Merge pull request #480 from IDEMSInternational/master

updated my master

instat/DlgUseDate.vb

@@ -16,6 +16,12 @@
 
 Imports instat.Translations
 Public Class dlgUseDate
+    Public enumUsedateMode As String = UsedateMode.Prepare
+    Public Enum UsedateMode
+        Prepare
+        Climatic
+    End Enum
+
     Private bReset As Boolean = True
     Public bFirstLoad As Boolean = True
     Public strDefaultDataFrame As String = ""
@@ -32,6 +38,7 @@ Public Class dlgUseDate
         End If
         SetRCodeforControls(bReset)
         SetDefaultColumn()
+        SetHelpOptions()
         bReset = False
         autoTranslate(Me)
     End Sub
@@ -226,6 +233,15 @@ Public Class dlgUseDate
         End If
     End Sub
 
+    Private Sub SetHelpOptions()
+        Select Case enumUsedateMode
+            Case UsedateMode.Prepare
+                ucrBase.iHelpTopicID = 462
+            Case UsedateMode.Climatic
+                ucrBase.iHelpTopicID = 494
+        End Select
+    End Sub
+
     Private Sub ucrControls_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrReceiverUseDate.ControlContentsChanged, ucrChkWeekName.ControlContentsChanged, ucrChkWeekdayNum.ControlContentsChanged, ucrChkWeekNum.ControlContentsChanged, ucrChkShiftPentadNum.ControlContentsChanged, ucrChkShiftPentadAbbr.ControlContentsChanged, ucrChkShiftDekadAbbr.ControlContentsChanged, ucrChkWeekAbbr.ControlContentsChanged, ucrChkShiftMonthNum.ControlContentsChanged, ucrChkLeapYearNum.ControlContentsChanged, ucrChkWeekdayName.ControlContentsChanged, ucrChkShiftMonthName.ControlContentsChanged, ucrChkShiftDekadNum.ControlContentsChanged, ucrChkDayInMonthNum.ControlContentsChanged, ucrChkDayInYearNum.ControlContentsChanged, ucrChkWeekdayAbbr.ControlContentsChanged, ucrChkShiftMonthAbbr.ControlContentsChanged, ucrChkShiftDayInYearNum366.ControlContentsChanged, ucrChkShiftYearNum.ControlContentsChanged, ucrChkShiftYearName.ControlContentsChanged, ucrChkShiftDayInYearNum366.ControlContentsChanged, ucrChkShiftQuarterNum.ControlContentsChanged, ucrInputComboBoxStartingMonth.ControlContentsChanged, ucrChkDaysInMonthNum.ControlContentsChanged, ucrChkShiftQuarterAbbr.ControlContentsChanged
         TestOKEnabled()
     End Sub

instat/dlgAddKey.vb

@@ -18,6 +18,13 @@ Imports instat.Translations
 Imports RDotNet
 
 Public Class dlgAddKey
+    Public enumAddkeyMode As String = AddkeyMode.Prepare
+    Public Enum AddkeyMode
+        Prepare
+        Describe
+        Climatic
+    End Enum
+
     Private bFirstLoad As Boolean = True
     Private bReset As Boolean = True
     Private clsDefaultRFunction As New RFunction
@@ -34,6 +41,7 @@ Public Class dlgAddKey
             SetDefaults()
         End If
         SetRCodeForControls(bReset)
+        SetHelpOptions()
         bReset = False
         bUniqueChecked = False
         TestOKEnabled()
@@ -127,6 +135,15 @@ Public Class dlgAddKey
         End If
     End Sub
 
+    Private Sub SetHelpOptions()
+        Select Case enumAddkeyMode
+            Case AddkeyMode.Prepare
+                ucrBase.iHelpTopicID = 416
+            Case AddkeyMode.Climatic
+                ucrBase.iHelpTopicID = 424
+        End Select
+    End Sub
+
     Private Sub ucrReceiverKeyColumns_ControlValueChanged() Handles ucrReceiverKeyColumns.ControlValueChanged
         EnableDisableCmdCheckUnique()
         bUniqueChecked = False

instat/dlgAppend.vb

@@ -16,6 +16,12 @@
 
 Imports instat.Translations
 Public Class dlgAppend
+    Public enumAppendMode As String = AppendMode.Prepare
+    Public Enum AppendMode
+        Prepare
+        Climatic
+    End Enum
+
     Private bFirstLoad As Boolean = True
     Private bReset As Boolean = True
     Private clsBindRows As New RFunction
