Merge branch 'IDEMSInternational:master' into instalRpackage

Vitalis95 · Feb 20, 2024 · db2c181 · db2c181
2 parents 97bb88c + 9ef209e
commit db2c181
Show file tree

Hide file tree

Showing 8 changed files with 21 additions and 8 deletions.
diff --git a/instat/dlgCalculator.vb b/instat/dlgCalculator.vb
@@ -198,10 +198,13 @@ Public Class dlgCalculator
                 ucrBase.iHelpTopicID = 598
             Case "Integer"
                 Me.Width = iBasicWidth * 1.5
+                ucrBase.iHelpTopicID = 463
             Case "Complex"
                 Me.Width = iBasicWidth * 1.5
+                ucrBase.iHelpTopicID = 455
             Case "List"
                 Me.Width = iBasicWidth * 1.5
+                ucrBase.iHelpTopicID = 439
             Case Else
                 Me.Width = iBasicWidth
         End Select

diff --git a/instat/dlgCircular.vb b/instat/dlgCircular.vb
@@ -32,6 +32,7 @@ Public Class dlgCircular
     End Sub
 
     Private Sub InitialiseDialog()
+        ucrBase.iHelpTopicID = 520
         ucrReceiverCircular.Selector = ucrSelectorCircular
         ucrReceiverCircular.SetMeAsReceiver()
 

diff --git a/instat/dlgExportForClimpact.vb b/instat/dlgExportForClimpact.vb
@@ -37,7 +37,7 @@ Public Class dlgExportForClimpact
     End Sub
 
     Private Sub InitialiseDialog()
-
+        ucrBase.iHelpTopicID = 506
         ucrInputCodeMissingValues.SetParameter(New RParameter("missing_code", 6))
         ucrInputCodeMissingValues.SetRDefault("-99.9")
 

diff --git a/instat/dlgExportToClimsoft.vb b/instat/dlgExportToClimsoft.vb
@@ -39,7 +39,7 @@ Public Class dlgExportToClimsoft
     End Sub
 
     Private Sub InitialiseDialog()
-
+        ucrBase.iHelpTopicID=476
         ucrReceiverStation.SetClimaticType("station")
         ucrReceiverStation.bAutoFill = True
         ucrReceiverStation.Selector = ucrSelectorImportToClimsoft

diff --git a/instat/dlgGeneralForGraphics.Designer.vb b/instat/dlgGeneralForGraphics.Designer.vb
diff --git a/instat/dlgGeneralForGraphics.vb b/instat/dlgGeneralForGraphics.vb
@@ -167,7 +167,7 @@ Public Class dlgGeneralForGraphics
 
         ucrChkAddCode.SetText("Add Code:")
         ucrChkAddCode.AddToLinkedControls({ucrInputAddCode}, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:="")
-        ucrInputAddCode.SetItems({"geom_hline(yintercept=20)", "geom_vline(xintercept = 5)", "geom_vline(xintercept = 5)", "scale_x_binned()", "scale_x_binned(n.breaks=20)"})
+        ucrInputAddCode.SetItems({"scale_colour_manual(values=c(" & Chr(34) & "red" & Chr(34) & "," & Chr(34) & "blue" & Chr(34) & "," & Chr(34) & "green" & Chr(34) & "," & Chr(34) & "black" & Chr(34) & "," & Chr(34) & "brown" & Chr(34) & "))", "scale_fill_manual(values = c(" & Chr(34) & "coral" & Chr(34) & "," & Chr(34) & "bisque4" & Chr(34) & "," & Chr(34) & "gold" & Chr(34) & "," & Chr(34) & "cyan" & Chr(34) & "," & Chr(34) & "khaki" & Chr(34) & "," & Chr(34) & "orange" & Chr(34) & "," & Chr(34) & "orchid" & Chr(34) & "))", "geom_hline(yintercept=20)", "geom_vline(xintercept=5) + geom_hline(yintercept = 1)", "geom_vline(xintercept=c(1,3,5),colour=" & Chr(34) & "green" & Chr(34) & ")", "scale_x_binned()", "scale_x_binned(n.breaks=20)", "scale_y_continuous(trans=" & Chr(34) & "log10" & Chr(34) & ", label=scales::dollar)"})
 
         ucrSave.SetPrefix("graph")
         ucrSave.SetIsComboBox()
