Menu
▾
▴
ggc-cvs
|
From: <and...@us...> - 2008-07-24 20:52:03
|
Revision: 447
http://ggc.svn.sourceforge.net/ggc/?rev=447&view=rev
Author: andyrozman
Date: 2008-07-24 20:52:10 +0000 (Thu, 24 Jul 2008)
Log Message:
-----------
Modified Paths:
--------------
trunk/ggc/.settings/org.eclipse.core.resources.prefs
trunk/ggc/data/GGC_Config.properties
trunk/ggc/src/Changelog
trunk/ggc/src/GGC_en.properties
trunk/ggc/src/README
trunk/ggc/src/README.si
trunk/ggc/src/ggc/core/data/DailyValues.java
trunk/ggc/src/ggc/core/data/GlucoValues.java
trunk/ggc/src/ggc/core/data/HbA1cValues.java
trunk/ggc/src/ggc/core/data/RatioValues.java
trunk/ggc/src/ggc/core/db/GGCDb.java
trunk/ggc/src/ggc/core/db/GGCDbConfig.java
trunk/ggc/src/ggc/core/db/GGCDbLoader.java
trunk/ggc/src/ggc/core/db/datalayer/DailyFoodEntries.java
trunk/ggc/src/ggc/core/db/datalayer/DailyValue.java
trunk/ggc/src/ggc/core/db/datalayer/MealNutrition.java
trunk/ggc/src/ggc/core/db/datalayer/MealParts.java
trunk/ggc/src/ggc/core/db/tool/transfer/BackupDialog.java
trunk/ggc/src/ggc/core/db/tool/transfer/ExportDailyValues.java
trunk/ggc/src/ggc/core/db/tool/transfer/ExportNutritionDb.java
trunk/ggc/src/ggc/core/db/tool/transfer/ExportSettings.java
trunk/ggc/src/ggc/core/db/tool/transfer/GGCBackupRestoreRunner.java
trunk/ggc/src/ggc/core/db/tool/transfer/ImportDailyValues.java
trunk/ggc/src/ggc/core/db/tool/transfer/ImportNutrition.java
trunk/ggc/src/ggc/core/db/tool/transfer/ImportSettings.java
trunk/ggc/src/ggc/core/db/tool/transfer/RestoreGGCDialog.java
trunk/ggc/src/ggc/core/db/tool/transfer/RestoreGGCSelectorDialog.java
trunk/ggc/src/ggc/core/plugins/MetersPlugIn.java
trunk/ggc/src/ggc/core/util/DataAccess.java
trunk/ggc/src/ggc/gui/MainFrame.java
trunk/ggc/src/ggc/gui/panels/info/HbA1cInfoPanel.java
trunk/web_page/inc_news.inc
Modified: trunk/ggc/.settings/org.eclipse.core.resources.prefs
===================================================================
--- trunk/ggc/.settings/org.eclipse.core.resources.prefs 2008-07-24 20:39:36 UTC (rev 446)
+++ trunk/ggc/.settings/org.eclipse.core.resources.prefs 2008-07-24 20:52:10 UTC (rev 447)
@@ -1,7 +1,8 @@
-#Sun Jul 06 18:42:10 CEST 2008
-eclipse.preferences.version=1
-encoding//src/GGC_Nutrition_de.native.properties=UTF-8
-encoding//src/GGC_Nutrition_de.properties=US-ASCII
-encoding//src/GGC_de.native.properties=UTF-8
-encoding//src/GGC_de.properties=US-ASCII
-encoding//src/README.de=UTF-8
+#Fri Jul 11 13:36:55 CEST 2008
+eclipse.preferences.version=1
+encoding//src/GGC_Nutrition_de.native.properties=UTF-8
+encoding//src/GGC_Nutrition_de.properties=US-ASCII
+encoding//src/GGC_de.native.properties=UTF-8
+encoding//src/GGC_de.properties=US-ASCII
+encoding//src/README.de=UTF-8
+encoding//src/README.si=UTF-8
Modified: trunk/ggc/data/GGC_Config.properties
===================================================================
--- trunk/ggc/data/GGC_Config.properties 2008-07-24 20:39:36 UTC (rev 446)
+++ trunk/ggc/data/GGC_Config.properties 2008-07-24 20:52:10 UTC (rev 447)
@@ -44,16 +44,29 @@
DB2_CONN_PASSWORD=ggc
DB2_HIBERNATE_DIALECT=org.hibernate.dialect.PostgreSQLDialect
+
#
+# Database #2 - PostgreSQL Database (v3)
+#
+DB3_CONN_NAME=PostgreSQL Database (ggc_test2)
+DB3_DB_NAME=PostgreSQL
+DB3_CONN_DRIVER_CLASS=org.postgresql.Driver
+DB3_CONN_URL=jdbc:postgresql://localhost:5432/ggc_test2?user=ggc&password=ggc
+DB3_CONN_USERNAME=ggc
+DB3_CONN_PASSWORD=ggc
+DB3_HIBERNATE_DIALECT=org.hibernate.dialect.PostgreSQLDialect
+
+
+#
# Database #3 - Internal Database
#
-DB3_CONN_NAME=Internal Database
-DB3_DB_NAME=HypersonicSQL File
-DB3_CONN_DRIVER_CLASS=org.hsqldb.jdbcDriver
-DB3_CONN_URL=jdbc:hsqldb:file:../data/dbt/hsql/ggc_db
-DB3_CONN_USERNAME=sa
-DB3_CONN_PASSWORD=
-DB3_HIBERNATE_DIALECT=org.hibernate.dialect.HSQLDialect
+DB4_CONN_NAME=Internal Database
+DB4_DB_NAME=HypersonicSQL File
+DB4_CONN_DRIVER_CLASS=org.hsqldb.jdbcDriver
+DB4_CONN_URL=jdbc:hsqldb:file:../data/dbt/hsql/ggc_db
+DB4_CONN_USERNAME=sa
+DB4_CONN_PASSWORD=
+DB4_HIBERNATE_DIALECT=org.hibernate.dialect.HSQLDialect
#
@@ -68,7 +81,7 @@
#
# Db Selector
#
-SELECTED_DB=1
+SELECTED_DB=3
#
Modified: trunk/ggc/src/Changelog
===================================================================
--- trunk/ggc/src/Changelog 2008-07-24 20:39:36 UTC (rev 446)
+++ trunk/ggc/src/Changelog 2008-07-24 20:52:10 UTC (rev 447)
@@ -1,3 +1,10 @@
+2008-07-24 (0.2.23) Andy Rozman <and...@us...>
+ * Finished and integrated Restore functionality
+ * Application is ready for release. There are just few translations to finish and we are ready to go.
+
+2008-07-10 Andy Rozman <and...@us...>
+ * Integrated Pump Tool into GGC
+
2008-07-06 Reinhold Rumberger <ru...@us...>
* Some translation
* noticed that README.de line delimiter was LF and converted to CRLF
@@ -22,25 +29,21 @@
* added documentation
* fixed food problem (we need to find out what is problem with decimals in java)
-
2008-06-30 (0.2.20.4) Andy Rozman <and...@us...>
* Error dialog finsihed and integrated into Printing Dialog (this is first dialog that uses extended
error dialogs)
-
2008-06-29 (0.2.20.3) Andy Rozman <and...@us...>
* fixed problem with adding new foods and meals
* fixed problem with meals tree (ids and refresh)
* tooltips are added with foods and meals, labels for name are usually long, so we also set tooltip so that
whole name is visible
-
2008-06-28 (0.2.20.2) Andy Rozman <and...@us...>
* added JDecimalTextField to atech-tools, which needs to replace JFormattedTextField used for decimal numbers
replaced elements in Daily Values
* On new Daily Value, hour is set to current hour
-
2008-06-25 (0.2.20.1) Andy Rozman <and...@us...>
* Changed CGM databases
* Db Version Change: Stable: v7, Development: v8
Modified: trunk/ggc/src/GGC_en.properties
===================================================================
--- trunk/ggc/src/GGC_en.properties 2008-07-24 20:39:36 UTC (rev 446)
+++ trunk/ggc/src/GGC_en.properties 2008-07-24 20:52:10 UTC (rev 447)
@@ -731,13 +731,25 @@
RESTORE_DB_TITLE=Restore GGC Database
RESTORE_DB_TITLE_SHORT=Restore Database
RESTORE=Restore
-#SELECT_RESTORE_ELEMENTS=Select elements (tables) which you wish to restore:
-SELECT_ELEMENTS_TO_RESTORE=Select elements which you wish to restore:
-DAILY_VALUES_APPEND=Do you wish to append to existing 'Daily values'?
-# @Andy: duplicate key
+
+RESTORE_NOT_STARTED_YET=Restore hasn't started yet.
+
+RESTORE_SELECTOR_DESC=<html>Select files from which you wish to do restore. You can either select text file (which contains data for database) or you can select zip file containing several files (made by our 'Backup' option). In next dialog you can select which elements you wish to restore and any special options.<br><br><b>Notes:</b><br>1. Files will be not checked at this time. Check is on restore only.<br>2. Restore is full. This means that all previous data will be deleted. In some cases there is exception to this rule, but only when unlinked data is used (which is rare in itself). You will learn more about this exceptions (if there are any) on next dialog.</html>
+SELECT_ELEMENTS_TO_RESTORE=Select elements to restore
+
+
DAILY_VALUES_APPEND=<html>Do you wish to append to existing 'Daily values'? If there are already values in database and you add same day values again, entries might be doubled. New values will be added as new (no compare with existing elements).</html>
+FILE_FILTER_DBE=*.dbe - Database Export Files
+FILE_FILTER_ZIP=*.zip - Archive (should contain *.dbe)
+SELECT_FILE_TO_RESTORE=Select file to restore
+#BROWSE=Browse
+NEXT_STEP=Next
+#CLOSE=Close
+
+
+
#
# Update (1)
#
Modified: trunk/ggc/src/README
===================================================================
--- trunk/ggc/src/README 2008-07-24 20:39:36 UTC (rev 446)
+++ trunk/ggc/src/README 2008-07-24 20:52:10 UTC (rev 447)
@@ -110,41 +110,43 @@
5. SUB-PROJECTS
===============
-Currently there are two sub-projects running.
+Currently there are three sub-projects running.
+!!! CHANGED - Start
+
METER-TOOL
-----------
This is a plug-in for getting data from glucose meters. Currently this project is in
-the development phase. Together with support for Ascensia meters, we are finishing
-up the whole plug-in framework and all needed graphical interface forms (classes).
-The first alpha version will be available around September 2008, together with the
-finished implementation for Ascensia meters. Next in line are Roche meters
-(December 2008) and after them LifeScan meters (January 2009).
+the development phase. We finished support for Ascensia/Bayer meters and base
+framework classes (also GUI classes). We have two functionalities left (meter lists
+and configuration), but first version (0.2) is out and available (it's packed
+together into ggc package). Missing functionalities will be available by next
+ggc release. Next in line are Roche meters (October 2008) and after them
+LifeScan meters (December 2009).
PUMP-TOOL
----------
-This is plug-in for entering and retrieving data from insulin pumps. This project
-is still in the planning phase. The project will move into the development phase
-in September 2008, so the next version (0.4) may already have part of the pump-tool
-functionality. The first supported pumps will be those from Roche (April 2009),
-after them probably Minimed.
+This is plug-in for entering, retrieving and handling data from insulin pumps. This
+project is slowly starting into development phase. We plan to have at least some
+pump functionality in next ggc version (0.4). The first supported pumps will be those
+from Roche (December 2008), after them probably Minimed, and some developers are
+working parallel to also add support for Animas.
-
CGMS-TOOL
----------
This is a plug-in for retrieving data from CGMS device and viewing of this data. This
project is still in the planning phase. The project will move into the development phase
-in September 2008, so the next version (0.4) may already have part of the cgms-tool
-functionality. The first supported CGMS will be that of Minimed through export file from
+in January 2009. The first supported CGMS will be that of Minimed through export file from
CareLink.
+!!! CHANGED - End
6. HOW CAN I HELP AS REGULAR USER
Modified: trunk/ggc/src/README.si
===================================================================
--- trunk/ggc/src/README.si 2008-07-24 20:39:36 UTC (rev 446)
+++ trunk/ggc/src/README.si 2008-07-24 20:52:10 UTC (rev 447)
@@ -5,49 +5,49 @@
1. O PROGRAMU
=============
-Dobrodo\x9Ali med uporabniki programa GNU Gluco Control (GGC). GGC je odprto-kodna
-java aplikacija, ki je namenjena samokontroli va\x9Aega diabetesa. Odprto-kodno
+Dobrodošli med uporabniki programa GNU Gluco Control (GGC). GGC je odprto-kodna
+java aplikacija, ki je namenjena samokontroli vašega diabetesa. Odprto-kodno
pomeni, da je aplikacija prosto dostopna, skupaj s izvorno kodo, kar pomeni, da
lahko vsak pomaga pri razvoju.
-Ker je to odprto-kodna aplikacija, se lahko med delovanjem pojavijo napake (re\xE8emo
-jim hro\x9A\xE8i). Zato se vnaprej opravi\xE8ujemo... Ker smo razvijalci sami diabetiki,
-posku\x9Aamo narediti ta program najbolj\x9Ai kot je lahko, ampak kot veste, nsre\xE8e se
-dogajajo. Prosim natan\xE8no preberite ta dokument, da vidite kako lahko ta program
-postane bolj\x9Ai in kako lahko vi do tega pripomorete (ne rabite biti razvijalec,
-da pomagate, vsako poro\xE8ilo o napiaki, lahko pribli\x9Ea ta produkt k temu, kar \x9Eelimo
+Ker je to odprto-kodna aplikacija, se lahko med delovanjem pojavijo napake (rečemo
+jim hrošči). Zato se vnaprej opravičujemo... Ker smo razvijalci sami diabetiki,
+poskušamo narediti ta program najboljši kot je lahko, ampak kot veste, nesreče se
+dogajajo. Prosim natančno preberite ta dokument, da vidite kako lahko ta program
+postane boljši in kako lahko vi do tega pripomorete (ne rabite biti razvijalec,
+da pomagate, vsako poročilo o napaki, lahko približa ta produkt k temu, kar želimo
da postane.
-\xC8e \x9Eelite malo ve\xE8 pomagati pri razvoju (razvoj, testiranje, prevajanje, dodajanje
+Če želite malo več pomagati pri razvoju (razvoj, testiranje, prevajanje, dodajanje
novih naprav), prosim preberite dokument 'How_Can_I_Help.txt'. Vsak razvijalec
mora nujno prebrati ta isti dokument.
-2. TRENUTNA RAZLI\xC8ICA IN STATUS
+2. TRENUTNA RAZLIČICA IN STATUS
===============================
-To je razli\xE8ica 0.3 od programa GGC.
+To je različica 0.3 od programa GGC.
-V tej to\xE8ki smo pri razli\xE8ici 0.3, ki je prva javna izdaja tega programa. \xC8e ste
-namestili kak\x9Ano verzijo pred to jo prosim odstranite. V \xE8asu od zadnje (nejavne)
+V tej točki smo pri razližici 0.3, ki je prva javna izdaja tega programa. Če ste
+namestili kakšno verzijo pred to jo prosim odstranite. V času od zadnje (nejavne)
izdaje je bilo dosti sprememb v podatkovni bazi in v programu samem, kar pomeni, da
-stare razli\xE8ice niso nadgradljive (\xE8e \x9Ee imate podatke v stari aplikaciji nas
+stare različice niso nadgradljive (če še imate podatke v stari aplikaciji nas
kontaktirajte in pomagali vam bomo pri prenosu podatku). Od te verzije dalje, bo
-nadgradnja manj zapletena. V naslednji ve\xE8ji razli\xE8ici bos odstopen tudi sistem
-za nadgradnjo (za avtomati\xE8no nadgradnjo iz interneta)
+nadgradnja manj zapletena. V naslednji večji različici bo dostopen tudi sistem
+za nadgradnjo (za avtomatično nadgradnjo iz interneta)
-Ta prva javna razli\xE8ica ima podporo samo za interno bazo, \xE8e pa imate nadpovpre\xE8no
-znanje o ra\xE8unalnik (beri: \xE8e radi eksperimentirate), pa lahko uporabite tudi ostale
-baze (ve\xE8 informacij v datoteki 'How_Can_I_Help.txt' s le malo truda.
+Ta prva javna različica ima podporo samo za interno bazo, če pa imate nadpovprečno
+znanje o računalnikih (beri: če radi eksperimentirate), pa lahko uporabite tudi ostale
+baze (več informacij v datoteki 'How_Can_I_Help.txt') s le malo truda.
-Nove glavne izdaje so na\xE8rtovane v 6 mese\xE8nih intervalih, kar pomeni, da lahko
-pri\xE8akujete razli\xE8ico 0.4 ob koncu leta ali za\xE8etku naslednjega.
+Nove glavne izdaje so načrtovane v 6 mesečnih intervalih, kar pomeni, da lahko
+pričakujete različico 0.4 ob koncu leta ali začetku naslednjega.
-Manj\x9Ae spremembe bodo objavljene, ko se je funkcionalnost spremenila v taki meri,
-da je nujno narediti nadgradnjo (ve\xE8je spremembe v funkcionalnosti in popravki
-hro\x9A\xE8ev).
+Manjše spremembe bodo objavljene, ko se bodo funkcionalnosti spremenile v taki meri,
+da je nujno narediti nadgradnjo (večje spremembe v funkcionalnosti in popravki
+hroščev).
-Zaenkrat bo treba vse nadgradnje narediti ro\xE8no, kar pomeni, natan\xE8no izvedbo
+Zaenkrat bo treba vse nadgradnje narediti ročno, kar pomeni, natančno izvedbo
vseh korakov opisanih v datoteki 'How To Upgrade.txt', ki bo dodana vsem izdajam
(tudi v vsaki nadgradnji). Poskrbeli bomo, da bo tudi ta datoteka prevedena.
@@ -58,17 +58,18 @@
- Dodajanje podatkov o dozah insulina, vrednosti KS, aktivnosti, vrednosti urina in
komentarji (tukaj gre za predvsem podatke za Pen terapijo)
-- Prikaz grafov (ta del je \x9Ae treba temeljito predelati)
-- Baze podatkov za "\x8Atetje OH": USDA baza (ameri\x9Aka), Uporabni\x9Aka baza \x9Eivil in obrokov
+- Prikaz grafov (ta del je še treba temeljito predelati in dopolniti)
+- Baze podatkov za "štetje OH": USDA baza (ameriška), Uporabniška baza živil in obrokov
(to uporabnik sam sestavi)
-- Izpis poro\xE8il (tiskanje)
-- Mehanizem za nadgradnjo (to zaenkrat \x9Ae ne dela, ker je potrebno narediti \x9Ae stre\x9Eni\x9Ako
- stran)
+- Izpis poročil (tiskanje)
+- Mehanizem za nadgradnjo (to zaenkrat še ne dela, ker je potrebno narediti še strežniški
+ del)
- Ustvarjanje varnostne kopije baze (in obnovitev)
+- Integracija Orodja za merilce
-4. NA\xC8RTOVANE FUNKCIONALNOSTI
+4. NAČRTOVANE FUNKCIONALNOSTI
=============================
@@ -76,27 +77,28 @@
------------
- Nadgradnja podatkovne baze
- Obnovitev podatkov
-- Db Orodje (za uporabo in namestitev podatkov za ostale baze=
-- Uporaba programa za ve\xE8 oseb
-- Dokon\xE8anje aplikacije GGC Little, ki je residentni program (se nahaja v spominu)
+- Db Orodje (za uporabo in namestitev podatkov za ostale baze)
+- Možnost, da več oseb uporablja GGC
+- Dokončanje aplikacije GGC Little, ki je residentni program (se nahaja v spominu)
za hitro dodajanje podatkov preko celega dneva
-- Sistem za nadgradnjo (stre\x9Eni\x9Aki del)
+- Sistem za nadgradnjo (strežniški del)
- Orodja za merilce - nastavitev
-- Pomo\xE8 za program (angle\x9Aka)
-- Orodje za \xE8rpalke: osnovno, ro\xE8ni vnos, integracija, brez grafov)
+- Pomoč za program (angleška)
+- Orodje za črpalke: osnovno, ročni vnos, integracija, brez grafov)
- CGMS orodje: osnovno, integracija
- Spremeni in dodaj nove grafe
- Dodana funkcionalnost za baze hrane
-- Pomo\xE8 za boluse
+- Pomoč za boluse in razmerja
+- Oddaljena baza za jedi
Version 0.5
------------
-- GGC Omre\x9Eje (zagon ve\xE8ih instanc aplikacije na razli\xE8nih ra\xE8unalnikih)
-- Synhronizacija (GGC omre\x9Eje)
+- GGC Omrežje (zagon večih instanc aplikacije na različnih računalnikih)
+- Synhronizacija (GGC omrežje)
- Povezave do stvari za Diabetike (spletne strani, forumi, ...)
-- GGC PPC - verzija, ki naj bi delovala na dlan\xE8nikih s OS Pocket PC
-- Na\xE8rtovalec (dodajanje dogodkov, mi\x9Aljeno predvsem za vodenje zdravni\x9Akih pregledov,
+- GGC PPC - verzija, ki naj bi delovala na dlančnikih s OS Pocket PC
+- Načrtovalec (dodajanje dogodkov, mišljeno predvsem za vodenje zdravniških pregledov,
dodajanje zdravnikov, itd.
- Medicinske zaloge - kontrola zdravil, ki jih imamo doma
@@ -108,57 +110,77 @@
V tem trenutku imamo tri dodatne (pod) projekte.
-METER-TOOL
------------
+DODATEK ZA MERILNIKE
+---------------------
-This is a plug-in for getting data from glucose meters. Currently this project is in
-the development phase. Together with support for Ascensia meters, we are finishing
-up the whole plug-in framework and all needed graphical interface forms (classes).
-The first alpha version will be available around September 2008, together with the
-finished implementation for Ascensia meters. Next in line are Roche meters
-(December 2008) and after them LifeScan meters (January 2009).
+Naloga dodatka za merilnike je branje podatkov iz različnih merilcev. Ta projekt je
+trenutnu v fazi razvoja. Dokončali smo podporo za Ascensia/Bayer merilce, ter osnovne
+razrede za ta dodatek (tudi uporabniški vmesnik). Dve veliki funkcionaosti sta še
+ostali (seznam merilcev in nastavitve), toda prva verzija (0.2) je zunaj in dostopna
+(pakirana je skupaj s ggc programom). Manjkajoče funkcionalnosti bodo dodane do
+naslednje ggc izdaje (0.4). Naslednji merilci, ki bodo dodani so od Roche-a (Oktober
+2008) in za njimi LifeScan merilci (December 2009).
-PUMP-TOOL
-----------
+DODATEK ZA ČRPALKE
+------------------
-This is plug-in for entering and retrieving data from insulin pumps. This project
-is still in the planning phase. The project will move into the development phase
-in September 2008, so the next version (0.4) may already have part of the pump-tool
-functionality. The first supported pumps will be those from Roche (April 2009),
-after them probably Minimed.
+To je dodatek za vpis, branje in upravljanje s podatki iz insulinskih črpalk.
+Projekt počasi prehaja v fazo razvoja. V načrtu imamo da dodamo vsaj nekaj črpalkarskih
+funkcij v naslednjo verzijo ggc-ja (0.4). Prve bodo podprte črpalke od Roche-a (December
+2008), zatem pa verjetno Minimed. Nekateri od naših razvijalcev pa paralelno delajo tudi
+na podpori za Animas.
+DODATEK ZA CGMS-e
+-----------------
-6. HOW CAN I HELP
-==================
+To je dodatek branje podatkov iz CGMS naprav in gledanje teh podatkov. Projekt je še vedno
+v fazi načrtovanja. Predvidoma bo šel iz načrtovanja v razvoj v začetku naslednjega leta
+(January 2009). Prvi podprti CGMS bo Minimedov preko export datotek iz programa CareLink.
-There are several ways you can help. Some ways require you to have some knowledge,
-but most of them don't
+6. KAKO LAHKO POMAGATE KOT 'NAVADNI' UPORABNIK
+===============================================
-There are several ways you can help. The first and major way is to test software.
-Try to use it and find anything that doesn't work. Version 0.3 will be started from
-the command-line and all actions will also be displayed in the console. If you see
-an error text, exception or e.g. many cryptic lines of classes with numbers, this
-means something went wrong. The error is displayed on your screen, but it is also
-logged to a file (in <GGC_Root>\data\log). There you will find one or more files for
-each day. If an error happened today, there will be a file named 'GGC.log'. You need
-to open it and go to end and try to find the previously displayed errors.
-Zip this file and store it. And do the following (choose option A or B):
+Obstaja več načinov kako lahko pomagate. Nekateri zahtevajo, da imate določeno znanje,
+toda večina ne. Prosim poglejte si dokument 'How_Can_I_Help.txt'. Tam je več
+poglavij in pri vsakem je napisano za koga je namenjeno.
-A.) Visit the bug reporting site for our project and enter the bug by yourself.
+Prvo poglavje je prikazano tukaj (in prevedeno) vsa ostala pa so v dokumentu in v
+angleščini.
+
+
+---------------------------------------------------
+
+A.) Preverjanje (testiranje) programa in predlogi za nove ideje ali spremembe (namenjeno VSEM)
+
+
+Obstaja več načinov, da lahko pomagate. Prvi in največji način je preverjanje programa.
+Probajte ga čimbolj aktivno uporabljati in poskušajte razne stvari. Različica 0.3
+se zažene s ukazne vrstice (in ima odprto okno), tako da bodo vse operacije vidne v
+konzoli. Če vidite sporočilo s napako, exception (več vrstic s čudnimi podatki), pomeni,
+da je šlo nekaj narobe. Napaka se prikazuje na ekranu, hkrati pa se tudi shranjuje
+v datoteke (v <GGC Koren>\data\log). Za vsak dan se ustvari nova datoteka. Če se je
+napaka zgodila danes, bo tam datoteka 'GGC.log'. Odprite to datoteko in pojdite na
+konec in poiščite napako, ki se je prej zgodila. Uporabite Zip in shranite datoteko.
+Zatem naredite naslednje (opcija A ali B):
+
+
+
+a.) Visit the bug reporting site for our project and enter the bug by yourself.
Please attach the zipped log. The site is (data should be entered in English):
http://sourceforge.net/tracker/?group_id=49749&atid=457319
You don't need to be member at sourceforge to add this information, if you are
not please, write your email address somewhere in the error report. Describe
exactly what you were doing when the exception occurred and how the problem
affected your application. Also please let us know the configuration of your
- computer (for example: Celereon 2000 with 2 Gb Ram, running Ubuntu Linux,
- kernel 2.4.1.34, with java 1.6_06)
+ computer (for example: Intel(R) Celeron(R) 2000 with 2GB RAM, running Ubuntu
+ Linux, kernel 2.6.1.34, with Java 1.6.0_06)
-B.) Send us an email (gg...@at...), with all the data described in A).
+b.) Pošljite nam e-pošto (gg...@at...), s vsemi podatki kot so opisani
+ v a.). Podatke lahko sem pošljete v slovenščini, nemščini ali angleščini.
---
@@ -182,7 +204,7 @@
We will try to fix problems as soon as possible, but since there are only two of us
(three, but only two active) it might take some time... Major bugs will be fixed
-first, then the minor ones...
+first, then minor ones...
New functionality proposals have the lowest priority (and planned functionality has
priority).
@@ -192,10 +214,10 @@
-7. END
-=======
+7. ZAKLJUČEK
+=============
+Še enkrat se vam zahvaljujemo za uporabo našega programa in upamo, da izpolnjuje
+vaše želje in potrebe... če pa v tem trenutku še ne, pa mogoče enkrat v prihodnosti.
-Again, thank you for using our software, we hope it fulfills your needs... If not
-yet, maybe in the future.
Modified: trunk/ggc/src/ggc/core/data/DailyValues.java
===================================================================
--- trunk/ggc/src/ggc/core/data/DailyValues.java 2008-07-24 20:39:36 UTC (rev 446)
+++ trunk/ggc/src/ggc/core/data/DailyValues.java 2008-07-24 20:52:10 UTC (rev 447)
@@ -90,6 +90,7 @@
public ArrayList<DayValueH> deleteList = null;
+ DataAccess m_da = DataAccess.getInstance();
public void setStdDev(float stdDev)
{
@@ -325,7 +326,7 @@
DailyValuesRow dvr = getRow(i);
- float dVR_BG = dvr.getBG();
+ float dVR_BG = dvr.getBGRaw();
if (dVR_BG != 0)
{
@@ -603,7 +604,7 @@
return column_names[column] == null ? m_ic.getMessage("NO_NAME") : column_names[column];
}
- public float getAvgBG()
+ public float getAvgBGRaw()
{
if (counterBG != 0)
return sumBG / counterBG;
@@ -611,6 +612,21 @@
return 0;
}
+
+ public float getAvgBG()
+ {
+ if (counterBG != 0)
+ {
+ if (m_da.getBGMeasurmentType()==DataAccess.BG_MGDL)
+ return sumBG / counterBG;
+ else
+ return m_da.getBGValueDifferent(DataAccess.BG_MGDL, (sumBG / counterBG));
+ }
+ else
+ return 0;
+ }
+
+
public float getAvgIns1()
{
if (counterIns1 != 0)
Modified: trunk/ggc/src/ggc/core/data/GlucoValues.java
===================================================================
--- trunk/ggc/src/ggc/core/data/GlucoValues.java 2008-07-24 20:39:36 UTC (rev 446)
+++ trunk/ggc/src/ggc/core/data/GlucoValues.java 2008-07-24 20:52:10 UTC (rev 447)
@@ -24,6 +24,9 @@
* form.
*
* Author: schultd
+ *
+ * @deprecated
+ *
*/
package ggc.core.data;
Modified: trunk/ggc/src/ggc/core/data/HbA1cValues.java
===================================================================
--- trunk/ggc/src/ggc/core/data/HbA1cValues.java 2008-07-24 20:39:36 UTC (rev 446)
+++ trunk/ggc/src/ggc/core/data/HbA1cValues.java 2008-07-24 20:52:10 UTC (rev 447)
@@ -1,43 +1,46 @@
package ggc.core.data;
-
/*
- * GGC - GNU Gluco Control
- *
- * A pure java app to help you manage your diabetes.
- *
- * See AUTHORS for copyright information.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
- * Filename: HbA1cValues.java
- * Purpose: Calculates the HbA1c based on a given date.
- *
- * Author: schultd
+ * GGC - GNU Gluco Control
+ *
+ * A pure java app to help you manage your diabetes.
+ *
+ * See AUTHORS for copyright information.
+ *
+ * This program is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by the Free Software
+ * Foundation; either version 2 of the License, or (at your option) any later
+ * version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc., 59 Temple
+ * Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Filename: HbA1cValues.java
+ *
+ * Purpose: Calculates the HbA1c based on a given date.
+ *
+ * Author: schultd
+ * Author: andyrozman {an...@at...}
+ *
*/
+import ggc.core.util.DataAccess;
import ggc.core.util.I18nControl;
import java.util.Enumeration;
import java.util.Hashtable;
-
public class HbA1cValues
{
private I18nControl m_ic = I18nControl.getInstance();
+ DataAccess m_da = DataAccess.getInstance();
private float sumBG;
private int readings;
@@ -66,65 +69,69 @@
dayCount++;
}
-
public void addDayValueRow(DailyValuesRow dvr)
{
- int date = (int)dvr.getDate();
+ int date = (int) dvr.getDate();
- if (m_dataTable.containsKey(""+date))
+ if (m_dataTable.containsKey("" + date))
{
- DailyValues dv_int = m_dataTable.get(""+date);
+ DailyValues dv_int = m_dataTable.get("" + date);
dv_int.addRow(dvr);
}
else
{
- DailyValues dv = new DailyValues();
- dv.addRow(dvr);
- m_dataTable.put(""+date, dv);
+ DailyValues dv = new DailyValues();
+ dv.addRow(dvr);
+ m_dataTable.put("" + date, dv);
}
-
- //this.readings++;
-
+
+ // addDay(dvr.getBGRaw(), 1);
+ // this.readings++;
+
}
-
public void processDayValues()
{
- for (Enumeration<String> en = m_dataTable.keys(); en.hasMoreElements(); )
- {
- DailyValues dv = m_dataTable.get(en.nextElement());
- addDay(dv.getAvgBG(), dv.getBGCount());
- }
-/*
- int num = 7 - m_dataTable.size();
-
- for (int i=0; i<num; i++)
- {
- addDay(0.0f, 0);
- }
-*/
+
+ for (Enumeration<String> en = m_dataTable.keys(); en.hasMoreElements();)
+ {
+ DailyValues dv = m_dataTable.get(en.nextElement());
+ addDay(dv.getAvgBGRaw(), dv.getBGCount());
+ }
+
+ /*
+ * int num = 7 - m_dataTable.size();
+ *
+ * for (int i=0; i<num; i++) { addDay(0.0f, 0); }
+ */
}
-
-
public float getAvgBG()
{
if (dayCount != 0)
- return sumBG / dayCount;
+ {
+
+ if (m_da.getBGMeasurmentType()==DataAccess.BG_MGDL)
+ return sumBG / dayCount;
+ else
+ return m_da.getBGValueDifferent(DataAccess.BG_MGDL, (sumBG / dayCount));
+
+ // return sumBG / dayCount;
+
+ }
else
return 0;
}
-
public float getAvgBGForMethod3()
{
if (dayCount != 0)
- return sumBG / readings;
+ return sumBG / dayCount;
+ //return sumBG / readings;
else
return 0;
}
-
-
+
public int getDayCount()
{
return dayCount;
@@ -135,7 +142,7 @@
float value = 0;
for (int i = 0; i < 5; i++)
- value += getPercentOfDaysInClass(i) * (i + 1); //max value = 5;
+ value += getPercentOfDaysInClass(i) * (i + 1); // max value = 5;
if (value < 2)
return m_ic.getMessage("NO_EXPRESSIVENESS");
@@ -155,28 +162,28 @@
public float getReadingsPerDay()
{
if (dayCount != 0)
- return readings / (float)dayCount;
+ return readings / (float) dayCount;
else
return 0;
}
public float getHbA1c_Method1()
{
- if (readings==0)
- return 0;
+ if (readings == 0)
+ return 0;
- if (dayCount > 0)
- return (float)((getAvgBG() + 66.1) / 31.7);
+ if (dayCount > 0)
+ return (float) ((getAvgBG() + 66.1) / 31.7);
else
return 0;
}
public float getHbA1c_Method2()
{
- if (readings==0)
- return 0;
+ if (readings == 0)
+ return 0;
- if (dayCount > 0)
+ if (dayCount > 0)
return (getAvgBG() / 30 + 2);
else
return 0;
@@ -184,18 +191,21 @@
public float getHbA1c_Method3()
{
- // HbA1c =( mg/dl + 86) / 33.3
-
- if (readings==0)
- return 0;
+ // HbA1c =( mg/dl + 86) / 33.3
- if (dayCount > 0)
- return (getAvgBGForMethod3() + 86.0f / 33.3f);
+ if (readings == 0)
+ return 0;
+
+ if (dayCount > 0)
+ {
+ System.out.println("avg bg: " + getAvgBGForMethod3());
+ System.out.println((getAvgBGForMethod3() + 86.0f) / 33.3f);
+ return ((getAvgBGForMethod3() + 86.0f) / 33.3f);
+ }
else
return 0;
}
-
-
+
public int getExp()
{
return exp;
@@ -203,23 +213,23 @@
public float getPercentOfDaysInClass(int r)
{
- switch (r)
+ switch (r)
{
- case 0:
- return (ReadingsPerDay[0] + ReadingsPerDay[1] - dayCount + 90) / (float)90;
- case 1:
- return (ReadingsPerDay[2] + ReadingsPerDay[3]) / (float)90;
- case 2:
- return (ReadingsPerDay[4] + ReadingsPerDay[5]) / (float)90;
- case 3:
- return (ReadingsPerDay[6] + ReadingsPerDay[7]) / (float)90;
- case 4:
- int tmp = 0;
- for (int i = 8; i < ReadingsPerDay.length; i++)
- tmp += ReadingsPerDay[i];
- return tmp / (float)90;
- default:
- return 0;
+ case 0:
+ return (ReadingsPerDay[0] + ReadingsPerDay[1] - dayCount + 90) / (float) 90;
+ case 1:
+ return (ReadingsPerDay[2] + ReadingsPerDay[3]) / (float) 90;
+ case 2:
+ return (ReadingsPerDay[4] + ReadingsPerDay[5]) / (float) 90;
+ case 3:
+ return (ReadingsPerDay[6] + ReadingsPerDay[7]) / (float) 90;
+ case 4:
+ int tmp = 0;
+ for (int i = 8; i < ReadingsPerDay.length; i++)
+ tmp += ReadingsPerDay[i];
+ return tmp / (float) 90;
+ default:
+ return 0;
}
}
}
Modified: trunk/ggc/src/ggc/core/data/RatioValues.java
===================================================================
--- trunk/ggc/src/ggc/core/data/RatioValues.java 2008-07-24 20:39:36 UTC (rev 446)
+++ trunk/ggc/src/ggc/core/data/RatioValues.java 2008-07-24 20:52:10 UTC (rev 447)
@@ -19,11 +19,10 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
- * Filename: GlucoValues.java
- * Purpose: The data read from the meter and translated into a more general
- * form.
+ * Filename: RatioValues.java
+ * Purpose: Values used for ratios.
*
- * Author: schultd
+ * Author: andyrozman {an...@at...}
*/
package ggc.core.data;
Modified: trunk/ggc/src/ggc/core/db/GGCDb.java
===================================================================
--- trunk/ggc/src/ggc/core/db/GGCDb.java 2008-07-24 20:39:36 UTC (rev 446)
+++ trunk/ggc/src/ggc/core/db/GGCDb.java 2008-07-24 20:52:10 UTC (rev 447)
@@ -19,19 +19,18 @@
* this program; if not, write to the Free Software Foundation, Inc., 59 Temple
* Place, Suite 330, Boston, MA 02111-1307 USA
*
- * Filename: GGCDb Purpose: This is main datalayer file. It contains all methods
- * for initialization of Hibernate framework, for adding/updating/deleting data
- * from database (hibernate). It also contains all methods for mass readings of
- * data from hibernate.
+ * Filename: GGCDb
+ *
+ * Purpose: This is main datalayer file. It contains all methods
+ * for initialization of Hibernate framework, for adding/updating/deleting data
+ * from database (hibernate). It also contains all methods for mass readings of
+ * data from hibernate.
*
* Author: andyrozman {an...@at...}
*/
-// WORK IN PROGRESS, PLEASE DO NOT TOUCH
-//
// Methods are added to this class, whenever we make changes to our existing
-// database,
-// either add methods for handling data or adding new tables.
+// database, either add methods for handling data or adding new tables.
//
// andyrozman
@@ -76,7 +75,6 @@
import org.apache.commons.logging.LogFactory;
import org.hibernate.Query;
import org.hibernate.Session;
-import org.hibernate.SessionFactory;
import org.hibernate.Transaction;
import org.hibernate.cfg.Configuration;
import org.hibernate.tool.hbm2ddl.SchemaExport;
@@ -84,7 +82,7 @@
import com.atech.db.hibernate.DatabaseObjectHibernate;
import com.atech.graphics.dialogs.selector.SelectableInterface;
-public class GGCDb // implements DbCheckInterface
+public class GGCDb // implements DbCheckInterface HibernateDb
{
public static final int DB_CONFIG_LOADED = 1;
public static final int DB_INITIALIZED = 2;
@@ -94,9 +92,9 @@
// x private boolean db_debug = false;
private static Log log = LogFactory.getLog(GGCDb.class);
- private Session m_session = null;
- private Session m_session_2 = null;
- private SessionFactory sessions = null;
+// private Session m_session = null;
+// private Session m_session_2 = null;
+// private SessionFactory sessions = null;
private int m_errorCode = 0;
private String m_errorDesc = "";
private String m_addId = "";
@@ -132,7 +130,7 @@
public GGCDb(DataAccess da)
{
- m_cfg = createConfiguration();
+ /*m_cfg =*/ createConfiguration();
m_da = da;
m_loadStatus = DB_CONFIG_LOADED;
// debugConfig();
@@ -140,7 +138,7 @@
public GGCDb()
{
- m_cfg = createConfiguration();
+ /*m_cfg =*/ createConfiguration();
m_loadStatus = DB_CONFIG_LOADED;
// debugConfig();
}
@@ -178,19 +176,7 @@
public void closeDb()
{
- if (this.hib_config.getHibernateDialect().equals("org.hibernate.dialect.HSQLDialect"))
- {
- try
- {
- getSession().connection().createStatement().execute("SHUTDOWN");
- }
- catch (Exception ex)
- {
- System.out.println("closeDb:Exception> " + ex);
- }
- }
- getSession().close();
- m_session = null;
+ this.hib_config.closeDb();
m_loadStatus = DB_CONFIG_LOADED;
}
@@ -201,6 +187,8 @@
public void openHibernateSimple()
{
+ this.hib_config.createSessionFactory();
+/*
logInfo("openHibernateSimple", "Start");
// getStartStatus();
sessions = m_cfg.buildSessionFactory();
@@ -211,6 +199,8 @@
m_loadStatus = DB_INITIALIZED;
logInfo("openHibernateSimple", "End");
+ */
+ m_loadStatus = DB_INITIALIZED;
}
/*
@@ -269,6 +259,8 @@
public Session getSession(int session_nr)
{
+ return this.hib_config.getSession(session_nr);
+ /*
if (session_nr == 1)
{
m_session.clear();
@@ -278,16 +270,16 @@
{
m_session_2.clear();
return m_session_2;
- }
+ }*/
}
public void createDatabase()
{
- logInfo("createDatabase", "Start");
+ logInfo("createDatabase", "Process");
- new SchemaExport(m_cfg).create(true, true);
+ new SchemaExport(this.getHibernateConfiguration().getConfiguration()).create(true, true);
- logInfo("openHibernateSimple", "End");
+ //logInfo("openHibernateSimple", "End");
}
// *************************************************************
@@ -598,11 +590,11 @@
// **** SETTINGS ****
// *************************************************************
- public Configuration createConfiguration()
+ public void createConfiguration()
{
logInfo("createConfiguration()");
this.hib_config = new GGCDbConfig(true);
- return this.hib_config.getConfiguration();
+ this.hib_config.getConfiguration();
}
/*
@@ -1184,7 +1176,7 @@
String sDay = sdf.format(gc1.getTime()) + "0000";
Query q = getSession().createQuery(
- "SELECT dv from " + "ggc.core.db.hibernate.DayValueH as dv " + "WHERE dv.bg <> 0 AND dv.dt_info >= "
+ "SELECT dv from " + "ggc.core.db.hibernate.DayValueH as dv " + "WHERE dv.bg > 0 AND dv.dt_info >= "
+ sDay + " AND dv.dt_info <= " + eDay + " ORDER BY dv.dt_info");
Iterator it = q.list().iterator();
@@ -1198,6 +1190,8 @@
hbVal.processDayValues();
logDebug("getHbA1c()", "Readings: " + hbVal.getDayCount() + " " + hbVal.getReadings());
+
+ System.out.println("Avg BG: " + hbVal.getAvgBGForMethod3());
}
catch (Exception ex)
Modified: trunk/ggc/src/ggc/core/db/GGCDbConfig.java
===================================================================
--- trunk/ggc/src/ggc/core/db/GGCDbConfig.java 2008-07-24 20:39:36 UTC (rev 446)
+++ trunk/ggc/src/ggc/core/db/GGCDbConfig.java 2008-07-24 20:52:10 UTC (rev 447)
@@ -1,5 +1,36 @@
package ggc.core.db;
+/*
+ * GGC - GNU Gluco Control
+ *
+ * A pure Java application to help you manage your diabetes.
+ *
+ * See AUTHORS for copyright information.
+ *
+ * This program is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by the Free Software
+ * Foundation; either version 2 of the License, or (at your option) any later
+ * version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc., 59 Temple
+ * Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Filename: GGCDbConfig
+ *
+ * Purpose: This is configuration file for GGC Database. This class is used for all external
+ * and internal handling of database. It contains main methods for accessing Hibernate
+ * Framework.
+ *
+ * Author: andyrozman {an...@at...}
+ */
+
+
import com.atech.db.hibernate.HibernateConfiguration;
import org.apache.commons.logging.Log;
@@ -86,4 +117,10 @@
return "../data/db_info.txt";
}
+ @Override
+ public int getNumberOfSessions()
+ {
+ return 2;
+ }
+
}
Modified: trunk/ggc/src/ggc/core/db/GGCDbLoader.java
===================================================================
--- trunk/ggc/src/ggc/core/db/GGCDbLoader.java 2008-07-24 20:39:36 UTC (rev 446)
+++ trunk/ggc/src/ggc/core/db/GGCDbLoader.java 2008-07-24 20:52:10 UTC (rev 447)
@@ -1,3 +1,6 @@
+package ggc.core.db;
+
+
/*
* GGC - GNU Gluco Control
*
@@ -20,23 +23,15 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* Filename: GGCDbLoader
+ *
* Purpose: This is GGCDb Loader. It help system to load all needed data for
- * GGC "Session".
+ * GGC Database Session.
*
* Author: andyrozman {an...@at...}
*/
-// WORK IN PROGRESS, PLEASE DO NOT TOUCH
-//
-// Methods are added to this class, whenever we make changes to our existing database,
-// either add methods for handling data or adding new tables.
-//
-// andyrozman
-
-package ggc.core.db;
-
import ggc.core.util.DataAccess;
import ggc.gui.MainFrame;
import ggc.gui.StatusBar;
Modified: trunk/ggc/src/ggc/core/db/datalayer/DailyFoodEntries.java
===================================================================
--- trunk/ggc/src/ggc/core/db/datalayer/DailyFoodEntries.java 2008-07-24 20:39:36 UTC (rev 446)
+++ trunk/ggc/src/ggc/core/db/datalayer/DailyFoodEntries.java 2008-07-24 20:52:10 UTC (rev 447)
@@ -1,30 +1,30 @@
/*
- * GGC - GNU Gluco Control
- *
- * A pure java app to help you manage your diabetes.
- *
- * See AUTHORS for copyright information.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
- * Filename: NutritionHomeWeightType
- * Purpose: This is datalayer file (data file, with methods to work with database or in
- * this case Hibernate).
- * This one is used for Food's Home Weights.
- *
- * Author: andyrozman {an...@at...}
+ * GGC - GNU Gluco Control
+ *
+ * A pure java app to help you manage your diabetes.
+ *
+ * See AUTHORS for copyright information.
+ *
+ * This program is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by the Free Software
+ * Foundation; either version 2 of the License, or (at your option) any later
+ * version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc., 59 Temple
+ * Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Filename: DailyFoodEntries
+ *
+ * Purpose: This is collection class which is used for collection DailyFoodEntry instances
+ * used by calcultator for dailyvalue entry food use.
+ *
+ * Author: andyrozman {an...@at...}
*/
package ggc.core.db.datalayer;
@@ -36,8 +36,7 @@
import java.util.Enumeration;
import java.util.Hashtable;
-
-public class DailyFoodEntries //implements SelectableInterface
+public class DailyFoodEntries // implements SelectableInterface
{
NutriI18nControl ic = NutriI18nControl.getInstance();
@@ -46,92 +45,81 @@
String text_idx;
DataAccess m_da = DataAccess.getInstance();
GlycemicNutrients glyc_nutr = null;
-
+
boolean root_entry = false;
ArrayList<DailyFoodEntry> entries = null;
-
-
+
public DailyFoodEntries()
{
- entries = new ArrayList<DailyFoodEntry>();
+ entries = new ArrayList<DailyFoodEntry>();
}
-
-
-
+
public void addDailyFoodEntry(DailyFoodEntry dfe)
{
- if (dfe.hasChildren())
- {
- this.entries.addAll(dfe.getChildren());
- }
- else
- {
- this.entries.add(dfe);
- }
+ if (dfe.hasChildren())
+ {
+ this.entries.addAll(dfe.getChildren());
+ }
+ else
+ {
+ this.entries.add(dfe);
+ }
}
-
-
+
public ArrayList<MealNutrition> getCalculatedNutrients()
{
-
- //System.out.println("calcultedNutrients ");
-
- Hashtable<String,MealNutrition> ht = new Hashtable<String,MealNutrition>();
-
- //System.out.println("Entries: \n" + this.entries);
-
- for(int i=0; i<this.entries.size(); i++)
- {
- ArrayList<MealNutrition> lst = this.entries.get(i).getNutrients();
-
- //System.out.println("Lst: " + lst);
-
- for(int j=0; j<lst.size(); j++)
- {
- MealNutrition mn = lst.get(j);
-
- if (!ht.containsKey("" + mn.getId()))
- {
- mn.clearSum();
-
- float cm = mn.getCalculatedAmount();
-
- //System.out.println("Calculated amount: " + cm);
- mn.addAmountToSum(cm);
-
- ht.put("" + mn.getId(), mn);
- }
- else
- {
- ht.get("" + mn.getId()).addAmountToSum(mn.getCalculatedAmount());
- }
- }
- }
-
- ArrayList<MealNutrition> out_lst = new ArrayList<MealNutrition>();
-
- for(Enumeration<String> en = ht.keys(); en.hasMoreElements(); )
- {
- out_lst.add(ht.get(en.nextElement()));
- }
-
- return out_lst;
+
+ // System.out.println("calcultedNutrients ");
+
+ Hashtable<String, MealNutrition> ht = new Hashtable<String, MealNutrition>();
+
+ // System.out.println("Entries: \n" + this.entries);
+
+ for (int i = 0; i < this.entries.size(); i++)
+ {
+ ArrayList<MealNutrition> lst = this.entries.get(i).getNutrients();
+
+ // System.out.println("Lst: " + lst);
+
+ for (int j = 0; j < lst.size(); j++)
+ {
+ MealNutrition mn = lst.get(j);
+
+ if (!ht.containsKey("" + mn.getId()))
+ {
+ mn.clearSum();
+
+ float cm = mn.getCalculatedAmount();
+
+ // System.out.println("Calculated amount: " + cm);
+ mn.addAmountToSum(cm);
+
+ ht.put("" + mn.getId(), mn);
+ }
+ else
+ {
+ ht.get("" + mn.getId()).addAmountToSum(mn.getCalculatedAmount());
+ }
+ }
+ }
+
+ ArrayList<MealNutrition> out_lst = new ArrayList<MealNutrition>();
+
+ for (Enumeration<String> en = ht.keys(); en.hasMoreElements();)
+ {
+ out_lst.add(ht.get(en.nextElement()));
+ }
+
+ return out_lst;
}
-
-
@Override
public String toString()
{
- //return this.getShortDescription();
- return "DailyFoodEntries [count=" + this.entries + "]"; //getShortDescription();
+ // return this.getShortDescription();
+ return "DailyFoodEntries [count=" + this.entries + "]"; // getShortDescription
+ // ();
}
-
-
-
-
}
-
-
Modified: trunk/ggc/src/ggc/core/db/datalayer/DailyValue.java
===================================================================
--- trunk/ggc/src/ggc/core/db/datalayer/DailyValue.java 2008-07-24 20:39:36 UTC (rev 446)
+++ trunk/ggc/src/ggc/core/db/datalayer/DailyValue.java 2008-07-24 20:52:10 UTC (rev 447)
@@ -19,10 +19,8 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
- * Filename: Meal
- * Purpose: This is datalayer file (data file, with methods to work with database or in
- * this case Hibernate).
- * This one is used for description of meal.
+ * Filename: DailyValue
+ * Purpose: This is backup class for DailyValuesH
*
* Author: andyrozman {an...@at...}
*/
Modified: trunk/ggc/src/ggc/core/db/datalayer/MealNutrition.java
===================================================================
--- trunk/ggc/src/ggc/core/db/datalayer/MealNutrition.java 2008-07-24 20:39:36 UTC (rev 446)
+++ trunk/ggc/src/ggc/core/db/datalayer/MealNutrition.java 2008-07-24 20:52:10 UTC (rev 447)
@@ -19,7 +19,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
- * Filename: MealValue
+ * Filename: MealNutrition
* Purpose: This is datalayer file (data file).
* This one is used for Meal (Nutrition) values.
*
Modified: trunk/ggc/src/ggc/core/db/datalayer/MealParts.java
===================================================================
--- trunk/ggc/src/ggc/core/db/datalayer/MealParts.java 2008-07-24 20:39:36 UTC (rev 446)
+++ trunk/ggc/src/ggc/core/db/datalayer/MealParts.java 2008-07-24 20:52:10 UTC (rev 447)
@@ -19,10 +19,9 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
- * Filename: NutritionHomeWeightType
- * Purpose: This is datalayer file (data file, with methods to work with database or in
- * this case Hibernate).
- * This one is used for Food's Home Weights.
+ * Filename: MealParts
+ * Purpose: This is collection class for storing and grouping of MealPart
+ * class instances.
*
* Author: andyrozman {an...@at...}
*/
Modified: trunk/ggc/src/ggc/core/db/tool/transfer/BackupDialog.java
===================================================================
--- trunk/ggc/src/ggc/core/db/tool/transfer/BackupDialog.java 2008-07-24 20:39:36 UTC (rev 446)
+++ trunk/ggc/src/ggc/core/db/tool/transfer/BackupDialog.java 2008-07-24 20:52:10 UTC (rev 447)
@@ -1,5 +1,7 @@
package ggc.core.db.tool.transfer;
+import ggc.core.util.DataAccess;
+
import javax.swing.JDialog;
import javax.swing.JFrame;
@@ -11,9 +13,6 @@
public class BackupDialog extends BackupRestoreDialog
{
- private static final long serialVersionUID = 1L;
-
-
public BackupDialog(JDialog parent, ATDataAccessAbstract da /*, BackupRestoreCollection br_coll*/)
{
super(parent, da, da.getBackupRestoreCollection());
@@ -40,6 +39,17 @@
gbrr.start();
}
+
+ public static void main(String args[])
+ {
+ JFrame fr = new JFrame();
+ fr.setSize(800,600);
+
+ BackupDialog rsd = new BackupDialog(new JDialog(), DataAccess.getInstance());
+ rsd.showDialog();
+ }
+
+
}
Modified: trunk/ggc/src/ggc/core/db/tool/transfer/ExportDailyValues.java
===================================================================
--- trunk/ggc/src/ggc/core/db/tool/transfer/ExportDailyValues.java 2008-07-24 20:39:36 UTC (rev 446)
+++ trunk/ggc/src/ggc/core/db/tool/transfer/ExportDailyValues.java 2008-07-24 20:52:10 UTC (rev 447)
@@ -7,19 +7,19 @@
import java.io.File;
import java.util.Iterator;
+import org.hibernate.Query;
+import org.hibernate.Session;
+
+import com.atech.db.hibernate.HibernateConfiguration;
import com.atech.db.hibernate.transfer.BackupRestoreWorkGiver;
import com.atech.db.hibernate.transfer.ExportTool;
-import org.hibernate.Query;
-import org.hibernate.Session;
-import org.hibernate.cfg.Configuration;
-
public class ExportDailyValues extends ExportTool implements Runnable
{
public ExportDailyValues(BackupRestoreWorkGiver giver)
{
- super(DataAccess.getInstance().getDb().getConfiguration());
+ super(DataAccess.getInstance().getDb().getHibernateConfiguration());
checkPrerequisitesForAutoBackup();
@@ -29,7 +29,7 @@
// exportAll();
}
- public ExportDailyValues(Configuration cfg)
+ public ExportDailyValues(HibernateConfiguration cfg)
{
super(cfg);
@@ -88,6 +88,14 @@
* } }
*/
+
+ public int getActiveSession()
+ {
+ return 2;
+ }
+
+
+
@SuppressWarnings("unchecked")
private void export_DailyValues()
{
@@ -133,7 +141,7 @@
{
GGCDb db = new GGCDb();
db.initDb();
- new ExportDailyValues(db.getConfiguration());
+ new ExportDailyValues(db.getHibernateConfiguration());
}
}
\ No newline at end of file
Modified: trunk/ggc/src/ggc/core/db/tool/transfer/ExportNutritionDb.java
===================================================================
--- trunk/ggc/src/ggc/core/db/tool/transfer/ExportNutritionDb.java 2008-07-24 20:39:36 UTC (rev 446)
+++ trunk/ggc/src/ggc/core/db/tool/transfer/ExportNutritionDb.java 2008-07-24 20:52:10 UTC (rev 447)
@@ -10,19 +10,19 @@
import java.io.File;
import java.util.Iterator;
+import org.hibernate.Query;
+import org.hibernate.Session;
+
+import com.atech.db.hibernate.HibernateConfiguration;
import com.atech.db.hibernate.transfer.BackupRestoreWorkGiver;
import com.atech.db.hibernate.transfer.ExportTool;
-import org.hibernate.Query;
-import org.hibernate.Session;
-import org.hibernate.cfg.Configuration;
-
public class ExportNutritionDb extends ExportTool
{
public ExportNutritionDb(BackupRestoreWorkGiver giver)
{
- super(DataAccess.getInstance().getDb().getConfiguration());
+ super(DataAccess.getInstance().getDb().getHibernateConfiguration());
checkPrerequisitesForAutoBackup();
@@ -32,7 +32,7 @@
// exportAll();
}
- public ExportNutritionDb(Configuration cfg)
+ public ExportNutritionDb(HibernateConfiguration cfg)
{
super(cfg);
@@ -79,6 +79,14 @@
this.setFileLastPart("");
}
+
+ public int getActiveSession()
+ {
+ return 2;
+ }
+
+
+
private void exportAll()
{
export_UserFoodGroups();
@@ -246,7 +254,8 @@
public static void main(String[] args)
{
GGCDb db = new GGCDb();
- new ExportNutritionDb(db.getConfiguration());
+ db.initDb();
+ new ExportNutritionDb(db.getHibernateConfiguration());
}
}
\ No newline at end of file
Modified: trunk/ggc/src/ggc/core/db/tool/transfer/ExportSettings.java
===================================================================
--- trunk/ggc/src/ggc/core/db/tool/transfer/ExportSettings.java 2008-07-24 20:39:36 UTC (rev 446)
+++ trunk/ggc/src/ggc/core/db/tool/transfer/ExportSettings.java 2008-07-24 20:52:10 UTC (rev 447)
@@ -9,8 +9,8 @@
import org.hibernate.Query;
import org.hibernate.Session;
-import org.hibernate.cfg.Configuration;
+import com.atech.db.hibernate.HibernateConfiguration;
import com.atech.db.hibernate.transfer.BackupRestoreWorkGiver;
import com.atech.db.hibernate.transfer.ExportTool;
@@ -19,7 +19,7 @@
public ExportSettings(BackupRestoreWorkGiver giver)
{
- super(DataAccess.getInstance().getDb().getConfiguration());
+ super(DataAccess.getInstance().getDb().getHibernateConfiguration());
checkPrerequisitesForAutoBackup();
@@ -29,7 +29,7 @@
// exportAll();
}
- public ExportSettings(Configuration cfg)
+ public ExportSettings(HibernateConfiguration cfg)
{
super(cfg);
@@ -76,6 +76,14 @@
this.setFileLastPart("");
}
+
+ public int getActiveSession()
+ {
+ return 2;
+ }
+
+
+
private void exportAll()
{
export_Settings();
@@ -131,7 +139,7 @@
{
GGCDb db = new GGCDb();
db.initDb();
- new ExportSettings(db.getConfiguration());
+ new ExportSettings(db.getHibernateConfiguration());
}
}
\ No newline at end of file
Modified: trunk/ggc/src/ggc/core/db/tool/transfer/GGCBackupRestoreRunner.java
===================================================================
--- trunk/ggc/src/ggc/core/db/tool/transfer/GGCBackupRestoreRunner.java 2008-07-24 20:39:36 UTC (rev 446)
+++ trunk/ggc/src/ggc/core/db/tool/transfer/GGCBackupRestoreRunner.java 2008-07-24 20:52:10 UTC (rev 447)
@@ -9,6 +9,7 @@
import com.atech.db.hibernate.transfer.BackupRestoreObject;
import com.atech.db.hibernate.transfer.BackupRestoreRunner;
import com.atech.db.hibernate.transfer.BackupRestoreWorkGiver;
+import com.atech.db.hibernate.transfer.RestoreFileInfo;
import com.atech.i18n.I18nControlAbstract;
import com.atech.utils.file.PackFiles;
@@ -32,6 +33,7 @@
DataAccess da = DataAccess.getInstance();
I18nControlAbstract ic = da.getI18nControlInstance();
+ boolean restore_with_append = true;
public GGCBackupRestoreRunner(Hashtable<String, BackupRestoreObject> objects, BackupRestoreWorkGiver giver)
{
@@ -39,6 +41,20 @@
// this.ht_backup_objects = objects;
}
+ public GGCBackupRestoreRunner(Hashtable<String,RestoreFileInfo> objects, BackupRestoreWorkGiver work_giver, String special)
+ {
+ super(objects, work_giver, special);
+
+ if (special!=null)
+ {
+ if (special.equals("true"))
+ this.restore_with_appe...
[truncated message content] |
|
From: <and...@us...> - 2008-08-02 17:25:55
|
Revision: 462
http://ggc.svn.sourceforge.net/ggc/?rev=462&view=rev
Author: andyrozman
Date: 2008-08-02 17:26:03 +0000 (Sat, 02 Aug 2008)
Log Message:
-----------
Added Paths:
-----------
trunk/ggc-cgm/src/ggc/cgm/device/CGMAlarms.java
trunk/ggc-pump/src/ggc/pump/device/PumpAlarms.java
trunk/ggc-pump/src/ggc/pump/device/PumpEvents.java
trunk/ggc-pump/src/ggc/pump/device/PumpReport.java
Added: trunk/ggc-cgm/src/ggc/cgm/device/CGMAlarms.java
===================================================================
--- trunk/ggc-cgm/src/ggc/cgm/device/CGMAlarms.java (rev 0)
+++ trunk/ggc-cgm/src/ggc/cgm/device/CGMAlarms.java 2008-08-02 17:26:03 UTC (rev 462)
@@ -0,0 +1,51 @@
+package ggc.cgm.device;
+
+
+
+/*
+ * GGC - GNU Gluco Control
+ *
+ * A pure java app to help you manage your diabetes.
+ *
+ * See AUTHORS for copyright information.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Filename: MeterInterface
+ * Purpose: This is interface class, used for meters. It should be primary implemented by protocol class, and
+ * protocol class should be used as super class for meter definitions. Each meter family "should"
+ * have it's own super class and one class for each meter.
+ *
+ * Author: andyrozman {and...@so...}
+ */
+
+
+public class CGMAlarms
+{
+
+ public static final int CGM_ALARM_HIGH_GLUCOSE = 101; //igh Glucose (101)
+ public static final int CGM_ALARM_LOW_GLUCOSE = 102; //Low Glucose (102)
+ public static final int CGM_ALARM_METER_BG_NOW = 104; //Meter BG Now (104)
+ public static final int CGM_ALARM_BASE = 105; // (105)
+ public static final int CGM_ALARM_CALIBRATION_ERROR = 106; //Calibration Error (106)
+ public static final int CGM_ALARM_SENSOR_END = 107; //Sensor End (107)
+ public static final int CGM_ALARM_CHNAGE_SENSOR = 108; //Change Sensor (108)
+ public static final int CGM_ALARM_SENSOR_ERRO = 109; //Sensor Error (109)
+ public static final int CGM_ALARM_WEAK_SIGNAL = 112; //Weak Signal (112)
+ public static final int CGM_ALARM_LOST_SENSOR = 113; //Lost Sensor (113)
+ public static final int CGM_ALARM_HIGH_GLUCOSE_PREDICTED = 114; //High Glucose Predicted (114)
+ public static final int CGM_ALARM_LOW_GLUCOSE_PREDICTED = 115; //Low Glucose Predicted (115)
+
+}
Added: trunk/ggc-pump/src/ggc/pump/device/PumpAlarms.java
===================================================================
--- trunk/ggc-pump/src/ggc/pump/device/PumpAlarms.java (rev 0)
+++ trunk/ggc-pump/src/ggc/pump/device/PumpAlarms.java 2008-08-02 17:26:03 UTC (rev 462)
@@ -0,0 +1,78 @@
+package ggc.pump.device;
+
+import ggc.pump.manager.company.AbstractPumpCompany;
+
+
+/*
+ * GGC - GNU Gluco Control
+ *
+ * A pure java app to help you manage your diabetes.
+ *
+ * See AUTHORS for copyright information.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Filename: MeterInterface
+ * Purpose: This is interface class, used for meters. It should be primary implemented by protocol class, and
+ * protocol class should be used as super class for meter definitions. Each meter family "should"
+ * have it's own super class and one class for each meter.
+ *
+ * Author: andyrozman {and...@so...}
+ */
+
+
+public class PumpAlarms
+{
+
+ public static final int PUMP_ERROR_CARTRIDGE_EMPTY = 1; //__________________________151
+ public static final int PUMP_ERROR_BATTERY_DEPLETED =2;//__________________________152
+ public static final int PUMP_ERROR_AUTOMATIC_OFF =3; //_____________________________152
+ public static final int PUMP_ERROR_OCCLUSION = 4; // minimed 'No Delivery'=4, roche 'Occlusion'=4
+ public static final int PUMP_ERROR_END_OF_OPERATION = 5; //__________________________154
+ public static final int PUMP_ERROR_MECHANICAL_ERROR = 6; //_________________________155
+ public static final int PUMP_ERROR_ELECTRONIC_ERROR = 7; //_________________________156
+ public static final int PUMP_ERROR_POWER_INTERRUPT = 8; //__________________________157
+ public static final int PUMP_ERROR_CARTRIDGE_ERROR = 10; // _________________________158
+ public static final int PUMP_ERROR_SET_NOTz_PRIMED = 11; //___________________________158
+ public static final int PUMP_ERROR_DATA_INTERRUPTED = 12; //_________________________159
+ public static final int PUMP_ERROR_LANGUAGE_ERROR = 13; //__________________________160
+ public static final int PUMP_ERROR_INSULIN_CHANGED = 14; //__________________________
+
+
+
+/*
+ *
+ * Minimed
+
+ No Delivery (4)
+
+
+
+ Sensor Alert: High Glucose (101)
+ Sensor Alert: Low Glucose (102)
+ Sensor Alert: Meter BG Now (104)
+ Sensor Alarm (105)
+ Sensor Alert: Calibration Error (106)
+ Sensor Alert: Sensor End (107)
+ Sensor Alert: Change Sensor (108)
+ Sensor Alert: Sensor Error (109)
+ Sensor Alert: Weak Signal (112)
+ Sensor Alert: Lost Sensor (113)
+ Sensor Alert: High Glucose Predicted (114)
+ Sensor Alert: Low Glucose Predicted (115)
+*/
+
+
+}
Added: trunk/ggc-pump/src/ggc/pump/device/PumpEvents.java
===================================================================
--- trunk/ggc-pump/src/ggc/pump/device/PumpEvents.java (rev 0)
+++ trunk/ggc-pump/src/ggc/pump/device/PumpEvents.java 2008-08-02 17:26:03 UTC (rev 462)
@@ -0,0 +1,52 @@
+package ggc.pump.device;
+
+import ggc.pump.manager.company.AbstractPumpCompany;
+
+
+/*
+ * GGC - GNU Gluco Control
+ *
+ * A pure java app to help you manage your diabetes.
+ *
+ * See AUTHORS for copyright information.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Filename: MeterInterface
+ * Purpose: This is interface class, used for meters. It should be primary implemented by protocol class, and
+ * protocol class should be used as super class for meter definitions. Each meter family "should"
+ * have it's own super class and one class for each meter.
+ *
+ * Author: andyrozman {and...@so...}
+ */
+
+
+public class PumpEvents
+{
+
+ public final static int PUMP_ALARM_CARTRIDGE_LOW = 1;
+
+ public final static int PUMP_ALARM_BATTERY_LOW = 2;
+ public final static int PUMP_ALARM_REVIEW_DATETIME = 3;
+ public final static int PUMP_ALARM_ALARM_CLOCK = 4;
+ public final static int PUMP_ALARM_PUMP_TIMER = 5;
+ public final static int PUMP_ALARM_TBR_CANCELED = 6;
+ public final static int PUMP_ALARM_TBR_OVER = 7;
+ public final static int PUMP_ALARM_BOLUS_CANCELED = 8;
+
+
+
+
+}
Added: trunk/ggc-pump/src/ggc/pump/device/PumpReport.java
===================================================================
--- trunk/ggc-pump/src/ggc/pump/device/PumpReport.java (rev 0)
+++ trunk/ggc-pump/src/ggc/pump/device/PumpReport.java 2008-08-02 17:26:03 UTC (rev 462)
@@ -0,0 +1,42 @@
+package ggc.pump.device;
+
+import ggc.pump.manager.company.AbstractPumpCompany;
+
+
+/*
+ * GGC - GNU Gluco Control
+ *
+ * A pure java app to help you manage your diabetes.
+ *
+ * See AUTHORS for copyright information.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Filename: MeterInterface
+ * Purpose: This is interface class, used for meters. It should be primary implemented by protocol class, and
+ * protocol class should be used as super class for meter definitions. Each meter family "should"
+ * have it's own super class and one class for each meter.
+ *
+ * Author: andyrozman {and...@so...}
+ */
+
+
+public class PumpReport
+{
+
+
+
+
+}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2008-08-12 12:12:40
|
Revision: 475
http://ggc.svn.sourceforge.net/ggc/?rev=475&view=rev
Author: andyrozman
Date: 2008-08-12 12:12:48 +0000 (Tue, 12 Aug 2008)
Log Message:
-----------
Added Paths:
-----------
trunk/ggc-plugin_base/
trunk/ggc-plugin_base/src/
trunk/ggc-plugin_base/src/ggc/
trunk/ggc-plugin_base/src/ggc/plugin/
trunk/ggc-plugin_base/src/ggc/plugin/list/
trunk/ggc-plugin_base/src/ggc/plugin/list/BaseListAbstractPanel.java
trunk/ggc-plugin_base/src/ggc/plugin/list/BaseListBrowserPanel.java
trunk/ggc-plugin_base/src/ggc/plugin/list/BaseListDialog.java
trunk/ggc-plugin_base/src/ggc/plugin/list/BaseListEntry.java
trunk/ggc-plugin_base/src/ggc/plugin/list/BaseListMainPanel.java
trunk/ggc-plugin_base/src/ggc/plugin/list/BaseListModel.java
trunk/ggc-plugin_base/src/ggc/plugin/list/BaseListRoot.java
trunk/ggc-plugin_base/src/ggc/plugin/util/
trunk/ggc-plugin_base/src/ggc/plugin/util/DataAccessPlugInBase.java
Added: trunk/ggc-plugin_base/src/ggc/plugin/list/BaseListAbstractPanel.java
===================================================================
--- trunk/ggc-plugin_base/src/ggc/plugin/list/BaseListAbstractPanel.java (rev 0)
+++ trunk/ggc-plugin_base/src/ggc/plugin/list/BaseListAbstractPanel.java 2008-08-12 12:12:48 UTC (rev 475)
@@ -0,0 +1,43 @@
+/*
+ * GGC - GNU Gluco Control
+ *
+ * A pure java app to help you manage your diabetes.
+ *
+ * See AUTHORS for copyright information.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Filename: GGCTreeRoot
+ * Purpose: Used for holding tree information for nutrition and meals
+ *
+ * Author: andyrozman
+ */
+
+package ggc.plugin.list;
+
+import javax.swing.JPanel;
+
+
+public abstract class BaseListAbstractPanel extends JPanel
+{
+
+ /**
+ *
+ */
+ private static final long serialVersionUID = -419549921018198285L;
+
+ public abstract void setData(Object obj);
+
+}
Added: trunk/ggc-plugin_base/src/ggc/plugin/list/BaseListBrowserPanel.java
===================================================================
--- trunk/ggc-plugin_base/src/ggc/plugin/list/BaseListBrowserPanel.java (rev 0)
+++ trunk/ggc-plugin_base/src/ggc/plugin/list/BaseListBrowserPanel.java 2008-08-12 12:12:48 UTC (rev 475)
@@ -0,0 +1,278 @@
+/*
+ * GGC - GNU Gluco Control
+ *
+ * A pure java app to help you manage your diabetes.
+ *
+ * See AUTHORS for copyright information.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Filename: GGCTreeRoot
+ * Purpose: Used for holding tree information for nutrition and meals
+ *
+ * Author: andyrozman
+ */
+
+package ggc.plugin.list;
+
+import ggc.plugin.util.DataAccessPlugInBase;
+
+import java.awt.Color;
+import java.awt.Font;
+
+import javax.swing.JButton;
+import javax.swing.JEditorPane;
+import javax.swing.JLabel;
+import javax.swing.JScrollPane;
+
+import com.atech.graphics.components.web.MiniBrowserPanel;
+import com.atech.i18n.I18nControlAbstract;
+
+
+
+public class BaseListBrowserPanel extends BaseListAbstractPanel
+{
+
+ static final long serialVersionUID = 0L;
+
+ I18nControlAbstract ic = null;
+ DataAccessPlugInBase m_da = null;
+ JEditorPane editor;
+
+ Font font_big, font_normal, font_normal_b;
+ JLabel label, label_test;
+ JButton button;
+
+ MiniBrowserPanel mbp;
+
+ BaseListDialog m_dialog = null;
+
+
+
+ public BaseListBrowserPanel(BaseListDialog dia)
+ {
+
+ super();
+
+ m_dialog = dia;
+ m_da = dia.m_da;
+
+ font_big = m_da.getFont(DataAccessPlugInBase.FONT_BIG_BOLD);
+ font_normal_b = m_da.getFont(DataAccessPlugInBase.FONT_NORMAL_BOLD);
+ font_normal = m_da.getFont(DataAccessPlugInBase.FONT_NORMAL);
+
+ //createPanel();
+ //init();
+ initBrowser();
+
+ }
+
+
+ public void init()
+ {
+
+ System.out.println("init()");
+ this.setBounds(0,0,500,500);
+ this.setLayout(new java.awt.BorderLayout());
+
+ this.editor = new JEditorPane();
+
+
+ JScrollPane jScrollPane1 = new JScrollPane(this.editor);
+ //jScrollPane1.setPreferredSize(new java.awt.Dimension(13, 1200));
+
+ this.editor.setEditable(false);
+ this.editor.setContentType("text/html");
+ jScrollPane1.setViewportView(this.editor);
+ this.editor.setText("<html><body><font color=\"#CCCCCC\"><h1>Test</h1></font></body></html>");
+
+ this.add(jScrollPane1, java.awt.BorderLayout.CENTER);
+
+ this.editor.select(0,0);
+
+
+
+ }
+
+
+ public void initBrowser()
+ {
+
+ this.setBounds(0,0,582,565);
+ this.setLayout(null);
+
+ //MiniBrowserPanel mbp;
+
+ this.mbp = new MiniBrowserPanel();
+ this.mbp.setBounds(0,0,582,565);
+
+/*
+ JScrollPane jScrollPane1 = new JScrollPane(this.editor);
+ //jScrollPane1.setPreferredSize(new java.awt.Dimension(13, 1200));
+
+ this.editor.setEditable(false);
+ this.editor.setContentType("text/html");
+ jScrollPane1.setViewportView(this.editor);
+ this.editor.setText("<html><body><font color=\"#CCCCCC\"><h1>Test</h1></font></body></html>");
+
+ this.add(jScrollPane1, java.awt.BorderLayout.CENTER);
+
+ this.editor.select(0,0);
+*/
+ this.add(this.mbp, null); //, java.awt.BorderLayout.CENTER);
+
+ }
+
+
+ public void createPanel()
+ {
+
+
+ //this.setLayout(new java.awt.BorderLayout());
+ this.setLayout(null);
+
+ editor = new JEditorPane();
+
+
+ JScrollPane jScrollPane1 = new JScrollPane(editor);
+ jScrollPane1.setBounds(0,0,300,300);
+ jScrollPane1.setBackground(Color.blue);
+
+
+ //jScrollPane1.setPreferredSize(new java.awt.Dimension(13, 1200));
+
+ editor.setEditable(false);
+ editor.setContentType("text/html");
+ //jScrollPane1.setViewportView(editor);
+ editor.setText("<html><body><font color=\"#CCCCCC\"><h1>Test</h1></font></body></html>");
+
+ this.add(jScrollPane1, null);
+
+ //editor.select(0,0);
+
+
+
+ /*
+
+ this.setSize(460, 520);
+ this.setLayout(new BorderLayout());
+
+ this.editor = new JEditorPane();
+ this.editor.setContentType("html");
+ this.editor.s
+
+
+ JScrollPane scroll = new JScrollPane();
+ */
+
+ /*
+
+ Font fnt_18 = new Font("Times New Roman", Font.PLAIN, 14);
+
+ //String nut_db = nutrition_db[this.m_dialog.getType()];
+
+ String nut_db = "SSS";
+
+ label = new JLabel(ic.getMessage(nut_db));
+ label.setBounds(0, 35, 520, 40);
+ label.setFont(font_big);
+ label.setHorizontalAlignment(SwingConstants.CENTER);
+ this.add(label, null);
+
+
+ label = new JLabel(ic.getMessage(nut_db + "_DESC"));
+ label.setBounds(40, 120, 400, 250);
+ label.setVerticalAlignment(JLabel.TOP);
+ label.setFont(fnt_18);
+ this.add(label, null);
+
+
+ label_test = new JLabel(ic.getMessage("ADD_DIOCESE_DESC"));
+ label_test.setBounds(40, 330, 300, 60);
+ label_test.setFont(font_normal);
+ this.add(label_test, null);
+
+
+
+ label = new JLabel(ic.getMessage("EDIT_VIEW"));
+ label.setBounds(40, 280, 300, 30);
+ label.setFont(fnt_18);
+// this.add(label, null);
+
+ label = new JLabel(ic.getMessage("EDIT_VIEW_DESC"));
+ label.setBounds(40, 310, 300, 60);
+ //label.setFont(font_normal);
+// this.add(label, null);
+*/
+
+ return;
+ }
+
+
+ public void loadFile(String name)
+ {
+ String res = m_da.metersUrl.get(name);
+
+ String web = "http://localhost:88/meters/" + res;
+
+ System.out.println(web);
+
+
+ this.mbp.setPage(web);
+
+ /*
+ //abbott_diabetes_care.html
+ try
+ {
+ URL url = new URL("http://localhost:88/meters/" + res); //this.getClass().getResource("/html/abbott_diabetes_care.html");
+ InputStreamReader ins = new InputStreamReader(url.openStream());
+ BufferedReader br = new BufferedReader( ins );
+ String line;
+ StringBuffer sb = new StringBuffer();
+
+ while ((line = br.readLine())!=null)
+ {
+ sb.append(line);
+ }
+
+ //System.out.println("Sb: " + sb);
+
+ this.editor.setText(sb.toString());
+ //this.jEditorPane1.setText(sb.toString());
+ }
+ catch(Exception ex)
+ {
+ System.out.println("PumpListCompanyPanel::error reading. Ex: " + ex);
+ ex.printStackTrace();
+ }
+ */
+ }
+
+
+ public void setData(Object obj)
+ {
+ //System.out.println((String)obj);
+
+ //editor.setText("<html><body><font color=\"#CCCCCC\"><h1>" + (String)obj + "</h1></font></body></html>");
+ //editor.setText("<html><body><h1>" + (String)obj + "</h1></body></html>");
+
+ loadFile((String)obj);
+ }
+
+
+
+
+
+}
Added: trunk/ggc-plugin_base/src/ggc/plugin/list/BaseListDialog.java
===================================================================
--- trunk/ggc-plugin_base/src/ggc/plugin/list/BaseListDialog.java (rev 0)
+++ trunk/ggc-plugin_base/src/ggc/plugin/list/BaseListDialog.java 2008-08-12 12:12:48 UTC (rev 475)
@@ -0,0 +1,434 @@
+/*
+ * GGC - GNU Gluco Control
+ *
+ * A pure java app to help you manage your diabetes.
+ *
+ * See AUTHORS for copyright information.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Filename: NutritionTreeDialog
+ * Purpose: Main class for displaying nutrition information.
+ *
+ * Author: andyrozman
+ */
+
+package ggc.plugin.list;
+
+import ggc.plugin.util.DataAccessPlugInBase;
+
+import java.awt.Dimension;
+import java.awt.GridLayout;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+
+import javax.swing.JDialog;
+import javax.swing.JFrame;
+import javax.swing.JPanel;
+import javax.swing.JScrollPane;
+import javax.swing.JSplitPane;
+import javax.swing.JTree;
+import javax.swing.event.TreeSelectionEvent;
+import javax.swing.event.TreeSelectionListener;
+import javax.swing.tree.TreeSelectionModel;
+
+import com.atech.i18n.I18nControlAbstract;
+
+
+
+public class BaseListDialog extends JDialog implements TreeSelectionListener, ActionListener
+{
+ static final long serialVersionUID = 0L;
+
+
+ private JPanel mainPane;
+ private JTree tree;
+
+ public DataAccessPlugInBase m_da = null;
+
+
+// private static boolean playWithLineStyle = false;
+// private static String lineStyle = "Horizontal";
+
+// private static boolean useSystemLookAndFeel = false;
+
+
+ private I18nControlAbstract ic = null;
+ public BaseListAbstractPanel panels[] = null;
+// x private int selectedPanel = 0;
+
+// addMouseListener(this);
+// add(pop);
+
+ BaseListRoot m_root = null;
+
+
+ public BaseListDialog(DataAccessPlugInBase da)
+ {
+
+ super(new JFrame(), "", true);
+ //super((JDialog)null, "", true);
+
+ m_da = da;
+ ic = m_da.m_i18n;
+
+ m_root = new BaseListRoot(m_da);
+
+ //this.setResizable(false);
+ this.setBounds(80, 50, 800, 600);
+ setTitle();
+
+ JPanel panel = new JPanel();
+ panel.setLayout(new GridLayout(1,0));
+
+ //this.pop.s
+ //add(pop);
+
+
+ //Create a tree that allows one selection at a time.
+ tree = new JTree();
+ tree.getSelectionModel().setSelectionMode(TreeSelectionModel.SINGLE_TREE_SELECTION);
+ this.setTreeModel(tree);
+ //tree.setModel(new NutritionTreeModel(m_da.m_nutrition_treeroot));
+ tree.addTreeSelectionListener(this);
+ //tree.addMouseListener(this);
+
+
+ JScrollPane treeView = new JScrollPane(tree);
+
+ mainPane = new JPanel();
+ mainPane.setLayout(null);
+
+ //Add the scroll panes to a split pane.
+ JSplitPane splitPane = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT/*.VERTICAL_SPLIT*/);
+ splitPane.setTopComponent(treeView);
+ splitPane.setBottomComponent(mainPane);
+
+ Dimension minimumSize = new Dimension(100, 50);
+ mainPane.setMinimumSize(minimumSize);
+ treeView.setMinimumSize(minimumSize);
+ splitPane.setDividerLocation(200); //XXX: ignored in some releases
+ //of Swing. bug 4101306
+ splitPane.setPreferredSize(new Dimension(500, 300));
+
+ panel.add(splitPane);
+
+ createPanels();
+ this.add(panel);
+ makePanelVisible(0);
+
+ this.setVisible(true);
+
+ }
+
+
+
+ public void setTitle()
+ {
+ this.setTitle(m_da.getWebListerTitle());
+ }
+
+ public void setTreeModel(JTree tree)
+ {
+ tree.setModel(new BaseListModel(this.m_root));
+ }
+
+
+ public void createPanels()
+ {
+ panels = new BaseListAbstractPanel[2];
+
+ panels[0] = new BaseListMainPanel(this);
+ panels[1] = new BaseListBrowserPanel(this);
+
+ for(int i = 0; i < panels.length ; i++)
+ {
+ mainPane.add(panels[i]);
+ }
+
+ makePanelVisible(0);
+
+ }
+
+ public static final int PANEL_MAIN = 0;
+ public static final int PANEL_BROWSER = 1;
+
+
+
+ /**
+ * Makes selected panel visible
+ */
+ public void makePanelVisible(int num)
+ {
+//x selectedPanel = num;
+
+ for(int i = 0; i < panels.length; i++)
+ if(i == num)
+ panels[i].setVisible(true);
+ else
+ panels[i].setVisible(false);
+ }
+
+
+ Object selected_last_path = null;
+
+ /** Required by TreeSelectionListener interface. */
+ public void valueChanged(TreeSelectionEvent e)
+ {
+
+ this.selected_last_path = tree.getLastSelectedPathComponent();
+
+ //this.displayPanel(1);
+
+ if (this.selected_last_path instanceof BaseListRoot)
+ {
+ makePanelVisible(BaseListDialog.PANEL_MAIN);
+ }
+ else if (this.selected_last_path instanceof String)
+ {
+ makePanelVisible(BaseListDialog.PANEL_BROWSER);
+ this.panels[BaseListDialog.PANEL_BROWSER].setData(this.selected_last_path);
+ }
+
+
+ /*
+ if (tree.getLastSelectedPathComponent() instanceof GGCTreeRoot)
+ {
+ makePanelVisible(NutritionTreeDialog.PANEL_MAIN);
+ //System.out.println("NutritionTreeDialog::valueChanged:: NOT IMPLEMENTED");
+ //Diocese dio = (Diocese)tree.getLastSelectedPathComponent();
+ //((ViewDiocesePanel)panels[DioceseCfgDialog.PANEL_VIEW_DIOCESE]).setData((DioceseH)dio); //node2.getObject());
+ }
+ else if (tree.getLastSelectedPathComponent() instanceof FoodGroup)
+ {
+ makePanelVisible(NutritionTreeDialog.PANEL_FOODGROUP);
+ this.panels[NutritionTreeDialog.PANEL_FOODGROUP].setData(tree.getLastSelectedPathComponent());
+ }
+ else if (tree.getLastSelectedPathComponent() instanceof FoodDescription)
+ {
+ makePanelVisible(NutritionTreeDialog.PANEL_FOOD);
+ this.panels[NutritionTreeDialog.PANEL_FOOD].setData(tree.getLastSelectedPathComponent());
+ }
+*/
+
+/*
+ if (panels[selectedPanel] instanceof EditablePanel)
+ {
+ EditablePanel p = (EditablePanel)panels[selectedPanel];
+ if (p.hasDataChanged())
+ {
+ if (!p.saveData())
+ return;
+ }
+ }
+
+
+ if (tree.getLastSelectedPathComponent() instanceof Diocese)
+ {
+ makePanelVisible(DioceseCfgDialog.PANEL_VIEW_DIOCESE);
+ Diocese dio = (Diocese)tree.getLastSelectedPathComponent();
+ ((ViewDiocesePanel)panels[DioceseCfgDialog.PANEL_VIEW_DIOCESE]).setData((DioceseH)dio); //node2.getObject());
+ }
+ else if (tree.getLastSelectedPathComponent() instanceof Parish)
+ {
+ makePanelVisible(DioceseCfgDialog.PANEL_VIEW_PARISH);
+ Parish pi = (Parish)tree.getLastSelectedPathComponent();
+ ((ViewParishPanel)panels[DioceseCfgDialog.PANEL_VIEW_PARISH]).setData((ParishH)pi);
+ }
+ else if (tree.getLastSelectedPathComponent() instanceof ParishPerson)
+ {
+ ParishPerson pp = (ParishPerson)tree.getLastSelectedPathComponent();
+ makePanelVisible(DioceseCfgDialog.PANEL_VIEW_PARISH_PERSONAL);
+ ((ViewParishPersonalPanel)panels[DioceseCfgDialog.PANEL_VIEW_PARISH_PERSONAL]).setData((ParishH)pp.getParish());
+ }
+ else if (tree.getLastSelectedPathComponent() instanceof DiocesePerson)
+ {
+ DiocesePerson pp = (DiocesePerson)tree.getLastSelectedPathComponent();
+ makePanelVisible(DioceseCfgDialog.PANEL_VIEW_DIOCESE_PERSONAL);
+ ((ViewDiocesePanel)panels[DioceseCfgDialog.PANEL_VIEW_DIOCESE_PERSONAL]).setData((DioceseH)pp.getDiocese());
+ }
+ else
+ {
+ System.out.println("DioceseCfgDialog::valueChanged::UnknownAction");
+ }
+*/
+ }
+
+ public static int PANEL_VIEW = 0;
+ public static int PANEL_EDIT = 1;
+ public static int PANEL_ADD = 2;
+ public static int PANEL_ADD_ITEM = 3;
+
+
+
+ private void displayPanel(int special_action)
+ {
+
+ /*
+ //System.out.println()
+
+ if (this.selected_last_path instanceof GGCTreeRoot)
+ {
+ makePanelVisible(NutritionTreeDialog.PANEL_MAIN);
+ }
+ else if (this.selected_last_path instanceof FoodGroup)
+ {
+ if (special_action == NutritionTreeDialog.PANEL_VIEW)
+ {
+ makePanelVisible(NutritionTreeDialog.PANEL_FOODGROUP);
+ this.panels[NutritionTreeDialog.PANEL_FOODGROUP].setData(this.selected_last_path);
+ }
+ else if (special_action == NutritionTreeDialog.PANEL_EDIT)
+ {
+ makePanelVisible(NutritionTreeDialog.PANEL_FOODGROUP_EDIT);
+ this.panels[NutritionTreeDialog.PANEL_FOODGROUP_EDIT].setData(this.selected_last_path);
+
+ //System.out.println("FoodGroup Edit failed");
+ }
+ else if (special_action == NutritionTreeDialog.PANEL_ADD)
+ {
+ //System.out.println("FoodGroup Add Group failed");
+ makePanelVisible(NutritionTreeDialog.PANEL_FOODGROUP_EDIT);
+ this.panels[NutritionTreeDialog.PANEL_FOODGROUP_EDIT].setParent(this.selected_last_path);
+ }
+ else
+ {
+ //System.out.println("FoodGroup Add Item failed");
+ makePanelVisible(NutritionTreeDialog.PANEL_FOOD_EDIT);
+ this.panels[NutritionTreeDialog.PANEL_FOOD_EDIT].setParent(this.selected_last_path);
+ }
+ }
+ else if (this.selected_last_path instanceof FoodDescription)
+ {
+ if (special_action == NutritionTreeDialog.PANEL_VIEW)
+ {
+ makePanelVisible(NutritionTreeDialog.PANEL_FOOD);
+ this.panels[NutritionTreeDialog.PANEL_FOOD].setData(this.selected_last_path);
+ }
+ else if (special_action == NutritionTreeDialog.PANEL_EDIT)
+ {
+ System.out.println("FoodDescription Edit failed");
+ }
+ else
+ {
+ System.out.println("FoodDescription Add failed");
+ }
+
+ }
+ */
+ }
+
+
+
+
+
+
+
+ boolean made = false;
+ int menu_prev_type = 0;
+
+
+
+ public int getTreeItemType()
+ {
+/*
+ if (this.mouse_selected_object instanceof GGCTreeRoot)
+ {
+ return 1;
+ }
+ else
+ {
+ if (this.m_tree_type==2)
+ {
+ if (this.mouse_selected_object instanceof FoodGroup)
+ return 2;
+ else
+ return 3;
+ }
+ else if (this.m_tree_type==3)
+ {
+ if (this.mouse_selected_object instanceof MealGroup)
+ return 2;
+ else
+ return 3;
+
+ }
+ else
+ {
+ System.out.println("Error on mouse click: Wrong type:" + this.mouse_selected_object);
+ return -1;
+ }
+
+ }
+ //else
+ */
+
+ return 0;
+
+ }
+
+
+ /*
+ public static void main(String args[])
+ {
+ DataAccessPlugInBase da = DataAccessPump.getInstance();
+
+
+
+ new PumpListDialog(da);
+
+ }
+*/
+
+ public void actionPerformed(ActionEvent ae)
+ {
+ /*
+ // TODO Auto-generated method stub
+ //System.out.println("Action performed, NOT handled");
+
+ String command = ae.getActionCommand();
+
+ if (command.equals("close"))
+ {
+ }
+ else if (command.equals("view"))
+ {
+ this.selected_last_path = this.mouse_selected_object;
+ this.displayPanel(NutritionTreeDialog.PANEL_VIEW);
+ }
+ else if (command.equals("add_item"))
+ {
+ this.selected_last_path = this.mouse_selected_object;
+ this.displayPanel(NutritionTreeDialog.PANEL_ADD_ITEM);
+ }
+ else if (command.equals("add_group"))
+ {
+ this.selected_last_path = this.mouse_selected_object;
+ this.displayPanel(NutritionTreeDialog.PANEL_ADD);
+ }
+ else if ((command.equals("edit_item")) ||
+ (command.equals("edit_group")))
+ {
+ this.selected_last_path = this.mouse_selected_object;
+ this.displayPanel(NutritionTreeDialog.PANEL_EDIT);
+ }
+
+ */
+
+ }
+
+
+
+}
Added: trunk/ggc-plugin_base/src/ggc/plugin/list/BaseListEntry.java
===================================================================
--- trunk/ggc-plugin_base/src/ggc/plugin/list/BaseListEntry.java (rev 0)
+++ trunk/ggc-plugin_base/src/ggc/plugin/list/BaseListEntry.java 2008-08-12 12:12:48 UTC (rev 475)
@@ -0,0 +1,61 @@
+/*
+ * GGC - GNU Gluco Control
+ *
+ * A pure java app to help you manage your diabetes.
+ *
+ * See AUTHORS for copyright information.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Filename: GGCTreeRoot
+ * Purpose: Used for holding tree information for nutrition and meals
+ *
+ * Author: andyrozman
+ */
+
+package ggc.plugin.list;
+
+
+
+
+public class BaseListEntry
+{
+
+ public static final int STATUS_NONE = 0;
+ public static final int STATUS_DONE = 1;
+ public static final int STATUS_PLANNED = 2;
+ public static final int STATUS_NOTPLANNED = 3;
+
+
+ public String name;
+ public String page;
+ public int status;
+
+
+ public BaseListEntry()
+ {
+ }
+
+
+ public BaseListEntry(String name, String page, int status)
+ {
+ this.name = name;
+ this.page = page;
+ this.status = status;
+ }
+
+
+
+}
Added: trunk/ggc-plugin_base/src/ggc/plugin/list/BaseListMainPanel.java
===================================================================
--- trunk/ggc-plugin_base/src/ggc/plugin/list/BaseListMainPanel.java (rev 0)
+++ trunk/ggc-plugin_base/src/ggc/plugin/list/BaseListMainPanel.java 2008-08-12 12:12:48 UTC (rev 475)
@@ -0,0 +1,88 @@
+package ggc.plugin.list;
+
+//package ggc.gui.nutrition.panels;
+
+//import ggc.gui.nutrition.NutritionTreeDialog;
+import ggc.plugin.util.DataAccessPlugInBase;
+
+import java.awt.Font;
+
+import javax.swing.JButton;
+import javax.swing.JLabel;
+import javax.swing.SwingConstants;
+
+import com.atech.i18n.I18nControlAbstract;
+
+
+// WORK IN PROGRESS, PLEASE DO NOT TOUCH
+// andyrozman
+
+
+public class BaseListMainPanel extends BaseListAbstractPanel //JPanel
+{
+ static final long serialVersionUID = 0L;
+
+
+ I18nControlAbstract m_ic = null;
+ DataAccessPlugInBase m_da = null;
+
+ Font font_big, font_normal, font_normal_b;
+ JLabel label;
+ JButton button;
+
+ BaseListDialog m_dialog = null;
+
+
+
+ public BaseListMainPanel(BaseListDialog dia)
+ {
+
+ super();
+
+ m_dialog = dia;
+ m_da = dia.m_da;
+ m_ic = m_da.getI18nControlInstance();
+
+ font_big = m_da.getFont(DataAccessPlugInBase.FONT_BIG_BOLD);
+ font_normal_b = m_da.getFont(DataAccessPlugInBase.FONT_NORMAL_BOLD);
+ font_normal = m_da.getFont(DataAccessPlugInBase.FONT_NORMAL);
+
+ createPanel();
+
+ }
+
+
+ public void createPanel()
+ {
+
+ this.setSize(460, 520);
+ this.setLayout(null);
+
+ Font fnt_18 = new Font("Times New Roman", Font.PLAIN, 14);
+
+ label = new JLabel(m_da.getWebListerTitle());
+ label.setBounds(0, 35, 520, 40);
+ label.setFont(font_big);
+ label.setHorizontalAlignment(SwingConstants.CENTER);
+ this.add(label, null);
+
+
+ label = new JLabel(m_da.getWebListerDescription());
+ label.setBounds(40, 120, 400, 250);
+ label.setVerticalAlignment(JLabel.TOP);
+ label.setFont(fnt_18);
+ this.add(label, null);
+
+ return;
+ }
+
+
+ public void setData(Object obj)
+ {
+ }
+
+
+}
+
+
+
Added: trunk/ggc-plugin_base/src/ggc/plugin/list/BaseListModel.java
===================================================================
--- trunk/ggc-plugin_base/src/ggc/plugin/list/BaseListModel.java (rev 0)
+++ trunk/ggc-plugin_base/src/ggc/plugin/list/BaseListModel.java 2008-08-12 12:12:48 UTC (rev 475)
@@ -0,0 +1,177 @@
+/*
+ * GGC - GNU Gluco Control
+ *
+ * A pure java app to help you manage your diabetes.
+ *
+ * See AUTHORS for copyright information.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Filename: NutritionTreeModel
+ * Purpose: This is tree model for displaying nutrition information.
+ *
+ * Author: andyrozman
+ */
+
+
+package ggc.plugin.list;
+
+
+import java.util.Vector;
+
+import javax.swing.event.TreeModelEvent;
+import javax.swing.event.TreeModelListener;
+import javax.swing.tree.TreeModel;
+import javax.swing.tree.TreePath;
+
+public class BaseListModel implements TreeModel
+{
+
+ private boolean m_debug = false;
+ private Vector<TreeModelListener> treeModelListeners = new Vector<TreeModelListener>();
+ private BaseListRoot rootObj = null;
+
+
+ public BaseListModel(BaseListRoot rt)
+ {
+ rootObj = rt;
+ }
+
+
+ public void debug(String deb)
+ {
+ if (m_debug)
+ System.out.println(deb);
+ }
+
+
+
+ //////////////// Fire events //////////////////////////////////////////////
+
+ /**
+ * The only event raised by this model is TreeStructureChanged with the
+ * root as path, i.e. the whole tree has changed.
+ */
+ protected void fireTreeStructureChanged(BaseListRoot oldRoot)
+ {
+ int len = treeModelListeners.size();
+ TreeModelEvent e = new TreeModelEvent(this,
+ new Object[] {oldRoot});
+ for (int i = 0; i < len; i++)
+ {
+ (treeModelListeners.elementAt(i)).treeStructureChanged(e);
+ }
+ }
+
+
+ //////////////// TreeModel interface implementation ///////////////////////
+
+ /**
+ * Adds a listener for the TreeModelEvent posted after the tree changes.
+ */
+ public void addTreeModelListener(TreeModelListener l)
+ {
+ treeModelListeners.addElement(l);
+ }
+
+
+ /**
+ * Returns the child of parent at index index in the parent's child array.
+ */
+ public Object getChild(Object parent, int index)
+ {
+
+ debug("getChild: " + index);
+
+ if (parent instanceof BaseListRoot)
+ {
+ return rootObj.children.get(index);
+ }
+ else if (parent instanceof String)
+ {
+ return null;
+ }
+ else
+ return null;
+
+ }
+
+ /**
+ * Returns the number of children of parent.
+ */
+ public int getChildCount(Object parent)
+ {
+ debug("Parent (getChildCount()): " + parent);
+
+ if (parent instanceof BaseListRoot)
+ {
+ return rootObj.children.size();
+ }
+ else
+ return 0;
+
+ }
+
+ /**
+ * Returns the index of child in parent.
+ */
+ public int getIndexOfChild(Object parent, Object child)
+ {
+ debug("getIndexofChild: ");
+
+ if (parent instanceof BaseListRoot)
+ {
+ return rootObj.children.indexOf(child);
+ }
+ else
+ return -1;
+
+ }
+
+ /**
+ * Returns the root of the tree.
+ */
+ public Object getRoot()
+ {
+ return rootObj;
+ }
+
+ /**
+ * Returns true if node is a leaf.
+ */
+ public boolean isLeaf(Object node)
+ {
+ return (getChildCount(node)==0);
+ }
+
+
+ /**
+ * Removes a listener previously added with addTreeModelListener().
+ */
+ public void removeTreeModelListener(TreeModelListener l)
+ {
+ treeModelListeners.removeElement(l);
+ }
+
+ /**
+ * Messaged when the user has altered the value for the item
+ * identified by path to newValue. Not used by this model.
+ */
+ public void valueForPathChanged(TreePath path, Object newValue)
+ {
+ System.out.println("*** valueForPathChanged : " + path + " --> " + newValue);
+ }
+
+}
Added: trunk/ggc-plugin_base/src/ggc/plugin/list/BaseListRoot.java
===================================================================
--- trunk/ggc-plugin_base/src/ggc/plugin/list/BaseListRoot.java (rev 0)
+++ trunk/ggc-plugin_base/src/ggc/plugin/list/BaseListRoot.java 2008-08-12 12:12:48 UTC (rev 475)
@@ -0,0 +1,55 @@
+/*
+ * GGC - GNU Gluco Control
+ *
+ * A pure java app to help you manage your diabetes.
+ *
+ * See AUTHORS for copyright information.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Filename: GGCTreeRoot
+ * Purpose: Used for holding tree information for nutrition and meals
+ *
+ * Author: andyrozman
+ */
+
+package ggc.plugin.list;
+
+import ggc.plugin.util.DataAccessPlugInBase;
+
+import java.util.ArrayList;
+
+public class BaseListRoot
+{
+
+ public ArrayList<String> children = null;
+ DataAccessPlugInBase m_da;
+
+
+ public BaseListRoot(DataAccessPlugInBase da)
+ {
+ m_da = da;
+ this.children = m_da.getWebListerItemsTitles();
+ }
+
+
+ @Override
+ public String toString()
+ {
+ return m_da.getWebListerTitle();
+ }
+
+
+}
Added: trunk/ggc-plugin_base/src/ggc/plugin/util/DataAccessPlugInBase.java
===================================================================
--- trunk/ggc-plugin_base/src/ggc/plugin/util/DataAccessPlugInBase.java (rev 0)
+++ trunk/ggc-plugin_base/src/ggc/plugin/util/DataAccessPlugInBase.java 2008-08-12 12:12:48 UTC (rev 475)
@@ -0,0 +1,1096 @@
+/*
+ * GGC - GNU Gluco Control
+ *
+ * A pure java app to help you manage your diabetes.
+ *
+ * See AUTHORS for copyright information.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Filename: DataAccessMeter
+ * Purpose: Used for utility works and static data handling (this is singelton
+ * class which holds all our definitions, so that we don't need to create them
+ * again for each class.
+ *
+ * Author: andyrozman
+ */
+
+package ggc.plugin.util;
+
+import java.awt.Color;
+import java.awt.Component;
+import java.awt.Font;
+import java.awt.Image;
+import java.io.ByteArrayOutputStream;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.math.BigDecimal;
+import java.math.MathContext;
+import java.math.RoundingMode;
+import java.text.DecimalFormat;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.Enumeration;
+import java.util.GregorianCalendar;
+import java.util.Hashtable;
+import java.util.Properties;
+import java.util.Vector;
+
+import javax.swing.ImageIcon;
+import javax.swing.JFrame;
+import javax.swing.JLabel;
+
+import com.atech.i18n.I18nControlAbstract;
+import com.atech.utils.ATDataAccessAbstract;
+
+
+public abstract class DataAccessPlugInBase extends ATDataAccessAbstract
+{
+
+
+ public static final String pathPrefix = ".";
+
+ //public I18nControl m_i18n = null;
+
+// private static DataAccessMeter s_da = null; // This is handle to unique
+
+
+ public Font fonts[] = null;
+
+
+
+//xa private GGCProperties m_settings = null;
+
+ //private DbToolApplicationGGC m_configFile = null;
+// private ConfigurationManager m_cfgMgr = null;
+
+
+ public static DecimalFormat MmolDecimalFormat = new DecimalFormat("#0.0");
+
+ /**
+ * Which BG unit is used: BG_MGDL = mg/dl, BG_MMOL = mmol/l
+ */
+ public int m_BG_unit = BG_MGDL;
+
+ public String[] availableLanguages = { "English", "Deutsch", "Slovenski", };
+
+ public String[] avLangPostfix = { "en", "de", "si", };
+
+ public String[] bg_units = { "mg/dl", "mmol/l" };
+
+ public Hashtable<String,String> timeZones;
+
+ public Vector<String> time_zones_vector;
+
+// public static DecimalFormat MmolDecimalFormat = new DecimalFormat("#0.0");
+
+ public ImageIcon config_icons[] = null;
+/*
+ {
+ new ImageIcon("/icons/cfg_general.png"),
+ new ImageIcon("/icons/cfg_medical.png"),
+ new ImageIcon("icons/cfg_colors.png"),
+ new ImageIcon("icons/cfg_render.png"),
+ new ImageIcon("icons/cfg_meter.png"),
+ new ImageIcon("icons/cfg_print.png")
+ };
+*/
+/* public ImageIcon config_icons[] = {
+ new ImageIcon("images/cfg_db.gif"),
+ new ImageIcon("images/cfg_look.gif"),
+ new ImageIcon("images/cfg_myparish.gif"),
+ new ImageIcon("images/cfg_masses.gif"),
+ new ImageIcon("images/cfg_users.gif"),
+ new ImageIcon("images/cfg_lang.gif"),
+ new ImageIcon("images/cfg_web.gif"),
+ null
+ };
+
+ public String config_types[] = {
+ m_ic.getMessage("GENERAL"),
+ m_ic.getMessage("MEDICAL_DATA"),
+ m_ic.getMessage("COLORS_AND_FONTS"),
+ m_ic.getMessage("RENDERING_QUALITY"),
+ m_ic.getMessage("METER_CONFIGURATION"),
+ m_ic.getMessage("PRINTING")
+ };
+
+*/
+ public String[] options_yes_no = null;
+
+
+ JFrame m_main = null;
+
+
+ public Hashtable<String,String> metersUrl;
+ public ArrayList<String> metersNames;
+
+
+
+ // ********************************************************
+ // ****** Constructors and Access methods *****
+ // ********************************************************
+
+ // Constructor: DataAccessMeter
+ /**
+ *
+ * This is DataAccessMeter constructor; Since classes use Singleton Pattern,
+ * constructor is protected and can be accessed only with getInstance()
+ * method.<br><br>
+ *
+ */
+ public DataAccessPlugInBase(I18nControlAbstract i18n)
+ {
+ super(i18n); //I18nControl.getInstance());
+
+ this.loadTimeZones();
+
+ loadMetersTable();
+ loadConfigIcons();
+
+ checkPrerequisites();
+
+ }
+
+ // FIXME should be abstract
+ public void initSpecial()
+ {
+ }
+
+
+ // Method: getInstance
+ // Author: Andy
+ /**
+ *
+ * This method returns reference to OmniI18nControl object created, or if no
+ * object was created yet, it creates one.<br><br>
+ *
+ * @return Reference to OmniI18nControl object
+ *
+ */
+/* public static DataAccessMeter getInstance()
+ {
+ if (s_da == null)
+ s_da = new DataAccessMeter(null);
+ return s_da;
+ }
+
+ public static DataAccessMeter createInstance(JFrame main)
+ {
+ if (s_da == null)
+ {
+ //GGCDb db = new GGCDb();
+ s_da = new DataAccessMeter(main);
+//x s_da.setParent(main);
+ }
+
+ return s_da;
+ }
+*/
+
+
+
+ public void loadConfigIcons()
+ {
+ config_icons = new ImageIcon[5];
+ config_icons[0] = new ImageIcon(getImage("/icons/cfg_general.png", m_main));
+ config_icons[1] = new ImageIcon(getImage("/icons/cfg_medical.png", m_main));
+ config_icons[2] = new ImageIcon(getImage("/icons/cfg_print.png", m_main));
+ config_icons[3] = new ImageIcon(getImage("/icons/cfg_meter.png", m_main));
+ config_icons[4] = new ImageIcon(getImage("/icons/cfg_general.png", m_main));
+
+ }
+
+
+
+
+ /*
+ static public DataAccessMeter getInstance()
+ {
+ return m_da;
+ }
+ */
+
+ // Method: deleteInstance
+ /**
+ * This method sets handle to DataAccessMeter to null and deletes the instance. <br><br>
+ */
+ public void deleteInstance()
+ {
+ m_i18n = null;
+ }
+
+
+ public void loadMetersTable()
+ {
+
+ metersUrl = new Hashtable<String,String>();
+ metersNames = new ArrayList<String>();
+
+
+
+ metersNames.add("Abbott Diabetes Care");
+ metersUrl.put("Abbott Diabetes Care", "abbott.html");
+ metersNames.add("Bayer Diagnostics");
+ metersUrl.put("Bayer Diagnostics", "bayer.html");
+ metersNames.add("Diabetic Supply of Suncoast");
+ metersUrl.put("Diabetic Supply of Suncoast", "suncoast.html");
+ metersNames.add("Diagnostic Devices");
+ metersUrl.put("Diagnostic Devices", "prodigy.html");
+ metersNames.add("Arkray USA (formerly Hypoguard)");
+ metersUrl.put("Arkray USA (formerly Hypoguard)", "arkray.html");
+ metersNames.add("HealthPia America");
+ metersUrl.put("HealthPia America", "healthpia.html");
+ metersNames.add("Home Diagnostics");
+ metersUrl.put("Home Diagnostics", "home_diganostics.html");
+ metersNames.add("Lifescan");
+ metersUrl.put("Lifescan", "lifescan.html");
+ metersNames.add("Nova Biomedical");
+ metersUrl.put("Nova Biomedical", "nova_biomedical.html");
+ metersNames.add("Roche Diagnostics");
+ metersUrl.put("Roche Diagnostics", "roche.html");
+ metersNames.add("Sanvita");
+ metersUrl.put("Sanvita", "sanvita.html");
+ metersNames.add("U.S. Diagnostics");
+ metersUrl.put("U.S. Diagnostics", "us_diagnostics.html");
+ metersNames.add("WaveSense");
+ metersUrl.put("WaveSense", "wavesense.html");
+
+ }
+
+
+
+ /*
+ public void startDb(StatusBarL bar2)
+ {
+ GGCDbLoader loader = new GGCDbLoader(this, bar2);
+ loader.start();
+ } */
+/*
+ public GGCDb getDb()
+ {
+ return m_db;
+ }
+*/
+
+
+ public String weblister_title;
+
+
+ public abstract void createWebListerItems();
+
+
+ public String getWebListerTitle()
+ {
+ return this.weblister_title;
+ }
+
+
+ public String getWebListerDescription()
+ {
+ // return this.weblister_title;
+ return null;
+ }
+
+
+ public ArrayList<String> getWebListerItemsTitles()
+ {
+ return null;
+ }
+
+ public ArrayList<String> getWebListerItemsStatuses()
+ {
+ return null;
+ }
+
+
+
+
+ // ********************************************************
+ // ****** Abstract Methods *****
+ // ********************************************************
+
+
+
+ public String getApplicationName()
+ {
+ return "GGC_MeterTool";
+ }
+
+
+
+ public void checkPrerequisites()
+ {
+ }
+
+
+ public String getImagesRoot()
+ {
+ return "/icons/";
+ }
+
+
+ public void loadBackupRestoreCollection()
+ {
+ }
+
+
+
+
+
+ // ********************************************************
+ // ****** Fonts *****
+ // ********************************************************
+
+ public static final int FONT_BIG_BOLD = 0;
+
+ public static final int FONT_NORMAL = 1;
+
+ public static final int FONT_NORMAL_BOLD = 2;
+
+ public void loadFonts()
+ {
+ fonts = new Font[3];
+ fonts[0] = new Font("SansSerif", Font.BOLD, 22);
+ fonts[1] = new Font("SansSerif", Font.PLAIN, 12);
+ fonts[2] = new Font("SansSerif", Font.BOLD, 12);
+ }
+
+ public Font getFont(int font_id)
+ {
+ return fonts[font_id];
+ }
+
+
+
+ // ********************************************************
+ // ****** Icons *****
+ // ********************************************************
+
+
+
+
+ // ********************************************************
+ // ****** Db *****
+ // ********************************************************
+
+
+
+ // ********************************************************
+ // ****** Meters *****
+ // ********************************************************
+
+
+ // ********************************************************
+ // ****** Meters *****
+ // ********************************************************
+
+ public void loadTimeZones()
+ {
+ this.timeZones = new Hashtable<String,String>();
+
+ // Posible needed enchancment. We should probably list all ID's as values. On windows default ID can be different
+ // as in this table. We should add this names, if we encounter problems.
+
+ addTimeZoneEntry("(GMT+13:00) Nuku'alofa", "Pacific/Tongatapu");
+ addTimeZoneEntry("(GMT+12:00) Fiji, Kamchatka, Marshall Is.", "Pacific/Fiji");
+ addTimeZoneEntry("(GMT+12:00) Auckland, Wellington", "Pacific/Auckland");
+ addTimeZoneEntry("(GMT+11:00) Magadan, Solomon Is., New Caledonia", "Asia/Magadan");
+ addTimeZoneEntry("(GMT+10:00) Vladivostok", "Asia/Vladivostok");
+ addTimeZoneEntry("(GMT+10:00) Hobart", "Australia/Hobart");
+ addTimeZoneEntry("(GMT+10:00) Guam, Port Moresby", "Pacific/Guam");
+ addTimeZoneEntry("(GMT+10:00) Canberra, Melbourne, Sydney", "Australia/Sydney");
+ addTimeZoneEntry("(GMT+10:00) Brisbane", "Australia/Brisbane");
+ addTimeZoneEntry("(GMT+09:30) Adelaide", "Australia/Adelaide");
+ addTimeZoneEntry("(GMT+09:00) Yakutsk", "Asia/Yakutsk");
+ addTimeZoneEntry("(GMT+09:00) Seoul", "Asia/Seoul");
+ addTimeZoneEntry("(GMT+09:00) Osaka, Sapporo, Tokyo", "Asia/Tokyo");
+ addTimeZoneEntry("(GMT+08:00) Taipei", "Asia/Taipei");
+ addTimeZoneEntry("(GMT+08:00) Perth", "Australia/Perth");
+ addTimeZoneEntry("(GMT+08:00) Kuala Lumpur, Singapore", "Asia/Kuala_Lumpur");
+ addTimeZoneEntry("(GMT+08:00) Irkutsk, Ulaan Bataar", "Asia/Irkutsk");
+ addTimeZoneEntry("(GMT+08:00) Beijing, Chongqing, Hong Kong, Urumqi", "Asia/Hong_Kong");
+ addTimeZoneEntry("(GMT+07:00) Krasnoyarsk", "Asia/Krasnoyarsk");
+ addTimeZoneEntry("(GMT+07:00) Bangkok, Hanoi, Jakarta", "Asia/Bangkok");
+ addTimeZoneEntry("(GMT+06:30) Rangoon", "Asia/Rangoon");
+ addTimeZoneEntry("(GMT+06:00) Sri Jayawardenepura", "Asia/Colombo");
+ addTimeZoneEntry("(GMT+06:00) Astana, Dhaka", "Asia/Dhaka");
+ addTimeZoneEntry("(GMT+06:00) Almaty, Novosibirsk", "Asia/Almaty");
+ addTimeZoneEntry("(GMT+05:45) Kathmandu", "Asia/Katmandu");
+ addTimeZoneEntry("(GMT+05:30) Chennai, Kolkata, Mumbai, New Delhi", "Asia/Calcutta");
+ addTimeZoneEntry("(GMT+05:00) Islamabad, Karachi, Tashkent", "Asia/Karachi");
+ addTimeZoneEntry("(GMT+05:00) Ekaterinburg", "Asia/Yekaterinburg");
+ addTimeZoneEntry("(GMT+04:30) Kabul", "Asia/Kabul");
+ addTimeZoneEntry("(GMT+04:00) Baku, Tbilisi, Yerevan", "Asia/Baku");
+ addTimeZoneEntry("(GMT+04:00) Abu Dhabi, Muscat", "Asia/Dubai");
+ addTimeZoneEntry("(GMT+03:30) Tehran", "Asia/Tehran");
+ addTimeZoneEntry("(GMT+03:00) Nairobi", "Africa/Nairobi");
+ addTimeZoneEntry("(GMT+03:00) Moscow, St. Petersburg, Volgograd", "Europe/Moscow");
+ addTimeZoneEntry("(GMT+03:00) Kuwait, Riyadh", "Asia/Kuwait");
+ addTimeZoneEntry("(GMT+03:00) Baghdad", "Asia/Baghdad");
+ addTimeZoneEntry("(GMT+02:00) Jerusalem", "Asia/Jerusalem");
+ addTimeZoneEntry("(GMT+02:00) Helsinki, Kyiv, Riga, Sofia, Tallinn, Vilnius", "Europe/Helsinki");
+ addTimeZoneEntry("(GMT+02:00) Harare, Pretoria", "Africa/Harare");
+ addTimeZoneEntry("(GMT+02:00) Cairo", "Africa/Cairo");
+ addTimeZoneEntry("(GMT+02:00) Bucharest", "Europe/Bucharest");
+ addTimeZoneEntry("(GMT+02:00) Athens, Istanbul, Minsk", "Europe/Athens");
+ addTimeZoneEntry("(GMT+01:00) West Central Africa", "Africa/Lagos");
+ addTimeZoneEntry("(GMT+01:00) Sarajevo, Skopje, Warsaw, Zagreb", "Europe/Warsaw");
+ addTimeZoneEntry("(GMT+01:00) Brussels, Copenhagen, Madrid, Paris", "Europe/Brussels");
+ addTimeZoneEntry("(GMT+01:00) Belgrade, Bratislava, Budapest, Ljubljana, Prague", "Europe/Prague,Europe/Belgrade");
+ addTimeZoneEntry("(GMT+01:00) Amsterdam, Berlin, Bern, Rome, Stockholm, Vienna", "Europe/Amsterdam");
+ addTimeZoneEntry("(GMT) Casablanca, Monrovia", "Africa/Casablanca");
+ addTimeZoneEntry("(GMT) Greenwich Mean Time : Dublin, Edinburgh, Lisbon, London", "Europe/Dublin");
+ addTimeZoneEntry("(GMT-01:00) Azores", "Atlantic/Azores");
+ addTimeZoneEntry("(GMT-01:00) Cape Verde Is.", "Atlantic/Cape_Verde");
+ addTimeZoneEntry("(GMT-02:00) Mid-Atlantic", "Atlantic/South_Georgia");
+ addTimeZoneEntry("(GMT-03:00) Brasilia", "America/Sao_Paulo");
+ addTimeZoneEntry("(GMT-03:00) Buenos Aires, Georgetown", "America/Buenos_Aires");
+ addTimeZoneEntry("(GMT-03:00) Greenland", "America/Thule");
+ addTimeZoneEntry("(GMT-03:30) Newfoundland", "America/St_Johns");
+ addTimeZoneEntry("(GMT-04:00) Atlantic Time (Canada)", "America/Halifax");
+ addTimeZoneEntry("(GMT-04:00) Caracas, La Paz", "America/Caracas");
+ addTimeZoneEntry("(GMT-04:00) Santiago", "America/Santiago");
+ addTimeZoneEntry("(GMT-05:00) Bogota, Lima, Quito", "America/Bogota");
+ addTimeZoneEntry("(GMT-05:00) Eastern Time (US & Canada)", " America/New_York");
+ addTimeZoneEntry("(GMT-05:00) Indiana (East)", "America/Indianapolis");
+ addTimeZoneEntry("(GMT-06:00) Central America", "America/Costa_Rica");
+ addTimeZoneEntry("(GMT-06:00) Central Time (US & Canada)", "America/Chicago");
+ addTimeZoneEntry("(GMT-06:00) Guadalajara, Mexico City, Monterrey", "America/Mexico_City");
+ addTimeZoneEntry("(GMT-06:00) Saskatchewan", "America/Winnipeg");
+ addTimeZoneEntry("(GMT-07:00) Arizona", "America/Phoenix");
+ addTimeZoneEntry("(GMT-07:00) Chihuahua, La Paz, Mazatlan", "America/Tegucigalpa");
+ addTimeZoneEntry("(GMT-07:00) Mountain Time (US & Canada)", "America/Denver");
+ addTimeZoneEntry("(GMT-08:00) Pacific Time (US & Canada); Tijuana", "America/Los_Angeles");
+ addTimeZoneEntry("(GMT-09:00) Alaska", "America/Anchorage");
+ addTimeZoneEntry("(GMT-10:00) Hawaii", "Pacific/Honolulu");
+ addTimeZoneEntry("(GMT-11:00) Midway Island, Samoa", "Pacific/Apia");
+ addTimeZoneEntry("(GMT-12:00) International Date Line West", "MIT");
+
+
+ this.time_zones_vector = new Vector<String>();
+
+ for(Enumeration<String> en= this.timeZones.keys(); en.hasMoreElements(); )
+ {
+ this.time_zones_vector.add(en.nextElement());
+ }
+
+
+ }
+
+
+ public void addTimeZoneEntry(String long_desc, String keycode)
+ {
+ //SimpleConfigurationTZDialog.time_zones.put(long_desc, keycode);
+ //SimpleConfigurationTZDialog.time_zones_vector.add(long_desc);
+ }
+
+
+
+
+ // ********************************************************
+ // ****** Settings *****
+ // ********************************************************
+/*
+ public GGCProperties getSettings()
+ {
+ return this.m_settings;
+ }
+
+ public void loadSettingsFromDb()
+ {
+ this.m_settings.load();
+ }
+*/
+ public Color getColor(int color)
+ {
+ return new Color(color);
+ }
+/*
+ public ConfigurationManager getConfigurationManager()
+ {
+ return this.m_cfgMgr;
+ }
+*/
+
+ // ********************************************************
+ // ****** BG Measurement Type *****
+ // ********************************************************
+
+ public static final int BG_MGDL = 1;
+
+ public static final int BG_MMOL = 2;
+
+ public int getBGMeasurmentType()
+ {
+ return this.m_BG_unit;
+ }
+
+ public void setBGMeasurmentType(int type)
+ {
+ this.m_BG_unit = type;
+ }
+
+ private static final float MGDL_TO_MMOL_FACTOR = 0.0555f;
+
+ private static final float MMOL_TO_MGDL_FACTOR = 18.016f;
+
+ /**
+ * Depending on the return value of <code>getBGMeasurmentType()</code>, either
+ * return the mg/dl or the mmol/l value of the database's value. Default is mg/dl.
+ * @param dbValue - The database's value (in float)
+ * @return the BG in either mg/dl or mmol/l
+ */
+ public float getDisplayedBG(float dbValue)
+ {
+ switch (this.m_BG_unit)
+ {
+ case BG_MMOL:
+ // this POS should return a float rounded to 3 decimal places,
+ // if I understand the docu correctly
+ return (new BigDecimal(dbValue * MGDL_TO_MMOL_FACTOR,
+ new MathContext(3, RoundingMode.HALF_UP)).floatValue());
+ case BG_MGDL:
+ default:
+ return dbValue;
+ }
+ }
+
+ public float getBGValue(float bg_value)
+ {
+ switch (this.m_BG_unit)
+ {
+ case BG_MMOL:
+ return (bg_value * MGDL_TO_MMOL_FACTOR);
+ case BG_MGDL:
+ default:
+ return bg_value;
+ }
+ }
+
+
+ public float getBGValueByType(int type, float bg_value)
+ {
+ switch (type)
+ {
+ case BG_MMOL:
+ return (bg_value * MGDL_TO_MMOL_FACTOR);
+ case BG_MGDL:
+ default:
+ return bg_value;
+ }
+ }
+
+
+ public float getBGValueByType(int input_type, int output_type, float bg_value)
+ {
+
+ if (input_type==output_type)
+ return bg_value;
+ else
+ {
+ if (output_type==DataAccessPlugInBase.BG_MGDL)
+ {
+ return bg_value * DataAccessPlugInBase.MGDL_TO_MMOL_FACTOR;
+ }
+ else
+ {
+ return bg_value * DataAccessPlugInBase.MMOL_TO_MGDL_FACTOR;
+ }
+ }
+
+ }
+
+
+ public float getBGValueDifferent(int type, float bg_value)
+ {
+
+ if (type==DataAccessPlugInBase.BG_MGDL)
+ {
+ return bg_value * DataAccessPlugInBase.MGDL_TO_MMOL_FACTOR;
+ }
+ else
+ {
+ return bg_value * DataAccessPlugInBase.MMOL_TO_MGDL_FACTOR;
+ }
+ }
+
+
+
+ // ********************************************************
+ // ****** Parent handling (for UIs) *****
+ // ********************************************************
+
+
+
+ /**
+ * Utils
+ */
+
+
+ public Image getImage(String filename, Component cmp)
+ {
+ Image img;
+
+ InputStream is = this.getClass().getResourceAsStream(filename);
+
+ if (is==null)
+ System.out.println("Error reading image: "+filename);
+
+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
+ try
+ {
+ int c;
+ while ((c = is.read()) >=0)
+ baos.write(c);
+
+
+ //JDialog.getT
+ //JFrame.getToolkit();
+
+ if (cmp==null)
+ cmp = new JLabel();
+
+ img = cmp.getToolkit().createImage(baos.toByteArray());
+ }
+ catch (IOException ex)
+ {
+ ex.printStackTrace();
+ return null;
+ }
+ return img;
+ }
+
+
+
+ // ********************************************************
+ // ****** Look and Feel *****
+ // ********************************************************
+
+
+ public static String[] getLFData()
+ {
+ String out[] = new String[2];
+
+ try
+ {
+ Properties props = new Properties();
+
+ FileInputStream in = new FileInputStream("../data/GGC_Config.properties");
+ props.load(in);
+
+ out[0] = (String)props.get("LF_CLASS");
+ out[1] = (String)props.get("SKINLF_SELECTED");
+
+ return out;
+
+ }
+ catch(Exception ex)
+ {
+ System.out.println("DataAccessMeter::getLFData::Exception> " + ex);
+ return null;
+ }
+ }
+
+
+
+
+ // ********************************************************
+ // ****** Dates and Times Handling *****
+ // ********************************************************
+
+ public String getCurrentDateString()
+ {
+ GregorianCalendar gc = new GregorianCalendar();
+ return gc.get(Calendar.DAY_OF_MONTH) + "."
+ + (gc.get(Calendar.MONTH) + 1) + "." + gc.get(Calendar.YEAR);
+ }
+
+ public String[] getMonthsArray()
+ {
+ String arr[] = new String[12];
+
+ arr[0] = m_i18n.getMessage("JANUARY");
+ arr[1] = m_i18n.getMessage("FEBRUARY");
+ arr[2] = m_i18n.getMessage("MARCH");
+ arr[3] = m_i18n.getMessage("APRIL");
+ arr[4] = m_i18n.getMessage("MAY");
+ arr[5] = m_i18n.getMessage("JUNE");
+ arr[6] = m_i18n.getMessage("JULY");
+ arr[7] = m_i18n.getMessage("AUGUST");
+ arr[8] = m_i18n.getMessage("SEPTEMBER");
+ arr[9] = m_i18n.getMessage("OCTOBER");
+ arr[10] = m_i18n.getMessage("NOVEMBER");
+ arr[11] = m_i18n.getMessage("DECEMBER");
+
+ return arr;
+
+ }
+
+ public String getDateString(int date)
+ {
+ // 20051012
+
+ int year = date / 10000;
+ int months = date - (year * 10000);
+
+ months = months / 100;
+
+ int days = date - (year * 10000) - (months * 100);
+
+ if (year == 0)
+ return getLeadingZero(days, 2) + "/" + getLeadingZero(months, 2);
+ else
+ return getLeadingZero(days, 2) + "/" + getLeadingZero(months, 2)
+ + "/" + year;
+ }
+
+ public String getTimeString(int time)
+ {
+ int hours = time / 100;
+ int min = time - hours * 100;
+
+ return getLeadingZero(hours, 2) + ":" + getLeadingZero(min, 2);
+ }
+
+ public String getDateTimeString(long date)
+ {
+ return getDateTimeString(date, 1);
+ }
+
+ public String getDateTimeAsDateString(long date)
+ {
+ return getDateTimeString(date, 2);
+ }
+
+ public String getDateTimeAsTimeString(long date)
+ {
+ return getDateTimeString(date, 3);
+ }
+
+ // ret_type = 1 (Date and time)
+ // ret_type = 2 (Date)
+ // ret_type = 3 (Time)
+
+ public static final int DT_DATETIME = 1;
+
+ public static final int DT_DATE = 2;
+
+ public static final int DT_TIME = 3;
+
+ public String getDateTimeString(long dt, int ret_type)
+ {
+
+ int y = (int) (dt / 100000000L);
+ dt -= y * 100000000L;
+
+ int m = (int) (dt / 1000000L);
+ dt -= m * 1000000L;
+
+ int d = (int) (dt / 10000L);
+ dt -= d * 10000L;
+
+ int h = (int) (dt / 100L);
+ dt -= h * 100L;
+
+ int min = (i...
[truncated message content] |
|
From: <and...@us...> - 2008-08-12 15:37:47
|
Revision: 476
http://ggc.svn.sourceforge.net/ggc/?rev=476&view=rev
Author: andyrozman
Date: 2008-08-12 15:37:52 +0000 (Tue, 12 Aug 2008)
Log Message:
-----------
Modified Paths:
--------------
trunk/ggc/data/GGC_Config.properties
trunk/ggc/src/Diabetes_Hardware.txt
trunk/ggc/src/ggc/core/db/GGCDbLoader.java
trunk/ggc/src/ggc/core/plugins/MetersPlugIn.java
trunk/ggc/src/ggc/core/plugins/PumpsPlugIn.java
trunk/ggc/src/ggc/core/util/DataAccess.java
trunk/ggc-cgm/src/ggc/cgm/util/DataAccessCGM.java
trunk/ggc-meter/.classpath
trunk/ggc-meter/src/ggc/meter/device/DummyMeter.java
trunk/ggc-meter/src/ggc/meter/gui/MeterDisplayDataDialog.java
trunk/ggc-meter/src/ggc/meter/gui/MeterExportDialog.java
trunk/ggc-meter/src/ggc/meter/gui/MeterInstructionsDialog.java
trunk/ggc-meter/src/ggc/meter/gui/config/MeterCompanyPanel.java
trunk/ggc-meter/src/ggc/meter/gui/config/MeterConfigPanel.java
trunk/ggc-meter/src/ggc/meter/gui/config/MeterLocationPanel.java
trunk/ggc-meter/src/ggc/meter/gui/config/MeterOtherPanel.java
trunk/ggc-meter/src/ggc/meter/gui/config/MeterStatusPanel.java
trunk/ggc-meter/src/ggc/meter/list/MeterListDialog.java
trunk/ggc-meter/src/ggc/meter/list/MeterListRoot.java
trunk/ggc-meter/src/ggc/meter/protocol/ConnectionProtocols.java
trunk/ggc-meter/src/ggc/meter/util/DataAccessMeter.java
trunk/ggc-plugin_base/src/ggc/plugin/list/BaseListDialog.java
trunk/ggc-pump/src/Changelog
trunk/ggc-pump/src/ggc/pump/data/PumpValues.java
trunk/ggc-pump/src/ggc/pump/data/PumpValuesDay.java
trunk/ggc-pump/src/ggc/pump/data/PumpValuesEntry.java
trunk/ggc-pump/src/ggc/pump/data/defs/PumpReport.java
trunk/ggc-pump/src/ggc/pump/test/PumpConsoleTester.java
trunk/ggc-pump/src/ggc/pump/util/DataAccessPump.java
trunk/web_page/inc_download.inc
trunk/web_page/inc_features.inc
trunk/web_page/inc_news.inc
trunk/web_page/inc_projects.inc
trunk/web_page/inc_support.inc
trunk/web_page/index.php
Added Paths:
-----------
trunk/ggc-pump/html/
Removed Paths:
-------------
trunk/ggc-support/data/nutrition-SR-20.zip
Modified: trunk/ggc/data/GGC_Config.properties
===================================================================
--- trunk/ggc/data/GGC_Config.properties 2008-08-12 12:12:48 UTC (rev 475)
+++ trunk/ggc/data/GGC_Config.properties 2008-08-12 15:37:52 UTC (rev 476)
@@ -1,6 +1,6 @@
#
# GGC_Config (Settings for GGC)
-#26.7.2008 17:13:36
+#5.8.2008 16:28:38
#
# Don't edit by hand
# Only settings need for application startup are written here. All other info
@@ -79,10 +79,10 @@
#
# Db Selector
#
-SELECTED_DB=0
+SELECTED_DB=1
#
# Language Selector
#
-SELECTED_LANG=si
+SELECTED_LANG=en
Modified: trunk/ggc/src/Diabetes_Hardware.txt
===================================================================
--- trunk/ggc/src/Diabetes_Hardware.txt 2008-08-12 12:12:48 UTC (rev 475)
+++ trunk/ggc/src/Diabetes_Hardware.txt 2008-08-12 15:37:52 UTC (rev 476)
@@ -8,43 +8,36 @@
C.) CGMS
-
-
-
A.) METERS
===========
- Name of company | Plans | Supported devices | Developer
+ Name of company | Plans | Supported devices | Developer
---------------------------------------------------------------------------------------------------------------------------------
-Bayer/Ascensia | Done | Dex2, Contour, Breeze, EliteXl | Andy
-Roche | Planned, -> 09.2008 | All supported through Pix device | Andy
-LifeScan | Planned, 09.- 12.2008 | ? | Andy
-Abbott | ? | ?
+Bayer/Ascensia | Done | Dex2, Contour, Breeze, EliteXl | Andy
+Roche | Planned, -> 09.2008 | All supported through Pix device | Andy
+LifeScan | Planned, 09.- 12.2008 | ? | Andy
+Abbott | ? | ? | ?
+Precission Xtra | ? | ? | ?
+Optimum Xceed | ? | ? | ?
-
B.) PUMPS
===========
- Name of company | Plans | Supported devices | Developer
----------------------------------------------------------------------------------------------------------------------------------
-Roche | Planned, -> 12.2008 | All supported through Pix device | Andy
-Minimed | Planned, ? | Support with import of CareLink export | Andy
-Animas | Planned | ? | Nate
+ Name of company | Plans | Supported devices | Developer
+----------------------------------------------------------------------------------------------------------------------
+Roche | Planned, -> 12.2008 | All supported through Pix device | Andy
+Minimed | Planned, ? | Support with import of CareLink export | Andy
+Animas | Planned | Through EZM db | Nate
-
C.) CGMS
==========
- Name of company | Plans | Supported devices | Developer
----------------------------------------------------------------------------------------------------------------------------------
-Minimed | Planned, ? | Support with import of CareLink export | Andy
+ Name of company | Plans | Supported devices | Developer
+----------------------------------------------------------------------------------------------------------------------
+Minimed | Planned, ? | Support with import of CareLink export | Andy
-
-
-
-
Modified: trunk/ggc/src/ggc/core/db/GGCDbLoader.java
===================================================================
--- trunk/ggc/src/ggc/core/db/GGCDbLoader.java 2008-08-12 12:12:48 UTC (rev 475)
+++ trunk/ggc/src/ggc/core/db/GGCDbLoader.java 2008-08-12 15:37:52 UTC (rev 476)
@@ -66,9 +66,11 @@
public boolean run_once = false;
- public boolean part_start = false;
+ public boolean part_start = true;
+ //public boolean debug = false;
+
public GGCDbLoader(DataAccess da)
{
m_da = da;
@@ -108,7 +110,7 @@
GGCDb db = new GGCDb(m_da);
- if (!part_start)
+ //if (!part_start)
{
if (m_bar!=null)
m_bar.setDatabaseName(db.getHibernateConfiguration().getConnectionName());
@@ -159,31 +161,35 @@
setDbStatus(StatusBar.DB_BASE_DONE);
+
+ if (!part_start)
+ {
- // 4 - load doctors data
-
- // TODO: in version 0.4
+ // 4 - load doctors data
+ // TODO: in version 0.4
+
+ // 5 - load nutrition(1) root data
+ db.loadNutritionDbBase();
+ db.loadNutritionDb1();
+
+ // 6 - load nutrition(2) root data
+ db.loadNutritionDb2();
+
+
+ // 7 - load meals root data
+ db.loadMealsDb();
-
- // 5 - load nutrition(1) root data
- db.loadNutritionDbBase();
- db.loadNutritionDb1();
+ setDbStatus(StatusBar.DB_LOADED);
+ }
+ else
+ {
+ db.loadNutritionDbBase();
+ setDbStatus(StatusBar.DB_LOADED);
+ }
- // 6 - load nutrition(2) root data
- db.loadNutritionDb2();
-
- // 7 - load meals root data
-
- db.loadMealsDb();
-
-
- setDbStatus(StatusBar.DB_LOADED);
-
-
-
/*
if (part_start)
{
@@ -209,8 +215,8 @@
public void setDbStatus(int status)
{
- if (part_start)
- return;
+ //if (part_start)
+ // return;
if (m_bar!=null)
{
Modified: trunk/ggc/src/ggc/core/plugins/MetersPlugIn.java
===================================================================
--- trunk/ggc/src/ggc/core/plugins/MetersPlugIn.java 2008-08-12 12:12:48 UTC (rev 475)
+++ trunk/ggc/src/ggc/core/plugins/MetersPlugIn.java 2008-08-12 15:37:52 UTC (rev 476)
@@ -59,11 +59,14 @@
.getInstance(), this);
// System.out.println("We have an instance !!! " + this.m_srv);
+
+ this.installed = true;
+
}
catch (Exception ex)
{
//System.out.println("Ex:" + ex);
-
+ this.installed = false;
}
// System.out.println("We have an instance !!! " + this.m_srv);
@@ -148,12 +151,9 @@
public String getShortStatus()
{
if (this.m_server != null)
- {
- return String.format(ic.getMessage("STATUS_INSTALLED"),
- this.m_server.getVersion());
- }
+ return String.format(ic.getMessage("STATUS_INSTALLED"), this.m_server.getVersion());
else
- return String.format(ic.getMessage("STATUS_NOT_AVAILABLE"), "0.3");
+ return ic.getMessage("STATUS_NOT_INSTALLED");
}
Modified: trunk/ggc/src/ggc/core/plugins/PumpsPlugIn.java
===================================================================
--- trunk/ggc/src/ggc/core/plugins/PumpsPlugIn.java 2008-08-12 12:12:48 UTC (rev 475)
+++ trunk/ggc/src/ggc/core/plugins/PumpsPlugIn.java 2008-08-12 15:37:52 UTC (rev 476)
@@ -190,12 +190,9 @@
public String getShortStatus()
{
if (this.m_server != null)
- {
- return String.format(ic.getMessage("STATUS_INSTALLED"),
- this.m_server.getVersion());
- }
+ return String.format(ic.getMessage("STATUS_INSTALLED"), this.m_server.getVersion());
else
- return String.format(ic.getMessage("STATUS_NOT_AVAILABLE"), "0.4");
+ return ic.getMessage("STATUS_NOT_INSTALLED");
}
public void setReturnData(Object return_data, StatusReporterInterface stat_rep_int)
Modified: trunk/ggc/src/ggc/core/util/DataAccess.java
===================================================================
--- trunk/ggc/src/ggc/core/util/DataAccess.java 2008-08-12 12:12:48 UTC (rev 475)
+++ trunk/ggc/src/ggc/core/util/DataAccess.java 2008-08-12 15:37:52 UTC (rev 476)
@@ -203,13 +203,14 @@
private DataAccess()
{
super(I18nControl.getInstance());
- // this.loadFonts();
- // m_i18n.createInstance(this);
- // loadAvailableLFs();
- // loadLanguageInfo();
- // x m_meterManager = new MeterManager();
+
+ }
+
+
+ public void initSpecial()
+ {
this.tree_roots = new Hashtable<String, GGCTreeRoot>();
this.m_configFile = new DbToolApplicationGGC();
@@ -219,25 +220,15 @@
this.m_settings = new GGCProperties(this, this.m_configFile, m_cfgMgr);
- // m_i18n = I18nControl.getInstance();
-
- // this.setI18nControlInstance(I18nControl.getInstance());
-
loadOptions();
- // this.verifyComConfig();
- // this.loadTimeZones();
-
- // checkPrerequisites();
- // this.loadBackupRestoreCollection();
-
if (!(new File("../data/debug.txt").exists()))
{
new RedirectScreen();
}
-
- }
-
+
+ }
+
// Method: getInstance
// Author: Andy
/**
Modified: trunk/ggc-cgm/src/ggc/cgm/util/DataAccessCGM.java
===================================================================
--- trunk/ggc-cgm/src/ggc/cgm/util/DataAccessCGM.java 2008-08-12 12:12:48 UTC (rev 475)
+++ trunk/ggc-cgm/src/ggc/cgm/util/DataAccessCGM.java 2008-08-12 15:37:52 UTC (rev 476)
@@ -159,33 +159,19 @@
private DataAccessCGM()
{
super(I18nControl.getInstance());
+ }
+
+
+ public void initSpecial()
+ {
this.loadFonts();
- //m_i18n.createInstance(this);
- // loadAvailableLFs();
- // loadLanguageInfo();
-//x m_meterManager = new PumpManager();
-
-// this.m_configFile = new DbToolApplicationGGC();
-// this.m_configFile.loadConfig();
-
-// m_cfgMgr = new ConfigurationManager(this);
-
-// this.m_settings = new GGCProperties(this, this.m_configFile, m_cfgMgr);
-
- m_i18n = I18nControl.getInstance();
-
- //loadOptions();
-
- //this.verifyComConfig();
this.loadTimeZones();
-
loadPumpsTable();
-
checkPrerequisites();
-
- }
-
+ }
+
+
// Method: getInstance
// Author: Andy
/**
Modified: trunk/ggc-meter/.classpath
===================================================================
--- trunk/ggc-meter/.classpath 2008-08-12 12:12:48 UTC (rev 475)
+++ trunk/ggc-meter/.classpath 2008-08-12 15:37:52 UTC (rev 476)
@@ -1,12 +1,13 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/rxtx-2.1.7"/>
- <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/commons-logging-1.0.4"/>
- <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/Xpp Xml Parser 3-1.1.4c"/>
- <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/dom4j-1.6.1"/>
- <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/commons-lang-2.4"/>
- <classpathentry combineaccessrules="false" kind="src" path="/Atech-Tools"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path="src"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/rxtx-2.1.7"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/commons-logging-1.0.4"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/Xpp Xml Parser 3-1.1.4c"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/dom4j-1.6.1"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/commons-lang-2.4"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/Atech-Tools"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/GGC Plugin Base"/>
+ <classpathentry kind="output" path="bin"/>
+</classpath>
Modified: trunk/ggc-meter/src/ggc/meter/device/DummyMeter.java
===================================================================
--- trunk/ggc-meter/src/ggc/meter/device/DummyMeter.java 2008-08-12 12:12:48 UTC (rev 475)
+++ trunk/ggc-meter/src/ggc/meter/device/DummyMeter.java 2008-08-12 15:37:52 UTC (rev 476)
@@ -19,18 +19,19 @@
import ggc.meter.data.MeterValuesEntry;
import ggc.meter.protocol.ConnectionProtocols;
import ggc.meter.util.DataAccessMeter;
-import ggc.meter.util.I18nControl;
import java.util.ArrayList;
import javax.swing.ImageIcon;
+import com.atech.i18n.I18nControlAbstract;
+
public class DummyMeter extends AbstractMeter //implements MeterInterface
{
DataAccessMeter m_da = DataAccessMeter.getInstance();
- I18nControl m_ic = m_da.getI18nInstance();
+ I18nControlAbstract m_ic = m_da.getI18nControlInstance();
public int m_meter_index = 0;
Modified: trunk/ggc-meter/src/ggc/meter/gui/MeterDisplayDataDialog.java
===================================================================
--- trunk/ggc-meter/src/ggc/meter/gui/MeterDisplayDataDialog.java 2008-08-12 12:12:48 UTC (rev 475)
+++ trunk/ggc-meter/src/ggc/meter/gui/MeterDisplayDataDialog.java 2008-08-12 15:37:52 UTC (rev 476)
@@ -11,7 +11,6 @@
import ggc.meter.output.OutputWriter;
import ggc.meter.plugin.MeterPlugInServer;
import ggc.meter.util.DataAccessMeter;
-import ggc.meter.util.I18nControl;
import java.awt.BorderLayout;
import java.awt.FlowLayout;
@@ -37,6 +36,8 @@
import javax.swing.ScrollPaneConstants;
import javax.swing.table.TableColumn;
+import com.atech.i18n.I18nControlAbstract;
+
public class MeterDisplayDataDialog extends JDialog implements ActionListener, OutputWriter
{
@@ -46,7 +47,7 @@
MeterReaderRunner mrr;
private DataAccessMeter m_da = DataAccessMeter.getInstance();
- private I18nControl m_ic = m_da.getI18nInstance();
+ I18nControlAbstract m_ic = m_da.getI18nControlInstance();
// private static ReadMeterDialog singleton = null;
Modified: trunk/ggc-meter/src/ggc/meter/gui/MeterExportDialog.java
===================================================================
--- trunk/ggc-meter/src/ggc/meter/gui/MeterExportDialog.java 2008-08-12 12:12:48 UTC (rev 475)
+++ trunk/ggc-meter/src/ggc/meter/gui/MeterExportDialog.java 2008-08-12 15:37:52 UTC (rev 476)
@@ -6,7 +6,6 @@
import ggc.meter.output.OutputWriter;
import ggc.meter.plugin.MeterPlugInServer;
import ggc.meter.util.DataAccessMeter;
-import ggc.meter.util.I18nControl;
import java.awt.BorderLayout;
import java.awt.Color;
@@ -25,6 +24,7 @@
import javax.swing.border.LineBorder;
import com.atech.graphics.components.StatusReporterInterface;
+import com.atech.i18n.I18nControlAbstract;
public class MeterExportDialog extends JDialog implements ActionListener, StatusReporterInterface
{
@@ -51,7 +51,7 @@
private DataAccessMeter m_da = DataAccessMeter.getInstance();
- private I18nControl m_ic = m_da.getI18nInstance();
+ I18nControlAbstract m_ic = m_da.getI18nControlInstance();
public JProgressBar progress = null;
Modified: trunk/ggc-meter/src/ggc/meter/gui/MeterInstructionsDialog.java
===================================================================
--- trunk/ggc-meter/src/ggc/meter/gui/MeterInstructionsDialog.java 2008-08-12 12:12:48 UTC (rev 475)
+++ trunk/ggc-meter/src/ggc/meter/gui/MeterInstructionsDialog.java 2008-08-12 15:37:52 UTC (rev 476)
@@ -9,7 +9,6 @@
import ggc.meter.plugin.MeterPlugInServer;
import ggc.meter.protocol.ConnectionProtocols;
import ggc.meter.util.DataAccessMeter;
-import ggc.meter.util.I18nControl;
import java.awt.BorderLayout;
import java.awt.Font;
@@ -28,6 +27,7 @@
import com.atech.db.DbDataReaderAbstract;
import com.atech.db.DbDataReadingFinishedInterface;
+import com.atech.i18n.I18nControlAbstract;
import com.atech.utils.TimeZoneUtil;
@@ -44,7 +44,7 @@
private DataAccessMeter m_da = DataAccessMeter.getInstance();
- private I18nControl m_ic = m_da.getI18nInstance();
+ I18nControlAbstract m_ic = m_da.getI18nControlInstance();
JButton button_start;
JLabel label_waiting;
Modified: trunk/ggc-meter/src/ggc/meter/gui/config/MeterCompanyPanel.java
===================================================================
--- trunk/ggc-meter/src/ggc/meter/gui/config/MeterCompanyPanel.java 2008-08-12 12:12:48 UTC (rev 475)
+++ trunk/ggc-meter/src/ggc/meter/gui/config/MeterCompanyPanel.java 2008-08-12 15:37:52 UTC (rev 476)
@@ -33,7 +33,6 @@
import ggc.meter.manager.MeterManager;
import ggc.meter.manager.company.MeterCompanyInterface;
import ggc.meter.util.DataAccessMeter;
-import ggc.meter.util.I18nControl;
import java.awt.event.ItemEvent;
import java.awt.event.ItemListener;
@@ -42,7 +41,9 @@
import javax.swing.JDialog;
import javax.swing.JLabel;
+import com.atech.i18n.I18nControlAbstract;
+
public class MeterCompanyPanel extends AbstractPreferencesPanel implements ItemListener
{
@@ -81,7 +82,7 @@
}
*/
DataAccessMeter m_da = DataAccessMeter.getInstance();
- I18nControl m_ic = m_da.getI18nInstance();
+ I18nControlAbstract m_ic = m_da.getI18nControlInstance();
JLabel label_status;
public MeterCompanyPanel(ConfigurationDialog parent)
Modified: trunk/ggc-meter/src/ggc/meter/gui/config/MeterConfigPanel.java
===================================================================
--- trunk/ggc-meter/src/ggc/meter/gui/config/MeterConfigPanel.java 2008-08-12 12:12:48 UTC (rev 475)
+++ trunk/ggc-meter/src/ggc/meter/gui/config/MeterConfigPanel.java 2008-08-12 15:37:52 UTC (rev 476)
@@ -31,7 +31,6 @@
//import ggc.gui.dialogs.PortSelectionDialog;
import ggc.meter.util.DataAccessMeter;
-import ggc.meter.util.I18nControl;
import java.awt.BorderLayout;
import java.awt.GridLayout;
@@ -53,7 +52,9 @@
import javax.swing.JPanel;
import javax.swing.JTextField;
+import com.atech.i18n.I18nControlAbstract;
+
public class MeterConfigPanel extends AbstractPreferencesPanel implements ItemListener
{
static final long serialVersionUID = 0;
@@ -87,7 +88,7 @@
}
*/
DataAccessMeter m_da = DataAccessMeter.getInstance();
- I18nControl m_ic = m_da.getI18nInstance();
+ I18nControlAbstract m_ic = m_da.getI18nControlInstance();
public MeterConfigPanel(ConfigurationDialog parent)
{
Modified: trunk/ggc-meter/src/ggc/meter/gui/config/MeterLocationPanel.java
===================================================================
--- trunk/ggc-meter/src/ggc/meter/gui/config/MeterLocationPanel.java 2008-08-12 12:12:48 UTC (rev 475)
+++ trunk/ggc-meter/src/ggc/meter/gui/config/MeterLocationPanel.java 2008-08-12 15:37:52 UTC (rev 476)
@@ -31,7 +31,6 @@
//import ggc.gui.dialogs.PortSelectionDialog;
import ggc.meter.util.DataAccessMeter;
-import ggc.meter.util.I18nControl;
import java.awt.BorderLayout;
import java.awt.GridLayout;
@@ -52,7 +51,9 @@
import javax.swing.JPanel;
import javax.swing.JTextField;
+import com.atech.i18n.I18nControlAbstract;
+
public class MeterLocationPanel extends AbstractPreferencesPanel implements ItemListener
{
static final long serialVersionUID = 0;
@@ -86,7 +87,7 @@
}
*/
DataAccessMeter m_da = DataAccessMeter.getInstance();
- I18nControl m_ic = m_da.getI18nInstance();
+ I18nControlAbstract m_ic = m_da.getI18nControlInstance();
public MeterLocationPanel(ConfigurationDialog parent)
{
Modified: trunk/ggc-meter/src/ggc/meter/gui/config/MeterOtherPanel.java
===================================================================
--- trunk/ggc-meter/src/ggc/meter/gui/config/MeterOtherPanel.java 2008-08-12 12:12:48 UTC (rev 475)
+++ trunk/ggc-meter/src/ggc/meter/gui/config/MeterOtherPanel.java 2008-08-12 15:37:52 UTC (rev 476)
@@ -31,7 +31,6 @@
//import ggc.gui.dialogs.PortSelectionDialog;
import ggc.meter.util.DataAccessMeter;
-import ggc.meter.util.I18nControl;
import java.awt.BorderLayout;
import java.awt.GridLayout;
@@ -53,7 +52,9 @@
import javax.swing.JPanel;
import javax.swing.JTextField;
+import com.atech.i18n.I18nControlAbstract;
+
public class MeterOtherPanel extends AbstractPreferencesPanel implements ItemListener
{
static final long serialVersionUID = 0;
@@ -87,7 +88,7 @@
}
*/
DataAccessMeter m_da = DataAccessMeter.getInstance();
- I18nControl m_ic = m_da.getI18nInstance();
+ I18nControlAbstract m_ic = m_da.getI18nControlInstance();
public MeterOtherPanel(ConfigurationDialog parent)
{
Modified: trunk/ggc-meter/src/ggc/meter/gui/config/MeterStatusPanel.java
===================================================================
--- trunk/ggc-meter/src/ggc/meter/gui/config/MeterStatusPanel.java 2008-08-12 12:12:48 UTC (rev 475)
+++ trunk/ggc-meter/src/ggc/meter/gui/config/MeterStatusPanel.java 2008-08-12 15:37:52 UTC (rev 476)
@@ -32,7 +32,6 @@
import ggc.meter.manager.MeterManager;
import ggc.meter.util.DataAccessMeter;
-import ggc.meter.util.I18nControl;
import java.awt.BorderLayout;
import java.awt.GridLayout;
@@ -54,7 +53,9 @@
import javax.swing.JPanel;
import javax.swing.JTextField;
+import com.atech.i18n.I18nControlAbstract;
+
public class MeterStatusPanel extends AbstractPreferencesPanel implements ItemListener
{
static final long serialVersionUID = 0;
@@ -88,7 +89,7 @@
}
*/
DataAccessMeter m_da = DataAccessMeter.getInstance();
- I18nControl m_ic = m_da.getI18nInstance();
+ I18nControlAbstract m_ic = m_da.getI18nControlInstance();
public MeterStatusPanel(ConfigurationDialog parent)
{
Modified: trunk/ggc-meter/src/ggc/meter/list/MeterListDialog.java
===================================================================
--- trunk/ggc-meter/src/ggc/meter/list/MeterListDialog.java 2008-08-12 12:12:48 UTC (rev 475)
+++ trunk/ggc-meter/src/ggc/meter/list/MeterListDialog.java 2008-08-12 15:37:52 UTC (rev 476)
@@ -28,7 +28,6 @@
package ggc.meter.list;
import ggc.meter.util.DataAccessMeter;
-import ggc.meter.util.I18nControl;
import java.awt.Dimension;
import java.awt.GridLayout;
@@ -45,8 +44,10 @@
import javax.swing.event.TreeSelectionListener;
import javax.swing.tree.TreeSelectionModel;
+import com.atech.i18n.I18nControlAbstract;
+
public class MeterListDialog extends JDialog implements TreeSelectionListener, ActionListener
{
static final long serialVersionUID = 0L;
@@ -64,7 +65,7 @@
// private static boolean useSystemLookAndFeel = false;
- private I18nControl ic = null;
+ private I18nControlAbstract ic = null;
public MeterListAbstractPanel panels[] = null;
// x private int selectedPanel = 0;
@@ -81,7 +82,7 @@
//super((JDialog)null, "", true);
m_da = da;
- ic = m_da.m_i18n;
+ ic = m_da.getI18nControlInstance();
//this.setResizable(false);
this.setBounds(80, 50, 800, 600);
Modified: trunk/ggc-meter/src/ggc/meter/list/MeterListRoot.java
===================================================================
--- trunk/ggc-meter/src/ggc/meter/list/MeterListRoot.java 2008-08-12 12:12:48 UTC (rev 475)
+++ trunk/ggc-meter/src/ggc/meter/list/MeterListRoot.java 2008-08-12 15:37:52 UTC (rev 476)
@@ -80,7 +80,7 @@
@Override
public String toString()
{
- return DataAccessMeter.getInstance().m_i18n.getMessage("METERS_LIST");
+ return DataAccessMeter.getInstance().getI18nControlInstance().getMessage("METERS_LIST");
}
Modified: trunk/ggc-meter/src/ggc/meter/protocol/ConnectionProtocols.java
===================================================================
--- trunk/ggc-meter/src/ggc/meter/protocol/ConnectionProtocols.java 2008-08-12 12:12:48 UTC (rev 475)
+++ trunk/ggc-meter/src/ggc/meter/protocol/ConnectionProtocols.java 2008-08-12 15:37:52 UTC (rev 476)
@@ -8,13 +8,15 @@
public static final int PROTOCOL_USB = 2;
public static final int PROTOCOL_MASS_STORAGE_XML = 3;
public static final int PROTOCOL_BLUE_TOOTH = 4;
+ public static final int PROTOCOL_FILE_IMPORT = 5;
public static String[] connectionProtocolDescription = {
"PROT_NONE",
"PROT_SERIAL_BRIDGE",
"PROT_SERIAL_USB",
"PROT_MASS_STORAGE_XML",
- "PROT_BLUE_TOOTH"
+ "PROT_BLUE_TOOTH",
+ "PROT_FILE_IMPORT"
};
Modified: trunk/ggc-meter/src/ggc/meter/util/DataAccessMeter.java
===================================================================
--- trunk/ggc-meter/src/ggc/meter/util/DataAccessMeter.java 2008-08-12 12:12:48 UTC (rev 475)
+++ trunk/ggc-meter/src/ggc/meter/util/DataAccessMeter.java 2008-08-12 15:37:52 UTC (rev 476)
@@ -30,19 +30,15 @@
package ggc.meter.util;
import ggc.meter.manager.MeterManager;
+import ggc.plugin.util.DataAccessPlugInBase;
import java.awt.Color;
import java.awt.Component;
-import java.awt.Font;
import java.awt.Image;
import java.io.ByteArrayOutputStream;
import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
-import java.math.BigDecimal;
-import java.math.MathContext;
-import java.math.RoundingMode;
-import java.text.DecimalFormat;
import java.util.ArrayList;
import java.util.Calendar;
import java.util.Date;
@@ -56,122 +52,22 @@
import javax.swing.JFrame;
import javax.swing.JLabel;
-import com.atech.utils.ATDataAccessAbstract;
-
-public class DataAccessMeter extends ATDataAccessAbstract
+public class DataAccessMeter extends DataAccessPlugInBase
{
- // LF
- // Hashtable<String,String> availableLF_full = null;
- // Object[] availableLF = null;
- // Object[] availableLang = null;
- // private LanguageInfo m_lang_info = null;
-
- // String selectedLF = null;
- // String subSelectedLF = null;
-
- // Config file
- // Hashtable<String,String> config_db_values = null;
- // public int selected_db = -1;
- // public int selected_lang = 1;
- // public String selected_LF_Class = null; // class
- // public String selected_LF_Name = null; // name
- // public String skinLFSelected = null;
- // String allDbs[] = null;
-
- public static final String pathPrefix = ".";
-
- public I18nControl m_i18n = null;
-
private static DataAccessMeter s_da = null; // This is handle to unique
- // singelton instance
-
- //public GGCDb m_db = null;
-
- //public MainFrame m_main = null;
-
- //public GGCLittle m_main_little = null;
-
- public Font fonts[] = null;
-
- //public GGCTreeRoot m_nutrition_treeroot = null;
-
- //public GGCTreeRoot m_meals_treeroot = null;
-
- // daily and weekly data
- //private GregorianCalendar m_date = null, m_dateStart = null;
-
- //private HbA1cValues m_HbA1c = null;
-
- //private DailyValues m_dvalues = null;
-
- //private WeeklyValues m_dRangeValues = null;
-
private MeterManager m_meterManager = null;
-//xa private GGCProperties m_settings = null;
-
- //private DbToolApplicationGGC m_configFile = null;
-// private ConfigurationManager m_cfgMgr = null;
-
-
- public static DecimalFormat MmolDecimalFormat = new DecimalFormat("#0.0");
-
- /**
- * Which BG unit is used: BG_MGDL = mg/dl, BG_MMOL = mmol/l
- */
- public int m_BG_unit = BG_MGDL;
-
- public String[] availableLanguages = { "English", "Deutsch", "Slovenski", };
-
- public String[] avLangPostfix = { "en", "de", "si", };
-
- public String[] bg_units = { "mg/dl", "mmol/l" };
-
public Hashtable<String,String> timeZones;
-
public Vector<String> time_zones_vector;
-// public static DecimalFormat MmolDecimalFormat = new DecimalFormat("#0.0");
public ImageIcon config_icons[] = null;
-/*
- {
- new ImageIcon("/icons/cfg_general.png"),
- new ImageIcon("/icons/cfg_medical.png"),
- new ImageIcon("icons/cfg_colors.png"),
- new ImageIcon("icons/cfg_render.png"),
- new ImageIcon("icons/cfg_meter.png"),
- new ImageIcon("icons/cfg_print.png")
- };
-*/
-/* public ImageIcon config_icons[] = {
- new ImageIcon("images/cfg_db.gif"),
- new ImageIcon("images/cfg_look.gif"),
- new ImageIcon("images/cfg_myparish.gif"),
- new ImageIcon("images/cfg_masses.gif"),
- new ImageIcon("images/cfg_users.gif"),
- new ImageIcon("images/cfg_lang.gif"),
- new ImageIcon("images/cfg_web.gif"),
- null
- };
+ public String[] options_yes_no = null;
- public String config_types[] = {
- m_ic.getMessage("GENERAL"),
- m_ic.getMessage("MEDICAL_DATA"),
- m_ic.getMessage("COLORS_AND_FONTS"),
- m_ic.getMessage("RENDERING_QUALITY"),
- m_ic.getMessage("METER_CONFIGURATION"),
- m_ic.getMessage("PRINTING")
- };
-
-*/
- public String[] options_yes_no = null;
-
-
- JFrame m_main = null;
+ JFrame m_main = null;
public Hashtable<String,String> metersUrl;
@@ -194,36 +90,21 @@
private DataAccessMeter(JFrame frame)
{
super(I18nControl.getInstance());
- this.loadFonts();
-
this.m_main = frame;
+ }
- //m_i18n.createInstance(this);
- // loadAvailableLFs();
- // loadLanguageInfo();
-//x m_meterManager = new MeterManager();
+
+ public void initSpecial()
+ {
+ this.loadFonts();
-// this.m_configFile = new DbToolApplicationGGC();
-// this.m_configFile.loadConfig();
-
-// m_cfgMgr = new ConfigurationManager(this);
-
-// this.m_settings = new GGCProperties(this, this.m_configFile, m_cfgMgr);
-
- m_i18n = I18nControl.getInstance();
-
- //loadOptions();
-
- //this.verifyComConfig();
this.loadTimeZones();
-
loadMetersTable();
- loadConfigIcons();
-
checkPrerequisites();
-
- }
-
+ }
+
+
+
// Method: getInstance
// Author: Andy
/**
@@ -283,7 +164,7 @@
*/
public void deleteInstance()
{
- m_i18n = null;
+ super.m_i18n = null;
}
@@ -375,45 +256,9 @@
- // ********************************************************
- // ****** Fonts *****
- // ********************************************************
- public static final int FONT_BIG_BOLD = 0;
- public static final int FONT_NORMAL = 1;
-
- public static final int FONT_NORMAL_BOLD = 2;
-
- public void loadFonts()
- {
- fonts = new Font[3];
- fonts[0] = new Font("SansSerif", Font.BOLD, 22);
- fonts[1] = new Font("SansSerif", Font.PLAIN, 12);
- fonts[2] = new Font("SansSerif", Font.BOLD, 12);
- }
-
- public Font getFont(int font_id)
- {
- return fonts[font_id];
- }
-
-
-
// ********************************************************
- // ****** Icons *****
- // ********************************************************
-
-
-
-
- // ********************************************************
- // ****** Db *****
- // ********************************************************
-
-
-
- // ********************************************************
// ****** Meters *****
// ********************************************************
@@ -555,119 +400,13 @@
}
*/
- // ********************************************************
- // ****** BG Measurement Type *****
- // ********************************************************
- public static final int BG_MGDL = 1;
- public static final int BG_MMOL = 2;
-
- public int getBGMeasurmentType()
- {
- return this.m_BG_unit;
- }
-
- public void setBGMeasurmentType(int type)
- {
- this.m_BG_unit = type;
- }
-
- private static final float MGDL_TO_MMOL_FACTOR = 0.0555f;
-
- private static final float MMOL_TO_MGDL_FACTOR = 18.016f;
-
- /**
- * Depending on the return value of <code>getBGMeasurmentType()</code>, either
- * return the mg/dl or the mmol/l value of the database's value. Default is mg/dl.
- * @param dbValue - The database's value (in float)
- * @return the BG in either mg/dl or mmol/l
- */
- public float getDisplayedBG(float dbValue)
- {
- switch (this.m_BG_unit)
- {
- case BG_MMOL:
- // this POS should return a float rounded to 3 decimal places,
- // if I understand the docu correctly
- return (new BigDecimal(dbValue * MGDL_TO_MMOL_FACTOR,
- new MathContext(3, RoundingMode.HALF_UP)).floatValue());
- case BG_MGDL:
- default:
- return dbValue;
- }
- }
-
- public float getBGValue(float bg_value)
- {
- switch (this.m_BG_unit)
- {
- case BG_MMOL:
- return (bg_value * MGDL_TO_MMOL_FACTOR);
- case BG_MGDL:
- default:
- return bg_value;
- }
- }
-
-
- public float getBGValueByType(int type, float bg_value)
- {
- switch (type)
- {
- case BG_MMOL:
- return (bg_value * MGDL_TO_MMOL_FACTOR);
- case BG_MGDL:
- default:
- return bg_value;
- }
- }
-
-
- public float getBGValueByType(int input_type, int output_type, float bg_value)
- {
-
- if (input_type==output_type)
- return bg_value;
- else
- {
- if (output_type==DataAccessMeter.BG_MGDL)
- {
- return bg_value * DataAccessMeter.MGDL_TO_MMOL_FACTOR;
- }
- else
- {
- return bg_value * DataAccessMeter.MMOL_TO_MGDL_FACTOR;
- }
- }
-
- }
-
-
- public float getBGValueDifferent(int type, float bg_value)
- {
-
- if (type==DataAccessMeter.BG_MGDL)
- {
- return bg_value * DataAccessMeter.MGDL_TO_MMOL_FACTOR;
- }
- else
- {
- return bg_value * DataAccessMeter.MMOL_TO_MGDL_FACTOR;
- }
- }
-
-
-
// ********************************************************
// ****** Parent handling (for UIs) *****
// ********************************************************
- public I18nControl getI18nInstance()
- {
- return m_i18n;
- }
/**
* Utils
@@ -1123,6 +862,16 @@
}
+
+
+ @Override
+ public void createWebListerItems()
+ {
+ // TODO Auto-generated method stub
+
+ }
+
+
}
Modified: trunk/ggc-plugin_base/src/ggc/plugin/list/BaseListDialog.java
===================================================================
--- trunk/ggc-plugin_base/src/ggc/plugin/list/BaseListDialog.java 2008-08-12 12:12:48 UTC (rev 475)
+++ trunk/ggc-plugin_base/src/ggc/plugin/list/BaseListDialog.java 2008-08-12 15:37:52 UTC (rev 476)
@@ -82,7 +82,7 @@
//super((JDialog)null, "", true);
m_da = da;
- ic = m_da.m_i18n;
+ ic = m_da.getI18nControlInstance();
m_root = new BaseListRoot(m_da);
Modified: trunk/ggc-pump/src/Changelog
===================================================================
--- trunk/ggc-pump/src/Changelog 2008-08-12 12:12:48 UTC (rev 475)
+++ trunk/ggc-pump/src/Changelog 2008-08-12 15:37:52 UTC (rev 476)
@@ -2,6 +2,12 @@
Changes file for GGC Meter Tool
===============================
+0.1.4 08-10
+ * Pump Definitions extended (Pump Interface will change later)
+ * PumpValues contexts were extended. Pump entries, need to be viewed as data for whole day, not as separate
+ records, which will also be the way to compare them to old ones. Generation of day records, must be
+ unified (how will be determined later)
+
0.1.3 08-09
* modification to PumpInterface to include Alaram and Event mappings
Modified: trunk/ggc-pump/src/ggc/pump/data/PumpValues.java
===================================================================
--- trunk/ggc-pump/src/ggc/pump/data/PumpValues.java 2008-08-12 12:12:48 UTC (rev 475)
+++ trunk/ggc-pump/src/ggc/pump/data/PumpValues.java 2008-08-12 15:37:52 UTC (rev 476)
@@ -22,7 +22,7 @@
* Filename: DailyValuesRow.java
* Purpose: One row in the DailyValues Data Model.
*
- * Author: schultd
+ * Author: Andy Rozman {an...@at...}
*/
package ggc.pump.data;
@@ -36,6 +36,7 @@
{
DataAccessPump da = DataAccessPump.getInstance();
+
+ // TODO: Make whole class
-
}
Modified: trunk/ggc-pump/src/ggc/pump/data/PumpValuesDay.java
===================================================================
--- trunk/ggc-pump/src/ggc/pump/data/PumpValuesDay.java 2008-08-12 12:12:48 UTC (rev 475)
+++ trunk/ggc-pump/src/ggc/pump/data/PumpValuesDay.java 2008-08-12 15:37:52 UTC (rev 476)
@@ -22,7 +22,7 @@
* Filename: DailyValuesRow.java
* Purpose: One row in the DailyValues Data Model.
*
- * Author: schultd
+ * Author: Andy Rozman {an...@at...}
*/
package ggc.pump.data;
@@ -35,6 +35,7 @@
{
DataAccessPump da = DataAccessPump.getInstance();
+ // TODO: Make whole class
}
Modified: trunk/ggc-pump/src/ggc/pump/data/PumpValuesEntry.java
===================================================================
--- trunk/ggc-pump/src/ggc/pump/data/PumpValuesEntry.java 2008-08-12 12:12:48 UTC (rev 475)
+++ trunk/ggc-pump/src/ggc/pump/data/PumpValuesEntry.java 2008-08-12 15:37:52 UTC (rev 476)
@@ -22,7 +22,7 @@
* Filename: DailyValuesRow.java
* Purpose: One row in the DailyValues Data Model.
*
- * Author: schultd
+ * Author: Andy Rozman {an...@at...}
*/
package ggc.pump.data;
Modified: trunk/ggc-pump/src/ggc/pump/data/defs/PumpReport.java
===================================================================
--- trunk/ggc-pump/src/ggc/pump/data/defs/PumpReport.java 2008-08-12 12:12:48 UTC (rev 475)
+++ trunk/ggc-pump/src/ggc/pump/data/defs/PumpReport.java 2008-08-12 15:37:52 UTC (rev 476)
@@ -1,6 +1,5 @@
package ggc.pump.data.defs;
-import ggc.pump.manager.company.AbstractPumpCompany;
/*
@@ -29,7 +28,7 @@
* protocol class should be used as super class for meter definitions. Each meter family "should"
* have it's own super class and one class for each meter.
*
- * Author: andyrozman {and...@so...}
+ * Author: Andy Rozman {an...@at...}
*/
Modified: trunk/ggc-pump/src/ggc/pump/test/PumpConsoleTester.java
===================================================================
--- trunk/ggc-pump/src/ggc/pump/test/PumpConsoleTester.java 2008-08-12 12:12:48 UTC (rev 475)
+++ trunk/ggc-pump/src/ggc/pump/test/PumpConsoleTester.java 2008-08-12 15:37:52 UTC (rev 476)
@@ -68,33 +68,10 @@
tzu.setSummerTimeChange(+1);
- //thread = new TimerThread();
- //thread.start();
-
try
{
startRoche(portName);
-
- //this.startOneTouchUltra(portName);
-
- /*
- //GGCFileOutputWriter gfo = new GGCFileOutputWriter();
- ConsoleOutputWriter cow = new ConsoleOutputWriter();
-
-// thread.addJob(gfo.getOutputUtil());
-
- displaySerialPorts();
-
-/*
- m_meter = new AscensiaContour(portName, gfo);
- m_meter.setPort(portName);
- m_meter.loadInitialData();
- */
-
- // m_meter = new OneTouchUltra(portName, cow);
- // m_meter.loadInitialData();
-
}
catch(Exception ex)
{
@@ -102,141 +79,10 @@
ex.printStackTrace();
}
-/*
- //MeterImportManager mim = new MeterImportManager();
-
- if (mim.getErrorCode()!=0)
- {
- System.exit(1);
- }
-*/
-
-
-/*
-
- JFrame.setDefaultLookAndFeelDecorated(true);
- JDialog.setDefaultLookAndFeelDecorated(true);
-
- enableEvents(AWTEvent.WINDOW_EVENT_MASK);
-
- this.getContentPane().setLayout(null);
- this.setSize(640, 480);
- this.setTitle("Meter Tester - v0.1");
- this.setResizable(true);
-
- JPanel fullPanel = new JPanel();
- fullPanel.setLayout(null);
- fullPanel.setBounds(0,0,640,480);
- this.getContentPane().add(fullPanel);
-
-
- JLabel label = new JLabel("String to Send:");
- label.setBounds(30, 10, 100, 25);
-
- fullPanel.add(label);
-
-
-
- textField = new JTextField();
- textField.setBounds(30, 35, 360, 25);
- fullPanel.add(textField);
-
- sendButton = new JButton("Send");
- sendButton.setBounds(405, 35, 65, 25);
- //sendButton.setEnabled(false);
- sendButton.addActionListener(new ActionListener()
- {
- public void actionPerformed(ActionEvent e)
- {
- readyToWrite(textField.getText()+"\n");
- messageArea.append("--> "+textField.getText()+"\n");
- }
- });
- fullPanel.add(sendButton);
-
-
- enterButton = new JButton("Test");
- enterButton.setBounds(480, 35, 120, 25);
- //enterButton.setEnabled(false);
- enterButton.addActionListener(new ActionListener()
- {
- public void actionPerformed(ActionEvent e)
- {
- //readyToWrite("\n");
- //messageArea.append("--> <Enter> sent.\n");
- //m_meter.test2();
- try
- {
- m_meter.loadInitialData();
-
- System.out.println("Info: \n" + m_meter.getInfo());
- System.out.println("Time Difference: \n" + m_meter.getTimeDifference());
-
- //m_meter.getDataFull();
- }
- catch(Exception ex)
- {
- System.out.println("Exception: " + ex);
- }
-
- m_meter.getInfo();
- m_meter.getTimeDifference();
- }
- });
- fullPanel.add(enterButton);
-
-
- label = new JLabel("Communication window:");
- label.setBounds(30, 70, 200, 25);
- fullPanel.add(label);
-
-
- clearButton = new JButton("Clear");
- clearButton.setBounds(535, 73, 65, 20);
- clearButton.addActionListener(new ActionListener()
- {
- public void actionPerformed(ActionEvent e)
- {
- messageArea.setText("");
- }
- });
- fullPanel.add(clearButton);
-
-
- messageArea = new TextArea();
- messageArea.setBounds(30, 95, 570, 300);
- fullPanel.add(messageArea, null);
-
- this.setVisible(true);
- */
}
- public void startAscensia(String portName) throws Exception
- {
- //GGCFileOutputWriter ow = new GGCFileOutputWriter();
- ConsoleOutputWriter ow = new ConsoleOutputWriter();
-
- //thread.addJob(cow.getOutputUtil());
- //thread.addJob(ow.getOutputUtil());
-
- displaySerialPorts();
-
- // TODO
- //AscensiaContour asc_meter = new AscensiaContour(portName, ow);
- //asc_meter.setPort(portName);
-
-
-
- //asc_meter.readDeviceDataFull();
-
- System.out.println("We are back in tester !!!!");
-
- System.exit(0);
-
- }
-
public void startRoche(String portName) throws Exception
{
AccuChekSpirit acs = new AccuChekSpirit("", new ConsoleOutputWriter());
@@ -244,23 +90,7 @@
}
- public void startOneTouchUltra(String portName) throws Exception
- {
-
- ConsoleOutputWriter cow = new ConsoleOutputWriter();
-
-//a thread.addJob(cow.getOutputUtil());
-
- displaySerialPorts();
-
- //OneTouchUltra otu = new OneTouchUltra(portName, cow);
- //m_meter = new OneTouchUltra(portName, cow);
- //otu.loadInitialData();
-
- }
-
-
public void displaySerialPorts()
{
Vector<String> vct = SerialProtocol.getAvailableSerialPorts();
@@ -274,17 +104,6 @@
}
- public void readyToWrite(String str)
- {
- try
- {
- //this.m_meter.portOutputStream.write(str.getBytes());
- }
- catch(Exception ex)
- {
- System.out.println("Tester -> Error writing to meter: " + ex);
- }
- }
public static void main(String args[])
@@ -293,21 +112,7 @@
{
new PumpConsoleTester(args[0]);
- /*
- AscensiaMeter am = new AscensiaMeter();
- am.setPort("COM1");
- am.open();
- try
- {
- Thread.sleep(2000);
- am.test();
-
- }
- catch(Exception ex)
- {
- }*/
-
}
catch(Exception ex)
{
Modified: trunk/ggc-pump/src/ggc/pump/util/DataAccessPump.java
===================================================================
--- trunk/ggc-pump/src/ggc/pump/util/DataAccessPump.java 2008-08-12 12:12:48 UTC (rev 475)
+++ trunk/ggc-pump/src/ggc/pump/util/DataAccessPump.java 2008-08-12 15:37:52 UTC (rev 476)
@@ -186,33 +186,17 @@
private DataAccessPump()
{
super(I18nControl.getInstance());
- this.loadFonts();
+ }
- //m_i18n.createInstance(this);
- // loadAvailableLFs();
- // loadLanguageInfo();
-//x m_meterManager = new PumpManager();
-
-// this.m_configFile = new DbToolApplicationGGC();
-// this.m_configFile.loadConfig();
-
-// m_cfgMgr = new ConfigurationManager(this);
-
-// this.m_settings = new GGCProperties(this, this.m_configFile, m_cfgMgr);
-
- m_i18n = I18nControl.getInstance();
-
- //loadOptions();
-
- //this.verifyComConfig();
+
+ public void initSpecial()
+ {
this.loadTimeZones();
-
loadPumpsTable();
-
checkPrerequisites();
-
- }
-
+ }
+
+
// Method: getInstance
// Author: Andy
/**
Modified: trunk/web_page/inc_download.inc
===================================================================
--- trunk/web_page/inc_download.inc 2008-08-12 12:12:48 UTC (rev 475)
+++ trunk/web_page/inc_download.inc 2008-08-12 15:37:52 UTC (rev 476)
@@ -1,37 +1,100 @@
<blockquote>
<br>
-<h2 class="header">Download</h2>
-There are 2 ways to get a copy. You can check out sources from CVS on sourceforge and compile them. You will get the most recent version, but it might be broken. Or you are free to download a released package. But be warned, until we reach version 0.1, they will be developer releases. They WILL contain bugs, are not optimized, and can do very bad things.
+<h1 class="header">Download</h1>
+
+<br>
+<h2>Packaged software</h2>
+
+This is preffered way of getting software (intended for all end users). In short you need to download package and install it.
+This is easier done on Windows platform, since we have installer, and little harder for all other platforms. There are detailed
+instructions in instalation package (see \docs folder, files Readme_1st and Readme, this 2 files are translated into german and
+slovene (as is application)).
+
+<h3>GGC Releases</h3>
+
+<h4>Version 0.3</h4>
+
<ul>
-<li>CVS:</li><br>
- CVS system was deprecated (there are still old file there) when Sourceforge installed SVN, which is now the way to get sources.<br><br>
+<li><a href="http://downloads.sourceforge.net/ggc/GGC_Setup_0.3_jre.exe?use_mirror=osdn">GGC 0.3 Windows Installer (with JRE)</a> - You should use this
+install file if you have no knowledge about Java. It contains JRE, so the file is much bigger, but you can just install it, out-of-the-box,
+without any special intervention (advised for most end-users).</li>
+<li><a href="http://downloads.sourceforge.net/ggc/GGC_Setup_0.3.exe?use_mirror=osdn">GGC 0.3 Windows Installer (without JRE)</a> - If you have Java
+already on your computer, and your knowledge of computer is above average you can decide to take this file and manually configure
+application to run with your installed Java.</li>
+
+<li><a href="http://downloads.sourceforge.net/ggc/GGC_0.3.zip?use_mirror=osdn">GGC 0.3 Zip file</a>, with all files - For all other platforms you need
+to use this file. You just extract it and then follow by reading Readme_1st to get it running.</li>
+
+
+</ul>
+
+
+<h3>USB Releases</h3>
+
+<h4>GGC USB Version</h4>
+<ul>
+<li><!-- a href="http://downloads.sourceforge.net/ggc/GGC_0.2.9.7.zip">GGC 0.3</a> -->
+USB Release is not available at this time, but it will be added by end of September
+</li>
+</ul>
+
+
+<h4>USB VMs</h4>
+<ul>
+<li><a href="http://downloads.sourceforge.net/ggc/Windows_16.zip?use_mirror=osdn">Windows VM [Java 1.6]</a></li>
+<li><a href="http://downloads.sourceforge.net/ggc/Linux_16.zip?use_mirror=osdn">Linux VM [Java 1.6]</a></li>
+<li><a href="http://downloads.sourceforge.net/ggc/FreeBSD_v7_16.zip?use_mirror=osdn">FreeBSD VM (FreeBSD 7.0) [Java 1.6]</a></li>
+</ul>
+
+
+
+<h3>Other files</h3>
+
+
+<h4>USDA Nutrition Database</h4>
+
+<ul>
+<li><a href="http://downloads.sourceforge.net/ggc/USDA_Nutrient_Db_for_Standard_Reference_r18.zip?use_mirror=kent">USDA Nutrition Database 18</a> - Our software supports any of USDA databases, but since we are using some of data here imported (Home Weights), we are still little bit dependant. If you will start with your own User database, you should install newer version, but for some of here supplied User Databases, you will need specific versions. We will remove this dependency in the future, but for now our "Supported" version is still 18.</li>
+</ul>
+
+
+<h4>Custom Nutrition Databases</h4>
+
+<ul>
+<li><a href="http://downloads.sourceforge.net/ggc/SLO_Db_1.zip?use_mirror=osdn">Slovenian Nutrition Database 1</a> - This is nutrition database for people living in Slovenia and speaking Slovenian. All instructions and notes are inside zip archive. Required USDA SR-18.</li>
+</ul>
+
+
+
+<br>
+<h2>Build from source</h2>
+
+If you are Java developer, you will probably try to build whole thing from source code. All our current code is in SVN (we
+used CVS few years back). If you are not ready for a challenge, then try to download packaged software release. There will
+be pause between releases (6 months or more for major releases, minor releases will be released, when needed changes are
+done).
+
+
+<ul>
+
<li>SVN:</li><br>
SVN system is current versioning system. You neeed to pull down whole tree. When builing with ANT,
compiled files will be stored into ggc-support\bin folder from where you can directly run it.<br>
Here is the link to the Sourceforge SVN Page:<br>
- <a href="http://sourceforge.net/svn/?group_id=49749">http://sourceforge.net/cvs/?group_id=49749</a> <br><br>
+ <a href="http://sourceforge.net/svn/?group_id=49749">http://sourceforge.net/svn/?group_id=49749</a> <br><br>
For details on how to check out sources see the Sourceforge SVN page.<br><br>
-
-<li>Packages:</li><br>
- Packages are in two formats. Windows format which is NullSoft installer (.exe file) (without java) and
- zip file containing all files packaged. <br><br>
- Windows file will install on your system and is runnable by clicking on right icon. In some cases java
- install doesn't set right paths, so java executable is not in path. In this case it's required to make
- change to run.cmd file in \bin folder.<br><br>
+<li>CVS:</li><br>
+ CVS system was deprecated (there are still old file there) when Sourceforge installed SVN, which is now the way to get sources.<br><br>
+ <a href="http://sourceforge.net/cvs/?group_id=49749">http://sourceforge.net/cvs/?group_id=49749</a> <br><br>
- Zip file must just be unzipped in folder of your choice and you can run it by invoking either run.cmd or
- run.sh. If you are running Mac or some other system which isn't supported by these two files, please
- let know support (ours) immediately.<br><br>
+</ul>
- Our Update/Startup mechanism added another file (StartupConfig.properties). There is also JAVA_EXE
- parameter in there which you might need to set (try running first if application is shown disregard
- this note, if not read further). On Windows you need to use double \\ (if you set path like C:\Windows,
- correct form would be C:\\Windows, on other system where you use / for path use only one...
-
- Link to files: <br>
+<br>
+<h2>Link to sourceforge files download area</h2>
+
<a href="http://sourceforge.net/project/showfiles.php?group_id=49749">http://sourceforge.net/project/showfiles.php?group_id=49749</a><br>
Modified: trunk/web_page/inc_features.inc
===================================================================
--- trunk/web_page/inc_features.inc 2008-08-12 12:12:48 UTC (rev 475)
+++ trunk/web_page/inc_features.inc 2008-08-12 15:37:52 UTC (rev 476)
@@ -10,22 +10,26 @@
<b>Currently Implemented Features:</b>
<ul>
- <li>You can enter:</li>
+ <li>Entering You can enter:</li>
<ul>
<li>Blood Glucose (BG) Values (in both formats)</li>
<li>2 different Insulins (Basal, Bolus)</li>
<li>Carbhydrates intake</li>
<li>Activity level</li>
- <li>Urine tests</li>
+ <li>Urine tests</li>
<li>Comments</li>
+ <li>Adding food data to daily entries</li>
</ul>
<li>Store your data in:</li>
<ul>
- <li>With help of Hibernate (see <a href="http://www.hibernate.org/">http://www.hibernate.org/</a> we now support wide
+ <li>With help of Hibernate (see <a href="http://www.hibernate.org/">http://www.hibernate.org/</a>) we now support wide
wariety of databases.
- <li>We have one "internal" database, which can be used out-of-the-box (we use H2 database for that)</li>
+ <li>We have one "internal" database, which can be used out-of-the-box (we use <a href="http://www.h2database.com/">H2</a> database for that)</li>
+ <li>Backup data and restore (full only)</li>
+ <li>Database versioning</li>
+
</ul>
- <li>Plots:</li>
+ <li>Graphs:</li>
<ul>
<li>One Day (shows a BG curve, avg BG, insulin and BU intake)</li>
<li>Course (shows you your values over a period of time)</li>
@@ -50,44 +54,44 @@
<li>Customize whole application</li>
<li>Two sub-projects were created: Meter Tool and Pump Tool (see page Sub-Projects)</li>
<li>Help framework integrated (no help pages are yet written)</li>
+ <li>USB Image of GGC</li>
+ <li>Application update: Client side is working, we need to implement server side</li>
+ <li>Tools integration:</li>
+ <ul>
+ <li>Meter Tool integration (v0.2) - See projects page for details.</li>
+ </ul>
+
</ul>
<b>Planned Features:</b>
<ul>
-<li><i>In next version (0.3):</i></li>
-<ul>
- <li>Backup data and restore (non-GUI)</li>
- <li>Db Versioning</li>
- <li>Rewrite Readme</li>
- <li>Error handling (and logging)</li>
- <li>Add some stuff in Daily</li>
- <li>Application update - Client side</li>
- <li>Startup add support for libraries with native parts</li>
- <li>USB Image of GGC</li>
-</ul>
<li><i>Version (0.4) - (end of 2008):</i></li>
<ul>
- <li>Restore data (full)</li>
- <li>Rewrite "plots" with new library (support for printing and better display)</li>
- <li>Integration of Meter Tool</li>
- <li>Basic Pump support (for manual input of data)</li>
- <li>Integration of Pump Tool</li>
- <li>Add ratio for smart insulin usage recommendations (good for pump users)</li>
- <li>Update system - Server side</li>
- <li>Write help pages for English</li>
+ <li>Rewrite "graphs" with new library (support for printing and better display)</li>
+ <li>Bolus Helper (help with bolus dosage)</li>
+ <li>Add ratios for Bolus Helper (good for pump users)</li>
+ <li>Update system - Server side</li>
+ <li>Write help pages for English</li>
+ <li>Extend nutrition databases</li>
+ <li>Add Remote Food database</li>
+ <li>Db Tool</li>
+ <li>Support for multiple persons</li>
+ <li>Printing of foods and CH usage</li>
+ <li>Backup/Restore extension</li>
+ <li>Integration of Pump Tool</li>
</ul>
<li><i>Version (0.5):</i></li>
<ul>
- <li>Support for multiple persons</li>
<li>Restore data (partitial/update)</li>
- <li>Appointment and Doctors handling</li>
- <li>Support for multiple instances of GGC and their communication</li>
- <li>Internet data (links for pages, forums, blogs - informational)</li>
- <li>Import of data from SiDiary Desktop application. SiDiary has its sister applications running
+ <li>Appointment and Doctors handling</li>
+ <li>Support for multiple instances of GGC and their communication</li>
+ <li>Internet data (links for pages, forums, blogs - informational)</li>
+ <li>Import of data from SiDiary Desktop application. SiDiary has its sister applications running
on many small devices (PocketPC, Palms, SmartPhones, Java Phones), and it has import for a lot of
Meters and also some pumps...</li>
+ <li>Integration of CGMS Tool</li>
</ul>
...
[truncated message content] |
|
From: <and...@us...> - 2008-08-24 14:22:01
|
Revision: 502
http://ggc.svn.sourceforge.net/ggc/?rev=502&view=rev
Author: andyrozman
Date: 2008-08-24 14:22:06 +0000 (Sun, 24 Aug 2008)
Log Message:
-----------
Modified Paths:
--------------
trunk/ggc/build/GGCVersion.properties
trunk/ggc/build/History.txt
trunk/ggc/data/update/GGC_Update.properties
trunk/ggc/src/Changelog
trunk/ggc/src/How_To_Upgrade.txt
trunk/ggc/src/ggc/GGC.java
trunk/ggc/src/ggc/core/nutrition/NutritionTreeDialog.java
trunk/ggc-cgm/src/ggc/cgm/device/minimed/MinimedCareLinkData.java
trunk/ggc-cgm/src/ggc/cgm/gui/CGMDisplayDataDialog.java
trunk/ggc-cgm/src/ggc/cgm/gui/CGMExportDialog.java
trunk/ggc-meter/.classpath
trunk/ggc-meter/src/ggc/meter/data/MeterValuesTable.java
trunk/ggc-meter/src/ggc/meter/data/MeterValuesTableModel.java
trunk/ggc-meter/src/ggc/meter/device/AbstractSerialMeter.java
trunk/ggc-meter/src/ggc/meter/device/ascensia/AscensiaMeter.java
trunk/ggc-meter/src/ggc/meter/device/onetouch/OneTouchMeter.java
trunk/ggc-meter/src/ggc/meter/test/MeterConsoleTester.java
trunk/ggc-plugin_base/.classpath
trunk/ggc-plugin_base/src/ggc/plugin/protocol/SerialProtocol.java
trunk/ggc-pump/.classpath
trunk/ggc-pump/src/ggc/core/db/hibernate/DayValueH.java
trunk/ggc-pump/src/ggc/pump/data/PumpValuesTableModel.java
trunk/ggc-pump/src/ggc/pump/device/PumpException.java
trunk/ggc-pump/src/ggc/pump/device/accuchek/AccuChekSmartPixPump.java
trunk/ggc-pump/src/ggc/pump/device/animas/EZManagerDb.java
trunk/ggc-pump/src/ggc/pump/device/minimed/MinimedCareLinkData.java
trunk/ggc-pump/src/ggc/pump/gui/PumpDisplayDataDialog.java
trunk/ggc-pump/src/ggc/pump/gui/config/SimpleConfigurationHelp.java
trunk/ggc-pump/src/ggc/pump/util/DataAccessPump.java
Removed Paths:
-------------
trunk/data/
trunk/ggc-cgm/src/ggc/cgm/list/
Property Changed:
----------------
trunk/ggc-pump/
Modified: trunk/ggc/build/GGCVersion.properties
===================================================================
--- trunk/ggc/build/GGCVersion.properties 2008-08-23 19:42:54 UTC (rev 501)
+++ trunk/ggc/build/GGCVersion.properties 2008-08-24 14:22:06 UTC (rev 502)
@@ -6,13 +6,13 @@
#
# Core Version
#
-ggc-core.version=0.3
+ggc-core.version=0.3.3
#
# Main GUI Version (this version is same as Core always)
#
-ggc-main.version=0.3
+ggc-main.version=0.3.3
#
@@ -24,5 +24,5 @@
#
# Lang version (this one has it's own versioning too). See history.txt
#
-ggc-lang.version=0.2.5
+ggc-lang.version=0.2.7
Modified: trunk/ggc/build/History.txt
===================================================================
--- trunk/ggc/build/History.txt 2008-08-23 19:42:54 UTC (rev 501)
+++ trunk/ggc/build/History.txt 2008-08-24 14:22:06 UTC (rev 502)
@@ -22,6 +22,9 @@
0.2.2 -> 0.2.13.1 (added keywords)
0.2.3 -> 0.2.13.1 (added keywords)
0.2.4 -> 0.2.15 (more translation for de added)
+0.2.5 -> 0.2.19
+0.2.6 -> 0.3
+0.2.7 -> 0.3.3
Modified: trunk/ggc/data/update/GGC_Update.properties
===================================================================
--- trunk/ggc/data/update/GGC_Update.properties 2008-08-23 19:42:54 UTC (rev 501)
+++ trunk/ggc/data/update/GGC_Update.properties 2008-08-24 14:22:06 UTC (rev 502)
@@ -76,14 +76,14 @@
COMPONENT_1_VERSION=0.3
COMPONENT_1_VERSION_NUM=1
COMPONENT_1_ROOT_DIR=/lib/ggc
-COMPONENT_1_FILES=%ROOT%/ggc-main-0.3.2.jar
+COMPONENT_1_FILES=%ROOT%/ggc-main-0.3.3.jar
COMPONENT_2_GROUP=1
COMPONENT_2_NAME=GGC Core
COMPONENT_2_VERSION=0.3
COMPONENT_2_VERSION_NUM=1
COMPONENT_2_ROOT_DIR=/lib/ggc
-COMPONENT_2_FILES=%ROOT%/ggc-core-0.3.2.jar
+COMPONENT_2_FILES=%ROOT%/ggc-core-0.3.3.jar
COMPONENT_3_GROUP=1
COMPONENT_3_NAME=GGC Little
@@ -98,124 +98,124 @@
COMPONENT_4_VERSION=0.2.5
COMPONENT_4_VERSION_NUM=1
COMPONENT_4_ROOT_DIR=/lib/ggc
-COMPONENT_4_FILES=%ROOT%/ggc-lang-0.2.6.jar
+COMPONENT_4_FILES=%ROOT%/ggc-lang-0.2.7.jar
-COMPONENT_18_GROUP=2
-COMPONENT_18_NAME=GGC Plugin Base
-COMPONENT_18_VERSION=0.1.3
-COMPONENT_18_VERSION_NUM=1
-COMPONENT_18_ROOT_DIR=/lib/ggc
-COMPONENT_18_FILES=%ROOT%/ggc-plugin_base-0.1.4.jar
-
-
-
COMPONENT_5_GROUP=2
-COMPONENT_5_NAME=Meter Tool
-COMPONENT_5_VERSION=0.3.3
+COMPONENT_5_NAME=GGC Plugin Base
+COMPONENT_5_VERSION=0.1.5
COMPONENT_5_VERSION_NUM=1
COMPONENT_5_ROOT_DIR=/lib/ggc
-COMPONENT_5_FILES=%ROOT%/ggc-meter_tool-0.3.3.jar
+COMPONENT_5_FILES=%ROOT%/ggc-plugin_base-0.1.5.jar
+
+
COMPONENT_6_GROUP=2
-COMPONENT_6_NAME=Pump Tool
-COMPONENT_6_VERSION=N/A
+COMPONENT_6_NAME=Meter Tool
+COMPONENT_6_VERSION=0.3.3
COMPONENT_6_VERSION_NUM=1
-COMPONENT_6_ROOT_DIR=
-COMPONENT_6_FILES=
+COMPONENT_6_ROOT_DIR=/lib/ggc
+COMPONENT_6_FILES=%ROOT%/ggc-meter_tool-0.3.3.jar
-
COMPONENT_7_GROUP=2
-COMPONENT_7_NAME=CGMS Tool
+COMPONENT_7_NAME=Pump Tool
COMPONENT_7_VERSION=N/A
COMPONENT_7_VERSION_NUM=1
COMPONENT_7_ROOT_DIR=
COMPONENT_7_FILES=
-COMPONENT_8_GROUP=3
-COMPONENT_8_NAME=Hibernate Framework
-COMPONENT_8_VERSION=3.1
-#COMPONENT_7_VERSION=3.2.6 GA
+COMPONENT_8_GROUP=2
+COMPONENT_8_NAME=CGMS Tool
+COMPONENT_8_VERSION=N/A
COMPONENT_8_VERSION_NUM=1
-COMPONENT_8_ROOT_DIR=/lib/hibernate3
-COMPONENT_8_FILES=%ROOT%/antlr-2.7.6rc1.jar;%ROOT%/asm.jar;%ROOT%/asm-attrs.jar;%ROOT%/c3p0-0.9.0.jar;%ROOT%/cglib-2.1.3.jar;%ROOT%/commons-collections-2.1.1.jar;%ROOT%/commons-lang.jar;%ROOT%/commons-lang-2.0.jar;%ROOT%/commons-logging-1.0.4.jar;%ROOT%/dom4j-1.6.1.jar;%ROOT%/ehcache-1.1.jar;%ROOT%/hibernate3.jar;%ROOT%/jdbc2_0-stdext.jar;%ROOT%/jta.jar;%ROOT%/log4j-1.2.11.jar
-#COMPONENT_7_FILES=%ROOT%/antlr-2.7.6.jar;%ROOT%/asm.jar;%ROOT%/asm-attrs.jar;%ROOT%/c3p0-0.9.1.jar;%ROOT%/cglib-2.1.3.jar;%ROOT%/commons-collections-2.1.1.jar;%ROOT%/commons-lang.jar;%ROOT%/commons-lang-2.0.jar;%ROOT%/commons-logging-1.0.4.jar;%ROOT%/dom4j-1.6.1.jar;%ROOT%/ehcache-1.2.3.jar;%ROOT%/hibernate3.jar;%ROOT%/jdbc2_0-stdext.jar;%ROOT%/jta.jar;%ROOT%/log4j-1.2.11.jar
+COMPONENT_8_ROOT_DIR=
+COMPONENT_8_FILES=
+
COMPONENT_9_GROUP=3
-COMPONENT_9_NAME=Internal Database [H2]
-COMPONENT_9_VERSION=1.0.69
+COMPONENT_9_NAME=Hibernate Framework
+COMPONENT_9_VERSION=3.1
+#COMPONENT_7_VERSION=3.2.6 GA
COMPONENT_9_VERSION_NUM=1
-COMPONENT_9_ROOT_DIR=/lib/jdbc
-COMPONENT_9_FILES=%ROOT%/h2-1.0.69.jar
+COMPONENT_9_ROOT_DIR=/lib/hibernate3
+COMPONENT_9_FILES=%ROOT%/antlr-2.7.6rc1.jar;%ROOT%/asm.jar;%ROOT%/asm-attrs.jar;%ROOT%/c3p0-0.9.0.jar;%ROOT%/cglib-2.1.3.jar;%ROOT%/commons-collections-2.1.1.jar;%ROOT%/commons-lang.jar;%ROOT%/commons-lang-2.0.jar;%ROOT%/commons-logging-1.0.4.jar;%ROOT%/dom4j-1.6.1.jar;%ROOT%/ehcache-1.1.jar;%ROOT%/hibernate3.jar;%ROOT%/jdbc2_0-stdext.jar;%ROOT%/jta.jar;%ROOT%/log4j-1.2.11.jar
+#COMPONENT_9_FILES=%ROOT%/antlr-2.7.6.jar;%ROOT%/asm.jar;%ROOT%/asm-attrs.jar;%ROOT%/c3p0-0.9.1.jar;%ROOT%/cglib-2.1.3.jar;%ROOT%/commons-collections-2.1.1.jar;%ROOT%/commons-lang.jar;%ROOT%/commons-lang-2.0.jar;%ROOT%/commons-logging-1.0.4.jar;%ROOT%/dom4j-1.6.1.jar;%ROOT%/ehcache-1.2.3.jar;%ROOT%/hibernate3.jar;%ROOT%/jdbc2_0-stdext.jar;%ROOT%/jta.jar;%ROOT%/log4j-1.2.11.jar
COMPONENT_10_GROUP=3
-COMPONENT_10_NAME=Atech Tools
-COMPONENT_10_VERSION=0.2.1
+COMPONENT_10_NAME=Internal Database [H2]
+COMPONENT_10_VERSION=1.0.69
COMPONENT_10_VERSION_NUM=1
-COMPONENT_10_ROOT_DIR=/lib/utils
-COMPONENT_10_FILES=%ROOT%/atech-tools-0.2.3.jar
+COMPONENT_10_ROOT_DIR=/lib/jdbc
+COMPONENT_10_FILES=%ROOT%/h2-1.0.69.jar
COMPONENT_11_GROUP=3
-COMPONENT_11_NAME=iText Pdf Library
-COMPONENT_11_VERSION=2.0.7
+COMPONENT_11_NAME=Atech Tools
+COMPONENT_11_VERSION=0.2.1
COMPONENT_11_VERSION_NUM=1
COMPONENT_11_ROOT_DIR=/lib/utils
-COMPONENT_11_FILES=%ROOT%/iText-2.0.7.jar
+COMPONENT_11_FILES=%ROOT%/atech-tools-0.2.4.jar
COMPONENT_12_GROUP=3
-COMPONENT_12_NAME=RxtxComm API
-COMPONENT_12_VERSION=2.1.7
+COMPONENT_12_NAME=iText Pdf Library
+COMPONENT_12_VERSION=2.0.7
COMPONENT_12_VERSION_NUM=1
COMPONENT_12_ROOT_DIR=/lib/utils
-COMPONENT_12_FILES=%ROOT%/RXTXcomm-2.1.7.jar
-COMPONENT_12_PLATFORM_SPECIFIC=true
-COMPONENT_12_PLATFORM_SPECIFIC_TYPE=2
-COMPONENT_12_PLATFORM_SUPPORTED=win linux mac solaris
+COMPONENT_12_FILES=%ROOT%/iText-2.0.7.jar
+
+COMPONENT_13_GROUP=3
+COMPONENT_13_NAME=RxtxComm API
+COMPONENT_13_VERSION=2.1.7
+COMPONENT_13_VERSION_NUM=1
+COMPONENT_13_ROOT_DIR=/lib/utils
+COMPONENT_13_FILES=%ROOT%/RXTXcomm-2.1.7-a1.jar
+COMPONENT_13_PLATFORM_SPECIFIC=true
+COMPONENT_13_PLATFORM_SPECIFIC_TYPE=2
+COMPONENT_13_PLATFORM_SUPPORTED=win linux mac solaris
#COMPONENT_11_PLATFORM_SPECIFIC_JAR_WIN=jar_win.jar
#COMPONENT_11_PLATFORM_SPECIFIC_JAR_LINUX=jar_linux.jar
#COMPONENT_11_PLATFORM_SPECIFIC_JAR_MAC=jar_mac.jar
#COMPONENT_11_PLATFORM_SPECIFIC_JAR_SOLARIS=jar_solaris.jar
-COMPONENT_13_GROUP=3
-COMPONENT_13_NAME=Skin L&F
-COMPONENT_13_VERSION=6.7
-COMPONENT_13_VERSION_NUM=1
-COMPONENT_13_ROOT_DIR=/lib/utils
-COMPONENT_13_FILES=%ROOT%/skinlf-6.7.jar
-
COMPONENT_14_GROUP=3
-COMPONENT_14_NAME=JFreeChart
-COMPONENT_14_VERSION=1.0.9
+COMPONENT_14_NAME=Skin L&F
+COMPONENT_14_VERSION=6.7
COMPONENT_14_VERSION_NUM=1
-COMPONENT_14_ROOT_DIR=/lib/jfreechart
-COMPONENT_14_FILES=%ROOT%/jcommon-1.0.12.jar;%ROOT%/jfreechart-1.0.9.jar;%ROOT%/jfreechart-1.0.9-experimental.jar;%ROOT%/jfreechart-1.0.9-swt.jar;%ROOT%/swtgraphics2d.jar
+COMPONENT_14_ROOT_DIR=/lib/utils
+COMPONENT_14_FILES=%ROOT%/skinlf-6.7.jar
-
COMPONENT_15_GROUP=3
-COMPONENT_15_NAME=Java Help
-COMPONENT_15_VERSION=2.0.5
+COMPONENT_15_NAME=JFreeChart
+COMPONENT_15_VERSION=1.0.9
COMPONENT_15_VERSION_NUM=1
-COMPONENT_15_ROOT_DIR=/lib/utils
-COMPONENT_15_FILES=%ROOT%/jhall-2.0.5.jar
+COMPONENT_15_ROOT_DIR=/lib/jfreechart
+COMPONENT_15_FILES=%ROOT%/jcommon-1.0.12.jar;%ROOT%/jfreechart-1.0.9.jar;%ROOT%/jfreechart-1.0.9-experimental.jar;%ROOT%/jfreechart-1.0.9-swt.jar;%ROOT%/swtgraphics2d.jar
COMPONENT_16_GROUP=3
-COMPONENT_16_NAME=Log4j
-COMPONENT_16_VERSION=1.2.15
+COMPONENT_16_NAME=Java Help
+COMPONENT_16_VERSION=2.0.5
COMPONENT_16_VERSION_NUM=1
COMPONENT_16_ROOT_DIR=/lib/utils
-COMPONENT_16_FILES=%ROOT%/log4j-1.2.15.jar
+COMPONENT_16_FILES=%ROOT%/jhall-2.0.5.jar
+
COMPONENT_17_GROUP=3
-COMPONENT_17_NAME=Pygmy Http Daemon
-COMPONENT_17_VERSION=0.2
+COMPONENT_17_NAME=Log4j
+COMPONENT_17_VERSION=1.2.15
COMPONENT_17_VERSION_NUM=1
COMPONENT_17_ROOT_DIR=/lib/utils
-COMPONENT_17_FILES=%ROOT%/pygmy-core-0.2.jar;%ROOT%/pygmy-handlers-0.2.jar
+COMPONENT_17_FILES=%ROOT%/log4j-1.2.15.jar
+COMPONENT_18_GROUP=3
+COMPONENT_18_NAME=Pygmy Http Daemon
+COMPONENT_18_VERSION=0.2
+COMPONENT_18_VERSION_NUM=1
+COMPONENT_18_ROOT_DIR=/lib/utils
+COMPONENT_18_FILES=%ROOT%/pygmy-core-0.2.jar;%ROOT%/pygmy-handlers-0.2.jar
+
#COMPONENT_13_GROUP=3
#COMPONENT_13_NAME=Java Help
#COMPONENT_13_VERSION=2.0.5
Modified: trunk/ggc/src/Changelog
===================================================================
--- trunk/ggc/src/Changelog 2008-08-23 19:42:54 UTC (rev 501)
+++ trunk/ggc/src/Changelog 2008-08-24 14:22:06 UTC (rev 502)
@@ -1,3 +1,14 @@
+
+2008-08-20 (0.3.3)
+ * Nutrition Tree is fixed (bug on FreeBSD system, maybe even on linux)
+ * Added How_To_Update.txt
+ * fixed statup creation for non-windows systems
+
+2008-08-20 (0.3.2)
+ * Bolus Helper fixes
+ * Source code changes to remove java warnings
+
+
2008-08-13 (0.3.1) Andy
* Bolus Helper first implementation (needed some fixes and also extended and basic ratios done)
Modified: trunk/ggc/src/How_To_Upgrade.txt
===================================================================
--- trunk/ggc/src/How_To_Upgrade.txt 2008-08-23 19:42:54 UTC (rev 501)
+++ trunk/ggc/src/How_To_Upgrade.txt 2008-08-24 14:22:06 UTC (rev 502)
@@ -10,28 +10,107 @@
===============
-At this point our application has no ability to make automatic upgrades. Because of this all updates need to be applied
-manually.
+At this point our application has no ability to make automatic upgrades. Because of this all updates need
+to be applied manually.
-Problem with all database applications is that we need to make update to application and to database. Because of this
-our updates have special tag in name (for example db_v5). You need to look into README file to determine which version
-of database update needs. In our application there is option to backup database (Tools->Database Maintainance->Backup).
-At this point Restore option is not available, but it will be available in one of our first updates. We will change
-this document accordingly.
+Problem with all database applications is that we need to make update to application and to database. In each
+update package there will be file, with all releases listed and version of database they use. Depending on
+information found there you will select which upgrade way to go. (difference is in step 2)
-According to database tag, you have now two options of update. (see A, B)
-
HOW ARE UPDATE FILES PACKAGED
=============================
+Update files contain this document (in future in all supported languages), file database_info.txt, with database
+information and Changes_<version>.txt (this is condensed version of Changes.txt document in SVN). Next there are
+directories that you need to update. There will be at least two directories there, sometimes three.
+ - data: contains update file, which tells us which versions we are currently using (this is used to
+ generate startup files, when you run run_<os_name>.<os_ext> batch script).
+ - libs: contains all libraries and our software
+ - bin: contains script
+ - docs: contains this documentation
+
+How to apply this update will be shown in few steps. Please follow them to the letter.
+STEP 1: Create backup copy of your data
+----------------------------------------
+Start GNU Gluco Control and wait for it to load, then go to Tools -> Database Maintainance -> Database backup.
-HOW TO UPGRADE IF DATABASE VERSION IS THE SAME
-==============================================
+In next window select all object and click on backup. New backup file will be created in data\export
+directory (GGC backup <year>_<month>_<day> <hour>_<minute>_<second>. Copy it to same safe location.
+Close GNU Gluco Control.
+
+STEP 2: Create backup copy of application
+------------------------------------------
+
+Open your favorite File manager and create directory somewhere (probably something like
+GGC_Backup_<current_date>). Copy whole GGC instalation there (it should have at least bin, lib and data
+subdirectories, sometime also jre). Copy all of them.
+
+This copy will be used in case that something goes wrong in next steps.
+
+
+
+STEP 3: Make actual update
+---------------------------
+
+Please take a look at database_info.txt file. You need to compare last entry (current version) and version
+you have installed (it is displayed in title bar when you start application). If the versions are the same
+go to step 3A if not step 3B.
+
+
+STEP 3.A: Update with same version
+-----------------------------------
+
+Use File manager (I advise to use some that has integrated Zip archiver) and open archive file, you need to
+copy everything into your instalation directory. You will be asked to overwrite some files, you need to
+overwrite all files there.
+
+
+STEP 3.B: Update with different version
+----------------------------------------
+
+1. Do all actions in STEP 3.A
+
+2. Run run_<os_name>.<os_extension>. Application will display some errors, this is OK. We needed to run this
+ script just to recreate startup script. Close application as soon as you can.
+
+3. Now you have new scripts. You need to run init_db.<os_extension> which will recreate database
+
+
+
+STEP 4: Start new version of application
+-----------------------------------------
+
+Start application, which should now start without problems.
+
+
+STEP 4.A: Starting with same version
+-------------------------------------
+
+When application is started you should have all your data there, since we didn't do any changes to
+our database
+
+
+STEP 4.B: Starting with different version
+------------------------------------------
+
+Now when application is started there will be no data available anymore. Database was totally recreated
+(and also deleted), so it's "clean" now. You will have to do following to get your data back. Click on
+Tools -> Database Maintainance -> Backup Restore. Select file you created in step 1 and in next window
+select all objects and click on Restore. After restart all your data should be there.
+
+
+STEP 5: Finished
+-----------------
+
+Update is finished.
+
+
+If you had any problems with update please contact us, and we will help you. (gg...@at...)
Modified: trunk/ggc/src/ggc/GGC.java
===================================================================
--- trunk/ggc/src/ggc/GGC.java 2008-08-23 19:42:54 UTC (rev 501)
+++ trunk/ggc/src/ggc/GGC.java 2008-08-24 14:22:06 UTC (rev 502)
@@ -51,9 +51,9 @@
private static MainFrame s_mainWindow;
// Version information
- public static String s_version = "0.3.2";
+ public static String s_version = "0.3.3";
public static String full_version = "v" + s_version;
- public static String version_date = "21th August 2008";
+ public static String version_date = "24th August 2008";
public static boolean isDbOk()
{
Modified: trunk/ggc/src/ggc/core/nutrition/NutritionTreeDialog.java
===================================================================
--- trunk/ggc/src/ggc/core/nutrition/NutritionTreeDialog.java 2008-08-23 19:42:54 UTC (rev 501)
+++ trunk/ggc/src/ggc/core/nutrition/NutritionTreeDialog.java 2008-08-24 14:22:06 UTC (rev 502)
@@ -57,6 +57,7 @@
import javax.swing.JScrollPane;
import javax.swing.JSplitPane;
import javax.swing.JTree;
+import javax.swing.SwingUtilities;
import javax.swing.event.TreeSelectionEvent;
import javax.swing.event.TreeSelectionListener;
import javax.swing.tree.TreeSelectionModel;
@@ -386,26 +387,31 @@
public void mouseReleased(MouseEvent me)
{
- // System.out.println("Mouse released");
+ //System.out.println("Mouse released");
+
+ //System.out.println("MouseEvent trigger: " + me.isPopupTrigger());
+ //System.out.println("MouseEvent Right Mouse: " + SwingUtilities.isRightMouseButton(me));
+
- if (me.isPopupTrigger()) // right click, show popup menu
+ if ((me.isPopupTrigger()) || // right click, show popup menu
+ (SwingUtilities.isRightMouseButton(me)))
{
+ //System.out.println("In pop trigger");
mouse_selected_object = tree.getClosestPathForLocation(me.getX(), me.getY()).getLastPathComponent();
tree.setSelectionPath(tree.getClosestPathForLocation(me.getX(), me.getY()));
- // System.out.println("MouseSelected: " + mouse_selected_object);
- // System.out.println(me.getSource());
- // mouse_selected_object = me.getSource();
+ //System.out.println("MouseSelected: " + mouse_selected_object);
+ //System.out.println(me.getSource());
createMenu();
- // System.out.println("Mouse: popUp trigger");
+ //System.out.println("Mouse: popUp trigger");
// pop.add(new MenuItem("Test"));
pop.show(me.getComponent(), me.getX(), me.getY());
}
else
{
- // System.out.println("Mouse: popUp NO trigger");
- // put the image stuff here
+ //System.out.println("Mouse: popUp NO trigger");
+ //put the image stuff here
}
}
Modified: trunk/ggc-cgm/src/ggc/cgm/device/minimed/MinimedCareLinkData.java
===================================================================
--- trunk/ggc-cgm/src/ggc/cgm/device/minimed/MinimedCareLinkData.java 2008-08-23 19:42:54 UTC (rev 501)
+++ trunk/ggc-cgm/src/ggc/cgm/device/minimed/MinimedCareLinkData.java 2008-08-24 14:22:06 UTC (rev 502)
@@ -11,8 +11,11 @@
private String time; // 2
private String raw_type; // 33
private String raw_values; // 34
+ @SuppressWarnings("unused")
private String raw_id; // 35
+ @SuppressWarnings("unused")
private String raw_upload_id; // 36
+ @SuppressWarnings("unused")
private String raw_seq_num; // 37
private String raw_device_type; // 38
Modified: trunk/ggc-cgm/src/ggc/cgm/gui/CGMDisplayDataDialog.java
===================================================================
--- trunk/ggc-cgm/src/ggc/cgm/gui/CGMDisplayDataDialog.java 2008-08-23 19:42:54 UTC (rev 501)
+++ trunk/ggc-cgm/src/ggc/cgm/gui/CGMDisplayDataDialog.java 2008-08-24 14:22:06 UTC (rev 502)
@@ -43,6 +43,8 @@
// private JLabel infoIcon = null;
// x private JLabel infoDescription = null;
+ private static final long serialVersionUID = 5334805788018378266L;
+
CGMReaderRunner mrr;
private DataAccessCGM m_da = DataAccessCGM.getInstance();
Modified: trunk/ggc-cgm/src/ggc/cgm/gui/CGMExportDialog.java
===================================================================
--- trunk/ggc-cgm/src/ggc/cgm/gui/CGMExportDialog.java 2008-08-23 19:42:54 UTC (rev 501)
+++ trunk/ggc-cgm/src/ggc/cgm/gui/CGMExportDialog.java 2008-08-24 14:22:06 UTC (rev 502)
@@ -29,6 +29,7 @@
public class CGMExportDialog extends JDialog implements ActionListener, StatusReporterInterface
{
+ private static final long serialVersionUID = -507664311820738400L;
CGMPlugInServer server;
Modified: trunk/ggc-meter/.classpath
===================================================================
--- trunk/ggc-meter/.classpath 2008-08-23 19:42:54 UTC (rev 501)
+++ trunk/ggc-meter/.classpath 2008-08-24 14:22:06 UTC (rev 502)
@@ -2,11 +2,11 @@
<classpath>
<classpathentry kind="src" path="src"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/rxtx-2.1.7"/>
<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/commons-logging-1.0.4"/>
<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/Xpp Xml Parser 3-1.1.4c"/>
<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/dom4j-1.6.1"/>
<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/commons-lang-2.4"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/rxtx-2.1.7-a1"/>
<classpathentry combineaccessrules="false" kind="src" path="/Atech-Tools"/>
<classpathentry combineaccessrules="false" kind="src" path="/GGC Plugin Base"/>
<classpathentry kind="output" path="bin"/>
Modified: trunk/ggc-meter/src/ggc/meter/data/MeterValuesTable.java
===================================================================
--- trunk/ggc-meter/src/ggc/meter/data/MeterValuesTable.java 2008-08-23 19:42:54 UTC (rev 501)
+++ trunk/ggc-meter/src/ggc/meter/data/MeterValuesTable.java 2008-08-24 14:22:06 UTC (rev 502)
@@ -26,16 +26,11 @@
import javax.swing.table.TableColumn;
-/**
- * @author stephan
- *
- * To change this generated comment edit the template variable "typecomment":
- * Window>Preferences>Java>Templates.
- */
public class MeterValuesTable extends JTable //implements TableModelListener
{
-//x private I18nControl m_ic = I18nControl.getInstance();
+ private static final long serialVersionUID = -599856528799069838L;
+ //x private I18nControl m_ic = I18nControl.getInstance();
MeterValuesTableModel model = null;
DataAccessMeter m_da = DataAccessMeter.getInstance();
@@ -170,6 +165,7 @@
class CheckCellRenderer extends JCheckBox implements TableCellRenderer
{
+ private static final long serialVersionUID = 8295003650375627769L;
protected Border m_noFocusBorder;
public CheckCellRenderer()
Modified: trunk/ggc-meter/src/ggc/meter/data/MeterValuesTableModel.java
===================================================================
--- trunk/ggc-meter/src/ggc/meter/data/MeterValuesTableModel.java 2008-08-23 19:42:54 UTC (rev 501)
+++ trunk/ggc-meter/src/ggc/meter/data/MeterValuesTableModel.java 2008-08-24 14:22:06 UTC (rev 502)
@@ -38,10 +38,10 @@
import javax.swing.table.AbstractTableModel;
-public class MeterValuesTableModel extends AbstractTableModel // implements
- // GlucoValueEventListener
+public class MeterValuesTableModel extends AbstractTableModel
{
+ private static final long serialVersionUID = 7198690314603156531L;
private I18nControl m_ic = I18nControl.getInstance();
// x private DataAccessMeter m_da = DataAccessMeter.getInstance();
Modified: trunk/ggc-meter/src/ggc/meter/device/AbstractSerialMeter.java
===================================================================
--- trunk/ggc-meter/src/ggc/meter/device/AbstractSerialMeter.java 2008-08-23 19:42:54 UTC (rev 501)
+++ trunk/ggc-meter/src/ggc/meter/device/AbstractSerialMeter.java 2008-08-24 14:22:06 UTC (rev 502)
@@ -134,19 +134,11 @@
String serial_port = null;
- public void setSerialPort(String port)
+ public void setSerialPort(String port) throws PlugInBaseException
{
this.serial_port = port;
- try
- {
- this.setPort(port);
- }
- catch(NoSuchPortException ex)
- {
- System.out.println("No Such Port Ex: " + ex);
-
- }
+ this.setPort(port);
}
Modified: trunk/ggc-meter/src/ggc/meter/device/ascensia/AscensiaMeter.java
===================================================================
--- trunk/ggc-meter/src/ggc/meter/device/ascensia/AscensiaMeter.java 2008-08-23 19:42:54 UTC (rev 501)
+++ trunk/ggc-meter/src/ggc/meter/device/ascensia/AscensiaMeter.java 2008-08-24 14:22:06 UTC (rev 502)
@@ -7,7 +7,6 @@
import ggc.meter.util.DataAccessMeter;
import ggc.meter.util.I18nControl;
import ggc.plugin.device.DeviceIdentification;
-import ggc.plugin.device.PlugInBaseException;
import ggc.plugin.output.AbstractOutputWriter;
import ggc.plugin.output.OutputUtil;
import ggc.plugin.output.OutputWriter;
@@ -79,7 +78,7 @@
SerialPort.FLOWCONTROL_NONE,
SerialProtocol.SERIAL_EVENT_BREAK_INTERRUPT);
- this.setSerialPort(portName);
+// this.setSerialPort(portName);
data = new ArrayList<MeterValuesEntry>();
@@ -93,12 +92,38 @@
{
System.out.println("Set port: " + portName);
- this.setPort(portName);
+ this.setSerialPort(portName);
+// this.setPort(portName);
if (!this.open())
{
this.m_status = 1;
}
+
+
+ end_string = (new Character((char)13)).toString();
+
+ //this.writer = new GGCFileOutputWriter();
+ this.output_writer.writeHeader();
+
+
+
+ //this.serialPort.
+
+ this.serialPort.notifyOnOutputEmpty(true);
+ this.serialPort.notifyOnBreakInterrupt(true);
+
+
+ this.end_strings = new String[2];
+ end_strings[0] = (new Character((char)3)).toString(); // ETX - End of Text
+ end_strings[1] = (new Character((char)4)).toString(); // EOT - End of Transmission
+ //end_strings[2] = (new Character((char)23)).toString(); // ETB - End of Text
+
+ this.text_def = new String[3];
+ this.text_def[0] = (new Character((char)2)).toString(); // STX - Start of Text
+ this.text_def[1] = (new Character((char)3)).toString(); // ETX - Start of Text
+ this.text_def[2] = (new Character((char)13)).toString(); // EOL - Start of Text
+
}
catch(Exception ex)
{
@@ -107,38 +132,6 @@
}
- end_string = (new Character((char)13)).toString();
-
- //this.writer = new GGCFileOutputWriter();
- this.output_writer.writeHeader();
-
-
-
- //this.serialPort.
-
- this.serialPort.notifyOnOutputEmpty(true);
- this.serialPort.notifyOnBreakInterrupt(true);
-
-
- this.end_strings = new String[2];
- end_strings[0] = (new Character((char)3)).toString(); // ETX - End of Text
- end_strings[1] = (new Character((char)4)).toString(); // EOT - End of Transmission
- //end_strings[2] = (new Character((char)23)).toString(); // ETB - End of Text
-
- this.text_def = new String[3];
- this.text_def[0] = (new Character((char)2)).toString(); // STX - Start of Text
- this.text_def[1] = (new Character((char)3)).toString(); // ETX - Start of Text
- this.text_def[2] = (new Character((char)13)).toString(); // EOL - Start of Text
-
- /*
- try
- {
- this.serialPort.addEventListener(this);
- }
- catch(Exception ex)
- {
- System.out.println(ex);
- }*/
}
Modified: trunk/ggc-meter/src/ggc/meter/device/onetouch/OneTouchMeter.java
===================================================================
--- trunk/ggc-meter/src/ggc/meter/device/onetouch/OneTouchMeter.java 2008-08-23 19:42:54 UTC (rev 501)
+++ trunk/ggc-meter/src/ggc/meter/device/onetouch/OneTouchMeter.java 2008-08-24 14:22:06 UTC (rev 502)
@@ -48,7 +48,6 @@
SerialPort.FLOWCONTROL_NONE,
SerialProtocol.SERIAL_EVENT_NONE);
- this.setSerialPort(portName);
//String portName, int baudrate, int databits, int stopbits, int parity
@@ -63,7 +62,8 @@
try
{
- this.setPort(portName);
+ this.setSerialPort(portName);
+// this.setPort(portName);
if (!this.open())
{
@@ -72,7 +72,7 @@
}
catch(Exception ex)
{
- System.out.println("AscensiaMeter -> Error adding listener: " + ex);
+ System.out.println("OneTouchMeter -> Error adding listener: " + ex);
ex.printStackTrace();
}
}
Modified: trunk/ggc-meter/src/ggc/meter/test/MeterConsoleTester.java
===================================================================
--- trunk/ggc-meter/src/ggc/meter/test/MeterConsoleTester.java 2008-08-23 19:42:54 UTC (rev 501)
+++ trunk/ggc-meter/src/ggc/meter/test/MeterConsoleTester.java 2008-08-24 14:22:06 UTC (rev 502)
@@ -34,7 +34,6 @@
import ggc.meter.device.onetouch.OneTouchUltra;
import ggc.plugin.output.ConsoleOutputWriter;
import ggc.plugin.protocol.SerialProtocol;
-import gnu.io.CommPortIdentifier;
import java.awt.TextArea;
import java.util.Vector;
@@ -273,13 +272,13 @@
public void displaySerialPorts()
{
- Vector<CommPortIdentifier> vct = SerialProtocol.getAllAvailablePorts();
+ Vector<String> vct = SerialProtocol.getAllAvailablePortsString();
System.out.println(" --- List Serial Ports -----");
for(int i=0; i<vct.size(); i++)
{
- System.out.println(vct.get(i).getName());
+ System.out.println(vct.get(i));
}
}
Modified: trunk/ggc-plugin_base/.classpath
===================================================================
--- trunk/ggc-plugin_base/.classpath 2008-08-23 19:42:54 UTC (rev 501)
+++ trunk/ggc-plugin_base/.classpath 2008-08-24 14:22:06 UTC (rev 502)
@@ -3,10 +3,10 @@
<classpathentry kind="src" path="src"/>
<classpathentry combineaccessrules="false" kind="src" path="/Atech-Tools"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/rxtx-2.1.7"/>
<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/commons-logging-1.0.4"/>
<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/commons-lang-2.4"/>
<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/dom4j-1.6.1"/>
<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/Xpp Xml Parser 3-1.1.4c"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/rxtx-2.1.7-a1"/>
<classpathentry kind="output" path="bin"/>
</classpath>
Modified: trunk/ggc-plugin_base/src/ggc/plugin/protocol/SerialProtocol.java
===================================================================
--- trunk/ggc-plugin_base/src/ggc/plugin/protocol/SerialProtocol.java 2008-08-23 19:42:54 UTC (rev 501)
+++ trunk/ggc-plugin_base/src/ggc/plugin/protocol/SerialProtocol.java 2008-08-24 14:22:06 UTC (rev 502)
@@ -114,9 +114,18 @@
* Set the COM-Port from wich will be read.
* @param String port
*/
- public void setPort(String port) throws NoSuchPortException
+ public void setPort(String port) throws PlugInBaseException
{
- portIdentifier = CommPortIdentifier.getPortIdentifier(port);
+ try
+ {
+ portIdentifier = CommPortIdentifier.getPortIdentifier(port);
+ }
+ catch(NoSuchPortException ex)
+ {
+ System.out.println("SerialProtocol::setPort:: No such port: " + ex);
+ log.error("No such port exception: " + ex.getMessage(), ex);
+ throw new PlugInBaseException(ex);
+ }
}
/**
@@ -626,6 +635,37 @@
}
+
+ public static Vector<String> getAllAvailablePortsString()
+ {
+ Vector<String> retVal = new Vector<String>();
+// Vector<CommPortIdentifier> retVal = new Vector<CommPortIdentifier>();
+
+ try
+ {
+ //Vector retVal = new Vector();
+// int counter = 0;
+
+ //CommPortIdentifier.
+
+ Enumeration<?> enume = CommPortIdentifier.getPortIdentifiers();
+ while (enume.hasMoreElements())
+ {
+ CommPortIdentifier portID = (CommPortIdentifier)enume.nextElement();
+ //if (portID.getPortType() == CommPortIdentifier.PORT_SERIAL)
+ retVal.add(portID.getName());
+ }
+ }
+ catch(Exception ex)
+ {
+ System.out.println("Exception: getAvailableSerialPorts: " + ex);
+
+ }
+ return retVal;
+
+ }
+
+
@SuppressWarnings("unchecked")
public static Vector<CommPortIdentifier> getAllAvailablePorts()
{
Property changes on: trunk/ggc-pump
___________________________________________________________________
Modified: svn:ignore
- bin
+ bin
test
Modified: trunk/ggc-pump/.classpath
===================================================================
--- trunk/ggc-pump/.classpath 2008-08-23 19:42:54 UTC (rev 501)
+++ trunk/ggc-pump/.classpath 2008-08-24 14:22:06 UTC (rev 502)
@@ -3,11 +3,11 @@
<classpathentry kind="src" path="src"/>
<classpathentry combineaccessrules="false" kind="src" path="/Atech-Tools"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/rxtx-2.1.7"/>
<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/commons-logging-1.0.4"/>
<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/commons-lang-2.4"/>
<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/dom4j-1.6.1"/>
<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/Xpp Xml Parser 3-1.1.4c"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/rxtx-2.1.7-a1"/>
<classpathentry combineaccessrules="false" kind="src" path="/GGC Plugin Base"/>
<classpathentry kind="output" path="bin"/>
</classpath>
Modified: trunk/ggc-pump/src/ggc/core/db/hibernate/DayValueH.java
===================================================================
--- trunk/ggc-pump/src/ggc/core/db/hibernate/DayValueH.java 2008-08-23 19:42:54 UTC (rev 501)
+++ trunk/ggc-pump/src/ggc/core/db/hibernate/DayValueH.java 2008-08-24 14:22:06 UTC (rev 502)
@@ -8,6 +8,8 @@
/** @author Hibernate CodeGenerator */
public class DayValueH implements Serializable {
+ private static final long serialVersionUID = -1661031856854546844L;
+
/** identifier field */
private long id;
Modified: trunk/ggc-pump/src/ggc/pump/data/PumpValuesTableModel.java
===================================================================
--- trunk/ggc-pump/src/ggc/pump/data/PumpValuesTableModel.java 2008-08-23 19:42:54 UTC (rev 501)
+++ trunk/ggc-pump/src/ggc/pump/data/PumpValuesTableModel.java 2008-08-24 14:22:06 UTC (rev 502)
@@ -42,6 +42,8 @@
// GlucoValueEventListener
{
+ private static final long serialVersionUID = -3199123443953228082L;
+
private I18nControl m_ic = I18nControl.getInstance();
// x private DataAccessMeter m_da = DataAccessMeter.getInstance();
Modified: trunk/ggc-pump/src/ggc/pump/device/PumpException.java
===================================================================
--- trunk/ggc-pump/src/ggc/pump/device/PumpException.java 2008-08-23 19:42:54 UTC (rev 501)
+++ trunk/ggc-pump/src/ggc/pump/device/PumpException.java 2008-08-24 14:22:06 UTC (rev 502)
@@ -5,6 +5,8 @@
{
+ private static final long serialVersionUID = -2859706316077380716L;
+
/**
* Constructor for ImportException.
*/
Modified: trunk/ggc-pump/src/ggc/pump/device/accuchek/AccuChekSmartPixPump.java
===================================================================
--- trunk/ggc-pump/src/ggc/pump/device/accuchek/AccuChekSmartPixPump.java 2008-08-23 19:42:54 UTC (rev 501)
+++ trunk/ggc-pump/src/ggc/pump/device/accuchek/AccuChekSmartPixPump.java 2008-08-24 14:22:06 UTC (rev 502)
@@ -236,6 +236,7 @@
}
+ @SuppressWarnings("unused")
private ArrayList<PumpValuesEntry> getBoluses()
{
return getSpecificElements("BOLUS", AccuChekSmartPixPump.TAG_BOLUS);
@@ -249,6 +250,7 @@
+ @SuppressWarnings("unused")
private ArrayList<PumpValuesEntry> getEvents()
{
return getSpecificElements("EVENT", AccuChekSmartPixPump.TAG_EVENT);
Modified: trunk/ggc-pump/src/ggc/pump/device/animas/EZManagerDb.java
===================================================================
--- trunk/ggc-pump/src/ggc/pump/device/animas/EZManagerDb.java 2008-08-23 19:42:54 UTC (rev 501)
+++ trunk/ggc-pump/src/ggc/pump/device/animas/EZManagerDb.java 2008-08-24 14:22:06 UTC (rev 502)
@@ -24,6 +24,7 @@
//private OutputWriter m_writer;
+ @SuppressWarnings("unused")
private String m_fileName;
Modified: trunk/ggc-pump/src/ggc/pump/device/minimed/MinimedCareLinkData.java
===================================================================
--- trunk/ggc-pump/src/ggc/pump/device/minimed/MinimedCareLinkData.java 2008-08-23 19:42:54 UTC (rev 501)
+++ trunk/ggc-pump/src/ggc/pump/device/minimed/MinimedCareLinkData.java 2008-08-24 14:22:06 UTC (rev 502)
@@ -10,8 +10,11 @@
private String time; // 2
private String raw_type; // 33
private String raw_values; // 34
+ @SuppressWarnings("unused")
private String raw_id; // 35
+ @SuppressWarnings("unused")
private String raw_upload_id; // 36
+ @SuppressWarnings("unused")
private String raw_seq_num; // 37
private String raw_device_type; // 38
Modified: trunk/ggc-pump/src/ggc/pump/gui/PumpDisplayDataDialog.java
===================================================================
--- trunk/ggc-pump/src/ggc/pump/gui/PumpDisplayDataDialog.java 2008-08-23 19:42:54 UTC (rev 501)
+++ trunk/ggc-pump/src/ggc/pump/gui/PumpDisplayDataDialog.java 2008-08-24 14:22:06 UTC (rev 502)
@@ -47,6 +47,8 @@
// private JLabel infoIcon = null;
// x private JLabel infoDescription = null;
+ private static final long serialVersionUID = 8849188103070838842L;
+
PumpReaderRunner mrr;
private DataAccessPump m_da = DataAccessPump.getInstance();
Modified: trunk/ggc-pump/src/ggc/pump/gui/config/SimpleConfigurationHelp.java
===================================================================
--- trunk/ggc-pump/src/ggc/pump/gui/config/SimpleConfigurationHelp.java 2008-08-23 19:42:54 UTC (rev 501)
+++ trunk/ggc-pump/src/ggc/pump/gui/config/SimpleConfigurationHelp.java 2008-08-24 14:22:06 UTC (rev 502)
@@ -48,6 +48,7 @@
public class SimpleConfigurationHelp extends JDialog implements ActionListener
{
+ private static final long serialVersionUID = -7736163052250034544L;
private I18nControl m_ic = I18nControl.getInstance();
private DataAccessPump m_da; // = DataAccessMeter.getInstance();
Modified: trunk/ggc-pump/src/ggc/pump/util/DataAccessPump.java
===================================================================
--- trunk/ggc-pump/src/ggc/pump/util/DataAccessPump.java 2008-08-23 19:42:54 UTC (rev 501)
+++ trunk/ggc-pump/src/ggc/pump/util/DataAccessPump.java 2008-08-24 14:22:06 UTC (rev 502)
@@ -373,9 +373,9 @@
this.timeZones.put("(GMT-04:00) Caracas, La Paz", "America/Caracas");
this.timeZones.put("(GMT-04:00) Santiago", "America/Santiago");
this.timeZones.put("(GMT-05:00) Bogota, Lima, Quito", "America/Bogota");
- this.timeZones.put("(GMT-05:00) Eastern Time (US & Canada)", " America/New_York");
- this.timeZones.put("(GMT-05:00) Indiana (East)", "America/Indianapolis");
- this.timeZones.put("(GMT-06:00) Central America", "America/Costa_Rica");
+ this.timeZones.put("(GMT-05:00) Eastern Time (US & Canada)", " America/New_York");
+ this.timeZones.put("(GMT-05:00) Indiana (East)", "America/Indianapolis");
+ this.timeZones.put("(GMT-06:00) Central America", "America/Costa_Rica");
this.timeZones.put("(GMT-06:00) Central Time (US & Canada)", "America/Chicago");
this.timeZones.put("(GMT-06:00) Guadalajara, Mexico City, Monterrey", "America/Mexico_City");
this.timeZones.put("(GMT-06:00) Saskatchewan", "America/Winnipeg");
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2008-08-24 18:58:44
|
Revision: 503
http://ggc.svn.sourceforge.net/ggc/?rev=503&view=rev
Author: andyrozman
Date: 2008-08-24 18:58:48 +0000 (Sun, 24 Aug 2008)
Log Message:
-----------
Modified Paths:
--------------
trunk/ggc/build/GGCBuild.properties_default
trunk/ggc/build/build.xml
trunk/ggc/src/How_Can_I_Help.txt
trunk/ggc-meter/build/GGCMeterToolVersion.properties
trunk/ggc-meter/build/build.xml
Added Paths:
-----------
trunk/build/
trunk/build/build.xml
trunk/ggc-plugin_base/build/
trunk/ggc-plugin_base/build/GGCPlugInBaseBuild.properties
trunk/ggc-plugin_base/build/GGCPlugInBaseVersion.properties
trunk/ggc-plugin_base/build/build.xml
Added: trunk/build/build.xml
===================================================================
--- trunk/build/build.xml (rev 0)
+++ trunk/build/build.xml 2008-08-24 18:58:48 UTC (rev 503)
@@ -0,0 +1,95 @@
+<?xml version="1.0" ?>
+<project name="GNU Gluco Control" default="build" basedir=".">
+ <description>
+ Main Build file for GGC
+ </description>
+
+ <!-- Environment properties read from a file ...-->
+ <property file="./GGCBuild.properties"/>
+ <property file="./GGCVersion.properties"/>
+
+
+ <!-- These should *not* be modified on the command line! -->
+ <property name="build.dir" value="${outdir.dir}/classes"/>
+ <property name="deploy.dir" value="${outdir.dir}/deploy"/>
+
+
+ <!-- Build GGC -->
+
+ <target name="build">
+ <echo message=" ************************************************* "/>
+ <echo message=" **** GGC Full Build **** "/>
+ <echo message=" ************************************************* "/>
+ <echo message=""/>
+ <echo message=" all = whole GGC"/>
+ <echo message=" all_noclean = whole GGC (no clean)"/>
+ <echo message=" ggc = GNU Gluco Control application build (full)"/>
+ <echo message=" plugins = create all plugins"/>
+ <echo message=" plugin_base = create GGC Base Plugin"/>
+ <echo message=" plugin_meter = create GGC Meter Tool (needs Base)"/>
+ <echo message=" plugin_pump = create GGC Pump Tool"/>
+ <echo message=" plugin_cgms = create GGC CGMS Plugin"/>
+ <echo message=" clean = clean directory"/>
+ <echo message=""/>
+ </target>
+
+
+ <!-- Public targets -->
+
+ <target name="clean" description="clean">
+ <delete>
+ <fileset dir="./deploy_files">
+ <include name="**"/>
+ </fileset>
+ </delete>
+ </target>
+
+ <target name="all" depends="clean, all_noclean" description="whole GGC">
+ </target>
+
+ <target name="all_noclean" depends="ggc, plugins" description="whole GGC">
+ </target>
+
+
+ <target name="ggc" description="GNU Gluco Control application build (full)">
+ <echo message=""/>
+ <echo message=" Start GGC build"/>
+ <echo message=""/>
+ <subant target="deploy">
+ <fileset dir="../ggc" includes="*/build.xml" />
+ </subant>
+ </target>
+
+ <target name="plugins" depends="plugin_base, plugin_meter, plugin_pump, plugin_cgms" description="create all plugins">
+ </target>
+
+ <target name="plugin_base" description="create PlugIn Base">
+ <echo message=""/>
+ <echo message=" Start GGC Base Plugin build"/>
+ <echo message=""/>
+ <subant target="deploy">
+ <fileset dir="../ggc-plugin_base" includes="*/build.xml" />
+ </subant>
+ </target>
+
+ <target name="plugin_meter" depends="plugin_base" description="create GGC Meter Tool (needs Base)">
+ <echo message=""/>
+ <echo message=" Start GGC Base Plugin build"/>
+ <echo message=""/>
+ </target>
+
+ <target name="plugin_pump" description="create GGC Pump Tool">
+ <echo message=""/>
+ <echo message=" Start GGC Base Plugin build"/>
+ <echo message=""/>
+ </target>
+
+ <target name="plugin_cgms" description="create GGC CGMS Plugin">
+ <echo message=""/>
+ <echo message=" Start GGC Base Plugin build"/>
+ <echo message=""/>
+ </target>
+
+
+</project>
+
Property changes on: trunk/build/build.xml
___________________________________________________________________
Added: svn:executable
+ *
Modified: trunk/ggc/build/GGCBuild.properties_default
===================================================================
--- trunk/ggc/build/GGCBuild.properties_default 2008-08-24 14:22:06 UTC (rev 502)
+++ trunk/ggc/build/GGCBuild.properties_default 2008-08-24 18:58:48 UTC (rev 503)
@@ -23,9 +23,16 @@
# build.dir = output for .class files
build.dir=${outdir.dir}/build/classes
+
+
+
# set this if you use database that is not our default one (HypersonicSQL)
additional.jdbc.driver=${jdbc_path}/some.jdbc.driver.jar
+
+
+
+
#
# STATIC (this is required lib tree)
# DO NOT CHANGE !!!
@@ -33,7 +40,6 @@
jdbc_path=${library.dir}/jdbc/
hibernate_path=${library.dir}/hibernate3
utils_path=${library.dir}/utils
-comunication.api_ibm=${utils_path}/RXTXcomm.jar
#
# Path to your communication api. Here you must set path to jar contating your communication
@@ -41,10 +47,43 @@
#
comunication.api=${comunication.api_ibm}
+
+
+
+
#
+# Special libraries settings
+#
+
+#
+# Path to your communication api. Here you must set path to jar contating your communication
+# api
+#
+comunication.api=${utils_path}/RXTXcomm.jar
+
+#
+# atech-tools
+#
+atech-tools.api=${utils_path}/atech-tools-0.2.4.jar
+
+#
+# pygmy (internal web server)
+#
+pygmy.api=${utils_path}/
+
+
+# Change following settings to reflect atech-tools version (do this only if latest version of atech-tools
+# has changed)
+#
+atech-tool.api=${utils_path}/atech-tools-0.2.1.jar
+
+
+
+
+#
### STOP EDITING HERE
#
-utils_cpath=${utils_path}/iText-2.0.7.jar;${utils_path}/skinlf-6.7.jar;${comunication.api};${utils_path}/atech-tools-0.1.8.jar
+utils_cpath=${utils_path}/iText-2.0.7.jar;${utils_path}/skinlf-6.7.jar;${comunication.api};${atech-tools.api}
hibernate_cpath=${hibernate_path}/asm.jar;${hibernate_path}/asm-attrs.jar;${hibernate_path}/c3p0-0.9.0.jar;${hibernate_path}/cglib-2.1.3.jar;${hibernate_path}/commons-collections-2.1.1.jar;${hibernate_path}/commons-logging-1.0.4.jar;${hibernate_path}/dom4j-1.6.1.jar;${hibernate_path}/hibernate3.jar;${hibernate_path}/jdbc2_0-stdext.jar;${hibernate_path}/jta.jar;${hibernate_path}/log4j-1.2.11.jar;${hibernate_path}/ehcache-1.1.jar;${hibernate_path}/commons-lang-2.0.jar;${hibernate_path}/antlr-2.7.6rc1.jar
jdbc_cpath=${jdbc_path}\hsqldb.jar;${additional.jdbc.driver}
\ No newline at end of file
Modified: trunk/ggc/build/build.xml
===================================================================
--- trunk/ggc/build/build.xml 2008-08-24 14:22:06 UTC (rev 502)
+++ trunk/ggc/build/build.xml 2008-08-24 18:58:48 UTC (rev 503)
@@ -29,6 +29,7 @@
<echo message=" available parts are: core, lang, little, main"/>
<echo message=" jars_full = all jars"/>
<echo message=" full = clean, build_ggc, copy, jars_full"/>
+ <echo message=" deploy = full, copy files to main directory"/>
<echo message=" dist = full, and create distribution zip file (contains needed libs, and data files)" />
<echo message=" style (_devel, _deploy) = checkstyle against our rules" />
<echo message=""/>
@@ -177,6 +178,14 @@
<target name="full" depends="clean, copy, jars_full">
</target>
+ <target name="deploy" depends="full">
+ <copy file="${binary.dir}/ggc-core-${ggc-core.version}.jar" todir="../../build/deploy_files/"/>
+ <copy file="${binary.dir}/ggc-main-${ggc-main.version}.jar" todir="../../build/deploy_files/"/>
+ <copy file="${binary.dir}/ggc-lang-${ggc-lang.version}.jar" todir="../../build/deploy_files/"/>
+ <copy file="${binary.dir}/ggc-little-${ggc-little.version}.jar" todir="../../build/deploy_files/"/>
+ </target>
+
+
<target name="dist">
<echo message="This option is not available yet." />
</target>
Modified: trunk/ggc/src/How_Can_I_Help.txt
===================================================================
--- trunk/ggc/src/How_Can_I_Help.txt 2008-08-24 14:22:06 UTC (rev 502)
+++ trunk/ggc/src/How_Can_I_Help.txt 2008-08-24 18:58:48 UTC (rev 503)
@@ -172,7 +172,7 @@
Install subclipse: (you need to do this step before you go to 3.
Go to Help -> Software Updates. Tab Available software, click on add site.
- Add following site url: http://subclipse.tigris.org/update_1.0.x
+ Add following site url: http://subclipse.tigris.org/update_1.4.x
Wait few seconds that entry is added and file list downloaded. Select Subclipse plugin.
3.) Create new workspace. Add Libraries. Libraries are stored under ggc-support/eclipse. You need to
@@ -182,11 +182,11 @@
Open Windows->Preferences. Go to group Java->Code style->Formatter. Use Import option and add xml
file stored under ggc-support/eclipse.
-4.) Import all projects (atech-tools, ggc, ggc-meter, ggc-pump, ggc-cgm)
+4.) Import all projects (atech-tools, ggc, ggc-meter, ggc-pump, ggc-cgm, ggc-plugin_base)
Use File->Import..., select General->Existing project into workspace and find all upper directories
- You should have 5 projects.
+ You should have 6 projects.
5.) Run GGC
Modified: trunk/ggc-meter/build/GGCMeterToolVersion.properties
===================================================================
--- trunk/ggc-meter/build/GGCMeterToolVersion.properties 2008-08-24 14:22:06 UTC (rev 502)
+++ trunk/ggc-meter/build/GGCMeterToolVersion.properties 2008-08-24 18:58:48 UTC (rev 503)
@@ -6,5 +6,5 @@
#
# GGC Meter Tool Version
#
-ggc-meter-tool.version=0.1.2
+ggc-meter-tool.version=0.3.4
Modified: trunk/ggc-meter/build/build.xml
===================================================================
--- trunk/ggc-meter/build/build.xml 2008-08-24 14:22:06 UTC (rev 502)
+++ trunk/ggc-meter/build/build.xml 2008-08-24 18:58:48 UTC (rev 503)
@@ -1,35 +1,34 @@
<?xml version="1.0" ?>
-<project name="GNU Gluco Control" default="build" basedir=".">
+<project name="GNU PlugIn Base" default="build" basedir=".">
<description>
Build file for GGC
</description>
<!-- Environment properties read from a file ...-->
- <property file="./GGCBuild.properties"/>
- <property file="./GGCVersion.properties"/>
-
-
+ <property file="../../ggc-plugin_base/GGCPlugInBaseBuild.properties"/>
+ <property file="./GGCMeterToolVersion.properties"/>
+
<!-- These should *not* be modified on the command line! -->
<property name="build.dir" value="${outdir.dir}/classes"/>
<property name="deploy.dir" value="${outdir.dir}/deploy"/>
-
+ <property name="jar_file_name" value="ggc-meter_tool" />
+ <property name="jar_file_version" value="${ggc-plugin-base.version}" />
+
+
+
<!-- Build GGC -->
<target name="build">
<echo message=" ************************************************* "/>
- <echo message=" **** GGC Meter Tool Build **** "/>
+ <echo message=" **** GGC PlugIn Base Build **** "/>
<echo message=" ************************************************* "/>
<echo message=""/>
- <echo message=" copy = copies all needed files"/>
<echo message=" clean = clean build dir"/>
- <echo message=" build_ggc (make) = build GGC (recompile classes)"/>
- <echo message=" jar = create GGC jar"/>
- <echo message=" jar_core = create GGC Core jar"/>
- <echo message=" jar_l = create GGC Little jar"/>
- <echo message=" full = clean, build_ggc, copy, jar, jar_l"/>
- <echo message=" dist = full, and create distribution zip file (contains needed libs, and data files)" />
- <echo message=" style (_devel, _deploy) = checkstyle against our rules" />
+ <echo message=" compile = build GGC PlugIn Base"/>
+ <echo message=" jar = create GGC PlugIn Base jar"/>
+ <echo message=" full = compile,jar GGC PlugIn Base"/>
+ <echo message=" deploy = full plus deploy in main (GGC PlugIn Base)"/>
<echo message=""/>
</target>
@@ -37,22 +36,21 @@
<!-- Public targets -->
<target name="clean" description="Clean build directory and previus version of GGC">
- <delete dir="${build.dir}/ggc"/>
- <delete dir="${build.dir}/icons"/>
- <delete file="${build.dir}/ggc.jar"/>
+ <delete dir="${binary.dir}"/>
+ <mkdir dir="${binary.dir}" />
</target>
<target name="copy" description="Copy all needed files">
- <mkdir dir="${build.dir}" />
- <copy todir="${build.dir}/" overwrite="true">
+ <mkdir dir="${binary.dir}" />
+ <copy todir="${binary.dir}/" overwrite="true">
<fileset dir="${source.dir}" casesensitive="no">
<include name="*.properties"/>
</fileset>
</copy>
- <mkdir dir="${build.dir}/icons" />
- <copy todir="${build.dir}/icons" overwrite="true">
- <fileset dir="${source.dir}/icons" casesensitive="no">
+ <mkdir dir="${binary.dir}/icons" />
+ <copy todir="${binary.dir}/icons" overwrite="true">
+ <fileset dir="../src/icons" casesensitive="no">
<include name="**/*.gif"/>
<include name="**/*.jpg"/>
<include name="**/*.png"/>
@@ -62,17 +60,14 @@
-
- <target name="make" description="Build GGC">
- <mkdir dir="${build.dir}" />
+ <target name="compile" depends="copy" description="Build GGC">
+ <mkdir dir="${deploy.dir}" />
<javac srcdir="${source.dir}"
- destdir="${build.dir}"
- includes="ggc/meter/**"
- deprecation="off" debug="true"> <!-- debug="${debug} DummyHandler.java, ggc/db/HSQLHandler.java, ggc\db\MySQLHandler, ggc/db/TextFileHandler.java" -->
-
+ destdir="${binary.dir}"
+ includes="ggc/**"
+ deprecation="off" debug="true">
<classpath>
- <pathelement path="${comunication.api}" />
- <pathelement path="${atech-tool.api}"/>
+ <pathelement path="${classpath.full}" />
</classpath>
</javac>
</target>
@@ -83,23 +78,19 @@
includes="ggc/**"
excludes="ggc/db/**"
+jar_file_version
-
-->
- <target name="jar" depends="jar_meter_tool" />
-
- <target name="jar_meter_tool" description="Build GGC Core" depends="make">
- <jar jarfile="${binary.dir}/ggc-meter-tool-${ggc-meter-tool.version}.jar"
+ <target name="jar" description="Create jar files" depends="compile">
+ <jar jarfile="${deploy.dir}/${jar_file_name}-${jar_file_version}.jar"
update="false"
index="false"
- manifest="./manifest_ggc_core.mf">
+ >
- <fileset dir="${build.dir}">
- <include name="ggc/meter/**"/>
- <include name="ggc/data/**"/>
- <include name="ggc/gui/**"/>
+ <fileset dir="${binary.dir}">
+ <include name="ggc/**"/>
</fileset>
<fileset dir="${source.dir}">
<include name="*.properties"/>
@@ -109,47 +100,13 @@
</target>
-
- <target name="dev" depends="clean, copy, make">
+ <target name="full" depends="clean, jar">
</target>
-
-
-
- <target name="full" depends="clean, copy, jar_meter_tool">
+
+ <target name="deploy" depends="clean, jar">
+ <copy file="${deploy.dir}/${jar_file_name}-${jar_file_version}.jar" todir="../../build/deploy_files/"/>
</target>
- <target name="dist">
- <echo message="This option is not available yet." />
- </target>
-
- <target name="style_deploy">
- <taskdef resource="checkstyletask.properties" classpath="${library.dir}/devel/checkstyle-all-4.1.jar" />
-
- <checkstyle config="ggc_deploy.xml">
- <fileset dir="${source.dir}" includes="**/*.java"/>
-
- <formatter type="plain"/>
- <formatter type="xml" toFile="checkstyle_errors.xml"/>
- </checkstyle>
-
- </target>
-
- <target name="style_devel">
- <taskdef resource="checkstyletask.properties" classpath="${library.dir}/devel/checkstyle-all-4.1.jar" />
-
- <checkstyle config="ggc_devel.xml">
- <fileset dir="${source.dir}" includes="**/*.java"/>
-
- <formatter type="plain"/>
- <formatter type="xml" toFile="checkstyle_errors.xml"/>
- </checkstyle>
- </target>
-
-
-
-
-
</project>
-
Added: trunk/ggc-plugin_base/build/GGCPlugInBaseBuild.properties
===================================================================
--- trunk/ggc-plugin_base/build/GGCPlugInBaseBuild.properties (rev 0)
+++ trunk/ggc-plugin_base/build/GGCPlugInBaseBuild.properties 2008-08-24 18:58:48 UTC (rev 503)
@@ -0,0 +1,77 @@
+#
+# GNU PligIn Base (Ant Build file)
+#
+#
+
+
+# Change this settings to reflect your paths
+#
+
+# output.dir = where output files (classes) and files will be put
+#outdir.dir=d:/My_Projects/GNUGlucoCenter/ggc
+outdir.dir=.
+
+# binary.dir = where output files (jars) will be places
+binary.dir=../bin
+
+deploy.dir=./deploy
+
+# source.dir = location of source files
+source.dir=../src
+
+# library.dir = location of lib root (ggc-support should always be used)
+library.dir=../../ggc-support/lib
+
+# build.dir = output for .class files
+build.dir=${outdir.dir}/classes
+
+# set this if you use database that is not our default one (HypersonicSQL)
+additional.jdbc.driver=${jdbc_path}/some.jdbc.driver.jar
+
+#
+# STATIC (this is required lib tree)
+# DO NOT CHANGE - Start
+#
+jdbc_path=${library.dir}/jdbc/
+hibernate_path=${library.dir}/hibernate3
+utils_path=${library.dir}/utils
+
+#
+# DO NOT CHANGE - End
+#
+
+#
+# Libs (running of application is regulated by startup/update classes, but build isn't. We need to add all files
+# needed for compile manually)
+#
+
+
+#
+# Path to your communication api. Here you must set path to jar contating your communication
+# api
+#
+comunication.api=${utils_path}/RXTXcomm.jar
+
+
+
+# Change following settings to reflect atech-tools version (do this only if latest version of atech-tools
+# has changed)
+#
+atech-tools.api=${utils_path}/atech-tools-0.2.4.jar
+
+
+
+#
+### STOP EDITING HERE
+#
+
+utils_cpath=${comunication.api};${atech-tools.api}
+hibernate_cpath=${hibernate_path}/asm.jar;${hibernate_path}/asm-attrs.jar;${hibernate_path}/c3p0-0.9.0.jar;${hibernate_path}/cglib-2.1.3.jar;${hibernate_path}/commons-collections-2.1.1.jar;${hibernate_path}/commons-logging-1.0.4.jar;${hibernate_path}/dom4j-1.6.1.jar;${hibernate_path}/hibernate3.jar;${hibernate_path}/jdbc2_0-stdext.jar;${hibernate_path}/jta.jar;${hibernate_path}/log4j-1.2.11.jar;${hibernate_path}/ehcache-1.1.jar;${hibernate_path}/commons-lang-2.0.jar;${hibernate_path}/antlr-2.7.6rc1.jar
+jdbc_cpath=${jdbc_path}\hsqldb.jar;${additional.jdbc.driver}
+
+
+#
+# Full Path (add library main entries here)
+#
+
+classpath.full=${utils_cpath};${hibernate_cpath};${jdbc_cpath};${javahelp.api};${tray.api}
Property changes on: trunk/ggc-plugin_base/build/GGCPlugInBaseBuild.properties
___________________________________________________________________
Added: svn:executable
+ *
Added: trunk/ggc-plugin_base/build/GGCPlugInBaseVersion.properties
===================================================================
--- trunk/ggc-plugin_base/build/GGCPlugInBaseVersion.properties (rev 0)
+++ trunk/ggc-plugin_base/build/GGCPlugInBaseVersion.properties 2008-08-24 18:58:48 UTC (rev 503)
@@ -0,0 +1,10 @@
+#
+# Version properties for GGC PlugIn Base
+#
+
+
+#
+# GGC PlugIn Base Version
+#
+ggc-plugin-base.version=0.1.5
+
Property changes on: trunk/ggc-plugin_base/build/GGCPlugInBaseVersion.properties
___________________________________________________________________
Added: svn:executable
+ *
Added: trunk/ggc-plugin_base/build/build.xml
===================================================================
--- trunk/ggc-plugin_base/build/build.xml (rev 0)
+++ trunk/ggc-plugin_base/build/build.xml 2008-08-24 18:58:48 UTC (rev 503)
@@ -0,0 +1,114 @@
+<?xml version="1.0" ?>
+<project name="GNU PlugIn Base" default="build" basedir=".">
+ <description>
+ Build file for GGC
+ </description>
+
+ <!-- Environment properties read from a file ...-->
+ <property file="./GGCPlugInBaseBuild.properties"/>
+ <property file="./GGCPlugInBaseVersion.properties"/>
+
+
+ <!-- These should *not* be modified on the command line! -->
+ <property name="build.dir" value="${outdir.dir}/classes"/>
+ <property name="deploy.dir" value="${outdir.dir}/deploy"/>
+
+ <property name="jar_file_name" value="ggc-plugin_base" />
+ <property name="jar_file_version" value="${ggc-plugin-base.version}" />
+
+
+
+ <!-- Build GGC -->
+
+ <target name="build">
+ <echo message=" ************************************************* "/>
+ <echo message=" **** GGC PlugIn Base Build **** "/>
+ <echo message=" ************************************************* "/>
+ <echo message=""/>
+ <echo message=" clean = clean build dir"/>
+ <echo message=" compile = build GGC PlugIn Base"/>
+ <echo message=" jar = create GGC PlugIn Base jar"/>
+ <echo message=" full = compile,jar GGC PlugIn Base"/>
+ <echo message=" deploy = full plus deploy in main (GGC PlugIn Base)"/>
+ <echo message=""/>
+ </target>
+
+
+ <!-- Public targets -->
+
+ <target name="clean" description="Clean build directory and previus version of GGC">
+ <delete dir="${binary.dir}"/>
+ <mkdir dir="${binary.dir}" />
+ </target>
+
+
+ <target name="copy" description="Copy all needed files">
+ <mkdir dir="${build.dir}" />
+ <copy todir="${build.dir}/" overwrite="true">
+ <fileset dir="${source.dir}" casesensitive="no">
+ <include name="*.properties"/>
+ </fileset>
+ </copy>
+ <mkdir dir="../bin/icons" />
+ <copy todir="../bin/icons" overwrite="true">
+ <fileset dir="../src/icons" casesensitive="no">
+ <include name="**/*.gif"/>
+ <include name="**/*.jpg"/>
+ <include name="**/*.png"/>
+ </fileset>
+ </copy>
+ </target>
+
+
+
+ <target name="compile" description="Build GGC">
+ <mkdir dir="${deploy.dir}" />
+ <javac srcdir="${source.dir}"
+ destdir="${binary.dir}"
+ includes="ggc/**"
+ deprecation="off" debug="true">
+ <classpath>
+ <pathelement path="${classpath.full}" />
+ </classpath>
+ </javac>
+ </target>
+
+
+<!--
+ <target name="build_ggc" description="Build GGC" />
+
+ includes="ggc/**"
+ excludes="ggc/db/**"
+jar_file_version
+
+-->
+
+
+ <target name="jar" description="Create jar files" depends="compile">
+ <jar jarfile="${deploy.dir}/${jar_file_name}-${jar_file_version}.jar"
+ update="false"
+ index="false"
+ >
+
+ <fileset dir="${binary.dir}">
+ <include name="ggc/**"/>
+ </fileset>
+ <fileset dir="${source.dir}">
+ <include name="*.properties"/>
+ </fileset>
+
+ </jar>
+ </target>
+
+
+ <target name="full" depends="clean, jar">
+ </target>
+
+
+ <target name="deploy" depends="clean, jar">
+ <copy file="${deploy.dir}/${jar_file_name}-${jar_file_version}.jar" todir="../../build/deploy_files/"/>
+ </target>
+
+
+</project>
+
Property changes on: trunk/ggc-plugin_base/build/build.xml
___________________________________________________________________
Added: svn:executable
+ *
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2008-09-04 10:14:28
|
Revision: 516
http://ggc.svn.sourceforge.net/ggc/?rev=516&view=rev
Author: andyrozman
Date: 2008-09-04 10:14:38 +0000 (Thu, 04 Sep 2008)
Log Message:
-----------
Modified Paths:
--------------
trunk/build/build.xml
trunk/ggc-meter/.classpath
trunk/ggc-plugin_base/.classpath
trunk/ggc-plugin_base/src/ggc/plugin/protocol/SerialProtocol.java
trunk/ggc-pump/.classpath
Removed Paths:
-------------
trunk/ggc-plugin_base/bin/
Modified: trunk/build/build.xml
===================================================================
--- trunk/build/build.xml 2008-08-31 07:34:55 UTC (rev 515)
+++ trunk/build/build.xml 2008-09-04 10:14:38 UTC (rev 516)
@@ -72,22 +72,31 @@
</subant>
</target>
- <target name="plugin_meter" depends="plugin_base" description="create GGC Meter Tool (needs Base)">
+ <target name="plugin_meter" description="create GGC Meter Tool (needs Base)">
<echo message=""/>
- <echo message=" Start GGC Base Plugin build"/>
+ <echo message=" Start GGC Meter Plugin build"/>
<echo message=""/>
+ <subant target="deploy">
+ <fileset dir="../ggc-meter" includes="*/build.xml" />
+ </subant>
</target>
<target name="plugin_pump" description="create GGC Pump Tool">
<echo message=""/>
- <echo message=" Start GGC Base Plugin build"/>
+ <echo message=" Start GGC Pump Plugin build"/>
<echo message=""/>
+ <subant target="deploy">
+ <fileset dir="../ggc-pump" includes="*/build.xml" />
+ </subant>
</target>
<target name="plugin_cgms" description="create GGC CGMS Plugin">
<echo message=""/>
<echo message=" Start GGC Base Plugin build"/>
<echo message=""/>
+ <subant target="deploy">
+ <fileset dir="../ggc-cgm" includes="*/build.xml" />
+ </subant>
</target>
Modified: trunk/ggc-meter/.classpath
===================================================================
--- trunk/ggc-meter/.classpath 2008-08-31 07:34:55 UTC (rev 515)
+++ trunk/ggc-meter/.classpath 2008-09-04 10:14:38 UTC (rev 516)
@@ -7,6 +7,7 @@
<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/dom4j-1.6.1"/>
<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/commons-lang-2.4"/>
<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/rxtx-2.1.7-a1"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/rxtx-2.1.7"/>
<classpathentry combineaccessrules="false" kind="src" path="/Atech-Tools"/>
<classpathentry combineaccessrules="false" kind="src" path="/GGC Plugin Base"/>
<classpathentry kind="output" path="bin"/>
Modified: trunk/ggc-plugin_base/.classpath
===================================================================
--- trunk/ggc-plugin_base/.classpath 2008-08-31 07:34:55 UTC (rev 515)
+++ trunk/ggc-plugin_base/.classpath 2008-09-04 10:14:38 UTC (rev 516)
@@ -1,12 +1,13 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src"/>
- <classpathentry combineaccessrules="false" kind="src" path="/Atech-Tools"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/commons-logging-1.0.4"/>
- <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/commons-lang-2.4"/>
- <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/dom4j-1.6.1"/>
- <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/Xpp Xml Parser 3-1.1.4c"/>
- <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/rxtx-2.1.7-a1"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path="src"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/Atech-Tools"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/commons-logging-1.0.4"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/commons-lang-2.4"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/dom4j-1.6.1"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/Xpp Xml Parser 3-1.1.4c"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/rxtx-2.1.7-a1"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/rxtx-2.1.7"/>
+ <classpathentry kind="output" path="bin"/>
+</classpath>
Modified: trunk/ggc-plugin_base/src/ggc/plugin/protocol/SerialProtocol.java
===================================================================
--- trunk/ggc-plugin_base/src/ggc/plugin/protocol/SerialProtocol.java 2008-08-31 07:34:55 UTC (rev 515)
+++ trunk/ggc-plugin_base/src/ggc/plugin/protocol/SerialProtocol.java 2008-09-04 10:14:38 UTC (rev 516)
@@ -32,6 +32,7 @@
private static Log log = LogFactory.getLog("ProtocolLog");
+
protected I18nControlAbstract m_ic = null; //I18nControl.getInstance();
protected DataAccessPlugInBase m_da = null; //DataAccessMeter.getInstance();
Modified: trunk/ggc-pump/.classpath
===================================================================
--- trunk/ggc-pump/.classpath 2008-08-31 07:34:55 UTC (rev 515)
+++ trunk/ggc-pump/.classpath 2008-09-04 10:14:38 UTC (rev 516)
@@ -8,6 +8,7 @@
<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/dom4j-1.6.1"/>
<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/Xpp Xml Parser 3-1.1.4c"/>
<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/rxtx-2.1.7-a1"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/rxtx-2.1.7"/>
<classpathentry combineaccessrules="false" kind="src" path="/GGC Plugin Base"/>
<classpathentry kind="output" path="bin"/>
</classpath>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2008-10-13 15:30:37
|
Revision: 554
http://ggc.svn.sourceforge.net/ggc/?rev=554&view=rev
Author: andyrozman
Date: 2008-10-13 15:30:05 +0000 (Mon, 13 Oct 2008)
Log Message:
-----------
Modified Paths:
--------------
trunk/ggc/src/Changelog
trunk/ggc/src/GGC_Nutrition_en.properties
trunk/ggc/src/GGC_Nutrition_si.properties
trunk/ggc/src/GGC_en.properties
trunk/ggc/src/GGC_si.properties
trunk/ggc/src/ggc/core/data/DailyValues.java
trunk/ggc/src/ggc/core/data/DayValuesData.java
trunk/ggc/src/ggc/core/db/datalayer/DailyFoodEntries.java
trunk/ggc/src/ggc/core/db/datalayer/DailyFoodEntry.java
trunk/ggc/src/ggc/core/print/PrintAbstract.java
trunk/ggc/src/ggc/core/print/PrintFoodMenuBase.java
trunk/ggc/src/ggc/core/util/DataAccess.java
trunk/ggc/src/ggc/gui/MainFrame.java
trunk/ggc/src/ggc/gui/dialogs/PrintingDialog.java
trunk/ggc-plugin_base/src/ggc/plugin/util/DataAccessPlugInBase.java
trunk/ggc-pump/src/Changelog
trunk/ggc-pump/src/GGCPumpTool_en.properties
trunk/ggc-pump/src/TO-DO_PumpTool.txt
trunk/ggc-pump/src/ggc/core/db/hibernate/pump/PumpDataH.java
trunk/ggc-pump/src/ggc/pump/data/PumpValuesDay.java
trunk/ggc-pump/src/ggc/pump/data/PumpValuesEntry.java
trunk/ggc-pump/src/ggc/pump/plugin/PumpPlugInServer.java
trunk/ggc-pump/src/ggc/pump/util/DataAccessPump.java
trunk/web_page/index.php
Added Paths:
-----------
trunk/ggc/src/ggc/core/print/PrintFoodMenuExt1.java
trunk/ggc/src/ggc/core/print/PrintFoodMenuExt2.java
trunk/ggc/src/ggc/core/print/PrintFoodMenuExt3.java
trunk/ggc-mobile/
trunk/ggc-mobile/.classpath
trunk/ggc-mobile/.project
trunk/ggc-mobile/.settings/
trunk/ggc-mobile/.settings/org.eclipse.jdt.core.prefs
trunk/ggc-mobile/.settings/org.eclipse.jdt.ui.prefs
trunk/ggc-mobile/data/
trunk/ggc-mobile/src/
trunk/ggc-mobile/src/ggc/
trunk/ggc-mobile/src/ggc/mobile/
trunk/ggc-mobile/src/ggc/mobile/gui/
trunk/ggc-mobile/src/ggc/mobile/util/
trunk/ggc-mobile/src/ggc/mobile/util/DataAccessMobile.java
trunk/ggc-mobile/src/ggc/mobile/util/I18nControl.java
trunk/ggc-pump/src/ggc/pump/data/db/
trunk/ggc-pump/src/ggc/pump/data/db/GGCPumpDb.java
trunk/ggc-pump/src/ggc/pump/gui/manual/PumpDataAdditionalWizardOne.java
trunk/ggc-pump/src/ggc/pump/gui/manual/PumpDataDialog.java
trunk/ggc-pump/src/ggc/pump/gui/manual/PumpDataRowDialog.java
trunk/ggc-pump/src/ggc/pump/gui/manual/PumpDataTableModel.java
trunk/ggc-pump/src/ggc/pump/gui/manual/PumpDataTypeComponent.java
trunk/ggc-pump/src/icons/cancel.png
trunk/ggc-pump/src/icons/course.png
trunk/ggc-pump/src/icons/folder_add.png
trunk/ggc-pump/src/icons/folder_delete.png
trunk/ggc-pump/src/icons/folder_edit.png
trunk/ggc-pump/src/icons/nav_left_blue.png
trunk/ggc-pump/src/icons/nav_right_blue.png
trunk/ggc-pump/src/icons/ok.png
trunk/ggc-pump/src/icons/table_add.png
trunk/ggc-pump/src/icons/table_delete.png
trunk/ggc-pump/src/icons/table_edit.png
trunk/ggc-support/lib/utils/atech-tools-0.2.5.jar
trunk/ggc-support/lib/utils/pygmy-core-0.2.jar
trunk/ggc-support/lib/utils/pygmy-handlers-0.2.jar
trunk/web_page/images/
trunk/web_page/images/course.gif
trunk/web_page/images/course.jpg
trunk/web_page/images/dailygraph.gif
trunk/web_page/images/dailygraph.jpg
trunk/web_page/images/dailystats.gif
trunk/web_page/images/frequency.gif
trunk/web_page/images/frequency.jpg
trunk/web_page/images/hba1c.gif
trunk/web_page/images/hba1c.jpg
trunk/web_page/images/main.gif
trunk/web_page/images/prefs.gif
trunk/web_page/images/print_extended.gif
trunk/web_page/images/print_prepare.gif
trunk/web_page/images/print_simple.gif
trunk/web_page/images/spread.gif
trunk/web_page/images/spread.jpg
trunk/web_page/images/usda_db.gif
Property Changed:
----------------
trunk/
trunk/ggc/doc/
Property changes on: trunk
___________________________________________________________________
Added: svn:ignore
+ trash
Property changes on: trunk/ggc/doc
___________________________________________________________________
Added: svn:ignore
+ header_template_andy.txt
Modified: trunk/ggc/src/Changelog
===================================================================
--- trunk/ggc/src/Changelog 2008-10-07 21:30:55 UTC (rev 553)
+++ trunk/ggc/src/Changelog 2008-10-13 15:30:05 UTC (rev 554)
@@ -1,3 +1,8 @@
+2008-10-10 (0.3.8)
+ * Most of printing of food menus done (missing just ext 3 type, which will be added later, if req.)
+ * Continuning to work on pump plugin base functionality (see Changes.txt in pump tool project)
+
+
2008-10-02 (0.3.7) Andy Rozman <and...@us...>
* Added dialog for starting printing for food menu
* Printing of base food menu has errors: meals are displayed as their sub-items not as meal as whole, and some
Modified: trunk/ggc/src/GGC_Nutrition_en.properties
===================================================================
--- trunk/ggc/src/GGC_Nutrition_en.properties 2008-10-07 21:30:55 UTC (rev 553)
+++ trunk/ggc/src/GGC_Nutrition_en.properties 2008-10-13 15:30:05 UTC (rev 554)
@@ -214,9 +214,22 @@
DATE=Date
TIME=Time
FOOD_MENU_BASE=Food Menu Base (CH only)
+
+FOOD_MENU_EXT_I=Extended Food Menu I (CH,Ins)
+FOOD_MENU_EXT_II=Extended Food Menu II (CH,Ins,BG)
+FOOD_MENU_EXT_III=Extended Food Menu III (CH,Ins,BG,kJ)
+
+
REPORT_FOOTER=This report is from \"GGC - GNU Gluco Control\", freely available at http://ggc.sourceforge.net
+TOGETHER=Together
+CH=OH
+INS=Ins
+BG=KS
+AMOUNT_SHORT=Am.
+
+
#
# Nutrients (2)
#
Modified: trunk/ggc/src/GGC_Nutrition_si.properties
===================================================================
--- trunk/ggc/src/GGC_Nutrition_si.properties 2008-10-07 21:30:55 UTC (rev 553)
+++ trunk/ggc/src/GGC_Nutrition_si.properties 2008-10-13 15:30:05 UTC (rev 554)
@@ -232,10 +232,17 @@
DATE=Datum
TIME=\u010Cas
FOOD_MENU_BASE=Preprost jedilnik (samo OH)
+FOOD_MENU_EXT_I=Raz\u0161irjen jedilnik I (OH,Ins)
+FOOD_MENU_EXT_II=Raz\u0161irjen jedilnik II (OH,Ins,KS)
+FOOD_MENU_EXT_III=Raz\u0161irjen jedilnik III (OH,Ins,KS,kJ)
REPORT_FOOTER=To poro\u010Dilo je iz programa \"GGC - GNU Gluco Control\", ki je dosegljiv zastonj na doma\u010Di strani: http://ggc.sourceforge.net
+TOGETHER=Skupaj
+CH=OH
+INS=Ins
+BG=KS
+AMOUNT_SHORT=Kol.
-
# Special characters
# \u017E zz
# \u017D ZZ
Modified: trunk/ggc/src/GGC_en.properties
===================================================================
--- trunk/ggc/src/GGC_en.properties 2008-10-07 21:30:55 UTC (rev 553)
+++ trunk/ggc/src/GGC_en.properties 2008-10-13 15:30:05 UTC (rev 554)
@@ -264,6 +264,17 @@
MN_FOODMENU_SIMPLE=Simple (CH only)
MN_FOODMENU_SIMPLE_DESC=Printing food menu (Simple)
+MN_FOODMENU_EXT1=Extended I (CH,Ins)
+MN_FOODMENU_EXT1_DESC=Printing food menu (Extended - CH,Ins)
+MN_FOODMENU_EXT2=Extended II (CH,Ins,BG)
+MN_FOODMENU_EXT2_DESC=Printing food menu (Extended - CH,Ins,BG)
+MN_FOODMENU_EXT3=Extended III (CH,Ins,BG,kJ)
+MN_FOODMENU_EXT3_DESC=Printing food menu (Extended - CH,Ins,BG,kJ)
+
+
+
+
+
# doctors
MN_DOCS=Doctors
MN_DOCS_DESC=Doctors
@@ -555,6 +566,9 @@
SELECT_STARTING_RANGE=Select starting range
SELECT_ENDING_RANGE=Select ending range
+FOOD_MENU_EXT_I=Extended Food Menu I (CH,Ins)
+FOOD_MENU_EXT_II=Extended Food Menu II (CH,Ins,BG)
+FOOD_MENU_EXT_III=Extended Food Menu III (CH,Ins,BG,kJ)
#
Modified: trunk/ggc/src/GGC_si.properties
===================================================================
--- trunk/ggc/src/GGC_si.properties 2008-10-07 21:30:55 UTC (rev 553)
+++ trunk/ggc/src/GGC_si.properties 2008-10-13 15:30:05 UTC (rev 554)
@@ -311,7 +311,14 @@
MN_FOODMENU_SIMPLE=Preprost (samo OH)
MN_FOODMENU_SIMPLE_DESC=Izpis preprostega jedilnika
+MN_FOODMENU_EXT1=Razsirjeni I (CH,Ins)
+MN_FOODMENU_EXT1_DESC=Printing food menu (Extended - CH,Ins)
+MN_FOODMENU_EXT2=Extended II (CH,Ins,BG)
+MN_FOODMENU_EXT2_DESC=Printing food menu (Extended - CH,Ins,BG)
+MN_FOODMENU_EXT3=Extended III (CH,Ins,BG,kJ)
+MN_FOODMENU_EXT3_DESC=Printing food menu (Extended - CH,Ins,BG,kJ)
+
# docs
MN_DOCS=Zdravniki
MN_DOCS_DESC=Zdravniki
@@ -633,8 +640,8 @@
#
-# ggc.gui.print
-#
+# Printing (2)
+#
INS_SHORT=Ins
CH_SHORT=OH
BREAKFAST=Zajtrk
@@ -657,7 +664,12 @@
SELECT_STARTING_RANGE=Izberi za\u010Detno obmo\u010Dje
SELECT_ENDING_RANGE=Izberi kon\u010Dno obmo\u010Dje
+FOOD_MENU_EXT_I=Raz\u0161irjen jedilnik I (OH,Ins)
+FOOD_MENU_EXT_II=Raz\u0161irjen jedilnik II (OH,Ins,KS)
+FOOD_MENU_EXT_III=Raz\u0161irjen jedilnik III (OH,Ins,KS,kJ)
+
+
#
# Stocks (5)
#
Modified: trunk/ggc/src/ggc/core/data/DailyValues.java
===================================================================
--- trunk/ggc/src/ggc/core/data/DailyValues.java 2008-10-07 21:30:55 UTC (rev 553)
+++ trunk/ggc/src/ggc/core/data/DailyValues.java 2008-10-13 15:30:05 UTC (rev 554)
@@ -40,7 +40,9 @@
import java.util.Collections;
import java.util.Date;
+import com.atech.utils.ATechDate;
+
public class DailyValues implements Serializable
{
@@ -509,6 +511,15 @@
return date;
}
+
+
+ public String getDateAsLocalizedString()
+ {
+ return m_da.getAsLocalizedDateString((new ATechDate(ATechDate.FORMAT_DATE_ONLY, this.date)).getGregorianCalendar(), 4);
+ }
+
+
+
public String getDateAsString()
{
int day, month, year;
Modified: trunk/ggc/src/ggc/core/data/DayValuesData.java
===================================================================
--- trunk/ggc/src/ggc/core/data/DayValuesData.java 2008-10-07 21:30:55 UTC (rev 553)
+++ trunk/ggc/src/ggc/core/data/DayValuesData.java 2008-10-13 15:30:05 UTC (rev 554)
@@ -33,7 +33,6 @@
import ggc.core.util.DataAccess;
-import java.text.DateFormat;
import java.util.GregorianCalendar;
import java.util.Hashtable;
import java.util.Iterator;
@@ -136,26 +135,26 @@
public String getFromAsLocalizedDate()
{
// return "xx";
- return getAsLocalizedString(this.range_from_gc);
+ return m_da.getAsLocalizedDateString(this.range_from_gc, 2);
}
public String getToAsLocalizedDate()
{
// return "xx";
- return getAsLocalizedString(this.range_to_gc);
+ return m_da.getAsLocalizedDateString(this.range_to_gc, 2);
}
public static final int DATE_MONTH = 0;
public static final int DATE_YEAR = 0;
-
+ /*
private String getAsLocalizedString(GregorianCalendar gc_value)
{
DateFormat df = DateFormat.getDateInstance(DateFormat.SHORT, this.m_da.getI18nControlInstance().getSelectedLanguageLocale());
return df.format(gc_value.getTime());
- }
+ }*/
Modified: trunk/ggc/src/ggc/core/db/datalayer/DailyFoodEntries.java
===================================================================
--- trunk/ggc/src/ggc/core/db/datalayer/DailyFoodEntries.java 2008-10-07 21:30:55 UTC (rev 553)
+++ trunk/ggc/src/ggc/core/db/datalayer/DailyFoodEntries.java 2008-10-13 15:30:05 UTC (rev 554)
@@ -48,9 +48,13 @@
GlycemicNutrients glyc_nutr = null;
boolean root_entry = false;
+ boolean print_mode = false;
ArrayList<DailyFoodEntry> entries = null;
+ /**
+ * Default constructor
+ */
public DailyFoodEntries()
{
entries = new ArrayList<DailyFoodEntry>();
@@ -68,13 +72,30 @@
}
}
+
+ public DailyFoodEntries(String meals_ids, boolean print_mode)
+ {
+ this.print_mode = print_mode;
+
+ entries = new ArrayList<DailyFoodEntry>();
+ StringTokenizer strtok = new StringTokenizer(meals_ids, ";");
+
+ while (strtok.hasMoreTokens())
+ {
+ addDailyFoodEntry(new DailyFoodEntry(strtok.nextToken() /*, print_mode */));
+ }
+ }
+
public void addDailyFoodEntry(DailyFoodEntry dfe)
{
if (dfe.hasChildren())
{
- this.entries.addAll(dfe.getChildren());
+ if (this.print_mode)
+ this.entries.add(dfe);
+ else
+ this.entries.addAll(dfe.getChildren());
}
else
{
Modified: trunk/ggc/src/ggc/core/db/datalayer/DailyFoodEntry.java
===================================================================
--- trunk/ggc/src/ggc/core/db/datalayer/DailyFoodEntry.java 2008-10-07 21:30:55 UTC (rev 553)
+++ trunk/ggc/src/ggc/core/db/datalayer/DailyFoodEntry.java 2008-10-13 15:30:05 UTC (rev 554)
@@ -84,6 +84,8 @@
ArrayList<DailyFoodEntry> children = null;
+ //private boolean is_printing_mode = false;
+
/*
* public DailyFoodEntry() { this.nutrients = new
* ArrayList<MealNutrition>(); this.calculated_multiplier = 1.0f;
@@ -392,6 +394,12 @@
return DataAccess.Decimal2Format.format(this.amount);
}
+ public String getAmountSingleDecimalString()
+ {
+ return DataAccess.MmolDecimalFormat.format(this.amount);
+ }
+
+
private void loadHomeWeight()
{
//System.out.println("HWs: " + this.m_food.getHome_weights());
@@ -417,6 +425,33 @@
}
+
+ public float getMealCH()
+ {
+ float sum = 0.0f;
+ //float mult = this
+
+
+ if (!hasChildren())
+ return sum;
+
+ //System.out.println("Meal: " + this.m_meal.getName()+ " children: " + this.children.size());
+
+ for(int i=0; i< this.children.size(); i++)
+ {
+ DailyFoodEntry dfe = this.children.get(i);
+ sum += dfe.getNutrientValue(205) * dfe.getMultiplier();
+
+ //System.out.println("dfe:" + dfe.amount + ", mult: " + dfe.getMultiplier() + "nut val: " + dfe.getNutrientValue(205));
+ }
+ //String val = this.m_meal.getNutritions();
+
+ //System.out.println(sum);
+
+ return sum;
+ }
+
+
private void calculateMultiplier()
{
// System.out.println("calculateMultiplier");
@@ -563,12 +598,17 @@
nutr = this.m_food.getNutritions();
processNutrients(nutr, 1.0f);
}
- else
+ else if (this.m_meal!=null)
{
nutr = this.m_meal.getNutritions();
+// processMeal(this.m_meal);
+ }
+/* else
+ {
+ nutr = this.m_meal.getNutritions();
processMeal(this.m_meal);
}
-
+*/
/*
* StringTokenizer strtok = new StringTokenizer(nutr, ";");
*
Modified: trunk/ggc/src/ggc/core/print/PrintAbstract.java
===================================================================
--- trunk/ggc/src/ggc/core/print/PrintAbstract.java 2008-10-07 21:30:55 UTC (rev 553)
+++ trunk/ggc/src/ggc/core/print/PrintAbstract.java 2008-10-13 15:30:05 UTC (rev 554)
@@ -55,6 +55,7 @@
public abstract class PrintAbstract extends PdfPageEventHelper
{
+
public DayValuesData m_data = null;
protected DataAccess m_da = DataAccess.getInstance();
protected I18nControlAbstract ic = null;
@@ -62,9 +63,12 @@
BaseFont base_helvetica = null;
BaseFont base_times = null;
- Font normal_text = null;
+ Font text_normal = null;
+ Font text_bold = null;
+ Font text_italic = null;
+
public PrintAbstract(DayValuesData data, I18nControlAbstract ic)
{
this.m_data = data;
@@ -76,7 +80,9 @@
{
base_helvetica = BaseFont.createFont("Helvetica", BaseFont.CP1250, BaseFont.NOT_EMBEDDED);
base_times = BaseFont.createFont(BaseFont.TIMES_ROMAN, BaseFont.CP1250, BaseFont.NOT_EMBEDDED);
- normal_text = new Font(this.base_helvetica , 12, Font.NORMAL);
+ text_normal = new Font(this.base_helvetica , 12, Font.NORMAL);
+ text_bold = new Font(this.base_helvetica , 12, Font.BOLD);
+ text_italic = new Font(this.base_helvetica , 12, Font.ITALIC);
}
catch(Exception ex)
{
@@ -101,11 +107,6 @@
public abstract Paragraph getTitle();
- public abstract void fillDocumentBody(Document document) throws Exception;
-
- public abstract String getFileNameBase();
-
- public abstract String getFileNameRange();
@@ -250,10 +251,25 @@
throw new ExceptionConverter(e);
}
}
+
+ /**
+ * Create document body.
+ *
+ * @param document
+ * @throws Exception
+ */
+ public abstract void fillDocumentBody(Document document) throws Exception;
+
+ /**
+ * Returns base filename for printing job, this is just part of end filename (starting part)
+ */
+ public abstract String getFileNameBase();
+
+ /**
+ * Returns data part of filename for printing job, showing which data is being printed
+ */
+ public abstract String getFileNameRange();
+
}
-
-
-
-
Modified: trunk/ggc/src/ggc/core/print/PrintFoodMenuBase.java
===================================================================
--- trunk/ggc/src/ggc/core/print/PrintFoodMenuBase.java 2008-10-07 21:30:55 UTC (rev 553)
+++ trunk/ggc/src/ggc/core/print/PrintFoodMenuBase.java 2008-10-13 15:30:05 UTC (rev 554)
@@ -42,27 +42,23 @@
import com.lowagie.text.Document;
import com.lowagie.text.Element;
import com.lowagie.text.Font;
-import com.lowagie.text.Paragraph;
import com.lowagie.text.Phrase;
import com.lowagie.text.pdf.PdfPTable;
-public class PrintFoodMenuBase extends PrintAbstract
+public class PrintFoodMenuBase extends PrintFoodMenuAbstract
{
public PrintFoodMenuBase(DayValuesData mv)
{
- super(mv, DataAccess.getInstance().getNutriI18nControl());
-
- // System.out.println("getNutriControl");
-
- //this.ic = m_da.getNutriI18nControl();
+ super(mv);
+ //super(mv, DataAccess.getInstance().getNutriI18nControl());
}
-
+ /*
public Paragraph getTitle()
{
Paragraph p = new Paragraph();
@@ -80,9 +76,9 @@
return p;
}
+ */
-
@@ -92,8 +88,7 @@
-
- @Override
+/*
public void fillDocumentBody(Document document) throws Exception
{
// TODO Auto-generated method stub
@@ -104,14 +99,158 @@
int count = 0;
- Font f = new Font(this.base_helvetica , 12, Font.NORMAL); // this.base_times
+ Font f = this.text_normal; //new Font(this.base_helvetica , 12, Font.NORMAL); // this.base_times
PdfPTable datatable = new PdfPTable(6);
- int headerwidths[] = { 17, 8,
- 35, 20, 10, 10
+ int headerwidths[] = { 13, 7,
+ 40, 20, 10, 10
}; // percentage
datatable.setWidths(headerwidths);
datatable.setWidthPercentage(100); // percentage
+
+ datatable.getDefaultCell().setVerticalAlignment(Element.ALIGN_MIDDLE);
+ datatable.getDefaultCell().setHorizontalAlignment(Element.ALIGN_LEFT); //ALIGN_CENTER);
+ datatable.getDefaultCell().setBorderWidth(1);
+
+ datatable.addCell(new Phrase(ic.getMessage("DATE"), this.text_bold));
+ datatable.addCell(new Phrase(ic.getMessage("TIME"), this.text_bold));
+ datatable.addCell(new Phrase(ic.getMessage("PRINT_FOOD_DESC"), this.text_bold));
+ datatable.addCell(new Phrase(ic.getMessage("WEIGHT_TYPE"), this.text_bold));
+ datatable.addCell(new Phrase(ic.getMessage("AMOUNT_LBL"), this.text_bold));
+ datatable.addCell(new Phrase(ic.getMessage("CH"), this.text_bold));
+
+// document.add(datatable);
+
+ while (it.hasNext())
+ {
+ DailyValues dv = it.next();
+ dv.sort();
+
+
+ datatable.addCell(new Phrase(dv.getDateAsString(), f));
+
+ System.out.println("Row count: " + dv.getRowCount());
+ System.out.println(dv.getDateAsString());
+
+ int active_day_entry = 0;
+
+ for(int i=0; i<dv.getRowCount(); i++)
+ {
+
+ DailyValuesRow rw = (DailyValuesRow)dv.getRow(i);
+
+ if ((rw.getMealsIds()==null) || (rw.getMealsIds().length()==0))
+ continue;
+
+
+ if (active_day_entry>0)
+ {
+ datatable.addCell(new Phrase("", f));
+ }
+
+ active_day_entry++;
+
+ datatable.addCell(new Phrase(rw.getTimeAsString(), f));
+
+ DailyFoodEntries mpts = new DailyFoodEntries(rw.getMealsIds(), true);
+
+
+ datatable.addCell(new Phrase(ic.getMessage("TOGETHER"), this.text_italic));
+ datatable.addCell(new Phrase("", f));
+ datatable.addCell(new Phrase("", f));
+ datatable.addCell(new Phrase(DataAccess.Decimal2Format.format(rw.getCH()), this.text_italic));
+
+
+
+
+ for(int j=0; j<mpts.getElementsCount(); j++)
+ {
+ DailyFoodEntry mp = mpts.getElement(j);
+
+// if (j>0)
+ {
+ datatable.addCell(new Phrase("", f));
+ datatable.addCell(new Phrase("", f));
+ }
+
+
+ datatable.addCell(new Phrase(mp.getName(), f));
+
+
+ float value = 0.0f;
+
+ if (mp.amount_type==DailyFoodEntry.WEIGHT_TYPE_AMOUNT)
+ {
+ datatable.addCell(new Phrase(ic.getMessage("AMOUNT_LBL"), f));
+ //value = mp.getNutrientValue(205);
+ value = mp.getMealCH();
+
+ }
+ else if (mp.amount_type==DailyFoodEntry.WEIGHT_TYPE_WEIGHT)
+ {
+ datatable.addCell(new Phrase(ic.getMessage("WEIGHT_LBL2"), f));
+ //value = mp.getNutrientValue(205);
+ value = mp.getNutrientValue(205) * (mp.amount / 100.0f);
+ }
+ else
+ {
+ datatable.addCell(new Phrase(mp.getHomeWeightDescription() + " (" + DataAccess.Decimal0Format.format(mp.getHomeWeightMultiplier() * 100) + " g)", f));
+ value = mp.getNutrientValue(205) * mp.getHomeWeightMultiplier();
+ }
+
+
+
+ datatable.addCell(new Phrase(mp.getAmountSingleDecimalString(), f));
+ datatable.addCell(new Phrase(DataAccess.Decimal2Format.format(value), f)); // ch
+
+ System.out.println(" " + rw.getTimeAsString() + " " + mp);
+ }
+
+ }
+
+
+ if (active_day_entry==0)
+ {
+ datatable.addCell(new Phrase("", f));
+ datatable.addCell(new Phrase("", f));
+ datatable.addCell(new Phrase("", f));
+ datatable.addCell(new Phrase("", f));
+ datatable.addCell(new Phrase("", f));
+ }
+
+
+
+ count++;
+ }
+
+
+ document.add(datatable);
+
+
+ System.out.println("Elements all: " + this.m_data.size() + " in iterator: " + count);
+ }
+*/
+
+
+
+ public void fillDocumentBodyX1(Document document) throws Exception
+ {
+ // TODO Auto-generated method stub
+
+ System.out.println("Jedilnik");
+
+ Iterator<DailyValues> it = this.m_data.iterator();
+
+ int count = 0;
+
+ Font f = this.text_normal; //new Font(this.base_helvetica , 12, Font.NORMAL); // this.base_times
+
+ PdfPTable datatable = new PdfPTable(6);
+ int headerwidths[] = { 13, 7,
+ 40, 20, 10, 10
+ }; // percentage
+ datatable.setWidths(headerwidths);
+ datatable.setWidthPercentage(100); // percentage
//datatable.getDefaultCell().setPadding(3);
//datatable.getDefaultCell().setBorderWidth(2);
@@ -119,12 +258,12 @@
datatable.getDefaultCell().setHorizontalAlignment(Element.ALIGN_LEFT); //ALIGN_CENTER);
datatable.getDefaultCell().setBorderWidth(1);
- datatable.addCell(new Phrase(ic.getMessage("DATE"), f));
- datatable.addCell(new Phrase(ic.getMessage("TIME"), f));
- datatable.addCell(new Phrase(ic.getMessage("PRINT_FOOD_DESC"), f));
- datatable.addCell(new Phrase(ic.getMessage("WEIGHT_TYPE"), f));
- datatable.addCell(new Phrase(ic.getMessage("AMOUNT_LBL"), f));
- datatable.addCell(new Phrase(ic.getMessage("CH"), f));
+ datatable.addCell(new Phrase(ic.getMessage("DATE"), this.text_bold));
+ datatable.addCell(new Phrase(ic.getMessage("TIME"), this.text_bold));
+ datatable.addCell(new Phrase(ic.getMessage("PRINT_FOOD_DESC"), this.text_bold));
+ datatable.addCell(new Phrase(ic.getMessage("WEIGHT_TYPE"), this.text_bold));
+ datatable.addCell(new Phrase(ic.getMessage("AMOUNT_LBL"), this.text_bold));
+ datatable.addCell(new Phrase(ic.getMessage("CH"), this.text_bold));
// document.add(datatable);
@@ -225,7 +364,7 @@
datatable.addCell(new Phrase(rw.getTimeAsString(), f));
- DailyFoodEntries mpts = new DailyFoodEntries(rw.getMealsIds());
+ DailyFoodEntries mpts = new DailyFoodEntries(rw.getMealsIds(), true);
//MealParts mpts = new MealParts(rw.getMealsIds());
/* v2
@@ -275,22 +414,30 @@
if (mp.amount_type==DailyFoodEntry.WEIGHT_TYPE_AMOUNT)
{
datatable.addCell(new Phrase(ic.getMessage("AMOUNT_LBL"), f));
- value = mp.getNutrientValue(205);
+ //value = mp.getNutrientValue(205);
+ /*
+ System.out.println("nutr val 205" + mp.getNutrientValue(205) +
+ "\namount: " + mp.amount +
+ "\nhw multiplier: " + mp.getHomeWeightMultiplier()
+ ); */
+ value = mp.getMealCH();
+
}
else if (mp.amount_type==DailyFoodEntry.WEIGHT_TYPE_WEIGHT)
{
datatable.addCell(new Phrase(ic.getMessage("WEIGHT_LBL2"), f));
- value = mp.getNutrientValue(205);
+ //value = mp.getNutrientValue(205);
+ value = mp.getNutrientValue(205) * (mp.amount / 100.0f);
}
else
{
- datatable.addCell(new Phrase(mp.getHomeWeightDescription(), f));
+ datatable.addCell(new Phrase(mp.getHomeWeightDescription() + " (" + DataAccess.Decimal0Format.format(mp.getHomeWeightMultiplier() * 100) + " g)", f));
value = mp.getNutrientValue(205) * mp.getHomeWeightMultiplier();
}
- datatable.addCell(new Phrase(mp.getAmountString(), f));
+ datatable.addCell(new Phrase(mp.getAmountSingleDecimalString(), f));
//datatable.addCell(new Phrase(DataAccess.Decimal2Format.format(mp.getNutrientValue(205) * mp.getHomeWeightMultiplier()), f)); // ch
datatable.addCell(new Phrase(DataAccess.Decimal2Format.format(value), f)); // ch
@@ -338,10 +485,9 @@
}
+
-
-
@Override
public String getFileNameBase()
{
@@ -358,6 +504,103 @@
return this.m_data.getRangeBeginObject().getDateString() + "-" + this.m_data.getRangeEndObject().getDateString();
}
+
+
+
+ @Override
+ public int[] getTableColumnWidths()
+ {
+ int headerwidths[] = { 13, 7,
+ 40, 20, 10, 10
+ }; // percentage
+ return headerwidths;
+ }
+
+
+ @Override
+ public int getTableColumnsCount()
+ {
+ return 6;
+ }
+
+
+
+
+ @Override
+ public String getTitleText()
+ {
+ return "FOOD_MENU_BASE";
+ }
+
+
+
+
+ @Override
+ public void writeAdditionalHeader(PdfPTable table) throws Exception
+ {
+ table.addCell(new Phrase(ic.getMessage("CH"), this.text_bold));
+ }
+
+
+ @Override
+ public void writeEmptyColumnData(PdfPTable table) throws Exception
+ {
+ table.addCell(new Phrase("", this.text_normal));
+ table.addCell(new Phrase("", this.text_normal));
+ table.addCell(new Phrase("", this.text_normal));
+ table.addCell(new Phrase("", this.text_normal));
+ table.addCell(new Phrase("", this.text_normal));
+ }
+
+
+ @Override
+ public void writeColumnData(PdfPTable table, DailyFoodEntry mp) throws Exception
+ {
+ table.addCell(new Phrase("", this.text_normal));
+ table.addCell(new Phrase("", this.text_normal));
+
+ table.addCell(new Phrase(mp.getName(), this.text_normal));
+
+
+ float value = 0.0f;
+
+ if (mp.amount_type==DailyFoodEntry.WEIGHT_TYPE_AMOUNT)
+ {
+ table.addCell(new Phrase(ic.getMessage("AMOUNT_LBL"), this.text_normal));
+ //value = mp.getNutrientValue(205);
+ value = mp.getMealCH();
+
+ }
+ else if (mp.amount_type==DailyFoodEntry.WEIGHT_TYPE_WEIGHT)
+ {
+ table.addCell(new Phrase(ic.getMessage("WEIGHT_LBL2"), this.text_normal));
+ //value = mp.getNutrientValue(205);
+ value = mp.getNutrientValue(205) * (mp.amount / 100.0f);
+ }
+ else
+ {
+ table.addCell(new Phrase(mp.getHomeWeightDescription() + " (" + DataAccess.Decimal0Format.format(mp.getHomeWeightMultiplier() * 100) + " g)", this.text_normal));
+ value = mp.getNutrientValue(205) * mp.getHomeWeightMultiplier();
+ }
+
+ table.addCell(new Phrase(mp.getAmountSingleDecimalString(), this.text_normal));
+ table.addCell(new Phrase(DataAccess.Decimal2Format.format(value), this.text_normal)); // ch
+
+ }
+
+
+
+
+ @Override
+ public void writeTogetherData(PdfPTable table, DailyValuesRow rw) throws Exception
+ {
+ table.addCell(new Phrase(ic.getMessage("TOGETHER"), this.text_italic));
+ table.addCell(new Phrase("", this.text_normal));
+ table.addCell(new Phrase("", this.text_normal));
+
+ table.addCell(new Phrase(DataAccess.Decimal2Format.format(rw.getCH()), this.text_italic));
+ }
+
}
Added: trunk/ggc/src/ggc/core/print/PrintFoodMenuExt1.java
===================================================================
--- trunk/ggc/src/ggc/core/print/PrintFoodMenuExt1.java (rev 0)
+++ trunk/ggc/src/ggc/core/print/PrintFoodMenuExt1.java 2008-10-13 15:30:05 UTC (rev 554)
@@ -0,0 +1,206 @@
+package ggc.core.print;
+
+
+/*
+ * GGC - GNU Gluco Control
+ *
+ * A pure java app to help you manage your diabetes.
+ *
+ * See AUTHORS for copyright information.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Filename: PrintSimpleonthlyReport.java
+
+ * Purpose: Creating PDF for Extended Monthly Report (used for printing)
+ *
+ * Author: andyrozman {an...@at...}
+ */
+
+
+import ggc.core.data.DailyValuesRow;
+import ggc.core.data.DayValuesData;
+import ggc.core.db.datalayer.DailyFoodEntry;
+import ggc.core.util.DataAccess;
+
+import com.lowagie.text.Phrase;
+import com.lowagie.text.pdf.PdfPTable;
+
+public class PrintFoodMenuExt1 extends PrintFoodMenuAbstract
+{
+
+
+ public PrintFoodMenuExt1(DayValuesData mv)
+ {
+ super(mv);
+ }
+
+
+
+ /**
+ * Get text for title
+ *
+ * @return title
+ */
+ @Override
+ public String getTitleText()
+ {
+ return "FOOD_MENU_EXT_I";
+ }
+
+// FOOD_MENU_EXT_I=Extended Food Menu I (CH,Ins)
+
+ /**
+ * Return columns widths for table
+ * @return
+ */
+ @Override
+ public int[] getTableColumnWidths()
+ {
+ int headerwidths[] = { 13, 7,
+ 41, 17, 8, 8, 6
+ }; // percentage
+ return headerwidths;
+ }
+
+
+
+ /**
+ * Return count of table columns
+ *
+ * @return
+ */
+ @Override
+ public int getTableColumnsCount()
+ {
+ return 7;
+ }
+
+
+
+ /**
+ * Write additional header to documents
+ *
+ * @param table
+ * @throws Exception
+ */
+ @Override
+ public void writeAdditionalHeader(PdfPTable table) throws Exception
+ {
+ table.addCell(new Phrase(ic.getMessage("CH"), this.text_bold));
+ table.addCell(new Phrase(ic.getMessage("INS"), this.text_bold));
+ }
+
+
+
+ /**
+ * Write data in column
+ *
+ * @param table
+ * @param mp
+ * @throws Exception
+ */
+ @Override
+ public void writeColumnData(PdfPTable table, DailyFoodEntry mp) throws Exception
+ {
+ table.addCell(new Phrase("", this.text_normal));
+ table.addCell(new Phrase("", this.text_normal));
+
+ table.addCell(new Phrase(mp.getName(), this.text_normal));
+
+
+ float value = 0.0f;
+
+ if (mp.amount_type==DailyFoodEntry.WEIGHT_TYPE_AMOUNT)
+ {
+ table.addCell(new Phrase(ic.getMessage("AMOUNT_LBL"), this.text_normal));
+ //value = mp.getNutrientValue(205);
+ value = mp.getMealCH();
+
+ }
+ else if (mp.amount_type==DailyFoodEntry.WEIGHT_TYPE_WEIGHT)
+ {
+ table.addCell(new Phrase(ic.getMessage("WEIGHT_LBL2"), this.text_normal));
+ //value = mp.getNutrientValue(205);
+ value = mp.getNutrientValue(205) * (mp.amount / 100.0f);
+ }
+ else
+ {
+ table.addCell(new Phrase(mp.getHomeWeightDescription() + " (" + DataAccess.Decimal0Format.format(mp.getHomeWeightMultiplier() * 100) + " g)", this.text_normal));
+ value = mp.getNutrientValue(205) * mp.getHomeWeightMultiplier();
+ }
+
+ table.addCell(new Phrase(mp.getAmountSingleDecimalString(), this.text_normal));
+ table.addCell(new Phrase(DataAccess.Decimal2Format.format(value), this.text_normal)); // ch
+
+ table.addCell(new Phrase("", this.text_normal));
+ }
+
+
+
+ /**
+ * Write empty column data. If there is no data, this is used, to fill empty places.
+ *
+ * @param table
+ * @throws Exception
+ */
+ @Override
+ public void writeEmptyColumnData(PdfPTable table) throws Exception
+ {
+ table.addCell(new Phrase("", this.text_normal));
+ table.addCell(new Phrase("", this.text_normal));
+ table.addCell(new Phrase("", this.text_normal));
+ table.addCell(new Phrase("", this.text_normal));
+ table.addCell(new Phrase("", this.text_normal));
+ table.addCell(new Phrase("", this.text_normal));
+ }
+
+
+
+ /**
+ * Write together data (all data of certain type summed)
+ *
+ * @param table
+ * @param rw
+ * @throws Exception
+ */
+ @Override
+ public void writeTogetherData(PdfPTable table, DailyValuesRow rw) throws Exception
+ {
+ table.addCell(new Phrase(ic.getMessage("TOGETHER"), this.text_italic));
+ table.addCell(new Phrase("", this.text_normal));
+ table.addCell(new Phrase("", this.text_normal));
+
+ table.addCell(new Phrase(DataAccess.Decimal2Format.format(rw.getCH()), this.text_italic));
+ table.addCell(new Phrase(rw.getIns1AsString(), this.text_italic));
+ }
+
+
+
+ /**
+ * Returns base filename for printing job, this is just part of end filename (starting part)
+ */
+ @Override
+ public String getFileNameBase()
+ {
+ return "" + System.currentTimeMillis();
+ }
+
+
+}
+
+
+
+
Added: trunk/ggc/src/ggc/core/print/PrintFoodMenuExt2.java
===================================================================
--- trunk/ggc/src/ggc/core/print/PrintFoodMenuExt2.java (rev 0)
+++ trunk/ggc/src/ggc/core/print/PrintFoodMenuExt2.java 2008-10-13 15:30:05 UTC (rev 554)
@@ -0,0 +1,416 @@
+package ggc.core.print;
+
+
+/*
+ * GGC - GNU Gluco Control
+ *
+ * A pure java app to help you manage your diabetes.
+ *
+ * See AUTHORS for copyright information.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Filename: PrintSimpleonthlyReport.java
+
+ * Purpose: Creating PDF for Extended Monthly Report (used for printing)
+ *
+ * Author: andyrozman {an...@at...}
+ */
+
+
+import ggc.core.data.DailyValues;
+import ggc.core.data.DailyValuesRow;
+import ggc.core.data.DayValuesData;
+import ggc.core.db.datalayer.DailyFoodEntries;
+import ggc.core.db.datalayer.DailyFoodEntry;
+import ggc.core.util.DataAccess;
+
+import java.util.Iterator;
+
+import com.lowagie.text.Document;
+import com.lowagie.text.Element;
+import com.lowagie.text.Font;
+import com.lowagie.text.Paragraph;
+import com.lowagie.text.Phrase;
+import com.lowagie.text.pdf.PdfPTable;
+
+public class PrintFoodMenuExt2 extends PrintFoodMenuAbstract
+{
+
+
+
+ public PrintFoodMenuExt2(DayValuesData mv)
+ {
+ super(mv);
+ }
+
+
+
+
+ public Paragraph getTitle()
+ {
+ Paragraph p = new Paragraph();
+
+ Font f = new Font(this.base_times , 16, Font.BOLD);
+
+ p.setAlignment(Element.ALIGN_CENTER);
+ p.add(new Paragraph("", f));
+ p.add(new Paragraph(ic.getMessage("FOOD_MENU_EXT_II") + " [" + this.m_data.getFromAsLocalizedDate() + " - " + this.m_data.getToAsLocalizedDate() + "]", f));
+ //p.add(new Paragraph("May 2006"));
+ p.add(new Paragraph(ic.getMessage("FOR") + " " + m_da.getSettings().getUserName(), new Font(Font.TIMES_ROMAN, 12, Font.ITALIC)));
+ p.add(new Paragraph("", f));
+ p.add(new Paragraph("", f));
+ //p.add(new Paragraph("", f));
+
+ return p;
+ }
+
+
+
+
+
+
+
+
+
+
+
+
+
+ @Override
+ public void fillDocumentBody(Document document) throws Exception
+ {
+ // TODO Auto-generated method stub
+
+ System.out.println("Jedilnik CH,Ins,BG");
+
+ Iterator<DailyValues> it = this.m_data.iterator();
+
+ int count = 0;
+
+ Font f = this.text_normal; //new Font(this.base_helvetica , 12, Font.NORMAL); // this.base_times
+
+ PdfPTable datatable = new PdfPTable(8);
+ int headerwidths[] = { 13, 7,
+ 35, 17, 8, 8, 6, 6
+ }; // percentage
+ datatable.setWidths(headerwidths);
+ datatable.setWidthPercentage(100); // percentage
+ //datatable.getDefaultCell().setPadding(3);
+ //datatable.getDefaultCell().setBorderWidth(2);
+
+ datatable.getDefaultCell().setVerticalAlignment(Element.ALIGN_MIDDLE);
+ datatable.getDefaultCell().setHorizontalAlignment(Element.ALIGN_LEFT); //ALIGN_CENTER);
+ datatable.getDefaultCell().setBorderWidth(1);
+
+ datatable.addCell(new Phrase(ic.getMessage("DATE"), this.text_bold));
+ datatable.addCell(new Phrase(ic.getMessage("TIME"), this.text_bold));
+ datatable.addCell(new Phrase(ic.getMessage("PRINT_FOOD_DESC"), this.text_bold));
+ datatable.addCell(new Phrase(ic.getMessage("WEIGHT_TYPE"), this.text_bold));
+ datatable.addCell(new Phrase(ic.getMessage("AMOUNT_SHORT"), this.text_bold));
+ datatable.addCell(new Phrase(ic.getMessage("CH"), this.text_bold));
+ datatable.addCell(new Phrase(ic.getMessage("INS"), this.text_bold));
+ datatable.addCell(new Phrase(ic.getMessage("BG"), this.text_bold));
+
+// document.add(datatable);
+
+ while (it.hasNext())
+ {
+ DailyValues dv = it.next();
+ dv.sort();
+
+ datatable.addCell(new Phrase(dv.getDateAsLocalizedString(), f));
+
+ System.out.println("Row count: " + dv.getRowCount());
+ System.out.println(dv.getDateAsString());
+
+ int active_day_entry = 0;
+
+ for(int i=0; i<dv.getRowCount(); i++)
+ {
+
+ DailyValuesRow rw = (DailyValuesRow)dv.getRow(i);
+
+ if ((rw.getMealsIds()==null) || (rw.getMealsIds().length()==0))
+ continue;
+
+
+ if (active_day_entry>0)
+ {
+ datatable.addCell(new Phrase("", f));
+ }
+
+ active_day_entry++;
+
+ datatable.addCell(new Phrase(rw.getTimeAsString(), f));
+
+ DailyFoodEntries mpts = new DailyFoodEntries(rw.getMealsIds(), true);
+
+
+ datatable.addCell(new Phrase(ic.getMessage("TOGETHER"), this.text_italic));
+ datatable.addCell(new Phrase("", f));
+ datatable.addCell(new Phrase("", f));
+ datatable.addCell(new Phrase(DataAccess.Decimal2Format.format(rw.getCH()), this.text_italic));
+ datatable.addCell(new Phrase(rw.getIns1AsString(), this.text_italic));
+ datatable.addCell(new Phrase(rw.getBGAsString(), this.text_italic));
+
+
+
+
+ for(int j=0; j<mpts.getElementsCount(); j++)
+ {
+ DailyFoodEntry mp = mpts.getElement(j);
+
+// if (j>0)
+ {
+ datatable.addCell(new Phrase("", f));
+ datatable.addCell(new Phrase("", f));
+ }
+
+
+ datatable.addCell(new Phrase(mp.getName(), f));
+
+
+ float value = 0.0f;
+
+ if (mp.amount_type==DailyFoodEntry.WEIGHT_TYPE_AMOUNT)
+ {
+ datatable.addCell(new Phrase(ic.getMessage("AMOUNT_LBL"), f));
+ //value = mp.getNutrientValue(205);
+ /*
+ System.out.println("nutr val 205" + mp.getNutrientValue(205) +
+ "\namount: " + mp.amount +
+ "\nhw multiplier: " + mp.getHomeWeightMultiplier()
+ ); */
+ value = mp.getMealCH();
+
+ }
+ else if (mp.amount_type==DailyFoodEntry.WEIGHT_TYPE_WEIGHT)
+ {
+ datatable.addCell(new Phrase(ic.getMessage("WEIGHT_LBL2"), f));
+ //value = mp.getNutrientValue(205);
+ value = mp.getNutrientValue(205) * (mp.amount / 100.0f);
+ }
+ else
+ {
+ datatable.addCell(new Phrase(mp.getHomeWeightDescription() + " (" + DataAccess.Decimal0Format.format(mp.getHomeWeightMultiplier() * 100) + " g)", f));
+ value = mp.getNutrientValue(205) * mp.getHomeWeightMultiplier();
+ }
+
+
+
+ datatable.addCell(new Phrase(mp.getAmountSingleDecimalString(), f));
+ datatable.addCell(new Phrase(DataAccess.Decimal2Format.format(value), f)); // ch
+
+ datatable.addCell(new Phrase("", f));
+ datatable.addCell(new Phrase("", f));
+
+
+ System.out.println(" " + rw.getTimeAsString() + " " + mp);
+ }
+
+ }
+
+
+ if (active_day_entry==0)
+ {
+ datatable.addCell(new Phrase("", f));
+ datatable.addCell(new Phrase("", f));
+ datatable.addCell(new Phrase("", f));
+ datatable.addCell(new Phrase("", f));
+ datatable.addCell(new Phrase("", f));
+ }
+
+
+
+ count++;
+ }
+
+
+ document.add(datatable);
+
+
+ System.out.println("Elements all: " + this.m_data.size() + " in iterator: " + count);
+
+
+
+ }
+
+
+
+
+
+
+ /**
+ * Get text for title
+ *
+ * @return title
+ */
+ @Override
+ public String getTitleText()
+ {
+ return "FOOD_MENU_EXT_II";
+ }
+
+// FOOD_MENU_EXT_I=Extended Food Menu I (CH,Ins)
+
+ /**
+ * Return columns widths for table
+ * @return
+ */
+ @Override
+ public int[] getTableColumnWidths()
+ {
+ int headerwidths[] = { 13, 7,
+ 35, 17, 8, 8, 6, 6
+ }; // percentage
+ return headerwidths;
+ }
+
+
+
+ /**
+ * Return count of table columns
+ *
+ * @return
+ */
+ @Override
+ public int getTableColumnsCount()
+ {
+ return 8;
+ }
+
+
+
+ /**
+ * Write additional header to documents
+ *
+ * @param table
+ * @throws Exception
+ */
+ @Override
+ public void writeAdditionalHeader(PdfPTable table) throws Exception
+ {
+ table.addCell(new Phrase(ic.getMessage("CH"), this.text_bold));
+ table.addCell(new Phrase(ic.getMessage("INS"), this.text_bold));
+ table.addCell(new Phrase(ic.getMessage("BG"), this.text_bold));
+ }
+
+
+
+ /**
+ * Write data in column
+ *
+ * @param table
+ * @param mp
+ * @throws Exception
+ */
+ @Override
+ public void writeColumnData(PdfPTable table, DailyFoodEntry mp) throws Exception
+ {
+ table.addCell(new Phrase("", this.text_normal));
+ table.addCell(new Phrase("", this.text_normal));
+
+ table.addCell(new Phrase(mp.getName(), this.text_normal));
+
+
+ float value = 0.0f;
+
+ if (mp.amount_type==DailyFoodEntry.WEIGHT_TYPE_AMOUNT)
+ {
+ table.addCell(new Phrase(ic.getMessage("AMOUNT_LBL"), this.text_normal));
+ //value = mp.getNutrientValue(205);
+ value = mp.getMealCH();
+
+ }
+ else if (mp.amount_type==DailyFoodEntry.WEIGHT_TYPE_WEIGHT)
+ {
+ table.addCell(new Phrase(ic.getMessage("WEIGHT_LBL2"), this.text_normal));
+ //value = mp.getNutrientValue(205);
+ value = mp.getNutrientValue(205) * (mp.amount / 100.0f);
+ }
+ else
+ {
+ table.addCell(new Phrase(mp.getHomeWeightDescription() + " (" + DataAccess.Decimal0Format.format(mp.getHomeWeightMultiplier() * 100) + " g)", this.text_normal));
+ value = mp.getNutrientValue(205) * mp.getHomeWeightMultiplier();
+ }
+
+ table.addCell(new Phrase(mp.getAmountSingleDecimalString(), this.text_normal));
+ table.addCell(new Phrase(DataAccess.Decimal2Format.format(value), this.text_normal)); // ch
+
+ table.addCell(new Phrase("", this.text_normal)); // ins
+ table.addCell(new Phrase("", this.text_normal)); // bg
+ }
+
+
+
+ /**
+ * Write empty column data. If there is no data, this is used, to fill empty places.
+ *
+ * @param table
+ * @throws Exception
+ */
+ @Override
+ public void writeEmptyColumnData(PdfPTable table) throws Exception
+ {
+ table.addCell(new Phrase("", this.text_normal));
+ table.addCell(new Phrase("", this.text_normal));
+ table.addCell(new Phrase("", this.text_normal));
+ table.addCell(new Phrase("", this.text_normal));
+ table.addCell(new Phrase("", this.text_normal));
+ table.addCell(new Phrase("", this.text_normal));
+ table.addCell(new Phrase("", this.text_normal));
+ }
+
+
+
+ /**
+ * Write together data (all data of certain type summed)
+ *
+ * @param table
+ * @param rw
+ * @throws Exception
+ */
+ @Override
+ public void writeTogetherData(PdfPTable table, DailyValuesRow rw) throws Exception
+ {
+ table.addCell(new Phrase(ic.getMessage("TOGETHER"), this.text_italic));
+ table.addCell(new Phrase("", this.text_normal));
+ table.addCell(new Phrase("", this.text_normal));
+
+ table.addCell(new Phrase(DataAccess.Decimal2Format.format(rw.getCH()), this.text_italic));
+ table.addCell(new Phrase(rw.getIns1AsString(), this.text_italic));
+ table.addCell(new Phrase(rw.getBGAsString(), this.text_italic));
+ }
+
+
+
+ /**
+ * Returns base filename for printing job, this is just part of end filename (starting part)
+ */
+ @Override
+ public String getFileNameBase()
+ {
+ return "" + System.currentTimeMillis();
+ }
+
+
+
+
+}
+
+
+
+
Added: trunk/ggc/src/ggc/core/print/PrintFoodMenuExt3.java
===================================================================
--- trunk/ggc/src/ggc/core/print/PrintFoodMenuExt3.java (rev 0)
+++ trunk/ggc/src/ggc/core/print/PrintFoodMenuExt3.java 2008-10-13 15:30:05 UTC (rev 554)
@@ -0,0 +1,423 @@
+package ggc.core.print;
+
+
+/*
+ * GGC - GNU Gluco Control
+ *
+ * A pure java app to help you manage your diabetes.
+ *
+ * See AUTHORS for copyright information.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Filename: PrintSimpleonthlyReport.java
+
+ * Purpose: Creating PDF for Extended Monthly Report (used for printing)
+ *
+ * Author: andyrozman {an...@at...}
+ */
+
+
+import ggc.core.data.DailyValues;
+import ggc.core.data.DailyValuesRow;
+import ggc.core.data.DayValuesData;
+import ggc.core.db.datalayer.DailyFoodEntries;
+import ggc.core.db.datalayer.DailyFoodEntry;
+import ggc.core.util.DataAccess;
+
+import java.util.Iterator;
+
+import com.lowagie.text.Document;
+import com.lowagie.text.Element;
+import com.lowagie.text.Font;
+import com.lowagie.text.Phrase;
+import com.lowagie.text.pdf.PdfPTable;
+
+public class PrintFoodMenuExt3 extends PrintFoodMenuAbstract
+{
+
+
+ public PrintFoodMenuExt3(DayValuesData mv)
+ {
+ super(mv);
+ }
+
+
+
+
+
+ public void fillDocumentBodyZXZ(Document document) throws Exception
+ {
+ // TODO Auto-generated method stub
+
+ System.out.println("Jedilnik");
+
+ Iterator<DailyValues> it = this.m_data.iterator();
+
+ int count = 0;
+
+ Font f = this.text_normal; //new Font(this.base_helvetica , 12, Font.NORMAL); // this.base_times
+
+ PdfPTable datatable = new PdfPTable(6);
+ int headerwidths[] = { 13, 7,
+ 40, 20, 10, 10
+ }; // percentage
+ datatable.setWidths(headerwidths);
+ datatable.setWidthPercentage(100); // percentage
+ //datatable.getDefaultCell().setPadding(3);
+ //datatable.getDefaultCell().setBorderWidth(2);
+
+ datatable.getDefaultCell().setVerticalAlignment(Element.ALIGN_MIDDLE);
+ datatable.getDefaultCell().setHorizontalAlignment(Element.ALIGN_LEFT); //ALIGN_CENTER);
+ datatable.getDefaultCell().setBorderWidth(1);
+
+ datatable.addCell(new Phrase(ic.getMessage("DATE"), this.text_bold));
+ datatable.addCell(new Phrase(ic.getMessage("TIME"), this.text_bold));
+ datatable.addCell(new Phrase(ic.getMessage("PRINT_FOOD_DESC"), this.text_bold));
+ datatable.addCell(new Phrase(ic.getMessage("WEIGHT_TYPE"), this.text_bold));
+ datatable.addCell(new Phrase(ic.getMessage("AMOUNT_LBL"), this.text_bold));
+ datatable.addCell(new Phrase(ic.getMessage("CH"), this.text_bold));
+
+// document.add(datatable);
+
+ while (it.hasNext())
+ {
+ DailyValues dv = it.next();
+ dv.sort();
+/* v2
+ PdfPTable data_1 = new PdfPTable(2);
+
+ int d1_widths[] = { 10, 90 //,
+ //40, 20, 10, 10
+ }; // percentage
+ data_1.setWidths(d1_widths);
+ data_1.setWidthPercentage(100); // percentage
+
+
+ //datatable.setWidths(headerwidths);
+ //datatable.setWidthPercentage(100); // percentage
+ //datatable.getDefaultCell().setPadding(3);
+ //datatable.getDefaultCell().setBorderWidth(2);
+
+ data_1.getDefaultCell().setVerticalAlignment(Element.ALIGN_MIDDLE);
+ data_1.getDefaultCell().setHorizontalAlignment(Element.ALIGN_CENTER);
+ data_1.getDefaultCell().setBorderWidth(1);
+
+*/
+
+/*
+ data_1.addCell(new Phrase(ic.getMessage("DATE"), f));
+ data_1.addCell(new Phrase(ic.getMessage("TIME"), f));
+ data_1.addCell(new Phrase(ic.getMessage("PRINT_FOOD_DESC"), f));
+ data_1.addCell(new Phrase(ic.getMessage("PRINT_AMOUNT_TYPE"), f));
+ datatable.addCell(new Phrase(ic.getMessage("PRINT_AMOUNT"), f));
+ datatable.addCell(new Phrase(ic.getMessage("CH"), f));
+*/
+
+
+
+// v2 data_1.addCell(new Phrase(dv.getDateAsString(), f));
+
+// v2 datatable.addCell(new Phrase(dv.getDateAsString(), f));
+
+
+ datatable.addCell(new Phrase(dv.getDateAsString(), f));
+
+ System.out.println("Row count: " + dv.getRowCount());
+ System.out.println(dv.getDateAsString());
+
+ int active_day_entry = 0;
+
+ for(int i=0; i<dv.getRowCount(); i++)
+ {
+
+ DailyValuesRow rw = (DailyValuesRow)dv.getRow(i);
+
+ if ((rw.getMealsIds()==null) || (rw.getMealsIds().length()==0))
+ continue;
+
+
+ if (active_day_entry>0)
+ {
+ datatable.addCell(new Phrase("", f));
+ }
+
+ active_day_entry++;
+
+ datatable.addCell(new Phrase(rw.getTimeAsString(), f));
+
+ DailyFoodEntries mpts = new DailyFoodEntries(rw.getMealsIds(), true);
+
+
+ datatable.addCell(new Phrase(ic.getMessage("TOGETHER"), this.text_italic));
+ datatable.addCell(new Phrase("", f));
+ datatable.addCell(new Phrase("", f));
+ datatable.addCell(new Phrase(DataAccess.Decimal2Format.format(rw.getCH()), this.text_italic));
+
+
+
+
+ for(int j=0; j<mpts.getElementsCount(); j++)
+ {
+ DailyFoodEntry mp = mpts.getElement(j);
+
+// if (j>0)
+ {
+ datatable.addCell(new Phrase("", f));
+ datatable.addCell(new Phrase("", f));
+ }
+
+
+ datatable.addCell(new Phrase(mp.getName(), f));
+
+
+ float value = 0.0f;
+
+ if (mp.amount_type==DailyFoodEntry.WEIGHT_TYPE_AMOUNT)
+ {
+ datatable.addCell(new Phrase(ic.getMessage("AMOUNT_LBL"), f));
+ //value = mp.getNutrientValue(205);
+ /*
+ System.out.println("nutr val 205" + mp.getNutrientValue(205) +
+ "\namount: " + mp.amount +
+ "\nhw multiplier: " + mp.getHomeWeightMultiplier()
+ ); */
+ value = mp.getMealCH();
+
+ }
+ else if (mp.amount_type==DailyFoodEntry.WEIGHT_TYPE_WEIGHT)
+ {
+ datatable.addCell(new Phrase(ic.getMessage("WEIGHT_LBL2"), f));
+ //value = mp.getNutrientValue(205);
+ value = mp.getNutrientValue(205) * (mp.amount / 100.0f);
+ }
+ else
+ {
+ datatable.addCell(new Phrase(mp.getHomeWeightDescription() + " (" + DataAccess.Decimal0Format.format(mp.getHomeWeightMultiplier() * 100) + " g)", f));
+ value = mp.getNutrientValue(205) * mp.getHomeWeightMultiplier();
+ }
+
+
+
+ datatable.addCell(new Phrase(mp.getAmountSingleDecimalString(), f));
+ datatable.addCell(new Phrase(DataAccess.Decimal2Format.format(value), f)); // ch
+
+ System.out.println(" " + rw.getTimeAsString() + " " + mp);
+ }
+ ...
[truncated message content] |
|
From: <ru...@us...> - 2011-03-12 20:58:39
|
Revision: 1169
http://ggc.svn.sourceforge.net/ggc/?rev=1169&view=rev
Author: rumbi
Date: 2011-03-12 20:58:33 +0000 (Sat, 12 Mar 2011)
Log Message:
-----------
RR:
* removing ggc_help-0.1.jar since it is a binary blob that is regenerated on every build and doesn't belong here
* svn:ignore-ing another lib directory
Removed Paths:
-------------
trunk/ggc-core/src/ggc_help-0.1.jar
Property Changed:
----------------
trunk/ggc-support/eclipse/
Deleted: trunk/ggc-core/src/ggc_help-0.1.jar
===================================================================
(Binary files differ)
Property changes on: trunk/ggc-support/eclipse
___________________________________________________________________
Modified: svn:ignore
- commons-collections-2.1.1
commons-lang-2.4
commons-logging-1.0.4
dom4j-1.6.1
h2-1.0.69
hibernate-3.1
iText-2.0.7
javahelp-2.0.5
log4j-1.2.15
postgresql-8.2
rxtx-2.1.7
servlet-development-tc-5.5
skinlf-6.7
xpp3-1.1.4c
pygmy-0.2
rxtx-2.1-7-bins-r2
ggc-web
IBMComm
rxtx-2.2
+ commons-collections-2.1.1
commons-lang-2.4
commons-logging-1.0.4
dom4j-1.6.1
h2-1.0.69
hibernate-3.1
iText-2.0.7
javahelp-2.0.5
log4j-1.2.15
postgresql-8.2
rxtx-2.1.7
servlet-development-tc-5.5
skinlf-6.7
xpp3-1.1.4c
pygmy-0.2
rxtx-2.1-7-bins-r2
ggc-web
IBMComm
rxtx-2.2
jasperreports-3.7.1
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2012-07-22 13:51:12
|
Revision: 1235
http://ggc.svn.sourceforge.net/ggc/?rev=1235&view=rev
Author: andyrozman
Date: 2012-07-22 13:51:03 +0000 (Sun, 22 Jul 2012)
Log Message:
-----------
Minimed files import. Not ready, just for experimental use.
Modified Paths:
--------------
trunk/ggc-pump/src/ggc/pump/device/minimed/Minimed508.java
trunk/ggc-pump/src/ggc/pump/device/minimed/Minimed512.java
trunk/ggc-pump/src/ggc/pump/device/minimed/Minimed554_Veo.java
trunk/ggc-pump/src/ggc/pump/manager/company/Minimed.java
Added Paths:
-----------
trunk/ggc-plugin_base/src/ggc/plugin/device/impl/minimed/MM_en.properties
trunk/ggc-plugin_base/src/ggc/plugin/device/impl/minimed/MinimedDevice.java
trunk/ggc-plugin_base/src/ggc/plugin/device/impl/minimed/MinimedDeviceConfig.java
trunk/ggc-plugin_base/src/ggc/plugin/device/impl/minimed/MinimedDeviceUtil.java
trunk/ggc-plugin_base/src/ggc/plugin/device/impl/minimed/cmd/BadDeviceValueException.java
trunk/ggc-plugin_base/src/ggc/plugin/device/impl/minimed/cmd/MinimedCommand.java
trunk/ggc-plugin_base/src/ggc/plugin/device/impl/minimed/cmd/MinimedCommandHistoryCGMS.java
trunk/ggc-plugin_base/src/ggc/plugin/device/impl/minimed/cmd/MinimedCommandHistoryData.java
trunk/ggc-plugin_base/src/ggc/plugin/device/impl/minimed/cmd/MinimedCommandReply.java
trunk/ggc-plugin_base/src/ggc/plugin/device/impl/minimed/cmd/MinimedReplyDecoder.java
trunk/ggc-plugin_base/src/ggc/plugin/device/impl/minimed/comm/MinimedComm_ComLink.java
trunk/ggc-plugin_base/src/ggc/plugin/device/impl/minimed/comm/MinimedComm_ComStation.java
trunk/ggc-plugin_base/src/ggc/plugin/device/impl/minimed/comm/MinimedComm_Interface.java
trunk/ggc-plugin_base/src/ggc/plugin/device/impl/minimed/comm/MinimedComm_USBLink.java
trunk/ggc-pump/src/ggc/pump/device/minimed/Minimed511.java
trunk/ggc-pump/src/ggc/pump/device/minimed/Minimed515.java
trunk/ggc-pump/src/ggc/pump/device/minimed/Minimed522.java
trunk/ggc-pump/src/ggc/pump/device/minimed/Minimed523.java
trunk/ggc-pump/src/ggc/pump/device/minimed/Minimed553.java
trunk/ggc-pump/src/ggc/pump/device/minimed/MinimedPumpDevice.java
trunk/ggc-pump/src/ggc/pump/device/minimed/PumpSimple.java
trunk/ggc-pump/src/ggc/pump/device/minimed/comm/
trunk/ggc-pump/src/ggc/pump/device/minimed/comm/MinimedReply.java
trunk/ggc-pump/src/ggc/pump/device/minimed/data/
trunk/ggc-pump/src/ggc/pump/device/minimed/data/Command.java
trunk/ggc-pump/src/ggc/pump/device/minimed/data/CommandHistoryData.java
trunk/ggc-pump/src/ggc/pump/device/minimed/data/DecodeHistoryData.java
trunk/ggc-pump/src/ggc/pump/device/minimed/data/MMPCommand.java
trunk/ggc-pump/src/ggc/pump/device/minimed/data/TestReturnData.java
trunk/ggc-pump/src/ggc/pump/test/MinimedConsoleTester.java
trunk/ggc-pump/src/ggc/pump/test/MinimedDecoderTester.java
Added: trunk/ggc-plugin_base/src/ggc/plugin/device/impl/minimed/MM_en.properties
===================================================================
--- trunk/ggc-plugin_base/src/ggc/plugin/device/impl/minimed/MM_en.properties (rev 0)
+++ trunk/ggc-plugin_base/src/ggc/plugin/device/impl/minimed/MM_en.properties 2012-07-22 13:51:03 UTC (rev 1235)
@@ -0,0 +1,107 @@
+Keywords:
+
+MM_SETTINGS_AUTO_OFF_DURATION_HRS=Auto Off Duration (h)
+MM_SETTINGS_ALARM_MODE=Alarm Mode
+MM_SETTINGS_ALARM_BEEP_VOLUME=Alarm Beep Volume
+MM_SETTINGS_EASY_AUDIO_BOLUS_ACTIVE=Easy (Audio) Bolus Enabled
+MM_SETTINGS_EASY_AUDIO_BOLUS_STEP_SIZE=Easy (Audio) Bolus Step Size
+MM_SETTINGS_VARIABLE_BOLUS_ENABLED=Variable Bolus Enabled
+MM_SETTINGS_MAX_BOLUS=Max Bolus
+MM_SETTINGS_MAX_BASAL_RATE=Max Basal Rate
+MM_SETTINGS_TIME_FORMAT=Time Format
+MM_SETTINGS_INSULIN_CONCENTRATION=Insulin Concentration
+MM_SETTINGS_BASAL_PATTERN_ENABLED=Basal Profile Enabled
+MM_SETTINGS_BASAL_PATTERN=Current Basal Profile
+MM_SETTINGS_RF_ENABLED=RF Enabled
+MM_SETTINGS_BLOCK_ENABLED=Block Enabled
+
+MM_PATTERN_STD=Pattern Std
+MM_PATTERN_A=Pattern A
+MM_PATTERN_B
+MM_PATTERN_UNKNOWN
+
+
+MM_ALARM_MODE_SILENT=Silent
+MM_ALARM_MODE_NORMAL=Normal
+
+
+ MM_SETTINGS_TEMP_BASAL_TYPE=Temp Basal Type
+ MM_TEMP_BASAL_TYPE_PERCENT=Percent
+ MM_TEMP_BASAL_TYPE_UNITS=Units/hour
+
+ MM_SETTINGS_PARADIGM_LINK_ENABLE=ParadigmLink Enable
+ MM_SETTINGS_PARADIGM_LINK_ENABLE=ParadigmLink Enable
+ MM_SETTINGS_TEMP_BASAL_PERCENT=Temp Basal Percent
+
+ MM_SETTINGS_INSULIN_ACTION_TYPE=Insulin Action Type
+
+ MM_INSULIN_ACTION_TYPE_REGULAR=Regular
+ MM_INSULIN_ACTION_TYPE_FAST=Fast
+
+ MM_INSULIN_ACTION_CURVE=Insulin Action Curve
+ MM_INSULIN_ACTION_TYPE_UNSET=Unset
+
+ MM_SETTINGS_RESERVOIR_WARNING_TYPE=Reservoir Warning Type
+ MM_SETTINGS_RESERVOIR_WARNING_POINT=Reservoir Warning Point
+ MM_SETTINGS_KEYPAD_LOCKED=Keypad Locked
+ MM_RESERVOIR_WARNING_TYPE_UNITS=Units
+ MM_RESERVOIR_WARNING_TYPE_TIME=Time
+
+
+
+
+// log.info( (new StringBuilder()).append("decodeCurrentSettings: Alarm Mode = ").append(m_settingAlarmMode).toString());
+// log.info( (new StringBuilder()).append("decodeCurrentSettings: Easy (Audio) Bolus On = ").append(m_settingAudioBolusEnable).toString());
+// log.info( (new StringBuilder()).append("decodeCurrentSettings: Easy (Audio) Bolus Step Size = ").append(m_settingAudioBolusSize).toString());
+// log.info( (new StringBuilder()).append("decodeCurrentSettings: Variable Bolus On = ").append(m_settingVarBolusEnable).toString());
+// log.info( (new StringBuilder()).append("decodeCurrentSettings: Max Bolus = ").append(m_settingMaxBolus).toString());
+// log.info( (new StringBuilder()).append("decodeCurrentSettings: Max Basal Rate = ").append(m_settingMaxBasalRate).toString());
+// log.info( (new StringBuilder()).append("decodeCurrentSettings: Time Format = ").append(m_settingTimeFormat != 1 ? "12h" : "24h").toString());
+// log.info( (new StringBuilder()).append("decodeCurrentSettings: Insulin Concen = ").append(m_settingInsulinConcen).toString());
+// log.info( (new StringBuilder()).append("decodeCurrentSettings: Pattern On = ").append(m_settingBasalPatternEnable).toString());
+// log.info( (new StringBuilder()).append("decodeCurrentSettings: Current Basal Profile = ").append(getPatternString(new Integer(m_settingCurrentBasalPattern))).toString());
+// log.info( (new StringBuilder()).append("decodeCurrentSettings: RF On = ").append(m_settingRFEnable).toString());
+// log.info( (new StringBuilder()).append("decodeCurrentSettings: Block On = ").append(m_settingBlockEnable).toString());
+
+
+
+
+
+
+
+
+
+
+
+
+
+MM_SETTINGS_BOLUS_SCROLL_STEP_SIZE=Bolus Scroll Step Size
+MM_SETTINGS_CAPTURE_EVENT_ENABLE=Capture Event Enable
+MM_SETTINGS_OTHER_DEVICE_ENABLE=Other Device Enable
+MM_SETTINGS_OTHER_DEVICE_MARRIES_STATE=Other Device Married State
+
+
+
+MM_COMMAND_READ_CURRENT_SETTINGS=Read Current Settings
+
+
+
+MM_SETTINGS_
+MM_SETTINGS_
+
+
+
+
+
+ m_settingBolusScrollStepSize = ai[21];
+ m_settingCaptureEventEnable = MedicalDevice.Util.parseEnable(ai[22], "CaptureEvent Enable");
+ m_settingOtherDeviceEnable = MedicalDevice.Util.parseEnable(ai[23], "OtherDevice Enable");
+ m_otherDeviceMarriedState = MedicalDevice.Util.parseEnable(ai[24], "OtherDevice Married State");
+ log.info( (new StringBuilder()).append("decodeCurrentSettings: Bolus Scroll Step Size = ").append(m_settingBolusScrollStepSize).toString());
+ log.info( (new StringBuilder()).append("decodeCurrentSettings: Capture Event Enable = ").append(m_settingCaptureEventEnable).toString());
+ log.info( (new StringBuilder()).append("decodeCurrentSettings: Other Device Enable = ").append(m_settingOtherDeviceEnable).toString());
+ log.info( (new StringBuilder()).append("decodeCurrentSettings: Other Device Married State = ").append(m_otherDeviceMarriedState).toString());
+
+
+
+
Added: trunk/ggc-plugin_base/src/ggc/plugin/device/impl/minimed/MinimedDevice.java
===================================================================
--- trunk/ggc-plugin_base/src/ggc/plugin/device/impl/minimed/MinimedDevice.java (rev 0)
+++ trunk/ggc-plugin_base/src/ggc/plugin/device/impl/minimed/MinimedDevice.java 2012-07-22 13:51:03 UTC (rev 1235)
@@ -0,0 +1,545 @@
+package ggc.plugin.device.impl.minimed;
+
+import ggc.plugin.device.DeviceAbstract;
+import ggc.plugin.device.DeviceIdentification;
+import ggc.plugin.device.PlugInBaseException;
+import ggc.plugin.device.impl.minimed.cmd.MinimedCommand;
+import ggc.plugin.device.impl.minimed.comm.MinimedComm_ComLink;
+import ggc.plugin.device.impl.minimed.comm.MinimedComm_ComStation;
+import ggc.plugin.device.impl.minimed.comm.MinimedComm_Interface;
+import ggc.plugin.device.impl.minimed.comm.MinimedComm_USBLink;
+import ggc.plugin.manager.company.AbstractDeviceCompany;
+import ggc.plugin.output.OutputWriter;
+import ggc.plugin.util.DataAccessPlugInBase;
+
+import java.util.Hashtable;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+
+/*
+Phases (English):
+ X 1 - Start minimed library outside browser and do reading
+ 2 - Create test environment, ter GGC library for Minimed, ter do simple communication with pump
+ 3 - Finialize all data reading
+ 4 - Decode Pump data
+ 5 - 1st phase integration to GGC (reading pump and writing to db)
+ 6 - 2nd phase integration into GGC (pump info, progress bar, etc.)
+ 7 - Reading CGMS data
+ 8 - Decoding CGMS data
+ 9 - Finalizing
+
+
+Faze (Slovene):
+ X 1 - Zazeni minimedovo knjiznico izven browserja, ter uspesno izvedi branje
+ . 2 - Naredi testno okolje, ter GGC knjižnico za Minimed, ter naredi preprosto povezavo na crpalko in neko komunikacijo s �rpalko
+ 3 - Do konca naredi branje vseh potrebnih podatkov (za �rpalko)
+ 4 - Dekodiraj prispele podatke
+ 5 - Prva faza integracije v GGC (branje pumpe in pisanje v bazo)
+ 6 - Druga faza integracije v GGC (uredi vse malenkosti - pump info, progress, itd).
+ 7 - Branje CGMS podatkov
+ 8 - Dekodiranje CGMS podatkov
+ 9 - Zaklju�ek
+
+*/
+
+
+/**
+ * Application: GGC - GNU Gluco Control
+ * Plug-in: Pump Tool (support for Pump devices)
+ *
+ * See AUTHORS for copyright information.
+ *
+ * This program is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by the Free Software
+ * Foundation; either version 2 of the License, or (at your option) any later
+ * version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc., 59 Temple
+ * Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Filename: Minimed512
+ * Description: Minimed 512/712 implementation (just settings)
+ *
+ * Author: Andy {an...@at...}
+ */
+
+public abstract class MinimedDevice extends DeviceAbstract //implements PumpInterface, SelectableInterface
+{
+
+ private MinimedComm_Interface m_communication_protocol = null;
+ protected int m_error_code = 0;
+ protected MinimedDeviceUtil util = null; //MinimedDeviceUtil.getInstance();
+ //protected DataAccessPump m_da = DataAccessPump.getInstance();
+ protected DataAccessPlugInBase m_da = null;
+ //AbstractDeviceCompany abstract_device_company = null;
+ //AbstractDeviceCompany pump_company = null;
+ //OutputWriter output_writer = null;
+ //boolean can_read_data = false;
+ //boolean can_read_partitial_data = false;
+ //boolean can_read_device_info = false;
+ //boolean can_read_device_configuration = false;
+
+
+ private static Log log = LogFactory.getLog(MinimedDevice.class);
+
+ /**
+ * Minimed Device Interface: Comstation
+ */
+ public static final int INTERFACE_COMSTATION = 1;
+
+ /**
+ * Minimed Device Interface: ComLink
+ */
+ public static final int INTERFACE_COMLINK = 2;
+
+ /**
+ * Minimed Device Interface: Paradigm Link Com
+ */
+ public static final int INTERFACE_PARADIGM_LINK_COM = 3;
+
+ /**
+ * Minimed Device Interface: Paradigm Link USB
+ */
+ public static final int INTERFACE_PARADIGM_LINK_USB = 4;
+
+ /**
+ * Minimed Device Interface: Carelink USB
+ */
+ public static final int INTERFACE_CARELINK_USB = 5;
+
+
+ /**
+ * Error: No Error.
+ */
+ public static final int ERROR_NO_ERROR = 0;
+
+ /**
+ * Error: Communication protocol not supported
+ */
+ public static final int ERROR_COMMUNICATION_PROTOCOL_NOT_SUPPORTED = 1;
+
+ /**
+ * Error: Action not supported
+ */
+ public static final int ERROR_ACTION_NOT_SUPPORTED = 2;
+
+ /**
+ * Error: Pump Active Error
+ */
+ public static final int ERROR_PUMP_ACTIVE_ERROR = 3;
+
+
+
+
+
+ /**
+ * Constructor
+ *
+ * @param device_type
+ * @param full_port is packed "portocol_id;port;serial_id"
+ * @param writer
+ */
+ //
+ public MinimedDevice(DataAccessPlugInBase da, int device_type, String full_port, OutputWriter writer)
+ {
+ super(da, writer); //full_port, writer, );
+ this.m_da = da;
+
+ this.util = MinimedDeviceUtil.createInstance(da, this);
+ initDeviceSpecific();
+
+ util.setDeviceType(device_type);
+ util.setCombinedPort(full_port);
+
+ System.out.println("Protocol ID: " + util.protocol_id );
+
+
+ if ((device_type==MinimedDevicesIds.PUMP_MINIMED_508) ||
+ (device_type==MinimedDevicesIds.PUMP_MINIMED_508c))
+ {
+ m_communication_protocol = new MinimedComm_ComStation(this);
+ this.util.device_stopped = true;
+ this.util.device_stopped_exception = new PlugInBaseException("This communication protocol (Comstation for 508/508c) is not supported.");
+ }
+ else
+ {
+ if ((util.protocol_id==INTERFACE_COMLINK) || (util.protocol_id==INTERFACE_PARADIGM_LINK_COM))
+ {
+ m_communication_protocol = new MinimedComm_ComLink(this);
+ }
+ else
+ {
+ m_communication_protocol = new MinimedComm_USBLink(this);
+ this.util.device_stopped = true;
+ this.util.device_stopped_exception = new PlugInBaseException("This communication protocol (Comlink USB) is not YET supported.");
+ }
+ }
+
+
+ if (this.util.isCommunicationStopped())
+ return;
+
+ this.util.setCommunicationInterface(m_communication_protocol);
+ createCommands();
+
+
+
+ }
+
+
+
+ /**
+ * Constructor
+ *
+ * @param cmp
+ */
+ public MinimedDevice(DataAccessPlugInBase da, AbstractDeviceCompany cmp)
+ {
+ super(da);
+ this.setDeviceCompany(cmp);
+ //abstract_device_company = cmp;
+ }
+
+
+ /**
+ * initDeviceSpecific - Device Specific Initialization
+ */
+ public abstract void initDeviceSpecific();
+
+
+ /**
+ * Create Commands
+ */
+ public abstract void createCommands();
+
+
+
+ public DataAccessPlugInBase getDataAccess()
+ {
+ return this.m_da;
+ }
+
+
+ // package received:
+ // 1- 167
+ // 2,3,4 - Serial1 Serial2 Serial3 (BCD packed)
+ // 5 - CMD1
+ // 6 - CMD2
+ //
+
+
+ // package sent:
+ // Header
+ // 1 - 10 (isUseMultiXmitMode), 5 (ParameterCount=0), 4 (ParameterCount<>0)
+ // 2 - Element count (bytes)
+
+ // Message
+ // 1 - 167
+ // 2-4 - Serial1 Serial2 Serial3 (BCD packed)
+ // 5 - CMD1
+ // 6 - CMD2
+ // 7 - CRC8 of this package
+ // encoded
+
+
+
+ public boolean arePumpSettingsSet()
+ {
+ // TODO Auto-generated method stub
+ return false;
+ }
+
+ public Hashtable<String, Integer> getAlarmMappings()
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public float getBasalStep()
+ {
+ // TODO Auto-generated method stub
+ return 0;
+ }
+
+ public Hashtable<String, Integer> getBolusMappings()
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public float getBolusStep()
+ {
+ // TODO Auto-generated method stub
+ return 0;
+ }
+
+ public Hashtable<String, Integer> getErrorMappings()
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public Hashtable<String, Integer> getEventMappings()
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public int getMaxMemoryRecords()
+ {
+ // TODO Auto-generated method stub
+ return 0;
+ }
+
+ public Hashtable<String, Integer> getReportMappings()
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public String getTemporaryBasalTypeDefinition()
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public int howManyMonthsOfDataStored()
+ {
+ // TODO Auto-generated method stub
+ return 0;
+ }
+
+ public void loadPumpSpecificValues()
+ {
+ // TODO Auto-generated method stub
+
+ }
+
+ public String getComment()
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+
+
+ public int getDownloadSupportType()
+ {
+ return 0;
+ }
+
+
+
+
+ public boolean hasSpecialProgressStatus()
+ {
+ return false;
+ }
+
+
+ public void readConfiguration() throws PlugInBaseException
+ {
+ // TODO Auto-generated method stub
+
+ }
+
+ public void readDeviceDataFull() throws PlugInBaseException
+ {
+ log.debug("readDeviceDataFull");
+
+ if (this.util.isCommunicationStopped())
+ {
+ log.debug("readDeviceDataFull:: Communication with pump was closed.");
+ return;
+ }
+
+
+ try
+ {
+
+ // initialize communication interface
+ this.m_communication_protocol.initializeCommunicationInterface();
+
+ if (this.util.isCommunicationStopped())
+ {
+ log.debug("readDeviceDataFull:: Communication with pump was closed.");
+ return;
+ }
+
+
+ // initalize device
+ this.m_communication_protocol.initDevice();
+
+ if (this.util.isCommunicationStopped())
+ {
+ log.debug("readDeviceDataFull:: Communication with pump was closed.");
+ return;
+ }
+
+
+// this.m_communication_protocol.executeCommand(MinimedCommand.COMMAND_HISTORY_DATA);
+
+
+ // close device
+// this.m_communication_protocol.closeDevice();
+
+
+ //this.m_communication_protocol.closeCommunicationInterface();
+
+
+ }
+ catch(PlugInBaseException ex)
+ {
+ throw ex;
+ }
+ finally
+ {
+ // close communication interface
+ this.m_communication_protocol.closeCommunicationInterface();
+ }
+
+
+ }
+
+ public void readDeviceDataPartitial() throws PlugInBaseException
+ {
+ this.m_error_code = MinimedDevice.ERROR_ACTION_NOT_SUPPORTED;
+ }
+
+ public void readInfo() throws PlugInBaseException
+ {
+ this.m_error_code = MinimedDevice.ERROR_ACTION_NOT_SUPPORTED;
+ }
+
+
+ public void close() throws PlugInBaseException
+ {
+
+ try
+ {
+ // close device
+ this.m_communication_protocol.closeDevice();
+
+ // close communication interface
+ this.m_communication_protocol.closeCommunicationInterface();
+
+ }
+ catch(PlugInBaseException ex)
+ {
+ throw ex;
+ }
+
+
+ }
+
+
+
+ /**
+ * getDeviceInfo - get Device info (firmware and software revision)
+ */
+ public DeviceIdentification getDeviceInfo()
+ {
+ return this.output_writer.getDeviceIdentification();
+ }
+
+
+ public boolean open() throws PlugInBaseException
+ {
+ try
+ {
+ // initialize communication interface
+ this.m_communication_protocol.initializeCommunicationInterface();
+
+ // initalize device
+ this.m_communication_protocol.initDevice();
+
+ }
+ catch(PlugInBaseException ex)
+ {
+ throw ex;
+ }
+ return false;
+ }
+
+
+
+ public void dispose()
+ {
+ // TODO Auto-generated method stub
+
+ }
+
+
+ public String getConnectionPort()
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+
+ public int getConnectionProtocol()
+ {
+ // TODO Auto-generated method stub
+ return 0;
+ }
+
+
+
+
+ public String getDeviceSpecialComment()
+ {
+ return "This is experimental download.";
+ }
+
+
+
+
+ public boolean hasIndeterminateProgressStatus()
+ {
+ return false;
+ }
+
+
+ public boolean isDeviceCommunicating()
+ {
+ // TODO Auto-generated method stub
+ return false;
+ }
+
+
+
+
+ public boolean isReadableDevice()
+ {
+ return true;
+ }
+
+
+
+
+ /**
+ * Get Item Id
+ */
+ public long getItemId()
+ {
+ return 0;
+ }
+
+
+
+ public abstract Object convertDeviceReply(MinimedCommand mc);
+
+
+ public abstract int getMinimedDeviceId();
+
+
+
+}
Added: trunk/ggc-plugin_base/src/ggc/plugin/device/impl/minimed/MinimedDeviceConfig.java
===================================================================
--- trunk/ggc-plugin_base/src/ggc/plugin/device/impl/minimed/MinimedDeviceConfig.java (rev 0)
+++ trunk/ggc-plugin_base/src/ggc/plugin/device/impl/minimed/MinimedDeviceConfig.java 2012-07-22 13:51:03 UTC (rev 1235)
@@ -0,0 +1,144 @@
+package ggc.plugin.device.impl.minimed;
+
+import gnu.io.SerialPort;
+
+import java.util.Enumeration;
+import java.util.Hashtable;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+public class MinimedDeviceConfig
+{
+
+ private static Log log = LogFactory.getLog(MinimedDeviceConfig.class);
+
+
+ public int comm_delay_io = 4;
+ public int comm_baudrate = 57600;
+ public int comm_rx_buffer_size = 16384;
+ public int comm_tx_buffer_size = 2048;
+ public int comm_data_bits = SerialPort.DATABITS_8;
+ public int comm_stop_bits = SerialPort.STOPBITS_1;
+ public int comm_parity = SerialPort.PARITY_NONE;
+ public int comm_flowcontrol = SerialPort.FLOWCONTROL_NONE;
+
+
+ public int m_minYear;
+ public int m_maxYear;
+
+ /*
+ public int m_settingBeepVolume;
+ public int m_settingAutoOffDurationHrs;
+ public double m_settingTempBasalRate;
+ public int m_settingTempBasalDurationMin;
+ public int m_settingInsulinConcen;
+ public double m_settingMaxBasalRate;
+ public double m_settingMaxBolus;
+ public boolean m_settingVarBolusEnable;
+ public int m_settingTimeFormat;
+ public boolean m_settingAudioBolusEnable;
+ public double m_settingAudioBolusSize;
+ public double m_settingTodaysTotal;
+ public double m_settingYesterdaysTotal;
+ public int m_settingCurrentBasalPattern;
+ public int m_settingAlarmMode;
+ public boolean m_settingBasalPatternEnable;
+ public boolean m_settingRFEnable;
+ public boolean m_settingBlockEnable;
+ public int m_settingBatteryStatus;
+ public int m_settingRemainingInsulin;
+ public int m_settingErrorStatus;
+ public int m_settingPumpState;
+ public String m_settingRemoteID1;
+ public String m_settingRemoteID2;
+ public String m_settingRemoteID3;
+ public int m_tempBasalType;
+ public int m_tempBasalPercent;
+ public boolean m_paradigmLinkEnable;
+ public int m_insulinActionType;
+ public int m_lowReservoirWarnType;
+ public int m_lowReservoirWarnPoint;
+ public int m_keypadLockStatus;
+ public int m_settingBolusScrollStepSize;
+ public boolean m_settingCaptureEventEnable;
+ public boolean m_settingOtherDeviceEnable;
+ public boolean m_otherDeviceMarriedState;
+ public int m_alarmSnoozeTime;
+ public boolean m_calibrationReminderEnable;
+ public int m_calibrationReminderTime;
+ public boolean m_highGlucoseLimitEnable;
+ public double m_highGlucoseLimitValue;
+ public int m_highGlucoseSnoozeTime;
+ public boolean m_lowGlucoseLimitEnable;
+ public double m_lowGlucoseLimitValue;
+ public int m_lowGlucoseSnoozeTime;
+ public int m_missedDataTime;
+ public boolean m_sensorEnable;
+ public int m_sensorTransmitterId;
+ public int m_sensorBgUnits;
+ public double m_calibrationFactor;
+ public int m_sequenceNumberInc;
+ public int m_totalBytesToRead;
+ public int m_bytesReadThusFar;
+ //public boolean m_serialPortInitialized;
+ //public boolean m_comStationInitialized;
+ //public boolean m_pumpInitialized;
+ public int m_currentHistoryPageNumber;
+ public int m_currentGlucoseHistoryPageNumber;
+ //public private Vector m_commandCollection;
+*/
+
+
+
+
+
+
+ public int strokes_per_basal_unit = 10;
+ public int strokes_per_bolus_unit = 10;
+
+ public Hashtable<String,String> settings = new Hashtable<String,String>();
+
+ public String serial_number = null;
+ public int[] serial_number_bcd = null;
+ public String firmware_version = null;
+
+
+
+
+ public void addSetting(String setting_name, String setting_value)
+ {
+ if (this.settings.containsKey(setting_name))
+ {
+ this.settings.remove(setting_name);
+ }
+
+ this.settings.put(setting_name, setting_value);
+
+ }
+
+
+ public String getSetting(String setting_name)
+ {
+ if (this.settings.containsKey(setting_name))
+ return this.settings.get(setting_name);
+ else
+ return "Unset";
+
+ }
+
+
+
+ public void showSettings()
+ {
+ for(Enumeration<String> en = this.settings.keys(); en.hasMoreElements(); )
+ {
+ String k = en.nextElement();
+ log.debug(k + "=" + this.settings.get(k));
+ }
+
+
+ }
+
+
+}
Added: trunk/ggc-plugin_base/src/ggc/plugin/device/impl/minimed/MinimedDeviceUtil.java
===================================================================
--- trunk/ggc-plugin_base/src/ggc/plugin/device/impl/minimed/MinimedDeviceUtil.java (rev 0)
+++ trunk/ggc-plugin_base/src/ggc/plugin/device/impl/minimed/MinimedDeviceUtil.java 2012-07-22 13:51:03 UTC (rev 1235)
@@ -0,0 +1,516 @@
+package ggc.plugin.device.impl.minimed;
+
+import ggc.plugin.device.PlugInBaseException;
+import ggc.plugin.device.impl.minimed.cmd.MinimedCommand;
+import ggc.plugin.device.impl.minimed.cmd.MinimedReplyDecoder;
+import ggc.plugin.device.impl.minimed.comm.MinimedComm_Interface;
+import ggc.plugin.util.DataAccessPlugInBase;
+
+import java.util.ArrayList;
+import java.util.Hashtable;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import com.atech.i18n.I18nControlAbstract;
+import com.atech.utils.data.CRCUtils;
+
+/**
+ * Application: GGC - GNU Gluco Control
+ * Plug-in: Pump Tool (support for Pump devices)
+ *
+ * See AUTHORS for copyright information.
+ *
+ * This program is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by the Free Software
+ * Foundation; either version 2 of the License, or (at your option) any later
+ * version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc., 59 Temple
+ * Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Filename: Minimed512
+ * Description: Minimed 512/712 implementation (just settings)
+ *
+ * Author: Andy {an...@at...}
+ */
+
+
+public class MinimedDeviceUtil
+{
+
+ private static Log log = LogFactory.getLog(MinimedDeviceUtil.class);
+ public static MinimedDeviceUtil s_util = null;
+
+ public int protocol_id = 0;
+ public String port = "";
+ //private String serial_number = null;
+ //public int[] serial_number_bcd = null;
+ private int device_type = 0;
+ private CRCUtils hex_utils = null;
+ private MinimedComm_Interface communication_interface = null;
+ //public String firmware_version = null;
+
+ public int interface_paradigmlink_delay = 250;
+
+
+ Hashtable<Integer, MinimedCommand> commands;
+ DataAccessPlugInBase m_da = null;
+ //DataAccessPump m_da = DataAccessPump.getInstance();
+ I18nControlAbstract m_ic = null;
+
+ public boolean device_stopped = false;
+
+ public PlugInBaseException device_stopped_exception = null;
+
+
+ //setReceiveBufferSize(16384);
+ //setTransmitBufferSize(2048);
+ //setBaudRate(i);
+ //m_serialConfig.setDataBits(3);
+ //m_serialConfig.setStopBits(0);
+ //m_serialConfig.setParity(0);
+ //m_serialConfig.setHandshake(0);
+ public MinimedDeviceConfig config = null;
+ public MinimedDevice device = null;
+ public MinimedReplyDecoder decoder = null;
+
+
+ private MinimedDeviceUtil(DataAccessPlugInBase da, MinimedDevice md)
+ {
+ this.m_da = da;
+ this.m_ic = da.getI18nControlInstance();
+ this.hex_utils = new CRCUtils();
+ commands = new Hashtable<Integer, MinimedCommand>();
+ this.config = new MinimedDeviceConfig();
+ this.device = md;
+ this.decoder = new MinimedReplyDecoder(this, md);
+ }
+
+
+ public void addCommand(int command_id, MinimedCommand mdc)
+ {
+ if (commands.containsKey(command_id))
+ {
+ commands.remove(command_id);
+ }
+
+ commands.put(command_id, mdc);
+ }
+
+ public MinimedCommand getCommand(int command_id)
+ {
+ return commands.get(command_id);
+ }
+
+ /**
+ * Is Command Available
+ *
+ * @param command_id
+ * @return
+ */
+ public boolean isCommandAvailable(int command_id)
+ {
+ return commands.containsKey(command_id);
+ }
+
+ public boolean isCommunicationStopped()
+ {
+ if (this.device_stopped)
+ log.warn("Communication with device stopped. Exiting.");
+ return this.device_stopped;
+ }
+
+
+ /**
+ * Get Instance
+ *
+ * @return
+ */
+ public static MinimedDeviceUtil createInstance(DataAccessPlugInBase da, MinimedDevice md)
+ {
+ if (MinimedDeviceUtil.s_util == null)
+ MinimedDeviceUtil.s_util = new MinimedDeviceUtil(da, md);
+
+ return MinimedDeviceUtil.s_util;
+ }
+
+
+
+ /**
+ * Get Instance
+ *
+ * @return
+ */
+ public static MinimedDeviceUtil getInstance()
+ {
+ return MinimedDeviceUtil.s_util;
+ }
+
+
+ /**
+ * Set Device Type
+ *
+ * @param dev_type
+ */
+ public void setDeviceType(int dev_type)
+ {
+ this.device_type = dev_type;
+ }
+
+
+ public int getDeviceType()
+ {
+ return this.device_type;
+ }
+
+
+ /**
+ * Set Combined Port
+ *
+ * @param comb_port
+ */
+ public void setCombinedPort(String comb_port)
+ {
+ // fullport is packed: portocol_id;port;serial_id
+ String[] ports = comb_port.split(";");
+
+ this.protocol_id = this.m_da.getIntValueFromString(ports[0], 2);
+ this.port = ports[1];
+ this.config.serial_number = ports[2];
+ this.config.serial_number_bcd = hex_utils.makePackedBCD(ports[2]);
+ }
+
+
+ public String getSerialNumber()
+ {
+ return this.config.serial_number;
+ }
+
+ public void setCommunicationInterface(MinimedComm_Interface comm_int)
+ {
+ this.communication_interface = comm_int;
+ }
+
+ public MinimedComm_Interface getCommunicationInterface()
+ {
+ return this.communication_interface;
+ }
+
+
+ public CRCUtils getHexUtils()
+ {
+ return this.hex_utils;
+ }
+
+
+ public boolean isPumpDevice()
+ {
+ return isPumpDevice(this.device_type);
+ }
+
+
+ public boolean isCGMSDevice()
+ {
+ return isCGMSDevice(this.device_type);
+ }
+
+
+ public boolean isPumpDevice(int device_id)
+ {
+ if ((device_id>=10000) && (device_id<20000))
+ return true;
+ else
+ return false;
+ }
+
+
+ public boolean isCGMSDevice(int device_id)
+ {
+ if ((device_id>=30000) && (device_id<40000))
+ return true;
+ else
+ return false;
+ }
+
+
+
+ public int[] createCommandByte(int command_id)
+ {
+ return createCommandByte(getCommand(command_id));
+ }
+
+
+
+ public int[] createCommandByte(MinimedCommand command)
+ {
+ // 0 -> [5] - command header | HEADER
+ // 1 -> [x] - length of next packet |
+ // 2 -> [167] - comand_package | BODY (ENCODED)
+ // 3,4,5 -> - BCD serial number
+ // 6 -> command_code
+ // 7 -> parameter
+ // 8 -> CRC (2-7)
+
+ ArrayList<Integer> list = new ArrayList<Integer>();
+
+ list.add(167);
+ list.add(this.config.serial_number_bcd[0]);
+ list.add(this.config.serial_number_bcd[1]);
+ list.add(this.config.serial_number_bcd[2]);
+ list.add(command.command_code);
+
+ if (command.command_parameters_count==0)
+ {
+ list.add(0);
+ }
+ else
+ {
+ //int ai2[] = new int[i + 1];
+ //System.arraycopy(ai, 0, ai2, 0, i);
+ if (command.sequence_number>-1)
+ list.add(command.sequence_number);
+ else
+ list.add(command.command_parameters_count);
+
+ hex_utils.addIntArrayToAL(list, command.command_parameters);
+ }
+
+ int crc = hex_utils.computeCRC8(hex_utils.getIntArrayFromAL(list), 0, list.size()); // size-1 ??
+
+ list.add(crc);
+
+ int[] cmd = hex_utils.getIntArrayFromAL(list);
+
+
+
+
+
+
+/*
+ int cmd[] = new int[7];
+ cmd[0] = 167;
+ cmd[1] = this.serial_number_bcd[0];
+ cmd[2] = this.serial_number_bcd[1];
+ cmd[3] = this.serial_number_bcd[2];
+ cmd[4] = command.command_code;
+
+ if (command.command_parameters_count==0)
+ {
+ cmd[5] = 0;
+ cmd[6] = hex_utils.computeCRC8(cmd, 0, 7);
+ }
+ else
+ {
+
+ // FIXME
+ //throw Exception("Not implemented")
+
+
+ i=5;
+
+ int ai2[] = new int[i + 1];
+ System.arraycopy(ai, 0, ai2, 0, i);
+ /*
+ if(m_sequenceNumber != null)
+ ai2[i] = m_sequenceNumber.intValue();
+ else
+ ai2[i] = m_deviceCommand.m_commandParameterCount;
+ ai = hex_utils.concatIntArrays(ai2, m_deviceCommand.m_commandParameters);
+ ai = hex_utils.concatIntArrays(ai, new int[1]);
+ i = ai.length - 1;
+
+ */
+
+
+
+ // }
+
+ log.debug("Command to encode: [" + this.hex_utils.getHexCompact(cmd) + "]");
+
+
+ if (this.getCommunicationInterface().hasEncryptionSupport())
+ cmd = this.getCommunicationInterface().encrypt(cmd);
+
+ log.debug("Command after encode: [" + this.hex_utils.getHexCompact(cmd) + "]");
+
+
+ int cmd_header[] = new int[2];
+
+ if (command.isUseMultiXmitMode())
+ cmd_header[0] = 10;
+ else if (command.command_parameters_count == 0)
+ cmd_header[0] = 5;
+ else
+ cmd_header[0] = 4;
+ cmd_header[1] = cmd.length;
+ cmd = hex_utils.concatIntArrays(cmd_header, cmd);
+
+
+
+
+
+
+
+
+ /*
+ int i = 0;
+ //Contract.pre(m_deviceCommand.m_cmdLength > 0, "m_cmdLength is < 1.");
+ int ai[] = new int[7];
+ ai[i++] = 167;
+ int ai1[] = this.getPackedSerialNumber();
+ ai[i++] = ai1[0];
+ ai[i++] = ai1[1];
+ ai[i++] = ai1[2];
+ ai[i++] = m_deviceCommand.m_commandCode;
+
+ if(m_deviceCommand.m_commandParameterCount == 0)
+ {
+ ai[i++] = 0;
+ }
+ else
+ {
+ int ai2[] = new int[i + 1];
+ System.arraycopy(ai, 0, ai2, 0, i);
+ if(m_sequenceNumber != null)
+ ai2[i] = m_sequenceNumber.intValue();
+ else
+ ai2[i] = m_deviceCommand.m_commandParameterCount;
+ ai = hex_utils.concatIntArrays(ai2, m_deviceCommand.m_commandParameters);
+ ai = hex_utils.concatIntArrays(ai, new int[1]);
+ i = ai.length - 1;
+ }
+ ai[i++] = hex_utils.computeCRC8(ai, 0, i - 1);
+ m_deviceCommand.m_packet = ai;
+
+ if (this.hasEncodingDecoding())
+ return encode(ai);
+ else
+ return ai;
+
+ //return encodeDC(ai);
+ */
+
+ log.debug("Command to send: " + this.hex_utils.getHex(cmd));
+
+
+
+ return cmd;
+ }
+
+
+
+ public void sleepIO()
+ {
+ sleepMs(this.config.comm_delay_io);
+ }
+
+
+ public void sleepParadigmLink()
+ {
+ sleepMs(this.interface_paradigmlink_delay);
+ }
+
+
+
+ public void sleepMs(long ms)
+ {
+ try
+ {
+ Thread.sleep(ms);
+ }
+ catch(Exception ex)
+ {}
+ }
+
+ boolean halt_requested = false;
+
+
+ public boolean isHaltRequested()
+ {
+ return halt_requested;
+ }
+
+
+ public int getNormalPumpState()
+ {
+ if (this.device.getDeviceId()==MinimedDevicesIds.PUMP_MINIMED_511)
+ return 0;
+ else
+ return 3;
+
+ }
+
+ /**
+ * Get Tool Device
+ *
+ * @return
+ */
+ public String getToolDevice()
+ {
+ if (this.isPumpDevice())
+ return m_ic.getMessage("MM_DEVICE_PUMP");
+
+ if (this.isCGMSDevice())
+ return m_ic.getMessage("MM_DEVICE_CGMS");
+
+ return "Unknown";
+ }
+
+ public I18nControlAbstract getI18nControl()
+ {
+ return this.m_ic;
+ }
+
+ public String getNAKDescription(int i)
+ {
+ String s;
+ if(i <= NAK_DESCRIPTIONS_TABLE.length - 1)
+ s = NAK_DESCRIPTIONS_TABLE[i];
+ else
+ s = "UNKNOWN NAK DESCRIPTION";
+ return s;
+ }
+
+
+ private static final String NAK_DESCRIPTIONS_TABLE[] = {
+ "UNKNOWN NAK DESCRIPTION",
+ "REQUEST PAUSE FOR 3 SECONDS",
+ "REQUEST PAUSE UNTIL ACK RECEIVED",
+ "CRC ERROR",
+ "REFUSE PROGRAM UPLOAD",
+ "TIMEOUT ERROR",
+ "COUNTER SEQUENCE ERROR",
+ "PUMP IN ERROR STATE",
+ "INCONSISTENT COMMAND REQUEST",
+ "DATA OUT OF RANGE",
+ "DATA CONSISTENCY",
+ "ATTEMPT TO ACTIVATE UNUSED PROFILES",
+ "PUMP DELIVERING BOLUS",
+ "REQUESTED HISTORY BLOCK HAS NO DATA",
+ "HARDWARE FAILURE"
+ };
+
+
+ public int[] getParamatersArray(int count, int...params)
+ {
+ int arr[] = new int[count];
+
+ for (int i=0; i<count; i++)
+ {
+ arr[i] = params[i];
+ }
+
+ return arr;
+ }
+
+
+
+
+}
Added: trunk/ggc-plugin_base/src/ggc/plugin/device/impl/minimed/cmd/BadDeviceValueException.java
===================================================================
--- trunk/ggc-plugin_base/src/ggc/plugin/device/impl/minimed/cmd/BadDeviceValueException.java (rev 0)
+++ trunk/ggc-plugin_base/src/ggc/plugin/device/impl/minimed/cmd/BadDeviceValueException.java 2012-07-22 13:51:03 UTC (rev 1235)
@@ -0,0 +1,18 @@
+package ggc.plugin.device.impl.minimed.cmd;
+
+public class BadDeviceValueException extends Exception
+{
+ String error_desc = null;
+
+ public BadDeviceValueException(String error)
+ {
+ this.error_desc = error;
+ }
+
+
+ public String toString()
+ {
+ return "BadDeviceValueException: [" + this.error_desc + "]";
+ }
+
+}
Added: trunk/ggc-plugin_base/src/ggc/plugin/device/impl/minimed/cmd/MinimedCommand.java
===================================================================
--- trunk/ggc-plugin_base/src/ggc/plugin/device/impl/minimed/cmd/MinimedCommand.java (rev 0)
+++ trunk/ggc-plugin_base/src/ggc/plugin/device/impl/minimed/cmd/MinimedCommand.java 2012-07-22 13:51:03 UTC (rev 1235)
@@ -0,0 +1,650 @@
+package ggc.plugin.device.impl.minimed.cmd;
+
+import ggc.plugin.device.PlugInBaseException;
+import ggc.plugin.device.impl.minimed.MinimedDeviceUtil;
+
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.io.Serializable;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+/**
+ * Application: GGC - GNU Gluco Control
+ * Plug-in: Pump Tool (support for Pump devices)
+ *
+ * See AUTHORS for copyright information.
+ *
+ * This program is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by the Free Software
+ * Foundation; either version 2 of the License, or (at your option) any later
+ * version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc., 59 Temple
+ * Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Filename: MinimedCommand
+ * Description: Minimed Command
+ *
+ * Author: Andy {an...@at...}
+ */
+
+
+public class MinimedCommand implements Serializable
+{
+ private static Log log = LogFactory.getLog(MinimedCommand.class);
+
+
+ /**
+ * Command: Set RF Power On
+ */
+ public static final int SET_RF_POWER_ON = 93;
+
+ /**
+ * Command: Set RF Power Off
+ */
+ public static final int SET_RF_POWER_OFF = 400;
+
+ /**
+ * Command: Read Pump Error Status
+ */
+ public static final int READ_PUMP_ERROR_STATUS = 117;
+
+ /**
+ * Command: Read Pump State
+ */
+ public static final int READ_PUMP_STATE = 131;
+
+ /**
+ * Command: Read Temporary Basal
+ */
+ public static final int READ_TEMPORARY_BASAL = 120;
+
+ /**
+ * Command: Detect Bolus
+ */
+ public static final int DETECT_BOLUS = 75;
+
+
+
+ /**
+ * Command: Cancel Suspend
+ */
+ public static final int CANCEL_SUSPEND = 77;
+
+ /**
+ * Command: Read Firmware Version
+ */
+ public static final int READ_FIRMWARE_VERSION = 116;
+
+ /**
+ * Command: Ack
+ */
+ public static final int COMMAND_ACK = 6;
+
+ /**
+ * Command: Keypad Push (ACK)
+ */
+ public static final int COMMAND_KEYPAD_PUSH_ACK = 4401;
+
+ /**
+ * Command: Keypad Push (ESC)
+ */
+ public static final int COMMAND_KEYPAD_PUSH_ESC = 4402;
+
+
+ public static final int HISTORY_DATA = 4403;
+
+
+ public static final int SETTINGS = 4404;
+
+
+ public static final int SET_SUSPEND = 4405;
+
+
+ public static final int GET_SERIAL_NUMBER = 113;
+
+
+ public static final int READ_REAL_TIME_CLOCK = 112;
+ public static final int READ_PUMP_ID = 113;
+ public static final int READ_TODAYS_TOTAL_INSULIN = 121;
+ public static final int READ_PROFILES_STD_DATA = 122;
+ public static final int READ_PROFILES_A_DATA = 123;
+ public static final int READ_PROFILES_B_DATA = 124;
+ public static final int READ_BATTERY_STATUS = 114;
+ public static final int READ_REMAINING_INSULIN = 115;
+
+ public static final int READ_REMOTE_CONTROL_IDS = 118;
+ public static final int READ_TEMP_BASAL_RATE_BOLUS_DETECTION = 75;
+
+ public static final int ENABLE_DETAIL_TRACE = 4409;
+ public static final int DISABLE_DETAIL_TRACE = 4410;
+
+ public static final int READ_PUMP_TRACE = 4411;
+ public static final int READ_DETAIL_TRACE = 4412;
+ public static final int READ_NEW_ALARM_TRACE = 4413;
+ public static final int READ_OLD_ALARM_TRACE = 4414;
+
+
+
+ // 512
+ public static final int READ_PUMP_MODEL = 141;
+ public static final int READ_BG_ALARM_CLOCKS = 142;
+ public static final int READ_BG_ALARM_ENABLE = 151;
+ public static final int READ_BG_REMINDER_ENABLE = 144;
+
+ public static final int READ_BG_TARGETS = 140;
+ public static final int READ_BG_UNITS = 137;
+ public static final int READ_BOLUS_WIZARD_SETUP_STATUS= 135;
+ public static final int READ_CARBOHYDRATE_RATIOS = 138;
+ public static final int READ_CARBOHYDRATE_UNITS = 136;
+
+ public static final int READ_PARADIGMLINK_IDS = 149;
+ public static final int READ_INSULIN_SENSITIVITES = 139;
+ public static final int READ_RESERVOIR_WARNING = 143;
+ public static final int READ_LANGUAGE = 134;
+ public static final int SET_TEMPORARY_BASAL = 76;
+
+
+ // 515
+ //public static final int READ_BG_TARGETS = 159;
+ public static final int READ_CURRENT_HISTORY_PAGE_NUMBER = 157;
+ public static final int READ_SAVE_SETTINGS_DATE = 193;
+ public static final int READ_CONTRAST = 195;
+ public static final int READ_MISSED_BOLUS_REMINDER_ENABLE = 197;
+ public static final int READ_MISSED_BOLUS_REMINDERS = 198;
+ public static final int READ_FACTORY_PARAMETERS = 199;
+ public static final int READ_CURRENT_PUMP_STATUS = 206;
+
+
+ // 522
+
+ public static final int READ_CALIBRATION_FACTOR = 156;
+ public static final int READ_SENSOR_SETTINGS = 153;
+ public static final int READ_GLUCOSE_HISTORY = 154;
+ public static final int READ_ISIG_HISTORY = 155;
+
+ // 523
+ public static final int READ_SENSOR_PREDICTIVE_ALERTS = 209;
+ public static final int READ_SENSOR_RATE_OF_CHANGE_ALERTS = 212;
+ public static final int READ_SENSOR_DEMO_AND_GRAPH_TIMEOUT = 210;
+ public static final int READ_SENSOR_ALARM_SILENCE = 211;
+ public static final int READ_OTHER_DEVICES_ID = 240;
+ public static final int READ_VCNTR_HISTORY = 213;
+
+
+
+
+ /**
+ * Command: Code/Id
+ */
+ public int command_code = 0;
+
+ /**
+ * Command: Description
+ */
+ public String command_description = "";
+
+ /**
+ * Command: Parameters Array
+ */
+ public int[] command_parameters = null;
+
+ /**
+ * Command: Parameters Count
+ */
+ public int command_parameters_count = 0;
+
+ /**
+ * Command: Multi Xmit Mode
+ */
+ public boolean use_multi_xmit_mode = false;
+
+ /**
+ * Command: Sequence Number
+ */
+ public int sequence_number = -1;
+
+ /**
+ * Command: Raw Data
+ */
+ //public int[] raw_data = null;
+
+ /**
+ * Command: Sub description
+ */
+ public String sub_description = null;
+
+ /**
+ * Command: Record Length
+ */
+ public int record_length = 64;
+
+ /**
+ * Command: Max Records
+ */
+ public int max_records = 1;
+
+ /**
+ * Command: Data Count (for paging)
+ */
+ public int data_count = 0;
+
+ /**
+ * Command: Command Type
+ */
+ public int command_type = 0;
+
+ /**
+ * Command: Allowed Retries
+ */
+ public int allowed_retries = 0;
+
+ /**
+ * Command: Max Timeout (Allowed Time)
+ */
+ public int max_allowed_time = 2000;
+
+
+
+ public int type_of_reply = 0;
+
+
+ public boolean has_sub_commands = false;
+
+ public boolean has_only_sub_commands = false;
+
+ int address = 0;
+ int address_length = 0;
+ int data_offset = 0;
+ int command_length = 0;
+ int[] packet = null;
+ //int max_retries = 2;
+
+
+ //public boolean has_sub_commands = false;
+
+
+
+ /**
+ * Constructor
+ *
+ * @param command_code_
+ * @param desc
+ */
+/* public MinimedCommand(int command_code_, String desc)
+ {
+ this(command_code_, desc, 0, null, 1, 2000);
+ }*/
+
+ /**
+ * Constructor
+ *
+ * @param command_code_
+ * @param desc
+ * @param cmd_parameter_count
+ * @param params
+ */
+/* public MinimedCommand(int command_code_, String desc, int cmd_parameter_count, int[] params)
+ {
+ this(command_code_, desc, cmd_parameter_count, params, 1, 2000);
+ }
+
+
+ public MinimedCommand(int command_code_, String desc, int[] params)
+ {
+ this(command_code_, desc, params.length, params, 1, 2000);
+ }
+ */
+
+ /**
+ * Constructor
+ *
+ * @param command_code_
+ * @param desc
+ * @param cmd_parameter_count
+ * @param params
+ * @param max_retries_
+ */
+ /*public MinimedCommand(int command_code_, String desc, int cmd_parameter_count, int[] params, int max_retries_)
+ {
+ this(command_code_, desc, cmd_parameter_count, params, max_retries_, 2000);
+ }
+
+
+
+ public MinimedCommand(int command_code_, String desc, int cmd_parameter_count, int[] params, int allowed_retries_, int max_allowed_time_)
+ {
+ this(command_code_, desc, params, allowed_retries_, max_allowed_time_, 0);
+ }
+
+ */
+
+
+
+ /**
+ * Constructor
+ *
+ * @param command_code_
+ * @param desc
+ * @param cmd_parameter_count
+ * @param params
+ * @param allowed_retries_
+ * @param max_allowed_time_
+ */
+ /* public MinimedCommand(int command_code_, String desc, int[] params, int allowed_retries_, int max_allowed_time_, int type_of_reply_)
+ {
+ this.command_code = command_code_;
+ this.command_description = desc;
+ if (params == null)
+ {
+ this.command_parameters_count = 0;
+ }
+ else
+ this.command_parameters_count = params.length;
+
+
+ //this.command_parameters_count = cmd_parameter_count;
+ this.command_parameters = params;
+ this.allowed_retries = allowed_retries_;
+ this.max_allowed_time = max_allowed_time_;
+
+ this.type_of_reply = type_of_reply_;
+
+ // FIXME
+
+ if ((command_code == 93) && (params!=null) && (params[0] == 1))
+ setUseMultiXmitMode(true);
+
+ this.clearData();
+ }
+ */
+
+
+
+
+ public MinimedCommand(int code, String desc)
+ {
+ // Command(int code, String desc, int bytes_per_rec, int max_recs, int cmd_type)
+ this(code, desc, 64, 1, 0);
+ }
+
+ public MinimedCommand(int code, String desc, int cmd_params[], int param_count)
+ {
+ // Command(int code, String desc, int bytes_per_rec, int max_recs, int cmd_type)
+ this(code, desc, 0, 1, 11);
+ this.command_parameters = cmd_params;
+ this.command_parameters_count = param_count;
+ }
+
+ /*
+ public MinimedCommand(int i, String s, int j, int k, int l)
+ {
+ // Command(int code, String desc, int bytes_per_rec, int max_recs, int cmd_type)
+ this(i, s, j, k, l);
+ }*/
+
+ public MinimedCommand(int code, String desc, int param_count)
+ {
+ // Command(int code, String desc, int bytes_per_rec, int max_recs, int cmd_type)
+ this(code, desc, 0, 1, 11);
+ this.command_parameters_count = param_count;
+ int k = param_count / 64 + 1;
+ this.command_parameters = new int[64 * k];
+ }
+
+
+
+ public MinimedCommand(int code, String desc, int bytes_per_rec, int max_recs, int cmd_type)
+ {
+ this(code, desc, bytes_per_rec, max_recs, 0, 0, cmd_type);
+
+// m_dataOffset = 0;
+// m_cmdLength = 2;
+ setUseMultiXmitMode(false);
+ }
+
+ public MinimedCommand(int code, String desc, int bytes_per_rec, int max_recs, int addy, int addy_len,
+ int cmd_type)
+ {
+ this.command_description = desc;
+ this.command_code = code;
+
+ this.record_length = bytes_per_rec;
+ this.max_records = max_recs;
+
+ prepareForReading();
+
+ this.address = 0;
+ this.address_length = addy_len;
+ this.data_offset = 2;
+
+ if (addy_len==1)
+ this.command_length = 2 + addy_len;
+ else
+ this.command_length = 2 + addy_len + 1;
+
+ this.packet = new int[0];
+ this.command_type = cmd_type;
+ this.command_parameters_count = 0;
+ this.command_parameters = new int[64];
+ setUseMultiXmitMode(false);
+ this.allowed_retries = 2;
+
+
+
+
+ /*
+ //m_numBytesRead = 0;
+ //m_extraObject = null;
+ //m_effectTime = 0;
+ allocateRawData();
+ m_address = addy;
+ m_addressLength = addy_len;
+ m_dataOffset = 2;
+ if(addy_len == 1)
+ m_cmdLength = 2 + addy_len;
+ else
+ m_cmdLength = 2 + addy_len + 1;
+ m_packet = new int[0];
+ m_commandType = cmd_type;
+ m_commandParameterCount = 0;
+ m_commandParameters = new int[64];
+ setUseMultiXmitMode(false);
+ m_maxRetries = 2;
+ */
+ }
+
+
+
+
+
+
+
+
+
+ /**
+ * Get Full Command Description
+ *
+ * @return
+ */
+ public String getFullCommandDescription()
+ {
+ if (this.sub_description==null)
+ return " CMD [id=" + this.command_code + ",hex=" + MinimedDeviceUtil.getInstance().getHexUtils().getHex(command_code) + ",description=" + MinimedDeviceUtil.getInstance().getI18nControl().getMessage(this.command_description) + "] ";
+ else
+ return " CMD [id=" + this.command_code + ",hex=" + MinimedDeviceUtil.getInstance().getHexUtils().getHex(command_code) + ",description=" + MinimedDeviceUtil.getInstance().getI18nControl().getMessage(this.command_description) + "-" + this.sub_description + "] ";
+ }
+
+
+ /**
+ * Is Multi Xmit Mode
+ *
+ * @return
+ */
+ public boolean isUseMultiXmitMode()
+ {
+ if (this.use_multi_xmit_mode)
+ return true;
+
+ return ((command_code == 93) && (this.command_parameters!=null) && (this.command_parameters[0] == 1));
+// setUseMultiXmitMode(true);
+// return use_multi_xmit_mode;
+ }
+
+ /**
+ * Set Multi Xmit Mode
+ *
+ * @param mxmit
+ */
+ public void setUseMultiXmitMode(boolean mxmit)
+ {
+ use_multi_xmit_mode = mxmit;
+ }
+
+
+ /**
+ * Prepare for Reading
+ */
+ public void prepareForReading()
+ {
+ if (this.reply==null)
+ {
+ this.reply = new MinimedCommandReply(MinimedCommandReply.COMMAND_REPLY_DATA, record_length, max_records);
+ }
+
+ this.reply.clearData();
+ }
+
+ public MinimedCommandReply reply = null;
+
+
+ public void clearData()
+ {
+ prepareForReading();
+ }
+
+
+ public void clearDataForce()
+ {
+ log.debug("Rec length: " + record_length + ", max_records= " + max_records);
+ this.reply = new MinimedCommandReply(MinimedCommandReply.COMMAND_REPLY_DATA, record_length, max_records);
+ this.reply.clearData();
+ }
+
+
+ public MinimedCommandReply getReply()
+ {
+ return this.reply;
+ }
+
+
+
+ /**
+ * Create Command Packet
+ *
+ * @return
+ */
+ public MinimedCommand createCommandPacket()
+ {
+ log.debug("createCommandPacket()");
+ MinimedCommand cmd = new MinimedCommand(this.command_code, this.command_description);
+ cmd.sub_description = "command packet";
+
+ cmd.command_parameters = null;
+ cmd.record_length = 0;
+ cmd.max_records = 0;
+ cmd.command_type = 0;
+ cmd.command_parameters_count =0;
+ cmd.reply = this.reply;
+ //cmd.raw_data = this.raw_data;
+
+ //cmd.prepareForReading();
+
+ //cmd.command_parameters = this.command_parameters;
+
+ if ((this.command_code == 93) && (this.command_parameters[0] == 1))
+ cmd.setUseMultiXmitMode(true);
+
+ return cmd;
+ }
+
+
+
+
+ public boolean canReturnData()
+ {
+ return (this.max_records * this.record_length) > 0;
+ }
+
+
+
+
+ public boolean hasSubCommands()
+ {
+ return this.has_sub_commands;
+ }
+
+
+
+
+
+ public void executeSubCommands() throws PlugInBaseException
+ {
+ }
+
+
+ public static void saveCommandData(MinimedCommand cmd, String filename)
+ {
+ try
+ {
+ // Write to disk with FileOutputStream
+ FileOutputStream f_out = new FileOutputStream(filename);
+
+ //Write object with ObjectOutputStream
+ ObjectOutputStream obj_out = new ObjectOutputStream (f_out);
+
+ // Write object out to disk
+ obj_out.writeObject ( cmd );
+ }
+ catch(IOException ex)
+ {
+ log.error("Error writing object to file. Ex: " + ex, ex);
+ }
+ }
+
+ public static MinimedCommand loadObjectData(String filename)
+ {
+ try
+ {
+ // Read from disk using FileInputStream
+ FileInputStream f_in = new FileInputStream(filename);
+
+ // Read object using ObjectInputStream
+ ObjectInputStream obj_in = new ObjectInputStream (f_in);
+
+ // Read an object
+ Ob...
[truncated message content] |
|
From: <and...@us...> - 2014-06-17 19:52:54
|
Revision: 1284
http://sourceforge.net/p/ggc/code/1284
Author: andyrozman
Date: 2014-06-17 19:52:49 +0000 (Tue, 17 Jun 2014)
Log Message:
-----------
pom changes
Modified Paths:
--------------
trunk/ggc-cgm/pom.xml
trunk/ggc-core/pom.xml
trunk/ggc-master-pom/pom.xml
trunk/ggc-meter/pom.xml
trunk/ggc-nutri/pom.xml
trunk/ggc-plugin_base/pom.xml
trunk/ggc-pump/pom.xml
Added Paths:
-----------
trunk/ggc-core/.settings/org.eclipse.jdt.core.prefs
trunk/ggc-master-pom/docs/
trunk/ggc-master-pom/docs/DeployVersions.txt
trunk/ggc-nutri/.settings/
trunk/ggc-nutri/.settings/org.eclipse.jdt.core.prefs
Modified: trunk/ggc-cgm/pom.xml
===================================================================
--- trunk/ggc-cgm/pom.xml 2014-06-17 19:47:50 UTC (rev 1283)
+++ trunk/ggc-cgm/pom.xml 2014-06-17 19:52:49 UTC (rev 1284)
@@ -4,7 +4,7 @@
<groupId>net.sf.ggc</groupId>
<artifactId>ggc-parent</artifactId>
<version>1.0-SNAPSHOT</version>
- <relativePath>../ggc-master-pom/pom.xml</relativePath>
+ <relativePath>../ggc-master-pom/pom.xml</relativePath>
</parent>
@@ -12,7 +12,7 @@
<groupId>net.sf.ggc</groupId>
<artifactId>ggc-cgms-tool</artifactId>
- <version>${ggc-cgms-tool.version}</version>
+ <version>${ggc-cgms-tool.version}</version>
<build>
@@ -63,15 +63,7 @@
<artifactId>atech-tools</artifactId>
</dependency>
- <dependency>
- <groupId>net.java.dev.jna</groupId>
- <artifactId>jna</artifactId>
- </dependency>
- <dependency>
- <groupId>com.ibm.old.comapi</groupId>
- <artifactId>ibm-compapi</artifactId>
- </dependency>
<dependency>
<groupId>net.sf.ggc.libusb4j</groupId>
Added: trunk/ggc-core/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- trunk/ggc-core/.settings/org.eclipse.jdt.core.prefs (rev 0)
+++ trunk/ggc-core/.settings/org.eclipse.jdt.core.prefs 2014-06-17 19:52:49 UTC (rev 1284)
@@ -0,0 +1,5 @@
+#Tue Jun 10 20:23:38 CEST 2014
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.compiler.compliance=1.5
Modified: trunk/ggc-core/pom.xml
===================================================================
--- trunk/ggc-core/pom.xml 2014-06-17 19:47:50 UTC (rev 1283)
+++ trunk/ggc-core/pom.xml 2014-06-17 19:52:49 UTC (rev 1284)
@@ -13,7 +13,7 @@
<groupId>net.sf.ggc</groupId>
<artifactId>ggc-core</artifactId>
- <version>${ggc-core.version}</version>
+ <version>${ggc-core.version}</version>
<build>
<directory>target</directory>
@@ -91,22 +91,24 @@
<groupId>javax.help</groupId>
<artifactId>javahelp</artifactId>
</dependency>
-
+<!--
<dependency>
<groupId>net.sf.squirrel-sql.thirdparty-non-maven</groupId>
<artifactId>skinlf</artifactId>
</dependency>
-
+ -->
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</dependency>
+<!--
<dependency>
<groupId>net.sf.jasperreports</groupId>
<artifactId>jasperreports</artifactId>
</dependency>
-
+ -->
+
<dependency>
<groupId>jfree</groupId>
<artifactId>jfreechart</artifactId>
Added: trunk/ggc-master-pom/docs/DeployVersions.txt
===================================================================
--- trunk/ggc-master-pom/docs/DeployVersions.txt (rev 0)
+++ trunk/ggc-master-pom/docs/DeployVersions.txt 2014-06-17 19:52:49 UTC (rev 1284)
@@ -0,0 +1,57 @@
+
+DEPLOY VERSIONS for MAVEN
+==========================
+
+
+ 0.5.0.3
+ -------
+
+ <ggc-core.version>0.5.0.3</ggc-core.version>
+ <ggc-plugin-base.version>0.6.2</ggc-plugin-base.version>
+ <atech-tools.version>0.7.7</atech-tools.version>
+ <ggc-desktop.version>0.5.0.3</ggc-core.version>
+ <ggc-little.version>0.2.3</> NON MAVEN
+ <ggc-lang.version>0.4.2</> NON MAVEN
+ <ggc-plugin_base.version>0.6.2</>
+ <ggc-nutri_tool.version>1.3.3</>
+ <ggc-meter_tool.version>2.0.3</>
+ <ggc-pump_tool.version>1.3.4</>
+ <ggc-cgms_tool.version>1.0.3</>
+
+
+OMPONENT_11_GROUP=3
+COMPONENT_11_NAME=Atech Tools
+COMPONENT_11_VERSION=0.7.7
+COMPONENT_11_VERSION_NUM=10
+COMPONENT_11_ROOT_DIR=/lib/utils
+COMPONENT_11_FILES=%ROOT%/atech-tools-0.7.7.jar
+
+
+
+ <!-- Dependencies versions -->
+ <jna.version>3.3.0</jna.version>
+ <rxtxcomm.version>2.2</rxtxcomm.version>
+ <libusb4jwo.version>0.2</libusb4jwo.version>
+ <ibm-compapi.version>1.3</ibm-compapi.version>
+ <skinlf.version>6.7</skinlf.version>
+ <log4j.version>1.2.16</log4j.version>
+ <jasperreports.version>3.7.1</jasperreports.version>
+ <jfreechart.version>1.0.13</jfreechart.version>
+ <hibernate.version>3.1</hibernate.version>
+ <pygmy-core.version>0.2</pygmy-core.version>
+ <pygmy-handlers.version>0.2</pygmy-handlers.version>
+ <junit.version>4.10</junit.version>
+ <servlet-api.version>2.5</servlet-api.version>
+ <itextpdf.version>5.1.2</itextpdf.version>
+ <commons-lang.version>2.0</commons-lang.version>
+ <javahelp.version>2.0.05</javahelp.version>
+
+
+ 0.5.1
+ -----
+
+ <ggc-core.version>0.5.1-SNAPSHOT</ggc-core.version>
+ <ggc-plugin-base.version>0.6.3-SNAPSHOT</ggc-plugin-base.version>
+
+ <atech-tools.version>0.7.8-SNAPSHOT</atech-tools.version>
+
\ No newline at end of file
Modified: trunk/ggc-master-pom/pom.xml
===================================================================
--- trunk/ggc-master-pom/pom.xml 2014-06-17 19:47:50 UTC (rev 1283)
+++ trunk/ggc-master-pom/pom.xml 2014-06-17 19:52:49 UTC (rev 1284)
@@ -1,285 +1,346 @@
<project>
- <modelVersion>4.0.0</modelVersion>
- <name>GGC Parent POM</name>
-
- <groupId>net.sf.ggc</groupId>
- <artifactId>ggc-parent</artifactId>
- <version>1.0-SNAPSHOT</version>
- <packaging>pom</packaging>
+ <modelVersion>4.0.0</modelVersion>
+ <name>GGC Parent POM</name>
-
-
- <!--
- <modules>
-<module>project-a</module>
-<module>project-b</module>
-</modules> -->
-
-
-<!--
- <artifactId>atech-tools</artifactId>
- <version>0.7-SNAPSHOT</version>
- -->
-
- <!--
- <repositories>
- <repository>
- <id>central</id>
- <name>Maven Repository Switchboard</name>
- <layout>default</layout>
- <url>http://repo1.maven.org/maven2</url>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
- </repositories>
+ <groupId>net.sf.ggc</groupId>
+ <artifactId>ggc-parent</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <packaging>pom</packaging>
- <pluginRepositories>
- <pluginRepository>
- <id>central</id>
- <name>Maven Plugin Repository</name>
- <url>http://repo1.maven.org/maven2</url>
- <layout>default</layout>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- <releases>
- <updatePolicy>never</updatePolicy>
- </releases>
- </pluginRepository>
- </pluginRepositories>
-
- -->
-<!--
- <repositories>
- <repository>
- <id>pygmy-repo</id>
- <name>Pygmy Repository</name>
- <layout>default</layout>
- <url>https://oss.sonatype.org/service/local/repositories/netsfggc-042/content/</url>
--->
-<!--https://oss.sonatype.org/content/repositories/netsfggc-046/net/sf/ggc/pygmy-httpd/pygmy-handlers/0.2/pygmy-handlers-0.2.pom
-https://oss.sonatype.org/service/local/repositories/netsfggc-042/content/
+ <!-- <modules> <module>project-a</module> <module>project-b</module> </modules> -->
--->
-<!--
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
--->
- <repository>
+ <!-- <artifactId>atech-tools</artifactId> <version>0.7-SNAPSHOT</version> -->
+
+ <!-- <repositories> <repository> <id>central</id> <name>Maven Repository
+ Switchboard</name> <layout>default</layout> <url>http://repo1.maven.org/maven2</url>
+ <snapshots> <enabled>false</enabled> </snapshots> </repository> </repositories>
+ <pluginRepositories> <pluginRepository> <id>central</id> <name>Maven Plugin
+ Repository</name> <url>http://repo1.maven.org/maven2</url> <layout>default</layout>
+ <snapshots> <enabled>false</enabled> </snapshots> <releases> <updatePolicy>never</updatePolicy>
+ </releases> </pluginRepository> </pluginRepositories> -->
+ <!-- <repositories> <repository> <id>pygmy-repo</id> <name>Pygmy Repository</name>
+ <layout>default</layout> <url>https://oss.sonatype.org/service/local/repositories/netsfggc-042/content/</url> -->
+ <!--https://oss.sonatype.org/content/repositories/netsfggc-046/net/sf/ggc/pygmy-httpd/pygmy-handlers/0.2/pygmy-handlers-0.2.pom
+ https://oss.sonatype.org/service/local/repositories/netsfggc-042/content/ -->
+ <!-- <snapshots> <enabled>false</enabled> </snapshots> </repository> -->
+
+ <repositories>
+
+ <repository>
<id>atechrepositorypublic</id>
- <name>Atech Software Public Repository</name>
- <url>http://www.atech-software.com:8080/nexus/content/groups/public/</url>
- </repository>
+ <name>Atech Software Public Repository</name>
+ <url>http://www.atech-software.com:8080/nexus/content/groups/public/</url>
+ </repository>
-<!--
- <repository>
- <id>mvnrepository</id>
- <name>Mvn Central Repository</name>
- <url>http://www.mvnrepository.com</url>
- </repository>
+ <!-- <repository> <id>mvnrepository</id> <name>Mvn Central Repository</name>
+ <url>http://www.mvnrepository.com</url> </repository> <repository> <id>jbossrepository</id>
+ <name>jbossrepository</name> <url>https://repository.jboss.org/nexus/</url>
+ </repository> <repository> <id>sonatype</id> <name>Sonatype OSS Snapshots
+ Repository</name> <url>http://oss.sonatype.org/content/groups/public</url>
+ </repository> <repository> <id>javanet</id> <name>Download Java Net Repository</name>
+ <url>http://download.java.net/maven/2/</url> </repository> <repository> <id>mavenrepository</id>
+ <name>Maven Repository Repository</name> <layout>legacy</layout> <url>http://maven-repository.com/artifacts/</url>
+ </repository> -->
- <repository>
- <id>jbossrepository</id>
- <name>jbossrepository</name>
- <url>https://repository.jboss.org/nexus/</url>
- </repository>
- <repository>
- <id>sonatype</id>
- <name>Sonatype OSS Snapshots Repository</name>
- <url>http://oss.sonatype.org/content/groups/public</url>
- </repository>
- <repository>
- <id>javanet</id>
- <name>Download Java Net Repository</name>
- <url>http://download.java.net/maven/2/</url>
- </repository>
+ </repositories>
- <repository>
- <id>mavenrepository</id>
- <name>Maven Repository Repository</name>
- <layout>legacy</layout>
- <url>http://maven-repository.com/artifacts/</url>
- </repository>
- -->
+ <distributionManagement>
+ <repository>
+ <id>releases</id>
+ <name>Internal Releases</name>
+ <url>http://www.atech-software.com:8080/nexus/content/repositories/releases/</url>
+ </repository>
+ <snapshotRepository>
+ <id>snapshots</id>
+ <name>Internal Snapshots</name>
+ <url>http://www.atech-software.com:8080/nexus/content/repositories/snapshots/</url>
+ </snapshotRepository>
+ </distributionManagement>
- </repositories>
+ <build>
+ <directory>target</directory>
+ <outputDirectory>target/classes</outputDirectory>
+ <finalName>${project.artifactId}-${project.version}</finalName>
+ <testOutputDirectory>target/test-classes</testOutputDirectory>
+ <sourceDirectory>src</sourceDirectory>
+ <scriptSourceDirectory>src</scriptSourceDirectory>
+ <testSourceDirectory>src/test/java</testSourceDirectory>
+ <resources>
+ <resource>
+ <directory>src</directory>
+ <filtering>true</filtering>
+ <excludes>
+ <exclude>**/*.java</exclude>
+ </excludes>
+ </resource>
+ </resources>
+ <testResources>
+ <testResource>
+ <directory>src/test/resources</directory>
+ </testResource>
+ </testResources>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>2.1</version>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
- <build>
- <directory>target</directory>
- <outputDirectory>target/classes</outputDirectory>
- <finalName>${project.artifactId}-${pom.version}</finalName>
- <testOutputDirectory>target/test-classes</testOutputDirectory>
- <sourceDirectory>src</sourceDirectory>
- <scriptSourceDirectory>src</scriptSourceDirectory>
- <testSourceDirectory>src/test/java</testSourceDirectory>
- <resources>
- <resource>
- <directory>src</directory>
- <filtering>true</filtering>
- <excludes>
- <exclude>**/*.java</exclude>
- </excludes>
- </resource>
- </resources>
- <testResources>
- <testResource>
- <directory>src/test/resources</directory>
- </testResource>
- </testResources>
- </build>
+ <reporting>
+ <outputDirectory>target/site</outputDirectory>
+ </reporting>
- <reporting>
- <outputDirectory>target/site</outputDirectory>
- </reporting>
-
-
-
- <dependencyManagement>
- <dependencies>
-
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate</artifactId>
- <version>3.1</version>
- </dependency>
+ <!-- <modules> <module>ggc-core</module> <module>ggc-plugin-base</module>
+ </modules> -->
- <dependency>
- <groupId>net.sf.ggc.pygmy-httpd</groupId>
- <artifactId>pygmy-core</artifactId>
- <version>0.2</version>
- </dependency>
-
- <dependency>
- <groupId>net.sf.ggc.pygmy-httpd</groupId>
- <artifactId>pygmy-handlers</artifactId>
- <version>0.2</version>
- </dependency>
-
-
-
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.10</version>
- <scope>test</scope>
- </dependency>
- <!-- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.5</version>
- <scope>provided</scope>
- </dependency> -->
- <dependency>
- <groupId>com.itextpdf</groupId>
- <artifactId>itextpdf</artifactId>
- <version>5.1.2</version>
- </dependency>
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>2.0</version>
- </dependency>
-
- <dependency>
- <groupId>javax.help</groupId>
- <artifactId>javahelp</artifactId>
- <version>2.0.05</version>
- </dependency>
-
- <dependency>
- <groupId>net.sf.squirrel-sql.thirdparty-non-maven</groupId>
- <artifactId>skinlf</artifactId>
- <version>6.7</version>
- </dependency>
+ <dependencyManagement>
+ <dependencies>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.16</version>
- </dependency>
+ <dependency>
+ <groupId>net.sf.ggc</groupId>
+ <artifactId>ggc-core</artifactId>
+ <version>${ggc-core.version}</version>
+ </dependency>
- <dependency>
- <groupId>net.sf.jasperreports</groupId>
- <artifactId>jasperreports</artifactId>
- <version>3.7.1</version>
- </dependency>
+ <dependency>
+ <groupId>net.sf.ggc</groupId>
+ <artifactId>ggc-plugin-base</artifactId>
+ <version>${ggc-plugin-base.version}</version>
+ </dependency>
- <dependency>
- <groupId>jfree</groupId>
- <artifactId>jfreechart</artifactId>
- <version>1.0.13</version>
- </dependency>
+ <dependency>
+ <groupId>net.sf.ggc</groupId>
+ <artifactId>ggc-meter-tool</artifactId>
+ <version>${ggc-meter-tool.version}</version>
+ </dependency>
- <!-- This should be replaced with nrserial, which is just extention of rxtx that also contains binary files in jar. -->
- <dependency>
- <groupId>org.bidib.jbidib.org.qbang.rxtx</groupId>
- <artifactId>rxtxcomm</artifactId>
- <version>${rxtxcomm.version}</version>
- </dependency>
+ <dependency>
+ <groupId>net.sf.ggc</groupId>
+ <artifactId>ggc-pump-tool</artifactId>
+ <version>${ggc-pump-tool.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>net.sf.ggc</groupId>
+ <artifactId>ggc-cgms-tool</artifactId>
+ <version>${ggc-cgms-tool.version}</version>
+ </dependency>
- <dependency>
- <groupId>com.atech-software</groupId>
- <artifactId>atech-tools</artifactId>
- <version>${atech-tools.version}</version>
- </dependency>
+ <dependency>
+ <groupId>net.sf.ggc</groupId>
+ <artifactId>ggc-nutri-tool</artifactId>
+ <version>${ggc-nutri-tool.version}</version>
+ </dependency>
- <dependency>
- <groupId>net.java.dev.jna</groupId>
- <artifactId>jna</artifactId>
- <version>${jna.version}</version>
- </dependency>
+ <dependency>
+ <groupId>net.sf.ggc</groupId>
+ <artifactId>ggc-desktop</artifactId>
+ <version>${ggc-desktop.version}</version>
+ </dependency>
- <!--This is some outdated library which we use only for BlueTooth, it needs to be removed or changed, but so far it's
- here and it's version is fixed. This NEEDS to be removed and changed to some other library in near future and
- tested with Dana Pump (only BT device we have so far) -->
- <dependency>
- <groupId>com.ibm.old.comapi</groupId>
- <artifactId>ibm-compapi</artifactId>
- <version>1.3</version>
- </dependency>
-
- <!-- This library is created in parallel to GGC and it should be used for USB communication. For USB devices that have HID
- interfaces (most of them), we will use other library, but for legacy support we use this for now. -->
- <dependency>
- <groupId>net.sf.ggc.libusb4j</groupId>
- <artifactId>libusb4jwo</artifactId>
- <version>${libusb4jwo.version}</version>
- </dependency>
- </dependencies>
- </dependencyManagement>
-
- <properties>
- <ggc-core.version>0.5.1-SNAPSHOT</ggc-core.version>
- <ggc-plugin-base.version>0.6.2-SNAPSHOT</ggc-plugin-base.version>
- <atech-tools.version>0.7.1-SNAPSHOT</atech-tools.version>
- <jna.version>3.3.0</jna.version>
- <rxtxcomm.version>2.2</rxtxcomm.version>
- <libusb4jwo.version>0.2</libusb4jwo.version>
-
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-
- </properties>
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate</artifactId>
+ <version>${hibernate.version}</version>
+ </dependency>
-
-
+ <dependency>
+ <groupId>net.sf.ggc.pygmy-httpd</groupId>
+ <artifactId>pygmy-core</artifactId>
+ <version>${pygmy-core.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>net.sf.ggc.pygmy-httpd</groupId>
+ <artifactId>pygmy-handlers</artifactId>
+ <version>${pygmy-handlers.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>${junit.version}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>${servlet-api.version}</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>com.itextpdf</groupId>
+ <artifactId>itextpdf</artifactId>
+ <version>${itextpdf.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ <version>${commons-lang.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.help</groupId>
+ <artifactId>javahelp</artifactId>
+ <version>${javahelp.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>net.sf.squirrel-sql.thirdparty-non-maven</groupId>
+ <artifactId>skinlf</artifactId>
+ <version>${skinlf.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>${log4j.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>net.sf.jasperreports</groupId>
+ <artifactId>jasperreports</artifactId>
+ <version>${jasperreports.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>jfree</groupId>
+ <artifactId>jfreechart</artifactId>
+ <version>${jfreechart.version}</version>
+ </dependency>
+
+
+ <!-- This should be replaced with nrserial, which is just extention of
+ rxtx that also contains binary files in jar. -->
+ <dependency>
+ <groupId>org.bidib.jbidib.org.qbang.rxtx</groupId>
+ <artifactId>rxtxcomm</artifactId>
+ <version>${rxtxcomm.version}</version>
+ </dependency>
+
+
+ <dependency>
+ <groupId>com.atech-software</groupId>
+ <artifactId>atech-tools</artifactId>
+ <version>${atech-tools.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>net.java.dev.jna</groupId>
+ <artifactId>jna</artifactId>
+ <version>${jna.version}</version>
+ </dependency>
+
+ <!--This is some outdated library which we use only for BlueTooth, it
+ needs to be removed or changed, but so far it's here and it's version is
+ fixed. This NEEDS to be removed and changed to some other library in near
+ future and tested with Dana Pump (only BT device we have so far) -->
+ <dependency>
+ <groupId>com.ibm.old.comapi</groupId>
+ <artifactId>ibm-compapi</artifactId>
+ <version>${ibm-compapi.version}</version>
+ </dependency>
+
+ <!-- This library is created in parallel to GGC and it should be used
+ for USB communication. For USB devices that have HID interfaces (most of
+ them), we will use other library, but for legacy support we use this for
+ now. -->
+ <dependency>
+ <groupId>net.sf.ggc.libusb4j</groupId>
+ <artifactId>libusb4jwo</artifactId>
+ <version>${libusb4jwo.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>com.codeminders</groupId>
+ <artifactId>hidapi</artifactId>
+ <version>${hidapi.version}</version>
+ </dependency>
+
+
+
+ </dependencies>
+ </dependencyManagement>
+
+ <properties>
+
+ <!-- Modules versions -->
+ <ggc-core.version>0.5.1-SNAPSHOT</ggc-core.version>
+ <ggc-plugin-base.version>0.6.3-SNAPSHOT</ggc-plugin-base.version>
+ <ggc-meter-tool.version>2.0.4-SNAPSHOT</ggc-meter-tool.version>
+ <ggc-pump-tool.version>1.3.5-SNAPSHOT</ggc-pump-tool.version>
+ <ggc-cgms-tool.version>1.0.4-SNAPSHOT</ggc-cgms-tool.version>
+ <ggc-nutri-tool.version>1.3.4-SNAPSHOT</ggc-nutri-tool.version>
+
+ <ggc-desktop.version>0.5.1-SNAPSHOT</ggc-desktop.version>
+
+ <!-- NON MAVEN -->
+ <ggc-little.version>0.2.4-SNAPSHOT</ggc-little.version>
+ <!-- NON MAVEN -->
+ <ggc-lang.version>0.4.3-SNAPSHOT</ggc-lang.version>
+
+
+
+
+ <!-- Dependencies versions -->
+ <atech-tools.version>0.7.8-SNAPSHOT</atech-tools.version>
+ <jna.version>3.3.0</jna.version>
+ <rxtxcomm.version>2.2</rxtxcomm.version>
+ <libusb4jwo.version>0.2</libusb4jwo.version>
+ <ibm-compapi.version>1.3</ibm-compapi.version>
+ <skinlf.version>6.7</skinlf.version>
+ <log4j.version>1.2.16</log4j.version>
+ <jasperreports.version>3.7.1</jasperreports.version>
+ <jfreechart.version>1.0.13</jfreechart.version>
+ <hibernate.version>3.1</hibernate.version>
+ <pygmy-core.version>0.2</pygmy-core.version>
+ <pygmy-handlers.version>0.2</pygmy-handlers.version>
+ <junit.version>4.10</junit.version>
+ <servlet-api.version>2.5</servlet-api.version>
+ <itextpdf.version>5.1.2</itextpdf.version>
+ <commons-lang.version>2.0</commons-lang.version>
+ <javahelp.version>2.0.05</javahelp.version>
+
+ <!-- NEW THIS VERSION -->
+ <hidapi.version>1.1</hidapi.version>
+
+
+ <maven.compiler.source>1.5</maven.compiler.source>
+ <maven.compiler.target>1.5</maven.compiler.target>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+
+ </properties>
+
+
+
+ <organization>
+ <name>GGC Development Team</name>
+ </organization>
</project>
Modified: trunk/ggc-meter/pom.xml
===================================================================
--- trunk/ggc-meter/pom.xml 2014-06-17 19:47:50 UTC (rev 1283)
+++ trunk/ggc-meter/pom.xml 2014-06-17 19:52:49 UTC (rev 1284)
@@ -12,7 +12,7 @@
<groupId>net.sf.ggc</groupId>
<artifactId>ggc-meter-tool</artifactId>
- <version>${ggc-meter-tool.version}</version>
+ <version>${ggc-meter-tool.version}</version>
<build>
Added: trunk/ggc-nutri/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- trunk/ggc-nutri/.settings/org.eclipse.jdt.core.prefs (rev 0)
+++ trunk/ggc-nutri/.settings/org.eclipse.jdt.core.prefs 2014-06-17 19:52:49 UTC (rev 1284)
@@ -0,0 +1,5 @@
+#Tue Jun 17 19:24:10 CEST 2014
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.compiler.compliance=1.5
Modified: trunk/ggc-nutri/pom.xml
===================================================================
--- trunk/ggc-nutri/pom.xml 2014-06-17 19:47:50 UTC (rev 1283)
+++ trunk/ggc-nutri/pom.xml 2014-06-17 19:52:49 UTC (rev 1284)
@@ -12,7 +12,7 @@
<groupId>net.sf.ggc</groupId>
<artifactId>ggc-nutri-tool</artifactId>
-<!-- <version>${ggc-nutri-tool.version}</version> -->
+ <version>${ggc-nutri-tool.version}</version>
<build>
Modified: trunk/ggc-plugin_base/pom.xml
===================================================================
--- trunk/ggc-plugin_base/pom.xml 2014-06-17 19:47:50 UTC (rev 1283)
+++ trunk/ggc-plugin_base/pom.xml 2014-06-17 19:52:49 UTC (rev 1284)
@@ -4,7 +4,7 @@
<groupId>net.sf.ggc</groupId>
<artifactId>ggc-parent</artifactId>
<version>1.0-SNAPSHOT</version>
- <relativePath>../ggc-master-pom/pom.xml</relativePath>
+ <relativePath>../ggc-master-pom/pom.xml</relativePath>
</parent>
@@ -12,7 +12,7 @@
<groupId>net.sf.ggc</groupId>
<artifactId>ggc-plugin-base</artifactId>
- <version>${ggc-plugin-base.version}</version>
+ <version>${ggc-plugin-base.version}</version>
<build>
@@ -42,11 +42,10 @@
<dependencies>
- <dependency>
- <groupId>net.sf.ggc</groupId>
- <artifactId>ggc-core</artifactId>
- <!-- <version>${ggc-core.version}</version> -->
- </dependency>
+ <dependency>
+ <groupId>net.sf.ggc</groupId>
+ <artifactId>ggc-core</artifactId>
+ </dependency>
<dependency>
<groupId>org.bidib.jbidib.org.qbang.rxtx</groupId>
Modified: trunk/ggc-pump/pom.xml
===================================================================
--- trunk/ggc-pump/pom.xml 2014-06-17 19:47:50 UTC (rev 1283)
+++ trunk/ggc-pump/pom.xml 2014-06-17 19:52:49 UTC (rev 1284)
@@ -12,7 +12,7 @@
<groupId>net.sf.ggc</groupId>
<artifactId>ggc-pump-tool</artifactId>
- <version>${ggc-pump-tool.version}</version>
+ <version>${ggc-pump-tool.version}</version>
<build>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ru...@us...> - 2014-09-02 17:04:26
|
Revision: 1296
http://sourceforge.net/p/ggc/code/1296
Author: rumbi
Date: 2014-09-02 17:04:23 +0000 (Tue, 02 Sep 2014)
Log Message:
-----------
RR: Fix some POM problems
Modified Paths:
--------------
trunk/ggc-cgm/pom.xml
trunk/ggc-core/pom.xml
trunk/ggc-desktop/pom.xml
trunk/ggc-meter/pom.xml
trunk/ggc-nutri/pom.xml
trunk/ggc-plugin_base/pom.xml
trunk/ggc-pump/pom.xml
Modified: trunk/ggc-cgm/pom.xml
===================================================================
--- trunk/ggc-cgm/pom.xml 2014-08-31 11:14:06 UTC (rev 1295)
+++ trunk/ggc-cgm/pom.xml 2014-09-02 17:04:23 UTC (rev 1296)
@@ -1,4 +1,5 @@
-<project>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>net.sf.ggc</groupId>
@@ -10,7 +11,6 @@
<name>GGC CGMS Tool Project</name>
- <groupId>net.sf.ggc</groupId>
<artifactId>ggc-cgms-tool</artifactId>
<version>${ggc-cgms-tool.version}</version>
Modified: trunk/ggc-core/pom.xml
===================================================================
--- trunk/ggc-core/pom.xml 2014-08-31 11:14:06 UTC (rev 1295)
+++ trunk/ggc-core/pom.xml 2014-09-02 17:04:23 UTC (rev 1296)
@@ -1,4 +1,5 @@
-<project>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
@@ -11,7 +12,6 @@
<name>GGC Core Project</name>
- <groupId>net.sf.ggc</groupId>
<artifactId>ggc-core</artifactId>
<version>${ggc-core.version}</version>
@@ -114,6 +114,12 @@
<artifactId>jfreechart</artifactId>
</dependency>
+ <dependency>
+ <groupId>com.h2database</groupId>
+ <artifactId>h2</artifactId>
+ <version>1.0.69</version>
+ <scope>runtime</scope>
+ </dependency>
Modified: trunk/ggc-desktop/pom.xml
===================================================================
--- trunk/ggc-desktop/pom.xml 2014-08-31 11:14:06 UTC (rev 1295)
+++ trunk/ggc-desktop/pom.xml 2014-09-02 17:04:23 UTC (rev 1296)
@@ -1,4 +1,5 @@
-<project>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
@@ -11,7 +12,6 @@
<name>GGC Desktop Project</name>
- <groupId>net.sf.ggc</groupId>
<artifactId>ggc-desktop</artifactId>
<version>${ggc-desktop.version}</version>
Modified: trunk/ggc-meter/pom.xml
===================================================================
--- trunk/ggc-meter/pom.xml 2014-08-31 11:14:06 UTC (rev 1295)
+++ trunk/ggc-meter/pom.xml 2014-09-02 17:04:23 UTC (rev 1296)
@@ -1,4 +1,5 @@
-<project>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>net.sf.ggc</groupId>
@@ -10,7 +11,6 @@
<name>GGC Meter Tool Project</name>
- <groupId>net.sf.ggc</groupId>
<artifactId>ggc-meter-tool</artifactId>
<version>${ggc-meter-tool.version}</version>
Modified: trunk/ggc-nutri/pom.xml
===================================================================
--- trunk/ggc-nutri/pom.xml 2014-08-31 11:14:06 UTC (rev 1295)
+++ trunk/ggc-nutri/pom.xml 2014-09-02 17:04:23 UTC (rev 1296)
@@ -1,4 +1,5 @@
-<project>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>net.sf.ggc</groupId>
@@ -10,7 +11,6 @@
<name>GGC Nutrition Tool Project</name>
- <groupId>net.sf.ggc</groupId>
<artifactId>ggc-nutri-tool</artifactId>
<version>${ggc-nutri-tool.version}</version>
Modified: trunk/ggc-plugin_base/pom.xml
===================================================================
--- trunk/ggc-plugin_base/pom.xml 2014-08-31 11:14:06 UTC (rev 1295)
+++ trunk/ggc-plugin_base/pom.xml 2014-09-02 17:04:23 UTC (rev 1296)
@@ -1,4 +1,5 @@
-<project>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>net.sf.ggc</groupId>
@@ -10,7 +11,6 @@
<name>GGC Plugin Base Project</name>
- <groupId>net.sf.ggc</groupId>
<artifactId>ggc-plugin-base</artifactId>
<version>${ggc-plugin-base.version}</version>
Modified: trunk/ggc-pump/pom.xml
===================================================================
--- trunk/ggc-pump/pom.xml 2014-08-31 11:14:06 UTC (rev 1295)
+++ trunk/ggc-pump/pom.xml 2014-09-02 17:04:23 UTC (rev 1296)
@@ -1,4 +1,5 @@
-<project>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>net.sf.ggc</groupId>
@@ -10,7 +11,6 @@
<name>GGC Pump Tool Project</name>
- <groupId>net.sf.ggc</groupId>
<artifactId>ggc-pump-tool</artifactId>
<version>${ggc-pump-tool.version}</version>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2014-10-02 16:51:21
|
Revision: 1327
http://sourceforge.net/p/ggc/code/1327
Author: andyrozman
Date: 2014-10-02 16:51:06 +0000 (Thu, 02 Oct 2014)
Log Message:
-----------
- Changes to ATechDate, and changes where this class is used
- DeviceValuesDay refactoring and extension to get data for specific hour (needed for report for Pump)
- report for Pump and underlaying changes in pump project
Modified Paths:
--------------
trunk/ggc-cgm/doc/Changelog
trunk/ggc-cgm/src/ggc/cgms/data/CGMSDailyStatistics.java
trunk/ggc-cgm/src/ggc/cgms/device/dexcom/receivers/data/ReceiverDownloadDataConfig.java
trunk/ggc-cgm/src/ggc/cgms/gui/viewer/CGMSDataDialog.java
trunk/ggc-core/pom.xml
trunk/ggc-core/src/ggc/core/data/graph/GraphViewSpread.java
trunk/ggc-core/src/ggc/shared/ratio/RatioEntry.java
trunk/ggc-desktop/data/update/version/Versions.txt
trunk/ggc-master-pom/pom.xml
trunk/ggc-meter/pom.xml
trunk/ggc-meter/src/ggc/meter/device/abbott/FreestyleMeter.java
trunk/ggc-nutri/docs/Changelog
trunk/ggc-plugin_base/docs/Changelog
trunk/ggc-plugin_base/src/ggc/plugin/data/DeviceValuesDay.java
trunk/ggc-plugin_base/src/ggc/plugin/data/DeviceValuesEntryInterface.java
trunk/ggc-pump/src/ggc/pump/data/PumpDailyStatistics.java
trunk/ggc-pump/src/ggc/pump/data/graph/GraphViewBasalRateEstimator.java
trunk/ggc-pump/src/ggc/pump/data/graph/GraphViewProfileEditor.java
trunk/ggc-pump/src/ggc/pump/data/graph/bre/BREGraphsAbstract.java
trunk/ggc-pump/src/ggc/pump/data/graph/bre/GraphViewBasalRate.java
trunk/ggc-pump/src/ggc/pump/device/animas/FRC_EZManager_v2.java
trunk/ggc-pump/src/ggc/pump/device/minimed/MinimedSPM.java
trunk/ggc-pump/src/ggc/pump/gui/manual/PumpDataDialog.java
trunk/ggc-pump/src/ggc/pump/print/PrintPumpDataBase.java
trunk/ggc-pump/src/ggc/pump/print/PrintPumpDataDailyTimeSheet.java
Added Paths:
-----------
trunk/ggc-desktop/data/update/version/GGC_Update_06_0.4.3.1.properties
trunk/ggc-desktop/data/update/version/GGC_Update_07_0.4.10.properties
trunk/ggc-desktop/data/update/version/GGC_Update_08_0.4.10.1.properties
trunk/ggc-desktop/data/update/version/GGC_Update_09_0.4.20.properties
trunk/ggc-desktop/data/update/version/GGC_Update_10_0.5.properties
trunk/ggc-desktop/data/update/version/GGC_Update_11_0.5.0.3.properties
trunk/ggc-plugin_base/src/ggc/plugin/data/DeviceValueTypeInterface.java
trunk/ggc-plugin_base/src/ggc/plugin/data/DeviceValuesHourInterface.java
trunk/ggc-pump/src/ggc/pump/data/PumpDeviceValueType.java
trunk/ggc-pump/src/ggc/pump/data/PumpValuesHourProcessor.java
Modified: trunk/ggc-cgm/doc/Changelog
===================================================================
--- trunk/ggc-cgm/doc/Changelog 2014-10-01 16:25:59 UTC (rev 1326)
+++ trunk/ggc-cgm/doc/Changelog 2014-10-02 16:51:06 UTC (rev 1327)
@@ -2,6 +2,12 @@
Changes file for GGC CGM Tool
==============================
+1.1 [30.8.2014]
+ * Added Dexcom G4 device
+ * changed some classes to enums
+ * extended viewer
+
+
1.0.2 [18.6.2010]
* PLUGIN_BASE: Required 0.5
* Changed main Constructor for device classes
@@ -12,14 +18,14 @@
* Plugin base functionalities finished
* Plugin finished and tested with Dexcom import files
* Menus refresh fixed
-
+
0.6 [10.4.2010]
* Import/Export
-
+
0.5 [2.3.2010]
- * View data for CGMS - finalized
+ * View data for CGMS - finalized
0.4.3
* Dexcom mostly done
@@ -28,10 +34,10 @@
0.4
* Start working on Dexcom7
* Changed I18n
- * PLUGIN_BASE: Required 0.4.5
+ * PLUGIN_BASE: Required 0.4.5
0.3.1 [24.1.2010] - Andy
- * DeviceDataRetrieval done
+ * DeviceDataRetrieval done
0.3 (16.1.2010) - Andy
* List implemented
@@ -39,14 +45,14 @@
0.2
* About Dialog implemented
-0.1
+0.1
* Framework implementation
0.0.3
* Startup work on Minimed files import
-
+
0.0.2
* Project extended with new files, preparing to start working on it
Modified: trunk/ggc-cgm/src/ggc/cgms/data/CGMSDailyStatistics.java
===================================================================
--- trunk/ggc-cgm/src/ggc/cgms/data/CGMSDailyStatistics.java 2014-10-01 16:25:59 UTC (rev 1326)
+++ trunk/ggc-cgm/src/ggc/cgms/data/CGMSDailyStatistics.java 2014-10-02 16:51:06 UTC (rev 1327)
@@ -12,24 +12,24 @@
* Plug-in: Pump Tool (support for Pump devices)
*
* See AUTHORS for copyright information.
- *
+ *
* This program is free software; you can redistribute it and/or modify it under
* the terms of the GNU General Public License as published by the Free Software
* Foundation; either version 2 of the License, or (at your option) any later
* version.
- *
+ *
* This program is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
* FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
* details.
- *
+ *
* You should have received a copy of the GNU General Public License along with
* this program; if not, write to the Free Software Foundation, Inc., 59 Temple
* Place, Suite 330, Boston, MA 02111-1307 USA
- *
- * Filename: ###---###
+ *
+ * Filename: ###---###
* Description:
- *
+ *
* Author: Andy {an...@at...}
*/
@@ -48,7 +48,7 @@
/**
* Process Special Statistics
- *
+ *
* @see com.atech.misc.statistics.StatisticsCollection#processSpecialStatistics()
*/
@Override
@@ -107,7 +107,7 @@
if (i + 1 == lst.size())
{
- int s = 24 - pve.getDateTimeObject().hour_of_day;
+ int s = 24 - pve.getDateTimeObject().hourOfDay;
float val = m_da.getFloatValueFromString(pve.getValue());
sum += s * val;
@@ -133,7 +133,7 @@
// System.out.println("pve2: " + pve2.getBaseTypeString() +
// pve2.getSubTypeString());
- int s = pve2.getDateTimeObject().hour_of_day - pve.getDateTimeObject().hour_of_day;
+ int s = pve2.getDateTimeObject().hourOfDay - pve.getDateTimeObject().hourOfDay;
float val = da_pump.getFloatValueFromString(pve.getValue());
sum += s * val;
Modified: trunk/ggc-cgm/src/ggc/cgms/device/dexcom/receivers/data/ReceiverDownloadDataConfig.java
===================================================================
--- trunk/ggc-cgm/src/ggc/cgms/device/dexcom/receivers/data/ReceiverDownloadDataConfig.java 2014-10-01 16:25:59 UTC (rev 1326)
+++ trunk/ggc-cgm/src/ggc/cgms/device/dexcom/receivers/data/ReceiverDownloadDataConfig.java 2014-10-02 16:51:06 UTC (rev 1327)
@@ -1,52 +1,52 @@
-package ggc.cgms.device.dexcom.receivers.data;
-
-public class ReceiverDownloadDataConfig
-{
- private String key;
- private String value;
- private boolean canBeTranslated;
-
- public ReceiverDownloadDataConfig(String key, String value, boolean canBeTranslated)
- {
- this.key = key;
- this.value = value;
- this.canBeTranslated = canBeTranslated;
- }
-
- public String getKey()
- {
- return key;
- }
-
- public void setKey(String key)
- {
- this.key = key;
- }
-
- public String getValue()
- {
- return value;
- }
-
- public void setValue(String value)
- {
- this.value = value;
- }
-
- @Override
- public String toString()
- {
- return this.key + " = " + this.value;
- }
-
- public boolean isCanBeTranslated()
- {
- return canBeTranslated;
- }
-
- public void setCanBeTranslated(boolean canBeTranslated)
- {
- this.canBeTranslated = canBeTranslated;
- }
-
-}
+package ggc.cgms.device.dexcom.receivers.data;
+
+public class ReceiverDownloadDataConfig
+{
+ private String key;
+ private String value;
+ private boolean canBeTranslated;
+
+ public ReceiverDownloadDataConfig(String key, String value, boolean canBeTranslated)
+ {
+ this.key = key;
+ this.value = value;
+ this.canBeTranslated = canBeTranslated;
+ }
+
+ public String getKey()
+ {
+ return key;
+ }
+
+ public void setKey(String key)
+ {
+ this.key = key;
+ }
+
+ public String getValue()
+ {
+ return value;
+ }
+
+ public void setValue(String value)
+ {
+ this.value = value;
+ }
+
+ @Override
+ public String toString()
+ {
+ return this.key + " = " + this.value;
+ }
+
+ public boolean isCanBeTranslated()
+ {
+ return canBeTranslated;
+ }
+
+ public void setCanBeTranslated(boolean canBeTranslated)
+ {
+ this.canBeTranslated = canBeTranslated;
+ }
+
+}
Modified: trunk/ggc-cgm/src/ggc/cgms/gui/viewer/CGMSDataDialog.java
===================================================================
--- trunk/ggc-cgm/src/ggc/cgms/gui/viewer/CGMSDataDialog.java 2014-10-01 16:25:59 UTC (rev 1326)
+++ trunk/ggc-cgm/src/ggc/cgms/gui/viewer/CGMSDataDialog.java 2014-10-02 16:51:06 UTC (rev 1327)
@@ -19,6 +19,7 @@
import java.util.ArrayList;
import java.util.Calendar;
import java.util.GregorianCalendar;
+import java.util.List;
import javax.swing.BorderFactory;
import javax.swing.Box;
@@ -42,24 +43,24 @@
* Plug-in: Pump Tool (support for Pump devices)
*
* See AUTHORS for copyright information.
- *
+ *
* This program is free software; you can redistribute it and/or modify it under
* the terms of the GNU General Public License as published by the Free Software
* Foundation; either version 2 of the License, or (at your option) any later
* version.
- *
+ *
* This program is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
* FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
* details.
- *
+ *
* You should have received a copy of the GNU General Public License along with
* this program; if not, write to the Free Software Foundation, Inc., 59 Temple
* Place, Suite 330, Boston, MA 02111-1307 USA
- *
- * Filename: PumpDataDialog
+ *
+ * Filename: PumpDataDialog
* Description: Pump Data Dialog
- *
+ *
* Author: Andy {an...@at...}
*/
@@ -69,7 +70,7 @@
// private static Log log = LogFactory.getLog(PumpDataDialog.class);
/**
- *
+ *
*/
private static final long serialVersionUID = -3923519587722702685L;
private DataAccessCGMS m_da = DataAccessCGMS.getInstance();
@@ -108,7 +109,7 @@
/**
* Constructor
- *
+ *
* @param da
* @param _parent
*/
@@ -124,7 +125,7 @@
/**
* Constructor
- *
+ *
* @param da
* @param _parent
*/
@@ -140,7 +141,7 @@
/**
* Set Title
- *
+ *
* @param gc
*/
public void setTitle(GregorianCalendar gc)
@@ -152,7 +153,7 @@
/**
* Get Table Model
- *
+ *
* @return
*/
public CGMSDataTableModel getTableModel()
@@ -173,7 +174,7 @@
this.model.fireTableChanged(null);
}
- private ArrayList<CGMSValuesSubEntry> getDataList(ArrayList<DeviceValuesEntry> list_in)
+ private ArrayList<CGMSValuesSubEntry> getDataList(List<DeviceValuesEntry> list_in)
{
ArrayList<CGMSValuesSubEntry> lst = new ArrayList<CGMSValuesSubEntry>();
@@ -345,7 +346,7 @@
{
/**
- *
+ *
*/
private static final long serialVersionUID = -2174342213914259805L;
Modified: trunk/ggc-core/pom.xml
===================================================================
--- trunk/ggc-core/pom.xml 2014-10-01 16:25:59 UTC (rev 1326)
+++ trunk/ggc-core/pom.xml 2014-10-02 16:51:06 UTC (rev 1327)
@@ -59,10 +59,8 @@
<artifactId>pygmy-handlers</artifactId>
</dependency>
- <!-- <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId>
+ <!-- <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId>
<version>3.8.1</version> <scope>test</scope> </dependency> -->
- <!-- <dependency> <groupId>javax.servlet</groupId> <artifactId>servlet-api</artifactId>
- <version>2.5</version> <scope>provided</scope> </dependency> -->
<dependency>
<groupId>com.itextpdf</groupId>
@@ -79,17 +77,11 @@
<artifactId>javahelp</artifactId>
</dependency>
- <!-- <dependency> <groupId>net.sf.squirrel-sql.thirdparty-non-maven</groupId>
- <artifactId>skinlf</artifactId> </dependency> -->
-
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</dependency>
- <!-- <dependency> <groupId>net.sf.jasperreports</groupId> <artifactId>jasperreports</artifactId>
- </dependency> -->
-
<dependency>
<groupId>jfree</groupId>
<artifactId>jfreechart</artifactId>
Modified: trunk/ggc-core/src/ggc/core/data/graph/GraphViewSpread.java
===================================================================
--- trunk/ggc-core/src/ggc/core/data/graph/GraphViewSpread.java 2014-10-01 16:25:59 UTC (rev 1326)
+++ trunk/ggc-core/src/ggc/core/data/graph/GraphViewSpread.java 2014-10-02 16:51:06 UTC (rev 1327)
@@ -32,25 +32,25 @@
* Application: GGC - GNU Gluco Control
*
* See AUTHORS for copyright information.
- *
+ *
* This program is free software; you can redistribute it and/or modify it under
* the terms of the GNU General Public License as published by the Free Software
* Foundation; either version 2 of the License, or (at your option) any later
* version.
- *
+ *
* This program is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
* FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
* details.
- *
+ *
* You should have received a copy of the GNU General Public License along with
* this program; if not, write to the Free Software Foundation, Inc., 59 Temple
* Place, Suite 330, Boston, MA 02111-1307 USA
- *
- * Filename: GraphViewSpread
+ *
+ * Filename: GraphViewSpread
* Description: GraphView implementation for Pen Spread, used by ATech Graph Framework
- *
- * Author: andyrozman {an...@at...}
+ *
+ * Author: andyrozman {an...@at...}
*/
public class GraphViewSpread extends AbstractGraphViewAndProcessor
@@ -87,7 +87,7 @@
/**
* Get Help Id
- *
+ *
* @return
*/
public String getHelpId()
@@ -97,8 +97,8 @@
/**
* Get Title (used by GraphViewer)
- *
- * @return title as string
+ *
+ * @return title as string
*/
@Override
public String getTitle()
@@ -108,7 +108,7 @@
/**
* Get Viewer Dialog Bounds (used by GraphViewer)
- *
+ *
* @return Rectangle object
*/
@Override
@@ -119,7 +119,7 @@
/**
* Set Controller Data
- *
+ *
* @see com.atech.graphics.graphs.AbstractGraphViewAndProcessor#setControllerData(java.lang.Object)
*/
@Override
@@ -166,7 +166,7 @@
/**
* Get Data Set
- *
+ *
* @return AbstractDataset instance
*/
public AbstractDataset getDataSet()
@@ -263,7 +263,7 @@
private long getFakeDateMs(ATechDate date)
{
- gc_temp.set(Calendar.HOUR_OF_DAY, date.hour_of_day);
+ gc_temp.set(Calendar.HOUR_OF_DAY, date.hourOfDay);
gc_temp.set(Calendar.MINUTE, date.minute);
return gc_temp.getTimeInMillis();
@@ -271,7 +271,7 @@
/**
* Set Plot
- *
+ *
* @param chart JFreeChart instance
*/
@SuppressWarnings("deprecation")
@@ -341,7 +341,7 @@
/**
* Get Controler Interface instance
- *
+ *
* @return GraphViewControlerInterface instance or null
*/
@Override
Modified: trunk/ggc-core/src/ggc/shared/ratio/RatioEntry.java
===================================================================
--- trunk/ggc-core/src/ggc/shared/ratio/RatioEntry.java 2014-10-01 16:25:59 UTC (rev 1326)
+++ trunk/ggc-core/src/ggc/shared/ratio/RatioEntry.java 2014-10-02 16:51:06 UTC (rev 1327)
@@ -10,25 +10,25 @@
* Application: GGC - GNU Gluco Control
*
* See AUTHORS for copyright information.
- *
+ *
* This program is free software; you can redistribute it and/or modify it under
* the terms of the GNU General Public License as published by the Free Software
* Foundation; either version 2 of the License, or (at your option) any later
* version.
- *
+ *
* This program is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
* FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
* details.
- *
+ *
* You should have received a copy of the GNU General Public License along with
* this program; if not, write to the Free Software Foundation, Inc., 59 Temple
* Place, Suite 330, Boston, MA 02111-1307 USA
- *
- * Filename: RatioEntry
- * Description:
- *
- * Author: andyrozman {an...@at...}
+ *
+ * Filename: RatioEntry
+ * Description:
+ *
+ * Author: andyrozman {an...@at...}
*/
public class RatioEntry
@@ -105,18 +105,18 @@
public int getMinuteFrom()
{
ATechDate atd = new ATechDate(ATechDate.FORMAT_TIME_ONLY_MIN, this.from);
- return atd.hour_of_day * 60 + atd.minute;
+ return atd.hourOfDay * 60 + atd.minute;
}
public int getMinuteTo()
{
ATechDate atd = new ATechDate(ATechDate.FORMAT_TIME_ONLY_MIN, this.to);
- return atd.hour_of_day * 60 + atd.minute;
+ return atd.hourOfDay * 60 + atd.minute;
}
/**
* Get Column Value
- *
+ *
* @param column
* @return
*/
@@ -149,7 +149,7 @@
/**
* Get Columns
- *
+ *
* @return
*/
public int getColumns()
@@ -159,9 +159,9 @@
/**
* Get Column Name
- * @param index
- * @return
- *
+ * @param index
+ * @return
+ *
* @see javax.swing.table.AbstractTableModel#getColumnName(int)
*/
public String getColumnName(int index)
@@ -194,7 +194,7 @@
/**
* Get Save Data
- *
+ *
* @return
*/
public String getSaveData()
Added: trunk/ggc-desktop/data/update/version/GGC_Update_06_0.4.3.1.properties
===================================================================
--- trunk/ggc-desktop/data/update/version/GGC_Update_06_0.4.3.1.properties (rev 0)
+++ trunk/ggc-desktop/data/update/version/GGC_Update_06_0.4.3.1.properties 2014-10-02 16:51:06 UTC (rev 1327)
@@ -0,0 +1,248 @@
+#
+# GGC Update File
+#
+# !!! Do NOT delete and/or edit this file.
+#
+#
+
+#
+# Main application
+#
+PRODUCT_ID=ggc
+ROOT=..
+
+
+#
+# Applications
+#
+
+
+APP_CUSTOM_COUNT=1
+APP_CUSTOM_1_ID=ggc
+APP_CUSTOM_1_FILENAME=run_ggc
+APP_CUSTOM_1_MAIN_CLASS=ggc.GGC
+#APP_CUSTOM_1_JAVA_PARAMS=-XX:NewSize=128m -XX:MaxNewSize=512m -XX:SurvivorRatio=8 -Xms512m -Xmx512m
+#APP_CUSTOM_1_JAVA_PARAMS=-XX:NewSize=128m -XX:MaxNewSize=512m -XX:SurvivorRatio=8 -Xms128m -Xmx512m
+APP_CUSTOM_1_BINARY_NEEDED=yes
+APP_CUSTOM_1_NEEDS_JDBC_DRIVERS=yes
+
+
+#
+# Database
+#
+DB_ENABLED=true
+DB_VERSION_REQUIRED=7
+DB_CONFIGURATION_CLASS=ggc.core.db.GGCDbConfig
+DB_UPDATE_SITE=
+
+#
+# Database applications
+#
+
+DB_TOOL=yes
+DB_CHECK=yes
+
+DB_APPLICATION=yes
+DB_APPLICATION_CLASS=org.h2.tools.Server
+
+DB_INIT=yes
+DB_INIT_CLASS=ggc.core.db.tool.InitDb
+
+DB_IMPORT=yes
+DB_IMPORT_CLASS=ggc.core.db.tool.transfer.GGCImporter
+
+
+
+#
+# Components
+#
+LAST_COMPONENT=19
+
+
+#
+# Groups
+#
+GROUP_1_NAME=GGC Main
+GROUP_2_NAME=GGC Plug-Ins
+GROUP_3_NAME=GGC Support Libraries
+
+
+#
+# Components
+#
+
+COMPONENT_1_GROUP=1
+COMPONENT_1_NAME=GGC Main
+COMPONENT_1_VERSION=0.4.3
+COMPONENT_1_VERSION_NUM=3
+COMPONENT_1_ROOT_DIR=/lib/ggc
+COMPONENT_1_FILES=%ROOT%/ggc-main-0.4.3.jar
+
+COMPONENT_2_GROUP=1
+COMPONENT_2_NAME=GGC Core
+COMPONENT_2_VERSION=0.4.3
+COMPONENT_2_VERSION_NUM=3
+COMPONENT_2_ROOT_DIR=/lib/ggc
+COMPONENT_2_FILES=%ROOT%/ggc-core-0.4.3.jar
+
+COMPONENT_3_GROUP=1
+COMPONENT_3_NAME=GGC Little
+COMPONENT_3_VERSION=0.2.2
+COMPONENT_3_VERSION_NUM=1
+COMPONENT_3_ROOT_DIR=/lib/ggc
+COMPONENT_3_FILES=%ROOT%/ggc-little-0.2.2.jar
+
+
+COMPONENT_4_GROUP=1
+COMPONENT_4_NAME=GGC Lang
+COMPONENT_4_VERSION=0.3.1
+COMPONENT_4_VERSION_NUM=2
+COMPONENT_4_ROOT_DIR=/lib/ggc
+COMPONENT_4_FILES=%ROOT%/ggc-lang-0.3.1.jar
+
+
+COMPONENT_5_GROUP=2
+COMPONENT_5_NAME=GGC Plugin Base
+COMPONENT_5_VERSION=0.2.7
+COMPONENT_5_VERSION_NUM=2
+COMPONENT_5_ROOT_DIR=/lib/ggc
+COMPONENT_5_FILES=%ROOT%/ggc-plugin_base-0.2.7.jar
+
+
+
+COMPONENT_6_GROUP=2
+COMPONENT_6_NAME=Meter Tool
+COMPONENT_6_VERSION=1.0.7
+COMPONENT_6_VERSION_NUM=2
+COMPONENT_6_ROOT_DIR=/lib/ggc
+COMPONENT_6_FILES=%ROOT%/ggc-meter_tool-1.0.7.jar
+
+COMPONENT_7_GROUP=2
+COMPONENT_7_NAME=Pump Tool
+COMPONENT_7_VERSION=0.2.1
+COMPONENT_7_VERSION_NUM=1
+COMPONENT_7_ROOT_DIR=/lib/ggc
+COMPONENT_7_FILES=%ROOT%/ggc-pump_tool-0.2.1.jar
+
+
+COMPONENT_8_GROUP=2
+COMPONENT_8_NAME=CGMS Tool
+COMPONENT_8_VERSION=N/A
+COMPONENT_8_VERSION_NUM=1
+COMPONENT_8_ROOT_DIR=
+COMPONENT_8_FILES=
+
+
+COMPONENT_9_GROUP=3
+COMPONENT_9_NAME=Hibernate Framework
+COMPONENT_9_VERSION=3.1
+#COMPONENT_7_VERSION=3.2.6 GA
+COMPONENT_9_VERSION_NUM=1
+COMPONENT_9_ROOT_DIR=/lib/hibernate3
+COMPONENT_9_FILES=%ROOT%/antlr-2.7.6rc1.jar;%ROOT%/asm.jar;%ROOT%/asm-attrs.jar;%ROOT%/c3p0-0.9.0.jar;%ROOT%/cglib-2.1.3.jar;%ROOT%/commons-collections-2.1.1.jar;%ROOT%/commons-lang.jar;%ROOT%/commons-lang-2.0.jar;%ROOT%/commons-logging-1.0.4.jar;%ROOT%/dom4j-1.6.1.jar;%ROOT%/ehcache-1.1.jar;%ROOT%/hibernate3.jar;%ROOT%/jdbc2_0-stdext.jar;%ROOT%/jta.jar;%ROOT%/log4j-1.2.11.jar
+#COMPONENT_9_FILES=%ROOT%/antlr-2.7.6.jar;%ROOT%/asm.jar;%ROOT%/asm-attrs.jar;%ROOT%/c3p0-0.9.1.jar;%ROOT%/cglib-2.1.3.jar;%ROOT%/commons-collections-2.1.1.jar;%ROOT%/commons-lang.jar;%ROOT%/commons-lang-2.0.jar;%ROOT%/commons-logging-1.0.4.jar;%ROOT%/dom4j-1.6.1.jar;%ROOT%/ehcache-1.2.3.jar;%ROOT%/hibernate3.jar;%ROOT%/jdbc2_0-stdext.jar;%ROOT%/jta.jar;%ROOT%/log4j-1.2.11.jar
+
+COMPONENT_10_GROUP=3
+COMPONENT_10_NAME=Internal Database [H2]
+COMPONENT_10_VERSION=1.0.69
+COMPONENT_10_VERSION_NUM=1
+COMPONENT_10_ROOT_DIR=/lib/jdbc
+COMPONENT_10_FILES=%ROOT%/h2-1.0.69.jar
+
+COMPONENT_11_GROUP=3
+COMPONENT_11_NAME=Atech Tools
+COMPONENT_11_VERSION=0.3.5
+COMPONENT_11_VERSION_NUM=4
+COMPONENT_11_ROOT_DIR=/lib/utils
+COMPONENT_11_FILES=%ROOT%/atech-tools-0.3.5.jar
+
+COMPONENT_12_GROUP=3
+COMPONENT_12_NAME=iText Pdf Library
+COMPONENT_12_VERSION=2.0.7
+COMPONENT_12_VERSION_NUM=1
+COMPONENT_12_ROOT_DIR=/lib/utils
+COMPONENT_12_FILES=%ROOT%/iText-2.0.7.jar
+
+COMPONENT_13_GROUP=3
+COMPONENT_13_NAME=RxtxComm API
+COMPONENT_13_VERSION=2.1.7 (Modified v4)
+COMPONENT_13_VERSION_NUM=2
+COMPONENT_13_ROOT_DIR=/lib/utils
+#COMPONENT_13_FILES=%ROOT%/RXTXcomm-2.1.7.jar
+COMPONENT_13_FILES=%ROOT%/RXTXcomm-2.1.7-a4.jar
+COMPONENT_13_PLATFORM_SPECIFIC=true
+COMPONENT_13_PLATFORM_SPECIFIC_TYPE=2
+COMPONENT_13_PLATFORM_SUPPORTED=win linux mac solaris
+#COMPONENT_11_PLATFORM_SPECIFIC_JAR_WIN=jar_win.jar
+#COMPONENT_11_PLATFORM_SPECIFIC_JAR_LINUX=jar_linux.jar
+#COMPONENT_11_PLATFORM_SPECIFIC_JAR_MAC=jar_mac.jar
+#COMPONENT_11_PLATFORM_SPECIFIC_JAR_SOLARIS=jar_solaris.jar
+
+COMPONENT_14_GROUP=3
+COMPONENT_14_NAME=Skin L&F
+COMPONENT_14_VERSION=6.7
+COMPONENT_14_VERSION_NUM=1
+COMPONENT_14_ROOT_DIR=/lib/utils
+COMPONENT_14_FILES=%ROOT%/skinlf-6.7.jar
+
+COMPONENT_15_GROUP=3
+COMPONENT_15_NAME=JFreeChart
+COMPONENT_15_VERSION=1.0.10
+COMPONENT_15_VERSION_NUM=2
+COMPONENT_15_ROOT_DIR=/lib/jfreechart
+#COMPONENT_15_FILES=%ROOT%/jcommon-1.0.12.jar;%ROOT%/jfreechart-1.0.9.jar;%ROOT%/jfreechart-1.0.9-experimental.jar;%ROOT%/jfreechart-1.0.9-swt.jar;%ROOT%/swtgraphics2d.jar
+COMPONENT_15_FILES=%ROOT%/jcommon-1.0.13.jar;%ROOT%/jcommon-xml-1.0.13.jar;%ROOT%/jfreechart-1.0.10.jar
+
+COMPONENT_16_GROUP=3
+COMPONENT_16_NAME=Java Help
+COMPONENT_16_VERSION=2.0.5
+COMPONENT_16_VERSION_NUM=1
+COMPONENT_16_ROOT_DIR=/lib/utils
+COMPONENT_16_FILES=%ROOT%/jhall-2.0.5.jar
+
+
+COMPONENT_17_GROUP=3
+COMPONENT_17_NAME=Log4j
+COMPONENT_17_VERSION=1.2.15
+COMPONENT_17_VERSION_NUM=1
+COMPONENT_17_ROOT_DIR=/lib/utils
+COMPONENT_17_FILES=%ROOT%/log4j-1.2.15.jar
+
+COMPONENT_18_GROUP=3
+COMPONENT_18_NAME=Pygmy Http Daemon
+COMPONENT_18_VERSION=0.2
+COMPONENT_18_VERSION_NUM=1
+COMPONENT_18_ROOT_DIR=/lib/utils
+COMPONENT_18_FILES=%ROOT%/pygmy-core-0.2.jar;%ROOT%/pygmy-handlers-0.2.jar
+
+
+COMPONENT_19_GROUP=3
+COMPONENT_19_NAME=Java Native Access
+COMPONENT_19_VERSION=3.0.9
+COMPONENT_19_VERSION_NUM=1
+COMPONENT_19_ROOT_DIR=/lib/utils
+COMPONENT_19_FILES=%ROOT%/jna-3.0.9.jar
+
+
+
+#COMPONENT_13_GROUP=3
+#COMPONENT_13_NAME=Java Help
+#COMPONENT_13_VERSION=2.0.5
+#COMPONENT_13_VERSION_NUM=1
+#COMPONENT_13_ROOT_DIR=/lib/utils
+#COMPONENT_13_FILES=%ROOT%/jhall-2.0.5.jar
+#COMPONENT_13_PLATFORM_SPECIFIC=true
+#COMPONENT_13_PLATFORM_SPECIFIC_TYPE=1,2,3 = 1- no, 2-yes,native_only,3-yes,both
+#COMPONENT_13_PLATFORM_SUPPORTED=win linux
+#COMPONENT_13_PLATFORM_SPECIFIC_JAR_WIN=
+#COMPONENT_13_PLATFORM_SPECIFIC_JAR_LINUX=
+
+
+#COMPONENT_14_GROUP=3
+#COMPONENT_14_NAME=Apache Commons Libraries
+#COMPONENT_14_VERSION=1.0
+#COMPONENT_14_VERSION_NUM=1
+#COMPONENT_14_ROOT_DIR=/lib/utils
+#COMPONENT_14_FILES=%ROOT%/jhall-2.0.5.jar
+
+
Added: trunk/ggc-desktop/data/update/version/GGC_Update_07_0.4.10.properties
===================================================================
--- trunk/ggc-desktop/data/update/version/GGC_Update_07_0.4.10.properties (rev 0)
+++ trunk/ggc-desktop/data/update/version/GGC_Update_07_0.4.10.properties 2014-10-02 16:51:06 UTC (rev 1327)
@@ -0,0 +1,276 @@
+#
+# GGC Update File
+#
+# !!! Do NOT delete and/or edit this file.
+#
+# 0.4.10.1
+
+#
+# Main application
+#
+PRODUCT_ID=ggc
+ROOT=..
+
+
+#
+# Applications
+#
+
+
+APP_CUSTOM_COUNT=1
+APP_CUSTOM_1_ID=ggc
+APP_CUSTOM_1_FILENAME=run_ggc
+APP_CUSTOM_1_MAIN_CLASS=ggc.GGC
+#APP_CUSTOM_1_JAVA_PARAMS=-XX:NewSize=128m -XX:MaxNewSize=512m -XX:SurvivorRatio=8 -Xms512m -Xmx512m
+#APP_CUSTOM_1_JAVA_PARAMS=-XX:NewSize=128m -XX:MaxNewSize=512m -XX:SurvivorRatio=8 -Xms128m -Xmx512m
+APP_CUSTOM_1_BINARY_NEEDED=yes
+APP_CUSTOM_1_NEEDS_JDBC_DRIVERS=yes
+
+
+#
+# Database
+#
+DB_ENABLED=true
+DB_VERSION_REQUIRED=7
+DB_CONFIGURATION_CLASS=ggc.core.db.GGCDbConfig
+DB_UPDATE_SITE=
+
+#
+# Database applications
+#
+
+DB_TOOL=yes
+DB_CHECK=yes
+
+DB_APPLICATION=yes
+DB_APPLICATION_CLASS=org.h2.tools.Server
+
+DB_INIT=yes
+DB_INIT_CLASS=ggc.core.db.tool.InitDb
+
+DB_IMPORT=yes
+DB_IMPORT_CLASS=ggc.core.db.tool.transfer.GGCImporter
+
+
+
+#
+# Components
+#
+LAST_COMPONENT=22
+
+
+#
+# Groups
+#
+GROUP_1_NAME=GGC Main
+GROUP_2_NAME=GGC Plug-Ins
+GROUP_3_NAME=GGC Support Libraries
+
+
+#
+# Components
+#
+
+COMPONENT_1_GROUP=1
+COMPONENT_1_NAME=GGC Main
+COMPONENT_1_VERSION=0.4.7.2
+COMPONENT_1_VERSION_NUM=7
+COMPONENT_1_ROOT_DIR=/lib/ggc
+COMPONENT_1_FILES=%ROOT%/ggc-main-0.4.7.2.jar
+
+COMPONENT_2_GROUP=1
+COMPONENT_2_NAME=GGC Core
+COMPONENT_2_VERSION=0.4.10.1
+COMPONENT_2_VERSION_NUM=7
+COMPONENT_2_ROOT_DIR=/lib/ggc
+COMPONENT_2_FILES=%ROOT%/ggc-core-0.4.10.1.jar
+
+COMPONENT_3_GROUP=1
+COMPONENT_3_NAME=GGC Little
+COMPONENT_3_VERSION=0.2.2
+COMPONENT_3_VERSION_NUM=1
+COMPONENT_3_ROOT_DIR=/lib/ggc
+COMPONENT_3_FILES=%ROOT%/ggc-little-0.2.2.jar
+
+
+COMPONENT_4_GROUP=1
+COMPONENT_4_NAME=GGC Lang
+COMPONENT_4_VERSION=0.3.6
+COMPONENT_4_VERSION_NUM=5
+COMPONENT_4_ROOT_DIR=/lib/ggc
+COMPONENT_4_FILES=%ROOT%/ggc-lang-0.3.6.jar
+
+
+COMPONENT_5_GROUP=2
+COMPONENT_5_NAME=GGC Plugin Base
+COMPONENT_5_VERSION=0.4.3
+COMPONENT_5_VERSION_NUM=5
+COMPONENT_5_ROOT_DIR=/lib/ggc
+COMPONENT_5_FILES=%ROOT%/ggc-plugin_base-0.4.3.jar
+
+
+COMPONENT_20_GROUP=2
+COMPONENT_20_NAME=Nutrition Tool
+COMPONENT_20_VERSION=1.2.2
+COMPONENT_20_VERSION_NUM=3
+COMPONENT_20_ROOT_DIR=/lib/ggc
+COMPONENT_20_FILES=%ROOT%/ggc-nutri_tool-1.2.2.jar
+
+
+COMPONENT_6_GROUP=2
+COMPONENT_6_NAME=Meter Tool
+COMPONENT_6_VERSION=1.1.5
+COMPONENT_6_VERSION_NUM=5
+COMPONENT_6_ROOT_DIR=/lib/ggc
+COMPONENT_6_FILES=%ROOT%/ggc-meter_tool-1.1.5.jar
+
+COMPONENT_7_GROUP=2
+COMPONENT_7_NAME=Pump Tool
+COMPONENT_7_VERSION=1.0.3
+COMPONENT_7_VERSION_NUM=4
+COMPONENT_7_ROOT_DIR=/lib/ggc
+COMPONENT_7_FILES=%ROOT%/ggc-pump_tool-1.0.3.jar
+
+
+COMPONENT_8_GROUP=2
+COMPONENT_8_NAME=CGMS Tool
+COMPONENT_8_VERSION=N/A
+COMPONENT_8_VERSION_NUM=1
+COMPONENT_8_ROOT_DIR=
+COMPONENT_8_FILES=
+
+
+COMPONENT_9_GROUP=3
+COMPONENT_9_NAME=Hibernate Framework
+COMPONENT_9_VERSION=3.1
+#COMPONENT_7_VERSION=3.2.6 GA
+COMPONENT_9_VERSION_NUM=1
+COMPONENT_9_ROOT_DIR=/lib/hibernate3
+COMPONENT_9_FILES=%ROOT%/antlr-2.7.6rc1.jar;%ROOT%/asm.jar;%ROOT%/asm-attrs.jar;%ROOT%/c3p0-0.9.0.jar;%ROOT%/cglib-2.1.3.jar;%ROOT%/commons-collections-2.1.1.jar;%ROOT%/commons-lang.jar;%ROOT%/commons-lang-2.0.jar;%ROOT%/commons-logging-1.0.4.jar;%ROOT%/dom4j-1.6.1.jar;%ROOT%/ehcache-1.1.jar;%ROOT%/hibernate3.jar;%ROOT%/jdbc2_0-stdext.jar;%ROOT%/jta.jar;%ROOT%/log4j-1.2.11.jar
+#COMPONENT_9_FILES=%ROOT%/antlr-2.7.6.jar;%ROOT%/asm.jar;%ROOT%/asm-attrs.jar;%ROOT%/c3p0-0.9.1.jar;%ROOT%/cglib-2.1.3.jar;%ROOT%/commons-collections-2.1.1.jar;%ROOT%/commons-lang.jar;%ROOT%/commons-lang-2.0.jar;%ROOT%/commons-logging-1.0.4.jar;%ROOT%/dom4j-1.6.1.jar;%ROOT%/ehcache-1.2.3.jar;%ROOT%/hibernate3.jar;%ROOT%/jdbc2_0-stdext.jar;%ROOT%/jta.jar;%ROOT%/log4j-1.2.11.jar
+
+COMPONENT_10_GROUP=3
+COMPONENT_10_NAME=Internal Database [H2]
+COMPONENT_10_VERSION=1.0.69
+COMPONENT_10_VERSION_NUM=1
+COMPONENT_10_ROOT_DIR=/lib/jdbc
+COMPONENT_10_FILES=%ROOT%/h2-1.0.69.jar
+
+COMPONENT_11_GROUP=3
+COMPONENT_11_NAME=Atech Tools
+COMPONENT_11_VERSION=0.3.13
+COMPONENT_11_VERSION_NUM=5
+COMPONENT_11_ROOT_DIR=/lib/utils
+COMPONENT_11_FILES=%ROOT%/atech-tools-0.3.13.jar
+
+COMPONENT_12_GROUP=3
+COMPONENT_12_NAME=iText Pdf Library
+COMPONENT_12_VERSION=2.0.7
+COMPONENT_12_VERSION_NUM=1
+COMPONENT_12_ROOT_DIR=/lib/utils
+COMPONENT_12_FILES=%ROOT%/iText-2.0.7.jar
+
+COMPONENT_13_GROUP=3
+COMPONENT_13_NAME=RxtxComm API
+COMPONENT_13_VERSION=2.1.7 (Modified v4)
+COMPONENT_13_VERSION_NUM=2
+COMPONENT_13_ROOT_DIR=/lib/utils
+#COMPONENT_13_FILES=%ROOT%/RXTXcomm-2.1.7.jar
+COMPONENT_13_FILES=%ROOT%/RXTXcomm-2.1.7-a4.jar
+COMPONENT_13_PLATFORM_SPECIFIC=true
+COMPONENT_13_PLATFORM_SPECIFIC_TYPE=2
+COMPONENT_13_PLATFORM_SUPPORTED=win linux mac solaris
+#COMPONENT_11_PLATFORM_SPECIFIC_JAR_WIN=jar_win.jar
+#COMPONENT_11_PLATFORM_SPECIFIC_JAR_LINUX=jar_linux.jar
+#COMPONENT_11_PLATFORM_SPECIFIC_JAR_MAC=jar_mac.jar
+#COMPONENT_11_PLATFORM_SPECIFIC_JAR_SOLARIS=jar_solaris.jar
+
+COMPONENT_14_GROUP=3
+COMPONENT_14_NAME=Skin L&F
+COMPONENT_14_VERSION=6.7
+COMPONENT_14_VERSION_NUM=1
+COMPONENT_14_ROOT_DIR=/lib/utils
+COMPONENT_14_FILES=%ROOT%/skinlf-6.7.jar
+
+COMPONENT_15_GROUP=3
+COMPONENT_15_NAME=JFreeChart
+COMPONENT_15_VERSION=1.0.10
+COMPONENT_15_VERSION_NUM=2
+COMPONENT_15_ROOT_DIR=/lib/jfreechart
+#COMPONENT_15_FILES=%ROOT%/jcommon-1.0.12.jar;%ROOT%/jfreechart-1.0.9.jar;%ROOT%/jfreechart-1.0.9-experimental.jar;%ROOT%/jfreechart-1.0.9-swt.jar;%ROOT%/swtgraphics2d.jar
+COMPONENT_15_FILES=%ROOT%/jcommon-1.0.13.jar;%ROOT%/jcommon-xml-1.0.13.jar;%ROOT%/jfreechart-1.0.10.jar
+
+COMPONENT_16_GROUP=3
+COMPONENT_16_NAME=Java Help
+COMPONENT_16_VERSION=2.0.5
+COMPONENT_16_VERSION_NUM=1
+COMPONENT_16_ROOT_DIR=/lib/utils
+COMPONENT_16_FILES=%ROOT%/jhall-2.0.5.jar
+
+
+COMPONENT_17_GROUP=3
+COMPONENT_17_NAME=Log4j
+COMPONENT_17_VERSION=1.2.15
+COMPONENT_17_VERSION_NUM=1
+COMPONENT_17_ROOT_DIR=/lib/utils
+COMPONENT_17_FILES=%ROOT%/log4j-1.2.15.jar
+
+COMPONENT_18_GROUP=3
+COMPONENT_18_NAME=Pygmy Http Daemon
+COMPONENT_18_VERSION=0.2
+COMPONENT_18_VERSION_NUM=1
+COMPONENT_18_ROOT_DIR=/lib/utils
+COMPONENT_18_FILES=%ROOT%/pygmy-core-0.2.jar;%ROOT%/pygmy-handlers-0.2.jar
+
+
+COMPONENT_19_GROUP=3
+COMPONENT_19_NAME=Java Native Access
+COMPONENT_19_VERSION=3.0.9
+COMPONENT_19_VERSION_NUM=1
+COMPONENT_19_ROOT_DIR=/lib/utils
+COMPONENT_19_FILES=%ROOT%/jna-3.0.9.jar
+
+
+COMPONENT_21_GROUP=3
+COMPONENT_21_NAME=XML (dom4j, jaxen)
+COMPONENT_21_VERSION=1.6.1
+COMPONENT_21_VERSION_NUM=1
+COMPONENT_21_ROOT_DIR=/lib/utils
+COMPONENT_21_FILES=%ROOT%/dom4j-1.6.1.jar;%ROOT%/jaxen-1.1-beta-6.jar
+
+
+COMPONENT_22_GROUP=3
+COMPONENT_22_NAME=IBM Communication API (for BlueTooth)
+COMPONENT_22_VERSION=1.3
+COMPONENT_22_VERSION_NUM=1
+COMPONENT_22_ROOT_DIR=/lib/utils
+COMPONENT_22_FILES=
+COMPONENT_22_PLATFORM_SPECIFIC=true
+COMPONENT_22_PLATFORM_SPECIFIC_TYPE=3
+COMPONENT_22_PLATFORM_SUPPORTED=win linux
+COMPONENT_22_PLATFORM_SPECIFIC_JAR_WIN=%ROOT%/IBMCommLin.jar
+COMPONENT_22_PLATFORM_SPECIFIC_JAR_LINUX=%ROOT%/IBMCommWin.jar
+
+
+
+#COMPONENT_13_GROUP=3
+#COMPONENT_13_NAME=Java Help
+#COMPONENT_13_VERSION=2.0.5
+#COMPONENT_13_VERSION_NUM=1
+#COMPONENT_13_ROOT_DIR=/lib/utils
+#COMPONENT_13_FILES=%ROOT%/jhall-2.0.5.jar
+#COMPONENT_13_PLATFORM_SPECIFIC=true
+#COMPONENT_13_PLATFORM_SPECIFIC_TYPE=1,2,3 = 1- no, 2-yes,native_only,3-yes,both
+#COMPONENT_13_PLATFORM_SUPPORTED=win linux
+#COMPONENT_13_PLATFORM_SPECIFIC_JAR_WIN=
+#COMPONENT_13_PLATFORM_SPECIFIC_JAR_LINUX=
+
+
+#COMPONENT_14_GROUP=3
+#COMPONENT_14_NAME=Apache Commons Libraries
+#COMPONENT_14_VERSION=1.0
+#COMPONENT_14_VERSION_NUM=1
+#COMPONENT_14_ROOT_DIR=/lib/utils
+#COMPONENT_14_FILES=%ROOT%/jhall-2.0.5.jar
+
+
Added: trunk/ggc-desktop/data/update/version/GGC_Update_08_0.4.10.1.properties
===================================================================
--- trunk/ggc-desktop/data/update/version/GGC_Update_08_0.4.10.1.properties (rev 0)
+++ trunk/ggc-desktop/data/update/version/GGC_Update_08_0.4.10.1.properties 2014-10-02 16:51:06 UTC (rev 1327)
@@ -0,0 +1,276 @@
+#
+# GGC Update File
+#
+# !!! Do NOT delete and/or edit this file.
+#
+# 0.4.10.1
+
+#
+# Main application
+#
+PRODUCT_ID=ggc
+ROOT=..
+
+
+#
+# Applications
+#
+
+
+APP_CUSTOM_COUNT=1
+APP_CUSTOM_1_ID=ggc
+APP_CUSTOM_1_FILENAME=run_ggc
+APP_CUSTOM_1_MAIN_CLASS=ggc.GGC
+#APP_CUSTOM_1_JAVA_PARAMS=-XX:NewSize=128m -XX:MaxNewSize=512m -XX:SurvivorRatio=8 -Xms512m -Xmx512m
+#APP_CUSTOM_1_JAVA_PARAMS=-XX:NewSize=128m -XX:MaxNewSize=512m -XX:SurvivorRatio=8 -Xms128m -Xmx512m
+APP_CUSTOM_1_BINARY_NEEDED=yes
+APP_CUSTOM_1_NEEDS_JDBC_DRIVERS=yes
+
+
+#
+# Database
+#
+DB_ENABLED=true
+DB_VERSION_REQUIRED=7
+DB_CONFIGURATION_CLASS=ggc.core.db.GGCDbConfig
+DB_UPDATE_SITE=
+
+#
+# Database applications
+#
+
+DB_TOOL=yes
+DB_CHECK=yes
+
+DB_APPLICATION=yes
+DB_APPLICATION_CLASS=org.h2.tools.Server
+
+DB_INIT=yes
+DB_INIT_CLASS=ggc.core.db.tool.InitDb
+
+DB_IMPORT=yes
+DB_IMPORT_CLASS=ggc.core.db.tool.transfer.GGCImporter
+
+
+
+#
+# Components
+#
+LAST_COMPONENT=22
+
+
+#
+# Groups
+#
+GROUP_1_NAME=GGC Main
+GROUP_2_NAME=GGC Plug-Ins
+GROUP_3_NAME=GGC Support Libraries
+
+
+#
+# Components
+#
+
+COMPONENT_1_GROUP=1
+COMPONENT_1_NAME=GGC Main
+COMPONENT_1_VERSION=0.4.7.2
+COMPONENT_1_VERSION_NUM=7
+COMPONENT_1_ROOT_DIR=/lib/ggc
+COMPONENT_1_FILES=%ROOT%/ggc-main-0.4.7.2.jar
+
+COMPONENT_2_GROUP=1
+COMPONENT_2_NAME=GGC Core
+COMPONENT_2_VERSION=0.4.10.1
+COMPONENT_2_VERSION_NUM=7
+COMPONENT_2_ROOT_DIR=/lib/ggc
+COMPONENT_2_FILES=%ROOT%/ggc-core-0.4.10.1.jar
+
+COMPONENT_3_GROUP=1
+COMPONENT_3_NAME=GGC Little
+COMPONENT_3_VERSION=0.2.2
+COMPONENT_3_VERSION_NUM=1
+COMPONENT_3_ROOT_DIR=/lib/ggc
+COMPONENT_3_FILES=%ROOT%/ggc-little-0.2.2.jar
+
+
+COMPONENT_4_GROUP=1
+COMPONENT_4_NAME=GGC Lang
+COMPONENT_4_VERSION=0.3.6
+COMPONENT_4_VERSION_NUM=5
+COMPONENT_4_ROOT_DIR=/lib/ggc
+COMPONENT_4_FILES=%ROOT%/ggc-lang-0.3.6.jar
+
+
+COMPONENT_5_GROUP=2
+COMPONENT_5_NAME=GGC Plugin Base
+COMPONENT_5_VERSION=0.4.3
+COMPONENT_5_VERSION_NUM=5
+COMPONENT_5_ROOT_DIR=/lib/ggc
+COMPONENT_5_FILES=%ROOT%/ggc-plugin_base-0.4.3.jar
+
+
+COMPONENT_20_GROUP=2
+COMPONENT_20_NAME=Nutrition Tool
+COMPONENT_20_VERSION=1.2.2
+COMPONENT_20_VERSION_NUM=3
+COMPONENT_20_ROOT_DIR=/lib/ggc
+COMPONENT_20_FILES=%ROOT%/ggc-nutri_tool-1.2.2.jar
+
+
+COMPONENT_6_GROUP=2
+COMPONENT_6_NAME=Meter Tool
+COMPONENT_6_VERSION=1.1.5
+COMPONENT_6_VERSION_NUM=5
+COMPONENT_6_ROOT_DIR=/lib/ggc
+COMPONENT_6_FILES=%ROOT%/ggc-meter_tool-1.1.5.jar
+
+COMPONENT_7_GROUP=2
+COMPONENT_7_NAME=Pump Tool
+COMPONENT_7_VERSION=1.0.3
+COMPONENT_7_VERSION_NUM=4
+COMPONENT_7_ROOT_DIR=/lib/ggc
+COMPONENT_7_FILES=%ROOT%/ggc-pump_tool-1.0.3.jar
+
+
+COMPONENT_8_GROUP=2
+COMPONENT_8_NAME=CGMS Tool
+COMPONENT_8_VERSION=N/A
+COMPONENT_8_VERSION_NUM=1
+COMPONENT_8_ROOT_DIR=
+COMPONENT_8_FILES=
+
+
+COMPONENT_9_GROUP=3
+COMPONENT_9_NAME=Hibernate Framework
+COMPONENT_9_VERSION=3.1
+#COMPONENT_7_VERSION=3.2.6 GA
+COMPONENT_9_VERSION_NUM=1
+COMPONENT_9_ROOT_DIR=/lib/hibernate3
+COMPONENT_9_FILES=%ROOT%/antlr-2.7.6rc1.jar;%ROOT%/asm.jar;%ROOT%/asm-attrs.jar;%ROOT%/c3p0-0.9.0.jar;%ROOT%/cglib-2.1.3.jar;%ROOT%/commons-collections-2.1.1.jar;%ROOT%/commons-lang.jar;%ROOT%/commons-lang-2.0.jar;%ROOT%/commons-logging-1.0.4.jar;%ROOT%/dom4j-1.6.1.jar;%ROOT%/ehcache-1.1.jar;%ROOT%/hibernate3.jar;%ROOT%/jdbc2_0-stdext.jar;%ROOT%/jta.jar;%ROOT%/log4j-1.2.11.jar
+#COMPONENT_9_FILES=%ROOT%/antlr-2.7.6.jar;%ROOT%/asm.jar;%ROOT%/asm-attrs.jar;%ROOT%/c3p0-0.9.1.jar;%ROOT%/cglib-2.1.3.jar;%ROOT%/commons-collections-2.1.1.jar;%ROOT%/commons-lang.jar;%ROOT%/commons-lang-2.0.jar;%ROOT%/commons-logging-1.0.4.jar;%ROOT%/dom4j-1.6.1.jar;%ROOT%/ehcache-1.2.3.jar;%ROOT%/hibernate3.jar;%ROOT%/jdbc2_0-stdext.jar;%ROOT%/jta.jar;%ROOT%/log4j-1.2.11.jar
+
+COMPONENT_10_GROUP=3
+COMPONENT_10_NAME=Internal Database [H2]
+COMPONENT_10_VERSION=1.0.69
+COMPONENT_10_VERSION_NUM=1
+COMPONENT_10_ROOT_DIR=/lib/jdbc
+COMPONENT_10_FILES=%ROOT%/h2-1.0.69.jar
+
+COMPONENT_11_GROUP=3
+COMPONENT_11_NAME=Atech Tools
+COMPONENT_11_VERSION=0.3.13
+COMPONENT_11_VERSION_NUM=5
+COMPONENT_11_ROOT_DIR=/lib/utils
+COMPONENT_11_FILES=%ROOT%/atech-tools-0.3.13.jar
+
+COMPONENT_12_GROUP=3
+COMPONENT_12_NAME=iText Pdf Library
+COMPONENT_12_VERSION=2.0.7
+COMPONENT_12_VERSION_NUM=1
+COMPONENT_12_ROOT_DIR=/lib/utils
+COMPONENT_12_FILES=%ROOT%/iText-2.0.7.jar
+
+COMPONENT_13_GROUP=3
+COMPONENT_13_NAME=RxtxComm API
+COMPONENT_13_VERSION=2.1.7 (Modified v4)
+COMPONENT_13_VERSION_NUM=2
+COMPONENT_13_ROOT_DIR=/lib/utils
+#COMPONENT_13_FILES=%ROOT%/RXTXcomm-2.1.7.jar
+COMPONENT_13_FILES=%ROOT%/RXTXcomm-2.1.7-a4.jar
+COMPONENT_13_PLATFORM_SPECIFIC=true
+COMPONENT_13_PLATFORM_SPECIFIC_TYPE=2
+COMPONENT_13_PLATFORM_SUPPORTED=win linux mac solaris
+#COMPONENT_11_PLATFORM_SPECIFIC_JAR_WIN=jar_win.jar
+#COMPONENT_11_PLATFORM_SPECIFIC_JAR_LINUX=jar_linux.jar
+#COMPONENT_11_PLATFORM_SPECIFIC_JAR_MAC=jar_mac.jar
+#COMPONENT_11_PLATFORM_SPECIFIC_JAR_SOLARIS=jar_solaris.jar
+
+COMPONENT_14_GROUP=3
+COMPONENT_14_NAME=Skin L&F
+COMPONENT_14_VERSION=6.7
+COMPONENT_14_VERSION_NUM=1
+COMPONENT_14_ROOT_DIR=/lib/utils
+COMPONENT_14_FILES=%ROOT%/skinlf-6.7.jar
+
+COMPONENT_15_GROUP=3
+COMPONENT_15_NAME=JFreeChart
+COMPONENT_15_VERSION=1.0.10
+COMPONENT_15_VERSION_NUM=2
+COMPONENT_15_ROOT_DIR=/lib/jfreechart
+#COMPONENT_15_FILES=%ROOT%/jcommon-1.0.12.jar;%ROOT%/jfreechart-1.0.9.jar;%ROOT%/jfreechart-1.0.9-experimental.jar;%ROOT%/jfreechart-1.0.9-swt.jar;%ROOT%/swtgraphics2d.jar
+COMPONENT_15_FILES=%ROOT%/jcommon-1.0.13.jar;%ROOT%/jcommon-xml-1.0.13.jar;%ROOT%/jfreechart-1.0.10.jar
+
+COMPONENT_16_GROUP=3
+COMPONENT_16_NAME=Java Help
+COMPONENT_16_VERSION=2.0.5
+COMPONENT_16_VERSION_NUM=1
+COMPONENT_16_ROOT_DIR=/lib/utils
+COMPONENT_16_FILES=%ROOT%/jhall-2.0.5.jar
+
+
+COMPONENT_17_GROUP=3
+COMPONENT_17_NAME=Log4j
+COMPONENT_17_VERSION=1.2.15
+COMPONENT_17_VERSION_NUM=1
+COMPONENT_17_ROOT_DIR=/lib/utils
+COMPONENT_17_FILES=%ROOT%/log4j-1.2.15.jar
+
+COMPONENT_18_GROUP=3
+COMPONENT_18_NAME=Pygmy Http Daemon
+COMPONENT_18_VERSION=0.2
+COMPONENT_18_VERSION_NUM=1
+COMPONENT_18_ROOT_DIR=/lib/utils
+COMPONENT_18_FILES=%ROOT%/pygmy-core-0.2.jar;%ROOT%/pygmy-handlers-0.2.jar
+
+
+COMPONENT_19_GROUP=3
+COMPONENT_19_NAME=Java Native Access
+COMPONENT_19_VERSION=3.0.9
+COMPONENT_19_VERSION_NUM=1
+COMPONENT_19_ROOT_DIR=/lib/utils
+COMPONENT_19_FILES=%ROOT%/jna-3.0.9.jar
+
+
+COMPONENT_21_GROUP=3
+COMPONENT_21_NAME=XML (dom4j, jaxen)
+COMPONENT_21_VERSION=1.6.1
+COMPONENT_21_VERSION_NUM=1
+COMPONENT_21_ROOT_DIR=/lib/utils
+COMPONENT_21_FILES=%ROOT%/dom4j-1.6.1.jar;%ROOT%/jaxen-1.1-beta-6.jar
+
+
+COMPONENT_22_GROUP=3
+COMPONENT_22_NAME=IBM Communication API (for BlueTooth)
+COMPONENT_22_VERSION=1.3
+COMPONENT_22_VERSION_NUM=1
+COMPONENT_22_ROOT_DIR=/lib/utils
+COMPONENT_22_FILES=
+COMPONENT_22_PLATFORM_SPECIFIC=true
+COMPONENT_22_PLATFORM_SPECIFIC_TYPE=3
+COMPONENT_22_PLATFORM_SUPPORTED=win linux
+COMPONENT_22_PLATFORM_SPECIFIC_JAR_WIN=%ROOT%/IBMCommLin.jar
+COMPONENT_22_PLATFORM_SPECIFIC_JAR_LINUX=%ROOT%/IBMCommWin.jar
+
+
+
+#COMPONENT_13_GROUP=3
+#COMPONENT_13_NAME=Java Help
+#COMPONENT_13_VERSION=2.0.5
+#COMPONENT_13_VERSION_NUM=1
+#COMPONENT_13_ROOT_DIR=/lib/utils
+#COMPONENT_13_FILES=%ROOT%/jhall-2.0.5.jar
+#COMPONENT_13_PLATFORM_SPECIFIC=true
+#COMPONENT_13_PLATFORM_SPECIFIC_TYPE=1,2,3 = 1- no, 2-yes,native_only,3-yes,both
+#COMPONENT_13_PLATFORM_SUPPORTED=win linux
+#COMPONENT_13_PLATFORM_SPECIFIC_JAR_WIN=
+#COMPONENT_13_PLATFORM_SPECIFIC_JAR_LINUX=
+
+
+#COMPONENT_14_GROUP=3
+#COMPONENT_14_NAME=Apache Commons Libraries
+#COMPONENT_14_VERSION=1.0
+#COMPONENT_14_VERSION_NUM=1
+#COMPONENT_14_ROOT_DIR=/lib/utils
+#COMPONENT_14_FILES=%ROOT%/jhall-2.0.5.jar
+
+
Added: trunk/ggc-desktop/data/update/version/GGC_Update_09_0.4.20.properties
===================================================================
--- trunk/ggc-desktop/data/update/version/GGC_Update_09_0.4.20.properties (rev 0)
+++ trunk/ggc-desktop/data/update/version/GGC_Update_09_0.4.20.properties 2014-10-02 16:51:06 UTC (rev 1327)
@@ -0,0 +1,277 @@
+#
+# GGC Update File
+#
+# !!! Do NOT delete and/or edit this file.
+#
+# Core: 0.4.17, Desktop: 0.4.9
+
+#
+# Main application
+#
+PRODUCT_ID=ggc
+ROOT=..
+
+VERSION_NAME=0.4.20
+VERSION_NUMERIC=9
+VERSION_DESCRIPTION=Core 0.4.17, Desktop 0.4.9, Meter Tool , Pump Tool, CGMS Tool
+
+
+
+#
+# Applications
+#
+
+
+APP_CUSTOM_COUNT=1
+APP_CUSTOM_1_ID=ggc
+APP_CUSTOM_1_FILENAME=run_ggc
+APP_CUSTOM_1_MAIN_CLASS=ggc.GGC
+#APP_CUSTOM_1_JAVA_PARAMS=-XX:NewSize=128m -XX:MaxNewSize=512m -XX:SurvivorRatio=8 -Xms512m -Xmx512m
+#APP_CUSTOM_1_JAVA_PARAMS=-XX:NewSize=128m -XX:MaxNewSize=512m -XX:SurvivorRatio=8 -Xms128m -Xmx512m
+APP_CUSTOM_1_BINARY_NEEDED=yes
+APP_CUSTOM_1_NEEDS_JDBC_DRIVERS=yes
+
+
+#
+# Database
+#
+DB_ENABLED=true
+DB_VERSION_REQUIRED=7
+DB_CONFIGURATION_CLASS=ggc.core.db.GGCDbConfig
+DB_UPDATE_SITE=
+DB_UPDATE_SITE_VERSION=0
+
+#
+# Database applications
+#
+
+DB_TOOL=yes
+DB_CHECK=yes
+
+DB_APPLICATION=yes
+DB_APPLICATION_CLASS=org.h2.tools.Server
+
+DB_INIT=yes
+DB_INIT_CLASS=ggc.core.db.tool.InitDb
+
+DB_IMPORT=yes
+DB_IMPORT_CLASS=ggc.core.db.tool.transfer.GGCImporter
+
+
+
+#
+# Components
+#
+LAST_COMPONENT=22
+
+
+#
+# Groups
+#
+GROUP_1_NAME=GGC Main
+GROUP_2_NAME=GGC Plug-Ins
+GROUP_3_NAME=GGC Support Libraries
+
+
+#
+# Components
+#
+
+COMPONENT_1_GROUP=1
+COMPONENT_1_NAME=GGC Main
+COMPONENT_1_VERSION=0.4.9
+COMPONENT_1_VERSION_NUM=8
+COMPONENT_1_ROOT_DIR=/lib/ggc
+COMPONENT_1_FILES=%ROOT%/ggc-main-0.4.9.jar
+
+COMPONENT_2_GROUP=1
+COMPONENT_2_NAME=GGC Core
+COMPONENT_2_VERSION=0.4.19
+COMPONENT_2_VERSION_NUM=8
+COMPONENT_2_ROOT_DIR=/lib/ggc
+COMPONENT_2_FILES=%ROOT%/ggc-core-0.4.19.jar
+
+COMPONENT_3_GROUP=1
+COMPONENT_3_NAME=GGC Little
+COMPONENT_3_VERSION=0.2.2
+COMPONENT_3_VERSION_NUM=1
+COMPONENT_3_ROOT_DIR=/lib/ggc
+COMPONENT_3_FILES=%ROOT%/ggc-little-0.2.2.jar
+
+
+COMPONENT_4_GROUP=1
+COMPONENT_4_NAME=GGC Lang
+COMPONENT_4_VERSION=0.3.7
+COMPONENT_4_VERSION_NUM=6
+COMPONENT_4_ROOT_DIR=/lib/ggc
+COMPONENT_4_FILES=%ROOT%/ggc-lang-0.3.7.jar
+
+
+COMPONENT_5_GROUP=2
+COMPONENT_5_NAME=GGC Plugin Base
+COMPONENT_5_VERSION=0.5.2
+COMPONENT_5_VERSION_NUM=6
+COMPONENT_5_ROOT_DIR=/lib/ggc
+COMPONENT_5_FILES=%ROOT%/ggc-plugin_base-0.5.2.jar
+
+
+COMPONENT_20_GROUP=2
+COMPONENT_20_NAME=Nutrition Tool
+COMPONENT_20_VERSION=1.3.1
+COMPONENT_20_VERSION_NUM=4
+COMPONENT_20_ROOT_DIR=/lib/ggc
+COMPONENT_20_FILES=%ROOT%/ggc-nutri_tool-1.3.1.jar
+
+
+COMPONENT_6_GROUP=2
+COMPONENT_6_NAME=Meter Tool
+COMPONENT_6_VERSION=1.2.1
+COMPONENT_6_VERSION_NUM=5
+COMPONENT_6_ROOT_DIR=/lib/ggc
+COMPONENT_6_FILES=%ROOT%/ggc-meter_tool-1.2.1.jar
+
+COMPONENT_7_GROUP=2
+COMPONENT_7_NAME=Pump Tool
+COMPONENT_7_VERSION=1.2.2
+COMPONENT_7_VERSION_NUM=4
+COMPONENT_7_ROOT_DIR=/lib/ggc
+COMPONENT_7_FILES=%ROOT%/ggc-pump_tool-1.2.2.jar
+
+
+COMPONENT_8_GROUP=2
+COMPONENT_8_NAME=CGMS Tool
+COMPONENT_8_VERSION=1.0.2
+COMPONENT_8_VERSION_NUM=1
+COMPONENT_8_ROOT_DIR=/lib/ggc
+COMPONENT_8_FILES=%ROOT%/ggc-cgms_tool-1.0.2.jar
+
+
+COMPONENT_9_GROUP=3
+COMPONENT_9_NAME=Hibernate Framework
+COMPONENT_9_VERSION=3.1
+#COMPONENT_7_VERSION=3.2.6 GA
+COMPONENT_9_VERSION_NUM=1
+COMPONENT_9_ROOT_DIR=/lib/hibernate3
+COMPONENT_9_FILES=%ROOT%/antlr-2.7.6rc1.jar;%ROOT%/asm.jar;%ROOT%/asm-attrs.jar;%ROOT%/c3p0-0.9.0.jar;%ROOT%/cglib-2.1.3.jar;%ROOT%/commons-collections-2.1.1.jar;%ROOT%/commons-lang.jar;%ROOT%/commons-lang-2.0.jar;%ROOT%/commons-logging-1.0.4.jar;%ROOT%/dom4j-1.6.1.jar;%ROOT%/ehcache-1.1.jar;%ROOT%/hibernate3.jar;%ROOT%/jdbc2_0-stdext.jar;%ROOT%/jta.jar;%ROOT%/log4j-1.2.11.jar
+#COMPONENT_9_FILES=%ROOT%/antlr-2.7.6.jar;%ROOT%/asm.jar;%ROOT%/asm-attrs.jar;%ROOT%/c3p0-0.9.1.jar;%ROOT%/cglib-2.1.3.jar;%ROOT%/commons-collections-2.1.1.jar;%ROOT%/commons-lang.jar;%ROOT%/commons-lang-2.0.jar;%ROOT%/commons-logging-1.0.4.jar;%ROOT%/dom4j-1.6.1.jar;%ROOT%/ehcache-1.2.3.jar;%ROOT%/hibernate3.jar;%ROOT%/jdbc2_0-stdext.jar;%ROOT%/jta.jar;%ROOT%/log4j-1.2.11.jar
+
+COMPONENT_10_GROUP=3
+COMPONENT_10_NAME=Internal Database [H2]
+COMPONENT_10_VERSION=1.0.69
+COMPONENT_10_VERSION_NUM=1
+COMPONENT_10_ROOT_DIR=/lib/jdbc
+COMPONENT_10_FILES=%ROOT%/h2-1.0.69.jar
+
+COMPONENT_11_GROUP=3
+COMPONENT_11_NAME=Atech Tools
+COMPONENT_11_VERSION=0.5.1
+COMPONENT_11_VERSION_NUM=6
+COMPONENT_11_ROOT_DIR=/lib/utils
+COMPONENT_11_FILES=%ROOT%/atech-tools-0.5.1.jar
+
+COMPONENT_12_GROUP=3
+COMPONENT_12_NAME=iText Pdf Library
+COMPONENT_12_VERSION=2.0.7
+COMPONENT_12_VERSION_NUM=1
+COMPONENT_12_ROOT_DIR=/lib/utils
+COMPONENT_12_FILES=%ROOT%/iText-2.0.7.jar
+
+COMPONENT_13_GROUP=3
+COMPONENT_13_NAME=RxtxComm API
+COMPONENT_13_VERSION=2.2 (pre-release 2)
+COMPONENT_13_VERSION_NUM=3
+COMPONENT_13_ROOT_DIR=/lib/utils
+COMPONENT_13_FILES=%ROOT%/RXTXcomm-2.2.p2.jar
+COMPONENT_13_PLATFORM_SPECIFIC=true
+COMPONENT_13_PLATFORM_SPECIFIC_TYPE=2
+COMPONENT_13_PLATFORM_SUPPORTED=win linux mac solaris
+
+COMPONENT_14_GROUP=3
+COMPONENT_14_NAME=Skin L&F
+COMPONENT_14_VERSION=6.7
+COMPONENT_14_VERSION_NUM=1
+COMPONENT_14_ROOT_DIR=/lib/utils
+COMPONENT_14_FILES=%ROOT%/skinlf-6.7.jar
+
+COMPONENT_15_GROUP=3
+COMPONENT_15_NAME=JFreeChart
+COMPONENT_15_VERSION=1.0.10
+COMPONENT_15_VERSION_NUM=2
+COMPONENT_15_ROOT_DIR=/lib/jfreechart
+#COMPONENT_15_FILES=%ROOT%/jcommon-1.0.12.jar;%ROOT%/jfreechart-1.0.9.jar;%ROOT%/jfreechart-1.0.9-experimental.jar;%ROOT%/jfreechart-1.0.9-swt.jar;%ROOT%/swtgraphics2d.jar
+COMPONENT_15_FILES=%ROOT%/jcommon-1.0.13.jar;%ROOT%/jcommon-xml-1.0.13.jar;%ROOT%/jfreechart-1.0.10.jar
+
+COMPONENT_16_GROUP=3
+COMPONENT_16_NAME=Java Help
+COMPONENT_16_VERSION=2.0.5
+COMPONENT_16_VERSION_NUM=1
+COMPONENT_16_ROOT_DIR=/lib/utils
+COMPONENT_16_FILES=%ROOT%/jhall-2.0.5.jar
+
+
+COMPONENT_17_GROUP=3
+COMPONENT_17_NAME=Log4j
+COMPONENT_17_VERSION=1.2.15
+COMPONENT_17_VERSION_NUM=1
+COMPONENT_17_ROOT_DIR=/lib/utils
+COMPONENT_17_FILES=%ROOT%/log4j-1.2.15.jar
+
+COMPONENT_18_GROUP=3
+COMPONENT_18_NAME=Pygmy Http Daemon
+COMPONENT_18_VERSION=0.2
+COMPONENT_18_VERSION_NUM=1
+COMPONENT_18_ROOT_DIR=/lib/utils
+COMPONENT_18_FILES=%ROOT%/pygmy-core-0.2.jar;%ROOT%/pygmy-handlers-0.2.jar
+
+
+COMPONENT_19_GROUP=3
+COMPONENT_19_NAME=Java Native Access
+COMPONENT_19_VERSION=3.0.9
+COMPONENT_19_VERSION_NUM=1
+COMPONENT_19_ROOT_DIR=/lib/utils
+COMPONENT_19_FILES=%ROOT%/jna-3.0.9.jar
+
+
+COMPONENT_21_GROUP=3
+COMPONENT_21_NAME=XML (dom4j, jaxen)
+COMPONENT_21_VERSION=1.6.1
+COMPONENT_21_VERSION_NUM=1
+COMPONENT_21_ROOT_DIR=/lib/utils
+COMPONENT_21_FILES=%ROOT%/dom4j-1.6.1.jar;%ROOT%/jaxen-1.1-beta-6.jar
+
+
+COMPONENT_22_GROUP=3
+COMPONENT_22_NAME=IBM Communication API (for BlueTooth)
+COMPONENT_22_VERSION=1.3
+COMPONENT_22_VERSION_NUM=1
+COMPONENT_22_ROOT_DIR=/lib/utils
+COMPONENT_22_FILES=
+COMPONENT_22_PLATFORM_SPECIFIC=true
+COMPONENT_22_PLATFORM_SPECIFIC_TYPE=3
+COMPONENT_22_PLATFORM_SUPPORTED=win linux
+COMPONENT_22_PLATFORM_SPECIFIC_JAR_WIN=%ROOT%/IBMCommLin.jar
+COMPONENT_22_PLATFORM_SPECIFIC_JAR_LINUX=%ROOT%/IBMCommWin.jar
+
+
+
+#COMPONENT_13_GROUP=3
+#COMPONENT_13_NAME=Java Help
+#COMPONENT_13_VERSION=2.0.5
+#COMPONENT_13_VERSION_NUM=1
+#COMPONENT_13_ROOT_DIR=/lib/utils
+#COMPONENT_13_FILES=%ROOT%/jhall-2.0.5.jar
+#COMPONENT_13_PLATFORM_SPECIFIC=true
+#COMPONENT_13_PLATFORM_SPECIFIC_TYPE=1,2,3 = 1- no, 2-yes,native_only,3-yes,both
+#COMPONENT_13_PLATFORM_SUPPORTED=win linux
+#COMPONENT_13_PLATFORM_SPECIFIC_JAR_WIN=
+#COMPONENT_13_PLATFORM_SPECIFIC_JAR_LINUX=
+
+
+#COMPONENT_14_GROUP=3
+#COMPONENT_14_NAME=Apache Commons Libraries
+#COMPONENT_14_VERSION=1.0
+#COMPONENT_14_VERSION_NUM=1
+#COMPONENT_14_ROOT_DIR=/lib/utils
+#COMPONENT_14_FILES=%ROOT%/jhall-2.0.5.jar
+
+
Added: trunk/ggc-desktop/data/update/version/GGC_Update_10_0.5.properties
===================================================================
--- trunk/ggc-desktop/data/update/version/GGC_Update_10_0.5.properties (rev 0)
+++ trunk/ggc-desktop/data/update/version/GGC_Update_10_0.5.properties 2014-10-02 16:51:06 UTC (rev 1327)
@@ -0,0 +1,294 @@
+#
+# GGC Update File
+#
+# !!! Do NOT delete and/or edit this file.
+#
+# Core: 0.4.17, Desktop: 0.4.9
+
+#
+# Main application
+#
+PRODUCT_ID=ggc
+ROOT=..
+
+VERSION_NAME=0.5
+VERSION_NUMERIC=10
+VERSION_DESCRIPTION=Core 0.5, Desktop 0.4.9, Meter Tool , Pump Tool, CGMS Tool
+
+
+
+#
+# Applications
+#
+
+
+APP_CUSTOM_COUNT=1
+APP_CUSTOM_1_ID=ggc
+APP_CUSTOM_1_FILENAME=run_ggc
+APP_CUSTOM_1_MAIN_CLASS=ggc.GGC
+#APP_CUSTOM_1_JAVA_PARAMS=-XX:NewSize=128m -XX:MaxNewSize=512m -XX:SurvivorRatio=8 -Xms512m -Xmx512m
+#APP_CUSTOM_1_JAVA_PARAMS=-XX:NewSize=128m -XX:MaxNewSize=512m -XX:SurvivorRatio=8 -Xms128m -Xmx512m
+APP_CUSTOM_1_BINARY_NEEDED=yes
+APP_CUSTOM_1_NEEDS_JDBC_DRIVERS=yes
+
+
+#
+# Database
+#
+DB_ENABLED=true
+DB_VERSION_REQUIRED=7
+DB_CONFIGURATION_CLASS=ggc.core.db.GGCDbConfig
+DB_UPDATE_SITE=
+DB_UPDATE_SITE_VERSION=0
+
+#
+# Database applications
+#
+
+DB_TOOL=yes
+DB_CHECK=yes
+
+DB_APPLICATION=yes
+DB_APPLICATION_CLASS=org.h2.tools.Server
+
+DB_INIT=yes
+DB_INIT_CLASS=ggc.core.db.tool.InitDb
+
+DB_IMPORT=yes
+DB_IMPORT_CLASS=ggc.core.db.tool.transfer.GGCImporter
+
+
+
+#
+# Components
+#
+LAST_COMPONENT=23
+
+
+#
+# Groups
+#
+GROUP_1_NAME=GGC Main
+GROUP_2_NAME=GGC Plug-Ins
+GROUP_3_NAME=GGC Support Libraries
+
+
+#
+# Components
+#
+
+COMPONENT_1_GROUP=1
+COMPONENT_1_NAME=GGC Main
+COMPONENT_1_VERSION=0.4.11
+COMPONENT_1_VERSION_NUM=9
+COMPONENT_1_ROOT_DIR=/lib/ggc
+COMPONENT_1_FILES=%ROOT%/ggc-main-0.4.11.jar
+
+COMPONENT_2_GROUP=1
+COMPONENT_2_NAME=GGC Core
+COMPONENT_2_VERSION=0.5
+COMPONENT_2_VERSION_NUM=10
+COMPONENT_2_ROOT_DIR=/lib/ggc
+COMPONENT_2_FILES=%ROOT%/ggc-core-0.5.jar
+
+COMPONENT_3_GROUP=1
+COMPONENT_3_NAME=GGC Little
+COMPONENT_3_VERSION=0.2.2
+COMPONENT_3_VERSION_NUM=1
+COMPONENT_3_ROOT_DIR=/lib/ggc
+COMPONENT_3_FILES=%ROOT%/ggc-little-0.2.2.jar
+
+
+COMPONENT_4_GROUP=1
+COMPONENT_4_NAME=GGC Lang
+COMPONENT_4_VERSION=0.3.8
+COMPONENT_4_VERSION_NUM=7
+COMPONENT_4_ROOT_DIR=/lib/ggc
+COMPONENT_4_FILES=%ROOT%/ggc-lang-0.3.8.jar
+
+
+COMPONENT_5_GROUP=2
+COMPONENT_5_NAME=GGC Plugin Base
+COMPONENT_5_VERSION=0.6.1
+COMPONENT_5_VERSION_NUM=8
+COMPONENT_5_ROOT_DIR=/lib/ggc
+COMPONENT_5_FILES=%ROOT%/ggc-plugin_base-0.6.1.jar
+
+
+COMPONENT_20_GROUP=2
+COMPONENT_20_NAME=Nutrition Tool
+COMPONENT_20_VERSION=1.3.2
+COMPONENT_20_VERSION_NUM=4
+COMPONENT_20_ROOT_DIR=/lib/ggc
+COMPONENT_20_FILES=%ROOT%/ggc-nutri_tool-1.3.2.jar
+
+
+COMPONENT_6_GROUP=2
+COMPONENT_6_NAME=Meter Tool
+COMPONENT_6_VERSION=2.0.3
+COMPONENT_6_VERSION_NUM=8
+COMPONENT_6_ROOT_DIR=/lib/ggc
+COMPONENT_6_FILES=%ROOT%/ggc-meter_tool-2.0.3.jar
+
+COMPONENT_7_GROUP=2
+COMPONENT_7_NAME=Pump Tool
+COMPONENT_7_VERSION=1.3.2
+COMPONENT_7_VERSION_NUM=7
+COMPONENT_7_ROOT_DIR=/lib/ggc
+COMPONENT_7_FILES=%ROOT%/ggc-pump_tool-1.3.2.jar
+
+
+COMPONENT_8_GROUP=2
+COMPONENT_8_NAME=CGMS Tool
+COMPONENT_8_VERSION=1.0.3
+COMPONENT_8_VERSION_NUM=1
+COMPONENT_8_ROOT_DIR=/lib/ggc
+COMPONENT_8_FILES=%ROOT%/ggc-cgms_tool-1.0.3.jar
+
+
+COMPONENT_9_GROUP=3
+COMPONENT_9_NAME=Hibernate Framework
+COMPONENT_9_VERSION=3.1
+#COMPONENT_7_VERSION=3.2.6 GA
+COMPONENT_9_VERSION_NUM=1
+COMPONENT_9_ROOT_DIR=/lib/hibernate3
+COMPONENT_9_FILES=%ROOT%/antlr-2.7.6rc1.jar;%ROOT%/asm.jar;%ROOT%/asm-attrs.jar;%ROOT%/c3p0-0.9.0.jar;%ROOT%/cglib-2.1.3.jar;%ROOT%/commons-collections-2.1.1.jar;%ROOT%/commons-lang.jar;%ROOT%/commons-lang-2.0.jar;%ROOT%/commons-logging-1.0.4.jar;%ROOT%/dom4j-1.6.1.jar;%ROOT%/ehcache-1.1.jar;%ROOT%/hibernate3.jar;%ROOT%/jdbc2_0-stdext.jar;%ROOT%/jta.jar;%ROOT%/log4j-1.2.11.jar
+#COMPONENT_9_FILES=%ROOT%/antlr-2.7.6.jar;%ROOT%/asm.jar;%ROOT%/asm-attrs.jar;%ROOT%/c3p0-0.9.1.jar;%ROOT%/cglib-2.1.3.jar;%ROOT%/commons-collections-2.1.1.jar;%ROOT%/commons-lang.jar;%ROOT%/commons-lang-2.0.jar;%ROOT%/commons-logging-1.0.4.jar;%ROOT%/dom4j-1.6.1.jar;%ROOT%/ehcache-1.2.3.jar;%ROOT%/hibernate3.jar;%ROOT%/jdbc2_0-stdext.jar;%ROOT%/jta.jar;%ROOT%/log4j-1.2.11.jar
+
+COMPONENT_10_GROUP=3
+COMPONENT_10_NAME=Internal Database [H2]
+COMPONENT_10_VERSION=1.0.69
+COMPONENT_10_VERSION_NUM=1
+COMPONENT_10_ROOT_DIR=/lib/jdbc
+COMPONENT_10_FILES=%ROOT%/h2-1.0.69.jar
+
+COMPONENT_11_GROUP=3
+COMPONENT_11_NAME=Atech Tools
+COMPONENT_11_VERSION=0.7.4
+COMPONENT_11_VERSION_NUM=9
+COMPONENT_11_ROOT_DIR=/lib/utils
+COMPONENT_11_FILES=%ROOT%/atech-tools-0.7.4.jar
+
+COMPONENT_12_GROUP=3
+COMPONENT_12_NAME=iText Pdf Library
+COMPONENT_12_VERSION=5.1.2
+COMPONENT_12_VERSION_NUM=2
+COMPONENT_12_ROOT_DIR=/lib/utils
+COMPONENT_12_FILES=%ROOT%/itextpdf-5.1.2.jar;%ROOT%/itext-xtra-5.1.2.jar
+
+
+COMPONENT_13_GROUP=3
+COMPONENT_13_NAME=RxtxComm API
+COMPONENT_13_VERSION=2.2 p2
+COMPONENT_13_VERSION_NUM=3
+COMPONENT_13_ROOT_DIR=/lib/utils
+#COMPONENT_13_FILES=%ROOT%/RXTXcomm-2.1.7.jar
+COMPONENT_13_FILES=%ROOT%/RXTXcomm-2.2.p2.jar
+COMPONENT_13_PLATFORM_SPECIFIC=true
+COMPONENT_13_PLATFORM_SPECIFIC_TYPE=2
+COMPONENT_13_PLATFORM_SUPPORTED=win linux mac solaris
+#COMPONENT_11_PLATFORM_SPECIFIC_JAR_WIN=jar_win.jar
+#COMPONENT_11_PLATFORM_SPECIFIC_JAR_LINUX=jar_linux.jar
+#COMPONENT_11_PLATFORM_SPECIFIC_JAR_MAC=jar_mac.jar
+#COMPONENT_11_PLATFORM_SPECIFIC_JAR_SOLARIS=jar_solaris.jar
+
+
+
+COMPONENT_14_GROUP=3
+COMPONENT_14_NAME=Skin L&F
+COMPONENT_14_VERSION=6.7
+COMPONENT_14_VERSION_NUM=1
+COMPONENT_14_ROOT_DIR=/lib/utils
+COMPONENT_14_FILES=%ROOT%/skinlf-6.7.jar
+
+COMPONENT_15_GROUP=3
+COMPONENT_15_NAME=JFreeChart
+COMPONENT_15_VERSION=1.0.13
+COMPONENT_15_VERSION_NUM=3
+COMPONENT_15_ROOT_DIR=/lib/jfreechart
+#COMPONENT_15_FILES=%ROOT%/jcommon-1.0.13.jar;%ROOT%/jcommon-xml-1.0.13.jar;%ROOT%/jfreechart-1.0.10.jar
+COMPONENT_15_FILES=%ROOT%/jcommon-1.0.16.jar;%ROOT%/jfreechart-1.0.13.jar
+
+
+COMPONENT_16_GROUP=3
+COMPONENT_16_NAME=Java Help
+COMPONENT_16_VERSION=2.0.5
+COMPONENT_16_VERSION_NUM=1
+COMPONENT_16_ROOT_DIR=/lib/utils
+COMPONENT_16_FILES=%ROOT%/jhall-2.0.5.jar
+
+
+COMPONENT_17_GROUP=3
+COMPONENT_17_NAME=Log4j
+COMPONENT_17_VERSION=1.2.15
+COMPONENT_17_VERSION_NUM=1
+COMPONENT_17_ROOT_DIR=/lib/utils
+COMPONENT_17_FILES=%ROOT%/log4j-1.2.15.jar
+
+COMPONENT_18_GROUP=3
+COMPONENT_18_NAME=Pygmy Http Daemon
+COMPONENT_18_VERSION=0.2
+COMPONENT_18_VERSION_NUM=1
+COMPONENT_18_ROOT_DIR=/lib/utils
+COMPONENT_18_FILES=%ROOT%/pygmy-core-0.2.jar;%ROOT%/pygmy-handlers-0.2.jar
+
+
+COMPONENT_19_GROUP=3
+COMPONENT_19_NAME=Java Native Access
+COMPONENT_19_VERSION=3.2.7
+COMPONENT_19_VERSION_NUM=2
+COMPONENT_19_ROOT_DIR=/lib/utils
+COMPONENT_19_FILES=%ROOT%/jna-3.2.7.jar;%ROOT%/jna-platform-3.2.7.jar
+jna.api=${utils_path}/jna-3.2.7.jar;${utils_path}/jna-platform-3.2.7.jar
+
+COMPONENT_21_GROUP=3
+COMPONENT_21_NAME=XML (dom4j, jaxen)
+COMPONENT_21_VERSION=1.6.1
+COMPONENT_21_VERSION_NUM=1
+COMPONENT_21_ROOT_DIR=/lib/utils
+COMPONENT_21_FILES=%ROOT%/dom4j-1.6.1.jar;%ROOT%/jaxen-1.1-beta-6.jar
+
+
+COMPONENT_22_GROUP=3
+COMPONENT_22_NAME=IBM Communication API (for BlueTooth)
+COMPONENT_22_VERSION=1.3
+COMPONENT_22_VERSION_NUM=1
+COMPONENT_22_ROOT_DIR=/lib/utils
+COMPONENT_22_FILES=
+COMPONENT_22_PLATFORM_SPECIFIC=true
+COMPONENT_22_PLATFORM_SPECIFIC_TYPE=3
+COMPONENT_22_PLATFORM_SUPPORTED=win linux
+COMPONENT_22_PLATFORM_SPECIFIC_JAR_WIN=%ROOT%/IBMCommLin.jar
+COMPONENT_22_PLATFORM_SPECIFIC_JAR_LINUX=%ROOT%/IBMCommWin.jar
+
+
+COMPONENT_23_GROUP=3
+COMPONENT_23_NAME=LibUSBj Windows/Other
+COMPONENT_23_VERSION=0.2.1
+COMPONENT_23_VERSION_NUM=1
+COMPONENT_23_ROOT_DIR=/lib/utils
+COMPONENT_23_FILES=%ROOT%/LibUSB4jwo-0.2.1.jar
+
+
+
+#COMPONENT_13_GROUP=3
+#COMPONENT_13_NAME=Java Help
+#COMPONENT_13_VERSION=2.0.5
+#COMPONENT_13_VERSION_NUM=1
+#COMPONENT_13_ROOT_DIR=/lib/utils
+#COMPONENT_13_FILES=%ROOT%/jhall-2.0.5.jar
+#COMPONENT_13_PLATFORM_SPECIFIC=true
+#COMPONENT_13_PLATFORM_SPECIFIC_TYPE=1,2,3 = 1- no, 2-yes,native_only,3-yes,both
+#COMPONENT_13_PLATFORM_SUPPORTED=win linux
+#COMPONENT_13_PLATFORM_SPECIFIC_JAR_WIN=
+#COMPONENT_13_PLATFORM_SPECIFIC_JAR_LINUX=
+
+
+#COMPONENT_14_GROUP=3
+#COMPONENT_14_NAME=Apache Commons Libraries
+#COMPONENT_14_VERSION=1.0
+#COMPONENT_14_VERSION_NUM=1
+#COMPONENT_14_ROOT_DIR=/lib/utils
+#COMPONENT_14_FILES=%ROOT%/jhall-2.0.5.jar
+
+
Added: trunk/ggc-desktop/data/update/version/GGC_Update_11_0.5.0.3.properties
===================================================================
--- trunk/ggc-desktop/data/update/version/GGC_Update_11_0.5.0.3.properties (rev 0)
+++ trunk/ggc-desktop/data/update/version/GGC_Update_11_0.5.0.3.properties 2014-10-02 16:51:06 UTC (rev 1327)
@@ -0,0 +1,294 @@
+#
+# GGC Update File
+#
+# !!! Do NOT delete and/or edit this file.
+#
+# Core: 0.5.0.3, Desktop: 0.5.0.3
+
+#
+# Main application
+#
+PRODUCT_ID=ggc
+ROOT=..
+
+VERSION_NAME=0.5.0.3
+VERSION_NUMERIC=11
+VERSION_DESCRIPTION=Core 0.5.0.3, Desktop 0.5.0.3, Meter Tool 2.0.3, Pump Tool 1.3.4, CGMS Tool 1.0.3
+
+
+
+#
+# Applications
+#
+
+
+APP_CUSTOM_COUNT=1
+APP_CUSTOM_1_ID=ggc
+APP_CUSTOM_1_FILENAME=run_ggc
+APP_CUSTOM_1_MAIN_CLASS=ggc.GGC
+#APP_CUSTOM_1_JAVA_PARAMS=-XX:NewSize=128m -XX:MaxNewSize=512m -XX:SurvivorRatio=8 -Xms512m -Xmx512m
+#APP_CUSTOM_1_JAVA_PARAMS=-XX:NewSize=128m -XX:MaxNewSize=512m -XX:SurvivorRatio=8 -Xms128m -Xmx512m
+APP_CUSTOM_1_BINARY_NEEDED=yes
+APP_CUSTOM_1_NEEDS_JDBC_DRIVERS=yes
+
+
+#
+# Database
+#
+DB_ENABLED=true
+DB_VERSION_REQUIRED=7
+DB_CONFIGURATION_CLASS=ggc.core.db.GGCDbConfig
+DB_UPDATE_SITE=
+DB_UPDATE_SITE_VERSION=0
+
+#
+# Database applications
+#
+
+DB_TOOL=yes
+DB_CHECK=yes
+
+DB_APPLICATION=yes
+DB_APPLICATION_CLASS=org.h2.tools.Server
+
+DB_INIT=yes
+DB_INIT_CLASS=ggc.core.db.tool.InitDb
+
+DB_IMPORT=yes
+DB_IMPORT_CLASS=ggc.core.db.tool.transfer.GGCImporter
+
+
+
+#
+# Components
+#
+LAST_COMPONENT=23
+
+
+#
+# Groups
+#
+GROUP_1_NAME=GGC Main
+GROUP_2_NAME=GGC Plug-Ins
+GROUP_3_NAME=GGC Support Libraries
+
+
+#
+# Components
+#
+
+COMPONENT_1_GROUP=1
+COMPONENT_1_NAME=GGC Main
+COMPONENT_1_VERSION=0.5.0.3
+COMPONENT_1_VERSION_NUM=10
+COMPONENT_1_ROOT_DIR=/lib/ggc
+COMPONENT_1_FILES=%ROOT%/ggc-main-0.5.0.3.jar
+
+COMPONENT_2_GROUP=1
+COMPONENT_2_NAME=GGC Core
+COMPONENT_2_VERSION=0.5.0.3
+COMPONENT_2_VERSION_NUM=11
+COMPONENT_2_ROOT_DIR=/lib/ggc
+COMPONENT_2_FILES=%ROOT%/ggc-core-0.5.0.3.jar
+
+COMPONENT_3_GROUP=1
+COMPONENT_3_NAME=GGC Little
+COMPONENT_3_VERSION=0.2.3
+COMPONENT_3_VERSION_NUM=2
+COMPONENT_3_ROOT_DIR=/lib/ggc
+COMPONENT_3_FILES=%ROOT%/ggc-little-0.2.3.jar
+
+
+COMPONENT_4_GROUP=1
+COMPONENT_4_NAME=GGC Lang
+COMPONENT_4_VERSION=0.4.2
+COMPONENT_4_VERSION_NUM=8
+COMPONENT_4_ROOT_DIR=/lib/ggc
+COMPONENT_4_FILES=%ROOT%/ggc-lang-0.4.2.jar
+
+
+COMPONENT_5_GROUP=2
+COMPONENT_5_NAME=GGC Plugin Base
+COMPONENT_5_VERSION=0.6.2
+COMPONENT_5_VERSION_NUM=9
+COMPONENT_5_ROOT_DIR=/lib/ggc
+COMPONENT_5_FILES=%ROOT%/ggc-pl...
[truncated message content] |
|
From: <and...@us...> - 2014-10-10 16:59:17
|
Revision: 1330
http://sourceforge.net/p/ggc/code/1330
Author: andyrozman
Date: 2014-10-10 16:59:08 +0000 (Fri, 10 Oct 2014)
Log Message:
-----------
- master pom change (eclipse build plugin)
- Pump Daily Sheet Report
Modified Paths:
--------------
trunk/ggc-master-pom/pom.xml
trunk/ggc-plugin_base/src/GGCPlugin_en.properties
trunk/ggc-pump/src/ggc/pump/data/PumpDeviceValueType.java
trunk/ggc-pump/src/ggc/pump/data/PumpValuesHour.java
trunk/ggc-pump/src/ggc/pump/data/PumpValuesHourProcessor.java
trunk/ggc-pump/src/ggc/pump/print/PrintPumpDataDailyTimeSheet.java
trunk/ggc-pump/src/ggc/pump/util/DataAccessPump.java
Modified: trunk/ggc-master-pom/pom.xml
===================================================================
--- trunk/ggc-master-pom/pom.xml 2014-10-09 21:34:52 UTC (rev 1329)
+++ trunk/ggc-master-pom/pom.xml 2014-10-10 16:59:08 UTC (rev 1330)
@@ -78,7 +78,18 @@
<target>1.5</target>
</configuration>
</plugin>
- </plugins>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-eclipse-plugin</artifactId>
+ <version>2.9</version>
+ <configuration>
+ <useProjectReferences>false</useProjectReferences>
+ </configuration>
+ </plugin>
+
+ </plugins>
+
</pluginManagement>
</build>
Modified: trunk/ggc-plugin_base/src/GGCPlugin_en.properties
===================================================================
--- trunk/ggc-plugin_base/src/GGCPlugin_en.properties 2014-10-09 21:34:52 UTC (rev 1329)
+++ trunk/ggc-plugin_base/src/GGCPlugin_en.properties 2014-10-10 16:59:08 UTC (rev 1330)
@@ -8,7 +8,7 @@
# ######################################################################
# ### Language: English ###
# ### Created by: Andy Rozman (an...@at...) ###
-# ### Last change: 4th June 2011 ###
+# ### Last change: 10th October 2014 ###
# ### Library Version: 0.6.1 ###
# ### Application Version: 0.5 ###
# ######################################################################
@@ -67,6 +67,7 @@
VERSION=Version
# !SG! weeks days and months
+DAY=Day
SU=Su
MO=Mo
TU=Tu
Modified: trunk/ggc-pump/src/ggc/pump/data/PumpDeviceValueType.java
===================================================================
--- trunk/ggc-pump/src/ggc/pump/data/PumpDeviceValueType.java 2014-10-09 21:34:52 UTC (rev 1329)
+++ trunk/ggc-pump/src/ggc/pump/data/PumpDeviceValueType.java 2014-10-10 16:59:08 UTC (rev 1330)
@@ -8,7 +8,7 @@
BOLUS, //
BG("PUMP_ADD_DATA_BG"), //
CH, //
- ;
+ COMMENT, ;
private String additionalKey;
Modified: trunk/ggc-pump/src/ggc/pump/data/PumpValuesHour.java
===================================================================
--- trunk/ggc-pump/src/ggc/pump/data/PumpValuesHour.java 2014-10-09 21:34:52 UTC (rev 1329)
+++ trunk/ggc-pump/src/ggc/pump/data/PumpValuesHour.java 2014-10-10 16:59:08 UTC (rev 1330)
@@ -1,28 +1,55 @@
package ggc.pump.data;
+import ggc.pump.data.defs.PumpBaseType;
+import ggc.pump.util.DataAccessPump;
+
import java.util.HashMap;
+import org.apache.commons.lang.StringUtils;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import com.atech.utils.data.ATechDate;
+
public class PumpValuesHour
{
int hour;
private HashMap<Long, Float> bgs = new HashMap<Long, Float>();
+ private StringBuffer sbBgs = new StringBuffer();
private float chs = 0.0f;
private float bolus = 0.0f;
+ private static final Log LOG = LogFactory.getLog(PumpValuesHour.class);
+ DataAccessPump dataAccessPump;
+ public PumpValuesHour(DataAccessPump da)
+ {
+ this.dataAccessPump = da;
+ }
+
public void addBGEntry(PumpValuesEntryExt pumpValuesEntryExt)
{
this.bgs.put(pumpValuesEntryExt.getDateTime(), Float.parseFloat(pumpValuesEntryExt.getValue()));
+
+ sbBgs.append(" ");
+ sbBgs.append(getTimeAsString(pumpValuesEntryExt.getDateTime()));
+ sbBgs.append("=");
+ sbBgs.append(dataAccessPump.getDisplayedBGString(pumpValuesEntryExt.getValue()));
+ sbBgs.append(",");
}
- public HashMap<Long, Float> getBgs()
+ private String getTimeAsString(long dt)
{
- return bgs;
+ ATechDate atd = new ATechDate(ATechDate.FORMAT_DATE_AND_TIME_S, dt);
+ String s = atd.getTimeString();
+ s = s.substring(0, s.lastIndexOf(":"));
+
+ return s;
}
- public void setBgs(HashMap<Long, Float> bgs)
+ public HashMap<Long, Float> getBgs()
{
- this.bgs = bgs;
+ return bgs;
}
public float getBgProcessedValue()
@@ -44,12 +71,23 @@
public void addCHEntry(String chValue)
{
+ if (StringUtils.isNotBlank(chValue))
+ {
+ chs += parseFloat(chValue, "CH");
+ }
+ }
+
+ private float parseFloat(String value, String valueType)
+ {
try
{
- chs += Float.parseFloat(chValue);
+ return Float.parseFloat(value);
}
catch (Exception ex)
- {}
+ {
+ LOG.warn("Problem parsing " + valueType + " value: " + value);
+ return 0.0f;
+ }
}
public float getCH()
@@ -57,16 +95,20 @@
return chs;
}
- public void addBolus(String bolusIn)
+ public void addBolus(PumpValuesEntry pve)
{
- try
+
+ if (pve.base_type == PumpBaseType.PUMP_DATA_PEN_INJECTION_BOLUS)
{
- bolus += Float.parseFloat(bolusIn);
+ bolus += parseFloat(pve.getValue(), "Pen-Bolus");
}
- catch (Exception ex)
+ else
{
- System.out.println("Parse Bolus. " + bolusIn + ", Ex.: " + ex);
+ // special boluses
+ // pump values
+ bolus += parseFloat(pve.getValue(), "Pump-Bolus");
}
+
}
public float getBolus()
@@ -74,4 +116,12 @@
return bolus;
}
+ public String getMultipleBgs()
+ {
+ String mBgs = sbBgs.substring(0, sbBgs.length() - 1);
+ mBgs.trim();
+
+ return mBgs;
+ }
+
}
Modified: trunk/ggc-pump/src/ggc/pump/data/PumpValuesHourProcessor.java
===================================================================
--- trunk/ggc-pump/src/ggc/pump/data/PumpValuesHourProcessor.java 2014-10-09 21:34:52 UTC (rev 1329)
+++ trunk/ggc-pump/src/ggc/pump/data/PumpValuesHourProcessor.java 2014-10-10 16:59:08 UTC (rev 1330)
@@ -5,13 +5,34 @@
import ggc.pump.data.defs.PumpBaseType;
import ggc.pump.util.DataAccessPump;
+import java.util.ArrayList;
+import java.util.HashMap;
import java.util.List;
public class PumpValuesHourProcessor
{
DataAccessPump dataAccessPump = DataAccessPump.getInstance();
+ HashMap<PumpDeviceValueType, List<String>> comments = null;
+ public void clearComments()
+ {
+ if (comments == null)
+ {
+ comments = new HashMap<PumpDeviceValueType, List<String>>();
+ comments.put(PumpDeviceValueType.BG, new ArrayList<String>());
+ comments.put(PumpDeviceValueType.BOLUS, new ArrayList<String>());
+ comments.put(PumpDeviceValueType.COMMENT, new ArrayList<String>());
+ }
+ else
+ {
+ comments.get(PumpDeviceValueType.BG).clear();
+ comments.get(PumpDeviceValueType.BOLUS).clear();
+ comments.get(PumpDeviceValueType.COMMENT).clear();
+ }
+
+ }
+
public float getValueForType(List<DeviceValuesEntry> deviceValues, PumpDeviceValueType valueType)
{
if (valueType == PumpDeviceValueType.BG)
@@ -35,7 +56,7 @@
public PumpValuesHour createPumpValuesHour(List<DeviceValuesEntry> deviceValues)
{
- PumpValuesHour pumpValuesHour = new PumpValuesHour();
+ PumpValuesHour pumpValuesHour = new PumpValuesHour(this.dataAccessPump);
String keyBG = dataAccessPump.getAdditionalTypes().getTypeDescription(PumpAdditionalDataType.PUMP_ADD_DATA_BG);
String keyCH = dataAccessPump.getAdditionalTypes().getTypeDescription(PumpAdditionalDataType.PUMP_ADD_DATA_CH);
@@ -67,14 +88,41 @@
if ((pve.getBaseType() == PumpBaseType.PUMP_DATA_BOLUS)
|| (pve.getBaseType() == PumpBaseType.PUMP_DATA_PEN_INJECTION_BOLUS))
{
- pumpValuesHour.addBolus(pve.getValue());
- System.out.println("Bolus");
+ pumpValuesHour.addBolus(pve);
}
+ }
- // if keyCH
+ return pumpValuesHour;
+ }
+ public void addComments(PumpDeviceValueType valueType, String partComment)
+ {
+ comments.get(valueType).add(partComment);
+ }
+
+ public String getFullComment()
+ {
+ StringBuffer fullComment = new StringBuffer();
+
+ List<String> listComms = comments.get(PumpDeviceValueType.BG);
+
+ if (!listComms.isEmpty())
+ {
+ StringBuffer sb = new StringBuffer();
+ sb.append(dataAccessPump.getI18nControlInstance().getMessage("BG"));
+ sb.append(": ");
+
+ for (String entry : listComms)
+ {
+ sb.append(entry);
+ sb.append(",");
+ }
+
+ fullComment.append(sb.toString().substring(0, sb.length() - 1));
+ fullComment.append("; ");
}
- return pumpValuesHour;
+ return fullComment.toString();
}
+
}
Modified: trunk/ggc-pump/src/ggc/pump/print/PrintPumpDataDailyTimeSheet.java
===================================================================
--- trunk/ggc-pump/src/ggc/pump/print/PrintPumpDataDailyTimeSheet.java 2014-10-09 21:34:52 UTC (rev 1329)
+++ trunk/ggc-pump/src/ggc/pump/print/PrintPumpDataDailyTimeSheet.java 2014-10-10 16:59:08 UTC (rev 1330)
@@ -17,6 +17,7 @@
import java.util.GregorianCalendar;
import java.util.List;
+import com.atech.i18n.I18nControlAbstract;
import com.atech.i18n.mgr.LanguageManager;
import com.atech.print.engine.ITextDocumentPrintSettings;
import com.atech.print.engine.PrintAbstractITextWithDataRead;
@@ -63,6 +64,7 @@
private GregorianCalendar gc_from;
private GregorianCalendar gc_to;
DataAccessPump dataAccessPump = DataAccessPump.getInstance();
+ I18nControlAbstract i18nControl = dataAccessPump.getI18nControlInstance();
PumpValuesHourProcessor pumpValuesHourProcessor;
public PrintPumpDataDailyTimeSheet(PrintParameters parameters)
@@ -102,7 +104,6 @@
@Override
public void initData()
{
- // TODO Auto-generated method stub
// FIXME read from parameters
@@ -124,6 +125,10 @@
GregorianCalendar gc_end = deviceValuesRange.getEndGC();
gc_end.add(Calendar.DAY_OF_MONTH, 1);
+ PdfPTable mainTable = new PdfPTable(1);
+ mainTable.setWidthPercentage(100);
+ mainTable.getDefaultCell().setBorderWidth(0);
+
do
{
@@ -133,34 +138,39 @@
{
DeviceValuesDay dvd = deviceValuesRange.getDayEntry(atd.getATDateTimeAsLong());
dvd.prepareHourlyEntries();
- createDayEntry(document, dvd, gc_current);
+ createDayEntry(mainTable, dvd, gc_current);
}
gc_current.add(Calendar.DAY_OF_MONTH, 1);
} while (gc_current.before(gc_end));
+ document.add(mainTable);
}
/**
* TODO
- *
- * - main view table (day, comment, space)
- * - multiple BG in comment
- * - comments
- * - bolus swuare or extended
- * - sums
- *
+ *
+ * + main view table (day, comment, space) 100%
+ * - multiple BG in comment 100%
+ * - comments 0%
+ * - bolus swuare or extended 0%
+ * + sums 100%
+ * - days resolve 0%
+ * - basal 0%
+ *
+ * NOT IMPORTANT FOR NOW:
+ * - special pump statues (stopped pump, change of pump material, TBR)
+ * - Hipo, Hyper ?
+ *
+ *
+ * PROFILES REPORT 0%
+ *
*/
- /**
- * {@inheritDoc}
- */
-
- public void createDayEntry(Document document, DeviceValuesDay deviceValuesDay, GregorianCalendar gcCurrent)
+ private void createDayEntry(PdfPTable mainTable, DeviceValuesDay deviceValuesDay, GregorianCalendar gcCurrent)
throws Exception
{
-
PdfPTable datatable = new PdfPTable(27);
datatable.setWidths(new float[] { 4.0f, 6.0f, 3.5f, 3.5f, 3.5f, 3.5f, 3.5f, 3.5f, 3.5f, 3.5f, 3.5f, 3.5f, 3.5f,
3.5f, 3.5f, 3.5f, 3.5f, 3.5f, 3.5f, 3.5f, 3.5f, 3.5f, 3.5f, 3.5f, 3.5f, 3.5f,
@@ -168,23 +178,9 @@
datatable.setWidthPercentage(100); // percentage
datatable.getDefaultCell().setVerticalAlignment(Element.ALIGN_MIDDLE);
- datatable.getDefaultCell().setHorizontalAlignment(Element.ALIGN_LEFT); // ALIGN_CENTER);
+ datatable.getDefaultCell().setHorizontalAlignment(Element.ALIGN_CENTER); // ALIGN_CENTER);
datatable.getDefaultCell().setBorderWidth(1);
- // datatable.getDefaultCell().setBorder(1);
- /*
- * datatable.addCell(this.createBoldTextPhrase("DATE"));
- * datatable.addCell(this.createBoldTextPhrase("TIME"));
- * datatable.addCell(this.createBoldTextPhrase("BASE_TYPE"));
- * datatable.addCell(this.createBoldTextPhrase("SUB_TYPE"));
- * datatable.addCell(this.createBoldTextPhrase("VALUE_SHORT"));
- * datatable.addCell(this.createBoldTextPhrase("OTHER_DATA"));
- */
- // PdfCell c = new PdfCell();
- // c.
-
- // line 1
-
// cell 1
datatable.addCell(this.createBoldTextPhrase("DAY"));
datatable.addCell(this.createBoldTextPhrase("TIME"));
@@ -196,10 +192,19 @@
datatable.addCell(this.createBoldTextPhrase("SUM"));
+ pumpValuesHourProcessor.clearComments();
+
for (int j = 0; j < 4; j++)
{
if (j == 0)
{
+ // SU=Su
+ // MO=Mo
+ // TU=Tu
+ // WE=We
+ // TH=Th
+ // FR=Fr
+ // SA=Sa
datatable.addCell(this.createNormalTextPhrase("???"));
datatable.addCell(this.createBoldTextPhrase("BASAL"));
@@ -210,13 +215,10 @@
{
PdfPCell cell = new PdfPCell();
cell.setPhrase(this.createBoldTextPhrase(gcCurrent.get(Calendar.DAY_OF_MONTH) + "."));
- // cell.setBorderColorBottom(BaseColor.WHITE);
cell.setBorder(Rectangle.LEFT | Rectangle.RIGHT | Rectangle.TOP);
cell.setBorderWidth(1);
- // cell.setVerticalAlignment(PdfPCell.ALIGN_BOTTOM);
cell.setVerticalAlignment(Element.ALIGN_BOTTOM);
cell.setHorizontalAlignment(Element.ALIGN_CENTER);
- // cell.setGrayFill(value);
datatable.addCell(cell);
datatable.addCell(this.createBoldTextPhrase("BOLUS"));
@@ -226,16 +228,7 @@
else if (j == 2)
{
PdfPCell cell = new PdfPCell();
- // cell.addElement(this.createBoldTextPhrase("1."));
- // cell.setBorderColorBottom(BaseColor.WHITE);
- // cell.setBorderColorTop(BaseColor.WHITE);
- cell.setBorder(Rectangle.LEFT | Rectangle.RIGHT); // | //
- // Rectangle.TOP
- // |
- // Rectangle.BOTTOM);
- // cell.setBorder(1);
- // cell.setBorder(0);
-
+ cell.setBorder(Rectangle.LEFT | Rectangle.RIGHT);
cell.setBorderWidth(1);
cell.setVerticalAlignment(Element.ALIGN_MIDDLE);
cell.setHorizontalAlignment(Element.ALIGN_CENTER);
@@ -251,14 +244,11 @@
// if (j==3)
{
PdfPCell cell = new PdfPCell();
- // cell.addElement(this.createBoldTextPhrase("2014"));
- // cell.setBorderColorTop(BaseColor.WHITE);
cell.setBorder(Rectangle.LEFT | Rectangle.RIGHT | Rectangle.BOTTOM);
cell.setBorderWidth(1);
cell.setVerticalAlignment(Element.ALIGN_TOP);
cell.setHorizontalAlignment(Element.ALIGN_CENTER);
cell.setPhrase(this.createBoldTextPhrase("" + gcCurrent.get(Calendar.YEAR)));
- // cell.setBorder(0);
datatable.addCell(cell);
datatable.addCell(this.createBoldTextPhrase("CH"));
@@ -268,8 +258,26 @@
}
- document.add(datatable);
+ mainTable.addCell(datatable);
+ // comment table
+ PdfPTable tableComment = new PdfPTable(2);
+ tableComment.setWidths(new float[] { 8.0f, 92.0f });
+ tableComment.setWidthPercentage(100);
+ tableComment.getDefaultCell().setBorderWidth(0);
+ tableComment.addCell(this.createBoldTextPhrase(this.i18nControl.getMessage("COMMENT") + ":"));
+ tableComment.addCell(this.createNormalTextPhrase(this.pumpValuesHourProcessor.getFullComment()));
+
+ mainTable.addCell(tableComment);
+
+ // empty line
+ PdfPCell cell = new PdfPCell();
+ cell.setFixedHeight(12);
+ cell.setBorder(0);
+ cell.setPhrase(this.createEmptyTextPhrase());
+
+ mainTable.addCell(cell);
+
}
private void writeHourlyValues(PumpDeviceValueType type, PdfPTable table, DeviceValuesDay deviceValuesDay)
@@ -296,6 +304,11 @@
if (type == PumpDeviceValueType.BASAL)
{
table.addCell(this.createNormalTextPhraseSmall("xx.xx"));
+
+ // sum += pumpValuesHour.getBolus();
+ // table.addCell(this.createNormalTextPhraseSmall(dataAccessPump
+ // .getFormatedBolusValue(pumpValuesHour.getBolus())));
+
}
else
{
@@ -306,38 +319,37 @@
if (type == PumpDeviceValueType.BOLUS)
{
-
if (pumpValuesHour.getBolus() > 0.0f)
{
sum += pumpValuesHour.getBolus();
- table.addCell(this.createNormalTextPhraseSmall(DataAccessPlugInBase.Decimal2Format
- .format(pumpValuesHour.getBolus())));
+ table.addCell(this.createNormalTextPhraseSmall(dataAccessPump
+ .getFormatedBolusValue(pumpValuesHour.getBolus())));
+
+ // FIXME special boluses
+ // pumpValuesHourProcessor.addComments(PumpDeviceValueType.BG,
+ // pumpValuesHour.getMultipleBgs());
+
}
else
{
table.addCell(this.createEmptyTextPhraseSmall());
}
- // float value =
- // pumpValuesHourProcessor.getValueForType(entries,
- // PumpDeviceValueType.BOLUS);
- // table.addCell(this.createNormalTextPhraseSmall(DataAccessPlugInBase.Decimal2Format
- // .format(value)));
}
else if (type == PumpDeviceValueType.BG)
{
- // float value =
- // pumpValuesHourProcessor.getValueForType(entries,
- // PumpDeviceValueType.BG);
-
if (pumpValuesHour.getBgs().size() > 1)
{
- table.addCell(this.createNormalTextPhraseSmall("!!!!"));
+ table.addCell(this.createNormalTextPhraseSmall("*"));
+
+ pumpValuesHourProcessor
+ .addComments(PumpDeviceValueType.BG, pumpValuesHour.getMultipleBgs());
}
else if (pumpValuesHour.getBgs().size() == 1)
{
- sum += pumpValuesHour.getBgProcessedValue();
+ sum += dataAccessPump.getDisplayedBG(pumpValuesHour.getBgProcessedValue());
count++;
+
table.addCell(this.createNormalTextPhraseSmall(dataAccessPump
.getDisplayedBGString(pumpValuesHour.getBgProcessedValue())));
}
@@ -345,8 +357,6 @@
{
table.addCell(this.createEmptyTextPhraseSmall());
}
-
- // table.addCell(this.createNormalTextPhraseSmall(DataAccessPump.Decimal1Format.format(value)));
}
else
{
@@ -361,11 +371,10 @@
{
table.addCell(this.createEmptyTextPhraseSmall());
}
+ }
- // table.addCell(this.createNormalTextPhraseSmall("100"));
- // table.addCell(this.createNormalTextPhraseSmall(DataAccessPlugInBase.Decimal0Format
- // .format(value)));
- }
+ // FIXME add comments
+
}
}
}
@@ -374,14 +383,21 @@
{
if (type == PumpDeviceValueType.BG)
{
- // format
float d = sum / (count * (1.0f));
- table.addCell(this.createNormalTextPhrase("" + d));
+
+ table.addCell(this.createNormalTextPhrase(dataAccessPump.getDisplayedBGString(d)));
}
+ else if (type == PumpDeviceValueType.BASAL)
+ {
+ table.addCell(this.createNormalTextPhrase(dataAccessPump.getFormatedBasalValue(sum)));
+ }
+ else if (type == PumpDeviceValueType.BOLUS)
+ {
+ table.addCell(this.createNormalTextPhrase(dataAccessPump.getFormatedBolusValue(sum)));
+ }
else
{
- // format
- table.addCell(this.createNormalTextPhrase("" + sum));
+ table.addCell(this.createNormalTextPhrase(DataAccessPlugInBase.Decimal0Format.format(sum)));
}
}
@@ -402,139 +418,17 @@
return new Phrase(this.i18nControl.getMessage(text), smallFont);
}
- /*
- * public void fillDocumentBodyCCC(Document document) throws Exception
- * {
- * Font f = this.textFontNormal;
- * PdfPTable datatable = new PdfPTable(getTableColumnsCount());
- * datatable.setWidths(getTableColumnWidths());
- * datatable.setWidthPercentage(100); // percentage
- * datatable.getDefaultCell().setVerticalAlignment(Element.ALIGN_MIDDLE);
- * datatable.getDefaultCell().setHorizontalAlignment(Element.ALIGN_LEFT); //
- * ALIGN_CENTER);
- * datatable.getDefaultCell().setBorderWidth(1);
- * datatable.addCell(this.createBoldTextPhrase("DATE"));
- * datatable.addCell(this.createBoldTextPhrase("TIME"));
- * datatable.addCell(this.createBoldTextPhrase("BASE_TYPE"));
- * datatable.addCell(this.createBoldTextPhrase("SUB_TYPE"));
- * datatable.addCell(this.createBoldTextPhrase("VALUE_SHORT"));
- * datatable.addCell(this.createBoldTextPhrase("OTHER_DATA"));
- * // writeAdditionalHeader(datatable);
- * GregorianCalendar gc_end = deviceValuesRange.getEndGC();
- * gc_end.add(Calendar.DAY_OF_MONTH, 1);
- * GregorianCalendar gc_current = deviceValuesRange.getStartGC();
- * do
- * {
- * ATechDate atd = new
- * ATechDate(da_local.getDataEntryObject().getDateTimeFormat(), gc_current);
- * if (deviceValuesRange.isDayEntryAvailable(atd.getATDateTimeAsLong()))
- * {
- * DeviceValuesDay dvd =
- * deviceValuesRange.getDayEntry(atd.getATDateTimeAsLong());
- * // FIXME fix this
- * datatable.addCell(new Phrase(atd.getDateString(), f));
- * for (int i = 0; i < dvd.getList().size(); i++)
- * {
- * PumpValuesEntry pve = (PumpValuesEntry) dvd.getList().get(i);
- * ATechDate atdx = new
- * ATechDate(da_local.getDataEntryObject().getDateTimeFormat(),
- * pve.getDateTime());
- * if (i != 0)
- * {
- * datatable.addCell(new Phrase("", f));
- * }
- * datatable.addCell(new Phrase(atdx.getTimeString(), f));
- * datatable.addCell(new Phrase(pve.getBaseTypeString(), f));
- * datatable.addCell(new Phrase(pve.getSubTypeString(), f));
- * datatable.addCell(new Phrase(pve.getValue(), f));
- * datatable.addCell(new Phrase(pve
- * .getAdditionalDataPrint(PumpValuesEntry.PRINT_ADDITIONAL_ALL_ENTRIES),
- * f));
- * }
- * }
- * else
- * {
- * datatable.addCell(new Phrase(atd.getDateString(), f));
- * this.writeEmptyColumnData(datatable);
- * }
- * gc_current.add(Calendar.DAY_OF_MONTH, 1);
- * } while (gc_current.before(gc_end));
- * document.add(datatable);
- * // System.out.println("Elements all: " + this.m_data.size() +
- * // " in iterator: " + count);
- * }
- */
-
/**
* {@inheritDoc}
*/
-
- public int[] getTableColumnWidths()
- {
- int headerwidths[] = { 25, 25, 25, 25 }; // percentage
- return headerwidths;
- }
-
- /**
- * {@inheritDoc}
- */
-
- public int getTableColumnsCount()
- {
- return 4;
- }
-
- /**
- * {@inheritDoc}
- */
-
public String getTitleText()
{
- return "PUMP_DATA_EXT";
+ return "PUMP_DATA_DAILY_TIMESHEET";
}
/**
* {@inheritDoc}
*/
-
- public void writeColumnData(PdfPTable table, Object /* DailyFoodEntry */mp) throws Exception
- {
- /*
- * table.addCell(new Phrase("", this.text_normal));
- * table.addCell(new Phrase("", this.text_normal));
- * table.addCell(new Phrase(mp.getName(), this.text_normal));
- * float value = 0.0f;
- * if (mp.getAmountType()==DailyFoodEntry.WEIGHT_TYPE_AMOUNT)
- * {
- * table.addCell(new Phrase(ic.getMessage("AMOUNT_LBL"),
- * this.text_normal));
- * //value = mp.getNutrientValue(205);
- * value = mp.getMealCH();
- * }
- * else if (mp.getAmountType()==DailyFoodEntry.WEIGHT_TYPE_WEIGHT)
- * {
- * table.addCell(new Phrase(ic.getMessage("WEIGHT_LBL2"),
- * this.text_normal));
- * //value = mp.getNutrientValue(205);
- * value = mp.getNutrientValue(205) * (mp.getAmount() / 100.0f);
- * }
- * else
- * {
- * table.addCell(new Phrase(mp.getHomeWeightDescription() + " (" +
- * DataAccess.Decimal0Format.format(mp.getHomeWeightMultiplier() * 100)
- * + " g)", this.text_normal));
- * value = mp.getNutrientValue(205) * mp.getHomeWeightMultiplier();
- * }
- * table.addCell(new Phrase(mp.getAmountSingleDecimalString(),
- * this.text_normal));
- * table.addCell(new Phrase(DataAccess.Decimal2Format.format(value),
- * this.text_normal)); // ch
- */
- }
-
- /**
- * {@inheritDoc}
- */
@Override
public String getFileNameBase()
{
@@ -557,7 +451,6 @@
@Override
public int getTextSize()
{
- // TODO Auto-generated method stub
return 6;
}
Modified: trunk/ggc-pump/src/ggc/pump/util/DataAccessPump.java
===================================================================
--- trunk/ggc-pump/src/ggc/pump/util/DataAccessPump.java 2014-10-09 21:34:52 UTC (rev 1329)
+++ trunk/ggc-pump/src/ggc/pump/util/DataAccessPump.java 2014-10-10 16:59:08 UTC (rev 1330)
@@ -731,7 +731,7 @@
public float getMaxBolusValue()
{
// TODO read from pump
- return 18.0f;
+ return 25.0f;
}
/**
@@ -742,7 +742,7 @@
public float getBasalStep()
{
// TODO read from pump
- return 0.1f;
+ return 0.05f;
}
/**
@@ -767,6 +767,16 @@
}
/**
+ * Get Basal Precision
+ *
+ * @return
+ */
+ public int getBasalPrecision()
+ {
+ return 2;
+ }
+
+ /**
* Create Old Data Reader
*/
@Override
@@ -787,6 +797,17 @@
}
/**
+ * Get Formated Bolus Value
+ *
+ * @param val
+ * @return
+ */
+ public String getFormatedBasalValue(float val)
+ {
+ return this.getDecimalHandler().getDecimalAsString(val, this.getBasalPrecision());
+ }
+
+ /**
* Get Decimal Handler
*
* @return
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2015-10-06 18:08:16
|
Revision: 1368
http://sourceforge.net/p/ggc/code/1368
Author: andyrozman
Date: 2015-10-06 18:08:14 +0000 (Tue, 06 Oct 2015)
Log Message:
-----------
- minor changes
- ggc support - maven repository
Modified Paths:
--------------
trunk/ggc-help/docs/HelpSupportInGGC.doc
trunk/ggc-help/pom.xml
trunk/ggc-master-pom/pom.xml
trunk/ggc-plugin_base/src/ggc/plugin/data/enums/PlugInExceptionType.java
trunk/ggc-pump/src/ggc/pump/data/defs/PumpDeviceDefinition.java
trunk/ggc-pump/src/ggc/pump/data/util/PumpBasalManager.java
trunk/web_page/inc_news.inc
Added Paths:
-----------
trunk/ggc-plugin_base/src/ggc/plugin/device/impl/minimed/enums/
trunk/ggc-plugin_base/src/ggc/plugin/device/impl/minimed/enums/MinimedDeviceType.java
trunk/ggc-support/developers/
Property Changed:
----------------
trunk/
Index: trunk
===================================================================
--- trunk 2015-10-06 18:05:41 UTC (rev 1367)
+++ trunk 2015-10-06 18:08:14 UTC (rev 1368)
Property changes on: trunk
___________________________________________________________________
Modified: svn:ignore
## -1 +1,7 ##
trash
+
+ggc-device-minimed-old
+
+ggc-device-minimed-decode
+
+ggc-device-minimed
Modified: trunk/ggc-help/docs/HelpSupportInGGC.doc
===================================================================
(Binary files differ)
Modified: trunk/ggc-help/pom.xml
===================================================================
--- trunk/ggc-help/pom.xml 2015-10-06 18:05:41 UTC (rev 1367)
+++ trunk/ggc-help/pom.xml 2015-10-06 18:08:14 UTC (rev 1368)
@@ -1,55 +1,48 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>net.sf.ggc</groupId>
- <artifactId>ggc-parent</artifactId>
- <version>1.0-SNAPSHOT</version>
- <relativePath>../ggc-master-pom/pom.xml</relativePath>
- </parent>
+ <parent>
+ <groupId>net.sf.ggc</groupId>
+ <artifactId>ggc-parent</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <relativePath>../ggc-master-pom/pom.xml</relativePath>
+ </parent>
- <name>GGC Help Project</name>
+ <name>GGC Help Project</name>
- <artifactId>ggc-help</artifactId>
- <version>${ggc-help.version}</version>
+ <artifactId>ggc-help</artifactId>
+ <version>${ggc-help.version}</version>
- <build>
- <directory>target</directory>
- <outputDirectory>target/classes</outputDirectory>
- <finalName>${project.artifactId}-${project.version}</finalName>
- <testOutputDirectory>target/test-classes</testOutputDirectory>
- <sourceDirectory>src/main/java</sourceDirectory>
- <scriptSourceDirectory>src/main/resources</scriptSourceDirectory>
- <testSourceDirectory>src/test/java</testSourceDirectory>
- <resources>
- <resource>
- <directory>src/main/resources</directory>
- <filtering>true</filtering>
- <excludes>
- <exclude>**/*.java</exclude>
- </excludes>
- </resource>
- </resources>
- <testResources>
- <testResource>
- <directory>src/test/resources</directory>
- </testResource>
- </testResources>
- </build>
+ <build>
+ <directory>target</directory>
+ <outputDirectory>target/classes</outputDirectory>
+ <finalName>${project.artifactId}-${project.version}</finalName>
+ <testOutputDirectory>target/test-classes</testOutputDirectory>
+ <sourceDirectory>src/main/java</sourceDirectory>
+ <scriptSourceDirectory>src/main/resources</scriptSourceDirectory>
+ <testSourceDirectory>src/test/java</testSourceDirectory>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ <filtering>true</filtering>
+ <excludes>
+ <exclude>**/*.java</exclude>
+ </excludes>
+ </resource>
+ </resources>
+ <testResources>
+ <testResource>
+ <directory>src/test/resources</directory>
+ </testResource>
+ </testResources>
+ </build>
- <dependencies>
- <dependency>
- <groupId>com.atech-software</groupId>
- <artifactId>atech-tools</artifactId>
- </dependency>
-
-
- <dependency>
- <groupId>javax.help</groupId>
- <artifactId>javahelp</artifactId>
- </dependency>
-
- </dependencies>
+ <dependencies>
+ <dependency>
+ <groupId>javax.help</groupId>
+ <artifactId>javahelp</artifactId>
+ </dependency>
+ </dependencies>
</project>
Modified: trunk/ggc-master-pom/pom.xml
===================================================================
--- trunk/ggc-master-pom/pom.xml 2015-10-06 18:05:41 UTC (rev 1367)
+++ trunk/ggc-master-pom/pom.xml 2015-10-06 18:08:14 UTC (rev 1368)
@@ -178,6 +178,17 @@
<groupId>org.hibernate</groupId>
<artifactId>hibernate</artifactId>
<version>${hibernate.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+
+ </exclusions>
</dependency>
<dependency>
@@ -324,27 +335,60 @@
<version>${nrjavaserial-j15.version}</version>
</dependency>
+ <dependency>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ <version>${commons-collections.version}</version>
+ </dependency>
+
+ <!-- slf4j API -->
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>${slf4j.version}</version>
+ </dependency>
+
+ <!--
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>log4j-over-slf4j</artifactId>
+ <version>${slf4j.version}</version>
+ </dependency>
+ -->
+
+ <!-- slf4j over log4j -->
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>${slf4j.version}</version>
+ </dependency>
+
+ <!-- Commons logging over slf4j -->
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
+ <version>${slf4j.version}</version>
+ </dependency>
+
</dependencies>
</dependencyManagement>
<properties>
- <!-- Modules versions -->
- <ggc-core.version>0.6.0-SNAPSHOT</ggc-core.version>
- <ggc-plugin-base.version>0.7.2-SNAPSHOT</ggc-plugin-base.version>
- <ggc-meter-tool.version>2.2.0-SNAPSHOT</ggc-meter-tool.version>
- <ggc-pump-tool.version>1.5.1-SNAPSHOT</ggc-pump-tool.version>
- <ggc-cgms-tool.version>1.3.2-SNAPSHOT</ggc-cgms-tool.version>
- <ggc-nutri-tool.version>1.3.5-SNAPSHOT</ggc-nutri-tool.version>
-
- <ggc-desktop.version>0.6.0-SNAPSHOT</ggc-desktop.version>
+ <!-- GGC Modules versions -->
+ <ggc-core.version>0.6.1-SNAPSHOT</ggc-core.version>
+ <ggc-plugin-base.version>1.0.1-SNAPSHOT</ggc-plugin-base.version>
+ <ggc-meter-tool.version>2.3.0-SNAPSHOT</ggc-meter-tool.version>
+ <ggc-pump-tool.version>1.6.0-SNAPSHOT</ggc-pump-tool.version>
+ <ggc-cgms-tool.version>1.3.3-SNAPSHOT</ggc-cgms-tool.version>
+ <ggc-nutri-tool.version>1.3.6-SNAPSHOT</ggc-nutri-tool.version>
+ <ggc-desktop.version>0.6.1-SNAPSHOT</ggc-desktop.version>
<ggc-help.version>0.2-SNAPSHOT</ggc-help.version>
<!-- NON MAVEN -->
<ggc-little.version>0.2.4-SNAPSHOT</ggc-little.version>
<!-- Dependencies versions -->
- <libusb4jwo.version>0.2</libusb4jwo.version>
<ibm-compapi.version>1.3</ibm-compapi.version>
<skinlf.version>6.7</skinlf.version>
<log4j.version>1.2.16</log4j.version>
@@ -359,23 +403,28 @@
<commons-lang.version>2.6</commons-lang.version>
<javahelp.version>2.0.05</javahelp.version>
- <!-- NEW THIS VERSION -->
+ <!-- NEW THIS VERSION 0.6 -->
<icepdf-core.version>5.0.7</icepdf-core.version>
<icepdf-viewer.version>5.0.7</icepdf-viewer.version>
<jaxen.version>1.1.6</jaxen.version>
<!-- NEW VERSION IN THIS VERSION -->
- <atech-tools.version>0.7.12-SNAPSHOT</atech-tools.version>
+ <atech-tools.version>0.7.13-SNAPSHOT</atech-tools.version>
<jna-j15.version>4.1.0</jna-j15.version>
<hid4java-j15.version>0.3.1</hid4java-j15.version>
<nrjavaserial-j15.version>3.9.3.1</nrjavaserial-j15.version>
+ <commons-collections.version>3.2.1</commons-collections.version>
+ <slf4j.version>1.7.12</slf4j.version>
+ <!-- Changed: CGMS, Core, Meter -->
+
+
<!-- Removed -->
<jna.version>4.1.0-GGC</jna.version>
<nrjavaserial.version>3.9.3-GGC</nrjavaserial.version>
+ <libusb4jwo.version>0.2</libusb4jwo.version>
-
<maven.compiler.source>1.5</maven.compiler.source>
<maven.compiler.target>1.5</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
Modified: trunk/ggc-plugin_base/src/ggc/plugin/data/enums/PlugInExceptionType.java
===================================================================
--- trunk/ggc-plugin_base/src/ggc/plugin/data/enums/PlugInExceptionType.java 2015-10-06 18:05:41 UTC (rev 1367)
+++ trunk/ggc-plugin_base/src/ggc/plugin/data/enums/PlugInExceptionType.java 2015-10-06 18:08:14 UTC (rev 1368)
@@ -48,6 +48,8 @@
TimeoutReadingData("Timeout reading data from device."), //
DeviceErrorWritingToDevice("EXC_RECEIVER_ERROR_WRITING"), //
DeviceNotFound("Device not found."), //
+ ErrorWithDeviceCommunication("Error when communicating with device. Exception: %s"), //
+ ErrorWithDeviceCommunicationDescription("Error when communicating with device [%s]. Exception: %s"), //
// Communication Port
CommunicationPortClosed("Communication Port is closed."), //
Added: trunk/ggc-plugin_base/src/ggc/plugin/device/impl/minimed/enums/MinimedDeviceType.java
===================================================================
--- trunk/ggc-plugin_base/src/ggc/plugin/device/impl/minimed/enums/MinimedDeviceType.java (rev 0)
+++ trunk/ggc-plugin_base/src/ggc/plugin/device/impl/minimed/enums/MinimedDeviceType.java 2015-10-06 18:08:14 UTC (rev 1368)
@@ -0,0 +1,93 @@
+package ggc.plugin.device.impl.minimed.enums;
+
+public enum MinimedDeviceType
+{
+ Unknown_Device, //
+
+ Minimed_508_508c, //
+ Minimed_511, //
+ Minimed_512_712, //
+ Minimed_515_715, //
+ Minimed_522_722, //
+ Minimed_523_723, //
+ Minimed_553_753_Revel, //
+ Minimed_554_754_Veo, //
+ Minimed_640G,
+
+ Minimed_512andHigher(Minimed_512_712, Minimed_515_715, Minimed_522_722, Minimed_523_723, Minimed_553_753_Revel,
+ Minimed_554_754_Veo, Minimed_640G), //
+
+ Minimed_515andHigher(Minimed_515_715, Minimed_522_722, Minimed_523_723, Minimed_553_753_Revel, Minimed_554_754_Veo,
+ Minimed_640G), //
+ Minimed_522andHigher(Minimed_522_722, Minimed_523_723, Minimed_553_753_Revel, Minimed_554_754_Veo, Minimed_640G), //
+ Minimed_523andHigher(Minimed_523_723, Minimed_553_753_Revel, Minimed_554_754_Veo, Minimed_640G), //
+
+ Minimed_553andHigher(Minimed_553_753_Revel, Minimed_554_754_Veo, Minimed_640G), //
+ Minimed_554andHigher(Minimed_554_754_Veo, Minimed_640G), //
+
+ All;
+
+ // static HashMap<String, MinimedDeviceType> deviceTypeToPumpModelMap =
+ // null;
+ private boolean isFamily;
+ private MinimedDeviceType[] familyMembers = null;
+
+ static
+ {
+ // deviceTypeToPumpModelMap = new HashMap<String, MinimedDeviceType>();
+ //
+ // for (MinimedDeviceType adt : values())
+ // {
+ // if ((!adt.isFamily()) &&
+ // (!deviceTypeToPumpModelMap.containsKey(adt.pumpModel)))
+ // {
+ // deviceTypeToPumpModelMap.put(adt.pumpModel, adt);
+ // }
+ // }
+ }
+
+
+ private MinimedDeviceType()
+ {
+ this.isFamily = false;
+ }
+
+
+ private MinimedDeviceType(MinimedDeviceType... familyMembers)
+ {
+ this.familyMembers = familyMembers;
+ this.isFamily = true;
+ }
+
+
+ public static boolean isSameDevice(MinimedDeviceType deviceWeCheck, MinimedDeviceType deviceSources)
+ {
+ if (deviceSources.isFamily)
+ {
+ for (MinimedDeviceType mdt : deviceSources.familyMembers)
+ {
+ if (mdt == deviceWeCheck)
+ return true;
+ }
+ }
+ else
+ {
+ return (deviceWeCheck == deviceSources);
+ }
+
+ return false;
+ }
+
+
+ public boolean isFamily()
+ {
+ return isFamily;
+ }
+
+
+ public MinimedDeviceType[] getFamilyMembers()
+ {
+ return familyMembers;
+ }
+
+}
Property changes on: trunk/ggc-plugin_base/src/ggc/plugin/device/impl/minimed/enums/MinimedDeviceType.java
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Modified: trunk/ggc-pump/src/ggc/pump/data/defs/PumpDeviceDefinition.java
===================================================================
--- trunk/ggc-pump/src/ggc/pump/data/defs/PumpDeviceDefinition.java 2015-10-06 18:05:41 UTC (rev 1367)
+++ trunk/ggc-pump/src/ggc/pump/data/defs/PumpDeviceDefinition.java 2015-10-06 18:08:14 UTC (rev 1368)
@@ -8,6 +8,7 @@
import ggc.plugin.data.enums.DevicePortParameterType;
import ggc.plugin.data.enums.DeviceProgressStatus;
import ggc.plugin.device.impl.animas.enums.AnimasDeviceType;
+import ggc.plugin.device.impl.minimed.enums.MinimedDeviceType;
import ggc.plugin.device.v2.DeviceDefinition;
import ggc.plugin.manager.DeviceImplementationStatus;
import ggc.plugin.protocol.DeviceConnectionProtocol;
@@ -52,27 +53,52 @@
DeviceHandlerType.InsuletOmnipodHandler, DevicePortParameterType.NoParameters,
DeviceConnectionProtocol.FileImport, DeviceProgressStatus.Special, "", 0.1f, 0.05f),
- // Minimed_508_508c(10001, "name", "pic", "instruction", null, ), //
- // Minimed_508c, //
- // Minimed_511, //
- // Minimed_512_712, //
- // // Minimed_712, // 513,
- // // 514
- // Minimed_515_715, //
- // // Minimed_715, //
- // Minimed_522_722, //
- // // Minimed_722, //
- // Minimed_523_723, //
- // // Minimed_723, //
- //
- // Minimed_553_753_Revel, //
- // // Minimed_753, //
- // Minimed_554_754_Veo, //
- // // Minimed_754, //
- // // Minimed_Veo, //
- //
- // Minimed_640G,
+ // Minimed (not done yet)
+ Minimed_508_508c(10001, "name", "pic", "instruction", MinimedDeviceType.Minimed_508_508c,
+ DeviceImplementationStatus.NotPlanned, DeviceCompanyDefinition.Minimed,
+ DeviceHandlerType.MinimedPumpHandler, DevicePortParameterType.PackedParameters,
+ DeviceConnectionProtocol.Serial_USBBridge, DeviceProgressStatus.Special, "", 0.1f, 0.1f), //
+ Minimed_511(10003, "name", "pic", "instruction", MinimedDeviceType.Minimed_511,
+ DeviceImplementationStatus.NotPlanned, DeviceCompanyDefinition.Minimed,
+ DeviceHandlerType.MinimedPumpHandler, DevicePortParameterType.PackedParameters,
+ DeviceConnectionProtocol.Serial_USBBridge, DeviceProgressStatus.Special, "", 0.1f, 0.1f), //
+
+ Minimed_512_712(10004, "name", "pic", "instruction", MinimedDeviceType.Minimed_512_712,
+ DeviceImplementationStatus.NotPlanned, DeviceCompanyDefinition.Minimed,
+ DeviceHandlerType.MinimedPumpHandler, DevicePortParameterType.PackedParameters,
+ DeviceConnectionProtocol.Serial_USBBridge, DeviceProgressStatus.Special, "", 0.1f, 0.1f), //
+
+ Minimed_515_715(10005, "name", "pic", "instruction", MinimedDeviceType.Minimed_515_715,
+ DeviceImplementationStatus.NotPlanned, DeviceCompanyDefinition.Minimed,
+ DeviceHandlerType.MinimedPumpHandler, DevicePortParameterType.PackedParameters,
+ DeviceConnectionProtocol.Serial_USBBridge, DeviceProgressStatus.Special, "", 0.1f, 0.1f), //
+
+ Minimed_522_722(10006, "name", "pic", "instruction", MinimedDeviceType.Minimed_522_722,
+ DeviceImplementationStatus.NotPlanned, DeviceCompanyDefinition.Minimed,
+ DeviceHandlerType.MinimedPumpHandler, DevicePortParameterType.PackedParameters,
+ DeviceConnectionProtocol.Serial_USBBridge, DeviceProgressStatus.Special, "", 0.1f, 0.1f), //
+
+ Minimed_523_723(10007, "name", "pic", "instruction", MinimedDeviceType.Minimed_523_723,
+ DeviceImplementationStatus.NotPlanned, DeviceCompanyDefinition.Minimed,
+ DeviceHandlerType.MinimedPumpHandler, DevicePortParameterType.PackedParameters,
+ DeviceConnectionProtocol.Serial_USBBridge, DeviceProgressStatus.Special, "", 0.1f, 0.1f), //
+
+ Minimed_553_753_Revel(10008, "name", "pic", "instruction", MinimedDeviceType.Minimed_553_753_Revel,
+ DeviceImplementationStatus.NotPlanned, DeviceCompanyDefinition.Minimed,
+ DeviceHandlerType.MinimedPumpHandler, DevicePortParameterType.PackedParameters,
+ DeviceConnectionProtocol.Serial_USBBridge, DeviceProgressStatus.Special, "", 0.1f, 0.1f), //
+
+ Minimed_554_754_Veo(10009, "name", "pic", "instruction", MinimedDeviceType.Minimed_554_754_Veo,
+ DeviceImplementationStatus.NotPlanned, DeviceCompanyDefinition.Minimed,
+ DeviceHandlerType.MinimedPumpHandler, DevicePortParameterType.PackedParameters,
+ DeviceConnectionProtocol.Serial_USBBridge, DeviceProgressStatus.Special, "", 0.1f, 0.1f), //
+
+ Minimed_640G(10010, "name", "pic", "instruction", MinimedDeviceType.Minimed_640G,
+ DeviceImplementationStatus.NotPlanned, DeviceCompanyDefinition.Minimed,
+ DeviceHandlerType.MinimedPumpHandler, DevicePortParameterType.PackedParameters,
+ DeviceConnectionProtocol.Serial_USBBridge, DeviceProgressStatus.Special, "", 0.1f, 0.1f),
+
;
static List<DeviceDefinition> allDevices;
Modified: trunk/ggc-pump/src/ggc/pump/data/util/PumpBasalManager.java
===================================================================
--- trunk/ggc-pump/src/ggc/pump/data/util/PumpBasalManager.java 2015-10-06 18:05:41 UTC (rev 1367)
+++ trunk/ggc-pump/src/ggc/pump/data/util/PumpBasalManager.java 2015-10-06 18:08:14 UTC (rev 1368)
@@ -113,7 +113,8 @@
public Map<String, BasalRatesDayDTO> getBasalRatesForRange(GregorianCalendar from, GregorianCalendar to)
{
- LOG.debug("Get BasalRates For Range: {} - {}", from, to);
+ LOG.debug("Get BasalRates For Range: {} - {}", DataAccessPump.getGregorianCalendarAsDateString(from),
+ DataAccessPump.getGregorianCalendarAsDateString(to));
List<PumpValuesEntry> data = this.dataAccess.getDb().getRangePumpBasalValues(from, to);
return prepareBasalRates(data, from, to);
Modified: trunk/web_page/inc_news.inc
===================================================================
--- trunk/web_page/inc_news.inc 2015-10-06 18:05:41 UTC (rev 1367)
+++ trunk/web_page/inc_news.inc 2015-10-06 18:08:14 UTC (rev 1368)
@@ -6,6 +6,37 @@
<table cellpadding="3" cellspacing="0" align="center" width="100%" summary="" class="container">
<tr class="newsheader">
<td width="150">2014-08-01</td>
+<td>Release 0.6.1</td>
+</tr>
+<tr>
+<td colspan="2">
+You are probably wondering if everything is OK, since new release is already here... And here comes
+the explanation... I planned new release at end of year (I usually try to make 2 releases in year, but
+mostly it happens that there is only one), so I made plan for features and I divided them into simple and hard
+tasks... Simple are tasks that are now in this release, this includes several bug fixes, basal statistics, fixed graphs
+for pump (now we have finally all data displayed... sorry no CGMS in Pump Daily Graph for now) and finally
+implementation of Contour (and Contour Next) meter, which is our first USB Hid Meter supported (this was also main
+reason for this release). <br>
+Now because of this release, it might happen that next release won't be at end of this year, but sometime in
+start of next year (probably february). My plan for this (0.7) release is to prepare support for Minimed Pump. While
+ there are some other tasks to be done, this is my main goal for next release, so when I have this support ready
+ (for ComLink cable and CareLink USB device and for start support will be done only for Pump part, so sorry no
+ CGMS data yet (coming in next release)) you can expect next release. If this is ready by end of year, then you
+ will get release by then, if I encounter some additional problems, then next release will be little later (with help
+ of decoding-carelink project (thanks Ben West) I managed to decode most of data, so everything that I need to do
+ is incorporate this results, with my current Minimed implementation. I hope this to be done in next few weeks
+ (perhaps months)).
+</tr>
+</table>
+
+<br><br>
+
+
+
+
+<table cellpadding="3" cellspacing="0" align="center" width="100%" summary="" class="container">
+<tr class="newsheader">
+<td width="150">2014-08-01</td>
<td>Release 0.6</td>
</tr>
<tr>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2016-02-02 16:39:18
|
Revision: 1392
http://sourceforge.net/p/ggc/code/1392
Author: andyrozman
Date: 2016-02-02 16:39:14 +0000 (Tue, 02 Feb 2016)
Log Message:
-----------
0.7 [2.2.2016] [Andy]
- started implementation of graph v2
- fixing graph v1 and extending it to be used by pump also
- extending hba1c
- moved hibernate files
- refactoring backup a little and Db
- added upgrade stuff
- added connect plugin
- ConfigurationManager changes, added ConfigurationManagerWrapper
- changes to graphs: added GraphViewCGMSDailyAbstract for displaying CGMS data in Daily graphs
- some refactorings because of ConfigurationManager and GGCProperties
- refactoring changing Log to Logger instance
- refactoring use of BG converter
Modified Paths:
--------------
trunk/ggc-core/docs/Changelog
trunk/ggc-core/pom.xml
trunk/ggc-core/src/GGC_New.hbm.xml
trunk/ggc-core/src/GGC_Nutrition.hbm.xml
trunk/ggc-core/src/GGC_Other.hbm.xml
trunk/ggc-core/src/GGC_en.properties
trunk/ggc-core/src/ggc/core/data/DailyValuesRow.java
trunk/ggc-core/src/ggc/core/data/GlucoValues.java
trunk/ggc-core/src/ggc/core/data/HbA1cValues.java
trunk/ggc-core/src/ggc/core/data/cfg/ConfigurationManager.java
trunk/ggc-core/src/ggc/core/data/cfg/ConfigurationManagerWrapper.java
trunk/ggc-core/src/ggc/core/db/GGCDb.java
trunk/ggc-core/src/ggc/core/db/GGCDbLoader.java
trunk/ggc-core/src/ggc/core/db/tool/InitDb.java
trunk/ggc-core/src/ggc/core/db/tool/transfer/BackupDialog.java
trunk/ggc-core/src/ggc/core/db/tool/transfer/ExportNutritionDb.java
trunk/ggc-core/src/ggc/core/db/tool/transfer/GGCBackupRestoreRunner.java
trunk/ggc-core/src/ggc/core/db/tool/transfer/GGCImporter.java
trunk/ggc-core/src/ggc/core/db/tool/transfer/ImportNutrition.java
trunk/ggc-core/src/ggc/core/plugins/GGCPluginType.java
trunk/ggc-core/src/ggc/core/test/ImportDacioDb.java
trunk/ggc-core/src/ggc/core/util/DataAccess.java
trunk/ggc-core/src/ggc/core/util/RefreshInfo.java
Added Paths:
-----------
trunk/ggc-core/src/ggc/core/data/graph/v1/
trunk/ggc-core/src/ggc/core/data/graph/v1/GGCGraphType.java
trunk/ggc-core/src/ggc/core/data/graph/v1/GGCGraphUtil.java
trunk/ggc-core/src/ggc/core/data/graph/v1/data/
trunk/ggc-core/src/ggc/core/data/graph/v1/data/PlotSelectorData.java
trunk/ggc-core/src/ggc/core/data/graph/v1/db/
trunk/ggc-core/src/ggc/core/data/graph/v1/db/GraphV1DbRetriever.java
trunk/ggc-core/src/ggc/core/data/graph/v1/db/GraphV1DbRetrieverCore.java
trunk/ggc-core/src/ggc/core/data/graph/v1/gui/
trunk/ggc-core/src/ggc/core/data/graph/v1/gui/DataPlotSelectorPanel.java
trunk/ggc-core/src/ggc/core/data/graph/v1/gui/GGCGraphViewControler.java
trunk/ggc-core/src/ggc/core/data/graph/v1/gui/HbA1cDialog.java
trunk/ggc-core/src/ggc/core/data/graph/v1/gui/PlotSelectorPanel.java
trunk/ggc-core/src/ggc/core/data/graph/v1/view/
trunk/ggc-core/src/ggc/core/data/graph/v1/view/GraphViewAbstract.java
trunk/ggc-core/src/ggc/core/data/graph/v1/view/GraphViewCGMSDailyAbstract.java
trunk/ggc-core/src/ggc/core/data/graph/v1/view/GraphViewCourse.java
trunk/ggc-core/src/ggc/core/data/graph/v1/view/GraphViewDaily.java
trunk/ggc-core/src/ggc/core/data/graph/v1/view/GraphViewFrequency.java
trunk/ggc-core/src/ggc/core/data/graph/v1/view/GraphViewHbA1c.java
trunk/ggc-core/src/ggc/core/data/graph/v1/view/GraphViewSpread.java
trunk/ggc-core/src/ggc/core/data/graph/v2/GGCGraphValueType.java
trunk/ggc-core/src/ggc/core/data/graph/v2/GGCGraphViewerV2.java
trunk/ggc-core/src/ggc/core/db/hibernate/doc/
trunk/ggc-core/src/ggc/core/db/hibernate/food/
trunk/ggc-core/src/ggc/core/db/hibernate/food/FoodDescriptionH.java
trunk/ggc-core/src/ggc/core/db/hibernate/food/FoodGroupH.java
trunk/ggc-core/src/ggc/core/db/hibernate/food/FoodUserDescriptionH.java
trunk/ggc-core/src/ggc/core/db/hibernate/food/FoodUserGroupH.java
trunk/ggc-core/src/ggc/core/db/hibernate/food/MealGroupH.java
trunk/ggc-core/src/ggc/core/db/hibernate/food/MealH.java
trunk/ggc-core/src/ggc/core/db/hibernate/food/NutritionDefinitionH.java
trunk/ggc-core/src/ggc/core/db/hibernate/food/NutritionHomeWeightTypeH.java
trunk/ggc-core/src/ggc/core/db/hibernate/inet/
trunk/ggc-core/src/ggc/core/db/hibernate/inet/InetGroupH.java
trunk/ggc-core/src/ggc/core/db/hibernate/inet/InetLinkGroupH.java
trunk/ggc-core/src/ggc/core/db/hibernate/inet/InetLinkH.java
trunk/ggc-core/src/ggc/core/db/hibernate/inet/InetTypeH.java
trunk/ggc-core/src/ggc/core/db/hibernate/stocks/
trunk/ggc-core/src/ggc/core/enums/
trunk/ggc-core/src/ggc/core/enums/DbLoadingStatus.java
trunk/ggc-core/src/ggc/core/enums/UpgradeCheckStatus.java
trunk/ggc-core/src/ggc/core/plugins/ConnectPlugIn.java
trunk/ggc-core/src/ggc/core/util/upgrade/
trunk/ggc-core/src/ggc/core/util/upgrade/GGCUpgradeApplicationContext.java
trunk/ggc-core/src/ggc/core/util/upgrade/UpgradeChecker.java
Removed Paths:
-------------
trunk/ggc-core/src/ggc/core/data/graph/DataPlotSelectorPanel.java
trunk/ggc-core/src/ggc/core/data/graph/GGCGraphUtil.java
trunk/ggc-core/src/ggc/core/data/graph/GGCGraphViewControler.java
trunk/ggc-core/src/ggc/core/data/graph/GraphViewCGMSDailyAbstract.java
trunk/ggc-core/src/ggc/core/data/graph/GraphViewCourse.java
trunk/ggc-core/src/ggc/core/data/graph/GraphViewDaily.java
trunk/ggc-core/src/ggc/core/data/graph/GraphViewFrequency.java
trunk/ggc-core/src/ggc/core/data/graph/GraphViewHbA1c.java
trunk/ggc-core/src/ggc/core/data/graph/GraphViewSpread.java
trunk/ggc-core/src/ggc/core/data/graph/PlotSelectorData.java
trunk/ggc-core/src/ggc/core/data/graph/PlotSelectorPanel.java
trunk/ggc-core/src/ggc/core/db/hibernate/FoodDescriptionH.java
trunk/ggc-core/src/ggc/core/db/hibernate/FoodGroupH.java
trunk/ggc-core/src/ggc/core/db/hibernate/FoodUserDescriptionH.java
trunk/ggc-core/src/ggc/core/db/hibernate/FoodUserGroupH.java
trunk/ggc-core/src/ggc/core/db/hibernate/InetGroupH.java
trunk/ggc-core/src/ggc/core/db/hibernate/InetLinkGroupH.java
trunk/ggc-core/src/ggc/core/db/hibernate/InetLinkH.java
trunk/ggc-core/src/ggc/core/db/hibernate/InetTypeH.java
trunk/ggc-core/src/ggc/core/db/hibernate/MealGroupH.java
trunk/ggc-core/src/ggc/core/db/hibernate/MealH.java
trunk/ggc-core/src/ggc/core/db/hibernate/NutritionDefinitionH.java
trunk/ggc-core/src/ggc/core/db/hibernate/NutritionHomeWeightTypeH.java
trunk/ggc-desktop/src/ggc/gui/dialogs/HbA1cDialog.java
Modified: trunk/ggc-core/docs/Changelog
===================================================================
--- trunk/ggc-core/docs/Changelog 2015-12-11 19:16:19 UTC (rev 1391)
+++ trunk/ggc-core/docs/Changelog 2016-02-02 16:39:14 UTC (rev 1392)
@@ -6,13 +6,17 @@
--------------------------------------------------------------------------------------------------
-
-0.6.2 [Andy]
-[12.10.2015]
+0.7 [2.2.2016] [Andy]
+- started implementation of graph v2
+- fixing graph v1 and extending it to be used by pump also
+- extending hba1c
+- moved hibernate files
+- refactoring backup a little and Db
+- added upgrade stuff
+- added connect plugin
- ConfigurationManager changes, added ConfigurationManagerWrapper
- changes to graphs: added GraphViewCGMSDailyAbstract for displaying CGMS data in Daily graphs
- some refactorings because of ConfigurationManager and GGCProperties
-[24.10.2015]
- refactoring changing Log to Logger instance
- refactoring use of BG converter
Modified: trunk/ggc-core/pom.xml
===================================================================
--- trunk/ggc-core/pom.xml 2015-12-11 19:16:19 UTC (rev 1391)
+++ trunk/ggc-core/pom.xml 2016-02-02 16:39:14 UTC (rev 1392)
@@ -115,5 +115,16 @@
<artifactId>commons-collections</artifactId>
</dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>postgresql</groupId>
+ <artifactId>postgresql</artifactId>
+ <version>8.4-702.jdbc3</version>
+ </dependency>
+
</dependencies>
</project>
Modified: trunk/ggc-core/src/GGC_New.hbm.xml
===================================================================
--- trunk/ggc-core/src/GGC_New.hbm.xml 2015-12-11 19:16:19 UTC (rev 1391)
+++ trunk/ggc-core/src/GGC_New.hbm.xml 2016-02-02 16:39:14 UTC (rev 1392)
@@ -2,9 +2,15 @@
<!DOCTYPE hibernate-mapping SYSTEM "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd" >
<hibernate-mapping>
+ <!--
+ Mappings put here and for new functionalities that were not "deployed" yet. This is read only if you start
+ GGC with dev parameter (on development database with correct columns). If you try to use this on production
+ Db you will get exception and GGC won't start.
+ -->
+
<!-- ****************************************** -->
- <!-- *** Stocks **** -->
+ <!-- *** Stocks **** -->
<!-- ****************************************** -->
<!-- Stock types -->
@@ -23,18 +29,18 @@
<id name="id" type="long" unsaved-value="0">
<generator class="org.hibernate.id.AssignedIncrementGenerator"/>
</id>
- <property name="stockTypeId" column="stock_type_id" type="java.lang.Long" />
- <property name="name" type="java.lang.String" length="512" />
- <property name="description" type="java.lang.String" length="2000" />
- <property name="packageContent" column="package_content" type="java.lang.Long" />
- <property name="packageContentUnit" column="package_content_unit" type="java.lang.String" length="100" />
- <property name="usageUnit" column="usage_unit" type="java.lang.Integer" />
- <property name="usageMin" column="usage_min" type="java.lang.Integer" />
- <property name="usageMax" column="usage_max" type="java.lang.Integer" />
- <property name="active" type="java.lang.Boolean" />
- <property name="personId" column="person_id" type="java.lang.Integer" not-null="true" />
- <property name="extended" type="text" />
- <property name="comment" type="java.lang.String" length="2000" />
+ <property name="stockTypeId" column="stock_type_id" type="java.lang.Long"/>
+ <property name="name" type="java.lang.String" length="512"/>
+ <property name="description" type="java.lang.String" length="2000"/>
+ <property name="packageContent" column="package_content" type="java.lang.Long"/>
+ <property name="packageContentUnit" column="package_content_unit" type="java.lang.String" length="100"/>
+ <property name="usageUnit" column="usage_unit" type="java.lang.Integer"/>
+ <property name="usageMin" column="usage_min" type="java.lang.Integer"/>
+ <property name="usageMax" column="usage_max" type="java.lang.Integer"/>
+ <property name="active" type="java.lang.Boolean"/>
+ <property name="personId" column="person_id" type="java.lang.Integer" not-null="true"/>
+ <property name="extended" type="text"/>
+ <property name="comment" type="java.lang.String" length="2000"/>
</class>
<class name="ggc.core.db.hibernate.StockH" table="stock_stocks">
@@ -42,21 +48,21 @@
<generator class="org.hibernate.id.AssignedIncrementGenerator"/>
</id>
-<!-- <property name="stockSubtypeId" column="stock_subtype_id" type="java.lang.Long" /> -->
+ <!-- <property name="stockSubtypeId" column="stock_subtype_id" type="java.lang.Long" /> -->
<many-to-one name="stockSubtype" class="ggc.core.db.hibernate.StockSubTypeH" fetch="select">
- <column name="stock_subtype_id" not-null="true" />
+ <column name="stock_subtype_id" not-null="true"/>
</many-to-one>
- <property name="stocktakingId" column="stocktaking_id" type="java.lang.Long" />
- <property name="amount" type="java.lang.Long" />
- <property name="location" type="java.lang.String" length="1000" />
- <property name="validFrom" column="valid_from" type="java.lang.Long" />
- <property name="validTill" column="valid_till" type="java.lang.Long" />
+ <property name="stocktakingId" column="stocktaking_id" type="java.lang.Long"/>
+ <property name="amount" type="java.lang.Long"/>
+ <property name="location" type="java.lang.String" length="1000"/>
+ <property name="validFrom" column="valid_from" type="java.lang.Long"/>
+ <property name="validTill" column="valid_till" type="java.lang.Long"/>
- <property name="personId" column="person_id" type="java.lang.Integer" not-null="true" />
- <property name="extended" type="text" />
- <property name="comment" type="java.lang.String" length="2000" />
+ <property name="personId" column="person_id" type="java.lang.Integer" not-null="true"/>
+ <property name="extended" type="text"/>
+ <property name="comment" type="java.lang.String" length="2000"/>
</class>
@@ -64,14 +70,18 @@
<id name="id" type="long" unsaved-value="0">
<generator class="org.hibernate.id.AssignedIncrementGenerator"/>
</id>
- <property name="datetime" column="dt_stocktaking" type="java.lang.Long" />
- <property name="description" type="java.lang.String" length="2000" />
+ <property name="datetime" column="dt_stocktaking" type="java.lang.Long"/>
+ <property name="description" type="java.lang.String" length="2000"/>
- <property name="personId" column="person_id" type="java.lang.Integer" not-null="true" />
- <property name="extended" type="text" />
- <property name="comment" type="java.lang.String" length="2000" />
- <property name="changed" type="java.lang.Long" />
+ <property name="personId" column="person_id" type="java.lang.Integer" not-null="true"/>
+ <property name="extended" type="text"/>
+ <property name="comment" type="java.lang.String" length="2000"/>
+ <property name="changed" type="java.lang.Long"/>
</class>
+ <!-- ****************************************** -->
+ <!-- *** Connect **** -->
+ <!-- ****************************************** -->
+
</hibernate-mapping>
\ No newline at end of file
Modified: trunk/ggc-core/src/GGC_Nutrition.hbm.xml
===================================================================
--- trunk/ggc-core/src/GGC_Nutrition.hbm.xml 2015-12-11 19:16:19 UTC (rev 1391)
+++ trunk/ggc-core/src/GGC_Nutrition.hbm.xml 2016-02-02 16:39:14 UTC (rev 1392)
@@ -1,117 +1,112 @@
<?xml version="1.0"?>
<!DOCTYPE hibernate-mapping SYSTEM "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd" >
<hibernate-mapping>
-
+
<!-- ***************** GGC::Nutrition SCHEMA ******************* -->
<!-- Nutrition Definition - Global -->
- <class name="ggc.core.db.hibernate.NutritionDefinitionH" table="nutrition_definition">
+ <class name="ggc.core.db.hibernate.food.NutritionDefinitionH" table="nutrition_definition">
<id name="id" type="long" unsaved-value="0">
<generator class="org.hibernate.id.AssignedIncrementGenerator"/>
- </id>
- <property name="weight_unit" type="string" length="50" />
- <property name="tag" type="string" length="50" />
- <property name="name" type="string" length="100" />
- <property name="decimal_places" type="text" length="10" />
- <property name="static_entry" type="int" />
+ </id>
+ <property name="weight_unit" type="string" length="50"/>
+ <property name="tag" type="string" length="50"/>
+ <property name="name" type="string" length="100"/>
+ <property name="decimal_places" type="text" length="10"/>
+ <property name="static_entry" type="int"/>
</class>
<!-- Nutrition Home Weight Type - Global -->
- <class name="ggc.core.db.hibernate.NutritionHomeWeightTypeH" table="nutrition_home_weight_type">
+ <class name="ggc.core.db.hibernate.food.NutritionHomeWeightTypeH" table="nutrition_home_weight_type">
<id name="id" type="long" unsaved-value="0">
<generator class="org.hibernate.id.AssignedIncrementGenerator"/>
- </id>
- <property name="name" type="string" length="255" />
- <property name="static_entry" type="int" />
+ </id>
+ <property name="name" type="string" length="255"/>
+ <property name="static_entry" type="int"/>
</class>
-
<!-- Food Group - Nutrition 1 -->
- <class name="ggc.core.db.hibernate.FoodGroupH" table="nutrition_usda_food_group">
+ <class name="ggc.core.db.hibernate.food.FoodGroupH" table="nutrition_usda_food_group">
<id name="id" type="long" unsaved-value="0">
<generator class="org.hibernate.id.AssignedIncrementGenerator"/>
- </id>
- <property name="name" type="string" length="255" />
- <property name="name_i18n" type="string" length="255" />
- <property name="description" type="string" length="1000" />
+ </id>
+ <property name="name" type="string" length="255"/>
+ <property name="name_i18n" type="string" length="255"/>
+ <property name="description" type="string" length="1000"/>
</class>
<!-- Food Description - - Nutrition 1-->
- <class name="ggc.core.db.hibernate.FoodDescriptionH" table="nutrition_usda_food_description">
+ <class name="ggc.core.db.hibernate.food.FoodDescriptionH" table="nutrition_usda_food_description">
<id name="id" type="long" unsaved-value="0">
<generator class="org.hibernate.id.AssignedIncrementGenerator"/>
- </id>
- <property name="group_id" type="long" />
- <property name="name" type="string" length="255" />
- <property name="name_i18n" type="string" length="255" />
- <property name="refuse" type="float" />
- <property name="nutritions" type="text" />
- <property name="home_weights" type="text" />
+ </id>
+ <property name="group_id" type="long"/>
+ <property name="name" type="string" length="255"/>
+ <property name="name_i18n" type="string" length="255"/>
+ <property name="refuse" type="float"/>
+ <property name="nutritions" type="text"/>
+ <property name="home_weights" type="text"/>
</class>
<!-- Food Group - Nutrition 2 -->
- <class name="ggc.core.db.hibernate.FoodUserGroupH" table="nutrition_user_food_group">
+ <class name="ggc.core.db.hibernate.food.FoodUserGroupH" table="nutrition_user_food_group">
<id name="id" type="long" unsaved-value="0">
<generator class="org.hibernate.id.AssignedIncrementGenerator"/>
- </id>
- <property name="name" type="string" length="255" />
- <property name="name_i18n" type="string" length="255" />
- <property name="description" type="string" length="1000" />
- <property name="parent_id" type="long" />
- <property name="changed" type="long" not-null="false" />
+ </id>
+ <property name="name" type="string" length="255"/>
+ <property name="name_i18n" type="string" length="255"/>
+ <property name="description" type="string" length="1000"/>
+ <property name="parent_id" type="long"/>
+ <property name="changed" type="long" not-null="false"/>
</class>
<!-- Food Description - - Nutrition 2-->
- <class name="ggc.core.db.hibernate.FoodUserDescriptionH" table="nutrition_user_food_description">
+ <class name="ggc.core.db.hibernate.food.FoodUserDescriptionH" table="nutrition_user_food_description">
<id name="id" type="long" unsaved-value="0">
<generator class="org.hibernate.id.AssignedIncrementGenerator"/>
- </id>
- <property name="group_id" type="long" />
- <property name="name" type="string" length="255" />
- <property name="name_i18n" type="string" length="255" />
- <property name="description" type="string" length="1000" />
- <property name="refuse" type="float" />
- <property name="nutritions" type="text" />
- <property name="home_weights" type="text" />
- <property name="changed" type="long" not-null="false" />
+ </id>
+ <property name="group_id" type="long"/>
+ <property name="name" type="string" length="255"/>
+ <property name="name_i18n" type="string" length="255"/>
+ <property name="description" type="string" length="1000"/>
+ <property name="refuse" type="float"/>
+ <property name="nutritions" type="text"/>
+ <property name="home_weights" type="text"/>
+ <property name="changed" type="long" not-null="false"/>
</class>
-
-
-
-
-
- <class name="ggc.core.db.hibernate.MealGroupH" table="meal_group">
+ <class name="ggc.core.db.hibernate.food.MealGroupH" table="meal_group">
<id name="id" type="long" unsaved-value="0">
<generator class="org.hibernate.id.AssignedIncrementGenerator"/>
- </id>
- <property name="name" type="string" length="255" />
- <property name="name_i18n" type="string" length="255" />
- <property name="description" type="string" length="2000" />
- <property name="parent_id" type="long" />
- <property name="changed" type="long" not-null="false" />
+ </id>
+ <property name="name" type="string" length="255"/>
+ <property name="name_i18n" type="string" length="255"/>
+ <property name="description" type="string" length="2000"/>
+ <property name="parent_id" type="long"/>
+ <property name="changed" type="long" not-null="false"/>
</class>
- <class name="ggc.core.db.hibernate.MealH" table="meal_meal">
+ <class name="ggc.core.db.hibernate.food.MealH" table="meal_meal">
<id name="id" type="long" unsaved-value="0">
<generator class="org.hibernate.id.AssignedIncrementGenerator"/>
- </id>
- <property name="group_id" type="long" />
- <property name="name" type="string" length="255" />
- <property name="name_i18n" type="string" length="255" />
- <property name="description" type="string" length="2000" />
- <property name="parts" type="text" /> <!-- 1:x=1.0;2:y;1:z -->
- <!-- type:id type=[1=Nutrition USDBA, 2=Nutrition User ]; id = id in db -->
- <property name="nutritions" type="text" />
- <property name="extended" type="text" />
- <property name="comment" type="string" length="2000" />
- <property name="changed" type="long" not-null="false" />
+ </id>
+ <property name="group_id" type="long"/>
+ <property name="name" type="string" length="255"/>
+ <property name="name_i18n" type="string" length="255"/>
+ <property name="description" type="string" length="2000"/>
+ <property name="parts" type="text"/>
+ <!-- 1:x=1.0;2:y;1:z -->
+ <!-- type:id type=[1=Nutrition USDBA, 2=Nutrition User ]; id = id in db -->
+ <property name="nutritions" type="text"/>
+ <property name="extended" type="text"/>
+ <property name="comment" type="string" length="2000"/>
+ <property name="changed" type="long" not-null="false"/>
</class>
</hibernate-mapping>
Modified: trunk/ggc-core/src/GGC_Other.hbm.xml
===================================================================
--- trunk/ggc-core/src/GGC_Other.hbm.xml 2015-12-11 19:16:19 UTC (rev 1391)
+++ trunk/ggc-core/src/GGC_Other.hbm.xml 2016-02-02 16:39:14 UTC (rev 1392)
@@ -1,47 +1,47 @@
<?xml version="1.0"?>
<!DOCTYPE hibernate-mapping SYSTEM "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd" >
<hibernate-mapping>
-
+
<!-- ***************** ggc::Other SCHEMA ******************* -->
- <class name="ggc.core.db.hibernate.InetGroupH" table="inet_group">
+ <class name="ggc.core.db.hibernate.inet.InetGroupH" table="inet_group">
<id name="id" type="long" unsaved-value="0">
<generator class="org.hibernate.id.AssignedIncrementGenerator"/>
- </id>
- <property name="parent" type="string" length="255" />
+ </id>
+ <property name="parent" type="string" length="255"/>
- <property name="name" type="string" length="255" />
- <property name="name_i18n" type="string" length="255" />
- <property name="description" type="string" length="2000" />
- <property name="comment" type="string" length="2000" />
+ <property name="name" type="string" length="255"/>
+ <property name="name_i18n" type="string" length="255"/>
+ <property name="description" type="string" length="2000"/>
+ <property name="comment" type="string" length="2000"/>
</class>
- <class name="ggc.core.db.hibernate.InetTypeH" table="inet_type">
+ <class name="ggc.core.db.hibernate.inet.InetTypeH" table="inet_type">
<id name="id" type="long" unsaved-value="0">
<generator class="org.hibernate.id.AssignedIncrementGenerator"/>
- </id>
- <property name="name" type="string" length="255" />
- <property name="name_i18n" type="string" length="255" />
- <property name="description" type="string" length="2000" />
- <property name="comment" type="string" length="2000" />
+ </id>
+ <property name="name" type="string" length="255"/>
+ <property name="name_i18n" type="string" length="255"/>
+ <property name="description" type="string" length="2000"/>
+ <property name="comment" type="string" length="2000"/>
</class>
- <class name="ggc.core.db.hibernate.InetLinkGroupH" table="inet_link_group">
+ <class name="ggc.core.db.hibernate.inet.InetLinkGroupH" table="inet_link_group">
<id name="id" type="long" unsaved-value="0">
<generator class="org.hibernate.id.AssignedIncrementGenerator"/>
- </id>
- <property name="group_id" type="string" length="1000" />
- <property name="link_id" type="string" length="1000" />
+ </id>
+ <property name="group_id" type="string" length="1000"/>
+ <property name="link_id" type="string" length="1000"/>
</class>
- <class name="ggc.core.db.hibernate.InetLinkH" table="inet_link">
+ <class name="ggc.core.db.hibernate.inet.InetLinkH" table="inet_link">
<id name="id" type="long" unsaved-value="0">
<generator class="org.hibernate.id.AssignedIncrementGenerator"/>
- </id>
- <property name="name" type="string" length="1000" />
- <property name="description" type="string" length="2000" />
- <property name="comment" type="string" length="2000" />
+ </id>
+ <property name="name" type="string" length="1000"/>
+ <property name="description" type="string" length="2000"/>
+ <property name="comment" type="string" length="2000"/>
</class>
Modified: trunk/ggc-core/src/GGC_en.properties
===================================================================
--- trunk/ggc-core/src/GGC_en.properties 2015-12-11 19:16:19 UTC (rev 1391)
+++ trunk/ggc-core/src/GGC_en.properties 2016-02-02 16:39:14 UTC (rev 1392)
@@ -94,6 +94,8 @@
LITTLE_EXPRESSIVENESS=Little Expressiveness
STANDARD_EXPRESSIVENESS=Standard Expressiveness
GOOD_EXPRESSIVENESS=Good Expressiveness
+METHOD=Method
+METHOD_NR=Method %s
# !SG! db problem
DB_PROBLEM_NOT_CONNECTED=There was problem connecting to your database. Likely cause of this might be misconfiguration of your database connection and/or missing database driver (JDBC) and/or incorrect database structure.<br>Currently selected configuration is:<br>%s - %s<br>Currently used database driver class:<br> %s
@@ -130,6 +132,7 @@
CLOSE=Close
COURSE_GRAPH=Course Graph
SPREAD_GRAPH=Spread Graph
+FREQUENCY_GRAPH=Frequency Graph
TO_BE_DRAWN=To be drawn
CONNECT_VALUES_FOR_ONE_DAY=Connect Values for One Day
SUM_BU=Sum CH
@@ -178,6 +181,7 @@
ARE_YOU_SURE_DELETE=Are you sure you want to delete this entry?
ARE_YOU_SURE_DELETE_ROW=Are you sure you want to delete this entry?
COPY_TO_CLIPBOARD=Copy To Clipboard
+ITEMS_AXIS=Items / Count
#
# !G! GGC Little (GUI) [2]
@@ -226,10 +230,14 @@
MN_FILE=&File
#MN_BGS=&BGs
MN_DATA=Pen/Injection
+MN_PEN_INJECTION=Pen/Injection
MN_DATA_GRAPH=Graphs
+MN_GRAPHS=Graphs
MN_DOCTOR=&Doctor
MN_FOOD=F&ood
MN_PRINTING=&Printing
+MN_REPORTS_GRAPHS=Reports/Graphs
+#MN_REPORTS=Reports
#MN_METERS=Meters
#MN_PUMPS=Pumps
MN_TOOLS=&Tools
@@ -246,7 +254,7 @@
# !SG! data
MN_DAILY=&Daily Overview
-MN_DAILY_DESC=View Daily Stats
+MN_DAILY_DESC=View Daily Overview
MN_COURSE=Cou&rse
MN_COURSE_DESC=View Course
MN_SPREAD=Spread
@@ -276,7 +284,10 @@
MN_MISC_SYNCHRONIZE=Synchronize
MN_MISC_SYNCHRONIZE_DESC=Synchronization with other GGC instances
+# !SG! misc
+MN_MISC=Misc
+
MN_PREFERENCES=&Preferences
MN_PREFERENCES_DESC=Preferences
@@ -295,8 +306,8 @@
MN_MEALS_DESC=Database of Meals
# !SG! printing
-MN_REPORTS=&Data
-MN_REPORTS_DESC=Reports self-control data
+MN_REPORTS=Reports
+MN_REPORTS_DESC=Reports for Pen/Injection mode
MN_PDF_SIMPLE=Simple
MN_PDF_SIMPLE_DESC=PDF Simple Monthly Report
MN_PDF_EXT=Extended
Modified: trunk/ggc-core/src/ggc/core/data/DailyValuesRow.java
===================================================================
--- trunk/ggc-core/src/ggc/core/data/DailyValuesRow.java 2015-12-11 19:16:19 UTC (rev 1391)
+++ trunk/ggc-core/src/ggc/core/data/DailyValuesRow.java 2016-02-02 16:39:14 UTC (rev 1392)
@@ -413,6 +413,38 @@
}
+ public String getBGAsString(GlucoseUnitType glucoseUnitType)
+ {
+ if (debug)
+ {
+ System.out.println("getBgAsString [type=" + glucoseUnitType.name() + "]");
+ System.out.println("getBgAsString [internal_value=" + this.bg + "]");
+ }
+
+ if (glucoseUnitType == GlucoseUnitType.mmol_L)
+ {
+ float v = m_da.getBGValueByTypeFromDefault(GlucoseUnitType.mmol_L, bg);
+
+ if (debug)
+ {
+ System.out.println("getBgAsString [type=2,return=" + v + "]");
+ }
+
+ return DataAccess.getFloatAsString(v, 1);
+ }
+ else
+ {
+ if (debug)
+ {
+ System.out.println("getBgAsString [type=1,return=" + this.bg + "]");
+ }
+
+ return "" + bg;
+ }
+
+ }
+
+
/**
* Get BG Raw
*
@@ -813,6 +845,12 @@
}
+ public String getBasalInsulinAsString()
+ {
+ return m_da.getDecimalHandler().getDecimalNumberAsString(this.getBasalInsulin(), 1);
+ }
+
+
public float getBolusInsulin()
{
float sum = 0.0f;
@@ -838,6 +876,12 @@
}
+ public String getBolusInsulinAsString()
+ {
+ return m_da.getDecimalHandler().getDecimalNumberAsString(this.getBolusInsulin(), 1);
+ }
+
+
public int getBasalInsulinCount()
{
int count = 0;
Modified: trunk/ggc-core/src/ggc/core/data/GlucoValues.java
===================================================================
--- trunk/ggc-core/src/ggc/core/data/GlucoValues.java 2015-12-11 19:16:19 UTC (rev 1391)
+++ trunk/ggc-core/src/ggc/core/data/GlucoValues.java 2016-02-02 16:39:14 UTC (rev 1392)
@@ -121,6 +121,27 @@
}
+ public GlucoValues(GregorianCalendar sDate, GregorianCalendar eDate, Collection<DailyValuesRow> collection)
+ {
+ sDate.set(Calendar.HOUR_OF_DAY, 0);
+ sDate.set(Calendar.MINUTE, 0);
+ sDate.set(Calendar.SECOND, 0);
+ sDate.setTimeZone(TimeZoneUtil.getInstance().getEmptyTimeZone());
+ from_date = sDate;
+
+ eDate.set(Calendar.HOUR_OF_DAY, 23);
+ eDate.set(Calendar.MINUTE, 59);
+ eDate.set(Calendar.SECOND, 0);
+ eDate.setTimeZone(TimeZoneUtil.getInstance().getEmptyTimeZone());
+ to_date = eDate;
+
+ for (DailyValuesRow dailyValuesRow : collection)
+ {
+ addRow(dailyValuesRow);
+ }
+ }
+
+
/**
* Get Range From
*
@@ -226,7 +247,6 @@
}
}
-
/**
* Set New Row
*
@@ -242,6 +262,7 @@
* }
*/
+
/**
* Save Values
*/
Modified: trunk/ggc-core/src/ggc/core/data/HbA1cValues.java
===================================================================
--- trunk/ggc-core/src/ggc/core/data/HbA1cValues.java 2015-12-11 19:16:19 UTC (rev 1391)
+++ trunk/ggc-core/src/ggc/core/data/HbA1cValues.java 2016-02-02 16:39:14 UTC (rev 1392)
@@ -1,6 +1,7 @@
package ggc.core.data;
import java.util.Enumeration;
+import java.util.GregorianCalendar;
import java.util.Hashtable;
import com.atech.i18n.I18nControlAbstract;
@@ -47,6 +48,7 @@
// private int[] ReadingsPerDay;
private Hashtable<String, DailyValues> m_dataTable = null;
+ GregorianCalendar calendar;
/**
@@ -63,6 +65,14 @@
}
+ public HbA1cValues(GregorianCalendar calendar)
+ {
+ this();
+
+ this.calendar = calendar;
+ }
+
+
/**
* Add Day
*
@@ -384,4 +394,14 @@
* }
*/
}
+
+
+ @Override
+ public String toString()
+ {
+ return "HbA1cValues [" + "sumBG=" + sumBG + //
+ ", readings=" + readings + //
+ ", dayCount=" + dayCount + //
+ ", calendar=" + DataAccess.getInstance().getGregorianCalendarDateAsString(calendar) + ']';
+ }
}
Modified: trunk/ggc-core/src/ggc/core/data/cfg/ConfigurationManager.java
===================================================================
--- trunk/ggc-core/src/ggc/core/data/cfg/ConfigurationManager.java 2015-12-11 19:16:19 UTC (rev 1391)
+++ trunk/ggc-core/src/ggc/core/data/cfg/ConfigurationManager.java 2016-02-02 16:39:14 UTC (rev 1392)
@@ -64,8 +64,11 @@
"PRINT_PDF_VIEWER_PARAMETERS", "", //
"INS3_NAME", "Insulin 3", //
"INS3_ABBR", "Ins3", //
- "RATIO_MODE", "Base" // Base, Extended
- };
+ "RATIO_MODE", "Base", // Base, Extended
+ // Main Window Size
+ "MAIN_WINDOW_SIZE", "800x600",
+ // Graph Viewer Size
+ "GRAPH_VIEWER_SIZE", "640x480", };
private String cfg_int[] = { "METER_TYPE", "0", //
"BG_UNIT", "2", // 1=mg/dl, 2= mmol/l
Modified: trunk/ggc-core/src/ggc/core/data/cfg/ConfigurationManagerWrapper.java
===================================================================
--- trunk/ggc-core/src/ggc/core/data/cfg/ConfigurationManagerWrapper.java 2015-12-11 19:16:19 UTC (rev 1391)
+++ trunk/ggc-core/src/ggc/core/data/cfg/ConfigurationManagerWrapper.java 2016-02-02 16:39:14 UTC (rev 1392)
@@ -1,5 +1,11 @@
package ggc.core.data.cfg;
+import java.awt.*;
+
+import org.apache.commons.lang.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import com.atech.graphics.graphs.GraphConfigProperties;
import ggc.core.data.defs.GlucoseUnitType;
@@ -9,6 +15,7 @@
public class ConfigurationManagerWrapper implements GraphConfigProperties
{
+ private static final Logger LOG = LoggerFactory.getLogger(ConfigurationManagerWrapper.class);
ConfigurationManager configurationManager;
@@ -1251,4 +1258,61 @@
setBooleanValue("USE_CGMS_DATA_IN_DAILY_PEN_DISPLAY", useCGMSDataInPenDailyGraph);
}
+
+ public Dimension getMainWindowSize()
+ {
+ return getDimensionFromParameter("MAIN_WINDOW_SIZE", 800, 600);
+ }
+
+
+ public void setMainWindowSize(Dimension size)
+ {
+ setDimensionToParameter("MAIN_WINDOW_SIZE", size);
+ }
+
+
+ public Dimension getGraphViewerSize()
+ {
+ return getDimensionFromParameter("GRAPH_VIEWER_SIZE", 640, 480);
+ }
+
+
+ public void setGraphViewerSize(Dimension size)
+ {
+ setDimensionToParameter("GRAPH_VIEWER_SIZE", size);
+ }
+
+
+ private void setDimensionToParameter(String parameterKey, Dimension size)
+ {
+
+ StringBuilder sb = new StringBuilder();
+ sb.append((int) size.getWidth());
+ sb.append("x");
+ sb.append((int) size.getHeight());
+
+ setStringValue(parameterKey, sb.toString());
+ }
+
+
+ public Dimension getDimensionFromParameter(String parameterKey, int defaultWidth, int defaultHeight)
+ {
+ String value = getStringValue(parameterKey);
+
+ if (StringUtils.isNotBlank(value))
+ {
+ try
+ {
+ String[] splitStrings = value.split("x");
+ return new Dimension(Integer.parseInt(splitStrings[0]), Integer.parseInt(splitStrings[1]));
+ }
+ catch (NumberFormatException e)
+ {
+ LOG.debug("Undefinied value for Dimension Parameter. {}", value, e);
+ }
+ }
+
+ return new Dimension(defaultWidth, defaultHeight);
+ }
+
}
Deleted: trunk/ggc-core/src/ggc/core/data/graph/DataPlotSelectorPanel.java
===================================================================
--- trunk/ggc-core/src/ggc/core/data/graph/DataPlotSelectorPanel.java 2015-12-11 19:16:19 UTC (rev 1391)
+++ trunk/ggc-core/src/ggc/core/data/graph/DataPlotSelectorPanel.java 2016-02-02 16:39:14 UTC (rev 1392)
@@ -1,558 +0,0 @@
-package ggc.core.data.graph;
-
-import java.awt.*;
-
-import javax.swing.*;
-import javax.swing.event.ChangeEvent;
-import javax.swing.event.ChangeListener;
-
-import com.atech.i18n.I18nControlAbstract;
-
-import ggc.core.data.PlotData;
-import ggc.core.data.ReadablePlotData;
-import ggc.core.data.cfg.ConfigurationManagerWrapper;
-import ggc.core.util.DataAccess;
-
-/**
- * Application: GGC - GNU Gluco Control
- *
- * See AUTHORS for copyright information.
- *
- * This program is free software; you can redistribute it and/or modify it under
- * the terms of the GNU General Public License as published by the Free Software
- * Foundation; either version 2 of the License, or (at your option) any later
- * version.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
- * details.
- *
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc., 59 Temple
- * Place, Suite 330, Boston, MA 02111-1307 USA
- *
- * Filename: DataPlotSelectorPanel
- * Description: A panel containing checkboxes to select the data to be plotted
- * A graphical way (using <code>{@link JCheckBox checkboxes}</code>)
- * to manipulate a <code>{@link PlotData}</code>.
- *
- * @author rumbi
- * @author andy {an...@at...}
- */
-
-public class DataPlotSelectorPanel extends JPanel implements ChangeListener
-{
-
- private static final long serialVersionUID = 6420234465982434157L;
- PlotData data = new PlotData();
- DataAccess dataAccessInstance = DataAccess.getInstance();
- private I18nControlAbstract translator = dataAccessInstance.getI18nControlInstance();
-
- JCheckBox BGBox = new JCheckBox();
- JCheckBox BGDayAvgBox = new JCheckBox();
- JCheckBox BGReadingsBox = new JCheckBox();
-
- JCheckBox CHBox = new JCheckBox();
- JCheckBox CHDayAvgBox = new JCheckBox();
- JCheckBox CHSumBox = new JCheckBox();
-
- JCheckBox ins1Box = new JCheckBox();
- JCheckBox ins1DayAvgBox = new JCheckBox();
- JCheckBox ins1SumBox = new JCheckBox();
-
- JCheckBox ins2Box = new JCheckBox();
- JCheckBox ins2DayAvgBox = new JCheckBox();
- JCheckBox ins2SumBox = new JCheckBox();
-
- JCheckBox insTotalBox = new JCheckBox();
- JCheckBox insTotalDayAvgBox = new JCheckBox();
- JCheckBox insTotalSumBox = new JCheckBox();
-
- JCheckBox insPerCHBox = new JCheckBox();
- JCheckBox mealsBox = new JCheckBox();
-
- ConfigurationManagerWrapper configurationManagerWrapper = dataAccessInstance.getConfigurationManagerWrapper();
-
- /**
- * Mask: BG
- */
- public static final int BG_MASK = 1;
- /**
- * Mask: BG Avg
- */
- public static final int BG_AVG_MASK = 2;
- /**
- * Mask: BG Reading
- */
- public static final int BG_READINGS_MASK = 4;
-
- /**
- * Mask: CH
- */
- public static final int CH_MASK = 8;
- /**
- * Mask: CH Avg
- */
- public static final int CH_AVG_MASK = 16;
- /**
- * Mask: CH Sum
- */
- public static final int CH_SUM_MASK = 32;
-
- /**
- * Mask: Ins1
- */
- public static final int INS1_MASK = 64;
- /**
- * Mask: Ins1 Avg
- */
- public static final int INS1_AVG_MASK = 128;
- /**
- * Mask: Ins1 Sum
- */
- public static final int INS1_SUM_MASK = 256;
-
- /**
- * Mask: Ins2
- */
- public static final int INS2_MASK = 512;
- /**
- * Mask: Ins2 Avg
- */
- public static final int INS2_AVG_MASK = 1024;
- /**
- * Mask: Ins2 Sum
- */
- public static final int INS2_SUM_MASK = 2048;
-
- /**
- * Mask: Ins Total
- */
- public static final int INS_TOTAL_MASK = 4096;
- /**
- * Mask: Ins Total Avg
- */
- public static final int INS_TOTAL_AVG_MASK = 8192;
- /**
- * Mask: Ins Total Sum
- */
- public static final int INS_TOTAL_SUM_MASK = 16384;
-
- /**
- * Mask: Ins/CH
- */
- public static final int INS_PER_CH_MASK = 32768;
-
- /**
- * Mask: Meals
- */
- public static final int MEALS_MASK = 65536;
-
-
- /**
- * Initialises the <code>{@link JPanel panel}</code> with no checkbox
- * selected.
- */
- public DataPlotSelectorPanel()
- {
- this(0);
- }
-
-
- /**
- * Initialises the <code>{@link JPanel panel}</code> with the specified
- * checkboxes selected.<br>
- * <br>
- * Use the <code>*_MASK</code> constants to select the
- * <code>{@link JCheckBox checkboxes}</code>.
- * <code>{@link #INS2_MASK} & {@link #CH_MASK}</code> will apply the action
- * to <code>{@link #ins2Box}</code> and <code>{@link #CHBox}</code>, for
- * example.
- *
- * @param initialSelection
- * A bitmask specifying the checkboxes to be preselected.
- */
- public DataPlotSelectorPanel(int initialSelection)
- {
- super(new GridLayout(4, 5), true);
- setBorder(BorderFactory.createTitledBorder(translator.getMessage("TO_BE_DRAWN") + ":"));
- initBoxes();
- addBoxes();
- selectBoxes(initialSelection, true);
- }
-
-
- private void initBoxes()
- {
- BGBox.setText(translator.getMessage("BG"));
- BGBox.addChangeListener(this);
- BGDayAvgBox.setText(translator.getMessage("AVG_BG_PER_DAY"));
- BGDayAvgBox.addChangeListener(this);
- BGReadingsBox.setText(translator.getMessage("READINGS"));
- BGReadingsBox.addChangeListener(this);
-
- CHBox.setText(translator.getMessage("BU"));
- CHBox.addChangeListener(this);
- CHDayAvgBox.setText(translator.getMessage("AVG_MEAL_SIZE"));
- CHDayAvgBox.addChangeListener(this);
- CHSumBox.setText(translator.getMessage("SUM_BU"));
- CHSumBox.addChangeListener(this);
-
- ins1Box.setText(this.configurationManagerWrapper.getIns1Abbr());
- ins1Box.addChangeListener(this);
- ins1DayAvgBox.setText(translator.getMessage("AVG") + " " + this.configurationManagerWrapper.getIns1Abbr());
- ins1DayAvgBox.addChangeListener(this);
- ins1SumBox.setText(translator.getMessage("SUM") + " " + this.configurationManagerWrapper.getIns1Abbr());
- ins1SumBox.addChangeListener(this);
-
- ins2Box.setText(this.configurationManagerWrapper.getIns2Abbr());
- ins2Box.addChangeListener(this);
- ins2DayAvgBox.setText(translator.getMessage("AVG") + " " + this.configurationManagerWrapper.getIns2Abbr());
- ins2DayAvgBox.addChangeListener(this);
- ins2SumBox.setText(translator.getMessage("SUM") + " " + this.configurationManagerWrapper.getIns2Abbr());
- ins2SumBox.addChangeListener(this);
-
- insTotalBox.setText(translator.getMessage("INSULIN"));
- insTotalBox.addChangeListener(this);
- insTotalDayAvgBox.setText(translator.getMessage("AVG_INS"));
- insTotalDayAvgBox.addChangeListener(this);
- insTotalSumBox.setText(translator.getMessage("SUM_INSULIN"));
- insTotalSumBox.addChangeListener(this);
-
- insPerCHBox.setText(translator.getMessage("INS_SLASH_BU"));
- insPerCHBox.addChangeListener(this);
- mealsBox.setText(translator.getMessage("MEALS"));
- mealsBox.addChangeListener(this);
- }
-
-
- private void addBoxes()
- {
- // columns contain related checkboxes, the last row contains unrelated
- // ones
-
- add(BGBox);
- add(CHBox);
- add(ins1Box);
- add(ins2Box);
- add(insTotalBox);
-
- add(BGDayAvgBox);
- add(CHDayAvgBox);
- add(ins1DayAvgBox);
- add(ins2DayAvgBox);
- add(insTotalDayAvgBox);
-
- add(BGReadingsBox);
- add(CHSumBox);
- add(ins1SumBox);
- add(ins2SumBox);
- add(insTotalSumBox);
-
- add(insPerCHBox);
- add(mealsBox);
- }
-
-
- /**
- * Use the <code>*_MASK</code> constants to select the
- * <code>{@link JCheckBox checkboxes}</code>.
- * <code>{@link #INS2_MASK} & {@link #CH_MASK}</code> will apply the action
- * to <code>{@link #ins2Box}</code> and <code>{@link #CHBox}</code>, for
- * example.
- *
- * @param initialSelection
- * Specifies which <code>{@link JCheckBox checkboxes}</code> to
- * de-/select.
- * @param enable
- * Whether to set or unset the specified
- * <code>{@link JCheckBox checkboxes}</code>.
- */
- public void selectBoxes(int initialSelection, boolean enable)
- {
- if (initialSelection == 0)
- return;
-
- if ((initialSelection & BG_MASK) == BG_MASK)
- {
- BGBox.setSelected(enable);
- }
- if ((initialSelection & BG_AVG_MASK) == BG_AVG_MASK)
- {
- BGDayAvgBox.setSelected(enable);
- }
- if ((initialSelection & BG_READINGS_MASK) == BG_READINGS_MASK)
- {
- BGReadingsBox.setSelected(enable);
- }
-
- if ((initialSelection & CH_MASK) == CH_MASK)
- {
- CHBox.setSelected(enable);
- }
- if ((initialSelection & CH_AVG_MASK) == CH_AVG_MASK)
- {
- CHDayAvgBox.setSelected(enable);
- }
- if ((initialSelection & CH_SUM_MASK) == CH_SUM_MASK)
- {
- CHSumBox.setSelected(enable);
- }
-
- if ((initialSelection & INS1_MASK) == INS1_MASK)
- {
- ins1Box.setSelected(enable);
- }
- if ((initialSelection & INS1_AVG_MASK) == INS1_AVG_MASK)
- {
- ins1DayAvgBox.setSelected(enable);
- }
- if ((initialSelection & INS1_SUM_MASK) == INS1_SUM_MASK)
- {
- ins1SumBox.setSelected(enable);
- }
-
- if ((initialSelection & INS2_MASK) == INS2_MASK)
- {
- ins2Box.setSelected(enable);
- }
- if ((initialSelection & INS2_AVG_MASK) == INS2_AVG_MASK)
- {
- ins2DayAvgBox.setSelected(enable);
- }
- if ((initialSelection & INS2_SUM_MASK) == INS2_SUM_MASK)
- {
- ins2SumBox.setSelected(enable);
- }
-
- if ((initialSelection & INS_TOTAL_MASK) == INS_TOTAL_MASK)
- {
- insTotalBox.setSelected(enable);
- }
- if ((initialSelection & INS_TOTAL_AVG_MASK) == INS_TOTAL_AVG_MASK)
- {
- insTotalDayAvgBox.setSelected(enable);
- }
- if ((initialSelection & INS_TOTAL_SUM_MASK) == INS_TOTAL_SUM_MASK)
- {
- insTotalSumBox.setSelected(enable);
- }
-
- if ((initialSelection & INS_PER_CH_MASK) == INS_PER_CH_MASK)
- {
- insPerCHBox.setSelected(enable);
- }
- if ((initialSelection & MEALS_MASK) == MEALS_MASK)
- {
- mealsBox.setSelected(enable);
- }
- }
-
-
- /**
- * Enables the specified checkboxes.
- *
- * @param choiceMask
- * A bitmask specifying the checkboxes to be enabled.
- */
- public void enableChoice(int choiceMask)
- {
- setChoice(choiceMask, true);
- }
-
-
- /**
- * Disables the specified checkboxes.
- *
- * @param choiceMask
- * A bitmask specifying the checkboxes to be disabled.
- */
- public void disableChoice(int choiceMask)
- {
- setChoice(choiceMask, false);
- }
-
-
- /**
- * Disables or enables the specified checkboxes, depending on the value of
- * <code>enable</code>.
- *
- * @param choiceMask
- * A bitmask specifying the checkboxes to be enabled or disabled.
- * @param enable
- * The checkboxes will be enabled when this is set to
- * <code>true</code> and disabled otherwise.
- */
- public void setChoice(int choiceMask, boolean enable)
- {
- if (choiceMask == 0)
- return;
-
- if ((choiceMask & BG_MASK) == BG_MASK)
- {
- BGBox.setEnabled(enable);
- }
- if ((choiceMask & BG_AVG_MASK) == BG_AVG_MASK)
- {
- BGDayAvgBox.setEnabled(enable);
- }
- if ((choiceMask & BG_READINGS_MASK) == BG_READINGS_MASK)
- {
- BGReadingsBox.setEnabled(enable);
- }
-
- if ((choiceMask & CH_MASK) == CH_MASK)
- {
- CHBox.setEnabled(enable);
- }
- if ((choiceMask & CH_AVG_MASK) == CH_AVG_MASK)
- {
- CHDayAvgBox.setEnabled(enable);
- }
- if ((choiceMask & CH_SUM_MASK) == CH_SUM_MASK)
- {
- CHSumBox.setEnabled(enable);
- }
-
- if ((choiceMask & INS1_MASK) == INS1_MASK)
- {
- ins1Box.setEnabled(enable);
- }
- if ((choiceMask & INS1_AVG_MASK) == INS1_AVG_MASK)
- {
- ins1DayAvgBox.setEnabled(enable);
- }
- if ((choiceMask & INS1_SUM_MASK) == INS1_SUM_MASK)
- {
- ins1SumBox.setEnabled(enable);
- }
-
- if ((choiceMask & INS2_MASK) == INS2_MASK)
- {
- ins2Box.setEnabled(enable);
- }
- if ((choiceMask & INS2_AVG_MASK) == INS2_AVG_MASK)
- {
- ins2DayAvgBox.setEnabled(enable);
- }
- if ((choiceMask & INS2_SUM_MASK) == INS2_SUM_MASK)
- {
- ins2SumBox.setEnabled(enable);
- }
-
- if ((choiceMask & INS_TOTAL_MASK) == INS_TOTAL_MASK)
- {
- insTotalBox.setEnabled(enable);
- }
- if ((choiceMask & INS_TOTAL_AVG_MASK) == INS_TOTAL_AVG_MASK)
- {
- insTotalDayAvgBox.setEnabled(enable);
- }
- if ((choiceMask & INS_TOTAL_SUM_MASK) == INS_TOTAL_SUM_MASK)
- {
- insTotalSumBox.setEnabled(enable);
- }
-
- if ((choiceMask & INS_PER_CH_MASK) == INS_PER_CH_MASK)
- {
- insPerCHBox.setEnabled(enable);
- }
- if ((choiceMask & MEALS_MASK) == MEALS_MASK)
- {
- mealsBox.setEnabled(enable);
- }
- }
-
-
- /**
- * @return Returns the <code>{@link ReadablePlotData}</code> containing
- * information on which kinds of data should be plotted in the
- * graph.
- */
- public ReadablePlotData getPlotData()
- {
- return data;
- }
-
-
- /**
- * State Changed
- *
- * @see javax.swing.event.ChangeListener#stateChanged(javax.swing.event.ChangeEvent)
- */
- public void stateChanged(ChangeEvent e)
- {
-
- if (e.getSource() == BGBox)
- {
- data.setPlotBG(BGBox.isSelected());
- }
- else if (e.getSource() == BGDayAvgBox)
- {
- data.setPlotBGDayAvg(BGDayAvgBox.isSelected());
- }
- else if (e.getSource() == BGReadingsBox)
- {
- data.setPlotBGReadings(BGReadingsBox.isSelected());
- }
- else if (e.getSource() == CHBox)
- {
- data.setPlotCH(CHBox.isSelected());
- }
- else if (e.getSource() == CHDayAvgBox)
- {
- data.setPlotCHDayAvg(CHDayAvgBox.isSelected());
- }
- else if (e.getSource() == CHSumBox)
- {
- data.setPlotCHSum(CHSumBox.isSelected());
- }
- else if (e.getSource() == ins1Box)
- {
- data.setPlotIns1(ins1Box.isSelected());
- }
- else if (e.getSource() == ins1DayAvgBox)
- {
- data.setPlotIns1DayAvg(ins1DayAvgBox.isSelected());
- }
- else if (e.getSource() == ins1SumBox)
- {
- data.setPlotIns1Sum(ins2SumBox.isSelected());
- }
- else if (e.getSource() == ins2Box)
- {
- data.setPlotIns2(ins2Box.isSelected());
- }
- else if (e.getSource() == ins2DayAvgBox)
- {
- data.setPlotIns2DayAvg(ins2DayAvgBox.isSelected());
- }
- else if (e.getSource() == ins2SumBox)
- {
- data.setPlotIns2Sum(ins2SumBox.isSelected());
- }
- else if (e.getSource() == insTotalBox)
- {
- data.setPlotInsTotal(insTotalBox.isSelected());
- }
- else if (e.getSource() == insTotalDayAvgBox)
- {
- data.setPlotInsTotalDayAvg(insTotalDayAvgBox.isSelected());
- }
- else if (e.getSource() == insTotalSumBox)
- {
- data.setPlotInsTotalSum(insTotalSumBox.isSelected());
- }
- else if (e.getSource() == insPerCHBox)
- {
- data.setPlotInsPerCH(insPerCHBox.isSelected());
- }
- else if (e.getSource() == mealsBox)
- {
- data.setPlotMeals(mealsBox.isSelected());
- }
-
- }
-
-}
Deleted: trunk/ggc-core/src/ggc/core/data/graph/GGCGraphUtil.java
===================================================================
--- trunk/ggc-core/src/ggc/core/data/graph/GGCGraphUtil.java 2015-12-11 19:16:19 UTC (rev 1391)
+++ trunk/ggc-core/src/ggc/core/data/graph/GGCGraphUtil.java 2016-02-02 16:39:14 UTC (rev 1392)
@@ -1,228 +0,0 @@
-package ggc.core.data.graph;
-
-import java.awt.*;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.jfree.chart.ChartPanel;
-import org.jfree.chart.JFreeChart;
-import org.jfree.chart.plot.IntervalMarker;
-import org.jfree.chart.plot.XYPlot;
-import org.jfree.ui.Layer;
-
-import com.atech.graphics.graphs.GraphUtil;
-import com.atech.utils.ATDataAccessAbstract;
-
-import ggc.core.data.cfg.ConfigurationManagerWrapper;
-import ggc.core.data.defs.GlucoseUnitType;
-import ggc.core.db.hibernate.ColorSchemeH;
-import ggc.core.util.DataAccess;
-import ggc.core.util.GGCProperties;
-
-/**
- * Application: GGC - GNU Gluco Control
- *
- * See AUTHORS for copyright information.
- *
- * This program is free software; you can redistribute it and/or modify it under
- * the terms of the GNU General Public License as published by the Free Software
- * Foundation; either version 2 of the License, or (at your option) any later
- * version.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
- * details.
- *
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc., 59 Temple
- * Place, Suite 330, Boston, MA 02111-1307 USA
- *
- * Filename: GGCGraphUtil
- * Description: This is utility for creating graphs, it extends abstract GraphUtil
- * It has same function as AbstractGraphView from old framework.
- * Most of parts are copied from Rumbi's JFAbstractGraphView.
- *
- * Author: andyrozman {an...@at...}
- */
-
-public class GGCGraphUtil extends GraphUtil
-{
-
- /**
- * Graph Setting: Background color
- */
- public Color backgroundColor = Color.WHITE;
- // int BGUnit = DataAccess.BG_MGDL;
- JFreeChart chart;
- GGCProperties settings;
-
- ChartPanel chartPanel;
- // DataAccess dataAccessInst = DataAccess.getInstance();
- // GGCProperties settings = dataAccessInst.getSettings();
- ColorSchemeH colorScheme; // = settings.getSelectedColorScheme();
- float maxBG = 200;
- float minBG = 50;
- float BGDiff = maxBG - minBG;
- // RenderingHints renderingHints;
-
- // private I18nControlAbstract m_ic =
- // DataAccess.getInstance().getI18nControlInstance();
-
- String unitLabel; // removed ="mg/dl" to reflect changes made in properties
-
- DataAccess m_da_local;
-
- ConfigurationManagerWrapper configurationManagerWrapper;
- GlucoseUnitType glucoseUnitType;
-
- /**
- * Static instance of Graph Util
- */
- public static Map<ATDataAccessAbstract, GGCGraphUtil> s_graph_util = new HashMap<ATDataAccessAbstract, GGCGraphUtil>();
-
-
- /**
- * Does some basic preparation needed by all graphs. Should be called from
- * all constructors and every subclass.
- */
- private GGCGraphUtil(ATDataAccessAbstract da)
- {
- super(da);
-
- // getRenderingQuality();
- }
-
-
- /**
- * Get Instance (Singelton)
- *
- * @param da
- * @return GGCGraphUtil instance
- */
- public static GGCGraphUtil getInstance(ATDataAccessAbstract da)
- {
- if (!GGCGraphUtil.s_graph_util.containsKey(da))
- {
- GGCGraphUtil gu = new GGCGraphUtil(da);
- s_graph_util.put(da, gu);
- return gu;
- }
-
- return GGCGraphUtil.s_graph_util.get(da);
- }
-
-
- /**
- * Init Local
- *
- * @see com.atech.graphics.graphs.GraphUtil#initLocal()
- */
- @Override
- public void initLocal()
- {
- // System.out.println("GGCGraphUtil");
-
- m_da_local = DataAccess.getInstance();
-
- settings = m_da_local.getSettings(); // DataAccess.getSettings();
-
- colorScheme = settings.getSelectedColorScheme();
- configurationManagerWrapper = m_da_local.getConfigurationManagerWrapper();
- glucoseUnitType = m_da_local.getGlucoseUnitType();
-
- switch (glucoseUnitType)
- {
-
- case mmol_L:
- maxBG = 11.1f;
- minBG = 2.775f;
- unitLabel = "mmol/l";
- break;
-
- case mg_dL:
- case None:
- default:
- maxBG = 200;
- minBG = 50;
- unitLabel = "mg/dl";
- break;
- }
-
- BGDiff = maxBG - minBG;
-
- getRenderingQuality();
-
- }
-
-
- /**
- * Adds <code>{@link IntervalMarker IntervalMarkers}</code> to the passed
- * <code>{@link XYPlot}</code> to highlight the low, target and high BG
- * zones.
- *
- * @param plot
- * The <code>{@link XYPlot}</code> to apply the markers to.
- */
- public void applyMarkers(XYPlot plot)
- {
- if (plot == null)
- return;
-
- IntervalMarker lowBGMarker;
- IntervalMarker targetBGMarker;
-
- // System.out.println("colorScheme: " + this.colorScheme);
- // System.out.println("settings: " + this.settings);
- // System.out.println("m_da_local: " + this.m_da_local);
-
- switch (glucoseUnitType...
[truncated message content] |
|
From: <and...@us...> - 2016-12-25 20:24:37
|
Revision: 1448
http://sourceforge.net/p/ggc/code/1448
Author: andyrozman
Date: 2016-12-25 20:24:34 +0000 (Sun, 25 Dec 2016)
Log Message:
-----------
ggc
- moving files arround
Modified Paths:
--------------
trunk/ggc-support/web_page/inc_doc.inc
trunk/ggc-support/web_page/inc_screenshots.inc
trunk/ggc-support/web_page/inc_screenshots_daily.inc
trunk/ggc-support/web_page/inc_screenshots_graph.inc
trunk/ggc-support/web_page/inc_screenshots_meter_tool.inc
trunk/ggc-support/web_page/inc_screenshots_old.inc
trunk/ggc-support/web_page/inc_screenshots_print.inc
trunk/ggc-support/web_page/inc_screenshots_pump_tool.inc
trunk/ggc-support/web_page/inc_screenshots_tools.inc
Added Paths:
-----------
trunk/ggc-plugins/ggc-connect/
trunk/ggc-plugins/ggc-connect/docs/
trunk/ggc-plugins/ggc-connect/pom.xml
trunk/ggc-plugins/ggc-connect/src/
trunk/ggc-plugins/ggc-connect/src/main/
trunk/ggc-plugins/ggc-connect/src/main/java/
trunk/ggc-plugins/ggc-connect/src/main/java/ggc/
trunk/ggc-plugins/ggc-connect/src/main/java/ggc/connect/
trunk/ggc-plugins/ggc-connect/src/main/java/ggc/connect/TestRun.java
trunk/ggc-plugins/ggc-connect/src/main/java/ggc/connect/db/
trunk/ggc-plugins/ggc-connect/src/main/java/ggc/connect/db/GGCConnectDb.java
trunk/ggc-plugins/ggc-connect/src/main/java/ggc/connect/defs/
trunk/ggc-plugins/ggc-connect/src/main/java/ggc/connect/defs/ConnectPluginDefinition.java
trunk/ggc-plugins/ggc-connect/src/main/java/ggc/connect/plugin/
trunk/ggc-plugins/ggc-connect/src/main/java/ggc/connect/plugin/ConnectPlugInServer.java
trunk/ggc-plugins/ggc-connect/src/main/java/ggc/connect/util/
trunk/ggc-plugins/ggc-connect/src/main/java/ggc/connect/util/DataAccessConnect.java
trunk/ggc-plugins/ggc-connect/src/main/java/ggc/connect/util/GGCConnectICRunner.java
trunk/ggc-plugins/ggc-connect/src/main/resources/
trunk/ggc-plugins/ggc-connect/src/main/resources/GGCConnectTool_en.properties
trunk/ggc-plugins/ggc-connect/src/main/resources/icons/
trunk/ggc-plugins/ggc-connect/src/main/resources/icons/cgms_about.jpg
trunk/ggc-plugins/ggc-connect/src/test/
trunk/ggc-plugins/ggc-connect/src/test/java/
trunk/ggc-plugins/ggc-connect/src/test/resources/
trunk/ggc-support/ggc-support/misc/
trunk/ggc-support/ggc-support/misc/deps.txt
trunk/ggc-support/ggc-support/misc/deps_full.txt
trunk/ggc-support/ggc-support/misc/full_list.txt
trunk/ggc-support/ggc-support/misc/list.txt
trunk/ggc-support/ggc-support/misc/test_create.xml
trunk/ggc-support/ggc-test/test_data/
trunk/ggc-support/ggc-test/test_data/130044267-2015-01-16-23-43-29.ibf
trunk/ggc-support/ggc-test/test_data/130113444-2015-05-22-18-59-58.ibf
trunk/ggc-support/ggc-test/test_data/20006422-2009-09-17-23-09-07.ibf
trunk/ggc-support/ggc-test/test_data/G0351342.XML
trunk/ggc-support/ggc-test/test_data/I0026117_2303_2010_B.XML
trunk/ggc-support/ggc-test/test_data/I1026739.XML
trunk/ggc-support/ggc-test/test_data/report-130113444-2015-05-22-18-59-58.pdf
trunk/ggc-support/ggc-test/test_data/report.pdf
trunk/ggc-support/web_page/
Removed Paths:
-------------
trunk/web_page/
Added: trunk/ggc-plugins/ggc-connect/pom.xml
===================================================================
--- trunk/ggc-plugins/ggc-connect/pom.xml (rev 0)
+++ trunk/ggc-plugins/ggc-connect/pom.xml 2016-12-25 20:24:34 UTC (rev 1448)
@@ -0,0 +1,88 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>net.sf.ggc</groupId>
+ <artifactId>ggc-parent</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <relativePath>../ggc-master-pom/pom.xml</relativePath>
+ </parent>
+
+ <groupId>net.sf.ggc</groupId>
+ <name>GGC Connect Tool Project</name>
+
+ <description>Plugin to connect to other software (import/export) of our data into foreign systems.</description>
+
+ <artifactId>ggc-connect-tool</artifactId>
+ <version>${ggc-connect-tool.version}</version>
+
+
+ <build>
+ <directory>target</directory>
+ <outputDirectory>target/classes</outputDirectory>
+ <finalName>${project.artifactId}-${project.version}</finalName>
+ <testOutputDirectory>target/test-classes</testOutputDirectory>
+ <sourceDirectory>src/main/java</sourceDirectory>
+ <!-- <scriptSourceDirectory>src/main/scripts</scriptSourceDirectory> -->
+
+
+ <testSourceDirectory>src/test/java</testSourceDirectory>
+ <resources>
+ <resource>
+ <directory>src</directory>
+ <filtering>true</filtering>
+ <excludes>
+ <exclude>**/*.java</exclude>
+ </excludes>
+ </resource>
+ </resources>
+ <testResources>
+ <testResource>
+ <directory>src/test/resources</directory>
+ </testResource>
+ </testResources>
+ </build>
+
+ <dependencies>
+ <dependency>
+ <groupId>net.sf.ggc</groupId>
+ <artifactId>ggc-core</artifactId>
+ </dependency>
+
+
+ <dependency>
+ <groupId>com.atech-software</groupId>
+ <artifactId>atech-tools</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>net.sf.ggc</groupId>
+ <artifactId>ggc-plugin-base</artifactId>
+ </dependency>
+
+
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <!-- <version>4.11</version> -->
+ <!-- <scope>test</scope> -->
+ </dependency>
+
+ <!-- Testing only -->
+ <dependency>
+ <groupId>postgresql</groupId>
+ <artifactId>postgresql</artifactId>
+ <version>8.4-702.jdbc3</version>
+ </dependency>
+
+
+ </dependencies>
+
+ <properties>
+
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+
+ </properties>
+
+</project>
Added: trunk/ggc-plugins/ggc-connect/src/main/java/ggc/connect/TestRun.java
===================================================================
--- trunk/ggc-plugins/ggc-connect/src/main/java/ggc/connect/TestRun.java (rev 0)
+++ trunk/ggc-plugins/ggc-connect/src/main/java/ggc/connect/TestRun.java 2016-12-25 20:24:34 UTC (rev 1448)
@@ -0,0 +1,36 @@
+package ggc.connect;
+
+import java.io.FileWriter;
+import java.io.IOException;
+
+import com.atech.utils.ATDataAccessAbstract;
+
+/**
+ * Created by andy on 30/04/16.
+ */
+public class TestRun
+{
+
+ public static void main(String[] args)
+ {
+ try
+ {
+
+ FileWriter fw = new FileWriter("/home/andy/tt.txt");
+
+ for (int i = 1; i < 900; i++)
+ {
+ fw.write(" " + ATDataAccessAbstract.getLeadingZero(i, 3) + "\n");
+ }
+
+ fw.flush();
+ fw.close();
+
+ }
+ catch (IOException e)
+ {
+ e.printStackTrace();
+ }
+ }
+
+}
Added: trunk/ggc-plugins/ggc-connect/src/main/java/ggc/connect/db/GGCConnectDb.java
===================================================================
--- trunk/ggc-plugins/ggc-connect/src/main/java/ggc/connect/db/GGCConnectDb.java (rev 0)
+++ trunk/ggc-plugins/ggc-connect/src/main/java/ggc/connect/db/GGCConnectDb.java 2016-12-25 20:24:34 UTC (rev 1448)
@@ -0,0 +1,177 @@
+package ggc.connect.db;
+
+import java.util.GregorianCalendar;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.atech.db.hibernate.HibernateDb;
+import com.atech.graphics.graphs.v2.data.GraphDefinitionDto;
+import com.atech.graphics.graphs.v2.data.GraphTimeDataCollection;
+
+import ggc.connect.util.DataAccessConnect;
+import ggc.plugin.db.PluginDb;
+
+/**
+ * Application: GGC - GNU Gluco Control
+ * Plug-in: Connect Tool (support for import/export of data to 3rd party systems)
+ *
+ * See AUTHORS for copyright information.
+ *
+ * This program is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by the Free Software
+ * Foundation; either version 2 of the License, or (at your option) any later
+ * version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc., 59 Temple
+ * Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Filename: GGCConnectDb
+ * Description: Db Instance
+ *
+ * Author: Andy {an...@at...}
+ */
+
+public class GGCConnectDb extends PluginDb // implements GraphDbDataRetriever
+{
+
+ private static final Logger LOG = LoggerFactory.getLogger(GGCConnectDb.class);
+ DataAccessConnect m_da = DataAccessConnect.getInstance();
+
+
+ /**
+ * Constructor
+ *
+ * @param db
+ */
+ public GGCConnectDb(HibernateDb db)
+ {
+ super(db);
+ LOG.debug("Created GGCConnectDb");
+ // getAllElementsCount();
+ }
+
+
+ public GraphTimeDataCollection getGraphTimeData(GregorianCalendar gcFrom, GregorianCalendar gcTill,
+ GraphDefinitionDto definitionDto)
+ {
+ return null;
+ }
+
+ // /**
+ // * Get Daily Pump Values
+ // *
+ // * @param gc
+ // * @return
+ // */
+ // public DeviceValuesDay getDailyCGMSValues(GregorianCalendar gc)
+ // {
+ // LOG.info("getDailyCGMSValues()");
+ //
+ // long dt = ATechDate.getATDateTimeFromGC(gc, ATechDateType.DateOnly);
+ // // long dt = 20070323;
+ //
+ // DeviceValuesDay dV = new DeviceValuesDay(dataAccess);
+ // dV.setDateTimeGC(gc);
+ //
+ // String sql = "";
+ //
+ // try
+ // {
+ // sql = "SELECT dv from ggc.core.db.hibernate.cgms.CGMSDataH as dv WHERE
+ // dv.dt_info = " + dt
+ // + " ORDER BY dv.dt_info ";
+ // // + "000000 AND dv.dt_info <= " + dt +
+ // // "235959 ORDER BY dv.dt_info";
+ //
+ // Query q = this.db.getSession().createQuery(sql);
+ //
+ // Iterator<?> it = q.list().iterator();
+ //
+ // while (it.hasNext())
+ // {
+ // CGMSDataH pdh = (CGMSDataH) it.next();
+ // CGMSValuesEntry dv = new CGMSValuesEntry(pdh);
+ //
+ // dV.addList(dv.getSubEntryList());
+ // }
+ //
+ // }
+ // catch (Exception ex)
+ // {
+ // LOG.debug("Sql: " + sql);
+ // LOG.error("getCGMSStats(). Exception: " + ex, ex);
+ // }
+ //
+ // return dV;
+ //
+ // // return null;
+ // }
+
+ // /**
+ // * Get All Elements Count
+ // *
+ // * @return
+ // */
+ // public int getAllElementsCount()
+ // {
+ // Integer in = null;
+ // int sum_all = 0;
+ //
+ // Criteria criteria = this.getSession().createCriteria(CGMSDataH.class);
+ // criteria.add(Restrictions.eq("person_id", (int)
+ // dataAccess.getCurrentUserId()));
+ // criteria.setProjection(Projections.rowCount());
+ // in = (Integer) criteria.list().get(0);
+ // sum_all = in.intValue();
+ //
+ // return sum_all;
+ // }
+ //
+
+ // public GraphTimeDataCollection getGraphTimeData(GregorianCalendar gcFrom,
+ // GregorianCalendar gcTill,
+ // GraphDefinitionDto definitionDto)
+ // {
+ // // TODO types, for now we get only glucose data
+ //
+ // GraphTimeDataCollection collection = new GraphTimeDataCollection();
+ //
+ // List<ATechDate> dates = dataAccess.getDatesList(gcFrom, gcTill, true);
+ //
+ // Criteria criteria = null;
+ //
+ // try
+ // {
+ // criteria = getSession().createCriteria(CGMSDataH.class)
+ // .add(Restrictions.eq("person_id", (int) dataAccess.getCurrentUserId()))
+ // .add(Restrictions.eq("base_type", 1))
+ // .add(Restrictions.and(Restrictions.ge("dt_info",
+ // dates.get(0).getATDateTimeAsLong()),
+ // Restrictions.le("dt_info", dates.get(1).getATDateTimeAsLong())));
+ //
+ // for (Object cgg : criteria.list())
+ // {
+ // CGMSDataH pdh = (CGMSDataH) cgg;
+ // CGMSValuesEntry dv = new CGMSValuesEntry(pdh);
+ //
+ // collection.put(dv.getDateTimeObject().getATDateTimeAsLong(),
+ // dv.getGraphSubEntryList());
+ // }
+ //
+ // }
+ // catch (Exception ex)
+ // {
+ // LOG.debug("Criteria: " + criteria);
+ // LOG.error("getGraphTimeData(). Exception: " + ex, ex);
+ // }
+ //
+ // return collection;
+ // }
+}
Added: trunk/ggc-plugins/ggc-connect/src/main/java/ggc/connect/defs/ConnectPluginDefinition.java
===================================================================
--- trunk/ggc-plugins/ggc-connect/src/main/java/ggc/connect/defs/ConnectPluginDefinition.java (rev 0)
+++ trunk/ggc-plugins/ggc-connect/src/main/java/ggc/connect/defs/ConnectPluginDefinition.java 2016-12-25 20:24:34 UTC (rev 1448)
@@ -0,0 +1,217 @@
+package ggc.connect.defs;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+import com.atech.app.data.about.CreditsEntry;
+import com.atech.app.data.about.CreditsGroup;
+import com.atech.app.data.about.FeaturesEntry;
+import com.atech.app.data.about.LibraryInfoEntry;
+import com.atech.i18n.mgr.LanguageManager;
+
+import ggc.connect.util.GGCConnectICRunner;
+import ggc.core.plugins.GGCPluginType;
+import ggc.plugin.defs.DevicePluginDefinitionAbstract;
+import ggc.plugin.graph.PluginGraphDefinition;
+import ggc.plugin.list.BaseListEntry;
+import ggc.plugin.report.PluginReportDefinition;
+
+/**
+ * Application: GGC - GNU Gluco Control
+ * Plug-in: CGMS Tool (support for CGMS devices)
+ *
+ * See AUTHORS for copyright information.
+ *
+ * This program is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by the Free Software
+ * Foundation; either version 2 of the License, or (at your option) any later
+ * version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc., 59 Temple
+ * Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Filename: CGMSPluginDefinition
+ * Description: CGMS PlugIn Definition
+ *
+ * Author: Andy {an...@at...}
+ */
+
+public class ConnectPluginDefinition extends DevicePluginDefinitionAbstract
+{
+
+ String PLUGIN_VERSION = "0.1.0";
+ String PLUGIN_NAME = "GGC Connect Plugin";
+
+
+ public ConnectPluginDefinition(LanguageManager languageManager)
+ {
+ super(languageManager, new GGCConnectICRunner());
+ }
+
+
+ public int getCopyrightFrom()
+ {
+ return 2016;
+ }
+
+
+ public String getAboutImagePath()
+ {
+ // FIXME
+ return "/icons/cgms_about.jpg";
+ }
+
+
+ public int[] getAboutImageSize()
+ {
+ int[] sz = new int[2];
+ sz[0] = 400;
+ sz[1] = 203;
+
+ return sz;
+ }
+
+
+ @Override
+ public List<LibraryInfoEntry> getPluginLibraries()
+ {
+ return null;
+ }
+
+
+ public List<CreditsGroup> getCredits()
+ {
+ CreditsGroup cg = new CreditsGroup(this.i18nControl.getMessage("DEVELOPERS_DESC"));
+ cg.addCreditsEntry(
+ new CreditsEntry("Aleksander Rozman (Andy)", "an...@at...", "Framework, About."));
+
+ return Arrays.asList(cg);
+ }
+
+
+ public List<FeaturesEntry> getImplementedFeatures()
+ {
+ List<FeaturesEntry> outList = new ArrayList<FeaturesEntry>();
+
+ outList.add(new FeaturesEntry("Base Connect Framework"));
+
+ return outList;
+ }
+
+
+ public List<FeaturesEntry> getNotImplementedFeatures()
+ {
+ List<FeaturesEntry> outList = new ArrayList<FeaturesEntry>();
+
+ outList.add(new FeaturesEntry("Configuration"));
+ outList.add(new FeaturesEntry("About dialog"));
+
+ return outList;
+ }
+
+
+ public List<FeaturesEntry> getSupportedDevices()
+ {
+ List<FeaturesEntry> outList = new ArrayList<FeaturesEntry>();
+
+ return outList;
+ }
+
+
+ public List<FeaturesEntry> getPlannedDevices()
+ {
+ List<FeaturesEntry> outList = new ArrayList<FeaturesEntry>();
+
+ outList.add(new FeaturesEntry("SiDiary (2016)"));
+ outList.add(new FeaturesEntry("MS Health (2016-17)"));
+
+ return outList;
+ }
+
+
+ public String getPluginVersion()
+ {
+ return this.PLUGIN_VERSION;
+ }
+
+
+ /**
+ * Get Name of Plugin (for internal use)
+ *
+ * @return
+ */
+ public String getPluginName()
+ {
+ return this.PLUGIN_NAME;
+ }
+
+
+ public GGCPluginType getPluginType()
+ {
+ return GGCPluginType.ConnectToolPlugin;
+ }
+
+
+ @Override
+ public List<BaseListEntry> getWebListerItems()
+ {
+ return null;
+ }
+
+
+ @Override
+ public String getWebListerDescription()
+ {
+ return this.i18nControl.getMessage("DEVICE_LIST_WEB_DESC");
+ }
+
+
+ @Override
+ public PluginReportDefinition getReportsDefinition()
+ {
+ // if (reportsCGMSDefinition == null)
+ // {
+ // this.reportsCGMSDefinition = new
+ // CGMSReportDefinition((DataAccessCGMS) this.dataAccess);
+ // }
+ //
+ // return reportsCGMSDefinition;
+
+ return null;
+ }
+
+
+ @Override
+ public PluginGraphDefinition getGraphsDefinition()
+ {
+ // if (graphsCGMSDefintion == null)
+ // {
+ // this.graphsCGMSDefintion = new CGMSGraphDefintion((DataAccessCGMS)
+ // this.dataAccess);
+ // }
+ //
+ // return graphsCGMSDefintion;
+ return null;
+ }
+
+
+ @Override
+ public String getPluginActionsPrefix()
+ {
+ return "connect_";
+ }
+
+
+ @Override
+ public void registerDeviceHandlers()
+ {
+ }
+
+}
Added: trunk/ggc-plugins/ggc-connect/src/main/java/ggc/connect/plugin/ConnectPlugInServer.java
===================================================================
--- trunk/ggc-plugins/ggc-connect/src/main/java/ggc/connect/plugin/ConnectPlugInServer.java (rev 0)
+++ trunk/ggc-plugins/ggc-connect/src/main/java/ggc/connect/plugin/ConnectPlugInServer.java 2016-12-25 20:24:34 UTC (rev 1448)
@@ -0,0 +1,351 @@
+package ggc.connect.plugin;
+
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.List;
+import java.util.Map;
+
+import javax.swing.*;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.atech.db.hibernate.transfer.BackupRestoreCollection;
+import com.atech.plugin.BackupRestorePlugin;
+import com.atech.utils.ATDataAccessLMAbstract;
+import com.atech.utils.ATSwingUtils;
+
+import ggc.connect.defs.ConnectPluginDefinition;
+import ggc.connect.util.DataAccessConnect;
+import ggc.core.util.DataAccess;
+import ggc.plugin.DevicePlugInServer;
+import ggc.plugin.util.DataAccessPlugInBase;
+
+/**
+ * Application: GGC - GNU Gluco Control
+ * Plug-in: CGMS Tool (support for CGMS devices)
+ *
+ * See AUTHORS for copyright information.
+ *
+ * This program is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by the Free Software
+ * Foundation; either version 2 of the License, or (at your option) any later
+ * version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc., 59 Temple
+ * Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Filename: CGMPlugInServer
+ * Description: This is server side of plugin architecture
+ *
+ * Author: Andy {an...@at...}
+ */
+
+public class ConnectPlugInServer extends DevicePlugInServer implements ActionListener
+{
+
+ private static final Logger LOG = LoggerFactory.getLogger(ConnectPlugInServer.class);
+
+ /**
+ * Return Object: Selected Device with parameters
+ */
+ public static final int RETURN_OBJECT_DEVICE_WITH_PARAMS = 1;
+
+ /**
+ * This is action that needs to be done, after read data.
+ */
+ public static final int RETURN_ACTION_READ_DATA = 1;
+
+ /**
+ * This is action that needs to be done, after config
+ */
+ public static final int RETURN_ACTION_CONFIG = 2;
+
+ // private String commands[] = { "MN_CGMS_READ_DESC", "MN_CGMS_LIST_DESC",
+ // "MN_CGMS_CONFIG_DESC", "MN_CGMS_ABOUT_DESC" };
+
+ DataAccessConnect dataAccessConnect;
+ private JMenuItem[] menus = new JMenuItem[3];
+
+
+ /**
+ * Constructor
+ */
+ public ConnectPlugInServer()
+ {
+ super();
+ }
+
+
+ /**
+ * Constructor
+ *
+ * @param cont
+ * @param da
+ */
+ public ConnectPlugInServer(Container cont, ATDataAccessLMAbstract da)
+ {
+ super(cont, da);
+
+ dataAccessConnect = DataAccessConnect.createInstance(getPluginDefinition(da));
+ dataAccessConnect.addComponent(cont);
+ }
+
+
+ /**
+ * {@inheritDoc}
+ */
+ private ConnectPluginDefinition getPluginDefinition(ATDataAccessLMAbstract da)
+ {
+ return new ConnectPluginDefinition(da.getLanguageManager());
+ }
+
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public String getName()
+ {
+ return ic.getMessage("CONNECT_PLUGIN");
+ }
+
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public String getVersion()
+ {
+ return dataAccessConnect.getPlugInVersion();
+ }
+
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public void initPlugIn()
+ {
+ ic = dataAccess.getI18nControlInstance();
+
+ if (dataAccessConnect == null)
+ {
+ dataAccessConnect = DataAccessConnect
+ .createInstance(getPluginDefinition((ATDataAccessLMAbstract) dataAccess));
+ }
+
+ this.initPlugInServer((DataAccess) dataAccess, dataAccessConnect);
+
+ // this.backup_restore_enabled = (this.backupRestoreCollection != null);
+
+ this.installed = true;
+ }
+
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public Object getReturnObject(int ret_obj_id)
+ {
+ return null;
+ }
+
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public Object getReturnObject(int ret_obj_id, Object[] parameters)
+ {
+ return null;
+ }
+
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public BackupRestoreCollection getBackupObjects()
+ {
+ return null;
+ }
+
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public JMenu getPlugInMainMenu()
+ {
+
+ JMenu menuConnect = ATSwingUtils.createMenu("MN_CONNECT", null, ic_local);
+
+ // JMenu menu_cgms = ATSwingUtils.createMenu("MN_CGMS", null, ic_local);
+ //
+ // JMenuItem menu = ATSwingUtils.createMenuItem(menu_cgms,
+ // "MN_CGMS_READ", //
+ // "MN_CGMS_READ_DESC", "plugin_read_data", //
+ // this, null, ic_local, DataAccessCGMS.getInstance(), parent);
+ //
+ // menus[0] = menu;
+ // menus[0].setEnabled(
+ // DownloadSupportType.isOptionSet(dataAccessConnect.getDownloadStatus(),
+ // DownloadSupportType.DownloadData));
+ //
+ // menu = ATSwingUtils.createMenuItem(menu_cgms, "MN_CGMS_READ_CONFIG",
+ // //
+ // "MN_CGMS_READ_CONFIG_DESC", "plugin_read_config", //
+ // this, null, ic_local, DataAccessCGMS.getInstance(), parent);
+ //
+ // menus[1] = menu;
+ // menus[1].setEnabled(DownloadSupportType.isOptionSet(dataAccessConnect.getDownloadStatus(),
+ // DownloadSupportType.Download_Data_Config));
+ //
+ // menu = ATSwingUtils.createMenuItem(menu_cgms, "MN_CGMS_READ_FILE", //
+ // "MN_CGMS_READ_FILE_DESC", "plugin_read_data_file", //
+ // this, null, ic_local, DataAccessCGMS.getInstance(), parent);
+ //
+ // menus[2] = menu;
+ // menus[2].setEnabled(DownloadSupportType.isOptionSet(dataAccessConnect.getDownloadStatus(),
+ // DownloadSupportType.DownloadDataFile));
+ //
+ // menu_cgms.addSeparator();
+ //
+ // ATSwingUtils.createMenuItem(menu_cgms, "MN_CGMS_VIEW_DATA", //
+ // "MN_CGMS_VIEW_DATA_DESC", "cgms_view_data", //
+ // this, null, ic_local, DataAccessCGMS.getInstance(), parent);
+ //
+ // menu_cgms.addSeparator();
+ //
+ // ATSwingUtils.createMenuItem(menu_cgms, "MN_CGMS_LIST", //
+ // "MN_CGMS_LIST_DESC", "plugin_list", //
+ // this, null, ic_local, DataAccessCGMS.getInstance(), parent);
+ //
+ // menu_cgms.addSeparator();
+ //
+ // ATSwingUtils.createMenuItem(menu_cgms, "MN_CGMS_CONFIG", //
+ // "MN_CGMS_CONFIG_DESC", "plugin_config", //
+ // this, null, ic_local, DataAccessCGMS.getInstance(), parent);
+ //
+ // menu_cgms.addSeparator();
+ //
+ // ATSwingUtils.createMenuItem(menu_cgms, "MN_CGMS_ABOUT", //
+ // "MN_CGMS_ABOUT_DESC", "plugin_about", this, null, ic_local,
+ // DataAccessCGMS.getInstance(), parent);
+ //
+ // return menu_cgms;
+
+ return menuConnect;
+ }
+
+
+ /**
+ * {@inheritDoc}
+ */
+ public void refreshMenusAfterConfig()
+ {
+ // menus[0].setEnabled(
+ // DownloadSupportType.isOptionSet(dataAccessConnect.getDownloadStatus(),
+ // DownloadSupportType.DownloadData));
+ // menus[1].setEnabled(
+ // DownloadSupportType.isOptionSet(dataAccessConnect.getDownloadStatus(),
+ // DownloadSupportType.DownloadConfig));
+ // menus[2].setEnabled(DownloadSupportType.isOptionSet(dataAccessConnect.getDownloadStatus(),
+ // DownloadSupportType.DownloadDataFile));
+ }
+
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public DataAccessPlugInBase getPlugInDataAccess()
+ {
+ return dataAccessConnect;
+ }
+
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public void actionPerformed(ActionEvent ae)
+ {
+ String command = ae.getActionCommand();
+
+ if (!executeBasePluginAction(command, this.dataAccessConnect))
+ {
+ // if (command.equals("cgms_view_data"))
+ // {
+ // //new CGMSDataDialog(dataAccessConnect, (JFrame) this.parent);
+ // }
+ // else
+ {
+ System.out.println("ConnectPluginServer::Unknown Command: " + command);
+ }
+ }
+
+ }
+
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public BackupRestorePlugin getBackupRestoreHandler()
+ {
+ // return new BackupRestoreCGMSHandler();
+ return null;
+ }
+
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public List<Object> getDataFromPlugin(Map<String, Object> parameters)
+ {
+ // if (MapUtils.isEmpty(parameters))
+ // {
+ // LOG.warn("We cannot retrieve data for empty request (no parameters):
+ // " + parameters);
+ // return null;
+ // }
+ //
+ // if (!parameters.containsKey("dataType"))
+ // {
+ // LOG.warn("DataType of return data must be specified, along with other
+ // required parameters.");
+ // return null;
+ // }
+ //
+ // if (parameters.get("dataType").equals("CGMSReadingsDaily4Graph"))
+ // {
+ // CGMSGraphDataHandler graphData = new CGMSGraphDataHandler();
+ // XYSeries series = graphData.getCGMSDailyReadings(dataAccessConnect,
+ // (GregorianCalendar) parameters.get("calendarDate"));
+ //
+ // List<Object> data = new ArrayList<Object>();
+ // data.add(series);
+ //
+ // return data;
+ // }
+ // else
+ // {
+ // LOG.warn("Unknown dataType requested: " +
+ // parameters.get("dataType"));
+ // }
+
+ return null;
+ }
+
+}
Added: trunk/ggc-plugins/ggc-connect/src/main/java/ggc/connect/util/DataAccessConnect.java
===================================================================
--- trunk/ggc-plugins/ggc-connect/src/main/java/ggc/connect/util/DataAccessConnect.java (rev 0)
+++ trunk/ggc-plugins/ggc-connect/src/main/java/ggc/connect/util/DataAccessConnect.java 2016-12-25 20:24:34 UTC (rev 1448)
@@ -0,0 +1,335 @@
+package ggc.connect.util;
+
+import java.util.Calendar;
+import java.util.GregorianCalendar;
+import java.util.Hashtable;
+
+import ggc.connect.db.GGCConnectDb;
+import ggc.connect.defs.ConnectPluginDefinition;
+import ggc.plugin.data.enums.DeviceEntryStatus;
+import ggc.plugin.device.impl.animas.enums.AnimasSoundType;
+import ggc.plugin.util.DataAccessPlugInBase;
+
+/**
+ * Application: GGC - GNU Gluco Control
+ * Plug-in: CGMS Tool (support for CGMS devices)
+ *
+ * See AUTHORS for copyright information.
+ *
+ * This program is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by the Free Software
+ * Foundation; either version 2 of the License, or (at your option) any later
+ * version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc., 59 Temple
+ * Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Filename: DataAccessCGMS
+ * Description: Singelton class containing all data used through plugin
+ *
+ * Author: Andy {an...@at...}
+ */
+
+public class DataAccessConnect extends DataAccessPlugInBase
+{
+
+ private static final String EXTENDED_HANDLER_CGMSValuesExtendedEntry = "CGMSValuesExtendedEntry";
+
+ private static DataAccessConnect s_da = null; // This is handle to unique
+
+ // private CGMSManager m_cgms_manager = null;
+
+ /**
+ * Value Type
+ */
+ public static String[] value_type = null;
+
+
+ // ********************************************************
+ // ****** Constructors and Access methods *****
+ // ********************************************************
+
+ /**
+ *
+ * This is DataAccess constructor; Since classes use Singleton Pattern,
+ * constructor is protected and can be accessed only with getInstance()
+ * method.<br><br>
+ *
+ * @param cgmsPluginDefinition
+ */
+ private DataAccessConnect(ConnectPluginDefinition cgmsPluginDefinition)
+ {
+ super(cgmsPluginDefinition);
+ }
+
+
+ /**
+ * Init Special - All methods that we support should be called here
+ */
+ @Override
+ public void initSpecial()
+ {
+ // this.createWebListerContext();
+ // this.createPlugInAboutContext();
+ this.createConfigurationContext();
+ loadDeviceDataHandler();
+ // loadManager();
+ // loadReadingStatuses();
+ this.createPlugInDataRetrievalContext();
+ this.createDeviceConfiguration();
+ this.createOldDataReader();
+
+ this.loadConverters();
+
+ this.prepareTranslationForEnums();
+ this.prepareGraphContext();
+ }
+
+
+ private void prepareTranslationForEnums()
+ {
+ AnimasSoundType.translateKeywords(this.getI18nControlInstance(), this.getPluginType());
+ DeviceEntryStatus.translateKeywords(this.getI18nControlInstance());
+ }
+
+
+ /**
+ *
+ * This method returns reference to DataAccessCGM object created, or if no
+ * object was created yet, it creates one.<br><br>
+ *
+ * @return Reference to DataAccessCGM instance
+ */
+ public static DataAccessConnect getInstance()
+ {
+ // if (s_da == null)
+ // s_da = new DataAccessCGM();
+ return s_da;
+ }
+
+
+ /**
+ * Create Instance
+ *
+ * @param connectPluginDefinition
+ * @return
+ */
+ public static DataAccessConnect createInstance(ConnectPluginDefinition connectPluginDefinition)
+ {
+ if (s_da == null)
+ {
+ s_da = new DataAccessConnect(connectPluginDefinition);
+ }
+ return s_da;
+ }
+
+
+ // Method: deleteInstance
+ /**
+ * This method sets handle to DataAccess to null and deletes the instance. <br><br>
+ */
+ public void deleteInstance()
+ {
+ m_i18n = null;
+ }
+
+ // ********************************************************
+ // ****** Abstract Methods *****
+ // ********************************************************
+
+
+ // ********************************************************
+ // ****** Manager *****
+ // ********************************************************
+
+ /**
+ * Get Device Manager
+ *
+ * @return
+ */
+ // public CGMSManager getCGMManager()
+ // {
+ // return this.m_cgms_manager;
+ // }
+
+ // ********************************************************
+ // ****** Parent handling (for UIs) *****
+ // ********************************************************
+
+ // ********************************************************
+ // ****** Dates and Times Handling *****
+ // ********************************************************
+
+ @Override
+ public String getCurrentDateString()
+ {
+ GregorianCalendar gc = new GregorianCalendar();
+ return gc.get(Calendar.DAY_OF_MONTH) + "." + (gc.get(Calendar.MONTH) + 1) + "." + gc.get(Calendar.YEAR);
+ }
+
+ // ********************************************************
+ // ****** Database *****
+ // ********************************************************
+
+ GGCConnectDb m_db;
+
+
+ /**
+ * Create Custom Db
+ *
+ * This is for plug-in specific database implementation
+ */
+ @Override
+ public void createCustomDb()
+ {
+ this.m_db = new GGCConnectDb(this.hibernateDb);
+ this.pluginDb = this.m_db;
+ }
+
+
+ /**
+ * Get Db
+ *
+ * @return
+ */
+ public GGCConnectDb getDb()
+ {
+ return this.m_db;
+ }
+
+
+ // ********************************************************
+ // ****** Configuration *****
+ // ********************************************************
+
+ /**
+ * Create Configuration Context for plugin
+ */
+ @Override
+ public void createConfigurationContext()
+ {
+ // this.device_config_def = new CGMSConfigurationDefinition();
+ }
+
+
+ /**
+ * Create Device Configuration for plugin
+ */
+ @Override
+ public void createDeviceConfiguration()
+ {
+ // this.device_config = new DeviceConfiguration(this);
+ }
+
+ // ********************************************************
+ // ****** About Methods *****
+ // ********************************************************
+
+ // ********************************************************
+ // ****** Web Lister Methods *****
+ // ********************************************************
+
+
+ /**
+ * Create About Context for plugin
+ */
+ @Override
+ public void createPlugInDataRetrievalContext()
+ {
+ // loadBasePluginTranslations();
+ //
+ // m_entry_type = new CGMSValuesEntry();
+ //
+ // this.data_download_screen_wide = false;
+ //
+ // DataAccessConnect.value_type = new String[7];
+ // DataAccessConnect.value_type[0] = "";
+ // DataAccessConnect.value_type[1] =
+ // this.i18n_plugin.getMessage("CGMS_READING");
+ // DataAccessConnect.value_type[2] =
+ // this.i18n_plugin.getMessage("CALIBRATION_READINGS");
+ // DataAccessConnect.value_type[4] =
+ // this.i18n_plugin.getMessage("CGMS_DATA_EVENT");
+ // DataAccessConnect.value_type[3] =
+ // this.i18n_plugin.getMessage("CGMS_DATA_ALARM");
+ // DataAccessConnect.value_type[5] =
+ // this.i18n_plugin.getMessage("CGMS_DATA_ERROR");
+ // DataAccessConnect.value_type[6] =
+ // this.i18n_plugin.getMessage("CGMS_READING_TREND");
+
+ }
+
+
+ /**
+ * Load Manager instance
+ */
+ @Override
+ public void loadManager()
+ {
+ // this.m_cgms_manager = CGMSManager.getInstance(this);
+ // this.m_manager = this.m_cgms_manager;
+ }
+
+
+ /**
+ * Load Device Data Handler
+ */
+ @Override
+ public void loadDeviceDataHandler()
+ {
+ }
+
+
+ @Override
+ public void loadExtendedHandlers()
+ {
+ }
+
+
+ /**
+ * Get Images for Devices
+ *
+ * @see ggc.plugin.util.DataAccessPlugInBase#getDeviceImagesRoot()
+ * @return String with images path
+ */
+ @Override
+ public String getDeviceImagesRoot()
+ {
+ return "/icons/connect/";
+ }
+
+
+ /**
+ * Create Old Data Reader
+ */
+ @Override
+ public void createOldDataReader()
+ {
+ }
+
+
+ /**
+ * Load Special Parameters
+ *
+ * @see com.atech.utils.ATDataAccessAbstract#loadSpecialParameters()
+ */
+ @Override
+ public void loadSpecialParameters()
+ {
+ this.special_parameters = new Hashtable<String, String>();
+ this.special_parameters.put("BG", "" + this.getGlucoseUnitType());
+ }
+
+
+ @Override
+ public void prepareGraphContext()
+ {
+ }
+
+}
Added: trunk/ggc-plugins/ggc-connect/src/main/java/ggc/connect/util/GGCConnectICRunner.java
===================================================================
--- trunk/ggc-plugins/ggc-connect/src/main/java/ggc/connect/util/GGCConnectICRunner.java (rev 0)
+++ trunk/ggc-plugins/ggc-connect/src/main/java/ggc/connect/util/GGCConnectICRunner.java 2016-12-25 20:24:34 UTC (rev 1448)
@@ -0,0 +1,45 @@
+package ggc.connect.util;
+
+import com.atech.i18n.I18nControlRunner;
+
+/**
+ * Application: GGC - GNU Gluco Control
+ * Plug-in: CGMS Tool (support for CGMS devices)
+ *
+ * See AUTHORS for copyright information.
+ *
+ * This program is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by the Free Software
+ * Foundation; either version 2 of the License, or (at your option) any later
+ * version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc., 59 Temple
+ * Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Filename: GGCNutriICRunner
+ * Description: Definition for Language translation framework
+ *
+ * Author: Andy {an...@at...}
+ */
+
+public class GGCConnectICRunner extends I18nControlRunner
+{
+
+ /**
+ * Get Name of root file for application translation
+ *
+ * @return
+ */
+ @Override
+ public String getLanguageFileRoot()
+ {
+ return "GGC_CGMSTool";
+ }
+
+}
Added: trunk/ggc-plugins/ggc-connect/src/main/resources/GGCConnectTool_en.properties
===================================================================
--- trunk/ggc-plugins/ggc-connect/src/main/resources/GGCConnectTool_en.properties (rev 0)
+++ trunk/ggc-plugins/ggc-connect/src/main/resources/GGCConnectTool_en.properties 2016-12-25 20:24:34 UTC (rev 1448)
@@ -0,0 +1,66 @@
+#
+# !MASTER_FILE!
+# !S! MODULE=GGC CGMS Tool
+# !S! MODULE_VERSION=0.1.0
+#
+# ######################################################################
+# ### GGC Connect Tool ###
+# ######################################################################
+# ### Language: English ###
+# ### Created by: Andy Rozman (an...@at...) ###
+# ### Last change: 18th January 2016 ###
+# ### Library Version: 0.1.0 ###
+# ### Application Version: 0.7 ###
+# ######################################################################
+#
+# Please use this file as default language file. Do not try to translate
+# from any other files, since this is the Master language file. Create the
+# same header and specify application version number for easier changes at
+# later time.
+# Translations should be grouped by groups as specified here.
+# Older groups are done by packages, newer by logical name.
+
+#
+# In brackets there are now tags which define urgency of some text beeing translated
+# !S! GROUP_PRIORITY_1=Needed, urgent (Base functionality, options which will be used by user mostly)
+# !S! GROUP_PRIORITY_2=Needed
+# !S! GROUP_PRIORITY_3=Not used yet (in public releases)
+# !S! GROUP_PRIORITY_4=In implementation
+#
+
+
+#
+# !G! Plug-in Specific [1]
+#
+CONNECT_PLUGIN=Connect Plugin
+
+#
+# !G! Menus [1]
+#
+MN_CONNECT=Connect
+MN_CGMS_READ=Read data
+MN_CGMS_READ_DESC=Reading data from CGMS
+
+MN_CGMS_READ_CONFIG=Read configuration
+MN_CGMS_READ_CONFIG_DESC=Read configuration from CGMS
+
+
+MN_CGMS_LIST=CGMS List
+MN_CGMS_LIST_DESC=List of available CGMS devices
+MN_CGMS_CONFIG=Configure
+MN_CGMS_CONFIG_DESC=Configuration of CGMS plug-in
+MN_CGMS_ABOUT=About
+MN_CGMS_ABOUT_DESC=About CGMS Plugin (copyright, features, credits,...)
+MN_CGMS_VIEW_DATA=View Data
+MN_CGMS_VIEW_DATA_DESC=View data read from device(s)
+MN_CGMS_READ_FILE=Read file
+MN_CGMS_READ_FILE_DESC=Read data from CGMS/sw export file
+
+
+#
+# !G! About [1]
+#
+DEVICE_PLUGIN=%s Plug-in
+DEVICE_PLUGIN_ABOUT=About %s Plug-in
+
+
Added: trunk/ggc-plugins/ggc-connect/src/main/resources/icons/cgms_about.jpg
===================================================================
(Binary files differ)
Index: trunk/ggc-plugins/ggc-connect/src/main/resources/icons/cgms_about.jpg
===================================================================
--- trunk/ggc-plugins/ggc-connect/src/main/resources/icons/cgms_about.jpg 2016-12-25 20:12:33 UTC (rev 1447)
+++ trunk/ggc-plugins/ggc-connect/src/main/resources/icons/cgms_about.jpg 2016-12-25 20:24:34 UTC (rev 1448)
Property changes on: trunk/ggc-plugins/ggc-connect/src/main/resources/icons/cgms_about.jpg
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/ggc-support/ggc-support/misc/deps.txt
===================================================================
--- trunk/ggc-support/ggc-support/misc/deps.txt (rev 0)
+++ trunk/ggc-support/ggc-support/misc/deps.txt 2016-12-25 20:24:34 UTC (rev 1448)
@@ -0,0 +1,465 @@
+[INFO] Scanning for projects...
+[WARNING]
+[WARNING] Some problems were encountered while building the effective model for net.sf.ggc:ggc-parent:pom:1.0-SNAPSHOT
+[WARNING] 'dependencyManagement.dependencies.dependency.(groupId:artifactId:type:classifier)' must be unique: net.sf.ggc:ggc-help:jar -> version ${ggc-help.version} vs ${ggc-lang.version} @ line 138, column 25
+[WARNING]
+[WARNING] Some problems were encountered while building the effective model for net.sf.ggc:ggc-help:jar:0.2-SNAPSHOT
+[WARNING] 'version' contains an expression but should be a constant. @ net.sf.ggc:ggc-help:${ggc-help.version}, /home/andy/workspaces/andy-iplayground/ggc/ggc-help/pom.xml, line 15, column 11
+[WARNING]
+[WARNING] Some problems were encountered while building the effective model for net.sf.ggc:ggc-core:jar:0.6.0-SNAPSHOT
+[WARNING] 'version' contains an expression but should be a constant. @ net.sf.ggc:ggc-core:${ggc-core.version}, /home/andy/workspaces/andy-iplayground/ggc/ggc-core/pom.xml, line 15, column 11
+[WARNING]
+[WARNING] Some problems were encountered while building the effective model for net.sf.ggc:ggc-plugin-base:jar:0.7.0-SNAPSHOT
+[WARNING] 'version' contains an expression but should be a constant. @ net.sf.ggc:ggc-plugin-base:${ggc-plugin-base.version}, /home/andy/workspaces/andy-iplayground/ggc/ggc-plugin_base/pom.xml, line 14, column 11
+[WARNING] 'dependencies.dependency.(groupId:artifactId:type:classifier)' must be unique: net.sf.ggc:ggc-core:jar -> duplicate declaration of version (?) @ net.sf.ggc:ggc-plugin-base:${ggc-plugin-base.version}, /home/andy/workspaces/andy-iplayground/ggc/ggc-plugin_base/pom.xml, line 54, column 21
+[WARNING]
+[WARNING] Some problems were encountered while building the effective model for net.sf.ggc:ggc-nutri-tool:jar:1.3.5-SNAPSHOT
+[WARNING] 'version' contains an expression but should be a constant. @ net.sf.ggc:ggc-nutri-tool:${ggc-nutri-tool.version}, /home/andy/workspaces/andy-iplayground/ggc/ggc-nutri/pom.xml, line 14, column 11
+[WARNING]
+[WARNING] Some problems were encountered while building the effective model for net.sf.ggc:ggc-meter-tool:jar:2.2.0-SNAPSHOT
+[WARNING] 'version' contains an expression but should be a constant. @ net.sf.ggc:ggc-meter-tool:${ggc-meter-tool.version}, /home/andy/workspaces/andy-iplayground/ggc/ggc-meter/pom.xml, line 16, column 11
+[WARNING]
+[WARNING] Some problems were encountered while building the effective model for net.sf.ggc:ggc-pump-tool:jar:1.5.0-SNAPSHOT
+[WARNING] 'version' contains an expression but should be a constant. @ net.sf.ggc:ggc-pump-tool:${ggc-pump-tool.version}, /home/andy/workspaces/andy-iplayground/ggc/ggc-pump/pom.xml, line 14, column 11
+[WARNING]
+[WARNING] Some problems were encountered while building the effective model for net.sf.ggc:ggc-cgms-tool:jar:1.3.0-SNAPSHOT
+[WARNING] 'version' contains an expression but should be a constant. @ net.sf.ggc:ggc-cgms-tool:${ggc-cgms-tool.version}, /home/andy/workspaces/andy-iplayground/ggc/ggc-cgm/pom.xml, line 14, column 11
+[WARNING]
+[WARNING] Some problems were encountered while building the effective model for net.sf.ggc:ggc-desktop:jar:0.6.0-SNAPSHOT
+[WARNING] 'version' contains an expression but should be a constant. @ net.sf.ggc:ggc-desktop:${ggc-desktop.version}, /home/andy/workspaces/andy-iplayground/ggc/ggc-desktop/pom.xml, line 15, column 11
+[WARNING]
+[WARNING] Some problems were encountered while building the effective model for com.infonova.hdplus.jtf:ggc-root:pom:1.0-SNAPSHOT
+[WARNING] 'dependencyManagement.dependencies.dependency.(groupId:artifactId:type:classifier)' must be unique: net.sf.ggc:ggc-help:jar -> version ${ggc-help.version} vs ${ggc-lang.version} @ net.sf.ggc:ggc-parent:1.0-SNAPSHOT, /home/andy/workspaces/andy-iplayground/ggc/ggc-master-pom/pom.xml, line 138, column 25
+[WARNING]
+[WARNING] It is highly recommended to fix these problems because they threaten the stability of your build.
+[WARNING]
+[WARNING] For this reason, future Maven versions might no longer support building such malformed projects.
+[WARNING]
+[INFO] ------------------------------------------------------------------------
+[INFO] Reactor Build Order:
+[INFO]
+[INFO] GGC Parent POM
+[INFO] GGC Help Project
+[INFO] GGC Core Project
+[INFO] GGC Plugin Base Project
+[INFO] GGC Nutrition Tool Project
+[INFO] GGC Meter Tool Project
+[INFO] GGC Pump Tool Project
+[INFO] GGC CGMS Tool Project
+[INFO] GGC Desktop Project
+[INFO] ggc-root
+[INFO]
+[INFO] ------------------------------------------------------------------------
+[INFO] Building GGC Parent POM 1.0-SNAPSHOT
+[INFO] ------------------------------------------------------------------------
+[INFO]
+[INFO] --- maven-dependency-plugin:2.1:tree (default-cli) @ ggc-parent ---
+[INFO] net.sf.ggc:ggc-parent:pom:1.0-SNAPSHOT
+[INFO]
+[INFO] ------------------------------------------------------------------------
+[INFO] Building GGC Help Project 0.2-SNAPSHOT
+[INFO] ------------------------------------------------------------------------
+Downloading: http://grzmvn01.infonova.at:8082/nexus/content/groups/public/com/atech-software/atech-tools/0.7.11-SNAPSHOT/maven-metadata.xml
+
+[WARNING] Could not transfer metadata com.atech-software:atech-tools:0.7.11-SNAPSHOT/maven-metadata.xml from/to nexus-infonova (http://grzmvn01.infonova.at:8082/nexus/content/groups/public/): grzmvn01.infonova.at: Name or service not known
+[WARNING] Failure to transfer com.atech-software:atech-tools:0.7.11-SNAPSHOT/maven-metadata.xml from http://grzmvn01.infonova.at:8082/nexus/content/groups/public/ was cached in the local repository, resolution will not be reattempted until the update interval of nexus-infonova has elapsed or updates are forced. Original error: Could not transfer metadata com.atech-software:atech-tools:0.7.11-SNAPSHOT/maven-metadata.xml from/to nexus-infonova (http://grzmvn01.infonova.at:8082/nexus/content/groups/public/): grzmvn01.infonova.at: Name or service not known
+[INFO]
+[INFO] --- maven-dependency-plugin:2.1:tree (default-cli) @ ggc-help ---
+[INFO] net.sf.ggc:ggc-help:jar:0.2-SNAPSHOT
+[INFO] +- com.atech-software:atech-tools:jar:0.7.11-SNAPSHOT:compile
+[INFO] | +- org.hibernate:hibernate:jar:3.1.3:compile
+[INFO] | | +- commons-logging:commons-logging:jar:1.0.4:compile
+[INFO] | | +- ehcache:ehcache:jar:1.1:compile
+[INFO] | | +- cglib:cglib:jar:2.1_3:compile
+[INFO] | | +- asm:asm:jar:1.5.3:compile
+[INFO] | | +- asm:asm-attrs:jar:1.5.3:compile
+[INFO] | | +- commons-collections:commons-collections:jar:2.1.1:compile
+[INFO] | | +- dom4j:dom4j:jar:1.6.1:compile
+[INFO] | | \- antlr:antlr:jar:2.7.6rc1:compile
+[INFO] | +- javax.transaction:jta:jar:1.0.1B:compile
+[INFO] | +- com.itextpdf:itextpdf:jar:5.1.2:compile
+[INFO] | +- commons-lang:commons-lang:jar:2.6:compile
+[INFO] | +- net.sf.squirrel-sql.thirdparty-non-maven:skinlf:jar:6.7:compile
+[INFO] | +- log4j:log4j:jar:1.2.16:compile
+[INFO] | +- jfree:jfreechart:jar:1.0.13:compile
+[INFO] | | \- jfree:jcommon:jar:1.0.16:compile
+[INFO] | +- org.icepdf:icepdf-core:jar:5.0.7:compile
+[INFO] | | \- com.sun.media:jai-codec:jar:1.1.3:compile
+[INFO] | | \- javax.media:jai-core:jar:1.1.3:compile
+[INFO] | \- org.icepdf:icepdf-viewer:jar:5.0.7:compile
+[INFO] | +- batik:batik-awt-util:jar:1.6:compile
+[INFO] | +- batik:batik-dom:jar:1.6:compile
+[INFO] | +- batik:batik-svg-dom:jar:1.6:compile
+[INFO] | +- batik:batik-svggen:jar:1.6:compile
+[INFO] | +- batik:batik-util:jar:1.6:compile
+[INFO] | \- batik:batik-xml:jar:1.6:compile
+[INFO] \- javax.help:javahelp:jar:2.0.05:compile
+[INFO]
+[INFO] ------------------------------------------------------------------------
+[INFO] Building GGC Core Project 0.6.0-SNAPSHOT
+[INFO] ------------------------------------------------------------------------
+[INFO]
+[INFO] --- maven-dependency-plugin:2.1:tree (default-cli) @ ggc-core ---
+[INFO] net.sf.ggc:ggc-core:jar:0.6.0-SNAPSHOT
+[INFO] +- com.atech-software:atech-tools:jar:0.7.11-SNAPSHOT:compile
+[INFO] | +- javax.transaction:jta:jar:1.0.1B:compile
+[INFO] | +- net.sf.squirrel-sql.thirdparty-non-maven:skinlf:jar:6.7:compile
+[INFO] | +- org.icepdf:icepdf-core:jar:5.0.7:compile
+[INFO] | | \- com.sun.media:jai-codec:jar:1.1.3:compile
+[INFO] | | \- javax.media:jai-core:jar:1.1.3:compile
+[INFO] | \- org.icepdf:icepdf-viewer:jar:5.0.7:compile
+[INFO] | +- batik:batik-awt-util:jar:1.6:compile
+[INFO] | +- batik:batik-dom:jar:1.6:compile
+[INFO] | +- batik:batik-svg-dom:jar:1.6:compile
+[INFO] | +- batik:batik-svggen:jar:1.6:compile
+[INFO] | +- batik:batik-util:jar:1.6:compile
+[INFO] | \- batik:batik-xml:jar:1.6:compile
+[INFO] +- org.hibernate:hibernate:jar:3.1.3:compile
+[INFO] | +- commons-logging:commons-logging:jar:1.0.4:compile
+[INFO] | +- ehcache:ehcache:jar:1.1:compile
+[INFO] | +- cglib:cglib:jar:2.1_3:compile
+[INFO] | +- asm:asm:jar:1.5.3:compile
+[INFO] | +- asm:asm-attrs:jar:1.5.3:compile
+[INFO] | +- commons-collections:commons-collections:jar:2.1.1:compile
+[INFO] | +- dom4j:dom4j:jar:1.6.1:compile
+[INFO] | \- antlr:antlr:jar:2.7.6rc1:compile
+[INFO] +- net.sf.ggc.pygmy-httpd:pygmy-core:jar:0.2:compile
+[INFO] +- net.sf.ggc.pygmy-httpd:pygmy-handlers:jar:0.2:compile
+[INFO] +- com.itextpdf:itextpdf:jar:5.1.2:compile
+[INFO] +- commons-lang:commons-lang:jar:2.6:compile
+[INFO] +- javax.help:javahelp:jar:2.0.05:compile
+[INFO] +- log4j:log4j:jar:1.2.16:compile
+[INFO] +- jfree:jfreechart:jar:1.0.13:compile
+[INFO] | \- jfree:jcommon:jar:1.0.16:compile
+[INFO] \- com.h2database:h2:jar:1.0.69:runtime
+[INFO]
+[INFO] ------------------------------------------------------------------------
+[INFO] Building GGC Plugin Base Project 0.7.0-SNAPSHOT
+[INFO] ------------------------------------------------------------------------
+Downloading: http://grzmvn01.infonova.at:8082/nexus/content/groups/public/net/sf/ggc/ggc-core/0.6.0-SNAPSHOT/maven-metadata.xml
+
+[WARNING] Could not transfer metadata net.sf.ggc:ggc-core:0.6.0-SNAPSHOT/maven-metadata.xml from/to nexus-infonova (http://grzmvn01.infonova.at:8082/nexus/content/groups/public/): grzmvn01.infonova.at
+[WARNING] Failure to transfer net.sf.ggc:ggc-core:0.6.0-SNAPSHOT/maven-metadata.xml from http://grzmvn01.infonova.at:8082/nexus/content/groups/public/ was cached in the local repository, resolution will not be reattempted until the update interval of nexus-infonova has elapsed or updates are forced. Original error: Could not transfer metadata net.sf.ggc:ggc-core:0.6.0-SNAPSHOT/maven-metadata.xml from/to nexus-infonova (http://grzmvn01.infonova.at:8082/nexus/content/groups/public/): grzmvn01.infonova.at
+[INFO]
+[INFO] --- maven-dependency-plugin:2.1:tree (default-cli) @ ggc-plugin-base ---
+[INFO] net.sf.ggc:ggc-plugin-base:jar:0.7.0-SNAPSHOT
+[INFO] +- net.sf.ggc:ggc-core:jar:0.6.0-SNAPSHOT:compile
+[INFO] | +- org.hibernate:hibernate:jar:3.1.3:compile
+[INFO] | | +- commons-logging:commons-logging:jar:1.0.4:compile
+[INFO] | | +- ehcache:ehcache:jar:1.1:compile
+[INFO] | | +- cglib:cglib:jar:2.1_3:compile
+[INFO] | | +- asm:asm:jar:1.5.3:compile
+[INFO] | | +- asm:asm-attrs:jar:1.5.3:compile
+[INFO] | | +- commons-collections:commons-collections:jar:2.1.1:compile
+[INFO] | | +- dom4j:dom4j:jar:1.6.1:compile
+[INFO] | | \- antlr:antlr:jar:2.7.6rc1:compile
+[INFO] | +- net.sf.ggc.pygmy-httpd:pygmy-core:jar:0.2:compile
+[INFO] | +- net.sf.ggc.pygmy-httpd:pygmy-handlers:jar:0.2:compile
+[INFO] | +- com.itextpdf:itextpdf:jar:5.1.2:compile
+[INFO] | +- javax.help:javahelp:jar:2.0.05:compile
+[INFO] | +- log4j:log4j:jar:1.2.16:compile
+[INFO] | +- jfree:jfreechart:jar:1.0.13:compile
+[INFO] | | \- jfree:jcommon:jar:1.0.16:compile
+[INFO] | \- com.h2database:h2:jar:1.0.69:runtime
+[INFO] +- com.atech-software:atech-tools:jar:0.7.11-SNAPSHOT:compile
+[INFO] | +- javax.transaction:jta:jar:1.0.1B:compile
+[INFO] | +- net.sf.squirrel-sql.thirdparty-non-maven:skinlf:jar:6.7:compile
+[INFO] | +- org.icepdf:icepdf-core:jar:5.0.7:compile
+[INFO] | | \- com.sun.media:jai-codec:jar:1.1.3:compile
+[INFO] | | \- javax.media:jai-core:jar:1.1.3:compile
+[INFO] | \- org.icepdf:icepdf-viewer:jar:5.0.7:compile
+[INFO] | +- batik:batik-awt-util:jar:1.6:compile
+[INFO] | +- batik:batik-dom:jar:1.6:compile
+[INFO] | +- batik:batik-svg-dom:jar:1.6:compile
+[INFO] | +- batik:batik-svggen:jar:1.6:compile
+[INFO] | +- batik:batik-util:jar:1.6:compile
+[INFO] | \- batik:batik-xml:jar:1.6:compile
+[INFO] +- net.java.dev.jna:jna:jar:3.3.0:compile
+[INFO] +- com.ibm.old.comapi:ibm-compapi:jar:1.3:compile
+[INFO] +- com.neuronrobotics:nrjavaserial:jar:3.9.3:compile
+[INFO] +- jaxen:jaxen:jar:1.1.6:compile
+[INFO] \- commons-lang:commons-lang:jar:2.6:compile
+[INFO]
+[INFO] ------------------------------------------------------------------------
+[INFO] Building GGC Nutrition Tool Project 1.3.5-SNAPSHOT
+[INFO] ------------------------------------------------------------------------
+Downloading: http://grzmvn01.infonova.at:8082/nexus/content/groups/public/net/sf/ggc/ggc-plugin-base/0.7.0-SNAPSHOT/maven-metadata.xml
+
+[WARNING] Could not transfer metadata net.sf.ggc:ggc-plugin-base:0.7.0-SNAPSHOT/maven-metadata.xml from/to nexus-infonova (http://grzmvn01.infonova.at:8082/nexus/content/groups/public/): grzmvn01.infonova.at
+[WARNING] Failure to transfer net.sf.ggc:ggc-core:0.6.0-SNAPSHOT/maven-metadata.xml from http://grzmvn01.infonova.at:8082/nexus/content/groups/public/ was cached in the local repository, resolution will not be reattempted until the update interval of nexus-infonova has elapsed or updates are forced. Original error: Could not transfer metadata net.sf.ggc:ggc-core:0.6.0-SNAPSHOT/maven-metadata.xml from/to nexus-infonova (http://grzmvn01.infonova.at:8082/nexus/content/groups/public/): grzmvn01.infonova.at
+[WARNING] Failure to transfer net.sf.ggc:ggc-plugin-base:0.7.0-SNAPSHOT/maven-metadata.xml from http://grzmvn01.infonova.at:8082/nexus/content/groups/public/ was cached in the local repository, resolution will not be reattempted until the update interval of nexus-infonova has elapsed or updates are forced. Original error: Could not transfer metadata net.sf.ggc:ggc-plugin-base:0.7.0-SNAPSHOT/maven-metadata.xml from/to nexus-infonova (http://grzmvn01.infonova.at:8082/nexus/content/groups/public/): grzmvn01.infonova.at
+[INFO]
+[INFO] --- maven-dependency-plugin:2.1:tree (default-cli) @ ggc-nutri-tool ---
+[INFO] net.sf.ggc:ggc-nutri-tool:jar:1.3.5-SNAPSHOT
+[INFO] +- net.sf.ggc:ggc-core:jar:0.6.0-SNAPSHOT:compile
+[INFO] | +- org.hibernate:hibernate:jar:3.1.3:compile
+[INFO] | | +- commons-logging:commons-logging:jar:1.0.4:compile
+[INFO] | | +- ehcache:ehcache:jar:1.1:compile
+[INFO] | | +- cglib:cglib:jar:2.1_3:compile
+[INFO] | | +- asm:asm:jar:1.5.3:compile
+[INFO] | | +- asm:asm-attrs:jar:1.5.3:compile
+[INFO] | | +- commons-collections:commons-collections:jar:2.1.1:compile
+[INFO] | | +- dom4j:dom4j:jar:1.6.1:compile
+[INFO] | | \- antlr:antlr:jar:2.7.6rc1:compile
+[INFO] | +- net.sf.ggc.pygmy-httpd:pygmy-core:jar:0.2:compile
+[INFO] | +- net.sf.ggc.pygmy-httpd:pygmy-handlers:jar:0.2:compile
+[INFO] | +- com.itextpdf:itextpdf:jar:5.1.2:compile
+[INFO] | +- commons-lang:commons-lang:jar:2.6:compile
+[INFO] | +- javax.help:javahelp:jar:2.0.05:compile
+[INFO] | +- log4j:log4j:jar:1.2.16:compile
+[INFO] | +- jfree:jfreechart:jar:1.0.13:compile
+[INFO] | | \- jfree:jcommon:jar:1.0.16:compile
+[INFO] | \- com.h2database:h2:jar:1.0.69:runtime
+[INFO] +- net.sf.ggc:ggc-plugin-base:jar:0.7.0-SNAPSHOT:compile
+[INFO] | +- net.java.dev.jna:jna:jar:3.3.0:compile
+[INFO] | +- com.ibm.old.comapi:ibm-compapi:jar:1.3:compile
+[INFO] | +- com.neuronrobotics:nrjavaserial:jar:3.9.3:compile
+[INFO] | \- jaxen:jaxen...
[truncated message content] |
|
From: <and...@us...> - 2008-12-14 19:46:59
|
Revision: 623
http://ggc.svn.sourceforge.net/ggc/?rev=623&view=rev
Author: andyrozman
Date: 2008-12-14 19:46:52 +0000 (Sun, 14 Dec 2008)
Log Message:
-----------
Modified Paths:
--------------
trunk/ggc/build/GGCVersion.properties
trunk/ggc/data/GGC_Config.properties
trunk/ggc/data/update/GGC_Update.properties
trunk/ggc/src/GGC_de.native.properties
trunk/ggc/src/GGC_de.properties
trunk/ggc/src/GGC_en.properties
trunk/ggc/src/GGC_fr.properties
trunk/ggc/src/GGC_si.properties
trunk/ggc/src/ggc/GGC.java
trunk/ggc/src/ggc/core/data/cfg/ConfigCellRenderer.java
trunk/ggc/src/ggc/core/data/cfg/ConfigurationManager.java
trunk/ggc/src/ggc/core/db/GGCDb.java
trunk/ggc/src/ggc/core/db/datalayer/DailyValue.java
trunk/ggc/src/ggc/core/db/datalayer/FoodGroup.java
trunk/ggc/src/ggc/core/plugins/CGMSPlugIn.java
trunk/ggc/src/ggc/core/plugins/GGCDataReader.java
trunk/ggc/src/ggc/core/plugins/GGCDataWriter.java
trunk/ggc/src/ggc/core/plugins/MetersPlugIn.java
trunk/ggc/src/ggc/core/plugins/PumpsPlugIn.java
trunk/ggc/src/ggc/core/sync/sidiary/ParseDataFile.java
trunk/ggc/src/ggc/core/sync/sidiary/data/DailyData.java
trunk/ggc/src/ggc/core/sync/sidiary/data/MonthlyData.java
trunk/ggc/src/ggc/core/test/ImportDacioDb.java
trunk/ggc/src/ggc/gui/MainFrame.java
trunk/ggc/src/ggc/gui/dialogs/AppointmentDialog.java
trunk/ggc/src/ggc/gui/dialogs/AppointmentsDialog.java
trunk/ggc/src/ggc/gui/dialogs/DailyRowDialog.java
trunk/ggc/src/ggc/gui/dialogs/DailyStatsDialog.java
trunk/ggc/src/ggc/gui/dialogs/DoctorDialog.java
trunk/ggc/src/ggc/gui/dialogs/DoctorsDialog.java
trunk/ggc/src/ggc/gui/dialogs/PrintingDialog.java
trunk/ggc/src/ggc/gui/dialogs/PropertiesDialog.java
trunk/ggc/src/ggc/gui/dialogs/SchemeDialog.java
trunk/ggc/src/ggc/gui/dialogs/SchemeEDDialog.java
trunk/ggc/src/ggc/gui/dialogs/graphs/FrequencyGraphDialog.java
trunk/ggc/src/ggc/gui/dialogs/pen/PenDataAdditionalWizardOne.java
trunk/ggc/src/ggc/gui/dialogs/pen/PenDataAdditionalWizardTwo.java
trunk/ggc/src/ggc/gui/dialogs/pen/PenDataTypeComponent.java
trunk/ggc/src/ggc/gui/dialogs/ratio/RatioCalculatorDialog.java
trunk/ggc/src/ggc/gui/dialogs/ratio/RatioExtendedDialog.java
trunk/ggc/src/ggc/gui/little/GGCLittle.java
trunk/ggc/src/ggc/gui/little/panels/DailyStatsControlsL.java
trunk/ggc/src/ggc/gui/panels/info/AbstractInfoPanel.java
trunk/ggc/src/ggc/gui/panels/info/GeneralInfoPanel.java
trunk/ggc/src/ggc/gui/panels/info/HbA1cInfoPanel.java
trunk/ggc/src/ggc/gui/panels/info/InfoPanel.java
trunk/ggc/src/ggc/gui/panels/info/OtherInfoPanel.java
trunk/ggc/src/ggc/gui/panels/info/ScheduleInfoPanel.java
trunk/ggc/src/ggc/gui/panels/info/StatisticsInfoPanel.java
trunk/ggc/src/ggc/gui/panels/info/StocksInfoPanel.java
trunk/ggc/src/ggc/gui/panels/prefs/PrefFontsAndColorPane.java
trunk/ggc-cgm/src/ggc/cgm/device/GenericCGM.java
trunk/ggc-cgm/src/ggc/cgm/plugin/CGMPlugInServer.java
trunk/ggc-meter/build/GGCMeterToolVersion.properties
trunk/ggc-meter/src/GGCMeterTool_de.native.properties
trunk/ggc-meter/src/GGCMeterTool_de.properties
trunk/ggc-meter/src/GGCMeterTool_en.properties
trunk/ggc-meter/src/GGCMeterTool_fr.properties
trunk/ggc-meter/src/GGCMeterTool_si.properties
trunk/ggc-meter/src/ggc/meter/data/MeterValuesTableModel.java
trunk/ggc-meter/src/ggc/meter/device/AbstractSerialMeter.java
trunk/ggc-meter/src/ggc/meter/device/AbstractXmlMeter.java
trunk/ggc-meter/src/ggc/meter/device/DummyMeter.java
trunk/ggc-meter/src/ggc/meter/device/MeterInterface.java
trunk/ggc-meter/src/ggc/meter/device/accuchek/AccuChekSmartPix.java
trunk/ggc-meter/src/ggc/meter/device/accuchek/AccuChekSmartPixMeter.java
trunk/ggc-meter/src/ggc/meter/device/onetouch/OneTouchMeter.java
trunk/ggc-meter/src/ggc/meter/device/onetouch/OneTouchUltraSmart.java
trunk/ggc-meter/src/ggc/meter/plugin/MeterPlugInServer.java
trunk/ggc-plugin_base/build/GGCPlugInBaseBuild.properties
trunk/ggc-plugin_base/build/GGCPlugInBaseVersion.properties
trunk/ggc-plugin_base/src/ggc/plugin/data/DeviceValuesTableModel.java
trunk/ggc-plugin_base/src/ggc/plugin/device/DeviceInterface.java
trunk/ggc-plugin_base/src/ggc/plugin/gui/DeviceReaderRunner.java
trunk/ggc-plugin_base/src/ggc/plugin/manager/EmptyMgrDevices.java
trunk/ggc-plugin_base/src/ggc/plugin/protocol/DatabaseProtocol.java
trunk/ggc-plugin_base/src/ggc/plugin/protocol/SerialProtocol.java
trunk/ggc-plugin_base/src/ggc/plugin/util/DataAccessPlugInBase.java
trunk/ggc-pump/src/ggc/pump/device/AbstractSerialPump.java
trunk/ggc-pump/src/ggc/pump/device/AbstractXmlPump.java
trunk/ggc-pump/src/ggc/pump/device/GenericPump.java
trunk/ggc-pump/src/ggc/pump/device/animas/AnimasTest.java
trunk/ggc-pump/src/ggc/pump/plugin/PumpPlugInServer.java
trunk/web_page/inc_features.inc
Added Paths:
-----------
trunk/ggc/doc/AUTHORS.txt
trunk/ggc/doc/BUGS.txt
trunk/ggc/doc/COPYING.txt
trunk/ggc/doc/Changelog
trunk/ggc/doc/Diabetes_Hardware.txt
trunk/ggc/doc/How_Can_I_Help.txt
trunk/ggc/doc/IDEAS
trunk/ggc/doc/README.de
trunk/ggc/doc/README.en
trunk/ggc/doc/README.si
trunk/ggc/doc/README_1st
trunk/ggc/doc/README_1st.de
trunk/ggc/doc/README_1st.si
trunk/ggc/doc/TO-DO.txt
trunk/ggc/src/ggc/gui/panels/info/DeviceInfoPanel.java
trunk/ggc/src/ggc/gui/panels/info/PlugInsInfoPanel.java
trunk/ggc-cgm/doc/
trunk/ggc-cgm/doc/AUTHORS.txt
trunk/ggc-cgm/doc/COPYING.txt
trunk/ggc-cgm/doc/Changelog
trunk/ggc-cgm/doc/TO-DO_CGMTool.txt
trunk/ggc-meter/docs/AUTHORS.txt
trunk/ggc-meter/docs/COPYING.txt
trunk/ggc-meter/docs/Changelog
trunk/ggc-meter/docs/TO-DO_MeterTool.txt
trunk/ggc-plugin_base/docs/
trunk/ggc-plugin_base/docs/AUTHORS.txt
trunk/ggc-plugin_base/docs/COPYING.txt
trunk/ggc-plugin_base/docs/Changelog
trunk/ggc-pump/docs/
trunk/ggc-pump/docs/AUTHORS.txt
trunk/ggc-pump/docs/COPYING.txt
trunk/ggc-pump/docs/Changelog
trunk/ggc-pump/docs/TO-DO_PumpTool.txt
Removed Paths:
-------------
trunk/ggc/src/AUTHORS
trunk/ggc/src/BUGS.txt
trunk/ggc/src/COPYING
trunk/ggc/src/Changelog
trunk/ggc/src/Diabetes_Hardware.txt
trunk/ggc/src/How_Can_I_Help.txt
trunk/ggc/src/IDEAS
trunk/ggc/src/README
trunk/ggc/src/README.de
trunk/ggc/src/README.si
trunk/ggc/src/README_1st
trunk/ggc/src/README_1st.de
trunk/ggc/src/README_1st.si
trunk/ggc/src/TO-DO.txt
trunk/ggc/src/USB-How-To.txt
trunk/ggc/src/ggc/core/util/BGInputVerifier.java
trunk/ggc/src/ggc/core/util/DateInputVerifier.java
trunk/ggc/src/ggc/core/util/TimeInputVerifier.java
trunk/ggc/src/ggc/core/util/VersionChecker.java
trunk/ggc-cgm/src/AUTHORS
trunk/ggc-cgm/src/COPYING
trunk/ggc-cgm/src/Changelog
trunk/ggc-cgm/src/TO-DO_CGMTool.txt
trunk/ggc-meter/src/AUTHORS
trunk/ggc-meter/src/COPYING
trunk/ggc-meter/src/Changelog
trunk/ggc-meter/src/TO-DO_MeterTool.txt
trunk/ggc-meter/src/ggc/meter/device/onetouch/tst/
trunk/ggc-plugin_base/src/AUTHORS
trunk/ggc-plugin_base/src/COPYING
trunk/ggc-plugin_base/src/Changelog
trunk/ggc-pump/src/AUTHORS
trunk/ggc-pump/src/COPYING
trunk/ggc-pump/src/Changelog
trunk/ggc-pump/src/TO-DO_PumpTool.txt
Modified: trunk/ggc/build/GGCVersion.properties
===================================================================
--- trunk/ggc/build/GGCVersion.properties 2008-12-12 22:28:45 UTC (rev 622)
+++ trunk/ggc/build/GGCVersion.properties 2008-12-14 19:46:52 UTC (rev 623)
@@ -6,13 +6,13 @@
#
# Core Version
#
-ggc-core.version=0.3.9
+ggc-core.version=0.3.10
#
# Main GUI Version (this version is same as Core always)
#
-ggc-main.version=0.3.9
+ggc-main.version=0.3.10
#
@@ -24,5 +24,5 @@
#
# Lang version (this one has it's own versioning too). See history.txt
#
-ggc-lang.version=0.2.7
+ggc-lang.version=0.2.8
Modified: trunk/ggc/data/GGC_Config.properties
===================================================================
--- trunk/ggc/data/GGC_Config.properties 2008-12-12 22:28:45 UTC (rev 622)
+++ trunk/ggc/data/GGC_Config.properties 2008-12-14 19:46:52 UTC (rev 623)
@@ -1,6 +1,6 @@
#
# GGC_Config (Settings for GGC)
-#9.12.2008 18:56:23
+#12.12.2008 17:35:57
#
# Don't edit by hand
# Only settings need for application startup are written here. All other info
@@ -85,4 +85,4 @@
#
# Language Selector
#
-SELECTED_LANG=si
+SELECTED_LANG=en
Modified: trunk/ggc/data/update/GGC_Update.properties
===================================================================
--- trunk/ggc/data/update/GGC_Update.properties 2008-12-12 22:28:45 UTC (rev 622)
+++ trunk/ggc/data/update/GGC_Update.properties 2008-12-14 19:46:52 UTC (rev 623)
@@ -74,16 +74,16 @@
COMPONENT_1_GROUP=1
COMPONENT_1_NAME=GGC Main
COMPONENT_1_VERSION=0.3
-COMPONENT_1_VERSION_NUM=1
+COMPONENT_1_VERSION_NUM=2
COMPONENT_1_ROOT_DIR=/lib/ggc
-COMPONENT_1_FILES=%ROOT%/ggc-main-0.3.3.jar
+COMPONENT_1_FILES=%ROOT%/ggc-main-0.3.10.jar
COMPONENT_2_GROUP=1
COMPONENT_2_NAME=GGC Core
COMPONENT_2_VERSION=0.3
-COMPONENT_2_VERSION_NUM=1
+COMPONENT_2_VERSION_NUM=2
COMPONENT_2_ROOT_DIR=/lib/ggc
-COMPONENT_2_FILES=%ROOT%/ggc-core-0.3.3.jar
+COMPONENT_2_FILES=%ROOT%/ggc-core-0.3.10.jar
COMPONENT_3_GROUP=1
COMPONENT_3_NAME=GGC Little
@@ -95,27 +95,27 @@
COMPONENT_4_GROUP=1
COMPONENT_4_NAME=GGC Lang
-COMPONENT_4_VERSION=0.2.5
-COMPONENT_4_VERSION_NUM=1
+COMPONENT_4_VERSION=0.2.8
+COMPONENT_4_VERSION_NUM=2
COMPONENT_4_ROOT_DIR=/lib/ggc
-COMPONENT_4_FILES=%ROOT%/ggc-lang-0.2.7.jar
+COMPONENT_4_FILES=%ROOT%/ggc-lang-0.2.8.jar
COMPONENT_5_GROUP=2
COMPONENT_5_NAME=GGC Plugin Base
-COMPONENT_5_VERSION=0.1.5
-COMPONENT_5_VERSION_NUM=1
+COMPONENT_5_VERSION=0.2.4
+COMPONENT_5_VERSION_NUM=2
COMPONENT_5_ROOT_DIR=/lib/ggc
-COMPONENT_5_FILES=%ROOT%/ggc-plugin_base-0.1.5.jar
+COMPONENT_5_FILES=%ROOT%/ggc-plugin_base-0.2.4.jar
COMPONENT_6_GROUP=2
COMPONENT_6_NAME=Meter Tool
-COMPONENT_6_VERSION=0.3.3
-COMPONENT_6_VERSION_NUM=1
+COMPONENT_6_VERSION=1.0.4
+COMPONENT_6_VERSION_NUM=2
COMPONENT_6_ROOT_DIR=/lib/ggc
-COMPONENT_6_FILES=%ROOT%/ggc-meter_tool-0.3.3.jar
+COMPONENT_6_FILES=%ROOT%/ggc-meter_tool-1.0.4.jar
COMPONENT_7_GROUP=2
COMPONENT_7_NAME=Pump Tool
@@ -152,9 +152,9 @@
COMPONENT_11_GROUP=3
COMPONENT_11_NAME=Atech Tools
COMPONENT_11_VERSION=0.2.1
-COMPONENT_11_VERSION_NUM=1
+COMPONENT_11_VERSION_NUM=3
COMPONENT_11_ROOT_DIR=/lib/utils
-COMPONENT_11_FILES=%ROOT%/atech-tools-0.2.4.jar
+COMPONENT_11_FILES=%ROOT%/atech-tools-0.2.8.jar
COMPONENT_12_GROUP=3
COMPONENT_12_NAME=iText Pdf Library
@@ -186,12 +186,12 @@
COMPONENT_15_GROUP=3
COMPONENT_15_NAME=JFreeChart
-COMPONENT_15_VERSION=1.0.9
-COMPONENT_15_VERSION_NUM=1
+COMPONENT_15_VERSION=1.0.10
+COMPONENT_15_VERSION_NUM=2
COMPONENT_15_ROOT_DIR=/lib/jfreechart
-COMPONENT_15_FILES=%ROOT%/jcommon-1.0.12.jar;%ROOT%/jfreechart-1.0.9.jar;%ROOT%/jfreechart-1.0.9-experimental.jar;%ROOT%/jfreechart-1.0.9-swt.jar;%ROOT%/swtgraphics2d.jar
+#COMPONENT_15_FILES=%ROOT%/jcommon-1.0.12.jar;%ROOT%/jfreechart-1.0.9.jar;%ROOT%/jfreechart-1.0.9-experimental.jar;%ROOT%/jfreechart-1.0.9-swt.jar;%ROOT%/swtgraphics2d.jar
+COMPONENT_15_FILES=%ROOT%/jcommon-1.0.13.jar;%ROOT%/jcommon-xml-1.0.13.jar;%ROOT%/jfreechart-1.0.10.jar
-
COMPONENT_16_GROUP=3
COMPONENT_16_NAME=Java Help
COMPONENT_16_VERSION=2.0.5
Copied: trunk/ggc/doc/AUTHORS.txt (from rev 583, trunk/ggc/src/AUTHORS)
===================================================================
--- trunk/ggc/doc/AUTHORS.txt (rev 0)
+++ trunk/ggc/doc/AUTHORS.txt 2008-12-14 19:46:52 UTC (rev 623)
@@ -0,0 +1,34 @@
+GNU Gluco Control AUTHORS file
+==============================
+
+Current developers:
+--------------------
+
+ Dieter Schultschik <sc...@us...>
+ Create basic look of application, whole statistic, and everything that was application.
+
+ Aleksander Rozman <and...@us...>
+ I18n, Slovene translation, Reworking of whole database concept, added nutritions, major changes in
+ whole GUI, added plugins, working on most of plugins
+
+ Reinhold Rumberger <ru...@us...>
+ Fixing bugs, extreme testing (especially for linux platform), reworking graphs, German translation
+
+ Tom S. <ptolomy1977@@users.sourceforge.net>
+ French translation, graphs
+
+
+Not developer anymore:
+-----------------------
+ Stephan Schrader <ssc...@us...>
+ Old meter import framework. Code of his is still arround, but unused, we are trying to move some
+ supported meters into new framework.
+
+
+
+Plugins Developers (detailed information in each plugin, here is just a list)
+=============================================================================
+
+Aleksander Rozman (M,P,C)
+Nate Barish [Innominate227] (P) [Retired]
+Magnus Odell (P)
Property changes on: trunk/ggc/doc/AUTHORS.txt
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision
Added: svn:mergeinfo
+
Added: svn:eol-style
+ native
Copied: trunk/ggc/doc/BUGS.txt (from rev 583, trunk/ggc/src/BUGS.txt)
===================================================================
--- trunk/ggc/doc/BUGS.txt (rev 0)
+++ trunk/ggc/doc/BUGS.txt 2008-12-14 19:46:52 UTC (rev 623)
@@ -0,0 +1,144 @@
+Know Bugs:
+
+ - [sf] german translation is somewhat behind schedule
+ - [sf] changes made to "medical data" don't get applied to "Colors & Fonts" until dialog is re-opened
+ A: changes are saved on exit of dialog... I guess we have to change that.
+ - this is a general problem whenever a static layout is used, but german strings
+ tend to be a bit longer that their english counterparts, resulting in a lot of
+ truncated strings
+ A: We need to discover which labels have problems and make them bigger if
+ possible. If it can't be done abbrev. must be used. We don't actually use
+ static layout... I use null layout, because most of java's layouts are
+ unpredictable
+ R: So, how's null layout not java's static layout? I know about their
+ unpredictability (boy, do I!), but they at least adapt sizes to fit the contents
+ A: They are too unpredictable for my test, so we will stay with static for now. If string is too big it will be
+ cut off
+ - The code relies on there being at least one entry per day; days without entries will be ignored in the date range selection code, resulting
+ in the GlucoValues passed to CourseGraphView.setGlucoValues() containing only one day if there is only one value in the database, even if
+ a larger range was selected. (The problem lies in GlucoValues.getDayCount(), see FIXME-comment)
+ - When entering BG, CH, insulin data, negative values can be entered. Negative BG gets set to 0 without warning. BTW: they don't get drawn,
+ but that doesn't excuse them being accepted!
+ (We're great! We make it possible for people to puke, squeeze insulin from their fat tissue and even live with no sugar at all in their bloodstream!)
+ - Setting a colour for one "color scheme" will change it for the rest, too.
+ - Restore: Browse dialog should open in ../data/export
+ - Restore: Description on first window is little "off" on FreeBSD
+ - GI/GL not implemented
+ - Daily Food Selector has problem when selecting meals... not all nutrients are displayed
+
+
+Not A Bug:
+ - "New Entry" dialog should only contain one of mg/dl and mmol/l Fields,
+ depending on preferences.
+ * This is not a bug. It's feature
+ * It was a bug before the other field was updated when one lost focus
+ - If e.g. the USDA DB is opened, GGC won't react to a "Close" command from the task bar (at least in KDE)
+ A: This must be internal problem with KDE. Dialogs are set to be modal, this works ok with windows
+ A: This is confirmed as KDE problem. Problem is solved with KDE 5 at least I think it is. I couldn't reproduce
+ it there (on FreeBSD)
+
+
+Bugs fixed in version X:
+
+
+0.3.5
+ - I18n TAGS missing: EDIT_FOOD_GROUP
+ - Statistics for Main Screen invalid for BG
+ - Statistics for Daily Value Stats invalid for BG
+
+0.3.x
+ - when a settings change could not be propagated to the database (sql exception
+ or whatever), the changes are still applied to GGC, but obviously can't be
+ loaded from the DB on startup; the behaviour in this case should be as if the
+ user had selected "Cancel"
+ A: When there is problem with database, program shouldn't even start... This is fixed in new version only
+ requirement is that you use our startup scripts (run_<os_name>), they call special checker that
+ creates info file, which is read by GGC on start
+ - After data was entered (DailyStatsDialog, etc.), it will be appended to the table instead of being inserted where it belongs.
+ A: This was fixed, at least for DailyStatsDialog
+
+
+0.2.16
+ - GGC Little: meters button is unresponsive
+ - GGC Little: About button is static (problematic when size is changed)
+ - GGCLittle -> (no data in DB) New Entry -> the following message:
+0 year: 200 month: 85 day: 21 hour: 0 min: 0
+Exception in thread "AWT-EventQueue-0" java.lang.ArrayIndexOutOfBoundsException: 84
+ at com.atech.graphics.components.DateTimeComponent.setDateTime(DateTimeComponent.java:332)
+ at ggc.gui.dialogs.DailyRowDialog.setDate(DailyRowDialog.java:285)
+ at ggc.gui.dialogs.DailyRowDialog.initParameters(DailyRowDialog.java:238)
+ at ggc.gui.dialogs.DailyRowDialog.<init>(DailyRowDialog.java:199)
+ at ggc.gui.little.DailyStatsControlsL.actionPerformed(DailyStatsControlsL.java:161)
+ at javax.swing.AbstractButton.fireActionPerformed(AbstractButton.java:1849)
+ at javax.swing.AbstractButton$Handler.actionPerformed(AbstractButton.java:2169)
+ at javax.swing.DefaultButtonModel.fireActionPerformed(DefaultButtonModel.java:420)
+ at javax.swing.DefaultButtonModel.setPressed(DefaultButtonModel.java:258)
+ at javax.swing.plaf.basic.BasicButtonListener.mouseReleased(BasicButtonListener.java:236)
+ at java.awt.Component.processMouseEvent(Component.java:5517)
+ at javax.swing.JComponent.processMouseEvent(JComponent.java:3135)
+ at java.awt.Component.processEvent(Component.java:5282)
+ at java.awt.Container.processEvent(Container.java:1966)
+ at java.awt.Component.dispatchEventImpl(Component.java:3984)
+ at java.awt.Container.dispatchEventImpl(Container.java:2024)
+ at java.awt.Component.dispatchEvent(Component.java:3819)
+ at java.awt.LightweightDispatcher.retargetMouseEvent(Container.java:4212)
+ at java.awt.LightweightDispatcher.processMouseEvent(Container.java:3892)
+ at java.awt.LightweightDispatcher.dispatchEvent(Container.java:3822)
+ at java.awt.Container.dispatchEventImpl(Container.java:2010)
+ at java.awt.Window.dispatchEventImpl(Window.java:1791)
+ at java.awt.Component.dispatchEvent(Component.java:3819)
+ at java.awt.EventQueue.dispatchEvent(EventQueue.java:463)
+ at java.awt.EventDispatchThread.pumpOneEventForHierarchy(EventDispatchThread.java:242)
+ at java.awt.EventDispatchThread.pumpEventsForHierarchy(EventDispatchThread.java:163)
+ at java.awt.EventDispatchThread.pumpEvents(EventDispatchThread.java:157)
+ at java.awt.EventDispatchThread.pumpEvents(EventDispatchThread.java:149)
+ at java.awt.EventDispatchThread.run(EventDispatchThread.java:110)
+
+
+0.2.15.1
+ - Backup without anything selected will cause a ZipException
+ - Slovene translation is done
+
+
+0.2.12:
+ - [sf] changing time in entry will not re-order cells
+ - [sf] Entering plain text in numerical only fields should at least result in a warning (is ignored, and the numerical value is set to 0)
+ - Add Entry -> Edit Food -> Add -> Cancel will still attempt to add something
+
+0.2.9.9:
+ - months not translated !!
+ Andy: fixed
+ - [sf] mmol values are rounded to ints, which does not make sense
+ Andy: all BG values are saved as mg/dl format (in db), so they aren't rounded,
+ they are converted
+ - [sf] Title for spread graph suggests a lost key in GGC_*.properties
+ Andy: fixed
+ - [sf] "DAILY_CONTROL", "SHOW_DAILY_GRAPH" and "DAILY_VALUES" missing in GGC Little
+ Andy: added
+ - [sf] switching L&F from CDE/Motif to SkinLF doesn't result in settings being saved : can't reproduce, you must
+ click on OK to save changes... IS THIS STILL THERE? (see sf)
+ Andy: fixed
+ - HbA1c-Frame: "your current HbA1c" is right-aligned, which looks crappy
+ Andy: total change of this dialog.
+
+0.2.x.x:
+ - L&F loading is inconsistent (makes a hardcoded assumption where themepacks are stored) and currently fails
+ on Linux (and probably because of that) -- You need to have files in specified directory,
+ which is ../data/skinlf_themes/ - Andy
+ - at least one undiscovered infinite loop, can't reproduce, happened while the preferences frame was open (found by: developer rumbi)
+ (not sure whether/how this was fixed, but since I haven't seen this in ages, and pretty much everything
+ has been changed, I guess this was fixed along the way)
+ - infinite loop when trying to display hba1c without data (rumbi): can't reproduce, looks ok. (andy)
+ (same as above)
+
+0.2.9.3
+ - division by zero when displaying graphs without data (RR)
+
+0.2.5.3:
+ - In Preferences->General: changing language also changes selected L&F name, but not class
+ - Changed preferences mostly apply only after restart (names, language)
+ - hba1c of 2.09% with ZERO readings...
+
+0.2.4.2:
+ - graphs axis: labels should start at 0, not 4 (works for mg/dl but not mmol/l)
+ (NOTE: seems to have been a rounding error due to using ints)
Property changes on: trunk/ggc/doc/BUGS.txt
___________________________________________________________________
Added: svn:mergeinfo
+
Copied: trunk/ggc/doc/COPYING.txt (from rev 583, trunk/ggc/src/COPYING)
===================================================================
--- trunk/ggc/doc/COPYING.txt (rev 0)
+++ trunk/ggc/doc/COPYING.txt 2008-12-14 19:46:52 UTC (rev 623)
@@ -0,0 +1,340 @@
+ GNU GENERAL PUBLIC LICENSE
+ Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+ 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+ Preamble
+
+ The licenses for most software are designed to take away your
+freedom to share and change it. By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users. This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it. (Some other Free Software Foundation software is covered by
+the GNU Library General Public License instead.) You can apply it to
+your programs, too.
+
+ When we speak of free software, we are referring to freedom, not
+price. Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+ To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+ For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have. You must make sure that they, too, receive or can get the
+source code. And you must show them these terms so they know their
+rights.
+
+ We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+ Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software. If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+ Finally, any free program is threatened constantly by software
+patents. We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary. To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+ The precise terms and conditions for copying, distribution and
+modification follow.
+
+ GNU GENERAL PUBLIC LICENSE
+ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+ 0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License. The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language. (Hereinafter, translation is included without limitation in
+the term "modification".) Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope. The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+ 1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+ 2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+ a) You must cause the modified files to carry prominent notices
+ stating that you changed the files and the date of any change.
+
+ b) You must cause any work that you distribute or publish, that in
+ whole or in part contains or is derived from the Program or any
+ part thereof, to be licensed as a whole at no charge to all third
+ parties under the terms of this License.
+
+ c) If the modified program normally reads commands interactively
+ when run, you must cause it, when started running for such
+ interactive use in the most ordinary way, to print or display an
+ announcement including an appropriate copyright notice and a
+ notice that there is no warranty (or else, saying that you provide
+ a warranty) and that users may redistribute the program under
+ these conditions, and telling the user how to view a copy of this
+ License. (Exception: if the Program itself is interactive but
+ does not normally print such an announcement, your work based on
+ the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole. If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works. But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+ 3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+ a) Accompany it with the complete corresponding machine-readable
+ source code, which must be distributed under the terms of Sections
+ 1 and 2 above on a medium customarily used for software interchange; or,
+
+ b) Accompany it with a written offer, valid for at least three
+ years, to give any third party, for a charge no more than your
+ cost of physically performing source distribution, a complete
+ machine-readable copy of the corresponding source code, to be
+ distributed under the terms of Sections 1 and 2 above on a medium
+ customarily used for software interchange; or,
+
+ c) Accompany it with the information you received as to the offer
+ to distribute corresponding source code. (This alternative is
+ allowed only for noncommercial distribution and only if you
+ received the program in object code or executable form with such
+ an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it. For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable. However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+ 4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License. Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+ 5. You are not required to accept this License, since you have not
+signed it. However, nothing else grants you permission to modify or
+distribute the Program or its derivative works. These actions are
+prohibited by law if you do not accept this License. Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+ 6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions. You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+ 7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License. If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all. For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices. Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+ 8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded. In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+ 9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time. Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number. If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation. If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+ 10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission. For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this. Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+ NO WARRANTY
+
+ 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+ 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+ END OF TERMS AND CONDITIONS
+
+ How to Apply These Terms to Your New Programs
+
+ If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+ To do so, attach the following notices to the program. It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+ <one line to give the program's name and a brief idea of what it does.>
+ Copyright (C) <year> <name of author>
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+ Gnomovision version 69, Copyright (C) year name of author
+ Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+ This is free software, and you are welcome to redistribute it
+ under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License. Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary. Here is a sample; alter the names:
+
+ Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+ `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+ <signature of Ty Coon>, 1 April 1989
+ Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs. If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library. If this is what you want to do, use the GNU Library General
+Public License instead of this License.
Property changes on: trunk/ggc/doc/COPYING.txt
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision
Added: svn:mergeinfo
+
Added: svn:eol-style
+ native
Copied: trunk/ggc/doc/Changelog (from rev 583, trunk/ggc/src/Changelog)
===================================================================
--- trunk/ggc/doc/Changelog (rev 0)
+++ trunk/ggc/doc/Changelog 2008-12-14 19:46:52 UTC (rev 623)
@@ -0,0 +1,822 @@
+2008-11-12 (0.3.9) Andy Rozman <and...@us...>
+ * Fixed nutrition processing. Minor bug
+
+2008-10-10 (0.3.8) Andy Rozman <and...@us...>
+ * Most of printing of food menus done (missing just ext 3 type, which will be added later, if req.)
+ * Continuning to work on pump plugin base functionality (see Changes.txt in pump tool project)
+
+2008-10-02 (0.3.7) Andy Rozman <and...@us...>
+ * Added dialog for starting printing for food menu
+ * Printing of base food menu has errors: meals are displayed as their sub-items not as meal as whole, and some
+ months throw exception. Work on this is suspended for time being.
+ * Added/finished 'How_To_Update.txt' and 'Update_0.3.1.txt' documents.
+
+2008-09-24 (0.3.6) Andy Rozman <and...@us...>
+ * Changing PrintFoodMenuBase class
+ * Extending DayValuesData to include date strings (localized)
+
+2008-09-9 (0.3.5) Andy Rozman <and...@us...>
+ * Added DayValuesData, which is used to contain DailiValues instances. It will either replace or super_class
+ WeeklyValues and MonthlyValues and all such collection classes
+ * Printing context will be extended. PrintAbstract class was created and all old Printing classes will use it
+ in the future, for now it will be used by PrintFoodMenu* classes
+ * Adding and moving entries in BUGS.txt
+ * Statistics for BG fixed in main application panel and in Daily Stats panel
+
+2008-08-24 (0.3.4) Reinhold Rumberger <ru...@us...>
+ * re-implemented the course graph using JFreeChart; code is extremely redundant
+ and should be rather slow.
+ * finished DataPlotSelectorPanel
+
+2008-08-24 Reinhold Rumberger <ru...@us...>
+ * finished commenting new classes
+ * brought GGC_de up-to-date
+
+2008-08-24 Reinhold Rumberger <ru...@us...>
+ * created MathUtils (abstract to prevent instantiation)
+
+2008-08-22 Reinhold Rumberger <ru...@us...>
+ * Added sample data to the graphs in the preferences.
+ * Deprecated part of GGCProperties so that it can be cleaned up a little (also sorted members
+ to make it easier to find the required member).
+ * renamed ggc.gui.view to ggc.gui.graphs
+ * created ggc.gui.dialogs.graphs and moved relevant classes there
+ * created DataPlotSelectorPanel and PlotData, so that no GraphViews need to depend on their
+ dialogs anymore.
+
+
+2008-08-22 Reinhold Rumberger <ru...@us...>
+ * migrated HbA1cView to JFreeChart, made HbA1cDialog use BorderLayout to get descent scaling.
+ * BUGS.txt updated
+
+2008-08-21 Reinhold Rumberger <ru...@us...>
+ * started using JFreeChart, using DailyGraphView to get to know it.
+
+2008-08-20 (0.3.3) Andy Rozman <and...@us...>
+ * Nutrition Tree is fixed (bug on FreeBSD system, maybe even on linux)
+ * Added How_To_Update.txt
+ * fixed statup creation for non-windows systems
+
+2008-08-20 (0.3.2) Andy Rozman <and...@us...>
+ * Bolus Helper fixes
+ * Source code changes to remove java warnings
+
+2008-08-13 (0.3.1) Andy Rozman <and...@us...>
+ * Bolus Helper first implementation (needed some fixes and also extended and basic ratios done)
+
+
+2008-07-26 (0.3) Andy Rozman <and...@us...>
+ * Version for release, minor changes to language file will be done for german language (probably), but
+ officialy we are in code freeze.
+ * README.si translation finished
+
+2008-07-24 (0.2.23) Andy Rozman <and...@us...>
+ * Finished and integrated Restore functionality
+ * Application is ready for release. There are just few translations to finish and we are ready to go.
+
+2008-07-10 Andy Rozman <and...@us...>
+ * Integrated Pump Tool into GGC
+
+2008-07-06 Reinhold Rumberger <ru...@us...>
+ * Some translation
+ * noticed that README.de line delimiter was LF and converted to CRLF
+
+2008-07-05 Reinhold Rumberger <ru...@us...>
+ * GGCMeterTool_de.properties prepared for translation & brought keys up-to-date
+ * cleaned up german language files' headers to make them look slightly more presentable
+
+2008-07-04 (0.2.22) Andy Rozman <and...@us...>
+ * Meter Tool implementation finished and tied into GGC (fully integrated)
+
+2008-07-04 Reinhold Rumberger <ru...@us...>
+ * README.de translated, Keys in GGC_*de brought up-to-date
+ * Added GGC_*de.native.properties, so that others can make changes that won't
+ be overwritten.
+ * moved version info to ggc.GGC, where it belongs; used Source->Format on
+ ggc.GGC
+ * Changelog: tabs -> spaces
+
+
+2008-07-02 (0.2.21) Andy Rozman <and...@us...>
+ * added documentation
+ * fixed food problem (we need to find out what is problem with decimals in java)
+
+2008-06-30 (0.2.20.4) Andy Rozman <and...@us...>
+ * Error dialog finsihed and integrated into Printing Dialog (this is first dialog that uses extended
+ error dialogs)
+
+2008-06-29 (0.2.20.3) Andy Rozman <and...@us...>
+ * fixed problem with adding new foods and meals
+ * fixed problem with meals tree (ids and refresh)
+ * tooltips are added with foods and meals, labels for name are usually long, so we also set tooltip so that
+ whole name is visible
+
+2008-06-28 (0.2.20.2) Andy Rozman <and...@us...>
+ * added JDecimalTextField to atech-tools, which needs to replace JFormattedTextField used for decimal numbers
+ replaced elements in Daily Values
+ * On new Daily Value, hour is set to current hour
+
+2008-06-25 (0.2.20.1) Andy Rozman <and...@us...>
+ * Changed CGM databases
+ * Db Version Change: Stable: v7, Development: v8
+ * Addded backup of Settings
+ * Total SVN directory structure redone
+ * fixed a lot of warnings
+
+2008-06-24 Reinhold Rumberger <ru...@us...>
+ * updated GGC_de & GGC_Nutrition_de to include all new keywords
+
+2008-06-20 (0.2.19.1) Andy Rozman <and...@us...>
+ * Changed plugin system and moved instances of plugins into DataAccess class
+ * Added CGMS context (Continous Glucose Monitoring System), see IDEAS file
+ * Created runner for DbInit, DbApplication, DbImport
+ * Daily overview now displays date in title, and Sunday is now colored red (label)
+
+2008-06-15 (0.2.18.2) Andy Rozman <and...@us...>
+ * Db Check was fully implemented and now Db Checking was added on start of application. If version of
+ database is not the same as those specified in GGC_Update.properties software doesn't start
+
+2008-06-10 (0.2.18.1) Andy Rozman <and...@us...>
+ * Db Version Change: Stable: v6, Development: v7
+ * We are now officaially using USDA SR-20 (older DBs were filled with SR-18)
+ * There were several tables added for Pump Tool, it shouldn't be done before the end of year, but it
+ might happen. Designing of tables is finished, and probably there will be at least import for
+ some of pumps (for Roche's family which uses Smart Pix device, which will be supported soon)
+
+2008-06-08 (0.2.17.1) Andy Rozman <and...@us...>
+ * data fix of HbA1c (new formula and we calculate values for last 3 months)
+ * also fixed dialog for HbA1c
+ * fixed calculations of foods (wrong display of values in MealView and calculation in DailyValues)
+
+2008-05-25 (0.2.16.2) Andy Rozman <and...@us...>
+ * bug fixing foods stuff
+ * added glycemic processing as seperate entity (not finished yet), maels db is currently not working
+ with connection to adding to daily values
+ * menus changes
+
+2008-05-25 (0.2.16.1) Andy Rozman <and...@us...>
+ * GGC Little was changed. Button for meter removed and upper left corner is now tabbed, so that it can contain
+ several panels.
+ * Added panels to GGC Little: plug-ins panel, stocks panel, and older ones were reformed a little.
+ * bug fixing all GGC Little stuff in bugs
+
+2008-05-24 (0.2.15) Andy Rozman <and...@us...>
+ * changes to nutrition tables
+ * Changes to database xml files, new version of Internal Db (H2), now it also has some foods in user table
+ * Db Version Change: Stable: v5, Development: v6
+ * README is now written and ready for deployment (translation of readme is needed, for each language)
+ * changes to english lang file
+ * Slovenian translation finished (for now)
+ * changed main theme
+ * some minor changed in code (some dialogs were readjusted)
+
+2008-05-23 Reinhold Rumberger <ru...@us...>
+ * README: spell & grammar check
+ * README.de: startet
+
+2008-05-20 (0.2.14) Andy Rozman <and...@us...>
+ * adding log4j support to GGCDb and some other important classes
+ * checking log4j configurations
+
+2008-05-21 Reinhold Rumberger <ru...@us...>
+ * fixed date display bug in course graph - still looks ugly though
+ * GGCLittle now uses the same about-dialog as the rest of ggc
+ * translation
+ * corrected bug in DailyValues: getDayAndMonthAsString() and getDateAsString()
+
+2008-05-19 Reinhold Rumberger <ru...@us...>
+ * Fixed a bug where selecting cancel in "Meals, Foods Selector"
+ (or selecting nothing) would cause several NullPointerExceptions
+ * translation
+
+2008-05-15 (0.2.13) Andy Rozman <and...@us...>
+ * bug fixes to nutrition database gui (should be working, testing is
+ underway).
+
+2008-05-14 (0.2.12) Andy Rozman <and...@us...>
+ * Implementation of DailyValueEntry adding Food (connecting foods
+ databases, with daily entries)
+ * some bugs fixed
+ * Atech-Tools 0.1.14 needed
+
+2008-05-11 Reinhold Rumberger <ru...@us...>
+ * translation
+ * changed the statistics to display counts as integers (as there can be no
+ such thing as half an injection)
+ * fixed division-by-zero in getAvgBG()
+ * new bugs
+
+2008-05-08 (0.2.11) Andy Rozman <and...@us...>
+ * Changes to database xml files, new version of Internal Db (H2)
+ * Db Version Change: Stable: v4, Development: v5
+
+2008-05-03 (0.2.10) Andy Rozman <and...@us...>
+ * Startup has gone through big changes, UpdateConfig has changed much
+ so now Atech Tools (0.1.13) is needed
+ * Started work on Daily Values input for Foods
+
+2008-04-30 (0.2.9.12) Andy Rozman <and...@us...>
+ * Backup implementation finished
+ * Added some pumps menus (still in planning... don't worry)
+
+2008-04-29 (0.2.9.11) Andy Rozman <and...@us...>
+ * Backup implementation 0.1 finished (non-gui backup)
+ * Backup implementation 0.2 started (GUI)
+ * Daily Values input changed: validation done via JFormattedTextField, added
+ values for both types of BG (we had one before, but switching types make
+ that impossible). Double click opens edit.
+
+2008-04-24 Reinhold Rumberger <ru...@us...>
+ * german translation
+
+2008-04-18 Reinhold Rumberger <ru...@us...>
+ * german translation: keywords brought up-to-date
+ * GGC_Nutrition initialized
+ * slight corrections to english language files
+
+2008-03-22 (0.2.9.10) Andy Rozman <and...@us...>
+ * some files were moved to different packages (ggc.core package created), we
+ have now more distinct split beetween files for creation of different jars
+ From now on, we create 4 jars:
+ - ggc-core.jar: contains all classes needed by any GUI
+ - ggc-main.jar: contains main GUI (for main application)
+ - ggc-little.jar: containing Little GUI (resident version of GGC, that
+ can input only data for today)
+ - ggc-lang.jar: contains all language files and help files
+ * Nutrition and meals functionalities completed
+ * language files were split. Now we have main language file and nutrition
+ language file, which also contains translation for Nutritions in database
+ * changes to ant files (added new libraries, more jars creation and
+ versioning of created jars)
+ * export of nutrition db done (need to rework whole import/export stuff)
+ * work started on connecting nutrition databases to daily values entries
+
+
+2008-03-22 (0.2.9.9) Andy Rozman <and...@us...>
+ * see BUGS.txt (some of bugs were fixed)
+
+2008-03-22 (0.2.9.8) Andy Rozman <and...@us...>
+ * many changes in atech-tools, added selector, abstract DataAccess and some
+ other files. It is now required to use version of atech-tools
+ directly from sourceforge (SVN)
+ * changed db loading. Partitial loading and menus/toolbar displaying
+ * changed database to refect multi person functionality
+ * added javahelp framework
+ * added help buttons in whole application
+ * through whole application icons were added and some code chenged to
+ be able to do this
+ * meal db added and 80% implemented
+ * usda nutrition db fixed (90% done)
+ * user nutrition db work started (about 40% done)
+
+2008-03-02 Reinhold Rumberger <ru...@us...>
+ * german translation
+
+2008-02-13 Reinhold Rumberger <ru...@us...>
+ * added new keys to GGC_de
+ * fixed graph display offset bug
+
+2008-02-13 Reinhold Rumberger <ru...@us...>
+ * added entries from BUGS.txt marked with [sf] to sourceforge's bugtracker
+
+2008-02-13 (0.2.9.7) Andy Rozman <and...@us...>
+ * source code changes to be compilable on java 1.5
+ (java 1.5 compatibility must be maintained) !!!!
+ * use of atech-tools 0.1.9 required (java 1.5 compatibility issue)
+ * implementation of update/startup mechanism started in atech-tools (0.1.9), files
+ added to support testing on GGC. Startup will be implemented first, because update
+ functionality needs to have server side done, which will take some time.
+ * jar files creation will change in near future (instead of two files, we will produce
+ 3: ggc, ggc-core and ggc-little). ggc will contains files specific to main gui, while
+ core contains all data, db and utill classes. ggc-little contains only GGC Little
+ specific code. Change is planned and division has started.
+
+2008-02-08 (0.2.9.6) Andy Rozman <and...@us...>
+ * major changed to whole nutrition db and framework
+ * final changes to USDA nutrition databases
+ * menu changes
+ * finalized changes to Printing (added Extended)
+ * display plug-ins: meters_tool and pumps tool
+
+
+2008-01-29 (0.2.9.5) Andy Rozman <and...@us...>
+ * fixing daily input values
+
+2008-01-02 Reinhold Rumberger <ru...@us...>
+ * fix for NumberFormatException when no BG is entered
+ * a BG of 0 isn't shown as a value in the table or the dialog anymore
+
+2008-01-21 Reinhold Rumberger <ru...@us...>
+ * removed YOUR_CURRENT from GGC_en and GGC_de
+ * key "SPREAD_GRAPH" seems to have gone missing
+ * some more translation
+ * documented some bugs
+
+2008-01-20 (v0.2.9.2 - 0.2.9.4) Andy Rozman <and...@us...>
+ * Added code for future versions
+ * Import of old DailyValues data (from 0.3 export or MeterTool), just class, no gui
+ * fixing of several warnings that Eclipse produced
+ * main display changed, instead schedule we now have schedule and stocks.
+ * added dialogs for doctors and appointments (visible through developer version)
+ * changed code a little, to allow starting GGC in development mode (add any paramter
+ to startup class)
+ * atech-tools 0.1.8 linked to project
+ * meter tool project started (it's in same SVN just in another directory). All changes
+ that are relevant to meters (and not directly to GGC main are visible from path
+ /ggc-meter). TO-DO file is also changed, all meter specific tasks have been moved
+ to ggc-meter project.
+ * ant build files changed (GGCBuild.properties_default)
+ * nutrition (usdb) db view fixed, nutrition (USDb) is with this change finished
+
+2008-01-20 Reinhold Rumberger <ru...@us...>
+ * removed a couple of @Override Tags to make to project compile again
+ * sync between GGC_de and GGC_en
+ * small correction of slovene that slipped into GGC_en
+ * fixed some small problems with graphs display when no data is present
+
+2008-01-13 Reinhold Rumberger <ru...@us...>
+ * updated german translation
+ * corrected english translation
+ * small fix to maintain ability to translate to german
+
+2008-01-12 Reinhold Rumberger <ru...@us...>
+ * updated german translation to include new strings (no actual translation yet)
+
+2008-01-06 (v0.2.9.1) Andy Rozman <and...@us...>
+ * adding new daily entry changed, some options are still unavailable, but it has totally new look
+ * BG data is now written in mg/dl format, user can select on entry in which format he wishes to write
+ * about dialog finalized
+ * bugs with daily data fixed
+ * delete changed
+ * added new menus for future functionalities
+ * fixed menu's mnemonic display
+ * slovenian translation updated
+ * meter support removed, at least for any new devices ... meter support will be done through separate
+ project, called meter_tool in next release
+ * changes to main gui
+ * atech-tools 0.1.7 linked to project (about dialog mainly, several component: DateTimeComponent,
+ I18nControl moved)
+ * build fixed, with support for newer version of libraries (ggc-support updated)
+
+
+
+2006-04-04 Reinhold Rumberger <ru...@us...>
+ * updated german translation
+
+2006-04-02 (v0.2.5.3) Andy Rozman <and...@us...>
+ * Bug fixes (from BUGS.txt):
+ - In Preferences->General: changing language also changes selected L&F name, but not class
+ - Changed preferences mostly apply only after restart (names, language)
+ - hba1c of 2.09% with ZERO readings...
+
+
+2006-04-01 (v0.2.5.2) Andy Rozman <and...@us...>
+ * Fixing reading of configuration
+ * Refresh of Info panels fixed
+ * Extensive database changes, a lot of added files to ggc.db.hibernate (some of files also removed):
+ - added: Doctors (doctor types, doctors, appointments), Stocks (stock type, srock subtype, stocks),
+ Nutrition (added global data, changed nutrition from usdb, added user nut...
[truncated message content] |
|
From: <and...@us...> - 2009-02-15 21:03:42
|
Revision: 660
http://ggc.svn.sourceforge.net/ggc/?rev=660&view=rev
Author: andyrozman
Date: 2009-02-15 21:03:35 +0000 (Sun, 15 Feb 2009)
Log Message:
-----------
Modified Paths:
--------------
trunk/ggc/.classpath
trunk/ggc/build/GGCVersion.properties
trunk/ggc/data/GGC_Config.properties
trunk/ggc/data/update/GGC_Update.properties
trunk/ggc/doc/Changelog
trunk/ggc/doc/README.de
trunk/ggc/doc/README.en
trunk/ggc/doc/README.si
trunk/ggc/doc/README_1st_v2.si
trunk/ggc/doc/USB-How-To_si.txt
trunk/ggc/src/GGC_en.properties
trunk/ggc/src/GGC_si.properties
trunk/ggc/src/ggc/GGC.java
trunk/ggc/src/ggc/core/data/graph/GraphViewHbA1c.java
trunk/ggc/src/ggc/core/plugins/PumpsPlugIn.java
trunk/ggc/src/ggc/core/print/PrintFoodMenuAbstract.java
trunk/ggc/src/ggc/core/print/PrintFoodMenuBase.java
trunk/ggc/src/ggc/core/print/PrintFoodMenuExt1.java
trunk/ggc/src/ggc/core/print/PrintFoodMenuExt2.java
trunk/ggc/src/ggc/core/print/PrintFoodMenuExt3.java
trunk/ggc/src/ggc/core/util/DataAccess.java
trunk/ggc/src/ggc/gui/MainFrame.java
trunk/ggc/src/ggc/gui/dialogs/DailyRowDialog.java
trunk/ggc/src/ggc/gui/dialogs/DailyRowMealsDialog.java
trunk/ggc/src/ggc/gui/dialogs/DoctorDialog.java
trunk/ggc/src/ggc/gui/dialogs/HbA1cDialog.java
trunk/ggc/src/ggc/gui/dialogs/graphs/HbA1cDialog.java
trunk/ggc-meter/build/GGCMeterToolVersion.properties
trunk/ggc-meter/docs/Changelog
trunk/ggc-meter/src/ggc/meter/device/accuchek/AccuChekActive.java
trunk/ggc-meter/src/ggc/meter/device/accuchek/AccuChekAdvantage.java
trunk/ggc-meter/src/ggc/meter/device/accuchek/AccuChekAviva.java
trunk/ggc-meter/src/ggc/meter/device/accuchek/AccuChekComfort.java
trunk/ggc-meter/src/ggc/meter/device/accuchek/AccuChekCompact.java
trunk/ggc-meter/src/ggc/meter/device/accuchek/AccuChekCompactPlus.java
trunk/ggc-meter/src/ggc/meter/device/accuchek/AccuChekGo.java
trunk/ggc-meter/src/ggc/meter/device/accuchek/AccuChekIntegra.java
trunk/ggc-meter/src/ggc/meter/device/accuchek/AccuChekPerforma.java
trunk/ggc-meter/src/ggc/meter/device/accuchek/AccuChekSensor.java
trunk/ggc-meter/src/ggc/meter/device/accuchek/AccuChekSmartPixMeter.java
trunk/ggc-meter/src/ggc/meter/device/ascensia/AscensiaBreeze.java
trunk/ggc-meter/src/ggc/meter/device/ascensia/AscensiaBreeze2.java
trunk/ggc-meter/src/ggc/meter/device/ascensia/AscensiaContour.java
trunk/ggc-meter/src/ggc/meter/device/ascensia/AscensiaContourLink.java
trunk/ggc-meter/src/ggc/meter/device/ascensia/AscensiaDEX.java
trunk/ggc-meter/src/ggc/meter/device/ascensia/AscensiaEliteXL.java
trunk/ggc-meter/src/ggc/meter/device/ascensia/AscensiaMeter.java
trunk/ggc-meter/src/ggc/meter/device/onetouch/OneTouchBasic.java
trunk/ggc-meter/src/ggc/meter/device/onetouch/OneTouchFastTake.java
trunk/ggc-meter/src/ggc/meter/device/onetouch/OneTouchII.java
trunk/ggc-meter/src/ggc/meter/device/onetouch/OneTouchInDuo.java
trunk/ggc-meter/src/ggc/meter/device/onetouch/OneTouchMeter.java
trunk/ggc-meter/src/ggc/meter/device/onetouch/OneTouchMeter2.java
trunk/ggc-meter/src/ggc/meter/device/onetouch/OneTouchProfile.java
trunk/ggc-meter/src/ggc/meter/device/onetouch/OneTouchSelect.java
trunk/ggc-meter/src/ggc/meter/device/onetouch/OneTouchSureStep.java
trunk/ggc-meter/src/ggc/meter/device/onetouch/OneTouchUltra.java
trunk/ggc-meter/src/ggc/meter/device/onetouch/OneTouchUltra2.java
trunk/ggc-meter/src/ggc/meter/device/onetouch/OneTouchUltraEasy.java
trunk/ggc-meter/src/ggc/meter/device/onetouch/OneTouchUltraLink.java
trunk/ggc-meter/src/ggc/meter/device/onetouch/OneTouchUltraSmart.java
trunk/ggc-meter/src/ggc/meter/manager/MeterManager.java
trunk/ggc-meter/src/ggc/meter/util/DataAccessMeter.java
trunk/ggc-plugin_base/build/GGCPlugInBaseBuild.properties
trunk/ggc-plugin_base/build/GGCPlugInBaseVersion.properties
trunk/ggc-plugin_base/docs/Changelog
trunk/ggc-pump/build/GGCPumpToolVersion.properties
trunk/ggc-pump/docs/Changelog
trunk/ggc-pump/src/GGCPumpTool_de.native.properties
trunk/ggc-pump/src/GGCPumpTool_de.properties
trunk/ggc-pump/src/GGCPumpTool_en.properties
trunk/ggc-pump/src/GGCPumpTool_fr.properties
trunk/ggc-pump/src/GGCPumpTool_si.properties
trunk/ggc-pump/src/ggc/core/db/hibernate/pump/PumpDataExtendedH.java
trunk/ggc-pump/src/ggc/pump/data/PumpValuesEntry.java
trunk/ggc-pump/src/ggc/pump/data/PumpValuesEntryExt.java
trunk/ggc-pump/src/ggc/pump/data/db/GGCPumpDb.java
trunk/ggc-pump/src/ggc/pump/data/defs/PumpAdditionalDataType.java
trunk/ggc-pump/src/ggc/pump/device/accuchek/AccuChekSmartPixPump.java
trunk/ggc-pump/src/ggc/pump/gui/manual/PumpDataAdditionalWizardOne.java
trunk/ggc-pump/src/ggc/pump/gui/manual/PumpDataAdditionalWizardTwo.java
trunk/ggc-pump/src/ggc/pump/gui/manual/PumpDataDialog.java
trunk/ggc-pump/src/ggc/pump/gui/manual/PumpDataRowDialog.java
trunk/ggc-pump/src/ggc/pump/gui/manual/PumpDataTableModel.java
trunk/ggc-pump/src/ggc/pump/gui/manual/PumpDataTypeComponent.java
trunk/ggc-pump/src/ggc/pump/plugin/PumpPlugInServer.java
trunk/ggc-pump/src/ggc/pump/util/DataAccessPump.java
trunk/web_page/inc_download.inc
trunk/web_page/inc_news.inc
Added Paths:
-----------
trunk/ggc-meter/src/ggc/meter/device/freestyle/Freestyle.java
trunk/ggc-meter/src/ggc/meter/device/freestyle/FreestyleFlash.java
trunk/ggc-meter/src/ggc/meter/device/freestyle/FreestyleFreedom.java
trunk/ggc-meter/src/ggc/meter/device/freestyle/FreestyleFreedomLite.java
trunk/ggc-meter/src/ggc/meter/device/freestyle/FreestyleLite.java
trunk/ggc-meter/src/ggc/meter/device/freestyle/FreestyleMeter.java
trunk/ggc-meter/src/ggc/meter/device/freestyle/FreestyleNavigator.java
trunk/ggc-meter/src/ggc/meter/device/freestyle/PrecisionXtra.java
trunk/ggc-pump/src/ggc/pump/data/PumpDailyStatistics.java
trunk/ggc-pump/src/ggc/pump/data/PumpValuesEntryProfile.java
trunk/ggc-support/lib/utils/atech-tools-0.3.2.jar
trunk/ggc-usb/
trunk/ggc-usb/freebsd/
trunk/ggc-usb/linux/
trunk/ggc-usb/mac/
trunk/ggc-usb/windows/
trunk/ggc-usb/windows/GVM_win.txt
trunk/ggc-usb/windows/bin/
trunk/ggc-usb/windows/bin/atech-tools-startup-1.0.jar
trunk/ggc-usb/windows/bin/run_win.bat
trunk/ggc-usb/windows/bin/setenv_atech.bat
trunk/ggc-usb/windows/bin/setenv_java_win.bat
trunk/ggc-usb/windows/java/
trunk/ggc-usb/windows/java/autorun/
trunk/ggc-usb/windows/java/autorun/autorun.inf
trunk/ggc-usb/windows/java/autorun/ggc.ico
trunk/ggc-usb/windows/java/autorun/run_windows.bat
trunk/ggc-usb/windows/lib/
trunk/ggc-usb/windows/lib/native/
trunk/ggc-usb/windows/lib/native/win/
trunk/ggc-usb/windows/lib/native/win/rxtxParallel.dll
trunk/ggc-usb/windows/lib/native/win/rxtxSerial.dll
trunk/web_page/docs/
trunk/web_page/docs/Changelog
trunk/web_page/docs/Diabetes_Hardware.txt
trunk/web_page/docs/How_Can_I_Help.txt
trunk/web_page/docs/How_To_Upgrade.txt
trunk/web_page/docs/How_To_Upgrade_de.txt
trunk/web_page/docs/How_To_Upgrade_si.txt
trunk/web_page/docs/IDEAS.txt
trunk/web_page/docs/README.de
trunk/web_page/docs/README.en
trunk/web_page/docs/README.si
trunk/web_page/docs/README_1st
trunk/web_page/docs/README_1st.de
trunk/web_page/docs/README_1st.si
trunk/web_page/docs/README_1st_v2
trunk/web_page/docs/README_1st_v2.de
trunk/web_page/docs/README_1st_v2.si
trunk/web_page/docs/TO-DO.txt
trunk/web_page/docs/USB-How-To.txt
trunk/web_page/docs/USB-How-To_de.txt
trunk/web_page/docs/USB-How-To_si.txt
trunk/web_page/docs/Update_0.3.1.txt
trunk/web_page/docs/Update_0.3.1_de.txt
trunk/web_page/docs/Update_0.3.1_si.txt
trunk/web_page/docs/database_info.txt
trunk/web_page/docs/ss
trunk/web_page/images/frequency.jpg
trunk/web_page/src/
trunk/web_page/src/ggc/
trunk/web_page/src/ggc/web/
trunk/web_page/src/ggc/web/servlets/
trunk/web_page/src/ggc/web/servlets/GGCNetworkServlet.java
trunk/web_page/src/ggc/web/servlets/ServletUtilities.java
Removed Paths:
-------------
trunk/ggc/data/debug_no_food.txt
trunk/ggc-support/lib/utils/atech-tools-0.2.1.jar
trunk/ggc-support/lib/utils/atech-tools-0.2.12.jar
trunk/ggc-support/lib/utils/atech-tools-0.2.5.jar
trunk/ggc-support/lib/utils/atech-tools-0.2.6.jar
Modified: trunk/ggc/.classpath
===================================================================
--- trunk/ggc/.classpath 2009-02-12 21:52:47 UTC (rev 659)
+++ trunk/ggc/.classpath 2009-02-15 21:03:35 UTC (rev 660)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
+ <classpathentry combineaccessrules="false" exported="true" kind="src" path="/Atech-Tools"/>
<classpathentry excluding="**/.svn/**" kind="src" path="src"/>
- <classpathentry combineaccessrules="false" exported="true" kind="src" path="/Atech-Tools"/>
<classpathentry combineaccessrules="false" exported="true" kind="src" path="/GGC Meter Tool">
<accessrules>
<accessrule kind="accessible" pattern="**/icons/**"/>
Modified: trunk/ggc/build/GGCVersion.properties
===================================================================
--- trunk/ggc/build/GGCVersion.properties 2009-02-12 21:52:47 UTC (rev 659)
+++ trunk/ggc/build/GGCVersion.properties 2009-02-15 21:03:35 UTC (rev 660)
@@ -6,13 +6,13 @@
#
# Core Version
#
-ggc-core.version=0.3.15
+ggc-core.version=0.4
#
# Main GUI Version (this version is same as Core always)
#
-ggc-main.version=0.3.15
+ggc-main.version=0.4
#
@@ -24,4 +24,4 @@
#
# Lang version (this one has it's own versioning too). See history.txt
#
-ggc-lang.version=0.2.9
+ggc-lang.version=0.3.1
Modified: trunk/ggc/data/GGC_Config.properties
===================================================================
--- trunk/ggc/data/GGC_Config.properties 2009-02-12 21:52:47 UTC (rev 659)
+++ trunk/ggc/data/GGC_Config.properties 2009-02-15 21:03:35 UTC (rev 660)
@@ -1,6 +1,6 @@
#
# GGC_Config (Settings for GGC)
-#17.1.2009 16:37:36
+#11.9.2008 22:37:49
#
# Don't edit by hand
# Only settings need for application startup are written here. All other info
Deleted: trunk/ggc/data/debug_no_food.txt
===================================================================
--- trunk/ggc/data/debug_no_food.txt 2009-02-12 21:52:47 UTC (rev 659)
+++ trunk/ggc/data/debug_no_food.txt 2009-02-15 21:03:35 UTC (rev 660)
@@ -1 +0,0 @@
-
Modified: trunk/ggc/data/update/GGC_Update.properties
===================================================================
--- trunk/ggc/data/update/GGC_Update.properties 2009-02-12 21:52:47 UTC (rev 659)
+++ trunk/ggc/data/update/GGC_Update.properties 2009-02-15 21:03:35 UTC (rev 660)
@@ -73,17 +73,17 @@
COMPONENT_1_GROUP=1
COMPONENT_1_NAME=GGC Main
-COMPONENT_1_VERSION=0.3.14
+COMPONENT_1_VERSION=0.4
COMPONENT_1_VERSION_NUM=2
COMPONENT_1_ROOT_DIR=/lib/ggc
-COMPONENT_1_FILES=%ROOT%/ggc-main-0.3.15.jar
+COMPONENT_1_FILES=%ROOT%/ggc-main-0.4.jar
COMPONENT_2_GROUP=1
COMPONENT_2_NAME=GGC Core
-COMPONENT_2_VERSION=0.3.14
+COMPONENT_2_VERSION=0.4
COMPONENT_2_VERSION_NUM=2
COMPONENT_2_ROOT_DIR=/lib/ggc
-COMPONENT_2_FILES=%ROOT%/ggc-core-0.3.15.jar
+COMPONENT_2_FILES=%ROOT%/ggc-core-0.4.jar
COMPONENT_3_GROUP=1
COMPONENT_3_NAME=GGC Little
@@ -95,34 +95,34 @@
COMPONENT_4_GROUP=1
COMPONENT_4_NAME=GGC Lang
-COMPONENT_4_VERSION=0.2.8
+COMPONENT_4_VERSION=0.3.1
COMPONENT_4_VERSION_NUM=2
COMPONENT_4_ROOT_DIR=/lib/ggc
-COMPONENT_4_FILES=%ROOT%/ggc-lang-0.2.9.jar
+COMPONENT_4_FILES=%ROOT%/ggc-lang-0.3.1.jar
COMPONENT_5_GROUP=2
COMPONENT_5_NAME=GGC Plugin Base
-COMPONENT_5_VERSION=0.2.4
+COMPONENT_5_VERSION=0.2.7
COMPONENT_5_VERSION_NUM=2
COMPONENT_5_ROOT_DIR=/lib/ggc
-COMPONENT_5_FILES=%ROOT%/ggc-plugin_base-0.2.6.jar
+COMPONENT_5_FILES=%ROOT%/ggc-plugin_base-0.2.7.jar
COMPONENT_6_GROUP=2
COMPONENT_6_NAME=Meter Tool
-COMPONENT_6_VERSION=1.0.4
+COMPONENT_6_VERSION=1.0.7
COMPONENT_6_VERSION_NUM=2
COMPONENT_6_ROOT_DIR=/lib/ggc
-COMPONENT_6_FILES=%ROOT%/ggc-meter_tool-1.0.6.jar
+COMPONENT_6_FILES=%ROOT%/ggc-meter_tool-1.0.7.jar
COMPONENT_7_GROUP=2
COMPONENT_7_NAME=Pump Tool
-COMPONENT_7_VERSION=N/A
+COMPONENT_7_VERSION=0.2.1
COMPONENT_7_VERSION_NUM=1
-COMPONENT_7_ROOT_DIR=
-COMPONENT_7_FILES=
+COMPONENT_7_ROOT_DIR=/lib/ggc
+COMPONENT_7_FILES=%ROOT%/ggc-pump_tool-0.2.1.jar
COMPONENT_8_GROUP=2
@@ -151,10 +151,10 @@
COMPONENT_11_GROUP=3
COMPONENT_11_NAME=Atech Tools
-COMPONENT_11_VERSION=0.2.1
+COMPONENT_11_VERSION=0.3.3
COMPONENT_11_VERSION_NUM=3
COMPONENT_11_ROOT_DIR=/lib/utils
-COMPONENT_11_FILES=%ROOT%/atech-tools-0.2.11.jar
+COMPONENT_11_FILES=%ROOT%/atech-tools-0.3.3.jar
COMPONENT_12_GROUP=3
COMPONENT_12_NAME=iText Pdf Library
@@ -165,10 +165,11 @@
COMPONENT_13_GROUP=3
COMPONENT_13_NAME=RxtxComm API
-COMPONENT_13_VERSION=2.1.7
-COMPONENT_13_VERSION_NUM=1
+COMPONENT_13_VERSION=2.1.7 (Modified v4)
+COMPONENT_13_VERSION_NUM=2
COMPONENT_13_ROOT_DIR=/lib/utils
-COMPONENT_13_FILES=%ROOT%/RXTXcomm-2.1.7-a1.jar
+#COMPONENT_13_FILES=%ROOT%/RXTXcomm-2.1.7.jar
+COMPONENT_13_FILES=%ROOT%/RXTXcomm-2.1.7-a4.jar
COMPONENT_13_PLATFORM_SPECIFIC=true
COMPONENT_13_PLATFORM_SPECIFIC_TYPE=2
COMPONENT_13_PLATFORM_SUPPORTED=win linux mac solaris
Modified: trunk/ggc/doc/Changelog
===================================================================
--- trunk/ggc/doc/Changelog 2009-02-12 21:52:47 UTC (rev 659)
+++ trunk/ggc/doc/Changelog 2009-02-15 21:03:35 UTC (rev 660)
@@ -1,35 +1,40 @@
-0.3.16 (17.1.2009)
+
+0.4 (2.2.2009) Andy Rozman <and...@us...>
+ * Version is changed, since all functionality is finished for new version
+ * Changes in documentation
+
+0.3.16 (17.1.2009) Andy Rozman <and...@us...>
* Finished Spread Graph
* Graph Development stopped for Release 0.4
* Frequency graph is disabled
* Course graph was tagged as not working 100%, this one is still in second version
of graph framework (we are not working on 3rd one, which is final one)
-0.3.15 (10.1.2009)
+0.3.15 (10.1.2009) Andy Rozman <and...@us...>
* fixed Freetext food entries processing (problem with parsing floats)
* Refresh panels mechanism redone
* Panels refresh when data from Meter plugin is processed
-0.3.14 (1.1.2009)
+0.3.14 (1.1.2009) Andy Rozman <and...@us...>
* changed free-text food entries. Horizontal scroll disabled.
* Graph changes. Working on Spread Graph, and GGC Controller class, we created
new PlotSelectorPanel and PlotSelectorData from existing classes and extended
both of them (we are not dependant on any of current implementations anymore)
*
-0.3.13 (29.12
+0.3.13 (29.12.2008) Andy Rozman <and...@us...>
* Changed printing to use abstract class
* Change to PrintingDialog to use correct command when calling application from
non-windows environment
* changed free-text food entries (minor bug)
-0.3.12 (27.12)
+0.3.12 (27.12.2008) Andy Rozman <and...@us...>
* more functionality to panels on main screen (selectable updates to main screen)
* added function to write free text for foods and accompanying CH values
* integration into old daily entry
-0.3.11 (22.12)
+0.3.11 (22.12.2008) Andy Rozman <and...@us...>
* integrating new graph framework (ATGraphFramework)
* implementation of HbA1c view for ATGraphFramework
* implementation of Daily view for ATGraphFramework
Modified: trunk/ggc/doc/README.de
===================================================================
--- trunk/ggc/doc/README.de 2009-02-12 21:52:47 UTC (rev 659)
+++ trunk/ggc/doc/README.de 2009-02-15 21:03:35 UTC (rev 660)
@@ -84,6 +84,8 @@
- Messgerätewerkzeug integriert. Jetzt müssen nur noch Geräte hinzugefügt
werden
- Bolus-Helper und Simple-Ratio Einstellungen
+- Pumpen-Werkzeug: <Grundlegende Pumpenunterstützung> (manuelle Eingabe,
+ Integration, keine Diagramme)
4. Geplante Funktionalität
@@ -101,8 +103,6 @@
- Hilfedateien vervollständigen und in der Applikation referenzieren (Englische
Version) (**)
- neue Funktionalität für Ernährungsdatenbanken
-- Pumpen-Werkzeug: <Grundlegende Pumpenunterstützung> (manuelle Eingabe,
- Integration, keine Diagramme)
- Intelligente Insulinmengenempfehlung (Bolus-Helfer), Ratio-Helfer
@@ -136,7 +136,7 @@
Dies ist ein Plug-in für den Datenabruf von Blutzuckermessgeräten. Dieses
Projekt befindet sich zur Zeit in der Beta-Phase (die Funktionalität ist
fertig, jetzt müssen nur noch neue Geräte hinzugefügt werden).
-Bisher unterstützte Geräte (Plugin-Version 1.0.5):
+Bisher unterstützte Geräte (Plugin-Version 1.0.7):
- Bayer/Ascensia: alle Geräte dieser Produkt-Familie
- Roche/Accu-Chek: all Geräte, die vom by Accu-Chek Pix unterstützt werden
- LifeScan: OT Ultra/2, OT UltraSmart, OT Ultra Mini/Easy
@@ -146,15 +146,6 @@
---------------
Dies ist ein Plug-in zur Eingabe, zum Abruf und zur Behandlung von Daten von
-Insulinpumpen. Dieses Projekt geht langsam in die Entwicklungsphase über. Wir
-planen in die nächste Version (0.5) schon teilweise die Funktionalität des
-Pumpen-Werkzeugs einzubauen. Die ersten unterstützten Pumpen werden die von
-Roche sein, danach wahrscheinlich die von Minimed und einige Entwickler
-arbeiten gleichzeitig an der Unterstützung für Animas.
-
-!! OR !!
-
-Dies ist ein Plug-in zur Eingabe, zum Abruf und zur Behandlung von Daten von
Insulinpumpen. Wir haben schon mit der Entwicklung angefangen, und der größte
Teil des Frameworks für Pumpen-Daten ist fertiggestellt. Bisher haben wir
manuelles Hinzufügen von Pumpen-Daten implementiert. Der nächste Schritt ist
@@ -252,3 +243,6 @@
Nochmals Danke für die Benutzung unserer Software - wir hoffen Sie erfüllt Ihre
Erwartungen. Falls noch nicht jetzt, hoffentlich in Zukunft.
+
+
+GGC Entwicklungs Team
\ No newline at end of file
Modified: trunk/ggc/doc/README.en
===================================================================
--- trunk/ggc/doc/README.en 2009-02-12 21:52:47 UTC (rev 659)
+++ trunk/ggc/doc/README.en 2009-02-15 21:03:35 UTC (rev 660)
@@ -48,7 +48,7 @@
New (major) releases are planned to occur in 6 month intervals (we almost managed
that one). This means that you can expect release 0.5 somewhere in June 2009.
-A minor release will be done, when functionality has been change in such a way
+A minor release will be done, when functionality has been changed in such a way
that it is beneficial to user to be released (major functionality changes and
bug fixes)
@@ -66,17 +66,19 @@
3. WHAT FUNCTIONALITY IS AVAILABLE
==================================
-- Adding Daily data about insulin, BG entries, activity, urine, comments
+- Adding Daily data about Insulin, BG entries, activity, urine, comments
- Display graphs for this Pen/Injection therapy (new framework, still work in progress)
- Food databases for "Carb Counting": USDA Nutrition DB, User Nutrition DB
- and Meals database
+ and Meals database or foods and CH as free text
- Printing reports
- Update mechanism (client side only), this means that until the server side
of update is done, you won't be able to update, but as soon as that works
you will have the option to update.
- Backup mechanism (and restore)
-- Meter Tool finished. Now we just have to add more devices.
- Bolus Helper and Simple Ratio Settings
+- Meter Tool finished. Now we just have to add more devices.
+- Pump Tool: Framework is work in progress, almost finished. Added is Manual adding of
+ data which is important pre-step, for actual reading and import from devices
@@ -92,11 +94,10 @@
- Update mechanism (server side) (**)
- Fully write English help files and add help through application (English version so far) (**)
- Add some functionality to food databases
-??!!?? - Pump Tool: <Basic pump support> (manual input, integration, no graphs)
-- Smart Insulin Recommendation (Bolus Helper), Ratio Helper
+- Extended Ratio Settings, Ratio Helper
+- New Graphs for Pen/Injection theraphy
-
Version 0.6
------------
- Automatic DB Update
@@ -135,14 +136,6 @@
PUMP-TOOL
----------
-This is plug-in for entering, retrieving and handling data from Insulin Pumps.
-This project is slowly starting into development phase. We plan to have at least some
-pump functionality in next GGC version (0.5). The first supported pumps will be those
-from Roche, after them probably Minimed, and some developers are working parallel to
-also add support for Animas.
-
-!! OR !!
-
This is plug-in for entering, retrieving and handling data from Insulin Pumps.
We have already started with development and most of framework is ready for Pump
data. For now we have added Manual adding of Pump Data and next step is retrieval
Modified: trunk/ggc/doc/README.si
===================================================================
--- trunk/ggc/doc/README.si 2009-02-12 21:52:47 UTC (rev 659)
+++ trunk/ggc/doc/README.si 2009-02-15 21:03:35 UTC (rev 660)
@@ -27,61 +27,29 @@
===============================
-This is version 0.4 of GGC.
+To je različica 0.4 od programa GGC.
-At this point we are at version 0.4, which is second public release. If you have
-installed version 0.3, you can either deinstall and install 0.4 or do updates
-(you will need to apply two of them (0.3.1 and 0.4): instructions are Update package.
+V tem trenutku smo pri verziji 0.4, ki je druga javna izdaja tega programa. Če ste
+že namestili različico 0.3, jo lahko odstranite (če je še niste redno uporabljali) in
+namestite različico 0.4 ali pa namestite nadgradnje (upgrade). V tem primeru boste
+morali namestiti dve nadgradnjo (0.3.1 in 0.4), natančna navodila so v paketih
+nadgradnje.
-If you used any of "preview" versions (before 0.3), you will need to uninstall.
-We made a lot of changes in database and application itself, so you can't update
-old version (if you already have data in old application contact us, and we will
-help you migrate it to new version).
-Updates are now possible, but so far only manual updates. We are working on
-automatic updates, but we are still far from working model.
+Če ste namestili kakšno verzijo pred 0.3 jo boste morali oddstranit. V času od zadnje
+(nejavne) izdaje je bilo dosti sprememb v podatkovni bazi in v programu samem, kar
+pomeni, da stare različice niso nadgradljive (če še imate podatke v stari aplikaciji
+nas kontaktirajte in pomagali vam bomo pri prenosu podatkov).
-In this public release you can still only use the internal database. If you have
-little above average computer knowledge (read 'if you like to dabble'), you can
-try to make it work with any database (see file 'How_Can_I_Help.txt') with just a
-little work.
+Nadgradnje so sedaj mogoče, ampak samo na "ročen" način. V tem trenutku je avtomatska
+nadgradnja še vedno v delu.
-New (major) releases are planned to occur in 6 month intervals (we almost managed
-that one). This means that you can expect release 0.5 somewgere in June 2009.
-
-A minor release will be done, when functionality has been change in such a way
-that it is beneficial to user to be released (major functionality changes and
-bug fixes)
-
-For now you need to update files manually, which means exactly following the
-instructions supplied with the release (there will be a file called
-'How To Upgrade.txt' supplied with each upgrade release).
-
-You are probably wondering, why are we still in 0.x versions if we already had
-public release... Answer is simple. We have several goals set, and when this goals
-are achieved, we will progress to version 1.0. If you look at Planned functionalities
-you will find several items marked with double asterix (**), this are required
-functions for 1.0 release.
-
-
-################
-
-To je različica 0.3 od programa GGC.
-
-V tej točki smo pri različici 0.3, ki je prva javna izdaja tega programa. Če ste
-namestili kakšno verzijo pred to jo prosim odstranite. V času od zadnje (nejavne)
-izdaje je bilo dosti sprememb v podatkovni bazi in v programu samem, kar pomeni, da
-stare različice niso nadgradljive (če še imate podatke v stari aplikaciji nas
-kontaktirajte in pomagali vam bomo pri prenosu podatku). Od te verzije dalje, bo
-nadgradnja manj zapletena. V naslednji večji različici bo dostopen tudi sistem
-za nadgradnjo (za avtomatično nadgradnjo iz interneta)
-
-Ta prva javna različica ima podporo samo za interno bazo, če pa imate nadpovprečno
+V tej različici še vedno lahko uporabljamo samo interno bazo, če pa imate nadpovprečno
znanje o računalnikih (beri: če radi eksperimentirate), pa lahko uporabite tudi ostale
baze (več informacij v datoteki 'How_Can_I_Help.txt') s le malo truda.
-Nove glavne izdaje so načrtovane v 6 mesečnih intervalih, kar pomeni, da lahko
-pričakujete različico 0.4 ob koncu leta ali začetku naslednjega.
+Nove glavne izdaje so načrtovane v 6 mesečnih intervalih (tega smo spravili ven skoraj
+pravočasno), kar pomeni da lahko pričakujete različico 0.5 nekje junija 2009.
Manjše spremembe bodo objavljene, ko se bodo funkcionalnosti spremenile v taki meri,
da je nujno narediti nadgradnjo (večje spremembe v funkcionalnosti in popravki
@@ -89,107 +57,65 @@
Zaenkrat bo treba vse nadgradnje narediti ročno, kar pomeni, natančno izvedbo
vseh korakov opisanih v datoteki 'How To Upgrade.txt', ki bo dodana vsem izdajam
-(tudi v vsaki nadgradnji). Poskrbeli bomo, da bo tudi ta datoteka prevedena.
+(tudi v vsaki nadgradnji).
+Verjetno se sprašujete zakaj smo še vedno pri 0.x različicah, če že imamo delujočo
+aplikacijo.... Odgovor je preprost. Postavili smo si nekaj ciljev in dokler, ti cilji
+niso doseženi bomo še vedno v 0.x verzijah, takoj ko pa bodo naši cilji doseženi.
+Te cilje lahko vidite v Načrtovanih funkcionalostih, kjer so označeni s dvema
+zvezdicama (**).
+
3. KAJ TRENUTNO LAHKO DELAMO S APLIKACIJO
=========================================
-
-- Adding Daily data about insulin, BG entries, activity, urine, comments
-- Display graphs for this Pen/Injecttion theraphy (new framework, still work in progress)
-- Food databases for "Carb Counting": USDA Nutrition DB, User Nutrition DB
- and Meals database
-- Printing reports
-- Update mechanism (client side only), this means that until the server side
- of update is done, you won't be able to update, but as soon as that works
- you will have the option to update.
-- Backup mechanism (and restore)
-- Meter Tool finished. Now we just have to add more devices.
-- Bolus Helper and Simple Ratio Settings
-
-###
-
- Dodajanje podatkov o dozah insulina, vrednosti KS, aktivnosti, vrednosti urina in
komentarji (tukaj gre za predvsem podatke za Pen terapijo)
-- Prikaz grafov (ta del je še treba temeljito predelati in dopolniti)
+- Prikaz grafov (ta del je še vedno v izdelavi - že uporabljamo novo orodje za grafe, ampak
+ grafi še niso vsi pripravljeni in stestirani
- Baze podatkov za "štetje OH": USDA baza (ameriška), Uporabniška baza živil in obrokov
(to uporabnik sam sestavi)
-- Izpis poročil (tiskanje)
+- Izpis poročil (tiskanje): mesečna poročila, ter izpis jedilnikov
- Mehanizem za nadgradnjo (to zaenkrat še ne dela, ker je potrebno narediti še strežniški
del)
- Ustvarjanje varnostne kopije baze (in obnovitev)
-- Integracija Orodja za merilce
+- Orodja za merilce (implementacija osnovnega orodja zaključena, sedaj je treba le še dodati
+ več naprav)
+- Bolus Pomočnik in Preprosta nastavitev razmerij
+- Orodje za črpalke: (implementacija ogrodja je v teku - skoraj zaključena in dodano je ročno
+ vpisovanje podatkov, ki je pomemben predkorak, pred avtomatskim branjem podatkov iz črpalk)
4. NAČRTOVANE FUNKCIONALNOSTI
=============================
-
-Version 0.5
-------------
-- DB Tool (for using other databases and install of initial data) (**)
-- Multi person instance
-- Finalization of GGC Little, which is used as a resident application for adding
- new data throughout the day
-- Update mechanism (server side) (**)
-- Fully write English help files and add help through application (English version so far) (**)
-- Add some functionality to food databases
-??!!?? - Pump Tool: <Basic pump support> (manual input, integration, no graphs)
-- Smart Insulin Recommendation (Bolus Helper), Ratio Helper
-
-
-
-Version 0.6
-------------
-- Automatic DB Update
-- GGC Network (running several instances of GGC on several computers)
-- I18n Help Files
-- CGMS Tool: <Basic CGMS support>
-- Synchronization (for GGC network)
-- Links to data about diabetes on internet
-- GGC PPC - the version of the application to be used by the Pocket PC (not all the
- functionality of the full version will be available)
-- Appointments (adding appointment, adding data from doctor's visit), Doctors
- management (adding)
-- Medical stock - Listing of everything that patient has, and what he needs to
- get to handle diabetes (and also any other condition)
-- Remote Food database functionality
-
-
-####
-
-
-Version 0.4
-------------
-- Nadgradnja podatkovne baze
-- Obnovitev podatkov
-- Db Orodje (za uporabo in namestitev podatkov za ostale baze)
+Različica 0.5
+-------------
+- Db Orodje (za uporabo in namestitev podatkov za ostale baze) (**)
- Možnost, da več oseb uporablja GGC
- Dokončanje aplikacije GGC Little, ki je residentni program (se nahaja v spominu)
- za hitro dodajanje podatkov preko celega dneva
-- Sistem za nadgradnjo (strežniški del)
-- Orodja za merilce - nastavitev
-- Pomoč za program (angleška)
-- Orodje za črpalke: osnovno, ročni vnos, integracija, brez grafov)
-- CGMS orodje: osnovno, integracija
-- Spremeni in dodaj nove grafe
-- Dodana funkcionalnost za baze hrane
-- Pomoč za boluse in razmerja
-- Oddaljena baza za jedi
+- Nadgradnja programa (strežniški del) (**)
+- Pomoč za program (angleška) - v celoti (**)
+- Dodana funkcionalnost za baze hrane (predvsem runtime nalaganje podatkov)
+- Spremeni in dodaj nove grafe za Injekcijsko/Pen terapijo
+- Razširjenjo nastavljanje razmerij in pomočnik za razmerja
-Version 0.5
+Version 0.6
------------
+- Nadgradnja podatkovne baze
- GGC Omrežje (zagon večih instanc aplikacije na različnih računalnikih)
- Synhronizacija (GGC omrežje)
+- Pomoč za tuje jezik (priprava sistema, ne prevodi sami)
+- CGMS orodje: osnovno, integracija
- Povezave do stvari za Diabetike (spletne strani, forumi, ...)
- GGC PPC - verzija, ki naj bi delovala na dlančnikih s OS Pocket PC
- Načrtovalec (dodajanje dogodkov, mišljeno predvsem za vodenje zdravniških pregledov,
dodajanje zdravnikov, itd.
- Medicinske zaloge - kontrola zdravil, ki jih imamo doma
+- Oddaljena baza za jedi
@@ -202,66 +128,31 @@
DODATEK ZA MERILNIKE
---------------------
-This is a plug-in for getting data from glucose meters. Currently this project is in
-beta phase (all functionalities finished, now we just need to add more devices).
-Currently supported devices:
- - Bayer/Ascensia: whole family
- - Roche/Accu-chek: all devices supported by Accu-Chek Pix device
- - LifeScan: OT Ultra/2, OT UltraSmart, OT Ultra Mini/Easy
-Current version of plugin: 1.0.5
-
-####
-
Naloga dodatka za merilnike je branje podatkov iz različnih merilcev. Ta projekt je
-trenutnu v fazi razvoja. Dokončali smo podporo za Ascensia/Bayer merilce, ter osnovne
-razrede za ta dodatek (tudi uporabniški vmesnik). Dve veliki funkcionaosti sta še
-ostali (seznam merilcev in nastavitve), toda prva verzija (0.2) je zunaj in dostopna
-(pakirana je skupaj s ggc programom). Manjkajoče funkcionalnosti bodo dodane do
-naslednje ggc izdaje (0.4). Naslednji merilci, ki bodo dodani so od Roche-a (Oktober
-2008) in za njimi LifeScan merilci (December 2008).
+trenutnu v beta fazi (dodali smo vse načrtovane funkcionalosti, sedaj moramo le še
+vse dodati več naprav).
+Trenutno podprte naprave (verzija 1.0.7):
+ - Bayer/Ascensia: celotna družina (kot je bila v letu 2008)
+ - Roche/Accu-chek: vse naprave, ki so podprte preko Accu-Chek Pix naprave
+ - LifeScan: OT Ultra/2, OT UltraSmart (delna podpora), OT Ultra Mini/Easy
DODATEK ZA ČRPALKE
------------------
-This is plug-in for entering, retrieving and handling data from Insulin Pumps.
-This project is slowly starting into development phase. We plan to have at least some
-pump functionality in next GGC version (0.5). The first supported pumps will be those
-from Roche, after them probably Minimed, and some developers are working parallel to
-also add support for Animas.
-
-!! OR !!
-
-This is plug-in for entering, retrieving and handling data from Insulin Pumps.
-We have already started with development and most of framework is ready for Pump
-data. For now we have added Manual adding of Pump Data and next step is retrieval
-of data from Pumps. First supported Pumps will be those of Roche and Minimed (at
-first through CareLink export file) and we have some developers also working on
-Animas.
-
-##############
-
-
To je dodatek za vpis, branje in upravljanje s podatki iz insulinskih črpalk.
-Projekt počasi prehaja v fazo razvoja. V načrtu imamo da dodamo vsaj nekaj črpalkarskih
-funkcij v naslednjo verzijo ggc-ja (0.4). Prve bodo podprte črpalke od Roche-a (December
-2008), zatem pa verjetno Minimed. Nekateri od naših razvijalcev pa paralelno delajo tudi
-na podpori za Animas.
+Projekt je v fazi razvoja in večina ogrodja za branje podatkov je že dokončana. Zaenkrat
+smo dodali Ročno dodajanje podatkov in naslednji korak je pobiranje in evaluiranje
+podatkov iz črpalk. Prve podprte črpalke bodo Rocheve in Minimedove (zaenkrat preko
+CareLink izvozne datoteke) in razvijalci delajo že tudi na podpori za Animas črpalko.
DODATEK ZA CGMS-e
-----------------
-This is a plug-in for retrieving data from CGMS device and viewing of this data. This
-project is still in the planning phase. The project will move into the development phase
-by end of 2009. The first supported CGMS will be that of Minimed through export file from
-CareLink.
-
-###
-
To je dodatek branje podatkov iz CGMS naprav in gledanje teh podatkov. Projekt je še vedno
-v fazi načrtovanja. Predvidoma bo šel iz načrtovanja v razvoj v začetku naslednjega leta
-(January 2009). Prvi podprti CGMS bo Minimedov preko export datotek iz programa CareLink.
+v fazi načrtovanja. Predvidoma bo šel iz načrtovanja v razvoj ob koncu leta 2009.
+Prvi podprti CGMS bo Minimedov preko export datotek iz programa CareLink.
Modified: trunk/ggc/doc/README_1st_v2.si
===================================================================
--- trunk/ggc/doc/README_1st_v2.si 2009-02-12 21:52:47 UTC (rev 659)
+++ trunk/ggc/doc/README_1st_v2.si 2009-02-15 21:03:35 UTC (rev 660)
@@ -1,4 +1,10 @@
+*********************************************************************
+** OPOZORILO: Ta datoteka še ni prevedena ! **
+*********************************************************************
+
+
+
GGC - GNU Gluco Control
=======================
Modified: trunk/ggc/doc/USB-How-To_si.txt
===================================================================
--- trunk/ggc/doc/USB-How-To_si.txt 2009-02-12 21:52:47 UTC (rev 659)
+++ trunk/ggc/doc/USB-How-To_si.txt 2009-02-15 21:03:35 UTC (rev 660)
@@ -54,49 +54,33 @@
3. Prenesite pravilen JRE za vaš OS in ga namestite na svoj računalnik. Potrebujete Javo 1.5, če pa
je možno pa prenesite Javo 1.6. Poiščite mapo kamor je bil JRE nameščen in prekopirajte vsebino
- v \java\<OS-kratko-ime> mapo
+ v \java\<OS-kratko-ime> mapo.
4. Poiščite binarne datoteke za Rxtx 2.17 in jih skopirajte v \lib\native\<OS-kratko-ime>. Binarna
datoteka mora biti arhitekturno specifična, če lahko najdete datoteke za vse arhitekture jih najdite
in položite v podmape (recimo primer za windows, bi bil da dobite x32 in x64 različico ustvarite x32
- in x64 mapo, ter položite pravilne datoteke v njih.
+ in x64 mapo, ter položite pravilne datoteke v njih. V primeru, da imamo datoteke za razlicne
+ arhitekture, pustimo koren prazen (in uporabniki bodo sami skopirali pravilno datoteke), lahko pa
+ v njega skopiramo datoteke za 32-bitne sisteme (ker so ti pogostejši).
+5. Če sistem podira autorun (ko vstavimo USB), lahko ustvarite datoteke in jih položite v
+ \java\autorun mapo.
+6. Ustvarite datoteko GVM_<OS-kratko-ime>.txt in napišite opis GVMja, vaše komentarje, ter vse
+ podatke, ki bodo v pomoč uporabnikom in vaše osebne podatke, da se vidi, da ste vi "avtor"
+ paketa. Če želite tudi v prihodnosti podpirati ta GVM pripišite tudi svoj email, da vas
+ lahko ljudje kontaktirajo, če imajo vprašanja.
-3. Download correct JRE for your OS. You need Java 1.5, but it is prefered to get 1.6 if
- available. Copy content to \java\<OS-short-name> directory.
-
-4. Find binary files for Rxtx 2.1.7 and put them into \lib\native\<OS-short-name>. This file must be
- architecture specific, if you can find files for all architecture, get them and put them into
- subdirectories (for example for windows, if you get x32 and x64, you create directories x32 and
- x64 and put correct files there. In case of multiple architecture files, leave root empty (and
- user will then copy correct file by themselves.
-5. If your OS supports autorun (when USB inserted), you can create file and put them into \java\autorun
- directory.
-
-6. Create file GVM_<OS-short-name>.txt and write into it, all notes and also your info, so that your are
- credited for work you have done. If you are willing to be supporter for this specific GVM, add
- also your email, so that people can contact you.
-
-
-
-
-
-
Podprti OS-ji
==============
Poglejte v datoteko README_1st.si za seznam vseh podprtih OSov.
-Supported OSes
-==============
-
-Take a look into README_1st for list of all supported OSes.
-
Vsi podprti sistemi nimajo nujno GVMja (večina jih ima, a ne vsi). Na Macu je precej težko priti do
teh datotek (JRE), ker so del sistema.
-GGC Razvojna ekipa
+
+GGC Razvojna ekipa
\ No newline at end of file
Modified: trunk/ggc/src/GGC_en.properties
===================================================================
--- trunk/ggc/src/GGC_en.properties 2009-02-12 21:52:47 UTC (rev 659)
+++ trunk/ggc/src/GGC_en.properties 2009-02-15 21:03:35 UTC (rev 660)
@@ -785,7 +785,10 @@
PLUGIN_NOT_INSTALLED=%s is not installed.
#METER_TOOL=Meter Tool
+PUMP_PLUGIN_EXPERIMENTAL=Pumps Plug-in\n\nThis part is just experimental. We took quite a time\nto work on it and tried to add all needed functions\nand options. We did some testing, but we still need\nto add some functionalities and do more exhaustive\ntesting. Therefore this module is marked as experimental\nand may be used for testing only. At this point we also\ndon't support backup/restore, so even if data would be\nadded succesfully, we have no means to backup it up.\n\nThis is required step, before we delve into world of\nautomatic data retriveal from actual devices. Once \nthis testing is done, we can start with data retrieval.\n\nIf you find any problem here, or have any additional\noptions/ideas that could be added, don't hesitate to\ncontact us on our e-mail address:\ng...@at....\n\n
+
+
#
# Backup/Restore (1)
#
Modified: trunk/ggc/src/GGC_si.properties
===================================================================
--- trunk/ggc/src/GGC_si.properties 2009-02-12 21:52:47 UTC (rev 659)
+++ trunk/ggc/src/GGC_si.properties 2009-02-15 21:03:35 UTC (rev 660)
@@ -939,7 +939,10 @@
PLUGIN_NOT_INSTALLED=%s ni name\u0161\u010Den.
+PUMP_PLUGIN_EXPERIMENTAL=Orodja za \u010Drpalke\n\nTa del je eksperimentalen. Za njegovo izdelavo smo\nuporabili kar nekaj \u010Dasa in posku\u0161ali dodati vse \npotrebne funkcionalnosti in opcije. Modul smo tudi\nstestirali, vendar ne preve\u010D natan\u010Dno. Zaradi tega je\nmodul \u010Dele eksperimentalen in ga lahko uporabljate \nsamo za testiranje. V tem trenutku tudi \u0161e ne podpiramo\nvarnostne kopije, tako da dodanih podatkov (tudi \u010De se \ndodani pravilno) ne moremo prenesti.\n\nTo je pomemben in potreben korak preden za\u010Dnemo s\navtomatskim prenosom podatkov iz \u010Drpalk. Ko bo testiranje\ntega modula zaklju\u010Deno, lahko za\u010Dnemo s prenosom iz\nnaprav samih.\n\n\u010Ce najdete kak\u0161no te\u017Eavo tukaj, ali imata kak\u0161no idejo\nin/ali predlog, ki bi ga lahko dodali, nas prosim \u010Dimprej\nkontaktirajte na na\u0161 email: gg...@at...\n\nKot lahko vidite tudi prevod \u0161e ni \u010Disto zaklju\u010Den in da\nnekatere fraze \u0161e niso prevedene.\n\n
+
+
#
# Backup/Restore
#
Modified: trunk/ggc/src/ggc/GGC.java
===================================================================
--- trunk/ggc/src/ggc/GGC.java 2009-02-12 21:52:47 UTC (rev 659)
+++ trunk/ggc/src/ggc/GGC.java 2009-02-15 21:03:35 UTC (rev 660)
@@ -48,7 +48,7 @@
/**
* Version of application
*/
- public static String s_version = "0.3.16";
+ public static String s_version = "0.4"; //3.16";
/**
@@ -59,7 +59,7 @@
/**
* Version Date
*/
- public static String version_date = "17th January 2009";
+ public static String version_date = "2nd February 2009";
/**
* Checks if Db is correct version
@@ -113,15 +113,24 @@
public void init(boolean dev)
{
s_mainWindow = new MainFrame("GGC - GNU Gluco Control", dev);
- Toolkit theKit = s_mainWindow.getToolkit();
- Dimension wndSize = theKit.getScreenSize();
- int x, y;
- x = wndSize.width / 2 - 400;
- y = wndSize.height / 2 - 300;
-
- s_mainWindow.setBounds(x, y, 800, 600);
- s_mainWindow.setVisible(true);
+ if (dev)
+ {
+ s_mainWindow.setBounds(0, 0, 800, 600);
+ s_mainWindow.setVisible(true);
+ }
+ else
+ {
+ Toolkit theKit = s_mainWindow.getToolkit();
+ Dimension wndSize = theKit.getScreenSize();
+
+ int x, y;
+ x = wndSize.width / 2 - 400;
+ y = wndSize.height / 2 - 300;
+
+ s_mainWindow.setBounds(x, y, 800, 600);
+ s_mainWindow.setVisible(true);
+ }
}
}
\ No newline at end of file
Modified: trunk/ggc/src/ggc/core/data/graph/GraphViewHbA1c.java
===================================================================
--- trunk/ggc/src/ggc/core/data/graph/GraphViewHbA1c.java 2009-02-12 21:52:47 UTC (rev 659)
+++ trunk/ggc/src/ggc/core/data/graph/GraphViewHbA1c.java 2009-02-15 21:03:35 UTC (rev 660)
@@ -16,7 +16,6 @@
import com.atech.graphics.graphs.AbstractGraphViewAndProcessor;
import com.atech.graphics.graphs.GraphViewControlerInterface;
-import com.atech.i18n.I18nControlAbstract;
/**
* Application: GGC - GNU Gluco Control
@@ -49,7 +48,7 @@
private HbA1cValues hbValues;
private DefaultPieDataset dataset = new DefaultPieDataset();
- I18nControlAbstract m_ic = null;
+ //I18nControlAbstract m_ic = null;
/**
* Constructor
@@ -140,9 +139,12 @@
{
dataset.clear();
- System.out.println("Read HbA1c data:\n" + hbValues.getPercentOfDaysInClass(0) + "\n" + hbValues.getPercentOfDaysInClass(1) + "\n"
- + hbValues.getPercentOfDaysInClass(2) + "\n" + hbValues.getPercentOfDaysInClass(3) + "\n"
- + hbValues.getPercentOfDaysInClass(4));
+ //System.out.println("Read HbA1c data:\n" + hbValues.getPercentOfDaysInClass(0) + "\n" + hbValues.getPercentOfDaysInClass(1) + "\n"
+ // + hbValues.getPercentOfDaysInClass(2) + "\n" + hbValues.getPercentOfDaysInClass(3) + "\n"
+ // + hbValues.getPercentOfDaysInClass(4));
+
+ //System.out.println("m_ic: " + m_ic);
+
dataset.insertValue(0, m_ic.getMessage("DAYS_WITH_READINGS_0_1"), hbValues.getPercentOfDaysInClass(0));
dataset.insertValue(1, m_ic.getMessage("DAYS_WITH_READINGS_2_3"), hbValues.getPercentOfDaysInClass(1));
dataset.insertValue(2, m_ic.getMessage("DAYS_WITH_READINGS_4_5"), hbValues.getPercentOfDaysInClass(2));
Modified: trunk/ggc/src/ggc/core/plugins/PumpsPlugIn.java
===================================================================
--- trunk/ggc/src/ggc/core/plugins/PumpsPlugIn.java 2009-02-12 21:52:47 UTC (rev 659)
+++ trunk/ggc/src/ggc/core/plugins/PumpsPlugIn.java 2009-02-15 21:03:35 UTC (rev 660)
@@ -7,6 +7,8 @@
import java.awt.Container;
import java.awt.event.ActionEvent;
+import javax.swing.JOptionPane;
+
import com.atech.graphics.components.StatusReporterInterface;
import com.atech.i18n.I18nControlAbstract;
import com.atech.plugin.PlugInClient;
@@ -144,7 +146,9 @@
*/
public void readPumpsData()
{
- this.featureNotImplemented(commands[0]);
+ //this.featureNotImplemented(commands[0]);
+ this.executeCommand(PumpsPlugIn.COMMAND_READ_PUMP_DATA);
+// executeCommand(commands[0]);
}
@@ -165,17 +169,17 @@
this.commands_implemented = new boolean[7];
this.commands_implemented[0] = false;
this.commands_implemented[1] = false;
- this.commands_implemented[2] = true;
+ this.commands_implemented[2] = false;
this.commands_implemented[3] = false;
this.commands_implemented[4] = true;
this.commands_implemented[5] = true;
this.commands_implemented[6] = true;
this.commands_will_be_done = new String[7];
- this.commands_will_be_done[0] = "0.6";
+ this.commands_will_be_done[0] = "0.5";
this.commands_will_be_done[1] = "0.5";
- this.commands_will_be_done[2] = null;
- this.commands_will_be_done[3] = "0.6";
+ this.commands_will_be_done[2] = "0.5";
+ this.commands_will_be_done[3] = "0.5";
this.commands_will_be_done[4] = null;
this.commands_will_be_done[5] = null;
this.commands_will_be_done[6] = null;
@@ -193,7 +197,7 @@
if (command.equals("pumps_read"))
{
this.readPumpsData();
- refreshPanels(InfoPanel.PANEL_GROUP_ALL_DATA);
+// refreshPanels(InfoPanel.PANEL_GROUP_ALL_DATA);
}
else if (command.equals("pumps_list"))
{
@@ -205,13 +209,19 @@
}
else if (command.equals("pumps_manual_entry"))
{
+ if (!DataAccess.getInstance().developer_version)
+ displayExperimental();
+
this.executeCommand(PumpsPlugIn.COMMAND_MANUAL_ENTRY);
- refreshPanels(InfoPanel.PANEL_GROUP_ALL_DATA);
+// refreshPanels(InfoPanel.PANEL_GROUP_ALL_DATA);
}
else if (command.equals("pumps_additional_data"))
{
+ if (!DataAccess.getInstance().developer_version)
+ displayExperimental();
+
this.executeCommand(PumpsPlugIn.COMMAND_ADDITIONAL_DATA);
- refreshPanels(InfoPanel.PANEL_GROUP_ALL_DATA);
+// refreshPanels(InfoPanel.PANEL_GROUP_ALL_DATA);
}
else if (command.equals("pumps_config"))
{
@@ -241,6 +251,32 @@
}
+ private void displayExperimental()
+ {
+ JOptionPane.showMessageDialog(this.parent,
+ ic.getMessage("PUMP_PLUGIN_EXPERIMENTAL")
+/* "Pumps Plug-in\n\n" +
+ "This part is just experimental. We took quite a time\n" +
+ "to work on it and tried to add all needed functions\n" +
+ "and options. We did some testing, but we still need\n" +
+ "to add some functionalities and do more exhaustive\n" +
+ "testing. Therefore this module is marked as experimental\n" +
+ "and may be used for testing only. At this point we also\n" +
+ "don't support backup/restore, so even if data would be\n" +
+ "added succesfully, we have no means to backup it up.\n\n" +
+ "This is required step, before we delve into world of\n" +
+ "automatic data retriveal from actual devices. Once \n" +
+ "this testing is done, we can start with data retrieval.\n\n" +
+ "If you find any problem here, or have any additional\n" +
+ "options/ideas that could be added, don't hesitate to\n" +
+ "contact us on our e-mail address:\n" +
+ "gg...@at....\n\n" */
+ ,
+ ic.getMessage("WARNING"),
+ JOptionPane.WARNING_MESSAGE);
+ }
+
+
/**
* Get Short Status
*
Modified: trunk/ggc/src/ggc/core/print/PrintFoodMenuAbstract.java
===================================================================
--- trunk/ggc/src/ggc/core/print/PrintFoodMenuAbstract.java 2009-02-12 21:52:47 UTC (rev 659)
+++ trunk/ggc/src/ggc/core/print/PrintFoodMenuAbstract.java 2009-02-15 21:03:35 UTC (rev 660)
@@ -280,8 +280,8 @@
@Override
public String getFileNameRange()
{
- return this.m_data.getRangeBeginObject().getDateString() + "-"
- + this.m_data.getRangeEndObject().getDateString();
+ return this.m_data.getRangeBeginObject().getDateFilenameString() + "-"
+ + this.m_data.getRangeEndObject().getDateFilenameString();
}
Modified: trunk/ggc/src/ggc/core/print/PrintFoodMenuBase.java
===================================================================
--- trunk/ggc/src/ggc/core/print/PrintFoodMenuBase.java 2009-02-12 21:52:47 UTC (rev 659)
+++ trunk/ggc/src/ggc/core/print/PrintFoodMenuBase.java 2009-02-15 21:03:35 UTC (rev 660)
@@ -491,17 +491,6 @@
}
- /**
- * Returns base filename for printing job, this is just part of end filename (starting part)
- *
- * @return
- */
- @Override
- public String getFileNameBase()
- {
- return "" + System.currentTimeMillis();
- //return "foodmenu_base_";
- }
/**
@@ -632,22 +621,22 @@
table.addCell(new Phrase(DataAccess.Decimal2Format.format(rw.getCH()), this.text_italic));
}
-
+
/**
- * Returns data part of filename for printing job, showing which data is being printed
- *
- * @return
+ * Returns base filename for printing job, this is just part of end filename (starting part)
*/
@Override
- public String getFileNameRange()
+ public String getFileNameBase()
{
- //return this.m_data.getRangeBeginObject().getDateString() + "-" + this.m_data.getRangeEndObject().getDateString();
- return "" + System.currentTimeMillis();
+ return "FoodMenuBase";
}
+
+
+
}
Modified: trunk/ggc/src/ggc/core/print/PrintFoodMenuExt1.java
===================================================================
--- trunk/ggc/src/ggc/core/print/PrintFoodMenuExt1.java 2009-02-12 21:52:47 UTC (rev 659)
+++ trunk/ggc/src/ggc/core/print/PrintFoodMenuExt1.java 2009-02-15 21:03:35 UTC (rev 660)
@@ -225,8 +225,9 @@
@Override
public String getFileNameBase()
{
- return "" + System.currentTimeMillis();
+ return "FoodMenuExt1";
}
+
}
Modified: trunk/ggc/src/ggc/core/print/PrintFoodMenuExt2.java
===================================================================
--- trunk/ggc/src/ggc/core/print/PrintFoodMenuExt2.java 2009-02-12 21:52:47 UTC (rev 659)
+++ trunk/ggc/src/ggc/core/print/PrintFoodMenuExt2.java 2009-02-15 21:03:35 UTC (rev 660)
@@ -432,14 +432,8 @@
@Override
public String getFileNameBase()
{
- return "" + System.currentTimeMillis();
+ return "FoodMenuExt2";
}
-
-
-}
-
-
-
-
+}
\ No newline at end of file
Modified: trunk/ggc/src/ggc/core/print/PrintFoodMenuExt3.java
===================================================================
--- trunk/ggc/src/ggc/core/print/PrintFoodMenuExt3.java 2009-02-12 21:52:47 UTC (rev 659)
+++ trunk/ggc/src/ggc/core/print/PrintFoodMenuExt3.java 2009-02-15 21:03:35 UTC (rev 660)
@@ -406,7 +406,7 @@
@Override
public String getFileNameBase()
{
- return "" + System.currentTimeMillis();
+ return "FoodMenuExt3";
}
Modified: trunk/ggc/src/ggc/core/util/DataAccess.java
===================================================================
--- trunk/ggc/src/ggc/core/util/DataAccess.java 2009-02-12 21:52:47 UTC (rev 659)
+++ trunk/ggc/src/ggc/core/util/DataAccess.java 2009-02-15 21:03:35 UTC (rev 660)
@@ -208,7 +208,10 @@
private int current_person_id = 1;
NutriI18nControl m_nutri_i18n = NutriI18nControl.getInstance();
-
+ /**
+ * Developer Version
+ */
+ public boolean developer_version = false;
// ********************************************************
// ****** Constructors and Access methods *****
@@ -262,6 +265,8 @@
startWebServer();
+ this.loadSpecialParameters();
+
}
// Method: getInstance
@@ -1439,5 +1444,18 @@
}
+
+ /**
+ * Load Special Parameters
+ *
+ * @see com.atech.utils.ATDataAccessAbstract#loadSpecialParameters()
+ */
+ public void loadSpecialParameters()
+ {
+ this.special_parameters = new Hashtable<String,String>();
+ this.special_parameters.put("BG", "" + this.m_settings.getBG_unit());
+ }
+
+
}
Modified: trunk/ggc/src/ggc/gui/MainFrame.java
===================================================================
--- trunk/ggc/src/ggc/gui/MainFrame.java 2009-02-12 21:52:47 UTC (rev 659)
+++ trunk/ggc/src/ggc/gui/MainFrame.java 2009-02-15 21:03:35 UTC (rev 660)
@@ -212,6 +212,8 @@
m_ic = I18nControl.getInstance();
m_da.addComponent(this);
+
+ m_da.developer_version = developer_version;
statusPanel = new StatusBar();
Modified: trunk/ggc/src/ggc/gui/dialogs/DailyRowDialog.java
===================================================================
--- trunk/ggc/src/ggc/gui/dialogs/DailyRowDialog.java 2009-02-12 21:52:47 UTC (rev 659)
+++ trunk/ggc/src/ggc/gui/dialogs/DailyRowDialog.java 2009-02-15 21:03:35 UTC (rev 660)
@@ -305,7 +305,7 @@
addLabel("mg/dL", 140, 138, panel);
addLabel("mmol/L", 140, 168, panel);
- this.dtc = new DateTimeComponent(this.m_ic, DateTimeComponent.ALIGN_VERTICAL, 5);
+ this.dtc = new DateTimeComponent(this.m_da, DateTimeComponent.ALIGN_VERTICAL, 5);
dtc.setBounds(140, 75, 100, 35);
panel.add(dtc);
Modified: trunk/ggc/src/ggc/gui/dialogs/DailyRowMealsDialog.java
===================================================================
--- trunk/ggc/src/ggc/gui/dialogs/DailyRowMealsDialog.java 2009-02-12 21:52:47 UTC (rev 659)
+++ trunk/ggc/src/ggc/gui/dialogs/DailyRowMealsDialog.java 2009-02-15 21:03:35 UTC (rev 660)
@@ -19,6 +19,9 @@
import javax.swing.JScrollPane;
import javax.swing.JTextArea;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
import com.atech.graphics.components.JDecimalTextField;
import com.atech.graphics.dialogs.TransferDialog;
import com.atech.help.HelpCapable;
@@ -56,6 +59,7 @@
private static final long serialVersionUID = 6763016271693781911L;
+ private static Log log = LogFactory.getLog(DailyRowMealsDialog.class);
private I18nControl m_ic = I18nControl.getInstance();
//private DataAccess m_da = DataAccess.getInstance();
// private GGCProperties props = m_da.getSettings();
@@ -338,28 +342,29 @@
{
String t = strtok.nextToken();
- System.out.println("Token: " + t);
+ //System.out.println("Token: " + t);
if (t.indexOf("]")==-1)
continue;
t = t.substring(0, t.indexOf("]"));
- System.out.println("Bef: " + t);
+ //System.out.println("Bef: " + t);
t = t.replace(",", "."); //DataAccess.false_decimal, DataAccess.real_decimal);
- System.out.println("False dec: " + DataAccess.false_decimal + " rwal=" + DataAccess.real_decimal);
+// System.out.println("False dec: " + DataAccess.false_decimal + " rwal=" + DataAccess.real_decimal);
- System.out.println("Aff: " + t);
+ //System.out.println("Aff: " + t);
try
{
float f = Float.parseFloat(t);
- System.out.println("entry: " + f);
+// System.out.println("entry: " + f);
sum += f;
}
catch(Exception ex)
{
- System.out.println("Ex: " + ex);
+ log.error("Error on parse: [token=" + t + ",exception=" + ex + "]", ex );
+ //System.out.println("Ex: " + ex);
}
}
@@ -394,7 +399,8 @@
calculateCH();
}
else
- System.out.println("DailyRowMealsDialog::unknown command: " + action);
+ log.error("DailyRowMealsDialog::unknown command: " + action);
+ //System.out.println("DailyRowMealsDialog::unknown command: " + action);
}
Modified: trunk/ggc/src/ggc/gui/dialogs/DoctorDialog.java
===================================================================
--- trunk/ggc/src/ggc/gui/dialogs/DoctorDialog.java 2009-02-12 21:52:47 UTC (rev 659)
+++ trunk/ggc/src/ggc/gui/dialogs/DoctorDialog.java 2009-02-15 21:03:35 UTC (rev 660)
@@ -261,7 +261,7 @@
addLabel(m_ic.getMessage("ACTIVITY") + ":", 318, panel);
addLabel(m_ic.getMessage("COMMENT") + ":", 348, panel);
- this.dtc = new DateTimeComponent(this.m_ic, DateTimeComponent.ALIGN_VERTICAL, 5);
+ this.dtc = new DateTimeComponent(this.m_da, DateTimeComponent.ALIGN_VERTICAL, 5);
dtc.setBounds(140, 75, 100, 35);
panel.add(dtc);
Modified: trunk/ggc/src/ggc/gui/dialogs/HbA1cDialog.java
===================================================================
--- trunk/ggc/src/ggc/gui/dialogs/HbA1cDialog.java 2009-02-12 21:52:47 UTC (rev 659)
+++ trunk/ggc/src/ggc/gui/dialogs/HbA1cDialog.java 2009-02-15 21:03:35 UTC (rev 660)
@@ -113,7 +113,7 @@
getContentPane().add(hbView, BorderLayout.CENTER); */
GraphViewerPanel gvp = new GraphViewerPanel(gv);
- gvp.setMinimumSize(new Dimension(450, 460));
+ gvp.setMinimumSize(new Dimension(450, 440)); // 450, 460
gvp.setPreferredSize(gvp.getMinimumSize());
getContentPane().add(gvp, BorderLayout.CENTER);
Modified: trunk/ggc/src/ggc/gui/dialogs/graphs/HbA1cDialog.java
===================================================================
--- trunk/ggc/src/ggc/gui/dialogs/graphs/HbA1cDialog.java 2009-02-12 21:52:47 UTC (rev 659)
+++ trunk/ggc/src/ggc/gui/dialogs/graphs/HbA1cDialog.java 2009-02-15 21:03:35 UTC (rev 660)
@@ -1,29 +1,3 @@
-/*
- * GGC - GNU Gluco Control
- *
- * A pure java app to help you manage your diabetes.
- *
- * See AUTHORS for copyright information.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
- * Filename: HbA1cFrame.java
- * Purpose: gives a "guess" about the current HbA1c
- *
- * Author: schultd
- */
package ggc.gui.dialogs.graphs;
Modified: trunk/ggc-meter/build/GGCMeterToolVersion.properties
===================================================================
--- trunk/ggc-meter/build/GGCMeterToolVersion.properties 2009-02-12 21:52:47 UTC (rev 659)
+++ trunk/ggc-meter/build/GGCMeterToolVersion.properties 2009-02-15 21:03:35 UTC (rev 660)
@@ -6,5 +6,5 @@
#
# GGC Meter Tool Version
#
-ggc-meter-tool....
[truncated message content] |
|
From: <and...@us...> - 2009-03-19 17:43:28
|
Revision: 684
http://ggc.svn.sourceforge.net/ggc/?rev=684&view=rev
Author: andyrozman
Date: 2009-03-19 17:43:07 +0000 (Thu, 19 Mar 2009)
Log Message:
-----------
Added Paths:
-----------
trunk/ggc-desktop/
trunk/ggc-desktop/.amateras
trunk/ggc-desktop/.classpath
trunk/ggc-desktop/.project
trunk/ggc-desktop/data/
trunk/ggc-desktop/data/GGC_Config.properties
trunk/ggc-desktop/data/help/
trunk/ggc-desktop/data/help/HelpList.txt
trunk/ggc-desktop/data/help/en/
trunk/ggc-desktop/data/help/en/GGC.hs
trunk/ggc-desktop/data/help/en/GGC.xml
trunk/ggc-desktop/data/help/en/GGCIndex.xml
trunk/ggc-desktop/data/help/en/GGCTOC.xml
trunk/ggc-desktop/data/help/en/JavaHelpSearch/
trunk/ggc-desktop/data/help/en/JavaHelpSearch/DOC.TAB
trunk/ggc-desktop/data/help/en/JavaHelpSearch/DOCS
trunk/ggc-desktop/data/help/en/JavaHelpSearch/DOCS.TAB
trunk/ggc-desktop/data/help/en/JavaHelpSearch/OFFSETS
trunk/ggc-desktop/data/help/en/JavaHelpSearch/POSITIONS
trunk/ggc-desktop/data/help/en/JavaHelpSearch/SCHEMA
trunk/ggc-desktop/data/help/en/JavaHelpSearch/TMAP
trunk/ggc-desktop/data/help/en/Map.jhm
trunk/ggc-desktop/data/help/en/images/
trunk/ggc-desktop/data/help/en/images/popup.gif
trunk/ggc-desktop/data/help/en/pages/
trunk/ggc-desktop/data/help/en/pages/CGMSTool_Configuration.html
trunk/ggc-desktop/data/help/en/pages/CGMSTool_Export_Data.html
trunk/ggc-desktop/data/help/en/pages/CGMSTool_List.html
trunk/ggc-desktop/data/help/en/pages/CGMSTool_Read_Instruction.html
trunk/ggc-desktop/data/help/en/pages/CGMSTool_Reading_View.html
trunk/ggc-desktop/data/help/en/pages/GGC_BG_BolusHelper.html
trunk/ggc-desktop/data/help/en/pages/GGC_BG_Daily_Add.html
trunk/ggc-desktop/data/help/en/pages/GGC_BG_Daily_View.html
trunk/ggc-desktop/data/help/en/pages/GGC_BG_Graph_Course.html
trunk/ggc-desktop/data/help/en/pages/GGC_BG_Graph_Frequency.html
trunk/ggc-desktop/data/help/en/pages/GGC_BG_Graph_Spread.html
trunk/ggc-desktop/data/help/en/pages/GGC_BG_HbA1c.html
trunk/ggc-desktop/data/help/en/pages/GGC_Backup_Restore.html
trunk/ggc-desktop/data/help/en/pages/GGC_File_Login.html
trunk/ggc-desktop/data/help/en/pages/GGC_File_Logout.html
trunk/ggc-desktop/data/help/en/pages/GGC_Food_Meal_Group_Edit.html
trunk/ggc-desktop/data/help/en/pages/GGC_Food_Meal_Group_View.html
trunk/ggc-desktop/data/help/en/pages/GGC_Food_Meal_Main.html
trunk/ggc-desktop/data/help/en/pages/GGC_Food_Meal_Meal_Edit.html
trunk/ggc-desktop/data/help/en/pages/GGC_Food_Meal_Meal_View.html
trunk/ggc-desktop/data/help/en/pages/GGC_Food_Meal_Select_FoodParts.html
trunk/ggc-desktop/data/help/en/pages/GGC_Food_USDA_Group.html
trunk/ggc-desktop/data/help/en/pages/GGC_Food_USDA_Main.html
trunk/ggc-desktop/data/help/en/pages/GGC_Food_USDA_View.html
trunk/ggc-desktop/data/help/en/pages/GGC_Food_User_Food_Edit.html
trunk/ggc-desktop/data/help/en/pages/GGC_Food_User_Food_View.html
trunk/ggc-desktop/data/help/en/pages/GGC_Food_User_Group_Edit.html
trunk/ggc-desktop/data/help/en/pages/GGC_Food_User_Group_View.html
trunk/ggc-desktop/data/help/en/pages/GGC_Food_User_Main.html
trunk/ggc-desktop/data/help/en/pages/GGC_Food_User_Select_HomeWeight.html
trunk/ggc-desktop/data/help/en/pages/GGC_Food_User_Select_HomeWeight_Main.html
trunk/ggc-desktop/data/help/en/pages/GGC_Food_User_Select_Nutrition.html
trunk/ggc-desktop/data/help/en/pages/GGC_Food_User_Select_Nutrition_Main.html
trunk/ggc-desktop/data/help/en/pages/GGC_MFS_Daily_Selector.html
trunk/ggc-desktop/data/help/en/pages/GGC_MFS_Item_Selector.html
trunk/ggc-desktop/data/help/en/pages/GGC_Main.html
trunk/ggc-desktop/data/help/en/pages/GGC_Prefs_Colors_Fonts.html
trunk/ggc-desktop/data/help/en/pages/GGC_Prefs_General.html
trunk/ggc-desktop/data/help/en/pages/GGC_Prefs_Main.html
trunk/ggc-desktop/data/help/en/pages/GGC_Prefs_MedicalData.html
trunk/ggc-desktop/data/help/en/pages/GGC_Prefs_Printing.html
trunk/ggc-desktop/data/help/en/pages/GGC_Prefs_Rendering.html
trunk/ggc-desktop/data/help/en/pages/GGC_Print_Selector.html
trunk/ggc-desktop/data/help/en/pages/GGC_Print_Selector_2.html
trunk/ggc-desktop/data/help/en/pages/GGC_Ratio_Base.html
trunk/ggc-desktop/data/help/en/pages/GGC_Ratio_Calculator.html
trunk/ggc-desktop/data/help/en/pages/GGC_Ratio_Extended.html
trunk/ggc-desktop/data/help/en/pages/GGC_Tools_Backup.html
trunk/ggc-desktop/data/help/en/pages/GGC_Tools_Restore.html
trunk/ggc-desktop/data/help/en/pages/GGC_Tools_Restore_File_Selector.html
trunk/ggc-desktop/data/help/en/pages/GGC_Tools_Update.html
trunk/ggc-desktop/data/help/en/pages/MeterTool_Configuration.html
trunk/ggc-desktop/data/help/en/pages/MeterTool_Export_Data.html
trunk/ggc-desktop/data/help/en/pages/MeterTool_List.html
trunk/ggc-desktop/data/help/en/pages/MeterTool_Read_Instruction.html
trunk/ggc-desktop/data/help/en/pages/MeterTool_Reading_View.html
trunk/ggc-desktop/data/help/en/pages/PumpTool_Configuration.html
trunk/ggc-desktop/data/help/en/pages/PumpTool_Export_Data.html
trunk/ggc-desktop/data/help/en/pages/PumpTool_List.html
trunk/ggc-desktop/data/help/en/pages/PumpTool_Read_Instruction.html
trunk/ggc-desktop/data/help/en/pages/PumpTool_Reading_View.html
trunk/ggc-desktop/data/help/en/pages/pics/
trunk/ggc-desktop/data/help/en/pages/pics/meter_info.jpg
trunk/ggc-desktop/data/lang/
trunk/ggc-desktop/data/lang/GGC_Languages.properties
trunk/ggc-desktop/data/nutrition_translation/
trunk/ggc-desktop/data/nutrition_translation/foods.txt
trunk/ggc-desktop/data/nutrition_translation/home_weight.txt
trunk/ggc-desktop/data/nutrition_translation/home_weight_not.txt
trunk/ggc-desktop/data/nutrition_translation/nutrients_defs.txt
trunk/ggc-desktop/data/skinlf_themes/
trunk/ggc-desktop/data/skinlf_themes/BeOSthemepack.zip
trunk/ggc-desktop/data/skinlf_themes/amarachthemepack.zip
trunk/ggc-desktop/data/skinlf_themes/aquathemepack.zip
trunk/ggc-desktop/data/skinlf_themes/architectBluethemepack.zip
trunk/ggc-desktop/data/skinlf_themes/architectOlivethemepack.zip
trunk/ggc-desktop/data/skinlf_themes/b0sumiErgothempack.zip
trunk/ggc-desktop/data/skinlf_themes/b0sumithemepack.zip
trunk/ggc-desktop/data/skinlf_themes/bbjthemepack.zip
trunk/ggc-desktop/data/skinlf_themes/beigeazulthemepack.zip
trunk/ggc-desktop/data/skinlf_themes/beosthemepack_orig.zip
trunk/ggc-desktop/data/skinlf_themes/blueMetalthemepack.zip
trunk/ggc-desktop/data/skinlf_themes/blueTurquesathemepack.zip
trunk/ggc-desktop/data/skinlf_themes/cellshadedthemepack.zip
trunk/ggc-desktop/data/skinlf_themes/chaNinja-Bluethemepack.zip
trunk/ggc-desktop/data/skinlf_themes/coronaHthemepack.zip
trunk/ggc-desktop/data/skinlf_themes/cougarthemepack.zip
trunk/ggc-desktop/data/skinlf_themes/fatalEthemepack.zip
trunk/ggc-desktop/data/skinlf_themes/gfxOasisthemepack.zip
trunk/ggc-desktop/data/skinlf_themes/hmmXPBluethemepack.zip
trunk/ggc-desktop/data/skinlf_themes/hmmXPMonoBluethemepack.zip
trunk/ggc-desktop/data/skinlf_themes/iBarthemepack.zip
trunk/ggc-desktop/data/skinlf_themes/macosthemepack.zip
trunk/ggc-desktop/data/skinlf_themes/midnightthemepack.zip
trunk/ggc-desktop/data/skinlf_themes/mmMagra-Xthemepack.zip
trunk/ggc-desktop/data/skinlf_themes/modernthemepack_orig.zip
trunk/ggc-desktop/data/skinlf_themes/oliveGreenLunaXPthemepack.zip
trunk/ggc-desktop/data/skinlf_themes/opusLunaSilverthemepack.zip
trunk/ggc-desktop/data/skinlf_themes/opusOSBluethemepack.zip
trunk/ggc-desktop/data/skinlf_themes/opusOSDeepthemepack.zip
trunk/ggc-desktop/data/skinlf_themes/opusOSOlivethemepack.zip
trunk/ggc-desktop/data/skinlf_themes/roueBluethemepack.zip
trunk/ggc-desktop/data/skinlf_themes/roueBrownthemepack.zip
trunk/ggc-desktop/data/skinlf_themes/royalInspiratthemepack.zip
trunk/ggc-desktop/data/skinlf_themes/silverLunaXPthemepack.zip
trunk/ggc-desktop/data/skinlf_themes/solunaRthemepack.zip
trunk/ggc-desktop/data/skinlf_themes/tigerGraphitethemepack.zip
trunk/ggc-desktop/data/skinlf_themes/tigerthemepack.zip
trunk/ggc-desktop/data/skinlf_themes/toxicthemepack.zip
trunk/ggc-desktop/data/skinlf_themes/whistlerthemepack.zip
trunk/ggc-desktop/data/skinlf_themes/xplunathemepack.zip
trunk/ggc-desktop/data/update/
trunk/ggc-desktop/data/update/GGC_Update.properties
trunk/ggc-desktop/src/
trunk/ggc-desktop/src/ggc/
trunk/ggc-desktop/src/ggc/GGC.java
trunk/ggc-desktop/src/ggc/gui/
trunk/ggc-desktop/src/ggc/gui/MainFrame.java
trunk/ggc-desktop/src/ggc/gui/StatusBar.java
trunk/ggc-desktop/src/ggc/gui/dialogs/
trunk/ggc-desktop/src/ggc/gui/dialogs/AboutGGCDialog.java
trunk/ggc-desktop/src/ggc/gui/dialogs/AppointmentDialog.java
trunk/ggc-desktop/src/ggc/gui/dialogs/AppointmentsDialog.java
trunk/ggc-desktop/src/ggc/gui/dialogs/BolusHelper.java
trunk/ggc-desktop/src/ggc/gui/dialogs/DailyRowDialog.java
trunk/ggc-desktop/src/ggc/gui/dialogs/DailyRowMealsDialog.java
trunk/ggc-desktop/src/ggc/gui/dialogs/DailyStatsDialog.java
trunk/ggc-desktop/src/ggc/gui/dialogs/DoctorDialog.java
trunk/ggc-desktop/src/ggc/gui/dialogs/DoctorsDialog.java
trunk/ggc-desktop/src/ggc/gui/dialogs/HbA1cDialog.java
trunk/ggc-desktop/src/ggc/gui/dialogs/PrintingDialog.java
trunk/ggc-desktop/src/ggc/gui/dialogs/PropertiesDialog.java
trunk/ggc-desktop/src/ggc/gui/dialogs/SchemeDialog.java
trunk/ggc-desktop/src/ggc/gui/dialogs/SchemeEDDialog.java
trunk/ggc-desktop/src/ggc/gui/dialogs/graphs/
trunk/ggc-desktop/src/ggc/gui/dialogs/graphs/CourseGraphDialog.java
trunk/ggc-desktop/src/ggc/gui/dialogs/graphs/DailyGraphDialog.java
trunk/ggc-desktop/src/ggc/gui/dialogs/graphs/FrequencyGraphDialog.java
trunk/ggc-desktop/src/ggc/gui/dialogs/graphs/HbA1cDialog.java
trunk/ggc-desktop/src/ggc/gui/dialogs/graphs/SpreadGraphDialog.java
trunk/ggc-desktop/src/ggc/gui/dialogs/pen/
trunk/ggc-desktop/src/ggc/gui/graphs/
trunk/ggc-desktop/src/ggc/gui/graphs/AbstractGraphView.java
trunk/ggc-desktop/src/ggc/gui/graphs/CourseGraphView.java
trunk/ggc-desktop/src/ggc/gui/graphs/DailyGraphView.java
trunk/ggc-desktop/src/ggc/gui/graphs/FrequencyGraphView.java
trunk/ggc-desktop/src/ggc/gui/graphs/HbA1cView.java
trunk/ggc-desktop/src/ggc/gui/graphs/JFAbstractGraphView.java
trunk/ggc-desktop/src/ggc/gui/graphs/SpreadGraphView.java
trunk/ggc-desktop/src/ggc/gui/little/
trunk/ggc-desktop/src/ggc/gui/little/GGCLittle.java
trunk/ggc-desktop/src/ggc/gui/little/StatusBarL.java
trunk/ggc-desktop/src/ggc/gui/little/panels/
trunk/ggc-desktop/src/ggc/gui/little/panels/DailyStatsControlsL.java
trunk/ggc-desktop/src/ggc/gui/little/panels/DailyStatsPanelL.java
trunk/ggc-desktop/src/ggc/gui/little/panels/GeneralInfoPanelL.java
trunk/ggc-desktop/src/ggc/gui/little/panels/MainLittlePanel.java
trunk/ggc-desktop/src/ggc/gui/little/panels/PlugInMeterPanelL.java
trunk/ggc-desktop/src/ggc/gui/little/panels/PlugInPanelL.java
trunk/ggc-desktop/src/ggc/gui/little/panels/PlugInPumpPanelL.java
trunk/ggc-desktop/src/ggc/gui/little/panels/ScheduleInfoPanelL.java
trunk/ggc-desktop/src/ggc/gui/little/panels/StocksInfoPanelL.java
trunk/ggc-desktop/src/ggc/gui/panels/
trunk/ggc-desktop/src/ggc/gui/panels/info/
trunk/ggc-desktop/src/ggc/gui/panels/info/AbstractInfoPanel.java
trunk/ggc-desktop/src/ggc/gui/panels/info/DeviceInfoPanel.java
trunk/ggc-desktop/src/ggc/gui/panels/info/GeneralInfoPanel.java
trunk/ggc-desktop/src/ggc/gui/panels/info/HbA1cInfoPanel.java
trunk/ggc-desktop/src/ggc/gui/panels/info/InfoPanel.java
trunk/ggc-desktop/src/ggc/gui/panels/info/InfoPanelsIds.java
trunk/ggc-desktop/src/ggc/gui/panels/info/OtherInfoPanel.java
trunk/ggc-desktop/src/ggc/gui/panels/info/PlugInsInfoPanel.java
trunk/ggc-desktop/src/ggc/gui/panels/info/ScheduleInfoPanel.java
trunk/ggc-desktop/src/ggc/gui/panels/info/StatisticsInfoPanel.java
trunk/ggc-desktop/src/ggc/gui/panels/info/StocksInfoPanel.java
trunk/ggc-desktop/src/ggc/gui/panels/prefs/
trunk/ggc-desktop/src/ggc/gui/panels/prefs/AbstractPrefOptionsPanel.java
trunk/ggc-desktop/src/ggc/gui/panels/prefs/PrefFontsAndColorPane.java
trunk/ggc-desktop/src/ggc/gui/panels/prefs/PrefGeneralPane.java
trunk/ggc-desktop/src/ggc/gui/panels/prefs/PrefMainPane.java
trunk/ggc-desktop/src/ggc/gui/panels/prefs/PrefMedicalDataPane.java
trunk/ggc-desktop/src/ggc/gui/panels/prefs/PrefNutritionConfPane.java
trunk/ggc-desktop/src/ggc/gui/panels/prefs/PrefPrintingPane.java
trunk/ggc-desktop/src/ggc/gui/panels/prefs/PrefRenderingQualityPane.java
trunk/ggc-desktop/src/ggc/header_template.txt
trunk/ggc-desktop/src/ggc_help-0.1.jar
trunk/ggc-desktop/src/icons/
trunk/ggc-desktop/src/icons/Remove16.gif
trunk/ggc-desktop/src/icons/RowInsertAfter16.gif
trunk/ggc-desktop/src/icons/Stop16.gif
trunk/ggc-desktop/src/icons/TipOfTheDay16.gif
trunk/ggc-desktop/src/icons/about.gif
trunk/ggc-desktop/src/icons/about.png
trunk/ggc-desktop/src/icons/about_logo.gif
trunk/ggc-desktop/src/icons/basic.gif
trunk/ggc-desktop/src/icons/calendar.png
trunk/ggc-desktop/src/icons/cancel.png
trunk/ggc-desktop/src/icons/cfg_colors.png
trunk/ggc-desktop/src/icons/cfg_doctor.png
trunk/ggc-desktop/src/icons/cfg_general.png
trunk/ggc-desktop/src/icons/cfg_medical.png
trunk/ggc-desktop/src/icons/cfg_meter.png
trunk/ggc-desktop/src/icons/cfg_print.png
trunk/ggc-desktop/src/icons/cfg_render.png
trunk/ggc-desktop/src/icons/close.gif
trunk/ggc-desktop/src/icons/close.png
trunk/ggc-desktop/src/icons/column-chart.png
trunk/ggc-desktop/src/icons/connect.gif
trunk/ggc-desktop/src/icons/connect.png
trunk/ggc-desktop/src/icons/course.gif
trunk/ggc-desktop/src/icons/course.png
trunk/ggc-desktop/src/icons/course24.gif
trunk/ggc-desktop/src/icons/daily.gif
trunk/ggc-desktop/src/icons/daily.png
trunk/ggc-desktop/src/icons/daily24.gif
trunk/ggc-desktop/src/icons/disconnect.gif
trunk/ggc-desktop/src/icons/disconnect.png
trunk/ggc-desktop/src/icons/disk_blue.png
trunk/ggc-desktop/src/icons/dot-chart.png
trunk/ggc-desktop/src/icons/download.png
trunk/ggc-desktop/src/icons/euroflash.gif
trunk/ggc-desktop/src/icons/euroflash.png
trunk/ggc-desktop/src/icons/exit.png
trunk/ggc-desktop/src/icons/export1.png
trunk/ggc-desktop/src/icons/flash.png
trunk/ggc-desktop/src/icons/food.png
trunk/ggc-desktop/src/icons/food_add.gif
trunk/ggc-desktop/src/icons/food_delete.gif
trunk/ggc-desktop/src/icons/food_edit.gif
trunk/ggc-desktop/src/icons/freestyle.gif
trunk/ggc-desktop/src/icons/freestyle.png
trunk/ggc-desktop/src/icons/frequency.gif
trunk/ggc-desktop/src/icons/frequency.png
trunk/ggc-desktop/src/icons/glucocard.gif
trunk/ggc-desktop/src/icons/glucocard.png
trunk/ggc-desktop/src/icons/help.gif
trunk/ggc-desktop/src/icons/help.png
trunk/ggc-desktop/src/icons/import1.png
trunk/ggc-desktop/src/icons/led_blue.gif
trunk/ggc-desktop/src/icons/led_gray.gif
trunk/ggc-desktop/src/icons/led_green.gif
trunk/ggc-desktop/src/icons/led_red.gif
trunk/ggc-desktop/src/icons/led_yellow.gif
trunk/ggc-desktop/src/icons/line-chart.png
trunk/ggc-desktop/src/icons/logon.png
trunk/ggc-desktop/src/icons/logout.png
trunk/ggc-desktop/src/icons/m_asc_breeze.gif
trunk/ggc-desktop/src/icons/m_asc_contour.gif
trunk/ggc-desktop/src/icons/m_asc_dex.gif
trunk/ggc-desktop/src/icons/m_asc_elite.gif
trunk/ggc-desktop/src/icons/m_euroflash.gif
trunk/ggc-desktop/src/icons/m_freestyle.gif
trunk/ggc-desktop/src/icons/m_glucocard.gif
trunk/ggc-desktop/src/icons/m_noMeter.gif
trunk/ggc-desktop/src/icons/medical_bag.png
trunk/ggc-desktop/src/icons/new.gif
trunk/ggc-desktop/src/icons/new.png
trunk/ggc-desktop/src/icons/noMeter.gif
trunk/ggc-desktop/src/icons/noMeter.png
trunk/ggc-desktop/src/icons/ok.png
trunk/ggc-desktop/src/icons/open.gif
trunk/ggc-desktop/src/icons/open.png
trunk/ggc-desktop/src/icons/paint.png
trunk/ggc-desktop/src/icons/pie-chart.png
trunk/ggc-desktop/src/icons/preferences.png
trunk/ggc-desktop/src/icons/print.gif
trunk/ggc-desktop/src/icons/print.png
trunk/ggc-desktop/src/icons/readmeter.gif
trunk/ggc-desktop/src/icons/readmeter.png
trunk/ggc-desktop/src/icons/spacer.gif
trunk/ggc-desktop/src/icons/spacer.png
trunk/ggc-desktop/src/icons/spread.gif
trunk/ggc-desktop/src/icons/spread.png
trunk/ggc-desktop/src/icons/t_asc_dex.gif
trunk/ggc-desktop/src/icons/table_add.png
trunk/ggc-desktop/src/icons/table_delete.png
trunk/ggc-desktop/src/icons/table_edit.png
trunk/ggc-desktop/src/icons/up_down_question.png
trunk/ggc-desktop/src/icons/weight_add.png
trunk/ggc-desktop/src/icons/weight_delete.png
trunk/ggc-desktop/src/icons/weight_edit.png
trunk/ggc-desktop/src/log4j.properties
Added: trunk/ggc-desktop/.amateras
===================================================================
--- trunk/ggc-desktop/.amateras (rev 0)
+++ trunk/ggc-desktop/.amateras 2009-03-19 17:43:07 UTC (rev 684)
@@ -0,0 +1,12 @@
+#EclipseHTMLEditor configuration file
+#Wed Dec 03 16:47:43 CET 2008
+validateDTD=false
+javaScriptCompleters=
+useDTD=false
+validateJSP=false
+validateXML=false
+validateJS=false
+removeMarkers=false
+root=/
+validateHTML=false
+javaScripts=
Added: trunk/ggc-desktop/.classpath
===================================================================
--- trunk/ggc-desktop/.classpath (rev 0)
+++ trunk/ggc-desktop/.classpath 2009-03-19 17:43:07 UTC (rev 684)
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry combineaccessrules="false" exported="true" kind="src" path="/Atech-Tools"/>
+ <classpathentry excluding="**/.svn/**" kind="src" path="src"/>
+ <classpathentry combineaccessrules="false" exported="true" kind="src" path="/GGC Meter Tool">
+ <accessrules>
+ <accessrule kind="accessible" pattern="**/icons/**"/>
+ </accessrules>
+ </classpathentry>
+ <classpathentry combineaccessrules="false" exported="true" kind="src" path="/GGC Pump Tool"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/iText-2.0.7"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/SkinLF-6.7"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/PostgreSQL-JDBC-8.2"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/JavaHelp-2.0.5"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/commons-logging-1.0.4"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/commons-collections-2.1.1"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/Hibernate-3.1"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/H2-1.0.69"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/pygmy-0.2"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/PostgreSQL-8.2"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/ggc-web"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/commons-lang-2.4"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/jfreechart-1.0.10"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/GGC Core"/>
+ <classpathentry kind="output" path="bin"/>
+</classpath>
Added: trunk/ggc-desktop/.project
===================================================================
--- trunk/ggc-desktop/.project (rev 0)
+++ trunk/ggc-desktop/.project 2009-03-19 17:43:07 UTC (rev 684)
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>GGC Desktop</name>
+ <comment></comment>
+ <projects>
+ <project>Atech-Tools</project>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.eclipse.jem.beaninfo.BeanInfoNature</nature>
+ </natures>
+</projectDescription>
Added: trunk/ggc-desktop/data/GGC_Config.properties
===================================================================
--- trunk/ggc-desktop/data/GGC_Config.properties (rev 0)
+++ trunk/ggc-desktop/data/GGC_Config.properties 2009-03-19 17:43:07 UTC (rev 684)
@@ -0,0 +1,88 @@
+#
+# GGC_Config (Settings for GGC)
+#11.9.2008 22:37:49
+#
+# Don't edit by hand
+# Only settings need for application startup are written here. All other info
+# is stored in database
+#
+
+#
+# Databases settings
+#
+
+#
+# Database #0 - Internal Db (H2)
+#
+DB0_CONN_NAME=Internal Db (H2)
+DB0_DB_NAME=H2 SQL
+DB0_CONN_DRIVER_CLASS=org.h2.Driver
+DB0_CONN_URL=jdbc:h2:../data/db/ggc_db
+DB0_CONN_USERNAME=sa
+DB0_CONN_PASSWORD=
+DB0_HIBERNATE_DIALECT=org.hibernate.dialect.H2Dialect
+
+#
+# Database #1 - PostgreSQL Database (v7)
+#
+DB1_CONN_NAME=PostgreSQL Database (v7)
+DB1_DB_NAME=PostgreSQL
+DB1_CONN_DRIVER_CLASS=org.postgresql.Driver
+DB1_CONN_URL=jdbc:postgresql://localhost:5432/ggc_v7?user=ggc&password=ggc
+DB1_CONN_USERNAME=ggc
+DB1_CONN_PASSWORD=ggc
+DB1_HIBERNATE_DIALECT=org.hibernate.dialect.PostgreSQLDialect
+
+#
+# Database #2 - PostgreSQL Database (v3)
+#
+DB2_CONN_NAME=PostgreSQL Database (v3)
+DB2_DB_NAME=PostgreSQL
+DB2_CONN_DRIVER_CLASS=org.postgresql.Driver
+DB2_CONN_URL=jdbc:postgresql://localhost:5432/ggc_v3?user=ggc&password=ggc
+DB2_CONN_USERNAME=ggc
+DB2_CONN_PASSWORD=ggc
+DB2_HIBERNATE_DIALECT=org.hibernate.dialect.PostgreSQLDialect
+
+#
+# Database #3 - PostgreSQL Database (ggc_test2)
+#
+DB3_CONN_NAME=PostgreSQL Database (ggc_test2)
+DB3_DB_NAME=PostgreSQL
+DB3_CONN_DRIVER_CLASS=org.postgresql.Driver
+DB3_CONN_URL=jdbc:postgresql://localhost:5432/ggc_test2?user=ggc&password=ggc
+DB3_CONN_USERNAME=ggc
+DB3_CONN_PASSWORD=ggc
+DB3_HIBERNATE_DIALECT=org.hibernate.dialect.PostgreSQLDialect
+
+#
+# Database #4 - Internal Database
+#
+DB4_CONN_NAME=Internal Database
+DB4_DB_NAME=HypersonicSQL File
+DB4_CONN_DRIVER_CLASS=org.hsqldb.jdbcDriver
+DB4_CONN_URL=jdbc:hsqldb:file:../data/dbt/hsql/ggc_db
+DB4_CONN_USERNAME=sa
+DB4_CONN_PASSWORD=
+DB4_HIBERNATE_DIALECT=org.hibernate.dialect.HSQLDialect
+
+
+#
+# Look and Feel Settings
+#
+
+LF_NAME=SkinLF
+LF_CLASS=com.l2fprod.gui.plaf.skin.SkinLookAndFeel
+SKINLF_SELECTED=modernthemepack_orig.zip
+
+
+#
+# Db Selector
+#
+SELECTED_DB=0
+
+
+#
+# Language Selector
+#
+SELECTED_LANG=en
Added: trunk/ggc-desktop/data/help/HelpList.txt
===================================================================
--- trunk/ggc-desktop/data/help/HelpList.txt (rev 0)
+++ trunk/ggc-desktop/data/help/HelpList.txt 2009-03-19 17:43:07 UTC (rev 684)
@@ -0,0 +1,85 @@
+
+
+File Priority When
+----------------------------------------------------------------
+GGC_Main.html | 0 |
+
+GGC_BG_Daily_Add.html | 1 |
+GGC_BG_Daily_View.html | 1 |
+GGC_BG_HbA1c.html | 2 |
+GGC_BG_Graph_Course.html | 4 |
+GGC_BG_Graph_Frequency.html | 4 |
+GGC_BG_Graph_Spread.html | 4 |
+GGC_BG_BolusHelper.html | 2 |
+GGC_MFS_Daily_Selector.html | 2 |
+GGC_MFS_Item_Selector.html | 2 |
+
+GGC_Ratio_Base.html | 2 |
+GGC_Ratio_Extended.html | - |
+GGC_Ratio_Calculator.html | - |
+
+GGC_Food_User_Main.html | |
+GGC_Food_Meal_Group_Edit.html | |
+GGC_Food_Meal_Group_View.html | |
+GGC_Food_Meal_Main.html | |
+GGC_Food_Meal_Meal_Edit.html | |
+GGC_Food_Meal_Meal_View.html | |
+GGC_Food_Meal_Select_FoodParts.html | |
+GGC_Food_USDA_Group.html | |
+GGC_Food_USDA_Main.html | |
+GGC_Food_USDA_View.html | |
+GGC_Food_User_Food_Edit.html | |
+GGC_Food_User_Food_View.html | |
+GGC_Food_User_Group_Edit.html | |
+GGC_Food_User_Group_View.html | |
+GGC_Food_User_Select_HomeWeight.html | |
+GGC_Food_User_Select_HomeWeight_Main | |
+GGC_Food_User_Select_Nutrition.html | |
+GGC_Food_User_Select_Nutrition_Main | |
+
+
+GGC_File_Login.html | - |
+GGC_File_Logout.html | - |
+
+GGC_Prefs_Rendering.html | - |
+GGC_Prefs_Colors_Fonts.html | 2 |
+GGC_Prefs_General.html | 1 |
+GGC_Prefs_Main.html | 1 |
+GGC_Prefs_MedicalData.html | 1 |
+GGC_Prefs_Printing.html | 2 |
+
+GGC_Print_Selector.html | 2 |
+GGC_Print_Selector_2.html | 2 |
+
+GGC_Tools_Backup.html | 1 |
+GGC_Tools_Restore.html | 1 |
+GGC_Tools_Update.html | 1 |
+GGC_Tools_Restore_File_Selector.html | 1 |
+
+
+Meter Tool
+==========
+
+MeterTool_Read_Instruction.html | 1 |
+MeterTool_Reading_View.html | 1 |
+MeterTool_Export_Data.html | 1 |
+MeterTool_Configuration.html | 1 |
+MeterTool_List.html | 4 |
+
+Pump Tool
+=========
+
+PumpTool_Configuration.html | |
+PumpTool_Export_Data.html | |
+PumpTool_List.html | |
+PumpTool_Read_Instruction.html | |
+PumpTool_Reading_View.html | |
+
+CGMS Tool
+=========
+
+CGMSTool_Configuration.html | |
+CGMSTool_Export_Data.html | |
+CGMSTool_List.html | |
+CGMSTool_Read_Instruction.html | |
+CGMSTool_Reading_View.html | |
Added: trunk/ggc-desktop/data/help/en/GGC.hs
===================================================================
--- trunk/ggc-desktop/data/help/en/GGC.hs (rev 0)
+++ trunk/ggc-desktop/data/help/en/GGC.hs 2009-03-19 17:43:07 UTC (rev 684)
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!--generated by JHelpDev Version: 0.62, 10 November 2006, see jhelpdev.sourceforge.net--><!DOCTYPE helpset PUBLIC "-//Sun Microsystems Inc.//DTD JavaHelp HelpSet Version 2.0//EN" "http://java.sun.com/products/javahelp/helpset_2_0.dtd">
+
+<helpset version="1.0">
+ <title>Help </title>
+ <maps>
+ <homeID>
+top
+ </homeID>
+ <mapref location="Map.jhm"/>
+
+ </maps>
+ <view>
+ <name>
+TOC
+ </name>
+ <label>
+TOC
+ </label>
+ <type>
+javax.help.TOCView
+ </type>
+ <data>
+GGCTOC.xml
+ </data>
+ </view>
+ <view>
+ <name>
+Index
+ </name>
+ <label>
+Index
+ </label>
+ <type>
+javax.help.IndexView
+ </type>
+ <data>
+GGCIndex.xml
+ </data>
+ </view>
+ <view>
+ <name>
+Search
+ </name>
+ <label>
+Search
+ </label>
+ <type>
+javax.help.SearchView
+ </type>
+ <data engine="com.sun.java.help.search.DefaultSearchEngine">
+JavaHelpSearch
+ </data>
+ </view>
+</helpset>
Added: trunk/ggc-desktop/data/help/en/GGC.xml
===================================================================
--- trunk/ggc-desktop/data/help/en/GGC.xml (rev 0)
+++ trunk/ggc-desktop/data/help/en/GGC.xml 2009-03-19 17:43:07 UTC (rev 684)
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE jhelpdev PUBLIC "-//jhelpdev.sourcefore.net//JHelpDev Configuration Settings 1.2" "http://jhelpdev.sourceforge.net/dtd/jhelpdev_1_2.dtd"><!--generated by JHelpDev Version: 0.62, 10 November 2006, see jhelpdev.sourceforge.org-->
+
+<jhelpdev version="1.2">
+ <config>
+ <project>
+GGC
+ </project>
+ <projectdir>
+D:\java\sw\tools\jhelpdev\projects\GGC
+ </projectdir>
+ <startpage>
+pages/GGC_Main.html
+ </startpage>
+ <popupicon>
+images/popup.gif
+ </popupicon>
+ </config>
+ <view>
+ <helptitle>
+Help
+ </helptitle>
+ <toc showing="yes" label="TOC"/>
+
+ <index showing="yes" label="Index"/>
+
+ <search showing="yes" label="Search"/>
+
+ </view>
+ <encoding value="UTF-8"/>
+
+</jhelpdev>
\ No newline at end of file
Added: trunk/ggc-desktop/data/help/en/GGCIndex.xml
===================================================================
--- trunk/ggc-desktop/data/help/en/GGCIndex.xml (rev 0)
+++ trunk/ggc-desktop/data/help/en/GGCIndex.xml 2009-03-19 17:43:07 UTC (rev 684)
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE index PUBLIC "-//Sun Microsystems Inc.//DTD JavaHelp Index Version 1.0//EN" "http://java.sun.com/products/javahelp/index_2_0.dtd"><!--generated by JHelpDev Version: 0.62, 10 November 2006, see jhelpdev.sourceforge.net-->
+
+<index version="1.0"/>
Added: trunk/ggc-desktop/data/help/en/GGCTOC.xml
===================================================================
--- trunk/ggc-desktop/data/help/en/GGCTOC.xml (rev 0)
+++ trunk/ggc-desktop/data/help/en/GGCTOC.xml 2009-03-19 17:43:07 UTC (rev 684)
@@ -0,0 +1,133 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE toc PUBLIC "-//Sun Microsystems Inc.//DTD JavaHelp TOC Version 1.0//EN" "http://java.sun.com/products/javahelp/toc_2_0.dtd"><!--generated by JHelpDev Version: 0.62, 10 November 2006, see jhelpdev.sourceforge.net-->
+
+<toc version="1.0">
+ <tocitem text="GGC Help " target="pages.GGC_Main">
+ <tocitem text="File ">
+ <tocitem text="Login " target="pages.GGC_File_Login"/>
+ <tocitem text="Logout " target="pages.GGC_File_Logout"/>
+ </tocitem>
+
+ <tocitem text="Pen/Injection">
+ <tocitem text="Daily ">
+ <tocitem text="Daily Entries View " target="pages.GGC_BG_Daily_View"/>
+ <tocitem text="Daily Entries Add " target="pages.GGC_BG_Daily_Add"/>
+ <tocitem text="Bolus Helper " target="pages.GGC_BG_BolusHelper"/>
+ <tocitem text="Meals, Foods Selector" target="pages.GGC_MFS_Daily_Selector"/>
+ <tocitem text="Meals, Foods Parts Selector" target="pages.GGC_MFS_Item_Selector"/>
+ </tocitem>
+
+ <tocitem text="Graph ">
+ <tocitem text="Course Graph " target="pages.GGC_BG_Graph_Course"/>
+ <tocitem text="Spread Graph " target="pages.GGC_BG_Graph_Spread"/>
+ <tocitem text="Frequency Graph " target="pages.GGC_BG_Graph_Frequency"/>
+ </tocitem>
+
+ <tocitem text="HbA1c ">
+ <tocitem text="HbA1c View " target="pages.GGC_BG_HbA1c"/>
+ </tocitem>
+
+ <tocitem text="Ratio ">
+ <tocitem text="Base Ratio" target="pages.GGC_Ratio_Base"/>
+ <tocitem text="Extended Ratio" target="pages.GGC_Ratio_Extended"/>
+ <tocitem text="Ratio Calculator" target="pages.GGC_Ratio_Calculator"/>
+ </tocitem>
+
+ </tocitem>
+ <tocitem text="Food ">
+ <tocitem text="USDA Database ">
+ <tocitem text="Main " target="pages.GGC_Food_USDA_Main"/>
+ <tocitem text="Group View " target="pages.GGC_Food_USDA_Group"/>
+ <tocitem text="Food View " target="pages.GGC_Food_USDA_View"/>
+ </tocitem>
+
+ <tocitem text="User Database ">
+ <tocitem text="Main " target="pages.GGC_Food_User_Main"/>
+ <tocitem text="Food Add/Edit " target="pages.GGC_Food_User_Food_Edit"/>
+ <tocitem text="Food View " target="pages.GGC_Food_User_Food_View"/>
+ <tocitem text="Group Add/Edit " target="pages.GGC_Food_User_Group_Edit"/>
+ <tocitem text="Group View " target="pages.GGC_Food_User_Group_View"/>
+ <tocitem text="Nutrition Selector Main " target="pages.GGC_Food_User_Select_Nutrition_Main"/>
+ <tocitem text="Nutrition Selector " target="pages.GGC_Food_User_Select_Nutrition"/>
+ <tocitem text="Home Weight Selector Main " target="pages.GGC_Food_User_Select_HomeWeight_Main"/>
+ <tocitem text="Home Weight Selector " target="pages.GGC_Food_User_Select_HomeWeight"/>
+ </tocitem>
+
+ <tocitem text="Meals Database ">
+ <tocitem text="Main " target="pages.GGC_Food_Meal_Main"/>
+ <tocitem text="Group Add/Edit " target="pages.GGC_Food_Meal_Group_Edit"/>
+ <tocitem text="Group View " target="pages.GGC_Food_Meal_Group_View"/>
+ <tocitem text="Meal Add/Edit " target="pages.GGC_Food_Meal_Meal_Edit"/>
+ <tocitem text="Meal View " target="pages.GGC_Food_Meal_Meal_View"/>
+ <tocitem text="Food Parts Selector " target="pages.GGC_Food_Meal_Select_FoodParts"/>
+ </tocitem>
+ </tocitem>
+
+ <tocitem text="Printing ">
+ <tocitem text="Data Printing " target="pages.GGC_Print_Selector"/>
+ <tocitem text="Food Menu Printing " target="pages.GGC_Print_Selector_2"/>
+ </tocitem>
+
+ <tocitem text="Preferences ">
+ <tocitem text="General " target="pages.GGC_Prefs_General"/>
+ <tocitem text="Medical Data " target="pages.GGC_Prefs_MedicalData"/>
+ <tocitem text="Colors & Fonts " target="pages.GGC_Prefs_Colors_Fonts"/>
+ <tocitem text="Rendering Quality " target="pages.GGC_Prefs_Rendering"/>
+ <tocitem text="Printing " target="pages.GGC_Prefs_Printing"/>
+ </tocitem>
+
+ <tocitem text="Tools ">
+ <tocitem text="Update " target="pages.GGC_Tools_Update"/>
+ <tocitem text="Backup " target="pages.GGC_Tools_Backup"/>
+ <tocitem text="Restore File Selector" target="pages.GGC_Tools_Restore_File_Selector"/>
+ <tocitem text="Restore " target="pages.GGC_Tools_Restore"/>
+ </tocitem>
+
+
+ <tocitem text="Plug-ins ">
+
+ <tocitem text="Meter Tool">
+ <tocitem text="Read Instruction" target="pages.MeterTool_Read_Instruction"/>
+ <tocitem text="Reading View" target="pages.MeterTool_Reading_View"/>
+ <tocitem text="Export Data" target="pages.MeterTool_Export_Data"/>
+ <tocitem text="Configuration " target="pages.MeterTool_Configuration"/>
+ <tocitem text="Configuration - Port Selector" target="pages.MeterTool_Configuration_PortSelector"/>
+ <tocitem text="List" target="pages.MeterTool_List"/>
+ </tocitem>
+
+ <tocitem text="Pump Tool">
+ <tocitem text="Read Instruction" target="pages.PumpTool_Read_Instruction"/>
+ <tocitem text="Reading View" target="pages.PumpTool_Reading_View"/>
+ <tocitem text="Export Data" target="pages.PumpTool_Export_Data"/>
+ <tocitem text="Configuration " target="pages.PumpTool_Configuration"/>
+ <tocitem text="Configuration - Port Selector" target="pages.PumpTool_Configuration_PortSelector"/>
+ <tocitem text="List" target="pages.PumpTool_List"/>
+
+ <tocitem text="HbA1c ">
+ <tocitem text="HbA1c View " target="pages.GGC_BG_HbA1c"/>
+ </tocitem>
+
+ <tocitem text="Ratio ">
+ <tocitem text="Base Ratio" target="pages.GGC_Ratio_Base"/>
+ <tocitem text="Extended Ratio" target="pages.GGC_Ratio_Extended"/>
+ <tocitem text="Ratio Calculator" target="pages.GGC_Ratio_Calculator"/>
+ </tocitem>
+
+ </tocitem>
+
+
+ <tocitem text="CGMS Tool">
+ <tocitem text="Read Instruction" target="pages.CGMSTool_Read_Instruction"/>
+ <tocitem text="Reading View" target="pages.CGMSTool_Reading_View"/>
+ <tocitem text="Export Data" target="pages.CGMSTool_Export_Data"/>
+ <tocitem text="Configuration " target="pages.CGMSTool_Configuration"/>
+ <tocitem text="Configuration - Port Selector" target="pages.CGMSTool_Configuration_PortSelector"/>
+ <tocitem text="List" target="pages.CGMSTool_List"/>
+ </tocitem>
+
+
+ </tocitem>
+
+
+ </tocitem>
+</toc>
\ No newline at end of file
Added: trunk/ggc-desktop/data/help/en/JavaHelpSearch/DOC.TAB
===================================================================
--- trunk/ggc-desktop/data/help/en/JavaHelpSearch/DOC.TAB (rev 0)
+++ trunk/ggc-desktop/data/help/en/JavaHelpSearch/DOC.TAB 2009-03-19 17:43:07 UTC (rev 684)
@@ -0,0 +1,3 @@
+eu\xDD}\xD5\xD5\xD5\xD74\x97\xF5sIsIu\xDCg\xC4\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF݀8\xA3\x86\xB2\xF3K9
+\xA3
+0\xA8\xC2\xCC(\xDE+̢\xF3 \xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xF6
\ No newline at end of file
Added: trunk/ggc-desktop/data/help/en/JavaHelpSearch/DOCS
===================================================================
(Binary files differ)
Property changes on: trunk/ggc-desktop/data/help/en/JavaHelpSearch/DOCS
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/ggc-desktop/data/help/en/JavaHelpSearch/DOCS.TAB
===================================================================
--- trunk/ggc-desktop/data/help/en/JavaHelpSearch/DOCS.TAB (rev 0)
+++ trunk/ggc-desktop/data/help/en/JavaHelpSearch/DOCS.TAB 2009-03-19 17:43:07 UTC (rev 684)
@@ -0,0 +1,3 @@
+eu\xDD}\xD5\xD5\xD5\xD74\x97\xF5sIsIu\xDCg\xC4\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF݀8\xA3\x86\xB2\xF3K9
+\xA3
+0\xA8\xC2\xCC(\xDE+̢\xF3 \xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xF6
\ No newline at end of file
Added: trunk/ggc-desktop/data/help/en/JavaHelpSearch/OFFSETS
===================================================================
--- trunk/ggc-desktop/data/help/en/JavaHelpSearch/OFFSETS (rev 0)
+++ trunk/ggc-desktop/data/help/en/JavaHelpSearch/OFFSETS 2009-03-19 17:43:07 UTC (rev 684)
@@ -0,0 +1,2 @@
+\xCC\xD9+(\xC2\xF3 \x8C.3.\xAE\xAE\xA0t6\x8Eb\xA6\xA6&Wiv\xABriw\xE6jⲰ\x80BX\xC6|\xCF\xDB+\x99\xC3 \xD6s\x83 \xDA\xCE0\xBD\xF6s\x86
+Y\x9B`
\ No newline at end of file
Added: trunk/ggc-desktop/data/help/en/JavaHelpSearch/POSITIONS
===================================================================
(Binary files differ)
Property changes on: trunk/ggc-desktop/data/help/en/JavaHelpSearch/POSITIONS
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/ggc-desktop/data/help/en/JavaHelpSearch/SCHEMA
===================================================================
--- trunk/ggc-desktop/data/help/en/JavaHelpSearch/SCHEMA (rev 0)
+++ trunk/ggc-desktop/data/help/en/JavaHelpSearch/SCHEMA 2009-03-19 17:43:07 UTC (rev 684)
@@ -0,0 +1,2 @@
+JavaSearch 1.0
+TMAP bs=2048 rt=1 fl=-1 id1=156 id2=1
Added: trunk/ggc-desktop/data/help/en/JavaHelpSearch/TMAP
===================================================================
(Binary files differ)
Property changes on: trunk/ggc-desktop/data/help/en/JavaHelpSearch/TMAP
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/ggc-desktop/data/help/en/Map.jhm
===================================================================
--- trunk/ggc-desktop/data/help/en/Map.jhm (rev 0)
+++ trunk/ggc-desktop/data/help/en/Map.jhm 2009-03-19 17:43:07 UTC (rev 684)
@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE map PUBLIC "-//Sun Microsystems Inc.//DTD JavaHelp Map Version 1.0//EN" "http://java.sun.com/products/javahelp/map_2_0.dtd"><!--generated by JHelpDev Version: 0.62, 10 November 2006, see jhelpdev.sourceforge.net-->
+
+<map version="1.0">
+<mapID target="top" url="pages/GGC_Main.html "/>
+
+<mapID target="popup_icon" url="images/popup.gif "/>
+
+<mapID target="pages.GGC_Main" url="pages/GGC_Main.html"/>
+
+
+
+<mapID target="pages.GGC_File_Login" url="pages/GGC_File_Login.html"/>
+<mapID target="pages.GGC_File_Logout" url="pages/GGC_File_Logout.html"/>
+
+
+<mapID target="pages.GGC_BG_Daily_View" url="pages/GGC_BG_Daily_View.html"/>
+<mapID target="pages.GGC_BG_HbA1c" url="pages/GGC_BG_HbA1c.html"/>
+<mapID target="pages.GGC_BG_Graph_Spread" url="pages/GGC_BG_Graph_Spread.html"/>
+<mapID target="pages.GGC_BG_Graph_Course" url="pages/GGC_BG_Graph_Course.html"/>
+<mapID target="pages.GGC_BG_Daily_Add" url="pages/GGC_BG_Daily_Add.html"/>
+<mapID target="pages.GGC_BG_Graph_Frequency" url="pages/GGC_BG_Graph_Frequency.html"/>
+<mapID target="pages.GGC_BG_BolusHelper" url="pages/GGC_BG_BolusHelper.html"/>
+<mapID target="pages.GGC_MFS_Daily_Selector" url="pages/GGC_MFS_Daily_Selector.html"/>
+<mapID target="pages.GGC_MFS_Item_Selector" url="pages/GGC_MFS_Item_Selector.html"/>
+
+
+<mapID target="pages.GGC_Ratio_Base" url="pages/GGC_Ratio_Base.html"/>
+<mapID target="pages.GGC_Ratio_Extended" url="pages/GGC_Ratio_Extended.html"/>
+<mapID target="pages.GGC_Ratio_Calculator" url="pages/GGC_Ratio_Calculator.html"/>
+
+<mapID target="pages.GGC_Prefs_Main" url="pages/GGC_Prefs_Main.html"/>
+<mapID target="pages.GGC_Prefs_General" url="pages/GGC_Prefs_General.html"/>
+<mapID target="pages.GGC_Prefs_Colors_Fonts" url="pages/GGC_Prefs_Colors_Fonts.html"/>
+<mapID target="pages.GGC_Prefs_Rendering" url="pages/GGC_Prefs_Rendering.html"/>
+<mapID target="pages.GGC_Prefs_MedicalData" url="pages/GGC_Prefs_MedicalData.html"/>
+<mapID target="pages.GGC_Prefs_Printing" url="pages/GGC_Prefs_Printing.html"/>
+
+<mapID target="pages.GGC_Print_Selector" url="pages/GGC_Print_Selector.html"/>
+<mapID target="pages.GGC_Print_Selector_2" url="pages/GGC_Print_Selector_2.html"/>
+
+<mapID target="pages.GGC_Food_Meal_Main" url="pages/GGC_Food_Meal_Main.html"/>
+<mapID target="pages.GGC_Food_User_Select_HomeWeight" url="pages/GGC_Food_User_Select_HomeWeight.html"/>
+<mapID target="pages.GGC_Food_Meal_Meal_View" url="pages/GGC_Food_Meal_Meal_View.html"/>
+<mapID target="pages.GGC_Food_Meal_Select_FoodParts" url="pages/GGC_Food_Meal_Select_FoodParts.html"/>
+<mapID target="pages.GGC_Food_User_Food_View" url="pages/GGC_Food_User_Food_View.html"/>
+<mapID target="pages.GGC_Food_User_Select_Nutrition" url="pages/GGC_Food_User_Select_Nutrition.html"/>
+<mapID target="pages.GGC_Food_Meal_Group_View" url="pages/GGC_Food_Meal_Group_View.html"/>
+<mapID target="pages.GGC_Food_User_Group_View" url="pages/GGC_Food_User_Group_View.html"/>
+<mapID target="pages.GGC_Food_User_Group_Edit" url="pages/GGC_Food_User_Group_Edit.html"/>
+<mapID target="pages.GGC_Food_Meal_Meal_Edit" url="pages/GGC_Food_Meal_Meal_Edit.html"/>
+<mapID target="pages.GGC_Food_User_Food_Edit" url="pages/GGC_Food_User_Food_Edit.html"/>
+<mapID target="pages.GGC_Food_User_Select_Nutrition_Main" url="pages/GGC_Food_User_Select_Nutrition_Main.html"/>
+<mapID target="pages.GGC_Food_User_Main" url="pages/GGC_Food_User_Main.html"/>
+<mapID target="pages.GGC_Food_USDA_View" url="pages/GGC_Food_USDA_View.html"/>
+<mapID target="pages.GGC_Food_User_Select_HomeWeight_Main" url="pages/GGC_Food_User_Select_HomeWeight_Main.html"/>
+<mapID target="pages.GGC_Food_USDA_Group" url="pages/GGC_Food_USDA_Group.html"/>
+<mapID target="pages.GGC_Food_Meal_Group_Edit" url="pages/GGC_Food_Meal_Group_Edit.html"/>
+<mapID target="pages.GGC_Food_USDA_Main" url="pages/GGC_Food_USDA_Main.html"/>
+
+<mapID target="pages.GGC_Tools_Update" url="pages/GGC_Tools_Update.html"/>
+<mapID target="pages.GGC_Tools_Backup" url="pages/GGC_Tools_Backup.html"/>
+<mapID target="pages.GGC_Tools_Restore" url="pages/GGC_Tools_Restore.html"/>
+<mapID target="pages.GGC_Tools_Restore_File_Selector" url="pages/GGC_Tools_Restore_File_Selector.html"/>
+
+
+<mapID target="pages.MeterTool_Read_Instruction" url="pages/MeterTool_Read_Instruction.html"/>
+<mapID target="pages.MeterTool_Reading_View" url="pages/MeterTool_Reading_View.html"/>
+<mapID target="pages.MeterTool_Export_Data" url="pages/MeterTool_Export_Data.html"/>
+<mapID target="pages.MeterTool_Configuration" url="pages/MeterTool_Configuration.html"/>
+<mapID target="pages.MeterTool_Configuration_PortSelector" url="pages/MeterTool_Configuration_PortSelector.html"/>
+<mapID target="pages.MeterTool_List" url="pages/MeterTool_List.html"/>
+
+<mapID target="pages.PumpTool_Read_Instruction" url="pages/PumpTool_Read_Instruction.html"/>
+<mapID target="pages.PumpTool_Reading_View" url="pages/PumpTool_Reading_View.html"/>
+<mapID target="pages.PumpTool_Export_Data" url="pages/PumpTool_Export_Data.html"/>
+<mapID target="pages.PumpTool_Configuration" url="pages/PumpTool_Configuration.html"/>
+<mapID target="pages.PumpTool_Configuration_PortSelector" url="pages/PumpTool_Configuration_PortSelector.html"/>
+<mapID target="pages.PumpTool_List" url="pages/PumpTool_List.html"/>
+
+<mapID target="pages.CGMSTool_Read_Instruction" url="pages/CGMSTool_Read_Instruction.html"/>
+<mapID target="pages.CGMSTool_Reading_View" url="pages/CGMSTool_Reading_View.html"/>
+<mapID target="pages.CGMSTool_Export_Data" url="pages/CGMSTool_Export_Data.html"/>
+<mapID target="pages.CGMSTool_Configuration" url="pages/CGMSTool_Configuration.html"/>
+<mapID target="pages.CGMSTool_Configuration_PortSelector" url="pages/CGMSTool_Configuration_PortSelector.html"/>
+<mapID target="pages.CGMSTool_List" url="pages/CGMSTool_List.html"/>
+
+
+<mapID target="images.popup" url="images/popup.gif"/>
+
+</map>
\ No newline at end of file
Added: trunk/ggc-desktop/data/help/en/images/popup.gif
===================================================================
(Binary files differ)
Property changes on: trunk/ggc-desktop/data/help/en/images/popup.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/ggc-desktop/data/help/en/pages/CGMSTool_Configuration.html
===================================================================
--- trunk/ggc-desktop/data/help/en/pages/CGMSTool_Configuration.html (rev 0)
+++ trunk/ggc-desktop/data/help/en/pages/CGMSTool_Configuration.html 2009-03-19 17:43:07 UTC (rev 684)
@@ -0,0 +1,6 @@
+<html>
+<title>CGMS - Configuration</title>
+<body>
+<h1>CGMS - Configuration</h1>
+</body>
+</html>
\ No newline at end of file
Added: trunk/ggc-desktop/data/help/en/pages/CGMSTool_Export_Data.html
===================================================================
--- trunk/ggc-desktop/data/help/en/pages/CGMSTool_Export_Data.html (rev 0)
+++ trunk/ggc-desktop/data/help/en/pages/CGMSTool_Export_Data.html 2009-03-19 17:43:07 UTC (rev 684)
@@ -0,0 +1,6 @@
+<html>
+<title>CGMS - Export Data</title>
+<body>
+<h1>CGMS - Export Data</h1>
+</body>
+</html>
\ No newline at end of file
Added: trunk/ggc-desktop/data/help/en/pages/CGMSTool_List.html
===================================================================
--- trunk/ggc-desktop/data/help/en/pages/CGMSTool_List.html (rev 0)
+++ trunk/ggc-desktop/data/help/en/pages/CGMSTool_List.html 2009-03-19 17:43:07 UTC (rev 684)
@@ -0,0 +1,6 @@
+<html>
+<title>CGMS - List</title>
+<body>
+<h1>CGMS - List</h1>
+</body>
+</html>
\ No newline at end of file
Added: trunk/ggc-desktop/data/help/en/pages/CGMSTool_Read_Instruction.html
===================================================================
--- trunk/ggc-desktop/data/help/en/pages/CGMSTool_Read_Instruction.html (rev 0)
+++ trunk/ggc-desktop/data/help/en/pages/CGMSTool_Read_Instruction.html 2009-03-19 17:43:07 UTC (rev 684)
@@ -0,0 +1,6 @@
+<html>
+<title>CGMS - Device Read Instructions</title>
+<body>
+<h1>CGMS - Device Read Instructions</h1>
+</body>
+</html>
\ No newline at end of file
Added: trunk/ggc-desktop/data/help/en/pages/CGMSTool_Reading_View.html
===================================================================
--- trunk/ggc-desktop/data/help/en/pages/CGMSTool_Reading_View.html (rev 0)
+++ trunk/ggc-desktop/data/help/en/pages/CGMSTool_Reading_View.html 2009-03-19 17:43:07 UTC (rev 684)
@@ -0,0 +1,6 @@
+<html>
+<title>CGMS - Reading View</title>
+<body>
+<h1>CGMS - Reading View</h1>
+</body>
+</html>
\ No newline at end of file
Added: trunk/ggc-desktop/data/help/en/pages/GGC_BG_BolusHelper.html
===================================================================
--- trunk/ggc-desktop/data/help/en/pages/GGC_BG_BolusHelper.html (rev 0)
+++ trunk/ggc-desktop/data/help/en/pages/GGC_BG_BolusHelper.html 2009-03-19 17:43:07 UTC (rev 684)
@@ -0,0 +1,6 @@
+<html>
+<title>BG - Bolus Helper</title>
+<body>
+<h1>BG - Bolus Helper</h1>
+</body>
+</html>
\ No newline at end of file
Added: trunk/ggc-desktop/data/help/en/pages/GGC_BG_Daily_Add.html
===================================================================
--- trunk/ggc-desktop/data/help/en/pages/GGC_BG_Daily_Add.html (rev 0)
+++ trunk/ggc-desktop/data/help/en/pages/GGC_BG_Daily_Add.html 2009-03-19 17:43:07 UTC (rev 684)
@@ -0,0 +1,34 @@
+<html>
+<body>
+<h1>Pen/Injection Daily Entry Add/Edit</h1>
+
+This is one of most important dialogs. It helps us to add daily entry data. This part
+that has involved the most since it's main entry dialog. To fully understand power
+of this wonderful dialog, we will go through all parts of it.
+
+At first we need to set Date and Time. When we start from Daily View, and click on Add
+Date is already set on Day from which we called Add. So we only need to set the Time.
+
+BG entry allows us to enter data in either mmol/L or mg/dL. If we enter in one format,
+data is automatically converted in other format.
+
+There are two insulins we can enter. Bolus and Basal (both have names set which we
+predefined in Configuration). We can enter data for Bolus manually or use Bolus
+Helper.
+
+Urine entry is text based entry so we can add description here...
+
+Activity is also descriptional entry, where we describe activity and its duration.
+
+Comment
+
+CH
+
+Bolus Helper
+
+
+
+
+
+</body>
+</html>
\ No newline at end of file
Added: trunk/ggc-desktop/data/help/en/pages/GGC_BG_Daily_View.html
===================================================================
--- trunk/ggc-desktop/data/help/en/pages/GGC_BG_Daily_View.html (rev 0)
+++ trunk/ggc-desktop/data/help/en/pages/GGC_BG_Daily_View.html 2009-03-19 17:43:07 UTC (rev 684)
@@ -0,0 +1,17 @@
+<html>
+<body>
+<h1>Pen/Injection Daily Values View</h1>
+
+This is most important view of application when application
+is running in Pen/Injection mode (Only mode currently supported).<br>
+<br>
+In this view you can see all Daily data, statistics for this Day and you have ability to
+Add/Delete or Edit certain data entries. There is also one other feature, Daily Graph
+(click on Graph).<br>
+<br>
+You can navigate through different days on left upper side. There is puldown entry
+for changing months, spinner for navigating through years and panel with buttons
+for changing day. <br>
+<br>
+</body>
+</html>
Added: trunk/ggc-desktop/data/help/en/pages/GGC_BG_Graph_Course.html
===================================================================
--- trunk/ggc-desktop/data/help/en/pages/GGC_BG_Graph_Course.html (rev 0)
+++ trunk/ggc-desktop/data/help/en/pages/GGC_BG_Graph_Course.html 2009-03-19 17:43:07 UTC (rev 684)
@@ -0,0 +1,5 @@
+<html>
+<body>
+<h1>BG Course Graph</h1>
+</body>
+</html>
\ No newline at end of file
Added: trunk/ggc-desktop/data/help/en/pages/GGC_BG_Graph_Frequency.html
===================================================================
--- trunk/ggc-desktop/data/help/en/pages/GGC_BG_Graph_Frequency.html (rev 0)
+++ trunk/ggc-desktop/data/help/en/pages/GGC_BG_Graph_Frequency.html 2009-03-19 17:43:07 UTC (rev 684)
@@ -0,0 +1,6 @@
+<html>
+<body>
+<h1>BG Frequency Graph</h1>
+
+</body>
+</html>
\ No newline at end of file
Added: trunk/ggc-desktop/data/help/en/pages/GGC_BG_Graph_Spread.html
===================================================================
--- trunk/ggc-desktop/data/help/en/pages/GGC_BG_Graph_Spread.html (rev 0)
+++ trunk/ggc-desktop/data/help/en/pages/GGC_BG_Graph_Spread.html 2009-03-19 17:43:07 UTC (rev 684)
@@ -0,0 +1,5 @@
+<html>
+<body>
+<h1>BG Spread Graph</h1>
+</body>
+</html>
\ No newline at end of file
Added: trunk/ggc-desktop/data/help/en/pages/GGC_BG_HbA1c.html
===================================================================
--- trunk/ggc-desktop/data/help/en/pages/GGC_BG_HbA1c.html (rev 0)
+++ trunk/ggc-desktop/data/help/en/pages/GGC_BG_HbA1c.html 2009-03-19 17:43:07 UTC (rev 684)
@@ -0,0 +1,5 @@
+<html>
+<body>
+<h1>BG HbA1c</h1>
+</body>
+</html>
\ No newline at end of file
Added: trunk/ggc-desktop/data/help/en/pages/GGC_Backup_Restore.html
===================================================================
--- trunk/ggc-desktop/data/help/en/pages/GGC_Backup_Restore.html (rev 0)
+++ trunk/ggc-desktop/data/help/en/pages/GGC_Backup_Restore.html 2009-03-19 17:43:07 UTC (rev 684)
@@ -0,0 +1,43 @@
+<html>
+<body>
+<h1>Backup/Restore System in GGC</h1>
+
+GGC has special Backup/Restore mechanism, since all user data is stored in database. <br>
+<br>
+GGC uses Hibernate framework, which can use almost any Java database, so it is very
+important that we have ability to do full Backup and Restore. (to make updates
+and to move data to and from various databases)<br>
+<br>
+As functionalities are enabled and used, also Backup options (Tables) are created so
+that all used data can be easily preserved.<br>
+<br>
+All tables are versioned, so if there are changes in database, we can backup data and
+restore it into new version (if we installed new version).<br>
+<br>
+Backup/Restore system is intended only for FULL backup/restore operations. <br>
+<br>
+With Daily Values we have option to just append data, but this just so that we can
+also add data from other computers. At later time this functionality will be done by
+Export/Import system, which will be Backup/Restore subsystem.<br>
+<br><br>
+Currently we support backup of following data:
+<ul>
+<li>Daily Values for Pen/Injection theraphy</li>
+<li>Configuration (full)</li>
+<li>User Foods/Groups</li>
+<li>Meals entries/Groups</li>
+</ul>
+<br><br>
+
+Planned backup of following data:
+<ul>
+<li>Multi User Data (functionality not implemented yet)</li>
+<li>USDA Food/Groups (now they are directly imported)</li>
+<li>Home Weights and other food data (now they are directly imported)</li>
+<li>Pump data (Pump support not finished yet)</li>
+<li>CGMS data (CGMS support not started yet)</li>
+</ul>
+
+
+</body>
+</html>
Added: trunk/ggc-desktop/data/help/en/pages/GGC_File_Login.html
===================================================================
--- trunk/ggc-desktop/data/help/en/pages/GGC_File_Login.html (rev 0)
+++ trunk/ggc-desktop/data/help/en/pages/GGC_File_Login.html 2009-03-19 17:43:07 UTC (rev 684)
@@ -0,0 +1,5 @@
+<html>
+<body>
+<h1>GGC Login</h1>
+</body>
+</html>
\ No newline at end of file
Added: trunk/ggc-desktop/data/help/en/pages/GGC_File_Logout.html
===================================================================
--- trunk/ggc-desktop/data/help/en/pages/GGC_File_Logout.html (rev 0)
+++ trunk/ggc-desktop/data/help/en/pages/GGC_File_Logout.html 2009-03-19 17:43:07 UTC (rev 684)
@@ -0,0 +1,5 @@
+<html>
+<body>
+<h1>GGC Logout</h1>
+</body>
+</html>
\ No newline at end of file
Added: trunk/ggc-desktop/data/help/en/pages/GGC_Food_Meal_Group_Edit.html
===================================================================
--- trunk/ggc-desktop/data/help/en/pages/GGC_Food_Meal_Group_Edit.html (rev 0)
+++ trunk/ggc-desktop/data/help/en/pages/GGC_Food_Meal_Group_Edit.html 2009-03-19 17:43:07 UTC (rev 684)
@@ -0,0 +1,5 @@
+<html>
+<body>
+<h1>Meals Db - Group Add/Edit</h1>
+</body>
+</html>
\ No newline at end of file
Added: trunk/ggc-desktop/data/help/en/pages/GGC_Food_Meal_Group_View.html
===================================================================
--- trunk/ggc-desktop/data/help/en/pages/GGC_Food_Meal_Group_View.html (rev 0)
+++ trunk/ggc-desktop/data/help/en/pages/GGC_Food_Meal_Group_View.html 2009-03-19 17:43:07 UTC (rev 684)
@@ -0,0 +1,5 @@
+<html>
+<body>
+<h1>Meals Db - Group View</h1>
+</body>
+</html>
\ No newline at end of file
Added: trunk/ggc-desktop/data/help/en/pages/GGC_Food_Meal_Main.html
===================================================================
--- trunk/ggc-desktop/data/help/en/pages/GGC_Food_Meal_Main.html (rev 0)
+++ trunk/ggc-desktop/data/help/en/pages/GGC_Food_Meal_Main.html 2009-03-19 17:43:07 UTC (rev 684)
@@ -0,0 +1,5 @@
+<html>
+<body>
+<h1>Meals Db Main</h1>
+</body>
+</html>
\ No newline at end of file
Added: trunk/ggc-desktop/data/help/en/pages/GGC_Food_Meal_Meal_Edit.html
===================================================================
--- trunk/ggc-desktop/data/help/en/pages/GGC_Food_Meal_Meal_Edit.html (rev 0)
+++ trunk/ggc-desktop/data/help/en/pages/GGC_Food_Meal_Meal_Edit.html 2009-03-19 17:43:07 UTC (rev 684)
@@ -0,0 +1,5 @@
+<html>
+<body>
+<h1>Meals Db - Meal Add/Edit</h1>
+</body>
+</html>
\ No newline at end of file
Added: trunk/ggc-desktop/data/help/en/pages/GGC_Food_Meal_Meal_View.html
===================================================================
--- trunk/ggc-desktop/data/help/en/pages/GGC_Food_Meal_Meal_View.html (rev 0)
+++ trunk/ggc-desktop/data/help/en/pages/GGC_Food_Meal_Meal_View.html 2009-03-19 17:43:07 UTC (rev 684)
@@ -0,0 +1,5 @@
+<html>
+<body>
+<h1>Meals Db - Meal View</h1>
+</body>
+</html>
\ No newline at end of file
Added: trunk/ggc-desktop/data/help/en/pages/GGC_Food_Meal_Select_FoodParts.html
===================================================================
--- trunk/ggc-desktop/data/help/en/pages/GGC_Food_Meal_Select_FoodParts.html (rev 0)
+++ trunk/ggc-desktop/data/help/en/pages/GGC_Food_Meal_Select_FoodParts.html 2009-03-19 17:43:07 UTC (rev 684)
@@ -0,0 +1,5 @@
+<html>
+<body>
+<h1>Meals Db - Food Parts Selector</h1>
+</body>
+</html>
\ No newline at end of file
Added: trunk/ggc-desktop/data/help/en/pages/GGC_Food_USDA_Group.html
===================================================================
--- trunk/ggc-desktop/data/help/en/pages/GGC_Food_USDA_Group.html (rev 0)
+++ trunk/ggc-desktop/data/help/en/pages/GGC_Food_USDA_Group.html 2009-03-19 17:43:07 UTC (rev 684)
@@ -0,0 +1,5 @@
+<html>
+<body>
+<h1>USDA Db - Group View</h1>
+</body>
+</html>
\ No newline at end of file
Added: trunk/ggc-desktop/data/help/en/pages/GGC_Food_USDA_Main.html
===================================================================
--- trunk/ggc-desktop/data/help/en/pages/GGC_Food_USDA_Main.html (rev 0)
+++ trunk/ggc-desktop/data/help/en/pages/GGC_Food_USDA_Main.html 2009-03-19 17:43:07 UTC (rev 684)
@@ -0,0 +1,5 @@
+<html>
+<body>
+<h1>USDA Db Main</h1>
+</body>
+</html>
\ No newline at end of file
Added: trunk/ggc-desktop/data/help/en/pages/GGC_Food_USDA_View.html
===================================================================
--- trunk/ggc-desktop/data/help/en/pages/GGC_Food_USDA_View.html (rev 0)
+++ trunk/ggc-desktop/data/help/en/pages/GGC_Food_USDA_View.html 2009-03-19 17:43:07 UTC (rev 684)
@@ -0,0 +1,5 @@
+<html>
+<body>
+<h1>USDA Db - Food View</h1>
+</body>
+</html>
\ No newline at end of file
Added: trunk/ggc-desktop/data/help/en/pages/GGC_Food_User_Food_Edit.html
===================================================================
--- trunk/ggc-desktop/data/help/en/pages/GGC_Food_User_Food_Edit.html (rev 0)
+++ trunk/ggc-desktop/data/help/en/pages/GGC_Food_User_Food_Edit.html 2009-03-19 17:43:07 UTC (rev 684)
@@ -0,0 +1,5 @@
+<html>
+<body>
+<h1>User Db - Food Add/Edit</h1>
+</body>
+</html>
\ No newline at end of file
Added: trunk/ggc-desktop/data/help/en/pages/GGC_Food_User_Food_View.html
===================================================================
--- trunk/ggc-desktop/data/help/en/pages/GGC_Food_User_Food_View.html (rev 0)
+++ trunk/ggc-desktop/data/help/en/pages/GGC_F...
[truncated message content] |
|
From: <and...@us...> - 2009-03-19 18:32:10
|
Revision: 685
http://ggc.svn.sourceforge.net/ggc/?rev=685&view=rev
Author: andyrozman
Date: 2009-03-19 18:32:06 +0000 (Thu, 19 Mar 2009)
Log Message:
-----------
Added Paths:
-----------
trunk/ggc-core/
trunk/ggc-core/.amateras
trunk/ggc-core/.classpath
trunk/ggc-core/.project
trunk/ggc-core/src/
trunk/ggc-core/src/GGC_CGM.hbm.xml
trunk/ggc-core/src/GGC_Main.hbm.xml
trunk/ggc-core/src/GGC_Nutrition.hbm.xml
trunk/ggc-core/src/GGC_Nutrition_de.native.properties
trunk/ggc-core/src/GGC_Nutrition_de.properties
trunk/ggc-core/src/GGC_Nutrition_en.properties
trunk/ggc-core/src/GGC_Nutrition_fr.properties
trunk/ggc-core/src/GGC_Nutrition_si.properties
trunk/ggc-core/src/GGC_Other.hbm.xml
trunk/ggc-core/src/GGC_Pump.hbm.xml
trunk/ggc-core/src/GGC_de.native.properties
trunk/ggc-core/src/GGC_de.properties
trunk/ggc-core/src/GGC_en.properties
trunk/ggc-core/src/GGC_fr.properties
trunk/ggc-core/src/GGC_si.properties
trunk/ggc-core/src/ggc/
trunk/ggc-core/src/ggc/core/
trunk/ggc-core/src/ggc/core/data/
trunk/ggc-core/src/ggc/core/data/DailyStatsTableModel.java
trunk/ggc-core/src/ggc/core/data/DailyValues.java
trunk/ggc-core/src/ggc/core/data/DailyValuesRow.java
trunk/ggc-core/src/ggc/core/data/DayValuesData.java
trunk/ggc-core/src/ggc/core/data/GlucoValues.java
trunk/ggc-core/src/ggc/core/data/HbA1cValues.java
trunk/ggc-core/src/ggc/core/data/MonthlyValues.java
trunk/ggc-core/src/ggc/core/data/PlotData.java
trunk/ggc-core/src/ggc/core/data/RatioValues.java
trunk/ggc-core/src/ggc/core/data/ReadablePlotData.java
trunk/ggc-core/src/ggc/core/data/StatisticValues.java
trunk/ggc-core/src/ggc/core/data/WeeklyValues.java
trunk/ggc-core/src/ggc/core/data/cfg/
trunk/ggc-core/src/ggc/core/data/cfg/ConfigCellRenderer.java
trunk/ggc-core/src/ggc/core/data/cfg/ConfigurationManager.java
trunk/ggc-core/src/ggc/core/data/graph/
trunk/ggc-core/src/ggc/core/data/graph/DataPlotSelectorPanel.java
trunk/ggc-core/src/ggc/core/data/graph/GGCGraphUtil.java
trunk/ggc-core/src/ggc/core/data/graph/GGCGraphViewControler.java
trunk/ggc-core/src/ggc/core/data/graph/GraphViewCourse.java
trunk/ggc-core/src/ggc/core/data/graph/GraphViewDaily.java
trunk/ggc-core/src/ggc/core/data/graph/GraphViewFrequency.java
trunk/ggc-core/src/ggc/core/data/graph/GraphViewHbA1c.java
trunk/ggc-core/src/ggc/core/data/graph/GraphViewSpread.java
trunk/ggc-core/src/ggc/core/data/graph/PlotSelectorData.java
trunk/ggc-core/src/ggc/core/data/graph/PlotSelectorPanel.java
trunk/ggc-core/src/ggc/core/db/
trunk/ggc-core/src/ggc/core/db/GGCDb.java
trunk/ggc-core/src/ggc/core/db/GGCDbCache.java
trunk/ggc-core/src/ggc/core/db/GGCDbConfig.java
trunk/ggc-core/src/ggc/core/db/GGCDbLoader.java
trunk/ggc-core/src/ggc/core/db/datalayer/
trunk/ggc-core/src/ggc/core/db/datalayer/DailyFoodEntries.java
trunk/ggc-core/src/ggc/core/db/datalayer/DailyFoodEntry.java
trunk/ggc-core/src/ggc/core/db/datalayer/DailyValue.java
trunk/ggc-core/src/ggc/core/db/datalayer/FoodDescription.java
trunk/ggc-core/src/ggc/core/db/datalayer/FoodGroup.java
trunk/ggc-core/src/ggc/core/db/datalayer/GlycemicNutrients.java
trunk/ggc-core/src/ggc/core/db/datalayer/HomeWeightSpecial.java
trunk/ggc-core/src/ggc/core/db/datalayer/Meal.java
trunk/ggc-core/src/ggc/core/db/datalayer/MealGroup.java
trunk/ggc-core/src/ggc/core/db/datalayer/MealNutrition.java
trunk/ggc-core/src/ggc/core/db/datalayer/MealPart.java
trunk/ggc-core/src/ggc/core/db/datalayer/MealParts.java
trunk/ggc-core/src/ggc/core/db/datalayer/NutritionDefinition.java
trunk/ggc-core/src/ggc/core/db/datalayer/NutritionHomeWeightType.java
trunk/ggc-core/src/ggc/core/db/datalayer/PumpData.java
trunk/ggc-core/src/ggc/core/db/datalayer/PumpDataExtended.java
trunk/ggc-core/src/ggc/core/db/datalayer/PumpProfile.java
trunk/ggc-core/src/ggc/core/db/datalayer/Settings.java
trunk/ggc-core/src/ggc/core/db/datalayer/SettingsColorScheme.java
trunk/ggc-core/src/ggc/core/db/hibernate/
trunk/ggc-core/src/ggc/core/db/hibernate/AppointmentH.java
trunk/ggc-core/src/ggc/core/db/hibernate/ColorSchemeH.java
trunk/ggc-core/src/ggc/core/db/hibernate/DayValueH.java
trunk/ggc-core/src/ggc/core/db/hibernate/DbInfoH.java
trunk/ggc-core/src/ggc/core/db/hibernate/DoctorH.java
trunk/ggc-core/src/ggc/core/db/hibernate/DoctorTypeH.java
trunk/ggc-core/src/ggc/core/db/hibernate/FoodDescriptionH.java
trunk/ggc-core/src/ggc/core/db/hibernate/FoodGroupH.java
trunk/ggc-core/src/ggc/core/db/hibernate/FoodUserDescriptionH.java
trunk/ggc-core/src/ggc/core/db/hibernate/FoodUserGroupH.java
trunk/ggc-core/src/ggc/core/db/hibernate/GGCHibernateObject.java
trunk/ggc-core/src/ggc/core/db/hibernate/InetGroupH.java
trunk/ggc-core/src/ggc/core/db/hibernate/InetLinkGroupH.java
trunk/ggc-core/src/ggc/core/db/hibernate/InetLinkH.java
trunk/ggc-core/src/ggc/core/db/hibernate/InetTypeH.java
trunk/ggc-core/src/ggc/core/db/hibernate/MealGroupH.java
trunk/ggc-core/src/ggc/core/db/hibernate/MealH.java
trunk/ggc-core/src/ggc/core/db/hibernate/NutritionDefinitionH.java
trunk/ggc-core/src/ggc/core/db/hibernate/NutritionHomeWeightTypeH.java
trunk/ggc-core/src/ggc/core/db/hibernate/SettingsH.java
trunk/ggc-core/src/ggc/core/db/hibernate/StockSubTypeH.java
trunk/ggc-core/src/ggc/core/db/hibernate/StockTypeH.java
trunk/ggc-core/src/ggc/core/db/hibernate/StocksH.java
trunk/ggc-core/src/ggc/core/db/hibernate/cgm/
trunk/ggc-core/src/ggc/core/db/hibernate/cgm/CGMDataExtendedH.java
trunk/ggc-core/src/ggc/core/db/hibernate/cgm/CGMDataH.java
trunk/ggc-core/src/ggc/core/db/hibernate/pump/
trunk/ggc-core/src/ggc/core/db/hibernate/pump/PumpDataExtendedH.java
trunk/ggc-core/src/ggc/core/db/hibernate/pump/PumpDataH.java
trunk/ggc-core/src/ggc/core/db/hibernate/pump/PumpProfileH.java
trunk/ggc-core/src/ggc/core/db/tool/
trunk/ggc-core/src/ggc/core/db/tool/DbToolApplicationGGC.java
trunk/ggc-core/src/ggc/core/db/tool/DbToolGGC.java
trunk/ggc-core/src/ggc/core/db/tool/InitDb.java
trunk/ggc-core/src/ggc/core/db/tool/transfer/
trunk/ggc-core/src/ggc/core/db/tool/transfer/BackupDialog.java
trunk/ggc-core/src/ggc/core/db/tool/transfer/ExportDailyValues.java
trunk/ggc-core/src/ggc/core/db/tool/transfer/ExportNutritionDb.java
trunk/ggc-core/src/ggc/core/db/tool/transfer/ExportSettings.java
trunk/ggc-core/src/ggc/core/db/tool/transfer/GGCBackupRestoreRunner.java
trunk/ggc-core/src/ggc/core/db/tool/transfer/GGCExporter.java
trunk/ggc-core/src/ggc/core/db/tool/transfer/GGCImporter.java
trunk/ggc-core/src/ggc/core/db/tool/transfer/ImportDailyValues.java
trunk/ggc-core/src/ggc/core/db/tool/transfer/ImportNutrition.java
trunk/ggc-core/src/ggc/core/db/tool/transfer/ImportSettings.java
trunk/ggc-core/src/ggc/core/db/tool/transfer/RestoreGGCDialog.java
trunk/ggc-core/src/ggc/core/db/tool/transfer/RestoreGGCSelectorDialog.java
trunk/ggc-core/src/ggc/core/nutrition/
trunk/ggc-core/src/ggc/core/nutrition/GGCTreeRoot.java
trunk/ggc-core/src/ggc/core/nutrition/GGCTreeRootDyn.java
trunk/ggc-core/src/ggc/core/nutrition/GGCTreeRootStatic.java
trunk/ggc-core/src/ggc/core/nutrition/NutritionTreeDialog.java
trunk/ggc-core/src/ggc/core/nutrition/NutritionTreeModel.java
trunk/ggc-core/src/ggc/core/nutrition/TestNutritionData.java
trunk/ggc-core/src/ggc/core/nutrition/data/
trunk/ggc-core/src/ggc/core/nutrition/data/HomeWeightComparator.java
trunk/ggc-core/src/ggc/core/nutrition/data/MealNutritionsComparator.java
trunk/ggc-core/src/ggc/core/nutrition/data/MealPartsComparator.java
trunk/ggc-core/src/ggc/core/nutrition/data/NutritionGroupModel.java
trunk/ggc-core/src/ggc/core/nutrition/data/NutritionsComparator.java
trunk/ggc-core/src/ggc/core/nutrition/dialogs/
trunk/ggc-core/src/ggc/core/nutrition/dialogs/DailyValuesMealSelectorDialog.java
trunk/ggc-core/src/ggc/core/nutrition/dialogs/FoodPartMainSelectorDialog.java
trunk/ggc-core/src/ggc/core/nutrition/dialogs/FoodPartSelectorDialog.java
trunk/ggc-core/src/ggc/core/nutrition/dialogs/HWSelectorDialog.java
trunk/ggc-core/src/ggc/core/nutrition/dialogs/MealSelectorDialog.java
trunk/ggc-core/src/ggc/core/nutrition/dialogs/MealSpecialSelectorDialog.java
trunk/ggc-core/src/ggc/core/nutrition/dialogs/NutritionGroupDialog.java
trunk/ggc-core/src/ggc/core/nutrition/display/
trunk/ggc-core/src/ggc/core/nutrition/display/DailyFoodEntryDisplay.java
trunk/ggc-core/src/ggc/core/nutrition/display/HomeWeightDataDisplay.java
trunk/ggc-core/src/ggc/core/nutrition/display/MealFoodDisplay.java
trunk/ggc-core/src/ggc/core/nutrition/display/MealNutritionsDisplay.java
trunk/ggc-core/src/ggc/core/nutrition/display/MealPartsDisplay.java
trunk/ggc-core/src/ggc/core/nutrition/display/NutritionDataDisplay.java
trunk/ggc-core/src/ggc/core/nutrition/panels/
trunk/ggc-core/src/ggc/core/nutrition/panels/GGCTreePanel.java
trunk/ggc-core/src/ggc/core/nutrition/panels/PanelMealSelector.java
trunk/ggc-core/src/ggc/core/nutrition/panels/PanelNutritionFood.java
trunk/ggc-core/src/ggc/core/nutrition/panels/PanelNutritionFoodEdit.java
trunk/ggc-core/src/ggc/core/nutrition/panels/PanelNutritionFoodGroup.java
trunk/ggc-core/src/ggc/core/nutrition/panels/PanelNutritionFoodGroupEdit.java
trunk/ggc-core/src/ggc/core/nutrition/panels/PanelNutritionMain.java
trunk/ggc-core/src/ggc/core/nutrition/panels/PanelNutritionMeal.java
trunk/ggc-core/src/ggc/core/nutrition/panels/PanelNutritionMealEdit.java
trunk/ggc-core/src/ggc/core/plugins/
trunk/ggc-core/src/ggc/core/plugins/CGMSPlugIn.java
trunk/ggc-core/src/ggc/core/plugins/GGCDataReader.java
trunk/ggc-core/src/ggc/core/plugins/GGCDataWriter.java
trunk/ggc-core/src/ggc/core/plugins/MetersPlugIn.java
trunk/ggc-core/src/ggc/core/plugins/PumpsPlugIn.java
trunk/ggc-core/src/ggc/core/print/
trunk/ggc-core/src/ggc/core/print/PrintAbstract.java
trunk/ggc-core/src/ggc/core/print/PrintExtendedMonthlyReport.java
trunk/ggc-core/src/ggc/core/print/PrintFoodMenuAbstract.java
trunk/ggc-core/src/ggc/core/print/PrintFoodMenuBase.java
trunk/ggc-core/src/ggc/core/print/PrintFoodMenuExt1.java
trunk/ggc-core/src/ggc/core/print/PrintFoodMenuExt2.java
trunk/ggc-core/src/ggc/core/print/PrintFoodMenuExt3.java
trunk/ggc-core/src/ggc/core/print/PrintSimpleMonthlyReport.java
trunk/ggc-core/src/ggc/core/sync/
trunk/ggc-core/src/ggc/core/sync/sidiary/
trunk/ggc-core/src/ggc/core/sync/sidiary/ParseDataFile.java
trunk/ggc-core/src/ggc/core/sync/sidiary/data/
trunk/ggc-core/src/ggc/core/sync/sidiary/data/DailyData.java
trunk/ggc-core/src/ggc/core/sync/sidiary/data/MonthlyData.java
trunk/ggc-core/src/ggc/core/test/
trunk/ggc-core/src/ggc/core/test/ImportDacioDb.java
trunk/ggc-core/src/ggc/core/util/
trunk/ggc-core/src/ggc/core/util/DataAccess.java
trunk/ggc-core/src/ggc/core/util/GGCLanguageInfo.java
trunk/ggc-core/src/ggc/core/util/GGCProperties.java
trunk/ggc-core/src/ggc/core/util/I18nControl.java
trunk/ggc-core/src/ggc/core/util/MathUtils.java
trunk/ggc-core/src/ggc/core/util/NutriI18nControl.java
trunk/ggc-core/src/ggc/core/util/RefreshInfo.java
trunk/ggc-core/src/ggc/core/util/UIUtilities.java
trunk/ggc-core/src/ggc/core/web/
trunk/ggc-core/src/ggc/core/web/GGCNetworkSend.java
trunk/ggc-core/src/ggc/header_template.txt
trunk/ggc-core/src/ggc/shared/
trunk/ggc-core/src/ggc/shared/ratio/
trunk/ggc-core/src/ggc/shared/ratio/RatioBaseDialog.java
trunk/ggc-core/src/ggc/shared/ratio/RatioCalculatorDialog.java
trunk/ggc-core/src/ggc/shared/ratio/RatioExtendedDialog.java
trunk/ggc-core/src/ggc_help-0.1.jar
trunk/ggc-core/src/log4j.properties
Added: trunk/ggc-core/.amateras
===================================================================
--- trunk/ggc-core/.amateras (rev 0)
+++ trunk/ggc-core/.amateras 2009-03-19 18:32:06 UTC (rev 685)
@@ -0,0 +1,12 @@
+#EclipseHTMLEditor configuration file
+#Wed Dec 03 16:47:43 CET 2008
+validateDTD=false
+javaScriptCompleters=
+useDTD=false
+validateJSP=false
+validateXML=false
+validateJS=false
+removeMarkers=false
+root=/
+validateHTML=false
+javaScripts=
Added: trunk/ggc-core/.classpath
===================================================================
--- trunk/ggc-core/.classpath (rev 0)
+++ trunk/ggc-core/.classpath 2009-03-19 18:32:06 UTC (rev 685)
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry combineaccessrules="false" exported="true" kind="src" path="/Atech-Tools"/>
+ <classpathentry excluding="**/.svn/**" kind="src" path="src"/>
+ <classpathentry combineaccessrules="false" exported="true" kind="src" path="/GGC Meter Tool">
+ <accessrules>
+ <accessrule kind="accessible" pattern="**/icons/**"/>
+ </accessrules>
+ </classpathentry>
+ <classpathentry combineaccessrules="false" exported="true" kind="src" path="/GGC Pump Tool"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/iText-2.0.7"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/SkinLF-6.7"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/PostgreSQL-JDBC-8.2"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/JavaHelp-2.0.5"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/commons-logging-1.0.4"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/commons-collections-2.1.1"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/Hibernate-3.1"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/H2-1.0.69"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/pygmy-0.2"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/PostgreSQL-8.2"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/ggc-web"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/commons-lang-2.4"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/jfreechart-1.0.10"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="output" path="bin"/>
+</classpath>
Added: trunk/ggc-core/.project
===================================================================
--- trunk/ggc-core/.project (rev 0)
+++ trunk/ggc-core/.project 2009-03-19 18:32:06 UTC (rev 685)
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>GGC Core</name>
+ <comment></comment>
+ <projects>
+ <project>Atech-Tools</project>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.eclipse.jem.beaninfo.BeanInfoNature</nature>
+ </natures>
+</projectDescription>
Added: trunk/ggc-core/src/GGC_CGM.hbm.xml
===================================================================
--- trunk/ggc-core/src/GGC_CGM.hbm.xml (rev 0)
+++ trunk/ggc-core/src/GGC_CGM.hbm.xml 2009-03-19 18:32:06 UTC (rev 685)
@@ -0,0 +1,39 @@
+<?xml version="1.0"?>
+<!DOCTYPE hibernate-mapping SYSTEM "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd" >
+<hibernate-mapping>
+
+ <!-- ***************** ggc::CGM SCHEMA ******************* -->
+
+
+ <!-- CGM Data -->
+ <class name="ggc.core.db.hibernate.cgm.CGMDataH" table="cgm_data" >
+ <id name="id" type="long" unsaved-value="0">
+ <generator class="org.hibernate.id.AssignedIncrementGenerator"/>
+ </id>
+ <property name="dt_info" type="long" not-null="true"/>
+ <property name="base_type" type="int" />
+ <property name="sub_type" type="int" />
+ <property name="value" type="string" length="2000" />
+ <property name="extended" type="text" />
+ <property name="person_id" type="int" not-null="true" />
+ <property name="comment" type="string" length="2000" />
+ <property name="changed" type="long" not-null="false" />
+ </class>
+
+
+ <!-- Pump Data Additional Info-->
+ <class name="ggc.core.db.hibernate.cgm.CGMDataExtendedH" table="cgm_data_ext" >
+ <id name="id" type="long" unsaved-value="0">
+ <generator class="org.hibernate.id.AssignedIncrementGenerator"/>
+ </id>
+ <property name="dt_info" type="long" not-null="true"/>
+ <property name="type" type="int" />
+ <property name="value" type="string" length="2000" />
+ <property name="extended" type="text" />
+ <property name="person_id" type="int" not-null="true" />
+ <property name="comment" type="string" length="2000" />
+ <property name="changed" type="long" not-null="false" />
+ </class>
+
+
+</hibernate-mapping>
Added: trunk/ggc-core/src/GGC_Main.hbm.xml
===================================================================
--- trunk/ggc-core/src/GGC_Main.hbm.xml (rev 0)
+++ trunk/ggc-core/src/GGC_Main.hbm.xml 2009-03-19 18:32:06 UTC (rev 685)
@@ -0,0 +1,167 @@
+<?xml version="1.0"?>
+<!DOCTYPE hibernate-mapping SYSTEM "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd" >
+<hibernate-mapping>
+
+ <!-- ***************** ggc::Main SCHEMA ******************* -->
+
+
+ <!-- ****************************************** -->
+ <!-- *** Patient Data **** -->
+ <!-- ****************************************** -->
+
+ <!-- Day values -->
+ <class name="ggc.core.db.hibernate.DayValueH" table="data_dayvalues" >
+ <id name="id" type="long" unsaved-value="0">
+ <generator class="org.hibernate.id.AssignedIncrementGenerator"/>
+ </id>
+ <property name="dt_info" type="long" not-null="true"/>
+ <property name="bg" type="int" />
+ <property name="ins1" type="int" />
+ <property name="ins2" type="int" />
+ <property name="ch" type="float" />
+ <property name="meals_ids" type="text" />
+ <property name="extended" type="text" />
+ <property name="person_id" type="int" not-null="true" />
+ <property name="comment" type="string" length="2000" />
+ <property name="changed" type="long" not-null="false" />
+ </class>
+
+
+ <!-- ****************************************** -->
+ <!-- *** Doctors **** -->
+ <!-- ****************************************** -->
+
+
+ <!-- Doctor types -->
+ <class name="ggc.core.db.hibernate.DoctorTypeH" table="doc_types">
+ <id name="id" type="long" unsaved-value="0">
+ <generator class="org.hibernate.id.AssignedIncrementGenerator"/>
+ </id>
+ <property name="name" type="string" length="1000" />
+ <property name="predefined" type="int" />
+ </class>
+
+ <!-- Doctor -->
+ <class name="ggc.core.db.hibernate.DoctorH" table="doc_doctors">
+ <id name="id" type="long" unsaved-value="0">
+ <generator class="org.hibernate.id.AssignedIncrementGenerator"/>
+ </id>
+ <many-to-one name="doctor_type" class="ggc.core.db.hibernate.DoctorTypeH" lazy="false" />
+ <property name="name" type="string" length="100" />
+ <property name="address" type="string" length="2000" />
+ <property name="phone_gsm" type="string" length="500" />
+ <property name="phone" type="string" length="500" />
+ <property name="working_time" type="text" />
+ <property name="extended" type="text" />
+ <property name="visible" type="int" />
+ <property name="person_id" type="int" not-null="true" />
+ <property name="comment" type="string" length="4000" />
+ </class>
+
+ <!-- Appointment -->
+ <class name="ggc.core.db.hibernate.AppointmentH" table="doc_appointment">
+ <id name="id" type="long" unsaved-value="0">
+ <generator class="org.hibernate.id.AssignedIncrementGenerator"/>
+ </id>
+ <many-to-one name="doctor" class="ggc.core.db.hibernate.DoctorH" lazy="false" />
+ <property name="dt_apoint" type="long" not-null="true" />
+ <property name="apoint_text" type="string" length="1000" />
+ <property name="extended" type="text" />
+ <property name="person_id" type="int" not-null="true" />
+ <property name="comment" type="string" length="4000" />
+ </class>
+
+
+ <!-- ****************************************** -->
+ <!-- *** Stocks **** -->
+ <!-- ****************************************** -->
+
+ <!-- Stock types -->
+ <class name="ggc.core.db.hibernate.StockTypeH" table="stock_types">
+ <id name="id" type="long" unsaved-value="0">
+ <generator class="org.hibernate.id.AssignedIncrementGenerator"/>
+ </id>
+ <property name="name" type="string" length="1000" />
+ <property name="name_i18n" type="string" length="1000" />
+ </class>
+
+
+ <class name="ggc.core.db.hibernate.StockSubTypeH" table="stock_subtypes">
+ <id name="id" type="long" unsaved-value="0">
+ <generator class="org.hibernate.id.AssignedIncrementGenerator"/>
+ </id>
+ <property name="stock_type_id" type="long" />
+ <property name="name" type="string" length="1000" />
+ <property name="description" type="text" />
+ <property name="content" type="float" />
+ <property name="comment" type="string" length="2000" />
+ </class>
+
+
+
+ <class name="ggc.core.db.hibernate.StocksH" table="stock_stocks">
+ <id name="id" type="long" unsaved-value="0">
+ <generator class="org.hibernate.id.AssignedIncrementGenerator"/>
+ </id>
+ <property name="stock_subtype_id" type="long" />
+ <property name="dt_stock" type="long" />
+ <property name="amount" type="float" />
+ <property name="description" type="string" length="255" />
+ <property name="usage_per_day_min" type="float" />
+ <property name="usage_per_day_max" type="float" />
+ <property name="extended" type="text" />
+ <property name="person_id" type="int" not-null="true" />
+ <property name="comment" type="string" length="4000" />
+ </class>
+
+
+
+ <!-- ****************************************** -->
+ <!-- *** Configuration **** -->
+ <!-- ****************************************** -->
+
+
+ <class name="ggc.core.db.hibernate.SettingsH" table="cfg_settings">
+ <id name="id" type="long" unsaved-value="0">
+ <generator class="org.hibernate.id.AssignedIncrementGenerator"/>
+ </id>
+ <property name="key" column="el_key" type="string" length="44" not-null="true" />
+ <property name="value" column="el_value" type="string" length="255"/>
+ <property name="type" type="int" /> <!-- 1-string, 2-int, 3=float -->
+ <property name="description" type="string" length="255" />
+ <property name="person_id" type="int" not-null="true" />
+ </class>
+
+
+
+ <class name="ggc.core.db.hibernate.ColorSchemeH" table="cfg_colorscheme">
+ <id name="id" type="long" unsaved-value="0">
+ <generator class="org.hibernate.id.AssignedIncrementGenerator"/>
+ </id>
+ <property name="name" type="string" length="50"/>
+ <property name="custom_type" type="int" />
+ <property name="color_bg" type="int" />
+ <property name="color_bg_avg" type="int" />
+ <property name="color_bg_low" type="int" />
+ <property name="color_bg_high" type="int" />
+ <property name="color_bg_target" type="int" />
+ <property name="color_ins" type="int" />
+ <property name="color_ins1" type="int" />
+ <property name="color_ins2" type="int" />
+ <property name="color_ins_perbu" type="int" />
+ <property name="color_ch" type="int" />
+ </class>
+
+ <class name="ggc.core.db.hibernate.DbInfoH" table="db_info">
+ <id name="id" type="long" unsaved-value="0">
+ <generator class="org.hibernate.id.AssignedIncrementGenerator"/>
+ </id>
+ <property name="key" column="el_key" type="string" length="44" not-null="true" />
+ <property name="value" column="el_value" type="string" length="255"/>
+ <property name="type" type="int" /> <!-- 1-string, 2-int, 3=float -->
+ <property name="description" type="string" length="255" />
+ </class>
+
+
+
+</hibernate-mapping>
Added: trunk/ggc-core/src/GGC_Nutrition.hbm.xml
===================================================================
--- trunk/ggc-core/src/GGC_Nutrition.hbm.xml (rev 0)
+++ trunk/ggc-core/src/GGC_Nutrition.hbm.xml 2009-03-19 18:32:06 UTC (rev 685)
@@ -0,0 +1,117 @@
+<?xml version="1.0"?>
+<!DOCTYPE hibernate-mapping SYSTEM "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd" >
+<hibernate-mapping>
+
+ <!-- ***************** GGC::Nutrition SCHEMA ******************* -->
+
+
+ <!-- Nutrition Definition - Global -->
+ <class name="ggc.core.db.hibernate.NutritionDefinitionH" table="nutrition_definition">
+ <id name="id" type="long" unsaved-value="0">
+ <generator class="org.hibernate.id.AssignedIncrementGenerator"/>
+ </id>
+ <property name="weight_unit" type="string" length="50" />
+ <property name="tag" type="string" length="50" />
+ <property name="name" type="string" length="100" />
+ <property name="decimal_places" type="text" length="10" />
+ <property name="static_entry" type="int" />
+ </class>
+
+ <!-- Nutrition Home Weight Type - Global -->
+ <class name="ggc.core.db.hibernate.NutritionHomeWeightTypeH" table="nutrition_home_weight_type">
+ <id name="id" type="long" unsaved-value="0">
+ <generator class="org.hibernate.id.AssignedIncrementGenerator"/>
+ </id>
+ <property name="name" type="string" length="255" />
+ <property name="static_entry" type="int" />
+ </class>
+
+
+
+ <!-- Food Group - Nutrition 1 -->
+ <class name="ggc.core.db.hibernate.FoodGroupH" table="nutrition_usda_food_group">
+ <id name="id" type="long" unsaved-value="0">
+ <generator class="org.hibernate.id.AssignedIncrementGenerator"/>
+ </id>
+ <property name="name" type="string" length="255" />
+ <property name="name_i18n" type="string" length="255" />
+ <property name="description" type="string" length="1000" />
+ </class>
+
+
+ <!-- Food Description - - Nutrition 1-->
+ <class name="ggc.core.db.hibernate.FoodDescriptionH" table="nutrition_usda_food_description">
+ <id name="id" type="long" unsaved-value="0">
+ <generator class="org.hibernate.id.AssignedIncrementGenerator"/>
+ </id>
+ <property name="group_id" type="long" />
+ <property name="name" type="string" length="255" />
+ <property name="name_i18n" type="string" length="255" />
+ <property name="refuse" type="float" />
+ <property name="nutritions" type="text" />
+ <property name="home_weights" type="text" />
+ </class>
+
+
+ <!-- Food Group - Nutrition 2 -->
+ <class name="ggc.core.db.hibernate.FoodUserGroupH" table="nutrition_user_food_group">
+ <id name="id" type="long" unsaved-value="0">
+ <generator class="org.hibernate.id.AssignedIncrementGenerator"/>
+ </id>
+ <property name="name" type="string" length="255" />
+ <property name="name_i18n" type="string" length="255" />
+ <property name="description" type="string" length="1000" />
+ <property name="parent_id" type="long" />
+ <property name="changed" type="long" not-null="false" />
+ </class>
+
+
+ <!-- Food Description - - Nutrition 2-->
+ <class name="ggc.core.db.hibernate.FoodUserDescriptionH" table="nutrition_user_food_description">
+ <id name="id" type="long" unsaved-value="0">
+ <generator class="org.hibernate.id.AssignedIncrementGenerator"/>
+ </id>
+ <property name="group_id" type="long" />
+ <property name="name" type="string" length="255" />
+ <property name="name_i18n" type="string" length="255" />
+ <property name="description" type="string" length="1000" />
+ <property name="refuse" type="float" />
+ <property name="nutritions" type="text" />
+ <property name="home_weights" type="text" />
+ <property name="changed" type="long" not-null="false" />
+ </class>
+
+
+
+
+
+
+
+ <class name="ggc.core.db.hibernate.MealGroupH" table="meal_group">
+ <id name="id" type="long" unsaved-value="0">
+ <generator class="org.hibernate.id.AssignedIncrementGenerator"/>
+ </id>
+ <property name="name" type="string" length="255" />
+ <property name="name_i18n" type="string" length="255" />
+ <property name="description" type="string" length="2000" />
+ <property name="parent_id" type="long" />
+ <property name="changed" type="long" not-null="false" />
+ </class>
+
+ <class name="ggc.core.db.hibernate.MealH" table="meal_meal">
+ <id name="id" type="long" unsaved-value="0">
+ <generator class="org.hibernate.id.AssignedIncrementGenerator"/>
+ </id>
+ <property name="group_id" type="long" />
+ <property name="name" type="string" length="255" />
+ <property name="name_i18n" type="string" length="255" />
+ <property name="description" type="string" length="2000" />
+ <property name="parts" type="text" /> <!-- 1:x=1.0;2:y;1:z -->
+ <!-- type:id type=[1=Nutrition USDBA, 2=Nutrition User ]; id = id in db -->
+ <property name="nutritions" type="text" />
+ <property name="extended" type="text" />
+ <property name="comment" type="string" length="2000" />
+ <property name="changed" type="long" not-null="false" />
+ </class>
+
+</hibernate-mapping>
Added: trunk/ggc-core/src/GGC_Nutrition_de.native.properties
===================================================================
--- trunk/ggc-core/src/GGC_Nutrition_de.native.properties (rev 0)
+++ trunk/ggc-core/src/GGC_Nutrition_de.native.properties 2009-03-19 18:32:06 UTC (rev 685)
@@ -0,0 +1,705 @@
+#
+# ######################################################################
+# ### GNU Gluco Control - Nutrition File ###
+# ######################################################################
+# ### Language: German ###
+# ### Created by: Reinhold Rumberger (ru...@us...) ###
+# ### Last change: 2008-10-15 Version: 0.9 ###
+# ### Application Version: 0.3.3 ###
+# ######################################################################
+#
+# NOT FINISHED!!!
+# Very little testing!!
+# 199 keys not translated as of version 0.8
+
+#####################################################################
+## WARNUNG: Diese Datei ist noch nicht komplett übersetzt! ##
+#####################################################################
+
+# This part is intended for nutrition only, everything that is done
+# by nutrition is here.
+#
+
+# In brackets there are now tags which define urgency of some text beeing translated
+# 1 - Needed, urgent (dialogs)
+# 2 - Needed (this are mostly nutrients, home weight, which is probably nice to have translated)
+# 3 - Not so important, but nice to have
+#
+
+#
+# Collation Rules - In unicode we can create special rules for sorting where we specify
+# sorting order of special characters. This will be used by tree's and special tables.
+# For english this is left empty. For all other (that have non-standarn, non-english
+# charcters) we need to set this if we want sorting to be done correctly.
+#
+COLLATION_RULES=< 0 < 1 < 2 < 3 < 4 < 5 < 6 < 7 < 8 < 9 < a,A,ä,Ä,á,à,Á,À,â, < b,B < c,C < d,D < e,E,é,è,ê,É,È,Ê < f,F < g,G < h,H < i,I < j,J < k,K < l,L < m,M < n,N < o,O,ö,Ö < p,P < q,Q < r,R < s,S,ß < t,T < u,U,ü,Ü < v,V < w,W < x,X < y,Y < z,Z
+
+#
+# Global (1)
+#
+ADD=Hinzufügen
+APPLY=Anwenden
+CANCEL=Abbrechen
+DELETE=Löschen
+EDIT=Bearbeiten
+HELP=Hilfe
+INFORMATION=Information
+NEW=Neu
+NO=Nein
+OK=OK
+QUESTION=Frage
+ROOT=Wurzel
+SELECT=Wählen
+YES=Ja
+
+#
+# Global Dialogs (1)
+#
+#[TODO] translate
+AMOUNT=Amount
+AMOUNT_LBL=Menge
+ARE_YOU_SURE_DELETE=Wollen Sie dieses Element wirklich löschen?
+ID=ID
+MEALS_DB=Mahlzeiten-DB
+NONE=Nichts
+NUTRITION=Nährstoff
+REFUSE=Ungenießbarer Anteil
+SELECT_ITEM_FIRST=Wählen Sie bitte erst einen Eintrag und danach eine Aktion!
+TRANSLATED_NAME=Übersetzter Name (falls verfügbar)
+USER_NUTRITION_DATABASE=Nährstoff-Datenbank des Benutzers
+USER_NUTRITION_DATABASE_DESC=<html><body>Dies ist die Nährstoff-Datenbank, zu der der Benutzer selbst Einträge hinzufügen kann. In Zukunft wird der Import fremder Nährstoff-Datenbanken unterstützt werden (die dann editierbar sein werden), damit Sie die Vorteile der erweiterten Ordnerstruktur (Ordner können Unterordner enthalten) genießen können. Wenn Sie beispielsweise in Deutschland wohnen, könnten Sie einen Ordner namens "Deutsche Nahrung" anlegen, in den Sie dann unterschiedliche Gruppen (z.B. "Zubereitung: Mikrowelle"), Nahrungstypen, usw. eintragen könnten.</body></html>
+USER_NUTRITION_DB=Benutzer Nährstoff-DB
+USDA_NUTRITION_DATABASE=Nährstoff-Datenbank des USDA
+USDA_NUTRITION_DATABASE_DESC=<html><body>Die USDA-DB ist die United States Department of Agriculture Datenbank, die viele in den USA erhältiche Lebensmittel enthält. Da diese Datenbank in der ganzen Welt genutzt wird, haben wir uns entschieden sie zu integrieren. Die Version, die sich in der Datenbank befindet, hängt von den Dateien ab, die importiert wurden. Erlaubt sind Versionen 18 und höher (getestet wurde SR-18).<br>In diesem Modul werden alle Einträge der Datenbank angezeigt und wenn es von bestimmten anderen Modulen (wie z.B. dem Mahlzeiten-Modul) aus aufgerufen wurde, können Lebensmittel zum Importieren ausgewählt werden.</body></html>
+USDA_NUTRITION_DB=USDA Nährstoff-DB
+
+#
+# Popup Menu (1)
+#
+PM_NUT_ADD_FOOD_DESCRIPTION=Lebensmittelbeschreibung hinzufügen
+PM_NUT_ADD_GROUP=Gruppe hinzufügen
+PM_NUT_ADD_MEAL=Mahlzeit hinzufügen
+PM_NUT_CLOSE=Schließen
+PM_NUT_EDIT_FOOD_DESCRIPTION=Lebensmittelbeschreibung bearbeiten
+PM_NUT_EDIT_GROUP=Gruppe bearbeiten
+PM_NUT_EDIT_MEAL=Mahlzeit bearbeiten
+PM_NUT_VIEW=Anzeigen
+
+#
+# Food (1)
+#
+ADD_FOOD=Neues Lebensmittel hinzufügen
+ADD_FOOD_GROUP=Lebensmittelgruppe hinzufügen
+ADD_MEAL_GROUP=Neue Mahlzeitengruppe hinzufügen
+AMOUNT_WEIGHT=Menge & Gewicht
+EDIT_FOOD_GROUP=Lebensmittelgruppe bearbeiten
+EDIT_MEAL_GROUP=Mahlzeitengruppe bearbeiten
+FOOD_DESCRIPTION=Lebensmittel-Beschreibung
+FOOD_GROUP=Lebensmittelgruppe
+FOOD_GROUPS=Lebensmittelgruppen
+FOOD_NAME=Name des Lebensmittels
+GROUP_NAME=Gruppenname
+#[TODO] translate
+HOME_WEIGHTS=Home weights (if defined)
+MEAL_GROUP=Mahlzeitengruppe
+MEAL_GROUPS=Mahlzeitengruppen
+NEW_FOOD=Neues Lebensmittel
+NEW_GROUP=Neue Gruppe
+NUTRITIONS_FOOD=Nährstoffe
+PARENT_GROUP=Übergeordnete Gruppe
+REFUSE_LBL=Ungenießbarer Anteil
+SELECT_GROUP=Gruppe wählen
+SELECTED_GROUP=Gewählte Gruppe
+TRANSLATION_KEYWORD=Schlüsselwort für die Übersetzung
+UNITS=Einheiten
+WEIGHT=Gewicht (in g)
+WEIGHT_TYPE=Gewichtstyp
+WISH_TO_SAVE_EDITED_GROUP=Sie haben eine Gruppe geändert. Wollen Sie speichern?
+WISH_TO_SAVE_NEW_GROUP=Sie haben eine neue Gruppe erstellt. Wollen Sie speichern?
+
+
+#
+# Meal (1)
+#
+ADD_MEAL=Mahlzeit hinzufügen
+AVAILABLE_NUTRITIONS=Verfügbahre Nährstoffe
+CANT_SELECT_CHILD_OR_GROUP=Diese Gruppe oder ein Kindelement dieser Gruppe kann nicht als Elternelement dieser Gruppe gewählt werden!
+CANT_SELECT_CIRCULAR_MEAL=Die Mahlzeit, die bearbeitet wird, kann nicht hinzugefügt werden
+DESCRIPTION=Beschreibung
+FOODS_MEALS_NUTRITIONS=Lebensmittel, Mahlzeiten und/oder Nährstoffe
+GROUP=Gruppe
+MEAL=Mahlzeit
+MEAL_ADD=Mahlzeit hinzufügen
+MEAL_EDIT=Mahlzeit bearbeiten
+MEAL_FOOD_ADD_DESC=Lebensmittel, Mahlzeit oder Nährstoffe hinzufügen
+MEAL_FOOD_DELETE_DESC=Lebensmittel, Mahlzeit oder Nährstoffe löschen
+MEAL_FOOD_EDIT_DESC=Lebensmittel, Mahlzeit oder Nährstoffe bearbeiten
+MEAL_NAME=Mahlzeitname
+MEAL_TYPE=Typ
+#[TODO] translate
+MEAL_VIEW=Meal View
+MEALS_DATABASE=Mahlzeiten-Datenbank
+MEALS_DATABASE_DESC=<html><body>Die Mahlzeiten-Datenbank enthält komplette Gerichte, z.B. "McDonald's Big Mac Menü". Sie enthält einige Elemente der USDA-Datenbank, z.B. "Big Mac Hamburger" und "Coca-Cola".<br>Gerichte können Elemente aus allen Datenbanken enthalten.</body></html>
+MEALS_FOODS_SELECTOR=Mahlzeiten- und Lebensmittelwahl
+NEW_MEAL=Neue Mahlzeit
+NUTRITION_TYPE=Nährstofftyp
+#[TODO] translate
+NUTRITION_TYPE_FOR_SELECTOR=Nutrition type for selector
+SELECT_ITEM=Element wählen
+SELECTED_ITEM=gewähltes Element
+#[TODO] translate
+SELECTOR=Selector
+USDA_NUTRITION=USDA Nährstoff
+USER_NUTRITION=Benutzerdefinierte Nährstoff
+TRANSLATED_NAME_MEAL=Übersetzter Name
+TRANSLATION_KEYWORD_MEAL=Schlüsselwort für die Übersetzung
+WISH_TO_SAVE_EDITED_MEAL=Sie haben eine Mahlzeit geändert. Wollen Sie speichen?
+WISH_TO_SAVE_NEW_MEAL=Sie haben eine neue Mahlzeit erstellt. Wollen Sie speichern?
+
+#
+# Food (User) (1)
+#
+FOOD_EDIT=Lebensmittel bearbeiten
+#[TODO] translate
+HOME_WEIGHT_ADD_DESC=Add Home Weight
+#[TODO] translate
+HOME_WEIGHT_DELETE_DESC=Delete Home Weight
+#[TODO] translate
+HOME_WEIGHT_EDIT_DESC=Edit Home Weight
+#[TODO] translate
+HOME_WEIGHT_NAME=Home Weight Name
+#[TODO] translate
+HOME_WEIGHT_SELECTOR=Home Weight Selector
+NEW_HOME_WEIGHT=Neu
+NEW_NUTR_DEF=Neu
+NUTRITION_NAME=Nährstoffname
+#[TODO] translate
+NUTRITION_SELECTOR=Nutritions Selector
+NUTRITIONS=Nährstoffe
+#[TODO] translate
+SELECT_HOME_WEIGHT=Select Home Weight
+SELECT_NUTRITION=Nährstoff wählen
+SELECTED_NUTRITION=gewählter Nährstoff
+#[TODO] translate
+SELECTED_HOME_WEIGHT=Selected Home Weight
+#[TODO] translate
+SELECTOR_HOME_WEIGHT=Selector for Home Weights
+#[TODO] translate
+SELECTOR_NUTRITION_DEFINITION=Selector for Nutritions
+#[TODO] translate
+TAG=Tag
+USER_DEFINED=Benutzerdefiniert
+WEIGHT_UNIT=Gew. Einheit
+WISH_TO_SAVE_EDITED_FOOD=Sie haben die Lebensmitteldaten geändert. Wollen Sie speichern?
+WISH_TO_SAVE_NEW_FOOD=Sie haben ein neues Lebensmittel eingetragen. Wollen Sie speichern?
+
+#
+# Daily Values and Foods (1)
+#
+#[TODO] translate
+HOME_WEIGHTS_LBL=Home Weights
+WEIGHT_LBL2=Gewicht
+WEIGHT_SHORT=Gew.
+#[TODO] translate
+WEIGHT_TYPE=Weight Type
+WGHT_PER_AMOUNT=Gewicht/Menge
+
+#
+# Selector for Daily Value (1)
+#
+#[TODO] translate
+HOME_WEIGHT=Home Weight
+MEALS_FOODS_SELECTOR_DAILY=Mahlzeiten- und Lebensmittelwahl für den Eintrag
+NAME=Name
+NO_ITEM_SELECTED=Keine Auswahl.
+
+
+#
+# Printing Food menu (2)
+#
+#[TODO] translate
+AMOUNT_SHORT=Am.
+#[TODO] translate
+BG=BG
+#[TODO] translate
+CH=CH
+#[TODO] translate
+DATE=Date
+#[TODO] translate
+FOOD_MENU_BASE=Food Menu Base (CH only)
+#[TODO] translate
+INS=Ins
+#[TODO] translate
+PRINT_FOOD_DESC=Food Description
+#[TODO] translate
+REPORT_FOOTER=This report is from \"GGC - GNU Gluco Control\", freely available at http://ggc.sourceforge.net
+#[TODO] translate
+TIME=Time
+#[TODO] translate
+FOOD_MENU_EXT_I=Extended Food Menu I (CH,Ins)
+#[TODO] translate
+FOOD_MENU_EXT_II=Extended Food Menu II (CH,Ins,BG)
+#[TODO] translate
+FOOD_MENU_EXT_III=Extended Food Menu III (CH,Ins,BG,kJ)
+#[TODO] translate
+TOGETHER=Together
+
+
+#
+# Nutrients (2)
+#
+ALC=Alkohol, Äthyl
+ASH=Asche
+CA=Kalzium, Ca
+CAFFN=Koffein
+CARTA=Karotin, alpha
+CARTB=Karotin, beta
+#[TODO] translate
+CHOCDF=Carbohydrate, by difference
+CHOLE=Cholesterin
+CU=Kupfer, Cu
+ENERC_KCAL=Energie (kcal)
+ENERC_KJ=Energie
+FAMS=Fettsäuren, einfach gesättigt
+FAPU=Fettsäuren, mehrfach gesättigt
+FASAT=Fettsäuren, gesättigt
+FAT=Lipide Gesamt (Fett)
+#[TODO] translate
+FATRN=Fatty acids, total trans
+#[TODO] translate
+FATRNM=Fatty acids, total trans-monoenoic
+#[TODO] translate
+FATRNP=Fatty acids, total trans-polyenoic
+FE=Eisen, Fe
+#[TODO] translate
+FIBTG=Fiber, total dietary
+FLD=Fluorid, F
+FRUS=Fruchtzucker
+#[TODO] translate
+GALS=Galactose
+GI_MAX=Glykämischer Index (Max)
+GI_MIN=Glykämischer Index (Min)
+GI=Glykämischer Index
+#[TODO] translate
+GL_MAX=Glycemic Load (Max)
+#[TODO] translate
+GL_MIN=Glycemic Load (Min)
+#[TODO] translate
+GL=Glycemic Load
+GLUS=Glukose (Dextrose)
+K=Kalium, K
+LACS=Laktose
+MALS=Maltose
+MG=Magnesium, Mg
+MN=Mangan, Mn
+NA=Natrium, Na
+P=Phosphor, P
+PROCNT=Eiweiß
+SE=Selen, Se
+STARCH=Stärke
+SUCS=Rübenzucker
+#[TODO] translate
+SUGAR=Sugars, total
+#[TODO] translate
+TOCPHA=Vitamin E (alpha-tocopherol)
+#[TODO] translate
+VITA_IU=Vitamin A, IU
+#[TODO] translate
+VITA_RAE=Vitamin A, RAE
+VITB12=Vitamin B12
+VITB6A=Vitamin B6
+VITD-=Vitamin D
+#[TODO] translate
+VITK=Vitamin K (phylloquinone)
+WATER=Wasser
+ZN=Zink, Zn
+
+
+#
+# Nutrients (3)
+#
+ALA_G=Alanin
+ARG_G=Arginin
+ASP_G=Asparaginsäure
+#[TODO] translate
+BETN=Betaine
+#[TODO] translate
+CAMD5=Campesterol
+#[TODO] translate
+CHOLN=Choline, total
+#[TODO] translate
+CRYPX=Cryptoxanthin, beta
+#[TODO] translate
+CYS_G=Cystine
+#[TODO] translate
+FOL=Folate, total
+FOLAC=Folsäure
+#[TODO] translate
+FOLDFE=Folate, DFE
+#[TODO] translate
+FOLFD=Folate, food
+#[TODO] translate
+GLU_G=Glutamic acid
+#[TODO] translate
+GLY_G=Glycine
+#[TODO] translate
+HISTN_G=Histidine
+#[TODO] translate
+HYP=Hydroxyproline
+#[TODO] translate
+ILE_G=Isoleucine
+LEU_G=Leucin
+#[TODO] translate
+LUT+ZEA=Lutein + zeaxanthin
+#[TODO] translate
+LYCPN=Lycopene
+#[TODO] translate
+LYS_G=Lysine
+MET_G=Methionin
+#[TODO] translate
+NIA=Niacin
+#[TODO] translate
+PANTAC=Pantothenic acid
+PHE_G=Phenylalanin
+#[TODO] translate
+PHYSTR=Phytosterols
+PRO_G=Prolin
+#[TODO] translate
+RETOL=Retinol
+RIBF=Vitamin B2, Riboflavin
+SER_G=Serin
+#[TODO] translate
+SITSTR=Beta-sitosterol
+#[TODO] translate
+STID7=Stigmasterol
+#[TODO] translate
+THEBRN=Theobromine
+THIA=Vitamin B1, Thiamin
+THR_G=Threonin
+#[TODO] translate
+TOCPHB=Tocopherol, beta
+#[TODO] translate
+TOCPHD=Tocopherol, delta
+#[TODO] translate
+TOCPHG=Tocopherol, gamma
+#[TODO] translate
+TRP_G=Tryptophan
+TYR_G=Tyrosin
+VAL_G=Valin
+#[TODO] translate
+VITC=Vitamin C, total ascorbic acid
+
+
+#
+# Home Weights - Translation (2,3)
+#
+#[TODO] translate
+-TO-SERVE=to serve
+#[TODO] translate
+AFTER=after
+#[TODO] translate
+AMOUNT=amount
+#[TODO] translate
+APPROX=approx
+#[TODO] translate
+AVG.=avg.
+#[TODO] translate
+BAG=bag
+#[TODO] translate
+BAR=bar
+#[TODO] translate
+BIG=big
+#[TODO] translate
+BLOCK=block
+#[TODO] translate
+BLOCKS=blocks
+BONE=Knochen
+#[TODO] translate
+BONELESS=boneless
+BOTTLE=Flasche
+#[TODO] translate
+BOX=box
+CAN=Dose
+#[TODO] translate
+CHOPPED=chopped
+#[TODO] translate
+CHUNK=chunk
+#[TODO] translate
+CHUNKS=chunks
+#[TODO] translate
+CONTAINER=container
+#[TODO] translate
+CONTENTS=contents
+#[TODO] translate
+COOK=cook
+COOKED=gekocht
+#[TODO] translate
+COOKIE=cookie
+#[TODO] translate
+COOKING=cooking
+#[TODO] translate
+CRUMBLED=crumbled
+#[TODO] translate
+CRUSHED=crushed
+CUBE=Würfel
+CUBED=gewürfelt
+CUBES=Würfel
+CUBIC=kubisch
+CUP=Tasse
+#[TODO] translate
+CUPCAKE=cupcake
+#[TODO] translate
+CUPS=cups
+#[TODO] translate
+CURD=curd
+#[TODO] translate
+CUT=cut
+#[TODO] translate
+DASH=dash
+DIA=Diameter
+DIA.=Diameter
+DIAM=Diameter
+DIAM.=Diameter
+#[TODO] translate
+DIAMETER=diameter
+#[TODO] translate
+DICED=diced
+#[TODO] translate
+DRAINED=drained
+#[TODO] translate
+ENVELOPE=envelope
+#[TODO] translate
+EXTRA=extra
+#[TODO] translate
+FL=fl
+#[TODO] translate
+FLUID=fluid
+#[TODO] translate
+FOR=for
+#[TODO] translate
+FROM=from
+#[TODO] translate
+FROZEN=frozen
+#[TODO] translate
+FRUIT=fruit
+#[TODO] translate
+FRUITS=fruits
+#[TODO] translate
+G=g
+#[TODO] translate
+GROUND=ground
+#[TODO] translate
+HIGH=high
+#[TODO] translate
+IN=in
+#[TODO] translate
+IN.=in.
+#[TODO] translate
+INCH=inch
+#[TODO] translate
+INDIVIDUAL=individual
+#[TODO] translate
+INSTANT=instant
+#[TODO] translate
+ITEM=item
+#[TODO] translate
+ITEMS=items
+#[TODO] translate
+JAR=jar
+#[TODO] translate
+JUMBO=jumbo
+#[TODO] translate
+LARGE=large
+#[TODO] translate
+LB=lb
+LEAVES=Blätter
+LONG=lang
+#[TODO] translate
+MAKE=make
+#[TODO] translate
+MAKES=makes
+#[TODO] translate
+MASHED=mashed
+#[TODO] translate
+MEAT=meat
+#[TODO] translate
+MEDIUM=medium
+#[TODO] translate
+MELTED=melted
+#[TODO] translate
+ML=ml
+#[TODO] translate
+NET=net
+NOT=nicht
+OR=oder
+#[TODO] translate
+OUNCE=ounce
+#[TODO] translate
+OZ=oz
+#[TODO] translate
+OZ.=oz.
+#[TODO] translate
+PACK=pack
+#[TODO] translate
+PACKED=packed
+#[TODO] translate
+PACKAGE=package
+#[TODO] translate
+PACKAGES=packages
+#[TODO] translate
+PACKET=packet
+#[TODO] translate
+PAT=pat
+#[TODO] translate
+PATTY=patty
+#[TODO] translate
+PIECE=piece
+#[TODO] translate
+PIECES=pieces
+#[TODO] translate
+PKG.=pkg.
+#[TODO] translate
+POD=pod
+#[TODO] translate
+PODS=pods
+#[TODO] translate
+PORTION=portion
+#[TODO] translate
+POWDER=powder
+#[TODO] translate
+PREPARED=prepared
+#[TODO] translate
+PRODUCT=product
+#[TODO] translate
+QUART=quart
+#[TODO] translate
+RAW=raw
+#[TODO] translate
+READY=ready
+#[TODO] translate
+READY-TO=ready to
+#[TODO] translate
+READY-TO-COOK=ready to cook
+#[TODO] translate
+READY-TO-EAT=ready to eat
+#[TODO] translate
+READY-TO-SERVE=ready to serve
+#[TODO] translate
+RECIPE=recipe
+#[TODO] translate
+RECONSTITUTED=reconstituted
+#[TODO] translate
+REFRIGATED=refrigirated
+#[TODO] translate
+REFRIGERATED=refrigerated
+#[TODO] translate
+REFUSE=refuse
+#[TODO] translate
+REGULAR=regular
+#[TODO] translate
+REMOVED=removed
+#[TODO] translate
+ROLL=roll
+#[TODO] translate
+ROLLS=rolls
+#[TODO] translate
+ROOT=root
+#[TODO] translate
+SCOOP=scoop
+#[TODO] translate
+SERVING=serving
+#[TODO] translate
+SERVINGS=servings
+#[TODO] translate
+SHELLED=shelled
+#[TODO] translate
+SHREDDED=shredded
+#[TODO] translate
+SIFTED=sifted
+#[TODO] translate
+SIZE=size
+#[TODO] translate
+SKIN=skin
+#[TODO] translate
+SLICE=slice
+#[TODO] translate
+SLICED=sliced
+#[TODO] translate
+SLICES=slices
+SMALL=klein
+#[TODO] translate
+SMALLER=smaller
+#[TODO] translate
+SNACK=snack
+#[TODO] translate
+SNACK-SIZE=snack size
+#[TODO] translate
+SPRIG=sprig
+#[TODO] translate
+SPRIGS=sprigs
+SPOON=Löffel
+#[TODO] translate
+SQ=sq
+#[TODO] translate
+STICK=stick
+#[TODO] translate
+STICKS=sticks
+#[TODO] translate
+TABLESPOON=table spoon
+#[TODO] translate
+TBS=table spoon
+#[TODO] translate
+TBSP=table spoon
+TEASPOON=Teelöffel
+THAWED=getaut
+#[TODO] translate
+THICK=thick
+THIN=dünn
+#[TODO] translate
+THICK.=thick.
+TO=zu
+#[TODO] translate
+TSP=tea spoon
+#[TODO] translate
+UNDILUTED=undiluted
+#[TODO] translate
+UNDRAINED=undrained
+#[TODO] translate
+UNHEATED=unheated
+#[TODO] translate
+UNIT=unit
+#[TODO] translate
+UNPACKED=unpacked
+#[TODO] translate
+UNPEELED=unpeeled
+#[TODO] translate
+UNPREPARED=unprepared
+#[TODO] translate
+UNSIFTED=unsifted
+#[TODO] translate
+UNTHAWED=unthawed
+#[TODO] translate
+WHOLE=whole
+WITH=mit
+WITHOUT=ohne
+#[TODO] translate
+WEDGE=wedge
+#[TODO] translate
+WEDGES=wedges
+WHIPPED=geschlagen
+#[TODO] translate
+WRAPPED=wrapped
+#[TODO] translate
+X=x
+#[TODO] translate
+YIELD=yield
+#[TODO] translate
+YIELDS=yields
+
+#
+# Food translations (3)
+#
+EGG=Ei
+HEADS=Köpfe
+MILK=Milch
+STEAK=Steak
Added: trunk/ggc-core/src/GGC_Nutrition_de.properties
===================================================================
--- trunk/ggc-core/src/GGC_Nutrition_de.properties (rev 0)
+++ trunk/ggc-core/src/GGC_Nutrition_de.properties 2009-03-19 18:32:06 UTC (rev 685)
@@ -0,0 +1,705 @@
+#
+# ######################################################################
+# ### GNU Gluco Control - Nutrition File ###
+# ######################################################################
+# ### Language: German ###
+# ### Created by: Reinhold Rumberger (ru...@us...) ###
+# ### Last change: 2008-10-15 Version: 0.9 ###
+# ### Application Version: 0.3.3 ###
+# ######################################################################
+#
+# NOT FINISHED!!!
+# Very little testing!!
+# 199 keys not translated as of version 0.8
+
+#####################################################################
+## WARNUNG: Diese Datei ist noch nicht komplett \u00fcbersetzt! ##
+#####################################################################
+
+# This part is intended for nutrition only, everything that is done
+# by nutrition is here.
+#
+
+# In brackets there are now tags which define urgency of some text beeing translated
+# 1 - Needed, urgent (dialogs)
+# 2 - Needed (this are mostly nutrients, home weight, which is probably nice to have translated)
+# 3 - Not so important, but nice to have
+#
+
+#
+# Collation Rules - In unicode we can create special rules for sorting where we specify
+# sorting order of special characters. This will be used by tree's and special tables.
+# For english this is left empty. For all other (that have non-standarn, non-english
+# charcters) we need to set this if we want sorting to be done correctly.
+#
+COLLATION_RULES=< 0 < 1 < 2 < 3 < 4 < 5 < 6 < 7 < 8 < 9 < a,A,\u00e4,\u00c4,\u00e1,\u00e0,\u00c1,\u00c0,\u00e2,\u00c2 < b,B < c,C < d,D < e,E,\u00e9,\u00e8,\u00ea,\u00c9,\u00c8,\u00ca < f,F < g,G < h,H < i,I < j,J < k,K < l,L < m,M < n,N < o,O,\u00f6,\u00d6 < p,P < q,Q < r,R < s,S,\u00df < t,T < u,U,\u00fc,\u00dc < v,V < w,W < x,X < y,Y < z,Z
+
+#
+# Global (1)
+#
+ADD=Hinzuf\u00fcgen
+APPLY=Anwenden
+CANCEL=Abbrechen
+DELETE=L\u00f6schen
+EDIT=Bearbeiten
+HELP=Hilfe
+INFORMATION=Information
+NEW=Neu
+NO=Nein
+OK=OK
+QUESTION=Frage
+ROOT=Wurzel
+SELECT=W\u00e4hlen
+YES=Ja
+
+#
+# Global Dialogs (1)
+#
+#[TODO] translate
+AMOUNT=Amount
+AMOUNT_LBL=Menge
+ARE_YOU_SURE_DELETE=Wollen Sie dieses Element wirklich l\u00f6schen?
+ID=ID
+MEALS_DB=Mahlzeiten-DB
+NONE=Nichts
+NUTRITION=N\u00e4hrstoff
+REFUSE=Ungenie\u00dfbarer Anteil
+SELECT_ITEM_FIRST=W\u00e4hlen Sie bitte erst einen Eintrag und danach eine Aktion!
+TRANSLATED_NAME=\u00dcbersetzter Name (falls verf\u00fcgbar)
+USER_NUTRITION_DATABASE=N\u00e4hrstoff-Datenbank des Benutzers
+USER_NUTRITION_DATABASE_DESC=<html><body>Dies ist die Nährstoff-Datenbank, zu der der Benutzer selbst Einträge hinzufügen kann. In Zukunft wird der Import fremder Nährstoff-Datenbanken unterstützt werden (die dann editierbar sein werden), damit Sie die Vorteile der erweiterten Ordnerstruktur (Ordner können Unterordner enthalten) genießen können. Wenn Sie beispielsweise in Deutschland wohnen, könnten Sie einen Ordner namens "Deutsche Nahrung" anlegen, in den Sie dann unterschiedliche Gruppen (z.B. "Zubereitung: Mikrowelle"), Nahrungstypen, usw. eintragen könnten.</body></html>
+USER_NUTRITION_DB=Benutzer N\u00e4hrstoff-DB
+USDA_NUTRITION_DATABASE=N\u00e4hrstoff-Datenbank des USDA
+USDA_NUTRITION_DATABASE_DESC=<html><body>Die USDA-DB ist die United States Department of Agriculture Datenbank, die viele in den USA erhältiche Lebensmittel enthält. Da diese Datenbank in der ganzen Welt genutzt wird, haben wir uns entschieden sie zu integrieren. Die Version, die sich in der Datenbank befindet, hängt von den Dateien ab, die importiert wurden. Erlaubt sind Versionen 18 und höher (getestet wurde SR-18).<br>In diesem Modul werden alle Einträge der Datenbank angezeigt und wenn es von bestimmten anderen Modulen (wie z.B. dem Mahlzeiten-Modul) aus aufgerufen wurde, können Lebensmittel zum Importieren ausgewählt werden.</body></html>
+USDA_NUTRITION_DB=USDA N\u00e4hrstoff-DB
+
+#
+# Popup Menu (1)
+#
+PM_NUT_ADD_FOOD_DESCRIPTION=Lebensmittelbeschreibung hinzuf\u00fcgen
+PM_NUT_ADD_GROUP=Gruppe hinzuf\u00fcgen
+PM_NUT_ADD_MEAL=Mahlzeit hinzuf\u00fcgen
+PM_NUT_CLOSE=Schlie\u00dfen
+PM_NUT_EDIT_FOOD_DESCRIPTION=Lebensmittelbeschreibung bearbeiten
+PM_NUT_EDIT_GROUP=Gruppe bearbeiten
+PM_NUT_EDIT_MEAL=Mahlzeit bearbeiten
+PM_NUT_VIEW=Anzeigen
+
+#
+# Food (1)
+#
+ADD_FOOD=Neues Lebensmittel hinzuf\u00fcgen
+ADD_FOOD_GROUP=Lebensmittelgruppe hinzuf\u00fcgen
+ADD_MEAL_GROUP=Neue Mahlzeitengruppe hinzuf\u00fcgen
+AMOUNT_WEIGHT=Menge & Gewicht
+EDIT_FOOD_GROUP=Lebensmittelgruppe bearbeiten
+EDIT_MEAL_GROUP=Mahlzeitengruppe bearbeiten
+FOOD_DESCRIPTION=Lebensmittel-Beschreibung
+FOOD_GROUP=Lebensmittelgruppe
+FOOD_GROUPS=Lebensmittelgruppen
+FOOD_NAME=Name des Lebensmittels
+GROUP_NAME=Gruppenname
+#[TODO] translate
+HOME_WEIGHTS=Home weights (if defined)
+MEAL_GROUP=Mahlzeitengruppe
+MEAL_GROUPS=Mahlzeitengruppen
+NEW_FOOD=Neues Lebensmittel
+NEW_GROUP=Neue Gruppe
+NUTRITIONS_FOOD=N\u00e4hrstoffe
+PARENT_GROUP=\u00dcbergeordnete Gruppe
+REFUSE_LBL=Ungenie\u00dfbarer Anteil
+SELECT_GROUP=Gruppe w\u00e4hlen
+SELECTED_GROUP=Gew\u00e4hlte Gruppe
+TRANSLATION_KEYWORD=Schl\u00fcsselwort f\u00fcr die \u00dcbersetzung
+UNITS=Einheiten
+WEIGHT=Gewicht (in g)
+WEIGHT_TYPE=Gewichtstyp
+WISH_TO_SAVE_EDITED_GROUP=Sie haben eine Gruppe ge\u00e4ndert. Wollen Sie speichern?
+WISH_TO_SAVE_NEW_GROUP=Sie haben eine neue Gruppe erstellt. Wollen Sie speichern?
+
+
+#
+# Meal (1)
+#
+ADD_MEAL=Mahlzeit hinzuf\u00fcgen
+AVAILABLE_NUTRITIONS=Verf\u00fcgbahre N\u00e4hrstoffe
+CANT_SELECT_CHILD_OR_GROUP=Diese Gruppe oder ein Kindelement dieser Gruppe kann nicht als Elternelement dieser Gruppe gew\u00e4hlt werden!
+CANT_SELECT_CIRCULAR_MEAL=Die Mahlzeit, die bearbeitet wird, kann nicht hinzugef\u00fcgt werden
+DESCRIPTION=Beschreibung
+FOODS_MEALS_NUTRITIONS=Lebensmittel, Mahlzeiten und/oder N\u00e4hrstoffe
+GROUP=Gruppe
+MEAL=Mahlzeit
+MEAL_ADD=Mahlzeit hinzuf\u00fcgen
+MEAL_EDIT=Mahlzeit bearbeiten
+MEAL_FOOD_ADD_DESC=Lebensmittel, Mahlzeit oder N\u00e4hrstoffe hinzuf\u00fcgen
+MEAL_FOOD_DELETE_DESC=Lebensmittel, Mahlzeit oder N\u00e4hrstoffe l\u00f6schen
+MEAL_FOOD_EDIT_DESC=Lebensmittel, Mahlzeit oder N\u00e4hrstoffe bearbeiten
+MEAL_NAME=Mahlzeitname
+MEAL_TYPE=Typ
+#[TODO] translate
+MEAL_VIEW=Meal View
+MEALS_DATABASE=Mahlzeiten-Datenbank
+MEALS_DATABASE_DESC=<html><body>Die Mahlzeiten-Datenbank enth\u00e4lt komplette Gerichte, z.B. "McDonald's Big Mac Men\u00fc". Sie enth\u00e4lt einige Elemente der USDA-Datenbank, z.B. "Big Mac Hamburger" und "Coca-Cola".<br>Gerichte k\u00f6nnen Elemente aus allen Datenbanken enthalten.</body></html>
+MEALS_FOODS_SELECTOR=Mahlzeiten- und Lebensmittelwahl
+NEW_MEAL=Neue Mahlzeit
+NUTRITION_TYPE=N\u00e4hrstofftyp
+#[TODO] translate
+NUTRITION_TYPE_FOR_SELECTOR=Nutrition type for selector
+SELECT_ITEM=Element w\u00e4hlen
+SELECTED_ITEM=gew\u00e4hltes Element
+#[TODO] translate
+SELECTOR=Selector
+USDA_NUTRITION=USDA N\u00e4hrstoff
+USER_NUTRITION=Benutzerdefinierte N\u00e4hrstoff
+TRANSLATED_NAME_MEAL=\u00dcbersetzter Name
+TRANSLATION_KEYWORD_MEAL=Schl\u00fcsselwort f\u00fcr die \u00dcbersetzung
+WISH_TO_SAVE_EDITED_MEAL=Sie haben eine Mahlzeit ge\u00e4ndert. Wollen Sie speichen?
+WISH_TO_SAVE_NEW_MEAL=Sie haben eine neue Mahlzeit erstellt. Wollen Sie speichern?
+
+#
+# Food (User) (1)
+#
+FOOD_EDIT=Lebensmittel bearbeiten
+#[TODO] translate
+HOME_WEIGHT_ADD_DESC=Add Home Weight
+#[TODO] translate
+HOME_WEIGHT_DELETE_DESC=Delete Home Weight
+#[TODO] translate
+HOME_WEIGHT_EDIT_DESC=Edit Home Weight
+#[TODO] translate
+HOME_WEIGHT_NAME=Home Weight Name
+#[TODO] translate
+HOME_WEIGHT_SELECTOR=Home Weight Selector
+NEW_HOME_WEIGHT=Neu
+NEW_NUTR_DEF=Neu
+NUTRITION_NAME=N\u00e4hrstoffname
+#[TODO] translate
+NUTRITION_SELECTOR=Nutritions Selector
+NUTRITIONS=N\u00e4hrstoffe
+#[TODO] translate
+SELECT_HOME_WEIGHT=Select Home Weight
+SELECT_NUTRITION=N\u00e4hrstoff w\u00e4hlen
+SELECTED_NUTRITION=gew\u00e4hlter N\u00e4hrstoff
+#[TODO] translate
+SELECTED_HOME_WEIGHT=Selected Home Weight
+#[TODO] translate
+SELECTOR_HOME_WEIGHT=Selector for Home Weights
+#[TODO] translate
+SELECTOR_NUTRITION_DEFINITION=Selector for Nutritions
+#[TODO] translate
+TAG=Tag
+USER_DEFINED=Benutzerdefiniert
+WEIGHT_UNIT=Gew. Einheit
+WISH_TO_SAVE_EDITED_FOOD=Sie haben die Lebensmitteldaten ge\u00e4ndert. Wollen Sie speichern?
+WISH_TO_SAVE_NEW_FOOD=Sie haben ein neues Lebensmittel eingetragen. Wollen Sie speichern?
+
+#
+# Daily Values and Foods (1)
+#
+#[TODO] translate
+HOME_WEIGHTS_LBL=Home Weights
+WEIGHT_LBL2=Gewicht
+WEIGHT_SHORT=Gew.
+#[TODO] translate
+WEIGHT_TYPE=Weight Type
+WGHT_PER_AMOUNT=Gewicht/Menge
+
+#
+# Selector for Daily Value (1)
+#
+#[TODO] translate
+HOME_WEIGHT=Home Weight
+MEALS_FOODS_SELECTOR_DAILY=Mahlzeiten- und Lebensmittelwahl f\u00fcr den Eintrag
+NAME=Name
+NO_ITEM_SELECTED=Keine Auswahl.
+
+
+#
+# Printing Food menu (2)
+#
+#[TODO] translate
+AMOUNT_SHORT=Am.
+#[TODO] translate
+BG=BG
+#[TODO] translate
+CH=CH
+#[TODO] translate
+DATE=Date
+#[TODO] translate
+FOOD_MENU_BASE=Food Menu Base (CH only)
+#[TODO] translate
+INS=Ins
+#[TODO] translate
+PRINT_FOOD_DESC=Food Description
+#[TODO] translate
+REPORT_FOOTER=This report is from \"GGC - GNU Gluco Control\", freely available at http://ggc.sourceforge.net
+#[TODO] translate
+TIME=Time
+#[TODO] translate
+FOOD_MENU_EXT_I=Extended Food Menu I (CH,Ins)
+#[TODO] translate
+FOOD_MENU_EXT_II=Extended Food Menu II (CH,Ins,BG)
+#[TODO] translate
+FOOD_MENU_EXT_III=Extended Food Menu III (CH,Ins,BG,kJ)
+#[TODO] translate
+TOGETHER=Together
+
+
+#
+# Nutrients (2)
+#
+ALC=Alkohol, \u00c4thyl
+ASH=Asche
+CA=Kalzium, Ca
+CAFFN=Koffein
+CARTA=Karotin, alpha
+CARTB=Karotin, beta
+#[TODO] translate
+CHOCDF=Carbohydrate, by difference
+CHOLE=Cholesterin
+CU=Kupfer, Cu
+ENERC_KCAL=Energie (kcal)
+ENERC_KJ=Energie
+FAMS=Fetts\u00e4uren, einfach ges\u00e4ttigt
+FAPU=Fetts\u00e4uren, mehrfach ges\u00e4ttigt
+FASAT=Fetts\u00e4uren, ges\u00e4ttigt
+FAT=Lipide Gesamt (Fett)
+#[TODO] translate
+FATRN=Fatty acids, total trans
+#[TODO] translate
+FATRNM=Fatty acids, total trans-monoenoic
+#[TODO] translate
+FATRNP=Fatty acids, total trans-polyenoic
+FE=Eisen, Fe
+#[TODO] translate
+FIBTG=Fiber, total dietary
+FLD=Fluorid, F
+FRUS=Fruchtzucker
+#[TODO] translate
+GALS=Galactose
+GI_MAX=Glyk\u00e4mischer Index (Max)
+GI_MIN=Glyk\u00e4mischer Index (Min)
+GI=Glyk\u00e4mischer Index
+#[TODO] translate
+GL_MAX=Glycemic Load (Max)
+#[TODO] translate
+GL_MIN=Glycemic Load (Min)
+#[TODO] translate
+GL=Glycemic Load
+GLUS=Glukose (Dextrose)
+K=Kalium, K
+LACS=Laktose
+MALS=Maltose
+MG=Magnesium, Mg
+MN=Mangan, Mn
+NA=Natrium, Na
+P=Phosphor, P
+PROCNT=Eiwei\u00df
+SE=Selen, Se
+STARCH=St\u00e4rke
+SUCS=R\u00fcbenzucker
+#[TODO] translate
+SUGAR=Sugars, total
+#[TODO] translate
+TOCPHA=Vitamin E (alpha-tocopherol)
+#[TODO] translate
+VITA_IU=Vitamin A, IU
+#[TODO] translate
+VITA_RAE=Vitamin A, RAE
+VITB12=Vitamin B12
+VITB6A=Vitamin B6
+VITD-=Vitamin D
+#[TODO] translate
+VITK=Vitamin K (phylloquinone)
+WATER=Wasser
+ZN=Zink, Zn
+
+
+#
+# \u00a0Nutrients (3)
+#
+ALA_G=Alanin
+ARG_G=Arginin
+ASP_G=Asparagins\u00e4ure
+#[TODO] translate
+BETN=Betaine
+#[TODO] translate
+CAMD5=Campesterol
+#[TODO] translate
+CHOLN=Choline, total
+#[TODO] translate
+CRYPX=Cryptoxanthin, beta
+#[TODO] translate
+CYS_G=Cystine
+#[TODO] translate
+FOL=Folate, total
+FOLAC=Fols\u00e4ure
+...
[truncated message content] |
|
From: <and...@us...> - 2009-03-21 23:51:54
|
Revision: 693
http://ggc.svn.sourceforge.net/ggc/?rev=693&view=rev
Author: andyrozman
Date: 2009-03-21 23:51:42 +0000 (Sat, 21 Mar 2009)
Log Message:
-----------
Added Paths:
-----------
trunk/ggc-nutri/
trunk/ggc-nutri/.classpath
trunk/ggc-nutri/.project
trunk/ggc-nutri/src/
trunk/ggc-nutri/src/GGC_Nutrition_de.native.properties
trunk/ggc-nutri/src/GGC_Nutrition_de.properties
trunk/ggc-nutri/src/GGC_Nutrition_en.properties
trunk/ggc-nutri/src/GGC_Nutrition_fr.properties
trunk/ggc-nutri/src/GGC_Nutrition_si.properties
trunk/ggc-nutri/src/ggc/
trunk/ggc-nutri/src/ggc/nutri/
trunk/ggc-nutri/src/ggc/nutri/data/
trunk/ggc-nutri/src/ggc/nutri/data/GGCTreeRoot.java
trunk/ggc-nutri/src/ggc/nutri/data/GGCTreeRootDyn.java
trunk/ggc-nutri/src/ggc/nutri/data/GGCTreeRootStatic.java
trunk/ggc-nutri/src/ggc/nutri/data/HomeWeightComparator.java
trunk/ggc-nutri/src/ggc/nutri/data/MealNutritionsComparator.java
trunk/ggc-nutri/src/ggc/nutri/data/MealPartsComparator.java
trunk/ggc-nutri/src/ggc/nutri/data/NutritionGroupModel.java
trunk/ggc-nutri/src/ggc/nutri/data/NutritionTreeModel.java
trunk/ggc-nutri/src/ggc/nutri/data/NutritionsComparator.java
trunk/ggc-nutri/src/ggc/nutri/plugin/
trunk/ggc-nutri/src/ggc/nutri/plugin/NutriPlugInServer.java
trunk/ggc-nutri/src/ggc/nutri/print/
trunk/ggc-nutri/src/ggc/nutri/print/PrintFoodMenuAbstract.java
trunk/ggc-nutri/src/ggc/nutri/print/PrintFoodMenuBase.java
trunk/ggc-nutri/src/ggc/nutri/print/PrintFoodMenuExt1.java
trunk/ggc-nutri/src/ggc/nutri/print/PrintFoodMenuExt2.java
trunk/ggc-nutri/src/ggc/nutri/print/PrintFoodMenuExt3.java
trunk/ggc-nutri/src/ggc/nutri/util/
trunk/ggc-nutri/src/ggc/nutri/util/DataAccessNutri.java
trunk/ggc-nutri/src/ggc/nutri/util/I18nControl.java
Added: trunk/ggc-nutri/.classpath
===================================================================
--- trunk/ggc-nutri/.classpath (rev 0)
+++ trunk/ggc-nutri/.classpath 2009-03-21 23:51:42 UTC (rev 693)
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry excluding="**/.svn/**" kind="src" path="src"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/commons-logging-1.0.4"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/Atech-Tools"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/GGC Plugin Base"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/GGC Core"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/iText-2.0.7"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/JavaHelp-2.0.5"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/Hibernate-3.1"/>
+ <classpathentry kind="output" path="bin"/>
+</classpath>
Added: trunk/ggc-nutri/.project
===================================================================
--- trunk/ggc-nutri/.project (rev 0)
+++ trunk/ggc-nutri/.project 2009-03-21 23:51:42 UTC (rev 693)
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>GGC Nutrition Tool</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ </natures>
+</projectDescription>
Added: trunk/ggc-nutri/src/GGC_Nutrition_de.native.properties
===================================================================
--- trunk/ggc-nutri/src/GGC_Nutrition_de.native.properties (rev 0)
+++ trunk/ggc-nutri/src/GGC_Nutrition_de.native.properties 2009-03-21 23:51:42 UTC (rev 693)
@@ -0,0 +1,705 @@
+#
+# ######################################################################
+# ### GNU Gluco Control - Nutrition File ###
+# ######################################################################
+# ### Language: German ###
+# ### Created by: Reinhold Rumberger (ru...@us...) ###
+# ### Last change: 2008-10-15 Version: 0.9 ###
+# ### Application Version: 0.3.3 ###
+# ######################################################################
+#
+# NOT FINISHED!!!
+# Very little testing!!
+# 199 keys not translated as of version 0.8
+
+#####################################################################
+## WARNUNG: Diese Datei ist noch nicht komplett übersetzt! ##
+#####################################################################
+
+# This part is intended for nutrition only, everything that is done
+# by nutrition is here.
+#
+
+# In brackets there are now tags which define urgency of some text beeing translated
+# 1 - Needed, urgent (dialogs)
+# 2 - Needed (this are mostly nutrients, home weight, which is probably nice to have translated)
+# 3 - Not so important, but nice to have
+#
+
+#
+# Collation Rules - In unicode we can create special rules for sorting where we specify
+# sorting order of special characters. This will be used by tree's and special tables.
+# For english this is left empty. For all other (that have non-standarn, non-english
+# charcters) we need to set this if we want sorting to be done correctly.
+#
+COLLATION_RULES=< 0 < 1 < 2 < 3 < 4 < 5 < 6 < 7 < 8 < 9 < a,A,ä,Ä,á,à,Á,À,â, < b,B < c,C < d,D < e,E,é,è,ê,É,È,Ê < f,F < g,G < h,H < i,I < j,J < k,K < l,L < m,M < n,N < o,O,ö,Ö < p,P < q,Q < r,R < s,S,ß < t,T < u,U,ü,Ü < v,V < w,W < x,X < y,Y < z,Z
+
+#
+# Global (1)
+#
+ADD=Hinzufügen
+APPLY=Anwenden
+CANCEL=Abbrechen
+DELETE=Löschen
+EDIT=Bearbeiten
+HELP=Hilfe
+INFORMATION=Information
+NEW=Neu
+NO=Nein
+OK=OK
+QUESTION=Frage
+ROOT=Wurzel
+SELECT=Wählen
+YES=Ja
+
+#
+# Global Dialogs (1)
+#
+#[TODO] translate
+AMOUNT=Amount
+AMOUNT_LBL=Menge
+ARE_YOU_SURE_DELETE=Wollen Sie dieses Element wirklich löschen?
+ID=ID
+MEALS_DB=Mahlzeiten-DB
+NONE=Nichts
+NUTRITION=Nährstoff
+REFUSE=Ungenießbarer Anteil
+SELECT_ITEM_FIRST=Wählen Sie bitte erst einen Eintrag und danach eine Aktion!
+TRANSLATED_NAME=Übersetzter Name (falls verfügbar)
+USER_NUTRITION_DATABASE=Nährstoff-Datenbank des Benutzers
+USER_NUTRITION_DATABASE_DESC=<html><body>Dies ist die Nährstoff-Datenbank, zu der der Benutzer selbst Einträge hinzufügen kann. In Zukunft wird der Import fremder Nährstoff-Datenbanken unterstützt werden (die dann editierbar sein werden), damit Sie die Vorteile der erweiterten Ordnerstruktur (Ordner können Unterordner enthalten) genießen können. Wenn Sie beispielsweise in Deutschland wohnen, könnten Sie einen Ordner namens "Deutsche Nahrung" anlegen, in den Sie dann unterschiedliche Gruppen (z.B. "Zubereitung: Mikrowelle"), Nahrungstypen, usw. eintragen könnten.</body></html>
+USER_NUTRITION_DB=Benutzer Nährstoff-DB
+USDA_NUTRITION_DATABASE=Nährstoff-Datenbank des USDA
+USDA_NUTRITION_DATABASE_DESC=<html><body>Die USDA-DB ist die United States Department of Agriculture Datenbank, die viele in den USA erhältiche Lebensmittel enthält. Da diese Datenbank in der ganzen Welt genutzt wird, haben wir uns entschieden sie zu integrieren. Die Version, die sich in der Datenbank befindet, hängt von den Dateien ab, die importiert wurden. Erlaubt sind Versionen 18 und höher (getestet wurde SR-18).<br>In diesem Modul werden alle Einträge der Datenbank angezeigt und wenn es von bestimmten anderen Modulen (wie z.B. dem Mahlzeiten-Modul) aus aufgerufen wurde, können Lebensmittel zum Importieren ausgewählt werden.</body></html>
+USDA_NUTRITION_DB=USDA Nährstoff-DB
+
+#
+# Popup Menu (1)
+#
+PM_NUT_ADD_FOOD_DESCRIPTION=Lebensmittelbeschreibung hinzufügen
+PM_NUT_ADD_GROUP=Gruppe hinzufügen
+PM_NUT_ADD_MEAL=Mahlzeit hinzufügen
+PM_NUT_CLOSE=Schließen
+PM_NUT_EDIT_FOOD_DESCRIPTION=Lebensmittelbeschreibung bearbeiten
+PM_NUT_EDIT_GROUP=Gruppe bearbeiten
+PM_NUT_EDIT_MEAL=Mahlzeit bearbeiten
+PM_NUT_VIEW=Anzeigen
+
+#
+# Food (1)
+#
+ADD_FOOD=Neues Lebensmittel hinzufügen
+ADD_FOOD_GROUP=Lebensmittelgruppe hinzufügen
+ADD_MEAL_GROUP=Neue Mahlzeitengruppe hinzufügen
+AMOUNT_WEIGHT=Menge & Gewicht
+EDIT_FOOD_GROUP=Lebensmittelgruppe bearbeiten
+EDIT_MEAL_GROUP=Mahlzeitengruppe bearbeiten
+FOOD_DESCRIPTION=Lebensmittel-Beschreibung
+FOOD_GROUP=Lebensmittelgruppe
+FOOD_GROUPS=Lebensmittelgruppen
+FOOD_NAME=Name des Lebensmittels
+GROUP_NAME=Gruppenname
+#[TODO] translate
+HOME_WEIGHTS=Home weights (if defined)
+MEAL_GROUP=Mahlzeitengruppe
+MEAL_GROUPS=Mahlzeitengruppen
+NEW_FOOD=Neues Lebensmittel
+NEW_GROUP=Neue Gruppe
+NUTRITIONS_FOOD=Nährstoffe
+PARENT_GROUP=Übergeordnete Gruppe
+REFUSE_LBL=Ungenießbarer Anteil
+SELECT_GROUP=Gruppe wählen
+SELECTED_GROUP=Gewählte Gruppe
+TRANSLATION_KEYWORD=Schlüsselwort für die Übersetzung
+UNITS=Einheiten
+WEIGHT=Gewicht (in g)
+WEIGHT_TYPE=Gewichtstyp
+WISH_TO_SAVE_EDITED_GROUP=Sie haben eine Gruppe geändert. Wollen Sie speichern?
+WISH_TO_SAVE_NEW_GROUP=Sie haben eine neue Gruppe erstellt. Wollen Sie speichern?
+
+
+#
+# Meal (1)
+#
+ADD_MEAL=Mahlzeit hinzufügen
+AVAILABLE_NUTRITIONS=Verfügbahre Nährstoffe
+CANT_SELECT_CHILD_OR_GROUP=Diese Gruppe oder ein Kindelement dieser Gruppe kann nicht als Elternelement dieser Gruppe gewählt werden!
+CANT_SELECT_CIRCULAR_MEAL=Die Mahlzeit, die bearbeitet wird, kann nicht hinzugefügt werden
+DESCRIPTION=Beschreibung
+FOODS_MEALS_NUTRITIONS=Lebensmittel, Mahlzeiten und/oder Nährstoffe
+GROUP=Gruppe
+MEAL=Mahlzeit
+MEAL_ADD=Mahlzeit hinzufügen
+MEAL_EDIT=Mahlzeit bearbeiten
+MEAL_FOOD_ADD_DESC=Lebensmittel, Mahlzeit oder Nährstoffe hinzufügen
+MEAL_FOOD_DELETE_DESC=Lebensmittel, Mahlzeit oder Nährstoffe löschen
+MEAL_FOOD_EDIT_DESC=Lebensmittel, Mahlzeit oder Nährstoffe bearbeiten
+MEAL_NAME=Mahlzeitname
+MEAL_TYPE=Typ
+#[TODO] translate
+MEAL_VIEW=Meal View
+MEALS_DATABASE=Mahlzeiten-Datenbank
+MEALS_DATABASE_DESC=<html><body>Die Mahlzeiten-Datenbank enthält komplette Gerichte, z.B. "McDonald's Big Mac Menü". Sie enthält einige Elemente der USDA-Datenbank, z.B. "Big Mac Hamburger" und "Coca-Cola".<br>Gerichte können Elemente aus allen Datenbanken enthalten.</body></html>
+MEALS_FOODS_SELECTOR=Mahlzeiten- und Lebensmittelwahl
+NEW_MEAL=Neue Mahlzeit
+NUTRITION_TYPE=Nährstofftyp
+#[TODO] translate
+NUTRITION_TYPE_FOR_SELECTOR=Nutrition type for selector
+SELECT_ITEM=Element wählen
+SELECTED_ITEM=gewähltes Element
+#[TODO] translate
+SELECTOR=Selector
+USDA_NUTRITION=USDA Nährstoff
+USER_NUTRITION=Benutzerdefinierte Nährstoff
+TRANSLATED_NAME_MEAL=Übersetzter Name
+TRANSLATION_KEYWORD_MEAL=Schlüsselwort für die Übersetzung
+WISH_TO_SAVE_EDITED_MEAL=Sie haben eine Mahlzeit geändert. Wollen Sie speichen?
+WISH_TO_SAVE_NEW_MEAL=Sie haben eine neue Mahlzeit erstellt. Wollen Sie speichern?
+
+#
+# Food (User) (1)
+#
+FOOD_EDIT=Lebensmittel bearbeiten
+#[TODO] translate
+HOME_WEIGHT_ADD_DESC=Add Home Weight
+#[TODO] translate
+HOME_WEIGHT_DELETE_DESC=Delete Home Weight
+#[TODO] translate
+HOME_WEIGHT_EDIT_DESC=Edit Home Weight
+#[TODO] translate
+HOME_WEIGHT_NAME=Home Weight Name
+#[TODO] translate
+HOME_WEIGHT_SELECTOR=Home Weight Selector
+NEW_HOME_WEIGHT=Neu
+NEW_NUTR_DEF=Neu
+NUTRITION_NAME=Nährstoffname
+#[TODO] translate
+NUTRITION_SELECTOR=Nutritions Selector
+NUTRITIONS=Nährstoffe
+#[TODO] translate
+SELECT_HOME_WEIGHT=Select Home Weight
+SELECT_NUTRITION=Nährstoff wählen
+SELECTED_NUTRITION=gewählter Nährstoff
+#[TODO] translate
+SELECTED_HOME_WEIGHT=Selected Home Weight
+#[TODO] translate
+SELECTOR_HOME_WEIGHT=Selector for Home Weights
+#[TODO] translate
+SELECTOR_NUTRITION_DEFINITION=Selector for Nutritions
+#[TODO] translate
+TAG=Tag
+USER_DEFINED=Benutzerdefiniert
+WEIGHT_UNIT=Gew. Einheit
+WISH_TO_SAVE_EDITED_FOOD=Sie haben die Lebensmitteldaten geändert. Wollen Sie speichern?
+WISH_TO_SAVE_NEW_FOOD=Sie haben ein neues Lebensmittel eingetragen. Wollen Sie speichern?
+
+#
+# Daily Values and Foods (1)
+#
+#[TODO] translate
+HOME_WEIGHTS_LBL=Home Weights
+WEIGHT_LBL2=Gewicht
+WEIGHT_SHORT=Gew.
+#[TODO] translate
+WEIGHT_TYPE=Weight Type
+WGHT_PER_AMOUNT=Gewicht/Menge
+
+#
+# Selector for Daily Value (1)
+#
+#[TODO] translate
+HOME_WEIGHT=Home Weight
+MEALS_FOODS_SELECTOR_DAILY=Mahlzeiten- und Lebensmittelwahl für den Eintrag
+NAME=Name
+NO_ITEM_SELECTED=Keine Auswahl.
+
+
+#
+# Printing Food menu (2)
+#
+#[TODO] translate
+AMOUNT_SHORT=Am.
+#[TODO] translate
+BG=BG
+#[TODO] translate
+CH=CH
+#[TODO] translate
+DATE=Date
+#[TODO] translate
+FOOD_MENU_BASE=Food Menu Base (CH only)
+#[TODO] translate
+INS=Ins
+#[TODO] translate
+PRINT_FOOD_DESC=Food Description
+#[TODO] translate
+REPORT_FOOTER=This report is from \"GGC - GNU Gluco Control\", freely available at http://ggc.sourceforge.net
+#[TODO] translate
+TIME=Time
+#[TODO] translate
+FOOD_MENU_EXT_I=Extended Food Menu I (CH,Ins)
+#[TODO] translate
+FOOD_MENU_EXT_II=Extended Food Menu II (CH,Ins,BG)
+#[TODO] translate
+FOOD_MENU_EXT_III=Extended Food Menu III (CH,Ins,BG,kJ)
+#[TODO] translate
+TOGETHER=Together
+
+
+#
+# Nutrients (2)
+#
+ALC=Alkohol, Äthyl
+ASH=Asche
+CA=Kalzium, Ca
+CAFFN=Koffein
+CARTA=Karotin, alpha
+CARTB=Karotin, beta
+#[TODO] translate
+CHOCDF=Carbohydrate, by difference
+CHOLE=Cholesterin
+CU=Kupfer, Cu
+ENERC_KCAL=Energie (kcal)
+ENERC_KJ=Energie
+FAMS=Fettsäuren, einfach gesättigt
+FAPU=Fettsäuren, mehrfach gesättigt
+FASAT=Fettsäuren, gesättigt
+FAT=Lipide Gesamt (Fett)
+#[TODO] translate
+FATRN=Fatty acids, total trans
+#[TODO] translate
+FATRNM=Fatty acids, total trans-monoenoic
+#[TODO] translate
+FATRNP=Fatty acids, total trans-polyenoic
+FE=Eisen, Fe
+#[TODO] translate
+FIBTG=Fiber, total dietary
+FLD=Fluorid, F
+FRUS=Fruchtzucker
+#[TODO] translate
+GALS=Galactose
+GI_MAX=Glykämischer Index (Max)
+GI_MIN=Glykämischer Index (Min)
+GI=Glykämischer Index
+#[TODO] translate
+GL_MAX=Glycemic Load (Max)
+#[TODO] translate
+GL_MIN=Glycemic Load (Min)
+#[TODO] translate
+GL=Glycemic Load
+GLUS=Glukose (Dextrose)
+K=Kalium, K
+LACS=Laktose
+MALS=Maltose
+MG=Magnesium, Mg
+MN=Mangan, Mn
+NA=Natrium, Na
+P=Phosphor, P
+PROCNT=Eiweiß
+SE=Selen, Se
+STARCH=Stärke
+SUCS=Rübenzucker
+#[TODO] translate
+SUGAR=Sugars, total
+#[TODO] translate
+TOCPHA=Vitamin E (alpha-tocopherol)
+#[TODO] translate
+VITA_IU=Vitamin A, IU
+#[TODO] translate
+VITA_RAE=Vitamin A, RAE
+VITB12=Vitamin B12
+VITB6A=Vitamin B6
+VITD-=Vitamin D
+#[TODO] translate
+VITK=Vitamin K (phylloquinone)
+WATER=Wasser
+ZN=Zink, Zn
+
+
+#
+# Nutrients (3)
+#
+ALA_G=Alanin
+ARG_G=Arginin
+ASP_G=Asparaginsäure
+#[TODO] translate
+BETN=Betaine
+#[TODO] translate
+CAMD5=Campesterol
+#[TODO] translate
+CHOLN=Choline, total
+#[TODO] translate
+CRYPX=Cryptoxanthin, beta
+#[TODO] translate
+CYS_G=Cystine
+#[TODO] translate
+FOL=Folate, total
+FOLAC=Folsäure
+#[TODO] translate
+FOLDFE=Folate, DFE
+#[TODO] translate
+FOLFD=Folate, food
+#[TODO] translate
+GLU_G=Glutamic acid
+#[TODO] translate
+GLY_G=Glycine
+#[TODO] translate
+HISTN_G=Histidine
+#[TODO] translate
+HYP=Hydroxyproline
+#[TODO] translate
+ILE_G=Isoleucine
+LEU_G=Leucin
+#[TODO] translate
+LUT+ZEA=Lutein + zeaxanthin
+#[TODO] translate
+LYCPN=Lycopene
+#[TODO] translate
+LYS_G=Lysine
+MET_G=Methionin
+#[TODO] translate
+NIA=Niacin
+#[TODO] translate
+PANTAC=Pantothenic acid
+PHE_G=Phenylalanin
+#[TODO] translate
+PHYSTR=Phytosterols
+PRO_G=Prolin
+#[TODO] translate
+RETOL=Retinol
+RIBF=Vitamin B2, Riboflavin
+SER_G=Serin
+#[TODO] translate
+SITSTR=Beta-sitosterol
+#[TODO] translate
+STID7=Stigmasterol
+#[TODO] translate
+THEBRN=Theobromine
+THIA=Vitamin B1, Thiamin
+THR_G=Threonin
+#[TODO] translate
+TOCPHB=Tocopherol, beta
+#[TODO] translate
+TOCPHD=Tocopherol, delta
+#[TODO] translate
+TOCPHG=Tocopherol, gamma
+#[TODO] translate
+TRP_G=Tryptophan
+TYR_G=Tyrosin
+VAL_G=Valin
+#[TODO] translate
+VITC=Vitamin C, total ascorbic acid
+
+
+#
+# Home Weights - Translation (2,3)
+#
+#[TODO] translate
+-TO-SERVE=to serve
+#[TODO] translate
+AFTER=after
+#[TODO] translate
+AMOUNT=amount
+#[TODO] translate
+APPROX=approx
+#[TODO] translate
+AVG.=avg.
+#[TODO] translate
+BAG=bag
+#[TODO] translate
+BAR=bar
+#[TODO] translate
+BIG=big
+#[TODO] translate
+BLOCK=block
+#[TODO] translate
+BLOCKS=blocks
+BONE=Knochen
+#[TODO] translate
+BONELESS=boneless
+BOTTLE=Flasche
+#[TODO] translate
+BOX=box
+CAN=Dose
+#[TODO] translate
+CHOPPED=chopped
+#[TODO] translate
+CHUNK=chunk
+#[TODO] translate
+CHUNKS=chunks
+#[TODO] translate
+CONTAINER=container
+#[TODO] translate
+CONTENTS=contents
+#[TODO] translate
+COOK=cook
+COOKED=gekocht
+#[TODO] translate
+COOKIE=cookie
+#[TODO] translate
+COOKING=cooking
+#[TODO] translate
+CRUMBLED=crumbled
+#[TODO] translate
+CRUSHED=crushed
+CUBE=Würfel
+CUBED=gewürfelt
+CUBES=Würfel
+CUBIC=kubisch
+CUP=Tasse
+#[TODO] translate
+CUPCAKE=cupcake
+#[TODO] translate
+CUPS=cups
+#[TODO] translate
+CURD=curd
+#[TODO] translate
+CUT=cut
+#[TODO] translate
+DASH=dash
+DIA=Diameter
+DIA.=Diameter
+DIAM=Diameter
+DIAM.=Diameter
+#[TODO] translate
+DIAMETER=diameter
+#[TODO] translate
+DICED=diced
+#[TODO] translate
+DRAINED=drained
+#[TODO] translate
+ENVELOPE=envelope
+#[TODO] translate
+EXTRA=extra
+#[TODO] translate
+FL=fl
+#[TODO] translate
+FLUID=fluid
+#[TODO] translate
+FOR=for
+#[TODO] translate
+FROM=from
+#[TODO] translate
+FROZEN=frozen
+#[TODO] translate
+FRUIT=fruit
+#[TODO] translate
+FRUITS=fruits
+#[TODO] translate
+G=g
+#[TODO] translate
+GROUND=ground
+#[TODO] translate
+HIGH=high
+#[TODO] translate
+IN=in
+#[TODO] translate
+IN.=in.
+#[TODO] translate
+INCH=inch
+#[TODO] translate
+INDIVIDUAL=individual
+#[TODO] translate
+INSTANT=instant
+#[TODO] translate
+ITEM=item
+#[TODO] translate
+ITEMS=items
+#[TODO] translate
+JAR=jar
+#[TODO] translate
+JUMBO=jumbo
+#[TODO] translate
+LARGE=large
+#[TODO] translate
+LB=lb
+LEAVES=Blätter
+LONG=lang
+#[TODO] translate
+MAKE=make
+#[TODO] translate
+MAKES=makes
+#[TODO] translate
+MASHED=mashed
+#[TODO] translate
+MEAT=meat
+#[TODO] translate
+MEDIUM=medium
+#[TODO] translate
+MELTED=melted
+#[TODO] translate
+ML=ml
+#[TODO] translate
+NET=net
+NOT=nicht
+OR=oder
+#[TODO] translate
+OUNCE=ounce
+#[TODO] translate
+OZ=oz
+#[TODO] translate
+OZ.=oz.
+#[TODO] translate
+PACK=pack
+#[TODO] translate
+PACKED=packed
+#[TODO] translate
+PACKAGE=package
+#[TODO] translate
+PACKAGES=packages
+#[TODO] translate
+PACKET=packet
+#[TODO] translate
+PAT=pat
+#[TODO] translate
+PATTY=patty
+#[TODO] translate
+PIECE=piece
+#[TODO] translate
+PIECES=pieces
+#[TODO] translate
+PKG.=pkg.
+#[TODO] translate
+POD=pod
+#[TODO] translate
+PODS=pods
+#[TODO] translate
+PORTION=portion
+#[TODO] translate
+POWDER=powder
+#[TODO] translate
+PREPARED=prepared
+#[TODO] translate
+PRODUCT=product
+#[TODO] translate
+QUART=quart
+#[TODO] translate
+RAW=raw
+#[TODO] translate
+READY=ready
+#[TODO] translate
+READY-TO=ready to
+#[TODO] translate
+READY-TO-COOK=ready to cook
+#[TODO] translate
+READY-TO-EAT=ready to eat
+#[TODO] translate
+READY-TO-SERVE=ready to serve
+#[TODO] translate
+RECIPE=recipe
+#[TODO] translate
+RECONSTITUTED=reconstituted
+#[TODO] translate
+REFRIGATED=refrigirated
+#[TODO] translate
+REFRIGERATED=refrigerated
+#[TODO] translate
+REFUSE=refuse
+#[TODO] translate
+REGULAR=regular
+#[TODO] translate
+REMOVED=removed
+#[TODO] translate
+ROLL=roll
+#[TODO] translate
+ROLLS=rolls
+#[TODO] translate
+ROOT=root
+#[TODO] translate
+SCOOP=scoop
+#[TODO] translate
+SERVING=serving
+#[TODO] translate
+SERVINGS=servings
+#[TODO] translate
+SHELLED=shelled
+#[TODO] translate
+SHREDDED=shredded
+#[TODO] translate
+SIFTED=sifted
+#[TODO] translate
+SIZE=size
+#[TODO] translate
+SKIN=skin
+#[TODO] translate
+SLICE=slice
+#[TODO] translate
+SLICED=sliced
+#[TODO] translate
+SLICES=slices
+SMALL=klein
+#[TODO] translate
+SMALLER=smaller
+#[TODO] translate
+SNACK=snack
+#[TODO] translate
+SNACK-SIZE=snack size
+#[TODO] translate
+SPRIG=sprig
+#[TODO] translate
+SPRIGS=sprigs
+SPOON=Löffel
+#[TODO] translate
+SQ=sq
+#[TODO] translate
+STICK=stick
+#[TODO] translate
+STICKS=sticks
+#[TODO] translate
+TABLESPOON=table spoon
+#[TODO] translate
+TBS=table spoon
+#[TODO] translate
+TBSP=table spoon
+TEASPOON=Teelöffel
+THAWED=getaut
+#[TODO] translate
+THICK=thick
+THIN=dünn
+#[TODO] translate
+THICK.=thick.
+TO=zu
+#[TODO] translate
+TSP=tea spoon
+#[TODO] translate
+UNDILUTED=undiluted
+#[TODO] translate
+UNDRAINED=undrained
+#[TODO] translate
+UNHEATED=unheated
+#[TODO] translate
+UNIT=unit
+#[TODO] translate
+UNPACKED=unpacked
+#[TODO] translate
+UNPEELED=unpeeled
+#[TODO] translate
+UNPREPARED=unprepared
+#[TODO] translate
+UNSIFTED=unsifted
+#[TODO] translate
+UNTHAWED=unthawed
+#[TODO] translate
+WHOLE=whole
+WITH=mit
+WITHOUT=ohne
+#[TODO] translate
+WEDGE=wedge
+#[TODO] translate
+WEDGES=wedges
+WHIPPED=geschlagen
+#[TODO] translate
+WRAPPED=wrapped
+#[TODO] translate
+X=x
+#[TODO] translate
+YIELD=yield
+#[TODO] translate
+YIELDS=yields
+
+#
+# Food translations (3)
+#
+EGG=Ei
+HEADS=Köpfe
+MILK=Milch
+STEAK=Steak
Added: trunk/ggc-nutri/src/GGC_Nutrition_de.properties
===================================================================
--- trunk/ggc-nutri/src/GGC_Nutrition_de.properties (rev 0)
+++ trunk/ggc-nutri/src/GGC_Nutrition_de.properties 2009-03-21 23:51:42 UTC (rev 693)
@@ -0,0 +1,705 @@
+#
+# ######################################################################
+# ### GNU Gluco Control - Nutrition File ###
+# ######################################################################
+# ### Language: German ###
+# ### Created by: Reinhold Rumberger (ru...@us...) ###
+# ### Last change: 2008-10-15 Version: 0.9 ###
+# ### Application Version: 0.3.3 ###
+# ######################################################################
+#
+# NOT FINISHED!!!
+# Very little testing!!
+# 199 keys not translated as of version 0.8
+
+#####################################################################
+## WARNUNG: Diese Datei ist noch nicht komplett \u00fcbersetzt! ##
+#####################################################################
+
+# This part is intended for nutrition only, everything that is done
+# by nutrition is here.
+#
+
+# In brackets there are now tags which define urgency of some text beeing translated
+# 1 - Needed, urgent (dialogs)
+# 2 - Needed (this are mostly nutrients, home weight, which is probably nice to have translated)
+# 3 - Not so important, but nice to have
+#
+
+#
+# Collation Rules - In unicode we can create special rules for sorting where we specify
+# sorting order of special characters. This will be used by tree's and special tables.
+# For english this is left empty. For all other (that have non-standarn, non-english
+# charcters) we need to set this if we want sorting to be done correctly.
+#
+COLLATION_RULES=< 0 < 1 < 2 < 3 < 4 < 5 < 6 < 7 < 8 < 9 < a,A,\u00e4,\u00c4,\u00e1,\u00e0,\u00c1,\u00c0,\u00e2,\u00c2 < b,B < c,C < d,D < e,E,\u00e9,\u00e8,\u00ea,\u00c9,\u00c8,\u00ca < f,F < g,G < h,H < i,I < j,J < k,K < l,L < m,M < n,N < o,O,\u00f6,\u00d6 < p,P < q,Q < r,R < s,S,\u00df < t,T < u,U,\u00fc,\u00dc < v,V < w,W < x,X < y,Y < z,Z
+
+#
+# Global (1)
+#
+ADD=Hinzuf\u00fcgen
+APPLY=Anwenden
+CANCEL=Abbrechen
+DELETE=L\u00f6schen
+EDIT=Bearbeiten
+HELP=Hilfe
+INFORMATION=Information
+NEW=Neu
+NO=Nein
+OK=OK
+QUESTION=Frage
+ROOT=Wurzel
+SELECT=W\u00e4hlen
+YES=Ja
+
+#
+# Global Dialogs (1)
+#
+#[TODO] translate
+AMOUNT=Amount
+AMOUNT_LBL=Menge
+ARE_YOU_SURE_DELETE=Wollen Sie dieses Element wirklich l\u00f6schen?
+ID=ID
+MEALS_DB=Mahlzeiten-DB
+NONE=Nichts
+NUTRITION=N\u00e4hrstoff
+REFUSE=Ungenie\u00dfbarer Anteil
+SELECT_ITEM_FIRST=W\u00e4hlen Sie bitte erst einen Eintrag und danach eine Aktion!
+TRANSLATED_NAME=\u00dcbersetzter Name (falls verf\u00fcgbar)
+USER_NUTRITION_DATABASE=N\u00e4hrstoff-Datenbank des Benutzers
+USER_NUTRITION_DATABASE_DESC=<html><body>Dies ist die Nährstoff-Datenbank, zu der der Benutzer selbst Einträge hinzufügen kann. In Zukunft wird der Import fremder Nährstoff-Datenbanken unterstützt werden (die dann editierbar sein werden), damit Sie die Vorteile der erweiterten Ordnerstruktur (Ordner können Unterordner enthalten) genießen können. Wenn Sie beispielsweise in Deutschland wohnen, könnten Sie einen Ordner namens "Deutsche Nahrung" anlegen, in den Sie dann unterschiedliche Gruppen (z.B. "Zubereitung: Mikrowelle"), Nahrungstypen, usw. eintragen könnten.</body></html>
+USER_NUTRITION_DB=Benutzer N\u00e4hrstoff-DB
+USDA_NUTRITION_DATABASE=N\u00e4hrstoff-Datenbank des USDA
+USDA_NUTRITION_DATABASE_DESC=<html><body>Die USDA-DB ist die United States Department of Agriculture Datenbank, die viele in den USA erhältiche Lebensmittel enthält. Da diese Datenbank in der ganzen Welt genutzt wird, haben wir uns entschieden sie zu integrieren. Die Version, die sich in der Datenbank befindet, hängt von den Dateien ab, die importiert wurden. Erlaubt sind Versionen 18 und höher (getestet wurde SR-18).<br>In diesem Modul werden alle Einträge der Datenbank angezeigt und wenn es von bestimmten anderen Modulen (wie z.B. dem Mahlzeiten-Modul) aus aufgerufen wurde, können Lebensmittel zum Importieren ausgewählt werden.</body></html>
+USDA_NUTRITION_DB=USDA N\u00e4hrstoff-DB
+
+#
+# Popup Menu (1)
+#
+PM_NUT_ADD_FOOD_DESCRIPTION=Lebensmittelbeschreibung hinzuf\u00fcgen
+PM_NUT_ADD_GROUP=Gruppe hinzuf\u00fcgen
+PM_NUT_ADD_MEAL=Mahlzeit hinzuf\u00fcgen
+PM_NUT_CLOSE=Schlie\u00dfen
+PM_NUT_EDIT_FOOD_DESCRIPTION=Lebensmittelbeschreibung bearbeiten
+PM_NUT_EDIT_GROUP=Gruppe bearbeiten
+PM_NUT_EDIT_MEAL=Mahlzeit bearbeiten
+PM_NUT_VIEW=Anzeigen
+
+#
+# Food (1)
+#
+ADD_FOOD=Neues Lebensmittel hinzuf\u00fcgen
+ADD_FOOD_GROUP=Lebensmittelgruppe hinzuf\u00fcgen
+ADD_MEAL_GROUP=Neue Mahlzeitengruppe hinzuf\u00fcgen
+AMOUNT_WEIGHT=Menge & Gewicht
+EDIT_FOOD_GROUP=Lebensmittelgruppe bearbeiten
+EDIT_MEAL_GROUP=Mahlzeitengruppe bearbeiten
+FOOD_DESCRIPTION=Lebensmittel-Beschreibung
+FOOD_GROUP=Lebensmittelgruppe
+FOOD_GROUPS=Lebensmittelgruppen
+FOOD_NAME=Name des Lebensmittels
+GROUP_NAME=Gruppenname
+#[TODO] translate
+HOME_WEIGHTS=Home weights (if defined)
+MEAL_GROUP=Mahlzeitengruppe
+MEAL_GROUPS=Mahlzeitengruppen
+NEW_FOOD=Neues Lebensmittel
+NEW_GROUP=Neue Gruppe
+NUTRITIONS_FOOD=N\u00e4hrstoffe
+PARENT_GROUP=\u00dcbergeordnete Gruppe
+REFUSE_LBL=Ungenie\u00dfbarer Anteil
+SELECT_GROUP=Gruppe w\u00e4hlen
+SELECTED_GROUP=Gew\u00e4hlte Gruppe
+TRANSLATION_KEYWORD=Schl\u00fcsselwort f\u00fcr die \u00dcbersetzung
+UNITS=Einheiten
+WEIGHT=Gewicht (in g)
+WEIGHT_TYPE=Gewichtstyp
+WISH_TO_SAVE_EDITED_GROUP=Sie haben eine Gruppe ge\u00e4ndert. Wollen Sie speichern?
+WISH_TO_SAVE_NEW_GROUP=Sie haben eine neue Gruppe erstellt. Wollen Sie speichern?
+
+
+#
+# Meal (1)
+#
+ADD_MEAL=Mahlzeit hinzuf\u00fcgen
+AVAILABLE_NUTRITIONS=Verf\u00fcgbahre N\u00e4hrstoffe
+CANT_SELECT_CHILD_OR_GROUP=Diese Gruppe oder ein Kindelement dieser Gruppe kann nicht als Elternelement dieser Gruppe gew\u00e4hlt werden!
+CANT_SELECT_CIRCULAR_MEAL=Die Mahlzeit, die bearbeitet wird, kann nicht hinzugef\u00fcgt werden
+DESCRIPTION=Beschreibung
+FOODS_MEALS_NUTRITIONS=Lebensmittel, Mahlzeiten und/oder N\u00e4hrstoffe
+GROUP=Gruppe
+MEAL=Mahlzeit
+MEAL_ADD=Mahlzeit hinzuf\u00fcgen
+MEAL_EDIT=Mahlzeit bearbeiten
+MEAL_FOOD_ADD_DESC=Lebensmittel, Mahlzeit oder N\u00e4hrstoffe hinzuf\u00fcgen
+MEAL_FOOD_DELETE_DESC=Lebensmittel, Mahlzeit oder N\u00e4hrstoffe l\u00f6schen
+MEAL_FOOD_EDIT_DESC=Lebensmittel, Mahlzeit oder N\u00e4hrstoffe bearbeiten
+MEAL_NAME=Mahlzeitname
+MEAL_TYPE=Typ
+#[TODO] translate
+MEAL_VIEW=Meal View
+MEALS_DATABASE=Mahlzeiten-Datenbank
+MEALS_DATABASE_DESC=<html><body>Die Mahlzeiten-Datenbank enth\u00e4lt komplette Gerichte, z.B. "McDonald's Big Mac Men\u00fc". Sie enth\u00e4lt einige Elemente der USDA-Datenbank, z.B. "Big Mac Hamburger" und "Coca-Cola".<br>Gerichte k\u00f6nnen Elemente aus allen Datenbanken enthalten.</body></html>
+MEALS_FOODS_SELECTOR=Mahlzeiten- und Lebensmittelwahl
+NEW_MEAL=Neue Mahlzeit
+NUTRITION_TYPE=N\u00e4hrstofftyp
+#[TODO] translate
+NUTRITION_TYPE_FOR_SELECTOR=Nutrition type for selector
+SELECT_ITEM=Element w\u00e4hlen
+SELECTED_ITEM=gew\u00e4hltes Element
+#[TODO] translate
+SELECTOR=Selector
+USDA_NUTRITION=USDA N\u00e4hrstoff
+USER_NUTRITION=Benutzerdefinierte N\u00e4hrstoff
+TRANSLATED_NAME_MEAL=\u00dcbersetzter Name
+TRANSLATION_KEYWORD_MEAL=Schl\u00fcsselwort f\u00fcr die \u00dcbersetzung
+WISH_TO_SAVE_EDITED_MEAL=Sie haben eine Mahlzeit ge\u00e4ndert. Wollen Sie speichen?
+WISH_TO_SAVE_NEW_MEAL=Sie haben eine neue Mahlzeit erstellt. Wollen Sie speichern?
+
+#
+# Food (User) (1)
+#
+FOOD_EDIT=Lebensmittel bearbeiten
+#[TODO] translate
+HOME_WEIGHT_ADD_DESC=Add Home Weight
+#[TODO] translate
+HOME_WEIGHT_DELETE_DESC=Delete Home Weight
+#[TODO] translate
+HOME_WEIGHT_EDIT_DESC=Edit Home Weight
+#[TODO] translate
+HOME_WEIGHT_NAME=Home Weight Name
+#[TODO] translate
+HOME_WEIGHT_SELECTOR=Home Weight Selector
+NEW_HOME_WEIGHT=Neu
+NEW_NUTR_DEF=Neu
+NUTRITION_NAME=N\u00e4hrstoffname
+#[TODO] translate
+NUTRITION_SELECTOR=Nutritions Selector
+NUTRITIONS=N\u00e4hrstoffe
+#[TODO] translate
+SELECT_HOME_WEIGHT=Select Home Weight
+SELECT_NUTRITION=N\u00e4hrstoff w\u00e4hlen
+SELECTED_NUTRITION=gew\u00e4hlter N\u00e4hrstoff
+#[TODO] translate
+SELECTED_HOME_WEIGHT=Selected Home Weight
+#[TODO] translate
+SELECTOR_HOME_WEIGHT=Selector for Home Weights
+#[TODO] translate
+SELECTOR_NUTRITION_DEFINITION=Selector for Nutritions
+#[TODO] translate
+TAG=Tag
+USER_DEFINED=Benutzerdefiniert
+WEIGHT_UNIT=Gew. Einheit
+WISH_TO_SAVE_EDITED_FOOD=Sie haben die Lebensmitteldaten ge\u00e4ndert. Wollen Sie speichern?
+WISH_TO_SAVE_NEW_FOOD=Sie haben ein neues Lebensmittel eingetragen. Wollen Sie speichern?
+
+#
+# Daily Values and Foods (1)
+#
+#[TODO] translate
+HOME_WEIGHTS_LBL=Home Weights
+WEIGHT_LBL2=Gewicht
+WEIGHT_SHORT=Gew.
+#[TODO] translate
+WEIGHT_TYPE=Weight Type
+WGHT_PER_AMOUNT=Gewicht/Menge
+
+#
+# Selector for Daily Value (1)
+#
+#[TODO] translate
+HOME_WEIGHT=Home Weight
+MEALS_FOODS_SELECTOR_DAILY=Mahlzeiten- und Lebensmittelwahl f\u00fcr den Eintrag
+NAME=Name
+NO_ITEM_SELECTED=Keine Auswahl.
+
+
+#
+# Printing Food menu (2)
+#
+#[TODO] translate
+AMOUNT_SHORT=Am.
+#[TODO] translate
+BG=BG
+#[TODO] translate
+CH=CH
+#[TODO] translate
+DATE=Date
+#[TODO] translate
+FOOD_MENU_BASE=Food Menu Base (CH only)
+#[TODO] translate
+INS=Ins
+#[TODO] translate
+PRINT_FOOD_DESC=Food Description
+#[TODO] translate
+REPORT_FOOTER=This report is from \"GGC - GNU Gluco Control\", freely available at http://ggc.sourceforge.net
+#[TODO] translate
+TIME=Time
+#[TODO] translate
+FOOD_MENU_EXT_I=Extended Food Menu I (CH,Ins)
+#[TODO] translate
+FOOD_MENU_EXT_II=Extended Food Menu II (CH,Ins,BG)
+#[TODO] translate
+FOOD_MENU_EXT_III=Extended Food Menu III (CH,Ins,BG,kJ)
+#[TODO] translate
+TOGETHER=Together
+
+
+#
+# Nutrients (2)
+#
+ALC=Alkohol, \u00c4thyl
+ASH=Asche
+CA=Kalzium, Ca
+CAFFN=Koffein
+CARTA=Karotin, alpha
+CARTB=Karotin, beta
+#[TODO] translate
+CHOCDF=Carbohydrate, by difference
+CHOLE=Cholesterin
+CU=Kupfer, Cu
+ENERC_KCAL=Energie (kcal)
+ENERC_KJ=Energie
+FAMS=Fetts\u00e4uren, einfach ges\u00e4ttigt
+FAPU=Fetts\u00e4uren, mehrfach ges\u00e4ttigt
+FASAT=Fetts\u00e4uren, ges\u00e4ttigt
+FAT=Lipide Gesamt (Fett)
+#[TODO] translate
+FATRN=Fatty acids, total trans
+#[TODO] translate
+FATRNM=Fatty acids, total trans-monoenoic
+#[TODO] translate
+FATRNP=Fatty acids, total trans-polyenoic
+FE=Eisen, Fe
+#[TODO] translate
+FIBTG=Fiber, total dietary
+FLD=Fluorid, F
+FRUS=Fruchtzucker
+#[TODO] translate
+GALS=Galactose
+GI_MAX=Glyk\u00e4mischer Index (Max)
+GI_MIN=Glyk\u00e4mischer Index (Min)
+GI=Glyk\u00e4mischer Index
+#[TODO] translate
+GL_MAX=Glycemic Load (Max)
+#[TODO] translate
+GL_MIN=Glycemic Load (Min)
+#[TODO] translate
+GL=Glycemic Load
+GLUS=Glukose (Dextrose)
+K=Kalium, K
+LACS=Laktose
+MALS=Maltose
+MG=Magnesium, Mg
+MN=Mangan, Mn
+NA=Natrium, Na
+P=Phosphor, P
+PROCNT=Eiwei\u00df
+SE=Selen, Se
+STARCH=St\u00e4rke
+SUCS=R\u00fcbenzucker
+#[TODO] translate
+SUGAR=Sugars, total
+#[TODO] translate
+TOCPHA=Vitamin E (alpha-tocopherol)
+#[TODO] translate
+VITA_IU=Vitamin A, IU
+#[TODO] translate
+VITA_RAE=Vitamin A, RAE
+VITB12=Vitamin B12
+VITB6A=Vitamin B6
+VITD-=Vitamin D
+#[TODO] translate
+VITK=Vitamin K (phylloquinone)
+WATER=Wasser
+ZN=Zink, Zn
+
+
+#
+# \u00a0Nutrients (3)
+#
+ALA_G=Alanin
+ARG_G=Arginin
+ASP_G=Asparagins\u00e4ure
+#[TODO] translate
+BETN=Betaine
+#[TODO] translate
+CAMD5=Campesterol
+#[TODO] translate
+CHOLN=Choline, total
+#[TODO] translate
+CRYPX=Cryptoxanthin, beta
+#[TODO] translate
+CYS_G=Cystine
+#[TODO] translate
+FOL=Folate, total
+FOLAC=Fols\u00e4ure
+#[TODO] translate
+FOLDFE=Folate, DFE
+#[TODO] translate
+FOLFD=Folate, food
+#[TODO] translate
+GLU_G=Glutamic acid
+#[TODO] translate
+GLY_G=Glycine
+#[TODO] translate
+HISTN_G=Histidine
+#[TODO] translate
+HYP=Hydroxyproline
+#[TODO] translate
+ILE_G=Isoleucine
+LEU_G=Leucin
+#[TODO] translate
+LUT+ZEA=Lutein + zeaxanthin
+#[TODO] translate
+LYCPN=Lycopene
+#[TODO] translate
+LYS_G=Lysine
+MET_G=Methionin
+#[TODO] translate
+NIA=Niacin
+#[TODO] translate
+PANTAC=Pantothenic acid
+PHE_G=Phenylalanin
+#[TODO] translate
+PHYSTR=Phytosterols
+PRO_G=Prolin
+#[TODO] translate
+RETOL=Retinol
+RIBF=Vitamin B2, Riboflavin
+SER_G=Serin
+#[TODO] translate
+SITSTR=Beta-sitosterol
+#[TODO] translate
+STID7=Stigmasterol
+#[TODO] translate
+THEBRN=Theobromine
+THIA=Vitamin B1, Thiamin
+THR_G=Threonin
+#[TODO] translate
+TOCPHB=Tocopherol, beta
+#[TODO] translate
+TOCPHD=Tocopherol, delta
+#[TODO] translate
+TOCPHG=Tocopherol, gamma
+#[TODO] translate
+TRP_G=Tryptophan
+TYR_G=Tyrosin
+VAL_G=Valin
+#[TODO] translate
+VITC=Vitamin C, total ascorbic acid
+
+
+#
+# \u00a0Home Weights - Translation (2,3)
+#
+#[TODO] translate
+-TO-SERVE=to serve
+#[TODO] translate
+AFTER=after
+#[TODO] translate
+AMOUNT=amount
+#[TODO] translate
+APPROX=approx
+#[TODO] translate
+AVG.=avg.
+#[TODO] translate
+BAG=bag
+#[TODO] translate
+BAR=bar
+#[TODO] translate
+BIG=big
+#[TODO] translate
+BLOCK=block
+#[TODO] translate
+BLOCKS=blocks
+BONE=Knochen
+#[TODO] translate
+BONELESS=boneless
+BOTTLE=Flasche
+#[TODO] translate
+BOX=box
+CAN=Dose
+#[TODO] translate
+CHOPPED=chopped
+#[TODO] translate
+CHUNK=chunk
+#[TODO] translate
+CHUNKS=chunks
+#[TODO] translate
+CONTAINER=container
+#[TODO] translate
+CONTENTS=contents
+#[TODO] translate
+COOK=cook
+COOKED=gekocht
+#[TODO] translate
+COOKIE=cookie
+#[TODO] translate
+COOKING=cooking
+#[TODO] translate
+CRUMBLED=crumbled
+#[TODO] translate
+CRUSHED=crushed
+CUBE=W\u00fcrfel
+CUBED=gew\u00fcrfelt
+CUBES=W\u00fcrfel
+CUBIC=kubisch
+CUP=Tasse
+#[TODO] translate
+CUPCAKE=cupcake
+#[TODO] translate
+CUPS=cups
+#[TODO] translate
+CURD=curd
+#[TODO] translate
+CUT=cut
+#[TODO] translate
+DASH=dash
+DIA=Diameter
+DIA.=Diameter
+DIAM=Diameter
+DIAM.=Diameter
+#[TODO] translate
+DIAMETER=diameter
+#[TODO] translate
+DICED=diced
+#[TODO] translate
+DRAINED=drained
+#[TODO] translate
+ENVELOPE=envelope
+#[TODO] translate
+EXTRA=extra
+#[TODO] translate
+FL=fl
+#[TODO] translate
+FLUID=fluid
+#[TODO] translate
+FOR=for
+#[TODO] translate
+FROM=from
+#[TODO] translate
+FROZEN=frozen
+#[TODO] translate
+FRUIT=fruit
+#[TODO] translate
+FRUITS=fruits
+#[TODO] translate
+G=g
+#[TODO] translate
+GROUND=ground
+#[TODO] translate
+HIGH=high
+#[TODO] translate
+IN=in
+#[TODO] translate
+IN.=in.
+#[TODO] translate
+INCH=inch
+#[TODO] translate
+INDIVIDUAL=individual
+#[TODO] translate
+INSTANT=instant
+#[TODO] translate
+ITEM=item
+#[TODO] translate
+ITEMS=items
+#[TODO] translate
+JAR=jar
+#[TODO] translate
+JUMBO=jumbo
+#[TODO] translate
+LARGE=large
+#[TODO] translate
+LB=lb
+LEAVES=Bl\u00e4tter
+LONG=lang
+#[TODO] translate
+MAKE=make
+#[TODO] translate
+MAKES=makes
+#[TODO] translate
+MASHED=mashed
+#[TODO] translate
+MEAT=meat
+#[TODO] translate
+MEDIUM=medium
+#[TODO] translate
+MELTED=melted
+#[TODO] translate
+ML=ml
+#[TODO] translate
+NET=net
+NOT=nicht
+OR=oder
+#[TODO] translate
+OUNCE=ounce
+#[TODO] translate
+OZ=oz
+#[TODO] translate
+OZ.=oz.
+#[TODO] translate
+PACK=pack
+#[TODO] translate
+PACKED=packed
+#[TODO] translate
+PACKAGE=package
+#[TODO] translate
+PACKAGES=packages
+#[TODO] translate
+PACKET=packet
+#[TODO] translate
+PAT=pat
+#[TODO] translate
+PATTY=patty
+#[TODO] translate
+PIECE=piece
+#[TODO] translate
+PIECES=pieces
+#[TODO] translate
+PKG.=pkg.
+#[TODO] translate
+POD=pod
+#[TODO] translate
+PODS=pods
+#[TODO] translate
+PORTION=portion
+#[TODO] translate
+POWDER=powder
+#[TODO] translate
+PREPARED=prepared
+#[TODO] translate
+PRODUCT=product
+#[TODO] translate
+QUART=quart
+#[TODO] translate
+RAW=raw
+#[TODO] translate
+READY=ready
+#[TODO] translate
+READY-TO=ready to
+#[TODO] translate
+READY-TO-COOK=ready to cook
+#[TODO] translate
+READY-TO-EAT=ready to eat
+#[TODO] translate
+READY-TO-SERVE=ready to serve
+#[TODO] translate
+RECIPE=recipe
+#[TODO] translate
+RECONSTITUTED=reconstituted
+#[TODO] translate
+REFRIGATED=refrigirated
+#[TODO] translate
+REFRIGERATED=refrigerated
+#[TODO] translate
+REFUSE=refuse
+#[TODO] translate
+REGULAR=regular
+#[TODO] translate
+REMOVED=removed
+#[TODO] translate
+ROLL=roll
+#[TODO] translate
+ROLLS=rolls
+#[TODO] translate
+ROOT=root
+#[TODO] translate
+SCOOP=scoop
+#[TODO] translate
+SERVING=serving
+#[TODO] translate
+SERVINGS=servings
+#[TODO] translate
+SHELLED=shelled
+#[TODO] translate
+SHREDDED=shredded
+#[TODO] translate
+SIFTED=sifted
+#[TODO] translate
+SIZE=size
+#[TODO] translate
+SKIN=skin
+#[TODO] translate
+SLICE=slice
+#[TODO] translate
+SLICED=sliced
+#[TODO] translate
+SLICES=slices
+SMALL=klein
+#[TODO] translate
+SMALLER=smaller
+#[TODO] translate
+SNACK=snack
+#[TODO] translate
+SNACK-SIZE=snack size
+#[TODO] translate
+SPRIG=sprig
+#[TODO] translate
+SPRIGS=sprigs
+SPOON=L\u00f6ffel
+#[TODO] translate
+SQ=sq
+#[TODO] translate
+STICK=stick
+#[TODO] translate
+STICKS=sticks
+#[TODO] translate
+TABLESPOON=table spoon
+#[TODO] translate
+TBS=table spoon
+#[TODO] translate
+TBSP=table spoon
+TEASPOON=Teel\u00f6ffel
+THAWED=getaut
+#[TODO] translate
+THICK=thick
+THIN=d\u00fcnn
+#[TODO] translate
+THICK.=thick.
+TO=zu
+#[TODO] translate
+TSP=tea spoon
+#[TODO] translate
+UNDILUTED=undiluted
+#[TODO] translate
+UNDRAINED=undrained
+#[TODO] translate
+UNHEATED=unheated
+#[TODO] translate
+UNIT=unit
+#[TODO] translate
+UNPACKED=unpacked
+#[TODO] translate
+UNPEELED=unpeeled
+#[TODO] translate
+UNPREPARED=unprepared
+#[TODO] translate
+UNSIFTED=unsifted
+#[TODO] translate
+UNTHAWED=unthawed
+#[TODO] translate
+WHOLE=whole
+WITH=mit
+WITHOUT=ohne
+#[TODO] translate
+WEDGE=wedge
+#[TODO] translate
+WEDGES=wedges
+WHIPPED=geschlagen
+#[TODO] translate
+WRAPPED=wrapped
+#[TODO] translate
+X=x
+#[TODO] translate
+YIELD=yield
+#[TODO] translate
+YIELDS=yields
+
+#
+# Food translations (3)
+#
+EGG=Ei
+HEADS=K\u00f6pfe
+MILK=Milch
+STEAK=Steak
Added: trunk/ggc-nutri/src/GGC_Nutrition_en.properties
===================================================================
--- trunk/ggc-nutri/src/GGC_Nutrition_en.properties (rev 0)
+++ trunk/ggc-nutri/src/GGC_Nutrition_en.properties 2009-03-21 23:51:42 UTC (rev 693)
@@ -0,0 +1,529 @@
+#
+# ######################################################################
+# ### GNU Gluco Control - Nutrition File ###
+# ######################################################################
+# ### Language: English ###
+# ### Created by: Andy Rozman (an...@tr...) ###
+# ### Last change: 23. March 2008 ###
+# ### Application Version: 0.4 ###
+# ######################################################################
+#
+# Please use this file as default language file. Do not try to translate
+# from any other files, since this is the Master language file. Create the
+# same header and specify application version number for easier changes at
+# later time.
+# Translations should be grouped by groups as specified here.
+# Older groups are done by packages, newer by logical name.
+#
+# This part is intended for nutrition only, everything that is done
+# by nutrition is here.
+#
+# In data folder there is nutrition folder containg all untranslated words
+# for both: home weights and foods. If we want to achieve full translation
+# of nutrition database, then we need to translate all words. This will be
+# done with time, but it's not priority at this time. So far most common [TODO]
+#
+# 383
+#
+# In brackets there are now tags which define urgency of some text beeing translated
+# 1 - Needed, urgent (dialogs)
+# 2 - Needed (this are mostly nutrients, home weight, which is probably nice to have translated)
+# 3 - Not so important, but nice to have
+#
+
+
+# Collation Rules - In unicode we can create special rules for sorting where we specify
+# sorting order of special characters. This will be used by tree's and special tables.
+# For english this is left empty. For all other (that have non-standarn, non english
+# charcters) we need to set this if we want sorting to be done correctly.
+#
+# COLLATION_RULES
+
+
+
+#
+# Global (1)
+#
+DELETE=Delete
+ADD=Add
+EDIT=Edit
+NEW=New
+INFORMATION=Information
+QUESTION=Question
+YES=Yes
+NO=No
+OK=OK
+CANCEL=Cancel
+APPLY=Apply
+SELECT=Select
+HELP=Help
+ROOT=Root
+
+#
+# Global Dialogs (1)
+#
+SELECT_ITEM_FIRST=Select item first, before clicking on action!
+ARE_YOU_SURE_DELETE=Are you sure you want to delete this item?
+TRANSLATED_NAME=Translated name (if available)
+ID=Id
+USDA_NUTRITION_DATABASE=USDA Nutrition Database
+USER_NUTRITION_DATABASE=User Nutrition Database
+MEALS_DATABASE=Meals Database
+USDA_NUTRITION_DATABASE_DESC=<html><body>The USDA is the United States Department of Agriculture database containing lots of food used and sold in the US. Since this database is used all around the world, we decided to incorporate it here for the user to use. The version in the database is dependent on the files that were used for import. Versions 18 and higher are allowed (tested with SR-18).<br>In this module you can see all entries of this database, and if you started it from certain other modules (like Meals) you can select food and import them.</body></html>
+USER_NUTRITION_DATABASE_DESC=<html><body>This is the nutrition database which the user can add entries to. At a later time we will support the import of foreign nutrition databases (which will then be editable), so you may take advantage of the extended folder structure (each folder can have subfolders). If, for example, you are from Germany, you can create a folder named "German Foods", in which you then put differnt groups (e.g. Microwave ready, types of foods, manufacturer, etc).</body></html>
+MEALS_DATABASE_DESC=<html><body>Meals database contains full meals. Good example would be 'McDonald's Big Mac Menu'. It contains several items from USDA database: Big Mac Hamburger, Coca-cola, etc. Meals can contain items from all databases: USDA, User or Meal database. </body></html>
+USDA_NUTRITION_DB=USDA Nutrition Db
+USER_NUTRITION_DB=User Nutrition Db
+MEALS_DB=Meals Db
+NONE=None
+NUTRITION=Nutrient
+AMOUNT_LBL=Amount
+
+
+
+
+#
+# Popup Menu (1)
+#
+PM_NUT_VIEW=View
+PM_NUT_CLOSE=Close
+PM_NUT_EDIT_GROUP=Edit Group
+PM_NUT_ADD_GROUP=Add Group
+PM_NUT_ADD_FOOD_DESCRIPTION=Add Food Description
+PM_NUT_EDIT_FOOD_DESCRIPTION=Edit Food Description
+PM_NUT_ADD_MEAL=Add Meal
+PM_NUT_EDIT_MEAL=Edit Meal
+
+
+#
+# Food (1)
+#
+NEW_FOOD=New Food
+ADD_FOOD=Add New Food
+FOOD_GROUP=Food Group
+GROUP_NAME=Name of group
+FOOD_NAME=Name of food
+REFUSE_LBL=Refuse (part which is removed)
+NUTRITIONS_FOOD=Nutrients' values
+FOOD_DESCRIPTION=Description of food
+HOME_WEIGHTS=Home weights (if defined)
+WEIGHT_TYPE=Weight type
+AMOUNT_WEIGHT=Amount & Weight
+WEIGHT=Weight (g)
+UNITS=Units
+FOOD_GROUPS=Food Groups
+MEAL_GROUPS=Meal Groups
+MEAL_GROUP=Meal Group
+SELECTED_GROUP=Selected Group
+SELECT_GROUP=Select Group
+PARENT_GROUP=Parent Group
+EDIT_MEAL_GROUP=Edit Meal Group
+ADD_MEAL_GROUP=Add Meal Group
+NEW_GROUP=New Group
+TRANSLATION_KEYWORD=Keyword for translation
+WISH_TO_SAVE_NEW_GROUP=You created a new group. Do you wish to save?
+WISH_TO_SAVE_EDITED_GROUP=You changed a group. Do you wish to save?
+ADD_FOOD_GROUP=Add Food Group
+EDIT_FOOD_GROUP=Edit Food Group
+
+#
+# Meal (1)
+#
+NUTRITION_TYPE=Nutrition Type
+SELECTED_ITEM=Selected Item
+NUTRITION_TYPE_FOR_SELECTOR=Nutrition type for selector
+SELECTOR=Selector
+USDA_NUTRITION=USDA Nutrition
+USER_NUTRITION=User-defined Nutrition
+MEAL=Meal
+SELECT_ITEM=Select Item
+MEALS_FOODS_SELECTOR=Meals, Foods Selector
+MEAL_ADD=Meal Add
+MEAL_EDIT=Meal Edit
+MEAL_NAME=Meal Name
+AVAILABLE_NUTRITIONS=Available Nutrients
+FOODS_MEALS_NUTRITIONS=Foods, Meals and/or Nutritions
+MEAL_FOOD_ADD_DESC=Add Food, Meal or Nutrition
+MEAL_FOOD_EDIT_DESC=Edit Food, Meal or Nutrition
+MEAL_FOOD_DELETE_DESC=Delete Food, Meal or Nutrition
+MEAL_TYPE=Type
+DESCRIPTION=Description
+TRANSLATION_KEYWORD_MEAL=Translation Keyword
+TRANSLATED_NAME_MEAL=Translated Name
+GROUP=Group
+WISH_TO_SAVE_NEW_MEAL=You created a new meal. Do you wish to save?
+WISH_TO_SAVE_EDITED_MEAL=You changed a meal. Do you wish to save?
+NEW_MEAL=New Meal
+CANT_SELECT_CIRCULAR_MEAL=You can't add the same meal as the one you are editing.
+CANT_SELECT_CHILD_OR_GROUP=You can't select this group or a child of this group as parent!
+MEAL_VIEW=Meal View
+MEALS_DATABASE=Meals Database
+MEALS_DATABASE_DESC=<html><body>Meals database contains full meals. A good example would be 'McDonald's Big Mac Menu'. It contains several items from USDA database: Big Mac Hamburger, Coca-Cola, etc. Meals can contain items from all databases: USDA, User or Meal. </body></html>
+ADD_MEAL=Add Meal
+
+#
+# Food (User) (1)
+#
+FOOD_EDIT=Edit Food
+SELECTED_NUTRITION=Selected Nutrient
+SELECT_NUTRITION=Select Nutrient
+SELECTED_HOME_WEIGHT=Selected Home Weight
+SELECT_HOME_WEIGHT=Select Home Weight
+NEW_NUTR_DEF=New
+WEIGHT_UNIT=W. Unit
+TAG=Tag
+SELECTOR_NUTRITION_DEFINITION=Selector for Nutrients
+NUTRITION_NAME=Name of Nutrient
+NUTRITION_SELECTOR=Nutrients Selector
+HOME_WEIGHT_SELECTOR=Home Weight Selector
+WISH_TO_SAVE_NEW_FOOD=You created a new food. Do you wish to save?
+WISH_TO_SAVE_EDITED_FOOD=You changed a food. Do you wish to save?
+NUTRITIONS=Nutrients
+SELECTOR_HOME_WEIGHT=Selector for Home Weights
+NEW_HOME_WEIGHT=New
+HOME_WEIGHT_NAME=Home Weight Name
+USER_DEFINED=User Defined
+HOME_WEIGHT_ADD_DESC=Add Home Weight
+HOME_WEIGHT_EDIT_DESC=Edit Home Weight
+HOME_WEIGHT_DELETE_DESC=Delete Home Weight
+
+#
+# Daily Values and Foods (1)
+#
+WEIGHT_LBL2=Weight
+WEIGHT_TYPE=Weight Type
+HOME_WEIGHTS_LBL=Home Weights
+WGHT_PER_AMOUNT=Weight/Amount
+WEIGHT_SHORT=Wgh.
+AMOUNT_LBL=Amount
+
+
+#
+# Selector for Daily Value (1)
+#
+MEALS_FOODS_SELECTOR_DAILY=Meals, Foods Selector for Daily Entry
+NAME=Name
+HOME_WEIGHT=Home Weight
+NO_ITEM_SELECTED=No item selected.
+
+
+#
+# Printing Food menu (2)
+#
+PRINT_FOOD_DESC=Food Description
+DATE=Date
+TIME=Time
+FOOD_MENU_BASE=Food Menu Base (CH only)
+
+FOOD_MENU_EXT_I=Extended Food Menu I (CH,Ins)
+FOOD_MENU_EXT_II=Extended Food Menu II (CH,Ins,BG)
+FOOD_MENU_EXT_III=Extended Food Menu III (CH,Ins,BG,kJ)
+
+
+REPORT_FOOTER=This report is from \"GGC - GNU Gluco Control\", freely available at http://ggc.sourceforge.net
+TOGETHER=Together
+CH=CH
+
+INS=Ins
+BG=BG
+AMOUNT_SHORT=Am.
+
+
+
+#
+# Nutrients (2)
+#
+PROCNT=Protein
+FAT=Total lipid (fat)
+CHOCDF=Carbohydrate, by difference
+ASH=Ash
+ENERC_KCAL=Energy (kcal)
+STARCH=Starch
+SUCS=Sucrose
+GLUS=Glucose (dextrose)
+FRUS=Fructose
+LACS=Lactose
+MALS=Maltose
+ALC=Alcohol, ethyl
+WATER=Water
+CAFFN=Caffeine
+GI=Glycemic Index
+GL=Glycemic Load
+GI_MIN=Glycemic Index (Min)
+GI_MAX=Glycemic Index (Max)
+GL_MIN=Glycemic Load (Min)
+GL_MAX=Glycemic Load (Max)
+ENERC_KJ=Energy
+SUGAR=Sugars, total
+GALS=Galactose
+FIBTG=Fiber, total dietary
+CA=Calcium, Ca
+FE=Iron, Fe
+MG=Magnesium, Mg
+P=Phosphorus, P
+K=Potassium, K
+NA=Sodium, Na
+ZN=Zinc, Zn
+CU=Copper, Cu
+FLD=Fluoride, F
+MN=Manganese, Mn
+SE=Selenium, Se
+VITA_IU=Vitamin A, IU
+VITA_RAE=Vitamin A, RAE
+CARTB=Carotene, beta
+CARTA=Carotene, alpha
+TOCPHA=Vitamin E (alpha-tocopherol)
+VITD-=Vitamin D
+VITB6A=Vitamin B-6
+VITB12=Vitamin B-12
+VITK=Vitamin K (phylloquinone)
+FAMS=Fatty acids, total monounsaturated
+FAPU=Fatty acids, total polyunsaturated
+CHOLE=Cholesterol
+FATRN=Fatty acids, total trans
+FASAT=Fatty acids, total saturated
+FATRNM=Fatty acids, total trans-monoenolic
+FATRNP=Fatty acids, total trans-polyenolic
+
+#
+# Nutrients (3)
+#
+FOL=Folate, total
+CHOLN=Choline, total
+THEBRN=Theobromine
+RETOL=Retinol
+CRYPX=Cryptoxanthin, beta
+LYCPN=Lycopene
+LUT+ZEA=Lutein + zeaxanthin
+TOCPHB=Tocopherol, beta
+TOCPHG=Tocopherol, gamma
+TOCPHD=Tocopherol, delta
+VITC=Vitamin C, total ascorbic acid
+THIA=Vitamin B1, Thiamin
+RIBF=Vitamin B2, Riboflavin
+NIA=Niacin
+PANTAC=Pantothenic acid
+FOLAC=Folic acid
+FOLFD=Folate, food
+FOLDFE=Folate, DFE
+BETN=Betaine
+TRP_G=Tryptophan
+THR_G=Threonine
+ILE_G=Isoleucine
+LEU_G=Leucine
+LYS_G=Lysine
+MET_G=Methionine
+CYS_G=Cystine
+PHE_G=Phenylalanine
+TYR_G=Tyrosine
+VAL_G=Valine
+ARG_G=Arginine
+HISTN_G=Histidine
+ALA_G=Alanine
+ASP_G=Aspartic acid
+GLU_G=Glutamic acid
+GLY_G=Glycine
+PRO_G=Proline
+SER_G=Serine
+HYP=Hydroxyproline
+PHYSTR=Phytosterols
+STID7=Stigmasterol
+CAMD5=Campesterol
+SITSTR=Beta-sitosterol
+
+
+
+
+#
+# Home Weights - Translation (2,3)
+#
+-TO-SERVE=to serve
+AFTER=after
+APPROX=approx
+AMOUNT=amount
+AVG.=avg.
+BLOCK=block
+BLOCKS=blocks
+BONE=bone
+BONELESS=boneless
+BOTTLE=bottle
+BAG=bag
+BAR=bar
+BIG=big
+BOX=box
+CAN=can
+CHOPPED=chopped
+CHUNK=chunk
+CHUNKS=chunks
+CONTAINER=container
+CONTENTS=contents
+COOKED=cooked
+COOKIE=cookie
+COOK=cook
+COOKING=cooking
+CRUMBLED=crumbled
+CRUSHED=crushed
+CUBED=cubed
+CUBIC=cubic
+CUT=cut
+CUBE=cube
+CUBES=cubes
+CUP=cup
+CUPCAKE=cupcake
+CUPS=cups
+CURD=curd
+DICED=diced
+DASH=dash
+DRAINED=drained
+DIA=diameter
+DIA.=diameter
+DIAM=diameter
+DIAM.=diameter
+DIAMETER=diameter
+ENVELOPE=envelope
+EXTRA=extra
+FOR=for
+FROM=from
+FROZEN=frozen
+FRUIT=fruit
+FRUITS=fruits
+FL=fl
+FLUID=fluid
+GROUND=ground
+G=g
+HIGH=high
+IN=in
+IN.=in.
+INCH=inch
+INSTANT=instant
+ITEM=item
+ITEMS=items
+INDIVIDUAL=individual
+JAR=jar
+JUMBO=jumbo
+
+
+LARGE=large
+LEAVES=leaves
+LONG=long
+LB=lb
+MAKE=make
+MASHED=mashed
+MAKES=makes
+MEDIUM=medium
+MEAT=meat
+ML=ml
+MELTED=melted
+NOT=not
+NET=net
+OUNCE=ounce
+OZ=oz
+OZ.=oz.
+OR=or
+PACK=pack
+PACKAGE=package
+PACKET=packet
+PACKAGES=packages
+PACKED=packed
+PAT=pat
+PATTY=patty
+
+PIECE=piece
+PIECES=pieces
+PKG.=pkg.
+POD=pod
+PODS=pods
+PORTION=portion
+POWDER=powder
+
+PRODUCT=product
+PREPARED=prepared
+
+QUART=quart
+
+RAW=raw
+READY=ready
+READY-TO=ready to
+READY-TO-COOK=ready to cook
+READY-TO-EAT=ready to eat
+READY-TO-SERVE=ready to serve
+RECIPE=recipe
+RECONSTITUTED=reconstituted
+
+REFRIGATED=refrigirated
+REFRIGERATED=refrigerated
+REFUSE=refuse
+REGULAR=regular
+REMOVED=removed
+
+
+ROLL=roll
+ROLLS=rolls
+ROOT=root
+SCOOP=scoop
+SERVING=serving
+SERVINGS=servings
+SHREDDED=shredded
+SHELLED=shelled
+
+SIFTED=sifted
+SIZE=size
+
+SMALL=small
+SMALLER=smaller
+SKIN=skin
+SLICE=slice
+SLICED=sliced
+SLICES=slices
+SNACK=snack
+SNACK-SIZE=snack size
+SQ=sq
+SPRIG=sprig
+SPRIGS=sprigs
+
+SPOON=spoon
+STICK=stick
+STICKS=sticks
+TABLESPOON=table spoon
+TBSP=table spoon
+TBS=table spoon
+TEASPOON=tea spoon
+TO=to
+
+TSP=tea spoon
+THAWED=thawed
+THICK=thick
+THIN=thin
+THICK.=thick.
+UNIT=unit
+UNPACKED=unpacked
+UNPEELED=unpeeled
+UNPREPARED=unprepared
+UNSIFTED=unsifted
+UNTHAWED=unthawed
+UNDILUTED=undiluted
+UNDRAINED=undrained
+UNHEATED=unheated
+
+WHOLE=whole
+WITH=with
+WITHOUT=without
+WRAPPED=wrapped
+
+WEDGE=wedge
+WEDGES=wedges
+WHIPPED=whipped
+
+YIELD=yield
+YIELDS=yields
+X=x
+
+
+
+#
+# Food translations (3)
+#
+MILK=milk
+EGG=egg
+STEAK=steak
+HEADS=heads
Added: trunk/ggc-nutri/src/GGC_Nutrition_fr.properties
===================================================================
--- trunk/ggc-nutri/src/GGC_Nutrition_fr.properties (rev 0)
+++ trunk/ggc-nutri/src/GGC_Nutrition_fr.properties 2009-03-21 23:51:42 UTC (rev 693)
@@ -0,0 +1,528 @@
+#
+# ######################################################################
+# ### GNU Gluco Control - Nutrition File ###
+# ######################################################################
+# ### Language: English ###
+# ### Created by: Andy Rozman (an...@tr...) ###
+# ### Last change: 08. December 2008 ###
+# ### Application Version: 0.4 ###
+# ######################################################################
+#
+# Please use this file as default language file. Do not try to translate
+# from any other files, since this is the Master language file. Create the
+# same header and specify application version number for easier changes at
+# later time.
+# Translations should be grouped by groups as specified here.
+# Older groups are done by packages, newer by logical name.
+#
+# This part is intended for nutrition only, everything that is done
+# by nutrition is here.
+#
+# In data folder there is nutrition folder containg all untranslated words
+# for both: home weights and foods. If we want to achieve full translation
+# of nutrition database, then we need to translate all words. This will be
+# done with time, but it's not priority at this time. So far most common [TODO]
+#
+# 383
+#
+# In brackets there are now tags which define urgency of some text beeing translated
+# 1 - Needed, urgent (dialogs)
+# 2 - Needed (this are mostly nutrients, home weight, which is probably nice to have translated)
+# 3 - Not so important, but nice to have
+#
+
+
+#
+# Collation Rules - In unicode we can create special rules for sorting where we specify
+# sorting order of special characters. This will be used by tree's and special tables.
+# For english this is left empty. For all other (that have non-standarn, non english
+# charcters) we need to set this if we want sorting to be done correctly.
+#
+COLLATION_RULES = < a,A,\u00e0,\u00c0,\u00e2,\u00c2 < b,B < c,C,\u00e7,\u00c7 < d,D <e,E,\u00e9,\u00c9,\u00e8,\u00c8,\u00ea,\u00ca,\u00eb,\u00cb < f,F < g,G < h,H < i,I,\u00ef,\u00cf < j,J < k,K < l,L < m,M < n,N < o,O,\u00f4,\u00d4 < p,P < q,Q < r,R < s,S < t,T < u,U,\u00fb,\u00db,\u00f9,\u00d9,\u00fc,\u00dc < v,V < w,W < x,X < y,Y < z,Z
+
+
+
+#
+# Global (1)
+#
+DELETE=Delete
+ADD=Add
+EDIT=Edit
+NEW=New
+INFORMATION=Information
+QUESTION=Question
+YES=Yes
+NO=No
+OK=OK
+CANCEL=Cancel
+APPLY=Apply
+SELECT=Select
+HELP=Help
+ROOT=Root
+
+#
+# Global Dialogs (1)
+#
+SELECT_ITEM_FIRST=Select item first, before clicking on action!
+ARE_YOU_SURE_DELETE=Are you sure you want to delete this item?
+TRANSLATED_NAME=Translated name (if available)
+ID=Id
+USDA_NUTRITION_DATABASE=USDA Nutrition Database
+USER_NUTRITION_DATABASE=User Nutrition Database
+MEALS_DATABASE=Meals Database
+USDA_NUTRITION_DATABASE_DESC=<html><body>The USDA is the United States Department of Agriculture database containing lots of food used and sold in the US. Since this database is used all around the world, we decided to incorporate it here for the user to use. The version in the database is dependent on the files that were used for import. Versions 18 and higher are allowed (tested with SR-18).<br>In this module you can see all entries of this database, and if you started it from certain other modules (like Meals) you can select food and import them.</body></html>
+USER_NUTRITION_DATABASE_DESC=<html><body>This is the nutrition database which the user can add entries to. At a later time we will support the import of foreign nutrition databases (which will then be editable), so you may take advantage of the extended folder structure (each folder can have subfolders). If, for example, you are from Germany, you can create a folder named "German Foods", in which you then put differnt groups (e.g. Microwave ready, types of foods, manufacturer, etc).</body></html>
+MEALS_DATABASE_DESC=<html><body>Meals database contains full meals. Good example would be 'McDonald's Big Mac Menu'. It contains several items from USDA database: Big Mac Hamburger, Coca-cola, etc. Meals can contain items from all databases: USDA, User or Meal database. </body></html>
+USDA_NUTRITION_DB=USDA Nutrition Db
+USER_NUTRITION_DB=User Nutrition Db
+MEALS_DB=Meals Db
+NONE=None
+NUTRITION=Nutrient
+AMOUNT_LBL=Amount
+
+
+
+
+#
+# Popup Menu (1)
+#
+PM_NUT_VIEW=View
+PM_NUT_CLOSE=Close
+PM_NUT_EDIT_GROUP=Edit Group
+PM_NUT_ADD_GROUP=Add Group
+PM_NUT_ADD_FOOD_DESCRIPTION=Add Food Description
+PM_NUT_EDIT_FOOD_DESCRIPTION=Edit Food Description
+PM_NUT_ADD_MEAL=Add Meal
+PM_NUT_EDIT_MEAL=Edit Meal
+
+
+#
+# Food (1)
+#
+NEW_FOOD=New Food
+ADD_FOOD=Add New Food
+FOOD_GROUP=Food Group
+GROUP_NAME=Name of group
+FOOD_NAME=Name of food
+REFUSE_LBL=Refuse (part which is removed)
+NUTRITIONS_FOOD=Nutrients' values
+FOOD_DESCRIPTION=Description of food
+HOME_WEIGHTS=Home weights (if defined)
+WEIGHT_TYPE=Weight type
+AMOUNT_WEIGHT=Amount & Weight
+WEIGHT=Weight (g)
+UNITS=Units
+FOOD_GROUPS=Food Groups
+MEAL_GROUPS=Meal Groups
+MEAL_GROUP=Meal Group
+SELECTED_GROUP=Selected Group
+SELECT_GROUP=Select Group
+PARENT_GROUP=Parent Group
+EDIT_MEAL_GROUP=Edit Meal Group
+ADD_MEAL_GROUP=Add Meal Group
+NEW_GROUP=New Group
+TRANSLATION_KEYWORD=Keyword for translation
+WISH_TO_SAVE_NEW_GROUP=You created a new group. Do you wish to save?
+WISH_TO_SAVE_EDITED_GROUP=You changed a group. Do you wish to save?
+ADD_FOOD_GROUP=Add Food Group
+EDIT_FOOD_GROUP=Edit Food Group
+
+#
+# Meal (1)
+#
+NUTRITION_TYPE=Nutrition Type
+SELECTED_ITEM=Selected Item
+NUTRITION_TYPE_FOR_SELECTOR=Nutrition type for selector
+SELECTOR=Selector
+USDA_NUTRITION=USDA Nutrition
+USER_NUTRITION=User-defined Nutrition
+MEAL=Meal
+SELECT_ITEM=Select Item
+MEALS_FOODS_SELECTOR=Meals, Foods Selector
+MEAL_ADD=Meal Add
+MEAL_EDIT=Meal Edit
+MEAL_NAME=Meal Name
+AVAILABLE_NUTRITIONS=Available Nutrients
+FOODS_MEALS_NUTRITIONS=Foods, Meals and/or Nutritions
+MEAL_FOOD_ADD_DESC=Add Food, Meal or Nutrition
+MEAL_FOOD_EDIT_DESC=Edit Food, Meal or Nutrition
+MEAL_FOOD_DELETE_DESC=Delete Food, Meal or Nutrition
+MEAL_TYPE=Type
+DESCRIPTION=Description
+TRANSLATION_KEYWORD_MEAL=Translation Keyword
+TRANSLATED_NAME_MEAL=Translated Name
+GROUP=Group
+WISH_TO_SAVE_NEW_MEAL=You created a new meal. Do you wish to save?
+WISH_TO_SAVE_EDITED_MEAL=You changed a meal. Do you wish to save?
+NEW_MEAL=New Meal
+CANT_SELECT_CIRCULAR_MEAL=You can't add the same meal as the one you are editing.
+CANT_SELECT_CHILD_OR_GROUP=You can't select this group or a child of this group as parent!
+MEAL_VIEW=Meal View
+MEALS_DATABASE=Meals Database
+MEALS_DATABASE_DESC=<html><body>Meals database contains full meals. A good example would be 'McDonald's Big Mac Menu'. It contains several items from USDA database: Big Mac Hamburger, Coca-Cola, etc. Meals can contain items from all databases: USDA, User or Meal. </body></html>
+ADD_MEAL=Add Meal
+
+#
+# Food (User) (1)
+#
+FOOD_EDIT=Edit Food
+SELECTED_NUTRITION=Selected Nutrient
+SELECT_NUTRITION=Select Nutrient
+SELECTED_HOME_WEIGHT=Selected Home Weight
+SELECT_HOME_WEIGHT=Select Home Weight
+NEW_NUTR_DEF=New
+WEIGHT_UNIT=W. Unit
+TAG=Tag
+SELECTOR_NUTRITION_DEFINITION=Selector for Nutrients
+NUTRITION_NAME=Name of Nutrient
+NUTRITION_SELECTOR=Nutrients Selector
+HOME_WEIGHT_SELECTOR=Home Weight Selector
+WISH_TO_SAVE_NEW_FOOD=You created a new food. Do you wish to save?
+WISH_TO_SAVE_EDITED_FOOD=You changed a food. Do you wish to save?
+NUTRITIONS=Nutrients
+SELECTOR_HOME_WEIGHT=Sel...
[truncated message content] |
|
From: <and...@us...> - 2009-03-25 08:21:53
|
Revision: 703
http://ggc.svn.sourceforge.net/ggc/?rev=703&view=rev
Author: andyrozman
Date: 2009-03-25 08:21:44 +0000 (Wed, 25 Mar 2009)
Log Message:
-----------
Modified Paths:
--------------
trunk/ggc-core/src/ggc/core/db/GGCDb.java
trunk/ggc-core/src/ggc/core/db/GGCDbLoader.java
trunk/ggc-core/src/ggc/core/plugins/NutriPlugIn.java
trunk/ggc-desktop/.classpath
trunk/ggc-desktop/src/ggc/gui/MainFrame.java
trunk/ggc-desktop/src/ggc/gui/StatusBar.java
trunk/ggc-nutri/src/ggc/nutri/db/GGCDbCache.java
trunk/ggc-nutri/src/ggc/nutri/db/GGCDbNutri.java
trunk/ggc-nutri/src/ggc/nutri/db/datalayer/FoodDescription.java
trunk/ggc-nutri/src/ggc/nutri/db/datalayer/FoodGroup.java
trunk/ggc-nutri/src/ggc/nutri/db/datalayer/Meal.java
trunk/ggc-nutri/src/ggc/nutri/db/datalayer/MealGroup.java
trunk/ggc-nutri/src/ggc/nutri/db/datalayer/NutritionDefinition.java
trunk/ggc-nutri/src/ggc/nutri/db/datalayer/NutritionHomeWeightType.java
trunk/ggc-nutri/src/ggc/nutri/plugin/NutriPlugInServer.java
trunk/ggc-nutri/src/ggc/nutri/util/DataAccessNutri.java
Modified: trunk/ggc-core/src/ggc/core/db/GGCDb.java
===================================================================
--- trunk/ggc-core/src/ggc/core/db/GGCDb.java 2009-03-23 07:20:06 UTC (rev 702)
+++ trunk/ggc-core/src/ggc/core/db/GGCDb.java 2009-03-25 08:21:44 UTC (rev 703)
@@ -76,8 +76,8 @@
// private String m_addId = "";
protected GGCDbConfig hib_config = null;
-
protected Configuration m_cfg = null;
+
private DataAccess m_da;
private int m_loadStatus = 0;
Modified: trunk/ggc-core/src/ggc/core/db/GGCDbLoader.java
===================================================================
--- trunk/ggc-core/src/ggc/core/db/GGCDbLoader.java 2009-03-23 07:20:06 UTC (rev 702)
+++ trunk/ggc-core/src/ggc/core/db/GGCDbLoader.java 2009-03-25 08:21:44 UTC (rev 703)
@@ -1,37 +1,6 @@
package ggc.core.db;
-
-/*
- * GGC - GNU Gluco Control
- *
- * A pure Java application to help you manage your diabetes.
- *
- * See AUTHORS for copyright information.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
- * Filename: GGCDbLoader
- *
- * Purpose: This is GGCDb Loader. It help system to load all needed data for
- * GGC Database Session.
- *
- * Author: andyrozman {an...@at...}
- */
-
-
-
+import ggc.core.plugins.NutriPlugIn;
import ggc.core.util.DataAccess;
import ggc.core.util.RefreshInfo;
@@ -236,6 +205,12 @@
*/
setDbStatus(RefreshInfo.DB_BASE_DONE);
+
+ m_da.getPlugIn(DataAccess.PLUGIN_NUTRITION).executeCommand(NutriPlugIn.COMMAND_LOAD_DATABASE);
+ setDbStatus(RefreshInfo.DB_LOADED);
+
+ //refreshMenus();
+
// if (!part_start)
{
Modified: trunk/ggc-core/src/ggc/core/plugins/NutriPlugIn.java
===================================================================
--- trunk/ggc-core/src/ggc/core/plugins/NutriPlugIn.java 2009-03-23 07:20:06 UTC (rev 702)
+++ trunk/ggc-core/src/ggc/core/plugins/NutriPlugIn.java 2009-03-25 08:21:44 UTC (rev 703)
@@ -81,6 +81,26 @@
/**
+ * Command: Load Database
+ */
+ public static final int COMMAND_LOAD_DATABASE = 4;
+
+
+
+
+ private String commands[] = {
+ "MN_NUTRI_READ_DESC",
+ "MN_NUTRI_LIST_DESC",
+ "MN_NUTRI_CONFIG_DESC",
+
+ "MN_LOAD_DATABASE_DESC",
+ "MN_NUTRI_ABOUT" };
+
+
+
+
+
+ /**
* Return Object: Selected Device with parameters
*/
public static final int RETURN_OBJECT_DEVICE_WITH_PARAMS = 1;
@@ -185,7 +205,7 @@
this.commands_will_be_done[1] = "0.5";
this.commands_will_be_done[2] = "0.5";
this.commands_will_be_done[3] = "0.5";
- this.commands_will_be_done[4] = null;
+ this.commands_will_be_done[4] = "0.5";
this.commands_will_be_done[5] = null;
this.commands_will_be_done[6] = null;
Modified: trunk/ggc-desktop/.classpath
===================================================================
--- trunk/ggc-desktop/.classpath 2009-03-23 07:20:06 UTC (rev 702)
+++ trunk/ggc-desktop/.classpath 2009-03-25 08:21:44 UTC (rev 703)
@@ -1,13 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry combineaccessrules="false" exported="true" kind="src" path="/Atech-Tools"/>
- <classpathentry excluding="**/.svn/**" kind="src" path="src"/>
+ <classpathentry combineaccessrules="false" exported="true" kind="src" path="/GGC Core"/>
<classpathentry combineaccessrules="false" exported="true" kind="src" path="/GGC Meter Tool">
<accessrules>
<accessrule kind="accessible" pattern="**/icons/**"/>
</accessrules>
</classpathentry>
<classpathentry combineaccessrules="false" exported="true" kind="src" path="/GGC Pump Tool"/>
+ <classpathentry combineaccessrules="false" exported="true" kind="src" path="/GGC Nutrition Tool"/>
+ <classpathentry excluding="**/.svn/**" kind="src" path="src"/>
<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/iText-2.0.7"/>
<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/SkinLF-6.7"/>
<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/JavaHelp-2.0.5"/>
@@ -16,7 +18,5 @@
<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/ggc-web"/>
<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/jfreechart-1.0.10"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry combineaccessrules="false" kind="src" path="/GGC Core"/>
- <classpathentry combineaccessrules="false" kind="src" path="/GGC Nutrition Tool"/>
<classpathentry kind="output" path="bin"/>
</classpath>
Modified: trunk/ggc-desktop/src/ggc/gui/MainFrame.java
===================================================================
--- trunk/ggc-desktop/src/ggc/gui/MainFrame.java 2009-03-23 07:20:06 UTC (rev 702)
+++ trunk/ggc-desktop/src/ggc/gui/MainFrame.java 2009-03-25 08:21:44 UTC (rev 703)
@@ -6,6 +6,7 @@
import ggc.core.db.tool.transfer.RestoreGGCSelectorDialog;
import ggc.core.util.DataAccess;
import ggc.core.util.I18nControl;
+import ggc.core.util.RefreshInfo;
import ggc.gui.dialogs.AboutGGCDialog;
import ggc.gui.dialogs.AppointmentsDialog;
import ggc.gui.dialogs.DailyStatsDialog;
@@ -29,7 +30,9 @@
import java.io.File;
import java.net.MalformedURLException;
import java.net.URL;
+import java.util.Enumeration;
import java.util.Hashtable;
+import java.util.Observable;
import javax.help.CSH;
import javax.help.HelpBroker;
@@ -52,6 +55,8 @@
import com.atech.graphics.graphs.GraphViewer;
import com.atech.help.HelpContext;
+import com.atech.misc.refresh.EventObserverInterface;
+import com.atech.plugin.PlugInClient;
import com.atech.update.client.UpdateDialog;
import com.l2fprod.gui.plaf.skin.SkinLookAndFeel;
@@ -82,7 +87,7 @@
*/
-public class MainFrame extends JFrame
+public class MainFrame extends JFrame implements EventObserverInterface
{
private static final long serialVersionUID = -8971779470148201332L;
@@ -207,7 +212,7 @@
// System.out.println("MainFrame before creation");
m_da = DataAccess.createInstance(this);
- // System.out.println("m_da: " + m_da);
+ System.out.println("!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! m_da: " + m_da);
m_ic = I18nControl.getInstance();
@@ -240,6 +245,9 @@
createMenus();
createToolBar();
+
+ m_da.addObserver(DataAccess.OBSERVABLE_STATUS, this);
+
/*
* addToolBarButtonWithName("view_daily");
* addToolBarButtonWithName("view_course");
@@ -321,7 +329,7 @@
this.createAction(menu_data_ratio, "MN_RATIO_BASE", "MN_RATIO_BASE_DESC", "ratio_base", null); // null);
this.createAction(menu_data_ratio, "MN_RATIO_EXTENDED", "MN_RATIO_EXTENDED_DESC", "ratio_extended", null); // null);
-
+/*
// food menu
this.menu_food = this.createMenu("MN_FOOD", null);
this.createAction(this.menu_food, "MN_NUTRDB_USDB", "MN_NUTRDB_USDB_DESC", "food_nutrition_1", null);
@@ -329,7 +337,7 @@
this.createAction(this.menu_food, "MN_NUTRDB_USER", "MN_NUTRDB_USER_DESC", "food_nutrition_2", null);
this.menu_food.addSeparator();
this.createAction(this.menu_food, "MN_MEALS", "MN_MEALS_DESC", "food_meals", null);
-
+*/
// doctors menu
this.menu_doctor = this.createMenu("MN_DOCTOR", null);
this.createAction(this.menu_doctor, "MN_DOCS", "MN_DOCS_DESC", "doc_docs", null);
@@ -412,6 +420,24 @@
this.createAction(this.menu_help, "MN_TEST", "MN_TEST_DESC", "test", null);
}
+ System.out.println("!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!");
+
+ for(Enumeration<String> en= m_da.getPlugins().keys(); en.hasMoreElements(); )
+ {
+ String key = en.nextElement();
+ System.out.println("Key=" + key);
+
+ PlugInClient pic = m_da.getPlugIn(key);
+
+ if (pic.getPlugInMainMenu()!=null)
+ {
+ this.menuBar.add(pic.getPlugInMainMenu());
+ }
+ }
+
+ System.out.println("!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!");
+
+
}
private void createToolBar()
@@ -652,10 +678,10 @@
this.actions.get("report_pdf_extended").setEnabled(false);
// food menu
- this.menu_food.setEnabled(false);
- this.actions.get("food_nutrition_1").setEnabled(false);
- this.actions.get("food_nutrition_2").setEnabled(false);
- this.actions.get("food_meals").setEnabled(false);
+ //this.menu_food.setEnabled(false);
+ //this.actions.get("food_nutrition_1").setEnabled(false);
+ //this.actions.get("food_nutrition_2").setEnabled(false);
+ //this.actions.get("food_meals").setEnabled(false);
// tools menu
this.menu_tools.setEnabled(false);
@@ -695,11 +721,12 @@
}
else if (status == StatusBar.DB_LOADED)
{
- // food menu
+/* // food menu
this.menu_food.setEnabled(true);
this.actions.get("food_nutrition_1").setEnabled(true);
this.actions.get("food_nutrition_2").setEnabled(true);
this.actions.get("food_meals").setEnabled(true);
+ */
}
/*
@@ -760,7 +787,7 @@
this.toolbar_items.get("view_freq").setEnabled(false);
this.toolbar_items.get("view_hba1c").setEnabled(false);
- this.toolbar_items.get("food_meals").setEnabled(false);
+ // this.toolbar_items.get("food_meals").setEnabled(false);
this.toolbar_items.get("report_pdf_simple").setEnabled(false);
@@ -782,7 +809,7 @@
}
else if (status == StatusBar.DB_LOADED)
{
- this.toolbar_items.get("food_meals").setEnabled(true);
+ // this.toolbar_items.get("food_meals").setEnabled(true);
}
}
@@ -1205,4 +1232,85 @@
return "MainFrame";
}
+ public void update(Observable obj, Object arg)
+ {
+ if (arg instanceof Integer)
+ {
+ Integer i = (Integer)arg;
+ setMenusByDbLoad(i.intValue());
+
+ if (i == RefreshInfo.DB_LOADED)
+ refreshMenus();
+ }
+ }
+
+
+ public void refreshMenus()
+ {
+ System.out.println("Refresh Menus: ");
+ this.menuBar.removeAll();
+
+
+ this.menuBar.add(this.menu_file);
+ this.menuBar.add(this.menu_bgs);
+
+ JMenu menu = getPlugInMenu(DataAccess.PLUGIN_NUTRITION);
+
+ if (menu!=null)
+ {
+ System.out.println("menu: " + menu);
+ this.menuBar.add(menu);
+ }
+
+
+ // doctors menu
+ this.menuBar.add(this.menu_doctor);
+
+ // reports menu
+ this.menuBar.add(this.menu_printing);
+
+ this.menuBar.add(this.menu_meters);
+ this.menuBar.add(this.menu_pumps);
+ this.menuBar.add(this.menu_cgms);
+
+ this.menuBar.add(this.menu_tools);
+ this.menuBar.add(this.menu_help);
+
+
+ this.setJMenuBar(this.menuBar);
+
+ /*
+ System.out.println("!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!");
+
+ for(Enumeration<String> en= m_da.getPlugins().keys(); en.hasMoreElements(); )
+ {
+ String key = en.nextElement();
+ System.out.println("Key=" + key);
+
+ PlugInClient pic = m_da.getPlugIn(key);
+
+ if (pic.getPlugInMainMenu()!=null)
+ {
+ this.menuBar.add(pic.getPlugInMainMenu());
+ }
+ }*/
+
+ System.out.println("!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!");
+
+ }
+
+
+ public JMenu getPlugInMenu(String name)
+ {
+ PlugInClient pic = m_da.getPlugIn(name);
+
+ System.out.println("PIC: " + pic + " = " + pic.getPlugInMainMenu());
+
+
+
+ return pic.getPlugInMainMenu();
+ }
+
+
+
}
\ No newline at end of file
Modified: trunk/ggc-desktop/src/ggc/gui/StatusBar.java
===================================================================
--- trunk/ggc-desktop/src/ggc/gui/StatusBar.java 2009-03-23 07:20:06 UTC (rev 702)
+++ trunk/ggc-desktop/src/ggc/gui/StatusBar.java 2009-03-25 08:21:44 UTC (rev 703)
@@ -174,7 +174,7 @@
public void setDbStatus(int status)
{
this.lblLed.setIcon(statusIcons[status]);
- this.m_frame.setMenusByDbLoad(status);
+ //this.m_frame.setMenusByDbLoad(status);
}
/**
@@ -193,7 +193,7 @@
*/
public void update(Observable obj, Object arg)
{
- System.out.println("update status");
+ //System.out.println("update status");
if (arg instanceof Integer)
{
Modified: trunk/ggc-nutri/src/ggc/nutri/db/GGCDbCache.java
===================================================================
--- trunk/ggc-nutri/src/ggc/nutri/db/GGCDbCache.java 2009-03-23 07:20:06 UTC (rev 702)
+++ trunk/ggc-nutri/src/ggc/nutri/db/GGCDbCache.java 2009-03-25 08:21:44 UTC (rev 703)
@@ -169,8 +169,8 @@
meals = new Hashtable<String, Hashtable<String, Meal>>();
meals.put("3", new Hashtable<String, Meal>());
+ this.tree_roots = new Hashtable<String, GGCTreeRoot>();
-
//food_groups_usda = new Hashtable<String, FoodGroup>();
//foods_usda = new Hashtable<String, FoodDescription>();
Modified: trunk/ggc-nutri/src/ggc/nutri/db/GGCDbNutri.java
===================================================================
--- trunk/ggc-nutri/src/ggc/nutri/db/GGCDbNutri.java 2009-03-23 07:20:06 UTC (rev 702)
+++ trunk/ggc-nutri/src/ggc/nutri/db/GGCDbNutri.java 2009-03-25 08:21:44 UTC (rev 703)
@@ -38,6 +38,8 @@
import org.hibernate.Session;
import org.hibernate.Transaction;
+import com.atech.db.hibernate.HibernateConfiguration;
+import com.atech.db.hibernate.HibernateDb;
import com.atech.graphics.dialogs.selector.SelectableInterface;
import com.atech.utils.ATechDate;
@@ -68,7 +70,7 @@
*/
-public class GGCDbNutri extends GGCDb
+public class GGCDbNutri extends HibernateDb //extends GGCDb
{
//public static final int DB_CONFIG_LOADED = 1;
//public static final int DB_INITIALIZED = 2;
@@ -107,6 +109,8 @@
* db_conn_username = null; protected String db_conn_password = null;
*/
+ HibernateConfiguration hib_config;
+
/**
* Constructor
*
@@ -115,7 +119,12 @@
public GGCDbNutri(GGCDb db)
{
this.hib_config = db.getHibernateConfiguration();
+
+ System.out.println("hib_Config:" + this.hib_config);
+ //this.hib_config.getS
+ cache_db = new GGCDbCache(this);
+
}
@@ -262,7 +271,7 @@
try
{
- Query q = getSession(2).createQuery("select pst from ggc.nutri.db.hibernate.FoodGroupH as pst order by pst.name");
+ Query q = getSession(2).createQuery("select pst from ggc.core.db.hibernate.FoodGroupH as pst order by pst.name");
Iterator it = q.iterate();
@@ -300,7 +309,7 @@
try
{
- Query q = getSession(2).createQuery("select pst from ggc.nutri.db.hibernate.FoodGroupH as pst where pst.id=" + id);
+ Query q = getSession(2).createQuery("select pst from ggc.core.db.hibernate.FoodGroupH as pst where pst.id=" + id);
Iterator it = q.iterate();
@@ -337,7 +346,7 @@
try
{
- Query q = getSession(2).createQuery("select pst from ggc.nutri.db.hibernate.FoodUserGroupH as pst order by pst.name");
+ Query q = getSession(2).createQuery("select pst from ggc.core.db.hibernate.FoodUserGroupH as pst order by pst.name");
Iterator it = q.iterate();
@@ -375,7 +384,7 @@
try
{
- Query q = getSession(2).createQuery("select pst from ggc.nutri.db.hibernate.FoodUserGroupH as pst order by pst.name");
+ Query q = getSession(2).createQuery("select pst from ggc.core.db.hibernate.FoodUserGroupH as pst order by pst.name");
Iterator it = q.iterate();
@@ -417,7 +426,7 @@
try
{
- Query q = getSession(2).createQuery("select pst from ggc.nutri.db.hibernate.FoodUserGroupH as pst where pst.parent_id=" + parent_id + " order by pst.name");
+ Query q = getSession(2).createQuery("select pst from ggc.core.db.hibernate.FoodUserGroupH as pst where pst.parent_id=" + parent_id + " order by pst.name");
Iterator it = q.iterate();
@@ -458,7 +467,7 @@
try
{
- Query q = getSession(2).createQuery("select pst from ggc.nutri.db.hibernate.MealGroupH as pst order by pst.name");
+ Query q = getSession(2).createQuery("select pst from ggc.core.db.hibernate.MealGroupH as pst order by pst.name");
Iterator it = q.iterate();
@@ -496,7 +505,7 @@
try
{
- Query q = getSession(2).createQuery("select pst from ggc.nutri.db.hibernate.MealGroupH as pst where pst.parent_id=" + parent_id + " order by pst.name");
+ Query q = getSession(2).createQuery("select pst from ggc.core.db.hibernate.MealGroupH as pst where pst.parent_id=" + parent_id + " order by pst.name");
Iterator it = q.iterate();
@@ -557,7 +566,7 @@
try
{
- Query q = getSession(2).createQuery("select pst from ggc.nutri.db.hibernate.FoodDescriptionH as pst order by pst.name");
+ Query q = getSession(2).createQuery("select pst from ggc.core.db.hibernate.FoodDescriptionH as pst order by pst.name");
Iterator it = q.iterate();
@@ -595,7 +604,7 @@
try
{
- Query q = getSession(2).createQuery("select pst from ggc.nutri.db.hibernate.FoodDescriptionH as pst where pst.group_id=" + parent_id + " order by pst.name");
+ Query q = getSession(2).createQuery("select pst from ggc.core.db.hibernate.FoodDescriptionH as pst where pst.group_id=" + parent_id + " order by pst.name");
Iterator it = q.iterate();
@@ -631,7 +640,7 @@
try
{
- Query q = getSession(2).createQuery("select pst from ggc.nutri.db.hibernate.FoodDescriptionH as pst where pst.id=" + id);
+ Query q = getSession(2).createQuery("select pst from ggc.core.db.hibernate.FoodDescriptionH as pst where pst.id=" + id);
Iterator it = q.iterate();
@@ -689,7 +698,7 @@
{
Query q = getSession(2).createQuery(
- "select pst from ggc.nutri.db.hibernate.FoodUserDescriptionH as pst where pst.id=" + id);
+ "select pst from ggc.core.db.hibernate.FoodUserDescriptionH as pst where pst.id=" + id);
Iterator it = q.iterate();
@@ -730,7 +739,7 @@
{
Query q = getSession(2).createQuery(
- "select pst from ggc.nutri.db.hibernate.FoodUserDescriptionH as pst where pst.group_id=" + parent_id + " order by pst.name");
+ "select pst from ggc.core.db.hibernate.FoodUserDescriptionH as pst where pst.group_id=" + parent_id + " order by pst.name");
Iterator it = q.iterate();
@@ -769,7 +778,7 @@
{
Query q = getSession(2).createQuery(
- "select pst from ggc.nutri.db.hibernate.FoodUserDescriptionH as pst order by pst.group_id, pst.name");
+ "select pst from ggc.core.db.hibernate.FoodUserDescriptionH as pst order by pst.group_id, pst.name");
Iterator it = q.iterate();
@@ -807,7 +816,7 @@
{
Query q = getSession(2).createQuery(
- "select pst from ggc.nutri.db.hibernate.MealH as pst order by pst.group_id, pst.name");
+ "select pst from ggc.core.db.hibernate.MealH as pst order by pst.group_id, pst.name");
Iterator it = q.iterate();
@@ -847,7 +856,7 @@
try
{
- Query q = getSession(2).createQuery("select pst from ggc.nutri.db.hibernate.MealH as pst where pst.id=" + meal_id);
+ Query q = getSession(2).createQuery("select pst from ggc.core.db.hibernate.MealH as pst where pst.id=" + meal_id);
Iterator it = q.iterate();
@@ -887,7 +896,7 @@
{
Query q = getSession(2).createQuery(
- "select pst from ggc.nutri.db.hibernate.MealH as pst where pst.group_id=" + parent_id + " order by pst.group_id, pst.name");
+ "select pst from ggc.core.db.hibernate.MealH as pst where pst.group_id=" + parent_id + " order by pst.group_id, pst.name");
Iterator it = q.iterate();
@@ -924,7 +933,7 @@
try
{
- Query q = getSession(2).createQuery("select pst from ggc.nutri.db.hibernate.MealH as pst where pst.id=" + id);
+ Query q = getSession(2).createQuery("select pst from ggc.core.db.hibernate.MealH as pst where pst.id=" + id);
Iterator it = q.iterate();
@@ -958,7 +967,7 @@
try
{
- Query q = getSession(2).createQuery("select pst from ggc.nutri.db.hibernate.MealGroupH as pst where pst.id=" + id);
+ Query q = getSession(2).createQuery("select pst from ggc.core.db.hibernate.MealGroupH as pst where pst.id=" + id);
Iterator it = q.iterate();
@@ -994,7 +1003,7 @@
Hashtable<String, NutritionDefinition> nut_defs = new Hashtable<String, NutritionDefinition>();
ArrayList<SelectableInterface> nut_defs_lst = new ArrayList<SelectableInterface>();
- Query q = getSession(2).createQuery("select pst from ggc.nutri.db.hibernate.NutritionDefinitionH as pst");
+ Query q = getSession(2).createQuery("select pst from ggc.core.db.hibernate.NutritionDefinitionH as pst");
Iterator it = q.iterate();
@@ -1055,7 +1064,7 @@
ArrayList<SelectableInterface> nut_hw_lst = new ArrayList<SelectableInterface>();
Query q = getSession(2)
- .createQuery("select pst from ggc.nutri.db.hibernate.NutritionHomeWeightTypeH as pst");
+ .createQuery("select pst from ggc.core.db.hibernate.NutritionHomeWeightTypeH as pst");
Iterator it = q.iterate();
@@ -1586,4 +1595,66 @@
return "ggc";
}
+
+ @Override
+ public HibernateConfiguration createConfiguration()
+ {
+ // TODO Auto-generated method stub
+ return this.hib_config;
+ }
+
+
+ protected void logException(String source, Exception ex)
+ {
+ log.error(source + "::Exception: " + ex.getMessage(), ex);
+ }
+
+ protected void logDebug(String source, String action)
+ {
+ log.debug(source + " - " + action);
+ }
+
+ protected void logInfo(String source, String action)
+ {
+ log.info(source + " - " + action);
+ }
+
+ protected void logInfo(String source)
+ {
+ log.info(source + " - Process");
+ }
+
+
+
+ /**
+ * Get Session
+ */
+ public Session getSession()
+ {
+ return getSession(1);
+ }
+
+ /**
+ * Get Session
+ *
+ * @param session_nr
+ * @return
+ */
+ public Session getSession(int session_nr)
+ {
+ return this.hib_config.getSession(session_nr);
+ /*
+ if (session_nr == 1)
+ {
+ m_session.clear();
+ return m_session;
+ }
+ else
+ {
+ m_session_2.clear();
+ return m_session_2;
+ }*/
+ }
+
+
}
Modified: trunk/ggc-nutri/src/ggc/nutri/db/datalayer/FoodDescription.java
===================================================================
--- trunk/ggc-nutri/src/ggc/nutri/db/datalayer/FoodDescription.java 2009-03-23 07:20:06 UTC (rev 702)
+++ trunk/ggc-nutri/src/ggc/nutri/db/datalayer/FoodDescription.java 2009-03-25 08:21:44 UTC (rev 703)
@@ -574,7 +574,7 @@
*/
public String getClassName()
{
- return "ggc.nutri.db.hibernate.FoodUserDescriptionH";
+ return "ggc.core.db.hibernate.FoodUserDescriptionH";
}
/**
Modified: trunk/ggc-nutri/src/ggc/nutri/db/datalayer/FoodGroup.java
===================================================================
--- trunk/ggc-nutri/src/ggc/nutri/db/datalayer/FoodGroup.java 2009-03-23 07:20:06 UTC (rev 702)
+++ trunk/ggc-nutri/src/ggc/nutri/db/datalayer/FoodGroup.java 2009-03-25 08:21:44 UTC (rev 703)
@@ -738,7 +738,7 @@
*/
public String getClassName()
{
- return "ggc.nutri.db.hibernate.FoodUserGroupH";
+ return "ggc.core.db.hibernate.FoodUserGroupH";
}
/**
Modified: trunk/ggc-nutri/src/ggc/nutri/db/datalayer/Meal.java
===================================================================
--- trunk/ggc-nutri/src/ggc/nutri/db/datalayer/Meal.java 2009-03-23 07:20:06 UTC (rev 702)
+++ trunk/ggc-nutri/src/ggc/nutri/db/datalayer/Meal.java 2009-03-25 08:21:44 UTC (rev 703)
@@ -148,7 +148,7 @@
/**
* To String
*
- * @see ggc.nutri.db.hibernate.MealH#toString()
+ * @see ggc.core.db.hibernate.MealH#toString()
*/
@Override
public String toString()
@@ -338,7 +338,7 @@
*/
public String getClassName()
{
- return "ggc.nutri.db.hibernate.MealH";
+ return "ggc.core.db.hibernate.MealH";
}
/**
Modified: trunk/ggc-nutri/src/ggc/nutri/db/datalayer/MealGroup.java
===================================================================
--- trunk/ggc-nutri/src/ggc/nutri/db/datalayer/MealGroup.java 2009-03-23 07:20:06 UTC (rev 702)
+++ trunk/ggc-nutri/src/ggc/nutri/db/datalayer/MealGroup.java 2009-03-25 08:21:44 UTC (rev 703)
@@ -313,7 +313,7 @@
/**
* To String
*
- * @see ggc.nutri.db.hibernate.MealGroupH#toString()
+ * @see ggc.core.db.hibernate.MealGroupH#toString()
*/
@Override
public String toString()
@@ -415,14 +415,14 @@
*/
public boolean DbHasChildren(Session sess) throws Exception
{
- Query q = sess.createQuery("select pst from ggc.nutri.db.hibernate.MealH as pst where pst.meal_group_id="
+ Query q = sess.createQuery("select pst from ggc.core.db.hibernate.MealH as pst where pst.meal_group_id="
+ getId());
int size = q.list().size();
if (size > 0)
return true;
- q = sess.createQuery("select pst from ggc.nutri.db.hibernate.MealGroupH as pst where pst.parent_id=" + getId());
+ q = sess.createQuery("select pst from ggc.core.db.hibernate.MealGroupH as pst where pst.parent_id=" + getId());
size = q.list().size();
if (size > 0)
@@ -553,7 +553,7 @@
*/
public String getClassName()
{
- return "ggc.nutri.db.hibernate.MealGroupH";
+ return "ggc.core.db.hibernate.MealGroupH";
}
/**
Modified: trunk/ggc-nutri/src/ggc/nutri/db/datalayer/NutritionDefinition.java
===================================================================
--- trunk/ggc-nutri/src/ggc/nutri/db/datalayer/NutritionDefinition.java 2009-03-23 07:20:06 UTC (rev 702)
+++ trunk/ggc-nutri/src/ggc/nutri/db/datalayer/NutritionDefinition.java 2009-03-25 08:21:44 UTC (rev 703)
@@ -96,7 +96,7 @@
/**
* To String
*
- * @see ggc.nutri.db.hibernate.NutritionDefinitionH#toString()
+ * @see ggc.core.db.hibernate.NutritionDefinitionH#toString()
*/
@Override
public String toString()
Modified: trunk/ggc-nutri/src/ggc/nutri/db/datalayer/NutritionHomeWeightType.java
===================================================================
--- trunk/ggc-nutri/src/ggc/nutri/db/datalayer/NutritionHomeWeightType.java 2009-03-23 07:20:06 UTC (rev 702)
+++ trunk/ggc-nutri/src/ggc/nutri/db/datalayer/NutritionHomeWeightType.java 2009-03-25 08:21:44 UTC (rev 703)
@@ -85,7 +85,7 @@
/**
* To String
*
- * @see ggc.nutri.db.hibernate.NutritionHomeWeightTypeH#toString()
+ * @see ggc.core.db.hibernate.NutritionHomeWeightTypeH#toString()
*/
@Override
public String toString()
Modified: trunk/ggc-nutri/src/ggc/nutri/plugin/NutriPlugInServer.java
===================================================================
--- trunk/ggc-nutri/src/ggc/nutri/plugin/NutriPlugInServer.java 2009-03-23 07:20:06 UTC (rev 702)
+++ trunk/ggc-nutri/src/ggc/nutri/plugin/NutriPlugInServer.java 2009-03-25 08:21:44 UTC (rev 703)
@@ -1,19 +1,27 @@
package ggc.nutri.plugin;
+import ggc.core.util.DataAccess;
+import ggc.nutri.data.GGCTreeRoot;
+import ggc.nutri.db.GGCDbNutri;
import ggc.nutri.db.datalayer.FoodDescription;
import ggc.nutri.db.datalayer.FoodGroup;
import ggc.nutri.db.datalayer.Meal;
import ggc.nutri.db.datalayer.MealGroup;
+import ggc.nutri.dialogs.NutritionTreeDialog;
import ggc.nutri.util.DataAccessNutri;
import ggc.nutri.util.I18nControl;
import java.awt.Container;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import javax.swing.JFrame;
import javax.swing.JMenu;
import com.atech.db.hibernate.transfer.BackupRestoreCollection;
import com.atech.plugin.PlugInServer;
import com.atech.utils.ATDataAccessAbstract;
+import com.atech.utils.ATSwingUtils;
/**
* Application: GGC - GNU Gluco Control
@@ -42,7 +50,7 @@
*/
-public class NutriPlugInServer extends PlugInServer
+public class NutriPlugInServer extends PlugInServer implements ActionListener
{
/**
@@ -53,15 +61,12 @@
private String commands[] = {
- "MN_PUMPS_READ_DESC",
- "MN_PUMPS_LIST_DESC",
- "MN_PUMPS_CONFIG_DESC",
+ "MN_NUTRI_READ_DESC",
+ "MN_NUTRI_LIST_DESC",
+ "MN_NUTRI_CONFIG_DESC",
- "MN_PUMP_PROFILES_DESC",
- "MN_PUMPS_MANUAL_ENTRY_DESC",
- "MN_PUMPS_ADDITIONAL_DATA_DESC",
-
- "MN_PUMPS_ABOUT" };
+ "MN_LOAD_DATABASE_DESC",
+ "MN_NUTRI_ABOUT" };
//I18nControl ic = I18nControl.getInstance();
@@ -108,6 +113,8 @@
case NutriPlugInServer.COMMAND_LOAD_DATABASE:
{
+ this.loadDb();
+
//this.
}
@@ -208,6 +215,10 @@
// da.initAllObjects();
da.loadSpecialParameters();
+ GGCDbNutri db = new GGCDbNutri(((DataAccess)m_da).getDb());
+ da.setNutriDb(db);
+
+
m_da.loadSpecialParameters();
//System.out.println("PumpServer: " + m_da.getSpecialParameters().get("BG"));
@@ -215,6 +226,15 @@
}
+ public void loadDb()
+ {
+ //GGCDbNutri db = new GGCDbNutri(((DataAccess)m_da).getDb());
+ //db.loadNutritionDatabase();
+
+ DataAccessNutri.getInstance().getNutriDb().loadNutritionDatabase();
+ }
+
+
/**
* Get Return Object
*
@@ -244,8 +264,38 @@
@Override
public JMenu getPlugInMainMenu()
{
+ // food menu
+ JMenu menu_food = ATSwingUtils.createMenu("MN_FOOD", null, ic);
+ ATSwingUtils.createMenuItem(menu_food,
+ "MN_NUTRDB_USDB",
+ "MN_NUTRDB_USDB_DESC",
+ "food_nutrition_1",
+ this, null,
+ ic, DataAccessNutri.getInstance(), parent);
+ //.createAction(this.menu_food, "MN_NUTRDB_USDB", "MN_NUTRDB_USDB_DESC", "food_nutrition_1", null);
+ menu_food.addSeparator();
+
+ ATSwingUtils.createMenuItem(menu_food,
+ "MN_NUTRDB_USER",
+ "MN_NUTRDB_USER_DESC",
+ "food_nutrition_2",
+ this, null,
+ ic, DataAccessNutri.getInstance(), parent);
+
+// this.createAction(this.menu_food, "MN_NUTRDB_USER", "MN_NUTRDB_USER_DESC", "food_nutrition_2", null);
+ menu_food.addSeparator();
+
+ ATSwingUtils.createMenuItem(menu_food,
+ "MN_MEALS",
+ "MN_MEALS_DESC",
+ "food_meals",
+ this, null,
+ ic, DataAccessNutri.getInstance(), parent);
+
+// this.createAction(this.menu_food, "MN_MEALS", "MN_MEALS_DESC", "food_meals", null);
+
// TODO Auto-generated method stub
- return null;
+ return menu_food;
}
@@ -255,6 +305,26 @@
// TODO Auto-generated method stub
return null;
}
+
+
+ public void actionPerformed(ActionEvent ae)
+ {
+ String command = ae.getActionCommand();
+
+ if (command.equals("food_nutrition_1"))
+ {
+ new NutritionTreeDialog((JFrame)parent, DataAccessNutri.getInstance(), GGCTreeRoot.TREE_USDA_NUTRITION);
+ }
+ else if (command.equals("food_nutrition_2"))
+ {
+ new NutritionTreeDialog((JFrame)parent, DataAccessNutri.getInstance(), GGCTreeRoot.TREE_USER_NUTRITION);
+ }
+ else if (command.equals("food_meals"))
+ {
+ new NutritionTreeDialog((JFrame)parent, DataAccessNutri.getInstance(), GGCTreeRoot.TREE_MEALS);
+ }
+
+ }
}
\ No newline at end of file
Modified: trunk/ggc-nutri/src/ggc/nutri/util/DataAccessNutri.java
===================================================================
--- trunk/ggc-nutri/src/ggc/nutri/util/DataAccessNutri.java 2009-03-23 07:20:06 UTC (rev 702)
+++ trunk/ggc-nutri/src/ggc/nutri/util/DataAccessNutri.java 2009-03-25 08:21:44 UTC (rev 703)
@@ -410,18 +410,24 @@
{
return DataAccess.getInstance().getDb();
}
+
+ GGCDbNutri db_nutri = null;
public GGCDbNutri getNutriDb()
{
- // TODO
- return null;
+ return db_nutri;
}
+
+ public void setNutriDb(GGCDbNutri db)
+ {
+ db_nutri = db;
+ }
+
public GGCDbCache getDbCache()
{
- // TODO
- return null;
+ return db_nutri.getDbCache();
}
@Override
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2009-04-02 08:14:07
|
Revision: 717
http://ggc.svn.sourceforge.net/ggc/?rev=717&view=rev
Author: andyrozman
Date: 2009-04-02 08:13:50 +0000 (Thu, 02 Apr 2009)
Log Message:
-----------
Modified Paths:
--------------
trunk/ggc-cgm/src/ggc/cgm/device/GenericCGM.java
trunk/ggc-core/src/ggc/core/plugins/MetersPlugIn.java
trunk/ggc-core/src/ggc/core/plugins/PumpsPlugIn.java
trunk/ggc-meter/src/ggc/meter/device/AbstractMeter.java
trunk/ggc-meter/src/ggc/meter/device/AbstractOtherMeter.java
trunk/ggc-meter/src/ggc/meter/device/AbstractSerialMeter.java
trunk/ggc-meter/src/ggc/meter/device/AbstractXmlMeter.java
trunk/ggc-meter/src/ggc/meter/device/DummyMeter.java
trunk/ggc-plugin_base/src/ggc/plugin/cfg/DeviceConfiguration.java
trunk/ggc-plugin_base/src/ggc/plugin/cfg/DeviceConfigurationDialog.java
trunk/ggc-plugin_base/src/ggc/plugin/device/DeviceInterface.java
trunk/ggc-plugin_base/src/ggc/plugin/manager/EmptyMgrDevices.java
trunk/ggc-pump/src/GGCPumpTool_en.properties
trunk/ggc-pump/src/ggc/pump/data/PumpDailyStatistics.java
trunk/ggc-pump/src/ggc/pump/data/cfg/PumpConfigurationDefinition.java
trunk/ggc-pump/src/ggc/pump/data/db/GGCPumpDb.java
trunk/ggc-pump/src/ggc/pump/data/db/PumpProfile.java
trunk/ggc-pump/src/ggc/pump/data/profile/ProfileSubEntry.java
trunk/ggc-pump/src/ggc/pump/device/AbstractPump.java
trunk/ggc-pump/src/ggc/pump/device/AbstractSerialPump.java
trunk/ggc-pump/src/ggc/pump/device/AbstractXmlPump.java
trunk/ggc-pump/src/ggc/pump/device/DummyPump.java
trunk/ggc-pump/src/ggc/pump/device/animas/EZManagerDb.java
trunk/ggc-pump/src/ggc/pump/gui/manual/PumpDataTypeComponent.java
trunk/ggc-pump/src/ggc/pump/gui/profile/ProfileEditor.java
trunk/ggc-pump/src/ggc/pump/gui/profile/ProfileSelector.java
trunk/ggc-pump/src/ggc/pump/manager/PumpManager.java
trunk/ggc-pump/src/ggc/pump/manager/company/Animas.java
trunk/ggc-pump/src/ggc/pump/manager/company/Deltec.java
trunk/ggc-pump/src/ggc/pump/manager/company/Insulet.java
trunk/ggc-pump/src/ggc/pump/manager/company/Minimed.java
trunk/ggc-pump/src/ggc/pump/manager/company/Roche.java
trunk/ggc-pump/src/ggc/pump/manager/company/Sooil.java
trunk/ggc-pump/src/ggc/pump/plugin/PumpPlugInServer.java
trunk/ggc-pump/src/ggc/pump/util/DataAccessPump.java
Added Paths:
-----------
trunk/ggc-pump/src/ggc/pump/gui/profile/ProfileSelectorPump.java
trunk/ggc-pump/src/ggc/pump/manager/company/AbstractPumpDeviceCompany.java
trunk/ggc-pump/src/ggc/pump/manager/company/GenericPumpDevice.java
Modified: trunk/ggc-cgm/src/ggc/cgm/device/GenericCGM.java
===================================================================
--- trunk/ggc-cgm/src/ggc/cgm/device/GenericCGM.java 2009-03-27 15:44:41 UTC (rev 716)
+++ trunk/ggc-cgm/src/ggc/cgm/device/GenericCGM.java 2009-04-02 08:13:50 UTC (rev 717)
@@ -494,4 +494,16 @@
return false;
}
+
+ /**
+ * Is Device Readable (there are some devices that are not actual devices, but are used to get some
+ * sort of specific device data - in most cases we call them generics, and they don't have ability
+ * to read data)
+ * @return
+ */
+ public boolean isReadableDevice()
+ {
+ return false;
+ }
+
}
Modified: trunk/ggc-core/src/ggc/core/plugins/MetersPlugIn.java
===================================================================
--- trunk/ggc-core/src/ggc/core/plugins/MetersPlugIn.java 2009-03-27 15:44:41 UTC (rev 716)
+++ trunk/ggc-core/src/ggc/core/plugins/MetersPlugIn.java 2009-04-02 08:13:50 UTC (rev 717)
@@ -216,6 +216,7 @@
private void refreshPanels(int mask)
{
+ DataAccess.getInstance().setChangeOnEventSource(DataAccess.OBSERVABLE_PANELS, mask);
//MainFrame mf = (MainFrame)parent;
//mf.informationPanel.refreshGroup(mask);
//
Modified: trunk/ggc-core/src/ggc/core/plugins/PumpsPlugIn.java
===================================================================
--- trunk/ggc-core/src/ggc/core/plugins/PumpsPlugIn.java 2009-03-27 15:44:41 UTC (rev 716)
+++ trunk/ggc-core/src/ggc/core/plugins/PumpsPlugIn.java 2009-04-02 08:13:50 UTC (rev 717)
@@ -172,7 +172,7 @@
this.commands_implemented = new boolean[7];
this.commands_implemented[0] = false;
this.commands_implemented[1] = true;
- this.commands_implemented[2] = false;
+ this.commands_implemented[2] = true;
this.commands_implemented[3] = true;
this.commands_implemented[4] = true;
this.commands_implemented[5] = true;
@@ -229,9 +229,6 @@
else if (command.equals("pumps_config"))
{
this.executeCommand(PumpsPlugIn.COMMAND_CONFIGURATION);
-
-
-
refreshPanels(RefreshInfo.PANEL_GROUP_PLUGINS_DEVICES);
}
else if (command.equals("pumps_about"))
@@ -246,6 +243,9 @@
}
+
+
+
/**
* Get When Will Be Implemented
*
@@ -299,11 +299,12 @@
private void refreshPanels(int mask)
{
-// MainFrame mf = (MainFrame)parent;
-// mf.informationPanel.refreshGroup(mask);
+ DataAccess.getInstance().setChangeOnEventSource(DataAccess.OBSERVABLE_PANELS, mask);
+ //MainFrame mf = (MainFrame)parent;
+ //mf.informationPanel.refreshGroup(mask);
+ //
}
-
/**
* Set Return Data (for getting data from plugin - async)
*
Modified: trunk/ggc-meter/src/ggc/meter/device/AbstractMeter.java
===================================================================
--- trunk/ggc-meter/src/ggc/meter/device/AbstractMeter.java 2009-03-27 15:44:41 UTC (rev 716)
+++ trunk/ggc-meter/src/ggc/meter/device/AbstractMeter.java 2009-04-02 08:13:50 UTC (rev 717)
@@ -193,7 +193,7 @@
}
- String device_columns[] = { ic.getMessage("METER_COMPANY"), ic.getMessage("METER_DEVICE"), ic.getMessage("DEVICE_CONNECTION") };
+ String device_columns[] = { ic.getMessage("DEVICE_COMPANY"), ic.getMessage("DEVICE_DEVICE"), ic.getMessage("DEVICE_CONNECTION") };
/**
* getColumnName
Modified: trunk/ggc-meter/src/ggc/meter/device/AbstractOtherMeter.java
===================================================================
--- trunk/ggc-meter/src/ggc/meter/device/AbstractOtherMeter.java 2009-03-27 15:44:41 UTC (rev 716)
+++ trunk/ggc-meter/src/ggc/meter/device/AbstractOtherMeter.java 2009-04-02 08:13:50 UTC (rev 717)
@@ -435,5 +435,15 @@
}
+ /**
+ * Is Device Readable (there are some devices that are not actual devices, but are used to get some
+ * sort of specific device data - in most cases we call them generics, and they don't have ability
+ * to read data)
+ * @return
+ */
+ public boolean isReadableDevice()
+ {
+ return false;
+ }
}
Modified: trunk/ggc-meter/src/ggc/meter/device/AbstractSerialMeter.java
===================================================================
--- trunk/ggc-meter/src/ggc/meter/device/AbstractSerialMeter.java 2009-03-27 15:44:41 UTC (rev 716)
+++ trunk/ggc-meter/src/ggc/meter/device/AbstractSerialMeter.java 2009-04-02 08:13:50 UTC (rev 717)
@@ -476,4 +476,16 @@
return this.device_company;
}
+
+ /**
+ * Is Device Readable (there are some devices that are not actual devices, but are used to get some
+ * sort of specific device data - in most cases we call them generics, and they don't have ability
+ * to read data)
+ * @return
+ */
+ public boolean isReadableDevice()
+ {
+ return true;
+ }
+
}
Modified: trunk/ggc-meter/src/ggc/meter/device/AbstractXmlMeter.java
===================================================================
--- trunk/ggc-meter/src/ggc/meter/device/AbstractXmlMeter.java 2009-03-27 15:44:41 UTC (rev 716)
+++ trunk/ggc-meter/src/ggc/meter/device/AbstractXmlMeter.java 2009-04-02 08:13:50 UTC (rev 717)
@@ -426,6 +426,18 @@
{
return this.communication_established;
}
+
+ /**
+ * Is Device Readable (there are some devices that are not actual devices, but are used to get some
+ * sort of specific device data - in most cases we call them generics, and they don't have ability
+ * to read data)
+ * @return
+ */
+ public boolean isReadableDevice()
+ {
+ return true;
+ }
+
}
Modified: trunk/ggc-meter/src/ggc/meter/device/DummyMeter.java
===================================================================
--- trunk/ggc-meter/src/ggc/meter/device/DummyMeter.java 2009-03-27 15:44:41 UTC (rev 716)
+++ trunk/ggc-meter/src/ggc/meter/device/DummyMeter.java 2009-04-02 08:13:50 UTC (rev 717)
@@ -355,5 +355,17 @@
return false;
}
+
+ /**
+ * Is Device Readable (there are some devices that are not actual devices, but are used to get some
+ * sort of specific device data - in most cases we call them generics, and they don't have ability
+ * to read data)
+ * @return
+ */
+ public boolean isReadableDevice()
+ {
+ return false;
+ }
+
}
Modified: trunk/ggc-plugin_base/src/ggc/plugin/cfg/DeviceConfiguration.java
===================================================================
--- trunk/ggc-plugin_base/src/ggc/plugin/cfg/DeviceConfiguration.java 2009-03-27 15:44:41 UTC (rev 716)
+++ trunk/ggc-plugin_base/src/ggc/plugin/cfg/DeviceConfiguration.java 2009-04-02 08:13:50 UTC (rev 717)
@@ -242,6 +242,8 @@
sb.append("SELECTED_" + this.dcd.getDevicePrefix() + "=" + this.default_device + "\n");
+ System.out.println("Device Ebtries: " + this.device_entries);
+
for(int i=1; i<21; i++)
{
if (this.device_entries.containsKey("" + i))
Modified: trunk/ggc-plugin_base/src/ggc/plugin/cfg/DeviceConfigurationDialog.java
===================================================================
--- trunk/ggc-plugin_base/src/ggc/plugin/cfg/DeviceConfigurationDialog.java 2009-03-27 15:44:41 UTC (rev 716)
+++ trunk/ggc-plugin_base/src/ggc/plugin/cfg/DeviceConfigurationDialog.java 2009-04-02 08:13:50 UTC (rev 717)
@@ -103,7 +103,6 @@
m_da.addComponent(this);
- setSize(450,600);
setTitle(String.format(m_ic.getMessage("DEVICE_CONFIGURATION"), m_ic.getMessage("DEVICE_NAME_BIG")));
m_da.centerJDialog(this, m_da.getCurrentComponentParent());
@@ -257,40 +256,49 @@
this.comm_port_comp = new CommunicationPortComponent(m_da, this);
pan_meter.add(this.comm_port_comp);
-
- // timezone fix panel
- JPanel pan_tzfix = ATSwingUtils.getPanel(20, 295, 410, 200, null, new TitledBorder(m_ic.getMessage("TIMEZONE_CONFIGURATION")), main_panel);
+ int start_y = 320;
- ATSwingUtils.getLabel(m_ic.getMessage("SELECT_TIMEZONE_LIST") + ":", 25,25, 450, 25, pan_tzfix, ATSwingUtils.FONT_NORMAL_BOLD);
+ if (this.dcd.doesDeviceSupportTimeFix())
+ {
- cb_timezone = ATSwingUtils.getComboBox(DeviceConfigurationDialog.time_zones_vector, 25, 50, 370, 25, pan_tzfix, ATSwingUtils.FONT_NORMAL);
+ // timezone fix panel
+ JPanel pan_tzfix = ATSwingUtils.getPanel(20, 295, 410, 200, null, new TitledBorder(m_ic.getMessage("TIMEZONE_CONFIGURATION")), main_panel);
+
+ ATSwingUtils.getLabel(m_ic.getMessage("SELECT_TIMEZONE_LIST") + ":", 25,25, 450, 25, pan_tzfix, ATSwingUtils.FONT_NORMAL_BOLD);
+
+ cb_timezone = ATSwingUtils.getComboBox(DeviceConfigurationDialog.time_zones_vector, 25, 50, 370, 25, pan_tzfix, ATSwingUtils.FONT_NORMAL);
+
+ chb_fix = ATSwingUtils.getCheckBox(" " + m_ic.getMessage("NEED_DAYLIGHTSAVING_FIX"), 25, 90, 380, 25, pan_tzfix, ATSwingUtils.FONT_NORMAL_BOLD);
+ chb_fix.addChangeListener(this);
+ chb_fix.setSelected(false);
+
+ String[] changes = { "-1", "0", "+1" };
+
+ ATSwingUtils.getLabel(m_ic.getMessage("WINTERTIME_FIX") + ":", 40,120, 200, 25, pan_tzfix, ATSwingUtils.FONT_NORMAL_BOLD);
+
+ this.cb_winter_fix = ATSwingUtils.getComboBox(changes, 240, 120, 80, 25, pan_tzfix, ATSwingUtils.FONT_NORMAL);
+ this.cb_winter_fix.setSelectedIndex(1);
+
+ ATSwingUtils.getLabel(m_ic.getMessage("SUMMERTIME_FIX") + ":", 40, 155, 200, 25, pan_tzfix, ATSwingUtils.FONT_NORMAL_BOLD);
+
+ this.cb_summer_fix = ATSwingUtils.getComboBox(changes, 240, 155, 80, 25, pan_tzfix, ATSwingUtils.FONT_NORMAL);
+ this.cb_summer_fix.setSelectedIndex(1);
+
+ start_y = 510;
- chb_fix = ATSwingUtils.getCheckBox(" " + m_ic.getMessage("NEED_DAYLIGHTSAVING_FIX"), 25, 90, 380, 25, pan_tzfix, ATSwingUtils.FONT_NORMAL_BOLD);
- chb_fix.addChangeListener(this);
- chb_fix.setSelected(false);
-
- String[] changes = { "-1", "0", "+1" };
+ enableDisableFix(false);
+ }
- ATSwingUtils.getLabel(m_ic.getMessage("WINTERTIME_FIX") + ":", 40,120, 200, 25, pan_tzfix, ATSwingUtils.FONT_NORMAL_BOLD);
- this.cb_winter_fix = ATSwingUtils.getComboBox(changes, 240, 120, 80, 25, pan_tzfix, ATSwingUtils.FONT_NORMAL);
- this.cb_winter_fix.setSelectedIndex(1);
-
- ATSwingUtils.getLabel(m_ic.getMessage("SUMMERTIME_FIX") + ":", 40, 155, 200, 25, pan_tzfix, ATSwingUtils.FONT_NORMAL_BOLD);
-
- this.cb_summer_fix = ATSwingUtils.getComboBox(changes, 240, 155, 80, 25, pan_tzfix, ATSwingUtils.FONT_NORMAL);
- this.cb_summer_fix.setSelectedIndex(1);
-
- ATSwingUtils.getButton(" " + m_ic.getMessage("OK"), 50, 510, 110, 25,
+ ATSwingUtils.getButton(" " + m_ic.getMessage("OK"), 50, start_y, 110, 25,
main_panel, ATSwingUtils.FONT_NORMAL, "ok.png", "ok", this, m_da);
- ATSwingUtils.getButton(" " + m_ic.getMessage("CANCEL"), 170, 510, 110, 25,
+ ATSwingUtils.getButton(" " + m_ic.getMessage("CANCEL"), 170, start_y, 110, 25,
main_panel, ATSwingUtils.FONT_NORMAL, "cancel.png", "cancel", this, m_da);
- help_button = m_da.createHelpButtonByBounds(290, 510, 110, 25, this, ATSwingUtils.FONT_NORMAL); //ATDataAccessAbstract.FONT_NORMAL);
+ help_button = m_da.createHelpButtonByBounds(290, start_y, 110, 25, this, ATSwingUtils.FONT_NORMAL); //ATDataAccessAbstract.FONT_NORMAL);
main_panel.add(help_button);
- enableDisableFix(false);
//this.cb_entry.setSelectedItem(this.first_selected);
@@ -303,7 +311,8 @@
{
this.tf_name.setText("My " + m_ic.getMessage("DEVICE_NAME_BIG") + " #1");
}
-
+
+ setSize(450, start_y + 90);
getContentPane().add(main_panel, null);
}
@@ -585,15 +594,15 @@
dce.device_device = this.lbl_device.getText();
dce.communication_port = this.comm_port_comp.getCommunicationPort();
- if (!dcd.doesDeviceSupportTimeFix())
- return;
-
- dce.ds_area_long = (String)this.cb_timezone.getSelectedItem();
- dce.ds_area = DeviceConfigurationDialog.time_zones.get((String)this.cb_timezone.getSelectedItem());
- dce.ds_fix = this.chb_fix.isSelected();
-
- dce.ds_summer_change = getNumber((String)this.cb_summer_fix.getSelectedItem());
- dce.ds_winter_change = getNumber((String)this.cb_winter_fix.getSelectedItem());
+ if (dcd.doesDeviceSupportTimeFix())
+ {
+ dce.ds_area_long = (String)this.cb_timezone.getSelectedItem();
+ dce.ds_area = DeviceConfigurationDialog.time_zones.get((String)this.cb_timezone.getSelectedItem());
+ dce.ds_fix = this.chb_fix.isSelected();
+
+ dce.ds_summer_change = getNumber((String)this.cb_summer_fix.getSelectedItem());
+ dce.ds_winter_change = getNumber((String)this.cb_winter_fix.getSelectedItem());
+ }
if (this.current_index_object.startsWith(m_ic.getMessage("NEW__")))
{
Modified: trunk/ggc-plugin_base/src/ggc/plugin/device/DeviceInterface.java
===================================================================
--- trunk/ggc-plugin_base/src/ggc/plugin/device/DeviceInterface.java 2009-03-27 15:44:41 UTC (rev 716)
+++ trunk/ggc-plugin_base/src/ggc/plugin/device/DeviceInterface.java 2009-04-02 08:13:50 UTC (rev 717)
@@ -295,5 +295,12 @@
+ /**
+ * Is Device Readable (there are some devices that are not actual devices, but are used to get some
+ * sort of specific device data - in most cases we call them generics, and they don't have ability
+ * to read data)
+ * @return
+ */
+ public boolean isReadableDevice();
}
Modified: trunk/ggc-plugin_base/src/ggc/plugin/manager/EmptyMgrDevices.java
===================================================================
--- trunk/ggc-plugin_base/src/ggc/plugin/manager/EmptyMgrDevices.java 2009-03-27 15:44:41 UTC (rev 716)
+++ trunk/ggc-plugin_base/src/ggc/plugin/manager/EmptyMgrDevices.java 2009-04-02 08:13:50 UTC (rev 717)
@@ -451,5 +451,16 @@
return true;
}
+
+ /**
+ * Is Device Readable (there are some devices that are not actual devices, but are used to get some
+ * sort of specific device data - in most cases we call them generics, and they don't have ability
+ * to read data)
+ * @return
+ */
+ public boolean isReadableDevice()
+ {
+ return false;
+ }
}
Modified: trunk/ggc-pump/src/GGCPumpTool_en.properties
===================================================================
--- trunk/ggc-pump/src/GGCPumpTool_en.properties 2009-03-27 15:44:41 UTC (rev 716)
+++ trunk/ggc-pump/src/GGCPumpTool_en.properties 2009-04-02 08:13:50 UTC (rev 717)
@@ -90,6 +90,7 @@
#
DEVICE_NAME_NORMAL=pump
DEVICE_NAME_BIG=Pump
+DEVICE_FULL_NAME_WITHOUT_PORT=%s
DEVICE_FULL_NAME_WITH_PORT=%s on %s
@@ -507,6 +508,8 @@
FROM=From
TILL=Till
NEW__PROFILE=New
+NAME_OF_PROFILE=Name of Profile
+PUMP_PROFILE_SELECTOR=Profile Selector (Pump)
Modified: trunk/ggc-pump/src/ggc/pump/data/PumpDailyStatistics.java
===================================================================
--- trunk/ggc-pump/src/ggc/pump/data/PumpDailyStatistics.java 2009-03-27 15:44:41 UTC (rev 716)
+++ trunk/ggc-pump/src/ggc/pump/data/PumpDailyStatistics.java 2009-04-02 08:13:50 UTC (rev 717)
@@ -1,5 +1,6 @@
package ggc.pump.data;
+import ggc.pump.data.defs.PumpBasalSubType;
import ggc.pump.data.defs.PumpBaseType;
import ggc.pump.util.DataAccessPump;
@@ -91,6 +92,10 @@
for(int i=0; i<lst.size(); i++)
{
PumpValuesEntry pve = lst.get(i);
+
+ if ((pve.base_type == PumpBaseType.PUMP_DATA_BASAL) &&
+ (pve.sub_type == PumpBasalSubType.PUMP_BASAL_PROFILE))
+ continue;
if ((i+1)==lst.size())
{
Modified: trunk/ggc-pump/src/ggc/pump/data/cfg/PumpConfigurationDefinition.java
===================================================================
--- trunk/ggc-pump/src/ggc/pump/data/cfg/PumpConfigurationDefinition.java 2009-03-27 15:44:41 UTC (rev 716)
+++ trunk/ggc-pump/src/ggc/pump/data/cfg/PumpConfigurationDefinition.java 2009-04-02 08:13:50 UTC (rev 717)
@@ -57,7 +57,7 @@
*/
public boolean doesDeviceSupportTimeFix()
{
- return true;
+ return false;
}
Modified: trunk/ggc-pump/src/ggc/pump/data/db/GGCPumpDb.java
===================================================================
--- trunk/ggc-pump/src/ggc/pump/data/db/GGCPumpDb.java 2009-03-27 15:44:41 UTC (rev 716)
+++ trunk/ggc-pump/src/ggc/pump/data/db/GGCPumpDb.java 2009-04-02 08:13:50 UTC (rev 717)
@@ -237,6 +237,11 @@
}
+ /**
+ * Get Profiles
+ *
+ * @return
+ */
public ArrayList<PumpProfile> getProfiles()
{
Modified: trunk/ggc-pump/src/ggc/pump/data/db/PumpProfile.java
===================================================================
--- trunk/ggc-pump/src/ggc/pump/data/db/PumpProfile.java 2009-03-27 15:44:41 UTC (rev 716)
+++ trunk/ggc-pump/src/ggc/pump/data/db/PumpProfile.java 2009-04-02 08:13:50 UTC (rev 717)
@@ -59,6 +59,16 @@
*/
public PumpProfile()
{
+ this.setId(0L);
+ this.setName("");
+ this.setBasal_base(0.0f);
+ this.setBasal_diffs("");
+ this.setActive_from(0L);
+ this.setActive_till(-1L);
+ this.setExtended("");
+ this.setPerson_id(0);
+ this.setComment("");
+ this.setChanged(0L);
}
@@ -549,7 +559,10 @@
return this.getName();
case 2:
- return ATechDate.getDateTimeString(ATechDate.FORMAT_DATE_AND_TIME_MIN, this.getActive_till());
+ if (this.getActive_till() <= 0)
+ return "";
+ else
+ return ATechDate.getDateTimeString(ATechDate.FORMAT_DATE_AND_TIME_MIN, this.getActive_till());
default:
return ATechDate.getDateTimeString(ATechDate.FORMAT_DATE_AND_TIME_MIN, this.getActive_from());
@@ -566,7 +579,10 @@
return this.getName();
case 2:
- return ATechDate.getDateTimeString(ATechDate.FORMAT_DATE_AND_TIME_MIN, this.getActive_till());
+ if (this.getActive_till() <= 0)
+ return "";
+ else
+ return ATechDate.getDateTimeString(ATechDate.FORMAT_DATE_AND_TIME_MIN, this.getActive_till());
default:
return ATechDate.getDateTimeString(ATechDate.FORMAT_DATE_AND_TIME_MIN, this.getActive_from());
Modified: trunk/ggc-pump/src/ggc/pump/data/profile/ProfileSubEntry.java
===================================================================
--- trunk/ggc-pump/src/ggc/pump/data/profile/ProfileSubEntry.java 2009-03-27 15:44:41 UTC (rev 716)
+++ trunk/ggc-pump/src/ggc/pump/data/profile/ProfileSubEntry.java 2009-04-02 08:13:50 UTC (rev 717)
@@ -2,10 +2,12 @@
import ggc.pump.util.DataAccessPump;
+import java.util.Comparator;
+
import com.atech.utils.ATechDate;
-public class ProfileSubEntry
+public class ProfileSubEntry implements Comparable<ProfileSubEntry> // Comparator<ProfileSubEntry>
{
public int time_start;
public int time_end;
@@ -45,6 +47,19 @@
{
return ATechDate.getTimeString(ATechDate.FORMAT_TIME_ONLY_MIN, time_start) + " - " + ATechDate.getTimeString(ATechDate.FORMAT_TIME_ONLY_MIN, time_end) + " = " + DataAccessPump.Decimal2Format.format(amount);
}
+
+ public int compare(ProfileSubEntry pse1, ProfileSubEntry pse2)
+ {
+ if (pse1.time_start == pse2.time_start)
+ return (pse1.time_end - pse2.time_end);
+ else
+ return (pse1.time_start - pse2.time_start);
+ }
+
+ public int compareTo(ProfileSubEntry arg0)
+ {
+ return compare(this, arg0);
+ }
}
Modified: trunk/ggc-pump/src/ggc/pump/device/AbstractPump.java
===================================================================
--- trunk/ggc-pump/src/ggc/pump/device/AbstractPump.java 2009-03-27 15:44:41 UTC (rev 716)
+++ trunk/ggc-pump/src/ggc/pump/device/AbstractPump.java 2009-04-02 08:13:50 UTC (rev 717)
@@ -51,6 +51,8 @@
protected OutputWriter m_output_writer = null;
+ protected String[] profile_names = null;
+
/**
* Constructor
@@ -238,10 +240,11 @@
}
- String device_columns[] = { ic.getMessage("METER_COMPANY"), ic.getMessage("METER_DEVICE"), ic.getMessage("DEVICE_CONNECTION") };
+ String device_columns[] = { ic.getMessage("DEVICE_COMPANY"), ic.getMessage("DEVICE_DEVICE"), ic.getMessage("DEVICE_CONNECTION") };
+
/**
- * Get Column Name
+ * getColumnName
*/
public String getColumnName(int num)
{
@@ -250,26 +253,29 @@
/**
- * Get Column Value
+ * getColumnValue
*/
public String getColumnValue(int num)
{
+ System.out.println("num:" + num);
switch(num)
{
- case 1:
+ case 2:
return this.getName();
- case 2:
+ case 3:
return this.getDeviceCompany().getConnectionSamples();
- case 0:
+ case 1:
default:
return this.getDeviceCompany().getName();
}
}
+
+
/**
@@ -372,4 +378,10 @@
}
+ public String[] getProfileNames()
+ {
+ return this.profile_names;
+ }
+
+
}
Modified: trunk/ggc-pump/src/ggc/pump/device/AbstractSerialPump.java
===================================================================
--- trunk/ggc-pump/src/ggc/pump/device/AbstractSerialPump.java 2009-03-27 15:44:41 UTC (rev 716)
+++ trunk/ggc-pump/src/ggc/pump/device/AbstractSerialPump.java 2009-04-02 08:13:50 UTC (rev 717)
@@ -526,5 +526,15 @@
}
+ /**
+ * Is Device Readable (there are some devices that are not actual devices, but are used to get some
+ * sort of specific device data - in most cases we call them generics, and they don't have ability
+ * to read data)
+ * @return
+ */
+ public boolean isReadableDevice()
+ {
+ return true;
+ }
}
Modified: trunk/ggc-pump/src/ggc/pump/device/AbstractXmlPump.java
===================================================================
--- trunk/ggc-pump/src/ggc/pump/device/AbstractXmlPump.java 2009-03-27 15:44:41 UTC (rev 716)
+++ trunk/ggc-pump/src/ggc/pump/device/AbstractXmlPump.java 2009-04-02 08:13:50 UTC (rev 717)
@@ -478,6 +478,16 @@
}
+ /**
+ * Is Device Readable (there are some devices that are not actual devices, but are used to get some
+ * sort of specific device data - in most cases we call them generics, and they don't have ability
+ * to read data)
+ * @return
+ */
+ public boolean isReadableDevice()
+ {
+ return true;
+ }
}
Modified: trunk/ggc-pump/src/ggc/pump/device/DummyPump.java
===================================================================
--- trunk/ggc-pump/src/ggc/pump/device/DummyPump.java 2009-03-27 15:44:41 UTC (rev 716)
+++ trunk/ggc-pump/src/ggc/pump/device/DummyPump.java 2009-04-02 08:13:50 UTC (rev 717)
@@ -1,8 +1,15 @@
package ggc.pump.device;
+import java.util.Hashtable;
+
+import ggc.plugin.device.DeviceIdentification;
+import ggc.plugin.device.PlugInBaseException;
+import ggc.plugin.manager.company.AbstractDeviceCompany;
import ggc.plugin.output.OutputWriter;
import ggc.pump.util.DataAccessPump;
+import com.atech.graphics.dialogs.selector.ColumnSorter;
+import com.atech.graphics.dialogs.selector.SelectableInterface;
import com.atech.i18n.I18nControlAbstract;
/**
@@ -32,7 +39,7 @@
*/
-public class DummyPump //extends GenericPump //implements MeterInterface
+public class DummyPump extends AbstractPump //implements PumpInterface //extends GenericPump //implements MeterInterface
{
DataAccessPump m_da = DataAccessPump.getInstance();
@@ -195,7 +202,162 @@
+ /**
+ * Is Device Readable (there are some devices that are not actual devices, but are used to get some
+ * sort of specific device data - in most cases we call them generics, and they don't have ability
+ * to read data)
+ * @return
+ */
+ public boolean isReadableDevice()
+ {
+ return false;
+ }
+ public Hashtable<String, Integer> getAlarmMappings()
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+ public Hashtable<String, Integer> getBolusMappings()
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+ public DeviceIdentification getDeviceInfo()
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public Hashtable<String, Integer> getErrorMappings()
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public Hashtable<String, Integer> getEventMappings()
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public int getMaxMemoryRecords()
+ {
+ // TODO Auto-generated method stub
+ return 0;
+ }
+
+ public Hashtable<String, Integer> getReportMappings()
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public void loadPumpSpecificValues()
+ {
+ // TODO Auto-generated method stub
+
+ }
+
+ public void dispose()
+ {
+ // TODO Auto-generated method stub
+
+ }
+
+ public String getComment()
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public String getConnectionPort()
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public int getConnectionProtocol()
+ {
+ // TODO Auto-generated method stub
+ return 0;
+ }
+
+ public String getDeviceClassName()
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public int getDeviceId()
+ {
+ // TODO Auto-generated method stub
+ return 0;
+ }
+
+ public String getDeviceSpecialComment()
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public String getIconName()
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public int getImplementationStatus()
+ {
+ // TODO Auto-generated method stub
+ return 0;
+ }
+
+ public String getInstructions()
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public boolean hasSpecialProgressStatus()
+ {
+ // TODO Auto-generated method stub
+ return false;
+ }
+
+ public boolean isDeviceCommunicating()
+ {
+ // TODO Auto-generated method stub
+ return false;
+ }
+
+ public void readConfiguration() throws PlugInBaseException
+ {
+ // TODO Auto-generated method stub
+
+ }
+
+ public void readDeviceDataFull() throws PlugInBaseException
+ {
+ // TODO Auto-generated method stub
+
+ }
+
+ public void readDeviceDataPartitial() throws PlugInBaseException
+ {
+ // TODO Auto-generated method stub
+
+ }
+
+ public void readInfo() throws PlugInBaseException
+ {
+ // TODO Auto-generated method stub
+
+ }
+
+
+
+
}
Modified: trunk/ggc-pump/src/ggc/pump/device/animas/EZManagerDb.java
===================================================================
--- trunk/ggc-pump/src/ggc/pump/device/animas/EZManagerDb.java 2009-03-27 15:44:41 UTC (rev 716)
+++ trunk/ggc-pump/src/ggc/pump/device/animas/EZManagerDb.java 2009-04-02 08:13:50 UTC (rev 717)
@@ -315,6 +315,16 @@
+ /**
+ * Is Device Readable (there are some devices that are not actual devices, but are used to get some
+ * sort of specific device data - in most cases we call them generics, and they don't have ability
+ * to read data)
+ * @return
+ */
+ public boolean isReadableDevice()
+ {
+ return true;
+ }
Modified: trunk/ggc-pump/src/ggc/pump/gui/manual/PumpDataTypeComponent.java
===================================================================
--- trunk/ggc-pump/src/ggc/pump/gui/manual/PumpDataTypeComponent.java 2009-03-27 15:44:41 UTC (rev 716)
+++ trunk/ggc-pump/src/ggc/pump/gui/manual/PumpDataTypeComponent.java 2009-04-02 08:13:50 UTC (rev 717)
@@ -8,6 +8,7 @@
import ggc.pump.data.defs.PumpBasalSubType;
import ggc.pump.data.defs.PumpBaseType;
import ggc.pump.data.defs.PumpBolusType;
+import ggc.pump.gui.profile.ProfileSelectorPump;
import ggc.pump.util.DataAccessPump;
import ggc.pump.util.I18nControl;
import ggc.shared.bolushelper.BolusHelper;
@@ -21,7 +22,6 @@
import javax.swing.JButton;
import javax.swing.JComboBox;
import javax.swing.JLabel;
-import javax.swing.JOptionPane;
import javax.swing.JPanel;
import javax.swing.JRadioButton;
import javax.swing.JSpinner;
@@ -1149,7 +1149,8 @@
private static final long serialVersionUID = 1195430308386555236L;
JLabel label_1_1, label_2_1;
JButton button_1;
- PumpValuesEntryProfile profile = null;
+ //PumpValuesEntryProfile profile = null;
+ String profile;
public ProfileComponent()
{
@@ -1183,18 +1184,26 @@
public void actionPerformed(ActionEvent arg0)
{
+ ProfileSelectorPump psp = new ProfileSelectorPump(m_da, m_parent);
+ if (psp.wasAction())
+ {
+ label_2_1.setText(psp.getSelectedObject().toString());
+ this.profile = psp.getSelectedObject().toString();
+ }
+/*
System.out.println("Profile Selector N/A !!!");
JOptionPane.showMessageDialog(this,
"Profile functionality will be added at " +
"later time (version 0.5), so profile " +
"selecttion is currently not possible.",
ic.getMessage("PFORILE"),
- JOptionPane.WARNING_MESSAGE);
+ JOptionPane.WARNING_MESSAGE);*/
}
public boolean isSelected()
{
- return (this.profile!=null);
+ return (profile!=null);
+ //return !(label_2_1.getText().equals(ic.getMessage("NOT_SELECTED")));
}
public boolean isValueSet()
@@ -1205,14 +1214,20 @@
public String getValue()
{
+ /*
if (this.profile==null)
return "0";
else
return "" + this.profile.getId();
+ */
+ return this.profile;
}
public void setValue(String val)
{
+
+ this.profile = val;
+ /*
long id = m_da.getLongValueFromString(val, 0L);
if (id == 0)
@@ -1225,7 +1240,7 @@
this.profile.setId(id);
m_da.getDb().get(this.profile);
- }
+ }*/
}
Modified: trunk/ggc-pump/src/ggc/pump/gui/profile/ProfileEditor.java
===================================================================
--- trunk/ggc-pump/src/ggc/pump/gui/profile/ProfileEditor.java 2009-03-27 15:44:41 UTC (rev 716)
+++ trunk/ggc-pump/src/ggc/pump/gui/profile/ProfileEditor.java 2009-04-02 08:13:50 UTC (rev 717)
@@ -17,6 +17,7 @@
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.Hashtable;
import java.util.StringTokenizer;
@@ -135,7 +136,17 @@
{
this.tf_name.setText(this.m_profile.getName());
this.dtc_from.setDateTime(this.m_profile.getActive_from());
- this.dtc_till.setDateTime(this.m_profile.getActive_till());
+
+ if (this.m_profile.getActive_till() <= 0)
+ {
+ this.cb_enabled_till.setSelected(false);
+ this.dtc_till.setDateTimeAsCurrent();
+ }
+ else
+ {
+ this.cb_enabled_till.setSelected(true);
+ this.dtc_till.setDateTime(this.m_profile.getActive_till());
+ }
this.sp_base.setValue(this.m_profile.getBasal_base());
this.loadSubEntries(this.m_profile.getBasal_diffs());
}
@@ -149,15 +160,23 @@
{
list_data.add(new ProfileSubEntry(strtok.nextToken()));
}
+
+ Collections.sort(list_data);
+
this.refreshList(1, list_data);
}
private void save()
{
this.m_profile.setName(this.tf_name.getText());
- this.m_profile.setActive_from(this.dtc_from.getDateTime());
- this.m_profile.setActive_till(this.dtc_till.getDateTime());
+ this.m_profile.setActive_from(this.dtc_from.getDateTime());
+
+ if (this.cb_enabled_till.isSelected())
+ this.m_profile.setActive_till(this.dtc_till.getDateTime());
+ else
+ this.m_profile.setActive_till(-1L);
+
this.m_profile.setBasal_base(m_da.getFloatValue(this.sp_base.getValue()));
this.m_profile.setBasal_diffs(getSubEntries());
@@ -203,7 +222,13 @@
ATSwingUtils.getLabel(m_ic.getMessage("NAME") + ":", 80, 75, 120, 25, panel, ATSwingUtils.FONT_NORMAL_BOLD);
tf_name = ATSwingUtils.getTextField("", 190, 75, 120, 25, panel);
+ tf_name.setEditable(false);
+ ATSwingUtils.getButton(" " +m_ic.getMessage("SELECT"),
+ 330, 75, 120, 25, panel,
+ ATSwingUtils.FONT_NORMAL, "cancel.png", "select_profile", this, m_da);
+
+
ATSwingUtils.getLabel(m_ic.getMessage("DATE_FROM") + ":", 80, 110, 200, 25, panel, ATSwingUtils.FONT_NORMAL_BOLD);
dtc_from = new DateTimeComponent(m_da, DateTimeComponent.ALIGN_HORIZONTAL, 30, DateTimeComponent.TIME_MAXIMAL_SECOND);
@@ -378,157 +403,9 @@
- /*
- private void init_v2()
- {
- //this.setLayout(null);
- this.setTitle("Basal Rate Estimator");
- JLabel label;
-
- JPanel panel = new JPanel();
- panel.setLayout(null);
- this.add(panel);
-
- ATSwingUtils.getTitleLabel("Basal Rate Estimator", 0, 20, 800, 35, panel, ATSwingUtils.FONT_BIG_BOLD);
-
- ATSwingUtils.getLabel("List of BGs:", 50, 85, 200, 25, panel, ATSwingUtils.FONT_NORMAL_BOLD);
-
- lst_bgs = new JList();
- JScrollPane scr = new JScrollPane(lst_bgs);
- scr.setBounds(40, 110, 160, 100);
- panel.add(scr);
-
- ATSwingUtils.getLabel("List of Old Basals:", 220, 85, 200, 25, panel, ATSwingUtils.FONT_NORMAL_BOLD);
-
- this.lst_basals_old = new JList();
- scr = new JScrollPane(this.lst_basals_old);
- scr.setBounds(210, 110, 160, 100);
- panel.add(scr);
-
- ATSwingUtils.getLabel("List of Ratios:", 390, 85, 200, 25, panel, ATSwingUtils.FONT_NORMAL_BOLD);
-
- this.lst_ratios = new JList();
- scr = new JScrollPane(this.lst_ratios);
- scr.setBounds(380, 110, 160, 100);
- panel.add(scr);
-
- ATSwingUtils.getLabel("List of New Basals:", 50, 280, 200, 25, panel, ATSwingUtils.FONT_NORMAL_BOLD);
-
- this.lst_basals_new = new JList();
- scr = new JScrollPane(this.lst_basals_new);
- scr.setBounds(40, 310, 160, 240);
- panel.add(scr);
-
- JPanel panel_graph = new JPanel();
- panel_graph.setBorder(new TitledBorder("Basal Rate Display"));
- panel_graph.setBounds(210, 220, 560, 320);
- //panel_graph.setBackground(new Color(0, 191, 255));
-
- gv = new GraphViewBasalRateEstimator();
-
- GraphViewerPanel gvp = new GraphViewerPanel(gv);
- gvp.setMinimumSize(new Dimension(550, 280)); // 450, 460
- gvp.setPreferredSize(gvp.getMinimumSize());
- panel_graph.add(gvp, BorderLayout.CENTER);
- panel.add(panel_graph);
-
- bre_algorithm = new BasalRateEstimatorAlgorithm(gv);
-
- ATSwingUtils.getLabel("Date of display: ", 570, 80, 200, 25, panel, ATSwingUtils.FONT_NORMAL_BOLD);
-
-
-
- ATSwingUtils.getLabel("02/02/2009", 690, 80, 200, 25, panel, ATSwingUtils.FONT_NORMAL);
-
- ATSwingUtils.getButton("Change Date", 570, 130, 190, 25, panel, ATSwingUtils.FONT_NORMAL, null, "change_date", this, m_da);
-
- JButton b = ATSwingUtils.getButton("Configure Ratios", 570, 170, 190, 25, panel, ATSwingUtils.FONT_NORMAL, null, "change_ratios", this, m_da);
- b.setEnabled(false);
-
- //ATSwingUtils.getButton("Algorithm", 570, 250, 190, 25, panel, ATSwingUtils.FONT_NORMAL, null, "algorithm", this, m_da);
-
- //ATSwingUtils.getButton("Change Date", 500, 50, 150, 25, panel, ATSwingUtils.FONT_NORMAL, null, "change_date", this, m_da);
-
- }
- */
- /*
- private void init_1()
- {
- //this.setLayout(null);
- this.setTitle("Basal Rate Estimator");
- JLabel label;
-
- JPanel panel = new JPanel();
- panel.setLayout(null);
- this.add(panel);
-
- ATSwingUtils.getTitleLabel("Basal Rate Estimator", 0, 20, 800, 35, panel, ATSwingUtils.FONT_BIG_BOLD);
-
- ATSwingUtils.getLabel("List of BGs:", 50, 85, 200, 25, panel, ATSwingUtils.FONT_NORMAL_BOLD);
-
- lst_bgs = new JList();
- JScrollPane scr = new JScrollPane(lst_bgs);
- scr.setBounds(40, 110, 160, 160);
- panel.add(scr);
-
- ATSwingUtils.getLabel("List of Old Basals:", 220, 85, 200, 25, panel, ATSwingUtils.FONT_NORMAL_BOLD);
-
- this.lst_basals_old = new JList();
- scr = new JScrollPane(this.lst_basals_old);
- scr.setBounds(210, 110, 160, 160);
- panel.add(scr);
-
- ATSwingUtils.getLabel("List of Ratios:", 390, 85, 200, 25, panel, ATSwingUtils.FONT_NORMAL_BOLD);
-
- this.lst_ratios = new JList();
- scr = new JScrollPane(this.lst_ratios);
- scr.setBounds(380, 110, 160, 160);
- panel.add(scr);
-
- ATSwingUtils.getLabel("List of New Basals:", 50, 280, 200, 25, panel, ATSwingUtils.FONT_NORMAL_BOLD);
-
- this.lst_basals_new = new JList();
- scr = new JScrollPane(this.lst_basals_new);
- scr.setBounds(40, 310, 160, 240);
- panel.add(scr);
-
-
-
- /*
- JPanel panel_graph = new JPanel();
- panel_graph.setBorder(new TitledBorder("Basal Rate Display"));
- panel_graph.setBounds(210, 280, 560, 270);
- panel_graph.setBackground(new Color(0, 191, 255));
-
- gv = new GraphViewBasalRateEstimator();
-
- GraphViewerPanel gvp = new GraphViewerPanel(gv);
- gvp.setMinimumSize(new Dimension(550, 240)); // 450, 460
- gvp.setPreferredSize(gvp.getMinimumSize());
- panel_graph.add(gvp, BorderLayout.CENTER);
- panel.add(panel_graph);
-
- bre_algorithm = new BasalRateEstimatorAlgorithm(gv);
-*/
-
- /*
-
- ATSwingUtils.getLabel("Date of display: ", 570, 120, 200, 25, panel, ATSwingUtils.FONT_NORMAL_BOLD);
- ATSwingUtils.getLabel("02/02/2009", 690, 120, 200, 25, panel, ATSwingUtils.FONT_NORMAL);
- ATSwingUtils.getButton("Change Date", 570, 170, 190, 25, panel, ATSwingUtils.FONT_NORMAL, null, "change_date", this, m_da);
-
- JButton b = ATSwingUtils.getButton("Configure Ratios", 570, 210, 190, 25, panel, ATSwingUtils.FONT_NORMAL, null, "change_ratios", this, m_da);
- b.setEnabled(false);
-
- ATSwingUtils.getButton("Algorithm", 570, 250, 190, 25, panel, ATSwingUtils.FONT_NORMAL, null, "algorithm", this, m_da);
-
- //ATSwingUtils.getButton("Change Date", 500, 50, 150, 25, panel, ATSwingUtils.FONT_NORMAL, null, "change_date", this, m_da);
-
- }*/
-
private void refreshList(int type, ArrayList<?> lst)
{
@@ -586,7 +463,7 @@
if (ped.actionSuccessful())
{
this.list_data.add(ped.getResult());
- //Collections.sort(this.list_data);
+ Collections.sort(this.list_data);
refreshList(1, this.list_data);
}
@@ -607,7 +484,7 @@
if (ped.actionSuccessful())
{
pse.setValues(ped.getResult());
- //Collections.sort(this.list_data);
+ Collections.sort(this.list_data);
refreshList(1, this.list_data);
}
}
@@ -624,7 +501,7 @@
if (ii==JOptionPane.YES_OPTION)
{
this.list_data.remove(this.lst_basals.getSelectedIndex());
- //Collections.sort(this.list_data);
+ Collections.sort(this.list_data);
refreshList(1, this.list_data);
}
else
@@ -643,7 +520,14 @@
m_da.removeComponent(this);
this.dispose();
}
-
+ else if (action.equals("select_profile"))
+ {
+ ProfileSelectorPump psp = new ProfileSelectorPump(m_da, this);
+ if (psp.wasAction())
+ {
+ this.tf_name.setText(psp.getSelectedObject().toString());
+ }
+ }
else
System.out.println(e.getActionCommand() + " is currently not supported.");
}
Modified: trunk/ggc-pump/src/ggc/pump/gui/profile/ProfileSelector.java
===================================================================
--- trunk/ggc-pump/src/ggc/pump/gui/profile/ProfileSelector.java 2009-03-27 15:44:41 UTC (rev 716)
+++ trunk/ggc-pump/src/ggc/pump/gui/profile/ProfileSelector.java 2009-04-02 08:13:50 UTC (rev 717)
@@ -85,14 +85,51 @@
if (pe.actionSuccessful())
{
+ PumpProfileH pr = pe.getResult();
+
+ PumpProfile pr_other = getOpenProfile();
+
+ if (pr_other==null)
+ {
+ this.full.add(new PumpProfile(pe.getResult()));
+ }
+ else
+ {
+ if (pr_other.getActive_from() < pr.getActive_from())
+ {
+ pr_other.setActive_till(pr.getActive_from());
+ }
+ else
+ {
+ pr.setActive_till(pr_other.getActive_from());
+ }
+
+ this.full.add(new PumpProfile(pr));
+
+ }
+
//System.out.println("Success: ");
- this.full.add(new PumpProfile(pe.getResult()));
+ //this.full.add(new PumpProfile(pe.getResult()));
this.filterEntries();
//System.out.println("Success: " + this.full);
}
}
+ private PumpProfile getOpenProfile()
+ {
+ for(int i=0; i<this.list.size(); i++)
+ {
+ PumpProfile pp = (PumpProfile)this.list.get(i);
+
+ if (pp.getActive_till()==-1)
+ return pp;
+ }
+ return null;
+ }
+
+
+
/**
* Check And Execute Action Select
*/
Added: trunk/ggc-pump/src/ggc/pump/gui/profile/ProfileSelectorPump.java
===================================================================
--- trunk/ggc-pump/src/ggc/pump/gui/profile/ProfileSelectorPump.java (rev 0)
+++ trunk/ggc-pump/src/ggc/pump/gui/profile/ProfileSelectorPump.java 2009-04-02 08:13:50 UTC (rev 717)
@@ -0,0 +1,321 @@
+package ggc.pump.gui.profile;
+
+import ggc.plugin.cfg.DeviceConfigEntry;
+import ggc.pump.data.db.PumpProfile;
+import ggc.pump.manager.PumpManager;
+import ggc.pump.manager.company.AbstractPumpDeviceCompany;
+import ggc.pump.util.DataAccessPump;
+
+import java.awt.event.ItemEvent;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Hashtable;
+
+import javax.swing.JDialog;
+import javax.swing.JFrame;
+
+import com.atech.graphics.dialogs.selector.ColumnSorter;
+import com.atech.graphics.dialogs.selector.SelectableInterface;
+import com.atech.graphics.dialogs.selector.SelectorAbstractDialog;
+
+
+
+// TODO: Auto-generated Javadoc
+/**
+ * The Class ProfileSelector.
+ */
+public class ProfileSelectorPump extends SelectorAbstractDialog
+{
+
+ private static final long serialVersionUID = -1061136628528659695L;
+
+ /**
+ * The da_local.
+ */
+ DataAccessPump da_local = DataAccessPump.getInstance();
+
+
+ /**
+ * Constructor
+ *
+ * @param parent
+ * @param da
+ */
+ public ProfileSelectorPump(DataAccessPump da, JFrame parent) //, DataAccessPump da)
+ {
+ super(parent, da, 0, null, true);
+ da_local = (DataAccessPump)da;
+ this.showDialog();
+ }
+
+
+ /**
+ * Constructor
+ *
+ * @param parent
+ * @param da
+ */
+ public ProfileSelectorPump(DataAccessPump da, JDialog parent) //, DataAccessPump da)
+ {
+ super(parent, da, 0, null, true);
+ da_local = (DataAccessPump)da;
+ this.showDialog();
+ }
+
+
+// /**
+// * Constructor
+// *
+// * @param parent
+// * @param da
+// */
+// public ProfileSelector(JFrame parent, ATDataAccessAbstract da)
+// {
+// super(parent, da, 0, null, true);
+// da_local = (DataAccessPump)da;
+// this.showDialog();
+// }
+
+
+
+
+ /**
+ * Check And Execute Action Edit
+ */
+ @Override
+ public void checkAndExecuteActionEdit(SelectableInterface si)
+ {
+ /*
+ ProfileEditor pe = new ProfileEditor(this, (PumpProfileH)si);
+ pe.setVisible(true);
+
+ if (pe.actionSuccessful())
+ {
+ this.filterEntries();
+ }*/
+
+ }
+
+ /**
+ * Check And Execute Action New
+ */
+ @Override
+ public void checkAndExecuteActionNew()
+ {
+ /*
+ ProfileEditor pe = new ProfileEditor(this);
+ pe.setVisible(true);
+
+ if (pe.actionSuccessful())
+ {
+ PumpProfileH pr = pe.getResult();
+
+ PumpProfile pr_other = getOpenProfile();
+
+ if (pr_other==null)
+ {
+ this.full.add(new PumpProfile(pe.getResult()));
+ }
+ else
+ {
+ if (pr_other.getActive_from() < pr.getActive_from())
+ {
+ pr_other.setActive_till(pr.getActive_from());
+ }
+ else
+ {
+ pr.setActive_till(pr_other.getActive_from());
+ }
+
+ this.full.add(new PumpProfile(pr));
+
+ }
+
+ //System.out.println("Success: ");
+ //this.full.add(new PumpProfile(pe.getResult()));
+ this.filterEntries();
+ //System.out.println("Success: " + this.full);
+ }*/
+ }
+
+
+ private PumpProfile getOpenProfile()
+ {
+ for(int i=0; i<this.list.size(); i++)
+ {
+ PumpProfile pp = (PumpProfile)this.list.get(i);
+
+ if (pp.getActive_till()==-1)
+ return pp;
+ }
+ return null;
+ }
+
+
+
+ /**
+ * Check And Execute Action Select
+ */
+ @Override
+ public void checkAndExecuteActionSelect()
+ {
+ }
+
+
+
+ /**
+ * Get Full Data
+ */
+ @Override
+ public void getFullData()
+ {
+ da_local = DataAccessPump.getInstance();
+ this.full = new ArrayList<SelectableInterface>();
+ this.full.addAll((Collection<? extends SelectableInterface>) getList());
+ }
+
+
+ /**
+ * Get List
+ *
+ * @return
+ */
+ public ArrayList<PumpProfileType> getList()
+ {
+ ArrayList<PumpProfileType> lst_out = new ArrayList<PumpProfileType>();
+ //AbstractPumpDeviceCompany adc = (AbstractPumpDeviceCompany)PumpManager.getInstance().getCompany("Minimed");
+ //Vector<AbstractDeviceCompany> lst = PumpManager.getInstance().getCompanies();
+ DeviceConfigEntry de = DataAccessPump.getInstance().getDeviceConfiguration().getSelectedDeviceInstance();
+
+ AbstractPumpDeviceCompany adc = (AbstractPumpDeviceCompany)PumpManager.getInstance().getCompany(de.device_company);
+ String[] profiles = adc.getProfileNames();
+
+ for(int i=0; i<profiles.length; i++)
+ {
+ lst_out.add(new PumpProfileType(profiles[i]));
+ }
+
+ return lst_out;
+ }
+
+
+
+ /**
+ * Init Selector Values For Type
+ */
+ @Override
+ public void initSelectorValuesForType()
+ {
+ setSelectorObject(new PumpProfileType());
+ setSelectorName(ic.getMessage("PUMP_PROFILE_SELECTOR"));
+ this.descriptions = new Hashtable<String,String>();
+ this.descriptions.put("DESC_1", ic.getMessage("NAME_OF_PROFILE"));
+ setAllowedActions(SelectorAbstractDialog.SELECTOR_ACTION_CANCEL|SelectorAbstractDialog.SELECTOR_ACTION_SELECT);
+ this.setColumnSortingEnabled(false);
+ this.setFilterType(SelectorAbstractDialog.SELECTOR_FILTER_TEXT);
+ this.setHelpEnabled(false);
+ use_generic_select = true;
+ //setNewItemString(ic.getMessage("NEW__PROFILE"));
+ }
+
+ /**
+ * Item State Changed
+ */
+ @Override
+ public void itemStateChanged(ItemEvent e)
+ {
+ }
+
+
+ private class PumpProfileType implements SelectableInterface
+ {
+ String name;
+
+ public PumpProfileType()
+ {
+
+ }
+
+ public PumpProfileType(String name)
+ {
+ this.name = name;
+ }
+
+ public int compareTo(SelectableInterface o)
+ {
+
+ // TODO Auto-generated method stub
+ return 0;
+ }
+
+ public int getColumnCount()
+ {
+ return 1;
+ }
+
+ public String getColumnName(int num)
+ {
+ return ic.getMessage("NAME");
+ }
+
+ public String getColumnValue(int num)
+ {
+ return name;
+ }
+
+ public Object getColumnValueObject(int num)
+ {
+ return name;
+ }
+
+ public int getColumnWidth(int num, int width)
+ {
+ return width;
+ }
+
+ public long getItemId()
+ {
+ return 0;
+ }
+
+ public String getShortDescription()
+ {
+ return this.name;
+ }
+
+ public boolean isFound(String text)
+ {
+ return name.contains(text);
+ }
+
+ public boolean isFound(int value)
+ {
+ return true;
+ }
+
+ public boolean isFound(int from, int till, int state)
+ {
+ return true;
+ }
+
+ public void setColumnSorter(ColumnSorter cs)
+ {
+ // TODO Auto-generated method stub
+
+ }
+
+ public void setSearchContext()
+ {
+ // TODO Auto-generated method stub
+
+ }
+
+
+ public String toString()
+ {
+ return this.name;
+ }
+ }
+
+
+}
\ No newline at end of file
Modified: trunk/ggc-pump/src/ggc/pump/manager/PumpManager.java
===================================================================
--- trunk/ggc-pump/src/ggc/pump/manager/PumpManager.java 2009-03-27 15:44:41 UTC (rev 716)
+++ trunk/ggc-pump/src/ggc/pump/manager/PumpManager.java 2009-04-02 08:13:50 UTC (rev 717)
@@ -61,9 +61,23 @@
*/
public static final int PUMP_COMPANY_ANIMAS = 4;
+ /**
+ * Pump Company: Animas
+ */
+ public static final int PUMP_COMPANY_DELTEC = 5;
+
+ /**
+ * Pump Company: Animas
+ */
+ public static final int PUMP_COMPANY_INSULET = 6;
/**
+ * Pump Company: Animas
+ */
+ public static final int PUMP_COMPANY_SOOIL = 7;
+
+ /**
* Singleton instance
*/
public static PumpManager s_manager = null;
@@ -113,8 +127,12 @@
@Override
public void loadSupportedDevices()
{
- // TODO add supported devices
- //this.supported_devices.addAll(new AscensiaBayer().getDevices());
+ this.supported_devices.addAll(new Animas().getDevices());
+ this.supported_devices.addAll(new Deltec().getDevices());
+ this.supported_devices.addAll(new Insulet().getDevices());
+ this.supported_devices.addAll(new Minimed().getDevices());
+ this.supported_devices.addAll(new Roche().getDevices());
+ this.supported_devices.addAll(new Sooil().getDevices());
}
Added: trunk/ggc-pump/src/ggc/pump/manager/company/AbstractPumpDeviceCompany.java
===================================================================
--- trunk/ggc-pump/src/ggc/pump/manager/company/AbstractPumpDeviceCompany.java (rev 0)
+++ trunk/ggc-pump/src/ggc/pump/manager/company/AbstractPumpDeviceCompany.java 2009-04-02 08:13:50 UTC (rev 717)
@@ -0,0 +1,29 @@
+package ggc.pump.manager.company;
+
+import ggc.plugin.manager.company.AbstractDeviceCompany;
+
+import com.atech.i18n.I18nControlAbstract;
+
+
+public abstract class AbstractPumpDeviceCompany extends AbstractDeviceCompany
+{
+
+ protected String[] profile_names;
+
+
+ public AbstractPumpDeviceCompany(I18nControlAbstract ic, boolean value)
+ {
+ super(ic, value);
+ }
+
+
+ public String[] getProfileNames()
+ {
+ return this.profile_names;
+ }
+
+
+
+}
+
+
Modified: trunk/ggc-pump/src/ggc/pump/manager/company/Animas.java
===================================================================
--- trunk/ggc-pump/src/ggc/pump/manager/company/Animas.java 2009-03-27 15:44:41 UTC (rev 716)
+++ trunk/ggc-pump/src/ggc/pump/manager/company/Animas.java 2009-04-02 08:13:50 UTC (rev 717)
@@ -1,35 +1,6 @@
-/*
- * GGC - GNU Gluco Control
- *
- * A pure java app to help you manage your diabetes.
- *
- * See AUTHORS for copyright information.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
- * Filename: MeterManager.java
- * Purpose: This class contains all definitions for Meters. This includes:
- * meter names, classes that handle meter and all other relevant data.
- *
- * Author: andyrozman
- */
-
-
package ggc.pump.manager.company;
-import ggc.plugin.manager.company.AbstractDeviceCompany;
+import ggc.pump.manager.PumpManager;
import ggc.pump.util.I18nControl;
/**
@@ -59,7 +30,7 @@
*/
-public class Animas extends AbstractDeviceCompany
+public class Animas extends AbstractPumpDeviceCompany
{
@@ -68,7 +39,9 @@
*/
public Animas()
{
- super(I18nControl.getInstance(), true);
+ super(I18nControl.getInstance(), false);
+
+ this.addDevice(new GenericPumpDevice(this));
}
@@ -90,7 +63,7 @@
*/
public int getCompanyId()
{
- return 2;
+ return PumpManager.PUMP_COMPANY_ANIMAS;
}
@@ -101,7 +74,7 @@
*/
public String getDescription()
{
- return "ROCHE_DESC";
+ return "ANIMAS_DESC";
}
Modified: trunk/ggc-pump/src/ggc/pump/manager/company/Deltec.java
===================================================================
--- trunk/ggc-pump/src/ggc/pump/manager/company/Deltec.java 2009-03-27 15:44:41 UTC (rev 716)
+++ trunk/ggc-pump/src/ggc/pump/manager/company/Deltec.java 2009-04-02 08:13:50 UTC (rev 717)
@@ -1,6 +1,6 @@
package ggc.pump.manager.company;
-import ggc.plugin.manager.company.AbstractDeviceCompany;
+import ggc.pump.manager.PumpManager;
import ggc.pump.util.I18nControl;
/**
@@ -30,7 +30,7 @@
*/
-public class Deltec extends AbstractDeviceCompany
+public class Deltec extends AbstractPumpDeviceCompany
{
/**
@@ -38,7 +38,8 @@
*/
public Deltec()
{
- super(I18nControl.getInstance(), true);
+ super(I18nControl.getInstance(), false);
+ this.ad...
[truncated message content] |
|
From: <and...@us...> - 2009-04-03 15:58:12
|
Revision: 729
http://ggc.svn.sourceforge.net/ggc/?rev=729&view=rev
Author: andyrozman
Date: 2009-04-03 15:57:53 +0000 (Fri, 03 Apr 2009)
Log Message:
-----------
Modified Paths:
--------------
trunk/build/build.xml
trunk/ggc-meter/src/ggc/meter/plugin/MeterPlugInServer.java
trunk/ggc-nutri/build/GGCNutriToolVersion.properties
trunk/ggc-nutri/build/build.xml
trunk/ggc-nutri/docs/Changelog
trunk/ggc-nutri/src/ggc/nutri/plugin/NutriPlugInServer.java
trunk/ggc-plugin_base/build/build.xml
trunk/ggc-pump/src/ggc/pump/plugin/PumpPlugInServer.java
Added Paths:
-----------
trunk/build/AtechTools.properties
trunk/ggc-nutri/src/ggc/nutri/gui/
trunk/ggc-nutri/src/ggc/nutri/gui/print/
trunk/ggc-nutri/src/ggc/nutri/gui/print/PrintFoodDialog.java
trunk/ggc-nutri/src/icons/
Added: trunk/build/AtechTools.properties
===================================================================
--- trunk/build/AtechTools.properties (rev 0)
+++ trunk/build/AtechTools.properties 2009-04-03 15:57:53 UTC (rev 729)
@@ -0,0 +1 @@
+atech-tools.api=../../ggc-support/lib/utils/atech-tools-0.3.6.jar
Modified: trunk/build/build.xml
===================================================================
--- trunk/build/build.xml 2009-04-03 15:53:20 UTC (rev 728)
+++ trunk/build/build.xml 2009-04-03 15:57:53 UTC (rev 729)
@@ -48,8 +48,16 @@
<target name="all" depends="clean, all_noclean" description="whole GGC">
</target>
- <target name="all_noclean" depends="ggc_core, ggc_desktop, plugins" description="whole GGC">
+ <target name="all_test" depends="all_noclean" description="whole GGC">
</target>
+
+
+ <target name="all_noclean" depends="ggc_desktop" description="whole GGC">
+ </target>
+
+
+ <target name="all_noclean_full" depends="ggc_core, ggc_desktop, plugins" description="whole GGC">
+ </target>
<target name="ggc_core" description="GNU Gluco Control application build (full)">
Modified: trunk/ggc-meter/src/ggc/meter/plugin/MeterPlugInServer.java
===================================================================
--- trunk/ggc-meter/src/ggc/meter/plugin/MeterPlugInServer.java 2009-04-03 15:53:20 UTC (rev 728)
+++ trunk/ggc-meter/src/ggc/meter/plugin/MeterPlugInServer.java 2009-04-03 15:57:53 UTC (rev 729)
@@ -239,6 +239,11 @@
}
+ /**
+ * Get Backup Objects (if available)
+ *
+ * @return
+ */
@Override
public BackupRestoreCollection getBackupObjects()
{
@@ -247,6 +252,15 @@
}
+ /**
+ * Get PlugIn Main Menu
+ *
+ * This is new way to handle everything, previously we used to pass ActionListener items through
+ * plugin framework, but in new way, we will use this one. We just give main application menu,
+ * which contains all items accessible through menus.
+ *
+ * @return
+ */
@Override
public JMenu getPlugInMainMenu()
{
@@ -254,9 +268,16 @@
return null;
}
-
+
+ /**
+ * Get PlugIn Print Menus
+ *
+ * Since printing is also PlugIn specific we need to add Printing jobs to application.
+ *
+ * @return
+ */
@Override
- public JMenu getPlugInPrintMenu()
+ public JMenu[] getPlugInPrintMenus()
{
// TODO Auto-generated method stub
return null;
Modified: trunk/ggc-nutri/build/GGCNutriToolVersion.properties
===================================================================
--- trunk/ggc-nutri/build/GGCNutriToolVersion.properties 2009-04-03 15:53:20 UTC (rev 728)
+++ trunk/ggc-nutri/build/GGCNutriToolVersion.properties 2009-04-03 15:57:53 UTC (rev 729)
@@ -6,5 +6,5 @@
#
# GGC Pump Tool Version
#
-ggc-pump-tool.version=0.4.1
+ggc-nutri-tool.version=1.1.1
Modified: trunk/ggc-nutri/build/build.xml
===================================================================
--- trunk/ggc-nutri/build/build.xml 2009-04-03 15:53:20 UTC (rev 728)
+++ trunk/ggc-nutri/build/build.xml 2009-04-03 15:57:53 UTC (rev 729)
@@ -7,21 +7,21 @@
<!-- Environment properties read from a file ...-->
<property file="../../ggc-plugin_base/build/GGCPlugInBaseBuild.properties"/>
<property file="../../ggc-plugin_base/build/GGCPlugInBaseVersion.properties"/>
- <property file="./GGCPumpToolVersion.properties"/>
+ <property file="./GGCNutriToolVersion.properties"/>
<!-- These should *not* be modified on the command line! -->
<property name="build.dir" value="${outdir.dir}/classes"/>
<property name="deploy.dir" value="${outdir.dir}/deploy"/>
- <property name="jar_file_name" value="ggc-pump_tool" />
- <property name="jar_file_version" value="${ggc-pump-tool.version}" />
+ <property name="jar_file_name" value="ggc-nutri_tool" />
+ <property name="jar_file_version" value="${ggc-nutri-tool.version}" />
<!-- Build GGC -->
<target name="build">
<echo message=" ************************************************* "/>
- <echo message=" **** GGC PlugIn Base Build **** "/>
+ <echo message=" **** GGC Nutrition Tool Build **** "/>
<echo message=" ************************************************* "/>
<echo message=""/>
<echo message=" clean = clean build dir"/>
Modified: trunk/ggc-nutri/docs/Changelog
===================================================================
--- trunk/ggc-nutri/docs/Changelog 2009-04-03 15:53:20 UTC (rev 728)
+++ trunk/ggc-nutri/docs/Changelog 2009-04-03 15:57:53 UTC (rev 729)
@@ -1,20 +1,16 @@
-Changelog file for GGC Core (GNU Gluco Control)
-===============================================
+Changelog file for GGC Nutrition Tool
+=======================================
Newer entries are on top, older on bottom.
--------------------------------------------------------------------------------------------------
-0.4.4.2
- * Build system for GGC Core
-
-0.4.4.1 (27.3.2009) [andy]
- * Meter Tool data is now added also into database for pump
- * Core is now separate project (it is master parent to all other projects)
+1.1.1 (27.3.2009) [andy]
+ * Nutrition is now separate project
--------------------------------------------------------------------------------------------------
-Old changelog's before separation are in Changelog_old
+Old changelog's before separation are in ../ggc-desktop/docs/Changelog_old
Added: trunk/ggc-nutri/src/ggc/nutri/gui/print/PrintFoodDialog.java
===================================================================
--- trunk/ggc-nutri/src/ggc/nutri/gui/print/PrintFoodDialog.java (rev 0)
+++ trunk/ggc-nutri/src/ggc/nutri/gui/print/PrintFoodDialog.java 2009-04-03 15:57:53 UTC (rev 729)
@@ -0,0 +1,665 @@
+/*
+ * GGC - GNU Gluco Control
+ *
+ * A pure java app to help you manage your diabetes.
+ *
+ * See AUTHORS for copyright information.
+ *
+ * This program is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by the Free Software
+ * Foundation; either version 2 of the License, or (at your option) any later
+ * version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc., 59 Temple
+ * Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Filename: PrintingDialog
+ *
+ * Purpose: This is printing selector, for printing. For selecting type of
+ * printing and date (month and year).
+ *
+ * Author: andyrozman {an...@at...}
+ */
+package ggc.nutri.gui.print;
+
+import ggc.core.data.DayValuesData;
+import ggc.core.data.MonthlyValues;
+import ggc.core.print.PrintAbstract;
+import ggc.core.print.PrintExtendedMonthlyReport;
+import ggc.core.print.PrintSimpleMonthlyReport;
+import ggc.core.util.DataAccess;
+import ggc.core.util.I18nControl;
+import ggc.nutri.print.PrintFoodMenuBase;
+import ggc.nutri.print.PrintFoodMenuExt1;
+import ggc.nutri.print.PrintFoodMenuExt2;
+import ggc.nutri.print.PrintFoodMenuExt3;
+
+import java.awt.Component;
+import java.awt.Font;
+import java.awt.event.ActionEvent;
+import java.io.File;
+import java.util.Calendar;
+import java.util.GregorianCalendar;
+
+import javax.swing.JButton;
+import javax.swing.JComboBox;
+import javax.swing.JFrame;
+import javax.swing.JLabel;
+import javax.swing.JPanel;
+import javax.swing.JSpinner;
+import javax.swing.JTextField;
+import javax.swing.SpinnerNumberModel;
+import javax.swing.SwingConstants;
+
+import com.atech.graphics.components.DateComponent;
+import com.atech.graphics.dialogs.ActionExceptionCatchDialog;
+
+/**
+ * Application: GGC - GNU Gluco Control
+ *
+ * See AUTHORS for copyright information.
+ *
+ * This program is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by the Free Software
+ * Foundation; either version 2 of the License, or (at your option) any later
+ * version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc., 59 Temple
+ * Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Filename: PrintingDialog
+ * Description: Dialog for Printing
+ *
+ * Author: andyrozman {an...@at...}
+ */
+
+// fix this
+
+public class PrintFoodDialog extends ActionExceptionCatchDialog // extends
+// JDialog
+// implements
+// ActionListener
+// , HelpCapable
+{
+
+
+
+ private static final long serialVersionUID = 2693207247071685559L;
+ private I18nControl m_ic = I18nControl.getInstance();
+ private DataAccess m_da = DataAccess.getInstance();
+
+ private boolean m_actionDone = false;
+
+ private JTextField tfName;
+ private JComboBox cb_template = null;
+ // x private String[] schemes_names = null;
+
+ DateComponent dc_to, dc_from;
+
+ GregorianCalendar gc = null;
+ JSpinner sl_year = null, sl_month = null;
+ JButton help_button;
+
+ private String[] report_types_1 = { m_ic.getMessage("SIMPLE_MONTHLY_REPORT"),
+ m_ic.getMessage("EXTENDED_MONTHLY_REPORT") };
+
+ private String[] report_types_2 = { m_ic.getMessage("FOOD_MENU_BASE"),
+ m_ic.getMessage("FOOD_MENU_EXT_I"),
+ m_ic.getMessage("FOOD_MENU_EXT_II"),
+// m_ic.getMessage("FOOD_MENU_EXT_III")
+ };
+
+ Font font_normal, font_normal_bold;
+
+ /**
+ * Dialog Options: Year and Month Option
+ */
+ public static final int PRINT_DIALOG_YEAR_MONTH_OPTION = 1;
+
+ /**
+ * Dialog Options: Range with day option
+ */
+ public static final int PRINT_DIALOG_RANGE_DAY_OPTION = 2;
+
+ private int master_type = 1;
+
+ /**
+ * Constructor
+ *
+ * @param frame
+ * @param type
+ * @param master_type
+ */
+ public PrintFoodDialog(JFrame frame, int type, int master_type) // throws
+ // Exception
+ {
+ super(DataAccess.getInstance(), "printing_dialog");
+ // super(frame, "", true);
+ /*
+ * Rectangle rec = frame.getBounds(); int x = rec.x + (rec.width / 2);
+ * int y = rec.y + (rec.height / 2);
+ */
+ this.setLayout(null);
+
+ font_normal = m_da.getFont(DataAccess.FONT_NORMAL);
+ font_normal_bold = m_da.getFont(DataAccess.FONT_NORMAL_BOLD);
+
+ gc = new GregorianCalendar();
+ setTitle(m_ic.getMessage("PRINTING"));
+
+ this.master_type = master_type;
+
+ //if (master_type == PrintingDialog.PRINT_DIALOG_YEAR_MONTH_OPTION)
+ // init();
+ //else
+ initRange();
+
+ this.cb_template.setSelectedIndex(type - 1);
+
+ this.setVisible(true);
+ }
+
+ private void init() // throws Exception
+ {
+
+ setSize(350, 320);
+ // setBounds(x - 175, y - 150, 350, 320);
+
+ this.m_da.centerJDialog(this);
+
+ JPanel panel = new JPanel();
+ panel.setBounds(0, 0, 350, 350);
+ panel.setLayout(null);
+
+ this.getContentPane().add(panel);
+
+ JLabel label = new JLabel(m_ic.getMessage("PRINTING"));
+ label.setFont(m_da.getFont(DataAccess.FONT_BIG_BOLD));
+ label.setHorizontalAlignment(SwingConstants.CENTER);
+ label.setBounds(0, 20, 350, 35);
+ panel.add(label);
+
+ label = new JLabel(m_ic.getMessage("TYPE_OF_REPORT") + ":");
+ label.setFont(this.font_normal_bold);
+ label.setBounds(40, 75, 280, 25);
+ panel.add(label);
+
+ cb_template = new JComboBox(report_types_1);
+ cb_template.setFont(this.font_normal);
+ cb_template.setBounds(40, 105, 230, 25);
+ panel.add(cb_template);
+
+ // int year = m_da.getC
+
+ int year = gc.get(Calendar.YEAR);
+ int month = gc.get(Calendar.MONTH) + 1;
+ // (new GregorianCalendar()).get(Calendar.YEAR);
+
+ label = new JLabel(m_ic.getMessage("SELECT_YEAR_AND_MONTH") + ":");
+ label.setFont(this.font_normal_bold);
+ label.setBounds(40, 155, 180, 25);
+ panel.add(label);
+
+ sl_year = new JSpinner();
+ SpinnerNumberModel model = new SpinnerNumberModel(year, 1970, year + 1, 1);
+ sl_year.setModel(model);
+ sl_year.setEditor(new JSpinner.NumberEditor(sl_year, "#"));
+ sl_year.setFont(this.font_normal);
+ sl_year.setBounds(40, 185, 60, 25);
+ panel.add(sl_year);
+
+ sl_month = new JSpinner();
+ SpinnerNumberModel model_m = new SpinnerNumberModel(month, 1, 12, 1);
+ sl_month.setModel(model_m);
+ // sl_month.setEditor(new JSpinner.NumberEditor(sl_month, "#"));
+ sl_month.setFont(this.font_normal);
+ sl_month.setBounds(120, 185, 40, 25);
+ panel.add(sl_month);
+
+ JButton button = new JButton(" " + m_ic.getMessage("OK"));
+ // button.setFont(m_da.getFont(DataAccess.FONT_NORMAL));
+ button.setActionCommand("ok");
+ button.addActionListener(this);
+ button.setIcon(m_da.getImageIcon_22x22("ok.png", this));
+ button.setBounds(40, 240, 125, 25);
+ panel.add(button);
+
+ button = new JButton(" " + m_ic.getMessage("CANCEL"));
+ // button.setFont(m_da.getFont(DataAccess.FONT_NORMAL));
+ button.setActionCommand("cancel");
+ button.setIcon(m_da.getImageIcon_22x22("cancel.png", this));
+ button.addActionListener(this);
+ button.setBounds(175, 240, 125, 25);
+ panel.add(button);
+
+ help_button = m_da.createHelpButtonByBounds(185, 210, 115, 25, this);
+ panel.add(help_button);
+
+ m_da.enableHelp(this);
+
+ /*
+ * new JButton(m_ic.getMessage("CANCEL"));
+ * button.setFont(m_da.getFont(DataAccess.FONT_NORMAL));
+ * button.setActionCommand("cancel"); button.addActionListener(this);
+ * button.setBounds(190, 240, 110, 25); panel.add(button);
+ */
+
+ }
+
+ private void initRange() // throws Exception
+ {
+
+ setSize(350, 420);
+ this.m_da.centerJDialog(this);
+
+ JPanel panel = new JPanel();
+ panel.setBounds(0, 0, 350, 400);
+ panel.setLayout(null);
+
+ this.getContentPane().add(panel);
+
+ JLabel label = new JLabel(m_ic.getMessage("PRINTING"));
+ label.setFont(m_da.getFont(DataAccess.FONT_BIG_BOLD));
+ label.setHorizontalAlignment(SwingConstants.CENTER);
+ label.setBounds(0, 20, 350, 35);
+ panel.add(label);
+
+ label = new JLabel(m_ic.getMessage("TYPE_OF_REPORT") + ":");
+ label.setFont(this.font_normal_bold);
+ label.setBounds(40, 75, 280, 25);
+ panel.add(label);
+
+ cb_template = new JComboBox(report_types_2);
+ cb_template.setFont(this.font_normal);
+ cb_template.setBounds(40, 105, 230, 25);
+ panel.add(cb_template);
+
+ // int year = m_da.getC
+
+// int year = gc.get(Calendar.YEAR);
+// int month = gc.get(Calendar.MONTH) + 1;
+ // (new GregorianCalendar()).get(Calendar.YEAR);
+
+ /*
+ * sl_year = new JSpinner(); SpinnerNumberModel model = new
+ * SpinnerNumberModel(year, 1970, year + 1, 1); sl_year.setModel(model);
+ * sl_year.setEditor(new JSpinner.NumberEditor(sl_year, "#"));
+ * sl_year.setFont(this.font_normal); sl_year.setBounds(40, 185, 60,
+ * 25); panel.add(sl_year);
+ *
+ * sl_month = new JSpinner(); SpinnerNumberModel model_m = new
+ * SpinnerNumberModel(month, 1, 12, 1); sl_month.setModel(model_m); //
+ * sl_month.setEditor(new JSpinner.NumberEditor(sl_month, "#"));
+ * sl_month.setFont(this.font_normal); sl_month.setBounds(120, 185, 40,
+ * 25); panel.add(sl_month);
+ */
+
+ label = new JLabel(m_ic.getMessage("SELECT_STARTING_RANGE") + ":");
+ label.setFont(this.font_normal_bold);
+ label.setBounds(40, 155, 180, 25);
+ panel.add(label);
+
+ dc_from = new DateComponent(m_ic);
+ dc_from.setBounds(40, 180, 120, 25);
+ panel.add(dc_from);
+
+ label = new JLabel(m_ic.getMessage("SELECT_ENDING_RANGE") + ":");
+ label.setFont(this.font_normal_bold);
+ label.setBounds(40, 225, 180, 25);
+ panel.add(label);
+
+ dc_to = new DateComponent(m_ic);
+ dc_to.setBounds(40, 250, 120, 25);
+ panel.add(dc_to);
+
+ JButton button = new JButton(" " + m_ic.getMessage("OK"));
+ // button.setFont(m_da.getFont(DataAccess.FONT_NORMAL));
+ button.setActionCommand("ok");
+ button.addActionListener(this);
+ button.setIcon(m_da.getImageIcon_22x22("ok.png", this));
+ button.setBounds(40, 340, 125, 25);
+ panel.add(button);
+
+ button = new JButton(" " + m_ic.getMessage("CANCEL"));
+ // button.setFont(m_da.getFont(DataAccess.FONT_NORMAL));
+ button.setActionCommand("cancel");
+ button.setIcon(m_da.getImageIcon_22x22("cancel.png", this));
+ button.addActionListener(this);
+ button.setBounds(175, 340, 125, 25);
+ panel.add(button);
+
+ help_button = m_da.createHelpButtonByBounds(185, 310, 115, 25, this);
+ panel.add(help_button);
+
+ m_da.enableHelp(this);
+
+ /*
+ * new JButton(m_ic.getMessage("CANCEL"));
+ * button.setFont(m_da.getFont(DataAccess.FONT_NORMAL));
+ * button.setActionCommand("cancel"); button.addActionListener(this);
+ * button.setBounds(190, 240, 110, 25); panel.add(button);
+ */
+
+ }
+
+ /*
+ * Invoked when an action occurs.
+ */
+ /*
+ * public void actionPerformed(ActionEvent e) { String action =
+ * e.getActionCommand();
+ *
+ * if (action.equals("cancel")) { m_actionDone = false; this.dispose(); }
+ * else if (action.equals("ok")) { int yr =
+ * ((Integer)sl_year.getValue()).intValue(); int mnth =
+ * ((Integer)sl_month.getValue()).intValue();
+ *
+ *
+ * MonthlyValues mv = m_da.getDb().getMonthlyValues(yr, mnth);
+ *
+ * if (this.cb_template.getSelectedIndex()==0) { PrintSimpleMonthlyReport
+ * psm = new PrintSimpleMonthlyReport(mv); displayPDF(psm.getName());
+ *
+ * } else { PrintExtendedMonthlyReport psm = new
+ * PrintExtendedMonthlyReport(mv); displayPDF(psm.getName()); }
+ *
+ *
+ * / if (this.tfName.getText().trim().equals("")) {
+ * JOptionPane.showMessageDialog(this, m_ic.getMessage("TYPE_NAME_BEFORE"),
+ * m_ic.getMessage("ERROR"), JOptionPane.ERROR_MESSAGE); return; }
+ * m_actionDone = true;
+ */
+ /*
+ * this.dispose(); } else
+ * System.out.println("PrintingDialog: Unknown command: " + action);
+ *
+ * }
+ */
+
+ /**
+ * performAction
+ */
+ @Override
+ public void performAction(ActionEvent e) throws Exception
+ {
+ String action = e.getActionCommand();
+ if (action.equals("cancel"))
+ {
+ m_actionDone = false;
+ this.dispose();
+ }
+ else if (action.equals("ok"))
+ {
+/*
+ if (this.master_type == PrintingDialog.PRINT_DIALOG_YEAR_MONTH_OPTION)
+ {
+ int yr = ((Integer) sl_year.getValue()).intValue();
+ int mnth = ((Integer) sl_month.getValue()).intValue();
+
+ //ATechDate at = new ATechDate(0, mnth, yr, 0, 0, ATechDate.FORMAT_DATE_ONLY);
+
+ MonthlyValues mv = m_da.getDb().getMonthlyValues(yr, mnth);
+
+
+
+ //DayValuesData ddv = m_da.getDb().getDayValuesData(0, 0);
+
+
+ this.dispose();
+
+ if (this.cb_template.getSelectedIndex() == 0)
+ {
+ PrintSimpleMonthlyReport psm = new PrintSimpleMonthlyReport(mv);
+
+ displayPDF(psm.getNameWithPath());
+
+ }
+ else
+ {
+ PrintExtendedMonthlyReport psm = new PrintExtendedMonthlyReport(mv);
+ displayPDF(psm.getNameWithPath());
+ }
+ }
+ else */
+ {
+
+ System.out.println(this.dc_from.getDate() + " " + this.dc_to.getDate());
+
+ DayValuesData dvd = m_da.getDb().getDayValuesData(this.dc_from.getDate(), this.dc_to.getDate()); //.getMonthlyValues(yr, mnth);
+
+
+ PrintAbstract pa = null;
+
+ if (this.cb_template.getSelectedIndex() == 0)
+ {
+ pa = new PrintFoodMenuBase(dvd);
+ }
+ else if (this.cb_template.getSelectedIndex() == 1)
+ {
+ pa = new PrintFoodMenuExt1(dvd);
+ }
+ else if (this.cb_template.getSelectedIndex() == 2)
+ {
+ pa = new PrintFoodMenuExt2(dvd);
+ }
+ else if (this.cb_template.getSelectedIndex() == 3)
+ {
+ pa = new PrintFoodMenuExt3(dvd);
+ }
+
+
+
+ displayPDF(pa.getNameWithPath());
+ }
+ }
+ }
+
+ /**
+ * Display PDF
+ *
+ * @param name name must be full path to file name (not just name as it was in previous versions)
+ * @throws Exception
+ */
+ public void displayPDF(String name) throws Exception
+ {
+ //Thread.sleep(2000);
+
+ //File f = new File(".");
+ //File f2 = f.getParentFile();
+
+ //System.out.println("Parent: " + f2);
+
+ //File fl = new File(".." + File.separator + "data" + File.separator + "temp" + File.separator);
+ File file = new File(name);
+
+ String pdf_viewer = m_da.getSettings().getPdfVieverPath().replace('\\', '/');
+ //String file_path = fl.getAbsolutePath().replace('\\', '/');
+
+ this.setErrorMessages(m_ic.getMessage("PRINTING_SETTINGS_NOT_SET"), m_ic
+ .getMessage("PRINTING_SETTINGS_NOT_SET_SOL"));
+
+ if (pdf_viewer.equals(""))
+ {
+ throw new Exception(m_ic.getMessage("PRINTING_SETTINGS_NOT_SET"));
+ }
+
+ File acr = new File(pdf_viewer);
+
+ if (!acr.exists())
+ {
+ throw new Exception(m_ic.getMessage("PRINTING_SETTINGS_NOT_SET"));
+ }
+
+ try
+ {
+ if (System.getProperty("os.name").toUpperCase().contains("WIN"))
+ {
+ //System.out.println("Windows found");
+ Runtime.getRuntime().exec(
+ acr.getAbsoluteFile() + " \"" + file.getAbsolutePath() + "\"");
+// Runtime.getRuntime().exec(
+// acr.getAbsoluteFile() + " \"" + fl.getAbsolutePath() + File.separator + name + "\"");
+ }
+ else
+ {
+ //System.out.println("Non-Windows found");
+ Runtime.getRuntime().exec(
+ acr.getAbsoluteFile() + " " + file.getAbsolutePath() );
+// Runtime.getRuntime().exec(
+// acr.getAbsoluteFile() + " " + fl.getAbsolutePath() + File.separator + name);
+ }
+
+ /*
+ Runtime.getRuntime().exec(
+ acr.getAbsoluteFile() + " \"" + fl.getAbsolutePath() + File.separator + name + "\""); */
+ //System.out.println(pdf_viewer + " " + file_path + File.separator + name);
+ System.out.println(pdf_viewer + " " + file.getAbsolutePath());
+ }
+ catch (RuntimeException ex)
+ {
+ this.setErrorMessages(m_ic.getMessage("PDF_VIEVER_RUN_ERROR"), null);
+ System.out.println("RE running AcrobatReader: " + ex);
+ throw ex;
+ }
+ catch (Exception ex)
+ {
+ this.setErrorMessages(m_ic.getMessage("PDF_VIEVER_RUN_ERROR"), null);
+ System.out.println("Error running AcrobatReader: " + ex);
+ throw ex;
+
+ }
+ }
+
+ /**
+ * Display PDF External (static method)
+ *
+ * @param name
+ */
+ public static void displayPDFExternal(String name)
+ {
+ I18nControl ic = I18nControl.getInstance();
+
+ File fl = new File(".." + File.separator + "data" + File.separator + "temp" + File.separator);
+
+ String pdf_viewer = DataAccess.getInstance().getSettings().getPdfVieverPath().replace('\\', '/');
+ String file_path = fl.getAbsolutePath().replace('\\', '/');
+
+ if (pdf_viewer.equals(""))
+ {
+ System.out.println(ic.getMessage("PRINTING_SETTINGS_NOT_SET"));
+ return;
+ }
+
+ File acr = new File(pdf_viewer);
+
+ if (!acr.exists())
+ {
+ System.out.println(ic.getMessage("PRINTING_SETTINGS_NOT_SET"));
+ return;
+ }
+
+ try
+ {
+ Runtime.getRuntime().exec(
+ acr.getAbsoluteFile() + " \"" + fl.getAbsolutePath() + File.separator + name + "\"");
+ System.out.println(pdf_viewer + " " + file_path + File.separator + name);
+ }
+ catch (RuntimeException ex)
+ {
+ // this.setErrorMessages(m_ic.getMessage("PDF_VIEVER_RUN_ERROR"),
+ // null);
+ System.out.println("RE running AcrobatReader: " + ex);
+ // throw ex;
+ }
+ catch (Exception ex)
+ {
+ // this.setErrorMessages(m_ic.getMessage("PDF_VIEVER_RUN_ERROR"),
+ // null);
+ System.out.println("Error running AcrobatReader: " + ex);
+ // throw ex;
+
+ }
+ }
+
+
+ /**
+ * Was Action Successful
+ *
+ * @return true if action was successful (dialog closed with OK)
+ */
+ public boolean actionSuccessful()
+ {
+ return m_actionDone;
+ }
+
+
+ /**
+ * Get Action Results
+ *
+ * @return String array of results
+ */
+ public String[] getActionResults()
+ {
+ String[] res = new String[3];
+
+ if (m_actionDone)
+ res[0] = "1";
+ else
+ res[0] = "0";
+
+ res[1] = this.tfName.getText();
+ res[2] = this.cb_template.getSelectedItem().toString();
+
+ return res;
+ }
+
+ // ****************************************************************
+ // ****** HelpCapable Implementation *****
+ // ****************************************************************
+
+ /**
+ * getComponent - get component to which to attach help context
+ */
+ public Component getComponent()
+ {
+ return this.getRootPane();
+ }
+
+ /**
+ * getHelpButton - get Help button
+ */
+ public JButton getHelpButton()
+ {
+ return this.help_button;
+ }
+
+ /**
+ * getHelpId - get id for Help
+ */
+ public String getHelpId()
+ {
+ return "pages.GGC_Print_Selector";
+ }
+
+ /**
+ * getObject
+ */
+ @Override
+ public Object getObject()
+ {
+ return this;
+ }
+
+}
Modified: trunk/ggc-nutri/src/ggc/nutri/plugin/NutriPlugInServer.java
===================================================================
--- trunk/ggc-nutri/src/ggc/nutri/plugin/NutriPlugInServer.java 2009-04-03 15:53:20 UTC (rev 728)
+++ trunk/ggc-nutri/src/ggc/nutri/plugin/NutriPlugInServer.java 2009-04-03 15:57:53 UTC (rev 729)
@@ -8,6 +8,7 @@
import ggc.nutri.db.datalayer.Meal;
import ggc.nutri.db.datalayer.MealGroup;
import ggc.nutri.dialogs.NutritionTreeDialog;
+import ggc.nutri.gui.print.PrintFoodDialog;
import ggc.nutri.util.DataAccessNutri;
import ggc.nutri.util.I18nControl;
@@ -248,6 +249,11 @@
}
+ /**
+ * Get Backup Objects (if available)
+ *
+ * @return
+ */
@Override
public BackupRestoreCollection getBackupObjects()
{
@@ -261,6 +267,15 @@
}
+ /**
+ * Get PlugIn Main Menu
+ *
+ * This is new way to handle everything, previously we used to pass ActionListener items through
+ * plugin framework, but in new way, we will use this one. We just give main application menu,
+ * which contains all items accessible through menus.
+ *
+ * @return
+ */
@Override
public JMenu getPlugInMainMenu()
{
@@ -294,19 +309,55 @@
// this.createAction(this.menu_food, "MN_MEALS", "MN_MEALS_DESC", "food_meals", null);
- // TODO Auto-generated method stub
return menu_food;
}
+ /**
+ * Get PlugIn Print Menus
+ *
+ * Since printing is also PlugIn specific we need to add Printing jobs to application.
+ *
+ * @return
+ */
@Override
- public JMenu getPlugInPrintMenu()
+ public JMenu[] getPlugInPrintMenus()
{
- // TODO Auto-generated method stub
- return null;
+ JMenu menu_reports_foodmenu = ATSwingUtils.createMenu("MN_FOODMENU", "MN_FOODMENU_DESC", ic);
+
+ ATSwingUtils.createMenuItem(menu_reports_foodmenu,
+ "MN_FOODMENU_SIMPLE",
+ "MN_FOODMENU_SIMPLE_DESC",
+ "report_foodmenu_simple",
+ this, "print.png",
+ ic, DataAccessNutri.getInstance(), parent);
+
+
+ ATSwingUtils.createMenuItem(menu_reports_foodmenu,
+ "MN_FOODMENU_EXT1",
+ "MN_FOODMENU_EXT1_DESC",
+ "report_foodmenu_ext1",
+ this, "print.png",
+ ic, DataAccessNutri.getInstance(), parent);
+
+
+ ATSwingUtils.createMenuItem(menu_reports_foodmenu,
+ "MN_FOODMENU_EXT2",
+ "MN_FOODMENU_EXT2_DESC",
+ "report_foodmenu_ext2",
+ this, "print.png",
+ ic, DataAccessNutri.getInstance(), parent);
+
+ JMenu[] mns = new JMenu[1];
+ mns[0] = menu_reports_foodmenu;
+
+ return mns;
}
+ /**
+ * Action Performed
+ */
public void actionPerformed(ActionEvent ae)
{
String command = ae.getActionCommand();
@@ -323,8 +374,27 @@
{
new NutritionTreeDialog((JFrame)parent, DataAccessNutri.getInstance(), GGCTreeRoot.TREE_MEALS);
}
+ else if (command.equals("report_foodmenu_simple"))
+ {
+ new PrintFoodDialog((JFrame)parent, 1, PrintFoodDialog.PRINT_DIALOG_RANGE_DAY_OPTION);
+ }
+ else if (command.equals("report_foodmenu_ext1"))
+ {
+ new PrintFoodDialog((JFrame)parent, 2, PrintFoodDialog.PRINT_DIALOG_RANGE_DAY_OPTION);
+ }
+ else if (command.equals("report_foodmenu_ext2"))
+ {
+ new PrintFoodDialog((JFrame)parent, 3, PrintFoodDialog.PRINT_DIALOG_RANGE_DAY_OPTION);
+ }
+ /*else if (command.equals("report_foodmenu_ext3"))
+ {
+ // disabled for now, until it's implement to fully function
+ new PrintingDialog(MainFrame.this, 4, PrintingDialog.PRINT_DIALOG_RANGE_DAY_OPTION);
+ } */
+
}
+
}
\ No newline at end of file
Modified: trunk/ggc-plugin_base/build/build.xml
===================================================================
--- trunk/ggc-plugin_base/build/build.xml 2009-04-03 15:53:20 UTC (rev 728)
+++ trunk/ggc-plugin_base/build/build.xml 2009-04-03 15:57:53 UTC (rev 729)
@@ -7,6 +7,7 @@
<!-- Environment properties read from a file ...-->
<property file="./GGCPlugInBaseBuild.properties"/>
<property file="./GGCPlugInBaseVersion.properties"/>
+ <property file="../ggc-core/build/GGC_Core_Version.properties"/>
<!-- These should *not* be modified on the command line! -->
Modified: trunk/ggc-pump/src/ggc/pump/plugin/PumpPlugInServer.java
===================================================================
--- trunk/ggc-pump/src/ggc/pump/plugin/PumpPlugInServer.java 2009-04-03 15:53:20 UTC (rev 728)
+++ trunk/ggc-pump/src/ggc/pump/plugin/PumpPlugInServer.java 2009-04-03 15:57:53 UTC (rev 729)
@@ -277,6 +277,11 @@
}
+ /**
+ * Get Backup Objects (if available)
+ *
+ * @return
+ */
@Override
public BackupRestoreCollection getBackupObjects()
{
@@ -289,6 +294,16 @@
}
+
+ /**
+ * Get PlugIn Main Menu
+ *
+ * This is new way to handle everything, previously we used to pass ActionListener items through
+ * plugin framework, but in new way, we will use this one. We just give main application menu,
+ * which contains all items accessible through menus.
+ *
+ * @return
+ */
@Override
public JMenu getPlugInMainMenu()
{
@@ -296,9 +311,16 @@
return null;
}
-
+
+ /**
+ * Get PlugIn Print Menus
+ *
+ * Since printing is also PlugIn specific we need to add Printing jobs to application.
+ *
+ * @return
+ */
@Override
- public JMenu getPlugInPrintMenu()
+ public JMenu[] getPlugInPrintMenus()
{
// TODO Auto-generated method stub
return null;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X