You can subscribe to this list here.
2002 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(74) |
Aug
(72) |
Sep
|
Oct
|
Nov
|
Dec
|
---|---|---|---|---|---|---|---|---|---|---|---|---|
2005 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(21) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
2006 |
Jan
|
Feb
(1) |
Mar
(122) |
Apr
(93) |
May
(5) |
Jun
(2) |
Jul
|
Aug
(2) |
Sep
(2) |
Oct
|
Nov
|
Dec
(18) |
2007 |
Jan
(5) |
Feb
|
Mar
(29) |
Apr
(11) |
May
(1) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
2008 |
Jan
(29) |
Feb
(24) |
Mar
(7) |
Apr
(33) |
May
(30) |
Jun
(29) |
Jul
(38) |
Aug
(57) |
Sep
(33) |
Oct
(22) |
Nov
(39) |
Dec
(27) |
2009 |
Jan
(15) |
Feb
(21) |
Mar
(44) |
Apr
(43) |
May
(13) |
Jun
(52) |
Jul
(40) |
Aug
(30) |
Sep
(1) |
Oct
(12) |
Nov
(7) |
Dec
(14) |
2010 |
Jan
(24) |
Feb
(44) |
Mar
(24) |
Apr
(14) |
May
(15) |
Jun
(32) |
Jul
(7) |
Aug
(18) |
Sep
(1) |
Oct
(21) |
Nov
|
Dec
(19) |
2011 |
Jan
(12) |
Feb
(9) |
Mar
(4) |
Apr
|
May
(1) |
Jun
|
Jul
(15) |
Aug
(6) |
Sep
(8) |
Oct
(3) |
Nov
|
Dec
(8) |
2012 |
Jan
(1) |
Feb
|
Mar
|
Apr
|
May
(18) |
Jun
|
Jul
(3) |
Aug
|
Sep
|
Oct
(2) |
Nov
|
Dec
(7) |
2013 |
Jan
(3) |
Feb
|
Mar
|
Apr
|
May
(1) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
2014 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(16) |
Jun
(19) |
Jul
(1) |
Aug
(10) |
Sep
(29) |
Oct
(12) |
Nov
(4) |
Dec
(1) |
2015 |
Jan
|
Feb
(9) |
Mar
(4) |
Apr
(1) |
May
|
Jun
|
Jul
(2) |
Aug
(2) |
Sep
(1) |
Oct
(28) |
Nov
|
Dec
(3) |
2016 |
Jan
|
Feb
(3) |
Mar
|
Apr
|
May
(9) |
Jun
(6) |
Jul
|
Aug
|
Sep
(2) |
Oct
|
Nov
|
Dec
(45) |
2017 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(10) |
Jul
|
Aug
|
Sep
(11) |
Oct
(1) |
Nov
|
Dec
|
From: <and...@us...> - 2016-12-25 20:52:11
|
Revision: 1453 http://sourceforge.net/p/ggc/code/1453 Author: andyrozman Date: 2016-12-25 20:52:08 +0000 (Sun, 25 Dec 2016) Log Message: ----------- ggc - moving files arround Modified Paths: -------------- trunk/ggc-plugins/ggc-connect/pom.xml trunk/ggc-plugins/ggc-nutrition/src/main/java/ggc/nutri/db/datalayer/FoodGroup.java Property Changed: ---------------- trunk/ Index: trunk =================================================================== --- trunk 2016-12-25 20:36:22 UTC (rev 1452) +++ trunk 2016-12-25 20:52:08 UTC (rev 1453) Property changes on: trunk ___________________________________________________________________ Modified: svn:ignore ## -5,3 +5,5 ## ggc-device-minimed-decode ggc-device-minimed + +\*.iml Modified: trunk/ggc-plugins/ggc-connect/pom.xml =================================================================== --- trunk/ggc-plugins/ggc-connect/pom.xml 2016-12-25 20:36:22 UTC (rev 1452) +++ trunk/ggc-plugins/ggc-connect/pom.xml 2016-12-25 20:52:08 UTC (rev 1453) @@ -3,53 +3,24 @@ <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> + <artifactId>ggc-plugins</artifactId> + <version>0.8-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> </parent> - <groupId>net.sf.ggc</groupId> - <name>GGC Connect Tool Project</name> - + <name>GGC Plugins - Connect Tool</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> @@ -57,10 +28,9 @@ <dependency> <groupId>net.sf.ggc</groupId> - <artifactId>ggc-plugin-base</artifactId> + <artifactId>ggc-plugins-base</artifactId> </dependency> - <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> @@ -75,7 +45,6 @@ <version>8.4-702.jdbc3</version> </dependency> - </dependencies> <properties> Modified: trunk/ggc-plugins/ggc-nutrition/src/main/java/ggc/nutri/db/datalayer/FoodGroup.java =================================================================== --- trunk/ggc-plugins/ggc-nutrition/src/main/java/ggc/nutri/db/datalayer/FoodGroup.java 2016-12-25 20:36:22 UTC (rev 1452) +++ trunk/ggc-plugins/ggc-nutrition/src/main/java/ggc/nutri/db/datalayer/FoodGroup.java 2016-12-25 20:52:08 UTC (rev 1453) @@ -637,7 +637,7 @@ tx.commit(); - return "" + _id.longValue(); + return "" + _id; } @@ -724,7 +724,7 @@ { if (this.group_type == 1) { - this.group_db1 = (FoodGroupH) sess.get(FoodGroupH.class, new Long(this.getId())); + this.group_db1 = (FoodGroupH) sess.get(FoodGroupH.class, this.getId()); sess.update(this.group_db1); } else This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <and...@us...> - 2016-12-25 20:36:24
|
Revision: 1452 http://sourceforge.net/p/ggc/code/1452 Author: andyrozman Date: 2016-12-25 20:36:22 +0000 (Sun, 25 Dec 2016) Log Message: ----------- ggc - moving files arround Modified Paths: -------------- trunk/pom.xml Added Paths: ----------- trunk/ggc-android-app/ trunk/ggc-removed/ggc-doctor_server/ Removed Paths: ------------- trunk/build/ Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2016-12-25 20:32:00 UTC (rev 1451) +++ trunk/pom.xml 2016-12-25 20:36:22 UTC (rev 1452) @@ -594,9 +594,9 @@ <module>atech-tools</module> <module>ggc-core-app</module> <module>ggc-plugins</module> + <module>ggc-support</module> <module>ggc-desktop-app</module> <module>ggc-doctor-app</module> - <module>ggc-support</module> </modules> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <and...@us...> - 2016-12-25 20:32:03
|
Revision: 1451 http://sourceforge.net/p/ggc/code/1451 Author: andyrozman Date: 2016-12-25 20:32:00 +0000 (Sun, 25 Dec 2016) Log Message: ----------- ggc - moving files arround Removed Paths: ------------- trunk/ggc-doctor_server/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <and...@us...> - 2016-12-25 20:30:58
|
Revision: 1450 http://sourceforge.net/p/ggc/code/1450 Author: andyrozman Date: 2016-12-25 20:30:57 +0000 (Sun, 25 Dec 2016) Log Message: ----------- ggc - moving files arround Removed Paths: ------------- trunk/ggc-doctor/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <and...@us...> - 2016-12-25 20:29:27
|
Revision: 1449 http://sourceforge.net/p/ggc/code/1449 Author: andyrozman Date: 2016-12-25 20:29:24 +0000 (Sun, 25 Dec 2016) Log Message: ----------- ggc - moving files arround Added Paths: ----------- trunk/ggc-doctor-app/ggc-desktop-doctor/data/ trunk/ggc-doctor-app/ggc-desktop-doctor/src/main/java/ggc/ trunk/ggc-doctor-app/ggc-desktop-doctor/src/main/resources/StartupConfig.properties trunk/ggc-doctor-app/ggc-desktop-doctor/src/main/resources/icons/ trunk/ggc-doctor-app/ggc-desktop-doctor/src/main/resources/log4j.properties Removed Paths: ------------- trunk/ggc-doctor/data/ trunk/ggc-doctor/src/StartupConfig.properties trunk/ggc-doctor/src/ggc/ trunk/ggc-doctor/src/icons/ trunk/ggc-doctor/src/log4j.properties Deleted: trunk/ggc-doctor/src/StartupConfig.properties =================================================================== --- trunk/ggc-doctor/src/StartupConfig.properties 2016-12-25 20:24:34 UTC (rev 1448) +++ trunk/ggc-doctor/src/StartupConfig.properties 2016-12-25 20:29:24 UTC (rev 1449) @@ -1,17 +0,0 @@ - -# -# Java executable (on most systems you don't need to change this parameter). Some system require full path to -# executable -# -JAVA_EXE=java - - - - - -# -# Do not edit past this line -# - - -UPDATE_CONFIG=../data/update/GGC_Update.properties Deleted: trunk/ggc-doctor/src/log4j.properties =================================================================== --- trunk/ggc-doctor/src/log4j.properties 2016-12-25 20:24:34 UTC (rev 1448) +++ trunk/ggc-doctor/src/log4j.properties 2016-12-25 20:29:24 UTC (rev 1449) @@ -1,59 +0,0 @@ -### direct log messages to stdout ### -log4j.appender.stdout=org.apache.log4j.ConsoleAppender -#log4j.appender.stdout.Target=System.out -log4j.appender.stdout.layout=org.apache.log4j.PatternLayout -#log4j.appender.stdout.layout.ConversionPattern=%d{ABSOLUTE} %5p %c{1}:%L - %m%n -#log4j.appender.stdout.layout.ConversionPattern=%d %5p [%c{1}:%L] - %m%n -log4j.appender.stdout.layout.ConversionPattern=%d{HH:mm:ss,SSS} %5p [%c{1}:%L] - %m%n -#log4j.appender.stdout.layout.ConversionPattern=%d{HH:mm:ss,SSS} %5p - %m%n - -#log4j.appender.stderr=org.apache.log4j.ConsoleAppender -#log4j.appender.stderr.layout=org.apache.log4j.PatternLayout -##log4j.appender.stderr.layout.ConversionPattern=%d{HH:mm:ss,SSS} %5p [%c{1}:%L] - %m%n -#log4j.appender.stderr.layout.ConversionPattern=%d{HH:mm:ss,SSS} %5p - %m%n - - -### direct messages to file hibernate.log ### -log4j.appender.file=org.apache.log4j.DailyRollingFileAppender -log4j.appender.file.File=../data/log/GGC.log -log4j.appender.file.DatePattern='.'yyyy-MM-dd -log4j.appender.file.layout=org.apache.log4j.PatternLayout -#log4j.appender.file.layout.ConversionPattern=%d %5p [%c{1}:%L] - %m%n -log4j.appender.file.layout.ConversionPattern=%d{HH:mm:ss,SSS} %5p [%c{1}:%L] - %m%n - - - - -### set log levels - for more verbose logging change 'info' to 'debug' ### - -log4j.rootLogger=debug, stdout, file - -### log just the SQL - -log4j.logger.org.hibernate=info -log4j.logger.org.hibernate.SQL=info - -log4j.logger.ggc.core.db.GGCDb=info - - -### log JDBC bind parameters ### -log4j.logger.org.hibernate.type=info - -### log schema export/update ### -log4j.logger.net.sf.hibernate.tool.hbm2ddl=info -log4j.logger.net.sf.hibernate.tool.hbm2java=info - -### log cache activity ### -#log4j.logger.net.sf.hibernate.cache=debug - -### enable the following line if you want to track down connection ### -### leakages when using DriverManagerConnectionProvider ### -#log4j.logger.org.hibernate.connection.DriverManagerConnectionProvider=trace - - -### Redirect needs another formatting -#log4j.logger.com.atech.utils.logs=debug -#log4j.logger.com.atech.utils.logs.layout=org.apache.log4j.PatternLayout -#log4j.logger.com.atech.utils.logs.layout.ConversionPattern=%d{HH:mm:ss,SSS} %5p - %m%n - - Copied: trunk/ggc-doctor-app/ggc-desktop-doctor/src/main/resources/StartupConfig.properties (from rev 1446, trunk/ggc-doctor/src/StartupConfig.properties) =================================================================== --- trunk/ggc-doctor-app/ggc-desktop-doctor/src/main/resources/StartupConfig.properties (rev 0) +++ trunk/ggc-doctor-app/ggc-desktop-doctor/src/main/resources/StartupConfig.properties 2016-12-25 20:29:24 UTC (rev 1449) @@ -0,0 +1,17 @@ + +# +# Java executable (on most systems you don't need to change this parameter). Some system require full path to +# executable +# +JAVA_EXE=java + + + + + +# +# Do not edit past this line +# + + +UPDATE_CONFIG=../data/update/GGC_Update.properties Copied: trunk/ggc-doctor-app/ggc-desktop-doctor/src/main/resources/log4j.properties (from rev 1446, trunk/ggc-doctor/src/log4j.properties) =================================================================== --- trunk/ggc-doctor-app/ggc-desktop-doctor/src/main/resources/log4j.properties (rev 0) +++ trunk/ggc-doctor-app/ggc-desktop-doctor/src/main/resources/log4j.properties 2016-12-25 20:29:24 UTC (rev 1449) @@ -0,0 +1,59 @@ +### direct log messages to stdout ### +log4j.appender.stdout=org.apache.log4j.ConsoleAppender +#log4j.appender.stdout.Target=System.out +log4j.appender.stdout.layout=org.apache.log4j.PatternLayout +#log4j.appender.stdout.layout.ConversionPattern=%d{ABSOLUTE} %5p %c{1}:%L - %m%n +#log4j.appender.stdout.layout.ConversionPattern=%d %5p [%c{1}:%L] - %m%n +log4j.appender.stdout.layout.ConversionPattern=%d{HH:mm:ss,SSS} %5p [%c{1}:%L] - %m%n +#log4j.appender.stdout.layout.ConversionPattern=%d{HH:mm:ss,SSS} %5p - %m%n + +#log4j.appender.stderr=org.apache.log4j.ConsoleAppender +#log4j.appender.stderr.layout=org.apache.log4j.PatternLayout +##log4j.appender.stderr.layout.ConversionPattern=%d{HH:mm:ss,SSS} %5p [%c{1}:%L] - %m%n +#log4j.appender.stderr.layout.ConversionPattern=%d{HH:mm:ss,SSS} %5p - %m%n + + +### direct messages to file hibernate.log ### +log4j.appender.file=org.apache.log4j.DailyRollingFileAppender +log4j.appender.file.File=../data/log/GGC.log +log4j.appender.file.DatePattern='.'yyyy-MM-dd +log4j.appender.file.layout=org.apache.log4j.PatternLayout +#log4j.appender.file.layout.ConversionPattern=%d %5p [%c{1}:%L] - %m%n +log4j.appender.file.layout.ConversionPattern=%d{HH:mm:ss,SSS} %5p [%c{1}:%L] - %m%n + + + + +### set log levels - for more verbose logging change 'info' to 'debug' ### + +log4j.rootLogger=debug, stdout, file + +### log just the SQL + +log4j.logger.org.hibernate=info +log4j.logger.org.hibernate.SQL=info + +log4j.logger.ggc.core.db.GGCDb=info + + +### log JDBC bind parameters ### +log4j.logger.org.hibernate.type=info + +### log schema export/update ### +log4j.logger.net.sf.hibernate.tool.hbm2ddl=info +log4j.logger.net.sf.hibernate.tool.hbm2java=info + +### log cache activity ### +#log4j.logger.net.sf.hibernate.cache=debug + +### enable the following line if you want to track down connection ### +### leakages when using DriverManagerConnectionProvider ### +#log4j.logger.org.hibernate.connection.DriverManagerConnectionProvider=trace + + +### Redirect needs another formatting +#log4j.logger.com.atech.utils.logs=debug +#log4j.logger.com.atech.utils.logs.layout=org.apache.log4j.PatternLayout +#log4j.logger.com.atech.utils.logs.layout.ConversionPattern=%d{HH:mm:ss,SSS} %5p - %m%n + + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
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...> - 2016-12-25 20:12:35
|
Revision: 1447 http://sourceforge.net/p/ggc/code/1447 Author: andyrozman Date: 2016-12-25 20:12:33 +0000 (Sun, 25 Dec 2016) Log Message: ----------- ggc-cgm - moved to new subdirectory and to new structure Removed Paths: ------------- trunk/ggc-nutri/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <and...@us...> - 2016-12-25 20:11:23
|
Revision: 1446 http://sourceforge.net/p/ggc/code/1446 Author: andyrozman Date: 2016-12-25 20:11:19 +0000 (Sun, 25 Dec 2016) Log Message: ----------- ggc-cgm - moved to new subdirectory and to new structure Modified Paths: -------------- trunk/ggc-desktop-app/ggc-desktop/pom.xml trunk/ggc-desktop-app/ggc-desktop/src/main/java/ggc/gui/dialogs/stock/StockSubTypeDialog.java trunk/ggc-plugins/ggc-cgms/pom.xml trunk/ggc-plugins/ggc-cgms/src/main/java/ggc/cgms/data/CGMSDataWriter.java trunk/ggc-plugins/ggc-cgms/src/main/java/ggc/cgms/data/CGMSTempValues.java trunk/ggc-plugins/ggc-meter/pom.xml trunk/ggc-plugins/ggc-nutrition/pom.xml trunk/ggc-plugins/ggc-plugins-base/pom.xml trunk/ggc-plugins/ggc-pump/pom.xml trunk/ggc-plugins/pom.xml trunk/pom.xml Removed Paths: ------------- trunk/ggc-cgm/ Modified: trunk/ggc-desktop-app/ggc-desktop/pom.xml =================================================================== --- trunk/ggc-desktop-app/ggc-desktop/pom.xml 2016-12-25 19:39:36 UTC (rev 1445) +++ trunk/ggc-desktop-app/ggc-desktop/pom.xml 2016-12-25 20:11:19 UTC (rev 1446) @@ -33,7 +33,7 @@ <dependency> <groupId>net.sf.ggc</groupId> - <artifactId>ggc-plugin-base</artifactId> + <artifactId>ggc-plugins-base</artifactId> </dependency> @@ -54,7 +54,7 @@ <dependency> <groupId>net.sf.ggc</groupId> - <artifactId>ggc-nutri-tool</artifactId> + <artifactId>ggc-nutrition-tool</artifactId> </dependency> <!-- Modified: 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/dialogs/stock/StockSubTypeDialog.java 2016-12-25 19:39:36 UTC (rev 1445) +++ trunk/ggc-desktop-app/ggc-desktop/src/main/java/ggc/gui/dialogs/stock/StockSubTypeDialog.java 2016-12-25 20:11:19 UTC (rev 1446) @@ -80,7 +80,7 @@ subTypeObject = new StockSubTypeH(); } - List<String> listFailed = new ArrayList(); + List<String> listFailed = new ArrayList<String>(); StockTypeBase stb = StockTypeBase.getByDescription((String) comboStockType.getSelectedItem()); Modified: trunk/ggc-plugins/ggc-cgms/pom.xml =================================================================== --- trunk/ggc-plugins/ggc-cgms/pom.xml 2016-12-25 19:39:36 UTC (rev 1445) +++ trunk/ggc-plugins/ggc-cgms/pom.xml 2016-12-25 20:11:19 UTC (rev 1446) @@ -3,39 +3,16 @@ <modelVersion>4.0.0</modelVersion> <parent> <groupId>net.sf.ggc</groupId> - <artifactId>ggc-parent</artifactId> - <version>1.0-SNAPSHOT</version> - <relativePath>../ggc-removed/ggc-master-pom/pom.xml</relativePath> + <artifactId>ggc-plugins</artifactId> + <version>0.8-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> </parent> - <name>GGC CGMS Tool Project</name> + <name>GGC Plugins - CGMS Tool</name> <artifactId>ggc-cgms-tool</artifactId> <version>${ggc-cgms-tool.version}</version> - <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> - </build> <dependencies> <dependency> @@ -45,11 +22,9 @@ <dependency> <groupId>net.sf.ggc</groupId> - <artifactId>ggc-plugin-base</artifactId> + <artifactId>ggc-plugins-base</artifactId> </dependency> - <!-- <dependency> <groupId>org.bidib.jbidib.org.qbang.rxtx</groupId> <artifactId>rxtxcomm</artifactId> - </dependency> --> <dependency> <groupId>com.atech-software</groupId> @@ -58,19 +33,13 @@ <!-- NEW put into parent pom --> - <dependency> <groupId>org.jdom</groupId> <artifactId>jdom</artifactId> <version>1.1</version> </dependency> - <!-- - <dependency> - <groupId>com.neuronrobotics</groupId> - <artifactId>nrjavaserial</artifactId> - </dependency> - --> + </dependencies> <properties> Modified: trunk/ggc-plugins/ggc-cgms/src/main/java/ggc/cgms/data/CGMSDataWriter.java =================================================================== --- trunk/ggc-plugins/ggc-cgms/src/main/java/ggc/cgms/data/CGMSDataWriter.java 2016-12-25 19:39:36 UTC (rev 1445) +++ trunk/ggc-plugins/ggc-cgms/src/main/java/ggc/cgms/data/CGMSDataWriter.java 2016-12-25 20:11:19 UTC (rev 1446) @@ -6,8 +6,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import sun.reflect.generics.reflectiveObjects.NotImplementedException; - +import com.atech.data.NotImplementedException; import com.atech.utils.data.ATechDate; import ggc.cgms.util.DataAccessCGMS; @@ -166,7 +165,6 @@ { if (owd instanceof CGMSValuesSubEntry) { - CGMSValuesSubEntry cvse = (CGMSValuesSubEntry) owd; // System.out.println("Value: " + cvse); @@ -174,7 +172,8 @@ } else { - throw new NotImplementedException(); + throw new NotImplementedException(this.getClass(), + "writeObject() with value different than CGMSValuesSubEntry."); } } Modified: trunk/ggc-plugins/ggc-cgms/src/main/java/ggc/cgms/data/CGMSTempValues.java =================================================================== --- trunk/ggc-plugins/ggc-cgms/src/main/java/ggc/cgms/data/CGMSTempValues.java 2016-12-25 19:39:36 UTC (rev 1445) +++ trunk/ggc-plugins/ggc-cgms/src/main/java/ggc/cgms/data/CGMSTempValues.java 2016-12-25 20:11:19 UTC (rev 1446) @@ -1,7 +1,6 @@ package ggc.cgms.data; -import sun.reflect.generics.reflectiveObjects.NotImplementedException; - +import com.atech.data.NotImplementedException; import com.atech.utils.data.ATechDate; import com.atech.utils.data.CodeEnum; import com.atech.utils.data.CodeEnumWithTranslation; @@ -52,7 +51,6 @@ this(_object_type, _base_type.getCode(), 0, null, isNumericValue); } - // public CGMSTempValues(int _object_type, CodeEnumWithTranslation // _base_type, // Boolean isNumericValue) @@ -67,6 +65,7 @@ // this(_object_type, _base_type, 0, null, isNumericValue); // } + // public CGMSTempValues(int _object_type, CodeEnumWithTranslation // _base_type, Boolean isNumericValue) // { @@ -128,7 +127,6 @@ super(objectType, baseType); } - /** * @param objectType * @param baseType @@ -138,6 +136,7 @@ // super(objectType.getCode(), baseType.getCode()); // } + /* * public void writeObject(OutputWriter ow, String _value) * { @@ -165,7 +164,7 @@ if (this.object_type == CGMSObject.Base.getCode()) { - new NotImplementedException(); + new NotImplementedException(this.getClass(), "getData() with objectType CGMSObject.Base."); // CGMSValuesEntry cve = new CGMSValuesEntry(); // // cve.setType(this.base_type); Modified: trunk/ggc-plugins/ggc-meter/pom.xml =================================================================== --- trunk/ggc-plugins/ggc-meter/pom.xml 2016-12-25 19:39:36 UTC (rev 1445) +++ trunk/ggc-plugins/ggc-meter/pom.xml 2016-12-25 20:11:19 UTC (rev 1446) @@ -30,7 +30,7 @@ <dependency> <groupId>net.sf.ggc</groupId> - <artifactId>ggc-plugin-base</artifactId> + <artifactId>ggc-plugins-base</artifactId> </dependency> <!-- Modified: trunk/ggc-plugins/ggc-nutrition/pom.xml =================================================================== --- trunk/ggc-plugins/ggc-nutrition/pom.xml 2016-12-25 19:39:36 UTC (rev 1445) +++ trunk/ggc-plugins/ggc-nutrition/pom.xml 2016-12-25 20:11:19 UTC (rev 1446) @@ -9,8 +9,8 @@ </parent> <name>GGC Plugins - Nutrition Tool</name> - <artifactId>ggc-nutri-tool</artifactId> - <version>${ggc-nutri-tool.version}</version> + <artifactId>ggc-nutrition-tool</artifactId> + <version>${ggc-nutrition-tool.version}</version> @@ -22,7 +22,7 @@ <dependency> <groupId>net.sf.ggc</groupId> - <artifactId>ggc-plugin-base</artifactId> + <artifactId>ggc-plugins-base</artifactId> </dependency> <dependency> Modified: trunk/ggc-plugins/ggc-plugins-base/pom.xml =================================================================== --- trunk/ggc-plugins/ggc-plugins-base/pom.xml 2016-12-25 19:39:36 UTC (rev 1445) +++ trunk/ggc-plugins/ggc-plugins-base/pom.xml 2016-12-25 20:11:19 UTC (rev 1446) @@ -11,7 +11,7 @@ <name>GGC Plugins - Base</name> <artifactId>ggc-plugins-base</artifactId> - <version>${ggc-plugin-base.version}</version> + <version>${ggc-plugins-base.version}</version> Modified: trunk/ggc-plugins/ggc-pump/pom.xml =================================================================== --- trunk/ggc-plugins/ggc-pump/pom.xml 2016-12-25 19:39:36 UTC (rev 1445) +++ trunk/ggc-plugins/ggc-pump/pom.xml 2016-12-25 20:11:19 UTC (rev 1446) @@ -12,30 +12,8 @@ <artifactId>ggc-pump-tool</artifactId> <version>${ggc-pump-tool.version}</version> - <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> - </build> + <dependencies> <dependency> <groupId>net.sf.ggc</groupId> @@ -44,7 +22,7 @@ <dependency> <groupId>net.sf.ggc</groupId> - <artifactId>ggc-plugin-base</artifactId> + <artifactId>ggc-plugins-base</artifactId> </dependency> <dependency> Modified: trunk/ggc-plugins/pom.xml =================================================================== --- trunk/ggc-plugins/pom.xml 2016-12-25 19:39:36 UTC (rev 1445) +++ trunk/ggc-plugins/pom.xml 2016-12-25 20:11:19 UTC (rev 1446) @@ -19,6 +19,7 @@ <module>ggc-meter</module> <module>ggc-pump</module> <module>ggc-nutrition</module> + <module>ggc-cgms</module> </modules> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2016-12-25 19:39:36 UTC (rev 1445) +++ trunk/pom.xml 2016-12-25 20:11:19 UTC (rev 1446) @@ -228,8 +228,8 @@ <dependency> <groupId>net.sf.ggc</groupId> - <artifactId>ggc-plugin-base</artifactId> - <version>${ggc-plugin-base.version}</version> + <artifactId>ggc-plugins-base</artifactId> + <version>${ggc-plugins-base.version}</version> </dependency> <dependency> @@ -252,8 +252,8 @@ <dependency> <groupId>net.sf.ggc</groupId> - <artifactId>ggc-nutri-tool</artifactId> - <version>${ggc-nutri-tool.version}</version> + <artifactId>ggc-nutrition-tool</artifactId> + <version>${ggc-nutrition-tool.version}</version> </dependency> <dependency> @@ -512,11 +512,11 @@ <!-- GGC Modules versions --> <ggc-core.version>0.8.0-SNAPSHOT</ggc-core.version> - <ggc-plugin-base.version>1.2.2-SNAPSHOT</ggc-plugin-base.version> + <ggc-plugins-base.version>1.2.2-SNAPSHOT</ggc-plugins-base.version> <ggc-meter-tool.version>2.4.1-SNAPSHOT</ggc-meter-tool.version> <ggc-pump-tool.version>2.0.1-SNAPSHOT</ggc-pump-tool.version> <ggc-cgms-tool.version>1.5.1-SNAPSHOT</ggc-cgms-tool.version> - <ggc-nutri-tool.version>1.4.1-SNAPSHOT</ggc-nutri-tool.version> + <ggc-nutrition-tool.version>1.4.1-SNAPSHOT</ggc-nutrition-tool.version> <ggc-connect-tool.version>0.1.0-SNAPSHOT</ggc-connect-tool.version> <ggc-desktop.version>0.8.0-SNAPSHOT</ggc-desktop.version> <ggc-help.version>0.2.2-SNAPSHOT</ggc-help.version> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <and...@us...> - 2016-12-25 19:39:38
|
Revision: 1445 http://sourceforge.net/p/ggc/code/1445 Author: andyrozman Date: 2016-12-25 19:39:36 +0000 (Sun, 25 Dec 2016) Log Message: ----------- ggc-cgm - moved to new subdirectory and to new structure Modified Paths: -------------- trunk/ggc-plugins/ggc-cgms/build/build.xml Added Paths: ----------- trunk/ggc-plugins/ggc-cgms/.amateras trunk/ggc-plugins/ggc-cgms/.settings/ trunk/ggc-plugins/ggc-cgms/build/ trunk/ggc-plugins/ggc-cgms/doc/ trunk/ggc-plugins/ggc-cgms/pom.xml Removed Paths: ------------- trunk/ggc-cgm/.amateras trunk/ggc-cgm/.settings/ trunk/ggc-cgm/build/ trunk/ggc-cgm/doc/ trunk/ggc-cgm/pom.xml Deleted: trunk/ggc-cgm/.amateras =================================================================== --- trunk/ggc-cgm/.amateras 2016-12-25 19:36:38 UTC (rev 1444) +++ trunk/ggc-cgm/.amateras 2016-12-25 19:39:36 UTC (rev 1445) @@ -1,12 +0,0 @@ -#EclipseHTMLEditor configuration file -#Sat Apr 10 19:22:45 CEST 2010 -validateDTD=true -javaScriptCompleters= -useDTD=true -validateJSP=true -validateXML=true -validateJS=true -removeMarkers=false -root=/ -validateHTML=true -javaScripts= Deleted: trunk/ggc-cgm/pom.xml =================================================================== --- trunk/ggc-cgm/pom.xml 2016-12-25 19:36:38 UTC (rev 1444) +++ trunk/ggc-cgm/pom.xml 2016-12-25 19:39:36 UTC (rev 1445) @@ -1,82 +0,0 @@ -<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-removed/ggc-master-pom/pom.xml</relativePath> - </parent> - - <name>GGC CGMS Tool Project</name> - - <artifactId>ggc-cgms-tool</artifactId> - <version>${ggc-cgms-tool.version}</version> - - <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> - </build> - - <dependencies> - <dependency> - <groupId>net.sf.ggc</groupId> - <artifactId>ggc-core</artifactId> - </dependency> - - <dependency> - <groupId>net.sf.ggc</groupId> - <artifactId>ggc-plugin-base</artifactId> - </dependency> - - <!-- <dependency> <groupId>org.bidib.jbidib.org.qbang.rxtx</groupId> <artifactId>rxtxcomm</artifactId> - </dependency> --> - - <dependency> - <groupId>com.atech-software</groupId> - <artifactId>atech-tools</artifactId> - </dependency> - - <!-- NEW put into parent pom --> - - - <dependency> - <groupId>org.jdom</groupId> - <artifactId>jdom</artifactId> - <version>1.1</version> - </dependency> - - <!-- - <dependency> - <groupId>com.neuronrobotics</groupId> - <artifactId>nrjavaserial</artifactId> - </dependency> - --> - </dependencies> - - <properties> - - <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> - - </properties> -</project> Copied: trunk/ggc-plugins/ggc-cgms/.amateras (from rev 1444, trunk/ggc-cgm/.amateras) =================================================================== --- trunk/ggc-plugins/ggc-cgms/.amateras (rev 0) +++ trunk/ggc-plugins/ggc-cgms/.amateras 2016-12-25 19:39:36 UTC (rev 1445) @@ -0,0 +1,12 @@ +#EclipseHTMLEditor configuration file +#Sat Apr 10 19:22:45 CEST 2010 +validateDTD=true +javaScriptCompleters= +useDTD=true +validateJSP=true +validateXML=true +validateJS=true +removeMarkers=false +root=/ +validateHTML=true +javaScripts= Modified: trunk/ggc-plugins/ggc-cgms/build/build.xml =================================================================== --- trunk/ggc-cgm/build/build.xml 2016-12-25 19:36:38 UTC (rev 1444) +++ trunk/ggc-plugins/ggc-cgms/build/build.xml 2016-12-25 19:39:36 UTC (rev 1445) @@ -1,5 +1,5 @@ <?xml version="1.0" ?> -<project name="GNU PlugIn Base" default="build" basedir="."> +<project name="GNU PlugIn Base" default="build" basedir=""> <description> Build file for GGC </description> @@ -9,7 +9,7 @@ <property file="../../ggc-core-app/ggc-core/build/GGC_Core_Version.properties"/> <property file="../../ggc-plugins/ggc-plugins-base/build/GGCPlugInBaseBuild.properties"/> <property file="../../ggc-plugins/ggc-plugins-base/build/GGCPlugInBaseVersion.properties"/> - <property file="./GGCCGMSToolVersion.properties"/> + <property file="GGCCGMSToolVersion.properties"/> <!-- These should *not* be modified on the command line! --> <property name="build.dir" value="${outdir.dir}/classes"/> Copied: trunk/ggc-plugins/ggc-cgms/pom.xml (from rev 1444, trunk/ggc-cgm/pom.xml) =================================================================== --- trunk/ggc-plugins/ggc-cgms/pom.xml (rev 0) +++ trunk/ggc-plugins/ggc-cgms/pom.xml 2016-12-25 19:39:36 UTC (rev 1445) @@ -0,0 +1,82 @@ +<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-removed/ggc-master-pom/pom.xml</relativePath> + </parent> + + <name>GGC CGMS Tool Project</name> + + <artifactId>ggc-cgms-tool</artifactId> + <version>${ggc-cgms-tool.version}</version> + + <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> + </build> + + <dependencies> + <dependency> + <groupId>net.sf.ggc</groupId> + <artifactId>ggc-core</artifactId> + </dependency> + + <dependency> + <groupId>net.sf.ggc</groupId> + <artifactId>ggc-plugin-base</artifactId> + </dependency> + + <!-- <dependency> <groupId>org.bidib.jbidib.org.qbang.rxtx</groupId> <artifactId>rxtxcomm</artifactId> + </dependency> --> + + <dependency> + <groupId>com.atech-software</groupId> + <artifactId>atech-tools</artifactId> + </dependency> + + <!-- NEW put into parent pom --> + + + <dependency> + <groupId>org.jdom</groupId> + <artifactId>jdom</artifactId> + <version>1.1</version> + </dependency> + + <!-- + <dependency> + <groupId>com.neuronrobotics</groupId> + <artifactId>nrjavaserial</artifactId> + </dependency> + --> + </dependencies> + + <properties> + + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> + + </properties> +</project> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <and...@us...> - 2016-12-25 19:36:41
|
Revision: 1444 http://sourceforge.net/p/ggc/code/1444 Author: andyrozman Date: 2016-12-25 19:36:38 +0000 (Sun, 25 Dec 2016) Log Message: ----------- ggc-cgm - Db changes - added new Extended Type Modified Paths: -------------- trunk/build/build.xml trunk/ggc-cgm/build/build.xml trunk/ggc-core-app/ggc-core/pom.xml trunk/ggc-core-app/ggc-doctor-core/pom.xml trunk/ggc-core-app/pom.xml trunk/ggc-doctor/data/db/ggc_db.trace.db trunk/ggc-doctor-app/ggc-desktop-doctor/pom.xml trunk/ggc-doctor-app/ggc-doctor-server/pom.xml trunk/ggc-doctor-app/pom.xml trunk/ggc-plugins/ggc-cgms/src/main/resources/html/cgms/minimed.html trunk/ggc-removed/ggc-master-pom/pom.xml trunk/ggc-support/ggc-help/pom.xml trunk/ggc-support/pom.xml trunk/pom.xml Added Paths: ----------- trunk/ggc-plugins/ggc-cgms/src/main/java/ggc/ trunk/ggc-plugins/ggc-cgms/src/main/java/ggc/cgms/data/CGMSValuesExtendedEntry.java trunk/ggc-plugins/ggc-cgms/src/main/java/ggc/cgms/data/ExtendedCGMSValueHandler.java trunk/ggc-plugins/ggc-cgms/src/main/java/ggc/cgms/data/ExtendedCGMSValueType.java trunk/ggc-plugins/ggc-cgms/src/main/java/ggc/cgms/data/db/GGC_CGMSDb.java trunk/ggc-plugins/ggc-cgms/src/main/java/ggc/cgms/data/defs/CGMSAlarms.java trunk/ggc-plugins/ggc-cgms/src/main/java/ggc/cgms/manager/CGMSDevicesIds.java trunk/ggc-plugins/ggc-cgms/src/main/java/ggc/cgms/util/DataAccessCGMS.java trunk/ggc-plugins/ggc-cgms/src/main/resources/GGC_CGMSTool_de.properties trunk/ggc-plugins/ggc-cgms/src/main/resources/GGC_CGMSTool_en.properties trunk/ggc-plugins/ggc-cgms/src/main/resources/GGC_CGMSTool_fr.properties trunk/ggc-plugins/ggc-cgms/src/main/resources/GGC_CGMSTool_si.properties trunk/ggc-plugins/ggc-cgms/src/main/resources/html/ trunk/ggc-plugins/ggc-cgms/src/main/resources/icons/ trunk/ggc-plugins/ggc-nutrition/src/main/java/ggc/ trunk/ggc-plugins/ggc-nutrition/src/main/java/ggc/nutri/data/GGCTreeRootStatic.java trunk/ggc-plugins/ggc-nutrition/src/main/java/ggc/nutri/db/GGCDbCache.java trunk/ggc-plugins/ggc-nutrition/src/main/java/ggc/nutri/db/GGCDbNutri.java trunk/ggc-plugins/ggc-nutrition/src/main/java/ggc/nutri/db/datalayer/DAOObject.java trunk/ggc-plugins/ggc-nutrition/src/main/java/ggc/nutri/db/datalayer/DailyFoodEntries.java trunk/ggc-plugins/ggc-nutrition/src/main/java/ggc/nutri/db/datalayer/DailyFoodEntry.java trunk/ggc-plugins/ggc-nutrition/src/main/java/ggc/nutri/db/datalayer/FoodDescription.java trunk/ggc-plugins/ggc-nutrition/src/main/java/ggc/nutri/db/datalayer/FoodGroup.java trunk/ggc-plugins/ggc-nutrition/src/main/java/ggc/nutri/db/datalayer/GlycemicNutrients.java trunk/ggc-plugins/ggc-nutrition/src/main/java/ggc/nutri/db/datalayer/HomeWeightSpecial.java trunk/ggc-plugins/ggc-nutrition/src/main/java/ggc/nutri/db/datalayer/Meal.java trunk/ggc-plugins/ggc-nutrition/src/main/java/ggc/nutri/db/datalayer/MealGroup.java trunk/ggc-plugins/ggc-nutrition/src/main/java/ggc/nutri/db/datalayer/MealNutrition.java trunk/ggc-plugins/ggc-nutrition/src/main/java/ggc/nutri/db/datalayer/MealPart.java trunk/ggc-plugins/ggc-nutrition/src/main/java/ggc/nutri/db/datalayer/MealParts.java trunk/ggc-plugins/ggc-nutrition/src/main/java/ggc/nutri/db/datalayer/NutritionDefinition.java trunk/ggc-plugins/ggc-nutrition/src/main/java/ggc/nutri/db/datalayer/NutritionHomeWeightType.java trunk/ggc-plugins/ggc-nutrition/src/main/java/ggc/nutri/plugin/BackupRestoreNutriHandler.java trunk/ggc-plugins/ggc-nutrition/src/main/java/ggc/nutri/print/PrintFoodMenuAbstract.java trunk/ggc-plugins/ggc-nutrition/src/main/java/ggc/nutri/print/PrintFoodMenuBase.java trunk/ggc-plugins/ggc-nutrition/src/main/java/ggc/nutri/print/PrintFoodMenuExt1.java trunk/ggc-plugins/ggc-nutrition/src/main/java/ggc/nutri/print/PrintFoodMenuExt2.java trunk/ggc-removed/ggc-master-pom/ trunk/ggc-support/ggc-support/doc/DeployVersions.txt Removed Paths: ------------- trunk/ggc-cgm/src/GGC_CGMSTool_de.properties trunk/ggc-cgm/src/GGC_CGMSTool_en.properties trunk/ggc-cgm/src/GGC_CGMSTool_fr.properties trunk/ggc-cgm/src/GGC_CGMSTool_si.properties trunk/ggc-cgm/src/ggc/ trunk/ggc-cgm/src/html/ trunk/ggc-cgm/src/icons/ trunk/ggc-master-pom/ trunk/ggc-plugins/ggc-cgms/src/main/java/ggc/cgms/data/CGMSValuesExtendedEntry.java trunk/ggc-plugins/ggc-cgms/src/main/java/ggc/cgms/data/ExtendedCGMSValuesExtendedEntry.java trunk/ggc-plugins/ggc-cgms/src/main/java/ggc/cgms/data/db/GGC_CGMSDb.java trunk/ggc-plugins/ggc-cgms/src/main/java/ggc/cgms/data/defs/CGMSAlarms.java trunk/ggc-plugins/ggc-cgms/src/main/java/ggc/cgms/manager/CGMSDevicesIds.java trunk/ggc-plugins/ggc-cgms/src/main/java/ggc/cgms/util/DataAccessCGMS.java trunk/ggc-plugins/ggc-nutrition/src/main/java/ggc/nutri/data/GGCTreeRootStatic.java trunk/ggc-plugins/ggc-nutrition/src/main/java/ggc/nutri/db/GGCDbCache.java trunk/ggc-plugins/ggc-nutrition/src/main/java/ggc/nutri/db/GGCDbNutri.java trunk/ggc-plugins/ggc-nutrition/src/main/java/ggc/nutri/db/datalayer/DailyFoodEntries.java trunk/ggc-plugins/ggc-nutrition/src/main/java/ggc/nutri/db/datalayer/DailyFoodEntry.java trunk/ggc-plugins/ggc-nutrition/src/main/java/ggc/nutri/db/datalayer/FoodDescription.java trunk/ggc-plugins/ggc-nutrition/src/main/java/ggc/nutri/db/datalayer/FoodGroup.java trunk/ggc-plugins/ggc-nutrition/src/main/java/ggc/nutri/db/datalayer/GlycemicNutrients.java trunk/ggc-plugins/ggc-nutrition/src/main/java/ggc/nutri/db/datalayer/HomeWeightSpecial.java trunk/ggc-plugins/ggc-nutrition/src/main/java/ggc/nutri/db/datalayer/Meal.java trunk/ggc-plugins/ggc-nutrition/src/main/java/ggc/nutri/db/datalayer/MealGroup.java trunk/ggc-plugins/ggc-nutrition/src/main/java/ggc/nutri/db/datalayer/MealNutrition.java trunk/ggc-plugins/ggc-nutrition/src/main/java/ggc/nutri/db/datalayer/MealPart.java trunk/ggc-plugins/ggc-nutrition/src/main/java/ggc/nutri/db/datalayer/MealParts.java trunk/ggc-plugins/ggc-nutrition/src/main/java/ggc/nutri/db/datalayer/NutritionDefinition.java trunk/ggc-plugins/ggc-nutrition/src/main/java/ggc/nutri/db/datalayer/NutritionHomeWeightType.java trunk/ggc-plugins/ggc-nutrition/src/main/java/ggc/nutri/plugin/BackupRestoreNutriHandler.java trunk/ggc-plugins/ggc-nutrition/src/main/java/ggc/nutri/print/PrintFoodMenuAbstract.java trunk/ggc-plugins/ggc-nutrition/src/main/java/ggc/nutri/print/PrintFoodMenuBase.java trunk/ggc-plugins/ggc-nutrition/src/main/java/ggc/nutri/print/PrintFoodMenuExt1.java trunk/ggc-plugins/ggc-nutrition/src/main/java/ggc/nutri/print/PrintFoodMenuExt2.java Modified: trunk/build/build.xml =================================================================== --- trunk/build/build.xml 2016-12-25 19:28:24 UTC (rev 1443) +++ trunk/build/build.xml 2016-12-25 19:36:38 UTC (rev 1444) @@ -5,7 +5,7 @@ </description> <!-- Environment properties read from a file ...--> - <property file="../ggc-core/build/GGC_Core_Version.properties"/> + <property file="../ggc-core-app/ggc-core/build/GGC_Core_Version.properties"/> <!-- These should *not* be modified on the command line! --> @@ -38,11 +38,11 @@ <!-- Public targets --> <target name="clean" description="clean"> - <delete> - <fileset dir="./deploy_files"> - <include name="**"/> - </fileset> - </delete> + <delete> + <fileset dir="./deploy_files"> + <include name="**"/> + </fileset> + </delete> </target> <target name="all" depends="clean, all_noclean" description="whole GGC"> @@ -65,7 +65,7 @@ <echo message=" Start GGC Core build"/> <echo message=""/> <subant target="deploy"> - <fileset dir="../ggc-core" includes="*/build.xml" /> + <fileset dir="../ggc-core-app/ggc-core" includes="*/build.xml" /> </subant> </target> @@ -108,7 +108,7 @@ <echo message=" Start GGC Meter Plugin build"/> <echo message=""/> <subant target="deploy"> - <fileset dir="../ggc-meter" includes="*/build.xml" /> + <fileset dir="../ggc-plugins/ggc-meter" includes="*/build.xml" /> </subant> </target> @@ -117,7 +117,7 @@ <echo message=" Start GGC Pump Plugin build"/> <echo message=""/> <subant target="deploy"> - <fileset dir="../ggc-pump" includes="*/build.xml" /> + <fileset dir="../ggc-plugins/ggc-pump" includes="*/build.xml" /> </subant> </target> Modified: trunk/ggc-cgm/build/build.xml =================================================================== --- trunk/ggc-cgm/build/build.xml 2016-12-25 19:28:24 UTC (rev 1443) +++ trunk/ggc-cgm/build/build.xml 2016-12-25 19:36:38 UTC (rev 1444) @@ -54,7 +54,7 @@ </copy> <mkdir dir="${binary.dir}/icons" /> <copy todir="${binary.dir}/icons" overwrite="true"> - <fileset dir="../src/icons" casesensitive="no"> + <fileset dir="../../ggc-plugins/ggc-cgms/src/main/resources/icons" casesensitive="no"> <include name="**/*.gif"/> <include name="**/*.jpg"/> <include name="**/*.png"/> Deleted: trunk/ggc-cgm/src/GGC_CGMSTool_de.properties =================================================================== --- trunk/ggc-cgm/src/GGC_CGMSTool_de.properties 2016-12-25 19:28:24 UTC (rev 1443) +++ trunk/ggc-cgm/src/GGC_CGMSTool_de.properties 2016-12-25 19:36:38 UTC (rev 1444) @@ -1,162 +0,0 @@ -# -# ###################################################################### -# ### GNU Glucose Control ### -# ###################################################################### -# ### Language: German ### -# ### Created by: Reinhold Rumberger (ru...@us...)### -# ### Version: 1.0.2 ### -# ### Last change: 03.07.2011 14:44:12 ### -# ###################################################################### -# -# -# Translation status: -# Words/expressions: 63 -# Not translated: 57 (90 %) -# Need to be checked: 0 (0 %) -# -# Translated: 6 (9 %) -# -# -# -## -# 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-standard, 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 - -# -# Plug-in Specific [1] -# -DEVICE_NAME_NORMAL=CGMS -DEVICE_NAME_BIG=CGMS -DEVICE_FULL_NAME_WITHOUT_PORT=%s -DEVICE_FULL_NAME_WITH_PORT=%s on %s - -# -# Menus [1] -# -MN_CGMS=CGMS -MN_CGMS_READ=CGMS &auslesen -MN_CGMS_READ_DESC=Die Daten des CGMS auslesen -MN_CGMS_LIST=CGMS-&Liste -MN_CGMS_LIST_DESC=Liste der verf\u00FCgbaren CGMS-Ger\u00E4te -MN_CGMS_CONFIG=&Einstellungen -MN_CGMS_CONFIG_DESC=Einstellungen des CGMS-Plug-ins -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 - -# -# About [1] -# -DEVICE_PLUGIN=%s Plug-in -DEVICE_PLUGIN_ABOUT=About %s Plug-in - -# -# Configuration [1] -# -MY__=My -NEW__=New -DEVICE_CONFIGURATION=%s Configuration -SELECT_X_DEVICE=Select %s Device -SELECTED_X_DEVICE=Selected %s Device -DEVICE_CUSTOM_NAME=%s Custom Name -DEVICE_DOWNLOAD=DL -DEVICE_SETTINGS=Sett. - -# -# Device Selector [1] -# -SELECTOR_DEVICE=%s Device Selector - -# -# Instructions Dialog [1] -# -OOPS_DEVICE_NOT_CONFIGURED=Oops ! You forgot to configure your %s\nand currently there is no %s configured\nand/or selected. Please visit configuration\nand configure your %s. -CONFIGURED_DEVICE_INSTRUCTIONS=Configured %s and Instructions -DEVICE_ICON=%s picture -STATUS_READER_ERROR=Internal %s (or port) error -ERROR_CONTACTING_DEVICE=We had problem contacting CGMS device.\nPlease recheck communication port settings\n(some of cables, can change their address,\nwhen reconnected). Run configuration again\nand problem should be solved!\n -DEVICE_INFO=%s Info - -# -# Download [1] -# -READ_DEVICE_DATA_TITLE=Read CGMS Data [%s on %s] - -# -# Device Configuration [1] -# -READ_DEVICE_CONFIG_TITLE=Read CGMS Configuration [%s on %s] -SETTING_GROUP=Setting / Group - -# -# Export [1] -# -EXPORT_DEVICE_DATA=Export %s Data - -# -# List [1] -# -DEVICE_LIST_WEB=CGMS List -DEVICE_LIST_WEB_DESC=<html>Pumps list contains most of Pumps (even most of models). For each of this pumps, there is configuration entry, which contains only basic settings for device (profile names, TBR settings, etc). Devices which support download have that shown in selector (DL column). Pumps in list are color coded, and color determines status of devices of selected company. Color coding description is shown at bottom of this page.<br></html> - -# -# CGMS companies descriptions [1] -# - -# -# CGMS Instructions [1] -# - -# -# Manual Entry [1] -# -AVG_BG=Avg BG -BLOOD_GLUCOSE_CGMS=Blood Glucose (CGMS) -BLOOD_GLUCOSE_CALIB=Blood Glucose (Calibration) -AVG=Avg -TOTAL=Total -LOWEST=Lowest -STD_DEV=Std Dev -READINGS=Readings -HIGHEST=Highest -SUM=Sum -READING=Reading -CGMS_DAILY_OVERVIEW=CGMS Daily Stats - -# table -ENTRY_TYPE=Entry Type -COMMENT=Comment - -# types -ENTRY_BG_READING=Reading -ENTRY_BG_CALIBRATION=Calibration - -# -# Devices [1] -# - -# -# Backup/Restore [1] -# -CGMS_TOOL=CGMS Tool -CGMS_DATA=CGMS Data -CGMS_DATA_EXTENDED=CGMS Data Extended - -# -# Types [1] -# -CGMS_READINGS=CGMS Readings -CALIBRATION_READINGS=Calibration -CGMS_READING=CGMS Reading - -# -# Meter Instructions [1] -# -INSTRUCTIONS_DEXCOM=<html>Instructions for CGMS reading:<br><ul><li>We currently support only import of Dexcom 3<br>application export files (TXT or XML).</li><li>Reading from device, might or might not be<br>supported in future (depending on company <br>support).</li><li>Select correct file and file type in next<br>screens and import will start.</li></ul></html> Deleted: trunk/ggc-cgm/src/GGC_CGMSTool_en.properties =================================================================== --- trunk/ggc-cgm/src/GGC_CGMSTool_en.properties 2016-12-25 19:28:24 UTC (rev 1443) +++ trunk/ggc-cgm/src/GGC_CGMSTool_en.properties 2016-12-25 19:36:38 UTC (rev 1444) @@ -1,336 +0,0 @@ -# -# !MASTER_FILE! -# !S! MODULE=GGC CGMS Tool -# !S! MODULE_VERSION=1.0.2 -# -# ###################################################################### -# ### GGC CGMS Tool ### -# ###################################################################### -# ### Language: English ### -# ### Created by: Andy Rozman (an...@at...) ### -# ### Last change: 4th April 2015 ### -# ### Library Version: 1.0.2 ### -# ### Application Version: 0.5 ### -# ###################################################################### -# -# 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] -# -DEVICE_NAME_NORMAL=CGMS -DEVICE_NAME_BIG=CGMS -DEVICE_FULL_NAME_WITHOUT_PORT=%s -DEVICE_FULL_NAME_WITH_PORT=%s on %s - -# -# !G! Menus [1] -# -MN_CGMS=CGMS -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 - -MN_CGMS_GRAPH_DESC=Graphs for CGMS Plugin -#MN_DAILY_GRAPH=Daily CGMS Graph -#MN_DAILY_GRAPH_DESC=Daily CGMS Graph - -#MN_WEEKLY_GRAPH=Weekly CGMS Graph -#MN_WEEKLY_GRAPH_DESC=Weekly CGMS Graph - -# -# !G! About [1] -# -DEVICE_PLUGIN=%s Plug-in -DEVICE_PLUGIN_ABOUT=About %s Plug-in - - - -# -# !G! Configuration [1] -# -MY__=My -NEW__=New -DEVICE_CONFIGURATION=%s Configuration -SELECT_X_DEVICE=Select %s Device -SELECTED_X_DEVICE=Selected %s Device -DEVICE_CUSTOM_NAME=%s Custom Name - -DEVICE_DOWNLOAD=DL -DEVICE_SETTINGS=Sett. - - -# -# !G! Device Selector [1] -# -SELECTOR_DEVICE=%s Device Selector - - -# -# !G! Instructions Dialog [1] -# -OOPS_DEVICE_NOT_CONFIGURED=Oops ! You forgot to configure your %s\nand currently there is no %s configured\nand/or selected. Please visit configuration\nand configure your %s. -CONFIGURED_DEVICE_INSTRUCTIONS=Configured %s and Instructions -DEVICE_ICON=%s picture -STATUS_READER_ERROR=Internal %s (or port) error -ERROR_CONTACTING_DEVICE=We had problem contacting CGMS device.\nPlease recheck communication port settings\n(some of cables, can change their address,\nwhen reconnected). Run configuration again\nand problem should be solved!\n -DEVICE_INFO=%s Info - - -# -# !G! Download [1] -# -READ_DEVICE_DATA_TITLE=Read CGMS Data [%s on %s] - - -# -# !G! Device Configuration [1] -# -READ_DEVICE_CONFIG_TITLE=Read CGMS Configuration [%s on %s] -SETTING_GROUP=Setting / Group - - -# -# !G! Export [1] -# -EXPORT_DEVICE_DATA=Export %s Data - - -# -# !G! List [1] -# -DEVICE_LIST_WEB=CGMS List -DEVICE_LIST_WEB_DESC=<html>CGMS list contains most of CGMS (even most of models). For each of this CGMS, there is configuration entry, which contains some basic settings for device. Devices which support download have that shown in selector (DL column). CGMSes in list are color coded, and color determines status of devices of selected company. Color coding description is shown at bottom of this page.<br></html> - - -# -# !G! CGMS companies descriptions [1] -# -#MINIMED_DESC=We got partitial support from company and implementation will start in December 2008. - - -# -# !G! CGMS Instructions [1] -# -INSTRUCTIONS_DEXCOM=<html>Instructions for CGMS reading:<br><ul><li>We currently support only import of Dexcom 3<br>application export files (TXT or XML).</li><li>Reading from device, might or might not be<br>supported in future (depending on company <br>support).</li><li>Select correct file and file type in next<br>screens and import will start.</li></ul></html> -DEXCOM_INSTRUCTIONS_DL_SERIAL_USB=<html>Instructions for CGMS reading:<br><li>Attach Dexcom device to computer via USB.</li><li>Click on "Start Download"</li></html> - - -# -# !G! Manual Entry [1] -# -AVG_BG=Avg BG -BLOOD_GLUCOSE_CGMS=Blood Glucose (CGMS) -BLOOD_GLUCOSE_CALIB=Blood Glucose (Calibration) -AVG=Avg -TOTAL=Total -LOWEST=Lowest -STD_DEV=Std Dev -READINGS=Readings -HIGHEST=Highest -SUM=Sum -READING=Reading -CGMS_DAILY_OVERVIEW=CGMS Daily Stats - -# !SG! table -ENTRY_TYPE=Entry Type -COMMENT=Comment - -# !SG! types -ENTRY_BG_READING=Reading -ENTRY_BG_CALIBRATION=Calibration - - -# -# !G! Devices [1] -# - -# -# !G! Backup/Restore [1] -# -CGMS_TOOL=CGMS Tool -CGMS_DATA=CGMS Data -CGMS_DATA_EXTENDED=CGMS Data Extended - - -# -# !G! Types [1] -# -CGMS_READINGS=CGMS Readings -CALIBRATION_READINGS=Calibration -CGMS_READING=CGMS Reading -CGMS_DATA_EVENT=Event -CGMS_DATA_ALARM=Alarm -CGMS_DATA_ERROR=Error -CGMS_READING_TREND=Trend -CGMS_TRANSMITER_EVENT=Transmiter Event - -# -# !G! CGMS Extended Types -# -CGMS_EXT_CARBS=Carbs -CGMS_EXT_INSULIN=Insulin -CGMS_EXT_HEALTH=Health -CGMS_EXT_EXERCISE=Exercise -HEALTH_DESCRIPTION=Health - %s - - -# -# !G! CGMS Events [2] -# -EVENT_CONTROLLER_POWER_DOWN=Controller Power Down -EVENT_CONTROLLER_POWER_UP=Controller Power Down -EVENT_SENSOR_CONNECTION_LOST=Sensor Connection Lost -EVENT_START_SENSOR=Start Sensor -EVENT_STOP_SENSOR=End Sensor -EVENT_CALIBRATION_WITH_METER=Calibration With Meter -EVENT_WAITING_FOR_CALIBRATION=Waiting for Calibration -EVENT_SET_CALIBRATION_FACTOR=Set Calibration Factor -EVENT_SENSOR_PRE_INIT=Sensor Pre-Init -EVENT_SENSOR_INIT=Sensor Init -EVENT_SENSOR_BURST=Sensor Burst -EVENT_SENSOR_WEAK_SIGNAL=Sensor Weak Signal -EVENT_SENSOR_LOW_BG=Sensor Low BG -EVENT_SENSOR_CALIBRATION_WITH_METER_NOW=Sensor Calibration With Meter Now - - -# -# !G! CGMS Errors [2] -# -ERROR_SENSOR_CALIB_ERROR=Sensor Calibration Error -ERROR_SENSOR_END_OF_LIFE=Sensor End Of Life -ERROR_SENSOR_BAD=Sensor Bad - -# -# !G! CGMS Alarms [2] -# -ALARM_CALIBRATION_REQUIRED=Sensor Calibration Required -ALARM_WEAK_SIGNAL=Sensor Weak Signal -ALARM_SENSOR_ALARM=Sensor Alarm -ALARM_CALIBRATION_ERROR=Calibration Error -ALARM_SENSOR_END_OF_LIFE=Sensor End Of Life approaching -ALARM_SENSOR_END_OF_LIFE_DESC=Sensor End Of Life approaching - %s -ALARM_SENSOR_ERROR=Sensor Error -ALARM_SENSOR_CHANGE_REQUIRED=Sensor Change Required -ALARM_SENSOR_SIGNAL_LOST=Sensor Signal Lost -ALARM_HIGH_GLUCOSE_PREDICTED=High Glucose Predicted -ALARM_LOW_GLUCOSE_PREDICTED=Low Glucose Predicted -ALARM_HIGH_GLUCOSE=High Glucose -ALARM_LOW_GLUCOSE=Low Glucose - - -# -# Dexcom -# - - - - - - ParsingError("DXC_PARSING_ERROR"), // - ParsingErrorUnsupportedDataLenth("DXC_PARSING_ERROR_UNSUPP_DATA_LENGTH"), // - Receiver_ErrorWritingToReceiver("DXC_RECEIVER_ERROR_WRITING"), // - Parsing_BytesParsingError("DXC_BYTES_PARSING_ERROR"), // - FailedCRCCheck("DXC_FAILED_CRC_CHECK"), // - UnsupportedTypeOfParametersForCommand("DXC_UNSUPPORTED_TYPE_OF_PARAMS_FOR_CMD"), // - UnsupportedReceiver("DXC_UNSUPPORTED_RECEIVER"), DownloadCanceledByUser("STATUS_STOPPED_USER"), DeviceNotFoundOnConfiguredPort( - "DEVICE_NOT_FOUND_ON_CONFIGURED_PORT"), DevicePortInUse("DEVICE_PORT_IN_USE"), - - -# -# !G! CGMS Configuration [2] -# - -# !SG! Groups -GROUP_TRANSMITER=Transmiter -GROUP_WARNINGS=Warnings - -# !SG! Sounds - -PCFG_SOUND_HIGH_ALERT=High Alert -PCFG_SOUND_LOW_ALERT=Low Alert -PCFG_SOUND_RISE_RATE=Rise Rate -PCFG_SOUND_FALL_RATE=Fall Rate -PCFG_SOUND_RANGE=Range -PCFG_SOUND_OTHER=Other -PCFG_SOUND_TRANSMITEROUT_OF_RANGE=Out of Range -CCFG_X_WARNING_ABOVE=%s Warning Above -CCFG_X_WARNING_BELOW=%s Warning Below -CCFG_X_SNOOZE_TIME=%s Snooze Time - - -# !SG! Sensor -CCFG_X_ENABLED=%s Enabled -CCFG_X_LIMIT_ENABLED=%s Limit Enabled -CCFG_TRANSMITER_SERIAL_NUMBER=Serial Number - -CCFG_SENSOR_ENABLED=Sensor Enabled -CCFG_SENSOR_BG_UNITS=Sensor BG Units -CCFG_SENSOR_CALIBRATION_REMINDER_ENABLE=Sensor Calibration Reminder Enable -CCFG_SENSOR_CALIBRATION_REMINDER_TIME=Sensor Calibration Reminder Time -CCFG_SENSOR_TRANSMITER_ID=Sensor Transmiter ID -CCFG_SENSOR_WEAK_SIGNAL_TIME=Sensor Weak Signal Time -CCFG_SENSOR_ALARM_SNOOZE_TIME=Sensor Alarm Snooze Time -CCFG_SENSOR_DEMO_ENABLE=Sensor Demo Enable -CCFG_SENSOR_GRAPH_TIMEOUT=Sensor Graph Timeout -CCFG_SENSOR_TIME_SENSITIVITY_LOW_PREDICTIVE_ALERT=Time Sensitivity - Low Predictive Alert -CCFG_SENSOR_TIME_SENSITIVITY_HIGH_PREDICTIVE_ALERT=Time Sensitivity - High Predictive Alert -CCFG_OPTION_OFF=Off -CCFG_SENSOR_ALERT_SILENCE_TYPE=Alert Silence Type -CCFG_SENSOR_ALERT_SILENCE_HI_ALERTS=High Alerts -CCFG_SENSOR_ALERT_SILENCE_LO_ALERTS=Low Alerts -CCFG_SENSOR_ALERT_SILENCE_HI_LO_ALERTS=High/Low Alerts -CCFG_SENSOR_ALERT_SILENCE_ALL_SENSOR_ALERTS=All Sensor Alerts -CCFG_SENSOR_ALERT_SILENCE_TIME=Alert Silence Time -CCFG_SENSOR_AUTOCALIBRATE=Sensor Autocalibrate -CCFG_SENSOR_LOW_BG_SUSPEND=Sensor Low BG Suspend -CCFG_SENSOR_CALIBRATION_REPEAT_TIME=Calibration Repeat Time -CCFG_SENSOR_BG_LIMITS_ENABLED=BG Limits Enabled -CCFG_SENSOR_BG_LIMIT=BG Limit - -CCFG_RATE_OF_CHANGE_ALERTS_RISE_RATE_LIMIT=Change Alert - Rise Rate Limit -CCFG_RATE_OF_CHANGE_ALERTS_FALL_RATE_LIMIT=Change Alert - Fall Rate Limit - - - - - - - -# -# !G! Graphs -# -CGMS_DAILY_GRAPH=CGMS Daily Graph -CGMS_DAILY_GRAPH_DESC=CGMS Daily Graph -CGMS_WEEKLY_GRAPH=CGMS Weekly Graph -CGMS_WEEKLY_GRAPH_DESC=CGMS Weekly Graph -GRAPH_CLOSE=Close -HELP=Help Deleted: trunk/ggc-cgm/src/GGC_CGMSTool_fr.properties =================================================================== --- trunk/ggc-cgm/src/GGC_CGMSTool_fr.properties 2016-12-25 19:28:24 UTC (rev 1443) +++ trunk/ggc-cgm/src/GGC_CGMSTool_fr.properties 2016-12-25 19:36:38 UTC (rev 1444) @@ -1,210 +0,0 @@ -# ###################################################################### -# ### GGC CGMS Tool ### -# ###################################################################### -# ### Language: French ### -# ### Created by: Andy Rozman (an...@at...) ### -# ### Last change: 4th February 2010 ### -# ### Library Version: 0.4.3 ### -# ### Application Version: 0.4.17 ### -# ###################################################################### -# -# In brackets there are now tags which define urgency of some text beeing translated -# 1 - Needed, urgent (Base functionality, options which will be used by user mostly) -# 2 - Needed -# 3 - Not used yet (in public releases) -# 4 - In implementation -# -# * - If tags also has *, then it means that this string can change regulary, last update is in [] -# - - -# -# Plug-in Specific (1) -# Most of strings here are concated with help of sprintf codes, so almost all are static -# -DEVICE_NAME_NORMAL=CGMS -DEVICE_NAME_BIG=CGMS -DEVICE_FULL_NAME_WITHOUT_PORT=%s -DEVICE_FULL_NAME_WITH_PORT=%s on %s - -# -# Menus -# -MN_CGMS=CGMS -MN_CGMS_READ=CGMS Read -MN_CGMS_READ_DESC=Reading data 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) - - -# -# About (1) -# Note: elements under static are same for all plugins and non-static are plugin specific -# - -# static -DEVICE_PLUGIN=%s Plug-in -DEVICE_PLUGIN_ABOUT=About %s Plug-in - - - -# -# Configuration (1) -# -MY__=My -NEW__=New -DEVICE_CONFIGURATION=%s Configuration -SELECT_X_DEVICE=Select %s Device -SELECTED_X_DEVICE=Selected %s Device -DEVICE_CUSTOM_NAME=%s Custom Name - -DEVICE_DOWNLOAD=DL -DEVICE_SETTINGS=Sett. - - -# -# Device Selector (1) -# -SELECTOR_DEVICE=%s Device Selector - - - - - - -# -# Instructions Dialog ((1)) -# -OOPS_DEVICE_NOT_CONFIGURED=Oops ! You forgot to configure your %s\nand currently there is no %s configured\nand/or selected. Please visit configuration\nand configure your %s. -CONFIGURED_DEVICE_INSTRUCTIONS=Configured %s and Instructions -DEVICE_ICON=%s picture -STATUS_READER_ERROR=Internal %s (or port) error - -ERROR_CONTACTING_DEVICE=We had problem contacting CGMS device.\nPlease recheck communication port settings\n(some of cables, can change their address,\nwhen reconnected). Run configuration again\nand problem should be solved!\n -DEVICE_INFO=%s Info - - -# -# Download -# - -READ_DEVICE_DATA_TITLE=Read CGMS Data [%s on %s] - - -# -# Device Configuration (1) -# -READ_DEVICE_CONFIG_TITLE=Read CGMS Configuration [%s on %s] -SETTING_GROUP=Setting / Group - - -# -# Export (1) -# -EXPORT_DEVICE_DATA=Export %s Data - - -# -# List (1) -# -DEVICE_LIST_WEB=CGMS List - -## TO DO -# non-static -DEVICE_LIST_WEB_DESC=<html>Pumps list contains most of Pumps (even most of models). For each of this pumps, there is configuration entry, which contains only basic settings for device (profile names, TBR settings, etc). Devices which support download have that shown in selector (DL column). Pumps in list are color coded, and color determines status of devices of selected company. Color coding description is shown at bottom of this page.<br></html> - - - -# -# CGMS companies desc. (this is not description of company, but about our connection with company) (3*) -# [12.10.2008] -# -MINIMED_DESC=We got partitial support from company and implementation will start in December 2008. - - -# -# CGMS Instructions (1) -# [] -# - - -# -# Manual Entry (1) -# -AVG_BG=Avg BG -BLOOD_GLUCOSE_CGMS=Blood Glucose (CGMS) -BLOOD_GLUCOSE_CALIB=Blood Glucose (Calibration) -AVG=Avg -TOTAL=Total -LOWEST=Lowest -STD_DEV=Std Dev -READINGS=Readings -HIGHEST=Highest -SUM=Sum -READING=Reading -CGMS_DAILY_OVERVIEW=CGMS Daily Stats - -# table -ENTRY_TYPE=Entry Type -COMMENT=Comment - -# types -ENTRY_BG_READING=Reading -ENTRY_BG_CALIBRATION=Calibration - - -# -# Devices -# - -# -# Backup/Restore -# -CGMS_TOOL=CGMS Tool -CGMS_DATA=CGMS Data - - -# -# Printing - Plugin specific (2) -# -#MN_PUMP=Pump -#MN_PUMP_PRINT_DESC=Report for Pumps Data -#MN_PUMP_PRINT_SIMPLE=Simple -#MN_PUMP_PRINT_SIMPLE_DESC=Simple Report for Pump data -#MN_PUMP_PRINT_EXT=Extended -#MN_PUMP_PRINT_SIMPLE_DESC=Extended Report for Pump data (Simple + Foods) -#VALUE_SHORT=Value -#OTHER_DATA=Other Data -#OTHER_DATA_FOOD=Other Data (with Food) -#PUMP_DATA_BASE=Simple Pump Report -#PUMP_DATA_EXT=Extended Pump Report - -#FOOD_DB_PRINT=Food (Db) -#FOOD_DESC_PRINT=Food (Desc.) - -#FOOD_DESC_PRINT_NOT_YET=Display of Food Db data not implemented yet! - - - -# -# Types - -CGMS_READINGS=CGMS Readings -CALIBRATION_READINGS=Calibration - -CGMS_READING=CGMS Reading - - - - -# -# New Keywords (they are grouped), this need to be copied to right locations, after release -# - - Deleted: trunk/ggc-cgm/src/GGC_CGMSTool_si.properties =================================================================== --- trunk/ggc-cgm/src/GGC_CGMSTool_si.properties 2016-12-25 19:28:24 UTC (rev 1443) +++ trunk/ggc-cgm/src/GGC_CGMSTool_si.properties 2016-12-25 19:36:38 UTC (rev 1444) @@ -1,162 +0,0 @@ -# -# ###################################################################### -# ### GNU Glucose Control ### -# ###################################################################### -# ### Language: Sloevene ### -# ### Created by: Andy (an...@t-...) ### -# ### Version: 1.0.2 ### -# ### Last change: 7.7.2013 18:34:55 ### -# ###################################################################### -# -# -# Translation status: -# Words/expressions: 63 -# Not translated: 0 (0 %) -# Need to be checked: 0 (0 %) -# -# Translated: 63 (100 %) -# -# -# This comment will be displayed after header -## -# 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-standard, non english -# charcters) we need to set this if we want sorting to be done correctly. -# -COLLATION_RULES=< a,A < b,B < c,C < \u010D,\u010C < 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 < \u0161,\u0160 < t,T < u,U < v,V < w,W < x,X < y,Y < z,Z < \u017E,\u017D - -# -# Plug-in Specific [1] -# -DEVICE_NAME_NORMAL=CGMS -DEVICE_NAME_BIG=CGMS -DEVICE_FULL_NAME_WITHOUT_PORT=%s -DEVICE_FULL_NAME_WITH_PORT=%s na %s - -# -# Menus [1] -# -MN_CGMS=CGMS -MN_CGMS_READ=Beri podatke -MN_CGMS_READ_DESC=Branje podatkov iz CGMS naprave -MN_CGMS_LIST=Seznam CGMSov -MN_CGMS_LIST_DESC=Seznam ve\u010Dine dostopnih CGMS naprav -MN_CGMS_CONFIG=Nastavitve CGMSja -MN_CGMS_CONFIG_DESC=Nastavitve plug-ina za CGMSje -MN_CGMS_ABOUT=O dodatku -MN_CGMS_ABOUT_DESC=O dodatku za CGMSe (pravice, zmo\u017Enosti, ...) -MN_CGMS_VIEW_DATA=Pregled podatkov -MN_CGMS_VIEW_DATA_DESC=Preglej podatke iz naprav(e) -MN_CGMS_READ_FILE=Beri datoteko -MN_CGMS_READ_FILE_DESC=Beri podatke iz CGMS/sw izvozne datoteke - -# -# About [1] -# -DEVICE_PLUGIN=Dodatek za CGMSe -DEVICE_PLUGIN_ABOUT=O dodatku za CGMSe - -# -# Configuration [1] -# -MY__=Moj -NEW__=Nov -DEVICE_CONFIGURATION=Konfiguracija CGMSa -SELECT_X_DEVICE=Izberi CGMS -SELECTED_X_DEVICE=Izbran CGMS -DEVICE_CUSTOM_NAME=Doma\u010De ime CGMSa -DEVICE_DOWNLOAD=DL -DEVICE_SETTINGS=Nast. - -# -# Device Selector [1] -# -SELECTOR_DEVICE=Izbirnik za CGMSe - -# -# Instructions Dialog [1] -# -OOPS_DEVICE_NOT_CONFIGURED=Ups! Pozabili ste nastaviti svojo \u010Drpalko\nin trenutno ni nobene nastavljene\nin/ali izbrane. Obi\u0161cite konfiguracijo\nin nastavite va\u0161o \u010Drpalko.\n -CONFIGURED_DEVICE_INSTRUCTIONS=Nastavljen CGMS in navodila -DEVICE_ICON=Slika CGMSa -STATUS_READER_ERROR=Interna napaka na CGMSu (ali portu) -ERROR_CONTACTING_DEVICE=Imeli smo problem pri kontaktiranju \u010Drpalke.\nProsim preverite nastavitve komunikacijskih vrat\n(nekateri kabli lahko spremenijo vrata, ko\njih znova priklju\u010Dimo). Za\u017Eenite konfiguracijo\nin problem bo verjetno re\u0161en.\n -DEVICE_INFO=Podatki o CGMSu - -# -# Download [1] -# -READ_DEVICE_DATA_TITLE=Beri podatke iz CGMSa [%s na %s] - -# -# Device Configuration [1] -# -READ_DEVICE_CONFIG_TITLE=Beri CGMS nastavitve [%s na %s] -SETTING_GROUP=Nastavitev / Skupina - -# -# Export [1] -# -EXPORT_DEVICE_DATA=Izvozi podatke %s - -# -# List [1] -# -DEVICE_LIST_WEB=Seznam CGMSov -DEVICE_LIST_WEB_DESC=<html>Seznam CGMSov vsebuje ve\u010Dino CGMSov (tudi modelov). Za vsakega od teh CGMSov imamo konfiguracijske vnose, kjer so prikazane osnovne nastavitve za napravo. Naprave, ki podpirajo prenos podatkov bodo prikazane v izbirniku (DL stolpec). CGMSi v seznamu so barvno kodirani in barva dolo\u010Da status naprav dolo\u010Denega podjetja. Legenda za barvno kodiranje je na spodnjem delu te strani.<br><html> - -# -# CGMS companies descriptions [1] -# - -# -# CGMS Instructions [1] -# - -# -# Manual Entry [1] -# -AVG_BG=Povp KS -BLOOD_GLUCOSE_CGMS=Krvni sladkor (CGMS) -BLOOD_GLUCOSE_CALIB=Krvni sladkor (kalibracija) -AVG=Povp -TOTAL=Skupaj -LOWEST=Najni\u017Eje -STD_DEV=Std Dev -READINGS=Prebrano -HIGHEST=Najvi\u0161ja -SUM=Vsota -READING=Vnos -CGMS_DAILY_OVERVIEW=CGMS dnevna statistika - -# table -ENTRY_TYPE=Tip vnosa -COMMENT=Komentar - -# types -ENTRY_BG_READING=Vnos -ENTRY_BG_CALIBRATION=Kalibracija - -# -# Devices [1] -# - -# -# Backup/Restore [1] -# -CGMS_TOOL=CGMS orodje -CGMS_DATA=CGMS podatki -CGMS_DATA_EXTENDED=CGMS podatki raz\u0161irjeni - -# -# Types [1] -# -CGMS_READINGS=CGMS vnosi -CALIBRATION_READINGS=Kalibracija -CGMS_READING=CGMS vnosi - -# -# Meter Instructions [1] -# -INSTRUCTIONS_DEXCOM=<html>Navodila za branje CGMSa:<br><ul><li>Trenutno podpiramo samo izvoze Dexcom 3<br>aplikacije (TXT ali XML).</li><li>Direktno branje iz naprave, bo ali pa ne bo<br>podprto v prihodnosti (odvisno od podpore iz<br>strani podjetja).</li><li>Izberite pravilno datoteko in tip datoteke<br>\nna naslednjem ekranu in uvoz se bo za\u010Del.</li></ul></html> Modified: trunk/ggc-core-app/ggc-core/pom.xml =================================================================== --- trunk/ggc-core-app/ggc-core/pom.xml 2016-12-25 19:28:24 UTC (rev 1443) +++ trunk/ggc-core-app/ggc-core/pom.xml 2016-12-25 19:36:38 UTC (rev 1444) @@ -9,7 +9,7 @@ <relativePath>../pom.xml</relativePath> </parent> - <name>GGC Core</name> + <name>GGC Core - Desktop</name> <artifactId>ggc-core</artifactId> <version>${ggc-core.version}</version> Modified: trunk/ggc-core-app/ggc-doctor-core/pom.xml =================================================================== --- trunk/ggc-core-app/ggc-doctor-core/pom.xml 2016-12-25 19:28:24 UTC (rev 1443) +++ trunk/ggc-core-app/ggc-doctor-core/pom.xml 2016-12-25 19:36:38 UTC (rev 1444) @@ -8,10 +8,10 @@ <relativePath>../pom.xml</relativePath> </parent> - <name>GGC Core Doctor</name> + <name>GGC Core - Doctor</name> <description>GGC Core for Doctors Edition (mostly just customizations of ggc-core)</description> - <artifactId>ggc-core-doctor</artifactId> - <version>${ggc-core-doctor.version}</version> + <artifactId>ggc-doctor-core</artifactId> + <version>${ggc-doctor-core.version}</version> Modified: trunk/ggc-core-app/pom.xml =================================================================== --- trunk/ggc-core-app/pom.xml 2016-12-25 19:28:24 UTC (rev 1443) +++ trunk/ggc-core-app/pom.xml 2016-12-25 19:36:38 UTC (rev 1444) @@ -9,7 +9,7 @@ <relativePath>../pom.xml</relativePath> </parent> - <name>GGC Core App</name> + <name>GGC Core</name> <artifactId>ggc-core-app</artifactId> <packaging>pom</packaging> Modified: trunk/ggc-doctor/data/db/ggc_db.trace.db =================================================================== --- trunk/ggc-doctor/data/db/ggc_db.trace.db 2016-12-25 19:28:24 UTC (rev 1443) +++ trunk/ggc-doctor/data/db/ggc_db.trace.db 2016-12-25 19:36:38 UTC (rev 1444) @@ -1,5 +1,5 @@ 04-15 23:26:35 jdbc[3]: SQLException -org.h2.jdbc.JdbcSQLException: Table DOC_APPOINTMENT not found; SQL statement: +org.h2.jdbc.JdbcSQLException: Table DOC_APPOINTMENT not found; SQL statement: alter table doc_appointment drop constraint FKC88D2B18668FC540 [42102-69] at org.h2.message.Message.getSQLException(Message.java:91) at org.h2.message.Message.getSQLException(Message.java:95) @@ -25,7 +25,7 @@ at ggc.core.db.tool.InitDb.<init>(InitDb.java:63) at ggc.core.db.tool.InitDb.main(InitDb.java:1045) 04-15 23:26:35 jdbc[3]: SQLException -org.h2.jdbc.JdbcSQLException: Table DOC_DOCTORS not found; SQL statement: +org.h2.jdbc.JdbcSQLException: Table DOC_DOCTORS not found; SQL statement: alter table doc_doctors drop constraint FK6537072DFA9399E1 [42102-69] at org.h2.message.Message.getSQLException(Message.java:91) at org.h2.message.Message.getSQLException(Message.java:95) @@ -1481,167 +1481,167 @@ at java.awt.EventDispatchThread.pumpEvents(Unknown Source) at java.awt.EventDispatchThread.pumpEvents(Unknown Source) at java.awt.EventDispatchThread.run(Unknown Source) -08-20 15:34:59 database: opening /mnt/data_2/Projects_SVN/ggc/trunk/ggc/data/db/ggc_db -org.h2.jdbc.JdbcSQLException: Database may be already in use: Locked by another process. Possible solutions: close all other connection(s); use the server mode [90020-69] - at org.h2.message.Message.getSQLException(Message.java:91) - at org.h2.message.Message.getSQLException(Message.java:95) - at org.h2.message.Message.getSQLException(Message.java:73) - at org.h2.store.FileLock.error(FileLock.java:316) - at org.h2.store.FileLock.lockFile(FileLock.java:178) - at org.h2.store.FileLock.lock(FileLock.java:74) - at org.h2.engine.Database.open(Database.java:467) - at org.h2.engine.Database.<init>(Database.java:203) - at org.h2.engine.Engine.openSession(Engine.java:55) - at org.h2.engine.Engine.getSession(Engine.java:104) - at org.h2.engine.Session.createSession(Session.java:203) - at org.h2.jdbc.JdbcConnection.<init>(JdbcConnection.java:976) - at org.h2.jdbc.JdbcConnection.<init>(JdbcConnection.java:957) - at org.h2.Driver.connect(Driver.java:57) - at java.sql.DriverManager.getConnection(DriverManager.java:582) - at java.sql.DriverManager.getConnection(DriverManager.java:154) - at org.hibernate.connection.DriverManagerConnectionProvider.getConnection(DriverManagerConnectionProvider.java:110) - at org.hibernate.cfg.SettingsFactory.buildSettings(SettingsFactory.java:72) - at org.hibernate.cfg.Configuration.buildSettings(Configuration.java:1881) - at org.hibernate.cfg.Configuration.buildSessionFactory(Configuration.java:1174) - at com.atech.db.hibernate.HibernateConfiguration.createSessionFactory(HibernateConfiguration.java:250) - at ggc.core.db.GGCDb.openHibernateSimple(GGCDb.java:198) - at ggc.core.db.GGCDb.initDb(GGCDb.java:177) - at ggc.core.db.GGCDbLoader.run(GGCDbLoader.java:123) -08-20 15:35:03 database: opening /mnt/data_2/Projects_SVN/ggc/trunk/ggc/data/db/ggc_db -org.h2.jdbc.JdbcSQLException: Database may be already in use: Locked by another process. Possible solutions: close all other connection(s); use the server mode [90020-69] - at org.h2.message.Message.getSQLException(Message.java:91) - at org.h2.message.Message.getSQLException(Message.java:95) - at org.h2.message.Message.getSQLException(Message.java:73) - at org.h2.store.FileLock.error(FileLock.java:316) - at org.h2.store.FileLock.lockFile(FileLock.java:178) - at org.h2.store.FileLock.lock(FileLock.java:74) - at org.h2.engine.Database.open(Database.java:467) - at org.h2.engine.Database.<init>(Database.java:203) - at org.h2.engine.Engine.openSession(Engine.java:55) - at org.h2.engine.Engine.getSession(Engine.java:104) - at org.h2.engine.Session.createSession(Session.java:203) - at org.h2.jdbc.JdbcConnection.<init>(JdbcConnection.java:976) - at org.h2.jdbc.JdbcConnection.<init>(JdbcConnection.java:957) - at org.h2.Driver.connect(Driver.java:57) - at java.sql.DriverManager.getConnection(DriverManager.java:582) - at java.sql.DriverManager.getConnection(DriverManager.java:154) - at org.hibernate.connection.DriverManagerConnectionProvider.getConnection(DriverManagerConnectionProvider.java:110) - at org.hibernate.jdbc.ConnectionManager.openConnection(ConnectionManager.java:417) - at org.hibernate.jdbc.ConnectionManager.getConnection(ConnectionManager.java:144) - at org.hibernate.jdbc.AbstractBatcher.prepareQueryStatement(AbstractBatcher.java:105) - at org.hibernate.loader.Loader.prepareQueryStatement(Loader.java:1561) - at org.hibernate.loader.hql.QueryLoader.iterate(QueryLoader.java:392) - at org.hibernate.hql.ast.QueryTranslatorImpl.iterate(QueryTranslatorImpl.java:318) - at org.hibernate.engine.query.HQLQueryPlan.performIterate(HQLQueryPlan.java:177) - at org.hibernate.impl.SessionImpl.iterate(SessionImpl.java:1156) - at org.hibernate.impl.QueryImpl.iterate(QueryImpl.java:46) - at ggc.core.db.GGCDb.loadColorSchemes(GGCDb.java:801) - at ggc.core.db.GGCDb.loadConfigData(GGCDb.java:733) - at ggc.core.db.GGCDbLoader.run(GGCDbLoader.java:130) -08-20 15:35:05 database: opening /mnt/data_2/Projects_SVN/ggc/trunk/ggc/data/db/ggc_db -org.h2.jdbc.JdbcSQLException: Database may be already in use: Locked by another process. Possible solutions: close all other connection(s); use the server mode [90020-69] - at org.h2.message.Message.getSQLException(Message.java:91) - at org.h2.message.Message.getSQLException(Message.java:95) - at org.h2.message.Message.getSQLException(Message.java:73) - at org.h2.store.FileLock.error(FileLock.java:316) - at org.h2.store.FileLock.lockFile(FileLock.java:178) - at org.h2.store.FileLock.lock(FileLock.java:74) - at org.h2.engine.Database.open(Database.java:467) - at org.h2.engine.Database.<init>(Database.java:203) - at org.h2.engine.Engine.openSession(Engine.java:55) - at org.h2.engine.Engine.getSession(Engine.java:104) - at org.h2.engine.Session.createSession(Session.java:203) - at org.h2.jdbc.JdbcConnection.<init>(JdbcConnection.java:976) - at org.h2.jdbc.JdbcConnection.<init>(JdbcConnection.java:957) - at org.h2.Driver.connect(Driver.java:57) - at java.sql.DriverManager.getConnection(DriverManager.java:582) - at java.sql.DriverManager.getConnection(DriverManager.java:154) - at org.hibernate.connection.DriverManagerConnectionProvider.getConnection(DriverManagerConnectionProvider.java:110) - at org.hibernate.jdbc.ConnectionManager.openConnection(ConnectionManager.java:417) - at org.hibernate.jdbc.ConnectionManager.getConnection(ConnectionManager.java:144) - at org.hibernate.jdbc.AbstractBatcher.prepareQueryStatement(AbstractBatcher.java:105) - at org.hibernate.loader.Loader.prepareQueryStatement(Loader.java:1561) - at org.hibernate.loader.hql.QueryLoader.iterate(QueryLoader.java:392) - at org.hibernate.hql.ast.QueryTranslatorImpl.iterate(QueryTranslatorImpl.java:318) - at org.hibernate.engine.query.HQLQueryPlan.performIterate(HQLQueryPlan.java:177) - at org.hibernate.impl.SessionImpl.iterate(SessionImpl.java:1156) - at org.hibernate.impl.QueryImpl.iterate(QueryImpl.java:46) - at ggc.core.db.GGCDb.loadConfigDataEntries(GGCDb.java:761) - at ggc.core.db.GGCDb.loadConfigData(GGCDb.java:736) - at ggc.core.db.GGCDbLoader.run(GGCDbLoader.java:130) -08-20 15:35:07 database: opening /mnt/data_2/Projects_SVN/ggc/trunk/ggc/data/db/ggc_db -org.h2.jdbc.JdbcSQLException: Database may be already in use: Locked by another process. Possible solutions: close all other connection(s); use the server mode [90020-69] - at org.h2.message.Message.getSQLException(Message.java:91) - at org.h2.message.Message.getSQLException(Message.java:95) - at org.h2.message.Message.getSQLException(Message.java:73) - at org.h2.store.FileLock.error(FileLock.java:316) - at org.h2.store.FileLock.lockFile(FileLock.java:178) - at org.h2.store.FileLock.lock(FileLock.java:74) - at org.h2.engine.Database.open(Database.java:467) - at org.h2.engine.Database.<init>(Database.java:203) - at org.h2.engine.Engine.openSession(Engine.java:55) - at org.h2.engine.Engine.getSession(Engine.java:104) - at org.h2.engine.Session.createSession(Session.java:203) - at org.h2.jdbc.JdbcConnection.<init>(JdbcConnection.java:976) - at org.h2.jdbc.JdbcConnection.<init>(JdbcConnection.java:957) - at org.h2.Driver.connect(Driver.java:57) - at java.sql.DriverManager.getConnection(DriverManager.java:582) - at java.sql.DriverManager.getConnection(DriverManager.java:154) - at org.hibernate.connection.DriverManagerConnectionProvider.getConnection(DriverManagerConnectionProvider.java:110) - at org.hibernate.jdbc.ConnectionManager.openConnection(ConnectionManager.java:417) - at org.hibernate.jdbc.ConnectionManager.getConnection(ConnectionManager.java:144) - at org.hibernate.jdbc.AbstractBatcher.prepareQueryStatement(AbstractBatcher.java:105) - at org.hibernate.loader.Loader.prepareQueryStatement(Loader.java:1561) - at org.hibernate.loader.Loader.doQuery(Loader.java:661) - at org.hibernate.loader.Loader.doQueryAndInitializeNonLazyCollections(Loader.java:224) - at org.hibernate.loader.Loader.doList(Loader.java:2145) - at org.hibernate.loader.Loader.listIgnoreQueryCache(Loader.java:2029) - at org.hibernate.loader.Loader.list(Loader.java:2024) - at org.hibernate.loader.hql.QueryLoader.list(QueryLoader.java:375) - at org.hibernate.hql.ast.QueryTranslatorImpl.list(QueryTranslatorImpl.java:308) - at org.hibernate.engine.query.HQLQueryPlan.performList(HQLQueryPlan.java:153) - at org.hibernate.impl.SessionImpl.list(SessionImpl.java:1106) - at org.hibernate.impl.QueryImpl.list(QueryImpl.java:79) - at ggc.core.db.GGCDb.loadHbA1c(GGCDb.java:1194) - at ggc.core.db.GGCDb.getHbA1c(GGCDb.java:1157) - at ggc.core.util.DataAccess.loadDailySettings(DataAccess.java:1129) - at ggc.core.db.GGCDbLoader.run(GGCDbLoader.java:138) -08-20 15:35:09 database: opening /mnt/data_2/Projects_SVN/ggc/trunk/ggc/data/db/ggc_db -org.h2.jdbc.JdbcSQLException: Database may be already in use: Locked by another process. Possible solutions: close all other connection(s); use the server mode [90020-69] - at org.h2.message.Message.getSQLException(Message.java:91) - at org.h2.message.Message.getSQLException(Message.java:95) - at org.h2.message.Message.getSQLException(Message.java:73) - at org.h2.store.FileLock.error(FileLock.java:316) - at org.h2.store.FileLock.lockFile(FileLock.java:178) - at org.h2.store.FileLock.lock(FileLock.java:74) - at org.h2.engine.Database.open(Database.java:467) - at org.h2.engine.Database.<init>(Database.java:203) - at org.h2.engine.Engine.openSession(Engine.java:55) - at org.h2.engine.Engine.getSession(Engine.java:104) - at org.h2.engine.Session.createSession(Session.java:203) - at org.h2.jdbc.JdbcConnection.<init>(JdbcConnection.java:976) - at org.h2.jdbc.JdbcConnection.<init>(JdbcConnection.java:957) - at org.h2.Driver.connect(Driver.java:57) - at java.sql.DriverManager.getConnection(DriverManager.java:582) - at java.sql.DriverManager.getConnection(DriverManager.java:154) - at org.hibernate.connection.DriverManagerConnectionProvider.getConnection(DriverManagerConnectionProvider.java:110) - at org.hibernate.jdbc.ConnectionManager.openConnection(ConnectionManager.java:417) - at org.hibernate.jdbc.ConnectionManager.getConnection(ConnectionManager.java:144) - at org.hibernate.jdbc.AbstractBatcher.prepareQueryStatement(AbstractBatcher.java:105) - at org.hibernate.loader.Loader.prepareQueryStatement(Loader.java:1561) - at org.hibernate.loader.Loader.doQuery(Loader.java:661) - at org.hibernate.loader.Loader.doQueryAndInitializeNonLazyCollections(Loader.java:224) - at org.hibernate.loader.Loader.doList(Loader.java:2145) - at org.hibernate.loader.Loader.listIgnoreQueryCache(Loader.java:2029) - at org.hibernate.loader.Loader.list(Loader.java:2024) - at org.hibernate.loader.hql.QueryLoader.list(QueryLoader.java:375) - at org.hibernate.hql.ast.QueryTranslatorImpl.list(QueryTranslatorImpl.java:308) - at org.hibernate.engine.query.HQLQueryPlan.performList(HQLQueryPlan.java:153) - at org.hibernate.impl.SessionImpl.list(SessionImpl.java:1106) - at org.hibernate.impl.QueryImpl.list(QueryImpl.java:79) - at ggc.core.db.GGCDb.getDayStats(GGCDb.java:1237) - at ggc.core.util.DataAccess.loadDailySettings(DataAccess.java:1130) - at ggc.core.db.GGCDbLoader.run(GGCDbLoader.java:138) +08-20 15:34:59 database: opening /mnt/data_2/Projects_SVN/ggc/trunk/ggc/data/db/ggc_db +org.h2.jdbc.JdbcSQLException: Database may be already in use: Locked by another process. Possible solutions: close all other connection(s); use the server mode [90020-69] + at org.h2.message.Message.getSQLException(Message.java:91) + at org.h2.message.Message.getSQLException(Message.java:95) + at org.h2.message.Message.getSQLException(Message.java:73) + at org.h2.store.FileLock.error(FileLock.java:316) + at org.h2.store.FileLock.lockFile(FileLock.java:178) + at org.h2.store.FileLock.lock(FileLock.java:74) + at org.h2.engine.Database.open(Database.java:467) + at org.h2.engine.Database.<init>(Database.java:203) + at org.h2.engine.Engine.openSession(Engine.java:55) + at org.h2.engine.Engine.getSession(Engine.java:104) + at org.h2.engine.Session.createSession(Session.java:203) + at org.h2.jdbc.JdbcConnection.<init>(JdbcConnection.java:976) + at org.h2.jdbc.JdbcConnection.<init>(JdbcConnection.java:957) + at org.h2.Driver.connect(Driver.java:57) + at java.sql.DriverManager.getConnection(DriverManager.java:582) + at java.sql.DriverManager.getConnection(DriverManager.java:154) + at org.hibernate.connection.DriverManagerConnectionProvider.getConnection(DriverManagerConnectionProvider.java:110) + at org.hibernate.cfg.SettingsFactory.buildSettings(SettingsFactory.java:72) + at org.hibernate.cfg.Configuration.buildSettings(Configuration.java:1881) + at org.hibernate.cfg.Configuration.buildSessionFactory(Configuration.java:1174) + at com.atech.db.hibernate.HibernateConfiguration.createSessionFactory(HibernateConfiguration.java:250) + at ggc.core.db.GGCDb.openHibernateSimple(GGCDb.java:198) + at ggc.core.db.GGCDb.initDb(GGCDb.java:177) + at ggc.core.db.GGCDbLoader.run(GGCDbLoader.java:123) +08-20 15:35:03 database: opening /mnt/data_2/Projects_SVN/ggc/trunk/ggc/data/db/ggc_db +org.h2.jdbc.JdbcSQLException: Database may be already in use: Locked by another process. Possible solutions: close all other connection(s); use the server mode [90020-69] + at org.h2.message.Message.getSQLException(Message.java:91) + at org.h2.message.Message.getSQLException(Message.java:95) + at org.h2.message.Message.getSQLException(Message.java:73) + at org.h2.store.FileLock.error(FileLock.java:316) + at org.h2.store.FileLock.lockFile(FileLock.java:178) + at org.h2.store.FileLock.lock(FileLock.java:74) + at org.h2.engine.Database.open(Database.java:467) + at org.h2.engine.Database.<init>(Database.java:203) + at org.h2.engine.Engine.openSession(Engine.java:55) + at org.h2.engine.Engine.getSession(Engine.java:104) + at org.h2.engine.Session.createSession(Session.java:203) + at org.h2.jdbc.JdbcConnection.<init>(JdbcConnection.java:976) + at org.h2.jdbc.JdbcConnection.<init>(JdbcConnection.java:957) + at org.h2.Driver.connect(Driver.java:57) + at java.sql.DriverManager.getConnection(DriverManager.java:582) + at java.sql.DriverManager.getConnection(DriverManager.java:154) + at org.hibernate.connection.DriverManagerConnectionProvider.getConnection(DriverManagerConnectionProvider.java:110) + at org.hibernate.jdbc.ConnectionManager.openConnection(ConnectionManager.java:417) + at org.hibernate.jdbc.ConnectionManager.getConnection(ConnectionManager.java:144) + at org.hibernate.jdbc.AbstractBatcher.prepareQueryStatement(AbstractBatcher.java:105) + at org.hibernate.loader.Loader.prepareQueryStatement(Loader.java:1561) + at org.hibernate.loader.hql.QueryLoader.iterate(QueryLoader.java:392) + at org.hibernate.hql.ast.QueryTranslatorImpl.iterate(QueryTranslatorImpl.java:318) + at org.hibernate.engine.query.HQLQueryPlan.performIterate(HQLQueryPlan.java:177) + at org.hibernate.impl.SessionImpl.iterate(SessionImpl.java:1156) + at org.hibernate.impl.QueryImpl.iterate(QueryImpl.java:46) + at ggc.core.db.GGCDb.loadColorSchemes(GGCDb.java:801) + at ggc.core.db.GGCDb.loadConfigData(GGCDb.java:733) + at ggc.core.db.GGCDbLoader.run(GGCDbLoader.java:130) +08-20 15:35:05 database: opening /mnt/data_2/Projects_SVN/ggc/trunk/ggc/data/db/ggc_db +org.h2.jdbc.JdbcSQLException: Database may be already in use: Locked by another process. Possible solutions: close all other connection(s); use the server mode [90020-69] + at org.h2.message.Message.getSQLException(Message.java:91) + at org.h2.message.Message.getSQLException(Message.java:95) + at org.h2.message.Message.getSQLException(Message.java:73) + at org.h2.store.FileLock.error(FileLock.java:316) + at org.h2.store.FileLock.lockFile(FileLock.java:178) + at org.h2.store.FileLock.lock(FileLock.java:74) + at org.h2.engine.Database.open(Database.java:467) + at org.h2.engine.Database.<init>(Database.java:203) + at org.h2.engine.Engine.openSession(Engine.java:55) + at org.h2.engine.Engine.getSession(Engine.java:104) + at org.h2.engine.Session.createSession(Session.java:203) + at org.h2.jdbc.JdbcConnection.<init>(JdbcConnection.java:976) + at org.h2.jdbc.JdbcConnection.<init>(JdbcConnection.java:957) + at org.h2.Driver.connect(Driver.java:57) + at java.sql.DriverManager.getConnection(DriverManager.java:582) + at java.sql.DriverManager.getConnection(DriverManager.java:154) + at org.hibernate.connection.DriverManagerConnectionProvider.getConnection(DriverManagerConnectionProvider.java:110) + at org.hibernate.jdbc.ConnectionManager.openConnection(ConnectionManager.java:417) + at org.hibernate.jdbc.ConnectionManager.getConnection(ConnectionManager.java:144) + at org.hibernate.jdbc.AbstractBatcher.prepareQueryStatement(AbstractBatcher.java:105) + at org.hibernate.loader.Loader.prepareQueryStatement(Loader.java:1561) + at org.hibernate.loader.hql.QueryLoader.iterate(QueryLoader.java:392) + at org.hibernate.hql.ast.QueryTranslatorImpl.iterate(QueryTranslatorImpl.java:318) + at org.hibernate.engine.query.HQLQueryPlan.performIterate(HQLQueryPlan.java:177) + at org.hibernate.impl.SessionImpl.iterate(SessionImpl.java:1156) + at org.hibernate.impl.QueryImpl.iterate(QueryImpl.java:46) + at ggc.core.db.GGCDb.loadConfigDataEntries(GGCDb.java:761) + at ggc.core.db.GGCDb.loadConfigData(GGCDb.java:736) + at ggc.core.db.GGCDbLoader.run(GGCDbLoader.java:130) +08-20 15:35:07 database: opening /mnt/data_2/Projects_SVN/ggc/trunk/ggc/data/db/ggc_db +org.h2.jdbc.JdbcSQLException: Database may be already in use: Locked by another process. Possible solutions: close all other connection(s); use the server mode [90020-69] + at org.h2.message.Message.getSQLException(Message.java:91) + at org.h2.message.Message.getSQLException(Message.java:95) + at org.h2.message.Message.getSQLException(Message.java:73) + at org.h2.store.FileLock.error(FileLock.java:316) + at org.h2.store.FileLock.lockFile(FileLock.java:178) + at org.h2.store.FileLock.lock(FileLock.java:74) + at org.h2.engine.Database.open(Database.java:467) + at org.h2.engine.Database.<init>(Database.java:203) + at org.h2.engine.Engine.openSession(Engine.java:55) + at org.h2.engine.Engine.getSession(Engine.java:104) + at org.h2.engine.Session.createSession(Session.java:203) + at org.h2.jdbc.JdbcConnection.<init>(JdbcConnection.java:976) + at org.h2.jdbc.JdbcConnection.<init>(JdbcConnection.java:957) + at org.h2.Driver.connect(Driver.java:57) + at java.sql.DriverManager.getConnection(DriverManager.java:582) + at java.sql.DriverManager.getConnection(DriverManager.java:154) + at org.hibernate.connection.DriverManagerConnectionProvider.getConnection(DriverManagerConnectionProvider.java:110) + at org.hibernate.jdbc.ConnectionManager.openConnection(ConnectionManager.java:417) + at org.hibernate.jdbc.ConnectionManager.getConnection(ConnectionManager.java:144) + at org.hibernate.jdbc.AbstractBatcher.prepareQueryStatement(AbstractBatcher.java:105) + at org.hibernate.loader.Loader.prepareQueryStatement(Loader.java:1561) + at org.hibernate.loader.Loader.doQuery(Loader.java:661) + at org.hibernate.loader.Loader.doQueryAndInitializeNonLazyCollections(Loader.java:224) + at org.hibernate.loader.Loader.doList(Loader.java:2145) + at org.hibernate.loader.Loader.listIgnoreQueryCache(Loader.java:2029) + at org.hibernate.loader.Loader.list(Loader.java:2024) + at org.hibernate.loader.hql.QueryLoader.list(QueryLoader.java:375) + at org.hibernate.hql.ast.QueryTranslatorImpl.list(QueryTranslatorImpl.java:308) + at org.hibernate.engine.query.HQLQueryPlan.performList(HQLQueryPlan.java:153) + at org.hibernate.impl.SessionImpl.list(SessionImpl.java:1106) + at org.hibernate.impl.QueryImpl.list(QueryImpl.java:79) + at ggc.core.db.GGCDb.loadHbA1c(GGCDb.java:1194) + at ggc.core.db.GGCDb.getHbA1c(GGCDb.java:1157) + at ggc.core.util.DataAccess.loadDailySettings(DataAccess.java:1129) + at ggc.core.db.GGCDbLoader.run(GGCDbLoader.java:138) +08-20 15:35:09 database: opening /mnt/data_2/Projects_SVN/ggc/trunk/ggc/data/db/ggc_db +org.h2.jdbc.JdbcSQLException: Database may be already in use: Locked by another process. Possible solutions: close all other connection(s); use the server mode [90020-69] + at org.h2.message.Message.getSQLException(Message.java:91) + at org.h2.message.Message.getSQLException(Message.java:95) + at org.h2.message.Message.getSQLException(Message.java:73) + at org.h2.store.FileLock.error(FileLock.java:316) + at org.h2.store.FileLock.lockFile(FileLock.java:178) + at org.h2.store.FileLock.lock(FileLock.java:74) + at org.h2.engine.Database.open(Database.java:467) + at org.h2.engine.Database.<init>(Database.java:203) + at org.h2.engine.Engine.openSession(Engine.java:55) + at org.h2.engine.Engine.getSession(Engine.java:104) + at org.h2.engine.Session.createSession(Session.java:203) + at org.h2.jdbc.JdbcConnection.<init>(JdbcConnection.java:976) + at org.h2.jdbc.JdbcConnection.<init>(JdbcConnection.java:957) + at org.h2.Driver.connect(Driver.java:57) + at java.sql.DriverManager.getConnection(DriverManager.java:582) + at java.sql.DriverManager.getConnection(DriverManager.java:154) + at org.hibernate.connection.DriverManagerConnectionProvider.getConnection(DriverManagerConnectionProvider.java:110) + at org.hibernate.jdbc.ConnectionManager.openConnection(ConnectionManager.java:417) + at org.hibernate.jdbc.ConnectionManager.getConnection(ConnectionManager.java:144) + at org.hibernate.jdbc.AbstractBatcher.prepareQueryStatement(Abstra... [truncated message content] |
From: <and...@us...> - 2016-12-25 19:28:26
|
Revision: 1443 http://sourceforge.net/p/ggc/code/1443 Author: andyrozman Date: 2016-12-25 19:28:24 +0000 (Sun, 25 Dec 2016) Log Message: ----------- ggc-cgms: 1.5.2 - Db changes - added new Extended Type Modified Paths: -------------- trunk/ggc-cgm/build/build.xml trunk/ggc-cgm/doc/Changelog trunk/ggc-cgm/pom.xml trunk/ggc-cgm/src/ggc/cgms/data/CGMSValuesExtendedEntry.java trunk/ggc-cgm/src/ggc/cgms/data/db/GGC_CGMSDb.java trunk/ggc-cgm/src/ggc/cgms/data/defs/CGMSAlarms.java trunk/ggc-cgm/src/ggc/cgms/manager/CGMSDevicesIds.java trunk/ggc-cgm/src/ggc/cgms/util/DataAccessCGMS.java Added Paths: ----------- trunk/ggc-cgm/src/ggc/cgms/data/ExtendedCGMSValueHandler.java trunk/ggc-cgm/src/ggc/cgms/data/ExtendedCGMSValueType.java Removed Paths: ------------- trunk/ggc-cgm/src/ggc/cgms/data/ExtendedCGMSValuesExtendedEntry.java Modified: trunk/ggc-cgm/build/build.xml =================================================================== --- trunk/ggc-cgm/build/build.xml 2016-12-25 19:22:53 UTC (rev 1442) +++ trunk/ggc-cgm/build/build.xml 2016-12-25 19:28:24 UTC (rev 1443) @@ -6,9 +6,9 @@ <!-- Environment properties read from a file ...--> <property file="../../build/AtechTools.properties"/> - <property file="../../ggc-core/build/GGC_Core_Version.properties"/> - <property file="../../ggc-plugin_base/build/GGCPlugInBaseBuild.properties"/> - <property file="../../ggc-plugin_base/build/GGCPlugInBaseVersion.properties"/> + <property file="../../ggc-core-app/ggc-core/build/GGC_Core_Version.properties"/> + <property file="../../ggc-plugins/ggc-plugins-base/build/GGCPlugInBaseBuild.properties"/> + <property file="../../ggc-plugins/ggc-plugins-base/build/GGCPlugInBaseVersion.properties"/> <property file="./GGCCGMSToolVersion.properties"/> <!-- These should *not* be modified on the command line! --> Modified: trunk/ggc-cgm/doc/Changelog =================================================================== --- trunk/ggc-cgm/doc/Changelog 2016-12-25 19:22:53 UTC (rev 1442) +++ trunk/ggc-cgm/doc/Changelog 2016-12-25 19:28:24 UTC (rev 1443) @@ -2,8 +2,11 @@ Changes file for GGC CGM Tool ============================== --- We will move to version 2.0, when Minimed and at least one of Abbott CGMSes is supported (Navigator 1.x or 2.x) +-- We will move to version 2.0, when Minimed is supported (Navigator 1.x or 2.x) +1.5.2 [25.12.2016] [Andy] +- Db changes +- added new Extended Type 1.5.1 [26.5.2016] [Andy] - refactorings (code, db) Modified: trunk/ggc-cgm/pom.xml =================================================================== --- trunk/ggc-cgm/pom.xml 2016-12-25 19:22:53 UTC (rev 1442) +++ trunk/ggc-cgm/pom.xml 2016-12-25 19:28:24 UTC (rev 1443) @@ -5,7 +5,7 @@ <groupId>net.sf.ggc</groupId> <artifactId>ggc-parent</artifactId> <version>1.0-SNAPSHOT</version> - <relativePath>../ggc-master-pom/pom.xml</relativePath> + <relativePath>../ggc-removed/ggc-master-pom/pom.xml</relativePath> </parent> <name>GGC CGMS Tool Project</name> Modified: trunk/ggc-cgm/src/ggc/cgms/data/CGMSValuesExtendedEntry.java =================================================================== --- trunk/ggc-cgm/src/ggc/cgms/data/CGMSValuesExtendedEntry.java 2016-12-25 19:22:53 UTC (rev 1442) +++ trunk/ggc-cgm/src/ggc/cgms/data/CGMSValuesExtendedEntry.java 2016-12-25 19:28:24 UTC (rev 1443) @@ -1,12 +1,12 @@ package ggc.cgms.data; import java.util.HashMap; +import java.util.Map; import org.apache.commons.lang.StringUtils; import org.hibernate.Session; import org.hibernate.Transaction; -import com.atech.db.ext.ExtendedHandler; import com.atech.misc.statistics.StatisticsItem; import com.atech.utils.data.ATechDate; import com.atech.utils.data.ATechDateType; @@ -427,37 +427,42 @@ } + private ExtendedCGMSValueHandler getExtendedHandler() + { + return (ExtendedCGMSValueHandler) CGMSUtil.getExtendedHandler(this.getDVEName()); + } + + private void loadExtended(String extended2) { - ExtendedHandler handler = CGMSUtil.getExtendedHandler(this.getDVEName()); - HashMap<String, String> data = handler.loadExtended(extended2); + ExtendedCGMSValueHandler handler = getExtendedHandler(); + Map<ExtendedCGMSValueType, String> data = handler.loadExtended(extended2); - if (handler.isExtendedValueSet(ExtendedCGMSValuesExtendedEntry.EXTENDED_SUB_TYPE, data)) + if (handler.isExtendedValueSet(ExtendedCGMSValueType.SubType, data)) { - this.subType = Integer - .parseInt(handler.getExtendedValue(ExtendedCGMSValuesExtendedEntry.EXTENDED_SUB_TYPE, data)); + this.subType = Integer.parseInt(handler.getExtendedValue(ExtendedCGMSValueType.SubType, data)); } - if (handler.isExtendedValueSet(ExtendedCGMSValuesExtendedEntry.EXTENDED_SUB_TYPE, data)) + if (handler.isExtendedValueSet(ExtendedCGMSValueType.Source, data)) { - this.source = handler.getExtendedValue(ExtendedCGMSValuesExtendedEntry.EXTENDED_SOURCE, data); + this.source = handler.getExtendedValue(ExtendedCGMSValueType.Source, data); } } private String saveExtended() { - ExtendedHandler handler = CGMSUtil.getExtendedHandler(this.getDVEName()); - HashMap<String, String> data = new HashMap<String, String>(); + ExtendedCGMSValueHandler handler = getExtendedHandler(); + Map<ExtendedCGMSValueType, String> data = new HashMap<ExtendedCGMSValueType, String>(); if (this.subType > 0) { - handler.setExtendedValue(ExtendedCGMSValuesExtendedEntry.EXTENDED_SUB_TYPE, "" + this.subType, data); + handler.setExtendedValue(ExtendedCGMSValueType.SubType, "" + this.subType, data); } if (StringUtils.isNotBlank(this.source)) { - handler.setExtendedValue(ExtendedCGMSValuesExtendedEntry.EXTENDED_SOURCE, this.source, data); + handler.setExtendedValue(ExtendedCGMSValueType.Source, this.source, data); } String ext = handler.saveExtended(data); Added: trunk/ggc-cgm/src/ggc/cgms/data/ExtendedCGMSValueHandler.java =================================================================== --- trunk/ggc-cgm/src/ggc/cgms/data/ExtendedCGMSValueHandler.java (rev 0) +++ trunk/ggc-cgm/src/ggc/cgms/data/ExtendedCGMSValueHandler.java 2016-12-25 19:28:24 UTC (rev 1443) @@ -0,0 +1,51 @@ +package ggc.cgms.data; + +import com.atech.db.ext.ExtendedEnumHandler; + +/** + * 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: ExtendedDailyValueHandler + * Description: Extended DailyValue Handler + * + * @author Andy {an...@at...} + */ + +public class ExtendedCGMSValueHandler extends ExtendedEnumHandler<ExtendedCGMSValueType> +{ + + // private String extended; + + // private String[] extended_arr; + + // private boolean changed = false; + // boolean debug = false; + + public ExtendedCGMSValueHandler() + { + super(ExtendedCGMSValueType.None, "CGMSValuesExtendedEntry"); + } + + // @Override + // public String getExtendedObject() + // { + // return "DailyValuesRow"; + // } + +} Added: trunk/ggc-cgm/src/ggc/cgms/data/ExtendedCGMSValueType.java =================================================================== --- trunk/ggc-cgm/src/ggc/cgms/data/ExtendedCGMSValueType.java (rev 0) +++ trunk/ggc-cgm/src/ggc/cgms/data/ExtendedCGMSValueType.java 2016-12-25 19:28:24 UTC (rev 1443) @@ -0,0 +1,89 @@ +package ggc.cgms.data; + +import java.util.HashMap; +import java.util.Map; + +import com.atech.db.ext.ExtendedEnumType; + +public enum ExtendedCGMSValueType implements ExtendedEnumType<ExtendedCGMSValueType> +{ + + None("NONE"), // + SubType("SUB_TYPE"), // + Source("SOURCE"), // + ; + + int code; + String i18nKey; + String translation; + + static Map<String, ExtendedCGMSValueType> mapByKey; + static Map<String, ExtendedCGMSValueType> mapByName; + + static + { + mapByKey = new HashMap<String, ExtendedCGMSValueType>(); + mapByName = new HashMap<String, ExtendedCGMSValueType>(); + + for (ExtendedCGMSValueType vt : values()) + { + mapByKey.put(vt.getI18nKey(), vt); + mapByName.put(vt.name(), vt); + } + } + + + ExtendedCGMSValueType(String i18nKey) + { + this.i18nKey = i18nKey; + } + + + public ExtendedCGMSValueType getEnumTypeByKey(String key) + { + return mapByKey.get(key); + } + + + public ExtendedCGMSValueType getEnumTypeByName(String key) + { + return mapByName.get(key); + } + + + public String getI18nKey() + { + return this.i18nKey; + } + + + public String getTranslation() + { + return this.translation; + } + + + public void setTranslation(String translation) + { + this.translation = translation; + } + + + public String getName() + { + return name(); + } + + + public boolean useI18nKey() + { + return true; + } + + + public ExtendedCGMSValueType[] getAllValues() + { + return values(); + } + +} Deleted: trunk/ggc-cgm/src/ggc/cgms/data/ExtendedCGMSValuesExtendedEntry.java =================================================================== --- trunk/ggc-cgm/src/ggc/cgms/data/ExtendedCGMSValuesExtendedEntry.java 2016-12-25 19:22:53 UTC (rev 1442) +++ trunk/ggc-cgm/src/ggc/cgms/data/ExtendedCGMSValuesExtendedEntry.java 2016-12-25 19:28:24 UTC (rev 1443) @@ -1,39 +0,0 @@ -package ggc.cgms.data; - -import java.util.Hashtable; - -import com.atech.db.ext.ExtendedHandler; -import com.atech.utils.ATDataAccessAbstract; - -public class ExtendedCGMSValuesExtendedEntry extends ExtendedHandler -{ - - public static final int EXTENDED_SUB_TYPE = 0; - public static final int EXTENDED_SOURCE = 1; - - private static final int EXTENDED_MAX = 1; - - - public ExtendedCGMSValuesExtendedEntry(ATDataAccessAbstract da) - { - super(da); - - } - - - @Override - public void initExtended() - { - ext_mapped_types = new Hashtable<Integer, String>(); - ext_mapped_types.put(ExtendedCGMSValuesExtendedEntry.EXTENDED_SUB_TYPE, "SUB_TYPE"); - ext_mapped_types.put(ExtendedCGMSValuesExtendedEntry.EXTENDED_SOURCE, "SOURCE"); - } - - - @Override - public String getExtendedObject() - { - return "CGMSValuesExtendedEntry"; - } - -} Modified: trunk/ggc-cgm/src/ggc/cgms/data/db/GGC_CGMSDb.java =================================================================== --- trunk/ggc-cgm/src/ggc/cgms/data/db/GGC_CGMSDb.java 2016-12-25 19:22:53 UTC (rev 1442) +++ trunk/ggc-cgm/src/ggc/cgms/data/db/GGC_CGMSDb.java 2016-12-25 19:28:24 UTC (rev 1443) @@ -16,6 +16,7 @@ import com.atech.graphics.graphs.v2.data.GraphDbDataRetriever; import com.atech.graphics.graphs.v2.data.GraphDefinitionDto; import com.atech.graphics.graphs.v2.data.GraphTimeDataCollection; +import com.atech.utils.ATDataAccessAbstract; import com.atech.utils.data.ATechDate; import com.atech.utils.data.ATechDateType; @@ -25,6 +26,7 @@ import ggc.core.db.hibernate.cgms.CGMSDataH; import ggc.plugin.data.DeviceValuesDay; import ggc.plugin.data.DeviceValuesEntryInterface; +import ggc.plugin.data.DeviceValuesRange; import ggc.plugin.db.PluginDb; /** @@ -124,6 +126,59 @@ /** + * Get Pump Values Range + * + * @param from + * @param to + * @return + */ + public DeviceValuesRange getRangePumpValues(GregorianCalendar from, GregorianCalendar to) + { + ATDataAccessAbstract.notImplemented("GGC_CGMSDb::getRangePumpValues()"); + return null; + + /* + * log.info("getPumpDayStats()"); + * long dt_from = ATechDate.getATDateTimeFromGC(from, + * ATechDate.FORMAT_DATE_ONLY); + * long dt_to = ATechDate.getATDateTimeFromGC(to, + * ATechDate.FORMAT_DATE_ONLY); + * String sql = ""; + * DeviceValuesRange dvr = new + * DeviceValuesRange(DataAccessPump.getInstance(), from, to); + * try + * { + * sql = "SELECT dv from " + + * "ggc.core.db.hibernate.pump.PumpDataH as dv " + + * "WHERE dv.dt_info >= " + dt_from + * + "000000 AND dv.dt_info <= " + dt_to + "235959 ORDER BY dv.dt_info"; + * //System.out.println("SQL: " + sql); + * Query q = this.db.getSession().createQuery(sql); + * Iterator<?> it = q.list().iterator(); + * while (it.hasNext()) + * { + * PumpDataH pdh = (PumpDataH)it.next(); + * PumpValuesEntry dv = new PumpValuesEntry(pdh); + * dvr.addEntry(dv); + * } + * ArrayList<PumpValuesEntryExt> lst_ext = + * getRangePumpValuesExtended(from, to); + * mergeRangePumpData(dvr, lst_ext); + * // ArrayList<PumpValuesEntryExt> lst_ext = + * getDailyPumpValuesExtended(gc); + * // mergeDailyPumpData(dV, lst_ext); + * } + * catch (Exception ex) + * { + * log.debug("Sql: " + sql); + * log.error("getDayStats(). Exception: " + ex, ex); + * } + * return dvr; + */ + } + + + /** * Get All Elements Count * * @return Modified: trunk/ggc-cgm/src/ggc/cgms/data/defs/CGMSAlarms.java =================================================================== --- trunk/ggc-cgm/src/ggc/cgms/data/defs/CGMSAlarms.java 2016-12-25 19:22:53 UTC (rev 1442) +++ trunk/ggc-cgm/src/ggc/cgms/data/defs/CGMSAlarms.java 2016-12-25 19:28:24 UTC (rev 1443) @@ -65,6 +65,7 @@ static Hashtable<String, CGMSAlarms> translationMapping = new Hashtable<String, CGMSAlarms>(); static Hashtable<Integer, CGMSAlarms> codeMapping = new Hashtable<Integer, CGMSAlarms>(); + static { I18nControlAbstract ic = DataAccessCGMS.getInstance().getI18nControlInstance(); @@ -137,4 +138,9 @@ return codeMapping.values(); } + // public CodeEnumWithTranslation[] values() + // { + // return values(); + // } + } Modified: trunk/ggc-cgm/src/ggc/cgms/manager/CGMSDevicesIds.java =================================================================== --- trunk/ggc-cgm/src/ggc/cgms/manager/CGMSDevicesIds.java 2016-12-25 19:22:53 UTC (rev 1442) +++ trunk/ggc-cgm/src/ggc/cgms/manager/CGMSDevicesIds.java 2016-12-25 19:28:24 UTC (rev 1443) @@ -104,10 +104,13 @@ public static final int CGMS_MINIMED_640G = 30007; /** - * CGMS (Minimed) - Minimed RealTime + * CGMS (Animas) - Animas Vibe (Dexcom 4 integration) */ public static final int CGMS_ANIMAS_VIBE_DEXCOM_INTEGRATION = 40001; + /** + * CGMS (Tandem) - Tandem G4 (Dexcom 4 integration) + */ public static final int CGMS_TANDEM_TSLIM_G4_DEXCOM_INTEGRATION = 50001; } Modified: trunk/ggc-cgm/src/ggc/cgms/util/DataAccessCGMS.java =================================================================== --- trunk/ggc-cgm/src/ggc/cgms/util/DataAccessCGMS.java 2016-12-25 19:22:53 UTC (rev 1442) +++ trunk/ggc-cgm/src/ggc/cgms/util/DataAccessCGMS.java 2016-12-25 19:28:24 UTC (rev 1443) @@ -7,7 +7,7 @@ import ggc.cgms.data.CGMSDataHandler; import ggc.cgms.data.CGMSDataReader; import ggc.cgms.data.CGMSValuesEntry; -import ggc.cgms.data.ExtendedCGMSValuesExtendedEntry; +import ggc.cgms.data.ExtendedCGMSValueHandler; import ggc.cgms.data.cfg.CGMSConfigurationDefinition; import ggc.cgms.data.db.GGC_CGMSDb; import ggc.cgms.data.graph.v2.CGMSGraphContext; @@ -389,7 +389,7 @@ public void loadExtendedHandlers() { this.addExtendedHandler(DataAccessCGMS.EXTENDED_HANDLER_CGMSValuesExtendedEntry, - new ExtendedCGMSValuesExtendedEntry(this)); + new ExtendedCGMSValueHandler()); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <and...@us...> - 2016-12-25 19:22:57
|
Revision: 1442 http://sourceforge.net/p/ggc/code/1442 Author: andyrozman Date: 2016-12-25 19:22:53 +0000 (Sun, 25 Dec 2016) Log Message: ----------- ggc-nutrition - first check afer move Modified Paths: -------------- trunk/ggc-plugins/pom.xml Added Paths: ----------- trunk/ggc-plugins/ggc-nutrition/.settings/ trunk/ggc-plugins/ggc-nutrition/build/ trunk/ggc-plugins/ggc-nutrition/build/build.xml trunk/ggc-plugins/ggc-nutrition/docs/ trunk/ggc-plugins/ggc-nutrition/docs/Changelog trunk/ggc-plugins/ggc-nutrition/pom.xml trunk/ggc-plugins/ggc-nutrition/src/main/resources/GGC_Nutrition_de.properties trunk/ggc-plugins/ggc-nutrition/src/main/resources/GGC_Nutrition_en.properties trunk/ggc-plugins/ggc-nutrition/src/main/resources/GGC_Nutrition_fr.properties trunk/ggc-plugins/ggc-nutrition/src/main/resources/GGC_Nutrition_si.properties trunk/ggc-plugins/ggc-nutrition/src/main/resources/icons/ Removed Paths: ------------- trunk/ggc-nutri/.settings/ trunk/ggc-nutri/build/ trunk/ggc-nutri/docs/ trunk/ggc-nutri/pom.xml 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/icons/ trunk/ggc-plugins/ggc-nutrition/build/build.xml trunk/ggc-plugins/ggc-nutrition/docs/Changelog Deleted: trunk/ggc-nutri/pom.xml =================================================================== --- trunk/ggc-nutri/pom.xml 2016-12-25 18:55:50 UTC (rev 1441) +++ trunk/ggc-nutri/pom.xml 2016-12-25 19:22:53 UTC (rev 1442) @@ -1,64 +0,0 @@ -<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-removed/ggc-master-pom/pom.xml</relativePath> - </parent> - - <name>GGC Nutrition Tool Project</name> - - <artifactId>ggc-nutri-tool</artifactId> - <version>${ggc-nutri-tool.version}</version> - - <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> - </build> - - <dependencies> - <dependency> - <groupId>net.sf.ggc</groupId> - <artifactId>ggc-core</artifactId> - </dependency> - - <dependency> - <groupId>net.sf.ggc</groupId> - <artifactId>ggc-plugin-base</artifactId> - </dependency> - - <dependency> - <groupId>com.atech-software</groupId> - <artifactId>atech-tools</artifactId> - </dependency> - </dependencies> - - <properties> - - <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> - - </properties> - -</project> Deleted: trunk/ggc-nutri/src/GGC_Nutrition_de.properties =================================================================== --- trunk/ggc-nutri/src/GGC_Nutrition_de.properties 2016-12-25 18:55:50 UTC (rev 1441) +++ trunk/ggc-nutri/src/GGC_Nutrition_de.properties 2016-12-25 19:22:53 UTC (rev 1442) @@ -1,507 +0,0 @@ -# -# ###################################################################### -# ### GNU Glucose Control ### -# ###################################################################### -# ### Language: German ### -# ### Created by: Reinhold Rumberger (ru...@us...)### -# ### Version: 1.3.1 ### -# ### Last change: 03.07.2011 14:12:02 ### -# ###################################################################### -# -# -# Translation status: -# Words/expressions: 418 -# Not translated: 215 (51 %) -# Need to be checked: 21 (5 %) -# -# Translated: 182 (43 %) -# -# -# -## -# 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-standard, 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] -# -DELETE=L\u00F6schen -ADD=Hinzuf\u00FCgen -EDIT=Bearbeiten -NEW=Neu -INFORMATION=Information -QUESTION=Frage -YES=Ja -NO=Nein -OK=OK -CANCEL=Abbrechen -APPLY=Anwenden -SELECT=W\u00E4hlen -HELP=Hilfe -ROOT=root - -# -# Global Dialogs [1] -# -SELECT_ITEM_FIRST=W\u00E4hlen Sie bitte erst einen Eintrag und danach eine Aktion! -ARE_YOU_SURE_DELETE=Wollen Sie dieses Element wirklich l\u00F6schen? -TRANSLATED_NAME=\u00DCbersetzter Name (falls verf\u00FCgbar) -ID=ID -USDA_NUTRITION_DATABASE=N\u00E4hrstoff-Datenbank des USDA -USER_NUTRITION_DATABASE=N\u00E4hrstoff-Datenbank des Benutzers -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> -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> -USDA_NUTRITION_DB=USDA N\u00E4hrstoff-DB -USER_NUTRITION_DB=Benutzer N\u00E4hrstoff-DB -MEALS_DB=Mahlzeiten-DB -NONE=Nichts -NUTRITION=N\u00E4hrstoff -AMOUNT_LBL=Menge - -# -# Menus [0] -# - -# main menus -MN_FOOD=&Nahrungsmittel -MN_NUTRDB_USDB=Nahrungsmittel-DB (USDA) -MN_NUTRDB_USDB_DESC=Nahrungsmittel-Datenbank des USDA -MN_NUTRDB_USER=Nahrungsmittel-DB (Benutzer) -MN_NUTRDB_USER_DESC=Nahrungsmittel-Datenbank des Benutzers -MN_MEALS=Mahlzeiten-DB -MN_MEALS_DESC=Datenbank mit Mahlzeiten -MN_FOODMENU=N&ahrungsmen\u00FC -MN_FOODMENU_DESC=Reports for Food Menus -MN_FOODMENU_SIMPLE=Einfach (nur KH) -MN_FOODMENU_SIMPLE_DESC=Printing food menu (Simple) -MN_FOODMENU_EXT1=Erweitert I (KH, Ins.) -MN_FOODMENU_EXT1_DESC=Printing food menu (Extended - CH,Ins) -MN_FOODMENU_EXT2=Erweitert II (KH, Ins., BZ) -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) - -# -# Popup Menu [1] -# -PM_NUT_VIEW=Anzeigen -PM_NUT_CLOSE=Schlie\u00DFen -PM_NUT_EDIT_GROUP=Gruppe bearbeiten -PM_NUT_ADD_GROUP=Gruppe hinzuf\u00FCgen -PM_NUT_ADD_FOOD_DESCRIPTION=Lebensmittelbeschreibung hinzuf\u00FCgen -PM_NUT_EDIT_FOOD_DESCRIPTION=Lebensmittelbeschreibung bearbeiten -PM_NUT_ADD_MEAL=Mahlzeit hinzuf\u00FCgen -PM_NUT_EDIT_MEAL=Mahlzeit bearbeiten - -# -# Backup Objects [1] -# -NUTRITION_OBJECTS=Nahrungsobjekte -USER_FOOD_GROUPS=Benutzer-Nahrungsgruppen -MEAL_GROUPS=Mahlzeitengruppen -MEALS=Mahlzeiten -FOODS=Ern\u00E4hrung - -# -# Food [1] -# -NEW_FOOD=Neues Lebensmittel -ADD_FOOD=Neues Lebensmittel hinzuf\u00FCgen -FOOD_GROUP=Lebensmittelgruppe -GROUP_NAME=Gruppenname -FOOD_NAME=Name des Lebensmittels -REFUSE_LBL=Ungenie\u00DFbarer Anteil -NUTRITIONS_FOOD=N\u00E4hrstoffe -FOOD_DESCRIPTION=Lebensmittel-Beschreibung -HOME_WEIGHTS=Home weights (if defined) -WEIGHT_TYPE=Weight Type -AMOUNT_WEIGHT=Menge & Gewicht -WEIGHT=Gewicht (in g) -UNITS=Einheiten -FOOD_GROUPS=Lebensmittelgruppen -MEAL_GROUP=Mahlzeitengruppe -SELECTED_GROUP=Gew\u00E4hlte Gruppe -SELECT_GROUP=Gruppe w\u00E4hlen -PARENT_GROUP=\u00DCbergeordnete Gruppe -EDIT_MEAL_GROUP=Mahlzeitengruppe bearbeiten -ADD_MEAL_GROUP=Neue Mahlzeitengruppe hinzuf\u00FCgen -NEW_GROUP=Neue Gruppe -TRANSLATION_KEYWORD=Schl\u00FCsselwort f\u00FCr die \u00DCbersetzung -WISH_TO_SAVE_NEW_GROUP=Sie haben eine neue Gruppe erstellt. Wollen Sie speichern? -WISH_TO_SAVE_EDITED_GROUP=Sie haben eine Gruppe ge\u00E4ndert. Wollen Sie speichern? -ADD_FOOD_GROUP=Lebensmittelgruppe hinzuf\u00FCgen -EDIT_FOOD_GROUP=Lebensmittelgruppe bearbeiten - -# -# Meal [1] -# -NUTRITION_TYPE=N\u00E4hrstofftyp -SELECTED_ITEM=gew\u00E4hltes Element -NUTRITION_TYPE_FOR_SELECTOR=Nutrition type for selector -SELECTOR=Selector -USDA_NUTRITION=USDA N\u00E4hrstoff -USER_NUTRITION=Benutzerdefinierte N\u00E4hrstoff -MEAL=Mahlzeit -SELECT_ITEM=Element w\u00E4hlen -MEALS_FOODS_SELECTOR=Mahlzeiten- und Lebensmittelwahl -MEAL_ADD=Mahlzeit hinzuf\u00FCgen -MEAL_EDIT=Mahlzeit bearbeiten -MEAL_NAME=Mahlzeitname -AVAILABLE_NUTRITIONS=Verf\u00FCgbahre N\u00E4hrstoffe -FOODS_MEALS_NUTRITIONS=Lebensmittel, Mahlzeiten und/oder N\u00E4hrstoffe -MEAL_FOOD_ADD_DESC=Lebensmittel, Mahlzeit oder N\u00E4hrstoffe hinzuf\u00FCgen -MEAL_FOOD_EDIT_DESC=Lebensmittel, Mahlzeit oder N\u00E4hrstoffe bearbeiten -MEAL_FOOD_DELETE_DESC=Lebensmittel, Mahlzeit oder N\u00E4hrstoffe l\u00F6schen -MEAL_TYPE=Typ -DESCRIPTION=Beschreibung -TRANSLATION_KEYWORD_MEAL=Schl\u00FCsselwort f\u00FCr die \u00DCbersetzung -TRANSLATED_NAME_MEAL=\u00DCbersetzter Name -GROUP=Gruppe -WISH_TO_SAVE_NEW_MEAL=Sie haben eine neue Mahlzeit erstellt. Wollen Sie speichern? -WISH_TO_SAVE_EDITED_MEAL=Sie haben eine Mahlzeit ge\u00E4ndert. Wollen Sie speichen? -NEW_MEAL=Neue Mahlzeit -CANT_SELECT_CIRCULAR_MEAL=Die Mahlzeit, die bearbeitet wird, kann nicht hinzugef\u00FCgt werden -CANT_SELECT_CHILD_OR_GROUP=Diese Gruppe oder ein Kindelement dieser Gruppe kann nicht als Elternelement dieser Gruppe gew\u00E4hlt werden! -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> -ADD_MEAL=Mahlzeit hinzuf\u00FCgen - -# -# Food (User) [1] -# -FOOD_EDIT=Lebensmittel bearbeiten -SELECTED_NUTRITION=gew\u00E4hlter N\u00E4hrstoff -SELECT_NUTRITION=N\u00E4hrstoff w\u00E4hlen -SELECTED_HOME_WEIGHT=Selected Home Weight -SELECT_HOME_WEIGHT=Select Home Weight -NEW_NUTR_DEF=Neu -WEIGHT_UNIT=Gew. Einheit -TAG=Tag -SELECTOR_NUTRITION_DEFINITION=Selector for Nutritions -NUTRITION_NAME=N\u00E4hrstoffname -NUTRITION_SELECTOR=Nutritions Selector -HOME_WEIGHT_SELECTOR=Home Weight Selector -WISH_TO_SAVE_NEW_FOOD=Sie haben ein neues Lebensmittel eingetragen. Wollen Sie speichern? -WISH_TO_SAVE_EDITED_FOOD=Sie haben die Lebensmitteldaten ge\u00E4ndert. Wollen Sie speichern? -NUTRITIONS=N\u00E4hrstoffe -SELECTOR_HOME_WEIGHT=Selector for Home Weights -NEW_HOME_WEIGHT=Neu -HOME_WEIGHT_NAME=Home Weight Name -USER_DEFINED=Benutzerdefiniert -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=Gewicht -HOME_WEIGHTS_LBL=Home Weights -WGHT_PER_AMOUNT=Gewicht/Menge -WEIGHT_SHORT=Gew. - -# -# Selector for Daily Value [1] -# -MEALS_FOODS_SELECTOR_DAILY=Mahlzeiten- und Lebensmittelwahl f\u00FCr den Eintrag -NAME=Name -HOME_WEIGHT=Home Weight -NO_ITEM_SELECTED=Keine Auswahl. - -# -# 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 [3] -# -PROCNT=Eiwei\u00DF -FAT=Lipide Gesamt (Fett) -CHOCDF=Carbohydrate, by difference -ASH=Asche -ENERC_KCAL=Energie (kcal) -STARCH=St\u00E4rke -SUCS=R\u00FCbenzucker -GLUS=Glukose (Dextrose) -FRUS=Fruchtzucker -LACS=Laktose -MALS=Maltose -ALC=Alkohol, \u00C4thyl -WATER=Wasser -CAFFN=Koffein -GI=Glyk\u00E4mischer Index -GL=Glycemic Load -GI_MIN=Glyk\u00E4mischer Index (Min) -GI_MAX=Glyk\u00E4mischer Index (Max) -GL_MIN=Glycemic Load (Min) -GL_MAX=Glycemic Load (Max) -ENERC_KJ=Energie -SUGAR=Sugars, total -GALS=Galactose -FIBTG=Fiber, total dietary -CA=Kalzium, Ca -FE=Eisen, Fe -MG=Magnesium, Mg -P=Phosphor, P -K=Kalium, K -NA=Natrium, Na -ZN=Zink, Zn -CU=Kupfer, Cu -FLD=Fluorid, F -MN=Mangan, Mn -SE=Selen, Se -VITA_IU=Vitamin A, IU -VITA_RAE=Vitamin A, RAE -CARTB=Karotin, beta -CARTA=Karotin, alpha -TOCPHA=Vitamin E (alpha-tocopherol) -VITD-=Vitamin D -VITB6A=Vitamin B6 -VITB12=Vitamin B12 -VITK=Vitamin K (phylloquinone) -FAMS=Fetts\u00E4uren, einfach ges\u00E4ttigt -FAPU=Fetts\u00E4uren, mehrfach ges\u00E4ttigt -CHOLE=Cholesterin -FATRN=Fatty acids, total trans -FASAT=Fetts\u00E4uren, ges\u00E4ttigt -FATRNM=Fatty acids, total trans-monoenoic -FATRNP=Fatty acids, total trans-polyenoic - -# -# Nutrients, not usually used [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=Fols\u00E4ure -FOLFD=Folate, food -FOLDFE=Folate, DFE -BETN=Betaine -TRP_G=Tryptophan -THR_G=Threonin -ILE_G=Isoleucine -LEU_G=Leucin -LYS_G=Lysine -MET_G=Methionin -CYS_G=Cystine -PHE_G=Phenylalanin -TYR_G=Tyrosin -VAL_G=Valin -ARG_G=Arginin -HISTN_G=Histidine -ALA_G=Alanin -ASP_G=Asparagins\u00E4ure -GLU_G=Glutamic acid -GLY_G=Glycine -PRO_G=Prolin -SER_G=Serin -HYP=Hydroxyproline -PHYSTR=Phytosterols -STID7=Stigmasterol -CAMD5=Campesterol -SITSTR=Beta-sitosterol - -# -# Home Weights - Translation [2] -# --TO-SERVE=to serve -AFTER=after -APPROX=approx -AMOUNT=amount -AVG.=avg. -BLOCK=block -BLOCKS=blocks -BONE=Knochen -BONELESS=boneless -BOTTLE=Flasche -BAG=bag -BAR=bar -BIG=big -BOX=box -CAN=Dose -CHOPPED=chopped -CHUNK=chunk -CHUNKS=chunks -CONTAINER=container -CONTENTS=contents -COOKED=gekocht -COOKIE=cookie -COOK=cook -COOKING=cooking -CRUMBLED=crumbled -CRUSHED=crushed -CUBED=gew\u00FCrfelt -CUBIC=kubisch -CUT=cut -CUBE=W\u00FCrfel -CUBES=W\u00FCrfel -CUP=Tasse -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=Bl\u00E4tter -LONG=lang -LB=lb -MAKE=make -MASHED=mashed -MAKES=makes -MEDIUM=medium -MEAT=meat -ML=ml -MELTED=melted -NOT=nicht -NET=net -OUNCE=ounce -OZ=oz -OZ.=oz. -OR=oder -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 -SCOOP=scoop -SERVING=serving -SERVINGS=servings -SHREDDED=shredded -SHELLED=shelled -SIFTED=sifted -SIZE=size -SMALL=klein -SMALLER=smaller -SKIN=skin -SLICE=slice -SLICED=sliced -SLICES=slices -SNACK=snack -SNACK-SIZE=snack size -SQ=sq -SPRIG=sprig -SPRIGS=sprigs -SPOON=L\u00F6ffel -STICK=stick -STICKS=sticks -TABLESPOON=table spoon -TBSP=table spoon -TBS=table spoon -TEASPOON=Teel\u00F6ffel -TO=zu -TSP=tea spoon -THAWED=getaut -THICK=thick -THIN=d\u00FCnn -THICK.=thick. -UNIT=unit -UNPACKED=unpacked -UNPEELED=unpeeled -UNPREPARED=unprepared -UNSIFTED=unsifted -UNTHAWED=unthawed -UNDILUTED=undiluted -UNDRAINED=undrained -UNHEATED=unheated -WHOLE=whole -WITH=mit -WITHOUT=ohne -WRAPPED=wrapped -WEDGE=wedge -WEDGES=wedges -WHIPPED=geschlagen -YIELD=yield -YIELDS=yields -X=x - -# -# Food translations [3] -# -MILK=Milch -EGG=Ei -STEAK=Steak -HEADS=K\u00F6pfe Deleted: trunk/ggc-nutri/src/GGC_Nutrition_en.properties =================================================================== --- trunk/ggc-nutri/src/GGC_Nutrition_en.properties 2016-12-25 18:55:50 UTC (rev 1441) +++ trunk/ggc-nutri/src/GGC_Nutrition_en.properties 2016-12-25 19:22:53 UTC (rev 1442) @@ -1,556 +0,0 @@ -# -# !MASTER_FILE! -# !S! MODULE=GGC - Nutrition Tool -# !S! MODULE_VERSION=1.3.1 -# -# ###################################################################### -# ### GNU Gluco Control - Nutrition File ### -# ###################################################################### -# ### Language: English ### -# ### Created by: Andy Rozman (an...@tr...) ### -# ### Last change: 4th June 2011 ### -# ### Application Version: 1.3.1 ### -# ### Application Version: 0.5 ### -# ###################################################################### -# -# 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 -# !S! GROUP_PRIORITY_1=Needed, urgent (dialogs) -# !S! GROUP_PRIORITY_2=Needed (this are mostly nutrients, home weight, which is probably nice to have translated) -# !S! GROUP_PRIORITY_3=Not so important, but nice to have -# - - - -# -# !G! 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 - -# -# !G! 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 -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> -USDA_NUTRITION_DB=USDA Nutrition Db -USER_NUTRITION_DB=User Nutrition Db -MEALS_DB=Meals Db -NONE=None -NUTRITION=Nutrient -AMOUNT_LBL=Amount - -# -# !G! Menus -# - -# !SG! main menus -MN_FOOD=F&ood - -MN_NUTRDB_USDB=Nutrition DB (USDA) -MN_NUTRDB_USDB_DESC=Database of Nutrition data from USDA -MN_NUTRDB_USER=Nutrition DB (User) -MN_NUTRDB_USER_DESC=Database of Nutrition data from the user -MN_MEALS=Meals DB -MN_MEALS_DESC=Database of Meals - -MN_FOODMENU=&Food -MN_FOODMENU_DESC=Reports for Food Menus -MN_FOODMENU_SIMPLE=Simple Food Menu (CH only) -MN_FOODMENU_SIMPLE_DESC=Printing Simple Food Menu (only CH) -MN_FOODMENU_EXT1=Extended Food Menu I (CH,Ins) -MN_FOODMENU_EXT1_DESC=Printing Extended Food Menu (CH and Insulin) -MN_FOODMENU_EXT2=Extended Food Menu II (CH,Ins,BG) -MN_FOODMENU_EXT2_DESC=Printing Extended Food Menu (CH,Ins,BG) -MN_FOODMENU_EXT3=Extended Food Menu III (CH,Ins,BG,kJ) -MN_FOODMENU_EXT3_DESC=Printing Extended Food Menu (CH,Ins,BG,kJ) - - - -# -# !G! 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 - -# -# !G! Backup Objects [1] -# -NUTRITION_OBJECTS=Nutrition Objects -USER_FOOD_GROUPS=User Food Groups -MEAL_GROUPS=Meal Groups -MEALS=Meals -FOODS=Foods - - -# -# !G! 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_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 - -# -# !G! 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. 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> -ADD_MEAL=Add Meal - -# -# !G! 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 - -# -# !G! Daily Values and Foods [1] -# -WEIGHT_LBL2=Weight -HOME_WEIGHTS_LBL=Home Weights -WGHT_PER_AMOUNT=Weight/Amount -WEIGHT_SHORT=Wgh. - - -# -# !G! 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. - - -# -# !G! 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. - - - -# -# !G! Nutrients [3] -# -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 - -# -# !G! Nutrients, not usually used [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 - - - - -# -# !G! Home Weights - Translation [2] -# --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 -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 - - - -# -# !G! Food translations [3] -# -MILK=milk -EGG=egg -STEAK=steak -HEADS=heads - - - Deleted: trunk/ggc-nutri/src/GGC_Nutrition_fr.properties =================================================================== --- trunk/ggc-nutri/src/GGC_Nutrition_fr.properties 2016-12-25 18:55:50 UTC (rev 1441) +++ trunk/ggc-nutri/src/GGC_Nutrition_fr.properties 2016-12-25 19:22:53 UTC (rev 1442) @@ -1,537 +0,0 @@ -# -# ###################################################################### -# ### 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=Effacer -ADD=Ajouter -EDIT=Modifier -NEW=Nouveau -INFORMATION=Information -QUESTION=Question -YES=Oui -NO=Non -OK=OK -CANCEL=Annuler -APPLY=Appliquer -SELECT=S\u00E9lectionner -HELP=Aide -ROOT=Racine - -# -# Global Dialogs (1) -# -SELECT_ITEM_FIRST=S\u00E9lectinnez un \u00E9l\u00E9ment, puis cliquez sur Action ! -ARE_YOU_SURE_DELETE=\u00CAtes vous s\u00FBr de vouloir supprimer cet \u00E9l\u00E9ment? -TRANSLATED_NAME=Nom Traduit (si disponible) -ID=Id -USDA_NUTRITION_DATABASE=Base de Donn\u00E9es Alimentation USDA -USER_NUTRITION_DATABASE=Base de D. Alimentation Utilisateur -MEALS_DATABASE=Base de Donn\u00E9es Repas -USDA_NUTRITION_DATABASE_DESC=<html><body>La BD du Département de l'Agriculture des États-Unis (United States Department of Agriculture database, USDA) contient des informations relatives à de nombreux aliments utilisés et commercialisés aux USA. Comme cette BD est largement utilisée autour du monde, nous l'avons incorporée pour vous permettre de l'utiliser. La version de la BD est celle que nous avons importée. Les versions 18 et ultérieures sont utilisables (testé avec SR-18).<br>Dans ce module, vous pouvez consulter toutes les entrées. Si vous l'avez démarré à partir d'un autre module (comme les repas), vous pouvez sélectionner un aliment et l'importer.</body></html> -USER_NUTRITION_DATABASE_DESC=<html><body>C'est la base de données alimentation dans laquelle l'utilisateur peut ajouter des entrées. Plus tard nous supporterons l'importation à partir d'autres bases de données (qui seront alors modifiables). Vous pourrez ainsi profiter de la structure de dossier étendue (chaque répertoire peut avoir un sous répertoire). Si, par exemple, vous êtes Allemand, vous pouvez créer un répertoire nommé "Alimentation Allemande", dans lequel vous pourrez créer d'autres groupes (i.e. prêt pour le micro-onde, types d'aliments, fabricants, etc).</body></html> -MEALS_DATABASE_DESC=<html><body>La BD Repas contient des repas complets. Un bon exemple pourrait-être un menu 'Sandwich'. Il contiendrait différents aliments présents dans la BD USDA : Gros Sandwich, Soda, etc. Les repas peuvent contenir des éléments de toutes les BD : USDA, Utilisateur ou BD Repas. </body></html> -USDA_NUTRITION_DB=BD Alimentation USDA -USER_NUTRITION_DB=BD Alimentation Utilisateur -MEALS_DB=Base de Donn\u00E9es Repas -NONE=Aucun -NUTRITION=Nutriment -AMOUNT_LBL=Quantit\u00E9 - - - - -# -# Popup Menu (1) -# -PM_NUT_VIEW=Voir -PM_NUT_CLOSE=Fermer -PM_NUT_EDIT_GROUP=Modifier Groupe -PM_NUT_ADD_GROUP=Ajouter Groupe -PM_NUT_ADD_FOOD_DESCRIPTION=Ajouter Composition Aliment -PM_NUT_EDIT_FOOD_DESCRIPTION=Modifier Composition Aliment -PM_NUT_ADD_MEAL=Ajouter Repas -PM_NUT_EDIT_MEAL=Modifier Repas - - - -# -# Backup Objects (1) -# -NUTRITION_OBJECTS=Objets Aliment -USER_FOOD_GROUPS=Groupes d'Aliments Utilisateur -MEAL_GROUPS=Groupes Repas -MEALS=Repas -FOODS=Aliments - - -# -# Food (1) -# -NEW_FOOD=Aliment Nouveau -ADD_FOOD=Ajouter Aliment Nouveau -FOOD_GROUP=Groupe d'Aliments -GROUP_NAME=Nom du Groupe -FOOD_NAME=Nom de l'Aliment -REFUSE_LBL=Refuser (Partie qui est refus\u00E9e) -NUTRITIONS_FOOD=Valeur du Nutriment -FOOD_DESCRIPTION=Composition de l'Aliment -HOME_WEIGHTS=Masse Perso (si d\u00E9finie) -WEIGHT_TYPE=Type de Masse -AMOUNT_WEIGHT=Quantit\u00E9 & Masse -WEIGHT=Masse (g) -UNITS=Unit\u00E9s -FOOD_GROUPS=Groupes d'Aliment -MEAL_GROUPS=Groupes de Repas -MEAL_GROUP=Groupe de Repas -SELECTED_GROUP=Groupe S\u00E9l\u00E9ctionn\u00E9 -SELECT_GROUP=S\u00E9lectionner un Groupe -PARENT_GROUP=Groupe Parent -EDIT_MEAL_GROUP=Modifier le Groupe Repas -ADD_MEAL_GROUP=Ajouter un Groupe Repas -NEW_GROUP=Nouveau Groupe -TRANSLATION_KEYWORD=Mot-cl\u00E9 pour traduire -WISH_TO_SAVE_NEW_GROUP=Nouveau Groupe Cr\u00E9\u00E9. Sauvegarder ? -WISH_TO_SAVE_EDITED_GROUP=Groupe Modifi\u00E9. Sauvegarder ? -ADD_FOOD_GROUP=Ajouter Groupe d'Aliments -EDIT_FOOD_GROUP=Modifier Groupe d'Aliments - -# -# Meal (1) -# -NUTRITION_TYPE=Type d'Alimentation -SELECTED_ITEM=S\u00E9lectionner un \u00E9l\u00E9ment -NUTRITION_TYPE_FOR_SELECTOR=Type d'Alimentation pour le s\u00E9lecteur -SELECTOR=S\u00E9lecteur -USDA_NUTRITION=Alimentation USDA -USER_NUTRITION=Alimentation d\u00E9finie par Utilisateur -MEAL=Repas -SELECT_ITEM=S\u00E9lectionner \u00E9l\u00E9ment -MEALS_FOODS_SELECTOR=S\u00E9lecteur de Repas, d'Aliments -MEAL_ADD=Ajouter Repas -MEAL_EDIT=Modifier Repas -MEAL_NAME=Nom Repas -AVAILABLE_NUTRITIONS=Nutiments Disponibles -FOODS_MEALS_NUTRITIONS=Aliments, Repas et/ou Alimentations -MEAL_FOOD_ADD_DESC=Ajouter Aliment, Repas ou Alimentation -MEAL_FOOD_EDIT_DESC=Modifier Aliment, Repas ou Alimentation -MEAL_FOOD_DELETE_DESC=Effacer Aliment, Repas ou Alimentation -MEAL_TYPE=Type -DESCRIPTION=Composition -TRANSLATION_KEYWORD_MEAL=Mot cl\u00E9 Traduction -TRANSLATED_NAME_MEAL=Nom traduit -GROUP=Groupe -WISH_TO_SAVE_NEW_MEAL=Nouveau repas Cr\u00E9\u00E9. Sauvegarder ? -WISH_TO_SAVE_EDITED_MEAL=Repas Modifi\u00E9. Sauvegarder ? -NEW_MEAL=Nouveau Repas -CANT_SELECT_CIRCULAR_MEAL=Impossible d'ajouter un repas identique \u00E0 celui qui est en cours d'\u00E9dition. -CANT_SELECT_CHILD_OR_GROUP=Impossible de s\u00E9lectionner ce groupe ou un de ses fils comme parent! -MEAL_VIEW=Voir Repas -ADD_MEAL=Ajouter Repas - -# -# Food (User) (1) -# -FOOD_EDIT=Modifier Aliment -SELECTED_NUTRITION= Nutriment S\u00E9lectionn\u00E9 -SELECT_NUTRITION=S\u00E9lectionner Nutriment -SELECTED_HOME_WEIGHT=Masse Perso S\u00E9lectionn\u00E9e -SELECT_HOME_WEIGHT=S\u00E9lectionner Masse Perso -NEW_NUTR_DEF=Nouveau -WEIGHT_UNIT=Unit\u00E9 M. -TAG=Marqueur -SELECTOR_NUTRITION_DEFINITION=S\u00E9lecteur de Nutriment -NUTRITION_NAME=Nom du Nutriment -NUTRITION_SELECTOR=S\u00E9lecteur de Nutriments -HOME_WEIGHT_SELECTOR=S\u00E9lecteur Masse Perso -WISH_TO_SAVE_NEW_FOOD=Aliment Nouveau Cr\u00E9\u00E9. Sauvegarder ? -WISH_TO_SAVE_EDITED_FOOD=Aliment Modifi\u00E9. Sauvegarder ? -NUTRITIONS=Nutriments -SELECTOR_HOME_WEIGHT=S\u00E9lecteur pour Masse Perso -NEW_HOME_WEIGHT=Nouveau -HOME_WEIGHT_NAME=Nom Masse Perso -USER_DEFINED=D\u00E9fini(e) par utilisateur -HOME_WEIGHT_ADD_DESC=Ajouter Masse Perso -HOME_WEIGHT_EDIT_DESC=Modifier Masse Perso -HOME_WEIGHT_DELETE_DESC=Supprimer Masse Perso - -# -# Daily Values and Foods (1) -# -WEIGHT_LBL2=Masse -WEIGHT_TYPE=Type de Masse -HOME_WEIGHTS_LBL=Masses Perso -WGHT_PER_AMOUNT=Masse /Quantit\u00E9 -WEIGHT_SHORT=M. - - -# -# Selector for Daily Value (1) -# -MEALS_FOODS_SELECTOR_DAILY=S\u00E9lecteur Repas, Aliments pour Saisie quotidienne -NAME=Nom -HOME_WEIGHT=Masse Perso -NO_ITEM_SELECTED=Aucun \u00C9l\u00E9ment S\u00E9lectionner. - -# -# Printing Food menu (2) -# -PRINT_FOOD_DESC=Composition Aliment -DATE=Date -TIME=Heure -FOOD_MENU_BASE=Menu Aliment de Base (HC uniquement) - -FOOD_MENU_EXT_I=Menu Aliment \u00C9tendu I (HC,Ins) -FOOD_MENU_EXT_II=Menu Aliment \u00C9tendu II (HC,Ins,Gly) -FOOD_MENU_EXT_III=Menu Aliment \u00C9tendu III (HC,Ins,Gly,kJ) - - -REPORT_FOOTER=Rapport cr\u00E9\u00E9 par \"GGC - GNU Gluco Control\", logiciel libre disponible sur http://ggc.sourceforge.net -TOGETHER=Ensemble -CH=HC - -INS=Ins -BG=Gly -AMOUNT_SHORT=Qt\u00E9 - - - -# -# Nutrients (2) -# -PROCNT=Prot\u00E9ine -FAT=Total des lipides (mati\u00E8res grasses) -CHOCDF=Hydrates de Carbone, par diff\u00E9rence -ASH=Mati\u00E8re s\u00E8che -ENERC_KCAL=\u00C9nergie (Kcal) -STARCH=Amidon -SUCS=Saccharose -GLUS=Glucose (dextrose) -FRUS=Fructose -LACS=Lactose -MALS=Maltose -ALC=Alcool, \u00E9thanol -WATER=Eau -CAFFN=Caf\u00E9ine -GI=Index Glyc\u00E9mique -GL=Charge Glyc\u00E9mique -GI_MIN=Index Glyc\u00E9mique (Min) -GI_MAX=Index Glyc\u00E9mique (Max) -GL_MIN=Charge Glyc\u00E9mique (Min) -GL_MAX=Charge Glyc\u00E9mique (Max) -ENERC_KJ=\u00C9nergie -SUGAR=Sucre, total -GALS=Galactose -FIBTG=Fibre, alimentaire totale -CA=Calcium, Ca -FE=Fer, Fe -MG=Magn\u00E9sium, Mg -P=Phosphore, P -K=Potassium, K -NA=Sodium, Na -ZN=Zinc, Zn -CU=Cuivre, Cu -FLD=Fluor, F -MN=Mangan\u00E8se, Mn -SE=S\u00E9l\u00E9nium, Se -VITA_IU=Vitamine A, IU -VITA_RAE=Vitamine A, RAE -CARTB=Carot\u00E8ne, b\u00EAta -CARTA=Carot\u00E8ne, alpha -TOCPHA=Vitamine E (alpha-tocopherol) -VITD-=Vitamine D -VITB6A=Vitamine B-6 -VITB12=Vitamine B-12 -VITK=Vitamine K (phylloquinone) -FAMS=Acides gras, total monoinsatur\u00E9s -FAPU=Acides gras, total polyinsatur\u00E9s -CHOLE=Cholest\u00E9rol -FATRN=Acides gras, total trans -FASAT=Acides gras, total saturat\u00E9s -FATRNM=Acides gras, total trans-mono\u00E9noliques -FATRNP=Acides gras, total trans-poly\u00E9noliques - -# -# Nutrients (3) -# -FOL=Folate, total -CHOLN=Choline, total -THEBRN=Th\u00E9obromine -RETOL=R\u00E9tinol -CRYPX=Cryptoxanthine, b\u00EAta -LYCPN=Lycop\u00E8ne -LUT+ZEA=Lut\u00E9ine + z\u00E9axanthine -TOCPHB=Tocoph\u00E9rol, b\u00EAta -TOCPHG=Tocoph\u00E9rol, gamma -TOCPHD=Tocoph\u00E9rol, delta -VITC=Vitamine C, total acide ascorbique -THIA=Thiamine -RIBF=Riboflavine -NIA=Niacine -PANTAC=Acide Pantoth\u00E9nique -FOLAC=Acide Folique -FOLFD=Folate, alimentaire -FOLDFE=Folate, DFE -BETN=B\u00E9ta\u00EFne -TRP_G=Tryptophane -THR_G=Thr\u00E9onine -ILE_G=Isoleucine -LEU_G=Leucine -LYS_G=Lysine -MET_G=M\u00E9thionine -CYS_G=Cystine -PHE_G=Ph\u00E9nylalanine -TYR_G=Tyrosine -VAL_G=Valine -ARG_G=Arginine -HISTN_G=Histidine -ALA_G=Alanine -ASP_G=Acide Aspartique -GLU_G=Acide Glutamique -GLY_G=Glycine -PRO_G=Proline -SER_G=S\u00E9rine -HYP=Hydroxyproline -PHYSTR=Phytost\u00E9rols -STID7=Stigmast\u00E9rol -CAMD5=Campest\u00E9rol -SITSTR=B\u00EAta-sitost\u00E9rol - - - - -# -# Home Weights - Translation (2,3) -# --TO-SERVE=\u00E0 servir -AFTER=apr\u00E8s -APPROX=approx -AMOUNT=quantit\u00E9 -AVG.=moy. -BLOCK=bloc -BLOCKS=blocs -BONE=avec os -BONELESS=d\u00E9soss\u00E9(e) -BOTTLE=bottle -BAG=sac -BAR=barre -BIG=grand -BOX=bo\u00EEte -CAN=p\u00F4t -CHOPPED=hach\u00E9 -CHUNK=gros morceau -CHUNKS=gros morceaux -CONTAINER=r\u00E9cipient -CONTENTS=contenus -COOKED=cuisin\u00E9 -COOKIE=petit g\u00E2teau -COOK=cuisiner -COOKING=cuisiner -CRUMBLED=\u00E9miett\u00E9 -CRUSHED=\u00E9cras\u00E9 -CUBED=coup\u00E9 en cubes -CUBIC=cubique -CUT=coup\u00E9 -CUBE=cube -CUBES=cubes -CUP=tasse -CUPCAKE=petit g\u00E2teau -CUPS=tasses -CURD=caill\u00E9 -DICED=en d\u00E9s -DASH=petite quantit\u00E9 -DRAINED=s\u00E9ch\u00E9 -DIA=diam\u00E8tre -DIA.=diam\u00E8tre. -DIAM=diam\u00E8tre -DIAM.=diam\u00E8tre. -DIAMETER=diam\u00E8trer -ENVELOPE=enveloppe -EXTRA=extra -FOR=pour -FROM=depuis -FROZEN=gel\u00E9 -FRUIT=fruit -FRUITS=fruits -FL=fl -FLUID=fluide -GROUND=surface -G=g -HIGH=hauteur -IN=in -IN.=in. -INCH=inch -INSTANT=instant -ITEM=\u00E9l\u00E9ment -ITEMS=\u00E9l\u00E9ments -INDIVIDUAL=individuel -JAR=jarre -JUMBO=g\u00E9ant - - -LARGE=large -LEAVES=feuilles -LONG=longueur -LB=lb -MAKE=pr\u00E9parer -MASHED=en pur\u00E9e -MAKES=pr\u00E9pare -MEDIUM=m\u00E9dium -MEAT=viande -ML=mL -MELTED=fondu -NOT=pas -NET=net -OUNCE=ounce -OZ=oz -OZ.=oz. -OR=or -PACK=paquet -PACKAGE=paquet -PACKET=paquet -PACKAGES=paquets -PACKED=empaquet\u00E9 -PAT=tout pr\u00EAt -PATTY=petit p\u00E2t\u00E9 - -PIECE=part -PIECES=parts -PKG.=pkg. -POD=pod -PODS=pods -PORTION=portion -POWDER=poudre - -PRODUCT=produit -PREPARED=pr\u00E9par\u00E9 - -QUART=litre - -RAW=ligne -READY=pr\u00EAt -READY-TO=pr\u00EAt \u00E0 -READY-TO-COOK=pr\u00EAt \u00E0 cuisiner -READY-TO-EAT=pr\u00EAt \u00E0 manger -READY-TO-SERVE=pr\u00EAt \u00E0 servir -RECIPE=recette -RECONSTITUTED=reconstitu\u00E9 - -REFRIGATED=r\u00E9frig\u00E9r\u00E9 -REFRIGERATED=r\u00E9frig\u00E9r\u00E9 -REFUSE=refuser -REGULAR=ordinaire -REMOVED=retir\u00E9 - - -ROLL=rouleau -ROLLS=rouleaux -ROOT=racine -SCOOP=scoop -SERVING=portion -SERVINGS=portions -SHREDDED=r\u00E2p\u00E9 -SHELLED=\u00E9coss\u00E9 - -SIFTED=tamis\u00E9 -SIZE=taille - -SMALL=petit -SMALLER=plus petit -SKIN=peau -SLICE=tranche -SLICED=tranch\u00E9 -SLICES=tranches -SNACK=snack -SNACK-SIZE=taille du snack -SQ=sq -SPRIG=brin -SPRIGS=brins - -SPOON=cuill\u00E8re -STICK=baguette -STICKS=baguettes -TABLESPOON=cuill\u00E8re \u00E0 soupe -TBSP=cuill\u00E8re \u00E0 soupe -TBS=cuill\u00E8re \u00E0 soupe -TEASPOON=cuill\u00E8re \u00E0 caf\u00E9 -TO=\u00E0 - -TSP=cuill\u00E8re \u00E0 caf\u00E9 -THAWED=congel\u00E9 -THICK=\u00E9pais -THIN=mince -THICK.=d'\u00E9paisseur. -UNIT=unit\u00E9 -UNPACKED=d\u00E9ball\u00E9 -UNPEELED=non pel\u00E9es -UNPREPARED=non pr\u00E9par\u00E9 -UNSIFTED=non tamis\u00E9e -UNTHAWED=d\u00E9congel\u00E9 -UNDILUTED=non dilu\u00E9 -UNDRAINED=non drain\u00E9 -UNHEATED=cru - -WHOLE=complet -WITH=avec -WITHOUT=sans -WRAPPED=envelopp\u00E9 - -WEDGE=morceau -WEDGES=morceaux -WHIPPED=fouett\u00E9 - -YIELD=gain -YIELDS=gains -X=x - - - -# -# Food translations (3) -# -MILK=lait -EGG=\u0153uf -STEAK=steak -HEADS=t\u00EAtes Deleted: trunk/ggc-nutri/src/GGC_Nutrition_si.properties =================================================================== --- trunk/ggc-nutri/src/GGC_Nutrition_si.properties 2016-12-25 18:55:50 UTC (rev 1441) +++ trunk/ggc-nutri/src/GGC_Nutrition_si.properties 2016-12-25 19:22:53 UTC (rev 1442) @@ -1,507 +0,0 @@ -# -# ###################################################################### -# ### GNU Glucose Control ### -# ###################################################################### -# ### Language: Sloevene ### -# ### Created by: Andy (an...@t-...) ### -# ### Version: 1.3.1 ### -# ### Last change: 26.3.2013 11:30:35 ### -# ###################################################################### -# -# -# Translation status: -# Words/expressions: 418 -# Not translated: 0 (0 %) -# Need to be checked: 72 (17 %) -# -# Translated: 346 (82 %) -# -# -# This comment will be displayed after header -## -# 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-standard, non english -# charcters) we need to set this if we want sorting to be done correctly. -# -COLLATION_RULES=< a,A < b,B < c,C < \u010D,\u010C < 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 < \u0161,\u0160 < t,T < u,U < v,V < w,W < x,X < y,Y < z,Z < \u017E,\u017D - -# -# Global [1] -# -DELETE=Zbri\u0161i -ADD=Dodaj -EDIT=Spremeni -NEW=Nov -INFORMATION=Informacija -QUESTION=Vpra\u0161anje -YES=Da -NO=Ne -OK=OK -CANCEL=Prekini -APPLY=Nastavi -SELECT=Izberi -HELP=Pomo\u010D -ROOT=korenina - -# -# Global Dialogs [1] -# -SELECT_ITEM_FIRST=Izberite vnos, preden izberete akcijo ! -ARE_YOU_SURE_DELETE=Ste prepri\u010Dani da \u017Eelite odstraniti ta vnos? -TRANSLATED_NAME=Prevedeno ime (\u010De obstaja) -ID=Id -USDA_NUTRITION_DATABASE=Baza USDA \u017Eivil -USER_NUTRITION_DATABASE=Baza uporabni\u0161kih \u017Eivil -USDA_NUTRITION_DATABASE_DESC=<html><body>USDA baza je baza oddelka za kmetijstvo Zdru\u017Eenih dr\u017Eav Amerike in vsebuje dosti \u017Eivil, ki so v prodaji v ZDA. Ker se baza uporablja po celem svetu smo se odlo\u010Dili, da jo dodamo v na\u0161 program, tako da jo lahko tudi na\u0161i uporabniki uporabljajo. Verzija baze je odvisna od datotek, ki smo jih uporabili za vnos. Verzije 18 in ve\u010D so podprte (testirano s SR-18 in SR-20 (trenutna verzija)).<br>Modul omogo\u010Da pregled vseh vrednosti, iz dolo\u010Denih delov programa (recimo Obroki) pa tudi izbiro trenutno ozna\u010Denega elementa.</body></html> -USER_NUTRITION_DATABASE_DESC=<html><body>To je baza \u017Eivil, v katero lahko uporabnik sam poljubno dodaja nova \u017Eivila. Kasneje bomo podpirali uvoz baz tujih \u017Eivil (ki jih bomo lahko spreminjali). V tej bazi lahko izkoristite zmo\u017Enost neomejenega dodajanja podmap (neomejeno v globino). \u010Ce ste recimo iz Slovenije dodate mapo Slovenske jedi, v katero se lahko dodajo razli\u010Dne podskupine (recimo Za mikrovalovno, tipi \u017Eivil/hrane, proizvajalce, itd.)</body></html> -USDA_NUTRITION_DB=Baza USDA \u017Eivil -USER_NUTRITION_DB=Baza Uporabni\u0161kih \u017Eivil -MEALS_DB=Baza jedi -NONE=Nobeden -NUTRITION=Hranilo -AMOUNT_LBL=Koli\u010Dina - -# -# Menus [0] -# - -# main menus -MN_FOOD=H&rana -MN_NUTRDB_USDB=Prehrambena baza (USDA) -MN_NUTRDB_USDB_DESC=Baza prehrambenih izdelkov USDA -MN_NUTRDB_USER=Prehrambena baza (Uporabni\u0161ka) -MN_NUTRDB_USER_DESC=Baza prehrambenih izdelkov uporabnika -MN_MEALS=Baza obrokov -MN_MEALS_DESC=Baza obrokov -MN_FOODMENU=Jedilniki -MN_FOODMENU_DESC=Poro\u010Dila jedilnikov -MN_FOODMENU_SIMPLE=Preprost (samo OH) -MN_FOODMENU_SIMPLE_DESC=Preprost jedilnik (samo OH) -MN_FOODMENU_EXT1=Raz\u0161irjen I (CH,Ins) -MN_FOODMENU_EXT1_DESC=Raz\u0161irjen jedilnik I (OH,Ins) -MN_FOODMENU_EXT2=Raz\u0161irjen II (OH,Ins,KS) -MN_FOODMENU_EXT2_DESC=Raz\u0161irjen jedilnik II (OH,Ins,KS) -MN_FOODMENU_EXT3=Raz\u0161irjen III (OH,Ins,KS,kJ) -MN_FOODMENU_EXT3_DESC=Raz\u0161irjen jedilnik III (OH,Ins,KS,kJ) - -# -# Popup Menu [1] -# -PM_NUT_VIEW=Pogled -PM_NUT_CLOSE=Zapri -PM_NUT_EDIT_GROUP=Spremeni skupino -PM_NUT_ADD_GROUP=Dodaj skupino -PM_NUT_ADD_FOOD_DESCRIPTION=Dodaj opis hrane -PM_NUT_EDIT_FOOD_DESCRIPTION=Spremeni opis hrane -PM_NUT_ADD_MEAL=Dodaj jed -PM_NUT_EDIT_MEAL=Spremeni jed - -# -# Backup Objects [1] -# -NUTRITION_OBJECTS=Objekti prehrane -USER_FOOD_GROUPS=Uporabni\u0161ke skupine \u017Eivil -MEAL_GROUPS=Skupine obrokov -MEALS=Obroki -FOODS=\u017Divila - -# -# Food [1] -# -NEW_FOOD=Novo \u017Eivilo -ADD_FOOD=Dodaj novo \u017Eivilo -FOOD_GROUP=Skupina \u017Eivil -GROUP_NAME=Ime skupine -FOOD_NAME=Ime \u017Eivila -REFUSE_LBL=Odpadni del (neu\u017Eitni del) -NUTRITIONS_FOOD=Hranilne vrednosti -FOOD_DESCRIPTION=Opis \u017Eivila -HOME_WEIGHTS=Doma\u010De mere (\u010De obstajajo) -WEIGHT_TYPE=Tip te\u017Ee -AMOUNT_WEIGHT=Koli\u010Dina & Te\u017Ea -WEIGHT=Te\u017Ea (g) -UNITS=Enote -FOOD_GROUPS=Skupine \u017Eivil -MEAL_GROUP=Skupina obroka -SELECTED_GROUP=Izbrana skupina -SELECT_GROUP=Izberi skupino -PARENT_GROUP=Star\u0161evska skupina -EDIT_MEAL_GROUP=Spremeni skupino obroka -ADD_MEAL_GROUP=Dodaj skupino obroka -NEW_GROUP=Nova skupina -TRANSLATION_KEYWORD=Klju\u010D za prevod -WISH_TO_SAVE_NEW_GROUP=Ustvarili ste novo skupino. Jo \u017Eelite shraniti? -WISH_TO_SAVE_EDITED_GROUP=Spremenili ste skupino. Jo \u017Eelite shraniti? -ADD_FOOD_GROUP=Dodaj skupino \u017Eivil -EDIT_FOOD_GROUP=Spremeni skupino \u017Eivil - -# -# Meal [1] -# -NUTRITION_TYPE=Tip \u017Eivila -SELECTED_ITEM=Izbran element -NUTRITION_TYPE_FOR_SELECTOR=Tip \u017Eivila za izbirnik -SELECTOR=Izbirnik -USDA_NUTRITION=USDA \u017Eivilo -USER_NUTRITION=Uporabni\u0161ko \u017Eivilo -MEAL=Obrok -SELECT_ITEM=Izberi element -MEALS_FOODS_SELECTOR=Izbirnik \u017Eivil in obrokov -MEAL_ADD=Dodaj obrok -MEAL_EDIT=Spremeni obrok -MEAL_NAME=Ime obroka -AVAILABLE_NUTRITIONS=Dostopna hranila -FOODS_MEALS_NUTRITIONS=\u017Divila in obroki -MEAL_FOOD_ADD_DESC=Dodaj \u017Eivila in/ali obroke -MEAL_FOOD_EDIT_DESC=Spremeni \u017Eivila in/ali obroke -MEAL_FOOD_DELETE_DESC=Odstrani \u017Eivila in/ali obroke -MEAL_TYPE=Tip -DESCRIPTION=Opis -TRANSLATION_KEYWORD_MEAL=Klju\u010D za prevod -TRANSLATED_NAME_MEAL=Prevedeno ime -GROUP=Skupina -WISH_TO_SAVE_NEW_MEAL=Ustvarili ste nov obrok. Ga \u017Eelite shraniti? -WISH_TO_SAVE_EDITED_MEAL=Spremenili ste obrok. Ga \u017Eelite shraniti? -NEW_MEAL=Nov obrok -CANT_SELECT_CIRCULAR_MEAL=Ne morete dodati obroka, ki ga spreminjate. -CANT_SELECT_CHILD_OR_GROUP=Te skupine, ali njenega otroka ne morete dodati kot star\u0161a! -MEAL_VIEW=Pogled obroka -MEALS_DATABASE=Baza jedi -MEALS_DATABASE_DESC=<html><body>Baza obrokov vsebuje celotne obroke. Dober primer je 'McDonaldsov Big Mac Meni'. Vsebuje \u0161tevilne vnose iz USDA baze: Big Mac, Coca-colo, itd.<br>Obroki lahko vsebujejo elemente iz vseh treh baz: USDA, Uporabni\u0161ke in/ali baze obrokov. </body></html> -ADD_MEAL=Dodaj obrok - -# -# Food (User) [1] -# -FOOD_EDIT=Spremeni \u017Eivilo -SELECTED_NUTRITION=Izbrano hranilo -SELECT_NUTRITION=Izberi hranilo -SELECTED_HOME_WEIGHT=Izbrana doma\u010Da mera -SELECT_HOME_WEIGHT=Izberi doma\u010Do mero -NEW_NUTR_DEF=Novo -WEIGHT_UNIT=Tip mere -TAG=Oznaka -SELECTOR_NUTRITION_DEFINITION=Izbirnik za hranila -NUTRITION_NAME=Ime hranila -NUTRITION_SELECTOR=Izbirnik hranil -HOME_WEIGHT_SELECTOR=Izbirnik za doma\u010De mere -WISH_TO_SAVE_NEW_FOOD=Ustvarili ste novo \u017Eivilo. \u017Delite shraniti? -WISH_TO_SAVE_EDITED_FOOD=Spremenili ste \u017Eivilo. \u017Delite shraniti? -NUTRITIONS=Hranila -SELECTOR_HOME_WEIGHT=Izbirnik za doma\u010De mere -NEW_HOME_WEIGHT=Nova -HOME_WEIGHT_NAME=Ime doma\u010De mere -USER_DEFINED=Uporabni\u0161ko definirano -HOME_WEIGHT_ADD_DESC=Dodaj doma\u010Do mero -HOME_WEIGHT_EDIT_DESC=Spremeni doma\u010Do mero -HOME_WEIGHT_DELETE_DESC=Odstrani doma\u010Do mero - -# -# Daily Values and Foods [1] -# -WEIGHT_LBL2=Te\u017Ea -HOME_WEIGHTS_LBL=Doma\u010De mere -WGHT_PER_AMOUNT=Te\u017Ea/Koli\u010Dina -WEIGHT_SHORT=Te\u017Ea - -# -# Selector for Daily Value [1] -# -MEALS_FOODS_SELECTOR_DAILY=Izbirnik \u017Eivil in obrokov za dnevni vnos -NAME=Ime -HOME_WEIGHT=Doma\u010De mere -NO_ITEM_SELECTED=Elementa nimamo izbranega. - -# -# Printing Food menu [2] -# -PRINT_FOOD_DESC=Opis hrane -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. - -# -# Nutrients [3] -# -PROCNT=Beljakovine -FAT=Ma\u0161\u010Dobe -CHOCDF=Ogljikovi hidrati -ASH=Pepel -ENERC_KCAL=Energija (kcal) -STARCH=Starch -SUCS=Sucrose -GLUS=Glukoza (dextroza) -FRUS=Fruktosa -LACS=Laktosa -MALS=Maltosa -ALC=Alkohol, ethyl -WATER=Voda -CAFFN=Kafein -GI=Glikemi\u010Dni Indeks -GL=Glikemi\u010Dno Nalaganje -GI_MIN=Glikemi\u010Dni Indeks (Min) -GI_MAX=Glikemi\u010Dni Indeks (Max) -GL_MIN=Glikemi\u010Dno Nalaganje (Min) -GL_MAX=Glikemi\u010Dno Nalaganje (Max) -ENERC_KJ=Energija (KJ) -SUGAR=Sladkorji, skupaj -GALS=Galactose -FIBTG=Vlaknine -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=Kolesterol -FATRN=Fatty acids, total trans -FASAT=Fatty acids, total saturated -FATRNM=Fatty acids, total trans-monoenoic -FATRNP=Fatty acids, total trans-polyenoic - -# -# Nutrients, not usually used [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] -# --TO-SERVE=za serviranje -AFTER=po -APPROX=pribl. -AMOUNT=kolicina xx -AVG.=povp. -BLOCK=kocka -BLOCKS=kocke -BONE=kost -BONELESS=brez kosti -BOTTLE=steklenica -BAG=vrecka xx -BAR=tablica -BIG=velik -BOX=skatla xx -CAN=konzerva -CHOPPED=sesekljano -CHUNK=kos -CHUNKS=kosi -CONTAINER=embala\u017Ea -CONTENTS=vsebina -COOKED=kuhano -COOKIE=keks -COOK=kuhaj -COOKING=kuhanje -CRUMBLED=razdrobljeno -CRUSHED=zme\u010Dkano -CUBED=kockano -CUBIC=kockast -CUT=razrezano -CUBE=kocka -CUBES=kocke -CUP=skodelica -CUPCAKE=poti\u010Dka -CUPS=skodelice -CURD=skuta -DICED=nakockano -DASH=potreseno -DRAINED=izsu\u0161eno -DIA=premer -DIA.=premer -DIAM=premer -DIAM.=premer -DIAMETER=premer -ENVELOPE=ovoj -EXTRA=posebej -FOR=za -FROM=od -FROZEN=zamr\u017Enjen -FRUIT=sade\u017E -FRUITS=sade\u017Ei -FL=fl x -FLUID=teko\u010Dina -GROUND=zemlja -G=g -HIGH=visoko -IN=v -IN.=un\u010Da -INCH=un\u010Da -INSTANT=instanten -ITEM=komad -ITEMS=komadi -INDIVIDUAL=posami\u010Dni -JAR=kozarec -JUMBO=velik -LARGE=velik -LEAVES=listi -LONG=dolg -LB=funt -MAKE=ustvari -MASHED=tla\u010Den -MAKES=ustvari -MEDIUM=srednje -MEAT=meso -ML=ml -MELTED=topljen -NOT=ne -NET=mre\u017Ea -OUNCE=un\u010Da -OZ=un. -OZ.=un. -OR=ali -PACK=zavitek -PACKAGE=zavitek -PACKET=paket -PACKAGES=paketi -PACKED=pakiran -PAT=kepica -PATTY=pa\u0161teta -PIECE=ko\u0161\u010Dek -PIECES=ko\u0161\u010Dki -PKG.=pak. -POD=strok -PODS=stroki -PORTION=porcija -POWDER=pra\u0161ek -PRODUCT=produkt -PREPARED=pripravljen -QUART=1/4 galone -RAW=surov -READY=pripravljen -READY-TO=pripravljen za -READY-TO-COOK=pripravljen za kuhanje -READY-TO-EAT=pripravljen za prehrano -READY-TO-SERVE=pripravljen za postre\u017Ebo -RECIPE=recept -RECONSTITUTED=obnovljen -REFRIGATED=zamr\u017Enjen -REFRIGERATED=zamr\u017Enjen -REFUSE=odpad -REGULAR=reden -REMOVED=odstranjen -ROLL=zavitek -ROLLS=zavirki -SCOOP=kepica -SE... [truncated message content] |
From: <and...@us...> - 2016-12-25 18:55:53
|
Revision: 1441 http://sourceforge.net/p/ggc/code/1441 Author: andyrozman Date: 2016-12-25 18:55:50 +0000 (Sun, 25 Dec 2016) Log Message: ----------- GGC Nutri and GGC CGMS - created empty directories Added Paths: ----------- trunk/ggc-plugins/ggc-cgms/ trunk/ggc-plugins/ggc-cgms/src/ trunk/ggc-plugins/ggc-cgms/src/main/ trunk/ggc-plugins/ggc-cgms/src/main/java/ trunk/ggc-plugins/ggc-cgms/src/main/resources/ trunk/ggc-plugins/ggc-nutrition/ trunk/ggc-plugins/ggc-nutrition/src/ trunk/ggc-plugins/ggc-nutrition/src/main/ trunk/ggc-plugins/ggc-nutrition/src/main/java/ trunk/ggc-plugins/ggc-nutrition/src/main/resources/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <and...@us...> - 2016-12-25 18:28:14
|
Revision: 1440 http://sourceforge.net/p/ggc/code/1440 Author: andyrozman Date: 2016-12-25 18:28:11 +0000 (Sun, 25 Dec 2016) Log Message: ----------- ggc-nutri 1.4.2 - GGCTreeRootStatic changed - datalayer - GGCDbCache, CGCDbNutri - backup object - print food menu Modified Paths: -------------- trunk/ggc-nutri/build/build.xml trunk/ggc-nutri/docs/Changelog trunk/ggc-nutri/pom.xml trunk/ggc-nutri/src/ggc/nutri/data/GGCTreeRootStatic.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/DailyFoodEntries.java trunk/ggc-nutri/src/ggc/nutri/db/datalayer/DailyFoodEntry.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/GlycemicNutrients.java trunk/ggc-nutri/src/ggc/nutri/db/datalayer/HomeWeightSpecial.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/MealNutrition.java trunk/ggc-nutri/src/ggc/nutri/db/datalayer/MealPart.java trunk/ggc-nutri/src/ggc/nutri/db/datalayer/MealParts.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/BackupRestoreNutriHandler.java 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 Added Paths: ----------- trunk/ggc-nutri/src/ggc/nutri/db/datalayer/DAOObject.java Modified: trunk/ggc-nutri/build/build.xml =================================================================== --- trunk/ggc-nutri/build/build.xml 2016-12-25 18:18:32 UTC (rev 1439) +++ trunk/ggc-nutri/build/build.xml 2016-12-25 18:28:11 UTC (rev 1440) @@ -6,11 +6,11 @@ <!-- Environment properties read from a file ...--> <property file="../../build/AtechTools.properties"/> - <property file="../../ggc-core/build/GGCBuild.properties"/> + <property file="../../ggc-core-app/ggc-core/build/GGCBuild.properties"/> <!-- <property file="./GGCPlugInBaseBuild.properties"/> <property file="../../ggc-plugin_base/build/GGCPlugInBaseBuild.properties"/> --> - <property file="../../ggc-plugin_base/build/GGCPlugInBaseVersion.properties"/> - <property file="../../ggc-core/build/GGC_Core_Version.properties"/> + <property file="../../ggc-plugins/ggc-plugins-base/build/GGCPlugInBaseVersion.properties"/> + <property file="../../ggc-core-app/ggc-core/build/GGC_Core_Version.properties"/> <property file="./GGCNutriToolVersion.properties"/> <!-- These should *not* be modified on the command line! --> Modified: trunk/ggc-nutri/docs/Changelog =================================================================== --- trunk/ggc-nutri/docs/Changelog 2016-12-25 18:18:32 UTC (rev 1439) +++ trunk/ggc-nutri/docs/Changelog 2016-12-25 18:28:11 UTC (rev 1440) @@ -6,6 +6,14 @@ -------------------------------------------------------------------------------------------------- +1.4.2 [25.12.2016] [Andy] +- GGCTreeRootStatic changed +- datalayer +- GGCDbCache, CGCDbNutri +- backup object +- print food menu + + 1.4.1 [18.5.2016] - db objects refactoring - refactorings Modified: trunk/ggc-nutri/pom.xml =================================================================== --- trunk/ggc-nutri/pom.xml 2016-12-25 18:18:32 UTC (rev 1439) +++ trunk/ggc-nutri/pom.xml 2016-12-25 18:28:11 UTC (rev 1440) @@ -5,7 +5,7 @@ <groupId>net.sf.ggc</groupId> <artifactId>ggc-parent</artifactId> <version>1.0-SNAPSHOT</version> - <relativePath>../ggc-master-pom/pom.xml</relativePath> + <relativePath>../ggc-removed/ggc-master-pom/pom.xml</relativePath> </parent> <name>GGC Nutrition Tool Project</name> Modified: trunk/ggc-nutri/src/ggc/nutri/data/GGCTreeRootStatic.java =================================================================== --- trunk/ggc-nutri/src/ggc/nutri/data/GGCTreeRootStatic.java 2016-12-25 18:18:32 UTC (rev 1439) +++ trunk/ggc-nutri/src/ggc/nutri/data/GGCTreeRootStatic.java 2016-12-25 18:28:11 UTC (rev 1440) @@ -27,9 +27,7 @@ package ggc.nutri.data; -import java.util.ArrayList; -import java.util.Hashtable; -import java.util.Iterator; +import java.util.*; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -71,49 +69,49 @@ private static final Logger LOG = LoggerFactory.getLogger(GGCTreeRootStatic.class); - private ArrayList<FoodGroup> import1_grp = null; - private ArrayList<FoodDescription> import1_foods = null; + private List<FoodGroup> import1_grp = null; + private List<FoodDescription> import1_foods = null; - private ArrayList<MealGroup> import2_grp = null; - private ArrayList<Meal> import2_foods = null; + private List<MealGroup> import2_grp = null; + private List<Meal> import2_foods = null; /** * Food Groups */ - public ArrayList<FoodGroup> m_groups = null; + public List<FoodGroup> m_groups = null; /** * Food Groups as Hashtable */ - public Hashtable<String, FoodGroup> m_groups_ht = null; + public Map<String, FoodGroup> m_groups_ht = null; /** * Food Groups Tree */ - public ArrayList<FoodGroup> m_groups_tree = null; + public List<FoodGroup> m_groups_tree = null; /** * Foods Hashtable */ - public Hashtable<String, FoodDescription> m_foods_ht = null; + public Map<String, FoodDescription> m_foods_ht = null; /** * Meal Groups */ - public ArrayList<MealGroup> m_meal_groups = null; + public List<MealGroup> m_meal_groups = null; /** * Meal Groups Hashtable */ - public Hashtable<String, MealGroup> m_meal_groups_ht = null; + public Map<String, MealGroup> m_meal_groups_ht = null; /** * Meal Groups Tree */ - public ArrayList<MealGroup> m_meal_groups_tree = null; + public List<MealGroup> m_meal_groups_tree = null; /** * Meals Hashtable */ - public Hashtable<String, Meal> m_meals_ht = null; + public Map<String, Meal> m_meals_ht = null; // private boolean debug = true; private boolean dev = false; Modified: trunk/ggc-nutri/src/ggc/nutri/db/GGCDbCache.java =================================================================== --- trunk/ggc-nutri/src/ggc/nutri/db/GGCDbCache.java 2016-12-25 18:18:32 UTC (rev 1439) +++ trunk/ggc-nutri/src/ggc/nutri/db/GGCDbCache.java 2016-12-25 18:28:11 UTC (rev 1440) @@ -27,8 +27,10 @@ package ggc.nutri.db; -import java.util.ArrayList; +import java.util.HashMap; import java.util.Hashtable; +import java.util.List; +import java.util.Map; import com.atech.graphics.dialogs.selector.SelectableInterface; @@ -83,47 +85,47 @@ /** * Tree Roots */ - public Hashtable<String, GGCTreeRoot> tree_roots = null; + public Map<String, GGCTreeRoot> tree_roots = null; /** * Data: Nutrition Definitions (Hashtable) */ - public Hashtable<String, NutritionDefinition> nutrition_defs = null; + public Map<String, NutritionDefinition> nutrition_defs = null; /** * Data: Home Weight Definitions (Hashtable) */ - public Hashtable<String, NutritionHomeWeightType> homeweight_defs = null; + public Map<String, NutritionHomeWeightType> homeweight_defs = null; /** * Data: Nutrition Definitions (ArrayList) */ - public ArrayList<SelectableInterface> nutrition_defs_list = null; + public List<SelectableInterface> nutrition_defs_list = null; /** * Data: Home Weight Definitions (ArrayList) */ - public ArrayList<SelectableInterface> homeweight_defs_list = null; + public List<SelectableInterface> homeweight_defs_list = null; /** * Food Groups as Hashtable */ - public Hashtable<String, Hashtable<String, FoodGroup>> food_groups = null; + public Map<String, Map<String, FoodGroup>> food_groups = null; /** * Foods as Hashtable */ - public Hashtable<String, Hashtable<String, FoodDescription>> foods = null; + public Map<String, Map<String, FoodDescription>> foods = null; /** * Food Groups as Hashtable */ - public Hashtable<String, Hashtable<String, MealGroup>> meal_groups = null; + public Map<String, Map<String, MealGroup>> meal_groups = null; /** * Foods as Hashtable */ - public Hashtable<String, Hashtable<String, Meal>> meals = null; + public Map<String, Map<String, Meal>> meals = null; /** @@ -135,18 +137,18 @@ { this.m_db = db; - food_groups = new Hashtable<String, Hashtable<String, FoodGroup>>(); + food_groups = new HashMap<String, Map<String, FoodGroup>>(); food_groups.put("1", new Hashtable<String, FoodGroup>()); food_groups.put("2", new Hashtable<String, FoodGroup>()); - foods = new Hashtable<String, Hashtable<String, FoodDescription>>(); + foods = new Hashtable<String, Map<String, FoodDescription>>(); foods.put("1", new Hashtable<String, FoodDescription>()); foods.put("2", new Hashtable<String, FoodDescription>()); - meal_groups = new Hashtable<String, Hashtable<String, MealGroup>>(); + meal_groups = new Hashtable<String, Map<String, MealGroup>>(); meal_groups.put("3", new Hashtable<String, MealGroup>()); - meals = new Hashtable<String, Hashtable<String, Meal>>(); + meals = new Hashtable<String, Map<String, Meal>>(); meals.put("3", new Hashtable<String, Meal>()); this.tree_roots = new Hashtable<String, GGCTreeRoot>(); @@ -459,7 +461,7 @@ * @param parent_id id of parent * @return */ - public ArrayList<FoodGroup> getChildrenFoodGroup(int type, long parent_id) + public List<FoodGroup> getChildrenFoodGroup(int type, long parent_id) { boolean not_loaded = false; @@ -483,7 +485,7 @@ if (not_loaded) { - ArrayList<FoodGroup> lst = m_db.getFoodGroups(type, parent_id); + List<FoodGroup> lst = m_db.getFoodGroups(type, parent_id); for (int i = 0; i < lst.size(); i++) { @@ -509,7 +511,7 @@ * @param parent_id * @return */ - public ArrayList<FoodDescription> getChildrenFoods(int type, long parent_id) + public List<FoodDescription> getChildrenFoods(int type, long parent_id) { boolean not_loaded = false; @@ -533,7 +535,7 @@ if (not_loaded) { - ArrayList<FoodDescription> lst = m_db.getFoodsByParent(type, parent_id); + List<FoodDescription> lst = m_db.getFoodsByParent(type, parent_id); for (int i = 0; i < lst.size(); i++) { @@ -560,7 +562,7 @@ * @param parent_id * @return */ - public ArrayList<MealGroup> getChildrenMealGroup(int type, long parent_id) + public List<MealGroup> getChildrenMealGroup(int type, long parent_id) { boolean not_loaded = false; @@ -583,7 +585,7 @@ if (not_loaded) { - ArrayList<MealGroup> lst = m_db.getMealGroups(parent_id); + List<MealGroup> lst = m_db.getMealGroups(parent_id); for (int i = 0; i < lst.size(); i++) { @@ -608,7 +610,7 @@ * @param parent_id * @return */ - public ArrayList<Meal> getChildrenMeals(int type, long parent_id) + public List<Meal> getChildrenMeals(int type, long parent_id) { boolean not_loaded = false; @@ -631,7 +633,7 @@ if (not_loaded) { - ArrayList<Meal> lst = m_db.getMealsByParent(parent_id); + List<Meal> lst = m_db.getMealsByParent(parent_id); for (int i = 0; i < lst.size(); i++) { Modified: trunk/ggc-nutri/src/ggc/nutri/db/GGCDbNutri.java =================================================================== --- trunk/ggc-nutri/src/ggc/nutri/db/GGCDbNutri.java 2016-12-25 18:18:32 UTC (rev 1439) +++ trunk/ggc-nutri/src/ggc/nutri/db/GGCDbNutri.java 2016-12-25 18:28:11 UTC (rev 1440) @@ -3,22 +3,22 @@ import java.util.ArrayList; import java.util.Hashtable; import java.util.Iterator; +import java.util.List; +import org.hibernate.Criteria; import org.hibernate.Query; import org.hibernate.Session; -import org.hibernate.Transaction; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import com.atech.db.hibernate.HibernateConfiguration; import com.atech.db.hibernate.HibernateDb; +import com.atech.db.hibernate.HibernateObject; import com.atech.graphics.dialogs.selector.SelectableInterface; -import ggc.core.data.DailyValues; -import ggc.core.data.DailyValuesRow; -import ggc.core.data.DayValuesData; import ggc.core.db.GGCDb; -import ggc.core.db.hibernate.DayValueH; import ggc.core.db.hibernate.food.*; import ggc.nutri.data.GGCTreeRoot; import ggc.nutri.data.GGCTreeRootDyn; @@ -43,53 +43,20 @@ * this program; if not, write to the Free Software Foundation, Inc., 59 Temple * Place, Suite 330, Boston, MA 02111-1307 USA * - * Filename: GGCDb - * Description: Class for working with database (Hibernate) + * Filename: GGCDbNutri + * Description: Class for working with database (Hibernate) in Nutrition Plugin * * Author: andyrozman {an...@at...} */ -public class GGCDbNutri extends HibernateDb // extends GGCDb +public class GGCDbNutri extends HibernateDb { - // public static final int DB_CONFIG_LOADED = 1; - // public static final int DB_INITIALIZED = 2; - // public static final int DB_STARTED = 3; - - private boolean debug = true; - // x private boolean db_debug = false; - private static final Logger LOG = LoggerFactory.getLogger(GGCDbNutri.class); - // 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 = ""; - // private DataAccessNutri dataAccess; - - private int m_loadStatus = 0; - - // GLOBAL DATA - - /* - * public ArrayList<MeterCompanyH> meter_companies = null; public - * Hashtable<String,ArrayList<MeterH>> meters_by_cmp = null; public - * Hashtable<String,MeterH> meters_full = null; - */ - - // --- - // --- DB Settings - // --- - /* - * protected int db_num = 0; protected String db_hib_dialect = null; - * protected String db_driver_class = null; protected String db_conn_name = - * null; protected String db_conn_url = null; protected String - * db_conn_username = null; protected String db_conn_password = null; - */ - HibernateConfiguration hib_config; + private boolean debug = true; + GGCDbCache cache_db = null; /** @@ -108,17 +75,7 @@ } - // ************************************************************* - // **** SETTINGS **** - // ************************************************************* - // ************************************************************* - // **** SETTINGS **** - // ************************************************************* - - GGCDbCache cache_db = null; - - /** * Get Db Cache * @@ -129,26 +86,11 @@ return cache_db; } - // ************************************************************* // **** DATABASE INIT METHODS **** // ************************************************************* - /** - * Load Nutrition Database - */ - public void loadNutritionDatabase() - { - /* - * this.loadNutritionDbBase(); - * this.loadNutritionDb1(); - * this.loadNutritionDb2(); - * this.loadMealsDb(); - */ - } - - /** * Load Nutrition Db Base */ @@ -205,7 +147,7 @@ * @param parent_id * @return */ - public ArrayList<FoodGroup> getFoodGroups(int type, long parent_id) + public List<FoodGroup> getFoodGroups(int type, long parent_id) { if (type == GGCTreeRoot.TREE_USER_NUTRITION) return this.getUserFoodGroups(parent_id); @@ -240,111 +182,111 @@ * * @return */ - public ArrayList<FoodGroup> getUSDAFoodGroups() + public List<FoodGroup> getUSDAFoodGroups() { + List<FoodGroupH> fgList = getHibernateObjectListByParameter(null, null, Order.asc("name"), FoodGroupH.class, 2); - logInfo("getUSDAFoodGroups()"); + return getDAOGroupList(fgList, FoodGroup.class); + } - ArrayList<FoodGroup> list = new ArrayList<FoodGroup>(); + public <T extends HibernateObject> T getHibernateObjectByParameter(String parameterName, Long parameterValue, + Order orderBy, Class<T> clazz, Integer sessionId) + { + LOG.info("get " + clazz.getSimpleName() + " (id=" + parameterValue + ")"); + try { + Criteria criteria = this.getSession(sessionId).createCriteria(clazz); + criteria.add(Restrictions.eq(parameterName, parameterValue)); - Query q = getSession(2) - .createQuery("select pst from ggc.core.db.hibernate.food.FoodGroupH as pst order by pst.name"); + List list = criteria.list(); - Iterator<?> it = q.iterate(); - - while (it.hasNext()) + if (list.size() > 0) { - FoodGroupH eh = (FoodGroupH) it.next(); - list.add(new FoodGroup(eh)); + return (T) list.get(0); } } catch (Exception ex) { - logException("getUSDAFoodGroups()", ex); + LOG.info( + "get " + clazz.getSimpleName() + " (id=" + parameterValue + ") problem. Exception: " + ex.getMessage(), + ex); } - return list; - + return (T) null; } - /** - * Get USDA Food Group - * - * @param id - * @return - */ - public FoodGroup getUSDAFoodGroup(long id) + public <T extends HibernateObject> List<T> getHibernateObjectListByParameter(String parameterName, + Long parameterValue, Order orderBy, Class<T> clazz, Integer sessionId) { + LOG.info("get %s %s", clazz.getSimpleName(), getParameterDebugString(parameterName, parameterValue)); - logInfo("getUSDAFoodGroup(id=)" + id + ")"); + List<T> outList = new ArrayList<T>(); - // ArrayList<FoodGroup> list = new ArrayList<FoodGroup>(); - try { + Criteria criteria = this.getSession(sessionId).createCriteria(clazz); - Query q = getSession(2) - .createQuery("select pst from ggc.core.db.hibernate.food.FoodGroupH as pst where pst.id=" + id); + if (parameterName != null) + criteria.add(Restrictions.eq(parameterName, parameterValue)); - Iterator<?> it = q.iterate(); + if (orderBy != null) + { + criteria.addOrder(orderBy); + } - while (it.hasNext()) + List list = criteria.list(); + + for (Object obj : list.toArray()) { - FoodGroupH eh = (FoodGroupH) it.next(); - return new FoodGroup(eh); + outList.add((T) obj); } } catch (Exception ex) { - logException("getUSDAFoodGroups()", ex); + LOG.error("get %s (%s=%s) problem. Exception: ", clazz.getSimpleName(), + getParameterDebugString(parameterName, parameterValue), ex.getMessage(), ex); } - return null; + return outList; + } + + private String getParameterDebugString(String parameterName, Long parameterValue) + { + return parameterName != null ? String.format(" (%s=%s)", parameterName, parameterValue) : ""; } /** - * Get Food Groups - User + * Get USDA Food Group * * @param id * @return */ - public FoodGroup getUserFoodGroup(long id) + public FoodGroup getUSDAFoodGroup(long id) { - logInfo("getUserFoodGroup(id=" + id + ")"); + FoodGroupH fg = getHibernateObjectByParameter("id", id, Order.asc("name"), FoodGroupH.class, 2); - // ArrayList<FoodGroup> list = new ArrayList<FoodGroup>(); + return fg != null ? new FoodGroup(fg) : null; + } - try - { - Query q = getSession(2) - .createQuery("select pst from ggc.core.db.hibernate.food.FoodUserGroupH as pst order by pst.name"); + /** + * Get Food Groups - User + * + * @param id + * @return + */ + public FoodGroup getUserFoodGroup(long id) + { + FoodUserGroupH fg = getHibernateObjectByParameter("id", id, Order.asc("name"), FoodUserGroupH.class, 2); - Iterator<?> it = q.iterate(); - - while (it.hasNext()) - { - FoodUserGroupH eh = (FoodUserGroupH) it.next(); - return new FoodGroup(eh); - } - } - catch (Exception ex) - { - logException("getUserFoodGroup()", ex); - - // LOG.error("Exception on getloadConfigData: " + ex.getMessage(), - // ex); - } - - return null; + return fg != null ? new FoodGroup(fg) : null; } @@ -353,79 +295,57 @@ * * @return */ - public ArrayList<FoodGroup> getUserFoodGroups() + public List<FoodGroup> getUserFoodGroups() { - logInfo("getUserFoodGroups()"); + List<FoodUserGroupH> fgList = getHibernateObjectListByParameter(null, null, Order.asc("name"), + FoodUserGroupH.class, 2); - ArrayList<FoodGroup> list = new ArrayList<FoodGroup>(); + return getDAOGroupList(fgList, FoodGroup.class); + } - try - { - Query q = getSession(2) - .createQuery("select pst from ggc.core.db.hibernate.food.FoodUserGroupH as pst order by pst.name"); + private <T extends DAOObject> List<T> getDAOGroupList(List<? extends HibernateObject> fgList, Class<T> clazz) + { + List<T> outList = new ArrayList<T>(); - Iterator<?> it = q.iterate(); - - while (it.hasNext()) + for (HibernateObject hibernateObject : fgList) + { + if (hibernateObject instanceof FoodGroupH) { - FoodUserGroupH eh = (FoodUserGroupH) it.next(); - list.add(new FoodGroup(eh)); + outList.add((T) new FoodGroup((FoodGroupH) hibernateObject)); } + else if (hibernateObject instanceof FoodUserGroupH) + { + outList.add((T) new FoodGroup((FoodUserGroupH) hibernateObject)); + } + else if (hibernateObject instanceof MealGroupH) + { + outList.add((T) new MealGroup((MealGroupH) hibernateObject)); + } + else if (hibernateObject instanceof FoodDescriptionH) + { + outList.add((T) new FoodDescription((FoodDescriptionH) hibernateObject)); + } - return list; } - catch (Exception ex) - { - logException("getUserFoodGroups()", ex); - // LOG.error("Exception on getloadConfigData: " + ex.getMessage(), - // ex); - } - - return list; + return outList; } /** * Get Food Groups - User * - * @param parent_id + * @param parentId parent Group * * @return */ - public ArrayList<FoodGroup> getUserFoodGroups(long parent_id) + public List<FoodGroup> getUserFoodGroups(long parentId) { - logInfo("getUserFoodGroups()"); + List<FoodUserGroupH> fgList = getHibernateObjectListByParameter("parent_id", parentId, Order.asc("name"), + FoodUserGroupH.class, 2); - ArrayList<FoodGroup> list = new ArrayList<FoodGroup>(); - - try - { - - Query q = getSession(2) - .createQuery("select pst from ggc.core.db.hibernate.food.FoodUserGroupH as pst where pst.parent_id=" - + parent_id + " order by pst.name"); - - Iterator<?> it = q.iterate(); - - while (it.hasNext()) - { - FoodUserGroupH eh = (FoodUserGroupH) it.next(); - list.add(new FoodGroup(eh)); - } - - return list; - } - catch (Exception ex) - { - logException("getUserFoodGroups()", ex); - - // LOG.error("Exception on getloadConfigData: " + ex.getMessage(), - // ex); - } - - return list; + return getDAOGroupList(fgList, FoodGroup.class); } @@ -434,73 +354,27 @@ * * @return */ - public ArrayList<MealGroup> getMealGroups() + public List<MealGroup> getMealGroups() { + List<MealGroupH> fgList = getHibernateObjectListByParameter(null, null, Order.asc("name"), MealGroupH.class, 2); - logInfo("getMealGroups()"); - - ArrayList<MealGroup> list = new ArrayList<MealGroup>(); - - try - { - - Query q = getSession(2) - .createQuery("select pst from ggc.core.db.hibernate.food.MealGroupH as pst order by pst.name"); - - Iterator<?> it = q.iterate(); - - while (it.hasNext()) - { - MealGroupH eh = (MealGroupH) it.next(); - list.add(new MealGroup(eh)); - } - - } - catch (Exception ex) - { - logException("getMealGroups()", ex); - } - - return list; + return getDAOGroupList(fgList, MealGroup.class); } /** * Get Meal Groups * - * @param parent_id + * @param parentId parentId of groups * - * @return + * @return List of meal groups */ - public ArrayList<MealGroup> getMealGroups(long parent_id) + public List<MealGroup> getMealGroups(long parentId) { + List<MealGroupH> fgList = getHibernateObjectListByParameter("parent_id", parentId, Order.asc("name"), + MealGroupH.class, 2); - logInfo("getMealGroups()"); - - ArrayList<MealGroup> list = new ArrayList<MealGroup>(); - - try - { - - Query q = getSession(2) - .createQuery("select pst from ggc.core.db.hibernate.food.MealGroupH as pst where pst.parent_id=" - + parent_id + " order by pst.name"); - - Iterator<?> it = q.iterate(); - - while (it.hasNext()) - { - MealGroupH eh = (MealGroupH) it.next(); - list.add(new MealGroup(eh)); - } - - } - catch (Exception ex) - { - logException("getMealGroups()", ex); - } - - return list; + return getDAOGroupList(fgList, MealGroup.class); } @@ -512,7 +386,7 @@ * * @return */ - public ArrayList<FoodDescription> getFoodsByParent(int type, long parent_id) + public List<FoodDescription> getFoodsByParent(int type, long parent_id) { logInfo("getFoodsByParent(type=" + type + ",parent_id=" + parent_id + ")"); @@ -529,73 +403,28 @@ * * @return */ - public ArrayList<FoodDescription> getUSDAFoodDescriptions() + public List<FoodDescription> getUSDAFoodDescriptions() { - logInfo("getUSDAFoodDescriptions()"); + List<FoodDescriptionH> fgList = getHibernateObjectListByParameter(null, null, Order.asc("name"), + FoodDescriptionH.class, 2); - ArrayList<FoodDescription> list = new ArrayList<FoodDescription>(); - - try - { - - Query q = getSession(2).createQuery( - "select pst from ggc.core.db.hibernate.food.FoodDescriptionH as pst order by pst.name"); - - Iterator<?> it = q.iterate(); - - while (it.hasNext()) - { - FoodDescriptionH eh = (FoodDescriptionH) it.next(); - list.add(new FoodDescription(eh)); - } - - return list; - } - catch (Exception ex) - { - logException("getUSDAFoodDescriptions()", ex); - } - - return list; + return getDAOGroupList(fgList, FoodDescription.class); } /** - * Get Food Descriptions - USDA + * Get Food Descriptions By Parent - USDA * - * @param parent_id + * @param parentId * * @return */ - public ArrayList<FoodDescription> getUSDAFoodDescriptionsByParent(long parent_id) + public List<FoodDescription> getUSDAFoodDescriptionsByParent(long parentId) { - logInfo("getUSDAFoodDescriptionsByParent(parent_id=" + parent_id + ")"); + List<FoodDescriptionH> fgList = getHibernateObjectListByParameter("parent_id", parentId, Order.asc("name"), + FoodDescriptionH.class, 2); - ArrayList<FoodDescription> list = new ArrayList<FoodDescription>(); - - try - { - - Query q = getSession(2).createQuery( - "select pst from ggc.core.db.hibernate.food.FoodDescriptionH as pst where pst.group_id=" + parent_id - + " order by pst.name"); - - Iterator<?> it = q.iterate(); - - while (it.hasNext()) - { - FoodDescriptionH eh = (FoodDescriptionH) it.next(); - list.add(new FoodDescription(eh)); - } - - return list; - } - catch (Exception ex) - { - logException("getUSDAFoodDescriptions()", ex); - } - - return list; + return getDAOGroupList(fgList, FoodDescription.class); } @@ -733,11 +562,11 @@ * * @return */ - public ArrayList<FoodDescription> getUserFoodDescriptions() + public List<FoodDescription> getUserFoodDescriptions() { logInfo("getUserFoodDescriptions()"); - ArrayList<FoodDescription> list = new ArrayList<FoodDescription>(); + List<FoodDescription> list = new ArrayList<FoodDescription>(); try { @@ -771,11 +600,11 @@ * * @return */ - public ArrayList<Meal> getMeals() + public List<Meal> getMeals() { logInfo("getMeals()"); - ArrayList<Meal> list = new ArrayList<Meal>(); + List<Meal> list = new ArrayList<Meal>(); try { @@ -813,31 +642,9 @@ */ public Meal getMealById(int type, long meal_id) { - logInfo("getMealById()"); + MealH fg = getHibernateObjectByParameter("id", meal_id, null, MealH.class, 2); - try - { - - Query q = getSession(2) - .createQuery("select pst from ggc.core.db.hibernate.food.MealH as pst where pst.id=" + meal_id); - - Iterator<?> it = q.iterate(); - - while (it.hasNext()) - { - MealH eh = (MealH) it.next(); - // list.put("" + eh.getId(), new Meal(eh)); - return new Meal(eh); - } - - } - catch (Exception ex) - { - logException("getMealById()", ex); - } - - return null; - + return fg != null ? new Meal(fg) : null; } @@ -848,11 +655,11 @@ * * @return */ - public ArrayList<Meal> getMealsByParent(long parent_id) + public List<Meal> getMealsByParent(long parent_id) { logInfo("getMealsByParent()"); - ArrayList<Meal> list = new ArrayList<Meal>(); + List<Meal> list = new ArrayList<Meal>(); try { @@ -890,29 +697,9 @@ */ public Meal getMealById(long id) { - logInfo("getMealById(id=" + id + ")"); + MealH fg = getHibernateObjectByParameter("id", id, null, MealH.class, 2); - try - { - - Query q = getSession(2) - .createQuery("select pst from ggc.core.db.hibernate.food.MealH as pst where pst.id=" + id); - - Iterator<?> it = q.iterate(); - - while (it.hasNext()) - { - MealH eh = (MealH) it.next(); - return new Meal(eh); - } - } - catch (Exception ex) - { - logException("getMealById()", ex); - } - - return null; - + return fg != null ? new Meal(fg) : null; } @@ -924,29 +711,9 @@ */ public MealGroup getMealGroupById(long id) { - logInfo("getMealGroupById(id=" + id + ")"); + MealGroupH fg = getHibernateObjectByParameter("id", id, null, MealGroupH.class, 2); - try - { - - Query q = getSession(2) - .createQuery("select pst from ggc.core.db.hibernate.food.MealGroupH as pst where pst.id=" + id); - - Iterator<?> it = q.iterate(); - - while (it.hasNext()) - { - MealGroupH eh = (MealGroupH) it.next(); - return new MealGroup(eh); - } - } - catch (Exception ex) - { - logException("getMealGroupById()", ex); - } - - return null; - + return fg != null ? new MealGroup(fg) : null; } @@ -1077,169 +844,7 @@ } - // ************************************************************* - // **** GGC Main Data **** - // **** Comment: Were implemnted in DataBaseHandler **** - // ************************************************************* - - /** - * Get DayValuesData - * - * @param from - * @param till - * @return - */ - public DayValuesData getDayValuesData(long from, long till) - { - - if (m_loadStatus == DB_CONFIG_LOADED) - return null; - - logInfo("getDayValuesData()"); - - DayValuesData dvd = new DayValuesData(from, till); - - try - { - Query q = getSession().createQuery("SELECT dv from " + "ggc.core.db.hibernate.DayValueH as dv " - + "WHERE dv.dt_info >= " + from + "0000 AND dv.dt_info <= " + till + "2359 ORDER BY dv.dt_info"); - - Iterator<?> it = q.list().iterator(); - - while (it.hasNext()) - { - DayValueH dv = (DayValueH) it.next(); - - DailyValuesRow dVR = new DailyValuesRow(dv); - dvd.addDayValueRow(dVR); - } - - } - catch (Exception ex) - { - logException("getDayValuesData()", ex); - } - - return dvd; - - } - - - /** - * Save Day Stats - * - * @param dV - */ - public void saveDayStats(DailyValues dV) - { - - if (dV.hasChanged()) - { - logInfo("saveDayStats()"); - - logDebug("saveDayStats()", "Data has changed"); - - Session sess = getSession(); - - try - { - - // deleted entries - - if (dV.hasDeletedItems()) - { - logDebug("saveDayStats()", "Removing deleted entry"); - - Transaction tx = sess.beginTransaction(); - - ArrayList<DayValueH> list = dV.getDeletedItems(); - for (int i = 0; i < list.size(); i++) - { - DayValueH d = list.get(i); - sess.delete(d); - tx.commit(); - } - - } - - // see if any of elements were changed or added - - for (int i = 0; i < dV.getRowCount(); i++) - { - DailyValuesRow dwr = dV.getRow(i); - - if (dwr.isNew()) - { - logDebug("saveDayStats()", "Adding new entry"); - - Transaction tx = sess.beginTransaction(); - - DayValueH dvh = dwr.getHibernateObject(); - Long l = (Long) sess.save(dvh); - - dvh.setId(l.longValue()); - tx.commit(); - } - else if (dwr.hasChanged()) - { - Transaction tx = sess.beginTransaction(); - - logDebug("saveDayStats()", "Changing entry"); - - DayValueH dvh = dwr.getHibernateObject(); - sess.update(dvh); - - tx.commit(); - } - - } // for - - } - catch (Exception ex) - { - logException("saveDayStats()", ex); - } - - } // hasChanged - else - { - logDebug("saveDayStats()", "No entries changed"); - } - - } - - - /** - * DateTime Exists - * - * @param datetime - * @return - */ - public boolean dateTimeExists(long datetime) - { - if (m_loadStatus == DB_CONFIG_LOADED) - return false; - - // if (db_debug) - // System.out.println("Hibernate: dateTimeExists()"); - - try - { - Query q = getSession().createQuery( - "SELECT dv from " + "ggc.nutri.db.hibernate.DayValueH as dv " + "WHERE dv.dt_info = " + datetime); - - return q.list().size() == 1; - } - catch (Exception ex) - { - logException("dateTimeExists()", ex); - return false; - } - - } - - // ************************************************************* // **** NUTRITION DATA **** // ************************************************************* @@ -1249,7 +854,7 @@ * * @return */ - public ArrayList<SelectableInterface> getNutritionHomeWeights() + public List<SelectableInterface> getNutritionHomeWeights() { return this.cache_db.homeweight_defs_list; } @@ -1272,62 +877,12 @@ * * @return */ - public ArrayList<SelectableInterface> getNutritionDefinitions() + public List<SelectableInterface> getNutritionDefinitions() { return this.cache_db.nutrition_defs_list; } - // ************************************************************* - // **** TOOLS Db METHODS **** - // ************************************************************* - /* - * <class name="ggc.nutri.db.hibernate.GlucoValueH" 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="person_id" type="int" not-null="true" /> - * <property name="changed" type="long" not-null="false" /> - * </class> - */ - - - // ************************************************************* - // **** U T I L S **** - // ************************************************************* - /* - * public String changeCase(String in) - * { - * StringTokenizer stok = new StringTokenizer(in, " "); - * boolean first = true; - * String out = ""; - * while (stok.hasMoreTokens()) - * { - * if (!first) - * out += " "; - * out += changeCaseWord(stok.nextToken()); - * first = false; - * } - * return out; - * } - * public String changeCaseWord(String in) - * { - * String t = ""; - * t = in.substring(0, 1).toUpperCase(); - * t += in.substring(1).toLowerCase(); - * return t; - * } - * public void showByte(byte[] in) - * { - * for (int i = 0; i < in.length; i++) - * { - * System.out.println((char) in[i] + " " + in[i]); - * } - * } - */ - /** * Debug Out */ @@ -1415,18 +970,8 @@ 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; - * } - */ } + // 1457 + } Added: trunk/ggc-nutri/src/ggc/nutri/db/datalayer/DAOObject.java =================================================================== --- trunk/ggc-nutri/src/ggc/nutri/db/datalayer/DAOObject.java (rev 0) +++ trunk/ggc-nutri/src/ggc/nutri/db/datalayer/DAOObject.java 2016-12-25 18:28:11 UTC (rev 1440) @@ -0,0 +1,8 @@ +package ggc.nutri.db.datalayer; + +/** + * Created by andy on 26/09/16. + */ +public interface DAOObject +{ +} Modified: trunk/ggc-nutri/src/ggc/nutri/db/datalayer/DailyFoodEntries.java =================================================================== --- trunk/ggc-nutri/src/ggc/nutri/db/datalayer/DailyFoodEntries.java 2016-12-25 18:18:32 UTC (rev 1439) +++ trunk/ggc-nutri/src/ggc/nutri/db/datalayer/DailyFoodEntries.java 2016-12-25 18:28:11 UTC (rev 1440) @@ -1,13 +1,12 @@ package ggc.nutri.db.datalayer; -import ggc.nutri.util.DataAccessNutri; - import java.util.ArrayList; import java.util.Enumeration; import java.util.Hashtable; import java.util.StringTokenizer; import com.atech.i18n.I18nControlAbstract; +import ggc.nutri.util.DataAccessNutri; /** * Application: GGC - GNU Gluco Control @@ -35,8 +34,10 @@ * Author: andyrozman {an...@at...} */ -public class DailyFoodEntries // implements SelectableInterface +public class DailyFoodEntries implements DAOObject // implements + // SelectableInterface { + String text_idx; DataAccessNutri m_da = DataAccessNutri.getInstance(); I18nControlAbstract ic = m_da.getI18nControlInstance(); @@ -47,6 +48,7 @@ ArrayList<DailyFoodEntry> entries = null; + /** * Default constructor */ @@ -55,6 +57,7 @@ entries = new ArrayList<DailyFoodEntry>(); } + /** * Constructor * @@ -71,6 +74,7 @@ } } + /** * Constructor * @@ -93,6 +97,7 @@ } } + /** * Add Daily Food Entry * @@ -117,6 +122,7 @@ } } + /** * Get Calculated Nutrients * @@ -181,6 +187,7 @@ return out_lst; } + /** * Get Elements Count * @@ -191,6 +198,7 @@ return this.entries.size(); } + /** * Get Element * @@ -202,6 +210,7 @@ return this.entries.get(index); } + /** * To String * Modified: trunk/ggc-nutri/src/ggc/nutri/db/datalayer/DailyFoodEntry.java =================================================================== --- trunk/ggc-nutri/src/ggc/nutri/db/datalayer/DailyFoodEntry.java 2016-12-25 18:18:32 UTC (rev 1439) +++ trunk/ggc-nutri/src/ggc/nutri/db/datalayer/DailyFoodEntry.java 2016-12-25 18:28:11 UTC (rev 1440) @@ -1,9 +1,5 @@ package ggc.nutri.db.datalayer; -import ggc.nutri.data.GGCTreeRoot; -import ggc.nutri.util.DataAccessNutri; -import ggc.plugin.util.DataAccessPlugInBase; - import java.util.ArrayList; import java.util.Enumeration; import java.util.Hashtable; @@ -11,6 +7,10 @@ import com.atech.i18n.I18nControlAbstract; +import ggc.nutri.data.GGCTreeRoot; +import ggc.nutri.util.DataAccessNutri; +import ggc.plugin.util.DataAccessPlugInBase; + /** * Application: GGC - GNU Gluco Control * @@ -36,8 +36,10 @@ * Author: andyrozman {an...@at...} */ -public class DailyFoodEntry // implements SelectableInterface +public class DailyFoodEntry implements DAOObject// implements + // SelectableInterface { + private boolean debug = false; String text_idx; DataAccessNutri m_da = DataAccessNutri.getInstance(); @@ -93,6 +95,7 @@ ArrayList<DailyFoodEntry> children = null; + /** * Constructor (food + weight) * @@ -104,6 +107,7 @@ this(fd.getFoodType(), fd, null, DailyFoodEntry.WEIGHT_TYPE_WEIGHT, null, weight); } + /** * Constructor (food + home weight) * @@ -116,6 +120,7 @@ this(fd.getFoodType(), fd, null, DailyFoodEntry.WEIGHT_TYPE_HOME_WEIGHT, hw, amount); } + /** * Constructor (meal + amount) * @@ -127,6 +132,7 @@ this(3, null, ml, DailyFoodEntry.WEIGHT_TYPE_AMOUNT, null, amount); } + /** * Constructor (many parameters) - Main * @@ -175,6 +181,7 @@ } + /** * Daily Food Entry (String) * @param val @@ -208,6 +215,7 @@ } + /** * Constructor (String, boolean) * @@ -235,6 +243,7 @@ loadNutrients(); } + /** * Constructor (String, int) * @@ -274,6 +283,7 @@ */ } + /* * public DailyFoodEntry(MealPart mpart) { if mpart.getType()== } */ @@ -284,6 +294,7 @@ loadObjects(); } + private void loadObjects() { // new GGCTreeRoot(1); @@ -299,7 +310,8 @@ { // System.out.println("dataAccess: " + dataAccess); - // System.out.println("dataAccess.getDbCache(): " + dataAccess.getDbCache()); + // System.out.println("dataAccess.getDbCache(): " + + // dataAccess.getDbCache()); // System.out.println("dataAccess.getDbCache().tree_roots: " + // dataAccess.getDbCache().tree_roots); // System.out.println("dataAccess: " + dataAccess); @@ -317,6 +329,7 @@ } + /** * Add Child * @@ -335,6 +348,7 @@ } + /** * Has Children * @@ -348,11 +362,13 @@ return true; } + private void createId() { this.component_id = DataAccessNutri.getInstance().getNewComponentId(); } + /** * Add Multiplier * @@ -372,6 +388,7 @@ } } + /** * Add Multipliers * @@ -395,6 +412,7 @@ } } + /** * Get Name * @@ -410,6 +428,7 @@ return ""; } + /** * Get Nutrition Food Type * @@ -420,6 +439,7 @@ return this.nutrition_food_type; } + /** * Get Food Type * @@ -433,6 +453,7 @@ return 3; // this.m_meal.getName(); } + /** * Get Weight Type * @@ -443,6 +464,7 @@ return this.amount_type; } + /** * Get Weight Type String * @@ -453,6 +475,7 @@ return this.amount_type_str[this.amount_type]; } + /** * Get Home Weight Description * @@ -471,6 +494,7 @@ return ""; } + /** * Get Amount String * @@ -481,6 +505,7 @@ return DataAccessPlugInBase.Decimal2Format.format(this.amount); } + /** * Get Amount Single Decimal String * @@ -491,10 +516,11 @@ return DataAccessPlugInBase.Decimal1Format.format(this.amount); } + private void loadHomeWeight() { // System.out.println("HWs: " + this.m_food.getHome_weights()); - // System.out.println("Looking for: " + this.home_weight_id); + // System.out.println("Looking for: " + this.home_weight_id); if (this.m_food.getHome_weights() == null && this.m_food.getHome_weights().length() == 0) return; @@ -515,6 +541,7 @@ } + /** * Get Meal CHs * @@ -546,6 +573,7 @@ return sum; } + private void calculateMultiplier() { // System.out.println("calculateMultiplier"); @@ -571,6 +599,7 @@ } } + private float getMultiplier() { if (this.calculated_multiplier == 0.0f) @@ -581,11 +610,13 @@ return this.calculated_multiplier; } + private Hashtable<String, String> getMultipliers() { return this.multiplier; } + /** * Get Children * @@ -601,6 +632,7 @@ return this.children; } + /** * Get Short Description * @@ -611,6 +643,7 @@ return this.getName() + " [" + this.getAmountString() + " x " + this.weight + " g]"; } + private int getAmountType(String type) { for (int i = 1; i < this.amount_type_str.length; i++) @@ -622,6 +655,7 @@ return -1; } + /** * Get Amount Type * @@ -632,6 +666,7 @@ return this.amount_type; } + /** * Get Amount * @@ -642,6 +677,7 @@ return this.amount; } + /** * Get Food Object * @return @@ -651,6 +687,7 @@ return this.m_food; } + /** * Get Meal Object * @@ -661,6 +698,7 @@ return this.m_meal; } + /** * Get Home Weight Special Object * @@ -671,6 +709,7 @@ return this.m_home_weight_special; } + // TODO: New code /** @@ -687,6 +726,7 @@ } + /** * Display Nutritions */ @@ -704,6 +744,7 @@ } + /** * To String * @@ -716,6 +757,7 @@ return getShortDescription(); } + /** * Get Value String * @@ -747,6 +789,7 @@ } + private void loadNutrients() { String nutr; @@ -777,6 +820,7 @@ */ } + private void processMeal(Meal meal) { if (meal == null) @@ -840,6 +884,7 @@ * } } } */ + /* * v3.1 * private void mergeGlycemicData(DailyFoodEntry dfe) @@ -892,6 +937,7 @@ } } + /** * Get Nutrients * @@ -936,6 +982,7 @@ return this.nutrients; } + /** * Get Nutrient Value * @@ -957,6 +1004,7 @@ return 0.0f; } + @SuppressWarnings("unused") private ArrayList<MealNutrition> createList(Hashtable<String, MealNutrition> table) { @@ -975,6 +1023,7 @@ return lst; } + /** * Get Home Weight Multiplier * @@ -1041,6 +1090,7 @@ * return this.nutrients; } */ + /* * proc v1 public void calculateNutrition(MealNutrition mn, float mult) { * if ((mn.getId()>=4000) && (mn.getId()<=4005)) { addGlycemicNutrient(mn); @@ -1061,6 +1111,7 @@ } } + /** * Contains Glycemic Nutrients * @@ -1071,6 +1122,7 @@ return this.glyc_nutr != null; } + /** * Get Glycemic Nutrients * @@ -1081,6 +1133,7 @@ return this.glyc_nutr; } + /** * getObjectName - returns name of DatabaseObject * @@ -1091,6 +1144,7 @@ return "Daily Food Entry"; } + /** * isDebugMode - returns debug mode of object * @@ -1101,6 +1155,7 @@ return debug; } + /** * getAction - returns action that should be done on object * 0 = no action 1 = add action 2 = edit action 3 = delete action @@ -1116,6 +1171,7 @@ return 0; } + /** * getItemId * Modified: trunk/ggc-nutri/src/ggc/nutri/db/datalayer/FoodDescription.java =================================================================== --- trunk/ggc-nutri/src/ggc/nutri/db/datalayer/FoodDescription.java 2016-12-25 18:18:32 UTC (rev 1439) +++ trunk/ggc-nutri/src/ggc/nutri/db/datalayer/FoodDescription.java 2016-12-25 18:28:11 UTC (rev 1440) @@ -42,7 +42,7 @@ * Author: andyrozman {an...@at...} */ -public class FoodDescription implements DatabaseObjectHibernate, BackupRestoreObject +public class FoodDescription implements DatabaseObjectHibernate, BackupRestoreObject, DAOObject { private boolean debug = false; Modified: trunk/ggc-nutri/src/ggc/nutri/db/datalayer/FoodGroup.java =================================================================== --- trunk/ggc-nutri/src/ggc/nutri/db/datalayer/FoodGroup.java 2016-12-25 18:18:32 UTC (rev 1439) +++ trunk/ggc-nutri/src/ggc/nutri/db/datalayer/FoodGroup.java 2016-12-25 18:28:11 UTC (rev 1440) @@ -1,6 +1,7 @@ package ggc.nutri.db.datalayer; import java.util.ArrayList; +import java.util.List; import java.util.Map; import org.hibernate.Session; @@ -43,7 +44,7 @@ * Author: andyrozman {an...@at...} */ -public class FoodGroup implements DatabaseObjectHibernate, BackupRestoreObject +public class FoodGroup implements DatabaseObjectHibernate, BackupRestoreObject, DAOObject { private boolean debug = false; @@ -59,19 +60,19 @@ /** * Children - Groups */ - public ArrayList<FoodGroup> children_group = null; // new - // ArrayList<FoodGroup>(); + public List<FoodGroup> children_group = null; // new + // ArrayList<FoodGroup>(); /** * Children - All */ - public ArrayList<Object> children = null; // new ArrayList<Object>(); + public List<Object> children = null; // new ArrayList<Object>(); /** * Children - Foods */ - public ArrayList<FoodDescription> children_food = null; // new - // ArrayList<Meal>(); + public List<FoodDescription> children_food = null; // new + // ArrayList<Meal>(); // public ArrayList<MealGroup> children_group = null; //new // ArrayList<MealGroup>(); Modified: trunk/ggc-nutri/src/ggc/nutri/db/datalayer/GlycemicNutrients.java =================================================================== --- trunk/ggc-nutri/src/ggc/nutri/db/datalayer/GlycemicNutrients.java 2016-12-25 18:18:32 UTC (rev 1439) +++ trunk/ggc-nutri/src/ggc/nutri/db/datalayer/GlycemicNutrients.java 2016-12-25 18:28:11 UTC (rev 1440) @@ -1,11 +1,10 @@ package ggc.nutri.db.datalayer; -import ggc.nutri.util.DataAccessNutri; - import java.util.ArrayList; import java.util.Hashtable; import com.atech.i18n.I18nControlAbstract; +import ggc.nutri.util.DataAccessNutri; /** * Application: GGC - GNU Gluco Control @@ -32,8 +31,9 @@ * Author: andyrozman {an...@at...} */ -public class GlycemicNutrients +public class GlycemicNutrients implements DAOObject { + DataAccessNutri m_da = DataAccessNutri.getInstance(); I18nControlAbstract ic = m_da.getI18nControlInstance(); Hashtable<String, ArrayList<MealNutrition>> gly_nutrients; @@ -46,6 +46,7 @@ String weight; Hashtable<String, MealNutrition> nutrients = null; + /** * Constructor * @@ -58,6 +59,7 @@ processEntry(mn); } + /** * */ @@ -67,6 +69,7 @@ System.out.println("mergeGlycemicData not implemented"); } + private void loadGI_GL() { // GI = 4000, GL = 4001, GI_MIN = 4002, GI_MAX = 4003, GL_MIN = 4004, @@ -77,6 +80,7 @@ this.nutrients.put("4005", new MealNutrition(4005, 0.0f, "GL Max")); } + /** * Add Nutrient * @@ -87,6 +91,7 @@ this.processEntry(mn); } + private void processEntry(MealNutrition mn) { // GI = 4000, GL = 4001, GI_MIN = 4002, GI_MAX = 4003, GL_MIN = 4004, @@ -120,6 +125,7 @@ } + private void checkGI_GL(Hashtable<String, MealNutrition> nutres, MealNutrition mn, boolean GI) { // GI = 4000, GL = 4001, GI_MIN = 4002, GI_MAX = 4003, GL_MIN = 4004, @@ -165,6 +171,7 @@ } + private void checkGI_GL_Max(Hashtable<String, MealNutrition> nutres, MealNutrition mn, boolean GI) { // GI = 4000, GL = 4001, GI_MIN = 4002, GI_MAX = 4003, GL_MIN = 4004, @@ -195,6 +202,7 @@ } + private void checkGI_GL_Min(Hashtable<String, MealNutrition> nutres, MealNutrition mn, boolean GI) { // GI = 4000, GL = 4001, GI_MIN = 4002, GI_MAX = 4003, GL_MIN = 4004, Modified: trunk/ggc-nutri/src/ggc/nutri/db/datalayer/HomeWeightSpecial.java =================================================================== --- trunk/ggc-nutri/src/ggc/nutri/db/datalayer/HomeWeightSpecial.java 2016-12-25 18:18:32 UTC (rev 1439) +++ trunk/ggc-nutri/src/ggc/nutri/db/datalayer/HomeWeightSpecial.java 2016-12-25 18:28:11 UTC (rev 1440) @@ -1,10 +1,9 @@ package ggc.nutri.db.datalayer; -import ggc.nutri.util.DataAccessNutri; - import com.atech.graphics.dialogs.selector.ColumnSorter; import com.atech.graphics.dialogs.selector.SelectableInterface; import com.atech.i18n.I18nControlAbstract; +import ggc.nutri.util.DataAccessNutri; /** * Application: GGC - GNU Gluco Control @@ -31,8 +30,9 @@ * Author: andyrozman {an...@at...} */ -public class HomeWeightSpecial implements SelectableInterface +public class HomeWeightSpecial implements SelectableInterface, DAOObject { + DataAccessNutri m_da = DataAccessNutri.getInstance(); I18nControlAbstract ic = m_da.getI18nControlInstance(); @@ -45,6 +45,7 @@ String weight; float calculated_weight = 0.0f; + /** * Constructor */ @@ -53,6 +54,7 @@ } + /** * Constructor * @@ -65,6 +67,7 @@ this(id, name, "1", weight); } + /** * Constructor * @@ -95,6 +98,7 @@ } + /** * Constructor * @@ -113,6 +117,7 @@ setSearchContext(); } + /* * public NutritionHomeWeightType(NutritionHomeWeightTypeH ch) { * this.setId(ch.getId()); this.setName(ch.getName()); setSearchContext(); } @@ -133,6 +138,7 @@ } + /** * Get Calculated Weight * @@ -148,6 +154,7 @@ return this.calculated_weight; } + /** * Get Short Description * @@ -159,6 +166,7 @@ return this.name + " [" + this.amount + " x " + this.weight + " g]"; } + /** * To String * @@ -170,6 +178,7 @@ return getShortDescription(); } + /** * Get Name * @@ -180,6 +189,7 @@ return this.name; } + /** * getObjectName - returns name of DatabaseObject * @@ -190,6 +200,7 @@ return "Home Weight Type"; } + /** * isDebugMode - returns debug mode of object * @@ -200,6 +211,7 @@ return debug; } + /** * getAction - returns action that should be done on object 0 = no action 1 * = add action 2 = edit action 3 = delete action This is used mainly for @@ -213,6 +225,7 @@ return 0; } + // --- // --- SelectorInterface // --- @@ -225,6 +238,7 @@ return 4; } + /** * Get Column Name */ @@ -247,6 +261,7 @@ } } + /** * Get Column Value */ @@ -270,6 +285,7 @@ } + /** * Get Column Value Object */ @@ -292,6 +308,7 @@ } } + /** * Get Column Width */ @@ -318,6 +335,7 @@ } + /** * Get Item Id */ @@ -326,6 +344,7 @@ return this.id; } + /** * Is Found */ @@ -334,6 +353,7 @@ return true; } + /** * Is Found */ @@ -342,6 +362,7 @@ return true; } + /** * Is Found */ @@ -353,6 +374,7 @@ return false; } + /** * Set Search Context */ @@ -367,6 +389,7 @@ private ColumnSorter columnSorter = null; + /** * setColumnSorter - sets class that will help with column sorting * @@ -377,6 +400,7 @@ this.columnSorter = cs; } + /** * Compares this object with the specified object for order. Returns a * negative integer, zero, or a positive integer as this object is less Modified: trunk/ggc-nutri/src/ggc/nutri/db/datalayer/Meal.java =================================================================== --- trunk/ggc-nutri/src/ggc/nutri/db/datalayer/Meal.java 2016-12-25 18:18:32 UTC (rev 1439... [truncated message content] |
From: <and...@us...> - 2016-12-25 18:18:35
|
Revision: 1439 http://sourceforge.net/p/ggc/code/1439 Author: andyrozman Date: 2016-12-25 18:18:32 +0000 (Sun, 25 Dec 2016) Log Message: ----------- GGC Desktop - move files Modified Paths: -------------- trunk/ggc-desktop-app/ggc-desktop/pom.xml trunk/ggc-desktop-app/pom.xml Added Paths: ----------- trunk/ggc-desktop-app/ggc-desktop-little/ trunk/ggc-desktop-app/ggc-desktop-little/docs/ trunk/ggc-desktop-app/ggc-desktop-little/pom.xml trunk/ggc-desktop-app/ggc-desktop-little/src/ trunk/ggc-desktop-app/ggc-desktop-little/src/main/ trunk/ggc-desktop-app/ggc-desktop-little/src/main/java/ trunk/ggc-desktop-app/ggc-desktop-little/src/main/resources/ trunk/ggc-desktop-app/ggc-desktop-little/src/test/ trunk/ggc-desktop-app/ggc-desktop-little/src/test/java/ trunk/ggc-desktop-app/ggc-desktop-little/src/test/resources/ Removed Paths: ------------- trunk/ggc-desktop/ Modified: trunk/ggc-desktop-app/ggc-desktop/pom.xml =================================================================== --- trunk/ggc-desktop-app/ggc-desktop/pom.xml 2016-12-25 18:04:29 UTC (rev 1438) +++ trunk/ggc-desktop-app/ggc-desktop/pom.xml 2016-12-25 18:18:32 UTC (rev 1439) @@ -4,40 +4,17 @@ <parent> <groupId>net.sf.ggc</groupId> - <artifactId>ggc-parent</artifactId> - <version>1.0-SNAPSHOT</version> - <relativePath>../ggc-removed/ggc-master-pom/pom.xml</relativePath> + <artifactId>ggc-desktop-app</artifactId> + <version>0.8-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> </parent> - <name>GGC Desktop Project</name> - + <name>GGC Desktop - Desktop</name> <artifactId>ggc-desktop</artifactId> <version>${ggc-desktop.version}</version> - <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> - </build> + <dependencies> <dependency> <groupId>com.atech-software</groupId> Added: trunk/ggc-desktop-app/ggc-desktop-little/pom.xml =================================================================== --- trunk/ggc-desktop-app/ggc-desktop-little/pom.xml (rev 0) +++ trunk/ggc-desktop-app/ggc-desktop-little/pom.xml 2016-12-25 18:18:32 UTC (rev 1439) @@ -0,0 +1,81 @@ +<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-desktop-app</artifactId> + <version>0.8-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> + </parent> + + <name>GGC Desktop - Little</name> + <description>GGC Little (Version of GGC that could always run in background)</description> + <artifactId>ggc-desktop-little</artifactId> + <version>0.1-SNAPSHOT</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>net.sf.ggc</groupId> + <artifactId>ggc-desktop</artifactId> + </dependency> + + <dependency> + <groupId>com.atech-software</groupId> + <artifactId>atech-tools</artifactId> + </dependency> + + <dependency> + <groupId>postgresql</groupId> + <artifactId>postgresql</artifactId> + <version>8.4-702.jdbc3</version> + </dependency> + + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <!-- <version>4.11</version> --> + <!-- <scope>test</scope> --> + </dependency> + + + </dependencies> + + <properties> + + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> + + </properties> + +</project> Modified: trunk/ggc-desktop-app/pom.xml =================================================================== --- trunk/ggc-desktop-app/pom.xml 2016-12-25 18:04:29 UTC (rev 1438) +++ trunk/ggc-desktop-app/pom.xml 2016-12-25 18:18:32 UTC (rev 1439) @@ -9,7 +9,7 @@ <relativePath>../pom.xml</relativePath> </parent> - <name>GGC Desktop App</name> + <name>GGC Desktop</name> <artifactId>ggc-desktop-app</artifactId> <packaging>pom</packaging> @@ -21,6 +21,7 @@ <modules> <module>ggc-desktop</module> + <module>ggc-desktop-little</module> </modules> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <and...@us...> - 2016-12-25 18:04:33
|
Revision: 1438 http://sourceforge.net/p/ggc/code/1438 Author: andyrozman Date: 2016-12-25 18:04:29 +0000 (Sun, 25 Dec 2016) Log Message: ----------- GGC Pumps - move files Modified Paths: -------------- trunk/ggc-desktop-app/pom.xml Added Paths: ----------- trunk/ggc-desktop-app/ggc-desktop/.amateras trunk/ggc-desktop-app/ggc-desktop/.settings/ trunk/ggc-desktop-app/ggc-desktop/build/ trunk/ggc-desktop-app/ggc-desktop/build/build.xml trunk/ggc-desktop-app/ggc-desktop/data/ trunk/ggc-desktop-app/ggc-desktop/data/DbTool_Config.properties_default trunk/ggc-desktop-app/ggc-desktop/data/lang/DbTool_Languages.properties trunk/ggc-desktop-app/ggc-desktop/doc/ 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/TO-DO Detailed.txt trunk/ggc-desktop-app/ggc-desktop/doc/TO-DO.txt trunk/ggc-desktop-app/ggc-desktop/doc/TO-DO_Hardware.txt trunk/ggc-desktop-app/ggc-desktop/doc/archive/ trunk/ggc-desktop-app/ggc-desktop/doc/database_info.txt trunk/ggc-desktop-app/ggc-desktop/doc/usb/ trunk/ggc-desktop-app/ggc-desktop/pom.xml Removed Paths: ------------- trunk/ggc-desktop/.amateras trunk/ggc-desktop/.settings/ trunk/ggc-desktop/build/ trunk/ggc-desktop/data/ trunk/ggc-desktop/doc/ trunk/ggc-desktop/pom.xml trunk/ggc-desktop-app/ggc-desktop/build/build.xml trunk/ggc-desktop-app/ggc-desktop/doc/Changelog_old 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/README_1st trunk/ggc-desktop-app/ggc-desktop/doc/README_1st.de trunk/ggc-desktop-app/ggc-desktop/doc/README_1st.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/TO-DO_Hardware.txt trunk/ggc-desktop-app/ggc-desktop/doc/USB-How-To.txt trunk/ggc-desktop-app/ggc-desktop/doc/USB-How-To_de.txt trunk/ggc-desktop-app/ggc-desktop/doc/USB-How-To_si.txt trunk/ggc-desktop-app/ggc-desktop/doc/database_info.txt trunk/ggc-desktop-app/ggc-desktop/doc/old_docs/ Deleted: trunk/ggc-desktop/.amateras =================================================================== --- trunk/ggc-desktop/.amateras 2016-12-25 17:58:00 UTC (rev 1437) +++ trunk/ggc-desktop/.amateras 2016-12-25 18:04:29 UTC (rev 1438) @@ -1,12 +0,0 @@ -#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= Deleted: trunk/ggc-desktop/pom.xml =================================================================== --- trunk/ggc-desktop/pom.xml 2016-12-25 17:58:00 UTC (rev 1437) +++ trunk/ggc-desktop/pom.xml 2016-12-25 18:04:29 UTC (rev 1438) @@ -1,157 +0,0 @@ -<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-removed/ggc-master-pom/pom.xml</relativePath> - </parent> - - <name>GGC Desktop Project</name> - - <artifactId>ggc-desktop</artifactId> - <version>${ggc-desktop.version}</version> - - <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> - </build> - - <dependencies> - <dependency> - <groupId>com.atech-software</groupId> - <artifactId>atech-tools</artifactId> - </dependency> - - <dependency> - <groupId>net.sf.ggc</groupId> - <artifactId>ggc-help</artifactId> - </dependency> - - <dependency> - <groupId>net.sf.ggc</groupId> - <artifactId>ggc-core</artifactId> - </dependency> - - <dependency> - <groupId>net.sf.ggc</groupId> - <artifactId>ggc-plugin-base</artifactId> - </dependency> - - - <dependency> - <groupId>net.sf.ggc</groupId> - <artifactId>ggc-meter-tool</artifactId> - </dependency> - - <dependency> - <groupId>net.sf.ggc</groupId> - <artifactId>ggc-pump-tool</artifactId> - </dependency> - - <dependency> - <groupId>net.sf.ggc</groupId> - <artifactId>ggc-cgms-tool</artifactId> - </dependency> - - <dependency> - <groupId>net.sf.ggc</groupId> - <artifactId>ggc-nutri-tool</artifactId> - </dependency> - - <!-- - <dependency> - <groupId>net.sf.ggc</groupId> - <artifactId>ggc-connect-tool</artifactId> - </dependency> ---> - - <dependency> - <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>jfree</groupId> - <artifactId>jfreechart</artifactId> - </dependency> - - <dependency> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> - </dependency> - - <!-- Is Required ?? --> - - <!-- - <dependency> - <groupId>org.simpleframework</groupId> - <artifactId>simple-xml</artifactId> - </dependency> - - <dependency> - <groupId>net.lingala.zip4j</groupId> - <artifactId>zip4j</artifactId> - </dependency> ---> - - <dependency> - <groupId>postgresql</groupId> - <artifactId>postgresql</artifactId> - <version>8.4-702.jdbc3</version> - </dependency> - - - <!-- - <dependency> - <groupId>info.clearthought</groupId> - <artifactId>table-layout-j15</artifactId> - <version>1.0</version> - </dependency> - --> - - <dependency> - <groupId>info.clearthought</groupId> - <artifactId>table-layout</artifactId> - </dependency> - - - <!-- <dependency> <groupId>org.swinglabs</groupId> <artifactId>pdf-renderer</artifactId> - </dependency> <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> - </dependency> --> - - - </dependencies> -</project> Copied: trunk/ggc-desktop-app/ggc-desktop/.amateras (from rev 1431, trunk/ggc-desktop/.amateras) =================================================================== --- trunk/ggc-desktop-app/ggc-desktop/.amateras (rev 0) +++ trunk/ggc-desktop-app/ggc-desktop/.amateras 2016-12-25 18:04:29 UTC (rev 1438) @@ -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= Deleted: trunk/ggc-desktop-app/ggc-desktop/build/build.xml =================================================================== --- trunk/ggc-desktop/build/build.xml 2016-12-25 17:14:28 UTC (rev 1431) +++ trunk/ggc-desktop-app/ggc-desktop/build/build.xml 2016-12-25 18:04:29 UTC (rev 1438) @@ -1,184 +0,0 @@ -<?xml version="1.0" ?> -<project name="GNU Gluco Control" default="build" basedir="."> - <description> - Build file for GGC Desktop - </description> - - <!-- Environment properties read from a file ...--> - <property file="../../build/AtechTools.properties"/> - <property file="../../ggc-core/build/GGCBuild.properties"/> - <property file="./GGC_Desktop_Version.properties"/> - <property file="../../ggc-core/build/GGC_Core_Version.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 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_'part' = create specified GGC jar"/> - <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=""/> - </target> - - - <!-- Public targets --> - - <target name="clean" description="Clean build directory and previus version of GGC"> - <delete dir="${build.dir}/ggc"/> - <delete dir="${build.dir}/com"/> - <delete dir="${build.dir}/org"/> - <delete dir="${build.dir}/icons"/> - <delete file="${build.dir}/ggc-main*.jar"/> - <delete file="${build.dir}/ggc-little*.jar"/> - </target> - - - <target name="copy" description="Copy all needed files"> - <copy todir="${build.dir}/" overwrite="true"> - <fileset dir="${source.dir}" casesensitive="no"> - <include name="GGC_*.properties"/> - </fileset> - </copy> - <mkdir dir="${build.dir}/icons" /> - <copy todir="${build.dir}/icons" overwrite="true"> - <fileset dir="${source.dir}/icons" casesensitive="no"> - <include name="**/*.gif"/> - <include name="**/*.jpg"/> - <include name="**/*.png"/> - </fileset> - </copy> - </target> - - - - - <target name="make" description="Build GGC"> - <javac srcdir="${source.dir}" - destdir="${build.dir}" - includes="ggc/**, org/**, com/**" - excludes="ggc/db/DummyHandler.java, ggc/db/HSQLHandler.java, ggc/db/MySQLHandler.java, ggc/db/TextFileHandler.java, ggc/data/meter2/**" - deprecation="off" debug="true"> <!-- debug="${debug} DummyHandler.java, ggc/db/HSQLHandler.java, ggc\db\MySQLHandler, ggc/db/TextFileHandler.java" --> - - <classpath> - <pathelement path="${hibernate_cpath}" /> - <pathelement path="${utils_cpath}"/> - <pathelement path="${classpath.full}"/> - <pathelement path="../../build/deploy_files/ggc-core-${ggc-core.version}.jar"/> - </classpath> - </javac> - </target> - - <target name="build_ggc" description="Build GGC" /> - -<!-- - - includes="ggc/**" - excludes="ggc/db/**" - - ---> - - <target name="jar_main" description="Build GGC Main GUI jar" depends="make"> - <jar jarfile="${binary.dir}/ggc-main-${ggc-main.version}.jar" - update="false" - index="false" - manifest="./manifest_ggc.mf"> - - <fileset dir="${build.dir}"> - <include name="ggc/GGC.class"/> - <include name="ggc/gui/**"/> - <exclude name="ggc/gui/little/**"/> - <include name="icons/*.gif"/> - <include name="icons/*.jpg"/> - <include name="icons/*.png"/> - </fileset> - </jar> - </target> - - - - - - - <target name="jar_little" description="Build GGC Little" depends="make"> - <jar jarfile="${binary.dir}/ggc-little-${ggc-little.version}.jar" - update="false" - index="false" - manifest="./manifest_ggc_little.mf"> - - <fileset dir="${build.dir}"> - <include name="ggc/gui/little/**"/> - <include name="ggc/gui/view/**"/> - <include name="icons/*.gif"/> - <include name="icons/*.jpg"/> - <include name="icons/*.png"/> - </fileset> - </jar> - </target> - - - <target name="dev" depends="clean, copy, make"> - </target> - - - <target name="jars_full" depends="jar_main, jar_little"> - </target> - - - <target name="full" depends="clean, copy, jars_full"> - </target> - - <target name="deploy" depends="full"> - <copy file="${binary.dir}/ggc-main-${ggc-main.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> - - - <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> - Copied: trunk/ggc-desktop-app/ggc-desktop/build/build.xml (from rev 1436, trunk/ggc-desktop/build/build.xml) =================================================================== --- trunk/ggc-desktop-app/ggc-desktop/build/build.xml (rev 0) +++ trunk/ggc-desktop-app/ggc-desktop/build/build.xml 2016-12-25 18:04:29 UTC (rev 1438) @@ -0,0 +1,184 @@ +<?xml version="1.0" ?> +<project name="GNU Gluco Control" default="build" basedir=""> + <description> + Build file for GGC Desktop + </description> + + <!-- Environment properties read from a file ...--> + <property file="../../build/AtechTools.properties"/> + <property file="../../ggc-core-app/ggc-core/build/GGCBuild.properties"/> + <property file="GGC_Desktop_Version.properties"/> + <property file="../../ggc-core-app/ggc-core/build/GGC_Core_Version.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 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_'part' = create specified GGC jar"/> + <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=""/> + </target> + + + <!-- Public targets --> + + <target name="clean" description="Clean build directory and previus version of GGC"> + <delete dir="${build.dir}/ggc"/> + <delete dir="${build.dir}/com"/> + <delete dir="${build.dir}/org"/> + <delete dir="${build.dir}/icons"/> + <delete file="${build.dir}/ggc-main*.jar"/> + <delete file="${build.dir}/ggc-little*.jar"/> + </target> + + + <target name="copy" description="Copy all needed files"> + <copy todir="${build.dir}/" overwrite="true"> + <fileset dir="${source.dir}" casesensitive="no"> + <include name="GGC_*.properties"/> + </fileset> + </copy> + <mkdir dir="${build.dir}/icons" /> + <copy todir="${build.dir}/icons" overwrite="true"> + <fileset dir="../../ggc-desktop-app/ggc-desktop/src/main/resources/icons" casesensitive="no"> + <include name="**/*.gif"/> + <include name="**/*.jpg"/> + <include name="**/*.png"/> + </fileset> + </copy> + </target> + + + + + <target name="make" description="Build GGC"> + <javac srcdir="${source.dir}" + destdir="${build.dir}" + includes="ggc/**, org/**, com/**" + excludes="ggc/db/DummyHandler.java, ggc/db/HSQLHandler.java, ggc/db/MySQLHandler.java, ggc/db/TextFileHandler.java, ggc/data/meter2/**" + deprecation="off" debug="true"> <!-- debug="${debug} DummyHandler.java, ggc/db/HSQLHandler.java, ggc\db\MySQLHandler, ggc/db/TextFileHandler.java" --> + + <classpath> + <pathelement path="${hibernate_cpath}" /> + <pathelement path="${utils_cpath}"/> + <pathelement path="${classpath.full}"/> + <pathelement path="../../build/deploy_files/ggc-core-${ggc-core.version}.jar"/> + </classpath> + </javac> + </target> + + <target name="build_ggc" description="Build GGC" /> + +<!-- + + includes="ggc/**" + excludes="ggc/db/**" + + +--> + + <target name="jar_main" description="Build GGC Main GUI jar" depends="make"> + <jar jarfile="${binary.dir}/ggc-main-${ggc-main.version}.jar" + update="false" + index="false" + manifest="manifest_ggc.mf"> + + <fileset dir="${build.dir}"> + <include name="ggc/GGC.class"/> + <include name="ggc/gui/**"/> + <exclude name="ggc/gui/little/**"/> + <include name="icons/*.gif"/> + <include name="icons/*.jpg"/> + <include name="icons/*.png"/> + </fileset> + </jar> + </target> + + + + + + + <target name="jar_little" description="Build GGC Little" depends="make"> + <jar jarfile="${binary.dir}/ggc-little-${ggc-little.version}.jar" + update="false" + index="false" + manifest="manifest_ggc_little.mf"> + + <fileset dir="${build.dir}"> + <include name="ggc/gui/little/**"/> + <include name="ggc/gui/view/**"/> + <include name="icons/*.gif"/> + <include name="icons/*.jpg"/> + <include name="icons/*.png"/> + </fileset> + </jar> + </target> + + + <target name="dev" depends="clean, copy, make"> + </target> + + + <target name="jars_full" depends="jar_main, jar_little"> + </target> + + + <target name="full" depends="clean, copy, jars_full"> + </target> + + <target name="deploy" depends="full"> + <copy file="${binary.dir}/ggc-main-${ggc-main.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> + + + <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> + Copied: trunk/ggc-desktop-app/ggc-desktop/data/DbTool_Config.properties_default (from rev 1436, trunk/ggc-desktop/data/DbTool_Config.properties_default) =================================================================== --- trunk/ggc-desktop-app/ggc-desktop/data/DbTool_Config.properties_default (rev 0) +++ trunk/ggc-desktop-app/ggc-desktop/data/DbTool_Config.properties_default 2016-12-25 18:04:29 UTC (rev 1438) @@ -0,0 +1,88 @@ +# +# GGC_Config (Settings for GGC) +#31.7.2010 13:11:37 +# +# 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 Copied: trunk/ggc-desktop-app/ggc-desktop/data/lang/DbTool_Languages.properties (from rev 1436, trunk/ggc-desktop/data/lang/DbTool_Languages.properties) =================================================================== --- trunk/ggc-desktop-app/ggc-desktop/data/lang/DbTool_Languages.properties (rev 0) +++ trunk/ggc-desktop-app/ggc-desktop/data/lang/DbTool_Languages.properties 2016-12-25 18:04:29 UTC (rev 1438) @@ -0,0 +1,71 @@ +# +# DbTool Languages +# +# Don't edit by hand +# + + + +VERSION=0.1 +AVAILABLE_LANGUAGES=1 +AVAILABLE_LANGUAGES_WITH_HELP=0 +LANGPACK_DATE=26/11/2016 12:00 +LANGUAGE_ROOT=DbTool +DEFAULT_HELP=en + + +# +# Language 1 - English (English) +# +LANG_1=en +LANG_1_NAME=English +LANG_1_HELP_AVAILABLE=No +LANG_1_HELP=No +LANG_1_FILE=DbTool_en.properties +LANG_1_LOCALE=en +LANG_1_LOCALE_COUNTRY= +LANG_1_LOCALE_ISO= + + + + +# +# Language 2 - Slovene (Slovenski) +# + +LANG_2=si +LANG_2_NAME=Slovenski +LANG_2_HELP_AVAILABLE=Yes +LANG_2_HELP=Yes +LANG_2_LOCALE=si +LANG_2_LOCALE_COUNTRY= +LANG_2_LOCALE_ISO= + + + +# +# Language 3 - German (Deutsch) +# +LANG_3=de +LANG_3_NAME=Deutsch +LANG_3_HELP_AVAILABLE=No +LANG_3_HELP=Yes +LANG_3_LOCALE=de +LANG_3_LOCALE_COUNTRY= +LANG_3_LOCALE_ISO= + + +# +# Language 4 - French +# +LANG_4=fr +LANG_4_NAME=French +LANG_4_HELP_AVAILABLE=No +LANG_4_HELP=Yes +LANG_4_LOCALE=fr +LANG_4_LOCALE_COUNTRY= +LANG_4_LOCALE_ISO= + + + + Deleted: trunk/ggc-desktop-app/ggc-desktop/doc/Changelog_old =================================================================== --- trunk/ggc-desktop/doc/Changelog_old 2016-12-25 17:14:28 UTC (rev 1431) +++ trunk/ggc-desktop-app/ggc-desktop/doc/Changelog_old 2016-12-25 18:04:29 UTC (rev 1438) @@ -1,900 +0,0 @@ - -Changelog file for GGC (GNU Gluco Control) -========================================== - -Newer entries are on top, older on bottom. - --------------------------------------------------------------------------------------------------- - -0.4.4 - * Meter Tool data is now added also into database for pump - -0.4.3 (16.3) - * Dynamic loading of data finished - * Startup tools changed - - -0.4.2 - * Continue work on dynamic loading of Nutrition data - * Dynamic loading now works for printing - -0.4.1.2 (28.2.2009) - * Correct dates are now printed in Food Menu reports - -0.4.1.1 (17.2.2009) - * All printing now uses abstract core file - * All printing is now done to \data\print - * All printing jobs create real names now, with real data in name (AT) - * Started work on dynamic loading of Nutrition data - -0.4.1 - * Bug fixing HbA1c graph display - * Printing files problem - -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) 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) 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.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.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.2008) Andy Rozman <and...@us...> - * integrating new graph framework (ATGraphFramework) - * implementation of HbA1c view for ATGraphFramework - * implementation of Daily view for ATGraphFramework - * ATech Tools Requirement: v0.2.10 - -0.3.10 - * adding comments - * changed main view of application - -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 nutrition db, changed - meals definitions), Meter (meter companies, meters, meter interface (for import), meter - implementations), Inet stuff (inet group, inet links, ...) - * Some file rename in ggc.db.datalayer - * Loading and init of Nutrition database changed - * Added User Nutrition Database - * Display USDB Nutrition Database - * Changed menus: restructuring, added entries: Stocks, Doctors, Appointments, Database Maintainance, - User Nutrition Database, Meter List (added are items, not functionality). - * Meter Management will be done in Database. We will try to have database filled with all different - meters available arround, those that are supported by GGC will have some other entries, so - that user has overview over most available meters. (so far list has 34 meters, only 3 are supported - to be read by application, another 7 are in the works (Ascensia) and will be available in 0.4 version - (End of 2007) - - -2006-03-21 (v0.2.4.2) Reinhold Rumberger <ru...@us...> - * german translation - * several bugs in BUGS.txt - * fixed bug in displaying graphs' y-axis labels - -2006-03-13 Reinhold Rumberger <ru...@us...> - * updated german translation - -2006-03-11 (v0.2.4.1) Andy Rozman <and...@us...> - * Color scheme settings - * Configuration work finished - probably - -2006-03-10 (v0.2.3.1) Andy Rozman <and...@us...> - * Loading L&F at startup - * Changing some debug information for Db - -2006-03-06 (v0.2.2.10 - 8) Andy Rozman <and...@us...> - * Configuration save fixed - * General settings - o Setting Db - o Setting Look and Feel (and saving info to configuration file) - -2006-01-24 Reinhold Rumberger <ru...@us...> - * made path to javax.comm.properties in DataAccess system-independant - -2006-01-23 (v0.2.2.7) Andy Rozman <and...@us...> - * New configuration tables are now used (old databases won't work anymore) - * Fixing of configuration stuff: - o Meter Configuration fixed - -2006-01-21 Reinhold Rumberger <ru...@us...> - * build.xml: ggc_l might now work again - * translation - -2006-01-05 Reinhold Rumberger <ru...@us...> - * make run.sh work - -2006-01-03 Reinhold Rumberger <ru...@us...> - * new idea in IDEAS - -2006-12-27 (v0.2.2.6) Andy Rozman <and...@us...> - * DailyRowDialog is replaced with older version, since new version is not working - yet - * Added new code for supporting meters - * Added new dialog for meters - * Meters support is in early testing phase, old meters code is disabled for now - -2006-12-26 Reinhold Rumberger <ru...@us...> - * GGCDb: - made connection detail fields protected instead of public since other - packages have no business reading things like password and username - - used constants for loadStatus to make code more readable and future - changes easier - -2006-12-15 Reinhold Rumberger <ru...@us...> - * InitDb, NutritionImport: prevent probably buggy code from being reached - * StatisticInfoPanel: - renamed to StatisticsInfoPanel - - commented out unnecessary if - * added @Override were it was necessary - * removed unnecessary casts - * DataAccess: replaced calls to deprecated methods - -2006-09-07 Reinhold Rumberger <ru...@us...> - * README: removed first preliminary release target date - * GGC_de.properties: some more translation - -2006-09-05 Reinhold Rumberger <ru...@us...> - * I18nControl: minor changes to the code - -2006-08-09 Reinhold Rumberger <ru...@us...> - * Added new strings to GGC_de - * Some general cleanup and java 1.5 niceties - -2006-06-09 Reinhold Rumberger <ru...@us...> - * Added new strings to GGC_de, some translation - * Some rewording in GGC_en - -2006-06-08 (v0.2.2.5) Andy Rozman <and...@us...> - * Added saving of Rendering settings - -2006-05-08 (v0.2.2.4) Andy Rozman <and...@us...> - * Printing Dialog for selection of month and year which to print - * Basic installer script, which be used to create deployment file for Windows - (NSIS). Deployment file for linux will be created at later time (as tar.gz - image). - * Printing report internationalized, keywords added to master file (english). - * Slovenian translation for printing added - * Fixed problem with Daily graph display in Daily Stats Dialog - -2006-05-02 (v0.2.2.3) Andy Rozman <and...@us...> - * MonthlyValues changed to work for simple PDF reports - * Create Simple PDF Reports (works with hardcoded values so far) - we can print only 2006 month 4, and times settings for meals are - hardcoded. Dialog to select date is not ready and times settings - must be done in config (in next release). - -2006-04-28 (v0.2.2.2) Andy Rozman <and...@us...> - * Meter handling. There are new files added for meter handling. I plan to add - support for some of meters in future, and I will change way how to get data. - Old will be used same way as now, but new ones will use new dialog and new - interfaces. - * moved ggc.errors to ggc.data.errors - * moved ggc.event to ggc.data.event - * moved ggc.print to ggc.data.print and renamed and added one file (for simple - and extended printing) - * moved ggc.nutrition to ggc.gui.nutrition - - -2006-04-27 (v0.2.2.1) Andy Rozman <and...@us...> - * moved ggc.datamodels to ggc.data - * moved GGCDb and GGCDbLoader to ggc.db (from ggc.db.datalayer) - * changes to configuration (Colors) - * start working on printing (added PrintingDialog, MonthlyValues) - * looking at meter import tool, trying to fix all exception that are thrown - if no meter present - -2006-04-26 Reinhold Rumberger <ru...@us...> - * README: some spellchecking and rewording - -2006-04-25 (v0.2.1.13) Andy Rozman <and...@us...> - * Removal of DatabaseHandler and HibernateHandler. All classes were changed to - use Db directly trhorugh DataAccess static class - * Fixing of GGCLittle to use new database schema (Hibernate) - * Visual changes to GGCLittle - * Fixed add, editing, deleting and graph display, from functional point of view - GGCLittle is working, but from visual point of view, there is still work to - do (about, meter import, add/edit should be centered). - -2006-04-23 Andy Rozman <and...@us...> - * update of slovene language file - * some of translation done - -2006-04-23 Reinhold Rumberger <ru...@us...> - * GGC_de.properties: - - merged in changes from GGC_en.properties - - sorted in alphabetical order - * moved ggcl.jar form the build directory to the binary directory in ant build task "jar_l" - * more translation... - * GGC_en.properties: removed superfluous "MEALS" - -2006-04-19 Andy Rozman <and...@us...> - * changes to README file - * added two tasks into ant: style_devel, style_deploy, which are used for - style checks (checkstyle-all-4.1.jar needed in lib/devel) - * fixed a lot of code so that is conformant with programming style guide - * updated ggc_db_nutr.zip and test_nutrition.zip with new versions of database - and config files, so that they now also contain config (which is almost finished) - -2006-04-18 (v0.2.1.12) Andy Rozman <and...@us...> - * Color schemes changed, we reference colorscheme by name and not by id. - -2006-04-15 Reinhold Rumberger <ru...@us...> - * had to merge in some conflicts in DataAccess.java; hope I made no mistakes. - It compiles so I can't have broken too much... - * GGC_de.properties: merged in changes from GGC_en.properties - * added NO_DATABASE_FOUND to GGC_en.properties - * README: changed "CVS" to "SVN" - * added run.sh, the bash equivalent of run.cmd -- Note: some classpaths seem to be missing - -2006-04-15 (v0.2.1.11) Andy Rozman <and...@us...> - * fixed Statistics (BG / Insulin) and Hba1c display - * fixed AbstractGraphView problem - * fixed display of daily graphs in day stats - * fixed control panels of daily graph (date selector was displayed very ugly, and - 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 - 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. - * fixed AbstractGraphView - * added methods for set to GGCProperties (for insulins, bg's and general data) - * PropertiesDialog fixed save/apply and cancel - * medical data added new configuration stuff (bg unit, settings for both bg units) and - fixed saving - -2006-04-13 (v0.2.1.9) Andy Rozman <and...@us...> - * continuing work on config in db - * loading of selected language (from config file) - * general setting of properties are working - -2006-04-11 (v0.2.1.8) Andy Rozman <and...@us...> - * added I18nCheck tool to help translators by translation (they display keywords - not available in language file) - * started removing config file. All settings will be stored in database, except database - settings and language settings - * changed GGCProperties, and changed all callings of this class to DataAccess where - GGCProperties is instantiated. - -2006-04-10 (v0.2.1.7) Andy Rozman <and...@us...> - * moved ggc.view.* to ggc.gui.view.* - * Renamed and made as JDialog: CourseGraphFrame, DailyGraphFrame, FrequenceGraphFrame, - SpreadGraphFrame, and fixed. - -2006-04-10 (v0.2.1.6) Andy Rozman <and...@us...> - * Some bug fixes in Graphs. Now graphs are displayed. This code is not finished - yet, but it's now usable without getting any exceptions. - * Configuration of meters now displays meters correctly - * Added Time calculation methods in DataAccess (we got wrong time as - GregorianCalendar and database returned nothing). - -2006-04-10 Reinhold Rumberger <ru...@us...> - * new function getDisplayedBG() in DataAccess, not used yet - -2006-04-08 Reinhold Rumberger <ru...@us...> - * started changing AbstractGraphView to make selection of BG unit type possible - * added unit to BG axis in DailyGraphView, couldn't do others as I can't access them - * DataAccess: "public static void" inf field should've been "public static final" - * corrected html in GGC_en.properties and added articles - * some more translation in GGC_de.properties - * ggc.little.DailyStatsPanel: made changes neccessary due to the deletion of AddRowFrame - * added inherited abstract methods to DummyHandler, they return empty objects - * MainFrame: made version info final, major formatting changes, as my tab width (4 spaces) - and the obviously used tab width (8 spaces) just didn't mix - * changes ... [truncated message content] |
From: <and...@us...> - 2016-12-25 17:58:02
|
Revision: 1437 http://sourceforge.net/p/ggc/code/1437 Author: andyrozman Date: 2016-12-25 17:58:00 +0000 (Sun, 25 Dec 2016) Log Message: ----------- GGC Pumps - move files Modified Paths: -------------- 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/pen/DailyRowDialog.java Added Paths: ----------- trunk/ggc-desktop-app/ggc-desktop/src/main/java/ggc/ Modified: trunk/ggc-desktop-app/ggc-desktop/src/main/java/ggc/gui/dialogs/doctor/appointment/AppointmentListDef.java =================================================================== --- trunk/ggc-desktop/src/ggc/gui/dialogs/doctor/appointment/AppointmentListDef.java 2016-12-25 17:14:28 UTC (rev 1431) +++ trunk/ggc-desktop-app/ggc-desktop/src/main/java/ggc/gui/dialogs/doctor/appointment/AppointmentListDef.java 2016-12-25 17:58:00 UTC (rev 1437) @@ -307,7 +307,7 @@ // // List<DoctorH> list = new ArrayList<DoctorH>(); // - // if (ic.getMessage("FILTER_ACTIVE").equals(filterComboText)) + // if (i18nControl.getMessage("FILTER_ACTIVE").equals(filterComboText)) // { // int today = (int) ATechDate.getATDateTimeFromGC(new // GregorianCalendar(), ATechDateType.DateOnly); @@ -321,7 +321,8 @@ // } // } // } - // else if (ic.getMessage("FILTER_INACTIVE").equals(filterComboText)) + // else if + // (i18nControl.getMessage("FILTER_INACTIVE").equals(filterComboText)) // { // int today = (int) ATechDate.getATDateTimeFromGC(new // GregorianCalendar(), ATechDateType.DateOnly); Modified: trunk/ggc-desktop-app/ggc-desktop/src/main/java/ggc/gui/pen/DailyRowDialog.java =================================================================== --- trunk/ggc-desktop/src/ggc/gui/pen/DailyRowDialog.java 2016-12-25 17:14:28 UTC (rev 1431) +++ trunk/ggc-desktop-app/ggc-desktop/src/main/java/ggc/gui/pen/DailyRowDialog.java 2016-12-25 17:58:00 UTC (rev 1437) @@ -22,7 +22,7 @@ import ggc.core.data.Converter_mgdL_mmolL; import ggc.core.data.DailyValues; import ggc.core.data.DailyValuesRow; -import ggc.core.data.ExtendedDailyValueHandler; +import ggc.core.data.ExtendedDailyValueType; import ggc.core.data.cfg.ConfigurationManagerWrapper; import ggc.core.data.defs.GlucoseUnitType; import ggc.core.plugins.GGCPluginType; @@ -247,7 +247,7 @@ if (this.table_ins_pos.containsKey(1)) { val = this.m_dailyValuesRow.getIns1() + 0.1f * m_da.getFloatValueFromString( - this.m_dailyValuesRow.getExtendedValue(ExtendedDailyValueHandler.EXTENDED_DECIMAL_PART_INS1), 0.0f); + this.m_dailyValuesRow.getExtendedValue(ExtendedDailyValueType.DecimalPartInsulin1), 0.0f); this.spinner_arr[this.table_ins_pos.get(1)].setValue(val); // this.spinner_arr[0].setValue(val); //new Integer((int) // this.m_dailyValuesRow.getIns1())); @@ -256,7 +256,7 @@ if (this.table_ins_pos.containsKey(2)) { val = this.m_dailyValuesRow.getIns2() + 0.1f * m_da.getFloatValueFromString( - this.m_dailyValuesRow.getExtendedValue(ExtendedDailyValueHandler.EXTENDED_DECIMAL_PART_INS2), 0.0f); + this.m_dailyValuesRow.getExtendedValue(ExtendedDailyValueType.DecimalPartInsulin2), 0.0f); this.spinner_arr[this.table_ins_pos.get(2)].setValue(val); // new // Integer((int) // this.m_dailyValuesRow.getIns2())); @@ -742,7 +742,7 @@ this.m_dailyValuesRow.setActivity(ActField.getText()); this.m_dailyValuesRow.setUrine(UrineField.getText()); this.m_dailyValuesRow.setComment(CommentField.getText()); - this.m_dailyValuesRow.createExtended(); + this.m_dailyValuesRow.createExtendedString(); if (this.m_add_action) { @@ -824,8 +824,7 @@ this.m_dailyValuesRow.setIns1(v_i); if (v_d > 0) { - this.m_dailyValuesRow.setExtendedValue(ExtendedDailyValueHandler.EXTENDED_DECIMAL_PART_INS1, - "" + v_d, true); + this.m_dailyValuesRow.setExtendedValue(ExtendedDailyValueType.DecimalPartInsulin1, "" + v_d, true); } } else if (ins_num == 2) @@ -833,8 +832,7 @@ this.m_dailyValuesRow.setIns2(v_i); if (v_d > 0) { - this.m_dailyValuesRow.setExtendedValue(ExtendedDailyValueHandler.EXTENDED_DECIMAL_PART_INS2, - "" + v_d, true); + this.m_dailyValuesRow.setExtendedValue(ExtendedDailyValueType.DecimalPartInsulin2, "" + v_d, true); } } else if (ins_num == 3) @@ -998,7 +996,7 @@ // val); float v_2 = m_da.getBGConverter().getValueByType(Converter_mgdL_mmolL.UNIT_mg_dL, Converter_mgdL_mmolL.UNIT_mmol_L, val); - // this.ftf_bg2.setValue(new Float(v_2)); + // this.ftf_bg2.setValue(new Float(v_2)); // System.out.println("focus lost: bg1 (spinner[4]). mmol/L: " + // v_2); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <and...@us...> - 2016-12-25 17:56:01
|
Revision: 1436 http://sourceforge.net/p/ggc/code/1436 Author: andyrozman Date: 2016-12-25 17:55:57 +0000 (Sun, 25 Dec 2016) Log Message: ----------- GGC Desktop - create project Modified Paths: -------------- trunk/ggc-desktop/build/build.xml trunk/ggc-desktop/doc/GGC_Supported_Hardware.html trunk/ggc-desktop/doc/HardwareLibraries.txt trunk/ggc-desktop/doc/TO-DO Detailed.txt trunk/ggc-desktop/doc/TO-DO.txt trunk/ggc-desktop/doc/TO-DO_Hardware.txt trunk/ggc-desktop/doc/database_info.txt trunk/ggc-desktop/pom.xml Added Paths: ----------- trunk/ggc-desktop/data/DbTool_Config.properties_default trunk/ggc-desktop/data/lang/DbTool_Languages.properties trunk/ggc-desktop/doc/archive/ trunk/ggc-desktop/doc/archive/Changelog_old trunk/ggc-desktop/doc/archive/How_Can_I_Help_v1.txt trunk/ggc-desktop/doc/archive/How_Can_I_Help_v2.txt trunk/ggc-desktop/doc/archive/README_1st trunk/ggc-desktop/doc/archive/README_1st.de trunk/ggc-desktop/doc/archive/README_1st.si trunk/ggc-desktop/doc/archive/TO-DO_Archive.txt trunk/ggc-desktop/doc/usb/ trunk/ggc-desktop/doc/usb/USB-How-To.txt trunk/ggc-desktop/doc/usb/USB-How-To_de.txt trunk/ggc-desktop/doc/usb/USB-How-To_si.txt trunk/ggc-desktop-app/ggc-desktop/src/main/resources/StartupConfig.properties trunk/ggc-desktop-app/ggc-desktop/src/main/resources/icons/ trunk/ggc-desktop-app/ggc-desktop/src/main/resources/log4j.properties Removed Paths: ------------- trunk/ggc-desktop/doc/Changelog_old trunk/ggc-desktop/doc/README_1st trunk/ggc-desktop/doc/README_1st.de trunk/ggc-desktop/doc/README_1st.si trunk/ggc-desktop/doc/USB-How-To.txt trunk/ggc-desktop/doc/USB-How-To_de.txt trunk/ggc-desktop/doc/USB-How-To_si.txt trunk/ggc-desktop/doc/old_docs/ trunk/ggc-desktop/src/StartupConfig.properties trunk/ggc-desktop/src/ggc/ trunk/ggc-desktop/src/icons/ trunk/ggc-desktop/src/log4j.properties Modified: trunk/ggc-desktop/build/build.xml =================================================================== --- trunk/ggc-desktop/build/build.xml 2016-12-25 17:53:59 UTC (rev 1435) +++ trunk/ggc-desktop/build/build.xml 2016-12-25 17:55:57 UTC (rev 1436) @@ -6,9 +6,9 @@ <!-- Environment properties read from a file ...--> <property file="../../build/AtechTools.properties"/> - <property file="../../ggc-core/build/GGCBuild.properties"/> + <property file="../../ggc-core-app/ggc-core/build/GGCBuild.properties"/> <property file="./GGC_Desktop_Version.properties"/> - <property file="../../ggc-core/build/GGC_Core_Version.properties"/> + <property file="../../ggc-core-app/ggc-core/build/GGC_Core_Version.properties"/> <!-- These should *not* be modified on the command line! --> @@ -58,7 +58,7 @@ </copy> <mkdir dir="${build.dir}/icons" /> <copy todir="${build.dir}/icons" overwrite="true"> - <fileset dir="${source.dir}/icons" casesensitive="no"> + <fileset dir="../../ggc-desktop-app/ggc-desktop/src/main/resources/icons" casesensitive="no"> <include name="**/*.gif"/> <include name="**/*.jpg"/> <include name="**/*.png"/> Copied: trunk/ggc-desktop/data/DbTool_Config.properties_default (from rev 1392, trunk/ggc-desktop/data/GGC_Config.properties_default) =================================================================== --- trunk/ggc-desktop/data/DbTool_Config.properties_default (rev 0) +++ trunk/ggc-desktop/data/DbTool_Config.properties_default 2016-12-25 17:55:57 UTC (rev 1436) @@ -0,0 +1,88 @@ +# +# GGC_Config (Settings for GGC) +#31.7.2010 13:11:37 +# +# 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 Copied: trunk/ggc-desktop/data/lang/DbTool_Languages.properties (from rev 1392, trunk/ggc-desktop/data/lang/GGC_Languages.properties) =================================================================== --- trunk/ggc-desktop/data/lang/DbTool_Languages.properties (rev 0) +++ trunk/ggc-desktop/data/lang/DbTool_Languages.properties 2016-12-25 17:55:57 UTC (rev 1436) @@ -0,0 +1,71 @@ +# +# DbTool Languages +# +# Don't edit by hand +# + + + +VERSION=0.1 +AVAILABLE_LANGUAGES=1 +AVAILABLE_LANGUAGES_WITH_HELP=0 +LANGPACK_DATE=26/11/2016 12:00 +LANGUAGE_ROOT=DbTool +DEFAULT_HELP=en + + +# +# Language 1 - English (English) +# +LANG_1=en +LANG_1_NAME=English +LANG_1_HELP_AVAILABLE=No +LANG_1_HELP=No +LANG_1_FILE=DbTool_en.properties +LANG_1_LOCALE=en +LANG_1_LOCALE_COUNTRY= +LANG_1_LOCALE_ISO= + + + + +# +# Language 2 - Slovene (Slovenski) +# + +LANG_2=si +LANG_2_NAME=Slovenski +LANG_2_HELP_AVAILABLE=Yes +LANG_2_HELP=Yes +LANG_2_LOCALE=si +LANG_2_LOCALE_COUNTRY= +LANG_2_LOCALE_ISO= + + + +# +# Language 3 - German (Deutsch) +# +LANG_3=de +LANG_3_NAME=Deutsch +LANG_3_HELP_AVAILABLE=No +LANG_3_HELP=Yes +LANG_3_LOCALE=de +LANG_3_LOCALE_COUNTRY= +LANG_3_LOCALE_ISO= + + +# +# Language 4 - French +# +LANG_4=fr +LANG_4_NAME=French +LANG_4_HELP_AVAILABLE=No +LANG_4_HELP=Yes +LANG_4_LOCALE=fr +LANG_4_LOCALE_COUNTRY= +LANG_4_LOCALE_ISO= + + + + Deleted: trunk/ggc-desktop/doc/Changelog_old =================================================================== --- trunk/ggc-desktop/doc/Changelog_old 2016-12-25 17:53:59 UTC (rev 1435) +++ trunk/ggc-desktop/doc/Changelog_old 2016-12-25 17:55:57 UTC (rev 1436) @@ -1,900 +0,0 @@ - -Changelog file for GGC (GNU Gluco Control) -========================================== - -Newer entries are on top, older on bottom. - --------------------------------------------------------------------------------------------------- - -0.4.4 - * Meter Tool data is now added also into database for pump - -0.4.3 (16.3) - * Dynamic loading of data finished - * Startup tools changed - - -0.4.2 - * Continue work on dynamic loading of Nutrition data - * Dynamic loading now works for printing - -0.4.1.2 (28.2.2009) - * Correct dates are now printed in Food Menu reports - -0.4.1.1 (17.2.2009) - * All printing now uses abstract core file - * All printing is now done to \data\print - * All printing jobs create real names now, with real data in name (AT) - * Started work on dynamic loading of Nutrition data - -0.4.1 - * Bug fixing HbA1c graph display - * Printing files problem - -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) 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) 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.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.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.2008) Andy Rozman <and...@us...> - * integrating new graph framework (ATGraphFramework) - * implementation of HbA1c view for ATGraphFramework - * implementation of Daily view for ATGraphFramework - * ATech Tools Requirement: v0.2.10 - -0.3.10 - * adding comments - * changed main view of application - -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 nutrition db, changed - meals definitions), Meter (meter companies, meters, meter interface (for import), meter - implementations), Inet stuff (inet group, inet links, ...) - * Some file rename in ggc.db.datalayer - * Loading and init of Nutrition database changed - * Added User Nutrition Database - * Display USDB Nutrition Database - * Changed menus: restructuring, added entries: Stocks, Doctors, Appointments, Database Maintainance, - User Nutrition Database, Meter List (added are items, not functionality). - * Meter Management will be done in Database. We will try to have database filled with all different - meters available arround, those that are supported by GGC will have some other entries, so - that user has overview over most available meters. (so far list has 34 meters, only 3 are supported - to be read by application, another 7 are in the works (Ascensia) and will be available in 0.4 version - (End of 2007) - - -2006-03-21 (v0.2.4.2) Reinhold Rumberger <ru...@us...> - * german translation - * several bugs in BUGS.txt - * fixed bug in displaying graphs' y-axis labels - -2006-03-13 Reinhold Rumberger <ru...@us...> - * updated german translation - -2006-03-11 (v0.2.4.1) Andy Rozman <and...@us...> - * Color scheme settings - * Configuration work finished - probably - -2006-03-10 (v0.2.3.1) Andy Rozman <and...@us...> - * Loading L&F at startup - * Changing some debug information for Db - -2006-03-06 (v0.2.2.10 - 8) Andy Rozman <and...@us...> - * Configuration save fixed - * General settings - o Setting Db - o Setting Look and Feel (and saving info to configuration file) - -2006-01-24 Reinhold Rumberger <ru...@us...> - * made path to javax.comm.properties in DataAccess system-independant - -2006-01-23 (v0.2.2.7) Andy Rozman <and...@us...> - * New configuration tables are now used (old databases won't work anymore) - * Fixing of configuration stuff: - o Meter Configuration fixed - -2006-01-21 Reinhold Rumberger <ru...@us...> - * build.xml: ggc_l might now work again - * translation - -2006-01-05 Reinhold Rumberger <ru...@us...> - * make run.sh work - -2006-01-03 Reinhold Rumberger <ru...@us...> - * new idea in IDEAS - -2006-12-27 (v0.2.2.6) Andy Rozman <and...@us...> - * DailyRowDialog is replaced with older version, since new version is not working - yet - * Added new code for supporting meters - * Added new dialog for meters - * Meters support is in early testing phase, old meters code is disabled for now - -2006-12-26 Reinhold Rumberger <ru...@us...> - * GGCDb: - made connection detail fields protected instead of public since other - packages have no business reading things like password and username - - used constants for loadStatus to make code more readable and future - changes easier - -2006-12-15 Reinhold Rumberger <ru...@us...> - * InitDb, NutritionImport: prevent probably buggy code from being reached - * StatisticInfoPanel: - renamed to StatisticsInfoPanel - - commented out unnecessary if - * added @Override were it was necessary - * removed unnecessary casts - * DataAccess: replaced calls to deprecated methods - -2006-09-07 Reinhold Rumberger <ru...@us...> - * README: removed first preliminary release target date - * GGC_de.properties: some more translation - -2006-09-05 Reinhold Rumberger <ru...@us...> - * I18nControl: minor changes to the code - -2006-08-09 Reinhold Rumberger <ru...@us...> - * Added new strings to GGC_de - * Some general cleanup and java 1.5 niceties - -2006-06-09 Reinhold Rumberger <ru...@us...> - * Added new strings to GGC_de, some translation - * Some rewording in GGC_en - -2006-06-08 (v0.2.2.5) Andy Rozman <and...@us...> - * Added saving of Rendering settings - -2006-05-08 (v0.2.2.4) Andy Rozman <and...@us...> - * Printing Dialog for selection of month and year which to print - * Basic installer script, which be used to create deployment file for Windows - (NSIS). Deployment file for linux will be created at later time (as tar.gz - image). - * Printing report internationalized, keywords added to master file (english). - * Slovenian translation for printing added - * Fixed problem with Daily graph display in Daily Stats Dialog - -2006-05-02 (v0.2.2.3) Andy Rozman <and...@us...> - * MonthlyValues changed to work for simple PDF reports - * Create Simple PDF Reports (works with hardcoded values so far) - we can print only 2006 month 4, and times settings for meals are - hardcoded. Dialog to select date is not ready and times settings - must be done in config (in next release). - -2006-04-28 (v0.2.2.2) Andy Rozman <and...@us...> - * Meter handling. There are new files added for meter handling. I plan to add - support for some of meters in future, and I will change way how to get data. - Old will be used same way as now, but new ones will use new dialog and new - interfaces. - * moved ggc.errors to ggc.data.errors - * moved ggc.event to ggc.data.event - * moved ggc.print to ggc.data.print and renamed and added one file (for simple - and extended printing) - * moved ggc.nutrition to ggc.gui.nutrition - - -2006-04-27 (v0.2.2.1) Andy Rozman <and...@us...> - * moved ggc.datamodels to ggc.data - * moved GGCDb and GGCDbLoader to ggc.db (from ggc.db.datalayer) - * changes to configuration (Colors) - * start working on printing (added PrintingDialog, MonthlyValues) - * looking at meter import tool, trying to fix all exception that are thrown - if no meter present - -2006-04-26 Reinhold Rumberger <ru...@us...> - * README: some spellchecking and rewording - -2006-04-25 (v0.2.1.13) Andy Rozman <and...@us...> - * Removal of DatabaseHandler and HibernateHandler. All classes were changed to - use Db directly trhorugh DataAccess static class - * Fixing of GGCLittle to use new database schema (Hibernate) - * Visual changes to GGCLittle - * Fixed add, editing, deleting and graph display, from functional point of view - GGCLittle is working, but from visual point of view, there is still work to - do (about, meter import, add/edit should be centered). - -2006-04-23 Andy Rozman <and...@us...> - * update of slovene language file - * some of translation done - -2006-04-23 Reinhold Rumberger <ru...@us...> - * GGC_de.properties: - - merged in changes from GGC_en.properties - - sorted in alphabetical order - * moved ggcl.jar form the build directory to the binary directory in ant build task "jar_l" - * more translation... - * GGC_en.properties: removed superfluous "MEALS" - -2006-04-19 Andy Rozman <and...@us...> - * changes to README file - * added two tasks into ant: style_devel, style_deploy, which are used for - style checks (checkstyle-all-4.1.jar needed in lib/devel) - * fixed a lot of code so that is conformant with programming style guide - * updated ggc_db_nutr.zip and test_nutrition.zip with new versions of database - and config files, so that they now also contain config (which is almost finished) - -2006-04-18 (v0.2.1.12) Andy Rozman <and...@us...> - * Color schemes changed, we reference colorscheme by name and not by id. - -2006-04-15 Reinhold Rumberger <ru...@us...> - * had to merge in some conflicts in DataAccess.java; hope I made no mistakes. - It compiles so I can't have broken too much... - * GGC_de.properties: merged in changes from GGC_en.properties - * added NO_DATABASE_FOUND to GGC_en.properties - * README: changed "CVS" to "SVN" - * added run.sh, the bash equivalent of run.cmd -- Note: some classpaths seem to be missing - -2006-04-15 (v0.2.1.11) Andy Rozman <and...@us...> - * fixed Statistics (BG / Insulin) and Hba1c display - * fixed AbstractGraphView problem - * fixed display of daily graphs in day stats - * fixed control panels of daily graph (date selector was displayed very ugly, and - 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 - 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. - * fixed AbstractGraphView - * added methods for set to GGCProperties (for insulins, bg's and general data) - * PropertiesDialog fixed save/apply and cancel - * medical data added new configuration stuff (bg unit, settings for both bg units) and - fixed saving - -2006-04-13 (v0.2.1.9) Andy Rozman <and...@us...> - * continuing work on config in db - * loading of selected language (from config file) - * general setting of properties are working - -2006-04-11 (v0.2.1.8) Andy Rozman <and...@us...> - * added I18nCheck tool to help translators by translation (they display keywords - not available in language file) - * started removing config file. All settings will be stored in database, except database - settings and language settings - * changed GGCProperties, and changed all callings of this class to DataAccess where - GGCProperties is instantiated. - -2006-04-10 (v0.2.1.7) Andy Rozman <and...@us...> - * moved ggc.view.* to ggc.gui.view.* - * Renamed and made as JDialog: CourseGraphFrame, DailyGraphFrame, FrequenceGraphFrame, - SpreadGraphFrame, and fixed. - -2006-04-10 (v0.2.1.6) Andy Rozman <and...@us...> - * Some bug fixes in Graphs. Now graphs are displayed. This code is not finished - yet, but it's now usable without getting any exceptions. - * Configuration of meters now displays meters correctly - * Added Time calculation methods in DataAccess (we got wrong time as - GregorianCalendar and database returned nothing). - -2006-04-10 Reinhold Rumberger <ru...@us...> - * new function getDisplayedBG() in DataAccess, not used yet - -2006-04-08 Reinhold Rumberger <ru...@us...> - * started changing AbstractGraphView to make selection of BG unit type possible - * added unit to BG axis in DailyGraphView, couldn't do others as I can't access them - * DataAccess: "public static void" inf field should've been "public static final" - * corrected html in GGC_en.properties and added articles - * some more translation in GGC_de.properties - * ggc.little.DailyStatsPanel: made changes neccessary due to the deletion of AddRowFrame - * added inherited abstract methods to DummyHandler, they return empty objects - * MainFrame: made version info final, major formatting changes, as my tab width (4 spaces) - and the obviously used tab width (8 spaces) just didn't mix - * changes '-' to '*' in TO-DO.txt to make diff reading easier - * added IDEAS - -2006-04-07 (v0.2.1.3-v0.2.1.5) Andy Rozman <and...@us...> - * Changes to DailyValues, DailyValuesRow (set methods) - * Added Weekly values (problem when reading a range of days from database) - * Fixed statistics - * Changed DatePanels (names), day, month, year - * Minor fixes in Properties (removed database contexts, fixed setting of COMs) - * Fixes in loading of database, daydata and weekdata are made static, so that we - don't need to make so much calls to database - * Using DailyRowDailog for adding data - * Using DailyRowDailog for editing existing data - * Added and fixed strings in GGC_en - * Deleted AddRowFrame and EditRowFrame - * Fixes over code against changes of DatePanel - * More extensive use of DataAccess class (static data instances) - * Added MeterManager class, which has definitions of all available meters, which - was stored in configuration - * Display meters in Configuration - -2006-04-07 Reinhold Rumberger <ru...@us...> - * moved ggc.db_tool to ggc.db.db_tool, as per package entries in the files in ggc.db_tool - * merged changes from GGC_en.properties into GGC_de.properties - -2006-04-05 Reinhold Rumberger <ru...@us...> - * Some more translation in GGC_de.properties - * added NUTRITION, ..., NO_LOCAL_DATA_AVAILABLE to GGC_de.properties, would - appreciate their addition to GGC_en.properties - * Added error message if host unavailable for update checking - (HOST_UNAVAILABLE_INFO, HOST_UNAVAILABLE_MSG) - * ggc.util.VersionChecker.isNewVersion: - - made variable names more intuitive assuming the code is correct ;-P - - added javadoc comment for that method - * build/build.xml: translation files don't have to be specified individually anymore - -2006-04-04 (v0.2.1.2) Andy Rozman <and...@us...> - * DailyStatsFrame was moved and renamed to dialogs.DailyStatsDialog - * Adding DailyRowDailog for editing and later adding rows - * Fixed ggc.gui.calendar.dayPanel to be displayed correctly - -2006-03-25 (v0.2.1) Andy Rozman <and...@us...> - * Changed MainFrame (Status, Added menus for future features (meals, nutrition, pdf reports) - * Added loading of Hibernate (in seperate thread) and show loading in MainFrame - * More usage of DataAccess class, added several functions - * Add daily values tables in hibernate - * Added doctors, doctorType and appointments tables in hibernate - * Implemented methods and classes for working with daily values in Hibernate - * Removed all database support except hibernate - * Changed DailyValues and DailyValuesRow - * Changed StatisticValues and command for getting data over several days - * Added Nutrition Dialog start to GGC Main (Nutrition Dialog not completed yet) - * Added some entries to GGC_en.properties - * Fixed build.xml - -2006-03-11 Reinhold Rumberger <ru...@us...> - * ggc.util.I18nControl: - - made private static final Locale defaultLocale and set it to Locale.ENGLISH - - set Locale.defaultLocale() to defaultLocale; this will make ResourceBundle look - here for entries it can't find in the current locale and look at this locale if - the required locale couldn't be found - * ggc.util.GGCPropertiesHelper: made some Strings final - * renamed GGC_XX.properties to GGC_xx.properties - * ggc.db.TextFileHandler: see XXX comments - * fixes: fixed some exceptions - * GGC_en.properties: - added TIME_MUST_BE_IN_FORMAT, DE, EN, SI, YOUR_LANGUAGE, INIT - removed YOUR_CURRENT - * GGC_de.properties: translation continues - * corrected incorrect error message about date format being incorrect when really - time format was meant and squashed an exception thrown when this occurred - * ggc.util.GGCProperties: data.imports.* changed to ggc.data.imports.* - * BUG: data import from meter throws a ClassCastException in - javax.swing.AbstractButton.configurePropertiesFromAction on line 1117 (attempted - cast to Integer, I'm too unfamiliar with the Actions used here to be able to - further debug anything) - * BUG: Daily stats -> add row -> change day -> add some values in the add row frame - ..-> new entry -> NO error, exception or anything wrong looking -> change back to - ..original day: no new entries, either here or anywhere else - * added language selection to prefPane; implementation is rather hackish and a - restart is required if this setting is changed; the main problem with this - implementation is an endless loop because the constructor of GGCProperties - depends on I18nControl - -2006-03-11 Andy Rozman <and...@us...> - * Moved ANT build files to build directory and removed all those in root - * ARCHITECTURE CHANGE: I added Hibernate (v3.1) framework to ggc (download in support as - hibernate3.zip). For now hibernate is used just for nutrition part, but after I - finish nutrition and meals, I will change all other code, to use hibernate. With - this we will remove several files needed for talking to different database. - Hibernate is object relational database framework, which can talk to almost any - database without any change to our code. - * Finished nutrition import - * Added hibernate data classes, datalayer classes and main GGCDb class which handle - hibernate database. With this we have database support for nutrition module. - * Added classes for working with nutrition. Tree dialog is finished, also TreeModel, - but I still need to change panels that display info on selected tree item. This - code is now available, but is so far not added to ggc. For testing this you must - set an external database, get jdbc driver for it, set user, password and empty - database, then write this settings to GGC_Config.properties under database 1 (or - you can add one for yourself and set SELECTED_DB value). After you have all this - you can unpack test_nutrition.zip to your build directory (where all compiled - classes go), then you take USDA_Nutrient_Db_for_Standard_Reference_r18.zip from - ggc-support cvs tree and unpack it to ../data/nutrition (from your build directory). - First you run nut_init for initialization of database and it's filling and then - you can use nut_tree to see nutrition tree. - * Fixed comments in ggc.little package - -2006-03-10 Reinhold Rumberger <ru...@us...> - * ggc.util.GGCPropertiesHelper: method read(): made error message in case of - IOException a bit more verbose - * GGC_DE.properties: more translation - -2006-03-05 Reinhold Rumberger <ru...@us...> - * OK, figured out problem with compiling ggc.little.DailyStatsPanel: this seems to - require java 1.5 - * ggc.util.GGCPropertiesHelper: undid a change to the data dir path that was supposed - to be local but forgotten - * looks like eclipse committed my .classpath and .cvsignore, trying to fix - -2006-03-04 Reinhold Rumberger <ru...@us...> - * GGC_DE.properties: some more work on the translation - * GGC_EN.properties: some spellchecking, no version or date changes since - this doesn't really imply that other translations need to be adopted - * ggc.util.I18nControl: - - moved header to the top - - made EN the fallback default locale, as english is the master language file - * ggc.gui.main.MainFrame: - - hardcoded skin location in a field at the top of the file instead of somewhere - in the code, to make this a tiny little bit more flexible - - changed the path in accordance with cvs repository layout - * ggc.util.GGCPropertiesHelper: pretty much same as above for data directory and - config file location - * MANIFEST.MF: I think this meant ggc.GGC, not just ggc (in Main-Class) - * ggc.little.LittleInfoPanel: had wrong package declaration - * ggc.little.DailyStatsPanel: doesn't seem to compile here (see "// XXX:" comment) - * PROBLEM: There suddenly are some mysterious "org.apache.commons" and "org.hibernate" - imports I can't seem to resolve - -2006-03-01 Reinhold Rumberger <ru...@us...> - * ggc.data.imports.*: a char -> int cast is unnecessary, deleted them. - * ggc.view.CourseGraphView: same for int -> float casts - If those casts were there for a reason, please feel free to re-insert - them and tell me how stupid I am :-P - * randomly scattered throughout the project, hopefully not creating too - many conflicts: - - optimized import section (<Shift> - <O> in eclipse) - - added several questions (see TODO comments) - * ggc.util.VersionChecker: added two questions, if I forget to start - a discussion, could somebody else, please? - * GGC_DE.properties: Added newest version of my German translation - -2005-06-13 Andy Rozman <and...@us...> (Version 0.0.2) - * fixed some packages - * added also *.gif images, since png and xmp are not always displayed - * added HSQL database - * added internationalization through whole software - -2002-08-29 Dieter Schultschik <sc...@us...> - - * Checking for new version implemented. - * created package ggc. moved everything from src into ggc. - -2002-08-28 Dieter Schultschik <sc...@us...> - - * Stephan has re-written the whole Data-Import. - * Today I merged his changes, and now its in CVS. - * DataSelector now has Spinners. - -2002-08-01 Dieter Schultschik <sc...@us...> - - * Select Meter and SerialPort in preferences. - -2002-07-31 Dieter Schultschik <sc...@us...> - - * Textfile Handler completed. - * some bugfixes. - * Ability to test the MySQL connection from prefs. - -2002-07-30 Dieter Schultschik <sc...@us...> - - * Added option to store data in a textfile. - * lots of small fixes and improvements. - * some stuff doesn't work very smooth at the moment. - (will be fixed in the next days) - -2002-07-29 Dieter Schultschik <sc...@us...> - - * Added a new SpreadView. - * Added a new FrequencyView. - * Added a new HbA1cView. - -2002-07-26 Dieter Schultschik <sc...@us...> - - * Added a new CourseView. (will get more options in the future) - * Many small improvements. - * Added Options to customize colors in the Views. - -2002-07-18 Dieter Schultschik <sc...@us...> - - * Added Icons to ToolBar. - -2002-07-17 Dieter Schultschik <sc...@us...> - - * Better DB Handling (Ability to Connect and Disconnect) - * Added a StatusBar to the Mainframe - -2002-07-16 Dieter Schultschik <sc...@us...> - - * Added sources to sourceforge cvs. - -2002-04-01 Dieter Schultschik <sc...@us...> - - * Starting to work on ggc. - Modified: trunk/ggc-desktop/doc/GGC_Supported_Hardware.html =================================================================== --- trunk/ggc-desktop/doc/GGC_Supported_Hardware.html 2016-12-25 17:53:59 UTC (rev 1435) +++ trunk/ggc-desktop/doc/GGC_Supported_Hardware.html 2016-12-25 17:55:57 UTC (rev 1436) @@ -67,20 +67,11 @@ <td width="10%">Support in GGC</td> <td width="10%">Since GGC Version</td> <td width="10%">Planned Support</td> + <td width="10%">Interface</td> <td width="10%">Developer</td> <td>Comment</td> </tr> - <tr bgcolor="#3cb371"> - <td>Ascensia/Bayer</td> - <td>Contour Link</td> - <td>Level 2</td> - <td>Done</td> - <td>0.3</td> - <td> </td> - <td>Andy</td> - <td> </td> - </tr> <tr bgcolor="#3cb371"> <td>Ascensia/Bayer</td> @@ -95,17 +86,6 @@ <tr bgcolor="#3cb371"> <td>Ascensia/Bayer</td> - <td>Contour Link</td> - <td>Level 2</td> - <td>Done</td> - <td>0.3</td> - <td> </td> - <td>Andy</td> - <td> </td> - </tr> - - <tr bgcolor="#3cb371"> - <td>Ascensia/Bayer</td> <td>Dex2</td> <td>Level 2</td> <td>Done</td> @@ -147,8 +127,20 @@ <td></td> </tr> - <tr bgcolor="#6495ed"> + + <tr bgcolor="#3cb371"> <td>Ascensia/Bayer</td> + <td>Contour Link</td> + <td>Level 2</td> + <td>Done</td> + <td>0.3</td> + <td> </td> + <td>Andy</td> + <td>Just meter readings</td> + </tr> + + <tr bgcolor="#3cb371"> + <td>Ascensia/Bayer</td> <td>Contour USB</td> <td>Level 2</td> <td>Done</td> @@ -158,7 +150,7 @@ <td> </td> </tr> - <tr bgcolor="#6495ed"> + <tr bgcolor="#3cb371"> <td>Ascensia/Bayer</td> <td>Contour Next</td> <td>Level 2</td> @@ -169,7 +161,7 @@ <td> </td> </tr> - <tr bgcolor="#6495ed"> + <tr bgcolor="#3cb371"> <td>Ascensia/Bayer</td> <td>Contour Next USB</td> <td>Level 2</td> @@ -180,7 +172,7 @@ <td> </td> </tr> - <tr bgcolor="#6495ed"> + <tr bgcolor="#3cb371"> <td>Ascensia/Bayer</td> <td>Contour Next Link</td> <td>Level 2</td> @@ -188,7 +180,7 @@ <td>0.6.1</td> <td> </td> <td>Andy</td> - <td> </td> + <td>Just meter readings for now.</td> </tr> <tr bgcolor="#3cb371"> @@ -1033,6 +1025,29 @@ the same, if you have one, you can just make another copy of same file or link)<br> <br> +<br> +<br> +<h3>Appendix C: USB devices with Linux (possibly also Mac)</h3> +<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> +<br> +2. Add rule in /etc/udev/rules.d<br> +Create file 44-ggc-devices.rules and add entry like this:<br> +SUBSYSTEM=="usb", ATTR{idVendor}=="1a79", MODE="0666", GROUP="plugdev"<br> +<br> +You will need to change ATTR{idVendor} to your device company. You can determine your devices company +if you execute command 'lsusb' and looking for your device, you should find it... There will be a list +like this:<br> +<br> +<i>Bus 003 Device 011: ID 1a79:7410 Bayer Health Care LLC Contour Next</i><br> +<br> +In this case 1a79 is company id (idVendor).<br> +<br> +<br> + + </body> </html> \ No newline at end of file Modified: trunk/ggc-desktop/doc/HardwareLibraries.txt =================================================================== --- trunk/ggc-desktop/doc/HardwareLibraries.txt 2016-12-25 17:53:59 UTC (rev 1435) +++ trunk/ggc-desktop/doc/HardwareLibraries.txt 2016-12-25 17:55:57 UTC (rev 1436) @@ -48,7 +48,7 @@ OS: Windows, Linux Own version: Yes Comment: This is old IBM Serial API library used for Bluetooth support for Dana pump. Needs to be replaced, - but at time of implementation, our serial library at that timeRxtx 2.1.7, had problems with BT + but at time of implementation, our serial library at that time Rxtx 2.1.7, had problems with BT devices. Our current NrJavaSerial is actually just extension of RXTX 2.2, so it might actually support this now, but we can't test it at this time (no hardware). Deleted: trunk/ggc-desktop/doc/README_1st =================================================================== --- trunk/ggc-desktop/doc/README_1st 2016-12-25 17:53:59 UTC (rev 1435) +++ trunk/ggc-desktop/doc/README_1st 2016-12-25 17:55:57 UTC (rev 1436) @@ -1,137 +0,0 @@ - -GGC - GNU Gluco Control -======================= - -This are short instructions on how to start the application. - -All java programs need special environment to run, it's called Java Runtime Environment (JRE) or -Java Development Kit (JDK, it contains JRE). On some OSes we can have problems detecting if this -JRE or JDK is installed. Because of this most of software packages, also contain JRE in their -install package (we have one windows install package that also contains JRE). - -For GGC you need to have at least Java 1.5, but 1.6 is preferred. - -Problem is that this JRE is different for each platform (also for each hardware version of platform), -so we need to do some things, to make GGC to run. -You can choose to do one of these things: - -1.) Modify system path to include path to your existing JRE installation. - You can check if this is set if you run following command 'java -version'. If you get - 'file not found' error then this is not set. - -2.) Copy JRE files into jre directory under GGC - Now you have two options here. If you have java already installed on your system (your - browser sometimes install this automatically to handle java applets) you can copy the - files from there. Usually they are under C:\Program Files\Java\jre<version> on windows - and somewhere under /usr/local/java on linux. You need to copy all files under jre<something> - directory to <GGC-Installed>\jre directory. - 2nd option is to download correct VM from 'USB Release' section. This is file that is meant - for installation to USB disks (coming soon). All tested VMs are there, so if you find - VM there you should not have any problems. You need to download VM zip file and extract - certain files. In the archive you will find a directory with the name of the VM (in case of windows, - directory is called Windows) under that directory there is jre_<version><OS-tags> directory. - Copy all files under there into GGC\jre directory. If your OSes VM is not there, then you - will have to use the one installed on system. - -3.) Modify config files - How to modify config files is described in section C.), but please read also through - sections A) and B) - - - -A) How to start software -========================= - -1.) Windows -After install program should run by itself (by clicking on icon), if it doesn't, you will need to -troubleshoot. Run cmd.exe (command line shell, search for icon Command Prompt) and run following -command: run_win.cmd. Error should be written somewhere on screen. -In most cases problem is with java path ('java' is not recognized as an internal or external command, -operable program or batch file). In this case follow instructions under C): 1. - - -2.) Linux -On linux platform you need to issue following command 'sh run_linux.sh'. If application doesn't start -see on screen where the... [truncated message content] |
From: <and...@us...> - 2016-12-25 17:54:01
|
Revision: 1435 http://sourceforge.net/p/ggc/code/1435 Author: andyrozman Date: 2016-12-25 17:53:59 +0000 (Sun, 25 Dec 2016) Log Message: ----------- GGC Desktop - create project Added Paths: ----------- trunk/ggc-desktop-app/ggc-desktop/ trunk/ggc-desktop-app/ggc-desktop/src/ trunk/ggc-desktop-app/ggc-desktop/src/main/ trunk/ggc-desktop-app/ggc-desktop/src/main/java/ trunk/ggc-desktop-app/ggc-desktop/src/main/resources/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <and...@us...> - 2016-12-25 17:38:47
|
Revision: 1434 http://sourceforge.net/p/ggc/code/1434 Author: andyrozman Date: 2016-12-25 17:38:43 +0000 (Sun, 25 Dec 2016) Log Message: ----------- GGC Pumps - move files Modified Paths: -------------- trunk/ggc-plugins/ggc-pump/build/build.xml Added Paths: ----------- trunk/ggc-plugins/ggc-pump/src/main/java/ggc/ trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/ trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/data/ trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/data/PumpDailyStatistics.java trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/data/PumpDataHandler.java trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/data/PumpDataReader.java trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/data/PumpValuesEntry.java trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/data/PumpValuesEntryExt.java trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/data/PumpValuesEntryInterface.java trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/data/PumpValuesEntryProfile.java trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/data/PumpValuesHour.java trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/data/PumpValuesHourProcessor.java trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/data/PumpValuesTableModel.java trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/data/PumpWriterValues.java trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/data/bre/ trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/data/bre/BREData.java trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/data/bre/BREDataCollection.java trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/data/bre/BasalEstimationData.java trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/data/bre/RatioData.java trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/data/cfg/ trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/data/cfg/PumpConfigurationDefinition.java trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/data/defs/ trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/data/defs/PumpAdditionalDataType.java trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/data/defs/PumpAlarms.java trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/data/defs/PumpBasalType.java trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/data/defs/PumpBaseType.java trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/data/defs/PumpBolusType.java trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/data/defs/PumpConfigurationGroup.java trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/data/defs/PumpConfigurationOld.java trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/data/defs/PumpDeviceValueType.java trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/data/defs/PumpErrors.java trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/data/defs/PumpEventType.java trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/data/defs/PumpReport.java trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/data/defs/RatioType.java trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/data/dto/ trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/data/dto/BasalDTO.java trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/data/dto/BasalRatesDayDTO.java trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/data/dto/BasalStatistics.java trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/data/dto/BolusDTO.java trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/data/dto/BolusWizardDTO.java trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/data/dto/RatioDTO.java trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/data/dto/TemporaryBasalRateDTO.java trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/data/graph/ trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/data/graph/GraphViewBasalRateEstimator.java trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/data/graph/GraphViewDailyPump.java trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/data/graph/GraphViewProfileEditor.java trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/data/graph/bre/ trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/data/graph/bre/BREGraphsAbstract.java trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/data/graph/bre/GraphViewBasalRate.java trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/data/graph/bre/GraphViewBasals.java trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/data/graph/bre/GraphViewRatios.java trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/data/graph/bre/Test.java trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/data/graph/v1/ trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/data/graph/v1/GraphV1DbRetrieverPump.java trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/data/graph/writer/ trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/data/profile/ trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/data/profile/Profile.java trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/data/profile/ProfileSubEntry.java trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/data/profile/ProfileSubOther.java trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/data/profile/ProfileSubPattern.java trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/data/util/ trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/data/util/PumpAdditionalDataHandler.java trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/data/util/PumpBasalManager.java trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/data/util/PumpBolusManager.java trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/data/writer/ trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/data/writer/PumpValuesWriter.java trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/data/writer/PumpWriterDefInterface.java trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/db/ trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/db/GGCPumpDb.java trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/db/PumpData.java trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/db/PumpDataExtended.java trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/db/PumpProfile.java trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/defs/ trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/defs/PumpPluginDefinition.java trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/defs/device/ trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/defs/device/PumpDeviceDefinition.java trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/defs/device/PumpDeviceHandler.java trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/defs/device/PumpProfileDefinition.java trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/defs/device/PumpTBRDefinition.java trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/defs/report/ trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/defs/report/PumpReportDefinition.java trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/device/ trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/device/AbstractBlueToothPump.java trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/device/AbstractPump.java trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/device/AbstractSerialPump.java trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/device/AbstractXmlPump.java trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/device/DummyPump.java trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/device/PumpDeviceInstanceWithHandler.java trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/device/PumpInterface.java trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/device/PumpInterfaceV2.java trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/device/accuchek/ trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/device/accuchek/AccuChekCombo.java trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/device/accuchek/AccuChekDTron.java trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/device/accuchek/AccuChekPumpHandler.java trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/device/accuchek/AccuChekPumpReader.java trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/device/accuchek/AccuChekSmartPixPump.java trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/device/accuchek/AccuChekSpirit.java trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/device/accuchek/DisetronicDTron.java trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/device/animas/ trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/device/animas/AnimasIR1200Handler.java trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/device/animas/FRC_EZManager_v2.java trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/device/animas/TODO_animas.txt trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/device/animas/impl/ trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/device/animas/impl/AnimasPumpDeviceReader.java trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/device/animas/impl/converter/ trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/device/animas/impl/converter/AnimasBaseDataV2Converter.java trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/device/animas/impl/data/ trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/device/animas/impl/data/AnimasPumpDeviceData.java trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/device/animas/impl/data/dto/ trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/device/animas/impl/data/dto/BasalLogDay.java trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/device/animas/impl/data/dto/BasalLogEntry.java trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/device/animas/impl/data/dto/BasalProfile.java trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/device/animas/impl/data/dto/BasalProfileEntry.java trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/device/animas/impl/data/dto/BolusEntry.java trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/device/animas/impl/data/dto/BolusExtEntry.java trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/device/animas/impl/data/dto/PumpSettings.java trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/device/animas/impl/data/enums/ trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/device/animas/impl/handler/ trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/device/animas/impl/handler/AnimasBaseDataV2Handler.java trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/device/animas/impl/handler/AnimasPumpDataWriter.java trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/device/dana/ trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/device/dana/DanaDiabecare_II.java trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/device/dana/DanaDiabecare_III_R.java trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/device/dana/DanaDiabecare_IIS.java trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/device/dana/DanaPump.java trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/device/dana/DanaPumpHandler.java trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/device/dana/DanaPumpHandlerV2.java trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/device/dana/PacketStreamReader.java trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/device/dana/impl/ trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/device/dana/impl/DanaDeviceReader.java trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/device/dana/impl/comm/ trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/device/dana/impl/comm/DanaCommProtocolAbstract.java trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/device/dana/impl/comm/DanaCommProtocolNRSV1.java trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/device/dana/impl/comm/DanaCommProtocolV1.java trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/device/dana/impl/data/ trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/device/dana/impl/data/defs/ trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/device/dana/impl/data/defs/DanaDataType.java trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/device/dana/impl/device/ trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/device/deltec/ trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/device/deltec/DeltecCosmo1700.java trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/device/deltec/DeltecCosmo1800.java trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/device/deltec/DeltecPump.java trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/device/deltec/FRC_CoPilotXMLPump.java trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/device/insulet/ trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/device/insulet/FRC_InsuletOmnipod.java trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/device/insulet/InsuletHandler.java trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/device/insulet/InsuletReader.java trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/device/insulet/data/ trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/device/insulet/data/converter/ trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/device/insulet/data/converter/OmnipodConfigConverter.java trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/device/insulet/data/converter/OmnipodConverter.java trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/device/insulet/data/converter/OmnipodDataConverter.java trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/device/insulet/data/dto/ trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/device/insulet/data/dto/AbstractRecord.java trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/device/insulet/data/dto/UnknownRecord.java trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/device/insulet/data/dto/config/ trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/device/insulet/data/dto/config/BasalProgramNames.java trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/device/insulet/data/dto/config/ConfigRecord.java trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/device/insulet/data/dto/config/EepromSettings.java trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/device/insulet/data/dto/config/IbfVersion.java trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/device/insulet/data/dto/config/LogDescription.java trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/device/insulet/data/dto/config/LogDescriptions.java trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/device/insulet/data/dto/config/LogHeader.java trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/device/insulet/data/dto/config/ManufacturingData.java trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/device/insulet/data/dto/config/PdmVersion.java trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/device/insulet/data/dto/config/Profile.java trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/device/insulet/data/dto/config/ProfileHeader.java trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/device/insulet/data/dto/data/ trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/device/insulet/data/dto/data/HistoryRecord.java trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/device/insulet/data/dto/data/LogRecord.java trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/device/insulet/data/dto/data/PumpAlarmRecord.java trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/device/insulet/data/enums/ trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/device/insulet/data/enums/AlarmType.java trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/device/insulet/data/enums/BGFlags.java trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/device/insulet/data/enums/HistoryRecordType.java trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/device/insulet/data/enums/LogType.java trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/device/insulet/data/enums/OmnipodDataType.java trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/device/insulet/data/enums/ProfileType.java trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/device/insulet/insulet_TODO.txt trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/device/insulet/org/ trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/device/insulet/org/Insulet.txt trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/device/insulet/org/insuletDriverDelete.js trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/device/insulet/org/insuletDriverOriginal.js trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/device/insulet/util/ trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/device/insulet/util/InsuletUtil.java trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/device/minimed/ trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/device/minimed/MinimedPumpDeviceHandler.java trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/device/minimed/data/ trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/device/minimed/data/PumpHistoryEntry.java trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/device/minimed/data/converter/ trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/device/minimed/data/converter/Minimed511PumpDataConverter.java trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/device/minimed/data/converter/Minimed512PumpDataConverter.java trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/device/minimed/data/converter/Minimed515PumpDataConverter.java trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/device/minimed/data/converter/Minimed523PumpDataConverter.java trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/device/minimed/data/decoder/ trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/device/minimed/data/decoder/MinimedPumpHistoryDecoder.java trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/device/minimed/data/enums/ trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/device/minimed/data/enums/PumpHistoryEntryType.java trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/device/minimed/file/ trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/device/minimed/file/FRC_MinimedCarelink.java trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/device/minimed/file/FRC_MinimedCarelinkConfig.java trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/device/minimed/file/MinimedCareLinkPump.java trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/device/minimed/file/MinimedCareLinkPumpData.java trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/device/minimed/file/MinimedCareLinkPumpProfile.java trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/device/minimed/handler/ trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/device/minimed/old/ trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/device/minimed/old/MinimedSPM.java trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/device/minimed/old/MinimedSPMData.java trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/device/minimed/old/MinimedSPMPump.java trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/graph/ trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/graph/PumpGraphContext.java trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/graph/PumpGraphDefintion.java trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/gui/ trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/gui/bre/ trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/gui/bre/BasalRateEstimator.java trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/gui/bre/BasalRateEstimatorAlgorithm.java trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/gui/bre/data.txt trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/gui/manual/ trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/gui/manual/PumpDataAdditionalWizardOne.java trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/gui/manual/PumpDataAdditionalWizardTwo.java trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/gui/manual/PumpDataDialog.java trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/gui/manual/PumpDataRowDialog.java trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/gui/manual/PumpDataTableModel.java trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/gui/manual/PumpDataTypeComponent.java trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/gui/manual/PumpDataTypeComponent2.java trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/gui/pdtc/ trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/gui/pdtc/PumpDataTypeAlarmHandler.java trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/gui/pdtc/PumpDataTypeBasalHandler.java trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/gui/pdtc/PumpDataTypeBolusHandler.java trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/gui/pdtc/PumpDataTypeComponentHandler.java trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/gui/pdtc/PumpDataTypeComponentHandlerAbstract.java trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/gui/pdtc/PumpDataTypeErrorHandler.java trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/gui/pdtc/PumpDataTypeEventHandler.java trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/gui/pdtc/PumpDataTypePenInjectionHandler.java trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/gui/pdtc/TemporaryBasalRateComponent.java trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/gui/profile/ trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/gui/profile/ProfileEditor.java trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/gui/profile/ProfileEntryDialog.java trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/gui/profile/ProfileSelector.java trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/gui/profile/ProfileSelectorPump.java trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/manager/ trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/manager/PumpDevicesIds.java trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/manager/PumpManager.java trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/manager/company/ trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/manager/company/AbstractPumpDeviceCompany.java trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/manager/company/Deltec.java trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/manager/company/GenericPumpDevice.java trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/manager/company/Roche.java trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/manager/company/Sooil.java trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/plugin/ trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/plugin/BackupRestorePumpHandler.java trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/plugin/PumpPlugInServer.java trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/print/ trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/report/ trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/report/PrintPumpBasalCheckSheet.java trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/report/PrintPumpDataAbstract.java trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/report/PrintPumpDataBase.java trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/report/PrintPumpDataDailyTimeSheet.java trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/report/PrintPumpDataExt.java trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/report/PrintPumpDataProfiles.java trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/report/data/ trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/report/def/ trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/test/ trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/test/AbstractPumpTest.java trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/test/BasalManagerTest.java trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/test/DanaPumpTester.java trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/test/GUITest.java trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/test/MinimedConsoleTester.java trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/test/MinimedDecoderTester.java trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/test/PumpConsoleTester.java trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/test/TestAnimas.java trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/test/TestOmnipod.java trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/test/XmlTests.java trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/test/minimed/ trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/test/minimed/DecoderLoadData.java trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/test/minimed/MinimedBaseTest.java trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/test/minimed/MinimedCarelinkUSBTester.java trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/test/minimed/MinimedConsoleTester.java trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/test/minimed/MinimedDecoderTester.java trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/util/ trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/util/DataAccessPump.java trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/util/GGCPumpICRunner.java trunk/ggc-plugins/ggc-pump/src/main/resources/GGCPumpTool_de.properties trunk/ggc-plugins/ggc-pump/src/main/resources/GGCPumpTool_en.properties trunk/ggc-plugins/ggc-pump/src/main/resources/GGCPumpTool_fr.properties trunk/ggc-plugins/ggc-pump/src/main/resources/GGCPumpTool_si.properties trunk/ggc-plugins/ggc-pump/src/main/resources/html/ trunk/ggc-plugins/ggc-pump/src/main/resources/icons/ Removed Paths: ------------- trunk/ggc-plugins/ggc-pump/src/GGCPumpTool_de.properties trunk/ggc-plugins/ggc-pump/src/GGCPumpTool_en.properties trunk/ggc-plugins/ggc-pump/src/GGCPumpTool_fr.properties trunk/ggc-plugins/ggc-pump/src/GGCPumpTool_si.properties trunk/ggc-plugins/ggc-pump/src/ggc/ trunk/ggc-plugins/ggc-pump/src/html/ trunk/ggc-plugins/ggc-pump/src/icons/ Modified: trunk/ggc-plugins/ggc-pump/build/build.xml =================================================================== --- trunk/ggc-plugins/ggc-pump/build/build.xml 2016-12-25 17:31:10 UTC (rev 1433) +++ trunk/ggc-plugins/ggc-pump/build/build.xml 2016-12-25 17:38:43 UTC (rev 1434) @@ -54,7 +54,7 @@ </copy> <mkdir dir="${binary.dir}/icons" /> <copy todir="${binary.dir}/icons" overwrite="true"> - <fileset dir="../src/icons" casesensitive="no"> + <fileset dir="../src/main/resources/icons" casesensitive="no"> <include name="**/*.gif"/> <include name="**/*.jpg"/> <include name="**/*.png"/> Deleted: trunk/ggc-plugins/ggc-pump/src/GGCPumpTool_de.properties =================================================================== --- trunk/ggc-plugins/ggc-pump/src/GGCPumpTool_de.properties 2016-12-25 17:31:10 UTC (rev 1433) +++ trunk/ggc-plugins/ggc-pump/src/GGCPumpTool_de.properties 2016-12-25 17:38:43 UTC (rev 1434) @@ -1,385 +0,0 @@ -# -# ###################################################################### -# ### GNU Glucose Control ### -# ###################################################################### -# ### Language: German ### -# ### Created by: Reinhold Rumberger (ru...@us...)### -# ### Version: 1.2.2 ### -# ### Last change: 20.09.2014 13:47:53 ### -# ###################################################################### -# -# -# Translation status: -# Words/expressions: 264 -# Not translated: 89 (34 %) -# Need to be checked: 168 (64 %) -# -# Translated: 7 (3 %) -# -# -# -## -# 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-standard, 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 - -# -# Plug-in Specific [1] -# -DEVICE_NAME_NORMAL=Pumpe -DEVICE_NAME_BIG=Pumpe -DEVICE_FULL_NAME_WITHOUT_PORT=%s -DEVICE_FULL_NAME_WITH_PORT=%s an %s - -# -# About [1] -# -DEVICE_PLUGIN=%s-Plug-in -DEVICE_PLUGIN_ABOUT=\u00DCber %s-Plug-in - -# -# Configuration [1] -# -MY__=Mein -NEW__=Neu -DEVICE_CONFIGURATION=%s Konfiguration -SELECT_X_DEVICE=Ger\u00E4t %s ausw\u00E4hlen -SELECTED_X_DEVICE=Ger\u00E4t %s ausgew\u00E4hlt -DEVICE_CUSTOM_NAME=%s benutzerdefinierter Name -DEVICE_DOWNLOAD=AUSL -DEVICE_SETTINGS=Einst. - -# -# Menus [1] -# -MN_PUMPS=Pumpen -MN_PUMPS_READ=Pumpe Auslesen -MN_PUMPS_READ_DESC=Die Daten der Pumpe auslesen -MN_PUMPS_LIST=Pumpenliste -MN_PUMPS_LIST_DESC=Eine Liste der meisten verf\u00FCgbaren Pumpen -MN_PUMPS_CONFIG=Einstellungen... -MN_PUMPS_CONFIG_DESC=Einstellungen des Pumpen-Plugins -MN_PUMP_PROFILES=Profile -MN_PUMP_PROFILES_DESC=Basal-Profile -MN_PUMPS_MANUAL_ENTRY=Manueller Eintrag -MN_PUMPS_MANUAL_ENTRY_DESC=Manuelle Dateneintragung (falls Ihr Ger\u00E4t nicht unterst\u00FCtzt wird) -MN_PUMPS_ADDITIONAL_DATA=Zus\u00E4tzliche Daten -MN_PUMPS_ADDITIONAL_DATA_DESC=Eintragung zus\u00E4tzlicher Daten (BZ, Sport, ...) -MN_PUMPS_ABOUT=\u00DCber... -MN_PUMPS_ABOUT_DESC=\u00DCber das Pumpen-Plugin (Copyright, Funktionen, Mitwirkende,...) -MN_PUMPS_READ_DATA=Daten auslesen -MN_PUMPS_READ_DATA_DESC=Daten von der Pumpe auslesen -MN_PUMPS_READ_CONFIG=Einstellungen auslesen -MN_PUMPS_READ_CONFIG_DESC=Einstellungen der Pumpe auslesen -MN_PUMPS_READ_FILE=Datei einlesen -MN_PUMPS_READ_FILE_DESC=Daten von einer Pumpen-/Programm-Export-Datei - -# -# Device Selector [1] -# -SELECTOR_DEVICE=%s Ger\u00E4teauswahl - -# -# Instructions Dialog [1] -# -OOPS_DEVICE_NOT_CONFIGURED=Ups! Sie haben vergessen, Ihre %s zu konfigurieren,\nund es ist augenblicklich keine %s konfiguriert\nund/oder ausgew\u00E4hlt. Bitte \u00F6ffnen Sie die Einstellungen\nund konfigurieren Sie Ihre %s. -CONFIGURED_DEVICE_INSTRUCTIONS=%s und Anleitung konfiguriert -DEVICE_ICON=%s Bild -BASE_TYPE_SH=Basis -EXT_TYPE_SH=Ext. -PROFILE_TYPE_SH=Profil -CONFIGURED_DEVICE=Pumpe konfiguriert -STATUS_READER_ERROR=Interner %s (oder Anschluss)-Fehler -ERROR_CONTACTING_DEVICE=Es ist ein Problem beim Kontaktieren des Messger\u00E4tes aufgetreten.\nBitte pr\u00FCfen Sie die Einstellungen zum Kommunikationsanschluss\n(manche Kabel \u00E4ndern ihre Adresse, wenn sie erneut eingesteckt werden).\nSto\u00DFen Sie dann die Konfiguration erneut an und das Problem sollte behoben sein. -DEVICE_INFO=%s Info - -# -# Download [1] -# -READ_DEVICE_DATA_TITLE=Pumpendaten auslesen [%s an %s] - -# -# Device Configuration [1] -# -READ_DEVICE_CONFIG_TITLE=Pumpeneinstellungen auslesen [%s an %s] -SETTING_GROUP=Setting / Group - -# -# Export [1] -# -EXPORT_DEVICE_DATA=%s Daten exportieren - -# -# List [1] -# -DEVICE_LIST_WEB=Pumpenliste -DEVICE_LIST_WEB_DESC=<html>Die Pumpenliste enth\u00E4lt die meisten Pumpen (auch die meisten Modelle). F\u00FCr jede dieser Pumpen gibt es einen Konfigurations-Eintrag, der nur die Grundeinstellungen des Ger\u00E4ts (Profilnamen, TBR-Einstellungen) enth\u00E4lt. Ger\u00E4te, die ausgelesen werden k\u00F6nnen, werden in der Auswahl markiert ("AUSL"-Spalte). Die Pumpen in der Liste sind farbcodiert, wobei die Farbe den Status der Ger\u00E4te des ausgew\u00E4hlten Unternehmens festlegt. Eine Beschreibung der Farbcodierung befindet sich am Ende dieser Seite.<br></html> - -# -# Pump companies desc. (this is not description of company, but about our connection with company) [2] -# -ROCHE_DESC=Wir haben die volle Unterst\u00FCtzunge Roches und die Implementierung sollte im M\u00E4rz 2009 gestartet werden. -MINIMED_DESC=Wir haben eine unvollst\u00E4ndige Unterst\u00FCtzung dieses Unternehmens, und die Implementierung sollte im Dezember 2008 gestartet werden. -ANIMAS_DESC=Keine Unterst\u00FCtzung dieses Unternehmens. Bisher ist keine Implementierung geplant. - -# -# Pump Instructions [2] -# -INSTRUCTIONS_DANA_III_R=<html>Instructions for pump download:<ul><li>Attach BlueTooth adapter (not all of them<br>work for this pump)</li><li>Prepare pump for data transfer (you only<br>need to do this once)</li><li>Since BT transfer is wireless, you might<br>need to have transfer data several times</li></ul>Click "Start Download" to begin reading data from<br>your pump...</html> -INSTRUCTIONS_ACCUCHEK_SPIRIT=<html><body>Instructions for pump download:<ul><li>Pix Device should be attached before<br>program is started<li>Stop pump and activate data transfer mode<li>Click on "Start Download" to start download.<li>When new window opens place pump 10 cm<br>from Pix device</ul>Accu-Check Pix has sometimes problems with java,<br> so you might be forced repeat download.</body></html> - -# -# Manual Entry [1] -# -NOT_ALL_REQUIRED_VALUES_SET=Not all required entries are selected\nand/or filled in for this type of entry.\nPlease recheck everything and try again.\n -AVG_BG=Durchsch. BZ -BLOOD_GLUCOSE=Blutzucker -BREAD_UNITS=Kohlenhydrateinheiten -AVG=Avg -INSULIN=Insulin -TOTAL=Summe -AVG_INS=Avg Ins -DOSE_INS=Dosis Ins -BOLUS=Bolus -BASAL=Basal -MEALS=Mahlzeiten -LOWEST=Niedrigster -STD_DEV=Std Dev -READINGS=Messungen -HIGHEST=Highest -DOSE=Dose -SUM=Summe -FOOD=Food -IMMEDIATE_AMOUNT=Sofortige Abgabe -PUMP_DAILY_OVERVIEW=T\u00E4gliche Pumpenstatistiken -DATE=Datum -TIME=Zeit -ADD_ROW=Pumpendaten hinzuf\u00FCgen -EDIT_ROW=Pumpendaten \u00E4ndern -DELETE_MANY_ADDITIONAL_DATA=<html>There are many additional data entries under<br>this item. Are you sure you want to delete<br>them all?<br></html> - -# table -BASE_TYPE=Grundtyp -SUB_TYPE=Untertyp -ADDITIONAL=Zus\u00E4tzlich - -# parametes -ADD_DATA_ACTIVITY=Aktivit\u00E4t -ADD_DATA_COMMENT=Kommentar -ADD_DATA_BG=Blutzucker -ADD_DATA_URINE=Urin -ADD_DATA_CH=Kohlenhydrate -ADD_DATA_FOOD_DB=Food from Db (and CH) -ADD_DATA_FOOD_DESC=Food by Description (and CH) -SELECT_SUBTYPE=Untertyp w\u00E4hlen -ENTRY_TYPE=Type Of Entry - -# parameters add wizard 1 -ADD_PARAMETER=Add additional data (1/2) -SELECT_ADDITONAL_DATA=Select additional data to add -ADD_PARAMETER2=Add additional data (2/2) -FOOD_BY_DESC=Foods by Description -FOOD_FROM_DB=Foods from Database -IS_FOOD_SET=Is Food Set -IS_FOOD_AND_CH_SET=Is Food and CH Set -SET=Set -FOOD_SET_DB=Food Set (Db) -FOOD_SET_DESC=Food Set (Beschreibung) - -# entry types -SELECT_ITEM=Select Item -BASAL_DOSE=Basal -BOLUS_DOSE=Bolus -EVENT=Ereignis -ALARM=Warnung -ERROR=Fehler -REPORT=Bericht -PEN_INJECTION_BASAL=Pen/Injection Basal -PEN_INJECTION_BOLUS=Pen/Injection Bolus -ADDITIONAL_DATA=Zus\u00E4tzl. Angaben - -# pen/injection -BOLUS_INSULIN=Bolusinsulin -BASAL_INSULIN=Basalinsulin - -# tbr -TEMPORARY_BASAL_RATE=Tempor\u00E4re Basalrate -BASAL_TEMPORARY_BASAL_RATE=Tempor\u00E4re Basalrate -BASAL_TEMPORARY_BASAL_RATE_PROFILE=Temp. Basal Rate + Profile -TEMPORARY_BASAL_RATE_SHORT=TBR -TBR_TYPE_UNIT=Einheit (E) -TBR_TYPE_PROC=Prozent (%) - -# profile -PROFILE=Profil -NOT_SELECTED=Not Selected. -BASAL_PROFILE=Profil - -# parameters -ACTIVITY=Aktivit\u00E4t -COMMENT=Kommentar -URINE=Urin -CH_LONG=Kohlenhydrate - -# -# Pump Basal [1] -# -BASAL_TYPE=Basal Type -SELECT_BASAL_TYPE=Select Basal Type -BASAL_VALUE=Wert -BASAL_PUMP_STATUS=Pumpenstatus -ON=An (L\u00E4uft) -OFF=Aus (Gestoppt) -SUSPENDED=Suspended -PUMP_STATUS=Pumpenstatus -BASAL_TEMPORARY_BASAL_RATE_ENDED=TBR beendet -BASAL_TEMPORARY_BASAL_RATE_CANCELED=TBR abgebrochen - -# -# Pump Bolus [1] -# -BOLUS_TYPE=Bolus Type -SELECT_BOLUS_TYPE=Select Bolus Type -BOLUS_STANDARD=Standard -BOLUS_AUDIO=Audio / Scroll -BOLUS_SQUARE=Verz\u00F6gerung -BOLUS_MULTIWAVE=MultiWave -AMOUNT=Menge -AMOUNT_MW_1=Menge #1 -AMOUNT_MW_2=Menge #2 -DURATION_SHORT=Dauer -SQUARE_AMOUNT=Verz\u00F6gerte Abgabe -DURATION=Dauer - -# -# Pump Alarms [2] -# -ALARM_TYPE=Alarm Type -ALARM_CARTRIDGE_LOW=Ampulle fast leer -ALARM_BATTERY_LOW=Batterie niedrig -ALARM_REVIEW_DATETIME=Review Date/Time -ALARM_ALARM_CLOCK=Alarm Clock -ALARM_PUMP_TIMER=Pump Timer -ALARM_TEMPORARY_BASAL_RATE_CANCELED=TBR abgebrochen -ALARM_TEMPORARY_BASAL_RATE_OVER=TBR abgelaufen -ALARM_BOLUS_CANCELED=Bolus abgebrochen - -# -# Pump Errors [2] -# -ERROR_CARTRIDGE_EMPTY=Ampulle leer -ERROR_NO_DELIVERY=No Delivery (Verstopfung) -ERROR_CARTRIDGE_ERROR=Ampullenfehler -ERROR_SET_NOT_PRIMED=Infusionsset nicht gef\u00FCllt -ERROR_INSULIN_CHANGED=Insulin ge\u00E4ndert - -# -# Pump Events [2] -# -EVENT_PRIME_INFUSION_SET=Infusionsset f\u00FCllen -EVENT_CARTRIDGE_CHANGED=Ampulle gewechselt -EVENT_BASAL_RUN=Basal Start -EVENT_BASAL_STOP=Basal Stop -EVENT_SET_MAX_BASAL=Max. Basal festlegen -EVENT_SET_MAX_BOLUS=Max. Bolus festlegen -EVENT_BG_FROM_METER=BZ From Meter -EVENT_RESERVOIR_LOW=Ampulle fast leer -EVENT_RESERVOIR_LOW_DESC=Ampulle fast leer (%s) -EVENT_SET_TEMPORARY_BASAL_RATE_TYPE=Set temporary basal rate type -EVENT_SET_BASAL_PATTERN=Set basal pattern -EVENT_SELF_TEST=Pumpen-Selbsttest -EVENT_DOWNLOAD=Pump Daten\u00FCbertragung - -# -# Pump Reports [2] -# -REPORT_TYPE=Report Type -REPORT_TEXT=Report Text (Value) -REPORT_MISC=Misc (undefined) -REPORT_BOLUS_TOTAL_DAY=Bolusmenge (Tag) -REPORT_BASAL_TOTAL_DAY=Basalmenge (Tag) -REPORT_INSULIN_TOTAL_DAY=Insulin gesamt (Tag) - -# -# Profiles [1] -# -PROFILE_SELECTOR=Profile Selector -NEW=Neu -PROFILE_BASAL_ENTRY=Profile Basal Entry -TIME_FROM=Time From -TIME_TILL=Time Until -BASAL_AMOUNT=Basal Amount -PROFILE_EDITOR=Profile Editor -DATE_FROM=Date From -DATE_TILL=Date Till -BASE_BASAL=Base Basal -NAME=Name -FROM=Von -TILL=Bis -NEW__PROFILE=Neu -NAME_OF_PROFILE=Profilname -PUMP_PROFILE_SELECTOR=Profile Selector (Pump) -ADD_BASAL_SUB_ENTRY=Add Basal Time Entry -EDIT_BASAL_SUB_ENTRY=Edit Basal Time Entry -DELETE_BASAL_SUB_ENTRY=Delete Basal Time Entry -IMPORT_BASAL_SUB_ENTRIES=Import Basal Time Entries -VALUE_AXIS_BASAL=Basal doses of insulin (in Units) -TIME_AXIS_BASAL=Time (each bar represent 30 min. interval) - -# -# Devices [2] -# - -# -# Backup/Restore [1] -# -PUMP_TOOL=Pump Tool -PUMP_DATA=Pump Data -PUMP_DATA_EXTENDED=Pump Data Extended -PUMP_PROFILE=Pump Profile - -# -# Printing - Plugin specific [2] -# -MN_PUMP=Pump -MN_PUMP_PRINT_DESC=Report for Pumps Data -MN_PUMP_PRINT_SIMPLE=Einfach -MN_PUMP_PRINT_SIMPLE_DESC=Simple Report for Pump data -MN_PUMP_PRINT_EXT=Erweitert -MN_PUMP_PRINT_EXT_DESC=Extended Report for Pump data (Simple + Foods) -VALUE_SHORT=Wert -OTHER_DATA=Zus\u00E4tzl. Daten -OTHER_DATA_FOOD=Zus\u00E4tzl. Daten (inkl. Nahrung) -PUMP_DATA_BASE=Simple Pump Report -PUMP_DATA_EXT=Erweiterter Pumpenbericht -PUMP_DATA_DAILY_TIMESHEET=Tagliche Pumpenbericht mit Zeittabelen -FOOD_DB_PRINT=Food (Db) -FOOD_DESC_PRINT=Food (Desc.) -FOOD_DESC_PRINT_NOT_YET=Display of Food Db data (not implemented yet!) - -# -# Pump Configuration (this will be added by each type of pump) [2] -# - -# Dana Pump -PCFG_BASAL_INCREMENT=Basal Increment -PCFG_BOLUS_INCREMENT=Bolus Increment -PCFG_BOLUS_PRESET=Bolus Preset (Breakfast/Lunch/...) -PCFG_BOLUS_ALARM=After Bolus Alarm -PCFG_BOLUS_BLOCK=Bolus Block -PCFG_BASAL_UNIT=Basal Rate Unit -UNIT_PER_HOUR=E/Std -UNIT_PER_DAY=E/Tag -PCFG_MAX_BOLUS=Max. Bolusinsulin -PCFG_MAX_BASAL=Max. Basalinsulin -PCFG_MAX_DAILY=Max. Tagesinsulinmenge -PCFG_GLUCOSE_UNIT=Blutzuckereinheit -PCFG_EASY_MODE=Easy Mode -PCFG_ACTIVE_INSULIN_DECREMENT_RATIO=Active Insulin Decrement Ratio -PCFG_CH_INS_RATIO=KH/Insulin-Verh\u00E4ltnis -PCFG_BG_INS_RATIO=BZ/Insulin-Verh\u00E4ltnis (Korrekturfaktor) -PCFG_TARGET_BG=Ziel-BZ -PCFG_ACTIVE_INSULIN_RATE=Active Insulin Rate Deleted: trunk/ggc-plugins/ggc-pump/src/GGCPumpTool_en.properties =================================================================== --- trunk/ggc-plugins/ggc-pump/src/GGCPumpTool_en.properties 2016-12-25 17:31:10 UTC (rev 1433) +++ trunk/ggc-plugins/ggc-pump/src/GGCPumpTool_en.properties 2016-12-25 17:38:43 UTC (rev 1434) @@ -1,580 +0,0 @@ -# -# !MASTER_FILE! -# !S! MODULE=GGC Pump Tool -# !S! MODULE_VERSION=1.2.2 -# -# ###################################################################### -# ### GGC Pump Tool ### -# ###################################################################### -# ### Language: English ### -# ### Created by: Andy Rozman (an...@at...) ### -# ### Last change: 4th June 2011 ### -# ### Library Version: 1.2.2 ### -# ### Application Version: 0.5 ### -# ###################################################################### -# -# 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 -# -# * - If tags also has *, then it means that this string can change regulary, last update is in [] -# -# If there are double brackets (( )) these elements are from old langauge file and shouldn't be translated -# at this time. -# -# Most of keywords are copies from Meter Plugin and some are from GGC, so most can be copied -# from either of this locations. -# - -# -# !G! Plug-in Specific [1] -# -DEVICE_NAME_NORMAL=pump -DEVICE_NAME_BIG=Pump -DEVICE_FULL_NAME_WITHOUT_PORT=%s -DEVICE_FULL_NAME_WITH_PORT=%s on %s - - -# -# !G! About [1] -# -DEVICE_PLUGIN=%s Plug-in -DEVICE_PLUGIN_ABOUT=About %s Plug-in - - -# -# !G! Configuration [1] -# -MY__=My -NEW__=New -DEVICE_CONFIGURATION=%s Configuration -SELECT_X_DEVICE=Select %s Device -SELECTED_X_DEVICE=Selected %s Device -DEVICE_CUSTOM_NAME=%s Custom Name - -DEVICE_DOWNLOAD=DL -DEVICE_SETTINGS=Sett. - -# -# !G! Menus [1] -# -MN_PUMPS=Pumps -MN_PUMPS_READ=Pump Read -MN_PUMPS_READ_DESC=Read data from pump -MN_PUMPS_LIST=Pumps List -MN_PUMPS_LIST_DESC=List of most pumps available -MN_PUMPS_CONFIG=Configure... -MN_PUMPS_CONFIG_DESC=Configuration of the Pump plug-in -MN_PUMP_PROFILES=Profiles -MN_PUMP_PROFILES_DESC=Basal profiles -MN_PUMPS_MANUAL_ENTRY=Manual entry -MN_PUMPS_MANUAL_ENTRY_DESC=Manual entry of data (if your device is not supported) -MN_PUMPS_ADDITIONAL_DATA=Additional data -MN_PUMPS_ADDITIONAL_DATA_DESC=Additional data entry (BG, Activity, ...) -MN_PUMPS_ABOUT=About... -MN_PUMPS_ABOUT_DESC=About Pump Plugin (copyright, features, credits,...) - -MN_PUMPS_READ_DATA=Read data -MN_PUMPS_READ_DATA_DESC=Read data from Pump -MN_PUMPS_READ_CONFIG=Read configuration -MN_PUMPS_READ_CONFIG_DESC=Read configuration from Pump -MN_PUMPS_READ_FILE=Read file -MN_PUMPS_READ_FILE_DESC=Read data from Pump/Sw (export) file -MN_PUMPS_READ_CONFIG_FILE=Read config file -MN_PUMPS_READ_CONFIG_FILE_DESC=Read config from Pump/Sw (export) file - -MN_PUMP_DAILY=Pump Daily Overview -MN_PUMP_DAILY_DESC=View Pump Daily Overview - - -# -# !G! Device Selector [1] -# -SELECTOR_DEVICE=%s Device Selector - - -# -# !G! Instructions Dialog [1] -# -OOPS_DEVICE_NOT_CONFIGURED=Oops ! You forgot to configure your %s\nand currently there is no %s configured\nand/or selected. Please visit configuration\nand configure your %s. -CONFIGURED_DEVICE_INSTRUCTIONS=Configured %s and Instructions -DEVICE_ICON=%s picture -BASE_TYPE_SH=Base -EXT_TYPE_SH=Ext. -PROFILE_TYPE_SH=Profile -CONFIGURED_DEVICE=Configured Pump - -STATUS_READER_ERROR=Internal %s (or port) error - -ERROR_CONTACTING_DEVICE=There was a problem contacting the meter device.\nPlease recheck the communication port settings\n(sometimes the cables can change their address\nwhen reconnected). Run the configuration again\nand the problem should be solved!\n -DEVICE_INFO=%s Info - - -# -# !G! Download [1] -# -READ_DEVICE_DATA_TITLE=Read Pump Data [%s on %s] - - -# -# !G! Device Configuration [1] -# -READ_DEVICE_CONFIG_TITLE=Read Pump Configuration [%s on %s] -SETTING_GROUP=Setting/Group - - -# -# !G! Export [1] -# -EXPORT_DEVICE_DATA=Export %s Data - - -# -# !G! List [1] -# -DEVICE_LIST_WEB=Pumps List -DEVICE_LIST_WEB_DESC=<html>The pumps list contains most pumps (even most models). For each of these pumps, there is a configuration entry which contains only basic settings for the device (profile names, TBR settings, etc.). Devices which support downloading have that shown in the selector (DL column). The pumps in the list are color coded, and color determines the status of the devices from the selected company. The color coding description is shown at bottom of this page.<br></html> - - -# -# !G! Pump companies desc. (this is not description of company, but about our connection with company) [2] -# -ROCHE_DESC=We got full support from Roche and we support Spirit and Combo device (actually all that can be downloaded by SmartPix). -MINIMED_DESC=We got partial support from this company and implementation will start in December 2015. -ANIMAS_DESC=We added support for devices 1200 onwards (last supported is Vibe). Support is experimental, if you find any problem please contact us ASAP. - - -# -# !G! Pump Instructions [2] -# -INSTRUCTIONS_DANA_III_R=<html><ul><li>Attach BlueTooth adapter (not all of them<br>work with this pump)</li><li>Prepare pump for data transfer (you only<br>need to do this once)</li><li>Since BT transfer is wireless, you might<br>need to retry transfer of data several times</li></ul>Click "Start Download" to begin reading data from<br>your pump...</html> -INSTRUCTIONS_ACCUCHEK_SPIRIT=<html><body><ul><li>The SmartPix Device should be attached before<br>the program is started.<li>Stop the pump and activate the data transfer<br>mode.<li>Click on "Start Download" to start the download.<li>When the new window opens, place the pump 10<br>cm from the SmartPix device.</ul>Accu-Check SmartPix sometimes has problems with Java,<br> so you might be forced repeat the download.</body></html> -INSTRUCTIONS_INSULET_OMNIPOD=<html><body><ul><li>Get (backup) .ibf file from OmniPod device<li>Import file (click "Start Download" in this dialog)</body></html> - -# -# !G! Manual Entry [1] -# -NOT_ALL_REQUIRED_VALUES_SET=Not all required entries are selected\nand/or filled in for this type of entry.\nPlease recheck everything and try again.\n - -AVG_BG=Avg BG -BLOOD_GLUCOSE=Blood Glucose -BREAD_UNITS=Carbohydrate Units -AVG=Avg -INSULIN=Insulin -TOTAL=Total -AVG_INS=Avg Ins -DOSE_INS=Dose Ins -BOLUS=Bolus -BASAL=Basal -MEALS=Meals -LOWEST=Lowest -STD_DEV=Std Dev -READINGS=Readings -HIGHEST=Highest -DOSE=Dose -SUM=Sum -FOOD=Food -IMMEDIATE_AMOUNT=Immediate Amount - -PUMP_DAILY_OVERVIEW=Pump Daily Stats -DATE=Date -TIME=Time -ADD_ROW=Add Pump Data -EDIT_ROW=Edit Pump Data - -DELETE_MANY_ADDITIONAL_DATA=<html>There are many additional data entries under<br>this item. Are you sure you want to delete<br>them all?<br></html> - - -# !SG! table -BASE_TYPE=Base Type -SUB_TYPE=Sub-Type -ADDITIONAL=Additional - -# !SG! parametes -ADD_DATA_ACTIVITY=Activity -ADD_DATA_COMMENT=Comment -ADD_DATA_BG=Blood Glucose -ADD_DATA_URINE=Urine -ADD_DATA_CH=Carbohydrates -ADD_DATA_FOOD_DB=Food from DB (and CH) -ADD_DATA_FOOD_DESC=Food by Description (and CH) -SELECT_SUBTYPE=Select Sub-type -ENTRY_TYPE=Type of Entry - -# !SG! parameters add wizard 1 -ADD_PARAMETER=Add additional data (1/2) -SELECT_ADDITONAL_DATA=Select additional data to add -ADD_PARAMETER2=Add additional data (2/2) -FOOD_BY_DESC=Foods by Description -FOOD_FROM_DB=Foods from Database -IS_FOOD_SET=Is Food Set -IS_FOOD_AND_CH_SET=Is Food and CH Set -SET=Set -FOOD_SET_DB=Food Set (Db) -FOOD_SET_DESC=Food Set (Description) -#FUNCTIONALITY_FOOD_DB_NA=Functionality 'Food Selector from Database'\nis not implemented yet. This functionality\nwill be probably supported in version 0.2.x.\n\n - -# !SG! entry types -SELECT_ITEM=Select Item -BASAL_DOSE=Basal Dose -BOLUS_DOSE=Bolus Dose -EVENT=Event -ALARM=Alarm -ERROR=Error -REPORT=Report -PEN_INJECTION_BASAL=Pen/Injection Basal -PEN_INJECTION_BOLUS=Pen/Injection Bolus -ADDITIONAL_DATA=Additional Data - -# !SG! pen/injection -BOLUS_INSULIN=Bolus Insulin -BASAL_INSULIN=Basal Insulin - -# !SG! tbr -TEMPORARY_BASAL_RATE=Temporary Basal Rate -BASAL_TEMPORARY_BASAL_RATE=Temporary Basal Rate -BASAL_TEMPORARY_BASAL_RATE_PROFILE=Temp. Basal Rate + Profile -TEMPORARY_BASAL_RATE_SHORT=TBR -TBR_TYPE_UNIT=Unit (U) -TBR_TYPE_PROC=Percent (%) - -# !SG! profile -PROFILE=Profile -NOT_SELECTED=Not Selected. -BASAL_PROFILE=Profile - -# !SG! parameters -ACTIVITY=Activity -COMMENT=Comment -URINE=Urine -CH_LONG=Carbohydrates - - - -# -# !G! Pump Basal [1] -# -BASAL_TYPE=Basal Type -SELECT_BASAL_TYPE=Select Basal Type -BASAL_VALUE=Value -BASAL_PUMP_STATUS=Pump Status -ON=On (Running) -OFF=Off (Stopped) -SUSPENDED=Suspended -PUMP_STATUS=Pump Status -BASAL_TEMPORARY_BASAL_RATE_ENDED=Temporary Basal Rate Ended -BASAL_TEMPORARY_BASAL_RATE_CANCELED=Temporary Basal Rate Canceled -BASAL_VALUE_CHANGE=Basal Value Change - -# -# !G! Pump Bolus [1] -# -BOLUS_TYPE=Bolus Type -SELECT_BOLUS_TYPE=Select Bolus Type -BOLUS_STANDARD=Standard -BOLUS_AUDIO=Audio/Scroll -BOLUS_SQUARE=Extended -BOLUS_MULTIWAVE=MultiWave -BOLUS_DUAL_NORMAL=Dual - Normal -BOLUS_DUAL_SQUARE=Dual - Extended -BOLUS_NONE=Bolus - None -AMOUNT=Amount -AMOUNT_MW_1=Amount #1 -AMOUNT_MW_2=Amount #2 -DURATION_SHORT=Duration -SQUARE_AMOUNT=Extended Amount -DURATION=Duration - -# -# !G! Pump Alarms [2] -# -ALARM_TYPE=Alarm Type -ALARM_CARTRIDGE_LOW=Cartridge Low -ALARM_BATTERY_LOW=Battery Low -ALARM_REVIEW_DATETIME=Review Date/Time -ALARM_ALARM_CLOCK=Alarm Clock -ALARM_PUMP_TIMER=Pump Timer -ALARM_TEMPORARY_BASAL_RATE_CANCELED=Temporary Basal Rate Canceled -ALARM_TEMPORARY_BASAL_RATE_OVER=Temporary Basal Rate Over -ALARM_BOLUS_CANCELED=Bolus Canceled -ALARM_NO_DELIVERY=No Delivery - - -# -# !G! Pump Errors [2] -# -ERROR_INSULIN_CHANGED=Insulin Changed -ERROR_CARTRIDGE_EMPTY=Cartridge Empty -ERROR_NO_DELIVERY=No Delivery (Occlussion) -ERROR_CARTRIDGE_ERROR=Cartridge Error -ERROR_SET_NOT_PRIMED=Set Not Primed - -ERROR_POD=Error with Pump Pod: %s -ERROR_PDM=Error with Pump PDM: %s - - - -# -# !G! Pump Events [2] -# -EVENT_PRIME_INFUSION_SET=Prime Infusion Set -EVENT_CARTRIDGE_CHANGED=Cartridge changed -EVENT_BASAL_RUN=Basal Run -EVENT_BASAL_STOP=Basal Stop -EVENT_SET_MAX_BASAL=Set Max Basal -EVENT_SET_MAX_BOLUS=Set Max Bolus -EVENT_RESERVOIR_LOW=Reservoir low -EVENT_RESERVOIR_LOW_DESC=Reservoir low (%s) -EVENT_SET_TEMPORARY_BASAL_RATE_TYPE=Set temporary basal rate type -EVENT_SET_BASAL_PATTERN=Set basal pattern -EVENT_FILL_CANNULA=Fill Cannula -EVENT_BG_FROM_METER=BG From Meter -EVENT_BOLUS_WIZARD=Bolus Wizard - - - - -# -# !G! Pump Reports [2] -# -REPORT_TYPE=Report Type -REPORT_TEXT=Report Text (Value) -REPORT_MISC=Misc (undefined) -REPORT_BOLUS_TOTAL_DAY=Daily Bolus Total -REPORT_BASAL_TOTAL_DAY=Daily Basal Total -REPORT_INSULIN_TOTAL_DAY=Daily Insulin Total - - -# -# !G! Profiles [1] -# -PROFILE_SELECTOR=Profile Selector -NEW=New -PROFILE_BASAL_ENTRY=Profile Basal Entry -TIME_FROM=Time From -TIME_TILL=Time Until -BASAL_AMOUNT=Basal Amount -PROFILE_EDITOR=Profile Editor -DATE_FROM=Date From -DATE_TILL=Date Until -BASE_BASAL=Base Basal -NAME=Name -FROM=From -TILL=Until -NEW__PROFILE=New -NAME_OF_PROFILE=Name of Profile -PUMP_PROFILE_SELECTOR=Profile Selector (Pump) - -ADD_BASAL_SUB_ENTRY=Add Basal Time Entry -EDIT_BASAL_SUB_ENTRY=Edit Basal Time Entry -DELETE_BASAL_SUB_ENTRY=Delete Basal Time Entry -IMPORT_BASAL_SUB_ENTRIES=Import Basal Time Entries -VALUE_AXIS_BASAL=Basal doses of insulin (in Units) -TIME_AXIS_BASAL=Time (each bar represents a 30 min. interval) - -NO_DEVICE_CANT_GET_PROFILES=No Pump device selected. Cannot retrieve Profile definitions.\nSelect device and retry. -DEVICE_HAS_NO_PROFILES=It seems that configured device has no Profiles defined.\nEither select other device, or contact support so that\nthey can change device implementation. - -# -# !G! Devices [2] -# - - - -# -# !G! Backup/Restore [1] -# -PUMP_TOOL=Pump Tool -PUMP_DATA=Pump Data -PUMP_DATA_EXTENDED=Pump Data Extended -PUMP_PROFILE=Pump Profile - - -# -# !G! Printing - Plugin specific [2] -# -MN_PUMP=Pump -MN_PUMP_PRINT_DESC=Report for Pumps Data -MN_PUMP_PRINT_SIMPLE=Simple -MN_PUMP_PRINT_SIMPLE_DESC=Simple Report for Pump data -MN_PUMP_PRINT_EXT=Extended -MN_PUMP_PRINT_EXT_DESC=Extended Report for Pump data (Simple + Foods) -MN_PUMP_PRINT_PROFILE=Profiles -MN_PUMP_PRINT_PROFILE_DESC=Profiles Report -MN_PUMP_PRINT_BASAL_CHECK=Basal Check -MN_PUMP_PRINT_BASAL_CHECK_DESC=Basal Check Report -MN_PUMP_PRINT_DAILY_TIMESHEET_1=Daily Timesheets I -MN_PUMP_PRINT_DAILY_TIMESHEET_1_DESC=Report with Daily Timesheets I (Colors,Events) -MN_PUMP_PRINT_DAILY_TIMESHEET_2=Daily Timesheets II (+CGMS) -MN_PUMP_PRINT_DAILY_TIMESHEET_2_DESC=Report with Daily Timesheets II (Base data + CGMS) - -VALUE_SHORT=Value -OTHER_DATA=Other Data -OTHER_DATA_FOOD=Other Data (with Food) -PUMP_DATA_BASE=Simple Pump Report -PUMP_DATA_EXT=Extended Pump Report -PUMP_DATA_DAILY_TIMESHEET_1=Pump Daily Timesheet I. (Base) -PUMP_DATA_DAILY_TIMESHEET_2=Pump Daily Timesheet II. (Base+CGMS) -PUMP_DATA_DAILY_TIMESHEET_3=Pump Daily Timesheet III. (Base+Food) -PUMP_DATA_DAILY_TIMESHEET_4=Pump Daily Timesheet IV. (Base+CGMS+Food) -PUMP_DATA_PROFILES=Pump Profiles -PUMP_DATA_BASAL_CHECK=Basal Check List - -FOOD_DB_PRINT=Food (Db) -FOOD_DESC_PRINT=Food (Desc.) - -RP_DAILYTIMESHEET_TBR=TBR [Duration=%s, Amount=%s] (%s) -RP_DAILYTIMESHEET_BOLUS_EXT=Bolus Extended [Duration=%s, Amount=%s] (%s) -RP_DAILYTIMESHEET_BOLUS_MW=Bolus MultiWave [Amount=%s, Extended Duration=%s, Extended Amount=%s] (%s) - -FOOD_DESC_PRINT_NOT_YET=Display of Food Db data (not implemented yet!) - -# -# -# -MN_PUMP_GRAPH_DESC=Graphs for Pump Mode - - -# -# !G! Pump Configuration (this will be added by each type of pump) [2] -# - -# !SG! Configuration Group -GROUP_GENERAL=General Settings -GROUP_DEVICE=Device Settings -GROUP_INSULIN=Insulin Settings -GROUP_BASAL=Basal Settings -GROUP_BOLUS=Bolus Settings -GROUP_SOUND=Sound Settings -GROUP_OTHER=Other Settings - -# !SG! General -#PCFG_GLUCOSE_UNIT=Blood Glucose Unit -PCFG_CH_INS_RATIO=Insulin/CH Ratio -PCFG_BG_INS_RATIO=Insulin/BG Ratio (Correction factor) -PCFG_TARGET_BG=BG Target -PCFG_BG_TRESHOLD=BG Treshold -PCFG_BASAL_PROFILE=Basal Profile -PCFG_PUMP_MODEL=Pump Model - -# !SG! Dana Pump -PCFG_BASAL_INCREMENT=Basal Increment -PCFG_BOLUS_INCREMENT=Bolus Increment -PCFG_BOLUS_PRESET=Bolus Preset (Breakfast/Lunch/...) -PCFG_BOLUS_ALARM=After Bolus Alarm -PCFG_BOLUS_BLOCK=Bolus Block -PCFG_BASAL_UNIT=Basal Rate Unit -UNIT_PER_HOUR=U/hr -UNIT_PER_DAY=U/day - -PCFG_MAX_BOLUS=Max Bolus Insulin -PCFG_MAX_BASAL=Max Basal Insulin -PCFG_MAX_DAILY=Max Daily Insulin -PCFG_EASY_MODE=Easy Mode -PCFG_ACTIVE_INSULIN_DECREMENT_RATIO=Active Insulin Decrement Ratio -PCFG_ACTIVE_INSULIN_RATE=Active Insulin Rate - - -# !SG! Animas Pump -PCFG_SOUND_NORMAL=Normal -PCFG_SOUND_AUDIOBOLUS=Audio Bolus -PCFG_SOUND_TEMPBASAL=Temporary Basal -PCFG_SOUND_ALERTS=Alerts -PCFG_SOUND_REMINDERS=Reminders -PCFG_SOUND_WARNINGS=Warnings -PCFG_SOUND_ALARMS=Alarms -PCFG_SOUND_REMOTEBOLUS=Remote Bolus -PCFG_AUDIO_BOLUS_ENABLED=Audio Bolus Enables -PCFG_AUDIO_BOLUS_STEP_SIZE=Audio Bolus Step Size -PCFG_ADVANCED_BOLUS_ENABLED=Advanced Bolus Enabled -PCFG_BOLUS_REMINDER=Bolus Reminder -PCFG_NUMBER_OF_BASAL_PROFILES=Number of Basal Profiles -PCFG_MAX_BOLUS_IN_HOUR=Max Bolus pro Hour -PCFG_MAX_BASAL_IN_HOUR=Max Basal pro Hour -PCFG_TOTAL_DAILY_DOSE=Total Daily Dose -PCFG_MAX_DOSE_IN_2HOURS=Max Dose in 2 Hours -PCFG_LOW_CARTRIDGE_WARNING=Low Cartridge Warning -PCFG_AUTOOFF_ENABLED=Auto Off Enabled -PCFG_AUTOOFF_TIMEOUT=Auto Off Timeout -PCFG_IOB_ENABLED=Inuslin-On-Board Enabled -PCFG_BOLUS_SPEED=Bolus Speed -PCFG_DISPLAY_TIMEOUT=Display Timeout -PCFG_IOB_DECAY=Insulin Decay -PCFG_SICK_DAYS_CHECK_KETONES_EVERY=When Sick check Ketones every x Hours -PCFG_SICK_DAYS_CHECK_BG_EVERY=When Sick check BG every x Hours -PCFG_SICK_DAYS_CHECK_OVER_LIMIT=When Sick check BG Over -PCFG_OCCLUSION_SENSITIVITY=Occlusion Sensitivity -PCFG_FRIENDLY_NAME=Friendly Name -PCFG_ACTIVE_BASAL_PROFILE=Active Basal Profile - -# !SG! Minimed Settings -PCFG_TEMP_BASAL_RATE=Temporary Basal Rate -PCFG_TEMP_BASAL_DURATION=Temporary Basal Rate Duration -PCFG_ALARM_MODE=Alarm Mode -PCFG_ALARM_MODE_SILENT=Silent -PCFG_ALARM_MODE_NORMAL=Normal -PCFG_ALARM_BEEP_VOLUME=Alarm Beep Volume -PCFG_VARIABLE_BOLUS_ENABLED=Variable Bolus Enable -PCFG_INSULIN_CONCENTRATION=Insulin Concentration -PCFG_INSULIN_DURATION=Insulin Duration -PCFG_BASAL_PROFILES_ENABLED=Basal Profiles Enabled -PCFG_BOLUS_WIZARD_ENABLED=Bolus Wizard Enabled -PCFG_BG_REMINDER_ENABLED=BG Reminder Enabled -PCFG_MISSED_BOLUS_REMINDER_ENABLED=Missed Bolus Reminder Enabled -PCFG_BG_ALARM_ENABLED=BG Alarm Enabled - -PCFG_INSULIN_ACTION_TYPE=Insulin Action Type -PCFG_INSULIN_ACTION_TYPE_REGULAR=Regular -PCFG_INSULIN_ACTION_TYPE_FAST=Fast -PCFG_INSULIN_ACTION_TYPE_UNSET=Unset -PCFG_INSULIN_ACTION_CURVE=Curve: %s - -PCFG_TEMP_BASAL_TYPE=Temporary Basal Type -PCFG_TEMP_BASAL_TYPE_PERCENT=Percent (%) -PCFG_TEMP_BASAL_TYPE_UNITS=Units -PCFG_TEMP_BASAL_PERCENT=Temporary Basal Percent - -PCFG_BOLUS_SCROLL_STEP_SIZE=Bolus Scroll Step Size -PCFG_CAPTURE_EVENT_ENABLE=Capture Event Enable -PCFG_OTHER_DEVICE_ENABLE=Other Device Enable -PCFG_OTHER_DEVICE_PAIRED_STATE=Other Device Paired -PCFG_PUMP_STATUS=Pump Status - -PCFG_MM_RESERVOIR_WARNING_TYPE=Reservoir Warning Type -PCFG_MM_RESERVOIR_WARNING_TYPE_TIME=Time -PCFG_MM_RESERVOIR_WARNING_TYPE_UNITS=Units -PCFG_MM_RESERVOIR_WARNING_POINT=Reservoir warning point - -PCFG_MISSED_BOLUS_REMINDER=Missed Bolus Reminders - - -# !SG! Insulet Omnipod -PCFG_OMNI_IBF_VERSION=IBF Version -PCFG_OMNI_PDM_VERSION=PDM Version - -PCFG_BG_MINIMAL=Minimal Blood Glucose -PCFG_BG_LOW_TARGET=Low Blood Glucose Target -PCFG_BG_HIGH_TARGET=High Blood Glucose Target - -PCFG_OMNI_ALERT_POD_EXPIRE=Alert for Pod-Disable -PCFG_OMNI_REMINDER_ALERT=Reminder for Bolus/TBR Enabled -PCFG_OMNI_CONFIGURATION_ALERT=Start/End Bolus/TBR Alert Enabled - -PCFG_OMNI_MIN_LIMIT_INS_RESERVE=Min. Limit value of insulin reserve in Pod -PCFG_OMNI_MANUFACTURING_DATA=Manufacturing Data - -# -# New Keywords (they are grouped), this need to be copied to right locations, after release -# - - Deleted: trunk/ggc-plugins/ggc-pump/src/GGCPumpTool_fr.properties =================================================================== --- trunk/ggc-plugins/ggc-pump/src/GGCPumpTool_fr.properties 2016-12-25 17:31:10 UTC (rev 1433) +++ trunk/ggc-plugins/ggc-pump/src/GGCPumpTool_fr.properties 2016-12-25 17:38:43 UTC (rev 1434) @@ -1,471 +0,0 @@ -# -# ###################################################################### -# ### GGC Pump Tool ### -# ###################################################################### -# ### Language: French ### -# ### Created by: Andy Rozman (an...@at...) ### -# ### Last change: 4th February 2010 ### -# ### Library Version: 1.0.5 ### -# ### Application Version: 0.4.17 ### -# ###################################################################### -# -# -# In brackets there are now tags which define urgency of some text beeing translated -# 1 - Needed, urgent (Base functionality, options which will be used by user mostly) -# 2 - Needed -# 3 - Not used yet (in public releases) -# 4 - In implementation -# -# * - If tags also has *, then it means that this string can change regulary, last update is in [] -# -# Most of keywords are copies from Meter Plugin and some are from GGC, so most can be copied -# from either of this locations. -# - - - -# -# Plug-in Specific (1) -# Most of strings here are concated with help of sprintf codes, so almost all are static -# -DEVICE_NAME_NORMAL=pump -DEVICE_NAME_BIG=Pump -DEVICE_FULL_NAME_WITHOUT_PORT=%s -DEVICE_FULL_NAME_WITH_PORT=%s on %s - - -# -# About (1) -# Note: elements under static are same for all plugins and non-static are plugin specific -# - -# static -DEVICE_PLUGIN=%s Plug-in -DEVICE_PLUGIN_ABOUT=About %s Plug-in - - -# -# Menus -# -MN_PUMPS=Pumps -MN_PUMPS_READ=Pump Read -MN_PUMPS_READ_DESC=Read data from pump -MN_PUMPS_LIST=Pumps List -MN_PUMPS_LIST... [truncated message content] |
From: <and...@us...> - 2016-12-25 17:31:11
|
Revision: 1433 http://sourceforge.net/p/ggc/code/1433 Author: andyrozman Date: 2016-12-25 17:31:10 +0000 (Sun, 25 Dec 2016) Log Message: ----------- GGC Pumps - adding new maven structure Added Paths: ----------- trunk/ggc-plugins/ggc-pump/src/main/ trunk/ggc-plugins/ggc-pump/src/main/java/ trunk/ggc-plugins/ggc-pump/src/main/resources/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <and...@us...> - 2016-12-25 17:24:17
|
Revision: 1432 http://sourceforge.net/p/ggc/code/1432 Author: andyrozman Date: 2016-12-25 17:24:13 +0000 (Sun, 25 Dec 2016) Log Message: ----------- GGC Pumps - moved to GGC Plugins Modified Paths: -------------- trunk/ggc-plugins/pom.xml Added Paths: ----------- trunk/ggc-plugins/ggc-pump/ trunk/ggc-plugins/ggc-pump/build/build.xml trunk/ggc-plugins/ggc-pump/docs/Changelog trunk/ggc-plugins/ggc-pump/docs/TO-DO_PumpTool.txt trunk/ggc-plugins/ggc-pump/pom.xml trunk/ggc-plugins/ggc-pump/src/ggc/pump/gui/manual/PumpDataAdditionalWizardTwo.java trunk/ggc-plugins/ggc-pump/src/ggc/pump/gui/manual/PumpDataTypeComponent.java trunk/ggc-plugins/ggc-pump/src/ggc/pump/gui/manual/PumpDataTypeComponent2.java trunk/ggc-plugins/ggc-pump/src/ggc/pump/gui/pdtc/PumpDataTypeAlarmHandler.java trunk/ggc-plugins/ggc-pump/src/ggc/pump/gui/pdtc/PumpDataTypeBasalHandler.java trunk/ggc-plugins/ggc-pump/src/ggc/pump/gui/pdtc/PumpDataTypeBolusHandler.java trunk/ggc-plugins/ggc-pump/src/ggc/pump/gui/pdtc/PumpDataTypeComponentHandler.java trunk/ggc-plugins/ggc-pump/src/ggc/pump/gui/pdtc/PumpDataTypeComponentHandlerAbstract.java trunk/ggc-plugins/ggc-pump/src/ggc/pump/gui/pdtc/PumpDataTypeErrorHandler.java trunk/ggc-plugins/ggc-pump/src/ggc/pump/gui/pdtc/PumpDataTypeEventHandler.java trunk/ggc-plugins/ggc-pump/src/ggc/pump/gui/pdtc/PumpDataTypePenInjectionHandler.java trunk/ggc-plugins/ggc-pump/src/ggc/pump/gui/pdtc/TemporaryBasalRateComponent.java Removed Paths: ------------- trunk/ggc-plugins/ggc-pump/build/build.xml trunk/ggc-plugins/ggc-pump/docs/Changelog trunk/ggc-plugins/ggc-pump/docs/TO-DO_PumpTool.txt trunk/ggc-plugins/ggc-pump/pom.xml trunk/ggc-plugins/ggc-pump/src/ggc/pump/gui/manual/PumpDataAdditionalWizardTwo.java trunk/ggc-plugins/ggc-pump/src/ggc/pump/gui/manual/PumpDataTypeComponent.java trunk/ggc-pump/ Deleted: trunk/ggc-plugins/ggc-pump/build/build.xml =================================================================== --- trunk/ggc-pump/build/build.xml 2016-12-25 16:39:02 UTC (rev 1427) +++ trunk/ggc-plugins/ggc-pump/build/build.xml 2016-12-25 17:24:13 UTC (rev 1432) @@ -1,121 +0,0 @@ -<?xml version="1.0" ?> -<project name="GNU Pump Tool" default="build" basedir="."> - <description> - Build file for GGC Pump - </description> - - <!-- Environment properties read from a file ...--> - <property file="../../build/AtechTools.properties"/> - <property file="../../ggc-core/build/GGC_Core_Version.properties"/> - <property file="../../ggc-core/build/GGCBuild.properties"/> -<!-- <property file="./GGCPlugInBaseBuild.properties"/> - <property file="../../ggc-plugin_base/build/GGCPlugInBaseBuild.properties"/> --> - <property file="../../ggc-plugin_base/build/GGCPlugInBaseVersion.properties"/> - <property file="./GGCPumpToolVersion.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}" /> - - - <!-- 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="${binary.dir}" /> - <copy todir="${binary.dir}/" overwrite="true"> - <fileset dir="${source.dir}" casesensitive="no"> - <include name="*.properties"/> - </fileset> - </copy> - <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"/> - </fileset> - </copy> - </target> - - - - <target name="compile" depends="copy" 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}" /> - <pathelement path="../../build/deploy_files/ggc-plugin_base-${ggc-plugin-base.version}.jar" /> - <pathelement path="../../build/deploy_files/ggc-core-${ggc-core.version}.jar" /> - </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="**/*"/> - </fileset> - - <fileset dir="${source.dir}"> - <include name="*."/> - <include name="html/**"/> - </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> Copied: trunk/ggc-plugins/ggc-pump/build/build.xml (from rev 1431, trunk/ggc-pump/build/build.xml) =================================================================== --- trunk/ggc-plugins/ggc-pump/build/build.xml (rev 0) +++ trunk/ggc-plugins/ggc-pump/build/build.xml 2016-12-25 17:24:13 UTC (rev 1432) @@ -0,0 +1,121 @@ +<?xml version="1.0" ?> +<project name="GNU Pump Tool" default="build" basedir=""> + <description> + Build file for GGC Pump + </description> + + <!-- Environment properties read from a file ...--> + <property file="../../build/AtechTools.properties"/> + <property file="../../ggc-core-app/ggc-core/build/GGC_Core_Version.properties"/> + <property file="../../ggc-core-app/ggc-core/build/GGCBuild.properties"/> +<!-- <property file="./GGCPlugInBaseBuild.properties"/> + <property file="../../ggc-plugin_base/build/GGCPlugInBaseBuild.properties"/> --> + <property file="../../ggc-plugins/ggc-plugins-base/build/GGCPlugInBaseVersion.properties"/> + <property file="GGCPumpToolVersion.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}" /> + + + <!-- 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="${binary.dir}" /> + <copy todir="${binary.dir}/" overwrite="true"> + <fileset dir="${source.dir}" casesensitive="no"> + <include name="*.properties"/> + </fileset> + </copy> + <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"/> + </fileset> + </copy> + </target> + + + + <target name="compile" depends="copy" 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}" /> + <pathelement path="../../build/deploy_files/ggc-plugin_base-${ggc-plugin-base.version}.jar" /> + <pathelement path="../../build/deploy_files/ggc-core-${ggc-core.version}.jar" /> + </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="**/*"/> + </fileset> + + <fileset dir="${source.dir}"> + <include name="*."/> + <include name="html/**"/> + </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> Deleted: trunk/ggc-plugins/ggc-pump/docs/Changelog =================================================================== --- trunk/ggc-pump/docs/Changelog 2016-12-25 16:39:02 UTC (rev 1427) +++ trunk/ggc-plugins/ggc-pump/docs/Changelog 2016-12-25 17:24:13 UTC (rev 1432) @@ -1,317 +0,0 @@ - -Changes file for GGC Pump Tool -============================== - -2.0.1 [26.5.2016] [Andy] -- refactorings (code, db) -- graphs for pump (the one from core), not complete yet -- comments -- dana refactoring -- added code for minimed. not tested yet, disabled for now - -2.0.0 [11.12.2015] -- change to PumpEventType, RatioType -- changes to Bolus, BolusWizard, RatioDTO and TBR Dto -- added Minimed code for Pump. Most of code is ready, we need to test this under different versions - of Pumps (configuration) and also decoding (data) needs to be tested on several devices. But initial version is - ready. There might be some changes later, but most of decoders/converters are ready -- added dummy devices: tandem, asante - - -1.7.1 [24.10.2015] [Andy] - * implemented all devices as DeviceV2 (created bridges for V1 to V2) - * ATechDateType getDateTimeFormat() refactoring - * AChanges for device V2: AccuChekPumpHandler, AccuChekPumpReader, DanaPumpHandler, updated PumpDefinitions - * Pump Profile adding with type Profile, ProfileSelector. We now get an error when adding Profile in case that profiles are not defined. We need additional change here, but at least we don;t get nullPointer exception. - * added definitions, for Profile, TBR - * added PumpDeviceInstanceWithHandler - * refactoring PumpProfile selector to work with V2 devices (doesn't work yet, but we don't get Fatal Exception) - * manager all devices removed from V1 context - - -1.7.0 [19.10.2015] [Andy] - * added PumpPluginDefinition for plugin defintions and refactoring of DataAccessPump - * added PumpReportDefinition for better management of reports - * migrating from Log to SLF4j Logger - * PumpBasalType TBR Profile deprecated - * refactoring BG conversion - * Reports changes: PumpAdditionalDataHandler - - -1.6.1 [10.10.2015] - * refactoring because of DataAccess and ConfigurationManagerWrapper changes - * added Minimed Devices to PumpDefinition - * working on report: PumpDataDailyTimeSheet, added CGMS support, added types for different types - of reports (Base, Base+CGMS, Base+Food, Base+CGMS+Food). Implementation is planned for - Base (v2) and Base+CGMS for 0.7 - - -1.6.0 [2.10.2015] - Andy - * changes because of Selector refactoring / fixing - * added BasalStatistic, BasalRatesDayDTO, PumpBasalManager, PumpBolusManager - * changed AdditionalData map (for PumpData to enum) which required some major refactorings on some classes - * fixes to Graph, fixed now... - -1.5.1 [6.7.2015] - Andy - * added experimental (just developer tested) support for Insulet OmniPod - * added Config File download support - * Support for OmniPod, Animas and Dexcom G4 are EXPERMINTAL (tested just with my configuration, which - might produce date/time problems for people in other Timezones). - -1.5.0 [26.4.2015] - Andy - * implementing DeviceInterfaceV2 - * added BasalType.ValueChange - * Fixing DailyTable report to support BasalType.ValueChange - * finalizing Animas Pump - * fix AccuChek problem with Basals (using BasalType.ValueChange and removing all unusable BasalProcessing in code) - * Rework Animas to use Communication Handler - * Added global PumpValuesWriter, rework Animas to use it - - Extended configuration interface for Pumps - - Extended Animas implementation - - Refactoring of AccuChek Pump Reader to use PumpBasalType.ValueChanged instead of Profiles, which are not natively supported by AC - - Changes on Dana Pump (configuration), planned refactoring in future... - - Added Enums to Pump, reworking most of code depending on that - - Data handling changed - - Data writter - - Animas code finalized - -1.4.0 [4.1.2015] - * support for Animas pump - -1.3.5 [21.09.2014] - * printing reports ... - -1.3.4 [10.12.2012] - * In manual editing we replaced text boxes with JSpinner on edit of BG and CH. (same was done in Pen/Injection Mode). Also we - set limits on both. BG max value is 999 mg/dL (55.4 mmol/L) and CH cannot be negative - -1.3.3 [1.9.2012] - * Added full Minimed code to SVN. This code can communicate via COM cable with pump, but is unable to read history data or - interpret this data. - -1.3.2 [3.7.2011] - * Support for Minimed is currently disabled, we need to add support for processing profiles, and also - adding profile change adding. - -1.3.1 [3.6.2011] - * Support for Minimed Carelink finalizing - -1.2.2 [20.6.2010] - * PLUGIN_BASE: Required 0.5.2 - -1.2.1 [18.6.2010] - * PLUGIN_BASE: Required 0.5 - * Changed main Constructor for device classes - -1.2.0 [4.6.2010] - * Finalizing work on Spirit pump download - * Added support for reading files - -1.1.1 [23.4.2010] - * Implemented statistics for GGC application (Pump Mode) - -1.0.5 [16.02.2010] - * I18n is now partitially in PlugInBase - * Minor device changes - * Started work on SmartPix under Linux (we have some major problems here, I hope to get - them fixed soon - * PLUGIN_BASE: Required 0.4.5 - - -1.0.4 - * PluginBase changed - * I18n Changed - * Company context changed - * Device Selector is now global and uses PlugInDeviceUtil - * Continuning work on Roche Pumps - Profiles - -1.0.3 [30.10.2009] - * Finished Dana import - * TBR fixed - * Minor fixes in manual data entry - * Continuing support for Roche (still working on profiles) - -1.0.2 [6.8.2009] - * Started tinkering with Dana device and BlueTooth connection - * Plugin changed fully to v2 framework, all menus are now created directly in plugin - * Separate class that now holds all device/company variables - -1.0.1 [10.7.2009] - * required base plugin is now 0.4.1 (framework v2) - * All basic functionalities are implemented (Download, List, About) - * Framework implementation is v2, with some v1 elements (very few), which will be replaced soon - * Added special functionalities: Graphs, Printing. Currently only Daily graph is available, but it's - still under construction - * Roche implementation is finished concerning basic functionality, only problem we currently have is - basal patterns history. SmartPix doesn't show exact history of BP. We will try to make this work, - but until SmartPix is extended/fixed so long code won't be 100%, which means possible losss of some - BP history. - * MultiWave entry and Square are finished - - -0.5.1 (current) - * Work on Accu-chek pump import - * Fixed Events, Basals and Boluses - * Working on download of Pump data, testing with Roche implementation - * major changes in PumpValuesTableModel (and also on its parent) - - -0.4.8 (current) - * Added food db adding from Nutritional plugin - * Fixed small time problem with BolusHelper - * Started work on reading old data - - -0.4.7 - * Started work on Minimed Import (from Solutions Pumps & Meter export file (MS Access *.mmp file)) - * Minor fix of Multiwave Bolus in Manual input - -0.4.6 - * Day Table has removed comment column, and now we have added Food column, which together with Additional data - column uses MultiLineTooltip (MultiLineTooltipModel) - * Import of profile and add Comment - -0.4.5 - * Added gcc.pump.print.* classes and implemented PrintPumpDataAbstract and PrintPumpDataBase (this all - classes implement PrintAbstractIText) - * Add PumpPrintDialog, which is also now in Atech-Tools (PrintDialogRange), so we just implement abstract - methods - * Fixed import, so now import/export fully works - -0.4.4 - * Printing work started. - -0.4.3 (6.4.2009) - * Possibility of removal of warning screen - -0.4.2 - * Profile selector changes (we use name now for changing last active and last active has now correct value - for non-active) - * BackupRestoreCollection fixed - * Manual adding Fixed for all Basals (edit) and Basal Profiles - -0.4.1 (1.4.2009) - * Profiles editor finished - * added Pump Profile Selector, which is tied to pump you are using (not to active profiles) - * Configuration of Pumps enabled - * Configuration fixed (time fix disabled) - * Web Lister enabled - * All pumps description available for weblister - * About picture added - -0.3.3 - * Test version for Profiles done, needs some fixes though, but most of functionality planned is done for now - -0.3.2 - * Profile manager work started - -0.3.1 - * Whole reorganization of all GGC projects, so that all sub projects can now use GGC core - -0.2.2 - * Added Bolus Helper to Bolus entry (after redesign of GGC (GGC was split into two seperate projects, GGC Core and - GGC Desktop)) - * Bolus Helper changed so that it produces value in float type (not in integer anymore) - -0.2.1 - * Version advanced after, Manual Entry finished - -0.1.17 - * Additional data dialogs finished - -0.1.16 - * Statistics finished - -0.1.15 - * Work started on statistics - -0.1.14 - * If everything is set check done - -0.1.13 - * Editing of additional data done - -0.1.12 - * Changes to main manual pump windows (editing and addding changes made back) - * refresh data - * Editing of additional data (except for Food entries) - -0.1.11 - * Editing entries (rows) - * Reading data to PumpDataTypeComponent - * Writing data to PumpDataTypeComponent - -0.1.10 - * Working with database, adding entries to database - -0.1.9.2 - * Adding 'Foods by Description' to dialog - * Focusing problem - major one - -0.1.9.1 - * Added Food by Description, by using TransferDialog mechanism. It needs to be reworked though. - -0.1.8 - * After reorganization of all plugins, database stopped working, we fixed that here - -0.1.7 - * Manually... Db - -0.1.6.1 - 0.1.6.8 - * Manually adding pump data - -0.1.6 10-06 - * Manually adding pump data - Start - -0.1.5 10-02 - * Added Db interface in Pump and transfer Db Instance to plugin interface - - -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 Alarm and Event mappings - - -2008-08-08 (0.1.2) - * first integration into ggc - * changes to Output classes and display classes (inspired by Roche AccuCheck Pix device) - * moved AccuChek Pix device, creation of Accu-Chek pump devices - * added ggc.pump.data.defs contains PumpAlarms, PumpEvents, PumpReport and PumpDataType classes (work in progres) - * started work on reading Roche/Accu-Chek Xml file - - -2008-07-10 (v0.1.1) Andy Rozman <and...@us...> - * pump tool project started (implementation) - * basic framework created. All pump related files created from meter tool application - * new files created for different outputs, creation of basic structure: - - meter_tools - | - |- ggc - | - |-- pump - | data - | device - | roche - | gui - | config - | list (list) - | output (outputing data) - | protocol (protocol for communication) - | test (test stuff) - | util (util) - |-- web (for displaying different pump (list) - - - * most of base stuff is implemented (outputs for example, some base protocols, guis, configuration) - * everything was copied from meter tools 0.2, most of stuff will need to be enchanched and changed, but - base stuff is now here. - * created plug in class for connection to GGC - - - Copied: trunk/ggc-plugins/ggc-pump/docs/Changelog (from rev 1431, trunk/ggc-pump/docs/Changelog) =================================================================== --- trunk/ggc-plugins/ggc-pump/docs/Changelog (rev 0) +++ trunk/ggc-plugins/ggc-pump/docs/Changelog 2016-12-25 17:24:13 UTC (rev 1432) @@ -0,0 +1,324 @@ + +Changes file for GGC Pump Tool +============================== + +2.0.2 [25.12.2016] [Andy] +- PumpDataAdditionalWizardTwo +- PumpDataTypeComponent +- PumpDataTypeComponent2 added new class for refactoring +- added handlers for PDT Component 2 + + +2.0.1 [26.5.2016] [Andy] +- refactorings (code, db) +- graphs for pump (the one from core), not complete yet +- comments +- dana refactoring +- added code for minimed. not tested yet, disabled for now + +2.0.0 [11.12.2015] +- change to PumpEventType, RatioType +- changes to Bolus, BolusWizard, RatioDTO and TBR Dto +- added Minimed code for Pump. Most of code is ready, we need to test this under different versions + of Pumps (configuration) and also decoding (data) needs to be tested on several devices. But initial version is + ready. There might be some changes later, but most of decoders/converters are ready +- added dummy devices: tandem, asante + + +1.7.1 [24.10.2015] [Andy] + * implemented all devices as DeviceV2 (created bridges for V1 to V2) + * ATechDateType getDateTimeFormat() refactoring + * AChanges for device V2: AccuChekPumpHandler, AccuChekPumpReader, DanaPumpHandler, updated PumpDefinitions + * Pump Profile adding with type Profile, ProfileSelector. We now get an error when adding Profile in case that profiles are not defined. We need additional change here, but at least we don;t get nullPointer exception. + * added definitions, for Profile, TBR + * added PumpDeviceInstanceWithHandler + * refactoring PumpProfile selector to work with V2 devices (doesn't work yet, but we don't get Fatal Exception) + * manager all devices removed from V1 context + + +1.7.0 [19.10.2015] [Andy] + * added PumpPluginDefinition for plugin defintions and refactoring of DataAccessPump + * added PumpReportDefinition for better management of reports + * migrating from Log to SLF4j Logger + * PumpBasalType TBR Profile deprecated + * refactoring BG conversion + * Reports changes: PumpAdditionalDataHandler + + +1.6.1 [10.10.2015] + * refactoring because of DataAccess and ConfigurationManagerWrapper changes + * added Minimed Devices to PumpDefinition + * working on report: PumpDataDailyTimeSheet, added CGMS support, added types for different types + of reports (Base, Base+CGMS, Base+Food, Base+CGMS+Food). Implementation is planned for + Base (v2) and Base+CGMS for 0.7 + + +1.6.0 [2.10.2015] - Andy + * changes because of Selector refactoring / fixing + * added BasalStatistic, BasalRatesDayDTO, PumpBasalManager, PumpBolusManager + * changed AdditionalData map (for PumpData to enum) which required some major refactorings on some classes + * fixes to Graph, fixed now... + +1.5.1 [6.7.2015] - Andy + * added experimental (just developer tested) support for Insulet OmniPod + * added Config File download support + * Support for OmniPod, Animas and Dexcom G4 are EXPERMINTAL (tested just with my configuration, which + might produce date/time problems for people in other Timezones). + +1.5.0 [26.4.2015] - Andy + * implementing DeviceInterfaceV2 + * added BasalType.ValueChange + * Fixing DailyTable report to support BasalType.ValueChange + * finalizing Animas Pump + * fix AccuChek problem with Basals (using BasalType.ValueChange and removing all unusable BasalProcessing in code) + * Rework Animas to use Communication Handler + * Added global PumpValuesWriter, rework Animas to use it + - Extended configuration interface for Pumps + - Extended Animas implementation + - Refactoring of AccuChek Pump Reader to use PumpBasalType.ValueChanged instead of Profiles, which are not natively supported by AC + - Changes on Dana Pump (configuration), planned refactoring in future... + - Added Enums to Pump, reworking most of code depending on that + - Data handling changed + - Data writter + - Animas code finalized + +1.4.0 [4.1.2015] + * support for Animas pump + +1.3.5 [21.09.2014] + * printing reports ... + +1.3.4 [10.12.2012] + * In manual editing we replaced text boxes with JSpinner on edit of BG and CH. (same was done in Pen/Injection Mode). Also we + set limits on both. BG max value is 999 mg/dL (55.4 mmol/L) and CH cannot be negative + +1.3.3 [1.9.2012] + * Added full Minimed code to SVN. This code can communicate via COM cable with pump, but is unable to read history data or + interpret this data. + +1.3.2 [3.7.2011] + * Support for Minimed is currently disabled, we need to add support for processing profiles, and also + adding profile change adding. + +1.3.1 [3.6.2011] + * Support for Minimed Carelink finalizing + +1.2.2 [20.6.2010] + * PLUGIN_BASE: Required 0.5.2 + +1.2.1 [18.6.2010] + * PLUGIN_BASE: Required 0.5 + * Changed main Constructor for device classes + +1.2.0 [4.6.2010] + * Finalizing work on Spirit pump download + * Added support for reading files + +1.1.1 [23.4.2010] + * Implemented statistics for GGC application (Pump Mode) + +1.0.5 [16.02.2010] + * I18n is now partitially in PlugInBase + * Minor device changes + * Started work on SmartPix under Linux (we have some major problems here, I hope to get + them fixed soon + * PLUGIN_BASE: Required 0.4.5 + + +1.0.4 + * PluginBase changed + * I18n Changed + * Company context changed + * Device Selector is now global and uses PlugInDeviceUtil + * Continuning work on Roche Pumps - Profiles + +1.0.3 [30.10.2009] + * Finished Dana import + * TBR fixed + * Minor fixes in manual data entry + * Continuing support for Roche (still working on profiles) + +1.0.2 [6.8.2009] + * Started tinkering with Dana device and BlueTooth connection + * Plugin changed fully to v2 framework, all menus are now created directly in plugin + * Separate class that now holds all device/company variables + +1.0.1 [10.7.2009] + * required base plugin is now 0.4.1 (framework v2) + * All basic functionalities are implemented (Download, List, About) + * Framework implementation is v2, with some v1 elements (very few), which will be replaced soon + * Added special functionalities: Graphs, Printing. Currently only Daily graph is available, but it's + still under construction + * Roche implementation is finished concerning basic functionality, only problem we currently have is + basal patterns history. SmartPix doesn't show exact history of BP. We will try to make this work, + but until SmartPix is extended/fixed so long code won't be 100%, which means possible losss of some + BP history. + * MultiWave entry and Square are finished + + +0.5.1 (current) + * Work on Accu-chek pump import + * Fixed Events, Basals and Boluses + * Working on download of Pump data, testing with Roche implementation + * major changes in PumpValuesTableModel (and also on its parent) + + +0.4.8 (current) + * Added food db adding from Nutritional plugin + * Fixed small time problem with BolusHelper + * Started work on reading old data + + +0.4.7 + * Started work on Minimed Import (from Solutions Pumps & Meter export file (MS Access *.mmp file)) + * Minor fix of Multiwave Bolus in Manual input + +0.4.6 + * Day Table has removed comment column, and now we have added Food column, which together with Additional data + column uses MultiLineTooltip (MultiLineTooltipModel) + * Import of profile and add Comment + +0.4.5 + * Added gcc.pump.print.* classes and implemented PrintPumpDataAbstract and PrintPumpDataBase (this all + classes implement PrintAbstractIText) + * Add PumpPrintDialog, which is also now in Atech-Tools (PrintDialogRange), so we just implement abstract + methods + * Fixed import, so now import/export fully works + +0.4.4 + * Printing work started. + +0.4.3 (6.4.2009) + * Possibility of removal of warning screen + +0.4.2 + * Profile selector changes (we use name now for changing last active and last active has now correct value + for non-active) + * BackupRestoreCollection fixed + * Manual adding Fixed for all Basals (edit) and Basal Profiles + +0.4.1 (1.4.2009) + * Profiles editor finished + * added Pump Profile Selector, which is tied to pump you are using (not to active profiles) + * Configuration of Pumps enabled + * Configuration fixed (time fix disabled) + * Web Lister enabled + * All pumps description available for weblister + * About picture added + +0.3.3 + * Test version for Profiles done, needs some fixes though, but most of functionality planned is done for now + +0.3.2 + * Profile manager work started + +0.3.1 + * Whole reorganization of all GGC projects, so that all sub projects can now use GGC core + +0.2.2 + * Added Bolus Helper to Bolus entry (after redesign of GGC (GGC was split into two seperate projects, GGC Core and + GGC Desktop)) + * Bolus Helper changed so that it produces value in float type (not in integer anymore) + +0.2.1 + * Version advanced after, Manual Entry finished + +0.1.17 + * Additional data dialogs finished + +0.1.16 + * Statistics finished + +0.1.15 + * Work started on statistics + +0.1.14 + * If everything is set check done + +0.1.13 + * Editing of additional data done + +0.1.12 + * Changes to main manual pump windows (editing and addding changes made back) + * refresh data + * Editing of additional data (except for Food entries) + +0.1.11 + * Editing entries (rows) + * Reading data to PumpDataTypeComponent + * Writing data to PumpDataTypeComponent + +0.1.10 + * Working with database, adding entries to database + +0.1.9.2 + * Adding 'Foods by Description' to dialog + * Focusing problem - major one + +0.1.9.1 + * Added Food by Description, by using TransferDialog mechanism. It needs to be reworked though. + +0.1.8 + * After reorganization of all plugins, database stopped working, we fixed that here + +0.1.7 + * Manually... Db + +0.1.6.1 - 0.1.6.8 + * Manually adding pump data + +0.1.6 10-06 + * Manually adding pump data - Start + +0.1.5 10-02 + * Added Db interface in Pump and transfer Db Instance to plugin interface + + +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 Alarm and Event mappings + + +2008-08-08 (0.1.2) + * first integration into ggc + * changes to Output classes and display classes (inspired by Roche AccuCheck Pix device) + * moved AccuChek Pix device, creation of Accu-Chek pump devices + * added ggc.pump.data.defs contains PumpAlarms, PumpEvents, PumpReport and PumpDataType classes (work in progres) + * started work on reading Roche/Accu-Chek Xml file + + +2008-07-10 (v0.1.1) Andy Rozman <and...@us...> + * pump tool project started (implementation) + * basic framework created. All pump related files created from meter tool application + * new files created for different outputs, creation of basic structure: + + meter_tools + | + |- ggc + | + |-- pump + | data + | device + | roche + | gui + | config + | list (list) + | output (outputing data) + | protocol (protocol for communication) + | test (test stuff) + | util (util) + |-- web (for displaying different pump (list) + + + * most of base stuff is implemented (outputs for example, some base protocols, guis, configuration) + * everything was copied from meter tools 0.2, most of stuff will need to be enchanched and changed, but + base stuff is now here. + * created plug in class for connection to GGC + + + Deleted: trunk/ggc-plugins/ggc-pump/docs/TO-DO_PumpTool.txt =================================================================== --- trunk/ggc-pump/docs/TO-DO_PumpTool.txt 2016-12-25 16:39:02 UTC (rev 1427) +++ trunk/ggc-plugins/ggc-pump/docs/TO-DO_PumpTool.txt 2016-12-25 17:24:13 UTC (rev 1432) @@ -1,81 +0,0 @@ -TO-DO LIST -========== - -Development of Pump Tools runs totally independent on GGC project -================================================================== - - - - * Graphs (0.6) - - * Specific pump models import implementations: - o MiniMed (2015) - protocol not public (use minimed's web tool) - o Omni Pod (?) - Couldn't send mail... Problem with web ?? - o T:Slim (?) - - - - - - -Detailed functionalities not done (and need to be): -=================================================== - - * Profile Editor: - * Graphical display of Basal Pattern - * Calculate and do warning if Basal pattern missing - - * Statistics - * We currently don't support statistics for Basal, if profile selected - - - - - -=============================================================================== -DONE - - * Output types: - o Console and file output (0.5) - o GGC Db Output (for manual import) (0.5) - o GGC Output (GUI integration) (0.5) - * Communication framework for pumps (interface that all pumps will use) (later) - * Base framework for pumps (0.3) - * Profile Editor: - - Base stuff - * Manual adding of pump data (data that will in future be read from pump) (0.5) - * Adding of additional data (bg measurements, OH intake, Activity...) (0.5) - * List of pumps (most of them not all) (0.4) - * Configuration and graphical interface for integration into GGC (0.5) - - * Profile Editor: - - Import from some other Profile (data values) - - * Printing of reports: - - Base report (no foods) - - Extended report (foods too) - - * Specific pump models import implementations: - o Sooil Dana (2011) - o Roche/Disetronic (2011) - got all info - o Smith's Cosmo (?) - Pump is not manufactured anymore, so it won't be supported - o Animas (2014) - - - -=============================================================================== - - - - - --------------------------------------------- - - -Help ----- - -pages.GGC_Pump_Add_Parameter_Wizard1 - - - Copied: trunk/ggc-plugins/ggc-pump/docs/TO-DO_PumpTool.txt (from rev 1431, trunk/ggc-pump/docs/TO-DO_PumpTool.txt) =================================================================== --- trunk/ggc-plugins/ggc-pump/docs/TO-DO_PumpTool.txt (rev 0) +++ trunk/ggc-plugins/ggc-pump/docs/TO-DO_PumpTool.txt 2016-12-25 17:24:13 UTC (rev 1432) @@ -0,0 +1,81 @@ +TO-DO LIST +========== + +Development of Pump Tools runs totally independent on GGC project +================================================================== + + * Refactoring: PumpDataTypeComponent + + * Graphs (0.6) + + * Specific pump models import implementations: + o MiniMed (2015) - protocol not public (use minimed's web tool) + o Omni Pod (?) - Couldn't send mail... Problem with web ?? + o T:Slim (?) + + + + + + +Detailed functionalities not done (and need to be): +=================================================== + + * Profile Editor: + * Graphical display of Basal Pattern + * Calculate and do warning if Basal pattern missing + + * Statistics + * We currently don't support statistics for Basal, if profile selected + + + + + +=============================================================================== +DONE + + * Output types: + o Console and file output (0.5) + o GGC Db Output (for manual import) (0.5) + o GGC Output (GUI integration) (0.5) + * Communication framework for pumps (interface that all pumps will use) (later) + * Base framework for pumps (0.3) + * Profile Editor: + - Base stuff + * Manual adding of pump data (data that will in future be read from pump) (0.5) + * Adding of additional data (bg measurements, OH intake, Activity...) (0.5) + * List of pumps (most of them not all) (0.4) + * Configuration and graphical interface for integration into GGC (0.5) + + * Profile Editor: + - Import from some other Profile (data values) + + * Printing of reports: + - Base report (no foods) + - Extended report (foods too) + + * Specific pump models import implementations: + o Sooil Dana (2011) + o Roche/Disetronic (2011) - got all info + o Smith's Cosmo (?) - Pump is not manufactured anymore, so it won't be supported + o Animas (2014) + + + +=============================================================================== + + + + + +-------------------------------------------- + + +Help +---- + +pages.GGC_Pump_Add_Parameter_Wizard1 + + + Deleted: trunk/ggc-plugins/ggc-pump/pom.xml =================================================================== --- trunk/ggc-pump/pom.xml 2016-12-25 16:39:02 UTC (rev 1427) +++ trunk/ggc-plugins/ggc-pump/pom.xml 2016-12-25 17:24:13 UTC (rev 1432) @@ -1,93 +0,0 @@ -<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> - - <name>GGC Pump Tool Project</name> - - <artifactId>ggc-pump-tool</artifactId> - <version>${ggc-pump-tool.version}</version> - - <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> - </build> - - <dependencies> - <dependency> - <groupId>net.sf.ggc</groupId> - <artifactId>ggc-core</artifactId> - </dependency> - - <dependency> - <groupId>net.sf.ggc</groupId> - <artifactId>ggc-plugin-base</artifactId> - </dependency> - - <dependency> - <groupId>com.atech-software</groupId> - <artifactId>atech-tools</artifactId> - </dependency> - - - <dependency> - <groupId>com.ibm.old.comapi</groupId> - <artifactId>ibm-compapi</artifactId> - </dependency> - - - <dependency> - <groupId>jaxen</groupId> - <artifactId>jaxen</artifactId> - </dependency> - - <dependency> - <groupId>postgresql</groupId> - <artifactId>postgresql</artifactId> - <version>8.4-702.jdbc3</version> - </dependency> - - <dependency> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> - </dependency> - - <dependency> - <groupId>commons-collections</groupId> - <artifactId>commons-collections</artifactId> - </dependency> - - - </dependencies> - - <properties> - - <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> - - </properties> -</project> Copied: trunk/ggc-plugins/ggc-pump/pom.xml (from rev 1431, trunk/ggc-pump/pom.xml) =================================================================== --- trunk/ggc-plugins/ggc-pump/pom.xml (rev 0) +++ trunk/ggc-plugins/ggc-pump/pom.xml 2016-12-25 17:24:13 UTC (rev 1432) @@ -0,0 +1,92 @@ +<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-plugins</artifactId> + <version>0.8-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> + </parent> + + <name>GGC Plugins - Pump Tool</name> + <artifactId>ggc-pump-tool</artifactId> + <version>${ggc-pump-tool.version}</version> + + <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> + </build> + + <dependencies> + <dependency> + <groupId>net.sf.ggc</groupId> + <artifactId>ggc-core</artifactId> + </dependency> + + <dependency> + <groupId>net.sf.ggc</groupId> + <artifactId>ggc-plugin-base</artifactId> + </dependency> + + <dependency> + <groupId>com.atech-software</groupId> + <artifactId>atech-tools</artifactId> + </dependency> + + + <dependency> + <groupId>com.ibm.old.comapi</groupId> + <artifactId>ibm-compapi</artifactId> + </dependency> + + + <dependency> + <groupId>jaxen</groupId> + <artifactId>jaxen</artifactId> + </dependency> + + <dependency> + <groupId>postgresql</groupId> + <artifactId>postgresql</artifactId> + <version>8.4-702.jdbc3</version> + </dependency> + + <dependency> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> + </dependency> + + <dependency> + <groupId>commons-collections</groupId> + <artifactId>commons-collections</artifactId> + </dependency> + + + </dependencies> + + <properties> + + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> + + </properties> +</project> Deleted: trunk/ggc-plugins/ggc-pump/src/ggc/pump/gui/manual/PumpDataAdditionalWizardTwo.java =================================================================== --- trunk/ggc-pump/src/ggc/pump/gui/manual/PumpDataAdditionalWizardTwo.java 2016-12-25 16:39:02 UTC (rev 1427) +++ trunk/ggc-plugins/ggc-pump/src/ggc/pump/gui/manual/PumpDataAdditionalWizardTwo.java 2016-12-25 17:24:13 UTC (rev 1432) @@ -1,965 +0,0 @@ -package ggc.pump.gui.manual; - -import java.awt.*; -import java.awt.event.*; -import java.lang.reflect.Constructor; - -import javax.swing.*; -import javax.swing.event.ChangeEvent; -import javax.swing.event.ChangeListener; - -import com.atech.graphics.components.JDecimalTextField; -import com.atech.graphics.dialogs.TransferDialog; -import com.atech.help.HelpCapable; -import com.atech.i18n.I18nControlAbstract; -import com.atech.plugin.PlugInClient; -import com.atech.utils.ATSwingUtils; - -import ggc.core.data.Converter_mgdL_mmolL; -import ggc.core.data.defs.GlucoseUnitType; -import ggc.core.plugins.GGCPluginType; -import ggc.core.plugins.NutriPlugIn; -import ggc.core.util.DataAccess; -import ggc.pump.data.PumpValuesEntryExt; -import ggc.pump.data.defs.PumpAdditionalDataType; -import ggc.pump.util.DataAccessPump; -import ggc.shared.fooddesc.FoodDescriptionDialog; - -/** - * 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: PumpDataAdditionalWizardTwo - * Description: Wizard for adding Additional data (step 2) - * - * Author: Andy {an...@at...} - */ - -// fix this - -public class PumpDataAdditionalWizardTwo extends JDialog - implements ActionListener, HelpCapable, KeyListener, ChangeListener -{ - - private static final long serialVersionUID = 6600123145384610341L; - - private DataAccessPump m_da = DataAccessPump.getInstance(); - private I18nControlAbstract m_ic = m_da.getI18nControlInstance(); - JLabel label_title = new JLabel(); - - boolean debug = true; - JButton help_button = null; - JPanel main_panel = null; - private Container m_parent = null; - - JLabel label_1; - JTextField text_1; - JDecimalTextField num_1, num_2; - JSpinner spin_1, spin_2; - JCheckBox cb_1; - JButton button_1; - int width; - - PumpAdditionalDataType pumpAdditionalDataType; - - boolean was_action = false; - PumpValuesEntryExt pump_objects_ext[]; - - PumpValuesEntryExt data_object; - PumpValuesEntryExt data_object2; - private String internal_data[] = null; - float food_ch; - - - // new data - /** - * Constructor - * - * @param wiz_one - * @param type - */ - public PumpDataAdditionalWizardTwo(PumpDataAdditionalWizardOne wiz_one, String type) - { - super(wiz_one, "", true); - - // this.m_pump_add = pump_add; - - // this.old_data = data; - m_parent = wiz_one; - this.pumpAdditionalDataType = pumpAdditionalDataType.getByDescription(type); - - ATSwingUtils.initLibrary(); - - init(); - } - - - /** - * Constructor - * - * @param dialog - * @param pc - */ - public PumpDataAdditionalWizardTwo(JDialog dialog, PumpValuesEntryExt pc) - { - super(dialog, "", true); - - // FIXME - // this.m_pump_add = dataAccess.getAdditionalTypes(); - - // this.old_data = data; - m_parent = dialog; - this.pumpAdditionalDataType = pc.getTypeEnum(); - - ATSwingUtils.initLibrary(); - - init(); - - data_object = pc; - - loadObject(); - } - - - /** - * Constructor - * - * @param dialog - * @param pc - * @param pc2 - */ - public PumpDataAdditionalWizardTwo(JDialog dialog, PumpValuesEntryExt pc, PumpValuesEntryExt pc2) - { - super(dialog, "", true); - - // FIXME - // this.m_pump_add = dataAccess.getAdditionalTypes(); - - // this.old_data = data; - m_parent = dialog; - this.pumpAdditionalDataType = pc.getTypeEnum(); - - ATSwingUtils.initLibrary(); - - this.data_object = pc; - this.data_object2 = pc2; - - init(); - - loadObject(); - } - - String food_data = null; - - - // for edit - private void loadObject() - { - if (this.pumpAdditionalDataType == PumpAdditionalDataType.Activity || // - this.pumpAdditionalDataType == PumpAdditionalDataType.Comment || // - this.pumpAdditionalDataType == PumpAdditionalDataType.Urine) - { - this.text_1.setText(this.data_object.getValue()); - // po.setValue(this.text_1.getText()); - } - else if (this.pumpAdditionalDataType == PumpAdditionalDataType.BloodGlucose) - { - // this.num_1.setValue(new Float(this.data_object.getValue())); - // this.focusProcess(num_1); - // po.setValue(this.num_1.getValue().toString()); - this.spin_1.setValue(new Float(this.data_object.getValue())); - } - else if (this.pumpAdditionalDataType == PumpAdditionalDataType.Carbohydrates) - { - - this.spin_1.setValue(new Float(this.data_object.getValue())); - // this.num_1.setValue(new Float(this.data_object.getValue())); - // po.setValue(this.num_1.getValue().toString()); - } - else if (this.pumpAdditionalDataType == PumpAdditionalDataType.FoodDescription) - { - food_data = this.data_object.getValue(); - - if (this.data_object2 != null) - { - food_ch = m_da.getFloatValueFromString(this.data_object2.getValue()); - if (food_ch > 0) - { - this.cb_1.setSelected(true); - } - } - else - { - food_ch = 0.0f; - } - - this.num_1.setText(DataAccess.getFloatAsString(food_ch, 2)); - - } - else if (this.pumpAdditionalDataType == PumpAdditionalDataType.FoodDb) - { - food_data = this.data_object.getValue(); - - if (this.data_object2 != null) - { - food_ch = m_da.getFloatValueFromString(this.data_object2.getValue()); - - if (food_ch > 0) - { - this.cb_1.setSelected(true); - } - } - else - { - food_ch = 0.0f; - this.num_1.setText("" + food_ch); - } - - this.num_1.setText(DataAccess.getFloatAsString(food_ch, 2)); - - } - else - { - System.out.println("Load for this type is not implemented !!!"); - } - - } - - int startx = 0; - - - private void init() - { - ATSwingUtils.initLibrary(); - - width = 380; - int height = 310; - - this.setSize(width, height); - - m_da.addComponent(this); - ATSwingUtils.centerJDialog(this, this.m_parent); - - JPanel panel = new JPanel(); - panel.setBounds(0, 0, width, height); - panel.setLayout(null); - - startx = 60; - - main_panel = panel; - - this.getContentPane().add(panel); - - label_title = ATSwingUtils.getTitleLabel(m_ic.getMessage("ADD_PARAMETER2"), 0, 35, width, 35, panel, - ATSwingUtils.FONT_BIG_BOLD); - - setTitle(m_ic.getMessage("ADD_PARAMETER2")); - - String button_command[] = { "cancel", m_ic.getMessage("CANCEL"), "ok", m_ic.getMessage("OK"), - // "help", m_ic.getMessage("HELP") - }; - - // button - String button_icon[] = { "cancel.png", "ok.png" }; - // null, "ok.png", "cancel.png" }; - - int button_coord[] = { startx, 230, 120, 1, startx + 130, 230, 130, 1, - // 170, 190, 140, 1, - // 30, 620, 110, 1, - // 145, 620, 110, 1, - // 250, 390, 80, 0 - }; - - JButton button; - // int j=0; - for (int i = 0, j = 0, k = 0; i < button_coord.length; i += 4, j += 2, k++) - { - button = new JButton(" " + button_command[j + 1]); - button.setActionCommand(button_command[j]); - // button.setFont(dataAccess.getFont(DataAccess.FONT_NORMAL)); - button.addActionListener(this); - - if (button_icon[k] != null) - { - button.setIcon(ATSwingUtils.getImageIcon_22x22(button_icon[k], this, m_da)); - } - - if (button_coord[i + 3] == 0) - { - button.setEnabled(false); - } - - if (k <= 1) - { - ATSwingUtils.addComponent(button, button_coord[i], button_coord[i + 1], button_coord[i + 2], 23, panel); - } - else - { - ATSwingUtils.addComponent(button, button_coord[i], button_coord[i + 1], button_coord[i + 2], 25, panel); - } - } - - help_button = ATSwingUtils.createHelpButtonByBounds(startx + 140, 195, 120, 25, this, ATSwingUtils.FONT_NORMAL, - m_da); - panel.add(help_button); - - m_da.enableHelp(this); - - initType(); - - } - - - private void initType() - { - switch (this.pumpAdditionalDataType) - { - case Activity: - case Comment: - case Urine: - { - areaText(); - } - break; - - case BloodGlucose: - { - areaBG(); - } - break; - - case Carbohydrates: - { - areaCH(); - } - break; - - case FoodDb: - case FoodDescription: - { - areaFood(); - } - break; - - default: - { - areaUnsupported(); - } - break; - } - } - - - // activity, comment, urine - private void areaText() - { - this.label_1 = ATSwingUtils.getLabel(null, startx, 100, 110, 25, this.main_panel); - this.text_1 = ATSwingUtils.getTextField("", startx, 130, 260, 25, this.main_panel); - - if (this.pumpAdditionalDataType == PumpAdditionalDataType.Activity) - { - this.label_1.setText(m_ic.getMessage("ACTIVITY")); - } - else if (this.pumpAdditionalDataType == PumpAdditionalDataType.Comment) - { - this.label_1.setText(m_ic.getMessage("COMMENT")); - } - else if (this.pumpAdditionalDataType == PumpAdditionalDataType.Urine) - { - this.label_1.setText(m_ic.getMessage("URINE")); - } - - } - - - /** - * Area: BG - */ - public void areaBG() - { - - ATSwingUtils.getLabel(m_ic.getMessage("BLOOD_GLUCOSE") + ":", startx + 20, 108, 100, 25, main_panel); - ATSwingUtils.getLabel("mg/dL", startx + 130, 108, 100, 25, main_panel); - ATSwingUtils.getLabel("mmol/L", startx + 130, 138, 100, 25, main_panel); - - /* - * this.num_1 = ATSwingUtils.getNumericTextField(2, 0, new Integer(0), - * startx + 180, 108, 55, 25, this.main_panel); - * this.num_2 = ATSwingUtils.getNumericTextField(2, 1, new Float(0.0f), - * startx + 180, 138, 55, 25, this.main_panel); - * this.num_1.addFocusListener(this); - * this.num_1.addKeyListener(this); - * this.num_2.addFocusListener(this); - * this.num_2.addKeyListener(this); - */ - - this.spin_1 = ATSwingUtils.getJSpinner(0.0f, 0.0f, 999.0f, 1.0f, startx + 180, 108, 55, 25, this.main_panel); - this.spin_1.addChangeListener(this); - - this.spin_2 = ATSwingUtils.getJSpinner(0.0f, 0.0f, 55.4f, 0.1f, startx + 180, 138, 55, 25, this.main_panel); - this.spin_2.addChangeListener(this); - - } - - - /** - * Area: CH - */ - public void areaCH() - { - - ATSwingUtils.getLabel(m_ic.getMessage("CH_LONG") + ":", startx + 20, 108, 100, 25, main_panel); - - // this.num_1 = ATSwingUtils.getNumericTextField(2, 0, new Integer(0), - // startx + 180, 108, 55, 25, this.main_panel); - - this.spin_1 = ATSwingUtils.getJSpinner(0.0f, 0.0f, 250.0f, 1, startx + 180, 108, ... [truncated message content] |
From: <and...@us...> - 2016-12-25 17:14:31
|
Revision: 1431 http://sourceforge.net/p/ggc/code/1431 Author: andyrozman Date: 2016-12-25 17:14:28 +0000 (Sun, 25 Dec 2016) Log Message: ----------- 2.0.2 - PumpDataAdditionalWizardTwo - PumpDataTypeComponent - PumpDataTypeComponent2 added new class for refactoring - added handlers for PDT Component 2 Modified Paths: -------------- trunk/ggc-pump/build/build.xml trunk/ggc-pump/docs/Changelog trunk/ggc-pump/docs/TO-DO_PumpTool.txt trunk/ggc-pump/pom.xml trunk/ggc-pump/src/ggc/pump/gui/manual/PumpDataAdditionalWizardTwo.java trunk/ggc-pump/src/ggc/pump/gui/manual/PumpDataTypeComponent.java Added Paths: ----------- trunk/ggc-pump/src/ggc/pump/gui/manual/PumpDataTypeComponent2.java trunk/ggc-pump/src/ggc/pump/gui/pdtc/PumpDataTypeAlarmHandler.java trunk/ggc-pump/src/ggc/pump/gui/pdtc/PumpDataTypeBasalHandler.java trunk/ggc-pump/src/ggc/pump/gui/pdtc/PumpDataTypeBolusHandler.java trunk/ggc-pump/src/ggc/pump/gui/pdtc/PumpDataTypeComponentHandler.java trunk/ggc-pump/src/ggc/pump/gui/pdtc/PumpDataTypeComponentHandlerAbstract.java trunk/ggc-pump/src/ggc/pump/gui/pdtc/PumpDataTypeErrorHandler.java trunk/ggc-pump/src/ggc/pump/gui/pdtc/PumpDataTypeEventHandler.java trunk/ggc-pump/src/ggc/pump/gui/pdtc/PumpDataTypePenInjectionHandler.java trunk/ggc-pump/src/ggc/pump/gui/pdtc/TemporaryBasalRateComponent.java Modified: trunk/ggc-pump/build/build.xml =================================================================== --- trunk/ggc-pump/build/build.xml 2016-12-25 17:08:39 UTC (rev 1430) +++ trunk/ggc-pump/build/build.xml 2016-12-25 17:14:28 UTC (rev 1431) @@ -6,11 +6,11 @@ <!-- Environment properties read from a file ...--> <property file="../../build/AtechTools.properties"/> - <property file="../../ggc-core/build/GGC_Core_Version.properties"/> - <property file="../../ggc-core/build/GGCBuild.properties"/> + <property file="../../ggc-core-app/ggc-core/build/GGC_Core_Version.properties"/> + <property file="../../ggc-core-app/ggc-core/build/GGCBuild.properties"/> <!-- <property file="./GGCPlugInBaseBuild.properties"/> <property file="../../ggc-plugin_base/build/GGCPlugInBaseBuild.properties"/> --> - <property file="../../ggc-plugin_base/build/GGCPlugInBaseVersion.properties"/> + <property file="../../ggc-plugins/ggc-plugins-base/build/GGCPlugInBaseVersion.properties"/> <property file="./GGCPumpToolVersion.properties"/> <!-- These should *not* be modified on the command line! --> Modified: trunk/ggc-pump/docs/Changelog =================================================================== --- trunk/ggc-pump/docs/Changelog 2016-12-25 17:08:39 UTC (rev 1430) +++ trunk/ggc-pump/docs/Changelog 2016-12-25 17:14:28 UTC (rev 1431) @@ -2,6 +2,13 @@ Changes file for GGC Pump Tool ============================== +2.0.2 [25.12.2016] [Andy] +- PumpDataAdditionalWizardTwo +- PumpDataTypeComponent +- PumpDataTypeComponent2 added new class for refactoring +- added handlers for PDT Component 2 + + 2.0.1 [26.5.2016] [Andy] - refactorings (code, db) - graphs for pump (the one from core), not complete yet Modified: trunk/ggc-pump/docs/TO-DO_PumpTool.txt =================================================================== --- trunk/ggc-pump/docs/TO-DO_PumpTool.txt 2016-12-25 17:08:39 UTC (rev 1430) +++ trunk/ggc-pump/docs/TO-DO_PumpTool.txt 2016-12-25 17:14:28 UTC (rev 1431) @@ -4,7 +4,7 @@ Development of Pump Tools runs totally independent on GGC project ================================================================== - + * Refactoring: PumpDataTypeComponent * Graphs (0.6) Modified: trunk/ggc-pump/pom.xml =================================================================== --- trunk/ggc-pump/pom.xml 2016-12-25 17:08:39 UTC (rev 1430) +++ trunk/ggc-pump/pom.xml 2016-12-25 17:14:28 UTC (rev 1431) @@ -5,7 +5,7 @@ <groupId>net.sf.ggc</groupId> <artifactId>ggc-parent</artifactId> <version>1.0-SNAPSHOT</version> - <relativePath>../ggc-master-pom/pom.xml</relativePath> + <relativePath>../ggc-removed/ggc-master-pom/pom.xml</relativePath> </parent> <name>GGC Pump Tool Project</name> Modified: trunk/ggc-pump/src/ggc/pump/gui/manual/PumpDataAdditionalWizardTwo.java =================================================================== --- trunk/ggc-pump/src/ggc/pump/gui/manual/PumpDataAdditionalWizardTwo.java 2016-12-25 17:08:39 UTC (rev 1430) +++ trunk/ggc-pump/src/ggc/pump/gui/manual/PumpDataAdditionalWizardTwo.java 2016-12-25 17:14:28 UTC (rev 1431) @@ -176,7 +176,7 @@ this.pumpAdditionalDataType == PumpAdditionalDataType.Urine) { this.text_1.setText(this.data_object.getValue()); - // po.setValue(this.text_1.getText()); + // po.setValue(this.text1.getText()); } else if (this.pumpAdditionalDataType == PumpAdditionalDataType.BloodGlucose) { @@ -476,7 +476,7 @@ { this.cb_1.setText(" " + m_ic.getMessage("IS_FOOD_AND_CH_SET")); l.setText("(" + m_ic.getMessage("FOOD_BY_DESC") + ")"); - // button_1.setBounds(startx, 175, 120, 25); + // button1.setBounds(startx, 175, 120, 25); } } Modified: trunk/ggc-pump/src/ggc/pump/gui/manual/PumpDataTypeComponent.java =================================================================== --- trunk/ggc-pump/src/ggc/pump/gui/manual/PumpDataTypeComponent.java 2016-12-25 17:08:39 UTC (rev 1430) +++ trunk/ggc-pump/src/ggc/pump/gui/manual/PumpDataTypeComponent.java 2016-12-25 17:14:28 UTC (rev 1431) @@ -1,13 +1,11 @@ package ggc.pump.gui.manual; +import java.awt.*; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.awt.event.ItemEvent; import java.awt.event.ItemListener; -import java.util.ArrayList; -import java.util.Enumeration; -import java.util.Hashtable; -import java.util.StringTokenizer; +import java.util.*; import javax.swing.*; @@ -91,7 +89,9 @@ ic.getMessage("PEN_INJECTION_BASAL"), ic.getMessage("PEN_INJECTION_BOLUS"), ic.getMessage("ADDITIONAL_DATA") }; + private Map<String, Component> componentMap; + /** * Constructor * @@ -146,7 +146,7 @@ combo_1.addActionListener(this); combo_2.addActionListener(this); - // JRadioButton rb_1, rb_2; + // JRadioButton radioButton1, radioButton2; this.rb_1 = new JRadioButton(); this.add(rb_1); @@ -247,7 +247,7 @@ { tbr_cmp.setVisible(false); label_1.setVisible(false); - // label_1.setHorizontalAlignment(JLabel.LEFT); + // label1.setHorizontalAlignment(JLabel.LEFT); label_2.setVisible(false); label_3.setVisible(false); label_4.setVisible(false); @@ -281,10 +281,10 @@ * private void setUnsupported() * { * this.hideAll(); - * label_1.setBounds(0, 20, 370, 25); - * label_1.setText("Component doesn't support this type: " + + * label1.setBounds(0, 20, 370, 25); + * label1.setText("Component doesn't support this type: " + * this.type_items[type]); - * label_1.setVisible(true); + * label1.setVisible(true); * this.setHeight(40); * } */ @@ -497,11 +497,11 @@ this.tbr_cmp.setBounds(0, 55, 180, 25); this.tbr_cmp.setVisible(true); - // this.num_tf_1_d2.setVisible(true); - // this.label_3.setBounds(0, 55, 150, 25); - // this.label_3.setText(i18nControlAbstract.getMessage("AMOUNT") + // this.numericDecimal2Field1.setVisible(true); + // this.label3.setBounds(0, 55, 150, 25); + // this.label3.setText(i18nControlAbstract.getMessage("AMOUNT") // + ":"); - // this.label_3.setVisible(true); + // this.label3.setVisible(true); this.setHeight(115); @@ -557,8 +557,8 @@ this.bg.add(rb_2); this.bg.add(rb_3); - // this.num_tf_1_d2.setBounds(150, 55, 180, 25); - // this.num_tf_1_d2.setVisible(true); + // this.numericDecimal2Field1.setBounds(150, 55, 180, 25); + // this.numericDecimal2Field1.setVisible(true); this.label_3.setBounds(0, 57, 150, 25); this.label_3.setText(ic.getMessage("PUMP_STATUS") + ":"); @@ -604,7 +604,7 @@ // System.out.println("Bolus: " + PumpBolusType.getDescriptions()); addAllItems(this.combo_1, PumpBolusType.getDescriptions()); - // this.combo_1.setSelectedIndex(1); + // this.combo1.setSelectedIndex(1); this.button_1.setBounds(120, 20, 25, 25); this.button_1.setVisible(true); @@ -659,8 +659,8 @@ this.label_2.setBounds(0, 90, 150, 25); this.text_1.setBounds(150, 90, 180, 25); - // this.text_1.setVisible(true); - // this.label_2.setVisible(true); + // this.text1.setVisible(true); + // this.label2.setVisible(true); this.num_tf_1_d2.setBounds(150, 55, 180, 25); this.num_tf_1_d2.setVisible(true); @@ -678,12 +678,12 @@ this.label_2.setBounds(0, 90, 150, 25); this.text_1.setBounds(110, 90, 220, 25); - // this.num_tf_1_d2.setBounds(150, 55, 180, 25); - // this.num_tf_1_d2.setVisible(true); - // this.label_3.setBounds(0, 55, 150, 25); - // this.label_3.setText(i18nControlAbstract.getMessage("AMOUNT") + // this.numericDecimal2Field1.setBounds(150, 55, 180, 25); + // this.numericDecimal2Field1.setVisible(true); + // this.label3.setBounds(0, 55, 150, 25); + // this.label3.setText(i18nControlAbstract.getMessage("AMOUNT") // + ":"); - // this.label_3.setVisible(true); + // this.label3.setVisible(true); this.bolus_sq.setBounds(0, 55, 200, 25); this.bolus_sq.setType(SquareBolusComponent.SQUARE_SINGLE); @@ -706,14 +706,14 @@ // 90 /* - * this.label_4.setText(i18nControlAbstract.getMessage( + * this.label4.setText(i18nControlAbstract.getMessage( * "AMOUNT_MW_2") + ":"); - * label_4.setBounds(0, 90, 150, 25); - * this.label_4.setVisible(true); - * this.num_tf_2_d2.setBounds(150, 90, 180, 25); - * this.num_tf_2_d2.setVisible(true); + * label4.setBounds(0, 90, 150, 25); + * this.label4.setVisible(true); + * this.numericDecimal2Field2.setBounds(150, 90, 180, 25); + * this.numericDecimal2Field2.setVisible(true); */ - // this.tc_1.setVisible(false); + // this.timeComponent.setVisible(false); this.bolus_sq.setBounds(0, 90, 200, 25); this.bolus_sq.setType(SquareBolusComponent.SQUARE_DUAL); @@ -727,10 +727,10 @@ case None: { /* - * this.num_tf_1_d2.setVisible(false); - * this.num_tf_2_d2.setVisible(false); - * this.label_3.setVisible(false); - * this.label_4.setVisible(false); + * this.numericDecimal2Field1.setVisible(false); + * this.numericDecimal2Field2.setVisible(false); + * this.label3.setVisible(false); + * this.label4.setVisible(false); */ this.label_2.setBounds(0, 55, 150, 25); @@ -859,7 +859,7 @@ setType(data.getBaseType()); this.text_1.setText(data.getComment()); - // this.combo_1.setSelectedIndex(data.getBaseType()); + // this.combo1.setSelectedIndex(data.getBaseType()); switch (this.type) { case Basal: @@ -944,7 +944,7 @@ String s[] = this.getParsedValues(data.getValue()); // String s[] = data.getValue().split(regex) this.num_tf_1_d2.setValue(m_da.getFloatValueFromString(s[0])); - // this.num_tf_2_d2.setValue(dataAccess.getFloatValueFromString(s[1])); + // this.numericDecimal2Field2.setValue(dataAccess.getFloatValueFromString(s[1])); this.bolus_sq.setValue(data.getValue()); } @@ -1026,7 +1026,7 @@ { pve.setSubType(PumpBasalType.getTypeFromDescription((String) this.combo_1.getSelectedItem())); // pve.setSubType(PumpEvents.getTypeFromDescription((String) - // this.combo_1.getSelectedItem())); + // this.combo1.getSelectedItem())); switch (PumpBasalType.getByCode(this.sub_type)) { @@ -1118,9 +1118,10 @@ */ // pve.setValue("AMOUNT_1=" + - // this.num_tf_1_d2.getCurrentValue() + + // this.numericDecimal2Field1.getCurrentValue() + // + // ";AMOUNT_2=" + - // this.num_tf_2_d2.getCurrentValue()); + // this.numericDecimal2Field2.getCurrentValue()); pve.setValue("IMMEDIATE_AMOUNT=" + this.num_tf_1_d2.getCurrentValue() + ";" + this.bolus_sq.getValue()); @@ -1154,7 +1155,7 @@ { pve.setSubType(PumpErrors.getTypeFromDescription((String) this.combo_1.getSelectedItem())); - // pve.setSubType(this.combo_1.getSelectedIndex()); + // pve.setSubType(this.combo1.getSelectedIndex()); } break; @@ -1276,8 +1277,8 @@ else if (cmd.equals("bolus_helper")) { System.out.println("Bolus Helper"); // Basal event: " + - // this.combo_1.getSelectedIndex()); - // setBasalSubType(this.combo_1.getSelectedIndex()); + // this.combo1.getSelectedIndex()); + // setBasalSubType(this.combo1.getSelectedIndex()); // m_parent.dtc float _bg = 0.0f; @@ -1525,8 +1526,8 @@ } // String s[] = data.getValue().split(regex) - // this.num_tf_1_d2.setValue(dataAccess.getFloatValueFromString(s[0])); - // this.num_tf_2_d2.setValue(dataAccess.getFloatValueFromString(s[1])); + // this.numericDecimal2Field1.setValue(dataAccess.getFloatValueFromString(s[0])); + // this.numericDecimal2Field2.setValue(dataAccess.getFloatValueFromString(s[1])); // System.out.println("setValue not implemented"); } Copied: trunk/ggc-pump/src/ggc/pump/gui/manual/PumpDataTypeComponent2.java (from rev 1379, trunk/ggc-pump/src/ggc/pump/gui/manual/PumpDataTypeComponent.java) =================================================================== --- trunk/ggc-pump/src/ggc/pump/gui/manual/PumpDataTypeComponent2.java (rev 0) +++ trunk/ggc-pump/src/ggc/pump/gui/manual/PumpDataTypeComponent2.java 2016-12-25 17:14:28 UTC (rev 1431) @@ -0,0 +1,1588 @@ +package ggc.pump.gui.manual; + +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.util.*; + +import javax.swing.*; + +import com.atech.graphics.components.JDecimalTextField; +import com.atech.graphics.components.TimeComponent; +import com.atech.i18n.I18nControlAbstract; +import com.atech.utils.ATSwingUtils; + +import ggc.core.data.defs.GlucoseUnitType; +import ggc.core.util.DataAccess; +import ggc.pump.data.PumpValuesEntry; +import ggc.pump.data.PumpValuesEntryExt; +import ggc.pump.data.defs.*; +import ggc.pump.gui.pdtc.TemporaryBasalRateComponent; +import ggc.pump.gui.profile.ProfileSelectorPump; +import ggc.pump.util.DataAccessPump; +import ggc.shared.bolushelper.BolusHelper; + +/** + * 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: PumpDataTypeComponent + * Description: Selection for different base selections and settings + * + * Author: Andy {an...@at...} + */ + +// NOTE: This class should replace currenr PumpDataTypeComponent, but it's still +// beeing developed + +@Deprecated +public class PumpDataTypeComponent2 extends JPanel implements ActionListener +{ + + private static final long serialVersionUID = -4449947661003378689L; + + TemporaryBasalRateComponent temporaryBasalRateComponent = null; + SquareBolusComponent squareBolusComponent = null; + JLabel label1, label2, label3, label4; + JTextField text1, text2; + JComboBox combo1, combo2; + JDecimalTextField numericDecimal2Field1, numericDecimal2Field2; + JRadioButton radioButton1, radioButton2, radioButton3; + ButtonGroup buttonGroup; + ProfileComponent profileComponent; + JButton button1; + TimeComponent timeComponent; + + PumpBaseType type = PumpBaseType.None; + int height = 0; + int width = 400; + + private PumpDataRowDialog m_parent = null; + + private DataAccessPump m_da = DataAccessPump.getInstance(); + private I18nControlAbstract ic = m_da.getI18nControlInstance(); + + private Object[] type_items = { ic.getMessage("SELECT_ITEM"), // + ic.getMessage("BASAL_DOSE"), // + ic.getMessage("BOLUS_DOSE"), // + ic.getMessage("EVENT"), // + ic.getMessage("ALARM"), // + ic.getMessage("ERROR"), // + ic.getMessage("REPORT"), // + ic.getMessage("PEN_INJECTION_BASAL"), // + ic.getMessage("PEN_INJECTION_BOLUS"), // + ic.getMessage("ADDITIONAL_DATA") }; + + private Map<String, JComponent> componentMap; + + + /** + * Constructor + * + * @param parent + * @param startx + */ + public PumpDataTypeComponent2(PumpDataRowDialog parent, int startx) + { + super(); + this.m_parent = parent; + this.setLayout(null); + init(); + this.setBounds(30, startx, width, height); + } + + + /** + * Init + */ + public void init() + { + ATSwingUtils.initLibrary(); + + componentMap = new HashMap<String, JComponent>(); + + temporaryBasalRateComponent = new TemporaryBasalRateComponent(); + addToComponents(temporaryBasalRateComponent, "temporaryBasalRateComponent"); + + label1 = new JLabel(); + label1.setFont(ATSwingUtils.getFont(ATSwingUtils.FONT_NORMAL_BOLD)); + this.add(label1); + label2 = new JLabel(); + label2.setFont(ATSwingUtils.getFont(ATSwingUtils.FONT_NORMAL_BOLD)); + this.add(label2); + label3 = new JLabel(); + label3.setFont(ATSwingUtils.getFont(ATSwingUtils.FONT_NORMAL_BOLD)); + this.add(label3); + label4 = new JLabel(); + label4.setFont(ATSwingUtils.getFont(ATSwingUtils.FONT_NORMAL_BOLD)); + this.add(label4); + + text1 = new JTextField(); + this.add(text1); + text2 = new JTextField(); + this.add(text2); + + combo1 = new JComboBox(); + this.add(combo1); + combo2 = new JComboBox(); + this.add(combo2); + + numericDecimal2Field1 = new JDecimalTextField(new Float(0.0f), 2); + this.add(numericDecimal2Field1); + numericDecimal2Field2 = new JDecimalTextField(new Float(0.0f), 2); + this.add(numericDecimal2Field2); + + combo1.addActionListener(this); + combo2.addActionListener(this); + + // JRadioButton radioButton1, radioButton2; + + this.radioButton1 = new JRadioButton(); + this.add(radioButton1); + this.radioButton2 = new JRadioButton(); + this.add(radioButton2); + this.radioButton3 = new JRadioButton(); + this.add(radioButton3); + + this.buttonGroup = new ButtonGroup(); + + profileComponent = new ProfileComponent(); + this.add(profileComponent); + + this.timeComponent = new TimeComponent(); + this.add(timeComponent); + + this.button1 = ATSwingUtils.getButton("", 0, 0, 0, 0, this, ATSwingUtils.FONT_NORMAL, "magic-wand.png", + "bolus_helper", this, m_da); + componentMap.put("button1", this.button1); + + this.squareBolusComponent = new SquareBolusComponent(); + addToComponents(this.squareBolusComponent, "squareBolusComponent"); + + } + + + public void addToComponents(JComponent component, String name) + { + this.componentMap.put(name, component); + this.add(component); + } + + + /** + * Set Type + * + * @param type + */ + public void setType(PumpBaseType type) + { + if (this.type == type) + return; + + this.type = type; + + switch (this.type) + { + + case Event: + case Alarm: + case Error: + { + this.setComboAndText(); + } + break; + + case Basal: + { + this.setBasal(); + } + break; + + case Bolus: + { + this.setBolus(); + } + break; + + case Report: + { + this.setReport(); + } + break; + + case PenInjectionBasal: + case PenInjectionBolus: + { + this.setNumericTextAndText(); + } + break; + + case None: + case AdditionalData: + default: + { + this.setEmpty(); + } + break; + } + + } + + + /** + * Get Items + * + * @return + */ + public Object[] getItems() + { + return this.type_items; + } + + + private void hideAll() + { + for (JComponent component : componentMap.values()) + { + component.setVisible(false); + } + + temporaryBasalRateComponent.setVisible(false); + label1.setVisible(false); + // label1.setHorizontalAlignment(JLabel.LEFT); + label2.setVisible(false); + label3.setVisible(false); + label4.setVisible(false); + text1.setVisible(false); + text2.setVisible(false); + combo1.setVisible(false); + combo2.setVisible(false); + numericDecimal2Field1.setVisible(false); + numericDecimal2Field2.setVisible(false); + combo1.setActionCommand(""); + combo2.setActionCommand(""); + radioButton1.setVisible(false); + radioButton2.setVisible(false); + radioButton3.setVisible(false); + profileComponent.setVisible(false); + this.button1.setVisible(false); + this.timeComponent.setVisible(false); + this.squareBolusComponent.setVisible(false); + + this.repaint(); + } + + + private void setEmpty() + { + this.hideAll(); + setHeight(0); + } + + /* + * private void setUnsupported() + * { + * this.hideAll(); + * label1.setBounds(0, 20, 370, 25); + * label1.setText("Component doesn't support this type: " + + * this.type_items[type]); + * label1.setVisible(true); + * this.setHeight(40); + * } + */ + + + // type: event, alarm, error + private void setComboAndText() + { + this.hideAll(); + + this.label1.setBounds(0, 22, 150, 25); + this.label1.setVisible(true); + + this.combo1.setBounds(150, 20, 180, 25); + this.combo1.setVisible(true); + + this.label2.setBounds(0, 57, 150, 25); + this.label2.setVisible(true); + + this.text1.setBounds(150, 55, 180, 25); + this.text1.setVisible(true); + + this.label2.setText(ic.getMessage("COMMENT") + ":"); + + this.setHeight(85); + + if (this.type == PumpBaseType.Event) + { + this.label1.setText(ic.getMessage("EVENT_TYPE") + ":"); + addAllItems(this.combo1, PumpEventType.getDescriptions()); + } + else if (this.type == PumpBaseType.Alarm) + { + this.label1.setText(ic.getMessage("ALARM_TYPE") + ":"); + addAllItems(this.combo1, PumpAlarms.getDescriptions()); + } + else if (this.type == PumpBaseType.Error) + { + this.label1.setText(ic.getMessage("ERROR_TYPE") + ":"); + addAllItems(this.combo1, PumpErrors.getDescriptions()); + // this.dataAccess.getPumpErrorTypes().getDescriptions()); + } + else + { + this.combo1.removeAllItems(); + } + + } + + + // type: pen bolus, pen basal + private void setNumericTextAndText() + { + this.hideAll(); + + this.label1.setBounds(0, 22, 150, 25); + this.label1.setVisible(true); + + this.numericDecimal2Field1.setBounds(150, 20, 180, 25); + this.numericDecimal2Field1.setVisible(true); + this.numericDecimal2Field1.setValue(new Float(0.0f)); + + this.label2.setBounds(0, 57, 150, 25); + this.label2.setVisible(true); + this.label2.setText(ic.getMessage("COMMENT") + ":"); + + this.text1.setBounds(150, 55, 180, 25); + this.text1.setVisible(true); + + this.setHeight(85); + + if (this.type == PumpBaseType.PenInjectionBasal) + { + this.label1.setText(ic.getMessage("BASAL_INSULIN") + ":"); + } + else if (this.type == PumpBaseType.PenInjectionBolus) + { + this.label1.setText(ic.getMessage("BOLUS_INSULIN") + ":"); + } + + } + + + // type: report + private void setReport() + { + this.hideAll(); + + this.label1.setBounds(0, 22, 150, 25); + this.label1.setVisible(true); + this.label1.setText(ic.getMessage("REPORT_TYPE") + ":"); + + this.combo1.setBounds(150, 20, 180, 25); + this.combo1.setVisible(true); + addAllItems(this.combo1, PumpReport.getDescriptions()); + + // PumpReportTypes().getDescriptions()); + + this.label2.setText(ic.getMessage("REPORT_TEXT") + ":"); + this.label2.setBounds(0, 57, 150, 25); + this.label2.setVisible(true); + + this.text2.setBounds(150, 55, 180, 25); + this.text2.setVisible(true); + + this.label3.setBounds(0, 92, 150, 25); + this.label3.setVisible(true); + this.label3.setText(ic.getMessage("COMMENT") + ":"); + + this.text1.setBounds(150, 90, 180, 25); + this.text1.setVisible(true); + + this.setHeight(115); + + } + + int sub_type = 0; + + + // types: basal + private void setBasal() + { + this.hideAll(); + this.sub_type = 0; + + this.label1.setBounds(0, 17, 150, 25); + this.label1.setVisible(true); + this.label1.setText(ic.getMessage("BASAL_TYPE") + ":"); + + this.combo1.setBounds(110, 15, 220, 25); + this.combo1.setVisible(true); + this.combo1.setActionCommand("basal"); + addAllItems(this.combo1, PumpBasalType.basal_desc); // this.dataAccess.getBasalSubTypes().getDescriptions()); + + this.label2.setBounds(0, 57, 150, 25); + this.label2.setVisible(true); + this.label2.setText(ic.getMessage("COMMENT") + ":"); + + this.text1.setBounds(110, 55, 220, 25); + this.text1.setVisible(true); + + this.setHeight(85); + + } + + + /** + * Set Basal Sub Type + * + * @param stype + */ + public void setBasalSubType(int stype) + { + // 20 55 + if (this.sub_type == stype) + return; + else + { + this.sub_type = stype; + } + + int index = m_da.getIndexOfElementInArray(PumpBasalType.getDescriptions(), + PumpBasalType.getByCode(stype).getTranslation()); + + this.combo1.setSelectedIndex(index); + + this.numericDecimal2Field1.setVisible(false); + this.numericDecimal2Field2.setVisible(false); + this.label3.setVisible(false); + this.label4.setVisible(false); + this.temporaryBasalRateComponent.setVisible(false); + + this.radioButton1.setVisible(false); + this.radioButton2.setVisible(false); + this.radioButton3.setVisible(false); + + this.buttonGroup.remove(radioButton1); + this.buttonGroup.remove(radioButton2); + this.buttonGroup.remove(radioButton3); + + profileComponent.setVisible(false); + + // comment + this.label2.setVisible(true); + this.text1.setVisible(true); + + switch (PumpBasalType.getByCode(this.sub_type)) + { + case Value: + { + this.label2.setBounds(0, 92, 150, 25); + this.text1.setBounds(150, 90, 180, 25); + + this.numericDecimal2Field1.setBounds(150, 55, 180, 25); + this.numericDecimal2Field1.setVisible(true); + this.label3.setBounds(0, 55, 150, 25); + this.label3.setText(ic.getMessage("AMOUNT") + ":"); + this.label3.setVisible(true); + + this.setHeight(115); + + } + break; + + case TemporaryBasalRate: + { + this.label2.setBounds(0, 92, 150, 25); + this.text1.setBounds(150, 90, 180, 25); + + this.temporaryBasalRateComponent.setBounds(0, 55, 180, 25); + this.temporaryBasalRateComponent.setVisible(true); + + // this.numericDecimal2Field1.setVisible(true); + // this.label3.setBounds(0, 55, 150, 25); + // this.label3.setText(i18nControlAbstract.getMessage("AMOUNT") + // + ":"); + // this.label3.setVisible(true); + + this.setHeight(115); + + } + break; + + case Profile: + { + this.label2.setBounds(0, 90, 150, 25); + this.text1.setBounds(150, 90, 180, 25); + + this.profileComponent.setBounds(0, 55, 180, 25); + this.profileComponent.setVisible(true); + + this.setHeight(115); + + } + break; + + case TemporaryBasalRateProfile: + { + this.label2.setBounds(0, 127, 150, 25); + this.text1.setBounds(150, 125, 180, 25); + + this.profileComponent.setBounds(0, 55, 180, 25); + this.profileComponent.setVisible(true); + + this.temporaryBasalRateComponent.setBounds(0, 90, 180, 25); + this.temporaryBasalRateComponent.setVisible(true); + + this.setHeight(150); + + } + break; + + case PumpStatus: + { + this.label2.setBounds(0, 142, 150, 25); + this.text1.setBounds(150, 140, 180, 25); + + this.radioButton1.setText(" " + ic.getMessage("ON")); + this.radioButton1.setBounds(150, 55, 200, 25); + this.radioButton1.setVisible(true); + this.radioButton1.setSelected(true); + this.radioButton2.setText(" " + ic.getMessage("OFF")); + this.radioButton2.setBounds(150, 80, 200, 25); + this.radioButton2.setVisible(true); + this.radioButton3.setText(" " + ic.getMessage("SUSPENDED")); + this.radioButton3.setBounds(150, 105, 200, 25); + this.radioButton3.setVisible(true); + + this.buttonGroup.add(radioButton1); + this.buttonGroup.add(radioButton2); + this.buttonGroup.add(radioButton3); + + // this.numericDecimal2Field1.setBounds(150, 55, 180, 25); + // this.numericDecimal2Field1.setVisible(true); + + this.label3.setBounds(0, 57, 150, 25); + this.label3.setText(ic.getMessage("PUMP_STATUS") + ":"); + this.label3.setVisible(true); + + this.setHeight(165); + + } + break; + + default: + { + this.label2.setVisible(false); + this.text1.setVisible(false); + + this.setHeight(55); + + } + break; + } + + this.m_parent.realignComponents(); + + } + + + // types: bolus + private void setBolus() + { + this.hideAll(); + this.sub_type = 0; + + this.label1.setBounds(0, 20, 150, 25); + this.label1.setVisible(true); + this.label1.setText(ic.getMessage("BOLUS_TYPE") + ":"); + + // System.out.println("DHHHD" + + // DataAccess.this.dataAccess.getBolusSubTypes().getStaticDescriptionArray()); + + this.combo1.setBounds(150, 20, 180, 25); + this.combo1.setVisible(true); + this.combo1.setActionCommand("bolus"); + + // System.out.println("Bolus: " + PumpBolusType.getDescriptions()); + addAllItems(this.combo1, PumpBolusType.getDescriptions()); + // this.combo1.setSelectedIndex(1); + + this.button1.setBounds(120, 20, 25, 25); + this.button1.setVisible(true); + + this.label2.setBounds(0, 55, 150, 25); + this.label2.setVisible(true); + this.label2.setText(ic.getMessage("COMMENT") + ":"); + + this.text1.setBounds(150, 55, 180, 25); + this.text1.setVisible(true); + + this.sub_type = -1; + this.setBolusSubType(PumpBolusType.Normal.getCode()); + // this.setHeight(85); + + } + + + /** + * Set Bolus Sub Type + * @param stype + */ + public void setBolusSubType(int stype) + { + // 20 55 + if (this.sub_type == stype) + return; + else + { + this.sub_type = stype; + } + + // fix subtype + // getIndexFromStaticDescriptionArrayWithID(stype) + + this.combo1.setSelectedIndex(m_da.getIndexOfElementInArray(PumpBolusType.getDescriptions(), + PumpBolusType.getByCode(stype).getTranslation())); + // this.dataAccess.getBolusSubTypes().getIndexFromStaticDescriptionArrayWithID(stype)); + + this.numericDecimal2Field1.setVisible(false); + this.numericDecimal2Field2.setVisible(false); + this.label3.setVisible(false); + this.label4.setVisible(false); + this.timeComponent.setVisible(false); + this.squareBolusComponent.setVisible(false); + + switch (PumpBolusType.getByCode(this.sub_type)) + { + case Normal: + case Audio: + { + this.label2.setBounds(0, 90, 150, 25); + this.text1.setBounds(150, 90, 180, 25); + + // this.text1.setVisible(true); + // this.label2.setVisible(true); + + this.numericDecimal2Field1.setBounds(150, 55, 180, 25); + this.numericDecimal2Field1.setVisible(true); + this.label3.setBounds(0, 55, 150, 25); + this.label3.setText(ic.getMessage("AMOUNT") + ":"); + this.label3.setVisible(true); + + this.setHeight(115); + } + break; + + case Extended: + { + // TODO + this.label2.setBounds(0, 90, 150, 25); + this.text1.setBounds(110, 90, 220, 25); + + // this.numericDecimal2Field1.setBounds(150, 55, 180, 25); + // this.numericDecimal2Field1.setVisible(true); + // this.label3.setBounds(0, 55, 150, 25); + // this.label3.setText(i18nControlAbstract.getMessage("AMOUNT") + // + ":"); + // this.label3.setVisible(true); + + this.squareBolusComponent.setBounds(0, 55, 200, 25); + this.squareBolusComponent.setType(SquareBolusComponent.SQUARE_SINGLE); + this.squareBolusComponent.setVisible(true); + + this.setHeight(115); + } + break; + + case Multiwave: + { + this.label2.setBounds(0, 125, 150, 25); + this.text1.setBounds(150, 125, 180, 25); + + this.numericDecimal2Field1.setBounds(150, 55, 180, 25); + this.numericDecimal2Field1.setVisible(true); + this.label3.setBounds(0, 55, 150, 25); + this.label3.setText(ic.getMessage("IMMEDIATE_AMOUNT") + ":"); + this.label3.setVisible(true); + + // 90 + /* + * this.label4.setText(i18nControlAbstract.getMessage( + * "AMOUNT_MW_2") + ":"); + * label4.setBounds(0, 90, 150, 25); + * this.label4.setVisible(true); + * this.numericDecimal2Field2.setBounds(150, 90, 180, 25); + * this.numericDecimal2Field2.setVisible(true); + */ + // this.timeComponent.setVisible(false); + + this.squareBolusComponent.setBounds(0, 90, 200, 25); + this.squareBolusComponent.setType(SquareBolusComponent.SQUARE_DUAL); + this.squareBolusComponent.setVisible(true); + + this.setHeight(150); + + } + break; + + case None: + { + /* + * this.numericDecimal2Field1.setVisible(false); + * this.numericDecimal2Field2.setVisible(false); + * this.label3.setVisible(false); + * this.label4.setVisible(false); + */ + + this.label2.setBounds(0, 55, 150, 25); + this.text1.setBounds(150, 55, 180, 25); + this.setHeight(85); + } + break; + + } + + this.m_parent.realignComponents(); + + } + + + /** + * Are Required Elements Set. For checking if elements are set. + * + * @return + */ + public boolean areRequiredElementsSet() + { + // System.out.println("!!!! Are Elements Set - Not Implemented !!!!"); + + switch (this.type) + { + + case Basal: + { + switch (PumpBasalType.getByCode(this.sub_type)) + { + case Value: + { + return m_da.getFloatValue(this.numericDecimal2Field1.getCurrentValue()) >= 0; + } + + case TemporaryBasalRate: + { + return this.temporaryBasalRateComponent.isValueSet(); + } + + case Profile: + { + return this.profileComponent.isValueSet(); + } + + case TemporaryBasalRateProfile: + { + return this.temporaryBasalRateComponent.isValueSet() + && this.profileComponent.isValueSet(); + } + + case PumpStatus: + { + return this.radioButton1.isSelected() || this.radioButton2.isSelected() + || this.radioButton3.isSelected(); + } + + default: + return false; + } + } + + case Bolus: + { + switch (PumpBolusType.getByCode(this.sub_type)) + { + case Normal: + case Audio: + { + return this.numericDecimal2Field1.getText().length() > 0; + } + case Extended: + { + return this.squareBolusComponent.isValueSet(); + } + + case Multiwave: + { + return m_da.getFloatValue(this.numericDecimal2Field1.getCurrentValue()) > 0 + && this.squareBolusComponent.isValueSet(); + } + + default: + { + return false; + + } + + } + } + + case Event: + case Alarm: + case Error: + { + return this.combo1.getSelectedIndex() > 0; + } + + case Report: + { + return this.combo1.getSelectedIndex() > 0 && this.text2.getText().trim().length() != 0; + } + + case PenInjectionBasal: + case PenInjectionBolus: + { + return m_da.getFloatValue(this.numericDecimal2Field1.getCurrentValue()) > 0; + } + + case AdditionalData: + default: + return true; + + } + + } + + + /** + * Load Data + * + * @param data + */ + public void loadData(PumpValuesEntry data) + { + // System.out.println("Load data not implemented yet !"); + setType(data.getBaseType()); + this.text1.setText(data.getComment()); + + // this.combo1.setSelectedIndex(data.getBaseType()); + switch (this.type) + { + case Basal: + { + this.setBasalSubType(data.getSubType()); + + switch (PumpBasalType.getByCode(this.sub_type)) + { + case Value: + { + this.numericDecimal2Field1.setValue(m_da.getFloatValueFromString(data.getValue())); + } + break; + + case TemporaryBasalRate: + { + this.temporaryBasalRateComponent.setValue(data.getValue()); + } + break; + + case Profile: + { + this.profileComponent.setValue(data.getValue()); + } + break; + + case TemporaryBasalRateProfile: + { + String s[] = this.getParsedValues(data.getValue()); + this.profileComponent.setValue(s[0]); + this.temporaryBasalRateComponent.setValue(s[1]); + } + break; + + case PumpStatus: + { + int i = m_da.getIntValueFromString(data.getValue(), 0); + + if (i == 1) + { + this.radioButton1.setSelected(true); + } + else if (i == 2) + { + this.radioButton2.setSelected(true); + } + else if (i == 3) + { + this.radioButton3.setSelected(true); + } + } + break; + + default: + break; + } + } + break; + + case Bolus: + { + this.setBolusSubType(data.getSubType()); + + switch (PumpBolusType.getByCode(this.sub_type)) + { + case Normal: + case Audio: + { + this.numericDecimal2Field1.setValue(m_da.getFloatValueFromString(data.getValue())); + } + break; + + case Extended: + { + this.squareBolusComponent.setValue(data.getValue()); + } + break; + + case Multiwave: + { + + String s[] = this.getParsedValues(data.getValue()); + // String s[] = data.getValue().split(regex) + this.numericDecimal2Field1.setValue(m_da.getFloatValueFromString(s[0])); + // this.numericDecimal2Field2.setValue(dataAccess.getFloatValueFromString(s[1])); + this.squareBolusComponent.setValue(data.getValue()); + + } + break; + + default: + { + + } + break; + + } + // TODO + } + break; + + case Event: + { + int index = m_da.getIndexOfElementInArray(PumpEventType.getDescriptions(), + PumpEventType.getByCode(data.getSubType()).getTranslation()); + this.combo1.setSelectedIndex(index); + } + break; + case Alarm: + { + int index = m_da.getIndexOfElementInArray(PumpAlarms.getDescriptions(), + PumpAlarms.getByCode(data.getSubType()).getTranslation()); + this.combo1.setSelectedIndex(index); + } + break; + case Error: + { + int index = m_da.getIndexOfElementInArray(PumpErrors.getDescriptions(), + PumpErrors.getByCode(data.getSubType()).getTranslation()); + this.combo1.setSelectedIndex(index); + } + break; + + case Report: + { + int index = m_da.getIndexOfElementInArray(PumpReport.getDescriptions(), + PumpReport.getByCode(data.getSubType()).getTranslation()); + this.combo1.setSelectedIndex(index); + this.text2.setText(data.getValue()); + } + break; + + case PenInjectionBasal: + case PenInjectionBolus: + { + this.numericDecimal2Field1.setValue(m_da.getFloatValueFromString(data.getValue())); + } + break; + + case AdditionalData: + break; + + default: + System.out.println("Load not implemented for this type: " + data.getBaseType()); + break; + + } + + } + + + /** + * Save Data (we put in PumpValuesEntry, which is then set to right values) + * + * @param pve + */ + public void saveData(PumpValuesEntry pve) + { + pve.setComment(this.text1.getText()); + + switch (this.type) + { + case Basal: + { + pve.setSubType(PumpBasalType.getTypeFromDescription((String) this.combo1.getSelectedItem())); + // pve.setSubType(PumpEvents.getTypeFromDescription((String) + // this.combo1.getSelectedItem())); + + switch (PumpBasalType.getByCode(this.sub_type)) + { + case Value: + { + pve.setValue("" + this.numericDecimal2Field1.getCurrentValue()); + } + break; + + case TemporaryBasalRate: + { + pve.setValue(this.temporaryBasalRateComponent.getValue()); + } + break; + + case Profile: + { + pve.setValue(this.profileComponent.getValue()); + } + break; + + case TemporaryBasalRateProfile: + { + pve.setValue("PROFILE_ID=" + this.profileComponent.getValue() + ";TBR=" + + this.temporaryBasalRateComponent.getValue()); + } + break; + + case PumpStatus: + { + if (this.radioButton1.isSelected()) + { + pve.setValue("1"); + } + else if (this.radioButton2.isSelected()) + { + pve.setValue("2"); + } + else if (this.radioButton3.isSelected()) + { + pve.setValue("3"); + } + else + { + pve.setValue("0"); + } + } + break; + + default: + break; + } + } + break; + + case Bolus: + { + pve.setSubType(PumpBolusType.getTypeFromDescription((String) this.combo1.getSelectedItem())); + // pve.setSubType(sub_type); + + switch (PumpBolusType.getByCode(this.sub_type)) + { + case Normal: + case Audio: + { + pve.setValue("" + this.numericDecimal2Field1.getCurrentValue()); + + } + break; + + // case PumpBolusType.PUMP_BOLUS_DUAL_SQUARE: + case Extended: + { + pve.setValue(this.squareBolusComponent.getValue()); + // pve.setValue("AMOUNT_SQUARE=" + amount + + // ";DURATION=" + e); + + } + break; + + case Multiwave: + { + /* + * pve.setValue(String.format( + * "AMOUNT=%s;AMOUNT_SQUARE=%s;DURATION=%s", + * str[0], + * str[2], + * str[3])); + */ + + // pve.setValue("AMOUNT_1=" + + // this.numericDecimal2Field1.getCurrentValue() + // + + // ";AMOUNT_2=" + + // this.numericDecimal2Field2.getCurrentValue()); + + pve.setValue("IMMEDIATE_AMOUNT=" + this.numericDecimal2Field1.getCurrentValue() + ";" + + this.squareBolusComponent.getValue()); + + } + break; + + default: + { + + } + break; + + } + // TODO + } + break; + + case Event: + { + pve.setSubType(PumpEventType.getTypeFromDescription((String) this.combo1.getSelectedItem())); + } + break; + + case Alarm: + { + pve.setSubType(PumpAlarms.getTypeFromDescription((String) this.combo1.getSelectedItem())); + } + break; + case Error: + { + pve.setSubType(PumpErrors.getTypeFromDescription((String) this.combo1.getSelectedItem())); + + // pve.setSubType(this.combo1.getSelectedIndex()); + } + break; + + case Report: + { + pve.setSubType(PumpReport.getTypeFromDescription((String) this.combo1.getSelectedItem())); + pve.setValue(this.text2.getText()); + } + break; + + case PenInjectionBasal: + case PenInjectionBolus: + { + pve.setSubType(0); + pve.setValue("" + this.numericDecimal2Field1.getCurrentValue()); + } + break; + + case AdditionalData: + default: + break; + + } + + // System.out.println("Save data not implemented yet !"); + + } + + + private String[] getParsedValues(String val) + { + ArrayList<String> lst = new ArrayList<String>(); + + StringTokenizer strtok = new StringTokenizer(val, ";"); + + while (strtok.hasMoreTokens()) + { + String tk = strtok.nextToken(); + lst.add(tk.substring(tk.indexOf("=") + 1)); + } + + String ia[] = new String[lst.size()]; + return lst.toArray(ia); + } + + + private void addAllItems(JComboBox cb, String[] array) + { + cb.removeAllItems(); + + for (String element : array) + { + // System.out.println("e: " + element); + cb.addItem(element); + } + } + + + private void addAllItems(JComboBox cb, Hashtable<Integer, String> ht) + { + cb.removeAllItems(); + + for (Enumeration<Integer> en = ht.keys(); en.hasMoreElements();) + { + Integer i = en.nextElement(); + cb.addItem(ht.get(i)); + } + } + + + /** + * Set Height + * + * @param height + */ + public void setHeight(int height) + { + this.height = height; + this.setSize(width, height); + } + + + /** + * Get Height + */ + @Override + public int getHeight() + { + return this.height; + } + + + /** + * Get Base Type + * + * @return + */ + public PumpBaseType getBaseType() + { + return this.type; + } + + + /** + * Action Performed + */ + public void actionPerformed(ActionEvent ev) + { + String cmd = ev.getActionCommand(); + + if (cmd.equals("bolus")) + { + setBolusSubType(PumpBolusType.getTypeFromDescription((String) this.combo1.getSelectedItem())); + } + else if (cmd.equals("basal")) + { + setBasalSubType(PumpBasalType.getTypeFromDescription((String) this.combo1.getSelectedItem())); + } + else if (cmd.equals("bolus_helper")) + { + System.out.println("Bolus Helper"); // Basal event: " + + // this.combo1.getSelectedIndex()); + // setBasalSubType(this.combo1.getSelectedIndex()); + // m_parent.dtc + + float _bg = 0.0f; + float ch = 0.0f; + + if (m_parent.ht_data.containsKey(PumpAdditionalDataType.BloodGlucose)) + { + PumpValuesEntryExt pvex = m_parent.ht_data.get(PumpAdditionalDataType.BloodGlucose); + _bg = m_da.getFloatValueFromString(pvex.getValue()); + + if (m_da.getGlucoseUnitType() == GlucoseUnitType.mmol_L) + { + _bg = m_da.getBGValueDifferent(GlucoseUnitType.mmol_L, _bg); + } + } + + if (m_parent.ht_data.containsKey(PumpAdditionalDataType.Carbohydrates)) + { + PumpValuesEntryExt pvex = m_parent.ht_data.get(PumpAdditionalDataType.Carbohydrates); + ch = m_da.getFloatValueFromString(pvex.getValue()); + } + + BolusHelper bh = new BolusHelper(m_parent, _bg, // dataAccess.getJFormatedTextValueFloat(ftf_bg2), + ch, // dataAccess.getJFormatedTextValueFloat(this.ftf_ch), + m_parent.dtc.getDateTime(), 2, DataAccess.INSULIN_PUMP); + + if (bh.hasResult()) + { + this.numericDecimal2Field1.setValue(bh.getResult()); + // this.ftf_ins1.setValue(bh.getResult()); + } + + } + } + + private class ProfileComponent extends JPanel implements ActionListener + { + + private static final long serialVersionUID = 1195430308386555236L; + JLabel label_1_1, label_2_1; + JButton b_button_1; + // PumpValuesEntryProfile profile = null; + String profile; + + + public ProfileComponent() + { + super(); + this.setLayout(null); + this.init(); + } + + + private void init() + { + label_1_1 = new JLabel(ic.getMessage("PROFILE") + ":"); + label_1_1.setBounds(0, 0, 140, 25); + label_1_1.setFont(ATSwingUtils.getFont(ATSwingUtils.FONT_NORMAL_BOLD)); + this.add(label_1_1); + + label_2_1 = new JLabel(ic.getMessage("NOT_SELECTED")); + label_2_1.setBounds(150, 0, 140, 25); + this.add(label_2_1); + + b_button_1 = new JButton("...")... [truncated message content] |
From: <and...@us...> - 2016-12-25 17:08:43
|
Revision: 1430 http://sourceforge.net/p/ggc/code/1430 Author: andyrozman Date: 2016-12-25 17:08:39 +0000 (Sun, 25 Dec 2016) Log Message: ----------- GGC Meters - moving paths Modified Paths: -------------- trunk/ggc-plugins/ggc-meter/build/build.xml trunk/ggc-plugins/ggc-meter/pom.xml trunk/ggc-plugins/ggc-plugins-base/pom.xml trunk/ggc-plugins/pom.xml Added Paths: ----------- trunk/ggc-plugins/ggc-meter/src/main/java/ggc/ trunk/ggc-plugins/ggc-meter/src/main/resources/GGCMeterTool_de.properties trunk/ggc-plugins/ggc-meter/src/main/resources/GGCMeterTool_en.properties trunk/ggc-plugins/ggc-meter/src/main/resources/GGCMeterTool_fr.properties trunk/ggc-plugins/ggc-meter/src/main/resources/GGCMeterTool_si.properties trunk/ggc-plugins/ggc-meter/src/main/resources/html/ trunk/ggc-plugins/ggc-meter/src/main/resources/icons/ Removed Paths: ------------- trunk/ggc-plugins/ggc-meter/src/GGCMeterTool_de.properties trunk/ggc-plugins/ggc-meter/src/GGCMeterTool_en.properties trunk/ggc-plugins/ggc-meter/src/GGCMeterTool_fr.properties trunk/ggc-plugins/ggc-meter/src/GGCMeterTool_si.properties trunk/ggc-plugins/ggc-meter/src/ggc/ trunk/ggc-plugins/ggc-meter/src/html/ trunk/ggc-plugins/ggc-meter/src/icons/ Modified: trunk/ggc-plugins/ggc-meter/build/build.xml =================================================================== --- trunk/ggc-plugins/ggc-meter/build/build.xml 2016-12-25 17:00:38 UTC (rev 1429) +++ trunk/ggc-plugins/ggc-meter/build/build.xml 2016-12-25 17:08:39 UTC (rev 1430) @@ -54,7 +54,7 @@ </copy> <mkdir dir="${binary.dir}/icons" /> <copy todir="${binary.dir}/icons" overwrite="true"> - <fileset dir="../src/icons" casesensitive="no"> + <fileset dir="../src/main/resources/icons" casesensitive="no"> <include name="**/*.gif"/> <include name="**/*.jpg"/> <include name="**/*.png"/> Modified: trunk/ggc-plugins/ggc-meter/pom.xml =================================================================== --- trunk/ggc-plugins/ggc-meter/pom.xml 2016-12-25 17:00:38 UTC (rev 1429) +++ trunk/ggc-plugins/ggc-meter/pom.xml 2016-12-25 17:08:39 UTC (rev 1430) @@ -5,42 +5,17 @@ <parent> <groupId>net.sf.ggc</groupId> - <artifactId>ggc-parent</artifactId> - <version>1.0-SNAPSHOT</version> - <relativePath>../ggc-removed/ggc-master-pom/pom.xml</relativePath> + <artifactId>ggc-plugins</artifactId> + <version>0.8-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> </parent> - <name>GGC Meter Tool Project</name> + <name>GGC Plugins - Meter Tool</name> <artifactId>ggc-meter-tool</artifactId> <version>${ggc-meter-tool.version}</version> - <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> - - </build> - <dependencies> <dependency> Deleted: trunk/ggc-plugins/ggc-meter/src/GGCMeterTool_de.properties =================================================================== --- trunk/ggc-plugins/ggc-meter/src/GGCMeterTool_de.properties 2016-12-25 17:00:38 UTC (rev 1429) +++ trunk/ggc-plugins/ggc-meter/src/GGCMeterTool_de.properties 2016-12-25 17:08:39 UTC (rev 1430) @@ -1,154 +0,0 @@ -# -# ###################################################################### -# ### GNU Glucose Control ### -# ###################################################################### -# ### Language: German ### -# ### Created by: Reinhold Rumberger (ru...@us...)### -# ### Version: 2.0.3 ### -# ### Last change: 03.07.2011 14:30:06 ### -# ###################################################################### -# -# -# Translation status: -# Words/expressions: 67 -# Not translated: 58 (86 %) -# Need to be checked: 0 (0 %) -# -# Translated: 9 (13 %) -# -# -# -## -# 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-standard, 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 - -# -# Plug-in Specific [1] -# -DEVICE_NAME_NORMAL=meter -DEVICE_NAME_BIG=Meter -DEVICE_FULL_NAME_WITH_PORT=%s auf %s -DEVICE_FULL_NAME_WITHOUT_PORT=%s -DEVICE_DEVICE=Meter device - -# -# Menus [1] -# -MN_METERS=&Messger\u00E4te -MN_METERS_READ=Messger\u00E4t &auslesen -MN_METERS_READ_DESC=Daten des Messger\u00E4ts auslesen -MN_METERS_LIST=Messger\u00E4te&liste -MN_METERS_LIST_DESC=Liste der meisten verf\u00FCgbaren Messger\u00E4te -MN_METERS_CONFIG=Messger\u00E4te-Plug-in &Einstellungen -MN_METERS_CONFIG_DESC=Einstellungen zum Messger\u00E4te-Plug-in -MN_METERS_ABOUT=About... -MN_METERS_ABOUT_DESC=About Meter Plugin (copyright, features, credits,...) -MN_METERS_READ_FILE=Read file -MN_METERS_READ_FILE_DESC=Read data from meter/sw export file - -# -# Configuration [1] -# -MY__=My -NEW__=New -DEVICE_CONFIGURATION=%s Configuration -SELECT_X_DEVICE=Select %s Device -SELECTED_X_DEVICE=Selected %s Device -DEVICE_CUSTOM_NAME=%s Custom Name - -# -# Meter Selector [1] -# -SELECTOR_DEVICE=%s Device Selector - -# -# Instructions Dialog [1] -# -OOPS_DEVICE_NOT_CONFIGURED=Oops ! You forgot to configure your %s\nand currently there is no %s configured\nand/or selected. Please visit configuration\nand configure your %s. -CONFIGURED_DEVICE_INSTRUCTIONS=Configured %s and Instructions -DEVICE_ICON=%s picture -DEVICE_INFO=%s Info - -# -# Transfer display [1] -# -ERROR_CONTACTING_DEVICE=We had problem contacting Meter device.\nPlease recheck communication port settings\n(some of cables, can change their address,\nwhen reconnected). Run configuration again\nand problem should be solved!\n -READ_DEVICE_DATA_TITLE=Read Meter Data [%s on %s] -STATUS_READER_ERROR=Internal %s (or port) error - -# table (add new table items here) -DATETIME=Date/Time -BG_MMOLL=BG (mmol/L) -BG_MGDL=BG (mg/dL) -MULTIPLE=Multiple - -# extended type table -URINE=Ketones -BG=Blood Glucose -ENTRY_TYPE=Type - -# -# Export [1] -# -EXPORT_DEVICE_DATA=Export %s Data - -# -# List [1] -# -DEVICE_LIST_WEB=%s List -DEVICE_LIST_WEB_DESC=<html>Meters List is not list of all available Meters in the world, this is just list of some (mostly commonly used) Meters available. We add new devices here when our source page changes (www.diabetesnet.com) or if some user requests that their device is to be added. Meters in list are color coded, and color determines status of devices of selected company. Color coding description is shown at bottom of this page.<br></html> - -# -# About [1] -# -DEVICE_PLUGIN=%s Plug-in -DEVICE_PLUGIN_ABOUT=About %s Plug-in - -# -# Meter Instructions [1] -# - -# ascensia -INSTRUCTIONS_ASCENSIA_BREEZE=<html>Instructions for meter download:<ul><li>Attach the meter cable to the selected PC<br> serial port</li><li>Plug the meter cable into the round meter port<br></li><li>Press the meter button to turn the meter ON</li></ul><br>Click "Start Download" to begin reading data from<br>your meter...</html> -INSTRUCTIONS_ASCENSIA_CONTOUR=<html>Instructions for meter download:<ul><li>Attach the meter cable to the selected PC<br> serial port</li><li>Plug the meter cable into the round meter port<br></li><li>Press the meter button M to turn the meter ON</li></ul><br>Click "Start Download" to begin reading data from<br>your meter...</html> -INSTRUCTIONS_ASCENSIA_ELITE_XL=<html>Instructions for meter download:<ul><li>Attach the meter cable to the selected PC<br> serial port</li><li>Plug the meter cable into the round meter<br>port<br></li><li>Press the meter button to turn the meter ON</li></ul><br>Click "Start Download" to begin reading data from<br>your meter...</html> -INSTRUCTIONS_ASCENSIA_DEX=<html>Instructions for meter download:<ul><li>Attach the meter cable to the selected PC<br> serial port<br></li><li>Plug the meter cable into the port between<br> the two meter buttons<br></li><li>Slide the meter cover to turn the meter ON</li></ul><br>Click "Start Download" to begin reading data from<br>your meter...</html> - -# roche -INSTRUCTIONS_ACCUCHEK_ACTIVE=<html><ul><li>Pix Device should be attached before program<br>is started</li><li>Place meter max. 10 cm from Pix device</li><li>Click on "Start Download" to start and watch<br>status until it becomes 'Detecting devices'.</li><li>Keep button M (left) on Active pressed for more<br>than 3 seconds and download will start.</li></ul>Accu-Check Pix has sometimes problems with java, so<br>you might be forced to start downloading twice.</html> -INSTRUCTIONS_ACCUCHEK_ADVANTAGE=<html><ul><li>Pix Device should be attached before program<br>is started</li><li>Click on "Start Download" to start and watch<br>status until it becomes 'Detecting devices'.</li><li>Insert IR Key into meter and place meter max.<br>10 cm from Pix device and download will start.</li></ul>Accu-Check Pix has sometimes problems with java, so<br>you might be forced to start downloading twice.</html> -INSTRUCTIONS_ACCUCHEK_AVIVA=<html><ul><li>Pix Device should be attached before program<br>is started</li><li>Place meter max. 10 cm from Pix device</li><li>Click on "Start Download" to start and watch<br>status until it becomes 'Detecting devices'.</li><li>Keep both buttons on Aviva pressed for more<br>than 3 seconds and download will start.</li></ul>Accu-Check Pix has sometimes problems with java, so<br>you might be forced to start downloading twice.</html> -INSTRUCTIONS_ACCUCHEK_COMFORT=<html><ul><li>Pix Device should be attached before program<br>is started</li><li>Click on "Start Download" to start and watch<br>status until it becomes 'Detecting devices'.</li><li>Insert IR Key into meter and place meter max.<br>10 cm from Pix device and download will start.</li></ul>Accu-Check Pix has sometimes problems with java, so<br>you might be forced to start downloading twice.</html> -INSTRUCTIONS_ACCUCHEK_COMPACT=<html><li>Pix Device should be attached before program<br>is started (it has sometimes problems with java,<br>so you might be forced to download twice)</li><li>Place meter max. 10 cm from Pix device</li><li>Click on "Start Download" to start and watch<br>status until it becomes 'Detecting devices'.</li><li>Keep both SET and MEMO buttons pressed for<br>more than 3 seconds and download will start.</li></html> -INSTRUCTIONS_ACCUCHEK_COMPACTPLUS=<html><li>Pix Device should be attached before program<br>is started (it has sometimes problems with java,<br>so you might be forced to download twice)</li><li>Place meter max. 10 cm from Pix device</li><li>Click on "Start Download" to start and watch<br>status until it becomes 'Detecting devices'.</li><li>Keep both S and M buttons pressed for<br>more than 3 seconds and download will start.</li></html> -INSTRUCTIONS_ACCUCHEK_GO=<html><ul><li>Pix Device should be attached before program<br>is started</li><li>Place meter max. 10 cm from Pix device</li><li>Click on "Start Download" to start and watch<br>status until it becomes 'Detecting devices'.</li><li>Keep button M (left) on Active pressed for more<br>than 3 seconds and download will start.</li></ul>Accu-Check Pix has sometimes problems with java, so<br>you might be forced to start downloading twice.</html> -INSTRUCTIONS_ACCUCHEK_INTEGRA=<html><li>Pix Device should be attached before program<br>is started (it has sometimes problems with java,<br>so you might be forced to download twice)</li><li>Place meter max. 10 cm from Pix device</li><li>Click on "Start Download" to start and watch<br>status until it becomes 'Detecting devices'.</li><li>Keep both SET and MEMO buttons pressed for<br> more than 3 seconds and download will start.</li></html> -INSTRUCTIONS_ACCUCHEK_PERFORMA=Performa not supported at this time. -INSTRUCTIONS_ACCUCHEK_SENSOR=<html><ul><li>Pix Device should be attached before program<br>is started</li><li>Click on "Start Download" to start and watch<br>status until it becomes 'Detecting devices'.</li><li>Insert IR Key into meter and place meter max.<br>10 cm from Pix device and download will start.</li></ul>Accu-Check Pix has sometimes problems with java, so<br>you might be forced to start downloading twice.</html> -INSTRUCTIONS_ACCUCHEK_NANO=<html><ul><li>Pix Device should be attached before program<br>is started</li><li>Place meter max. 10 cm from Pix device</li><li>Click on "Start Download" to start and watch<br>status until it becomes 'Detecting devices'.</li><li>Keep Left and Right buttons on Aviva pressed<br>for more than 3 seconds and download will<br>start.</li></ul>Accu-Check Pix has sometimes problems with java, so<br>you might be forced to start downloading twice.</html> - -# lifescan -INSTRUCTIONS_LIFESCAN_ON=<html>Instructions for meter download:<ul><li>Attach the meter cable to the selected PC<br> serial port</li><li>Plug the meter cable into the meter port<br></li><li>Make sure that meter is ON</li></ul><br>Click "Start Download" to begin reading data from<br>your meter...</html> -INSTRUCTIONS_LIFESCAN_OFF=<html>Instructions for meter download:<ul><li>Attach the meter cable to the selected PC<br> serial port</li><li>Plug the meter cable into the meter port<br></li><li>Make sure that meter is OFF</li></ul><br>Click "Start Download" to begin reading data from<br>your meter...</html> - -# Abbott and also Menarini -INSTRUCTIONS_ABBOTT_OPTIUMXCEED=<html>Instructions for meter download:<ul><li>Attach the meter cable to the selected PC<br> serial/USB port</li><li>Plug the meter cable into meter strip port<br></li></ul><br>Click "Start Download" to begin reading data from<br>your meter...</html> - -# -# Devices [2] -# - -# OT Ultra mini & OT Ultra (some) -READING_SW_VERSION=Reading Sw version -READING_SERIAL_NR=Read Serial number -READING_DATA_COUNTER=Reading data counter -READING_PROCESSING_ENTRY=Reading and processing entry # -READING_SERIAL_NR_SETTINGS=Read Serial number & Settings - -# AccuChek Combo -BG_UNIT=BG Unit -TIME_ON_DEVICE=Time on device Deleted: trunk/ggc-plugins/ggc-meter/src/GGCMeterTool_en.properties =================================================================== --- trunk/ggc-plugins/ggc-meter/src/GGCMeterTool_en.properties 2016-12-25 17:00:38 UTC (rev 1429) +++ trunk/ggc-plugins/ggc-meter/src/GGCMeterTool_en.properties 2016-12-25 17:08:39 UTC (rev 1430) @@ -1,195 +0,0 @@ -# -# !MASTER_FILE! -# !S! MODULE=GGC Meter Tool -# !S! MODULE_VERSION=2.0.3 -# -# ###################################################################### -# ### GGC Meter Tool ### -# ###################################################################### -# ### Language: English ### -# ### Created by: Andy Rozman (an...@at...) ### -# ### Last change: 4th June 2011 ### -# ### Module Version: 2.0.3 ### -# ### Application Version: 0.5 ### -# ###################################################################### -# -# 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 -# -# * - If tags also has *, then it means that this string can change regulary, last update is in [] -# - - -# -# !G! Plug-in Specific [1] -# -DEVICE_NAME_NORMAL=meter -DEVICE_NAME_BIG=Meter -DEVICE_FULL_NAME_WITH_PORT=%s on %s -DEVICE_FULL_NAME_WITHOUT_PORT=%s -DEVICE_DEVICE=Meter device - -# -# !G! Menus [1] -# -MN_METERS=Meters -MN_METERS_READ=Read data -MN_METERS_READ_DESC=Read data from meter -MN_METERS_LIST=Meters List -MN_METERS_LIST_DESC=List of most meters available -MN_METERS_CONFIG=Configure... -MN_METERS_CONFIG_DESC=Configuration of the Meter plug-in -MN_METERS_ABOUT=About... -MN_METERS_ABOUT_DESC=About Meter Plugin (copyright, features, credits,...) -MN_METERS_READ_FILE=Read file -MN_METERS_READ_FILE_DESC=Read data from meter/sw export file - - -# -# !G! Configuration [1] -# -MY__=My -NEW__=New -DEVICE_CONFIGURATION=%s Configuration -SELECT_X_DEVICE=Select %s Device -SELECTED_X_DEVICE=Selected %s Device -DEVICE_CUSTOM_NAME=%s Custom Name - - - - -# -# !G! Meter Selector [1] -# -SELECTOR_DEVICE=%s Device Selector - - - -# -# !G! Instructions Dialog [1] -# -OOPS_DEVICE_NOT_CONFIGURED=Oops ! You forgot to configure your %s\nand currently there is no %s configured\nand/or selected. Please visit configuration\nand configure your %s. -CONFIGURED_DEVICE_INSTRUCTIONS=Configured %s and Instructions -DEVICE_ICON=%s picture -DEVICE_INFO=%s Info - - -# -# !G! Transfer display [1] -# -ERROR_CONTACTING_DEVICE=We had problem contacting Meter device.\nPlease recheck communication port settings\n(some of cables, can change their address,\nwhen reconnected). Run configuration again\nand problem should be solved!\n -READ_DEVICE_DATA_TITLE=Read Meter Data [%s on %s] -STATUS_READER_ERROR=Internal %s (or port) error - -# !SG! table (add new table items here) -DATETIME=Date/Time -BG_MMOLL=BG (mmol/L) -BG_MGDL=BG (mg/dL) -MULTIPLE=Multiple - -# !SG! extended type table -URINE=Ketones -BG=Blood Glucose -ENTRY_TYPE=Type - -# -# !G! Export [1] -# -EXPORT_DEVICE_DATA=Export %s Data - - -# -# !G! List [1] -# -DEVICE_LIST_WEB=%s List - -# non-static -DEVICE_LIST_WEB_DESC=<html>Meters List is not list of all available Meters in the world, this is just list of some (mostly commonly used) Meters available. We add new devices here when our source page changes (www.diabetesnet.com) or if some user requests that their device is to be added. Meters in list are color coded, and color determines status of devices of selected company. Color coding description is shown at bottom of this page.<br></html> - -#METERS_LIST_WEB_DESC=<html>Meters List is not list of all available Meters in the world, this is just<br>list of some (mostly commonly used) Meters available. We add new devices<br>here when our source page changes (www.diabetesnet.com) or if some user<br>requests that their device is to be added. Meters in list are color coded,<br>and color determines status of devices of selected company. Color coding<br>description is shown at bottom of this page.<br></html> - - -# -# !G! About [1] -# -DEVICE_PLUGIN=%s Plug-in -DEVICE_PLUGIN_ABOUT=About %s Plug-in - - - -# -# !G! Meter Instructions [1] -# - -# !SG! ascensia -INSTRUCTIONS_ASCENSIA_BREEZE=<html>Instructions for meter download:<ul><li>Attach the meter cable to the selected PC<br> serial port</li><li>Plug the meter cable into the round meter port<br></li><li>Press the meter button to turn the meter ON</li></ul><br>Click "Start Download" to begin reading data from<br>your meter...</html> -INSTRUCTIONS_ASCENSIA_CONTOUR=<html>Instructions for meter download:<ul><li>Attach the meter cable to the selected PC<br> serial port</li><li>Plug the meter cable into the round meter port<br></li><li>Press the meter button M to turn the meter ON</li></ul><br>Click "Start Download" to begin reading data from<br>your meter...</html> -INSTRUCTIONS_ASCENSIA_ELITE_XL=<html>Instructions for meter download:<ul><li>Attach the meter cable to the selected PC<br> serial port</li><li>Plug the meter cable into the round meter<br>port<br></li><li>Press the meter button to turn the meter ON</li></ul><br>Click "Start Download" to begin reading data from<br>your meter...</html> -INSTRUCTIONS_ASCENSIA_DEX=<html>Instructions for meter download:<ul><li>Attach the meter cable to the selected PC<br> serial port<br></li><li>Plug the meter cable into the port between<br> the two meter buttons<br></li><li>Slide the meter cover to turn the meter ON</li></ul><br>Click "Start Download" to begin reading data from<br>your meter...</html> -INSTRUCTIONS_ASCENSIA_CONTOUR_USB=<html><ul><li>Attach meter to USB port<br></li></ul><br>Click "Start Download" to begin reading data from<br>your meter...</html> - -# !SG! roche -# same instructions: compact & integra, active & go, advantage & comfort & sensor -INSTRUCTIONS_ACCUCHEK_ACTIVE=<html><ul><li>Pix Device should be attached before program<br>is started</li><li>Place meter max. 10 cm from Pix device</li><li>Click on "Start Download" to start and watch<br>status until it becomes 'Detecting devices'.</li><li>Keep button M (left) on Active pressed for more<br>than 3 seconds and download will start.</li></ul>Accu-Check Pix has sometimes problems with java, so<br>you might be forced to start downloading twice.</html> -INSTRUCTIONS_ACCUCHEK_ADVANTAGE=<html><ul><li>Pix Device should be attached before program<br>is started</li><li>Click on "Start Download" to start and watch<br>status until it becomes 'Detecting devices'.</li><li>Insert IR Key into meter and place meter max.<br>10 cm from Pix device and download will start.</li></ul>Accu-Check Pix has sometimes problems with java, so<br>you might be forced to start downloading twice.</html> -INSTRUCTIONS_ACCUCHEK_AVIVA=<html><ul><li>Pix Device should be attached before program<br>is started</li><li>Place meter max. 10 cm from Pix device</li><li>Click on "Start Download" to start and watch<br>status until it becomes 'Detecting devices'.</li><li>Keep both buttons on Aviva pressed for more<br>than 3 seconds and download will start.</li></ul>Accu-Check Pix has sometimes problems with java, so<br>you might be forced to start downloading twice.</html> -INSTRUCTIONS_ACCUCHEK_COMFORT=<html><ul><li>Pix Device should be attached before program<br>is started</li><li>Click on "Start Download" to start and watch<br>status until it becomes 'Detecting devices'.</li><li>Insert IR Key into meter and place meter max.<br>10 cm from Pix device and download will start.</li></ul>Accu-Check Pix has sometimes problems with java, so<br>you might be forced to start downloading twice.</html> -INSTRUCTIONS_ACCUCHEK_COMPACT=<html><li>Pix Device should be attached before program<br>is started (it has sometimes problems with java,<br>so you might be forced to download twice)</li><li>Place meter max. 10 cm from Pix device</li><li>Click on "Start Download" to start and watch<br>status until it becomes 'Detecting devices'.</li><li>Keep both SET and MEMO buttons pressed for<br>more than 3 seconds and download will start.</li></html> -INSTRUCTIONS_ACCUCHEK_COMPACTPLUS=<html><li>Pix Device should be attached before program<br>is started (it has sometimes problems with java,<br>so you might be forced to download twice)</li><li>Place meter max. 10 cm from Pix device</li><li>Click on "Start Download" to start and watch<br>status until it becomes 'Detecting devices'.</li><li>Keep both S and M buttons pressed for<br>more than 3 seconds and download will start.</li></html> -INSTRUCTIONS_ACCUCHEK_GO=<html><ul><li>Pix Device should be attached before program<br>is started</li><li>Place meter max. 10 cm from Pix device</li><li>Click on "Start Download" to start and watch<br>status until it becomes 'Detecting devices'.</li><li>Keep button M (left) on Active pressed for more<br>than 3 seconds and download will start.</li></ul>Accu-Check Pix has sometimes problems with java, so<br>you might be forced to start downloading twice.</html> -INSTRUCTIONS_ACCUCHEK_INTEGRA=<html><li>Pix Device should be attached before program<br>is started (it has sometimes problems with java,<br>so you might be forced to download twice)</li><li>Place meter max. 10 cm from Pix device</li><li>Click on "Start Download" to start and watch<br>status until it becomes 'Detecting devices'.</li><li>Keep both SET and MEMO buttons pressed for<br> more than 3 seconds and download will start.</li></html> -INSTRUCTIONS_ACCUCHEK_PERFORMA=Performa not supported at this time. -INSTRUCTIONS_ACCUCHEK_SENSOR=<html><ul><li>Pix Device should be attached before program<br>is started</li><li>Click on "Start Download" to start and watch<br>status until it becomes 'Detecting devices'.</li><li>Insert IR Key into meter and place meter max.<br>10 cm from Pix device and download will start.</li></ul>Accu-Check Pix has sometimes problems with java, so<br>you might be forced to start downloading twice.</html> -INSTRUCTIONS_ACCUCHEK_NANO=<html><ul><li>Pix Device should be attached before program<br>is started</li><li>Place meter max. 10 cm from Pix device</li><li>Click on "Start Download" to start and watch<br>status until it becomes 'Detecting devices'.</li><li>Keep Left and Right buttons on Aviva pressed<br>for more than 3 seconds and download will<br>start.</li></ul>Accu-Check Pix has sometimes problems with java, so<br>you might be forced to start downloading twice.</html> -INSTRUCTIONS_ACCUCHEK_AVIVA_COMBO=<html><ul><li>Pix Device should be attached before program<br>is started</li><li>Place meter max. 10 cm from Pix device</li><li>Click on "Start Download" to start and watch<br>status until it becomes 'Detecting devices'.</li><li>Start meter and enter Data Transfer Mode<br>(My Data -> Data Transfer)<br></li></ul>Accu-Check Pix has sometimes problems with java, so<br>you might be forced to start downloading twice.</html> - -# !SG! lifescan -# off: InDuo(x), OT, OT: FastTake(x), SmartScan, EuroFlash, PocketScan, Select(x), Ultra(x), Ultra 2(x), Easy/Mini(x) -# on: OT: Basic(x), Basic Plus, II(x), Profile(x), SureStep(x), GlucoTouch, UltraSmart(x) -INSTRUCTIONS_LIFESCAN_ON=<html>Instructions for meter download:<ul><li>Attach the meter cable to the selected PC<br> serial port</li><li>Plug the meter cable into the meter port<br></li><li>Make sure that meter is ON</li></ul><br>Click "Start Download" to begin reading data from<br>your meter...</html> -INSTRUCTIONS_LIFESCAN_OFF=<html>Instructions for meter download:<ul><li>Attach the meter cable to the selected PC<br> serial port</li><li>Plug the meter cable into the meter port<br></li><li>Make sure that meter is OFF</li></ul><br>Click "Start Download" to begin reading data from<br>your meter...</html> - -# !SG! Abbott and also Menarini -INSTRUCTIONS_ABBOTT_OPTIUMXCEED=<html>Instructions for meter download:<ul><li>Attach the meter cable to the selected PC<br> serial/USB port</li><li>Plug the meter cable into meter strip port<br></li></ul><br>Click "Start Download" to begin reading data from<br>your meter...</html> - - - - - -# -# !G! Devices [2] -# - -# !SG! OT Ultra mini & OT Ultra (some) -READING_SW_VERSION=Reading Sw version -READING_SERIAL_NR=Read Serial number -READING_DATA_COUNTER=Reading data counter -READING_PROCESSING_ENTRY=Reading and processing entry # -READING_SERIAL_NR_SETTINGS=Read Serial number & Settings - -# !SG! AccuChek Combo -BG_UNIT=BG Unit -TIME_ON_DEVICE=Time on device - -# !SG! Ascensia -MARKER_HI=High BG -MARKER_LO=Low BG -MARKER_PRE_MEAL=Pre-Meal -MARKER_POST_MEAL=Post-Meal -MARKER_DONT_FEEL_RIGHT=Don't feel right -MARKER_SICK=Sick -MARKER_STRESS=Stress -MARKER_ACTIVITY=Activity -MARKER_CONTROL_RESULT=Control result -MARKER_AFTER_FOOD=Time after food (%s) \ No newline at end of file Deleted: trunk/ggc-plugins/ggc-meter/src/GGCMeterTool_fr.properties =================================================================== --- trunk/ggc-plugins/ggc-meter/src/GGCMeterTool_fr.properties 2016-12-25 17:00:38 UTC (rev 1429) +++ trunk/ggc-plugins/ggc-meter/src/GGCMeterTool_fr.properties 2016-12-25 17:08:39 UTC (rev 1430) @@ -1,190 +0,0 @@ -# -# ###################################################################### -# ### GGC Meter Tool ### -# ###################################################################### -# ### Language: French ### -# ### Created by: F.A. ### -# ### Last change: 16th April 2010 ### -# ### Library Version: 0.4.5 ### -# ### Application Version: 0.4.17 ### -# ###################################################################### -# - -# -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 - -# -# Plug-in Specific [1] -# -DEVICE_NAME_NORMAL=lecteur -DEVICE_NAME_BIG=Lecteur -DEVICE_FULL_NAME_WITH_PORT=%s sur %s -DEVICE_FULL_NAME_WITHOUT_PORT=%s - -# -# Menus [1] -# -MN_METERS=Lecteur -MN_METERS_READ=Lecture des Donn\u00E9es -MN_METERS_READ_DESC=R\u00E9cup\u00E9rer les donn\u00E9es du lecteur -MN_METERS_LIST=Liste des Lecteurs -MN_METERS_LIST_DESC=Liste des lecteurs disponibles -MN_METERS_CONFIG=Configuration... -MN_METERS_CONFIG_DESC=Configuration du plug-in Lecteur -MN_METERS_ABOUT=\u00C0 propos... -MN_METERS_ABOUT_DESC=\u00C0 Propos du plug-in lecteur (copyright, fonctions, cr\u00E9dits,...) -MN_METERS_READ_FILE=Lire donn\u00E9es -MN_METERS_READ_FILE_DESC=R\u00E9cup\u00E8re les donn\u00E9es du lecteur sans les exporter - -# -# Configuration [1] -# -MY__=Mon -NEW__=Nouveau -DEVICE_CONFIGURATION=Configuration %s -SELECT_X_DEVICE=S\u00E9lectionner Mat\u00E9riel %s -SELECTED_X_DEVICE=Mat\u00E9riel %s S\u00E9lectionn\u00E9 -DEVICE_CUSTOM_NAME=Nom %s Personnalis\u00E9 - -# -# Meter Selector [1] -# -SELECTOR_DEVICE=S\u00E9lecteur de Mat\u00E9riel %s -DEVICE_CONNECTION=Connexion du dispositif -# -# Instructions Dialog [1] -# -OOPS_DEVICE_NOT_CONFIGURED=Oops ! Vous avez oubli\u00E9 de configurer votre lecteur %s\n et actuellement aucun %s n'est configur\u00E9\net/ou s\u00E9lectionn\u00E9. Veuillez v\u00E9rifier\net la configuration de votre %s. -CONFIGURED_DEVICE_INSTRUCTIONS=Instructions du %s configur\u00E9 -DEVICE_ICON=Image du %s -DEVICE_INFO=Info du %s - -# -# Transfer display [1] -# -ERROR_CONTACTING_DEVICE=Nous ne parvenons pas \u00E0 contacter le lecteur glyc\u00E9mique.\nVeuillez v\u00E9rifier le r\u00E9glage du port de communication\n(certains c\u00E2bles modifient leur adresse\nen se connectant). Renouvelez la configuration\net le probl\u00E8me devrait \u00EAtre r\u00E9solu !\n -READ_DEVICE_DATA_TITLE=Lire %s Donn\u00E9es [%s sur %s] -STATUS_READER_ERROR=Erreur Interne %s (ou port) - - - - - - - - -### start add >>>> - - -BREAK_COMMUNICATION=Interrompre la Communication -EXPORT_DATA=Exporter les Donn\u00E9es -DATA=Donn\u00E9es -LOG=Log -DEVICE_INFO=%s Info -ACTION=Action - -STATUS_NONE=Unknown Status -STATUS_READY=Pr\u00EAt -STATUS_DOWNLOADING=Chargement -STATUS_STOPPED_DEVICE=Chargement interrompu (par le dispositif) -STATUS_STOPPED_USER=Chargement interroompu par l'utilisateur -STATUS_DOWNLOAD_FINISHED=Chargement termin\u00E9 -STATUS_READER_ERROR=Erreur %s Interne (ou de port) - -UNKNOWN=Inconnu -NEW=Nouveau -CHANGED=Modifi\u00E9 -OLD=Ancien - -LOG_IS_CURRENTLY_NOT_IMPLEMENTED=Log n'est pas actuellement disponible. -READ_DEVICE_DATA_TITLE=Lecture des donn\u00E9es [%s sur %s] -SW_VERSION=SW Version -HW_VERSION=HW Version -SELECT_ALL=Tout S\u00E9lectionner -DESELECT_ALL=Tout D\u00E9-s\u00E9lectionner -FILTER=Filtrer -FILTER_ALL=Tout -FILTER_NEW=Nouveau -FILTER_CHANGED=Modifi\u00E9 -FILTER_EXISTING=Ancien -FILTER_UNKNOWN=Inconnu -FILTER_NEW_CHANGED=Nouveau + Modifi\u00E9 -FILTER_ALL_BUT_EXISTING=Tout sauf Ancien -### end add <<<<<< - -# table (add new table items here) -DATETIME=Date/Heure -BG_MMOLL=Gly (mmol/L) -BG_MGDL=Gly (mg/dL) -MULTIPLE=Multiple - - -# extended type table -URINE=C\u00E9tones -BG=Glyc\u00E9mie -ENTRY_TYPE=Type - -# -# Export [1] -# -### start add >>>>>>>> -EXPORT_OUTPUT=Sortie \u00E0 Exporter -#EXPORT_DEVICE_DATA=Donn\u00E9es %s Export\u00E9es -GGC_APPLICATION=Application GGC -EXPORT_PROGRESS=Progression de l'exportation -START=D\u00E9but -EXPORT_STATUS_READY=Pr\u00EAt -EXPORT_STATUS_EXPORTING=Exportation en cours -EXPORT_STATUS_FINISHED=Termin\u00E9 - -### <<<< end add -EXPORT_DEVICE_DATA=Exporter Donn\u00E9es %s -# -# List [1] -# -DEVICE_LIST_WEB=Liste %s -DEVICE_LIST_WEB_DESC=<html>La liste de lecteurs n'est pas exhaustive. Elle contient les lecteurs couramment utilisés. Nous mettons cette liste à jour en cas de modification de la page source (www.diabetesnet.com) ou de demande des utilisateurs. La liste de lecteurs fait apparaître un code couleur qui détermine l'état des dispositifs choisis. Le code couleur est descrit au bas de cette page.<br></Html> -DEVICE_PLUGIN=Plug-in %s -DEVICE_PLUGIN_ABOUT=\u00C0 propos du Plug-in %s -#begin : dtaken from GGCPlugin_fr.properties -LEGEND_DESC=<html><b>Légnde :</b><br><font color="green">Vert</font> = Tous les dispositifs supportés connus<br><font color="#33FFFF">Cyan</font> = En test<br><font color="#660066">Magenta</font> = quelques dispositifs pris en charge<br><font color="blue">Bleu</font> = Travail en cours<br><font color="#FFCC33">Orange</font> = Pr\u00E9vu<br><font color="red">Red</font> = Non prévu</html> -#end : taken from - -# -# Meter Instructions [1] -# -# ascensia -INSTRUCTIONS_ASCENSIA_BREEZE=<html>Instructions pour récupérer les données du lecteur :<ul><li>Branchez le câble au port série choisi<br> du PC</li><li>Insérez le câble dans le port arrondi du lecteur<br></li><li>Pressez le bouton pour allumer le lecteur</li></ul><br>Cliquez sur Récupérer les données pour débuter le chargement depuis<br>votre lecteur...</html> -INSTRUCTIONS_ASCENSIA_CONTOUR=<html>Instructions pour récupérer les données du lecteur :<ul><li>Branchez le câble au port série choisi<br> du PC</li><li>Insérez le câble dans le port arrondi du lecteur<br></li><li>Pressez le bouton M pour allumer le lecteur</li></ul><br>Cliquez sur Récupérer les données pour débuter le chargement depuis<br>votre lecteur...</html> -INSTRUCTIONS_ASCENSIA_ELITE_XL=<html>Instructions pour récupérer les données du lecteur :<ul><li>Branchez le câble au port série choisi<br> du PC</li><li>Insérez le câble dans le port arrondi du lecteur<br></li><li>Pressez le bouton pour allumer le lecteur</li></ul><br>Cliquez sur Récupérer les données pour débuter le chargement depuis<br>votre lecteur...</html> -INSTRUCTIONS_ASCENSIA_DEX=<html>Instructions pour récupérer les données du lecteur :<ul><li>Branchez le câble au port série choisi<br> du PC</li><li>Insérez le câble dans le port situé entre les deux boutons<br></li><li>Faîtes glisser la partie antérieure pour allumer le lecteur</li></ul><br>Cliquez sur Récupérer les données pour débuter le chargement depuis<br>votre lecteur...</html> - -# roche -INSTRUCTIONS_ACCUCHEK_ACTIVE=<html><ul><li>Le dispositif à image doit être connecté<br>avant de lancer le programme</li><li>Placez le lecteur au maximum à 10cm du dispositif à image</li><li>Cliquez sur Récupérer les données et patientez jusqu'au message 'Detecting devices'.</li><li>Appuyez sur le bouton M (gauche) pendant<br>plus de 3 secondes et le chargement débute.</li></ul>Accu-Check Pix a des problèmes avec Java qui pourraient rendre,<br>un second chargement nécessaire.</html> -INSTRUCTIONS_ACCUCHEK_ADVANTAGE=<html><ul><li>Le dispositif à image doit être connecté<br>avant de lancer le programme</li><li>Cliquez sur Récupérer les données et patientez jusqu'au message 'Detecting devices'.</li><li>Insérez la clé IR dans le lecteur. Placez le lecteur au maximum à 10cm du dispositif à image et le chargement débute.</li></ul>Accu-Check Pix a des problèmes avec Java qui pourraient rendre,<br>un second chargement nécessaire.</html> -INSTRUCTIONS_ACCUCHEK_AVIVA=<html><ul><li>Le dispositif à image doit être connecté<br>avant de lancer le programme</li><li>Placez le lecteur au maximum à 10cm du dispositif à image</li><li>Click on "Start Download" to start and watch<br>status until it becomes 'Detecting devices'.</li><li>Pressez les deux boutons de l'Aviva en même temps <br>pendant plus de 3 secondes et le chargement débute.</li></ul>Accu-Check Pix a des problèmes avec Java qui pourraient rendre,<br>un second chargement nécessaire.</html> -INSTRUCTIONS_ACCUCHEK_COMFORT=<html><ul><li>Le dispositif à image doit être connecté<br>avant de lancer le programme</li><li>Cliquez sur Récupérer les données et patientez jusqu'au message 'Detecting devices'.</li><li>Insérez la clé IR dans le lecteur. Placez le lecteur au maximum à 10cm du dispositif à image et le chargement débute.</li></ul>Accu-Check Pix a des problèmes avec Java qui pourraient rendre,<br>un second chargement nécessaire.</html> -INSTRUCTIONS_ACCUCHEK_COMPACT=<html><li>Le dispositif à image doit être connecté<br>avant de lancer le programme (des problèmes avec Java pourraient rendre,<br>un second chargement nécessaire)</li><li>Placez le lecteur au maximum à 10cm du dispositif à image</li><li>Cliquez sur Récupérer les données et patientez jusqu'au message 'Detecting devices'.</li><li>Pressez les boutons SET et MEMO en même temps <br>pendant plus de 3 secondes et le chargement débute.</li></html> -INSTRUCTIONS_ACCUCHEK_COMPACTPLUS=<html><li>Le dispositif à image doit être connecté<br>avant de lancer le programme (des problèmes avec Java pourraient rendre,<br>un second chargement nécessaire)</li><li>Placez le lecteur au maximum à 10cm du dispositif à image</li><li>Cliquez sur Récupérer les données et patientez jusqu'au message 'Detecting devices'.</li><li>Keep both S and M buttons pressed for<br>more than 3 seconds and download will start.</li></html> -INSTRUCTIONS_ACCUCHEK_GO=<html><ul><li>Le dispositif à image doit être connecté<br>avant de lancer le programme</li><li>Placez le lecteur au maximum à 10cm du dispositif à image</li><li>Cliquez sur Récupérer les données et patientez jusqu'au message 'Detecting devices'.</li><li>Appuyez sur le bouton M (gauche) pendant<br>plus de 3 secondes et le chargement débute.</li></ul>Accu-Check Pix a des problèmes avec Java qui pourraient rendre,<br>un second chargement nécessaire.</html> -INSTRUCTIONS_ACCUCHEK_INTEGRA=<html><li>Le dispositif à image doit être connecté<br>avant de lancer le programme (des problèmes avec Java pourraient rendre,<br>un second chargement nécessaire)</li><li>Placez le lecteur au maximum à 10cm du dispositif à image</li><li>Cliquez sur Récupérer les données et patientez jusqu'au message 'Detecting devices'.</li><li>Pressez les boutons SET et MEMO en même temps <br>pendant plus de 3 secondes et le chargement débute.</li></html> -INSTRUCTIONS_ACCUCHEK_PERFORMA=Instructions Performa <Actuellement pas support\u00E9> -INSTRUCTIONS_ACCUCHEK_SENSOR=<html><ul><li>Le dispositif à image doit être connecté<br>avant de lancer le programme</li><li>Cliquez sur Récupérer les données et patientez jusqu'au message 'Detecting devices'.</li><li>Insérez la clé IR dans le lecteur. Placez le lecteur au maximum à 10cm du dispositif à image et le chargement débute.</li></ul>Accu-Check Pix a des problèmes avec Java qui pourraient rendre,<br>un second chargement nécessaire.</html> -INSTRUCTIONS_ACCUCHEK_NANO=<html><ul><li>Le dispositif à image doit être connecté<br>avant de lancer le programme</li><li>Placez le lecteur au maximum à 10cm du dispositif à image</li><li>Cliquez sur Récupérer les données et patientez jusqu'au message 'Detecting devices'.</li><li>Pressez les boutons gauche et droit de l'Aviva en même temps <br>pendant plus de 3 secondes et le chargement débute.</li></ul>Accu-Check Pix a des problèmes avec Java qui pourraient rendre,<br>un second chargement nécessaire.</html> - -# lifescan -INSTRUCTIONS_LIFESCAN_ON=<html>Instructions pour récupérer les données du lecteur :<ul><li>Branchez le câble au port série choisi<br> du PC</li><li>Insérez le câble dans le port du lecteur<br></li><li>Assurez-vous que le lecteur soit allumé</li></ul><br>Cliquez sur Récupérer les données pour débuter le chargement depuis<br>votre lecteur...</html> -INSTRUCTIONS_LIFESCAN_OFF=<html>Instructions pour récupérer les données du lecteur :<ul><li>Branchez le câble au port série choisi<br> du PC</li><li>Insérez le câble dans le port du lecteur<br></li><li>Assurez-vous que le lecteur soit éteint</li></ul><br>Cliquez sur Récupérer les données pour débuter le chargement depuis<br>votre lecteur...</html> - -# Abbott and also Menarini -INSTRUCTIONS_ABBOTT_OPTIUMXCEED=<html>Instructions pour récupérer les données du lecteur :<ul><li>Branchez le câble au port série/USB choisi<br> du PC</li><li>Insérez le câble dans le port à bandelette du lecteu<br></li></ul><br>Cliquez sur Récupérer les données pour débuter le chargement depuis<br>votre lecteur...</html> - -# -# Devices [2] -# -# OT Ultra mini & OT Ultra (some) -READING_SW_VERSION=Lecture de la version Sw -READING_SERIAL_NR=Lecture du num\u00E9ro de s\u00E9rie -READING_DATA_COUNTER=Lecture du nombre de donn\u00E9es -READING_PROCESSING_ENTRY=Lecture et traitement des donn\u00E9es # -READING_SERIAL_NR_SETTINGS=Lire r\u00E9glages et num\u00E9ro de s\u00E9rie Deleted: trunk/ggc-plugins/ggc-meter/src/GGCMeterTool_si.properties =================================================================== --- trunk/ggc-plugins/ggc-meter/src/GGCMeterTool_si.properties 2016-12-25 17:00:38 UTC (rev 1429) +++ trunk/ggc-plugins/ggc-meter/src/GGCMeterTool_si.properties 2016-12-25 17:08:39 UTC (rev 1430) @@ -1,154 +0,0 @@ -# -# ###################################################################### -# ### GNU Glucose Control ### -# ###################################################################### -# ### Language: Sloevene ### -# ### Created by: Andy (an...@t-...) ### -# ### Version: 2.0.3 ### -# ### Last change: 12.5.2013 10:51:0 ### -# ###################################################################### -# -# -# Translation status: -# Words/expressions: 67 -# Not translated: 0 (0 %) -# Need to be checked: 0 (0 %) -# -# Translated: 67 (100 %) -# -# -# This comment will be displayed after header -## -# 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-standard, non english -# charcters) we need to set this if we want sorting to be done correctly. -# -COLLATION_RULES=< a,A < b,B < c,C < \u010D,\u010C < 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 < \u0161,\u0160 < t,T < u,U < v,V < w,W < x,X < y,Y < z,Z < \u017E,\u017D - -# -# Plug-in Specific [1] -# -DEVICE_NAME_NORMAL=merilec -DEVICE_NAME_BIG=Merilec -DEVICE_FULL_NAME_WITH_PORT=%s na %s -DEVICE_FULL_NAME_WITHOUT_PORT=%s -DEVICE_DEVICE=Merilec - -# -# Menus [1] -# -MN_METERS=Merilci -MN_METERS_READ=Beri podatke -MN_METERS_READ_DESC=Beri podatke iz merilca -MN_METERS_LIST=Seznam merilcev -MN_METERS_LIST_DESC=Seznam ve\u010Dine dostopnih merilcev -MN_METERS_CONFIG=Nastavitve... -MN_METERS_CONFIG_DESC=Nastavitve dodatka za merilce -MN_METERS_ABOUT=O dodatku... -MN_METERS_ABOUT_DESC=O dodatku za merilce (pravice, zmo\u017Enosti, ...) -MN_METERS_READ_FILE=Beri datoteko -MN_METERS_READ_FILE_DESC=Beri podatke iz metrove/prog. izvozne datoeteke - -# -# Configuration [1] -# -MY__=Moj -NEW__=Nov -DEVICE_CONFIGURATION=Konfiguracija merilca -SELECT_X_DEVICE=Izberi merilec -SELECTED_X_DEVICE=Izbran merilec -DEVICE_CUSTOM_NAME=Doma\u010De ime merilca - -# -# Meter Selector [1] -# -SELECTOR_DEVICE=Izbirnik za %s - -# -# Instructions Dialog [1] -# -OOPS_DEVICE_NOT_CONFIGURED=Ups! Pozabili ste nastaviti svoj merilec\nin trenutno ni nobenega nastavljenega\nin/ali izbranega. Obi\u0161cite konfiguracijo\nin nastavite va\u0161 merilec.\n -CONFIGURED_DEVICE_INSTRUCTIONS=Nastavljen merilec in navodila -DEVICE_ICON=Slika merilca -DEVICE_INFO=Podatki merilca - -# -# Transfer display [1] -# -ERROR_CONTACTING_DEVICE=Imeli smo problem pri kontaktiranju merilca.\nProsim preverite nastavitve komunikacijskih vrat\n(nekateri kabli lahko spremenijo vrata, ko\njih znova priklju\u010Dimo). Za\u017Eenite konfiguracijo\nin problem bo verjetno re\u0161en.\n -READ_DEVICE_DATA_TITLE=Beri podatke merilca [%s na %s] -STATUS_READER_ERROR=Interna %s (ali vratna) napaka - -# table (add new table items here) -DATETIME=Datum/\u010Cas -BG_MMOLL=KS (mmol/L) -BG_MGDL=KS (mg/dL) -MULTIPLE=Razli\u010Dni - -# extended type table -URINE=Ketoni -BG=Krvni sladkor -ENTRY_TYPE=Tip - -# -# Export [1] -# -EXPORT_DEVICE_DATA=Izvozi podatke merilca - -# -# List [1] -# -DEVICE_LIST_WEB=Seznam merilcev -DEVICE_LIST_WEB_DESC=<html>Seznam merilcev ni seznam vseh merilcev na svetu, to je samo seznam nekaterih (najpogosteje uporabljenih) merilcev, ki obstajajo. Nove merilce dodamo, ko se spremeni na\u0161a izvorna stran (www.diabetesnet.com) ali \u010De kak\u0161en uporabnik zaprosi, da dodamo njegov merilec. Merilci so barvno kodirani in barva dolo\u010Duje status naprav dolo\u010Denega proizvajalca. Opis barvnega kodiranja je prikazan na robu te strani.<br></html> - -# -# About [1] -# -DEVICE_PLUGIN=Dodatek za merilce -DEVICE_PLUGIN_ABOUT=O dodatku za merilce - -# -# Meter Instructions [1] -# - -# ascensia -INSTRUCTIONS_ASCENSIA_BREEZE=<html>Navodila za prenos podatkov:<ul><li>Priklju\u010Dite kabel na izbran serijski<br>priklju\u010Dek</li><li>Priklju\u010Dite kabel v priklju\u010Dek na merilcu<br></li><li>Pritisnite tipko na merilcu da ga pri\u017Egete</li></ul><br>Kliknite na "Za\u010Detek prenosa" za za\u010Detek branja...</html> -INSTRUCTIONS_ASCENSIA_CONTOUR=<html>Navodila za prenos podatkov:<ul><li>Priklju\u010Dite kabel na izbran serijski<br>priklju\u010Dek</li><li>Priklju\u010Dite kabel v priklju\u010Dek na merilcu<br></li><li>Pritisnite tipko M na merilcu da ga pri\u017Egete</li></ul><br>Kliknite na "Za\u010Detek prenosa" za za\u010Detek branja...</html> -INSTRUCTIONS_ASCENSIA_ELITE_XL=<html>Navodila za prenos podatkov:<ul><li>Priklju\u010Dite kabel na izbran serijski<br>priklju\u010Dek</li><li>Priklju\u010Dite kabel v priklju\u010Dek na merilcu<br></li><li>Pritisnite tipko na merilcu da ga pri\u017Egete</li></ul><br>Kliknite na "Za\u010Detek prenosa" za za\u010Detek branja...</html> -INSTRUCTIONS_ASCENSIA_DEX=<html>Navodila za prenos podatkov:<ul><li><li>Priklju\u010Dite kabel na izbran serijski<br>priklju\u010Dek</li><li>Priklju\u010Dite kabel v priklju\u010Dek med obema<br>tipkama.<br></li><li>Premaknite drsni pokrov da vklju\u010Dite merilec</li></ul><br>Kliknite na "Za\u010Detek prenosa" za za\u010Detek branja...</html> - -# roche -INSTRUCTIONS_ACCUCHEK_ACTIVE=<html><li>Pix naprava naj bo priklju\u010Dena pred zagonom<br>programa (v\u010Dasih so problemi s javo, in bo<br>mogo\u010De potrebno prenos zagnati dvakrat)<br></li><li>Postavite merilec 10 cm od Pix naprave</li><li>Kliknite na "Za\u010Detek prenosa" in po\u010Dakajte,<br>da status postane 'Odkrivanje naprav'.</li><li>Dr\u017Eite tipko M (leva) pritisnjeno za ve\u010D<br>kot 3 sekunde in prenos se bo za\u010Del.</li></html> -INSTRUCTIONS_ACCUCHEK_ADVANTAGE=<html><li>Pix naprava naj bo priklju\u010Dena pred zagonom<br>programa (v\u010Dasih so problemi s javo, in bo<br>mogo\u010De potrebno prenos zagnati dvakrat)<br></li><li>Kliknite na "Za\u010Detek prenosa" in po\u010Dakajte,<br>da status postane 'Odkrivanje naprav'.</li><li>Vstavite IR klju\u010D v merilec in postavite merilec<br>10 cm od Pix naprave in prenos se bo za\u010Del.</li></html> -INSTRUCTIONS_ACCUCHEK_AVIVA=<html><li>Pix naprava naj bo priklju\u010Dena pred zagonom<br>programa (v\u010Dasih so problemi s javo, in bo<br>mogo\u010De potrebno prenos zagnati dvakrat)<br></li><li>Postavite merilec 10 cm od Pix naprave</li><li>Kliknite na "Za\u010Detek prenosa" in po\u010Dakajte,<br>da status postane 'Odkrivanje naprav'.</li><li>Dr\u017Eite obe tipki pritisnjeni za ve\u010D kot<br>3 sekunde in prenos se bo za\u010Del.</li></html> -INSTRUCTIONS_ACCUCHEK_COMFORT=<html><li>Pix naprava naj bo priklju\u010Dena pred zagonom<br>programa (v\u010Dasih so problemi s javo, in bo<br>mogo\u010De potrebno prenos zagnati dvakrat)<br></li><li>Kliknite na "Za\u010Detek prenosa" in po\u010Dakajte,<br>da status postane 'Odkrivanje naprav'.</li><li>Vstavite IR klju\u010D v merilec in postavite merilec<br>10 cm od Pix naprave in prenos se bo za\u010Del.</li></html> -INSTRUCTIONS_ACCUCHEK_COMPACT=<html><li>Pix naprava naj bo priklju\u010Dena pred zagonom<br>programa (v\u010Dasih so problemi s javo, in bo<br>mogo\u010De potrebno prenos zagnati dvakrat)<br></li><li>Postavite merilec 10 cm od Pix naprave</li><li>Kliknite na "Za\u010Detek prenosa" in po\u010Dakajte,<br>da status postane 'Odkrivanje naprav'.</li><li>Dr\u017Eite tipki SET in DEMO pritisnjeni za ve\u010D<br>kot 3 sekunde in prenos se bo za\u010Del.</li></html> -INSTRUCTIONS_ACCUCHEK_COMPACTPLUS=<html><li>Pix naprava naj bo priklju\u010Dena pred zagonom<br>programa (v\u010Dasih so problemi s javo, in bo<br>mogo\u010De potrebno prenos zagnati dvakrat)<br></li><li>Postavite merilec 10 cm od Pix naprave</li><li>Kliknite na "Za\u010Detek prenosa" in po\u010Dakajte,<br>da status postane 'Odkrivanje naprav'.</li><li>Dr\u017Eite tipki M in S pritisnjeni za ve\u010D<br>kot 3 sekunde in prenos se bo za\u010Del.</li></html> -INSTRUCTIONS_ACCUCHEK_GO=<html><li>Pix naprava naj bo priklju\u010Dena pred zagonom<br>programa (v\u010Dasih so problemi s javo, in bo<br>mogo\u010De potrebno prenos zagnati dvakrat)<br></li><li>Postavite merilec 10 cm od Pix naprave</li><li>Kliknite na "Za\u010Detek prenosa" in po\u010Dakajte,<br>da status postane 'Odkrivanje naprav'.</li><li>Dr\u017Eite tipko M (leva) pritisnjeno za ve\u010D<br>kot 3 sekunde in prenos se bo za\u010Del.</li></html> -INSTRUCTIONS_ACCUCHEK_INTEGRA=<html><li>Pix naprava naj bo priklju\u010Dena pred zagonom<br>programa (v\u010Dasih so problemi s javo, in bo<br>mogo\u010De potrebno prenos zagnati dvakrat)<br></li><li>Postavite merilec 10 cm od Pix naprave</li><li>Kliknite na "Za\u010Detek prenosa" in po\u010Dakajte,<br>da status postane 'Odkrivanje naprav'.</li><li>Dr\u017Eite tipki SET in DEMO pritisnjeni za ve\u010D<br>kot 3 sekunde in prenos se bo za\u010Del.</li></html> -INSTRUCTIONS_ACCUCHEK_PERFORMA=Naprava Performa v tem trenutku ni podprta. -INSTRUCTIONS_ACCUCHEK_SENSOR=<html><li>Pix naprava naj bo priklju\u010Dena pred zagonom<br>programa (v\u010Dasih so problemi s javo, in bo<br>mogo\u010De potrebno prenos zagnati dvakrat)<br></li><li>Kliknite na "Za\u010Detek prenosa" in po\u010Dakajte,<br>da status postane 'Odkrivanje naprav'.</li><li>Vstavite IR klju\u010D v merilec in postavite merilec<br>10 cm od Pix naprave in prenos se bo za\u010Del.</li></html> -INSTRUCTIONS_ACCUCHEK_NANO=<html><ul><li>Pix Device should be attached before program<br>is started</li><li>Place meter max. 10 cm from Pix device</li><li>Click on "Start Download" to start and watch<br>status until it becomes 'Detecting devices'.</li><li>Keep Left and Right buttons on Aviva pressed for more<br>than 3 seconds and download will start.</li></ul>Accu-Check Pix has sometimes problems with java, so<br>you might be forced to start downloading twice.</html> - -# lifescan -INSTRUCTIONS_LIFESCAN_ON=<html>Navodila za prenos podatkov:<ul><li>Priklju\u010Dite kabel na izbran serijski<br>priklju\u010Dek</li><li>Priklju\u010Dite kabel v priklju\u010Dek na merilcu<br></li><li>Preverite da je merilec VKLJU\u010DEN</li></ul><br>Kliknite na "Za\u010Detek prenosa" za za\u010Detek branja...</html> -INSTRUCTIONS_LIFESCAN_OFF=<html>Navodila za prenos podatkov:<ul><li>Priklju\u010Dite kabel na izbran serijski<br>priklju\u010Dek</li><li>Priklju\u010Dite kabel v priklju\u010Dek na merilcu<br></li><li>Preverite da je merilec IZKLJU\u010DEN</li></ul><br>Kliknite na "Za\u010Detek prenosa" za za\u010Detek branja...</html> - -# Abbott and also Menarini -INSTRUCTIONS_ABBOTT_OPTIUMXCEED=<html>Navodila za prenos podatkov:<ul><li>Priklju\u010Dite kabel na izbran serijski/USB<br>priklju\u010Dek</li><li>Priklju\u010Dite kabel v slot za testne trakove<br></ul><br>Kliknite na "Za\u010Detek prenosa" za za\u010Detek branja...</html> - -# -# Devices [2] -# - -# OT Ultra mini & OT Ultra (some) -READING_SW_VERSION=Branje verzije programa -READING_SERIAL_NR=Beri serijsko \u0161tevilko -READING_DATA_COUNTER=Beri \u0161tevec podatkov -READING_PROCESSING_ENTRY=Branje in procesiranje vnosa # -READING_SERIAL_NR_SETTINGS=Beri serijsko \u0161tevilko & Nastavitve - -# AccuChek Combo -BG_UNIT=KS enota -TIME_ON_DEVICE=\u010Cas na napravi Copied: trunk/ggc-plugins/ggc-meter/src/main/resources/GGCMeterTool_de.properties (from rev 1428, trunk/ggc-plugins/ggc-meter/src/GGCMeterTool_de.properties) =================================================================== --- trunk/ggc-plugins/ggc-meter/src/main/resources/GGCMeterTool_de.properties (rev 0) +++ trunk/ggc-plugins/ggc-meter/src/main/resources/GGCMeterTool_de.properties 2016-12-25 17:08:39 UTC (rev 1430) @@ -0,0 +1,154 @@ +# +# ###################################################################### +# ### GNU Glucose Control ### +# ###################################################################### +# ### Language: German ### +# ### Created by: Reinhold Rumberger (ru...@us...)### +# ### Version: 2.0.3 ### +# ### Last change: 03.07.2011 14:30:06 ### +# ###################################################################### +# +# +# Translation status: +# Words/expressions: 67 +# Not translated: 58 (86 %) +# Need to be checked: 0 (0 %) +# +# Translated: 9 (13 %) +# +# +# +## +# 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-standard, 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 + +# +# Plug-in Specific [1] +# +DEVICE_NAME_NORMAL=meter +DEVICE_NAME_BIG=Meter +DEVICE_FULL_NAME_WITH_PORT=%s auf %s +DEVICE_FULL_NAME_WITHOUT_PORT=%s +DEVICE_DEVICE=Meter device + +# +# Menus [1] +# +MN_METERS=&Messger\u00E4te +MN_METERS_READ=Messger\u00E4t &auslesen +MN_METERS_READ_DESC=Daten des Messger\u00E4ts auslesen +MN_METERS_LIST=Messger\u00E4te&liste +MN_METERS_LIST_DESC=Liste der meisten verf\u00FCgbaren Messger\u00E4te +MN_METERS_CONFIG=Messger\u00E4te-Plug-in &Einstellungen +MN_METERS_CONFIG_DESC=Einstellungen zum Messger\u00E4te-Plug-in +MN_METERS_ABOUT=About... +MN_METERS_ABOUT_DESC=About Meter Plugin (copyright, features, credits,...) +MN_METERS_READ_FILE=Read file +MN_METERS_READ_FILE_DESC=Read data from meter/sw export file + +# +# Configuration [1] +# +MY__=My +NEW__=New +DEVICE_CONFIGURATION=%s Configuration +SELECT_X_DEVICE=Select %s Device +SELECTED_X_DEVICE=Selected %s Device +DEVICE_CUSTOM_NAME=%s Custom Name + +# +# Meter Selector [1] +# +SELECTOR_DEVICE=%s Device Selector + +# +# Instructions Dialog [1] +# +OOPS_DEVICE_NOT_CONFIGURED=Oops ! You forgot to configure your %s\nand currently there is no %s configured\nand/or selected. Please visit configuration\nand configure your %s. +CONFIGURED_DEVICE_INSTRUCTIONS=Configured %s and Instructions +DEVICE_ICON=%s picture +DEVICE_INFO=%s Info + +# +# Transfer display [1] +# +ERROR_CONTACTING_DEVICE=We had problem contacting Meter device.\nPlease recheck communication port settings\n(some of cables, can change their address,\nwhen reconnected). Run configuration again\nand problem should be solved!\n +READ_DEVICE_DATA_TITLE=Read Meter Data [%s on %s] +STATUS_READER_ERROR=Internal %s (or port) error + +# table (add new table items here) +DATETIME=Date/Time +BG_MMOLL=BG (mmol/L) +BG_MGDL=BG (mg/dL) +MULTIPLE=Multiple + +# extended type table +URINE=Ketones +BG=Blood Glucose +ENTRY_TYPE=Type + +# +# Export [1] +# +EXPORT_DEVICE_DATA=Export %s Data + +# +# List [1] +# +DEVICE_LIST_WEB=%s List +DEVICE_LIST_WEB_DESC=<html>Meters List is not list of all available Meters in the world, this is just list of some (mostly commonly used) Meters available. We add new devices here when our source page changes (www.diabetesnet.com) or if some user requests that their device is to be added. Meters in list are color coded, and color determines status of devices of selected company. Color coding description is shown at bottom of this page.<br></html> + +# +# About [1] +# +DEVICE_PLUGIN=%s Plug-in +DEVICE_PLUGIN_ABOUT=About %s Plug-in + +# +# Meter Instructions [1] +# + +# ascensia +INSTRUCTIONS_ASCENSIA_BREEZE=<html>Instructions for meter download:<ul><li>Attach the meter cable to the selected PC<br> serial po... [truncated message content] |
From: <and...@us...> - 2016-12-25 17:00:41
|
Revision: 1429 http://sourceforge.net/p/ggc/code/1429 Author: andyrozman Date: 2016-12-25 17:00:38 +0000 (Sun, 25 Dec 2016) Log Message: ----------- GGC Meters - moving paths Added Paths: ----------- trunk/ggc-plugins/ggc-meter/src/main/ trunk/ggc-plugins/ggc-meter/src/main/java/ trunk/ggc-plugins/ggc-meter/src/main/resources/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |