diff --git a/instat/dlgScatterPlot.Designer.vb b/instat/dlgScatterPlot.Designer.vb
index 7da7e411a27..1378732baa4 100644
--- a/instat/dlgScatterPlot.Designer.vb
+++ b/instat/dlgScatterPlot.Designer.vb
@@ -53,21 +53,26 @@ Partial Class dlgScatterPlot
Me.toolStripMenuItemJitterOptions = New System.Windows.Forms.ToolStripMenuItem()
Me.toolStripMenuItemCountOptions = New System.Windows.Forms.ToolStripMenuItem()
Me.grpGeom = New System.Windows.Forms.GroupBox()
- Me.ucrInputPosition = New instat.ucrInputComboBox()
Me.lblPosition = New System.Windows.Forms.Label()
- Me.ucrInputLegend = New instat.ucrInputComboBox()
Me.lblLegend = New System.Windows.Forms.Label()
- Me.ucrInputShape = New instat.ucrInputComboBox()
Me.lblPointsize = New System.Windows.Forms.Label()
- Me.ucrNudPointsize = New instat.ucrNud()
Me.lblShape = New System.Windows.Forms.Label()
Me.rdoCount = New System.Windows.Forms.RadioButton()
Me.rdoPoint = New System.Windows.Forms.RadioButton()
Me.lblHeith = New System.Windows.Forms.Label()
- Me.ucrNudHeigth = New instat.ucrNud()
Me.lblWidth = New System.Windows.Forms.Label()
- Me.ucrNudWidth = New instat.ucrNud()
Me.rdoJitter = New System.Windows.Forms.RadioButton()
+ Me.lblFacetBy = New System.Windows.Forms.Label()
+ Me.ucrInputStation = New instat.ucrInputComboBox()
+ Me.ucr1stFactorReceiver = New instat.ucrReceiverSingle()
+ Me.ucrInputLegendPosition = New instat.ucrInputComboBox()
+ Me.ucrChkLegend = New instat.ucrCheck()
+ Me.ucrInputPosition = New instat.ucrInputComboBox()
+ Me.ucrInputLegend = New instat.ucrInputComboBox()
+ Me.ucrInputShape = New instat.ucrInputComboBox()
+ Me.ucrNudPointsize = New instat.ucrNud()
+ Me.ucrNudHeigth = New instat.ucrNud()
+ Me.ucrNudWidth = New instat.ucrNud()
Me.ucrPnlGeoms = New instat.UcrPanel()
Me.cmdOptions = New instat.ucrSplitButton()
Me.ucrInputSides = New instat.ucrInputComboBox()
@@ -82,13 +87,11 @@ Partial Class dlgScatterPlot
Me.ucrFactorOptionalReceiver = New instat.ucrReceiverSingle()
Me.ucrReceiverX = New instat.ucrReceiverSingle()
Me.ucrBase = New instat.ucrButtons()
- Me.ucrInputStation = New instat.ucrInputComboBox()
- Me.ucr1stFactorReceiver = New instat.ucrReceiverSingle()
- Me.lblFacetBy = New System.Windows.Forms.Label()
- Me.ucrInputLegendPosition = New instat.ucrInputComboBox()
- Me.ucrChkLegend = New instat.ucrCheck()
+ Me.ucrChkAddSidePlot = New instat.ucrCheck()
+ Me.grpAdd = New System.Windows.Forms.GroupBox()
Me.contextMenuStripOptions.SuspendLayout()
Me.grpGeom.SuspendLayout()
+ Me.grpAdd.SuspendLayout()
Me.SuspendLayout()
'
'lblFactorOptional
@@ -106,7 +109,7 @@ Partial Class dlgScatterPlot
'
Me.lblXVariable.AutoSize = True
Me.lblXVariable.ImeMode = System.Windows.Forms.ImeMode.NoControl
- Me.lblXVariable.Location = New System.Drawing.Point(347, 175)
+ Me.lblXVariable.Location = New System.Drawing.Point(349, 175)
Me.lblXVariable.Name = "lblXVariable"
Me.lblXVariable.Size = New System.Drawing.Size(58, 13)
Me.lblXVariable.TabIndex = 2
@@ -126,7 +129,7 @@ Partial Class dlgScatterPlot
'lblSize
'
Me.lblSize.AutoSize = True
- Me.lblSize.Location = New System.Drawing.Point(127, 264)
+ Me.lblSize.Location = New System.Drawing.Point(120, 43)
Me.lblSize.Name = "lblSize"
Me.lblSize.Size = New System.Drawing.Size(30, 13)
Me.lblSize.TabIndex = 12
@@ -136,7 +139,7 @@ Partial Class dlgScatterPlot
'
Me.lblSides.AutoSize = True
Me.lblSides.ImeMode = System.Windows.Forms.ImeMode.NoControl
- Me.lblSides.Location = New System.Drawing.Point(205, 264)
+ Me.lblSides.Location = New System.Drawing.Point(199, 43)
Me.lblSides.Name = "lblSides"
Me.lblSides.Size = New System.Drawing.Size(36, 13)
Me.lblSides.TabIndex = 14
@@ -208,64 +211,31 @@ Partial Class dlgScatterPlot
Me.grpGeom.Controls.Add(Me.ucrNudWidth)
Me.grpGeom.Controls.Add(Me.rdoJitter)
Me.grpGeom.Controls.Add(Me.ucrPnlGeoms)
- Me.grpGeom.Location = New System.Drawing.Point(10, 298)
+ Me.grpGeom.Location = New System.Drawing.Point(9, 337)
Me.grpGeom.Name = "grpGeom"
- Me.grpGeom.Size = New System.Drawing.Size(334, 122)
+ Me.grpGeom.Size = New System.Drawing.Size(457, 109)
Me.grpGeom.TabIndex = 23
Me.grpGeom.TabStop = False
- Me.grpGeom.Text = "Geoms"
- '
- 'ucrInputPosition
- '
- Me.ucrInputPosition.AddQuotesIfUnrecognised = True
- Me.ucrInputPosition.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink
- Me.ucrInputPosition.GetSetSelectedIndex = -1
- Me.ucrInputPosition.IsReadOnly = False
- Me.ucrInputPosition.Location = New System.Drawing.Point(240, 52)
- Me.ucrInputPosition.Name = "ucrInputPosition"
- Me.ucrInputPosition.Size = New System.Drawing.Size(83, 21)
- Me.ucrInputPosition.TabIndex = 39
+ Me.grpGeom.Text = "Geom"
'
'lblPosition
'
Me.lblPosition.AutoSize = True
- Me.lblPosition.Location = New System.Drawing.Point(192, 57)
+ Me.lblPosition.Location = New System.Drawing.Point(195, 50)
Me.lblPosition.Name = "lblPosition"
Me.lblPosition.Size = New System.Drawing.Size(47, 13)
Me.lblPosition.TabIndex = 38
Me.lblPosition.Text = "Position:"
'
- 'ucrInputLegend
- '
- Me.ucrInputLegend.AddQuotesIfUnrecognised = True
- Me.ucrInputLegend.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink
- Me.ucrInputLegend.GetSetSelectedIndex = -1
- Me.ucrInputLegend.IsReadOnly = False
- Me.ucrInputLegend.Location = New System.Drawing.Point(113, 52)
- Me.ucrInputLegend.Name = "ucrInputLegend"
- Me.ucrInputLegend.Size = New System.Drawing.Size(61, 21)
- Me.ucrInputLegend.TabIndex = 37
- '
'lblLegend
'
Me.lblLegend.AutoSize = True
- Me.lblLegend.Location = New System.Drawing.Point(59, 57)
+ Me.lblLegend.Location = New System.Drawing.Point(59, 50)
Me.lblLegend.Name = "lblLegend"
Me.lblLegend.Size = New System.Drawing.Size(46, 13)
Me.lblLegend.TabIndex = 36
Me.lblLegend.Text = "Legend:"
'
- 'ucrInputShape
- '
- Me.ucrInputShape.AddQuotesIfUnrecognised = True
- Me.ucrInputShape.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink
- Me.ucrInputShape.GetSetSelectedIndex = -1
- Me.ucrInputShape.IsReadOnly = False
- Me.ucrInputShape.Location = New System.Drawing.Point(227, 16)
- Me.ucrInputShape.Name = "ucrInputShape"
- Me.ucrInputShape.Size = New System.Drawing.Size(96, 21)
- Me.ucrInputShape.TabIndex = 35
- '
'lblPointsize
'
Me.lblPointsize.AutoSize = True
@@ -275,19 +245,6 @@ Partial Class dlgScatterPlot
Me.lblPointsize.TabIndex = 33
Me.lblPointsize.Text = "Size:"
'
- 'ucrNudPointsize
- '
- Me.ucrNudPointsize.AutoSize = True
- Me.ucrNudPointsize.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0})
- Me.ucrNudPointsize.Increment = New Decimal(New Integer() {1, 0, 0, 0})
- Me.ucrNudPointsize.Location = New System.Drawing.Point(113, 17)
- Me.ucrNudPointsize.Maximum = New Decimal(New Integer() {100, 0, 0, 0})
- Me.ucrNudPointsize.Minimum = New Decimal(New Integer() {0, 0, 0, 0})
- Me.ucrNudPointsize.Name = "ucrNudPointsize"
- Me.ucrNudPointsize.Size = New System.Drawing.Size(45, 20)
- Me.ucrNudPointsize.TabIndex = 34
- Me.ucrNudPointsize.Value = New Decimal(New Integer() {0, 0, 0, 0})
- '
'lblShape
'
Me.lblShape.AutoSize = True
@@ -300,7 +257,7 @@ Partial Class dlgScatterPlot
'rdoCount
'
Me.rdoCount.AutoSize = True
- Me.rdoCount.Location = New System.Drawing.Point(4, 55)
+ Me.rdoCount.Location = New System.Drawing.Point(4, 46)
Me.rdoCount.Name = "rdoCount"
Me.rdoCount.Size = New System.Drawing.Size(53, 17)
Me.rdoCount.TabIndex = 30
@@ -322,18 +279,139 @@ Partial Class dlgScatterPlot
'lblHeith
'
Me.lblHeith.AutoSize = True
- Me.lblHeith.Location = New System.Drawing.Point(182, 92)
+ Me.lblHeith.Location = New System.Drawing.Point(180, 73)
Me.lblHeith.Name = "lblHeith"
Me.lblHeith.Size = New System.Drawing.Size(41, 13)
Me.lblHeith.TabIndex = 27
- Me.lblHeith.Text = "Heigth:"
+ Me.lblHeith.Text = "Height:"
+ '
+ 'lblWidth
+ '
+ Me.lblWidth.AutoSize = True
+ Me.lblWidth.Location = New System.Drawing.Point(60, 73)
+ Me.lblWidth.Name = "lblWidth"
+ Me.lblWidth.Size = New System.Drawing.Size(38, 13)
+ Me.lblWidth.TabIndex = 25
+ Me.lblWidth.Text = "Width:"
+ '
+ 'rdoJitter
+ '
+ Me.rdoJitter.AutoSize = True
+ Me.rdoJitter.Location = New System.Drawing.Point(4, 71)
+ Me.rdoJitter.Name = "rdoJitter"
+ Me.rdoJitter.Size = New System.Drawing.Size(47, 17)
+ Me.rdoJitter.TabIndex = 24
+ Me.rdoJitter.TabStop = True
+ Me.rdoJitter.Text = "Jitter"
+ Me.rdoJitter.UseVisualStyleBackColor = True
+ '
+ 'lblFacetBy
+ '
+ Me.lblFacetBy.AutoSize = True
+ Me.lblFacetBy.ImeMode = System.Windows.Forms.ImeMode.NoControl
+ Me.lblFacetBy.Location = New System.Drawing.Point(208, 458)
+ Me.lblFacetBy.Name = "lblFacetBy"
+ Me.lblFacetBy.Size = New System.Drawing.Size(52, 13)
+ Me.lblFacetBy.TabIndex = 74
+ Me.lblFacetBy.Tag = ""
+ Me.lblFacetBy.Text = "Facet By:"
+ '
+ 'ucrInputStation
+ '
+ Me.ucrInputStation.AddQuotesIfUnrecognised = True
+ Me.ucrInputStation.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink
+ Me.ucrInputStation.GetSetSelectedIndex = -1
+ Me.ucrInputStation.IsReadOnly = False
+ Me.ucrInputStation.Location = New System.Drawing.Point(335, 472)
+ Me.ucrInputStation.Name = "ucrInputStation"
+ Me.ucrInputStation.Size = New System.Drawing.Size(101, 21)
+ Me.ucrInputStation.TabIndex = 76
+ '
+ 'ucr1stFactorReceiver
+ '
+ Me.ucr1stFactorReceiver.AutoSize = True
+ Me.ucr1stFactorReceiver.frmParent = Me
+ Me.ucr1stFactorReceiver.Location = New System.Drawing.Point(208, 473)
+ Me.ucr1stFactorReceiver.Margin = New System.Windows.Forms.Padding(0)
+ Me.ucr1stFactorReceiver.Name = "ucr1stFactorReceiver"
+ Me.ucr1stFactorReceiver.Selector = Nothing
+ Me.ucr1stFactorReceiver.Size = New System.Drawing.Size(121, 26)
+ Me.ucr1stFactorReceiver.strNcFilePath = ""
+ Me.ucr1stFactorReceiver.TabIndex = 75
+ Me.ucr1stFactorReceiver.ucrSelector = Nothing
+ '
+ '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(92, 472)
+ Me.ucrInputLegendPosition.Name = "ucrInputLegendPosition"
+ Me.ucrInputLegendPosition.Size = New System.Drawing.Size(112, 21)
+ Me.ucrInputLegendPosition.TabIndex = 78
+ '
+ 'ucrChkLegend
+ '
+ Me.ucrChkLegend.AutoSize = True
+ Me.ucrChkLegend.Checked = False
+ Me.ucrChkLegend.Location = New System.Drawing.Point(6, 473)
+ Me.ucrChkLegend.Name = "ucrChkLegend"
+ Me.ucrChkLegend.Size = New System.Drawing.Size(98, 24)
+ Me.ucrChkLegend.TabIndex = 77
+ '
+ 'ucrInputPosition
+ '
+ Me.ucrInputPosition.AddQuotesIfUnrecognised = True
+ Me.ucrInputPosition.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink
+ Me.ucrInputPosition.GetSetSelectedIndex = -1
+ Me.ucrInputPosition.IsReadOnly = False
+ Me.ucrInputPosition.Location = New System.Drawing.Point(240, 44)
+ Me.ucrInputPosition.Name = "ucrInputPosition"
+ Me.ucrInputPosition.Size = New System.Drawing.Size(83, 21)
+ Me.ucrInputPosition.TabIndex = 39
+ '
+ 'ucrInputLegend
+ '
+ Me.ucrInputLegend.AddQuotesIfUnrecognised = True
+ Me.ucrInputLegend.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink
+ Me.ucrInputLegend.GetSetSelectedIndex = -1
+ Me.ucrInputLegend.IsReadOnly = False
+ Me.ucrInputLegend.Location = New System.Drawing.Point(111, 44)
+ Me.ucrInputLegend.Name = "ucrInputLegend"
+ Me.ucrInputLegend.Size = New System.Drawing.Size(61, 21)
+ Me.ucrInputLegend.TabIndex = 37
+ '
+ 'ucrInputShape
+ '
+ Me.ucrInputShape.AddQuotesIfUnrecognised = True
+ Me.ucrInputShape.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink
+ Me.ucrInputShape.GetSetSelectedIndex = -1
+ Me.ucrInputShape.IsReadOnly = False
+ Me.ucrInputShape.Location = New System.Drawing.Point(227, 16)
+ Me.ucrInputShape.Name = "ucrInputShape"
+ Me.ucrInputShape.Size = New System.Drawing.Size(96, 21)
+ Me.ucrInputShape.TabIndex = 35
+ '
+ 'ucrNudPointsize
+ '
+ Me.ucrNudPointsize.AutoSize = True
+ Me.ucrNudPointsize.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0})
+ Me.ucrNudPointsize.Increment = New Decimal(New Integer() {1, 0, 0, 0})
+ Me.ucrNudPointsize.Location = New System.Drawing.Point(113, 17)
+ Me.ucrNudPointsize.Maximum = New Decimal(New Integer() {100, 0, 0, 0})
+ Me.ucrNudPointsize.Minimum = New Decimal(New Integer() {0, 0, 0, 0})
+ Me.ucrNudPointsize.Name = "ucrNudPointsize"
+ Me.ucrNudPointsize.Size = New System.Drawing.Size(45, 20)
+ Me.ucrNudPointsize.TabIndex = 34
+ Me.ucrNudPointsize.Value = New Decimal(New Integer() {0, 0, 0, 0})
'
'ucrNudHeigth
'
Me.ucrNudHeigth.AutoSize = True
Me.ucrNudHeigth.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0})
Me.ucrNudHeigth.Increment = New Decimal(New Integer() {1, 0, 0, 0})
- Me.ucrNudHeigth.Location = New System.Drawing.Point(223, 90)
+ Me.ucrNudHeigth.Location = New System.Drawing.Point(227, 71)
Me.ucrNudHeigth.Maximum = New Decimal(New Integer() {100, 0, 0, 0})
Me.ucrNudHeigth.Minimum = New Decimal(New Integer() {0, 0, 0, 0})
Me.ucrNudHeigth.Name = "ucrNudHeigth"
@@ -341,21 +419,12 @@ Partial Class dlgScatterPlot
Me.ucrNudHeigth.TabIndex = 28
Me.ucrNudHeigth.Value = New Decimal(New Integer() {0, 0, 0, 0})
'
- 'lblWidth
- '
- Me.lblWidth.AutoSize = True
- Me.lblWidth.Location = New System.Drawing.Point(59, 92)
- Me.lblWidth.Name = "lblWidth"
- Me.lblWidth.Size = New System.Drawing.Size(38, 13)
- Me.lblWidth.TabIndex = 25
- Me.lblWidth.Text = "Width:"
- '
'ucrNudWidth
'
Me.ucrNudWidth.AutoSize = True
Me.ucrNudWidth.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0})
Me.ucrNudWidth.Increment = New Decimal(New Integer() {1, 0, 0, 0})
- Me.ucrNudWidth.Location = New System.Drawing.Point(113, 90)
+ Me.ucrNudWidth.Location = New System.Drawing.Point(113, 71)
Me.ucrNudWidth.Maximum = New Decimal(New Integer() {100, 0, 0, 0})
Me.ucrNudWidth.Minimum = New Decimal(New Integer() {0, 0, 0, 0})
Me.ucrNudWidth.Name = "ucrNudWidth"
@@ -363,23 +432,12 @@ Partial Class dlgScatterPlot
Me.ucrNudWidth.TabIndex = 26
Me.ucrNudWidth.Value = New Decimal(New Integer() {0, 0, 0, 0})
'
- 'rdoJitter
- '
- Me.rdoJitter.AutoSize = True
- Me.rdoJitter.Location = New System.Drawing.Point(4, 90)
- Me.rdoJitter.Name = "rdoJitter"
- Me.rdoJitter.Size = New System.Drawing.Size(47, 17)
- Me.rdoJitter.TabIndex = 24
- Me.rdoJitter.TabStop = True
- Me.rdoJitter.Text = "Jitter"
- Me.rdoJitter.UseVisualStyleBackColor = True
- '
'ucrPnlGeoms
'
Me.ucrPnlGeoms.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink
Me.ucrPnlGeoms.Location = New System.Drawing.Point(2, 14)
Me.ucrPnlGeoms.Name = "ucrPnlGeoms"
- Me.ucrPnlGeoms.Size = New System.Drawing.Size(321, 102)
+ Me.ucrPnlGeoms.Size = New System.Drawing.Size(321, 89)
Me.ucrPnlGeoms.TabIndex = 24
'
'cmdOptions
@@ -401,7 +459,7 @@ Partial Class dlgScatterPlot
Me.ucrInputSides.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink
Me.ucrInputSides.GetSetSelectedIndex = -1
Me.ucrInputSides.IsReadOnly = False
- Me.ucrInputSides.Location = New System.Drawing.Point(239, 261)
+ Me.ucrInputSides.Location = New System.Drawing.Point(236, 40)
Me.ucrInputSides.Name = "ucrInputSides"
Me.ucrInputSides.Size = New System.Drawing.Size(94, 21)
Me.ucrInputSides.TabIndex = 15
@@ -411,7 +469,7 @@ Partial Class dlgScatterPlot
Me.ucrNudSize.AutoSize = True
Me.ucrNudSize.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0})
Me.ucrNudSize.Increment = New Decimal(New Integer() {1, 0, 0, 0})
- Me.ucrNudSize.Location = New System.Drawing.Point(157, 262)
+ Me.ucrNudSize.Location = New System.Drawing.Point(150, 41)
Me.ucrNudSize.Maximum = New Decimal(New Integer() {100, 0, 0, 0})
Me.ucrNudSize.Minimum = New Decimal(New Integer() {0, 0, 0, 0})
Me.ucrNudSize.Name = "ucrNudSize"
@@ -423,16 +481,16 @@ Partial Class dlgScatterPlot
'
Me.ucrChkAddRugPlot.AutoSize = True
Me.ucrChkAddRugPlot.Checked = False
- Me.ucrChkAddRugPlot.Location = New System.Drawing.Point(11, 262)
+ Me.ucrChkAddRugPlot.Location = New System.Drawing.Point(6, 38)
Me.ucrChkAddRugPlot.Name = "ucrChkAddRugPlot"
- Me.ucrChkAddRugPlot.Size = New System.Drawing.Size(134, 23)
+ Me.ucrChkAddRugPlot.Size = New System.Drawing.Size(108, 23)
Me.ucrChkAddRugPlot.TabIndex = 11
'
'ucrReceiverLabel
'
Me.ucrReceiverLabel.AutoSize = True
Me.ucrReceiverLabel.frmParent = Me
- Me.ucrReceiverLabel.Location = New System.Drawing.Point(347, 289)
+ Me.ucrReceiverLabel.Location = New System.Drawing.Point(352, 286)
Me.ucrReceiverLabel.Margin = New System.Windows.Forms.Padding(0)
Me.ucrReceiverLabel.Name = "ucrReceiverLabel"
Me.ucrReceiverLabel.Selector = Nothing
@@ -445,7 +503,7 @@ Partial Class dlgScatterPlot
'
Me.ucrChkWithSE.AutoSize = True
Me.ucrChkWithSE.Checked = False
- Me.ucrChkWithSE.Location = New System.Drawing.Point(189, 233)
+ Me.ucrChkWithSE.Location = New System.Drawing.Point(186, 17)
Me.ucrChkWithSE.Name = "ucrChkWithSE"
Me.ucrChkWithSE.Size = New System.Drawing.Size(133, 23)
Me.ucrChkWithSE.TabIndex = 10
@@ -454,7 +512,7 @@ Partial Class dlgScatterPlot
'
Me.ucrChkLineofBestFit.AutoSize = True
Me.ucrChkLineofBestFit.Checked = False
- Me.ucrChkLineofBestFit.Location = New System.Drawing.Point(11, 233)
+ Me.ucrChkLineofBestFit.Location = New System.Drawing.Point(6, 16)
Me.ucrChkLineofBestFit.Name = "ucrChkLineofBestFit"
Me.ucrChkLineofBestFit.Size = New System.Drawing.Size(173, 24)
Me.ucrChkLineofBestFit.TabIndex = 9
@@ -462,7 +520,7 @@ Partial Class dlgScatterPlot
'ucrSaveScatterPlot
'
Me.ucrSaveScatterPlot.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink
- Me.ucrSaveScatterPlot.Location = New System.Drawing.Point(10, 473)
+ Me.ucrSaveScatterPlot.Location = New System.Drawing.Point(6, 505)
Me.ucrSaveScatterPlot.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
Me.ucrSaveScatterPlot.Name = "ucrSaveScatterPlot"
Me.ucrSaveScatterPlot.Size = New System.Drawing.Size(312, 24)
@@ -497,7 +555,7 @@ Partial Class dlgScatterPlot
'
Me.ucrFactorOptionalReceiver.AutoSize = True
Me.ucrFactorOptionalReceiver.frmParent = Me
- Me.ucrFactorOptionalReceiver.Location = New System.Drawing.Point(347, 237)
+ Me.ucrFactorOptionalReceiver.Location = New System.Drawing.Point(352, 237)
Me.ucrFactorOptionalReceiver.Margin = New System.Windows.Forms.Padding(0)
Me.ucrFactorOptionalReceiver.Name = "ucrFactorOptionalReceiver"
Me.ucrFactorOptionalReceiver.Selector = Nothing
@@ -510,7 +568,7 @@ Partial Class dlgScatterPlot
'
Me.ucrReceiverX.AutoSize = True
Me.ucrReceiverX.frmParent = Me
- Me.ucrReceiverX.Location = New System.Drawing.Point(347, 188)
+ Me.ucrReceiverX.Location = New System.Drawing.Point(352, 188)
Me.ucrReceiverX.Margin = New System.Windows.Forms.Padding(0)
Me.ucrReceiverX.Name = "ucrReceiverX"
Me.ucrReceiverX.Selector = Nothing
@@ -523,72 +581,44 @@ Partial Class dlgScatterPlot
'
Me.ucrBase.AutoSize = True
Me.ucrBase.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink
- Me.ucrBase.Location = New System.Drawing.Point(10, 504)
+ Me.ucrBase.Location = New System.Drawing.Point(28, 537)
Me.ucrBase.Name = "ucrBase"
Me.ucrBase.Size = New System.Drawing.Size(408, 52)
Me.ucrBase.TabIndex = 17
'
- 'ucrInputStation
- '
- Me.ucrInputStation.AddQuotesIfUnrecognised = True
- Me.ucrInputStation.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink
- Me.ucrInputStation.GetSetSelectedIndex = -1
- Me.ucrInputStation.IsReadOnly = False
- Me.ucrInputStation.Location = New System.Drawing.Point(339, 440)
- Me.ucrInputStation.Name = "ucrInputStation"
- Me.ucrInputStation.Size = New System.Drawing.Size(101, 21)
- Me.ucrInputStation.TabIndex = 76
- '
- 'ucr1stFactorReceiver
- '
- Me.ucr1stFactorReceiver.AutoSize = True
- Me.ucr1stFactorReceiver.frmParent = Me
- Me.ucr1stFactorReceiver.Location = New System.Drawing.Point(212, 441)
- Me.ucr1stFactorReceiver.Margin = New System.Windows.Forms.Padding(0)
- Me.ucr1stFactorReceiver.Name = "ucr1stFactorReceiver"
- Me.ucr1stFactorReceiver.Selector = Nothing
- Me.ucr1stFactorReceiver.Size = New System.Drawing.Size(121, 26)
- Me.ucr1stFactorReceiver.strNcFilePath = ""
- Me.ucr1stFactorReceiver.TabIndex = 75
- Me.ucr1stFactorReceiver.ucrSelector = Nothing
- '
- 'lblFacetBy
- '
- Me.lblFacetBy.AutoSize = True
- Me.lblFacetBy.ImeMode = System.Windows.Forms.ImeMode.NoControl
- Me.lblFacetBy.Location = New System.Drawing.Point(212, 426)
- Me.lblFacetBy.Name = "lblFacetBy"
- Me.lblFacetBy.Size = New System.Drawing.Size(52, 13)
- Me.lblFacetBy.TabIndex = 74
- Me.lblFacetBy.Tag = ""
- Me.lblFacetBy.Text = "Facet By:"
- '
- '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(96, 440)
- Me.ucrInputLegendPosition.Name = "ucrInputLegendPosition"
- Me.ucrInputLegendPosition.Size = New System.Drawing.Size(112, 21)
- Me.ucrInputLegendPosition.TabIndex = 78
- '
- 'ucrChkLegend
- '
- Me.ucrChkLegend.AutoSize = True
- Me.ucrChkLegend.Checked = False
- Me.ucrChkLegend.Location = New System.Drawing.Point(10, 441)
- Me.ucrChkLegend.Name = "ucrChkLegend"
- Me.ucrChkLegend.Size = New System.Drawing.Size(98, 24)
- Me.ucrChkLegend.TabIndex = 77
+ 'ucrChkAddSidePlot
+ '
+ Me.ucrChkAddSidePlot.AutoSize = True
+ Me.ucrChkAddSidePlot.Checked = False
+ Me.ucrChkAddSidePlot.Location = New System.Drawing.Point(6, 67)
+ Me.ucrChkAddSidePlot.Name = "ucrChkAddSidePlot"
+ Me.ucrChkAddSidePlot.Size = New System.Drawing.Size(134, 23)
+ Me.ucrChkAddSidePlot.TabIndex = 80
+ '
+ 'grpAdd
+ '
+ Me.grpAdd.Controls.Add(Me.ucrChkLineofBestFit)
+ Me.grpAdd.Controls.Add(Me.ucrChkAddSidePlot)
+ Me.grpAdd.Controls.Add(Me.ucrChkAddRugPlot)
+ Me.grpAdd.Controls.Add(Me.lblSides)
+ Me.grpAdd.Controls.Add(Me.ucrNudSize)
+ Me.grpAdd.Controls.Add(Me.lblSize)
+ Me.grpAdd.Controls.Add(Me.ucrInputSides)
+ Me.grpAdd.Controls.Add(Me.ucrChkWithSE)
+ Me.grpAdd.Location = New System.Drawing.Point(9, 227)
+ Me.grpAdd.Name = "grpAdd"
+ Me.grpAdd.Size = New System.Drawing.Size(336, 95)
+ Me.grpAdd.TabIndex = 81
+ Me.grpAdd.TabStop = False
+ Me.grpAdd.Text = "Add"
'
'dlgScatterPlot
'
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(469, 558)
+ Me.ClientSize = New System.Drawing.Size(476, 595)
+ Me.Controls.Add(Me.grpAdd)
Me.Controls.Add(Me.ucrInputStation)
Me.Controls.Add(Me.ucr1stFactorReceiver)
Me.Controls.Add(Me.lblFacetBy)
@@ -596,15 +626,8 @@ Partial Class dlgScatterPlot
Me.Controls.Add(Me.ucrChkLegend)
Me.Controls.Add(Me.grpGeom)
Me.Controls.Add(Me.cmdOptions)
- Me.Controls.Add(Me.ucrInputSides)
- Me.Controls.Add(Me.lblSides)
- Me.Controls.Add(Me.lblSize)
- Me.Controls.Add(Me.ucrNudSize)
- Me.Controls.Add(Me.ucrChkAddRugPlot)
Me.Controls.Add(Me.lblVariable)
Me.Controls.Add(Me.ucrReceiverLabel)
- Me.Controls.Add(Me.ucrChkWithSE)
- Me.Controls.Add(Me.ucrChkLineofBestFit)
Me.Controls.Add(Me.ucrSaveScatterPlot)
Me.Controls.Add(Me.ucrSelectorForScatter)
Me.Controls.Add(Me.ucrVariablesAsFactorForScatter)
@@ -622,6 +645,8 @@ Partial Class dlgScatterPlot
Me.contextMenuStripOptions.ResumeLayout(False)
Me.grpGeom.ResumeLayout(False)
Me.grpGeom.PerformLayout()
+ Me.grpAdd.ResumeLayout(False)
+ Me.grpAdd.PerformLayout()
Me.ResumeLayout(False)
Me.PerformLayout()
@@ -675,4 +700,6 @@ Partial Class dlgScatterPlot
Friend WithEvents lblFacetBy As Label
Friend WithEvents ucrInputLegendPosition As ucrInputComboBox
Friend WithEvents ucrChkLegend As ucrCheck
+ Friend WithEvents ucrChkAddSidePlot As ucrCheck
+ Friend WithEvents grpAdd As GroupBox
End Class
diff --git a/instat/dlgScatterPlot.vb b/instat/dlgScatterPlot.vb
index d2bf9df7a1d..ed138c90efe 100644
--- a/instat/dlgScatterPlot.vb
+++ b/instat/dlgScatterPlot.vb
@@ -126,7 +126,7 @@ Public Class dlgScatterPlot
ucrFactorOptionalReceiver.Selector = ucrSelectorForScatter
ucrFactorOptionalReceiver.strSelectorHeading = "Variables"
- ucrChkLineofBestFit.SetText("Add Line of Best Fit")
+ ucrChkLineofBestFit.SetText("Line of Best Fit")
ucrChkLineofBestFit.AddParameterPresentCondition(True, "geom_smooth")
ucrChkLineofBestFit.AddParameterPresentCondition(False, "geom_smooth", False)
ucrChkLineofBestFit.AddToLinkedControls(ucrChkWithSE, {True}, bNewLinkedHideIfParameterMissing:=True)
@@ -136,11 +136,14 @@ Public Class dlgScatterPlot
ucrChkWithSE.SetValuesCheckedAndUnchecked("TRUE", "FALSE")
ucrChkWithSE.SetRDefault("TRUE")
- ucrChkAddRugPlot.SetText("Add Rug Plot")
+ ucrChkAddRugPlot.SetText("Rug Plot")
ucrChkAddRugPlot.AddParameterPresentCondition(True, "geom_rug")
ucrChkAddRugPlot.AddParameterPresentCondition(False, "geom_rug", False)
ucrChkAddRugPlot.AddToLinkedControls({ucrNudSize, ucrInputSides}, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True)
+ ucrChkAddSidePlot.SetText("Side Plot")
+ ucrChkAddSidePlot.Enabled = False
+
ucrPnlGeoms.AddRadioButton(rdoJitter)
ucrPnlGeoms.AddRadioButton(rdoPoint)
ucrPnlGeoms.AddRadioButton(rdoCount)
diff --git a/instat/instat.vbproj b/instat/instat.vbproj
index f6a8168930f..510c222dca7 100644
--- a/instat/instat.vbproj
+++ b/instat/instat.vbproj
@@ -152,8 +152,8 @@
-
- ..\packages\R.NET.1.8.2\lib\netstandard2.0\RDotNet.dll
+
+ ..\packages\R.NET.1.9.0\lib\netstandard2.0\RDotNet.dll
..\packages\RInsightF461.0.0.10\lib\net461\RInsightF461.dll
diff --git a/instat/packages.config b/instat/packages.config
index 30419269a79..04fd4772f43 100644
--- a/instat/packages.config
+++ b/instat/packages.config
@@ -10,7 +10,7 @@
-
+
diff --git a/instat/static/InstatObject/R/install_packages.R b/instat/static/InstatObject/R/install_packages.R
index 5ecfb1f0c10..2b2530cb11a 100644
--- a/instat/static/InstatObject/R/install_packages.R
+++ b/instat/static/InstatObject/R/install_packages.R
@@ -177,6 +177,7 @@ pkgs <-
# Data and Code Behind the Stories and Interactives at 'FiveThirtyEight'
"fivethirtyeight",
"CGPfunctions",
+ "ggside",
"collapse"
)
pkgList <- pkgDep(pkgs, type="win.binary", repos = "https://cran.rstudio.com/", suggests = FALSE, includeBasePkgs = FALSE, Rversion = r_version)
diff --git a/instat/ucrScript.vb b/instat/ucrScript.vb
index 55e2630a4ef..ebfb3d73b3e 100644
--- a/instat/ucrScript.vb
+++ b/instat/ucrScript.vb
@@ -227,9 +227,10 @@ Public Class ucrScript
If dlgSave.ShowDialog() = DialogResult.OK Then
Try
File.WriteAllText(dlgSave.FileName, If(bIsLog, clsScriptLog.Text, clsScriptActive.Text))
+ strInitialDirectory = Path.GetDirectoryName(dlgSave.FileName)
bIsTextChanged = False
TabControl.SelectedTab.Text = System.IO.Path.GetFileNameWithoutExtension(dlgSave.FileName)
- frmMain.clsRecentItems.addToMenu(Replace(Path.Combine(Path.GetFullPath(FileIO.SpecialDirectories.MyDocuments), System.IO.Path.GetFileName(dlgSave.FileName)), "\", "/"))
+ frmMain.clsRecentItems.addToMenu(Replace(Path.Combine(Path.GetFullPath(strInitialDirectory), System.IO.Path.GetFileName(dlgSave.FileName)), "\", "/"))
frmMain.bDataSaved = True
If bIsLog Then
strInitialDirectoryLog = Path.GetDirectoryName(dlgSave.FileName)
@@ -547,7 +548,7 @@ Public Class ucrScript
strInitialDirectory = Path.GetDirectoryName(dlgLoad.FileName)
bIsTextChanged = False
clsRScript = Nothing
- frmMain.clsRecentItems.addToMenu(Replace(Path.Combine(Path.GetFullPath(FileIO.SpecialDirectories.MyDocuments), System.IO.Path.GetFileName(dlgLoad.FileName)), "\", "/"))
+ frmMain.clsRecentItems.addToMenu(Replace(Path.Combine(Path.GetFullPath(strInitialDirectory), System.IO.Path.GetFileName(dlgLoad.FileName)), "\", "/"))
frmMain.bDataSaved = True
Catch
MsgBox("Could not load the script from file." & Environment.NewLine &
diff --git a/packages/R.NET.1.8.2/lib/netstandard2.0/RDotNet.dll b/packages/R.NET.1.8.2/lib/netstandard2.0/RDotNet.dll
deleted file mode 100644
index 3e778f6468f..00000000000
Binary files a/packages/R.NET.1.8.2/lib/netstandard2.0/RDotNet.dll and /dev/null differ
diff --git a/packages/R.NET.1.8.2/.signature.p7s b/packages/R.NET.1.9.0/.signature.p7s
similarity index 84%
rename from packages/R.NET.1.8.2/.signature.p7s
rename to packages/R.NET.1.9.0/.signature.p7s
index 3e16a80a676..fae0f795f2b 100644
Binary files a/packages/R.NET.1.8.2/.signature.p7s and b/packages/R.NET.1.9.0/.signature.p7s differ
diff --git a/packages/R.NET.1.9.0/lib/netstandard2.0/RDotNet.dll b/packages/R.NET.1.9.0/lib/netstandard2.0/RDotNet.dll
new file mode 100644
index 00000000000..8041a764046
Binary files /dev/null and b/packages/R.NET.1.9.0/lib/netstandard2.0/RDotNet.dll differ
diff --git a/packages/R.NET.1.8.2/lib/netstandard2.0/RDotNet.xml b/packages/R.NET.1.9.0/lib/netstandard2.0/RDotNet.xml
similarity index 99%
rename from packages/R.NET.1.8.2/lib/netstandard2.0/RDotNet.xml
rename to packages/R.NET.1.9.0/lib/netstandard2.0/RDotNet.xml
index 6cc3bf8ac8a..06e8d5e95dd 100644
--- a/packages/R.NET.1.8.2/lib/netstandard2.0/RDotNet.xml
+++ b/packages/R.NET.1.9.0/lib/netstandard2.0/RDotNet.xml
@@ -2397,6 +2397,16 @@
Gets a log of the changes made to environment variables via the NativeUtility
+
+
+ Gets the path to the folder containing R.dll that this instance found when setting environment variables
+
+
+
+
+ Gets the path to the R home directory that this instance found when setting environment variables
+
+
Sets the PATH to the R binaries and R_HOME environment variables if needed.