@@ -272,6 +272,14 @@ Public Class dlgGeneralForGraphics
         TestOKEnabled()
     End Sub
 
+    Private Sub SetCalculationHistory()
+        Dim newItem As String = ucrInputAddCode.GetText().Trim()
+
+        If Not String.IsNullOrEmpty(newItem) AndAlso Not ucrInputAddCode.cboInput.Items.Contains(newItem) Then
+            ucrInputAddCode.AddItems({newItem})
+        End If
+    End Sub
+
     Private Sub SetRCodeForControls(bReset As Boolean)
         ucrReceiverX.AddAdditionalCodeParameterPair(clsLevelsFunction, New RParameter("y", ucrReceiverX.GetVariableNames(False), bNewIncludeArgumentName:=False), iAdditionalPairNo:=1)
         ucrGraphicsSelector.SetRCode(clsGgplotFunction, bReset)
@@ -670,7 +678,7 @@ Public Class dlgGeneralForGraphics
     End Sub
 
     Private Sub UpdateParameters()
-        clsFacetVariablesOperator.RemoveParameterByName("wrap" & ucrInputStation.Name)
+        clsFacetVariablesOperator.RemoveParameterByName("var1")
         clsFacetColOp.RemoveParameterByName("col" & ucrInputStation.Name)
         clsFacetRowOp.RemoveParameterByName("row" & ucrInputStation.Name)
 
@@ -794,6 +802,7 @@ Public Class dlgGeneralForGraphics
     End Sub
 
     Private Sub ucrChkAddCode_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkAddCode.ControlValueChanged, ucrInputAddCode.ControlValueChanged
+        SetCalculationHistory()
         If ucrChkAddCode.Checked AndAlso Not ucrInputAddCode.IsEmpty Then
             clsAddCodeOperator.AddParameter("code1", ucrInputAddCode.GetText(), bIncludeArgumentName:=False, iPosition:=1)
             clsBaseOperator.AddParameter("newcode", clsROperatorParameter:=clsAddCodeOperator, bIncludeArgumentName:=False)

diff --git a/instat/instat.vbproj b/instat/instat.vbproj
@@ -155,8 +155,8 @@
     <Reference Include="RDotNet, Version=1.8.2.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\R.NET.1.8.2\lib\netstandard2.0\RDotNet.dll</HintPath>
     </Reference>
-    <Reference Include="RInsightF461, Version=0.0.6.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\RInsightF461.0.0.7\lib\net461\RInsightF461.dll</HintPath>
+    <Reference Include="RInsightF461, Version=0.0.10.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\RInsightF461.0.0.10\lib\net461\RInsightF461.dll</HintPath>
     </Reference>
     <Reference Include="ScintillaNET, Version=3.6.3.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\jacobslusser.ScintillaNET.3.6.3\lib\net40\ScintillaNET.dll</HintPath>

diff --git a/instat/packages.config b/instat/packages.config
@@ -11,7 +11,7 @@
   <package id="Microsoft.Win32.Registry" version="4.5.0" targetFramework="net461" />
   <package id="NLog" version="5.1.0" targetFramework="net461" />
   <package id="R.NET" version="1.8.2" targetFramework="net461" />
-  <package id="RInsightF461" version="0.0.7" targetFramework="net461" />
+  <package id="RInsightF461" version="0.0.10" targetFramework="net461" />
   <package id="Stub.System.Data.SQLite.Core.NetFramework" version="1.0.113.3" targetFramework="net461" />
   <package id="System.Collections.Specialized" version="4.3.0" targetFramework="net461" />
   <package id="System.Data.SQLite.Core" version="1.0.113.7" targetFramework="net461" />