Merge pull request #242 from dannyparsons/graphs

Graphs
IDEMSInternational · Nov 9, 2017 · 60ab22a · 60ab22a
2 parents 19192ac + af922dc
commit 60ab22a
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 3 deletions.
diff --git a/instat/dlgDotPlot.vb b/instat/dlgDotPlot.vb
@@ -178,10 +178,12 @@ Public Class dlgDotPlot
         sdgLayerOptions.ShowDialog()
         bResetDotLayerSubdialog = False
         iIndex = clsRDotplotGeomFunction.clsParameters.FindIndex(Function(x) x.strArgumentName = "binaxis")
+        ' Shouldn't be needed now as the panel can read from the code and set value correctly
         If iIndex <> -1 AndAlso clsRDotplotGeomFunction.clsParameters(iIndex).strArgumentValue = Chr(34) & "y" & Chr(34) Then
             rdoYBinAxis.Checked = True
         Else
-            rdoXBinAxis.Checked = True 'Note: the default value of "binaxis" is "x"
+            rdoXBinAxis.Checked = False
+            rdoXBinAxis.Checked = True
         End If
         'Task: adapt for multivariable case...
         'Warning: In specific plots in general, we still have the bug that if ApplyOnAllLayers is unchecked on the LayerOptions, then the aesthetics will be stored in the LocalAes.

diff --git a/instat/frmMain.Designer.vb b/instat/frmMain.Designer.vb
diff --git a/instat/frmMain.resx b/instat/frmMain.resx
@@ -260,6 +260,9 @@
   <data name="mnuDescribeSpecificBoxplot.Text" xml:space="preserve">
     <value>Boxplot...</value>
   </data>
+  <data name="mnuDescribeSpecificDotPlot.Enabled" type="System.Boolean, mscorlib">
+    <value>False</value>
+  </data>
   <data name="mnuDescribeSpecificDotPlot.Size" type="System.Drawing.Size, System.Drawing">
     <value>209, 22</value>
   </data>

diff --git a/instat/ucrLayerParamsControls.vb b/instat/ucrLayerParamsControls.vb
@@ -28,9 +28,11 @@ Public Class ucrLayerParamsControls
     Public Sub SetControl(clsNewRCode As RCodeStructure, Optional clsNewLayerParam As LayerParameter = Nothing, Optional bReset As Boolean = False)
         If Not bControlsInitialised Then
             InitialiseControls()
+            bControlsInitialised = True
         End If
         ucrReceiverMetadataProperty.SetControls(clsNewRCode:=clsNewRCode, clsNewLayerParam:=clsNewLayerParam, bReset:=bReset)
-        ucrChkParamName.SetRCode(clsNewRCode, bReset)
+        ' Clear the conditions because this control could have been used for another geom (so different conditions)
+        ucrChkParamName.ClearConditions()
         If clsNewLayerParam IsNot Nothing Then
             ucrChkParamName.SetText(clsNewLayerParam.strLayerParameterName)
             ucrChkParamName.AddParameterPresentCondition(True, clsNewLayerParam.strLayerParameterName)
@@ -39,6 +41,8 @@ Public Class ucrLayerParamsControls
         Else
             ucrChkParamName.Visible = False
         End If
+        ' Set RCode only after clearing and setting conditions
+        ucrChkParamName.SetRCode(clsNewRCode, bReset)
     End Sub
 
     Private Sub ucrReceiverMetadataProperty_ControlContentsChanged() Handles ucrReceiverMetadataProperty.ControlContentsChanged, ucrChkParamName.ControlContentsChanged