@@ -29,6 +35,7 @@ Public Class dlgAppend
             SetDefaults()
         End If
         SetRCodeForControls(bReset)
+        SetHelpOptions()
         bReset = False
         autoTranslate(Me)
     End Sub
@@ -99,6 +106,15 @@ Public Class dlgAppend
         TestOKEnabled()
     End Sub
 
+    Private Sub SetHelpOptions()
+        Select Case enumAppendMode
+            Case AppendMode.Prepare
+                ucrBase.iHelpTopicID = 465
+            Case AppendMode.Climatic
+                ucrBase.iHelpTopicID = 610
+        End Select
+    End Sub
+
     Private Sub ucrReceiverAppendDataframe_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrReceiverAppendDataframe.ControlContentsChanged, ucrSaveGraph.ControlContentsChanged, ucrChkIncludeIDColumn.ControlContentsChanged, ucrInputIDColName.ControlContentsChanged
         TestOKEnabled()
     End Sub

instat/dlgBoxPlot.vb

@@ -15,8 +15,15 @@
 ' along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 Imports instat
+Imports instat.dlgVisualizeData
 Imports instat.Translations
 Public Class dlgBoxplot
+    Public enumBoxplotMode As String = BoxplotMode.Prepare
+    Public Enum BoxplotMode
+        Prepare
+        Describe
+    End Enum
+
     Private bResetLineLayerSubdialog As Boolean = True
     Private clsRggplotFunction As New RFunction
     'clsRggplotFunction is the global ggplot function, will be used as RFunction of the first RParameter of ucrBase.clsRSyntax (which has "+" as main command). It is emphasised as a public field as it is used/editted in the sdgLayerOptions. The link is operated via SetupLayer that sets sdgLayerOptions.clsGgplotFunction = dlgBoxPlot.clsRggplotFunction.
@@ -94,6 +101,7 @@ Public Class dlgBoxplot
             SetDefaults()
         End If
         SetRCodeForControls(bReset)
+        SetHelpOptions()
         bReset = False
         autoTranslate(Me)
         TestOkEnabled()
@@ -581,6 +589,15 @@ Public Class dlgBoxplot
         openSdgLayerOptions(clsSummaryFunction)
     End Sub
 
+    Private Sub SetHelpOptions()
+        Select Case enumBoxplotMode
+            Case BoxplotMode.Prepare
+                ucrBase.iHelpTopicID = 548
+            Case BoxplotMode.Describe
+                ucrBase.iHelpTopicID = 436
+        End Select
+    End Sub
+
     Private Sub DialogueSize()
         If rdoBoxplotTufte.Checked OrElse rdoViolin.Checked Then
             Me.Size = New Size(441, 536)

instat/dlgCalculator.vb

@@ -58,6 +58,12 @@ Public Class dlgCalculator
         SaveResults()
         ucrCalc.ucrSelectorForCalculations.bUseCurrentFilter = False
         ucrCalc.ucrTryCalculator.SetRSyntax(ucrBase.clsRsyntax)
+        ucrBase.clsRsyntax.SetAssignTo(ucrCalc.ucrSaveResultInto.GetText(), strTempColumn:=ucrCalc.ucrSaveResultInto.GetText(),
+                                           strTempDataframe:=ucrCalc.ucrSelectorForCalculations.ucrAvailableDataFrames.cboAvailableDataFrames.Text,
+                                           bAssignToIsPrefix:=ucrBase.clsRsyntax.clsBaseCommandString.bAssignToIsPrefix,
+                                           bAssignToColumnWithoutNames:=ucrBase.clsRsyntax.clsBaseCommandString.bAssignToColumnWithoutNames,
+                                           bInsertColumnBefore:=ucrBase.clsRsyntax.clsBaseCommandString.bInsertColumnBefore,
+                                           bRequireCorrectLength:=ucrBase.clsRsyntax.clsBaseCommandString.bRequireCorrectLength)
         ucrBase.Visible = True
     End Sub
 
@@ -119,13 +125,6 @@ Public Class dlgCalculator
     Private Sub SaveResults()
         If ucrCalc.ucrSaveResultInto.ucrChkSave.Checked AndAlso ucrCalc.ucrSaveResultInto.IsComplete Then
             clsRemoveLabelsFunction.AddParameter("col_names", Chr(34) & ucrCalc.ucrSaveResultInto.GetText() & Chr(34), iPosition:=1)
