diff --git a/instat/DlgUseDate.vb b/instat/DlgUseDate.vb index 4c05b2a7003..08bccb5b8f3 100644 --- a/instat/DlgUseDate.vb +++ b/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 diff --git a/instat/dlgAddKey.vb b/instat/dlgAddKey.vb index 41b91abcd0b..ea59b4c312d 100644 --- a/instat/dlgAddKey.vb +++ b/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 diff --git a/instat/dlgAppend.vb b/instat/dlgAppend.vb index d5e3703a6d8..7eaad388210 100644 --- a/instat/dlgAppend.vb +++ b/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 diff --git a/instat/dlgBoxPlot.vb b/instat/dlgBoxPlot.vb index cc93e3bd8fe..d0f7c6a00a0 100644 --- a/instat/dlgBoxPlot.vb +++ b/instat/dlgBoxPlot.vb @@ -15,8 +15,15 @@ ' along with this program. If not, see . 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) diff --git a/instat/dlgCalculator.vb b/instat/dlgCalculator.vb index 941ad851aa3..16e9351e19a 100644 --- a/instat/dlgCalculator.vb +++ b/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 diff --git a/instat/dlgCompareColumns.vb b/instat/dlgCompareColumns.vb index 112bbf11c3b..b1336fb1939 100644 --- a/instat/dlgCompareColumns.vb +++ b/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,6 +44,7 @@ Public Class dlgCompareColumns SetDefaults() End If SetRCodeForControls(bReset) + SetHelpOptions() bReset = False autoTranslate(Me) TestOkEnabled() @@ -46,7 +52,6 @@ Public Class dlgCompareColumns 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 diff --git a/instat/dlgDescribeTwoVarGraph.vb b/instat/dlgDescribeTwoVarGraph.vb index 4b7340e7178..00169a986fe 100644 --- a/instat/dlgDescribeTwoVarGraph.vb +++ b/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 diff --git a/instat/dlgDescribeTwoVariable.vb b/instat/dlgDescribeTwoVariable.vb index f3c9791ff6d..de0e1c3e530 100644 --- a/instat/dlgDescribeTwoVariable.vb +++ b/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() diff --git a/instat/dlgDuplicates.vb b/instat/dlgDuplicates.vb index cce88ba4679..770beea9dad 100644 --- a/instat/dlgDuplicates.vb +++ b/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 diff --git a/instat/dlgFindNonnumericValues.vb b/instat/dlgFindNonnumericValues.vb index 41dcaa32832..faf95fa7eaf 100644 --- a/instat/dlgFindNonnumericValues.vb +++ b/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) diff --git a/instat/dlgInfill.vb b/instat/dlgInfill.vb index b6ea19b19ec..c2fa50583e5 100644 --- a/instat/dlgInfill.vb +++ b/instat/dlgInfill.vb @@ -16,6 +16,12 @@ Imports instat.Translations Public Class dlgInfill + Public enumFilldateMode As String = FilldateMode.Prepare + Public Enum FilldateMode + Prepare + Climatic + End Enum + Private bFirstLoad As Boolean = True Private bReset As Boolean = True Private clsDefaultFunction As New RFunction @@ -28,6 +34,7 @@ Public Class dlgInfill SetDefaults() End If SetRCodeforControls(bReset) + SetHelpOptions() bReset = False autoTranslate(Me) End Sub @@ -134,6 +141,15 @@ Public Class dlgInfill End Select End Sub + Private Sub SetHelpOptions() + Select Case enumFilldateMode + Case FilldateMode.Prepare + ucrBase.iHelpTopicID = 497 + Case FilldateMode.Climatic + ucrBase.iHelpTopicID = 357 + End Select + End Sub + Private Sub AutoFillStation() If ucrInfillSelector.CurrentReceiver IsNot Nothing Then ucrInfillSelector.CurrentReceiver.SetMeAsReceiver() diff --git a/instat/dlgMakeDate.vb b/instat/dlgMakeDate.vb index be7b505e73c..156cb7864a0 100644 --- a/instat/dlgMakeDate.vb +++ b/instat/dlgMakeDate.vb @@ -17,6 +17,12 @@ Imports instat.Translations Imports System.Text.RegularExpressions Public Class dlgMakeDate + Public enumMakedateMode As String = MakedateMode.Prepare + Public Enum MakedateMode + Prepare + Climatic + End Enum + Public clsPaste As New RFunction Public bFirstLoad As Boolean = True Private bReset As Boolean = True @@ -44,6 +50,7 @@ Public Class dlgMakeDate SetDefaultColumn() End If SetRCodeForControls(bReset) + SetHelpOptions() bReset = False autoTranslate(Me) End Sub @@ -440,6 +447,15 @@ Public Class dlgMakeDate TestOKEnabled() End Sub + Private Sub SetHelpOptions() + Select Case enumMakedateMode + Case MakedateMode.Prepare + ucrBase.iHelpTopicID = 461 + Case MakedateMode.Climatic + ucrBase.iHelpTopicID = 493 + End Select + End Sub + Private Sub AutoFillReceivers() Dim ucrCurrentReceiver As ucrReceiver = ucrSelectorMakeDate.CurrentReceiver Dim lstRecognisedValues As List(Of String) = New List(Of String) diff --git a/instat/dlgMerge.vb b/instat/dlgMerge.vb index a93fdeafbb1..3ddbab1caa8 100644 --- a/instat/dlgMerge.vb +++ b/instat/dlgMerge.vb @@ -18,6 +18,12 @@ Imports instat Imports instat.Translations Public Class dlgMerge + Public enumMergeMode As String = MergeMode.Prepare + Public Enum MergeMode + Prepare + Climatic + End Enum + Private bFirstLoad As Boolean = True Private clsMergeFunction As New RFunction Private clsByListFunction As New RFunction @@ -42,6 +48,7 @@ Public Class dlgMerge SetDefaults() End If SetRCodeForControls(bReset) + SetHelpOptions() bReset = False SetMergingBy() TestOKEnabled() @@ -148,6 +155,15 @@ Public Class dlgMerge SetMergingBy() End Sub + Private Sub SetHelpOptions() + Select Case enumMergeMode + Case MergeMode.Prepare + ucrBase.iHelpTopicID = 60 + Case MergeMode.Climatic + ucrBase.iHelpTopicID = 609 + End Select + End Sub + Private Sub ucrInputJoinType_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrInputJoinType.ControlValueChanged Dim bFound As Boolean = True diff --git a/instat/dlgOneVariableGraph.vb b/instat/dlgOneVariableGraph.vb index 1db2567c099..c0bd47d6472 100644 --- a/instat/dlgOneVariableGraph.vb +++ b/instat/dlgOneVariableGraph.vb @@ -17,6 +17,13 @@ Imports instat.Translations Public Class dlgOneVariableGraph + Public enumOnevariableMode As String = OnevariableMode.Prepare + Public Enum OnevariableMode + Prepare + Describe + Climatic + End Enum + Private bFirstLoad As Boolean = True Private bReset As Boolean = True Private bResetSubdialog As Boolean = False @@ -34,6 +41,7 @@ Public Class dlgOneVariableGraph End If SetRCodeForControls(bReset) SetDefaultColumn() + SetHelpOptions() bReset = False ReopenDialog() TestOkEnabled() @@ -143,6 +151,17 @@ Public Class dlgOneVariableGraph strDefaultColumns = Nothing End Sub + Private Sub SetHelpOptions() + Select Case enumOnevariableMode + Case OnevariableMode.Prepare + ucrBase.iHelpTopicID = 549 + Case OnevariableMode.Describe + ucrBase.iHelpTopicID = 412 + Case OnevariableMode.Climatic + ucrBase.iHelpTopicID = 616 + End Select + End Sub + Private Sub AllControls_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrReceiverOneVarGraph.ControlValueChanged CheckDataType() End Sub diff --git a/instat/dlgOneVariableSummarise.vb b/instat/dlgOneVariableSummarise.vb index 056dd0c575f..d2fbe9ad3fb 100644 --- a/instat/dlgOneVariableSummarise.vb +++ b/instat/dlgOneVariableSummarise.vb @@ -17,6 +17,13 @@ Imports instat Imports instat.Translations Public Class dlgOneVariableSummarise + Public enumOnevariableMode As String = OnevariableMode.Prepare + Public Enum OnevariableMode + Prepare + Describe + Climatic + End Enum + Private bFirstLoad As Boolean = True Private bReset As Boolean = True Private bRCodeSet As Boolean = True @@ -44,6 +51,7 @@ Public Class dlgOneVariableSummarise SetDefaults() End If SetRCodeForControls(bReset) + SetHelpOptions() SetDefaultColumn() bReset = False TestOKEnabled() @@ -329,6 +337,17 @@ Public Class dlgOneVariableSummarise End If End Sub + Private Sub SetHelpOptions() + Select Case enumOnevariableMode + Case OnevariableMode.Prepare + ucrBase.iHelpTopicID = 550 + Case OnevariableMode.Describe + ucrBase.iHelpTopicID = 410 + Case OnevariableMode.Climatic + ucrBase.iHelpTopicID = 615 + End Select + End Sub + Private Sub SetDefaultColumn() If strDefaultDataFrame <> "" Then ucrSelectorOneVarSummarise.SetDataframe(strDefaultDataFrame) @@ -418,7 +437,7 @@ Public Class dlgOneVariableSummarise clsNewFootnoteCellFunction:=clsFootnoteCellFunction, clsNewSecondFootnoteCellBodyFunction:=clsSecondFootnoteCellBodyFunction, clsNewPipeOperator:=clsPipeOperator, clsNewFootnoteTitleLocationFunction:=clsFootnoteTitleLocationFunction, clsNewFootnoteCellBodyFunction:=clsFootnoteCellBodyFunction, clsNewFootnoteSubtitleLocationFunction:=clsFootnoteSubtitleLocationFunction, clsNewTabFootnoteSubtitleFunction:=clsTabFootnoteSubtitleFunction, clsNewJoiningOperator:=clsJoiningPipeOperator, - clsNewMutableOPerator:=clsSummaryOperator, clsNewSecondFootnoteCellFunction:=clsSecondFootnoteCellFunction, + clsNewMutableOperator:=clsSummaryOperator, clsNewSecondFootnoteCellFunction:=clsSecondFootnoteCellFunction, clsNewTabStyleCellTextFunction:=clsTabStyleCellTextFunction, clsNewTabStyleFunction:=clsTabStyleFunction, clsNewTabStylePxFunction:=clsTabStylePxFunction, clsNewThemesTabOptionFunction:=clsThemesTabOptionsFunction, clsNewgtExtraThemesFunction:=clsgtExtraThemesFunction, bReset:=bResetFormatSubdialog) diff --git a/instat/dlgOneWayFrequencies.vb b/instat/dlgOneWayFrequencies.vb index 5ee374d23a6..71696613278 100644 --- a/instat/dlgOneWayFrequencies.vb +++ b/instat/dlgOneWayFrequencies.vb @@ -15,6 +15,13 @@ ' along with this program. If not, see . Imports instat.Translations Public Class dlgOneWayFrequencies + Public enumOnewayMode As String = OnewayMode.Prepare + Public Enum OnewayMode + Prepare + Describe + Climatic + End Enum + Private bFirstLoad As Boolean = True Private bReset As Boolean = True Private bResetSubdialog As Boolean = False @@ -42,6 +49,7 @@ Public Class dlgOneWayFrequencies End If SetRCodeForControls(bReset) SetDefaultColumn() + SetHelpOptions() bReset = False TestOkEnabled() autoTranslate(Me) @@ -449,4 +457,14 @@ Public Class dlgOneWayFrequencies strDefaultColumns = Nothing End Sub + Private Sub SetHelpOptions() + Select Case enumOnewayMode + Case OnewayMode.Prepare + ucrBase.iHelpTopicID = 551 + Case OnewayMode.Describe + ucrBase.iHelpTopicID = 518 + Case OnewayMode.Climatic + ucrBase.iHelpTopicID = 617 + End Select + End Sub End Class diff --git a/instat/dlgRandomSample.vb b/instat/dlgRandomSample.vb index 15a63ca32c6..ac14d2f31d5 100644 --- a/instat/dlgRandomSample.vb +++ b/instat/dlgRandomSample.vb @@ -17,6 +17,12 @@ Imports instat.Translations Public Class dlgRandomSample + Public enumRandomSampleMode As String = RandomSampleMode.Prepare + Public Enum RandomSampleMode + Prepare + Model + End Enum + Private bFirstLoad As Boolean = True Private clsMultipleSamplesFunction As New RFunction Private clsDistributionFunction As New RFunction @@ -33,6 +39,7 @@ Public Class dlgRandomSample SetDefaults() End If SetRCodeForControls(bReset) + SetHelpOptions() bReset = False autoTranslate(Me) TestOKEnabled() @@ -143,6 +150,15 @@ Public Class dlgRandomSample TestOKEnabled() End Sub + Private Sub SetHelpOptions() + Select Case enumRandomSampleMode + Case RandomSampleMode.Prepare + ucrBase.iHelpTopicID = 376 + Case RandomSampleMode.Model + ucrBase.iHelpTopicID = 31 + End Select + End Sub + Private Sub SetNewColumName() If ucrNudNumberOfSamples.Value = 1 Then ucrSaveRandomSample.SetAssignToBooleans(bTempAssignToIsPrefix:=False) diff --git a/instat/dlgRegularSequence.vb b/instat/dlgRegularSequence.vb index ddbe070b156..ecf5299ee3d 100644 --- a/instat/dlgRegularSequence.vb +++ b/instat/dlgRegularSequence.vb @@ -18,6 +18,12 @@ Imports instat.Translations Imports RDotNet Public Class dlgRegularSequence + Public enumRegularsequenceMode As String = RegularsequenceMode.Prepare + Public Enum RegularsequenceMode + Prepare + Climatic + End Enum + Public bFirstLoad As Boolean = True Private bReset As Boolean = True Private clsRepFunction, clsSeqFunction, clsSeqDateFunction As New RFunction @@ -48,6 +54,7 @@ Public Class dlgRegularSequence bDefaultOptionChanged = False End If + SetHelpOptions() bReset = False autoTranslate(Me) End Sub @@ -337,6 +344,16 @@ Public Class dlgRegularSequence PreviewSequence() End Sub + Private Sub SetHelpOptions() + Select Case enumRegularsequenceMode + Case RegularsequenceMode.Prepare + ucrBase.iHelpTopicID = 460 + Case RegularsequenceMode.Climatic + ucrBase.iHelpTopicID = 492 + End Select + End Sub + + Private Sub ucrInputInStepsOf_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrInputInStepsOf.ControlValueChanged PreviewSequence() End Sub diff --git a/instat/dlgReplaceValues.vb b/instat/dlgReplaceValues.vb index b893e7c73c2..5afcef5523e 100644 --- a/instat/dlgReplaceValues.vb +++ b/instat/dlgReplaceValues.vb @@ -17,6 +17,12 @@ Imports instat.Translations Public Class dlgReplaceValues + Public enumReplacevaluesMode As String = ReplacevaluesMode.Prepare + Public Enum ReplacevaluesMode + Prepare + Climatic + End Enum + Public bFirstLoad As Boolean = True Private bReset As Boolean = True Private clsReplace As New RFunction @@ -31,6 +37,7 @@ Public Class dlgReplaceValues SetDefaults() End If SetRCodeForControls(bReset) + SetHelpOptions() bReset = False TestOKEnabled() autoTranslate(Me) @@ -257,6 +264,16 @@ Public Class dlgReplaceValues End If End Sub + Private Sub SetHelpOptions() + Select Case enumReplacevaluesMode + Case ReplacevaluesMode.Prepare + ucrBase.iHelpTopicID = 47 + Case ReplacevaluesMode.Climatic + ucrBase.iHelpTopicID = 604 + End Select + End Sub + + Private Sub ucrPnlOld_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrPnlOld.ControlValueChanged, ucrPnlNew.ControlValueChanged, ucrInputRangeFrom.ControlContentsChanged, ucrInputRangeTo.ControlContentsChanged InputValue() EnableRange() diff --git a/instat/dlgSplitText.vb b/instat/dlgSplitText.vb index 4165eb7847e..46beff78c10 100644 --- a/instat/dlgSplitText.vb +++ b/instat/dlgSplitText.vb @@ -16,6 +16,12 @@ Imports instat.Translations Public Class dlgSplitText + Public enumSplitMode As String = SplitMode.Prepare + Public Enum SplitMode + Prepare + Climatic + End Enum + Public bFirstLoad As Boolean = True Private bReset As Boolean = True Private clsTextComponentsFixed, clsTextComponentsMaximum, clsStringCollFunction As New RFunction @@ -33,6 +39,7 @@ Public Class dlgSplitText SetDefaults() End If SetRCodeForControls(bReset) + SetHelpOptions() bReset = False TestOKEnabled() autoTranslate(Me) @@ -163,6 +170,16 @@ Public Class dlgSplitText sdgConstructRegexExpression.ucrReceiverForRegex.Clear() End Sub + Private Sub SetHelpOptions() + Select Case enumSplitMode + Case SplitMode.Prepare + ucrBase.iHelpTopicID = 344 + Case SplitMode.Climatic + ucrBase.iHelpTopicID = 601 + End Select + End Sub + + Private Sub cmdAddkeyboard_Click(sender As Object, e As EventArgs) Handles cmdAddkeyboard.Click sdgConstructRegexExpression.ShowDialog() ucrInputRegexPattern.SetName(sdgConstructRegexExpression.ucrReceiverForRegex.GetText()) diff --git a/instat/dlgStack.vb b/instat/dlgStack.vb index 0ab7c8e0e45..0fd8973dba3 100644 --- a/instat/dlgStack.vb +++ b/instat/dlgStack.vb @@ -17,6 +17,13 @@ Imports instat.Translations Public Class dlgStack + Public enumStackMode As String = StackMode.Prepare + Public Enum StackMode + Prepare + Climatic + End Enum + + Private clsUnnestTokensFunction As New RFunction Private clsPivotLongerFunction As New RFunction Private clsSelectFunction As New RFunction @@ -39,6 +46,7 @@ Public Class dlgStack SetDefaults() End If SetRCodeForControls(bReset) + SetHelpOptions() bReset = False TestOKEnabled() autoTranslate(Me) @@ -478,6 +486,15 @@ Public Class dlgStack Excludevariables() End Sub + Private Sub SetHelpOptions() + Select Case enumStackMode + Case StackMode.Prepare + ucrBase.iHelpTopicID = 57 + Case StackMode.Climatic + ucrBase.iHelpTopicID = 607 + End Select + End Sub + Private Sub Excludevariables() If ucrChkDropVariables.Checked Then ucrReceiverDropValues.SetMeAsReceiver() diff --git a/instat/dlgThreeVariablePivotTable.vb b/instat/dlgThreeVariablePivotTable.vb index c0652f97de2..eab53f5aee1 100644 --- a/instat/dlgThreeVariablePivotTable.vb +++ b/instat/dlgThreeVariablePivotTable.vb @@ -23,9 +23,10 @@ Public Class dlgThreeVariablePivotTable clsRelevelPasteFunction, clsRPivotTableFunction, clsSelectFunction As New RFunction Private clsPipeOperator, clsLevelsDollarOperator As New ROperator - Public enumPivotMode As PivotMode = PivotMode.Describe + Public enumPivotMode As PivotMode = PivotMode.Prepare Public Enum PivotMode + Prepare Describe Climatic End Enum @@ -47,7 +48,6 @@ Public Class dlgThreeVariablePivotTable End Sub Private Sub InitialiseDialog() - ucrBase.iHelpTopicID = 417 ucrBase.clsRsyntax.bExcludeAssignedFunctionOutput = False ucrSelectorPivot.SetParameter(New RParameter("data", iNewPosition:=0)) @@ -297,7 +297,21 @@ Public Class dlgThreeVariablePivotTable Private Sub AutofillMode() Select Case enumPivotMode + Case PivotMode.Prepare + ucrBase.iHelpTopicID = 319 + + ucrReceiverInitialRowFactors.bAutoFill = False + + ucrReceiverInitialColumnFactor.bAutoFill = False + + ucrReceiverFactorLevels.SetDataType("factor") + ucrReceiverFactorLevels.bAutoFill = False + + ucrReceiverAdditionalRowFactor.SetIncludedDataTypes({"numeric", "Date", "logical"}) + ucrReceiverAdditionalRowFactor.bAutoFill = False Case PivotMode.Describe + ucrBase.iHelpTopicID = 417 + ucrReceiverInitialRowFactors.bAutoFill = False ucrReceiverInitialColumnFactor.bAutoFill = False @@ -319,6 +333,9 @@ Public Class dlgThreeVariablePivotTable strRainCol = frmMain.clsRLink.GetClimaticColumnOfType(strDataFrame, "rain_label") strYearCol = frmMain.clsRLink.GetClimaticColumnOfType(strDataFrame, "year_label") strDayCol = frmMain.clsRLink.GetClimaticColumnOfType(strDataFrame, "day_label") + + ucrBase.iHelpTopicID = 558 + If Not String.IsNullOrEmpty(strRainCol) Then ucrChkNumericVariable.Checked = True ucrReceiverAdditionalRowFactor.Add(strRainCol, strDataFrame) diff --git a/instat/dlgTransformText.vb b/instat/dlgTransformText.vb index d4559e71ce2..0d40c8ab161 100644 --- a/instat/dlgTransformText.vb +++ b/instat/dlgTransformText.vb @@ -17,6 +17,13 @@ Imports instat.Translations Public Class dlgTransformText + Public enumTransformMode As String = TransformMode.Prepare + Public Enum TransformMode + Prepare + Describe + Climatic + End Enum + Public bFirstLoad As Boolean = True Private bReset As Boolean = True Private clsConvertFunction, clsLengthFunction, clsPadFunction, clsWordsFunction, clsSubstringFunction As New RFunction @@ -40,6 +47,7 @@ Public Class dlgTransformText SetDefaults() End If SetRCodeForControls(bReset) + SetHelpOptions() bReset = False TestOkEnabled() autoTranslate(Me) @@ -474,6 +482,15 @@ Public Class dlgTransformText End If End Sub + Private Sub SetHelpOptions() + Select Case enumTransformMode + Case TransformMode.Prepare + ucrBase.iHelpTopicID = 343 + Case TransformMode.Climatic + ucrBase.iHelpTopicID = 606 + End Select + End Sub + Private Sub AddRemoveStartAndEndParameters() If ucrChkFirstOr.Checked Then clsWordsFunction.AddParameter("start", clsRFunctionParameter:=ucrReceiverFirstWord.GetVariables(), iPosition:=1) diff --git a/instat/dlgUnstack.vb b/instat/dlgUnstack.vb index abb6ac882eb..e3750cf13a2 100644 --- a/instat/dlgUnstack.vb +++ b/instat/dlgUnstack.vb @@ -17,6 +17,12 @@ Imports instat.Translations Public Class dlgUnstack + Public enumUnstackMode As String = UnstackMode.Prepare + Public Enum UnstackMode + Prepare + Climatic + End Enum + Public bFirstLoad As Boolean = True Private bReset As Boolean = True Private clsCarryColumnsOperator As New ROperator @@ -42,6 +48,7 @@ Public Class dlgUnstack SetDefaults() End If SetRCodeforControls(bReset) + SetHelpOptions() bReset = False TestOKEnabled() autoTranslate(Me) @@ -379,6 +386,15 @@ Public Class dlgUnstack CarryColumnsParameter() End Sub + Private Sub SetHelpOptions() + Select Case enumUnstackMode + Case UnstackMode.Prepare + ucrBase.iHelpTopicID = 58 + Case UnstackMode.Climatic + ucrBase.iHelpTopicID = 608 + End Select + End Sub + Private Sub CarryColumnsLabelReceiverLocation() If rdoRestoreHierarchy.Checked Then ucrReceiverCarryColumns.Location = New Point(ucrReceiverCarryColumns.Location.X, iReceiverMaxY / 1.8) diff --git a/instat/dlgVisualizeData.vb b/instat/dlgVisualizeData.vb index 0e1a6850d2e..505d6e20748 100644 --- a/instat/dlgVisualizeData.vb +++ b/instat/dlgVisualizeData.vb @@ -23,6 +23,7 @@ Public Class dlgVisualizeData Describe Climatic End Enum + Private bFirstLoad As Boolean = True Private bReset As Boolean = True Private clsVisDatFunction As New RFunction diff --git a/instat/frmMain.vb b/instat/frmMain.vb index 551eec97e90..ffb7a193f45 100644 --- a/instat/frmMain.vb +++ b/instat/frmMain.vb @@ -639,10 +639,12 @@ Public Class frmMain End Sub Private Sub mnuPrepareReshapeStack_Click(sender As Object, e As EventArgs) Handles mnuPrepareColumnReshapeStack.Click + dlgStack.enumStackMode = dlgStack.StackMode.Prepare dlgStack.ShowDialog() End Sub Private Sub mnuPrepareReshapeUnstack_Click(sender As Object, e As EventArgs) Handles mnuPrepareColumnReshapeUnstack.Click + dlgUnstack.enumUnstackMode = dlgUnstack.UnstackMode.Prepare dlgUnstack.ShowDialog() End Sub @@ -651,6 +653,7 @@ Public Class frmMain End Sub Private Sub mnuPrepareColumnNumericRandomSamples_Click(sender As Object, e As EventArgs) Handles mnuPrepareColumnNumericRandomSamples.Click + dlgRandomSample.enumRandomsampleMode = dlgRandomSample.RandomsampleMode.Prepare dlgRandomSample.ShowDialog() End Sub @@ -711,6 +714,7 @@ Public Class frmMain End Sub Private Sub mnuPrepareReshapeMerge_Click(sender As Object, e As EventArgs) Handles mnuPrepareColumnReshapeMerge.Click + dlgMerge.enumMergeMode = dlgMerge.MergeMode.Prepare dlgMerge.ShowDialog() End Sub @@ -869,6 +873,7 @@ Public Class frmMain End Sub Private Sub mnuPrepareTextSplit_Click(sender As Object, e As EventArgs) Handles mnuPrepareColumnTextSplit.Click + dlgSplitText.enumSplitMode = dlgSplitText.SplitMode.Prepare dlgSplitText.ShowDialog() End Sub @@ -908,6 +913,7 @@ Public Class frmMain 'End Sub Private Sub mnuPrepareTextTransform_Click(sender As Object, e As EventArgs) Handles mnuPrepareColumnTextTransform.Click + dlgTransformText.enumTransformMode = dlgTransformText.TransformMode.Prepare dlgTransformText.ShowDialog() End Sub @@ -936,6 +942,7 @@ Public Class frmMain End Sub Private Sub mnuModelProbabilityDistributionsRandomSamplesUseModel_Click(sender As Object, e As EventArgs) Handles mnuModelProbabilityDistributionsRandomSamplesUseModel.Click + dlgRandomSample.enumRandomsampleMode = dlgRandomSample.RandomsampleMode.Model dlgRandomSample.ShowDialog() End Sub @@ -1037,6 +1044,7 @@ Public Class frmMain End Sub Private Sub mnuDescribeOneVariableGraph_Click(sender As Object, e As EventArgs) Handles mnuDescribeOneVariableGraph.Click + dlgOneVariableGraph.enumOnevariableMode = dlgOneVariableGraph.OnevariableMode.Describe dlgOneVariableGraph.ShowDialog() End Sub @@ -1141,14 +1149,17 @@ Public Class frmMain End Sub Private Sub mnuOrganiseDataFrameReplaceValues_Click(sender As Object, e As EventArgs) Handles mnuPrepareDataFrameReplaceValues.Click + dlgReplaceValues.enumReplacevaluesMode = dlgReplaceValues.ReplacevaluesMode.Prepare dlgReplaceValues.ShowDialog() End Sub Private Sub mnuDescribeTwoVariablesSummarise_Click(sender As Object, e As EventArgs) Handles mnuDescribeTwoVariablesSummarise.Click + dlgDescribeTwoVariable.enumTwovariableMode = dlgDescribeTwoVariable.TwovariableMode.Describe dlgDescribeTwoVariable.ShowDialog() End Sub Private Sub mnuAppendDataFrame_Click(sender As Object, e As EventArgs) Handles mnuPrepareAppendDataFrame.Click + dlgAppend.enumAppendMode = dlgAppend.AppendMode.Prepare dlgAppend.ShowDialog() End Sub @@ -1165,6 +1176,7 @@ Public Class frmMain End Sub Private Sub mnuDescribeTwoVariablesGraph_Click(sender As Object, e As EventArgs) Handles mnuDescribeTwoVariablesGraph.Click + dlgDescribeTwoVarGraph.enumTwovarMode = dlgDescribeTwoVarGraph.TwovarMode.Describe dlgDescribeTwoVarGraph.ShowDialog() End Sub @@ -1237,6 +1249,7 @@ Public Class frmMain End Sub Private Sub mnuDescribeSpecificBoxplot_Click(sender As Object, e As EventArgs) Handles mnuDescribeSpecificBoxplotJitterViolinPlot.Click + dlgBoxplot.enumBoxplotMode = dlgBoxplot.BoxplotMode.Describe dlgBoxplot.ShowDialog() End Sub @@ -1253,6 +1266,7 @@ Public Class frmMain End Sub Private Sub mnuOrganiseColumnMakeDate_Click(sender As Object, e As EventArgs) Handles mnuPrepareColumnDateMakeDate.Click + dlgMakeDate.enumMakedateMode = dlgMakeDate.MakedateMode.Prepare dlgMakeDate.ShowDialog() End Sub @@ -1273,6 +1287,7 @@ Public Class frmMain End Sub Private Sub mnuOrganiseColumnUseDate_Click(sender As Object, e As EventArgs) Handles mnuPrepareColumnDateUseDate.Click + dlgUseDate.enumUsedateMode = dlgUseDate.UsedateMode.Prepare dlgUseDate.ShowDialog() End Sub @@ -1365,18 +1380,22 @@ Public Class frmMain End Sub Private Sub mnuPrepareKeysAndLinksAddKey_Click(sender As Object, e As EventArgs) Handles mnuPrepareKeysAndLinksAddKey.Click + dlgAddKey.enumAddkeyMode = dlgAddKey.AddkeyMode.Prepare dlgAddKey.ShowDialog() End Sub Private Sub mnuClimaticPrepareDatesMakeDate_Click(sender As Object, e As EventArgs) Handles mnuClimaticDatesMakeDate.Click + dlgMakeDate.enumMakedateMode = dlgMakeDate.MakedateMode.Climatic dlgMakeDate.ShowDialog() End Sub Private Sub mnuClimaticPrepareDatesUseDate_Click(sender As Object, e As EventArgs) Handles mnuClimaticDatesUseDate.Click + dlgUseDate.enumUsedateMode = dlgUseDate.UsedateMode.Climatic dlgUseDate.ShowDialog() End Sub Private Sub mnuClimaticPrepareInfillMissingDates_Click(sender As Object, e As EventArgs) Handles mnuClimaticDatesInfillMissingDates.Click + dlgInfill.enumFilldateMode = dlgInfill.FilldateMode.Climatic dlgInfill.ShowDialog() End Sub @@ -1511,6 +1530,7 @@ Public Class frmMain End Sub Private Sub mnuDescribeOneVariableFrequencies_Click(sender As Object, e As EventArgs) Handles mnuDescribeOneVariableFrequencies.Click + dlgOneWayFrequencies.enumOnewayMode = dlgOneWayFrequencies.OnewayMode.Describe dlgOneWayFrequencies.ShowDialog() End Sub @@ -1698,6 +1718,7 @@ Public Class frmMain End Sub Private Sub mnuPrepareCheckDataDuplicates_Click(sender As Object, e As EventArgs) Handles mnuPrepareCheckDataDuplicates.Click + dlgDuplicateRows.enumDuplicateMode = dlgDuplicateRows.DuplicateMode.Prepare dlgDuplicateRows.ShowDialog() End Sub @@ -1714,6 +1735,7 @@ Public Class frmMain End Sub Private Sub mnuPrepareColumnInfillMissingDates_Click(sender As Object, e As EventArgs) Handles mnuPrepareColumnDateInfillMissingDates.Click + dlgInfill.enumFilldateMode = dlgInfill.FilldateMode.Prepare dlgInfill.ShowDialog() End Sub @@ -1775,18 +1797,22 @@ Public Class frmMain End Sub Private Sub mnuPrepareCheckDataBoxplot_Click(sender As Object, e As EventArgs) Handles mnuPrepareCheckDataBoxplot.Click + dlgBoxplot.enumBoxplotMode = dlgBoxplot.BoxplotMode.Prepare dlgBoxplot.ShowDialog() End Sub Private Sub mnuPrepareCheckDataOneVariableGraph_Click(sender As Object, e As EventArgs) Handles mnuPrepareCheckDataOneVariableGraph.Click + dlgOneVariableGraph.enumOnevariableMode = dlgOneVariableGraph.OnevariableMode.Prepare dlgOneVariableGraph.ShowDialog() End Sub Private Sub mnuPrepareCheckDataOneVariableSummarise_Click(sender As Object, e As EventArgs) Handles mnuPrepareCheckDataOneVariableSummarise.Click + dlgOneVariableSummarise.enumOnevariableMode = dlgOneVariableSummarise.OnevariableMode.Prepare dlgOneVariableSummarise.ShowDialog() End Sub Private Sub mnuPrepareCheckDataOneWayFrequencies_Click(sender As Object, e As EventArgs) Handles mnuPrepareCheckDataOneWayFrequencies.Click + dlgOneWayFrequencies.enumOnewayMode = dlgOneWayFrequencies.OnewayMode.Prepare dlgOneWayFrequencies.ShowDialog() End Sub @@ -1927,11 +1953,13 @@ Public Class frmMain End Sub Private Sub mnuPrepareColumnGenerateDate_Click(sender As Object, e As EventArgs) Handles mnuPrepareColumnDateGenerateDate.Click + dlgRegularSequence.enumRegularsequenceMode = dlgRegularSequence.RegularsequenceMode.Prepare dlgRegularSequence.SetDateSequenceAsDefaultOption() dlgRegularSequence.ShowDialog() End Sub Private Sub mnuClimaticDatesGenerateDates_Click(sender As Object, e As EventArgs) Handles mnuClimaticDatesGenerateDates.Click + dlgRegularSequence.enumRegularsequenceMode = dlgRegularSequence.RegularsequenceMode.Climatic dlgRegularSequence.SetDateSequenceAsDefaultOption() dlgRegularSequence.ShowDialog() End Sub @@ -1941,6 +1969,7 @@ Public Class frmMain End Sub Private Sub mnuPrepareCheckDataCompareColumns_Click(sender As Object, e As EventArgs) Handles mnuPrepareCheckDataCompareColumns.Click + dlgCompareColumns.enumCompareMode = dlgCompareColumns.CompareMode.Prepare dlgCompareColumns.ShowDialog() End Sub @@ -1997,14 +2026,17 @@ Public Class frmMain End Sub Private Sub mnuPrepareCheckDataNonNumericCases_Click(sender As Object, e As EventArgs) Handles mnuPrepareCheckDataNonNumericCases.Click + dlgFindNonnumericValues.enumNonNumericMode = dlgFindNonnumericValues.NonNumericMode.Prepare dlgFindNonnumericValues.ShowDialog() End Sub Private Sub mnuClimaticTidyandExamineNonNumericCases_Click(sender As Object, e As EventArgs) Handles mnuClimaticTidyandExamineNonNumericCases.Click + dlgFindNonnumericValues.enumNonNumericMode = dlgFindNonnumericValues.NonNumericMode.Climatic dlgFindNonnumericValues.ShowDialog() End Sub Private Sub mnuClimaticTidyandExamineReplaceValues_Click(sender As Object, e As EventArgs) Handles mnuClimaticTidyandExamineReplaceValues.Click + dlgReplaceValues.enumReplacevaluesMode = dlgReplaceValues.ReplacevaluesMode.Climatic dlgReplaceValues.ShowDialog() End Sub @@ -2025,6 +2057,7 @@ Public Class frmMain End Sub Private Sub mnuClimaticTidyandExamineMerge_Click(sender As Object, e As EventArgs) Handles mnuClimaticTidyandExamineMerge.Click + dlgMerge.enumMergeMode = dlgMerge.MergeMode.Climatic dlgMerge.ShowDialog() End Sub @@ -2072,14 +2105,17 @@ Public Class frmMain End Sub Private Sub MnuClimaticTidyandExamineUnstack_Click(sender As Object, e As EventArgs) Handles mnuClimaticTidyandExamineUnstack.Click + dlgUnstack.enumUnstackMode = dlgUnstack.UnstackMode.Climatic dlgUnstack.ShowDialog() End Sub Private Sub mnuClimaticTidyandExamineStack_Click(sender As Object, e As EventArgs) Handles mnuClimaticTidyandExamineStack.Click + dlgStack.enumStackMode = dlgStack.StackMode.Climatic dlgStack.ShowDialog() End Sub Private Sub mnuClimaticTidyandExamineAppend_Click(sender As Object, e As EventArgs) Handles mnuClimaticTidyandExamineAppend.Click + dlgAppend.enumAppendMode = dlgAppend.AppendMode.Climatic dlgAppend.ShowDialog() End Sub @@ -2092,6 +2128,7 @@ Public Class frmMain End Sub Private Sub mnuClimaticTidyandExamineDuplicates_Click(sender As Object, e As EventArgs) Handles mnuClimaticTidyandExamineDuplicateRows.Click + dlgDuplicateRows.enumDuplicateMode = dlgDuplicateRows.DuplicateMode.Climatic dlgDuplicateRows.ShowDialog() End Sub @@ -2567,22 +2604,27 @@ Public Class frmMain End Sub Private Sub mnuClimaticTidyandExamineTransformText_Click(sender As Object, e As EventArgs) Handles mnuClimaticTidyandExamineTransformText.Click + dlgTransformText.enumTransformMode = dlgTransformText.TransformMode.Climatic dlgTransformText.ShowDialog() End Sub Private Sub mnuClimaticTidyandExamineSplitText_Click(sender As Object, e As EventArgs) Handles mnuClimaticTidyandExamineSplitText.Click + dlgSplitText.enumSplitMode = dlgSplitText.SplitMode.Climatic dlgSplitText.ShowDialog() End Sub Private Sub mnuExamineEditDataOneVariableSummarise_Click(sender As Object, e As EventArgs) Handles mnuExamineEditDataOneVariableSummarise.Click + dlgOneVariableSummarise.enumOnevariableMode = dlgOneVariableSummarise.OnevariableMode.Climatic dlgOneVariableSummarise.ShowDialog() End Sub Private Sub mnuExamineEditDataOneVariableGraph_Click(sender As Object, e As EventArgs) Handles mnuExamineEditDataOneVariableGraph.Click + dlgOneVariableGraph.enumOnevariableMode = dlgOneVariableGraph.OnevariableMode.Climatic dlgOneVariableGraph.ShowDialog() End Sub Private Sub mnuExamineEditDataOneVariableFrequencies_Click(sender As Object, e As EventArgs) Handles mnuExamineEditDataOneVariableFrequencies.Click + dlgOneWayFrequencies.enumOnewayMode = dlgOneWayFrequencies.OnewayMode.Climatic dlgOneWayFrequencies.ShowDialog() End Sub @@ -2600,6 +2642,7 @@ Public Class frmMain End Sub Private Sub mnuExamineEditDataCompareColumns_Click(sender As Object, e As EventArgs) Handles mnuExamineEditDataCompareColumns.Click + dlgCompareColumns.enumCompareMode = dlgCompareColumns.CompareMode.Climatic dlgCompareColumns.ShowDialog() End Sub @@ -2612,7 +2655,7 @@ Public Class frmMain End Sub Private Sub mnuPrepareCheckDataPivotTable_Click(sender As Object, e As EventArgs) Handles mnuPrepareCheckDataPivotTable.Click - dlgThreeVariablePivotTable.enumPivotMode = dlgThreeVariablePivotTable.PivotMode.Describe + dlgThreeVariablePivotTable.enumPivotMode = dlgThreeVariablePivotTable.PivotMode.Prepare dlgThreeVariablePivotTable.ShowDialog() End Sub @@ -2621,14 +2664,17 @@ Public Class frmMain End Sub Private Sub AddToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles mnuClimaticTidyDataKey.Click + dlgAddKey.enumAddkeyMode = dlgAddKey.AddkeyMode.Climatic dlgAddKey.ShowDialog() End Sub Private Sub mnuClimaticDescribeSummarise23Variables_Click(sender As Object, e As EventArgs) Handles mnuClimaticDescribeSummarise23Variables.Click + dlgDescribeTwoVariable.enumTwovariableMode = dlgDescribeTwoVariable.TwovariableMode.Climatic dlgDescribeTwoVariable.ShowDialog() End Sub Private Sub mnuClimaticDescribeGraph23Variables_Click(sender As Object, e As EventArgs) Handles mnuClimaticDescribeGraph23Variables.Click + dlgDescribeTwoVarGraph.enumTwovarMode = dlgDescribeTwoVarGraph.TwovarMode.Climatic dlgDescribeTwoVarGraph.ShowDialog() End Sub diff --git a/instat/sdgMerge.vb b/instat/sdgMerge.vb index 6d51044e13a..6a33452f39a 100644 --- a/instat/sdgMerge.vb +++ b/instat/sdgMerge.vb @@ -23,6 +23,7 @@ Public Class sdgMerge Private clsMerge As RFunction Private Sub sdgMerge_Load(sender As Object, e As EventArgs) Handles MyBase.Load + SetHelpOptions() autoTranslate(Me) End Sub @@ -93,6 +94,15 @@ Public Class sdgMerge cmdRemoveAll.Enabled = False End Sub + Private Sub SetHelpOptions() + Select Case dlgMerge.enumMergeMode + Case dlgMerge.MergeMode.Prepare + ucrSubBase.iHelpTopicID = 51 + Case dlgMerge.MergeMode.Climatic + ucrSubBase.iHelpTopicID = 624 + End Select + End Sub + Private Sub cmdAddPair_Click(sender As Object, e As EventArgs) Handles cmdAddPair.Click Dim i As Integer Dim bFound As Boolean = False diff --git a/instat/sdgMergeColumnsToInclude.vb b/instat/sdgMergeColumnsToInclude.vb index 257396be31f..29116770125 100644 --- a/instat/sdgMergeColumnsToInclude.vb +++ b/instat/sdgMergeColumnsToInclude.vb @@ -23,6 +23,7 @@ Public Class sdgMergeColumnstoInclude Private clsMerge As RFunction Private Sub sdgMerge_Load(sender As Object, e As EventArgs) Handles MyBase.Load + SetHelpOptions() autoTranslate(Me) End Sub @@ -129,4 +130,13 @@ Public Class sdgMergeColumnstoInclude Next End If End Sub + + Private Sub SetHelpOptions() + Select Case dlgMerge.enumMergeMode + Case dlgMerge.MergeMode.Prepare + ucrSubBase.iHelpTopicID = 154 + Case dlgMerge.MergeMode.Climatic + ucrSubBase.iHelpTopicID = 636 + End Select + End Sub End Class diff --git a/instat/sdgOneVarGraph.vb b/instat/sdgOneVarGraph.vb index b1ebc508417..7e6fe39264f 100644 --- a/instat/sdgOneVarGraph.vb +++ b/instat/sdgOneVarGraph.vb @@ -20,6 +20,7 @@ Public Class sdgOneVarGraph Public clsGraphOneVariable As New RFunction Private Sub sdgOneVarGraph_Load(sender As Object, e As EventArgs) Handles Me.Load + SetHelpOptions() autoTranslate(Me) End Sub @@ -79,4 +80,15 @@ Public Class sdgOneVarGraph tbcOneVarGraph.SelectedIndex = 0 End If End Sub + + Private Sub SetHelpOptions() + Select Case dlgOneVariableGraph.enumOnevariableMode + Case dlgOneVariableGraph.OnevariableMode.Prepare + ucrButtonsOneVarGraph.iHelpTopicID = 187 + Case dlgOneVariableGraph.OnevariableMode.Describe + ucrButtonsOneVarGraph.iHelpTopicID = 170 + Case dlgOneVariableGraph.OnevariableMode.Climatic + ucrButtonsOneVarGraph.iHelpTopicID = 623 + End Select + End Sub End Class \ No newline at end of file diff --git a/instat/sdgOneWayFrequencies.vb b/instat/sdgOneWayFrequencies.vb index 0926ceab615..f41c836d066 100644 --- a/instat/sdgOneWayFrequencies.vb +++ b/instat/sdgOneWayFrequencies.vb @@ -20,6 +20,7 @@ Public Class sdgOneWayFrequencies Public clsOneWayTableFreq, clsOneWayGraphFreq, clsOneWayGrid As New RFunction Private Sub sdgOneWayFrequencies_Load(sender As Object, e As EventArgs) Handles MyBase.Load + SetHelpOptions() autoTranslate(Me) End Sub @@ -30,7 +31,6 @@ Public Class sdgOneWayFrequencies Dim dctColors As New Dictionary(Of String, String) ucrInputGraphTitle.SetParameter(New RParameter("title", 2)) - 'Table Only ucrInputTitle.SetParameter(New RParameter("title", 5)) @@ -153,4 +153,15 @@ Public Class sdgOneWayFrequencies Next tbpOneWayFrequencies.SelectedIndex = 0 End Sub + + Private Sub SetHelpOptions() + Select Case dlgOneWayFrequencies.enumOnewayMode + Case dlgOneWayFrequencies.OnewayMode.Prepare + ucrBaseOneWayFrequencies.iHelpTopicID = 620 + Case dlgOneWayFrequencies.OnewayMode.Describe + ucrBaseOneWayFrequencies.iHelpTopicID = 96 + Case dlgOneWayFrequencies.OnewayMode.Climatic + ucrBaseOneWayFrequencies.iHelpTopicID = 273 + End Select + End Sub End Class \ No newline at end of file diff --git a/instat/sdgPlots.vb b/instat/sdgPlots.vb index 18e491dd56f..11e09c2777c 100644 --- a/instat/sdgPlots.vb +++ b/instat/sdgPlots.vb @@ -90,7 +90,7 @@ Public Class sdgPlots Private clsXElementTitle As New RFunction Private clsYElemetText As New RFunction Private clsYElemetTitle As New RFunction - + Private clsGuideLegendFunction1, clsGuideFunction1, clsGuideLegendFunction, clsGuideFunction As New RFunction 'Polar Coordinates Private clsCoordPolarFunc As New RFunction Private clsCoordPolarStartOperator As New ROperator @@ -2322,11 +2322,26 @@ Public Class sdgPlots clsScaleColourViridisFunction = clsNewScaleColourViridisFunction clsAnnotateFunction = clsNewAnnotateFunction + clsGuideLegendFunction = New RFunction + clsGuideFunction = New RFunction + clsGuideLegendFunction1 = New RFunction + clsGuideFunction1 = New RFunction clsDummyFunction = New RFunction clsDummyFunction.AddParameter("palette", "sequential", iPosition:=0) clsDummyFunction.AddParameter("Check", "fill", iPosition:=1) + clsGuideLegendFunction.SetRCommand("guide_legend") + clsGuideLegendFunction.AddParameter("reverse", "TRUE", iPosition:=0) + + clsGuideFunction.SetRCommand("guides") + clsGuideFunction.AddParameter("fill", clsRFunctionParameter:=clsGuideLegendFunction, iPosition:=0) + + clsGuideLegendFunction1.SetRCommand("guide_legend") + clsGuideLegendFunction1.AddParameter("reverse", "TRUE", iPosition:=0) + + clsGuideFunction1.SetRCommand("guides") + clsGuideFunction1.AddParameter("colour", clsRFunctionParameter:=clsGuideLegendFunction1, iPosition:=1) strAxisType = strNewAxisType ucrInputAxisType.SetName(strAxisType) @@ -3406,7 +3421,6 @@ Public Class sdgPlots Private Sub SetRcodeForCommonThemesControls(bReset As Boolean) ucrChkLegendPosition.SetRCode(clsThemeFunction, bReset, bCloneIfNeeded:=True) - ucrInputLegendPosition.SetRCode(clsThemeFunction, bReset, bCloneIfNeeded:=True) ucrChkXaxisAngle.SetRCode(clsXElementText, bReset, bCloneIfNeeded:=True) ucrNudXAngle.SetRCode(clsXElementText, bReset, bCloneIfNeeded:=True) @@ -3425,10 +3439,12 @@ Public Class sdgPlots End Sub Private Sub cmdSimpleOptions_Click(sender As Object, e As EventArgs) Handles cmdSimpleOptions.Click - sdgThemesSub.SetRCode(clsBaseOperator, clsNewThemesFunction:=clsThemeFunction, dctNewThemeFunctions:=dctThemeFunctions, bReset:=bResetThemes) + sdgThemesSub.SetRCode(clsBaseOperator, clsNewGuideFunction:=clsGuideFunction, clsNewGuideLegendFunction:=clsGuideLegendFunction, clsNewGuideFunction1:=clsGuideFunction1, clsNewGuideLegendFunction1:=clsGuideLegendFunction1, clsNewThemesFunction:=clsThemeFunction, dctNewThemeFunctions:=dctThemeFunctions, bReset:=bResetThemes) Me.SendToBack() sdgThemesSub.ShowDialog() + bResetThemes = False SetRcodeForCommonThemesControls(False) + ucrChkLegendPosition.Checked = False End Sub Private Sub ucrChkUsePolarCoordinates_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkUsePolarCoordinates.ControlValueChanged @@ -6188,4 +6204,12 @@ Public Class sdgPlots HideShowCanvaFill() GroupeColorScale() End Sub + + Private Sub ucrInputLegendPosition_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrInputLegendPosition.ControlValueChanged + If Not ucrInputLegendPosition.IsEmpty Then + clsThemeFunction.AddParameter("legend.position", Chr(34) & ucrInputLegendPosition.GetText().ToLower() & Chr(34), iPosition:=0) + Else + clsThemeFunction.RemoveParameterByName("legend.position") + End If + End Sub End Class \ No newline at end of file diff --git a/instat/sdgThemesSub.Designer.vb b/instat/sdgThemesSub.Designer.vb index 7cede141ed8..7917f10f5ff 100644 --- a/instat/sdgThemesSub.Designer.vb +++ b/instat/sdgThemesSub.Designer.vb @@ -1,9 +1,9 @@ - _ + Partial Class sdgThemesSub Inherits System.Windows.Forms.Form 'Form overrides dispose to clean up the component list. - _ + Protected Overrides Sub Dispose(ByVal disposing As Boolean) Try If disposing AndAlso components IsNot Nothing Then @@ -20,45 +20,52 @@ Partial Class sdgThemesSub 'NOTE: The following procedure is required by the Windows Form Designer 'It can be modified using the Windows Form Designer. 'Do not modify it using the code editor. - _ + Private Sub InitializeComponent() Me.TabThemes = New System.Windows.Forms.TabControl() Me.tbTitles = New System.Windows.Forms.TabPage() + Me.tbLabels = New System.Windows.Forms.TabPage() + Me.tbAxes = New System.Windows.Forms.TabPage() + Me.tbPanel = New System.Windows.Forms.TabPage() + Me.tbBackground = New System.Windows.Forms.TabPage() + Me.tbLegend = New System.Windows.Forms.TabPage() + Me.grpLegendPosition = New System.Windows.Forms.GroupBox() + Me.rdoColour = New System.Windows.Forms.RadioButton() + Me.rdoFill = New System.Windows.Forms.RadioButton() + Me.rdoHorizontal = New System.Windows.Forms.RadioButton() + Me.rdoVertical = New System.Windows.Forms.RadioButton() + Me.rdoCoordinates = New System.Windows.Forms.RadioButton() + Me.rdoSpecific = New System.Windows.Forms.RadioButton() + Me.lblYCoord = New System.Windows.Forms.Label() + Me.lblXCoord = New System.Windows.Forms.Label() + Me.lblLegendPosition = New System.Windows.Forms.Label() + Me.ucrBaseSubdialog = New instat.ucrButtonsSubdialogue() Me.ucrThemeTitleYAxis = New instat.ucrELementTextControl() Me.ucrThemeTitleXAxis = New instat.ucrELementTextControl() Me.ucrPlotTitle = New instat.ucrELementTextControl() - Me.tbLabels = New System.Windows.Forms.TabPage() Me.ucrThemeLeftYAxis = New instat.ucrELementTextControl() Me.ucrThemeBottomXAxis = New instat.ucrELementTextControl() Me.ucrThemeAxesTickLabels = New instat.ucrELementTextControl() - Me.tbAxes = New System.Windows.Forms.TabPage() Me.ucrYAxisLines = New instat.ucrElementLineControl() Me.ucrTickMarksYAxis = New instat.ucrElementLineControl() Me.ucrXAxisLines = New instat.ucrElementLineControl() Me.ucrTickMarksXAxis = New instat.ucrElementLineControl() Me.ucrThemeAxesLines = New instat.ucrElementLineControl() Me.ucrTickMarksAxes = New instat.ucrElementLineControl() - Me.tbPanel = New System.Windows.Forms.TabPage() Me.ucrPanelGridMinor = New instat.ucrElementLineControl() Me.ucrPanelGridMajor = New instat.ucrElementLineControl() Me.ucrPanelGrid = New instat.ucrElementLineControl() - Me.tbBackground = New System.Windows.Forms.TabPage() Me.ucrPanelBackground = New instat.ucrElementRectControl() Me.ucrPanelBorder = New instat.ucrElementRectControl() - Me.tbLegend = New System.Windows.Forms.TabPage() - Me.GroupBox1 = New System.Windows.Forms.GroupBox() - Me.ucrChkLegTitleTextSize = New instat.ucrCheck() - Me.grpLegendPosition = New System.Windows.Forms.GroupBox() - Me.lblYCoord = New System.Windows.Forms.Label() - Me.lblXCoord = New System.Windows.Forms.Label() - Me.UcrNud2 = New instat.ucrNud() - Me.UcrNud1 = New instat.ucrNud() - Me.ucRdoCoordinated = New instat.ucrRadio() - Me.ucrrdoSpecific = New instat.ucrRadio() - Me.UcrInputComboBox1 = New instat.ucrInputComboBox() - Me.lblLegendPosition = New System.Windows.Forms.Label() - Me.ucrChkRemoveLegend = New instat.ucrCheck() - Me.ucrBaseSubdialog = New instat.ucrButtonsSubdialogue() + Me.ucrPnlReverse = New instat.UcrPanel() + Me.ucrPnlDirection = New instat.UcrPanel() + Me.ucrChkReverse = New instat.ucrCheck() + Me.ucrChkDirection = New instat.ucrCheck() + Me.ucrNudY = New instat.ucrNud() + Me.ucrNudX = New instat.ucrNud() + Me.ucrPnlOptions = New instat.UcrPanel() + Me.ucrInputLegendPosition = New instat.ucrInputComboBox() + Me.ucrChkAddLegend = New instat.ucrCheck() Me.TabThemes.SuspendLayout() Me.tbTitles.SuspendLayout() Me.tbLabels.SuspendLayout() @@ -66,7 +73,6 @@ Partial Class sdgThemesSub Me.tbPanel.SuspendLayout() Me.tbBackground.SuspendLayout() Me.tbLegend.SuspendLayout() - Me.GroupBox1.SuspendLayout() Me.grpLegendPosition.SuspendLayout() Me.SuspendLayout() ' @@ -97,6 +103,195 @@ Partial Class sdgThemesSub Me.tbTitles.Text = "Titles" Me.tbTitles.UseVisualStyleBackColor = True ' + 'tbLabels + ' + Me.tbLabels.Controls.Add(Me.ucrThemeLeftYAxis) + Me.tbLabels.Controls.Add(Me.ucrThemeBottomXAxis) + Me.tbLabels.Controls.Add(Me.ucrThemeAxesTickLabels) + Me.tbLabels.Location = New System.Drawing.Point(4, 22) + Me.tbLabels.Name = "tbLabels" + Me.tbLabels.Padding = New System.Windows.Forms.Padding(3) + Me.tbLabels.Size = New System.Drawing.Size(519, 461) + Me.tbLabels.TabIndex = 1 + Me.tbLabels.Text = "Labels" + Me.tbLabels.UseVisualStyleBackColor = True + ' + 'tbAxes + ' + Me.tbAxes.Controls.Add(Me.ucrYAxisLines) + Me.tbAxes.Controls.Add(Me.ucrTickMarksYAxis) + Me.tbAxes.Controls.Add(Me.ucrXAxisLines) + Me.tbAxes.Controls.Add(Me.ucrTickMarksXAxis) + Me.tbAxes.Controls.Add(Me.ucrThemeAxesLines) + Me.tbAxes.Controls.Add(Me.ucrTickMarksAxes) + Me.tbAxes.Location = New System.Drawing.Point(4, 22) + Me.tbAxes.Name = "tbAxes" + Me.tbAxes.Size = New System.Drawing.Size(519, 461) + Me.tbAxes.TabIndex = 2 + Me.tbAxes.Text = "Axes" + Me.tbAxes.UseVisualStyleBackColor = True + ' + 'tbPanel + ' + Me.tbPanel.Controls.Add(Me.ucrPanelGridMinor) + Me.tbPanel.Controls.Add(Me.ucrPanelGridMajor) + Me.tbPanel.Controls.Add(Me.ucrPanelGrid) + Me.tbPanel.Location = New System.Drawing.Point(4, 22) + Me.tbPanel.Name = "tbPanel" + Me.tbPanel.Size = New System.Drawing.Size(519, 461) + Me.tbPanel.TabIndex = 3 + Me.tbPanel.Text = "Grid Lines" + Me.tbPanel.UseVisualStyleBackColor = True + ' + 'tbBackground + ' + Me.tbBackground.Controls.Add(Me.ucrPanelBackground) + Me.tbBackground.Controls.Add(Me.ucrPanelBorder) + Me.tbBackground.Location = New System.Drawing.Point(4, 22) + Me.tbBackground.Name = "tbBackground" + Me.tbBackground.Size = New System.Drawing.Size(519, 461) + Me.tbBackground.TabIndex = 4 + Me.tbBackground.Text = "Panel" + Me.tbBackground.UseVisualStyleBackColor = True + ' + 'tbLegend + ' + Me.tbLegend.Controls.Add(Me.ucrChkAddLegend) + Me.tbLegend.Controls.Add(Me.grpLegendPosition) + Me.tbLegend.Location = New System.Drawing.Point(4, 22) + Me.tbLegend.Name = "tbLegend" + Me.tbLegend.Size = New System.Drawing.Size(519, 461) + Me.tbLegend.TabIndex = 5 + Me.tbLegend.Text = "Legend" + Me.tbLegend.UseVisualStyleBackColor = True + ' + 'grpLegendPosition + ' + Me.grpLegendPosition.Controls.Add(Me.rdoColour) + Me.grpLegendPosition.Controls.Add(Me.rdoFill) + Me.grpLegendPosition.Controls.Add(Me.ucrPnlReverse) + Me.grpLegendPosition.Controls.Add(Me.rdoHorizontal) + Me.grpLegendPosition.Controls.Add(Me.rdoVertical) + Me.grpLegendPosition.Controls.Add(Me.ucrPnlDirection) + Me.grpLegendPosition.Controls.Add(Me.ucrChkReverse) + Me.grpLegendPosition.Controls.Add(Me.ucrChkDirection) + Me.grpLegendPosition.Controls.Add(Me.ucrNudY) + Me.grpLegendPosition.Controls.Add(Me.rdoCoordinates) + Me.grpLegendPosition.Controls.Add(Me.ucrNudX) + Me.grpLegendPosition.Controls.Add(Me.rdoSpecific) + Me.grpLegendPosition.Controls.Add(Me.lblYCoord) + Me.grpLegendPosition.Controls.Add(Me.ucrPnlOptions) + Me.grpLegendPosition.Controls.Add(Me.lblXCoord) + Me.grpLegendPosition.Controls.Add(Me.ucrInputLegendPosition) + Me.grpLegendPosition.Controls.Add(Me.lblLegendPosition) + Me.grpLegendPosition.Location = New System.Drawing.Point(6, 53) + Me.grpLegendPosition.Name = "grpLegendPosition" + Me.grpLegendPosition.Size = New System.Drawing.Size(413, 146) + Me.grpLegendPosition.TabIndex = 6 + Me.grpLegendPosition.TabStop = False + Me.grpLegendPosition.Text = "Legend Position" + ' + 'rdoColour + ' + Me.rdoColour.AutoSize = True + Me.rdoColour.Location = New System.Drawing.Point(244, 84) + Me.rdoColour.Name = "rdoColour" + Me.rdoColour.Size = New System.Drawing.Size(55, 17) + Me.rdoColour.TabIndex = 341 + Me.rdoColour.TabStop = True + Me.rdoColour.Text = "Colour" + Me.rdoColour.UseVisualStyleBackColor = True + ' + 'rdoFill + ' + Me.rdoFill.AutoSize = True + Me.rdoFill.Location = New System.Drawing.Point(119, 84) + Me.rdoFill.Name = "rdoFill" + Me.rdoFill.Size = New System.Drawing.Size(37, 17) + Me.rdoFill.TabIndex = 340 + Me.rdoFill.TabStop = True + Me.rdoFill.Text = "Fill" + Me.rdoFill.UseVisualStyleBackColor = True + ' + 'rdoHorizontal + ' + Me.rdoHorizontal.AutoSize = True + Me.rdoHorizontal.Location = New System.Drawing.Point(244, 112) + Me.rdoHorizontal.Name = "rdoHorizontal" + Me.rdoHorizontal.Size = New System.Drawing.Size(72, 17) + Me.rdoHorizontal.TabIndex = 338 + Me.rdoHorizontal.TabStop = True + Me.rdoHorizontal.Text = "Horizontal" + Me.rdoHorizontal.UseVisualStyleBackColor = True + ' + 'rdoVertical + ' + Me.rdoVertical.AutoSize = True + Me.rdoVertical.Location = New System.Drawing.Point(119, 112) + Me.rdoVertical.Name = "rdoVertical" + Me.rdoVertical.Size = New System.Drawing.Size(60, 17) + Me.rdoVertical.TabIndex = 337 + Me.rdoVertical.TabStop = True + Me.rdoVertical.Text = "Vertical" + Me.rdoVertical.UseVisualStyleBackColor = True + ' + 'rdoCoordinates + ' + Me.rdoCoordinates.AutoSize = True + Me.rdoCoordinates.Location = New System.Drawing.Point(195, 22) + Me.rdoCoordinates.Name = "rdoCoordinates" + Me.rdoCoordinates.Size = New System.Drawing.Size(81, 17) + Me.rdoCoordinates.TabIndex = 329 + Me.rdoCoordinates.TabStop = True + Me.rdoCoordinates.Text = "Coordinates" + Me.rdoCoordinates.UseVisualStyleBackColor = True + ' + 'rdoSpecific + ' + Me.rdoSpecific.AutoSize = True + Me.rdoSpecific.Location = New System.Drawing.Point(10, 22) + Me.rdoSpecific.Name = "rdoSpecific" + Me.rdoSpecific.Size = New System.Drawing.Size(63, 17) + Me.rdoSpecific.TabIndex = 328 + Me.rdoSpecific.TabStop = True + Me.rdoSpecific.Text = "Specific" + Me.rdoSpecific.UseVisualStyleBackColor = True + ' + 'lblYCoord + ' + Me.lblYCoord.AutoSize = True + Me.lblYCoord.Location = New System.Drawing.Point(329, 52) + Me.lblYCoord.Name = "lblYCoord" + Me.lblYCoord.Size = New System.Drawing.Size(15, 13) + Me.lblYCoord.TabIndex = 8 + Me.lblYCoord.Text = "y:" + ' + 'lblXCoord + ' + Me.lblXCoord.AutoSize = True + Me.lblXCoord.Location = New System.Drawing.Point(239, 52) + Me.lblXCoord.Name = "lblXCoord" + Me.lblXCoord.Size = New System.Drawing.Size(15, 13) + Me.lblXCoord.TabIndex = 7 + Me.lblXCoord.Text = "x:" + ' + 'lblLegendPosition + ' + Me.lblLegendPosition.AutoSize = True + Me.lblLegendPosition.Location = New System.Drawing.Point(6, 52) + Me.lblLegendPosition.Name = "lblLegendPosition" + Me.lblLegendPosition.Size = New System.Drawing.Size(47, 13) + Me.lblLegendPosition.TabIndex = 1 + Me.lblLegendPosition.Text = "Position:" + ' + 'ucrBaseSubdialog + ' + Me.ucrBaseSubdialog.AutoSize = True + Me.ucrBaseSubdialog.Location = New System.Drawing.Point(160, 495) + Me.ucrBaseSubdialog.Name = "ucrBaseSubdialog" + Me.ucrBaseSubdialog.Size = New System.Drawing.Size(224, 30) + Me.ucrBaseSubdialog.TabIndex = 2 + ' 'ucrThemeTitleYAxis ' Me.ucrThemeTitleYAxis.AutoSize = True @@ -121,19 +316,6 @@ Partial Class sdgThemesSub Me.ucrPlotTitle.Size = New System.Drawing.Size(255, 226) Me.ucrPlotTitle.TabIndex = 1 ' - 'tbLabels - ' - Me.tbLabels.Controls.Add(Me.ucrThemeLeftYAxis) - Me.tbLabels.Controls.Add(Me.ucrThemeBottomXAxis) - Me.tbLabels.Controls.Add(Me.ucrThemeAxesTickLabels) - Me.tbLabels.Location = New System.Drawing.Point(4, 22) - Me.tbLabels.Name = "tbLabels" - Me.tbLabels.Padding = New System.Windows.Forms.Padding(3) - Me.tbLabels.Size = New System.Drawing.Size(519, 461) - Me.tbLabels.TabIndex = 1 - Me.tbLabels.Text = "Labels" - Me.tbLabels.UseVisualStyleBackColor = True - ' 'ucrThemeLeftYAxis ' Me.ucrThemeLeftYAxis.AutoSize = True @@ -158,21 +340,6 @@ Partial Class sdgThemesSub Me.ucrThemeAxesTickLabels.Size = New System.Drawing.Size(255, 228) Me.ucrThemeAxesTickLabels.TabIndex = 2 ' - 'tbAxes - ' - Me.tbAxes.Controls.Add(Me.ucrYAxisLines) - Me.tbAxes.Controls.Add(Me.ucrTickMarksYAxis) - Me.tbAxes.Controls.Add(Me.ucrXAxisLines) - Me.tbAxes.Controls.Add(Me.ucrTickMarksXAxis) - Me.tbAxes.Controls.Add(Me.ucrThemeAxesLines) - Me.tbAxes.Controls.Add(Me.ucrTickMarksAxes) - Me.tbAxes.Location = New System.Drawing.Point(4, 22) - Me.tbAxes.Name = "tbAxes" - Me.tbAxes.Size = New System.Drawing.Size(519, 461) - Me.tbAxes.TabIndex = 2 - Me.tbAxes.Text = "Axes" - Me.tbAxes.UseVisualStyleBackColor = True - ' 'ucrYAxisLines ' Me.ucrYAxisLines.AutoSize = True @@ -221,18 +388,6 @@ Partial Class sdgThemesSub Me.ucrTickMarksAxes.Size = New System.Drawing.Size(257, 122) Me.ucrTickMarksAxes.TabIndex = 4 ' - 'tbPanel - ' - Me.tbPanel.Controls.Add(Me.ucrPanelGridMinor) - Me.tbPanel.Controls.Add(Me.ucrPanelGridMajor) - Me.tbPanel.Controls.Add(Me.ucrPanelGrid) - Me.tbPanel.Location = New System.Drawing.Point(4, 22) - Me.tbPanel.Name = "tbPanel" - Me.tbPanel.Size = New System.Drawing.Size(519, 461) - Me.tbPanel.TabIndex = 3 - Me.tbPanel.Text = "Grid Lines" - Me.tbPanel.UseVisualStyleBackColor = True - ' 'ucrPanelGridMinor ' Me.ucrPanelGridMinor.AutoSize = True @@ -257,17 +412,6 @@ Partial Class sdgThemesSub Me.ucrPanelGrid.Size = New System.Drawing.Size(254, 124) Me.ucrPanelGrid.TabIndex = 2 ' - 'tbBackground - ' - Me.tbBackground.Controls.Add(Me.ucrPanelBackground) - Me.tbBackground.Controls.Add(Me.ucrPanelBorder) - Me.tbBackground.Location = New System.Drawing.Point(4, 22) - Me.tbBackground.Name = "tbBackground" - Me.tbBackground.Size = New System.Drawing.Size(519, 461) - Me.tbBackground.TabIndex = 4 - Me.tbBackground.Text = "Panel" - Me.tbBackground.UseVisualStyleBackColor = True - ' 'ucrPanelBackground ' Me.ucrPanelBackground.AutoSize = True @@ -284,150 +428,93 @@ Partial Class sdgThemesSub Me.ucrPanelBorder.Size = New System.Drawing.Size(253, 132) Me.ucrPanelBorder.TabIndex = 0 ' - 'tbLegend - ' - Me.tbLegend.Controls.Add(Me.GroupBox1) - Me.tbLegend.Controls.Add(Me.grpLegendPosition) - Me.tbLegend.Controls.Add(Me.ucrChkRemoveLegend) - Me.tbLegend.Location = New System.Drawing.Point(4, 22) - Me.tbLegend.Name = "tbLegend" - Me.tbLegend.Size = New System.Drawing.Size(519, 461) - Me.tbLegend.TabIndex = 5 - Me.tbLegend.Text = "Legend" - Me.tbLegend.UseVisualStyleBackColor = True - ' - 'GroupBox1 - ' - Me.GroupBox1.Controls.Add(Me.ucrChkLegTitleTextSize) - Me.GroupBox1.Location = New System.Drawing.Point(6, 126) - Me.GroupBox1.Name = "GroupBox1" - Me.GroupBox1.Size = New System.Drawing.Size(413, 100) - Me.GroupBox1.TabIndex = 4 - Me.GroupBox1.TabStop = False - Me.GroupBox1.Text = "GroupBox1" - ' - 'ucrChkLegTitleTextSize - ' - Me.ucrChkLegTitleTextSize.AutoSize = True - Me.ucrChkLegTitleTextSize.Checked = False - Me.ucrChkLegTitleTextSize.Location = New System.Drawing.Point(3, 19) - Me.ucrChkLegTitleTextSize.Name = "ucrChkLegTitleTextSize" - Me.ucrChkLegTitleTextSize.Size = New System.Drawing.Size(100, 23) - Me.ucrChkLegTitleTextSize.TabIndex = 5 - ' - 'grpLegendPosition - ' - Me.grpLegendPosition.Controls.Add(Me.lblYCoord) - Me.grpLegendPosition.Controls.Add(Me.lblXCoord) - Me.grpLegendPosition.Controls.Add(Me.UcrNud2) - Me.grpLegendPosition.Controls.Add(Me.UcrNud1) - Me.grpLegendPosition.Controls.Add(Me.ucRdoCoordinated) - Me.grpLegendPosition.Controls.Add(Me.ucrrdoSpecific) - Me.grpLegendPosition.Controls.Add(Me.UcrInputComboBox1) - Me.grpLegendPosition.Controls.Add(Me.lblLegendPosition) - Me.grpLegendPosition.Location = New System.Drawing.Point(6, 36) - Me.grpLegendPosition.Name = "grpLegendPosition" - Me.grpLegendPosition.Size = New System.Drawing.Size(413, 84) - Me.grpLegendPosition.TabIndex = 3 - Me.grpLegendPosition.TabStop = False - Me.grpLegendPosition.Text = "Legend Position" - ' - 'lblYCoord - ' - Me.lblYCoord.AutoSize = True - Me.lblYCoord.Location = New System.Drawing.Point(329, 52) - Me.lblYCoord.Name = "lblYCoord" - Me.lblYCoord.Size = New System.Drawing.Size(15, 13) - Me.lblYCoord.TabIndex = 8 - Me.lblYCoord.Text = "y:" - ' - 'lblXCoord - ' - Me.lblXCoord.AutoSize = True - Me.lblXCoord.Location = New System.Drawing.Point(239, 52) - Me.lblXCoord.Name = "lblXCoord" - Me.lblXCoord.Size = New System.Drawing.Size(15, 13) - Me.lblXCoord.TabIndex = 7 - Me.lblXCoord.Text = "x:" - ' - 'UcrNud2 - ' - Me.UcrNud2.AutoSize = True - Me.UcrNud2.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) - Me.UcrNud2.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.UcrNud2.Location = New System.Drawing.Point(348, 52) - Me.UcrNud2.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) - Me.UcrNud2.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) - Me.UcrNud2.Name = "UcrNud2" - Me.UcrNud2.Size = New System.Drawing.Size(50, 20) - Me.UcrNud2.TabIndex = 6 - Me.UcrNud2.Value = New Decimal(New Integer() {0, 0, 0, 0}) - ' - 'UcrNud1 - ' - Me.UcrNud1.AutoSize = True - Me.UcrNud1.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) - Me.UcrNud1.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.UcrNud1.Location = New System.Drawing.Point(258, 51) - Me.UcrNud1.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) - Me.UcrNud1.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) - Me.UcrNud1.Name = "UcrNud1" - Me.UcrNud1.Size = New System.Drawing.Size(50, 20) - Me.UcrNud1.TabIndex = 4 - Me.UcrNud1.Value = New Decimal(New Integer() {0, 0, 0, 0}) - ' - 'ucRdoCoordinated - ' - Me.ucRdoCoordinated.AutoSize = True - Me.ucRdoCoordinated.Location = New System.Drawing.Point(220, 19) - Me.ucRdoCoordinated.Name = "ucRdoCoordinated" - Me.ucRdoCoordinated.Size = New System.Drawing.Size(100, 20) - Me.ucRdoCoordinated.TabIndex = 5 - ' - 'ucrrdoSpecific - ' - Me.ucrrdoSpecific.AutoSize = True - Me.ucrrdoSpecific.Location = New System.Drawing.Point(9, 19) - Me.ucrrdoSpecific.Name = "ucrrdoSpecific" - Me.ucrrdoSpecific.Size = New System.Drawing.Size(100, 20) - Me.ucrrdoSpecific.TabIndex = 4 - ' - 'UcrInputComboBox1 - ' - Me.UcrInputComboBox1.AddQuotesIfUnrecognised = True - Me.UcrInputComboBox1.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.UcrInputComboBox1.GetSetSelectedIndex = -1 - Me.UcrInputComboBox1.IsReadOnly = False - Me.UcrInputComboBox1.Location = New System.Drawing.Point(59, 51) - Me.UcrInputComboBox1.Name = "UcrInputComboBox1" - Me.UcrInputComboBox1.Size = New System.Drawing.Size(137, 21) - Me.UcrInputComboBox1.TabIndex = 0 - ' - 'lblLegendPosition - ' - Me.lblLegendPosition.AutoSize = True - Me.lblLegendPosition.Location = New System.Drawing.Point(6, 52) - Me.lblLegendPosition.Name = "lblLegendPosition" - Me.lblLegendPosition.Size = New System.Drawing.Size(47, 13) - Me.lblLegendPosition.TabIndex = 1 - Me.lblLegendPosition.Text = "Position:" - ' - 'ucrChkRemoveLegend - ' - Me.ucrChkRemoveLegend.AutoSize = True - Me.ucrChkRemoveLegend.Checked = False - Me.ucrChkRemoveLegend.Location = New System.Drawing.Point(9, 10) - Me.ucrChkRemoveLegend.Name = "ucrChkRemoveLegend" - Me.ucrChkRemoveLegend.Size = New System.Drawing.Size(100, 23) - Me.ucrChkRemoveLegend.TabIndex = 2 - ' - 'ucrBaseSubdialog - ' - Me.ucrBaseSubdialog.AutoSize = True - Me.ucrBaseSubdialog.Location = New System.Drawing.Point(160, 495) - Me.ucrBaseSubdialog.Name = "ucrBaseSubdialog" - Me.ucrBaseSubdialog.Size = New System.Drawing.Size(224, 30) - Me.ucrBaseSubdialog.TabIndex = 2 + 'ucrPnlReverse + ' + Me.ucrPnlReverse.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrPnlReverse.Location = New System.Drawing.Point(115, 81) + Me.ucrPnlReverse.Name = "ucrPnlReverse" + Me.ucrPnlReverse.Size = New System.Drawing.Size(281, 26) + Me.ucrPnlReverse.TabIndex = 339 + ' + 'ucrPnlDirection + ' + Me.ucrPnlDirection.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrPnlDirection.Location = New System.Drawing.Point(115, 109) + Me.ucrPnlDirection.Name = "ucrPnlDirection" + Me.ucrPnlDirection.Size = New System.Drawing.Size(281, 26) + Me.ucrPnlDirection.TabIndex = 336 + ' + 'ucrChkReverse + ' + Me.ucrChkReverse.AutoSize = True + Me.ucrChkReverse.Checked = False + Me.ucrChkReverse.Location = New System.Drawing.Point(9, 81) + Me.ucrChkReverse.Name = "ucrChkReverse" + Me.ucrChkReverse.Size = New System.Drawing.Size(100, 23) + Me.ucrChkReverse.TabIndex = 332 + ' + 'ucrChkDirection + ' + Me.ucrChkDirection.AutoSize = True + Me.ucrChkDirection.Checked = False + Me.ucrChkDirection.Location = New System.Drawing.Point(9, 112) + Me.ucrChkDirection.Name = "ucrChkDirection" + Me.ucrChkDirection.Size = New System.Drawing.Size(100, 23) + Me.ucrChkDirection.TabIndex = 331 + ' + 'ucrNudY + ' + Me.ucrNudY.AutoSize = True + Me.ucrNudY.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudY.Increment = New Decimal(New Integer() {1, 0, 0, 0}) + Me.ucrNudY.Location = New System.Drawing.Point(346, 52) + Me.ucrNudY.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) + Me.ucrNudY.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudY.Name = "ucrNudY" + Me.ucrNudY.Size = New System.Drawing.Size(50, 20) + Me.ucrNudY.TabIndex = 330 + Me.ucrNudY.Value = New Decimal(New Integer() {0, 0, 0, 0}) + ' + 'ucrNudX + ' + Me.ucrNudX.AutoSize = True + Me.ucrNudX.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudX.Increment = New Decimal(New Integer() {1, 0, 0, 0}) + Me.ucrNudX.Location = New System.Drawing.Point(259, 51) + Me.ucrNudX.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) + Me.ucrNudX.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudX.Name = "ucrNudX" + Me.ucrNudX.Size = New System.Drawing.Size(50, 20) + Me.ucrNudX.TabIndex = 7 + Me.ucrNudX.Value = New Decimal(New Integer() {0, 0, 0, 0}) + ' + 'ucrPnlOptions + ' + Me.ucrPnlOptions.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrPnlOptions.Location = New System.Drawing.Point(6, 19) + Me.ucrPnlOptions.Name = "ucrPnlOptions" + Me.ucrPnlOptions.Size = New System.Drawing.Size(356, 26) + Me.ucrPnlOptions.TabIndex = 327 + ' + 'ucrInputLegendPosition + ' + Me.ucrInputLegendPosition.AddQuotesIfUnrecognised = True + Me.ucrInputLegendPosition.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrInputLegendPosition.GetSetSelectedIndex = -1 + Me.ucrInputLegendPosition.IsReadOnly = False + Me.ucrInputLegendPosition.Location = New System.Drawing.Point(59, 51) + Me.ucrInputLegendPosition.Name = "ucrInputLegendPosition" + Me.ucrInputLegendPosition.Size = New System.Drawing.Size(137, 21) + Me.ucrInputLegendPosition.TabIndex = 0 + ' + 'ucrChkAddLegend + ' + Me.ucrChkAddLegend.AutoSize = True + Me.ucrChkAddLegend.Checked = False + Me.ucrChkAddLegend.Location = New System.Drawing.Point(15, 19) + Me.ucrChkAddLegend.Name = "ucrChkAddLegend" + Me.ucrChkAddLegend.Size = New System.Drawing.Size(100, 23) + Me.ucrChkAddLegend.TabIndex = 332 ' 'sdgThemesSub ' @@ -457,8 +544,6 @@ Partial Class sdgThemesSub Me.tbBackground.PerformLayout() Me.tbLegend.ResumeLayout(False) Me.tbLegend.PerformLayout() - Me.GroupBox1.ResumeLayout(False) - Me.GroupBox1.PerformLayout() Me.grpLegendPosition.ResumeLayout(False) Me.grpLegendPosition.PerformLayout() Me.ResumeLayout(False) @@ -490,17 +575,24 @@ Partial Class sdgThemesSub Friend WithEvents ucrPanelGridMinor As ucrElementLineControl Friend WithEvents ucrPanelBackground As ucrElementRectControl Friend WithEvents ucrPanelBorder As ucrElementRectControl + Friend WithEvents ucrBaseSubdialog As ucrButtonsSubdialogue Friend WithEvents grpLegendPosition As GroupBox Friend WithEvents lblYCoord As Label Friend WithEvents lblXCoord As Label - Friend WithEvents UcrNud2 As ucrNud - Friend WithEvents UcrNud1 As ucrNud - Friend WithEvents ucRdoCoordinated As ucrRadio - Friend WithEvents ucrrdoSpecific As ucrRadio - Friend WithEvents UcrInputComboBox1 As ucrInputComboBox + Friend WithEvents ucrInputLegendPosition As ucrInputComboBox Friend WithEvents lblLegendPosition As Label - Friend WithEvents ucrChkRemoveLegend As ucrCheck - Friend WithEvents GroupBox1 As GroupBox - Friend WithEvents ucrChkLegTitleTextSize As ucrCheck - Friend WithEvents ucrBaseSubdialog As ucrButtonsSubdialogue + Friend WithEvents ucrNudX As ucrNud + Friend WithEvents rdoCoordinates As RadioButton + Friend WithEvents rdoSpecific As RadioButton + Friend WithEvents ucrPnlOptions As UcrPanel + Friend WithEvents ucrNudY As ucrNud + Friend WithEvents ucrChkReverse As ucrCheck + Friend WithEvents ucrChkDirection As ucrCheck + Friend WithEvents rdoHorizontal As RadioButton + Friend WithEvents rdoVertical As RadioButton + Friend WithEvents ucrPnlDirection As UcrPanel + Friend WithEvents rdoColour As RadioButton + Friend WithEvents rdoFill As RadioButton + Friend WithEvents ucrPnlReverse As UcrPanel + Friend WithEvents ucrChkAddLegend As ucrCheck End Class diff --git a/instat/sdgThemesSub.vb b/instat/sdgThemesSub.vb index f88695f1513..1866ee51eb2 100644 --- a/instat/sdgThemesSub.vb +++ b/instat/sdgThemesSub.vb @@ -19,8 +19,8 @@ Imports instat.Translations Public Class sdgThemesSub Public bControlsInitialised As Boolean = False - Private clsThemesFunction, clsElementPlotTitle, clsAxesTitles, clsElementPanelGridMinor, clsElementPanelGridMajor, clsXElementTitle, clsYElementTitle, clsAllLabels, clsXAxisLables, clsYAxisLabels, clsAllTickMarks, clsXAxisTickMarks, clsYAxisTickMarks, clsUnitAxisTickLength, clsAllAxisLines, clsXAxisLine, clsYAxisLine, clsElementLineXAxis, clsElementLineYAxis As New RFunction - Private clsAllPanelGrid, clsPanelGridMajor, clsPanelGridMinor, clsPanelBackground, clsPanelBorder As New RFunction + Private clsThemesFunction, clsCFunction, clsGuideFunction1, clsGuideFunction, clsElementPlotTitle, clsAxesTitles, clsElementPanelGridMinor, clsElementPanelGridMajor, clsXElementTitle, clsYElementTitle, clsAllLabels, clsXAxisLables, clsYAxisLabels, clsAllTickMarks, clsXAxisTickMarks, clsYAxisTickMarks, clsUnitAxisTickLength, clsAllAxisLines, clsXAxisLine, clsYAxisLine, clsElementLineXAxis, clsElementLineYAxis As New RFunction + Private clsAllPanelGrid, clsPanelGridMajor, clsPanelGridMinor, clsDummyFunction, clsPanelBackground, clsPanelBorder As New RFunction Private clsBaseOperator As New ROperator Private dctThemeFunctions As New Dictionary(Of String, RFunction) Private clsThemesSubFunctions As New clsThemeSubFunctions @@ -28,11 +28,13 @@ Public Class sdgThemesSub Private Sub sdgThemesSub_Load(sender As Object, e As EventArgs) Handles MyBase.Load autoTranslate(Me) 'temp hidden as not yet implemented - tbLegend.Visible = False - tbLegend.Enabled = False + 'tbLegend.Visible = False + 'tbLegend.Enabled = False End Sub Public Sub InitialiseControls() + Dim dctLegendPosition As New Dictionary(Of String, String) + ucrPlotTitle.SetLabel("Plot Title") ucrThemeTitleXAxis.SetLabel("X-Axis Title") ucrThemeTitleYAxis.SetLabel("Y-Axis Title") @@ -53,19 +55,92 @@ Public Class sdgThemesSub ucrPanelGridMinor.SetLabel("Minor Grid Lines") ucrPanelBorder.SetLabel("Panel Border") ucrPanelBackground.SetLabel("Panel Background") - ucrChkRemoveLegend.SetText("Remove Legend") - ucRdoCoordinated.SetText("Coordinates") - ucrrdoSpecific.SetText("Specific") + + ucrPnlOptions.AddRadioButton(rdoCoordinates) + ucrPnlOptions.AddRadioButton(rdoSpecific) + ucrPnlOptions.AddParameterValuesCondition(rdoCoordinates, "legend", "coordinated") + ucrPnlOptions.AddParameterValuesCondition(rdoSpecific, "legend", "specific") + ucrPnlOptions.AddToLinkedControls(ucrNudY, {rdoCoordinates}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) + ucrPnlOptions.AddToLinkedControls(ucrNudX, {rdoCoordinates}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) + ucrPnlOptions.AddToLinkedControls(ucrInputLegendPosition, {rdoSpecific}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) + + ucrInputLegendPosition.SetDropDownStyleAsNonEditable() + ucrInputLegendPosition.SetParameter(New RParameter("legend.position")) + dctLegendPosition.Add("None", Chr(34) & "none" & Chr(34)) + dctLegendPosition.Add("Left", Chr(34) & "left" & Chr(34)) + dctLegendPosition.Add("Right", Chr(34) & "right" & Chr(34)) + dctLegendPosition.Add("Top", Chr(34) & "top" & Chr(34)) + dctLegendPosition.Add("Bottom", Chr(34) & "bottom" & Chr(34)) + ucrInputLegendPosition.SetItems(dctLegendPosition) + ucrInputLegendPosition.SetRDefault(Chr(34) & "None" & Chr(34)) + ucrInputLegendPosition.SetLinkedDisplayControl(lblLegendPosition) + + ucrNudX.SetParameter(New RParameter("x", 0, False)) + ucrNudX.SetMinMax(0, 1) + ucrNudX.DecimalPlaces = 2 + ucrNudX.Increment = 0.01 + ucrNudX.SetRDefault("0") + ucrNudX.SetLinkedDisplayControl(lblXCoord) + + ucrNudY.SetParameter(New RParameter("y", 1, False)) + ucrNudY.SetMinMax(0, 1) + ucrNudY.DecimalPlaces = 2 + ucrNudY.Increment = 0.01 + ucrNudY.SetRDefault("0") + ucrNudY.SetLinkedDisplayControl(lblYCoord) + + ucrPnlDirection.AddRadioButton(rdoVertical) + ucrPnlDirection.AddRadioButton(rdoHorizontal) + ucrPnlDirection.AddParameterValuesCondition(rdoVertical, "legend.direction", "Vertical") + ucrPnlDirection.AddParameterValuesCondition(rdoHorizontal, "legend.direction", "Horizontal") + + ucrPnlReverse.AddRadioButton(rdoColour) + ucrPnlReverse.AddRadioButton(rdoFill) + ucrPnlReverse.AddParameterValuesCondition(rdoColour, "checked", "Colour") + ucrPnlReverse.AddParameterValuesCondition(rdoFill, "checked", "Fill") + + ucrChkDirection.SetParameter(New RParameter("legend.direction", 8)) + ucrChkDirection.SetText("Direction") + ucrChkDirection.AddParameterPresentCondition(True, "legend.direction", True) + ucrChkDirection.AddParameterPresentCondition(False, "legend.direction", False) + ucrChkDirection.AddToLinkedControls(ucrPnlDirection, {True}, bNewLinkedHideIfParameterMissing:=True) + + ucrChkReverse.SetText("Reverse") + ucrChkReverse.SetParameter(New RParameter("guides", 4)) + ucrChkReverse.SetValuesCheckedAndUnchecked("TRUE", "FALSE") + ucrChkReverse.SetRDefault("FALSE") + ucrChkReverse.AddToLinkedControls(ucrPnlReverse, {True}, bNewLinkedHideIfParameterMissing:=True) + + ucrChkAddLegend.SetText("Include Legend") + ucrChkAddLegend.AddParameterPresentCondition(True, "legend", True) + ucrChkAddLegend.AddParameterPresentCondition(False, "legend", False) + ucrChkAddLegend.AddToLinkedControls(ucrChkDirection, {True}, bNewLinkedHideIfParameterMissing:=True) + ucrChkAddLegend.AddToLinkedControls(ucrChkReverse, {True}, bNewLinkedHideIfParameterMissing:=True) + ucrChkAddLegend.AddToLinkedControls(ucrPnlOptions, {True}, bNewLinkedHideIfParameterMissing:=True) + + grpLegendPosition.Hide() bControlsInitialised = True End Sub - Public Sub SetRCode(clsBaseOperator As ROperator, clsNewThemesFunction As RFunction, dctNewThemeFunctions As Dictionary(Of String, RFunction), Optional bReset As Boolean = False) + Public Sub SetRCode(clsNewBaseOperator As ROperator, clsNewGuideFunction As RFunction, clsNewGuideLegendFunction As RFunction, clsNewGuideFunction1 As RFunction, clsNewGuideLegendFunction1 As RFunction, clsNewThemesFunction As RFunction, dctNewThemeFunctions As Dictionary(Of String, RFunction), Optional bReset As Boolean = False) If Not bControlsInitialised Then InitialiseControls() End If + clsGuideFunction = clsNewGuideFunction + clsGuideFunction1 = clsNewGuideFunction1 + clsBaseOperator = clsNewBaseOperator + + clsDummyFunction = New RFunction + clsDummyFunction.AddParameter("legend", "coordinated", iPosition:=0) + clsDummyFunction.AddParameter("checked", "Fill", iPosition:=1) + clsDummyFunction.AddParameter("legend.direction", "Vertical", iPosition:=2) + + clsCFunction = New RFunction + clsCFunction.SetRCommand("c") + clsThemesFunction = clsNewThemesFunction ' The position MUST be larger than the position of the theme_* argument ' Otherwise the choice of theme will overwrite the options selected here. @@ -114,6 +189,64 @@ Public Class sdgThemesSub ucrPanelBorder.SetRCodeForControl("panel.border", clsThemesSubFunctions.clsElementBorder, clsNewThemeFunction:=clsThemesFunction, clsNewBaseOperator:=clsBaseOperator, bReset:=bReset) ucrPanelBackground.SetRCodeForControl("panel.background", clsThemesSubFunctions.clsElementPanelBackGround, clsNewThemeFunction:=clsThemesFunction, clsNewBaseOperator:=clsBaseOperator, bReset:=bReset) + + If bReset Then + ucrChkReverse.SetRCode(clsBaseOperator, bReset, bCloneIfNeeded:=True) + ucrChkAddLegend.SetRCode(clsBaseOperator, bReset, bCloneIfNeeded:=True) + ucrNudX.SetRCode(clsCFunction, bReset) + ucrNudY.SetRCode(clsCFunction, bReset) + ucrInputLegendPosition.SetRCode(clsThemesFunction, bReset, bCloneIfNeeded:=True) + ucrPnlOptions.SetRCode(clsDummyFunction, bReset, bCloneIfNeeded:=True) + ucrPnlReverse.SetRCode(clsDummyFunction, bReset, bCloneIfNeeded:=True) + ucrPnlDirection.SetRCode(clsDummyFunction, bReset, bCloneIfNeeded:=True) + ucrChkDirection.SetRCode(clsThemesFunction, bReset, bCloneIfNeeded:=True) + End If + End Sub + + Private Sub LegendOptions() + If rdoSpecific.Checked AndAlso Not ucrInputLegendPosition.IsEmpty Then + clsThemesFunction.AddParameter("legend.position", Chr(34) & ucrInputLegendPosition.GetText().ToLower() & Chr(34), iPosition:=0) + ElseIf rdoCoordinates.Checked AndAlso Not (ucrNudY.IsEmpty AndAlso ucrNudX.IsEmpty) Then + clsCFunction.AddParameter("x", ucrNudX.GetText(), iPosition:=0, bIncludeArgumentName:=False) + clsCFunction.AddParameter("y", ucrNudY.GetText(), iPosition:=1, bIncludeArgumentName:=False) + clsThemesFunction.AddParameter("legend.position", clsRFunctionParameter:=clsCFunction, iPosition:=0) + End If + End Sub + + Private Sub ucrPnlOptions_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrPnlOptions.ControlValueChanged, ucrInputLegendPosition.ControlValueChanged + LegendOptions() + End Sub + + Private Sub ucrNudX_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrNudX.ControlValueChanged, ucrNudY.ControlValueChanged + LegendOptions() + End Sub + + Private Sub ucrChkReverse_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkReverse.ControlValueChanged, ucrPnlReverse.ControlValueChanged + clsBaseOperator.RemoveParameterByName("guides") + clsBaseOperator.RemoveParameterByName("guides1") + If ucrChkReverse.Checked Then + If rdoFill.Checked Then + clsBaseOperator.AddParameter("guides", clsRFunctionParameter:=clsGuideFunction) + Else + clsBaseOperator.AddParameter("guides1", clsRFunctionParameter:=clsGuideFunction1) + End If + End If + End Sub + + Private Sub ucrChkDirection_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkDirection.ControlValueChanged, ucrPnlDirection.ControlValueChanged + If ucrChkDirection.Checked Then + If rdoVertical.Checked Then + clsThemesFunction.AddParameter("legend.direction", Chr(34) & "vertical" & Chr(34), iPosition:=1) + Else + clsThemesFunction.AddParameter("legend.direction", Chr(34) & "horizontal" & Chr(34), iPosition:=1) + End If + Else + clsThemesFunction.RemoveParameterByName("legend.direction") + End If + End Sub + + Private Sub ucrChkAddLegend_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkAddLegend.ControlValueChanged + grpLegendPosition.Visible = ucrChkAddLegend.Checked End Sub End Class diff --git a/instat/ucrCalculator.Designer.vb b/instat/ucrCalculator.Designer.vb index f52022d6196..06205839228 100644 --- a/instat/ucrCalculator.Designer.vb +++ b/instat/ucrCalculator.Designer.vb @@ -86,7 +86,6 @@ Partial Class ucrCalculator Me.cmdMdy = New System.Windows.Forms.Button() Me.cmdYmd = New System.Windows.Forms.Button() Me.cmdLeap = New System.Windows.Forms.Button() - Me.cmdRHelp = New instat.ucrSplitButton() Me.ContextMenuStripDate = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.DateLubridateToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.DateHmsToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() @@ -124,7 +123,6 @@ Partial Class ucrCalculator Me.cmdGCD = New System.Windows.Forms.Button() Me.cmdGeneratePrimes = New System.Windows.Forms.Button() Me.cmdNthPrime = New System.Windows.Forms.Button() - Me.cmdIntegerRHelp = New instat.ucrSplitButton() Me.ContextMenuStripInteger = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.GmpToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.DescToolsToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() @@ -147,7 +145,6 @@ Partial Class ucrCalculator Me.cmdIsPrime = New System.Windows.Forms.Button() Me.cmdBigZ = New System.Windows.Forms.Button() Me.grpFactor = New System.Windows.Forms.GroupBox() - Me.cmdTransformHelp = New instat.ucrSplitButton() Me.ContextMenuStripFactor = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.FactorForcatsToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.cmdShuffle = New System.Windows.Forms.Button() @@ -171,7 +168,6 @@ Partial Class ucrCalculator Me.cmdFactor = New System.Windows.Forms.Button() Me.cmdAnon = New System.Windows.Forms.Button() Me.grpHydroGOF = New System.Windows.Forms.GroupBox() - Me.cmdHydroHelp = New instat.ucrSplitButton() Me.ContextMenuStripHydroGOF = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.HydroGOFToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.cmdVE = New System.Windows.Forms.Button() @@ -252,7 +248,6 @@ Partial Class ucrCalculator Me.cmdGroup = New System.Windows.Forms.Button() Me.cmdGrade = New System.Windows.Forms.Button() Me.grpMaths = New System.Windows.Forms.GroupBox() - Me.cmdMathsHelp = New instat.ucrSplitButton() Me.ContextMenuStripMaths = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.MathsBaseStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.MathsStatsStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() @@ -286,7 +281,6 @@ Partial Class ucrCalculator Me.cmdwhichmax = New System.Windows.Forms.Button() Me.cmdwheremax = New System.Windows.Forms.Button() Me.cmdwhichmin = New System.Windows.Forms.Button() - Me.cmdSummaryRHelp = New instat.ucrSplitButton() Me.ContextMenuStripSummary = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.BaseToolStripMenuItem1 = New System.Windows.Forms.ToolStripMenuItem() Me.StatsToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() @@ -340,7 +334,6 @@ Partial Class ucrCalculator Me.cmdFreqLength = New System.Windows.Forms.Button() Me.grpProbabilty = New System.Windows.Forms.GroupBox() Me.cmdPascal = New System.Windows.Forms.Button() - Me.cmdProbRHelp = New instat.ucrSplitButton() Me.ContextMenuStripProbability = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.ProbStatsToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.ProbBaseToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() @@ -389,7 +382,6 @@ Partial Class ucrCalculator Me.cmdDecimals = New System.Windows.Forms.Button() Me.cmdMASSFractions = New System.Windows.Forms.Button() Me.cmdScale = New System.Windows.Forms.Button() - Me.cmdTransformRHelp = New instat.ucrSplitButton() Me.ContextMenuStripTransform = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.BaseToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.DplyrToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() @@ -424,13 +416,16 @@ Partial Class ucrCalculator Me.cmdLead = New System.Windows.Forms.Button() Me.cmdLag = New System.Windows.Forms.Button() Me.grpLogical = New System.Windows.Forms.GroupBox() - Me.cmdLogicalHelp = New instat.ucrSplitButton() + Me.cmdnumeric = New System.Windows.Forms.Button() + Me.cmdCalcRepelicationFunction = New System.Windows.Forms.Button() + Me.cmdCalcSequenceFunction = New System.Windows.Forms.Button() + Me.cmdCalcConcantenateFunction = New System.Windows.Forms.Button() Me.ContextMenuStripLogical = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.LogBaseToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.LogDplyrToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.cmdFalse = New System.Windows.Forms.Button() Me.cmdTrue = New System.Windows.Forms.Button() - Me.cmdDoubleSqrBrackets = New System.Windows.Forms.Button() + Me.cmdTilde = New System.Windows.Forms.Button() Me.cmdIn = New System.Windows.Forms.Button() Me.cmdWhich = New System.Windows.Forms.Button() Me.cmdNA = New System.Windows.Forms.Button() @@ -488,7 +483,6 @@ Partial Class ucrCalculator Me.cmdSquishb = New System.Windows.Forms.Button() Me.ttCalculator = New System.Windows.Forms.ToolTip(Me.components) Me.grpCircular = New System.Windows.Forms.GroupBox() - Me.cmdCircularHelp = New instat.ucrSplitButton() Me.ContextMenuStripCircular = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.CircularToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.cmdCircular = New System.Windows.Forms.Button() @@ -534,7 +528,6 @@ Partial Class ucrCalculator Me.cmdComplexAcos = New System.Windows.Forms.Button() Me.cmdAsComplex = New System.Windows.Forms.Button() Me.cmdComplexi = New System.Windows.Forms.Button() - Me.cmdComplexRHelp = New instat.ucrSplitButton() Me.cmdComplexTanH = New System.Windows.Forms.Button() Me.cmdComplexTan = New System.Windows.Forms.Button() Me.cmdComplexPi = New System.Windows.Forms.Button() @@ -625,6 +618,17 @@ Partial Class ucrCalculator Me.ucrInputCalOptions = New instat.ucrInputComboBox() Me.ucrSelectorForCalculations = New instat.ucrSelectorByDataFrameAddRemove() Me.ucrReceiverForCalculation = New instat.ucrReceiverExpression() + Me.cmdLogicalHelp = New instat.ucrSplitButton() + Me.cmdRHelp = New instat.ucrSplitButton() + Me.cmdHydroHelp = New instat.ucrSplitButton() + Me.cmdTransformHelp = New instat.ucrSplitButton() + Me.cmdCircularHelp = New instat.ucrSplitButton() + Me.cmdMathsHelp = New instat.ucrSplitButton() + Me.cmdProbRHelp = New instat.ucrSplitButton() + Me.cmdIntegerRHelp = New instat.ucrSplitButton() + Me.cmdComplexRHelp = New instat.ucrSplitButton() + Me.cmdSummaryRHelp = New instat.ucrSplitButton() + Me.cmdTransformRHelp = New instat.ucrSplitButton() Me.grpBasic.SuspendLayout Me.grpDates.SuspendLayout Me.ContextMenuStripDate.SuspendLayout @@ -1220,18 +1224,6 @@ Partial Class ucrCalculator Me.cmdLeap.Text = "leap" Me.cmdLeap.UseVisualStyleBackColor = True ' - 'cmdRHelp - ' - Me.cmdRHelp.AutoSize = True - Me.cmdRHelp.ContextMenuStrip = Me.ContextMenuStripDate - Me.cmdRHelp.Location = New System.Drawing.Point(194, 248) - Me.cmdRHelp.Name = "cmdRHelp" - Me.cmdRHelp.Size = New System.Drawing.Size(113, 38) - Me.cmdRHelp.SplitMenuStrip = Me.ContextMenuStripDate - Me.cmdRHelp.TabIndex = 212 - Me.cmdRHelp.Text = "R Help" - Me.cmdRHelp.UseVisualStyleBackColor = True - ' 'ContextMenuStripDate ' Me.ContextMenuStripDate.ImageScalingSize = New System.Drawing.Size(24, 24) @@ -1625,18 +1617,6 @@ Partial Class ucrCalculator Me.cmdNthPrime.Text = "nth_prime" Me.cmdNthPrime.UseVisualStyleBackColor = True ' - 'cmdIntegerRHelp - ' - Me.cmdIntegerRHelp.AutoSize = True - Me.cmdIntegerRHelp.ContextMenuStrip = Me.ContextMenuStripInteger - Me.cmdIntegerRHelp.Location = New System.Drawing.Point(262, 354) - Me.cmdIntegerRHelp.Name = "cmdIntegerRHelp" - Me.cmdIntegerRHelp.Size = New System.Drawing.Size(113, 38) - Me.cmdIntegerRHelp.SplitMenuStrip = Me.ContextMenuStripInteger - Me.cmdIntegerRHelp.TabIndex = 16 - Me.cmdIntegerRHelp.Text = "R Help" - Me.cmdIntegerRHelp.UseVisualStyleBackColor = True - ' 'ContextMenuStripInteger ' Me.ContextMenuStripInteger.ImageScalingSize = New System.Drawing.Size(24, 24) @@ -1842,18 +1822,6 @@ Partial Class ucrCalculator Me.grpFactor.TabStop = False Me.grpFactor.Text = "Factor" ' - 'cmdTransformHelp - ' - Me.cmdTransformHelp.AutoSize = True - Me.cmdTransformHelp.ContextMenuStrip = Me.ContextMenuStripFactor - Me.cmdTransformHelp.Location = New System.Drawing.Point(188, 218) - Me.cmdTransformHelp.Name = "cmdTransformHelp" - Me.cmdTransformHelp.Size = New System.Drawing.Size(113, 38) - Me.cmdTransformHelp.SplitMenuStrip = Me.ContextMenuStripFactor - Me.cmdTransformHelp.TabIndex = 212 - Me.cmdTransformHelp.Text = "R Help" - Me.cmdTransformHelp.UseVisualStyleBackColor = True - ' 'ContextMenuStripFactor ' Me.ContextMenuStripFactor.ImageScalingSize = New System.Drawing.Size(24, 24) @@ -2120,18 +2088,6 @@ Partial Class ucrCalculator Me.grpHydroGOF.TabStop = False Me.grpHydroGOF.Text = "hydroGOF " ' - 'cmdHydroHelp - ' - Me.cmdHydroHelp.AutoSize = True - Me.cmdHydroHelp.ContextMenuStrip = Me.ContextMenuStripHydroGOF - Me.cmdHydroHelp.Location = New System.Drawing.Point(113, 298) - Me.cmdHydroHelp.Name = "cmdHydroHelp" - Me.cmdHydroHelp.Size = New System.Drawing.Size(108, 38) - Me.cmdHydroHelp.SplitMenuStrip = Me.ContextMenuStripHydroGOF - Me.cmdHydroHelp.TabIndex = 212 - Me.cmdHydroHelp.Text = "R Help" - Me.cmdHydroHelp.UseVisualStyleBackColor = True - ' 'ContextMenuStripHydroGOF ' Me.ContextMenuStripHydroGOF.ImageScalingSize = New System.Drawing.Size(24, 24) @@ -3080,18 +3036,6 @@ Partial Class ucrCalculator Me.grpMaths.TabStop = False Me.grpMaths.Text = "Maths" ' - 'cmdMathsHelp - ' - Me.cmdMathsHelp.AutoSize = True - Me.cmdMathsHelp.ContextMenuStrip = Me.ContextMenuStripMaths - Me.cmdMathsHelp.Location = New System.Drawing.Point(204, 165) - Me.cmdMathsHelp.Name = "cmdMathsHelp" - Me.cmdMathsHelp.Size = New System.Drawing.Size(108, 38) - Me.cmdMathsHelp.SplitMenuStrip = Me.ContextMenuStripMaths - Me.cmdMathsHelp.TabIndex = 211 - Me.cmdMathsHelp.Text = "R Help" - Me.cmdMathsHelp.UseVisualStyleBackColor = True - ' 'ContextMenuStripMaths ' Me.ContextMenuStripMaths.ImageScalingSize = New System.Drawing.Size(24, 24) @@ -3470,18 +3414,6 @@ Partial Class ucrCalculator Me.cmdwhichmin.Text = "which.min" Me.cmdwhichmin.UseVisualStyleBackColor = True ' - 'cmdSummaryRHelp - ' - Me.cmdSummaryRHelp.AutoSize = True - Me.cmdSummaryRHelp.ContextMenuStrip = Me.ContextMenuStripSummary - Me.cmdSummaryRHelp.Location = New System.Drawing.Point(228, 238) - Me.cmdSummaryRHelp.Name = "cmdSummaryRHelp" - Me.cmdSummaryRHelp.Size = New System.Drawing.Size(113, 38) - Me.cmdSummaryRHelp.SplitMenuStrip = Me.ContextMenuStripSummary - Me.cmdSummaryRHelp.TabIndex = 185 - Me.cmdSummaryRHelp.Text = "R Help" - Me.cmdSummaryRHelp.UseVisualStyleBackColor = True - ' 'ContextMenuStripSummary ' Me.ContextMenuStripSummary.ImageScalingSize = New System.Drawing.Size(24, 24) @@ -4104,18 +4036,6 @@ Partial Class ucrCalculator Me.cmdPascal.Text = "pascal" Me.cmdPascal.UseVisualStyleBackColor = True ' - 'cmdProbRHelp - ' - Me.cmdProbRHelp.AutoSize = True - Me.cmdProbRHelp.ContextMenuStrip = Me.ContextMenuStripProbability - Me.cmdProbRHelp.Location = New System.Drawing.Point(269, 239) - Me.cmdProbRHelp.Name = "cmdProbRHelp" - Me.cmdProbRHelp.Size = New System.Drawing.Size(108, 38) - Me.cmdProbRHelp.SplitMenuStrip = Me.ContextMenuStripProbability - Me.cmdProbRHelp.TabIndex = 212 - Me.cmdProbRHelp.Text = "R Help" - Me.cmdProbRHelp.UseVisualStyleBackColor = True - ' 'ContextMenuStripProbability ' Me.ContextMenuStripProbability.ImageScalingSize = New System.Drawing.Size(24, 24) @@ -4706,18 +4626,6 @@ Partial Class ucrCalculator Me.cmdScale.Text = "scale" Me.cmdScale.UseVisualStyleBackColor = True ' - 'cmdTransformRHelp - ' - Me.cmdTransformRHelp.AutoSize = True - Me.cmdTransformRHelp.ContextMenuStrip = Me.ContextMenuStripTransform - Me.cmdTransformRHelp.Location = New System.Drawing.Point(267, 245) - Me.cmdTransformRHelp.Name = "cmdTransformRHelp" - Me.cmdTransformRHelp.Size = New System.Drawing.Size(113, 38) - Me.cmdTransformRHelp.SplitMenuStrip = Me.ContextMenuStripTransform - Me.cmdTransformRHelp.TabIndex = 204 - Me.cmdTransformRHelp.Text = "R Help" - Me.cmdTransformRHelp.UseVisualStyleBackColor = True - ' 'ContextMenuStripTransform ' Me.ContextMenuStripTransform.ImageScalingSize = New System.Drawing.Size(24, 24) @@ -5033,10 +4941,14 @@ Partial Class ucrCalculator ' 'grpLogical ' + Me.grpLogical.Controls.Add(Me.cmdnumeric) + Me.grpLogical.Controls.Add(Me.cmdCalcRepelicationFunction) + Me.grpLogical.Controls.Add(Me.cmdCalcSequenceFunction) + Me.grpLogical.Controls.Add(Me.cmdCalcConcantenateFunction) Me.grpLogical.Controls.Add(Me.cmdLogicalHelp) Me.grpLogical.Controls.Add(Me.cmdFalse) Me.grpLogical.Controls.Add(Me.cmdTrue) - Me.grpLogical.Controls.Add(Me.cmdDoubleSqrBrackets) + Me.grpLogical.Controls.Add(Me.cmdTilde) Me.grpLogical.Controls.Add(Me.cmdIn) Me.grpLogical.Controls.Add(Me.cmdWhich) Me.grpLogical.Controls.Add(Me.cmdNA) @@ -5068,22 +4980,57 @@ Partial Class ucrCalculator Me.grpLogical.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.grpLogical.Name = "grpLogical" Me.grpLogical.Padding = New System.Windows.Forms.Padding(2, 3, 2, 3) - Me.grpLogical.Size = New System.Drawing.Size(322, 276) + Me.grpLogical.Size = New System.Drawing.Size(322, 320) Me.grpLogical.TabIndex = 183 Me.grpLogical.TabStop = False Me.grpLogical.Text = "Logical and Symbols" ' - 'cmdLogicalHelp - ' - Me.cmdLogicalHelp.AutoSize = True - Me.cmdLogicalHelp.ContextMenuStrip = Me.ContextMenuStripLogical - Me.cmdLogicalHelp.Location = New System.Drawing.Point(207, 234) - Me.cmdLogicalHelp.Name = "cmdLogicalHelp" - Me.cmdLogicalHelp.Size = New System.Drawing.Size(108, 38) - Me.cmdLogicalHelp.SplitMenuStrip = Me.ContextMenuStripLogical - Me.cmdLogicalHelp.TabIndex = 212 - Me.cmdLogicalHelp.Text = "R Help" - Me.cmdLogicalHelp.UseVisualStyleBackColor = True + 'cmdnumeric + ' + Me.cmdnumeric.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.cmdnumeric.Location = New System.Drawing.Point(239, 234) + Me.cmdnumeric.Margin = New System.Windows.Forms.Padding(2, 4, 2, 4) + Me.cmdnumeric.Name = "cmdnumeric" + Me.cmdnumeric.Size = New System.Drawing.Size(78, 38) + Me.cmdnumeric.TabIndex = 216 + Me.cmdnumeric.Text = "numeric" + Me.cmdnumeric.UseVisualStyleBackColor = True + ' + 'cmdCalcRepelicationFunction + ' + Me.cmdCalcRepelicationFunction.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) + Me.cmdCalcRepelicationFunction.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.cmdCalcRepelicationFunction.Location = New System.Drawing.Point(5, 234) + Me.cmdCalcRepelicationFunction.Margin = New System.Windows.Forms.Padding(2, 4, 2, 4) + Me.cmdCalcRepelicationFunction.Name = "cmdCalcRepelicationFunction" + Me.cmdCalcRepelicationFunction.Size = New System.Drawing.Size(78, 38) + Me.cmdCalcRepelicationFunction.TabIndex = 215 + Me.cmdCalcRepelicationFunction.Text = "rep" + Me.cmdCalcRepelicationFunction.UseVisualStyleBackColor = True + ' + 'cmdCalcSequenceFunction + ' + Me.cmdCalcSequenceFunction.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) + Me.cmdCalcSequenceFunction.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.cmdCalcSequenceFunction.Location = New System.Drawing.Point(82, 234) + Me.cmdCalcSequenceFunction.Margin = New System.Windows.Forms.Padding(2, 4, 2, 4) + Me.cmdCalcSequenceFunction.Name = "cmdCalcSequenceFunction" + Me.cmdCalcSequenceFunction.Size = New System.Drawing.Size(78, 38) + Me.cmdCalcSequenceFunction.TabIndex = 214 + Me.cmdCalcSequenceFunction.Tag = "Del" + Me.cmdCalcSequenceFunction.Text = "seq" + Me.cmdCalcSequenceFunction.UseVisualStyleBackColor = True + ' + 'cmdCalcConcantenateFunction + ' + Me.cmdCalcConcantenateFunction.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.cmdCalcConcantenateFunction.Location = New System.Drawing.Point(159, 234) + Me.cmdCalcConcantenateFunction.Margin = New System.Windows.Forms.Padding(2, 4, 2, 4) + Me.cmdCalcConcantenateFunction.Name = "cmdCalcConcantenateFunction" + Me.cmdCalcConcantenateFunction.Size = New System.Drawing.Size(82, 38) + Me.cmdCalcConcantenateFunction.TabIndex = 213 + Me.cmdCalcConcantenateFunction.Text = "c( )" + Me.cmdCalcConcantenateFunction.UseVisualStyleBackColor = True ' 'ContextMenuStripLogical ' @@ -5107,7 +5054,7 @@ Partial Class ucrCalculator 'cmdFalse ' Me.cmdFalse.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdFalse.Location = New System.Drawing.Point(252, 52) + Me.cmdFalse.Location = New System.Drawing.Point(251, 52) Me.cmdFalse.Name = "cmdFalse" Me.cmdFalse.Size = New System.Drawing.Size(65, 38) Me.cmdFalse.TabIndex = 207 @@ -5117,28 +5064,28 @@ Partial Class ucrCalculator 'cmdTrue ' Me.cmdTrue.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdTrue.Location = New System.Drawing.Point(252, 17) + Me.cmdTrue.Location = New System.Drawing.Point(251, 17) Me.cmdTrue.Name = "cmdTrue" Me.cmdTrue.Size = New System.Drawing.Size(65, 38) Me.cmdTrue.TabIndex = 206 Me.cmdTrue.Text = "TRUE" Me.cmdTrue.UseVisualStyleBackColor = True ' - 'cmdDoubleSqrBrackets + 'cmdTilde ' - Me.cmdDoubleSqrBrackets.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdDoubleSqrBrackets.Location = New System.Drawing.Point(160, 88) - Me.cmdDoubleSqrBrackets.Margin = New System.Windows.Forms.Padding(2) - Me.cmdDoubleSqrBrackets.Name = "cmdDoubleSqrBrackets" - Me.cmdDoubleSqrBrackets.Size = New System.Drawing.Size(45, 38) - Me.cmdDoubleSqrBrackets.TabIndex = 205 - Me.cmdDoubleSqrBrackets.Text = "[[ ]]" - Me.cmdDoubleSqrBrackets.UseVisualStyleBackColor = True + Me.cmdTilde.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.cmdTilde.Location = New System.Drawing.Point(159, 88) + Me.cmdTilde.Margin = New System.Windows.Forms.Padding(2) + Me.cmdTilde.Name = "cmdTilde" + Me.cmdTilde.Size = New System.Drawing.Size(45, 38) + Me.cmdTilde.TabIndex = 205 + Me.cmdTilde.Text = "~" + Me.cmdTilde.UseVisualStyleBackColor = True ' 'cmdIn ' Me.cmdIn.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdIn.Location = New System.Drawing.Point(160, 125) + Me.cmdIn.Location = New System.Drawing.Point(159, 125) Me.cmdIn.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdIn.Name = "cmdIn" Me.cmdIn.Size = New System.Drawing.Size(82, 38) @@ -5149,7 +5096,7 @@ Partial Class ucrCalculator 'cmdWhich ' Me.cmdWhich.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdWhich.Location = New System.Drawing.Point(240, 125) + Me.cmdWhich.Location = New System.Drawing.Point(239, 125) Me.cmdWhich.Name = "cmdWhich" Me.cmdWhich.Size = New System.Drawing.Size(78, 38) Me.cmdWhich.TabIndex = 203 @@ -5159,7 +5106,7 @@ Partial Class ucrCalculator 'cmdNA ' Me.cmdNA.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdNA.Location = New System.Drawing.Point(203, 52) + Me.cmdNA.Location = New System.Drawing.Point(202, 52) Me.cmdNA.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdNA.Name = "cmdNA" Me.cmdNA.Size = New System.Drawing.Size(50, 38) @@ -5170,7 +5117,7 @@ Partial Class ucrCalculator 'cmdNear ' Me.cmdNear.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdNear.Location = New System.Drawing.Point(240, 198) + Me.cmdNear.Location = New System.Drawing.Point(239, 198) Me.cmdNear.Name = "cmdNear" Me.cmdNear.Size = New System.Drawing.Size(78, 38) Me.cmdNear.TabIndex = 201 @@ -5180,7 +5127,7 @@ Partial Class ucrCalculator 'cmdBetween ' Me.cmdBetween.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdBetween.Location = New System.Drawing.Point(240, 162) + Me.cmdBetween.Location = New System.Drawing.Point(239, 162) Me.cmdBetween.Name = "cmdBetween" Me.cmdBetween.Size = New System.Drawing.Size(78, 38) Me.cmdBetween.TabIndex = 200 @@ -5210,7 +5157,7 @@ Partial Class ucrCalculator 'cmdDuplicate ' Me.cmdDuplicate.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdDuplicate.Location = New System.Drawing.Point(160, 198) + Me.cmdDuplicate.Location = New System.Drawing.Point(159, 198) Me.cmdDuplicate.Name = "cmdDuplicate" Me.cmdDuplicate.Size = New System.Drawing.Size(82, 38) Me.cmdDuplicate.TabIndex = 193 @@ -5240,7 +5187,7 @@ Partial Class ucrCalculator 'cmdwhen ' Me.cmdwhen.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdwhen.Location = New System.Drawing.Point(160, 162) + Me.cmdwhen.Location = New System.Drawing.Point(159, 162) Me.cmdwhen.Name = "cmdwhen" Me.cmdwhen.Size = New System.Drawing.Size(82, 38) Me.cmdwhen.TabIndex = 190 @@ -5250,7 +5197,7 @@ Partial Class ucrCalculator 'cmdOpeningBracket ' Me.cmdOpeningBracket.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdOpeningBracket.Location = New System.Drawing.Point(203, 88) + Me.cmdOpeningBracket.Location = New System.Drawing.Point(202, 88) Me.cmdOpeningBracket.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdOpeningBracket.Name = "cmdOpeningBracket" Me.cmdOpeningBracket.Size = New System.Drawing.Size(50, 38) @@ -5273,7 +5220,7 @@ Partial Class ucrCalculator 'cmdGreaterOrEqualsTo ' Me.cmdGreaterOrEqualsTo.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdGreaterOrEqualsTo.Location = New System.Drawing.Point(160, 17) + Me.cmdGreaterOrEqualsTo.Location = New System.Drawing.Point(159, 17) Me.cmdGreaterOrEqualsTo.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdGreaterOrEqualsTo.Name = "cmdGreaterOrEqualsTo" Me.cmdGreaterOrEqualsTo.Size = New System.Drawing.Size(45, 38) @@ -5284,7 +5231,7 @@ Partial Class ucrCalculator 'cmdClossingBracket ' Me.cmdClossingBracket.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdClossingBracket.Location = New System.Drawing.Point(252, 88) + Me.cmdClossingBracket.Location = New System.Drawing.Point(251, 88) Me.cmdClossingBracket.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdClossingBracket.Name = "cmdClossingBracket" Me.cmdClossingBracket.Size = New System.Drawing.Size(65, 38) @@ -5297,7 +5244,7 @@ Partial Class ucrCalculator ' Me.cmdAnd.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!) Me.cmdAnd.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdAnd.Location = New System.Drawing.Point(160, 52) + Me.cmdAnd.Location = New System.Drawing.Point(159, 52) Me.cmdAnd.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdAnd.Name = "cmdAnd" Me.cmdAnd.Size = New System.Drawing.Size(45, 38) @@ -5310,7 +5257,7 @@ Partial Class ucrCalculator ' Me.cmdQuotes.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!) Me.cmdQuotes.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdQuotes.Location = New System.Drawing.Point(203, 17) + Me.cmdQuotes.Location = New System.Drawing.Point(202, 17) Me.cmdQuotes.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdQuotes.Name = "cmdQuotes" Me.cmdQuotes.Size = New System.Drawing.Size(50, 38) @@ -5832,18 +5779,6 @@ Partial Class ucrCalculator Me.grpCircular.TabStop = False Me.grpCircular.Text = "Circular" ' - 'cmdCircularHelp - ' - Me.cmdCircularHelp.AutoSize = True - Me.cmdCircularHelp.ContextMenuStrip = Me.ContextMenuStripCircular - Me.cmdCircularHelp.Location = New System.Drawing.Point(197, 178) - Me.cmdCircularHelp.Name = "cmdCircularHelp" - Me.cmdCircularHelp.Size = New System.Drawing.Size(108, 38) - Me.cmdCircularHelp.SplitMenuStrip = Me.ContextMenuStripCircular - Me.cmdCircularHelp.TabIndex = 212 - Me.cmdCircularHelp.Text = "R Help" - Me.cmdCircularHelp.UseVisualStyleBackColor = True - ' 'ContextMenuStripCircular ' Me.ContextMenuStripCircular.ImageScalingSize = New System.Drawing.Size(24, 24) @@ -6378,18 +6313,6 @@ Partial Class ucrCalculator Me.cmdComplexi.Text = "i" Me.cmdComplexi.UseVisualStyleBackColor = True ' - 'cmdComplexRHelp - ' - Me.cmdComplexRHelp.AutoSize = True - Me.cmdComplexRHelp.ContextMenuStrip = Me.ContextMenuStripComplex - Me.cmdComplexRHelp.Location = New System.Drawing.Point(237, 240) - Me.cmdComplexRHelp.Name = "cmdComplexRHelp" - Me.cmdComplexRHelp.Size = New System.Drawing.Size(113, 38) - Me.cmdComplexRHelp.SplitMenuStrip = Me.ContextMenuStripComplex - Me.cmdComplexRHelp.TabIndex = 209 - Me.cmdComplexRHelp.Text = "R Help" - Me.cmdComplexRHelp.UseVisualStyleBackColor = True - ' 'cmdComplexTanH ' Me.cmdComplexTanH.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) @@ -7459,6 +7382,138 @@ Partial Class ucrCalculator Me.ucrReceiverForCalculation.TabIndex = 120 Me.ucrReceiverForCalculation.ucrSelector = Nothing ' + 'cmdLogicalHelp + ' + Me.cmdLogicalHelp.AutoSize = True + Me.cmdLogicalHelp.ContextMenuStrip = Me.ContextMenuStripLogical + Me.cmdLogicalHelp.Location = New System.Drawing.Point(207, 277) + Me.cmdLogicalHelp.Name = "cmdLogicalHelp" + Me.cmdLogicalHelp.Size = New System.Drawing.Size(108, 38) + Me.cmdLogicalHelp.SplitMenuStrip = Me.ContextMenuStripLogical + Me.cmdLogicalHelp.TabIndex = 212 + Me.cmdLogicalHelp.Text = "R Help" + Me.cmdLogicalHelp.UseVisualStyleBackColor = True + ' + 'cmdRHelp + ' + Me.cmdRHelp.AutoSize = True + Me.cmdRHelp.ContextMenuStrip = Me.ContextMenuStripDate + Me.cmdRHelp.Location = New System.Drawing.Point(194, 248) + Me.cmdRHelp.Name = "cmdRHelp" + Me.cmdRHelp.Size = New System.Drawing.Size(113, 38) + Me.cmdRHelp.SplitMenuStrip = Me.ContextMenuStripDate + Me.cmdRHelp.TabIndex = 212 + Me.cmdRHelp.Text = "R Help" + Me.cmdRHelp.UseVisualStyleBackColor = True + ' + 'cmdHydroHelp + ' + Me.cmdHydroHelp.AutoSize = True + Me.cmdHydroHelp.ContextMenuStrip = Me.ContextMenuStripHydroGOF + Me.cmdHydroHelp.Location = New System.Drawing.Point(113, 298) + Me.cmdHydroHelp.Name = "cmdHydroHelp" + Me.cmdHydroHelp.Size = New System.Drawing.Size(108, 38) + Me.cmdHydroHelp.SplitMenuStrip = Me.ContextMenuStripHydroGOF + Me.cmdHydroHelp.TabIndex = 212 + Me.cmdHydroHelp.Text = "R Help" + Me.cmdHydroHelp.UseVisualStyleBackColor = True + ' + 'cmdTransformHelp + ' + Me.cmdTransformHelp.AutoSize = True + Me.cmdTransformHelp.ContextMenuStrip = Me.ContextMenuStripFactor + Me.cmdTransformHelp.Location = New System.Drawing.Point(188, 218) + Me.cmdTransformHelp.Name = "cmdTransformHelp" + Me.cmdTransformHelp.Size = New System.Drawing.Size(113, 38) + Me.cmdTransformHelp.SplitMenuStrip = Me.ContextMenuStripFactor + Me.cmdTransformHelp.TabIndex = 212 + Me.cmdTransformHelp.Text = "R Help" + Me.cmdTransformHelp.UseVisualStyleBackColor = True + ' + 'cmdCircularHelp + ' + Me.cmdCircularHelp.AutoSize = True + Me.cmdCircularHelp.ContextMenuStrip = Me.ContextMenuStripCircular + Me.cmdCircularHelp.Location = New System.Drawing.Point(197, 178) + Me.cmdCircularHelp.Name = "cmdCircularHelp" + Me.cmdCircularHelp.Size = New System.Drawing.Size(108, 38) + Me.cmdCircularHelp.SplitMenuStrip = Me.ContextMenuStripCircular + Me.cmdCircularHelp.TabIndex = 212 + Me.cmdCircularHelp.Text = "R Help" + Me.cmdCircularHelp.UseVisualStyleBackColor = True + ' + 'cmdMathsHelp + ' + Me.cmdMathsHelp.AutoSize = True + Me.cmdMathsHelp.ContextMenuStrip = Me.ContextMenuStripMaths + Me.cmdMathsHelp.Location = New System.Drawing.Point(204, 165) + Me.cmdMathsHelp.Name = "cmdMathsHelp" + Me.cmdMathsHelp.Size = New System.Drawing.Size(108, 38) + Me.cmdMathsHelp.SplitMenuStrip = Me.ContextMenuStripMaths + Me.cmdMathsHelp.TabIndex = 211 + Me.cmdMathsHelp.Text = "R Help" + Me.cmdMathsHelp.UseVisualStyleBackColor = True + ' + 'cmdProbRHelp + ' + Me.cmdProbRHelp.AutoSize = True + Me.cmdProbRHelp.ContextMenuStrip = Me.ContextMenuStripProbability + Me.cmdProbRHelp.Location = New System.Drawing.Point(269, 239) + Me.cmdProbRHelp.Name = "cmdProbRHelp" + Me.cmdProbRHelp.Size = New System.Drawing.Size(108, 38) + Me.cmdProbRHelp.SplitMenuStrip = Me.ContextMenuStripProbability + Me.cmdProbRHelp.TabIndex = 212 + Me.cmdProbRHelp.Text = "R Help" + Me.cmdProbRHelp.UseVisualStyleBackColor = True + ' + 'cmdIntegerRHelp + ' + Me.cmdIntegerRHelp.AutoSize = True + Me.cmdIntegerRHelp.ContextMenuStrip = Me.ContextMenuStripInteger + Me.cmdIntegerRHelp.Location = New System.Drawing.Point(262, 354) + Me.cmdIntegerRHelp.Name = "cmdIntegerRHelp" + Me.cmdIntegerRHelp.Size = New System.Drawing.Size(113, 38) + Me.cmdIntegerRHelp.SplitMenuStrip = Me.ContextMenuStripInteger + Me.cmdIntegerRHelp.TabIndex = 16 + Me.cmdIntegerRHelp.Text = "R Help" + Me.cmdIntegerRHelp.UseVisualStyleBackColor = True + ' + 'cmdComplexRHelp + ' + Me.cmdComplexRHelp.AutoSize = True + Me.cmdComplexRHelp.ContextMenuStrip = Me.ContextMenuStripComplex + Me.cmdComplexRHelp.Location = New System.Drawing.Point(237, 240) + Me.cmdComplexRHelp.Name = "cmdComplexRHelp" + Me.cmdComplexRHelp.Size = New System.Drawing.Size(113, 38) + Me.cmdComplexRHelp.SplitMenuStrip = Me.ContextMenuStripComplex + Me.cmdComplexRHelp.TabIndex = 209 + Me.cmdComplexRHelp.Text = "R Help" + Me.cmdComplexRHelp.UseVisualStyleBackColor = True + ' + 'cmdSummaryRHelp + ' + Me.cmdSummaryRHelp.AutoSize = True + Me.cmdSummaryRHelp.ContextMenuStrip = Me.ContextMenuStripSummary + Me.cmdSummaryRHelp.Location = New System.Drawing.Point(228, 238) + Me.cmdSummaryRHelp.Name = "cmdSummaryRHelp" + Me.cmdSummaryRHelp.Size = New System.Drawing.Size(113, 38) + Me.cmdSummaryRHelp.SplitMenuStrip = Me.ContextMenuStripSummary + Me.cmdSummaryRHelp.TabIndex = 185 + Me.cmdSummaryRHelp.Text = "R Help" + Me.cmdSummaryRHelp.UseVisualStyleBackColor = True + ' + 'cmdTransformRHelp + ' + Me.cmdTransformRHelp.AutoSize = True + Me.cmdTransformRHelp.ContextMenuStrip = Me.ContextMenuStripTransform + Me.cmdTransformRHelp.Location = New System.Drawing.Point(267, 245) + Me.cmdTransformRHelp.Name = "cmdTransformRHelp" + Me.cmdTransformRHelp.Size = New System.Drawing.Size(113, 38) + Me.cmdTransformRHelp.SplitMenuStrip = Me.ContextMenuStripTransform + Me.cmdTransformRHelp.TabIndex = 204 + Me.cmdTransformRHelp.Text = "R Help" + Me.cmdTransformRHelp.UseVisualStyleBackColor = True + ' 'ucrCalculator ' Me.AutoScaleDimensions = New System.Drawing.SizeF(120.0!, 120.0!) @@ -7476,12 +7531,6 @@ Partial Class ucrCalculator Me.Controls.Add(Me.ucrSelectorForCalculations) Me.Controls.Add(Me.ucrReceiverForCalculation) Me.Controls.Add(Me.lblExpression) - Me.Controls.Add(Me.grpModifier) - Me.Controls.Add(Me.grpTestString) - Me.Controls.Add(Me.grpSymbols) - Me.Controls.Add(Me.grpComplex) - Me.Controls.Add(Me.grpSummary) - Me.Controls.Add(Me.grpTransform) Me.Controls.Add(Me.grpLogical) Me.Controls.Add(Me.grpDates) Me.Controls.Add(Me.grpHydroGOF) @@ -7491,6 +7540,12 @@ Partial Class ucrCalculator Me.Controls.Add(Me.grpMaths) Me.Controls.Add(Me.grpProbabilty) Me.Controls.Add(Me.grpInteger) + Me.Controls.Add(Me.grpTestString) + Me.Controls.Add(Me.grpModifier) + Me.Controls.Add(Me.grpSymbols) + Me.Controls.Add(Me.grpComplex) + Me.Controls.Add(Me.grpSummary) + Me.Controls.Add(Me.grpTransform) Me.Name = "ucrCalculator" Me.Size = New System.Drawing.Size(1123, 572) Me.grpBasic.ResumeLayout(False) @@ -7700,7 +7755,7 @@ Partial Class ucrCalculator Friend WithEvents cmdNA As Button Friend WithEvents cmdIn As Button Friend WithEvents cmdWhich As Button - Friend WithEvents cmdDoubleSqrBrackets As Button + Friend WithEvents cmdTilde As Button Friend WithEvents cmdFalse As Button Friend WithEvents cmdTrue As Button Friend WithEvents ttCalculator As ToolTip @@ -8137,4 +8192,8 @@ Partial Class ucrCalculator Friend WithEvents cmdComplexAsin As Button Friend WithEvents cmdComplexAtan As Button Friend WithEvents cmdComplexAcos As Button + Friend WithEvents cmdnumeric As Button + Friend WithEvents cmdCalcRepelicationFunction As Button + Friend WithEvents cmdCalcSequenceFunction As Button + Friend WithEvents cmdCalcConcantenateFunction As Button End Class diff --git a/instat/ucrCalculator.vb b/instat/ucrCalculator.vb index 978f359712b..be3a2823860 100644 --- a/instat/ucrCalculator.vb +++ b/instat/ucrCalculator.vb @@ -120,13 +120,18 @@ Public Class ucrCalculator ttCalculator.SetToolTip(cmdIn, "(%in%)is like the match function and returns a logical vector. For example (11:15 %in% c(11,13)) gives TRUE, FALSE, TRUE, FALSE, FALSE") ttCalculator.SetToolTip(cmdmatch, "(see also %in%)gives the positions of the matching elements. For example match(11:15, c(11,13)) gives (1,NA, 2, NA, NA). match(11:15,c(11,13),nomatch=0) gives 1, 0, 2, 0, 0)") ttCalculator.SetToolTip(cmdIntegerDivision, "div operator(%/%)is for integer division. For example (7 %/% 3) is 2, (13 %/% 3) is 4") - ttCalculator.SetToolTip(cmdwhen, "when is multiple ifelse, for example case_when(1:5>320,1:5>110) gives NA, 10, 10, 20, 20") + ttCalculator.SetToolTip(cmdwhen, "when is multiple ifelse, for example case_when(1:5 > 3 ~ 20, 1:5>1~10) gives (NA,10,10,20,20)") ttCalculator.SetToolTip(cmdIfelse, "is what it says, for example ifelse((1:5 > 3,20,10) gives 10, 10, 10, 20, 20") ttCalculator.SetToolTip(cmdBetween, "between two values, for example between(1:5, 3,4) is FALSE, FALSE, TRUE, TRUE, FALSE") ttCalculator.SetToolTip(cmdIsNa, "is.na detects missing values, for example is.na(c(1,3,NA, 5)) gives FALSE, FALSE, TRUE, FALSE") ttCalculator.SetToolTip(cmdNotIsNa, "!is.na detects non-missing values, for example !is.na(c(1,3,NA, 5)) gives TRUE, TRUE, FALSE, TRUE") ttCalculator.SetToolTip(cmdDuplicate, "duplicate detects non-unique values, for example duplicated(c(1:3,2,7)) gives FALSE, FALSE, FALSE, TRUE, FALSE") ttCalculator.SetToolTip(cmdNear, "near(x,y)compares 2 variables. For example sqrt(5)^2 is almost, but isn't exactly 5, however near(sqrt(5)^2,5) is TRUE") + ttCalculator.SetToolTip(cmdnumeric, "Define a variable as numeric. For example as numeric(c(TRUE,TRUE,FALSE,TRUE)) gives (1, 1,0, 1) ") + ttCalculator.SetToolTip(cmdTilde, "This is called tilde and links the left side and right side of a formula") + ttCalculator.SetToolTip(cmdCalcConcantenateFunction, "Combines arguments to form a single vector, e.g. c(1:3 8) is 1, 2, 3, 8") + ttCalculator.SetToolTip(cmdCalcRepelicationFunction, "Repeat of a sequence, e.g. rep(c(2, 3, 4), each=2) gives 2, 2, 3, 3, 4, 4") + ttCalculator.SetToolTip(cmdCalcSequenceFunction, "Sequences, given either as seq(1, 5, 2) to give 1, 3, 5 or as seq(1, 5, length = 3) to give the same") ttCalculator.SetToolTip(cmdWhich, "which gives the indices of a logical variable. For example which(11:15>13) gives 4, 5. Note the result is usually not the same length as the original variable.") ttCalculator.SetToolTip(cmdAnyDup, "any Are any values TRUE in a logical variable. For example any(1:5 >3) gives TRUE") ttCalculator.SetToolTip(cmdPnorm, "(normal probabilities. For example; pnorm(-1.6449) = 0.05; pnorm(130,100,15) = 0.9772.") @@ -1975,6 +1980,39 @@ Public Class ucrCalculator ucrReceiverForCalculation.AddToReceiverAtCursorPosition("dplyr::near()", 1) End If End Sub + + Private Sub cmdCalcRepelicationFunction_Click(sender As Object, e As EventArgs) Handles cmdCalcRepelicationFunction.Click + If chkShowParameters.Checked Then + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("rep(x = , times = , length = , each = )", 32) + Else + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("rep( )", 2) + End If + End Sub + + Private Sub cmdCalcSequenceFunction_Click(sender As Object, e As EventArgs) Handles cmdCalcSequenceFunction.Click + If chkShowParameters.Checked Then + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("seq(from = , to = , by = , length = )", 28) + Else + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("seq( )", 2) + End If + End Sub + + Private Sub cmdCalcConcantenateFunction_Click(sender As Object, e As EventArgs) Handles cmdCalcConcantenateFunction.Click + If chkShowParameters.Checked Then + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("c( , recursive = FALSE)", 21) + Else + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("c( )", 2) + End If + End Sub + + Private Sub cmdnumeric_Click(sender As Object, e As EventArgs) Handles cmdnumeric.Click + If chkShowParameters.Checked Then + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("as.numeric(x= )", 2) + Else + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("as.numeric( )", 2) + End If + End Sub + Private Sub cmdLogit_Click(sender As Object, e As EventArgs) Handles cmdLogit.Click If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("car::logit(p, percents = Range.p[2] > 1, adjust)", 24) @@ -1982,6 +2020,7 @@ Public Class ucrCalculator ucrReceiverForCalculation.AddToReceiverAtCursorPosition("car::logit()", 1) End If End Sub + Private Sub cmdLogistic_Click(sender As Object, e As EventArgs) Handles cmdLogistic.Click If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("stats::plogis(q, Location = 0, Scale() = 1, lower.tail = True, Log.p = False))", 50) @@ -2143,8 +2182,8 @@ Public Class ucrCalculator ucrReceiverForCalculation.AddToReceiverAtCursorPosition(" %in% ") End Sub - Private Sub cmdDoubleSqrBrackets_Click(sender As Object, e As EventArgs) Handles cmdDoubleSqrBrackets.Click - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("[[]]", 2) + Private Sub cmdTilde_Click(sender As Object, e As EventArgs) Handles cmdTilde.Click + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("~") End Sub Private Sub cmdTrue_Click(sender As Object, e As EventArgs) Handles cmdTrue.Click @@ -3638,7 +3677,7 @@ Public Class ucrCalculator Private Sub cmdAdd_na_Click(sender As Object, e As EventArgs) Handles cmdAdd_na.Click If chkShowParameters.Checked Then - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("forcats::fct_na_value_to_level(f = , na_level = ""(Missing)"")", 26) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("forcats::fct_na_value_to_level(f = ,level = Null)", 15) Else ucrReceiverForCalculation.AddToReceiverAtCursorPosition("forcats::fct_na_value_to_level()", 1) End If