Menu
▾
▴
[ggc-cvs] SF.net SVN: ggc:[476] trunk
|
From: <and...@us...> - 2008-08-12 15:37:47
|
Revision: 476
http://ggc.svn.sourceforge.net/ggc/?rev=476&view=rev
Author: andyrozman
Date: 2008-08-12 15:37:52 +0000 (Tue, 12 Aug 2008)
Log Message:
-----------
Modified Paths:
--------------
trunk/ggc/data/GGC_Config.properties
trunk/ggc/src/Diabetes_Hardware.txt
trunk/ggc/src/ggc/core/db/GGCDbLoader.java
trunk/ggc/src/ggc/core/plugins/MetersPlugIn.java
trunk/ggc/src/ggc/core/plugins/PumpsPlugIn.java
trunk/ggc/src/ggc/core/util/DataAccess.java
trunk/ggc-cgm/src/ggc/cgm/util/DataAccessCGM.java
trunk/ggc-meter/.classpath
trunk/ggc-meter/src/ggc/meter/device/DummyMeter.java
trunk/ggc-meter/src/ggc/meter/gui/MeterDisplayDataDialog.java
trunk/ggc-meter/src/ggc/meter/gui/MeterExportDialog.java
trunk/ggc-meter/src/ggc/meter/gui/MeterInstructionsDialog.java
trunk/ggc-meter/src/ggc/meter/gui/config/MeterCompanyPanel.java
trunk/ggc-meter/src/ggc/meter/gui/config/MeterConfigPanel.java
trunk/ggc-meter/src/ggc/meter/gui/config/MeterLocationPanel.java
trunk/ggc-meter/src/ggc/meter/gui/config/MeterOtherPanel.java
trunk/ggc-meter/src/ggc/meter/gui/config/MeterStatusPanel.java
trunk/ggc-meter/src/ggc/meter/list/MeterListDialog.java
trunk/ggc-meter/src/ggc/meter/list/MeterListRoot.java
trunk/ggc-meter/src/ggc/meter/protocol/ConnectionProtocols.java
trunk/ggc-meter/src/ggc/meter/util/DataAccessMeter.java
trunk/ggc-plugin_base/src/ggc/plugin/list/BaseListDialog.java
trunk/ggc-pump/src/Changelog
trunk/ggc-pump/src/ggc/pump/data/PumpValues.java
trunk/ggc-pump/src/ggc/pump/data/PumpValuesDay.java
trunk/ggc-pump/src/ggc/pump/data/PumpValuesEntry.java
trunk/ggc-pump/src/ggc/pump/data/defs/PumpReport.java
trunk/ggc-pump/src/ggc/pump/test/PumpConsoleTester.java
trunk/ggc-pump/src/ggc/pump/util/DataAccessPump.java
trunk/web_page/inc_download.inc
trunk/web_page/inc_features.inc
trunk/web_page/inc_news.inc
trunk/web_page/inc_projects.inc
trunk/web_page/inc_support.inc
trunk/web_page/index.php
Added Paths:
-----------
trunk/ggc-pump/html/
Removed Paths:
-------------
trunk/ggc-support/data/nutrition-SR-20.zip
Modified: trunk/ggc/data/GGC_Config.properties
===================================================================
--- trunk/ggc/data/GGC_Config.properties 2008-08-12 12:12:48 UTC (rev 475)
+++ trunk/ggc/data/GGC_Config.properties 2008-08-12 15:37:52 UTC (rev 476)
@@ -1,6 +1,6 @@
#
# GGC_Config (Settings for GGC)
-#26.7.2008 17:13:36
+#5.8.2008 16:28:38
#
# Don't edit by hand
# Only settings need for application startup are written here. All other info
@@ -79,10 +79,10 @@
#
# Db Selector
#
-SELECTED_DB=0
+SELECTED_DB=1
#
# Language Selector
#
-SELECTED_LANG=si
+SELECTED_LANG=en
Modified: trunk/ggc/src/Diabetes_Hardware.txt
===================================================================
--- trunk/ggc/src/Diabetes_Hardware.txt 2008-08-12 12:12:48 UTC (rev 475)
+++ trunk/ggc/src/Diabetes_Hardware.txt 2008-08-12 15:37:52 UTC (rev 476)
@@ -8,43 +8,36 @@
C.) CGMS
-
-
-
A.) METERS
===========
- Name of company | Plans | Supported devices | Developer
+ Name of company | Plans | Supported devices | Developer
---------------------------------------------------------------------------------------------------------------------------------
-Bayer/Ascensia | Done | Dex2, Contour, Breeze, EliteXl | Andy
-Roche | Planned, -> 09.2008 | All supported through Pix device | Andy
-LifeScan | Planned, 09.- 12.2008 | ? | Andy
-Abbott | ? | ?
+Bayer/Ascensia | Done | Dex2, Contour, Breeze, EliteXl | Andy
+Roche | Planned, -> 09.2008 | All supported through Pix device | Andy
+LifeScan | Planned, 09.- 12.2008 | ? | Andy
+Abbott | ? | ? | ?
+Precission Xtra | ? | ? | ?
+Optimum Xceed | ? | ? | ?
-
B.) PUMPS
===========
- Name of company | Plans | Supported devices | Developer
----------------------------------------------------------------------------------------------------------------------------------
-Roche | Planned, -> 12.2008 | All supported through Pix device | Andy
-Minimed | Planned, ? | Support with import of CareLink export | Andy
-Animas | Planned | ? | Nate
+ Name of company | Plans | Supported devices | Developer
+----------------------------------------------------------------------------------------------------------------------
+Roche | Planned, -> 12.2008 | All supported through Pix device | Andy
+Minimed | Planned, ? | Support with import of CareLink export | Andy
+Animas | Planned | Through EZM db | Nate
-
C.) CGMS
==========
- Name of company | Plans | Supported devices | Developer
----------------------------------------------------------------------------------------------------------------------------------
-Minimed | Planned, ? | Support with import of CareLink export | Andy
+ Name of company | Plans | Supported devices | Developer
+----------------------------------------------------------------------------------------------------------------------
+Minimed | Planned, ? | Support with import of CareLink export | Andy
-
-
-
-
Modified: trunk/ggc/src/ggc/core/db/GGCDbLoader.java
===================================================================
--- trunk/ggc/src/ggc/core/db/GGCDbLoader.java 2008-08-12 12:12:48 UTC (rev 475)
+++ trunk/ggc/src/ggc/core/db/GGCDbLoader.java 2008-08-12 15:37:52 UTC (rev 476)
@@ -66,9 +66,11 @@
public boolean run_once = false;
- public boolean part_start = false;
+ public boolean part_start = true;
+ //public boolean debug = false;
+
public GGCDbLoader(DataAccess da)
{
m_da = da;
@@ -108,7 +110,7 @@
GGCDb db = new GGCDb(m_da);
- if (!part_start)
+ //if (!part_start)
{
if (m_bar!=null)
m_bar.setDatabaseName(db.getHibernateConfiguration().getConnectionName());
@@ -159,31 +161,35 @@
setDbStatus(StatusBar.DB_BASE_DONE);
+
+ if (!part_start)
+ {
- // 4 - load doctors data
-
- // TODO: in version 0.4
+ // 4 - load doctors data
+ // TODO: in version 0.4
+
+ // 5 - load nutrition(1) root data
+ db.loadNutritionDbBase();
+ db.loadNutritionDb1();
+
+ // 6 - load nutrition(2) root data
+ db.loadNutritionDb2();
+
+
+ // 7 - load meals root data
+ db.loadMealsDb();
-
- // 5 - load nutrition(1) root data
- db.loadNutritionDbBase();
- db.loadNutritionDb1();
+ setDbStatus(StatusBar.DB_LOADED);
+ }
+ else
+ {
+ db.loadNutritionDbBase();
+ setDbStatus(StatusBar.DB_LOADED);
+ }
- // 6 - load nutrition(2) root data
- db.loadNutritionDb2();
-
- // 7 - load meals root data
-
- db.loadMealsDb();
-
-
- setDbStatus(StatusBar.DB_LOADED);
-
-
-
/*
if (part_start)
{
@@ -209,8 +215,8 @@
public void setDbStatus(int status)
{
- if (part_start)
- return;
+ //if (part_start)
+ // return;
if (m_bar!=null)
{
Modified: trunk/ggc/src/ggc/core/plugins/MetersPlugIn.java
===================================================================
--- trunk/ggc/src/ggc/core/plugins/MetersPlugIn.java 2008-08-12 12:12:48 UTC (rev 475)
+++ trunk/ggc/src/ggc/core/plugins/MetersPlugIn.java 2008-08-12 15:37:52 UTC (rev 476)
@@ -59,11 +59,14 @@
.getInstance(), this);
// System.out.println("We have an instance !!! " + this.m_srv);
+
+ this.installed = true;
+
}
catch (Exception ex)
{
//System.out.println("Ex:" + ex);
-
+ this.installed = false;
}
// System.out.println("We have an instance !!! " + this.m_srv);
@@ -148,12 +151,9 @@
public String getShortStatus()
{
if (this.m_server != null)
- {
- return String.format(ic.getMessage("STATUS_INSTALLED"),
- this.m_server.getVersion());
- }
+ return String.format(ic.getMessage("STATUS_INSTALLED"), this.m_server.getVersion());
else
- return String.format(ic.getMessage("STATUS_NOT_AVAILABLE"), "0.3");
+ return ic.getMessage("STATUS_NOT_INSTALLED");
}
Modified: trunk/ggc/src/ggc/core/plugins/PumpsPlugIn.java
===================================================================
--- trunk/ggc/src/ggc/core/plugins/PumpsPlugIn.java 2008-08-12 12:12:48 UTC (rev 475)
+++ trunk/ggc/src/ggc/core/plugins/PumpsPlugIn.java 2008-08-12 15:37:52 UTC (rev 476)
@@ -190,12 +190,9 @@
public String getShortStatus()
{
if (this.m_server != null)
- {
- return String.format(ic.getMessage("STATUS_INSTALLED"),
- this.m_server.getVersion());
- }
+ return String.format(ic.getMessage("STATUS_INSTALLED"), this.m_server.getVersion());
else
- return String.format(ic.getMessage("STATUS_NOT_AVAILABLE"), "0.4");
+ return ic.getMessage("STATUS_NOT_INSTALLED");
}
public void setReturnData(Object return_data, StatusReporterInterface stat_rep_int)
Modified: trunk/ggc/src/ggc/core/util/DataAccess.java
===================================================================
--- trunk/ggc/src/ggc/core/util/DataAccess.java 2008-08-12 12:12:48 UTC (rev 475)
+++ trunk/ggc/src/ggc/core/util/DataAccess.java 2008-08-12 15:37:52 UTC (rev 476)
@@ -203,13 +203,14 @@
private DataAccess()
{
super(I18nControl.getInstance());
- // this.loadFonts();
- // m_i18n.createInstance(this);
- // loadAvailableLFs();
- // loadLanguageInfo();
- // x m_meterManager = new MeterManager();
+
+ }
+
+
+ public void initSpecial()
+ {
this.tree_roots = new Hashtable<String, GGCTreeRoot>();
this.m_configFile = new DbToolApplicationGGC();
@@ -219,25 +220,15 @@
this.m_settings = new GGCProperties(this, this.m_configFile, m_cfgMgr);
- // m_i18n = I18nControl.getInstance();
-
- // this.setI18nControlInstance(I18nControl.getInstance());
-
loadOptions();
- // this.verifyComConfig();
- // this.loadTimeZones();
-
- // checkPrerequisites();
- // this.loadBackupRestoreCollection();
-
if (!(new File("../data/debug.txt").exists()))
{
new RedirectScreen();
}
-
- }
-
+
+ }
+
// Method: getInstance
// Author: Andy
/**
Modified: trunk/ggc-cgm/src/ggc/cgm/util/DataAccessCGM.java
===================================================================
--- trunk/ggc-cgm/src/ggc/cgm/util/DataAccessCGM.java 2008-08-12 12:12:48 UTC (rev 475)
+++ trunk/ggc-cgm/src/ggc/cgm/util/DataAccessCGM.java 2008-08-12 15:37:52 UTC (rev 476)
@@ -159,33 +159,19 @@
private DataAccessCGM()
{
super(I18nControl.getInstance());
+ }
+
+
+ public void initSpecial()
+ {
this.loadFonts();
- //m_i18n.createInstance(this);
- // loadAvailableLFs();
- // loadLanguageInfo();
-//x m_meterManager = new PumpManager();
-
-// this.m_configFile = new DbToolApplicationGGC();
-// this.m_configFile.loadConfig();
-
-// m_cfgMgr = new ConfigurationManager(this);
-
-// this.m_settings = new GGCProperties(this, this.m_configFile, m_cfgMgr);
-
- m_i18n = I18nControl.getInstance();
-
- //loadOptions();
-
- //this.verifyComConfig();
this.loadTimeZones();
-
loadPumpsTable();
-
checkPrerequisites();
-
- }
-
+ }
+
+
// Method: getInstance
// Author: Andy
/**
Modified: trunk/ggc-meter/.classpath
===================================================================
--- trunk/ggc-meter/.classpath 2008-08-12 12:12:48 UTC (rev 475)
+++ trunk/ggc-meter/.classpath 2008-08-12 15:37:52 UTC (rev 476)
@@ -1,12 +1,13 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/rxtx-2.1.7"/>
- <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/commons-logging-1.0.4"/>
- <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/Xpp Xml Parser 3-1.1.4c"/>
- <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/dom4j-1.6.1"/>
- <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/commons-lang-2.4"/>
- <classpathentry combineaccessrules="false" kind="src" path="/Atech-Tools"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path="src"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/rxtx-2.1.7"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/commons-logging-1.0.4"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/Xpp Xml Parser 3-1.1.4c"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/dom4j-1.6.1"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/commons-lang-2.4"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/Atech-Tools"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/GGC Plugin Base"/>
+ <classpathentry kind="output" path="bin"/>
+</classpath>
Modified: trunk/ggc-meter/src/ggc/meter/device/DummyMeter.java
===================================================================
--- trunk/ggc-meter/src/ggc/meter/device/DummyMeter.java 2008-08-12 12:12:48 UTC (rev 475)
+++ trunk/ggc-meter/src/ggc/meter/device/DummyMeter.java 2008-08-12 15:37:52 UTC (rev 476)
@@ -19,18 +19,19 @@
import ggc.meter.data.MeterValuesEntry;
import ggc.meter.protocol.ConnectionProtocols;
import ggc.meter.util.DataAccessMeter;
-import ggc.meter.util.I18nControl;
import java.util.ArrayList;
import javax.swing.ImageIcon;
+import com.atech.i18n.I18nControlAbstract;
+
public class DummyMeter extends AbstractMeter //implements MeterInterface
{
DataAccessMeter m_da = DataAccessMeter.getInstance();
- I18nControl m_ic = m_da.getI18nInstance();
+ I18nControlAbstract m_ic = m_da.getI18nControlInstance();
public int m_meter_index = 0;
Modified: trunk/ggc-meter/src/ggc/meter/gui/MeterDisplayDataDialog.java
===================================================================
--- trunk/ggc-meter/src/ggc/meter/gui/MeterDisplayDataDialog.java 2008-08-12 12:12:48 UTC (rev 475)
+++ trunk/ggc-meter/src/ggc/meter/gui/MeterDisplayDataDialog.java 2008-08-12 15:37:52 UTC (rev 476)
@@ -11,7 +11,6 @@
import ggc.meter.output.OutputWriter;
import ggc.meter.plugin.MeterPlugInServer;
import ggc.meter.util.DataAccessMeter;
-import ggc.meter.util.I18nControl;
import java.awt.BorderLayout;
import java.awt.FlowLayout;
@@ -37,6 +36,8 @@
import javax.swing.ScrollPaneConstants;
import javax.swing.table.TableColumn;
+import com.atech.i18n.I18nControlAbstract;
+
public class MeterDisplayDataDialog extends JDialog implements ActionListener, OutputWriter
{
@@ -46,7 +47,7 @@
MeterReaderRunner mrr;
private DataAccessMeter m_da = DataAccessMeter.getInstance();
- private I18nControl m_ic = m_da.getI18nInstance();
+ I18nControlAbstract m_ic = m_da.getI18nControlInstance();
// private static ReadMeterDialog singleton = null;
Modified: trunk/ggc-meter/src/ggc/meter/gui/MeterExportDialog.java
===================================================================
--- trunk/ggc-meter/src/ggc/meter/gui/MeterExportDialog.java 2008-08-12 12:12:48 UTC (rev 475)
+++ trunk/ggc-meter/src/ggc/meter/gui/MeterExportDialog.java 2008-08-12 15:37:52 UTC (rev 476)
@@ -6,7 +6,6 @@
import ggc.meter.output.OutputWriter;
import ggc.meter.plugin.MeterPlugInServer;
import ggc.meter.util.DataAccessMeter;
-import ggc.meter.util.I18nControl;
import java.awt.BorderLayout;
import java.awt.Color;
@@ -25,6 +24,7 @@
import javax.swing.border.LineBorder;
import com.atech.graphics.components.StatusReporterInterface;
+import com.atech.i18n.I18nControlAbstract;
public class MeterExportDialog extends JDialog implements ActionListener, StatusReporterInterface
{
@@ -51,7 +51,7 @@
private DataAccessMeter m_da = DataAccessMeter.getInstance();
- private I18nControl m_ic = m_da.getI18nInstance();
+ I18nControlAbstract m_ic = m_da.getI18nControlInstance();
public JProgressBar progress = null;
Modified: trunk/ggc-meter/src/ggc/meter/gui/MeterInstructionsDialog.java
===================================================================
--- trunk/ggc-meter/src/ggc/meter/gui/MeterInstructionsDialog.java 2008-08-12 12:12:48 UTC (rev 475)
+++ trunk/ggc-meter/src/ggc/meter/gui/MeterInstructionsDialog.java 2008-08-12 15:37:52 UTC (rev 476)
@@ -9,7 +9,6 @@
import ggc.meter.plugin.MeterPlugInServer;
import ggc.meter.protocol.ConnectionProtocols;
import ggc.meter.util.DataAccessMeter;
-import ggc.meter.util.I18nControl;
import java.awt.BorderLayout;
import java.awt.Font;
@@ -28,6 +27,7 @@
import com.atech.db.DbDataReaderAbstract;
import com.atech.db.DbDataReadingFinishedInterface;
+import com.atech.i18n.I18nControlAbstract;
import com.atech.utils.TimeZoneUtil;
@@ -44,7 +44,7 @@
private DataAccessMeter m_da = DataAccessMeter.getInstance();
- private I18nControl m_ic = m_da.getI18nInstance();
+ I18nControlAbstract m_ic = m_da.getI18nControlInstance();
JButton button_start;
JLabel label_waiting;
Modified: trunk/ggc-meter/src/ggc/meter/gui/config/MeterCompanyPanel.java
===================================================================
--- trunk/ggc-meter/src/ggc/meter/gui/config/MeterCompanyPanel.java 2008-08-12 12:12:48 UTC (rev 475)
+++ trunk/ggc-meter/src/ggc/meter/gui/config/MeterCompanyPanel.java 2008-08-12 15:37:52 UTC (rev 476)
@@ -33,7 +33,6 @@
import ggc.meter.manager.MeterManager;
import ggc.meter.manager.company.MeterCompanyInterface;
import ggc.meter.util.DataAccessMeter;
-import ggc.meter.util.I18nControl;
import java.awt.event.ItemEvent;
import java.awt.event.ItemListener;
@@ -42,7 +41,9 @@
import javax.swing.JDialog;
import javax.swing.JLabel;
+import com.atech.i18n.I18nControlAbstract;
+
public class MeterCompanyPanel extends AbstractPreferencesPanel implements ItemListener
{
@@ -81,7 +82,7 @@
}
*/
DataAccessMeter m_da = DataAccessMeter.getInstance();
- I18nControl m_ic = m_da.getI18nInstance();
+ I18nControlAbstract m_ic = m_da.getI18nControlInstance();
JLabel label_status;
public MeterCompanyPanel(ConfigurationDialog parent)
Modified: trunk/ggc-meter/src/ggc/meter/gui/config/MeterConfigPanel.java
===================================================================
--- trunk/ggc-meter/src/ggc/meter/gui/config/MeterConfigPanel.java 2008-08-12 12:12:48 UTC (rev 475)
+++ trunk/ggc-meter/src/ggc/meter/gui/config/MeterConfigPanel.java 2008-08-12 15:37:52 UTC (rev 476)
@@ -31,7 +31,6 @@
//import ggc.gui.dialogs.PortSelectionDialog;
import ggc.meter.util.DataAccessMeter;
-import ggc.meter.util.I18nControl;
import java.awt.BorderLayout;
import java.awt.GridLayout;
@@ -53,7 +52,9 @@
import javax.swing.JPanel;
import javax.swing.JTextField;
+import com.atech.i18n.I18nControlAbstract;
+
public class MeterConfigPanel extends AbstractPreferencesPanel implements ItemListener
{
static final long serialVersionUID = 0;
@@ -87,7 +88,7 @@
}
*/
DataAccessMeter m_da = DataAccessMeter.getInstance();
- I18nControl m_ic = m_da.getI18nInstance();
+ I18nControlAbstract m_ic = m_da.getI18nControlInstance();
public MeterConfigPanel(ConfigurationDialog parent)
{
Modified: trunk/ggc-meter/src/ggc/meter/gui/config/MeterLocationPanel.java
===================================================================
--- trunk/ggc-meter/src/ggc/meter/gui/config/MeterLocationPanel.java 2008-08-12 12:12:48 UTC (rev 475)
+++ trunk/ggc-meter/src/ggc/meter/gui/config/MeterLocationPanel.java 2008-08-12 15:37:52 UTC (rev 476)
@@ -31,7 +31,6 @@
//import ggc.gui.dialogs.PortSelectionDialog;
import ggc.meter.util.DataAccessMeter;
-import ggc.meter.util.I18nControl;
import java.awt.BorderLayout;
import java.awt.GridLayout;
@@ -52,7 +51,9 @@
import javax.swing.JPanel;
import javax.swing.JTextField;
+import com.atech.i18n.I18nControlAbstract;
+
public class MeterLocationPanel extends AbstractPreferencesPanel implements ItemListener
{
static final long serialVersionUID = 0;
@@ -86,7 +87,7 @@
}
*/
DataAccessMeter m_da = DataAccessMeter.getInstance();
- I18nControl m_ic = m_da.getI18nInstance();
+ I18nControlAbstract m_ic = m_da.getI18nControlInstance();
public MeterLocationPanel(ConfigurationDialog parent)
{
Modified: trunk/ggc-meter/src/ggc/meter/gui/config/MeterOtherPanel.java
===================================================================
--- trunk/ggc-meter/src/ggc/meter/gui/config/MeterOtherPanel.java 2008-08-12 12:12:48 UTC (rev 475)
+++ trunk/ggc-meter/src/ggc/meter/gui/config/MeterOtherPanel.java 2008-08-12 15:37:52 UTC (rev 476)
@@ -31,7 +31,6 @@
//import ggc.gui.dialogs.PortSelectionDialog;
import ggc.meter.util.DataAccessMeter;
-import ggc.meter.util.I18nControl;
import java.awt.BorderLayout;
import java.awt.GridLayout;
@@ -53,7 +52,9 @@
import javax.swing.JPanel;
import javax.swing.JTextField;
+import com.atech.i18n.I18nControlAbstract;
+
public class MeterOtherPanel extends AbstractPreferencesPanel implements ItemListener
{
static final long serialVersionUID = 0;
@@ -87,7 +88,7 @@
}
*/
DataAccessMeter m_da = DataAccessMeter.getInstance();
- I18nControl m_ic = m_da.getI18nInstance();
+ I18nControlAbstract m_ic = m_da.getI18nControlInstance();
public MeterOtherPanel(ConfigurationDialog parent)
{
Modified: trunk/ggc-meter/src/ggc/meter/gui/config/MeterStatusPanel.java
===================================================================
--- trunk/ggc-meter/src/ggc/meter/gui/config/MeterStatusPanel.java 2008-08-12 12:12:48 UTC (rev 475)
+++ trunk/ggc-meter/src/ggc/meter/gui/config/MeterStatusPanel.java 2008-08-12 15:37:52 UTC (rev 476)
@@ -32,7 +32,6 @@
import ggc.meter.manager.MeterManager;
import ggc.meter.util.DataAccessMeter;
-import ggc.meter.util.I18nControl;
import java.awt.BorderLayout;
import java.awt.GridLayout;
@@ -54,7 +53,9 @@
import javax.swing.JPanel;
import javax.swing.JTextField;
+import com.atech.i18n.I18nControlAbstract;
+
public class MeterStatusPanel extends AbstractPreferencesPanel implements ItemListener
{
static final long serialVersionUID = 0;
@@ -88,7 +89,7 @@
}
*/
DataAccessMeter m_da = DataAccessMeter.getInstance();
- I18nControl m_ic = m_da.getI18nInstance();
+ I18nControlAbstract m_ic = m_da.getI18nControlInstance();
public MeterStatusPanel(ConfigurationDialog parent)
{
Modified: trunk/ggc-meter/src/ggc/meter/list/MeterListDialog.java
===================================================================
--- trunk/ggc-meter/src/ggc/meter/list/MeterListDialog.java 2008-08-12 12:12:48 UTC (rev 475)
+++ trunk/ggc-meter/src/ggc/meter/list/MeterListDialog.java 2008-08-12 15:37:52 UTC (rev 476)
@@ -28,7 +28,6 @@
package ggc.meter.list;
import ggc.meter.util.DataAccessMeter;
-import ggc.meter.util.I18nControl;
import java.awt.Dimension;
import java.awt.GridLayout;
@@ -45,8 +44,10 @@
import javax.swing.event.TreeSelectionListener;
import javax.swing.tree.TreeSelectionModel;
+import com.atech.i18n.I18nControlAbstract;
+
public class MeterListDialog extends JDialog implements TreeSelectionListener, ActionListener
{
static final long serialVersionUID = 0L;
@@ -64,7 +65,7 @@
// private static boolean useSystemLookAndFeel = false;
- private I18nControl ic = null;
+ private I18nControlAbstract ic = null;
public MeterListAbstractPanel panels[] = null;
// x private int selectedPanel = 0;
@@ -81,7 +82,7 @@
//super((JDialog)null, "", true);
m_da = da;
- ic = m_da.m_i18n;
+ ic = m_da.getI18nControlInstance();
//this.setResizable(false);
this.setBounds(80, 50, 800, 600);
Modified: trunk/ggc-meter/src/ggc/meter/list/MeterListRoot.java
===================================================================
--- trunk/ggc-meter/src/ggc/meter/list/MeterListRoot.java 2008-08-12 12:12:48 UTC (rev 475)
+++ trunk/ggc-meter/src/ggc/meter/list/MeterListRoot.java 2008-08-12 15:37:52 UTC (rev 476)
@@ -80,7 +80,7 @@
@Override
public String toString()
{
- return DataAccessMeter.getInstance().m_i18n.getMessage("METERS_LIST");
+ return DataAccessMeter.getInstance().getI18nControlInstance().getMessage("METERS_LIST");
}
Modified: trunk/ggc-meter/src/ggc/meter/protocol/ConnectionProtocols.java
===================================================================
--- trunk/ggc-meter/src/ggc/meter/protocol/ConnectionProtocols.java 2008-08-12 12:12:48 UTC (rev 475)
+++ trunk/ggc-meter/src/ggc/meter/protocol/ConnectionProtocols.java 2008-08-12 15:37:52 UTC (rev 476)
@@ -8,13 +8,15 @@
public static final int PROTOCOL_USB = 2;
public static final int PROTOCOL_MASS_STORAGE_XML = 3;
public static final int PROTOCOL_BLUE_TOOTH = 4;
+ public static final int PROTOCOL_FILE_IMPORT = 5;
public static String[] connectionProtocolDescription = {
"PROT_NONE",
"PROT_SERIAL_BRIDGE",
"PROT_SERIAL_USB",
"PROT_MASS_STORAGE_XML",
- "PROT_BLUE_TOOTH"
+ "PROT_BLUE_TOOTH",
+ "PROT_FILE_IMPORT"
};
Modified: trunk/ggc-meter/src/ggc/meter/util/DataAccessMeter.java
===================================================================
--- trunk/ggc-meter/src/ggc/meter/util/DataAccessMeter.java 2008-08-12 12:12:48 UTC (rev 475)
+++ trunk/ggc-meter/src/ggc/meter/util/DataAccessMeter.java 2008-08-12 15:37:52 UTC (rev 476)
@@ -30,19 +30,15 @@
package ggc.meter.util;
import ggc.meter.manager.MeterManager;
+import ggc.plugin.util.DataAccessPlugInBase;
import java.awt.Color;
import java.awt.Component;
-import java.awt.Font;
import java.awt.Image;
import java.io.ByteArrayOutputStream;
import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
-import java.math.BigDecimal;
-import java.math.MathContext;
-import java.math.RoundingMode;
-import java.text.DecimalFormat;
import java.util.ArrayList;
import java.util.Calendar;
import java.util.Date;
@@ -56,122 +52,22 @@
import javax.swing.JFrame;
import javax.swing.JLabel;
-import com.atech.utils.ATDataAccessAbstract;
-
-public class DataAccessMeter extends ATDataAccessAbstract
+public class DataAccessMeter extends DataAccessPlugInBase
{
- // LF
- // Hashtable<String,String> availableLF_full = null;
- // Object[] availableLF = null;
- // Object[] availableLang = null;
- // private LanguageInfo m_lang_info = null;
-
- // String selectedLF = null;
- // String subSelectedLF = null;
-
- // Config file
- // Hashtable<String,String> config_db_values = null;
- // public int selected_db = -1;
- // public int selected_lang = 1;
- // public String selected_LF_Class = null; // class
- // public String selected_LF_Name = null; // name
- // public String skinLFSelected = null;
- // String allDbs[] = null;
-
- public static final String pathPrefix = ".";
-
- public I18nControl m_i18n = null;
-
private static DataAccessMeter s_da = null; // This is handle to unique
- // singelton instance
-
- //public GGCDb m_db = null;
-
- //public MainFrame m_main = null;
-
- //public GGCLittle m_main_little = null;
-
- public Font fonts[] = null;
-
- //public GGCTreeRoot m_nutrition_treeroot = null;
-
- //public GGCTreeRoot m_meals_treeroot = null;
-
- // daily and weekly data
- //private GregorianCalendar m_date = null, m_dateStart = null;
-
- //private HbA1cValues m_HbA1c = null;
-
- //private DailyValues m_dvalues = null;
-
- //private WeeklyValues m_dRangeValues = null;
-
private MeterManager m_meterManager = null;
-//xa private GGCProperties m_settings = null;
-
- //private DbToolApplicationGGC m_configFile = null;
-// private ConfigurationManager m_cfgMgr = null;
-
-
- public static DecimalFormat MmolDecimalFormat = new DecimalFormat("#0.0");
-
- /**
- * Which BG unit is used: BG_MGDL = mg/dl, BG_MMOL = mmol/l
- */
- public int m_BG_unit = BG_MGDL;
-
- public String[] availableLanguages = { "English", "Deutsch", "Slovenski", };
-
- public String[] avLangPostfix = { "en", "de", "si", };
-
- public String[] bg_units = { "mg/dl", "mmol/l" };
-
public Hashtable<String,String> timeZones;
-
public Vector<String> time_zones_vector;
-// public static DecimalFormat MmolDecimalFormat = new DecimalFormat("#0.0");
public ImageIcon config_icons[] = null;
-/*
- {
- new ImageIcon("/icons/cfg_general.png"),
- new ImageIcon("/icons/cfg_medical.png"),
- new ImageIcon("icons/cfg_colors.png"),
- new ImageIcon("icons/cfg_render.png"),
- new ImageIcon("icons/cfg_meter.png"),
- new ImageIcon("icons/cfg_print.png")
- };
-*/
-/* public ImageIcon config_icons[] = {
- new ImageIcon("images/cfg_db.gif"),
- new ImageIcon("images/cfg_look.gif"),
- new ImageIcon("images/cfg_myparish.gif"),
- new ImageIcon("images/cfg_masses.gif"),
- new ImageIcon("images/cfg_users.gif"),
- new ImageIcon("images/cfg_lang.gif"),
- new ImageIcon("images/cfg_web.gif"),
- null
- };
+ public String[] options_yes_no = null;
- public String config_types[] = {
- m_ic.getMessage("GENERAL"),
- m_ic.getMessage("MEDICAL_DATA"),
- m_ic.getMessage("COLORS_AND_FONTS"),
- m_ic.getMessage("RENDERING_QUALITY"),
- m_ic.getMessage("METER_CONFIGURATION"),
- m_ic.getMessage("PRINTING")
- };
-
-*/
- public String[] options_yes_no = null;
-
-
- JFrame m_main = null;
+ JFrame m_main = null;
public Hashtable<String,String> metersUrl;
@@ -194,36 +90,21 @@
private DataAccessMeter(JFrame frame)
{
super(I18nControl.getInstance());
- this.loadFonts();
-
this.m_main = frame;
+ }
- //m_i18n.createInstance(this);
- // loadAvailableLFs();
- // loadLanguageInfo();
-//x m_meterManager = new MeterManager();
+
+ public void initSpecial()
+ {
+ this.loadFonts();
-// this.m_configFile = new DbToolApplicationGGC();
-// this.m_configFile.loadConfig();
-
-// m_cfgMgr = new ConfigurationManager(this);
-
-// this.m_settings = new GGCProperties(this, this.m_configFile, m_cfgMgr);
-
- m_i18n = I18nControl.getInstance();
-
- //loadOptions();
-
- //this.verifyComConfig();
this.loadTimeZones();
-
loadMetersTable();
- loadConfigIcons();
-
checkPrerequisites();
-
- }
-
+ }
+
+
+
// Method: getInstance
// Author: Andy
/**
@@ -283,7 +164,7 @@
*/
public void deleteInstance()
{
- m_i18n = null;
+ super.m_i18n = null;
}
@@ -375,45 +256,9 @@
- // ********************************************************
- // ****** Fonts *****
- // ********************************************************
- public static final int FONT_BIG_BOLD = 0;
- public static final int FONT_NORMAL = 1;
-
- public static final int FONT_NORMAL_BOLD = 2;
-
- public void loadFonts()
- {
- fonts = new Font[3];
- fonts[0] = new Font("SansSerif", Font.BOLD, 22);
- fonts[1] = new Font("SansSerif", Font.PLAIN, 12);
- fonts[2] = new Font("SansSerif", Font.BOLD, 12);
- }
-
- public Font getFont(int font_id)
- {
- return fonts[font_id];
- }
-
-
-
// ********************************************************
- // ****** Icons *****
- // ********************************************************
-
-
-
-
- // ********************************************************
- // ****** Db *****
- // ********************************************************
-
-
-
- // ********************************************************
// ****** Meters *****
// ********************************************************
@@ -555,119 +400,13 @@
}
*/
- // ********************************************************
- // ****** BG Measurement Type *****
- // ********************************************************
- public static final int BG_MGDL = 1;
- public static final int BG_MMOL = 2;
-
- public int getBGMeasurmentType()
- {
- return this.m_BG_unit;
- }
-
- public void setBGMeasurmentType(int type)
- {
- this.m_BG_unit = type;
- }
-
- private static final float MGDL_TO_MMOL_FACTOR = 0.0555f;
-
- private static final float MMOL_TO_MGDL_FACTOR = 18.016f;
-
- /**
- * Depending on the return value of <code>getBGMeasurmentType()</code>, either
- * return the mg/dl or the mmol/l value of the database's value. Default is mg/dl.
- * @param dbValue - The database's value (in float)
- * @return the BG in either mg/dl or mmol/l
- */
- public float getDisplayedBG(float dbValue)
- {
- switch (this.m_BG_unit)
- {
- case BG_MMOL:
- // this POS should return a float rounded to 3 decimal places,
- // if I understand the docu correctly
- return (new BigDecimal(dbValue * MGDL_TO_MMOL_FACTOR,
- new MathContext(3, RoundingMode.HALF_UP)).floatValue());
- case BG_MGDL:
- default:
- return dbValue;
- }
- }
-
- public float getBGValue(float bg_value)
- {
- switch (this.m_BG_unit)
- {
- case BG_MMOL:
- return (bg_value * MGDL_TO_MMOL_FACTOR);
- case BG_MGDL:
- default:
- return bg_value;
- }
- }
-
-
- public float getBGValueByType(int type, float bg_value)
- {
- switch (type)
- {
- case BG_MMOL:
- return (bg_value * MGDL_TO_MMOL_FACTOR);
- case BG_MGDL:
- default:
- return bg_value;
- }
- }
-
-
- public float getBGValueByType(int input_type, int output_type, float bg_value)
- {
-
- if (input_type==output_type)
- return bg_value;
- else
- {
- if (output_type==DataAccessMeter.BG_MGDL)
- {
- return bg_value * DataAccessMeter.MGDL_TO_MMOL_FACTOR;
- }
- else
- {
- return bg_value * DataAccessMeter.MMOL_TO_MGDL_FACTOR;
- }
- }
-
- }
-
-
- public float getBGValueDifferent(int type, float bg_value)
- {
-
- if (type==DataAccessMeter.BG_MGDL)
- {
- return bg_value * DataAccessMeter.MGDL_TO_MMOL_FACTOR;
- }
- else
- {
- return bg_value * DataAccessMeter.MMOL_TO_MGDL_FACTOR;
- }
- }
-
-
-
// ********************************************************
// ****** Parent handling (for UIs) *****
// ********************************************************
- public I18nControl getI18nInstance()
- {
- return m_i18n;
- }
/**
* Utils
@@ -1123,6 +862,16 @@
}
+
+
+ @Override
+ public void createWebListerItems()
+ {
+ // TODO Auto-generated method stub
+
+ }
+
+
}
Modified: trunk/ggc-plugin_base/src/ggc/plugin/list/BaseListDialog.java
===================================================================
--- trunk/ggc-plugin_base/src/ggc/plugin/list/BaseListDialog.java 2008-08-12 12:12:48 UTC (rev 475)
+++ trunk/ggc-plugin_base/src/ggc/plugin/list/BaseListDialog.java 2008-08-12 15:37:52 UTC (rev 476)
@@ -82,7 +82,7 @@
//super((JDialog)null, "", true);
m_da = da;
- ic = m_da.m_i18n;
+ ic = m_da.getI18nControlInstance();
m_root = new BaseListRoot(m_da);
Modified: trunk/ggc-pump/src/Changelog
===================================================================
--- trunk/ggc-pump/src/Changelog 2008-08-12 12:12:48 UTC (rev 475)
+++ trunk/ggc-pump/src/Changelog 2008-08-12 15:37:52 UTC (rev 476)
@@ -2,6 +2,12 @@
Changes file for GGC Meter Tool
===============================
+0.1.4 08-10
+ * Pump Definitions extended (Pump Interface will change later)
+ * PumpValues contexts were extended. Pump entries, need to be viewed as data for whole day, not as separate
+ records, which will also be the way to compare them to old ones. Generation of day records, must be
+ unified (how will be determined later)
+
0.1.3 08-09
* modification to PumpInterface to include Alaram and Event mappings
Modified: trunk/ggc-pump/src/ggc/pump/data/PumpValues.java
===================================================================
--- trunk/ggc-pump/src/ggc/pump/data/PumpValues.java 2008-08-12 12:12:48 UTC (rev 475)
+++ trunk/ggc-pump/src/ggc/pump/data/PumpValues.java 2008-08-12 15:37:52 UTC (rev 476)
@@ -22,7 +22,7 @@
* Filename: DailyValuesRow.java
* Purpose: One row in the DailyValues Data Model.
*
- * Author: schultd
+ * Author: Andy Rozman {an...@at...}
*/
package ggc.pump.data;
@@ -36,6 +36,7 @@
{
DataAccessPump da = DataAccessPump.getInstance();
+
+ // TODO: Make whole class
-
}
Modified: trunk/ggc-pump/src/ggc/pump/data/PumpValuesDay.java
===================================================================
--- trunk/ggc-pump/src/ggc/pump/data/PumpValuesDay.java 2008-08-12 12:12:48 UTC (rev 475)
+++ trunk/ggc-pump/src/ggc/pump/data/PumpValuesDay.java 2008-08-12 15:37:52 UTC (rev 476)
@@ -22,7 +22,7 @@
* Filename: DailyValuesRow.java
* Purpose: One row in the DailyValues Data Model.
*
- * Author: schultd
+ * Author: Andy Rozman {an...@at...}
*/
package ggc.pump.data;
@@ -35,6 +35,7 @@
{
DataAccessPump da = DataAccessPump.getInstance();
+ // TODO: Make whole class
}
Modified: trunk/ggc-pump/src/ggc/pump/data/PumpValuesEntry.java
===================================================================
--- trunk/ggc-pump/src/ggc/pump/data/PumpValuesEntry.java 2008-08-12 12:12:48 UTC (rev 475)
+++ trunk/ggc-pump/src/ggc/pump/data/PumpValuesEntry.java 2008-08-12 15:37:52 UTC (rev 476)
@@ -22,7 +22,7 @@
* Filename: DailyValuesRow.java
* Purpose: One row in the DailyValues Data Model.
*
- * Author: schultd
+ * Author: Andy Rozman {an...@at...}
*/
package ggc.pump.data;
Modified: trunk/ggc-pump/src/ggc/pump/data/defs/PumpReport.java
===================================================================
--- trunk/ggc-pump/src/ggc/pump/data/defs/PumpReport.java 2008-08-12 12:12:48 UTC (rev 475)
+++ trunk/ggc-pump/src/ggc/pump/data/defs/PumpReport.java 2008-08-12 15:37:52 UTC (rev 476)
@@ -1,6 +1,5 @@
package ggc.pump.data.defs;
-import ggc.pump.manager.company.AbstractPumpCompany;
/*
@@ -29,7 +28,7 @@
* protocol class should be used as super class for meter definitions. Each meter family "should"
* have it's own super class and one class for each meter.
*
- * Author: andyrozman {and...@so...}
+ * Author: Andy Rozman {an...@at...}
*/
Modified: trunk/ggc-pump/src/ggc/pump/test/PumpConsoleTester.java
===================================================================
--- trunk/ggc-pump/src/ggc/pump/test/PumpConsoleTester.java 2008-08-12 12:12:48 UTC (rev 475)
+++ trunk/ggc-pump/src/ggc/pump/test/PumpConsoleTester.java 2008-08-12 15:37:52 UTC (rev 476)
@@ -68,33 +68,10 @@
tzu.setSummerTimeChange(+1);
- //thread = new TimerThread();
- //thread.start();
-
try
{
startRoche(portName);
-
- //this.startOneTouchUltra(portName);
-
- /*
- //GGCFileOutputWriter gfo = new GGCFileOutputWriter();
- ConsoleOutputWriter cow = new ConsoleOutputWriter();
-
-// thread.addJob(gfo.getOutputUtil());
-
- displaySerialPorts();
-
-/*
- m_meter = new AscensiaContour(portName, gfo);
- m_meter.setPort(portName);
- m_meter.loadInitialData();
- */
-
- // m_meter = new OneTouchUltra(portName, cow);
- // m_meter.loadInitialData();
-
}
catch(Exception ex)
{
@@ -102,141 +79,10 @@
ex.printStackTrace();
}
-/*
- //MeterImportManager mim = new MeterImportManager();
-
- if (mim.getErrorCode()!=0)
- {
- System.exit(1);
- }
-*/
-
-
-/*
-
- JFrame.setDefaultLookAndFeelDecorated(true);
- JDialog.setDefaultLookAndFeelDecorated(true);
-
- enableEvents(AWTEvent.WINDOW_EVENT_MASK);
-
- this.getContentPane().setLayout(null);
- this.setSize(640, 480);
- this.setTitle("Meter Tester - v0.1");
- this.setResizable(true);
-
- JPanel fullPanel = new JPanel();
- fullPanel.setLayout(null);
- fullPanel.setBounds(0,0,640,480);
- this.getContentPane().add(fullPanel);
-
-
- JLabel label = new JLabel("String to Send:");
- label.setBounds(30, 10, 100, 25);
-
- fullPanel.add(label);
-
-
-
- textField = new JTextField();
- textField.setBounds(30, 35, 360, 25);
- fullPanel.add(textField);
-
- sendButton = new JButton("Send");
- sendButton.setBounds(405, 35, 65, 25);
- //sendButton.setEnabled(false);
- sendButton.addActionListener(new ActionListener()
- {
- public void actionPerformed(ActionEvent e)
- {
- readyToWrite(textField.getText()+"\n");
- messageArea.append("--> "+textField.getText()+"\n");
- }
- });
- fullPanel.add(sendButton);
-
-
- enterButton = new JButton("Test");
- enterButton.setBounds(480, 35, 120, 25);
- //enterButton.setEnabled(false);
- enterButton.addActionListener(new ActionListener()
- {
- public void actionPerformed(ActionEvent e)
- {
- //readyToWrite("\n");
- //messageArea.append("--> <Enter> sent.\n");
- //m_meter.test2();
- try
- {
- m_meter.loadInitialData();
-
- System.out.println("Info: \n" + m_meter.getInfo());
- System.out.println("Time Difference: \n" + m_meter.getTimeDifference());
-
- //m_meter.getDataFull();
- }
- catch(Exception ex)
- {
- System.out.println("Exception: " + ex);
- }
-
- m_meter.getInfo();
- m_meter.getTimeDifference();
- }
- });
- fullPanel.add(enterButton);
-
-
- label = new JLabel("Communication window:");
- label.setBounds(30, 70, 200, 25);
- fullPanel.add(label);
-
-
- clearButton = new JButton("Clear");
- clearButton.setBounds(535, 73, 65, 20);
- clearButton.addActionListener(new ActionListener()
- {
- public void actionPerformed(ActionEvent e)
- {
- messageArea.setText("");
- }
- });
- fullPanel.add(clearButton);
-
-
- messageArea = new TextArea();
- messageArea.setBounds(30, 95, 570, 300);
- fullPanel.add(messageArea, null);
-
- this.setVisible(true);
- */
}
- public void startAscensia(String portName) throws Exception
- {
- //GGCFileOutputWriter ow = new GGCFileOutputWriter();
- ConsoleOutputWriter ow = new ConsoleOutputWriter();
-
- //thread.addJob(cow.getOutputUtil());
- //thread.addJob(ow.getOutputUtil());
-
- displaySerialPorts();
-
- // TODO
- //AscensiaContour asc_meter = new AscensiaContour(portName, ow);
- //asc_meter.setPort(portName);
-
-
-
- //asc_meter.readDeviceDataFull();
-
- System.out.println("We are back in tester !!!!");
-
- System.exit(0);
-
- }
-
public void startRoche(String portName) throws Exception
{
AccuChekSpirit acs = new AccuChekSpirit("", new ConsoleOutputWriter());
@@ -244,23 +90,7 @@
}
- public void startOneTouchUltra(String portName) throws Exception
- {
-
- ConsoleOutputWriter cow = new ConsoleOutputWriter();
-
-//a thread.addJob(cow.getOutputUtil());
-
- displaySerialPorts();
-
- //OneTouchUltra otu = new OneTouchUltra(portName, cow);
- //m_meter = new OneTouchUltra(portName, cow);
- //otu.loadInitialData();
-
- }
-
-
public void displaySerialPorts()
{
Vector<String> vct = SerialProtocol.getAvailableSerialPorts();
@@ -274,17 +104,6 @@
}
- public void readyToWrite(String str)
- {
- try
- {
- //this.m_meter.portOutputStream.write(str.getBytes());
- }
- catch(Exception ex)
- {
- System.out.println("Tester -> Error writing to meter: " + ex);
- }
- }
public static void main(String args[])
@@ -293,21 +112,7 @@
{
new PumpConsoleTester(args[0]);
- /*
- AscensiaMeter am = new AscensiaMeter();
- am.setPort("COM1");
- am.open();
- try
- {
- Thread.sleep(2000);
- am.test();
-
- }
- catch(Exception ex)
- {
- }*/
-
}
catch(Exception ex)
{
Modified: trunk/ggc-pump/src/ggc/pump/util/DataAccessPump.java
===================================================================
--- trunk/ggc-pump/src/ggc/pump/util/DataAccessPump.java 2008-08-12 12:12:48 UTC (rev 475)
+++ trunk/ggc-pump/src/ggc/pump/util/DataAccessPump.java 2008-08-12 15:37:52 UTC (rev 476)
@@ -186,33 +186,17 @@
private DataAccessPump()
{
super(I18nControl.getInstance());
- this.loadFonts();
+ }
- //m_i18n.createInstance(this);
- // loadAvailableLFs();
- // loadLanguageInfo();
-//x m_meterManager = new PumpManager();
-
-// this.m_configFile = new DbToolApplicationGGC();
-// this.m_configFile.loadConfig();
-
-// m_cfgMgr = new ConfigurationManager(this);
-
-// this.m_settings = new GGCProperties(this, this.m_configFile, m_cfgMgr);
-
- m_i18n = I18nControl.getInstance();
-
- //loadOptions();
-
- //this.verifyComConfig();
+
+ public void initSpecial()
+ {
this.loadTimeZones();
-
loadPumpsTable();
-
checkPrerequisites();
-
- }
-
+ }
+
+
// Method: getInstance
// Author: Andy
/**
Modified: trunk/web_page/inc_download.inc
===================================================================
--- trunk/web_page/inc_download.inc 2008-08-12 12:12:48 UTC (rev 475)
+++ trunk/web_page/inc_download.inc 2008-08-12 15:37:52 UTC (rev 476)
@@ -1,37 +1,100 @@
<blockquote>
<br>
-<h2 class="header">Download</h2>
-There are 2 ways to get a copy. You can check out sources from CVS on sourceforge and compile them. You will get the most recent version, but it might be broken. Or you are free to download a released package. But be warned, until we reach version 0.1, they will be developer releases. They WILL contain bugs, are not optimized, and can do very bad things.
+<h1 class="header">Download</h1>
+
+<br>
+<h2>Packaged software</h2>
+
+This is preffered way of getting software (intended for all end users). In short you need to download package and install it.
+This is easier done on Windows platform, since we have installer, and little harder for all other platforms. There are detailed
+instructions in instalation package (see \docs folder, files Readme_1st and Readme, this 2 files are translated into german and
+slovene (as is application)).
+
+<h3>GGC Releases</h3>
+
+<h4>Version 0.3</h4>
+
<ul>
-<li>CVS:</li><br>
- CVS system was deprecated (there are still old file there) when Sourceforge installed SVN, which is now the way to get sources.<br><br>
+<li><a href="http://downloads.sourceforge.net/ggc/GGC_Setup_0.3_jre.exe?use_mirror=osdn">GGC 0.3 Windows Installer (with JRE)</a> - You should use this
+install file if you have no knowledge about Java. It contains JRE, so the file is much bigger, but you can just install it, out-of-the-box,
+without any special intervention (advised for most end-users).</li>
+<li><a href="http://downloads.sourceforge.net/ggc/GGC_Setup_0.3.exe?use_mirror=osdn">GGC 0.3 Windows Installer (without JRE)</a> - If you have Java
+already on your computer, and your knowledge of computer is above average you can decide to take this file and manually configure
+application to run with your installed Java.</li>
+
+<li><a href="http://downloads.sourceforge.net/ggc/GGC_0.3.zip?use_mirror=osdn">GGC 0.3 Zip file</a>, with all files - For all other platforms you need
+to use this file. You just extract it and then follow by reading Readme_1st to get it running.</li>
+
+
+</ul>
+
+
+<h3>USB Releases</h3>
+
+<h4>GGC USB Version</h4>
+<ul>
+<li><!-- a href="http://downloads.sourceforge.net/ggc/GGC_0.2.9.7.zip">GGC 0.3</a> -->
+USB Release is not available at this time, but it will be added by end of September
+</li>
+</ul>
+
+
+<h4>USB VMs</h4>
+<ul>
+<li><a href="http://downloads.sourceforge.net/ggc/Windows_16.zip?use_mirror=osdn">Windows VM [Java 1.6]</a></li>
+<li><a href="http://downloads.sourceforge.net/ggc/Linux_16.zip?use_mirror=osdn">Linux VM [Java 1.6]</a></li>
+<li><a href="http://downloads.sourceforge.net/ggc/FreeBSD_v7_16.zip?use_mirror=osdn">FreeBSD VM (FreeBSD 7.0) [Java 1.6]</a></li>
+</ul>
+
+
+
+<h3>Other files</h3>
+
+
+<h4>USDA Nutrition Database</h4>
+
+<ul>
+<li><a href="http://downloads.sourceforge.net/ggc/USDA_Nutrient_Db_for_Standard_Reference_r18.zip?use_mirror=kent">USDA Nutrition Database 18</a> - Our software supports any of USDA databases, but since we are using some of data here imported (Home Weights), we are still little bit dependant. If you will start with your own User database, you should install newer version, but for some of here supplied User Databases, you will need specific versions. We will remove this dependency in the future, but for now our "Supported" version is still 18.</li>
+</ul>
+
+
+<h4>Custom Nutrition Databases</h4>
+
+<ul>
+<li><a href="http://downloads.sourceforge.net/ggc/SLO_Db_1.zip?use_mirror=osdn">Slovenian Nutrition Database 1</a> - This is nutrition database for people living in Slovenia and speaking Slovenian. All instructions and notes are inside zip archive. Required USDA SR-18.</li>
+</ul>
+
+
+
+<br>
+<h2>Build from source</h2>
+
+If you are Java developer, you will probably try to build whole thing from source code. All our current code is in SVN (we
+used CVS few years back). If you are not ready for a challenge, then try to download packaged software release. There will
+be pause between releases (6 months or more for major releases, minor releases will be released, when needed changes are
+done).
+
+
+<ul>
+
<li>SVN:</li><br>
SVN system is current versioning system. You neeed to pull down whole tree. When builing with ANT,
compiled files will be stored into ggc-support\bin folder from where you can directly run it.<br>
Here is the link to the Sourceforge SVN Page:<br>
- <a href="http://sourceforge.net/svn/?group_id=49749">http://sourceforge.net/cvs/?group_id=49749</a> <br><br>
+ <a href="http://sourceforge.net/svn/?group_id=49749">http://sourceforge.net/svn/?group_id=49749</a> <br><br>
For details on how to check out sources see the Sourceforge SVN page.<br><br>
-
-<li>Packages:</li><br>
- Packages are in two formats. Windows format which is NullSoft installer (.exe file) (without java) and
- zip file containing all files packaged. <br><br>
- Windows file will install on your system and is runnable by clicking on right icon. In some cases java
- install doesn't set right paths, so java executable is not in path. In this case it's required to make
- change to run.cmd file in \bin folder.<br><br>
+<li>CVS:</li><br>
+ CVS system was deprecated (there are still old file there) when Sourceforge installed SVN, which is now the way to get sources.<br><br>
+ <a href="http://sourceforge.net/cvs/?group_id=49749">http://sourceforge.net/cvs/?group_id=49749</a> <br><br>
- Zip file must just be unzipped in folder of your choice and you can run it by invoking either run.cmd or
- run.sh. If you are running Mac or some other system which isn't supported by these two files, please
- let know support (ours) immediately.<br><br>
+</ul>
- Our Update/Startup mechanism added another file (StartupConfig.properties). There is also JAVA_EXE
- parameter in there which you might need to set (try running first if application is shown disregard
- this note, if not read further). On Windows you need to use double \\ (if you set path like C:\Windows,
- correct form would be C:\\Windows, on other system where you use / for path use only one...
-
- Link to files: <br>
+<br>
+<h2>Link to sourceforge files download area</h2>
+
<a href="http://sourceforge.net/project/showfiles.php?group_id=49749">http://sourceforge.net/project/showfiles.php?group_id=49749</a><br>
Modified: trunk/web_page/inc_features.inc
===================================================================
--- trunk/web_page/inc_features.inc 2008-08-12 12:12:48 UTC (rev 475)
+++ trunk/web_page/inc_features.inc 2008-08-12 15:37:52 UTC (rev 476)
@@ -10,22 +10,26 @@
<b>Currently Implemented Features:</b>
<ul>
- <li>You can enter:</li>
+ <li>Entering You can enter:</li>
<ul>
<li>Blood Glucose (BG) Values (in both formats)</li>
<li>2 different Insulins (Basal, Bolus)</li>
<li>Carbhydrates intake</li>
<li>Activity level</li>
- <li>Urine tests</li>
+ <li>Urine tests</li>
<li>Comments</li>
+ <li>Adding food data to daily entries</li>
</ul>
<li>Store your data in:</li>
<ul>
- <li>With help of Hibernate (see <a href="http://www.hibernate.org/">http://www.hibernate.org/</a> we now support wide
+ <li>With help of Hibernate (see <a href="http://www.hibernate.org/">http://www.hibernate.org/</a>) we now support wide
wariety of databases.
- <li>We have one "internal" database, which can be used out-of-the-box (we use H2 database for that)</li>
+ <li>We have one "internal" database, which can be used out-of-the-box (we use <a href="http://www.h2database.com/">H2</a> database for that)</li>
+ <li>Backup data and restore (full only)</li>
+ <li>Database versioning</li>
+
</ul>
- <li>Plots:</li>
+ <li>Graphs:</li>
<ul>
<li>One Day (shows a BG curve, avg BG, insulin and BU intake)</li>
<li>Course (shows you your values over a period of time)</li>
@@ -50,44 +54,44 @@
<li>Customize whole application</li>
<li>Two sub-projects were created: Meter Tool and Pump Tool (see page Sub-Projects)</li>
<li>Help framework integrated (no help pages are yet written)</li>
+ <li>USB Image of GGC</li>
+ <li>Application update: Client side is working, we need to implement server side</li>
+ <li>Tools integration:</li>
+ <ul>
+ <li>Meter Tool integration (v0.2) - See projects page for details.</li>
+ </ul>
+
</ul>
<b>Planned Features:</b>
<ul>
-<li><i>In next version (0.3):</i></li>
-<ul>
- <li>Backup data and restore (non-GUI)</li>
- <li>Db Versioning</li>
- <li>Rewrite Readme</li>
- <li>Error handling (and logging)</li>
- <li>Add some stuff in Daily</li>
- <li>Application update - Client side</li>
- <li>Startup add support for libraries with native parts</li>
- <li>USB Image of GGC</li>
-</ul>
<li><i>Version (0.4) - (end of 2008):</i></li>
<ul>
- <li>Restore data (full)</li>
- <li>Rewrite "plots" with new library (support for printing and better display)</li>
- <li>Integration of Meter Tool</li>
- <li>Basic Pump support (for manual input of data)</li>
- <li>Integration of Pump Tool</li>
- <li>Add ratio for smart insulin usage recommendations (good for pump users)</li>
- <li>Update system - Server side</li>
- <li>Write help pages for English</li>
+ <li>Rewrite "graphs" with new library (support for printing and better display)</li>
+ <li>Bolus Helper (help with bolus dosage)</li>
+ <li>Add ratios for Bolus Helper (good for pump users)</li>
+ <li>Update system - Server side</li>
+ <li>Write help pages for English</li>
+ <li>Extend nutrition databases</li>
+ <li>Add Remote Food database</li>
+ <li>Db Tool</li>
+ <li>Support for multiple persons</li>
+ <li>Printing of foods and CH usage</li>
+ <li>Backup/Restore extension</li>
+ <li>Integration of Pump Tool</li>
</ul>
<li><i>Version (0.5):</i></li>
<ul>
- <li>Support for multiple persons</li>
<li>Restore data (partitial/update)</li>
- <li>Appointment and Doctors handling</li>
- <li>Support for multiple instances of GGC and their communication</li>
- <li>Internet data (links for pages, forums, blogs - informational)</li>
- <li>Import of data from SiDiary Desktop application. SiDiary has its sister applications running
+ <li>Appointment and Doctors handling</li>
+ <li>Support for multiple instances of GGC and their communication</li>
+ <li>Internet data (links for pages, forums, blogs - informational)</li>
+ <li>Import of data from SiDiary Desktop application. SiDiary has its sister applications running
on many small devices (PocketPC, Palms, SmartPhones, Java Phones), and it has import for a lot of
Meters and also some pumps...</li>
+ <li>Integration of CGMS Tool</li>
</ul>
...
[truncated message content] |