-            ucrBase.clsRsyntax.SetAssignTo(ucrCalc.ucrSaveResultInto.GetText(), strTempColumn:=ucrCalc.ucrSaveResultInto.GetText(),
-                                           strTempDataframe:=ucrCalc.ucrSelectorForCalculations.ucrAvailableDataFrames.cboAvailableDataFrames.Text,
-                                           bAssignToIsPrefix:=ucrBase.clsRsyntax.clsBaseCommandString.bAssignToIsPrefix,
-                                           bAssignToColumnWithoutNames:=ucrBase.clsRsyntax.clsBaseCommandString.bAssignToColumnWithoutNames,
-                                           bInsertColumnBefore:=ucrBase.clsRsyntax.clsBaseCommandString.bInsertColumnBefore,
-                                           bRequireCorrectLength:=ucrBase.clsRsyntax.clsBaseCommandString.bRequireCorrectLength,
-                                           strAdjacentColumn:=ucrCalc.ucrSaveResultInto.AdjacentColumnName)
             ucrBase.clsRsyntax.AddToAfterCodes(clsRemoveLabelsFunction, 1)
             ucrBase.clsRsyntax.bExcludeAssignedFunctionOutput = True
             ucrBase.clsRsyntax.iCallType = 0

instat/dlgCompareColumns.vb

@@ -17,6 +17,11 @@
 Imports instat.Translations
 
 Public Class dlgCompareColumns
+    Public enumCompareMode As String = CompareMode.Prepare
+    Public Enum CompareMode
+        Prepare
+        Climatic
+    End Enum
 
     Private bFirstLoad As Boolean = True
     Private bReset As Boolean = True
@@ -39,14 +44,14 @@ Public Class dlgCompareColumns
             SetDefaults()
         End If
         SetRCodeForControls(bReset)
+        SetHelpOptions()
         bReset = False
         autoTranslate(Me)
         TestOkEnabled()
     End Sub
 
     Private Sub InitialiseDialog()
         Dim dctTolerance As New Dictionary(Of String, String)
-        ucrBase.iHelpTopicID = 546
 
         ucrPnlOptions.AddRadioButton(rdoByRow)
         ucrPnlOptions.AddRadioButton(rdoByValue)
@@ -210,6 +215,15 @@ Public Class dlgCompareColumns
         TestOkEnabled()
     End Sub
 
+    Private Sub SetHelpOptions()
+        Select Case enumCompareMode
+            Case CompareMode.Prepare
+                ucrBase.iHelpTopicID = 546
+            Case CompareMode.Climatic
+                ucrBase.iHelpTopicID = 562
+        End Select
+    End Sub
+
     Private Sub ucrPnlOptions_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrPnlOptions.ControlValueChanged
         If rdoByValue.Checked Then
             ucrInputTolerance.Visible = False

instat/dlgDescribeTwoVarGraph.vb

@@ -17,6 +17,12 @@
 Imports instat.Translations
 
 Public Class dlgDescribeTwoVarGraph
+    Public enumTwovarMode As String = TwovarMode.Describe
+    Public Enum TwovarMode
+        Describe
+        Climatic
+    End Enum
+
     Private clsBaseOperator, clsPairOperator, clsCoordPolarStartOperator As New ROperator
     Private clsRGGplotFunction, clsMosaicGgplotFunction, clsRFacet, clsThemeFunction,
             clsGlobalAes, clsLabsFunction, clsXlabsFunction, clsYlabFunction,
@@ -68,6 +74,7 @@ Public Class dlgDescribeTwoVarGraph
             SetDefaults()
         End If
         SetRCodeForControls(bReset)
+        SetHelpOptions()
         bReset = False
         TestOkEnabled()
         autoTranslate(Me)
@@ -1057,6 +1064,15 @@ Public Class dlgDescribeTwoVarGraph
         End If
     End Sub
 
+    Private Sub SetHelpOptions()
+        Select Case enumTwovarMode
+            Case TwovarMode.Describe
+                ucrBase.iHelpTopicID = 416
+            Case TwovarMode.Climatic
+                ucrBase.iHelpTopicID = 424
+        End Select
+    End Sub
+
     Private Sub LowerUpperDiagonal_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkLower.ControlValueChanged, ucrChkUpper.ControlValueChanged, ucrChkDiagonal.ControlValueChanged
         If bRCodeSet Then
             If ucrChkDiagonal.Checked Then

instat/dlgDescribeTwoVariable.vb

@@ -16,6 +16,12 @@
 
 Imports instat.Translations
 Public Class dlgDescribeTwoVariable
