diff --git a/instat/dlgGeneralForGraphics.Designer.vb b/instat/dlgGeneralForGraphics.Designer.vb index 83f97eba464..7b585b8bc6c 100644 --- a/instat/dlgGeneralForGraphics.Designer.vb +++ b/instat/dlgGeneralForGraphics.Designer.vb @@ -90,6 +90,7 @@ Partial Class dlgGeneralForGraphics Me.ucrGraphicsSelector = New instat.ucrSelectorByDataFrameAddRemove() Me.ucrAdditionalLayers = New instat.ucrAdditionalLayers() Me.ucrBase = New instat.ucrButtons() + Me.cmdColour = New System.Windows.Forms.Button() Me.grpAethetics.SuspendLayout() Me.ContextMenuPackagesList.SuspendLayout() Me.SuspendLayout() @@ -99,18 +100,18 @@ Partial Class dlgGeneralForGraphics Me.cmdOptions.ImeMode = System.Windows.Forms.ImeMode.NoControl Me.cmdOptions.Location = New System.Drawing.Point(6, 401) Me.cmdOptions.Name = "cmdOptions" - Me.cmdOptions.Size = New System.Drawing.Size(135, 25) + Me.cmdOptions.Size = New System.Drawing.Size(60, 25) Me.cmdOptions.TabIndex = 7 Me.cmdOptions.Tag = "Options" - Me.cmdOptions.Text = "Plot Options" + Me.cmdOptions.Text = "Options" Me.cmdOptions.UseVisualStyleBackColor = True ' 'cmdFacets ' Me.cmdFacets.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdFacets.Location = New System.Drawing.Point(139, 401) + Me.cmdFacets.Location = New System.Drawing.Point(65, 401) Me.cmdFacets.Name = "cmdFacets" - Me.cmdFacets.Size = New System.Drawing.Size(64, 25) + Me.cmdFacets.Size = New System.Drawing.Size(57, 25) Me.cmdFacets.TabIndex = 17 Me.cmdFacets.Tag = "Facets" Me.cmdFacets.Text = "Facets" @@ -119,20 +120,20 @@ Partial Class dlgGeneralForGraphics 'cmdTheme ' Me.cmdTheme.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdTheme.Location = New System.Drawing.Point(401, 401) + Me.cmdTheme.Location = New System.Drawing.Point(303, 401) Me.cmdTheme.Name = "cmdTheme" Me.cmdTheme.Size = New System.Drawing.Size(65, 25) Me.cmdTheme.TabIndex = 21 Me.cmdTheme.Tag = "Theme" - Me.cmdTheme.Text = "Theme" + Me.cmdTheme.Text = "Themes" Me.cmdTheme.UseVisualStyleBackColor = True ' 'cmdYAxis ' Me.cmdYAxis.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdYAxis.Location = New System.Drawing.Point(334, 401) + Me.cmdYAxis.Location = New System.Drawing.Point(240, 401) Me.cmdYAxis.Name = "cmdYAxis" - Me.cmdYAxis.Size = New System.Drawing.Size(69, 25) + Me.cmdYAxis.Size = New System.Drawing.Size(64, 25) Me.cmdYAxis.TabIndex = 20 Me.cmdYAxis.Tag = "" Me.cmdYAxis.Text = "Y-Axis" @@ -141,9 +142,9 @@ Partial Class dlgGeneralForGraphics 'cmdXAxis ' Me.cmdXAxis.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdXAxis.Location = New System.Drawing.Point(266, 401) + Me.cmdXAxis.Location = New System.Drawing.Point(180, 401) Me.cmdXAxis.Name = "cmdXAxis" - Me.cmdXAxis.Size = New System.Drawing.Size(71, 25) + Me.cmdXAxis.Size = New System.Drawing.Size(61, 25) Me.cmdXAxis.TabIndex = 19 Me.cmdXAxis.Tag = "" Me.cmdXAxis.Text = "X-Axis" @@ -152,9 +153,9 @@ Partial Class dlgGeneralForGraphics 'cmdTitles ' Me.cmdTitles.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdTitles.Location = New System.Drawing.Point(201, 401) + Me.cmdTitles.Location = New System.Drawing.Point(121, 401) Me.cmdTitles.Name = "cmdTitles" - Me.cmdTitles.Size = New System.Drawing.Size(67, 25) + Me.cmdTitles.Size = New System.Drawing.Size(60, 25) Me.cmdTitles.TabIndex = 18 Me.cmdTitles.Tag = "" Me.cmdTitles.Text = "Titles" @@ -539,12 +540,24 @@ Partial Class dlgGeneralForGraphics Me.ucrBase.Size = New System.Drawing.Size(408, 52) Me.ucrBase.TabIndex = 9 ' + 'cmdColour + ' + Me.cmdColour.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.cmdColour.Location = New System.Drawing.Point(367, 401) + Me.cmdColour.Name = "cmdColour" + Me.cmdColour.Size = New System.Drawing.Size(65, 25) + Me.cmdColour.TabIndex = 214 + Me.cmdColour.Tag = "Colour" + Me.cmdColour.Text = "Colour" + Me.cmdColour.UseVisualStyleBackColor = True + ' 'dlgGeneralForGraphics ' Me.AutoScaleDimensions = New System.Drawing.SizeF(96.0!, 96.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi Me.AutoSize = True Me.ClientSize = New System.Drawing.Size(478, 547) + Me.Controls.Add(Me.cmdColour) Me.Controls.Add(Me.cmdRHelp) Me.Controls.Add(Me.grpAethetics) Me.Controls.Add(Me.ucrInputLegendPosition) @@ -626,4 +639,5 @@ Partial Class dlgGeneralForGraphics Friend WithEvents lblYVariable As Label Friend WithEvents lblXVariable As Label Friend WithEvents ucrReceiverX As ucrReceiverSingle + Friend WithEvents cmdColour As Button End Class diff --git a/instat/dlgGeneralForGraphics.vb b/instat/dlgGeneralForGraphics.vb index 0cbfcf389c5..eec9155014b 100644 --- a/instat/dlgGeneralForGraphics.vb +++ b/instat/dlgGeneralForGraphics.vb @@ -245,14 +245,12 @@ Public Class dlgGeneralForGraphics End Sub Private Sub cmdOptions_Click(sender As Object, e As EventArgs) Handles cmdOptions.Click - sdgPlots.DisableLayersTab() sdgPlots.SetRCode(clsNewOperator:=ucrBase.clsRsyntax.clsBaseOperator, clsNewThemeFunction:=clsThemeFunction, dctNewThemeFunctions:=dctThemeFunctions, clsNewYScalecontinuousFunction:=clsYScalecontinuousFunction, clsNewXScalecontinuousFunction:=clsXScalecontinuousFunction, clsNewLabsFunction:=clsLabsFunction, clsNewXLabsTitleFunction:=clsXlabsFunction, clsNewYLabTitleFunction:=clsYlabsFunction, clsNewFacetFunction:=clsFacetsFunction, clsNewScaleFillViridisFunction:=clsScaleFillViridisFunction, clsNewScaleColourViridisFunction:=clsScaleColourViridisFunction, clsNewGlobalAesFunction:=clsGlobalAesFunction, clsNewXScaleDateFunction:=clsXScaleDateFunction, clsNewYScaleDateFunction:=clsYScaleDateFunction, ucrNewBaseSelector:=sdgLayerOptions.ucrGeomWithAes.ucrGeomWithAesSelector, clsNewAnnotateFunction:=clsAnnotateFunction, clsNewCoordPolarFunction:=clsCoordPolarFunction, clsNewCoordPolarStartOperator:=clsCoordPolarStartOperator, bReset:=bResetSubdialog) sdgPlots.ShowDialog() - sdgPlots.EnableLayersTab() bResetSubdialog = False End Sub @@ -328,6 +326,18 @@ Public Class dlgGeneralForGraphics sdgPlots.EnableLayersTab() End Sub + Private Sub cmdColour_Click(sender As Object, e As EventArgs) Handles cmdColour.Click + sdgPlots.DisableLayersTab() + sdgPlots.SetRCode(clsNewOperator:=ucrBase.clsRsyntax.clsBaseOperator, clsNewThemeFunction:=clsThemeFunction, dctNewThemeFunctions:=dctThemeFunctions, clsNewYScalecontinuousFunction:=clsYScalecontinuousFunction, + clsNewXScalecontinuousFunction:=clsXScalecontinuousFunction, clsNewLabsFunction:=clsLabsFunction, clsNewXLabsTitleFunction:=clsXlabsFunction, clsNewYLabTitleFunction:=clsYlabsFunction, + clsNewFacetFunction:=clsFacetsFunction, clsNewScaleFillViridisFunction:=clsScaleFillViridisFunction, clsNewScaleColourViridisFunction:=clsScaleColourViridisFunction, clsNewGlobalAesFunction:=clsGlobalAesFunction, + clsNewXScaleDateFunction:=clsXScaleDateFunction, clsNewYScaleDateFunction:=clsYScaleDateFunction, ucrNewBaseSelector:=sdgLayerOptions.ucrGeomWithAes.ucrGeomWithAesSelector, clsNewAnnotateFunction:=clsAnnotateFunction, + clsNewCoordPolarFunction:=clsCoordPolarFunction, clsNewCoordPolarStartOperator:=clsCoordPolarStartOperator, bReset:=bResetOptionsSubdialog) + sdgPlots.tbpPlotsOptions.SelectedIndex = 7 + sdgPlots.ShowDialog() + bResetOptionsSubdialog = False + sdgPlots.EnableLayersTab() + End Sub Private Sub ucrReceiverY_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrReceiverY.ControlValueChanged, ucrReceiverX.ControlValueChanged If Not ucrReceiverY.IsEmpty Then clsGlobalAesFunction.AddParameter("y", ucrReceiverY.GetVariableNames(False), iPosition:=1) diff --git a/instat/sdgPlots.vb b/instat/sdgPlots.vb index 5dd726c3388..53975f24814 100644 --- a/instat/sdgPlots.vb +++ b/instat/sdgPlots.vb @@ -694,26 +694,11 @@ Public Class sdgPlots dctThemeFunctions.TryGetValue("axis.text.x", clsXElementText) dctThemeFunctions.TryGetValue("axis.title.x", clsXElementTitle) dctThemeFunctions.TryGetValue("axis.text.y", clsYElemetText) - dctThemeFunctions.TryGetValue("title", clsPlotElementTitleFunction) - dctThemeFunctions.TryGetValue("sub.title", clsPlotElementSubTitleFunction) - dctThemeFunctions.TryGetValue("caption", clsPlotElementCaptionFunction) dctThemeFunctions.TryGetValue("tag", clsPlotElementTagFunction) dctThemeFunctions.TryGetValue("colour", clsPlotLegendTitleFunction) dctNewThemeFunctions.TryGetValue("axis.title.y", clsYElemetTitle) - If dctThemeFunctions.TryGetValue("caption", clsPlotElementCaptionFunction) Then - clsThemeFunction.AddParameter("plot.caption", clsRFunctionParameter:=clsPlotElementCaptionFunction) - End If - - If dctThemeFunctions.TryGetValue("title", clsPlotElementTitleFunction) Then - clsThemeFunction.AddParameter("plot.title", clsRFunctionParameter:=clsPlotElementTitleFunction) - End If - - If dctThemeFunctions.TryGetValue("sub.title", clsPlotElementSubTitleFunction) Then - clsThemeFunction.AddParameter("plot.subtitle", clsRFunctionParameter:=clsPlotElementSubTitleFunction) - End If - If clsFacetFunction.ContainsParameter("facets") Then clsTempParam = clsFacetFunction.GetParameter("facets") If clsTempParam.bIsOperator AndAlso clsTempParam.clsArgumentCodeStructure IsNot Nothing Then @@ -757,9 +742,11 @@ Public Class sdgPlots ucrChkMargin.SetRCode(clsFacetFunction, bReset, bCloneIfNeeded:=True) ucrChkFreeSpace.SetRCode(clsFacetFunction, bReset, bCloneIfNeeded:=True) ucrChkFreeScalesX.SetRCode(clsFacetFunction, bReset, bCloneIfNeeded:=True) - ucrChkFreeScalesY.SetRCode(clsFacetFunction, bReset, bCloneIfNeeded:=True) + If bReset Then + ucrChkFreeScalesY.SetRCode(clsFacetFunction, bReset, bCloneIfNeeded:=True) + End If ucrNudNumberofRows.SetRCode(clsFacetFunction, bReset, bCloneIfNeeded:=True) - ucrChkLabeler.SetRCode(clsFacetFunction, bReset, bCloneIfNeeded:=True) + ucrChkLabeler.SetRCode(clsFacetFunction, bReset, bCloneIfNeeded:=True) ucrChkDrop.SetRCode(clsFacetFunction, bReset, bCloneIfNeeded:=True) ucrChkIncludeFacets.SetRCode(clsBaseOperator, bReset, bCloneIfNeeded:=True) @@ -1208,8 +1195,8 @@ Public Class sdgPlots ucrChkYaxisSize.SetRCode(clsYElemetTitle, bReset, bCloneIfNeeded:=True) ucrNudYSize.SetRCode(clsYElemetTitle, bReset, bCloneIfNeeded:=True) - ucrNudXaxisMarkSize.SetRCode(clsXElementText, bReset, bCloneIfNeeded:=True) ucrChkXaxisTickMarkLabelSize.SetRCode(clsXElementText, bReset, bCloneIfNeeded:=True) + ucrNudXaxisMarkSize.SetRCode(clsXElementText, bReset, bCloneIfNeeded:=True) End Sub Private Sub cmdSimpleOptions_Click(sender As Object, e As EventArgs) Handles cmdSimpleOptions.Click @@ -1331,15 +1318,30 @@ Public Class sdgPlots End Sub Private Sub ucrNudCaptionSize_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrNudCaptionSize.ControlValueChanged - clsPlotElementCaptionFunction.AddParameter("size", ucrNudCaptionSize.GetText) + If clsPlotElementCaptionFunction.clsParameters.Count > 0 Then + clsThemeFunction.AddParameter("plot.caption", clsRFunctionParameter:=clsPlotElementCaptionFunction) + Else + clsThemeFunction.RemoveParameterByName("plot.caption") + End If + AddRemoveTheme() End Sub Private Sub ucrNudTitleSize_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrNudTitleSize.ControlValueChanged - clsPlotElementTitleFunction.AddParameter("size", ucrNudTitleSize.GetText) + If clsPlotElementTitleFunction.clsParameters.Count > 0 Then + clsThemeFunction.AddParameter("plot.title", clsRFunctionParameter:=clsPlotElementTitleFunction) + Else + clsThemeFunction.RemoveParameterByName("plot.title") + End If + AddRemoveTheme() End Sub Private Sub ucrNudSubTitleSize_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrNudSubTitleSize.ControlValueChanged - clsPlotElementSubTitleFunction.AddParameter("size", ucrNudSubTitleSize.GetText) + If clsPlotElementSubTitleFunction.clsParameters.Count > 0 Then + clsThemeFunction.AddParameter("plot.title", clsRFunctionParameter:=clsPlotElementSubTitleFunction) + Else + clsThemeFunction.RemoveParameterByName("plot.title") + End If + AddRemoveTheme() End Sub Private Sub ucrNudTagSize_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrNudTagSize.ControlValueChanged diff --git a/instat/ucrAdditionalLayers.Designer.vb b/instat/ucrAdditionalLayers.Designer.vb index 5588aabaaf2..5498932ab25 100644 --- a/instat/ucrAdditionalLayers.Designer.vb +++ b/instat/ucrAdditionalLayers.Designer.vb @@ -45,27 +45,27 @@ Partial Class ucrAdditionalLayers Me.cmdDelete = New System.Windows.Forms.Button() Me.cmdAdd = New instat.ucrSplitButton() Me.contextMenuStripAdd = New System.Windows.Forms.ContextMenuStrip(Me.components) - Me.toolStripMenuItemGeomBoxPlot = New System.Windows.Forms.ToolStripMenuItem() Me.toolStripMenuItemGeomBar = New System.Windows.Forms.ToolStripMenuItem() + Me.toolStripMenuItemGeomBoxPlot = New System.Windows.Forms.ToolStripMenuItem() + Me.toolStripMenuItemGeomcategoricalmodel = New System.Windows.Forms.ToolStripMenuItem() Me.toolStripMenuItemGeomCol = New System.Windows.Forms.ToolStripMenuItem() + Me.toolStripMenuItemGeomcontour = New System.Windows.Forms.ToolStripMenuItem() Me.toolStripMenuItemGeomCount = New System.Windows.Forms.ToolStripMenuItem() Me.toolStripMenuItemGeomDensity = New System.Windows.Forms.ToolStripMenuItem() Me.toolStripMenuItemGeomDensityRidges = New System.Windows.Forms.ToolStripMenuItem() + Me.toolStripMenuItemGeomhistogram = New System.Windows.Forms.ToolStripMenuItem() Me.toolStripMenuItemGeomJitter = New System.Windows.Forms.ToolStripMenuItem() Me.toolStripMenuItemGeomLabel = New System.Windows.Forms.ToolStripMenuItem() Me.toolStripMenuItemGeomLabelRepel = New System.Windows.Forms.ToolStripMenuItem() Me.toolStripMenuItemGeomLine = New System.Windows.Forms.ToolStripMenuItem() + Me.toolStripMenuItemGeomparallelslopes = New System.Windows.Forms.ToolStripMenuItem() Me.toolStripMenuItemGeomPoint = New System.Windows.Forms.ToolStripMenuItem() - Me.toolStripMenuItemGeomRugSmooth = New System.Windows.Forms.ToolStripMenuItem() + Me.toolStripMenuItemGeomRug = New System.Windows.Forms.ToolStripMenuItem() + Me.toolStripMenuItemGeomsmooth = New System.Windows.Forms.ToolStripMenuItem() Me.toolStripMenuItemGeomText = New System.Windows.Forms.ToolStripMenuItem() Me.toolStripMenuItemGeomTextRepel = New System.Windows.Forms.ToolStripMenuItem() - Me.cmdEdit = New System.Windows.Forms.Button() Me.toolStripMenuItemGeomtile = New System.Windows.Forms.ToolStripMenuItem() - Me.toolStripMenuItemGeomparallelslopes = New System.Windows.Forms.ToolStripMenuItem() - Me.toolStripMenuItemGeomcategoricalmodel = New System.Windows.Forms.ToolStripMenuItem() - Me.toolStripMenuItemGeomhistogram = New System.Windows.Forms.ToolStripMenuItem() - Me.toolStripMenuItemGeomcontour = New System.Windows.Forms.ToolStripMenuItem() - Me.GeomsmoothToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.cmdEdit = New System.Windows.Forms.Button() Me.grpGeoms.SuspendLayout() Me.contextMenuStripAdd.SuspendLayout() Me.SuspendLayout() @@ -127,21 +127,27 @@ Partial Class ucrAdditionalLayers 'contextMenuStripAdd ' Me.contextMenuStripAdd.ImageScalingSize = New System.Drawing.Size(24, 24) - Me.contextMenuStripAdd.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.toolStripMenuItemGeomBar, Me.toolStripMenuItemGeomBoxPlot, Me.toolStripMenuItemGeomcategoricalmodel, Me.toolStripMenuItemGeomCol, Me.toolStripMenuItemGeomcontour, Me.toolStripMenuItemGeomCount, Me.toolStripMenuItemGeomDensity, Me.toolStripMenuItemGeomDensityRidges, Me.toolStripMenuItemGeomhistogram, Me.toolStripMenuItemGeomJitter, Me.toolStripMenuItemGeomLabel, Me.toolStripMenuItemGeomLabelRepel, Me.toolStripMenuItemGeomLine, Me.toolStripMenuItemGeomparallelslopes, Me.toolStripMenuItemGeomPoint, Me.toolStripMenuItemGeomRugSmooth, Me.GeomsmoothToolStripMenuItem, Me.toolStripMenuItemGeomText, Me.toolStripMenuItemGeomTextRepel, Me.toolStripMenuItemGeomtile}) + Me.contextMenuStripAdd.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.toolStripMenuItemGeomBar, Me.toolStripMenuItemGeomBoxPlot, Me.toolStripMenuItemGeomcategoricalmodel, Me.toolStripMenuItemGeomCol, Me.toolStripMenuItemGeomcontour, Me.toolStripMenuItemGeomCount, Me.toolStripMenuItemGeomDensity, Me.toolStripMenuItemGeomDensityRidges, Me.toolStripMenuItemGeomhistogram, Me.toolStripMenuItemGeomJitter, Me.toolStripMenuItemGeomLabel, Me.toolStripMenuItemGeomLabelRepel, Me.toolStripMenuItemGeomLine, Me.toolStripMenuItemGeomparallelslopes, Me.toolStripMenuItemGeomPoint, Me.toolStripMenuItemGeomRug, Me.toolStripMenuItemGeomsmooth, Me.toolStripMenuItemGeomText, Me.toolStripMenuItemGeomTextRepel, Me.toolStripMenuItemGeomtile}) Me.contextMenuStripAdd.Name = "contextMenuStripOk" Me.contextMenuStripAdd.Size = New System.Drawing.Size(208, 466) ' + 'toolStripMenuItemGeomBar + ' + Me.toolStripMenuItemGeomBar.Name = "toolStripMenuItemGeomBar" + Me.toolStripMenuItemGeomBar.Size = New System.Drawing.Size(207, 22) + Me.toolStripMenuItemGeomBar.Text = "geom_bar" + ' 'toolStripMenuItemGeomBoxPlot ' Me.toolStripMenuItemGeomBoxPlot.Name = "toolStripMenuItemGeomBoxPlot" Me.toolStripMenuItemGeomBoxPlot.Size = New System.Drawing.Size(207, 22) Me.toolStripMenuItemGeomBoxPlot.Text = "geom_boxplot" ' - 'toolStripMenuItemGeomBar + 'toolStripMenuItemGeomcategoricalmodel ' - Me.toolStripMenuItemGeomBar.Name = "toolStripMenuItemGeomBar" - Me.toolStripMenuItemGeomBar.Size = New System.Drawing.Size(207, 22) - Me.toolStripMenuItemGeomBar.Text = "geom_bar" + Me.toolStripMenuItemGeomcategoricalmodel.Name = "toolStripMenuItemGeomcategoricalmodel" + Me.toolStripMenuItemGeomcategoricalmodel.Size = New System.Drawing.Size(207, 22) + Me.toolStripMenuItemGeomcategoricalmodel.Text = "geom_categorical_model" ' 'toolStripMenuItemGeomCol ' @@ -149,6 +155,12 @@ Partial Class ucrAdditionalLayers Me.toolStripMenuItemGeomCol.Size = New System.Drawing.Size(207, 22) Me.toolStripMenuItemGeomCol.Text = "geom_col" ' + 'toolStripMenuItemGeomcontour + ' + Me.toolStripMenuItemGeomcontour.Name = "toolStripMenuItemGeomcontour" + Me.toolStripMenuItemGeomcontour.Size = New System.Drawing.Size(207, 22) + Me.toolStripMenuItemGeomcontour.Text = "geom_contour" + ' 'toolStripMenuItemGeomCount ' Me.toolStripMenuItemGeomCount.Name = "toolStripMenuItemGeomCount" @@ -167,6 +179,12 @@ Partial Class ucrAdditionalLayers Me.toolStripMenuItemGeomDensityRidges.Size = New System.Drawing.Size(207, 22) Me.toolStripMenuItemGeomDensityRidges.Text = "geom_density_ridges" ' + 'toolStripMenuItemGeomhistogram + ' + Me.toolStripMenuItemGeomhistogram.Name = "toolStripMenuItemGeomhistogram" + Me.toolStripMenuItemGeomhistogram.Size = New System.Drawing.Size(207, 22) + Me.toolStripMenuItemGeomhistogram.Text = "geom_histogram " + ' 'toolStripMenuItemGeomJitter ' Me.toolStripMenuItemGeomJitter.Name = "toolStripMenuItemGeomJitter" @@ -191,17 +209,29 @@ Partial Class ucrAdditionalLayers Me.toolStripMenuItemGeomLine.Size = New System.Drawing.Size(207, 22) Me.toolStripMenuItemGeomLine.Text = "geom_line" ' + 'toolStripMenuItemGeomparallelslopes + ' + Me.toolStripMenuItemGeomparallelslopes.Name = "toolStripMenuItemGeomparallelslopes" + Me.toolStripMenuItemGeomparallelslopes.Size = New System.Drawing.Size(207, 22) + Me.toolStripMenuItemGeomparallelslopes.Text = "geom_parallel_slopes" + ' 'toolStripMenuItemGeomPoint ' Me.toolStripMenuItemGeomPoint.Name = "toolStripMenuItemGeomPoint" Me.toolStripMenuItemGeomPoint.Size = New System.Drawing.Size(207, 22) Me.toolStripMenuItemGeomPoint.Text = "geom_point" ' - 'toolStripMenuItemGeomRugSmooth + 'toolStripMenuItemGeomRug + ' + Me.toolStripMenuItemGeomRug.Name = "toolStripMenuItemGeomRug" + Me.toolStripMenuItemGeomRug.Size = New System.Drawing.Size(207, 22) + Me.toolStripMenuItemGeomRug.Text = "geom_rug" ' - Me.toolStripMenuItemGeomRugSmooth.Name = "toolStripMenuItemGeomRugSmooth" - Me.toolStripMenuItemGeomRugSmooth.Size = New System.Drawing.Size(207, 22) - Me.toolStripMenuItemGeomRugSmooth.Text = "geom_rug" + 'toolStripMenuItemGeomsmooth + ' + Me.toolStripMenuItemGeomsmooth.Name = "toolStripMenuItemGeomsmooth" + Me.toolStripMenuItemGeomsmooth.Size = New System.Drawing.Size(207, 22) + Me.toolStripMenuItemGeomsmooth.Text = "geom_smooth" ' 'toolStripMenuItemGeomText ' @@ -215,6 +245,12 @@ Partial Class ucrAdditionalLayers Me.toolStripMenuItemGeomTextRepel.Size = New System.Drawing.Size(207, 22) Me.toolStripMenuItemGeomTextRepel.Text = "geom_text_repel" ' + 'toolStripMenuItemGeomtile + ' + Me.toolStripMenuItemGeomtile.Name = "toolStripMenuItemGeomtile" + Me.toolStripMenuItemGeomtile.Size = New System.Drawing.Size(207, 22) + Me.toolStripMenuItemGeomtile.Text = "geom_tile" + ' 'cmdEdit ' Me.cmdEdit.Location = New System.Drawing.Point(16, 43) @@ -224,42 +260,6 @@ Partial Class ucrAdditionalLayers Me.cmdEdit.Text = "Edit" Me.cmdEdit.UseVisualStyleBackColor = True ' - 'toolStripMenuItemGeomtile - ' - Me.toolStripMenuItemGeomtile.Name = "toolStripMenuItemGeomtile" - Me.toolStripMenuItemGeomtile.Size = New System.Drawing.Size(207, 22) - Me.toolStripMenuItemGeomtile.Text = "geom_tile" - ' - 'toolStripMenuItemGeomparallelslopes - ' - Me.toolStripMenuItemGeomparallelslopes.Name = "toolStripMenuItemGeomparallelslopes" - Me.toolStripMenuItemGeomparallelslopes.Size = New System.Drawing.Size(207, 22) - Me.toolStripMenuItemGeomparallelslopes.Text = "geom_parallel_slopes" - ' - 'toolStripMenuItemGeomcategoricalmodel - ' - Me.toolStripMenuItemGeomcategoricalmodel.Name = "toolStripMenuItemGeomcategoricalmodel" - Me.toolStripMenuItemGeomcategoricalmodel.Size = New System.Drawing.Size(207, 22) - Me.toolStripMenuItemGeomcategoricalmodel.Text = "geom_categorical_model" - ' - 'toolStripMenuItemGeomhistogram - ' - Me.toolStripMenuItemGeomhistogram.Name = "toolStripMenuItemGeomhistogram" - Me.toolStripMenuItemGeomhistogram.Size = New System.Drawing.Size(207, 22) - Me.toolStripMenuItemGeomhistogram.Text = "geom_histogram " - ' - 'toolStripMenuItemGeomcontour - ' - Me.toolStripMenuItemGeomcontour.Name = "toolStripMenuItemGeomcontour" - Me.toolStripMenuItemGeomcontour.Size = New System.Drawing.Size(207, 22) - Me.toolStripMenuItemGeomcontour.Text = "geom_contour" - ' - 'GeomsmoothToolStripMenuItem - ' - Me.GeomsmoothToolStripMenuItem.Name = "GeomsmoothToolStripMenuItem" - Me.GeomsmoothToolStripMenuItem.Size = New System.Drawing.Size(207, 22) - Me.GeomsmoothToolStripMenuItem.Text = "geom_smooth" - ' 'ucrAdditionalLayers ' Me.AutoScaleDimensions = New System.Drawing.SizeF(96.0!, 96.0!) @@ -295,13 +295,13 @@ Partial Class ucrAdditionalLayers Friend WithEvents toolStripMenuItemGeomLabelRepel As ToolStripMenuItem Friend WithEvents toolStripMenuItemGeomLine As ToolStripMenuItem Friend WithEvents toolStripMenuItemGeomPoint As ToolStripMenuItem - Friend WithEvents toolStripMenuItemGeomRugSmooth As ToolStripMenuItem + Friend WithEvents toolStripMenuItemGeomRug As ToolStripMenuItem Friend WithEvents toolStripMenuItemGeomText As ToolStripMenuItem Friend WithEvents toolStripMenuItemGeomTextRepel As ToolStripMenuItem Friend WithEvents toolStripMenuItemGeomcategoricalmodel As ToolStripMenuItem Friend WithEvents toolStripMenuItemGeomcontour As ToolStripMenuItem Friend WithEvents toolStripMenuItemGeomhistogram As ToolStripMenuItem Friend WithEvents toolStripMenuItemGeomparallelslopes As ToolStripMenuItem - Friend WithEvents GeomsmoothToolStripMenuItem As ToolStripMenuItem + Friend WithEvents toolStripMenuItemGeomsmooth As ToolStripMenuItem Friend WithEvents toolStripMenuItemGeomtile As ToolStripMenuItem End Class diff --git a/instat/ucrAdditionalLayers.vb b/instat/ucrAdditionalLayers.vb index a5431af837e..eda967b1579 100644 --- a/instat/ucrAdditionalLayers.vb +++ b/instat/ucrAdditionalLayers.vb @@ -92,7 +92,7 @@ Public Class ucrAdditionalLayers Private Sub cmdAdd_Click(sender As Object, e As EventArgs) Handles cmdAdd.Click, toolStripMenuItemGeomBar.Click, toolStripMenuItemGeomBoxPlot.Click, toolStripMenuItemGeomCol.Click, toolStripMenuItemGeomCount.Click, toolStripMenuItemGeomcategoricalmodel.Click, toolStripMenuItemGeomDensity.Click, toolStripMenuItemGeomJitter.Click, toolStripMenuItemGeomLabel.Click, toolStripMenuItemGeomparallelslopes.Click, toolStripMenuItemGeomtile.Click, toolStripMenuItemGeomcontour.Click, toolStripMenuItemGeomhistogram.Click, - toolStripMenuItemGeomLabelRepel.Click, toolStripMenuItemGeomLine.Click, toolStripMenuItemGeomPoint.Click, toolStripMenuItemGeomRugSmooth.Click, toolStripMenuItemGeomText.Click, toolStripMenuItemGeomTextRepel.Click, toolStripMenuItemGeomDensityRidges.Click + toolStripMenuItemGeomLabelRepel.Click, toolStripMenuItemGeomLine.Click, toolStripMenuItemGeomsmooth.Click, toolStripMenuItemGeomPoint.Click, toolStripMenuItemGeomRug.Click, toolStripMenuItemGeomText.Click, toolStripMenuItemGeomTextRepel.Click, toolStripMenuItemGeomDensityRidges.Click 'setup the geom function to use Dim clsNewGeomFunction As New RFunction @@ -130,8 +130,10 @@ Public Class ucrAdditionalLayers strGeomRCommand = "geom_line" ElseIf sender Is toolStripMenuItemGeomPoint Then strGeomRCommand = "geom_point" - ElseIf sender Is toolStripMenuItemGeomRugSmooth Then - strGeomRCommand = "geom_rug_smooth" + ElseIf sender Is toolStripMenuItemGeomRug Then + strGeomRCommand = "geom_rug" + ElseIf sender Is toolStripMenuItemGeomsmooth Then + strGeomRCommand = "geom_smooth" ElseIf sender Is toolStripMenuItemGeomText Then strGeomRCommand = "geom_text" ElseIf sender Is toolStripMenuItemGeomTextRepel Then