From 0cbe8d22443e62b9748e5e2747be96e1db2b70ea Mon Sep 17 00:00:00 2001 From: Sophie Malla Tatchum Date: Mon, 11 Sep 2023 10:29:20 +0100 Subject: [PATCH 01/14] minor change --- instat/dlgGeneralForGraphics.Designer.vb | 64 ++++++++++++++++++++++-- 1 file changed, 59 insertions(+), 5 deletions(-) diff --git a/instat/dlgGeneralForGraphics.Designer.vb b/instat/dlgGeneralForGraphics.Designer.vb index cf1d7c3eb33..0fad1de1d4e 100644 --- a/instat/dlgGeneralForGraphics.Designer.vb +++ b/instat/dlgGeneralForGraphics.Designer.vb @@ -50,6 +50,10 @@ Partial Class dlgGeneralForGraphics Me.ucrGraphicsSelector = New instat.ucrSelectorByDataFrameAddRemove() Me.ucrAdditionalLayers = New instat.ucrAdditionalLayers() Me.ucrBase = New instat.ucrButtons() + Me.cmdYAxis = New System.Windows.Forms.Button() + Me.cmdXAxis = New System.Windows.Forms.Button() + Me.cmdTitles = New System.Windows.Forms.Button() + Me.ucrChkLegend = New instat.ucrCheck() Me.SuspendLayout() ' 'cmdOptions @@ -57,7 +61,7 @@ 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(137, 25) + Me.cmdOptions.Size = New System.Drawing.Size(78, 25) Me.cmdOptions.TabIndex = 6 Me.cmdOptions.Tag = "Options" Me.cmdOptions.Text = "Plot Options" @@ -88,9 +92,9 @@ Partial Class dlgGeneralForGraphics 'cmdFacets ' Me.cmdFacets.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdFacets.Location = New System.Drawing.Point(146, 401) + Me.cmdFacets.Location = New System.Drawing.Point(83, 401) Me.cmdFacets.Name = "cmdFacets" - Me.cmdFacets.Size = New System.Drawing.Size(110, 25) + Me.cmdFacets.Size = New System.Drawing.Size(64, 25) Me.cmdFacets.TabIndex = 18 Me.cmdFacets.Tag = "Facets" Me.cmdFacets.Text = "Facets" @@ -99,9 +103,9 @@ Partial Class dlgGeneralForGraphics 'cmdTheme ' Me.cmdTheme.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdTheme.Location = New System.Drawing.Point(258, 401) + Me.cmdTheme.Location = New System.Drawing.Point(329, 401) Me.cmdTheme.Name = "cmdTheme" - Me.cmdTheme.Size = New System.Drawing.Size(110, 25) + Me.cmdTheme.Size = New System.Drawing.Size(71, 25) Me.cmdTheme.TabIndex = 19 Me.cmdTheme.Tag = "Theme" Me.cmdTheme.Text = "Theme" @@ -184,12 +188,58 @@ Partial Class dlgGeneralForGraphics Me.ucrBase.Size = New System.Drawing.Size(408, 52) Me.ucrBase.TabIndex = 9 ' + 'cmdYAxis + ' + Me.cmdYAxis.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.cmdYAxis.Location = New System.Drawing.Point(260, 401) + Me.cmdYAxis.Name = "cmdYAxis" + Me.cmdYAxis.Size = New System.Drawing.Size(70, 25) + Me.cmdYAxis.TabIndex = 20 + Me.cmdYAxis.Tag = "" + Me.cmdYAxis.Text = "Y-Axis" + Me.cmdYAxis.UseVisualStyleBackColor = True + ' + 'cmdXAxis + ' + Me.cmdXAxis.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.cmdXAxis.Location = New System.Drawing.Point(199, 401) + Me.cmdXAxis.Name = "cmdXAxis" + Me.cmdXAxis.Size = New System.Drawing.Size(62, 25) + Me.cmdXAxis.TabIndex = 21 + Me.cmdXAxis.Tag = "" + Me.cmdXAxis.Text = "X-Axis" + Me.cmdXAxis.UseVisualStyleBackColor = True + ' + 'cmdTitles + ' + Me.cmdTitles.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.cmdTitles.Location = New System.Drawing.Point(147, 401) + Me.cmdTitles.Name = "cmdTitles" + Me.cmdTitles.Size = New System.Drawing.Size(53, 25) + Me.cmdTitles.TabIndex = 22 + Me.cmdTitles.Tag = "" + Me.cmdTitles.Text = "Titles" + Me.cmdTitles.UseVisualStyleBackColor = True + ' + 'ucrChkLegend + ' + Me.ucrChkLegend.AutoSize = True + Me.ucrChkLegend.Checked = False + Me.ucrChkLegend.Location = New System.Drawing.Point(262, 279) + Me.ucrChkLegend.Name = "ucrChkLegend" + Me.ucrChkLegend.Size = New System.Drawing.Size(125, 24) + Me.ucrChkLegend.TabIndex = 23 + ' '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(416, 519) + Me.Controls.Add(Me.ucrChkLegend) + Me.Controls.Add(Me.cmdTitles) + Me.Controls.Add(Me.cmdXAxis) + Me.Controls.Add(Me.cmdYAxis) Me.Controls.Add(Me.cmdTheme) Me.Controls.Add(Me.cmdFacets) Me.Controls.Add(Me.ucrSave) @@ -226,4 +276,8 @@ Partial Class dlgGeneralForGraphics Friend WithEvents ucrSave As ucrSave Friend WithEvents cmdTheme As Button Friend WithEvents cmdFacets As Button + Friend WithEvents cmdTitles As Button + Friend WithEvents cmdXAxis As Button + Friend WithEvents cmdYAxis As Button + Friend WithEvents ucrChkLegend As ucrCheck End Class From a1269e8de36a394f933883a7d9197444a6308920 Mon Sep 17 00:00:00 2001 From: Sophie Malla Tatchum Date: Tue, 12 Sep 2023 12:36:01 +0100 Subject: [PATCH 02/14] minor change --- instat/dlgGeneralForGraphics.Designer.vb | 128 +- instat/dlgGeneralForGraphics.vb | 85 +- instat/sdgPlots.Designer.vb | 1952 +++++++++++----------- instat/sdgPlots.vb | 20 + 4 files changed, 1161 insertions(+), 1024 deletions(-) diff --git a/instat/dlgGeneralForGraphics.Designer.vb b/instat/dlgGeneralForGraphics.Designer.vb index 0fad1de1d4e..13cf2995f2d 100644 --- a/instat/dlgGeneralForGraphics.Designer.vb +++ b/instat/dlgGeneralForGraphics.Designer.vb @@ -44,7 +44,6 @@ Partial Class dlgGeneralForGraphics Me.cmdFacets = New System.Windows.Forms.Button() Me.cmdTheme = New System.Windows.Forms.Button() Me.ucrSave = New instat.ucrSave() - Me.ucrVariablesAsFactorForGraphics = New instat.ucrVariablesAsFactor() Me.ucrFillOrColourReceiver = New instat.ucrReceiverSingle() Me.ucrReceiverX = New instat.ucrReceiverSingle() Me.ucrGraphicsSelector = New instat.ucrSelectorByDataFrameAddRemove() @@ -54,6 +53,12 @@ Partial Class dlgGeneralForGraphics Me.cmdXAxis = New System.Windows.Forms.Button() Me.cmdTitles = New System.Windows.Forms.Button() Me.ucrChkLegend = New instat.ucrCheck() + Me.ucrChkFlipCoordinates = New instat.ucrCheck() + Me.lblYVariable = New System.Windows.Forms.Label() + Me.ucrChkSecondY = New instat.ucrCheck() + Me.lblSecondYVariable = New System.Windows.Forms.Label() + Me.ucrReceiverSecondYVariable = New instat.ucrReceiverSingle() + Me.ucrReceiverY = New instat.ucrReceiverSingle() Me.SuspendLayout() ' 'cmdOptions @@ -61,7 +66,7 @@ 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(78, 25) + Me.cmdOptions.Size = New System.Drawing.Size(135, 25) Me.cmdOptions.TabIndex = 6 Me.cmdOptions.Tag = "Options" Me.cmdOptions.Text = "Plot Options" @@ -71,7 +76,7 @@ Partial Class dlgGeneralForGraphics ' Me.lblXVariable.AutoSize = True Me.lblXVariable.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblXVariable.Location = New System.Drawing.Point(264, 183) + Me.lblXVariable.Location = New System.Drawing.Point(259, 21) Me.lblXVariable.Name = "lblXVariable" Me.lblXVariable.Size = New System.Drawing.Size(58, 13) Me.lblXVariable.TabIndex = 2 @@ -82,7 +87,7 @@ Partial Class dlgGeneralForGraphics ' Me.lblFillOrColor.AutoSize = True Me.lblFillOrColor.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblFillOrColor.Location = New System.Drawing.Point(264, 231) + Me.lblFillOrColor.Location = New System.Drawing.Point(259, 130) Me.lblFillOrColor.Name = "lblFillOrColor" Me.lblFillOrColor.Size = New System.Drawing.Size(57, 13) Me.lblFillOrColor.TabIndex = 4 @@ -92,7 +97,7 @@ Partial Class dlgGeneralForGraphics 'cmdFacets ' Me.cmdFacets.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdFacets.Location = New System.Drawing.Point(83, 401) + Me.cmdFacets.Location = New System.Drawing.Point(139, 401) Me.cmdFacets.Name = "cmdFacets" Me.cmdFacets.Size = New System.Drawing.Size(64, 25) Me.cmdFacets.TabIndex = 18 @@ -103,9 +108,9 @@ Partial Class dlgGeneralForGraphics 'cmdTheme ' Me.cmdTheme.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdTheme.Location = New System.Drawing.Point(329, 401) + Me.cmdTheme.Location = New System.Drawing.Point(360, 401) Me.cmdTheme.Name = "cmdTheme" - Me.cmdTheme.Size = New System.Drawing.Size(71, 25) + Me.cmdTheme.Size = New System.Drawing.Size(51, 25) Me.cmdTheme.TabIndex = 19 Me.cmdTheme.Tag = "Theme" Me.cmdTheme.Text = "Theme" @@ -120,24 +125,11 @@ Partial Class dlgGeneralForGraphics Me.ucrSave.Size = New System.Drawing.Size(346, 24) Me.ucrSave.TabIndex = 17 ' - 'ucrVariablesAsFactorForGraphics - ' - Me.ucrVariablesAsFactorForGraphics.AutoSize = True - Me.ucrVariablesAsFactorForGraphics.frmParent = Me - Me.ucrVariablesAsFactorForGraphics.Location = New System.Drawing.Point(262, 33) - Me.ucrVariablesAsFactorForGraphics.Name = "ucrVariablesAsFactorForGraphics" - Me.ucrVariablesAsFactorForGraphics.Selector = Nothing - Me.ucrVariablesAsFactorForGraphics.Size = New System.Drawing.Size(125, 136) - Me.ucrVariablesAsFactorForGraphics.strNcFilePath = "" - Me.ucrVariablesAsFactorForGraphics.TabIndex = 1 - Me.ucrVariablesAsFactorForGraphics.ucrSelector = Nothing - Me.ucrVariablesAsFactorForGraphics.ucrVariableSelector = Nothing - ' 'ucrFillOrColourReceiver ' Me.ucrFillOrColourReceiver.AutoSize = True Me.ucrFillOrColourReceiver.frmParent = Me - Me.ucrFillOrColourReceiver.Location = New System.Drawing.Point(262, 246) + Me.ucrFillOrColourReceiver.Location = New System.Drawing.Point(257, 145) Me.ucrFillOrColourReceiver.Margin = New System.Windows.Forms.Padding(0) Me.ucrFillOrColourReceiver.Name = "ucrFillOrColourReceiver" Me.ucrFillOrColourReceiver.Selector = Nothing @@ -150,7 +142,7 @@ Partial Class dlgGeneralForGraphics ' Me.ucrReceiverX.AutoSize = True Me.ucrReceiverX.frmParent = Me - Me.ucrReceiverX.Location = New System.Drawing.Point(262, 198) + Me.ucrReceiverX.Location = New System.Drawing.Point(257, 36) Me.ucrReceiverX.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverX.Name = "ucrReceiverX" Me.ucrReceiverX.Selector = Nothing @@ -191,9 +183,9 @@ Partial Class dlgGeneralForGraphics 'cmdYAxis ' Me.cmdYAxis.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdYAxis.Location = New System.Drawing.Point(260, 401) + Me.cmdYAxis.Location = New System.Drawing.Point(306, 401) Me.cmdYAxis.Name = "cmdYAxis" - Me.cmdYAxis.Size = New System.Drawing.Size(70, 25) + Me.cmdYAxis.Size = New System.Drawing.Size(56, 25) Me.cmdYAxis.TabIndex = 20 Me.cmdYAxis.Tag = "" Me.cmdYAxis.Text = "Y-Axis" @@ -202,9 +194,9 @@ Partial Class dlgGeneralForGraphics 'cmdXAxis ' Me.cmdXAxis.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdXAxis.Location = New System.Drawing.Point(199, 401) + Me.cmdXAxis.Location = New System.Drawing.Point(252, 401) Me.cmdXAxis.Name = "cmdXAxis" - Me.cmdXAxis.Size = New System.Drawing.Size(62, 25) + Me.cmdXAxis.Size = New System.Drawing.Size(56, 25) Me.cmdXAxis.TabIndex = 21 Me.cmdXAxis.Tag = "" Me.cmdXAxis.Text = "X-Axis" @@ -213,7 +205,7 @@ Partial Class dlgGeneralForGraphics 'cmdTitles ' Me.cmdTitles.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdTitles.Location = New System.Drawing.Point(147, 401) + Me.cmdTitles.Location = New System.Drawing.Point(201, 401) Me.cmdTitles.Name = "cmdTitles" Me.cmdTitles.Size = New System.Drawing.Size(53, 25) Me.cmdTitles.TabIndex = 22 @@ -225,17 +217,89 @@ Partial Class dlgGeneralForGraphics ' Me.ucrChkLegend.AutoSize = True Me.ucrChkLegend.Checked = False - Me.ucrChkLegend.Location = New System.Drawing.Point(262, 279) + Me.ucrChkLegend.Location = New System.Drawing.Point(257, 259) Me.ucrChkLegend.Name = "ucrChkLegend" Me.ucrChkLegend.Size = New System.Drawing.Size(125, 24) Me.ucrChkLegend.TabIndex = 23 ' + 'ucrChkFlipCoordinates + ' + Me.ucrChkFlipCoordinates.AutoSize = True + Me.ucrChkFlipCoordinates.Checked = False + Me.ucrChkFlipCoordinates.Location = New System.Drawing.Point(257, 290) + Me.ucrChkFlipCoordinates.Name = "ucrChkFlipCoordinates" + Me.ucrChkFlipCoordinates.Size = New System.Drawing.Size(125, 24) + Me.ucrChkFlipCoordinates.TabIndex = 24 + ' + 'lblYVariable + ' + Me.lblYVariable.AutoSize = True + Me.lblYVariable.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.lblYVariable.Location = New System.Drawing.Point(259, 76) + Me.lblYVariable.Name = "lblYVariable" + Me.lblYVariable.Size = New System.Drawing.Size(58, 13) + Me.lblYVariable.TabIndex = 25 + Me.lblYVariable.Tag = "Y_Variable:" + Me.lblYVariable.Text = "Y Variable:" + ' + 'ucrChkSecondY + ' + Me.ucrChkSecondY.AutoSize = True + Me.ucrChkSecondY.Checked = False + Me.ucrChkSecondY.Location = New System.Drawing.Point(257, 181) + Me.ucrChkSecondY.Name = "ucrChkSecondY" + Me.ucrChkSecondY.Size = New System.Drawing.Size(125, 24) + Me.ucrChkSecondY.TabIndex = 27 + ' + 'lblSecondYVariable + ' + Me.lblSecondYVariable.AutoSize = True + Me.lblSecondYVariable.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.lblSecondYVariable.Location = New System.Drawing.Point(254, 213) + Me.lblSecondYVariable.Name = "lblSecondYVariable" + Me.lblSecondYVariable.Size = New System.Drawing.Size(79, 13) + Me.lblSecondYVariable.TabIndex = 28 + Me.lblSecondYVariable.Tag = "" + Me.lblSecondYVariable.Text = "2nd Y Variable:" + ' + 'ucrReceiverSecondYVariable + ' + Me.ucrReceiverSecondYVariable.AutoSize = True + Me.ucrReceiverSecondYVariable.frmParent = Me + Me.ucrReceiverSecondYVariable.Location = New System.Drawing.Point(252, 228) + Me.ucrReceiverSecondYVariable.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverSecondYVariable.Name = "ucrReceiverSecondYVariable" + Me.ucrReceiverSecondYVariable.Selector = Nothing + Me.ucrReceiverSecondYVariable.Size = New System.Drawing.Size(125, 26) + Me.ucrReceiverSecondYVariable.strNcFilePath = "" + Me.ucrReceiverSecondYVariable.TabIndex = 29 + Me.ucrReceiverSecondYVariable.ucrSelector = Nothing + ' + 'ucrReceiverY + ' + Me.ucrReceiverY.AutoSize = True + Me.ucrReceiverY.frmParent = Me + Me.ucrReceiverY.Location = New System.Drawing.Point(257, 89) + Me.ucrReceiverY.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverY.Name = "ucrReceiverY" + Me.ucrReceiverY.Selector = Nothing + Me.ucrReceiverY.Size = New System.Drawing.Size(125, 20) + Me.ucrReceiverY.strNcFilePath = "" + Me.ucrReceiverY.TabIndex = 30 + Me.ucrReceiverY.ucrSelector = Nothing + ' '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(416, 519) + Me.Controls.Add(Me.ucrReceiverY) + Me.Controls.Add(Me.lblSecondYVariable) + Me.Controls.Add(Me.ucrReceiverSecondYVariable) + Me.Controls.Add(Me.ucrChkSecondY) + Me.Controls.Add(Me.lblYVariable) + Me.Controls.Add(Me.ucrChkFlipCoordinates) Me.Controls.Add(Me.ucrChkLegend) Me.Controls.Add(Me.cmdTitles) Me.Controls.Add(Me.cmdXAxis) @@ -245,7 +309,6 @@ Partial Class dlgGeneralForGraphics Me.Controls.Add(Me.ucrSave) Me.Controls.Add(Me.lblFillOrColor) Me.Controls.Add(Me.lblXVariable) - Me.Controls.Add(Me.ucrVariablesAsFactorForGraphics) Me.Controls.Add(Me.ucrFillOrColourReceiver) Me.Controls.Add(Me.ucrReceiverX) Me.Controls.Add(Me.ucrGraphicsSelector) @@ -268,7 +331,6 @@ Partial Class dlgGeneralForGraphics Friend WithEvents ucrAdditionalLayers As ucrAdditionalLayers Friend WithEvents cmdOptions As Button Friend WithEvents ucrGraphicsSelector As ucrSelectorByDataFrameAddRemove - Friend WithEvents ucrVariablesAsFactorForGraphics As ucrVariablesAsFactor Friend WithEvents ucrFillOrColourReceiver As ucrReceiverSingle Friend WithEvents ucrReceiverX As ucrReceiverSingle Friend WithEvents lblXVariable As Label @@ -280,4 +342,10 @@ Partial Class dlgGeneralForGraphics Friend WithEvents cmdXAxis As Button Friend WithEvents cmdYAxis As Button Friend WithEvents ucrChkLegend As ucrCheck + Friend WithEvents ucrChkFlipCoordinates As ucrCheck + Friend WithEvents lblYVariable As Label + Friend WithEvents lblSecondYVariable As Label + Friend WithEvents ucrReceiverSecondYVariable As ucrReceiverSingle + Friend WithEvents ucrChkSecondY As ucrCheck + Friend WithEvents ucrReceiverY As ucrReceiverSingle End Class diff --git a/instat/dlgGeneralForGraphics.vb b/instat/dlgGeneralForGraphics.vb index 4a6c454a5f2..3d5163c6778 100644 --- a/instat/dlgGeneralForGraphics.vb +++ b/instat/dlgGeneralForGraphics.vb @@ -47,6 +47,8 @@ Public Class dlgGeneralForGraphics Private clsScaleFillViridisFunction As New RFunction Private clsScaleColourViridisFunction As New RFunction Private clsAnnotateFunction As New RFunction + Public clsXYSecondaryAxisFunction As New RFunction + Public clsDummyFunction As New RFunction Private Sub dlgGeneralForGraphics_Load(sender As Object, e As EventArgs) Handles MyBase.Load If bFirstLoad Then @@ -73,14 +75,6 @@ Public Class dlgGeneralForGraphics ucrGraphicsSelector.SetParameter(New RParameter("data", 0)) ucrGraphicsSelector.SetParameterIsrfunction() - ucrVariablesAsFactorForGraphics.SetFactorReceiver(ucrFillOrColourReceiver) - ucrVariablesAsFactorForGraphics.Selector = ucrGraphicsSelector - ucrVariablesAsFactorForGraphics.strSelectorHeading = "Variables" - ucrVariablesAsFactorForGraphics.SetParameterIsString() - ucrVariablesAsFactorForGraphics.bWithQuotes = False - ucrVariablesAsFactorForGraphics.SetValuesToIgnore({Chr(34) & Chr(34)}) - ucrVariablesAsFactorForGraphics.bAddParameterIfEmpty = True - ucrReceiverX.Selector = ucrGraphicsSelector ucrReceiverX.strSelectorHeading = "Variables" ucrReceiverX.bWithQuotes = False @@ -88,12 +82,27 @@ Public Class dlgGeneralForGraphics ucrReceiverX.SetValuesToIgnore({Chr(34) & Chr(34)}) ucrReceiverX.bAddParameterIfEmpty = True + ucrReceiverY.Selector = ucrGraphicsSelector + ucrReceiverY.strSelectorHeading = "Variables" + ucrReceiverY.bWithQuotes = False + ucrReceiverY.SetParameterIsString() + ucrReceiverY.SetValuesToIgnore({Chr(34) & Chr(34)}) + ucrReceiverY.bAddParameterIfEmpty = True + ucrFillOrColourReceiver.Selector = ucrGraphicsSelector ucrFillOrColourReceiver.SetIncludedDataTypes({"factor"}) ucrFillOrColourReceiver.strSelectorHeading = "Factors" ucrFillOrColourReceiver.bWithQuotes = False ucrFillOrColourReceiver.SetParameterIsString() + ucrChkFlipCoordinates.SetParameter(New RParameter("coord_flip", 4), bNewChangeParameterValue:=True, bNewAddRemoveParameter:=True, strNewValueIfChecked:="TRUE", strNewValueIfUnchecked:="FALSE") + ucrChkFlipCoordinates.SetText("Flip Coordinates") + ucrChkFlipCoordinates.SetRDefault("FALSE") + + ucrChkSecondY.SetText("2nd Y Variable") + ucrChkSecondY.AddParameterPresentCondition(True, True) + ucrChkSecondY.AddParameterPresentCondition(False, False) + ucrSave.SetPrefix("graph") ucrSave.SetIsComboBox() ucrSave.SetSaveTypeAsGraph() @@ -111,7 +120,7 @@ Public Class dlgGeneralForGraphics ucrGraphicsSelector.Reset() ucrGraphicsSelector.SetGgplotFunction(clsBaseOperator) - ucrVariablesAsFactorForGraphics.SetMeAsReceiver() + ucrReceiverX.SetMeAsReceiver() bDataFrameSet = False bResetOptionsSubdialog = True @@ -155,9 +164,10 @@ Public Class dlgGeneralForGraphics Private Sub SetRCodeForControls(bReset As Boolean) ucrGraphicsSelector.SetRCode(clsGgplotFunction, bReset) - ucrVariablesAsFactorForGraphics.SetRCode(clsGlobalAesFunction, bReset) + ucrReceiverY.SetRCode(clsGlobalAesFunction, bReset) ucrReceiverX.SetRCode(clsGlobalAesFunction, bReset) ucrFillOrColourReceiver.SetRCode(clsGlobalAesFunction, bReset) + ucrChkFlipCoordinates.SetRCode(clsGlobalAesFunction, bReset) ucrSave.SetRCode(clsBaseOperator, bReset) End Sub @@ -168,7 +178,7 @@ Public Class dlgGeneralForGraphics End Sub Private Sub TestOKEnabled() - If Not ucrSave.IsComplete OrElse (ucrReceiverX.IsEmpty AndAlso ucrVariablesAsFactorForGraphics.IsEmpty) Then + If Not ucrSave.IsComplete OrElse (ucrReceiverX.IsEmpty AndAlso ucrReceiverY.IsEmpty) Then ucrBase.OKEnabled(False) Else ucrBase.OKEnabled(True) @@ -219,14 +229,57 @@ Public Class dlgGeneralForGraphics sdgPlots.EnableLayersTab() End Sub - Private Sub ucrVariablesAsFactorForGraphics_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrVariablesAsFactorForGraphics.ControlValueChanged, ucrReceiverX.ControlValueChanged, ucrFillOrColourReceiver.ControlValueChanged + Private Sub cmdTitles_Click(sender As Object, e As EventArgs) Handles cmdTitles.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, + clsNewXScaleDateFunction:=clsXScaleDateFunction, clsNewYScaleDateFunction:=clsYScaleDateFunction, ucrNewBaseSelector:=sdgLayerOptions.ucrGeomWithAes.ucrGeomWithAesSelector, clsNewAnnotateFunction:=clsAnnotateFunction, + clsNewCoordPolarFunction:=clsCoordPolarFunction, clsNewCoordPolarStartOperator:=clsCoordPolarStartOperator, bReset:=bResetSubdialog) + sdgPlots.tbpPlotsOptions.SelectedIndex = 2 + sdgPlots.ShowDialog() + bResetOptionsSubdialog = False + sdgPlots.EnableLayersTab() + End Sub + + Private Sub cmdXAxis_Click(sender As Object, e As EventArgs) Handles cmdXAxis.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, + clsNewXScaleDateFunction:=clsXScaleDateFunction, clsNewYScaleDateFunction:=clsYScaleDateFunction, ucrNewBaseSelector:=sdgLayerOptions.ucrGeomWithAes.ucrGeomWithAesSelector, clsNewAnnotateFunction:=clsAnnotateFunction, + clsNewCoordPolarFunction:=clsCoordPolarFunction, clsNewCoordPolarStartOperator:=clsCoordPolarStartOperator, bReset:=bResetSubdialog) + sdgPlots.tbpPlotsOptions.SelectedIndex = 3 + sdgPlots.ShowDialog() + bResetOptionsSubdialog = False + sdgPlots.EnableLayersTab() + End Sub + + Private Sub cmdYAxis_Click(sender As Object, e As EventArgs) Handles cmdYAxis.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, + clsNewXScaleDateFunction:=clsXScaleDateFunction, clsNewYScaleDateFunction:=clsYScaleDateFunction, ucrNewBaseSelector:=sdgLayerOptions.ucrGeomWithAes.ucrGeomWithAesSelector, clsNewAnnotateFunction:=clsAnnotateFunction, + clsNewCoordPolarFunction:=clsCoordPolarFunction, clsNewCoordPolarStartOperator:=clsCoordPolarStartOperator, bReset:=bResetSubdialog) + sdgPlots.tbpPlotsOptions.SelectedIndex = 4 + sdgPlots.ShowDialog() + bResetOptionsSubdialog = False + sdgPlots.EnableLayersTab() + End Sub + + Private Sub AllControl_ControlContentsChanged() Handles ucrReceiverX.ControlContentsChanged, ucrReceiverY.ControlContentsChanged, ucrSave.ControlContentsChanged + TestOKEnabled() + End Sub + + Private Sub ucrReceiverY_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrReceiverX.ControlValueChanged, ucrFillOrColourReceiver.ControlValueChanged If Not ucrReceiverX.IsEmpty Then clsGlobalAesFunction.AddParameter("x", ucrReceiverX.GetVariableNames(False), iPosition:=0) Else clsGlobalAesFunction.RemoveParameterByName("x") End If - If Not ucrVariablesAsFactorForGraphics.IsEmpty Then - clsGlobalAesFunction.AddParameter("y", ucrVariablesAsFactorForGraphics.GetVariableNames(False), iPosition:=1) + If Not ucrReceiverY.IsEmpty Then + clsGlobalAesFunction.AddParameter("y", ucrReceiverY.GetVariableNames(False), iPosition:=1) Else clsGlobalAesFunction.RemoveParameterByName("y") End If @@ -236,8 +289,4 @@ Public Class dlgGeneralForGraphics clsGlobalAesFunction.RemoveParameterByName("colour") End If End Sub - - Private Sub AllControl_ControlContentsChanged() Handles ucrReceiverX.ControlContentsChanged, ucrVariablesAsFactorForGraphics.ControlContentsChanged, ucrSave.ControlContentsChanged - TestOKEnabled() - End Sub End Class \ No newline at end of file diff --git a/instat/sdgPlots.Designer.vb b/instat/sdgPlots.Designer.vb index 5de86935b32..fe72166f02a 100644 --- a/instat/sdgPlots.Designer.vb +++ b/instat/sdgPlots.Designer.vb @@ -41,27 +41,12 @@ Partial Class sdgPlots Me.components = New System.ComponentModel.Container() Me.tbpPlotsOptions = New System.Windows.Forms.TabControl() Me.tbpFacet = New System.Windows.Forms.TabPage() - Me.ucrChkDrop = New instat.ucrCheck() - Me.ucrNudNumberofRows = New instat.ucrNud() - Me.ucrChkNoOfRowsOrColumns = New instat.ucrCheck() - Me.ucrChkIncludeFacets = New instat.ucrCheck() - Me.ucrChkLabeler = New instat.ucrCheck() - Me.ucrChkFreeSpace = New instat.ucrCheck() - Me.ucrChkFreeScalesY = New instat.ucrCheck() - Me.ucrChkFreeScalesX = New instat.ucrCheck() - Me.ucrChkMargin = New instat.ucrCheck() - Me.ucrFacetSelector = New instat.ucrSelectorByDataFrameAddRemove() Me.rdoHorizontal = New System.Windows.Forms.RadioButton() Me.rdoVertical = New System.Windows.Forms.RadioButton() Me.lblFactor2 = New System.Windows.Forms.Label() Me.lblFactor1 = New System.Windows.Forms.Label() - Me.ucr2ndFactorReceiver = New instat.ucrReceiverSingle() - Me.ucr1stFactorReceiver = New instat.ucrReceiverSingle() - Me.ucrPnlHorizonatalVertical = New instat.UcrPanel() Me.tbpLayers = New System.Windows.Forms.TabPage() - Me.ucrPlotsAdditionalLayers = New instat.ucrAdditionalLayers() Me.tbpTitles = New System.Windows.Forms.TabPage() - Me.ucrChkIncludeTitles = New instat.ucrCheck() Me.lblLegendSize = New System.Windows.Forms.Label() Me.lblTagSize = New System.Windows.Forms.Label() Me.lblCaptionSize = New System.Windows.Forms.Label() @@ -73,11 +58,74 @@ Partial Class sdgPlots Me.lblSubTitle = New System.Windows.Forms.Label() Me.lblTitle = New System.Windows.Forms.Label() Me.grpLegendTitle = New System.Windows.Forms.GroupBox() + Me.rdoLegendTitleCustom = New System.Windows.Forms.RadioButton() + Me.rdoLegendTitleAuto = New System.Windows.Forms.RadioButton() + Me.tbpXAxis = New System.Windows.Forms.TabPage() + Me.tbpYAxis = New System.Windows.Forms.TabPage() + Me.tbpTheme = New System.Windows.Forms.TabPage() + Me.cmdSimpleOptions = New System.Windows.Forms.Button() + Me.grpCommonOptions = New System.Windows.Forms.GroupBox() + Me.lblFont = New System.Windows.Forms.Label() + Me.cmdAllOptions = New System.Windows.Forms.Button() + Me.tbpCoordinates = New System.Windows.Forms.TabPage() + Me.grpPolarCordinates = New System.Windows.Forms.GroupBox() + Me.lblPolarCoordinate = New System.Windows.Forms.Label() + Me.lblStartingAngle = New System.Windows.Forms.Label() + Me.lblPi = New System.Windows.Forms.Label() + Me.tbpColour = New System.Windows.Forms.TabPage() + Me.grpColourScale = New System.Windows.Forms.GroupBox() + Me.lblColourScaleMapEnds = New System.Windows.Forms.Label() + Me.lblColourScaleMapBegins = New System.Windows.Forms.Label() + Me.lblColourScalePalette = New System.Windows.Forms.Label() + Me.lblColourScaleTransparency = New System.Windows.Forms.Label() + Me.grpFillScale = New System.Windows.Forms.GroupBox() + Me.lblFillScaleMapEnds = New System.Windows.Forms.Label() + Me.lblFillScaleBeginColour = New System.Windows.Forms.Label() + Me.lblFillScaleColourPalettte = New System.Windows.Forms.Label() + Me.lblFillScaleTransparency = New System.Windows.Forms.Label() + Me.tbpAnnotation = New System.Windows.Forms.TabPage() + Me.grpAnnotation = New System.Windows.Forms.GroupBox() + Me.lblCurvature = New System.Windows.Forms.Label() + Me.lblAlpha = New System.Windows.Forms.Label() + Me.lblLineend = New System.Windows.Forms.Label() + Me.lblAngle = New System.Windows.Forms.Label() + Me.lblShape = New System.Windows.Forms.Label() + Me.lblAnnotationGeoms = New System.Windows.Forms.Label() + Me.lblSize = New System.Windows.Forms.Label() + Me.lblColour = New System.Windows.Forms.Label() + Me.lblY = New System.Windows.Forms.Label() + Me.lblX = New System.Windows.Forms.Label() + Me.lblFill = New System.Windows.Forms.Label() + Me.lblXmax = New System.Windows.Forms.Label() + Me.lblYmin = New System.Windows.Forms.Label() + Me.lblXmin = New System.Windows.Forms.Label() + Me.lblXend = New System.Windows.Forms.Label() + Me.lblYmax = New System.Windows.Forms.Label() + Me.lblYend = New System.Windows.Forms.Label() + Me.lblLinetype = New System.Windows.Forms.Label() + Me.lblPointrangeFatten = New System.Windows.Forms.Label() + Me.lblCrossbarFatten = New System.Windows.Forms.Label() + Me.lblLabel = New System.Windows.Forms.Label() + Me.ttCaptionTitle = New System.Windows.Forms.ToolTip(Me.components) + Me.ucrBaseSubdialog = New instat.ucrButtonsSubdialogue() + Me.ucrChkDrop = New instat.ucrCheck() + Me.ucrNudNumberofRows = New instat.ucrNud() + Me.ucrChkNoOfRowsOrColumns = New instat.ucrCheck() + Me.ucrChkIncludeFacets = New instat.ucrCheck() + Me.ucrChkLabeler = New instat.ucrCheck() + Me.ucrChkFreeSpace = New instat.ucrCheck() + Me.ucrChkFreeScalesY = New instat.ucrCheck() + Me.ucrChkFreeScalesX = New instat.ucrCheck() + Me.ucrChkMargin = New instat.ucrCheck() + Me.ucrFacetSelector = New instat.ucrSelectorByDataFrameAddRemove() + Me.ucr2ndFactorReceiver = New instat.ucrReceiverSingle() + Me.ucr1stFactorReceiver = New instat.ucrReceiverSingle() + Me.ucrPnlHorizonatalVertical = New instat.UcrPanel() + Me.ucrPlotsAdditionalLayers = New instat.ucrAdditionalLayers() + Me.ucrChkIncludeTitles = New instat.ucrCheck() Me.ucrChkOverwriteLegendTitle = New instat.ucrCheck() Me.ucrChkDisplayLegendTitle = New instat.ucrCheck() Me.ucrInputLegend = New instat.ucrInputTextBox() - Me.rdoLegendTitleCustom = New System.Windows.Forms.RadioButton() - Me.rdoLegendTitleAuto = New System.Windows.Forms.RadioButton() Me.ucrPnlLegendTitle = New instat.UcrPanel() Me.ucrNudLegendSize = New instat.ucrNud() Me.ucrNudTagSize = New instat.ucrNud() @@ -91,13 +139,8 @@ Partial Class sdgPlots Me.ucrInputTag = New instat.ucrInputTextBox() Me.ucrInputGraphSubTitle = New instat.ucrInputTextBox() Me.ucrInputGraphTitle = New instat.ucrInputTextBox() - Me.tbpXAxis = New System.Windows.Forms.TabPage() Me.ucrXAxis = New instat.ucrAxes() - Me.tbpYAxis = New System.Windows.Forms.TabPage() Me.ucrYAxis = New instat.ucrAxes() - Me.tbpTheme = New System.Windows.Forms.TabPage() - Me.cmdSimpleOptions = New System.Windows.Forms.Button() - Me.grpCommonOptions = New System.Windows.Forms.GroupBox() Me.ucrNudYaxisMarkSize = New instat.ucrNud() Me.ucrNudXaxisMarkSize = New instat.ucrNud() Me.ucrNudYSize = New instat.ucrNud() @@ -110,95 +153,52 @@ Partial Class sdgPlots Me.ucrChkXaxisSize = New instat.ucrCheck() Me.ucrChkXaxisAngle = New instat.ucrCheck() Me.ucrChkLegendPosition = New instat.ucrCheck() - Me.lblFont = New System.Windows.Forms.Label() - Me.cmdAllOptions = New System.Windows.Forms.Button() Me.urChkSelectTheme = New instat.ucrCheck() Me.ucrInputThemes = New instat.ucrInputComboBox() - Me.tbpCoordinates = New System.Windows.Forms.TabPage() - Me.grpPolarCordinates = New System.Windows.Forms.GroupBox() Me.ucrInputPolarCoordinates = New instat.ucrInputComboBox() - Me.lblPolarCoordinate = New System.Windows.Forms.Label() - Me.lblStartingAngle = New System.Windows.Forms.Label() Me.ucrChkUsePolarCoordinates = New instat.ucrCheck() - Me.lblPi = New System.Windows.Forms.Label() Me.ucrChkDirectionAnticlockwise = New instat.ucrCheck() Me.ucrInputStartingAngle = New instat.ucrInputTextBox() Me.ucrChkSameScale = New instat.ucrCheck() Me.ucrChkHorizontalPlot = New instat.ucrCheck() - Me.tbpColour = New System.Windows.Forms.TabPage() Me.ucrChkAddColour = New instat.ucrCheck() Me.ucrChkAddFillScale = New instat.ucrCheck() - Me.grpColourScale = New System.Windows.Forms.GroupBox() Me.ucrChkColourDiscrete = New instat.ucrCheck() Me.ucrNudColourScaleTransparency = New instat.ucrNud() Me.ucrInputColourScalePalette = New instat.ucrInputComboBox() Me.ucrNudColourScaleMapEnds = New instat.ucrNud() Me.ucrNudColourScaleMapBegins = New instat.ucrNud() Me.ucrChkColourScaleReverseOrder = New instat.ucrCheck() - Me.lblColourScaleMapEnds = New System.Windows.Forms.Label() - Me.lblColourScaleMapBegins = New System.Windows.Forms.Label() - Me.lblColourScalePalette = New System.Windows.Forms.Label() - Me.lblColourScaleTransparency = New System.Windows.Forms.Label() - Me.grpFillScale = New System.Windows.Forms.GroupBox() Me.ucrChkFillDiscrete = New instat.ucrCheck() Me.ucrNudFillScaleTransparency = New instat.ucrNud() Me.ucrNudFillScaleMapEnds = New instat.ucrNud() Me.ucrNudFillScaleMapBegins = New instat.ucrNud() Me.ucrInputFillScaleColour = New instat.ucrInputComboBox() Me.ucrChkFillScaleReverseColourOrder = New instat.ucrCheck() - Me.lblFillScaleMapEnds = New System.Windows.Forms.Label() - Me.lblFillScaleBeginColour = New System.Windows.Forms.Label() - Me.lblFillScaleColourPalettte = New System.Windows.Forms.Label() - Me.lblFillScaleTransparency = New System.Windows.Forms.Label() - Me.tbpAnnotation = New System.Windows.Forms.TabPage() Me.ucrChkAnnotation = New instat.ucrCheck() - Me.grpAnnotation = New System.Windows.Forms.GroupBox() Me.ucrChkParse = New instat.ucrCheck() Me.ucrInputFill = New instat.ucrColors() Me.ucrInputColour = New instat.ucrColors() - Me.lblCurvature = New System.Windows.Forms.Label() Me.ucrNudAlpha = New instat.ucrNud() - Me.lblAlpha = New System.Windows.Forms.Label() - Me.lblLineend = New System.Windows.Forms.Label() - Me.lblAngle = New System.Windows.Forms.Label() Me.ucrNudAngle = New instat.ucrNud() - Me.lblShape = New System.Windows.Forms.Label() - Me.lblAnnotationGeoms = New System.Windows.Forms.Label() Me.ucrInputAnnotationGeoms = New instat.ucrInputComboBox() - Me.lblSize = New System.Windows.Forms.Label() Me.ucrNudSize = New instat.ucrNud() - Me.lblColour = New System.Windows.Forms.Label() - Me.lblY = New System.Windows.Forms.Label() - Me.lblX = New System.Windows.Forms.Label() - Me.lblFill = New System.Windows.Forms.Label() - Me.lblXmax = New System.Windows.Forms.Label() Me.ucrInputXmax = New instat.ucrInputTextBox() Me.ucrInputYmin = New instat.ucrInputTextBox() Me.ucrInputXmin = New instat.ucrInputTextBox() - Me.lblYmin = New System.Windows.Forms.Label() - Me.lblXmin = New System.Windows.Forms.Label() - Me.lblXend = New System.Windows.Forms.Label() - Me.lblYmax = New System.Windows.Forms.Label() Me.ucrInputYmax = New instat.ucrInputTextBox() Me.ucrInputYend = New instat.ucrInputTextBox() Me.ucrInputXend = New instat.ucrInputTextBox() - Me.lblYend = New System.Windows.Forms.Label() Me.ucrNudLinetype = New instat.ucrNud() - Me.lblLinetype = New System.Windows.Forms.Label() - Me.lblPointrangeFatten = New System.Windows.Forms.Label() Me.ucrNudPointrangeFatten = New instat.ucrNud() Me.ucrNudCrossbarFatten = New instat.ucrNud() - Me.lblCrossbarFatten = New System.Windows.Forms.Label() Me.ucrNudCurvature = New instat.ucrNud() Me.ucrNudShape = New instat.ucrNud() - Me.lblLabel = New System.Windows.Forms.Label() Me.ucrInputLabel = New instat.ucrInputTextBox() Me.ucrInputLineend = New instat.ucrInputComboBox() Me.ucrInputY = New instat.ucrInputTextBox() Me.ucrInputX = New instat.ucrInputTextBox() Me.ucrReceiverY = New instat.ucrReceiverSingle() - Me.ttCaptionTitle = New System.Windows.Forms.ToolTip(Me.components) - Me.ucrBaseSubdialog = New instat.ucrButtonsSubdialogue() Me.tbpPlotsOptions.SuspendLayout() Me.tbpFacet.SuspendLayout() Me.tbpLayers.SuspendLayout() @@ -262,103 +262,6 @@ Partial Class sdgPlots Me.tbpFacet.Text = "Facets" Me.tbpFacet.UseVisualStyleBackColor = True ' - 'ucrChkDrop - ' - Me.ucrChkDrop.AutoSize = True - Me.ucrChkDrop.Checked = False - Me.ucrChkDrop.Location = New System.Drawing.Point(273, 269) - Me.ucrChkDrop.Name = "ucrChkDrop" - Me.ucrChkDrop.Size = New System.Drawing.Size(257, 23) - Me.ucrChkDrop.TabIndex = 11 - ' - 'ucrNudNumberofRows - ' - Me.ucrNudNumberofRows.AutoSize = True - Me.ucrNudNumberofRows.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) - Me.ucrNudNumberofRows.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudNumberofRows.Location = New System.Drawing.Point(169, 252) - Me.ucrNudNumberofRows.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) - Me.ucrNudNumberofRows.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) - Me.ucrNudNumberofRows.Name = "ucrNudNumberofRows" - Me.ucrNudNumberofRows.Size = New System.Drawing.Size(46, 20) - Me.ucrNudNumberofRows.TabIndex = 15 - Me.ucrNudNumberofRows.Value = New Decimal(New Integer() {0, 0, 0, 0}) - ' - 'ucrChkNoOfRowsOrColumns - ' - Me.ucrChkNoOfRowsOrColumns.AutoSize = True - Me.ucrChkNoOfRowsOrColumns.Checked = False - Me.ucrChkNoOfRowsOrColumns.Location = New System.Drawing.Point(7, 254) - Me.ucrChkNoOfRowsOrColumns.Name = "ucrChkNoOfRowsOrColumns" - Me.ucrChkNoOfRowsOrColumns.Size = New System.Drawing.Size(156, 23) - Me.ucrChkNoOfRowsOrColumns.TabIndex = 14 - ' - 'ucrChkIncludeFacets - ' - Me.ucrChkIncludeFacets.AutoSize = True - Me.ucrChkIncludeFacets.Checked = False - Me.ucrChkIncludeFacets.Location = New System.Drawing.Point(8, 13) - Me.ucrChkIncludeFacets.Name = "ucrChkIncludeFacets" - Me.ucrChkIncludeFacets.Size = New System.Drawing.Size(121, 23) - Me.ucrChkIncludeFacets.TabIndex = 0 - ' - 'ucrChkLabeler - ' - Me.ucrChkLabeler.AutoSize = True - Me.ucrChkLabeler.Checked = False - Me.ucrChkLabeler.Location = New System.Drawing.Point(273, 245) - Me.ucrChkLabeler.Name = "ucrChkLabeler" - Me.ucrChkLabeler.Size = New System.Drawing.Size(257, 23) - Me.ucrChkLabeler.TabIndex = 10 - ' - 'ucrChkFreeSpace - ' - Me.ucrChkFreeSpace.AutoSize = True - Me.ucrChkFreeSpace.Checked = False - Me.ucrChkFreeSpace.Location = New System.Drawing.Point(273, 221) - Me.ucrChkFreeSpace.Name = "ucrChkFreeSpace" - Me.ucrChkFreeSpace.Size = New System.Drawing.Size(257, 23) - Me.ucrChkFreeSpace.TabIndex = 9 - ' - 'ucrChkFreeScalesY - ' - Me.ucrChkFreeScalesY.AutoSize = True - Me.ucrChkFreeScalesY.Checked = False - Me.ucrChkFreeScalesY.Location = New System.Drawing.Point(273, 197) - Me.ucrChkFreeScalesY.Name = "ucrChkFreeScalesY" - Me.ucrChkFreeScalesY.Size = New System.Drawing.Size(257, 23) - Me.ucrChkFreeScalesY.TabIndex = 8 - ' - 'ucrChkFreeScalesX - ' - Me.ucrChkFreeScalesX.AutoSize = True - Me.ucrChkFreeScalesX.Checked = False - Me.ucrChkFreeScalesX.Location = New System.Drawing.Point(273, 173) - Me.ucrChkFreeScalesX.Name = "ucrChkFreeScalesX" - Me.ucrChkFreeScalesX.Size = New System.Drawing.Size(257, 23) - Me.ucrChkFreeScalesX.TabIndex = 7 - ' - 'ucrChkMargin - ' - Me.ucrChkMargin.AutoSize = True - Me.ucrChkMargin.Checked = False - Me.ucrChkMargin.Location = New System.Drawing.Point(273, 149) - Me.ucrChkMargin.Name = "ucrChkMargin" - Me.ucrChkMargin.Size = New System.Drawing.Size(257, 23) - Me.ucrChkMargin.TabIndex = 6 - ' - 'ucrFacetSelector - ' - Me.ucrFacetSelector.AutoSize = True - Me.ucrFacetSelector.bDropUnusedFilterLevels = False - Me.ucrFacetSelector.bShowHiddenColumns = False - Me.ucrFacetSelector.bUseCurrentFilter = True - Me.ucrFacetSelector.Location = New System.Drawing.Point(8, 36) - Me.ucrFacetSelector.Margin = New System.Windows.Forms.Padding(0) - Me.ucrFacetSelector.Name = "ucrFacetSelector" - Me.ucrFacetSelector.Size = New System.Drawing.Size(213, 183) - Me.ucrFacetSelector.TabIndex = 1 - ' 'rdoHorizontal ' Me.rdoHorizontal.AutoSize = True @@ -406,61 +309,19 @@ Partial Class sdgPlots Me.lblFactor1.Tag = "" Me.lblFactor1.Text = "1st Factor:" ' - 'ucr2ndFactorReceiver + 'tbpLayers ' - Me.ucr2ndFactorReceiver.AutoSize = True - Me.ucr2ndFactorReceiver.frmParent = Nothing - Me.ucr2ndFactorReceiver.Location = New System.Drawing.Point(273, 114) - Me.ucr2ndFactorReceiver.Margin = New System.Windows.Forms.Padding(0) - Me.ucr2ndFactorReceiver.Name = "ucr2ndFactorReceiver" - Me.ucr2ndFactorReceiver.Selector = Nothing - Me.ucr2ndFactorReceiver.Size = New System.Drawing.Size(106, 26) - Me.ucr2ndFactorReceiver.strNcFilePath = "" - Me.ucr2ndFactorReceiver.TabIndex = 5 - Me.ucr2ndFactorReceiver.ucrSelector = Nothing + Me.tbpLayers.Controls.Add(Me.ucrPlotsAdditionalLayers) + Me.tbpLayers.Location = New System.Drawing.Point(4, 22) + Me.tbpLayers.Name = "tbpLayers" + Me.tbpLayers.Padding = New System.Windows.Forms.Padding(3) + Me.tbpLayers.Size = New System.Drawing.Size(669, 455) + Me.tbpLayers.TabIndex = 4 + Me.tbpLayers.Tag = "Layers" + Me.tbpLayers.Text = "Layers" + Me.tbpLayers.UseVisualStyleBackColor = True ' - 'ucr1stFactorReceiver - ' - Me.ucr1stFactorReceiver.AutoSize = True - Me.ucr1stFactorReceiver.frmParent = Nothing - Me.ucr1stFactorReceiver.Location = New System.Drawing.Point(273, 59) - Me.ucr1stFactorReceiver.Margin = New System.Windows.Forms.Padding(0) - Me.ucr1stFactorReceiver.Name = "ucr1stFactorReceiver" - Me.ucr1stFactorReceiver.Selector = Nothing - Me.ucr1stFactorReceiver.Size = New System.Drawing.Size(106, 26) - Me.ucr1stFactorReceiver.strNcFilePath = "" - Me.ucr1stFactorReceiver.TabIndex = 3 - Me.ucr1stFactorReceiver.ucrSelector = Nothing - ' - 'ucrPnlHorizonatalVertical - ' - Me.ucrPnlHorizonatalVertical.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrPnlHorizonatalVertical.Location = New System.Drawing.Point(8, 228) - Me.ucrPnlHorizonatalVertical.Name = "ucrPnlHorizonatalVertical" - Me.ucrPnlHorizonatalVertical.Size = New System.Drawing.Size(165, 20) - Me.ucrPnlHorizonatalVertical.TabIndex = 30 - ' - 'tbpLayers - ' - Me.tbpLayers.Controls.Add(Me.ucrPlotsAdditionalLayers) - Me.tbpLayers.Location = New System.Drawing.Point(4, 22) - Me.tbpLayers.Name = "tbpLayers" - Me.tbpLayers.Padding = New System.Windows.Forms.Padding(3) - Me.tbpLayers.Size = New System.Drawing.Size(669, 455) - Me.tbpLayers.TabIndex = 4 - Me.tbpLayers.Tag = "Layers" - Me.tbpLayers.Text = "Layers" - Me.tbpLayers.UseVisualStyleBackColor = True - ' - 'ucrPlotsAdditionalLayers - ' - Me.ucrPlotsAdditionalLayers.AutoSize = True - Me.ucrPlotsAdditionalLayers.Location = New System.Drawing.Point(7, 6) - Me.ucrPlotsAdditionalLayers.Name = "ucrPlotsAdditionalLayers" - Me.ucrPlotsAdditionalLayers.Size = New System.Drawing.Size(218, 191) - Me.ucrPlotsAdditionalLayers.TabIndex = 0 - ' - 'tbpTitles + 'tbpTitles ' Me.tbpTitles.Controls.Add(Me.ucrChkIncludeTitles) Me.tbpTitles.Controls.Add(Me.lblLegendSize) @@ -495,15 +356,6 @@ Partial Class sdgPlots Me.tbpTitles.Text = "Titles" Me.tbpTitles.UseVisualStyleBackColor = True ' - 'ucrChkIncludeTitles - ' - Me.ucrChkIncludeTitles.AutoSize = True - Me.ucrChkIncludeTitles.Checked = False - Me.ucrChkIncludeTitles.Location = New System.Drawing.Point(6, 10) - Me.ucrChkIncludeTitles.Name = "ucrChkIncludeTitles" - Me.ucrChkIncludeTitles.Size = New System.Drawing.Size(121, 23) - Me.ucrChkIncludeTitles.TabIndex = 55 - ' 'lblLegendSize ' Me.lblLegendSize.AutoSize = True @@ -620,35 +472,6 @@ Partial Class sdgPlots Me.grpLegendTitle.Text = "Legend Title" Me.grpLegendTitle.Visible = False ' - 'ucrChkOverwriteLegendTitle - ' - Me.ucrChkOverwriteLegendTitle.AutoSize = True - Me.ucrChkOverwriteLegendTitle.Checked = False - Me.ucrChkOverwriteLegendTitle.Location = New System.Drawing.Point(6, 75) - Me.ucrChkOverwriteLegendTitle.Name = "ucrChkOverwriteLegendTitle" - Me.ucrChkOverwriteLegendTitle.Size = New System.Drawing.Size(100, 23) - Me.ucrChkOverwriteLegendTitle.TabIndex = 14 - ' - 'ucrChkDisplayLegendTitle - ' - Me.ucrChkDisplayLegendTitle.AutoSize = True - Me.ucrChkDisplayLegendTitle.Checked = False - Me.ucrChkDisplayLegendTitle.Location = New System.Drawing.Point(6, 51) - Me.ucrChkDisplayLegendTitle.Name = "ucrChkDisplayLegendTitle" - Me.ucrChkDisplayLegendTitle.Size = New System.Drawing.Size(100, 23) - Me.ucrChkDisplayLegendTitle.TabIndex = 13 - ' - 'ucrInputLegend - ' - Me.ucrInputLegend.AddQuotesIfUnrecognised = True - Me.ucrInputLegend.AutoSize = True - Me.ucrInputLegend.IsMultiline = False - Me.ucrInputLegend.IsReadOnly = False - Me.ucrInputLegend.Location = New System.Drawing.Point(133, 74) - Me.ucrInputLegend.Name = "ucrInputLegend" - Me.ucrInputLegend.Size = New System.Drawing.Size(160, 21) - Me.ucrInputLegend.TabIndex = 11 - ' 'rdoLegendTitleCustom ' Me.rdoLegendTitleCustom.AutoSize = True @@ -673,160 +496,6 @@ Partial Class sdgPlots Me.rdoLegendTitleAuto.Text = "Auto" Me.rdoLegendTitleAuto.UseVisualStyleBackColor = True ' - 'ucrPnlLegendTitle - ' - Me.ucrPnlLegendTitle.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrPnlLegendTitle.Location = New System.Drawing.Point(4, 20) - Me.ucrPnlLegendTitle.Name = "ucrPnlLegendTitle" - Me.ucrPnlLegendTitle.Size = New System.Drawing.Size(117, 25) - Me.ucrPnlLegendTitle.TabIndex = 12 - ' - 'ucrNudLegendSize - ' - Me.ucrNudLegendSize.AutoSize = True - Me.ucrNudLegendSize.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) - Me.ucrNudLegendSize.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudLegendSize.Location = New System.Drawing.Point(434, 203) - Me.ucrNudLegendSize.Margin = New System.Windows.Forms.Padding(5) - Me.ucrNudLegendSize.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) - Me.ucrNudLegendSize.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) - Me.ucrNudLegendSize.Name = "ucrNudLegendSize" - Me.ucrNudLegendSize.Size = New System.Drawing.Size(50, 20) - Me.ucrNudLegendSize.TabIndex = 53 - Me.ucrNudLegendSize.Value = New Decimal(New Integer() {0, 0, 0, 0}) - ' - 'ucrNudTagSize - ' - Me.ucrNudTagSize.AutoSize = True - Me.ucrNudTagSize.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) - Me.ucrNudTagSize.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudTagSize.Location = New System.Drawing.Point(434, 165) - Me.ucrNudTagSize.Margin = New System.Windows.Forms.Padding(5) - Me.ucrNudTagSize.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) - Me.ucrNudTagSize.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) - Me.ucrNudTagSize.Name = "ucrNudTagSize" - Me.ucrNudTagSize.Size = New System.Drawing.Size(50, 20) - Me.ucrNudTagSize.TabIndex = 51 - Me.ucrNudTagSize.Value = New Decimal(New Integer() {0, 0, 0, 0}) - ' - 'ucrChkTag - ' - Me.ucrChkTag.AutoSize = True - Me.ucrChkTag.Checked = False - Me.ucrChkTag.Location = New System.Drawing.Point(6, 165) - Me.ucrChkTag.Name = "ucrChkTag" - Me.ucrChkTag.Size = New System.Drawing.Size(104, 23) - Me.ucrChkTag.TabIndex = 50 - ' - 'ucrChkNewLegend - ' - Me.ucrChkNewLegend.AutoSize = True - Me.ucrChkNewLegend.Checked = False - Me.ucrChkNewLegend.Location = New System.Drawing.Point(6, 203) - Me.ucrChkNewLegend.Name = "ucrChkNewLegend" - Me.ucrChkNewLegend.Size = New System.Drawing.Size(125, 23) - Me.ucrChkNewLegend.TabIndex = 49 - ' - 'ucrInputGraphCaption - ' - Me.ucrInputGraphCaption.AddQuotesIfUnrecognised = True - Me.ucrInputGraphCaption.AutoSize = True - Me.ucrInputGraphCaption.IsMultiline = True - Me.ucrInputGraphCaption.IsReadOnly = False - Me.ucrInputGraphCaption.Location = New System.Drawing.Point(126, 96) - Me.ucrInputGraphCaption.Margin = New System.Windows.Forms.Padding(7, 6, 7, 6) - Me.ucrInputGraphCaption.Name = "ucrInputGraphCaption" - Me.ucrInputGraphCaption.Size = New System.Drawing.Size(181, 53) - Me.ucrInputGraphCaption.TabIndex = 48 - ' - 'ucrNudCaptionSize - ' - Me.ucrNudCaptionSize.AutoSize = True - Me.ucrNudCaptionSize.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) - Me.ucrNudCaptionSize.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudCaptionSize.Location = New System.Drawing.Point(434, 113) - Me.ucrNudCaptionSize.Margin = New System.Windows.Forms.Padding(5) - Me.ucrNudCaptionSize.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) - Me.ucrNudCaptionSize.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) - Me.ucrNudCaptionSize.Name = "ucrNudCaptionSize" - Me.ucrNudCaptionSize.Size = New System.Drawing.Size(50, 20) - Me.ucrNudCaptionSize.TabIndex = 44 - Me.ucrNudCaptionSize.Value = New Decimal(New Integer() {0, 0, 0, 0}) - ' - 'ucrNudSubTitleSize - ' - Me.ucrNudSubTitleSize.AutoSize = True - Me.ucrNudSubTitleSize.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) - Me.ucrNudSubTitleSize.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudSubTitleSize.Location = New System.Drawing.Point(434, 67) - Me.ucrNudSubTitleSize.Margin = New System.Windows.Forms.Padding(5) - Me.ucrNudSubTitleSize.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) - Me.ucrNudSubTitleSize.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) - Me.ucrNudSubTitleSize.Name = "ucrNudSubTitleSize" - Me.ucrNudSubTitleSize.Size = New System.Drawing.Size(50, 20) - Me.ucrNudSubTitleSize.TabIndex = 43 - Me.ucrNudSubTitleSize.Value = New Decimal(New Integer() {0, 0, 0, 0}) - ' - 'ucrNudTitleSize - ' - Me.ucrNudTitleSize.AutoSize = True - Me.ucrNudTitleSize.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) - Me.ucrNudTitleSize.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudTitleSize.Location = New System.Drawing.Point(434, 37) - Me.ucrNudTitleSize.Margin = New System.Windows.Forms.Padding(5) - Me.ucrNudTitleSize.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) - Me.ucrNudTitleSize.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) - Me.ucrNudTitleSize.Name = "ucrNudTitleSize" - Me.ucrNudTitleSize.Size = New System.Drawing.Size(50, 20) - Me.ucrNudTitleSize.TabIndex = 42 - Me.ucrNudTitleSize.Value = New Decimal(New Integer() {0, 0, 0, 0}) - ' - 'ucrInputLegendTitle - ' - Me.ucrInputLegendTitle.AddQuotesIfUnrecognised = True - Me.ucrInputLegendTitle.AutoSize = True - Me.ucrInputLegendTitle.IsMultiline = False - Me.ucrInputLegendTitle.IsReadOnly = False - Me.ucrInputLegendTitle.Location = New System.Drawing.Point(205, 203) - Me.ucrInputLegendTitle.Margin = New System.Windows.Forms.Padding(7, 6, 7, 6) - Me.ucrInputLegendTitle.Name = "ucrInputLegendTitle" - Me.ucrInputLegendTitle.Size = New System.Drawing.Size(71, 21) - Me.ucrInputLegendTitle.TabIndex = 38 - ' - 'ucrInputTag - ' - Me.ucrInputTag.AddQuotesIfUnrecognised = True - Me.ucrInputTag.AutoSize = True - Me.ucrInputTag.IsMultiline = False - Me.ucrInputTag.IsReadOnly = False - Me.ucrInputTag.Location = New System.Drawing.Point(205, 165) - Me.ucrInputTag.Margin = New System.Windows.Forms.Padding(7, 6, 7, 6) - Me.ucrInputTag.Name = "ucrInputTag" - Me.ucrInputTag.Size = New System.Drawing.Size(71, 21) - Me.ucrInputTag.TabIndex = 35 - ' - 'ucrInputGraphSubTitle - ' - Me.ucrInputGraphSubTitle.AddQuotesIfUnrecognised = True - Me.ucrInputGraphSubTitle.AutoSize = True - Me.ucrInputGraphSubTitle.IsMultiline = False - Me.ucrInputGraphSubTitle.IsReadOnly = False - Me.ucrInputGraphSubTitle.Location = New System.Drawing.Point(126, 68) - Me.ucrInputGraphSubTitle.Name = "ucrInputGraphSubTitle" - Me.ucrInputGraphSubTitle.Size = New System.Drawing.Size(166, 21) - Me.ucrInputGraphSubTitle.TabIndex = 9 - ' - 'ucrInputGraphTitle - ' - Me.ucrInputGraphTitle.AddQuotesIfUnrecognised = True - Me.ucrInputGraphTitle.AutoSize = True - Me.ucrInputGraphTitle.IsMultiline = False - Me.ucrInputGraphTitle.IsReadOnly = False - Me.ucrInputGraphTitle.Location = New System.Drawing.Point(126, 41) - Me.ucrInputGraphTitle.Name = "ucrInputGraphTitle" - Me.ucrInputGraphTitle.Size = New System.Drawing.Size(166, 21) - Me.ucrInputGraphTitle.TabIndex = 9 - ' 'tbpXAxis ' Me.tbpXAxis.Controls.Add(Me.ucrXAxis) @@ -838,14 +507,6 @@ Partial Class sdgPlots Me.tbpXAxis.Text = "X-Axis" Me.tbpXAxis.UseVisualStyleBackColor = True ' - 'ucrXAxis - ' - Me.ucrXAxis.AutoSize = True - Me.ucrXAxis.Location = New System.Drawing.Point(-4, 3) - Me.ucrXAxis.Name = "ucrXAxis" - Me.ucrXAxis.Size = New System.Drawing.Size(669, 463) - Me.ucrXAxis.TabIndex = 0 - ' 'tbpYAxis ' Me.tbpYAxis.Controls.Add(Me.ucrYAxis) @@ -857,14 +518,6 @@ Partial Class sdgPlots Me.tbpYAxis.Text = "Y-Axis" Me.tbpYAxis.UseVisualStyleBackColor = True ' - 'ucrYAxis - ' - Me.ucrYAxis.AutoSize = True - Me.ucrYAxis.Location = New System.Drawing.Point(0, 1) - Me.ucrYAxis.Name = "ucrYAxis" - Me.ucrYAxis.Size = New System.Drawing.Size(669, 463) - Me.ucrYAxis.TabIndex = 0 - ' 'tbpTheme ' Me.tbpTheme.Controls.Add(Me.cmdSimpleOptions) @@ -913,18 +566,865 @@ Partial Class sdgPlots Me.grpCommonOptions.TabStop = False Me.grpCommonOptions.Text = "Common Options" ' - 'ucrNudYaxisMarkSize - ' - Me.ucrNudYaxisMarkSize.AutoSize = True - Me.ucrNudYaxisMarkSize.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) - Me.ucrNudYaxisMarkSize.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudYaxisMarkSize.Location = New System.Drawing.Point(246, 205) - Me.ucrNudYaxisMarkSize.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) - Me.ucrNudYaxisMarkSize.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) - Me.ucrNudYaxisMarkSize.Name = "ucrNudYaxisMarkSize" - Me.ucrNudYaxisMarkSize.Size = New System.Drawing.Size(50, 20) - Me.ucrNudYaxisMarkSize.TabIndex = 11 - Me.ucrNudYaxisMarkSize.Value = New Decimal(New Integer() {0, 0, 0, 0}) + 'lblFont + ' + Me.lblFont.AutoSize = True + Me.lblFont.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.lblFont.Location = New System.Drawing.Point(233, 49) + Me.lblFont.Name = "lblFont" + Me.lblFont.Size = New System.Drawing.Size(0, 13) + Me.lblFont.TabIndex = 4 + ' + 'cmdAllOptions + ' + Me.cmdAllOptions.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.cmdAllOptions.Location = New System.Drawing.Point(29, 49) + Me.cmdAllOptions.Name = "cmdAllOptions" + Me.cmdAllOptions.Size = New System.Drawing.Size(139, 23) + Me.cmdAllOptions.TabIndex = 2 + Me.cmdAllOptions.Text = "All Options" + Me.cmdAllOptions.UseVisualStyleBackColor = True + ' + 'tbpCoordinates + ' + Me.tbpCoordinates.Controls.Add(Me.grpPolarCordinates) + Me.tbpCoordinates.Controls.Add(Me.ucrChkSameScale) + Me.tbpCoordinates.Controls.Add(Me.ucrChkHorizontalPlot) + Me.tbpCoordinates.Location = New System.Drawing.Point(4, 22) + Me.tbpCoordinates.Name = "tbpCoordinates" + Me.tbpCoordinates.Padding = New System.Windows.Forms.Padding(3) + Me.tbpCoordinates.Size = New System.Drawing.Size(669, 455) + Me.tbpCoordinates.TabIndex = 7 + Me.tbpCoordinates.Text = "Coordinates" + Me.tbpCoordinates.UseVisualStyleBackColor = True + ' + 'grpPolarCordinates + ' + Me.grpPolarCordinates.Controls.Add(Me.ucrInputPolarCoordinates) + Me.grpPolarCordinates.Controls.Add(Me.lblPolarCoordinate) + Me.grpPolarCordinates.Controls.Add(Me.lblStartingAngle) + Me.grpPolarCordinates.Controls.Add(Me.ucrChkUsePolarCoordinates) + Me.grpPolarCordinates.Controls.Add(Me.lblPi) + Me.grpPolarCordinates.Controls.Add(Me.ucrChkDirectionAnticlockwise) + Me.grpPolarCordinates.Controls.Add(Me.ucrInputStartingAngle) + Me.grpPolarCordinates.Location = New System.Drawing.Point(3, 67) + Me.grpPolarCordinates.Name = "grpPolarCordinates" + Me.grpPolarCordinates.Size = New System.Drawing.Size(300, 136) + Me.grpPolarCordinates.TabIndex = 22 + Me.grpPolarCordinates.TabStop = False + Me.grpPolarCordinates.Text = "Polar Cordinates" + ' + 'lblPolarCoordinate + ' + Me.lblPolarCoordinate.AutoSize = True + Me.lblPolarCoordinate.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.lblPolarCoordinate.Location = New System.Drawing.Point(10, 46) + Me.lblPolarCoordinate.Name = "lblPolarCoordinate" + Me.lblPolarCoordinate.Size = New System.Drawing.Size(88, 13) + Me.lblPolarCoordinate.TabIndex = 23 + Me.lblPolarCoordinate.Text = "Polar Coordinate:" + ' + 'lblStartingAngle + ' + Me.lblStartingAngle.AutoSize = True + Me.lblStartingAngle.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.lblStartingAngle.Location = New System.Drawing.Point(10, 99) + Me.lblStartingAngle.Name = "lblStartingAngle" + Me.lblStartingAngle.Size = New System.Drawing.Size(76, 13) + Me.lblStartingAngle.TabIndex = 22 + Me.lblStartingAngle.Text = "Starting Angle:" + ' + 'lblPi + ' + Me.lblPi.AutoSize = True + Me.lblPi.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.lblPi.Location = New System.Drawing.Point(191, 103) + Me.lblPi.Name = "lblPi" + Me.lblPi.Size = New System.Drawing.Size(15, 13) + Me.lblPi.TabIndex = 21 + Me.lblPi.Tag = "" + Me.lblPi.Text = "pi" + ' + 'tbpColour + ' + Me.tbpColour.Controls.Add(Me.ucrChkAddColour) + Me.tbpColour.Controls.Add(Me.ucrChkAddFillScale) + Me.tbpColour.Controls.Add(Me.grpColourScale) + Me.tbpColour.Controls.Add(Me.grpFillScale) + Me.tbpColour.Location = New System.Drawing.Point(4, 22) + Me.tbpColour.Name = "tbpColour" + Me.tbpColour.Padding = New System.Windows.Forms.Padding(3) + Me.tbpColour.Size = New System.Drawing.Size(669, 455) + Me.tbpColour.TabIndex = 8 + Me.tbpColour.Text = "Colour" + Me.tbpColour.UseVisualStyleBackColor = True + ' + 'grpColourScale + ' + Me.grpColourScale.Controls.Add(Me.ucrChkColourDiscrete) + Me.grpColourScale.Controls.Add(Me.ucrNudColourScaleTransparency) + Me.grpColourScale.Controls.Add(Me.ucrInputColourScalePalette) + Me.grpColourScale.Controls.Add(Me.ucrNudColourScaleMapEnds) + Me.grpColourScale.Controls.Add(Me.ucrNudColourScaleMapBegins) + Me.grpColourScale.Controls.Add(Me.ucrChkColourScaleReverseOrder) + Me.grpColourScale.Controls.Add(Me.lblColourScaleMapEnds) + Me.grpColourScale.Controls.Add(Me.lblColourScaleMapBegins) + Me.grpColourScale.Controls.Add(Me.lblColourScalePalette) + Me.grpColourScale.Controls.Add(Me.lblColourScaleTransparency) + Me.grpColourScale.Location = New System.Drawing.Point(13, 236) + Me.grpColourScale.Name = "grpColourScale" + Me.grpColourScale.Size = New System.Drawing.Size(444, 181) + Me.grpColourScale.TabIndex = 25 + Me.grpColourScale.TabStop = False + Me.grpColourScale.Text = "Colour Scale" + ' + 'lblColourScaleMapEnds + ' + Me.lblColourScaleMapEnds.AutoSize = True + Me.lblColourScaleMapEnds.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.lblColourScaleMapEnds.Location = New System.Drawing.Point(7, 100) + Me.lblColourScaleMapEnds.Name = "lblColourScaleMapEnds" + Me.lblColourScaleMapEnds.Size = New System.Drawing.Size(198, 13) + Me.lblColourScaleMapEnds.TabIndex = 3 + Me.lblColourScaleMapEnds.Text = "Corrected Hue Where Colour Map Ends:" + ' + 'lblColourScaleMapBegins + ' + Me.lblColourScaleMapBegins.AutoSize = True + Me.lblColourScaleMapBegins.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.lblColourScaleMapBegins.Location = New System.Drawing.Point(7, 75) + Me.lblColourScaleMapBegins.Name = "lblColourScaleMapBegins" + Me.lblColourScaleMapBegins.Size = New System.Drawing.Size(206, 13) + Me.lblColourScaleMapBegins.TabIndex = 2 + Me.lblColourScaleMapBegins.Text = "Corrected Hue Where Colour Map Begins:" + ' + 'lblColourScalePalette + ' + Me.lblColourScalePalette.AutoSize = True + Me.lblColourScalePalette.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.lblColourScalePalette.Location = New System.Drawing.Point(7, 25) + Me.lblColourScalePalette.Name = "lblColourScalePalette" + Me.lblColourScalePalette.Size = New System.Drawing.Size(76, 13) + Me.lblColourScalePalette.TabIndex = 1 + Me.lblColourScalePalette.Text = "Colour Palette:" + ' + 'lblColourScaleTransparency + ' + Me.lblColourScaleTransparency.AutoSize = True + Me.lblColourScaleTransparency.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.lblColourScaleTransparency.Location = New System.Drawing.Point(7, 50) + Me.lblColourScaleTransparency.Name = "lblColourScaleTransparency" + Me.lblColourScaleTransparency.Size = New System.Drawing.Size(75, 13) + Me.lblColourScaleTransparency.TabIndex = 0 + Me.lblColourScaleTransparency.Text = "Transparency:" + ' + 'grpFillScale + ' + Me.grpFillScale.Controls.Add(Me.ucrChkFillDiscrete) + Me.grpFillScale.Controls.Add(Me.ucrNudFillScaleTransparency) + Me.grpFillScale.Controls.Add(Me.ucrNudFillScaleMapEnds) + Me.grpFillScale.Controls.Add(Me.ucrNudFillScaleMapBegins) + Me.grpFillScale.Controls.Add(Me.ucrInputFillScaleColour) + Me.grpFillScale.Controls.Add(Me.ucrChkFillScaleReverseColourOrder) + Me.grpFillScale.Controls.Add(Me.lblFillScaleMapEnds) + Me.grpFillScale.Controls.Add(Me.lblFillScaleBeginColour) + Me.grpFillScale.Controls.Add(Me.lblFillScaleColourPalettte) + Me.grpFillScale.Controls.Add(Me.lblFillScaleTransparency) + Me.grpFillScale.Location = New System.Drawing.Point(13, 30) + Me.grpFillScale.Name = "grpFillScale" + Me.grpFillScale.Size = New System.Drawing.Size(444, 174) + Me.grpFillScale.TabIndex = 23 + Me.grpFillScale.TabStop = False + Me.grpFillScale.Text = "Fill Scale" + ' + 'lblFillScaleMapEnds + ' + Me.lblFillScaleMapEnds.AutoSize = True + Me.lblFillScaleMapEnds.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.lblFillScaleMapEnds.Location = New System.Drawing.Point(7, 98) + Me.lblFillScaleMapEnds.Name = "lblFillScaleMapEnds" + Me.lblFillScaleMapEnds.Size = New System.Drawing.Size(198, 13) + Me.lblFillScaleMapEnds.TabIndex = 3 + Me.lblFillScaleMapEnds.Text = "Corrected Hue Where Colour Map Ends:" + ' + 'lblFillScaleBeginColour + ' + Me.lblFillScaleBeginColour.AutoSize = True + Me.lblFillScaleBeginColour.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.lblFillScaleBeginColour.Location = New System.Drawing.Point(7, 73) + Me.lblFillScaleBeginColour.Name = "lblFillScaleBeginColour" + Me.lblFillScaleBeginColour.Size = New System.Drawing.Size(206, 13) + Me.lblFillScaleBeginColour.TabIndex = 2 + Me.lblFillScaleBeginColour.Text = "Corrected Hue Where Colour Map Begins:" + ' + 'lblFillScaleColourPalettte + ' + Me.lblFillScaleColourPalettte.AutoSize = True + Me.lblFillScaleColourPalettte.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.lblFillScaleColourPalettte.Location = New System.Drawing.Point(7, 23) + Me.lblFillScaleColourPalettte.Name = "lblFillScaleColourPalettte" + Me.lblFillScaleColourPalettte.Size = New System.Drawing.Size(76, 13) + Me.lblFillScaleColourPalettte.TabIndex = 1 + Me.lblFillScaleColourPalettte.Text = "Colour Palette:" + ' + 'lblFillScaleTransparency + ' + Me.lblFillScaleTransparency.AutoSize = True + Me.lblFillScaleTransparency.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.lblFillScaleTransparency.Location = New System.Drawing.Point(7, 48) + Me.lblFillScaleTransparency.Name = "lblFillScaleTransparency" + Me.lblFillScaleTransparency.Size = New System.Drawing.Size(75, 13) + Me.lblFillScaleTransparency.TabIndex = 0 + Me.lblFillScaleTransparency.Text = "Transparency:" + ' + 'tbpAnnotation + ' + Me.tbpAnnotation.Controls.Add(Me.ucrChkAnnotation) + Me.tbpAnnotation.Controls.Add(Me.grpAnnotation) + Me.tbpAnnotation.Location = New System.Drawing.Point(4, 22) + Me.tbpAnnotation.Name = "tbpAnnotation" + Me.tbpAnnotation.Padding = New System.Windows.Forms.Padding(3) + Me.tbpAnnotation.Size = New System.Drawing.Size(669, 455) + Me.tbpAnnotation.TabIndex = 9 + Me.tbpAnnotation.Text = "Annotation" + Me.tbpAnnotation.UseVisualStyleBackColor = True + ' + 'grpAnnotation + ' + Me.grpAnnotation.Controls.Add(Me.ucrChkParse) + Me.grpAnnotation.Controls.Add(Me.ucrInputFill) + Me.grpAnnotation.Controls.Add(Me.ucrInputColour) + Me.grpAnnotation.Controls.Add(Me.lblCurvature) + Me.grpAnnotation.Controls.Add(Me.ucrNudAlpha) + Me.grpAnnotation.Controls.Add(Me.lblAlpha) + Me.grpAnnotation.Controls.Add(Me.lblLineend) + Me.grpAnnotation.Controls.Add(Me.lblAngle) + Me.grpAnnotation.Controls.Add(Me.ucrNudAngle) + Me.grpAnnotation.Controls.Add(Me.lblShape) + Me.grpAnnotation.Controls.Add(Me.lblAnnotationGeoms) + Me.grpAnnotation.Controls.Add(Me.ucrInputAnnotationGeoms) + Me.grpAnnotation.Controls.Add(Me.lblSize) + Me.grpAnnotation.Controls.Add(Me.ucrNudSize) + Me.grpAnnotation.Controls.Add(Me.lblColour) + Me.grpAnnotation.Controls.Add(Me.lblY) + Me.grpAnnotation.Controls.Add(Me.lblX) + Me.grpAnnotation.Controls.Add(Me.lblFill) + Me.grpAnnotation.Controls.Add(Me.lblXmax) + Me.grpAnnotation.Controls.Add(Me.ucrInputXmax) + Me.grpAnnotation.Controls.Add(Me.ucrInputYmin) + Me.grpAnnotation.Controls.Add(Me.ucrInputXmin) + Me.grpAnnotation.Controls.Add(Me.lblYmin) + Me.grpAnnotation.Controls.Add(Me.lblXmin) + Me.grpAnnotation.Controls.Add(Me.lblXend) + Me.grpAnnotation.Controls.Add(Me.lblYmax) + Me.grpAnnotation.Controls.Add(Me.ucrInputYmax) + Me.grpAnnotation.Controls.Add(Me.ucrInputYend) + Me.grpAnnotation.Controls.Add(Me.ucrInputXend) + Me.grpAnnotation.Controls.Add(Me.lblYend) + Me.grpAnnotation.Controls.Add(Me.ucrNudLinetype) + Me.grpAnnotation.Controls.Add(Me.lblLinetype) + Me.grpAnnotation.Controls.Add(Me.lblPointrangeFatten) + Me.grpAnnotation.Controls.Add(Me.ucrNudPointrangeFatten) + Me.grpAnnotation.Controls.Add(Me.ucrNudCrossbarFatten) + Me.grpAnnotation.Controls.Add(Me.lblCrossbarFatten) + Me.grpAnnotation.Controls.Add(Me.ucrNudCurvature) + Me.grpAnnotation.Controls.Add(Me.ucrNudShape) + Me.grpAnnotation.Controls.Add(Me.lblLabel) + Me.grpAnnotation.Controls.Add(Me.ucrInputLabel) + Me.grpAnnotation.Controls.Add(Me.ucrInputLineend) + Me.grpAnnotation.Controls.Add(Me.ucrInputY) + Me.grpAnnotation.Controls.Add(Me.ucrInputX) + Me.grpAnnotation.Controls.Add(Me.ucrReceiverY) + Me.grpAnnotation.Location = New System.Drawing.Point(7, 43) + Me.grpAnnotation.Name = "grpAnnotation" + Me.grpAnnotation.Size = New System.Drawing.Size(459, 374) + Me.grpAnnotation.TabIndex = 43 + Me.grpAnnotation.TabStop = False + Me.grpAnnotation.Text = "Annotation" + ' + 'lblCurvature + ' + Me.lblCurvature.AutoSize = True + Me.lblCurvature.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.lblCurvature.Location = New System.Drawing.Point(7, 184) + Me.lblCurvature.Name = "lblCurvature" + Me.lblCurvature.Size = New System.Drawing.Size(58, 13) + Me.lblCurvature.TabIndex = 85 + Me.lblCurvature.Text = "curvature :" + ' + 'lblAlpha + ' + Me.lblAlpha.AutoSize = True + Me.lblAlpha.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.lblAlpha.Location = New System.Drawing.Point(26, 135) + Me.lblAlpha.Name = "lblAlpha" + Me.lblAlpha.Size = New System.Drawing.Size(39, 13) + Me.lblAlpha.TabIndex = 19 + Me.lblAlpha.Text = "alpha :" + ' + 'lblLineend + ' + Me.lblLineend.AutoSize = True + Me.lblLineend.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.lblLineend.Location = New System.Drawing.Point(18, 184) + Me.lblLineend.Name = "lblLineend" + Me.lblLineend.Size = New System.Drawing.Size(47, 13) + Me.lblLineend.TabIndex = 83 + Me.lblLineend.Text = "lineend :" + ' + 'lblAngle + ' + Me.lblAngle.AutoSize = True + Me.lblAngle.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.lblAngle.Location = New System.Drawing.Point(26, 208) + Me.lblAngle.Name = "lblAngle" + Me.lblAngle.Size = New System.Drawing.Size(39, 13) + Me.lblAngle.TabIndex = 80 + Me.lblAngle.Text = "angle :" + ' + 'lblShape + ' + Me.lblShape.AutoSize = True + Me.lblShape.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.lblShape.Location = New System.Drawing.Point(23, 210) + Me.lblShape.Name = "lblShape" + Me.lblShape.Size = New System.Drawing.Size(42, 13) + Me.lblShape.TabIndex = 79 + Me.lblShape.Text = "shape :" + ' + 'lblAnnotationGeoms + ' + Me.lblAnnotationGeoms.AutoSize = True + Me.lblAnnotationGeoms.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.lblAnnotationGeoms.Location = New System.Drawing.Point(25, 24) + Me.lblAnnotationGeoms.Name = "lblAnnotationGeoms" + Me.lblAnnotationGeoms.Size = New System.Drawing.Size(41, 13) + Me.lblAnnotationGeoms.TabIndex = 77 + Me.lblAnnotationGeoms.Text = "Geom :" + ' + 'lblSize + ' + Me.lblSize.AutoSize = True + Me.lblSize.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.lblSize.Location = New System.Drawing.Point(34, 111) + Me.lblSize.Name = "lblSize" + Me.lblSize.Size = New System.Drawing.Size(31, 13) + Me.lblSize.TabIndex = 75 + Me.lblSize.Text = "size :" + ' + 'lblColour + ' + Me.lblColour.AutoSize = True + Me.lblColour.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.lblColour.Location = New System.Drawing.Point(23, 87) + Me.lblColour.Name = "lblColour" + Me.lblColour.Size = New System.Drawing.Size(42, 13) + Me.lblColour.TabIndex = 73 + Me.lblColour.Text = "colour :" + ' + 'lblY + ' + Me.lblY.AutoSize = True + Me.lblY.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.lblY.Location = New System.Drawing.Point(291, 56) + Me.lblY.Name = "lblY" + Me.lblY.Size = New System.Drawing.Size(18, 13) + Me.lblY.TabIndex = 69 + Me.lblY.Text = "y :" + ' + 'lblX + ' + Me.lblX.AutoSize = True + Me.lblX.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.lblX.Location = New System.Drawing.Point(294, 31) + Me.lblX.Name = "lblX" + Me.lblX.Size = New System.Drawing.Size(15, 13) + Me.lblX.TabIndex = 68 + Me.lblX.Text = "x:" + ' + 'lblFill + ' + Me.lblFill.AutoSize = True + Me.lblFill.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.lblFill.Location = New System.Drawing.Point(43, 184) + Me.lblFill.Name = "lblFill" + Me.lblFill.Size = New System.Drawing.Size(22, 13) + Me.lblFill.TabIndex = 61 + Me.lblFill.Text = "fill :" + ' + 'lblXmax + ' + Me.lblXmax.AutoSize = True + Me.lblXmax.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.lblXmax.Location = New System.Drawing.Point(272, 132) + Me.lblXmax.Name = "lblXmax" + Me.lblXmax.Size = New System.Drawing.Size(37, 13) + Me.lblXmax.TabIndex = 51 + Me.lblXmax.Text = "xmax :" + ' + 'lblYmin + ' + Me.lblYmin.AutoSize = True + Me.lblYmin.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.lblYmin.Location = New System.Drawing.Point(275, 106) + Me.lblYmin.Name = "lblYmin" + Me.lblYmin.Size = New System.Drawing.Size(34, 13) + Me.lblYmin.TabIndex = 47 + Me.lblYmin.Text = "ymin :" + ' + 'lblXmin + ' + Me.lblXmin.AutoSize = True + Me.lblXmin.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.lblXmin.Location = New System.Drawing.Point(275, 81) + Me.lblXmin.Name = "lblXmin" + Me.lblXmin.Size = New System.Drawing.Size(34, 13) + Me.lblXmin.TabIndex = 46 + Me.lblXmin.Text = "xmin :" + ' + 'lblXend + ' + Me.lblXend.AutoSize = True + Me.lblXend.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.lblXend.Location = New System.Drawing.Point(273, 181) + Me.lblXend.Name = "lblXend" + Me.lblXend.Size = New System.Drawing.Size(36, 13) + Me.lblXend.TabIndex = 40 + Me.lblXend.Text = "xend :" + ' + 'lblYmax + ' + Me.lblYmax.AutoSize = True + Me.lblYmax.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.lblYmax.Location = New System.Drawing.Point(272, 156) + Me.lblYmax.Name = "lblYmax" + Me.lblYmax.Size = New System.Drawing.Size(37, 13) + Me.lblYmax.TabIndex = 39 + Me.lblYmax.Text = "ymax :" + ' + 'lblYend + ' + Me.lblYend.AutoSize = True + Me.lblYend.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.lblYend.Location = New System.Drawing.Point(273, 206) + Me.lblYend.Name = "lblYend" + Me.lblYend.Size = New System.Drawing.Size(36, 13) + Me.lblYend.TabIndex = 35 + Me.lblYend.Text = "yend :" + ' + 'lblLinetype + ' + Me.lblLinetype.AutoSize = True + Me.lblLinetype.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.lblLinetype.Location = New System.Drawing.Point(16, 159) + Me.lblLinetype.Name = "lblLinetype" + Me.lblLinetype.Size = New System.Drawing.Size(49, 13) + Me.lblLinetype.TabIndex = 63 + Me.lblLinetype.Text = "linetype :" + ' + 'lblPointrangeFatten + ' + Me.lblPointrangeFatten.AutoSize = True + Me.lblPointrangeFatten.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.lblPointrangeFatten.Location = New System.Drawing.Point(25, 184) + Me.lblPointrangeFatten.Name = "lblPointrangeFatten" + Me.lblPointrangeFatten.Size = New System.Drawing.Size(40, 13) + Me.lblPointrangeFatten.TabIndex = 89 + Me.lblPointrangeFatten.Text = "fatten :" + ' + 'lblCrossbarFatten + ' + Me.lblCrossbarFatten.AutoSize = True + Me.lblCrossbarFatten.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.lblCrossbarFatten.Location = New System.Drawing.Point(25, 184) + Me.lblCrossbarFatten.Name = "lblCrossbarFatten" + Me.lblCrossbarFatten.Size = New System.Drawing.Size(40, 13) + Me.lblCrossbarFatten.TabIndex = 86 + Me.lblCrossbarFatten.Text = "fatten :" + ' + 'lblLabel + ' + Me.lblLabel.AutoSize = True + Me.lblLabel.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.lblLabel.Location = New System.Drawing.Point(30, 159) + Me.lblLabel.Name = "lblLabel" + Me.lblLabel.Size = New System.Drawing.Size(35, 13) + Me.lblLabel.TabIndex = 91 + Me.lblLabel.Text = "label :" + ' + 'ttCaptionTitle + ' + Me.ttCaptionTitle.AutoPopDelay = 10000 + Me.ttCaptionTitle.InitialDelay = 500 + Me.ttCaptionTitle.ReshowDelay = 100 + ' + 'ucrBaseSubdialog + ' + Me.ucrBaseSubdialog.AutoSize = True + Me.ucrBaseSubdialog.Location = New System.Drawing.Point(232, 490) + Me.ucrBaseSubdialog.Name = "ucrBaseSubdialog" + Me.ucrBaseSubdialog.Size = New System.Drawing.Size(224, 29) + Me.ucrBaseSubdialog.TabIndex = 1 + ' + 'ucrChkDrop + ' + Me.ucrChkDrop.AutoSize = True + Me.ucrChkDrop.Checked = False + Me.ucrChkDrop.Location = New System.Drawing.Point(273, 269) + Me.ucrChkDrop.Name = "ucrChkDrop" + Me.ucrChkDrop.Size = New System.Drawing.Size(257, 23) + Me.ucrChkDrop.TabIndex = 11 + ' + 'ucrNudNumberofRows + ' + Me.ucrNudNumberofRows.AutoSize = True + Me.ucrNudNumberofRows.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudNumberofRows.Increment = New Decimal(New Integer() {1, 0, 0, 0}) + Me.ucrNudNumberofRows.Location = New System.Drawing.Point(169, 252) + Me.ucrNudNumberofRows.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) + Me.ucrNudNumberofRows.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudNumberofRows.Name = "ucrNudNumberofRows" + Me.ucrNudNumberofRows.Size = New System.Drawing.Size(46, 20) + Me.ucrNudNumberofRows.TabIndex = 15 + Me.ucrNudNumberofRows.Value = New Decimal(New Integer() {0, 0, 0, 0}) + ' + 'ucrChkNoOfRowsOrColumns + ' + Me.ucrChkNoOfRowsOrColumns.AutoSize = True + Me.ucrChkNoOfRowsOrColumns.Checked = False + Me.ucrChkNoOfRowsOrColumns.Location = New System.Drawing.Point(7, 254) + Me.ucrChkNoOfRowsOrColumns.Name = "ucrChkNoOfRowsOrColumns" + Me.ucrChkNoOfRowsOrColumns.Size = New System.Drawing.Size(156, 23) + Me.ucrChkNoOfRowsOrColumns.TabIndex = 14 + ' + 'ucrChkIncludeFacets + ' + Me.ucrChkIncludeFacets.AutoSize = True + Me.ucrChkIncludeFacets.Checked = False + Me.ucrChkIncludeFacets.Location = New System.Drawing.Point(8, 13) + Me.ucrChkIncludeFacets.Name = "ucrChkIncludeFacets" + Me.ucrChkIncludeFacets.Size = New System.Drawing.Size(121, 23) + Me.ucrChkIncludeFacets.TabIndex = 0 + ' + 'ucrChkLabeler + ' + Me.ucrChkLabeler.AutoSize = True + Me.ucrChkLabeler.Checked = False + Me.ucrChkLabeler.Location = New System.Drawing.Point(273, 245) + Me.ucrChkLabeler.Name = "ucrChkLabeler" + Me.ucrChkLabeler.Size = New System.Drawing.Size(257, 23) + Me.ucrChkLabeler.TabIndex = 10 + ' + 'ucrChkFreeSpace + ' + Me.ucrChkFreeSpace.AutoSize = True + Me.ucrChkFreeSpace.Checked = False + Me.ucrChkFreeSpace.Location = New System.Drawing.Point(273, 221) + Me.ucrChkFreeSpace.Name = "ucrChkFreeSpace" + Me.ucrChkFreeSpace.Size = New System.Drawing.Size(257, 23) + Me.ucrChkFreeSpace.TabIndex = 9 + ' + 'ucrChkFreeScalesY + ' + Me.ucrChkFreeScalesY.AutoSize = True + Me.ucrChkFreeScalesY.Checked = False + Me.ucrChkFreeScalesY.Location = New System.Drawing.Point(273, 197) + Me.ucrChkFreeScalesY.Name = "ucrChkFreeScalesY" + Me.ucrChkFreeScalesY.Size = New System.Drawing.Size(257, 23) + Me.ucrChkFreeScalesY.TabIndex = 8 + ' + 'ucrChkFreeScalesX + ' + Me.ucrChkFreeScalesX.AutoSize = True + Me.ucrChkFreeScalesX.Checked = False + Me.ucrChkFreeScalesX.Location = New System.Drawing.Point(273, 173) + Me.ucrChkFreeScalesX.Name = "ucrChkFreeScalesX" + Me.ucrChkFreeScalesX.Size = New System.Drawing.Size(257, 23) + Me.ucrChkFreeScalesX.TabIndex = 7 + ' + 'ucrChkMargin + ' + Me.ucrChkMargin.AutoSize = True + Me.ucrChkMargin.Checked = False + Me.ucrChkMargin.Location = New System.Drawing.Point(273, 149) + Me.ucrChkMargin.Name = "ucrChkMargin" + Me.ucrChkMargin.Size = New System.Drawing.Size(257, 23) + Me.ucrChkMargin.TabIndex = 6 + ' + 'ucrFacetSelector + ' + Me.ucrFacetSelector.AutoSize = True + Me.ucrFacetSelector.bDropUnusedFilterLevels = False + Me.ucrFacetSelector.bShowHiddenColumns = False + Me.ucrFacetSelector.bUseCurrentFilter = True + Me.ucrFacetSelector.Location = New System.Drawing.Point(8, 36) + Me.ucrFacetSelector.Margin = New System.Windows.Forms.Padding(0) + Me.ucrFacetSelector.Name = "ucrFacetSelector" + Me.ucrFacetSelector.Size = New System.Drawing.Size(213, 183) + Me.ucrFacetSelector.TabIndex = 1 + ' + 'ucr2ndFactorReceiver + ' + Me.ucr2ndFactorReceiver.AutoSize = True + Me.ucr2ndFactorReceiver.frmParent = Nothing + Me.ucr2ndFactorReceiver.Location = New System.Drawing.Point(273, 114) + Me.ucr2ndFactorReceiver.Margin = New System.Windows.Forms.Padding(0) + Me.ucr2ndFactorReceiver.Name = "ucr2ndFactorReceiver" + Me.ucr2ndFactorReceiver.Selector = Nothing + Me.ucr2ndFactorReceiver.Size = New System.Drawing.Size(106, 26) + Me.ucr2ndFactorReceiver.strNcFilePath = "" + Me.ucr2ndFactorReceiver.TabIndex = 5 + Me.ucr2ndFactorReceiver.ucrSelector = Nothing + ' + 'ucr1stFactorReceiver + ' + Me.ucr1stFactorReceiver.AutoSize = True + Me.ucr1stFactorReceiver.frmParent = Nothing + Me.ucr1stFactorReceiver.Location = New System.Drawing.Point(273, 59) + Me.ucr1stFactorReceiver.Margin = New System.Windows.Forms.Padding(0) + Me.ucr1stFactorReceiver.Name = "ucr1stFactorReceiver" + Me.ucr1stFactorReceiver.Selector = Nothing + Me.ucr1stFactorReceiver.Size = New System.Drawing.Size(106, 26) + Me.ucr1stFactorReceiver.strNcFilePath = "" + Me.ucr1stFactorReceiver.TabIndex = 3 + Me.ucr1stFactorReceiver.ucrSelector = Nothing + ' + 'ucrPnlHorizonatalVertical + ' + Me.ucrPnlHorizonatalVertical.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrPnlHorizonatalVertical.Location = New System.Drawing.Point(8, 228) + Me.ucrPnlHorizonatalVertical.Name = "ucrPnlHorizonatalVertical" + Me.ucrPnlHorizonatalVertical.Size = New System.Drawing.Size(165, 20) + Me.ucrPnlHorizonatalVertical.TabIndex = 30 + ' + 'ucrPlotsAdditionalLayers + ' + Me.ucrPlotsAdditionalLayers.AutoSize = True + Me.ucrPlotsAdditionalLayers.Location = New System.Drawing.Point(7, 6) + Me.ucrPlotsAdditionalLayers.Name = "ucrPlotsAdditionalLayers" + Me.ucrPlotsAdditionalLayers.Size = New System.Drawing.Size(218, 191) + Me.ucrPlotsAdditionalLayers.TabIndex = 0 + ' + 'ucrChkIncludeTitles + ' + Me.ucrChkIncludeTitles.AutoSize = True + Me.ucrChkIncludeTitles.Checked = False + Me.ucrChkIncludeTitles.Location = New System.Drawing.Point(6, 10) + Me.ucrChkIncludeTitles.Name = "ucrChkIncludeTitles" + Me.ucrChkIncludeTitles.Size = New System.Drawing.Size(121, 23) + Me.ucrChkIncludeTitles.TabIndex = 55 + ' + 'ucrChkOverwriteLegendTitle + ' + Me.ucrChkOverwriteLegendTitle.AutoSize = True + Me.ucrChkOverwriteLegendTitle.Checked = False + Me.ucrChkOverwriteLegendTitle.Location = New System.Drawing.Point(6, 75) + Me.ucrChkOverwriteLegendTitle.Name = "ucrChkOverwriteLegendTitle" + Me.ucrChkOverwriteLegendTitle.Size = New System.Drawing.Size(100, 23) + Me.ucrChkOverwriteLegendTitle.TabIndex = 14 + ' + 'ucrChkDisplayLegendTitle + ' + Me.ucrChkDisplayLegendTitle.AutoSize = True + Me.ucrChkDisplayLegendTitle.Checked = False + Me.ucrChkDisplayLegendTitle.Location = New System.Drawing.Point(6, 51) + Me.ucrChkDisplayLegendTitle.Name = "ucrChkDisplayLegendTitle" + Me.ucrChkDisplayLegendTitle.Size = New System.Drawing.Size(100, 23) + Me.ucrChkDisplayLegendTitle.TabIndex = 13 + ' + 'ucrInputLegend + ' + Me.ucrInputLegend.AddQuotesIfUnrecognised = True + Me.ucrInputLegend.AutoSize = True + Me.ucrInputLegend.IsMultiline = False + Me.ucrInputLegend.IsReadOnly = False + Me.ucrInputLegend.Location = New System.Drawing.Point(133, 74) + Me.ucrInputLegend.Name = "ucrInputLegend" + Me.ucrInputLegend.Size = New System.Drawing.Size(160, 21) + Me.ucrInputLegend.TabIndex = 11 + ' + 'ucrPnlLegendTitle + ' + Me.ucrPnlLegendTitle.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrPnlLegendTitle.Location = New System.Drawing.Point(4, 20) + Me.ucrPnlLegendTitle.Name = "ucrPnlLegendTitle" + Me.ucrPnlLegendTitle.Size = New System.Drawing.Size(117, 25) + Me.ucrPnlLegendTitle.TabIndex = 12 + ' + 'ucrNudLegendSize + ' + Me.ucrNudLegendSize.AutoSize = True + Me.ucrNudLegendSize.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudLegendSize.Increment = New Decimal(New Integer() {1, 0, 0, 0}) + Me.ucrNudLegendSize.Location = New System.Drawing.Point(434, 203) + Me.ucrNudLegendSize.Margin = New System.Windows.Forms.Padding(5) + Me.ucrNudLegendSize.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) + Me.ucrNudLegendSize.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudLegendSize.Name = "ucrNudLegendSize" + Me.ucrNudLegendSize.Size = New System.Drawing.Size(50, 20) + Me.ucrNudLegendSize.TabIndex = 53 + Me.ucrNudLegendSize.Value = New Decimal(New Integer() {0, 0, 0, 0}) + ' + 'ucrNudTagSize + ' + Me.ucrNudTagSize.AutoSize = True + Me.ucrNudTagSize.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudTagSize.Increment = New Decimal(New Integer() {1, 0, 0, 0}) + Me.ucrNudTagSize.Location = New System.Drawing.Point(434, 165) + Me.ucrNudTagSize.Margin = New System.Windows.Forms.Padding(5) + Me.ucrNudTagSize.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) + Me.ucrNudTagSize.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudTagSize.Name = "ucrNudTagSize" + Me.ucrNudTagSize.Size = New System.Drawing.Size(50, 20) + Me.ucrNudTagSize.TabIndex = 51 + Me.ucrNudTagSize.Value = New Decimal(New Integer() {0, 0, 0, 0}) + ' + 'ucrChkTag + ' + Me.ucrChkTag.AutoSize = True + Me.ucrChkTag.Checked = False + Me.ucrChkTag.Location = New System.Drawing.Point(6, 165) + Me.ucrChkTag.Name = "ucrChkTag" + Me.ucrChkTag.Size = New System.Drawing.Size(104, 23) + Me.ucrChkTag.TabIndex = 50 + ' + 'ucrChkNewLegend + ' + Me.ucrChkNewLegend.AutoSize = True + Me.ucrChkNewLegend.Checked = False + Me.ucrChkNewLegend.Location = New System.Drawing.Point(6, 203) + Me.ucrChkNewLegend.Name = "ucrChkNewLegend" + Me.ucrChkNewLegend.Size = New System.Drawing.Size(125, 23) + Me.ucrChkNewLegend.TabIndex = 49 + ' + 'ucrInputGraphCaption + ' + Me.ucrInputGraphCaption.AddQuotesIfUnrecognised = True + Me.ucrInputGraphCaption.AutoSize = True + Me.ucrInputGraphCaption.IsMultiline = True + Me.ucrInputGraphCaption.IsReadOnly = False + Me.ucrInputGraphCaption.Location = New System.Drawing.Point(126, 96) + Me.ucrInputGraphCaption.Margin = New System.Windows.Forms.Padding(7, 6, 7, 6) + Me.ucrInputGraphCaption.Name = "ucrInputGraphCaption" + Me.ucrInputGraphCaption.Size = New System.Drawing.Size(181, 53) + Me.ucrInputGraphCaption.TabIndex = 48 + ' + 'ucrNudCaptionSize + ' + Me.ucrNudCaptionSize.AutoSize = True + Me.ucrNudCaptionSize.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudCaptionSize.Increment = New Decimal(New Integer() {1, 0, 0, 0}) + Me.ucrNudCaptionSize.Location = New System.Drawing.Point(434, 113) + Me.ucrNudCaptionSize.Margin = New System.Windows.Forms.Padding(5) + Me.ucrNudCaptionSize.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) + Me.ucrNudCaptionSize.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudCaptionSize.Name = "ucrNudCaptionSize" + Me.ucrNudCaptionSize.Size = New System.Drawing.Size(50, 20) + Me.ucrNudCaptionSize.TabIndex = 44 + Me.ucrNudCaptionSize.Value = New Decimal(New Integer() {0, 0, 0, 0}) + ' + 'ucrNudSubTitleSize + ' + Me.ucrNudSubTitleSize.AutoSize = True + Me.ucrNudSubTitleSize.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudSubTitleSize.Increment = New Decimal(New Integer() {1, 0, 0, 0}) + Me.ucrNudSubTitleSize.Location = New System.Drawing.Point(434, 67) + Me.ucrNudSubTitleSize.Margin = New System.Windows.Forms.Padding(5) + Me.ucrNudSubTitleSize.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) + Me.ucrNudSubTitleSize.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudSubTitleSize.Name = "ucrNudSubTitleSize" + Me.ucrNudSubTitleSize.Size = New System.Drawing.Size(50, 20) + Me.ucrNudSubTitleSize.TabIndex = 43 + Me.ucrNudSubTitleSize.Value = New Decimal(New Integer() {0, 0, 0, 0}) + ' + 'ucrNudTitleSize + ' + Me.ucrNudTitleSize.AutoSize = True + Me.ucrNudTitleSize.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudTitleSize.Increment = New Decimal(New Integer() {1, 0, 0, 0}) + Me.ucrNudTitleSize.Location = New System.Drawing.Point(434, 37) + Me.ucrNudTitleSize.Margin = New System.Windows.Forms.Padding(5) + Me.ucrNudTitleSize.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) + Me.ucrNudTitleSize.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudTitleSize.Name = "ucrNudTitleSize" + Me.ucrNudTitleSize.Size = New System.Drawing.Size(50, 20) + Me.ucrNudTitleSize.TabIndex = 42 + Me.ucrNudTitleSize.Value = New Decimal(New Integer() {0, 0, 0, 0}) + ' + 'ucrInputLegendTitle + ' + Me.ucrInputLegendTitle.AddQuotesIfUnrecognised = True + Me.ucrInputLegendTitle.AutoSize = True + Me.ucrInputLegendTitle.IsMultiline = False + Me.ucrInputLegendTitle.IsReadOnly = False + Me.ucrInputLegendTitle.Location = New System.Drawing.Point(205, 203) + Me.ucrInputLegendTitle.Margin = New System.Windows.Forms.Padding(7, 6, 7, 6) + Me.ucrInputLegendTitle.Name = "ucrInputLegendTitle" + Me.ucrInputLegendTitle.Size = New System.Drawing.Size(71, 21) + Me.ucrInputLegendTitle.TabIndex = 38 + ' + 'ucrInputTag + ' + Me.ucrInputTag.AddQuotesIfUnrecognised = True + Me.ucrInputTag.AutoSize = True + Me.ucrInputTag.IsMultiline = False + Me.ucrInputTag.IsReadOnly = False + Me.ucrInputTag.Location = New System.Drawing.Point(205, 165) + Me.ucrInputTag.Margin = New System.Windows.Forms.Padding(7, 6, 7, 6) + Me.ucrInputTag.Name = "ucrInputTag" + Me.ucrInputTag.Size = New System.Drawing.Size(71, 21) + Me.ucrInputTag.TabIndex = 35 + ' + 'ucrInputGraphSubTitle + ' + Me.ucrInputGraphSubTitle.AddQuotesIfUnrecognised = True + Me.ucrInputGraphSubTitle.AutoSize = True + Me.ucrInputGraphSubTitle.IsMultiline = False + Me.ucrInputGraphSubTitle.IsReadOnly = False + Me.ucrInputGraphSubTitle.Location = New System.Drawing.Point(126, 68) + Me.ucrInputGraphSubTitle.Name = "ucrInputGraphSubTitle" + Me.ucrInputGraphSubTitle.Size = New System.Drawing.Size(166, 21) + Me.ucrInputGraphSubTitle.TabIndex = 9 + ' + 'ucrInputGraphTitle + ' + Me.ucrInputGraphTitle.AddQuotesIfUnrecognised = True + Me.ucrInputGraphTitle.AutoSize = True + Me.ucrInputGraphTitle.IsMultiline = False + Me.ucrInputGraphTitle.IsReadOnly = False + Me.ucrInputGraphTitle.Location = New System.Drawing.Point(126, 41) + Me.ucrInputGraphTitle.Name = "ucrInputGraphTitle" + Me.ucrInputGraphTitle.Size = New System.Drawing.Size(166, 21) + Me.ucrInputGraphTitle.TabIndex = 9 + ' + 'ucrXAxis + ' + Me.ucrXAxis.AutoSize = True + Me.ucrXAxis.Location = New System.Drawing.Point(-4, 3) + Me.ucrXAxis.Name = "ucrXAxis" + Me.ucrXAxis.Size = New System.Drawing.Size(669, 463) + Me.ucrXAxis.TabIndex = 0 + ' + 'ucrYAxis + ' + Me.ucrYAxis.AutoSize = True + Me.ucrYAxis.Location = New System.Drawing.Point(0, 1) + Me.ucrYAxis.Name = "ucrYAxis" + Me.ucrYAxis.Size = New System.Drawing.Size(669, 463) + Me.ucrYAxis.TabIndex = 0 + ' + 'ucrNudYaxisMarkSize + ' + Me.ucrNudYaxisMarkSize.AutoSize = True + Me.ucrNudYaxisMarkSize.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudYaxisMarkSize.Increment = New Decimal(New Integer() {1, 0, 0, 0}) + Me.ucrNudYaxisMarkSize.Location = New System.Drawing.Point(246, 205) + Me.ucrNudYaxisMarkSize.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) + Me.ucrNudYaxisMarkSize.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudYaxisMarkSize.Name = "ucrNudYaxisMarkSize" + Me.ucrNudYaxisMarkSize.Size = New System.Drawing.Size(50, 20) + Me.ucrNudYaxisMarkSize.TabIndex = 11 + Me.ucrNudYaxisMarkSize.Value = New Decimal(New Integer() {0, 0, 0, 0}) ' 'ucrNudXaxisMarkSize ' @@ -1043,25 +1543,6 @@ Partial Class sdgPlots Me.ucrChkLegendPosition.Size = New System.Drawing.Size(234, 23) Me.ucrChkLegendPosition.TabIndex = 0 ' - 'lblFont - ' - Me.lblFont.AutoSize = True - Me.lblFont.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblFont.Location = New System.Drawing.Point(233, 49) - Me.lblFont.Name = "lblFont" - Me.lblFont.Size = New System.Drawing.Size(0, 13) - Me.lblFont.TabIndex = 4 - ' - 'cmdAllOptions - ' - Me.cmdAllOptions.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdAllOptions.Location = New System.Drawing.Point(29, 49) - Me.cmdAllOptions.Name = "cmdAllOptions" - Me.cmdAllOptions.Size = New System.Drawing.Size(139, 23) - Me.cmdAllOptions.TabIndex = 2 - Me.cmdAllOptions.Text = "All Options" - Me.cmdAllOptions.UseVisualStyleBackColor = True - ' 'urChkSelectTheme ' Me.urChkSelectTheme.AutoSize = True @@ -1082,65 +1563,16 @@ Partial Class sdgPlots Me.ucrInputThemes.Size = New System.Drawing.Size(171, 21) Me.ucrInputThemes.TabIndex = 1 ' - 'tbpCoordinates - ' - Me.tbpCoordinates.Controls.Add(Me.grpPolarCordinates) - Me.tbpCoordinates.Controls.Add(Me.ucrChkSameScale) - Me.tbpCoordinates.Controls.Add(Me.ucrChkHorizontalPlot) - Me.tbpCoordinates.Location = New System.Drawing.Point(4, 22) - Me.tbpCoordinates.Name = "tbpCoordinates" - Me.tbpCoordinates.Padding = New System.Windows.Forms.Padding(3) - Me.tbpCoordinates.Size = New System.Drawing.Size(669, 455) - Me.tbpCoordinates.TabIndex = 7 - Me.tbpCoordinates.Text = "Coordinates" - Me.tbpCoordinates.UseVisualStyleBackColor = True - ' - 'grpPolarCordinates - ' - Me.grpPolarCordinates.Controls.Add(Me.ucrInputPolarCoordinates) - Me.grpPolarCordinates.Controls.Add(Me.lblPolarCoordinate) - Me.grpPolarCordinates.Controls.Add(Me.lblStartingAngle) - Me.grpPolarCordinates.Controls.Add(Me.ucrChkUsePolarCoordinates) - Me.grpPolarCordinates.Controls.Add(Me.lblPi) - Me.grpPolarCordinates.Controls.Add(Me.ucrChkDirectionAnticlockwise) - Me.grpPolarCordinates.Controls.Add(Me.ucrInputStartingAngle) - Me.grpPolarCordinates.Location = New System.Drawing.Point(3, 67) - Me.grpPolarCordinates.Name = "grpPolarCordinates" - Me.grpPolarCordinates.Size = New System.Drawing.Size(300, 136) - Me.grpPolarCordinates.TabIndex = 22 - Me.grpPolarCordinates.TabStop = False - Me.grpPolarCordinates.Text = "Polar Cordinates" - ' - 'ucrInputPolarCoordinates - ' - Me.ucrInputPolarCoordinates.AddQuotesIfUnrecognised = True - Me.ucrInputPolarCoordinates.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrInputPolarCoordinates.GetSetSelectedIndex = -1 - Me.ucrInputPolarCoordinates.IsReadOnly = False - Me.ucrInputPolarCoordinates.Location = New System.Drawing.Point(141, 43) - Me.ucrInputPolarCoordinates.Name = "ucrInputPolarCoordinates" - Me.ucrInputPolarCoordinates.Size = New System.Drawing.Size(65, 21) - Me.ucrInputPolarCoordinates.TabIndex = 24 - ' - 'lblPolarCoordinate - ' - Me.lblPolarCoordinate.AutoSize = True - Me.lblPolarCoordinate.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblPolarCoordinate.Location = New System.Drawing.Point(10, 46) - Me.lblPolarCoordinate.Name = "lblPolarCoordinate" - Me.lblPolarCoordinate.Size = New System.Drawing.Size(88, 13) - Me.lblPolarCoordinate.TabIndex = 23 - Me.lblPolarCoordinate.Text = "Polar Coordinate:" - ' - 'lblStartingAngle + 'ucrInputPolarCoordinates ' - Me.lblStartingAngle.AutoSize = True - Me.lblStartingAngle.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblStartingAngle.Location = New System.Drawing.Point(10, 99) - Me.lblStartingAngle.Name = "lblStartingAngle" - Me.lblStartingAngle.Size = New System.Drawing.Size(76, 13) - Me.lblStartingAngle.TabIndex = 22 - Me.lblStartingAngle.Text = "Starting Angle:" + Me.ucrInputPolarCoordinates.AddQuotesIfUnrecognised = True + Me.ucrInputPolarCoordinates.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrInputPolarCoordinates.GetSetSelectedIndex = -1 + Me.ucrInputPolarCoordinates.IsReadOnly = False + Me.ucrInputPolarCoordinates.Location = New System.Drawing.Point(141, 43) + Me.ucrInputPolarCoordinates.Name = "ucrInputPolarCoordinates" + Me.ucrInputPolarCoordinates.Size = New System.Drawing.Size(65, 21) + Me.ucrInputPolarCoordinates.TabIndex = 24 ' 'ucrChkUsePolarCoordinates ' @@ -1151,17 +1583,6 @@ Partial Class sdgPlots Me.ucrChkUsePolarCoordinates.Size = New System.Drawing.Size(194, 23) Me.ucrChkUsePolarCoordinates.TabIndex = 16 ' - 'lblPi - ' - Me.lblPi.AutoSize = True - Me.lblPi.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblPi.Location = New System.Drawing.Point(191, 103) - Me.lblPi.Name = "lblPi" - Me.lblPi.Size = New System.Drawing.Size(15, 13) - Me.lblPi.TabIndex = 21 - Me.lblPi.Tag = "" - Me.lblPi.Text = "pi" - ' 'ucrChkDirectionAnticlockwise ' Me.ucrChkDirectionAnticlockwise.AutoSize = True @@ -1200,20 +1621,6 @@ Partial Class sdgPlots Me.ucrChkHorizontalPlot.Size = New System.Drawing.Size(233, 23) Me.ucrChkHorizontalPlot.TabIndex = 14 ' - 'tbpColour - ' - Me.tbpColour.Controls.Add(Me.ucrChkAddColour) - Me.tbpColour.Controls.Add(Me.ucrChkAddFillScale) - Me.tbpColour.Controls.Add(Me.grpColourScale) - Me.tbpColour.Controls.Add(Me.grpFillScale) - Me.tbpColour.Location = New System.Drawing.Point(4, 22) - Me.tbpColour.Name = "tbpColour" - Me.tbpColour.Padding = New System.Windows.Forms.Padding(3) - Me.tbpColour.Size = New System.Drawing.Size(669, 455) - Me.tbpColour.TabIndex = 8 - Me.tbpColour.Text = "Colour" - Me.tbpColour.UseVisualStyleBackColor = True - ' 'ucrChkAddColour ' Me.ucrChkAddColour.AutoSize = True @@ -1232,25 +1639,6 @@ Partial Class sdgPlots Me.ucrChkAddFillScale.Size = New System.Drawing.Size(326, 23) Me.ucrChkAddFillScale.TabIndex = 26 ' - 'grpColourScale - ' - Me.grpColourScale.Controls.Add(Me.ucrChkColourDiscrete) - Me.grpColourScale.Controls.Add(Me.ucrNudColourScaleTransparency) - Me.grpColourScale.Controls.Add(Me.ucrInputColourScalePalette) - Me.grpColourScale.Controls.Add(Me.ucrNudColourScaleMapEnds) - Me.grpColourScale.Controls.Add(Me.ucrNudColourScaleMapBegins) - Me.grpColourScale.Controls.Add(Me.ucrChkColourScaleReverseOrder) - Me.grpColourScale.Controls.Add(Me.lblColourScaleMapEnds) - Me.grpColourScale.Controls.Add(Me.lblColourScaleMapBegins) - Me.grpColourScale.Controls.Add(Me.lblColourScalePalette) - Me.grpColourScale.Controls.Add(Me.lblColourScaleTransparency) - Me.grpColourScale.Location = New System.Drawing.Point(13, 236) - Me.grpColourScale.Name = "grpColourScale" - Me.grpColourScale.Size = New System.Drawing.Size(444, 181) - Me.grpColourScale.TabIndex = 25 - Me.grpColourScale.TabStop = False - Me.grpColourScale.Text = "Colour Scale" - ' 'ucrChkColourDiscrete ' Me.ucrChkColourDiscrete.AutoSize = True @@ -1319,65 +1707,6 @@ Partial Class sdgPlots Me.ucrChkColourScaleReverseOrder.Size = New System.Drawing.Size(352, 23) Me.ucrChkColourScaleReverseOrder.TabIndex = 5 ' - 'lblColourScaleMapEnds - ' - Me.lblColourScaleMapEnds.AutoSize = True - Me.lblColourScaleMapEnds.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblColourScaleMapEnds.Location = New System.Drawing.Point(7, 100) - Me.lblColourScaleMapEnds.Name = "lblColourScaleMapEnds" - Me.lblColourScaleMapEnds.Size = New System.Drawing.Size(198, 13) - Me.lblColourScaleMapEnds.TabIndex = 3 - Me.lblColourScaleMapEnds.Text = "Corrected Hue Where Colour Map Ends:" - ' - 'lblColourScaleMapBegins - ' - Me.lblColourScaleMapBegins.AutoSize = True - Me.lblColourScaleMapBegins.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblColourScaleMapBegins.Location = New System.Drawing.Point(7, 75) - Me.lblColourScaleMapBegins.Name = "lblColourScaleMapBegins" - Me.lblColourScaleMapBegins.Size = New System.Drawing.Size(206, 13) - Me.lblColourScaleMapBegins.TabIndex = 2 - Me.lblColourScaleMapBegins.Text = "Corrected Hue Where Colour Map Begins:" - ' - 'lblColourScalePalette - ' - Me.lblColourScalePalette.AutoSize = True - Me.lblColourScalePalette.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblColourScalePalette.Location = New System.Drawing.Point(7, 25) - Me.lblColourScalePalette.Name = "lblColourScalePalette" - Me.lblColourScalePalette.Size = New System.Drawing.Size(76, 13) - Me.lblColourScalePalette.TabIndex = 1 - Me.lblColourScalePalette.Text = "Colour Palette:" - ' - 'lblColourScaleTransparency - ' - Me.lblColourScaleTransparency.AutoSize = True - Me.lblColourScaleTransparency.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblColourScaleTransparency.Location = New System.Drawing.Point(7, 50) - Me.lblColourScaleTransparency.Name = "lblColourScaleTransparency" - Me.lblColourScaleTransparency.Size = New System.Drawing.Size(75, 13) - Me.lblColourScaleTransparency.TabIndex = 0 - Me.lblColourScaleTransparency.Text = "Transparency:" - ' - 'grpFillScale - ' - Me.grpFillScale.Controls.Add(Me.ucrChkFillDiscrete) - Me.grpFillScale.Controls.Add(Me.ucrNudFillScaleTransparency) - Me.grpFillScale.Controls.Add(Me.ucrNudFillScaleMapEnds) - Me.grpFillScale.Controls.Add(Me.ucrNudFillScaleMapBegins) - Me.grpFillScale.Controls.Add(Me.ucrInputFillScaleColour) - Me.grpFillScale.Controls.Add(Me.ucrChkFillScaleReverseColourOrder) - Me.grpFillScale.Controls.Add(Me.lblFillScaleMapEnds) - Me.grpFillScale.Controls.Add(Me.lblFillScaleBeginColour) - Me.grpFillScale.Controls.Add(Me.lblFillScaleColourPalettte) - Me.grpFillScale.Controls.Add(Me.lblFillScaleTransparency) - Me.grpFillScale.Location = New System.Drawing.Point(13, 30) - Me.grpFillScale.Name = "grpFillScale" - Me.grpFillScale.Size = New System.Drawing.Size(444, 174) - Me.grpFillScale.TabIndex = 23 - Me.grpFillScale.TabStop = False - Me.grpFillScale.Text = "Fill Scale" - ' 'ucrChkFillDiscrete ' Me.ucrChkFillDiscrete.AutoSize = True @@ -1422,143 +1751,38 @@ Partial Class sdgPlots Me.ucrNudFillScaleMapBegins.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) Me.ucrNudFillScaleMapBegins.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudFillScaleMapBegins.Name = "ucrNudFillScaleMapBegins" - Me.ucrNudFillScaleMapBegins.Size = New System.Drawing.Size(50, 27) - Me.ucrNudFillScaleMapBegins.TabIndex = 7 - Me.ucrNudFillScaleMapBegins.Value = New Decimal(New Integer() {0, 0, 0, 0}) - ' - 'ucrInputFillScaleColour - ' - Me.ucrInputFillScaleColour.AddQuotesIfUnrecognised = True - Me.ucrInputFillScaleColour.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrInputFillScaleColour.GetSetSelectedIndex = -1 - Me.ucrInputFillScaleColour.IsReadOnly = False - Me.ucrInputFillScaleColour.Location = New System.Drawing.Point(268, 14) - Me.ucrInputFillScaleColour.Name = "ucrInputFillScaleColour" - Me.ucrInputFillScaleColour.Size = New System.Drawing.Size(137, 24) - Me.ucrInputFillScaleColour.TabIndex = 6 - ' - 'ucrChkFillScaleReverseColourOrder - ' - Me.ucrChkFillScaleReverseColourOrder.AutoSize = True - Me.ucrChkFillScaleReverseColourOrder.Checked = False - Me.ucrChkFillScaleReverseColourOrder.Location = New System.Drawing.Point(7, 145) - Me.ucrChkFillScaleReverseColourOrder.Name = "ucrChkFillScaleReverseColourOrder" - Me.ucrChkFillScaleReverseColourOrder.Size = New System.Drawing.Size(352, 23) - Me.ucrChkFillScaleReverseColourOrder.TabIndex = 5 - ' - 'lblFillScaleMapEnds - ' - Me.lblFillScaleMapEnds.AutoSize = True - Me.lblFillScaleMapEnds.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblFillScaleMapEnds.Location = New System.Drawing.Point(7, 98) - Me.lblFillScaleMapEnds.Name = "lblFillScaleMapEnds" - Me.lblFillScaleMapEnds.Size = New System.Drawing.Size(198, 13) - Me.lblFillScaleMapEnds.TabIndex = 3 - Me.lblFillScaleMapEnds.Text = "Corrected Hue Where Colour Map Ends:" - ' - 'lblFillScaleBeginColour - ' - Me.lblFillScaleBeginColour.AutoSize = True - Me.lblFillScaleBeginColour.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblFillScaleBeginColour.Location = New System.Drawing.Point(7, 73) - Me.lblFillScaleBeginColour.Name = "lblFillScaleBeginColour" - Me.lblFillScaleBeginColour.Size = New System.Drawing.Size(206, 13) - Me.lblFillScaleBeginColour.TabIndex = 2 - Me.lblFillScaleBeginColour.Text = "Corrected Hue Where Colour Map Begins:" - ' - 'lblFillScaleColourPalettte - ' - Me.lblFillScaleColourPalettte.AutoSize = True - Me.lblFillScaleColourPalettte.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblFillScaleColourPalettte.Location = New System.Drawing.Point(7, 23) - Me.lblFillScaleColourPalettte.Name = "lblFillScaleColourPalettte" - Me.lblFillScaleColourPalettte.Size = New System.Drawing.Size(76, 13) - Me.lblFillScaleColourPalettte.TabIndex = 1 - Me.lblFillScaleColourPalettte.Text = "Colour Palette:" - ' - 'lblFillScaleTransparency - ' - Me.lblFillScaleTransparency.AutoSize = True - Me.lblFillScaleTransparency.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblFillScaleTransparency.Location = New System.Drawing.Point(7, 48) - Me.lblFillScaleTransparency.Name = "lblFillScaleTransparency" - Me.lblFillScaleTransparency.Size = New System.Drawing.Size(75, 13) - Me.lblFillScaleTransparency.TabIndex = 0 - Me.lblFillScaleTransparency.Text = "Transparency:" - ' - 'tbpAnnotation - ' - Me.tbpAnnotation.Controls.Add(Me.ucrChkAnnotation) - Me.tbpAnnotation.Controls.Add(Me.grpAnnotation) - Me.tbpAnnotation.Location = New System.Drawing.Point(4, 22) - Me.tbpAnnotation.Name = "tbpAnnotation" - Me.tbpAnnotation.Padding = New System.Windows.Forms.Padding(3) - Me.tbpAnnotation.Size = New System.Drawing.Size(669, 455) - Me.tbpAnnotation.TabIndex = 9 - Me.tbpAnnotation.Text = "Annotation" - Me.tbpAnnotation.UseVisualStyleBackColor = True - ' - 'ucrChkAnnotation - ' - Me.ucrChkAnnotation.AutoSize = True - Me.ucrChkAnnotation.Checked = False - Me.ucrChkAnnotation.Location = New System.Drawing.Point(7, 17) - Me.ucrChkAnnotation.Name = "ucrChkAnnotation" - Me.ucrChkAnnotation.Size = New System.Drawing.Size(278, 23) - Me.ucrChkAnnotation.TabIndex = 44 - ' - 'grpAnnotation - ' - Me.grpAnnotation.Controls.Add(Me.ucrChkParse) - Me.grpAnnotation.Controls.Add(Me.ucrInputFill) - Me.grpAnnotation.Controls.Add(Me.ucrInputColour) - Me.grpAnnotation.Controls.Add(Me.lblCurvature) - Me.grpAnnotation.Controls.Add(Me.ucrNudAlpha) - Me.grpAnnotation.Controls.Add(Me.lblAlpha) - Me.grpAnnotation.Controls.Add(Me.lblLineend) - Me.grpAnnotation.Controls.Add(Me.lblAngle) - Me.grpAnnotation.Controls.Add(Me.ucrNudAngle) - Me.grpAnnotation.Controls.Add(Me.lblShape) - Me.grpAnnotation.Controls.Add(Me.lblAnnotationGeoms) - Me.grpAnnotation.Controls.Add(Me.ucrInputAnnotationGeoms) - Me.grpAnnotation.Controls.Add(Me.lblSize) - Me.grpAnnotation.Controls.Add(Me.ucrNudSize) - Me.grpAnnotation.Controls.Add(Me.lblColour) - Me.grpAnnotation.Controls.Add(Me.lblY) - Me.grpAnnotation.Controls.Add(Me.lblX) - Me.grpAnnotation.Controls.Add(Me.lblFill) - Me.grpAnnotation.Controls.Add(Me.lblXmax) - Me.grpAnnotation.Controls.Add(Me.ucrInputXmax) - Me.grpAnnotation.Controls.Add(Me.ucrInputYmin) - Me.grpAnnotation.Controls.Add(Me.ucrInputXmin) - Me.grpAnnotation.Controls.Add(Me.lblYmin) - Me.grpAnnotation.Controls.Add(Me.lblXmin) - Me.grpAnnotation.Controls.Add(Me.lblXend) - Me.grpAnnotation.Controls.Add(Me.lblYmax) - Me.grpAnnotation.Controls.Add(Me.ucrInputYmax) - Me.grpAnnotation.Controls.Add(Me.ucrInputYend) - Me.grpAnnotation.Controls.Add(Me.ucrInputXend) - Me.grpAnnotation.Controls.Add(Me.lblYend) - Me.grpAnnotation.Controls.Add(Me.ucrNudLinetype) - Me.grpAnnotation.Controls.Add(Me.lblLinetype) - Me.grpAnnotation.Controls.Add(Me.lblPointrangeFatten) - Me.grpAnnotation.Controls.Add(Me.ucrNudPointrangeFatten) - Me.grpAnnotation.Controls.Add(Me.ucrNudCrossbarFatten) - Me.grpAnnotation.Controls.Add(Me.lblCrossbarFatten) - Me.grpAnnotation.Controls.Add(Me.ucrNudCurvature) - Me.grpAnnotation.Controls.Add(Me.ucrNudShape) - Me.grpAnnotation.Controls.Add(Me.lblLabel) - Me.grpAnnotation.Controls.Add(Me.ucrInputLabel) - Me.grpAnnotation.Controls.Add(Me.ucrInputLineend) - Me.grpAnnotation.Controls.Add(Me.ucrInputY) - Me.grpAnnotation.Controls.Add(Me.ucrInputX) - Me.grpAnnotation.Controls.Add(Me.ucrReceiverY) - Me.grpAnnotation.Location = New System.Drawing.Point(7, 43) - Me.grpAnnotation.Name = "grpAnnotation" - Me.grpAnnotation.Size = New System.Drawing.Size(459, 374) - Me.grpAnnotation.TabIndex = 43 - Me.grpAnnotation.TabStop = False - Me.grpAnnotation.Text = "Annotation" + Me.ucrNudFillScaleMapBegins.Size = New System.Drawing.Size(50, 27) + Me.ucrNudFillScaleMapBegins.TabIndex = 7 + Me.ucrNudFillScaleMapBegins.Value = New Decimal(New Integer() {0, 0, 0, 0}) + ' + 'ucrInputFillScaleColour + ' + Me.ucrInputFillScaleColour.AddQuotesIfUnrecognised = True + Me.ucrInputFillScaleColour.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrInputFillScaleColour.GetSetSelectedIndex = -1 + Me.ucrInputFillScaleColour.IsReadOnly = False + Me.ucrInputFillScaleColour.Location = New System.Drawing.Point(268, 14) + Me.ucrInputFillScaleColour.Name = "ucrInputFillScaleColour" + Me.ucrInputFillScaleColour.Size = New System.Drawing.Size(137, 24) + Me.ucrInputFillScaleColour.TabIndex = 6 + ' + 'ucrChkFillScaleReverseColourOrder + ' + Me.ucrChkFillScaleReverseColourOrder.AutoSize = True + Me.ucrChkFillScaleReverseColourOrder.Checked = False + Me.ucrChkFillScaleReverseColourOrder.Location = New System.Drawing.Point(7, 145) + Me.ucrChkFillScaleReverseColourOrder.Name = "ucrChkFillScaleReverseColourOrder" + Me.ucrChkFillScaleReverseColourOrder.Size = New System.Drawing.Size(352, 23) + Me.ucrChkFillScaleReverseColourOrder.TabIndex = 5 + ' + 'ucrChkAnnotation + ' + Me.ucrChkAnnotation.AutoSize = True + Me.ucrChkAnnotation.Checked = False + Me.ucrChkAnnotation.Location = New System.Drawing.Point(7, 17) + Me.ucrChkAnnotation.Name = "ucrChkAnnotation" + Me.ucrChkAnnotation.Size = New System.Drawing.Size(278, 23) + Me.ucrChkAnnotation.TabIndex = 44 ' 'ucrChkParse ' @@ -1591,16 +1815,6 @@ Partial Class sdgPlots Me.ucrInputColour.Size = New System.Drawing.Size(137, 21) Me.ucrInputColour.TabIndex = 100 ' - 'lblCurvature - ' - Me.lblCurvature.AutoSize = True - Me.lblCurvature.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblCurvature.Location = New System.Drawing.Point(7, 184) - Me.lblCurvature.Name = "lblCurvature" - Me.lblCurvature.Size = New System.Drawing.Size(58, 13) - Me.lblCurvature.TabIndex = 85 - Me.lblCurvature.Text = "curvature :" - ' 'ucrNudAlpha ' Me.ucrNudAlpha.AutoSize = True @@ -1614,36 +1828,6 @@ Partial Class sdgPlots Me.ucrNudAlpha.TabIndex = 20 Me.ucrNudAlpha.Value = New Decimal(New Integer() {0, 0, 0, 0}) ' - 'lblAlpha - ' - Me.lblAlpha.AutoSize = True - Me.lblAlpha.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblAlpha.Location = New System.Drawing.Point(26, 135) - Me.lblAlpha.Name = "lblAlpha" - Me.lblAlpha.Size = New System.Drawing.Size(39, 13) - Me.lblAlpha.TabIndex = 19 - Me.lblAlpha.Text = "alpha :" - ' - 'lblLineend - ' - Me.lblLineend.AutoSize = True - Me.lblLineend.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblLineend.Location = New System.Drawing.Point(18, 184) - Me.lblLineend.Name = "lblLineend" - Me.lblLineend.Size = New System.Drawing.Size(47, 13) - Me.lblLineend.TabIndex = 83 - Me.lblLineend.Text = "lineend :" - ' - 'lblAngle - ' - Me.lblAngle.AutoSize = True - Me.lblAngle.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblAngle.Location = New System.Drawing.Point(26, 208) - Me.lblAngle.Name = "lblAngle" - Me.lblAngle.Size = New System.Drawing.Size(39, 13) - Me.lblAngle.TabIndex = 80 - Me.lblAngle.Text = "angle :" - ' 'ucrNudAngle ' Me.ucrNudAngle.AutoSize = True @@ -1657,26 +1841,6 @@ Partial Class sdgPlots Me.ucrNudAngle.TabIndex = 78 Me.ucrNudAngle.Value = New Decimal(New Integer() {0, 0, 0, 0}) ' - 'lblShape - ' - Me.lblShape.AutoSize = True - Me.lblShape.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblShape.Location = New System.Drawing.Point(23, 210) - Me.lblShape.Name = "lblShape" - Me.lblShape.Size = New System.Drawing.Size(42, 13) - Me.lblShape.TabIndex = 79 - Me.lblShape.Text = "shape :" - ' - 'lblAnnotationGeoms - ' - Me.lblAnnotationGeoms.AutoSize = True - Me.lblAnnotationGeoms.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblAnnotationGeoms.Location = New System.Drawing.Point(25, 24) - Me.lblAnnotationGeoms.Name = "lblAnnotationGeoms" - Me.lblAnnotationGeoms.Size = New System.Drawing.Size(41, 13) - Me.lblAnnotationGeoms.TabIndex = 77 - Me.lblAnnotationGeoms.Text = "Geom :" - ' 'ucrInputAnnotationGeoms ' Me.ucrInputAnnotationGeoms.AddQuotesIfUnrecognised = True @@ -1688,16 +1852,6 @@ Partial Class sdgPlots Me.ucrInputAnnotationGeoms.Size = New System.Drawing.Size(137, 21) Me.ucrInputAnnotationGeoms.TabIndex = 76 ' - 'lblSize - ' - Me.lblSize.AutoSize = True - Me.lblSize.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblSize.Location = New System.Drawing.Point(34, 111) - Me.lblSize.Name = "lblSize" - Me.lblSize.Size = New System.Drawing.Size(31, 13) - Me.lblSize.TabIndex = 75 - Me.lblSize.Text = "size :" - ' 'ucrNudSize ' Me.ucrNudSize.AutoSize = True @@ -1711,56 +1865,6 @@ Partial Class sdgPlots Me.ucrNudSize.TabIndex = 74 Me.ucrNudSize.Value = New Decimal(New Integer() {0, 0, 0, 0}) ' - 'lblColour - ' - Me.lblColour.AutoSize = True - Me.lblColour.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblColour.Location = New System.Drawing.Point(23, 87) - Me.lblColour.Name = "lblColour" - Me.lblColour.Size = New System.Drawing.Size(42, 13) - Me.lblColour.TabIndex = 73 - Me.lblColour.Text = "colour :" - ' - 'lblY - ' - Me.lblY.AutoSize = True - Me.lblY.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblY.Location = New System.Drawing.Point(291, 56) - Me.lblY.Name = "lblY" - Me.lblY.Size = New System.Drawing.Size(18, 13) - Me.lblY.TabIndex = 69 - Me.lblY.Text = "y :" - ' - 'lblX - ' - Me.lblX.AutoSize = True - Me.lblX.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblX.Location = New System.Drawing.Point(294, 31) - Me.lblX.Name = "lblX" - Me.lblX.Size = New System.Drawing.Size(15, 13) - Me.lblX.TabIndex = 68 - Me.lblX.Text = "x:" - ' - 'lblFill - ' - Me.lblFill.AutoSize = True - Me.lblFill.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblFill.Location = New System.Drawing.Point(43, 184) - Me.lblFill.Name = "lblFill" - Me.lblFill.Size = New System.Drawing.Size(22, 13) - Me.lblFill.TabIndex = 61 - Me.lblFill.Text = "fill :" - ' - 'lblXmax - ' - Me.lblXmax.AutoSize = True - Me.lblXmax.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblXmax.Location = New System.Drawing.Point(272, 132) - Me.lblXmax.Name = "lblXmax" - Me.lblXmax.Size = New System.Drawing.Size(37, 13) - Me.lblXmax.TabIndex = 51 - Me.lblXmax.Text = "xmax :" - ' 'ucrInputXmax ' Me.ucrInputXmax.AddQuotesIfUnrecognised = True @@ -1794,46 +1898,6 @@ Partial Class sdgPlots Me.ucrInputXmin.Size = New System.Drawing.Size(116, 21) Me.ucrInputXmin.TabIndex = 48 ' - 'lblYmin - ' - Me.lblYmin.AutoSize = True - Me.lblYmin.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblYmin.Location = New System.Drawing.Point(275, 106) - Me.lblYmin.Name = "lblYmin" - Me.lblYmin.Size = New System.Drawing.Size(34, 13) - Me.lblYmin.TabIndex = 47 - Me.lblYmin.Text = "ymin :" - ' - 'lblXmin - ' - Me.lblXmin.AutoSize = True - Me.lblXmin.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblXmin.Location = New System.Drawing.Point(275, 81) - Me.lblXmin.Name = "lblXmin" - Me.lblXmin.Size = New System.Drawing.Size(34, 13) - Me.lblXmin.TabIndex = 46 - Me.lblXmin.Text = "xmin :" - ' - 'lblXend - ' - Me.lblXend.AutoSize = True - Me.lblXend.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblXend.Location = New System.Drawing.Point(273, 181) - Me.lblXend.Name = "lblXend" - Me.lblXend.Size = New System.Drawing.Size(36, 13) - Me.lblXend.TabIndex = 40 - Me.lblXend.Text = "xend :" - ' - 'lblYmax - ' - Me.lblYmax.AutoSize = True - Me.lblYmax.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblYmax.Location = New System.Drawing.Point(272, 156) - Me.lblYmax.Name = "lblYmax" - Me.lblYmax.Size = New System.Drawing.Size(37, 13) - Me.lblYmax.TabIndex = 39 - Me.lblYmax.Text = "ymax :" - ' 'ucrInputYmax ' Me.ucrInputYmax.AddQuotesIfUnrecognised = True @@ -1867,16 +1931,6 @@ Partial Class sdgPlots Me.ucrInputXend.Size = New System.Drawing.Size(115, 21) Me.ucrInputXend.TabIndex = 36 ' - 'lblYend - ' - Me.lblYend.AutoSize = True - Me.lblYend.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblYend.Location = New System.Drawing.Point(273, 206) - Me.lblYend.Name = "lblYend" - Me.lblYend.Size = New System.Drawing.Size(36, 13) - Me.lblYend.TabIndex = 35 - Me.lblYend.Text = "yend :" - ' 'ucrNudLinetype ' Me.ucrNudLinetype.AutoSize = True @@ -1890,26 +1944,6 @@ Partial Class sdgPlots Me.ucrNudLinetype.TabIndex = 62 Me.ucrNudLinetype.Value = New Decimal(New Integer() {0, 0, 0, 0}) ' - 'lblLinetype - ' - Me.lblLinetype.AutoSize = True - Me.lblLinetype.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblLinetype.Location = New System.Drawing.Point(16, 159) - Me.lblLinetype.Name = "lblLinetype" - Me.lblLinetype.Size = New System.Drawing.Size(49, 13) - Me.lblLinetype.TabIndex = 63 - Me.lblLinetype.Text = "linetype :" - ' - 'lblPointrangeFatten - ' - Me.lblPointrangeFatten.AutoSize = True - Me.lblPointrangeFatten.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblPointrangeFatten.Location = New System.Drawing.Point(25, 184) - Me.lblPointrangeFatten.Name = "lblPointrangeFatten" - Me.lblPointrangeFatten.Size = New System.Drawing.Size(40, 13) - Me.lblPointrangeFatten.TabIndex = 89 - Me.lblPointrangeFatten.Text = "fatten :" - ' 'ucrNudPointrangeFatten ' Me.ucrNudPointrangeFatten.AutoSize = True @@ -1936,16 +1970,6 @@ Partial Class sdgPlots Me.ucrNudCrossbarFatten.TabIndex = 87 Me.ucrNudCrossbarFatten.Value = New Decimal(New Integer() {0, 0, 0, 0}) ' - 'lblCrossbarFatten - ' - Me.lblCrossbarFatten.AutoSize = True - Me.lblCrossbarFatten.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblCrossbarFatten.Location = New System.Drawing.Point(25, 184) - Me.lblCrossbarFatten.Name = "lblCrossbarFatten" - Me.lblCrossbarFatten.Size = New System.Drawing.Size(40, 13) - Me.lblCrossbarFatten.TabIndex = 86 - Me.lblCrossbarFatten.Text = "fatten :" - ' 'ucrNudCurvature ' Me.ucrNudCurvature.AutoSize = True @@ -1972,16 +1996,6 @@ Partial Class sdgPlots Me.ucrNudShape.TabIndex = 81 Me.ucrNudShape.Value = New Decimal(New Integer() {0, 0, 0, 0}) ' - 'lblLabel - ' - Me.lblLabel.AutoSize = True - Me.lblLabel.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblLabel.Location = New System.Drawing.Point(30, 159) - Me.lblLabel.Name = "lblLabel" - Me.lblLabel.Size = New System.Drawing.Size(35, 13) - Me.lblLabel.TabIndex = 91 - Me.lblLabel.Text = "label :" - ' 'ucrInputLabel ' Me.ucrInputLabel.AddQuotesIfUnrecognised = True @@ -2039,20 +2053,6 @@ Partial Class sdgPlots Me.ucrReceiverY.TabIndex = 99 Me.ucrReceiverY.ucrSelector = Nothing ' - 'ttCaptionTitle - ' - Me.ttCaptionTitle.AutoPopDelay = 10000 - Me.ttCaptionTitle.InitialDelay = 500 - Me.ttCaptionTitle.ReshowDelay = 100 - ' - 'ucrBaseSubdialog - ' - Me.ucrBaseSubdialog.AutoSize = True - Me.ucrBaseSubdialog.Location = New System.Drawing.Point(232, 490) - Me.ucrBaseSubdialog.Name = "ucrBaseSubdialog" - Me.ucrBaseSubdialog.Size = New System.Drawing.Size(224, 29) - Me.ucrBaseSubdialog.TabIndex = 1 - ' 'sdgPlots ' Me.AutoScaleDimensions = New System.Drawing.SizeF(96.0!, 96.0!) diff --git a/instat/sdgPlots.vb b/instat/sdgPlots.vb index 37cffd2c873..4a7222f2337 100644 --- a/instat/sdgPlots.vb +++ b/instat/sdgPlots.vb @@ -1309,4 +1309,24 @@ Public Class sdgPlots Private Sub ucrChkIncludeTitles_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkIncludeTitles.ControlValueChanged AddRemoveLabs() End Sub + + Private Sub ucrChkIncludeFacets_CheckedChanged(ucrChangedControl As ucrCore) Handles ucrChkIncludeFacets.ControlValueChanged, ucr2ndFactorReceiver.ControlValueChanged, ucr1stFactorReceiver.ControlValueChanged + + End Sub + + Private Sub ucrChkFreeSpace_CheckedChanged(ucrChangedControl As ucrCore) Handles ucrChkFreeSpace.ControlValueChanged + + End Sub + + Private Sub chkScales_CheckedChanged(ucrChangedControl As ucrCore) Handles ucrChkFreeScalesY.ControlValueChanged, ucrChkFreeScalesX.ControlValueChanged + + End Sub + + Private Sub ucrPnlHorizonatalVertical_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrPnlHorizonatalVertical.ControlValueChanged, ucrChkMargin.ControlValueChanged + + End Sub + + Private Sub LabsControls_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrInputTag.ControlValueChanged, ucrInputLegendTitle.ControlValueChanged, ucrInputGraphTitle.ControlValueChanged, ucrInputGraphSubTitle.ControlValueChanged, ucrInputGraphCaption.ControlValueChanged + + End Sub End Class \ No newline at end of file From fb4c36fb5a9ec1882dab7affe6bbed154200c2fa Mon Sep 17 00:00:00 2001 From: Sophie Malla Tatchum Date: Wed, 13 Sep 2023 22:57:50 +0100 Subject: [PATCH 03/14] minor change --- instat/dlgGeneralForGraphics.Designer.vb | 250 ++++++++++------------- instat/dlgGeneralForGraphics.vb | 46 ++++- 2 files changed, 146 insertions(+), 150 deletions(-) diff --git a/instat/dlgGeneralForGraphics.Designer.vb b/instat/dlgGeneralForGraphics.Designer.vb index 13cf2995f2d..4b69cf2019c 100644 --- a/instat/dlgGeneralForGraphics.Designer.vb +++ b/instat/dlgGeneralForGraphics.Designer.vb @@ -43,22 +43,20 @@ Partial Class dlgGeneralForGraphics Me.lblFillOrColor = New System.Windows.Forms.Label() Me.cmdFacets = New System.Windows.Forms.Button() Me.cmdTheme = New System.Windows.Forms.Button() + Me.cmdYAxis = New System.Windows.Forms.Button() + Me.cmdXAxis = New System.Windows.Forms.Button() + Me.cmdTitles = New System.Windows.Forms.Button() + Me.lblYVariable = New System.Windows.Forms.Label() + Me.ucrInputLegendPosition = New instat.ucrInputComboBox() + Me.ucrReceiverY = New instat.ucrReceiverSingle() + Me.ucrChkFlipCoordinates = New instat.ucrCheck() + Me.ucrChkLegend = New instat.ucrCheck() Me.ucrSave = New instat.ucrSave() Me.ucrFillOrColourReceiver = New instat.ucrReceiverSingle() Me.ucrReceiverX = New instat.ucrReceiverSingle() Me.ucrGraphicsSelector = New instat.ucrSelectorByDataFrameAddRemove() Me.ucrAdditionalLayers = New instat.ucrAdditionalLayers() Me.ucrBase = New instat.ucrButtons() - Me.cmdYAxis = New System.Windows.Forms.Button() - Me.cmdXAxis = New System.Windows.Forms.Button() - Me.cmdTitles = New System.Windows.Forms.Button() - Me.ucrChkLegend = New instat.ucrCheck() - Me.ucrChkFlipCoordinates = New instat.ucrCheck() - Me.lblYVariable = New System.Windows.Forms.Label() - Me.ucrChkSecondY = New instat.ucrCheck() - Me.lblSecondYVariable = New System.Windows.Forms.Label() - Me.ucrReceiverSecondYVariable = New instat.ucrReceiverSingle() - Me.ucrReceiverY = New instat.ucrReceiverSingle() Me.SuspendLayout() ' 'cmdOptions @@ -67,7 +65,7 @@ Partial Class dlgGeneralForGraphics Me.cmdOptions.Location = New System.Drawing.Point(6, 401) Me.cmdOptions.Name = "cmdOptions" Me.cmdOptions.Size = New System.Drawing.Size(135, 25) - Me.cmdOptions.TabIndex = 6 + Me.cmdOptions.TabIndex = 7 Me.cmdOptions.Tag = "Options" Me.cmdOptions.Text = "Plot Options" Me.cmdOptions.UseVisualStyleBackColor = True @@ -76,10 +74,10 @@ Partial Class dlgGeneralForGraphics ' Me.lblXVariable.AutoSize = True Me.lblXVariable.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblXVariable.Location = New System.Drawing.Point(259, 21) + Me.lblXVariable.Location = New System.Drawing.Point(254, 81) Me.lblXVariable.Name = "lblXVariable" Me.lblXVariable.Size = New System.Drawing.Size(58, 13) - Me.lblXVariable.TabIndex = 2 + Me.lblXVariable.TabIndex = 3 Me.lblXVariable.Tag = "X_Variable:" Me.lblXVariable.Text = "X Variable:" ' @@ -87,10 +85,10 @@ Partial Class dlgGeneralForGraphics ' Me.lblFillOrColor.AutoSize = True Me.lblFillOrColor.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblFillOrColor.Location = New System.Drawing.Point(259, 130) + Me.lblFillOrColor.Location = New System.Drawing.Point(254, 122) Me.lblFillOrColor.Name = "lblFillOrColor" Me.lblFillOrColor.Size = New System.Drawing.Size(57, 13) - Me.lblFillOrColor.TabIndex = 4 + Me.lblFillOrColor.TabIndex = 5 Me.lblFillOrColor.Tag = "Fill_Colour:" Me.lblFillOrColor.Text = "Fill/Colour:" ' @@ -100,7 +98,7 @@ Partial Class dlgGeneralForGraphics Me.cmdFacets.Location = New System.Drawing.Point(139, 401) Me.cmdFacets.Name = "cmdFacets" Me.cmdFacets.Size = New System.Drawing.Size(64, 25) - Me.cmdFacets.TabIndex = 18 + Me.cmdFacets.TabIndex = 17 Me.cmdFacets.Tag = "Facets" Me.cmdFacets.Text = "Facets" Me.cmdFacets.UseVisualStyleBackColor = True @@ -111,11 +109,97 @@ Partial Class dlgGeneralForGraphics Me.cmdTheme.Location = New System.Drawing.Point(360, 401) Me.cmdTheme.Name = "cmdTheme" Me.cmdTheme.Size = New System.Drawing.Size(51, 25) - Me.cmdTheme.TabIndex = 19 + Me.cmdTheme.TabIndex = 21 Me.cmdTheme.Tag = "Theme" Me.cmdTheme.Text = "Theme" Me.cmdTheme.UseVisualStyleBackColor = True ' + 'cmdYAxis + ' + Me.cmdYAxis.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.cmdYAxis.Location = New System.Drawing.Point(306, 401) + Me.cmdYAxis.Name = "cmdYAxis" + Me.cmdYAxis.Size = New System.Drawing.Size(56, 25) + Me.cmdYAxis.TabIndex = 20 + Me.cmdYAxis.Tag = "" + Me.cmdYAxis.Text = "Y-Axis" + Me.cmdYAxis.UseVisualStyleBackColor = True + ' + 'cmdXAxis + ' + Me.cmdXAxis.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.cmdXAxis.Location = New System.Drawing.Point(252, 401) + Me.cmdXAxis.Name = "cmdXAxis" + Me.cmdXAxis.Size = New System.Drawing.Size(56, 25) + Me.cmdXAxis.TabIndex = 19 + Me.cmdXAxis.Tag = "" + Me.cmdXAxis.Text = "X-Axis" + Me.cmdXAxis.UseVisualStyleBackColor = True + ' + 'cmdTitles + ' + Me.cmdTitles.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.cmdTitles.Location = New System.Drawing.Point(201, 401) + Me.cmdTitles.Name = "cmdTitles" + Me.cmdTitles.Size = New System.Drawing.Size(53, 25) + Me.cmdTitles.TabIndex = 18 + Me.cmdTitles.Tag = "" + Me.cmdTitles.Text = "Titles" + Me.cmdTitles.UseVisualStyleBackColor = True + ' + 'lblYVariable + ' + Me.lblYVariable.AutoSize = True + Me.lblYVariable.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.lblYVariable.Location = New System.Drawing.Point(254, 38) + Me.lblYVariable.Name = "lblYVariable" + Me.lblYVariable.Size = New System.Drawing.Size(58, 13) + Me.lblYVariable.TabIndex = 1 + Me.lblYVariable.Tag = "Y_Variable:" + Me.lblYVariable.Text = "Y Variable:" + ' + 'ucrInputLegendPosition + ' + Me.ucrInputLegendPosition.AddQuotesIfUnrecognised = True + Me.ucrInputLegendPosition.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrInputLegendPosition.GetSetSelectedIndex = -1 + Me.ucrInputLegendPosition.IsReadOnly = False + Me.ucrInputLegendPosition.Location = New System.Drawing.Point(252, 360) + Me.ucrInputLegendPosition.Name = "ucrInputLegendPosition" + Me.ucrInputLegendPosition.Size = New System.Drawing.Size(137, 21) + Me.ucrInputLegendPosition.TabIndex = 15 + ' + 'ucrReceiverY + ' + Me.ucrReceiverY.AutoSize = True + Me.ucrReceiverY.frmParent = Me + Me.ucrReceiverY.Location = New System.Drawing.Point(252, 51) + Me.ucrReceiverY.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverY.Name = "ucrReceiverY" + Me.ucrReceiverY.Selector = Nothing + Me.ucrReceiverY.Size = New System.Drawing.Size(125, 20) + Me.ucrReceiverY.strNcFilePath = "" + Me.ucrReceiverY.TabIndex = 2 + Me.ucrReceiverY.ucrSelector = Nothing + ' + 'ucrChkFlipCoordinates + ' + Me.ucrChkFlipCoordinates.AutoSize = True + Me.ucrChkFlipCoordinates.Checked = False + Me.ucrChkFlipCoordinates.Location = New System.Drawing.Point(257, 300) + Me.ucrChkFlipCoordinates.Name = "ucrChkFlipCoordinates" + Me.ucrChkFlipCoordinates.Size = New System.Drawing.Size(125, 24) + Me.ucrChkFlipCoordinates.TabIndex = 13 + ' + 'ucrChkLegend + ' + Me.ucrChkLegend.AutoSize = True + Me.ucrChkLegend.Checked = False + Me.ucrChkLegend.Location = New System.Drawing.Point(257, 335) + Me.ucrChkLegend.Name = "ucrChkLegend" + Me.ucrChkLegend.Size = New System.Drawing.Size(125, 24) + Me.ucrChkLegend.TabIndex = 14 + ' 'ucrSave ' Me.ucrSave.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink @@ -123,32 +207,32 @@ Partial Class dlgGeneralForGraphics Me.ucrSave.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.ucrSave.Name = "ucrSave" Me.ucrSave.Size = New System.Drawing.Size(346, 24) - Me.ucrSave.TabIndex = 17 + Me.ucrSave.TabIndex = 16 ' 'ucrFillOrColourReceiver ' Me.ucrFillOrColourReceiver.AutoSize = True Me.ucrFillOrColourReceiver.frmParent = Me - Me.ucrFillOrColourReceiver.Location = New System.Drawing.Point(257, 145) + Me.ucrFillOrColourReceiver.Location = New System.Drawing.Point(252, 138) Me.ucrFillOrColourReceiver.Margin = New System.Windows.Forms.Padding(0) Me.ucrFillOrColourReceiver.Name = "ucrFillOrColourReceiver" Me.ucrFillOrColourReceiver.Selector = Nothing - Me.ucrFillOrColourReceiver.Size = New System.Drawing.Size(125, 26) + Me.ucrFillOrColourReceiver.Size = New System.Drawing.Size(125, 25) Me.ucrFillOrColourReceiver.strNcFilePath = "" - Me.ucrFillOrColourReceiver.TabIndex = 5 + Me.ucrFillOrColourReceiver.TabIndex = 6 Me.ucrFillOrColourReceiver.ucrSelector = Nothing ' 'ucrReceiverX ' Me.ucrReceiverX.AutoSize = True Me.ucrReceiverX.frmParent = Me - Me.ucrReceiverX.Location = New System.Drawing.Point(257, 36) + Me.ucrReceiverX.Location = New System.Drawing.Point(252, 95) Me.ucrReceiverX.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverX.Name = "ucrReceiverX" Me.ucrReceiverX.Selector = Nothing - Me.ucrReceiverX.Size = New System.Drawing.Size(125, 26) + Me.ucrReceiverX.Size = New System.Drawing.Size(125, 27) Me.ucrReceiverX.strNcFilePath = "" - Me.ucrReceiverX.TabIndex = 3 + Me.ucrReceiverX.TabIndex = 4 Me.ucrReceiverX.ucrSelector = Nothing ' 'ucrGraphicsSelector @@ -169,7 +253,7 @@ Partial Class dlgGeneralForGraphics Me.ucrAdditionalLayers.Location = New System.Drawing.Point(6, 213) Me.ucrAdditionalLayers.Name = "ucrAdditionalLayers" Me.ucrAdditionalLayers.Size = New System.Drawing.Size(218, 182) - Me.ucrAdditionalLayers.TabIndex = 7 + Me.ucrAdditionalLayers.TabIndex = 8 ' 'ucrBase ' @@ -180,124 +264,14 @@ Partial Class dlgGeneralForGraphics Me.ucrBase.Size = New System.Drawing.Size(408, 52) Me.ucrBase.TabIndex = 9 ' - 'cmdYAxis - ' - Me.cmdYAxis.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdYAxis.Location = New System.Drawing.Point(306, 401) - Me.cmdYAxis.Name = "cmdYAxis" - Me.cmdYAxis.Size = New System.Drawing.Size(56, 25) - Me.cmdYAxis.TabIndex = 20 - Me.cmdYAxis.Tag = "" - Me.cmdYAxis.Text = "Y-Axis" - Me.cmdYAxis.UseVisualStyleBackColor = True - ' - 'cmdXAxis - ' - Me.cmdXAxis.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdXAxis.Location = New System.Drawing.Point(252, 401) - Me.cmdXAxis.Name = "cmdXAxis" - Me.cmdXAxis.Size = New System.Drawing.Size(56, 25) - Me.cmdXAxis.TabIndex = 21 - Me.cmdXAxis.Tag = "" - Me.cmdXAxis.Text = "X-Axis" - Me.cmdXAxis.UseVisualStyleBackColor = True - ' - 'cmdTitles - ' - Me.cmdTitles.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdTitles.Location = New System.Drawing.Point(201, 401) - Me.cmdTitles.Name = "cmdTitles" - Me.cmdTitles.Size = New System.Drawing.Size(53, 25) - Me.cmdTitles.TabIndex = 22 - Me.cmdTitles.Tag = "" - Me.cmdTitles.Text = "Titles" - Me.cmdTitles.UseVisualStyleBackColor = True - ' - 'ucrChkLegend - ' - Me.ucrChkLegend.AutoSize = True - Me.ucrChkLegend.Checked = False - Me.ucrChkLegend.Location = New System.Drawing.Point(257, 259) - Me.ucrChkLegend.Name = "ucrChkLegend" - Me.ucrChkLegend.Size = New System.Drawing.Size(125, 24) - Me.ucrChkLegend.TabIndex = 23 - ' - 'ucrChkFlipCoordinates - ' - Me.ucrChkFlipCoordinates.AutoSize = True - Me.ucrChkFlipCoordinates.Checked = False - Me.ucrChkFlipCoordinates.Location = New System.Drawing.Point(257, 290) - Me.ucrChkFlipCoordinates.Name = "ucrChkFlipCoordinates" - Me.ucrChkFlipCoordinates.Size = New System.Drawing.Size(125, 24) - Me.ucrChkFlipCoordinates.TabIndex = 24 - ' - 'lblYVariable - ' - Me.lblYVariable.AutoSize = True - Me.lblYVariable.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblYVariable.Location = New System.Drawing.Point(259, 76) - Me.lblYVariable.Name = "lblYVariable" - Me.lblYVariable.Size = New System.Drawing.Size(58, 13) - Me.lblYVariable.TabIndex = 25 - Me.lblYVariable.Tag = "Y_Variable:" - Me.lblYVariable.Text = "Y Variable:" - ' - 'ucrChkSecondY - ' - Me.ucrChkSecondY.AutoSize = True - Me.ucrChkSecondY.Checked = False - Me.ucrChkSecondY.Location = New System.Drawing.Point(257, 181) - Me.ucrChkSecondY.Name = "ucrChkSecondY" - Me.ucrChkSecondY.Size = New System.Drawing.Size(125, 24) - Me.ucrChkSecondY.TabIndex = 27 - ' - 'lblSecondYVariable - ' - Me.lblSecondYVariable.AutoSize = True - Me.lblSecondYVariable.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblSecondYVariable.Location = New System.Drawing.Point(254, 213) - Me.lblSecondYVariable.Name = "lblSecondYVariable" - Me.lblSecondYVariable.Size = New System.Drawing.Size(79, 13) - Me.lblSecondYVariable.TabIndex = 28 - Me.lblSecondYVariable.Tag = "" - Me.lblSecondYVariable.Text = "2nd Y Variable:" - ' - 'ucrReceiverSecondYVariable - ' - Me.ucrReceiverSecondYVariable.AutoSize = True - Me.ucrReceiverSecondYVariable.frmParent = Me - Me.ucrReceiverSecondYVariable.Location = New System.Drawing.Point(252, 228) - Me.ucrReceiverSecondYVariable.Margin = New System.Windows.Forms.Padding(0) - Me.ucrReceiverSecondYVariable.Name = "ucrReceiverSecondYVariable" - Me.ucrReceiverSecondYVariable.Selector = Nothing - Me.ucrReceiverSecondYVariable.Size = New System.Drawing.Size(125, 26) - Me.ucrReceiverSecondYVariable.strNcFilePath = "" - Me.ucrReceiverSecondYVariable.TabIndex = 29 - Me.ucrReceiverSecondYVariable.ucrSelector = Nothing - ' - 'ucrReceiverY - ' - Me.ucrReceiverY.AutoSize = True - Me.ucrReceiverY.frmParent = Me - Me.ucrReceiverY.Location = New System.Drawing.Point(257, 89) - Me.ucrReceiverY.Margin = New System.Windows.Forms.Padding(0) - Me.ucrReceiverY.Name = "ucrReceiverY" - Me.ucrReceiverY.Selector = Nothing - Me.ucrReceiverY.Size = New System.Drawing.Size(125, 20) - Me.ucrReceiverY.strNcFilePath = "" - Me.ucrReceiverY.TabIndex = 30 - Me.ucrReceiverY.ucrSelector = Nothing - ' '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(416, 519) + Me.Controls.Add(Me.ucrInputLegendPosition) Me.Controls.Add(Me.ucrReceiverY) - Me.Controls.Add(Me.lblSecondYVariable) - Me.Controls.Add(Me.ucrReceiverSecondYVariable) - Me.Controls.Add(Me.ucrChkSecondY) Me.Controls.Add(Me.lblYVariable) Me.Controls.Add(Me.ucrChkFlipCoordinates) Me.Controls.Add(Me.ucrChkLegend) @@ -344,8 +318,6 @@ Partial Class dlgGeneralForGraphics Friend WithEvents ucrChkLegend As ucrCheck Friend WithEvents ucrChkFlipCoordinates As ucrCheck Friend WithEvents lblYVariable As Label - Friend WithEvents lblSecondYVariable As Label - Friend WithEvents ucrReceiverSecondYVariable As ucrReceiverSingle - Friend WithEvents ucrChkSecondY As ucrCheck Friend WithEvents ucrReceiverY As ucrReceiverSingle + Friend WithEvents ucrInputLegendPosition As ucrInputComboBox End Class diff --git a/instat/dlgGeneralForGraphics.vb b/instat/dlgGeneralForGraphics.vb index 3d5163c6778..4c0cfebd310 100644 --- a/instat/dlgGeneralForGraphics.vb +++ b/instat/dlgGeneralForGraphics.vb @@ -25,7 +25,7 @@ Public Class dlgGeneralForGraphics Private iLayerIndex As Integer 'current layer Private clsGlobalAesFunction As New RFunction - Private clsBaseOperator As ROperator + Private clsBaseOperator As New ROperator Private strGlobalDataFrame As String Public bDataFrameSet As Boolean Private bResetOptionsSubdialog As Boolean = True @@ -65,6 +65,7 @@ Public Class dlgGeneralForGraphics End Sub Private Sub InitialiseDialog() + Dim dctLegendPosition As New Dictionary(Of String, String) ucrBase.iHelpTopicID = 420 'By default, we want to put in the script the output of our Base R-command (in this case the ...+...+...) even when it has been assigned to some object (in which case we want the name of that object in the script so that it's called when the script is run). 'For example, when a graph is saved, it is assigned to it's place in an R-instat object. If we had set bExcludeAssignedFunctionOutput to True, then we would never print the graph when running the script. @@ -99,9 +100,18 @@ Public Class dlgGeneralForGraphics ucrChkFlipCoordinates.SetText("Flip Coordinates") ucrChkFlipCoordinates.SetRDefault("FALSE") - ucrChkSecondY.SetText("2nd Y Variable") - ucrChkSecondY.AddParameterPresentCondition(True, True) - ucrChkSecondY.AddParameterPresentCondition(False, False) + ucrChkLegend.SetText("Legend:") + ucrChkLegend.AddToLinkedControls({ucrInputLegendPosition}, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:="None") + ucrInputLegendPosition.SetDropDownStyleAsNonEditable() + ucrInputLegendPosition.SetParameter(New RParameter("legend.position")) + dctLegendPosition.Add("None", Chr(34) & "none" & Chr(34)) + dctLegendPosition.Add("Left", Chr(34) & "left" & Chr(34)) + dctLegendPosition.Add("Right", Chr(34) & "right" & Chr(34)) + dctLegendPosition.Add("Top", Chr(34) & "top" & Chr(34)) + dctLegendPosition.Add("Bottom", Chr(34) & "bottom" & Chr(34)) + ucrInputLegendPosition.SetItems(dctLegendPosition) + ucrChkLegend.AddParameterPresentCondition(True, "legend.position") + ucrChkLegend.AddParameterPresentCondition(False, "legend.position", False) ucrSave.SetPrefix("graph") ucrSave.SetIsComboBox() @@ -120,7 +130,7 @@ Public Class dlgGeneralForGraphics ucrGraphicsSelector.Reset() ucrGraphicsSelector.SetGgplotFunction(clsBaseOperator) - ucrReceiverX.SetMeAsReceiver() + ucrReceiverY.SetMeAsReceiver() bDataFrameSet = False bResetOptionsSubdialog = True @@ -155,7 +165,7 @@ Public Class dlgGeneralForGraphics clsBaseOperator.bExcludeAssignedFunctionOutput = False ucrBase.clsRsyntax.SetBaseROperator(clsBaseOperator) - ucrAdditionalLayers.SetRCodeForControl(clsNewBaseOperator:=clsBaseOperator, clsRNewggplotFunc:=clsGgplotFunction, clsNewAesFunc:=clsGlobalAesFunction, strNewGlobalDataFrame:=ucrGraphicsSelector.strCurrentDataFrame, bReset:=True) + 'ucrAdditionalLayers.SetRCodeForControl(clsNewBaseOperator:=clsBaseOperator, clsRNewggplotFunc:=clsGgplotFunction, clsNewAesFunc:=clsGlobalAesFunction, strNewGlobalDataFrame:=ucrGraphicsSelector.strCurrentDataFrame, bReset:=True) sdgPlots.Reset() 'Warning/to be discussed: sdgPlots doesn't work like sdgLayerOptions. Information actually stays on the dialogue, as it cannot be editted on the general for graphics (yet) I think that sdgPlots should work like LayerOptions and be filled in at load, thanks to a setup function and setsettings sub. @@ -168,6 +178,8 @@ Public Class dlgGeneralForGraphics ucrReceiverX.SetRCode(clsGlobalAesFunction, bReset) ucrFillOrColourReceiver.SetRCode(clsGlobalAesFunction, bReset) ucrChkFlipCoordinates.SetRCode(clsGlobalAesFunction, bReset) + ucrChkLegend.SetRCode(clsThemeFunction, bReset, bCloneIfNeeded:=True) + ucrInputLegendPosition.SetRCode(clsThemeFunction, bReset, bCloneIfNeeded:=True) ucrSave.SetRCode(clsBaseOperator, bReset) End Sub @@ -268,11 +280,7 @@ Public Class dlgGeneralForGraphics sdgPlots.EnableLayersTab() End Sub - Private Sub AllControl_ControlContentsChanged() Handles ucrReceiverX.ControlContentsChanged, ucrReceiverY.ControlContentsChanged, ucrSave.ControlContentsChanged - TestOKEnabled() - End Sub - - Private Sub ucrReceiverY_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrReceiverX.ControlValueChanged, ucrFillOrColourReceiver.ControlValueChanged + Private Sub ucrReceiverY_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrReceiverY.ControlValueChanged, ucrReceiverX.ControlValueChanged, ucrFillOrColourReceiver.ControlValueChanged If Not ucrReceiverX.IsEmpty Then clsGlobalAesFunction.AddParameter("x", ucrReceiverX.GetVariableNames(False), iPosition:=0) Else @@ -289,4 +297,20 @@ Public Class dlgGeneralForGraphics clsGlobalAesFunction.RemoveParameterByName("colour") End If End Sub + + Private Sub AllControl_ControlContentsChanged() Handles ucrReceiverX.ControlContentsChanged, ucrReceiverY.ControlContentsChanged, ucrSave.ControlContentsChanged, ucrInputLegendPosition.ControlContentsChanged, ucrChkLegend.ControlContentsChanged + TestOKEnabled() + End Sub + + Private Sub AddRemoveTheme() + If clsThemeFunction.iParameterCount > 0 Then + clsBaseOperator.AddParameter("theme", clsRFunctionParameter:=clsThemeFunction, iPosition:=15) + Else + clsBaseOperator.RemoveParameterByName("theme") + End If + End Sub + + Private Sub ucrChkLegend_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkLegend.ControlValueChanged, ucrInputLegendPosition.ControlValueChanged + AddRemoveTheme() + End Sub End Class \ No newline at end of file From 3312f6ae2dfec89c019aa8c3818c12f7ccc589ca Mon Sep 17 00:00:00 2001 From: Sophie Malla Tatchum Date: Thu, 14 Sep 2023 12:07:47 +0100 Subject: [PATCH 04/14] minor change --- instat/dlgGeneralForGraphics.vb | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/instat/dlgGeneralForGraphics.vb b/instat/dlgGeneralForGraphics.vb index 4c0cfebd310..20580d5eea5 100644 --- a/instat/dlgGeneralForGraphics.vb +++ b/instat/dlgGeneralForGraphics.vb @@ -47,8 +47,6 @@ Public Class dlgGeneralForGraphics Private clsScaleFillViridisFunction As New RFunction Private clsScaleColourViridisFunction As New RFunction Private clsAnnotateFunction As New RFunction - Public clsXYSecondaryAxisFunction As New RFunction - Public clsDummyFunction As New RFunction Private Sub dlgGeneralForGraphics_Load(sender As Object, e As EventArgs) Handles MyBase.Load If bFirstLoad Then @@ -165,7 +163,7 @@ Public Class dlgGeneralForGraphics clsBaseOperator.bExcludeAssignedFunctionOutput = False ucrBase.clsRsyntax.SetBaseROperator(clsBaseOperator) - 'ucrAdditionalLayers.SetRCodeForControl(clsNewBaseOperator:=clsBaseOperator, clsRNewggplotFunc:=clsGgplotFunction, clsNewAesFunc:=clsGlobalAesFunction, strNewGlobalDataFrame:=ucrGraphicsSelector.strCurrentDataFrame, bReset:=True) + ucrAdditionalLayers.SetRCodeForControl(clsNewBaseOperator:=clsBaseOperator, clsRNewggplotFunc:=clsGgplotFunction, clsNewAesFunc:=clsGlobalAesFunction, strNewGlobalDataFrame:=ucrGraphicsSelector.strCurrentDataFrame, bReset:=True) sdgPlots.Reset() 'Warning/to be discussed: sdgPlots doesn't work like sdgLayerOptions. Information actually stays on the dialogue, as it cannot be editted on the general for graphics (yet) I think that sdgPlots should work like LayerOptions and be filled in at load, thanks to a setup function and setsettings sub. From bf4ead53287fb673a07a60155ca751edba5e9142 Mon Sep 17 00:00:00 2001 From: Sophie Malla Tatchum Date: Thu, 14 Sep 2023 18:12:10 +0100 Subject: [PATCH 05/14] minor change --- instat/dlgGeneralForGraphics.Designer.vb | 22 +++++++++++----------- instat/dlgGeneralForGraphics.vb | 20 +++++++++++++++++--- 2 files changed, 28 insertions(+), 14 deletions(-) diff --git a/instat/dlgGeneralForGraphics.Designer.vb b/instat/dlgGeneralForGraphics.Designer.vb index 4b69cf2019c..0f810735a96 100644 --- a/instat/dlgGeneralForGraphics.Designer.vb +++ b/instat/dlgGeneralForGraphics.Designer.vb @@ -74,7 +74,7 @@ Partial Class dlgGeneralForGraphics ' Me.lblXVariable.AutoSize = True Me.lblXVariable.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblXVariable.Location = New System.Drawing.Point(254, 81) + Me.lblXVariable.Location = New System.Drawing.Point(245, 81) Me.lblXVariable.Name = "lblXVariable" Me.lblXVariable.Size = New System.Drawing.Size(58, 13) Me.lblXVariable.TabIndex = 3 @@ -85,7 +85,7 @@ Partial Class dlgGeneralForGraphics ' Me.lblFillOrColor.AutoSize = True Me.lblFillOrColor.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblFillOrColor.Location = New System.Drawing.Point(254, 122) + Me.lblFillOrColor.Location = New System.Drawing.Point(245, 122) Me.lblFillOrColor.Name = "lblFillOrColor" Me.lblFillOrColor.Size = New System.Drawing.Size(57, 13) Me.lblFillOrColor.TabIndex = 5 @@ -151,7 +151,7 @@ Partial Class dlgGeneralForGraphics ' Me.lblYVariable.AutoSize = True Me.lblYVariable.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblYVariable.Location = New System.Drawing.Point(254, 38) + Me.lblYVariable.Location = New System.Drawing.Point(245, 38) Me.lblYVariable.Name = "lblYVariable" Me.lblYVariable.Size = New System.Drawing.Size(58, 13) Me.lblYVariable.TabIndex = 1 @@ -164,7 +164,7 @@ Partial Class dlgGeneralForGraphics Me.ucrInputLegendPosition.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink Me.ucrInputLegendPosition.GetSetSelectedIndex = -1 Me.ucrInputLegendPosition.IsReadOnly = False - Me.ucrInputLegendPosition.Location = New System.Drawing.Point(252, 360) + Me.ucrInputLegendPosition.Location = New System.Drawing.Point(243, 360) Me.ucrInputLegendPosition.Name = "ucrInputLegendPosition" Me.ucrInputLegendPosition.Size = New System.Drawing.Size(137, 21) Me.ucrInputLegendPosition.TabIndex = 15 @@ -173,7 +173,7 @@ Partial Class dlgGeneralForGraphics ' Me.ucrReceiverY.AutoSize = True Me.ucrReceiverY.frmParent = Me - Me.ucrReceiverY.Location = New System.Drawing.Point(252, 51) + Me.ucrReceiverY.Location = New System.Drawing.Point(243, 51) Me.ucrReceiverY.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverY.Name = "ucrReceiverY" Me.ucrReceiverY.Selector = Nothing @@ -186,16 +186,16 @@ Partial Class dlgGeneralForGraphics ' Me.ucrChkFlipCoordinates.AutoSize = True Me.ucrChkFlipCoordinates.Checked = False - Me.ucrChkFlipCoordinates.Location = New System.Drawing.Point(257, 300) + Me.ucrChkFlipCoordinates.Location = New System.Drawing.Point(243, 305) Me.ucrChkFlipCoordinates.Name = "ucrChkFlipCoordinates" - Me.ucrChkFlipCoordinates.Size = New System.Drawing.Size(125, 24) + Me.ucrChkFlipCoordinates.Size = New System.Drawing.Size(156, 24) Me.ucrChkFlipCoordinates.TabIndex = 13 ' 'ucrChkLegend ' Me.ucrChkLegend.AutoSize = True Me.ucrChkLegend.Checked = False - Me.ucrChkLegend.Location = New System.Drawing.Point(257, 335) + Me.ucrChkLegend.Location = New System.Drawing.Point(243, 335) Me.ucrChkLegend.Name = "ucrChkLegend" Me.ucrChkLegend.Size = New System.Drawing.Size(125, 24) Me.ucrChkLegend.TabIndex = 14 @@ -206,14 +206,14 @@ Partial Class dlgGeneralForGraphics Me.ucrSave.Location = New System.Drawing.Point(6, 434) Me.ucrSave.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.ucrSave.Name = "ucrSave" - Me.ucrSave.Size = New System.Drawing.Size(346, 24) + Me.ucrSave.Size = New System.Drawing.Size(397, 24) Me.ucrSave.TabIndex = 16 ' 'ucrFillOrColourReceiver ' Me.ucrFillOrColourReceiver.AutoSize = True Me.ucrFillOrColourReceiver.frmParent = Me - Me.ucrFillOrColourReceiver.Location = New System.Drawing.Point(252, 138) + Me.ucrFillOrColourReceiver.Location = New System.Drawing.Point(243, 138) Me.ucrFillOrColourReceiver.Margin = New System.Windows.Forms.Padding(0) Me.ucrFillOrColourReceiver.Name = "ucrFillOrColourReceiver" Me.ucrFillOrColourReceiver.Selector = Nothing @@ -226,7 +226,7 @@ Partial Class dlgGeneralForGraphics ' Me.ucrReceiverX.AutoSize = True Me.ucrReceiverX.frmParent = Me - Me.ucrReceiverX.Location = New System.Drawing.Point(252, 95) + Me.ucrReceiverX.Location = New System.Drawing.Point(243, 95) Me.ucrReceiverX.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverX.Name = "ucrReceiverX" Me.ucrReceiverX.Selector = Nothing diff --git a/instat/dlgGeneralForGraphics.vb b/instat/dlgGeneralForGraphics.vb index 20580d5eea5..6129fe09f37 100644 --- a/instat/dlgGeneralForGraphics.vb +++ b/instat/dlgGeneralForGraphics.vb @@ -63,6 +63,8 @@ Public Class dlgGeneralForGraphics End Sub Private Sub InitialiseDialog() + Dim clsCoordFlipFunc As New RFunction + Dim clsCoordFlipParam As New RParameter Dim dctLegendPosition As New Dictionary(Of String, String) ucrBase.iHelpTopicID = 420 'By default, we want to put in the script the output of our Base R-command (in this case the ...+...+...) even when it has been assigned to some object (in which case we want the name of that object in the script so that it's called when the script is run). @@ -94,9 +96,17 @@ Public Class dlgGeneralForGraphics ucrFillOrColourReceiver.bWithQuotes = False ucrFillOrColourReceiver.SetParameterIsString() - ucrChkFlipCoordinates.SetParameter(New RParameter("coord_flip", 4), bNewChangeParameterValue:=True, bNewAddRemoveParameter:=True, strNewValueIfChecked:="TRUE", strNewValueIfUnchecked:="FALSE") + clsCoordFlipFunc.SetPackageName("ggplot2") + clsCoordFlipFunc.SetRCommand("coord_flip") + clsCoordFlipParam.SetArgumentName("coord_flip") + clsCoordFlipParam.SetArgument(clsCoordFlipFunc) ucrChkFlipCoordinates.SetText("Flip Coordinates") - ucrChkFlipCoordinates.SetRDefault("FALSE") + ucrChkFlipCoordinates.SetParameter(clsCoordFlipParam, bNewChangeParameterValue:=False, bNewAddRemoveParameter:=True) + + + 'ucrChkFlipCoordinates.SetParameter(New RParameter("coord_flip", 4), bNewChangeParameterValue:=True, bNewAddRemoveParameter:=True, strNewValueIfChecked:="TRUE", strNewValueIfUnchecked:="FALSE") + 'ucrChkFlipCoordinates.SetText("Flip Coordinates") + 'ucrChkFlipCoordinates.SetRDefault("FALSE") ucrChkLegend.SetText("Legend:") ucrChkLegend.AddToLinkedControls({ucrInputLegendPosition}, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:="None") @@ -175,7 +185,7 @@ Public Class dlgGeneralForGraphics ucrReceiverY.SetRCode(clsGlobalAesFunction, bReset) ucrReceiverX.SetRCode(clsGlobalAesFunction, bReset) ucrFillOrColourReceiver.SetRCode(clsGlobalAesFunction, bReset) - ucrChkFlipCoordinates.SetRCode(clsGlobalAesFunction, bReset) + ucrChkFlipCoordinates.SetRCode(clsBaseOperator, bReset) ucrChkLegend.SetRCode(clsThemeFunction, bReset, bCloneIfNeeded:=True) ucrInputLegendPosition.SetRCode(clsThemeFunction, bReset, bCloneIfNeeded:=True) ucrSave.SetRCode(clsBaseOperator, bReset) @@ -311,4 +321,8 @@ Public Class dlgGeneralForGraphics Private Sub ucrChkLegend_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkLegend.ControlValueChanged, ucrInputLegendPosition.ControlValueChanged AddRemoveTheme() End Sub + + Private Sub AllControl_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrSave.ControlContentsChanged, ucrReceiverY.ControlContentsChanged, ucrReceiverX.ControlContentsChanged, ucrInputLegendPosition.ControlContentsChanged, ucrChkLegend.ControlContentsChanged + + End Sub End Class \ No newline at end of file From dfe56e6542e3166348f17378375b26400e61eeb3 Mon Sep 17 00:00:00 2001 From: Sophie Malla Tatchum Date: Thu, 14 Sep 2023 18:15:56 +0100 Subject: [PATCH 06/14] minor change --- instat/dlgGeneralForGraphics.vb | 5 ----- 1 file changed, 5 deletions(-) diff --git a/instat/dlgGeneralForGraphics.vb b/instat/dlgGeneralForGraphics.vb index 6129fe09f37..98ffcd50644 100644 --- a/instat/dlgGeneralForGraphics.vb +++ b/instat/dlgGeneralForGraphics.vb @@ -103,11 +103,6 @@ Public Class dlgGeneralForGraphics ucrChkFlipCoordinates.SetText("Flip Coordinates") ucrChkFlipCoordinates.SetParameter(clsCoordFlipParam, bNewChangeParameterValue:=False, bNewAddRemoveParameter:=True) - - 'ucrChkFlipCoordinates.SetParameter(New RParameter("coord_flip", 4), bNewChangeParameterValue:=True, bNewAddRemoveParameter:=True, strNewValueIfChecked:="TRUE", strNewValueIfUnchecked:="FALSE") - 'ucrChkFlipCoordinates.SetText("Flip Coordinates") - 'ucrChkFlipCoordinates.SetRDefault("FALSE") - ucrChkLegend.SetText("Legend:") ucrChkLegend.AddToLinkedControls({ucrInputLegendPosition}, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:="None") ucrInputLegendPosition.SetDropDownStyleAsNonEditable() From a00bdf8ab0cdf946294c16f3cbf28b440f173268 Mon Sep 17 00:00:00 2001 From: Sophie Malla Tatchum Date: Thu, 14 Sep 2023 18:17:00 +0100 Subject: [PATCH 07/14] minor change --- instat/dlgGeneralForGraphics.vb | 4 ---- 1 file changed, 4 deletions(-) diff --git a/instat/dlgGeneralForGraphics.vb b/instat/dlgGeneralForGraphics.vb index 98ffcd50644..0888023fd5f 100644 --- a/instat/dlgGeneralForGraphics.vb +++ b/instat/dlgGeneralForGraphics.vb @@ -316,8 +316,4 @@ Public Class dlgGeneralForGraphics Private Sub ucrChkLegend_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkLegend.ControlValueChanged, ucrInputLegendPosition.ControlValueChanged AddRemoveTheme() End Sub - - Private Sub AllControl_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrSave.ControlContentsChanged, ucrReceiverY.ControlContentsChanged, ucrReceiverX.ControlContentsChanged, ucrInputLegendPosition.ControlContentsChanged, ucrChkLegend.ControlContentsChanged - - End Sub End Class \ No newline at end of file From a43c7bdd11c46b79311d502b32ed115aee49a23d Mon Sep 17 00:00:00 2001 From: Sophie Malla Tatchum Date: Fri, 15 Sep 2023 10:32:38 +0100 Subject: [PATCH 08/14] minor change --- instat/sdgPlots.vb | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/instat/sdgPlots.vb b/instat/sdgPlots.vb index 4a7222f2337..37cffd2c873 100644 --- a/instat/sdgPlots.vb +++ b/instat/sdgPlots.vb @@ -1309,24 +1309,4 @@ Public Class sdgPlots Private Sub ucrChkIncludeTitles_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkIncludeTitles.ControlValueChanged AddRemoveLabs() End Sub - - Private Sub ucrChkIncludeFacets_CheckedChanged(ucrChangedControl As ucrCore) Handles ucrChkIncludeFacets.ControlValueChanged, ucr2ndFactorReceiver.ControlValueChanged, ucr1stFactorReceiver.ControlValueChanged - - End Sub - - Private Sub ucrChkFreeSpace_CheckedChanged(ucrChangedControl As ucrCore) Handles ucrChkFreeSpace.ControlValueChanged - - End Sub - - Private Sub chkScales_CheckedChanged(ucrChangedControl As ucrCore) Handles ucrChkFreeScalesY.ControlValueChanged, ucrChkFreeScalesX.ControlValueChanged - - End Sub - - Private Sub ucrPnlHorizonatalVertical_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrPnlHorizonatalVertical.ControlValueChanged, ucrChkMargin.ControlValueChanged - - End Sub - - Private Sub LabsControls_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrInputTag.ControlValueChanged, ucrInputLegendTitle.ControlValueChanged, ucrInputGraphTitle.ControlValueChanged, ucrInputGraphSubTitle.ControlValueChanged, ucrInputGraphCaption.ControlValueChanged - - End Sub End Class \ No newline at end of file From f4c55101c41f6f78ca5daea10654055ef30bc0b5 Mon Sep 17 00:00:00 2001 From: Sophie Malla Tatchum Date: Tue, 26 Sep 2023 10:02:06 +0100 Subject: [PATCH 09/14] minor change --- instat/dlgGeneralForGraphics.Designer.vb | 414 +++++++++++++++--- instat/dlgGeneralForGraphics.resx | 3 + instat/dlgGeneralForGraphics.vb | 199 ++++++++- .../static/InstatObject/R/install_packages.R | 5 +- instat/ucrAdditionalLayers.Designer.vb | 83 ++-- instat/ucrAdditionalLayers.vb | 4 +- 6 files changed, 591 insertions(+), 117 deletions(-) diff --git a/instat/dlgGeneralForGraphics.Designer.vb b/instat/dlgGeneralForGraphics.Designer.vb index dc64aef53ac..61b49651fa5 100644 --- a/instat/dlgGeneralForGraphics.Designer.vb +++ b/instat/dlgGeneralForGraphics.Designer.vb @@ -38,26 +38,60 @@ Partial Class dlgGeneralForGraphics 'Do not modify it using the code editor. Private Sub InitializeComponent() + Me.components = New System.ComponentModel.Container() Me.cmdOptions = New System.Windows.Forms.Button() Me.lblXVariable = New System.Windows.Forms.Label() - Me.lblFillOrColor = New System.Windows.Forms.Label() Me.cmdFacets = New System.Windows.Forms.Button() Me.cmdTheme = New System.Windows.Forms.Button() Me.cmdYAxis = New System.Windows.Forms.Button() Me.cmdXAxis = New System.Windows.Forms.Button() Me.cmdTitles = New System.Windows.Forms.Button() Me.lblYVariable = New System.Windows.Forms.Label() + Me.grpAethetics = New System.Windows.Forms.GroupBox() + Me.lblLabel = New System.Windows.Forms.Label() + Me.lblColour = New System.Windows.Forms.Label() + Me.lblFill = New System.Windows.Forms.Label() + Me.ContextMenuPackagesList = New System.Windows.Forms.ContextMenuStrip(Me.components) + Me.ListBaseToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.GeomtextpathToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.GGallyToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.GgaltToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.GgdendroToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.GgeffectsToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.GgfittextToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.GgforceToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.GgformulaToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.GgfortifyToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.GgmcmcToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.GgmosaicToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.GgplotifyToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.GgpmiscToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.GgppToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.GgpubrToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.GgrepelToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.GgridgesToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.GgsciToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.GgsignifToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.GgstanceToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.GgtextToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.GgthemesToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.GgwordbuildToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.cmdRHelp = New instat.ucrSplitButton() + Me.ucrLabelReceiver = New instat.ucrReceiverSingle() + Me.ucrColourReceiver = New instat.ucrReceiverSingle() + Me.ucrFillReceiver = New instat.ucrReceiverSingle() + Me.ucrChkUseasNumeric = New instat.ucrCheck() Me.ucrInputLegendPosition = New instat.ucrInputComboBox() Me.ucrReceiverY = New instat.ucrReceiverSingle() Me.ucrChkFlipCoordinates = New instat.ucrCheck() Me.ucrChkLegend = New instat.ucrCheck() Me.ucrSave = New instat.ucrSave() - Me.ucrFillOrColourReceiver = New instat.ucrReceiverSingle() Me.ucrReceiverX = New instat.ucrReceiverSingle() Me.ucrGraphicsSelector = New instat.ucrSelectorByDataFrameAddRemove() Me.ucrAdditionalLayers = New instat.ucrAdditionalLayers() Me.ucrBase = New instat.ucrButtons() - Me.ucrChkUseasNumeric = New instat.ucrCheck() + Me.grpAethetics.SuspendLayout() + Me.ContextMenuPackagesList.SuspendLayout() Me.SuspendLayout() ' 'cmdOptions @@ -75,24 +109,13 @@ Partial Class dlgGeneralForGraphics ' Me.lblXVariable.AutoSize = True Me.lblXVariable.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblXVariable.Location = New System.Drawing.Point(245, 81) + Me.lblXVariable.Location = New System.Drawing.Point(303, 80) Me.lblXVariable.Name = "lblXVariable" Me.lblXVariable.Size = New System.Drawing.Size(58, 13) Me.lblXVariable.TabIndex = 3 Me.lblXVariable.Tag = "X_Variable:" Me.lblXVariable.Text = "X Variable:" ' - 'lblFillOrColor - ' - Me.lblFillOrColor.AutoSize = True - Me.lblFillOrColor.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblFillOrColor.Location = New System.Drawing.Point(245, 122) - Me.lblFillOrColor.Name = "lblFillOrColor" - Me.lblFillOrColor.Size = New System.Drawing.Size(57, 13) - Me.lblFillOrColor.TabIndex = 5 - Me.lblFillOrColor.Tag = "Fill_Colour:" - Me.lblFillOrColor.Text = "Fill/Colour:" - ' 'cmdFacets ' Me.cmdFacets.ImeMode = System.Windows.Forms.ImeMode.NoControl @@ -107,9 +130,9 @@ Partial Class dlgGeneralForGraphics 'cmdTheme ' Me.cmdTheme.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdTheme.Location = New System.Drawing.Point(360, 401) + Me.cmdTheme.Location = New System.Drawing.Point(401, 401) Me.cmdTheme.Name = "cmdTheme" - Me.cmdTheme.Size = New System.Drawing.Size(51, 25) + Me.cmdTheme.Size = New System.Drawing.Size(65, 25) Me.cmdTheme.TabIndex = 21 Me.cmdTheme.Tag = "Theme" Me.cmdTheme.Text = "Theme" @@ -118,9 +141,9 @@ Partial Class dlgGeneralForGraphics 'cmdYAxis ' Me.cmdYAxis.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdYAxis.Location = New System.Drawing.Point(306, 401) + Me.cmdYAxis.Location = New System.Drawing.Point(334, 401) Me.cmdYAxis.Name = "cmdYAxis" - Me.cmdYAxis.Size = New System.Drawing.Size(56, 25) + Me.cmdYAxis.Size = New System.Drawing.Size(69, 25) Me.cmdYAxis.TabIndex = 20 Me.cmdYAxis.Tag = "" Me.cmdYAxis.Text = "Y-Axis" @@ -129,9 +152,9 @@ Partial Class dlgGeneralForGraphics 'cmdXAxis ' Me.cmdXAxis.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdXAxis.Location = New System.Drawing.Point(252, 401) + Me.cmdXAxis.Location = New System.Drawing.Point(266, 401) Me.cmdXAxis.Name = "cmdXAxis" - Me.cmdXAxis.Size = New System.Drawing.Size(56, 25) + Me.cmdXAxis.Size = New System.Drawing.Size(71, 25) Me.cmdXAxis.TabIndex = 19 Me.cmdXAxis.Tag = "" Me.cmdXAxis.Text = "X-Axis" @@ -142,7 +165,7 @@ Partial Class dlgGeneralForGraphics Me.cmdTitles.ImeMode = System.Windows.Forms.ImeMode.NoControl Me.cmdTitles.Location = New System.Drawing.Point(201, 401) Me.cmdTitles.Name = "cmdTitles" - Me.cmdTitles.Size = New System.Drawing.Size(53, 25) + Me.cmdTitles.Size = New System.Drawing.Size(67, 25) Me.cmdTitles.TabIndex = 18 Me.cmdTitles.Tag = "" Me.cmdTitles.Text = "Titles" @@ -152,29 +175,288 @@ Partial Class dlgGeneralForGraphics ' Me.lblYVariable.AutoSize = True Me.lblYVariable.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblYVariable.Location = New System.Drawing.Point(245, 38) + Me.lblYVariable.Location = New System.Drawing.Point(303, 43) Me.lblYVariable.Name = "lblYVariable" Me.lblYVariable.Size = New System.Drawing.Size(58, 13) Me.lblYVariable.TabIndex = 1 Me.lblYVariable.Tag = "Y_Variable:" Me.lblYVariable.Text = "Y Variable:" ' + 'grpAethetics + ' + Me.grpAethetics.Controls.Add(Me.lblLabel) + Me.grpAethetics.Controls.Add(Me.ucrLabelReceiver) + Me.grpAethetics.Controls.Add(Me.lblColour) + Me.grpAethetics.Controls.Add(Me.ucrColourReceiver) + Me.grpAethetics.Controls.Add(Me.lblFill) + Me.grpAethetics.Controls.Add(Me.ucrFillReceiver) + Me.grpAethetics.Location = New System.Drawing.Point(277, 152) + Me.grpAethetics.Name = "grpAethetics" + Me.grpAethetics.Size = New System.Drawing.Size(174, 146) + Me.grpAethetics.TabIndex = 23 + Me.grpAethetics.TabStop = False + Me.grpAethetics.Text = "Aethetics:" + ' + 'lblLabel + ' + Me.lblLabel.AutoSize = True + Me.lblLabel.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.lblLabel.Location = New System.Drawing.Point(27, 95) + Me.lblLabel.Name = "lblLabel" + Me.lblLabel.Size = New System.Drawing.Size(36, 13) + Me.lblLabel.TabIndex = 29 + Me.lblLabel.Tag = "Label:" + Me.lblLabel.Text = "Label:" + ' + 'lblColour + ' + Me.lblColour.AutoSize = True + Me.lblColour.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.lblColour.Location = New System.Drawing.Point(27, 55) + Me.lblColour.Name = "lblColour" + Me.lblColour.Size = New System.Drawing.Size(40, 13) + Me.lblColour.TabIndex = 27 + Me.lblColour.Tag = "Fill_Colour:" + Me.lblColour.Text = "Colour:" + ' + 'lblFill + ' + Me.lblFill.AutoSize = True + Me.lblFill.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.lblFill.Location = New System.Drawing.Point(27, 16) + Me.lblFill.Name = "lblFill" + Me.lblFill.Size = New System.Drawing.Size(19, 13) + Me.lblFill.TabIndex = 25 + Me.lblFill.Tag = "Fill_Colour:" + Me.lblFill.Text = "Fill" + ' + 'ContextMenuPackagesList + ' + Me.ContextMenuPackagesList.ImageScalingSize = New System.Drawing.Size(24, 24) + Me.ContextMenuPackagesList.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ListBaseToolStripMenuItem, Me.GeomtextpathToolStripMenuItem, Me.GGallyToolStripMenuItem, Me.GgaltToolStripMenuItem, Me.GgdendroToolStripMenuItem, Me.GgeffectsToolStripMenuItem, Me.GgfittextToolStripMenuItem, Me.GgforceToolStripMenuItem, Me.GgformulaToolStripMenuItem, Me.GgfortifyToolStripMenuItem, Me.GgmcmcToolStripMenuItem, Me.GgmosaicToolStripMenuItem, Me.GgplotifyToolStripMenuItem, Me.GgpmiscToolStripMenuItem, Me.GgppToolStripMenuItem, Me.GgpubrToolStripMenuItem, Me.GgrepelToolStripMenuItem, Me.GgridgesToolStripMenuItem, Me.GgsciToolStripMenuItem, Me.GgsignifToolStripMenuItem, Me.GgstanceToolStripMenuItem, Me.GgtextToolStripMenuItem, Me.GgthemesToolStripMenuItem, Me.GgwordbuildToolStripMenuItem}) + Me.ContextMenuPackagesList.Name = "ContextMenuStrip1" + Me.ContextMenuPackagesList.Size = New System.Drawing.Size(181, 554) + ' + 'ListBaseToolStripMenuItem + ' + Me.ListBaseToolStripMenuItem.Name = "ListBaseToolStripMenuItem" + Me.ListBaseToolStripMenuItem.Size = New System.Drawing.Size(180, 22) + Me.ListBaseToolStripMenuItem.Text = "ggplot2" + ' + 'GeomtextpathToolStripMenuItem + ' + Me.GeomtextpathToolStripMenuItem.Name = "GeomtextpathToolStripMenuItem" + Me.GeomtextpathToolStripMenuItem.Size = New System.Drawing.Size(180, 22) + Me.GeomtextpathToolStripMenuItem.Text = "geomtextpath" + ' + 'GGallyToolStripMenuItem + ' + Me.GGallyToolStripMenuItem.Name = "GGallyToolStripMenuItem" + Me.GGallyToolStripMenuItem.Size = New System.Drawing.Size(180, 22) + Me.GGallyToolStripMenuItem.Text = "GGally" + ' + 'GgaltToolStripMenuItem + ' + Me.GgaltToolStripMenuItem.Name = "GgaltToolStripMenuItem" + Me.GgaltToolStripMenuItem.Size = New System.Drawing.Size(180, 22) + Me.GgaltToolStripMenuItem.Text = "ggalt" + ' + 'GgdendroToolStripMenuItem + ' + Me.GgdendroToolStripMenuItem.Name = "GgdendroToolStripMenuItem" + Me.GgdendroToolStripMenuItem.Size = New System.Drawing.Size(180, 22) + Me.GgdendroToolStripMenuItem.Text = "ggdendro" + ' + 'GgeffectsToolStripMenuItem + ' + Me.GgeffectsToolStripMenuItem.Name = "GgeffectsToolStripMenuItem" + Me.GgeffectsToolStripMenuItem.Size = New System.Drawing.Size(180, 22) + Me.GgeffectsToolStripMenuItem.Text = "ggeffects" + ' + 'GgfittextToolStripMenuItem + ' + Me.GgfittextToolStripMenuItem.Name = "GgfittextToolStripMenuItem" + Me.GgfittextToolStripMenuItem.Size = New System.Drawing.Size(180, 22) + Me.GgfittextToolStripMenuItem.Text = "ggfittext" + ' + 'GgforceToolStripMenuItem + ' + Me.GgforceToolStripMenuItem.Name = "GgforceToolStripMenuItem" + Me.GgforceToolStripMenuItem.Size = New System.Drawing.Size(180, 22) + Me.GgforceToolStripMenuItem.Text = "ggforce" + ' + 'GgformulaToolStripMenuItem + ' + Me.GgformulaToolStripMenuItem.Name = "GgformulaToolStripMenuItem" + Me.GgformulaToolStripMenuItem.Size = New System.Drawing.Size(180, 22) + Me.GgformulaToolStripMenuItem.Text = "ggformula" + ' + 'GgfortifyToolStripMenuItem + ' + Me.GgfortifyToolStripMenuItem.Name = "GgfortifyToolStripMenuItem" + Me.GgfortifyToolStripMenuItem.Size = New System.Drawing.Size(180, 22) + Me.GgfortifyToolStripMenuItem.Text = "ggfortify" + ' + 'GgmcmcToolStripMenuItem + ' + Me.GgmcmcToolStripMenuItem.Name = "GgmcmcToolStripMenuItem" + Me.GgmcmcToolStripMenuItem.Size = New System.Drawing.Size(180, 22) + Me.GgmcmcToolStripMenuItem.Text = "ggmcmc" + ' + 'GgmosaicToolStripMenuItem + ' + Me.GgmosaicToolStripMenuItem.Name = "GgmosaicToolStripMenuItem" + Me.GgmosaicToolStripMenuItem.Size = New System.Drawing.Size(180, 22) + Me.GgmosaicToolStripMenuItem.Text = "ggmosaic" + ' + 'GgplotifyToolStripMenuItem + ' + Me.GgplotifyToolStripMenuItem.Name = "GgplotifyToolStripMenuItem" + Me.GgplotifyToolStripMenuItem.Size = New System.Drawing.Size(180, 22) + Me.GgplotifyToolStripMenuItem.Text = "ggplotify" + ' + 'GgpmiscToolStripMenuItem + ' + Me.GgpmiscToolStripMenuItem.Name = "GgpmiscToolStripMenuItem" + Me.GgpmiscToolStripMenuItem.Size = New System.Drawing.Size(180, 22) + Me.GgpmiscToolStripMenuItem.Text = "ggpmisc" + ' + 'GgppToolStripMenuItem + ' + Me.GgppToolStripMenuItem.Name = "GgppToolStripMenuItem" + Me.GgppToolStripMenuItem.Size = New System.Drawing.Size(180, 22) + Me.GgppToolStripMenuItem.Text = "ggpp" + ' + 'GgpubrToolStripMenuItem + ' + Me.GgpubrToolStripMenuItem.Name = "GgpubrToolStripMenuItem" + Me.GgpubrToolStripMenuItem.Size = New System.Drawing.Size(180, 22) + Me.GgpubrToolStripMenuItem.Text = "ggpubr" + ' + 'GgrepelToolStripMenuItem + ' + Me.GgrepelToolStripMenuItem.Name = "GgrepelToolStripMenuItem" + Me.GgrepelToolStripMenuItem.Size = New System.Drawing.Size(180, 22) + Me.GgrepelToolStripMenuItem.Text = "ggrepel" + ' + 'GgridgesToolStripMenuItem + ' + Me.GgridgesToolStripMenuItem.Name = "GgridgesToolStripMenuItem" + Me.GgridgesToolStripMenuItem.Size = New System.Drawing.Size(180, 22) + Me.GgridgesToolStripMenuItem.Text = "ggridges" + ' + 'GgsciToolStripMenuItem + ' + Me.GgsciToolStripMenuItem.Name = "GgsciToolStripMenuItem" + Me.GgsciToolStripMenuItem.Size = New System.Drawing.Size(180, 22) + Me.GgsciToolStripMenuItem.Text = "ggsci" + ' + 'GgsignifToolStripMenuItem + ' + Me.GgsignifToolStripMenuItem.Name = "GgsignifToolStripMenuItem" + Me.GgsignifToolStripMenuItem.Size = New System.Drawing.Size(180, 22) + Me.GgsignifToolStripMenuItem.Text = "ggsignif" + ' + 'GgstanceToolStripMenuItem + ' + Me.GgstanceToolStripMenuItem.Name = "GgstanceToolStripMenuItem" + Me.GgstanceToolStripMenuItem.Size = New System.Drawing.Size(180, 22) + Me.GgstanceToolStripMenuItem.Text = "ggstance" + ' + 'GgtextToolStripMenuItem + ' + Me.GgtextToolStripMenuItem.Name = "GgtextToolStripMenuItem" + Me.GgtextToolStripMenuItem.Size = New System.Drawing.Size(180, 22) + Me.GgtextToolStripMenuItem.Text = "ggtext" + ' + 'GgthemesToolStripMenuItem + ' + Me.GgthemesToolStripMenuItem.Name = "GgthemesToolStripMenuItem" + Me.GgthemesToolStripMenuItem.Size = New System.Drawing.Size(180, 22) + Me.GgthemesToolStripMenuItem.Text = "ggthemes" + ' + 'GgwordbuildToolStripMenuItem + ' + Me.GgwordbuildToolStripMenuItem.Name = "GgwordbuildToolStripMenuItem" + Me.GgwordbuildToolStripMenuItem.Size = New System.Drawing.Size(180, 22) + Me.GgwordbuildToolStripMenuItem.Text = " ggwordbuild" + ' + 'cmdRHelp + ' + Me.cmdRHelp.AutoSize = True + Me.cmdRHelp.ContextMenuStrip = Me.ContextMenuPackagesList + Me.cmdRHelp.Location = New System.Drawing.Point(371, 430) + Me.cmdRHelp.Name = "cmdRHelp" + Me.cmdRHelp.Size = New System.Drawing.Size(91, 30) + Me.cmdRHelp.SplitMenuStrip = Me.ContextMenuPackagesList + Me.cmdRHelp.TabIndex = 213 + Me.cmdRHelp.Text = "R Help" + Me.cmdRHelp.UseVisualStyleBackColor = True + ' + 'ucrLabelReceiver + ' + Me.ucrLabelReceiver.AutoSize = True + Me.ucrLabelReceiver.frmParent = Nothing + Me.ucrLabelReceiver.Location = New System.Drawing.Point(25, 111) + Me.ucrLabelReceiver.Margin = New System.Windows.Forms.Padding(0) + Me.ucrLabelReceiver.Name = "ucrLabelReceiver" + Me.ucrLabelReceiver.Selector = Nothing + Me.ucrLabelReceiver.Size = New System.Drawing.Size(125, 25) + Me.ucrLabelReceiver.strNcFilePath = "" + Me.ucrLabelReceiver.TabIndex = 30 + Me.ucrLabelReceiver.ucrSelector = Nothing + ' + 'ucrColourReceiver + ' + Me.ucrColourReceiver.AutoSize = True + Me.ucrColourReceiver.frmParent = Nothing + Me.ucrColourReceiver.Location = New System.Drawing.Point(25, 71) + Me.ucrColourReceiver.Margin = New System.Windows.Forms.Padding(0) + Me.ucrColourReceiver.Name = "ucrColourReceiver" + Me.ucrColourReceiver.Selector = Nothing + Me.ucrColourReceiver.Size = New System.Drawing.Size(125, 25) + Me.ucrColourReceiver.strNcFilePath = "" + Me.ucrColourReceiver.TabIndex = 28 + Me.ucrColourReceiver.ucrSelector = Nothing + ' + 'ucrFillReceiver + ' + Me.ucrFillReceiver.AutoSize = True + Me.ucrFillReceiver.frmParent = Nothing + Me.ucrFillReceiver.Location = New System.Drawing.Point(25, 32) + Me.ucrFillReceiver.Margin = New System.Windows.Forms.Padding(0) + Me.ucrFillReceiver.Name = "ucrFillReceiver" + Me.ucrFillReceiver.Selector = Nothing + Me.ucrFillReceiver.Size = New System.Drawing.Size(125, 25) + Me.ucrFillReceiver.strNcFilePath = "" + Me.ucrFillReceiver.TabIndex = 26 + Me.ucrFillReceiver.ucrSelector = Nothing + ' + 'ucrChkUseasNumeric + ' + Me.ucrChkUseasNumeric.AutoSize = True + Me.ucrChkUseasNumeric.Checked = False + Me.ucrChkUseasNumeric.Location = New System.Drawing.Point(301, 122) + Me.ucrChkUseasNumeric.Name = "ucrChkUseasNumeric" + Me.ucrChkUseasNumeric.Size = New System.Drawing.Size(126, 24) + Me.ucrChkUseasNumeric.TabIndex = 22 + ' 'ucrInputLegendPosition ' Me.ucrInputLegendPosition.AddQuotesIfUnrecognised = True Me.ucrInputLegendPosition.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink Me.ucrInputLegendPosition.GetSetSelectedIndex = -1 Me.ucrInputLegendPosition.IsReadOnly = False - Me.ucrInputLegendPosition.Location = New System.Drawing.Point(243, 360) + Me.ucrInputLegendPosition.Location = New System.Drawing.Point(302, 360) Me.ucrInputLegendPosition.Name = "ucrInputLegendPosition" - Me.ucrInputLegendPosition.Size = New System.Drawing.Size(137, 21) + Me.ucrInputLegendPosition.Size = New System.Drawing.Size(125, 21) Me.ucrInputLegendPosition.TabIndex = 15 ' 'ucrReceiverY ' Me.ucrReceiverY.AutoSize = True Me.ucrReceiverY.frmParent = Me - Me.ucrReceiverY.Location = New System.Drawing.Point(243, 51) + Me.ucrReceiverY.Location = New System.Drawing.Point(301, 56) Me.ucrReceiverY.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverY.Name = "ucrReceiverY" Me.ucrReceiverY.Selector = Nothing @@ -187,16 +469,16 @@ Partial Class dlgGeneralForGraphics ' Me.ucrChkFlipCoordinates.AutoSize = True Me.ucrChkFlipCoordinates.Checked = False - Me.ucrChkFlipCoordinates.Location = New System.Drawing.Point(243, 305) + Me.ucrChkFlipCoordinates.Location = New System.Drawing.Point(301, 304) Me.ucrChkFlipCoordinates.Name = "ucrChkFlipCoordinates" - Me.ucrChkFlipCoordinates.Size = New System.Drawing.Size(156, 24) + Me.ucrChkFlipCoordinates.Size = New System.Drawing.Size(125, 24) Me.ucrChkFlipCoordinates.TabIndex = 13 ' 'ucrChkLegend ' Me.ucrChkLegend.AutoSize = True Me.ucrChkLegend.Checked = False - Me.ucrChkLegend.Location = New System.Drawing.Point(243, 335) + Me.ucrChkLegend.Location = New System.Drawing.Point(301, 334) Me.ucrChkLegend.Name = "ucrChkLegend" Me.ucrChkLegend.Size = New System.Drawing.Size(125, 24) Me.ucrChkLegend.TabIndex = 14 @@ -207,27 +489,14 @@ Partial Class dlgGeneralForGraphics Me.ucrSave.Location = New System.Drawing.Point(6, 434) Me.ucrSave.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.ucrSave.Name = "ucrSave" - Me.ucrSave.Size = New System.Drawing.Size(397, 24) + Me.ucrSave.Size = New System.Drawing.Size(204, 24) Me.ucrSave.TabIndex = 16 ' - 'ucrFillOrColourReceiver - ' - Me.ucrFillOrColourReceiver.AutoSize = True - Me.ucrFillOrColourReceiver.frmParent = Me - Me.ucrFillOrColourReceiver.Location = New System.Drawing.Point(243, 138) - Me.ucrFillOrColourReceiver.Margin = New System.Windows.Forms.Padding(0) - Me.ucrFillOrColourReceiver.Name = "ucrFillOrColourReceiver" - Me.ucrFillOrColourReceiver.Selector = Nothing - Me.ucrFillOrColourReceiver.Size = New System.Drawing.Size(125, 25) - Me.ucrFillOrColourReceiver.strNcFilePath = "" - Me.ucrFillOrColourReceiver.TabIndex = 6 - Me.ucrFillOrColourReceiver.ucrSelector = Nothing - ' 'ucrReceiverX ' Me.ucrReceiverX.AutoSize = True Me.ucrReceiverX.frmParent = Me - Me.ucrReceiverX.Location = New System.Drawing.Point(243, 95) + Me.ucrReceiverX.Location = New System.Drawing.Point(301, 94) Me.ucrReceiverX.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverX.Name = "ucrReceiverX" Me.ucrReceiverX.Selector = Nothing @@ -253,7 +522,7 @@ Partial Class dlgGeneralForGraphics Me.ucrAdditionalLayers.AutoSize = True Me.ucrAdditionalLayers.Location = New System.Drawing.Point(6, 213) Me.ucrAdditionalLayers.Name = "ucrAdditionalLayers" - Me.ucrAdditionalLayers.Size = New System.Drawing.Size(218, 182) + Me.ucrAdditionalLayers.Size = New System.Drawing.Size(253, 182) Me.ucrAdditionalLayers.TabIndex = 8 ' 'ucrBase @@ -265,21 +534,15 @@ Partial Class dlgGeneralForGraphics Me.ucrBase.Size = New System.Drawing.Size(408, 52) Me.ucrBase.TabIndex = 9 ' - 'ucrChkUseasNumeric - ' - Me.ucrChkUseasNumeric.AutoSize = True - Me.ucrChkUseasNumeric.Checked = False - Me.ucrChkUseasNumeric.Location = New System.Drawing.Point(262, 241) - Me.ucrChkUseasNumeric.Name = "ucrChkUseasNumeric" - Me.ucrChkUseasNumeric.Size = New System.Drawing.Size(125, 23) - Me.ucrChkUseasNumeric.TabIndex = 20 - ' '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(416, 519) + Me.ClientSize = New System.Drawing.Size(478, 519) + Me.Controls.Add(Me.cmdRHelp) + Me.Controls.Add(Me.grpAethetics) + Me.Controls.Add(Me.ucrChkUseasNumeric) Me.Controls.Add(Me.ucrInputLegendPosition) Me.Controls.Add(Me.ucrReceiverY) Me.Controls.Add(Me.lblYVariable) @@ -291,9 +554,7 @@ Partial Class dlgGeneralForGraphics Me.Controls.Add(Me.cmdTheme) Me.Controls.Add(Me.cmdFacets) Me.Controls.Add(Me.ucrSave) - Me.Controls.Add(Me.lblFillOrColor) Me.Controls.Add(Me.lblXVariable) - Me.Controls.Add(Me.ucrFillOrColourReceiver) Me.Controls.Add(Me.ucrReceiverX) Me.Controls.Add(Me.ucrGraphicsSelector) Me.Controls.Add(Me.cmdOptions) @@ -306,6 +567,9 @@ Partial Class dlgGeneralForGraphics Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen Me.Tag = "General " Me.Text = "General Graphics" + Me.grpAethetics.ResumeLayout(False) + Me.grpAethetics.PerformLayout() + Me.ContextMenuPackagesList.ResumeLayout(False) Me.ResumeLayout(False) Me.PerformLayout() @@ -315,10 +579,8 @@ Partial Class dlgGeneralForGraphics Friend WithEvents ucrAdditionalLayers As ucrAdditionalLayers Friend WithEvents cmdOptions As Button Friend WithEvents ucrGraphicsSelector As ucrSelectorByDataFrameAddRemove - Friend WithEvents ucrFillOrColourReceiver As ucrReceiverSingle Friend WithEvents ucrReceiverX As ucrReceiverSingle Friend WithEvents lblXVariable As Label - Friend WithEvents lblFillOrColor As Label Friend WithEvents ucrSave As ucrSave Friend WithEvents cmdTheme As Button Friend WithEvents cmdFacets As Button @@ -330,4 +592,38 @@ Partial Class dlgGeneralForGraphics Friend WithEvents lblYVariable As Label Friend WithEvents ucrReceiverY As ucrReceiverSingle Friend WithEvents ucrInputLegendPosition As ucrInputComboBox + Friend WithEvents ucrChkUseasNumeric As ucrCheck + Friend WithEvents grpAethetics As GroupBox + Friend WithEvents lblColour As Label + Friend WithEvents ucrColourReceiver As ucrReceiverSingle + Friend WithEvents lblFill As Label + Friend WithEvents ucrFillReceiver As ucrReceiverSingle + Friend WithEvents lblLabel As Label + Friend WithEvents ucrLabelReceiver As ucrReceiverSingle + Friend WithEvents cmdRHelp As ucrSplitButton + Friend WithEvents ContextMenuPackagesList As ContextMenuStrip + Friend WithEvents ListBaseToolStripMenuItem As ToolStripMenuItem + Friend WithEvents GeomtextpathToolStripMenuItem As ToolStripMenuItem + Friend WithEvents GGallyToolStripMenuItem As ToolStripMenuItem + Friend WithEvents GgaltToolStripMenuItem As ToolStripMenuItem + Friend WithEvents GgdendroToolStripMenuItem As ToolStripMenuItem + Friend WithEvents GgeffectsToolStripMenuItem As ToolStripMenuItem + Friend WithEvents GgfittextToolStripMenuItem As ToolStripMenuItem + Friend WithEvents GgforceToolStripMenuItem As ToolStripMenuItem + Friend WithEvents GgformulaToolStripMenuItem As ToolStripMenuItem + Friend WithEvents GgfortifyToolStripMenuItem As ToolStripMenuItem + Friend WithEvents GgmcmcToolStripMenuItem As ToolStripMenuItem + Friend WithEvents GgmosaicToolStripMenuItem As ToolStripMenuItem + Friend WithEvents GgplotifyToolStripMenuItem As ToolStripMenuItem + Friend WithEvents GgpmiscToolStripMenuItem As ToolStripMenuItem + Friend WithEvents GgppToolStripMenuItem As ToolStripMenuItem + Friend WithEvents GgpubrToolStripMenuItem As ToolStripMenuItem + Friend WithEvents GgrepelToolStripMenuItem As ToolStripMenuItem + Friend WithEvents GgridgesToolStripMenuItem As ToolStripMenuItem + Friend WithEvents GgsciToolStripMenuItem As ToolStripMenuItem + Friend WithEvents GgsignifToolStripMenuItem As ToolStripMenuItem + Friend WithEvents GgstanceToolStripMenuItem As ToolStripMenuItem + Friend WithEvents GgtextToolStripMenuItem As ToolStripMenuItem + Friend WithEvents GgthemesToolStripMenuItem As ToolStripMenuItem + Friend WithEvents GgwordbuildToolStripMenuItem As ToolStripMenuItem End Class diff --git a/instat/dlgGeneralForGraphics.resx b/instat/dlgGeneralForGraphics.resx index 29dcb1b3a35..f8d7bd09a9c 100644 --- a/instat/dlgGeneralForGraphics.resx +++ b/instat/dlgGeneralForGraphics.resx @@ -117,4 +117,7 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 217, 12 + \ No newline at end of file diff --git a/instat/dlgGeneralForGraphics.vb b/instat/dlgGeneralForGraphics.vb index c7f771239ca..d8e06adec0a 100644 --- a/instat/dlgGeneralForGraphics.vb +++ b/instat/dlgGeneralForGraphics.vb @@ -24,7 +24,7 @@ Public Class dlgGeneralForGraphics 'list of completed layers. Private iLayerIndex As Integer 'current layer - Private clsGlobalAesFunction As New RFunction + Private clsGlobalAesFunction, clsScaleContinuousFunction, clsLevelsFunction As New RFunction Private clsBaseOperator As New ROperator Private strGlobalDataFrame As String Public bDataFrameSet As Boolean @@ -48,6 +48,7 @@ Public Class dlgGeneralForGraphics Private clsScaleColourViridisFunction As New RFunction Private clsAnnotateFunction As New RFunction Private clsDummyFunction As New RFunction + Private strPackageName As String Private Sub dlgGeneralForGraphics_Load(sender As Object, e As EventArgs) Handles MyBase.Load If bFirstLoad Then @@ -84,6 +85,10 @@ Public Class dlgGeneralForGraphics ucrReceiverX.SetValuesToIgnore({Chr(34) & Chr(34)}) ucrReceiverX.bAddParameterIfEmpty = True + ucrChkUseasNumeric.SetText("Group X") + ucrChkUseasNumeric.AddParameterValuesCondition(True, "group", "True") + ucrChkUseasNumeric.AddParameterValuesCondition(False, "group", "False") + ucrReceiverY.Selector = ucrGraphicsSelector ucrReceiverY.strSelectorHeading = "Variables" ucrReceiverY.bWithQuotes = False @@ -91,11 +96,26 @@ Public Class dlgGeneralForGraphics ucrReceiverY.SetValuesToIgnore({Chr(34) & Chr(34)}) ucrReceiverY.bAddParameterIfEmpty = True - ucrFillOrColourReceiver.Selector = ucrGraphicsSelector - ucrFillOrColourReceiver.SetIncludedDataTypes({"factor"}) - ucrFillOrColourReceiver.strSelectorHeading = "Factors" - ucrFillOrColourReceiver.bWithQuotes = False - ucrFillOrColourReceiver.SetParameterIsString() + ucrFillReceiver.SetParameter(New RParameter("fill", 3)) + ucrFillReceiver.Selector = ucrGraphicsSelector + ucrFillReceiver.SetIncludedDataTypes({"factor"}) + ucrFillReceiver.strSelectorHeading = "Factors" + ucrFillReceiver.bWithQuotes = False + ucrFillReceiver.SetParameterIsString() + + ucrColourReceiver.SetParameter(New RParameter("colour", 4)) + ucrColourReceiver.Selector = ucrGraphicsSelector + ucrColourReceiver.SetIncludedDataTypes({"factor"}) + ucrColourReceiver.strSelectorHeading = "Factors" + ucrColourReceiver.bWithQuotes = False + ucrColourReceiver.SetParameterIsString() + + ucrLabelReceiver.SetParameter(New RParameter("label", 5)) + ucrLabelReceiver.Selector = ucrGraphicsSelector + ucrLabelReceiver.SetIncludedDataTypes({"factor"}) + ucrLabelReceiver.strSelectorHeading = "Factors" + ucrLabelReceiver.bWithQuotes = False + ucrLabelReceiver.SetParameterIsString() clsCoordFlipFunc.SetPackageName("ggplot2") clsCoordFlipFunc.SetRCommand("coord_flip") @@ -120,7 +140,7 @@ Public Class dlgGeneralForGraphics ucrSave.SetPrefix("graph") ucrSave.SetIsComboBox() ucrSave.SetSaveTypeAsGraph() - ucrSave.SetCheckBoxText("Save Graph") + ucrSave.SetCheckBoxText("Save") ucrSave.SetDataFrameSelector(ucrGraphicsSelector.ucrAvailableDataFrames) ucrSave.SetAssignToIfUncheckedValue("last_graph") VariableXType() @@ -129,10 +149,10 @@ Public Class dlgGeneralForGraphics Private Sub SetDefaults() clsGgplotFunction = New RFunction clsGlobalAesFunction = New RFunction - clsScaleContinuousFunction = New RFunction - clsLevelsFunction = New RFunction clsBaseOperator = New ROperator clsDummyFunction = New RFunction + clsScaleContinuousFunction = New RFunction + clsLevelsFunction = New RFunction ucrSave.Reset() @@ -143,6 +163,7 @@ Public Class dlgGeneralForGraphics bResetOptionsSubdialog = True clsDummyFunction.AddParameter("group", "false", iPosition:=0) + clsDummyFunction.AddParameter("group", "false", iPosition:=1) clsBaseOperator.SetOperation("+") clsBaseOperator.AddParameter("ggplot", clsRFunctionParameter:=clsGgplotFunction, iPosition:=0) @@ -196,7 +217,12 @@ Public Class dlgGeneralForGraphics ucrGraphicsSelector.SetRCode(clsGgplotFunction, bReset) ucrReceiverY.SetRCode(clsGlobalAesFunction, bReset) ucrReceiverX.SetRCode(clsGlobalAesFunction, bReset) - ucrFillOrColourReceiver.SetRCode(clsGlobalAesFunction, bReset) + If bReset Then + ucrChkUseasNumeric.SetRCode(clsDummyFunction, bReset) + End If + ucrFillReceiver.SetRCode(clsGlobalAesFunction, bReset) + ucrColourReceiver.SetRCode(clsGlobalAesFunction, bReset) + ucrLabelReceiver.SetRCode(clsGlobalAesFunction, bReset) ucrChkFlipCoordinates.SetRCode(clsBaseOperator, bReset) ucrChkLegend.SetRCode(clsThemeFunction, bReset, bCloneIfNeeded:=True) ucrInputLegendPosition.SetRCode(clsThemeFunction, bReset, bCloneIfNeeded:=True) @@ -301,25 +327,35 @@ Public Class dlgGeneralForGraphics sdgPlots.EnableLayersTab() End Sub - Private Sub ucrReceiverY_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrReceiverY.ControlValueChanged, ucrReceiverX.ControlValueChanged, ucrFillOrColourReceiver.ControlValueChanged - If Not ucrReceiverX.IsEmpty Then - clsGlobalAesFunction.AddParameter("x", ucrReceiverX.GetVariableNames(False), iPosition:=0) - Else - clsGlobalAesFunction.RemoveParameterByName("x") - End If + Private Sub ucrReceiverY_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrReceiverY.ControlValueChanged, ucrReceiverX.ControlValueChanged + 'If Not ucrReceiverX.IsEmpty Then + ' clsGlobalAesFunction.AddParameter("x", ucrReceiverX.GetVariableNames(False), iPosition:=0) + 'Else + ' clsGlobalAesFunction.RemoveParameterByName("x") + 'End If If Not ucrReceiverY.IsEmpty Then clsGlobalAesFunction.AddParameter("y", ucrReceiverY.GetVariableNames(False), iPosition:=1) Else clsGlobalAesFunction.RemoveParameterByName("y") End If - If Not ucrFillOrColourReceiver.IsEmpty Then - clsGlobalAesFunction.AddParameter("colour", ucrFillOrColourReceiver.GetVariableNames(False), iPosition:=2) + If Not ucrFillReceiver.IsEmpty Then + clsGlobalAesFunction.AddParameter("fill", ucrFillReceiver.GetVariableNames(False), iPosition:=2) + Else + clsGlobalAesFunction.RemoveParameterByName("fill") + End If + If Not ucrColourReceiver.IsEmpty Then + clsGlobalAesFunction.AddParameter("colour", ucrColourReceiver.GetVariableNames(False), iPosition:=3) Else clsGlobalAesFunction.RemoveParameterByName("colour") End If + If Not ucrLabelReceiver.IsEmpty Then + clsGlobalAesFunction.AddParameter("label", ucrLabelReceiver.GetVariableNames(False), iPosition:=3) + Else + clsGlobalAesFunction.RemoveParameterByName("label") + End If End Sub - - Private Sub AllControl_ControlContentsChanged() Handles ucrReceiverX.ControlContentsChanged, ucrReceiverY.ControlContentsChanged, ucrSave.ControlContentsChanged, ucrInputLegendPosition.ControlContentsChanged, ucrChkLegend.ControlContentsChanged + + Private Sub AllControl_ControlContentsChanged() Handles ucrReceiverX.ControlContentsChanged, ucrReceiverY.ControlContentsChanged, ucrSave.ControlContentsChanged, ucrInputLegendPosition.ControlContentsChanged, ucrChkLegend.ControlContentsChanged, ucrChkUseasNumeric.ControlContentsChanged TestOKEnabled() End Sub @@ -334,4 +370,127 @@ Public Class dlgGeneralForGraphics Private Sub ucrChkLegend_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkLegend.ControlValueChanged, ucrInputLegendPosition.ControlValueChanged AddRemoveTheme() End Sub + + Private Sub VariableXType() + ucrChkUseasNumeric.Visible = False + If Not ucrReceiverX.IsEmpty Then + clsGlobalAesFunction.AddParameter("x", ucrReceiverX.GetVariableNames(False), iPosition:=0) + ucrChkUseasNumeric.Visible = ucrReceiverX.strCurrDataType = "factor" + If ucrChkUseasNumeric.Checked Then + clsGlobalAesFunction.AddParameter("group", "1", iPosition:=2) + Else + clsGlobalAesFunction.RemoveParameterByName("group") + End If + Else + clsGlobalAesFunction.RemoveParameterByName("x") + End If + End Sub + + Private Sub OpenHelpPage() + If strPackageName <> "" Then + frmMaximiseOutput.Show(strFileName:=clsFileUrlUtilities.GetHelpFileURL(strPackageName:=strPackageName), bReplace:=False) + End If + End Sub + + Private Sub cmdRHelp_Click(sender As Object, e As EventArgs) Handles cmdRHelp.Click, ListBaseToolStripMenuItem.Click + strPackageName = "ggplot2" + OpenHelpPage() + End Sub + + Private Sub GGallyToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles GGallyToolStripMenuItem.Click + + End Sub + + Private Sub GgaltToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles GgaltToolStripMenuItem.Click + + End Sub + + Private Sub GgdendroToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles GgdendroToolStripMenuItem.Click + + End Sub + + Private Sub GgeffectsToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles GgeffectsToolStripMenuItem.Click + + End Sub + + Private Sub GgfittextToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles GgfittextToolStripMenuItem.Click + + End Sub + + Private Sub GgforceToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles GgforceToolStripMenuItem.Click + + End Sub + + Private Sub GgformulaToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles GgformulaToolStripMenuItem.Click + + End Sub + + Private Sub GgfortifyToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles GgfortifyToolStripMenuItem.Click + + End Sub + + Private Sub GgmcmcToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles GgmcmcToolStripMenuItem.Click + + End Sub + + Private Sub GgmosaicToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles GgmosaicToolStripMenuItem.Click + + End Sub + + Private Sub GgplotifyToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles GgplotifyToolStripMenuItem.Click + + End Sub + + Private Sub GgpmiscToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles GgpmiscToolStripMenuItem.Click + + End Sub + + Private Sub GgppToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles GgppToolStripMenuItem.Click + + End Sub + + Private Sub GgpubrToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles GgpubrToolStripMenuItem.Click + + End Sub + + Private Sub GgrepelToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles GgrepelToolStripMenuItem.Click + + End Sub + + Private Sub GgridgesToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles GgridgesToolStripMenuItem.Click + + End Sub + + Private Sub GgsciToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles GgsciToolStripMenuItem.Click + + End Sub + + Private Sub GgsignifToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles GgsignifToolStripMenuItem.Click + + End Sub + + Private Sub GgstanceToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles GgstanceToolStripMenuItem.Click + + End Sub + + Private Sub GgtextToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles GgtextToolStripMenuItem.Click + + End Sub + + Private Sub GgthemesToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles GgthemesToolStripMenuItem.Click + + End Sub + + Private Sub GgwordbuildToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles GgwordbuildToolStripMenuItem.Click + + End Sub + + Private Sub GeomtextpathToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles GeomtextpathToolStripMenuItem.Click + strPackageName = "geomtextpath" + OpenHelpPage() + End Sub + + Private Sub ucrReceiverX_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrReceiverX.ControlValueChanged, ucrChkUseasNumeric.ControlValueChanged + VariableXType() + End Sub End Class \ No newline at end of file diff --git a/instat/static/InstatObject/R/install_packages.R b/instat/static/InstatObject/R/install_packages.R index 988de278d05..5430da1eee6 100644 --- a/instat/static/InstatObject/R/install_packages.R +++ b/instat/static/InstatObject/R/install_packages.R @@ -161,7 +161,10 @@ pkgs <- "rsplit", "desplot", #applying formatting on vectors and data frames to make data presentation easier, richer, more flexible and hopefully convey more information - "formattable" + "formattable", + #A 'ggplot2' extension that allows text to follow curved paths. + "geomtextpath", + ) pkgList <- pkgDep(pkgs, type="win.binary", repos = "https://cran.rstudio.com/", suggests = FALSE, includeBasePkgs = FALSE, Rversion = r_version) pth <- "C:/Users/Christopher Marsh/Documents/RPackages" diff --git a/instat/ucrAdditionalLayers.Designer.vb b/instat/ucrAdditionalLayers.Designer.vb index bf6ae9eef28..640e05c704b 100644 --- a/instat/ucrAdditionalLayers.Designer.vb +++ b/instat/ucrAdditionalLayers.Designer.vb @@ -38,80 +38,93 @@ Partial Class ucrAdditionalLayers 'Do not modify it using the code editor. _ Private Sub InitializeComponent() + Me.lblLayers = New System.Windows.Forms.Label() + Me.lstLayers = New System.Windows.Forms.ListView() + Me.grpGeoms = New System.Windows.Forms.GroupBox() Me.cmdDelete = New System.Windows.Forms.Button() Me.cmdEdit = New System.Windows.Forms.Button() Me.cmdAdd = New System.Windows.Forms.Button() - Me.lblLayers = New System.Windows.Forms.Label() - Me.lstLayers = New System.Windows.Forms.ListView() + Me.grpGeoms.SuspendLayout() Me.SuspendLayout() ' + 'lblLayers + ' + Me.lblLayers.AutoSize = True + Me.lblLayers.Location = New System.Drawing.Point(4, 13) + Me.lblLayers.Name = "lblLayers" + Me.lblLayers.Size = New System.Drawing.Size(41, 13) + Me.lblLayers.TabIndex = 5 + Me.lblLayers.Text = "Layers:" + ' + 'lstLayers + ' + Me.lstLayers.FullRowSelect = True + Me.lstLayers.HideSelection = False + Me.lstLayers.Location = New System.Drawing.Point(3, 28) + Me.lstLayers.Name = "lstLayers" + Me.lstLayers.Size = New System.Drawing.Size(125, 149) + Me.lstLayers.TabIndex = 4 + Me.lstLayers.UseCompatibleStateImageBehavior = False + Me.lstLayers.View = System.Windows.Forms.View.List + ' + 'grpGeoms + ' + Me.grpGeoms.Controls.Add(Me.cmdDelete) + Me.grpGeoms.Controls.Add(Me.cmdEdit) + Me.grpGeoms.Controls.Add(Me.cmdAdd) + Me.grpGeoms.Location = New System.Drawing.Point(134, 53) + Me.grpGeoms.Name = "grpGeoms" + Me.grpGeoms.Size = New System.Drawing.Size(106, 100) + Me.grpGeoms.TabIndex = 9 + Me.grpGeoms.TabStop = False + Me.grpGeoms.Text = "Geoms:" + ' 'cmdDelete ' - Me.cmdDelete.Location = New System.Drawing.Point(134, 121) + Me.cmdDelete.Location = New System.Drawing.Point(16, 72) Me.cmdDelete.Name = "cmdDelete" Me.cmdDelete.Size = New System.Drawing.Size(75, 23) - Me.cmdDelete.TabIndex = 6 + Me.cmdDelete.TabIndex = 9 Me.cmdDelete.Text = "Delete" Me.cmdDelete.UseVisualStyleBackColor = True ' 'cmdEdit ' - Me.cmdEdit.Location = New System.Drawing.Point(134, 92) + Me.cmdEdit.Location = New System.Drawing.Point(16, 43) Me.cmdEdit.Name = "cmdEdit" Me.cmdEdit.Size = New System.Drawing.Size(75, 23) - Me.cmdEdit.TabIndex = 7 + Me.cmdEdit.TabIndex = 10 Me.cmdEdit.Text = "Edit" Me.cmdEdit.UseVisualStyleBackColor = True ' 'cmdAdd ' - Me.cmdAdd.Location = New System.Drawing.Point(134, 63) + Me.cmdAdd.Location = New System.Drawing.Point(16, 14) Me.cmdAdd.Name = "cmdAdd" Me.cmdAdd.Size = New System.Drawing.Size(75, 23) - Me.cmdAdd.TabIndex = 8 + Me.cmdAdd.TabIndex = 11 Me.cmdAdd.Text = "Add" Me.cmdAdd.UseVisualStyleBackColor = True ' - 'lblLayers - ' - Me.lblLayers.AutoSize = True - Me.lblLayers.Location = New System.Drawing.Point(4, 13) - Me.lblLayers.Name = "lblLayers" - Me.lblLayers.Size = New System.Drawing.Size(41, 13) - Me.lblLayers.TabIndex = 5 - Me.lblLayers.Text = "Layers:" - ' - 'lstLayers - ' - Me.lstLayers.FullRowSelect = True - Me.lstLayers.HideSelection = False - Me.lstLayers.Location = New System.Drawing.Point(3, 28) - Me.lstLayers.Name = "lstLayers" - Me.lstLayers.Size = New System.Drawing.Size(125, 149) - Me.lstLayers.TabIndex = 4 - Me.lstLayers.UseCompatibleStateImageBehavior = False - Me.lstLayers.View = System.Windows.Forms.View.List - ' 'ucrAdditionalLayers ' Me.AutoScaleDimensions = New System.Drawing.SizeF(96.0!, 96.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi Me.AutoSize = True - Me.Controls.Add(Me.cmdDelete) - Me.Controls.Add(Me.cmdEdit) - Me.Controls.Add(Me.cmdAdd) + Me.Controls.Add(Me.grpGeoms) Me.Controls.Add(Me.lblLayers) Me.Controls.Add(Me.lstLayers) Me.Name = "ucrAdditionalLayers" - Me.Size = New System.Drawing.Size(213, 180) + Me.Size = New System.Drawing.Size(249, 180) + Me.grpGeoms.ResumeLayout(False) Me.ResumeLayout(False) Me.PerformLayout() End Sub - + Friend WithEvents lblLayers As Label + Friend WithEvents lstLayers As ListView + Friend WithEvents grpGeoms As GroupBox Friend WithEvents cmdDelete As Button Friend WithEvents cmdEdit As Button Friend WithEvents cmdAdd As Button - Friend WithEvents lblLayers As Label - Friend WithEvents lstLayers As ListView End Class diff --git a/instat/ucrAdditionalLayers.vb b/instat/ucrAdditionalLayers.vb index 1f91bd1d1b6..d26d0718bad 100644 --- a/instat/ucrAdditionalLayers.vb +++ b/instat/ucrAdditionalLayers.vb @@ -131,7 +131,7 @@ Public Class ucrAdditionalLayers SetEditDeleteEnabled() End Sub - Private Sub cmdDelete_Click(sender As Object, e As EventArgs) Handles cmdDelete.Click + Private Sub cmdDelete_Click(sender As Object, e As EventArgs) If lstLayers.SelectedItems.Count = 1 Then If strMainDialogGeomNames Is Nothing OrElse Not strMainDialogGeomNames.Contains(lstLayers.SelectedItems(0).Tag) Then clsBaseOperator.RemoveParameterByName(lstLayers.SelectedItems(0).Tag) @@ -145,7 +145,7 @@ Public Class ucrAdditionalLayers End If End Sub - Private Sub cmdEdit_Click(sender As Object, e As EventArgs) Handles cmdEdit.Click + Private Sub cmdEdit_Click(sender As Object, e As EventArgs) Dim clsSelectedGeomParameter As RParameter Dim clsSelectedGeomFunction As RFunction Dim clsLocalAes As RFunction From 42b8329c7c0d2e83a0d19b6cc64a403ae9b480a4 Mon Sep 17 00:00:00 2001 From: Sophie Malla Tatchum Date: Tue, 26 Sep 2023 10:28:58 +0100 Subject: [PATCH 10/14] change made --- instat/dlgGeneralForGraphics.vb | 74 ++++++++++++------- .../static/InstatObject/R/install_packages.R | 3 +- 2 files changed, 49 insertions(+), 28 deletions(-) diff --git a/instat/dlgGeneralForGraphics.vb b/instat/dlgGeneralForGraphics.vb index d8e06adec0a..b316dc05ccd 100644 --- a/instat/dlgGeneralForGraphics.vb +++ b/instat/dlgGeneralForGraphics.vb @@ -397,96 +397,118 @@ Public Class dlgGeneralForGraphics OpenHelpPage() End Sub - Private Sub GGallyToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles GGallyToolStripMenuItem.Click + Private Sub GeomtextpathToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles GeomtextpathToolStripMenuItem.Click + strPackageName = "geomtextpath" + OpenHelpPage() + End Sub + Private Sub GGallyToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles GGallyToolStripMenuItem.Click + strPackageName = "GGally" + OpenHelpPage() End Sub Private Sub GgaltToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles GgaltToolStripMenuItem.Click - + strPackageName = "ggalt" + OpenHelpPage() End Sub Private Sub GgdendroToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles GgdendroToolStripMenuItem.Click - + strPackageName = "ggdendro" + OpenHelpPage() End Sub Private Sub GgeffectsToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles GgeffectsToolStripMenuItem.Click - + strPackageName = "ggeffects" + OpenHelpPage() End Sub Private Sub GgfittextToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles GgfittextToolStripMenuItem.Click - + strPackageName = "ggfittext" + OpenHelpPage() End Sub Private Sub GgforceToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles GgforceToolStripMenuItem.Click - + strPackageName = "ggforce" + OpenHelpPage() End Sub Private Sub GgformulaToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles GgformulaToolStripMenuItem.Click - + strPackageName = "ggformula" + OpenHelpPage() End Sub Private Sub GgfortifyToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles GgfortifyToolStripMenuItem.Click - + strPackageName = "ggfortify" + OpenHelpPage() End Sub Private Sub GgmcmcToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles GgmcmcToolStripMenuItem.Click - + strPackageName = "ggmcmc" + OpenHelpPage() End Sub Private Sub GgmosaicToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles GgmosaicToolStripMenuItem.Click - + strPackageName = "ggmosaic" + OpenHelpPage() End Sub Private Sub GgplotifyToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles GgplotifyToolStripMenuItem.Click - + strPackageName = "ggplotify" + OpenHelpPage() End Sub Private Sub GgpmiscToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles GgpmiscToolStripMenuItem.Click - + strPackageName = "ggpmisc" + OpenHelpPage() End Sub Private Sub GgppToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles GgppToolStripMenuItem.Click - + strPackageName = "ggpp" + OpenHelpPage() End Sub Private Sub GgpubrToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles GgpubrToolStripMenuItem.Click - + strPackageName = "ggpubr" + OpenHelpPage() End Sub Private Sub GgrepelToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles GgrepelToolStripMenuItem.Click - + strPackageName = "ggrepel" + OpenHelpPage() End Sub Private Sub GgridgesToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles GgridgesToolStripMenuItem.Click - + strPackageName = "ggridges" + OpenHelpPage() End Sub Private Sub GgsciToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles GgsciToolStripMenuItem.Click - + strPackageName = "ggsci" + OpenHelpPage() End Sub Private Sub GgsignifToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles GgsignifToolStripMenuItem.Click - + strPackageName = "ggsignif" + OpenHelpPage() End Sub Private Sub GgstanceToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles GgstanceToolStripMenuItem.Click - + strPackageName = "ggstance" + OpenHelpPage() End Sub Private Sub GgtextToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles GgtextToolStripMenuItem.Click - + strPackageName = "ggtext" + OpenHelpPage() End Sub Private Sub GgthemesToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles GgthemesToolStripMenuItem.Click - + strPackageName = "ggthemes" + OpenHelpPage() End Sub Private Sub GgwordbuildToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles GgwordbuildToolStripMenuItem.Click - - End Sub - - Private Sub GeomtextpathToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles GeomtextpathToolStripMenuItem.Click - strPackageName = "geomtextpath" + strPackageName = "ggwordbluid" OpenHelpPage() End Sub diff --git a/instat/static/InstatObject/R/install_packages.R b/instat/static/InstatObject/R/install_packages.R index 5430da1eee6..f5181bb409c 100644 --- a/instat/static/InstatObject/R/install_packages.R +++ b/instat/static/InstatObject/R/install_packages.R @@ -163,8 +163,7 @@ pkgs <- #applying formatting on vectors and data frames to make data presentation easier, richer, more flexible and hopefully convey more information "formattable", #A 'ggplot2' extension that allows text to follow curved paths. - "geomtextpath", - + "geomtextpath" ) pkgList <- pkgDep(pkgs, type="win.binary", repos = "https://cran.rstudio.com/", suggests = FALSE, includeBasePkgs = FALSE, Rversion = r_version) pth <- "C:/Users/Christopher Marsh/Documents/RPackages" From 3b426f8911d57c3a0705255eafd38c93d7be84f5 Mon Sep 17 00:00:00 2001 From: Sophie Malla Tatchum Date: Tue, 26 Sep 2023 17:03:49 +0100 Subject: [PATCH 11/14] minor change --- instat/dlgGeneralForGraphics.Designer.vb | 308 +++++++++++------------ instat/dlgGeneralForGraphics.vb | 5 - 2 files changed, 154 insertions(+), 159 deletions(-) diff --git a/instat/dlgGeneralForGraphics.Designer.vb b/instat/dlgGeneralForGraphics.Designer.vb index 61b49651fa5..46e69c7e10e 100644 --- a/instat/dlgGeneralForGraphics.Designer.vb +++ b/instat/dlgGeneralForGraphics.Designer.vb @@ -40,17 +40,23 @@ Partial Class dlgGeneralForGraphics Private Sub InitializeComponent() Me.components = New System.ComponentModel.Container() Me.cmdOptions = New System.Windows.Forms.Button() - Me.lblXVariable = New System.Windows.Forms.Label() Me.cmdFacets = New System.Windows.Forms.Button() Me.cmdTheme = New System.Windows.Forms.Button() Me.cmdYAxis = New System.Windows.Forms.Button() Me.cmdXAxis = New System.Windows.Forms.Button() Me.cmdTitles = New System.Windows.Forms.Button() - Me.lblYVariable = New System.Windows.Forms.Label() Me.grpAethetics = New System.Windows.Forms.GroupBox() + Me.ucrChkUseasNumeric = New instat.ucrCheck() + Me.ucrReceiverY = New instat.ucrReceiverSingle() + Me.lblYVariable = New System.Windows.Forms.Label() + Me.lblXVariable = New System.Windows.Forms.Label() + Me.ucrReceiverX = New instat.ucrReceiverSingle() Me.lblLabel = New System.Windows.Forms.Label() + Me.ucrLabelReceiver = New instat.ucrReceiverSingle() Me.lblColour = New System.Windows.Forms.Label() + Me.ucrColourReceiver = New instat.ucrReceiverSingle() Me.lblFill = New System.Windows.Forms.Label() + Me.ucrFillReceiver = New instat.ucrReceiverSingle() Me.ContextMenuPackagesList = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.ListBaseToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.GeomtextpathToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() @@ -77,16 +83,10 @@ Partial Class dlgGeneralForGraphics Me.GgthemesToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.GgwordbuildToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.cmdRHelp = New instat.ucrSplitButton() - Me.ucrLabelReceiver = New instat.ucrReceiverSingle() - Me.ucrColourReceiver = New instat.ucrReceiverSingle() - Me.ucrFillReceiver = New instat.ucrReceiverSingle() - Me.ucrChkUseasNumeric = New instat.ucrCheck() Me.ucrInputLegendPosition = New instat.ucrInputComboBox() - Me.ucrReceiverY = New instat.ucrReceiverSingle() Me.ucrChkFlipCoordinates = New instat.ucrCheck() Me.ucrChkLegend = New instat.ucrCheck() Me.ucrSave = New instat.ucrSave() - Me.ucrReceiverX = New instat.ucrReceiverSingle() Me.ucrGraphicsSelector = New instat.ucrSelectorByDataFrameAddRemove() Me.ucrAdditionalLayers = New instat.ucrAdditionalLayers() Me.ucrBase = New instat.ucrButtons() @@ -105,17 +105,6 @@ Partial Class dlgGeneralForGraphics Me.cmdOptions.Text = "Plot Options" Me.cmdOptions.UseVisualStyleBackColor = True ' - 'lblXVariable - ' - Me.lblXVariable.AutoSize = True - Me.lblXVariable.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblXVariable.Location = New System.Drawing.Point(303, 80) - Me.lblXVariable.Name = "lblXVariable" - Me.lblXVariable.Size = New System.Drawing.Size(58, 13) - Me.lblXVariable.TabIndex = 3 - Me.lblXVariable.Tag = "X_Variable:" - Me.lblXVariable.Text = "X Variable:" - ' 'cmdFacets ' Me.cmdFacets.ImeMode = System.Windows.Forms.ImeMode.NoControl @@ -171,221 +160,311 @@ Partial Class dlgGeneralForGraphics Me.cmdTitles.Text = "Titles" Me.cmdTitles.UseVisualStyleBackColor = True ' - 'lblYVariable - ' - Me.lblYVariable.AutoSize = True - Me.lblYVariable.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblYVariable.Location = New System.Drawing.Point(303, 43) - Me.lblYVariable.Name = "lblYVariable" - Me.lblYVariable.Size = New System.Drawing.Size(58, 13) - Me.lblYVariable.TabIndex = 1 - Me.lblYVariable.Tag = "Y_Variable:" - Me.lblYVariable.Text = "Y Variable:" - ' 'grpAethetics ' + Me.grpAethetics.Controls.Add(Me.ucrChkUseasNumeric) + Me.grpAethetics.Controls.Add(Me.ucrReceiverY) + Me.grpAethetics.Controls.Add(Me.lblYVariable) + Me.grpAethetics.Controls.Add(Me.lblXVariable) + Me.grpAethetics.Controls.Add(Me.ucrReceiverX) Me.grpAethetics.Controls.Add(Me.lblLabel) Me.grpAethetics.Controls.Add(Me.ucrLabelReceiver) Me.grpAethetics.Controls.Add(Me.lblColour) Me.grpAethetics.Controls.Add(Me.ucrColourReceiver) Me.grpAethetics.Controls.Add(Me.lblFill) Me.grpAethetics.Controls.Add(Me.ucrFillReceiver) - Me.grpAethetics.Location = New System.Drawing.Point(277, 152) + Me.grpAethetics.Location = New System.Drawing.Point(277, 41) Me.grpAethetics.Name = "grpAethetics" - Me.grpAethetics.Size = New System.Drawing.Size(174, 146) + Me.grpAethetics.Size = New System.Drawing.Size(174, 257) Me.grpAethetics.TabIndex = 23 Me.grpAethetics.TabStop = False Me.grpAethetics.Text = "Aethetics:" ' + 'ucrChkUseasNumeric + ' + Me.ucrChkUseasNumeric.AutoSize = True + Me.ucrChkUseasNumeric.Checked = False + Me.ucrChkUseasNumeric.Location = New System.Drawing.Point(24, 107) + Me.ucrChkUseasNumeric.Name = "ucrChkUseasNumeric" + Me.ucrChkUseasNumeric.Size = New System.Drawing.Size(126, 24) + Me.ucrChkUseasNumeric.TabIndex = 35 + ' + 'ucrReceiverY + ' + Me.ucrReceiverY.AutoSize = True + Me.ucrReceiverY.frmParent = Me + Me.ucrReceiverY.Location = New System.Drawing.Point(24, 36) + Me.ucrReceiverY.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverY.Name = "ucrReceiverY" + Me.ucrReceiverY.Selector = Nothing + Me.ucrReceiverY.Size = New System.Drawing.Size(125, 20) + Me.ucrReceiverY.strNcFilePath = "" + Me.ucrReceiverY.TabIndex = 32 + Me.ucrReceiverY.ucrSelector = Nothing + ' + 'lblYVariable + ' + Me.lblYVariable.AutoSize = True + Me.lblYVariable.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.lblYVariable.Location = New System.Drawing.Point(26, 23) + Me.lblYVariable.Name = "lblYVariable" + Me.lblYVariable.Size = New System.Drawing.Size(58, 13) + Me.lblYVariable.TabIndex = 31 + Me.lblYVariable.Tag = "Y_Variable:" + Me.lblYVariable.Text = "Y Variable:" + ' + 'lblXVariable + ' + Me.lblXVariable.AutoSize = True + Me.lblXVariable.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.lblXVariable.Location = New System.Drawing.Point(26, 67) + Me.lblXVariable.Name = "lblXVariable" + Me.lblXVariable.Size = New System.Drawing.Size(58, 13) + Me.lblXVariable.TabIndex = 33 + Me.lblXVariable.Tag = "X_Variable:" + Me.lblXVariable.Text = "X Variable:" + ' + 'ucrReceiverX + ' + Me.ucrReceiverX.AutoSize = True + Me.ucrReceiverX.frmParent = Me + Me.ucrReceiverX.Location = New System.Drawing.Point(24, 81) + Me.ucrReceiverX.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverX.Name = "ucrReceiverX" + Me.ucrReceiverX.Selector = Nothing + Me.ucrReceiverX.Size = New System.Drawing.Size(125, 27) + Me.ucrReceiverX.strNcFilePath = "" + Me.ucrReceiverX.TabIndex = 34 + Me.ucrReceiverX.ucrSelector = Nothing + ' 'lblLabel ' Me.lblLabel.AutoSize = True Me.lblLabel.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblLabel.Location = New System.Drawing.Point(27, 95) + Me.lblLabel.Location = New System.Drawing.Point(27, 213) Me.lblLabel.Name = "lblLabel" Me.lblLabel.Size = New System.Drawing.Size(36, 13) Me.lblLabel.TabIndex = 29 Me.lblLabel.Tag = "Label:" Me.lblLabel.Text = "Label:" ' + 'ucrLabelReceiver + ' + Me.ucrLabelReceiver.AutoSize = True + Me.ucrLabelReceiver.frmParent = Me + Me.ucrLabelReceiver.Location = New System.Drawing.Point(25, 229) + Me.ucrLabelReceiver.Margin = New System.Windows.Forms.Padding(0) + Me.ucrLabelReceiver.Name = "ucrLabelReceiver" + Me.ucrLabelReceiver.Selector = Nothing + Me.ucrLabelReceiver.Size = New System.Drawing.Size(125, 25) + Me.ucrLabelReceiver.strNcFilePath = "" + Me.ucrLabelReceiver.TabIndex = 30 + Me.ucrLabelReceiver.ucrSelector = Nothing + ' 'lblColour ' Me.lblColour.AutoSize = True Me.lblColour.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblColour.Location = New System.Drawing.Point(27, 55) + Me.lblColour.Location = New System.Drawing.Point(27, 173) Me.lblColour.Name = "lblColour" Me.lblColour.Size = New System.Drawing.Size(40, 13) Me.lblColour.TabIndex = 27 Me.lblColour.Tag = "Fill_Colour:" Me.lblColour.Text = "Colour:" ' + 'ucrColourReceiver + ' + Me.ucrColourReceiver.AutoSize = True + Me.ucrColourReceiver.frmParent = Me + Me.ucrColourReceiver.Location = New System.Drawing.Point(25, 189) + Me.ucrColourReceiver.Margin = New System.Windows.Forms.Padding(0) + Me.ucrColourReceiver.Name = "ucrColourReceiver" + Me.ucrColourReceiver.Selector = Nothing + Me.ucrColourReceiver.Size = New System.Drawing.Size(125, 25) + Me.ucrColourReceiver.strNcFilePath = "" + Me.ucrColourReceiver.TabIndex = 28 + Me.ucrColourReceiver.ucrSelector = Nothing + ' 'lblFill ' Me.lblFill.AutoSize = True Me.lblFill.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblFill.Location = New System.Drawing.Point(27, 16) + Me.lblFill.Location = New System.Drawing.Point(27, 134) Me.lblFill.Name = "lblFill" - Me.lblFill.Size = New System.Drawing.Size(19, 13) + Me.lblFill.Size = New System.Drawing.Size(22, 13) Me.lblFill.TabIndex = 25 Me.lblFill.Tag = "Fill_Colour:" - Me.lblFill.Text = "Fill" + Me.lblFill.Text = "Fill:" + ' + 'ucrFillReceiver + ' + Me.ucrFillReceiver.AutoSize = True + Me.ucrFillReceiver.frmParent = Me + Me.ucrFillReceiver.Location = New System.Drawing.Point(25, 150) + Me.ucrFillReceiver.Margin = New System.Windows.Forms.Padding(0) + Me.ucrFillReceiver.Name = "ucrFillReceiver" + Me.ucrFillReceiver.Selector = Nothing + Me.ucrFillReceiver.Size = New System.Drawing.Size(125, 25) + Me.ucrFillReceiver.strNcFilePath = "" + Me.ucrFillReceiver.TabIndex = 26 + Me.ucrFillReceiver.ucrSelector = Nothing ' 'ContextMenuPackagesList ' Me.ContextMenuPackagesList.ImageScalingSize = New System.Drawing.Size(24, 24) Me.ContextMenuPackagesList.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ListBaseToolStripMenuItem, Me.GeomtextpathToolStripMenuItem, Me.GGallyToolStripMenuItem, Me.GgaltToolStripMenuItem, Me.GgdendroToolStripMenuItem, Me.GgeffectsToolStripMenuItem, Me.GgfittextToolStripMenuItem, Me.GgforceToolStripMenuItem, Me.GgformulaToolStripMenuItem, Me.GgfortifyToolStripMenuItem, Me.GgmcmcToolStripMenuItem, Me.GgmosaicToolStripMenuItem, Me.GgplotifyToolStripMenuItem, Me.GgpmiscToolStripMenuItem, Me.GgppToolStripMenuItem, Me.GgpubrToolStripMenuItem, Me.GgrepelToolStripMenuItem, Me.GgridgesToolStripMenuItem, Me.GgsciToolStripMenuItem, Me.GgsignifToolStripMenuItem, Me.GgstanceToolStripMenuItem, Me.GgtextToolStripMenuItem, Me.GgthemesToolStripMenuItem, Me.GgwordbuildToolStripMenuItem}) Me.ContextMenuPackagesList.Name = "ContextMenuStrip1" - Me.ContextMenuPackagesList.Size = New System.Drawing.Size(181, 554) + Me.ContextMenuPackagesList.Size = New System.Drawing.Size(150, 532) ' 'ListBaseToolStripMenuItem ' Me.ListBaseToolStripMenuItem.Name = "ListBaseToolStripMenuItem" - Me.ListBaseToolStripMenuItem.Size = New System.Drawing.Size(180, 22) + Me.ListBaseToolStripMenuItem.Size = New System.Drawing.Size(149, 22) Me.ListBaseToolStripMenuItem.Text = "ggplot2" ' 'GeomtextpathToolStripMenuItem ' Me.GeomtextpathToolStripMenuItem.Name = "GeomtextpathToolStripMenuItem" - Me.GeomtextpathToolStripMenuItem.Size = New System.Drawing.Size(180, 22) + Me.GeomtextpathToolStripMenuItem.Size = New System.Drawing.Size(149, 22) Me.GeomtextpathToolStripMenuItem.Text = "geomtextpath" ' 'GGallyToolStripMenuItem ' Me.GGallyToolStripMenuItem.Name = "GGallyToolStripMenuItem" - Me.GGallyToolStripMenuItem.Size = New System.Drawing.Size(180, 22) + Me.GGallyToolStripMenuItem.Size = New System.Drawing.Size(149, 22) Me.GGallyToolStripMenuItem.Text = "GGally" ' 'GgaltToolStripMenuItem ' Me.GgaltToolStripMenuItem.Name = "GgaltToolStripMenuItem" - Me.GgaltToolStripMenuItem.Size = New System.Drawing.Size(180, 22) + Me.GgaltToolStripMenuItem.Size = New System.Drawing.Size(149, 22) Me.GgaltToolStripMenuItem.Text = "ggalt" ' 'GgdendroToolStripMenuItem ' Me.GgdendroToolStripMenuItem.Name = "GgdendroToolStripMenuItem" - Me.GgdendroToolStripMenuItem.Size = New System.Drawing.Size(180, 22) + Me.GgdendroToolStripMenuItem.Size = New System.Drawing.Size(149, 22) Me.GgdendroToolStripMenuItem.Text = "ggdendro" ' 'GgeffectsToolStripMenuItem ' Me.GgeffectsToolStripMenuItem.Name = "GgeffectsToolStripMenuItem" - Me.GgeffectsToolStripMenuItem.Size = New System.Drawing.Size(180, 22) + Me.GgeffectsToolStripMenuItem.Size = New System.Drawing.Size(149, 22) Me.GgeffectsToolStripMenuItem.Text = "ggeffects" ' 'GgfittextToolStripMenuItem ' Me.GgfittextToolStripMenuItem.Name = "GgfittextToolStripMenuItem" - Me.GgfittextToolStripMenuItem.Size = New System.Drawing.Size(180, 22) + Me.GgfittextToolStripMenuItem.Size = New System.Drawing.Size(149, 22) Me.GgfittextToolStripMenuItem.Text = "ggfittext" ' 'GgforceToolStripMenuItem ' Me.GgforceToolStripMenuItem.Name = "GgforceToolStripMenuItem" - Me.GgforceToolStripMenuItem.Size = New System.Drawing.Size(180, 22) + Me.GgforceToolStripMenuItem.Size = New System.Drawing.Size(149, 22) Me.GgforceToolStripMenuItem.Text = "ggforce" ' 'GgformulaToolStripMenuItem ' Me.GgformulaToolStripMenuItem.Name = "GgformulaToolStripMenuItem" - Me.GgformulaToolStripMenuItem.Size = New System.Drawing.Size(180, 22) + Me.GgformulaToolStripMenuItem.Size = New System.Drawing.Size(149, 22) Me.GgformulaToolStripMenuItem.Text = "ggformula" ' 'GgfortifyToolStripMenuItem ' Me.GgfortifyToolStripMenuItem.Name = "GgfortifyToolStripMenuItem" - Me.GgfortifyToolStripMenuItem.Size = New System.Drawing.Size(180, 22) + Me.GgfortifyToolStripMenuItem.Size = New System.Drawing.Size(149, 22) Me.GgfortifyToolStripMenuItem.Text = "ggfortify" ' 'GgmcmcToolStripMenuItem ' Me.GgmcmcToolStripMenuItem.Name = "GgmcmcToolStripMenuItem" - Me.GgmcmcToolStripMenuItem.Size = New System.Drawing.Size(180, 22) + Me.GgmcmcToolStripMenuItem.Size = New System.Drawing.Size(149, 22) Me.GgmcmcToolStripMenuItem.Text = "ggmcmc" ' 'GgmosaicToolStripMenuItem ' Me.GgmosaicToolStripMenuItem.Name = "GgmosaicToolStripMenuItem" - Me.GgmosaicToolStripMenuItem.Size = New System.Drawing.Size(180, 22) + Me.GgmosaicToolStripMenuItem.Size = New System.Drawing.Size(149, 22) Me.GgmosaicToolStripMenuItem.Text = "ggmosaic" ' 'GgplotifyToolStripMenuItem ' Me.GgplotifyToolStripMenuItem.Name = "GgplotifyToolStripMenuItem" - Me.GgplotifyToolStripMenuItem.Size = New System.Drawing.Size(180, 22) + Me.GgplotifyToolStripMenuItem.Size = New System.Drawing.Size(149, 22) Me.GgplotifyToolStripMenuItem.Text = "ggplotify" ' 'GgpmiscToolStripMenuItem ' Me.GgpmiscToolStripMenuItem.Name = "GgpmiscToolStripMenuItem" - Me.GgpmiscToolStripMenuItem.Size = New System.Drawing.Size(180, 22) + Me.GgpmiscToolStripMenuItem.Size = New System.Drawing.Size(149, 22) Me.GgpmiscToolStripMenuItem.Text = "ggpmisc" ' 'GgppToolStripMenuItem ' Me.GgppToolStripMenuItem.Name = "GgppToolStripMenuItem" - Me.GgppToolStripMenuItem.Size = New System.Drawing.Size(180, 22) + Me.GgppToolStripMenuItem.Size = New System.Drawing.Size(149, 22) Me.GgppToolStripMenuItem.Text = "ggpp" ' 'GgpubrToolStripMenuItem ' Me.GgpubrToolStripMenuItem.Name = "GgpubrToolStripMenuItem" - Me.GgpubrToolStripMenuItem.Size = New System.Drawing.Size(180, 22) + Me.GgpubrToolStripMenuItem.Size = New System.Drawing.Size(149, 22) Me.GgpubrToolStripMenuItem.Text = "ggpubr" ' 'GgrepelToolStripMenuItem ' Me.GgrepelToolStripMenuItem.Name = "GgrepelToolStripMenuItem" - Me.GgrepelToolStripMenuItem.Size = New System.Drawing.Size(180, 22) + Me.GgrepelToolStripMenuItem.Size = New System.Drawing.Size(149, 22) Me.GgrepelToolStripMenuItem.Text = "ggrepel" ' 'GgridgesToolStripMenuItem ' Me.GgridgesToolStripMenuItem.Name = "GgridgesToolStripMenuItem" - Me.GgridgesToolStripMenuItem.Size = New System.Drawing.Size(180, 22) + Me.GgridgesToolStripMenuItem.Size = New System.Drawing.Size(149, 22) Me.GgridgesToolStripMenuItem.Text = "ggridges" ' 'GgsciToolStripMenuItem ' Me.GgsciToolStripMenuItem.Name = "GgsciToolStripMenuItem" - Me.GgsciToolStripMenuItem.Size = New System.Drawing.Size(180, 22) + Me.GgsciToolStripMenuItem.Size = New System.Drawing.Size(149, 22) Me.GgsciToolStripMenuItem.Text = "ggsci" ' 'GgsignifToolStripMenuItem ' Me.GgsignifToolStripMenuItem.Name = "GgsignifToolStripMenuItem" - Me.GgsignifToolStripMenuItem.Size = New System.Drawing.Size(180, 22) + Me.GgsignifToolStripMenuItem.Size = New System.Drawing.Size(149, 22) Me.GgsignifToolStripMenuItem.Text = "ggsignif" ' 'GgstanceToolStripMenuItem ' Me.GgstanceToolStripMenuItem.Name = "GgstanceToolStripMenuItem" - Me.GgstanceToolStripMenuItem.Size = New System.Drawing.Size(180, 22) + Me.GgstanceToolStripMenuItem.Size = New System.Drawing.Size(149, 22) Me.GgstanceToolStripMenuItem.Text = "ggstance" ' 'GgtextToolStripMenuItem ' Me.GgtextToolStripMenuItem.Name = "GgtextToolStripMenuItem" - Me.GgtextToolStripMenuItem.Size = New System.Drawing.Size(180, 22) + Me.GgtextToolStripMenuItem.Size = New System.Drawing.Size(149, 22) Me.GgtextToolStripMenuItem.Text = "ggtext" ' 'GgthemesToolStripMenuItem ' Me.GgthemesToolStripMenuItem.Name = "GgthemesToolStripMenuItem" - Me.GgthemesToolStripMenuItem.Size = New System.Drawing.Size(180, 22) + Me.GgthemesToolStripMenuItem.Size = New System.Drawing.Size(149, 22) Me.GgthemesToolStripMenuItem.Text = "ggthemes" ' 'GgwordbuildToolStripMenuItem ' Me.GgwordbuildToolStripMenuItem.Name = "GgwordbuildToolStripMenuItem" - Me.GgwordbuildToolStripMenuItem.Size = New System.Drawing.Size(180, 22) + Me.GgwordbuildToolStripMenuItem.Size = New System.Drawing.Size(149, 22) Me.GgwordbuildToolStripMenuItem.Text = " ggwordbuild" ' 'cmdRHelp ' Me.cmdRHelp.AutoSize = True Me.cmdRHelp.ContextMenuStrip = Me.ContextMenuPackagesList - Me.cmdRHelp.Location = New System.Drawing.Point(371, 430) + Me.cmdRHelp.Location = New System.Drawing.Point(371, 439) Me.cmdRHelp.Name = "cmdRHelp" Me.cmdRHelp.Size = New System.Drawing.Size(91, 30) Me.cmdRHelp.SplitMenuStrip = Me.ContextMenuPackagesList @@ -393,83 +472,22 @@ Partial Class dlgGeneralForGraphics Me.cmdRHelp.Text = "R Help" Me.cmdRHelp.UseVisualStyleBackColor = True ' - 'ucrLabelReceiver - ' - Me.ucrLabelReceiver.AutoSize = True - Me.ucrLabelReceiver.frmParent = Nothing - Me.ucrLabelReceiver.Location = New System.Drawing.Point(25, 111) - Me.ucrLabelReceiver.Margin = New System.Windows.Forms.Padding(0) - Me.ucrLabelReceiver.Name = "ucrLabelReceiver" - Me.ucrLabelReceiver.Selector = Nothing - Me.ucrLabelReceiver.Size = New System.Drawing.Size(125, 25) - Me.ucrLabelReceiver.strNcFilePath = "" - Me.ucrLabelReceiver.TabIndex = 30 - Me.ucrLabelReceiver.ucrSelector = Nothing - ' - 'ucrColourReceiver - ' - Me.ucrColourReceiver.AutoSize = True - Me.ucrColourReceiver.frmParent = Nothing - Me.ucrColourReceiver.Location = New System.Drawing.Point(25, 71) - Me.ucrColourReceiver.Margin = New System.Windows.Forms.Padding(0) - Me.ucrColourReceiver.Name = "ucrColourReceiver" - Me.ucrColourReceiver.Selector = Nothing - Me.ucrColourReceiver.Size = New System.Drawing.Size(125, 25) - Me.ucrColourReceiver.strNcFilePath = "" - Me.ucrColourReceiver.TabIndex = 28 - Me.ucrColourReceiver.ucrSelector = Nothing - ' - 'ucrFillReceiver - ' - Me.ucrFillReceiver.AutoSize = True - Me.ucrFillReceiver.frmParent = Nothing - Me.ucrFillReceiver.Location = New System.Drawing.Point(25, 32) - Me.ucrFillReceiver.Margin = New System.Windows.Forms.Padding(0) - Me.ucrFillReceiver.Name = "ucrFillReceiver" - Me.ucrFillReceiver.Selector = Nothing - Me.ucrFillReceiver.Size = New System.Drawing.Size(125, 25) - Me.ucrFillReceiver.strNcFilePath = "" - Me.ucrFillReceiver.TabIndex = 26 - Me.ucrFillReceiver.ucrSelector = Nothing - ' - 'ucrChkUseasNumeric - ' - Me.ucrChkUseasNumeric.AutoSize = True - Me.ucrChkUseasNumeric.Checked = False - Me.ucrChkUseasNumeric.Location = New System.Drawing.Point(301, 122) - Me.ucrChkUseasNumeric.Name = "ucrChkUseasNumeric" - Me.ucrChkUseasNumeric.Size = New System.Drawing.Size(126, 24) - Me.ucrChkUseasNumeric.TabIndex = 22 - ' 'ucrInputLegendPosition ' Me.ucrInputLegendPosition.AddQuotesIfUnrecognised = True Me.ucrInputLegendPosition.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink Me.ucrInputLegendPosition.GetSetSelectedIndex = -1 Me.ucrInputLegendPosition.IsReadOnly = False - Me.ucrInputLegendPosition.Location = New System.Drawing.Point(302, 360) + Me.ucrInputLegendPosition.Location = New System.Drawing.Point(302, 364) Me.ucrInputLegendPosition.Name = "ucrInputLegendPosition" Me.ucrInputLegendPosition.Size = New System.Drawing.Size(125, 21) Me.ucrInputLegendPosition.TabIndex = 15 ' - 'ucrReceiverY - ' - Me.ucrReceiverY.AutoSize = True - Me.ucrReceiverY.frmParent = Me - Me.ucrReceiverY.Location = New System.Drawing.Point(301, 56) - Me.ucrReceiverY.Margin = New System.Windows.Forms.Padding(0) - Me.ucrReceiverY.Name = "ucrReceiverY" - Me.ucrReceiverY.Selector = Nothing - Me.ucrReceiverY.Size = New System.Drawing.Size(125, 20) - Me.ucrReceiverY.strNcFilePath = "" - Me.ucrReceiverY.TabIndex = 2 - Me.ucrReceiverY.ucrSelector = Nothing - ' 'ucrChkFlipCoordinates ' Me.ucrChkFlipCoordinates.AutoSize = True Me.ucrChkFlipCoordinates.Checked = False - Me.ucrChkFlipCoordinates.Location = New System.Drawing.Point(301, 304) + Me.ucrChkFlipCoordinates.Location = New System.Drawing.Point(301, 308) Me.ucrChkFlipCoordinates.Name = "ucrChkFlipCoordinates" Me.ucrChkFlipCoordinates.Size = New System.Drawing.Size(125, 24) Me.ucrChkFlipCoordinates.TabIndex = 13 @@ -478,7 +496,7 @@ Partial Class dlgGeneralForGraphics ' Me.ucrChkLegend.AutoSize = True Me.ucrChkLegend.Checked = False - Me.ucrChkLegend.Location = New System.Drawing.Point(301, 334) + Me.ucrChkLegend.Location = New System.Drawing.Point(301, 338) Me.ucrChkLegend.Name = "ucrChkLegend" Me.ucrChkLegend.Size = New System.Drawing.Size(125, 24) Me.ucrChkLegend.TabIndex = 14 @@ -486,25 +504,12 @@ Partial Class dlgGeneralForGraphics 'ucrSave ' Me.ucrSave.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrSave.Location = New System.Drawing.Point(6, 434) + Me.ucrSave.Location = New System.Drawing.Point(6, 443) Me.ucrSave.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.ucrSave.Name = "ucrSave" - Me.ucrSave.Size = New System.Drawing.Size(204, 24) + Me.ucrSave.Size = New System.Drawing.Size(282, 24) Me.ucrSave.TabIndex = 16 ' - 'ucrReceiverX - ' - Me.ucrReceiverX.AutoSize = True - Me.ucrReceiverX.frmParent = Me - Me.ucrReceiverX.Location = New System.Drawing.Point(301, 94) - Me.ucrReceiverX.Margin = New System.Windows.Forms.Padding(0) - Me.ucrReceiverX.Name = "ucrReceiverX" - Me.ucrReceiverX.Selector = Nothing - Me.ucrReceiverX.Size = New System.Drawing.Size(125, 27) - Me.ucrReceiverX.strNcFilePath = "" - Me.ucrReceiverX.TabIndex = 4 - Me.ucrReceiverX.ucrSelector = Nothing - ' 'ucrGraphicsSelector ' Me.ucrGraphicsSelector.AutoSize = True @@ -529,7 +534,7 @@ Partial Class dlgGeneralForGraphics ' Me.ucrBase.AutoSize = True Me.ucrBase.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrBase.Location = New System.Drawing.Point(6, 464) + Me.ucrBase.Location = New System.Drawing.Point(6, 483) Me.ucrBase.Name = "ucrBase" Me.ucrBase.Size = New System.Drawing.Size(408, 52) Me.ucrBase.TabIndex = 9 @@ -539,13 +544,10 @@ Partial Class 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, 519) + Me.ClientSize = New System.Drawing.Size(478, 547) Me.Controls.Add(Me.cmdRHelp) Me.Controls.Add(Me.grpAethetics) - Me.Controls.Add(Me.ucrChkUseasNumeric) Me.Controls.Add(Me.ucrInputLegendPosition) - Me.Controls.Add(Me.ucrReceiverY) - Me.Controls.Add(Me.lblYVariable) Me.Controls.Add(Me.ucrChkFlipCoordinates) Me.Controls.Add(Me.ucrChkLegend) Me.Controls.Add(Me.cmdTitles) @@ -554,8 +556,6 @@ Partial Class dlgGeneralForGraphics Me.Controls.Add(Me.cmdTheme) Me.Controls.Add(Me.cmdFacets) Me.Controls.Add(Me.ucrSave) - Me.Controls.Add(Me.lblXVariable) - Me.Controls.Add(Me.ucrReceiverX) Me.Controls.Add(Me.ucrGraphicsSelector) Me.Controls.Add(Me.cmdOptions) Me.Controls.Add(Me.ucrAdditionalLayers) @@ -579,8 +579,6 @@ Partial Class dlgGeneralForGraphics Friend WithEvents ucrAdditionalLayers As ucrAdditionalLayers Friend WithEvents cmdOptions As Button Friend WithEvents ucrGraphicsSelector As ucrSelectorByDataFrameAddRemove - Friend WithEvents ucrReceiverX As ucrReceiverSingle - Friend WithEvents lblXVariable As Label Friend WithEvents ucrSave As ucrSave Friend WithEvents cmdTheme As Button Friend WithEvents cmdFacets As Button @@ -589,10 +587,7 @@ Partial Class dlgGeneralForGraphics Friend WithEvents cmdYAxis As Button Friend WithEvents ucrChkLegend As ucrCheck Friend WithEvents ucrChkFlipCoordinates As ucrCheck - Friend WithEvents lblYVariable As Label - Friend WithEvents ucrReceiverY As ucrReceiverSingle Friend WithEvents ucrInputLegendPosition As ucrInputComboBox - Friend WithEvents ucrChkUseasNumeric As ucrCheck Friend WithEvents grpAethetics As GroupBox Friend WithEvents lblColour As Label Friend WithEvents ucrColourReceiver As ucrReceiverSingle @@ -626,4 +621,9 @@ Partial Class dlgGeneralForGraphics Friend WithEvents GgtextToolStripMenuItem As ToolStripMenuItem Friend WithEvents GgthemesToolStripMenuItem As ToolStripMenuItem Friend WithEvents GgwordbuildToolStripMenuItem As ToolStripMenuItem + Friend WithEvents ucrChkUseasNumeric As ucrCheck + Friend WithEvents ucrReceiverY As ucrReceiverSingle + Friend WithEvents lblYVariable As Label + Friend WithEvents lblXVariable As Label + Friend WithEvents ucrReceiverX As ucrReceiverSingle End Class diff --git a/instat/dlgGeneralForGraphics.vb b/instat/dlgGeneralForGraphics.vb index b316dc05ccd..63a4428ba69 100644 --- a/instat/dlgGeneralForGraphics.vb +++ b/instat/dlgGeneralForGraphics.vb @@ -328,11 +328,6 @@ Public Class dlgGeneralForGraphics End Sub Private Sub ucrReceiverY_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrReceiverY.ControlValueChanged, ucrReceiverX.ControlValueChanged - 'If Not ucrReceiverX.IsEmpty Then - ' clsGlobalAesFunction.AddParameter("x", ucrReceiverX.GetVariableNames(False), iPosition:=0) - 'Else - ' clsGlobalAesFunction.RemoveParameterByName("x") - 'End If If Not ucrReceiverY.IsEmpty Then clsGlobalAesFunction.AddParameter("y", ucrReceiverY.GetVariableNames(False), iPosition:=1) Else From 8ea7db62202fd7c28baf3c83572332ab9d0de6eb Mon Sep 17 00:00:00 2001 From: Sophie Malla Tatchum Date: Thu, 28 Sep 2023 15:18:39 +0100 Subject: [PATCH 12/14] minor change --- instat/ucrAdditionalLayers.vb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/instat/ucrAdditionalLayers.vb b/instat/ucrAdditionalLayers.vb index d26d0718bad..1f91bd1d1b6 100644 --- a/instat/ucrAdditionalLayers.vb +++ b/instat/ucrAdditionalLayers.vb @@ -131,7 +131,7 @@ Public Class ucrAdditionalLayers SetEditDeleteEnabled() End Sub - Private Sub cmdDelete_Click(sender As Object, e As EventArgs) + Private Sub cmdDelete_Click(sender As Object, e As EventArgs) Handles cmdDelete.Click If lstLayers.SelectedItems.Count = 1 Then If strMainDialogGeomNames Is Nothing OrElse Not strMainDialogGeomNames.Contains(lstLayers.SelectedItems(0).Tag) Then clsBaseOperator.RemoveParameterByName(lstLayers.SelectedItems(0).Tag) @@ -145,7 +145,7 @@ Public Class ucrAdditionalLayers End If End Sub - Private Sub cmdEdit_Click(sender As Object, e As EventArgs) + Private Sub cmdEdit_Click(sender As Object, e As EventArgs) Handles cmdEdit.Click Dim clsSelectedGeomParameter As RParameter Dim clsSelectedGeomFunction As RFunction Dim clsLocalAes As RFunction From ecd70df2dff885eb500ec99bcd2a0f61ca72ae28 Mon Sep 17 00:00:00 2001 From: Chris Marsh Date: Mon, 2 Oct 2023 12:35:33 +0100 Subject: [PATCH 13/14] Added R packages --- .../static/InstatObject/R/InstallPackages.R | 221 +++++----- instat/static/InstatObject/R/Rsetup.R | 391 ++++++++---------- .../static/InstatObject/R/install_packages.R | 3 +- 3 files changed, 258 insertions(+), 357 deletions(-) diff --git a/instat/static/InstatObject/R/InstallPackages.R b/instat/static/InstatObject/R/InstallPackages.R index c65fd609b2b..3e1a2492a61 100644 --- a/instat/static/InstatObject/R/InstallPackages.R +++ b/instat/static/InstatObject/R/InstallPackages.R @@ -14,132 +14,101 @@ install.packages("XML", dependencies = FALSE, repos='http://cran.us.r-project.or # Packages including dependencies # Generated from install_packages.R, do not edit manually! # Above packages taken out -packs <- c("abind", "agricolae", "agridat", - "AlgDesign", "animation", "anytime", "apsimx", - "arrangements", "ash", "askpass", "assertthat", - "automap", "backports", "base64enc", "bayestestR", - "BH", "bigD", "bit", "bit64", "bitops", - "blob", "boot", "brew", "brio", "broom", - "bslib", "ca", "cachem", "callr", "candisc", - "car", "carData", "caret", "cellranger", - "changepoint", "checkmate", "chillR", "chron", - "circlize", "CircStats", "circular", "class", - "classInt", "cli", "clifro", "climdex.pcic", - "clipr", "clock", "clue", "cluster", - "cmsaf", "cmsafops", "cmsafvis", "codetools", - "coin", "colorRamps", "colorspace", "colourpicker", - "combinat", "commonmark", "conf.design", "confintr", - "contfrac", "corrplot", "corrr", "countrycode", - "cowplot", "cpp11", "crayon", "credentials", - "crosstalk", "curl", "DAAG", "dae", "data.table", - "datawizard", "date", "DBI", "deldir", - "dendextend", "DEoptimR", "desc", "DescTools", - "deSolve", "devtools", "diffobj", "digest", - "distillery", "dotCall64", "downlit", "dplyr", - "dslabs", "DT", "dtw", "e1071", "ecmwfr", - "effectsize", "ellipse", "ellipsis", "elliptic", - "emmeans", "EnvStats", "estimability", "evaluate", - "Evapotranspiration", "Exact", "exactRankTests", - "expm", "extraDistr", "extrafont", "extrafontdb", - "extRemes", "factoextra", "FactoMineR", "fansi", - "faraway", "farver", "fastDummies", "fastmap", - "fields", "filelock", "fitdistrplus", "flashClust", - "FNN", "fontawesome", "forcats", "foreach", - "forecast", "foreign", "formula.tools", "Formula", - "fracdiff", "fs", "future.apply", "future", - "gapminder", "gclus", "gcookbook", "generics", - "GenSA", "geosphere", "gert", "getPass", - "GGally", "ggalt", "ggdendro", "ggeffects", - "ggfittext", "ggforce", "ggformula", "ggfortify", - "ggmosaic", "ggplot2", "ggplotify", "ggpmisc", - "ggpp", "ggpubr", "ggrepel", "ggridges", - "ggsci", "ggsignif", "ggstance", "ggtext", - "ggthemes", "ggwordcloud", "gh", "gitcreds", - "gld", "GlobalOptions", "globals", "glue", - "gmp", "gnm", "goftest", "gower", "gridExtra", - "gridGraphics", "gridtext", "gstat", "gt", - "gtable", "gtExtras", "hardhat", "haven", - "heplots", "hexbin", "highr", "HistData", - "Hmisc", "hms", "htmlTable", "htmltools", - "htmlwidgets", "httpuv", "httr", "httr2", - "hunspell", "hydroGOF", "hydroTSM", "hypergeo", - "imputeTS", "ini", "insight", "interp", - "intervals", "ipred", "isoband", "iterators", - "janeaustenr", "janitor", "jpeg", "jquerylib", - "jsonlite", "juicyjuice", "Kendall", "KernSmooth", - "keyring", "klaR", "knitr", "labeling", - "labelled", "Lahman", "later", "lattice", - "latticeExtra", "lava", "lazyeval", "leaflet.providers", - "leaflet", "leaps", "lemon", "libcoin", - "lifecycle", "listenv", "lme4", "lmodel2", - "lmom", "lmomco", "Lmoments", "lmtest", - "lubridate", "lwgeom", "magick", "magrittr", - "mapdata", "mapproj", "maps", "maptools", - "markdown", "MASS", "Matrix", "MatrixModels", - "matrixStats", "mc2d", "memoise", "metR", - "mgcv", "mime", "miniUI", "minqa", "MKdescr", - "MKinfer", "mlbench", "ModelMetrics", "modelr", - "modeltools", "mosaic", "mosaicCore", "mosaicData", - "multcomp", "multcompView", "munsell", "mvtnorm", - "ncdf4.helpers", "ncdf4", "nlme", "nloptr", - "nnet", "nortest", "numDeriv", "nycflights13", - "openair", "openssl", "openxlsx", "operator.tools", - "paletteer", "parallelly", "parameters", "patchwork", - "pbkrtest", "pbs", "PCICt", "performance", - "pillar", "pingr", "pkgbuild", "pkgconfig", - "pkgdown", "pkgload", "plogr", "plotly", - "plotrix", "pls", "plyr", "png", "polyclip", - "polynom", "praise", "prediction", "prettyunits", - "primes", "prismatic", "pROC", "processx", - "prodlim", "productplots", "profvis", "progress", - "progressr", "proj4", "promises", "proxy", - "ps", "purrr", "qap", "quadprog", "quantmod", - "quantreg", "questionr", "qvcalc", "R.cache", - "R.methodsS3", "R.oo", "R.utils", "R6", - "ragg", "rainfarmr", "rappdirs", "raster", - "rasterVis", "rbibutils", "rcmdcheck", "RColorBrewer", - "rcorpora", "Rcpp", "RcppArmadillo", "RcppEigen", - "RcppRoll", "RCurl", "Rdpack", "readODS", - "readr", "readxl", "recipes", "registry", - "relimp", "rematch", "rematch2", "remotes", - "repr", "reshape", "reshape2", "rgdal", - "rio", "rje", "rlang", "rmarkdown", "RMAWGEN", - #"RMySQL", - "robustbase", "rootSolve", "roxygen2", - "rpart", "rpivotTable", "rprojroot", "rrefine", - "RSQLite", "rstatix", "rstudioapi", "rtf", - "Rttf2pt1", "rversions", "rvest", "rworldmap", - "rworldxtra", "s2", "sandwich", "sass", - "scales", "scatterplot3d", "SearchTrees", "segmented", - "selectr", "seriation", "sessioninfo", "sf", - "sftime", "shades", "shape", "shiny", - "shinyFiles", "shinyjs", "shinythemes", "shinyWidgets", - "signmedian.test", "sjlabelled", "sjmisc", - "sjPlot", "sjstats", "skimr", "snakecase", - "SnowballC", "sodium", "sourcetools", "sp", - "spacetime", "spam", "SparseM", "SPEI", - "splines2", "splus2R", "SQUAREM", "stars", - "statip", "stinepack", "stringdist", - #"stringi", - #"stringr", - "strucchange", "styler", "survival", - "svglite", "sys", "systemfonts", - #"terra", - "testthat", "texmex", "textshaping", "TH.data", - "tibble", "tidyr", "tidyselect", "tidytext", - "timechange", "timeDate", "tinytex", "TLMoments", - "tokenizers", "treemapify", "trend", "tseries", - "TSP", "TTR", "tweenr", "tzdb", "units", - "urca", "urlchecker", "usethis", "utf8", - "uuid", "V8", "vars", "vcd", "vcdExtra", - "vctrs", "verification", "viridis", "viridisLite", - "visdat", "visreg", "vroom", "wakefield", - "waldo", "weathermetrics", "whisker", "withr", - "wk", "xfun", - #"XML", - "xml2", "xopen", - "xtable", "xts", "yaml", "yulab.utils", - "zip", "zoo", "Zseq", "zyp") +packs <- c("abind", "agricolae", "agridat", "agriTutorial", + "AlgDesign", "animation", "anytime", "apsimx", "arm", "arrangements", + "ash", "askpass", "assertthat", "automap", "backports", "base64enc", + "BayesFactor", "bayesplot", "bayestestR", "BH", "bigD", "bit", + "bit64", "bitops", "blob", "boot", "brew", "brio", "broom", "bslib", + "ca", "cachem", "callr", "candisc", "car", "carData", "caret", + "cellranger", "changepoint", "checkmate", "chillR", "chron", + "circlize", "CircStats", "circular", "class", "classInt", "cli", + "clifro", "climdex.pcic", "clipr", "clock", "clue", "cluster", + "cmsaf", "cmsafops", "cmsafvis", "coda", "codetools", "coin", + "colorRamps", "colorspace", "colourpicker", "combinat", "commonmark", + "conf.design", "confintr", "contfrac", "corrplot", "corrr", "countrycode", + "cowplot", "cpp11", "crayon", "credentials", "crosstalk", "cubature", + "curl", "DAAG", "dae", "data.table", "datawizard", "date", "DBI", + "deldir", "dendextend", "DEoptimR", "desc", "DescTools", "deSolve", + "desplot", "devtools", "diagram", "diffobj", "digest", "distillery", + "distributional", "dotCall64", "downlit", "dplyr", "dslabs", + "DT", "dtw", "dygraphs", "e1071", "ecmwfr", "effectsize", "ellipse", + "ellipsis", "elliptic", "emmeans", "EnvStats", "estimability", + "evaluate", "Evapotranspiration", "Exact", "exactRankTests", + "expm", "extraDistr", "extrafont", "extrafontdb", "extRemes", + "factoextra", "FactoMineR", "fansi", "faraway", "farver", "fastDummies", + "fastmap", "fields", "filelock", "fitdistrplus", "flashClust", + "FNN", "fontawesome", "forcats", "foreach", "forecast", "foreign", + "formattable", "formula.tools", "Formula", "fracdiff", "fs", + "future.apply", "future", "gapminder", "gclus", "gcookbook", + "generics", "GenSA", "geosphere", "gert", "getPass", "GGally", + "ggalt", "ggeffects", "ggfittext", "ggforce", "ggformula", "ggfortify", + "ggmosaic", "ggplot2", "ggplotify", "ggpmisc", "ggpp", "ggpubr", + "ggrepel", "ggridges", "ggsci", "ggsignif", "ggstance", "ggtext", + "ggthemes", "ggwordcloud", "gh", "gitcreds", "gld", "GlobalOptions", + "globals", "glue", "gmp", "gnm", "goftest", "gower", "gridExtra", + "gridGraphics", "gridtext", "gstat", "gt", "gtable", "gtExtras", + "gtools", "hardhat", "haven", "heplots", "here", "hexbin", "highr", + "HistData", "Hmisc", "hms", "htmlTable", "htmltools", "htmlwidgets", + "httpuv", "httr", "httr2", "hydroGOF", "hydroTSM", "hypergeo", + "igraph", "imputeTS", "ini", "inline", "insight", "interp", "intervals", + "ipred", "isoband", "iterators", "janeaustenr", "janitor", "jpeg", + "jquerylib", "jsonlite", "juicyjuice", "Kendall", "KernSmooth", + "keyring", "klaR", "knitr", "labeling", "labelled", "Lahman", + "later", "lattice", "latticeExtra", "lava", "lazyeval", "leaps", + "lemon", "libcoin", "lifecycle", "listenv", "lme4", "lmerTest", + "lmodel2", "lmom", "lmomco", "Lmoments", "lmtest", "loo", "lubridate", + "lwgeom", "magick", "magrittr", "mapdata", "mapproj", "maps", + "maptools", "markdown", "MASS", "Matrix", "MatrixModels", "matrixStats", + "mc2d", "memoise", "metR", "mgcv", "mice", "miceadds", "mime", + "miniUI", "minqa", "mitools", "MKdescr", "MKinfer", "mlbench", + "ModelMetrics", "modelr", "modeltools", "mosaic", "mosaicCore", + "mosaicData", "multcomp", "multcompView", "munsell", "mvtnorm", + "ncdf4.helpers", "ncdf4", "nlme", "nloptr", "nnet", "nortest", + "numDeriv", "nycflights13", "openair", "openssl", "openxlsx", + "operator.tools", "paletteer", "parallelly", "parameters", "patchwork", + "pbapply", "pbkrtest", "pbs", "PCICt", "performance", "pillar", + "pingr", "pkgbuild", "pkgconfig", "pkgdown", "pkgload", "plogr", + "plotly", "plotrix", "pls", "plyr", "png", "polyclip", "polynom", + "posterior", "praise", "prediction", "prettyunits", "primes", + "prismatic", "pROC", "processx", "prodlim", "productplots", "profvis", + "progress", "progressr", "proj4", "promises", "proxy", "ps", + "purrr", "qap", "quadprog", "quantmod", "quantreg", "questionr", + "qvcalc", "R.cache", "R.methodsS3", "R.oo", "R.utils", "R6", + "ragg", "rainfarmr", "rappdirs", "raster", "rasterVis", "rbibutils", + "rcmdcheck", "RColorBrewer", "rcorpora", "Rcpp", "RcppArmadillo", + "RcppEigen", "RcppParallel", "RcppRoll", "RCurl", "Rdpack", "readODS", + "readr", "readxl", "recipes", "registry", "relimp", "rematch", + "rematch2", "remotes", "repr", "reshape", "reshape2", "rio", + "rje", "rlang", "rmarkdown", "RMAWGEN", + #"RMySQL", + "robustbase", + "rootSolve", "roxygen2", "rpart", "rpivotTable", "rprojroot", + "rrefine", "RSQLite", "rstan", "rstanarm", "rstantools", "rstatix", + "rstudioapi", "rtf", "Rttf2pt1", "rversions", "rvest", "rworldmap", + "rworldxtra", "s2", "sandwich", "sass", "scales", "scatterplot3d", + "SearchTrees", "segmented", "selectr", "seriation", "sessioninfo", + "sf", "sftime", "shades", "shape", "shiny", "shinyFiles", "shinyjs", + "shinystan", "shinythemes", "shinyWidgets", "sjlabelled", "sjmisc", + "sjPlot", "sjstats", "skimr", "snakecase", "SnowballC", "sodium", + "sourcetools", "sp", "spacetime", "spam", "SparseM", "SPEI", + "splines2", "splus2R", "SQUAREM", "StanHeaders", "stars", "statip", + "statquotes", "statsr", "stinepack", "stringdist", + #"stringi", + #"stringr", + "strucchange", "styler", "survival", "svglite", "sys", + "systemfonts", "tensorA", + #"terra", + "testthat", "texmex", "textshaping", + "TH.data", "threejs", "tibble", "tidyr", "tidyselect", "tidytext", + "timechange", "timeDate", "tinytex", "TLMoments", "tokenizers", + "treemapify", "trend", "tseries", "TSP", "TTR", "tweenr", "tzdb", + "units", "urca", "urlchecker", "usethis", "utf8", "uuid", "V8", + "vars", "vcd", "vcdExtra", "vctrs", "verification", "viridis", + "viridisLite", "visdat", "visreg", "vroom", "wakefield", "waldo", + "weathermetrics", "whisker", "withr", "wk", "wordcloud", "xfun", + #"XML", + "xml2", "xopen", "xtable", "xts", "yaml", "yulab.utils", + "zip", "zoo", "Zseq", "zyp") install.packages(packs, dependencies = FALSE, repos='https://cloud.r-project.org', type="win.binary") diff --git a/instat/static/InstatObject/R/Rsetup.R b/instat/static/InstatObject/R/Rsetup.R index 1b21971410f..88a699fba41 100644 --- a/instat/static/InstatObject/R/Rsetup.R +++ b/instat/static/InstatObject/R/Rsetup.R @@ -1,124 +1,92 @@ # Packages including dependencies # Generated from install_packages.R, do not edit manually! -packs <- c("abind", "agricolae", "agridat", - "AlgDesign", "animation", "anytime", "apsimx", - "arrangements", "ash", "askpass", "assertthat", - "automap", "backports", "base64enc", "bayestestR", - "BH", "bigD", "bit", "bit64", "bitops", - "blob", "boot", "brew", "brio", "broom", - "bslib", "ca", "cachem", "callr", "candisc", - "car", "carData", "caret", "cellranger", - "changepoint", "checkmate", "chillR", "chron", - "circlize", "CircStats", "circular", "class", - "classInt", "cli", "clifro", "climdex.pcic", - "clipr", "clock", "clue", "cluster", - "cmsaf", "cmsafops", "cmsafvis", "codetools", - "coin", "colorRamps", "colorspace", "colourpicker", - "combinat", "commonmark", "conf.design", "confintr", - "contfrac", "corrplot", "corrr", "countrycode", - "cowplot", "cpp11", "crayon", "credentials", - "crosstalk", "curl", "DAAG", "dae", "data.table", - "datawizard", "date", "DBI", "deldir", - "dendextend", "DEoptimR", "desc", "DescTools", - "deSolve", "devtools", "diffobj", "digest", - "distillery", "dotCall64", "downlit", "dplyr", - "dslabs", "DT", "dtw", "e1071", "ecmwfr", - "effectsize", "ellipse", "ellipsis", "elliptic", - "emmeans", "EnvStats", "estimability", "evaluate", - "Evapotranspiration", "Exact", "exactRankTests", - "expm", "extraDistr", "extrafont", "extrafontdb", - "extRemes", "factoextra", "FactoMineR", "fansi", - "faraway", "farver", "fastDummies", "fastmap", - "fields", "filelock", "fitdistrplus", "flashClust", - "FNN", "fontawesome", "forcats", "foreach", - "forecast", "foreign", "formula.tools", "Formula", - "fracdiff", "fs", "future.apply", "future", - "gapminder", "gclus", "gcookbook", "generics", - "GenSA", "geosphere", "gert", "getPass", - "GGally", "ggalt", "ggdendro", "ggeffects", - "ggfittext", "ggforce", "ggformula", "ggfortify", - "ggmosaic", "ggplot2", "ggplotify", "ggpmisc", - "ggpp", "ggpubr", "ggrepel", "ggridges", - "ggsci", "ggsignif", "ggstance", "ggtext", - "ggthemes", "ggwordcloud", "gh", "gitcreds", - "gld", "GlobalOptions", "globals", "glue", - "gmp", "gnm", "goftest", "gower", "gridExtra", - "gridGraphics", "gridtext", "gstat", "gt", - "gtable", "gtExtras", "hardhat", "haven", - "heplots", "hexbin", "highr", "HistData", - "Hmisc", "hms", "htmlTable", "htmltools", - "htmlwidgets", "httpuv", "httr", "httr2", - "hunspell", "hydroGOF", "hydroTSM", "hypergeo", - "imputeTS", "ini", "insight", "interp", - "intervals", "ipred", "isoband", "iterators", - "janeaustenr", "janitor", "jpeg", "jquerylib", - "jsonlite", "juicyjuice", "Kendall", "KernSmooth", - "keyring", "klaR", "knitr", "labeling", - "labelled", "Lahman", "later", "lattice", - "latticeExtra", "lava", "lazyeval", "leaflet.providers", - "leaflet", "leaps", "lemon", "libcoin", - "lifecycle", "listenv", "lme4", "lmodel2", - "lmom", "lmomco", "Lmoments", "lmtest", - "lubridate", "lwgeom", "magick", "magrittr", - "mapdata", "mapproj", "maps", "maptools", - "markdown", "MASS", "Matrix", "MatrixModels", - "matrixStats", "mc2d", "memoise", "metR", - "mgcv", "mime", "miniUI", "minqa", "MKdescr", - "MKinfer", "mlbench", "ModelMetrics", "modelr", - "modeltools", "mosaic", "mosaicCore", "mosaicData", - "multcomp", "multcompView", "munsell", "mvtnorm", - "ncdf4.helpers", "ncdf4", "nlme", "nloptr", - "nnet", "nortest", "numDeriv", "nycflights13", - "openair", "openssl", "openxlsx", "operator.tools", - "paletteer", "parallelly", "parameters", "patchwork", - "pbkrtest", "pbs", "PCICt", "performance", - "pillar", "pingr", "pkgbuild", "pkgconfig", - "pkgdown", "pkgload", "plogr", "plotly", - "plotrix", "pls", "plyr", "png", "polyclip", - "polynom", "praise", "prediction", "prettyunits", - "primes", "prismatic", "pROC", "processx", - "prodlim", "productplots", "profvis", "progress", - "progressr", "proj4", "promises", "proxy", - "ps", "purrr", "qap", "quadprog", "quantmod", - "quantreg", "questionr", "qvcalc", "R.cache", - "R.methodsS3", "R.oo", "R.utils", "R6", - "ragg", "rainfarmr", "rappdirs", "raster", - "rasterVis", "rbibutils", "rcmdcheck", "RColorBrewer", - "rcorpora", "Rcpp", "RcppArmadillo", "RcppEigen", - "RcppRoll", "RCurl", "Rdpack", "readODS", - "readr", "readxl", "recipes", "registry", - "relimp", "rematch", "rematch2", "remotes", - "repr", "reshape", "reshape2", "rgdal", - "rio", "rje", "rlang", "rmarkdown", "RMAWGEN", - "RMySQL", "robustbase", "rootSolve", "roxygen2", - "rpart", "rpivotTable", "rprojroot", "rrefine", - "RSQLite", "rstatix", "rstudioapi", "rtf", - "Rttf2pt1", "rversions", "rvest", "rworldmap", - "rworldxtra", "s2", "sandwich", "sass", - "scales", "scatterplot3d", "SearchTrees", "segmented", - "selectr", "seriation", "sessioninfo", "sf", - "sftime", "shades", "shape", "shiny", - "shinyFiles", "shinyjs", "shinythemes", "shinyWidgets", - "signmedian.test", "sjlabelled", "sjmisc", - "sjPlot", "sjstats", "skimr", "snakecase", - "SnowballC", "sodium", "sourcetools", "sp", - "spacetime", "spam", "SparseM", "SPEI", - "splines2", "splus2R", "SQUAREM", "stars", - "statip", "stinepack", "stringdist", "stringi", - "stringr", "strucchange", "styler", "survival", - "svglite", "sys", "systemfonts", "terra", - "testthat", "texmex", "textshaping", "TH.data", - "tibble", "tidyr", "tidyselect", "tidytext", - "timechange", "timeDate", "tinytex", "TLMoments", - "tokenizers", "treemapify", "trend", "tseries", - "TSP", "TTR", "tweenr", "tzdb", "units", - "urca", "urlchecker", "usethis", "utf8", - "uuid", "V8", "vars", "vcd", "vcdExtra", - "vctrs", "verification", "viridis", "viridisLite", - "visdat", "visreg", "vroom", "wakefield", - "waldo", "weathermetrics", "whisker", "withr", - "wk", "xfun", "XML", "xml2", "xopen", - "xtable", "xts", "yaml", "yulab.utils", +packs <- c("abind", "agricolae", "agridat", "agriTutorial", + "AlgDesign", "animation", "anytime", "apsimx", "arm", "arrangements", + "ash", "askpass", "assertthat", "automap", "backports", "base64enc", + "BayesFactor", "bayesplot", "bayestestR", "BH", "bigD", "bit", + "bit64", "bitops", "blob", "boot", "brew", "brio", "broom", "bslib", + "ca", "cachem", "callr", "candisc", "car", "carData", "caret", + "cellranger", "changepoint", "checkmate", "chillR", "chron", + "circlize", "CircStats", "circular", "class", "classInt", "cli", + "clifro", "climdex.pcic", "clipr", "clock", "clue", "cluster", + "cmsaf", "cmsafops", "cmsafvis", "coda", "codetools", "coin", + "colorRamps", "colorspace", "colourpicker", "combinat", "commonmark", + "conf.design", "confintr", "contfrac", "corrplot", "corrr", "countrycode", + "cowplot", "cpp11", "crayon", "credentials", "crosstalk", "cubature", + "curl", "DAAG", "dae", "data.table", "datawizard", "date", "DBI", + "deldir", "dendextend", "DEoptimR", "desc", "DescTools", "deSolve", + "desplot", "devtools", "diagram", "diffobj", "digest", "distillery", + "distributional", "dotCall64", "downlit", "dplyr", "dslabs", + "DT", "dtw", "dygraphs", "e1071", "ecmwfr", "effectsize", "ellipse", + "ellipsis", "elliptic", "emmeans", "EnvStats", "estimability", + "evaluate", "Evapotranspiration", "Exact", "exactRankTests", + "expm", "extraDistr", "extrafont", "extrafontdb", "extRemes", + "factoextra", "FactoMineR", "fansi", "faraway", "farver", "fastDummies", + "fastmap", "fields", "filelock", "fitdistrplus", "flashClust", + "FNN", "fontawesome", "forcats", "foreach", "forecast", "foreign", + "formattable", "formula.tools", "Formula", "fracdiff", "fs", + "future.apply", "future", "gapminder", "gclus", "gcookbook", + "generics", "GenSA", "geosphere", "gert", "getPass", "GGally", + "ggalt", "ggeffects", "ggfittext", "ggforce", "ggformula", "ggfortify", + "ggmosaic", "ggplot2", "ggplotify", "ggpmisc", "ggpp", "ggpubr", + "ggrepel", "ggridges", "ggsci", "ggsignif", "ggstance", "ggtext", + "ggthemes", "ggwordcloud", "gh", "gitcreds", "gld", "GlobalOptions", + "globals", "glue", "gmp", "gnm", "goftest", "gower", "gridExtra", + "gridGraphics", "gridtext", "gstat", "gt", "gtable", "gtExtras", + "gtools", "hardhat", "haven", "heplots", "here", "hexbin", "highr", + "HistData", "Hmisc", "hms", "htmlTable", "htmltools", "htmlwidgets", + "httpuv", "httr", "httr2", "hydroGOF", "hydroTSM", "hypergeo", + "igraph", "imputeTS", "ini", "inline", "insight", "interp", "intervals", + "ipred", "isoband", "iterators", "janeaustenr", "janitor", "jpeg", + "jquerylib", "jsonlite", "juicyjuice", "Kendall", "KernSmooth", + "keyring", "klaR", "knitr", "labeling", "labelled", "Lahman", + "later", "lattice", "latticeExtra", "lava", "lazyeval", "leaps", + "lemon", "libcoin", "lifecycle", "listenv", "lme4", "lmerTest", + "lmodel2", "lmom", "lmomco", "Lmoments", "lmtest", "loo", "lubridate", + "lwgeom", "magick", "magrittr", "mapdata", "mapproj", "maps", + "maptools", "markdown", "MASS", "Matrix", "MatrixModels", "matrixStats", + "mc2d", "memoise", "metR", "mgcv", "mice", "miceadds", "mime", + "miniUI", "minqa", "mitools", "MKdescr", "MKinfer", "mlbench", + "ModelMetrics", "modelr", "modeltools", "mosaic", "mosaicCore", + "mosaicData", "multcomp", "multcompView", "munsell", "mvtnorm", + "ncdf4.helpers", "ncdf4", "nlme", "nloptr", "nnet", "nortest", + "numDeriv", "nycflights13", "openair", "openssl", "openxlsx", + "operator.tools", "paletteer", "parallelly", "parameters", "patchwork", + "pbapply", "pbkrtest", "pbs", "PCICt", "performance", "pillar", + "pingr", "pkgbuild", "pkgconfig", "pkgdown", "pkgload", "plogr", + "plotly", "plotrix", "pls", "plyr", "png", "polyclip", "polynom", + "posterior", "praise", "prediction", "prettyunits", "primes", + "prismatic", "pROC", "processx", "prodlim", "productplots", "profvis", + "progress", "progressr", "proj4", "promises", "proxy", "ps", + "purrr", "qap", "quadprog", "quantmod", "quantreg", "questionr", + "qvcalc", "R.cache", "R.methodsS3", "R.oo", "R.utils", "R6", + "ragg", "rainfarmr", "rappdirs", "raster", "rasterVis", "rbibutils", + "rcmdcheck", "RColorBrewer", "rcorpora", "Rcpp", "RcppArmadillo", + "RcppEigen", "RcppParallel", "RcppRoll", "RCurl", "Rdpack", "readODS", + "readr", "readxl", "recipes", "registry", "relimp", "rematch", + "rematch2", "remotes", "repr", "reshape", "reshape2", "rio", + "rje", "rlang", "rmarkdown", "RMAWGEN", "RMySQL", "robustbase", + "rootSolve", "roxygen2", "rpart", "rpivotTable", "rprojroot", + "rrefine", "RSQLite", "rstan", "rstanarm", "rstantools", "rstatix", + "rstudioapi", "rtf", "Rttf2pt1", "rversions", "rvest", "rworldmap", + "rworldxtra", "s2", "sandwich", "sass", "scales", "scatterplot3d", + "SearchTrees", "segmented", "selectr", "seriation", "sessioninfo", + "sf", "sftime", "shades", "shape", "shiny", "shinyFiles", "shinyjs", + "shinystan", "shinythemes", "shinyWidgets", "sjlabelled", "sjmisc", + "sjPlot", "sjstats", "skimr", "snakecase", "SnowballC", "sodium", + "sourcetools", "sp", "spacetime", "spam", "SparseM", "SPEI", + "splines2", "splus2R", "SQUAREM", "StanHeaders", "stars", "statip", + "statquotes", "statsr", "stinepack", "stringdist", "stringi", + "stringr", "strucchange", "styler", "survival", "svglite", "sys", + "systemfonts", "tensorA", "terra", "testthat", "texmex", "textshaping", + "TH.data", "threejs", "tibble", "tidyr", "tidyselect", "tidytext", + "timechange", "timeDate", "tinytex", "TLMoments", "tokenizers", + "treemapify", "trend", "tseries", "TSP", "TTR", "tweenr", "tzdb", + "units", "urca", "urlchecker", "usethis", "utf8", "uuid", "V8", + "vars", "vcd", "vcdExtra", "vctrs", "verification", "viridis", + "viridisLite", "visdat", "visreg", "vroom", "wakefield", "waldo", + "weathermetrics", "whisker", "withr", "wk", "wordcloud", "xfun", + "XML", "xml2", "xopen", "xtable", "xts", "yaml", "yulab.utils", "zip", "zoo", "Zseq", "zyp", # mmtable2 package from GitHub added manually to list # install with devtools::install_github("ianmoran11/mmtable2") @@ -129,116 +97,81 @@ packs <- c("abind", "agricolae", "agridat", "mmtable2", "aida", "CDT" ) -versions <- c("1.4-5", "1.3-5", "1.21", "1.2.1", - "2.7", "0.3.9", "2.3.1", "1.1.9", "1.0-15", - "1.1", "0.2.1", "1.0-16", "1.4.1", "0.1-3", - "0.13.0", "1.81.0-1", "0.2.0", "4.0.5", - "4.0.5", "1.0-7", "1.2.3", "1.3-28.1", - "1.0-8", "1.1.3", "1.0.3", "0.4.2", "0.71.1", - "1.0.6", "3.7.3", "0.8-6", "3.1-1", "3.0-5", - "6.0-93", "1.1.0", "2.2.4", "2.1.0", - "0.72.8", "2.3-59", "0.4.15", "0.2-6", - "0.4-95", "7.3-21", "0.4-8", "3.6.0", - "3.2-5", "1.1-11", "0.8.0", "0.6.1", - "0.3-64", "2.1.4", "3.4.4", "1.2.6", - "1.1.12", "0.2-19", "1.4-2", "2.3.1", - "2.1-0", "1.2.0", "0.0-8", "1.8.1", "2.0.0", - "0.2.0", "1.1-12", "0.92", "0.4.4", "1.4.0", - "1.1.1", "0.4.3", "1.5.2", "1.3.2", "1.2.0", - "5.0.0", "1.25.4", "3.2-14", "1.14.8", - "0.6.5", "1.2-42", "1.1.3", "1.0-6", - "1.16.0", "1.0-11", "1.4.2", "0.99.48", - "1.34", "2.4.5", "0.3.5", "0.6.31", "1.2-1", - "1.0-2", "0.4.2", "1.1.0", "0.7.4", "0.27", - "1.23-1", "1.7-13", "1.5.0", "0.8.2", - "0.4.3", "0.3.2", "1.4-0", "1.8.4-1", - "2.7.0", "1.4.1", "0.20", "1.16", "3.2", - "0.8-35", "0.999-7", "1.9.1", "0.19", - "1.0", "2.1-3", "1.0.7", "2.7", "1.0.4", - "1.0.8", "2.1.1", "1.6.3", "1.1.0", "14.1", - "1.0.2", "1.1-8", "1.01-2", "1.1.3.1", - "0.5.0", "1.0.0", "1.5.2", "8.20", "0.8-84", - "1.7.1", "1.2-4", "1.5-2", "1.5.2", "1.10.0", - "1.31.0", "0.3.0", "1.3.2", "2.0", "0.1.3", - "1.1.8", "1.5-18", "1.9.2", "0.2-2", - "2.1.2", "0.4.0", "0.1.23", "1.1.5", - "0.9.1", "0.4.1", "0.10.2", "0.4.15", - "0.3.3", "3.4.1", "0.1.0", "0.5.2", "0.5.1", - "0.6.0", "0.9.3", "0.5.4", "2.9", "0.6.4", - "0.3.6", "0.1.2", "4.2.4", "0.5.0", "1.4.0", - "0.1.2", "2.6.6", "0.1.2", "0.16.2", - "1.6.2", "0.7-1", "1.1-2", "1.2-3", "1.0.1", - "2.3", "0.5-1", "0.1.5", "2.1-0", "0.8.0", - "0.3.1", "0.4.5", "1.2.0", "2.5.1", "1.4-2", - "1.28.2", "0.10", "0.8-7", "4.8-0", "1.1.2", - "2.4.1", "0.5.4", "1.6.1", "1.6.9", "1.4.4", - "0.2.2", "3.0.2", "0.4-0", "0.6-0", "1.2-13", - "3.3", "0.3.1", "0.19.0", "1.1-3", "0.15.2", - "0.9-13", "0.2.7", "1.0.14", "1.0.0", - "2.2.0", "0.1-10", "0.1.4", "1.8.4", - "0.1.0", "2.2.1", "2.23-20", "1.3.1", - "1.7-1", "1.42", "0.4.2", "2.10.0", "10.0-1", - "1.3.0", "0.20-45", "0.6-30", "1.7.2", - "0.2.2", "1.9.0", "2.1.1", "3.1", "0.4.6", - "1.0-9", "1.0.3", "0.9.0", "1.1-31", - "1.7-3", "2.9", "2.4.7", "1.3-1", "0.9-40", - "1.9.2", "0.2-11", "2.7.3", "2.0.3", - "2.3.1", "1.2.11", "3.4.1", "1.1-6", - "1.5", "7.3-58.2", "1.5-3", "0.5-1", - "0.63.0", "0.1-22", "2.0.1", "0.13.0", - "1.8-41", "0.12", "0.1.1.1", "1.2.5", - "0.8", "0.9", "2.1-3", "1.2.2.2", "0.1.10", - "0.2-23", "1.8.4.2", "0.9.2.1", "0.20.3", - "1.4-22", "0.1-8", "0.5.0", "1.1-3", - "0.3-6", "1.21", "3.1-162", "2.0.3", - "7.3-18", "1.0-4", "2016.8-1.1", "1.0.2", - "2.15", "2.0.5", "4.2.5.2", "1.6.3", - "1.5.0", "1.34.0", "0.20.2", "1.1.2", - "0.5.2", "1.1", "0.5-4.4", "0.10.2", - "1.8.1", "2.0.2", "1.4.0", "2.0.3", "2.0.7", - "1.3.2", "0.2.0", "4.10.1", "3.8-2", - "2.8-1", "1.8.8", "0.1-8", "1.10-4", - "1.4-1", "1.0.0", "0.3.14", "1.1.1", - "1.4.0", "1.1.1", "1.18.0", "3.8.0", - "2019.11.13", "0.1.1", "0.3.7", "1.2.2", - "0.13.0", "1.0-12", "1.2.0.1", "0.4-27", - "1.7.2", "1.0.1", "0.1-2", "1.5-8", "0.4.20", - "5.94", "0.7.8", "1.0.2", "0.16.0", "1.8.2", - "1.25.0", "2.12.2", "2.5.1", "1.2.5", - "0.1", "0.3.3", "3.6-14", "0.51.5", "2.2.13", - "1.4.0", "1.1-3", "2.0.0", "1.0.10", - "0.12.0.1.0", "0.3.3.9.3", "0.3.0", "1.98-1.10", - "2.4", "1.7.0", "2.1.4", "1.4.2", "1.0.5", - "0.5-1", "1.0-5", "1.0.1", "2.1.2", "2.4.2", - "1.1.6", "0.8.9", "1.4.4", "1.5-32", - "0.5.29", "1.12.1", "1.0.6", "2.20", - "1.3.7", "0.10.25", "0.95-0", "1.8.2.3", - "7.2.3", "4.1.19", "0.3.0", "2.0.3", - "2.1.0", "2.3.0", "0.7.2", "0.14", "0.4-14.1", - "1.3.12", "2.1.2", "1.0.3", "1.3-6", - "1.01", "1.1.2", "3.0-2", "0.4.5", "1.2.1", - "0.3-42", "0.5.5", "1.6-2", "0.4-2", - "1.4.1", "1.2.2", "1.0-9", "0.2-0", "1.4.0", - "1.4.6", "1.7.4", "0.9.3", "2.1.0", "1.2.0", - "0.7.6", "1.5.1", "1.2.0", "2.8.9", "2.8.12", - "0.18.2", "2.1.5", "0.11.0", "0.7.0", - "1.2.1", "0.1.7-1", "1.6-0", "1.2-8", - "2.9-1", "1.81", "1.8.0", "0.4.7", "1.3-3", - "2021.1", "0.6-0", "0.2.3", "1.4", "0.9.10", - "1.7.12", "1.5.0", "1.5-3", "1.9.0", - "3.5-3", "2.1.1", "3.4.1", "1.0.4", "1.7-3", - "3.1.6", "2.4.8", "0.3.6", "1.1-1", "3.1.8", - "1.3.0", "1.2.0", "0.4.1", "0.2.0", "4022.108", - "0.44", "0.7.5.3", "0.3.0", "2.5.5", - "1.1.4", "0.10-53", "1.2-2", "0.24.3", - "2.0.2", "0.3.0", "0.8-1", "1.3-3", "1.0.1", - "2.1.6", "1.2.3", "1.1-0", "4.2.2", "1.5-6", - "1.4-11", "0.8-2", "0.5.2", "1.42", "0.6.2", - "0.4.1", "0.6.0", "2.7.0", "1.6.1", "0.3.6", - "0.4.0", "1.2.2", "0.4.1", "2.5.0", "0.7.1", - "0.37", "3.99-0.13", "1.3.3", "1.0.0", - "1.8-4", "0.13.0", "2.3.7", "0.0.6", - "2.2.2", "1.8-11", "0.2.1", "0.11", +versions <- c("1.4-5", "1.3-5", "1.21", "0.1.5", "1.2.1", "2.7", + "0.3.9", "2.3.1", "1.13-1", "1.1.9", "1.0-15", "1.1", "0.2.1", + "1.1-9", "1.4.1", "0.1-3", "0.9.12-4.4", "1.10.0", "0.13.1", + "1.81.0-1", "0.2.0", "4.0.5", "4.0.5", "1.0-7", "1.2.4", "1.3-28.1", + "1.0-8", "1.1.3", "1.0.4", "0.4.2", "0.71.1", "1.0.7", "3.7.3", + "0.8-6", "3.1-2", "3.0-5", "6.0-94", "1.1.0", "2.2.4", "2.1.0", + "0.72.8", "2.3-60", "0.4.15", "0.2-6", "0.4-95", "7.3-21", "0.4-9", + "3.6.1", "3.2-5", "1.1-11", "0.8.0", "0.6.1", "0.3-64", "2.1.4", + "3.4.4", "1.2.6", "1.1.12", "0.19-4", "0.2-19", "1.4-2", "2.3.1", + "2.1-0", "1.2.0", "0.0-8", "1.9.0", "2.0.0", "1.0.0", "1.1-12", + "0.92", "0.4.4", "1.4.0", "1.1.1", "0.4.3", "1.5.2", "1.3.2", + "1.2.0", "2.0.4.6", "5.0.0", "1.25.4", "3.2.15", "1.14.8", "0.7.1", + "1.2-42", "1.1.3", "1.0-6", "1.17.1", "1.0-12", "1.4.2", "0.99.48", + "1.35", "1.10", "2.4.5", "1.6.5", "0.3.5", "0.6.31", "1.2-1", + "0.3.2", "1.0-2", "0.4.2", "1.1.2", "0.7.4", "0.27", "1.23-1", + "1.1.1.6", "1.7-13", "1.5.0", "0.8.2", "0.4.5", "0.3.2", "1.4-0", + "1.8.5", "2.7.0", "1.4.1", "0.20", "1.16", "3.2", "0.8-35", "0.999-7", + "1.9.1", "0.19", "1.0", "2.1-3", "1.0.7", "2.8", "1.0.4", "1.0.8", + "2.1.1", "1.6.3", "1.1.1", "14.1", "1.0.2", "1.1-8", "1.01-2", + "1.1.3.2", "0.5.1", "1.0.0", "1.5.2", "8.21", "0.8-84", "0.2.1", + "1.7.1", "1.2-5", "1.5-2", "1.5.2", "1.10.0", "1.32.0", "1.0.0", + "1.3.2", "2.0", "0.1.3", "1.1.8", "1.5-18", "1.9.2", "0.2-2", + "2.1.2", "0.4.0", "1.2.1", "0.10.0", "0.4.1", "0.10.4", "0.4.16", + "0.3.3", "3.4.2", "0.1.0", "0.5.2", "0.5.2", "0.6.0", "0.9.3", + "0.5.4", "3.0.0", "0.6.4", "0.3.6", "0.1.2", "4.2.4", "0.5.0", + "1.4.0", "0.1.2", "2.6.6", "0.1.2", "0.16.2", "1.6.2", "0.7-1", + "1.1-2", "1.2-3", "1.0.1", "2.3", "0.5-1", "0.1.5", "2.1-1", + "0.8.0", "0.3.3", "0.4.5", "3.9.4", "1.3.0", "2.5.2", "1.4-2", + "1.0.1", "1.28.3", "0.10", "0.8-7", "5.0-1", "1.1.3", "2.4.1", + "0.5.5", "1.6.2", "1.6.9", "1.4.5", "0.2.2", "0.4-0", "0.6-0", + "1.2-13", "1.4.2", "3.3", "0.3.1", "0.3.19", "0.19.1", "1.1-4", + "0.15.3", "0.9-14", "0.2.7", "1.0.14", "1.0.0", "2.2.0", "0.1-10", + "0.1.4", "1.8.4", "0.1.0", "2.2.1", "2.23-20", "1.3.1", "1.7-2", + "1.42", "0.4.2", "2.11.0", "10.0-1", "1.3.0", "0.21-8", "0.6-30", + "1.7.2.1", "0.2.2", "3.1", "0.4.6", "1.0-9", "1.0.3", "0.9.0", + "1.1-32", "3.1-3", "1.7-3", "2.9", "2.4.7", "1.3-1", "0.9-40", + "2.6.0", "1.9.2", "0.2-11", "2.7.4", "2.0.3", "2.3.1", "1.2.11", + "3.4.1", "1.1-6", "1.6", "7.3-58.3", "1.5-4", "0.5-1", "0.63.0", + "0.1-22", "2.0.1", "0.14.0", "1.8-42", "3.15.0", "3.16-18", "0.12", + "0.1.1.1", "1.2.5", "2.4", "0.8", "1.1", "2.1-3", "1.2.2.2", + "0.1.11", "0.2-23", "1.8.4.2", "0.9.2.1", "0.20.3", "1.4-23", + "0.1-9", "0.5.0", "1.1-3", "0.3-6", "1.21", "3.1-162", "2.0.3", + "7.3-18", "1.0-4", "2016.8-1.1", "1.0.2", "2.16-0", "2.0.6", + "4.2.5.2", "1.6.3", "1.5.0", "1.35.0", "0.21.0", "1.1.2", "1.7-0", + "0.5.2", "1.1", "0.5-4.4", "0.10.3", "1.9.0", "2.0.2", "1.4.0", + "2.0.3", "2.0.7", "1.3.2", "0.2.0", "4.10.1", "3.8-2", "2.8-1", + "1.8.8", "0.1-8", "1.10-4", "1.4-1", "1.4.1", "1.0.0", "0.3.14", + "1.1.1", "1.4.0", "1.1.1", "1.18.0", "3.8.1", "2023.03.31", "0.1.1", + "0.3.7", "1.2.2", "0.13.0", "1.0-12", "1.2.0.1", "0.4-27", "1.7.5", + "1.0.1", "0.1-2", "1.5-8", "0.4.22", "5.95", "0.7.8", "1.0.2", + "0.16.0", "1.8.2", "1.25.0", "2.12.2", "2.5.1", "1.2.5", "0.1", + "0.3.3", "3.6-20", "0.51.5", "2.2.13", "1.4.0", "1.1-3", "2.0.0", + "1.0.10", "0.12.2.0.0", "0.3.3.9.3", "5.1.7", "0.3.0", "1.98-1.12", + "2.4", "1.7.0", "2.1.4", "1.4.2", "1.0.5", "0.5-1", "1.0-5", + "1.0.1", "2.1.2", "2.4.2", "1.1.6", "0.8.9", "1.4.4", "0.5.29", + "1.12.1", "1.1.0", "2.21", "1.3.7", "0.10.25", "0.95-1", "1.8.2.3", + "7.2.3", "4.1.19", "0.3.0", "2.0.3", "2.1.0", "2.3.1", "2.21.7", + "2.21.4", "2.3.1", "0.7.2", "0.14", "0.4-14.1", "1.3.12", "2.1.2", + "1.0.3", "1.3-6", "1.01", "1.1.2", "3.0-2", "0.4.5", "1.2.1", + "0.3-43", "0.5.5", "1.6-4", "0.4-2", "1.4.2", "1.2.2", "1.0-12", + "0.2-0", "1.4.0", "1.4.6", "1.7.4", "0.9.3", "2.1.0", "2.6.0", + "1.2.0", "0.7.6", "1.2.0", "2.8.9", "2.8.14", "0.18.2", "2.1.5", + "0.11.0", "0.7.0", "1.2.1", "0.1.7-1", "1.6-0", "1.3-0", "2.9-1", + "1.81", "1.8.1", "0.4.8", "1.3-3", "2021.1", "2.21.0-7", "0.6-1", + "0.2.3", "0.3.1", "0.3.0", "1.4", "0.9.10", "1.7.12", "1.5.0", + "1.5-3", "1.9.1", "3.5-5", "2.1.1", "3.4.1", "1.0.4", "0.36.2", + "1.7-23", "3.1.7", "2.4.8", "0.3.6", "1.1-2", "0.3.3", "3.2.1", + "1.3.0", "1.2.0", "0.4.1", "0.2.0", "4022.108", "0.45", "0.7.5.3", + "0.3.0", "2.5.5", "1.1.5", "0.10-53", "1.2-4", "0.24.3", "2.0.2", + "0.3.0", "0.8-1", "1.3-3", "1.0.1", "2.1.6", "1.2.3", "1.1-0", + "4.3.0", "1.5-9", "1.4-11", "0.8-4", "0.6.1", "1.42", "0.6.2", + "0.4.1", "0.6.0", "2.7.0", "1.6.1", "0.3.6", "0.4.0", "1.2.2", + "0.4.1", "2.5.0", "0.7.2", "2.6", "0.39", "3.99-0.14", "1.3.3", + "1.0.0", "1.8-4", "0.13.1", "2.3.7", "0.0.6", "2.3.0", "1.8-12", + "0.2.1", "0.11-1", # mmtable2 package from GitHub added manually to list # aida-package package from GitHub added manually to list # CDT package from GitHub added manually to list diff --git a/instat/static/InstatObject/R/install_packages.R b/instat/static/InstatObject/R/install_packages.R index 988de278d05..2052f82ee59 100644 --- a/instat/static/InstatObject/R/install_packages.R +++ b/instat/static/InstatObject/R/install_packages.R @@ -158,13 +158,12 @@ pkgs <- "rstanarm", "statsr", "statquotes", - "rsplit", "desplot", #applying formatting on vectors and data frames to make data presentation easier, richer, more flexible and hopefully convey more information "formattable" ) pkgList <- pkgDep(pkgs, type="win.binary", repos = "https://cran.rstudio.com/", suggests = FALSE, includeBasePkgs = FALSE, Rversion = r_version) -pth <- "C:/Users/Christopher Marsh/Documents/RPackages" +pth <- "C:/Users/chris/Documents/RPackages" makeRepo(pkgList, path = pth, type = "win.binary", Rversion = r_version, repos = "https://cran.rstudio.com/") #add extra packages to location From 57426d9a6eedaf90faa85205f62bf062646d70c2 Mon Sep 17 00:00:00 2001 From: n-thony Date: Tue, 3 Oct 2023 12:41:15 +0300 Subject: [PATCH 14/14] updated packages --- .../static/InstatObject/R/InstallPackages.R | 231 ++++++---- instat/static/InstatObject/R/Rsetup.R | 407 +++++++++++------- .../static/InstatObject/R/install_packages.R | 5 +- 3 files changed, 383 insertions(+), 260 deletions(-) diff --git a/instat/static/InstatObject/R/InstallPackages.R b/instat/static/InstatObject/R/InstallPackages.R index 3e1a2492a61..f95d3612d97 100644 --- a/instat/static/InstatObject/R/InstallPackages.R +++ b/instat/static/InstatObject/R/InstallPackages.R @@ -14,101 +14,142 @@ install.packages("XML", dependencies = FALSE, repos='http://cran.us.r-project.or # Packages including dependencies # Generated from install_packages.R, do not edit manually! # Above packages taken out -packs <- c("abind", "agricolae", "agridat", "agriTutorial", - "AlgDesign", "animation", "anytime", "apsimx", "arm", "arrangements", - "ash", "askpass", "assertthat", "automap", "backports", "base64enc", - "BayesFactor", "bayesplot", "bayestestR", "BH", "bigD", "bit", - "bit64", "bitops", "blob", "boot", "brew", "brio", "broom", "bslib", - "ca", "cachem", "callr", "candisc", "car", "carData", "caret", - "cellranger", "changepoint", "checkmate", "chillR", "chron", - "circlize", "CircStats", "circular", "class", "classInt", "cli", - "clifro", "climdex.pcic", "clipr", "clock", "clue", "cluster", - "cmsaf", "cmsafops", "cmsafvis", "coda", "codetools", "coin", - "colorRamps", "colorspace", "colourpicker", "combinat", "commonmark", - "conf.design", "confintr", "contfrac", "corrplot", "corrr", "countrycode", - "cowplot", "cpp11", "crayon", "credentials", "crosstalk", "cubature", - "curl", "DAAG", "dae", "data.table", "datawizard", "date", "DBI", - "deldir", "dendextend", "DEoptimR", "desc", "DescTools", "deSolve", - "desplot", "devtools", "diagram", "diffobj", "digest", "distillery", - "distributional", "dotCall64", "downlit", "dplyr", "dslabs", - "DT", "dtw", "dygraphs", "e1071", "ecmwfr", "effectsize", "ellipse", - "ellipsis", "elliptic", "emmeans", "EnvStats", "estimability", - "evaluate", "Evapotranspiration", "Exact", "exactRankTests", - "expm", "extraDistr", "extrafont", "extrafontdb", "extRemes", - "factoextra", "FactoMineR", "fansi", "faraway", "farver", "fastDummies", - "fastmap", "fields", "filelock", "fitdistrplus", "flashClust", - "FNN", "fontawesome", "forcats", "foreach", "forecast", "foreign", - "formattable", "formula.tools", "Formula", "fracdiff", "fs", - "future.apply", "future", "gapminder", "gclus", "gcookbook", - "generics", "GenSA", "geosphere", "gert", "getPass", "GGally", - "ggalt", "ggeffects", "ggfittext", "ggforce", "ggformula", "ggfortify", - "ggmosaic", "ggplot2", "ggplotify", "ggpmisc", "ggpp", "ggpubr", - "ggrepel", "ggridges", "ggsci", "ggsignif", "ggstance", "ggtext", - "ggthemes", "ggwordcloud", "gh", "gitcreds", "gld", "GlobalOptions", - "globals", "glue", "gmp", "gnm", "goftest", "gower", "gridExtra", - "gridGraphics", "gridtext", "gstat", "gt", "gtable", "gtExtras", - "gtools", "hardhat", "haven", "heplots", "here", "hexbin", "highr", - "HistData", "Hmisc", "hms", "htmlTable", "htmltools", "htmlwidgets", - "httpuv", "httr", "httr2", "hydroGOF", "hydroTSM", "hypergeo", - "igraph", "imputeTS", "ini", "inline", "insight", "interp", "intervals", - "ipred", "isoband", "iterators", "janeaustenr", "janitor", "jpeg", - "jquerylib", "jsonlite", "juicyjuice", "Kendall", "KernSmooth", - "keyring", "klaR", "knitr", "labeling", "labelled", "Lahman", - "later", "lattice", "latticeExtra", "lava", "lazyeval", "leaps", - "lemon", "libcoin", "lifecycle", "listenv", "lme4", "lmerTest", - "lmodel2", "lmom", "lmomco", "Lmoments", "lmtest", "loo", "lubridate", - "lwgeom", "magick", "magrittr", "mapdata", "mapproj", "maps", - "maptools", "markdown", "MASS", "Matrix", "MatrixModels", "matrixStats", - "mc2d", "memoise", "metR", "mgcv", "mice", "miceadds", "mime", - "miniUI", "minqa", "mitools", "MKdescr", "MKinfer", "mlbench", - "ModelMetrics", "modelr", "modeltools", "mosaic", "mosaicCore", - "mosaicData", "multcomp", "multcompView", "munsell", "mvtnorm", - "ncdf4.helpers", "ncdf4", "nlme", "nloptr", "nnet", "nortest", - "numDeriv", "nycflights13", "openair", "openssl", "openxlsx", - "operator.tools", "paletteer", "parallelly", "parameters", "patchwork", - "pbapply", "pbkrtest", "pbs", "PCICt", "performance", "pillar", - "pingr", "pkgbuild", "pkgconfig", "pkgdown", "pkgload", "plogr", - "plotly", "plotrix", "pls", "plyr", "png", "polyclip", "polynom", - "posterior", "praise", "prediction", "prettyunits", "primes", - "prismatic", "pROC", "processx", "prodlim", "productplots", "profvis", - "progress", "progressr", "proj4", "promises", "proxy", "ps", - "purrr", "qap", "quadprog", "quantmod", "quantreg", "questionr", - "qvcalc", "R.cache", "R.methodsS3", "R.oo", "R.utils", "R6", - "ragg", "rainfarmr", "rappdirs", "raster", "rasterVis", "rbibutils", - "rcmdcheck", "RColorBrewer", "rcorpora", "Rcpp", "RcppArmadillo", - "RcppEigen", "RcppParallel", "RcppRoll", "RCurl", "Rdpack", "readODS", - "readr", "readxl", "recipes", "registry", "relimp", "rematch", - "rematch2", "remotes", "repr", "reshape", "reshape2", "rio", - "rje", "rlang", "rmarkdown", "RMAWGEN", - #"RMySQL", - "robustbase", - "rootSolve", "roxygen2", "rpart", "rpivotTable", "rprojroot", - "rrefine", "RSQLite", "rstan", "rstanarm", "rstantools", "rstatix", - "rstudioapi", "rtf", "Rttf2pt1", "rversions", "rvest", "rworldmap", - "rworldxtra", "s2", "sandwich", "sass", "scales", "scatterplot3d", - "SearchTrees", "segmented", "selectr", "seriation", "sessioninfo", - "sf", "sftime", "shades", "shape", "shiny", "shinyFiles", "shinyjs", - "shinystan", "shinythemes", "shinyWidgets", "sjlabelled", "sjmisc", - "sjPlot", "sjstats", "skimr", "snakecase", "SnowballC", "sodium", - "sourcetools", "sp", "spacetime", "spam", "SparseM", "SPEI", - "splines2", "splus2R", "SQUAREM", "StanHeaders", "stars", "statip", - "statquotes", "statsr", "stinepack", "stringdist", - #"stringi", - #"stringr", - "strucchange", "styler", "survival", "svglite", "sys", - "systemfonts", "tensorA", - #"terra", - "testthat", "texmex", "textshaping", - "TH.data", "threejs", "tibble", "tidyr", "tidyselect", "tidytext", - "timechange", "timeDate", "tinytex", "TLMoments", "tokenizers", - "treemapify", "trend", "tseries", "TSP", "TTR", "tweenr", "tzdb", - "units", "urca", "urlchecker", "usethis", "utf8", "uuid", "V8", - "vars", "vcd", "vcdExtra", "vctrs", "verification", "viridis", - "viridisLite", "visdat", "visreg", "vroom", "wakefield", "waldo", - "weathermetrics", "whisker", "withr", "wk", "wordcloud", "xfun", - #"XML", - "xml2", "xopen", "xtable", "xts", "yaml", "yulab.utils", - "zip", "zoo", "Zseq", "zyp") +packs <- c("abind", "agricolae", "agridat", + "agriTutorial", "AlgDesign", "animation", "anytime", + "apsimx", "arm", "arrangements", "ash", + "askpass", "assertthat", "automap", "backports", + "base64enc", "BayesFactor", "bayesplot", "bayestestR", + "BH", "bigD", "bit", "bit64", "bitops", + "blob", "boot", "brew", "brio", "broom", + "bslib", "ca", "cachem", "callr", "candisc", + "car", "carData", "caret", "cellranger", + "changepoint", "checkmate", "chillR", "chron", + "circlize", "CircStats", "circular", "class", + "classInt", "cli", "clifro", "climdex.pcic", + "clipr", "clock", "clue", "cluster", + "cmsaf", "cmsafops", "cmsafvis", "coda", + "codetools", "coin", "collapse", "colorRamps", + "colorspace", "colourpicker", "combinat", "commonmark", + "conf.design", "confintr", "contfrac", "corrplot", + "corrr", "countrycode", "cowplot", "cpp11", + "crayon", "credentials", "crosstalk", "cubature", + "curl", "DAAG", "dae", "data.table", + "datawizard", "date", "DBI", "deldir", + "dendextend", "DEoptimR", "desc", "DescTools", + "deSolve", "desplot", "devtools", "diagram", + "diffobj", "digest", "distillery", "distributional", + "dotCall64", "downlit", "dplyr", "dslabs", + "DT", "dtw", "dygraphs", "e1071", "ecmwfr", + "effectsize", "ellipse", "ellipsis", "elliptic", + "emmeans", "EnvStats", "estimability", "evaluate", + "Evapotranspiration", "Exact", "exactRankTests", + "expm", "extraDistr", "extrafont", "extrafontdb", + "extRemes", "factoextra", "FactoMineR", "fansi", + "faraway", "farver", "fastDummies", "fastmap", + "fields", "filelock", "fitdistrplus", "flashClust", + "FNN", "fontawesome", "forcats", "foreach", + "forecast", "foreign", "formattable", "formula.tools", + "Formula", "fracdiff", "fs", "future.apply", + "future", "gapminder", "gclus", "gcookbook", + "generics", "GenSA", "geomtextpath", "geosphere", + "gert", "getPass", "GGally", "ggalt", + "ggeffects", "ggfittext", "ggforce", "ggformula", + "ggfortify", "ggmosaic", "ggplot2", "ggplotify", + "ggpmisc", "ggpp", "ggpubr", "ggrepel", + "ggridges", "ggsci", "ggsignif", "ggstance", + "ggtext", "ggthemes", "ggwordcloud", "gh", + "gitcreds", "gld", "GlobalOptions", "globals", + "glue", "gmp", "gnm", "goftest", "gower", + "gridExtra", "gridGraphics", "gridtext", "gstat", + "gt", "gtable", "gtExtras", "gtools", + "hardhat", "haven", "heplots", "here", + "hexbin", "highr", "HistData", "Hmisc", + "hms", "htmlTable", "htmltools", "htmlwidgets", + "httpuv", "httr", "httr2", "hydroGOF", + "hydroTSM", "hypergeo", "igraph", "imputeTS", + "ini", "inline", "insight", "interp", + "intervals", "ipred", "isoband", "iterators", + "janeaustenr", "janitor", "jpeg", "jquerylib", + "jsonlite", "juicyjuice", "Kendall", "KernSmooth", + "keyring", "klaR", "knitr", "labeling", + "labelled", "Lahman", "later", "lattice", + "latticeExtra", "lava", "lazyeval", "leaps", + "lemon", "libcoin", "lifecycle", "listenv", + "lme4", "lmerTest", "lmodel2", "lmom", + "lmomco", "Lmoments", "lmtest", "loo", + "lubridate", "lwgeom", "magick", "magrittr", + "mapdata", "mapproj", "maps", "maptools", + "markdown", "MASS", "Matrix", "MatrixModels", + "matrixStats", "mc2d", "memoise", "metR", + "mgcv", "mice", "miceadds", "mime", "miniUI", + "minqa", "mitools", "MKdescr", "MKinfer", + "mlbench", "ModelMetrics", "modelr", "modeltools", + "mosaic", "mosaicCore", "mosaicData", "multcomp", + "multcompView", "munsell", "mvtnorm", "ncdf4.helpers", + "ncdf4", "nlme", "nloptr", "nnet", "nortest", + "numDeriv", "nycflights13", "openair", "openssl", + "openxlsx", "operator.tools", "paletteer", + "parallelly", "parameters", "patchwork", "pbapply", + "pbkrtest", "pbs", "PCICt", "performance", + "pillar", "pingr", "pkgbuild", "pkgconfig", + "pkgdown", "pkgload", "plogr", "plotly", + "plotrix", "pls", "plyr", "png", "polyclip", + "polynom", "posterior", "praise", "prediction", + "prettyunits", "primes", "prismatic", "pROC", + "processx", "prodlim", "productplots", "profvis", + "progress", "progressr", "proj4", "promises", + "proxy", "ps", "purrr", "qap", "quadprog", + "quantmod", "quantreg", "questionr", "qvcalc", + "R.cache", "R.methodsS3", "R.oo", "R.utils", + "R6", "ragg", "rainfarmr", "rappdirs", + "raster", "rasterVis", "rbibutils", "rcmdcheck", + "RColorBrewer", "rcorpora", "Rcpp", "RcppArmadillo", + "RcppEigen", "RcppParallel", "RcppRoll", "RCurl", + "Rdpack", "readODS", "readr", "readxl", + "recipes", "registry", "relimp", "rematch", + "rematch2", "remotes", "repr", "reshape", + "reshape2", "rio", "rje", "rlang", "rmarkdown", + "RMAWGEN", + #"RMySQL", + "robustbase", "rootSolve", + "roxygen2", "rpart", "rpivotTable", "rprojroot", + "rrefine", "RSQLite", "rstan", "rstanarm", + "rstantools", "rstatix", "rstudioapi", "rtf", + "Rttf2pt1", "rversions", "rvest", "rworldmap", + "rworldxtra", "s2", "sandwich", "sass", + "scales", "scatterplot3d", "SearchTrees", "segmented", + "selectr", "seriation", "sessioninfo", "sf", + "sftime", "shades", "shape", "shiny", + "shinyFiles", "shinyjs", "shinystan", "shinythemes", + "shinyWidgets", "sjlabelled", "sjmisc", "sjPlot", + "sjstats", "skimr", "snakecase", "SnowballC", + "sodium", "sourcetools", "sp", "spacetime", + "spam", "SparseM", "SPEI", "splines2", + "splus2R", "SQUAREM", "StanHeaders", "stars", + "statip", "statquotes", "statsr", "stinepack", + "stringdist", + #"stringi", + #"stringr", + "strucchange", + "styler", "survival", "svglite", "sys", + "systemfonts", "tensorA", + #"terra", + "testthat", + "texmex", "textshaping", "TH.data", "threejs", + "tibble", "tidyr", "tidyselect", "tidytext", + "timechange", "timeDate", "tinytex", "TLMoments", + "tokenizers", "treemapify", "trend", "tseries", + "TSP", "TTR", "tweenr", "tzdb", "units", + "urca", "urlchecker", "usethis", "utf8", + "uuid", "V8", "vars", "vcd", "vcdExtra", + "vctrs", "verification", "viridis", "viridisLite", + "visdat", "visreg", "vroom", "wakefield", + "waldo", "weathermetrics", "whisker", "withr", + "wk", "wordcloud", "xfun", + #"XML", + "xml2", + "xopen", "xtable", "xts", "yaml", "yulab.utils", + "zip", "zoo", "Zseq", "zyp") install.packages(packs, dependencies = FALSE, repos='https://cloud.r-project.org', type="win.binary") diff --git a/instat/static/InstatObject/R/Rsetup.R b/instat/static/InstatObject/R/Rsetup.R index 88a699fba41..3d28831e085 100644 --- a/instat/static/InstatObject/R/Rsetup.R +++ b/instat/static/InstatObject/R/Rsetup.R @@ -1,93 +1,132 @@ # Packages including dependencies # Generated from install_packages.R, do not edit manually! -packs <- c("abind", "agricolae", "agridat", "agriTutorial", - "AlgDesign", "animation", "anytime", "apsimx", "arm", "arrangements", - "ash", "askpass", "assertthat", "automap", "backports", "base64enc", - "BayesFactor", "bayesplot", "bayestestR", "BH", "bigD", "bit", - "bit64", "bitops", "blob", "boot", "brew", "brio", "broom", "bslib", - "ca", "cachem", "callr", "candisc", "car", "carData", "caret", - "cellranger", "changepoint", "checkmate", "chillR", "chron", - "circlize", "CircStats", "circular", "class", "classInt", "cli", - "clifro", "climdex.pcic", "clipr", "clock", "clue", "cluster", - "cmsaf", "cmsafops", "cmsafvis", "coda", "codetools", "coin", - "colorRamps", "colorspace", "colourpicker", "combinat", "commonmark", - "conf.design", "confintr", "contfrac", "corrplot", "corrr", "countrycode", - "cowplot", "cpp11", "crayon", "credentials", "crosstalk", "cubature", - "curl", "DAAG", "dae", "data.table", "datawizard", "date", "DBI", - "deldir", "dendextend", "DEoptimR", "desc", "DescTools", "deSolve", - "desplot", "devtools", "diagram", "diffobj", "digest", "distillery", - "distributional", "dotCall64", "downlit", "dplyr", "dslabs", - "DT", "dtw", "dygraphs", "e1071", "ecmwfr", "effectsize", "ellipse", - "ellipsis", "elliptic", "emmeans", "EnvStats", "estimability", - "evaluate", "Evapotranspiration", "Exact", "exactRankTests", - "expm", "extraDistr", "extrafont", "extrafontdb", "extRemes", - "factoextra", "FactoMineR", "fansi", "faraway", "farver", "fastDummies", - "fastmap", "fields", "filelock", "fitdistrplus", "flashClust", - "FNN", "fontawesome", "forcats", "foreach", "forecast", "foreign", - "formattable", "formula.tools", "Formula", "fracdiff", "fs", - "future.apply", "future", "gapminder", "gclus", "gcookbook", - "generics", "GenSA", "geosphere", "gert", "getPass", "GGally", - "ggalt", "ggeffects", "ggfittext", "ggforce", "ggformula", "ggfortify", - "ggmosaic", "ggplot2", "ggplotify", "ggpmisc", "ggpp", "ggpubr", - "ggrepel", "ggridges", "ggsci", "ggsignif", "ggstance", "ggtext", - "ggthemes", "ggwordcloud", "gh", "gitcreds", "gld", "GlobalOptions", - "globals", "glue", "gmp", "gnm", "goftest", "gower", "gridExtra", - "gridGraphics", "gridtext", "gstat", "gt", "gtable", "gtExtras", - "gtools", "hardhat", "haven", "heplots", "here", "hexbin", "highr", - "HistData", "Hmisc", "hms", "htmlTable", "htmltools", "htmlwidgets", - "httpuv", "httr", "httr2", "hydroGOF", "hydroTSM", "hypergeo", - "igraph", "imputeTS", "ini", "inline", "insight", "interp", "intervals", - "ipred", "isoband", "iterators", "janeaustenr", "janitor", "jpeg", - "jquerylib", "jsonlite", "juicyjuice", "Kendall", "KernSmooth", - "keyring", "klaR", "knitr", "labeling", "labelled", "Lahman", - "later", "lattice", "latticeExtra", "lava", "lazyeval", "leaps", - "lemon", "libcoin", "lifecycle", "listenv", "lme4", "lmerTest", - "lmodel2", "lmom", "lmomco", "Lmoments", "lmtest", "loo", "lubridate", - "lwgeom", "magick", "magrittr", "mapdata", "mapproj", "maps", - "maptools", "markdown", "MASS", "Matrix", "MatrixModels", "matrixStats", - "mc2d", "memoise", "metR", "mgcv", "mice", "miceadds", "mime", - "miniUI", "minqa", "mitools", "MKdescr", "MKinfer", "mlbench", - "ModelMetrics", "modelr", "modeltools", "mosaic", "mosaicCore", - "mosaicData", "multcomp", "multcompView", "munsell", "mvtnorm", - "ncdf4.helpers", "ncdf4", "nlme", "nloptr", "nnet", "nortest", - "numDeriv", "nycflights13", "openair", "openssl", "openxlsx", - "operator.tools", "paletteer", "parallelly", "parameters", "patchwork", - "pbapply", "pbkrtest", "pbs", "PCICt", "performance", "pillar", - "pingr", "pkgbuild", "pkgconfig", "pkgdown", "pkgload", "plogr", - "plotly", "plotrix", "pls", "plyr", "png", "polyclip", "polynom", - "posterior", "praise", "prediction", "prettyunits", "primes", - "prismatic", "pROC", "processx", "prodlim", "productplots", "profvis", - "progress", "progressr", "proj4", "promises", "proxy", "ps", - "purrr", "qap", "quadprog", "quantmod", "quantreg", "questionr", - "qvcalc", "R.cache", "R.methodsS3", "R.oo", "R.utils", "R6", - "ragg", "rainfarmr", "rappdirs", "raster", "rasterVis", "rbibutils", - "rcmdcheck", "RColorBrewer", "rcorpora", "Rcpp", "RcppArmadillo", - "RcppEigen", "RcppParallel", "RcppRoll", "RCurl", "Rdpack", "readODS", - "readr", "readxl", "recipes", "registry", "relimp", "rematch", - "rematch2", "remotes", "repr", "reshape", "reshape2", "rio", - "rje", "rlang", "rmarkdown", "RMAWGEN", "RMySQL", "robustbase", - "rootSolve", "roxygen2", "rpart", "rpivotTable", "rprojroot", - "rrefine", "RSQLite", "rstan", "rstanarm", "rstantools", "rstatix", - "rstudioapi", "rtf", "Rttf2pt1", "rversions", "rvest", "rworldmap", - "rworldxtra", "s2", "sandwich", "sass", "scales", "scatterplot3d", - "SearchTrees", "segmented", "selectr", "seriation", "sessioninfo", - "sf", "sftime", "shades", "shape", "shiny", "shinyFiles", "shinyjs", - "shinystan", "shinythemes", "shinyWidgets", "sjlabelled", "sjmisc", - "sjPlot", "sjstats", "skimr", "snakecase", "SnowballC", "sodium", - "sourcetools", "sp", "spacetime", "spam", "SparseM", "SPEI", - "splines2", "splus2R", "SQUAREM", "StanHeaders", "stars", "statip", - "statquotes", "statsr", "stinepack", "stringdist", "stringi", - "stringr", "strucchange", "styler", "survival", "svglite", "sys", - "systemfonts", "tensorA", "terra", "testthat", "texmex", "textshaping", - "TH.data", "threejs", "tibble", "tidyr", "tidyselect", "tidytext", - "timechange", "timeDate", "tinytex", "TLMoments", "tokenizers", - "treemapify", "trend", "tseries", "TSP", "TTR", "tweenr", "tzdb", - "units", "urca", "urlchecker", "usethis", "utf8", "uuid", "V8", - "vars", "vcd", "vcdExtra", "vctrs", "verification", "viridis", - "viridisLite", "visdat", "visreg", "vroom", "wakefield", "waldo", - "weathermetrics", "whisker", "withr", "wk", "wordcloud", "xfun", - "XML", "xml2", "xopen", "xtable", "xts", "yaml", "yulab.utils", - "zip", "zoo", "Zseq", "zyp", +packs <- c("abind", "agricolae", "agridat", + "agriTutorial", "AlgDesign", "animation", "anytime", + "apsimx", "arm", "arrangements", "ash", + "askpass", "assertthat", "automap", "backports", + "base64enc", "BayesFactor", "bayesplot", "bayestestR", + "BH", "bigD", "bit", "bit64", "bitops", + "blob", "boot", "brew", "brio", "broom", + "bslib", "ca", "cachem", "callr", "candisc", + "car", "carData", "caret", "cellranger", + "changepoint", "checkmate", "chillR", "chron", + "circlize", "CircStats", "circular", "class", + "classInt", "cli", "clifro", "climdex.pcic", + "clipr", "clock", "clue", "cluster", + "cmsaf", "cmsafops", "cmsafvis", "coda", + "codetools", "coin", "collapse", "colorRamps", + "colorspace", "colourpicker", "combinat", "commonmark", + "conf.design", "confintr", "contfrac", "corrplot", + "corrr", "countrycode", "cowplot", "cpp11", + "crayon", "credentials", "crosstalk", "cubature", + "curl", "DAAG", "dae", "data.table", + "datawizard", "date", "DBI", "deldir", + "dendextend", "DEoptimR", "desc", "DescTools", + "deSolve", "desplot", "devtools", "diagram", + "diffobj", "digest", "distillery", "distributional", + "dotCall64", "downlit", "dplyr", "dslabs", + "DT", "dtw", "dygraphs", "e1071", "ecmwfr", + "effectsize", "ellipse", "ellipsis", "elliptic", + "emmeans", "EnvStats", "estimability", "evaluate", + "Evapotranspiration", "Exact", "exactRankTests", + "expm", "extraDistr", "extrafont", "extrafontdb", + "extRemes", "factoextra", "FactoMineR", "fansi", + "faraway", "farver", "fastDummies", "fastmap", + "fields", "filelock", "fitdistrplus", "flashClust", + "FNN", "fontawesome", "forcats", "foreach", + "forecast", "foreign", "formattable", "formula.tools", + "Formula", "fracdiff", "fs", "future.apply", + "future", "gapminder", "gclus", "gcookbook", + "generics", "GenSA", "geomtextpath", "geosphere", + "gert", "getPass", "GGally", "ggalt", + "ggeffects", "ggfittext", "ggforce", "ggformula", + "ggfortify", "ggmosaic", "ggplot2", "ggplotify", + "ggpmisc", "ggpp", "ggpubr", "ggrepel", + "ggridges", "ggsci", "ggsignif", "ggstance", + "ggtext", "ggthemes", "ggwordcloud", "gh", + "gitcreds", "gld", "GlobalOptions", "globals", + "glue", "gmp", "gnm", "goftest", "gower", + "gridExtra", "gridGraphics", "gridtext", "gstat", + "gt", "gtable", "gtExtras", "gtools", + "hardhat", "haven", "heplots", "here", + "hexbin", "highr", "HistData", "Hmisc", + "hms", "htmlTable", "htmltools", "htmlwidgets", + "httpuv", "httr", "httr2", "hydroGOF", + "hydroTSM", "hypergeo", "igraph", "imputeTS", + "ini", "inline", "insight", "interp", + "intervals", "ipred", "isoband", "iterators", + "janeaustenr", "janitor", "jpeg", "jquerylib", + "jsonlite", "juicyjuice", "Kendall", "KernSmooth", + "keyring", "klaR", "knitr", "labeling", + "labelled", "Lahman", "later", "lattice", + "latticeExtra", "lava", "lazyeval", "leaps", + "lemon", "libcoin", "lifecycle", "listenv", + "lme4", "lmerTest", "lmodel2", "lmom", + "lmomco", "Lmoments", "lmtest", "loo", + "lubridate", "lwgeom", "magick", "magrittr", + "mapdata", "mapproj", "maps", "maptools", + "markdown", "MASS", "Matrix", "MatrixModels", + "matrixStats", "mc2d", "memoise", "metR", + "mgcv", "mice", "miceadds", "mime", "miniUI", + "minqa", "mitools", "MKdescr", "MKinfer", + "mlbench", "ModelMetrics", "modelr", "modeltools", + "mosaic", "mosaicCore", "mosaicData", "multcomp", + "multcompView", "munsell", "mvtnorm", "ncdf4.helpers", + "ncdf4", "nlme", "nloptr", "nnet", "nortest", + "numDeriv", "nycflights13", "openair", "openssl", + "openxlsx", "operator.tools", "paletteer", + "parallelly", "parameters", "patchwork", "pbapply", + "pbkrtest", "pbs", "PCICt", "performance", + "pillar", "pingr", "pkgbuild", "pkgconfig", + "pkgdown", "pkgload", "plogr", "plotly", + "plotrix", "pls", "plyr", "png", "polyclip", + "polynom", "posterior", "praise", "prediction", + "prettyunits", "primes", "prismatic", "pROC", + "processx", "prodlim", "productplots", "profvis", + "progress", "progressr", "proj4", "promises", + "proxy", "ps", "purrr", "qap", "quadprog", + "quantmod", "quantreg", "questionr", "qvcalc", + "R.cache", "R.methodsS3", "R.oo", "R.utils", + "R6", "ragg", "rainfarmr", "rappdirs", + "raster", "rasterVis", "rbibutils", "rcmdcheck", + "RColorBrewer", "rcorpora", "Rcpp", "RcppArmadillo", + "RcppEigen", "RcppParallel", "RcppRoll", "RCurl", + "Rdpack", "readODS", "readr", "readxl", + "recipes", "registry", "relimp", "rematch", + "rematch2", "remotes", "repr", "reshape", + "reshape2", "rio", "rje", "rlang", "rmarkdown", + "RMAWGEN", "RMySQL", "robustbase", "rootSolve", + "roxygen2", "rpart", "rpivotTable", "rprojroot", + "rrefine", "RSQLite", "rstan", "rstanarm", + "rstantools", "rstatix", "rstudioapi", "rtf", + "Rttf2pt1", "rversions", "rvest", "rworldmap", + "rworldxtra", "s2", "sandwich", "sass", + "scales", "scatterplot3d", "SearchTrees", "segmented", + "selectr", "seriation", "sessioninfo", "sf", + "sftime", "shades", "shape", "shiny", + "shinyFiles", "shinyjs", "shinystan", "shinythemes", + "shinyWidgets", "sjlabelled", "sjmisc", "sjPlot", + "sjstats", "skimr", "snakecase", "SnowballC", + "sodium", "sourcetools", "sp", "spacetime", + "spam", "SparseM", "SPEI", "splines2", + "splus2R", "SQUAREM", "StanHeaders", "stars", + "statip", "statquotes", "statsr", "stinepack", + "stringdist", "stringi", "stringr", "strucchange", + "styler", "survival", "svglite", "sys", + "systemfonts", "tensorA", "terra", "testthat", + "texmex", "textshaping", "TH.data", "threejs", + "tibble", "tidyr", "tidyselect", "tidytext", + "timechange", "timeDate", "tinytex", "TLMoments", + "tokenizers", "treemapify", "trend", "tseries", + "TSP", "TTR", "tweenr", "tzdb", "units", + "urca", "urlchecker", "usethis", "utf8", + "uuid", "V8", "vars", "vcd", "vcdExtra", + "vctrs", "verification", "viridis", "viridisLite", + "visdat", "visreg", "vroom", "wakefield", + "waldo", "weathermetrics", "whisker", "withr", + "wk", "wordcloud", "xfun", "XML", "xml2", + "xopen", "xtable", "xts", "yaml", "yulab.utils", + "zip", "zoo", "Zseq", "zyp", # mmtable2 package from GitHub added manually to list # install with devtools::install_github("ianmoran11/mmtable2") # aida-package package from GitHub added manually to list @@ -97,81 +136,123 @@ packs <- c("abind", "agricolae", "agridat", "agriTutorial", "mmtable2", "aida", "CDT" ) -versions <- c("1.4-5", "1.3-5", "1.21", "0.1.5", "1.2.1", "2.7", - "0.3.9", "2.3.1", "1.13-1", "1.1.9", "1.0-15", "1.1", "0.2.1", - "1.1-9", "1.4.1", "0.1-3", "0.9.12-4.4", "1.10.0", "0.13.1", - "1.81.0-1", "0.2.0", "4.0.5", "4.0.5", "1.0-7", "1.2.4", "1.3-28.1", - "1.0-8", "1.1.3", "1.0.4", "0.4.2", "0.71.1", "1.0.7", "3.7.3", - "0.8-6", "3.1-2", "3.0-5", "6.0-94", "1.1.0", "2.2.4", "2.1.0", - "0.72.8", "2.3-60", "0.4.15", "0.2-6", "0.4-95", "7.3-21", "0.4-9", - "3.6.1", "3.2-5", "1.1-11", "0.8.0", "0.6.1", "0.3-64", "2.1.4", - "3.4.4", "1.2.6", "1.1.12", "0.19-4", "0.2-19", "1.4-2", "2.3.1", - "2.1-0", "1.2.0", "0.0-8", "1.9.0", "2.0.0", "1.0.0", "1.1-12", - "0.92", "0.4.4", "1.4.0", "1.1.1", "0.4.3", "1.5.2", "1.3.2", - "1.2.0", "2.0.4.6", "5.0.0", "1.25.4", "3.2.15", "1.14.8", "0.7.1", - "1.2-42", "1.1.3", "1.0-6", "1.17.1", "1.0-12", "1.4.2", "0.99.48", - "1.35", "1.10", "2.4.5", "1.6.5", "0.3.5", "0.6.31", "1.2-1", - "0.3.2", "1.0-2", "0.4.2", "1.1.2", "0.7.4", "0.27", "1.23-1", - "1.1.1.6", "1.7-13", "1.5.0", "0.8.2", "0.4.5", "0.3.2", "1.4-0", - "1.8.5", "2.7.0", "1.4.1", "0.20", "1.16", "3.2", "0.8-35", "0.999-7", - "1.9.1", "0.19", "1.0", "2.1-3", "1.0.7", "2.8", "1.0.4", "1.0.8", - "2.1.1", "1.6.3", "1.1.1", "14.1", "1.0.2", "1.1-8", "1.01-2", - "1.1.3.2", "0.5.1", "1.0.0", "1.5.2", "8.21", "0.8-84", "0.2.1", - "1.7.1", "1.2-5", "1.5-2", "1.5.2", "1.10.0", "1.32.0", "1.0.0", - "1.3.2", "2.0", "0.1.3", "1.1.8", "1.5-18", "1.9.2", "0.2-2", - "2.1.2", "0.4.0", "1.2.1", "0.10.0", "0.4.1", "0.10.4", "0.4.16", - "0.3.3", "3.4.2", "0.1.0", "0.5.2", "0.5.2", "0.6.0", "0.9.3", - "0.5.4", "3.0.0", "0.6.4", "0.3.6", "0.1.2", "4.2.4", "0.5.0", - "1.4.0", "0.1.2", "2.6.6", "0.1.2", "0.16.2", "1.6.2", "0.7-1", - "1.1-2", "1.2-3", "1.0.1", "2.3", "0.5-1", "0.1.5", "2.1-1", - "0.8.0", "0.3.3", "0.4.5", "3.9.4", "1.3.0", "2.5.2", "1.4-2", - "1.0.1", "1.28.3", "0.10", "0.8-7", "5.0-1", "1.1.3", "2.4.1", - "0.5.5", "1.6.2", "1.6.9", "1.4.5", "0.2.2", "0.4-0", "0.6-0", - "1.2-13", "1.4.2", "3.3", "0.3.1", "0.3.19", "0.19.1", "1.1-4", - "0.15.3", "0.9-14", "0.2.7", "1.0.14", "1.0.0", "2.2.0", "0.1-10", - "0.1.4", "1.8.4", "0.1.0", "2.2.1", "2.23-20", "1.3.1", "1.7-2", - "1.42", "0.4.2", "2.11.0", "10.0-1", "1.3.0", "0.21-8", "0.6-30", - "1.7.2.1", "0.2.2", "3.1", "0.4.6", "1.0-9", "1.0.3", "0.9.0", - "1.1-32", "3.1-3", "1.7-3", "2.9", "2.4.7", "1.3-1", "0.9-40", - "2.6.0", "1.9.2", "0.2-11", "2.7.4", "2.0.3", "2.3.1", "1.2.11", - "3.4.1", "1.1-6", "1.6", "7.3-58.3", "1.5-4", "0.5-1", "0.63.0", - "0.1-22", "2.0.1", "0.14.0", "1.8-42", "3.15.0", "3.16-18", "0.12", - "0.1.1.1", "1.2.5", "2.4", "0.8", "1.1", "2.1-3", "1.2.2.2", - "0.1.11", "0.2-23", "1.8.4.2", "0.9.2.1", "0.20.3", "1.4-23", - "0.1-9", "0.5.0", "1.1-3", "0.3-6", "1.21", "3.1-162", "2.0.3", - "7.3-18", "1.0-4", "2016.8-1.1", "1.0.2", "2.16-0", "2.0.6", - "4.2.5.2", "1.6.3", "1.5.0", "1.35.0", "0.21.0", "1.1.2", "1.7-0", - "0.5.2", "1.1", "0.5-4.4", "0.10.3", "1.9.0", "2.0.2", "1.4.0", - "2.0.3", "2.0.7", "1.3.2", "0.2.0", "4.10.1", "3.8-2", "2.8-1", - "1.8.8", "0.1-8", "1.10-4", "1.4-1", "1.4.1", "1.0.0", "0.3.14", - "1.1.1", "1.4.0", "1.1.1", "1.18.0", "3.8.1", "2023.03.31", "0.1.1", - "0.3.7", "1.2.2", "0.13.0", "1.0-12", "1.2.0.1", "0.4-27", "1.7.5", - "1.0.1", "0.1-2", "1.5-8", "0.4.22", "5.95", "0.7.8", "1.0.2", - "0.16.0", "1.8.2", "1.25.0", "2.12.2", "2.5.1", "1.2.5", "0.1", - "0.3.3", "3.6-20", "0.51.5", "2.2.13", "1.4.0", "1.1-3", "2.0.0", - "1.0.10", "0.12.2.0.0", "0.3.3.9.3", "5.1.7", "0.3.0", "1.98-1.12", - "2.4", "1.7.0", "2.1.4", "1.4.2", "1.0.5", "0.5-1", "1.0-5", - "1.0.1", "2.1.2", "2.4.2", "1.1.6", "0.8.9", "1.4.4", "0.5.29", - "1.12.1", "1.1.0", "2.21", "1.3.7", "0.10.25", "0.95-1", "1.8.2.3", - "7.2.3", "4.1.19", "0.3.0", "2.0.3", "2.1.0", "2.3.1", "2.21.7", - "2.21.4", "2.3.1", "0.7.2", "0.14", "0.4-14.1", "1.3.12", "2.1.2", - "1.0.3", "1.3-6", "1.01", "1.1.2", "3.0-2", "0.4.5", "1.2.1", - "0.3-43", "0.5.5", "1.6-4", "0.4-2", "1.4.2", "1.2.2", "1.0-12", - "0.2-0", "1.4.0", "1.4.6", "1.7.4", "0.9.3", "2.1.0", "2.6.0", - "1.2.0", "0.7.6", "1.2.0", "2.8.9", "2.8.14", "0.18.2", "2.1.5", - "0.11.0", "0.7.0", "1.2.1", "0.1.7-1", "1.6-0", "1.3-0", "2.9-1", - "1.81", "1.8.1", "0.4.8", "1.3-3", "2021.1", "2.21.0-7", "0.6-1", - "0.2.3", "0.3.1", "0.3.0", "1.4", "0.9.10", "1.7.12", "1.5.0", - "1.5-3", "1.9.1", "3.5-5", "2.1.1", "3.4.1", "1.0.4", "0.36.2", - "1.7-23", "3.1.7", "2.4.8", "0.3.6", "1.1-2", "0.3.3", "3.2.1", - "1.3.0", "1.2.0", "0.4.1", "0.2.0", "4022.108", "0.45", "0.7.5.3", - "0.3.0", "2.5.5", "1.1.5", "0.10-53", "1.2-4", "0.24.3", "2.0.2", - "0.3.0", "0.8-1", "1.3-3", "1.0.1", "2.1.6", "1.2.3", "1.1-0", - "4.3.0", "1.5-9", "1.4-11", "0.8-4", "0.6.1", "1.42", "0.6.2", - "0.4.1", "0.6.0", "2.7.0", "1.6.1", "0.3.6", "0.4.0", "1.2.2", - "0.4.1", "2.5.0", "0.7.2", "2.6", "0.39", "3.99-0.14", "1.3.3", - "1.0.0", "1.8-4", "0.13.1", "2.3.7", "0.0.6", "2.3.0", "1.8-12", - "0.2.1", "0.11-1", +versions <- c("1.4-5", "1.3-5", "1.21", "0.1.5", + "1.2.1", "2.7", "0.3.9", "2.3.1", "1.13-1", + "1.1.9", "1.0-15", "1.1", "0.2.1", "1.1-9", + "1.4.1", "0.1-3", "0.9.12-4.4", "1.10.0", + "0.13.1", "1.81.0-1", "0.2.0", "4.0.5", + "4.0.5", "1.0-7", "1.2.4", "1.3-28.1", + "1.0-8", "1.1.3", "1.0.4", "0.4.2", "0.71.1", + "1.0.7", "3.7.3", "0.8-6", "3.1-2", "3.0-5", + "6.0-94", "1.1.0", "2.2.4", "2.1.0", + "0.72.8", "2.3-60", "0.4.15", "0.2-6", + "0.4-95", "7.3-21", "0.4-9", "3.6.1", + "3.2-5", "1.1-11", "0.8.0", "0.6.1", + "0.3-64", "2.1.4", "3.4.4", "1.2.6", + "1.1.12", "0.19-4", "0.2-19", "1.4-2", + "1.9.5", "2.3.1", "2.1-0", "1.2.0", "0.0-8", + "1.9.0", "2.0.0", "1.0.0", "1.1-12", + "0.92", "0.4.4", "1.4.0", "1.1.1", "0.4.3", + "1.5.2", "1.3.2", "1.2.0", "2.0.4.6", + "5.0.0", "1.25.4", "3.2.15", "1.14.8", + "0.7.1", "1.2-42", "1.1.3", "1.0-6", + "1.17.1", "1.0-12", "1.4.2", "0.99.48", + "1.35", "1.10", "2.4.5", "1.6.5", "0.3.5", + "0.6.31", "1.2-1", "0.3.2", "1.0-2", + "0.4.2", "1.1.2", "0.7.4", "0.27", "1.23-1", + "1.1.1.6", "1.7-13", "1.5.0", "0.8.2", + "0.4.5", "0.3.2", "1.4-0", "1.8.5", "2.7.0", + "1.4.1", "0.20", "1.16", "3.2", "0.8-35", + "0.999-7", "1.9.1", "0.19", "1.0", "2.1-3", + "1.0.7", "2.8", "1.0.4", "1.0.8", "2.1.1", + "1.6.3", "1.1.1", "14.1", "1.0.2", "1.1-8", + "1.01-2", "1.1.3.2", "0.5.1", "1.0.0", + "1.5.2", "8.21", "0.8-84", "0.2.1", "1.7.1", + "1.2-5", "1.5-2", "1.5.2", "1.10.0", + "1.32.0", "1.0.0", "1.3.2", "2.0", "0.1.3", + "1.1.8", "0.1.1", "1.5-18", "1.9.2", + "0.2-2", "2.1.2", "0.4.0", "1.2.1", "0.10.0", + "0.4.1", "0.10.4", "0.4.16", "0.3.3", + "3.4.2", "0.1.0", "0.5.2", "0.5.2", "0.6.0", + "0.9.3", "0.5.4", "3.0.0", "0.6.4", "0.3.6", + "0.1.2", "4.2.4", "0.5.0", "1.4.0", "0.1.2", + "2.6.6", "0.1.2", "0.16.2", "1.6.2", + "0.7-1", "1.1-2", "1.2-3", "1.0.1", "2.3", + "0.5-1", "0.1.5", "2.1-1", "0.8.0", "0.3.3", + "0.4.5", "3.9.4", "1.3.0", "2.5.2", "1.4-2", + "1.0.1", "1.28.3", "0.10", "0.8-7", "5.0-1", + "1.1.3", "2.4.1", "0.5.5", "1.6.2", "1.6.9", + "1.4.5", "0.2.2", "0.4-0", "0.6-0", "1.2-13", + "1.4.2", "3.3", "0.3.1", "0.3.19", "0.19.1", + "1.1-4", "0.15.3", "0.9-14", "0.2.7", + "1.0.14", "1.0.0", "2.2.0", "0.1-10", + "0.1.4", "1.8.4", "0.1.0", "2.2.1", "2.23-20", + "1.3.1", "1.7-2", "1.42", "0.4.2", "2.11.0", + "10.0-1", "1.3.0", "0.21-8", "0.6-30", + "1.7.2.1", "0.2.2", "3.1", "0.4.6", "1.0-9", + "1.0.3", "0.9.0", "1.1-32", "3.1-3", + "1.7-3", "2.9", "2.4.7", "1.3-1", "0.9-40", + "2.6.0", "1.9.2", "0.2-11", "2.7.4", + "2.0.3", "2.3.1", "1.2.11", "3.4.1", + "1.1-6", "1.6", "7.3-58.3", "1.5-4", + "0.5-1", "0.63.0", "0.1-22", "2.0.1", + "0.14.0", "1.8-42", "3.15.0", "3.16-18", + "0.12", "0.1.1.1", "1.2.5", "2.4", "0.8", + "1.1", "2.1-3", "1.2.2.2", "0.1.11", + "0.2-23", "1.8.4.2", "0.9.2.1", "0.20.3", + "1.4-23", "0.1-9", "0.5.0", "1.1-3", + "0.3-6", "1.21", "3.1-162", "2.0.3", + "7.3-18", "1.0-4", "2016.8-1.1", "1.0.2", + "2.16-0", "2.0.6", "4.2.5.2", "1.6.3", + "1.5.0", "1.35.0", "0.21.0", "1.1.2", + "1.7-0", "0.5.2", "1.1", "0.5-4.4", "0.10.3", + "1.9.0", "2.0.2", "1.4.0", "2.0.3", "2.0.7", + "1.3.2", "0.2.0", "4.10.1", "3.8-2", + "2.8-1", "1.8.8", "0.1-8", "1.10-4", + "1.4-1", "1.4.1", "1.0.0", "0.3.14", + "1.1.1", "1.4.0", "1.1.1", "1.18.0", + "3.8.1", "2023.03.31", "0.1.1", "0.3.7", + "1.2.2", "0.13.0", "1.0-12", "1.2.0.1", + "0.4-27", "1.7.5", "1.0.1", "0.1-2", + "1.5-8", "0.4.22", "5.95", "0.7.8", "1.0.2", + "0.16.0", "1.8.2", "1.25.0", "2.12.2", + "2.5.1", "1.2.5", "0.1", "0.3.3", "3.6-20", + "0.51.5", "2.2.13", "1.4.0", "1.1-3", + "2.0.0", "1.0.10", "0.12.2.0.0", "0.3.3.9.3", + "5.1.7", "0.3.0", "1.98-1.12", "2.4", + "1.7.0", "2.1.4", "1.4.2", "1.0.5", "0.5-1", + "1.0-5", "1.0.1", "2.1.2", "2.4.2", "1.1.6", + "0.8.9", "1.4.4", "0.5.29", "1.12.1", + "1.1.0", "2.21", "1.3.7", "0.10.25", + "0.95-1", "1.8.2.3", "7.2.3", "4.1.19", + "0.3.0", "2.0.3", "2.1.0", "2.3.1", "2.21.7", + "2.21.4", "2.3.1", "0.7.2", "0.14", "0.4-14.1", + "1.3.12", "2.1.2", "1.0.3", "1.3-6", + "1.01", "1.1.2", "3.0-2", "0.4.5", "1.2.1", + "0.3-43", "0.5.5", "1.6-4", "0.4-2", + "1.4.2", "1.2.2", "1.0-12", "0.2-0", + "1.4.0", "1.4.6", "1.7.4", "0.9.3", "2.1.0", + "2.6.0", "1.2.0", "0.7.6", "1.2.0", "2.8.9", + "2.8.14", "0.18.2", "2.1.5", "0.11.0", + "0.7.0", "1.2.1", "0.1.7-1", "1.6-0", + "1.3-0", "2.9-1", "1.81", "1.8.1", "0.4.8", + "1.3-3", "2021.1", "2.21.0-7", "0.6-1", + "0.2.3", "0.3.1", "0.3.0", "1.4", "0.9.10", + "1.7.12", "1.5.0", "1.5-3", "1.9.1", + "3.5-5", "2.1.1", "3.4.1", "1.0.4", "0.36.2", + "1.7-23", "3.1.7", "2.4.8", "0.3.6", + "1.1-2", "0.3.3", "3.2.1", "1.3.0", "1.2.0", + "0.4.1", "0.2.0", "4022.108", "0.45", + "0.7.5.3", "0.3.0", "2.5.5", "1.1.5", + "0.10-53", "1.2-4", "0.24.3", "2.0.2", + "0.3.0", "0.8-1", "1.3-3", "1.0.1", "2.1.6", + "1.2.3", "1.1-0", "4.3.0", "1.5-9", "1.4-11", + "0.8-4", "0.6.1", "1.42", "0.6.2", "0.4.1", + "0.6.0", "2.7.0", "1.6.1", "0.3.6", "0.4.0", + "1.2.2", "0.4.1", "2.5.0", "0.7.2", "2.6", + "0.39", "3.99-0.14", "1.3.3", "1.0.0", + "1.8-4", "0.13.1", "2.3.7", "0.0.6", + "2.3.0", "1.8-12", "0.2.1", "0.11-1", # mmtable2 package from GitHub added manually to list # aida-package package from GitHub added manually to list # CDT package from GitHub added manually to list diff --git a/instat/static/InstatObject/R/install_packages.R b/instat/static/InstatObject/R/install_packages.R index 672bc6bf65a..143d0b65d26 100644 --- a/instat/static/InstatObject/R/install_packages.R +++ b/instat/static/InstatObject/R/install_packages.R @@ -162,10 +162,11 @@ pkgs <- #applying formatting on vectors and data frames to make data presentation easier, richer, more flexible and hopefully convey more information "formattable", #A 'ggplot2' extension that allows text to follow curved paths. - "geomtextpath" + "geomtextpath", + "collapse" ) pkgList <- pkgDep(pkgs, type="win.binary", repos = "https://cran.rstudio.com/", suggests = FALSE, includeBasePkgs = FALSE, Rversion = r_version) -pth <- "C:/Users/chris/Documents/RPackages" +pth <- "C:/Users/Antoine/Documents/RPackages" makeRepo(pkgList, path = pth, type = "win.binary", Rversion = r_version, repos = "https://cran.rstudio.com/") #add extra packages to location