From cc6309ef264f2f9e0a16939bdbcd34e6e785504a Mon Sep 17 00:00:00 2001 From: Barbra2020 Date: Thu, 29 Feb 2024 16:32:51 +0300 Subject: [PATCH] changes --- instat/dlgBarAndPieChart.Designer.vb | 31 ++------------------ instat/dlgBarAndPieChart.vb | 44 ++++++++++++++-------------- 2 files changed, 24 insertions(+), 51 deletions(-) diff --git a/instat/dlgBarAndPieChart.Designer.vb b/instat/dlgBarAndPieChart.Designer.vb index a319b8a4e5d..24dd99b55dd 100644 --- a/instat/dlgBarAndPieChart.Designer.vb +++ b/instat/dlgBarAndPieChart.Designer.vb @@ -50,7 +50,6 @@ Partial Class dlgBarAndPieChart Me.lblLabelColour = New System.Windows.Forms.Label() Me.lblLabelSize = New System.Windows.Forms.Label() Me.lblLollipopSize = New System.Windows.Forms.Label() - Me.lblLollipopColour = New System.Windows.Forms.Label() Me.lblReorder = New System.Windows.Forms.Label() Me.rdoTreeMap = New System.Windows.Forms.RadioButton() Me.lblFill = New System.Windows.Forms.Label() @@ -81,7 +80,6 @@ Partial Class dlgBarAndPieChart Me.ucrInputLabelSize = New instat.ucrInputComboBox() Me.ucrNudLollipopSize = New instat.ucrNud() Me.ucrNudMaxSize = New instat.ucrNud() - Me.ucrInputLollipopColour = New instat.ucrInputComboBox() Me.ucrChkLollipop = New instat.ucrCheck() Me.ucrInputLabelPosition = New instat.ucrInputComboBox() Me.ucrInputBarChartPositions = New instat.ucrInputComboBox() @@ -247,22 +245,12 @@ Partial Class dlgBarAndPieChart ' Me.lblLollipopSize.AutoSize = True Me.lblLollipopSize.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblLollipopSize.Location = New System.Drawing.Point(123, 408) + Me.lblLollipopSize.Location = New System.Drawing.Point(123, 390) Me.lblLollipopSize.Name = "lblLollipopSize" Me.lblLollipopSize.Size = New System.Drawing.Size(30, 13) Me.lblLollipopSize.TabIndex = 42 Me.lblLollipopSize.Text = "Size:" ' - 'lblLollipopColour - ' - Me.lblLollipopColour.AutoSize = True - Me.lblLollipopColour.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblLollipopColour.Location = New System.Drawing.Point(220, 408) - Me.lblLollipopColour.Name = "lblLollipopColour" - Me.lblLollipopColour.Size = New System.Drawing.Size(40, 13) - Me.lblLollipopColour.TabIndex = 44 - Me.lblLollipopColour.Text = "Colour:" - ' 'lblReorder ' Me.lblReorder.AutoSize = True @@ -521,7 +509,7 @@ Partial Class dlgBarAndPieChart Me.ucrNudLollipopSize.AutoSize = True Me.ucrNudLollipopSize.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudLollipopSize.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudLollipopSize.Location = New System.Drawing.Point(170, 405) + Me.ucrNudLollipopSize.Location = New System.Drawing.Point(170, 387) Me.ucrNudLollipopSize.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) Me.ucrNudLollipopSize.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudLollipopSize.Name = "ucrNudLollipopSize" @@ -542,17 +530,6 @@ Partial Class dlgBarAndPieChart Me.ucrNudMaxSize.TabIndex = 64 Me.ucrNudMaxSize.Value = New Decimal(New Integer() {1, 0, 0, 0}) ' - 'ucrInputLollipopColour - ' - Me.ucrInputLollipopColour.AddQuotesIfUnrecognised = True - Me.ucrInputLollipopColour.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrInputLollipopColour.GetSetSelectedIndex = -1 - Me.ucrInputLollipopColour.IsReadOnly = False - Me.ucrInputLollipopColour.Location = New System.Drawing.Point(276, 405) - Me.ucrInputLollipopColour.Name = "ucrInputLollipopColour" - Me.ucrInputLollipopColour.Size = New System.Drawing.Size(93, 21) - Me.ucrInputLollipopColour.TabIndex = 45 - ' 'ucrChkLollipop ' Me.ucrChkLollipop.AutoSize = True @@ -954,8 +931,6 @@ Partial Class dlgBarAndPieChart Me.Controls.Add(Me.rdoWordCloud) Me.Controls.Add(Me.lblLabel) Me.Controls.Add(Me.rdoTreeMap) - Me.Controls.Add(Me.ucrInputLollipopColour) - Me.Controls.Add(Me.lblLollipopColour) Me.Controls.Add(Me.lblLollipopSize) Me.Controls.Add(Me.ucrChkLollipop) Me.Controls.Add(Me.lblLabelSize) @@ -1042,8 +1017,6 @@ Partial Class dlgBarAndPieChart Friend WithEvents ucrInputLabelColour As ucrInputComboBox Friend WithEvents lblLabelSize As Label Friend WithEvents ucrInputLabelSize As ucrInputComboBox - Friend WithEvents ucrInputLollipopColour As ucrInputComboBox - Friend WithEvents lblLollipopColour As Label Friend WithEvents ucrNudLollipopSize As ucrNud Friend WithEvents lblLollipopSize As Label Friend WithEvents ucrChkLollipop As ucrCheck diff --git a/instat/dlgBarAndPieChart.vb b/instat/dlgBarAndPieChart.vb index 8b68ddcf059..afcc55c89c7 100644 --- a/instat/dlgBarAndPieChart.vb +++ b/instat/dlgBarAndPieChart.vb @@ -295,21 +295,21 @@ 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 @@ -317,12 +317,12 @@ Public Class dlgBarAndPieChart 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)