Merge pull request #226 from IDEMSInternational/master

update
Vitalis95 · Mar 13, 2024 · 9265f12 · 9265f12
2 parents 8e35943 + eb8f20d
commit 9265f12
Show file tree

Hide file tree

Showing 10 changed files with 213 additions and 171 deletions.
diff --git a/instat/dlgScatterPlot.Designer.vb b/instat/dlgScatterPlot.Designer.vb
diff --git a/instat/dlgScatterPlot.vb b/instat/dlgScatterPlot.vb
@@ -126,7 +126,7 @@ Public Class dlgScatterPlot
         ucrFactorOptionalReceiver.Selector = ucrSelectorForScatter
         ucrFactorOptionalReceiver.strSelectorHeading = "Variables"
 
-        ucrChkLineofBestFit.SetText("Add Line of Best Fit")
+        ucrChkLineofBestFit.SetText("Line of Best Fit")
         ucrChkLineofBestFit.AddParameterPresentCondition(True, "geom_smooth")
         ucrChkLineofBestFit.AddParameterPresentCondition(False, "geom_smooth", False)
         ucrChkLineofBestFit.AddToLinkedControls(ucrChkWithSE, {True}, bNewLinkedHideIfParameterMissing:=True)
@@ -136,11 +136,14 @@ Public Class dlgScatterPlot
         ucrChkWithSE.SetValuesCheckedAndUnchecked("TRUE", "FALSE")
         ucrChkWithSE.SetRDefault("TRUE")
 
-        ucrChkAddRugPlot.SetText("Add Rug Plot")
+        ucrChkAddRugPlot.SetText("Rug Plot")
         ucrChkAddRugPlot.AddParameterPresentCondition(True, "geom_rug")
         ucrChkAddRugPlot.AddParameterPresentCondition(False, "geom_rug", False)
         ucrChkAddRugPlot.AddToLinkedControls({ucrNudSize, ucrInputSides}, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True)
 
+        ucrChkAddSidePlot.SetText("Side Plot")
+        ucrChkAddSidePlot.Enabled = False
+
         ucrPnlGeoms.AddRadioButton(rdoJitter)
         ucrPnlGeoms.AddRadioButton(rdoPoint)
         ucrPnlGeoms.AddRadioButton(rdoCount)

diff --git a/instat/instat.vbproj b/instat/instat.vbproj
@@ -152,8 +152,8 @@
     </Reference>
     <Reference Include="PresentationCore" />
     <Reference Include="PresentationFramework" />
-    <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 Include="RDotNet, Version=1.9.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\R.NET.1.9.0\lib\netstandard2.0\RDotNet.dll</HintPath>
     </Reference>
     <Reference Include="RInsightF461, Version=0.0.10.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\RInsightF461.0.0.10\lib\net461\RInsightF461.dll</HintPath>

diff --git a/instat/packages.config b/instat/packages.config
@@ -10,7 +10,7 @@
   <package id="Microsoft.CSharp" version="4.5.0" targetFramework="net461" />
   <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="R.NET" version="1.9.0" targetFramework="net461" />
   <package id="RInsightF461" version="0.0.10" 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" />

diff --git a/instat/static/InstatObject/R/install_packages.R b/instat/static/InstatObject/R/install_packages.R
@@ -177,6 +177,7 @@ pkgs <-
     # Data and Code Behind the Stories and Interactives at 'FiveThirtyEight'
     "fivethirtyeight",
     "CGPfunctions",
+    "ggside",
     "collapse"
  )
 pkgList <- pkgDep(pkgs, type="win.binary", repos = "https://cran.rstudio.com/", suggests = FALSE, includeBasePkgs = FALSE, Rversion = r_version)

diff --git a/instat/ucrScript.vb b/instat/ucrScript.vb
@@ -227,9 +227,10 @@ Public Class ucrScript
             If dlgSave.ShowDialog() = DialogResult.OK Then
                 Try
                     File.WriteAllText(dlgSave.FileName, If(bIsLog, clsScriptLog.Text, clsScriptActive.Text))
+                    strInitialDirectory = Path.GetDirectoryName(dlgSave.FileName)
                     bIsTextChanged = False
                     TabControl.SelectedTab.Text = System.IO.Path.GetFileNameWithoutExtension(dlgSave.FileName)
-                    frmMain.clsRecentItems.addToMenu(Replace(Path.Combine(Path.GetFullPath(FileIO.SpecialDirectories.MyDocuments), System.IO.Path.GetFileName(dlgSave.FileName)), "\", "/"))
+                    frmMain.clsRecentItems.addToMenu(Replace(Path.Combine(Path.GetFullPath(strInitialDirectory), System.IO.Path.GetFileName(dlgSave.FileName)), "\", "/"))
                     frmMain.bDataSaved = True
                     If bIsLog Then
                         strInitialDirectoryLog = Path.GetDirectoryName(dlgSave.FileName)
@@ -547,7 +548,7 @@ Public Class ucrScript
                 strInitialDirectory = Path.GetDirectoryName(dlgLoad.FileName)
                 bIsTextChanged = False
                 clsRScript = Nothing
-                frmMain.clsRecentItems.addToMenu(Replace(Path.Combine(Path.GetFullPath(FileIO.SpecialDirectories.MyDocuments), System.IO.Path.GetFileName(dlgLoad.FileName)), "\", "/"))
+                frmMain.clsRecentItems.addToMenu(Replace(Path.Combine(Path.GetFullPath(strInitialDirectory), System.IO.Path.GetFileName(dlgLoad.FileName)), "\", "/"))
                 frmMain.bDataSaved = True
             Catch
                 MsgBox("Could not load the script from file." & Environment.NewLine &

diff --git a/packages/R.NET.1.8.2/lib/netstandard2.0/RDotNet.dll b/packages/R.NET.1.8.2/lib/netstandard2.0/RDotNet.dll
diff --git a/packages/R.NET.1.8.2/.signature.p7s → packages/R.NET.1.9.0/.signature.p7s b/packages/R.NET.1.8.2/.signature.p7s → packages/R.NET.1.9.0/.signature.p7s
diff --git a/packages/R.NET.1.9.0/lib/netstandard2.0/RDotNet.dll b/packages/R.NET.1.9.0/lib/netstandard2.0/RDotNet.dll
diff --git a/....NET.1.8.2/lib/netstandard2.0/RDotNet.xml → ....NET.1.9.0/lib/netstandard2.0/RDotNet.xml b/....NET.1.8.2/lib/netstandard2.0/RDotNet.xml → ....NET.1.9.0/lib/netstandard2.0/RDotNet.xml