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 #431

Merged
merged 116 commits into from
Sep 29, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
116 commits
Select commit Hold shift + click to select a range
a5208bd
importing wide datasets
conlooptechnologies May 5, 2023
ea5f1c7
Merge pull request #73 from africanmathsinitiative/master
EstherNjeriLiberatta Jun 15, 2023
3786630
Improving and fixing bugs in the bar chart dialogue.
EstherNjeriLiberatta Jun 21, 2023
f6c3ad9
Added reorder to pie and donut, fixed bugs
EstherNjeriLiberatta Jul 13, 2023
281bcd2
minor change
MeSophie Jul 17, 2023
68efa07
minor change
MeSophie Jul 17, 2023
d4c9449
Added Use as Numeric and Display as Factor checkbox
MeSophie Jul 18, 2023
4c9ce30
added comments
conlooptechnologies Jul 27, 2023
384409e
improved comment
conlooptechnologies Jul 27, 2023
5d64d1c
Merge pull request #414 from africanmathsinitiative/master
conlooptechnologies Jul 27, 2023
9cc602f
changes that matter
conlooptechnologies Aug 8, 2023
0bd35ff
Merge pull request #415 from Patowhiz/WidedatasetsMultipleReceiver
conlooptechnologies Aug 8, 2023
dcbd974
Changes on the bar chart's and pie chart's reorder and receiver contr…
EstherNjeriLiberatta Aug 11, 2023
6559413
Fixing geoms
EstherNjeriLiberatta Aug 14, 2023
a1c050d
Changes in the code
EstherNjeriLiberatta Aug 15, 2023
7bf2892
Merge pull request #78 from africanmathsinitiative/master
EstherNjeriLiberatta Aug 15, 2023
10272c0
Fixing developer error but there is still an issue with the geom text
EstherNjeriLiberatta Aug 15, 2023
1f8fb28
Changes in the code (WIP)
EstherNjeriLiberatta Aug 16, 2023
fc2ccb9
Merge pull request #93 from EstherNjeriLiberatta/bar_chart_#8288
N-thony Aug 17, 2023
31293dc
bug fixes
N-thony Aug 17, 2023
a2290a0
Merge pull request #80 from N-thony/test_bar_chart
EstherNjeriLiberatta Aug 17, 2023
7aa2fc1
Changes to code
EstherNjeriLiberatta Aug 17, 2023
8ccc10e
Merge pull request #163 from africanmathsinitiative/master
Vitalis95 Aug 18, 2023
e0ffa39
Merge pull request #164 from africanmathsinitiative/master
Vitalis95 Aug 21, 2023
7802c6b
Merge pull request #420 from africanmathsinitiative/master
conlooptechnologies Aug 21, 2023
95dd8ad
Merge pull request #93 from africanmathsinitiative/master
MeSophie Aug 21, 2023
f4cd1b0
Minor code changes.
EstherNjeriLiberatta Aug 22, 2023
1e85c0e
Adds message to the column metadata
conlooptechnologies Aug 22, 2023
b16194a
small cahnges to frmMain windows contents
conlooptechnologies Aug 22, 2023
3821f5e
Merge pull request #421 from Patowhiz/Widedatasets
conlooptechnologies Aug 22, 2023
4f6ecd6
Removes oddity on startup and toggling visibility of windows in main …
conlooptechnologies Aug 22, 2023
d9292a6
Minor code changes
EstherNjeriLiberatta Aug 23, 2023
462efe3
changes that prevent recusrions
conlooptechnologies Aug 23, 2023
39dd061
fixed bug in the data frame and repetitive message box prompts
conlooptechnologies Aug 23, 2023
bd7de49
made changes
conlooptechnologies Aug 23, 2023
61ebf83
Merge pull request #422 from africanmathsinitiative/master
conlooptechnologies Aug 23, 2023
d1bb587
Removed cancel option
conlooptechnologies Aug 24, 2023
8d60b08
Merge pull request #94 from africanmathsinitiative/master
MeSophie Aug 28, 2023
9fb0f7b
Code changes
EstherNjeriLiberatta Aug 29, 2023
3d34dcd
Merge pull request #423 from africanmathsinitiative/master
conlooptechnologies Aug 29, 2023
3976647
Viewing multiple R help files in the import from n library dialog
conlooptechnologies Aug 29, 2023
a28f8e2
Merge pull request #94 from EstherNjeriLiberatta/bar_chart_#8288
N-thony Aug 30, 2023
2a2606f
commented out the list append
conlooptechnologies Aug 30, 2023
71d1ef8
opening r help
conlooptechnologies Aug 30, 2023
0fddb86
Merge pull request #425 from Patowhiz/Widedatasets
conlooptechnologies Aug 30, 2023
3527e73
fixing some bugs
N-thony Aug 31, 2023
c8a6e60
Merge pull request #83 from N-thony/br-chart
EstherNjeriLiberatta Aug 31, 2023
0d831df
minor change
MeSophie Aug 31, 2023
6e8897d
Fixed the issue with the reorder but still some issues in the sub-dia…
EstherNjeriLiberatta Aug 31, 2023
4597b24
Revert "Fixed the issue with the reorder but still some issues in the…
EstherNjeriLiberatta Aug 31, 2023
1a0fcea
Merge pull request #95 from africanmathsinitiative/master
MeSophie Aug 31, 2023
cc0a7e3
minor bug fix
N-thony Aug 31, 2023
c7c4871
Merge pull request #84 from N-thony/br-chart
EstherNjeriLiberatta Aug 31, 2023
7a6c6a9
Code changes. Fixes bug in bar chart sub dialogue and reorder when 2 …
EstherNjeriLiberatta Aug 31, 2023
c919ec0
minor bug fix
N-thony Sep 3, 2023
8402092
Merge pull request #86 from N-thony/br-chart
EstherNjeriLiberatta Sep 4, 2023
802af3d
Merge pull request #8515 from Patowhiz/RHelpMaximseWindow
lloyddewit Sep 4, 2023
798c17f
Merge pull request #8522 from MeSophie/PivotTableDescribe8511
lloyddewit Sep 4, 2023
1a47203
Minor bug fix
EstherNjeriLiberatta Sep 4, 2023
eef5119
minor change
N-thony Sep 5, 2023
187aa18
minor change
N-thony Sep 5, 2023
bea74ae
more fixes
N-thony Sep 5, 2023
ce619b7
Added Jitter check box on Scatter Plot Dialog
MeSophie Sep 5, 2023
d4162aa
minor change
MeSophie Sep 5, 2023
39bd56f
Update instat/dlgDeleteDataFrames.vb
conlooptechnologies Sep 5, 2023
8da08fb
Update instat/dlgTransposeColumns.vb
conlooptechnologies Sep 5, 2023
5cbb07e
Update instat/ucrColumnMetadata.vb
conlooptechnologies Sep 5, 2023
e52d3f7
Update instat/ucrColumnMetadata.vb
conlooptechnologies Sep 5, 2023
de284a9
Update instat/ucrReceiverExpression.vb
conlooptechnologies Sep 5, 2023
d4062f7
Merge pull request #87 from N-thony/br-chart
EstherNjeriLiberatta Sep 5, 2023
8d032dc
Removed reorder from Treemap and Wordcloud, minor changes in the code
EstherNjeriLiberatta Sep 6, 2023
9e43a88
minor code change
N-thony Sep 6, 2023
d31b639
corrected the fill parameter
N-thony Sep 6, 2023
5e2c842
Merge pull request #88 from N-thony/br-chart
EstherNjeriLiberatta Sep 6, 2023
6130dc8
Update instat/dlgScatterPlot.vb
MeSophie Sep 6, 2023
3cafbab
Update instat/dlgScatterPlot.vb
MeSophie Sep 6, 2023
4b32efa
removed strQuotes parameter
conlooptechnologies Sep 6, 2023
6dee668
Update instat/ucrColumnMetadata.vb
conlooptechnologies Sep 6, 2023
427aaa1
Update instat/ucrColumnMetadata.vb
conlooptechnologies Sep 6, 2023
e9dd36d
Update instat/ucrSelector.vb
conlooptechnologies Sep 6, 2023
4e79429
Update instat/ucrSelector.vb
conlooptechnologies Sep 6, 2023
9697535
Update instat/ucrSelector.vb
conlooptechnologies Sep 6, 2023
296dbc0
changes suggested
conlooptechnologies Sep 6, 2023
b4e1e72
Merge pull request #426 from africanmathsinitiative/master
conlooptechnologies Sep 6, 2023
6ebef7a
Merge pull request #427 from Patowhiz/Widedatasets
conlooptechnologies Sep 6, 2023
8b9870d
Minor change
MeSophie Sep 6, 2023
33153c0
minor change
MeSophie Sep 6, 2023
fc25827
Ensured the Key checkbox worked correctly in dlgRownamesOrNumbers
derekagorhom Sep 7, 2023
e834a83
Merge pull request #165 from africanmathsinitiative/master
Vitalis95 Sep 7, 2023
a85fadb
Code Changes
derekagorhom Sep 7, 2023
7836334
Delete CNAME
ChrisMarsh82 Sep 7, 2023
4010200
Merge pull request #8526 from MeSophie/RenameDialogissue8488
lloyddewit Sep 8, 2023
8599df4
Update instat/dlgGeneralForGraphics.vb
MeSophie Sep 8, 2023
5368c1e
minor change
MeSophie Sep 8, 2023
13c94f6
Merge pull request #168 from africanmathsinitiative/master
Vitalis95 Sep 11, 2023
a6a86c0
minor code change
Vitalis95 Sep 11, 2023
34719a5
Code changes
derekagorhom Sep 12, 2023
79124ed
Merge pull request #8538 from Vitalis95/OneVarSummaries
lloyddewit Sep 12, 2023
83cc2a1
Merge pull request #8396 from EstherNjeriLiberatta/bar_chart_#8288
lloyddewit Sep 12, 2023
1dd4e8c
Merge pull request #8465 from Patowhiz/Widedatasets
lloyddewit Sep 12, 2023
8e76e3d
Merge pull request #428 from africanmathsinitiative/master
conlooptechnologies Sep 13, 2023
7514a74
Merge pull request #429 from africanmathsinitiative/master
conlooptechnologies Sep 13, 2023
483f1b7
fixed double imports when using script window
conlooptechnologies Sep 13, 2023
7134ce1
allows comments to go to the output window when run from script window
conlooptechnologies Sep 13, 2023
3d3426f
Merge pull request #8529 from derekagorhom/Code_Changes_dlg_Rownames
lloyddewit Sep 14, 2023
d9329a5
restored functionality
conlooptechnologies Sep 14, 2023
b94bc5d
added line
conlooptechnologies Sep 14, 2023
ee889f9
Merge pull request #8504 from Patowhiz/MainWindowOddity
lloyddewit Sep 14, 2023
b030299
Merge pull request #430 from africanmathsinitiative/master
conlooptechnologies Sep 14, 2023
281fc85
Merge pull request #8539 from Patowhiz/Widedatasets
lloyddewit Sep 15, 2023
0ca0676
Merge pull request #169 from africanmathsinitiative/master
Vitalis95 Sep 18, 2023
044fcf3
Merge pull request #8448 from MeSophie/GeomRibon8428
lloyddewit Sep 21, 2023
db6d24a
Adding functions
Vitalis95 Sep 21, 2023
7281548
a change to the code
Vitalis95 Sep 21, 2023
80009b8
changes to the code
Vitalis95 Sep 22, 2023
f8b8462
Merge pull request #8547 from Vitalis95/histdensity
N-thony Sep 22, 2023
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
1 change: 0 additions & 1 deletion docs/CNAME

