jfDataLogger/0.8 and jfDataLogger/0.4

pquiring · Feb 22, 2017 · dc58c48 · dc58c48
1 parent 8da107e
commit dc58c48
Show file tree

Hide file tree

Showing 9 changed files with 19 additions and 13 deletions.
diff --git a/projects/jfdatalogger/build.xml b/projects/jfdatalogger/build.xml
@@ -7,7 +7,7 @@
   <property name="src" location="src"/>
   <property name="build" location="classes"/>
   <property name="classpath" location="javaforce.jar"/>
-  <property name="version" value="0.7"/>
+  <property name="version" value="0.8"/>
 
   <import file="../../base.xml"/>
 

diff --git a/projects/jfdatalogger/src/App.java b/projects/jfdatalogger/src/App.java
@@ -14,7 +14,7 @@
 
 public class App extends javax.swing.JFrame {
 
-  public static String version = "0.7";
+  public static String version = "0.8";
 
   public static int delays[] = new int[] {
     25, 50, 100, 500, 1000, 3000, 5000, 10000, 30000, 60000, 300000

diff --git a/projects/jfdatalogger/whatsnew.txt b/projects/jfdatalogger/whatsnew.txt
@@ -1,3 +1,6 @@
+Feb 22/2017 : v0.8 released
+  - fix : improved PLC connections
+
 Feb 17/2017 : v0.7 released
   - fix : added support for AB INT data type
 

diff --git a/projects/jfdatalogger/wix32.xml b/projects/jfdatalogger/wix32.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
-  <Product Id="*" UpgradeCode="{429E2AD1-232C-4C24-9C78-8D06E506505A}" Version="0.7" Language="1033" Name="jfDataLogger" Manufacturer="Peter Quiring">
+  <Product Id="*" UpgradeCode="{429E2AD1-232C-4C24-9C78-8D06E506505A}" Version="0.8" Language="1033" Name="jfDataLogger" Manufacturer="Peter Quiring">
     <Package InstallerVersion="300" Compressed="yes" InstallScope="perMachine"/>
     <Media Id="1" Cabinet="files.cab" EmbedCab="yes" />
     <UIRef Id="WixUI_Minimal" />

diff --git a/projects/jfdatalogger/wix64.xml b/projects/jfdatalogger/wix64.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
-  <Product Id="*" UpgradeCode="{741FCC9E-8DEC-415E-A05E-1115FEA9FA31}" Version="0.7" Language="1033" Name="jfDataLogger" Manufacturer="Peter Quiring">
+  <Product Id="*" UpgradeCode="{741FCC9E-8DEC-415E-A05E-1115FEA9FA31}" Version="0.8" Language="1033" Name="jfDataLogger" Manufacturer="Peter Quiring">
     <Package InstallerVersion="300" Compressed="yes" InstallScope="perMachine" Platform="x64"/>
     <Media Id="1" Cabinet="files.cab" EmbedCab="yes" />
     <UIRef Id="WixUI_Minimal" />

diff --git a/projects/jfdataloggerplus/build.xml b/projects/jfdataloggerplus/build.xml
@@ -8,7 +8,7 @@
   <property name="src" location="src"/>
   <property name="build" location="classes"/>
   <property name="classpath" location="javaforce.jar"/>
-  <property name="version" value="0.3"/>
+  <property name="version" value="0.4"/>
 
   <import file="../../base.xml"/>
 

diff --git a/projects/jfdataloggerplus/src/Service.java b/projects/jfdataloggerplus/src/Service.java
@@ -47,7 +47,7 @@ public static void addTag(Tag tag) {
       String id = sql.select1value(query);
       tag.setData("id", JF.atoi(id));
       sql.close();
-      restart();
+      restart(false);
     }
   }
   public static boolean exists(String host, String tag) {
@@ -69,20 +69,22 @@ public static void removeTag(Tag tag) {
       query = String.format("delete from history where id=%d", tag.getData("id"));
       sql.execute(query);
       sql.close();
-      restart();
+      restart(false);
     }
   }
-  public static void restart() {
+  public static void restart(boolean first) {
     synchronized(tagsLock) {
       Tag tags[] = getTags();
       //stop all tags
+      if (!first) JFLog.log("Stopping " + tags.length + " tags");
       for(int a=0;a<tags.length;a++) {
         tags[a].stop();
       }
       //start all tags
+      JFLog.log("Starting " + tags.length + " tags");
       for(int a=0;a<tags.length;a++) {
         Tag parent = null;
-        for(int b=0;b<tags.length;b++) {
+        for(int b=0;b<a;b++) {
           if (tags[a].host.equals(tags[b].host)) {
             parent = tags[b];
             break;
@@ -94,7 +96,7 @@ public static void restart() {
   }
   public static void updateTag(Tag tag) {
     synchronized(tagsLock) {
-      restart();
+      restart(false);
     }
   }
   public static void logMsg(String msg) {
@@ -171,6 +173,7 @@ public static void start() {
     String query[][] = sql.select("select id,host,type,tag,size,color,minvalue,maxvalue,delay from tags");
     sql.close();
     if (query == null) return;
+    JFLog.log("Loaded " + query.length + " tags");
     for(int a=0;a<query.length;a++) {
       Tag tag = new Tag();
       tags.add(tag);
@@ -202,7 +205,7 @@ public static void start() {
       }
       tag.delay = JF.atoi(query[a][8]);
     }
-    restart();
+    restart(true);
   }
   public static void stop() {
     synchronized (tagsLock) {

diff --git a/projects/jfdataloggerplus/wix32.xml b/projects/jfdataloggerplus/wix32.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
-  <Product Id="*" UpgradeCode="{429E2AD1-232C-4C24-9C78-8D06E506505B}" Version="0.3" Language="1033" Name="jfDataLoggerPlus" Manufacturer="Peter Quiring">
+  <Product Id="*" UpgradeCode="{429E2AD1-232C-4C24-9C78-8D06E506505B}" Version="0.4" Language="1033" Name="jfDataLoggerPlus" Manufacturer="Peter Quiring">
     <Package InstallerVersion="300" Compressed="yes" InstallScope="perMachine"/>
     <Media Id="1" Cabinet="files.cab" EmbedCab="yes" />
     <UIRef Id="WixUI_Minimal" />

diff --git a/projects/jfdataloggerplus/wix64.xml b/projects/jfdataloggerplus/wix64.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
-  <Product Id="*" UpgradeCode="{741FCC9E-8DEC-415E-A05E-1115FEA9FA32}" Version="0.3" Language="1033" Name="jfDataLoggerPlus" Manufacturer="Peter Quiring">
+  <Product Id="*" UpgradeCode="{741FCC9E-8DEC-415E-A05E-1115FEA9FA32}" Version="0.4" Language="1033" Name="jfDataLoggerPlus" Manufacturer="Peter Quiring">
     <Package InstallerVersion="300" Compressed="yes" InstallScope="perMachine" Platform="x64"/>
     <Media Id="1" Cabinet="files.cab" EmbedCab="yes" />
     <UIRef Id="WixUI_Minimal" />