Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

updated my master #480

Merged
merged 30 commits into from
Apr 22, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
aecb57a
Merge pull request #199 from IDEMSInternational/master
MeSophie Feb 29, 2024
92d4050
Change made
MeSophie Feb 29, 2024
2ceecb5
change made
MeSophie Feb 29, 2024
b52fafc
Change made
MeSophie Feb 29, 2024
b41dda5
Change made
MeSophie Mar 1, 2024
3b574af
Minor Change
MeSophie Mar 4, 2024
35d6ea9
Minor code change
MeSophie Mar 4, 2024
2741f9f
Minor code change
MeSophie Mar 4, 2024
a8c3146
minor code change
MeSophie Mar 4, 2024
aa723a7
minor change on the code
MeSophie Mar 5, 2024
5c53c60
Added Reverse and Direction controls
MeSophie Mar 13, 2024
e1801f2
change made
MeSophie Mar 18, 2024
e5b2379
Change made
MeSophie Mar 26, 2024
eda4161
Merge pull request #231 from IDEMSInternational/master
Vitalis95 Mar 26, 2024
5ba0731
minor change made
MeSophie Apr 3, 2024
311235c
snippets
Apr 4, 2024
5a53a1a
Merge branch 'IDEMSInternational:master' into Help_snippets
Fidel365 Apr 4, 2024
764fd31
changes
Apr 4, 2024
029aa22
change
Apr 7, 2024
9288fa8
changes
Apr 8, 2024
fbbfebc
changes
Apr 8, 2024
f92dfcc
chng
Apr 8, 2024
3d3b1a2
help
Apr 8, 2024
14c5e60
changes to the code
Vitalis95 Apr 8, 2024
8f6e0b8
changes to the code
Vitalis95 Apr 9, 2024
28d336f
Merge pull request #8924 from Vitalis95/col_position
N-thony Apr 9, 2024
c046048
Change made
MeSophie Apr 9, 2024
984c619
Merge pull request #8850 from MeSophie/NewLegend8843
N-thony Apr 10, 2024
983e155
Merge pull request #8923 from Fidel365/Help_snippets
N-thony Apr 11, 2024
ce9d7de
Merge pull request #8922 from Fidel365/Logical/symbols
N-thony Apr 11, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions instat/DlgUseDate.vb
Original file line number Diff line number Diff line change
Expand Up @@ -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 = ""
Expand All @@ -32,6 +38,7 @@ Public Class dlgUseDate
End If
SetRCodeforControls(bReset)
SetDefaultColumn()
SetHelpOptions()
bReset = False
autoTranslate(Me)
End Sub
Expand Down Expand Up @@ -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
Expand Down
17 changes: 17 additions & 0 deletions instat/dlgAddKey.vb
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -34,6 +41,7 @@ Public Class dlgAddKey
SetDefaults()
End If
SetRCodeForControls(bReset)
SetHelpOptions()
bReset = False
bUniqueChecked = False
TestOKEnabled()
Expand Down Expand Up @@ -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
Expand Down
16 changes: 16 additions & 0 deletions instat/dlgAppend.vb
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -29,6 +35,7 @@ Public Class dlgAppend
SetDefaults()
End If
SetRCodeForControls(bReset)
SetHelpOptions()
bReset = False
autoTranslate(Me)
End Sub
Expand Down Expand Up @@ -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
Expand Down
17 changes: 17 additions & 0 deletions instat/dlgBoxPlot.vb
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,15 @@
' along with this program. If not, see <http://www.gnu.org/licenses/>.

Imports instat
Imports instat.dlgVisualizeData
Imports instat.Translations
Public Class dlgBoxplot
Public enumBoxplotMode As String = BoxplotMode.Prepare
Public Enum BoxplotMode
Prepare
Describe
End Enum

Private bResetLineLayerSubdialog As Boolean = True
Private clsRggplotFunction As New RFunction
'clsRggplotFunction is the global ggplot function, will be used as RFunction of the first RParameter of ucrBase.clsRSyntax (which has "+" as main command). It is emphasised as a public field as it is used/editted in the sdgLayerOptions. The link is operated via SetupLayer that sets sdgLayerOptions.clsGgplotFunction = dlgBoxPlot.clsRggplotFunction.
Expand Down Expand Up @@ -94,6 +101,7 @@ Public Class dlgBoxplot
SetDefaults()
End If
SetRCodeForControls(bReset)
SetHelpOptions()
bReset = False
autoTranslate(Me)
TestOkEnabled()
Expand Down Expand Up @@ -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)
Expand Down
13 changes: 6 additions & 7 deletions instat/dlgCalculator.vb
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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
Expand Down
16 changes: 15 additions & 1 deletion instat/dlgCompareColumns.vb
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -39,14 +44,14 @@ Public Class dlgCompareColumns
SetDefaults()
End If
SetRCodeForControls(bReset)
SetHelpOptions()
bReset = False
autoTranslate(Me)
TestOkEnabled()
End Sub

Private Sub InitialiseDialog()
Dim dctTolerance As New Dictionary(Of String, String)
ucrBase.iHelpTopicID = 546

ucrPnlOptions.AddRadioButton(rdoByRow)
ucrPnlOptions.AddRadioButton(rdoByValue)
Expand Down Expand Up @@ -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
Expand Down
16 changes: 16 additions & 0 deletions instat/dlgDescribeTwoVarGraph.vb
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -68,6 +74,7 @@ Public Class dlgDescribeTwoVarGraph
SetDefaults()
End If
SetRCodeForControls(bReset)
SetHelpOptions()
bReset = False
TestOkEnabled()
autoTranslate(Me)
Expand Down Expand Up @@ -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
Expand Down
16 changes: 16 additions & 0 deletions instat/dlgDescribeTwoVariable.vb
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -60,6 +66,7 @@ Public Class dlgDescribeTwoVariable
SetDefaults()
End If
SetRCodeForControls(bReset)
SetHelpOptions()
bReset = False
TestOKEnabled()
autoTranslate(Me)
Expand Down Expand Up @@ -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()
Expand Down
17 changes: 16 additions & 1 deletion instat/dlgDuplicates.vb
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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)

Expand Down Expand Up @@ -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
Expand Down
17 changes: 16 additions & 1 deletion instat/dlgFindNonnumericValues.vb
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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()

Expand Down Expand Up @@ -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)
Expand Down
Loading
Loading