Merge pull request #476 from IDEMSInternational/master

updated master
Patowhiz · Feb 19, 2024 · 1b3fa0c · 1b3fa0c
2 parents 8b2bb8a + eea3245
commit 1b3fa0c
Show file tree

Hide file tree

Showing 46 changed files with 3,559 additions and 2,031 deletions.
diff --git a/instat/dlgCircularDensityPlot.vb b/instat/dlgCircularDensityPlot.vb
@@ -39,7 +39,7 @@ Public Class dlgCircularDensityPlot
     Private Sub InitialiseDialog()
         Dim dctKernel As New Dictionary(Of String, String)
         Dim dctUnits As New Dictionary(Of String, String)
-
+        ucrBase.iHelpTopicID = 181
         ucrBase.clsRsyntax.iCallType = 3
         ucrBase.clsRsyntax.bExcludeAssignedFunctionOutput = False
 

diff --git a/instat/dlgClimaticNCMPCountRecords.vb b/instat/dlgClimaticNCMPCountRecords.vb
@@ -41,6 +41,7 @@ Public Class dlgClimaticNCMPCountRecords
     Private Sub InitialiseDialog()
         Dim dctResolution As New Dictionary(Of String, String)
 
+        ucrBase.iHelpTopicID=631
         ucrSelectorForA2.SetParameter(New RParameter("a2", 0))
         ucrSelectorForA2.SetParameterIsrfunction()
         ucrSelectorForA2.ucrAvailableDataFrames.lblDataFrame.Text = "Indices Data Frame:"

diff --git a/instat/dlgClimaticNCMPIndices.vb b/instat/dlgClimaticNCMPIndices.vb
@@ -39,6 +39,7 @@ Public Class dlgClimaticNCMPIndices
     End Sub
 
     Private Sub InitialiseDialog()
+        ucrBase.iHelpTopicID=627
         ucrSelectorIndices.SetParameter(New RParameter("df", 0))
         ucrSelectorIndices.SetParameterIsrfunction()
 

diff --git a/instat/dlgClimaticNCMPRegionAverage.vb b/instat/dlgClimaticNCMPRegionAverage.vb
@@ -41,6 +41,7 @@ Public Class dlgClimaticNCMPRegionAverage
     Private Sub InitialiseDialog()
         Dim dctResolution As New Dictionary(Of String, String)
 
+        ucrBase.iHelpTopicID=629
         ucrSelectorForA2.SetParameter(New RParameter("a2", 0))
         ucrSelectorForA2.SetParameterIsrfunction()
         ucrSelectorForA2.ucrAvailableDataFrames.lblDataFrame.Text = "Indices Data Frame:"

diff --git a/instat/dlgClimaticNCMPSummaryFile.vb b/instat/dlgClimaticNCMPSummaryFile.vb
@@ -39,6 +39,7 @@ Public Class dlgClimaticNCMPSummaryFile
     Private Sub InitialiseDialog()
         Dim dctResolution As New Dictionary(Of String, String)
 
+        ucrBase.iHelpTopicID=632
         ucrSelectorA2.SetParameter(New RParameter("a2", 0))
         ucrSelectorA2.SetParameterIsRFunction()
         ucrSelectorA2.lblDataFrame.Text = "Indices Data Frame:"

diff --git a/instat/dlgClimaticNCMPTrendGraphs.vb b/instat/dlgClimaticNCMPTrendGraphs.vb
@@ -41,6 +41,7 @@ Public Class dlgClimaticNCMPTrendGraphs
     Private Sub InitialiseDialog()
         Dim dctResolution As New Dictionary(Of String, String)
 
+        ucrBase.iHelpTopicID=630
         ucrSelectorForA2.SetParameter(New RParameter("a2", 0))
         ucrSelectorForA2.SetParameterIsrfunction()
         ucrSelectorForA2.ucrAvailableDataFrames.lblDataFrame.Text = "Indices Data Frame:"

diff --git a/instat/dlgClimaticNCMPVariogram.vb b/instat/dlgClimaticNCMPVariogram.vb
@@ -39,6 +39,7 @@ Public Class dlgClimaticNCMPVariogram
     End Sub
 
     Private Sub InitialiseDialog()
+        ucrBase.iHelpTopicID=628
         ucrSelectorVariogram.SetParameter(New RParameter("a2", 0))
         ucrSelectorVariogram.SetParameterIsrfunction()
         ucrSelectorVariogram.ucrAvailableDataFrames.lblDataFrame.Text = "Indices Data Frame:"

diff --git a/instat/dlgClimaticStationMaps.vb b/instat/dlgClimaticStationMaps.vb
@@ -64,7 +64,7 @@ Public Class dlgClimaticStationMaps
     End Sub
 
     Private Sub InitialiseDialog()
-        ucrBase.iHelpTopicID = 558
+        ucrBase.iHelpTopicID = 645
         ucrBase.clsRsyntax.iCallType = 3
         ucrBase.clsRsyntax.bExcludeAssignedFunctionOutput = False
 

diff --git a/instat/dlgColumnStats.Designer.vb b/instat/dlgColumnStats.Designer.vb
diff --git a/instat/dlgColumnStats.vb b/instat/dlgColumnStats.vb
@@ -177,13 +177,6 @@ Public Class dlgColumnStats
         TestOKEnabled()
     End Sub
 
-    Private Sub cmdProportionsPercentages_Click(sender As Object, e As EventArgs) Handles cmdProportionsPercentages.Click
-        sdgProportionsPercentages.SetRFunction(clsDefaultFunction, bResetSubdialog)
-        sdgProportionsPercentages.ShowDialog()
-        bResetSubdialog = False
-        TestOKEnabled()
-    End Sub
-
     Private Sub ucrChkOmitMissing_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkOmitMissing.ControlValueChanged
         If clsSummariesList.ContainsParameter("summary_cor") OrElse clsSummariesList.ContainsParameter("summary_cov") Then
             clsDefaultFunction.AddParameter("use", Chr(34) & "'na.or.complete'" & Chr(34))

diff --git a/instat/dlgCompare.vb b/instat/dlgCompare.vb
@@ -48,7 +48,7 @@ Public Class dlgCompare
     End Sub
 
     Private Sub InitialiseDialog()
-        ucrBase.iHelpTopicID = 562
+        ucrBase.iHelpTopicID = 634
         ucrPnlCompare.AddRadioButton(rdoDifferences)
         ucrPnlCompare.AddRadioButton(rdoAnomalies)
         ucrPnlCompare.AddParameterPresentCondition(rdoDifferences, "manipulations", False)

diff --git a/instat/dlgCompareSummary.vb b/instat/dlgCompareSummary.vb
@@ -37,6 +37,7 @@ Public Class dlgCompareSummary
     End Sub
 
     Private Sub InitialiseDialog()
+        ucrBase.iHelpTopicID = 635
         ucrSelectorVerificationSummary.SetParameter(New RParameter("data_name", 0))
         ucrSelectorVerificationSummary.SetParameterIsString()
 

diff --git a/instat/dlgConditionalQuantilePlot.vb b/instat/dlgConditionalQuantilePlot.vb
@@ -42,6 +42,7 @@ Public Class dlgConditionalQuantilePlot
         Dim dctLegendPosition As New Dictionary(Of String, String)
         Dim dctStatistics As New Dictionary(Of String, String)
         ucrBase.clsRsyntax.iCallType = 3
+        ucrBase.iHelpTopicID = 642
 
         ucrConditionalQuantilePlotSelector.SetParameter(New RParameter("mydata", 0))
         ucrConditionalQuantilePlotSelector.SetParameterIsrfunction()