Menu
▾
▴
[ggc-cvs] SF.net SVN: ggc:[1432] trunk
|
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] |
