Merge pull request #37 from DougSchmidt-AI/feature/Issue-36-Support2019.2Uncertainty

Issue-36 - Added support for quantitative uncertainty

Author: Doug Schmidt

README.md

@@ -10,6 +10,15 @@ An AQTS field data plugin supporting FlowTracker2 measurement files, for AQTS 20
 - Download the latest release of the plugin [here](../../releases/latest)
 - Install it using the [FieldVisitPluginTool](https://github.com/AquaticInformatics/aquarius-field-data-framework/tree/master/src/FieldDataPluginTool)
 
+## Plugin Compatibility Matrix
+
+It is recommended that you use the most recent version of the plugin which matches your AQTS server version.
+
+| AQTS Version | Latest compatible plugin Version |
+| --- | --- |
+| AQTS 2019.2 | [v19.2.1](https://github.com/AquaticInformatics/flowtracker2-field-data-plugin/releases/download/v19.2.1/FlowTracker2Plugin.plugin) - Adds discharge uncertainty |
+| 2017.4 - 2019.1 | [v17.4.44](https://github.com/AquaticInformatics/flowtracker2-field-data-plugin/releases/download/v17.4.44/FlowTracker2Plugin.plugin) |
+
 ## Requirements for building the plugin from source
 
 - Requires Visual Studio 2017 (Community Edition is fine)

src/Flowtracker2Plugin/DataFileParser.cs

@@ -217,6 +217,8 @@ private DischargeActivity CreateDischargeActivity(FieldVisitInfo visit)
             var dischargeActivity = dischargeActivityFactory.CreateDischargeActivity(
                 new DateTimeInterval(visit.StartDate, visit.EndDate), UnitConverter.ConvertDischarge(DataFile.Calculations.Discharge));
             dischargeActivity.Comments = DataFile.Properties.Comment;
+            dischargeActivity.ActiveUncertaintyType = UncertaintyType.Quantitative;
+            dischargeActivity.QuantitativeUncertainty = DataFile.Calculations.UncertaintyIso.Overall * 100;
 
             return dischargeActivity;
         }

src/Flowtracker2Plugin/FlowTracker2Plugin.csproj

@@ -9,7 +9,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>FlowTracker2Plugin</RootNamespace>
     <AssemblyName>FlowTracker2Plugin</AssemblyName>
-    <TargetFrameworkVersion>v4.7</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile />
   </PropertyGroup>
@@ -32,8 +32,8 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="FieldDataPluginFramework, Version=1.0.0.0, Culture=neutral, processorArchitecture=AMD64">
-      <HintPath>..\packages\Aquarius.FieldDataFramework.17.4.3\lib\net47\FieldDataPluginFramework.dll</HintPath>
+    <Reference Include="FieldDataPluginFramework, Version=2.3.0.0, Culture=neutral, processorArchitecture=AMD64">
+      <HintPath>..\packages\Aquarius.FieldDataFramework.19.2.2\lib\net472\FieldDataPluginFramework.dll</HintPath>
     </Reference>
     <Reference Include="ICSharpCode.SharpZipLib, Version=0.85.5.452, Culture=neutral, PublicKeyToken=1b03e6acf1164f73, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
@@ -69,7 +69,7 @@
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
-    <PostBuildEvent>$(SolutionDir)packages\Aquarius.FieldDataFramework.17.4.3\tools\PluginPackager.exe $(TargetPath) /OutputPath=$(ProjectDir)deploy\$(Configuration)\$(TargetName).plugin
-$(SolutionDir)packages\Aquarius.FieldDataFramework.17.4.3\tools\PluginTester.exe /Plugin=$(TargetPath) /Data=$(SolutionDir)..\data\DemoData.ft</PostBuildEvent>
+    <PostBuildEvent>$(SolutionDir)packages\Aquarius.FieldDataFramework.19.2.2\tools\PluginPackager.exe $(TargetPath) /OutputPath=$(ProjectDir)deploy\$(Configuration)\$(TargetName).plugin
+$(SolutionDir)packages\Aquarius.FieldDataFramework.19.2.2\tools\PluginTester.exe /Plugin=$(TargetPath) /Data=$(SolutionDir)..\data\DemoData.ft</PostBuildEvent>
   </PropertyGroup>
 </Project>

src/Flowtracker2Plugin/packages.config

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Aquarius.FieldDataFramework" version="17.4.3" targetFramework="net47" />
+  <package id="Aquarius.FieldDataFramework" version="19.2.2" targetFramework="net472" />
 </packages>