Menu
▾
▴
[ggc-cvs] SF.net SVN: ggc:[1462] trunk/ggc-plugins/ggc-cgms
|
From: <and...@us...> - 2017-06-28 19:00:31
|
Revision: 1462
http://sourceforge.net/p/ggc/code/1462
Author: andyrozman
Date: 2017-06-28 19:00:28 +0000 (Wed, 28 Jun 2017)
Log Message:
-----------
1.5.3 [26.6.2017]
- changed enums, so that translation are changed from withing DataAccess
- refactorings
- changes to Db Objects
Modified Paths:
--------------
trunk/ggc-plugins/ggc-cgms/doc/Changelog
trunk/ggc-plugins/ggc-cgms/pom.xml
trunk/ggc-plugins/ggc-cgms/src/main/java/ggc/cgms/data/CGMSDataReader.java
trunk/ggc-plugins/ggc-cgms/src/main/java/ggc/cgms/data/CGMSValuesEntry.java
trunk/ggc-plugins/ggc-cgms/src/main/java/ggc/cgms/data/CGMSValuesExtendedEntry.java
trunk/ggc-plugins/ggc-cgms/src/main/java/ggc/cgms/data/db/CGMSData.java
trunk/ggc-plugins/ggc-cgms/src/main/java/ggc/cgms/data/db/CGMSDataExtended.java
trunk/ggc-plugins/ggc-cgms/src/main/java/ggc/cgms/data/db/GGC_CGMSDb.java
trunk/ggc-plugins/ggc-cgms/src/main/java/ggc/cgms/data/defs/CGMSAlarms.java
trunk/ggc-plugins/ggc-cgms/src/main/java/ggc/cgms/data/defs/CGMSBaseDataType.java
trunk/ggc-plugins/ggc-cgms/src/main/java/ggc/cgms/data/defs/CGMSConfigurationGroup.java
trunk/ggc-plugins/ggc-cgms/src/main/java/ggc/cgms/data/defs/CGMSErrors.java
trunk/ggc-plugins/ggc-cgms/src/main/java/ggc/cgms/data/defs/CGMSEvents.java
trunk/ggc-plugins/ggc-cgms/src/main/java/ggc/cgms/defs/CGMSPluginDefinition.java
trunk/ggc-plugins/ggc-cgms/src/main/java/ggc/cgms/defs/device/CGMSDeviceDefinition.java
trunk/ggc-plugins/ggc-cgms/src/main/java/ggc/cgms/defs/device/CGMSDeviceHandler.java
trunk/ggc-plugins/ggc-cgms/src/main/java/ggc/cgms/device/animas/AnimasCGMSHandler.java
trunk/ggc-plugins/ggc-cgms/src/main/java/ggc/cgms/device/animas/impl/AnimasCGMSDeviceReader.java
trunk/ggc-plugins/ggc-cgms/src/main/java/ggc/cgms/device/dexcom/DexcomHandler.java
trunk/ggc-plugins/ggc-cgms/src/main/java/ggc/cgms/device/minimed/MinimedCGMSDeviceHandler.java
trunk/ggc-plugins/ggc-cgms/src/main/java/ggc/cgms/device/minimed/data/converter/Minimed522CGMSDataConverter.java
trunk/ggc-plugins/ggc-cgms/src/main/java/ggc/cgms/device/minimed/data/converter/Minimed523CGMSDataConverter.java
trunk/ggc-plugins/ggc-cgms/src/main/java/ggc/cgms/gui/viewer/CGMSDataDialog.java
trunk/ggc-plugins/ggc-cgms/src/main/java/ggc/cgms/util/CGMSUtil.java
trunk/ggc-plugins/ggc-cgms/src/main/java/ggc/cgms/util/DataAccessCGMS.java
Added Paths:
-----------
trunk/ggc-plugins/ggc-cgms/src/main/templates/
trunk/ggc-plugins/ggc-cgms/src/main/templates/Version.java.template
Modified: trunk/ggc-plugins/ggc-cgms/doc/Changelog
===================================================================
--- trunk/ggc-plugins/ggc-cgms/doc/Changelog 2017-06-28 18:57:17 UTC (rev 1461)
+++ trunk/ggc-plugins/ggc-cgms/doc/Changelog 2017-06-28 19:00:28 UTC (rev 1462)
@@ -4,6 +4,12 @@
-- We will move to version 2.0, when Minimed is supported (Navigator 1.x or 2.x)
+1.5.3 [26.6.2017]
+- changed enums, so that translation are changed from withing DataAccess
+- refactorings
+- changes to Db Objects
+
+
1.5.2 [25.12.2016] [Andy]
- Db changes
- added new Extended Type
Modified: trunk/ggc-plugins/ggc-cgms/pom.xml
===================================================================
--- trunk/ggc-plugins/ggc-cgms/pom.xml 2017-06-28 18:57:17 UTC (rev 1461)
+++ trunk/ggc-plugins/ggc-cgms/pom.xml 2017-06-28 19:00:28 UTC (rev 1462)
@@ -13,7 +13,36 @@
<artifactId>ggc-cgms-tool</artifactId>
<version>${ggc-cgms-tool.version}</version>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>com.google.code.maven-replacer-plugin</groupId>
+ <artifactId>maven-replacer-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>add-source</goal>
+ </goals>
+ <configuration>
+ <sources>
+ <source>${project.build.directory}/generated-sources/ggc/cgms/defs/</source>
+ </sources>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+
+
+ </plugins>
+ </build>
+
<dependencies>
<dependency>
<groupId>net.sf.ggc</groupId>
@@ -43,9 +72,9 @@
</dependencies>
<properties>
+ <version.file>
+ ${project.build.directory}/generated-sources/ggc/cgms/defs/Version.java
+ </version.file>
+ </properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-
- </properties>
</project>
Modified: trunk/ggc-plugins/ggc-cgms/src/main/java/ggc/cgms/data/CGMSDataReader.java
===================================================================
--- trunk/ggc-plugins/ggc-cgms/src/main/java/ggc/cgms/data/CGMSDataReader.java 2017-06-28 18:57:17 UTC (rev 1461)
+++ trunk/ggc-plugins/ggc-cgms/src/main/java/ggc/cgms/data/CGMSDataReader.java 2017-06-28 19:00:28 UTC (rev 1462)
@@ -65,7 +65,7 @@
{
// DataAccessCGMS.notImplemented("CGMSDataReader::getMaxEntries()");
db = m_da.getDb();
- this.all_entries = db.getAllElementsCount();
+ this.allEntries = db.getAllElementsCount();
}
@@ -114,7 +114,7 @@
float proc_total = (proc * 1.0f + db_reading) / 120.0f * 100.0f;
int proc_total_i = (int) proc_total;
- this.m_drr.setOldDataReadingProgress(proc_total_i);
+ this.deviceReaderRunner.setOldDataReadingProgress(proc_total_i);
/*
* try
Modified: trunk/ggc-plugins/ggc-cgms/src/main/java/ggc/cgms/data/CGMSValuesEntry.java
===================================================================
--- trunk/ggc-plugins/ggc-cgms/src/main/java/ggc/cgms/data/CGMSValuesEntry.java 2017-06-28 18:57:17 UTC (rev 1461)
+++ trunk/ggc-plugins/ggc-cgms/src/main/java/ggc/cgms/data/CGMSValuesEntry.java 2017-06-28 19:00:28 UTC (rev 1462)
@@ -88,10 +88,10 @@
super();
list = new ArrayList<CGMSValuesSubEntry>();
this.id = pdh.getId();
- this.datetime = pdh.getDt_info();
- this.type = pdh.getBase_type();
+ this.datetime = pdh.getDtInfo();
+ this.type = pdh.getBaseType();
loadExtended(pdh.getExtended());
- this.person_id = pdh.getPerson_id();
+ this.person_id = pdh.getPersonId();
}
@@ -310,33 +310,33 @@
{
switch (index)
{
- /*
- * case 0: // time
- * {
- * return this.datetime.getTimeString();
- * }
- * case 1: // type
- * {
- * return getBaseTypeString();
- * }
- * case 2: // subtype
- * {
- * return getSubTypeString();
- * }
- * case 3: // value
- * {
- * //return this.getCode();
- * return getValuePrint();
- * }
- * case 4: // additional
- * {
- * return this.getAdditionalDisplay();
- * }
- * case 5: // food
- * {
- * return this.isFoodSet();
- * }
- */
+ /*
+ * case 0: // time
+ * {
+ * return this.datetime.getTimeString();
+ * }
+ * case 1: // type
+ * {
+ * return getBaseTypeString();
+ * }
+ * case 2: // subtype
+ * {
+ * return getSubTypeString();
+ * }
+ * case 3: // value
+ * {
+ * //return this.getCode();
+ * return getValuePrint();
+ * }
+ * case 4: // additional
+ * {
+ * return this.getAdditionalDisplay();
+ * }
+ * case 5: // food
+ * {
+ * return this.isFoodSet();
+ * }
+ */
}
return "N/A";
}
@@ -538,10 +538,10 @@
CGMSDataH pdh = new CGMSDataH();
pdh.setId(this.id);
- pdh.setDt_info(this.datetime);
- pdh.setBase_type(this.type);
+ pdh.setDtInfo(this.datetime);
+ pdh.setBaseType(this.type);
pdh.setExtended(extended = this.saveExtended());
- pdh.setPerson_id(this.person_id);
+ pdh.setPersonId(this.person_id);
pdh.setChanged(System.currentTimeMillis());
Long _id = (Long) sess.save(pdh);
@@ -573,9 +573,9 @@
CGMSDataH pdh = (CGMSDataH) sess.get(CGMSDataH.class, this.id);
pdh.setId(this.id);
- pdh.setBase_type(this.type);
+ pdh.setBaseType(this.type);
pdh.setExtended(this.extended = saveExtended());
- pdh.setPerson_id(this.person_id);
+ pdh.setPersonId(this.person_id);
pdh.setChanged(System.currentTimeMillis());
sess.update(pdh);
@@ -630,10 +630,10 @@
CGMSDataH pdh = (CGMSDataH) sess.get(CGMSDataH.class, this.id);
this.id = pdh.getId();
- this.datetime = pdh.getDt_info();
- this.type = pdh.getBase_type();
+ this.datetime = pdh.getDtInfo();
+ this.type = pdh.getBaseType();
loadExtended(pdh.getExtended());
- this.person_id = pdh.getPerson_id();
+ this.person_id = pdh.getPersonId();
return true;
}
Modified: trunk/ggc-plugins/ggc-cgms/src/main/java/ggc/cgms/data/CGMSValuesExtendedEntry.java
===================================================================
--- trunk/ggc-plugins/ggc-cgms/src/main/java/ggc/cgms/data/CGMSValuesExtendedEntry.java 2017-06-28 18:57:17 UTC (rev 1461)
+++ trunk/ggc-plugins/ggc-cgms/src/main/java/ggc/cgms/data/CGMSValuesExtendedEntry.java 2017-06-28 19:00:28 UTC (rev 1462)
@@ -84,11 +84,11 @@
{
this.id = pdh.getId();
- this.datetime = pdh.getDt_info();
+ this.datetime = pdh.getDtInfo();
this.type = CGMSExtendedDataType.getEnum(pdh.getType());
this.value = pdh.getValue();
loadExtended(pdh.getExtended());
- this.personId = pdh.getPerson_id();
+ this.personId = pdh.getPersonId();
this.comment = pdh.getComment();
}
@@ -288,11 +288,11 @@
{
this.personId = CGMSUtil.getCurrentUserId();
- ch.setDt_info(this.datetime);
+ ch.setDtInfo(this.datetime);
ch.setType(this.type.getValue());
ch.setValue(this.getValue());
ch.setExtended(extended = this.saveExtended());
- ch.setPerson_id(this.personId);
+ ch.setPersonId(this.personId);
ch.setComment(this.comment);
ch.setChanged(System.currentTimeMillis());
}
Modified: trunk/ggc-plugins/ggc-cgms/src/main/java/ggc/cgms/data/db/CGMSData.java
===================================================================
--- trunk/ggc-plugins/ggc-cgms/src/main/java/ggc/cgms/data/db/CGMSData.java 2017-06-28 18:57:17 UTC (rev 1461)
+++ trunk/ggc-plugins/ggc-cgms/src/main/java/ggc/cgms/data/db/CGMSData.java 2017-06-28 19:00:28 UTC (rev 1462)
@@ -72,12 +72,12 @@
public CGMSData(CGMSDataH ch)
{
this.setId(ch.getId());
- this.setDt_info(ch.getDt_info());
- this.setBase_type(ch.getBase_type());
- this.setSub_type(ch.getSub_type());
+ this.setDtInfo(ch.getDtInfo());
+ this.setBaseType(ch.getBaseType());
+ this.setSubType(ch.getSubType());
this.setValue(ch.getValue());
this.setExtended(ch.getExtended());
- this.setPerson_id(ch.getPerson_id());
+ this.setPersonId(ch.getPersonId());
this.setComment(ch.getComment());
this.setChanged(ch.getChanged());
}
@@ -92,12 +92,12 @@
{
// FIXME
this.setId(0L);
- this.setDt_info(pve.getDateTime());
- // this.setBase_type(pve.getBaseType());
- // this.setSub_type(pve.getSubType());
+ this.setDtInfo(pve.getDateTime());
+ // this.setBaseType(pve.getBaseType());
+ // this.setSubType(pve.getSubType());
this.setValue(pve.getValue());
this.setExtended("");
- this.setPerson_id((int) DataAccessCGMS.getInstance().getCurrentUserId());
+ this.setPersonId((int) DataAccessCGMS.getInstance().getCurrentUserId());
// this.setComment(pve.getComment());
this.setChanged(System.currentTimeMillis());
}
@@ -223,12 +223,12 @@
CGMSDataH ch = new CGMSDataH();
ch.setId(this.getId());
- ch.setDt_info(this.getDt_info());
- ch.setBase_type(this.getBase_type());
- ch.setSub_type(this.getSub_type());
+ ch.setDtInfo(this.getDtInfo());
+ ch.setBaseType(this.getBaseType());
+ ch.setSubType(this.getSubType());
ch.setValue(this.getValue());
ch.setExtended(this.getExtended());
- ch.setPerson_id(this.getPerson_id());
+ ch.setPersonId(this.getPersonId());
ch.setComment(this.getComment());
ch.setChanged(System.currentTimeMillis());
@@ -274,12 +274,12 @@
CGMSDataH ch = (CGMSDataH) sess.get(CGMSDataH.class, new Long(this.getId()));
ch.setId(this.getId());
- ch.setDt_info(this.getDt_info());
- ch.setBase_type(this.getBase_type());
- ch.setSub_type(this.getSub_type());
+ ch.setDtInfo(this.getDtInfo());
+ ch.setBaseType(this.getBaseType());
+ ch.setSubType(this.getSubType());
ch.setValue(this.getValue());
ch.setExtended(this.getExtended());
- ch.setPerson_id(this.getPerson_id());
+ ch.setPersonId(this.getPersonId());
ch.setComment(this.getComment());
ch.setChanged(System.currentTimeMillis());
@@ -302,12 +302,12 @@
CGMSDataH ch = (CGMSDataH) sess.get(CGMSDataH.class, new Long(this.getId()));
this.setId(ch.getId());
- this.setDt_info(ch.getDt_info());
- this.setBase_type(ch.getBase_type());
- this.setSub_type(ch.getSub_type());
+ this.setDtInfo(ch.getDtInfo());
+ this.setBaseType(ch.getBaseType());
+ this.setSubType(ch.getSubType());
this.setValue(ch.getValue());
this.setExtended(ch.getExtended());
- this.setPerson_id(ch.getPerson_id());
+ this.setPersonId(ch.getPersonId());
this.setComment(ch.getComment());
this.setChanged(ch.getChanged());
@@ -367,17 +367,17 @@
sb.append(this.getId());
sb.append("|");
- sb.append(this.getDt_info());
+ sb.append(this.getDtInfo());
sb.append("|");
- sb.append(this.getBase_type());
+ sb.append(this.getBaseType());
sb.append("|");
- sb.append(this.getSub_type());
+ sb.append(this.getSubType());
sb.append("|");
sb.append(this.getValue());
sb.append("|");
sb.append(this.getExtended());
sb.append("|");
- sb.append(this.getPerson_id());
+ sb.append(this.getPersonId());
sb.append("|");
sb.append(this.getComment());
sb.append("|");
@@ -444,12 +444,12 @@
String[] arr = da.splitString(value_entry, "|");
this.setId(da.getLongValueFromString(arr[0]));
- this.setDt_info(da.getLongValueFromString(arr[1]));
- this.setBase_type(da.getIntValueFromString(arr[2]));
- this.setSub_type(da.getIntValueFromString(arr[3]));
+ this.setDtInfo(da.getLongValueFromString(arr[1]));
+ this.setBaseType(da.getIntValueFromString(arr[2]));
+ this.setSubType(da.getIntValueFromString(arr[3]));
this.setValue(arr[4]);
this.setExtended(arr[5]);
- this.setPerson_id(da.getIntValueFromString(arr[6]));
+ this.setPersonId(da.getIntValueFromString(arr[6]));
this.setComment(arr[7]);
this.setChanged(da.getLongValueFromString(arr[8]));
Modified: trunk/ggc-plugins/ggc-cgms/src/main/java/ggc/cgms/data/db/CGMSDataExtended.java
===================================================================
--- trunk/ggc-plugins/ggc-cgms/src/main/java/ggc/cgms/data/db/CGMSDataExtended.java 2017-06-28 18:57:17 UTC (rev 1461)
+++ trunk/ggc-plugins/ggc-cgms/src/main/java/ggc/cgms/data/db/CGMSDataExtended.java 2017-06-28 19:00:28 UTC (rev 1462)
@@ -71,11 +71,11 @@
public CGMSDataExtended(CGMSDataExtendedH ch)
{
this.setId(ch.getId());
- this.setDt_info(ch.getDt_info());
+ this.setDtInfo(ch.getDtInfo());
this.setType(ch.getType());
this.setValue(ch.getValue());
this.setExtended(ch.getExtended());
- this.setPerson_id(ch.getPerson_id());
+ this.setPersonId(ch.getPersonId());
this.setComment(ch.getComment());
this.setChanged(ch.getChanged());
}
@@ -201,11 +201,11 @@
CGMSDataExtendedH ch = new CGMSDataExtendedH();
ch.setId(this.getId());
- ch.setDt_info(this.getDt_info());
+ ch.setDtInfo(this.getDtInfo());
ch.setType(this.getType());
ch.setValue(this.getValue());
ch.setExtended(this.getExtended());
- ch.setPerson_id(this.getPerson_id());
+ ch.setPersonId(this.getPersonId());
ch.setComment(this.getComment());
ch.setChanged(System.currentTimeMillis());
@@ -252,11 +252,11 @@
CGMSDataExtendedH ch = (CGMSDataExtendedH) sess.get(CGMSDataExtendedH.class, new Long(this.getId()));
ch.setId(this.getId());
- ch.setDt_info(this.getDt_info());
+ ch.setDtInfo(this.getDtInfo());
ch.setType(this.getType());
ch.setValue(this.getValue());
ch.setExtended(this.getExtended());
- ch.setPerson_id(this.getPerson_id());
+ ch.setPersonId(this.getPersonId());
ch.setComment(this.getComment());
ch.setChanged(System.currentTimeMillis());
@@ -280,11 +280,11 @@
CGMSDataExtendedH ch = (CGMSDataExtendedH) sess.get(CGMSDataExtendedH.class, new Long(this.getId()));
this.setId(ch.getId());
- this.setDt_info(ch.getDt_info());
+ this.setDtInfo(ch.getDtInfo());
this.setType(ch.getType());
this.setValue(ch.getValue());
this.setExtended(ch.getExtended());
- this.setPerson_id(ch.getPerson_id());
+ this.setPersonId(ch.getPersonId());
this.setComment(ch.getComment());
this.setChanged(ch.getChanged());
@@ -344,7 +344,7 @@
sb.append(this.getId());
sb.append("|");
- sb.append(this.getDt_info());
+ sb.append(this.getDtInfo());
sb.append("|");
sb.append(this.getType());
sb.append("|");
@@ -352,7 +352,7 @@
sb.append("|");
sb.append(this.getExtended());
sb.append("|");
- sb.append(this.getPerson_id());
+ sb.append(this.getPersonId());
sb.append("|");
sb.append(this.getComment());
sb.append("|");
@@ -419,11 +419,11 @@
String[] arr = da.splitString(value_entry, "|");
this.setId(da.getLongValueFromString(arr[0]));
- this.setDt_info(da.getLongValueFromString(arr[1]));
+ this.setDtInfo(da.getLongValueFromString(arr[1]));
this.setType(da.getIntValueFromString(arr[2]));
this.setValue(arr[3]);
this.setExtended(arr[4]);
- this.setPerson_id(da.getIntValueFromString(arr[5]));
+ this.setPersonId(da.getIntValueFromString(arr[5]));
this.setComment(arr[6]);
this.setChanged(da.getLongValueFromString(arr[7]));
}
Modified: trunk/ggc-plugins/ggc-cgms/src/main/java/ggc/cgms/data/db/GGC_CGMSDb.java
===================================================================
--- trunk/ggc-plugins/ggc-cgms/src/main/java/ggc/cgms/data/db/GGC_CGMSDb.java 2017-06-28 18:57:17 UTC (rev 1461)
+++ trunk/ggc-plugins/ggc-cgms/src/main/java/ggc/cgms/data/db/GGC_CGMSDb.java 2017-06-28 19:00:28 UTC (rev 1462)
@@ -1,12 +1,12 @@
package ggc.cgms.data.db;
+import java.util.Arrays;
import java.util.GregorianCalendar;
import java.util.Hashtable;
-import java.util.Iterator;
import java.util.List;
import org.hibernate.Criteria;
-import org.hibernate.Query;
+import org.hibernate.criterion.Order;
import org.hibernate.criterion.Projections;
import org.hibernate.criterion.Restrictions;
import org.slf4j.Logger;
@@ -49,8 +49,8 @@
* this program; if not, write to the Free Software Foundation, Inc., 59 Temple
* Place, Suite 330, Boston, MA 02111-1307 USA
*
- * Filename: ###---###
- * Description:
+ * Filename: GGC_CGMSDb
+ * Description: CGMS database handler
*
* Author: Andy {an...@at...}
*/
@@ -59,7 +59,6 @@
{
private static final Logger LOG = LoggerFactory.getLogger(GGC_CGMSDb.class);
- DataAccessCGMS m_da = DataAccessCGMS.getInstance();
/**
@@ -69,8 +68,8 @@
*/
public GGC_CGMSDb(HibernateDb db)
{
- super(db);
- LOG.debug("Created CGMSDb");
+ super(db, DataAccessCGMS.getInstance());
+ // LOG.debug("Created CGMSDb");
// getAllElementsCount();
}
@@ -88,7 +87,7 @@
long dt = ATechDate.getATDateTimeFromGC(gc, ATechDateType.DateOnly);
// long dt = 20070323;
- DeviceValuesDay dV = new DeviceValuesDay(m_da);
+ DeviceValuesDay dV = new DeviceValuesDay(dataAccess);
dV.setDateTimeGC(gc);
String sql = "";
@@ -95,19 +94,15 @@
try
{
- sql = "SELECT dv from ggc.core.db.hibernate.cgms.CGMSDataH as dv WHERE dv.dt_info = " + dt
- + " ORDER BY dv.dt_info ";
- // + "000000 AND dv.dt_info <= " + dt +
- // "235959 ORDER BY dv.dt_info";
+ List<CGMSDataH> dataList = getHibernateData(CGMSDataH.class, //
+ Arrays.asList( //
+ Restrictions.eq("personId", this.dataAccess.getCurrentUserId()), //
+ Restrictions.eq("dtInfo", dt)) //
+ , Arrays.asList(Order.asc("dtInfo")));
- Query q = this.db.getSession().createQuery(sql);
-
- Iterator<?> it = q.list().iterator();
-
- while (it.hasNext())
+ for (CGMSDataH cgmsDataH : dataList)
{
- CGMSDataH pdh = (CGMSDataH) it.next();
- CGMSValuesEntry dv = new CGMSValuesEntry(pdh);
+ CGMSValuesEntry dv = new CGMSValuesEntry(cgmsDataH);
dV.addList(dv.getSubEntryList());
}
@@ -189,7 +184,9 @@
int sum_all = 0;
Criteria criteria = this.getSession().createCriteria(CGMSDataH.class);
- criteria.add(Restrictions.eq("person_id", (int) m_da.getCurrentUserId()));
+ criteria.add(Restrictions.eq("personId", (int) dataAccess.getCurrentUserId()));
+ criteria.add(Restrictions.like("extended", "%" + dataAccess.getSourceDevice() + "%"));
+
criteria.setProjection(Projections.rowCount());
in = (Integer) criteria.list().get(0);
sum_all = in.intValue();
@@ -213,21 +210,19 @@
{
int counter = 0;
- sql = "SELECT dv from ggc.core.db.hibernate.cgms.CGMSDataH as dv WHERE dv.person_id="
- + m_da.getCurrentUserId() + " ORDER BY dv.dt_info ";
+ List<CGMSDataH> dataList = getHibernateData(CGMSDataH.class, //
+ Arrays.asList( //
+ Restrictions.eq("personId", this.dataAccess.getCurrentUserId()), //
+ Restrictions.like("extended", "%" + dataAccess.getSourceDevice() + "%")) //
+ , Arrays.asList(Order.asc("dtInfo")));
- Query q = this.db.getSession().createQuery(sql);
-
- Iterator<?> it = q.list().iterator();
-
pdr.writeStatus(-1);
- // id = "PD_%s_%s_%s";
- while (it.hasNext())
+ for (CGMSDataH cgmsDataH : dataList)
{
counter++;
- CGMSValuesEntry pve = new CGMSValuesEntry((CGMSDataH) it.next());
+ CGMSValuesEntry pve = new CGMSValuesEntry(cgmsDataH);
dt.put(pve.getSpecialId(), pve);
pdr.writeStatus(counter);
}
@@ -251,7 +246,7 @@
GraphTimeDataCollection collection = new GraphTimeDataCollection();
- List<ATechDate> dates = m_da.getDatesList(gcFrom, gcTill, true);
+ List<ATechDate> dates = dataAccess.getDatesList(gcFrom, gcTill, true);
Criteria criteria = null;
@@ -258,10 +253,10 @@
try
{
criteria = getSession().createCriteria(CGMSDataH.class)
- .add(Restrictions.eq("person_id", (int) m_da.getCurrentUserId()))
- .add(Restrictions.eq("base_type", 1))
- .add(Restrictions.and(Restrictions.ge("dt_info", dates.get(0).getATDateTimeAsLong()),
- Restrictions.le("dt_info", dates.get(1).getATDateTimeAsLong())));
+ .add(Restrictions.eq("personId", (int) dataAccess.getCurrentUserId()))
+ .add(Restrictions.eq("baseType", 1))
+ .add(Restrictions.and(Restrictions.ge("dtInfo", dates.get(0).getATDateTimeAsLong()),
+ Restrictions.le("dtInfo", dates.get(1).getATDateTimeAsLong())));
List listData = criteria.list();
Modified: trunk/ggc-plugins/ggc-cgms/src/main/java/ggc/cgms/data/defs/CGMSAlarms.java
===================================================================
--- trunk/ggc-plugins/ggc-cgms/src/main/java/ggc/cgms/data/defs/CGMSAlarms.java 2017-06-28 18:57:17 UTC (rev 1461)
+++ trunk/ggc-plugins/ggc-cgms/src/main/java/ggc/cgms/data/defs/CGMSAlarms.java 2017-06-28 19:00:28 UTC (rev 1462)
@@ -5,7 +5,6 @@
import com.atech.i18n.I18nControlAbstract;
import com.atech.utils.data.CodeEnumWithTranslation;
-import ggc.cgms.util.DataAccessCGMS;
/**
* Application: GGC - GNU Gluco Control
@@ -65,22 +64,33 @@
static Hashtable<String, CGMSAlarms> translationMapping = new Hashtable<String, CGMSAlarms>();
static Hashtable<Integer, CGMSAlarms> codeMapping = new Hashtable<Integer, CGMSAlarms>();
-
static
{
- I18nControlAbstract ic = DataAccessCGMS.getInstance().getI18nControlInstance();
+ for (CGMSAlarms pbt : values())
+ {
+ codeMapping.put(pbt.code, pbt);
+ }
+ }
+
+ public static void translateKeywords(I18nControlAbstract ic)
+ {
+ if (translated)
+ return;
+
for (CGMSAlarms pbt : values())
{
pbt.setTranslation(ic.getMessage(pbt.i18nKey));
translationMapping.put(pbt.getTranslation(), pbt);
- codeMapping.put(pbt.code, pbt);
}
+
+ translated = true;
}
int code;
String i18nKey;
String translation;
+ static boolean translated = false;
private CGMSAlarms(int code, String i18nKey)
Modified: trunk/ggc-plugins/ggc-cgms/src/main/java/ggc/cgms/data/defs/CGMSBaseDataType.java
===================================================================
--- trunk/ggc-plugins/ggc-cgms/src/main/java/ggc/cgms/data/defs/CGMSBaseDataType.java 2017-06-28 18:57:17 UTC (rev 1461)
+++ trunk/ggc-plugins/ggc-cgms/src/main/java/ggc/cgms/data/defs/CGMSBaseDataType.java 2017-06-28 19:00:28 UTC (rev 1462)
@@ -4,7 +4,6 @@
import com.atech.i18n.I18nControlAbstract;
import com.atech.utils.data.CodeEnumWithTranslation;
-import ggc.cgms.util.DataAccessCGMS;
/**
* Application: GGC - GNU Gluco Control
@@ -76,17 +75,29 @@
static Hashtable<String, CGMSBaseDataType> translationMapping = new Hashtable<String, CGMSBaseDataType>();
static Hashtable<Integer, CGMSBaseDataType> codeMapping = new Hashtable<Integer, CGMSBaseDataType>();
+ private static boolean translated;
static
{
- I18nControlAbstract ic = DataAccessCGMS.getInstance().getI18nControlInstance();
+ for (CGMSBaseDataType pbt : values())
+ {
+ codeMapping.put(pbt.code, pbt);
+ }
+ }
+
+ public static void translateKeywords(I18nControlAbstract ic)
+ {
+ if (translated)
+ return;
+
for (CGMSBaseDataType pbt : values())
{
pbt.setTranslation(ic.getMessage(pbt.i18nKey));
translationMapping.put(pbt.getTranslation(), pbt);
- codeMapping.put(pbt.code, pbt);
}
+
+ translated = true;
}
int code;
@@ -94,7 +105,7 @@
String translation;
- private CGMSBaseDataType(int code, String i18nKey)
+ CGMSBaseDataType(int code, String i18nKey)
{
this.code = code;
this.i18nKey = i18nKey;
Modified: trunk/ggc-plugins/ggc-cgms/src/main/java/ggc/cgms/data/defs/CGMSConfigurationGroup.java
===================================================================
--- trunk/ggc-plugins/ggc-cgms/src/main/java/ggc/cgms/data/defs/CGMSConfigurationGroup.java 2017-06-28 18:57:17 UTC (rev 1461)
+++ trunk/ggc-plugins/ggc-cgms/src/main/java/ggc/cgms/data/defs/CGMSConfigurationGroup.java 2017-06-28 19:00:28 UTC (rev 1462)
@@ -6,7 +6,6 @@
import com.atech.i18n.I18nControlAbstract;
import com.atech.utils.data.CodeEnumWithTranslation;
-import ggc.cgms.util.DataAccessCGMS;
import ggc.plugin.data.enums.DeviceConfigurationGroup;
/**
@@ -81,18 +80,29 @@
int code;
String i18nKey;
String translation;
+ static boolean translated = false;
static
{
- I18nControlAbstract ic = DataAccessCGMS.getInstance().getI18nControlInstance();
+ for (CGMSConfigurationGroup pbt : values())
+ {
+ codeMapping.put(pbt.code, pbt);
+ }
+ }
+
+ public static void translateKeywords(I18nControlAbstract ic)
+ {
+ if (translated)
+ return;
+
for (CGMSConfigurationGroup pbt : values())
{
pbt.setTranslation(ic.getMessage(pbt.i18nKey));
translationMapping.put(pbt.getTranslation(), pbt);
- codeMapping.put(pbt.code, pbt);
}
+ translated = true;
}
Modified: trunk/ggc-plugins/ggc-cgms/src/main/java/ggc/cgms/data/defs/CGMSErrors.java
===================================================================
--- trunk/ggc-plugins/ggc-cgms/src/main/java/ggc/cgms/data/defs/CGMSErrors.java 2017-06-28 18:57:17 UTC (rev 1461)
+++ trunk/ggc-plugins/ggc-cgms/src/main/java/ggc/cgms/data/defs/CGMSErrors.java 2017-06-28 19:00:28 UTC (rev 1462)
@@ -4,7 +4,6 @@
import com.atech.i18n.I18nControlAbstract;
import com.atech.utils.data.CodeEnumWithTranslation;
-import ggc.cgms.util.DataAccessCGMS;
/**
* Application: GGC - GNU Gluco Control
@@ -57,22 +56,34 @@
static
{
- I18nControlAbstract ic = DataAccessCGMS.getInstance().getI18nControlInstance();
+ for (CGMSErrors pbt : values())
+ {
+ codeMapping.put(pbt.code, pbt);
+ }
+ }
+
+ public static void translateKeywords(I18nControlAbstract ic)
+ {
+ if (translated)
+ return;
+
for (CGMSErrors pbt : values())
{
pbt.setTranslation(ic.getMessage(pbt.i18nKey));
translationMapping.put(pbt.getTranslation(), pbt);
- codeMapping.put(pbt.code, pbt);
}
+
+ translated = true;
}
int code;
String i18nKey;
String translation;
+ static boolean translated = false;
- private CGMSErrors(int code, String i18nKey)
+ CGMSErrors(int code, String i18nKey)
{
this.code = code;
this.i18nKey = i18nKey;
Modified: trunk/ggc-plugins/ggc-cgms/src/main/java/ggc/cgms/data/defs/CGMSEvents.java
===================================================================
--- trunk/ggc-plugins/ggc-cgms/src/main/java/ggc/cgms/data/defs/CGMSEvents.java 2017-06-28 18:57:17 UTC (rev 1461)
+++ trunk/ggc-plugins/ggc-cgms/src/main/java/ggc/cgms/data/defs/CGMSEvents.java 2017-06-28 19:00:28 UTC (rev 1462)
@@ -5,7 +5,6 @@
import com.atech.i18n.I18nControlAbstract;
import com.atech.utils.data.CodeEnumWithTranslation;
-import ggc.cgms.util.DataAccessCGMS;
/**
* Application: GGC - GNU Gluco Control
@@ -73,22 +72,34 @@
static
{
- I18nControlAbstract ic = DataAccessCGMS.getInstance().getI18nControlInstance();
+ for (CGMSEvents pbt : values())
+ {
+ codeMapping.put(pbt.code, pbt);
+ }
+ }
+
+ public static void translateKeywords(I18nControlAbstract ic)
+ {
+ if (translated)
+ return;
+
for (CGMSEvents pbt : values())
{
pbt.setTranslation(ic.getMessage(pbt.i18nKey));
translationMapping.put(pbt.getTranslation(), pbt);
- codeMapping.put(pbt.code, pbt);
}
+
+ translated = true;
}
int code;
String i18nKey;
String translation;
+ static boolean translated = false;
- private CGMSEvents(int code, String i18nKey)
+ CGMSEvents(int code, String i18nKey)
{
this.code = code;
this.i18nKey = i18nKey;
Modified: trunk/ggc-plugins/ggc-cgms/src/main/java/ggc/cgms/defs/CGMSPluginDefinition.java
===================================================================
--- trunk/ggc-plugins/ggc-cgms/src/main/java/ggc/cgms/defs/CGMSPluginDefinition.java 2017-06-28 18:57:17 UTC (rev 1461)
+++ trunk/ggc-plugins/ggc-cgms/src/main/java/ggc/cgms/defs/CGMSPluginDefinition.java 2017-06-28 19:00:28 UTC (rev 1462)
@@ -10,8 +10,7 @@
import com.atech.app.data.about.LibraryInfoEntry;
import com.atech.i18n.mgr.LanguageManager;
-import ggc.cgms.device.animas.AnimasCGMSHandler;
-import ggc.cgms.device.dexcom.DexcomHandler;
+import ggc.cgms.device.minimed.MinimedCGMSDeviceHandler;
import ggc.cgms.graph.CGMSGraphDefintion;
import ggc.cgms.report.def.CGMSReportDefinition;
import ggc.cgms.util.DataAccessCGMS;
@@ -52,8 +51,7 @@
public class CGMSPluginDefinition extends DevicePluginDefinitionAbstract
{
- String PLUGIN_VERSION = "1.5.1";
- String PLUGIN_NAME = "GGC CGMS Plugin";
+ private static String PLUGIN_NAME = "GGC CGMS Plugin";
CGMSReportDefinition reportsCGMSDefinition;
CGMSGraphDefintion graphsCGMSDefintion;
@@ -61,7 +59,12 @@
public CGMSPluginDefinition(LanguageManager languageManager)
{
- super(languageManager, new GGC_CGMS_ICRunner());
+ super(languageManager, //
+ new GGC_CGMS_ICRunner(), //
+ PLUGIN_NAME, //
+ GGCPluginType.CGMSToolPlugin, //
+ "cgms_", //
+ "ggc.cgms.defs.Version");
}
@@ -155,29 +158,6 @@
}
- public String getPluginVersion()
- {
- return this.PLUGIN_VERSION;
- }
-
-
- /**
- * Get Name of Plugin (for internal use)
- *
- * @return
- */
- public String getPluginName()
- {
- return this.PLUGIN_NAME;
- }
-
-
- public GGCPluginType getPluginType()
- {
- return GGCPluginType.CGMSToolPlugin;
- }
-
-
@Override
public List<BaseListEntry> getWebListerItems()
{
@@ -194,13 +174,6 @@
@Override
- public String getWebListerDescription()
- {
- return this.i18nControl.getMessage("DEVICE_LIST_WEB_DESC");
- }
-
-
- @Override
public PluginReportDefinition getReportsDefinition()
{
if (reportsCGMSDefinition == null)
@@ -225,20 +198,14 @@
@Override
- public String getPluginActionsPrefix()
- {
- return "cgms_";
- }
-
-
- @Override
public void registerDeviceHandlers()
{
- // Animas CGMS - Dexcom (Vibe)
- DeviceHandlerManager.getInstance().addDeviceHandler(new AnimasCGMSHandler());
+ // Minimed CGMS - this one can't be registered Dynamically
+ DeviceHandlerManager.getInstance()
+ .addDeviceHandler(new MinimedCGMSDeviceHandler((DataAccessCGMS) this.dataAccess));
- // Dexcom: G4
- DeviceHandlerManager.getInstance().addDeviceHandler(new DexcomHandler());
+ // register dynamic handlers
+ DeviceHandlerManager.getInstance().registerDeviceHandlersDynamically(getPluginType());
}
}
Modified: trunk/ggc-plugins/ggc-cgms/src/main/java/ggc/cgms/defs/device/CGMSDeviceDefinition.java
===================================================================
--- trunk/ggc-plugins/ggc-cgms/src/main/java/ggc/cgms/defs/device/CGMSDeviceDefinition.java 2017-06-28 18:57:17 UTC (rev 1461)
+++ trunk/ggc-plugins/ggc-cgms/src/main/java/ggc/cgms/defs/device/CGMSDeviceDefinition.java 2017-06-28 19:00:28 UTC (rev 1462)
@@ -153,7 +153,6 @@
static List<DeviceDefinition> allDevices;
static List<DeviceDefinition> supportedDevices;
-
static
{
allDevices = new ArrayList<DeviceDefinition>();
@@ -182,7 +181,7 @@
Object internalDefintion;
DeviceImplementationStatus implementationStatus;
DeviceCompanyDefinition companyDefinition;
- DeviceHandlerType deviceHandlerType;
+ DeviceHandlerType deviceHandlerType = DeviceHandlerType.NullHandler;
DevicePortParameterType devicePortParameterType;
DeviceConnectionProtocol deviceConnectionProtocol;
DeviceProgressStatus deviceProgressStatus;
Modified: trunk/ggc-plugins/ggc-cgms/src/main/java/ggc/cgms/defs/device/CGMSDeviceHandler.java
===================================================================
--- trunk/ggc-plugins/ggc-cgms/src/main/java/ggc/cgms/defs/device/CGMSDeviceHandler.java 2017-06-28 18:57:17 UTC (rev 1461)
+++ trunk/ggc-plugins/ggc-cgms/src/main/java/ggc/cgms/defs/device/CGMSDeviceHandler.java 2017-06-28 19:00:28 UTC (rev 1462)
@@ -3,6 +3,7 @@
import java.util.List;
import ggc.cgms.util.DataAccessCGMS;
+import ggc.core.plugins.GGCPluginType;
import ggc.plugin.data.GGCPlugInFileReaderContext;
import ggc.plugin.device.DownloadSupportType;
import ggc.plugin.device.v2.DeviceDefinition;
@@ -76,4 +77,13 @@
return (CGMSDeviceDefinition) definition;
}
+
+ /**
+ * {@inheritDoc}
+ */
+ public GGCPluginType getGGCPluginType()
+ {
+ return GGCPluginType.CGMSToolPlugin;
+ }
+
}
Modified: trunk/ggc-plugins/ggc-cgms/src/main/java/ggc/cgms/device/animas/AnimasCGMSHandler.java
===================================================================
--- trunk/ggc-plugins/ggc-cgms/src/main/java/ggc/cgms/device/animas/AnimasCGMSHandler.java 2017-06-28 18:57:17 UTC (rev 1461)
+++ trunk/ggc-plugins/ggc-cgms/src/main/java/ggc/cgms/device/animas/AnimasCGMSHandler.java 2017-06-28 19:00:28 UTC (rev 1462)
@@ -72,6 +72,12 @@
}
+ public void closeDevice() throws PlugInBaseException
+ {
+ // not used - handled internally
+ }
+
+
private AnimasDeviceType getAnimasDeviceType(DeviceDefinition definition)
{
return (AnimasDeviceType) getDeviceDefinition(definition).getInternalDefintion();
Modified: trunk/ggc-plugins/ggc-cgms/src/main/java/ggc/cgms/device/animas/impl/AnimasCGMSDeviceReader.java
===================================================================
--- trunk/ggc-plugins/ggc-cgms/src/main/java/ggc/cgms/device/animas/impl/AnimasCGMSDeviceReader.java 2017-06-28 18:57:17 UTC (rev 1461)
+++ trunk/ggc-plugins/ggc-cgms/src/main/java/ggc/cgms/device/animas/impl/AnimasCGMSDeviceReader.java 2017-06-28 19:00:28 UTC (rev 1462)
@@ -62,4 +62,11 @@
handler.startAction(AnimasTransferType.DownloadCGMSSettings);
}
+
+ @Override
+ public void closeDevice() throws PlugInBaseException
+ {
+ // not used - close is handled internally
+ }
+
}
Modified: trunk/ggc-plugins/ggc-cgms/src/main/java/ggc/cgms/device/dexcom/DexcomHandler.java
===================================================================
--- trunk/ggc-plugins/ggc-cgms/src/main/java/ggc/cgms/device/dexcom/DexcomHandler.java 2017-06-28 18:57:17 UTC (rev 1461)
+++ trunk/ggc-plugins/ggc-cgms/src/main/java/ggc/cgms/device/dexcom/DexcomHandler.java 2017-06-28 19:00:28 UTC (rev 1462)
@@ -10,9 +10,6 @@
import ggc.plugin.device.v2.DeviceDefinition;
import ggc.plugin.output.OutputWriter;
-/**
- * Created by andy on 15.04.15.
- */
public class DexcomHandler extends CGMSDeviceHandler
{
@@ -47,7 +44,6 @@
outputWriter.endOutput();
}
-
}
@@ -77,7 +73,12 @@
outputWriter.endOutput();
}
+ }
+
+ public void closeDevice() throws PlugInBaseException
+ {
+ // not used - is handled internally
}
Modified: trunk/ggc-plugins/ggc-cgms/src/main/java/ggc/cgms/device/minimed/MinimedCGMSDeviceHandler.java
===================================================================
--- trunk/ggc-plugins/ggc-cgms/src/main/java/ggc/cgms/device/minimed/MinimedCGMSDeviceHandler.java 2017-06-28 18:57:17 UTC (rev 1461)
+++ trunk/ggc-plugins/ggc-cgms/src/main/java/ggc/cgms/device/minimed/MinimedCGMSDeviceHandler.java 2017-06-28 19:00:28 UTC (rev 1462)
@@ -54,9 +54,13 @@
private static MinimedSpecialConfig specialConfigPanel;
+ public DataAccessCGMS dataAccess;
- public MinimedCGMSDeviceHandler() throws PlugInBaseException
+
+ public MinimedCGMSDeviceHandler(DataAccessCGMS dataAccess)
{
+ this.dataAccess = dataAccess;
+ this.registerConverters();
}
@@ -90,6 +94,12 @@
}
+ public void closeDevice() throws PlugInBaseException
+ {
+ // not used - close is handled internally
+ }
+
+
public List<GGCPlugInFileReaderContext> getFileDownloadContexts(DownloadSupportType downloadSupportType)
{
return null;
@@ -107,9 +117,9 @@
if (!MinimedUtil.isTargetRegistered(MinimedTargetType.CGMS))
{
MinimedUtil.registerConverter(MinimedTargetType.CGMS, MinimedConverterType.CGMS522Converter,
- new Minimed522CGMSDataConverter());
+ new Minimed522CGMSDataConverter(dataAccess));
MinimedUtil.registerConverter(MinimedTargetType.CGMS, MinimedConverterType.CGMS523Converter,
- new Minimed523CGMSDataConverter());
+ new Minimed523CGMSDataConverter(dataAccess));
}
}
Modified: trunk/ggc-plugins/ggc-cgms/src/main/java/ggc/cgms/device/minimed/data/converter/Minimed522CGMSDataConverter.java
===================================================================
--- trunk/ggc-plugins/ggc-cgms/src/main/java/ggc/cgms/device/minimed/data/converter/Minimed522CGMSDataConverter.java 2017-06-28 18:57:17 UTC (rev 1461)
+++ trunk/ggc-plugins/ggc-cgms/src/main/java/ggc/cgms/device/minimed/data/converter/Minimed522CGMSDataConverter.java 2017-06-28 19:00:28 UTC (rev 1462)
@@ -46,9 +46,12 @@
private static final Logger LOG = LoggerFactory.getLogger(Minimed522CGMSDataConverter.class);
- public Minimed522CGMSDataConverter()
+ // public DataAccessCGMS dataAccess;
+
+ public Minimed522CGMSDataConverter(DataAccessCGMS dataAccess)
{
- super(DataAccessCGMS.getInstance());
+ super(dataAccess);
+ // this.dataAccess = dataAccess;
this.bitUtils = MinimedUtil.getBitUtils();
this.outputWriter = MinimedUtil.getOutputWriter();
}
@@ -182,8 +185,7 @@
}
- protected void decodeEnableSetting(String key, MinimedCommandReply minimedReply, int bit,
- CGMSConfigurationGroup pcg)
+ protected void decodeEnableSetting(String key, MinimedCommandReply minimedReply, int bit, CGMSConfigurationGroup pcg)
{
writeSetting(key, parseResultEnable(minimedReply.getRawDataAsInt(bit)), pcg);
}
Modified: trunk/ggc-plugins/ggc-cgms/src/main/java/ggc/cgms/device/minimed/data/converter/Minimed523CGMSDataConverter.java
===================================================================
--- trunk/ggc-plugins/ggc-cgms/src/main/java/ggc/cgms/device/minimed/data/converter/Minimed523CGMSDataConverter.java 2017-06-28 18:57:17 UTC (rev 1461)
+++ trunk/ggc-plugins/ggc-cgms/src/main/java/ggc/cgms/device/minimed/data/converter/Minimed523CGMSDataConverter.java 2017-06-28 19:00:28 UTC (rev 1462)
@@ -6,6 +6,7 @@
import com.atech.utils.ATDataAccessAbstract;
import ggc.cgms.data.defs.CGMSConfigurationGroup;
+import ggc.cgms.util.DataAccessCGMS;
import ggc.core.data.defs.GlucoseUnitType;
import ggc.plugin.device.impl.minimed.data.MinimedCommandReply;
import ggc.plugin.device.impl.minimed.data.converter.MinimedDataConverterAbstract;
@@ -44,6 +45,12 @@
private static final Logger LOG = LoggerFactory.getLogger(Minimed523CGMSDataConverter.class);
+ public Minimed523CGMSDataConverter(DataAccessCGMS dataAccess)
+ {
+ super(dataAccess);
+ }
+
+
@Override
public void convertData(MinimedCommandReply minimedReply)
{
@@ -173,17 +180,13 @@
// System.out.println("Set Rise Rate Limit: " +
// DataAccessPump.Decimal3Format.format(rd[1]/1000.0f) + " mmol/L/min");
- writeSetting("CCFG_RATE_OF_CHANGE_ALERTS_RISE_RATE_LIMIT",
- minimedReply.getRawDataAsInt(1) == 0 ? "OFF"
- : DataAccessPlugInBase.Decimal3Format.format(minimedReply.getRawDataAsInt(1) / 1000.0f)
- + " mmol/L / min",
- CGMSConfigurationGroup.Warnings);
+ writeSetting("CCFG_RATE_OF_CHANGE_ALERTS_RISE_RATE_LIMIT", minimedReply.getRawDataAsInt(1) == 0 ? "OFF"
+ : DataAccessPlugInBase.Decimal3Format.format(minimedReply.getRawDataAsInt(1) / 1000.0f)
+ + " mmol/L / min", CGMSConfigurationGroup.Warnings);
- writeSetting("CCFG_RATE_OF_CHANGE_ALERTS_FALL_RATE_LIMIT",
- minimedReply.getRawDataAsInt(2) == 0 ? "OFF"
- : DataAccessPlugInBase.Decimal3Format.format(minimedReply.getRawDataAsInt(2) / 1000.0f)
- + " mmol/L / min",
- CGMSConfigurationGroup.Warnings);
+ writeSetting("CCFG_RATE_OF_CHANGE_ALERTS_FALL_RATE_LIMIT", minimedReply.getRawDataAsInt(2) == 0 ? "OFF"
+ : DataAccessPlugInBase.Decimal3Format.format(minimedReply.getRawDataAsInt(2) / 1000.0f)
+ + " mmol/L / min", CGMSConfigurationGroup.Warnings);
// SET FALL RATE LIMIT = 0.250
// SET RISE RATE LIMIT = 0.275
@@ -199,8 +202,8 @@
}
else
{
- writeSetting("CCFG_SENSOR_TIME_SENSITIVITY_LOW_PREDICTIVE_ALERT",
- "00:" + (minimedReply.getRawDataAsInt(4) - 128), CGMSConfigurationGroup.Warnings);
+ writeSetting("CCFG_SENSOR_TIME_SENSITIVITY_LOW_PREDICTIVE_ALERT", "00:"
+ + (minimedReply.getRawDataAsInt(4) - 128), CGMSConfigurationGroup.Warnings);
}
if (minimedReply.getRawDataAsInt(3) == 0)
@@ -210,8 +213,8 @@
}
else
{
- writeSetting("CCFG_SENSOR_TIME_SENSITIVITY_HIGH_PREDICTIVE_ALERT",
- "00:" + (minimedReply.getRawDataAsInt(3) - 128), CGMSConfigurationGroup.Warnings);
+ writeSetting("CCFG_SENSOR_TIME_SENSITIVITY_HIGH_PREDICTIVE_ALERT", "00:"
+ + (minimedReply.getRawDataAsInt(3) - 128), CGMSConfigurationGroup.Warnings);
}
return true;
Modified: trunk/ggc-plugins/ggc-cgms/src/main/java/ggc/cgms/gui/viewer/CGMSDataDialog.java
===================================================================
--- trunk/ggc-plugins/ggc-cgms/src/main/java/ggc/cgms/gui/viewer/CGMSDataDialog.java 2017-06-28 18:57:17 UTC (rev 1461)
+++ trunk/ggc-plugins/ggc-cgms/src/main/java/ggc/cgms/gui/viewer/CGMSDataDialog.java 2017-06-28 19:00:28 UTC (rev 1462)
@@ -26,6 +26,7 @@
import ggc.cgms.util.CGMSUtil;
import ggc.cgms.util.DataAccessCGMS;
import ggc.core.data.defs.GlucoseUnitType;
+import ggc.core.util.DataAccess;
import ggc.plugin.data.DeviceValuesDay;
/**
@@ -59,9 +60,6 @@
// private static Log log = LogFactory.getLog(PumpDataDialog.class);
- /**
- *
- */
private static final long serialVersionUID = -3923519587722702685L;
private DataAccessCGMS m_da = DataAccessCGMS.getInstance();
private I18nControlAbstract m_ic = m_da.getI18nControlInstance();
@@ -239,63 +237,71 @@
/*
* JPanel BGPanel = new JPanel(new GridLayout(0, 6));
- * BGPanel.setBorder(BorderFactory.createTitledBorder(m_ic.getMessage(
+ * BGPanel.setBorder(BorderFactory.createTitledBorder(i18nControl.
+ * getMessage(
* "BLOOD_GLUCOSE_CALIB") + ":"));
- * BGPanel.add(new JLabel(m_ic.getMessage("AVG_BG") + ":"));
+ * BGPanel.add(new JLabel(i18nControl.getMessage("AVG_BG") + ":"));
* BGPanel.add(avgBG = new JLabel());
- * BGPanel.add(new JLabel(m_ic.getMessage("HIGHEST") + ":"));
+ * BGPanel.add(new JLabel(i18nControl.getMessage("HIGHEST") + ":"));
* BGPanel.add(highestBG = new JLabel());
- * BGPanel.add(new JLabel(m_ic.getMessage("READINGS") + ":"));
+ * BGPanel.add(new JLabel(i18nControl.getMessage("READINGS") + ":"));
* BGPanel.add(readings = new JLabel());
- * BGPanel.add(new JLabel(m_ic.getMessage("STD_DEV") + ":"));
+ * BGPanel.add(new JLabel(i18nControl.getMessage("STD_DEV") + ":"));
* BGPanel.add(stdDev = new JLabel());
- * BGPanel.add(new JLabel(m_ic.getMessage("LOWEST") + ":"));
+ * BGPanel.add(new JLabel(i18nControl.getMessage("LOWEST") + ":"));
* BGPanel.add(lowestBG = new JLabel());
* InsPanel.add(new JLabel(getIns1Abbr() + ":"));
* InsPanel.add(sumIns1 = new JLabel());
- * InsPanel.add(new JLabel(m_ic.getMessage("AVG") + " " + getIns1Abbr()
+ * InsPanel.add(new JLabel(i18nControl.getMessage("AVG") + " " +
+ * getIns1Abbr()
* + ":"));
* InsPanel.add(avgIns1 = new JLabel());
- * InsPanel.add(new JLabel(m_ic.getMessage("DOSE") + " " + getIns1Abbr()
+ * InsPanel.add(new JLabel(i18nControl.getMessage("DOSE") + " " +
+ * getIns1Abbr()
* + ":"));
* InsPanel.add(doseIns1 = new JLabel());
* InsPanel.add(new JLabel(getIns2Abbr() + ":"));
* InsPanel.add(sumIns2 = new JLabel());
- * InsPanel.add(new JLabel(m_ic.getMessage("AVG") + " " + getIns2Abbr()
+ * InsPanel.add(new JLabel(i18nControl.getMessage("AVG") + " " +
+ * getIns2Abbr()
* + ":"));
* InsPanel.add(avgIns2 = new JLabel());
- * InsPanel.add(new JLabel(m_ic.getMessage("DOSE") + " " + getIns2Abbr()
+ * InsPanel.add(new JLabel(i18nControl.getMessage("DOSE") + " " +
+ * getIns2Abbr()
* + ":"));
* InsPanel.add(doseIns2 = new JLabel());
- * InsPanel.add(new JLabel(m_ic.getMessage("TOTAL") + ":"));
+ * InsPanel.add(new JLabel(i18nControl.getMessage("TOTAL") + ":"));
* InsPanel.add(sumIns = new JLabel());
- * InsPanel.add(new JLabel("")); //m_ic.getMessage("AVG_INS") + ":"));
+ * InsPanel.add(new JLabel("")); //i18nControl.getMessage("AVG_INS") +
+ * ":"));
* InsPanel.add(avgIns = new JLabel());
- * InsPanel.add(new JLabel(m_ic.getMessage("DOSE_INS") + ":"));
+ * InsPanel.add(new JLabel(i18nControl.getMessage("DOSE_INS") + ":"));
* InsPanel.add(doseIns = new JLabel());
* // Panel for BU Stats
* JPanel BUPanel = new JPanel(new GridLayout(1, 6));
- * BUPanel.setBorder(BorderFactory.createTitledBorder(m_ic.getMessage(
+ * BUPanel.setBorder(BorderFactory.createTitledBorder(i18nControl.
+ * getMessage(
* "BREAD_UNITS") + ":"));
- * BUPanel.add(new JLabel(m_ic.getMessage("SUM") + ":"));
+ * BUPanel.add(new JLabel(i18nControl.getMessage("SUM") + ":"));
* BUPanel.add(sumBE = new JLabel());
- * BUPanel.add(new JLabel(m_ic.getMessage("AVG") + ":"));
+ * BUPanel.add(new JLabel(i18nControl.getMessage("AVG") + ":"));
* BUPanel.add(avgBE = new JLabel());
- * BUPanel.add(new JLabel(m_ic.getMessage("MEALS") + ":"));
+ * BUPanel.add(new JLabel(i18nControl.getMessage("MEALS") + ":"));
* BUPanel.add(meals = new JLabel());
* // Panel for BG Stats
* JPanel BGPanel = new JPanel(new GridLayout(0, 6));
- * BGPanel.setBorder(BorderFactory.createTitledBorder(m_ic.getMessage(
+ * BGPanel.setBorder(BorderFactory.createTitledBorder(i18nControl.
+ * getMessage(
* "BLOOD_GLUCOSE") + ":"));
- * BGPanel.add(new JLabel(m_ic.getMessage("AVG_BG") + ":"));
+ * BGPanel.add(new JLabel(i18nControl.getMessage("AVG_BG") + ":"));
* BGPanel.add(avgBG = new JLabel());
- * BGPanel.add(new JLabel(m_ic.getMessage("HIGHEST") + ":"));
+ * BGPanel.add(new JLabel(i18nControl.getMessage("HIGHEST") + ":"));
* BGPanel.add(highestBG = new JLabel());
- * BGPanel.add(new JLabel(m_ic.getMessage("READINGS") + ":"));
+ * BGPanel.add(new JLabel(i18nControl.getMessage("READINGS") + ":"));
* BGPanel.add(readings = new JLabel());
- * BGPanel.add(new JLabel(m_ic.getMessage("STD_DEV") + ":"));
+ * BGPanel.add(new JLabel(i18nControl.getMessage("STD_DEV") + ":"));
* BGPanel.add(stdDev = new JLabel());
- * BGPanel.add(new JLabel(m_ic.getMessage("LOWEST") + ":"));
+ * BGPanel.add(new JLabel(i18nControl.getMessage("LOWEST") + ":"));
* BGPanel.add(lowestBG = new JLabel());
*/
@@ -371,6 +377,8 @@
};
table.setAutoResizeMode(JTable.AUTO_RESIZE_LAST_COLUMN);
+ DataAccess.getSkinManager().reSkinifyComponent(table);
+
resultsPane = new JScrollPane(table);
// resultsPane.getViewport().addMouseListener(ma);
// resultsPane.getViewport().setBackground(table.getBackground());
@@ -414,7 +422,8 @@
// Dimension dim = new Dimension(120, 20);
/*
- * JButton addButton = new JButton(" " + m_ic.getMessage("ADD"));
+ * JButton addButton = new JButton(" " +
+ * i18nControl.getMessage("ADD"));
* addButton.setPreferredSize(dim);
* addButton.setIcon(dataAccess.getImageIcon_22x22("table_add.png",
* this));
@@ -421,7 +430,8 @@
* addButton.setActionCommand("add_row");
* addButton.addActionListener(this);
* EntryBox.add(addButton);
- * JButton editButton = new JButton(" " + m_ic.getMessage("EDIT"));
+ * JButton editButton = new JButton(" " +
+ * i18nControl.getMessage("EDIT"));
* editButton.setPreferredSize(dim);
* editButton.setIcon(dataAccess.getImageIcon_22x22("table_edit.png",
* this));
@@ -428,7 +438,8 @@
* editButton.setActionCommand("edit_row");
* editButton.addActionListener(this);
* EntryBox.add(editButton);
- * JButton delButton = new JButton(" " + m_ic.getMessage("DELETE"));
+ * JButton delButton = new JButton(" " +
+ * i18nControl.getMessage("DELETE"));
* delButton.setPreferredSize(dim);
* delButton.setIcon(dataAccess.getImageIcon_22x22("table_delete.png",
* this));
@@ -579,11 +590,11 @@
/*
* private String getIns1Abbr()
* {
- * return m_ic.getMessage("BOLUS"); //"Bolus Insulin";
+ * return i18nControl.getMessage("BOLUS"); //"Bolus Insulin";
* }
* private String getIns2Abbr()
* {
- * return m_ic.getMessage("BASAL");
+ * return i18nControl.getMessage("BASAL");
* //return "Basal Insulin";
* }
*/
@@ -615,7 +626,8 @@
* if (table.getSelectedRow() == -1)
* {
* JOptionPane.showMessageDialog(this,
- * m_ic.getMessage("SELECT_ROW_FIRST"), m_ic.getMessage("ERROR"),
+ * i18nControl.getMessage("SELECT_ROW_FIRST"),
+ * i18nControl.getMessage("ERROR"),
* JOptionPane.ERROR_MESSAGE);
* return;
* }
@@ -622,7 +634,7 @@
* //DeviceValuesEntryInterface dei =
* this.dayData.getRowAt(table.getSelectedRow());
* int option_selected = JOptionPane.showOptionDialog(this,
- * m_ic.getMessage("ARE_YOU_SURE_DELETE"), m_ic
+ * i18nControl.getMessage("ARE_YOU_SURE_DELETE"), i18nControl
* .getMessage("QUESTION"), JOptionPane.YES_NO_OPTION,
* JOptionPane.QUESTION_MESSAGE, null,
* dataAccess.options_yes_no, JOptionPane.YES_OPTION);
Modified: trunk/ggc-plugins/ggc-cgms/src/main/java/ggc/cgms/util/CGMSUtil.java
===================================================================
--- trunk/ggc-plugins/ggc-cgms/src/main/java/ggc/cgms/util/CGMSUtil.java 2017-06-28 18:57:17 UTC (rev 1461)
+++ trunk/ggc-plugins/ggc-cgms/src/main/java/ggc/cgms/util/CGMSUtil.java 2017-06-28 19:00:28 UTC (rev 1462)
@@ -42,13 +42,21 @@
public class CGMSUtil
{
- private static DataAccessCGMS dataAccess = DataAccessCGMS.getInstance();
+ private static DataAccessCGMS dataAccess;
- private static GGCI18nControl i18nControl = dataAccess.getI18nControlInstance();
+ private static GGCI18nControl i18nControl;
- private static GlucoseUnitType BGUnit = DataAccess.getInstance().getGlucoseUnitType();
+ private static GlucoseUnitType BGUnit;
+ public static void setDataAccess(DataAccessCGMS dataAccess_)
+ {
+ dataAccess = dataAccess_;
+ i18nControl = dataAccess.getI18nControlInstance();
+ BGUnit = DataAccess.getInstance().getGlucoseUnitType();
+ }
+
+
public static GGCI18nControl getI18Control()
{
return i18nControl;
Modified: trunk/ggc-plugins/ggc-cgms/src/main/java/ggc/cgms/util/DataAccessCGMS.java
===================================================================
--- trunk/ggc-plugins/ggc-cgms/src/main/java/ggc/cgms/util/DataAccessCGMS.java 2017-06-28 18:57:17 UTC (rev 1461)
+++ trunk/ggc-plugins/ggc-cgms/src/main/java/ggc/cgms/util/DataAccessCGMS.java 2017-06-28 19:00:28 UTC (rev 1462)
@@ -10,6 +10,7 @@
import ggc.cgms.data.ExtendedCGMSValueHandler;
import ggc.cgms.data.cfg.CGMSConfigurationDefinition;
import ggc.cgms.data.db.GGC_CGMSDb;
+import ggc.cgms.data.defs.*;
import ggc.cgms.data.graph.v2.CGMSGraphContext;
import ggc.cgms.defs.CGMSPluginDefinition;
import ggc.cgms.manager.CGMSManager;
@@ -98,6 +99,8 @@
this.prepareTranslationForEnums();
this.prepareGraphContext();
+
+ CGMSUtil.setDataAccess(this);
}
@@ -105,6 +108,11 @@
{
AnimasSoundType.translateKeywords(this.getI18nControlInstance(), this.getPluginType());
DeviceEntryStatus.translateKeywords(this.getI18nControlInstance());
+ CGMSEvents.translateKeywords(this.getI18nControlInstance());
+ CGMSConfigurationGroup.translateKeywords(this.getI18nControlInstance());
+ CGMSAlarms.translateKeywords(this.getI18nControlInstance());
+ CGMSErrors.translateKeywords(this.getI18nControlInstance());
+ CGMSBaseDataType.translateKeywords(this.getI18nControlInstance());
}
@@ -148,11 +156,11 @@
m_i18n = null;
}
+
// ********************************************************
// ****** Abstract Methods *****
// ********************************************************
-
// ********************************************************
// ****** Manager *****
// ********************************************************
@@ -167,11 +175,11 @@
return this.m_cgms_manager;
}
+
// ********************************************************
// ****** Parent handling (for UIs) *****
// ********************************************************
-
// ********************************************************
// ****** Dates and Times Handling *****
// ********************************************************
@@ -237,6 +245,7 @@
this.device_config = new DeviceConfiguration(this);
}
+
// ********************************************************
// ****** About Methods *****
// ********************************************************
@@ -317,7 +326,6 @@
// ****** Web Lister Methods *****
// ********************************************************
-
// /**
// * Create WebLister (for List) Context for plugin
// */
@@ -388,8 +396,7 @@
@Override
public void loadExtendedHandlers()
{
- this.addExtendedHandler(DataAccessCGM...
[truncated message content] |
