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

update #300

Merged
merged 100 commits into from
Nov 14, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
100 commits
Select commit Hold shift + click to select a range
e8b4721
design changes
Fidel365 Sep 28, 2024
88bf3e3
code
Fidel365 Oct 1, 2024
71aa747
code2
Fidel365 Oct 1, 2024
432caeb
code3
Fidel365 Oct 2, 2024
167a5cd
Changes to the Use Table Dialog
derekagorhom Oct 2, 2024
aa6781b
Minor Changes
derekagorhom Oct 2, 2024
4734879
Minor Change
derekagorhom Oct 2, 2024
130ff78
code 4
Fidel365 Oct 7, 2024
968544e
code5
Fidel365 Oct 7, 2024
fdc509b
Final changes
Fidel365 Oct 7, 2024
171d21d
Merge branch 'IDEMSInternational:master' into View.dialog
Fidel365 Oct 7, 2024
f3d8571
Changing the as_raw_html command to fmt_markdown for html results
derekagorhom Oct 8, 2024
0fb53ba
Code Changes
derekagorhom Oct 10, 2024
300731f
More Changes
derekagorhom Oct 10, 2024
e33cc90
changes
derekagorhom Oct 10, 2024
7fa9981
Final Changes
derekagorhom Oct 10, 2024
5599d94
changes
Fidel365 Oct 13, 2024
5736c8a
Merge branch 'IDEMSInternational:master' into View.dialog
Fidel365 Oct 17, 2024
5650518
Merge branch 'View.dialog' of https://github.com/Fidel365/R-Instat in…
Fidel365 Oct 20, 2024
54d4e32
sub dialog changes
Fidel365 Oct 21, 2024
558a895
rows
Fidel365 Oct 23, 2024
61fe6fe
Merge branch 'IDEMSInternational:master' into View.dialog
Fidel365 Oct 23, 2024
a38697c
changes to the code
Vitalis95 Oct 24, 2024
5693b2f
changes to the code
Vitalis95 Oct 24, 2024
4c0de12
changes
Vitalis95 Oct 25, 2024
087a423
changes
Vitalis95 Oct 28, 2024
294df81
changes
Vitalis95 Oct 28, 2024
be7650b
changes
Vitalis95 Oct 28, 2024
61a6bf9
Code changes
derekagorhom Oct 28, 2024
24a712b
changes
Vitalis95 Oct 28, 2024
925839d
changesv
Fidel365 Oct 28, 2024
d2698bb
changes to the code
Vitalis95 Oct 28, 2024
b9b5b80
changes
Vitalis95 Oct 28, 2024
f8102f4
changes
Fidel365 Oct 28, 2024
328e286
changes
Fidel365 Oct 29, 2024
ad93859
tables
Fidel365 Oct 29, 2024
6f0def8
objectname
Fidel365 Oct 29, 2024
a920bce
final
Fidel365 Oct 29, 2024
cfdfbf8
Merge branch 'View.dialog' of https://github.com/Fidel365/R-Instat in…
Fidel365 Oct 29, 2024
9323682
changes to the code
Vitalis95 Oct 29, 2024
6d102e2
Merge branch 'IDEMSInternational:master' into View.dialog
Fidel365 Oct 29, 2024
698aa0f
changes
Vitalis95 Oct 30, 2024
70e1e98
Merge branch 'IDEMSInternational:master' into View.dialog
Fidel365 Oct 30, 2024
24c60d3
changes to the code
Vitalis95 Oct 31, 2024
0a53908
changes
Vitalis95 Oct 31, 2024
caf7c10
changes
Vitalis95 Nov 1, 2024
4c781ff
changes
Vitalis95 Nov 1, 2024
bbb4be6
changes to the code
Vitalis95 Nov 4, 2024
b5b7db9
code change
Vitalis95 Nov 4, 2024
fef54dd
changes
Vitalis95 Nov 5, 2024
361d76d
changes
Vitalis95 Nov 6, 2024
387b333
changes to the code
Vitalis95 Nov 6, 2024
d51d692
sub changes
Fidel365 Nov 6, 2024
404034e
Merge branch 'View.dialog' of https://github.com/Fidel365/R-Instat in…
Fidel365 Nov 6, 2024
b77fec2
Merge pull request #502 from derekagorhom/Use_Table_Dialog
Patowhiz Nov 6, 2024
ae0e0ef
changes to the code
Vitalis95 Nov 6, 2024
1277910
changes
Vitalis95 Nov 6, 2024
9b1b58f
changes to the code
Vitalis95 Nov 7, 2024
1fbd7f9
changes to the code
Vitalis95 Nov 7, 2024
74987ea
changes
Vitalis95 Nov 7, 2024
5abd10e
changes to the code
Vitalis95 Nov 7, 2024
c243df6
Merge branch 'IDEMSInternational:master' into View.dialog
Fidel365 Nov 7, 2024
c45e50e
changes
Vitalis95 Nov 8, 2024
dab1a63
code changes
Vitalis95 Nov 8, 2024
6b6fa8a
adding help context
Fidel365 Nov 11, 2024
4dcc7e4
Merge branch 'IDEMSInternational:master' into ClimaticDistances
Fidel365 Nov 11, 2024
9cd92ec
Merge pull request #9243 from Fidel365/ClimaticDistances
N-thony Nov 11, 2024
a6781b7
Added a drop down and implemented the file option to the Help menu Icon
derekagorhom Nov 11, 2024
1e18fdf
minor correction in the column summary dialogue
N-thony Nov 12, 2024
0d70381
Set No loaded data text correctly after auto saving
N-thony Nov 12, 2024
0b2b2f9
minor code change
N-thony Nov 12, 2024
5cb82f8
Initial changes
conlooptechnologies Nov 12, 2024
9c2c419
Final changes
conlooptechnologies Nov 12, 2024
2965d1f
Changes in the Summary dialogs
derekagorhom Nov 12, 2024
963db5e
comments added
conlooptechnologies Nov 12, 2024
45657aa
Getting n_distinct working for summaries
lilyclements Nov 12, 2024
36c517b
Allowing summary_n_distinct to work for factors
lilyclements Nov 12, 2024
e3cf805
Code changes
derekagorhom Nov 12, 2024
dedb6c6
Merge pull request #9248 from lilyclements/n_distinct-fix
N-thony Nov 13, 2024
1097c5f
removed pdf, png and word options
conlooptechnologies Nov 13, 2024
09fad50
minor code change
N-thony Nov 13, 2024
f5d8872
changed if block as requested
conlooptechnologies Nov 13, 2024
1ae23dc
Merge pull request #9244 from N-thony/fixing_column_summary
Patowhiz Nov 13, 2024
773b425
Merge pull request #9253 from Patowhiz/use_table_partial
N-thony Nov 13, 2024
f9ae18b
Code changes
derekagorhom Nov 13, 2024
76523ad
Created a dropdown for the Dataview button
derekagorhom Nov 13, 2024
8e7efa2
table changes
Fidel365 Nov 13, 2024
064d434
design for number of rowa
Fidel365 Nov 13, 2024
39b99de
Rows_Options
Fidel365 Nov 13, 2024
ecfde91
change
Fidel365 Nov 13, 2024
0199a50
final changes
Fidel365 Nov 13, 2024
67780a8
Merge branch 'IDEMSInternational:master' into View.dialog
Fidel365 Nov 13, 2024
7b3d371
Merge branch 'View.dialog' of https://github.com/Fidel365/R-Instat in…
Fidel365 Nov 13, 2024
d390b17
Merge pull request #9203 from Vitalis95/summary_table
Patowhiz Nov 14, 2024
21764f0
Merge pull request #9174 from Fidel365/View.dialog
N-thony Nov 14, 2024
f61dc68
Merge pull request #9246 from N-thony/ifx_no_data_loaded
Patowhiz Nov 14, 2024
301b507
Merge pull request #9245 from derekagorhom/ToolBar_DesignChanges
N-thony Nov 14, 2024
5014510
Merge branch 'master' into Changes_Column_Summaries
derekagorhom Nov 14, 2024
9e1d534
Changes in the calculations.R
derekagorhom Nov 14, 2024
1131867
Merge pull request #9250 from derekagorhom/Changes_Column_Summaries
N-thony Nov 14, 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
12 changes: 4 additions & 8 deletions instat/UserTables/sdgTableOptions.vb
Original file line number Diff line number Diff line change
Expand Up @@ -41,16 +41,12 @@ Public Class sdgTableOptions
End Sub

