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 master #476

Merged
merged 43 commits into from
Feb 19, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
43 commits
Select commit Hold shift + click to select a range
74143a5
Added support for if-else key words to Script window
lloyddewit Jan 21, 2024
61fea94
Merge pull request #173 from africanmathsinitiative/master
MeSophie Jan 22, 2024
b723b40
Merge pull request #175 from IDEMSInternational/master
MeSophie Jan 25, 2024
93ab31f
Some improvement made on Add Code control on General Graph dialog.
MeSophie Jan 25, 2024
9fd39ef
minor code change
MeSophie Jan 25, 2024
8327769
minor change
MeSophie Jan 25, 2024
dcf3d94
Added CGPfunctions to R-instat
Raymond-Andam Feb 6, 2024
c0c0785
changes to the dialogs
Vitalis95 Feb 7, 2024
d6763d1
Moved the percentage button to the summaries subdialogue
N-thony Feb 8, 2024
20435f1
minor design change
N-thony Feb 8, 2024
82d6fac
added percentage box
N-thony Feb 8, 2024
d1d8a95
Merge pull request #8795 from Vitalis95/adding_legendfacets
N-thony Feb 8, 2024
d9f584e
fixes resetting
N-thony Feb 8, 2024
f286201
minor code change
N-thony Feb 8, 2024
6c8f765
upgraded to RInsightF461 0.0.9
lloyddewit Feb 11, 2024
e545fdc
small_changes
Feb 12, 2024
b586d43
Merge pull request #8801 from Fidel365/General_summaries
N-thony Feb 12, 2024
df7d685
Merge pull request #8796 from N-thony/column_summary
conlooptechnologies Feb 12, 2024
0d6bb79
Disabled horizontal scrollbar in multiple receiver
N-thony Feb 13, 2024
7ddf7e7
Update instat/ucrReceiverMultiple.vb
N-thony Feb 13, 2024
14193f6
minor code change
N-thony Feb 13, 2024
7edaef2
minor code change
MeSophie Feb 13, 2024
d9acd43
improve code readability
N-thony Feb 13, 2024
b28b4b0
Merge pull request #186 from IDEMSInternational/master
MeSophie Feb 13, 2024
8446b68
Merge pull request #8805 from N-thony/multiple_receiver_scrolling
conlooptechnologies Feb 13, 2024
7499300
help2
Feb 14, 2024
456974a
help.3
Feb 14, 2024
1079bb2
help.4
Feb 14, 2024
8baf3fb
Removing mapping function from the dotplot and add new options when t…
derekagorhom Feb 14, 2024
239ff41
Merge pull request #8812 from Fidel365/help_id.4
N-thony Feb 15, 2024
9f3862b
Merge pull request #8811 from Fidel365/help_id.3
N-thony Feb 15, 2024
062493c
Merge pull request #8810 from Fidel365/help-id_2
N-thony Feb 15, 2024
2cebff1
changes
Feb 15, 2024
16acf68
Merge branch 'IDEMSInternational:master' into Paste-dataframe
Fidel365 Feb 15, 2024
cee7530
Minor code change
MeSophie Feb 15, 2024
1a06230
minor Change
MeSophie Feb 15, 2024
f58c8c1
Merge pull request #8816 from Fidel365/Paste-dataframe
N-thony Feb 16, 2024
f36b64d
Merge pull request #8814 from Raymond-Andam/R_Packages
N-thony Feb 16, 2024
ba5c440
Merge pull request #8813 from derekagorhom/Changes_Histogram
N-thony Feb 16, 2024
af502b9
upgraded to RInsightF461 0.0.10, ensured that script in IDEMSInternat…
lloyddewit Feb 16, 2024
842f659
Minor Change
MeSophie Feb 16, 2024
9c73b4b
Merge pull request #8746 from lloyddewit/scriptIfElse
N-thony Feb 19, 2024
eea3245
Merge pull request #8765 from MeSophie/NewGeneralGrpahsIssue8745
N-thony Feb 19, 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
2 changes: 1 addition & 1 deletion instat/dlgCircularDensityPlot.vb
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ Public Class dlgCircularDensityPlot
Private Sub InitialiseDialog()
Dim dctKernel As New Dictionary(Of String, String)
Dim dctUnits As New Dictionary(Of String, String)

ucrBase.iHelpTopicID = 181
ucrBase.clsRsyntax.iCallType = 3
ucrBase.clsRsyntax.bExcludeAssignedFunctionOutput = False

Expand Down
1 change: 1 addition & 0 deletions instat/dlgClimaticNCMPCountRecords.vb
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ Public Class dlgClimaticNCMPCountRecords
Private Sub InitialiseDialog()
Dim dctResolution As New Dictionary(Of String, String)

ucrBase.iHelpTopicID=631
ucrSelectorForA2.SetParameter(New RParameter("a2", 0))
ucrSelectorForA2.SetParameterIsrfunction()
ucrSelectorForA2.ucrAvailableDataFrames.lblDataFrame.Text = "Indices Data Frame:"
Expand Down
1 change: 1 addition & 0 deletions instat/dlgClimaticNCMPIndices.vb
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ Public Class dlgClimaticNCMPIndices
End Sub

