Merge pull request #31 from shadrackkibet/temp

Temp
IDEMSInternational · Nov 24, 2017 · 5021af6 · 5021af6
2 parents 0258623 + ebb9fa6
commit 5021af6
Show file tree

Hide file tree

Showing 47 changed files with 753 additions and 307 deletions.
diff --git a/docs/Download.html b/docs/Download.html
@@ -82,8 +82,8 @@ <h2 class="section-heading">Download R-Instat</h2>
                   <p>If this is your first time downloading R-Instat, we recommend you <a href="https://goo.gl/YNXoZi" style="color:blue;" target="_blank">download the Complete Installer</a>. The Complete Installer is the same version of R-Instat as the Basic Installer but also includes an up to date version of R and the .NET Framework, which are required to run R-Instat.</p>
                   <p>If you do not know if you have the latest version of R, download the Complete Installer. The Basic Installer does not include R or the .NET Framework.</p>
                   <p>R-Instat is currently a Windows only application. However, it can be accessed on Mac or Linux through use of a Virtual Windows Machine</p>
-                  <p><a href="https://goo.gl/M44W4D" style="color:blue;" target="_blank">R-Instat 0.4.7 Complete Installer (.exe 512MB)</a></p>
-                  <p><a href="https://goo.gl/1smrme" style="color:blue;" target="_blank">R-Instat 0.4.7 Basic Installer (.msi 374MB)</a></p>
+                  <p><a href="https://goo.gl/cw72WJ" style="color:blue;" target="_blank">R-Instat 0.4.8 Complete Installer (.exe 502MB)</a></p>
+                  <p><a href="https://goo.gl/ea1JoM" style="color:blue;" target="_blank">R-Instat 0.4.8 Basic Installer (.msi 363MB)</a></p>
 
                   <h2 class="section-heading">Installation & Documentation</h2>
                   <hr class="light">

diff --git a/instat/clsRLink.vb b/instat/clsRLink.vb
@@ -127,6 +127,25 @@ Public Class RLink
         bInstatObjectExists = True
     End Sub
 
+    Public Sub RunScriptFromWindow(strNewScript As String, strNewComment As String)
+        Dim strSelectedScript As String = strNewScript
+        Dim iCallType As Integer
+        Dim bFirst As Boolean = True
+        Dim strComment As String = strNewComment
+
+        For Each strLine As String In strSelectedScript.Split(Environment.NewLine)
+            If strLine.Trim(vbLf).Count > 0 AndAlso Not strLine.Trim(vbLf).StartsWith("#") Then
+                If strLine.Contains(strInstatDataObject & "$get_graphs") Then
+                    iCallType = 3
+                Else
+                    iCallType = 0
+                End If
+                RunScript(strScript:=strLine.Trim(vbLf), iCallType:=iCallType, strComment:=strComment, bSeparateThread:=False, bSilent:=False)
+                strComment = ""
+            End If
+        Next
+    End Sub
+
     Public Sub CloseREngine()
         If clsEngine IsNot Nothing Then
             Try

diff --git a/instat/dlgAddComment.resx b/instat/dlgAddComment.resx
@@ -274,7 +274,7 @@
     <value>2</value>
   </data>
   <data name="UcrDialogDisabled1.Location" type="System.Drawing.Point, System.Drawing">
-    <value>66, 147</value>
+    <value>71, 154</value>
   </data>
   <data name="UcrDialogDisabled1.Size" type="System.Drawing.Size, System.Drawing">
     <value>295, 96</value>
@@ -376,7 +376,7 @@
     <value>0, 0, 0, 0</value>
   </data>
   <data name="ucrSelectorAddComment.Size" type="System.Drawing.Size, System.Drawing">
-    <value>210, 180</value>
+    <value>233, 191</value>
   </data>
   <data name="ucrSelectorAddComment.TabIndex" type="System.Int32, mscorlib">
     <value>3</value>

diff --git a/instat/dlgAppend.resx b/instat/dlgAppend.resx
@@ -123,7 +123,7 @@
   </data>
   <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
   <data name="lblAppendToDataframe.Location" type="System.Drawing.Point, System.Drawing">
-    <value>252, 45</value>
+    <value>248, 17</value>
   </data>
   <data name="lblAppendToDataframe.Size" type="System.Drawing.Size, System.Drawing">
     <value>115, 13</value>
@@ -318,6 +318,9 @@
   <data name="&gt;&gt;ucrBase.ZOrder" xml:space="preserve">
     <value>8</value>
   </data>
+  <data name="$this.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+    <value>NoControl</value>
+  </data>
   <data name="$this.StartPosition" type="System.Windows.Forms.FormStartPosition, System.Windows.Forms">
     <value>CenterScreen</value>
   </data>
@@ -331,7 +334,7 @@
     <value>System.Windows.Forms.Form, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
   <data name="ucrReceiverAppendDataframe.Location" type="System.Drawing.Point, System.Drawing">
-    <value>252, 60</value>
+    <value>248, 32</value>
   </data>
   <data name="ucrReceiverAppendDataframe.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
     <value>0, 0, 0, 0</value>

diff --git a/instat/dlgClimSoft.resx b/instat/dlgClimSoft.resx
@@ -328,7 +328,7 @@
     <value>0, 0, 0, 0</value>
   </data>
   <data name="ucrSelectorForClimSoft.Size" type="System.Drawing.Size, System.Drawing">
-    <value>201, 147</value>
+    <value>216, 147</value>
   </data>
   <data name="ucrSelectorForClimSoft.TabIndex" type="System.Int32, mscorlib">
     <value>1</value>

diff --git a/instat/dlgClimaticCheckDataRain.Designer.vb b/instat/dlgClimaticCheckDataRain.Designer.vb