Menu
▾
▴
[ggc-cvs] SF.net SVN: ggc:[1464] trunk/ggc-desktop-app/ggc-desktop
|
From: <and...@us...> - 2017-06-28 19:15:32
|
Revision: 1464
http://sourceforge.net/p/ggc/code/1464
Author: andyrozman
Date: 2017-06-28 19:15:28 +0000 (Wed, 28 Jun 2017)
Log Message:
-----------
0.8.0 [26.6.2017]
- little update to documentation
- Apointments Implementation
- Doctors Implementation
- Stock/Inventory implementation started
- refactoring a little
- added DialogCreator
Modified Paths:
--------------
trunk/ggc-desktop-app/ggc-desktop/data/update/GGC_Update.properties
trunk/ggc-desktop-app/ggc-desktop/doc/Changelog
trunk/ggc-desktop-app/ggc-desktop/doc/Diabetes_Hardware.txt
trunk/ggc-desktop-app/ggc-desktop/doc/GGC_Supported_Hardware.html
trunk/ggc-desktop-app/ggc-desktop/doc/HardwareLibraries.txt
trunk/ggc-desktop-app/ggc-desktop/doc/How_Can_I_Help.txt
trunk/ggc-desktop-app/ggc-desktop/doc/README.de
trunk/ggc-desktop-app/ggc-desktop/doc/README.en
trunk/ggc-desktop-app/ggc-desktop/doc/README.si
trunk/ggc-desktop-app/ggc-desktop/doc/TO-DO Detailed.txt
trunk/ggc-desktop-app/ggc-desktop/doc/TO-DO.txt
trunk/ggc-desktop-app/ggc-desktop/doc/archive/Changelog_old
trunk/ggc-desktop-app/ggc-desktop/doc/archive/How_Can_I_Help_v1.txt
trunk/ggc-desktop-app/ggc-desktop/doc/archive/How_Can_I_Help_v2.txt
trunk/ggc-desktop-app/ggc-desktop/doc/archive/TO-DO_Archive.txt
trunk/ggc-desktop-app/ggc-desktop/pom.xml
trunk/ggc-desktop-app/ggc-desktop/src/main/java/ggc/GGC.java
trunk/ggc-desktop-app/ggc-desktop/src/main/java/ggc/gui/dialogs/AboutGGCDialog.java
trunk/ggc-desktop-app/ggc-desktop/src/main/java/ggc/gui/dialogs/AppointmentsDialog.java
trunk/ggc-desktop-app/ggc-desktop/src/main/java/ggc/gui/dialogs/DoctorDialog.java
trunk/ggc-desktop-app/ggc-desktop/src/main/java/ggc/gui/dialogs/DoctorsDialog.java
trunk/ggc-desktop-app/ggc-desktop/src/main/java/ggc/gui/dialogs/config/panels/AbstractPrefOptionsPanel.java
trunk/ggc-desktop-app/ggc-desktop/src/main/java/ggc/gui/dialogs/config/panels/ConfigCGMSPanel.java
trunk/ggc-desktop-app/ggc-desktop/src/main/java/ggc/gui/dialogs/config/panels/ConfigPumpPanel.java
trunk/ggc-desktop-app/ggc-desktop/src/main/java/ggc/gui/dialogs/config/panels/PrefFontsAndColorPane.java
trunk/ggc-desktop-app/ggc-desktop/src/main/java/ggc/gui/dialogs/config/panels/PrefGeneralPane.java
trunk/ggc-desktop-app/ggc-desktop/src/main/java/ggc/gui/dialogs/config/panels/PrefLanguagePane.java
trunk/ggc-desktop-app/ggc-desktop/src/main/java/ggc/gui/dialogs/config/panels/PrefMedicalDataPane.java
trunk/ggc-desktop-app/ggc-desktop/src/main/java/ggc/gui/dialogs/config/panels/PrefModePane.java
trunk/ggc-desktop-app/ggc-desktop/src/main/java/ggc/gui/dialogs/config/panels/PrefPrintingPane.java
trunk/ggc-desktop-app/ggc-desktop/src/main/java/ggc/gui/dialogs/config/panels/PrefRenderingQualityPane.java
trunk/ggc-desktop-app/ggc-desktop/src/main/java/ggc/gui/dialogs/doctor/DoctorDialog.java
trunk/ggc-desktop-app/ggc-desktop/src/main/java/ggc/gui/dialogs/doctor/DoctorListDef.java
trunk/ggc-desktop-app/ggc-desktop/src/main/java/ggc/gui/dialogs/doctor/DoctorTypeDialog.java
trunk/ggc-desktop-app/ggc-desktop/src/main/java/ggc/gui/dialogs/doctor/appointment/AppointmentDialog.java
trunk/ggc-desktop-app/ggc-desktop/src/main/java/ggc/gui/dialogs/doctor/appointment/AppointmentListDef.java
trunk/ggc-desktop-app/ggc-desktop/src/main/java/ggc/gui/dialogs/doctor/to-do_doctor.txt
trunk/ggc-desktop-app/ggc-desktop/src/main/java/ggc/gui/dialogs/doctor/worktime/WorkingTimeDialog.java
trunk/ggc-desktop-app/ggc-desktop/src/main/java/ggc/gui/dialogs/stock/StockAmounts.java
trunk/ggc-desktop-app/ggc-desktop/src/main/java/ggc/gui/dialogs/stock/StockSelectorDialog.java
trunk/ggc-desktop-app/ggc-desktop/src/main/java/ggc/gui/dialogs/stock/def/StockListDef.java
trunk/ggc-desktop-app/ggc-desktop/src/main/java/ggc/gui/dialogs/stock/def/StockTypeListDef.java
trunk/ggc-desktop-app/ggc-desktop/src/main/java/ggc/gui/dialogs/stock/def/StocktakingListDef.java
trunk/ggc-desktop-app/ggc-desktop/src/main/java/ggc/gui/main/MainFrame.java
trunk/ggc-desktop-app/ggc-desktop/src/main/java/ggc/gui/main/StatusBar.java
trunk/ggc-desktop-app/ggc-desktop/src/main/java/ggc/gui/main/panels/AbstractInfoPanel.java
trunk/ggc-desktop-app/ggc-desktop/src/main/java/ggc/gui/main/panels/DeviceInfoPanel.java
trunk/ggc-desktop-app/ggc-desktop/src/main/java/ggc/gui/main/panels/GeneralInfoPanel.java
trunk/ggc-desktop-app/ggc-desktop/src/main/java/ggc/gui/main/panels/HbA1cInfoPanel.java
trunk/ggc-desktop-app/ggc-desktop/src/main/java/ggc/gui/main/panels/InfoPanelType.java
trunk/ggc-desktop-app/ggc-desktop/src/main/java/ggc/gui/main/panels/MainWindowInfoPanel.java
trunk/ggc-desktop-app/ggc-desktop/src/main/java/ggc/gui/main/panels/PlugInsInfoPanel.java
trunk/ggc-desktop-app/ggc-desktop/src/main/java/ggc/gui/main/panels/StatisticsInfoPanel.java
trunk/ggc-desktop-app/ggc-desktop/src/main/java/ggc/gui/pen/DailyRowDialog.java
trunk/ggc-desktop-app/ggc-desktop/src/main/java/ggc/gui/pen/DailyRowMealsDialog.java
trunk/ggc-desktop-app/ggc-desktop/src/main/java/ggc/gui/pen/DailyStatsDialog.java
trunk/ggc-desktop-app/ggc-desktop/src/main/java/ggc/gui/test/Testing.java
Added Paths:
-----------
trunk/ggc-desktop-app/ggc-desktop/doc/Developer Image.txt
trunk/ggc-desktop-app/ggc-desktop/src/main/java/ggc/gui/dialogs/GGCCoreDesktopDialogCreator.java
trunk/ggc-desktop-app/ggc-desktop/src/main/java/ggc/gui/dialogs/GGCListDef.java
trunk/ggc-desktop-app/ggc-desktop/src/main/java/ggc/gui/dialogs/config/
trunk/ggc-desktop-app/ggc-desktop/src/main/java/ggc/gui/dialogs/config/PropertiesDialog.java
trunk/ggc-desktop-app/ggc-desktop/src/main/java/ggc/gui/dialogs/config/SchemeDialog.java
trunk/ggc-desktop-app/ggc-desktop/src/main/java/ggc/gui/dialogs/config/SchemeEDDialog.java
trunk/ggc-desktop-app/ggc-desktop/src/main/java/ggc/gui/dialogs/config/graph/
trunk/ggc-desktop-app/ggc-desktop/src/main/java/ggc/gui/dialogs/config/graph/DailyGraphView.java
trunk/ggc-desktop-app/ggc-desktop/src/main/java/ggc/gui/dialogs/config/graph/JFAbstractGraphView.java
trunk/ggc-desktop-app/ggc-desktop/src/main/java/ggc/gui/dialogs/config/panels/
trunk/ggc-desktop-app/ggc-desktop/src/main/java/ggc/gui/dialogs/config/panels/ConfigUsersPanel.java
trunk/ggc-desktop-app/ggc-desktop/src/main/java/ggc/gui/dialogs/config/panels/PrefGlobalPane.java
trunk/ggc-desktop-app/ggc-desktop/src/main/java/ggc/gui/dialogs/inventory/
trunk/ggc-desktop-app/ggc-desktop/src/main/java/ggc/gui/dialogs/inventory/InventoryItemDialog.java
trunk/ggc-desktop-app/ggc-desktop/src/main/java/ggc/gui/dialogs/inventory/InventoryItemTypeDialog.java
trunk/ggc-desktop-app/ggc-desktop/src/main/java/ggc/gui/dialogs/inventory/def/
trunk/ggc-desktop-app/ggc-desktop/src/main/java/ggc/gui/dialogs/inventory/def/InventoryListDef.java
trunk/ggc-desktop-app/ggc-desktop/src/main/java/ggc/gui/dialogs/inventory/def/MainInventoryListDef.java
trunk/ggc-desktop-app/ggc-desktop/src/main/java/ggc/gui/dialogs/selector/
trunk/ggc-desktop-app/ggc-desktop/src/main/java/ggc/gui/main/panels/AppointmentsInfoPanel.java
trunk/ggc-desktop-app/ggc-desktop/src/main/java/ggc/gui/main/panels/InventoryInfoPanel.java
trunk/ggc-desktop-app/ggc-desktop/src/main/resources/icons/cfg_global.png
trunk/ggc-desktop-app/ggc-desktop/src/main/resources/icons/cfg_users.png
trunk/ggc-desktop-app/ggc-desktop/src/main/resources/icons/data_find.png
trunk/ggc-desktop-app/ggc-desktop/src/main/resources/icons/usr_add.png
trunk/ggc-desktop-app/ggc-desktop/src/main/resources/icons/usr_default.png
trunk/ggc-desktop-app/ggc-desktop/src/main/resources/icons/usr_delete.png
trunk/ggc-desktop-app/ggc-desktop/src/main/resources/icons/usr_edit.png
Removed Paths:
-------------
trunk/ggc-desktop-app/ggc-desktop/src/main/java/ggc/gui/cfg/PropertiesDialog.java
trunk/ggc-desktop-app/ggc-desktop/src/main/java/ggc/gui/cfg/SchemeDialog.java
trunk/ggc-desktop-app/ggc-desktop/src/main/java/ggc/gui/cfg/SchemeEDDialog.java
trunk/ggc-desktop-app/ggc-desktop/src/main/java/ggc/gui/cfg/graph/
trunk/ggc-desktop-app/ggc-desktop/src/main/java/ggc/gui/cfg/panels/
trunk/ggc-desktop-app/ggc-desktop/src/main/java/ggc/gui/dialogs/doctor/appointment/DoctorSelector.java
trunk/ggc-desktop-app/ggc-desktop/src/main/java/ggc/gui/dialogs/stock/StockDialog.java
trunk/ggc-desktop-app/ggc-desktop/src/main/java/ggc/gui/dialogs/stock/StockSubTypeDialog.java
trunk/ggc-desktop-app/ggc-desktop/src/main/java/ggc/gui/main/panels/ScheduleInfoPanel.java
trunk/ggc-desktop-app/ggc-desktop/src/main/java/ggc/gui/main/panels/StocksInfoPanel.java
Modified: trunk/ggc-desktop-app/ggc-desktop/data/update/GGC_Update.properties
===================================================================
--- trunk/ggc-desktop-app/ggc-desktop/data/update/GGC_Update.properties 2017-06-28 19:09:37 UTC (rev 1463)
+++ trunk/ggc-desktop-app/ggc-desktop/data/update/GGC_Update.properties 2017-06-28 19:15:28 UTC (rev 1464)
@@ -3,7 +3,6 @@
#
# !!! Do NOT delete and/or edit this file.
#
-# Core: 0.5.0.3, Desktop: 0.5.0.3
#
# Main application
@@ -11,13 +10,16 @@
PRODUCT_ID=ggc
ROOT=..
-VERSION_NAME=0.7
-VERSION_NUMERIC=15
+VERSION_NAME=0.8
+VERSION_NUMERIC=16
-VERSION_DESCRIPTION=Core 0.6.0, Desktop 0.6.0, Meter Tool 2.2.0, Pump Tool 1.5.0, CGMS Tool 1.3.5
+###### NOT DONE YET
+VERSION_DESCRIPTION=Core 0.7.0, Desktop 0.7.0, Meter Tool 2.4.1, Pump Tool 2.0.1, CGMS Tool 1.5.1, Nutrition Tool 1.4.1
+
+
#
# Applications
#
Modified: trunk/ggc-desktop-app/ggc-desktop/doc/Changelog
===================================================================
--- trunk/ggc-desktop-app/ggc-desktop/doc/Changelog 2017-06-28 19:09:37 UTC (rev 1463)
+++ trunk/ggc-desktop-app/ggc-desktop/doc/Changelog 2017-06-28 19:15:28 UTC (rev 1464)
@@ -6,7 +6,16 @@
--------------------------------------------------------------------------------------------------
+0.8.0 [26.6.2017]
+- little update to documentation
+- Apointments Implementation
+- Doctors Implementation
+- Stock/Inventory implementation started
+- refactoring a little
+- added DialogCreator
+
+
0.7.0 [2.2.2016] [Andy]
- table layout:
- refactoring of info panels
Added: trunk/ggc-desktop-app/ggc-desktop/doc/Developer Image.txt
===================================================================
--- trunk/ggc-desktop-app/ggc-desktop/doc/Developer Image.txt (rev 0)
+++ trunk/ggc-desktop-app/ggc-desktop/doc/Developer Image.txt 2017-06-28 19:15:28 UTC (rev 1464)
@@ -0,0 +1,68 @@
+
+DEVELOPER VIRTUAL BOX IMAGE
+============================
+
+Since we had some complaints from people who are not acquinted with Maven, that they have
+problems getting Development running, I decided to create Developer image, contaning all
+software needed for starting development.
+
+IMAGE CONTENT:
+--------------
+- Lubuntu Image 16.10 (x386)
+- Subversion 1.8
+- Maven 3.0.5
+- Java 1.5 (for compiling GGC)
+- Java 1.8 (for IntelliJ)
+- local maven cache for start working (no download needed)
+- IntelliJ 14 - Community edition (I am still using this version, because it works best, and
+ all later changes are pretty bad)
+- Some Intellij Plugins: Save Actions, Eclipse Formatter.
+- PostgreSQL 9.1 with PgAdmin III. (with empty ggc database)
+
+Read-only repositories of:
+- Atech-Software
+- GGC
+
+
+HOW CAN I START
+---------------
+1. Download image
+2. Start it in your Virtual Box
+3. When box is running install "Virtual Box Guest Additions" (for better resolution)
+
+And that's it. You can try out the GGC. You can run Intellij and start GGC from there. (with latest
+version available in Image)
+
+
+START WITH NEVER VERSION
+------------------------
+
+Image of GGC might be older one, so you should probably go to: ~/workspaces/ggc
+and run "svn update", same in ~/workspaces/ggc/atech-tools.
+
+After that just run "mvn clean install" in ~/workspaces/ggc
+
+
+START OF DEVELOPMENT
+--------------------
+
+If you want to start contributing you should check out repositories again with your own
+sourceforge.net username and password (so that you can checkin changes made).
+
+
+NOTES
+-----
+We are still supporting Java 1.5, which is why Java 1.5 is installed. Maven 3.0.5 also
+supports Java 1.5 (it might be the last version that does). There is also Java 8 installed,
+but that is only so that we can run IntelliJ. JavaC points to java 1.5. Theoretically
+you can use any version of java you want, but code checked in needs to be in strict 1.5 format.
+While you can set target to 1.5 in maven, it usually doesn't check if you have writen it
+correctly, which in turn means that it won't be compilable with java 1.5.
+
+There is PostgreSQL database installed with ggc_v7 instance and your development environment
+will start with it, so that you can easily go to database and see data there (pgAdminIII is
+installed for browsing database).
+
+You can also run with standard local database (same as with running application), but
+in that case you are limited with one instance of application.
+
Modified: trunk/ggc-desktop-app/ggc-desktop/doc/Diabetes_Hardware.txt
===================================================================
--- trunk/ggc-desktop-app/ggc-desktop/doc/Diabetes_Hardware.txt 2017-06-28 19:09:37 UTC (rev 1463)
+++ trunk/ggc-desktop-app/ggc-desktop/doc/Diabetes_Hardware.txt 2017-06-28 19:15:28 UTC (rev 1464)
@@ -107,5 +107,10 @@
the same, if you have one, you can just make another copy of same file or link)
+2.) Linux (when running as non-root user)
+Some devices require that you register (add rules) your device, so that you can access it
+(USB devices) directly.
+
+
Modified: trunk/ggc-desktop-app/ggc-desktop/doc/GGC_Supported_Hardware.html
===================================================================
--- trunk/ggc-desktop-app/ggc-desktop/doc/GGC_Supported_Hardware.html 2017-06-28 19:09:37 UTC (rev 1463)
+++ trunk/ggc-desktop-app/ggc-desktop/doc/GGC_Supported_Hardware.html 2017-06-28 19:15:28 UTC (rev 1464)
@@ -623,7 +623,7 @@
<td>Level 2</td>
<td>Planned</td>
<td>-</td>
- <td>End of 2015</td>
+ <td>4Q/2017</td>
<td> </td>
<td></td>
</tr>
@@ -634,7 +634,7 @@
<td>Level 2</td>
<td>Planned</td>
<td>-</td>
- <td>End of 2015</td>
+ <td>4Q/2017</td>
<td> </td>
<td>*1</td>
</tr>
@@ -645,7 +645,7 @@
<td>Level 2</td>
<td>Planned</td>
<td>-</td>
- <td>End of 2015</td>
+ <td>4Q/2017</td>
<td> </td>
<td>*1</td>
</tr>
@@ -656,7 +656,7 @@
<td>Level 2</td>
<td>Planned</td>
<td>-</td>
- <td>End of 2015</td>
+ <td>4Q/2017</td>
<td> </td>
<td>*1</td>
</tr>
@@ -668,7 +668,7 @@
<td>Level 2</td>
<td>Planned</td>
<td>-</td>
- <td>End of 2015</td>
+ <td>4Q/2017</td>
<td> </td>
<td>*1</td>
</tr>
@@ -679,7 +679,7 @@
<td>Level 2</td>
<td>Planned</td>
<td>-</td>
- <td>End of 2015</td>
+ <td>4Q/2017</td>
<td> </td>
<td>*1</td>
</tr>
@@ -690,7 +690,7 @@
<td>Level 2</td>
<td>Planned</td>
<td>-</td>
- <td>End of 2015</td>
+ <td>4Q/2017</td>
<td> </td>
<td>*1</td>
</tr>
@@ -701,7 +701,7 @@
<td>Level 1</td>
<td>Not planned for now</td>
<td>-</td>
- <td>?</td>
+ <td>4Q/2018</td>
<td> </td>
<td>*2. Perhaps export from Carelink</td>
</tr>
@@ -776,14 +776,15 @@
<br>
-*1 - Minimed Pumps currently have 3 interfaces (devices) which can be used to read data from them. <b>ComLink</b> is
-oldest of
-them and is no longer used, so we won't add support for it. Second one is <b>Carelink USB</b>, which is at least for
-most used interface, so we are adding support for this. Third one is <b>Contour Next Link meter</b>. Protocol for
-this one is at this time unknown, so time when this will be supported is undetermined, we hope to get it done by
-end of 2016.<br>
+*1 - Minimed Pumps currently have 3 interfaces (devices) which can be used to read data from them:<br>
+<b>ComLink</b> is oldest of
+them and is no longer used, so we won't add support for it. <br>
+<b>Carelink USB</b> - was most used interface recently, but it stopped working when Linux/Mac stopped using
+USB 2.0 interface. We had support for this, but since it doesn;t work anymore, we have to go with next one<br>
+<b>Contour Next Link meter</b>. Protocol for this one is still mostly unknown, but we are working on decoding it
+and adding support for Medtronic device as soon as we can (probably by end 2017).<br>
*2 - New Minimed Pump uses different protocol (which is supported through Contour Next Link 2.4 meter ), which means
-that it won't be supported together with all other devices.
+that it won't be supported together with all other devices. Support is planned for 2018.
<br><br><br>
@@ -1032,7 +1033,7 @@
<br>
1. Add your user into group plugdev<br>
Add your user into group plugdev (this is the group under which USB devices are loaded as default).
-Please google "udev" for your computer, if this sollutions doesn't work for you.<br>
+Please google "udev" for your computer, if this solutions doesn't work for you.<br>
<br>
2. Add rule in /etc/udev/rules.d<br>
Create file 44-ggc-devices.rules and add entry like this:<br>
Modified: trunk/ggc-desktop-app/ggc-desktop/doc/HardwareLibraries.txt
===================================================================
--- trunk/ggc-desktop-app/ggc-desktop/doc/HardwareLibraries.txt 2017-06-28 19:09:37 UTC (rev 1463)
+++ trunk/ggc-desktop-app/ggc-desktop/doc/HardwareLibraries.txt 2017-06-28 19:15:28 UTC (rev 1464)
@@ -33,7 +33,7 @@
=======
Our Version: 4.1.0
-Latest Version: -
+Latest Version: Latest of 4.1 branch
OS: -
Own version: Yes
Comment: Dependency of Hid4Java.
Modified: trunk/ggc-desktop-app/ggc-desktop/doc/How_Can_I_Help.txt
===================================================================
--- trunk/ggc-desktop-app/ggc-desktop/doc/How_Can_I_Help.txt 2017-06-28 19:09:37 UTC (rev 1463)
+++ trunk/ggc-desktop-app/ggc-desktop/doc/How_Can_I_Help.txt 2017-06-28 19:15:28 UTC (rev 1464)
@@ -22,7 +22,7 @@
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):
-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
+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/?groupId=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.6.2.34, with java 1.8_12)
b.) Send us an email (gg...@at...), with all the data described in A).
@@ -36,7 +36,7 @@
---
So you have been using the software for some time, some things work fine, other not so well. If you find parts of GGC, which your think could work better, please let us know. If you find that some functionality is missing, again, let us know. You can use either email, or you can use the following form (data should be entered in English):
-http://sourceforge.net/tracker/?group_id=49749&atid=457322
+http://sourceforge.net/tracker/?groupId=49749&atid=457322
---
Modified: trunk/ggc-desktop-app/ggc-desktop/doc/README.de
===================================================================
--- trunk/ggc-desktop-app/ggc-desktop/doc/README.de 2017-06-28 19:09:37 UTC (rev 1463)
+++ trunk/ggc-desktop-app/ggc-desktop/doc/README.de 2017-06-28 19:15:28 UTC (rev 1464)
@@ -196,7 +196,7 @@
a) Gehen Sie zur Fehlerberichtserstattungsseite für dieses Projekt und geben
Sie den Fehler selbst ein. Bitte fügen Sie das gepackte Protokoll bei. Die
- Seite ist: http://sourceforge.net/tracker/?group_id=49749&atid=457319 (Bitte
+ Seite ist: http://sourceforge.net/tracker/?groupId=49749&atid=457319 (Bitte
geben Sie Fehlerberichte nur auf Englisch ein!)
Sie müssen kein Sourceforge-Mitglied sein, um Fehler zu berichten. Sofern
Sie kein Mitglied sind, vermerken Sie bitte Ihre E-Mail-Adresse im
@@ -225,7 +225,7 @@
nicht? Bitte berichten Sie über Ihre Erfahrungen (vor allem negative). Sie
können entweder E-Mail schreiben oder oder folgendes Formular (Englisch)
ausfüllen:
-http://sourceforge.net/tracker/?group_id=49749&atid=457322
+http://sourceforge.net/tracker/?groupId=49749&atid=457322
---
Modified: trunk/ggc-desktop-app/ggc-desktop/doc/README.en
===================================================================
--- trunk/ggc-desktop-app/ggc-desktop/doc/README.en 2017-06-28 19:09:37 UTC (rev 1463)
+++ trunk/ggc-desktop-app/ggc-desktop/doc/README.en 2017-06-28 19:15:28 UTC (rev 1464)
@@ -186,7 +186,7 @@
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
+ http://sourceforge.net/tracker/?groupId=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
@@ -213,7 +213,7 @@
know. If you find that some functionality is missing, again, let us know. You can
use either email, or you can use the following form (data should be entered in
English):
-http://sourceforge.net/tracker/?group_id=49749&atid=457322
+http://sourceforge.net/tracker/?groupId=49749&atid=457322
---
Modified: trunk/ggc-desktop-app/ggc-desktop/doc/README.si
===================================================================
--- trunk/ggc-desktop-app/ggc-desktop/doc/README.si 2017-06-28 19:09:37 UTC (rev 1463)
+++ trunk/ggc-desktop-app/ggc-desktop/doc/README.si 2017-06-28 19:15:28 UTC (rev 1464)
@@ -189,7 +189,7 @@
a.) Obiščite spletno stran za poročanje hroščev in vnesite hrošča. Prosim pripnite
arhivirano dnevniško datoteko. Spletna stran je (podatki morajo biti vnešeni
- v angleščini) http://sourceforge.net/tracker/?group_id=49749&atid=457319
+ v angleščini) http://sourceforge.net/tracker/?groupId=49749&atid=457319
Za vpis teh podatkov ne rabite biti član portala sourceforge.net. Če niste član
prosim pustite svoj e-mail naslov nekje v poročilu. Čim bolj natančno opišite
kaj ste delali, ko je prišlo do napake in kako se je aplikacija obnašala po
@@ -215,7 +215,7 @@
malo manj. Če ste našli dele GGC za katere mislite, da bi lahko delovali boljše, nam
prosim sporočite to. Lahko uporabite email, ali pa uporabite naslednjo spletno
stran (na tej strani morajo biti podatki vpisani v angleščini):
-http://sourceforge.net/tracker/?group_id=49749&atid=457322
+http://sourceforge.net/tracker/?groupId=49749&atid=457322
---
Modified: trunk/ggc-desktop-app/ggc-desktop/doc/TO-DO Detailed.txt
===================================================================
--- trunk/ggc-desktop-app/ggc-desktop/doc/TO-DO Detailed.txt 2017-06-28 19:09:37 UTC (rev 1463)
+++ trunk/ggc-desktop-app/ggc-desktop/doc/TO-DO Detailed.txt 2017-06-28 19:15:28 UTC (rev 1464)
@@ -9,10 +9,10 @@
GGC 0.8
========
-- stocks feature
+
- Refactor: - ExtendedDailyValueHandler (add enums)
-METER TOOL:
+METER TOOL: (not tested)
- menarini
- arkray
@@ -22,6 +22,8 @@
GGC 0.9
========
+- stocks feature (req. new DB)
+
- Startup Feature
Modified: trunk/ggc-desktop-app/ggc-desktop/doc/TO-DO.txt
===================================================================
--- trunk/ggc-desktop-app/ggc-desktop/doc/TO-DO.txt 2017-06-28 19:09:37 UTC (rev 1463)
+++ trunk/ggc-desktop-app/ggc-desktop/doc/TO-DO.txt 2017-06-28 19:15:28 UTC (rev 1464)
@@ -45,7 +45,7 @@
GGC Meter Tool
--------------
See TO-DO_MeterTool.txt (in svn/trunk/ggc-meter)
- Planned Device (in near future): Menarini, Arkray, Ascensia Contour Next One, Accu-chek Mobile
+ Planned Device (in near future): Menarini f., Arkray f., Ascensia Contour Next One, Accu-chek Mobile
GGC Pump Tool
@@ -62,7 +62,7 @@
-II. SORTED BY VERSION (Updated 16.10.2016)
+II. SORTED BY VERSION (Updated 17.05.2017)
===========================================
We plan to change version to 1.0, when all entries specified with [1.0] are
@@ -69,24 +69,19 @@
finished (Help for english, Upgrade, Db Tool and Support for multiple persons)
-Version 0.8 [1.6.2016 - 2.2.2017]
+Version 0.8 [x.6.2017]
=================================
-Meanrini support
+Contour ONE: - check if works
-Arkray support
+Menarini support: + implement
+ + integrate
+Arkray support: + implement
+ + integrate
-Graphs (v1):
- Pump:
- - data retrival: - gluco values
+Db Version: + determine version from resource file contents
-DbTool: - base GGC
- - init GGC
- - export GGC
- - restore GGC
-
-
Release 0.8: - prepare release
- release
- webpage
@@ -95,9 +90,29 @@
-Version 0.9 [1.4 - 1.7.2016]
+Version 0.9 [x.12.2017]
=================================
+Add to List: - Meter (Ascensia One ?, Menarini, Arkray)
+
+
+Refactor: - Meter Db
+
+Graphs (v1):
+ Pump:
+ - data retrival: - gluco values
+
+DbTool(?): - base GGC
+ - init GGC
+ - export GGC
+ - restore GGC
+
+Menarini support: - test
+
+Arkray support: - test
+
+HbA1c: - for Pump
+
(1)
Minimed:
- support through Contour Next Link
@@ -108,27 +123,48 @@
- move package
+Inventory: - implement
+ - integrate [Required Db Update functionality]
+Doctors: - integrate [Required Db Update functionality]
Graph: - Configuration CGMS for Graph (Low, High Value)
+
+Hid4Java: - use version 0.5
+ - use serialNumber to access devices
+ - changes to code (disable USB scanner)
+
(4)
-Release 0.7: - prepare release
+Release 0.9: - prepare release
- release
- upgrade configuration
- upgrade server deploy
+================================
+1.0 Milestones
+================================
+* Db Tools Integration: - InitDb [1.0]
+* Update (server) [1.0]
+* Java Help: - Write help pages II. (finish EN) [1.0]
+ - Load from language jar [1.0]
+* Support for multiple persons [1.0]
+
+
================================
+WAITING LIST / WISH LIST
+================================
-GGC 0.9
-========
+-------------------------------------------------------------------------
+CORE
+-------------------------------------------------------------------------
Update System v3 [1.0]
- Software updater
@@ -162,11 +198,47 @@
Fix: UpgradeCheckStatus class, and Statusbar
+Graphs: - Framework v2 (ON HOLD FOR NOW)
+ - read XML definition
+ - graphs type support: - line
+ - bar
+ - ...
+ - CGMS Daily Graph V2
+ - CGMS Weekly Graph
+ - GRAPH EDITOR (Graph Framework 3.0) (ON HOLD FOR NOW)
+ - Predefined graphs for GE (we need to create some usable graphs for end users, and convert all old)
-(8)
+
+DeviceSelector: - resize possibility (ZeroLayout2)
+ - color (just enabled - supported, disabled for now - not supported)
+
+
+* Db Tools Integration: - InitDb [1.0]
+* Support for multiple persons [1.0]
+* Update for Database IMPORTANT !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+
+* DeviceValuesTableModel - problem with existing data if data changes (manual change and then
+ again import)
+
+
+
+-------------------------------------------------------------------------
+PEN/INJECTION
+-------------------------------------------------------------------------
+
+
+Pen/Injection: - Additional data: BP, Weight, Pills
+
+
+-------------------------------------------------------------------------
+PLUGINS - CONNECT
+-------------------------------------------------------------------------
+
GGC Connect Plugin: - base
- about
- display version
+ - integrate
- export GUI
- import GUI
- GGC: - import Pen
@@ -177,164 +249,51 @@
- export CGMS
- SiDiary: - export
- import
+ - connect to Nutrition SLO Db
-(9)
-Doctors module: [Required Db Update functionality]
- - add doctor: - dialog
- - working days
- + working hours
- - add scheduling entry: - dialog
+* 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...
+-------------------------------------------------------------------------
+PLUGINS - PUMP & CGMS
+-------------------------------------------------------------------------
-
-REFACTORING 0.7 or later
-=========================
-
-GUI Refacoring: - main window
- - pen: ?
- - pumo: ?
- - cgms: ?
- - tools: ?
- - ...
-
-Project refactoring: - add doctors project as maven:
- - core
- - desktop
- - server (?)
- - add desktop little as separate project
- - create correct maven structure: - core
- - desktop
- - plugin_base (rename ?)
- - cgms
- - pump
- - meter
- - nutrition
-
-
-GGC Help:
-
- *******************************************************************
- *** Section * Done * All * N/A ***
- *******************************************************************
- * Main * 0 * 1 * ***
- * File * 0 * 2 * 2 ***
- * Pen/Injection * 0 * 13 * 4 ***
- * Food * 0 * 17 * 2 ***
- * Doctor * 0 * 3 * 3 ***
- * Printing * 0 * 3 * 3 ***
- * Graphs * * * ? ***
- * Plugin - Core * 0 * 10 * ***
- * Meter * * * ***
- * Pump * 0 * 9 * 4 ***
- * CGMS * 0 * 0 * ***
- * Tools * 0 * 10 * ***
- * Help * 0 * 1 * 1 ***
- *******************************************************************
-
-
-
-(Low)
-Refactoring: - DataAccess -> Languages
- - DataAccess (PlugIns also) -> Decimal Formaters (new way)
- - PlugInBaseExceptionType -> Translations for exceptions
- - refactor configuration (gui parts, changes detection, make more like ConfigPump...)
- - refactor numeric formatters in DataAccess
- - refactor Pump Report to use internal data retrieval to use PrintParameter
- - Pump Profile Editor -> Not available for some pumps
- - Pump -> Manual -> Add -> Profile Selector not available for some Pumps (implement it must be available)
- - Pump Profile (??) - rethinking after Minimed is finished, possible removal
- - in configuration we use old Graph for display of settings, reimplet with new Graph v1
- (Atech Graph V1) and then remove all of pre V1 implementation (rumbi's Jchart preview).
-
-
-Tasks: - configuration of colors for Daily TimeSheet report (hardcoded)
- - configuration CGMS: Low Target range, High target range (graph, reports)
-
-ReportPluginDefinition:
- - refactor all reports to use same Print Dialog (at least Food, Pump and CGMS should use the same), add
- printing defintions or something similar, this should also take care of register of menus for
- printing.
- - Pump 100%
- - Food 20%
- - CGMS 20%
- - Connect ---
- - Meter ---
- - Core ???
-
-
-
-
-
-**************************************************************************************
-Version 0.10
-**************************************************************************************
-
-(6)
-Stocks: ... [?]
-
-Graphs: - Framework v2
- - read XML definition
- - graphs type support: - line
- - bar
- - ...
- - CGMS Daily Graph V2
- - CGMS Weekly Graph
-
-HbA1c: - for Pump
-
-Minimed: - comlink: read CGMS data
+Minimed: x comlink: read CGMS data
- decode CGMS history data
- - carelink: read CGMS data
- - carelink: read CGMS history data
+ x carelink: read CGMS data
+ x carelink: read CGMS history data
- add support for contour next link
- contourNextLink: read pump data
- contourNextLink: read pump history data
- contourNextLink: read CGMS data
- contourNextLink: read CGMS history data
- - support 5306??
+ - support 640G? (ContourNextLink 2.4)?
-DeviceSelector: - resize possibility (ZeroLayout2)
- - color (just enabled - supported, disabled for now - not supported)
+Tandem: - ???
-Pump: - Additional data: BP, Weight, Pills
+-------------------------------------------------------------------------
+PLUGINS - PUMP
+-------------------------------------------------------------------------
-Pen/Injection: - Additional data: BP, Weight, Pills
+Pump: - Additional data: BP, Weight, Pills
+* Tandem support ??
-0.9
-====
-* Graphs:
- - Graphs
- - GRAPH EDITOR (Graph Framework 3.0)
- - Predefined graphs for GE (we need to create some usable graphs for end users, and convert all old)
+-------------------------------------------------------------------------
+PLUGINS - NUTRITION
+-------------------------------------------------------------------------
-* Db Tools Integration: - InitDb [1.0]
-
-* Support for multiple persons [1.0]
-
-
-
-* Update for Database IMPORTANT !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-
-
-Bugs:
* Nutrition Db in DataAccess fix (works ok, just outside confines of framework) - 5
-* DeviceValuesTableModel - problem with existing data if data changes (manual change and then
- again import)
-GGC 0.10
-=======
-
-* External foods database
-
* Added functionality for Nutrition Db:
- Import data (selective)
- Import Entry
@@ -346,126 +305,143 @@
- Glycemic data change
- Foods tree, we need to see about dynamic loading, since it takes a lot of memory to hold this information
-* Stocks
- - AED subtypes
- - AED stocks
-* Tandem support ??
+* External foods database
-GGC 0.11 and later
-==================
+-------------------------------------------------------------------------
+CORE FUNCTIONALITIES
+-------------------------------------------------------------------------
-* GGC Little
+* Activity Manager
+
* Server Error Resolution (exceptions thrown by application, that help can be found on internet).
-* Activity Manager
+
* Synchronization
+
* GGC Network
+
* Internet data (links for pages, forums, blogs - informational)
- AED Inet Group
- AED Inet Type
- AED Inet Links
-* GGC PPC (??)
-* Appoinmtments Mngr
- - AED doctor
- - AED appointment
-
* GGC Network - Support for multiple instances of GGC and their communication
-* 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...
-----
+-------------------------------------------------------------------------
+OTHER
+-------------------------------------------------------------------------
+* GGC Little
+* GGC: - Android (??)
+ - Iphone
-1.0 Milestones
-==============
-* Db Tools Integration: - InitDb [1.0]
-* Update (server) [1.0]
-* Java Help - Write help pages II. (finish EN) [1.0]
- - Load from language jar [1.0]
-* Support for multiple persons [1.0]
+================================
+REFACTORING
+================================
-III. SORTED BY LEVELS OF PRIORITY (not updated !!!)
-=================================
+GUI Refacoring: - main window
+ - pen: ?
+ - pumo: ?
+ - cgms: ?
+ - tools: ?
+ - ...
-Level 1 (High Priority):
-----------------------------
+Project refactoring: - add doctors project as maven:
+ + core
+ - desktop
+ - server (?)
+ - add desktop little as separate project
+ - create correct maven structure: + core
+ + desktop
+ + plugin_base (rename ?)
+ + cgms
+ + pump
+ + meter
+ + nutrition
+ - atech-tools
-Level 2 (Medium 1 Priority):
-----------------------------
+GGC Help:
+ *******************************************************************
+ *** Section * Done * All * N/A ***
+ *******************************************************************
+ * Main * 0 * 1 * ***
+ * File * 0 * 2 * 2 ***
+ * Pen/Injection * 0 * 13 * 4 ***
+ * Food * 0 * 17 * 2 ***
+ * Doctor * 0 * 3 * 3 ***
+ * Printing * 0 * 3 * 3 ***
+ * Graphs * * * ? ***
+ * Plugin - Core * 0 * 10 * ***
+ * Meter * * 0 * ***
+ * Pump * 0 * 9 * 4 ***
+ * CGMS * 0 * 0 * ***
+ * Tools * 0 * 10 * ***
+ * Help * 0 * 1 * 1 ***
+ *******************************************************************
+ * Together * 0 * 0 * ***
+ *******************************************************************
-* Import/Export Tool (old data):
-// o Export old data (daily values, with conversion of BS format, in db can be only in mg/Dl)
-// o Import old data (daily values)
- o Db Maintainance GUI
-* Add external library for graphs (something with pictures creations, so we can use it in pdfs)
+(Low)
+Refactoring: - DataAccess -> Languages
+ - DataAccess (PlugIns also) -> Decimal Formaters (new way)
+ - PlugInBaseExceptionType -> Translations for exceptions
+ - refactor configuration (gui parts, changes detection, make more like ConfigPump...)
+ - refactor numeric formatters in DataAccess
+ - refactor Pump Report to use internal data retrieval to use PrintParameter
+ - Pump Profile Editor -> Not available for some pumps
+ - Pump -> Manual -> Add -> Profile Selector not available for some Pumps (implement it must be available)
+ - Pump Profile (??) - rethinking after Minimed is finished, possible removal
+ - in configuration we use old Graph for display of settings, reimplet with new Graph v1
+ (Atech Graph V1) and then remove all of pre V1 implementation (rumbi's Jchart preview).
-Level 3 (Medium 2 Priority):
-----------------------------
-* DB TOOL
- o ???
- o Nutrition data Init
- o Basic Data Init
+Tasks: - configuration of colors for Daily TimeSheet report (hardcoded)
+ - configuration CGMS: Low Target range, High target range (graph, reports)
-* Import/Export Tool (for real time):
- o Backup
- o Restore
+ReportPluginDefinition:
+ - refactor all reports to use same Print Dialog (at least Food, Pump and CGMS should use the same), add
+ printing defintions or something similar, this should also take care of register of menus for
+ printing.
+ - Pump 100%
+ - Food 20%
+ - CGMS 20%
+ - Connect ---
+ - Meter ---
+ - Core ???
-Level 4 (Medium 3 Priority):
-----------------------------
-* Entering daily data:
- o Add CH entry through meals
-
-* Java Help:
- x Integration
- o Write English help
-Level 5 (Low Priority):
-----------------------------
-* Appointments/Doctors:
- o Create GUI
- o Database entries
- o Add/Edit/Delete
- o View
-* GGC Little:
- o GUI
- o about
- o meter import, add/edit should be centered
-* Adding support for mmol/l (now we have only mG/DL):
- o graphs
-* Web Links:
- o Db
+III. LANGUAGE SUPPORT
+======================
-Level 6 (IN NEAR FUTURE):
--------------------------
+LANGUAGE STATUS LAST UPDATE
+---------------------------------------------
+German WIP (50%) -
+Slovenian WIP (75%) -
+French: DONE 0.5
-* I18n Language: German (work in progress)
-* I18n Language: Slovenian (work in progress 74% done)
* I18n Language: Italian
Modified: trunk/ggc-desktop-app/ggc-desktop/doc/archive/Changelog_old
===================================================================
--- trunk/ggc-desktop-app/ggc-desktop/doc/archive/Changelog_old 2017-06-28 19:09:37 UTC (rev 1463)
+++ trunk/ggc-desktop-app/ggc-desktop/doc/archive/Changelog_old 2017-06-28 19:15:28 UTC (rev 1464)
@@ -635,7 +635,7 @@
all texts for check and select elements were displayed to close to control
2006-04-14 (v0.2.1.10) Andy Rozman <and...@us...>
- * moved ggc.gui.PropertiesFrame to ggc.gui.cfg.PropertiesDialog, and changed internal
+ * moved ggc.gui.PropertiesFrame to ggc.gui.dialogs.config.PropertiesDialog, and changed internal
workings, so that after properties are done, we can save all setting and not just the
current as it was till now.
* changed DailyStatsDialog to display graph and ti display error if no row was selected.
Modified: trunk/ggc-desktop-app/ggc-desktop/doc/archive/How_Can_I_Help_v1.txt
===================================================================
--- trunk/ggc-desktop-app/ggc-desktop/doc/archive/How_Can_I_Help_v1.txt 2017-06-28 19:09:37 UTC (rev 1463)
+++ trunk/ggc-desktop-app/ggc-desktop/doc/archive/How_Can_I_Help_v1.txt 2017-06-28 19:15:28 UTC (rev 1464)
@@ -34,7 +34,7 @@
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
+ http://sourceforge.net/tracker/?groupId=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
@@ -60,7 +60,7 @@
know. If you find that some functionality is missing, again, let us know. You can
use either email, or you can use the following form (data should be entered in
English):
-http://sourceforge.net/tracker/?group_id=49749&atid=457322
+http://sourceforge.net/tracker/?groupId=49749&atid=457322
---
Modified: trunk/ggc-desktop-app/ggc-desktop/doc/archive/How_Can_I_Help_v2.txt
===================================================================
--- trunk/ggc-desktop-app/ggc-desktop/doc/archive/How_Can_I_Help_v2.txt 2017-06-28 19:09:37 UTC (rev 1463)
+++ trunk/ggc-desktop-app/ggc-desktop/doc/archive/How_Can_I_Help_v2.txt 2017-06-28 19:15:28 UTC (rev 1464)
@@ -34,7 +34,7 @@
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
+ http://sourceforge.net/tracker/?groupId=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
@@ -60,7 +60,7 @@
know. If you find that some functionality is missing, again, let us know. You can
use either email, or you can use the following form (data should be entered in
English):
-http://sourceforge.net/tracker/?group_id=49749&atid=457322
+http://sourceforge.net/tracker/?groupId=49749&atid=457322
---
Modified: trunk/ggc-desktop-app/ggc-desktop/doc/archive/TO-DO_Archive.txt
===================================================================
--- trunk/ggc-desktop-app/ggc-desktop/doc/archive/TO-DO_Archive.txt 2017-06-28 19:09:37 UTC (rev 1463)
+++ trunk/ggc-desktop-app/ggc-desktop/doc/archive/TO-DO_Archive.txt 2017-06-28 19:15:28 UTC (rev 1464)
@@ -4,7 +4,42 @@
****************************************************************
+0.8
+===
+Doctors: + implemented but hidden (db change and update required)
+Doctors module:
+ + add doctor: + dialog
+ + working days
+ + working hours
+ + add scheduling entry: + dialog
+
+
+
+CANCELED 0.7
+=============
+
+Minimed: - comlink: read history data from device -2.1
+
+
+
+
+0.7
+====
+
+(6)
+Graphs (v2):
+ - CGMS Daily Graph V2
+ - CGMS Weekly Graph
+
+Graphs (v1): (make them workable for Pen and add them for Pump)
+
+ Pen:
+ - cleanup code
+
+
+
+
===============================================================================
===============================================================================
DONE
@@ -369,31 +404,12 @@
- web page
-CANCELED 0.7
-=============
-Minimed: - comlink: read history data from device -2.1
-DONE Version 0.7
-=================
-(6)
-Graphs (v2):
- - CGMS Daily Graph V2
- - CGMS Weekly Graph
-
-Graphs (v1): (make them workable for Pen and add them for Pump)
-
- Pen:
- - cleanup code
-
-
-
-
-
==============================
Modified: trunk/ggc-desktop-app/ggc-desktop/pom.xml
===================================================================
--- trunk/ggc-desktop-app/ggc-desktop/pom.xml 2017-06-28 19:09:37 UTC (rev 1463)
+++ trunk/ggc-desktop-app/ggc-desktop/pom.xml 2017-06-28 19:15:28 UTC (rev 1464)
@@ -14,8 +14,10 @@
<version>${ggc-desktop.version}</version>
+ <dependencies>
- <dependencies>
+ <!-- GGC Dependencies -->
+
<dependency>
<groupId>com.atech-software</groupId>
<artifactId>atech-tools</artifactId>
@@ -57,14 +59,24 @@
<artifactId>ggc-nutrition-tool</artifactId>
</dependency>
- <!--
+
<dependency>
<groupId>net.sf.ggc</groupId>
<artifactId>ggc-connect-tool</artifactId>
</dependency>
--->
+
+ <!-- GGC Temporary Dependecies (testing only) -->
+
<dependency>
+ <groupId>net.sf.ggc</groupId>
+ <artifactId>ggc-device-menarini</artifactId>
+ </dependency>
+
+
+ <!-- Support Libraries -->
+
+ <dependency>
<groupId>javax.help</groupId>
<artifactId>javahelp</artifactId>
</dependency>
@@ -74,13 +86,7 @@
<artifactId>skinlf</artifactId>
</dependency>
- <!--
<dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </dependency>
--->
- <dependency>
<groupId>jfree</groupId>
<artifactId>jfreechart</artifactId>
</dependency>
@@ -111,24 +117,15 @@
</dependency>
- <!--
<dependency>
<groupId>info.clearthought</groupId>
- <artifactId>table-layout-j15</artifactId>
- <version>1.0</version>
+ <artifactId>table-layout</artifactId>
</dependency>
- -->
<dependency>
- <groupId>info.clearthought</groupId>
- <artifactId>table-layout</artifactId>
+ <groupId>javax.jmdns</groupId>
+ <artifactId>jmdns</artifactId>
</dependency>
-
- <!-- <dependency> <groupId>org.swinglabs</groupId> <artifactId>pdf-renderer</artifactId>
- </dependency> <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId>
- </dependency> -->
-
-
</dependencies>
</project>
Modified: trunk/ggc-desktop-app/ggc-desktop/src/main/java/ggc/GGC.java
===================================================================
--- trunk/ggc-desktop-app/ggc-desktop/src/main/java/ggc/GGC.java 2017-06-28 19:09:37 UTC (rev 1463)
+++ trunk/ggc-desktop-app/ggc-desktop/src/main/java/ggc/GGC.java 2017-06-28 19:15:28 UTC (rev 1464)
@@ -41,6 +41,7 @@
private static GGC s_theApp;
private static MainFrame s_mainWindow;
+
// Version information
/**
* Version of application
@@ -50,9 +51,8 @@
/**
* Full Version
*/
- public static String full_version = "v" + DataAccess.CORE_VERSION;
+ // public static String full_version = "v" + DataAccess.CORE_VERSION;
-
/**
* Version Date
*/
@@ -67,8 +67,8 @@
{
GGCDbConfig conf = new GGCDbConfig(true);
- DbCheckReport dcr = new DbCheckReport(conf.getDbInfoReportFilename(),
- DataAccess.getInstance().getI18nControlInstance());
+ DbCheckReport dcr = new DbCheckReport(conf.getDbInfoReportFilename(), DataAccess.getInstance()
+ .getI18nControlInstance());
if (dcr.canApplicationStart())
return true;
Deleted: trunk/ggc-desktop-app/ggc-desktop/src/main/java/ggc/gui/cfg/PropertiesDialog.java
===================================================================
--- trunk/ggc-desktop-app/ggc-desktop/src/main/java/ggc/gui/cfg/PropertiesDialog.java 2017-06-28 19:09:37 UTC (rev 1463)
+++ trunk/ggc-desktop-app/ggc-desktop/src/main/java/ggc/gui/cfg/PropertiesDialog.java 2017-06-28 19:15:28 UTC (rev 1464)
@@ -1,395 +0,0 @@
-package ggc.gui.cfg;
-
-import java.awt.*;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.util.ArrayList;
-
-import javax.swing.*;
-import javax.swing.event.ListSelectionEvent;
-import javax.swing.event.ListSelectionListener;
-
-import com.atech.help.HelpCapable;
-import com.atech.i18n.I18nControlAbstract;
-import com.atech.utils.ATSwingUtils;
-
-import ggc.core.data.cfg.ConfigCellRenderer;
-import ggc.core.data.defs.GlucoseUnitType;
-import ggc.core.util.DataAccess;
-import ggc.gui.cfg.panels.*;
-
-/**
- * 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: PropertiesDialog
- * Description: Dialog for setting properties for application.
- *
- * Author: andyrozman {an...@at...}
- */
-
-// REFACTOR
-public class PropertiesDialog extends JDialog implements ListSelectionListener, ActionListener, HelpCapable
-{
-
- private static final long serialVersionUID = -5813992933782713913L;
-
- private DataAccess dataAccess = DataAccess.getInstance();
- private I18nControlAbstract i18nControl = dataAccess.getI18nControlInstance();
-
- private JList list = null;
- private JPanel mainEditPanel;
- private JButton helpButton;
-
- private ArrayList<AbstractPrefOptionsPanel> panels = null;
-
- private int currentIndex = 0;
- private boolean okAction = false;
-
- // used for updating preferences correctly when glucoseUnit changes
- private PrefFontsAndColorPane fontsAndColorPane = null;
- private PrefRenderingQualityPane renderingQualityPane = null;
- AbstractPrefOptionsPanel selectedPanel = null;
-
- /**
- * Config types
- */
- public String configTypes[] = { //
- i18nControl.getMessage("MODE"), //
- i18nControl.getMessage("GENERAL"), //
- i18nControl.getMessage("MEDICAL_DATA"), //
- i18nControl.getMessage("COLORS_AND_FONTS"), //
- i18nControl.getMessage("RENDERING_QUALITY"), //
- i18nControl.getMessage("PRINTING"), //
- i18nControl.getMessage("LANGUAGE"), //
- i18nControl.getMessage("PUMP"), //
- i18nControl.getMessage("CGMS") //
- };
-
-
- /**
- * Constructor
- *
- * @param da
- */
- public PropertiesDialog(DataAccess da)
- {
- super(da.getMainParent(), "", true);
-
- setSize(640, 480);
- setTitle(i18nControl.getMessage("PREFERENCES"));
-
- ATSwingUtils.initLibrary();
-
- ATSwingUtils.centerJDialog(this, da.getMainParent());
-
- helpButton = ATSwingUtils.createHelpButtonBySize(120, 25, this, dataAccess);
- createPanels();
-
- init();
- selectPanel(0);
- this.setResizable(false);
- this.setVisible(true);
- }
-
-
- @SuppressWarnings({ "unchecked", "rawtypes" })
- private void init()
- {
- Dimension dim = new Dimension(120, 25);
-
- list = new JList(configTypes);
- list.addListSelectionListener(this);
- ConfigCellRenderer renderer = new ConfigCellRenderer();
- renderer.setPreferredSize(new Dimension(100, 75));
- list.setCellRenderer(renderer);
- list.setSelectedIndex(0);
-
- JScrollPane prefTreePane = new JScrollPane(list, ScrollPaneConstants.VERTICAL_SCROLLBAR_ALWAYS,
- ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
-
- mainEditPanel = new JPanel(new BorderLayout());
-
- // set the buttons up...
- JButton okButton = new JButton(" " + i18nControl.getMessage("OK"));
- okButton.setPreferredSize(dim);
- okButton.setIcon(ATSwingUtils.getImageIcon_22x22("ok.png", this, dataAccess));
- okButton.setActionCommand("ok");
- okButton.addActionListener(this);
-
- JButton cancelButton = new JButton(" " + i18nControl.getMessage("CANCEL"));
- cancelButton.setPreferredSize(dim);
- cancelButton.setIcon(ATSwingUtils.getImageIcon_22x22("cancel.png", this, dataAccess));
- cancelButton.setActionCommand("cancel");
- cancelButton.addActionListener(this);
-
- JButton applyButton = new JButton(" " + i18nControl.getMessage("APPLY"));
- applyButton.setPreferredSize(dim);
- applyButton.setIcon(ATSwingUtils.getImageIcon_22x22("flash.png", this, dataAccess));
- applyButton.setActionCommand("apply");
- applyButton.addActionListener(this);
-
- // ...and align them in a row at the buttom.
- JPanel buttonPanel = new JPanel();
- buttonPanel.setAlignmentX(Component.RIGHT_ALIGNMENT);
- buttonPanel.add(okButton);
- buttonPanel.add(cancelButton);
- buttonPanel.add(applyButton);
-
- buttonPanel.add(helpButton);
-
- mainEditPanel.add(buttonPanel, BorderLayout.SOUTH);
- mainEditPanel.add(panels.get(0), BorderLayout.CENTER);
-
- getContentPane().add(prefTreePane, BorderLayout.WEST);
- // getContentPane().add(list, BorderLayout.WEST);
- getContentPane().add(mainEditPanel, BorderLayout.CENTER);
- }
-
-
- /**
- * Create Panels
- */
- public void createPanels()
- {
- // Each node must have a panel, and panel numbers must be as they are
- // added
- // to. You must add panels in same order as you add, nodes.
-
- panels = new ArrayList<AbstractPrefOptionsPanel>();
- // panel_id = new Hashtable<String, String>();
-
- // addPanel(i18nControl.getMessage("PREFERENCES"), this.PANEL_MAIN, new
- // PrefMainPane());
- // addPanel(i18nControl.getMessage("MODE"), PANEL_MODE, new
- // PrefModePane(this));
- // addPanel(i18nControl.getMessage("GENERAL"), this.PANEL_GENERAL, new
- // PrefGeneralPane(this));
- // addPanel(i18nControl.getMessage("MEDICAL_DATA"),
- // this.PANEL_MEDICAL_DATA, new PrefMedicalDataPane(this));
- // fontsAndColorPane = new PrefFontsAndColorPane(this); // to be able to
- // use
- // // updateGraphView with an
- // // instance later.
- ...
[truncated message content] |