''' <summary>
''' An R operateor that has a parameter named "gt" set up.
''' The parameter should be an R Function that generates script "gt:gt()" as part of the last script statement.
''' Sets up the sub dialog.
''' Expected to be called before showing the dialog.
''' </summary>
''' <param name="clsNewOperator"></param>
''' <param name="strDataFrameName">Name of the data frame contained in the data book</param>
''' <param name="clsNewOperator">R operator that has a 'gt' parameter that produces a 'gt' object.</param>
Public Sub Setup(strDataFrameName As String, clsNewOperator As ROperator)
If clsTablesUtils.FindRFunctionsParamsWithRCommand({"gt"}, clsNewOperator).Count = 0 Then
MsgBox("Developer Error: Parameter with 'gt' as name MUST be set up before using this subdialog")
Exit Sub
End If

clsOperator = clsNewOperator

ucrHeader.Setup(clsOperator)
Expand Down
3 changes: 1 addition & 2 deletions instat/dlgClimaticSummary.vb
Original file line number Diff line number Diff line change
Expand Up @@ -194,8 +194,7 @@ Public Class dlgClimaticSummary

'TODO: what defaults do we want?
clsSummariesList.SetRCommand("c")
clsSummariesList.AddParameter("summary_count_non_missing", Chr(34) & "summary_count_non_missing" & Chr(34), bIncludeArgumentName:=False, iPosition:=1)
clsSummariesList.AddParameter("summary_count", Chr(34) & "summary_count" & Chr(34), bIncludeArgumentName:=False, iPosition:=3)
clsSummariesList.AddParameter("summary_count", Chr(34) & "summary_count" & Chr(34), bIncludeArgumentName:=False, iPosition:=1)
clsSummariesList.AddParameter("summary_sum", Chr(34) & "summary_sum" & Chr(34), bIncludeArgumentName:=False, iPosition:=11)

clsDefaultFunction.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$calculate_summary")
Expand Down
33 changes: 23 additions & 10 deletions instat/dlgColumnStats.vb
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ Public Class dlgColumnStats
clsConcFunction.SetRCommand("c")

clsSummariesList.SetRCommand("c")
clsSummariesList.AddParameter("summary_count_non_missing", Chr(34) & "summary_count_non_missing" & Chr(34), bIncludeArgumentName:=False, iPosition:=1)
clsSummariesList.AddParameter("summary_count", Chr(34) & "summary_count" & Chr(34), bIncludeArgumentName:=False, iPosition:=1)
clsSummariesList.AddParameter("summary_sum", Chr(34) & "summary_sum" & Chr(34), bIncludeArgumentName:=False, iPosition:=11)

clsDefaultFunction.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$calculate_summary")
Expand Down Expand Up @@ -220,19 +220,32 @@ Public Class dlgColumnStats
sdgMissingOptions.ShowDialog()
End Sub

Private Sub ucrReceiverByFactor_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrReceiverByFactor.ControlValueChanged, ucrChkStoreResults.ControlValueChanged, ucrChkPrintOutput.ControlValueChanged
If ucrReceiverByFactor.IsEmpty Then
clsDefaultFunction.AddParameter("store_results", "FALSE", iPosition:=3)
clsDefaultFunction.AddParameter("return_output", "TRUE", iPosition:=4)
ucrBase.clsRsyntax.iCallType = 2
Else
clsDefaultFunction.RemoveParameterByName("return_output")
If ucrChkStoreResults.Checked Then
clsDefaultFunction.AddParameter("store_results", "TRUE", iPosition:=3)
Private Sub ucrReceiverByFactor_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrReceiverByFactor.ControlValueChanged, ucrChkStoreResults.ControlValueChanged, ucrChkPrintOutput.ControlValueChanged, ucrReceiverSelectedVariables.ControlValueChanged, ucrChkOriginalLevel.ControlValueChanged
If Not ucrChkOriginalLevel.Checked Then
If ucrReceiverByFactor.IsEmpty AndAlso Not ucrReceiverSelectedVariables.IsEmpty Then
clsDefaultFunction.AddParameter("store_results", "FALSE", iPosition:=3)
clsDefaultFunction.AddParameter("return_output", "TRUE", iPosition:=4)
ucrBase.clsRsyntax.iCallType = 2
Else
clsDefaultFunction.RemoveParameterByName("return_output")
If ucrChkStoreResults.Checked Then
clsDefaultFunction.AddParameter("store_results", "TRUE", iPosition:=3)
Else
clsDefaultFunction.AddParameter("store_results", "FALSE", iPosition:=3)
End If
If ucrChkPrintOutput.Checked Then
clsDefaultFunction.AddParameter("return_output", "TRUE", iPosition:=4)
Else
clsDefaultFunction.AddParameter("return_output", "FALSE", iPosition:=4)
End If
End If
Else
If ucrChkPrintOutput.Checked Then
clsDefaultFunction.AddParameter("return_output", "TRUE", iPosition:=4)
Else
clsDefaultFunction.RemoveParameterByName("return_output")
End If
clsDefaultFunction.AddParameter("store_results", "TRUE", iPosition:=3)
End If
End Sub

Expand Down
2 changes: 1 addition & 1 deletion instat/dlgDisplayDailyData.vb
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ Public Class dlgDisplayDailyData
ucrChkIQR.SetParameter(New RParameter("IQR", 5), bNewChangeParameterValue:=True, bNewAddRemoveParameter:=True, strNewValueIfChecked:=Chr(34) & "IQR" & Chr(34), strNewValueIfUnchecked:=Chr(34) & Chr(34))
ucrChkIQR.SetText("IQR")

ucrChkSumMissing.SetParameter(New RParameter("summary_count_missing", 6), bNewChangeParameterValue:=True, bNewAddRemoveParameter:=True, strNewValueIfChecked:=Chr(34) & "summary_count_missing" & Chr(34), strNewValueIfUnchecked:=Chr(34) & Chr(34))
ucrChkSumMissing.SetParameter(New RParameter("summary_count_miss", 6), bNewChangeParameterValue:=True, bNewAddRemoveParameter:=True, strNewValueIfChecked:=Chr(34) & "summary_count_miss" & Chr(34), strNewValueIfUnchecked:=Chr(34) & Chr(34))
ucrChkSumMissing.SetText("N Missing")

ucrNudNumberOfColumns.SetParameter(New RParameter("ncol", 1))
Expand Down
1 change: 1 addition & 0 deletions instat/dlgDistances.vb
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ Public Class dlgDistances
autoTranslate(Me)
End Sub
Private Sub InitialiseDialog()
ucrBase.iHelpTopicID = 145

ucrSelectorDistance.SetParameter(New RParameter("df", 0))
ucrSelectorDistance.SetParameterIsrfunction()
Expand Down
2 changes: 1 addition & 1 deletion instat/dlgExtremesClimatic.vb
Original file line number Diff line number Diff line change
Expand Up @@ -447,7 +447,7 @@ Public Class dlgExtremesClimatic
clsNSummary.AddParameter("save", "2", iPosition:=4)
clsNSummary.SetAssignTo("n_dates_summary")

clsNFunction.SetRCommand("summary_count")
clsNFunction.SetRCommand("summary_count_all")
clsNFunction.bToScriptAsRString = True

clsFilterExtremeCalc.SetRCommand("instat_calculation$new")
Expand Down
2 changes: 1 addition & 1 deletion instat/dlgOneVariableSummarise.vb
Original file line number Diff line number Diff line change
Expand Up @@ -248,8 +248,8 @@ Public Class dlgOneVariableSummarise
strObjectName:="last_table")

clsSummariesList.SetRCommand("c")
clsSummariesList.AddParameter("summary_count_non_missing", Chr(34) & "summary_count_non_missing" & Chr(34), bIncludeArgumentName:=False)
clsSummariesList.AddParameter("summary_count", Chr(34) & "summary_count" & Chr(34), bIncludeArgumentName:=False)
clsSummariesList.AddParameter("summary_count_all", Chr(34) & "summary_count_all" & Chr(34), bIncludeArgumentName:=False)
clsSummariesList.AddParameter("summary_sum", Chr(34) & "summary_sum" & Chr(34), bIncludeArgumentName:=False)

clsSummaryFunction.SetRCommand("summary")
Expand Down
Loading
Loading