Merge branch 'bluemodel:master' into master

Author: devmki

setup/Wave.Setup.vdproj

@@ -1875,15 +1875,15 @@
         {
         "Name" = "8:Microsoft Visual Studio"
         "ProductName" = "8:BlueM.Wave"
-        "ProductCode" = "8:{614202E7-65F6-4838-971A-8D8C6A34A27F}"
-        "PackageCode" = "8:{B9361699-5903-4EAD-87B3-1111FD035E84}"
+        "ProductCode" = "8:{7398C268-3CC7-4B22-8657-B9D93C3BC8E0}"
+        "PackageCode" = "8:{DDC4279C-2C31-4413-B918-FC07D8F0EE74}"
         "UpgradeCode" = "8:{8AC270DC-0E8D-4087-98AB-3A2C358096B9}"
         "AspNetVersion" = "8:2.0.50727.0"
         "RestartWWWService" = "11:FALSE"
         "RemovePreviousVersions" = "11:TRUE"
         "DetectNewerInstalledVersion" = "11:TRUE"
         "InstallAllUsers" = "11:TRUE"
-        "ProductVersion" = "8:2.9.2"
+        "ProductVersion" = "8:2.10.0"
         "Manufacturer" = "8:BlueM Dev Group"
         "ARPHELPTELEPHONE" = "8:"
         "ARPHELPLINK" = "8:https://wiki.bluemodel.org/index.php/BlueM.Wave"

source/CHANGELOG.md

@@ -1,6 +1,14 @@
 BlueM.Wave Release Notes
 ========================
 
+Version 2.10.0
+--------------
+NEW:
+* Added support for reading and writing files in Delft-FEWS PI timeseries XML format #200
+
+CHANGED:
+* Updated about box
+
 Version 2.9.2
 -------------
 NEW:

source/Classes/TimeSeriesFile.vb

@@ -31,6 +31,7 @@ Public MustInherit Class TimeSeriesFile
         BIN
         CSV
         DFS0
+        FEWS_PI
         GBL
         GISMO_WEL
         HYBNAT_BCS
@@ -83,6 +84,7 @@ Public MustInherit Class TimeSeriesFile
         Public Shared ReadOnly WBL As String = ".WBL"   'SYDRO binary WEL format
         Public Shared ReadOnly WEL As String = ".WEL"
         Public Shared ReadOnly WVP As String = ".WVP"   'Wave project file
+        Public Shared ReadOnly XML As String = ".XML"
         Public Shared ReadOnly ZRE As String = ".ZRE"
         Public Shared ReadOnly ZRX As String = ".ZRX"   'ZRXP format
         Public Shared ReadOnly ZRXP As String = ".ZRXP" 'ZRXP format
@@ -112,6 +114,7 @@ Public MustInherit Class TimeSeriesFile
         "UVF files (*.uvf)|*.uvf|" &
         "WEL files (*.wel, *.kwl)|*.wel;*.kwl|" &
         "Wave project files (*.wvp)|*.wvp|" &
+        "XML files (*.xml)|*.xml|" &
         "ZRE files (*.zre)|*.zre|" &
         "ZRXP files (*.zrx, *.zrxp)|*.zrx;*.zrxp"
 
@@ -556,6 +559,8 @@ Public MustInherit Class TimeSeriesFile
                 Return FileExtensions.CSV
             Case FileTypes.DFS0
                 Return FileExtensions.DFS0
+            Case FileTypes.FEWS_PI
+                Return FileExtensions.XML
             Case FileTypes.GBL
                 Return FileExtensions.GBL
             Case FileTypes.GISMO_WEL
@@ -614,6 +619,7 @@ Public MustInherit Class TimeSeriesFile
         Select Case type
             Case TimeSeriesFile.FileTypes.CSV,
                  TimeSeriesFile.FileTypes.DFS0,
+                 TimeSeriesFile.FileTypes.FEWS_PI,
                  TimeSeriesFile.FileTypes.SWMM_INTERFACE,
                  TimeSeriesFile.FileTypes.HYBNAT_BCS
                 'TODO: ZRXP does actually also support multiple series, but for simplicity's sake, we assume that it doesn't
@@ -812,6 +818,14 @@ Public MustInherit Class TimeSeriesFile
                 Log.AddLogEntry(levels.info, $"Assuming Wave project file format for file {fileName}.")
                 fileType = FileTypes.WVP
 
+            Case FileExtensions.XML
+                'Check file format
+                If Fileformats.FEWS_PI.verifyFormat(file) Then
+                    'FEWS PI XML file
+                    Log.AddLogEntry(levels.info, $"Detected FEWS PI XML format for file {fileName}.")
+                    fileType = FileTypes.FEWS_PI
+                End If
+
             Case FileExtensions.ZRE
                 Log.AddLogEntry(levels.info, $"Assuming ZRE format for file {fileName}.")
                 fileType = FileTypes.ZRE
@@ -906,6 +920,8 @@ Public MustInherit Class TimeSeriesFile
                 FileInstance = New Fileformats.WEL(file)
             Case FileTypes.WVP
                 Throw New Exception("Wave project files (WVP) need to be loaded using `Wave.Import_File()` or `Wave.Load_WVP()`!")
+            Case FileTypes.FEWS_PI
+                FileInstance = New Fileformats.FEWS_PI(file)
             Case FileTypes.ZRE
                 FileInstance = New Fileformats.ZRE(file)
             Case FileTypes.ZRXP

source/Dialogs/AboutBox.Designer.vb

@@ -122,6 +122,18 @@
 
 (At runtime, the labels' text will be replaced with the application's assembly information.
 Customize the application's assembly information in the Application pane of Project Designer.)</value>
+  </data>
+  <data name="TextBox_Credits.Text" xml:space="preserve">
+    <value>Developers (in alphabetical order):
+Michael Bach, Felix Froehlich, Steffen Heusch, Christoph Hübner, Michael Kissel, Dirk Muschalla, Manfred Ostrowski, Frank Reußner, Tobias Rosskopf
+
+Third party components:
+Silk Icons: http://www.famfamfam.com/lab/icons/silk/
+TeeChart: http://www.steema.com/products/teechart/
+MathParserNet: https://github.com/bluemodel/MathParserNet
+Math.NET Numerics: https://numerics.mathdotnet.com/
+Newtonsoft.Json: https://www.newtonsoft.com/json
+DHI.DFS: https://www.nuget.org/packages/DHI.DFS/</value>
   </data>
   <data name="TextBox_License.Text" xml:space="preserve">
     <value>                   GNU LESSER GENERAL PUBLIC LICENSE
@@ -200,17 +212,4 @@ Each version is given a distinguishing version number. If the Library as you rec
 
 If the Library as you received it specifies that a proxy can decide whether future versions of the GNU Lesser General Public License shall apply, that proxy's public statement of acceptance of any version is permanent authorization for you to choose that version for the Library.</value>
   </data>
-  <data name="TextBox_Credits.Text" xml:space="preserve">
-    <value>Developers (in alphabetical order):
-Michael Bach, Felix Froehlich, Steffen Heusch, Christoph Hübner, Dirk Muschalla, Manfred Ostrowski, Frank Reußner, Tobias Rosskopf
-
-Third party components:
-Silk Icons: http://www.famfamfam.com/lab/icons/silk/
-TeeChart: http://www.steema.com/products/teechart/
-Math Parser .NET: https://www.codeproject.com/articles/274093/math-parser-net
-Math.NET Numerics: https://numerics.mathdotnet.com/
-Newtonsoft.Json: https://www.newtonsoft.com/json
-DotNetZip: https://github.com/haf/DotNetZip.Semverd
-DHI.DFS: https://www.nuget.org/packages/DHI.DFS/</value>
-  </data>
 </root>

source/Dialogs/AboutBox.resx

@@ -28,6 +28,7 @@ Friend Class ExportDiag
         Me.ComboBox_Format.Items.Add(TimeSeriesFile.FileTypes.CSV)
         Me.ComboBox_Format.Items.Add(TimeSeriesFile.FileTypes.BIN)
         Me.ComboBox_Format.Items.Add(TimeSeriesFile.FileTypes.DFS0)
+        Me.ComboBox_Format.Items.Add(TimeSeriesFile.FileTypes.FEWS_PI)
         Me.ComboBox_Format.Items.Add(TimeSeriesFile.FileTypes.HYBNAT_BCS)
         Me.ComboBox_Format.Items.Add(TimeSeriesFile.FileTypes.HYSTEM_REG)
         Me.ComboBox_Format.Items.Add(TimeSeriesFile.FileTypes.SMUSI_REG)