Merge pull request #161 from africanmathsinitiative/master

updating branch
IDEMSInternational · Feb 12, 2018 · 1b2c850 · 1b2c850
2 parents 6e8a132 + ebc06bf
commit 1b2c850
Show file tree

Hide file tree

Showing 35 changed files with 1,227 additions and 342 deletions.
diff --git a/docs/Download.html b/docs/Download.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!DOCTYPE html>
 <html lang="en">
 
 <head>
@@ -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/3kRKfb" style="color:blue;" target="_blank">R-Instat 0.4.10 Complete Installer (.exe 505MB)</a></p>
-                  <p><a href="https://goo.gl/jPq6i7" style="color:blue;" target="_blank">R-Instat 0.4.10 Basic Installer (.msi 367MB)</a></p>
+                  <p><a href="https://goo.gl/WLSvXA" style="color:blue;" target="_blank">R-Instat 0.4.11 Complete Installer (.exe 506MB)</a></p>
+                  <p><a href="https://goo.gl/DYxfvm" style="color:blue;" target="_blank">R-Instat 0.4.11 Basic Installer (.msi 366MB)</a></p>
 
                   <h2 class="section-heading">Installation & Documentation</h2>
                   <hr class="light">

diff --git a/instat/Rlapack.dll b/instat/Rlapack.dll
diff --git a/instat/clsCondition.vb b/instat/clsCondition.vb
@@ -151,7 +151,7 @@ Public Class Condition
         Dim clsTempFunc As RFunction
 
         If bIsParameterValues Then
-            If clsParameter IsNot Nothing Then
+            If clsParameter IsNot Nothing AndAlso clsParameter.strArgumentName IsNot Nothing AndAlso clsParameter.strArgumentName = strParameterName Then
                 clsTempParam = clsParameter
             Else
                 clsTempParam = clsRCode.GetParameter(strParameterName)

diff --git a/instat/clsRLink.vb b/instat/clsRLink.vb
@@ -138,7 +138,7 @@ Public Class RLink
                 If strLine.Contains(strInstatDataObject & "$get_graphs") Then
                     iCallType = 3
                 Else
-                    iCallType = 0
+                    iCallType = 2
                 End If
                 RunScript(strScript:=strLine.Trim(vbLf), iCallType:=iCallType, strComment:=strComment, bSeparateThread:=False, bSilent:=False)
                 strComment = ""
@@ -557,7 +557,9 @@ Public Class RLink
                 expTemp = GetSymbol(strTempAssignTo)
                 If expTemp IsNot Nothing Then
                     strTemp = String.Join(Environment.NewLine, expTemp.AsCharacter())
-                    strOutput = strOutput & strTemp & Environment.NewLine
+                    If strTemp <> "" Then
+                        strOutput = strOutput & strTemp & Environment.NewLine
+                    End If
                 End If
             Catch e As Exception
                 MsgBox(e.Message & Environment.NewLine & "The error occurred in attempting to run the following R command(s):" & Environment.NewLine & strScript, MsgBoxStyle.Critical, "Error running R command(s)")

diff --git a/instat/dlgBoxPlot.designer.vb b/instat/dlgBoxPlot.designer.vb
diff --git a/instat/dlgBoxPlot.resx b/instat/dlgBoxPlot.resx
@@ -141,7 +141,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;cmdOptions.ZOrder" xml:space="preserve">
-    <value>13</value>
+    <value>14</value>
   </data>
   <data name="lblByFactors.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -168,7 +168,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;lblByFactors.ZOrder" xml:space="preserve">
-    <value>11</value>
+    <value>12</value>
   </data>
   <data name="lblBySecondFactor.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -195,7 +195,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;lblBySecondFactor.ZOrder" xml:space="preserve">
-    <value>10</value>
+    <value>11</value>
   </data>
   <data name="cmdBoxPlotOptions.Location" type="System.Drawing.Point, System.Drawing">
     <value>10, 237</value>
@@ -219,7 +219,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;cmdBoxPlotOptions.ZOrder" xml:space="preserve">
-    <value>7</value>
+    <value>8</value>
   </data>
   <metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
@@ -230,6 +230,30 @@
   <data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
     <value>425, 433</value>
   </data>