Private Sub InitialiseDialog()
ucrBase.iHelpTopicID=627
ucrSelectorIndices.SetParameter(New RParameter("df", 0))
ucrSelectorIndices.SetParameterIsrfunction()

Expand Down
1 change: 1 addition & 0 deletions instat/dlgClimaticNCMPRegionAverage.vb
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ Public Class dlgClimaticNCMPRegionAverage
Private Sub InitialiseDialog()
Dim dctResolution As New Dictionary(Of String, String)

ucrBase.iHelpTopicID=629
ucrSelectorForA2.SetParameter(New RParameter("a2", 0))
ucrSelectorForA2.SetParameterIsrfunction()
ucrSelectorForA2.ucrAvailableDataFrames.lblDataFrame.Text = "Indices Data Frame:"
Expand Down
1 change: 1 addition & 0 deletions instat/dlgClimaticNCMPSummaryFile.vb
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ Public Class dlgClimaticNCMPSummaryFile
Private Sub InitialiseDialog()
Dim dctResolution As New Dictionary(Of String, String)

ucrBase.iHelpTopicID=632
ucrSelectorA2.SetParameter(New RParameter("a2", 0))
ucrSelectorA2.SetParameterIsRFunction()
ucrSelectorA2.lblDataFrame.Text = "Indices Data Frame:"
Expand Down
1 change: 1 addition & 0 deletions instat/dlgClimaticNCMPTrendGraphs.vb
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ Public Class dlgClimaticNCMPTrendGraphs
Private Sub InitialiseDialog()
Dim dctResolution As New Dictionary(Of String, String)

ucrBase.iHelpTopicID=630
ucrSelectorForA2.SetParameter(New RParameter("a2", 0))
ucrSelectorForA2.SetParameterIsrfunction()
ucrSelectorForA2.ucrAvailableDataFrames.lblDataFrame.Text = "Indices Data Frame:"
Expand Down
1 change: 1 addition & 0 deletions instat/dlgClimaticNCMPVariogram.vb
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ Public Class dlgClimaticNCMPVariogram
End Sub

Private Sub InitialiseDialog()
ucrBase.iHelpTopicID=628
ucrSelectorVariogram.SetParameter(New RParameter("a2", 0))
ucrSelectorVariogram.SetParameterIsrfunction()
ucrSelectorVariogram.ucrAvailableDataFrames.lblDataFrame.Text = "Indices Data Frame:"
Expand Down
2 changes: 1 addition & 1 deletion instat/dlgClimaticStationMaps.vb
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ Public Class dlgClimaticStationMaps
End Sub

Private Sub InitialiseDialog()
ucrBase.iHelpTopicID = 558
ucrBase.iHelpTopicID = 645
ucrBase.clsRsyntax.iCallType = 3
ucrBase.clsRsyntax.bExcludeAssignedFunctionOutput = False

Expand Down
96 changes: 48 additions & 48 deletions instat/dlgColumnStats.Designer.vb

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 0 additions & 7 deletions instat/dlgColumnStats.vb
Original file line number Diff line number Diff line change
Expand Up @@ -177,13 +177,6 @@ Public Class dlgColumnStats
TestOKEnabled()
End Sub

Private Sub cmdProportionsPercentages_Click(sender As Object, e As EventArgs) Handles cmdProportionsPercentages.Click
sdgProportionsPercentages.SetRFunction(clsDefaultFunction, bResetSubdialog)
sdgProportionsPercentages.ShowDialog()
bResetSubdialog = False
TestOKEnabled()
End Sub

Private Sub ucrChkOmitMissing_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkOmitMissing.ControlValueChanged
If clsSummariesList.ContainsParameter("summary_cor") OrElse clsSummariesList.ContainsParameter("summary_cov") Then
clsDefaultFunction.AddParameter("use", Chr(34) & "'na.or.complete'" & Chr(34))
Expand Down
2 changes: 1 addition & 1 deletion instat/dlgCompare.vb
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ Public Class dlgCompare
End Sub

Private Sub InitialiseDialog()
ucrBase.iHelpTopicID = 562
ucrBase.iHelpTopicID = 634
ucrPnlCompare.AddRadioButton(rdoDifferences)
ucrPnlCompare.AddRadioButton(rdoAnomalies)
ucrPnlCompare.AddParameterPresentCondition(rdoDifferences, "manipulations", False)
Expand Down
1 change: 1 addition & 0 deletions instat/dlgCompareSummary.vb
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ Public Class dlgCompareSummary
End Sub

Private Sub InitialiseDialog()
ucrBase.iHelpTopicID = 635
ucrSelectorVerificationSummary.SetParameter(New RParameter("data_name", 0))
ucrSelectorVerificationSummary.SetParameterIsString()

Expand Down
1 change: 1 addition & 0 deletions instat/dlgConditionalQuantilePlot.vb
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ Public Class dlgConditionalQuantilePlot
Dim dctLegendPosition As New Dictionary(Of String, String)
Dim dctStatistics As New Dictionary(Of String, String)
ucrBase.clsRsyntax.iCallType = 3
ucrBase.iHelpTopicID = 642

ucrConditionalQuantilePlotSelector.SetParameter(New RParameter("mydata", 0))
ucrConditionalQuantilePlotSelector.SetParameterIsrfunction()
Expand Down
Loading
Loading