Merge pull request #6 from Vitalis95/test3

Test3
derekagorhom · Feb 29, 2024 · 0fc12de · 0fc12de
2 parents 302a751 + cc6309e
commit 0fc12de
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 51 deletions.
diff --git a/instat/dlgBarAndPieChart.Designer.vb b/instat/dlgBarAndPieChart.Designer.vb
diff --git a/instat/dlgBarAndPieChart.vb b/instat/dlgBarAndPieChart.vb
@@ -295,34 +295,34 @@ Public Class dlgBarAndPieChart
         ucrInputPlace.SetLinkedDisplayControl(lblPlace)
         ucrReceiverLabel.SetLinkedDisplayControl(lblLabel)
 
-        ucrInputLollipopColour.SetParameter(New RParameter("point.colour", 0))
-        dctLollipopColours.Add("SteelBlue", Chr(34) & "steelBlue" & Chr(34))
-        dctLollipopColours.Add("Black", Chr(34) & "black" & Chr(34))
-        dctLollipopColours.Add("White", Chr(34) & "white" & Chr(34))
-        dctLollipopColours.Add("Blue", Chr(34) & "blue" & Chr(34))
-        dctLollipopColours.Add("Red", Chr(34) & "red" & Chr(34))
-        dctLollipopColours.Add("Yellow", Chr(34) & "yellow" & Chr(34))
-        dctLollipopColours.Add("Purple", Chr(34) & "purple" & Chr(34))
-        dctLollipopColours.Add("Green", Chr(34) & "green" & Chr(34))
-        dctLollipopColours.Add("Orange", Chr(34) & "orange" & Chr(34))
-        dctLollipopColours.Add("Grey", Chr(34) & "grey" & Chr(34))
-        dctLollipopColours.Add("Brown", Chr(34) & "brown" & Chr(34))
-        dctLollipopColours.Add("Pink", Chr(34) & "pink" & Chr(34))
-        ucrInputLollipopColour.SetItems(dctLollipopColours)
-        ucrInputLollipopColour.bAllowNonConditionValues = True
+        'ucrInputLollipopColour.SetParameter(New RParameter("point.colour", 0))
+        'dctLollipopColours.Add("SteelBlue", Chr(34) & "steelBlue" & Chr(34))
+        'dctLollipopColours.Add("Black", Chr(34) & "black" & Chr(34))
+        'dctLollipopColours.Add("White", Chr(34) & "white" & Chr(34))
+        'dctLollipopColours.Add("Blue", Chr(34) & "blue" & Chr(34))
+        'dctLollipopColours.Add("Red", Chr(34) & "red" & Chr(34))
+        'dctLollipopColours.Add("Yellow", Chr(34) & "yellow" & Chr(34))
+        'dctLollipopColours.Add("Purple", Chr(34) & "purple" & Chr(34))
+        'dctLollipopColours.Add("Green", Chr(34) & "green" & Chr(34))
+        'dctLollipopColours.Add("Orange", Chr(34) & "orange" & Chr(34))
+        'dctLollipopColours.Add("Grey", Chr(34) & "grey" & Chr(34))
+        'dctLollipopColours.Add("Brown", Chr(34) & "brown" & Chr(34))
+        'dctLollipopColours.Add("Pink", Chr(34) & "pink" & Chr(34))
+        'ucrInputLollipopColour.SetItems(dctLollipopColours)
+        'ucrInputLollipopColour.bAllowNonConditionValues = True
 
         ucrNudLollipopSize.SetParameter(New RParameter("point.size", 1))
         ucrNudLollipopSize.DecimalPlaces = 0
         ucrNudLollipopSize.Increment = 1
         ucrNudLollipopSize.Minimum = 1
         ucrNudLollipopSize.Maximum = 15
 
-        ucrChkLollipop.SetText("Lollipop")
-        ucrChkLollipop.AddParameterPresentCondition(True, "geom_lollipop")
-        ucrChkLollipop.AddParameterPresentCondition(False, "geom_lollipop", False)
-        ucrChkLollipop.AddToLinkedControls({ucrNudLollipopSize, ucrInputLollipopColour}, {True}, bNewLinkedHideIfParameterMissing:=True)
-        ucrNudLollipopSize.SetLinkedDisplayControl(lblLollipopSize)
-        ucrInputLollipopColour.SetLinkedDisplayControl(lblLollipopColour)
+        'ucrChkLollipop.SetText("Lollipop")
+        'ucrChkLollipop.AddParameterPresentCondition(True, "geom_lollipop")
+        'ucrChkLollipop.AddParameterPresentCondition(False, "geom_lollipop", False)
+        'ucrChkLollipop.AddToLinkedControls({ucrNudLollipopSize, ucrInputLollipopColour}, {True}, bNewLinkedHideIfParameterMissing:=True)
+        'ucrNudLollipopSize.SetLinkedDisplayControl(lblLollipopSize)
+        'ucrInputLollipopColour.SetLinkedDisplayControl(lblLollipopColour)
 
         ucrInputAddReorder.SetItems({strAscending, strDescending, strReverse, strNone})
         ucrInputAddReorder.SetDropDownStyleAsNonEditable()
@@ -683,7 +683,7 @@ Public Class dlgBarAndPieChart
         ucrInputLabelPosition.SetRCode(clsGeomTextFunction, bReset)
         ucrInputLabelSize.SetRCode(clsGeomTextFunction, bReset)
         ucrNudLollipopSize.SetRCode(clsGeomLollipopFunction, bReset)
-        ucrInputLollipopColour.SetRCode(clsGeomLollipopFunction, bReset)
+        'ucrInputLollipopColour.SetRCode(clsGeomLollipopFunction, bReset)
         ucrChkLollipop.SetRCode(clsBaseOperator, bReset)
         ucrReceiverArea.SetRCode(clsAsNumericFunction, bReset)
         ucrReceiverFill.SetRCode(clsGeomTreemapAesFunction, bReset)