+  <data name="ucrChkSwapParameters.Enabled" type="System.Boolean, mscorlib">
+    <value>False</value>
+  </data>
+  <data name="ucrChkSwapParameters.Location" type="System.Drawing.Point, System.Drawing">
+    <value>254, 287</value>
+  </data>
+  <data name="ucrChkSwapParameters.Size" type="System.Drawing.Size, System.Drawing">
+    <value>120, 20</value>
+  </data>
+  <data name="ucrChkSwapParameters.TabIndex" type="System.Int32, mscorlib">
+    <value>16</value>
+  </data>
+  <data name="&gt;&gt;ucrChkSwapParameters.Name" xml:space="preserve">
+    <value>ucrChkSwapParameters</value>
+  </data>
+  <data name="&gt;&gt;ucrChkSwapParameters.Type" xml:space="preserve">
+    <value>instat.ucrCheck, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null</value>
+  </data>
+  <data name="&gt;&gt;ucrChkSwapParameters.Parent" xml:space="preserve">
+    <value>$this</value>
+  </data>
+  <data name="&gt;&gt;ucrChkSwapParameters.ZOrder" xml:space="preserve">
+    <value>0</value>
+  </data>
   <data name="ucrSaveBoxplot.Location" type="System.Drawing.Point, System.Drawing">
     <value>10, 351</value>
   </data>
@@ -249,7 +273,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;ucrSaveBoxplot.ZOrder" xml:space="preserve">
-    <value>0</value>
+    <value>1</value>
   </data>
   <data name="ucrChkHorizontalBoxplot.Location" type="System.Drawing.Point, System.Drawing">
     <value>10, 325</value>
@@ -270,7 +294,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;ucrChkHorizontalBoxplot.ZOrder" xml:space="preserve">
-    <value>1</value>
+    <value>2</value>
   </data>
   <data name="ucrChkVarWidth.Location" type="System.Drawing.Point, System.Drawing">
     <value>10, 299</value>
@@ -291,7 +315,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;ucrChkVarWidth.ZOrder" xml:space="preserve">
-    <value>2</value>
+    <value>3</value>
   </data>
   <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
   <data name="rdoViolin.Appearance" type="System.Windows.Forms.Appearance, System.Windows.Forms">
@@ -325,7 +349,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;rdoViolin.ZOrder" xml:space="preserve">
-    <value>3</value>
+    <value>4</value>
   </data>
   <data name="rdoJitter.Appearance" type="System.Windows.Forms.Appearance, System.Windows.Forms">
     <value>Button</value>
@@ -358,7 +382,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;rdoJitter.ZOrder" xml:space="preserve">
-    <value>4</value>
+    <value>5</value>
   </data>
   <data name="rdoBoxplot.Appearance" type="System.Windows.Forms.Appearance, System.Windows.Forms">
     <value>Button</value>
@@ -391,7 +415,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;rdoBoxplot.ZOrder" xml:space="preserve">
-    <value>5</value>
+    <value>6</value>
   </data>
   <data name="ucrSecondFactorReceiver.Location" type="System.Drawing.Point, System.Drawing">
     <value>254, 263</value>
@@ -415,7 +439,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;ucrSecondFactorReceiver.ZOrder" xml:space="preserve">
-    <value>8</value>
+    <value>9</value>
   </data>
   <data name="ucrSelectorBoxPlot.Location" type="System.Drawing.Point, System.Drawing">
     <value>10, 50</value>
@@ -439,7 +463,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;ucrSelectorBoxPlot.ZOrder" xml:space="preserve">
-    <value>9</value>
+    <value>10</value>
   </data>
   <data name="ucrByFactorsReceiver.Location" type="System.Drawing.Point, System.Drawing">
     <value>254, 220</value>
@@ -463,7 +487,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;ucrByFactorsReceiver.ZOrder" xml:space="preserve">
-    <value>12</value>
+    <value>13</value>
   </data>
   <data name="ucrBase.Location" type="System.Drawing.Point, System.Drawing">
     <value>10, 376</value>
@@ -484,7 +508,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;ucrBase.ZOrder" xml:space="preserve">
-    <value>14</value>
+    <value>15</value>
   </data>
   <data name="ucrPnlPlots.Location" type="System.Drawing.Point, System.Drawing">
     <value>23, 12</value>
@@ -505,7 +529,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;ucrPnlPlots.ZOrder" xml:space="preserve">
-    <value>15</value>
+    <value>16</value>
   </data>
   <data name="$this.StartPosition" type="System.Windows.Forms.FormStartPosition, System.Windows.Forms">
     <value>CenterScreen</value>
@@ -538,6 +562,6 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;ucrVariablesAsFactorForBoxplot.ZOrder" xml:space="preserve">
-    <value>6</value>
+    <value>7</value>
   </data>
 </root>
