UI work to always show logs & bump ver 2.0.1-pre1-->pre02

* UI: Remove all values from Criteria textFields.
* UI: Rename tab-Options --> Criteria
* Cleanup some forgotten Global-vars.
* worker: Remove unused Error field.

CHANGES.md

@@ -4,13 +4,14 @@ VECTO-CSE: Changes
 
 TODO: 2014-06-??: v2.0.1
 -----------------
-  * JSON-ize preferences, vehicle-file, job-file, criteria-file
+  * JSON-ize preferences, vehicle, job & criteria-files, ...
   * Provide default-values and help-messages in GUI/files with infos from "schemas".
-  * Start improving error-reporting by including stack-traces and timestamps into the log-file, for post-mortem examination.
+  * Improving error-reporting by including stack-traces and timestamps into the log-file, for post-mortem examination.
   * Separate config/ from Declaration/ folders.
-  * Standarize versinong using [SemanticVersioning](http://semver.org/).
+  * Use "clever" WorkingDir for all file-paths, so that Job-files cen be ported to other computers.
   * Possible to use any editor (not only notepad.exe) for viewing files.
-  * Welcome developers with README.md, CHANGES.md and COPYING.txt files.
+  * Standarize versioning using [SemanticVersioning](http://semver.org/).
+  * Welcome developers and users with README.md, CHANGES.md and COPYING.txt files.
 ##### Internal:
   * Implement an API for writing Header/Body json-files.
   * Apply Object-oriented design weith resource-management when I/O files.
@@ -19,9 +20,18 @@ TODO: 2014-06-??: v2.0.1
 
 More analytically:
 
+#### 2014-06-04: v2.0.1-pre2 ####
+JRC contributions:
+  * Convert Job & Criteria files to JSON and possible to store them separately.
+  * Still supporting old format for reading.
+  * Use "clever" WorkingDir for all file-paths, so that Job-files cen be ported to other computers.
+  * UI work.
+##### Internal:
+  * Log unhandled exceptions
+  * More refactorings to simplify structure of source files and folders.
 
 
-#### 2014-06-03: v2.0.1-pre1 ####
+#### 2014-05-30: v2.0.1-pre1 ####
 JRC contributions:
 
   * Read/write Vehicle-file as JSON.

CSE/ApplicationEvents.vb

@@ -56,6 +56,9 @@
                 fbVECTO = New cFileBrowser("CSE")
                 fbVECTO.Extensions = New String() {"csjob.json", "csjob"}
 
+                fbCRT = New cFileBrowser("CRT.json")
+                fbCRT.Extensions = New String() {"cscrt.json"}
+
                 fbTXT = New cFileBrowser("TXT")
                 fbTXT.Extensions = New String() {"txt"}
 

CSE/Classes/cFile_v3.vb

@@ -70,8 +70,6 @@ Public Class cFile_V3
         Dim line0 As String
         Dim gogo As Boolean = True
 
-        endofall = False
-
         line = PreLine
 
 lb10:
@@ -96,8 +94,6 @@ lb10:
 
         End If
 
-        If Equals(PreLine, line) And FileEnd And Not gogo Then endofall = True
-
         Return line
 
     End Function

CSE/GUI/FB_Dialog.vb

@@ -131,7 +131,7 @@ Public Class FB_Dialog
                         HasExt = True
                     Else
                         'Check ob Datei mit Ext angegeben
-                        HasExt = (Microsoft.VisualBasic.Len(fEXT(path)) > 1)
+                        HasExt = (Microsoft.VisualBasic.Len(IO.Path.GetExtension(path)) > 1)
                     End If
                     'Falls Datei ohne Endung (nach bForceExt-Abfrage) und nicht existiert dann primre Endung hinzufgen
                     If Not HasExt Then

CSE/IO/cCriteria.vb

@@ -237,7 +237,7 @@ Public Class cCriteria
         Dim g, b As Object
         b = Me.Body
 
-        g = b.Processing
+        g = b("Processing")
         g.roh_air_ref = Me.roh_air_ref
         g.accel_correction = Me.accel_correction
         g.gradient_correction = Me.gradient_correction
@@ -246,7 +246,7 @@ Public Class cCriteria
         g.acc_corr_avg = Me.acc_corr_avg
         g.dist_float = Me.dist_float
 
-        g = b.Validation
+        g = b("Validation")
         g.trigger_delta_x_max = Me.trigger_delta_x_max
         g.trigger_delta_y_max = Me.trigger_delta_y_max
         g.delta_head_max = Me.delta_head_max

CSE/IO/cJob.vb

@@ -247,10 +247,13 @@ Public Class cJob
 
 
     ''' <summary>Do not invoke this method in vain...</summary>
-    ReadOnly Property Criteria As cCriteria
+    Property Criteria As cCriteria
         Get
             Return New cCriteria(Me.Body("Criteria"), True)
         End Get
+        Set(ByVal value As cCriteria)
+            Me.Body("Criteria") = value.Body
+        End Set
     End Property
 
 

CSE/IO/cJsonFile.vb

@@ -154,6 +154,7 @@ Public MustInherit Class cJsonFile
 
     ''' <summary>Validates and Writing to the config file</summary>
     Overridable Sub Store(ByVal fpath As String)
+        logme(4, False, format("Writting JSON-file({0})...", fpath))
         Me.UpdateHeader()
 
         Me.Validate(Me.StrictBody)

CSE/declaration_public.vb

@@ -2,12 +2,11 @@
 
     ' Description of the form
     Public Const AppName As String = "VECTO_CSE"                ' Name of the programm
-    Public Const AppVers As String = "2.0.1-pre1"                     ' Version of the Programm
+    Public Const AppVers As String = "2.0.1-pre2"                     ' Version of the Programm
     Public AppDate As String                                    ' Date of the compilation of the programm
 
     ' Control variables
     Public Const komment = "C"                                  ' Symbol for a comment in the input files
-    Public NameFK() As String = ({"", "Vehicle", "Weather", "Altitude", "MS Config calibration", "MS Config test", "Data Calib", "Data LS1", "Data HS", "Data LS2"})
     Public AnzeigeMessage() As String = ({"", "", "", "         + ", "      ~ ", "   * ", " - ", "", "", ""})
 
     Public AppFormStarted = False
@@ -44,7 +43,6 @@
     Public OptPar() As Boolean = ({True, True, True})           ' Array to identify if optional parameters are given
 
     ' Boolean for the programm control
-    Public endofall As Boolean = False                          ' Variable if enough input data in the files
     Public FileBlock As Boolean = False                         ' Variable if a file is blocked by an other process
 
 
@@ -56,6 +54,7 @@
 
     Public fbTXT As cFileBrowser
     Public fbVECTO As cFileBrowser
+    Public fbCRT As cFileBrowser
     Public fbCSV As cFileBrowser
     Public fbDir As cFileBrowser
     Public fbWorkDir As cFileBrowser