Code development platform for open source projects from the European Union institutions

Skip to content
Snippets Groups Projects
Commit 15a5a1a1 authored by Kostis ANAGNOSTOPOULOS's avatar Kostis ANAGNOSTOPOULOS
Browse files

FIX jsonFile not-saving by reverting caching of Body/Header props.

* Minor text updates.
parent 673670c6
No related branches found
No related tags found
No related merge requests found
......@@ -3,40 +3,44 @@ VECTO-CSE: Development
### BUILD
Before compiling you need to add/check references to:
* vectolic.dll
* Newtonsoft.Json.dll
* vectolic.dll
* Newtonsoft.Json.dll
### EXECUTE
The following directories/files must be provided in the application folder (e.g. ..\bin\Debug):
* vectolic.dll (check correct version)
* Newtonsoft.Json.dll 6.0.0
* license.dat
* Declaration/
* DemoData/
* Docs/CSE-User Manual.pdf (generated from Word-file)
* vectolic.dll (check correct version)
* Newtonsoft.Json.dll 6.0.0
* license.dat
* Declaration/
* DemoData/
* Docs/CSE-User Manual.pdf (generated from Word-file)
### RELEASE
Checklist to build a new release:
* Make zip-folder named with the "Semantic-version", ie: 2014_15_5-VECTO_CSE-2.0.1-beta1.
* Copy into it:
* executable (`.EXE`) (from bin/Debug when pre/beta release)
* vectolic.dll (check correct version)
* Newtonsoft.Json.dll 6.0.0
* Declaration/
* DemoData/
* Docs/CSE-User Manual.pdf (generated from Word-file)
* Docs/GenericData.xlsx
* README.md
* CHANGES.md
* COPYING.txt
* Make a temp-copy of the folder and run it with a license to check everything alright.
* Does the "User Manual" open?
* ZIP the original folder.
* Upload into CITNet's SVN:
https://webgate.ec.europa.eu/CITnet/svn/VECTO/trunk/Share/
and link from:
https://webgate.ec.europa.eu/CITnet/confluence/display/VECTO_CSE/Releases
* Make licenses and update private pages
* Tag repos.
* Send announcment email through JIRA (ie see VECTO-28)
* Make zip-folder named with the "Semantic-version", ie: 2014_15_5-VECTO_CSE-2.0.1-beta1.
* Copy into it:
* executable (`.EXE`) (from bin/Debug when pre/beta release)
* vectolic.dll (check correct version)
* Newtonsoft.Json.dll 6.0.0
* Declaration/
* DemoData/
* Docs/CSE-User Manual.pdf (generated from Word-file)
* Docs/GenericData.xlsx
* README.md
* CHANGES.md
* COPYING.txt
* Make a temp-copy of the folder and run it with a license to check everything alright.
* Does the "User Manual" open?
* ZIP the original folder.
* Upload into CITNet's SVN:
https://webgate.ec.europa.eu/CITnet/svn/VECTO/trunk/Share/
and link from:
https://webgate.ec.europa.eu/CITnet/confluence/display/VECTO_CSE/Releases
* Make licenses and update private pages
* Tag repos.
* Send announcment email through JIRA (ie see VECTO-28).
VECTO-CSE: Changes
===================
#### 2014-05-29: 2.0.1-pre1 ####
TODO: 2014-06-??: v2.0.1
-----------------
* JSON-ize preferences, vehicle-file, job-file, criteria-file
* 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.
* Separate config/ from Declaration/ folders.
* Standarize versinong using [SemanticVersioning](http://semver.org/).
* Possible to use any editor (not only notepad.exe) for viewing files.
* Welcome developers with README.md, CHANGES.md and COPYING.txt files.
##### Internal:
* Improve logging-API so now a single log-routine is used everywhere(instead of 3 different ones).
* Implement an API for writing Header/Body json-files.
* General restructuring of the folders and names in the project.
More analytically:
#### 2014-06-03: v2.0.1-pre1 ####
JRC contributions:
* Read/write Vehicle-file as JSON.
* prefsUI: Add Reload button.
* Remember window-location (use .net Settings for that).
......@@ -15,17 +35,18 @@ JRC contributions:
* Rework logging as a single routine, whether invoked from Background Worker or not.
#### 2014-05-23: 2.0.1-pre0 ####
#### 2014-05-23: v2.0.1-pre0 ####
JRC contributions:
* Remove the versioning infos from app-name (manual, project-name, folders).
* Use SemanticVersioning 2.0.0 (see http://semver.org/).
* Possible to use any editor (not only notepad.exe).
* Separate config/ from Declaration/ folders.
* Remove the versioning infos from app-name (manual, project-name, folders) and
use [SemanticVersioning](http://semver.org/) 2.0.0 instead.
* Possible to use any editor (not only notepad.exe).
* Added README.md, CHANGES.md, COPYING.txt files.
##### Internal:
* Auto create config/ on the 1st run, converted to JSON with transparent error-handling.
* FIX leaking of file-descriptors by using VB's 'Using' statement (class 'cFile_v3' now implements IDisposeable).
#### 2014-05-14: CSE2.01 ####
#### 2014-05-14: CSE2.01 ####
1st delivery from TU-Graz under Lot-3.
......@@ -107,6 +107,7 @@
<Compile Include="Classes\cMSC.vb" />
<Compile Include="IO\cJsonFile.vb" />
<Compile Include="Classes\CResult.vb" />
<Compile Include="IO\cJob.vb" />
<Compile Include="IO\cPreferences.vb" />
<Compile Include="cSemanticVersion.vb" />
<Compile Include="Classes\csKey.vb" />
......
......@@ -103,11 +103,11 @@ Public MustInherit Class cJsonFile
''' <summary>The whole json-content receiving any changes, always ready to be written as is.</summary>
Private Content As JObject
''' <summary>Cached instance from 'Content', used (tentatively) for perfomance.</summary>
Public ReadOnly Header As JObject
' ''' <summary>Cached instance from 'Content', used (tentatively) for perfomance.</summary>
'Public ReadOnly Header As JObject
''' <summary>Cached instance from 'Content', used (tentatively) for perfomance.</summary>
Public ReadOnly Body As JObject
' ''' <summary>Cached instance from 'Content', used (tentatively) for perfomance.</summary>
'Public ReadOnly Body As JObject
''' <summary>Reads from a file (aka "Load") or creates an instance with defaults
'''
......@@ -123,18 +123,18 @@ Public MustInherit Class cJsonFile
If (inputFilePath Is Nothing) Then
Dim jstr = JsonStr_FileContents()
Me.Content = JObject.Parse(jstr)
Me.Header = Content("Header")
'Me.Header = Content("Header")
UpdateHeader()
Me.Content("Body") = Me.BodyContent
Me.Body = Content("Body")
'Me.Body = Content("Body")
Else
strictHeader = False '' Try to read even bad headers.
fInfWarErr(4, False, format("Reading JSON-file({0})...", inputFilePath))
Me.Content = ReadJsonFile(inputFilePath)
Me.Header = Content("Header")
Me.Body = Content("Body")
'Me.Header = Content("Header")
'Me.Body = Content("Body")
End If
If Not skipValidation Then
......@@ -254,16 +254,16 @@ Public MustInherit Class cJsonFile
End Function
#Region "json props"
'Protected ReadOnly Property Header() As JObject
' Get
' Return Me.Json_Contents("Header")
' End Get
'End Property
'Protected ReadOnly Property Body() As JObject
' Get
' Return Me.Json_Contents("Body")
' End Get
'End Property
Protected ReadOnly Property Header() As JObject
Get
Return Me.Content("Header")
End Get
End Property
Protected ReadOnly Property Body() As JObject
Get
Return Me.Content("Body")
End Get
End Property
Public ReadOnly Property Title As String
......
VECTO-CSE
=========
* Copyright : 2014 EUROPEAN COMMISSION
* Developed : by TU-Graz, on behalf of DG CLIMA, supported by JRC.
* License : EUPL
A Constant Speed Evaluation tool for tests performed on Heavy-duty vehicles.
* Copyright : 2014 EUROPEAN COMMISSION
* Developed : by TU-Graz, on behalf of DG CLIMA, supported by JRC.
* License : EUPL
## INSTALLATION:
This application is "portable" since no administration rights are needed,
and you can simply copy and move it anywhere.
### Prerequisites:
The application is written in Windows VB.Net-4.0, so you have to ensure
that it is installed properly.
......@@ -23,7 +22,6 @@ If not, [install it](http://msdn.microsoft.com/en-us/library/vstudio/5a4x27ek%28
### License-file:
In order to run it, you should have received instruction on how to download
and use your License file. The installation procedure is similar to the one
described at [Vecto's wiki-page](https://webgate.ec.europa.eu/CITnet/confluence/display/VECTO/Installation+instructions).
......@@ -35,5 +33,4 @@ In any case, you can contact JRC to ask for access to the above resources:
## USAGE:
Read `./Docs/VECTO_CSE-User Manual.pdf`
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment