Merge pull request #8879 from Fidel365/help_changes

More improvements to help ids

instat/dlgMergeAdditionalData.vb

@@ -45,6 +45,7 @@ Public Class dlgMergeAdditionalData
     End Sub
 
     Private Sub InitialiseDialog()
+        ucrBase.iHelpTopicID = 186
         ucrToDataFrame.SetParameter(New RParameter("x", 0))
         ucrToDataFrame.SetParameterIsRFunction()
         ucrToDataFrame.SetLabelText("To Data Frame:")

instat/dlgTwoWayFrequencies.vb

@@ -48,7 +48,7 @@ Public Class dlgTwoWayFrequencies
     End Sub
 
     Private Sub InitialiseDialog()
-        ucrBase.iHelpTopicID = 415
+        ucrBase.iHelpTopicID = 289
         ucrBase.clsRsyntax.bExcludeAssignedFunctionOutput = False
 
         ucrReceiverColumnFactor.Selector = ucrSelectorTwoWayFrequencies

instat/dlgVisualizeData.vb

@@ -17,6 +17,12 @@
 Imports instat.Translations
 
 Public Class dlgVisualizeData
+    Public enumVisualizeMode As String = VisualizeMode.Prepare
+    Public Enum VisualizeMode
+        Prepare
+        Describe
+        Climatic
+    End Enum
     Private bFirstLoad As Boolean = True
     Private bReset As Boolean = True
     Private clsVisDatFunction As New RFunction
@@ -41,6 +47,7 @@ Public Class dlgVisualizeData
             SetDefaults()
         End If
         SetRCodeForControls(bReset)
+        SetHelpOptions()
         bReset = False
         autoTranslate(Me)
         TestOkEnabled()
@@ -328,6 +335,17 @@ Public Class dlgVisualizeData
         End If
     End Sub
 
+    Private Sub SetHelpOptions()
+        Select Case enumVisualizeMode
+            Case VisualizeMode.Prepare
+                ucrBase.iHelpTopicID = 54
+            Case VisualizeMode.Describe
+                ucrBase.iHelpTopicID = 600
+            Case VisualizeMode.Climatic
+                ucrBase.iHelpTopicID = 524
+        End Select
+    End Sub
+
     Private Sub ucrNudMaximumSize_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrNudMaximumSize.ControlValueChanged
         MaximumDataPoint()
     End Sub
@@ -407,7 +425,7 @@ Public Class dlgVisualizeData
         End If
         Dim lstvariable As List(Of String) = ucrReceiverVisualizeData.GetVariableNamesAsList
         Dim strFacetvariable As String = ucrByFactorsReceiver.GetVariableNames(False)
-        If Not ucrByFactorsReceiver.IsEmpty AndAlso (rdoVisDat.Checked OrElse rdoVisMiss.Checked) AndAlso Not Lstvariable.Contains(StrFacetvariable) Then
+        If Not ucrByFactorsReceiver.IsEmpty AndAlso (rdoVisDat.Checked OrElse rdoVisMiss.Checked) AndAlso Not lstvariable.Contains(strFacetvariable) Then
             lstvariable.Add(strFacetvariable)
         End If
         clsGetVariableFunction.AddParameter("data_name", Chr(34) & ucrSelectorVisualizeData.ucrAvailableDataFrames.strCurrDataFrame & Chr(34), iPosition:=0)

instat/frmMain.vb

@@ -2281,7 +2281,9 @@ Public Class frmMain
     End Sub
 
     Private Sub mnuPrepareCheckDataVisualiseData_Click(sender As Object, e As EventArgs) Handles mnuPrepareCheckDataVisualiseData.Click
+        dlgVisualizeData.enumVisualizeMode = dlgVisualizeData.VisualizeMode.Prepare
         dlgVisualizeData.ShowDialog()
+        ' ucrBase.iHelpTopicID = 54
     End Sub
 
     Private Sub mnuClimaticCompareCalculation_Click(sender As Object, e As EventArgs) Handles mnuClimaticCompareCalculation.Click
@@ -2485,6 +2487,7 @@ Public Class frmMain
     End Sub
 
     Private Sub mnuDescribeOneVariableVisualiseData_Click(sender As Object, e As EventArgs) Handles mnuDescribeOneVariableVisualiseData.Click
+        dlgVisualizeData.enumVisualizeMode = dlgVisualizeData.VisualizeMode.Describe
         dlgVisualizeData.ShowDialog()
     End Sub
 
@@ -2672,6 +2675,7 @@ Public Class frmMain
     End Sub
 
     Private Sub mnuClimaticExamineEditDataVisualiseData_Click(sender As Object, e As EventArgs) Handles mnuClimaticExamineEditDataVisualiseData.Click
+        dlgVisualizeData.enumVisualizeMode = dlgVisualizeData.VisualizeMode.Climatic
         dlgVisualizeData.ShowDialog()
     End Sub