Merge pull request #966 from dannyparsons/dlgStack

Fixed bug in multiplereceiver, updated Stack and Sort
IDEMSInternational · Feb 27, 2016 · 070c1fd · 070c1fd
2 parents f2a7834 + 6cc7f18
commit 070c1fd
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 10 deletions.
diff --git a/instat/dlgStack.vb b/instat/dlgStack.vb
@@ -51,28 +51,27 @@ Public Class dlgStack
         ucrReceiverColumnsToBeStack.SetMeAsReceiver()
         chkIDVariables.Checked = False
         ucrIDVariablesReceiver.Visible = False
-        SetStackIntoText("Value")
-        SetFactorIntoText("Variable")
+        SetStackIntoText("value")
+        SetFactorIntoText("variable")
         ucrNewDataFrameName.bUserTyped = False
         autoTranslate(Me)
-
     End Sub
 
     Private Sub SetFactorIntoText(strNewVal As String)
         txtFactorInto.Text = strNewVal
-        If txtFactorInto.Text <> "" Then
-            ucrBase.clsRsyntax.AddParameter("variable.name", Chr(34) & txtFactorInto.Text & Chr(34))
-        Else
+        If txtFactorInto.Text = "" Or (txtFactorInto.Text = "variable" AndAlso (Not frmMain.clsInstatOptions.bIncludeRDefaultParameters)) Then
             ucrBase.clsRsyntax.RemoveParameter("variable.name")
+        Else
+            ucrBase.clsRsyntax.AddParameter("variable.name", Chr(34) & txtFactorInto.Text & Chr(34))
         End If
     End Sub
 
     Private Sub SetStackIntoText(strNewVal As String)
         txtStackDataInto.Text = strNewVal
-        If txtStackDataInto.Text <> "" Then
-            ucrBase.clsRsyntax.AddParameter("value.name", Chr(34) & txtStackDataInto.Text & Chr(34))
-        Else
+        If txtStackDataInto.Text = "" Or (txtStackDataInto.Text = "value" AndAlso (Not frmMain.clsInstatOptions.bIncludeRDefaultParameters)) Then
             ucrBase.clsRsyntax.RemoveParameter("value.name")
+        Else
+            ucrBase.clsRsyntax.AddParameter("value.name", Chr(34) & txtStackDataInto.Text & Chr(34))
         End If
     End Sub
 

diff --git a/instat/ucrReceiverMultiple.vb b/instat/ucrReceiverMultiple.vb
@@ -120,7 +120,11 @@ Public Class ucrReceiverMultiple
         Dim strTemp As String = ""
         Dim i As Integer
         If lstSelectedVariables.Items.Count = 1 Then
-            strTemp = Chr(34) & lstSelectedVariables.Items(0).Text & Chr(34)
+            If bWithQuotes Then
+                strTemp = Chr(34) & lstSelectedVariables.Items(0).Text & Chr(34)
+            Else
+                strTemp = lstSelectedVariables.Items(0).Text
+            End If
         ElseIf lstSelectedVariables.Items.Count > 1 Then
             strTemp = "c" & "("
             For i = 0 To lstSelectedVariables.Items.Count - 1

diff --git a/instat/ucrReceiverSingle.fr-FR.resx b/instat/ucrReceiverSingle.fr-FR.resx
@@ -12,4 +12,7 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <metadata name="SelectionMenuStrip.TrayLocation" xml:space="preserve" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
 </root>
diff --git a/instat/ucrReceiverSingle.sw-KE.resx b/instat/ucrReceiverSingle.sw-KE.resx
@@ -12,4 +12,7 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <metadata name="SelectionMenuStrip.TrayLocation" xml:space="preserve" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
 </root>