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.

Sign up for GitHub

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

Execute Script window statement by statement rather than line by line #8551

Merged
merged 16 commits into from
Nov 2, 2023
Merged

Execute Script window statement by statement rather than line by line #8551

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
e352cca
upgraded to RScript 1.0.7
lloyddewit Sep 23, 2023
fd1d50e
checked out from PR #8494 branch
lloyddewit Sep 24, 2023
600497f
Integrated changes from PR #8494
lloyddewit Sep 24, 2023
d9eb85d
allow script that cannot be parsed by RScript to run as simple string
lloyddewit Sep 25, 2023
40598db
Prevented exception if non-ASCII character checked to see if it is a …
lloyddewit Sep 30, 2023
b39877a
if RScript exception raised, then execute using heuristics approach
lloyddewit Oct 5, 2023
0fdcc14
Tidied up logging
lloyddewit Oct 6, 2023
5a06bcf
typo correction
lloyddewit Oct 6, 2023
dc720c5
Fixed bug in comment handling
lloyddewit Oct 6, 2023
3c21360
Small refactoring changes
lloyddewit Oct 10, 2023
5d3b608
Improved comments
lloyddewit Oct 10, 2023
3c85751
upgraded to rscript 1.0.8 to allow commas in square brackets
lloyddewit Oct 17, 2023
b5719a3
upgraded to RScript 1.0.9 (support comments at end of script)
lloyddewit Oct 23, 2023
250c418
Ensure actual output displayed, not file path of output
lloyddewit Oct 26, 2023
bb0c0b2
replaced duplicate code with common functions
lloyddewit Oct 31, 2023
de0e9c6
Merge branch 'master' into rScriptExecuteStatement2
lloyddewit Nov 2, 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
4 changes: 4 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,3 +252,7 @@ installer/Output/

/packages/NLog.*/
/packages/Newtonsoft.Json.*/

# RScript package and dependencies
/packages/RScript.*/
/packages/System.Collections.Specialized.*/
288 changes: 204 additions & 84 deletions instat/clsRLink.vb
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion instat/dlgScript.vb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,7 @@ Public Class dlgScript
End Sub

Private Sub ucrBase_ClickOk(sender As Object, e As EventArgs) Handles ucrBase.ClickOk
frmMain.clsRLink.RunScriptFromWindow(strNewScript:=txtScript.Text, strNewComment:=strComment)
frmMain.clsRLink.RunScriptFromWindow(txtScript.Text.Trim(vbLf), strComment:=strComment)
End Sub

Private Sub ucrPnlGetData_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrPnlGetData.ControlValueChanged
Expand Down
9 changes: 7 additions & 2 deletions instat/instat.vbproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,13 +155,18 @@
<Reference Include="RDotNet, Version=1.8.2.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\R.NET.1.8.2\lib\netstandard2.0\RDotNet.dll</HintPath>
</Reference>
<Reference Include="RScript, Version=0.1.0.4, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\RScript.1.0.6\lib\net461\RScript.dll</HintPath>
<Reference Include="RScript, Version=0.1.0.8, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\RScript.1.0.9\lib\net461\RScript.dll</HintPath>
</Reference>
<Reference Include="ScintillaNET, Version=3.6.3.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\jacobslusser.ScintillaNET.3.6.3\lib\net40\ScintillaNET.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Collections.Specialized, Version=4.0.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Collections.Specialized.4.3.0\lib\net46\System.Collections.Specialized.dll</HintPath>
<Private>True</Private>
<Private>True</Private>
</Reference>
<Reference Include="System.Configuration" />
<Reference Include="System.Data" />
<Reference Include="System.Data.SQLite, Version=1.0.113.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=MSIL">
Expand Down
3 changes: 2 additions & 1 deletion instat/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,9 @@
<package id="Microsoft.Win32.Registry" version="4.5.0" targetFramework="net461" />
<package id="NLog" version="5.1.0" targetFramework="net461" />
<package id="R.NET" version="1.8.2" targetFramework="net461" />
<package id="RScript" version="1.0.6" targetFramework="net461" />
<package id="RScript" version="1.0.9" targetFramework="net461" />
<package id="Stub.System.Data.SQLite.Core.NetFramework" version="1.0.113.3" targetFramework="net461" />
<package id="System.Collections.Specialized" version="4.3.0" targetFramework="net461" />
<package id="System.Data.SQLite.Core" version="1.0.113.7" targetFramework="net461" />
<package id="System.Security.AccessControl" version="4.5.0" targetFramework="net461" />
<package id="System.Security.Principal.Windows" version="4.5.0" targetFramework="net461" />
Expand Down
68 changes: 34 additions & 34 deletions instat/ucrScript.Designer.vb
View file
Open in desktop

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

Loading
Loading