+    Public enumTwovariableMode As String = TwovariableMode.Describe
+    Public Enum TwovariableMode
+        Describe
+        Climatic
+    End Enum
+
     Private bFirstLoad As Boolean = True
     Private bReset As Boolean = True
     Private bRcodeSet As Boolean = True
@@ -60,6 +66,7 @@ Public Class dlgDescribeTwoVariable
             SetDefaults()
         End If
         SetRCodeForControls(bReset)
+        SetHelpOptions()
         bReset = False
         TestOKEnabled()
         autoTranslate(Me)
@@ -849,6 +856,15 @@ Public Class dlgDescribeTwoVariable
         End If
     End Sub
 
+    Private Sub SetHelpOptions()
+        Select Case enumTwovariableMode
+            Case TwovariableMode.Describe
+                ucrBase.iHelpTopicID = 414
+            Case TwovariableMode.Climatic
+                ucrBase.iHelpTopicID = 408
+        End Select
+    End Sub
+
     Private Sub ucrReceiverFirstVars_ControlValueAndContentChanged(ucrChangedControl As ucrCore) Handles ucrReceiverFirstVars.ControlValueChanged,
         ucrReceiverFirstVars.ControlContentsChanged
         ChangeFirstTypeLabel()

instat/dlgDuplicates.vb

@@ -17,6 +17,12 @@
 Imports RDotNet
 Imports instat.Translations
 Public Class dlgDuplicateRows
+    Public enumDuplicateMode As String = DuplicateMode.Prepare
+    Public Enum DuplicateMode
+        Prepare
+        Climatic
+    End Enum
+
     Private bReset As Boolean = True
     Private bFirstLoad As Boolean = True
     Private clsDuplicated2, clsDuplicated, clsStreakFunction, clsSubsetCol, clsDupCountIndex, clsSummaryFunction, clsGetColumnsFunction As New RFunction
@@ -30,13 +36,13 @@ Public Class dlgDuplicateRows
             SetDefaults()
         End If
         SetRCodeForControls(bReset)
+        SetHelpOptions()
         bReset = False
         autoTranslate(Me)
         TestOKEnabled()
     End Sub
 
     Private Sub InitialiseDialog()
-        ucrBase.iHelpTopicID = 547
         Dim dctConditions As New Dictionary(Of String, String)
         Dim dctType As New Dictionary(Of String, String)
 
@@ -267,6 +273,15 @@ Public Class dlgDuplicateRows
         End If
     End Sub
 
+    Private Sub SetHelpOptions()
+        Select Case enumDuplicateMode
+            Case DuplicateMode.Prepare
+                ucrBase.iHelpTopicID = 547
+            Case DuplicateMode.Climatic
+                ucrBase.iHelpTopicID = 605
+        End Select
+    End Sub
+
     Private Sub SetBaseFunction()
         If rdoDataFrame.Checked OrElse rdoSelectedVariables.Checked Then
             If rdoAllDuplicateCases.Checked Then

instat/dlgFindNonnumericValues.vb

@@ -17,6 +17,12 @@
 Imports instat
 Imports instat.Translations
 Public Class dlgFindNonnumericValues
+    Public enumNonNumericMode As String = NonNumericMode.Prepare
+    Public Enum NonNumericMode
+        Prepare
+        Climatic
+    End Enum
+
     Public bFirstLoad As Boolean = True
     Private bReset As Boolean = True
     Private bUseSelectedColumn As Boolean = False
@@ -42,11 +48,11 @@ Public Class dlgFindNonnumericValues
         If bUseSelectedColumn Then
             SetSelectedColumn()
         End If
+        SetHelpOptions()
         autoTranslate(Me)
     End Sub
 
     Private Sub InitialiseDialog()
-        ucrBase.iHelpTopicID = 545
         ucrSelectorShowNonNumericValues.SetParameter(New RParameter("data_name", 0))
         ucrSelectorShowNonNumericValues.SetParameterIsString()
 
@@ -173,6 +179,15 @@ Public Class dlgFindNonnumericValues
         TestOKEnabled()
     End Sub
 
+    Private Sub SetHelpOptions()
+        Select Case enumNonNumericMode
+            Case NonNumericMode.Prepare
+                ucrBase.iHelpTopicID = 545
+            Case NonNumericMode.Climatic
+                ucrBase.iHelpTopicID = 603
+        End Select
+    End Sub
+
     Private Sub ucrChkShowSummary_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkShowSummary.ControlValueChanged
         If ucrChkShowSummary.Checked Then
             ucrBase.clsRsyntax.AddToAfterCodes(clsSummaryFunction, iPosition:=0)