diff --git a/instat/dlgBoxPlot.vb b/instat/dlgBoxPlot.vb
@@ -14,6 +14,7 @@
 ' You should have received a copy of the GNU General Public License 
 ' along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+
 Imports instat.Translations
 Public Class dlgBoxplot
     Private clsRggplotFunction As New RFunction
@@ -81,7 +82,8 @@ Public Class dlgBoxplot
 
         ucrByFactorsReceiver.SetParameter(New RParameter("x", 1))
         ucrByFactorsReceiver.Selector = ucrSelectorBoxPlot
-        ucrByFactorsReceiver.strSelectorHeading = "Varibles"
+        ucrByFactorsReceiver.SetIncludedDataTypes({"factor"})
+        ucrByFactorsReceiver.strSelectorHeading = "Factors"
         ucrByFactorsReceiver.SetParameterIsString()
         ucrByFactorsReceiver.bWithQuotes = False
         ucrByFactorsReceiver.SetValuesToIgnore({Chr(34) & Chr(34)})
@@ -113,7 +115,10 @@ Public Class dlgBoxplot
         ucrSaveBoxplot.SetDataFrameSelector(ucrSelectorBoxPlot.ucrAvailableDataFrames)
         ucrSaveBoxplot.SetAssignToIfUncheckedValue("last_graph")
 
-        '  sdgPlots.SetGgplotFunction(clsRggplotFunction)
+
+        'this control exists but diabled for now
+        ucrChkSwapParameters.SetText("swap Parameters")
+        'ucrSecondFactorReceiver.AddToLinkedControls(ucrChkSwapParameters, {ucrSecondFactorReceiver.IsEmpty = False}, bNewLinkedHideIfParameterMissing:=True)
     End Sub
 
     Private Sub SetDefaults()
@@ -149,9 +154,9 @@ Public Class dlgBoxplot
         clsRgeomPlotFunction.SetRCommand("geom_boxplot")
         clsRgeomPlotFunction.AddParameter("varwidth", "FALSE")
 
-        clsLocalRaesFunction.SetPackageName("ggplot2")
-        clsLocalRaesFunction.SetRCommand("aes")
-        clsRgeomPlotFunction.AddParameter("boxaes", clsRFunctionParameter:=clsLocalRaesFunction, iPosition:=1, bIncludeArgumentName:=False)
+        'clsLocalRaesFunction.SetPackageName("ggplot2")
+        'clsLocalRaesFunction.SetRCommand("aes")
+        'clsRgeomPlotFunction.AddParameter("boxaes", clsRFunctionParameter:=clsLocalRaesFunction, iPosition:=1, bIncludeArgumentName:=False)
 
 
         clsBaseOperator.AddParameter(GgplotDefaults.clsDefaultThemeParameter.Clone())
@@ -179,7 +184,8 @@ Public Class dlgBoxplot
         ucrChkHorizontalBoxplot.SetRCode(clsBaseOperator, bReset)
         ucrVariablesAsFactorForBoxplot.SetRCode(clsRaesFunction, bReset)
         ucrByFactorsReceiver.SetRCode(clsRaesFunction, bReset)
-        ucrByFactorsReceiver.AddAdditionalCodeParameterPair(clsLocalRaesFunction, New RParameter("group", 0), iAdditionalPairNo:=1)
+
+        ' ucrByFactorsReceiver.AddAdditionalCodeParameterPair(clsLocalRaesFunction, New RParameter("group", 0), iAdditionalPairNo:=1)
 
         ucrSecondFactorReceiver.SetRCode(clsRaesFunction, bReset)
         ucrPnlPlots.SetRCode(clsRgeomPlotFunction, bReset)
@@ -287,4 +293,16 @@ Public Class dlgBoxplot
     Private Sub ucrSaveBoxplot_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrSaveBoxplot.ControlContentsChanged, ucrVariablesAsFactorForBoxplot.ControlContentsChanged
         TestOkEnabled()
     End Sub
+
+    'this code is commented out but will work once we get the feature of linking controls with the contents of a receiver
+    'Private Sub SwapFactors()
+    '    If ucrChkSwapParameters.Checked Then
+    '        ucrByFactorsReceiver.ChangeParameterName("fill")
+    '        ucrSecondFactorReceiver.ChangeParameterName("x")
+    '    End If
+    'End Sub
+
+    'Private Sub ucrChkSwapParameters_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkSwapParameters.ControlValueChanged
+    '    SwapFactors()
+    'End Sub
 End Class