Merge pull request #404 from Marthafuraha/dlgBoxplot

Made changes in the Boxplot designer view
IDEMSInternational · Dec 16, 2015 · 74c220b · 74c220b
2 parents cd09e39 + f71bdaf
commit 74c220b
Show file tree

Hide file tree

Showing 3 changed files with 72 additions and 61 deletions.
diff --git a/instat/dlgBoxPlot.designer.vb b/instat/dlgBoxPlot.designer.vb
diff --git a/instat/dlgBoxPlot.vb b/instat/dlgBoxPlot.vb
@@ -18,24 +18,23 @@ Public Class dlgBoxPlot
     Private Sub dlgBoxPlot_Load(sender As Object, e As EventArgs) Handles MyBase.Load
         ucrBase.clsRsyntax.SetFunction("boxplot")
         ucrBase.clsRsyntax.iCallType = 0
-        ucrReceiveBoxplotVariable.Selector = UcrAddRemove
-        ucrReceiveBoxplotVariable.SetMeAsReceiver()
+        ucrReceiverDataToPlot.Selector = UcrAddRemove
+        ucrReceiverDataToPlot.SetMeAsReceiver()
         autoTranslate(Me)
         ucrBase.OKEnabled(False)
     End Sub
 
-    Private Sub ucrReceiveBoxplotVariable_Enter(sender As Object, e As EventArgs) Handles ucrReceiveBoxplotVariable.Enter
-        ucrReceiveBoxplotVariable.SetMeAsReceiver()
+    Private Sub ucrReceiveBoxplotVariable_Enter(sender As Object, e As EventArgs)
+        ucrReceiverDataToPlot.SetMeAsReceiver()
     End Sub
 
 
-    Private Sub ucrReceiveBoxplotVariable_ValueChanged(sender As Object, e As EventArgs) Handles ucrReceiveBoxplotVariable.ValueChanged
-        If Not (ucrReceiveBoxplotVariable.txtReceiverSingle.Text = "") Then
-            ucrBase.clsRsyntax.AddParameter("x", ucrReceiveBoxplotVariable.GetVariables())
+    Private Sub ucrReceiveBoxplotVariable_ValueChanged(sender As Object, e As EventArgs)
+        If Not (ucrReceiverDataToPlot.lstSelectedVariables.SelectedItem = "") Then
+            ucrBase.clsRsyntax.AddParameter("x", ucrReceiverDataToPlot.GetVariables())
             ucrBase.OKEnabled(True)
         Else
             ucrBase.OKEnabled(False)
         End If
     End Sub
-
 End Class
diff --git a/instat/instat.vbproj b/instat/instat.vbproj
@@ -920,6 +920,12 @@
     </Compile>
     <Compile Include="rLink.vb" />
     <Compile Include="rSyntax.vb" />
+    <Compile Include="sdgBoxplot.Designer.vb">
+      <DependentUpon>sdgBoxplot.vb</DependentUpon>
+    </Compile>
+    <Compile Include="sdgBoxplot.vb">
+      <SubType>Form</SubType>
+    </Compile>
     <Compile Include="Translations.vb" />
     <Compile Include="ucrButtons.designer.vb">
       <DependentUpon>ucrButtons.vb</DependentUpon>
@@ -2068,6 +2074,15 @@
       <SubType>Designer</SubType>
     </EmbeddedResource>
     <EmbeddedResource Include="My Project\Resources.sw-KE.resx" />
+    <EmbeddedResource Include="sdgBoxplot.fr-FR.resx">
+      <DependentUpon>sdgBoxplot.vb</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="sdgBoxplot.resx">
+      <DependentUpon>sdgBoxplot.vb</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="sdgBoxplot.sw-KE.resx">
+      <DependentUpon>sdgBoxplot.vb</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="ucrButtons.fr-FR.resx">
       <DependentUpon>ucrButtons.vb</DependentUpon>
     </EmbeddedResource>