This file was deleted.

14 changes: 4 additions & 10 deletions instat/clsRLink.vb
Original file line number Diff line number Diff line change
Expand Up @@ -824,15 +824,8 @@ Public Class RLink
End If
ElseIf iCallType = 5 Then
'else if script comes from script window
Dim bSuccess As Boolean = Evaluate(strScript, bSilent:=bSilent, bSeparateThread:=bSeparateThread, bShowWaitDialogOverride:=bShowWaitDialogOverride)

'if not an assignment operation, then capture the output
If Not strScript.Contains("<-") AndAlso bSuccess Then
Dim strScriptAsSingleLine As String = strScript.Replace(vbCrLf, String.Empty)
strScriptAsSingleLine = strScriptAsSingleLine.Replace(vbCr, String.Empty)
strScriptAsSingleLine = strScriptAsSingleLine.Replace(vbLf, String.Empty)
strOutput = GetFileOutput("view_object_data(object = " & strScriptAsSingleLine & " , object_format = 'text' )", bSilent, bSeparateThread, bShowWaitDialogOverride)
End If
'wrap command inside view_object_data just incase there is an output object
strOutput = GetFileOutput("view_object_data(object = " & strScript & " , object_format = 'text' )", bSilent, bSeparateThread, bShowWaitDialogOverride)
Else
'else if script output should not be ignored or not stored as an object or variable

Expand Down Expand Up @@ -883,7 +876,8 @@ Public Class RLink
Dim expTemp As RDotNet.SymbolicExpression
Dim strNewAssignedToScript As String = ConstructAssignTo(strTempAssignTo, strScript)
Evaluate(strNewAssignedToScript, bSilent:=bSilent, bSeparateThread:=bSeparateThread, bShowWaitDialogOverride:=bShowWaitDialogOverride)
expTemp = GetSymbol(strTempAssignTo, bSilent:=bSilent)
'get file path. If not found then silently return nothing
expTemp = GetSymbol(strTempAssignTo, bSilent:=True)
Evaluate("rm(" & strTempAssignTo & ")", bSilent:=True)
If expTemp IsNot Nothing Then
'get the file path name, check if it exists and whether it has contents
Expand Down
84 changes: 46 additions & 38 deletions instat/dlgBarAndPieChart.Designer.vb

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

Loading
Loading