diff --git a/instat/DlgDefineClimaticData.Designer.vb b/instat/DlgDefineClimaticData.Designer.vb index cfd7f27a21e..d50f0fef080 100644 --- a/instat/DlgDefineClimaticData.Designer.vb +++ b/instat/DlgDefineClimaticData.Designer.vb @@ -38,11 +38,7 @@ Partial Class DlgDefineClimaticData 'Do not modify it using the code editor. Private Sub InitializeComponent() - Me.ucrChkLinkedMetaData = New instat.ucrCheck() - Me.ucrSelectorLinkedDataFrame = New instat.ucrSelectorByDataFrameAddRemove() - Me.ucrInputCheckInput = New instat.ucrInputTextBox() Me.cmdCheckUnique = New System.Windows.Forms.Button() - Me.ucrSelectorDefineClimaticData = New instat.ucrSelectorByDataFrameAddRemove() Me.lblStationName = New System.Windows.Forms.Label() Me.lblDOY = New System.Windows.Forms.Label() Me.lblLongitude = New System.Windows.Forms.Label() @@ -53,7 +49,6 @@ Partial Class DlgDefineClimaticData Me.ucrReceiverLongitude = New instat.ucrReceiverSingle() Me.ucrReceiverLatitude = New instat.ucrReceiverSingle() Me.ucrReceiverAltitude = New instat.ucrReceiverSingle() - Me.ucrBase = New instat.ucrButtons() Me.grpDateTime = New System.Windows.Forms.GroupBox() Me.ucrReceiverYear = New instat.ucrReceiverSingle() Me.lblDate = New System.Windows.Forms.Label() @@ -68,11 +63,11 @@ Partial Class DlgDefineClimaticData Me.Label2 = New System.Windows.Forms.Label() Me.Label3 = New System.Windows.Forms.Label() Me.Label4 = New System.Windows.Forms.Label() + Me.grpMeta = New System.Windows.Forms.GroupBox() Me.ucrReceiverStationMeta = New instat.ucrReceiverSingle() Me.ucrReceiverLonMeta = New instat.ucrReceiverSingle() Me.ucrReceiverLatMeta = New instat.ucrReceiverSingle() Me.ucrReceiverAltMeta = New instat.ucrReceiverSingle() - Me.grpMeta = New System.Windows.Forms.GroupBox() Me.lblRain = New System.Windows.Forms.Label() Me.grpElements = New System.Windows.Forms.GroupBox() Me.ucrReceiverMaxRH = New instat.ucrReceiverSingle() @@ -94,46 +89,17 @@ Partial Class DlgDefineClimaticData Me.ucrReceiverMinTemp = New instat.ucrReceiverSingle() Me.lblWindSpeed = New System.Windows.Forms.Label() Me.lblWindDirection = New System.Windows.Forms.Label() + Me.ucrChkLinkedMetaData = New instat.ucrCheck() + Me.ucrSelectorLinkedDataFrame = New instat.ucrSelectorByDataFrameAddRemove() + Me.ucrInputCheckInput = New instat.ucrInputTextBox() + Me.ucrSelectorDefineClimaticData = New instat.ucrSelectorByDataFrameAddRemove() + Me.ucrBase = New instat.ucrButtons() Me.grpStation.SuspendLayout() Me.grpDateTime.SuspendLayout() Me.grpMeta.SuspendLayout() Me.grpElements.SuspendLayout() Me.SuspendLayout() ' - 'ucrChkLinkedMetaData - ' - Me.ucrChkLinkedMetaData.AutoSize = True - Me.ucrChkLinkedMetaData.Checked = False - Me.ucrChkLinkedMetaData.Location = New System.Drawing.Point(16, 204) - Me.ucrChkLinkedMetaData.Margin = New System.Windows.Forms.Padding(6) - Me.ucrChkLinkedMetaData.Name = "ucrChkLinkedMetaData" - Me.ucrChkLinkedMetaData.Size = New System.Drawing.Size(195, 23) - Me.ucrChkLinkedMetaData.TabIndex = 21 - ' - 'ucrSelectorLinkedDataFrame - ' - Me.ucrSelectorLinkedDataFrame.AutoSize = True - Me.ucrSelectorLinkedDataFrame.bDropUnusedFilterLevels = False - Me.ucrSelectorLinkedDataFrame.bShowHiddenColumns = False - Me.ucrSelectorLinkedDataFrame.bUseCurrentFilter = True - Me.ucrSelectorLinkedDataFrame.Location = New System.Drawing.Point(16, 224) - Me.ucrSelectorLinkedDataFrame.Margin = New System.Windows.Forms.Padding(0) - Me.ucrSelectorLinkedDataFrame.Name = "ucrSelectorLinkedDataFrame" - Me.ucrSelectorLinkedDataFrame.Size = New System.Drawing.Size(213, 183) - Me.ucrSelectorLinkedDataFrame.TabIndex = 20 - ' - 'ucrInputCheckInput - ' - Me.ucrInputCheckInput.AddQuotesIfUnrecognised = True - Me.ucrInputCheckInput.AutoSize = True - Me.ucrInputCheckInput.IsMultiline = False - Me.ucrInputCheckInput.IsReadOnly = False - Me.ucrInputCheckInput.Location = New System.Drawing.Point(147, 439) - Me.ucrInputCheckInput.Margin = New System.Windows.Forms.Padding(9) - Me.ucrInputCheckInput.Name = "ucrInputCheckInput" - Me.ucrInputCheckInput.Size = New System.Drawing.Size(253, 21) - Me.ucrInputCheckInput.TabIndex = 18 - ' 'cmdCheckUnique ' Me.cmdCheckUnique.ImeMode = System.Windows.Forms.ImeMode.NoControl @@ -144,18 +110,6 @@ Partial Class DlgDefineClimaticData Me.cmdCheckUnique.Text = "Check Duplicates" Me.cmdCheckUnique.UseVisualStyleBackColor = True ' - 'ucrSelectorDefineClimaticData - ' - Me.ucrSelectorDefineClimaticData.AutoSize = True - Me.ucrSelectorDefineClimaticData.bDropUnusedFilterLevels = False - Me.ucrSelectorDefineClimaticData.bShowHiddenColumns = False - Me.ucrSelectorDefineClimaticData.bUseCurrentFilter = True - Me.ucrSelectorDefineClimaticData.Location = New System.Drawing.Point(16, 9) - Me.ucrSelectorDefineClimaticData.Margin = New System.Windows.Forms.Padding(0) - Me.ucrSelectorDefineClimaticData.Name = "ucrSelectorDefineClimaticData" - Me.ucrSelectorDefineClimaticData.Size = New System.Drawing.Size(213, 183) - Me.ucrSelectorDefineClimaticData.TabIndex = 13 - ' 'lblStationName ' Me.lblStationName.AutoSize = True @@ -218,7 +172,7 @@ Partial Class DlgDefineClimaticData Me.grpStation.Controls.Add(Me.ucrReceiverAltitude) Me.grpStation.Location = New System.Drawing.Point(242, 234) Me.grpStation.Name = "grpStation" - Me.grpStation.Size = New System.Drawing.Size(112, 173) + Me.grpStation.Size = New System.Drawing.Size(126, 173) Me.grpStation.TabIndex = 14 Me.grpStation.TabStop = False Me.grpStation.Tag = "" @@ -232,9 +186,9 @@ Partial Class DlgDefineClimaticData Me.ucrReceiverStation.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverStation.Name = "ucrReceiverStation" Me.ucrReceiverStation.Selector = Nothing - Me.ucrReceiverStation.Size = New System.Drawing.Size(93, 20) + Me.ucrReceiverStation.Size = New System.Drawing.Size(100, 20) Me.ucrReceiverStation.strNcFilePath = "" - Me.ucrReceiverStation.TabIndex = 8 + Me.ucrReceiverStation.TabIndex = 6 Me.ucrReceiverStation.ucrSelector = Nothing ' 'ucrReceiverLongitude @@ -245,9 +199,9 @@ Partial Class DlgDefineClimaticData Me.ucrReceiverLongitude.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverLongitude.Name = "ucrReceiverLongitude" Me.ucrReceiverLongitude.Selector = Nothing - Me.ucrReceiverLongitude.Size = New System.Drawing.Size(93, 20) + Me.ucrReceiverLongitude.Size = New System.Drawing.Size(100, 20) Me.ucrReceiverLongitude.strNcFilePath = "" - Me.ucrReceiverLongitude.TabIndex = 10 + Me.ucrReceiverLongitude.TabIndex = 8 Me.ucrReceiverLongitude.ucrSelector = Nothing ' 'ucrReceiverLatitude @@ -258,9 +212,9 @@ Partial Class DlgDefineClimaticData Me.ucrReceiverLatitude.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverLatitude.Name = "ucrReceiverLatitude" Me.ucrReceiverLatitude.Selector = Nothing - Me.ucrReceiverLatitude.Size = New System.Drawing.Size(93, 20) + Me.ucrReceiverLatitude.Size = New System.Drawing.Size(100, 20) Me.ucrReceiverLatitude.strNcFilePath = "" - Me.ucrReceiverLatitude.TabIndex = 9 + Me.ucrReceiverLatitude.TabIndex = 7 Me.ucrReceiverLatitude.ucrSelector = Nothing ' 'ucrReceiverAltitude @@ -271,21 +225,11 @@ Partial Class DlgDefineClimaticData Me.ucrReceiverAltitude.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverAltitude.Name = "ucrReceiverAltitude" Me.ucrReceiverAltitude.Selector = Nothing - Me.ucrReceiverAltitude.Size = New System.Drawing.Size(93, 20) + Me.ucrReceiverAltitude.Size = New System.Drawing.Size(100, 20) Me.ucrReceiverAltitude.strNcFilePath = "" - Me.ucrReceiverAltitude.TabIndex = 11 + Me.ucrReceiverAltitude.TabIndex = 9 Me.ucrReceiverAltitude.ucrSelector = Nothing ' - 'ucrBase - ' - Me.ucrBase.AutoSize = True - Me.ucrBase.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrBase.Location = New System.Drawing.Point(6, 476) - Me.ucrBase.Margin = New System.Windows.Forms.Padding(4) - Me.ucrBase.Name = "ucrBase" - Me.ucrBase.Size = New System.Drawing.Size(408, 52) - Me.ucrBase.TabIndex = 19 - ' 'grpDateTime ' Me.grpDateTime.Controls.Add(Me.lblDOY) @@ -298,7 +242,7 @@ Partial Class DlgDefineClimaticData Me.grpDateTime.Controls.Add(Me.ucrReceiverMonth) Me.grpDateTime.Controls.Add(Me.ucrReceiverDay) Me.grpDateTime.Controls.Add(Me.lblDay) - Me.grpDateTime.Location = New System.Drawing.Point(372, 234) + Me.grpDateTime.Location = New System.Drawing.Point(242, 12) Me.grpDateTime.Name = "grpDateTime" Me.grpDateTime.Size = New System.Drawing.Size(126, 196) Me.grpDateTime.TabIndex = 15 @@ -316,7 +260,7 @@ Partial Class DlgDefineClimaticData Me.ucrReceiverYear.Selector = Nothing Me.ucrReceiverYear.Size = New System.Drawing.Size(98, 20) Me.ucrReceiverYear.strNcFilePath = "" - Me.ucrReceiverYear.TabIndex = 3 + Me.ucrReceiverYear.TabIndex = 2 Me.ucrReceiverYear.ucrSelector = Nothing ' 'lblDate @@ -349,7 +293,7 @@ Partial Class DlgDefineClimaticData Me.ucrReceiverDOY.Selector = Nothing Me.ucrReceiverDOY.Size = New System.Drawing.Size(98, 20) Me.ucrReceiverDOY.strNcFilePath = "" - Me.ucrReceiverDOY.TabIndex = 9 + Me.ucrReceiverDOY.TabIndex = 5 Me.ucrReceiverDOY.ucrSelector = Nothing ' 'lblYear @@ -385,7 +329,7 @@ Partial Class DlgDefineClimaticData Me.ucrReceiverMonth.Selector = Nothing Me.ucrReceiverMonth.Size = New System.Drawing.Size(98, 20) Me.ucrReceiverMonth.strNcFilePath = "" - Me.ucrReceiverMonth.TabIndex = 5 + Me.ucrReceiverMonth.TabIndex = 3 Me.ucrReceiverMonth.ucrSelector = Nothing ' 'ucrReceiverDay @@ -398,7 +342,7 @@ Partial Class DlgDefineClimaticData Me.ucrReceiverDay.Selector = Nothing Me.ucrReceiverDay.Size = New System.Drawing.Size(98, 20) Me.ucrReceiverDay.strNcFilePath = "" - Me.ucrReceiverDay.TabIndex = 7 + Me.ucrReceiverDay.TabIndex = 4 Me.ucrReceiverDay.ucrSelector = Nothing ' 'lblDay @@ -451,6 +395,24 @@ Partial Class DlgDefineClimaticData Me.Label4.TabIndex = 0 Me.Label4.Text = "Name:" ' + 'grpMeta + ' + Me.grpMeta.Controls.Add(Me.Label1) + Me.grpMeta.Controls.Add(Me.Label2) + Me.grpMeta.Controls.Add(Me.Label3) + Me.grpMeta.Controls.Add(Me.Label4) + Me.grpMeta.Controls.Add(Me.ucrReceiverStationMeta) + Me.grpMeta.Controls.Add(Me.ucrReceiverLonMeta) + Me.grpMeta.Controls.Add(Me.ucrReceiverLatMeta) + Me.grpMeta.Controls.Add(Me.ucrReceiverAltMeta) + Me.grpMeta.Location = New System.Drawing.Point(242, 234) + Me.grpMeta.Name = "grpMeta" + Me.grpMeta.Size = New System.Drawing.Size(112, 173) + Me.grpMeta.TabIndex = 22 + Me.grpMeta.TabStop = False + Me.grpMeta.Tag = "" + Me.grpMeta.Text = "Station" + ' 'ucrReceiverStationMeta ' Me.ucrReceiverStationMeta.AutoSize = True @@ -503,24 +465,6 @@ Partial Class DlgDefineClimaticData Me.ucrReceiverAltMeta.TabIndex = 11 Me.ucrReceiverAltMeta.ucrSelector = Nothing ' - 'grpMeta - ' - Me.grpMeta.Controls.Add(Me.Label1) - Me.grpMeta.Controls.Add(Me.Label2) - Me.grpMeta.Controls.Add(Me.Label3) - Me.grpMeta.Controls.Add(Me.Label4) - Me.grpMeta.Controls.Add(Me.ucrReceiverStationMeta) - Me.grpMeta.Controls.Add(Me.ucrReceiverLonMeta) - Me.grpMeta.Controls.Add(Me.ucrReceiverLatMeta) - Me.grpMeta.Controls.Add(Me.ucrReceiverAltMeta) - Me.grpMeta.Location = New System.Drawing.Point(242, 234) - Me.grpMeta.Name = "grpMeta" - Me.grpMeta.Size = New System.Drawing.Size(112, 173) - Me.grpMeta.TabIndex = 22 - Me.grpMeta.TabStop = False - Me.grpMeta.Tag = "" - Me.grpMeta.Text = "Station" - ' 'lblRain ' Me.lblRain.AutoSize = True @@ -553,9 +497,9 @@ Partial Class DlgDefineClimaticData Me.grpElements.Controls.Add(Me.ucrReceiverMinTemp) Me.grpElements.Controls.Add(Me.lblWindSpeed) Me.grpElements.Controls.Add(Me.lblWindDirection) - Me.grpElements.Location = New System.Drawing.Point(238, 6) + Me.grpElements.Location = New System.Drawing.Point(374, 12) Me.grpElements.Name = "grpElements" - Me.grpElements.Size = New System.Drawing.Size(260, 225) + Me.grpElements.Size = New System.Drawing.Size(151, 395) Me.grpElements.TabIndex = 16 Me.grpElements.TabStop = False Me.grpElements.Text = "Elements" @@ -564,11 +508,11 @@ Partial Class DlgDefineClimaticData ' Me.ucrReceiverMaxRH.AutoSize = True Me.ucrReceiverMaxRH.frmParent = Me - Me.ucrReceiverMaxRH.Location = New System.Drawing.Point(144, 193) + Me.ucrReceiverMaxRH.Location = New System.Drawing.Point(18, 366) Me.ucrReceiverMaxRH.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverMaxRH.Name = "ucrReceiverMaxRH" Me.ucrReceiverMaxRH.Selector = Nothing - Me.ucrReceiverMaxRH.Size = New System.Drawing.Size(99, 20) + Me.ucrReceiverMaxRH.Size = New System.Drawing.Size(116, 20) Me.ucrReceiverMaxRH.strNcFilePath = "" Me.ucrReceiverMaxRH.TabIndex = 19 Me.ucrReceiverMaxRH.ucrSelector = Nothing @@ -577,7 +521,7 @@ Partial Class DlgDefineClimaticData ' Me.lblMaxRH.AutoSize = True Me.lblMaxRH.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblMaxRH.Location = New System.Drawing.Point(141, 178) + Me.lblMaxRH.Location = New System.Drawing.Point(15, 351) Me.lblMaxRH.Name = "lblMaxRH" Me.lblMaxRH.Size = New System.Drawing.Size(90, 13) Me.lblMaxRH.TabIndex = 18 @@ -587,20 +531,20 @@ Partial Class DlgDefineClimaticData ' Me.ucrReceiverMinRH.AutoSize = True Me.ucrReceiverMinRH.frmParent = Me - Me.ucrReceiverMinRH.Location = New System.Drawing.Point(144, 152) + Me.ucrReceiverMinRH.Location = New System.Drawing.Point(18, 330) Me.ucrReceiverMinRH.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverMinRH.Name = "ucrReceiverMinRH" Me.ucrReceiverMinRH.Selector = Nothing - Me.ucrReceiverMinRH.Size = New System.Drawing.Size(99, 20) + Me.ucrReceiverMinRH.Size = New System.Drawing.Size(116, 20) Me.ucrReceiverMinRH.strNcFilePath = "" - Me.ucrReceiverMinRH.TabIndex = 17 + Me.ucrReceiverMinRH.TabIndex = 18 Me.ucrReceiverMinRH.ucrSelector = Nothing ' 'lblMinimumRH ' Me.lblMinimumRH.AutoSize = True Me.lblMinimumRH.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblMinimumRH.Location = New System.Drawing.Point(141, 137) + Me.lblMinimumRH.Location = New System.Drawing.Point(15, 315) Me.lblMinimumRH.Name = "lblMinimumRH" Me.lblMinimumRH.Size = New System.Drawing.Size(87, 13) Me.lblMinimumRH.TabIndex = 16 @@ -610,85 +554,85 @@ Partial Class DlgDefineClimaticData ' Me.ucrReceiverWindDirection.AutoSize = True Me.ucrReceiverWindDirection.frmParent = Me - Me.ucrReceiverWindDirection.Location = New System.Drawing.Point(18, 193) + Me.ucrReceiverWindDirection.Location = New System.Drawing.Point(18, 177) Me.ucrReceiverWindDirection.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverWindDirection.Name = "ucrReceiverWindDirection" Me.ucrReceiverWindDirection.Selector = Nothing Me.ucrReceiverWindDirection.Size = New System.Drawing.Size(111, 20) Me.ucrReceiverWindDirection.strNcFilePath = "" - Me.ucrReceiverWindDirection.TabIndex = 9 + Me.ucrReceiverWindDirection.TabIndex = 14 Me.ucrReceiverWindDirection.ucrSelector = Nothing ' 'ucrReceiverRain ' Me.ucrReceiverRain.AutoSize = True Me.ucrReceiverRain.frmParent = Me - Me.ucrReceiverRain.Location = New System.Drawing.Point(18, 31) + Me.ucrReceiverRain.Location = New System.Drawing.Point(18, 30) Me.ucrReceiverRain.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverRain.Name = "ucrReceiverRain" Me.ucrReceiverRain.Selector = Nothing Me.ucrReceiverRain.Size = New System.Drawing.Size(111, 20) Me.ucrReceiverRain.strNcFilePath = "" - Me.ucrReceiverRain.TabIndex = 1 + Me.ucrReceiverRain.TabIndex = 10 Me.ucrReceiverRain.ucrSelector = Nothing ' 'ucrReceiverSunshine ' Me.ucrReceiverSunshine.AutoSize = True Me.ucrReceiverSunshine.frmParent = Me - Me.ucrReceiverSunshine.Location = New System.Drawing.Point(144, 31) + Me.ucrReceiverSunshine.Location = New System.Drawing.Point(18, 215) Me.ucrReceiverSunshine.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverSunshine.Name = "ucrReceiverSunshine" Me.ucrReceiverSunshine.Selector = Nothing - Me.ucrReceiverSunshine.Size = New System.Drawing.Size(99, 20) + Me.ucrReceiverSunshine.Size = New System.Drawing.Size(116, 20) Me.ucrReceiverSunshine.strNcFilePath = "" - Me.ucrReceiverSunshine.TabIndex = 11 + Me.ucrReceiverSunshine.TabIndex = 15 Me.ucrReceiverSunshine.ucrSelector = Nothing ' 'ucrReceiverRadiation ' Me.ucrReceiverRadiation.AutoSize = True Me.ucrReceiverRadiation.frmParent = Me - Me.ucrReceiverRadiation.Location = New System.Drawing.Point(144, 70) + Me.ucrReceiverRadiation.Location = New System.Drawing.Point(18, 254) Me.ucrReceiverRadiation.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverRadiation.Name = "ucrReceiverRadiation" Me.ucrReceiverRadiation.Selector = Nothing - Me.ucrReceiverRadiation.Size = New System.Drawing.Size(99, 20) + Me.ucrReceiverRadiation.Size = New System.Drawing.Size(116, 20) Me.ucrReceiverRadiation.strNcFilePath = "" - Me.ucrReceiverRadiation.TabIndex = 13 + Me.ucrReceiverRadiation.TabIndex = 16 Me.ucrReceiverRadiation.ucrSelector = Nothing ' 'ucrReceiverMaxTemp ' Me.ucrReceiverMaxTemp.AutoSize = True Me.ucrReceiverMaxTemp.frmParent = Me - Me.ucrReceiverMaxTemp.Location = New System.Drawing.Point(18, 111) + Me.ucrReceiverMaxTemp.Location = New System.Drawing.Point(18, 103) Me.ucrReceiverMaxTemp.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverMaxTemp.Name = "ucrReceiverMaxTemp" Me.ucrReceiverMaxTemp.Selector = Nothing Me.ucrReceiverMaxTemp.Size = New System.Drawing.Size(111, 20) Me.ucrReceiverMaxTemp.strNcFilePath = "" - Me.ucrReceiverMaxTemp.TabIndex = 5 + Me.ucrReceiverMaxTemp.TabIndex = 12 Me.ucrReceiverMaxTemp.ucrSelector = Nothing ' 'ucrReceiverCloudCover ' Me.ucrReceiverCloudCover.AutoSize = True Me.ucrReceiverCloudCover.frmParent = Me - Me.ucrReceiverCloudCover.Location = New System.Drawing.Point(144, 111) + Me.ucrReceiverCloudCover.Location = New System.Drawing.Point(18, 292) Me.ucrReceiverCloudCover.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverCloudCover.Name = "ucrReceiverCloudCover" Me.ucrReceiverCloudCover.Selector = Nothing - Me.ucrReceiverCloudCover.Size = New System.Drawing.Size(99, 20) + Me.ucrReceiverCloudCover.Size = New System.Drawing.Size(116, 20) Me.ucrReceiverCloudCover.strNcFilePath = "" - Me.ucrReceiverCloudCover.TabIndex = 15 + Me.ucrReceiverCloudCover.TabIndex = 17 Me.ucrReceiverCloudCover.ucrSelector = Nothing ' 'lblMaxTemp ' Me.lblMaxTemp.AutoSize = True Me.lblMaxTemp.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblMaxTemp.Location = New System.Drawing.Point(15, 96) + Me.lblMaxTemp.Location = New System.Drawing.Point(15, 88) Me.lblMaxTemp.Name = "lblMaxTemp" Me.lblMaxTemp.Size = New System.Drawing.Size(117, 13) Me.lblMaxTemp.TabIndex = 4 @@ -698,7 +642,7 @@ Partial Class DlgDefineClimaticData ' Me.lblCloudCover.AutoSize = True Me.lblCloudCover.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblCloudCover.Location = New System.Drawing.Point(141, 96) + Me.lblCloudCover.Location = New System.Drawing.Point(15, 277) Me.lblCloudCover.Name = "lblCloudCover" Me.lblCloudCover.Size = New System.Drawing.Size(68, 13) Me.lblCloudCover.TabIndex = 14 @@ -708,17 +652,17 @@ Partial Class DlgDefineClimaticData ' Me.lblMinTemp.AutoSize = True Me.lblMinTemp.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblMinTemp.Location = New System.Drawing.Point(15, 55) + Me.lblMinTemp.Location = New System.Drawing.Point(15, 51) Me.lblMinTemp.Name = "lblMinTemp" - Me.lblMinTemp.Size = New System.Drawing.Size(111, 13) + Me.lblMinTemp.Size = New System.Drawing.Size(114, 13) Me.lblMinTemp.TabIndex = 2 - Me.lblMinTemp.Text = "Minimum Temperature" + Me.lblMinTemp.Text = "Minimum Temperature:" ' 'lblRadiation ' Me.lblRadiation.AutoSize = True Me.lblRadiation.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblRadiation.Location = New System.Drawing.Point(141, 55) + Me.lblRadiation.Location = New System.Drawing.Point(15, 239) Me.lblRadiation.Name = "lblRadiation" Me.lblRadiation.Size = New System.Drawing.Size(55, 13) Me.lblRadiation.TabIndex = 12 @@ -728,20 +672,20 @@ Partial Class DlgDefineClimaticData ' Me.ucrReceiverWindSpeed.AutoSize = True Me.ucrReceiverWindSpeed.frmParent = Me - Me.ucrReceiverWindSpeed.Location = New System.Drawing.Point(18, 152) + Me.ucrReceiverWindSpeed.Location = New System.Drawing.Point(18, 140) Me.ucrReceiverWindSpeed.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverWindSpeed.Name = "ucrReceiverWindSpeed" Me.ucrReceiverWindSpeed.Selector = Nothing Me.ucrReceiverWindSpeed.Size = New System.Drawing.Size(111, 20) Me.ucrReceiverWindSpeed.strNcFilePath = "" - Me.ucrReceiverWindSpeed.TabIndex = 7 + Me.ucrReceiverWindSpeed.TabIndex = 13 Me.ucrReceiverWindSpeed.ucrSelector = Nothing ' 'lblSunshine ' Me.lblSunshine.AutoSize = True Me.lblSunshine.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblSunshine.Location = New System.Drawing.Point(141, 15) + Me.lblSunshine.Location = New System.Drawing.Point(15, 199) Me.lblSunshine.Name = "lblSunshine" Me.lblSunshine.Size = New System.Drawing.Size(85, 13) Me.lblSunshine.TabIndex = 10 @@ -751,20 +695,20 @@ Partial Class DlgDefineClimaticData ' Me.ucrReceiverMinTemp.AutoSize = True Me.ucrReceiverMinTemp.frmParent = Me - Me.ucrReceiverMinTemp.Location = New System.Drawing.Point(18, 70) + Me.ucrReceiverMinTemp.Location = New System.Drawing.Point(18, 66) Me.ucrReceiverMinTemp.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverMinTemp.Name = "ucrReceiverMinTemp" Me.ucrReceiverMinTemp.Selector = Nothing Me.ucrReceiverMinTemp.Size = New System.Drawing.Size(111, 20) Me.ucrReceiverMinTemp.strNcFilePath = "" - Me.ucrReceiverMinTemp.TabIndex = 3 + Me.ucrReceiverMinTemp.TabIndex = 11 Me.ucrReceiverMinTemp.ucrSelector = Nothing ' 'lblWindSpeed ' Me.lblWindSpeed.AutoSize = True Me.lblWindSpeed.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblWindSpeed.Location = New System.Drawing.Point(15, 137) + Me.lblWindSpeed.Location = New System.Drawing.Point(15, 125) Me.lblWindSpeed.Name = "lblWindSpeed" Me.lblWindSpeed.Size = New System.Drawing.Size(69, 13) Me.lblWindSpeed.TabIndex = 6 @@ -774,18 +718,74 @@ Partial Class DlgDefineClimaticData ' Me.lblWindDirection.AutoSize = True Me.lblWindDirection.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblWindDirection.Location = New System.Drawing.Point(15, 178) + Me.lblWindDirection.Location = New System.Drawing.Point(15, 162) Me.lblWindDirection.Name = "lblWindDirection" Me.lblWindDirection.Size = New System.Drawing.Size(80, 13) Me.lblWindDirection.TabIndex = 8 Me.lblWindDirection.Text = "Wind Direction:" ' + 'ucrChkLinkedMetaData + ' + Me.ucrChkLinkedMetaData.AutoSize = True + Me.ucrChkLinkedMetaData.Checked = False + Me.ucrChkLinkedMetaData.Location = New System.Drawing.Point(16, 204) + Me.ucrChkLinkedMetaData.Margin = New System.Windows.Forms.Padding(6) + Me.ucrChkLinkedMetaData.Name = "ucrChkLinkedMetaData" + Me.ucrChkLinkedMetaData.Size = New System.Drawing.Size(195, 23) + Me.ucrChkLinkedMetaData.TabIndex = 21 + ' + 'ucrSelectorLinkedDataFrame + ' + Me.ucrSelectorLinkedDataFrame.AutoSize = True + Me.ucrSelectorLinkedDataFrame.bDropUnusedFilterLevels = False + Me.ucrSelectorLinkedDataFrame.bShowHiddenColumns = False + Me.ucrSelectorLinkedDataFrame.bUseCurrentFilter = True + Me.ucrSelectorLinkedDataFrame.Location = New System.Drawing.Point(16, 224) + Me.ucrSelectorLinkedDataFrame.Margin = New System.Windows.Forms.Padding(0) + Me.ucrSelectorLinkedDataFrame.Name = "ucrSelectorLinkedDataFrame" + Me.ucrSelectorLinkedDataFrame.Size = New System.Drawing.Size(213, 183) + Me.ucrSelectorLinkedDataFrame.TabIndex = 20 + ' + 'ucrInputCheckInput + ' + Me.ucrInputCheckInput.AddQuotesIfUnrecognised = True + Me.ucrInputCheckInput.AutoSize = True + Me.ucrInputCheckInput.IsMultiline = False + Me.ucrInputCheckInput.IsReadOnly = False + Me.ucrInputCheckInput.Location = New System.Drawing.Point(147, 439) + Me.ucrInputCheckInput.Margin = New System.Windows.Forms.Padding(9) + Me.ucrInputCheckInput.Name = "ucrInputCheckInput" + Me.ucrInputCheckInput.Size = New System.Drawing.Size(253, 21) + Me.ucrInputCheckInput.TabIndex = 18 + ' + 'ucrSelectorDefineClimaticData + ' + Me.ucrSelectorDefineClimaticData.AutoSize = True + Me.ucrSelectorDefineClimaticData.bDropUnusedFilterLevels = False + Me.ucrSelectorDefineClimaticData.bShowHiddenColumns = False + Me.ucrSelectorDefineClimaticData.bUseCurrentFilter = True + Me.ucrSelectorDefineClimaticData.Location = New System.Drawing.Point(16, 9) + Me.ucrSelectorDefineClimaticData.Margin = New System.Windows.Forms.Padding(0) + Me.ucrSelectorDefineClimaticData.Name = "ucrSelectorDefineClimaticData" + Me.ucrSelectorDefineClimaticData.Size = New System.Drawing.Size(213, 183) + Me.ucrSelectorDefineClimaticData.TabIndex = 13 + ' + 'ucrBase + ' + Me.ucrBase.AutoSize = True + Me.ucrBase.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrBase.Location = New System.Drawing.Point(6, 476) + Me.ucrBase.Margin = New System.Windows.Forms.Padding(4) + Me.ucrBase.Name = "ucrBase" + Me.ucrBase.Size = New System.Drawing.Size(408, 52) + Me.ucrBase.TabIndex = 19 + ' 'DlgDefineClimaticData ' 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(502, 460) + Me.ClientSize = New System.Drawing.Size(533, 531) Me.Controls.Add(Me.ucrChkLinkedMetaData) Me.Controls.Add(Me.ucrSelectorLinkedDataFrame) Me.Controls.Add(Me.ucrInputCheckInput) diff --git a/instat/UcrGeomListWithAes.vb b/instat/UcrGeomListWithAes.vb index f4028853efb..2fee80b1525 100644 --- a/instat/UcrGeomListWithAes.vb +++ b/instat/UcrGeomListWithAes.vb @@ -300,6 +300,14 @@ Public Class ucrGeomListWithParameters SetReceiverColour() End Sub + Private Sub AddRFunctionParameter(parentFunction As RFunction, paramName As String, paramValue As String) + Dim clsProductFunction As New RFunction + clsProductFunction.SetPackageName("ggmosaic") + clsProductFunction.SetRCommand("product") + clsProductFunction.AddParameter(paramName, paramValue, bIncludeArgumentName:=False) + parentFunction.AddParameter(paramName, clsRFunctionParameter:=clsProductFunction) + End Sub + Public Sub UpdateGlobalAndLocalAesFromInter() Dim clsRelevantAesFunction As New RFunction 'Will be used in the partially mandatory aes filling method below. Dim clsCurrentAesFunction As RFunction @@ -342,9 +350,67 @@ Public Class ucrGeomListWithParameters clsCurrentAesFunction = clsLocalAesFunction End If + If clsGeomFunction.strRCommand = "geom_mosaic" Then + Dim xParameterIndex As Integer = clsLocalAesFunction.clsParameters.FindIndex(Function(x) x.strArgumentName = "x") + Dim condsParameterIndex As Integer = clsLocalAesFunction.clsParameters.FindIndex(Function(x) x.strArgumentName = "conds") + + If xParameterIndex >= 0 Then + Dim strArgNameValue = clsLocalAesFunction.clsParameters(xParameterIndex).strArgumentValue + AddRFunctionParameter(clsCurrentAesFunction, "x", strArgNameValue) + End If + + If condsParameterIndex >= 0 Then + Dim strArgNameValue = clsLocalAesFunction.clsParameters(condsParameterIndex).strArgumentValue + AddRFunctionParameter(clsCurrentAesFunction, "conds", strArgNameValue) + End If + + Dim xParameterGlobalIndex As Integer = clsGlobalAesFunction.clsParameters.FindIndex(Function(x) x.strArgumentName = "x") + Dim condsParameterGlobalIndex As Integer = clsGlobalAesFunction.clsParameters.FindIndex(Function(x) x.strArgumentName = "conds") + + If xParameterGlobalIndex >= 0 Then + Dim strArgNameValue = clsGlobalAesFunction.clsParameters(xParameterGlobalIndex).strArgumentValue + AddRFunctionParameter(clsCurrentAesFunction, "x", strArgNameValue) + End If + + If condsParameterGlobalIndex >= 0 Then + Dim strArgNameValue = clsGlobalAesFunction.clsParameters(condsParameterGlobalIndex).strArgumentValue + AddRFunctionParameter(clsCurrentAesFunction, "conds", strArgNameValue) + End If + End If + + If clsGeomFunction.strRCommand = "geom_mosaic_jitter" Then + Dim xParameterIndex As Integer = clsLocalAesFunction.clsParameters.FindIndex(Function(x) x.strArgumentName = "x") + Dim condsParameterIndex As Integer = clsLocalAesFunction.clsParameters.FindIndex(Function(x) x.strArgumentName = "conds") + + If xParameterIndex >= 0 Then + Dim strArgNameValue = clsLocalAesFunction.clsParameters(xParameterIndex).strArgumentValue + AddRFunctionParameter(clsCurrentAesFunction, "x", strArgNameValue) + End If + + If condsParameterIndex >= 0 Then + Dim strArgNameValue = clsLocalAesFunction.clsParameters(condsParameterIndex).strArgumentValue + AddRFunctionParameter(clsCurrentAesFunction, "conds", strArgNameValue) + End If + End If + + If clsGeomFunction.strRCommand = "geom_mosaic_text" Then + Dim xParameterIndex As Integer = clsLocalAesFunction.clsParameters.FindIndex(Function(x) x.strArgumentName = "x") + Dim condsParameterIndex As Integer = clsLocalAesFunction.clsParameters.FindIndex(Function(x) x.strArgumentName = "conds") + + If xParameterIndex >= 0 Then + Dim strArgNameValue = clsLocalAesFunction.clsParameters(xParameterIndex).strArgumentValue + AddRFunctionParameter(clsCurrentAesFunction, "x", strArgNameValue) + End If + + If condsParameterIndex >= 0 Then + Dim strArgNameValue = clsLocalAesFunction.clsParameters(condsParameterIndex).strArgumentValue + AddRFunctionParameter(clsCurrentAesFunction, "conds", strArgNameValue) + End If + End If + 'This is a temporary solution to issue which should be solved with geoms 'This adds "" aes for x or y when no variables are mapped to them for geoms which require it, either adding to the global or local aes. - If clsGeomFunction.strRCommand = "geom_boxplot" OrElse clsGeomFunction.strRCommand = "geom_dotplot" Then + If clsGeomFunction.strRCommand = "geom_boxplot" OrElse clsGeomFunction.strRCommand = "geom_dotplot" OrElse clsGeomFunction.strRCommand = "geom_violin" Then If (clsGlobalAesFunction.clsParameters.FindIndex(Function(x) x.strArgumentName = "x") = -1 OrElse ucrChkIgnoreGlobalAes.Checked) AndAlso clsLocalAesFunction.clsParameters.FindIndex(Function(x) x.strArgumentName = "x") = -1 Then clsCurrentAesFunction.AddParameter("x", Chr(34) & Chr(34)) End If @@ -358,6 +424,9 @@ Public Class ucrGeomListWithParameters End If 'Adding stat = identity method If {"geom_bar", "geom_density", "geom_freqpoly"}.Contains(clsGeomFunction.strRCommand) Then + If (clsGlobalAesFunction.clsParameters.FindIndex(Function(x) x.strArgumentName = "x") = -1 OrElse ucrChkIgnoreGlobalAes.Checked) AndAlso clsLocalAesFunction.clsParameters.FindIndex(Function(x) x.strArgumentName = "x") = -1 Then + clsCurrentAesFunction.AddParameter("x", Chr(34) & Chr(34)) + End If 'If there is a y in the global aes, and the global aes are not ignored or if there is a y in the local aes then in case stat has not been set manually, stat is set to identity. If (((clsGlobalAesFunction.clsParameters.FindIndex(Function(x) x.strArgumentName = "y") <> -1) AndAlso ((clsGeomFunction.clsParameters.FindIndex(Function(x) x.strArgumentName = "inherit.aes") = -1) OrElse (Not ucrChkIgnoreGlobalAes.Checked))) OrElse (clsLocalAesFunction.clsParameters.FindIndex(Function(x) x.strArgumentName = "y") <> -1)) AndAlso (clsGeomFunction.clsParameters.FindIndex(Function(x) x.strArgumentName = "stat") = -1) Then clsGeomFunction.AddParameter("stat", Chr(34) & "identity" & Chr(34)) diff --git a/instat/clsRCodeStructure.vb b/instat/clsRCodeStructure.vb index 5e96db4c7fa..1044c69d182 100644 --- a/instat/clsRCodeStructure.vb +++ b/instat/clsRCodeStructure.vb @@ -49,17 +49,17 @@ Public Class RCodeStructure ''' This could be a data frame, data frame colmun, model, graph etc. ''' If the output from the R command doesn't to be assigned, then this string is null or empty. ''' - Public _strAssignToObject As String - Public _strAssignToName As String - Public _strAssignToObjectTypeLabel As String - Public _strAssignToObjectFormat As String + Protected _strAssignToObject As String + Protected _strAssignToName As String + Protected _strAssignToObjectTypeLabel As String + Protected _strAssignToObjectFormat As String Public _strDataFrameNameToAddAssignToObject As String ''' ''' If true then a list of data frames is assigned (i.e. the R "_strAssignToName" ''' parameter needs to be an R string list). ''' - Private bDataFrameList As Boolean = False + Private _bDataFrameList As Boolean = False ''' If true then the R parameter "use_col_name_as_prefix" is set to true, ''' else the parameter is set to false. @@ -79,7 +79,7 @@ Public Class RCodeStructure ''' The name of the column to associate with the R "adjacent_column" parameter. ''' Only used when assigning to a column. ''' - Public strAdjacentColumn As String = "" + Private _strAdjacentColumn As String = "" ''' If true then there is no effect. ''' If false then set the R "require_correct_length" parameter to false. @@ -100,8 +100,7 @@ Public Class RCodeStructure ''' Note: This is currently only used in RSyntax as a before/after code to ''' determine whether the position code should be run in the list. ''' - Public iPosition = -1 ' TODO SJL 03/04/20 This seems to be a constant, should we declare it with 'const'? - 'TODO SJL 03/04/20 - Also, it only seems to be used by RSyntax. Move the constant to that class and give it a less confusing name? + Public iPosition = -1 ''' Deprecated. What to do with the result returned by executing the R code: ''' @@ -143,10 +142,6 @@ Public Class RCodeStructure ''' Public bExcludeAssignedFunctionOutput As Boolean = True - ''' This is used to clear the global environment of unused variables. - ''' - Public bClearFromGlobal As Boolean = False 'TODO SJL 03/04/20 This variable is never checked or set to true, can we remove? - ''' If true then 'clsRFunction.ToScript' and 'clsROperator.ToScript' return a string ''' that can be passed to R (i.e. double quotes are replaced with single quotes, ''' and the string is wrapped in double quotes). @@ -154,27 +149,13 @@ Public Class RCodeStructure ''' For example: seq(from = 1, to = 10) becomes "seq(from = 1, to = 10)". ''' ''' Note: if true then the returned string can no longer be used for the - ''' function or its parameters because it will not produce the correct script - ''' (i.e. it should not be true if 'bToBeAssigned' or 'bIsAssigned' is true. + ''' function or its parameters because it will not produce the correct script. ''' Public bToScriptAsRString As Boolean = False ''' Tag object for any use. Public Tag As Object 'TODO SJL 03/04/20 This only seems to be used by dlgCalculationsSummary. Could we add something local to this dialog and then remove the tag from this calss? - ''' Event queue for all listeners interested in ParametersChanged events. - Public Event ParametersChanged() 'TODO SJL 03/04/20 Is this used? Can it be removed? - - ''' Executes the parameters changed action. - ''' - Protected Sub OnParametersChanged() - RaiseEvent ParametersChanged() - 'TODO SJL 03/04/20 Is this still used? Can it be removed? - ' Currently only used when this is in RSyntax as a before/after code to determine if - ' position code should be run in the list. This is because RSyntax has iCallType and - ' bExcludeAssignedFunctionOutput which it uses for the base code. Eventually migrate these out of RSyntax. - End Sub - '''-------------------------------------------------------------------------------------------- ''' Deprecated. @@ -288,10 +269,12 @@ Public Class RCodeStructure End Sub + '''-------------------------------------------------------------------------------------------- ''' ''' Gets the assign to variable ''' ''' assign to value + '''-------------------------------------------------------------------------------------------- Public Function GetRObjectToAssignTo() As String Return _strAssignToObject End Function @@ -300,19 +283,22 @@ Public Class RCodeStructure Return Not String.IsNullOrEmpty(_strAssignToObject) End Function + '''-------------------------------------------------------------------------------------------- ''' ''' Sets the assign to variable for objects that will not be added in the data book and displayed in the output viewer. ''' For instance objects used as input parameters for other R funtions ''' ''' The new value for the R object assignment string + '''-------------------------------------------------------------------------------------------- Public Sub SetAssignToObject(strRObjectToAssignTo As String) - Me._strAssignToObject = strRObjectToAssignTo - Me._strAssignToObjectTypeLabel = "" - Me._strAssignToObjectFormat = "" - Me._strDataFrameNameToAddAssignToObject = "" - Me._strAssignToName = "" + _strAssignToObject = strRObjectToAssignTo + _strAssignToObjectTypeLabel = "" + _strAssignToObjectFormat = "" + _strDataFrameNameToAddAssignToObject = "" + _strAssignToName = "" End Sub + '''-------------------------------------------------------------------------------------------- ''' ''' Sets the assign to variables for objects that will be added to the databook and possibly displayed in the output viewer. ''' To prevent the object from being diplayed in the output viewer, @@ -323,17 +309,18 @@ Public Class RCodeStructure ''' The new value for the object format ''' The new value for the data frame name that the object will be added to. ''' The new value for the object name + '''-------------------------------------------------------------------------------------------- Public Sub SetAssignToOutputObject(strRObjectToAssignTo As String, strRObjectTypeLabelToAssignTo As String, strRObjectFormatToAssignTo As String, Optional strRDataFrameNameToAddObjectTo As String = "", Optional strObjectName As String = "") - Me._strAssignToObject = strRObjectToAssignTo - Me._strAssignToObjectTypeLabel = strRObjectTypeLabelToAssignTo - Me._strAssignToObjectFormat = strRObjectFormatToAssignTo - Me._strDataFrameNameToAddAssignToObject = strRDataFrameNameToAddObjectTo - Me._strAssignToName = strObjectName + _strAssignToObject = strRObjectToAssignTo + _strAssignToObjectTypeLabel = strRObjectTypeLabelToAssignTo + _strAssignToObjectFormat = strRObjectFormatToAssignTo + _strDataFrameNameToAddAssignToObject = strRDataFrameNameToAddObjectTo + _strAssignToName = strObjectName End Sub Public Sub SetAssignToColumnObject(strColToAssignTo As String, @@ -345,26 +332,26 @@ Public Class RCodeStructure Optional bInsertColumnBefore As Boolean = False, Optional strAdjacentColumn As String = "") - Me._strAssignToObject = strColToAssignTo - Me._strAssignToObjectTypeLabel = RObjectTypeLabel.Column - Me._strDataFrameNameToAddAssignToObject = strRDataFrameNameToAddObjectTo - Me._strAssignToName = strColName + _strAssignToObject = strColToAssignTo + _strAssignToObjectTypeLabel = RObjectTypeLabel.Column + _strDataFrameNameToAddAssignToObject = strRDataFrameNameToAddObjectTo + _strAssignToName = strColName Me.bAssignToIsPrefix = bAssignToIsPrefix Me.bAssignToColumnWithoutNames = bAssignToColumnWithoutNames Me.bInsertColumnBefore = bInsertColumnBefore - Me.strAdjacentColumn = strAdjacentColumn + _strAdjacentColumn = strAdjacentColumn Me.bRequireCorrectLength = bRequireCorrectLength End Sub - Public Sub SetAssignToDataFrameObject(strDataFrameToAssignTo As String, + Private Sub SetAssignToDataFrameObject(strDataFrameToAssignTo As String, strDataFrameName As String, Optional bDataFrameList As Boolean = False) - Me._strAssignToObject = strDataFrameToAssignTo - Me._strAssignToObjectTypeLabel = RObjectTypeLabel.Dataframe - Me._strAssignToName = strDataFrameName - Me.bDataFrameList = bDataFrameList + _strAssignToObject = strDataFrameToAssignTo + _strAssignToObjectTypeLabel = RObjectTypeLabel.Dataframe + _strAssignToName = strDataFrameName + _bDataFrameList = bDataFrameList End Sub '''-------------------------------------------------------------------------------------------- @@ -380,10 +367,10 @@ Public Class RCodeStructure bAssignToColumnWithoutNames = False bInsertColumnBefore = False - Me._strAssignToObject = "" - Me._strAssignToName = "" - Me._strAssignToObjectTypeLabel = "" - Me._strAssignToObjectFormat = "" + _strAssignToObject = "" + _strAssignToName = "" + _strAssignToObjectTypeLabel = "" + _strAssignToObjectFormat = "" End Sub '''-------------------------------------------------------------------------------------------- @@ -428,8 +415,6 @@ Public Class RCodeStructure ''' ''' This function sets the value of several data members. It stores the new ''' assign-to script in 'strAssignTo' (replacing the previous value stored). - ''' This function also updates the 'bIsAssigned' and 'bToBeAssigned' flags that - ''' store this object's assignment status. ''' ''' ''' [in,out] (Optional) The existing script including any @@ -479,8 +464,8 @@ Public Class RCodeStructure End If End If clsAddRObject.AddParameter("before", If(bInsertColumnBefore, "TRUE", "FALSE")) - If Not String.IsNullOrEmpty(strAdjacentColumn) Then - clsAddRObject.AddParameter("adjacent_column", strAdjacentColumn) + If Not String.IsNullOrEmpty(_strAdjacentColumn) Then + clsAddRObject.AddParameter("adjacent_column", _strAdjacentColumn) End If If Not bRequireCorrectLength Then clsAddRObject.AddParameter("require_correct_length", "FALSE") @@ -500,7 +485,7 @@ Public Class RCodeStructure 'for data frame object clsAddRObject.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$import_data") - If bDataFrameList Then + If _bDataFrameList Then clsAddRObject.AddParameter("data_tables", _strAssignToObject, iPosition:=0) If _strAssignToName <> "" Then clsAddRObject.AddParameter("data_names", _strAssignToName, iPosition:=5) @@ -665,33 +650,6 @@ Public Class RCodeStructure AddParameter(clsParam) End Sub - '''-------------------------------------------------------------------------------------------- - ''' TODO SJL 03/04/20 This function is not used, and is not overridden by any child classes. Can we remove? - ''' - ''' - ''' (Optional) Name of the parameter. - ''' (Optional) The parameter value. - ''' (Optional) The R code structure parameter. - ''' (Optional) True to include, false to exclude the argument - ''' name. - ''' (Optional) (Optional) The relative position of the - ''' parameter in this object's parameter list. - '''-------------------------------------------------------------------------------------------- - Public Overridable Sub AddParameterWithCodeStructure(Optional strParameterName As String = "", Optional strParameterValue As String = "", Optional clsRCodeObject As RCodeStructure = Nothing, Optional bIncludeArgumentName As Boolean = True, Optional iPosition As Integer = -1) - ' TODO Legacy - This should be call AddParameter but need to make it unambiguous with above. - ' TODO SJL 03/04/20 I think this function has a bug: If strParameterValue is specified then the - ' clsRFunctionParameter and clsROperatorParameter parameters will be ignored. - If TypeOf (clsRCodeObject) Is RFunction Then - AddParameter(strParameterName:=strParameterName, strParameterValue:=strParameterValue, - clsRFunctionParameter:=clsRCodeObject, bIncludeArgumentName:=bIncludeArgumentName, - iPosition:=iPosition) - ElseIf TypeOf (clsRCodeObject) Is ROperator Then - AddParameter(strParameterName:=strParameterName, strParameterValue:=strParameterValue, - clsROperatorParameter:=clsRCodeObject, bIncludeArgumentName:=bIncludeArgumentName, - iPosition:=iPosition) - End If - End Sub - '''-------------------------------------------------------------------------------------------- ''' If the object already has a parameter with the same name then changes the ''' parameter's value to the value in . @@ -743,7 +701,6 @@ Public Class RCodeStructure End If 'bIsAssigned = False 'parameters have changed so the output of the R command needs to be reassigned iNumberOfAddedParameters = iNumberOfAddedParameters + 1 - OnParametersChanged() 'TODO SJL 03/04/20 can this line be removed? End Sub '''-------------------------------------------------------------------------------------------- @@ -794,7 +751,9 @@ Public Class RCodeStructure End If End Sub + '''-------------------------------------------------------------------------------------------- ''' Sorts the parameters into position order. + '''-------------------------------------------------------------------------------------------- Public Sub SortParameters() 'This sub is used to reorder the parameters according to their Position property. 'It will be called only in places where it is necessary ie before ToScript or RemoveAdditionalParameters in ROperator. @@ -831,21 +790,6 @@ Public Class RCodeStructure End If End Function - ''' Removes all parameters that do not have a specified position - ''' (i.e. parameter's position is -1). - ''' - Public Sub RemoveUnorderedParameters() - 'TODO SJL 03/04/20 This function is not used, remove it? - Dim clsParam As RParameter - 'TODO SJL 03/04/20 This function only seems to remove the first unordered param, is this a bug? - If Not clsParameters Is Nothing Then - clsParam = clsParameters.Find(Function(x) x.Position = -1) - clsParameters.Remove(clsParam) - End If - 'bIsAssigned = False 'parameters have changed so the output of the R command needs to be reassigned - OnParametersChanged() 'TODO SJL 03/04/20 can this line be removed? - End Sub - '''-------------------------------------------------------------------------------------------- ''' Removes the parameter named . ''' @@ -862,8 +806,6 @@ Public Class RCodeStructure clsParam = clsParameters.Find(Function(x) x.strArgumentName = strArgName) clsParameters.Remove(clsParam) ' End If - 'bIsAssigned = False 'parameters have changed so the output of the R command needs to be reassigned - OnParametersChanged() 'TODO SJL 03/04/20 can this line be removed? End Sub '''-------------------------------------------------------------------------------------------- @@ -882,8 +824,6 @@ Public Class RCodeStructure clsParam = clsParameters.Find(Function(x) x.Position = iPosition) clsParameters.Remove(clsParam) End If - 'bIsAssigned = False 'parameters have changed so the output of the R command needs to be reassigned - OnParametersChanged() 'TODO SJL 03/04/20 can this line be removed? End Sub '''-------------------------------------------------------------------------------------------- @@ -896,8 +836,6 @@ Public Class RCodeStructure If Not clsParameters Is Nothing Then clsParameters.Remove(clsParam) End If - ' bIsAssigned = False 'parameters have changed so the output of the R command needs to be reassigned - OnParametersChanged() 'TODO SJL 03/04/20 can this line be removed? End Sub '''-------------------------------------------------------------------------------------------- @@ -926,22 +864,20 @@ Public Class RCodeStructure ''' Clears this object to its blank/initial state. Public Overridable Sub Clear() - 'TODO legacy tidy up iPosition iPosition = -1 iCallType = 0 bExcludeAssignedFunctionOutput = True - bClearFromGlobal = False bToScriptAsRString = False RemoveAssignTo() ClearParameters() End Sub + '''-------------------------------------------------------------------------------------------- ''' Clears the parameters. + '''-------------------------------------------------------------------------------------------- Public Overridable Sub ClearParameters() clsParameters.Clear() iNumberOfAddedParameters = 0 - 'bIsAssigned = False - OnParametersChanged() 'TODO SJL 03/04/20 can this line be removed? End Sub '''-------------------------------------------------------------------------------------------- @@ -953,13 +889,13 @@ Public Class RCodeStructure Dim clsTempCode As New RCodeStructure Dim clsRParam As RParameter - clsTempCode._strAssignToObject = Me._strAssignToObject - clsTempCode._strAssignToName = Me._strAssignToName - clsTempCode._strAssignToObjectTypeLabel = Me._strAssignToObjectTypeLabel - clsTempCode._strAssignToObjectFormat = Me._strAssignToObjectFormat - clsTempCode._strDataFrameNameToAddAssignToObject = Me._strDataFrameNameToAddAssignToObject + clsTempCode._strAssignToObject = _strAssignToObject + clsTempCode._strAssignToName = _strAssignToName + clsTempCode._strAssignToObjectTypeLabel = _strAssignToObjectTypeLabel + clsTempCode._strAssignToObjectFormat = _strAssignToObjectFormat + clsTempCode._strDataFrameNameToAddAssignToObject = _strDataFrameNameToAddAssignToObject - clsTempCode.bDataFrameList = bDataFrameList + clsTempCode._bDataFrameList = _bDataFrameList clsTempCode.bAssignToIsPrefix = bAssignToIsPrefix clsTempCode.bAssignToColumnWithoutNames = bAssignToColumnWithoutNames clsTempCode.bInsertColumnBefore = bInsertColumnBefore @@ -967,7 +903,6 @@ Public Class RCodeStructure clsTempCode.iPosition = iPosition clsTempCode.iCallType = iCallType clsTempCode.bExcludeAssignedFunctionOutput = bExcludeAssignedFunctionOutput - clsTempCode.bClearFromGlobal = bClearFromGlobal clsTempCode.bToScriptAsRString = bToScriptAsRString clsTempCode.Tag = Tag For Each clsRParam In clsParameters diff --git a/instat/clsRFunction.vb b/instat/clsRFunction.vb index a38465061d8..9659f559af0 100644 --- a/instat/clsRFunction.vb +++ b/instat/clsRFunction.vb @@ -41,11 +41,6 @@ Public Class RFunction ''' The R command's package name. Private strPackageName As String = "" - ''' Initializes a new instance of this class. - Public Sub New() - OnParametersChanged() 'TODO SJL is this still needed? - End Sub - '''-------------------------------------------------------------------------------------------- ''' Sets the R command's name (e.g. "facet_grid") and flags that the R script ''' associated with this object is no longer correctly assigned. @@ -228,7 +223,6 @@ Public Class RFunction clsRFunction.iPosition = iPosition clsRFunction.iCallType = iCallType clsRFunction.bExcludeAssignedFunctionOutput = bExcludeAssignedFunctionOutput - clsRFunction.bClearFromGlobal = bClearFromGlobal clsRFunction.bToScriptAsRString = bToScriptAsRString clsRFunction.Tag = Tag For Each clsRParam In clsParameters diff --git a/instat/clsROperator.vb b/instat/clsROperator.vb index 6286b4ae5c2..fa6fdf727e2 100644 --- a/instat/clsROperator.vb +++ b/instat/clsROperator.vb @@ -94,7 +94,6 @@ Public Class ROperator Public Sub SetOperation(strTemp As String, Optional bBracketsTemp As Boolean = True) strOperation = strTemp bBrackets = bBracketsTemp - 'bIsAssigned = False End Sub '''-------------------------------------------------------------------------------------------- @@ -264,22 +263,6 @@ Public Class ROperator Return Nothing End Function - ''' Removes all additional parameters. - Public Sub RemoveAllAdditionalParameters() - 'TODO SJL 03/04/20 this function is only used by 1 dialog. This hints that there may be an alternative way of doing the same thing. - ' It's also suspicious that the other RCodeStructure classes don't have such a function. Why is it only needed for an operator? - ' Can this function be removed? - SortParameters() 'This is used to bring the parameter with position 0 to the front if it exists, then clear all the others using range. - If clsParameters(0).Position = 0 Then - If clsParameters.Count > 1 Then - clsParameters.RemoveRange(1, clsParameters.Count - 1) - End If - Else - clsParameters.Clear() - End If - OnParametersChanged() - End Sub - ''' Clears this object to its blank/initial state. Public Overrides Sub Clear() SetOperation("") @@ -310,7 +293,6 @@ Public Class ROperator clsTempROperator.iPosition = iPosition clsTempROperator.iCallType = iCallType clsTempROperator.bExcludeAssignedFunctionOutput = bExcludeAssignedFunctionOutput - clsTempROperator.bClearFromGlobal = bClearFromGlobal clsTempROperator.bToScriptAsRString = bToScriptAsRString clsTempROperator.Tag = Tag For Each clsRParam In clsParameters diff --git a/instat/dlgBarAndPieChart.Designer.vb b/instat/dlgBarAndPieChart.Designer.vb index 7e857d855c2..24dd99b55dd 100644 --- a/instat/dlgBarAndPieChart.Designer.vb +++ b/instat/dlgBarAndPieChart.Designer.vb @@ -50,7 +50,6 @@ Partial Class dlgBarAndPieChart Me.lblLabelColour = New System.Windows.Forms.Label() Me.lblLabelSize = New System.Windows.Forms.Label() Me.lblLollipopSize = New System.Windows.Forms.Label() - Me.lblLollipopColour = New System.Windows.Forms.Label() Me.lblReorder = New System.Windows.Forms.Label() Me.rdoTreeMap = New System.Windows.Forms.RadioButton() Me.lblFill = New System.Windows.Forms.Label() @@ -67,9 +66,10 @@ Partial Class dlgBarAndPieChart Me.contextMenuStripOptions = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.toolStripMenuItemPlotOptions = New System.Windows.Forms.ToolStripMenuItem() Me.toolStripMenuItemBarchartOptions = New System.Windows.Forms.ToolStripMenuItem() - Me.toolStripMenuItemLollipopOptions = New System.Windows.Forms.ToolStripMenuItem() Me.toolStripMenuItemTextOptions = New System.Windows.Forms.ToolStripMenuItem() + Me.toolStripMenuItemLollipopOptions = New System.Windows.Forms.ToolStripMenuItem() Me.toolStripMenuItemTreemapOptions = New System.Windows.Forms.ToolStripMenuItem() + Me.toolStripMenuItemTreemapTextOptionsOptions = New System.Windows.Forms.ToolStripMenuItem() Me.toolStripMenuItemWordcloudOptions = New System.Windows.Forms.ToolStripMenuItem() Me.cmdOptions = New instat.ucrSplitButton() Me.ucrChkReorderValue = New instat.ucrCheck() @@ -80,7 +80,6 @@ Partial Class dlgBarAndPieChart Me.ucrInputLabelSize = New instat.ucrInputComboBox() Me.ucrNudLollipopSize = New instat.ucrNud() Me.ucrNudMaxSize = New instat.ucrNud() - Me.ucrInputLollipopColour = New instat.ucrInputComboBox() Me.ucrChkLollipop = New instat.ucrCheck() Me.ucrInputLabelPosition = New instat.ucrInputComboBox() Me.ucrInputBarChartPositions = New instat.ucrInputComboBox() @@ -111,7 +110,11 @@ Partial Class dlgBarAndPieChart Me.ucrChkAddLabelsTreemap = New instat.ucrCheck() Me.ucrChkBacktoback = New instat.ucrCheck() Me.ucrChkIncreaseSize = New instat.ucrCheck() - Me.toolStripMenuItemTreemapTextOptionsOptions = New System.Windows.Forms.ToolStripMenuItem() + 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.contextMenuStripOptions.SuspendLayout() Me.SuspendLayout() ' @@ -242,22 +245,12 @@ Partial Class dlgBarAndPieChart ' Me.lblLollipopSize.AutoSize = True Me.lblLollipopSize.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblLollipopSize.Location = New System.Drawing.Point(123, 408) + Me.lblLollipopSize.Location = New System.Drawing.Point(123, 390) Me.lblLollipopSize.Name = "lblLollipopSize" Me.lblLollipopSize.Size = New System.Drawing.Size(30, 13) Me.lblLollipopSize.TabIndex = 42 Me.lblLollipopSize.Text = "Size:" ' - 'lblLollipopColour - ' - Me.lblLollipopColour.AutoSize = True - Me.lblLollipopColour.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblLollipopColour.Location = New System.Drawing.Point(220, 408) - Me.lblLollipopColour.Name = "lblLollipopColour" - Me.lblLollipopColour.Size = New System.Drawing.Size(40, 13) - Me.lblLollipopColour.TabIndex = 44 - Me.lblLollipopColour.Text = "Colour:" - ' 'lblReorder ' Me.lblReorder.AutoSize = True @@ -390,7 +383,7 @@ Partial Class dlgBarAndPieChart ' Me.contextMenuStripOptions.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.toolStripMenuItemPlotOptions, Me.toolStripMenuItemBarchartOptions, Me.toolStripMenuItemTextOptions, Me.toolStripMenuItemLollipopOptions, Me.toolStripMenuItemTreemapOptions, Me.toolStripMenuItemTreemapTextOptionsOptions, Me.toolStripMenuItemWordcloudOptions}) Me.contextMenuStripOptions.Name = "contextMenuStripOk" - Me.contextMenuStripOptions.Size = New System.Drawing.Size(189, 180) + Me.contextMenuStripOptions.Size = New System.Drawing.Size(189, 158) ' 'toolStripMenuItemPlotOptions ' @@ -404,24 +397,30 @@ Partial Class dlgBarAndPieChart Me.toolStripMenuItemBarchartOptions.Size = New System.Drawing.Size(188, 22) Me.toolStripMenuItemBarchartOptions.Text = "BarChart Options" ' - 'toolStripMenuItemLollipopOptions - ' - Me.toolStripMenuItemLollipopOptions.Name = "toolStripMenuItemLollipopOptions" - Me.toolStripMenuItemLollipopOptions.Size = New System.Drawing.Size(188, 22) - Me.toolStripMenuItemLollipopOptions.Text = "Lollipop Options" - ' 'toolStripMenuItemTextOptions ' Me.toolStripMenuItemTextOptions.Name = "toolStripMenuItemTextOptions" Me.toolStripMenuItemTextOptions.Size = New System.Drawing.Size(188, 22) Me.toolStripMenuItemTextOptions.Text = "Text Options" ' + 'toolStripMenuItemLollipopOptions + ' + Me.toolStripMenuItemLollipopOptions.Name = "toolStripMenuItemLollipopOptions" + Me.toolStripMenuItemLollipopOptions.Size = New System.Drawing.Size(188, 22) + Me.toolStripMenuItemLollipopOptions.Text = "Lollipop Options" + ' 'toolStripMenuItemTreemapOptions ' Me.toolStripMenuItemTreemapOptions.Name = "toolStripMenuItemTreemapOptions" Me.toolStripMenuItemTreemapOptions.Size = New System.Drawing.Size(188, 22) Me.toolStripMenuItemTreemapOptions.Text = "Treemap Options" ' + 'toolStripMenuItemTreemapTextOptionsOptions + ' + Me.toolStripMenuItemTreemapTextOptionsOptions.Name = "toolStripMenuItemTreemapTextOptionsOptions" + Me.toolStripMenuItemTreemapTextOptionsOptions.Size = New System.Drawing.Size(188, 22) + Me.toolStripMenuItemTreemapTextOptionsOptions.Text = "Treemap Text Options" + ' 'toolStripMenuItemWordcloudOptions ' Me.toolStripMenuItemWordcloudOptions.Name = "toolStripMenuItemWordcloudOptions" @@ -510,7 +509,7 @@ Partial Class dlgBarAndPieChart Me.ucrNudLollipopSize.AutoSize = True Me.ucrNudLollipopSize.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudLollipopSize.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudLollipopSize.Location = New System.Drawing.Point(170, 405) + Me.ucrNudLollipopSize.Location = New System.Drawing.Point(170, 387) Me.ucrNudLollipopSize.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) Me.ucrNudLollipopSize.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudLollipopSize.Name = "ucrNudLollipopSize" @@ -531,17 +530,6 @@ Partial Class dlgBarAndPieChart Me.ucrNudMaxSize.TabIndex = 64 Me.ucrNudMaxSize.Value = New Decimal(New Integer() {1, 0, 0, 0}) ' - 'ucrInputLollipopColour - ' - Me.ucrInputLollipopColour.AddQuotesIfUnrecognised = True - Me.ucrInputLollipopColour.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrInputLollipopColour.GetSetSelectedIndex = -1 - Me.ucrInputLollipopColour.IsReadOnly = False - Me.ucrInputLollipopColour.Location = New System.Drawing.Point(276, 405) - Me.ucrInputLollipopColour.Name = "ucrInputLollipopColour" - Me.ucrInputLollipopColour.Size = New System.Drawing.Size(93, 21) - Me.ucrInputLollipopColour.TabIndex = 45 - ' 'ucrChkLollipop ' Me.ucrChkLollipop.AutoSize = True @@ -576,7 +564,7 @@ Partial Class dlgBarAndPieChart 'ucrSaveBar ' Me.ucrSaveBar.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrSaveBar.Location = New System.Drawing.Point(10, 461) + Me.ucrSaveBar.Location = New System.Drawing.Point(10, 512) Me.ucrSaveBar.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.ucrSaveBar.Name = "ucrSaveBar" Me.ucrSaveBar.Size = New System.Drawing.Size(372, 24) @@ -611,7 +599,7 @@ Partial Class dlgBarAndPieChart ' Me.ucrBase.AutoSize = True Me.ucrBase.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrBase.Location = New System.Drawing.Point(7, 491) + Me.ucrBase.Location = New System.Drawing.Point(7, 542) Me.ucrBase.Name = "ucrBase" Me.ucrBase.Size = New System.Drawing.Size(408, 52) Me.ucrBase.TabIndex = 60 @@ -863,18 +851,72 @@ Partial Class dlgBarAndPieChart Me.ucrChkIncreaseSize.Size = New System.Drawing.Size(88, 23) Me.ucrChkIncreaseSize.TabIndex = 63 ' - 'toolStripMenuItemTreemapTextOptionsOptions - ' - Me.toolStripMenuItemTreemapTextOptionsOptions.Name = "toolStripMenuItemTreemapTextOptionsOptions" - Me.toolStripMenuItemTreemapTextOptionsOptions.Size = New System.Drawing.Size(188, 22) - Me.toolStripMenuItemTreemapTextOptionsOptions.Text = "Treemap Text Options" + '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(327, 478) + Me.ucrInputStation.Name = "ucrInputStation" + Me.ucrInputStation.Size = New System.Drawing.Size(86, 21) + Me.ucrInputStation.TabIndex = 71 + ' + 'ucr1stFactorReceiver + ' + Me.ucr1stFactorReceiver.AutoSize = True + Me.ucr1stFactorReceiver.frmParent = Me + Me.ucr1stFactorReceiver.Location = New System.Drawing.Point(214, 479) + Me.ucr1stFactorReceiver.Margin = New System.Windows.Forms.Padding(0) + Me.ucr1stFactorReceiver.Name = "ucr1stFactorReceiver" + Me.ucr1stFactorReceiver.Selector = Nothing + Me.ucr1stFactorReceiver.Size = New System.Drawing.Size(109, 26) + Me.ucr1stFactorReceiver.strNcFilePath = "" + Me.ucr1stFactorReceiver.TabIndex = 70 + Me.ucr1stFactorReceiver.ucrSelector = Nothing + ' + 'lblFacetBy + ' + Me.lblFacetBy.AutoSize = True + Me.lblFacetBy.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.lblFacetBy.Location = New System.Drawing.Point(214, 464) + Me.lblFacetBy.Name = "lblFacetBy" + Me.lblFacetBy.Size = New System.Drawing.Size(52, 13) + Me.lblFacetBy.TabIndex = 69 + 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(97, 478) + Me.ucrInputLegendPosition.Name = "ucrInputLegendPosition" + Me.ucrInputLegendPosition.Size = New System.Drawing.Size(112, 21) + Me.ucrInputLegendPosition.TabIndex = 73 + ' + 'ucrChkLegend + ' + Me.ucrChkLegend.AutoSize = True + Me.ucrChkLegend.Checked = False + Me.ucrChkLegend.Location = New System.Drawing.Point(10, 479) + Me.ucrChkLegend.Name = "ucrChkLegend" + Me.ucrChkLegend.Size = New System.Drawing.Size(98, 24) + Me.ucrChkLegend.TabIndex = 72 ' 'dlgBarAndPieChart ' 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(415, 547) + Me.ClientSize = New System.Drawing.Size(415, 596) + Me.Controls.Add(Me.ucrInputStation) + Me.Controls.Add(Me.ucr1stFactorReceiver) + Me.Controls.Add(Me.lblFacetBy) + Me.Controls.Add(Me.ucrInputLegendPosition) + Me.Controls.Add(Me.ucrChkLegend) Me.Controls.Add(Me.cmdOptions) Me.Controls.Add(Me.ucrChkReorderValue) Me.Controls.Add(Me.ucrChkReorderFrequency) @@ -889,8 +931,6 @@ Partial Class dlgBarAndPieChart Me.Controls.Add(Me.rdoWordCloud) Me.Controls.Add(Me.lblLabel) Me.Controls.Add(Me.rdoTreeMap) - Me.Controls.Add(Me.ucrInputLollipopColour) - Me.Controls.Add(Me.lblLollipopColour) Me.Controls.Add(Me.lblLollipopSize) Me.Controls.Add(Me.ucrChkLollipop) Me.Controls.Add(Me.lblLabelSize) @@ -977,8 +1017,6 @@ Partial Class dlgBarAndPieChart Friend WithEvents ucrInputLabelColour As ucrInputComboBox Friend WithEvents lblLabelSize As Label Friend WithEvents ucrInputLabelSize As ucrInputComboBox - Friend WithEvents ucrInputLollipopColour As ucrInputComboBox - Friend WithEvents lblLollipopColour As Label Friend WithEvents ucrNudLollipopSize As ucrNud Friend WithEvents lblLollipopSize As Label Friend WithEvents ucrChkLollipop As ucrCheck @@ -1024,4 +1062,9 @@ Partial Class dlgBarAndPieChart Friend WithEvents cmdOptions As ucrSplitButton Friend WithEvents toolStripMenuItemLollipopOptions As ToolStripMenuItem Friend WithEvents toolStripMenuItemTreemapTextOptionsOptions As ToolStripMenuItem + Friend WithEvents ucrInputStation As ucrInputComboBox + Friend WithEvents ucr1stFactorReceiver As ucrReceiverSingle + Friend WithEvents lblFacetBy As Label + Friend WithEvents ucrInputLegendPosition As ucrInputComboBox + Friend WithEvents ucrChkLegend As ucrCheck End Class \ No newline at end of file diff --git a/instat/dlgBarAndPieChart.vb b/instat/dlgBarAndPieChart.vb index 75dc081567e..011f33a91c3 100644 --- a/instat/dlgBarAndPieChart.vb +++ b/instat/dlgBarAndPieChart.vb @@ -76,14 +76,29 @@ Public Class dlgBarAndPieChart Private clsGeomTextWordcloudAesFunction As New RFunction Private clsScaleSizeAreaFunction As New RFunction Private clsDummyFunction As New RFunction + Private clsThemeFunction As New RFunction Private clsPointsFunction As New RFunction Private clsGeomLollipopAesFunction As New RFunction + Private clsFacetFunction As New RFunction + Private clsFacetVariablesOperator As New ROperator + Private clsFacetRowOp As New ROperator + Private clsFacetColOp As New ROperator + Private clsPipeOperator As New ROperator + Private clsGroupByFunction As New RFunction + Private ReadOnly strAscending As String = "Ascending" Private ReadOnly strDescending As String = "Descending" Private ReadOnly strReverse As String = "Reverse" Private ReadOnly strNone As String = "None" + Private ReadOnly strFacetWrap As String = "Facet Wrap" + Private ReadOnly strFacetRow As String = "Facet Row" + Private ReadOnly strFacetCol As String = "Facet Column" + + Private bUpdateComboOptions As Boolean = True + Private bUpdatingParameters As Boolean = False + 'Parameter names for geoms Private strFirstParameterName As String = "geomfunc" Private strStatSummaryParameterName As String = "stat_summary" @@ -117,6 +132,7 @@ Public Class dlgBarAndPieChart Dim dctLayout As New Dictionary(Of String, String) Dim dctStart As New Dictionary(Of String, String) Dim dctPlace As New Dictionary(Of String, String) + Dim dctLegendPosition As New Dictionary(Of String, String) ucrBase.clsRsyntax.bExcludeAssignedFunctionOutput = False ucrBase.clsRsyntax.iCallType = 3 @@ -279,22 +295,6 @@ Public Class dlgBarAndPieChart ucrInputPlace.SetLinkedDisplayControl(lblPlace) ucrReceiverLabel.SetLinkedDisplayControl(lblLabel) - ucrInputLollipopColour.SetParameter(New RParameter("point.colour", 0)) - dctLollipopColours.Add("SteelBlue", Chr(34) & "steelBlue" & Chr(34)) - dctLollipopColours.Add("Black", Chr(34) & "black" & Chr(34)) - dctLollipopColours.Add("White", Chr(34) & "white" & Chr(34)) - dctLollipopColours.Add("Blue", Chr(34) & "blue" & Chr(34)) - dctLollipopColours.Add("Red", Chr(34) & "red" & Chr(34)) - dctLollipopColours.Add("Yellow", Chr(34) & "yellow" & Chr(34)) - dctLollipopColours.Add("Purple", Chr(34) & "purple" & Chr(34)) - dctLollipopColours.Add("Green", Chr(34) & "green" & Chr(34)) - dctLollipopColours.Add("Orange", Chr(34) & "orange" & Chr(34)) - dctLollipopColours.Add("Grey", Chr(34) & "grey" & Chr(34)) - dctLollipopColours.Add("Brown", Chr(34) & "brown" & Chr(34)) - dctLollipopColours.Add("Pink", Chr(34) & "pink" & Chr(34)) - ucrInputLollipopColour.SetItems(dctLollipopColours) - ucrInputLollipopColour.bAllowNonConditionValues = True - ucrNudLollipopSize.SetParameter(New RParameter("point.size", 1)) ucrNudLollipopSize.DecimalPlaces = 0 ucrNudLollipopSize.Increment = 1 @@ -304,9 +304,8 @@ Public Class dlgBarAndPieChart ucrChkLollipop.SetText("Lollipop") ucrChkLollipop.AddParameterPresentCondition(True, "geom_lollipop") ucrChkLollipop.AddParameterPresentCondition(False, "geom_lollipop", False) - ucrChkLollipop.AddToLinkedControls({ucrNudLollipopSize, ucrInputLollipopColour}, {True}, bNewLinkedHideIfParameterMissing:=True) + ucrChkLollipop.AddToLinkedControls({ucrNudLollipopSize}, {True}, bNewLinkedHideIfParameterMissing:=True) ucrNudLollipopSize.SetLinkedDisplayControl(lblLollipopSize) - ucrInputLollipopColour.SetLinkedDisplayControl(lblLollipopColour) ucrInputAddReorder.SetItems({strAscending, strDescending, strReverse, strNone}) ucrInputAddReorder.SetDropDownStyleAsNonEditable() @@ -359,6 +358,32 @@ Public Class dlgBarAndPieChart ucrInputPlace.SetRDefault(Chr(34) & "middle" & Chr(34)) ucrInputPlace.SetDropDownStyleAsNonEditable() + 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) + + ucr1stFactorReceiver.SetParameter(New RParameter("var1")) + ucr1stFactorReceiver.Selector = ucrBarChartSelector + ucr1stFactorReceiver.SetIncludedDataTypes({"factor"}) + ucr1stFactorReceiver.strSelectorHeading = "Factors" + ucr1stFactorReceiver.bWithQuotes = False + ucr1stFactorReceiver.SetParameterIsString() + ucr1stFactorReceiver.SetValuesToIgnore({"."}) + ucr1stFactorReceiver.SetParameterPosition(1) + ucr1stFactorReceiver.SetLinkedDisplayControl(lblFacetBy) + + ucrInputStation.SetItems({strFacetWrap, strFacetRow, strFacetCol, strNone}) + ucrInputStation.SetDropDownStyleAsNonEditable() + ucrNudMaxSize.SetParameter(New RParameter("max_size", 0)) ucrChkIncreaseSize.SetText("Increase size") ucrChkIncreaseSize.AddToLinkedControls(ucrNudMaxSize, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:=20) @@ -408,6 +433,15 @@ Public Class dlgBarAndPieChart clsDummyFunction = New RFunction clsPointsFunction = New RFunction clsGeomLollipopAesFunction = New RFunction + clsFacetFunction = New RFunction + clsFacetVariablesOperator = New ROperator + clsFacetRowOp = New ROperator + clsFacetColOp = New ROperator + clsPipeOperator = New ROperator + clsGroupByFunction = New RFunction + + ucrInputStation.SetName(strFacetWrap) + ucrInputStation.bUpdateRCodeFromControl = True ucrBarChartSelector.Reset() ucrBarChartSelector.SetGgplotFunction(clsBaseOperator) @@ -455,7 +489,6 @@ Public Class dlgBarAndPieChart clsGeomLollipopFunction.SetPackageName("ggalt") clsGeomLollipopFunction.SetRCommand("geom_lollipop") - clsGeomLollipopFunction.AddParameter("point.colour", "steelblue", iPosition:=0) clsGeomLollipopFunction.AddParameter("point.size", "1", iPosition:=1) clsGeomLollipopAesFunction.SetPackageName("ggplot2") @@ -569,6 +602,22 @@ Public Class dlgBarAndPieChart clsScaleSizeAreaFunction.SetPackageName("ggplot2") clsScaleSizeAreaFunction.SetRCommand("scale_size_area") + clsFacetFunction.SetPackageName("ggplot2") + clsFacetRowOp.SetOperation("+") + clsFacetRowOp.bBrackets = False + clsFacetColOp.SetOperation("+") + clsFacetColOp.bBrackets = False + clsFacetVariablesOperator.SetOperation("~") + clsFacetVariablesOperator.bForceIncludeOperation = True + clsFacetVariablesOperator.bBrackets = False + clsFacetFunction.AddParameter("facets", clsROperatorParameter:=clsFacetVariablesOperator, iPosition:=0) + + clsPipeOperator.SetOperation("%>%") + SetPipeAssignTo() + + clsGroupByFunction.SetPackageName("dplyr") + clsGroupByFunction.SetRCommand("group_by") + clsLabsFunction = GgplotDefaults.clsDefaultLabs.Clone() clsXlabFunction = GgplotDefaults.clsXlabTitleFunction.Clone() clsYlabFunction = GgplotDefaults.clsYlabTitleFunction.Clone() @@ -581,6 +630,7 @@ Public Class dlgBarAndPieChart clsXScaleDateFunction = GgplotDefaults.clsXScaleDateFunction.Clone() clsYScaleDateFunction = GgplotDefaults.clsYScaleDateFunction.Clone() clsThemeFuction = GgplotDefaults.clsDefaultThemeFunction.Clone + clsThemeFunction = GgplotDefaults.clsDefaultThemeFunction.Clone() dctThemeFunctions = New Dictionary(Of String, RFunction)(GgplotDefaults.dctThemeFunctions) clsLocalRaesFunction = GgplotDefaults.clsAesFunction.Clone() clsScaleFillViridisFunction = GgplotDefaults.clsScaleFillViridisFunction @@ -594,8 +644,6 @@ Public Class dlgBarAndPieChart End Sub Private Sub SetRCodeForControls(bReset As Boolean) - ucrBarChartSelector.AddAdditionalCodeParameterPair(clsSubsetFunction1, ucrBarChartSelector.GetParameter(), iAdditionalPairNo:=1) - ucrBarChartSelector.AddAdditionalCodeParameterPair(clsSubsetFunction2, ucrBarChartSelector.GetParameter(), iAdditionalPairNo:=2) ucrReceiverByFactor.AddAdditionalCodeParameterPair(clsIsEqualToOperator1, New RParameter("left", 0), iAdditionalPairNo:=1) ucrReceiverByFactor.AddAdditionalCodeParameterPair(clsIsEqualToOperator2, New RParameter("left", 0), iAdditionalPairNo:=2) ucrReceiverByFactor.AddAdditionalCodeParameterPair(clsLevelsFunction, New RParameter("x", 0), iAdditionalPairNo:=3) @@ -615,7 +663,6 @@ Public Class dlgBarAndPieChart ucrInputLabelPosition.SetRCode(clsGeomTextFunction, bReset) ucrInputLabelSize.SetRCode(clsGeomTextFunction, bReset) ucrNudLollipopSize.SetRCode(clsGeomLollipopFunction, bReset) - ucrInputLollipopColour.SetRCode(clsGeomLollipopFunction, bReset) ucrChkLollipop.SetRCode(clsBaseOperator, bReset) ucrReceiverArea.SetRCode(clsAsNumericFunction, bReset) ucrReceiverFill.SetRCode(clsGeomTreemapAesFunction, bReset) @@ -630,6 +677,8 @@ Public Class dlgBarAndPieChart ucrChkAddLabelsTreemap.SetRCode(clsBaseOperator, bReset) ucrNudMaxSize.SetRCode(clsScaleSizeAreaFunction, bReset) ucrChkReorderFrequency.SetRCode(clsDummyFunction, bReset) + ucrChkLegend.SetRCode(clsThemeFunction, bReset, bCloneIfNeeded:=True) + ucrInputLegendPosition.SetRCode(clsThemeFunction, bReset, bCloneIfNeeded:=True) If bReset Then ucrChkStart.SetRCode(clsGeomTreemapFunction, bReset) @@ -672,6 +721,18 @@ Public Class dlgBarAndPieChart 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 + Private Sub openSdgLayerOptions(clsNewGeomFunc As RFunction, clsNewAesFunction As RFunction) sdgLayerOptions.SetupLayer(clsNewGgPlot:=clsRggplotFunction, clsNewGeomFunc:=clsNewGeomFunc, clsNewGlobalAesFunc:=clsNewAesFunction, clsNewLocalAes:=clsLocalRaesFunction, @@ -725,7 +786,7 @@ Public Class dlgBarAndPieChart clsNewXLabsTitleFunction:=clsXlabFunction, clsNewYLabTitleFunction:=clsYlabFunction, clsNewLabsFunction:=clsLabsFunction, clsNewFacetFunction:=clsRFacetFunction, clsNewThemeFunction:=clsThemeFuction, dctNewThemeFunctions:=dctThemeFunctions, clsNewGlobalAesFunction:=clsTempGlobalAesFunction, ucrNewBaseSelector:=ucrBarChartSelector, clsNewCoordPolarFunction:=clsCoordPolarFunction, clsNewCoordPolarStartOperator:=clsCoordPolarStartOperator, clsNewXScaleDateFunction:=clsXScaleDateFunction, clsNewAnnotateFunction:=clsAnnotateFunction, - clsNewScaleFillViridisFunction:=clsScaleFillViridisFunction, clsNewScaleColourViridisFunction:=clsScaleColourViridisFunction, clsNewYScaleDateFunction:=clsYScaleDateFunction, + clsNewScaleFillViridisFunction:=clsScaleFillViridisFunction, clsNewScaleColourViridisFunction:=clsScaleColourViridisFunction, clsNewYScaleDateFunction:=clsYScaleDateFunction, clsNewFacetVariablesOperator:=clsFacetVariablesOperator, strMainDialogGeomParameterNames:=strGeomParameterNames, bReset:=bResetSubdialog) sdgPlots.ShowDialog() bResetSubdialog = False @@ -867,21 +928,26 @@ Public Class dlgBarAndPieChart clsReorderFunction.AddParameter("X", ucrVariablesAsFactorForBarChart.GetVariableNames(False), iPosition:=1) clsBarAesFunction.AddParameter("x", clsRFunctionParameter:=clsReorderFunction, iPosition:=0) clsPieAesFunction.AddParameter("x", clsRFunctionParameter:=clsReorderFunction, iPosition:=0) + clsGeomLollipopAesFunction.AddParameter("x", clsRFunctionParameter:=clsReorderFunction, iPosition:=0) Case strDescending clsReorderFunction.AddParameter("X", "-" & ucrVariablesAsFactorForBarChart.GetVariableNames(False), iPosition:=1) clsBarAesFunction.AddParameter("x", clsRFunctionParameter:=clsReorderFunction, iPosition:=0) clsPieAesFunction.AddParameter("x", clsRFunctionParameter:=clsReorderFunction, iPosition:=0) + clsGeomLollipopAesFunction.AddParameter("x", clsRFunctionParameter:=clsReorderFunction, iPosition:=0) Case strReverse clsForecatsReverse.AddParameter("f", ucrReceiverX.GetVariableNames(False), iPosition:=0) clsBarAesFunction.AddParameter("x", clsRFunctionParameter:=clsForecatsReverse, iPosition:=0) clsPieAesFunction.AddParameter("x", clsRFunctionParameter:=clsForecatsReverse, iPosition:=0) + clsGeomLollipopAesFunction.AddParameter("x", clsRFunctionParameter:=clsForecatsReverse, iPosition:=0) Case strNone clsBarAesFunction.AddParameter("x", ucrReceiverX.GetVariableNames(False), iPosition:=0) clsPieAesFunction.AddParameter("x", ucrReceiverX.GetVariableNames(False), iPosition:=0) + clsGeomLollipopAesFunction.AddParameter("x", ucrReceiverX.GetVariableNames(False), iPosition:=0) End Select Else clsBarAesFunction.AddParameter("x", ucrReceiverX.GetVariableNames(False), iPosition:=1) clsPieAesFunction.AddParameter("x", ucrReceiverX.GetVariableNames(False), iPosition:=0) + clsGeomLollipopAesFunction.AddParameter("x", ucrReceiverX.GetVariableNames(False), iPosition:=1) End If If ucrChkPolarCoordinates.Checked Then If rdoPie.Checked OrElse rdoDonut.Checked Then @@ -909,17 +975,21 @@ Public Class dlgBarAndPieChart clsReorderFunctionValue.AddParameter("X", ucrVariablesAsFactorForBarChart.GetVariableNames(False), iPosition:=1) clsBarAesFunction.AddParameter("fill", clsRFunctionParameter:=clsReorderFunctionValue, iPosition:=2) clsPieAesFunction.AddParameter("fill", clsRFunctionParameter:=clsReorderFunctionValue, iPosition:=2) + clsGeomLollipopAesFunction.AddParameter("colour", clsRFunctionParameter:=clsReorderFunctionValue, iPosition:=2) Case strDescending clsReorderFunctionValue.AddParameter("X", "-" & ucrVariablesAsFactorForBarChart.GetVariableNames(False), iPosition:=1) clsBarAesFunction.AddParameter("fill", clsRFunctionParameter:=clsReorderFunctionValue, iPosition:=2) clsPieAesFunction.AddParameter("fill", clsRFunctionParameter:=clsReorderFunctionValue, iPosition:=2) + clsGeomLollipopAesFunction.AddParameter("colour", clsRFunctionParameter:=clsReorderFunctionValue, iPosition:=2) Case strReverse clsForecatsReverseValue.AddParameter("f", ucrReceiverByFactor.GetVariableNames(False), iPosition:=0) clsBarAesFunction.AddParameter("fill", clsRFunctionParameter:=clsForecatsReverseValue, iPosition:=2) clsPieAesFunction.AddParameter("fill", clsRFunctionParameter:=clsForecatsReverseValue, iPosition:=2) + clsGeomLollipopAesFunction.AddParameter("colour", clsRFunctionParameter:=clsForecatsReverseValue, iPosition:=2) Case strNone clsBarAesFunction.AddParameter("fill", ucrReceiverByFactor.GetVariableNames(False), iPosition:=1) clsPieAesFunction.AddParameter("fill", ucrReceiverByFactor.GetVariableNames(False), iPosition:=2) + clsGeomLollipopAesFunction.AddParameter("colour", ucrReceiverByFactor.GetVariableNames(False), iPosition:=1) End Select End If End If @@ -936,7 +1006,10 @@ Public Class dlgBarAndPieChart clsRggplotFunction.RemoveParameterByName("aes") clsGeomLollipopAesFunction.RemoveParameterByName("x") clsGeomLollipopAesFunction.RemoveParameterByName("y") - clsGeomLollipopAesFunction.RemoveParameterByName("fill") + clsGeomLollipopAesFunction.RemoveParameterByName("colour") + clsRgeomBarFunction1.RemoveParameterByName("stat") + clsRgeomBarFunction2.RemoveParameterByName("stat") + clsRgeomBarFunction.RemoveParameterByName("stat") If rdoValue.Checked Then clsBarAesFunction.AddParameter("x", ucrReceiverX.GetVariableNames(False), iPosition:=0) clsBarAesFunction.AddParameter("y", ucrVariablesAsFactorForBarChart.GetVariableNames(False), iPosition:=1) @@ -951,7 +1024,7 @@ Public Class dlgBarAndPieChart End If clsGeomLollipopAesFunction.AddParameter("x", ucrReceiverX.GetVariableNames(False), iPosition:=0) clsGeomLollipopAesFunction.AddParameter("y", ucrVariablesAsFactorForBarChart.GetVariableNames(False), iPosition:=1) - clsGeomLollipopAesFunction.AddParameter("fill", ucrReceiverByFactor.GetVariableNames(False), iPosition:=2) + clsGeomLollipopAesFunction.AddParameter("colour", ucrReceiverByFactor.GetVariableNames(False), iPosition:=2) clsRgeomBarFunction1.AddParameter("stat", Chr(34) & "identity" & Chr(34), iPosition:=2) clsRgeomBarFunction2.AddParameter("stat", Chr(34) & "identity" & Chr(34), iPosition:=1) clsRgeomBarFunction.AddParameter("stat", Chr(34) & "identity" & Chr(34), iPosition:=1) @@ -962,6 +1035,7 @@ Public Class dlgBarAndPieChart If ucrReceiverX.IsEmpty Then clsBarAesFunction.AddParameter("x", Chr(34) & Chr(34), iPosition:=0) clsPieAesFunction.AddParameter("x", Chr(34) & Chr(34), iPosition:=0) + clsGeomLollipopAesFunction.AddParameter("x", Chr(34) & Chr(34), iPosition:=0) End If If ucrVariablesAsFactorForBarChart.IsEmpty Then clsBarAesFunction.AddParameter("y", Chr(34) & Chr(34), iPosition:=1) @@ -971,6 +1045,7 @@ Public Class dlgBarAndPieChart clsBarAesFunction.AddParameter("fill", Chr(34) & Chr(34), iPosition:=2) clsPieAesFunction.AddParameter("fill", Chr(34) & Chr(34), iPosition:=2) clsRgeomBarFunction.RemoveParameterByName("position") + clsGeomLollipopAesFunction.AddParameter("colour", Chr(34) & Chr(34), iPosition:=2) End If If ucrChkLollipop.Checked Then clsRggplotFunction.AddParameter("mapping", clsRFunctionParameter:=clsGeomLollipopAesFunction, iPosition:=1) @@ -998,12 +1073,10 @@ Public Class dlgBarAndPieChart clsBarAesFunction.AddParameter("fill", ucrReceiverByFactor.GetVariableNames(False), iPosition:=1) clsPieAesFunction.AddParameter("fill", ucrReceiverByFactor.GetVariableNames(False), iPosition:=1) End If - clsRgeomBarFunction1.AddParameter("stat", Chr(34) & "count" & Chr(34), iPosition:=2) clsRgeomBarFunction.AddParameter("stat", Chr(34) & "count" & Chr(34), iPosition:=1) clsRgeomBarFunction2.RemoveParameterByName("stat") End If clsRgeomBarFunction.AddParameter("stat", Chr(34) & "count" & Chr(34), iPosition:=1) - clsBaseOperator.AddParameter("geom_bar", clsRFunctionParameter:=clsRgeomBarFunction, iPosition:=2) clsBaseOperator.RemoveParameterByName("geom_treemap") clsBaseOperator.RemoveParameterByName("geom_text_wordcloud") ElseIf rdoTreeMap.Checked Then @@ -1027,6 +1100,164 @@ Public Class dlgBarAndPieChart UpdateParameter() End Sub + Private Sub AutoFacetStation() + Dim currentReceiver As ucrReceiver = ucrBarChartSelector.CurrentReceiver + + If currentReceiver IsNot Nothing Then + ucr1stFactorReceiver.AddItemsWithMetadataProperty(ucrBarChartSelector.ucrAvailableDataFrames.cboAvailableDataFrames.Text, "Climatic_Type", {"station_label"}) + currentReceiver.SetMeAsReceiver() + AddRemoveGroupBy() + End If + End Sub + + Private Sub ucrInput_ControlValueChanged(ucrChangedControl As ucrInputComboBox) Handles ucrInputStation.ControlValueChanged + If Not bUpdateComboOptions Then + Exit Sub + End If + Dim strChangedText As String = ucrChangedControl.GetText() + If strChangedText <> strNone Then + If Not strChangedText = strFacetCol AndAlso Not strChangedText = strFacetRow AndAlso + Not ucrInputStation.Equals(ucrChangedControl) AndAlso ucrInputStation.GetText() = strChangedText Then + bUpdateComboOptions = False + ucrInputStation.SetName(strNone) + bUpdateComboOptions = True + End If + If (strChangedText = strFacetWrap AndAlso ucrInputStation.GetText = strFacetRow) OrElse (strChangedText = strFacetRow AndAlso + ucrInputStation.GetText = strFacetWrap) OrElse (strChangedText = strFacetWrap AndAlso + ucrInputStation.GetText = strFacetCol) OrElse (strChangedText = strFacetCol AndAlso ucrInputStation.GetText = strFacetWrap) Then + ucrInputStation.SetName(strNone) + End If + End If + UpdateParameters() + AddRemoveFacets() + AddRemoveGroupBy() + End Sub + + Private Sub UpdateParameters() + clsFacetVariablesOperator.RemoveParameterByName("var1") + clsFacetColOp.RemoveParameterByName("col" & ucrInputStation.Name) + clsFacetRowOp.RemoveParameterByName("row" & ucrInputStation.Name) + + clsBaseOperator.RemoveParameterByName("facets") + bUpdatingParameters = True + ucr1stFactorReceiver.SetRCode(Nothing) + Select Case ucrInputStation.GetText() + Case strFacetWrap + ucr1stFactorReceiver.ChangeParameterName("var1") + ucr1stFactorReceiver.SetRCode(clsFacetVariablesOperator) + Case strFacetCol + ucr1stFactorReceiver.ChangeParameterName("col" & ucrInputStation.Name) + ucr1stFactorReceiver.SetRCode(clsFacetColOp) + Case strFacetRow + ucr1stFactorReceiver.ChangeParameterName("row" & ucrInputStation.Name) + ucr1stFactorReceiver.SetRCode(clsFacetRowOp) + End Select + If Not clsRFacetFunction.ContainsParameter("x") Then + clsRFacetFunction.AddParameter("x", Chr(34) & Chr(34)) + End If + bUpdatingParameters = False + End Sub + + Private Sub AddRemoveFacets() + Dim bWrap As Boolean = False + Dim bCol As Boolean = False + Dim bRow As Boolean = False + + If bUpdatingParameters Then + Exit Sub + End If + + clsBaseOperator.RemoveParameterByName("facets") + If Not ucr1stFactorReceiver.IsEmpty Then + Select Case ucrInputStation.GetText() + Case strFacetWrap + bWrap = True + Case strFacetCol + bCol = True + Case strFacetRow + bRow = True + End Select + End If + + If bWrap OrElse bRow OrElse bCol Then + clsBaseOperator.AddParameter("facets", clsRFunctionParameter:=clsFacetFunction) + End If + If bWrap Then + clsFacetFunction.SetRCommand("facet_wrap") + End If + If bRow OrElse bCol Then + clsFacetFunction.SetRCommand("facet_grid") + End If + If bRow Then + clsFacetVariablesOperator.AddParameter("left", clsROperatorParameter:=clsFacetRowOp, iPosition:=0) + ElseIf bCol AndAlso bWrap = False Then + clsFacetVariablesOperator.AddParameter("left", ".", iPosition:=0) + Else + clsFacetVariablesOperator.RemoveParameterByName("left") + End If + If bCol Then + clsFacetVariablesOperator.AddParameter("right", clsROperatorParameter:=clsFacetColOp, iPosition:=1) + ElseIf bRow AndAlso bWrap = False Then + clsFacetVariablesOperator.AddParameter("right", ".", iPosition:=1) + Else + clsFacetVariablesOperator.RemoveParameterByName("right") + End If + End Sub + + Private Sub ucr1stFactorReceiver_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucr1stFactorReceiver.ControlValueChanged, ucrReceiverX.ControlValueChanged + AddRemoveFacets() + AddRemoveGroupBy() + End Sub + + Private Sub GetParameterValue(clsOperator As ROperator) + Dim i As Integer = 0 + For Each clsTempParam As RParameter In clsOperator.clsParameters + If clsTempParam.strArgumentValue <> "" AndAlso clsTempParam.strArgumentValue <> "." Then + clsGroupByFunction.AddParameter(i, clsTempParam.strArgumentValue, bIncludeArgumentName:=False, iPosition:=i) + i = i + 1 + End If + Next + End Sub + + Private Sub AddRemoveGroupBy() + If clsPipeOperator.ContainsParameter("mutate") Then + clsGroupByFunction.ClearParameters() + If clsBaseOperator.ContainsParameter("facets") Then + Select Case ucrInputStation.GetText() + Case strFacetWrap + GetParameterValue(clsFacetVariablesOperator) + Case strFacetCol + GetParameterValue(clsFacetColOp) + Case strFacetRow + GetParameterValue(clsFacetRowOp) + End Select + End If + + If clsGroupByFunction.iParameterCount > 0 Then + clsPipeOperator.AddParameter("group_by", clsRFunctionParameter:=clsGroupByFunction, iPosition:=1) + Else + clsPipeOperator.RemoveParameterByName("group_by") + End If + Else + clsPipeOperator.RemoveParameterByName("group_by") + End If + + SetPipeAssignTo() + End Sub + + Private Sub SetPipeAssignTo() + If ucrBarChartSelector.ucrAvailableDataFrames.cboAvailableDataFrames.Text <> "" AndAlso clsPipeOperator.clsParameters.Count > 1 Then + clsPipeOperator.SetAssignTo(ucrBarChartSelector.ucrAvailableDataFrames.cboAvailableDataFrames.Text) + Else + clsPipeOperator.RemoveAssignTo() + End If + End Sub + + Private Sub ucrBarChartSelector_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrBarChartSelector.ControlValueChanged + AutoFacetStation() + SetPipeAssignTo() + End Sub + Private Sub ucrPnlOptions_ControlValueChanged() Handles ucrPnlOptions.ControlValueChanged, ucrVariablesAsFactorForBarChart.ControlValueChanged, ucrReceiverX.ControlValueChanged, ucrReceiverByFactor.ControlValueChanged, ucrReceiverLabel.ControlValueChanged, ucrChkAddLabelsText.ControlValueChanged, ucrChkReorderValue.ControlValueChanged, ucrInputReorderX.ControlValueChanged, @@ -1069,8 +1300,10 @@ Public Class dlgBarAndPieChart ucrChkPolarCoordinates.Enabled = False ucrChkPolarCoordinates.Checked = Not ucrChkBacktoback.Checked clsBaseOperator.RemoveParameterByName("geom_bar") - clsSubsetFunction1.AddParameter("subset", clsROperatorParameter:=clsIsEqualToOperator1, iPosition:=1, bIncludeArgumentName:=False) - clsSubsetFunction2.AddParameter("subset", clsROperatorParameter:=clsIsEqualToOperator2, iPosition:=1, bIncludeArgumentName:=False) + clsSubsetFunction1.AddParameter("data", ucrBarChartSelector.ucrAvailableDataFrames.cboAvailableDataFrames.Text, iPosition:=1, bIncludeArgumentName:=False) + clsSubsetFunction1.AddParameter("subset", clsROperatorParameter:=clsIsEqualToOperator1, iPosition:=2, bIncludeArgumentName:=False) + clsSubsetFunction2.AddParameter("data", ucrBarChartSelector.ucrAvailableDataFrames.cboAvailableDataFrames.Text, iPosition:=1, bIncludeArgumentName:=False) + clsSubsetFunction2.AddParameter("subset", clsROperatorParameter:=clsIsEqualToOperator2, iPosition:=2, bIncludeArgumentName:=False) clsBaseOperator.AddParameter("geom_bar2", clsRFunctionParameter:=clsRgeomBarFunction2, iPosition:=1) clsBaseOperator.AddParameter("geom_bar1", clsRFunctionParameter:=clsRgeomBarFunction1, iPosition:=2) clsBaseOperator.AddParameter("scale_y_symmetric", clsRFunctionParameter:=clsScaleYSymmetricFunction, iPosition:=3) @@ -1080,8 +1313,8 @@ Public Class dlgBarAndPieChart clsRgeomBarFunction2.AddParameter("aes", clsRFunctionParameter:=clsAesFunction1, iPosition:=1) clsRgeomBarFunction1.AddParameter("aes", clsRFunctionParameter:=clsAesFunction2, iPosition:=1) Else - clsAesFunction1.AddParameter("y", "..count..*(-1)", iPosition:=0) - clsRgeomBarFunction1.AddParameter("aes", clsRFunctionParameter:=clsAesFunction1, iPosition:=1) + clsAesFunction1.AddParameter("y", "after_stat(count) * (-1)", iPosition:=0) + clsRgeomBarFunction1.AddParameter("aes", clsRFunctionParameter:=clsAesFunction1, iPosition:=1, bIncludeArgumentName:=False) End If End If End If diff --git a/instat/dlgBoxPlot.designer.vb b/instat/dlgBoxPlot.designer.vb index a722ae22baf..730ec0f7f5a 100644 --- a/instat/dlgBoxPlot.designer.vb +++ b/instat/dlgBoxPlot.designer.vb @@ -53,6 +53,15 @@ Partial Class dlgBoxplot Me.toolStripMenuItemSummaryOptions = New System.Windows.Forms.ToolStripMenuItem() Me.toolStripMenuItemTufteOptions = New System.Windows.Forms.ToolStripMenuItem() Me.toolStripMenuItemViolinOptions = New System.Windows.Forms.ToolStripMenuItem() + Me.lblFacetBy = New System.Windows.Forms.Label() + Me.ucrNudBoxPlot = New instat.ucrNud() + Me.ucrChkBoxPlot = New instat.ucrCheck() + Me.ucrInputWidth = New instat.ucrInputTextBox() + Me.ucrChkWidth = New instat.ucrCheck() + Me.ucrInputStation = New instat.ucrInputComboBox() + Me.ucr1stFactorReceiver = New instat.ucrReceiverSingle() + Me.ucrInputLegendPosition = New instat.ucrInputComboBox() + Me.ucrChkLegend = New instat.ucrCheck() Me.ucrInputSummaries = New instat.ucrInputComboBox() Me.cmdOptions = New instat.ucrSplitButton() Me.ucrChkTufte = New instat.ucrCheck() @@ -60,7 +69,6 @@ Partial Class dlgBoxplot Me.ucrNudTransparency = New instat.ucrNud() Me.ucrNudJitter = New instat.ucrNud() Me.ucrChkAddPoints = New instat.ucrCheck() - Me.ucrChkSwapParameters = New instat.ucrCheck() Me.ucrSaveBoxplot = New instat.ucrSave() Me.ucrChkHorizontalBoxplot = New instat.ucrCheck() Me.ucrChkVarWidth = New instat.ucrCheck() @@ -70,6 +78,7 @@ Partial Class dlgBoxplot Me.ucrByFactorsReceiver = New instat.ucrReceiverSingle() Me.ucrBase = New instat.ucrButtons() Me.ucrPnlPlots = New instat.UcrPanel() + Me.lblWidth = New System.Windows.Forms.Label() Me.contextMenuStripOptions.SuspendLayout() Me.SuspendLayout() ' @@ -79,10 +88,10 @@ Partial Class dlgBoxplot Me.lblByFactors.ImeMode = System.Windows.Forms.ImeMode.NoControl Me.lblByFactors.Location = New System.Drawing.Point(272, 205) Me.lblByFactors.Name = "lblByFactors" - Me.lblByFactors.Size = New System.Drawing.Size(88, 13) + Me.lblByFactors.Size = New System.Drawing.Size(83, 13) Me.lblByFactors.TabIndex = 6 Me.lblByFactors.Tag = "By_Factor:" - Me.lblByFactors.Text = "Factor (Optional):" + Me.lblByFactors.Text = "Factor (Usually):" ' 'lblBySecondFactor ' @@ -108,7 +117,7 @@ Partial Class dlgBoxplot Me.rdoBoxplotTufte.Size = New System.Drawing.Size(133, 27) Me.rdoBoxplotTufte.TabIndex = 1 Me.rdoBoxplotTufte.TabStop = True - Me.rdoBoxplotTufte.Text = "Boxplot/Tufte Boxplot" + Me.rdoBoxplotTufte.Text = "Boxplot" Me.rdoBoxplotTufte.TextAlign = System.Drawing.ContentAlignment.MiddleCenter Me.rdoBoxplotTufte.UseVisualStyleBackColor = True ' @@ -150,7 +159,7 @@ Partial Class dlgBoxplot ' Me.lblJitter.AutoSize = True Me.lblJitter.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblJitter.Location = New System.Drawing.Point(128, 360) + Me.lblJitter.Location = New System.Drawing.Point(128, 362) Me.lblJitter.Name = "lblJitter" Me.lblJitter.Size = New System.Drawing.Size(32, 13) Me.lblJitter.TabIndex = 18 @@ -161,7 +170,7 @@ Partial Class dlgBoxplot ' Me.lblTransparency.AutoSize = True Me.lblTransparency.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblTransparency.Location = New System.Drawing.Point(223, 359) + Me.lblTransparency.Location = New System.Drawing.Point(223, 361) Me.lblTransparency.Name = "lblTransparency" Me.lblTransparency.Size = New System.Drawing.Size(75, 13) Me.lblTransparency.TabIndex = 20 @@ -172,51 +181,148 @@ Partial Class dlgBoxplot ' Me.contextMenuStripOptions.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.toolStripMenuItemPlotOptions, Me.toolStripMenuItemBoxOptions, Me.toolStripMenuItemJitterOptions, Me.toolStripMenuItemSummaryOptions, Me.toolStripMenuItemTufteOptions, Me.toolStripMenuItemViolinOptions}) Me.contextMenuStripOptions.Name = "contextMenuStripOk" - Me.contextMenuStripOptions.Size = New System.Drawing.Size(181, 158) + Me.contextMenuStripOptions.Size = New System.Drawing.Size(171, 136) ' 'toolStripMenuItemPlotOptions ' Me.toolStripMenuItemPlotOptions.Name = "toolStripMenuItemPlotOptions" - Me.toolStripMenuItemPlotOptions.Size = New System.Drawing.Size(180, 22) + Me.toolStripMenuItemPlotOptions.Size = New System.Drawing.Size(170, 22) Me.toolStripMenuItemPlotOptions.Text = "Plot Options" ' 'toolStripMenuItemBoxOptions ' Me.toolStripMenuItemBoxOptions.Name = "toolStripMenuItemBoxOptions" - Me.toolStripMenuItemBoxOptions.Size = New System.Drawing.Size(180, 22) + Me.toolStripMenuItemBoxOptions.Size = New System.Drawing.Size(170, 22) Me.toolStripMenuItemBoxOptions.Text = "Boxplot Options" ' 'toolStripMenuItemJitterOptions ' Me.toolStripMenuItemJitterOptions.Name = "toolStripMenuItemJitterOptions" - Me.toolStripMenuItemJitterOptions.Size = New System.Drawing.Size(180, 22) + Me.toolStripMenuItemJitterOptions.Size = New System.Drawing.Size(170, 22) Me.toolStripMenuItemJitterOptions.Text = "Jitter Options" ' 'toolStripMenuItemSummaryOptions ' Me.toolStripMenuItemSummaryOptions.Name = "toolStripMenuItemSummaryOptions" - Me.toolStripMenuItemSummaryOptions.Size = New System.Drawing.Size(180, 22) + Me.toolStripMenuItemSummaryOptions.Size = New System.Drawing.Size(170, 22) Me.toolStripMenuItemSummaryOptions.Text = "Summary Options" ' 'toolStripMenuItemTufteOptions ' Me.toolStripMenuItemTufteOptions.Name = "toolStripMenuItemTufteOptions" - Me.toolStripMenuItemTufteOptions.Size = New System.Drawing.Size(180, 22) + Me.toolStripMenuItemTufteOptions.Size = New System.Drawing.Size(170, 22) Me.toolStripMenuItemTufteOptions.Text = "Tufte Options" ' 'toolStripMenuItemViolinOptions ' Me.toolStripMenuItemViolinOptions.Name = "toolStripMenuItemViolinOptions" - Me.toolStripMenuItemViolinOptions.Size = New System.Drawing.Size(180, 22) + Me.toolStripMenuItemViolinOptions.Size = New System.Drawing.Size(170, 22) Me.toolStripMenuItemViolinOptions.Text = "Violin Options" ' + 'lblFacetBy + ' + Me.lblFacetBy.AutoSize = True + Me.lblFacetBy.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.lblFacetBy.Location = New System.Drawing.Point(222, 376) + Me.lblFacetBy.Name = "lblFacetBy" + Me.lblFacetBy.Size = New System.Drawing.Size(52, 13) + Me.lblFacetBy.TabIndex = 24 + Me.lblFacetBy.Tag = "" + Me.lblFacetBy.Text = "Facet By:" + ' + 'ucrNudBoxPlot + ' + Me.ucrNudBoxPlot.AutoSize = True + Me.ucrNudBoxPlot.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudBoxPlot.Increment = New Decimal(New Integer() {1, 0, 0, 0}) + Me.ucrNudBoxPlot.Location = New System.Drawing.Point(165, 335) + Me.ucrNudBoxPlot.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) + Me.ucrNudBoxPlot.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudBoxPlot.Name = "ucrNudBoxPlot" + Me.ucrNudBoxPlot.Size = New System.Drawing.Size(50, 20) + Me.ucrNudBoxPlot.TabIndex = 32 + Me.ucrNudBoxPlot.Value = New Decimal(New Integer() {0, 0, 0, 0}) + ' + 'ucrChkBoxPlot + ' + Me.ucrChkBoxPlot.AutoSize = True + Me.ucrChkBoxPlot.Checked = False + Me.ucrChkBoxPlot.Location = New System.Drawing.Point(11, 334) + Me.ucrChkBoxPlot.Name = "ucrChkBoxPlot" + Me.ucrChkBoxPlot.Size = New System.Drawing.Size(114, 23) + Me.ucrChkBoxPlot.TabIndex = 31 + ' + 'ucrInputWidth + ' + Me.ucrInputWidth.AddQuotesIfUnrecognised = True + Me.ucrInputWidth.AutoSize = True + Me.ucrInputWidth.IsMultiline = False + Me.ucrInputWidth.IsReadOnly = False + Me.ucrInputWidth.Location = New System.Drawing.Point(130, 311) + Me.ucrInputWidth.Name = "ucrInputWidth" + Me.ucrInputWidth.Size = New System.Drawing.Size(69, 21) + Me.ucrInputWidth.TabIndex = 30 + ' + 'ucrChkWidth + ' + Me.ucrChkWidth.AutoSize = True + Me.ucrChkWidth.Checked = False + Me.ucrChkWidth.Location = New System.Drawing.Point(10, 310) + Me.ucrChkWidth.Name = "ucrChkWidth" + Me.ucrChkWidth.Size = New System.Drawing.Size(121, 23) + Me.ucrChkWidth.TabIndex = 29 + ' + '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, 390) + Me.ucrInputStation.Name = "ucrInputStation" + Me.ucrInputStation.Size = New System.Drawing.Size(86, 21) + Me.ucrInputStation.TabIndex = 26 + ' + 'ucr1stFactorReceiver + ' + Me.ucr1stFactorReceiver.AutoSize = True + Me.ucr1stFactorReceiver.frmParent = Me + Me.ucr1stFactorReceiver.Location = New System.Drawing.Point(222, 391) + Me.ucr1stFactorReceiver.Margin = New System.Windows.Forms.Padding(0) + Me.ucr1stFactorReceiver.Name = "ucr1stFactorReceiver" + Me.ucr1stFactorReceiver.Selector = Nothing + Me.ucr1stFactorReceiver.Size = New System.Drawing.Size(109, 26) + Me.ucr1stFactorReceiver.strNcFilePath = "" + Me.ucr1stFactorReceiver.TabIndex = 25 + 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(105, 390) + Me.ucrInputLegendPosition.Name = "ucrInputLegendPosition" + Me.ucrInputLegendPosition.Size = New System.Drawing.Size(112, 21) + Me.ucrInputLegendPosition.TabIndex = 28 + ' + 'ucrChkLegend + ' + Me.ucrChkLegend.AutoSize = True + Me.ucrChkLegend.Checked = False + Me.ucrChkLegend.Location = New System.Drawing.Point(10, 388) + Me.ucrChkLegend.Name = "ucrChkLegend" + Me.ucrChkLegend.Size = New System.Drawing.Size(98, 24) + Me.ucrChkLegend.TabIndex = 27 + ' 'ucrInputSummaries ' Me.ucrInputSummaries.AddQuotesIfUnrecognised = True Me.ucrInputSummaries.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink Me.ucrInputSummaries.GetSetSelectedIndex = -1 Me.ucrInputSummaries.IsReadOnly = False - Me.ucrInputSummaries.Location = New System.Drawing.Point(130, 327) + Me.ucrInputSummaries.Location = New System.Drawing.Point(130, 285) Me.ucrInputSummaries.Name = "ucrInputSummaries" Me.ucrInputSummaries.Size = New System.Drawing.Size(81, 21) Me.ucrInputSummaries.TabIndex = 16 @@ -247,7 +353,7 @@ Partial Class dlgBoxplot ' Me.ucrChkGrouptoConnect.AutoSize = True Me.ucrChkGrouptoConnect.Checked = False - Me.ucrChkGrouptoConnect.Location = New System.Drawing.Point(10, 328) + Me.ucrChkGrouptoConnect.Location = New System.Drawing.Point(10, 285) Me.ucrChkGrouptoConnect.Name = "ucrChkGrouptoConnect" Me.ucrChkGrouptoConnect.Size = New System.Drawing.Size(144, 23) Me.ucrChkGrouptoConnect.TabIndex = 15 @@ -257,7 +363,7 @@ Partial Class dlgBoxplot Me.ucrNudTransparency.AutoSize = True Me.ucrNudTransparency.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudTransparency.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudTransparency.Location = New System.Drawing.Point(301, 356) + Me.ucrNudTransparency.Location = New System.Drawing.Point(301, 358) Me.ucrNudTransparency.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) Me.ucrNudTransparency.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudTransparency.Name = "ucrNudTransparency" @@ -270,7 +376,7 @@ Partial Class dlgBoxplot Me.ucrNudJitter.AutoSize = True Me.ucrNudJitter.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudJitter.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudJitter.Location = New System.Drawing.Point(164, 356) + Me.ucrNudJitter.Location = New System.Drawing.Point(164, 358) Me.ucrNudJitter.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) Me.ucrNudJitter.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudJitter.Name = "ucrNudJitter" @@ -282,25 +388,15 @@ Partial Class dlgBoxplot ' Me.ucrChkAddPoints.AutoSize = True Me.ucrChkAddPoints.Checked = False - Me.ucrChkAddPoints.Location = New System.Drawing.Point(10, 356) + Me.ucrChkAddPoints.Location = New System.Drawing.Point(10, 358) Me.ucrChkAddPoints.Name = "ucrChkAddPoints" Me.ucrChkAddPoints.Size = New System.Drawing.Size(115, 23) Me.ucrChkAddPoints.TabIndex = 17 ' - 'ucrChkSwapParameters - ' - Me.ucrChkSwapParameters.AutoSize = True - Me.ucrChkSwapParameters.Checked = False - Me.ucrChkSwapParameters.Enabled = False - Me.ucrChkSwapParameters.Location = New System.Drawing.Point(275, 290) - Me.ucrChkSwapParameters.Name = "ucrChkSwapParameters" - Me.ucrChkSwapParameters.Size = New System.Drawing.Size(145, 23) - Me.ucrChkSwapParameters.TabIndex = 10 - ' 'ucrSaveBoxplot ' Me.ucrSaveBoxplot.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrSaveBoxplot.Location = New System.Drawing.Point(10, 384) + Me.ucrSaveBoxplot.Location = New System.Drawing.Point(10, 415) Me.ucrSaveBoxplot.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.ucrSaveBoxplot.Name = "ucrSaveBoxplot" Me.ucrSaveBoxplot.Size = New System.Drawing.Size(328, 24) @@ -310,7 +406,7 @@ Partial Class dlgBoxplot ' Me.ucrChkHorizontalBoxplot.AutoSize = True Me.ucrChkHorizontalBoxplot.Checked = False - Me.ucrChkHorizontalBoxplot.Location = New System.Drawing.Point(10, 300) + Me.ucrChkHorizontalBoxplot.Location = New System.Drawing.Point(10, 263) Me.ucrChkHorizontalBoxplot.Name = "ucrChkHorizontalBoxplot" Me.ucrChkHorizontalBoxplot.Size = New System.Drawing.Size(238, 23) Me.ucrChkHorizontalBoxplot.TabIndex = 14 @@ -319,9 +415,9 @@ Partial Class dlgBoxplot ' Me.ucrChkVarWidth.AutoSize = True Me.ucrChkVarWidth.Checked = False - Me.ucrChkVarWidth.Location = New System.Drawing.Point(10, 272) + Me.ucrChkVarWidth.Location = New System.Drawing.Point(275, 290) Me.ucrChkVarWidth.Name = "ucrChkVarWidth" - Me.ucrChkVarWidth.Size = New System.Drawing.Size(238, 23) + Me.ucrChkVarWidth.Size = New System.Drawing.Size(146, 23) Me.ucrChkVarWidth.TabIndex = 13 ' 'ucrVariablesAsFactorForBoxplot @@ -379,7 +475,7 @@ Partial Class dlgBoxplot ' Me.ucrBase.AutoSize = True Me.ucrBase.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrBase.Location = New System.Drawing.Point(10, 412) + Me.ucrBase.Location = New System.Drawing.Point(10, 442) Me.ucrBase.Name = "ucrBase" Me.ucrBase.Size = New System.Drawing.Size(408, 52) Me.ucrBase.TabIndex = 23 @@ -392,12 +488,33 @@ Partial Class dlgBoxplot Me.ucrPnlPlots.Size = New System.Drawing.Size(410, 35) Me.ucrPnlPlots.TabIndex = 0 ' + 'lblWidth + ' + Me.lblWidth.AutoSize = True + Me.lblWidth.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.lblWidth.Location = New System.Drawing.Point(125, 338) + Me.lblWidth.Name = "lblWidth" + Me.lblWidth.Size = New System.Drawing.Size(38, 13) + Me.lblWidth.TabIndex = 33 + Me.lblWidth.Tag = "By_Factor:" + Me.lblWidth.Text = "Width:" + ' 'dlgBoxplot ' 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(425, 466) + Me.ClientSize = New System.Drawing.Size(425, 497) + Me.Controls.Add(Me.lblWidth) + Me.Controls.Add(Me.ucrNudBoxPlot) + Me.Controls.Add(Me.ucrChkBoxPlot) + Me.Controls.Add(Me.ucrInputWidth) + Me.Controls.Add(Me.ucrChkWidth) + Me.Controls.Add(Me.ucrInputStation) + Me.Controls.Add(Me.ucr1stFactorReceiver) + Me.Controls.Add(Me.lblFacetBy) + Me.Controls.Add(Me.ucrInputLegendPosition) + Me.Controls.Add(Me.ucrChkLegend) Me.Controls.Add(Me.ucrInputSummaries) Me.Controls.Add(Me.cmdOptions) Me.Controls.Add(Me.ucrChkTufte) @@ -407,7 +524,6 @@ Partial Class dlgBoxplot Me.Controls.Add(Me.ucrNudJitter) Me.Controls.Add(Me.lblJitter) Me.Controls.Add(Me.ucrChkAddPoints) - Me.Controls.Add(Me.ucrChkSwapParameters) Me.Controls.Add(Me.ucrSaveBoxplot) Me.Controls.Add(Me.ucrChkHorizontalBoxplot) Me.Controls.Add(Me.ucrChkVarWidth) @@ -450,7 +566,6 @@ Partial Class dlgBoxplot Friend WithEvents ucrChkHorizontalBoxplot As ucrCheck Friend WithEvents ucrChkVarWidth As ucrCheck Friend WithEvents ucrPnlPlots As UcrPanel - Friend WithEvents ucrChkSwapParameters As ucrCheck Friend WithEvents ucrNudTransparency As ucrNud Friend WithEvents lblTransparency As Label Friend WithEvents ucrNudJitter As ucrNud @@ -467,4 +582,14 @@ Partial Class dlgBoxplot Friend WithEvents toolStripMenuItemTufteOptions As ToolStripMenuItem Friend WithEvents ucrInputSummaries As ucrInputComboBox Friend WithEvents toolStripMenuItemSummaryOptions As ToolStripMenuItem + Friend WithEvents ucrInputStation As ucrInputComboBox + Friend WithEvents ucr1stFactorReceiver As ucrReceiverSingle + Friend WithEvents lblFacetBy As Label + Friend WithEvents ucrInputLegendPosition As ucrInputComboBox + Friend WithEvents ucrChkLegend As ucrCheck + Friend WithEvents ucrInputWidth As ucrInputTextBox + Friend WithEvents ucrChkWidth As ucrCheck + Friend WithEvents ucrNudBoxPlot As ucrNud + Friend WithEvents ucrChkBoxPlot As ucrCheck + Friend WithEvents lblWidth As Label End Class diff --git a/instat/dlgBoxPlot.vb b/instat/dlgBoxPlot.vb index d9628ed6a70..cc93e3bd8fe 100644 --- a/instat/dlgBoxPlot.vb +++ b/instat/dlgBoxPlot.vb @@ -24,7 +24,11 @@ Public Class dlgBoxplot Private clsRaesFunction As New RFunction Private clsBaseOperator As New ROperator Private clsLocalRaesFunction As New RFunction + Private clsWidthRaesFunction As New RFunction + Private clsStatAesFunction As New RFunction Private clsStatSummary As New RFunction + Private clsPositionNodgeFunction As New RFunction + Private clsDummyFunction As New RFunction 'Similarly clsRgeom_boxplotFunction and clsRaesFunction (respectively the geom_boxplot function and the global aes function) are given through SetupLayer to sdgLayerOptions for edit. Private bFirstLoad As Boolean = True Private bReset As Boolean = True @@ -51,10 +55,28 @@ Public Class dlgBoxplot Private clsViolinplotFunction As New RFunction Private clsCurrGeomFunction As New RFunction Private clsSummaryFunction As New RFunction + Private clsCutWitdhFunction As New RFunction + Private clsGeomBoxPlotFunction As New RFunction ' Jitter function that can be added to the boxplot/violin base layer Private clsAddedJitterFunc As New RFunction Private clsXScaleDateFunction As New RFunction Private clsYScaleDateFunction As New RFunction + Private clsFacetsFunction As New RFunction + + Private clsFacetFunction As New RFunction + Private clsFacetVariablesOperator As New ROperator + Private clsFacetRowOp As New ROperator + Private clsFacetColOp As New ROperator + Private clsPipeOperator As New ROperator + Private clsGroupByFunction As New RFunction + + Private ReadOnly strFacetWrap As String = "Facet Wrap" + Private ReadOnly strFacetRow As String = "Facet Row" + Private ReadOnly strFacetCol As String = "Facet Column" + Private ReadOnly strNone As String = "None" + + Private bUpdateComboOptions As Boolean = True + Private bUpdatingParameters As Boolean = False 'Parameter names for geoms Private strFirstParameterName As String = "geomfunc" @@ -83,6 +105,7 @@ Public Class dlgBoxplot Dim clsCoordFlipParam As New RParameter Dim clsAddedJitterParam As New RParameter Dim dctSummaries As New Dictionary(Of String, String) + Dim dctLegendPosition As New Dictionary(Of String, String) ucrBase.clsRsyntax.bExcludeAssignedFunctionOutput = False ucrBase.iHelpTopicID = 436 ucrBase.clsRsyntax.iCallType = 3 @@ -94,9 +117,11 @@ Public Class dlgBoxplot ucrPnlPlots.AddFunctionNamesCondition(rdoBoxplotTufte, {"geom_boxplot", "geom_tufteboxplot"}) ucrPnlPlots.AddFunctionNamesCondition(rdoJitter, "geom_jitter") ucrPnlPlots.AddFunctionNamesCondition(rdoViolin, "geom_violin") - ucrPnlPlots.AddToLinkedControls(ucrChkAddPoints, {rdoBoxplotTufte, rdoViolin}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) - ucrPnlPlots.AddToLinkedControls({ucrChkTufte}, {rdoBoxplotTufte}, bNewLinkedHideIfParameterMissing:=True) + ucrPnlPlots.AddToLinkedControls({ucrChkAddPoints, ucrChkWidth}, {rdoBoxplotTufte, rdoViolin}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) + ucrPnlPlots.AddToLinkedControls({ucrChkTufte}, {rdoBoxplotTufte}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) ucrChkTufte.AddToLinkedControls(ucrChkVarWidth, {"FALSE"}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) + ucrPnlPlots.AddToLinkedControls(ucrChkBoxPlot, {rdoJitter, rdoViolin}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) + ucrSelectorBoxPlot.SetParameter(New RParameter("data", 0)) ucrSelectorBoxPlot.SetParameterIsrfunction() @@ -111,8 +136,6 @@ Public Class dlgBoxplot ucrByFactorsReceiver.SetParameter(New RParameter("x", 1)) ucrByFactorsReceiver.Selector = ucrSelectorBoxPlot - ucrByFactorsReceiver.SetIncludedDataTypes({"factor"}) - ucrByFactorsReceiver.strSelectorHeading = "Factors" ucrByFactorsReceiver.SetParameterIsString() ucrByFactorsReceiver.bWithQuotes = False ucrByFactorsReceiver.SetValuesToIgnore({Chr(34) & Chr(34)}) @@ -178,13 +201,56 @@ Public Class dlgBoxplot ucrInputSummaries.SetItems(dctSummaries) ucrInputSummaries.SetDropDownStyleAsNonEditable() + 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) + + ucr1stFactorReceiver.SetParameter(New RParameter("var1")) + ucr1stFactorReceiver.Selector = ucrSelectorBoxPlot + ucr1stFactorReceiver.SetIncludedDataTypes({"factor"}) + ucr1stFactorReceiver.strSelectorHeading = "Factors" + ucr1stFactorReceiver.bWithQuotes = False + ucr1stFactorReceiver.SetParameterIsString() + ucr1stFactorReceiver.SetValuesToIgnore({"."}) + ucr1stFactorReceiver.SetParameterPosition(1) + ucr1stFactorReceiver.SetLinkedDisplayControl(lblFacetBy) + + ucrInputStation.SetItems({strFacetWrap, strFacetRow, strFacetCol, strNone}) + ucrInputStation.SetDropDownStyleAsNonEditable() + + ucrChkWidth.SetText("Width") + ucrChkWidth.AddToLinkedControls({ucrInputWidth}, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:=0.25) + ucrChkWidth.AddParameterValuesCondition(True, "cut_width", "True") + ucrChkWidth.AddParameterValuesCondition(False, "cut_width", "False") + + ucrChkBoxPlot.SetText("Add Boxplot") + ucrChkBoxPlot.AddToLinkedControls({ucrNudBoxPlot}, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:=0.5) + ucrChkBoxPlot.AddParameterValuesCondition(True, "boxplot", "True") + ucrChkBoxPlot.AddParameterValuesCondition(False, "boxplot", "False") + + ucrNudBoxPlot.SetParameter(New RParameter("width", 2)) + ucrNudBoxPlot.SetMinMax(0, 1) + ucrNudBoxPlot.DecimalPlaces = 2 + ucrNudBoxPlot.Increment = 0.01 + ucrNudBoxPlot.SetLinkedDisplayControl(lblWidth) + + ucrInputWidth.SetParameter(New RParameter("width")) + ucrInputWidth.SetValidationTypeAsNumeric() ucrChkGrouptoConnect.SetText("Group to Connect") ucrChkGrouptoConnect.AddToLinkedControls(ucrInputSummaries, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:="mean") ucrChkGrouptoConnect.AddParameterPresentCondition(True, strStatSummaryParameterName, True) ucrChkGrouptoConnect.AddParameterPresentCondition(False, strStatSummaryParameterName, False) 'this control exists but diabled for now - ucrChkSwapParameters.SetText("swap Parameters") DialogueSize() End Sub @@ -196,6 +262,17 @@ Public Class dlgBoxplot clsRaesFunction = New RFunction clsLocalRaesFunction = New RFunction clsStatSummary = New RFunction + clsFacetFunction = New RFunction + clsFacetVariablesOperator = New ROperator + clsFacetRowOp = New ROperator + clsFacetColOp = New ROperator + clsPipeOperator = New ROperator + clsGroupByFunction = New RFunction + clsDummyFunction = New RFunction + clsWidthRaesFunction = New RFunction + clsGeomBoxPlotFunction = New RFunction + clsStatAesFunction = New RFunction + clsPositionNodgeFunction = New RFunction 'Setting up new functions clsBoxplotFunction = New RFunction @@ -206,6 +283,9 @@ Public Class dlgBoxplot clsAddedJitterFunc.Clear() + ucrInputStation.SetName(strFacetWrap) + ucrInputStation.bUpdateRCodeFromControl = True + ucrSelectorBoxPlot.Reset() ucrSelectorBoxPlot.SetGgplotFunction(clsBaseOperator) @@ -215,6 +295,9 @@ Public Class dlgBoxplot bResetSubdialog = True bResetBoxLayerSubdialog = True + clsDummyFunction.AddParameter("cut_width", "False", iPosition:=0) + clsDummyFunction.AddParameter("boxplot", "False", iPosition:=1) + 'Setting current geom as boxplot clsCurrGeomFunction.SetPackageName("ggplot2") clsCurrGeomFunction = clsBoxplotFunction @@ -224,6 +307,18 @@ Public Class dlgBoxplot clsBoxplotFunction.AddParameter("varwidth", "FALSE", iPosition:=0) clsBoxplotFunction.AddParameter("outlier.colour", Chr(34) & "red" & Chr(34), iPosition:=1) + clsWidthRaesFunction.SetPackageName("ggplot2") + clsWidthRaesFunction.SetRCommand("aes") + + clsCutWitdhFunction.SetPackageName("ggplot2") + clsCutWitdhFunction.SetRCommand("cut_width") + + clsStatAesFunction.SetPackageName("ggplot2") + clsStatAesFunction.SetRCommand("aes") + + clsGeomBoxPlotFunction.SetPackageName("ggplot2") + clsGeomBoxPlotFunction.SetRCommand("geom_boxplot") + clsTufteBoxplotFunction.SetPackageName("ggthemes") clsTufteBoxplotFunction.SetRCommand("geom_tufteboxplot") clsTufteBoxplotFunction.AddParameter("stat", Chr(34) & "boxplot" & Chr(34), iPosition:=0) @@ -262,8 +357,26 @@ Public Class dlgBoxplot clsStatSummary.SetPackageName("ggplot2") clsStatSummary.SetRCommand("stat_summary") clsStatSummary.AddParameter("geom", Chr(34) & "line" & Chr(34), iPosition:=0) - clsStatSummary.AddParameter("group", 1, iPosition:=1) - clsStatSummary.AddParameter("color", Chr(34) & "blue" & Chr(34), iPosition:=2) + + clsPositionNodgeFunction.SetPackageName("ggplot2") + clsPositionNodgeFunction.SetRCommand("position_dodge") + clsPositionNodgeFunction.AddParameter("width", 0.9, iPosition:=0) + + clsFacetFunction.SetPackageName("ggplot2") + clsFacetRowOp.SetOperation("+") + clsFacetRowOp.bBrackets = False + clsFacetColOp.SetOperation("+") + clsFacetColOp.bBrackets = False + clsFacetVariablesOperator.SetOperation("~") + clsFacetVariablesOperator.bForceIncludeOperation = True + clsFacetVariablesOperator.bBrackets = False + clsFacetFunction.AddParameter("facets", clsROperatorParameter:=clsFacetVariablesOperator, iPosition:=0) + + clsPipeOperator.SetOperation("%>%") + SetPipeAssignTo() + + clsGroupByFunction.SetPackageName("dplyr") + clsGroupByFunction.SetRCommand("group_by") clsBaseOperator.AddParameter(GgplotDefaults.clsDefaultThemeParameter.Clone()) clsXlabsFunction = GgplotDefaults.clsXlabTitleFunction.Clone() @@ -307,8 +420,16 @@ Public Class dlgBoxplot ucrInputSummaries.SetRCode(clsStatSummary, bReset) ucrChkGrouptoConnect.SetRCode(clsBaseOperator, bReset) ucrPnlPlots.SetRCode(clsCurrGeomFunction, bReset) - + ucrChkLegend.SetRCode(clsThemeFunction, bReset, bCloneIfNeeded:=True) + ucrInputLegendPosition.SetRCode(clsThemeFunction, bReset, bCloneIfNeeded:=True) ucrChkTufte.SetRCode(clsCurrGeomFunction, bReset) + ucrInputWidth.SetRCode(clsCutWitdhFunction, bReset) + ucrNudBoxPlot.SetRCode(clsGeomBoxPlotFunction, bReset) + If bReset Then + AutoFacetStation() + ucrChkBoxPlot.SetRCode(clsDummyFunction, bReset) + ucrChkWidth.SetRCode(clsDummyFunction, bReset) + End If End Sub Private Sub TestOkEnabled() @@ -359,6 +480,13 @@ Public Class dlgBoxplot SetGeomPrefixFillColourAes() DialogueSize() EnableDisableBoxplotOptions() + If rdoBoxplotTufte.Checked Then + If ucrChkAddPoints.Checked Then + clsBoxplotFunction.AddParameter("outlier.shape", "NA", iPosition:=2) + Else + clsBoxplotFunction.RemoveParameterByName("outlier.shape") + End If + End If End Sub Private Sub ucrChkGrouptoConnect_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkGrouptoConnect.ControlValueChanged @@ -367,6 +495,7 @@ Public Class dlgBoxplot Else clsBaseOperator.RemoveParameterByName(strStatSummaryParameterName) End If + AddRemoveAesParm() End Sub Private Sub openSdgLayerOptions(clsNewGeomFunc As RFunction) @@ -409,13 +538,25 @@ Public Class dlgBoxplot 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 + Private Sub cmdOptions_Click(sender As Object, e As EventArgs) Handles cmdOptions.Click, toolStripMenuItemPlotOptions.Click sdgPlots.SetRCode(clsNewOperator:=ucrBase.clsRsyntax.clsBaseOperator, clsNewYScalecontinuousFunction:=clsYScaleContinuousFunction, clsNewXScalecontinuousFunction:=clsXScaleContinuousFunction, clsNewXLabsTitleFunction:=clsXlabsFunction, clsNewYLabTitleFunction:=clsYlabFunction, clsNewLabsFunction:=clsLabsFunction, clsNewFacetFunction:=clsRFacetFunction, - clsNewThemeFunction:=clsThemeFunction, dctNewThemeFunctions:=dctThemeFunctions, clsNewGlobalAesFunction:=clsRaesFunction, ucrNewBaseSelector:=ucrSelectorBoxPlot, + clsNewThemeFunction:=clsThemeFunction, dctNewThemeFunctions:=dctThemeFunctions, clsNewGlobalAesFunction:=clsRaesFunction, ucrNewBaseSelector:=ucrSelectorBoxPlot, clsNewFacetVariablesOperator:=clsFacetVariablesOperator, clsNewCoordPolarFunction:=clsCoordPolarFunction, clsNewCoordPolarStartOperator:=clsCoordPolarStartOperator, clsNewXScaleDateFunction:=clsXScaleDateFunction, clsNewAnnotateFunction:=clsAnnotateFunction, clsNewScaleFillViridisFunction:=clsScaleFillViridisFunction, clsNewScaleColourViridisFunction:=clsScaleColourViridisFunction, clsNewYScaleDateFunction:=clsYScaleDateFunction, - strMainDialogGeomParameterNames:=strGeomParameterNames, bReset:=bResetSubdialog) + strMainDialogGeomParameterNames:=strGeomParameterNames, bChangeAesParameter:=True, bReset:=bResetSubdialog) sdgPlots.ShowDialog() bResetSubdialog = False End Sub @@ -442,16 +583,189 @@ Public Class dlgBoxplot Private Sub DialogueSize() If rdoBoxplotTufte.Checked OrElse rdoViolin.Checked Then - Me.Size = New Size(441, 505) - Me.ucrSaveBoxplot.Location = New Point(10, 384) - Me.ucrBase.Location = New Point(10, 413) + Me.Size = New Size(441, 536) + Me.ucrChkLegend.Location = New Size(10, 388) + Me.ucrInputLegendPosition.Location = New Size(105, 390) + Me.ucrInputStation.Location = New Size(335, 390) + Me.ucr1stFactorReceiver.Location = New Size(222, 391) + Me.lblFacetBy.Location = New Size(222, 376) + Me.ucrSaveBoxplot.Location = New Point(10, 418) + Me.ucrBase.Location = New Point(10, 442) + Else + Me.Size = New Size(441, 500) + Me.ucrChkLegend.Location = New Size(10, 358) + Me.ucrInputLegendPosition.Location = New Size(105, 360) + Me.ucrInputStation.Location = New Size(335, 360) + Me.ucr1stFactorReceiver.Location = New Size(222, 361) + Me.lblFacetBy.Location = New Size(222, 346) + Me.ucrSaveBoxplot.Location = New Point(10, 390) + Me.ucrBase.Location = New Point(10, 415) + End If + End Sub + + Private Sub AutoFacetStation() + Dim ucrCurrentReceiver As ucrReceiver = Nothing + + If ucrSelectorBoxPlot.CurrentReceiver IsNot Nothing Then + ucrCurrentReceiver = ucrSelectorBoxPlot.CurrentReceiver + End If + ucr1stFactorReceiver.AddItemsWithMetadataProperty(ucrSelectorBoxPlot.ucrAvailableDataFrames.cboAvailableDataFrames.Text, "Climatic_Type", {"station_label"}) + If ucrCurrentReceiver IsNot Nothing Then + ucrCurrentReceiver.SetMeAsReceiver() + End If + AddRemoveGroupBy() + End Sub + + Private Sub ucrInput_ControlValueChanged(ucrChangedControl As ucrInputComboBox) Handles ucrInputStation.ControlValueChanged + If Not bUpdateComboOptions Then + Exit Sub + End If + Dim strChangedText As String = ucrChangedControl.GetText() + If strChangedText <> strNone Then + If Not strChangedText = strFacetCol AndAlso Not strChangedText = strFacetRow AndAlso + Not ucrInputStation.Equals(ucrChangedControl) AndAlso ucrInputStation.GetText() = strChangedText Then + bUpdateComboOptions = False + ucrInputStation.SetName(strNone) + bUpdateComboOptions = True + End If + If (strChangedText = strFacetWrap AndAlso ucrInputStation.GetText = strFacetRow) OrElse (strChangedText = strFacetRow AndAlso + ucrInputStation.GetText = strFacetWrap) OrElse (strChangedText = strFacetWrap AndAlso + ucrInputStation.GetText = strFacetCol) OrElse (strChangedText = strFacetCol AndAlso ucrInputStation.GetText = strFacetWrap) Then + ucrInputStation.SetName(strNone) + End If + End If + UpdateParameters() + AddRemoveFacets() + AddRemoveGroupBy() + End Sub + + Private Sub UpdateParameters() + clsFacetVariablesOperator.RemoveParameterByName("var1") + clsFacetColOp.RemoveParameterByName("col" & ucrInputStation.Name) + clsFacetRowOp.RemoveParameterByName("row" & ucrInputStation.Name) + + clsBaseOperator.RemoveParameterByName("facets") + bUpdatingParameters = True + ucr1stFactorReceiver.SetRCode(Nothing) + Select Case ucrInputStation.GetText() + Case strFacetWrap + ucr1stFactorReceiver.ChangeParameterName("var1") + ucr1stFactorReceiver.SetRCode(clsFacetVariablesOperator) + Case strFacetCol + ucr1stFactorReceiver.ChangeParameterName("col" & ucrInputStation.Name) + ucr1stFactorReceiver.SetRCode(clsFacetColOp) + Case strFacetRow + ucr1stFactorReceiver.ChangeParameterName("row" & ucrInputStation.Name) + ucr1stFactorReceiver.SetRCode(clsFacetRowOp) + End Select + If Not clsRaesFunction.ContainsParameter("x") Then + clsRaesFunction.AddParameter("x", Chr(34) & Chr(34)) + End If + bUpdatingParameters = False + End Sub + + Private Sub AddRemoveFacets() + Dim bWrap As Boolean = False + Dim bCol As Boolean = False + Dim bRow As Boolean = False + + If bUpdatingParameters Then + Exit Sub + End If + + clsBaseOperator.RemoveParameterByName("facets") + If Not ucr1stFactorReceiver.IsEmpty Then + Select Case ucrInputStation.GetText() + Case strFacetWrap + bWrap = True + Case strFacetCol + bCol = True + Case strFacetRow + bRow = True + End Select + End If + + If bWrap OrElse bRow OrElse bCol Then + clsBaseOperator.AddParameter("facets", clsRFunctionParameter:=clsFacetFunction) + End If + If bWrap Then + clsFacetFunction.SetRCommand("facet_wrap") + End If + If bRow OrElse bCol Then + clsFacetFunction.SetRCommand("facet_grid") + End If + If bRow Then + clsFacetVariablesOperator.AddParameter("left", clsROperatorParameter:=clsFacetRowOp, iPosition:=0) + ElseIf bCol AndAlso bWrap = False Then + clsFacetVariablesOperator.AddParameter("left", ".", iPosition:=0) + Else + clsFacetVariablesOperator.RemoveParameterByName("left") + End If + If bCol Then + clsFacetVariablesOperator.AddParameter("right", clsROperatorParameter:=clsFacetColOp, iPosition:=1) + ElseIf bRow AndAlso bWrap = False Then + clsFacetVariablesOperator.AddParameter("right", ".", iPosition:=1) + Else + clsFacetVariablesOperator.RemoveParameterByName("right") + End If + End Sub + + Private Sub ucr1stFactorReceiver_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucr1stFactorReceiver.ControlValueChanged, ucrByFactorsReceiver.ControlValueChanged + AddRemoveFacets() + AddRemoveGroupBy() + EnableDisableWidth() + AddRemoveAesParm() + End Sub + + Private Sub GetParameterValue(clsOperator As ROperator) + Dim i As Integer = 0 + For Each clsTempParam As RParameter In clsOperator.clsParameters + If clsTempParam.strArgumentValue <> "" AndAlso clsTempParam.strArgumentValue <> "." Then + clsGroupByFunction.AddParameter(i, clsTempParam.strArgumentValue, bIncludeArgumentName:=False, iPosition:=i) + i = i + 1 + End If + Next + End Sub + + Private Sub AddRemoveGroupBy() + If clsPipeOperator.ContainsParameter("mutate") Then + clsGroupByFunction.ClearParameters() + If clsBaseOperator.ContainsParameter("facets") Then + Select Case ucrInputStation.GetText() + Case strFacetWrap + GetParameterValue(clsFacetVariablesOperator) + Case strFacetCol + GetParameterValue(clsFacetColOp) + Case strFacetRow + GetParameterValue(clsFacetRowOp) + End Select + End If + + If clsGroupByFunction.iParameterCount > 0 Then + clsPipeOperator.AddParameter("group_by", clsRFunctionParameter:=clsGroupByFunction, iPosition:=1) + Else + clsPipeOperator.RemoveParameterByName("group_by") + End If + Else + clsPipeOperator.RemoveParameterByName("group_by") + End If + + SetPipeAssignTo() + End Sub + + Private Sub SetPipeAssignTo() + If ucrSelectorBoxPlot.ucrAvailableDataFrames.cboAvailableDataFrames.Text <> "" AndAlso clsPipeOperator.clsParameters.Count > 1 Then + clsPipeOperator.SetAssignTo(ucrSelectorBoxPlot.ucrAvailableDataFrames.cboAvailableDataFrames.Text) Else - Me.Size = New Size(441, 479) - Me.ucrSaveBoxplot.Location = New Point(10, 356) - Me.ucrBase.Location = New Point(10, 384) + clsPipeOperator.RemoveAssignTo() End If End Sub + Private Sub ucrSelectorBoxPlot_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrSelectorBoxPlot.ControlValueChanged + AutoFacetStation() + SetPipeAssignTo() + End Sub + Private Sub ucrSaveBoxplot_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrSaveBoxplot.ControlContentsChanged, ucrVariablesAsFactorForBoxplot.ControlContentsChanged TestOkEnabled() End Sub @@ -465,15 +779,72 @@ Public Class dlgBoxplot toolStripMenuItemTufteOptions.Enabled = (rdoBoxplotTufte.Checked AndAlso ucrChkTufte.Checked) End Sub - 'this code is commented out but will work once we get the feature of linking controls with the contents of a receiver - 'Private Sub SwapFactors() - ' If ucrChkSwapParameters.Checked Then - ' ucrByFactorsReceiver.ChangeParameterName("fill") - ' ucrSecondFactorReceiver.ChangeParameterName("x") - ' End If - 'End Sub + Private Sub ucrInputWidth_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrInputWidth.ControlValueChanged, ucrByFactorsReceiver.ControlValueChanged + If Not ucrInputWidth.IsEmpty Then + clsCutWitdhFunction.AddParameter("width", ucrInputWidth.GetText(), iPosition:=1) + clsCutWitdhFunction.AddParameter("var", ucrByFactorsReceiver.GetVariableNames(False), bIncludeArgumentName:=False, iPosition:=0) + Else + clsCutWitdhFunction.RemoveParameterByName("width") + clsCutWitdhFunction.RemoveParameterByName("var") + End If + EnableDisableWidth() + End Sub + + Private Sub ucrChkWidth_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkWidth.ControlValueChanged + EnableDisableWidth() + End Sub + + Private Sub EnableDisableWidth() + If ucrByFactorsReceiver.strCurrDataType = "Date" OrElse ucrByFactorsReceiver.strCurrDataType = "factor" OrElse ucrByFactorsReceiver.strCurrDataType = "orderded, factor" Then + ucrChkWidth.Enabled = False + ucrInputWidth.Enabled = False + clsBoxplotFunction.RemoveParameterByName("aes") + clsWidthRaesFunction.RemoveParameterByName("group") + clsViolinplotFunction.RemoveParameterByName("aes") + Else + ucrChkWidth.Enabled = True + ucrInputWidth.Enabled = True + If ucrChkWidth.Checked AndAlso Not ucrByFactorsReceiver.IsEmpty Then + clsWidthRaesFunction.AddParameter("group", clsRFunctionParameter:=clsCutWitdhFunction, iPosition:=1) + clsBoxplotFunction.AddParameter("aes", clsRFunctionParameter:=clsWidthRaesFunction, bIncludeArgumentName:=False, iPosition:=1) + clsViolinplotFunction.AddParameter("aes", clsRFunctionParameter:=clsWidthRaesFunction, bIncludeArgumentName:=False, iPosition:=1) + Else + clsWidthRaesFunction.RemoveParameterByName("group") + clsBoxplotFunction.RemoveParameterByName("aes") + clsViolinplotFunction.RemoveParameterByName("aes") + End If + End If + End Sub + + Private Sub ucrChkBoxPlot_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkBoxPlot.ControlValueChanged, ucrNudBoxPlot.ControlValueChanged + If ucrChkBoxPlot.Checked Then + clsGeomBoxPlotFunction.AddParameter("width", ucrNudBoxPlot.GetText(), iPosition:=3) + clsBaseOperator.AddParameter("geom_boxplot", clsRFunctionParameter:=clsGeomBoxPlotFunction) + Else + clsGeomBoxPlotFunction.RemoveParameterByName("width") + clsBaseOperator.RemoveParameterByName("geom_boxplot") + End If + End Sub + + Private Sub AddRemoveAesParm() + If Not ucrSecondFactorReceiver.IsEmpty AndAlso Not (ucrSecondFactorReceiver.GetVariableNames = ucrByFactorsReceiver.GetVariableNames) Then + clsStatAesFunction.AddParameter("group", ucrSecondFactorReceiver.GetVariableNames(False), iPosition:=0) + clsStatAesFunction.AddParameter("colour", ucrSecondFactorReceiver.GetVariableNames(False), iPosition:=1) + clsStatSummary.AddParameter("stat_aes", clsRFunctionParameter:=clsStatAesFunction, bIncludeArgumentName:=False) + clsStatSummary.AddParameter("position", clsRFunctionParameter:=clsPositionNodgeFunction) + clsStatSummary.RemoveParameterByName("group") + clsStatSummary.RemoveParameterByName("color") + Else + clsStatSummary.AddParameter("group", 1, iPosition:=1) + clsStatSummary.AddParameter("color", Chr(34) & "blue" & Chr(34), iPosition:=2) + clsStatAesFunction.RemoveParameterByName("group") + clsStatAesFunction.RemoveParameterByName("colour") + clsStatSummary.RemoveParameterByName("stat_aes") + clsStatSummary.RemoveParameterByName("position") + End If + End Sub - 'Private Sub ucrChkSwapParameters_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkSwapParameters.ControlValueChanged - ' SwapFactors() - 'End Sub + Private Sub ucrSecondFactorReceiver_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrSecondFactorReceiver.ControlValueChanged + AddRemoveAesParm() + End Sub End Class diff --git a/instat/dlgCalculator.vb b/instat/dlgCalculator.vb index 58002ce15bc..b544e8d7b90 100644 --- a/instat/dlgCalculator.vb +++ b/instat/dlgCalculator.vb @@ -198,10 +198,13 @@ Public Class dlgCalculator ucrBase.iHelpTopicID = 598 Case "Integer" Me.Width = iBasicWidth * 1.5 + ucrBase.iHelpTopicID = 463 Case "Complex" Me.Width = iBasicWidth * 1.5 + ucrBase.iHelpTopicID = 455 Case "List" Me.Width = iBasicWidth * 1.5 + ucrBase.iHelpTopicID = 439 Case Else Me.Width = iBasicWidth End Select diff --git a/instat/dlgCircular.vb b/instat/dlgCircular.vb index 433addfe9a9..18d089f3a7a 100644 --- a/instat/dlgCircular.vb +++ b/instat/dlgCircular.vb @@ -32,6 +32,7 @@ Public Class dlgCircular End Sub Private Sub InitialiseDialog() + ucrBase.iHelpTopicID = 520 ucrReceiverCircular.Selector = ucrSelectorCircular ucrReceiverCircular.SetMeAsReceiver() diff --git a/instat/dlgCircularDensityPlot.vb b/instat/dlgCircularDensityPlot.vb index a6f05c3fafe..7861799a9ab 100644 --- a/instat/dlgCircularDensityPlot.vb +++ b/instat/dlgCircularDensityPlot.vb @@ -39,7 +39,7 @@ Public Class dlgCircularDensityPlot Private Sub InitialiseDialog() Dim dctKernel As New Dictionary(Of String, String) Dim dctUnits As New Dictionary(Of String, String) - + ucrBase.iHelpTopicID = 181 ucrBase.clsRsyntax.iCallType = 3 ucrBase.clsRsyntax.bExcludeAssignedFunctionOutput = False diff --git a/instat/dlgClimaticNCMPCountRecords.vb b/instat/dlgClimaticNCMPCountRecords.vb index c895af73bf3..70eb836e87c 100644 --- a/instat/dlgClimaticNCMPCountRecords.vb +++ b/instat/dlgClimaticNCMPCountRecords.vb @@ -41,6 +41,7 @@ Public Class dlgClimaticNCMPCountRecords Private Sub InitialiseDialog() Dim dctResolution As New Dictionary(Of String, String) + ucrBase.iHelpTopicID=631 ucrSelectorForA2.SetParameter(New RParameter("a2", 0)) ucrSelectorForA2.SetParameterIsrfunction() ucrSelectorForA2.ucrAvailableDataFrames.lblDataFrame.Text = "Indices Data Frame:" diff --git a/instat/dlgClimaticNCMPIndices.vb b/instat/dlgClimaticNCMPIndices.vb index bbf3d064731..58b7769ad50 100644 --- a/instat/dlgClimaticNCMPIndices.vb +++ b/instat/dlgClimaticNCMPIndices.vb @@ -39,6 +39,7 @@ Public Class dlgClimaticNCMPIndices End Sub Private Sub InitialiseDialog() + ucrBase.iHelpTopicID=627 ucrSelectorIndices.SetParameter(New RParameter("df", 0)) ucrSelectorIndices.SetParameterIsrfunction() diff --git a/instat/dlgClimaticNCMPRegionAverage.vb b/instat/dlgClimaticNCMPRegionAverage.vb index 941ff1b02ea..7ba410056e9 100644 --- a/instat/dlgClimaticNCMPRegionAverage.vb +++ b/instat/dlgClimaticNCMPRegionAverage.vb @@ -41,6 +41,7 @@ Public Class dlgClimaticNCMPRegionAverage Private Sub InitialiseDialog() Dim dctResolution As New Dictionary(Of String, String) + ucrBase.iHelpTopicID=629 ucrSelectorForA2.SetParameter(New RParameter("a2", 0)) ucrSelectorForA2.SetParameterIsrfunction() ucrSelectorForA2.ucrAvailableDataFrames.lblDataFrame.Text = "Indices Data Frame:" diff --git a/instat/dlgClimaticNCMPSummaryFile.vb b/instat/dlgClimaticNCMPSummaryFile.vb index 2cca33d94e8..1b6f59b16c0 100644 --- a/instat/dlgClimaticNCMPSummaryFile.vb +++ b/instat/dlgClimaticNCMPSummaryFile.vb @@ -39,6 +39,7 @@ Public Class dlgClimaticNCMPSummaryFile Private Sub InitialiseDialog() Dim dctResolution As New Dictionary(Of String, String) + ucrBase.iHelpTopicID=632 ucrSelectorA2.SetParameter(New RParameter("a2", 0)) ucrSelectorA2.SetParameterIsRFunction() ucrSelectorA2.lblDataFrame.Text = "Indices Data Frame:" diff --git a/instat/dlgClimaticNCMPTrendGraphs.vb b/instat/dlgClimaticNCMPTrendGraphs.vb index 28f6234e488..e8194c3c444 100644 --- a/instat/dlgClimaticNCMPTrendGraphs.vb +++ b/instat/dlgClimaticNCMPTrendGraphs.vb @@ -41,6 +41,7 @@ Public Class dlgClimaticNCMPTrendGraphs Private Sub InitialiseDialog() Dim dctResolution As New Dictionary(Of String, String) + ucrBase.iHelpTopicID=630 ucrSelectorForA2.SetParameter(New RParameter("a2", 0)) ucrSelectorForA2.SetParameterIsrfunction() ucrSelectorForA2.ucrAvailableDataFrames.lblDataFrame.Text = "Indices Data Frame:" diff --git a/instat/dlgClimaticNCMPVariogram.vb b/instat/dlgClimaticNCMPVariogram.vb index c3ffc8f2e19..af9a46f3c16 100644 --- a/instat/dlgClimaticNCMPVariogram.vb +++ b/instat/dlgClimaticNCMPVariogram.vb @@ -39,6 +39,7 @@ Public Class dlgClimaticNCMPVariogram End Sub Private Sub InitialiseDialog() + ucrBase.iHelpTopicID=628 ucrSelectorVariogram.SetParameter(New RParameter("a2", 0)) ucrSelectorVariogram.SetParameterIsrfunction() ucrSelectorVariogram.ucrAvailableDataFrames.lblDataFrame.Text = "Indices Data Frame:" diff --git a/instat/dlgClimaticStationMaps.vb b/instat/dlgClimaticStationMaps.vb index feb295067e3..7d27f489804 100644 --- a/instat/dlgClimaticStationMaps.vb +++ b/instat/dlgClimaticStationMaps.vb @@ -64,7 +64,7 @@ Public Class dlgClimaticStationMaps End Sub Private Sub InitialiseDialog() - ucrBase.iHelpTopicID = 558 + ucrBase.iHelpTopicID = 645 ucrBase.clsRsyntax.iCallType = 3 ucrBase.clsRsyntax.bExcludeAssignedFunctionOutput = False diff --git a/instat/dlgClimograph.Designer.vb b/instat/dlgClimograph.Designer.vb new file mode 100644 index 00000000000..cff96c37a9b --- /dev/null +++ b/instat/dlgClimograph.Designer.vb @@ -0,0 +1,41 @@ + _ +Partial Class dlgClimograph + Inherits System.Windows.Forms.Form + + 'Form remplace la méthode Dispose pour nettoyer la liste des composants. + _ + Protected Overrides Sub Dispose(ByVal disposing As Boolean) + Try + If disposing AndAlso components IsNot Nothing Then + components.Dispose() + End If + Finally + MyBase.Dispose(disposing) + End Try + End Sub + + 'Requise par le Concepteur Windows Form + Private components As System.ComponentModel.IContainer + + 'REMARQUE : la procédure suivante est requise par le Concepteur Windows Form + 'Elle peut être modifiée à l'aide du Concepteur Windows Form. + 'Ne la modifiez pas à l'aide de l'éditeur de code. + _ + Private Sub InitializeComponent() + Me.SuspendLayout() + ' + 'dlgClimograph + ' + Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) + Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.ClientSize = New System.Drawing.Size(428, 450) + Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow + Me.MaximizeBox = False + Me.MinimizeBox = False + Me.Name = "dlgClimograph" + Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen + Me.Text = "Climograph" + Me.ResumeLayout(False) + + End Sub +End Class diff --git a/instat/dlgClimograph.resx b/instat/dlgClimograph.resx new file mode 100644 index 00000000000..1af7de150c9 --- /dev/null +++ b/instat/dlgClimograph.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/instat/dlgClimograph.vb b/instat/dlgClimograph.vb new file mode 100644 index 00000000000..26752c99347 --- /dev/null +++ b/instat/dlgClimograph.vb @@ -0,0 +1,3 @@ +Public Class dlgClimograph + +End Class \ No newline at end of file diff --git a/instat/dlgColumnStats.Designer.vb b/instat/dlgColumnStats.Designer.vb index 3501003091b..ea5865dfdf1 100644 --- a/instat/dlgColumnStats.Designer.vb +++ b/instat/dlgColumnStats.Designer.vb @@ -48,7 +48,6 @@ Partial Class dlgColumnStats Me.ucrChkPrintOutput = New instat.ucrCheck() Me.ucrChkDropUnusedLevels = New instat.ucrCheck() Me.cmdSummaries = New System.Windows.Forms.Button() - Me.cmdProportionsPercentages = New System.Windows.Forms.Button() Me.ucrChkWeights = New instat.ucrCheck() Me.ucrReceiverWeights = New instat.ucrReceiverSingle() Me.ucrReceiverByFactor = New instat.ucrReceiverMultiple() @@ -62,9 +61,10 @@ Partial Class dlgColumnStats ' Me.lblSelectedVariables.AutoSize = True Me.lblSelectedVariables.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblSelectedVariables.Location = New System.Drawing.Point(273, 9) + Me.lblSelectedVariables.Location = New System.Drawing.Point(410, 14) + Me.lblSelectedVariables.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblSelectedVariables.Name = "lblSelectedVariables" - Me.lblSelectedVariables.Size = New System.Drawing.Size(125, 13) + Me.lblSelectedVariables.Size = New System.Drawing.Size(191, 20) Me.lblSelectedVariables.TabIndex = 1 Me.lblSelectedVariables.Text = "Variable(s) to Summarise:" ' @@ -72,9 +72,10 @@ Partial Class dlgColumnStats ' Me.lblSummariseBy.AutoSize = True Me.lblSummariseBy.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblSummariseBy.Location = New System.Drawing.Point(272, 176) + Me.lblSummariseBy.Location = New System.Drawing.Point(408, 264) + Me.lblSummariseBy.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblSummariseBy.Name = "lblSummariseBy" - Me.lblSummariseBy.Size = New System.Drawing.Size(76, 13) + Me.lblSummariseBy.Size = New System.Drawing.Size(115, 20) Me.lblSummariseBy.TabIndex = 5 Me.lblSummariseBy.Text = "Summarise By:" ' @@ -86,9 +87,11 @@ Partial Class dlgColumnStats Me.grpOptions.Controls.Add(Me.ucrChkOmitMissing) Me.grpOptions.Controls.Add(Me.ucrChkPrintOutput) Me.grpOptions.Controls.Add(Me.ucrChkDropUnusedLevels) - Me.grpOptions.Location = New System.Drawing.Point(10, 196) + Me.grpOptions.Location = New System.Drawing.Point(15, 294) + Me.grpOptions.Margin = New System.Windows.Forms.Padding(4) Me.grpOptions.Name = "grpOptions" - Me.grpOptions.Size = New System.Drawing.Size(258, 155) + Me.grpOptions.Padding = New System.Windows.Forms.Padding(4) + Me.grpOptions.Size = New System.Drawing.Size(387, 232) Me.grpOptions.TabIndex = 7 Me.grpOptions.TabStop = False Me.grpOptions.Text = "Options" @@ -96,9 +99,10 @@ Partial Class dlgColumnStats 'cmdMissingOptions ' Me.cmdMissingOptions.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdMissingOptions.Location = New System.Drawing.Point(190, 114) + Me.cmdMissingOptions.Location = New System.Drawing.Point(285, 174) + Me.cmdMissingOptions.Margin = New System.Windows.Forms.Padding(4) Me.cmdMissingOptions.Name = "cmdMissingOptions" - Me.cmdMissingOptions.Size = New System.Drawing.Size(62, 26) + Me.cmdMissingOptions.Size = New System.Drawing.Size(93, 39) Me.cmdMissingOptions.TabIndex = 20 Me.cmdMissingOptions.Tag = "MissingOptions" Me.cmdMissingOptions.Text = "Options" @@ -108,87 +112,83 @@ Partial Class dlgColumnStats ' Me.ucrChkOriginalLevel.AutoSize = True Me.ucrChkOriginalLevel.Checked = False - Me.ucrChkOriginalLevel.Location = New System.Drawing.Point(25, 42) + Me.ucrChkOriginalLevel.Location = New System.Drawing.Point(38, 63) + Me.ucrChkOriginalLevel.Margin = New System.Windows.Forms.Padding(9) Me.ucrChkOriginalLevel.Name = "ucrChkOriginalLevel" - Me.ucrChkOriginalLevel.Size = New System.Drawing.Size(218, 23) + Me.ucrChkOriginalLevel.Size = New System.Drawing.Size(327, 34) Me.ucrChkOriginalLevel.TabIndex = 1 ' 'ucrChkStoreResults ' Me.ucrChkStoreResults.AutoSize = True Me.ucrChkStoreResults.Checked = False - Me.ucrChkStoreResults.Location = New System.Drawing.Point(6, 17) + Me.ucrChkStoreResults.Location = New System.Drawing.Point(9, 26) + Me.ucrChkStoreResults.Margin = New System.Windows.Forms.Padding(9) Me.ucrChkStoreResults.Name = "ucrChkStoreResults" - Me.ucrChkStoreResults.Size = New System.Drawing.Size(237, 23) + Me.ucrChkStoreResults.Size = New System.Drawing.Size(356, 51) Me.ucrChkStoreResults.TabIndex = 0 ' 'ucrChkOmitMissing ' Me.ucrChkOmitMissing.AutoSize = True Me.ucrChkOmitMissing.Checked = False - Me.ucrChkOmitMissing.Location = New System.Drawing.Point(6, 117) + Me.ucrChkOmitMissing.Location = New System.Drawing.Point(9, 176) + Me.ucrChkOmitMissing.Margin = New System.Windows.Forms.Padding(9) Me.ucrChkOmitMissing.Name = "ucrChkOmitMissing" - Me.ucrChkOmitMissing.Size = New System.Drawing.Size(178, 23) + Me.ucrChkOmitMissing.Size = New System.Drawing.Size(267, 51) Me.ucrChkOmitMissing.TabIndex = 4 ' 'ucrChkPrintOutput ' Me.ucrChkPrintOutput.AutoSize = True Me.ucrChkPrintOutput.Checked = False - Me.ucrChkPrintOutput.Location = New System.Drawing.Point(6, 67) + Me.ucrChkPrintOutput.Location = New System.Drawing.Point(9, 100) + Me.ucrChkPrintOutput.Margin = New System.Windows.Forms.Padding(9) Me.ucrChkPrintOutput.Name = "ucrChkPrintOutput" - Me.ucrChkPrintOutput.Size = New System.Drawing.Size(246, 23) + Me.ucrChkPrintOutput.Size = New System.Drawing.Size(369, 34) Me.ucrChkPrintOutput.TabIndex = 2 ' 'ucrChkDropUnusedLevels ' Me.ucrChkDropUnusedLevels.AutoSize = True Me.ucrChkDropUnusedLevels.Checked = False - Me.ucrChkDropUnusedLevels.Location = New System.Drawing.Point(6, 92) + Me.ucrChkDropUnusedLevels.Location = New System.Drawing.Point(9, 138) + Me.ucrChkDropUnusedLevels.Margin = New System.Windows.Forms.Padding(9) Me.ucrChkDropUnusedLevels.Name = "ucrChkDropUnusedLevels" - Me.ucrChkDropUnusedLevels.Size = New System.Drawing.Size(237, 23) + Me.ucrChkDropUnusedLevels.Size = New System.Drawing.Size(356, 34) Me.ucrChkDropUnusedLevels.TabIndex = 3 ' 'cmdSummaries ' Me.cmdSummaries.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdSummaries.Location = New System.Drawing.Point(274, 302) + Me.cmdSummaries.Location = New System.Drawing.Point(411, 453) + Me.cmdSummaries.Margin = New System.Windows.Forms.Padding(4) Me.cmdSummaries.Name = "cmdSummaries" - Me.cmdSummaries.Size = New System.Drawing.Size(134, 23) + Me.cmdSummaries.Size = New System.Drawing.Size(201, 34) Me.cmdSummaries.TabIndex = 8 Me.cmdSummaries.Tag = "Summaries" Me.cmdSummaries.Text = "Summaries..." Me.cmdSummaries.UseVisualStyleBackColor = True ' - 'cmdProportionsPercentages - ' - Me.cmdProportionsPercentages.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdProportionsPercentages.Location = New System.Drawing.Point(274, 328) - Me.cmdProportionsPercentages.Name = "cmdProportionsPercentages" - Me.cmdProportionsPercentages.Size = New System.Drawing.Size(134, 23) - Me.cmdProportionsPercentages.TabIndex = 9 - Me.cmdProportionsPercentages.Tag = "Proportions/Percentages..." - Me.cmdProportionsPercentages.Text = "Prop. and Percentages..." - Me.cmdProportionsPercentages.UseVisualStyleBackColor = True - ' 'ucrChkWeights ' Me.ucrChkWeights.AutoSize = True Me.ucrChkWeights.Checked = False - Me.ucrChkWeights.Location = New System.Drawing.Point(274, 127) + Me.ucrChkWeights.Location = New System.Drawing.Point(411, 190) + Me.ucrChkWeights.Margin = New System.Windows.Forms.Padding(9) Me.ucrChkWeights.Name = "ucrChkWeights" - Me.ucrChkWeights.Size = New System.Drawing.Size(119, 23) + Me.ucrChkWeights.Size = New System.Drawing.Size(178, 34) Me.ucrChkWeights.TabIndex = 3 ' 'ucrReceiverWeights ' Me.ucrReceiverWeights.AutoSize = True Me.ucrReceiverWeights.frmParent = Me - Me.ucrReceiverWeights.Location = New System.Drawing.Point(274, 150) + Me.ucrReceiverWeights.Location = New System.Drawing.Point(411, 225) Me.ucrReceiverWeights.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverWeights.Name = "ucrReceiverWeights" Me.ucrReceiverWeights.Selector = Nothing - Me.ucrReceiverWeights.Size = New System.Drawing.Size(120, 20) + Me.ucrReceiverWeights.Size = New System.Drawing.Size(180, 30) Me.ucrReceiverWeights.strNcFilePath = "" Me.ucrReceiverWeights.TabIndex = 4 Me.ucrReceiverWeights.ucrSelector = Nothing @@ -197,11 +197,11 @@ Partial Class dlgColumnStats ' Me.ucrReceiverByFactor.AutoSize = True Me.ucrReceiverByFactor.frmParent = Me - Me.ucrReceiverByFactor.Location = New System.Drawing.Point(274, 190) + Me.ucrReceiverByFactor.Location = New System.Drawing.Point(411, 285) Me.ucrReceiverByFactor.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverByFactor.Name = "ucrReceiverByFactor" Me.ucrReceiverByFactor.Selector = Nothing - Me.ucrReceiverByFactor.Size = New System.Drawing.Size(133, 100) + Me.ucrReceiverByFactor.Size = New System.Drawing.Size(200, 150) Me.ucrReceiverByFactor.strNcFilePath = "" Me.ucrReceiverByFactor.TabIndex = 6 Me.ucrReceiverByFactor.ucrSelector = Nothing @@ -210,11 +210,11 @@ Partial Class dlgColumnStats ' Me.ucrReceiverSelectedVariables.AutoSize = True Me.ucrReceiverSelectedVariables.frmParent = Me - Me.ucrReceiverSelectedVariables.Location = New System.Drawing.Point(274, 24) + Me.ucrReceiverSelectedVariables.Location = New System.Drawing.Point(411, 36) Me.ucrReceiverSelectedVariables.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverSelectedVariables.Name = "ucrReceiverSelectedVariables" Me.ucrReceiverSelectedVariables.Selector = Nothing - Me.ucrReceiverSelectedVariables.Size = New System.Drawing.Size(133, 100) + Me.ucrReceiverSelectedVariables.Size = New System.Drawing.Size(200, 150) Me.ucrReceiverSelectedVariables.strNcFilePath = "" Me.ucrReceiverSelectedVariables.TabIndex = 2 Me.ucrReceiverSelectedVariables.ucrSelector = Nothing @@ -225,30 +225,30 @@ Partial Class dlgColumnStats Me.ucrSelectorForColumnStatistics.bDropUnusedFilterLevels = False Me.ucrSelectorForColumnStatistics.bShowHiddenColumns = False Me.ucrSelectorForColumnStatistics.bUseCurrentFilter = True - Me.ucrSelectorForColumnStatistics.Location = New System.Drawing.Point(10, 10) + Me.ucrSelectorForColumnStatistics.Location = New System.Drawing.Point(15, 15) Me.ucrSelectorForColumnStatistics.Margin = New System.Windows.Forms.Padding(0) Me.ucrSelectorForColumnStatistics.Name = "ucrSelectorForColumnStatistics" - Me.ucrSelectorForColumnStatistics.Size = New System.Drawing.Size(213, 183) + Me.ucrSelectorForColumnStatistics.Size = New System.Drawing.Size(320, 274) Me.ucrSelectorForColumnStatistics.TabIndex = 0 ' 'ucrBase ' Me.ucrBase.AutoSize = True Me.ucrBase.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrBase.Location = New System.Drawing.Point(6, 363) + Me.ucrBase.Location = New System.Drawing.Point(9, 544) + Me.ucrBase.Margin = New System.Windows.Forms.Padding(6) Me.ucrBase.Name = "ucrBase" - Me.ucrBase.Size = New System.Drawing.Size(405, 52) + Me.ucrBase.Size = New System.Drawing.Size(611, 77) Me.ucrBase.TabIndex = 10 ' 'dlgColumnStats ' - Me.AutoScaleDimensions = New System.Drawing.SizeF(96.0!, 96.0!) + Me.AutoScaleDimensions = New System.Drawing.SizeF(144.0!, 144.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi Me.AutoSize = True - Me.ClientSize = New System.Drawing.Size(416, 419) + Me.ClientSize = New System.Drawing.Size(624, 628) Me.Controls.Add(Me.ucrChkWeights) Me.Controls.Add(Me.ucrReceiverWeights) - Me.Controls.Add(Me.cmdProportionsPercentages) Me.Controls.Add(Me.cmdSummaries) Me.Controls.Add(Me.grpOptions) Me.Controls.Add(Me.ucrReceiverByFactor) @@ -258,6 +258,7 @@ Partial Class dlgColumnStats Me.Controls.Add(Me.ucrSelectorForColumnStatistics) Me.Controls.Add(Me.ucrBase) Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow + Me.Margin = New System.Windows.Forms.Padding(4) Me.MaximizeBox = False Me.MinimizeBox = False Me.Name = "dlgColumnStats" @@ -283,7 +284,6 @@ Partial Class dlgColumnStats Friend WithEvents ucrChkOmitMissing As ucrCheck Friend WithEvents ucrChkPrintOutput As ucrCheck Friend WithEvents ucrChkDropUnusedLevels As ucrCheck - Friend WithEvents cmdProportionsPercentages As Button Friend WithEvents ucrChkOriginalLevel As ucrCheck Friend WithEvents ucrChkWeights As ucrCheck Friend WithEvents ucrReceiverWeights As ucrReceiverSingle diff --git a/instat/dlgColumnStats.vb b/instat/dlgColumnStats.vb index ddc5d469a6b..98e43b2340a 100644 --- a/instat/dlgColumnStats.vb +++ b/instat/dlgColumnStats.vb @@ -177,13 +177,6 @@ Public Class dlgColumnStats TestOKEnabled() End Sub - Private Sub cmdProportionsPercentages_Click(sender As Object, e As EventArgs) Handles cmdProportionsPercentages.Click - sdgProportionsPercentages.SetRFunction(clsDefaultFunction, bResetSubdialog) - sdgProportionsPercentages.ShowDialog() - bResetSubdialog = False - TestOKEnabled() - End Sub - Private Sub ucrChkOmitMissing_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkOmitMissing.ControlValueChanged If clsSummariesList.ContainsParameter("summary_cor") OrElse clsSummariesList.ContainsParameter("summary_cov") Then clsDefaultFunction.AddParameter("use", Chr(34) & "'na.or.complete'" & Chr(34)) diff --git a/instat/dlgCompare.vb b/instat/dlgCompare.vb index 9851a2d8f11..0b60a5fe4ac 100644 --- a/instat/dlgCompare.vb +++ b/instat/dlgCompare.vb @@ -48,7 +48,7 @@ Public Class dlgCompare End Sub Private Sub InitialiseDialog() - ucrBase.iHelpTopicID = 562 + ucrBase.iHelpTopicID = 634 ucrPnlCompare.AddRadioButton(rdoDifferences) ucrPnlCompare.AddRadioButton(rdoAnomalies) ucrPnlCompare.AddParameterPresentCondition(rdoDifferences, "manipulations", False) diff --git a/instat/dlgCompareSummary.vb b/instat/dlgCompareSummary.vb index 7ea211a743d..8a0f84d41e6 100644 --- a/instat/dlgCompareSummary.vb +++ b/instat/dlgCompareSummary.vb @@ -37,6 +37,7 @@ Public Class dlgCompareSummary End Sub Private Sub InitialiseDialog() + ucrBase.iHelpTopicID = 635 ucrSelectorVerificationSummary.SetParameter(New RParameter("data_name", 0)) ucrSelectorVerificationSummary.SetParameterIsString() diff --git a/instat/dlgConditionalQuantilePlot.vb b/instat/dlgConditionalQuantilePlot.vb index 96a6fef7d6e..e3ceb9deef0 100644 --- a/instat/dlgConditionalQuantilePlot.vb +++ b/instat/dlgConditionalQuantilePlot.vb @@ -42,6 +42,7 @@ Public Class dlgConditionalQuantilePlot Dim dctLegendPosition As New Dictionary(Of String, String) Dim dctStatistics As New Dictionary(Of String, String) ucrBase.clsRsyntax.iCallType = 3 + ucrBase.iHelpTopicID = 642 ucrConditionalQuantilePlotSelector.SetParameter(New RParameter("mydata", 0)) ucrConditionalQuantilePlotSelector.SetParameterIsrfunction() diff --git a/instat/dlgCumulativeDistribution.Designer.vb b/instat/dlgCumulativeDistribution.Designer.vb index 07d77df1015..45a346662f0 100644 --- a/instat/dlgCumulativeDistribution.Designer.vb +++ b/instat/dlgCumulativeDistribution.Designer.vb @@ -54,6 +54,11 @@ Partial Class dlgCumulativeDistribution Me.ucrFactorReceiver = New instat.ucrReceiverSingle() Me.ucrCumDistSelector = New instat.ucrSelectorByDataFrameAddRemove() 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.SuspendLayout() ' 'lblFactors @@ -162,7 +167,7 @@ Partial Class dlgCumulativeDistribution ' Me.ucrPnlOption.Anchor = System.Windows.Forms.AnchorStyles.None Me.ucrPnlOption.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrPnlOption.Location = New System.Drawing.Point(101, 9) + Me.ucrPnlOption.Location = New System.Drawing.Point(101, 7) Me.ucrPnlOption.Name = "ucrPnlOption" Me.ucrPnlOption.Size = New System.Drawing.Size(211, 38) Me.ucrPnlOption.TabIndex = 0 @@ -188,7 +193,7 @@ Partial Class dlgCumulativeDistribution 'ucrSaveCumDist ' Me.ucrSaveCumDist.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrSaveCumDist.Location = New System.Drawing.Point(10, 327) + Me.ucrSaveCumDist.Location = New System.Drawing.Point(10, 373) Me.ucrSaveCumDist.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.ucrSaveCumDist.Name = "ucrSaveCumDist" Me.ucrSaveCumDist.Size = New System.Drawing.Size(320, 24) @@ -236,17 +241,77 @@ Partial Class dlgCumulativeDistribution ' Me.ucrBase.AutoSize = True Me.ucrBase.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrBase.Location = New System.Drawing.Point(10, 354) + Me.ucrBase.Location = New System.Drawing.Point(10, 402) Me.ucrBase.Name = "ucrBase" - Me.ucrBase.Size = New System.Drawing.Size(405, 52) + Me.ucrBase.Size = New System.Drawing.Size(408, 52) Me.ucrBase.TabIndex = 15 ' + '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(313, 336) + Me.ucrInputStation.Name = "ucrInputStation" + Me.ucrInputStation.Size = New System.Drawing.Size(101, 21) + Me.ucrInputStation.TabIndex = 101 + ' + 'ucr1stFactorReceiver + ' + Me.ucr1stFactorReceiver.AutoSize = True + Me.ucr1stFactorReceiver.frmParent = Me + Me.ucr1stFactorReceiver.Location = New System.Drawing.Point(202, 337) + Me.ucr1stFactorReceiver.Margin = New System.Windows.Forms.Padding(0) + Me.ucr1stFactorReceiver.Name = "ucr1stFactorReceiver" + Me.ucr1stFactorReceiver.Selector = Nothing + Me.ucr1stFactorReceiver.Size = New System.Drawing.Size(110, 26) + Me.ucr1stFactorReceiver.strNcFilePath = "" + Me.ucr1stFactorReceiver.TabIndex = 100 + Me.ucr1stFactorReceiver.ucrSelector = Nothing + ' + 'lblFacetBy + ' + Me.lblFacetBy.AutoSize = True + Me.lblFacetBy.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.lblFacetBy.Location = New System.Drawing.Point(204, 322) + Me.lblFacetBy.Name = "lblFacetBy" + Me.lblFacetBy.Size = New System.Drawing.Size(52, 13) + Me.lblFacetBy.TabIndex = 99 + 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(88, 336) + Me.ucrInputLegendPosition.Name = "ucrInputLegendPosition" + Me.ucrInputLegendPosition.Size = New System.Drawing.Size(112, 21) + Me.ucrInputLegendPosition.TabIndex = 103 + ' + 'ucrChkLegend + ' + Me.ucrChkLegend.AutoSize = True + Me.ucrChkLegend.Checked = False + Me.ucrChkLegend.Location = New System.Drawing.Point(9, 337) + Me.ucrChkLegend.Name = "ucrChkLegend" + Me.ucrChkLegend.Size = New System.Drawing.Size(98, 24) + Me.ucrChkLegend.TabIndex = 102 + ' 'dlgCumulativeDistribution ' 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(415, 410) + Me.ClientSize = New System.Drawing.Size(415, 458) + Me.Controls.Add(Me.ucrInputStation) + Me.Controls.Add(Me.ucr1stFactorReceiver) + Me.Controls.Add(Me.lblFacetBy) + Me.Controls.Add(Me.ucrInputLegendPosition) + Me.Controls.Add(Me.ucrChkLegend) Me.Controls.Add(Me.rdoExceedance) Me.Controls.Add(Me.rdoCumulative) Me.Controls.Add(Me.ucrNudBy) @@ -291,4 +356,9 @@ Partial Class dlgCumulativeDistribution Friend WithEvents lblNudby As Label Friend WithEvents rdoExceedance As RadioButton Friend WithEvents rdoCumulative As RadioButton + Friend WithEvents ucrInputStation As ucrInputComboBox + Friend WithEvents ucr1stFactorReceiver As ucrReceiverSingle + Friend WithEvents lblFacetBy As Label + Friend WithEvents ucrInputLegendPosition As ucrInputComboBox + Friend WithEvents ucrChkLegend As ucrCheck End Class diff --git a/instat/dlgCumulativeDistribution.vb b/instat/dlgCumulativeDistribution.vb index dbf8902b5ae..cd123316452 100644 --- a/instat/dlgCumulativeDistribution.vb +++ b/instat/dlgCumulativeDistribution.vb @@ -41,6 +41,21 @@ Public Class dlgCumulativeDistribution Private clsSequence As New RFunction Private bReset As Boolean = True + Private clsFacetFunction As New RFunction + Private clsFacetVariablesOperator As New ROperator + Private clsFacetRowOp As New ROperator + Private clsFacetColOp As New ROperator + Private clsPipeOperator As New ROperator + Private clsGroupByFunction As New RFunction + + Private ReadOnly strNone As String = "None" + Private ReadOnly strFacetWrap As String = "Facet Wrap" + Private ReadOnly strFacetRow As String = "Facet Row" + Private ReadOnly strFacetCol As String = "Facet Column" + + Private bUpdateComboOptions As Boolean = True + Private bUpdatingParameters As Boolean = False + Private strFirstParameterName As String = "stat_ecdf" Private strFirstPointParameterName As String = "stat_ecdf2" Private strYScleParameterName As String = "YscaleContinous" @@ -65,6 +80,7 @@ Public Class dlgCumulativeDistribution Private Sub InitaliseDialog() Dim dctScalesPairs As New Dictionary(Of String, String) + Dim dctLegendPosition As New Dictionary(Of String, String) ucrChkCountsOnYAxis.Enabled = False ' temporary What should this do? @@ -120,6 +136,32 @@ Public Class dlgCumulativeDistribution 'ucrInputComboPad.SetDropDownStyleAsNonEditable() 'ucrInputComboPad.SetRDefault("TRUE") + 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) + + ucr1stFactorReceiver.SetParameter(New RParameter("var1")) + ucr1stFactorReceiver.Selector = ucrCumDistSelector + ucr1stFactorReceiver.SetIncludedDataTypes({"factor"}) + ucr1stFactorReceiver.strSelectorHeading = "Factors" + ucr1stFactorReceiver.bWithQuotes = False + ucr1stFactorReceiver.SetParameterIsString() + ucr1stFactorReceiver.SetValuesToIgnore({"."}) + ucr1stFactorReceiver.SetParameterPosition(1) + ucr1stFactorReceiver.SetLinkedDisplayControl(lblFacetBy) + + ucrInputStation.SetItems({strFacetWrap, strFacetRow, strFacetCol, strNone}) + ucrInputStation.SetDropDownStyleAsNonEditable() + ucrSaveCumDist.SetSaveTypeAsGraph() ucrSaveCumDist.SetDataFrameSelector(ucrCumDistSelector.ucrAvailableDataFrames) ucrSaveCumDist.SetCheckBoxText("Save Graph") @@ -136,6 +178,16 @@ Public Class dlgCumulativeDistribution clsRggplotFunction = New RFunction clsStatECDFAesFunction = New RFunction clsStatECDFPointAesFunction = New RFunction + clsFacetFunction = New RFunction + clsFacetVariablesOperator = New ROperator + clsFacetRowOp = New ROperator + clsFacetColOp = New ROperator + clsPipeOperator = New ROperator + clsGroupByFunction = New RFunction + + ucrInputStation.SetName(strFacetWrap) + ucrInputStation.bUpdateRCodeFromControl = True + clsSequence = New RFunction clsSequence.SetRCommand("seq") @@ -185,6 +237,22 @@ Public Class dlgCumulativeDistribution clsLabsFunction.SetRCommand("labs") clsLabsFunction.AddParameter("y", "NULL") + clsFacetFunction.SetPackageName("ggplot2") + clsFacetRowOp.SetOperation("+") + clsFacetRowOp.bBrackets = False + clsFacetColOp.SetOperation("+") + clsFacetColOp.bBrackets = False + clsFacetVariablesOperator.SetOperation("~") + clsFacetVariablesOperator.bForceIncludeOperation = True + clsFacetVariablesOperator.bBrackets = False + clsFacetFunction.AddParameter("facets", clsROperatorParameter:=clsFacetVariablesOperator, iPosition:=0) + + clsPipeOperator.SetOperation("%>%") + SetPipeAssignTo() + + clsGroupByFunction.SetPackageName("dplyr") + clsGroupByFunction.SetRCommand("group_by") + clsBaseOperator.AddParameter(GgplotDefaults.clsDefaultThemeParameter.Clone()) clsXlabsFunction = GgplotDefaults.clsXlabTitleFunction.Clone() clsLabsFunction = GgplotDefaults.clsDefaultLabs.Clone() @@ -224,6 +292,9 @@ Public Class dlgCumulativeDistribution ucrChkIncludePoints.SetRCode(clsStatECDFPointFunction, bReset) + ucrChkLegend.SetRCode(clsThemeFunction, bReset, bCloneIfNeeded:=True) + ucrInputLegendPosition.SetRCode(clsThemeFunction, bReset, bCloneIfNeeded:=True) + ucrNudBy.SetRCode(clsSequence, bReset) End Sub @@ -246,7 +317,7 @@ Public Class dlgCumulativeDistribution sdgPlots.SetRCode(clsBaseOperator, clsNewThemeFunction:=clsThemeFunction, dctNewThemeFunctions:=dctThemeFunctions, clsNewGlobalAesFunction:=clsRaesFunction, clsNewYScalecontinuousFunction:=clsYScalecontinuousFunction, clsNewXScalecontinuousFunction:=clsXScalecontinuousFunction, clsNewXLabsTitleFunction:=clsXlabsFunction, clsNewYLabTitleFunction:=clsYlabFunction, clsNewLabsFunction:=clsLabsFunction, clsNewFacetFunction:=clsRFacetFunction, clsNewScaleFillViridisFunction:=clsScaleFillViridisFunction, - clsNewScaleColourViridisFunction:=clsScaleColourViridisFunction, ucrNewBaseSelector:=ucrCumDistSelector, clsNewCoordPolarFunction:=clsCoordPolarFunction, + clsNewScaleColourViridisFunction:=clsScaleColourViridisFunction, ucrNewBaseSelector:=ucrCumDistSelector, clsNewCoordPolarFunction:=clsCoordPolarFunction, clsNewFacetVariablesOperator:=clsFacetVariablesOperator, clsNewCoordPolarStartOperator:=clsCoordPolarStartOperator, clsNewXScaleDateFunction:=clsXScaleDateFunction, clsNewYScaleDateFunction:=clsYScaleDateFunction, clsNewAnnotateFunction:=clsAnnotateFunction, strMainDialogGeomParameterNames:=strGeomParameterNames, bReset:=bResetSubdialog) sdgPlots.ShowDialog() @@ -275,4 +346,173 @@ Public Class dlgCumulativeDistribution clsBaseOperator.RemoveParameterByName(strFirstPointParameterName) End If 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 + + Private Sub AutoFacetStation() + Dim currentReceiver As ucrReceiver = ucrCumDistSelector.CurrentReceiver + + If currentReceiver IsNot Nothing Then + ucr1stFactorReceiver.AddItemsWithMetadataProperty(ucrCumDistSelector.ucrAvailableDataFrames.cboAvailableDataFrames.Text, "Climatic_Type", {"station_label"}) + currentReceiver.SetMeAsReceiver() + AddRemoveGroupBy() + End If + End Sub + Private Sub ucrInput_ControlValueChanged(ucrChangedControl As ucrInputComboBox) Handles ucrInputStation.ControlValueChanged + If Not bUpdateComboOptions Then + Exit Sub + End If + Dim strChangedText As String = ucrChangedControl.GetText() + If strChangedText <> strNone Then + If Not strChangedText = strFacetCol AndAlso Not strChangedText = strFacetRow AndAlso + Not ucrInputStation.Equals(ucrChangedControl) AndAlso ucrInputStation.GetText() = strChangedText Then + bUpdateComboOptions = False + ucrInputStation.SetName(strNone) + bUpdateComboOptions = True + End If + If (strChangedText = strFacetWrap AndAlso ucrInputStation.GetText = strFacetRow) OrElse (strChangedText = strFacetRow AndAlso + ucrInputStation.GetText = strFacetWrap) OrElse (strChangedText = strFacetWrap AndAlso + ucrInputStation.GetText = strFacetCol) OrElse (strChangedText = strFacetCol AndAlso ucrInputStation.GetText = strFacetWrap) Then + ucrInputStation.SetName(strNone) + End If + End If + UpdateParameters() + AddRemoveFacets() + AddRemoveGroupBy() + End Sub + + Private Sub UpdateParameters() + clsFacetVariablesOperator.RemoveParameterByName("var1") + clsFacetColOp.RemoveParameterByName("col" & ucrInputStation.Name) + clsFacetRowOp.RemoveParameterByName("row" & ucrInputStation.Name) + + clsBaseOperator.RemoveParameterByName("facets") + bUpdatingParameters = True + ucr1stFactorReceiver.SetRCode(Nothing) + Select Case ucrInputStation.GetText() + Case strFacetWrap + ucr1stFactorReceiver.ChangeParameterName("var1") + ucr1stFactorReceiver.SetRCode(clsFacetVariablesOperator) + Case strFacetCol + ucr1stFactorReceiver.ChangeParameterName("col" & ucrInputStation.Name) + ucr1stFactorReceiver.SetRCode(clsFacetColOp) + Case strFacetRow + ucr1stFactorReceiver.ChangeParameterName("row" & ucrInputStation.Name) + ucr1stFactorReceiver.SetRCode(clsFacetRowOp) + End Select + If Not clsRaesFunction.ContainsParameter("x") Then + clsRaesFunction.AddParameter("x", Chr(34) & Chr(34)) + End If + bUpdatingParameters = False + End Sub + + Private Sub AddRemoveFacets() + Dim bWrap As Boolean = False + Dim bCol As Boolean = False + Dim bRow As Boolean = False + + If bUpdatingParameters Then + Exit Sub + End If + + clsBaseOperator.RemoveParameterByName("facets") + If Not ucr1stFactorReceiver.IsEmpty Then + Select Case ucrInputStation.GetText() + Case strFacetWrap + bWrap = True + Case strFacetCol + bCol = True + Case strFacetRow + bRow = True + End Select + End If + + If bWrap OrElse bRow OrElse bCol Then + clsBaseOperator.AddParameter("facets", clsRFunctionParameter:=clsFacetFunction) + End If + If bWrap Then + clsFacetFunction.SetRCommand("facet_wrap") + End If + If bRow OrElse bCol Then + clsFacetFunction.SetRCommand("facet_grid") + End If + If bRow Then + clsFacetVariablesOperator.AddParameter("left", clsROperatorParameter:=clsFacetRowOp, iPosition:=0) + ElseIf bCol AndAlso bWrap = False Then + clsFacetVariablesOperator.AddParameter("left", ".", iPosition:=0) + Else + clsFacetVariablesOperator.RemoveParameterByName("left") + End If + If bCol Then + clsFacetVariablesOperator.AddParameter("right", clsROperatorParameter:=clsFacetColOp, iPosition:=1) + ElseIf bRow AndAlso bWrap = False Then + clsFacetVariablesOperator.AddParameter("right", ".", iPosition:=1) + Else + clsFacetVariablesOperator.RemoveParameterByName("right") + End If + End Sub + + Private Sub ucr1stFactorReceiver_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucr1stFactorReceiver.ControlValueChanged, ucrVariablesAsFactorforCumDist.ControlValueChanged + AddRemoveFacets() + AddRemoveGroupBy() + End Sub + + Private Sub GetParameterValue(clsOperator As ROperator) + Dim i As Integer = 0 + For Each clsTempParam As RParameter In clsOperator.clsParameters + If clsTempParam.strArgumentValue <> "" AndAlso clsTempParam.strArgumentValue <> "." Then + clsGroupByFunction.AddParameter(i, clsTempParam.strArgumentValue, bIncludeArgumentName:=False, iPosition:=i) + i = i + 1 + End If + Next + End Sub + + Private Sub AddRemoveGroupBy() + If clsPipeOperator.ContainsParameter("mutate") Then + clsGroupByFunction.ClearParameters() + If clsBaseOperator.ContainsParameter("facets") Then + Select Case ucrInputStation.GetText() + Case strFacetWrap + GetParameterValue(clsFacetVariablesOperator) + Case strFacetCol + GetParameterValue(clsFacetColOp) + Case strFacetRow + GetParameterValue(clsFacetRowOp) + End Select + End If + + If clsGroupByFunction.iParameterCount > 0 Then + clsPipeOperator.AddParameter("group_by", clsRFunctionParameter:=clsGroupByFunction, iPosition:=1) + Else + clsPipeOperator.RemoveParameterByName("group_by") + End If + Else + clsPipeOperator.RemoveParameterByName("group_by") + End If + + SetPipeAssignTo() + End Sub + + Private Sub SetPipeAssignTo() + If ucrCumDistSelector.ucrAvailableDataFrames.cboAvailableDataFrames.Text <> "" AndAlso clsPipeOperator.clsParameters.Count > 1 Then + clsPipeOperator.SetAssignTo(ucrCumDistSelector.ucrAvailableDataFrames.cboAvailableDataFrames.Text) + Else + clsPipeOperator.RemoveAssignTo() + End If + End Sub + + Private Sub ucrCumDistSelector_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrCumDistSelector.ControlValueChanged + AutoFacetStation() + SetPipeAssignTo() + End Sub End Class \ No newline at end of file diff --git a/instat/dlgEndOfRainsSeason.Designer.vb b/instat/dlgEndOfRainsSeason.Designer.vb index 538b4708bfc..8b4b8203617 100644 --- a/instat/dlgEndOfRainsSeason.Designer.vb +++ b/instat/dlgEndOfRainsSeason.Designer.vb @@ -51,7 +51,6 @@ Partial Class dlgEndOfRainsSeason Me.cmdDoyRange = New System.Windows.Forms.Button() Me.rdoVariableEvaporation = New System.Windows.Forms.RadioButton() Me.rdoValueEvaporation = New System.Windows.Forms.RadioButton() - Me.lblReplaceNA = New System.Windows.Forms.Label() Me.grpEndofSeason = New System.Windows.Forms.GroupBox() Me.ucrInputEndofSeasonOccurence = New instat.ucrInputTextBox() Me.ucrInputSeasonDoy = New instat.ucrInputTextBox() @@ -69,7 +68,6 @@ Partial Class dlgEndOfRainsSeason Me.rdoEndOfSeasons = New System.Windows.Forms.RadioButton() Me.rdoEndOfRains = New System.Windows.Forms.RadioButton() Me.ucrPnlEndOfRainsAndSeasons = New instat.UcrPanel() - Me.ucrInputReplaceNA = New instat.ucrInputTextBox() Me.ucrReceiverEvaporation = New instat.ucrReceiverSingle() Me.ucrInputEvaporation = New instat.ucrInputTextBox() Me.ucrPnlEvaporation = New instat.UcrPanel() @@ -94,40 +92,36 @@ Partial Class dlgEndOfRainsSeason 'lblYear ' Me.lblYear.AutoSize = True - Me.lblYear.Location = New System.Drawing.Point(459, 206) - Me.lblYear.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblYear.Location = New System.Drawing.Point(306, 137) Me.lblYear.Name = "lblYear" - Me.lblYear.Size = New System.Drawing.Size(47, 20) + Me.lblYear.Size = New System.Drawing.Size(32, 13) Me.lblYear.TabIndex = 5 Me.lblYear.Text = "Year:" ' 'lblDate ' Me.lblDate.AutoSize = True - Me.lblDate.Location = New System.Drawing.Point(459, 136) - Me.lblDate.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblDate.Location = New System.Drawing.Point(306, 91) Me.lblDate.Name = "lblDate" - Me.lblDate.Size = New System.Drawing.Size(48, 20) + Me.lblDate.Size = New System.Drawing.Size(33, 13) Me.lblDate.TabIndex = 3 Me.lblDate.Text = "Date:" ' 'lblDOY ' Me.lblDOY.AutoSize = True - Me.lblDOY.Location = New System.Drawing.Point(459, 272) - Me.lblDOY.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblDOY.Location = New System.Drawing.Point(306, 181) Me.lblDOY.Name = "lblDOY" - Me.lblDOY.Size = New System.Drawing.Size(97, 20) + Me.lblDOY.Size = New System.Drawing.Size(66, 13) Me.lblDOY.TabIndex = 7 Me.lblDOY.Text = "Day of Year:" ' 'lblCapacity ' Me.lblCapacity.AutoSize = True - Me.lblCapacity.Location = New System.Drawing.Point(24, 465) - Me.lblCapacity.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblCapacity.Location = New System.Drawing.Point(16, 310) Me.lblCapacity.Name = "lblCapacity" - Me.lblCapacity.Size = New System.Drawing.Size(74, 20) + Me.lblCapacity.Size = New System.Drawing.Size(51, 13) Me.lblCapacity.TabIndex = 20 Me.lblCapacity.Tag = "Capacity:" Me.lblCapacity.Text = "Capacity:" @@ -135,60 +129,54 @@ Partial Class dlgEndOfRainsSeason 'lblRainfall ' Me.lblRainfall.AutoSize = True - Me.lblRainfall.Location = New System.Drawing.Point(459, 338) - Me.lblRainfall.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblRainfall.Location = New System.Drawing.Point(306, 225) Me.lblRainfall.Name = "lblRainfall" - Me.lblRainfall.Size = New System.Drawing.Size(104, 20) + Me.lblRainfall.Size = New System.Drawing.Size(70, 13) Me.lblRainfall.TabIndex = 9 Me.lblRainfall.Text = "Rain Column:" ' 'lblEvaporation ' Me.lblEvaporation.AutoSize = True - Me.lblEvaporation.Location = New System.Drawing.Point(22, 517) - Me.lblEvaporation.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblEvaporation.Location = New System.Drawing.Point(15, 345) Me.lblEvaporation.Name = "lblEvaporation" - Me.lblEvaporation.Size = New System.Drawing.Size(98, 20) + Me.lblEvaporation.Size = New System.Drawing.Size(67, 13) Me.lblEvaporation.TabIndex = 24 Me.lblEvaporation.Text = "Evaporation:" ' 'lblStation ' Me.lblStation.AutoSize = True - Me.lblStation.Location = New System.Drawing.Point(459, 69) - Me.lblStation.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblStation.Location = New System.Drawing.Point(306, 46) Me.lblStation.Name = "lblStation" - Me.lblStation.Size = New System.Drawing.Size(64, 20) + Me.lblStation.Size = New System.Drawing.Size(43, 13) Me.lblStation.TabIndex = 1 Me.lblStation.Text = "Station:" ' 'lblAmount ' Me.lblAmount.AutoSize = True - Me.lblAmount.Location = New System.Drawing.Point(22, 465) - Me.lblAmount.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblAmount.Location = New System.Drawing.Point(15, 310) Me.lblAmount.Name = "lblAmount" - Me.lblAmount.Size = New System.Drawing.Size(69, 20) + Me.lblAmount.Size = New System.Drawing.Size(46, 13) Me.lblAmount.TabIndex = 14 Me.lblAmount.Text = "Amount:" ' 'lblTotalOverDays ' Me.lblTotalOverDays.AutoSize = True - Me.lblTotalOverDays.Location = New System.Drawing.Point(242, 465) - Me.lblTotalOverDays.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblTotalOverDays.Location = New System.Drawing.Point(161, 310) Me.lblTotalOverDays.Name = "lblTotalOverDays" - Me.lblTotalOverDays.Size = New System.Drawing.Size(96, 20) + Me.lblTotalOverDays.Size = New System.Drawing.Size(66, 13) Me.lblTotalOverDays.TabIndex = 16 Me.lblTotalOverDays.Text = "Over Day(s):" ' 'lblWaterBalanceLessThan ' Me.lblWaterBalanceLessThan.AutoSize = True - Me.lblWaterBalanceLessThan.Location = New System.Drawing.Point(202, 465) - Me.lblWaterBalanceLessThan.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblWaterBalanceLessThan.Location = New System.Drawing.Point(135, 310) Me.lblWaterBalanceLessThan.Name = "lblWaterBalanceLessThan" - Me.lblWaterBalanceLessThan.Size = New System.Drawing.Size(136, 20) + Me.lblWaterBalanceLessThan.Size = New System.Drawing.Size(93, 13) Me.lblWaterBalanceLessThan.TabIndex = 22 Me.lblWaterBalanceLessThan.Tag = "Water Balance <=" Me.lblWaterBalanceLessThan.Text = "Water Balance <=" @@ -196,10 +184,9 @@ Partial Class dlgEndOfRainsSeason 'cmdDoyRange ' Me.cmdDoyRange.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdDoyRange.Location = New System.Drawing.Point(33, 405) - Me.cmdDoyRange.Margin = New System.Windows.Forms.Padding(4) + Me.cmdDoyRange.Location = New System.Drawing.Point(22, 270) Me.cmdDoyRange.Name = "cmdDoyRange" - Me.cmdDoyRange.Size = New System.Drawing.Size(158, 39) + Me.cmdDoyRange.Size = New System.Drawing.Size(105, 26) Me.cmdDoyRange.TabIndex = 11 Me.cmdDoyRange.Tag = "" Me.cmdDoyRange.Text = "Day Range" @@ -208,10 +195,9 @@ Partial Class dlgEndOfRainsSeason 'rdoVariableEvaporation ' Me.rdoVariableEvaporation.AutoSize = True - Me.rdoVariableEvaporation.Location = New System.Drawing.Point(335, 513) - Me.rdoVariableEvaporation.Margin = New System.Windows.Forms.Padding(4) + Me.rdoVariableEvaporation.Location = New System.Drawing.Point(223, 342) Me.rdoVariableEvaporation.Name = "rdoVariableEvaporation" - Me.rdoVariableEvaporation.Size = New System.Drawing.Size(92, 24) + Me.rdoVariableEvaporation.Size = New System.Drawing.Size(63, 17) Me.rdoVariableEvaporation.TabIndex = 28 Me.rdoVariableEvaporation.Text = "Variable" Me.rdoVariableEvaporation.UseVisualStyleBackColor = True @@ -219,24 +205,13 @@ Partial Class dlgEndOfRainsSeason 'rdoValueEvaporation ' Me.rdoValueEvaporation.AutoSize = True - Me.rdoValueEvaporation.Location = New System.Drawing.Point(144, 513) - Me.rdoValueEvaporation.Margin = New System.Windows.Forms.Padding(4) + Me.rdoValueEvaporation.Location = New System.Drawing.Point(96, 342) Me.rdoValueEvaporation.Name = "rdoValueEvaporation" - Me.rdoValueEvaporation.Size = New System.Drawing.Size(75, 24) + Me.rdoValueEvaporation.Size = New System.Drawing.Size(52, 17) Me.rdoValueEvaporation.TabIndex = 26 Me.rdoValueEvaporation.Text = "Value" Me.rdoValueEvaporation.UseVisualStyleBackColor = True ' - 'lblReplaceNA - ' - Me.lblReplaceNA.AutoSize = True - Me.lblReplaceNA.Location = New System.Drawing.Point(122, 603) - Me.lblReplaceNA.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) - Me.lblReplaceNA.Name = "lblReplaceNA" - Me.lblReplaceNA.Size = New System.Drawing.Size(130, 20) - Me.lblReplaceNA.TabIndex = 30 - Me.lblReplaceNA.Text = "Replace NA with:" - ' 'grpEndofSeason ' Me.grpEndofSeason.Controls.Add(Me.ucrInputEndofSeasonOccurence) @@ -245,11 +220,9 @@ Partial Class dlgEndOfRainsSeason Me.grpEndofSeason.Controls.Add(Me.ucrChkEndofSeasonOccurence) Me.grpEndofSeason.Controls.Add(Me.ucrChkEndofSeasonDate) Me.grpEndofSeason.Controls.Add(Me.ucrChkEndofSeasonDoy) - Me.grpEndofSeason.Location = New System.Drawing.Point(4, 639) - Me.grpEndofSeason.Margin = New System.Windows.Forms.Padding(4) + Me.grpEndofSeason.Location = New System.Drawing.Point(3, 426) Me.grpEndofSeason.Name = "grpEndofSeason" - Me.grpEndofSeason.Padding = New System.Windows.Forms.Padding(4) - Me.grpEndofSeason.Size = New System.Drawing.Size(708, 62) + Me.grpEndofSeason.Size = New System.Drawing.Size(472, 41) Me.grpEndofSeason.TabIndex = 32 Me.grpEndofSeason.TabStop = False Me.grpEndofSeason.Text = "End of Season" @@ -260,10 +233,10 @@ Partial Class dlgEndOfRainsSeason Me.ucrInputEndofSeasonOccurence.AutoSize = True Me.ucrInputEndofSeasonOccurence.IsMultiline = False Me.ucrInputEndofSeasonOccurence.IsReadOnly = False - Me.ucrInputEndofSeasonOccurence.Location = New System.Drawing.Point(542, 22) - Me.ucrInputEndofSeasonOccurence.Margin = New System.Windows.Forms.Padding(14) + Me.ucrInputEndofSeasonOccurence.Location = New System.Drawing.Point(361, 15) + Me.ucrInputEndofSeasonOccurence.Margin = New System.Windows.Forms.Padding(9) Me.ucrInputEndofSeasonOccurence.Name = "ucrInputEndofSeasonOccurence" - Me.ucrInputEndofSeasonOccurence.Size = New System.Drawing.Size(156, 32) + Me.ucrInputEndofSeasonOccurence.Size = New System.Drawing.Size(104, 21) Me.ucrInputEndofSeasonOccurence.TabIndex = 38 ' 'ucrInputSeasonDoy @@ -272,10 +245,10 @@ Partial Class dlgEndOfRainsSeason Me.ucrInputSeasonDoy.AutoSize = True Me.ucrInputSeasonDoy.IsMultiline = False Me.ucrInputSeasonDoy.IsReadOnly = False - Me.ucrInputSeasonDoy.Location = New System.Drawing.Point(74, 22) - Me.ucrInputSeasonDoy.Margin = New System.Windows.Forms.Padding(14) + Me.ucrInputSeasonDoy.Location = New System.Drawing.Point(49, 15) + Me.ucrInputSeasonDoy.Margin = New System.Windows.Forms.Padding(9) Me.ucrInputSeasonDoy.Name = "ucrInputSeasonDoy" - Me.ucrInputSeasonDoy.Size = New System.Drawing.Size(100, 32) + Me.ucrInputSeasonDoy.Size = New System.Drawing.Size(67, 21) Me.ucrInputSeasonDoy.TabIndex = 32 ' 'ucrInputEndofSeasonDate @@ -284,40 +257,40 @@ Partial Class dlgEndOfRainsSeason Me.ucrInputEndofSeasonDate.AutoSize = True Me.ucrInputEndofSeasonDate.IsMultiline = False Me.ucrInputEndofSeasonDate.IsReadOnly = False - Me.ucrInputEndofSeasonDate.Location = New System.Drawing.Point(248, 22) - Me.ucrInputEndofSeasonDate.Margin = New System.Windows.Forms.Padding(14) + Me.ucrInputEndofSeasonDate.Location = New System.Drawing.Point(165, 15) + Me.ucrInputEndofSeasonDate.Margin = New System.Windows.Forms.Padding(9) Me.ucrInputEndofSeasonDate.Name = "ucrInputEndofSeasonDate" - Me.ucrInputEndofSeasonDate.Size = New System.Drawing.Size(165, 32) + Me.ucrInputEndofSeasonDate.Size = New System.Drawing.Size(110, 21) Me.ucrInputEndofSeasonDate.TabIndex = 37 ' 'ucrChkEndofSeasonOccurence ' Me.ucrChkEndofSeasonOccurence.AutoSize = True Me.ucrChkEndofSeasonOccurence.Checked = False - Me.ucrChkEndofSeasonOccurence.Location = New System.Drawing.Point(422, 26) - Me.ucrChkEndofSeasonOccurence.Margin = New System.Windows.Forms.Padding(9) + Me.ucrChkEndofSeasonOccurence.Location = New System.Drawing.Point(281, 17) + Me.ucrChkEndofSeasonOccurence.Margin = New System.Windows.Forms.Padding(6) Me.ucrChkEndofSeasonOccurence.Name = "ucrChkEndofSeasonOccurence" - Me.ucrChkEndofSeasonOccurence.Size = New System.Drawing.Size(126, 51) + Me.ucrChkEndofSeasonOccurence.Size = New System.Drawing.Size(84, 34) Me.ucrChkEndofSeasonOccurence.TabIndex = 48 ' 'ucrChkEndofSeasonDate ' Me.ucrChkEndofSeasonDate.AutoSize = True Me.ucrChkEndofSeasonDate.Checked = False - Me.ucrChkEndofSeasonDate.Location = New System.Drawing.Point(182, 24) - Me.ucrChkEndofSeasonDate.Margin = New System.Windows.Forms.Padding(9) + Me.ucrChkEndofSeasonDate.Location = New System.Drawing.Point(121, 16) + Me.ucrChkEndofSeasonDate.Margin = New System.Windows.Forms.Padding(6) Me.ucrChkEndofSeasonDate.Name = "ucrChkEndofSeasonDate" - Me.ucrChkEndofSeasonDate.Size = New System.Drawing.Size(80, 51) + Me.ucrChkEndofSeasonDate.Size = New System.Drawing.Size(53, 34) Me.ucrChkEndofSeasonDate.TabIndex = 47 ' 'ucrChkEndofSeasonDoy ' Me.ucrChkEndofSeasonDoy.AutoSize = True Me.ucrChkEndofSeasonDoy.Checked = False - Me.ucrChkEndofSeasonDoy.Location = New System.Drawing.Point(6, 24) - Me.ucrChkEndofSeasonDoy.Margin = New System.Windows.Forms.Padding(9) + Me.ucrChkEndofSeasonDoy.Location = New System.Drawing.Point(4, 16) + Me.ucrChkEndofSeasonDoy.Margin = New System.Windows.Forms.Padding(6) Me.ucrChkEndofSeasonDoy.Name = "ucrChkEndofSeasonDoy" - Me.ucrChkEndofSeasonDoy.Size = New System.Drawing.Size(87, 51) + Me.ucrChkEndofSeasonDoy.Size = New System.Drawing.Size(58, 34) Me.ucrChkEndofSeasonDoy.TabIndex = 46 ' 'grpEndofRains @@ -328,11 +301,9 @@ Partial Class dlgEndOfRainsSeason Me.grpEndofRains.Controls.Add(Me.ucrChkEndofRainsDoy) Me.grpEndofRains.Controls.Add(Me.ucrChkEndofRainsDate) Me.grpEndofRains.Controls.Add(Me.ucrChkEndofRainsOccurence) - Me.grpEndofRains.Location = New System.Drawing.Point(4, 639) - Me.grpEndofRains.Margin = New System.Windows.Forms.Padding(4) + Me.grpEndofRains.Location = New System.Drawing.Point(3, 426) Me.grpEndofRains.Name = "grpEndofRains" - Me.grpEndofRains.Padding = New System.Windows.Forms.Padding(4) - Me.grpEndofRains.Size = New System.Drawing.Size(644, 60) + Me.grpEndofRains.Size = New System.Drawing.Size(429, 40) Me.grpEndofRains.TabIndex = 18 Me.grpEndofRains.TabStop = False Me.grpEndofRains.Text = "End of Rains" @@ -343,10 +314,10 @@ Partial Class dlgEndOfRainsSeason Me.ucrInputEndofRainsDate.AutoSize = True Me.ucrInputEndofRainsDate.IsMultiline = False Me.ucrInputEndofRainsDate.IsReadOnly = False - Me.ucrInputEndofRainsDate.Location = New System.Drawing.Point(248, 26) - Me.ucrInputEndofRainsDate.Margin = New System.Windows.Forms.Padding(14) + Me.ucrInputEndofRainsDate.Location = New System.Drawing.Point(165, 17) + Me.ucrInputEndofRainsDate.Margin = New System.Windows.Forms.Padding(9) Me.ucrInputEndofRainsDate.Name = "ucrInputEndofRainsDate" - Me.ucrInputEndofRainsDate.Size = New System.Drawing.Size(140, 26) + Me.ucrInputEndofRainsDate.Size = New System.Drawing.Size(93, 17) Me.ucrInputEndofRainsDate.TabIndex = 36 ' 'ucrInputEndofRainsOccurence @@ -355,10 +326,10 @@ Partial Class dlgEndOfRainsSeason Me.ucrInputEndofRainsOccurence.AutoSize = True Me.ucrInputEndofRainsOccurence.IsMultiline = False Me.ucrInputEndofRainsOccurence.IsReadOnly = False - Me.ucrInputEndofRainsOccurence.Location = New System.Drawing.Point(512, 24) - Me.ucrInputEndofRainsOccurence.Margin = New System.Windows.Forms.Padding(14) + Me.ucrInputEndofRainsOccurence.Location = New System.Drawing.Point(341, 16) + Me.ucrInputEndofRainsOccurence.Margin = New System.Windows.Forms.Padding(9) Me.ucrInputEndofRainsOccurence.Name = "ucrInputEndofRainsOccurence" - Me.ucrInputEndofRainsOccurence.Size = New System.Drawing.Size(141, 30) + Me.ucrInputEndofRainsOccurence.Size = New System.Drawing.Size(94, 20) Me.ucrInputEndofRainsOccurence.TabIndex = 39 ' 'ucrInputEndRainDoy @@ -367,40 +338,40 @@ Partial Class dlgEndOfRainsSeason Me.ucrInputEndRainDoy.AutoSize = True Me.ucrInputEndRainDoy.IsMultiline = False Me.ucrInputEndRainDoy.IsReadOnly = False - Me.ucrInputEndRainDoy.Location = New System.Drawing.Point(75, 26) - Me.ucrInputEndRainDoy.Margin = New System.Windows.Forms.Padding(14) + Me.ucrInputEndRainDoy.Location = New System.Drawing.Point(50, 17) + Me.ucrInputEndRainDoy.Margin = New System.Windows.Forms.Padding(9) Me.ucrInputEndRainDoy.Name = "ucrInputEndRainDoy" - Me.ucrInputEndRainDoy.Size = New System.Drawing.Size(98, 32) + Me.ucrInputEndRainDoy.Size = New System.Drawing.Size(65, 21) Me.ucrInputEndRainDoy.TabIndex = 50 ' 'ucrChkEndofRainsDoy ' Me.ucrChkEndofRainsDoy.AutoSize = True Me.ucrChkEndofRainsDoy.Checked = False - Me.ucrChkEndofRainsDoy.Location = New System.Drawing.Point(8, 27) - Me.ucrChkEndofRainsDoy.Margin = New System.Windows.Forms.Padding(9) + Me.ucrChkEndofRainsDoy.Location = New System.Drawing.Point(5, 18) + Me.ucrChkEndofRainsDoy.Margin = New System.Windows.Forms.Padding(6) Me.ucrChkEndofRainsDoy.Name = "ucrChkEndofRainsDoy" - Me.ucrChkEndofRainsDoy.Size = New System.Drawing.Size(90, 51) + Me.ucrChkEndofRainsDoy.Size = New System.Drawing.Size(60, 34) Me.ucrChkEndofRainsDoy.TabIndex = 49 ' 'ucrChkEndofRainsDate ' Me.ucrChkEndofRainsDate.AutoSize = True Me.ucrChkEndofRainsDate.Checked = False - Me.ucrChkEndofRainsDate.Location = New System.Drawing.Point(177, 26) - Me.ucrChkEndofRainsDate.Margin = New System.Windows.Forms.Padding(9) + Me.ucrChkEndofRainsDate.Location = New System.Drawing.Point(118, 17) + Me.ucrChkEndofRainsDate.Margin = New System.Windows.Forms.Padding(6) Me.ucrChkEndofRainsDate.Name = "ucrChkEndofRainsDate" - Me.ucrChkEndofRainsDate.Size = New System.Drawing.Size(78, 51) + Me.ucrChkEndofRainsDate.Size = New System.Drawing.Size(52, 34) Me.ucrChkEndofRainsDate.TabIndex = 48 ' 'ucrChkEndofRainsOccurence ' Me.ucrChkEndofRainsOccurence.AutoSize = True Me.ucrChkEndofRainsOccurence.Checked = False - Me.ucrChkEndofRainsOccurence.Location = New System.Drawing.Point(396, 24) - Me.ucrChkEndofRainsOccurence.Margin = New System.Windows.Forms.Padding(9) + Me.ucrChkEndofRainsOccurence.Location = New System.Drawing.Point(264, 16) + Me.ucrChkEndofRainsOccurence.Margin = New System.Windows.Forms.Padding(6) Me.ucrChkEndofRainsOccurence.Name = "ucrChkEndofRainsOccurence" - Me.ucrChkEndofRainsOccurence.Size = New System.Drawing.Size(136, 51) + Me.ucrChkEndofRainsOccurence.Size = New System.Drawing.Size(91, 34) Me.ucrChkEndofRainsOccurence.TabIndex = 47 ' 'rdoEndOfSeasons @@ -411,10 +382,9 @@ Partial Class dlgEndOfRainsSeason Me.rdoEndOfSeasons.FlatAppearance.CheckedBackColor = System.Drawing.SystemColors.ActiveCaption Me.rdoEndOfSeasons.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.rdoEndOfSeasons.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.rdoEndOfSeasons.Location = New System.Drawing.Point(326, 15) - Me.rdoEndOfSeasons.Margin = New System.Windows.Forms.Padding(4) + Me.rdoEndOfSeasons.Location = New System.Drawing.Point(217, 10) Me.rdoEndOfSeasons.Name = "rdoEndOfSeasons" - Me.rdoEndOfSeasons.Size = New System.Drawing.Size(195, 40) + Me.rdoEndOfSeasons.Size = New System.Drawing.Size(130, 27) Me.rdoEndOfSeasons.TabIndex = 36 Me.rdoEndOfSeasons.Text = "End of Season" Me.rdoEndOfSeasons.TextAlign = System.Drawing.ContentAlignment.MiddleCenter @@ -428,10 +398,9 @@ Partial Class dlgEndOfRainsSeason Me.rdoEndOfRains.FlatAppearance.CheckedBackColor = System.Drawing.SystemColors.ActiveCaption Me.rdoEndOfRains.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.rdoEndOfRains.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.rdoEndOfRains.Location = New System.Drawing.Point(134, 15) - Me.rdoEndOfRains.Margin = New System.Windows.Forms.Padding(4) + Me.rdoEndOfRains.Location = New System.Drawing.Point(89, 10) Me.rdoEndOfRains.Name = "rdoEndOfRains" - Me.rdoEndOfRains.Size = New System.Drawing.Size(195, 40) + Me.rdoEndOfRains.Size = New System.Drawing.Size(130, 27) Me.rdoEndOfRains.TabIndex = 35 Me.rdoEndOfRains.Text = "End of Rains" Me.rdoEndOfRains.TextAlign = System.Drawing.ContentAlignment.MiddleCenter @@ -440,33 +409,21 @@ Partial Class dlgEndOfRainsSeason 'ucrPnlEndOfRainsAndSeasons ' Me.ucrPnlEndOfRainsAndSeasons.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrPnlEndOfRainsAndSeasons.Location = New System.Drawing.Point(118, 14) - Me.ucrPnlEndOfRainsAndSeasons.Margin = New System.Windows.Forms.Padding(9) + Me.ucrPnlEndOfRainsAndSeasons.Location = New System.Drawing.Point(79, 9) + Me.ucrPnlEndOfRainsAndSeasons.Margin = New System.Windows.Forms.Padding(6) Me.ucrPnlEndOfRainsAndSeasons.Name = "ucrPnlEndOfRainsAndSeasons" - Me.ucrPnlEndOfRainsAndSeasons.Size = New System.Drawing.Size(410, 52) + Me.ucrPnlEndOfRainsAndSeasons.Size = New System.Drawing.Size(273, 35) Me.ucrPnlEndOfRainsAndSeasons.TabIndex = 34 ' - 'ucrInputReplaceNA - ' - Me.ucrInputReplaceNA.AddQuotesIfUnrecognised = True - Me.ucrInputReplaceNA.AutoSize = True - Me.ucrInputReplaceNA.IsMultiline = False - Me.ucrInputReplaceNA.IsReadOnly = False - Me.ucrInputReplaceNA.Location = New System.Drawing.Point(264, 596) - Me.ucrInputReplaceNA.Margin = New System.Windows.Forms.Padding(14) - Me.ucrInputReplaceNA.Name = "ucrInputReplaceNA" - Me.ucrInputReplaceNA.Size = New System.Drawing.Size(78, 32) - Me.ucrInputReplaceNA.TabIndex = 31 - ' 'ucrReceiverEvaporation ' Me.ucrReceiverEvaporation.AutoSize = True Me.ucrReceiverEvaporation.frmParent = Me - Me.ucrReceiverEvaporation.Location = New System.Drawing.Point(431, 513) + Me.ucrReceiverEvaporation.Location = New System.Drawing.Point(287, 342) Me.ucrReceiverEvaporation.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverEvaporation.Name = "ucrReceiverEvaporation" Me.ucrReceiverEvaporation.Selector = Nothing - Me.ucrReceiverEvaporation.Size = New System.Drawing.Size(210, 30) + Me.ucrReceiverEvaporation.Size = New System.Drawing.Size(140, 20) Me.ucrReceiverEvaporation.strNcFilePath = "" Me.ucrReceiverEvaporation.TabIndex = 29 Me.ucrReceiverEvaporation.ucrSelector = Nothing @@ -477,19 +434,19 @@ Partial Class dlgEndOfRainsSeason Me.ucrInputEvaporation.AutoSize = True Me.ucrInputEvaporation.IsMultiline = False Me.ucrInputEvaporation.IsReadOnly = False - Me.ucrInputEvaporation.Location = New System.Drawing.Point(230, 513) - Me.ucrInputEvaporation.Margin = New System.Windows.Forms.Padding(14) + Me.ucrInputEvaporation.Location = New System.Drawing.Point(153, 342) + Me.ucrInputEvaporation.Margin = New System.Windows.Forms.Padding(9) Me.ucrInputEvaporation.Name = "ucrInputEvaporation" - Me.ucrInputEvaporation.Size = New System.Drawing.Size(96, 32) + Me.ucrInputEvaporation.Size = New System.Drawing.Size(64, 21) Me.ucrInputEvaporation.TabIndex = 27 ' 'ucrPnlEvaporation ' Me.ucrPnlEvaporation.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrPnlEvaporation.Location = New System.Drawing.Point(144, 505) - Me.ucrPnlEvaporation.Margin = New System.Windows.Forms.Padding(9) + Me.ucrPnlEvaporation.Location = New System.Drawing.Point(96, 337) + Me.ucrPnlEvaporation.Margin = New System.Windows.Forms.Padding(6) Me.ucrPnlEvaporation.Name = "ucrPnlEvaporation" - Me.ucrPnlEvaporation.Size = New System.Drawing.Size(518, 40) + Me.ucrPnlEvaporation.Size = New System.Drawing.Size(345, 27) Me.ucrPnlEvaporation.TabIndex = 25 ' 'ucrInputFilterPreview @@ -498,10 +455,10 @@ Partial Class dlgEndOfRainsSeason Me.ucrInputFilterPreview.AutoSize = True Me.ucrInputFilterPreview.IsMultiline = False Me.ucrInputFilterPreview.IsReadOnly = True - Me.ucrInputFilterPreview.Location = New System.Drawing.Point(196, 410) - Me.ucrInputFilterPreview.Margin = New System.Windows.Forms.Padding(14) + Me.ucrInputFilterPreview.Location = New System.Drawing.Point(131, 273) + Me.ucrInputFilterPreview.Margin = New System.Windows.Forms.Padding(9) Me.ucrInputFilterPreview.Name = "ucrInputFilterPreview" - Me.ucrInputFilterPreview.Size = New System.Drawing.Size(363, 33) + Me.ucrInputFilterPreview.Size = New System.Drawing.Size(242, 22) Me.ucrInputFilterPreview.TabIndex = 12 ' 'ucrNudTotalOverDays @@ -509,12 +466,12 @@ Partial Class dlgEndOfRainsSeason Me.ucrNudTotalOverDays.AutoSize = True Me.ucrNudTotalOverDays.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudTotalOverDays.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudTotalOverDays.Location = New System.Drawing.Point(350, 462) - Me.ucrNudTotalOverDays.Margin = New System.Windows.Forms.Padding(9) + Me.ucrNudTotalOverDays.Location = New System.Drawing.Point(233, 308) + Me.ucrNudTotalOverDays.Margin = New System.Windows.Forms.Padding(6) Me.ucrNudTotalOverDays.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) Me.ucrNudTotalOverDays.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudTotalOverDays.Name = "ucrNudTotalOverDays" - Me.ucrNudTotalOverDays.Size = New System.Drawing.Size(75, 30) + Me.ucrNudTotalOverDays.Size = New System.Drawing.Size(50, 20) Me.ucrNudTotalOverDays.TabIndex = 17 Me.ucrNudTotalOverDays.Value = New Decimal(New Integer() {0, 0, 0, 0}) ' @@ -523,12 +480,12 @@ Partial Class dlgEndOfRainsSeason Me.ucrNudAmount.AutoSize = True Me.ucrNudAmount.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudAmount.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudAmount.Location = New System.Drawing.Point(102, 462) - Me.ucrNudAmount.Margin = New System.Windows.Forms.Padding(9) + Me.ucrNudAmount.Location = New System.Drawing.Point(68, 308) + Me.ucrNudAmount.Margin = New System.Windows.Forms.Padding(6) Me.ucrNudAmount.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) Me.ucrNudAmount.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudAmount.Name = "ucrNudAmount" - Me.ucrNudAmount.Size = New System.Drawing.Size(75, 30) + Me.ucrNudAmount.Size = New System.Drawing.Size(50, 20) Me.ucrNudAmount.TabIndex = 15 Me.ucrNudAmount.Value = New Decimal(New Integer() {0, 0, 0, 0}) ' @@ -537,12 +494,12 @@ Partial Class dlgEndOfRainsSeason Me.ucrNudWBLessThan.AutoSize = True Me.ucrNudWBLessThan.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudWBLessThan.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudWBLessThan.Location = New System.Drawing.Point(351, 462) - Me.ucrNudWBLessThan.Margin = New System.Windows.Forms.Padding(9) + Me.ucrNudWBLessThan.Location = New System.Drawing.Point(234, 308) + Me.ucrNudWBLessThan.Margin = New System.Windows.Forms.Padding(6) Me.ucrNudWBLessThan.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) Me.ucrNudWBLessThan.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudWBLessThan.Name = "ucrNudWBLessThan" - Me.ucrNudWBLessThan.Size = New System.Drawing.Size(75, 30) + Me.ucrNudWBLessThan.Size = New System.Drawing.Size(50, 20) Me.ucrNudWBLessThan.TabIndex = 23 Me.ucrNudWBLessThan.Value = New Decimal(New Integer() {0, 0, 0, 0}) ' @@ -551,12 +508,12 @@ Partial Class dlgEndOfRainsSeason Me.ucrNudCapacity.AutoSize = True Me.ucrNudCapacity.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudCapacity.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudCapacity.Location = New System.Drawing.Point(104, 462) - Me.ucrNudCapacity.Margin = New System.Windows.Forms.Padding(9) + Me.ucrNudCapacity.Location = New System.Drawing.Point(69, 308) + Me.ucrNudCapacity.Margin = New System.Windows.Forms.Padding(6) Me.ucrNudCapacity.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) Me.ucrNudCapacity.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudCapacity.Name = "ucrNudCapacity" - Me.ucrNudCapacity.Size = New System.Drawing.Size(75, 30) + Me.ucrNudCapacity.Size = New System.Drawing.Size(50, 20) Me.ucrNudCapacity.TabIndex = 21 Me.ucrNudCapacity.Value = New Decimal(New Integer() {0, 0, 0, 0}) ' @@ -564,11 +521,11 @@ Partial Class dlgEndOfRainsSeason ' Me.ucrReceiverStation.AutoSize = True Me.ucrReceiverStation.frmParent = Me - Me.ucrReceiverStation.Location = New System.Drawing.Point(464, 88) + Me.ucrReceiverStation.Location = New System.Drawing.Point(309, 59) Me.ucrReceiverStation.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverStation.Name = "ucrReceiverStation" Me.ucrReceiverStation.Selector = Nothing - Me.ucrReceiverStation.Size = New System.Drawing.Size(214, 30) + Me.ucrReceiverStation.Size = New System.Drawing.Size(143, 20) Me.ucrReceiverStation.strNcFilePath = "" Me.ucrReceiverStation.TabIndex = 2 Me.ucrReceiverStation.ucrSelector = Nothing @@ -577,11 +534,11 @@ Partial Class dlgEndOfRainsSeason ' Me.ucrReceiverYear.AutoSize = True Me.ucrReceiverYear.frmParent = Me - Me.ucrReceiverYear.Location = New System.Drawing.Point(464, 225) + Me.ucrReceiverYear.Location = New System.Drawing.Point(309, 150) Me.ucrReceiverYear.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverYear.Name = "ucrReceiverYear" Me.ucrReceiverYear.Selector = Nothing - Me.ucrReceiverYear.Size = New System.Drawing.Size(214, 30) + Me.ucrReceiverYear.Size = New System.Drawing.Size(143, 20) Me.ucrReceiverYear.strNcFilePath = "" Me.ucrReceiverYear.TabIndex = 6 Me.ucrReceiverYear.ucrSelector = Nothing @@ -590,11 +547,11 @@ Partial Class dlgEndOfRainsSeason ' Me.ucrReceiverDate.AutoSize = True Me.ucrReceiverDate.frmParent = Me - Me.ucrReceiverDate.Location = New System.Drawing.Point(464, 156) + Me.ucrReceiverDate.Location = New System.Drawing.Point(309, 104) Me.ucrReceiverDate.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverDate.Name = "ucrReceiverDate" Me.ucrReceiverDate.Selector = Nothing - Me.ucrReceiverDate.Size = New System.Drawing.Size(214, 30) + Me.ucrReceiverDate.Size = New System.Drawing.Size(143, 20) Me.ucrReceiverDate.strNcFilePath = "" Me.ucrReceiverDate.TabIndex = 4 Me.ucrReceiverDate.ucrSelector = Nothing @@ -603,11 +560,11 @@ Partial Class dlgEndOfRainsSeason ' Me.ucrReceiverDOY.AutoSize = True Me.ucrReceiverDOY.frmParent = Me - Me.ucrReceiverDOY.Location = New System.Drawing.Point(464, 291) + Me.ucrReceiverDOY.Location = New System.Drawing.Point(309, 194) Me.ucrReceiverDOY.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverDOY.Name = "ucrReceiverDOY" Me.ucrReceiverDOY.Selector = Nothing - Me.ucrReceiverDOY.Size = New System.Drawing.Size(214, 30) + Me.ucrReceiverDOY.Size = New System.Drawing.Size(143, 20) Me.ucrReceiverDOY.strNcFilePath = "" Me.ucrReceiverDOY.TabIndex = 8 Me.ucrReceiverDOY.ucrSelector = Nothing @@ -616,11 +573,11 @@ Partial Class dlgEndOfRainsSeason ' Me.ucrReceiverRainfall.AutoSize = True Me.ucrReceiverRainfall.frmParent = Me - Me.ucrReceiverRainfall.Location = New System.Drawing.Point(464, 357) + Me.ucrReceiverRainfall.Location = New System.Drawing.Point(309, 238) Me.ucrReceiverRainfall.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverRainfall.Name = "ucrReceiverRainfall" Me.ucrReceiverRainfall.Selector = Nothing - Me.ucrReceiverRainfall.Size = New System.Drawing.Size(214, 30) + Me.ucrReceiverRainfall.Size = New System.Drawing.Size(143, 20) Me.ucrReceiverRainfall.strNcFilePath = "" Me.ucrReceiverRainfall.TabIndex = 10 Me.ucrReceiverRainfall.ucrSelector = Nothing @@ -631,20 +588,20 @@ Partial Class dlgEndOfRainsSeason Me.ucrSelectorForWaterBalance.bDropUnusedFilterLevels = False Me.ucrSelectorForWaterBalance.bShowHiddenColumns = False Me.ucrSelectorForWaterBalance.bUseCurrentFilter = True - Me.ucrSelectorForWaterBalance.Location = New System.Drawing.Point(4, 104) + Me.ucrSelectorForWaterBalance.Location = New System.Drawing.Point(3, 69) Me.ucrSelectorForWaterBalance.Margin = New System.Windows.Forms.Padding(0) Me.ucrSelectorForWaterBalance.Name = "ucrSelectorForWaterBalance" - Me.ucrSelectorForWaterBalance.Size = New System.Drawing.Size(320, 274) + Me.ucrSelectorForWaterBalance.Size = New System.Drawing.Size(213, 183) Me.ucrSelectorForWaterBalance.TabIndex = 0 ' 'ucrBase ' Me.ucrBase.AutoSize = True Me.ucrBase.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrBase.Location = New System.Drawing.Point(4, 708) - Me.ucrBase.Margin = New System.Windows.Forms.Padding(6) + Me.ucrBase.Location = New System.Drawing.Point(3, 472) + Me.ucrBase.Margin = New System.Windows.Forms.Padding(4) Me.ucrBase.Name = "ucrBase" - Me.ucrBase.Size = New System.Drawing.Size(611, 77) + Me.ucrBase.Size = New System.Drawing.Size(408, 52) Me.ucrBase.TabIndex = 33 ' 'ucrNudWB @@ -652,12 +609,12 @@ Partial Class dlgEndOfRainsSeason Me.ucrNudWB.AutoSize = True Me.ucrNudWB.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudWB.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudWB.Location = New System.Drawing.Point(189, 561) - Me.ucrNudWB.Margin = New System.Windows.Forms.Padding(9) + Me.ucrNudWB.Location = New System.Drawing.Point(126, 374) + Me.ucrNudWB.Margin = New System.Windows.Forms.Padding(6) Me.ucrNudWB.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) Me.ucrNudWB.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudWB.Name = "ucrNudWB" - Me.ucrNudWB.Size = New System.Drawing.Size(75, 30) + Me.ucrNudWB.Size = New System.Drawing.Size(50, 20) Me.ucrNudWB.TabIndex = 47 Me.ucrNudWB.Value = New Decimal(New Integer() {0, 0, 0, 0}) ' @@ -665,30 +622,28 @@ Partial Class dlgEndOfRainsSeason ' Me.ucrChkWB.AutoSize = True Me.ucrChkWB.Checked = False - Me.ucrChkWB.Location = New System.Drawing.Point(26, 561) - Me.ucrChkWB.Margin = New System.Windows.Forms.Padding(6, 6, 6, 6) + Me.ucrChkWB.Location = New System.Drawing.Point(17, 374) + Me.ucrChkWB.Margin = New System.Windows.Forms.Padding(4) Me.ucrChkWB.Name = "ucrChkWB" - Me.ucrChkWB.Size = New System.Drawing.Size(150, 34) + Me.ucrChkWB.Size = New System.Drawing.Size(100, 23) Me.ucrChkWB.TabIndex = 46 ' 'dlgEndOfRainsSeason ' - Me.AutoScaleDimensions = New System.Drawing.SizeF(144.0!, 144.0!) + 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(716, 824) + Me.ClientSize = New System.Drawing.Size(477, 549) + Me.Controls.Add(Me.ucrReceiverEvaporation) + Me.Controls.Add(Me.ucrInputEvaporation) Me.Controls.Add(Me.ucrNudWB) Me.Controls.Add(Me.ucrChkWB) Me.Controls.Add(Me.rdoEndOfSeasons) Me.Controls.Add(Me.rdoEndOfRains) Me.Controls.Add(Me.ucrPnlEndOfRainsAndSeasons) - Me.Controls.Add(Me.ucrInputReplaceNA) - Me.Controls.Add(Me.lblReplaceNA) Me.Controls.Add(Me.rdoVariableEvaporation) Me.Controls.Add(Me.grpEndofSeason) Me.Controls.Add(Me.rdoValueEvaporation) - Me.Controls.Add(Me.ucrReceiverEvaporation) - Me.Controls.Add(Me.ucrInputEvaporation) Me.Controls.Add(Me.ucrPnlEvaporation) Me.Controls.Add(Me.ucrInputFilterPreview) Me.Controls.Add(Me.cmdDoyRange) @@ -715,7 +670,6 @@ Partial Class dlgEndOfRainsSeason Me.Controls.Add(Me.ucrBase) Me.Controls.Add(Me.grpEndofRains) Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow - Me.Margin = New System.Windows.Forms.Padding(4) Me.MaximizeBox = False Me.MinimizeBox = False Me.Name = "dlgEndOfRainsSeason" @@ -759,8 +713,6 @@ Partial Class dlgEndOfRainsSeason Friend WithEvents rdoVariableEvaporation As RadioButton Friend WithEvents rdoValueEvaporation As RadioButton Friend WithEvents ucrPnlEvaporation As UcrPanel - Friend WithEvents ucrInputReplaceNA As ucrInputTextBox - Friend WithEvents lblReplaceNA As Label Friend WithEvents ucrInputEndofRainsOccurence As ucrInputTextBox Friend WithEvents ucrInputEndofSeasonOccurence As ucrInputTextBox Friend WithEvents ucrInputEndofSeasonDate As ucrInputTextBox diff --git a/instat/dlgEndOfRainsSeason.vb b/instat/dlgEndOfRainsSeason.vb index 52cd221bf40..f4685299ee9 100644 --- a/instat/dlgEndOfRainsSeason.vb +++ b/instat/dlgEndOfRainsSeason.vb @@ -47,9 +47,9 @@ Public Class dlgEndOfRainsSeason #Region "end_of_rains_code_structures" ' Rolling sum rain - Private clsEndRainsRollingSumCalc As New RFunction + Private clsEndRainsRollingSumCalc, clsWBEvaporationMinFunction, clsWBEvaporationMaxFunction As New RFunction Private clsRollSumRainFunction As New RFunction - + Private clsWBOperator1, clsWBOperator2 As New ROperator ' Conditions filter Private clsEndRainsConditionsFilterCalc As New RFunction Private clsEndRainsConditionsFilterSubCalcsList As New RFunction @@ -97,16 +97,20 @@ Public Class dlgEndOfRainsSeason Private clsEndSeasonWBMinCalc As New RFunction Private clsEndSeasonWBMinCalcSubCalcsList As New RFunction Private clsReduceWBMinFunction As New RFunction + Private clsReduceWBMinFunction1 As New RFunction Private clsPMinWBMinFunction As New RFunction Private clsWBMinTailFunction As New RFunction + Private clsWBMinTailFunction1 As New RFunction Private clsWBMinEvapOperator As New ROperator ' Water Balance max Private clsEndSeasonWBMaxCalc As New RFunction Private clsEndSeasonWBMaxCalcSubCalcsList As New RFunction Private clsReduceWBMaxFunction As New RFunction + Private clsReduceWBMaxFunction1 As New RFunction Private clsPMinWBMaxFunction As New RFunction Private clsWBMaxTailFunction As New RFunction + Private clsWBMaxTailFunction1 As New RFunction Private clsWBMaxEvapOperator As New ROperator ' Water Balance @@ -264,11 +268,6 @@ Public Class dlgEndOfRainsSeason ucrInputEvaporation.SetValidationTypeAsNumeric() ucrInputEvaporation.AddQuotesIfUnrecognised = False - ucrInputReplaceNA.SetParameter(New RParameter("yes", 1)) - ucrInputReplaceNA.SetValidationTypeAsNumeric() - ucrInputReplaceNA.AddQuotesIfUnrecognised = False - - ucrNudWBLessThan.SetParameter(New RParameter("1", 1, False)) ucrNudWBLessThan.SetMinMax(0, Integer.MaxValue) ucrNudWBLessThan.Increment = 0.5 @@ -301,32 +300,32 @@ Public Class dlgEndOfRainsSeason ucrChkWB.SetParameter(New RParameter("WB_evap")) ucrChkWB.SetValuesCheckedAndUnchecked("TRUE", "FALSE") ucrChkWB.SetText("Reducing") - ucrChkWB.SetLinkedDisplayControl(ucrNudWB) ucrNudWB.SetParameter(New RParameter("WB_evap_value")) ucrNudWB.SetMinMax(0, 1) - ucrNudWB.DecimalPlaces = 0.01 ucrNudWB.Increment = 0.01 + ucrNudWB.DecimalPlaces = 2 + 'linking controls ucrChkEndofRainsDoy.AddToLinkedControls(ucrInputEndRainDoy, {True}, bNewLinkedHideIfParameterMissing:=True) ucrChkEndofSeasonOccurence.AddToLinkedControls(ucrInputEndofSeasonOccurence, {True}, bNewLinkedHideIfParameterMissing:=True) ucrChkEndofSeasonDate.AddToLinkedControls(ucrInputEndofSeasonDate, {True}, bNewLinkedHideIfParameterMissing:=True) ucrChkEndofSeasonDoy.AddToLinkedControls(ucrInputSeasonDoy, {True}, bNewLinkedHideIfParameterMissing:=True) - ucrChkWB.AddToLinkedControls(ucrNudWB, {True}, bNewLinkedHideIfParameterMissing:=True) - ucrPnlEvaporation.AddToLinkedControls(ucrInputEvaporation, {rdoValueEvaporation}, bNewLinkedHideIfParameterMissing:=True) + ucrChkWB.AddToLinkedControls(ucrNudWB, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:=0.5) + ucrPnlEvaporation.AddToLinkedControls(ucrInputEvaporation, {rdoValueEvaporation}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:=5) ucrPnlEvaporation.AddToLinkedControls(ucrReceiverEvaporation, {rdoVariableEvaporation}, bNewLinkedHideIfParameterMissing:=True) - ucrPnlEvaporation.AddToLinkedControls(ucrInputReplaceNA, {rdoVariableEvaporation}, bNewLinkedHideIfParameterMissing:=True) ucrChkEndofRainsOccurence.AddToLinkedControls(ucrInputEndofRainsOccurence, {True}, bNewLinkedHideIfParameterMissing:=True) ucrChkEndofRainsDate.AddToLinkedControls(ucrInputEndofRainsDate, {True}, bNewLinkedHideIfParameterMissing:=True) ucrPnlEndOfRainsAndSeasons.AddToLinkedControls({ucrNudAmount, ucrNudTotalOverDays}, {rdoEndOfRains}, bNewLinkedHideIfParameterMissing:=True) ucrPnlEndOfRainsAndSeasons.AddToLinkedControls({ucrNudCapacity, ucrNudWBLessThan, ucrChkEndofSeasonDoy}, {rdoEndOfSeasons}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) ucrPnlEndOfRainsAndSeasons.AddToLinkedControls({ucrPnlEvaporation}, {rdoEndOfSeasons}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) ucrPnlEndOfRainsAndSeasons.AddToLinkedControls({ucrChkWB}, {rdoEndOfSeasons}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) + ucrPnlEndOfRainsAndSeasons.AddToLinkedControls({ucrChkEndofSeasonDate, ucrChkEndofSeasonDoy, ucrChkEndofSeasonOccurence}, {rdoEndOfSeasons}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) + ucrPnlEndOfRainsAndSeasons.AddToLinkedControls({ucrChkEndofRainsDate, ucrChkEndofRainsDoy, ucrChkEndofRainsOccurence}, {rdoEndOfRains}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) ucrChkEndofRainsDoy.SetLinkedDisplayControl(grpEndofRains) ucrPnlEvaporation.SetLinkedDisplayControl(lblEvaporation) - ucrInputReplaceNA.SetLinkedDisplayControl(lblReplaceNA) ucrNudAmount.SetLinkedDisplayControl(lblAmount) ucrNudWBLessThan.SetLinkedDisplayControl(lblWaterBalanceLessThan) ucrNudCapacity.SetLinkedDisplayControl(lblCapacity) @@ -421,16 +420,20 @@ Public Class dlgEndOfRainsSeason clsEndSeasonWBMinCalc.Clear() clsEndSeasonWBMinCalcSubCalcsList.Clear() clsReduceWBMinFunction.Clear() + clsReduceWBMinFunction1.Clear() clsPMinWBMinFunction.Clear() clsWBMinTailFunction.Clear() + clsWBMinTailFunction1.Clear() clsWBMinEvapOperator.Clear() ' Water Balance max clsEndSeasonWBMaxCalc.Clear() clsEndSeasonWBMaxCalcSubCalcsList.Clear() clsReduceWBMaxFunction.Clear() + clsReduceWBMaxFunction1.Clear() clsPMinWBMaxFunction.Clear() clsWBMaxTailFunction.Clear() + clsWBMaxTailFunction1.Clear() clsWBMaxEvapOperator.Clear() ' Water Balance @@ -438,6 +441,10 @@ Public Class dlgEndOfRainsSeason clsEndSeasonWBCalcSubCalcsList.Clear() clsIfElseWBFunction.Clear() clsWBOperator.Clear() + clsWBOperator1.Clear() + clsWBOperator2.Clear() + clsWBEvaporationMinFunction.Clear() + clsPMinWBMaxFunction.Clear() clsWBMinMaxOperator.Clear() ' Evaporation @@ -610,6 +617,16 @@ Public Class dlgEndOfRainsSeason clsEndRainsCombinationManipulationList.AddParameter("manip2", clsRFunctionParameter:=clsGroupByStationYearCalc, bIncludeArgumentName:=False, iPosition:=1) clsEndRainsCombinationManipulationList.AddParameter("manip3", clsRFunctionParameter:=clsDoyFilterCalc, bIncludeArgumentName:=False, iPosition:=2) + clsWBOperator1.SetOperation("-") + clsWBOperator1.AddParameter("left", "..1 + ..2", iPosition:=0) + clsWBOperator1.AddParameter("right", clsRFunctionParameter:=clsWBEvaporationMinFunction, iPosition:=1) + clsWBOperator1.bSpaceAroundOperation = True + clsWBOperator1.bBrackets = False + + clsWBEvaporationMinFunction.SetRCommand("WB_evaporation") + clsWBEvaporationMinFunction.AddParameter("water_balance", "..1", iPosition:=0, bIncludeArgumentName:=False) + clsWBEvaporationMinFunction.AddParameter("y", "..2", iPosition:=4, bIncludeArgumentName:=False) + clsEndRainsCombinationSubCalcList.SetRCommand("list") clsEndRainsCombinationSubCalcList.AddParameter("sub1", clsRFunctionParameter:=clsEndRainsLastDoySummaryCalc, bIncludeArgumentName:=False, iPosition:=0) @@ -649,7 +666,7 @@ Public Class dlgEndOfRainsSeason 'Pmax clsPMaxFunction.SetRCommand("pmax") - clsPMaxFunction.AddParameter("0", "x + y", iPosition:=0, bIncludeArgumentName:=False) + clsPMaxFunction.AddParameter("0", "..1 + ..2", iPosition:=0, bIncludeArgumentName:=False) clsPMaxFunction.AddParameter("1", "0", bIncludeArgumentName:=False) ' Water Balance min @@ -664,13 +681,20 @@ Public Class dlgEndOfRainsSeason clsEndSeasonWBMinCalcSubCalcsList.AddParameter("0", clsRFunctionParameter:=clsEndSeasonRainMinCalc, iPosition:=0, bIncludeArgumentName:=False) clsReduceWBMinFunction.bToScriptAsRString = True - clsReduceWBMinFunction.SetRCommand("Reduce") - clsReduceWBMinFunction.AddParameter("f", clsRFunctionParameter:=clsPMinWBMinFunction, iPosition:=0) - clsReduceWBMinFunction.AddParameter("x", clsRFunctionParameter:=clsWBMinTailFunction, iPosition:=1) - clsReduceWBMinFunction.AddParameter("init", "0", iPosition:=2) - clsReduceWBMinFunction.AddParameter("accumulate", "TRUE", iPosition:=3) - - clsPMinWBMinFunction.SetRCommand("function(x, y) pmin") + clsReduceWBMinFunction.SetPackageName("purrr") + clsReduceWBMinFunction.SetRCommand("accumulate") + clsReduceWBMinFunction.AddParameter(".f", clsRFunctionParameter:=clsPMinWBMinFunction, iPosition:=0) + clsReduceWBMinFunction.AddParameter(".x", clsRFunctionParameter:=clsWBMinTailFunction, iPosition:=1) + clsReduceWBMinFunction.AddParameter(".init", "0", iPosition:=2) + + clsReduceWBMinFunction1.bToScriptAsRString = True + clsReduceWBMinFunction1.SetPackageName("purrr") + clsReduceWBMinFunction1.SetRCommand("accumulate2") + clsReduceWBMinFunction1.AddParameter(".f", clsRFunctionParameter:=clsPMinWBMinFunction, iPosition:=0) + clsReduceWBMinFunction1.AddParameter(".x", clsRFunctionParameter:=clsWBMinTailFunction, iPosition:=1) + clsReduceWBMinFunction1.AddParameter(".init", "0", iPosition:=2) + + clsPMinWBMinFunction.SetRCommand(" ~ pmin") clsPMinWBMinFunction.AddParameter("0", clsRFunctionParameter:=clsPMaxFunction, iPosition:=0, bIncludeArgumentName:=False) clsPMinWBMinFunction.AddParameter("1", iCapacityDefault, iPosition:=1, bIncludeArgumentName:=False) @@ -678,6 +702,10 @@ Public Class dlgEndOfRainsSeason clsWBMinTailFunction.AddParameter("x", clsROperatorParameter:=clsWBMinEvapOperator, iPosition:=0) clsWBMinTailFunction.AddParameter("n", "-1", iPosition:=1) + clsWBMinTailFunction1.SetRCommand("tail") + clsWBMinTailFunction1.AddParameter("x", ucrReceiverEvaporation.GetVariableNames(False), iPosition:=0) + clsWBMinTailFunction1.AddParameter("n", "-1", iPosition:=1) + clsWBMinEvapOperator.SetOperation("-") clsWBMinEvapOperator.AddParameter("0", strRainMin, iPosition:=0) clsWBMinEvapOperator.AddParameter("value", "5", iPosition:=1) @@ -694,13 +722,20 @@ Public Class dlgEndOfRainsSeason clsEndSeasonWBMaxCalcSubCalcsList.AddParameter("0", clsRFunctionParameter:=clsEndSeasonRainMaxCalc, iPosition:=0, bIncludeArgumentName:=False) clsReduceWBMaxFunction.bToScriptAsRString = True - clsReduceWBMaxFunction.SetRCommand("Reduce") - clsReduceWBMaxFunction.AddParameter("f", clsRFunctionParameter:=clsPMinWBMaxFunction, iPosition:=0) - clsReduceWBMaxFunction.AddParameter("x", clsRFunctionParameter:=clsWBMaxTailFunction, iPosition:=1) - clsReduceWBMaxFunction.AddParameter("init", "0", iPosition:=2) - clsReduceWBMaxFunction.AddParameter("accumulate", "TRUE", iPosition:=3) - - clsPMinWBMaxFunction.SetRCommand("function(x, y) pmin") + clsReduceWBMaxFunction.SetPackageName("purrr") + clsReduceWBMaxFunction.SetRCommand("accumulate") + clsReduceWBMaxFunction.AddParameter(".f", clsRFunctionParameter:=clsPMinWBMaxFunction, iPosition:=0) + clsReduceWBMaxFunction.AddParameter(".x", clsRFunctionParameter:=clsWBMaxTailFunction, iPosition:=1) + clsReduceWBMaxFunction.AddParameter(".init", "0", iPosition:=2) + + clsReduceWBMaxFunction1.bToScriptAsRString = True + clsReduceWBMaxFunction1.SetPackageName("purrr") + clsReduceWBMaxFunction1.SetRCommand("accumulate2") + clsReduceWBMaxFunction1.AddParameter(".f", clsRFunctionParameter:=clsPMinWBMaxFunction, iPosition:=0) + clsReduceWBMaxFunction1.AddParameter(".x", clsRFunctionParameter:=clsWBMaxTailFunction, iPosition:=1) + clsReduceWBMaxFunction1.AddParameter(".init", "0", iPosition:=2) + + clsPMinWBMaxFunction.SetRCommand(" ~ pmin") clsPMinWBMaxFunction.AddParameter("0", clsRFunctionParameter:=clsPMaxFunction, iPosition:=0, bIncludeArgumentName:=False) clsPMinWBMaxFunction.AddParameter("1", iCapacityDefault, iPosition:=1, bIncludeArgumentName:=False) @@ -708,6 +743,10 @@ Public Class dlgEndOfRainsSeason clsWBMaxTailFunction.AddParameter("x", clsROperatorParameter:=clsWBMaxEvapOperator, iPosition:=0) clsWBMaxTailFunction.AddParameter("n", "-1", iPosition:=1) + clsWBMaxTailFunction1.SetRCommand("tail") + clsWBMaxTailFunction1.AddParameter("x", ucrReceiverEvaporation.GetVariableNames(False), iPosition:=0) + clsWBMaxTailFunction1.AddParameter("n", "-1", iPosition:=1) + clsWBMaxEvapOperator.SetOperation("-") clsWBMaxEvapOperator.AddParameter("0", strRainMax, iPosition:=0) clsWBMaxEvapOperator.AddParameter("value", "5", iPosition:=1) @@ -840,7 +879,7 @@ Public Class dlgEndOfRainsSeason ucrReceiverRainfall.AddAdditionalCodeParameterPair(clsEndSeasonIsNaRain, New RParameter("x", 0), iAdditionalPairNo:=1) ucrReceiverRainfall.AddAdditionalCodeParameterPair(clsIfElseRainMinFunction, New RParameter("no", 2), iAdditionalPairNo:=2) ucrReceiverRainfall.AddAdditionalCodeParameterPair(clsIfElseRainMaxFunction, New RParameter("no", 2), iAdditionalPairNo:=3) - ucrReceiverEvaporation.AddAdditionalCodeParameterPair(clsIfElseVariableEvaporation, New RParameter("no", 2), iAdditionalPairNo:=1) + ucrReceiverEvaporation.AddAdditionalCodeParameterPair(clsWBMaxTailFunction1, New RParameter("x", 0), iAdditionalPairNo:=1) ucrReceiverDate.AddAdditionalCodeParameterPair(clsFirstDateFunction, New RParameter("x", 0), iAdditionalPairNo:=1) ucrNudCapacity.AddAdditionalCodeParameterPair(clsPMinWBMinFunction, New RParameter("1", 1, bNewIncludeArgumentName:=False), iAdditionalPairNo:=1) @@ -850,8 +889,6 @@ Public Class dlgEndOfRainsSeason ucrReceiverDOY.SetRCode(clsDayToOperator, bReset) - ucrReceiverEvaporation.SetRCode(clsIsNaEvaporation, bReset) - ucrInputEndRainDoy.SetRCode(clsEndRainsLastDoySummaryCalc, bReset) ucrInputEndofRainsDate.SetRCode(clsEndRainsLastDateSummaryCalc, bReset) ucrInputEndofRainsOccurence.SetRCode(clsEndRainsStatusSummaryCalc, bReset) @@ -866,10 +903,12 @@ Public Class dlgEndOfRainsSeason ucrNudWBLessThan.SetRCode(clsEndSeasonWBConditionOperator, bReset) - ucrPnlEvaporation.SetRCode(clsWBMinEvapOperator, bReset) - ucrInputEvaporation.SetRCode(clsWBMinEvapOperator, bReset) + If bReset Then + ucrPnlEvaporation.SetRCode(clsWBMinEvapOperator, bReset) + ucrInputEvaporation.SetRCode(clsWBMinEvapOperator, bReset) + ucrReceiverEvaporation.SetRCode(clsWBMinTailFunction1, bReset) + End If ucrNudCapacity.SetRCode(clsIfElseRainMaxFunction, bReset) - ucrInputReplaceNA.SetRCode(clsIfElseVariableEvaporation, bReset) ucrChkEndofSeasonDoy.SetRCode(clsEndSeasonCombinationSubCalcList, bReset) ucrChkEndofSeasonDate.SetRCode(clsEndSeasonCombinationSubCalcList, bReset) @@ -912,7 +951,7 @@ Public Class dlgEndOfRainsSeason bOkEnabled = False ElseIf rdoValueEvaporation.Checked AndAlso ucrInputEvaporation.IsEmpty Then bOkEnabled = False - ElseIf rdoVariableEvaporation.Checked AndAlso (ucrReceiverEvaporation.IsEmpty OrElse ucrInputReplaceNA.IsEmpty) Then + ElseIf rdoVariableEvaporation.Checked AndAlso ucrReceiverEvaporation.IsEmpty Then bOkEnabled = False End If Else @@ -989,21 +1028,66 @@ Public Class dlgEndOfRainsSeason clsDoyFilterCalcFromList.ClearParameters() End Sub - Private Sub ucrPnlEvaporation_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrPnlEvaporation.ControlValueChanged, ucrReceiverEvaporation.ControlValueChanged, ucrInputReplaceNA.ControlValueChanged, ucrInputEvaporation.ControlValueChanged + Private Sub ucrPnlEvaporation_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrPnlEvaporation.ControlValueChanged, ucrReceiverEvaporation.ControlValueChanged, ucrInputEvaporation.ControlValueChanged Evaporation() End Sub Private Sub Evaporation() - If rdoValueEvaporation.Checked Then - ucrReceiverRainfall.SetMeAsReceiver() - clsWBMinEvapOperator.RemoveParameterByName("variable") - clsWBMaxEvapOperator.RemoveParameterByName("variable") - ElseIf rdoVariableEvaporation.Checked Then - ucrReceiverEvaporation.SetMeAsReceiver() - clsWBMinEvapOperator.AddParameter("variable", clsRFunctionParameter:=clsIfElseVariableEvaporation, iPosition:=1, bIncludeArgumentName:=False) - clsWBMinEvapOperator.RemoveParameterByName("value") - clsWBMaxEvapOperator.AddParameter("variable", clsRFunctionParameter:=clsIfElseVariableEvaporation, iPosition:=1, bIncludeArgumentName:=False) - clsWBMaxEvapOperator.RemoveParameterByName("value") + If rdoEndOfSeasons.Checked Then + If rdoValueEvaporation.Checked Then + clsEndSeasonWBMinCalc.AddParameter("function_exp", clsRFunctionParameter:=clsReduceWBMinFunction, iPosition:=1) + clsEndSeasonWBMaxCalc.AddParameter("function_exp", clsRFunctionParameter:=clsReduceWBMaxFunction, iPosition:=1) + clsWBMinEvapOperator.RemoveParameterByName("variable") + clsWBMaxEvapOperator.RemoveParameterByName("variable") + If ucrChkWB.Checked Then + clsWBEvaporationMinFunction.AddParameter("WB_evap_value", ucrNudWB.GetText(), iPosition:=1, bIncludeArgumentName:=False) + clsWBEvaporationMinFunction.AddParameter("yes", ucrNudCapacity.GetText(), iPosition:=2, bIncludeArgumentName:=False) + clsWBEvaporationMinFunction.AddParameter("value", ucrInputEvaporation.GetText(), iPosition:=3, bIncludeArgumentName:=False) + clsPMaxFunction.AddParameter("wb", clsROperatorParameter:=clsWBOperator1, iPosition:=0, bIncludeArgumentName:=False) + clsPMaxFunction.RemoveParameterByName("0") + clsPMaxFunction.RemoveParameterByName("0") + clsWBMaxEvapOperator.RemoveParameterByName("value") + clsWBMinEvapOperator.RemoveParameterByName("value") + clsPMinWBMaxFunction.RemoveParameterByName("1") + clsPMinWBMinFunction.RemoveParameterByName("1") + Else + clsPMaxFunction.AddParameter("0", "..1 + ..2", iPosition:=0, bIncludeArgumentName:=False) + clsPMaxFunction.RemoveParameterByName("wb") + clsPMaxFunction.RemoveParameterByName("wb") + clsWBMaxEvapOperator.AddParameter("value", ucrInputEvaporation.GetText(), iPosition:=1) + clsWBMinEvapOperator.AddParameter("value", ucrInputEvaporation.GetText(), iPosition:=1) + clsPMinWBMaxFunction.AddParameter("1", ucrNudCapacity.GetText(), iPosition:=1) + clsPMinWBMinFunction.AddParameter("1", ucrNudCapacity.GetText(), iPosition:=1) + End If + Else + ucrReceiverEvaporation.SetMeAsReceiver() + clsEndSeasonWBMaxCalc.AddParameter("function_exp", clsRFunctionParameter:=clsReduceWBMaxFunction1, iPosition:=1) + clsEndSeasonWBMinCalc.AddParameter("function_exp", clsRFunctionParameter:=clsReduceWBMinFunction1, iPosition:=1) + clsWBMinEvapOperator.RemoveParameterByName("variable") + clsWBMaxEvapOperator.RemoveParameterByName("variable") + If ucrChkWB.Checked Then + clsWBEvaporationMinFunction.AddParameter("WB_evap_value", ucrNudWB.GetText(), iPosition:=1, bIncludeArgumentName:=False) + clsWBEvaporationMinFunction.AddParameter("yes", ucrNudCapacity.GetText(), iPosition:=2, bIncludeArgumentName:=False) + clsWBEvaporationMinFunction.AddParameter("value", "..3", bIncludeArgumentName:=False, iPosition:=3) + clsReduceWBMinFunction1.AddParameter(".y", clsRFunctionParameter:=clsWBMinTailFunction1, iPosition:=1) + clsReduceWBMaxFunction1.AddParameter(".y", clsRFunctionParameter:=clsWBMaxTailFunction1, iPosition:=1) + clsPMaxFunction.AddParameter("wb", clsROperatorParameter:=clsWBOperator1, iPosition:=0, bIncludeArgumentName:=False) + clsPMaxFunction.RemoveParameterByName("0") + clsPMaxFunction.RemoveParameterByName("0") + clsWBMaxEvapOperator.RemoveParameterByName("value") + clsWBMinEvapOperator.RemoveParameterByName("value") + clsPMinWBMaxFunction.RemoveParameterByName("1") + clsPMinWBMinFunction.RemoveParameterByName("1") + Else + clsPMaxFunction.AddParameter("0", "..1 + ..2", iPosition:=0, bIncludeArgumentName:=False) + clsPMaxFunction.RemoveParameterByName("wb") + clsPMaxFunction.RemoveParameterByName("wb") + clsReduceWBMinFunction1.AddParameter(".y", clsRFunctionParameter:=clsWBMinTailFunction1, iPosition:=1) + clsReduceWBMaxFunction1.AddParameter(".y", clsRFunctionParameter:=clsWBMaxTailFunction1, iPosition:=1) + clsPMinWBMaxFunction.AddParameter("1", ucrNudCapacity.GetText(), iPosition:=1) + clsPMinWBMinFunction.AddParameter("1", ucrNudCapacity.GetText(), iPosition:=1) + End If + End If End If End Sub @@ -1065,7 +1149,15 @@ Public Class dlgEndOfRainsSeason End If End Sub - Private Sub CoreControls_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrPnlEndOfRainsAndSeasons.ControlContentsChanged, ucrReceiverRainfall.ControlContentsChanged, ucrReceiverDate.ControlContentsChanged, ucrReceiverYear.ControlContentsChanged, ucrReceiverDOY.ControlContentsChanged, ucrNudCapacity.ControlContentsChanged, ucrNudWBLessThan.ControlContentsChanged, ucrInputSeasonDoy.ControlContentsChanged, ucrNudTotalOverDays.ControlContentsChanged, ucrNudAmount.ControlContentsChanged, ucrChkEndofRainsDoy.ControlContentsChanged, ucrInputEndRainDoy.ControlContentsChanged, ucrChkEndofRainsDate.ControlContentsChanged, ucrInputEndofRainsDate.ControlContentsChanged, ucrChkEndofRainsOccurence.ControlContentsChanged, ucrInputEndofRainsOccurence.ControlContentsChanged, ucrChkEndofSeasonDoy.ControlContentsChanged, ucrPnlEvaporation.ControlContentsChanged, ucrReceiverEvaporation.ControlContentsChanged, ucrInputReplaceNA.ControlContentsChanged, ucrChkEndofSeasonOccurence.ControlContentsChanged, ucrInputEndofSeasonOccurence.ControlContentsChanged, ucrChkEndofSeasonDate.ControlContentsChanged, ucrInputEndofSeasonDate.ControlContentsChanged, ucrInputEvaporation.ControlContentsChanged + Private Sub CoreControls_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrPnlEndOfRainsAndSeasons.ControlContentsChanged, ucrReceiverRainfall.ControlContentsChanged, ucrReceiverDate.ControlContentsChanged, ucrReceiverYear.ControlContentsChanged, ucrReceiverDOY.ControlContentsChanged, ucrNudCapacity.ControlContentsChanged, ucrNudWBLessThan.ControlContentsChanged, ucrInputSeasonDoy.ControlContentsChanged, ucrNudTotalOverDays.ControlContentsChanged, ucrNudAmount.ControlContentsChanged, ucrChkEndofRainsDoy.ControlContentsChanged, ucrInputEndRainDoy.ControlContentsChanged, ucrChkEndofRainsDate.ControlContentsChanged, ucrInputEndofRainsDate.ControlContentsChanged, ucrChkEndofRainsOccurence.ControlContentsChanged, ucrInputEndofRainsOccurence.ControlContentsChanged, ucrChkEndofSeasonDoy.ControlContentsChanged, ucrPnlEvaporation.ControlContentsChanged, ucrReceiverEvaporation.ControlContentsChanged, ucrChkEndofSeasonOccurence.ControlContentsChanged, ucrInputEndofSeasonOccurence.ControlContentsChanged, ucrChkEndofSeasonDate.ControlContentsChanged, ucrInputEndofSeasonDate.ControlContentsChanged, ucrInputEvaporation.ControlContentsChanged TestOKEnabled() End Sub + + Private Sub ucrChkWB_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkWB.ControlValueChanged, ucrNudWB.ControlValueChanged, ucrNudCapacity.ControlValueChanged + Evaporation() + End Sub + + Private Sub rdoValueEvaporation_CheckedChanged(sender As Object, e As EventArgs) Handles rdoValueEvaporation.CheckedChanged, rdoVariableEvaporation.CheckedChanged + Evaporation() + End Sub End Class \ No newline at end of file diff --git a/instat/dlgExportClimaticDefinitions.Designer.vb b/instat/dlgExportClimaticDefinitions.Designer.vb new file mode 100644 index 00000000000..b6e8c0cb7c8 --- /dev/null +++ b/instat/dlgExportClimaticDefinitions.Designer.vb @@ -0,0 +1,42 @@ + _ +Partial Class dlgExportClimaticDefinitions + Inherits System.Windows.Forms.Form + + 'Form overrides dispose to clean up the component list. + _ + Protected Overrides Sub Dispose(ByVal disposing As Boolean) + Try + If disposing AndAlso components IsNot Nothing Then + components.Dispose() + End If + Finally + MyBase.Dispose(disposing) + End Try + End Sub + + 'Required by the Windows Form Designer + Private components As System.ComponentModel.IContainer + + 'NOTE: The following procedure is required by the Windows Form Designer + 'It can be modified using the Windows Form Designer. + 'Do not modify it using the code editor. + _ + Private Sub InitializeComponent() + Me.SuspendLayout() + ' + 'dlgExportClimaticDefinitions + ' + Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) + Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.AutoSize = True + Me.ClientSize = New System.Drawing.Size(464, 360) + Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow + Me.MaximizeBox = False + Me.MinimizeBox = False + Me.Name = "dlgExportClimaticDefinitions" + Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen + Me.Text = "Export Climatic Definitions" + Me.ResumeLayout(False) + + End Sub +End Class diff --git a/instat/dlgExportClimaticDefinitions.resx b/instat/dlgExportClimaticDefinitions.resx new file mode 100644 index 00000000000..1af7de150c9 --- /dev/null +++ b/instat/dlgExportClimaticDefinitions.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/instat/dlgExportClimaticDefinitions.vb b/instat/dlgExportClimaticDefinitions.vb new file mode 100644 index 00000000000..89b1ba24c26 --- /dev/null +++ b/instat/dlgExportClimaticDefinitions.vb @@ -0,0 +1,3 @@ +Public Class dlgExportClimaticDefinitions + +End Class \ No newline at end of file diff --git a/instat/dlgExportForClimpact.Designer.vb b/instat/dlgExportForClimpact.Designer.vb new file mode 100644 index 00000000000..fa0a0034e58 --- /dev/null +++ b/instat/dlgExportForClimpact.Designer.vb @@ -0,0 +1,305 @@ + _ +Partial Class dlgExportForClimpact + Inherits System.Windows.Forms.Form + + 'Form overrides dispose to clean up the component list. + _ + Protected Overrides Sub Dispose(ByVal disposing As Boolean) + Try + If disposing AndAlso components IsNot Nothing Then + components.Dispose() + End If + Finally + MyBase.Dispose(disposing) + End Try + End Sub + + 'Required by the Windows Form Designer + Private components As System.ComponentModel.IContainer + + 'NOTE: The following procedure is required by the Windows Form Designer + 'It can be modified using the Windows Form Designer. + 'Do not modify it using the code editor. + _ + Private Sub InitializeComponent() + Me.lblTN = New System.Windows.Forms.Label() + Me.lblTX = New System.Windows.Forms.Label() + Me.lblRR = New System.Windows.Forms.Label() + Me.lblDay = New System.Windows.Forms.Label() + Me.lblMonth = New System.Windows.Forms.Label() + Me.lblExport = New System.Windows.Forms.Label() + Me.cmdBrowse = New System.Windows.Forms.Button() + Me.lblYear = New System.Windows.Forms.Label() + Me.lblMissingValues = New System.Windows.Forms.Label() + Me.ucrInputCodeMissingValues = New instat.ucrInputTextBox() + Me.ucrReceiverTN = New instat.ucrReceiverSingle() + Me.ucrReceiverTX = New instat.ucrReceiverSingle() + Me.ucrReceiverRR = New instat.ucrReceiverSingle() + Me.ucrReceiverDay = New instat.ucrReceiverSingle() + Me.ucrReceiverMonth = New instat.ucrReceiverSingle() + Me.ucrInputExportFile = New instat.ucrInputTextBox() + Me.ucrBase = New instat.ucrButtons() + Me.ucrReceiverYear = New instat.ucrReceiverSingle() + Me.ucrSelectorImportToClimpact = New instat.ucrSelectorByDataFrameAddRemove() + Me.SuspendLayout() + ' + 'lblTN + ' + Me.lblTN.AutoSize = True + Me.lblTN.Location = New System.Drawing.Point(278, 244) + Me.lblTN.Name = "lblTN" + Me.lblTN.Size = New System.Drawing.Size(93, 13) + Me.lblTN.TabIndex = 11 + Me.lblTN.Text = "Min. Temperature:" + ' + 'lblTX + ' + Me.lblTX.AutoSize = True + Me.lblTX.Location = New System.Drawing.Point(278, 197) + Me.lblTX.Name = "lblTX" + Me.lblTX.Size = New System.Drawing.Size(96, 13) + Me.lblTX.TabIndex = 9 + Me.lblTX.Text = "Max. Temperature:" + ' + 'lblRR + ' + Me.lblRR.AutoSize = True + Me.lblRR.Location = New System.Drawing.Point(278, 150) + Me.lblRR.Name = "lblRR" + Me.lblRR.Size = New System.Drawing.Size(45, 13) + Me.lblRR.TabIndex = 7 + Me.lblRR.Text = "Rainfall:" + ' + 'lblDay + ' + Me.lblDay.AutoSize = True + Me.lblDay.Location = New System.Drawing.Point(278, 106) + Me.lblDay.Name = "lblDay" + Me.lblDay.Size = New System.Drawing.Size(29, 13) + Me.lblDay.TabIndex = 5 + Me.lblDay.Text = "Day:" + ' + 'lblMonth + ' + Me.lblMonth.AutoSize = True + Me.lblMonth.Location = New System.Drawing.Point(278, 59) + Me.lblMonth.Name = "lblMonth" + Me.lblMonth.Size = New System.Drawing.Size(40, 13) + Me.lblMonth.TabIndex = 3 + Me.lblMonth.Text = "Month:" + ' + 'lblExport + ' + Me.lblExport.AutoSize = True + Me.lblExport.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.lblExport.Location = New System.Drawing.Point(9, 297) + Me.lblExport.Name = "lblExport" + Me.lblExport.Size = New System.Drawing.Size(59, 13) + Me.lblExport.TabIndex = 16 + Me.lblExport.Text = "Export File:" + ' + 'cmdBrowse + ' + Me.cmdBrowse.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.cmdBrowse.Location = New System.Drawing.Point(293, 291) + Me.cmdBrowse.Name = "cmdBrowse" + Me.cmdBrowse.Size = New System.Drawing.Size(80, 23) + Me.cmdBrowse.TabIndex = 18 + Me.cmdBrowse.Text = "Browse" + Me.cmdBrowse.UseVisualStyleBackColor = True + ' + 'lblYear + ' + Me.lblYear.AutoSize = True + Me.lblYear.Location = New System.Drawing.Point(278, 12) + Me.lblYear.Name = "lblYear" + Me.lblYear.Size = New System.Drawing.Size(32, 13) + Me.lblYear.TabIndex = 1 + Me.lblYear.Text = "Year:" + ' + 'lblMissingValues + ' + Me.lblMissingValues.AutoSize = True + Me.lblMissingValues.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.lblMissingValues.Location = New System.Drawing.Point(4, 244) + Me.lblMissingValues.Name = "lblMissingValues" + Me.lblMissingValues.Size = New System.Drawing.Size(122, 13) + Me.lblMissingValues.TabIndex = 33 + Me.lblMissingValues.Text = "Code Missing Values as:" + ' + 'ucrInputCodeMissingValues + ' + Me.ucrInputCodeMissingValues.AddQuotesIfUnrecognised = True + Me.ucrInputCodeMissingValues.AutoSize = True + Me.ucrInputCodeMissingValues.IsMultiline = False + Me.ucrInputCodeMissingValues.IsReadOnly = False + Me.ucrInputCodeMissingValues.Location = New System.Drawing.Point(132, 242) + Me.ucrInputCodeMissingValues.Name = "ucrInputCodeMissingValues" + Me.ucrInputCodeMissingValues.Size = New System.Drawing.Size(99, 21) + Me.ucrInputCodeMissingValues.TabIndex = 32 + ' + 'ucrReceiverTN + ' + Me.ucrReceiverTN.AutoSize = True + Me.ucrReceiverTN.frmParent = Me + Me.ucrReceiverTN.Location = New System.Drawing.Point(278, 257) + Me.ucrReceiverTN.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverTN.Name = "ucrReceiverTN" + Me.ucrReceiverTN.Selector = Nothing + Me.ucrReceiverTN.Size = New System.Drawing.Size(120, 20) + Me.ucrReceiverTN.strNcFilePath = "" + Me.ucrReceiverTN.TabIndex = 12 + Me.ucrReceiverTN.ucrSelector = Nothing + ' + 'ucrReceiverTX + ' + Me.ucrReceiverTX.AutoSize = True + Me.ucrReceiverTX.frmParent = Me + Me.ucrReceiverTX.Location = New System.Drawing.Point(278, 215) + Me.ucrReceiverTX.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverTX.Name = "ucrReceiverTX" + Me.ucrReceiverTX.Selector = Nothing + Me.ucrReceiverTX.Size = New System.Drawing.Size(120, 20) + Me.ucrReceiverTX.strNcFilePath = "" + Me.ucrReceiverTX.TabIndex = 10 + Me.ucrReceiverTX.ucrSelector = Nothing + ' + 'ucrReceiverRR + ' + Me.ucrReceiverRR.AutoSize = True + Me.ucrReceiverRR.frmParent = Me + Me.ucrReceiverRR.Location = New System.Drawing.Point(278, 168) + Me.ucrReceiverRR.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverRR.Name = "ucrReceiverRR" + Me.ucrReceiverRR.Selector = Nothing + Me.ucrReceiverRR.Size = New System.Drawing.Size(120, 20) + Me.ucrReceiverRR.strNcFilePath = "" + Me.ucrReceiverRR.TabIndex = 8 + Me.ucrReceiverRR.ucrSelector = Nothing + ' + 'ucrReceiverDay + ' + Me.ucrReceiverDay.AutoSize = True + Me.ucrReceiverDay.frmParent = Me + Me.ucrReceiverDay.Location = New System.Drawing.Point(278, 119) + Me.ucrReceiverDay.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverDay.Name = "ucrReceiverDay" + Me.ucrReceiverDay.Selector = Nothing + Me.ucrReceiverDay.Size = New System.Drawing.Size(120, 20) + Me.ucrReceiverDay.strNcFilePath = "" + Me.ucrReceiverDay.TabIndex = 6 + Me.ucrReceiverDay.ucrSelector = Nothing + ' + 'ucrReceiverMonth + ' + Me.ucrReceiverMonth.AutoSize = True + Me.ucrReceiverMonth.frmParent = Me + Me.ucrReceiverMonth.Location = New System.Drawing.Point(278, 77) + Me.ucrReceiverMonth.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverMonth.Name = "ucrReceiverMonth" + Me.ucrReceiverMonth.Selector = Nothing + Me.ucrReceiverMonth.Size = New System.Drawing.Size(120, 20) + Me.ucrReceiverMonth.strNcFilePath = "" + Me.ucrReceiverMonth.TabIndex = 4 + Me.ucrReceiverMonth.ucrSelector = Nothing + ' + 'ucrInputExportFile + ' + Me.ucrInputExportFile.AddQuotesIfUnrecognised = True + Me.ucrInputExportFile.AutoSize = True + Me.ucrInputExportFile.IsMultiline = False + Me.ucrInputExportFile.IsReadOnly = False + Me.ucrInputExportFile.Location = New System.Drawing.Point(108, 293) + Me.ucrInputExportFile.Margin = New System.Windows.Forms.Padding(6, 8, 6, 8) + Me.ucrInputExportFile.Name = "ucrInputExportFile" + Me.ucrInputExportFile.Size = New System.Drawing.Size(182, 21) + Me.ucrInputExportFile.TabIndex = 17 + ' + 'ucrBase + ' + Me.ucrBase.AutoSize = True + Me.ucrBase.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrBase.Location = New System.Drawing.Point(7, 318) + Me.ucrBase.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) + Me.ucrBase.Name = "ucrBase" + Me.ucrBase.Size = New System.Drawing.Size(408, 52) + Me.ucrBase.TabIndex = 19 + ' + 'ucrReceiverYear + ' + Me.ucrReceiverYear.AutoSize = True + Me.ucrReceiverYear.frmParent = Me + Me.ucrReceiverYear.Location = New System.Drawing.Point(278, 30) + Me.ucrReceiverYear.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverYear.Name = "ucrReceiverYear" + Me.ucrReceiverYear.Selector = Nothing + Me.ucrReceiverYear.Size = New System.Drawing.Size(120, 20) + Me.ucrReceiverYear.strNcFilePath = "" + Me.ucrReceiverYear.TabIndex = 2 + Me.ucrReceiverYear.ucrSelector = Nothing + ' + 'ucrSelectorImportToClimpact + ' + Me.ucrSelectorImportToClimpact.AutoSize = True + Me.ucrSelectorImportToClimpact.bDropUnusedFilterLevels = False + Me.ucrSelectorImportToClimpact.bShowHiddenColumns = False + Me.ucrSelectorImportToClimpact.bUseCurrentFilter = True + Me.ucrSelectorImportToClimpact.Location = New System.Drawing.Point(9, 3) + Me.ucrSelectorImportToClimpact.Margin = New System.Windows.Forms.Padding(0) + Me.ucrSelectorImportToClimpact.Name = "ucrSelectorImportToClimpact" + Me.ucrSelectorImportToClimpact.Size = New System.Drawing.Size(213, 183) + Me.ucrSelectorImportToClimpact.TabIndex = 0 + ' + 'dlgExportForClimpact + ' + Me.AutoScaleDimensions = New System.Drawing.SizeF(96.0!, 96.0!) + Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi + Me.ClientSize = New System.Drawing.Size(422, 370) + Me.Controls.Add(Me.lblMissingValues) + Me.Controls.Add(Me.ucrInputCodeMissingValues) + Me.Controls.Add(Me.lblTN) + Me.Controls.Add(Me.ucrReceiverTN) + Me.Controls.Add(Me.lblTX) + Me.Controls.Add(Me.ucrReceiverTX) + Me.Controls.Add(Me.lblRR) + Me.Controls.Add(Me.ucrReceiverRR) + Me.Controls.Add(Me.lblDay) + Me.Controls.Add(Me.ucrReceiverDay) + Me.Controls.Add(Me.lblMonth) + Me.Controls.Add(Me.ucrReceiverMonth) + Me.Controls.Add(Me.lblExport) + Me.Controls.Add(Me.cmdBrowse) + Me.Controls.Add(Me.ucrInputExportFile) + Me.Controls.Add(Me.ucrBase) + Me.Controls.Add(Me.lblYear) + Me.Controls.Add(Me.ucrReceiverYear) + Me.Controls.Add(Me.ucrSelectorImportToClimpact) + Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow + Me.Name = "dlgExportForClimpact" + Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen + Me.Text = "Export For Climpact" + Me.ResumeLayout(False) + Me.PerformLayout() + + End Sub + + Friend WithEvents lblTN As Label + Friend WithEvents ucrReceiverTN As ucrReceiverSingle + Friend WithEvents lblTX As Label + Friend WithEvents ucrReceiverTX As ucrReceiverSingle + Friend WithEvents lblRR As Label + Friend WithEvents ucrReceiverRR As ucrReceiverSingle + Friend WithEvents lblDay As Label + Friend WithEvents ucrReceiverDay As ucrReceiverSingle + Friend WithEvents lblMonth As Label + Friend WithEvents ucrReceiverMonth As ucrReceiverSingle + Friend WithEvents lblExport As Label + Friend WithEvents cmdBrowse As Button + Friend WithEvents ucrInputExportFile As ucrInputTextBox + Friend WithEvents ucrBase As ucrButtons + Friend WithEvents lblYear As Label + Friend WithEvents ucrReceiverYear As ucrReceiverSingle + Friend WithEvents ucrSelectorImportToClimpact As ucrSelectorByDataFrameAddRemove + Friend WithEvents lblMissingValues As Label + Friend WithEvents ucrInputCodeMissingValues As ucrInputTextBox +End Class diff --git a/instat/dlgExportForClimpact.resx b/instat/dlgExportForClimpact.resx new file mode 100644 index 00000000000..1af7de150c9 --- /dev/null +++ b/instat/dlgExportForClimpact.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/instat/dlgExportForClimpact.vb b/instat/dlgExportForClimpact.vb new file mode 100644 index 00000000000..91770b69bc6 --- /dev/null +++ b/instat/dlgExportForClimpact.vb @@ -0,0 +1,160 @@ +' R- Instat +' Copyright (C) 2015-2017 +' +' This program is free software: you can redistribute it and/or modify +' it under the terms of the GNU General Public License as published by +' the Free Software Foundation, either version 3 of the License, or +' (at your option) any later version. +' +' This program is distributed in the hope that it will be useful, +' but WITHOUT ANY WARRANTY; without even the implied warranty of +' MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +' GNU General Public License for more details. +' +' You should have received a copy of the GNU General Public License +' along with this program. If not, see . + +Imports System.IO +Imports instat.Translations + +Public Class dlgExportForClimpact + Private bFirstLoad As Boolean = True + Private bReset As Boolean = True + Private clsOutputClimpact As New RFunction + + Private Sub dlgExportForClimpact_Load(sender As Object, e As EventArgs) Handles MyBase.Load + If bFirstLoad Then + InitialiseDialog() + bFirstLoad = False + End If + If bReset Then + SetDefaults() + End If + SetRCodeForControls(bReset) + bReset = False + autoTranslate(Me) + TestOkEnabled() + End Sub + + Private Sub InitialiseDialog() + ucrBase.iHelpTopicID = 506 + ucrInputCodeMissingValues.SetParameter(New RParameter("missing_code", 6)) + ucrInputCodeMissingValues.SetRDefault("-99.9") + + 'Year Receiver + ucrReceiverYear.Selector = ucrSelectorImportToClimpact + ucrReceiverYear.SetParameter(New RParameter("year", 0)) + ucrReceiverYear.SetClimaticType("year") + ucrReceiverYear.SetParameterIsRFunction() + ucrReceiverYear.bAutoFill = True + ucrReceiverYear.strSelectorHeading = "Year Variables" + + 'Month Receiver + ucrReceiverMonth.Selector = ucrSelectorImportToClimpact + ucrReceiverMonth.SetParameter(New RParameter("month", 1)) + ucrReceiverMonth.SetClimaticType("month") + ucrReceiverMonth.SetParameterIsRFunction() + ucrReceiverMonth.bAutoFill = True + ucrReceiverMonth.strSelectorHeading = "Month Variables" + ucrReceiverMonth.bWithQuotes = False + + 'Day Receiver + ucrReceiverDay.Selector = ucrSelectorImportToClimpact + ucrReceiverDay.SetParameter(New RParameter("day", 2)) + ucrReceiverDay.SetParameterIsRFunction() + ucrReceiverDay.bWithQuotes = False + ucrReceiverDay.SetClimaticType("day") + ucrReceiverDay.bAutoFill = True + + 'Element Receiver + ucrReceiverTX.Selector = ucrSelectorImportToClimpact + ucrReceiverTX.SetParameter(New RParameter("mx_tmp", 3)) + ucrReceiverTX.SetParameterIsRFunction() + ucrReceiverTX.bWithQuotes = False + ucrReceiverTX.SetClimaticType("temp_max") + ucrReceiverTX.bAutoFill = True + + ucrReceiverTN.Selector = ucrSelectorImportToClimpact + ucrReceiverTN.SetParameter(New RParameter("mn_tmp", 4)) + ucrReceiverTN.SetParameterIsRFunction() + ucrReceiverTN.SetClimaticType("temp_min") + ucrReceiverTN.bAutoFill = True + ucrReceiverTN.bWithQuotes = False + + ucrReceiverRR.SetParameter(New RParameter("rain", 5,)) + ucrReceiverRR.Selector = ucrSelectorImportToClimpact + ucrReceiverRR.SetClimaticType("rain") + ucrReceiverRR.bAutoFill = True + ucrReceiverRR.SetParameterIsRFunction() + ucrReceiverRR.bWithQuotes = False + + ucrInputExportFile.SetParameter(New RParameter("output_file ", 9)) + ucrInputExportFile.IsReadOnly = True + ucrInputExportFile.SetLinkedDisplayControl(lblExport) + + End Sub + + Private Sub SetDefaults() + clsOutputClimpact = New RFunction + + ucrSelectorImportToClimpact.Reset() + + clsOutputClimpact.SetRCommand("write_weather_data") + + ucrBase.clsRsyntax.SetBaseRFunction(clsOutputClimpact) + End Sub + + Private Sub SetRCodeForControls(bReset As Boolean) + + SetRCode(Me, ucrBase.clsRsyntax.clsBaseFunction, bReset) + End Sub + + Private Sub TestOkEnabled() + ucrBase.OKEnabled(Not ucrReceiverDay.IsEmpty _ + AndAlso Not ucrReceiverMonth.IsEmpty _ + AndAlso Not ucrReceiverYear.IsEmpty _ + AndAlso Not ucrReceiverRR.IsEmpty _ + AndAlso Not ucrReceiverTX.IsEmpty _ + AndAlso Not ucrReceiverTN.IsEmpty + ) + If ucrInputExportFile.IsEmpty Then + ucrBase.OKEnabled(False) + End If + End Sub + + Private Sub ucrBase_ClickReset(sender As Object, e As EventArgs) Handles ucrBase.ClickReset + SetDefaults() + SetRCodeForControls(True) + TestOkEnabled() + End Sub + + Private Sub cmdBrowse_Click(sender As Object, e As EventArgs) Handles cmdBrowse.Click + SelectFileToSave() + End Sub + + Private Sub SelectFileToSave() + Using dlgSave As New SaveFileDialog + dlgSave.Title = "Save Climpact File" + dlgSave.Filter = "Text File (*.txt)|*.txt" + If ucrInputExportFile.GetText() <> "" Then + dlgSave.InitialDirectory = ucrInputExportFile.GetText().Replace("/", "\") + Else + dlgSave.InitialDirectory = frmMain.clsInstatOptions.strWorkingDirectory + End If + If dlgSave.ShowDialog() = DialogResult.OK Then + ucrInputExportFile.SetName(dlgSave.FileName.Replace("\", "/")) + End If + TestOkEnabled() + End Using + End Sub + + Private Sub ucrInputExportFile_Click(sender As Object, e As EventArgs) Handles ucrInputExportFile.Click + If ucrInputExportFile.IsEmpty() Then + SelectFileToSave() + End If + End Sub + + Private Sub ucrReceiverElements_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrReceiverRR.ControlContentsChanged, ucrReceiverTN.ControlValueChanged, ucrReceiverDay.ControlValueChanged, ucrReceiverYear.ControlValueChanged, ucrInputExportFile.ControlContentsChanged, ucrReceiverTX.ControlValueChanged, ucrReceiverMonth.ControlValueChanged + TestOkEnabled() + End Sub +End Class \ No newline at end of file diff --git a/instat/dlgExportToClimsoft.vb b/instat/dlgExportToClimsoft.vb index 0bf4d4c6126..72c2faa3d8a 100644 --- a/instat/dlgExportToClimsoft.vb +++ b/instat/dlgExportToClimsoft.vb @@ -39,7 +39,7 @@ Public Class dlgExportToClimsoft End Sub Private Sub InitialiseDialog() - + ucrBase.iHelpTopicID=476 ucrReceiverStation.SetClimaticType("station") ucrReceiverStation.bAutoFill = True ucrReceiverStation.Selector = ucrSelectorImportToClimsoft diff --git a/instat/dlgExtremes.vb b/instat/dlgExtremes.vb index cc0ad564449..122ebf33a53 100644 --- a/instat/dlgExtremes.vb +++ b/instat/dlgExtremes.vb @@ -47,6 +47,7 @@ clsInitialListFunction, clsOmitMissingFunction As New RFunction Private Sub InitialiseDialog() Dim dctFevdTypes As New Dictionary(Of String, String) + ucrBase.iHelpTopicID = 488 ucrInputExtremes.SetParameter(New RParameter("type", 1)) dctFevdTypes.Add("GEV", Chr(34) & "GEV" & Chr(34)) dctFevdTypes.Add("GP", Chr(34) & "GP" & Chr(34)) diff --git a/instat/dlgGeneralForGraphics.Designer.vb b/instat/dlgGeneralForGraphics.Designer.vb index 83bc3139f89..a175bff8c64 100644 --- a/instat/dlgGeneralForGraphics.Designer.vb +++ b/instat/dlgGeneralForGraphics.Designer.vb @@ -491,7 +491,7 @@ Partial Class dlgGeneralForGraphics Me.ucrInputAddCode.IsReadOnly = False Me.ucrInputAddCode.Location = New System.Drawing.Point(159, 362) Me.ucrInputAddCode.Name = "ucrInputAddCode" - Me.ucrInputAddCode.Size = New System.Drawing.Size(267, 21) + Me.ucrInputAddCode.Size = New System.Drawing.Size(316, 21) Me.ucrInputAddCode.TabIndex = 218 ' 'ucrChkAddCode diff --git a/instat/dlgGeneralForGraphics.vb b/instat/dlgGeneralForGraphics.vb index 3db68c1e86d..04112a21464 100644 --- a/instat/dlgGeneralForGraphics.vb +++ b/instat/dlgGeneralForGraphics.vb @@ -167,7 +167,7 @@ Public Class dlgGeneralForGraphics ucrChkAddCode.SetText("Add Code:") ucrChkAddCode.AddToLinkedControls({ucrInputAddCode}, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:="") - ucrInputAddCode.SetItems({"geom_hline(yintercept=20)", "geom_vline(xintercept = 5)", "geom_vline(xintercept = 5)", "scale_x_binned()", "scale_x_binned(n.breaks=20)"}) + ucrInputAddCode.SetItems({"scale_colour_manual(values=c(" & Chr(34) & "red" & Chr(34) & "," & Chr(34) & "blue" & Chr(34) & "," & Chr(34) & "green" & Chr(34) & "," & Chr(34) & "black" & Chr(34) & "," & Chr(34) & "brown" & Chr(34) & "))", "scale_fill_manual(values = c(" & Chr(34) & "coral" & Chr(34) & "," & Chr(34) & "bisque4" & Chr(34) & "," & Chr(34) & "gold" & Chr(34) & "," & Chr(34) & "cyan" & Chr(34) & "," & Chr(34) & "khaki" & Chr(34) & "," & Chr(34) & "orange" & Chr(34) & "," & Chr(34) & "orchid" & Chr(34) & "))", "geom_hline(yintercept=20)", "geom_vline(xintercept=5) + geom_hline(yintercept = 1)", "geom_vline(xintercept=c(1,3,5),colour=" & Chr(34) & "green" & Chr(34) & ")", "scale_x_binned()", "scale_x_binned(n.breaks=20)", "scale_y_continuous(trans=" & Chr(34) & "log10" & Chr(34) & ", label=scales::dollar)"}) ucrSave.SetPrefix("graph") ucrSave.SetIsComboBox() @@ -272,6 +272,14 @@ Public Class dlgGeneralForGraphics TestOKEnabled() End Sub + Private Sub SetCalculationHistory() + Dim newItem As String = ucrInputAddCode.GetText().Trim() + + If Not String.IsNullOrEmpty(newItem) AndAlso Not ucrInputAddCode.cboInput.Items.Contains(newItem) Then + ucrInputAddCode.AddItems({newItem}) + End If + End Sub + Private Sub SetRCodeForControls(bReset As Boolean) ucrReceiverX.AddAdditionalCodeParameterPair(clsLevelsFunction, New RParameter("y", ucrReceiverX.GetVariableNames(False), bNewIncludeArgumentName:=False), iAdditionalPairNo:=1) ucrGraphicsSelector.SetRCode(clsGgplotFunction, bReset) @@ -670,7 +678,7 @@ Public Class dlgGeneralForGraphics End Sub Private Sub UpdateParameters() - clsFacetVariablesOperator.RemoveParameterByName("wrap" & ucrInputStation.Name) + clsFacetVariablesOperator.RemoveParameterByName("var1") clsFacetColOp.RemoveParameterByName("col" & ucrInputStation.Name) clsFacetRowOp.RemoveParameterByName("row" & ucrInputStation.Name) @@ -794,6 +802,7 @@ Public Class dlgGeneralForGraphics End Sub Private Sub ucrChkAddCode_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkAddCode.ControlValueChanged, ucrInputAddCode.ControlValueChanged + SetCalculationHistory() If ucrChkAddCode.Checked AndAlso Not ucrInputAddCode.IsEmpty Then clsAddCodeOperator.AddParameter("code1", ucrInputAddCode.GetText(), bIncludeArgumentName:=False, iPosition:=1) clsBaseOperator.AddParameter("newcode", clsROperatorParameter:=clsAddCodeOperator, bIncludeArgumentName:=False) diff --git a/instat/dlgHeatMapPlot.Designer.vb b/instat/dlgHeatMapPlot.Designer.vb index dd78aa726a6..1d91d650e19 100644 --- a/instat/dlgHeatMapPlot.Designer.vb +++ b/instat/dlgHeatMapPlot.Designer.vb @@ -45,8 +45,6 @@ Partial Class dlgHeatMapPlot Me.lblLabelPosition = New System.Windows.Forms.Label() Me.lblLabelColour = New System.Windows.Forms.Label() Me.lblLabelSize = New System.Windows.Forms.Label() - Me.lblPointsOptional = New System.Windows.Forms.Label() - Me.lblPointsSize = New System.Windows.Forms.Label() Me.lblReorderVariableX = New System.Windows.Forms.Label() Me.lblReorderValue = New System.Windows.Forms.Label() Me.rdoChoroplethMap = New System.Windows.Forms.RadioButton() @@ -54,11 +52,25 @@ Partial Class dlgHeatMapPlot Me.lblLongitude = New System.Windows.Forms.Label() Me.lblLatitude = New System.Windows.Forms.Label() Me.lblFillChoropleth = New System.Windows.Forms.Label() - Me.ucrChkFlipCoordinates = New instat.ucrCheck() - Me.ucrReceiverPointsHeatMap = New instat.ucrReceiverSingle() - Me.ucrNudShapeHeatMap = New instat.ucrNud() - Me.ucrChkColourPalette = New instat.ucrCheck() - Me.ucrInputColourPalette = New instat.ucrInputComboBox() + Me.lblGroup = New System.Windows.Forms.Label() + Me.contextMenuStripOptions = New System.Windows.Forms.ContextMenuStrip(Me.components) + Me.toolStripMenuItemPlotOptions = New System.Windows.Forms.ToolStripMenuItem() + Me.toolStripMenuItemTileOptions = New System.Windows.Forms.ToolStripMenuItem() + Me.toolStripMenuItemPolygonOptions = New System.Windows.Forms.ToolStripMenuItem() + Me.toolStripMenuItemJitterOptions = New System.Windows.Forms.ToolStripMenuItem() + Me.lblFacetBy = New System.Windows.Forms.Label() + Me.lblYvariable = New System.Windows.Forms.Label() + Me.lblHeith = New System.Windows.Forms.Label() + Me.lblWidth = New System.Windows.Forms.Label() + Me.ucrChkJitter = New instat.ucrCheck() + Me.ucrNudHeigth = New instat.ucrNud() + Me.ucrNudWidth = New instat.ucrNud() + Me.ucrReceiverY = New instat.ucrReceiverSingle() + Me.ucrInputStation = New instat.ucrInputComboBox() + Me.ucr1stFactorReceiver = New instat.ucrReceiverSingle() + Me.ucrInputLegendPosition = New instat.ucrInputComboBox() + Me.ucrChkLegend = New instat.ucrCheck() + Me.cmdOptions = New instat.ucrSplitButton() Me.ucrReceiverFill = New instat.ucrReceiverSingle() Me.ucrSaveGraph = New instat.ucrSave() Me.ucrBase = New instat.ucrButtons() @@ -68,22 +80,30 @@ Partial Class dlgHeatMapPlot Me.ucrReceiverLongitude = New instat.ucrReceiverSingle() Me.ucrReceiverLatitude = New instat.ucrReceiverSingle() Me.ucrReceiverFillChoropleth = New instat.ucrReceiverSingle() - Me.ucrVariableAsFactorForHeatMap = New instat.ucrVariablesAsFactor() Me.ucrInputReorderVariableX = New instat.ucrInputComboBox() Me.ucrInputSize = New instat.ucrInputComboBox() - Me.ucrChkAddLabels = New instat.ucrCheck() Me.ucrInputPosition = New instat.ucrInputComboBox() Me.ucrInputColour = New instat.ucrInputComboBox() Me.ucrReceiverX = New instat.ucrReceiverSingle() Me.ucrReceiverGroup = New instat.ucrReceiverSingle() - Me.lblGroup = New System.Windows.Forms.Label() + Me.ucrChkAddLabels = New instat.ucrCheck() Me.ucrChkPoints = New instat.ucrCheck() - Me.contextMenuStripOptions = New System.Windows.Forms.ContextMenuStrip(Me.components) - Me.toolStripMenuItemPlotOptions = New System.Windows.Forms.ToolStripMenuItem() - Me.toolStripMenuItemTileOptions = New System.Windows.Forms.ToolStripMenuItem() - Me.toolStripMenuItemPolygonOptions = New System.Windows.Forms.ToolStripMenuItem() - Me.cmdOptions = New instat.ucrSplitButton() + Me.ucrChkFlipCoordinates = New instat.ucrCheck() + Me.grpColour = New System.Windows.Forms.GroupBox() + Me.lblValue = New System.Windows.Forms.Label() + Me.ucrInputValue = New instat.ucrInputTextBox() + Me.lblTo = New System.Windows.Forms.Label() + Me.lblFrom = New System.Windows.Forms.Label() + Me.rdoViridis = New System.Windows.Forms.RadioButton() + Me.ucrColourTo = New instat.ucrColors() + Me.ucrColourFrom = New instat.ucrColors() + Me.ucrInputPalette = New instat.ucrInputComboBox() + Me.rdoPalette = New System.Windows.Forms.RadioButton() + Me.rdoGradient = New System.Windows.Forms.RadioButton() + Me.ucrPnlColour = New instat.UcrPanel() + Me.ucrInputColourPalette = New instat.ucrInputComboBox() Me.contextMenuStripOptions.SuspendLayout() + Me.grpColour.SuspendLayout() Me.SuspendLayout() ' 'lblXVariable @@ -113,17 +133,6 @@ Partial Class dlgHeatMapPlot resources.ApplyResources(Me.lblLabelSize, "lblLabelSize") Me.lblLabelSize.Name = "lblLabelSize" ' - 'lblPointsOptional - ' - resources.ApplyResources(Me.lblPointsOptional, "lblPointsOptional") - Me.lblPointsOptional.Name = "lblPointsOptional" - Me.lblPointsOptional.Tag = "Points_Optional" - ' - 'lblPointsSize - ' - resources.ApplyResources(Me.lblPointsSize, "lblPointsSize") - Me.lblPointsSize.Name = "lblPointsSize" - ' 'lblReorderVariableX ' resources.ApplyResources(Me.lblReorderVariableX, "lblReorderVariableX") @@ -174,44 +183,132 @@ Partial Class dlgHeatMapPlot Me.lblFillChoropleth.Name = "lblFillChoropleth" Me.lblFillChoropleth.Tag = "fill" ' - 'ucrChkFlipCoordinates + 'lblGroup ' - resources.ApplyResources(Me.ucrChkFlipCoordinates, "ucrChkFlipCoordinates") - Me.ucrChkFlipCoordinates.Checked = False - Me.ucrChkFlipCoordinates.Name = "ucrChkFlipCoordinates" + resources.ApplyResources(Me.lblGroup, "lblGroup") + Me.lblGroup.Name = "lblGroup" ' - 'ucrReceiverPointsHeatMap + 'contextMenuStripOptions ' - resources.ApplyResources(Me.ucrReceiverPointsHeatMap, "ucrReceiverPointsHeatMap") - Me.ucrReceiverPointsHeatMap.frmParent = Me - Me.ucrReceiverPointsHeatMap.Name = "ucrReceiverPointsHeatMap" - Me.ucrReceiverPointsHeatMap.Selector = Nothing - Me.ucrReceiverPointsHeatMap.strNcFilePath = "" - Me.ucrReceiverPointsHeatMap.ucrSelector = Nothing + Me.contextMenuStripOptions.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.toolStripMenuItemPlotOptions, Me.toolStripMenuItemTileOptions, Me.toolStripMenuItemPolygonOptions, Me.toolStripMenuItemJitterOptions}) + Me.contextMenuStripOptions.Name = "contextMenuStripOk" + resources.ApplyResources(Me.contextMenuStripOptions, "contextMenuStripOptions") ' - 'ucrNudShapeHeatMap + 'toolStripMenuItemPlotOptions ' - resources.ApplyResources(Me.ucrNudShapeHeatMap, "ucrNudShapeHeatMap") - Me.ucrNudShapeHeatMap.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) - Me.ucrNudShapeHeatMap.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudShapeHeatMap.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) - Me.ucrNudShapeHeatMap.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) - Me.ucrNudShapeHeatMap.Name = "ucrNudShapeHeatMap" - Me.ucrNudShapeHeatMap.Value = New Decimal(New Integer() {0, 0, 0, 0}) + Me.toolStripMenuItemPlotOptions.Name = "toolStripMenuItemPlotOptions" + resources.ApplyResources(Me.toolStripMenuItemPlotOptions, "toolStripMenuItemPlotOptions") ' - 'ucrChkColourPalette + 'toolStripMenuItemTileOptions ' - resources.ApplyResources(Me.ucrChkColourPalette, "ucrChkColourPalette") - Me.ucrChkColourPalette.Checked = False - Me.ucrChkColourPalette.Name = "ucrChkColourPalette" + Me.toolStripMenuItemTileOptions.Name = "toolStripMenuItemTileOptions" + resources.ApplyResources(Me.toolStripMenuItemTileOptions, "toolStripMenuItemTileOptions") ' - 'ucrInputColourPalette + 'toolStripMenuItemPolygonOptions ' - Me.ucrInputColourPalette.AddQuotesIfUnrecognised = True - resources.ApplyResources(Me.ucrInputColourPalette, "ucrInputColourPalette") - Me.ucrInputColourPalette.GetSetSelectedIndex = -1 - Me.ucrInputColourPalette.IsReadOnly = False - Me.ucrInputColourPalette.Name = "ucrInputColourPalette" + Me.toolStripMenuItemPolygonOptions.Name = "toolStripMenuItemPolygonOptions" + resources.ApplyResources(Me.toolStripMenuItemPolygonOptions, "toolStripMenuItemPolygonOptions") + ' + 'toolStripMenuItemJitterOptions + ' + Me.toolStripMenuItemJitterOptions.Name = "toolStripMenuItemJitterOptions" + resources.ApplyResources(Me.toolStripMenuItemJitterOptions, "toolStripMenuItemJitterOptions") + ' + 'lblFacetBy + ' + resources.ApplyResources(Me.lblFacetBy, "lblFacetBy") + Me.lblFacetBy.Name = "lblFacetBy" + Me.lblFacetBy.Tag = "" + ' + 'lblYvariable + ' + resources.ApplyResources(Me.lblYvariable, "lblYvariable") + Me.lblYvariable.Name = "lblYvariable" + ' + 'lblHeith + ' + resources.ApplyResources(Me.lblHeith, "lblHeith") + Me.lblHeith.Name = "lblHeith" + ' + 'lblWidth + ' + resources.ApplyResources(Me.lblWidth, "lblWidth") + Me.lblWidth.Name = "lblWidth" + ' + 'ucrChkJitter + ' + resources.ApplyResources(Me.ucrChkJitter, "ucrChkJitter") + Me.ucrChkJitter.Checked = False + Me.ucrChkJitter.Name = "ucrChkJitter" + ' + 'ucrNudHeigth + ' + resources.ApplyResources(Me.ucrNudHeigth, "ucrNudHeigth") + Me.ucrNudHeigth.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudHeigth.Increment = New Decimal(New Integer() {1, 0, 0, 0}) + 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" + Me.ucrNudHeigth.Value = New Decimal(New Integer() {0, 0, 0, 0}) + ' + 'ucrNudWidth + ' + resources.ApplyResources(Me.ucrNudWidth, "ucrNudWidth") + Me.ucrNudWidth.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudWidth.Increment = New Decimal(New Integer() {1, 0, 0, 0}) + 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" + Me.ucrNudWidth.Value = New Decimal(New Integer() {0, 0, 0, 0}) + ' + 'ucrReceiverY + ' + resources.ApplyResources(Me.ucrReceiverY, "ucrReceiverY") + Me.ucrReceiverY.frmParent = Me + Me.ucrReceiverY.Name = "ucrReceiverY" + Me.ucrReceiverY.Selector = Nothing + Me.ucrReceiverY.strNcFilePath = "" + Me.ucrReceiverY.ucrSelector = Nothing + ' + 'ucrInputStation + ' + Me.ucrInputStation.AddQuotesIfUnrecognised = True + resources.ApplyResources(Me.ucrInputStation, "ucrInputStation") + Me.ucrInputStation.GetSetSelectedIndex = -1 + Me.ucrInputStation.IsReadOnly = False + Me.ucrInputStation.Name = "ucrInputStation" + ' + 'ucr1stFactorReceiver + ' + resources.ApplyResources(Me.ucr1stFactorReceiver, "ucr1stFactorReceiver") + Me.ucr1stFactorReceiver.frmParent = Me + Me.ucr1stFactorReceiver.Name = "ucr1stFactorReceiver" + Me.ucr1stFactorReceiver.Selector = Nothing + Me.ucr1stFactorReceiver.strNcFilePath = "" + Me.ucr1stFactorReceiver.ucrSelector = Nothing + ' + 'ucrInputLegendPosition + ' + Me.ucrInputLegendPosition.AddQuotesIfUnrecognised = True + resources.ApplyResources(Me.ucrInputLegendPosition, "ucrInputLegendPosition") + Me.ucrInputLegendPosition.GetSetSelectedIndex = -1 + Me.ucrInputLegendPosition.IsReadOnly = False + Me.ucrInputLegendPosition.Name = "ucrInputLegendPosition" + ' + 'ucrChkLegend + ' + resources.ApplyResources(Me.ucrChkLegend, "ucrChkLegend") + Me.ucrChkLegend.Checked = False + Me.ucrChkLegend.Name = "ucrChkLegend" + ' + 'cmdOptions + ' + resources.ApplyResources(Me.cmdOptions, "cmdOptions") + Me.cmdOptions.ContextMenuStrip = Me.contextMenuStripOptions + Me.cmdOptions.Name = "cmdOptions" + Me.cmdOptions.SplitMenuStrip = Me.contextMenuStripOptions + Me.cmdOptions.Tag = "Plot Options" + Me.cmdOptions.UseVisualStyleBackColor = True ' 'ucrReceiverFill ' @@ -280,16 +377,6 @@ Partial Class dlgHeatMapPlot Me.ucrReceiverFillChoropleth.strNcFilePath = "" Me.ucrReceiverFillChoropleth.ucrSelector = Nothing ' - 'ucrVariableAsFactorForHeatMap - ' - resources.ApplyResources(Me.ucrVariableAsFactorForHeatMap, "ucrVariableAsFactorForHeatMap") - Me.ucrVariableAsFactorForHeatMap.frmParent = Me - Me.ucrVariableAsFactorForHeatMap.Name = "ucrVariableAsFactorForHeatMap" - Me.ucrVariableAsFactorForHeatMap.Selector = Nothing - Me.ucrVariableAsFactorForHeatMap.strNcFilePath = "" - Me.ucrVariableAsFactorForHeatMap.ucrSelector = Nothing - Me.ucrVariableAsFactorForHeatMap.ucrVariableSelector = Nothing - ' 'ucrInputReorderVariableX ' Me.ucrInputReorderVariableX.AddQuotesIfUnrecognised = True @@ -306,12 +393,6 @@ Partial Class dlgHeatMapPlot Me.ucrInputSize.IsReadOnly = False Me.ucrInputSize.Name = "ucrInputSize" ' - 'ucrChkAddLabels - ' - resources.ApplyResources(Me.ucrChkAddLabels, "ucrChkAddLabels") - Me.ucrChkAddLabels.Checked = False - Me.ucrChkAddLabels.Name = "ucrChkAddLabels" - ' 'ucrInputPosition ' Me.ucrInputPosition.AddQuotesIfUnrecognised = True @@ -346,10 +427,11 @@ Partial Class dlgHeatMapPlot Me.ucrReceiverGroup.strNcFilePath = "" Me.ucrReceiverGroup.ucrSelector = Nothing ' - 'lblGroup + 'ucrChkAddLabels ' - resources.ApplyResources(Me.lblGroup, "lblGroup") - Me.lblGroup.Name = "lblGroup" + resources.ApplyResources(Me.ucrChkAddLabels, "ucrChkAddLabels") + Me.ucrChkAddLabels.Checked = False + Me.ucrChkAddLabels.Name = "ucrChkAddLabels" ' 'ucrChkPoints ' @@ -357,53 +439,136 @@ Partial Class dlgHeatMapPlot Me.ucrChkPoints.Checked = False Me.ucrChkPoints.Name = "ucrChkPoints" ' - 'contextMenuStripOptions + 'ucrChkFlipCoordinates ' - Me.contextMenuStripOptions.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.toolStripMenuItemPlotOptions, Me.toolStripMenuItemTileOptions, Me.toolStripMenuItemPolygonOptions}) - Me.contextMenuStripOptions.Name = "contextMenuStripOk" - resources.ApplyResources(Me.contextMenuStripOptions, "contextMenuStripOptions") + resources.ApplyResources(Me.ucrChkFlipCoordinates, "ucrChkFlipCoordinates") + Me.ucrChkFlipCoordinates.Checked = False + Me.ucrChkFlipCoordinates.Name = "ucrChkFlipCoordinates" ' - 'toolStripMenuItemPlotOptions + 'grpColour ' - Me.toolStripMenuItemPlotOptions.Name = "toolStripMenuItemPlotOptions" - resources.ApplyResources(Me.toolStripMenuItemPlotOptions, "toolStripMenuItemPlotOptions") + Me.grpColour.Controls.Add(Me.lblValue) + Me.grpColour.Controls.Add(Me.lblTo) + Me.grpColour.Controls.Add(Me.ucrInputValue) + Me.grpColour.Controls.Add(Me.lblFrom) + Me.grpColour.Controls.Add(Me.rdoViridis) + Me.grpColour.Controls.Add(Me.ucrColourTo) + Me.grpColour.Controls.Add(Me.ucrColourFrom) + Me.grpColour.Controls.Add(Me.ucrInputPalette) + Me.grpColour.Controls.Add(Me.rdoPalette) + Me.grpColour.Controls.Add(Me.rdoGradient) + Me.grpColour.Controls.Add(Me.ucrPnlColour) + Me.grpColour.Controls.Add(Me.ucrInputColourPalette) + resources.ApplyResources(Me.grpColour, "grpColour") + Me.grpColour.Name = "grpColour" + Me.grpColour.TabStop = False ' - 'toolStripMenuItemTileOptions + 'lblValue ' - Me.toolStripMenuItemTileOptions.Name = "toolStripMenuItemTileOptions" - resources.ApplyResources(Me.toolStripMenuItemTileOptions, "toolStripMenuItemTileOptions") + resources.ApplyResources(Me.lblValue, "lblValue") + Me.lblValue.Name = "lblValue" + Me.lblValue.Tag = "" ' - 'toolStripMenuItemPolygonOptions + 'ucrInputValue ' - Me.toolStripMenuItemPolygonOptions.Name = "toolStripMenuItemPolygonOptions" - resources.ApplyResources(Me.toolStripMenuItemPolygonOptions, "toolStripMenuItemPolygonOptions") + Me.ucrInputValue.AddQuotesIfUnrecognised = True + resources.ApplyResources(Me.ucrInputValue, "ucrInputValue") + Me.ucrInputValue.IsMultiline = False + Me.ucrInputValue.IsReadOnly = False + Me.ucrInputValue.Name = "ucrInputValue" ' - 'cmdOptions + 'lblTo ' - resources.ApplyResources(Me.cmdOptions, "cmdOptions") - Me.cmdOptions.ContextMenuStrip = Me.contextMenuStripOptions - Me.cmdOptions.Name = "cmdOptions" - Me.cmdOptions.SplitMenuStrip = Me.contextMenuStripOptions - Me.cmdOptions.Tag = "Plot Options" - Me.cmdOptions.UseVisualStyleBackColor = True + resources.ApplyResources(Me.lblTo, "lblTo") + Me.lblTo.Name = "lblTo" + Me.lblTo.Tag = "fill" + ' + 'lblFrom + ' + resources.ApplyResources(Me.lblFrom, "lblFrom") + Me.lblFrom.Name = "lblFrom" + Me.lblFrom.Tag = "" + ' + 'rdoViridis + ' + resources.ApplyResources(Me.rdoViridis, "rdoViridis") + Me.rdoViridis.Name = "rdoViridis" + Me.rdoViridis.TabStop = True + Me.rdoViridis.UseVisualStyleBackColor = True + ' + 'ucrColourTo + ' + Me.ucrColourTo.AddQuotesIfUnrecognised = True + resources.ApplyResources(Me.ucrColourTo, "ucrColourTo") + Me.ucrColourTo.GetSetSelectedIndex = -1 + Me.ucrColourTo.IsReadOnly = False + Me.ucrColourTo.Name = "ucrColourTo" + ' + 'ucrColourFrom + ' + Me.ucrColourFrom.AddQuotesIfUnrecognised = True + resources.ApplyResources(Me.ucrColourFrom, "ucrColourFrom") + Me.ucrColourFrom.GetSetSelectedIndex = -1 + Me.ucrColourFrom.IsReadOnly = False + Me.ucrColourFrom.Name = "ucrColourFrom" + ' + 'ucrInputPalette + ' + Me.ucrInputPalette.AddQuotesIfUnrecognised = True + resources.ApplyResources(Me.ucrInputPalette, "ucrInputPalette") + Me.ucrInputPalette.GetSetSelectedIndex = -1 + Me.ucrInputPalette.IsReadOnly = False + Me.ucrInputPalette.Name = "ucrInputPalette" + ' + 'rdoPalette + ' + resources.ApplyResources(Me.rdoPalette, "rdoPalette") + Me.rdoPalette.Name = "rdoPalette" + Me.rdoPalette.TabStop = True + Me.rdoPalette.UseVisualStyleBackColor = True + ' + 'rdoGradient + ' + resources.ApplyResources(Me.rdoGradient, "rdoGradient") + Me.rdoGradient.Name = "rdoGradient" + Me.rdoGradient.TabStop = True + Me.rdoGradient.UseVisualStyleBackColor = True + ' + 'ucrPnlColour + ' + resources.ApplyResources(Me.ucrPnlColour, "ucrPnlColour") + Me.ucrPnlColour.Name = "ucrPnlColour" + ' + 'ucrInputColourPalette + ' + Me.ucrInputColourPalette.AddQuotesIfUnrecognised = True + resources.ApplyResources(Me.ucrInputColourPalette, "ucrInputColourPalette") + Me.ucrInputColourPalette.GetSetSelectedIndex = -1 + Me.ucrInputColourPalette.IsReadOnly = False + Me.ucrInputColourPalette.Name = "ucrInputColourPalette" ' 'dlgHeatMapPlot ' resources.ApplyResources(Me, "$this") Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.Controls.Add(Me.grpColour) + Me.Controls.Add(Me.ucrChkJitter) + Me.Controls.Add(Me.lblHeith) + Me.Controls.Add(Me.ucrNudHeigth) + Me.Controls.Add(Me.lblWidth) + Me.Controls.Add(Me.ucrNudWidth) + Me.Controls.Add(Me.lblYvariable) + Me.Controls.Add(Me.ucrReceiverY) + Me.Controls.Add(Me.ucrInputStation) + Me.Controls.Add(Me.ucr1stFactorReceiver) + Me.Controls.Add(Me.lblFacetBy) + Me.Controls.Add(Me.ucrInputLegendPosition) + Me.Controls.Add(Me.ucrChkLegend) Me.Controls.Add(Me.cmdOptions) - Me.Controls.Add(Me.ucrChkPoints) Me.Controls.Add(Me.lblGroup) Me.Controls.Add(Me.lblFillChoropleth) - Me.Controls.Add(Me.ucrChkFlipCoordinates) Me.Controls.Add(Me.rdoChoroplethMap) Me.Controls.Add(Me.rdoHeatMap) - Me.Controls.Add(Me.lblPointsOptional) - Me.Controls.Add(Me.lblPointsSize) - Me.Controls.Add(Me.ucrReceiverPointsHeatMap) - Me.Controls.Add(Me.ucrNudShapeHeatMap) - Me.Controls.Add(Me.ucrChkColourPalette) - Me.Controls.Add(Me.ucrInputColourPalette) Me.Controls.Add(Me.lblFill) Me.Controls.Add(Me.ucrReceiverFill) Me.Controls.Add(Me.ucrSaveGraph) @@ -418,7 +583,6 @@ Partial Class dlgHeatMapPlot Me.Controls.Add(Me.lblLatitude) Me.Controls.Add(Me.lblReorderValue) Me.Controls.Add(Me.ucrReceiverFillChoropleth) - Me.Controls.Add(Me.ucrVariableAsFactorForHeatMap) Me.Controls.Add(Me.ucrInputReorderVariableX) Me.Controls.Add(Me.ucrInputSize) Me.Controls.Add(Me.lblLabelPosition) @@ -430,11 +594,15 @@ Partial Class dlgHeatMapPlot Me.Controls.Add(Me.lblReorderVariableX) Me.Controls.Add(Me.ucrReceiverGroup) Me.Controls.Add(Me.ucrChkAddLabels) + Me.Controls.Add(Me.ucrChkPoints) + Me.Controls.Add(Me.ucrChkFlipCoordinates) Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow Me.MaximizeBox = False Me.MinimizeBox = False Me.Name = "dlgHeatMapPlot" Me.contextMenuStripOptions.ResumeLayout(False) + Me.grpColour.ResumeLayout(False) + Me.grpColour.PerformLayout() Me.ResumeLayout(False) Me.PerformLayout() @@ -444,7 +612,6 @@ Partial Class dlgHeatMapPlot Friend WithEvents ucrReceiverX As ucrReceiverSingle Friend WithEvents lblXVariable As Label Friend WithEvents ucrSaveGraph As ucrSave - Friend WithEvents ucrVariableAsFactorForHeatMap As ucrVariablesAsFactor Friend WithEvents lblFill As Label Friend WithEvents ucrReceiverFill As ucrReceiverSingle Friend WithEvents ucrChkAddLabels As ucrCheck @@ -454,12 +621,6 @@ Partial Class dlgHeatMapPlot Friend WithEvents ucrInputColour As ucrInputComboBox Friend WithEvents ucrInputSize As ucrInputComboBox Friend WithEvents lblLabelSize As Label - Friend WithEvents ucrInputColourPalette As ucrInputComboBox - Friend WithEvents ucrChkColourPalette As ucrCheck - Friend WithEvents lblPointsOptional As Label - Friend WithEvents lblPointsSize As Label - Friend WithEvents ucrReceiverPointsHeatMap As ucrReceiverSingle - Friend WithEvents ucrNudShapeHeatMap As ucrNud Friend WithEvents lblReorderVariableX As Label Friend WithEvents ucrInputReorderVariableX As ucrInputComboBox Friend WithEvents ucrInputReorderValue As ucrInputComboBox @@ -482,4 +643,30 @@ Partial Class dlgHeatMapPlot Friend WithEvents toolStripMenuItemPlotOptions As ToolStripMenuItem Friend WithEvents toolStripMenuItemTileOptions As ToolStripMenuItem Friend WithEvents toolStripMenuItemPolygonOptions As ToolStripMenuItem + Friend WithEvents ucrInputStation As ucrInputComboBox + Friend WithEvents ucr1stFactorReceiver As ucrReceiverSingle + Friend WithEvents lblFacetBy As Label + Friend WithEvents ucrInputLegendPosition As ucrInputComboBox + Friend WithEvents ucrChkLegend As ucrCheck + Friend WithEvents lblYvariable As Label + Friend WithEvents ucrReceiverY As ucrReceiverSingle + Friend WithEvents lblHeith As Label + Friend WithEvents ucrNudHeigth As ucrNud + Friend WithEvents lblWidth As Label + Friend WithEvents ucrNudWidth As ucrNud + Friend WithEvents ucrChkJitter As ucrCheck + Friend WithEvents toolStripMenuItemJitterOptions As ToolStripMenuItem + Friend WithEvents ucrColourFrom As ucrColors + Friend WithEvents ucrColourTo As ucrColors + Friend WithEvents rdoGradient As RadioButton + Friend WithEvents grpColour As GroupBox + Friend WithEvents rdoViridis As RadioButton + Friend WithEvents ucrInputPalette As ucrInputComboBox + Friend WithEvents rdoPalette As RadioButton + Friend WithEvents ucrPnlColour As UcrPanel + Friend WithEvents ucrInputColourPalette As ucrInputComboBox + Friend WithEvents lblTo As Label + Friend WithEvents lblFrom As Label + Friend WithEvents lblValue As Label + Friend WithEvents ucrInputValue As ucrInputTextBox End Class \ No newline at end of file diff --git a/instat/dlgHeatMapPlot.resx b/instat/dlgHeatMapPlot.resx index 0aac402b5a0..c37e692f683 100644 --- a/instat/dlgHeatMapPlot.resx +++ b/instat/dlgHeatMapPlot.resx @@ -127,7 +127,7 @@ - 273, 197 + 273, 164 58, 13 @@ -148,7 +148,7 @@ $this - 23 + 28 True @@ -157,7 +157,7 @@ NoControl - 273, 284 + 273, 242 22, 13 @@ -178,7 +178,7 @@ $this - 14 + 19 True @@ -187,7 +187,7 @@ NoControl - 126, 413 + 130, 415 47, 13 @@ -208,7 +208,7 @@ $this - 31 + 35 True @@ -217,7 +217,7 @@ NoControl - 229, 413 + 233, 415 40, 13 @@ -238,7 +238,7 @@ $this - 33 + 37 True @@ -247,7 +247,7 @@ NoControl - 322, 413 + 327, 415 30, 13 @@ -268,67 +268,7 @@ $this - 35 - - - True - - - NoControl - - - 273, 328 - - - 87, 13 - - - 23 - - - Points (Optional): - - - lblPointsOptional - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - 8 - - - True - - - NoControl - - - 275, 369 - - - 30, 13 - - - 25 - - - Size: - - - lblPointsSize - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - 9 + 39 True @@ -337,7 +277,7 @@ NoControl - 273, 240 + 273, 203 48, 13 @@ -358,7 +298,7 @@ $this - 37 + 41 True @@ -367,7 +307,7 @@ NoControl - 273, 112 + 273, 87 48, 13 @@ -388,7 +328,7 @@ $this - 26 + 31 Button @@ -400,7 +340,7 @@ NoControl - 206, 12 + 206, 8 110, 28 @@ -409,7 +349,7 @@ 2 - Chorolopleth Map + Choropleth Map MiddleCenter @@ -424,7 +364,7 @@ $this - 6 + 17 Button @@ -436,7 +376,7 @@ NoControl - 99, 12 + 99, 8 110, 28 @@ -460,7 +400,7 @@ $this - 7 + 18 True @@ -469,7 +409,7 @@ NoControl - 273, 63 + 273, 44 57, 13 @@ -490,7 +430,7 @@ $this - 21 + 26 True @@ -499,7 +439,7 @@ NoControl - 273, 111 + 273, 87 48, 13 @@ -520,7 +460,7 @@ $this - 25 + 30 True @@ -529,7 +469,7 @@ NoControl - 273, 154 + 273, 126 22, 13 @@ -549,212 +489,761 @@ $this - - 4 + + 16 + + + True + + + NoControl + + + 274, 164 + + + 55, 13 + + + 16 + + + Group/ID: + + + lblGroup + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 15 + + + 17, 17 + + + 164, 92 + + + contextMenuStripOptions + + + System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 163, 22 + + + Plot Options + + + 163, 22 + + + Tile Options + + + 163, 22 + + + Polygon Options + + + 163, 22 + + + Jitter Options + + + True + + + NoControl + + + 207, 434 + + + 52, 13 + + + 89 + + + Facet By: + + + lblFacetBy + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 11 + + + True + + + NoControl + + + 273, 45 + + + 58, 13 + + + 94 + + + Y Variable: + + + lblYvariable + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 7 + + + True + + + NoControl + + + 233, 384 + + + 41, 13 + + + 99 + + + Heigth: + + + lblHeith + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 3 + + + True + + + NoControl + + + 129, 384 + + + 38, 13 + + + 97 + + + Width: + + + lblWidth + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 5 + + + True + + + 8, 382 + + + 113, 23 + + + 101 + + + ucrChkJitter + + + instat.ucrCheck, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + + $this + + + 2 + + + True + + + 278, 382 + + + 45, 20 + + + 100 + + + ucrNudHeigth + + + instat.ucrNud, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + + $this + + + 4 + + + True + + + 172, 382 + + + 45, 20 + + + 98 + + + ucrNudWidth + + + instat.ucrNud, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + + $this + + + 6 + + + True + + + True + + + 6, 13 + + + 426, 568 + + + True + + + NoControl + + + 70, 71 + + + 42, 13 + + + 121 + + + Values: + + + lblValue + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpColour + + + 0 + + + True + + + NoControl + + + 174, 71 + + + 23, 13 + + + 120 + + + To: + + + lblTo + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpColour + + + 1 + + + True + + + 116, 68 + + + 135, 21 + + + 104 + + + ucrInputValue + + + instat.ucrInputTextBox, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + + grpColour + + + 2 + + + True + + + NoControl + + + 72, 71 + + + 33, 13 + + + 119 + + + From: + + + lblFrom + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpColour + + + 3 + + + True + + + NoControl + + + 7, 16 + + + 52, 17 + + + 118 + + + Viridis + + + rdoViridis + + + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpColour + + + 4 + + + GrowAndShrink + + + 200, 67 + + + 63, 21 + + + 113 + + + ucrColourTo + + + instat.ucrColors, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + + grpColour + + + 5 + + + GrowAndShrink + + + 106, 67 + + + 63, 21 + + + 114 + + + ucrColourFrom + + + instat.ucrColors, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + + grpColour + + + 6 + + + GrowAndShrink + + + 129, 41 + + + 63, 21 + + + 117 + + + ucrInputPalette + + + instat.ucrInputComboBox, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + + grpColour + + + 7 + + + True + + + NoControl + + + 6, 42 + + + 58, 17 + + + 116 + + + Palette + + + rdoPalette + + + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpColour + + + 8 + + + True + + + NoControl + + + 6, 69 + + + 65, 17 + + + 112 + + + Gradient + + + rdoGradient + + + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpColour + + + 9 - - True + + GrowAndShrink - - 10, 379 + + 4, 13 - - 166, 23 + + 92, 77 - - 27 + + 115 - - ucrChkFlipCoordinates + + ucrPnlColour - - instat.ucrCheck, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + instat.UcrPanel, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - $this + + grpColour - - 5 + + 10 - - True + + GrowAndShrink - - True - - - 6, 13 + + 129, 14 - - 420, 562 + + 63, 21 - - True + + 109 - - 17, 17 - - - 164, 70 + + ucrInputColourPalette - - contextMenuStripOptions + + instat.ucrInputComboBox, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + grpColour - - 8, 247 + + 11 - - 149, 23 + + 8, 280 - - 41 + + 266, 96 - - Plot Options + + 103 - - cmdOptions + + Colour - - instat.ucrSplitButton, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + grpColour - + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + $this - + 1 - - True + + GrowAndShrink - - 10, 379 + + 316, 449 - - 166, 23 + + 101, 21 - - 39 + + 91 - - ucrChkPoints + + ucrInputStation - - instat.ucrCheck, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + instat.ucrInputComboBox, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - + $this - - 2 + + 9 - + True - - 273, 197 + + 204, 450 - - 55, 13 + + 0, 0, 0, 0 - - 16 + + 110, 26 - - Group/ID: + + 90 - - lblGroup + + ucr1stFactorReceiver - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + instat.ucrReceiverSingle, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - + $this - - 3 + + 10 - - True + + GrowAndShrink - - 308, 366 + + 86, 449 - - 41, 20 + + 112, 21 - - 26 + + 93 - - ucrNudShapeHeatMap + + ucrInputLegendPosition - - instat.ucrNud, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + instat.ucrInputComboBox, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - + $this - - 11 + + 12 - + True - - 10, 439 + + 8, 450 - - 128, 23 + + 98, 24 - - 35 + + 92 - - ucrChkColourPalette + + ucrChkLegend - + instat.ucrCheck, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - + $this - - 12 + + 13 - - GrowAndShrink + + True - - 141, 439 + + NoControl - - 63, 21 + + 8, 229 - - 36 + + 149, 23 - - ucrInputColourPalette + + 41 - - instat.ucrInputComboBox, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + Plot Options - + + cmdOptions + + + instat.ucrSplitButton, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + $this - - 13 + + 14 True - 273, 300 + 273, 258 0, 0, 0, 0 @@ -775,19 +1264,19 @@ $this - 15 + 20 GrowAndShrink - 10, 470 + 8, 477 4, 5, 4, 5 - 370, 32 + 370, 27 37 @@ -802,13 +1291,13 @@ $this - 16 + 21 GrowAndShrink - 8, 510 + 8, 511 410, 58 @@ -826,13 +1315,13 @@ $this - 17 + 22 GrowAndShrink - 99, 5 + 99, 3 217, 43 @@ -850,13 +1339,13 @@ $this - 18 + 23 GrowAndShrink - 273, 127 + 273, 103 93, 21 @@ -874,13 +1363,13 @@ $this - 19 + 24 True - 8, 60 + 8, 42 0, 0, 0, 0 @@ -901,13 +1390,13 @@ $this - 20 + 25 True - 273, 84 + 273, 63 0, 0, 0, 0 @@ -928,13 +1417,13 @@ $this - 22 + 27 True - 273, 127 + 273, 103 0, 0, 0, 0 @@ -955,13 +1444,13 @@ $this - 24 + 29 True - 273, 170 + 273, 142 0, 0, 0, 0 @@ -982,37 +1471,13 @@ $this - 27 - - - True - - - 273, 54 - - - 125, 138 - - - 6 - - - ucrVariableAsFactorForHeatMap - - - instat.ucrVariablesAsFactor, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - - $this - - - 28 + 32 GrowAndShrink - 273, 256 + 273, 219 93, 21 @@ -1030,13 +1495,13 @@ $this - 29 + 33 GrowAndShrink - 349, 409 + 357, 411 59, 23 @@ -1054,13 +1519,13 @@ $this - 30 + 34 GrowAndShrink - 173, 409 + 177, 411 52, 23 @@ -1078,13 +1543,13 @@ $this - 32 + 36 GrowAndShrink - 269, 409 + 279, 411 50, 23 @@ -1102,13 +1567,13 @@ $this - 34 + 38 True - 273, 213 + 273, 180 0, 0, 0, 0 @@ -1129,13 +1594,13 @@ $this - 36 + 40 True - 273, 213 + 273, 180 0, 0, 0, 0 @@ -1156,13 +1621,13 @@ $this - 38 + 42 True - 10, 409 + 8, 413 128, 23 @@ -1180,8 +1645,56 @@ $this + 43 + + + True + + + 9, 257 + + + 166, 23 + + 39 + + ucrChkPoints + + + instat.ucrCheck, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + + $this + + + 44 + + + True + + + 9, 257 + + + 166, 23 + + + 27 + + + ucrChkFlipCoordinates + + + instat.ucrCheck, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + + $this + + + 45 + CenterScreen @@ -1206,52 +1719,40 @@ System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + toolStripMenuItemJitterOptions + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + dlgHeatMapPlot System.Windows.Forms.Form, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 273, 343 + + 273, 63 - + 0, 0, 0, 0 - - 125, 20 + + 120, 20 - - 24 + + 1 - - ucrReceiverPointsHeatMap + + ucrReceiverY - + instat.ucrReceiverSingle, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - + $this - - 10 - - - 163, 22 - - - Plot Options - - - 163, 22 - - - Tile Options - - - 163, 22 - - - Polygon Options + + 8 \ No newline at end of file diff --git a/instat/dlgHeatMapPlot.vb b/instat/dlgHeatMapPlot.vb index 7ebeb13f287..aef1a4223e8 100644 --- a/instat/dlgHeatMapPlot.vb +++ b/instat/dlgHeatMapPlot.vb @@ -30,6 +30,18 @@ Public Class dlgHeatMapPlot Private ReadOnly strReverse As String = "Reverse" Private ReadOnly strNone As String = "None" + Private clsFacetFunction As New RFunction + Private clsFacetVariablesOperator As New ROperator + Private clsFacetRowOp As New ROperator + Private clsFacetColOp As New ROperator + + Private ReadOnly strFacetWrap As String = "Facet Wrap" + Private ReadOnly strFacetRow As String = "Facet Row" + Private ReadOnly strFacetCol As String = "Facet Column" + + Private bUpdateComboOptions As Boolean = True + Private bUpdatingParameters As Boolean = False + Private clsCoordPolarStartOperator, clsBaseOperator, clsPipeOperator As New ROperator Private clsCoordPolarFunction, clsAnnotateFunction, clsLocalRaesFunction, clsXScaleDateFunction, clsYScaleDateFunction, @@ -41,7 +53,8 @@ Public Class dlgHeatMapPlot clsSizeChoroplethAesFunction, clsHeatmapAesFunction, clsChoroplethAesFunction, clsXlabsFunction, clsYlabFunction, clsXScalecontinuousFunction, clsYScalecontinuousFunction, clsRFacetFunction, clsThemeFunction, clsRoundFunction, clsXRangeFunction, clsYRangeFunction, clsXMeanFunction, clsYMeanFunction, clsGroupByFunction, - clsSummariseFunction, clsDummyFunction As New RFunction + clsSummariseFunction, clsDummyFunction, clsGeomJitterFunction, clsScalefillDistillerFunction, + clsFillBrewerFunction, clsScalefillmanualFunction, clsScalefillgradientFunction As New RFunction Private Sub dlgHeatMapPlot_Load(sender As Object, e As EventArgs) Handles MyBase.Load If bFirstLoad Then @@ -65,6 +78,8 @@ Public Class dlgHeatMapPlot Dim dctLabelPositions As New Dictionary(Of String, String) Dim dctLabelSizes As New Dictionary(Of String, String) Dim dctColourPallette As New Dictionary(Of String, String) + Dim dctLegendPosition As New Dictionary(Of String, String) + Dim dctPalette As New Dictionary(Of String, String) ucrBase.iHelpTopicID = 476 ucrBase.clsRsyntax.bExcludeAssignedFunctionOutput = False @@ -73,18 +88,30 @@ Public Class dlgHeatMapPlot ucrPnlOptions.AddRadioButton(rdoHeatMap) ucrPnlOptions.AddRadioButton(rdoChoroplethMap) + ucrPnlColour.AddRadioButton(rdoViridis) + ucrPnlColour.AddRadioButton(rdoPalette) + ucrPnlColour.AddRadioButton(rdoGradient) + ucrPnlOptions.AddParameterPresentCondition(rdoHeatMap, "geom_tile") ucrPnlOptions.AddParameterPresentCondition(rdoChoroplethMap, "geom_polygon") - ucrPnlOptions.AddToLinkedControls({ucrChkAddLabels, ucrChkColourPalette}, {rdoHeatMap, rdoChoroplethMap}) + ucrPnlColour.AddParameterValuesCondition(rdoPalette, "Check", "palette") + ucrPnlColour.AddParameterValuesCondition(rdoViridis, "Check", "viridis") + ucrPnlColour.AddParameterValuesCondition(rdoGradient, "Check", "gradient") + + ucrPnlOptions.AddToLinkedControls(ucrChkAddLabels, {rdoHeatMap, rdoChoroplethMap}) ucrPnlOptions.AddToLinkedControls({ucrChkPoints, ucrReceiverFillChoropleth, ucrReceiverLongitude, ucrReceiverLatitude, ucrReceiverGroup}, {rdoChoroplethMap}, bNewLinkedHideIfParameterMissing:=True, bNewLinkedAddRemoveParameter:=True) - ucrPnlOptions.AddToLinkedControls({ucrChkColourPalette, ucrChkFlipCoordinates, ucrInputReorderValue, ucrReceiverPointsHeatMap, ucrReceiverFill, ucrInputReorderVariableX, ucrReceiverX, ucrVariableAsFactorForHeatMap}, {rdoHeatMap}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) + ucrPnlOptions.AddToLinkedControls({ucrChkFlipCoordinates, ucrInputReorderValue, ucrReceiverFill, ucrInputReorderVariableX, ucrReceiverX, ucrReceiverY}, {rdoHeatMap}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) + ucrPnlOptions.AddToLinkedControls(ucrPnlColour, {rdoHeatMap, rdoChoroplethMap}) + ucrPnlColour.AddToLinkedControls(ucrInputPalette, {rdoPalette}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:="Blues") + ucrPnlColour.AddToLinkedControls(ucrInputColourPalette, {rdoViridis}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:="Viridis") + ucrPnlColour.AddToLinkedControls({ucrColourFrom, ucrColourTo}, {rdoGradient}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:="Black") + ucrPnlColour.AddToLinkedControls(ucrInputValue, {rdoGradient}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:="") ucrReceiverX.SetLinkedDisplayControl(lblXVariable) ucrReceiverLatitude.SetLinkedDisplayControl(lblLatitude) ucrReceiverLongitude.SetLinkedDisplayControl(lblLongitude) ucrReceiverFill.SetLinkedDisplayControl(lblFill) ucrReceiverFillChoropleth.SetLinkedDisplayControl(lblFillChoropleth) - ucrReceiverPointsHeatMap.SetLinkedDisplayControl(lblPointsOptional) ucrReceiverGroup.SetLinkedDisplayControl(lblGroup) ucrHeatMapSelector.SetParameter(New RParameter("data", 0)) @@ -116,30 +143,19 @@ Public Class dlgHeatMapPlot ucrReceiverGroup.SetParameterIsString() ucrReceiverGroup.bWithQuotes = False - ucrVariableAsFactorForHeatMap.Selector = ucrHeatMapSelector - ucrVariableAsFactorForHeatMap.SetFactorReceiver(ucrReceiverX) - ucrVariableAsFactorForHeatMap.SetParameter(New RParameter("y", 1)) - ucrVariableAsFactorForHeatMap.SetParameterIsString() - ucrVariableAsFactorForHeatMap.bChangeParameterValue = False - ucrVariableAsFactorForHeatMap.bWithQuotes = False - ucrVariableAsFactorForHeatMap.SetValuesToIgnore({Chr(34) & Chr(34)}) - ucrVariableAsFactorForHeatMap.bAddParameterIfEmpty = True + ucrReceiverY.Selector = ucrHeatMapSelector + ucrReceiverY.SetParameter(New RParameter("y", 1)) + ucrReceiverY.SetParameterIsString() + ucrReceiverY.bChangeParameterValue = False + ucrReceiverY.bWithQuotes = False + ucrReceiverY.SetValuesToIgnore({Chr(34) & Chr(34)}) + ucrReceiverY.bAddParameterIfEmpty = True ucrReceiverFill.Selector = ucrHeatMapSelector ucrReceiverFill.SetParameter(New RParameter("fill", 2)) ucrReceiverFill.SetParameterIsString() ucrReceiverFill.bWithQuotes = False - ucrReceiverPointsHeatMap.Selector = ucrHeatMapSelector - ucrReceiverPointsHeatMap.SetParameter(New RParameter("size", 0)) - ucrReceiverPointsHeatMap.SetParameterIsString() - ucrReceiverPointsHeatMap.bWithQuotes = False - ucrReceiverPointsHeatMap.AddToLinkedControls(ucrNudShapeHeatMap, {True}, bNewLinkedHideIfParameterMissing:=True) - - ucrNudShapeHeatMap.SetParameter(New RParameter("size", 2)) - ucrNudShapeHeatMap.Visible = False - ucrNudShapeHeatMap.SetLinkedDisplayControl(lblPointsSize) - ucrSaveGraph.SetPrefix("heatmap") ucrSaveGraph.SetSaveTypeAsGraph() ucrSaveGraph.SetIsComboBox() @@ -173,6 +189,9 @@ Public Class dlgHeatMapPlot dctColourPallette.Add("Inferno", Chr(34) & "inferno" & Chr(34)) dctColourPallette.Add("Plasma", Chr(34) & "plasma" & Chr(34)) dctColourPallette.Add("Cividis", Chr(34) & "cividis" & Chr(34)) + dctColourPallette.Add("mako", Chr(34) & "mako" & Chr(34)) + dctColourPallette.Add("rocket", Chr(34) & "rocket" & Chr(34)) + dctColourPallette.Add("turbo", Chr(34) & "turbo" & Chr(34)) ucrInputColourPalette.SetItems(dctColourPallette) ucrInputColourPalette.SetDropDownStyleAsNonEditable() @@ -180,16 +199,11 @@ Public Class dlgHeatMapPlot ucrChkPoints.AddParameterValuesCondition(True, "choropleth_geom_point", "True") ucrChkPoints.AddParameterValuesCondition(False, "choropleth_geom_point", "False") - ucrChkColourPalette.SetText("Colour Palette") - ucrChkColourPalette.AddParameterPresentCondition(True, "option") - ucrChkColourPalette.AddParameterPresentCondition(False, "option", False) - ucrChkAddLabels.SetText("Add Labels") ucrChkAddLabels.AddParameterPresentCondition(True, "geom_text") ucrChkAddLabels.AddParameterPresentCondition(False, "geom_text", False) ucrChkAddLabels.AddToLinkedControls({ucrInputPosition, ucrInputSize, ucrInputColour}, {True}, bNewLinkedHideIfParameterMissing:=True) - ucrChkColourPalette.AddToLinkedControls({ucrInputColourPalette}, {True}, bNewLinkedHideIfParameterMissing:=True, bNewLinkedAddRemoveParameter:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:="Viridis") ucrInputColour.SetLinkedDisplayControl(lblLabelColour) ucrInputPosition.SetLinkedDisplayControl(lblLabelPosition) ucrInputSize.SetLinkedDisplayControl(lblLabelSize) @@ -202,12 +216,109 @@ Public Class dlgHeatMapPlot ucrInputReorderVariableX.SetDropDownStyleAsNonEditable() ucrInputReorderVariableX.SetLinkedDisplayControl(lblReorderVariableX) + 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) + + ucr1stFactorReceiver.SetParameter(New RParameter("var1")) + ucr1stFactorReceiver.Selector = ucrHeatMapSelector + ucr1stFactorReceiver.SetIncludedDataTypes({"factor"}) + ucr1stFactorReceiver.strSelectorHeading = "Factors" + ucr1stFactorReceiver.bWithQuotes = False + ucr1stFactorReceiver.SetParameterIsString() + ucr1stFactorReceiver.SetValuesToIgnore({"."}) + ucr1stFactorReceiver.SetParameterPosition(1) + ucr1stFactorReceiver.SetLinkedDisplayControl(lblFacetBy) + + ucrInputStation.SetItems({strFacetWrap, strFacetRow, strFacetCol, strNone}) + ucrInputStation.SetDropDownStyleAsNonEditable() + clsCoordFlipFunction.SetPackageName("ggplot2") clsCoordFlipFunction.SetRCommand("coord_flip") clsCoordFlipParam.SetArgumentName("coord_flip") clsCoordFlipParam.SetArgument(clsCoordFlipFunction) ucrChkFlipCoordinates.SetText("Swap x and y") ucrChkFlipCoordinates.SetParameter(clsCoordFlipParam, bNewChangeParameterValue:=False, bNewAddRemoveParameter:=True) + + ucrChkJitter.SetText("Add Jitter") + ucrChkJitter.AddToLinkedControls({ucrNudHeigth, ucrNudWidth}, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) + ucrChkLegend.AddParameterPresentCondition(True, "geom_jitter") + ucrChkLegend.AddParameterPresentCondition(False, "ggeom_jitter", False) + + ucrNudHeigth.SetParameter(New RParameter("height", 5)) + ucrNudHeigth.Maximum = 0.5 + ucrNudHeigth.Minimum = 0 + ucrNudHeigth.Increment = 0.01 + ucrNudHeigth.DecimalPlaces = 2 + ucrNudHeigth.SetLinkedDisplayControl(lblHeith) + ucrNudHeigth.SetRDefault(0.4) + + ucrNudWidth.SetParameter(New RParameter("width", 6)) + ucrNudWidth.Maximum = 0.5 + ucrNudWidth.Minimum = 0 + ucrNudWidth.Increment = 0.01 + ucrNudWidth.DecimalPlaces = 2 + ucrNudWidth.SetLinkedDisplayControl(lblWidth) + ucrNudWidth.SetRDefault(0.4) + + ucrInputPalette.SetParameter(New RParameter("palette", 10)) + ucrInputPalette.SetDropDownStyleAsNonEditable() + dctPalette.Add("Blues", Chr(34) & "Blues" & Chr(34)) + dctPalette.Add("Greens", Chr(34) & "Greens" & Chr(34)) + dctPalette.Add("Greys", Chr(34) & "Greys" & Chr(34)) + dctPalette.Add("Oranges", Chr(34) & "Oranges" & Chr(34)) + dctPalette.Add("Purples", Chr(34) & "Purples" & Chr(34)) + dctPalette.Add("Reds", Chr(34) & "Reds" & Chr(34)) + dctPalette.Add("BuGn", Chr(34) & "BuGn" & Chr(34)) + dctPalette.Add("BuPu", Chr(34) & "BuPu" & Chr(34)) + dctPalette.Add("GnBu", Chr(34) & "GnBu" & Chr(34)) + dctPalette.Add("OrRd", Chr(34) & "OrRd" & Chr(34)) + dctPalette.Add("PuBu", Chr(34) & "PuBu" & Chr(34)) + dctPalette.Add("PuBuGn", Chr(34) & "PuBuGn" & Chr(34)) + dctPalette.Add("PuRd", Chr(34) & "PuRd" & Chr(34)) + dctPalette.Add("RdPu", Chr(34) & "RdPu" & Chr(34)) + dctPalette.Add("YlGn", Chr(34) & "YlGn" & Chr(34)) + dctPalette.Add("YlGnBu", Chr(34) & "YlGnBu" & Chr(34)) + dctPalette.Add("YlOrBr", Chr(34) & "YlOrBr" & Chr(34)) + dctPalette.Add("YlOrRd", Chr(34) & "YlOrRd" & Chr(34)) + dctPalette.Add("Spectral", Chr(34) & "Spectral" & Chr(34)) + dctPalette.Add("BrBG", Chr(34) & "BrBG" & Chr(34)) + dctPalette.Add("PiYG", Chr(34) & "PiYG" & Chr(34)) + dctPalette.Add("PRGn", Chr(34) & "PRGn" & Chr(34)) + dctPalette.Add("PuOr", Chr(34) & "PuOr" & Chr(34)) + dctPalette.Add("RdBu", Chr(34) & "RdBu" & Chr(34)) + dctPalette.Add("RdGy", Chr(34) & "RdGy" & Chr(34)) + dctPalette.Add("RdYlBu", Chr(34) & "RdYlBu" & Chr(34)) + dctPalette.Add("RdYlGn", Chr(34) & "RdYlGn" & Chr(34)) + dctPalette.Add("Accent", Chr(34) & "Accent" & Chr(34)) + dctPalette.Add("Dark2", Chr(34) & "Dark2" & Chr(34)) + dctPalette.Add("Pastel1", Chr(34) & "Pastel1" & Chr(34)) + dctPalette.Add("Pastel2", Chr(34) & "Pastel2" & Chr(34)) + dctPalette.Add("Set1", Chr(34) & "Set1" & Chr(34)) + dctPalette.Add("Set2", Chr(34) & "Set2" & Chr(34)) + dctPalette.Add("Set3", Chr(34) & "Set3" & Chr(34)) + ucrInputPalette.SetItems(dctPalette) + + ucrColourFrom.SetParameter(New RParameter("low", 8)) + ucrColourFrom.SetColours() + ucrColourFrom.SetLinkedDisplayControl(lblFrom) + + ucrColourTo.SetParameter(New RParameter("high", 9)) + ucrColourTo.SetColours() + ucrColourTo.SetLinkedDisplayControl(lblTo) + + ucrInputValue.SetParameter(New RParameter("values", )) + ucrInputValue.SetValidationTypeAsList() + ucrInputValue.SetLinkedDisplayControl(lblValue) End Sub Private Sub SetDefaults() @@ -240,9 +351,20 @@ Public Class dlgHeatMapPlot clsGroupByFunction = New RFunction clsSummariseFunction = New RFunction clsDummyFunction = New RFunction + clsFacetFunction = New RFunction + clsFacetVariablesOperator = New ROperator + clsFacetRowOp = New ROperator + clsFacetColOp = New ROperator + clsGeomJitterFunction = New RFunction + clsScalefillDistillerFunction = New RFunction + clsFillBrewerFunction = New RFunction + clsScalefillgradientFunction = New RFunction + + ucrInputStation.SetName(strFacetWrap) + ucrInputStation.bUpdateRCodeFromControl = True ucrSaveGraph.Reset() - ucrVariableAsFactorForHeatMap.SetMeAsReceiver() + ucrReceiverY.SetMeAsReceiver() ucrHeatMapSelector.Reset() ucrHeatMapSelector.SetGgplotFunction(clsBaseOperator) bResetSubdialog = True @@ -268,6 +390,11 @@ Public Class dlgHeatMapPlot clsRgeomTileFunction.SetPackageName("ggplot2") clsRgeomTileFunction.SetRCommand("geom_tile") + clsGeomJitterFunction.SetPackageName("ggplot2") + clsGeomJitterFunction.SetRCommand("geom_jitter") + clsGeomJitterFunction.AddParameter("width", 0.4, iPosition:=0) + clsGeomJitterFunction.AddParameter("height", 0.4, iPosition:=1) + clsGeomTextFunction.SetPackageName("ggplot2") clsGeomTextFunction.SetRCommand("geom_text") clsGeomTextFunction.AddParameter("mapping", clsRFunctionParameter:=clsLabelAesFunction, iPosition:=1) @@ -303,6 +430,15 @@ Public Class dlgHeatMapPlot clsColourPaletteFunction.SetPackageName("viridis") clsColourPaletteFunction.SetRCommand("scale_fill_viridis") + clsScalefillDistillerFunction.SetPackageName("ggplot2") + clsScalefillDistillerFunction.SetRCommand("scale_fill_distiller") + + clsFillBrewerFunction.SetPackageName("ggplot2") + clsFillBrewerFunction.SetRCommand("scale_fill_brewer") + + clsScalefillgradientFunction.SetPackageName("ggplot2") + clsScalefillgradientFunction.SetRCommand("scale_fill_gradient") + clsForecatsReverseFunction.SetPackageName("forcats") clsForecatsReverseFunction.SetRCommand("fct_rev") @@ -327,6 +463,7 @@ Public Class dlgHeatMapPlot clsGroupFunction.SetRCommand("aes") clsDummyFunction.AddParameter("choropleth_geom_point", False, iPosition:=0) + clsDummyFunction.AddParameter("Check", "viridis", iPosition:=1) clsPipeOperator.SetOperation("%>%") clsPipeOperator.AddParameter("data", ucrHeatMapSelector.ucrAvailableDataFrames.cboAvailableDataFrames.Text, iPosition:=0) @@ -352,6 +489,10 @@ Public Class dlgHeatMapPlot clsYRangeFunction.SetRCommand("range") + clsScalefillmanualFunction = New RFunction + clsScalefillmanualFunction.SetRCommand("scale_fill_manual") + clsScalefillmanualFunction.AddParameter("aesthetics", Chr(34) & "fill" & Chr(34), iPosition:=1) + clsGeomPointSizeChoroplethFunction.SetPackageName("ggplot2") clsGeomPointSizeChoroplethFunction.SetRCommand("geom_point") clsGeomPointSizeChoroplethFunction.AddParameter("data", clsROperatorParameter:=clsPipeOperator, iPosition:=0) @@ -362,6 +503,22 @@ Public Class dlgHeatMapPlot clsSizeChoroplethAesFunction.AddParameter("x", "x", iPosition:=0) clsSizeChoroplethAesFunction.AddParameter("y", "y", iPosition:=1) + clsFacetFunction.SetPackageName("ggplot2") + clsFacetRowOp.SetOperation("+") + clsFacetRowOp.bBrackets = False + clsFacetColOp.SetOperation("+") + clsFacetColOp.bBrackets = False + clsFacetVariablesOperator.SetOperation("~") + clsFacetVariablesOperator.bForceIncludeOperation = True + clsFacetVariablesOperator.bBrackets = False + clsFacetFunction.AddParameter("facets", clsROperatorParameter:=clsFacetVariablesOperator, iPosition:=0) + + ' clsPipeOperator.SetOperation("%>%") + SetPipeAssignTo() + + 'clsGroupByFunction.SetPackageName("dplyr") + 'clsGroupByFunction.SetRCommand("group_by") + clsBaseOperator.AddParameter(GgplotDefaults.clsDefaultThemeParameter.Clone()) clsXlabsFunction = GgplotDefaults.clsXlabTitleFunction.Clone() @@ -394,16 +551,16 @@ Public Class dlgHeatMapPlot ucrReceiverFillChoropleth.AddAdditionalCodeParameterPair(clsGroupByFunction, New RParameter("x", 0, bNewIncludeArgumentName:=False), iAdditionalPairNo:=2) ucrReceiverFillChoropleth.AddAdditionalCodeParameterPair(clsLabelAesFunction, New RParameter("label", 0), iAdditionalPairNo:=3) - ucrReceiverPointsHeatMap.AddAdditionalCodeParameterPair(clsShapeHeatMapAesFunction, New RParameter("shape", 0), iAdditionalPairNo:=1) - ucrReceiverX.AddAdditionalCodeParameterPair(clsReorderFunction, New RParameter("x", 0), iAdditionalPairNo:=1) - ucrVariableAsFactorForHeatMap.AddAdditionalCodeParameterPair(clsReorderValueFunction, New RParameter("x", 0), iAdditionalPairNo:=1) + ucrReceiverY.AddAdditionalCodeParameterPair(clsReorderValueFunction, New RParameter("x", 0), iAdditionalPairNo:=1) ucrReceiverLongitude.AddAdditionalCodeParameterPair(clsXRangeFunction, New RParameter("x", 0, bNewIncludeArgumentName:=False), iAdditionalPairNo:=1) ucrReceiverLatitude.AddAdditionalCodeParameterPair(clsYRangeFunction, New RParameter("x", 0, bNewIncludeArgumentName:=False), iAdditionalPairNo:=1) + ucrInputPalette.AddAdditionalCodeParameterPair(clsScalefillDistillerFunction, New RParameter("palette", 10)) + ucrSaveGraph.SetRCode(clsBaseOperator, bReset) ucrHeatMapSelector.SetRCode(clsRggplotFunction, bReset) @@ -411,7 +568,7 @@ Public Class dlgHeatMapPlot ucrReceiverX.SetRCode(clsHeatmapAesFunction, bReset) ucrReceiverLongitude.SetRCode(clsChoroplethAesFunction, bReset) ucrReceiverLatitude.SetRCode(clsChoroplethAesFunction, bReset) - ucrVariableAsFactorForHeatMap.SetRCode(clsHeatmapAesFunction, bReset) + ucrReceiverY.SetRCode(clsHeatmapAesFunction, bReset) ucrReceiverFill.SetRCode(clsHeatmapAesFunction, bReset) ucrReceiverFillChoropleth.SetRCode(clsChoroplethAesFunction, bReset) ucrReceiverGroup.SetRCode(clsGroupFunction, bReset) @@ -420,14 +577,21 @@ Public Class dlgHeatMapPlot ucrInputColour.SetRCode(clsGeomTextFunction, bReset) ucrInputPosition.SetRCode(clsGeomTextFunction, bReset) ucrInputSize.SetRCode(clsGeomTextFunction, bReset) - ucrChkColourPalette.SetRCode(clsColourPaletteFunction, bReset) ucrInputColourPalette.SetRCode(clsColourPaletteFunction, bReset) - ucrReceiverPointsHeatMap.SetRCode(clsSizeHeatMapAesFunction, bReset) - ucrNudShapeHeatMap.SetRCode(clsGeomPointShapeHeatMapFunction, bReset) ucrChkFlipCoordinates.SetRCode(clsBaseOperator, bReset) + ucrChkLegend.SetRCode(clsThemeFunction, bReset, bCloneIfNeeded:=True) + ucrInputLegendPosition.SetRCode(clsThemeFunction, bReset, bCloneIfNeeded:=True) + If bReset Then + ucrNudHeigth.SetRCode(clsGeomJitterFunction, bReset) + ucrNudWidth.SetRCode(clsGeomJitterFunction, bReset) + ucrChkJitter.SetRCode(clsGeomJitterFunction, bReset) + ucrPnlColour.SetRCode(clsDummyFunction, bReset) + End If + ucrColourFrom.SetRCode(clsScalefillgradientFunction, bReset) + ucrColourTo.SetRCode(clsScalefillgradientFunction, bReset) + ucrInputPalette.SetRCode(clsFillBrewerFunction, bReset) + ucrInputValue.SetRCode(clsScalefillmanualFunction, bReset, bCloneIfNeeded:=True) bRCodeSet = True - - UnstackColumns() End Sub Private Sub TestOkEnabled() @@ -437,7 +601,7 @@ Public Class dlgHeatMapPlot End If If rdoHeatMap.Checked Then - ucrBase.OKEnabled(Not ucrVariableAsFactorForHeatMap.IsEmpty AndAlso Not ucrReceiverX.IsEmpty) + ucrBase.OKEnabled(Not ucrReceiverY.IsEmpty AndAlso Not ucrReceiverX.IsEmpty) Else If Not ucrReceiverLongitude.IsEmpty AndAlso Not ucrReceiverLatitude.IsEmpty Then ucrBase.OKEnabled(Not ucrChkAddLabels.Checked _ @@ -454,6 +618,18 @@ Public Class dlgHeatMapPlot 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 + Private Sub ucrChkAddLabels_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkAddLabels.ControlValueChanged If ucrChkAddLabels.Checked Then clsBaseOperator.AddParameter("geom_text", clsRFunctionParameter:=clsGeomTextFunction, iPosition:=5) @@ -464,26 +640,23 @@ Public Class dlgHeatMapPlot Private Sub TempOptionsDisabledInMultipleVariablesCase() cmdOptions.Enabled = True - toolStripMenuItemTileOptions.Enabled = rdoHeatMap.Checked AndAlso ucrVariableAsFactorForHeatMap.bSingleVariable + toolStripMenuItemTileOptions.Enabled = rdoHeatMap.Checked toolStripMenuItemPolygonOptions.Enabled = rdoChoroplethMap.Checked - End Sub - - Private Sub UcrVariablesAsFactor_ControlValueChanged() Handles ucrVariableAsFactorForHeatMap.ControlValueChanged, ucrPnlOptions.ControlValueChanged - TempOptionsDisabledInMultipleVariablesCase() + toolStripMenuItemJitterOptions.Enabled = ucrChkJitter.Checked End Sub Private Sub cmdOptions_Click(sender As Object, e As EventArgs) Handles cmdOptions.Click, toolStripMenuItemPlotOptions.Click sdgPlots.SetRCode(clsBaseOperator, clsNewYScalecontinuousFunction:=clsYScalecontinuousFunction, clsNewXScalecontinuousFunction:=clsXScalecontinuousFunction, clsNewGlobalAesFunction:=If(rdoHeatMap.Checked, clsHeatmapAesFunction, clsChoroplethAesFunction), clsNewXLabsTitleFunction:=clsXlabsFunction, clsNewScaleFillViridisFunction:=clsScaleFillViridisFunction, clsNewScaleColourViridisFunction:=clsScaleColourViridisFunction, clsNewYLabTitleFunction:=clsYlabFunction, clsNewLabsFunction:=clsLabsFunction, - clsNewFacetFunction:=clsRFacetFunction, clsNewThemeFunction:=clsThemeFunction, dctNewThemeFunctions:=dctThemeFunctions, ucrNewBaseSelector:=ucrHeatMapSelector, + clsNewFacetFunction:=clsRFacetFunction, clsNewThemeFunction:=clsThemeFunction, dctNewThemeFunctions:=dctThemeFunctions, ucrNewBaseSelector:=ucrHeatMapSelector, clsNewFacetVariablesOperator:=clsFacetVariablesOperator, strMainDialogGeomParameterNames:=strGeomParameterNames, clsNewCoordPolarFunction:=clsCoordPolarFunction, clsNewCoordPolarStartOperator:=clsCoordPolarStartOperator, - clsNewAnnotateFunction:=clsAnnotateFunction, clsNewXScaleDateFunction:=clsXScaleDateFunction, clsNewYScaleDateFunction:=clsYScaleDateFunction, bReset:=bResetSubdialog) + clsNewAnnotateFunction:=clsAnnotateFunction, clsNewXScaleDateFunction:=clsXScaleDateFunction, clsNewYScaleDateFunction:=clsYScaleDateFunction, bChangeAesParameter:=True, bReset:=bResetSubdialog) sdgPlots.ShowDialog() bResetSubdialog = False End Sub - Private Sub toolStripMenuItemTileOptions_Click(sender As Object, e As EventArgs) Handles toolStripMenuItemTileOptions.Click, toolStripMenuItemPolygonOptions.Click + Private Sub toolStripMenuItemTileOptions_Click(sender As Object, e As EventArgs) Handles toolStripMenuItemTileOptions.Click, toolStripMenuItemPolygonOptions.Click, toolStripMenuItemJitterOptions.Click ''''''' i wonder if all this will be needed for the new system sdgLayerOptions.SetupLayer(clsNewGgPlot:=clsRggplotFunction, @@ -496,8 +669,8 @@ Public Class dlgHeatMapPlot bResetRugLayerSubdialog = False If rdoHeatMap.Checked Then For Each clsParam In clsHeatmapAesFunction.clsParameters - If clsParam.strArgumentName = "y" AndAlso (clsParam.strArgumentValue <> "value" OrElse ucrVariableAsFactorForHeatMap.bSingleVariable) Then - ucrVariableAsFactorForHeatMap.Add(clsParam.strArgumentValue) + If clsParam.strArgumentName = "y" AndAlso clsParam.strArgumentValue <> "value" Then + ucrReceiverY.Add(clsParam.strArgumentValue) ElseIf clsParam.strArgumentName = "x" Then ucrReceiverX.Add(clsParam.strArgumentValue) ElseIf clsParam.strArgumentName = "fill" Then @@ -519,31 +692,7 @@ Public Class dlgHeatMapPlot End If End Sub - Private Sub ucrChkColourPalette_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkColourPalette.ControlValueChanged - If ucrChkColourPalette.Checked Then - clsBaseOperator.AddParameter("palette", clsRFunctionParameter:=clsColourPaletteFunction, iPosition:=6) - Else - clsBaseOperator.RemoveParameterByName("palette") - End If - End Sub - - Private Sub ucrReceiverPoints_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrReceiverPointsHeatMap.ControlValueChanged, ucrPnlOptions.ControlValueChanged - If bRCodeSet Then - clsBaseOperator.RemoveParameterByName("heatmap_geom_point") - MakeNudVisible() - If ucrReceiverPointsHeatMap.IsEmpty OrElse Not rdoHeatMap.Checked Then - Exit Sub - ElseIf ucrReceiverPointsHeatMap.strCurrDataType = "numeric" Then - clsBaseOperator.AddParameter("heatmap_geom_point", clsRFunctionParameter:=clsGeomPointSizeHeatMapFunction, iPosition:=7) - ElseIf ucrReceiverPointsHeatMap.strCurrDataType = "factor" Then - clsBaseOperator.AddParameter("heatmap_geom_point", clsRFunctionParameter:=clsGeomPointShapeHeatMapFunction, iPosition:=7) - Else - clsBaseOperator.RemoveParameterByName("heatmap_geom_point") - End If - End If - End Sub - - Private Sub ucrPnlOptions_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrPnlOptions.ControlValueChanged, ucrReceiverX.ControlValueChanged, ucrReceiverFill.ControlValueChanged, ucrInputReorderVariableX.ControlValueChanged, ucrInputReorderValue.ControlValueChanged + Private Sub ucrPnlOptions_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrPnlOptions.ControlValueChanged, ucrReceiverX.ControlValueChanged, ucrReceiverFill.ControlValueChanged, ucrInputReorderVariableX.ControlValueChanged, ucrInputReorderValue.ControlValueChanged, ucrReceiverY.ControlValueChanged clsGeomTextFunction.RemoveParameterByName("data") clsLabelAesFunction.RemoveParameterByName("x") clsLabelAesFunction.RemoveParameterByName("y") @@ -565,17 +714,6 @@ Public Class dlgHeatMapPlot ucrSaveGraph.SetPrefix("choroplethmap") End If - UnstackColumns() - End Sub - - Private Sub ucrVariableAsFactorForHeatMap_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrVariableAsFactorForHeatMap.ControlValueChanged - MakeVisible() - End Sub - - Private Sub MakeVisible() - If rdoHeatMap.Checked Then - ucrInputReorderValue.Visible = If(ucrVariableAsFactorForHeatMap.bSingleVariable, True, False) - End If End Sub Private Sub ucrReceiverLongitude_ControlContentsChanged() Handles ucrReceiverLongitude.ControlContentsChanged, ucrPnlOptions.ControlContentsChanged @@ -584,15 +722,9 @@ Public Class dlgHeatMapPlot End If End Sub - Private Sub ucrVariableAsFactorForHeatMap_ControlContentsChanged() Handles ucrVariableAsFactorForHeatMap.ControlContentsChanged, ucrPnlOptions.ControlContentsChanged - If rdoHeatMap.Checked Then - ucrVariableAsFactorForHeatMap.SetMeAsReceiver() - End If - End Sub - - Private Sub MakeNudVisible() + Private Sub ucrReceiverY_ControlContentsChanged() Handles ucrReceiverY.ControlContentsChanged, ucrPnlOptions.ControlContentsChanged If rdoHeatMap.Checked Then - ucrNudShapeHeatMap.Visible = If(Not ucrReceiverPointsHeatMap.IsEmpty AndAlso ucrReceiverPointsHeatMap.strCurrDataType = "factor", True, False) + ucrReceiverY.SetMeAsReceiver() End If End Sub @@ -606,17 +738,17 @@ Public Class dlgHeatMapPlot clsReorderValueFunction.AddParameter("X", "-" & ucrReceiverX.GetVariableNames(False), iPosition:=1) clsHeatmapAesFunction.AddParameter("y", clsRFunctionParameter:=clsReorderValueFunction, iPosition:=0) Case strReverse - clsForecatsReverseValueFunction.AddParameter("f", ucrVariableAsFactorForHeatMap.GetVariableNames(False), iPosition:=0) + clsForecatsReverseValueFunction.AddParameter("f", ucrReceiverY.GetVariableNames(False), iPosition:=0) clsHeatmapAesFunction.AddParameter("y", clsRFunctionParameter:=clsForecatsReverseValueFunction, iPosition:=0) Case strNone - clsHeatmapAesFunction.AddParameter("y", ucrVariableAsFactorForHeatMap.GetVariableNames(False), iPosition:=0) + clsHeatmapAesFunction.AddParameter("y", ucrReceiverY.GetVariableNames(False), iPosition:=0) End Select Select Case ucrInputReorderVariableX.GetText() Case strAscending - clsReorderFunction.AddParameter("X", ucrVariableAsFactorForHeatMap.GetVariableNames(False), iPosition:=1) + clsReorderFunction.AddParameter("X", ucrReceiverY.GetVariableNames(False), iPosition:=1) clsHeatmapAesFunction.AddParameter("x", clsRFunctionParameter:=clsReorderFunction, iPosition:=0) Case strDescending - clsReorderFunction.AddParameter("X", "-" & ucrVariableAsFactorForHeatMap.GetVariableNames(False), iPosition:=1) + clsReorderFunction.AddParameter("X", "-" & ucrReceiverY.GetVariableNames(False), iPosition:=1) clsHeatmapAesFunction.AddParameter("x", clsRFunctionParameter:=clsReorderFunction, iPosition:=0) Case strReverse clsForecatsReverseFunction.AddParameter("f", ucrReceiverX.GetVariableNames(False), iPosition:=0) @@ -627,36 +759,172 @@ Public Class dlgHeatMapPlot End If End Sub - Private Sub ucrPnlOptions_ControlValueChanged() Handles ucrPnlOptions.ControlValueChanged, ucrVariableAsFactorForHeatMap.ControlValueChanged, + Private Sub ucrPnlOptions_ControlValueChanged() Handles ucrPnlOptions.ControlValueChanged, ucrReceiverY.ControlValueChanged, ucrReceiverX.ControlValueChanged, ucrReceiverFill.ControlValueChanged, ucrChkAddLabels.ControlValueChanged, ucrInputReorderValue.ControlValueChanged, ucrInputReorderVariableX.ControlValueChanged - MakeNudVisible() UpdateParameter() - MakeVisible() AddRemoveGeomParameter() + ChangePalette() + Visibility() + End Sub + + Private Sub AutoFacetStation() + Dim currentReceiver As ucrReceiver = ucrHeatMapSelector.CurrentReceiver + + If currentReceiver IsNot Nothing Then + ucr1stFactorReceiver.AddItemsWithMetadataProperty(ucrHeatMapSelector.ucrAvailableDataFrames.cboAvailableDataFrames.Text, "Climatic_Type", {"station_label"}) + currentReceiver.SetMeAsReceiver() + AddRemoveGroupBy() + End If End Sub - Private Sub UnstackColumns() - If Not bRCodeSet Then + Private Sub ucrInput_ControlValueChanged(ucrChangedControl As ucrInputComboBox) Handles ucrInputStation.ControlValueChanged + If Not bUpdateComboOptions Then Exit Sub End If - If rdoChoroplethMap.Checked Then - If Not ucrVariableAsFactorForHeatMap.bSingleVariable Then - ucrHeatMapSelector.ucrAvailableDataFrames.clsCurrDataFrame.RemoveParameterByName("measure.vars") - ucrHeatMapSelector.ucrAvailableDataFrames.clsCurrDataFrame.RemoveParameterByName("stack_data") + Dim strChangedText As String = ucrChangedControl.GetText() + If strChangedText <> strNone Then + If Not strChangedText = strFacetCol AndAlso Not strChangedText = strFacetRow AndAlso + Not ucrInputStation.Equals(ucrChangedControl) AndAlso ucrInputStation.GetText() = strChangedText Then + bUpdateComboOptions = False + ucrInputStation.SetName(strNone) + bUpdateComboOptions = True + End If + If (strChangedText = strFacetWrap AndAlso ucrInputStation.GetText = strFacetRow) OrElse (strChangedText = strFacetRow AndAlso + ucrInputStation.GetText = strFacetWrap) OrElse (strChangedText = strFacetWrap AndAlso + ucrInputStation.GetText = strFacetCol) OrElse (strChangedText = strFacetCol AndAlso ucrInputStation.GetText = strFacetWrap) Then + ucrInputStation.SetName(strNone) End If + End If + UpdateParameters() + AddRemoveFacets() + AddRemoveGroupBy() + End Sub + + Private Sub UpdateParameters() + clsFacetVariablesOperator.RemoveParameterByName("var1") + clsFacetColOp.RemoveParameterByName("col" & ucrInputStation.Name) + clsFacetRowOp.RemoveParameterByName("row" & ucrInputStation.Name) + + clsBaseOperator.RemoveParameterByName("facets") + bUpdatingParameters = True + ucr1stFactorReceiver.SetRCode(Nothing) + Select Case ucrInputStation.GetText() + Case strFacetWrap + ucr1stFactorReceiver.ChangeParameterName("var1") + ucr1stFactorReceiver.SetRCode(clsFacetVariablesOperator) + Case strFacetCol + ucr1stFactorReceiver.ChangeParameterName("col" & ucrInputStation.Name) + ucr1stFactorReceiver.SetRCode(clsFacetColOp) + Case strFacetRow + ucr1stFactorReceiver.ChangeParameterName("row" & ucrInputStation.Name) + ucr1stFactorReceiver.SetRCode(clsFacetRowOp) + End Select + If Not clsHeatmapAesFunction.ContainsParameter("x") Then + clsHeatmapAesFunction.AddParameter("x", Chr(34) & Chr(34)) + End If + bUpdatingParameters = False + End Sub + + Private Sub AddRemoveFacets() + Dim bWrap As Boolean = False + Dim bCol As Boolean = False + Dim bRow As Boolean = False + + If bUpdatingParameters Then + Exit Sub + End If + + clsBaseOperator.RemoveParameterByName("facets") + If Not ucr1stFactorReceiver.IsEmpty Then + Select Case ucrInputStation.GetText() + Case strFacetWrap + bWrap = True + Case strFacetCol + bCol = True + Case strFacetRow + bRow = True + End Select + End If + + If bWrap OrElse bRow OrElse bCol Then + clsBaseOperator.AddParameter("facets", clsRFunctionParameter:=clsFacetFunction) + End If + If bWrap Then + clsFacetFunction.SetRCommand("facet_wrap") + End If + If bRow OrElse bCol Then + clsFacetFunction.SetRCommand("facet_grid") + End If + If bRow Then + clsFacetVariablesOperator.AddParameter("left", clsROperatorParameter:=clsFacetRowOp, iPosition:=0) + ElseIf bCol AndAlso bWrap = False Then + clsFacetVariablesOperator.AddParameter("left", ".", iPosition:=0) Else - If Not ucrVariableAsFactorForHeatMap.bSingleVariable Then - ucrHeatMapSelector.ucrAvailableDataFrames.clsCurrDataFrame.AddParameter("stack_data", "TRUE") - If Not ucrVariableAsFactorForHeatMap.ucrMultipleVariables.IsEmpty Then - ucrHeatMapSelector.ucrAvailableDataFrames.clsCurrDataFrame.AddParameter("measure.vars", ucrVariableAsFactorForHeatMap.ucrMultipleVariables.GetVariableNames()) - End If + clsFacetVariablesOperator.RemoveParameterByName("left") + End If + If bCol Then + clsFacetVariablesOperator.AddParameter("right", clsROperatorParameter:=clsFacetColOp, iPosition:=1) + ElseIf bRow AndAlso bWrap = False Then + clsFacetVariablesOperator.AddParameter("right", ".", iPosition:=1) + Else + clsFacetVariablesOperator.RemoveParameterByName("right") + End If + End Sub + + Private Sub ucr1stFactorReceiver_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucr1stFactorReceiver.ControlValueChanged, ucrReceiverX.ControlValueChanged + AddRemoveFacets() + AddRemoveGroupBy() + End Sub + + Private Sub GetParameterValue(clsOperator As ROperator) + Dim i As Integer = 0 + For Each clsTempParam As RParameter In clsOperator.clsParameters + If clsTempParam.strArgumentValue <> "" AndAlso clsTempParam.strArgumentValue <> "." Then + clsGroupByFunction.AddParameter(i, clsTempParam.strArgumentValue, bIncludeArgumentName:=False, iPosition:=i) + i = i + 1 + End If + Next + End Sub + + Private Sub AddRemoveGroupBy() + If clsPipeOperator.ContainsParameter("mutate") Then + clsGroupByFunction.ClearParameters() + If clsBaseOperator.ContainsParameter("facets") Then + Select Case ucrInputStation.GetText() + Case strFacetWrap + GetParameterValue(clsFacetVariablesOperator) + Case strFacetCol + GetParameterValue(clsFacetColOp) + Case strFacetRow + GetParameterValue(clsFacetRowOp) + End Select + End If + + If clsGroupByFunction.iParameterCount > 0 Then + clsPipeOperator.AddParameter("group_by", clsRFunctionParameter:=clsGroupByFunction, iPosition:=1) + Else + clsPipeOperator.RemoveParameterByName("group_by") End If + Else + clsPipeOperator.RemoveParameterByName("group_by") + End If + + SetPipeAssignTo() + End Sub + + Private Sub SetPipeAssignTo() + If ucrHeatMapSelector.ucrAvailableDataFrames.cboAvailableDataFrames.Text <> "" AndAlso clsPipeOperator.clsParameters.Count > 1 Then + clsPipeOperator.SetAssignTo(ucrHeatMapSelector.ucrAvailableDataFrames.cboAvailableDataFrames.Text) + Else + clsPipeOperator.RemoveAssignTo() End If End Sub Private Sub ucrHeatMapSelector_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrHeatMapSelector.ControlValueChanged clsPipeOperator.AddParameter("data", ucrHeatMapSelector.ucrAvailableDataFrames.cboAvailableDataFrames.Text, iPosition:=0) + AutoFacetStation() + SetPipeAssignTo() End Sub Private Sub AddRemoveGeomParameter() @@ -671,7 +939,71 @@ Public Class dlgHeatMapPlot clsDummyFunction.AddParameter("choropleth_geom_point", ucrChkPoints.Checked, iPosition:=0) End Sub - Private Sub AllControlsContentsChanged() Handles ucrInputColour.ControlContentsChanged, ucrReceiverX.ControlContentsChanged, ucrSaveGraph.ControlContentsChanged, ucrVariableAsFactorForHeatMap.ControlContentsChanged, ucrReceiverLongitude.ControlContentsChanged, ucrReceiverLatitude.ControlContentsChanged, ucrPnlOptions.ControlContentsChanged, ucrChkAddLabels.ControlContentsChanged + Private Sub AllControlsContentsChanged() Handles ucrInputColour.ControlContentsChanged, ucrReceiverX.ControlContentsChanged, ucrSaveGraph.ControlContentsChanged, ucrReceiverY.ControlContentsChanged, ucrReceiverLongitude.ControlContentsChanged, ucrReceiverLatitude.ControlContentsChanged, ucrPnlOptions.ControlContentsChanged, ucrChkAddLabels.ControlContentsChanged TestOkEnabled() End Sub + + Private Sub ucrChkJitter_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkJitter.ControlValueChanged, ucrNudWidth.ControlValueChanged, ucrNudHeigth.ControlValueChanged + If ucrChkJitter.Checked Then + clsGeomJitterFunction.AddParameter("width", ucrNudWidth.GetText, iPosition:=0) + clsGeomJitterFunction.AddParameter("height", ucrNudHeigth.GetText, iPosition:=1) + clsBaseOperator.AddParameter("geom_jitter", clsRFunctionParameter:=clsGeomJitterFunction, iPosition:=2) + Else + clsBaseOperator.RemoveParameterByName("geom_jitter") + End If + End Sub + + Private Sub Visibility() + If rdoGradient.Checked Then + ucrInputValue.Visible = (ucrReceiverFill.strCurrDataType = "factor" OrElse ucrReceiverFill.strCurrDataType = "ordered,factor" OrElse ucrReceiverFillChoropleth.strCurrDataType = "factor" OrElse ucrReceiverFillChoropleth.strCurrDataType = "ordered,factor") + ucrColourFrom.Visible = Not (ucrReceiverFill.strCurrDataType = "factor" OrElse ucrReceiverFill.strCurrDataType = "ordered,factor" OrElse ucrReceiverFillChoropleth.strCurrDataType = "factor" OrElse ucrReceiverFillChoropleth.strCurrDataType = "ordered,factor") + ucrColourTo.Visible = Not (ucrReceiverFill.strCurrDataType = "factor" OrElse ucrReceiverFill.strCurrDataType = "ordered,factor" OrElse ucrReceiverFillChoropleth.strCurrDataType = "factor" OrElse ucrReceiverFillChoropleth.strCurrDataType = "ordered,factor") + Else + ucrColourFrom.Visible = False + ucrColourTo.Visible = False + ucrInputValue.Visible = False + End If + End Sub + + Private Sub ChangePalette() + ' Remove all existing palette-related parameters + clsBaseOperator.RemoveParameterByName("palette") + clsBaseOperator.RemoveParameterByName("scale_fill_brewer") + clsBaseOperator.RemoveParameterByName("scale_fill_distiller") + clsBaseOperator.RemoveParameterByName("scale_fill_manual") + clsBaseOperator.RemoveParameterByName("scale_fill_gradient") + If rdoViridis.Checked Then + clsBaseOperator.AddParameter("palette", clsRFunctionParameter:=clsColourPaletteFunction, iPosition:=6) + ElseIf rdoPalette.Checked Then + If Not ucrReceiverFill.IsEmpty OrElse Not ucrReceiverFillChoropleth.IsEmpty Then + If ucrReceiverFill.strCurrDataType = "factor" OrElse ucrReceiverFillChoropleth.strCurrDataType = "factor" Then + clsFillBrewerFunction.AddParameter("palette", Chr(34) & ucrInputPalette.GetText() & Chr(34)) + clsBaseOperator.AddParameter("scale_fill_brewer", clsRFunctionParameter:=clsFillBrewerFunction, iPosition:=2) + Else + clsScalefillDistillerFunction.AddParameter("palette", Chr(34) & ucrInputPalette.GetText() & Chr(34)) + clsBaseOperator.AddParameter("scale_fill_distiller", clsRFunctionParameter:=clsScalefillDistillerFunction, iPosition:=2) + End If + End If + ElseIf rdoGradient.Checked Then + If Not ucrReceiverFill.IsEmpty Or Not ucrReceiverFillChoropleth.IsEmpty Then + If ucrReceiverFill.strCurrDataType = "factor" OrElse ucrReceiverFillChoropleth.strCurrDataType = "factor" Then + If Not ucrInputValue.IsEmpty() Then + clsScalefillmanualFunction.AddParameter("values", ucrInputValue.clsRList.ToScript(), iPosition:=0) + clsBaseOperator.AddParameter("scale_fill_manual", clsRFunctionParameter:=clsScalefillmanualFunction, iPosition:=2) + End If + Else + If Not ucrColourTo.IsEmpty AndAlso Not ucrColourFrom.IsEmpty Then + clsScalefillgradientFunction.AddParameter("low", Chr(34) & ucrColourFrom.GetText() & Chr(34), iPosition:=0) + clsScalefillgradientFunction.AddParameter("high", Chr(34) & ucrColourTo.GetText() & Chr(34), iPosition:=1) + clsBaseOperator.AddParameter("scale_fill_gradient", clsRFunctionParameter:=clsScalefillgradientFunction, iPosition:=2) + End If + End If + End If + End If + End Sub + + Private Sub ucrPnlColour_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrPnlColour.ControlValueChanged, ucrInputPalette.ControlValueChanged, ucrInputColourPalette.ControlValueChanged, ucrInputValue.ControlValueChanged, ucrColourFrom.ControlValueChanged, ucrColourTo.ControlValueChanged + ChangePalette() + Visibility() + End Sub End Class diff --git a/instat/dlgHistogram.designer.vb b/instat/dlgHistogram.designer.vb index 46b7178c5f8..734dab62ee1 100644 --- a/instat/dlgHistogram.designer.vb +++ b/instat/dlgHistogram.designer.vb @@ -64,6 +64,11 @@ Partial Class dlgHistogram Me.ucrPnlOptions = New instat.UcrPanel() Me.lblReorder = New System.Windows.Forms.Label() Me.ucrInputAddReorder = New instat.ucrInputComboBox() + 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.contextMenuStripOptions.SuspendLayout() Me.SuspendLayout() ' @@ -236,7 +241,7 @@ Partial Class dlgHistogram 'ucrSaveHist ' Me.ucrSaveHist.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrSaveHist.Location = New System.Drawing.Point(10, 342) + Me.ucrSaveHist.Location = New System.Drawing.Point(10, 385) Me.ucrSaveHist.Margin = New System.Windows.Forms.Padding(5) Me.ucrSaveHist.Name = "ucrSaveHist" Me.ucrSaveHist.Size = New System.Drawing.Size(322, 24) @@ -285,7 +290,7 @@ Partial Class dlgHistogram ' Me.ucrBase.AutoSize = True Me.ucrBase.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrBase.Location = New System.Drawing.Point(10, 365) + Me.ucrBase.Location = New System.Drawing.Point(10, 408) Me.ucrBase.Margin = New System.Windows.Forms.Padding(4) Me.ucrBase.Name = "ucrBase" Me.ucrBase.Size = New System.Drawing.Size(408, 52) @@ -321,12 +326,72 @@ Partial Class dlgHistogram Me.ucrInputAddReorder.Size = New System.Drawing.Size(120, 21) Me.ucrInputAddReorder.TabIndex = 39 ' + '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(318, 348) + Me.ucrInputStation.Name = "ucrInputStation" + Me.ucrInputStation.Size = New System.Drawing.Size(101, 21) + Me.ucrInputStation.TabIndex = 86 + ' + 'ucr1stFactorReceiver + ' + Me.ucr1stFactorReceiver.AutoSize = True + Me.ucr1stFactorReceiver.frmParent = Me + Me.ucr1stFactorReceiver.Location = New System.Drawing.Point(205, 349) + Me.ucr1stFactorReceiver.Margin = New System.Windows.Forms.Padding(0) + Me.ucr1stFactorReceiver.Name = "ucr1stFactorReceiver" + Me.ucr1stFactorReceiver.Selector = Nothing + Me.ucr1stFactorReceiver.Size = New System.Drawing.Size(110, 26) + Me.ucr1stFactorReceiver.strNcFilePath = "" + Me.ucr1stFactorReceiver.TabIndex = 85 + Me.ucr1stFactorReceiver.ucrSelector = Nothing + ' + 'lblFacetBy + ' + Me.lblFacetBy.AutoSize = True + Me.lblFacetBy.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.lblFacetBy.Location = New System.Drawing.Point(208, 334) + Me.lblFacetBy.Name = "lblFacetBy" + Me.lblFacetBy.Size = New System.Drawing.Size(52, 13) + Me.lblFacetBy.TabIndex = 84 + 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(87, 348) + Me.ucrInputLegendPosition.Name = "ucrInputLegendPosition" + Me.ucrInputLegendPosition.Size = New System.Drawing.Size(112, 21) + Me.ucrInputLegendPosition.TabIndex = 88 + ' + 'ucrChkLegend + ' + Me.ucrChkLegend.AutoSize = True + Me.ucrChkLegend.Checked = False + Me.ucrChkLegend.Location = New System.Drawing.Point(11, 349) + Me.ucrChkLegend.Name = "ucrChkLegend" + Me.ucrChkLegend.Size = New System.Drawing.Size(98, 24) + Me.ucrChkLegend.TabIndex = 87 + ' 'dlgHistogram ' 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(448, 422) + Me.ClientSize = New System.Drawing.Size(448, 461) + Me.Controls.Add(Me.ucrInputStation) + Me.Controls.Add(Me.ucr1stFactorReceiver) + Me.Controls.Add(Me.lblFacetBy) + Me.Controls.Add(Me.ucrInputLegendPosition) + Me.Controls.Add(Me.ucrChkLegend) Me.Controls.Add(Me.lblReorder) Me.Controls.Add(Me.ucrInputAddReorder) Me.Controls.Add(Me.cmdOptions) @@ -382,4 +447,9 @@ Partial Class dlgHistogram Friend WithEvents toolStripMenuItemDotOptions As ToolStripMenuItem Friend WithEvents lblReorder As Label Friend WithEvents ucrInputAddReorder As ucrInputComboBox + Friend WithEvents ucrInputStation As ucrInputComboBox + Friend WithEvents ucr1stFactorReceiver As ucrReceiverSingle + Friend WithEvents lblFacetBy As Label + Friend WithEvents ucrInputLegendPosition As ucrInputComboBox + Friend WithEvents ucrChkLegend As ucrCheck End Class \ No newline at end of file diff --git a/instat/dlgHistogram.vb b/instat/dlgHistogram.vb index 850fb1e5099..76d0d340272 100644 --- a/instat/dlgHistogram.vb +++ b/instat/dlgHistogram.vb @@ -47,6 +47,20 @@ Public Class dlgHistogram Private clsForecatsInfreqValue As New RFunction Private clsForecatsReverseValue As New RFunction + Private clsFacetFunction As New RFunction + Private clsFacetVariablesOperator As New ROperator + Private clsFacetRowOp As New ROperator + Private clsFacetColOp As New ROperator + Private clsPipeOperator As New ROperator + Private clsGroupByFunction As New RFunction + + Private ReadOnly strFacetWrap As String = "Facet Wrap" + Private ReadOnly strFacetRow As String = "Facet Row" + Private ReadOnly strFacetCol As String = "Facet Column" + + Private bUpdateComboOptions As Boolean = True + Private bUpdatingParameters As Boolean = False + Private ReadOnly strAscending As String = "Ascending" Private ReadOnly strDescending As String = "Descending" Private ReadOnly strReverse As String = "Reverse" @@ -75,6 +89,7 @@ Public Class dlgHistogram Private Sub InitialiseDialog() Dim dctStats As New Dictionary(Of String, String) + Dim dctLegendPosition As New Dictionary(Of String, String) ucrBase.clsRsyntax.bExcludeAssignedFunctionOutput = False ucrBase.clsRsyntax.iCallType = 3 ucrBase.iHelpTopicID = 435 @@ -131,6 +146,32 @@ Public Class dlgHistogram ucrInputAddReorder.SetDropDownStyleAsNonEditable() ucrInputAddReorder.SetLinkedDisplayControl(lblReorder) + 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) + + ucr1stFactorReceiver.SetParameter(New RParameter("var1")) + ucr1stFactorReceiver.Selector = ucrHistogramSelector + ucr1stFactorReceiver.SetIncludedDataTypes({"factor"}) + ucr1stFactorReceiver.strSelectorHeading = "Factors" + ucr1stFactorReceiver.bWithQuotes = False + ucr1stFactorReceiver.SetParameterIsString() + ucr1stFactorReceiver.SetValuesToIgnore({"."}) + ucr1stFactorReceiver.SetParameterPosition(1) + ucr1stFactorReceiver.SetLinkedDisplayControl(lblFacetBy) + + ucrInputStation.SetItems({strFacetWrap, strFacetRow, strFacetCol, strNone}) + ucrInputStation.SetDropDownStyleAsNonEditable() + ucrPnlOptions.AddToLinkedControls({ucrChkDisplayAsDotPlot}, {rdoHistogram}, bNewLinkedHideIfParameterMissing:=True) ucrPnlOptions.AddToLinkedControls({ucrChkRidges}, {rdoDensity_ridges}, bNewLinkedHideIfParameterMissing:=True) ucrChkRidges.AddToLinkedControls(ucrInputStats, {"FALSE"}, bNewLinkedHideIfParameterMissing:=True) @@ -154,6 +195,15 @@ Public Class dlgHistogram clsForecatsReverse = New RFunction clsForecatsInfreqValue = New RFunction clsForecatsReverseValue = New RFunction + clsFacetFunction = New RFunction + clsFacetVariablesOperator = New ROperator + clsFacetRowOp = New ROperator + clsFacetColOp = New ROperator + clsPipeOperator = New ROperator + clsGroupByFunction = New RFunction + + ucrInputStation.SetName(strFacetWrap) + ucrInputStation.bUpdateRCodeFromControl = True ucrHistogramSelector.Reset() ucrHistogramSelector.SetGgplotFunction(clsBaseOperator) ucrSaveHist.Reset() @@ -195,6 +245,22 @@ Public Class dlgHistogram clsForecatsInfreqValue.SetPackageName("forcats") clsForecatsInfreqValue.SetRCommand("fct_infreq") + clsFacetFunction.SetPackageName("ggplot2") + clsFacetRowOp.SetOperation("+") + clsFacetRowOp.bBrackets = False + clsFacetColOp.SetOperation("+") + clsFacetColOp.bBrackets = False + clsFacetVariablesOperator.SetOperation("~") + clsFacetVariablesOperator.bForceIncludeOperation = True + clsFacetVariablesOperator.bBrackets = False + clsFacetFunction.AddParameter("facets", clsROperatorParameter:=clsFacetVariablesOperator, iPosition:=0) + + clsPipeOperator.SetOperation("%>%") + SetPipeAssignTo() + + clsGroupByFunction.SetPackageName("dplyr") + clsGroupByFunction.SetRCommand("group_by") + clsBaseOperator.AddParameter(GgplotDefaults.clsDefaultThemeParameter.Clone()) clsXlabsFunction = GgplotDefaults.clsXlabTitleFunction.Clone() clsYlabFunction = GgplotDefaults.clsYlabTitleFunction.Clone() @@ -226,6 +292,8 @@ Public Class dlgHistogram ucrChkDisplayAsDotPlot.SetRCode(clsRgeomPlotFunction, bReset) ucrChkRidges.SetRCode(clsRgeomPlotFunction, bReset) ucrVariablesAsFactorforHist.SetRCode(clsRaesFunction, bReset) + ucrChkLegend.SetRCode(clsThemeFunction, bReset, bCloneIfNeeded:=True) + ucrInputLegendPosition.SetRCode(clsThemeFunction, bReset, bCloneIfNeeded:=True) If bReset Then ucrInputStats.SetRCode(clsHistAesFunction, bReset) ucrFactorReceiver.SetRCode(clsRaesFunction, bReset) @@ -247,6 +315,18 @@ Public Class dlgHistogram 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 + Private Sub SetDialogOptions() clsHistAesFunction.RemoveParameterByName("x") clsHistAesFunction.RemoveParameterByName("y") @@ -257,8 +337,21 @@ Public Class dlgHistogram If rdoHistogram.Checked Then If ucrChkDisplayAsDotPlot.Checked Then clsRgeomPlotFunction.SetRCommand("geom_dotplot") + clsRgeomPlotFunction.RemoveParameterByName("mapping") + If Not ucrFactorReceiver.IsEmpty Then + clsRgeomPlotFunction.AddParameter("binpositions", Chr(34) & "all" & Chr(34), iPosition:=0) + clsRgeomPlotFunction.AddParameter("stackgroups", "TRUE", iPosition:=1) + Else + clsRgeomPlotFunction.RemoveParameterByName("binpositions") + clsRgeomPlotFunction.RemoveParameterByName("stackgroups") + End If Else clsRgeomPlotFunction.SetRCommand("geom_histogram") + clsRgeomPlotFunction.AddParameter("mapping", clsRFunctionParameter:=clsHistAesFunction) + If Not ucrFactorReceiver.IsEmpty Then + clsRgeomPlotFunction.RemoveParameterByName("binpositions") + clsRgeomPlotFunction.RemoveParameterByName("stackgroups") + End If End If ucrFactorReceiver.ChangeParameterName("fill") If Not ucrSaveHist.bUserTyped Then ucrSaveHist.SetPrefix("histogram") @@ -398,7 +491,7 @@ Public Class dlgHistogram Private Sub cmdOptions_Click(sender As Object, e As EventArgs) Handles cmdOptions.Click, toolStripMenuItemPlotOptions.Click sdgPlots.SetRCode(clsBaseOperator, clsNewYScalecontinuousFunction:=clsYScalecontinuousFunction, clsNewXScalecontinuousFunction:=clsXScalecontinuousFunction, clsNewXLabsTitleFunction:=clsXlabsFunction, clsNewYLabTitleFunction:=clsYlabFunction, clsNewLabsFunction:=clsLabsFunction, clsNewThemeFunction:=clsThemeFunction, clsNewScaleFillViridisFunction:=clsScaleFillViridisFunction, - clsNewScaleColourViridisFunction:=clsScaleColourViridisFunction, dctNewThemeFunctions:=dctThemeFunctions, clsNewFacetFunction:=clsRFacetFunction, ucrNewBaseSelector:=ucrHistogramSelector, + clsNewScaleColourViridisFunction:=clsScaleColourViridisFunction, dctNewThemeFunctions:=dctThemeFunctions, clsNewFacetFunction:=clsRFacetFunction, ucrNewBaseSelector:=ucrHistogramSelector, clsNewFacetVariablesOperator:=clsFacetVariablesOperator, clsNewGlobalAesFunction:=clsRaesFunction, clsNewCoordPolarFunction:=clsCoordPolarFunction, clsNewCoordPolarStartOperator:=clsCoordPolarStartOperator, clsNewXScaleDateFunction:=clsXScaleDateFunction, clsNewAnnotateFunction:=clsAnnotateFunction, clsNewYScaleDateFunction:=clsYScaleDateFunction, strMainDialogGeomParameterNames:=strGeomParameterNames, bReset:=bResetSubdialog) sdgPlots.ShowDialog() @@ -452,27 +545,200 @@ Public Class dlgHistogram Private Sub DialogueSize() If rdoHistogram.Checked Then - Me.Size = New Size(464, 409) + Me.Size = New Size(464, 468) Me.lblReorder.Location = New Point(283, 275) Me.ucrInputAddReorder.Location = New Point(283, 289) - Me.ucrSaveHist.Location = New Point(10, 314) - Me.ucrBase.Location = New Point(10, 342) + Me.ucrSaveHist.Location = New Point(10, 360) + Me.ucrChkLegend.Location = New Point(11, 329) + Me.ucrInputStation.Location = New Point(318, 328) + Me.ucrInputLegendPosition.Location = New Point(87, 328) + Me.ucr1stFactorReceiver.Location = New Point(205, 329) + Me.lblFacetBy.Location = New Point(208, 315) + Me.ucrBase.Location = New Point(10, 390) ElseIf rdoDensity_ridges.Checked Then - Me.Size = New Size(464, 461) + Me.Size = New Size(464, 500) Me.lblReorder.Location = New Point(286, 298) Me.ucrInputAddReorder.Location = New Point(287, 314) - Me.ucrSaveHist.Location = New Point(10, 342) - Me.ucrBase.Location = New Point(10, 365) + Me.ucrSaveHist.Location = New Point(10, 380) + Me.ucrBase.Location = New Point(10, 408) + Me.ucrChkLegend.Location = New Point(11, 349) + Me.ucrInputStation.Location = New Point(318, 348) + Me.ucrInputLegendPosition.Location = New Point(87, 348) + Me.ucr1stFactorReceiver.Location = New Point(205, 349) + Me.lblFacetBy.Location = New Point(208, 334) Else - Me.Size = New Size(464, 401) + Me.Size = New Size(464, 440) Me.lblReorder.Location = New Point(283, 250) Me.ucrInputAddReorder.Location = New Point(283, 264) - Me.ucrSaveHist.Location = New Point(10, 288) - Me.ucrBase.Location = New Point(10, 314) + Me.ucrSaveHist.Location = New Point(10, 330) + Me.ucrChkLegend.Location = New Point(11, 296) + Me.ucrInputStation.Location = New Point(318, 294) + Me.ucrInputLegendPosition.Location = New Point(87, 294) + Me.ucr1stFactorReceiver.Location = New Point(205, 296) + Me.lblFacetBy.Location = New Point(208, 283) + Me.ucrBase.Location = New Point(10, 357) + End If + End Sub + + Private Sub AutoFacetStation() + Dim currentReceiver As ucrReceiver = ucrHistogramSelector.CurrentReceiver + + If currentReceiver IsNot Nothing Then + ucr1stFactorReceiver.AddItemsWithMetadataProperty(ucrHistogramSelector.ucrAvailableDataFrames.cboAvailableDataFrames.Text, "Climatic_Type", {"station_label"}) + currentReceiver.SetMeAsReceiver() + AddRemoveGroupBy() End If End Sub + Private Sub ucrInput_ControlValueChanged(ucrChangedControl As ucrInputComboBox) Handles ucrInputStation.ControlValueChanged + If Not bUpdateComboOptions Then + Exit Sub + End If + Dim strChangedText As String = ucrChangedControl.GetText() + If strChangedText <> strNone Then + If Not strChangedText = strFacetCol AndAlso Not strChangedText = strFacetRow AndAlso + Not ucrInputStation.Equals(ucrChangedControl) AndAlso ucrInputStation.GetText() = strChangedText Then + bUpdateComboOptions = False + ucrInputStation.SetName(strNone) + bUpdateComboOptions = True + End If + If (strChangedText = strFacetWrap AndAlso ucrInputStation.GetText = strFacetRow) OrElse (strChangedText = strFacetRow AndAlso + ucrInputStation.GetText = strFacetWrap) OrElse (strChangedText = strFacetWrap AndAlso + ucrInputStation.GetText = strFacetCol) OrElse (strChangedText = strFacetCol AndAlso ucrInputStation.GetText = strFacetWrap) Then + ucrInputStation.SetName(strNone) + End If + End If + UpdateParameters() + AddRemoveFacets() + AddRemoveGroupBy() + End Sub + + Private Sub UpdateParameters() + clsFacetVariablesOperator.RemoveParameterByName("var1") + clsFacetColOp.RemoveParameterByName("col" & ucrInputStation.Name) + clsFacetRowOp.RemoveParameterByName("row" & ucrInputStation.Name) + + clsBaseOperator.RemoveParameterByName("facets") + bUpdatingParameters = True + ucr1stFactorReceiver.SetRCode(Nothing) + Select Case ucrInputStation.GetText() + Case strFacetWrap + ucr1stFactorReceiver.ChangeParameterName("var1") + ucr1stFactorReceiver.SetRCode(clsFacetVariablesOperator) + Case strFacetCol + ucr1stFactorReceiver.ChangeParameterName("col" & ucrInputStation.Name) + ucr1stFactorReceiver.SetRCode(clsFacetColOp) + Case strFacetRow + ucr1stFactorReceiver.ChangeParameterName("row" & ucrInputStation.Name) + ucr1stFactorReceiver.SetRCode(clsFacetRowOp) + End Select + If Not clsRaesFunction.ContainsParameter("x") Then + clsRaesFunction.AddParameter("x", Chr(34) & Chr(34)) + End If + bUpdatingParameters = False + End Sub + + Private Sub AddRemoveFacets() + Dim bWrap As Boolean = False + Dim bCol As Boolean = False + Dim bRow As Boolean = False + + If bUpdatingParameters Then + Exit Sub + End If + + clsBaseOperator.RemoveParameterByName("facets") + If Not ucr1stFactorReceiver.IsEmpty Then + Select Case ucrInputStation.GetText() + Case strFacetWrap + bWrap = True + Case strFacetCol + bCol = True + Case strFacetRow + bRow = True + End Select + End If + + If bWrap OrElse bRow OrElse bCol Then + clsBaseOperator.AddParameter("facets", clsRFunctionParameter:=clsFacetFunction) + End If + If bWrap Then + clsFacetFunction.SetRCommand("facet_wrap") + End If + If bRow OrElse bCol Then + clsFacetFunction.SetRCommand("facet_grid") + End If + If bRow Then + clsFacetVariablesOperator.AddParameter("left", clsROperatorParameter:=clsFacetRowOp, iPosition:=0) + ElseIf bCol AndAlso bWrap = False Then + clsFacetVariablesOperator.AddParameter("left", ".", iPosition:=0) + Else + clsFacetVariablesOperator.RemoveParameterByName("left") + End If + If bCol Then + clsFacetVariablesOperator.AddParameter("right", clsROperatorParameter:=clsFacetColOp, iPosition:=1) + ElseIf bRow AndAlso bWrap = False Then + clsFacetVariablesOperator.AddParameter("right", ".", iPosition:=1) + Else + clsFacetVariablesOperator.RemoveParameterByName("right") + End If + End Sub + + Private Sub ucr1stFactorReceiver_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucr1stFactorReceiver.ControlValueChanged, ucrVariablesAsFactorforHist.ControlValueChanged + AddRemoveFacets() + AddRemoveGroupBy() + End Sub + + Private Sub GetParameterValue(clsOperator As ROperator) + Dim i As Integer = 0 + For Each clsTempParam As RParameter In clsOperator.clsParameters + If clsTempParam.strArgumentValue <> "" AndAlso clsTempParam.strArgumentValue <> "." Then + clsGroupByFunction.AddParameter(i, clsTempParam.strArgumentValue, bIncludeArgumentName:=False, iPosition:=i) + i = i + 1 + End If + Next + End Sub + + Private Sub AddRemoveGroupBy() + If clsPipeOperator.ContainsParameter("mutate") Then + clsGroupByFunction.ClearParameters() + If clsBaseOperator.ContainsParameter("facets") Then + Select Case ucrInputStation.GetText() + Case strFacetWrap + GetParameterValue(clsFacetVariablesOperator) + Case strFacetCol + GetParameterValue(clsFacetColOp) + Case strFacetRow + GetParameterValue(clsFacetRowOp) + End Select + End If + + If clsGroupByFunction.iParameterCount > 0 Then + clsPipeOperator.AddParameter("group_by", clsRFunctionParameter:=clsGroupByFunction, iPosition:=1) + Else + clsPipeOperator.RemoveParameterByName("group_by") + End If + Else + clsPipeOperator.RemoveParameterByName("group_by") + End If + + SetPipeAssignTo() + End Sub + + Private Sub SetPipeAssignTo() + If ucrHistogramSelector.ucrAvailableDataFrames.cboAvailableDataFrames.Text <> "" AndAlso clsPipeOperator.clsParameters.Count > 1 Then + clsPipeOperator.SetAssignTo(ucrHistogramSelector.ucrAvailableDataFrames.cboAvailableDataFrames.Text) + Else + clsPipeOperator.RemoveAssignTo() + End If + End Sub + + Private Sub ucrHistogramSelector_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrHistogramSelector.ControlValueChanged + AutoFacetStation() + SetPipeAssignTo() + End Sub Private Sub CoreControls_ControlContentsChanged() Handles ucrVariablesAsFactorforHist.ControlContentsChanged, ucrSaveHist.ControlContentsChanged, ucrFactorReceiver.ControlContentsChanged, ucrChkRidges.ControlContentsChanged, ucrInputAddReorder.ControlContentsChanged TestOkEnabled() End Sub + End Class \ No newline at end of file diff --git a/instat/dlgHomogenization.Designer.vb b/instat/dlgHomogenization.Designer.vb index 35b58e1b6f4..0b13188ecd5 100644 --- a/instat/dlgHomogenization.Designer.vb +++ b/instat/dlgHomogenization.Designer.vb @@ -1,9 +1,9 @@ - _ + Partial Class dlgHomogenization Inherits System.Windows.Forms.Form 'Form overrides dispose to clean up the component list. - _ + Protected Overrides Sub Dispose(ByVal disposing As Boolean) Try If disposing AndAlso components IsNot Nothing Then @@ -20,7 +20,7 @@ Partial Class dlgHomogenization 'NOTE: The following procedure is required by the Windows Form Designer 'It can be modified using the Windows Form Designer. 'Do not modify it using the code editor. - _ + Private Sub InitializeComponent() Me.components = New System.ComponentModel.Container() Me.lblElement = New System.Windows.Forms.Label() @@ -52,20 +52,46 @@ Partial Class dlgHomogenization Me.ucrChkSummary = New instat.ucrCheck() Me.ttOptions = New System.Windows.Forms.ToolTip(Me.components) Me.rdoSingle = New System.Windows.Forms.RadioButton() - Me.rdoMultiple = New System.Windows.Forms.RadioButton() - Me.rdoNeighbouring = New System.Windows.Forms.RadioButton() Me.lblNeighbouring = New System.Windows.Forms.Label() - Me.ucrReceiverNeighbour = New instat.ucrReceiverSingle() + Me.lblStation = New System.Windows.Forms.Label() + Me.rdoPrepare = New System.Windows.Forms.RadioButton() + Me.grpStationFile = New System.Windows.Forms.GroupBox() + Me.ucrReceiverElavation = New instat.ucrReceiverSingle() + Me.lblLongtude = New System.Windows.Forms.Label() + Me.lblStationName = New System.Windows.Forms.Label() + Me.lblStationID = New System.Windows.Forms.Label() + Me.lblElavation = New System.Windows.Forms.Label() + Me.ucrReceiverStationId = New instat.ucrReceiverSingle() + Me.ucrReceiverStationName = New instat.ucrReceiverSingle() + Me.ucrReceiverLongtitude = New instat.ucrReceiverSingle() + Me.ucrReceiverLatitude = New instat.ucrReceiverSingle() + Me.lblLatitude = New System.Windows.Forms.Label() + Me.ucrSelectorStationFile = New instat.ucrSelectorByDataFrameAddRemove() + Me.grpDataFile = New System.Windows.Forms.GroupBox() + Me.ucrReceiverDataFiles = New instat.ucrReceiverMultiple() + Me.lblDataFiles = New System.Windows.Forms.Label() + Me.ucrSelectorDataFiles = New instat.ucrSelectorByDataFrameAddRemove() + Me.lblClimaticVariable = New System.Windows.Forms.Label() + Me.lblFinalYear = New System.Windows.Forms.Label() + Me.lblInitialYear = New System.Windows.Forms.Label() + Me.ucrInputFinalYear = New instat.ucrInputTextBox() + Me.ucrInputInitialYear = New instat.ucrInputTextBox() + Me.ucrReceiverStation = New instat.ucrReceiverSingle() + Me.ucrSelectorHomogenization = New instat.ucrSelectorByDataFrameAddRemove() + Me.ucrInputClimateVariables = New instat.ucrInputTextBox() Me.ucrPnlOptions = New instat.UcrPanel() Me.ucrSaveResult = New instat.ucrSave() Me.ucrReceiverElement = New instat.ucrReceiverSingle() - Me.ucrSelectorHomogenization = New instat.ucrSelectorByDataFrameAddRemove() Me.ucrBase = New instat.ucrButtons() - Me.lblStation = New System.Windows.Forms.Label() - Me.ucrReceiverStation = New instat.ucrReceiverSingle() + Me.ucrReceiverNeighbour = New instat.ucrReceiverSingle() + Me.rdoHomogenization = New System.Windows.Forms.RadioButton() + Me.rdoMonthlyTotals = New System.Windows.Forms.RadioButton() + Me.rdoQualityControl = New System.Windows.Forms.RadioButton() Me.grpMethods.SuspendLayout() Me.grpCptOptions.SuspendLayout() Me.grpOutputOptions.SuspendLayout() + Me.grpStationFile.SuspendLayout() + Me.grpDataFile.SuspendLayout() Me.SuspendLayout() ' 'lblElement @@ -75,7 +101,7 @@ Partial Class dlgHomogenization Me.lblElement.Location = New System.Drawing.Point(264, 135) Me.lblElement.Name = "lblElement" Me.lblElement.Size = New System.Drawing.Size(48, 13) - Me.lblElement.TabIndex = 7 + Me.lblElement.TabIndex = 6 Me.lblElement.Text = "Element:" ' 'grpMethods @@ -90,7 +116,7 @@ Partial Class dlgHomogenization Me.grpMethods.Location = New System.Drawing.Point(12, 243) Me.grpMethods.Name = "grpMethods" Me.grpMethods.Size = New System.Drawing.Size(209, 104) - Me.grpMethods.TabIndex = 11 + Me.grpMethods.TabIndex = 10 Me.grpMethods.TabStop = False Me.grpMethods.Text = "Methods" ' @@ -101,7 +127,7 @@ Partial Class dlgHomogenization Me.rdoCptMean.Location = New System.Drawing.Point(87, 23) Me.rdoCptMean.Name = "rdoCptMean" Me.rdoCptMean.Size = New System.Drawing.Size(52, 17) - Me.rdoCptMean.TabIndex = 6 + Me.rdoCptMean.TabIndex = 3 Me.rdoCptMean.Text = "Mean" Me.rdoCptMean.UseVisualStyleBackColor = True ' @@ -112,7 +138,7 @@ Partial Class dlgHomogenization Me.rdoCptMeanVariance.Location = New System.Drawing.Point(87, 69) Me.rdoCptMeanVariance.Name = "rdoCptMeanVariance" Me.rdoCptMeanVariance.Size = New System.Drawing.Size(118, 17) - Me.rdoCptMeanVariance.TabIndex = 5 + Me.rdoCptMeanVariance.TabIndex = 6 Me.rdoCptMeanVariance.Text = "Mean and Variance" Me.rdoCptMeanVariance.UseVisualStyleBackColor = True ' @@ -134,7 +160,7 @@ Partial Class dlgHomogenization Me.rdoBuishand.Location = New System.Drawing.Point(9, 69) Me.rdoBuishand.Name = "rdoBuishand" Me.rdoBuishand.Size = New System.Drawing.Size(69, 17) - Me.rdoBuishand.TabIndex = 16 + Me.rdoBuishand.TabIndex = 5 Me.rdoBuishand.Text = "Buishand" Me.rdoBuishand.UseVisualStyleBackColor = True ' @@ -145,7 +171,7 @@ Partial Class dlgHomogenization Me.rdoPettitt.Location = New System.Drawing.Point(9, 46) Me.rdoPettitt.Name = "rdoPettitt" Me.rdoPettitt.Size = New System.Drawing.Size(52, 17) - Me.rdoPettitt.TabIndex = 15 + Me.rdoPettitt.TabIndex = 2 Me.rdoPettitt.Text = "Pettitt" Me.rdoPettitt.UseVisualStyleBackColor = True ' @@ -156,7 +182,7 @@ Partial Class dlgHomogenization Me.rdoSnht.Location = New System.Drawing.Point(9, 23) Me.rdoSnht.Name = "rdoSnht" Me.rdoSnht.Size = New System.Drawing.Size(55, 17) - Me.rdoSnht.TabIndex = 14 + Me.rdoSnht.TabIndex = 1 Me.rdoSnht.Text = "SNHT" Me.rdoSnht.UseVisualStyleBackColor = True ' @@ -187,7 +213,7 @@ Partial Class dlgHomogenization Me.grpCptOptions.Location = New System.Drawing.Point(227, 243) Me.grpCptOptions.Name = "grpCptOptions" Me.grpCptOptions.Size = New System.Drawing.Size(179, 170) - Me.grpCptOptions.TabIndex = 12 + Me.grpCptOptions.TabIndex = 14 Me.grpCptOptions.TabStop = False Me.grpCptOptions.Text = "Change Point Options" ' @@ -200,7 +226,7 @@ Partial Class dlgHomogenization Me.ucrInputComboMeanVarDistribution.Location = New System.Drawing.Point(68, 67) Me.ucrInputComboMeanVarDistribution.Name = "ucrInputComboMeanVarDistribution" Me.ucrInputComboMeanVarDistribution.Size = New System.Drawing.Size(64, 21) - Me.ucrInputComboMeanVarDistribution.TabIndex = 14 + Me.ucrInputComboMeanVarDistribution.TabIndex = 8 ' 'ucrInputComboVarDistribution ' @@ -220,7 +246,7 @@ Partial Class dlgHomogenization Me.lblPenaltyValue.Location = New System.Drawing.Point(4, 142) Me.lblPenaltyValue.Name = "lblPenaltyValue" Me.lblPenaltyValue.Size = New System.Drawing.Size(59, 13) - Me.lblPenaltyValue.TabIndex = 12 + Me.lblPenaltyValue.TabIndex = 5 Me.lblPenaltyValue.Text = "Pen.Value:" ' 'ucrInputPenValue @@ -241,7 +267,7 @@ Partial Class dlgHomogenization Me.lblMinSegLen.Location = New System.Drawing.Point(4, 95) Me.lblMinSegLen.Name = "lblMinSegLen" Me.lblMinSegLen.Size = New System.Drawing.Size(64, 13) - Me.lblMinSegLen.TabIndex = 10 + Me.lblMinSegLen.TabIndex = 3 Me.lblMinSegLen.Text = "MinSegLen:" ' 'lblQ @@ -251,7 +277,7 @@ Partial Class dlgHomogenization Me.lblQ.Location = New System.Drawing.Point(4, 120) Me.lblQ.Name = "lblQ" Me.lblQ.Size = New System.Drawing.Size(18, 13) - Me.lblQ.TabIndex = 9 + Me.lblQ.TabIndex = 4 Me.lblQ.Text = "Q:" ' 'lblPenalty @@ -261,7 +287,7 @@ Partial Class dlgHomogenization Me.lblPenalty.Location = New System.Drawing.Point(4, 21) Me.lblPenalty.Name = "lblPenalty" Me.lblPenalty.Size = New System.Drawing.Size(45, 13) - Me.lblPenalty.TabIndex = 8 + Me.lblPenalty.TabIndex = 0 Me.lblPenalty.Text = "Penalty:" ' 'lblMethod @@ -271,7 +297,7 @@ Partial Class dlgHomogenization Me.lblMethod.Location = New System.Drawing.Point(4, 44) Me.lblMethod.Name = "lblMethod" Me.lblMethod.Size = New System.Drawing.Size(46, 13) - Me.lblMethod.TabIndex = 7 + Me.lblMethod.TabIndex = 1 Me.lblMethod.Text = "Method:" ' 'lblDistribution @@ -281,7 +307,7 @@ Partial Class dlgHomogenization Me.lblDistribution.Location = New System.Drawing.Point(4, 69) Me.lblDistribution.Name = "lblDistribution" Me.lblDistribution.Size = New System.Drawing.Size(62, 13) - Me.lblDistribution.TabIndex = 6 + Me.lblDistribution.TabIndex = 2 Me.lblDistribution.Text = "Distribution:" ' 'ucrNudMinSegLen @@ -294,7 +320,7 @@ Partial Class dlgHomogenization Me.ucrNudMinSegLen.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudMinSegLen.Name = "ucrNudMinSegLen" Me.ucrNudMinSegLen.Size = New System.Drawing.Size(50, 20) - Me.ucrNudMinSegLen.TabIndex = 4 + Me.ucrNudMinSegLen.TabIndex = 9 Me.ucrNudMinSegLen.Value = New Decimal(New Integer() {0, 0, 0, 0}) ' 'ucrInputQ @@ -306,7 +332,7 @@ Partial Class dlgHomogenization Me.ucrInputQ.Location = New System.Drawing.Point(68, 114) Me.ucrInputQ.Name = "ucrInputQ" Me.ucrInputQ.Size = New System.Drawing.Size(55, 21) - Me.ucrInputQ.TabIndex = 3 + Me.ucrInputQ.TabIndex = 10 ' 'ucrInputComboMeanDistribution ' @@ -328,7 +354,7 @@ Partial Class dlgHomogenization Me.ucrInputComboMethod.Location = New System.Drawing.Point(68, 43) Me.ucrInputComboMethod.Name = "ucrInputComboMethod" Me.ucrInputComboMethod.Size = New System.Drawing.Size(64, 21) - Me.ucrInputComboMethod.TabIndex = 1 + Me.ucrInputComboMethod.TabIndex = 7 ' 'ucrInputComboPenalty ' @@ -339,7 +365,7 @@ Partial Class dlgHomogenization Me.ucrInputComboPenalty.Location = New System.Drawing.Point(68, 19) Me.ucrInputComboPenalty.Name = "ucrInputComboPenalty" Me.ucrInputComboPenalty.Size = New System.Drawing.Size(64, 21) - Me.ucrInputComboPenalty.TabIndex = 0 + Me.ucrInputComboPenalty.TabIndex = 6 ' 'grpOutputOptions ' @@ -349,7 +375,7 @@ Partial Class dlgHomogenization Me.grpOutputOptions.Location = New System.Drawing.Point(12, 353) Me.grpOutputOptions.Name = "grpOutputOptions" Me.grpOutputOptions.Size = New System.Drawing.Size(209, 42) - Me.grpOutputOptions.TabIndex = 13 + Me.grpOutputOptions.TabIndex = 12 Me.grpOutputOptions.TabStop = False Me.grpOutputOptions.Text = "Output Options" ' @@ -360,7 +386,7 @@ Partial Class dlgHomogenization Me.ucrChkPlot.Location = New System.Drawing.Point(10, 19) Me.ucrChkPlot.Name = "ucrChkPlot" Me.ucrChkPlot.Size = New System.Drawing.Size(100, 23) - Me.ucrChkPlot.TabIndex = 1 + Me.ucrChkPlot.TabIndex = 0 ' 'ucrChkSummary ' @@ -369,7 +395,7 @@ Partial Class dlgHomogenization Me.ucrChkSummary.Location = New System.Drawing.Point(110, 19) Me.ucrChkSummary.Name = "ucrChkSummary" Me.ucrChkSummary.Size = New System.Drawing.Size(93, 23) - Me.ucrChkSummary.TabIndex = 0 + Me.ucrChkSummary.TabIndex = 1 ' 'rdoSingle ' @@ -380,9 +406,9 @@ Partial Class dlgHomogenization Me.rdoSingle.FlatAppearance.CheckedBackColor = System.Drawing.SystemColors.ActiveCaption Me.rdoSingle.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.rdoSingle.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.rdoSingle.Location = New System.Drawing.Point(62, 27) + Me.rdoSingle.Location = New System.Drawing.Point(12, 9) Me.rdoSingle.Name = "rdoSingle" - Me.rdoSingle.Size = New System.Drawing.Size(101, 28) + Me.rdoSingle.Size = New System.Drawing.Size(78, 28) Me.rdoSingle.TabIndex = 1 Me.rdoSingle.TabStop = True Me.rdoSingle.Tag = "" @@ -390,44 +416,6 @@ Partial Class dlgHomogenization Me.rdoSingle.TextAlign = System.Drawing.ContentAlignment.MiddleCenter Me.rdoSingle.UseVisualStyleBackColor = False ' - 'rdoMultiple - ' - Me.rdoMultiple.Appearance = System.Windows.Forms.Appearance.Button - Me.rdoMultiple.BackColor = System.Drawing.SystemColors.Control - Me.rdoMultiple.FlatAppearance.BorderColor = System.Drawing.SystemColors.ActiveCaption - Me.rdoMultiple.FlatAppearance.BorderSize = 2 - Me.rdoMultiple.FlatAppearance.CheckedBackColor = System.Drawing.SystemColors.ActiveCaption - Me.rdoMultiple.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.rdoMultiple.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.rdoMultiple.Location = New System.Drawing.Point(260, 27) - Me.rdoMultiple.Name = "rdoMultiple" - Me.rdoMultiple.Size = New System.Drawing.Size(101, 28) - Me.rdoMultiple.TabIndex = 3 - Me.rdoMultiple.TabStop = True - Me.rdoMultiple.Tag = "" - Me.rdoMultiple.Text = "Multiple" - Me.rdoMultiple.TextAlign = System.Drawing.ContentAlignment.MiddleCenter - Me.rdoMultiple.UseVisualStyleBackColor = False - ' - 'rdoNeighbouring - ' - Me.rdoNeighbouring.Appearance = System.Windows.Forms.Appearance.Button - Me.rdoNeighbouring.BackColor = System.Drawing.SystemColors.Control - Me.rdoNeighbouring.FlatAppearance.BorderColor = System.Drawing.SystemColors.ActiveCaption - Me.rdoNeighbouring.FlatAppearance.BorderSize = 2 - Me.rdoNeighbouring.FlatAppearance.CheckedBackColor = System.Drawing.SystemColors.ActiveCaption - Me.rdoNeighbouring.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.rdoNeighbouring.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.rdoNeighbouring.Location = New System.Drawing.Point(161, 27) - Me.rdoNeighbouring.Name = "rdoNeighbouring" - Me.rdoNeighbouring.Size = New System.Drawing.Size(101, 28) - Me.rdoNeighbouring.TabIndex = 2 - Me.rdoNeighbouring.TabStop = True - Me.rdoNeighbouring.Tag = "" - Me.rdoNeighbouring.Text = "Neighbouring" - Me.rdoNeighbouring.TextAlign = System.Drawing.ContentAlignment.MiddleCenter - Me.rdoNeighbouring.UseVisualStyleBackColor = False - ' 'lblNeighbouring ' Me.lblNeighbouring.AutoSize = True @@ -435,39 +423,337 @@ Partial Class dlgHomogenization Me.lblNeighbouring.Location = New System.Drawing.Point(264, 190) Me.lblNeighbouring.Name = "lblNeighbouring" Me.lblNeighbouring.Size = New System.Drawing.Size(59, 13) - Me.lblNeighbouring.TabIndex = 9 + Me.lblNeighbouring.TabIndex = 8 Me.lblNeighbouring.Text = "Neighbour:" ' - 'ucrReceiverNeighbour + 'lblStation ' - Me.ucrReceiverNeighbour.AutoSize = True - Me.ucrReceiverNeighbour.frmParent = Me - Me.ucrReceiverNeighbour.Location = New System.Drawing.Point(266, 206) - Me.ucrReceiverNeighbour.Margin = New System.Windows.Forms.Padding(0) - Me.ucrReceiverNeighbour.Name = "ucrReceiverNeighbour" - Me.ucrReceiverNeighbour.Selector = Nothing - Me.ucrReceiverNeighbour.Size = New System.Drawing.Size(120, 20) - Me.ucrReceiverNeighbour.strNcFilePath = "" - Me.ucrReceiverNeighbour.TabIndex = 10 - Me.ucrReceiverNeighbour.ucrSelector = Nothing + Me.lblStation.AutoSize = True + Me.lblStation.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.lblStation.Location = New System.Drawing.Point(264, 80) + Me.lblStation.Name = "lblStation" + Me.lblStation.Size = New System.Drawing.Size(43, 13) + Me.lblStation.TabIndex = 4 + Me.lblStation.Text = "Station:" + ' + 'rdoPrepare + ' + Me.rdoPrepare.Appearance = System.Windows.Forms.Appearance.Button + Me.rdoPrepare.BackColor = System.Drawing.SystemColors.Control + Me.rdoPrepare.FlatAppearance.BorderColor = System.Drawing.SystemColors.ActiveCaption + Me.rdoPrepare.FlatAppearance.BorderSize = 2 + Me.rdoPrepare.FlatAppearance.CheckedBackColor = System.Drawing.SystemColors.ActiveCaption + Me.rdoPrepare.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.rdoPrepare.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.rdoPrepare.Location = New System.Drawing.Point(88, 9) + Me.rdoPrepare.Name = "rdoPrepare" + Me.rdoPrepare.Size = New System.Drawing.Size(63, 28) + Me.rdoPrepare.TabIndex = 2 + Me.rdoPrepare.TabStop = True + Me.rdoPrepare.Tag = "" + Me.rdoPrepare.Text = "Prepare" + Me.rdoPrepare.TextAlign = System.Drawing.ContentAlignment.MiddleCenter + Me.rdoPrepare.UseVisualStyleBackColor = False + ' + 'grpStationFile + ' + Me.grpStationFile.Controls.Add(Me.ucrReceiverElavation) + Me.grpStationFile.Controls.Add(Me.lblLongtude) + Me.grpStationFile.Controls.Add(Me.lblStationName) + Me.grpStationFile.Controls.Add(Me.lblStationID) + Me.grpStationFile.Controls.Add(Me.lblElavation) + Me.grpStationFile.Controls.Add(Me.ucrReceiverStationId) + Me.grpStationFile.Controls.Add(Me.ucrReceiverStationName) + Me.grpStationFile.Controls.Add(Me.ucrReceiverLongtitude) + Me.grpStationFile.Controls.Add(Me.ucrReceiverLatitude) + Me.grpStationFile.Controls.Add(Me.lblLatitude) + Me.grpStationFile.Controls.Add(Me.ucrSelectorStationFile) + Me.grpStationFile.Location = New System.Drawing.Point(11, 260) + Me.grpStationFile.Name = "grpStationFile" + Me.grpStationFile.Size = New System.Drawing.Size(397, 201) + Me.grpStationFile.TabIndex = 11 + Me.grpStationFile.TabStop = False + Me.grpStationFile.Text = "StationFile" + ' + 'ucrReceiverElavation + ' + Me.ucrReceiverElavation.AutoSize = True + Me.ucrReceiverElavation.frmParent = Me + Me.ucrReceiverElavation.Location = New System.Drawing.Point(272, 105) + Me.ucrReceiverElavation.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverElavation.Name = "ucrReceiverElavation" + Me.ucrReceiverElavation.Selector = Nothing + Me.ucrReceiverElavation.Size = New System.Drawing.Size(120, 20) + Me.ucrReceiverElavation.strNcFilePath = "" + Me.ucrReceiverElavation.TabIndex = 6 + Me.ucrReceiverElavation.ucrSelector = Nothing + ' + 'lblLongtude + ' + Me.lblLongtude.AutoSize = True + Me.lblLongtude.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.lblLongtude.Location = New System.Drawing.Point(274, 51) + Me.lblLongtude.Name = "lblLongtude" + Me.lblLongtude.Size = New System.Drawing.Size(57, 13) + Me.lblLongtude.TabIndex = 3 + Me.lblLongtude.Text = "Longitude:" + ' + 'lblStationName + ' + Me.lblStationName.AutoSize = True + Me.lblStationName.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.lblStationName.Location = New System.Drawing.Point(274, 125) + Me.lblStationName.Name = "lblStationName" + Me.lblStationName.Size = New System.Drawing.Size(74, 13) + Me.lblStationName.TabIndex = 7 + Me.lblStationName.Text = "Station Name:" + ' + 'lblStationID + ' + Me.lblStationID.AutoSize = True + Me.lblStationID.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.lblStationID.Location = New System.Drawing.Point(274, 161) + Me.lblStationID.Name = "lblStationID" + Me.lblStationID.Size = New System.Drawing.Size(55, 13) + Me.lblStationID.TabIndex = 9 + Me.lblStationID.Text = "Station Id:" + ' + 'lblElavation + ' + Me.lblElavation.AutoSize = True + Me.lblElavation.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.lblElavation.Location = New System.Drawing.Point(274, 90) + Me.lblElavation.Name = "lblElavation" + Me.lblElavation.Size = New System.Drawing.Size(54, 13) + Me.lblElavation.TabIndex = 5 + Me.lblElavation.Text = "Elavation:" + ' + 'ucrReceiverStationId + ' + Me.ucrReceiverStationId.AutoSize = True + Me.ucrReceiverStationId.frmParent = Me + Me.ucrReceiverStationId.Location = New System.Drawing.Point(272, 175) + Me.ucrReceiverStationId.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverStationId.Name = "ucrReceiverStationId" + Me.ucrReceiverStationId.Selector = Nothing + Me.ucrReceiverStationId.Size = New System.Drawing.Size(120, 20) + Me.ucrReceiverStationId.strNcFilePath = "" + Me.ucrReceiverStationId.TabIndex = 10 + Me.ucrReceiverStationId.ucrSelector = Nothing + ' + 'ucrReceiverStationName + ' + Me.ucrReceiverStationName.AutoSize = True + Me.ucrReceiverStationName.frmParent = Me + Me.ucrReceiverStationName.Location = New System.Drawing.Point(272, 140) + Me.ucrReceiverStationName.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverStationName.Name = "ucrReceiverStationName" + Me.ucrReceiverStationName.Selector = Nothing + Me.ucrReceiverStationName.Size = New System.Drawing.Size(120, 20) + Me.ucrReceiverStationName.strNcFilePath = "" + Me.ucrReceiverStationName.TabIndex = 8 + Me.ucrReceiverStationName.ucrSelector = Nothing + ' + 'ucrReceiverLongtitude + ' + Me.ucrReceiverLongtitude.AutoSize = True + Me.ucrReceiverLongtitude.frmParent = Me + Me.ucrReceiverLongtitude.Location = New System.Drawing.Point(272, 68) + Me.ucrReceiverLongtitude.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverLongtitude.Name = "ucrReceiverLongtitude" + Me.ucrReceiverLongtitude.Selector = Nothing + Me.ucrReceiverLongtitude.Size = New System.Drawing.Size(120, 20) + Me.ucrReceiverLongtitude.strNcFilePath = "" + Me.ucrReceiverLongtitude.TabIndex = 4 + Me.ucrReceiverLongtitude.ucrSelector = Nothing + ' + 'ucrReceiverLatitude + ' + Me.ucrReceiverLatitude.AutoSize = True + Me.ucrReceiverLatitude.frmParent = Me + Me.ucrReceiverLatitude.Location = New System.Drawing.Point(272, 25) + Me.ucrReceiverLatitude.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverLatitude.Name = "ucrReceiverLatitude" + Me.ucrReceiverLatitude.Selector = Nothing + Me.ucrReceiverLatitude.Size = New System.Drawing.Size(120, 20) + Me.ucrReceiverLatitude.strNcFilePath = "" + Me.ucrReceiverLatitude.TabIndex = 2 + Me.ucrReceiverLatitude.ucrSelector = Nothing + ' + 'lblLatitude + ' + Me.lblLatitude.AutoSize = True + Me.lblLatitude.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.lblLatitude.Location = New System.Drawing.Point(274, 10) + Me.lblLatitude.Name = "lblLatitude" + Me.lblLatitude.Size = New System.Drawing.Size(48, 13) + Me.lblLatitude.TabIndex = 1 + Me.lblLatitude.Text = "Latitude:" + ' + 'ucrSelectorStationFile + ' + Me.ucrSelectorStationFile.AutoSize = True + Me.ucrSelectorStationFile.bDropUnusedFilterLevels = False + Me.ucrSelectorStationFile.bShowHiddenColumns = False + Me.ucrSelectorStationFile.bUseCurrentFilter = True + Me.ucrSelectorStationFile.Location = New System.Drawing.Point(6, 16) + Me.ucrSelectorStationFile.Margin = New System.Windows.Forms.Padding(0) + Me.ucrSelectorStationFile.Name = "ucrSelectorStationFile" + Me.ucrSelectorStationFile.Size = New System.Drawing.Size(213, 185) + Me.ucrSelectorStationFile.TabIndex = 0 + ' + 'grpDataFile + ' + Me.grpDataFile.Controls.Add(Me.ucrReceiverDataFiles) + Me.grpDataFile.Controls.Add(Me.lblDataFiles) + Me.grpDataFile.Controls.Add(Me.ucrSelectorDataFiles) + Me.grpDataFile.Location = New System.Drawing.Point(12, 59) + Me.grpDataFile.Name = "grpDataFile" + Me.grpDataFile.Size = New System.Drawing.Size(397, 201) + Me.grpDataFile.TabIndex = 3 + Me.grpDataFile.TabStop = False + Me.grpDataFile.Text = "Data File" + ' + 'ucrReceiverDataFiles + ' + Me.ucrReceiverDataFiles.AutoSize = True + Me.ucrReceiverDataFiles.frmParent = Me + Me.ucrReceiverDataFiles.Location = New System.Drawing.Point(265, 38) + Me.ucrReceiverDataFiles.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverDataFiles.Name = "ucrReceiverDataFiles" + Me.ucrReceiverDataFiles.Selector = Nothing + Me.ucrReceiverDataFiles.Size = New System.Drawing.Size(120, 100) + Me.ucrReceiverDataFiles.strNcFilePath = "" + Me.ucrReceiverDataFiles.TabIndex = 2 + Me.ucrReceiverDataFiles.ucrSelector = Nothing + ' + 'lblDataFiles + ' + Me.lblDataFiles.AutoSize = True + Me.lblDataFiles.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.lblDataFiles.Location = New System.Drawing.Point(269, 19) + Me.lblDataFiles.Name = "lblDataFiles" + Me.lblDataFiles.Size = New System.Drawing.Size(76, 13) + Me.lblDataFiles.TabIndex = 1 + Me.lblDataFiles.Text = "Data Columns:" + ' + 'ucrSelectorDataFiles + ' + Me.ucrSelectorDataFiles.AutoSize = True + Me.ucrSelectorDataFiles.bDropUnusedFilterLevels = False + Me.ucrSelectorDataFiles.bShowHiddenColumns = False + Me.ucrSelectorDataFiles.bUseCurrentFilter = True + Me.ucrSelectorDataFiles.Location = New System.Drawing.Point(6, 16) + Me.ucrSelectorDataFiles.Margin = New System.Windows.Forms.Padding(0) + Me.ucrSelectorDataFiles.Name = "ucrSelectorDataFiles" + Me.ucrSelectorDataFiles.Size = New System.Drawing.Size(213, 185) + Me.ucrSelectorDataFiles.TabIndex = 0 + ' + 'lblClimaticVariable + ' + Me.lblClimaticVariable.AutoSize = True + Me.lblClimaticVariable.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.lblClimaticVariable.Location = New System.Drawing.Point(195, 468) + Me.lblClimaticVariable.Name = "lblClimaticVariable" + Me.lblClimaticVariable.Size = New System.Drawing.Size(87, 13) + Me.lblClimaticVariable.TabIndex = 19 + Me.lblClimaticVariable.Text = "Climatic Variable:" + ' + 'lblFinalYear + ' + Me.lblFinalYear.AutoSize = True + Me.lblFinalYear.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.lblFinalYear.Location = New System.Drawing.Point(15, 488) + Me.lblFinalYear.Name = "lblFinalYear" + Me.lblFinalYear.Size = New System.Drawing.Size(57, 13) + Me.lblFinalYear.TabIndex = 17 + Me.lblFinalYear.Text = "Final Year:" + ' + 'lblInitialYear + ' + Me.lblInitialYear.AutoSize = True + Me.lblInitialYear.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.lblInitialYear.Location = New System.Drawing.Point(15, 465) + Me.lblInitialYear.Name = "lblInitialYear" + Me.lblInitialYear.Size = New System.Drawing.Size(59, 13) + Me.lblInitialYear.TabIndex = 15 + Me.lblInitialYear.Text = "Initial Year:" + ' + 'ucrInputFinalYear + ' + Me.ucrInputFinalYear.AddQuotesIfUnrecognised = True + Me.ucrInputFinalYear.AutoSize = True + Me.ucrInputFinalYear.IsMultiline = False + Me.ucrInputFinalYear.IsReadOnly = False + Me.ucrInputFinalYear.Location = New System.Drawing.Point(77, 484) + Me.ucrInputFinalYear.Name = "ucrInputFinalYear" + Me.ucrInputFinalYear.Size = New System.Drawing.Size(89, 21) + Me.ucrInputFinalYear.TabIndex = 18 + ' + 'ucrInputInitialYear + ' + Me.ucrInputInitialYear.AddQuotesIfUnrecognised = True + Me.ucrInputInitialYear.AutoSize = True + Me.ucrInputInitialYear.IsMultiline = False + Me.ucrInputInitialYear.IsReadOnly = False + Me.ucrInputInitialYear.Location = New System.Drawing.Point(77, 461) + Me.ucrInputInitialYear.Name = "ucrInputInitialYear" + Me.ucrInputInitialYear.Size = New System.Drawing.Size(89, 21) + Me.ucrInputInitialYear.TabIndex = 16 + ' + 'ucrReceiverStation + ' + Me.ucrReceiverStation.AutoSize = True + Me.ucrReceiverStation.frmParent = Me + Me.ucrReceiverStation.Location = New System.Drawing.Point(266, 96) + Me.ucrReceiverStation.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverStation.Name = "ucrReceiverStation" + Me.ucrReceiverStation.Selector = Nothing + Me.ucrReceiverStation.Size = New System.Drawing.Size(120, 20) + Me.ucrReceiverStation.strNcFilePath = "" + Me.ucrReceiverStation.TabIndex = 5 + Me.ucrReceiverStation.ucrSelector = Nothing + ' + 'ucrSelectorHomogenization + ' + Me.ucrSelectorHomogenization.AutoSize = True + Me.ucrSelectorHomogenization.bDropUnusedFilterLevels = False + Me.ucrSelectorHomogenization.bShowHiddenColumns = False + Me.ucrSelectorHomogenization.bUseCurrentFilter = True + Me.ucrSelectorHomogenization.Location = New System.Drawing.Point(12, 58) + Me.ucrSelectorHomogenization.Margin = New System.Windows.Forms.Padding(0) + Me.ucrSelectorHomogenization.Name = "ucrSelectorHomogenization" + Me.ucrSelectorHomogenization.Size = New System.Drawing.Size(213, 183) + Me.ucrSelectorHomogenization.TabIndex = 4 + ' + 'ucrInputClimateVariables + ' + Me.ucrInputClimateVariables.AddQuotesIfUnrecognised = True + Me.ucrInputClimateVariables.AutoSize = True + Me.ucrInputClimateVariables.IsMultiline = False + Me.ucrInputClimateVariables.IsReadOnly = False + Me.ucrInputClimateVariables.Location = New System.Drawing.Point(284, 464) + Me.ucrInputClimateVariables.Name = "ucrInputClimateVariables" + Me.ucrInputClimateVariables.Size = New System.Drawing.Size(125, 21) + Me.ucrInputClimateVariables.TabIndex = 20 ' 'ucrPnlOptions ' Me.ucrPnlOptions.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrPnlOptions.Location = New System.Drawing.Point(51, 25) + Me.ucrPnlOptions.Location = New System.Drawing.Point(12, 2) Me.ucrPnlOptions.Name = "ucrPnlOptions" - Me.ucrPnlOptions.Size = New System.Drawing.Size(321, 30) + Me.ucrPnlOptions.Size = New System.Drawing.Size(408, 51) Me.ucrPnlOptions.TabIndex = 0 ' 'ucrSaveResult ' Me.ucrSaveResult.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink Me.ucrSaveResult.Enabled = False - Me.ucrSaveResult.Location = New System.Drawing.Point(12, 413) + Me.ucrSaveResult.Location = New System.Drawing.Point(12, 426) Me.ucrSaveResult.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.ucrSaveResult.Name = "ucrSaveResult" Me.ucrSaveResult.Size = New System.Drawing.Size(320, 24) - Me.ucrSaveResult.TabIndex = 14 + Me.ucrSaveResult.TabIndex = 13 ' 'ucrReceiverElement ' @@ -479,66 +765,111 @@ Partial Class dlgHomogenization Me.ucrReceiverElement.Selector = Nothing Me.ucrReceiverElement.Size = New System.Drawing.Size(120, 20) Me.ucrReceiverElement.strNcFilePath = "" - Me.ucrReceiverElement.TabIndex = 8 + Me.ucrReceiverElement.TabIndex = 7 Me.ucrReceiverElement.ucrSelector = Nothing ' - 'ucrSelectorHomogenization - ' - Me.ucrSelectorHomogenization.AutoSize = True - Me.ucrSelectorHomogenization.bDropUnusedFilterLevels = False - Me.ucrSelectorHomogenization.bShowHiddenColumns = False - Me.ucrSelectorHomogenization.bUseCurrentFilter = True - Me.ucrSelectorHomogenization.Location = New System.Drawing.Point(12, 58) - Me.ucrSelectorHomogenization.Margin = New System.Windows.Forms.Padding(0) - Me.ucrSelectorHomogenization.Name = "ucrSelectorHomogenization" - Me.ucrSelectorHomogenization.Size = New System.Drawing.Size(213, 183) - Me.ucrSelectorHomogenization.TabIndex = 4 - ' 'ucrBase ' Me.ucrBase.AutoSize = True Me.ucrBase.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrBase.Location = New System.Drawing.Point(12, 440) + Me.ucrBase.Location = New System.Drawing.Point(12, 515) Me.ucrBase.Name = "ucrBase" - Me.ucrBase.Size = New System.Drawing.Size(405, 52) - Me.ucrBase.TabIndex = 15 - ' - 'lblStation + Me.ucrBase.Size = New System.Drawing.Size(408, 52) + Me.ucrBase.TabIndex = 21 ' - Me.lblStation.AutoSize = True - Me.lblStation.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblStation.Location = New System.Drawing.Point(264, 80) - Me.lblStation.Name = "lblStation" - Me.lblStation.Size = New System.Drawing.Size(43, 13) - Me.lblStation.TabIndex = 5 - Me.lblStation.Text = "Station:" + 'ucrReceiverNeighbour ' - 'ucrReceiverStation + Me.ucrReceiverNeighbour.AutoSize = True + Me.ucrReceiverNeighbour.frmParent = Me + Me.ucrReceiverNeighbour.Location = New System.Drawing.Point(266, 206) + Me.ucrReceiverNeighbour.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverNeighbour.Name = "ucrReceiverNeighbour" + Me.ucrReceiverNeighbour.Selector = Nothing + Me.ucrReceiverNeighbour.Size = New System.Drawing.Size(120, 20) + Me.ucrReceiverNeighbour.strNcFilePath = "" + Me.ucrReceiverNeighbour.TabIndex = 9 + Me.ucrReceiverNeighbour.ucrSelector = Nothing ' - Me.ucrReceiverStation.AutoSize = True - Me.ucrReceiverStation.frmParent = Me - Me.ucrReceiverStation.Location = New System.Drawing.Point(266, 96) - Me.ucrReceiverStation.Margin = New System.Windows.Forms.Padding(0) - Me.ucrReceiverStation.Name = "ucrReceiverStation" - Me.ucrReceiverStation.Selector = Nothing - Me.ucrReceiverStation.Size = New System.Drawing.Size(120, 20) - Me.ucrReceiverStation.strNcFilePath = "" - Me.ucrReceiverStation.TabIndex = 6 - Me.ucrReceiverStation.ucrSelector = Nothing + 'rdoHomogenization + ' + Me.rdoHomogenization.Appearance = System.Windows.Forms.Appearance.Button + Me.rdoHomogenization.BackColor = System.Drawing.SystemColors.Control + Me.rdoHomogenization.FlatAppearance.BorderColor = System.Drawing.SystemColors.ActiveCaption + Me.rdoHomogenization.FlatAppearance.BorderSize = 2 + Me.rdoHomogenization.FlatAppearance.CheckedBackColor = System.Drawing.SystemColors.ActiveCaption + Me.rdoHomogenization.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.rdoHomogenization.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.rdoHomogenization.Location = New System.Drawing.Point(319, 9) + Me.rdoHomogenization.Name = "rdoHomogenization" + Me.rdoHomogenization.Size = New System.Drawing.Size(101, 28) + Me.rdoHomogenization.TabIndex = 23 + Me.rdoHomogenization.TabStop = True + Me.rdoHomogenization.Tag = "" + Me.rdoHomogenization.Text = "Homogenization" + Me.rdoHomogenization.TextAlign = System.Drawing.ContentAlignment.MiddleCenter + Me.rdoHomogenization.UseVisualStyleBackColor = False + ' + 'rdoMonthlyTotals + ' + Me.rdoMonthlyTotals.Appearance = System.Windows.Forms.Appearance.Button + Me.rdoMonthlyTotals.BackColor = System.Drawing.SystemColors.Control + Me.rdoMonthlyTotals.FlatAppearance.BorderColor = System.Drawing.SystemColors.ActiveCaption + Me.rdoMonthlyTotals.FlatAppearance.BorderSize = 2 + Me.rdoMonthlyTotals.FlatAppearance.CheckedBackColor = System.Drawing.SystemColors.ActiveCaption + Me.rdoMonthlyTotals.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.rdoMonthlyTotals.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.rdoMonthlyTotals.Location = New System.Drawing.Point(233, 9) + Me.rdoMonthlyTotals.Name = "rdoMonthlyTotals" + Me.rdoMonthlyTotals.Size = New System.Drawing.Size(91, 28) + Me.rdoMonthlyTotals.TabIndex = 24 + Me.rdoMonthlyTotals.TabStop = True + Me.rdoMonthlyTotals.Tag = "" + Me.rdoMonthlyTotals.Text = "Monthly Totals " + Me.rdoMonthlyTotals.TextAlign = System.Drawing.ContentAlignment.MiddleCenter + Me.rdoMonthlyTotals.UseVisualStyleBackColor = False + ' + 'rdoQualityControl + ' + Me.rdoQualityControl.Appearance = System.Windows.Forms.Appearance.Button + Me.rdoQualityControl.BackColor = System.Drawing.SystemColors.Control + Me.rdoQualityControl.FlatAppearance.BorderColor = System.Drawing.SystemColors.ActiveCaption + Me.rdoQualityControl.FlatAppearance.BorderSize = 2 + Me.rdoQualityControl.FlatAppearance.CheckedBackColor = System.Drawing.SystemColors.ActiveCaption + Me.rdoQualityControl.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.rdoQualityControl.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.rdoQualityControl.Location = New System.Drawing.Point(148, 9) + Me.rdoQualityControl.Name = "rdoQualityControl" + Me.rdoQualityControl.Size = New System.Drawing.Size(87, 28) + Me.rdoQualityControl.TabIndex = 25 + Me.rdoQualityControl.TabStop = True + Me.rdoQualityControl.Tag = "" + Me.rdoQualityControl.Text = "Quality Control" + Me.rdoQualityControl.TextAlign = System.Drawing.ContentAlignment.MiddleCenter + Me.rdoQualityControl.UseVisualStyleBackColor = False ' 'dlgHomogenization ' 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(422, 494) - Me.Controls.Add(Me.lblStation) + Me.ClientSize = New System.Drawing.Size(422, 570) + Me.Controls.Add(Me.rdoQualityControl) + Me.Controls.Add(Me.rdoMonthlyTotals) + Me.Controls.Add(Me.rdoHomogenization) + Me.Controls.Add(Me.grpStationFile) + Me.Controls.Add(Me.grpDataFile) + Me.Controls.Add(Me.ucrInputFinalYear) + Me.Controls.Add(Me.ucrInputInitialYear) + Me.Controls.Add(Me.lblInitialYear) + Me.Controls.Add(Me.lblFinalYear) Me.Controls.Add(Me.ucrReceiverStation) + Me.Controls.Add(Me.ucrSelectorHomogenization) + Me.Controls.Add(Me.lblClimaticVariable) + Me.Controls.Add(Me.ucrInputClimateVariables) + Me.Controls.Add(Me.rdoPrepare) + Me.Controls.Add(Me.lblStation) Me.Controls.Add(Me.lblNeighbouring) - Me.Controls.Add(Me.ucrReceiverNeighbour) - Me.Controls.Add(Me.rdoNeighbouring) Me.Controls.Add(Me.rdoSingle) - Me.Controls.Add(Me.rdoMultiple) Me.Controls.Add(Me.ucrPnlOptions) Me.Controls.Add(Me.ucrSaveResult) Me.Controls.Add(Me.grpOutputOptions) @@ -546,8 +877,8 @@ Partial Class dlgHomogenization Me.Controls.Add(Me.grpMethods) Me.Controls.Add(Me.lblElement) Me.Controls.Add(Me.ucrReceiverElement) - Me.Controls.Add(Me.ucrSelectorHomogenization) Me.Controls.Add(Me.ucrBase) + Me.Controls.Add(Me.ucrReceiverNeighbour) Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow Me.MaximizeBox = False Me.MinimizeBox = False @@ -560,6 +891,10 @@ Partial Class dlgHomogenization Me.grpCptOptions.PerformLayout() Me.grpOutputOptions.ResumeLayout(False) Me.grpOutputOptions.PerformLayout() + Me.grpStationFile.ResumeLayout(False) + Me.grpStationFile.PerformLayout() + Me.grpDataFile.ResumeLayout(False) + Me.grpDataFile.PerformLayout() Me.ResumeLayout(False) Me.PerformLayout() @@ -593,9 +928,7 @@ Partial Class dlgHomogenization Friend WithEvents lblPenaltyValue As Label Friend WithEvents ucrInputPenValue As ucrInputTextBox Friend WithEvents rdoSingle As RadioButton - Friend WithEvents rdoMultiple As RadioButton Friend WithEvents ucrPnlOptions As UcrPanel - Friend WithEvents rdoNeighbouring As RadioButton Friend WithEvents lblNeighbouring As Label Friend WithEvents ucrReceiverNeighbour As ucrReceiverSingle Friend WithEvents ucrInputComboVarDistribution As ucrInputComboBox @@ -605,4 +938,30 @@ Partial Class dlgHomogenization Friend WithEvents rdoBuishand As RadioButton Friend WithEvents lblStation As Label Friend WithEvents ucrReceiverStation As ucrReceiverSingle + Friend WithEvents rdoPrepare As RadioButton + Friend WithEvents lblClimaticVariable As Label + Friend WithEvents ucrInputClimateVariables As ucrInputTextBox + Friend WithEvents grpDataFile As GroupBox + Friend WithEvents ucrReceiverDataFiles As ucrReceiverMultiple + Friend WithEvents lblDataFiles As Label + Friend WithEvents ucrSelectorDataFiles As ucrSelectorByDataFrameAddRemove + Friend WithEvents grpStationFile As GroupBox + Friend WithEvents lblLatitude As Label + Friend WithEvents ucrSelectorStationFile As ucrSelectorByDataFrameAddRemove + Friend WithEvents ucrInputFinalYear As ucrInputTextBox + Friend WithEvents ucrInputInitialYear As ucrInputTextBox + Friend WithEvents lblInitialYear As Label + Friend WithEvents lblFinalYear As Label + Friend WithEvents ucrReceiverStationId As ucrReceiverSingle + Friend WithEvents ucrReceiverStationName As ucrReceiverSingle + Friend WithEvents ucrReceiverLongtitude As ucrReceiverSingle + Friend WithEvents ucrReceiverLatitude As ucrReceiverSingle + Friend WithEvents ucrReceiverElavation As ucrReceiverSingle + Friend WithEvents lblLongtude As Label + Friend WithEvents lblStationName As Label + Friend WithEvents lblStationID As Label + Friend WithEvents lblElavation As Label + Friend WithEvents rdoQualityControl As RadioButton + Friend WithEvents rdoMonthlyTotals As RadioButton + Friend WithEvents rdoHomogenization As RadioButton End Class diff --git a/instat/dlgHomogenization.vb b/instat/dlgHomogenization.vb index ffca7cb35e8..c376b0bdb9f 100644 --- a/instat/dlgHomogenization.vb +++ b/instat/dlgHomogenization.vb @@ -19,8 +19,17 @@ Imports instat.Translations Public Class dlgHomogenization Private bFirstLoad As Boolean = True Private bReset As Boolean = True - Private clsCptMeanFunction, clsCptVarianceFunction, clsCptMeanVarianceFunction, clsExcludeNAFunction, clsPlotFunction, clsSummaryFunction, clsSnhtFunction, clsPettittFunction, clsBuishandFunction, clsTapplyFunction, clsCompleteCasesFunction As New RFunction - Private clsBracketsOperator, clsLeftBracketOperator, clsRightBracketOperator As New ROperator + Private bResetRCode As Boolean = True + Private clsCptMeanFunction, clsCptVarianceFunction, clsCptMeanVarianceFunction, clsExcludeNAFunction, clsPlotFunction, clsSummaryFunction, clsSnhtFunction, + clsPettittFunction, clsBuishandFunction, clsTapplyFunction, clsDummyFunction, clsCsv2climatolFunction, clsHomogenQCFunctin, clsDdm2Function, clsHomogenFunction, + clsGetColumnsFunction, clsGetStnColumnsFunction, clsCompleteCasesFunction, clsPmatchFunction, clsPmatch2Function, clsColumnsFunction, clsColumns2Function As New RFunction + Private clsBracketsOperator, clsLeftBracketOperator, clsVars2ColumnsFunction, clsVars1ColumnsFunction, clsRightBracketOperator As New ROperator + + ' Counter variable to keep track of the enabled radio button + Private iEnabledRadioButtonIndex As Integer = 0 + + Private lstOfRadioButtons As List(Of RadioButton) + Private Sub dlgHomogenization_Load(sender As Object, e As EventArgs) Handles MyBase.Load If bFirstLoad Then InitialiseDialog() @@ -31,6 +40,7 @@ Public Class dlgHomogenization SetDefaults() End If SetRCodeForControls(bReset) + DialogSize() bReset = False TestOkEnabled() autoTranslate(Me) @@ -44,8 +54,52 @@ Public Class dlgHomogenization Dim dctMeanVarDistribution As New Dictionary(Of String, String) ucrBase.clsRsyntax.iCallType = 2 + ucrBase.iHelpTopicID = 621 ucrBase.clsRsyntax.bExcludeAssignedFunctionOutput = False + ucrSelectorStationFile.SetParameter(New RParameter("stnfile", 1)) + ucrSelectorStationFile.SetParameterIsrfunction() + + ucrSelectorDataFiles.SetParameter(New RParameter("csvfile", 0)) + ucrSelectorDataFiles.SetParameterIsrfunction() + + ucrReceiverDataFiles.SetParameter(New RParameter("datacol", 2)) + ucrReceiverDataFiles.Selector = ucrSelectorDataFiles + ucrReceiverDataFiles.SetParameterIsString() + + ucrReceiverLatitude.SetParameter(New RParameter("lat", 3, bNewIncludeArgumentName:=False)) + ucrReceiverLatitude.Selector = ucrSelectorStationFile + ucrReceiverLatitude.SetParameterIsString() + ucrReceiverLatitude.SetLinkedDisplayControl(lblLatitude) + ucrReceiverLatitude.SetMeAsReceiver() + + ucrReceiverLongtitude.Selector = ucrSelectorStationFile + ucrReceiverLongtitude.SetParameterIsString() + ucrReceiverLongtitude.SetLinkedDisplayControl(lblLongtude) + + ucrReceiverElavation.Selector = ucrSelectorStationFile + ucrReceiverElavation.SetParameterIsString() + ucrReceiverElavation.SetLinkedDisplayControl(lblElavation) + + ucrReceiverStationName.Selector = ucrSelectorStationFile + ucrReceiverStationName.SetParameterIsString() + ucrReceiverStationName.SetLinkedDisplayControl(lblStationName) + + ucrReceiverStationId.Selector = ucrSelectorStationFile + ucrReceiverStationId.SetParameterIsString() + ucrReceiverStationId.SetLinkedDisplayControl(lblStationID) + + ucrInputClimateVariables.SetParameter(New RParameter("varcli", 8)) + ucrInputClimateVariables.SetLinkedDisplayControl(lblClimaticVariable) + + ucrInputInitialYear.SetParameter(New RParameter("anyi", 1)) + ucrInputInitialYear.SetValidationTypeAsNumeric() + ucrInputInitialYear.SetLinkedDisplayControl(lblInitialYear) + + ucrInputFinalYear.SetParameter(New RParameter("anyf", 2)) + ucrInputFinalYear.SetValidationTypeAsNumeric() + ucrInputFinalYear.SetLinkedDisplayControl(lblFinalYear) + ucrReceiverStation.SetParameter(New RParameter("station", 0)) ucrReceiverStation.Selector = ucrSelectorHomogenization ucrReceiverStation.SetParameterIsRFunction() @@ -75,11 +129,15 @@ Public Class dlgHomogenization ttOptions.SetToolTip(rdoBuishand, "Performes the Buishand range test for change-point detection of a normal variate.") ucrPnlOptions.AddRadioButton(rdoSingle) - ucrPnlOptions.AddRadioButton(rdoNeighbouring) - ucrPnlOptions.AddRadioButton(rdoMultiple) - ucrPnlOptions.AddFunctionNamesCondition(rdoSingle, {"cpt.mean", "cpt.var", "cpt.meanvar", "snh.test", "pettitt.test", "br.test", "tapply"}) - ucrPnlOptions.AddFunctionNamesCondition(rdoNeighbouring, {"cpt.mean", "cpt.var", "cpt.meanvar", "snh.test", "pettitt.test", "br.test", "tapply"}, False) - ucrPnlOptions.AddFunctionNamesCondition(rdoMultiple, {"cpt.mean", "cpt.var", "cpt.meanvar", "snh.test", "pettitt.test", "br.test", "tapply"}, False) + ucrPnlOptions.AddRadioButton(rdoPrepare) + ucrPnlOptions.AddRadioButton(rdoQualityControl) + ucrPnlOptions.AddRadioButton(rdoMonthlyTotals) + ucrPnlOptions.AddRadioButton(rdoHomogenization) + ucrPnlOptions.AddParameterValuesCondition(rdoSingle, "checked", "single") + ucrPnlOptions.AddParameterValuesCondition(rdoPrepare, "checked", "prepare") + ucrPnlOptions.AddParameterValuesCondition(rdoQualityControl, "checked", "quality") + ucrPnlOptions.AddParameterValuesCondition(rdoMonthlyTotals, "checked", "month_totals") + ucrPnlOptions.AddParameterValuesCondition(rdoHomogenization, "checked", "homogen") ucrChkPlot.SetText("Plot") ucrChkPlot.AddRSyntaxContainsFunctionNamesCondition(True, {"plot"}) @@ -148,16 +206,13 @@ Public Class dlgHomogenization ucrInputPenValue.SetValidationTypeAsNumeric() ttOptions.SetToolTip(ucrInputPenValue.txtInput, "The theoretical type I error e.g.0.05 when using the Asymptotic penalty. A vector of length 2 (min,max) if using the CROPS penalty") - 'ucrSaveResult.SetDataFrameSelector(ucrSelectorHomogenization.ucrAvailableDataFrames) ucrSaveResult.SetCheckBoxText("Save Test Object:") - 'ucrSaveResult.SetSaveTypeAsModel() - 'ucrSaveResult.SetIsComboBox() - 'ucrSaveResult.SetPrefix("Test") - 'ucrSaveResult.SetAssignToIfUncheckedValue("last_model") + ucrPnlOptions.AddToLinkedControls({ucrSelectorHomogenization, ucrSaveResult, ucrReceiverNeighbour, ucrReceiverStation, ucrReceiverElement}, {rdoSingle}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) + ucrPnlOptions.AddToLinkedControls({ucrInputClimateVariables}, {rdoPrepare, rdoQualityControl, rdoHomogenization, rdoMonthlyTotals}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) + ucrPnlOptions.AddToLinkedControls({ucrInputInitialYear, ucrInputFinalYear}, {rdoQualityControl, rdoHomogenization, rdoMonthlyTotals}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) ucrInputComboPenalty.AddToLinkedControls(ucrInputPenValue, {"Asymptotic", "CROPS"}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:=0) ucrInputComboMethod.AddToLinkedControls(ucrInputQ, {"SegNeigh", "BinSeg"}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:=5) - ucrPnlOptions.AddToLinkedControls(ucrReceiverNeighbour, {rdoNeighbouring}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) ucrPnlMethods.AddToLinkedControls(ucrInputComboMeanDistribution, {rdoCptMean}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) ucrPnlMethods.AddToLinkedControls(ucrInputComboVarDistribution, {rdoCptVariance}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) ucrPnlMethods.AddToLinkedControls(ucrInputComboMeanVarDistribution, {rdoCptMeanVariance}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) @@ -166,10 +221,11 @@ Public Class dlgHomogenization ucrReceiverNeighbour.SetLinkedDisplayControl(lblNeighbouring) ucrInputPenValue.SetLinkedDisplayControl(lblPenaltyValue) ucrInputQ.SetLinkedDisplayControl(lblQ) + ucrReceiverElement.SetLinkedDisplayControl(lblElement) + ucrReceiverStation.SetLinkedDisplayControl(lblStation) + + lstOfRadioButtons = New List(Of RadioButton) From {rdoPrepare, rdoQualityControl, rdoMonthlyTotals, rdoHomogenization} - 'Not yet working! - rdoMultiple.Enabled = False - rdoNeighbouring.Enabled = False End Sub Private Sub SetDefaults() @@ -183,17 +239,34 @@ Public Class dlgHomogenization clsPettittFunction = New RFunction clsBuishandFunction = New RFunction clsCompleteCasesFunction = New RFunction + clsCsv2climatolFunction = New RFunction + clsDummyFunction = New RFunction + clsGetColumnsFunction = New RFunction + clsPmatchFunction = New RFunction + clsColumnsFunction = New RFunction + clsPmatch2Function = New RFunction + clsColumns2Function = New RFunction + clsGetStnColumnsFunction = New RFunction + clsHomogenQCFunctin = New RFunction + clsDdm2Function = New RFunction + clsHomogenFunction = New RFunction clsBracketsOperator = New ROperator clsLeftBracketOperator = New ROperator clsRightBracketOperator = New ROperator + clsVars1ColumnsFunction = New ROperator + clsVars2ColumnsFunction = New ROperator ucrSelectorHomogenization.Reset() ucrReceiverElement.SetMeAsReceiver() - 'ucrSaveResult.Reset() + ucrReceiverDataFiles.SetMeAsReceiver() + ucrSelectorDataFiles.Reset() + ucrSelectorStationFile.Reset() 'TODO: Set conditions properly! rdoSnht.Checked = True + clsDummyFunction.AddParameter("checked", "single", iPosition:=0) + clsCptMeanFunction.SetPackageName("changepoint") clsCptMeanFunction.SetRCommand("cpt.mean") clsCptMeanFunction.AddParameter("Q", 5, iPosition:=5) @@ -248,9 +321,59 @@ Public Class dlgHomogenization clsRightBracketOperator.bSpaceAroundOperation = False clsRightBracketOperator.bBrackets = False + clsCsv2climatolFunction.SetPackageName("climatol") + clsCsv2climatolFunction.SetRCommand("csv2climatol") + clsCsv2climatolFunction.AddParameter("datacol", clsRFunctionParameter:=clsPmatchFunction, iPosition:=1) + clsCsv2climatolFunction.AddParameter("stncol", clsRFunctionParameter:=clsPmatch2Function, iPosition:=3) + clsCsv2climatolFunction.AddParameter("header", "TRUE", iPosition:=4) + + clsGetColumnsFunction.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$get_columns_from_data") + clsGetColumnsFunction.SetAssignTo("col_data") + + clsGetStnColumnsFunction.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$get_columns_from_data") + clsGetStnColumnsFunction.SetAssignTo("stn_data") + + clsVars1ColumnsFunction.SetOperation("", bBracketsTemp:=False) + clsVars1ColumnsFunction.SetAssignTo("var_1") + + clsColumnsFunction.SetRCommand("colnames") + + clsPmatchFunction.SetRCommand("pmatch") + clsPmatchFunction.AddParameter("elements", clsRFunctionParameter:=clsColumnsFunction, bIncludeArgumentName:=False, iPosition:=0) + clsPmatchFunction.AddParameter("duplicates.ok", "TRUE", iPosition:=1) + clsPmatchFunction.AddParameter("cols", clsROperatorParameter:=clsVars1ColumnsFunction, bIncludeArgumentName:=False, iPosition:=0) + clsPmatchFunction.SetAssignTo("data_file") + + clsVars2ColumnsFunction.SetOperation("", bBracketsTemp:=False) + clsVars2ColumnsFunction.SetAssignTo("var_2") + + clsColumns2Function.SetRCommand("colnames") + + clsPmatch2Function.SetRCommand("pmatch") + clsPmatch2Function.AddParameter("stn_data", clsRFunctionParameter:=clsColumns2Function, bIncludeArgumentName:=False, iPosition:=0) + clsPmatch2Function.AddParameter("duplicates.ok", "TRUE", iPosition:=1) + clsPmatch2Function.AddParameter("cols", clsROperatorParameter:=clsVars2ColumnsFunction, bIncludeArgumentName:=False, iPosition:=0) + clsPmatch2Function.SetAssignTo("stns_file") + + clsHomogenQCFunctin.SetPackageName("climatol") + clsHomogenQCFunctin.SetRCommand("homogen") + clsHomogenQCFunctin.AddParameter("onlyQC", "TRUE", iPosition:=3) + clsHomogenQCFunctin.SetAssignTo("QC") + + clsDdm2Function.SetPackageName("climatol") + clsDdm2Function.SetRCommand("dd2m") + clsDdm2Function.AddParameter("valm", 1, iPosition:=3) + + clsHomogenFunction.SetPackageName("climatol") + clsHomogenFunction.SetRCommand("homogen") + clsHomogenFunction.AddParameter("std", 1, iPosition:=3) + clsHomogenFunction.AddParameter("annual", Chr(34) & "total" & Chr(34), iPosition:=4) + ucrBase.clsRsyntax.ClearCodes() ucrBase.clsRsyntax.SetBaseRFunction(clsSnhtFunction) AddPlotSummaryParameters() + + ResetRadioButtons() End Sub Private Sub SetRCodeForControls(bReset As Boolean) @@ -283,26 +406,43 @@ Public Class dlgHomogenization ucrReceiverStation.SetRCode(clsLeftBracketOperator, bReset) - 'ucrPnlMethods.SetRCode(ucrBase.clsRsyntax.clsBaseFunction, bReset) - ucrPnlOptions.SetRCode(ucrBase.clsRsyntax.clsBaseFunction, bReset) - - 'ucrSaveResult.AddAdditionalRCode(clsCptVarianceFunction, iAdditionalPairNo:=1) - 'ucrSaveResult.AddAdditionalRCode(clsCptMeanVarianceFunction, iAdditionalPairNo:=2) - 'ucrSaveResult.AddAdditionalRCode(clsPettittFunction, iAdditionalPairNo:=3) - 'ucrSaveResult.AddAdditionalRCode(clsSnhtFunction, iAdditionalPairNo:=4) - 'ucrSaveResult.AddAdditionalRCode(clsBuishandFunction, iAdditionalPairNo:=5) - - 'ucrSaveResult.SetRCode(clsCptMeanFunction, bReset) + If bReset Then + ucrPnlOptions.SetRCode(clsDummyFunction, bReset) + End If + ucrReceiverDataFiles.SetRCode(clsGetColumnsFunction, bReset) + ucrSelectorDataFiles.SetRCode(clsGetColumnsFunction, bReset) + ucrReceiverLatitude.SetRCode(clsGetColumnsFunction, bReset) + ucrReceiverLongtitude.SetRCode(clsGetColumnsFunction, bReset) + ucrReceiverElavation.SetRCode(clsGetColumnsFunction, bReset) + ucrReceiverStationId.SetRCode(clsGetColumnsFunction, bReset) + ucrReceiverStationName.SetRCode(clsGetColumnsFunction, bReset) + ucrInputClimateVariables.SetRCode(clsCsv2climatolFunction, bReset) + ucrSelectorStationFile.SetRCode(clsGetStnColumnsFunction, bReset) ucrChkPlot.SetRSyntax(ucrBase.clsRsyntax, bReset) ucrChkSummary.SetRSyntax(ucrBase.clsRsyntax, bReset) + ucrInputFinalYear.SetRSyntax(ucrBase.clsRsyntax, bReset) + ucrInputInitialYear.SetRSyntax(ucrBase.clsRsyntax, bReset) + End Sub + + Private Sub ResetRadioButtons() + With lstOfRadioButtons + .ForEach(Sub(radioButton) radioButton.Enabled = False) + .First().Enabled = True + End With End Sub Private Sub TestOkEnabled() - If ucrReceiverElement.IsEmpty OrElse Not ucrSaveResult.IsComplete OrElse (ucrInputComboMethod.GetText = "BinSeg" AndAlso ucrInputQ.IsEmpty) OrElse (ucrInputComboPenalty.GetText = "Asymptotic" AndAlso ucrInputPenValue.IsEmpty) OrElse ucrNudMinSegLen.GetText = "" Then - ucrBase.OKEnabled(False) + If rdoSingle.Checked Then + If ucrReceiverElement.IsEmpty OrElse Not ucrSaveResult.IsComplete OrElse (ucrInputComboMethod.GetText = "BinSeg" AndAlso ucrInputQ.IsEmpty) OrElse (ucrInputComboPenalty.GetText = "Asymptotic" AndAlso ucrInputPenValue.IsEmpty) OrElse ucrNudMinSegLen.GetText = "" Then + ucrBase.OKEnabled(False) + Else + ucrBase.OKEnabled(True) + End If + ElseIf rdoPrepare.Checked Then + ucrBase.OKEnabled((Not ucrReceiverLatitude.IsEmpty AndAlso Not ucrReceiverLongtitude.IsEmpty AndAlso (Not ucrReceiverStationName.IsEmpty OrElse Not ucrReceiverStationId.IsEmpty) AndAlso Not ucrReceiverDataFiles.IsEmpty) AndAlso Not ucrInputClimateVariables.IsEmpty) Else - ucrBase.OKEnabled(True) + ucrBase.OKEnabled(Not ucrInputClimateVariables.IsEmpty AndAlso Not ucrInputInitialYear.IsEmpty AndAlso Not ucrInputFinalYear.IsEmpty) End If End Sub @@ -387,7 +527,189 @@ Public Class dlgHomogenization TestOkEnabled() End Sub - Private Sub Controls_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrReceiverElement.ControlContentsChanged, ucrSaveResult.ControlContentsChanged, ucrInputQ.ControlContentsChanged, ucrInputPenValue.ControlContentsChanged, ucrNudMinSegLen.ControlContentsChanged, ucrInputComboMethod.ControlContentsChanged, ucrInputComboPenalty.ControlContentsChanged + Private Sub ucrPnlOptions_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrPnlOptions.ControlValueChanged + If rdoSingle.Checked Then + ucrBase.clsRsyntax.SetBaseRFunction(clsSnhtFunction) + ucrBase.clsRsyntax.RemoveFromAfterCodes(clsHomogenQCFunctin) + ucrBase.clsRsyntax.RemoveFromAfterCodes(clsDdm2Function) + ucrBase.clsRsyntax.RemoveFromAfterCodes(clsHomogenFunction) + ElseIf rdoPrepare.Checked Then + ucrBase.clsRsyntax.SetBaseRFunction(clsCsv2climatolFunction) + ElseIf rdoQualityControl.Checked Then + ucrBase.clsRsyntax.SetBaseRFunction(clsHomogenQCFunctin) + ElseIf rdoMonthlyTotals.Checked Then + ucrBase.clsRsyntax.SetBaseRFunction(clsDdm2Function) + Else + ucrBase.clsRsyntax.SetBaseRFunction(clsHomogenFunction) + End If + DialogSize() + HideShowControls() + End Sub + + Private Sub HideShowControls() + If rdoPrepare.Checked Then + grpDataFile.Show() + grpStationFile.Show() + grpMethods.Hide() + grpCptOptions.Hide() + grpOutputOptions.Hide() + ElseIf rdoHomogenization.Checked Then + grpMethods.Hide() + grpCptOptions.Hide() + grpOutputOptions.Hide() + grpStationFile.Hide() + grpDataFile.Hide() + ElseIf rdoMonthlyTotals.Checked Then + grpMethods.Hide() + grpCptOptions.Hide() + grpOutputOptions.Hide() + grpStationFile.Hide() + grpDataFile.Hide() + ElseIf rdoQualityControl.Checked Then + grpMethods.Hide() + grpCptOptions.Hide() + grpOutputOptions.Hide() + grpStationFile.Hide() + grpDataFile.Hide() + Else + grpStationFile.Hide() + grpDataFile.Hide() + grpMethods.Show() + grpCptOptions.Show() + grpOutputOptions.Show() + End If + End Sub + + Private Sub DialogSize() + If rdoSingle.Checked Then + Me.Size = New Size(438, 550) + Me.ucrBase.Location = New Point(12, 460) + ElseIf rdoPrepare.Checked Then + Me.Size = New Size(438, 609) + Me.ucrBase.Location = New Point(12, 515) + Me.ucrInputClimateVariables.Location = New Point(284, 464) + Me.lblClimaticVariable.Location = New Point(195, 468) + Else + Me.Size = New Size(438, 160) + Me.ucrBase.Location = New Point(12, 130) + Me.ucrInputClimateVariables.Location = New Point(272, 61) + Me.ucrInputInitialYear.Location = New Point(77, 59) + Me.ucrInputFinalYear.Location = New Point(77, 90) + Me.lblClimaticVariable.Location = New Point(182, 65) + Me.lblFinalYear.Location = New Point(15, 94) + Me.lblInitialYear.Location = New Point(15, 63) + End If + End Sub + + Private Sub ucrReceiverDataFiles_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrReceiverDataFiles.ControlValueChanged + If Not ucrReceiverDataFiles.IsEmpty Then + clsVars1ColumnsFunction.AddParameter("cols", ucrReceiverDataFiles.GetVariableNames(True), iPosition:=0, bIncludeArgumentName:=False) + Else + clsVars1ColumnsFunction.RemoveParameterByName("cols") + End If + End Sub + + Private Sub ucrSelectorDataFiles_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrSelectorDataFiles.ControlValueChanged + If Not ucrSelectorDataFiles.IsEmpty Then + clsColumnsFunction.AddParameter("data", clsRCodeStructureParameter:=ucrSelectorDataFiles.ucrAvailableDataFrames.clsCurrDataFrame, bIncludeArgumentName:=False, iPosition:=0) + clsCsv2climatolFunction.AddParameter("data", Chr(34) & ucrSelectorDataFiles.ucrAvailableDataFrames.cboAvailableDataFrames.SelectedItem & ".csv" & Chr(34), bIncludeArgumentName:=False, iPosition:=0) + Else + clsColumnsFunction.RemoveParameterByName("data") + clsCsv2climatolFunction.RemoveParameterByName("data") + End If + End Sub + + Private Sub ucrSelectorStationFile_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrSelectorStationFile.ControlValueChanged + If Not ucrSelectorStationFile.IsEmpty Then + clsColumns2Function.AddParameter("stndata", clsRCodeStructureParameter:=ucrSelectorStationFile.ucrAvailableDataFrames.clsCurrDataFrame, bIncludeArgumentName:=False, iPosition:=0) + clsCsv2climatolFunction.AddParameter("stnfile", Chr(34) & ucrSelectorStationFile.ucrAvailableDataFrames.cboAvailableDataFrames.SelectedItem & ".csv" & Chr(34), iPosition:=2) + Else + clsColumns2Function.RemoveParameterByName("stndata") + clsCsv2climatolFunction.RemoveParameterByName("stnfile") + End If + End Sub + + Private Sub ucrInputClimateVariables_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrInputClimateVariables.ControlValueChanged + If Not ucrInputClimateVariables.IsEmpty Then + clsCsv2climatolFunction.AddParameter("varcli", Chr(34) & ucrInputClimateVariables.GetText & Chr(34), iPosition:=5) + clsHomogenQCFunctin.AddParameter("par", Chr(34) & ucrInputClimateVariables.GetText & Chr(34), bIncludeArgumentName:=False, iPosition:=0) + clsDdm2Function.AddParameter("var", Chr(34) & ucrInputClimateVariables.GetText & Chr(34), bIncludeArgumentName:=False, iPosition:=0) + clsHomogenFunction.AddParameter("name", Chr(34) & ucrInputClimateVariables.GetText & "-m" & Chr(34), bIncludeArgumentName:=False, iPosition:=0) + Else + clsCsv2climatolFunction.RemoveParameterByName("varcli") + clsHomogenQCFunctin.RemoveParameterByName("par") + clsDdm2Function.RemoveParameterByName("var") + clsHomogenFunction.RemoveParameterByName("name") + End If + End Sub + + Private Sub ucrInputFinalYear_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrInputFinalYear.ControlValueChanged + If Not ucrInputFinalYear.IsEmpty Then + clsHomogenQCFunctin.AddParameter("anyf", ucrInputFinalYear.GetText, iPosition:=2, bIncludeArgumentName:=False) + clsDdm2Function.AddParameter("initial", ucrInputFinalYear.GetText, bIncludeArgumentName:=False, iPosition:=2) + clsHomogenFunction.AddParameter("in_yr", ucrInputFinalYear.GetText, bIncludeArgumentName:=False, iPosition:=2) + Else + clsHomogenQCFunctin.RemoveParameterByName("anyf") + clsDdm2Function.RemoveParameterByName("par") + clsHomogenFunction.RemoveParameterByName("in_yr") + End If + End Sub + + Private Sub ucrInputInitialYear_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrInputInitialYear.ControlValueChanged + If Not ucrInputInitialYear.IsEmpty Then + clsHomogenQCFunctin.AddParameter("anyi", ucrInputInitialYear.GetText, iPosition:=1, bIncludeArgumentName:=False) + clsDdm2Function.AddParameter("final", ucrInputInitialYear.GetText, bIncludeArgumentName:=False, iPosition:=1) + clsHomogenFunction.AddParameter("final_yr", ucrInputInitialYear.GetText, bIncludeArgumentName:=False, iPosition:=1) + Else + clsHomogenQCFunctin.RemoveParameterByName("anyi") + clsDdm2Function.RemoveParameterByName("final") + clsHomogenFunction.RemoveParameterByName("final_yr") + End If + End Sub + + Private Sub ucrReceiverLatitude_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrReceiverLatitude.ControlValueChanged, ucrReceiverElavation.ControlValueChanged, + ucrReceiverLongtitude.ControlValueChanged, ucrReceiverStationId.ControlValueChanged, ucrReceiverStationName.ControlValueChanged + If Not ucrReceiverLatitude.IsEmpty AndAlso Not ucrReceiverLongtitude.IsEmpty Then + Dim lstVariables As New List(Of String)() + + lstVariables.Add(ucrReceiverLatitude.GetVariableNames()) + lstVariables.Add(ucrReceiverLongtitude.GetVariableNames()) + + If Not ucrReceiverElavation.IsEmpty Then + lstVariables.Add(ucrReceiverElavation.GetVariableNames()) + Else + lstVariables.Add(0) + End If + + If Not ucrReceiverStationName.IsEmpty Then + lstVariables.Add(ucrReceiverStationName.GetVariableNames()) + End If + + If Not ucrReceiverStationId.IsEmpty Then + lstVariables.Add(ucrReceiverStationId.GetVariableNames()) + End If + clsVars2ColumnsFunction.AddParameter("cols", "c(" & String.Join(", ", lstVariables) & ")", iPosition:=0, bIncludeArgumentName:=False) + Else + clsVars2ColumnsFunction.RemoveParameterByName("cols") + End If + End Sub + + Private Sub ucrBase_ClickOk(sender As Object, e As EventArgs) Handles ucrBase.ClickOk + If iEnabledRadioButtonIndex >= 0 AndAlso iEnabledRadioButtonIndex < lstOfRadioButtons.Count - 1 Then + ' Enable the next radio button + iEnabledRadioButtonIndex += 1 + lstOfRadioButtons(iEnabledRadioButtonIndex).Enabled = True + Else + ' If all radio buttons are enabled, you may want to reset the counter or handle it as per your requirements + ' For this example, I am resetting the counter to 0 + iEnabledRadioButtonIndex = 0 + End If + End Sub + + Private Sub Controls_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrReceiverElement.ControlContentsChanged, ucrSaveResult.ControlContentsChanged, + ucrInputQ.ControlContentsChanged, ucrInputPenValue.ControlContentsChanged, ucrNudMinSegLen.ControlContentsChanged, + ucrInputComboMethod.ControlContentsChanged, ucrInputComboPenalty.ControlContentsChanged, ucrReceiverDataFiles.ControlContentsChanged, ucrInputFinalYear.ControlContentsChanged, ucrInputInitialYear.ControlContentsChanged, ucrInputClimateVariables.ControlContentsChanged, + ucrReceiverStationName.ControlContentsChanged, ucrReceiverStationId.ControlContentsChanged, ucrReceiverLongtitude.ControlContentsChanged, ucrReceiverLatitude.ControlContentsChanged TestOkEnabled() End Sub End Class \ No newline at end of file diff --git a/instat/dlgIDFCurves.Designer.vb b/instat/dlgIDFCurves.Designer.vb index f9af1238740..d5264b4eda9 100644 --- a/instat/dlgIDFCurves.Designer.vb +++ b/instat/dlgIDFCurves.Designer.vb @@ -22,13 +22,150 @@ Partial Class dlgIDFCurves 'Do not modify it using the code editor. _ Private Sub InitializeComponent() + Me.lblDateTime = New System.Windows.Forms.Label() + Me.lblRain = New System.Windows.Forms.Label() + Me.lblStationName = New System.Windows.Forms.Label() + Me.lblMinimumProp = New System.Windows.Forms.Label() + Me.ucrSave = New instat.ucrSave() + Me.ucrNudMaxPrec = New instat.ucrNud() + Me.ucrStationName = New instat.ucrInputTextBox() + Me.ucrReceiverPrec = New instat.ucrReceiverSingle() + Me.ucrReceiverDateTime = New instat.ucrReceiverSingle() + Me.ucrIDFCurvesSelector = New instat.ucrSelectorByDataFrameAddRemove() + Me.ucrBase = New instat.ucrButtons() Me.SuspendLayout() ' + 'lblDateTime + ' + Me.lblDateTime.AutoSize = True + Me.lblDateTime.Location = New System.Drawing.Point(290, 38) + Me.lblDateTime.Name = "lblDateTime" + Me.lblDateTime.Size = New System.Drawing.Size(56, 13) + Me.lblDateTime.TabIndex = 4 + Me.lblDateTime.Text = "Date-Time" + ' + 'lblRain + ' + Me.lblRain.AutoSize = True + Me.lblRain.Location = New System.Drawing.Point(289, 81) + Me.lblRain.Name = "lblRain" + Me.lblRain.Size = New System.Drawing.Size(29, 13) + Me.lblRain.TabIndex = 5 + Me.lblRain.Text = "Rain" + ' + 'lblStationName + ' + Me.lblStationName.AutoSize = True + Me.lblStationName.Location = New System.Drawing.Point(289, 128) + Me.lblStationName.Name = "lblStationName" + Me.lblStationName.Size = New System.Drawing.Size(71, 13) + Me.lblStationName.TabIndex = 7 + Me.lblStationName.Text = "Station Name" + ' + 'lblMinimumProp + ' + Me.lblMinimumProp.AutoSize = True + Me.lblMinimumProp.Location = New System.Drawing.Point(263, 186) + Me.lblMinimumProp.Name = "lblMinimumProp" + Me.lblMinimumProp.Size = New System.Drawing.Size(99, 13) + Me.lblMinimumProp.TabIndex = 9 + Me.lblMinimumProp.Text = "Minimum Proportion" + ' + 'ucrSave + ' + Me.ucrSave.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrSave.Location = New System.Drawing.Point(7, 224) + Me.ucrSave.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) + Me.ucrSave.Name = "ucrSave" + Me.ucrSave.Size = New System.Drawing.Size(401, 24) + Me.ucrSave.TabIndex = 70 + ' + 'ucrNudMaxPrec + ' + Me.ucrNudMaxPrec.AutoSize = True + Me.ucrNudMaxPrec.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudMaxPrec.Increment = New Decimal(New Integer() {1, 0, 0, 0}) + Me.ucrNudMaxPrec.Location = New System.Drawing.Point(365, 183) + Me.ucrNudMaxPrec.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) + Me.ucrNudMaxPrec.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudMaxPrec.Name = "ucrNudMaxPrec" + Me.ucrNudMaxPrec.Size = New System.Drawing.Size(50, 20) + Me.ucrNudMaxPrec.TabIndex = 8 + Me.ucrNudMaxPrec.Value = New Decimal(New Integer() {0, 0, 0, 0}) + ' + 'ucrStationName + ' + Me.ucrStationName.AddQuotesIfUnrecognised = True + Me.ucrStationName.AutoSize = True + Me.ucrStationName.IsMultiline = False + Me.ucrStationName.IsReadOnly = False + Me.ucrStationName.Location = New System.Drawing.Point(286, 144) + Me.ucrStationName.Name = "ucrStationName" + Me.ucrStationName.Size = New System.Drawing.Size(130, 21) + Me.ucrStationName.TabIndex = 6 + ' + 'ucrReceiverPrec + ' + Me.ucrReceiverPrec.AutoSize = True + Me.ucrReceiverPrec.frmParent = Me + Me.ucrReceiverPrec.Location = New System.Drawing.Point(286, 98) + Me.ucrReceiverPrec.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverPrec.Name = "ucrReceiverPrec" + Me.ucrReceiverPrec.Selector = Nothing + Me.ucrReceiverPrec.Size = New System.Drawing.Size(120, 20) + Me.ucrReceiverPrec.strNcFilePath = "" + Me.ucrReceiverPrec.TabIndex = 3 + Me.ucrReceiverPrec.ucrSelector = Nothing + ' + 'ucrReceiverDateTime + ' + Me.ucrReceiverDateTime.AutoSize = True + Me.ucrReceiverDateTime.frmParent = Me + Me.ucrReceiverDateTime.Location = New System.Drawing.Point(286, 55) + Me.ucrReceiverDateTime.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverDateTime.Name = "ucrReceiverDateTime" + Me.ucrReceiverDateTime.Selector = Nothing + Me.ucrReceiverDateTime.Size = New System.Drawing.Size(120, 20) + Me.ucrReceiverDateTime.strNcFilePath = "" + Me.ucrReceiverDateTime.TabIndex = 2 + Me.ucrReceiverDateTime.ucrSelector = Nothing + ' + 'ucrIDFCurvesSelector + ' + Me.ucrIDFCurvesSelector.AutoSize = True + Me.ucrIDFCurvesSelector.bDropUnusedFilterLevels = False + Me.ucrIDFCurvesSelector.bShowHiddenColumns = False + Me.ucrIDFCurvesSelector.bUseCurrentFilter = True + Me.ucrIDFCurvesSelector.Location = New System.Drawing.Point(6, 8) + Me.ucrIDFCurvesSelector.Margin = New System.Windows.Forms.Padding(0) + Me.ucrIDFCurvesSelector.Name = "ucrIDFCurvesSelector" + Me.ucrIDFCurvesSelector.Size = New System.Drawing.Size(213, 183) + Me.ucrIDFCurvesSelector.TabIndex = 1 + ' + 'ucrBase + ' + Me.ucrBase.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrBase.Location = New System.Drawing.Point(6, 258) + Me.ucrBase.Name = "ucrBase" + Me.ucrBase.Size = New System.Drawing.Size(410, 52) + Me.ucrBase.TabIndex = 0 + ' 'dlgIDFCurves ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(487, 450) + Me.ClientSize = New System.Drawing.Size(417, 329) + Me.Controls.Add(Me.ucrSave) + Me.Controls.Add(Me.lblMinimumProp) + Me.Controls.Add(Me.ucrNudMaxPrec) + Me.Controls.Add(Me.lblStationName) + Me.Controls.Add(Me.ucrStationName) + Me.Controls.Add(Me.lblRain) + Me.Controls.Add(Me.lblDateTime) + Me.Controls.Add(Me.ucrReceiverPrec) + Me.Controls.Add(Me.ucrReceiverDateTime) + Me.Controls.Add(Me.ucrIDFCurvesSelector) + Me.Controls.Add(Me.ucrBase) Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow Me.MaximizeBox = False Me.MinimizeBox = False @@ -36,6 +173,19 @@ Partial Class dlgIDFCurves Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen Me.Text = "IDF Curves" Me.ResumeLayout(False) + Me.PerformLayout() End Sub + + Friend WithEvents ucrBase As ucrButtons + Friend WithEvents ucrIDFCurvesSelector As ucrSelectorByDataFrameAddRemove + Friend WithEvents ucrReceiverDateTime As ucrReceiverSingle + Friend WithEvents lblStationName As Label + Friend WithEvents ucrStationName As ucrInputTextBox + Friend WithEvents lblRain As Label + Friend WithEvents lblDateTime As Label + Friend WithEvents ucrReceiverPrec As ucrReceiverSingle + Friend WithEvents lblMinimumProp As Label + Friend WithEvents ucrNudMaxPrec As ucrNud + Friend WithEvents ucrSave As ucrSave End Class diff --git a/instat/dlgIDFCurves.vb b/instat/dlgIDFCurves.vb index e146ccf6d86..215c4e7b639 100644 --- a/instat/dlgIDFCurves.vb +++ b/instat/dlgIDFCurves.vb @@ -1,3 +1,168 @@ -Public Class dlgIDFCurves +' R- Instat +' Copyright (C) 2015-2017 +' +' This program is free software: you can redistribute it and/or modify +' it under the terms of the GNU General Public License as published by +' the Free Software Foundation, either version 3 of the License, or +' (at your option) any later version. +' +' This program is distributed in the hope that it will be useful, +' but WITHOUT ANY WARRANTY; without even the implied warranty of +' MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +' GNU General Public License for more details. +' +' You should have received a copy of the GNU General Public License +' along with this program. If not, see . +Imports instat.Translations +Public Class dlgIDFCurves + Private bFirstLoad As Boolean = True + Private bReset As Boolean = True + Private bResetRCode As Boolean = True + Private clsIDFCurvesFunction, clsPmatchFunction, clsGetColumnsFunction, clsColumnsFunction As New RFunction + Private clsVarsColumnsOperator, clsVars1ColumnsOperator As ROperator + + Private Sub dlgIDFCurves_Load(sender As Object, e As EventArgs) Handles MyBase.Load + If bFirstLoad Then + InitialiseDialog() + bFirstLoad = False + End If + If bReset Then + SetDefaults() + End If + SetRCodeForControls(bReset) + bReset = False + TestOKEnabled() + autoTranslate(Me) + End Sub + + Private Sub InitialiseDialog() + ucrBase.iHelpTopicID = 523 + ucrBase.clsRsyntax.bSeparateThread = False + + ucrIDFCurvesSelector.SetParameter(New RParameter("prdat", 0)) + ucrIDFCurvesSelector.SetParameterIsrfunction() + + ucrReceiverDateTime.SetParameter(New RParameter("clmn", 1)) + ucrReceiverDateTime.Selector = ucrIDFCurvesSelector + + ucrReceiverPrec.SetParameter(New RParameter("clmn", 1)) + ucrReceiverPrec.Selector = ucrIDFCurvesSelector + + ucrStationName.SetParameter(New RParameter("stname", 2)) + + ucrNudMaxPrec.SetParameter(New RParameter("mindpy", 3)) + ucrNudMaxPrec.SetMinMax(0.0, 1.0) + ucrNudMaxPrec.Increment = 0.1 + ucrNudMaxPrec.DecimalPlaces = 1 + ucrNudMaxPrec.SetRDefault(0.8) + + ucrSave.SetPrefix("Prec_accum") + ucrSave.SetIsComboBox() + ucrSave.SetCheckBoxText("Save DataFrame") + ucrSave.SetSaveTypeAsDataFrame() + ucrSave.SetDataFrameSelector(ucrIDFCurvesSelector.ucrAvailableDataFrames) + ucrSave.SetAssignToIfUncheckedValue("last_accum") + + End Sub + + Private Sub SetDefaults() + clsIDFCurvesFunction = New RFunction + clsPmatchFunction = New RFunction + clsGetColumnsFunction = New RFunction + + clsColumnsFunction = New RFunction + + clsVarsColumnsOperator = New ROperator + clsVars1ColumnsOperator = New ROperator + + ucrIDFCurvesSelector.Reset() + ucrReceiverDateTime.SetMeAsReceiver() + + clsGetColumnsFunction.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$get_columns_from_data") + clsGetColumnsFunction.SetAssignTo("col_data") + + clsVarsColumnsOperator.SetOperation("", bBracketsTemp:=False) + clsVarsColumnsOperator.SetAssignTo("var_1") + + clsVars1ColumnsOperator.SetOperation("", bBracketsTemp:=False) + clsVars1ColumnsOperator.SetAssignTo("var_2") + + clsColumnsFunction.SetRCommand("colnames") + + clsPmatchFunction.SetRCommand("pmatch") + clsPmatchFunction.AddParameter("elements", clsRFunctionParameter:=clsColumnsFunction, bIncludeArgumentName:=False, iPosition:=0) + clsPmatchFunction.AddParameter("duplicates.ok", "TRUE", iPosition:=1) + clsPmatchFunction.AddParameter("cols", clsROperatorParameter:=clsVars1ColumnsOperator, bIncludeArgumentName:=False, iPosition:=0) + clsPmatchFunction.SetAssignTo("data_file") + + clsIDFCurvesFunction.SetPackageName("climatol") + clsIDFCurvesFunction.SetRCommand("IDFcurves") + clsIDFCurvesFunction.AddParameter("clmn", clsRFunctionParameter:=clsPmatchFunction, iPosition:=2) + clsIDFCurvesFunction.AddParameter("na.code", "NA", iPosition:=3) + + ucrBase.clsRsyntax.SetBaseRFunction(clsIDFCurvesFunction) + ucrBase.clsRsyntax.bExcludeAssignedFunctionOutput = True + End Sub + + Private Sub SetRCodeForControls(bReset As Boolean) + ucrIDFCurvesSelector.SetRCode(clsGetColumnsFunction, bReset) + ucrNudMaxPrec.SetRCode(clsIDFCurvesFunction, bReset) + ucrStationName.SetRCode(clsIDFCurvesFunction, bReset) + ucrSave.SetRCode(clsIDFCurvesFunction, bReset) + + If bReset Then + ucrReceiverDateTime.SetRCode(clsGetColumnsFunction, bReset) + ucrReceiverPrec.SetRCode(clsGetColumnsFunction, bReset) + End If + End Sub + + Private Sub TestOkEnabled() + ucrBase.OKEnabled(Not ucrReceiverDateTime.IsEmpty AndAlso Not ucrReceiverPrec.IsEmpty AndAlso Not ucrStationName.IsEmpty) + End Sub + + Private Sub ucrBase_ClickReset(sender As Object, e As EventArgs) Handles ucrBase.ClickReset + SetDefaults() + SetRCodeForControls(True) + TestOkEnabled() + End Sub + + Private Sub ucrReceiverPrec_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrReceiverPrec.ControlValueChanged, ucrReceiverDateTime.ControlValueChanged + If Not ucrReceiverPrec.IsEmpty AndAlso Not ucrReceiverDateTime.IsEmpty Then + clsVars1ColumnsOperator.AddParameter("cols", "c(" & ucrReceiverDateTime.GetVariableNames() & ", " & ucrReceiverPrec.GetVariableNames() & ")", iPosition:=0, bIncludeArgumentName:=False) + Else + clsVars1ColumnsOperator.RemoveParameterByName("cols") + End If + End Sub + + Private Sub ucrNudMaxPrec_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrNudMaxPrec.ControlValueChanged + If Not ucrNudMaxPrec.IsEmpty Then + clsIDFCurvesFunction.AddParameter("mindpy", ucrNudMaxPrec.GetText, iPosition:=5) + Else + clsIDFCurvesFunction.RemoveParameterByName("mindpy") + End If + End Sub + + Private Sub ucrStationName_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrStationName.ControlValueChanged + If Not ucrStationName.IsEmpty Then + clsIDFCurvesFunction.AddParameter("stname", Chr(34) & ucrStationName.GetText & Chr(34), iPosition:=4) + Else + clsIDFCurvesFunction.RemoveParameterByName("stname") + End If + End Sub + + Private Sub ucrIDFCurvesSelector_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrIDFCurvesSelector.ControlValueChanged + If Not ucrIDFCurvesSelector.IsEmpty Then + clsColumnsFunction.AddParameter("data", clsRCodeStructureParameter:=ucrIDFCurvesSelector.ucrAvailableDataFrames.clsCurrDataFrame, bIncludeArgumentName:=False, iPosition:=0) + clsIDFCurvesFunction.AddParameter("data", ucrIDFCurvesSelector.ucrAvailableDataFrames.cboAvailableDataFrames.SelectedItem, bIncludeArgumentName:=False, iPosition:=0) + Else + clsColumnsFunction.RemoveParameterByName("data") + clsIDFCurvesFunction.RemoveParameterByName("data") + End If + End Sub + + Private Sub ucrReceiverDateTime_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrReceiverDateTime.ControlContentsChanged, +ucrReceiverPrec.ControlContentsChanged, ucrStationName.ControlContentsChanged + TestOkEnabled() + End Sub End Class \ No newline at end of file diff --git a/instat/dlgInventoryPlot.vb b/instat/dlgInventoryPlot.vb index 36b10d5af5b..ca4fe3055d8 100644 --- a/instat/dlgInventoryPlot.vb +++ b/instat/dlgInventoryPlot.vb @@ -253,7 +253,6 @@ Public Class dlgInventoryPlot ucrInventoryPlotSelector.SetRCode(clsInventoryPlot, bReset) ucrReceiverDate.SetRCode(clsInventoryPlot, bReset) - ucrReceiverElements.SetRCode(clsInventoryPlot, bReset) ucrChkFlipCoordinates.SetRCode(clsInventoryPlot, bReset) ucrInputTitle.SetRCode(clsInventoryPlot, bReset) ucrChkDisplayRainDays.SetRCode(clsInventoryPlot, bReset) @@ -262,7 +261,6 @@ Public Class dlgInventoryPlot ucrInputFacetBy.SetRCode(clsInventoryPlot, bReset) ucrSaveGraph.SetRCode(clsInventoryPlot, bReset) ucrReceiverStation.SetRCode(clsInventoryPlot, bReset) - ucrChkDetails.SetRSyntax(ucrBase.clsRsyntax, bReset) ucrChkYear.SetRCode(clsClimaticDetails, bReset) ucrChkMonth.SetRCode(clsClimaticDetails, bReset) ucrChkDay.SetRCode(clsClimaticDetails, bReset) @@ -270,10 +268,11 @@ Public Class dlgInventoryPlot ucrChkOmitStart.SetRCode(clsClimaticMissing, bReset) ucrChkOmitEnd.SetRCode(clsClimaticMissing, bReset) ucrPnlOrder.SetRCode(clsClimaticDetails, bReset) - If bReset Then ucrPnlOptions.SetRCode(clsDummyFunction, bReset) ucrChkSummary.SetRCode(clsDummyFunction, bReset) + ucrReceiverElements.SetRCode(clsInventoryPlot, bReset) + ucrChkDetails.SetRSyntax(ucrBase.clsRsyntax, bReset) End If End Sub @@ -336,7 +335,6 @@ Public Class dlgInventoryPlot clsInventoryPlot.iCallType = 3 clsInventoryPlot.bExcludeAssignedFunctionOutput = False End If - End Sub Private Sub AddOrRemoveKeyFunctions() @@ -350,27 +348,21 @@ Public Class dlgInventoryPlot End Sub Private Sub ucrChkSummary_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkSummary.ControlValueChanged - If rdoMissing.Checked Then - If ucrChkSummary.Checked Then - ucrBase.clsRsyntax.AddToAfterCodes(clsClimaticMissing, iPosition:=1) - clsClimaticMissing.iCallType = 2 - Else - ucrBase.clsRsyntax.RemoveFromAfterCodes(clsClimaticMissing) - End If - AddOrRemoveKeyFunctions() + If ucrChkSummary.Checked Then + ucrBase.clsRsyntax.AddToAfterCodes(clsClimaticMissing, iPosition:=1) + clsClimaticMissing.iCallType = 2 Else ucrBase.clsRsyntax.RemoveFromAfterCodes(clsClimaticMissing) - End If + End If + AddOrRemoveKeyFunctions() End Sub Private Sub ucrChkDetails_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkDetails.ControlValueChanged If ucrChkDetails.Checked Then - ucrBase.clsRsyntax.AddToAfterCodes(clsClimaticDetails, iPosition:=2) - ucrBase.clsRsyntax.AddToAfterCodes(clsDataFrameFunction, iPosition:=3) + ucrBase.clsRsyntax.AddToAfterCodes(clsDataFrameFunction, iPosition:=2) clsCumulativeInventoryFunction.AddParameter("data", clsRFunctionParameter:=clsClimaticDetails, iPosition:=0) clsClimaticDetails.iCallType = 2 Else - ucrBase.clsRsyntax.RemoveFromAfterCodes(clsClimaticDetails) ucrBase.clsRsyntax.RemoveFromAfterCodes(clsDataFrameFunction) End If diff --git a/instat/dlgLinePlot.designer.vb b/instat/dlgLinePlot.designer.vb index 7e93036b5fc..e265e1421d0 100644 --- a/instat/dlgLinePlot.designer.vb +++ b/instat/dlgLinePlot.designer.vb @@ -49,6 +49,13 @@ Partial Class dlgLinePlot Me.lblMethod = New System.Windows.Forms.Label() Me.lblFamily = New System.Windows.Forms.Label() Me.grpSmoothOptions = New System.Windows.Forms.GroupBox() + Me.ucrInputFormula = New instat.ucrInputComboBox() + Me.ucrChkSpan = New instat.ucrCheck() + Me.ucrChkFormula = New instat.ucrCheck() + Me.ucrChkAddSE = New instat.ucrCheck() + Me.ucrNudSpan = New instat.ucrNud() + Me.ucrInputMethod = New instat.ucrInputComboBox() + Me.ucrFamilyInput = New instat.ucrInputComboBox() Me.rdoRibbon = New System.Windows.Forms.RadioButton() Me.rdoPointrange = New System.Windows.Forms.RadioButton() Me.rdoErrorbar = New System.Windows.Forms.RadioButton() @@ -74,11 +81,16 @@ Partial Class dlgLinePlot Me.lblSlopeLineTicknes = New System.Windows.Forms.Label() Me.contextMenuStripOptions = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.PlotOptionsToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.AreaOptionsToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.CrossbarOptionsToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.DumbbellOptionsToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.ErrorbarOptionsToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.LineOptionsToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.LinerangeOptionsToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.PathOptionsToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() - Me.AreaOptionsToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.PointOptionToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.PointrangeOptionsToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.RibbonOptionsToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.SmoothOptionsToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.StepOptionsToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.rdoDumbbell = New System.Windows.Forms.RadioButton() @@ -128,20 +140,13 @@ Partial Class dlgLinePlot Me.ucrReceiverXEnd = New instat.ucrReceiverSingle() Me.ucrReceiverSlopeColour = New instat.ucrReceiverSingle() Me.ucrReceiverSlopeX = New instat.ucrReceiverSingle() - Me.ucrInputFormula = New instat.ucrInputComboBox() - Me.ucrChkSpan = New instat.ucrCheck() - Me.ucrChkFormula = New instat.ucrCheck() - Me.ucrChkAddSE = New instat.ucrCheck() - Me.ucrNudSpan = New instat.ucrNud() - Me.ucrInputMethod = New instat.ucrInputComboBox() - Me.ucrFamilyInput = New instat.ucrInputComboBox() Me.ucrPnlStepOrPath = New instat.UcrPanel() Me.ucrPnlLinerangeOptions = New instat.UcrPanel() - Me.LinerangeOptionsToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() - Me.CrossbarOptionsToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() - Me.ErrorbarOptionsToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() - Me.RibbonOptionsToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() - Me.PointrangeOptionsToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + 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.grpSmoothOptions.SuspendLayout() Me.contextMenuStripOptions.SuspendLayout() Me.SuspendLayout() @@ -277,6 +282,79 @@ Partial Class dlgLinePlot Me.grpSmoothOptions.TabStop = False Me.grpSmoothOptions.Text = "Smooth Options" ' + 'ucrInputFormula + ' + Me.ucrInputFormula.AddQuotesIfUnrecognised = True + Me.ucrInputFormula.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrInputFormula.GetSetSelectedIndex = -1 + Me.ucrInputFormula.IsReadOnly = False + Me.ucrInputFormula.Location = New System.Drawing.Point(73, 46) + Me.ucrInputFormula.Name = "ucrInputFormula" + Me.ucrInputFormula.Size = New System.Drawing.Size(110, 23) + Me.ucrInputFormula.TabIndex = 7 + ' + 'ucrChkSpan + ' + Me.ucrChkSpan.AutoSize = True + Me.ucrChkSpan.Checked = False + Me.ucrChkSpan.Location = New System.Drawing.Point(185, 20) + Me.ucrChkSpan.Name = "ucrChkSpan" + Me.ucrChkSpan.Size = New System.Drawing.Size(54, 23) + Me.ucrChkSpan.TabIndex = 4 + ' + 'ucrChkFormula + ' + Me.ucrChkFormula.AutoSize = True + Me.ucrChkFormula.Checked = False + Me.ucrChkFormula.Location = New System.Drawing.Point(5, 49) + Me.ucrChkFormula.Name = "ucrChkFormula" + Me.ucrChkFormula.Size = New System.Drawing.Size(66, 23) + Me.ucrChkFormula.TabIndex = 1 + ' + 'ucrChkAddSE + ' + Me.ucrChkAddSE.AutoSize = True + Me.ucrChkAddSE.Checked = False + Me.ucrChkAddSE.Location = New System.Drawing.Point(185, 51) + Me.ucrChkAddSE.Name = "ucrChkAddSE" + Me.ucrChkAddSE.Size = New System.Drawing.Size(82, 23) + Me.ucrChkAddSE.TabIndex = 8 + ' + 'ucrNudSpan + ' + Me.ucrNudSpan.AutoSize = True + Me.ucrNudSpan.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudSpan.Increment = New Decimal(New Integer() {1, 0, 0, 0}) + Me.ucrNudSpan.Location = New System.Drawing.Point(239, 20) + Me.ucrNudSpan.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) + Me.ucrNudSpan.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudSpan.Name = "ucrNudSpan" + Me.ucrNudSpan.Size = New System.Drawing.Size(50, 20) + Me.ucrNudSpan.TabIndex = 6 + Me.ucrNudSpan.Value = New Decimal(New Integer() {0, 0, 0, 0}) + ' + 'ucrInputMethod + ' + Me.ucrInputMethod.AddQuotesIfUnrecognised = True + Me.ucrInputMethod.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrInputMethod.GetSetSelectedIndex = -1 + Me.ucrInputMethod.IsReadOnly = False + Me.ucrInputMethod.Location = New System.Drawing.Point(52, 20) + Me.ucrInputMethod.Name = "ucrInputMethod" + Me.ucrInputMethod.Size = New System.Drawing.Size(90, 21) + Me.ucrInputMethod.TabIndex = 2 + ' + 'ucrFamilyInput + ' + Me.ucrFamilyInput.AddQuotesIfUnrecognised = True + Me.ucrFamilyInput.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrFamilyInput.GetSetSelectedIndex = -1 + Me.ucrFamilyInput.IsReadOnly = False + Me.ucrFamilyInput.Location = New System.Drawing.Point(210, 20) + Me.ucrFamilyInput.Name = "ucrFamilyInput" + Me.ucrFamilyInput.Size = New System.Drawing.Size(110, 24) + Me.ucrFamilyInput.TabIndex = 5 + ' 'rdoRibbon ' Me.rdoRibbon.AutoSize = True @@ -532,54 +610,84 @@ Partial Class dlgLinePlot ' Me.contextMenuStripOptions.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.PlotOptionsToolStripMenuItem, Me.AreaOptionsToolStripMenuItem, Me.CrossbarOptionsToolStripMenuItem, Me.DumbbellOptionsToolStripMenuItem, Me.ErrorbarOptionsToolStripMenuItem, Me.LineOptionsToolStripMenuItem, Me.LinerangeOptionsToolStripMenuItem, Me.PathOptionsToolStripMenuItem, Me.PointOptionToolStripMenuItem, Me.PointrangeOptionsToolStripMenuItem, Me.RibbonOptionsToolStripMenuItem, Me.SmoothOptionsToolStripMenuItem, Me.StepOptionsToolStripMenuItem}) Me.contextMenuStripOptions.Name = "contextMenuStripOk" - Me.contextMenuStripOptions.Size = New System.Drawing.Size(181, 312) + Me.contextMenuStripOptions.Size = New System.Drawing.Size(178, 290) ' 'PlotOptionsToolStripMenuItem ' Me.PlotOptionsToolStripMenuItem.Name = "PlotOptionsToolStripMenuItem" - Me.PlotOptionsToolStripMenuItem.Size = New System.Drawing.Size(180, 22) + Me.PlotOptionsToolStripMenuItem.Size = New System.Drawing.Size(177, 22) Me.PlotOptionsToolStripMenuItem.Text = "Plot Options" ' + 'AreaOptionsToolStripMenuItem + ' + Me.AreaOptionsToolStripMenuItem.Name = "AreaOptionsToolStripMenuItem" + Me.AreaOptionsToolStripMenuItem.Size = New System.Drawing.Size(177, 22) + Me.AreaOptionsToolStripMenuItem.Text = "Area Options" + ' + 'CrossbarOptionsToolStripMenuItem + ' + Me.CrossbarOptionsToolStripMenuItem.Name = "CrossbarOptionsToolStripMenuItem" + Me.CrossbarOptionsToolStripMenuItem.Size = New System.Drawing.Size(177, 22) + Me.CrossbarOptionsToolStripMenuItem.Text = "Crossbar Options" + ' 'DumbbellOptionsToolStripMenuItem ' Me.DumbbellOptionsToolStripMenuItem.Name = "DumbbellOptionsToolStripMenuItem" - Me.DumbbellOptionsToolStripMenuItem.Size = New System.Drawing.Size(180, 22) + Me.DumbbellOptionsToolStripMenuItem.Size = New System.Drawing.Size(177, 22) Me.DumbbellOptionsToolStripMenuItem.Text = "Dumbbell Options" ' + 'ErrorbarOptionsToolStripMenuItem + ' + Me.ErrorbarOptionsToolStripMenuItem.Name = "ErrorbarOptionsToolStripMenuItem" + Me.ErrorbarOptionsToolStripMenuItem.Size = New System.Drawing.Size(177, 22) + Me.ErrorbarOptionsToolStripMenuItem.Text = "Errorbar Options" + ' 'LineOptionsToolStripMenuItem ' Me.LineOptionsToolStripMenuItem.Name = "LineOptionsToolStripMenuItem" - Me.LineOptionsToolStripMenuItem.Size = New System.Drawing.Size(180, 22) + Me.LineOptionsToolStripMenuItem.Size = New System.Drawing.Size(177, 22) Me.LineOptionsToolStripMenuItem.Text = "Line Options" ' + 'LinerangeOptionsToolStripMenuItem + ' + Me.LinerangeOptionsToolStripMenuItem.Name = "LinerangeOptionsToolStripMenuItem" + Me.LinerangeOptionsToolStripMenuItem.Size = New System.Drawing.Size(177, 22) + Me.LinerangeOptionsToolStripMenuItem.Text = "Linerange Options" + ' 'PathOptionsToolStripMenuItem ' Me.PathOptionsToolStripMenuItem.Name = "PathOptionsToolStripMenuItem" - Me.PathOptionsToolStripMenuItem.Size = New System.Drawing.Size(180, 22) + Me.PathOptionsToolStripMenuItem.Size = New System.Drawing.Size(177, 22) Me.PathOptionsToolStripMenuItem.Text = "Path Options " ' - 'AreaOptionsToolStripMenuItem - ' - Me.AreaOptionsToolStripMenuItem.Name = "AreaOptionsToolStripMenuItem" - Me.AreaOptionsToolStripMenuItem.Size = New System.Drawing.Size(180, 22) - Me.AreaOptionsToolStripMenuItem.Text = "Area Options" - ' 'PointOptionToolStripMenuItem ' Me.PointOptionToolStripMenuItem.Name = "PointOptionToolStripMenuItem" - Me.PointOptionToolStripMenuItem.Size = New System.Drawing.Size(180, 22) + Me.PointOptionToolStripMenuItem.Size = New System.Drawing.Size(177, 22) Me.PointOptionToolStripMenuItem.Text = "Point Options " ' + 'PointrangeOptionsToolStripMenuItem + ' + Me.PointrangeOptionsToolStripMenuItem.Name = "PointrangeOptionsToolStripMenuItem" + Me.PointrangeOptionsToolStripMenuItem.Size = New System.Drawing.Size(177, 22) + Me.PointrangeOptionsToolStripMenuItem.Text = "Pointrange Options" + ' + 'RibbonOptionsToolStripMenuItem + ' + Me.RibbonOptionsToolStripMenuItem.Name = "RibbonOptionsToolStripMenuItem" + Me.RibbonOptionsToolStripMenuItem.Size = New System.Drawing.Size(177, 22) + Me.RibbonOptionsToolStripMenuItem.Text = "Ribbon Options" + ' 'SmoothOptionsToolStripMenuItem ' Me.SmoothOptionsToolStripMenuItem.Name = "SmoothOptionsToolStripMenuItem" - Me.SmoothOptionsToolStripMenuItem.Size = New System.Drawing.Size(180, 22) + Me.SmoothOptionsToolStripMenuItem.Size = New System.Drawing.Size(177, 22) Me.SmoothOptionsToolStripMenuItem.Text = "Smooth Options" ' 'StepOptionsToolStripMenuItem ' Me.StepOptionsToolStripMenuItem.Name = "StepOptionsToolStripMenuItem" - Me.StepOptionsToolStripMenuItem.Size = New System.Drawing.Size(180, 22) + Me.StepOptionsToolStripMenuItem.Size = New System.Drawing.Size(177, 22) Me.StepOptionsToolStripMenuItem.Text = "Step Options" ' 'rdoDumbbell @@ -876,7 +984,7 @@ Partial Class dlgLinePlot 'ucrSave ' Me.ucrSave.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrSave.Location = New System.Drawing.Point(9, 442) + Me.ucrSave.Location = New System.Drawing.Point(9, 482) Me.ucrSave.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.ucrSave.Name = "ucrSave" Me.ucrSave.Size = New System.Drawing.Size(401, 24) @@ -911,7 +1019,7 @@ Partial Class dlgLinePlot ' Me.ucrBase.AutoSize = True Me.ucrBase.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrBase.Location = New System.Drawing.Point(9, 467) + Me.ucrBase.Location = New System.Drawing.Point(9, 507) Me.ucrBase.Name = "ucrBase" Me.ucrBase.Size = New System.Drawing.Size(408, 52) Me.ucrBase.TabIndex = 68 @@ -1124,79 +1232,6 @@ Partial Class dlgLinePlot Me.ucrReceiverSlopeX.TabIndex = 17 Me.ucrReceiverSlopeX.ucrSelector = Nothing ' - 'ucrInputFormula - ' - Me.ucrInputFormula.AddQuotesIfUnrecognised = True - Me.ucrInputFormula.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrInputFormula.GetSetSelectedIndex = -1 - Me.ucrInputFormula.IsReadOnly = False - Me.ucrInputFormula.Location = New System.Drawing.Point(73, 46) - Me.ucrInputFormula.Name = "ucrInputFormula" - Me.ucrInputFormula.Size = New System.Drawing.Size(110, 23) - Me.ucrInputFormula.TabIndex = 7 - ' - 'ucrChkSpan - ' - Me.ucrChkSpan.AutoSize = True - Me.ucrChkSpan.Checked = False - Me.ucrChkSpan.Location = New System.Drawing.Point(185, 20) - Me.ucrChkSpan.Name = "ucrChkSpan" - Me.ucrChkSpan.Size = New System.Drawing.Size(54, 23) - Me.ucrChkSpan.TabIndex = 4 - ' - 'ucrChkFormula - ' - Me.ucrChkFormula.AutoSize = True - Me.ucrChkFormula.Checked = False - Me.ucrChkFormula.Location = New System.Drawing.Point(5, 49) - Me.ucrChkFormula.Name = "ucrChkFormula" - Me.ucrChkFormula.Size = New System.Drawing.Size(66, 23) - Me.ucrChkFormula.TabIndex = 1 - ' - 'ucrChkAddSE - ' - Me.ucrChkAddSE.AutoSize = True - Me.ucrChkAddSE.Checked = False - Me.ucrChkAddSE.Location = New System.Drawing.Point(185, 51) - Me.ucrChkAddSE.Name = "ucrChkAddSE" - Me.ucrChkAddSE.Size = New System.Drawing.Size(82, 23) - Me.ucrChkAddSE.TabIndex = 8 - ' - 'ucrNudSpan - ' - Me.ucrNudSpan.AutoSize = True - Me.ucrNudSpan.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) - Me.ucrNudSpan.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudSpan.Location = New System.Drawing.Point(239, 20) - Me.ucrNudSpan.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) - Me.ucrNudSpan.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) - Me.ucrNudSpan.Name = "ucrNudSpan" - Me.ucrNudSpan.Size = New System.Drawing.Size(50, 20) - Me.ucrNudSpan.TabIndex = 6 - Me.ucrNudSpan.Value = New Decimal(New Integer() {0, 0, 0, 0}) - ' - 'ucrInputMethod - ' - Me.ucrInputMethod.AddQuotesIfUnrecognised = True - Me.ucrInputMethod.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrInputMethod.GetSetSelectedIndex = -1 - Me.ucrInputMethod.IsReadOnly = False - Me.ucrInputMethod.Location = New System.Drawing.Point(52, 20) - Me.ucrInputMethod.Name = "ucrInputMethod" - Me.ucrInputMethod.Size = New System.Drawing.Size(90, 21) - Me.ucrInputMethod.TabIndex = 2 - ' - 'ucrFamilyInput - ' - Me.ucrFamilyInput.AddQuotesIfUnrecognised = True - Me.ucrFamilyInput.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrFamilyInput.GetSetSelectedIndex = -1 - Me.ucrFamilyInput.IsReadOnly = False - Me.ucrFamilyInput.Location = New System.Drawing.Point(210, 20) - Me.ucrFamilyInput.Name = "ucrFamilyInput" - Me.ucrFamilyInput.Size = New System.Drawing.Size(110, 24) - Me.ucrFamilyInput.TabIndex = 5 - ' 'ucrPnlStepOrPath ' Me.ucrPnlStepOrPath.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink @@ -1213,41 +1248,71 @@ Partial Class dlgLinePlot Me.ucrPnlLinerangeOptions.Size = New System.Drawing.Size(385, 33) Me.ucrPnlLinerangeOptions.TabIndex = 2 ' - 'LinerangeOptionsToolStripMenuItem - ' - Me.LinerangeOptionsToolStripMenuItem.Name = "LinerangeOptionsToolStripMenuItem" - Me.LinerangeOptionsToolStripMenuItem.Size = New System.Drawing.Size(180, 22) - Me.LinerangeOptionsToolStripMenuItem.Text = "Linerange Options" - ' - 'CrossbarOptionsToolStripMenuItem - ' - Me.CrossbarOptionsToolStripMenuItem.Name = "CrossbarOptionsToolStripMenuItem" - Me.CrossbarOptionsToolStripMenuItem.Size = New System.Drawing.Size(180, 22) - Me.CrossbarOptionsToolStripMenuItem.Text = "Crossbar Options" - ' - 'ErrorbarOptionsToolStripMenuItem - ' - Me.ErrorbarOptionsToolStripMenuItem.Name = "ErrorbarOptionsToolStripMenuItem" - Me.ErrorbarOptionsToolStripMenuItem.Size = New System.Drawing.Size(180, 22) - Me.ErrorbarOptionsToolStripMenuItem.Text = "Errorbar Options" - ' - 'RibbonOptionsToolStripMenuItem - ' - Me.RibbonOptionsToolStripMenuItem.Name = "RibbonOptionsToolStripMenuItem" - Me.RibbonOptionsToolStripMenuItem.Size = New System.Drawing.Size(180, 22) - Me.RibbonOptionsToolStripMenuItem.Text = "Ribbon Options" - ' - 'PointrangeOptionsToolStripMenuItem - ' - Me.PointrangeOptionsToolStripMenuItem.Name = "PointrangeOptionsToolStripMenuItem" - Me.PointrangeOptionsToolStripMenuItem.Size = New System.Drawing.Size(180, 22) - Me.PointrangeOptionsToolStripMenuItem.Text = "Pointrange Options" + '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(318, 452) + Me.ucrInputStation.Name = "ucrInputStation" + Me.ucrInputStation.Size = New System.Drawing.Size(101, 21) + Me.ucrInputStation.TabIndex = 81 + ' + 'ucr1stFactorReceiver + ' + Me.ucr1stFactorReceiver.AutoSize = True + Me.ucr1stFactorReceiver.frmParent = Me + Me.ucr1stFactorReceiver.Location = New System.Drawing.Point(205, 453) + Me.ucr1stFactorReceiver.Margin = New System.Windows.Forms.Padding(0) + Me.ucr1stFactorReceiver.Name = "ucr1stFactorReceiver" + Me.ucr1stFactorReceiver.Selector = Nothing + Me.ucr1stFactorReceiver.Size = New System.Drawing.Size(110, 26) + Me.ucr1stFactorReceiver.strNcFilePath = "" + Me.ucr1stFactorReceiver.TabIndex = 80 + Me.ucr1stFactorReceiver.ucrSelector = Nothing + ' + 'lblFacetBy + ' + Me.lblFacetBy.AutoSize = True + Me.lblFacetBy.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.lblFacetBy.Location = New System.Drawing.Point(208, 438) + Me.lblFacetBy.Name = "lblFacetBy" + Me.lblFacetBy.Size = New System.Drawing.Size(52, 13) + Me.lblFacetBy.TabIndex = 79 + 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(87, 452) + Me.ucrInputLegendPosition.Name = "ucrInputLegendPosition" + Me.ucrInputLegendPosition.Size = New System.Drawing.Size(112, 21) + Me.ucrInputLegendPosition.TabIndex = 83 + ' + 'ucrChkLegend + ' + Me.ucrChkLegend.AutoSize = True + Me.ucrChkLegend.Checked = False + Me.ucrChkLegend.Location = New System.Drawing.Point(11, 453) + Me.ucrChkLegend.Name = "ucrChkLegend" + Me.ucrChkLegend.Size = New System.Drawing.Size(98, 24) + Me.ucrChkLegend.TabIndex = 82 ' 'dlgLinePlot ' Me.AutoScaleDimensions = New System.Drawing.SizeF(96.0!, 96.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi - Me.ClientSize = New System.Drawing.Size(423, 523) + Me.ClientSize = New System.Drawing.Size(423, 563) + Me.Controls.Add(Me.ucrInputStation) + Me.Controls.Add(Me.ucr1stFactorReceiver) + Me.Controls.Add(Me.lblFacetBy) + Me.Controls.Add(Me.ucrInputLegendPosition) + Me.Controls.Add(Me.ucrChkLegend) Me.Controls.Add(Me.rdoArea) Me.Controls.Add(Me.lblGroupLine) Me.Controls.Add(Me.ucrReceiverGroup) @@ -1445,4 +1510,9 @@ Partial Class dlgLinePlot Friend WithEvents LinerangeOptionsToolStripMenuItem As ToolStripMenuItem Friend WithEvents PointrangeOptionsToolStripMenuItem As ToolStripMenuItem Friend WithEvents RibbonOptionsToolStripMenuItem As ToolStripMenuItem + Friend WithEvents ucrInputStation As ucrInputComboBox + Friend WithEvents ucr1stFactorReceiver As ucrReceiverSingle + Friend WithEvents lblFacetBy As Label + Friend WithEvents ucrInputLegendPosition As ucrInputComboBox + Friend WithEvents ucrChkLegend As ucrCheck End Class diff --git a/instat/dlgLinePlot.vb b/instat/dlgLinePlot.vb index 009c05e0d8a..7f92eac8db7 100644 --- a/instat/dlgLinePlot.vb +++ b/instat/dlgLinePlot.vb @@ -63,6 +63,21 @@ Public Class dlgLinePlot Private clsGeomErrorbarFunction As New RFunction Private clsGeomPointrangeFunction As New RFunction + Private clsFacetFunction As New RFunction + Private clsFacetVariablesOperator As New ROperator + Private clsFacetRowOp As New ROperator + Private clsFacetColOp As New ROperator + Private clsPipeOperator As New ROperator + Private clsGroupByFunction As New RFunction + + Private ReadOnly strNone As String = "None" + Private ReadOnly strFacetWrap As String = "Facet Wrap" + Private ReadOnly strFacetRow As String = "Facet Row" + Private ReadOnly strFacetCol As String = "Facet Column" + + Private bUpdateComboOptions As Boolean = True + Private bUpdatingParameters As Boolean = False + 'Parameter names for geoms Private strFirstParameterName As String = "geomfunc" Private strgeomSmoothParameterName As String = "geom_smooth" @@ -91,6 +106,7 @@ Public Class dlgLinePlot Dim dctFamilyOptions As New Dictionary(Of String, String) Dim dctColourOptions As New Dictionary(Of String, String) Dim dctSlopeLineColourOptions As New Dictionary(Of String, String) + Dim dctLegendPosition As New Dictionary(Of String, String) ucrBase.clsRsyntax.bExcludeAssignedFunctionOutput = False ucrBase.clsRsyntax.iCallType = 3 @@ -396,6 +412,32 @@ Public Class dlgLinePlot ucrChkSlopeLegend.AddParameterPresentCondition(True, "slopetheme") ucrChkSlopeLegend.AddParameterPresentCondition(False, "slopetheme", 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) + + ucr1stFactorReceiver.SetParameter(New RParameter("var1")) + ucr1stFactorReceiver.Selector = ucrLinePlotSelector + ucr1stFactorReceiver.SetIncludedDataTypes({"factor"}) + ucr1stFactorReceiver.strSelectorHeading = "Factors" + ucr1stFactorReceiver.bWithQuotes = False + ucr1stFactorReceiver.SetParameterIsString() + ucr1stFactorReceiver.SetValuesToIgnore({"."}) + ucr1stFactorReceiver.SetParameterPosition(1) + ucr1stFactorReceiver.SetLinkedDisplayControl(lblFacetBy) + + ucrInputStation.SetItems({strFacetWrap, strFacetRow, strFacetCol, strNone}) + ucrInputStation.SetDropDownStyleAsNonEditable() + ucrPnlOptions.AddToLinkedControls({ucrChkPathOrStep, ucrChkWithSE, ucrChkLineofBestFit}, {rdoLine}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) ucrPnlOptions.AddToLinkedControls({ucrChkAddLine, ucrInputMethod, ucrInputFormula}, {rdoSmoothing}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) ucrPnlOptions.AddToLinkedControls({ucrChkAddSE, ucrChkFormula, ucrChkSpan}, {rdoSmoothing}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:="FALSE") @@ -475,6 +517,15 @@ Public Class dlgLinePlot clsGeomLinerangeFunction = New RFunction clsGeomPointrangeFunction = New RFunction clsGeomRibbonFunction = New RFunction + clsFacetFunction = New RFunction + clsFacetVariablesOperator = New ROperator + clsFacetRowOp = New ROperator + clsFacetColOp = New ROperator + clsPipeOperator = New ROperator + clsGroupByFunction = New RFunction + + ucrInputStation.SetName(strFacetWrap) + ucrInputStation.bUpdateRCodeFromControl = True ucrLinePlotSelector.Reset() ucrLinePlotSelector.SetGgplotFunction(clsBaseOperator) @@ -513,6 +564,22 @@ Public Class dlgLinePlot clsSlopeThemeFunction.SetRCommand("slopegraph_theme") + clsFacetFunction.SetPackageName("ggplot2") + clsFacetRowOp.SetOperation("+") + clsFacetRowOp.bBrackets = False + clsFacetColOp.SetOperation("+") + clsFacetColOp.bBrackets = False + clsFacetVariablesOperator.SetOperation("~") + clsFacetVariablesOperator.bForceIncludeOperation = True + clsFacetVariablesOperator.bBrackets = False + clsFacetFunction.AddParameter("facets", clsROperatorParameter:=clsFacetVariablesOperator, iPosition:=0) + + clsPipeOperator.SetOperation("%>%") + SetPipeAssignTo() + + clsGroupByFunction.SetPackageName("dplyr") + clsGroupByFunction.SetRCommand("group_by") + clsBaseOperator.AddParameter(GgplotDefaults.clsDefaultThemeParameter.Clone()) clsXlabsFunction = GgplotDefaults.clsXlabTitleFunction.Clone() clsYlabFunction = GgplotDefaults.clsYlabTitleFunction.Clone @@ -615,6 +682,8 @@ Public Class dlgLinePlot ucrChkSlopeLabelOptions.SetRCode(clsGgSlopeFunction, bReset) ucrChkSlopeTextOptions.SetRCode(clsGgSlopeFunction, bReset) ucrChkSlopeLineOptions.SetRCode(clsGgSlopeFunction, bReset) + ucrChkLegend.SetRCode(clsThemeFunction, bReset, bCloneIfNeeded:=True) + ucrInputLegendPosition.SetRCode(clsThemeFunction, bReset, bCloneIfNeeded:=True) If bReset Then ucrChkRibbon.SetRCode(clsOptionsFunction, bReset) End If @@ -818,10 +887,22 @@ Public Class dlgLinePlot End If 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 + Private Sub cmdOptions_Click(sender As Object, e As EventArgs) Handles cmdOptions.Click, PlotOptionsToolStripMenuItem.Click sdgPlots.SetRCode(clsNewOperator:=ucrBase.clsRsyntax.clsBaseOperator, clsNewYScalecontinuousFunction:=clsYScalecontinuousFunction, clsNewXScalecontinuousFunction:=clsXScalecontinuousFunction, clsNewXLabsTitleFunction:=clsXlabsFunction, clsNewYLabTitleFunction:=clsYlabFunction, clsNewLabsFunction:=clsLabsFunction, clsNewFacetFunction:=clsRFacetFunction, - clsNewThemeFunction:=clsThemeFunction, dctNewThemeFunctions:=dctThemeFunctions, clsNewGlobalAesFunction:=clsRaesFunction, ucrNewBaseSelector:=ucrLinePlotSelector, + clsNewThemeFunction:=clsThemeFunction, dctNewThemeFunctions:=dctThemeFunctions, clsNewGlobalAesFunction:=clsRaesFunction, ucrNewBaseSelector:=ucrLinePlotSelector, clsNewFacetVariablesOperator:=clsFacetVariablesOperator, clsNewCoordPolarFunction:=clsCoordPolarFunction, clsNewCoordPolarStartOperator:=clsCoordPolarStartOperator, clsNewXScaleDateFunction:=clsXScaleDateFunction, clsNewAnnotateFunction:=clsAnnotateFunction, clsNewScaleFillViridisFunction:=clsScaleFillViridisFunction, clsNewScaleColourViridisFunction:=clsScaleColourViridisFunction, clsNewYScaleDateFunction:=clsYScaleDateFunction, strMainDialogGeomParameterNames:=strGeomParameterNames, bReset:=bResetSubdialog) @@ -877,4 +958,160 @@ Public Class dlgLinePlot openSdgLayerOptions(clsGeomRibbonFunction) End Sub + Private Sub AutoFacetStation() + Dim currentReceiver As ucrReceiver = ucrLinePlotSelector.CurrentReceiver + + If currentReceiver IsNot Nothing Then + ucr1stFactorReceiver.AddItemsWithMetadataProperty(ucrLinePlotSelector.ucrAvailableDataFrames.cboAvailableDataFrames.Text, "Climatic_Type", {"station_label"}) + currentReceiver.SetMeAsReceiver() + AddRemoveGroupBy() + End If + End Sub + Private Sub ucrInput_ControlValueChanged(ucrChangedControl As ucrInputComboBox) Handles ucrInputStation.ControlValueChanged + If Not bUpdateComboOptions Then + Exit Sub + End If + Dim strChangedText As String = ucrChangedControl.GetText() + If strChangedText <> strNone Then + If Not strChangedText = strFacetCol AndAlso Not strChangedText = strFacetRow AndAlso + Not ucrInputStation.Equals(ucrChangedControl) AndAlso ucrInputStation.GetText() = strChangedText Then + bUpdateComboOptions = False + ucrInputStation.SetName(strNone) + bUpdateComboOptions = True + End If + If (strChangedText = strFacetWrap AndAlso ucrInputStation.GetText = strFacetRow) OrElse (strChangedText = strFacetRow AndAlso + ucrInputStation.GetText = strFacetWrap) OrElse (strChangedText = strFacetWrap AndAlso + ucrInputStation.GetText = strFacetCol) OrElse (strChangedText = strFacetCol AndAlso ucrInputStation.GetText = strFacetWrap) Then + ucrInputStation.SetName(strNone) + End If + End If + UpdateParameters() + AddRemoveFacets() + AddRemoveGroupBy() + End Sub + + Private Sub UpdateParameters() + clsFacetVariablesOperator.RemoveParameterByName("var1") + clsFacetColOp.RemoveParameterByName("col" & ucrInputStation.Name) + clsFacetRowOp.RemoveParameterByName("row" & ucrInputStation.Name) + + clsBaseOperator.RemoveParameterByName("facets") + bUpdatingParameters = True + ucr1stFactorReceiver.SetRCode(Nothing) + Select Case ucrInputStation.GetText() + Case strFacetWrap + ucr1stFactorReceiver.ChangeParameterName("var1") + ucr1stFactorReceiver.SetRCode(clsFacetVariablesOperator) + Case strFacetCol + ucr1stFactorReceiver.ChangeParameterName("col" & ucrInputStation.Name) + ucr1stFactorReceiver.SetRCode(clsFacetColOp) + Case strFacetRow + ucr1stFactorReceiver.ChangeParameterName("row" & ucrInputStation.Name) + ucr1stFactorReceiver.SetRCode(clsFacetRowOp) + End Select + If Not clsRaesFunction.ContainsParameter("x") Then + clsRaesFunction.AddParameter("x", Chr(34) & Chr(34)) + End If + bUpdatingParameters = False + End Sub + + Private Sub AddRemoveFacets() + Dim bWrap As Boolean = False + Dim bCol As Boolean = False + Dim bRow As Boolean = False + + If bUpdatingParameters Then + Exit Sub + End If + + clsBaseOperator.RemoveParameterByName("facets") + If Not ucr1stFactorReceiver.IsEmpty Then + Select Case ucrInputStation.GetText() + Case strFacetWrap + bWrap = True + Case strFacetCol + bCol = True + Case strFacetRow + bRow = True + End Select + End If + + If bWrap OrElse bRow OrElse bCol Then + clsBaseOperator.AddParameter("facets", clsRFunctionParameter:=clsFacetFunction) + End If + If bWrap Then + clsFacetFunction.SetRCommand("facet_wrap") + End If + If bRow OrElse bCol Then + clsFacetFunction.SetRCommand("facet_grid") + End If + If bRow Then + clsFacetVariablesOperator.AddParameter("left", clsROperatorParameter:=clsFacetRowOp, iPosition:=0) + ElseIf bCol AndAlso bWrap = False Then + clsFacetVariablesOperator.AddParameter("left", ".", iPosition:=0) + Else + clsFacetVariablesOperator.RemoveParameterByName("left") + End If + If bCol Then + clsFacetVariablesOperator.AddParameter("right", clsROperatorParameter:=clsFacetColOp, iPosition:=1) + ElseIf bRow AndAlso bWrap = False Then + clsFacetVariablesOperator.AddParameter("right", ".", iPosition:=1) + Else + clsFacetVariablesOperator.RemoveParameterByName("right") + End If + End Sub + + Private Sub ucr1stFactorReceiver_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucr1stFactorReceiver.ControlValueChanged, ucrReceiverX.ControlValueChanged + AddRemoveFacets() + AddRemoveGroupBy() + End Sub + + Private Sub GetParameterValue(clsOperator As ROperator) + Dim i As Integer = 0 + For Each clsTempParam As RParameter In clsOperator.clsParameters + If clsTempParam.strArgumentValue <> "" AndAlso clsTempParam.strArgumentValue <> "." Then + clsGroupByFunction.AddParameter(i, clsTempParam.strArgumentValue, bIncludeArgumentName:=False, iPosition:=i) + i = i + 1 + End If + Next + End Sub + + Private Sub AddRemoveGroupBy() + If clsPipeOperator.ContainsParameter("mutate") Then + clsGroupByFunction.ClearParameters() + If clsBaseOperator.ContainsParameter("facets") Then + Select Case ucrInputStation.GetText() + Case strFacetWrap + GetParameterValue(clsFacetVariablesOperator) + Case strFacetCol + GetParameterValue(clsFacetColOp) + Case strFacetRow + GetParameterValue(clsFacetRowOp) + End Select + End If + + If clsGroupByFunction.iParameterCount > 0 Then + clsPipeOperator.AddParameter("group_by", clsRFunctionParameter:=clsGroupByFunction, iPosition:=1) + Else + clsPipeOperator.RemoveParameterByName("group_by") + End If + Else + clsPipeOperator.RemoveParameterByName("group_by") + End If + + SetPipeAssignTo() + End Sub + + Private Sub SetPipeAssignTo() + If ucrLinePlotSelector.ucrAvailableDataFrames.cboAvailableDataFrames.Text <> "" AndAlso clsPipeOperator.clsParameters.Count > 1 Then + clsPipeOperator.SetAssignTo(ucrLinePlotSelector.ucrAvailableDataFrames.cboAvailableDataFrames.Text) + Else + clsPipeOperator.RemoveAssignTo() + End If + End Sub + + Private Sub ucrLinePlotSelector_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrLinePlotSelector.ControlValueChanged + AutoFacetStation() + SetPipeAssignTo() + End Sub End Class \ No newline at end of file diff --git a/instat/dlgLocatingPointsInShapeFile.vb b/instat/dlgLocatingPointsInShapeFile.vb index 21dcf12d695..2ce99100279 100644 --- a/instat/dlgLocatingPointsInShapeFile.vb +++ b/instat/dlgLocatingPointsInShapeFile.vb @@ -44,6 +44,7 @@ Public Class dlgLocatingPointsInShapeFile End Sub Private Sub InitiliseDialog() + ucrBase.iHelpTopicID=622 ucrSelectorStationFile.SetParameter(New RParameter("x", 0)) ucrSelectorStationFile.SetParameterIsrfunction() diff --git a/instat/dlgMergeAdditionalData.vb b/instat/dlgMergeAdditionalData.vb index cf5d43ecef7..3248859496b 100644 --- a/instat/dlgMergeAdditionalData.vb +++ b/instat/dlgMergeAdditionalData.vb @@ -45,6 +45,7 @@ Public Class dlgMergeAdditionalData End Sub Private Sub InitialiseDialog() + ucrBase.iHelpTopicID = 186 ucrToDataFrame.SetParameter(New RParameter("x", 0)) ucrToDataFrame.SetParameterIsRFunction() ucrToDataFrame.SetLabelText("To Data Frame:") diff --git a/instat/dlgMosaicPlot.Designer.vb b/instat/dlgMosaicPlot.Designer.vb index 17023502c43..dfe34001258 100644 --- a/instat/dlgMosaicPlot.Designer.vb +++ b/instat/dlgMosaicPlot.Designer.vb @@ -43,6 +43,11 @@ Partial Class dlgMosaicPlot Me.toolStripMenuItemPlotOptions = New System.Windows.Forms.ToolStripMenuItem() Me.toolStripMenuItemMosaicOptions = New System.Windows.Forms.ToolStripMenuItem() Me.cmdOptions = New instat.ucrSplitButton() + 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.contextMenuStripOptions.SuspendLayout() Me.SuspendLayout() ' @@ -101,7 +106,7 @@ Partial Class dlgMosaicPlot Me.ucrNudXAxisLabelsAngle.AutoSize = True Me.ucrNudXAxisLabelsAngle.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudXAxisLabelsAngle.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudXAxisLabelsAngle.Location = New System.Drawing.Point(183, 301) + Me.ucrNudXAxisLabelsAngle.Location = New System.Drawing.Point(183, 326) Me.ucrNudXAxisLabelsAngle.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) Me.ucrNudXAxisLabelsAngle.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudXAxisLabelsAngle.Name = "ucrNudXAxisLabelsAngle" @@ -124,7 +129,7 @@ Partial Class dlgMosaicPlot ' Me.ucrChkOmitMissing.AutoSize = True Me.ucrChkOmitMissing.Checked = False - Me.ucrChkOmitMissing.Location = New System.Drawing.Point(9, 269) + Me.ucrChkOmitMissing.Location = New System.Drawing.Point(9, 278) Me.ucrChkOmitMissing.Name = "ucrChkOmitMissing" Me.ucrChkOmitMissing.Size = New System.Drawing.Size(224, 23) Me.ucrChkOmitMissing.TabIndex = 13 @@ -184,7 +189,7 @@ Partial Class dlgMosaicPlot 'ucrSaveMosaicPlot ' Me.ucrSaveMosaicPlot.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrSaveMosaicPlot.Location = New System.Drawing.Point(9, 385) + Me.ucrSaveMosaicPlot.Location = New System.Drawing.Point(9, 422) Me.ucrSaveMosaicPlot.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.ucrSaveMosaicPlot.Name = "ucrSaveMosaicPlot" Me.ucrSaveMosaicPlot.Size = New System.Drawing.Size(317, 24) @@ -194,7 +199,7 @@ Partial Class dlgMosaicPlot ' Me.ucrChkXAxisLabelAngle.AutoSize = True Me.ucrChkXAxisLabelAngle.Checked = False - Me.ucrChkXAxisLabelAngle.Location = New System.Drawing.Point(9, 301) + Me.ucrChkXAxisLabelAngle.Location = New System.Drawing.Point(9, 326) Me.ucrChkXAxisLabelAngle.Name = "ucrChkXAxisLabelAngle" Me.ucrChkXAxisLabelAngle.Size = New System.Drawing.Size(168, 23) Me.ucrChkXAxisLabelAngle.TabIndex = 14 @@ -215,7 +220,7 @@ Partial Class dlgMosaicPlot ' Me.ucrBase.AutoSize = True Me.ucrBase.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrBase.Location = New System.Drawing.Point(12, 418) + Me.ucrBase.Location = New System.Drawing.Point(12, 455) Me.ucrBase.Name = "ucrBase" Me.ucrBase.Size = New System.Drawing.Size(408, 52) Me.ucrBase.TabIndex = 17 @@ -252,12 +257,72 @@ Partial Class dlgMosaicPlot Me.cmdOptions.Text = "Plot Options" Me.cmdOptions.UseVisualStyleBackColor = True ' + '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(321, 381) + Me.ucrInputStation.Name = "ucrInputStation" + Me.ucrInputStation.Size = New System.Drawing.Size(101, 21) + Me.ucrInputStation.TabIndex = 96 + ' + 'ucr1stFactorReceiver + ' + Me.ucr1stFactorReceiver.AutoSize = True + Me.ucr1stFactorReceiver.frmParent = Me + Me.ucr1stFactorReceiver.Location = New System.Drawing.Point(209, 382) + Me.ucr1stFactorReceiver.Margin = New System.Windows.Forms.Padding(0) + Me.ucr1stFactorReceiver.Name = "ucr1stFactorReceiver" + Me.ucr1stFactorReceiver.Selector = Nothing + Me.ucr1stFactorReceiver.Size = New System.Drawing.Size(110, 26) + Me.ucr1stFactorReceiver.strNcFilePath = "" + Me.ucr1stFactorReceiver.TabIndex = 95 + 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, 367) + Me.lblFacetBy.Name = "lblFacetBy" + Me.lblFacetBy.Size = New System.Drawing.Size(52, 13) + Me.lblFacetBy.TabIndex = 94 + 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(91, 381) + Me.ucrInputLegendPosition.Name = "ucrInputLegendPosition" + Me.ucrInputLegendPosition.Size = New System.Drawing.Size(112, 21) + Me.ucrInputLegendPosition.TabIndex = 98 + ' + 'ucrChkLegend + ' + Me.ucrChkLegend.AutoSize = True + Me.ucrChkLegend.Checked = False + Me.ucrChkLegend.Location = New System.Drawing.Point(9, 382) + Me.ucrChkLegend.Name = "ucrChkLegend" + Me.ucrChkLegend.Size = New System.Drawing.Size(98, 24) + Me.ucrChkLegend.TabIndex = 97 + ' 'dlgMosaicPlot ' 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(441, 475) + Me.ClientSize = New System.Drawing.Size(441, 510) + Me.Controls.Add(Me.ucrInputStation) + Me.Controls.Add(Me.ucr1stFactorReceiver) + Me.Controls.Add(Me.lblFacetBy) + Me.Controls.Add(Me.ucrInputLegendPosition) + Me.Controls.Add(Me.ucrChkLegend) Me.Controls.Add(Me.cmdOptions) Me.Controls.Add(Me.ucrNudXAxisLabelsAngle) Me.Controls.Add(Me.ucrInputPartitioning) @@ -308,4 +373,9 @@ Partial Class dlgMosaicPlot Friend WithEvents contextMenuStripOptions As ContextMenuStrip Friend WithEvents toolStripMenuItemPlotOptions As ToolStripMenuItem Friend WithEvents toolStripMenuItemMosaicOptions As ToolStripMenuItem + Friend WithEvents ucrInputStation As ucrInputComboBox + Friend WithEvents ucr1stFactorReceiver As ucrReceiverSingle + Friend WithEvents lblFacetBy As Label + Friend WithEvents ucrInputLegendPosition As ucrInputComboBox + Friend WithEvents ucrChkLegend As ucrCheck End Class diff --git a/instat/dlgMosaicPlot.vb b/instat/dlgMosaicPlot.vb index 8ee21119606..f4f6c2cf6f0 100644 --- a/instat/dlgMosaicPlot.vb +++ b/instat/dlgMosaicPlot.vb @@ -42,6 +42,22 @@ Public Class dlgMosaicPlot Private clsYScaleDateFunction As New RFunction Private clsScaleFillViridisFunction As New RFunction Private clsScaleColourViridisFunction As New RFunction + + Private clsFacetFunction As New RFunction + Private clsFacetVariablesOperator As New ROperator + Private clsFacetRowOp As New ROperator + Private clsFacetColOp As New ROperator + Private clsPipeOperator As New ROperator + Private clsGroupByFunction As New RFunction + + Private ReadOnly strNone As String = "None" + Private ReadOnly strFacetWrap As String = "Facet Wrap" + Private ReadOnly strFacetRow As String = "Facet Row" + Private ReadOnly strFacetCol As String = "Facet Column" + + Private bUpdateComboOptions As Boolean = True + Private bUpdatingParameters As Boolean = False + Private bFirstLoad As Boolean = True Private bReset As Boolean = True Private bRCodeSet As Boolean = True @@ -65,6 +81,7 @@ Public Class dlgMosaicPlot Private Sub InitialiseDialog() Dim dctPartitionOptions As New Dictionary(Of String, String) + Dim dctLegendPosition As New Dictionary(Of String, String) ucrBase.clsRsyntax.bExcludeAssignedFunctionOutput = False ucrBase.iHelpTopicID = 594 @@ -129,6 +146,32 @@ Public Class dlgMosaicPlot ucrNudXAxisLabelsAngle.SetParameter(New RParameter("angle")) ucrNudXAxisLabelsAngle.SetMinMax(0, 360) + 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) + + ucr1stFactorReceiver.SetParameter(New RParameter("var1")) + ucr1stFactorReceiver.Selector = ucrSelectorMosaicPlot + ucr1stFactorReceiver.SetIncludedDataTypes({"factor"}) + ucr1stFactorReceiver.strSelectorHeading = "Factors" + ucr1stFactorReceiver.bWithQuotes = False + ucr1stFactorReceiver.SetParameterIsString() + ucr1stFactorReceiver.SetValuesToIgnore({"."}) + ucr1stFactorReceiver.SetParameterPosition(1) + ucr1stFactorReceiver.SetLinkedDisplayControl(lblFacetBy) + + ucrInputStation.SetItems({strFacetWrap, strFacetRow, strFacetCol, strNone}) + ucrInputStation.SetDropDownStyleAsNonEditable() + ucrSaveMosaicPlot.SetPrefix("mosaic") ucrSaveMosaicPlot.SetIsComboBox() ucrSaveMosaicPlot.SetCheckBoxText("Save Graph") @@ -146,6 +189,17 @@ Public Class dlgMosaicPlot clsXElementLabels = New RFunction + clsFacetFunction = New RFunction + clsFacetVariablesOperator = New ROperator + clsFacetRowOp = New ROperator + clsFacetColOp = New ROperator + clsPipeOperator = New ROperator + clsGroupByFunction = New RFunction + + ucrInputStation.SetName(strFacetWrap) + ucrInputStation.bUpdateRCodeFromControl = True + + ucrSelectorMosaicPlot.Reset() ucrSelectorMosaicPlot.SetGgplotFunction(clsBaseOperator) @@ -172,6 +226,22 @@ Public Class dlgMosaicPlot clsAesFunction.SetPackageName("ggplot2") clsAesFunction.SetRCommand("aes") + clsFacetFunction.SetPackageName("ggplot2") + clsFacetRowOp.SetOperation("+") + clsFacetRowOp.bBrackets = False + clsFacetColOp.SetOperation("+") + clsFacetColOp.bBrackets = False + clsFacetVariablesOperator.SetOperation("~") + clsFacetVariablesOperator.bForceIncludeOperation = True + clsFacetVariablesOperator.bBrackets = False + clsFacetFunction.AddParameter("facets", clsROperatorParameter:=clsFacetVariablesOperator, iPosition:=0) + + clsPipeOperator.SetOperation("%>%") + SetPipeAssignTo() + + clsGroupByFunction.SetPackageName("dplyr") + clsGroupByFunction.SetRCommand("group_by") + clsBaseOperator.AddParameter(GgplotDefaults.clsDefaultThemeParameter.Clone()) clsXlabsFunction = GgplotDefaults.clsXlabTitleFunction.Clone() clsLabsFunction = GgplotDefaults.clsDefaultLabs.Clone() @@ -215,6 +285,9 @@ Public Class dlgMosaicPlot ucrSaveMosaicPlot.SetRCode(clsBaseOperator, bReset) + ucrChkLegend.SetRCode(clsThemeFunction, bReset, bCloneIfNeeded:=True) + ucrInputLegendPosition.SetRCode(clsThemeFunction, bReset, bCloneIfNeeded:=True) + AddRemoveXAxisTextParameters() bRCodeSet = True End Sub @@ -237,6 +310,163 @@ Public Class dlgMosaicPlot TestOkEnabled() End Sub + Private Sub AutoFacetStation() + Dim currentReceiver As ucrReceiver = ucrSelectorMosaicPlot.CurrentReceiver + + If currentReceiver IsNot Nothing Then + ucr1stFactorReceiver.AddItemsWithMetadataProperty(ucrSelectorMosaicPlot.ucrAvailableDataFrames.cboAvailableDataFrames.Text, "Climatic_Type", {"station_label"}) + currentReceiver.SetMeAsReceiver() + AddRemoveGroupBy() + End If + End Sub + + Private Sub ucrInput_ControlValueChanged(ucrChangedControl As ucrInputComboBox) Handles ucrInputStation.ControlValueChanged + If Not bUpdateComboOptions Then + Exit Sub + End If + Dim strChangedText As String = ucrChangedControl.GetText() + If strChangedText <> strNone Then + If Not strChangedText = strFacetCol AndAlso Not strChangedText = strFacetRow AndAlso + Not ucrInputStation.Equals(ucrChangedControl) AndAlso ucrInputStation.GetText() = strChangedText Then + bUpdateComboOptions = False + ucrInputStation.SetName(strNone) + bUpdateComboOptions = True + End If + If (strChangedText = strFacetWrap AndAlso ucrInputStation.GetText = strFacetRow) OrElse (strChangedText = strFacetRow AndAlso + ucrInputStation.GetText = strFacetWrap) OrElse (strChangedText = strFacetWrap AndAlso + ucrInputStation.GetText = strFacetCol) OrElse (strChangedText = strFacetCol AndAlso ucrInputStation.GetText = strFacetWrap) Then + ucrInputStation.SetName(strNone) + End If + End If + UpdateParameters() + AddRemoveFacets() + AddRemoveGroupBy() + End Sub + + Private Sub UpdateParameters() + clsFacetVariablesOperator.RemoveParameterByName("var1") + clsFacetColOp.RemoveParameterByName("col" & ucrInputStation.Name) + clsFacetRowOp.RemoveParameterByName("row" & ucrInputStation.Name) + + clsBaseOperator.RemoveParameterByName("facets") + bUpdatingParameters = True + ucr1stFactorReceiver.SetRCode(Nothing) + Select Case ucrInputStation.GetText() + Case strFacetWrap + ucr1stFactorReceiver.ChangeParameterName("var1") + ucr1stFactorReceiver.SetRCode(clsFacetVariablesOperator) + Case strFacetCol + ucr1stFactorReceiver.ChangeParameterName("col" & ucrInputStation.Name) + ucr1stFactorReceiver.SetRCode(clsFacetColOp) + Case strFacetRow + ucr1stFactorReceiver.ChangeParameterName("row" & ucrInputStation.Name) + ucr1stFactorReceiver.SetRCode(clsFacetRowOp) + End Select + If Not clsAesFunction.ContainsParameter("x") Then + clsAesFunction.AddParameter("x", Chr(34) & Chr(34)) + End If + bUpdatingParameters = False + End Sub + + Private Sub AddRemoveFacets() + Dim bWrap As Boolean = False + Dim bCol As Boolean = False + Dim bRow As Boolean = False + + If bUpdatingParameters Then + Exit Sub + End If + + If Not ucr1stFactorReceiver.IsEmpty Then + Select Case ucrInputStation.GetText() + Case strFacetWrap + bWrap = True + Case strFacetCol + bCol = True + Case strFacetRow + bRow = True + End Select + End If + + If bWrap OrElse bRow OrElse bCol Then + clsBaseOperator.AddParameter("facets", clsRFunctionParameter:=clsFacetFunction) + End If + If bWrap Then + clsFacetFunction.SetRCommand("facet_wrap") + End If + If bRow OrElse bCol Then + clsFacetFunction.SetRCommand("facet_grid") + End If + If bRow Then + clsFacetVariablesOperator.AddParameter("left", clsROperatorParameter:=clsFacetRowOp, iPosition:=0) + ElseIf bCol AndAlso bWrap = False Then + clsFacetVariablesOperator.AddParameter("left", ".", iPosition:=0) + Else + clsFacetVariablesOperator.RemoveParameterByName("left") + End If + If bCol Then + clsFacetVariablesOperator.AddParameter("right", clsROperatorParameter:=clsFacetColOp, iPosition:=1) + ElseIf bRow AndAlso bWrap = False Then + clsFacetVariablesOperator.AddParameter("right", ".", iPosition:=1) + Else + clsFacetVariablesOperator.RemoveParameterByName("right") + End If + End Sub + + Private Sub ucr1stFactorReceiver_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucr1stFactorReceiver.ControlValueChanged, ucrReceiverX.ControlValueChanged + AddRemoveFacets() + AddRemoveGroupBy() + End Sub + + Private Sub GetParameterValue(clsOperator As ROperator) + Dim i As Integer = 0 + For Each clsTempParam As RParameter In clsOperator.clsParameters + If clsTempParam.strArgumentValue <> "" AndAlso clsTempParam.strArgumentValue <> "." Then + clsGroupByFunction.AddParameter(i, clsTempParam.strArgumentValue, bIncludeArgumentName:=False, iPosition:=i) + i = i + 1 + End If + Next + End Sub + + Private Sub AddRemoveGroupBy() + If clsPipeOperator.ContainsParameter("mutate") Then + clsGroupByFunction.ClearParameters() + If clsBaseOperator.ContainsParameter("facets") Then + Select Case ucrInputStation.GetText() + Case strFacetWrap + GetParameterValue(clsFacetVariablesOperator) + Case strFacetCol + GetParameterValue(clsFacetColOp) + Case strFacetRow + GetParameterValue(clsFacetRowOp) + End Select + End If + + If clsGroupByFunction.iParameterCount > 0 Then + clsPipeOperator.AddParameter("group_by", clsRFunctionParameter:=clsGroupByFunction, iPosition:=1) + Else + clsPipeOperator.RemoveParameterByName("group_by") + End If + Else + clsPipeOperator.RemoveParameterByName("group_by") + End If + + SetPipeAssignTo() + End Sub + + Private Sub SetPipeAssignTo() + If ucrSelectorMosaicPlot.ucrAvailableDataFrames.cboAvailableDataFrames.Text <> "" AndAlso clsPipeOperator.clsParameters.Count > 1 Then + clsPipeOperator.SetAssignTo(ucrSelectorMosaicPlot.ucrAvailableDataFrames.cboAvailableDataFrames.Text) + Else + clsPipeOperator.RemoveAssignTo() + End If + End Sub + + Private Sub ucrSelectorMosaicPlot_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrSelectorMosaicPlot.ControlValueChanged + AutoFacetStation() + SetPipeAssignTo() + End Sub + Private Sub ucrReceiverX_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrReceiverX.ControlValueChanged Dim iXVarCount As Integer @@ -285,6 +515,10 @@ Public Class dlgMosaicPlot End If End Sub + Private Sub ucrChkLegend_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkLegend.ControlValueChanged, ucrInputLegendPosition.ControlValueChanged + AddRemoveTheme() + End Sub + Private Sub XAxisLabelAngleControls_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkXAxisLabelAngle.ControlValueChanged, ucrNudXAxisLabelsAngle.ControlValueChanged AddRemoveXAxisTextParameters() End Sub @@ -300,7 +534,7 @@ Public Class dlgMosaicPlot clsNewXScalecontinuousFunction:=clsXScaleContinuousFunction, clsNewYScalecontinuousFunction:=clsYScaleContinuousFunction, clsNewXLabsTitleFunction:=clsXlabsFunction, clsNewYLabTitleFunction:=clsYlabFunction, clsNewLabsFunction:=clsLabsFunction, clsNewFacetFunction:=clsRFacetFunction, ucrNewBaseSelector:=ucrSelectorMosaicPlot, clsNewCoordPolarFunction:=clsCoordPolarFunction, - clsNewCoordPolarStartOperator:=clsCoordPolarStartOperator, clsNewXScaleDateFunction:=clsXScaleDateFunction, + clsNewCoordPolarStartOperator:=clsCoordPolarStartOperator, clsNewXScaleDateFunction:=clsXScaleDateFunction, clsNewFacetVariablesOperator:=clsFacetVariablesOperator, clsNewAnnotateFunction:=clsAnnotateFunction, clsNewYScaleDateFunction:=clsYScaleDateFunction, bNewEnableColour:=False, bNewEnableDiscrete:=False, bReset:=bResetSubdialog) sdgPlots.ShowDialog() bResetSubdialog = False diff --git a/instat/dlgNewMarkovChains.vb b/instat/dlgNewMarkovChains.vb index e66a160aa01..123acf9e989 100644 --- a/instat/dlgNewMarkovChains.vb +++ b/instat/dlgNewMarkovChains.vb @@ -55,6 +55,7 @@ Public Class dlgNewMarkovChains End Sub Private Sub InitialiseDialog() + ucrBase.iHelpTopicID = 490 ucrReceiverStation.Selector = ucrSelectorMarkovChains ucrReceiverStation.AddIncludedMetadataProperty("Climatic_Type", {Chr(34) & "station" & Chr(34)}) ucrReceiverStation.bAutoFill = True diff --git a/instat/dlgOtherRosePlots.vb b/instat/dlgOtherRosePlots.vb index 0a91d425da4..2affd52a850 100644 --- a/instat/dlgOtherRosePlots.vb +++ b/instat/dlgOtherRosePlots.vb @@ -39,7 +39,7 @@ Public Class dlgOtherRosePlots Private Sub InitiliseDialog() Dim dctMethod As New Dictionary(Of String, String) - + ucrBase.iHelpTopicID = 309 ucrBase.clsRsyntax.iCallType = 3 ucrSelectorOtherRosePlots.SetParameter(New RParameter("data", 0)) diff --git a/instat/dlgPICSARainfall.vb b/instat/dlgPICSARainfall.vb index a86787a1eba..f424bb2b746 100644 --- a/instat/dlgPICSARainfall.vb +++ b/instat/dlgPICSARainfall.vb @@ -875,6 +875,7 @@ Public Class dlgPICSARainfall ucrChkLineofBestFit.Visible = True ucrChkWithSE.Visible = True Me.Text = "PICSA General Graphs" + ucrBase.iHelpTopicID = 521 Case PICSAMode.Rainfall ucrChkLineofBestFit.Visible = False ucrChkWithSE.Visible = False @@ -883,6 +884,7 @@ Public Class dlgPICSARainfall ucrChkLineofBestFit.Visible = True ucrChkWithSE.Visible = True Me.Text = "PICSA Temperature Graphs" + ucrBase.iHelpTopicID = 479 End Select End Sub diff --git a/instat/dlgParallelCoordinatePlot.Designer.vb b/instat/dlgParallelCoordinatePlot.Designer.vb index 709f74443cc..eadafee6fe7 100644 --- a/instat/dlgParallelCoordinatePlot.Designer.vb +++ b/instat/dlgParallelCoordinatePlot.Designer.vb @@ -40,6 +40,11 @@ Partial Class dlgParallelCoordinatePlot Me.toolStripMenuItemParcoordOptions = New System.Windows.Forms.ToolStripMenuItem() Me.ucrChkBoxplots = New instat.ucrCheck() Me.ucrChkPoints = New instat.ucrCheck() + 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.contextMenuStripOptions.SuspendLayout() Me.SuspendLayout() ' @@ -86,7 +91,7 @@ Partial Class dlgParallelCoordinatePlot 'ucrSaveGraph ' Me.ucrSaveGraph.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrSaveGraph.Location = New System.Drawing.Point(11, 313) + Me.ucrSaveGraph.Location = New System.Drawing.Point(11, 351) Me.ucrSaveGraph.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.ucrSaveGraph.Name = "ucrSaveGraph" Me.ucrSaveGraph.Size = New System.Drawing.Size(324, 24) @@ -120,7 +125,7 @@ Partial Class dlgParallelCoordinatePlot ' Me.ucrBase.AutoSize = True Me.ucrBase.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrBase.Location = New System.Drawing.Point(9, 342) + Me.ucrBase.Location = New System.Drawing.Point(9, 380) Me.ucrBase.Name = "ucrBase" Me.ucrBase.Size = New System.Drawing.Size(408, 52) Me.ucrBase.TabIndex = 13 @@ -212,12 +217,72 @@ Partial Class dlgParallelCoordinatePlot Me.ucrChkPoints.Size = New System.Drawing.Size(100, 23) Me.ucrChkPoints.TabIndex = 11 ' + '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(315, 315) + Me.ucrInputStation.Name = "ucrInputStation" + Me.ucrInputStation.Size = New System.Drawing.Size(101, 21) + Me.ucrInputStation.TabIndex = 106 + ' + 'ucr1stFactorReceiver + ' + Me.ucr1stFactorReceiver.AutoSize = True + Me.ucr1stFactorReceiver.frmParent = Me + Me.ucr1stFactorReceiver.Location = New System.Drawing.Point(204, 316) + Me.ucr1stFactorReceiver.Margin = New System.Windows.Forms.Padding(0) + Me.ucr1stFactorReceiver.Name = "ucr1stFactorReceiver" + Me.ucr1stFactorReceiver.Selector = Nothing + Me.ucr1stFactorReceiver.Size = New System.Drawing.Size(110, 26) + Me.ucr1stFactorReceiver.strNcFilePath = "" + Me.ucr1stFactorReceiver.TabIndex = 105 + Me.ucr1stFactorReceiver.ucrSelector = Nothing + ' + 'lblFacetBy + ' + Me.lblFacetBy.AutoSize = True + Me.lblFacetBy.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.lblFacetBy.Location = New System.Drawing.Point(206, 301) + Me.lblFacetBy.Name = "lblFacetBy" + Me.lblFacetBy.Size = New System.Drawing.Size(52, 13) + Me.lblFacetBy.TabIndex = 104 + 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(90, 315) + Me.ucrInputLegendPosition.Name = "ucrInputLegendPosition" + Me.ucrInputLegendPosition.Size = New System.Drawing.Size(112, 21) + Me.ucrInputLegendPosition.TabIndex = 108 + ' + 'ucrChkLegend + ' + Me.ucrChkLegend.AutoSize = True + Me.ucrChkLegend.Checked = False + Me.ucrChkLegend.Location = New System.Drawing.Point(11, 316) + Me.ucrChkLegend.Name = "ucrChkLegend" + Me.ucrChkLegend.Size = New System.Drawing.Size(98, 24) + Me.ucrChkLegend.TabIndex = 107 + ' 'dlgParallelCoordinatePlot ' 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(417, 399) + Me.ClientSize = New System.Drawing.Size(417, 436) + Me.Controls.Add(Me.ucrInputStation) + Me.Controls.Add(Me.ucr1stFactorReceiver) + Me.Controls.Add(Me.lblFacetBy) + Me.Controls.Add(Me.ucrInputLegendPosition) + Me.Controls.Add(Me.ucrChkLegend) Me.Controls.Add(Me.ucrChkPoints) Me.Controls.Add(Me.ucrChkBoxplots) Me.Controls.Add(Me.cmdOptions) @@ -261,4 +326,9 @@ Partial Class dlgParallelCoordinatePlot Friend WithEvents toolStripMenuItemParcoordOptions As ToolStripMenuItem Friend WithEvents ucrChkPoints As ucrCheck Friend WithEvents ucrChkBoxplots As ucrCheck + Friend WithEvents ucrInputStation As ucrInputComboBox + Friend WithEvents ucr1stFactorReceiver As ucrReceiverSingle + Friend WithEvents lblFacetBy As Label + Friend WithEvents ucrInputLegendPosition As ucrInputComboBox + Friend WithEvents ucrChkLegend As ucrCheck End Class diff --git a/instat/dlgParallelCoordinatePlot.vb b/instat/dlgParallelCoordinatePlot.vb index 693bef45b0b..54210b80f68 100644 --- a/instat/dlgParallelCoordinatePlot.vb +++ b/instat/dlgParallelCoordinatePlot.vb @@ -37,6 +37,21 @@ Public Class dlgParallelCoordinatePlot Private clsScaleColourViridisFunction As New RFunction Private clsAnnotateFunction As New RFunction + Private clsFacetFunction As New RFunction + Private clsFacetVariablesOperator As New ROperator + Private clsFacetRowOp As New ROperator + Private clsFacetColOp As New ROperator + Private clsPipeOperator As New ROperator + Private clsGroupByFunction As New RFunction + + Private ReadOnly strNone As String = "None" + Private ReadOnly strFacetWrap As String = "Facet Wrap" + Private ReadOnly strFacetRow As String = "Facet Row" + Private ReadOnly strFacetCol As String = "Facet Column" + + Private bUpdateComboOptions As Boolean = True + Private bUpdatingParameters As Boolean = False + Private Sub dlgParallelCoordinatePlot_Load(sender As Object, e As EventArgs) Handles MyBase.Load If bFirstload Then InitialiseDialog() @@ -53,6 +68,7 @@ Public Class dlgParallelCoordinatePlot Private Sub InitialiseDialog() Dim dctScale As New Dictionary(Of String, String) + Dim dctLegendPosition As New Dictionary(Of String, String) ucrBase.clsRsyntax.bExcludeAssignedFunctionOutput = False ucrBase.iHelpTopicID = 593 ucrBase.clsRsyntax.iCallType = 3 @@ -100,6 +116,32 @@ Public Class dlgParallelCoordinatePlot ucrInputScale.SetRDefault("std") ucrInputScale.SetDropDownStyleAsNonEditable() + 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) + + ucr1stFactorReceiver.SetParameter(New RParameter("var1")) + ucr1stFactorReceiver.Selector = ucrSelectorParallelCoordinatePlot + ucr1stFactorReceiver.SetIncludedDataTypes({"factor"}) + ucr1stFactorReceiver.strSelectorHeading = "Factors" + ucr1stFactorReceiver.bWithQuotes = False + ucr1stFactorReceiver.SetParameterIsString() + ucr1stFactorReceiver.SetValuesToIgnore({"."}) + ucr1stFactorReceiver.SetParameterPosition(1) + ucr1stFactorReceiver.SetLinkedDisplayControl(lblFacetBy) + + ucrInputStation.SetItems({strFacetWrap, strFacetRow, strFacetCol, strNone}) + ucrInputStation.SetDropDownStyleAsNonEditable() + ucrSaveGraph.SetPrefix("par_coord_plot") ucrSaveGraph.SetSaveTypeAsGraph() ucrSaveGraph.SetDataFrameSelector(ucrSelectorParallelCoordinatePlot.ucrAvailableDataFrames) @@ -111,6 +153,15 @@ Public Class dlgParallelCoordinatePlot Private Sub SetDefaults() clsBaseOperator = New ROperator clsGGParCoordFunc = New RFunction + clsFacetFunction = New RFunction + clsFacetVariablesOperator = New ROperator + clsFacetRowOp = New ROperator + clsFacetColOp = New ROperator + clsPipeOperator = New ROperator + clsGroupByFunction = New RFunction + + ucrInputStation.SetName(strFacetWrap) + ucrInputStation.bUpdateRCodeFromControl = True ucrReceiverXVariables.SetMeAsReceiver() ucrSelectorParallelCoordinatePlot.Reset() @@ -127,6 +178,22 @@ Public Class dlgParallelCoordinatePlot clsBaseOperator.SetOperation("+") clsBaseOperator.AddParameter("ggparcord", clsRFunctionParameter:=clsGGParCoordFunc, iPosition:=0) + clsFacetFunction.SetPackageName("ggplot2") + clsFacetRowOp.SetOperation("+") + clsFacetRowOp.bBrackets = False + clsFacetColOp.SetOperation("+") + clsFacetColOp.bBrackets = False + clsFacetVariablesOperator.SetOperation("~") + clsFacetVariablesOperator.bForceIncludeOperation = True + clsFacetVariablesOperator.bBrackets = False + clsFacetFunction.AddParameter("facets", clsROperatorParameter:=clsFacetVariablesOperator, iPosition:=0) + + clsPipeOperator.SetOperation("%>%") + SetPipeAssignTo() + + clsGroupByFunction.SetPackageName("dplyr") + clsGroupByFunction.SetRCommand("group_by") + clsBaseOperator.AddParameter(GgplotDefaults.clsDefaultThemeParameter.Clone()) clsXLabsFunction = GgplotDefaults.clsXlabTitleFunction.Clone() clsLabsFunction = GgplotDefaults.clsDefaultLabs.Clone() @@ -151,13 +218,17 @@ Public Class dlgParallelCoordinatePlot Private Sub SetRCodeForControls(bReset As Boolean) ucrSelectorParallelCoordinatePlot.SetRCode(clsGGParCoordFunc, bReset) - ucrReceiverXVariables.SetRCode(clsGGParCoordFunc, bReset) ucrReceiverFactor.SetRCode(clsGGParCoordFunc, bReset) ucrChkBoxplots.SetRCode(clsGGParCoordFunc, bReset) ucrChkPoints.SetRCode(clsGGParCoordFunc, bReset) ucrNudTransparency.SetRCode(clsGGParCoordFunc, bReset) ucrInputScale.SetRCode(clsGGParCoordFunc, bReset) + ucrChkLegend.SetRCode(clsThemeFunction, bReset, bCloneIfNeeded:=True) + ucrInputLegendPosition.SetRCode(clsThemeFunction, bReset, bCloneIfNeeded:=True) ucrSaveGraph.SetRCode(clsBaseOperator, bReset) + If bReset Then + ucrReceiverXVariables.SetRCode(clsGGParCoordFunc, bReset) + End If End Sub Private Sub TestOkEnabled() @@ -182,13 +253,180 @@ Public Class dlgParallelCoordinatePlot Private Sub cmdOptions_Click(sender As Object, e As EventArgs) Handles cmdOptions.Click, toolStripMenuItemPlotOptions.Click sdgPlots.SetRCode(clsBaseOperator, clsNewThemeFunction:=clsThemeFunction, dctNewThemeFunctions:=dctThemeFunctions, clsNewXScalecontinuousFunction:=clsXScaleContinuousFunction, clsNewYScalecontinuousFunction:=clsYScaleContinuousFunction, - clsNewScaleFillViridisFunction:=clsScaleFillViridisFunction, clsNewScaleColourViridisFunction:=clsScaleColourViridisFunction, clsNewXLabsTitleFunction:=clsXLabsFunction, clsNewYLabTitleFunction:=clsYLabsFunction, + clsNewScaleFillViridisFunction:=clsScaleFillViridisFunction, clsNewScaleColourViridisFunction:=clsScaleColourViridisFunction, clsNewXLabsTitleFunction:=clsXLabsFunction, clsNewYLabTitleFunction:=clsYLabsFunction, clsNewFacetVariablesOperator:=clsFacetVariablesOperator, clsNewLabsFunction:=clsLabsFunction, clsNewFacetFunction:=clsRFacetFunction, ucrNewBaseSelector:=ucrSelectorParallelCoordinatePlot, clsNewCoordPolarFunction:=clsCoordPolarFunction, clsNewCoordPolarStartOperator:=clsCoordPolarStartOperator, clsNewXScaleDateFunction:=clsXScaleDateFunction, clsNewYScaleDateFunction:=clsYScaleDateFunction, clsNewAnnotateFunction:=clsAnnotateFunction, bReset:=bResetSubdialog) sdgPlots.ShowDialog() bResetSubdialog = False 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 + + Private Sub AutoFacetStation() + Dim currentReceiver As ucrReceiver = ucrSelectorParallelCoordinatePlot.CurrentReceiver + + If currentReceiver IsNot Nothing Then + ucr1stFactorReceiver.AddItemsWithMetadataProperty(ucrSelectorParallelCoordinatePlot.ucrAvailableDataFrames.cboAvailableDataFrames.Text, "Climatic_Type", {"station_label"}) + currentReceiver.SetMeAsReceiver() + AddRemoveGroupBy() + End If + End Sub + + Private Sub ucrInput_ControlValueChanged(ucrChangedControl As ucrInputComboBox) Handles ucrInputStation.ControlValueChanged + If Not bUpdateComboOptions Then + Exit Sub + End If + Dim strChangedText As String = ucrChangedControl.GetText() + If strChangedText <> strNone Then + If Not strChangedText = strFacetCol AndAlso Not strChangedText = strFacetRow AndAlso + Not ucrInputStation.Equals(ucrChangedControl) AndAlso ucrInputStation.GetText() = strChangedText Then + bUpdateComboOptions = False + ucrInputStation.SetName(strNone) + bUpdateComboOptions = True + End If + If (strChangedText = strFacetWrap AndAlso ucrInputStation.GetText = strFacetRow) OrElse (strChangedText = strFacetRow AndAlso + ucrInputStation.GetText = strFacetWrap) OrElse (strChangedText = strFacetWrap AndAlso + ucrInputStation.GetText = strFacetCol) OrElse (strChangedText = strFacetCol AndAlso ucrInputStation.GetText = strFacetWrap) Then + ucrInputStation.SetName(strNone) + End If + End If + UpdateParameters() + AddRemoveFacets() + AddRemoveGroupBy() + End Sub + + Private Sub UpdateParameters() + clsFacetVariablesOperator.RemoveParameterByName("var1") + clsFacetColOp.RemoveParameterByName("col" & ucrInputStation.Name) + clsFacetRowOp.RemoveParameterByName("row" & ucrInputStation.Name) + + clsBaseOperator.RemoveParameterByName("facets") + bUpdatingParameters = True + ucr1stFactorReceiver.SetRCode(Nothing) + Select Case ucrInputStation.GetText() + Case strFacetWrap + ucr1stFactorReceiver.ChangeParameterName("var1") + ucr1stFactorReceiver.SetRCode(clsFacetVariablesOperator) + Case strFacetCol + ucr1stFactorReceiver.ChangeParameterName("col" & ucrInputStation.Name) + ucr1stFactorReceiver.SetRCode(clsFacetColOp) + Case strFacetRow + ucr1stFactorReceiver.ChangeParameterName("row" & ucrInputStation.Name) + ucr1stFactorReceiver.SetRCode(clsFacetRowOp) + End Select + bUpdatingParameters = False + End Sub + + Private Sub AddRemoveFacets() + Dim bWrap As Boolean = False + Dim bCol As Boolean = False + Dim bRow As Boolean = False + + If bUpdatingParameters Then + Exit Sub + End If + + clsBaseOperator.RemoveParameterByName("facets") + If Not ucr1stFactorReceiver.IsEmpty Then + Select Case ucrInputStation.GetText() + Case strFacetWrap + bWrap = True + Case strFacetCol + bCol = True + Case strFacetRow + bRow = True + End Select + End If + + If bWrap OrElse bRow OrElse bCol Then + clsBaseOperator.AddParameter("facets", clsRFunctionParameter:=clsFacetFunction) + End If + If bWrap Then + clsFacetFunction.SetRCommand("facet_wrap") + End If + If bRow OrElse bCol Then + clsFacetFunction.SetRCommand("facet_grid") + End If + If bRow Then + clsFacetVariablesOperator.AddParameter("left", clsROperatorParameter:=clsFacetRowOp, iPosition:=0) + ElseIf bCol AndAlso bWrap = False Then + clsFacetVariablesOperator.AddParameter("left", ".", iPosition:=0) + Else + clsFacetVariablesOperator.RemoveParameterByName("left") + End If + If bCol Then + clsFacetVariablesOperator.AddParameter("right", clsROperatorParameter:=clsFacetColOp, iPosition:=1) + ElseIf bRow AndAlso bWrap = False Then + clsFacetVariablesOperator.AddParameter("right", ".", iPosition:=1) + Else + clsFacetVariablesOperator.RemoveParameterByName("right") + End If + End Sub + + Private Sub ucr1stFactorReceiver_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucr1stFactorReceiver.ControlValueChanged + AddRemoveFacets() + AddRemoveGroupBy() + End Sub + + Private Sub GetParameterValue(clsOperator As ROperator) + Dim i As Integer = 0 + For Each clsTempParam As RParameter In clsOperator.clsParameters + If clsTempParam.strArgumentValue <> "" AndAlso clsTempParam.strArgumentValue <> "." Then + clsGroupByFunction.AddParameter(i, clsTempParam.strArgumentValue, bIncludeArgumentName:=False, iPosition:=i) + i = i + 1 + End If + Next + End Sub + + Private Sub AddRemoveGroupBy() + If clsPipeOperator.ContainsParameter("mutate") Then + clsGroupByFunction.ClearParameters() + If clsBaseOperator.ContainsParameter("facets") Then + Select Case ucrInputStation.GetText() + Case strFacetWrap + GetParameterValue(clsFacetVariablesOperator) + Case strFacetCol + GetParameterValue(clsFacetColOp) + Case strFacetRow + GetParameterValue(clsFacetRowOp) + End Select + End If + + If clsGroupByFunction.iParameterCount > 0 Then + clsPipeOperator.AddParameter("group_by", clsRFunctionParameter:=clsGroupByFunction, iPosition:=1) + Else + clsPipeOperator.RemoveParameterByName("group_by") + End If + Else + clsPipeOperator.RemoveParameterByName("group_by") + End If + + SetPipeAssignTo() + End Sub + + Private Sub SetPipeAssignTo() + If ucrSelectorParallelCoordinatePlot.ucrAvailableDataFrames.cboAvailableDataFrames.Text <> "" AndAlso clsPipeOperator.clsParameters.Count > 1 Then + clsPipeOperator.SetAssignTo(ucrSelectorParallelCoordinatePlot.ucrAvailableDataFrames.cboAvailableDataFrames.Text) + Else + clsPipeOperator.RemoveAssignTo() + End If + End Sub + + Private Sub ucrSelectorParallelCoordinatePlot_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrSelectorParallelCoordinatePlot.ControlValueChanged + AutoFacetStation() + SetPipeAssignTo() + End Sub + Private Sub CoreControls_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrReceiverXVariables.ControlContentsChanged, ucrSaveGraph.ControlContentsChanged, ucrNudTransparency.ControlContentsChanged TestOkEnabled() End Sub diff --git a/instat/dlgRestrict.Designer.vb b/instat/dlgRestrict.Designer.vb index 1555fab3311..3030445e05c 100644 --- a/instat/dlgRestrict.Designer.vb +++ b/instat/dlgRestrict.Designer.vb @@ -39,140 +39,108 @@ Partial Class dlgRestrict Private Sub InitializeComponent() Me.cmdDefineNewFilter = New System.Windows.Forms.Button() - Me.ucrSelectorFilter = New instat.ucrSelectorByDataFrameAddRemove() - Me.ucrBase = New instat.ucrButtons() Me.lblFilter = New System.Windows.Forms.Label() - Me.ucrReceiverFilter = New instat.ucrReceiverSingle() Me.lblFilterPreview = New System.Windows.Forms.Label() - Me.ucrInputFilterPreview = New instat.ucrInputTextBox() Me.grpApplyOptions = New System.Windows.Forms.GroupBox() + Me.rdoSavefilter = New System.Windows.Forms.RadioButton() Me.rdoApplyAsSubset = New System.Windows.Forms.RadioButton() Me.rdoApplyAsFilter = New System.Windows.Forms.RadioButton() - Me.ucrNewDataFrameName = New instat.ucrSave() Me.cmdEditFilter = New System.Windows.Forms.Button() Me.cmdFilterFromFactors = New System.Windows.Forms.Button() + Me.ucrInputFilterPreview = New instat.ucrInputTextBox() + Me.ucrReceiverFilter = New instat.ucrReceiverSingle() + Me.ucrSelectorFilter = New instat.ucrSelectorByDataFrameAddRemove() + Me.ucrBase = New instat.ucrButtons() + Me.ucrNewDataFrameName = New instat.ucrSave() Me.grpApplyOptions.SuspendLayout() Me.SuspendLayout() ' 'cmdDefineNewFilter ' - Me.cmdDefineNewFilter.Location = New System.Drawing.Point(249, 88) + Me.cmdDefineNewFilter.Location = New System.Drawing.Point(311, 110) + Me.cmdDefineNewFilter.Margin = New System.Windows.Forms.Padding(4) Me.cmdDefineNewFilter.Name = "cmdDefineNewFilter" - Me.cmdDefineNewFilter.Size = New System.Drawing.Size(129, 30) + Me.cmdDefineNewFilter.Size = New System.Drawing.Size(161, 38) Me.cmdDefineNewFilter.TabIndex = 3 Me.cmdDefineNewFilter.Tag = "Define_New_Filter" Me.cmdDefineNewFilter.Text = "Define New Filter" Me.cmdDefineNewFilter.UseVisualStyleBackColor = True ' - 'ucrSelectorFilter - ' - Me.ucrSelectorFilter.AutoSize = True - Me.ucrSelectorFilter.bDropUnusedFilterLevels = False - Me.ucrSelectorFilter.bShowHiddenColumns = False - Me.ucrSelectorFilter.bUseCurrentFilter = True - Me.ucrSelectorFilter.Location = New System.Drawing.Point(10, 10) - Me.ucrSelectorFilter.Margin = New System.Windows.Forms.Padding(0) - Me.ucrSelectorFilter.Name = "ucrSelectorFilter" - Me.ucrSelectorFilter.Size = New System.Drawing.Size(213, 183) - Me.ucrSelectorFilter.TabIndex = 0 - ' - 'ucrBase - ' - Me.ucrBase.AutoSize = True - Me.ucrBase.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrBase.Location = New System.Drawing.Point(10, 333) - Me.ucrBase.Name = "ucrBase" - Me.ucrBase.Size = New System.Drawing.Size(405, 52) - Me.ucrBase.TabIndex = 8 - ' 'lblFilter ' Me.lblFilter.AutoSize = True - Me.lblFilter.Location = New System.Drawing.Point(249, 45) + Me.lblFilter.Location = New System.Drawing.Point(311, 56) + Me.lblFilter.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblFilter.Name = "lblFilter" - Me.lblFilter.Size = New System.Drawing.Size(32, 13) + Me.lblFilter.Size = New System.Drawing.Size(70, 16) Me.lblFilter.TabIndex = 1 - Me.lblFilter.Text = "Filter:" - ' - 'ucrReceiverFilter - ' - Me.ucrReceiverFilter.AutoSize = True - Me.ucrReceiverFilter.frmParent = Me - Me.ucrReceiverFilter.Location = New System.Drawing.Point(250, 60) - Me.ucrReceiverFilter.Margin = New System.Windows.Forms.Padding(0) - Me.ucrReceiverFilter.Name = "ucrReceiverFilter" - Me.ucrReceiverFilter.Selector = Nothing - Me.ucrReceiverFilter.Size = New System.Drawing.Size(129, 20) - Me.ucrReceiverFilter.strNcFilePath = "" - Me.ucrReceiverFilter.TabIndex = 2 - Me.ucrReceiverFilter.ucrSelector = Nothing + Me.lblFilter.Text = "Filter rows:" ' 'lblFilterPreview ' - Me.lblFilterPreview.Location = New System.Drawing.Point(10, 285) + Me.lblFilterPreview.Location = New System.Drawing.Point(12, 356) + Me.lblFilterPreview.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblFilterPreview.Name = "lblFilterPreview" - Me.lblFilterPreview.Size = New System.Drawing.Size(118, 22) + Me.lblFilterPreview.Size = New System.Drawing.Size(148, 28) Me.lblFilterPreview.TabIndex = 6 - Me.lblFilterPreview.Text = "Selected Filter Preview:" - ' - 'ucrInputFilterPreview - ' - Me.ucrInputFilterPreview.AddQuotesIfUnrecognised = True - Me.ucrInputFilterPreview.AutoSize = True - Me.ucrInputFilterPreview.IsMultiline = True - Me.ucrInputFilterPreview.IsReadOnly = False - Me.ucrInputFilterPreview.Location = New System.Drawing.Point(129, 284) - Me.ucrInputFilterPreview.Name = "ucrInputFilterPreview" - Me.ucrInputFilterPreview.Size = New System.Drawing.Size(277, 43) - Me.ucrInputFilterPreview.TabIndex = 7 + Me.lblFilterPreview.Text = "Filter Preview:" ' 'grpApplyOptions ' + Me.grpApplyOptions.Controls.Add(Me.rdoSavefilter) Me.grpApplyOptions.Controls.Add(Me.rdoApplyAsSubset) Me.grpApplyOptions.Controls.Add(Me.rdoApplyAsFilter) - Me.grpApplyOptions.Location = New System.Drawing.Point(10, 197) + Me.grpApplyOptions.Location = New System.Drawing.Point(12, 246) + Me.grpApplyOptions.Margin = New System.Windows.Forms.Padding(4) Me.grpApplyOptions.Name = "grpApplyOptions" - Me.grpApplyOptions.Size = New System.Drawing.Size(396, 53) + Me.grpApplyOptions.Padding = New System.Windows.Forms.Padding(4) + Me.grpApplyOptions.Size = New System.Drawing.Size(495, 66) Me.grpApplyOptions.TabIndex = 4 Me.grpApplyOptions.TabStop = False - Me.grpApplyOptions.Text = "Apply Options" + Me.grpApplyOptions.Text = "Apply" + ' + 'rdoSavefilter + ' + Me.rdoSavefilter.AutoSize = True + Me.rdoSavefilter.Location = New System.Drawing.Point(377, 24) + Me.rdoSavefilter.Margin = New System.Windows.Forms.Padding(2) + Me.rdoSavefilter.Name = "rdoSavefilter" + Me.rdoSavefilter.Size = New System.Drawing.Size(92, 20) + Me.rdoSavefilter.TabIndex = 4 + Me.rdoSavefilter.TabStop = True + Me.rdoSavefilter.Text = "Save Filter" + Me.rdoSavefilter.UseVisualStyleBackColor = True ' 'rdoApplyAsSubset ' - Me.rdoApplyAsSubset.Location = New System.Drawing.Point(174, 22) + Me.rdoApplyAsSubset.Location = New System.Drawing.Point(200, 24) + Me.rdoApplyAsSubset.Margin = New System.Windows.Forms.Padding(4) Me.rdoApplyAsSubset.Name = "rdoApplyAsSubset" - Me.rdoApplyAsSubset.Size = New System.Drawing.Size(190, 17) + Me.rdoApplyAsSubset.Size = New System.Drawing.Size(153, 21) Me.rdoApplyAsSubset.TabIndex = 1 Me.rdoApplyAsSubset.TabStop = True - Me.rdoApplyAsSubset.Text = "Apply As Subset" + Me.rdoApplyAsSubset.Text = "As Subset" Me.rdoApplyAsSubset.UseVisualStyleBackColor = True ' 'rdoApplyAsFilter ' - Me.rdoApplyAsFilter.Location = New System.Drawing.Point(6, 22) + Me.rdoApplyAsFilter.Location = New System.Drawing.Point(8, 26) + Me.rdoApplyAsFilter.Margin = New System.Windows.Forms.Padding(4) Me.rdoApplyAsFilter.Name = "rdoApplyAsFilter" - Me.rdoApplyAsFilter.Size = New System.Drawing.Size(154, 17) + Me.rdoApplyAsFilter.Size = New System.Drawing.Size(164, 21) Me.rdoApplyAsFilter.TabIndex = 0 Me.rdoApplyAsFilter.TabStop = True - Me.rdoApplyAsFilter.Text = "Apply As Filter" + Me.rdoApplyAsFilter.Text = "As Filter" Me.rdoApplyAsFilter.UseVisualStyleBackColor = True ' - 'ucrNewDataFrameName - ' - Me.ucrNewDataFrameName.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrNewDataFrameName.Location = New System.Drawing.Point(10, 254) - Me.ucrNewDataFrameName.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) - Me.ucrNewDataFrameName.Name = "ucrNewDataFrameName" - Me.ucrNewDataFrameName.Size = New System.Drawing.Size(368, 24) - Me.ucrNewDataFrameName.TabIndex = 5 - ' 'cmdEditFilter ' Me.cmdEditFilter.Enabled = False Me.cmdEditFilter.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdEditFilter.Location = New System.Drawing.Point(249, 167) + Me.cmdEditFilter.Location = New System.Drawing.Point(311, 209) + Me.cmdEditFilter.Margin = New System.Windows.Forms.Padding(4) Me.cmdEditFilter.Name = "cmdEditFilter" - Me.cmdEditFilter.Size = New System.Drawing.Size(129, 23) + Me.cmdEditFilter.Size = New System.Drawing.Size(161, 29) Me.cmdEditFilter.TabIndex = 9 Me.cmdEditFilter.Tag = "Define_New_Filter" Me.cmdEditFilter.Text = "Edit Filter" @@ -181,20 +149,77 @@ Partial Class dlgRestrict 'cmdFilterFromFactors ' Me.cmdFilterFromFactors.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdFilterFromFactors.Location = New System.Drawing.Point(249, 123) + Me.cmdFilterFromFactors.Location = New System.Drawing.Point(311, 154) + Me.cmdFilterFromFactors.Margin = New System.Windows.Forms.Padding(4) Me.cmdFilterFromFactors.Name = "cmdFilterFromFactors" - Me.cmdFilterFromFactors.Size = New System.Drawing.Size(129, 38) + Me.cmdFilterFromFactors.Size = New System.Drawing.Size(161, 48) Me.cmdFilterFromFactors.TabIndex = 10 Me.cmdFilterFromFactors.Tag = "Define_New_Filter" Me.cmdFilterFromFactors.Text = "Filter From Factors" Me.cmdFilterFromFactors.UseVisualStyleBackColor = True ' + 'ucrInputFilterPreview + ' + Me.ucrInputFilterPreview.AddQuotesIfUnrecognised = True + Me.ucrInputFilterPreview.AutoSize = True + Me.ucrInputFilterPreview.IsMultiline = True + Me.ucrInputFilterPreview.IsReadOnly = False + Me.ucrInputFilterPreview.Location = New System.Drawing.Point(161, 355) + Me.ucrInputFilterPreview.Margin = New System.Windows.Forms.Padding(8) + Me.ucrInputFilterPreview.Name = "ucrInputFilterPreview" + Me.ucrInputFilterPreview.Size = New System.Drawing.Size(346, 54) + Me.ucrInputFilterPreview.TabIndex = 7 + ' + 'ucrReceiverFilter + ' + Me.ucrReceiverFilter.AutoSize = True + Me.ucrReceiverFilter.frmParent = Me + Me.ucrReceiverFilter.Location = New System.Drawing.Point(312, 75) + Me.ucrReceiverFilter.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverFilter.Name = "ucrReceiverFilter" + Me.ucrReceiverFilter.Selector = Nothing + Me.ucrReceiverFilter.Size = New System.Drawing.Size(161, 25) + Me.ucrReceiverFilter.strNcFilePath = "" + Me.ucrReceiverFilter.TabIndex = 2 + Me.ucrReceiverFilter.ucrSelector = Nothing + ' + 'ucrSelectorFilter + ' + Me.ucrSelectorFilter.AutoSize = True + Me.ucrSelectorFilter.bDropUnusedFilterLevels = False + Me.ucrSelectorFilter.bShowHiddenColumns = False + Me.ucrSelectorFilter.bUseCurrentFilter = True + Me.ucrSelectorFilter.Location = New System.Drawing.Point(12, 12) + Me.ucrSelectorFilter.Margin = New System.Windows.Forms.Padding(0) + Me.ucrSelectorFilter.Name = "ucrSelectorFilter" + Me.ucrSelectorFilter.Size = New System.Drawing.Size(267, 229) + Me.ucrSelectorFilter.TabIndex = 0 + ' + 'ucrBase + ' + Me.ucrBase.AutoSize = True + Me.ucrBase.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrBase.Location = New System.Drawing.Point(12, 416) + Me.ucrBase.Margin = New System.Windows.Forms.Padding(5) + Me.ucrBase.Name = "ucrBase" + Me.ucrBase.Size = New System.Drawing.Size(511, 65) + Me.ucrBase.TabIndex = 8 + ' + 'ucrNewDataFrameName + ' + Me.ucrNewDataFrameName.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrNewDataFrameName.Location = New System.Drawing.Point(12, 318) + Me.ucrNewDataFrameName.Margin = New System.Windows.Forms.Padding(5, 6, 5, 6) + Me.ucrNewDataFrameName.Name = "ucrNewDataFrameName" + Me.ucrNewDataFrameName.Size = New System.Drawing.Size(460, 30) + Me.ucrNewDataFrameName.TabIndex = 5 + ' 'dlgRestrict ' - Me.AutoScaleDimensions = New System.Drawing.SizeF(96.0!, 96.0!) + Me.AutoScaleDimensions = New System.Drawing.SizeF(120.0!, 120.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi Me.AutoSize = True - Me.ClientSize = New System.Drawing.Size(418, 388) + Me.ClientSize = New System.Drawing.Size(522, 485) Me.Controls.Add(Me.cmdFilterFromFactors) Me.Controls.Add(Me.cmdEditFilter) Me.Controls.Add(Me.grpApplyOptions) @@ -207,6 +232,7 @@ Partial Class dlgRestrict Me.Controls.Add(Me.ucrBase) Me.Controls.Add(Me.ucrNewDataFrameName) Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow + Me.Margin = New System.Windows.Forms.Padding(4) Me.MaximizeBox = False Me.MinimizeBox = False Me.Name = "dlgRestrict" @@ -214,6 +240,7 @@ Partial Class dlgRestrict Me.Tag = "Filter" Me.Text = "Filter" Me.grpApplyOptions.ResumeLayout(False) + Me.grpApplyOptions.PerformLayout() Me.ResumeLayout(False) Me.PerformLayout() @@ -232,4 +259,5 @@ Partial Class dlgRestrict Friend WithEvents ucrNewDataFrameName As ucrSave Friend WithEvents cmdEditFilter As Button Friend WithEvents cmdFilterFromFactors As Button + Friend WithEvents rdoSavefilter As RadioButton End Class \ No newline at end of file diff --git a/instat/dlgRestrict.vb b/instat/dlgRestrict.vb index d0fd585a123..ecabeb9a0b6 100644 --- a/instat/dlgRestrict.vb +++ b/instat/dlgRestrict.vb @@ -22,6 +22,7 @@ Public Class dlgRestrict Private clsSetCurrentFilter As New RFunction Private clsSubset As New RFunction Private clsFilterView As New RFunction + Private clsCatFunction As New RFunction Public bIsSubsetDialog As Boolean Public strDefaultDataframe As String = "" Public strDefaultColumn As String = "" @@ -37,8 +38,10 @@ Public Class dlgRestrict clsRemoveFilter = New RFunction clsSetCurrentFilter = New RFunction clsFilterView = New RFunction + clsCatFunction = New RFunction bFirstLoad = True + clsCatFunction.SetRCommand("cat") clsRemoveFilter.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$remove_current_filter") clsSetCurrentFilter.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$set_current_filter") clsSubset.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$copy_data_object") @@ -84,7 +87,7 @@ Public Class dlgRestrict End Sub Private Sub TestOkEnabled() - If Not ucrReceiverFilter.IsEmpty AndAlso ((rdoApplyAsSubset.Checked AndAlso ucrNewDataFrameName.IsComplete) OrElse (rdoApplyAsFilter.Checked)) Then + If Not ucrReceiverFilter.IsEmpty AndAlso ((rdoApplyAsSubset.Checked AndAlso ucrNewDataFrameName.IsComplete) OrElse (rdoApplyAsFilter.Checked) OrElse (rdoSavefilter.Checked)) Then ucrBase.OKEnabled(True) Else ucrBase.OKEnabled(False) @@ -171,8 +174,8 @@ Public Class dlgRestrict TestOkEnabled() End Sub - Private Sub rdoApplyAs_CheckedChanged(sender As Object, e As EventArgs) Handles rdoApplyAsFilter.CheckedChanged, rdoApplyAsSubset.CheckedChanged - ucrNewDataFrameName.Visible = Not rdoApplyAsFilter.Checked + Private Sub rdoApplyAs_CheckedChanged(sender As Object, e As EventArgs) Handles rdoApplyAsFilter.CheckedChanged, rdoApplyAsSubset.CheckedChanged, rdoSavefilter.CheckedChanged + ucrNewDataFrameName.Visible = Not (rdoApplyAsFilter.Checked OrElse rdoSavefilter.Checked) SetFilterOptions() SetBaseFunction() TestOkEnabled() @@ -183,9 +186,12 @@ Public Class dlgRestrict ucrBase.clsRsyntax.SetBaseRFunction(If(ucrReceiverFilter.IsEmpty, clsRemoveFilter, clsSetCurrentFilter)) ucrBase.clsRsyntax.RemoveAssignTo() - Else + ElseIf rdoApplyAsSubset.Checked Then ucrBase.clsRsyntax.SetBaseRFunction(clsSubset) clsSubset.AddParameter("new_name", Chr(34) & ucrNewDataFrameName.GetText() & Chr(34), iPosition:=1) + Else + clsCatFunction.AddParameter("dispay", Chr(34) & "Saved column selection" & Chr(34), bIncludeArgumentName:=False) + ucrBase.clsRsyntax.SetBaseRFunction(clsCatFunction) End If End Sub diff --git a/instat/dlgScatterPlot.Designer.vb b/instat/dlgScatterPlot.Designer.vb index a722c9958a4..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,8 +87,11 @@ Partial Class dlgScatterPlot Me.ucrFactorOptionalReceiver = New instat.ucrReceiverSingle() Me.ucrReceiverX = New instat.ucrReceiverSingle() Me.ucrBase = New instat.ucrButtons() + Me.ucrChkAddSidePlot = New instat.ucrCheck() + Me.grpAdd = New System.Windows.Forms.GroupBox() Me.contextMenuStripOptions.SuspendLayout() Me.grpGeom.SuspendLayout() + Me.grpAdd.SuspendLayout() Me.SuspendLayout() ' 'lblFactorOptional @@ -101,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 @@ -121,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 @@ -131,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 @@ -203,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 @@ -270,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 @@ -295,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 @@ -317,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" @@ -336,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" @@ -358,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 @@ -396,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 @@ -406,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" @@ -418,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 @@ -440,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 @@ -449,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 @@ -457,7 +520,7 @@ Partial Class dlgScatterPlot 'ucrSaveScatterPlot ' Me.ucrSaveScatterPlot.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrSaveScatterPlot.Location = New System.Drawing.Point(10, 428) + 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) @@ -492,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 @@ -505,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 @@ -518,28 +581,53 @@ Partial Class dlgScatterPlot ' Me.ucrBase.AutoSize = True Me.ucrBase.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrBase.Location = New System.Drawing.Point(10, 459) + 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 ' + '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(483, 521) + 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) + Me.Controls.Add(Me.ucrInputLegendPosition) + 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) @@ -557,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() @@ -605,4 +695,11 @@ Partial Class dlgScatterPlot Friend WithEvents lblPosition As Label Friend WithEvents ucrInputLegend As ucrInputComboBox Friend WithEvents lblLegend As Label + Friend WithEvents ucrInputStation As ucrInputComboBox + Friend WithEvents ucr1stFactorReceiver As ucrReceiverSingle + 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 24238bce012..ed138c90efe 100644 --- a/instat/dlgScatterPlot.vb +++ b/instat/dlgScatterPlot.vb @@ -20,6 +20,8 @@ Public Class dlgScatterPlot Private clsRScatterGeomFunction, clsLabelFunction As New RFunction Private clsRaesFunction As New RFunction Private clsLocalRaesFunction As New RFunction + Private clsGroupAesFuction As New RFunction + Private clsGroupAesVarFuction As New RFunction Private clsBaseOperator As New ROperator Private bFirstLoad As Boolean = True Private bReset As Boolean = True @@ -44,6 +46,21 @@ Public Class dlgScatterPlot Private clsGeomRugFunction As New RFunction Private clsGeomJitterFunction As New RFunction Private clsCountGeomFunction, clsDummyFunction As New RFunction + + Private clsFacetFunction As New RFunction + Private clsFacetVariablesOperator As New ROperator + Private clsFacetRowOp As New ROperator + Private clsFacetColOp As New ROperator + Private clsPipeOperator As New ROperator + Private clsGroupByFunction As New RFunction + + Private ReadOnly strNone As String = "None" + Private ReadOnly strFacetWrap As String = "Facet Wrap" + Private ReadOnly strFacetRow As String = "Facet Row" + Private ReadOnly strFacetCol As String = "Facet Column" + + Private bUpdateComboOptions As Boolean = True + Private bUpdatingParameters As Boolean = False 'Parameter names for geoms Private strFirstParameterName As String = "geomfunc" Private strGeomSmoothParameterName As String = "geom_smooth" @@ -71,6 +88,7 @@ Public Class dlgScatterPlot Dim dctSidesOptions As New Dictionary(Of String, String) Dim dctShapePoint As New Dictionary(Of String, String) Dim dctPositioncount As New Dictionary(Of String, String) + Dim dctLegendPosition As New Dictionary(Of String, String) ucrBase.iHelpTopicID = 433 ucrBase.clsRsyntax.bExcludeAssignedFunctionOutput = False @@ -108,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) @@ -118,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) @@ -224,6 +245,33 @@ Public Class dlgScatterPlot ucrInputSides.SetRDefault(Chr(34) & "bl" & Chr(34)) ucrInputSides.SetDropDownStyleAsNonEditable() + 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) + + ucr1stFactorReceiver.SetParameter(New RParameter("var1")) + ucr1stFactorReceiver.Selector = ucrSelectorForScatter + ucr1stFactorReceiver.SetIncludedDataTypes({"factor"}) + ucr1stFactorReceiver.strSelectorHeading = "Factors" + ucr1stFactorReceiver.bWithQuotes = False + ucr1stFactorReceiver.SetParameterIsString() + ucr1stFactorReceiver.SetValuesToIgnore({"."}) + ucr1stFactorReceiver.SetParameterPosition(1) + ucr1stFactorReceiver.SetLinkedDisplayControl(lblFacetBy) + + ucrInputStation.SetItems({strFacetWrap, strFacetRow, strFacetCol, strNone}) + ucrInputStation.SetDropDownStyleAsNonEditable() + + ucrNudSize.SetLinkedDisplayControl(lblSize) ucrNudWidth.SetLinkedDisplayControl(lblWidth) ucrNudHeigth.SetLinkedDisplayControl(lblHeith) @@ -245,6 +293,18 @@ Public Class dlgScatterPlot clsGeomJitterFunction = New RFunction clsCountGeomFunction = New RFunction clsDummyFunction = New RFunction + clsFacetFunction = New RFunction + clsFacetVariablesOperator = New ROperator + clsFacetRowOp = New ROperator + clsFacetColOp = New ROperator + clsPipeOperator = New ROperator + clsGroupByFunction = New RFunction + clsGroupAesFuction = New RFunction + clsGroupAesVarFuction = New RFunction + + + ucrInputStation.SetName(strFacetWrap) + ucrInputStation.bUpdateRCodeFromControl = True ucrSelectorForScatter.Reset() ucrSelectorForScatter.SetGgplotFunction(clsBaseOperator) @@ -284,6 +344,12 @@ Public Class dlgScatterPlot clsLabelFunction.SetPackageName("ggrepel") clsLabelFunction.SetRCommand("geom_text_repel") + clsGroupAesFuction.SetPackageName("ggplot2") + clsGroupAesFuction.SetRCommand("aes") + + clsGroupAesVarFuction.SetPackageName("ggplot2") + clsGroupAesVarFuction.SetRCommand("aes") + clsGeomRugFunction.SetPackageName("ggplot2") clsGeomRugFunction.SetRCommand("geom_rug") clsGeomRugFunction.AddParameter("size", 0.5, iPosition:=0) @@ -293,6 +359,22 @@ Public Class dlgScatterPlot clsGeomJitterFunction.AddParameter("width", 0.4, iPosition:=0) clsGeomJitterFunction.AddParameter("height", 0.4, iPosition:=1) + clsFacetFunction.SetPackageName("ggplot2") + clsFacetRowOp.SetOperation("+") + clsFacetRowOp.bBrackets = False + clsFacetColOp.SetOperation("+") + clsFacetColOp.bBrackets = False + clsFacetVariablesOperator.SetOperation("~") + clsFacetVariablesOperator.bForceIncludeOperation = True + clsFacetVariablesOperator.bBrackets = False + clsFacetFunction.AddParameter("facets", clsROperatorParameter:=clsFacetVariablesOperator, iPosition:=0) + + clsPipeOperator.SetOperation("%>%") + SetPipeAssignTo() + + clsGroupByFunction.SetPackageName("dplyr") + clsGroupByFunction.SetRCommand("group_by") + clsBaseOperator.AddParameter(GgplotDefaults.clsDefaultThemeParameter.Clone()) clsXlabsFunction = GgplotDefaults.clsXlabTitleFunction.Clone() clsYlabsFunction = GgplotDefaults.clsYlabTitleFunction.Clone() @@ -343,6 +425,8 @@ Public Class dlgScatterPlot ucrNudPointsize.SetRCode(clsRScatterGeomFunction, bReset) ucrInputLegend.SetRCode(clsCountGeomFunction, bReset) ucrInputPosition.SetRCode(clsCountGeomFunction, bReset) + ucrChkLegend.SetRCode(clsThemeFunction, bReset, bCloneIfNeeded:=True) + ucrInputLegendPosition.SetRCode(clsThemeFunction, bReset, bCloneIfNeeded:=True) If bReset Then ucrPnlGeoms.SetRCode(clsDummyFunction, bReset) End If @@ -381,12 +465,24 @@ Public Class dlgScatterPlot toolStripMenuItemRugOptions.Enabled = ucrChkAddRugPlot.Checked 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 + Private Sub cmdOptions_Click(sender As Object, e As EventArgs) Handles cmdOptions.Click, toolStripMenuItemPlotOptions.Click sdgPlots.SetRCode(clsNewOperator:=ucrBase.clsRsyntax.clsBaseOperator, clsNewGlobalAesFunction:=clsRaesFunction, clsNewYScalecontinuousFunction:=clsYScalecontinuousFunction, clsNewXScalecontinuousFunction:=clsXScalecontinuousFunction, clsNewLabsFunction:=clsLabsFunction, clsNewXLabsTitleFunction:=clsXlabsFunction, clsNewYLabTitleFunction:=clsYlabsFunction, clsNewFacetFunction:=clsFacetsFunction, clsNewCoordPolarFunction:=clsCoordPolarFunction, clsNewCoordPolarStartOperator:=clsCoordPolarStartOperator, - clsNewThemeFunction:=clsThemeFunction, clsNewScaleFillViridisFunction:=clsScaleFillViridisFunction, + clsNewThemeFunction:=clsThemeFunction, clsNewScaleFillViridisFunction:=clsScaleFillViridisFunction, clsNewFacetVariablesOperator:=clsFacetVariablesOperator, clsNewScaleColourViridisFunction:=clsScaleColourViridisFunction, clsNewXScaleDateFunction:=clsXScaleDateFunction, clsNewYScaleDateFunction:=clsYScaleDateFunction, dctNewThemeFunctions:=dctThemeFunctions, ucrNewBaseSelector:=ucrSelectorForScatter, strMainDialogGeomParameterNames:=strGeomParameterNames, clsNewAnnotateFunction:=clsAnnotateFunction, bReset:=bResetSubdialog) @@ -498,4 +594,195 @@ Public Class dlgScatterPlot clsCountGeomFunction.AddParameter("position", Chr(34) & ucrInputPosition.GetText & Chr(34), iPosition:=0) End If End Sub + + Private Sub AutoFacetStation() + Dim currentReceiver As ucrReceiver = ucrSelectorForScatter.CurrentReceiver + + If currentReceiver IsNot Nothing Then + ucr1stFactorReceiver.AddItemsWithMetadataProperty(ucrSelectorForScatter.ucrAvailableDataFrames.cboAvailableDataFrames.Text, "Climatic_Type", {"station_label"}) + currentReceiver.SetMeAsReceiver() + AddRemoveGroupBy() + End If + End Sub + + Private Sub ucrInput_ControlValueChanged(ucrChangedControl As ucrInputComboBox) Handles ucrInputStation.ControlValueChanged + If Not bUpdateComboOptions Then + Exit Sub + End If + Dim strChangedText As String = ucrChangedControl.GetText() + If strChangedText <> strNone Then + If Not strChangedText = strFacetCol AndAlso Not strChangedText = strFacetRow AndAlso + Not ucrInputStation.Equals(ucrChangedControl) AndAlso ucrInputStation.GetText() = strChangedText Then + bUpdateComboOptions = False + ucrInputStation.SetName(strNone) + bUpdateComboOptions = True + End If + If (strChangedText = strFacetWrap AndAlso ucrInputStation.GetText = strFacetRow) OrElse (strChangedText = strFacetRow AndAlso + ucrInputStation.GetText = strFacetWrap) OrElse (strChangedText = strFacetWrap AndAlso + ucrInputStation.GetText = strFacetCol) OrElse (strChangedText = strFacetCol AndAlso ucrInputStation.GetText = strFacetWrap) Then + ucrInputStation.SetName(strNone) + End If + End If + UpdateParameters() + AddRemoveFacets() + AddRemoveGroupBy() + End Sub + + Private Sub UpdateParameters() + clsFacetVariablesOperator.RemoveParameterByName("var1") + clsFacetColOp.RemoveParameterByName("col" & ucrInputStation.Name) + clsFacetRowOp.RemoveParameterByName("row" & ucrInputStation.Name) + + clsBaseOperator.RemoveParameterByName("facets") + bUpdatingParameters = True + ucr1stFactorReceiver.SetRCode(Nothing) + Select Case ucrInputStation.GetText() + Case strFacetWrap + ucr1stFactorReceiver.ChangeParameterName("var1") + ucr1stFactorReceiver.SetRCode(clsFacetVariablesOperator) + Case strFacetCol + ucr1stFactorReceiver.ChangeParameterName("col" & ucrInputStation.Name) + ucr1stFactorReceiver.SetRCode(clsFacetColOp) + Case strFacetRow + ucr1stFactorReceiver.ChangeParameterName("row" & ucrInputStation.Name) + ucr1stFactorReceiver.SetRCode(clsFacetRowOp) + End Select + If Not clsRaesFunction.ContainsParameter("x") Then + clsRaesFunction.AddParameter("x", Chr(34) & Chr(34)) + End If + bUpdatingParameters = False + End Sub + + Private Sub AddRemoveFacets() + Dim bWrap As Boolean = False + Dim bCol As Boolean = False + Dim bRow As Boolean = False + + If bUpdatingParameters Then + Exit Sub + End If + + clsBaseOperator.RemoveParameterByName("facets") + If Not ucr1stFactorReceiver.IsEmpty Then + Select Case ucrInputStation.GetText() + Case strFacetWrap + bWrap = True + Case strFacetCol + bCol = True + Case strFacetRow + bRow = True + End Select + End If + + If bWrap OrElse bRow OrElse bCol Then + clsBaseOperator.AddParameter("facets", clsRFunctionParameter:=clsFacetFunction) + End If + If bWrap Then + clsFacetFunction.SetRCommand("facet_wrap") + End If + If bRow OrElse bCol Then + clsFacetFunction.SetRCommand("facet_grid") + End If + If bRow Then + clsFacetVariablesOperator.AddParameter("left", clsROperatorParameter:=clsFacetRowOp, iPosition:=0) + ElseIf bCol AndAlso bWrap = False Then + clsFacetVariablesOperator.AddParameter("left", ".", iPosition:=0) + Else + clsFacetVariablesOperator.RemoveParameterByName("left") + End If + If bCol Then + clsFacetVariablesOperator.AddParameter("right", clsROperatorParameter:=clsFacetColOp, iPosition:=1) + ElseIf bRow AndAlso bWrap = False Then + clsFacetVariablesOperator.AddParameter("right", ".", iPosition:=1) + Else + clsFacetVariablesOperator.RemoveParameterByName("right") + End If + End Sub + + Private Sub ucr1stFactorReceiver_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucr1stFactorReceiver.ControlValueChanged, ucrReceiverX.ControlValueChanged + AddRemoveFacets() + AddRemoveGroupBy() + AddRemoveGroupAesVar() + End Sub + + Private Sub GetParameterValue(clsOperator As ROperator) + Dim i As Integer = 0 + For Each clsTempParam As RParameter In clsOperator.clsParameters + If clsTempParam.strArgumentValue <> "" AndAlso clsTempParam.strArgumentValue <> "." Then + clsGroupByFunction.AddParameter(i, clsTempParam.strArgumentValue, bIncludeArgumentName:=False, iPosition:=i) + i = i + 1 + End If + Next + End Sub + + Private Sub AddRemoveGroupBy() + If clsPipeOperator.ContainsParameter("mutate") Then + clsGroupByFunction.ClearParameters() + If clsBaseOperator.ContainsParameter("facets") Then + Select Case ucrInputStation.GetText() + Case strFacetWrap + GetParameterValue(clsFacetVariablesOperator) + Case strFacetCol + GetParameterValue(clsFacetColOp) + Case strFacetRow + GetParameterValue(clsFacetRowOp) + End Select + End If + + If clsGroupByFunction.iParameterCount > 0 Then + clsPipeOperator.AddParameter("group_by", clsRFunctionParameter:=clsGroupByFunction, iPosition:=1) + Else + clsPipeOperator.RemoveParameterByName("group_by") + End If + Else + clsPipeOperator.RemoveParameterByName("group_by") + End If + + SetPipeAssignTo() + End Sub + + Private Sub SetPipeAssignTo() + If ucrSelectorForScatter.ucrAvailableDataFrames.cboAvailableDataFrames.Text <> "" AndAlso clsPipeOperator.clsParameters.Count > 1 Then + clsPipeOperator.SetAssignTo(ucrSelectorForScatter.ucrAvailableDataFrames.cboAvailableDataFrames.Text) + Else + clsPipeOperator.RemoveAssignTo() + End If + End Sub + + Private Sub ucrSelectorForScatter_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrSelectorForScatter.ControlValueChanged + AutoFacetStation() + SetPipeAssignTo() + End Sub + + Private Sub AddRemoveGroupAesVar() + clsGroupAesFuction.RemoveParameterByName("group") + clsGroupAesVarFuction.RemoveParameterByName("group") + clsGeomSmoothFunction.RemoveParameterByName("group_aes") + clsGeomSmoothFunction.RemoveParameterByName("group_aes1") + If Not ucrReceiverX.IsEmpty AndAlso ucrReceiverX.strCurrDataType = "factor" OrElse ucrReceiverX.strCurrDataType = "ordered,factor" Then + If Not ucrFactorOptionalReceiver.IsEmpty AndAlso ucrFactorOptionalReceiver.strCurrDataType = "factor" OrElse ucrFactorOptionalReceiver.strCurrDataType = "ordered,factor" Then + ' Add group parameter with variable names + clsGroupAesFuction.AddParameter("group", ucrFactorOptionalReceiver.GetVariableNames(False), iPosition:=0) + clsGeomSmoothFunction.AddParameter("group_aes1", clsRFunctionParameter:=clsGroupAesFuction, bIncludeArgumentName:=False) + clsGroupAesVarFuction.RemoveParameterByName("group") + clsGeomSmoothFunction.RemoveParameterByName("group_aes") + Else + ' Add group parameter without variable names + clsGroupAesVarFuction.AddParameter("group", 1, iPosition:=0) + clsGeomSmoothFunction.AddParameter("group_aes", clsRFunctionParameter:=clsGroupAesVarFuction, bIncludeArgumentName:=False) + clsGroupAesFuction.RemoveParameterByName("group") + clsGeomSmoothFunction.RemoveParameterByName("group_aes1") + End If + Else + ' Remove group parameters + clsGroupAesFuction.RemoveParameterByName("group") + clsGroupAesVarFuction.RemoveParameterByName("group") + clsGeomSmoothFunction.RemoveParameterByName("group_aes") + clsGeomSmoothFunction.RemoveParameterByName("group_aes1") + End If + End Sub + + Private Sub ucrFactorOptionalReceiver_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrFactorOptionalReceiver.ControlValueChanged + AddRemoveGroupAesVar() + End Sub End Class diff --git a/instat/dlgScript.Designer.vb b/instat/dlgScript.Designer.vb index 87f9545cc1c..ba37efac17a 100644 --- a/instat/dlgScript.Designer.vb +++ b/instat/dlgScript.Designer.vb @@ -24,49 +24,70 @@ Partial Class dlgScript Private Sub InitializeComponent() Me.tbFeatures = New System.Windows.Forms.TabControl() Me.tbPageSaveData = New System.Windows.Forms.TabPage() - Me.ucrChkSaveDataFrameSingle = New instat.ucrCheck() - Me.lblSaveDataFrame = New System.Windows.Forms.Label() - Me.ucrInputSaveDataFrame = New instat.ucrInputTextBox() + Me.rdoFromRFile = New System.Windows.Forms.RadioButton() + Me.rdoDataFrame = New System.Windows.Forms.RadioButton() Me.lblSaveObjectFormat = New System.Windows.Forms.Label() - Me.ucrCboSaveOutputObjectFormat = New instat.ucrInputComboBox() Me.lblSaveObjectType = New System.Windows.Forms.Label() - Me.ucrCboSaveOutputObjectType = New instat.ucrInputComboBox() Me.rdoSaveOutputObject = New System.Windows.Forms.RadioButton() Me.rdoSaveDataFrame = New System.Windows.Forms.RadioButton() Me.rdoSaveColumn = New System.Windows.Forms.RadioButton() - Me.ucrSaveObject = New instat.ucrSave() - Me.ucrDataFrameSaveOutputSelect = New instat.ucrDataFrame() - Me.ucrPnlSaveData = New instat.UcrPanel() Me.tbPageGetData = New System.Windows.Forms.TabPage() - Me.ucrReceiverGetOutputObject = New instat.ucrReceiverSingle() - Me.ucrReceiverGetColumns = New instat.ucrReceiverMultiple() Me.lblGetColumn = New System.Windows.Forms.Label() Me.lblGetObjectType = New System.Windows.Forms.Label() Me.rdoGetOutputObject = New System.Windows.Forms.RadioButton() Me.lblGetOutputObject = New System.Windows.Forms.Label() Me.rdoGetDataFrame = New System.Windows.Forms.RadioButton() Me.rdoGetColumn = New System.Windows.Forms.RadioButton() - Me.ucrDataFrameGetDF = New instat.ucrDataFrame() - Me.ucrCboGetOutputObjectType = New instat.ucrInputComboBox() - Me.ucrPnlGetData = New instat.UcrPanel() - Me.ucrSelectorGetObject = New instat.ucrSelectorByDataFrameAddRemove() Me.tbPageCommand = New System.Windows.Forms.TabPage() - Me.ucrInputRemoveObjects = New instat.ucrInputTextBox() + Me.rdoWindow = New System.Windows.Forms.RadioButton() + Me.rdoListData = New System.Windows.Forms.RadioButton() + Me.rdoViewData = New System.Windows.Forms.RadioButton() + Me.lblGraphCommand = New System.Windows.Forms.Label() + Me.lblGraphObject = New System.Windows.Forms.Label() + Me.rdoChooseFile = New System.Windows.Forms.RadioButton() + Me.rdoGgplotify = New System.Windows.Forms.RadioButton() Me.rdoCommandPackage = New System.Windows.Forms.RadioButton() Me.rdoCommandObject = New System.Windows.Forms.RadioButton() - Me.ucrCboCommandPackage = New instat.ucrInputComboBox() - Me.ucrPnlCommands = New instat.UcrPanel() Me.tbPageExamples = New System.Windows.Forms.TabPage() + Me.cmdHelp = New System.Windows.Forms.Button() Me.rdoExampleData = New System.Windows.Forms.RadioButton() Me.rdoExampleFunction = New System.Windows.Forms.RadioButton() - Me.ucrPnlExample = New instat.UcrPanel() Me.lstExampleCollection = New System.Windows.Forms.ListView() Me.clmDatasets = CType(New System.Windows.Forms.ColumnHeader(), System.Windows.Forms.ColumnHeader) Me.clmDesc = CType(New System.Windows.Forms.ColumnHeader(), System.Windows.Forms.ColumnHeader) Me.Label3 = New System.Windows.Forms.Label() - Me.ucrCboExamplePackages = New instat.ucrInputComboBox() Me.lblPreview = New System.Windows.Forms.Label() Me.txtScript = New System.Windows.Forms.TextBox() + Me.ucrInputSaveRFile = New instat.ucrInputTextBox() + Me.ucrChkDisplayGraph = New instat.ucrCheck() + Me.ucrChkSaveDataFrameSingle = New instat.ucrCheck() + Me.ucrInputSaveDataFrame = New instat.ucrInputTextBox() + Me.ucrCboSaveOutputObjectFormat = New instat.ucrInputComboBox() + Me.ucrCboSaveOutputObjectType = New instat.ucrInputComboBox() + Me.ucrSaveObject = New instat.ucrSave() + Me.ucrDataFrameSaveOutputSelect = New instat.ucrDataFrame() + Me.ucrPnlSaveData = New instat.UcrPanel() + Me.ucrPnlSaveDataFrame = New instat.UcrPanel() + Me.ucrReceiverGetOutputObject = New instat.ucrReceiverSingle() + Me.ucrReceiverGetColumns = New instat.ucrReceiverMultiple() + Me.ucrDataFrameGetDF = New instat.ucrDataFrame() + Me.ucrCboGetOutputObjectType = New instat.ucrInputComboBox() + Me.ucrPnlGetData = New instat.UcrPanel() + Me.ucrSelectorGetObject = New instat.ucrSelectorByDataFrameAddRemove() + Me.ucrChkWindow = New instat.ucrCheck() + Me.ucrChkInto = New instat.ucrCheck() + Me.ucrInputSaveData = New instat.ucrInputTextBox() + Me.ucrCboCommandDataPackage = New instat.ucrInputComboBox() + Me.ucrInputViewData = New instat.ucrInputTextBox() + Me.ucrInputGraphCommand = New instat.ucrInputTextBox() + Me.ucrChkOpenRFile = New instat.ucrCheck() + Me.ucrInputChooseFile = New instat.ucrInputTextBox() + Me.ucrInputGgplotify = New instat.ucrInputTextBox() + Me.ucrInputRemoveObjects = New instat.ucrInputTextBox() + Me.ucrCboCommandPackage = New instat.ucrInputComboBox() + Me.ucrPnlCommands = New instat.UcrPanel() + Me.ucrPnlExample = New instat.UcrPanel() + Me.ucrCboExamplePackages = New instat.ucrInputComboBox() Me.ucrBase = New instat.ucrButtons() Me.tbFeatures.SuspendLayout() Me.tbPageSaveData.SuspendLayout() @@ -89,8 +110,11 @@ Partial Class dlgScript ' 'tbPageSaveData ' + Me.tbPageSaveData.Controls.Add(Me.ucrInputSaveRFile) + Me.tbPageSaveData.Controls.Add(Me.rdoFromRFile) + Me.tbPageSaveData.Controls.Add(Me.rdoDataFrame) + Me.tbPageSaveData.Controls.Add(Me.ucrChkDisplayGraph) Me.tbPageSaveData.Controls.Add(Me.ucrChkSaveDataFrameSingle) - Me.tbPageSaveData.Controls.Add(Me.lblSaveDataFrame) Me.tbPageSaveData.Controls.Add(Me.ucrInputSaveDataFrame) Me.tbPageSaveData.Controls.Add(Me.lblSaveObjectFormat) Me.tbPageSaveData.Controls.Add(Me.ucrCboSaveOutputObjectFormat) @@ -102,6 +126,7 @@ Partial Class dlgScript Me.tbPageSaveData.Controls.Add(Me.ucrSaveObject) Me.tbPageSaveData.Controls.Add(Me.ucrDataFrameSaveOutputSelect) Me.tbPageSaveData.Controls.Add(Me.ucrPnlSaveData) + Me.tbPageSaveData.Controls.Add(Me.ucrPnlSaveDataFrame) Me.tbPageSaveData.Location = New System.Drawing.Point(4, 22) Me.tbPageSaveData.Name = "tbPageSaveData" Me.tbPageSaveData.Size = New System.Drawing.Size(438, 245) @@ -109,35 +134,29 @@ Partial Class dlgScript Me.tbPageSaveData.Text = "Save Data" Me.tbPageSaveData.UseVisualStyleBackColor = True ' - 'ucrChkSaveDataFrameSingle - ' - Me.ucrChkSaveDataFrameSingle.AutoSize = True - Me.ucrChkSaveDataFrameSingle.Checked = False - Me.ucrChkSaveDataFrameSingle.Location = New System.Drawing.Point(91, 101) - Me.ucrChkSaveDataFrameSingle.Name = "ucrChkSaveDataFrameSingle" - Me.ucrChkSaveDataFrameSingle.Size = New System.Drawing.Size(146, 23) - Me.ucrChkSaveDataFrameSingle.TabIndex = 59 - ' - 'lblSaveDataFrame - ' - Me.lblSaveDataFrame.AutoSize = True - Me.lblSaveDataFrame.Location = New System.Drawing.Point(89, 52) - Me.lblSaveDataFrame.Name = "lblSaveDataFrame" - Me.lblSaveDataFrame.Size = New System.Drawing.Size(65, 13) - Me.lblSaveDataFrame.TabIndex = 58 - Me.lblSaveDataFrame.Text = "Data Frame:" - ' - 'ucrInputSaveDataFrame - ' - Me.ucrInputSaveDataFrame.AddQuotesIfUnrecognised = True - Me.ucrInputSaveDataFrame.AutoSize = True - Me.ucrInputSaveDataFrame.IsMultiline = False - Me.ucrInputSaveDataFrame.IsReadOnly = False - Me.ucrInputSaveDataFrame.Location = New System.Drawing.Point(92, 70) - Me.ucrInputSaveDataFrame.Margin = New System.Windows.Forms.Padding(9) - Me.ucrInputSaveDataFrame.Name = "ucrInputSaveDataFrame" - Me.ucrInputSaveDataFrame.Size = New System.Drawing.Size(145, 21) - Me.ucrInputSaveDataFrame.TabIndex = 57 + 'rdoFromRFile + ' + Me.rdoFromRFile.AutoSize = True + Me.rdoFromRFile.Location = New System.Drawing.Point(83, 125) + Me.rdoFromRFile.Margin = New System.Windows.Forms.Padding(2) + Me.rdoFromRFile.Name = "rdoFromRFile" + Me.rdoFromRFile.Size = New System.Drawing.Size(81, 17) + Me.rdoFromRFile.TabIndex = 63 + Me.rdoFromRFile.TabStop = True + Me.rdoFromRFile.Text = "From R File:" + Me.rdoFromRFile.UseVisualStyleBackColor = True + ' + 'rdoDataFrame + ' + Me.rdoDataFrame.AutoSize = True + Me.rdoDataFrame.Location = New System.Drawing.Point(83, 48) + Me.rdoDataFrame.Margin = New System.Windows.Forms.Padding(2) + Me.rdoDataFrame.Name = "rdoDataFrame" + Me.rdoDataFrame.Size = New System.Drawing.Size(109, 17) + Me.rdoDataFrame.TabIndex = 62 + Me.rdoDataFrame.TabStop = True + Me.rdoDataFrame.Text = "From Data Frame:" + Me.rdoDataFrame.UseVisualStyleBackColor = True ' 'lblSaveObjectFormat ' @@ -148,18 +167,6 @@ Partial Class dlgScript Me.lblSaveObjectFormat.TabIndex = 56 Me.lblSaveObjectFormat.Text = "Format:" ' - 'ucrCboSaveOutputObjectFormat - ' - Me.ucrCboSaveOutputObjectFormat.AddQuotesIfUnrecognised = True - Me.ucrCboSaveOutputObjectFormat.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrCboSaveOutputObjectFormat.GetSetSelectedIndex = -1 - Me.ucrCboSaveOutputObjectFormat.IsReadOnly = False - Me.ucrCboSaveOutputObjectFormat.Location = New System.Drawing.Point(88, 160) - Me.ucrCboSaveOutputObjectFormat.Margin = New System.Windows.Forms.Padding(9) - Me.ucrCboSaveOutputObjectFormat.Name = "ucrCboSaveOutputObjectFormat" - Me.ucrCboSaveOutputObjectFormat.Size = New System.Drawing.Size(141, 21) - Me.ucrCboSaveOutputObjectFormat.TabIndex = 55 - ' 'lblSaveObjectType ' Me.lblSaveObjectType.AutoSize = True @@ -169,18 +176,6 @@ Partial Class dlgScript Me.lblSaveObjectType.TabIndex = 54 Me.lblSaveObjectType.Text = "Type:" ' - 'ucrCboSaveOutputObjectType - ' - Me.ucrCboSaveOutputObjectType.AddQuotesIfUnrecognised = True - Me.ucrCboSaveOutputObjectType.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrCboSaveOutputObjectType.GetSetSelectedIndex = -1 - Me.ucrCboSaveOutputObjectType.IsReadOnly = False - Me.ucrCboSaveOutputObjectType.Location = New System.Drawing.Point(87, 116) - Me.ucrCboSaveOutputObjectType.Margin = New System.Windows.Forms.Padding(9) - Me.ucrCboSaveOutputObjectType.Name = "ucrCboSaveOutputObjectType" - Me.ucrCboSaveOutputObjectType.Size = New System.Drawing.Size(144, 21) - Me.ucrCboSaveOutputObjectType.TabIndex = 53 - ' 'rdoSaveOutputObject ' Me.rdoSaveOutputObject.Appearance = System.Windows.Forms.Appearance.Button @@ -232,35 +227,6 @@ Partial Class dlgScript Me.rdoSaveColumn.TextAlign = System.Drawing.ContentAlignment.MiddleCenter Me.rdoSaveColumn.UseVisualStyleBackColor = True ' - 'ucrSaveObject - ' - Me.ucrSaveObject.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrSaveObject.Location = New System.Drawing.Point(88, 193) - Me.ucrSaveObject.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) - Me.ucrSaveObject.Name = "ucrSaveObject" - Me.ucrSaveObject.Size = New System.Drawing.Size(258, 22) - Me.ucrSaveObject.TabIndex = 35 - ' - 'ucrDataFrameSaveOutputSelect - ' - Me.ucrDataFrameSaveOutputSelect.AutoSize = True - Me.ucrDataFrameSaveOutputSelect.bDropUnusedFilterLevels = False - Me.ucrDataFrameSaveOutputSelect.bUseCurrentFilter = True - Me.ucrDataFrameSaveOutputSelect.Location = New System.Drawing.Point(86, 54) - Me.ucrDataFrameSaveOutputSelect.Margin = New System.Windows.Forms.Padding(0) - Me.ucrDataFrameSaveOutputSelect.Name = "ucrDataFrameSaveOutputSelect" - Me.ucrDataFrameSaveOutputSelect.Size = New System.Drawing.Size(224, 59) - Me.ucrDataFrameSaveOutputSelect.TabIndex = 29 - ' - 'ucrPnlSaveData - ' - Me.ucrPnlSaveData.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrPnlSaveData.Location = New System.Drawing.Point(13, 12) - Me.ucrPnlSaveData.Margin = New System.Windows.Forms.Padding(6) - Me.ucrPnlSaveData.Name = "ucrPnlSaveData" - Me.ucrPnlSaveData.Size = New System.Drawing.Size(402, 36) - Me.ucrPnlSaveData.TabIndex = 47 - ' 'tbPageGetData ' Me.tbPageGetData.Controls.Add(Me.ucrReceiverGetOutputObject) @@ -283,32 +249,6 @@ Partial Class dlgScript Me.tbPageGetData.Text = "Get Data" Me.tbPageGetData.UseVisualStyleBackColor = True ' - 'ucrReceiverGetOutputObject - ' - Me.ucrReceiverGetOutputObject.AutoSize = True - Me.ucrReceiverGetOutputObject.frmParent = Nothing - Me.ucrReceiverGetOutputObject.Location = New System.Drawing.Point(240, 117) - Me.ucrReceiverGetOutputObject.Margin = New System.Windows.Forms.Padding(0) - Me.ucrReceiverGetOutputObject.Name = "ucrReceiverGetOutputObject" - Me.ucrReceiverGetOutputObject.Selector = Nothing - Me.ucrReceiverGetOutputObject.Size = New System.Drawing.Size(138, 20) - Me.ucrReceiverGetOutputObject.strNcFilePath = "" - Me.ucrReceiverGetOutputObject.TabIndex = 27 - Me.ucrReceiverGetOutputObject.ucrSelector = Nothing - ' - 'ucrReceiverGetColumns - ' - Me.ucrReceiverGetColumns.AutoSize = True - Me.ucrReceiverGetColumns.frmParent = Nothing - Me.ucrReceiverGetColumns.Location = New System.Drawing.Point(243, 104) - Me.ucrReceiverGetColumns.Margin = New System.Windows.Forms.Padding(0) - Me.ucrReceiverGetColumns.Name = "ucrReceiverGetColumns" - Me.ucrReceiverGetColumns.Selector = Nothing - Me.ucrReceiverGetColumns.Size = New System.Drawing.Size(137, 105) - Me.ucrReceiverGetColumns.strNcFilePath = "" - Me.ucrReceiverGetColumns.TabIndex = 49 - Me.ucrReceiverGetColumns.ucrSelector = Nothing - ' 'lblGetColumn ' Me.lblGetColumn.AutoSize = True @@ -389,55 +329,27 @@ Partial Class dlgScript Me.rdoGetColumn.TextAlign = System.Drawing.ContentAlignment.MiddleCenter Me.rdoGetColumn.UseVisualStyleBackColor = True ' - 'ucrDataFrameGetDF - ' - Me.ucrDataFrameGetDF.AutoSize = True - Me.ucrDataFrameGetDF.bDropUnusedFilterLevels = False - Me.ucrDataFrameGetDF.bUseCurrentFilter = True - Me.ucrDataFrameGetDF.Location = New System.Drawing.Point(81, 55) - Me.ucrDataFrameGetDF.Margin = New System.Windows.Forms.Padding(0) - Me.ucrDataFrameGetDF.Name = "ucrDataFrameGetDF" - Me.ucrDataFrameGetDF.Size = New System.Drawing.Size(224, 59) - Me.ucrDataFrameGetDF.TabIndex = 31 - ' - 'ucrCboGetOutputObjectType - ' - Me.ucrCboGetOutputObjectType.AddQuotesIfUnrecognised = True - Me.ucrCboGetOutputObjectType.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrCboGetOutputObjectType.GetSetSelectedIndex = -1 - Me.ucrCboGetOutputObjectType.IsReadOnly = False - Me.ucrCboGetOutputObjectType.Location = New System.Drawing.Point(241, 72) - Me.ucrCboGetOutputObjectType.Margin = New System.Windows.Forms.Padding(9) - Me.ucrCboGetOutputObjectType.Name = "ucrCboGetOutputObjectType" - Me.ucrCboGetOutputObjectType.Size = New System.Drawing.Size(137, 21) - Me.ucrCboGetOutputObjectType.TabIndex = 47 - ' - 'ucrPnlGetData - ' - Me.ucrPnlGetData.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrPnlGetData.Location = New System.Drawing.Point(5, 10) - Me.ucrPnlGetData.Margin = New System.Windows.Forms.Padding(6) - Me.ucrPnlGetData.Name = "ucrPnlGetData" - Me.ucrPnlGetData.Size = New System.Drawing.Size(402, 36) - Me.ucrPnlGetData.TabIndex = 42 - ' - 'ucrSelectorGetObject - ' - Me.ucrSelectorGetObject.AutoSize = True - Me.ucrSelectorGetObject.bDropUnusedFilterLevels = False - Me.ucrSelectorGetObject.bShowHiddenColumns = False - Me.ucrSelectorGetObject.bUseCurrentFilter = True - Me.ucrSelectorGetObject.Location = New System.Drawing.Point(9, 52) - Me.ucrSelectorGetObject.Margin = New System.Windows.Forms.Padding(0) - Me.ucrSelectorGetObject.Name = "ucrSelectorGetObject" - Me.ucrSelectorGetObject.Size = New System.Drawing.Size(320, 274) - Me.ucrSelectorGetObject.TabIndex = 34 - ' 'tbPageCommand ' - Me.tbPageCommand.Controls.Add(Me.ucrInputRemoveObjects) + Me.tbPageCommand.Controls.Add(Me.ucrChkWindow) + Me.tbPageCommand.Controls.Add(Me.rdoWindow) + Me.tbPageCommand.Controls.Add(Me.rdoListData) + Me.tbPageCommand.Controls.Add(Me.rdoViewData) + Me.tbPageCommand.Controls.Add(Me.lblGraphCommand) + Me.tbPageCommand.Controls.Add(Me.lblGraphObject) + Me.tbPageCommand.Controls.Add(Me.rdoChooseFile) + Me.tbPageCommand.Controls.Add(Me.rdoGgplotify) Me.tbPageCommand.Controls.Add(Me.rdoCommandPackage) Me.tbPageCommand.Controls.Add(Me.rdoCommandObject) + Me.tbPageCommand.Controls.Add(Me.ucrChkInto) + Me.tbPageCommand.Controls.Add(Me.ucrInputSaveData) + Me.tbPageCommand.Controls.Add(Me.ucrCboCommandDataPackage) + Me.tbPageCommand.Controls.Add(Me.ucrInputViewData) + Me.tbPageCommand.Controls.Add(Me.ucrInputGraphCommand) + Me.tbPageCommand.Controls.Add(Me.ucrChkOpenRFile) + Me.tbPageCommand.Controls.Add(Me.ucrInputChooseFile) + Me.tbPageCommand.Controls.Add(Me.ucrInputGgplotify) + Me.tbPageCommand.Controls.Add(Me.ucrInputRemoveObjects) Me.tbPageCommand.Controls.Add(Me.ucrCboCommandPackage) Me.tbPageCommand.Controls.Add(Me.ucrPnlCommands) Me.tbPageCommand.Location = New System.Drawing.Point(4, 22) @@ -447,22 +359,88 @@ Partial Class dlgScript Me.tbPageCommand.Text = "Commands" Me.tbPageCommand.UseVisualStyleBackColor = True ' - 'ucrInputRemoveObjects - ' - Me.ucrInputRemoveObjects.AddQuotesIfUnrecognised = True - Me.ucrInputRemoveObjects.AutoSize = True - Me.ucrInputRemoveObjects.IsMultiline = False - Me.ucrInputRemoveObjects.IsReadOnly = False - Me.ucrInputRemoveObjects.Location = New System.Drawing.Point(156, 56) - Me.ucrInputRemoveObjects.Margin = New System.Windows.Forms.Padding(9) - Me.ucrInputRemoveObjects.Name = "ucrInputRemoveObjects" - Me.ucrInputRemoveObjects.Size = New System.Drawing.Size(145, 21) - Me.ucrInputRemoveObjects.TabIndex = 2 + 'rdoWindow + ' + Me.rdoWindow.AutoSize = True + Me.rdoWindow.Location = New System.Drawing.Point(25, 94) + Me.rdoWindow.Margin = New System.Windows.Forms.Padding(2) + Me.rdoWindow.Name = "rdoWindow" + Me.rdoWindow.Size = New System.Drawing.Size(134, 17) + Me.rdoWindow.TabIndex = 66 + Me.rdoWindow.TabStop = True + Me.rdoWindow.Text = "Output Graph Window:" + Me.rdoWindow.UseVisualStyleBackColor = True + ' + 'rdoListData + ' + Me.rdoListData.AutoSize = True + Me.rdoListData.Location = New System.Drawing.Point(25, 35) + Me.rdoListData.Margin = New System.Windows.Forms.Padding(2) + Me.rdoListData.Name = "rdoListData" + Me.rdoListData.Size = New System.Drawing.Size(70, 17) + Me.rdoListData.TabIndex = 61 + Me.rdoListData.TabStop = True + Me.rdoListData.Text = "List Data:" + Me.rdoListData.UseVisualStyleBackColor = True + ' + 'rdoViewData + ' + Me.rdoViewData.AutoSize = True + Me.rdoViewData.Location = New System.Drawing.Point(25, 129) + Me.rdoViewData.Margin = New System.Windows.Forms.Padding(2) + Me.rdoViewData.Name = "rdoViewData" + Me.rdoViewData.Size = New System.Drawing.Size(77, 17) + Me.rdoViewData.TabIndex = 58 + Me.rdoViewData.TabStop = True + Me.rdoViewData.Text = "View Data:" + Me.rdoViewData.UseVisualStyleBackColor = True + ' + 'lblGraphCommand + ' + Me.lblGraphCommand.AutoSize = True + Me.lblGraphCommand.Location = New System.Drawing.Point(156, 165) + Me.lblGraphCommand.Name = "lblGraphCommand" + Me.lblGraphCommand.Size = New System.Drawing.Size(89, 13) + Me.lblGraphCommand.TabIndex = 56 + Me.lblGraphCommand.Text = "Graph Command:" + ' + 'lblGraphObject + ' + Me.lblGraphObject.AutoSize = True + Me.lblGraphObject.Location = New System.Drawing.Point(156, 190) + Me.lblGraphObject.Name = "lblGraphObject" + Me.lblGraphObject.Size = New System.Drawing.Size(73, 13) + Me.lblGraphObject.TabIndex = 54 + Me.lblGraphObject.Text = "Graph Object:" + ' + 'rdoChooseFile + ' + Me.rdoChooseFile.AutoSize = True + Me.rdoChooseFile.Location = New System.Drawing.Point(25, 64) + Me.rdoChooseFile.Margin = New System.Windows.Forms.Padding(2) + Me.rdoChooseFile.Name = "rdoChooseFile" + Me.rdoChooseFile.Size = New System.Drawing.Size(83, 17) + Me.rdoChooseFile.TabIndex = 52 + Me.rdoChooseFile.TabStop = True + Me.rdoChooseFile.Text = "Choose File:" + Me.rdoChooseFile.UseVisualStyleBackColor = True + ' + 'rdoGgplotify + ' + Me.rdoGgplotify.AutoSize = True + Me.rdoGgplotify.Location = New System.Drawing.Point(25, 166) + Me.rdoGgplotify.Margin = New System.Windows.Forms.Padding(2) + Me.rdoGgplotify.Name = "rdoGgplotify" + Me.rdoGgplotify.Size = New System.Drawing.Size(69, 17) + Me.rdoGgplotify.TabIndex = 50 + Me.rdoGgplotify.TabStop = True + Me.rdoGgplotify.Text = "Ggplotify:" + Me.rdoGgplotify.UseVisualStyleBackColor = True ' 'rdoCommandPackage ' Me.rdoCommandPackage.AutoSize = True - Me.rdoCommandPackage.Location = New System.Drawing.Point(25, 23) + Me.rdoCommandPackage.Location = New System.Drawing.Point(25, 9) Me.rdoCommandPackage.Margin = New System.Windows.Forms.Padding(2) Me.rdoCommandPackage.Name = "rdoCommandPackage" Me.rdoCommandPackage.Size = New System.Drawing.Size(91, 17) @@ -474,7 +452,7 @@ Partial Class dlgScript 'rdoCommandObject ' Me.rdoCommandObject.AutoSize = True - Me.rdoCommandObject.Location = New System.Drawing.Point(25, 60) + Me.rdoCommandObject.Location = New System.Drawing.Point(25, 218) Me.rdoCommandObject.Margin = New System.Windows.Forms.Padding(2) Me.rdoCommandObject.Name = "rdoCommandObject" Me.rdoCommandObject.Size = New System.Drawing.Size(113, 17) @@ -483,29 +461,9 @@ Partial Class dlgScript Me.rdoCommandObject.Text = "Remove Object(s):" Me.rdoCommandObject.UseVisualStyleBackColor = True ' - 'ucrCboCommandPackage - ' - Me.ucrCboCommandPackage.AddQuotesIfUnrecognised = True - Me.ucrCboCommandPackage.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrCboCommandPackage.GetSetSelectedIndex = -1 - Me.ucrCboCommandPackage.IsReadOnly = False - Me.ucrCboCommandPackage.Location = New System.Drawing.Point(156, 19) - Me.ucrCboCommandPackage.Margin = New System.Windows.Forms.Padding(9) - Me.ucrCboCommandPackage.Name = "ucrCboCommandPackage" - Me.ucrCboCommandPackage.Size = New System.Drawing.Size(137, 21) - Me.ucrCboCommandPackage.TabIndex = 44 - ' - 'ucrPnlCommands - ' - Me.ucrPnlCommands.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrPnlCommands.Location = New System.Drawing.Point(9, 8) - Me.ucrPnlCommands.Margin = New System.Windows.Forms.Padding(6) - Me.ucrPnlCommands.Name = "ucrPnlCommands" - Me.ucrPnlCommands.Size = New System.Drawing.Size(333, 143) - Me.ucrPnlCommands.TabIndex = 47 - ' 'tbPageExamples ' + Me.tbPageExamples.Controls.Add(Me.cmdHelp) Me.tbPageExamples.Controls.Add(Me.rdoExampleData) Me.tbPageExamples.Controls.Add(Me.rdoExampleFunction) Me.tbPageExamples.Controls.Add(Me.ucrPnlExample) @@ -516,9 +474,18 @@ Partial Class dlgScript Me.tbPageExamples.Name = "tbPageExamples" Me.tbPageExamples.Size = New System.Drawing.Size(438, 245) Me.tbPageExamples.TabIndex = 4 - Me.tbPageExamples.Text = "Examples" + Me.tbPageExamples.Text = "Library" Me.tbPageExamples.UseVisualStyleBackColor = True ' + 'cmdHelp + ' + Me.cmdHelp.Location = New System.Drawing.Point(361, 4) + Me.cmdHelp.Name = "cmdHelp" + Me.cmdHelp.Size = New System.Drawing.Size(75, 23) + Me.cmdHelp.TabIndex = 61 + Me.cmdHelp.Text = "R Help" + Me.cmdHelp.UseVisualStyleBackColor = True + ' 'rdoExampleData ' Me.rdoExampleData.Appearance = System.Windows.Forms.Appearance.Button @@ -553,15 +520,6 @@ Partial Class dlgScript Me.rdoExampleFunction.TextAlign = System.Drawing.ContentAlignment.MiddleCenter Me.rdoExampleFunction.UseVisualStyleBackColor = True ' - 'ucrPnlExample - ' - Me.ucrPnlExample.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrPnlExample.Location = New System.Drawing.Point(7, 51) - Me.ucrPnlExample.Margin = New System.Windows.Forms.Padding(6) - Me.ucrPnlExample.Name = "ucrPnlExample" - Me.ucrPnlExample.Size = New System.Drawing.Size(402, 34) - Me.ucrPnlExample.TabIndex = 56 - ' 'lstExampleCollection ' Me.lstExampleCollection.Columns.AddRange(New System.Windows.Forms.ColumnHeader() {Me.clmDatasets, Me.clmDesc}) @@ -598,18 +556,6 @@ Partial Class dlgScript Me.Label3.TabIndex = 52 Me.Label3.Text = "Package" ' - 'ucrCboExamplePackages - ' - Me.ucrCboExamplePackages.AddQuotesIfUnrecognised = True - Me.ucrCboExamplePackages.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrCboExamplePackages.GetSetSelectedIndex = -1 - Me.ucrCboExamplePackages.IsReadOnly = False - Me.ucrCboExamplePackages.Location = New System.Drawing.Point(14, 22) - Me.ucrCboExamplePackages.Margin = New System.Windows.Forms.Padding(9) - Me.ucrCboExamplePackages.Name = "ucrCboExamplePackages" - Me.ucrCboExamplePackages.Size = New System.Drawing.Size(137, 21) - Me.ucrCboExamplePackages.TabIndex = 51 - ' 'lblPreview ' Me.lblPreview.AutoSize = True @@ -629,6 +575,333 @@ Partial Class dlgScript Me.txtScript.Size = New System.Drawing.Size(445, 96) Me.txtScript.TabIndex = 32 ' + 'ucrInputSaveRFile + ' + Me.ucrInputSaveRFile.AddQuotesIfUnrecognised = True + Me.ucrInputSaveRFile.AutoSize = True + Me.ucrInputSaveRFile.IsMultiline = False + Me.ucrInputSaveRFile.IsReadOnly = False + Me.ucrInputSaveRFile.Location = New System.Drawing.Point(92, 150) + Me.ucrInputSaveRFile.Margin = New System.Windows.Forms.Padding(9) + Me.ucrInputSaveRFile.Name = "ucrInputSaveRFile" + Me.ucrInputSaveRFile.Size = New System.Drawing.Size(145, 21) + Me.ucrInputSaveRFile.TabIndex = 64 + ' + 'ucrChkDisplayGraph + ' + Me.ucrChkDisplayGraph.AutoSize = True + Me.ucrChkDisplayGraph.Checked = False + Me.ucrChkDisplayGraph.Location = New System.Drawing.Point(88, 217) + Me.ucrChkDisplayGraph.Name = "ucrChkDisplayGraph" + Me.ucrChkDisplayGraph.Size = New System.Drawing.Size(113, 23) + Me.ucrChkDisplayGraph.TabIndex = 60 + ' + 'ucrChkSaveDataFrameSingle + ' + Me.ucrChkSaveDataFrameSingle.AutoSize = True + Me.ucrChkSaveDataFrameSingle.Checked = False + Me.ucrChkSaveDataFrameSingle.Location = New System.Drawing.Point(91, 101) + Me.ucrChkSaveDataFrameSingle.Name = "ucrChkSaveDataFrameSingle" + Me.ucrChkSaveDataFrameSingle.Size = New System.Drawing.Size(146, 23) + Me.ucrChkSaveDataFrameSingle.TabIndex = 59 + ' + 'ucrInputSaveDataFrame + ' + Me.ucrInputSaveDataFrame.AddQuotesIfUnrecognised = True + Me.ucrInputSaveDataFrame.AutoSize = True + Me.ucrInputSaveDataFrame.IsMultiline = False + Me.ucrInputSaveDataFrame.IsReadOnly = False + Me.ucrInputSaveDataFrame.Location = New System.Drawing.Point(92, 70) + Me.ucrInputSaveDataFrame.Margin = New System.Windows.Forms.Padding(9) + Me.ucrInputSaveDataFrame.Name = "ucrInputSaveDataFrame" + Me.ucrInputSaveDataFrame.Size = New System.Drawing.Size(145, 21) + Me.ucrInputSaveDataFrame.TabIndex = 57 + ' + 'ucrCboSaveOutputObjectFormat + ' + Me.ucrCboSaveOutputObjectFormat.AddQuotesIfUnrecognised = True + Me.ucrCboSaveOutputObjectFormat.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrCboSaveOutputObjectFormat.GetSetSelectedIndex = -1 + Me.ucrCboSaveOutputObjectFormat.IsReadOnly = False + Me.ucrCboSaveOutputObjectFormat.Location = New System.Drawing.Point(88, 160) + Me.ucrCboSaveOutputObjectFormat.Margin = New System.Windows.Forms.Padding(9) + Me.ucrCboSaveOutputObjectFormat.Name = "ucrCboSaveOutputObjectFormat" + Me.ucrCboSaveOutputObjectFormat.Size = New System.Drawing.Size(141, 21) + Me.ucrCboSaveOutputObjectFormat.TabIndex = 55 + ' + 'ucrCboSaveOutputObjectType + ' + Me.ucrCboSaveOutputObjectType.AddQuotesIfUnrecognised = True + Me.ucrCboSaveOutputObjectType.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrCboSaveOutputObjectType.GetSetSelectedIndex = -1 + Me.ucrCboSaveOutputObjectType.IsReadOnly = False + Me.ucrCboSaveOutputObjectType.Location = New System.Drawing.Point(87, 116) + Me.ucrCboSaveOutputObjectType.Margin = New System.Windows.Forms.Padding(9) + Me.ucrCboSaveOutputObjectType.Name = "ucrCboSaveOutputObjectType" + Me.ucrCboSaveOutputObjectType.Size = New System.Drawing.Size(144, 21) + Me.ucrCboSaveOutputObjectType.TabIndex = 53 + ' + 'ucrSaveObject + ' + Me.ucrSaveObject.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrSaveObject.Location = New System.Drawing.Point(88, 193) + Me.ucrSaveObject.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) + Me.ucrSaveObject.Name = "ucrSaveObject" + Me.ucrSaveObject.Size = New System.Drawing.Size(258, 22) + Me.ucrSaveObject.TabIndex = 35 + ' + 'ucrDataFrameSaveOutputSelect + ' + Me.ucrDataFrameSaveOutputSelect.AutoSize = True + Me.ucrDataFrameSaveOutputSelect.bDropUnusedFilterLevels = False + Me.ucrDataFrameSaveOutputSelect.bUseCurrentFilter = True + Me.ucrDataFrameSaveOutputSelect.Location = New System.Drawing.Point(86, 54) + Me.ucrDataFrameSaveOutputSelect.Margin = New System.Windows.Forms.Padding(0) + Me.ucrDataFrameSaveOutputSelect.Name = "ucrDataFrameSaveOutputSelect" + Me.ucrDataFrameSaveOutputSelect.Size = New System.Drawing.Size(224, 59) + Me.ucrDataFrameSaveOutputSelect.TabIndex = 29 + ' + 'ucrPnlSaveData + ' + Me.ucrPnlSaveData.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrPnlSaveData.Location = New System.Drawing.Point(13, 12) + Me.ucrPnlSaveData.Margin = New System.Windows.Forms.Padding(6) + Me.ucrPnlSaveData.Name = "ucrPnlSaveData" + Me.ucrPnlSaveData.Size = New System.Drawing.Size(402, 36) + Me.ucrPnlSaveData.TabIndex = 47 + ' + 'ucrPnlSaveDataFrame + ' + Me.ucrPnlSaveDataFrame.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrPnlSaveDataFrame.Location = New System.Drawing.Point(5, 48) + Me.ucrPnlSaveDataFrame.Margin = New System.Windows.Forms.Padding(6) + Me.ucrPnlSaveDataFrame.Name = "ucrPnlSaveDataFrame" + Me.ucrPnlSaveDataFrame.Size = New System.Drawing.Size(429, 134) + Me.ucrPnlSaveDataFrame.TabIndex = 65 + ' + 'ucrReceiverGetOutputObject + ' + Me.ucrReceiverGetOutputObject.AutoSize = True + Me.ucrReceiverGetOutputObject.frmParent = Nothing + Me.ucrReceiverGetOutputObject.Location = New System.Drawing.Point(240, 117) + Me.ucrReceiverGetOutputObject.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverGetOutputObject.Name = "ucrReceiverGetOutputObject" + Me.ucrReceiverGetOutputObject.Selector = Nothing + Me.ucrReceiverGetOutputObject.Size = New System.Drawing.Size(138, 20) + Me.ucrReceiverGetOutputObject.strNcFilePath = "" + Me.ucrReceiverGetOutputObject.TabIndex = 27 + Me.ucrReceiverGetOutputObject.ucrSelector = Nothing + ' + 'ucrReceiverGetColumns + ' + Me.ucrReceiverGetColumns.AutoSize = True + Me.ucrReceiverGetColumns.frmParent = Nothing + Me.ucrReceiverGetColumns.Location = New System.Drawing.Point(243, 104) + Me.ucrReceiverGetColumns.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverGetColumns.Name = "ucrReceiverGetColumns" + Me.ucrReceiverGetColumns.Selector = Nothing + Me.ucrReceiverGetColumns.Size = New System.Drawing.Size(137, 105) + Me.ucrReceiverGetColumns.strNcFilePath = "" + Me.ucrReceiverGetColumns.TabIndex = 49 + Me.ucrReceiverGetColumns.ucrSelector = Nothing + ' + 'ucrDataFrameGetDF + ' + Me.ucrDataFrameGetDF.AutoSize = True + Me.ucrDataFrameGetDF.bDropUnusedFilterLevels = False + Me.ucrDataFrameGetDF.bUseCurrentFilter = True + Me.ucrDataFrameGetDF.Location = New System.Drawing.Point(81, 55) + Me.ucrDataFrameGetDF.Margin = New System.Windows.Forms.Padding(0) + Me.ucrDataFrameGetDF.Name = "ucrDataFrameGetDF" + Me.ucrDataFrameGetDF.Size = New System.Drawing.Size(224, 59) + Me.ucrDataFrameGetDF.TabIndex = 31 + ' + 'ucrCboGetOutputObjectType + ' + Me.ucrCboGetOutputObjectType.AddQuotesIfUnrecognised = True + Me.ucrCboGetOutputObjectType.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrCboGetOutputObjectType.GetSetSelectedIndex = -1 + Me.ucrCboGetOutputObjectType.IsReadOnly = False + Me.ucrCboGetOutputObjectType.Location = New System.Drawing.Point(241, 72) + Me.ucrCboGetOutputObjectType.Margin = New System.Windows.Forms.Padding(9) + Me.ucrCboGetOutputObjectType.Name = "ucrCboGetOutputObjectType" + Me.ucrCboGetOutputObjectType.Size = New System.Drawing.Size(137, 21) + Me.ucrCboGetOutputObjectType.TabIndex = 47 + ' + 'ucrPnlGetData + ' + Me.ucrPnlGetData.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrPnlGetData.Location = New System.Drawing.Point(5, 10) + Me.ucrPnlGetData.Margin = New System.Windows.Forms.Padding(6) + Me.ucrPnlGetData.Name = "ucrPnlGetData" + Me.ucrPnlGetData.Size = New System.Drawing.Size(402, 36) + Me.ucrPnlGetData.TabIndex = 42 + ' + 'ucrSelectorGetObject + ' + Me.ucrSelectorGetObject.AutoSize = True + Me.ucrSelectorGetObject.bDropUnusedFilterLevels = False + Me.ucrSelectorGetObject.bShowHiddenColumns = False + Me.ucrSelectorGetObject.bUseCurrentFilter = True + Me.ucrSelectorGetObject.Location = New System.Drawing.Point(9, 52) + Me.ucrSelectorGetObject.Margin = New System.Windows.Forms.Padding(0) + Me.ucrSelectorGetObject.Name = "ucrSelectorGetObject" + Me.ucrSelectorGetObject.Size = New System.Drawing.Size(320, 274) + Me.ucrSelectorGetObject.TabIndex = 34 + ' + 'ucrChkWindow + ' + Me.ucrChkWindow.AutoSize = True + Me.ucrChkWindow.Checked = False + Me.ucrChkWindow.Location = New System.Drawing.Point(233, 94) + Me.ucrChkWindow.Name = "ucrChkWindow" + Me.ucrChkWindow.Size = New System.Drawing.Size(126, 23) + Me.ucrChkWindow.TabIndex = 67 + ' + 'ucrChkInto + ' + Me.ucrChkInto.AutoSize = True + Me.ucrChkInto.Checked = False + Me.ucrChkInto.Location = New System.Drawing.Point(233, 33) + Me.ucrChkInto.Name = "ucrChkInto" + Me.ucrChkInto.Size = New System.Drawing.Size(84, 23) + Me.ucrChkInto.TabIndex = 63 + ' + 'ucrInputSaveData + ' + Me.ucrInputSaveData.AddQuotesIfUnrecognised = True + Me.ucrInputSaveData.AutoSize = True + Me.ucrInputSaveData.IsMultiline = False + Me.ucrInputSaveData.IsReadOnly = False + Me.ucrInputSaveData.Location = New System.Drawing.Point(319, 31) + Me.ucrInputSaveData.Margin = New System.Windows.Forms.Padding(9) + Me.ucrInputSaveData.Name = "ucrInputSaveData" + Me.ucrInputSaveData.Size = New System.Drawing.Size(110, 21) + Me.ucrInputSaveData.TabIndex = 60 + ' + 'ucrCboCommandDataPackage + ' + Me.ucrCboCommandDataPackage.AddQuotesIfUnrecognised = True + Me.ucrCboCommandDataPackage.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrCboCommandDataPackage.GetSetSelectedIndex = -1 + Me.ucrCboCommandDataPackage.IsReadOnly = False + Me.ucrCboCommandDataPackage.Location = New System.Drawing.Point(109, 31) + Me.ucrCboCommandDataPackage.Margin = New System.Windows.Forms.Padding(9) + Me.ucrCboCommandDataPackage.Name = "ucrCboCommandDataPackage" + Me.ucrCboCommandDataPackage.Size = New System.Drawing.Size(117, 21) + Me.ucrCboCommandDataPackage.TabIndex = 59 + ' + 'ucrInputViewData + ' + Me.ucrInputViewData.AddQuotesIfUnrecognised = True + Me.ucrInputViewData.AutoSize = True + Me.ucrInputViewData.IsMultiline = False + Me.ucrInputViewData.IsReadOnly = False + Me.ucrInputViewData.Location = New System.Drawing.Point(156, 129) + Me.ucrInputViewData.Margin = New System.Windows.Forms.Padding(9) + Me.ucrInputViewData.Name = "ucrInputViewData" + Me.ucrInputViewData.Size = New System.Drawing.Size(145, 21) + Me.ucrInputViewData.TabIndex = 57 + ' + 'ucrInputGraphCommand + ' + Me.ucrInputGraphCommand.AddQuotesIfUnrecognised = True + Me.ucrInputGraphCommand.AutoSize = True + Me.ucrInputGraphCommand.IsMultiline = False + Me.ucrInputGraphCommand.IsReadOnly = False + Me.ucrInputGraphCommand.Location = New System.Drawing.Point(247, 161) + Me.ucrInputGraphCommand.Margin = New System.Windows.Forms.Padding(9) + Me.ucrInputGraphCommand.Name = "ucrInputGraphCommand" + Me.ucrInputGraphCommand.Size = New System.Drawing.Size(145, 21) + Me.ucrInputGraphCommand.TabIndex = 55 + ' + 'ucrChkOpenRFile + ' + Me.ucrChkOpenRFile.AutoSize = True + Me.ucrChkOpenRFile.Checked = False + Me.ucrChkOpenRFile.Location = New System.Drawing.Point(156, 64) + Me.ucrChkOpenRFile.Name = "ucrChkOpenRFile" + Me.ucrChkOpenRFile.Size = New System.Drawing.Size(100, 23) + Me.ucrChkOpenRFile.TabIndex = 53 + ' + 'ucrInputChooseFile + ' + Me.ucrInputChooseFile.AddQuotesIfUnrecognised = True + Me.ucrInputChooseFile.AutoSize = True + Me.ucrInputChooseFile.IsMultiline = False + Me.ucrInputChooseFile.IsReadOnly = False + Me.ucrInputChooseFile.Location = New System.Drawing.Point(265, 64) + Me.ucrInputChooseFile.Margin = New System.Windows.Forms.Padding(9) + Me.ucrInputChooseFile.Name = "ucrInputChooseFile" + Me.ucrInputChooseFile.Size = New System.Drawing.Size(145, 21) + Me.ucrInputChooseFile.TabIndex = 51 + ' + 'ucrInputGgplotify + ' + Me.ucrInputGgplotify.AddQuotesIfUnrecognised = True + Me.ucrInputGgplotify.AutoSize = True + Me.ucrInputGgplotify.IsMultiline = False + Me.ucrInputGgplotify.IsReadOnly = False + Me.ucrInputGgplotify.Location = New System.Drawing.Point(247, 186) + Me.ucrInputGgplotify.Margin = New System.Windows.Forms.Padding(9) + Me.ucrInputGgplotify.Name = "ucrInputGgplotify" + Me.ucrInputGgplotify.Size = New System.Drawing.Size(145, 21) + Me.ucrInputGgplotify.TabIndex = 49 + ' + 'ucrInputRemoveObjects + ' + Me.ucrInputRemoveObjects.AddQuotesIfUnrecognised = True + Me.ucrInputRemoveObjects.AutoSize = True + Me.ucrInputRemoveObjects.IsMultiline = False + Me.ucrInputRemoveObjects.IsReadOnly = False + Me.ucrInputRemoveObjects.Location = New System.Drawing.Point(156, 218) + Me.ucrInputRemoveObjects.Margin = New System.Windows.Forms.Padding(9) + Me.ucrInputRemoveObjects.Name = "ucrInputRemoveObjects" + Me.ucrInputRemoveObjects.Size = New System.Drawing.Size(145, 21) + Me.ucrInputRemoveObjects.TabIndex = 2 + ' + 'ucrCboCommandPackage + ' + Me.ucrCboCommandPackage.AddQuotesIfUnrecognised = True + Me.ucrCboCommandPackage.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrCboCommandPackage.GetSetSelectedIndex = -1 + Me.ucrCboCommandPackage.IsReadOnly = False + Me.ucrCboCommandPackage.Location = New System.Drawing.Point(156, 5) + Me.ucrCboCommandPackage.Margin = New System.Windows.Forms.Padding(9) + Me.ucrCboCommandPackage.Name = "ucrCboCommandPackage" + Me.ucrCboCommandPackage.Size = New System.Drawing.Size(137, 21) + Me.ucrCboCommandPackage.TabIndex = 44 + ' + 'ucrPnlCommands + ' + Me.ucrPnlCommands.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrPnlCommands.Location = New System.Drawing.Point(2, 8) + Me.ucrPnlCommands.Margin = New System.Windows.Forms.Padding(6) + Me.ucrPnlCommands.Name = "ucrPnlCommands" + Me.ucrPnlCommands.Size = New System.Drawing.Size(429, 238) + Me.ucrPnlCommands.TabIndex = 47 + ' + 'ucrPnlExample + ' + Me.ucrPnlExample.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrPnlExample.Location = New System.Drawing.Point(7, 51) + Me.ucrPnlExample.Margin = New System.Windows.Forms.Padding(6) + Me.ucrPnlExample.Name = "ucrPnlExample" + Me.ucrPnlExample.Size = New System.Drawing.Size(402, 34) + Me.ucrPnlExample.TabIndex = 56 + ' + 'ucrCboExamplePackages + ' + Me.ucrCboExamplePackages.AddQuotesIfUnrecognised = True + Me.ucrCboExamplePackages.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrCboExamplePackages.GetSetSelectedIndex = -1 + Me.ucrCboExamplePackages.IsReadOnly = False + Me.ucrCboExamplePackages.Location = New System.Drawing.Point(14, 22) + Me.ucrCboExamplePackages.Margin = New System.Windows.Forms.Padding(9) + Me.ucrCboExamplePackages.Name = "ucrCboExamplePackages" + Me.ucrCboExamplePackages.Size = New System.Drawing.Size(137, 21) + Me.ucrCboExamplePackages.TabIndex = 51 + ' 'ucrBase ' Me.ucrBase.AutoSize = True @@ -712,7 +985,28 @@ Partial Class dlgScript Friend WithEvents ucrPnlCommands As UcrPanel Friend WithEvents rdoCommandPackage As RadioButton Friend WithEvents rdoCommandObject As RadioButton - Friend WithEvents lblSaveDataFrame As Label Friend WithEvents ucrInputSaveDataFrame As ucrInputTextBox Friend WithEvents ucrChkSaveDataFrameSingle As ucrCheck + Friend WithEvents ucrChkDisplayGraph As ucrCheck + Friend WithEvents ucrInputGgplotify As ucrInputTextBox + Friend WithEvents rdoGgplotify As RadioButton + Friend WithEvents ucrChkOpenRFile As ucrCheck + Friend WithEvents ucrInputChooseFile As ucrInputTextBox + Friend WithEvents rdoChooseFile As RadioButton + Friend WithEvents lblGraphObject As Label + Friend WithEvents lblGraphCommand As Label + Friend WithEvents ucrInputGraphCommand As ucrInputTextBox + Friend WithEvents ucrInputViewData As ucrInputTextBox + Friend WithEvents rdoViewData As RadioButton + Friend WithEvents rdoListData As RadioButton + Friend WithEvents ucrInputSaveData As ucrInputTextBox + Friend WithEvents ucrCboCommandDataPackage As ucrInputComboBox + Friend WithEvents ucrChkInto As ucrCheck + Friend WithEvents ucrChkWindow As ucrCheck + Friend WithEvents rdoWindow As RadioButton + Friend WithEvents cmdHelp As Button + Friend WithEvents ucrInputSaveRFile As ucrInputTextBox + Friend WithEvents rdoFromRFile As RadioButton + Friend WithEvents rdoDataFrame As RadioButton + Friend WithEvents ucrPnlSaveDataFrame As UcrPanel End Class diff --git a/instat/dlgScript.vb b/instat/dlgScript.vb index 17b3d481199..f16bb22c428 100644 --- a/instat/dlgScript.vb +++ b/instat/dlgScript.vb @@ -20,6 +20,7 @@ Public Class dlgScript Private strComment As String = "Code generated by the dialog, Script" Private bFirstload As Boolean = True Private clsSaveDataFunction As New RFunction + Private clsGetRObjectFunction As New RFunction Private dctOutputObjectTypes As New Dictionary(Of String, String) Private dctOutputObjectFormats As New Dictionary(Of String, String) @@ -29,10 +30,20 @@ Public Class dlgScript SetDefaults() bFirstload = False End If + + If lstExampleCollection.SelectedItems.Count > 0 Then + 'make the listview have the focus + lstExampleCollection.Select() + 'set the selected item to be visible + lstExampleCollection.TopItem = lstExampleCollection.Items(lstExampleCollection.Items.IndexOf(lstExampleCollection.SelectedItems.Item(0))) + End If + autoTranslate(Me) + EnableHelp() End Sub Private Sub InitialiseDialog() + ucrBase.iHelpTopicID = 180 ' Supported output object types and formats dctOutputObjectTypes.Add("Summary", RObjectTypeLabel.Summary) @@ -65,9 +76,13 @@ Public Class dlgScript ucrSaveObject.SetIsComboBox() ucrSaveObject.SetDataFrameSelector(ucrDataFrameSaveOutputSelect) - ucrInputSaveDataFrame.SetLinkedDisplayControl(lblSaveDataFrame) + ucrPnlSaveDataFrame.AddRadioButton(rdoDataFrame) + ucrPnlSaveDataFrame.AddRadioButton(rdoFromRFile) + ucrChkSaveDataFrameSingle.SetText("Single") + ucrChkDisplayGraph.SetText("Display Output") + '-------------------------------- 'Get data controls @@ -96,9 +111,26 @@ Public Class dlgScript ucrCboCommandPackage.SetItems(GetPackages(), bAddConditions:=True) ucrCboCommandPackage.SetDropDownStyleAsNonEditable() + ucrCboCommandDataPackage.SetParameter(New RParameter("package", 0)) + ucrCboCommandDataPackage.SetItems(GetPackages(), bAddConditions:=True) + ucrCboCommandDataPackage.SetDropDownStyleAsNonEditable() + + ucrChkOpenRFile.SetText("Open R File") + + ucrChkInto.SetText("Into:") + + ucrChkWindow.SetText("Multiple Graphs:") + + ucrInputGgplotify.SetLinkedDisplayControl(lblGraphObject) + ucrInputGraphCommand.SetLinkedDisplayControl(lblGraphCommand) ucrPnlCommands.AddRadioButton(rdoCommandPackage) ucrPnlCommands.AddRadioButton(rdoCommandObject) + ucrPnlCommands.AddRadioButton(rdoGgplotify) + ucrPnlCommands.AddRadioButton(rdoChooseFile) + ucrPnlCommands.AddRadioButton(rdoViewData) + ucrPnlCommands.AddRadioButton(rdoListData) + ucrPnlCommands.AddRadioButton(rdoWindow) '-------------------------------- 'Get example controls @@ -136,13 +168,15 @@ Public Class dlgScript End Function Private Sub SetDefaults() - + clsGetRObjectFunction = New RFunction ' Examples controls rdoExampleData.Checked = True ' Command controls rdoCommandPackage.Checked = True ucrCboCommandPackage.GetSetSelectedIndex = -1 + ucrCboCommandDataPackage.GetSetSelectedIndex = -1 + ucrInputRemoveObjects.Reset() ' Save controls reset @@ -150,6 +184,10 @@ Public Class dlgScript ucrSaveObject.Reset() rdoSaveDataFrame.Checked = True ucrChkSaveDataFrameSingle.Checked = True + ucrChkDisplayGraph.Checked = True + ucrChkOpenRFile.Checked = False + ucrChkInto.Checked = False + ucrChkWindow.Checked = True ucrDataFrameSaveOutputSelect.Reset() ' Get controls reset @@ -157,7 +195,7 @@ Public Class dlgScript ucrCboGetOutputObjectType.GetSetSelectedIndex = 0 ucrDataFrameGetDF.Reset() rdoGetDataFrame.Checked = True - + rdoDataFrame.Checked = True 'activate the selected tab to library tab tbFeatures.SelectedIndex = -1 @@ -170,23 +208,34 @@ Public Class dlgScript ucrCboSaveOutputObjectType.SetVisible(False) ucrCboSaveOutputObjectFormat.SetVisible(False) ucrSaveObject.SetVisible(False) - ucrInputSaveDataFrame.SetVisible(False) - ucrChkSaveDataFrameSingle.SetVisible(False) + ucrChkDisplayGraph.Visible = False + ucrPnlSaveDataFrame.SetVisible(False) If rdoSaveDataFrame.Checked Then - ucrInputSaveDataFrame.SetVisible(True) - ucrChkSaveDataFrameSingle.SetVisible(True) + ucrPnlSaveDataFrame.SetVisible(True) + HideShowSaveDataFrameControls() + ucrChkDisplayGraph.Visible = False ucrInputSaveDataFrame.SetName("") ElseIf rdoSaveColumn.Checked Then ucrSaveObject.Location = New Point(ucrSaveObject.Location.X, ucrCboSaveOutputObjectType.Location.Y) ucrSaveObject.SetVisible(True) ucrDataFrameSaveOutputSelect.SetVisible(True) + ucrChkDisplayGraph.Visible = False + ucrInputSaveRFile.SetVisible(False) + ucrInputSaveDataFrame.SetVisible(False) + ucrChkSaveDataFrameSingle.SetVisible(False) + ucrPnlSaveDataFrame.SetVisible(False) SetupSaveDataControl("Column", RObjectTypeLabel.Column, "") ElseIf rdoSaveOutputObject.Checked Then ucrSaveObject.Location = New Point(ucrSaveObject.Location.X, ucrCboSaveOutputObjectFormat.Location.Y + 33) ucrSaveObject.SetVisible(True) ucrDataFrameSaveOutputSelect.SetVisible(True) + ucrChkDisplayGraph.Visible = True ucrCboSaveOutputObjectType.SetVisible(True) + ucrInputSaveRFile.SetVisible(False) + ucrInputSaveDataFrame.SetVisible(False) ucrCboSaveOutputObjectFormat.SetVisible(True) + ucrChkSaveDataFrameSingle.SetVisible(False) + ucrPnlSaveDataFrame.SetVisible(False) SetupSaveDataControl(ucrCboSaveOutputObjectType.GetText(), dctOutputObjectTypes.Item(ucrCboSaveOutputObjectType.GetText()), dctOutputObjectFormats.Item(ucrCboSaveOutputObjectFormat.GetText())) End If End Sub @@ -203,34 +252,51 @@ Public Class dlgScript ucrSaveObject.SetName("") End Sub - Private Sub ucrSaveDataFrameControls_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrInputSaveDataFrame.ControlContentsChanged, ucrChkSaveDataFrameSingle.ControlContentsChanged + Private Sub ucrSaveDataFrameControls_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrInputSaveDataFrame.ControlContentsChanged, ucrChkSaveDataFrameSingle.ControlContentsChanged, + ucrInputSaveRFile.ControlContentsChanged + Dim strScript As String = "" - If Not ucrInputSaveDataFrame.IsEmpty() Then - Dim strDataFrameName As String = ucrInputSaveDataFrame.GetText() - Dim clsImportRFunction As New RFunction + If rdoDataFrame.Checked Then + If Not ucrInputSaveDataFrame.IsEmpty() Then + Dim clsImportRFunction As New RFunction + Dim strDataFrameName As String = ucrInputSaveDataFrame.GetText() - clsImportRFunction.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$import_data") + clsImportRFunction.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$import_data") + + If ucrChkSaveDataFrameSingle.Checked Then + ' If it's a single data frame then wrap it into a list + Dim clsDataListRFunction As New RFunction + clsDataListRFunction.SetRCommand("list") + clsDataListRFunction.AddParameter(strParameterName:=strDataFrameName, strParameterValue:=strDataFrameName) + clsImportRFunction.AddParameter(strParameterName:="data_tables", clsRFunctionParameter:=clsDataListRFunction) + Else + ' If it's already a list of data frames, then add the name directly + clsImportRFunction.AddParameter(strParameterName:="data_tables", strParameterValue:=strDataFrameName) + End If + + strScript = "# Save data frame(s) """ & strDataFrameName & """" & Environment.NewLine & clsImportRFunction.ToScript() - If ucrChkSaveDataFrameSingle.Checked Then - ' If it's a single data frame then wrap it into a list - Dim clsDataListRFunction As New RFunction - clsDataListRFunction.SetRCommand("list") - clsDataListRFunction.AddParameter(strParameterName:=strDataFrameName, strParameterValue:=strDataFrameName) - clsImportRFunction.AddParameter(strParameterName:="data_tables", clsRFunctionParameter:=clsDataListRFunction) - Else - ' If it's already a list of data frames, then add the name directly - clsImportRFunction.AddParameter(strParameterName:="data_tables", strParameterValue:=strDataFrameName) End If + Else + If Not ucrInputSaveRFile.IsEmpty Then + Dim clsImportRDSFunction As New RFunction + Dim strRFileName As String = ucrInputSaveRFile.GetText() - strScript = "# Save data frame(s) """ & strDataFrameName & """" & Environment.NewLine & clsImportRFunction.ToScript() + clsImportRDSFunction.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$import_RDS") + clsImportRDSFunction.AddParameter(strParameterName:="data_RDS", strParameterValue:=strRFileName) + + strScript = "# Save RDS File(s) """ & strRFileName & """" & Environment.NewLine & clsImportRDSFunction.ToScript() + + End If End If PreviewScript(strScript) End Sub - Private Sub ucrSaveData_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrSaveObject.ControlContentsChanged + Private Sub ucrSaveData_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrSaveObject.ControlContentsChanged, ucrChkDisplayGraph.ControlValueChanged Dim strScript As String = "" + Dim strGetScript As String = "" If ucrSaveObject.IsComplete Then ' R code is not automatiucally updated by save control when control contents changed event is raised by the control @@ -250,9 +316,18 @@ Public Class dlgScript strTemp = arrtemp(1) strScript = "# Save " & strDataType & " """ & ucrSaveObject.GetText() & """" & Environment.NewLine & strTemp End If - End If - PreviewScript(strScript) + If ucrChkDisplayGraph.Checked Then + ucrChkDisplayGraph.UpdateRCode() + clsGetRObjectFunction.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$get_object_data") + clsGetRObjectFunction.AddParameter("data_name", Chr(34) & ucrDataFrameSaveOutputSelect.strCurrDataFrame & Chr(34), iPosition:=0) + clsGetRObjectFunction.AddParameter("as_file", "TRUE", iPosition:=2) + clsGetRObjectFunction.AddParameter("object_name", Chr(34) & ucrSaveObject.GetText & Chr(34), iPosition:=1) + strGetScript = "" & Environment.NewLine & clsGetRObjectFunction.ToScript() + End If + End If + Dim combinedScript As String = strScript & Environment.NewLine & strGetScript + PreviewScript(combinedScript) End Sub Private Sub ucrPnlGetData_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrPnlGetData.ControlValueChanged @@ -335,12 +410,42 @@ Public Class dlgScript Private Sub ucrPnlCommands_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrPnlCommands.ControlValueChanged ucrCboCommandPackage.SetVisible(False) ucrInputRemoveObjects.SetVisible(False) + ucrInputGgplotify.SetVisible(False) + ucrInputGraphCommand.SetVisible(False) + ucrChkOpenRFile.SetVisible(False) + ucrChkInto.SetVisible(False) + ucrInputChooseFile.SetVisible(False) + ucrInputViewData.SetVisible(False) + ucrCboCommandDataPackage.SetVisible(False) + ucrInputSaveData.SetVisible(False) + ucrChkWindow.SetVisible(False) If rdoCommandPackage.Checked Then ucrCboCommandPackage.SetVisible(True) ucrCboCommandPackage.OnControlValueChanged() ElseIf rdoCommandObject.Checked Then ucrInputRemoveObjects.SetVisible(True) ucrInputRemoveObjects.OnControlValueChanged() + ElseIf rdoGgplotify.Checked Then + ucrInputGgplotify.SetVisible(True) + ucrInputGgplotify.OnControlValueChanged() + ucrInputGraphCommand.SetVisible(True) + ucrInputGraphCommand.OnControlValueChanged() + ElseIf rdoChooseFile.Checked Then + ucrChkOpenRFile.SetVisible(True) + ucrChkOpenRFile.OnControlValueChanged() + ucrInputChooseFile.OnControlValueChanged() + ElseIf rdoViewData.Checked Then + ucrInputViewData.SetVisible(True) + ucrInputViewData.OnControlValueChanged() + ElseIf rdoListData.Checked Then + ucrCboCommandDataPackage.SetVisible(True) + ucrChkInto.SetVisible(True) + ucrCboCommandDataPackage.OnControlValueChanged() + ucrInputSaveData.OnControlValueChanged() + ucrChkInto.OnControlValueChanged() + ElseIf rdoWindow.Checked Then + ucrChkWindow.SetVisible(True) + ucrChkWindow.OnControlValueChanged() End If End Sub @@ -357,6 +462,46 @@ Public Class dlgScript PreviewScript(strScript) End Sub + Private Sub ucrCboCommandDataPackage_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrInputSaveData.ControlContentsChanged, ucrChkInto.ControlContentsChanged, ucrCboCommandDataPackage.ControlValueChanged + ucrInputSaveData.Visible = ucrChkInto.Checked + + Dim strScript As String = "" + Dim strScriptDataFrame As String = "" + Dim clsDatasetFunction As New RFunction + clsDatasetFunction.SetPackageName("vcdExtra") + + If Not ucrCboCommandDataPackage.IsEmpty() Then + clsDatasetFunction.SetRCommand("datasets") + clsDatasetFunction.AddParameter("package", Chr(34) & ucrCboCommandDataPackage.GetText() & Chr(34), bIncludeArgumentName:=False) + strScript = "#List of data sets " & Environment.NewLine & clsDatasetFunction.ToScript + End If + + If ucrChkInto.Checked AndAlso Not ucrInputSaveData.IsEmpty() Then + Dim strDataFrameName As String = ucrInputSaveData.GetText() + Dim clsImportRFunction As New RFunction + Dim strAssignedScript As String = "" + + clsDatasetFunction.SetRCommand("datasets") + clsDatasetFunction.SetAssignTo(strDataFrameName) + clsDatasetFunction.AddParameter("package", Chr(34) & ucrCboCommandDataPackage.GetText() & Chr(34), bIncludeArgumentName:=False) + clsDatasetFunction.ToScript(strScript:=strAssignedScript) + strScript = "#List of data sets " & Environment.NewLine & strAssignedScript + + clsImportRFunction.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$import_data") + + Dim clsDataListRFunction As New RFunction + clsDataListRFunction.SetRCommand("list") + clsDataListRFunction.AddParameter(strParameterName:=strDataFrameName, strParameterValue:=strDataFrameName) + clsImportRFunction.AddParameter(strParameterName:="data_tables", clsRFunctionParameter:=clsDataListRFunction) + + strScriptDataFrame = "# Save data frame """ & strDataFrameName & """" & Environment.NewLine & clsImportRFunction.ToScript() + End If + + Dim combinedScript As String = strScript & Environment.NewLine & strScriptDataFrame + + PreviewScript(combinedScript) + End Sub + Private Sub ucrInputRemoveObject_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrInputRemoveObjects.ControlContentsChanged Dim strScript As String = "" @@ -379,7 +524,43 @@ Public Class dlgScript PreviewScript(strScript) End Sub - Private Sub ucrComboGetPackages_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrCboExamplePackages.ControlValueChanged, ucrPnlExample.ControlValueChanged + Private Sub ucrInputGgplotify_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrInputGraphCommand.ControlContentsChanged, ucrInputGgplotify.ControlContentsChanged + Dim strScript As String = "" + + If Not ucrInputGgplotify.IsEmpty() AndAlso Not ucrInputGraphCommand.IsEmpty Then + Dim clsGgglorifyFunction As New RFunction + + clsGgglorifyFunction.SetPackageName("ggplotify") + clsGgglorifyFunction.SetRCommand("as.ggplot") + + + Dim strAssignedScript As String = "" + clsGgglorifyFunction.AddParameter("plot", "~" & ucrInputGraphCommand.GetText(), bIncludeArgumentName:=False) + clsGgglorifyFunction.SetAssignTo(ucrInputGgplotify.GetText) + clsGgglorifyFunction.ToScript(strScript:=strAssignedScript) + + strScript = "# Make Graph a ggplot " & Environment.NewLine & strAssignedScript + + End If + PreviewScript(strScript) + End Sub + + Private Sub ucrInputViewData_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrInputViewData.ControlContentsChanged + Dim strScript As String = "" + + If Not ucrInputViewData.IsEmpty Then + Dim clsViewDataFunction As New RFunction + + clsViewDataFunction.SetRCommand("View") + clsViewDataFunction.AddParameter("view", ucrInputViewData.GetText(), bIncludeArgumentName:=False) + + strScript = "#Show data in the R spreadsheet-type viewer" & Environment.NewLine & clsViewDataFunction.ToScript() + + End If + PreviewScript(strScript) + End Sub + + Private Sub ucrComboGetPackages_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrPnlExample.ControlValueChanged, ucrCboExamplePackages.ControlValueChanged PreviewScript("") lstExampleCollection.Items.Clear() @@ -397,7 +578,7 @@ Public Class dlgScript lstExampleCollection.Items.AddRange(GetFunctions(strSelectedPackage)) End If lstExampleCollection.Select() - + EnableHelp() End Sub Private Function GetDatasets(strPackage As String) As ListViewItem() @@ -462,6 +643,7 @@ Public Class dlgScript Catch ex As Exception MsgBox(strTopic & " has a help file but no examples.") End Try + EnableHelp() End Sub Private Sub txtScript_TextChanged(sender As Object, e As EventArgs) Handles txtScript.TextChanged @@ -471,6 +653,7 @@ Public Class dlgScript Private Sub ucrBase_ClickReset(sender As Object, e As EventArgs) Handles ucrBase.ClickReset SetDefaults() + EnableHelp() End Sub Private Sub tbFeatures_Selected(sender As Object, e As TabControlEventArgs) Handles tbFeatures.Selected @@ -498,5 +681,96 @@ Public Class dlgScript txtScript.Refresh() End Sub + Private Sub ucrInputChooseFile_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrInputChooseFile.ControlContentsChanged, ucrChkOpenRFile.ControlContentsChanged + UpdateScript() + ucrInputChooseFile.Visible = ucrChkOpenRFile.Checked + End Sub + + Private Sub rdoChooseFile_CheckedChanged(sender As Object, e As EventArgs) Handles rdoChooseFile.CheckedChanged + UpdateScript() + End Sub + + Private Sub UpdateScript() + Dim strScript As String = "" + Dim clsFileChooseFunction As New RFunction + Dim clsReadRdsFunction As New RFunction + + If rdoChooseFile.Checked Then + If Not ucrChkOpenRFile.Checked Then + ' Only file choosing logic + clsFileChooseFunction.SetRCommand("choose.files") + Dim strAssignedScript As String = "" + clsFileChooseFunction.SetAssignTo("filename") + clsFileChooseFunction.ToScript(strScript:=strAssignedScript) + strScript = "#Open file interactively" & Environment.NewLine & strAssignedScript + ElseIf ucrChkOpenRFile.Checked AndAlso Not ucrInputChooseFile.IsEmpty Then + ' File choosing and RDS file reading logic + clsFileChooseFunction.SetRCommand("choose.files") + Dim strAssignedScript As String = "" + clsFileChooseFunction.SetAssignTo("filename") + clsFileChooseFunction.ToScript(strScript:=strAssignedScript) + strScript = "#Open R data file interactively" & Environment.NewLine & strAssignedScript + + clsReadRdsFunction.SetRCommand("readRDS") + Dim strRdsAssignedScript As String = "" + clsReadRdsFunction.SetAssignTo(ucrInputChooseFile.GetText) + clsReadRdsFunction.AddParameter("file", "filename", bIncludeArgumentName:=False) + clsReadRdsFunction.ToScript(strScript:=strRdsAssignedScript) + Dim strRdScript As String = strRdsAssignedScript + + ' Combine scripts if applicable + strScript &= strRdScript + End If + End If + PreviewScript(strScript) + End Sub + Private Sub EnableHelp() + cmdHelp.Enabled = rdoExampleData.Checked AndAlso lstExampleCollection.SelectedItems.Count > 0 + End Sub + + Private Sub ucrChkWindow_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrChkWindow.ControlContentsChanged + Dim strScript As String = "" + Dim clsWindowFunction As New RFunction + + If ucrChkWindow.Checked Then + clsWindowFunction.SetRCommand("windows") + clsWindowFunction.AddParameter("record", "TRUE", iPosition:=0) + strScript = "#Recording multiple graphs" & Environment.NewLine & clsWindowFunction.ToScript() + Else + clsWindowFunction.SetRCommand("windows") + clsWindowFunction.RemoveParameterByName("record") + strScript = "#Open the R graph viewer" & Environment.NewLine & clsWindowFunction.ToScript() + End If + + PreviewScript(strScript) + End Sub + + Private Sub cmdHelp_Click(sender As Object, e As EventArgs) Handles cmdHelp.Click + Dim strPackageName As String = ucrCboExamplePackages.cboInput.SelectedItem + Dim strTopic As String = lstExampleCollection.SelectedItems(0).Text + If Not String.IsNullOrEmpty(strPackageName) AndAlso Not String.IsNullOrEmpty(strTopic) Then + Dim frmMaximiseOutput As New frmMaximiseOutput + frmMaximiseOutput.Show(strFileName:=clsFileUrlUtilities.GetHelpFileURL(strPackageName:=strPackageName, strTopic:=strTopic), bReplace:=False) + End If + End Sub + + Private Sub ucrPnlSaveDataFrame_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrPnlSaveDataFrame.ControlValueChanged + HideShowSaveDataFrameControls() + End Sub + + Private Sub HideShowSaveDataFrameControls() + ucrInputSaveRFile.SetVisible(False) + ucrInputSaveDataFrame.SetVisible(False) + ucrChkSaveDataFrameSingle.SetVisible(False) + If rdoDataFrame.Checked Then + ucrInputSaveDataFrame.SetVisible(True) + ucrChkSaveDataFrameSingle.SetVisible(True) + ucrInputSaveDataFrame.OnControlValueChanged() + ucrChkSaveDataFrameSingle.OnControlValueChanged() + ElseIf rdoFromRFile.Checked Then + ucrInputSaveRFile.SetVisible(True) + ucrInputSaveRFile.OnControlValueChanged() + End If + End Sub End Class \ No newline at end of file diff --git a/instat/dlgSeasonalPlot.vb b/instat/dlgSeasonalPlot.vb index fd0e869bd73..2df8b779213 100644 --- a/instat/dlgSeasonalPlot.vb +++ b/instat/dlgSeasonalPlot.vb @@ -98,6 +98,7 @@ Public Class dlgSeasonalPlot End Sub Private Sub InitiliseDialog() + ucrBase.iHelpTopicID = 640 ucrBase.clsRsyntax.iCallType = 3 ucrBase.clsRsyntax.bExcludeAssignedFunctionOutput = False diff --git a/instat/dlgSelect.Designer.vb b/instat/dlgSelect.Designer.vb index 3eac8507f49..3f679d4dff8 100644 --- a/instat/dlgSelect.Designer.vb +++ b/instat/dlgSelect.Designer.vb @@ -66,11 +66,9 @@ Partial Class dlgSelect Me.grpApplyOptions.Controls.Add(Me.rdoApplyAsSubset) Me.grpApplyOptions.Controls.Add(Me.rdoApplyAsSelect) Me.grpApplyOptions.Controls.Add(Me.ucrPnlApplyOptions) - Me.grpApplyOptions.Location = New System.Drawing.Point(16, 310) - Me.grpApplyOptions.Margin = New System.Windows.Forms.Padding(4) + Me.grpApplyOptions.Location = New System.Drawing.Point(13, 258) Me.grpApplyOptions.Name = "grpApplyOptions" - Me.grpApplyOptions.Padding = New System.Windows.Forms.Padding(4) - Me.grpApplyOptions.Size = New System.Drawing.Size(320, 151) + Me.grpApplyOptions.Size = New System.Drawing.Size(267, 126) Me.grpApplyOptions.TabIndex = 4 Me.grpApplyOptions.TabStop = False Me.grpApplyOptions.Text = "Apply" @@ -78,9 +76,10 @@ Partial Class dlgSelect 'rdoApplySave ' Me.rdoApplySave.AutoSize = True - Me.rdoApplySave.Location = New System.Drawing.Point(11, 106) + Me.rdoApplySave.Location = New System.Drawing.Point(9, 88) + Me.rdoApplySave.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2) Me.rdoApplySave.Name = "rdoApplySave" - Me.rdoApplySave.Size = New System.Drawing.Size(119, 24) + Me.rdoApplySave.Size = New System.Drawing.Size(101, 20) Me.rdoApplySave.TabIndex = 3 Me.rdoApplySave.TabStop = True Me.rdoApplySave.Text = "Save Select" @@ -90,35 +89,33 @@ Partial Class dlgSelect ' Me.rdoApplyAsSubset.AutoSize = True Me.rdoApplyAsSubset.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.rdoApplyAsSubset.Location = New System.Drawing.Point(11, 71) - Me.rdoApplyAsSubset.Margin = New System.Windows.Forms.Padding(4) + Me.rdoApplyAsSubset.Location = New System.Drawing.Point(9, 59) Me.rdoApplyAsSubset.Name = "rdoApplyAsSubset" - Me.rdoApplyAsSubset.Size = New System.Drawing.Size(85, 24) + Me.rdoApplyAsSubset.Size = New System.Drawing.Size(89, 20) Me.rdoApplyAsSubset.TabIndex = 1 Me.rdoApplyAsSubset.TabStop = True - Me.rdoApplyAsSubset.Text = "Subset" + Me.rdoApplyAsSubset.Text = "As Subset" Me.rdoApplyAsSubset.UseVisualStyleBackColor = True ' 'rdoApplyAsSelect ' Me.rdoApplyAsSelect.AutoSize = True Me.rdoApplyAsSelect.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.rdoApplyAsSelect.Location = New System.Drawing.Point(11, 36) - Me.rdoApplyAsSelect.Margin = New System.Windows.Forms.Padding(4) + Me.rdoApplyAsSelect.Location = New System.Drawing.Point(9, 30) Me.rdoApplyAsSelect.Name = "rdoApplyAsSelect" - Me.rdoApplyAsSelect.Size = New System.Drawing.Size(79, 24) + Me.rdoApplyAsSelect.Size = New System.Drawing.Size(156, 20) Me.rdoApplyAsSelect.TabIndex = 0 Me.rdoApplyAsSelect.TabStop = True - Me.rdoApplyAsSelect.Text = "Select" + Me.rdoApplyAsSelect.Text = "As Selected Columns" Me.rdoApplyAsSelect.UseVisualStyleBackColor = True ' 'ucrPnlApplyOptions ' Me.ucrPnlApplyOptions.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrPnlApplyOptions.Location = New System.Drawing.Point(6, 25) - Me.ucrPnlApplyOptions.Margin = New System.Windows.Forms.Padding(9) + Me.ucrPnlApplyOptions.Location = New System.Drawing.Point(5, 21) + Me.ucrPnlApplyOptions.Margin = New System.Windows.Forms.Padding(8, 8, 8, 8) Me.ucrPnlApplyOptions.Name = "ucrPnlApplyOptions" - Me.ucrPnlApplyOptions.Size = New System.Drawing.Size(289, 114) + Me.ucrPnlApplyOptions.Size = New System.Drawing.Size(241, 95) Me.ucrPnlApplyOptions.TabIndex = 2 ' 'grpOptions @@ -126,9 +123,11 @@ Partial Class dlgSelect Me.grpOptions.Controls.Add(Me.ucrChkDialogue) Me.grpOptions.Controls.Add(Me.ucrChkMetaData) Me.grpOptions.Controls.Add(Me.ucrChkDataframe) - Me.grpOptions.Location = New System.Drawing.Point(343, 310) + Me.grpOptions.Location = New System.Drawing.Point(286, 258) + Me.grpOptions.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2) Me.grpOptions.Name = "grpOptions" - Me.grpOptions.Size = New System.Drawing.Size(289, 151) + Me.grpOptions.Padding = New System.Windows.Forms.Padding(2, 2, 2, 2) + Me.grpOptions.Size = New System.Drawing.Size(241, 126) Me.grpOptions.TabIndex = 3 Me.grpOptions.TabStop = False Me.grpOptions.Text = "Apply To:" @@ -137,50 +136,48 @@ Partial Class dlgSelect ' Me.ucrChkDialogue.AutoSize = True Me.ucrChkDialogue.Checked = False - Me.ucrChkDialogue.Location = New System.Drawing.Point(14, 105) - Me.ucrChkDialogue.Margin = New System.Windows.Forms.Padding(6, 6, 6, 6) + Me.ucrChkDialogue.Location = New System.Drawing.Point(12, 88) + Me.ucrChkDialogue.Margin = New System.Windows.Forms.Padding(5, 5, 5, 5) Me.ucrChkDialogue.Name = "ucrChkDialogue" - Me.ucrChkDialogue.Size = New System.Drawing.Size(265, 34) + Me.ucrChkDialogue.Size = New System.Drawing.Size(221, 29) Me.ucrChkDialogue.TabIndex = 2 ' 'ucrChkMetaData ' Me.ucrChkMetaData.AutoSize = True Me.ucrChkMetaData.Checked = False - Me.ucrChkMetaData.Location = New System.Drawing.Point(14, 64) - Me.ucrChkMetaData.Margin = New System.Windows.Forms.Padding(6, 6, 6, 6) + Me.ucrChkMetaData.Location = New System.Drawing.Point(12, 53) + Me.ucrChkMetaData.Margin = New System.Windows.Forms.Padding(5, 5, 5, 5) Me.ucrChkMetaData.Name = "ucrChkMetaData" - Me.ucrChkMetaData.Size = New System.Drawing.Size(265, 34) + Me.ucrChkMetaData.Size = New System.Drawing.Size(221, 29) Me.ucrChkMetaData.TabIndex = 1 ' 'ucrChkDataframe ' Me.ucrChkDataframe.AutoSize = True Me.ucrChkDataframe.Checked = False - Me.ucrChkDataframe.Location = New System.Drawing.Point(14, 26) - Me.ucrChkDataframe.Margin = New System.Windows.Forms.Padding(6, 6, 6, 6) + Me.ucrChkDataframe.Location = New System.Drawing.Point(12, 22) + Me.ucrChkDataframe.Margin = New System.Windows.Forms.Padding(5, 5, 5, 5) Me.ucrChkDataframe.Name = "ucrChkDataframe" - Me.ucrChkDataframe.Size = New System.Drawing.Size(265, 34) + Me.ucrChkDataframe.Size = New System.Drawing.Size(221, 29) Me.ucrChkDataframe.TabIndex = 0 ' 'lblSelection ' Me.lblSelection.AutoSize = True Me.lblSelection.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblSelection.Location = New System.Drawing.Point(375, 82) - Me.lblSelection.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblSelection.Location = New System.Drawing.Point(312, 68) Me.lblSelection.Name = "lblSelection" - Me.lblSelection.Size = New System.Drawing.Size(79, 20) + Me.lblSelection.Size = New System.Drawing.Size(66, 16) Me.lblSelection.TabIndex = 1 Me.lblSelection.Text = "Selection:" ' 'cmdDefineNewSelect ' Me.cmdDefineNewSelect.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdDefineNewSelect.Location = New System.Drawing.Point(375, 147) - Me.cmdDefineNewSelect.Margin = New System.Windows.Forms.Padding(4) + Me.cmdDefineNewSelect.Location = New System.Drawing.Point(312, 122) Me.cmdDefineNewSelect.Name = "cmdDefineNewSelect" - Me.cmdDefineNewSelect.Size = New System.Drawing.Size(236, 45) + Me.cmdDefineNewSelect.Size = New System.Drawing.Size(197, 38) Me.cmdDefineNewSelect.TabIndex = 3 Me.cmdDefineNewSelect.Tag = "" Me.cmdDefineNewSelect.Text = "Define New Selection" @@ -189,10 +186,9 @@ Partial Class dlgSelect 'lblFilterPreview ' Me.lblFilterPreview.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblFilterPreview.Location = New System.Drawing.Point(16, 559) - Me.lblFilterPreview.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblFilterPreview.Location = New System.Drawing.Point(13, 466) Me.lblFilterPreview.Name = "lblFilterPreview" - Me.lblFilterPreview.Size = New System.Drawing.Size(214, 33) + Me.lblFilterPreview.Size = New System.Drawing.Size(178, 28) Me.lblFilterPreview.TabIndex = 7 Me.lblFilterPreview.Text = "Selection Preview:" Me.lblFilterPreview.Visible = False @@ -200,10 +196,9 @@ Partial Class dlgSelect 'lblNewDataFrameName ' Me.lblNewDataFrameName.AutoSize = True - Me.lblNewDataFrameName.Location = New System.Drawing.Point(32, 513) - Me.lblNewDataFrameName.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblNewDataFrameName.Location = New System.Drawing.Point(27, 428) Me.lblNewDataFrameName.Name = "lblNewDataFrameName" - Me.lblNewDataFrameName.Size = New System.Drawing.Size(179, 20) + Me.lblNewDataFrameName.Size = New System.Drawing.Size(151, 16) Me.lblNewDataFrameName.TabIndex = 5 Me.lblNewDataFrameName.Text = "New Data Frame Name:" ' @@ -213,10 +208,10 @@ Partial Class dlgSelect Me.ucrInputNewDataFrameName.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink Me.ucrInputNewDataFrameName.GetSetSelectedIndex = -1 Me.ucrInputNewDataFrameName.IsReadOnly = False - Me.ucrInputNewDataFrameName.Location = New System.Drawing.Point(219, 506) - Me.ucrInputNewDataFrameName.Margin = New System.Windows.Forms.Padding(14) + Me.ucrInputNewDataFrameName.Location = New System.Drawing.Point(182, 422) + Me.ucrInputNewDataFrameName.Margin = New System.Windows.Forms.Padding(12, 12, 12, 12) Me.ucrInputNewDataFrameName.Name = "ucrInputNewDataFrameName" - Me.ucrInputNewDataFrameName.Size = New System.Drawing.Size(206, 32) + Me.ucrInputNewDataFrameName.Size = New System.Drawing.Size(172, 27) Me.ucrInputNewDataFrameName.TabIndex = 6 ' 'ucrInputSelectPreview @@ -225,10 +220,10 @@ Partial Class dlgSelect Me.ucrInputSelectPreview.AutoSize = True Me.ucrInputSelectPreview.IsMultiline = True Me.ucrInputSelectPreview.IsReadOnly = False - Me.ucrInputSelectPreview.Location = New System.Drawing.Point(240, 546) - Me.ucrInputSelectPreview.Margin = New System.Windows.Forms.Padding(14) + Me.ucrInputSelectPreview.Location = New System.Drawing.Point(200, 455) + Me.ucrInputSelectPreview.Margin = New System.Windows.Forms.Padding(12, 12, 12, 12) Me.ucrInputSelectPreview.Name = "ucrInputSelectPreview" - Me.ucrInputSelectPreview.Size = New System.Drawing.Size(382, 64) + Me.ucrInputSelectPreview.Size = New System.Drawing.Size(318, 53) Me.ucrInputSelectPreview.TabIndex = 8 Me.ucrInputSelectPreview.Visible = False ' @@ -236,11 +231,11 @@ Partial Class dlgSelect ' Me.ucrReceiverSelect.AutoSize = True Me.ucrReceiverSelect.frmParent = Me - Me.ucrReceiverSelect.Location = New System.Drawing.Point(376, 105) + Me.ucrReceiverSelect.Location = New System.Drawing.Point(313, 88) Me.ucrReceiverSelect.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverSelect.Name = "ucrReceiverSelect" Me.ucrReceiverSelect.Selector = Nothing - Me.ucrReceiverSelect.Size = New System.Drawing.Size(234, 30) + Me.ucrReceiverSelect.Size = New System.Drawing.Size(195, 25) Me.ucrReceiverSelect.strNcFilePath = "" Me.ucrReceiverSelect.TabIndex = 2 Me.ucrReceiverSelect.ucrSelector = Nothing @@ -251,28 +246,28 @@ Partial Class dlgSelect Me.ucrSelectorForSelectColumns.bDropUnusedFilterLevels = False Me.ucrSelectorForSelectColumns.bShowHiddenColumns = False Me.ucrSelectorForSelectColumns.bUseCurrentFilter = True - Me.ucrSelectorForSelectColumns.Location = New System.Drawing.Point(16, 30) + Me.ucrSelectorForSelectColumns.Location = New System.Drawing.Point(13, 25) Me.ucrSelectorForSelectColumns.Margin = New System.Windows.Forms.Padding(0) Me.ucrSelectorForSelectColumns.Name = "ucrSelectorForSelectColumns" - Me.ucrSelectorForSelectColumns.Size = New System.Drawing.Size(320, 274) + Me.ucrSelectorForSelectColumns.Size = New System.Drawing.Size(267, 228) Me.ucrSelectorForSelectColumns.TabIndex = 0 ' 'ucrBase ' Me.ucrBase.AutoSize = True Me.ucrBase.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrBase.Location = New System.Drawing.Point(16, 619) - Me.ucrBase.Margin = New System.Windows.Forms.Padding(6) + Me.ucrBase.Location = New System.Drawing.Point(13, 516) + Me.ucrBase.Margin = New System.Windows.Forms.Padding(5, 5, 5, 5) Me.ucrBase.Name = "ucrBase" - Me.ucrBase.Size = New System.Drawing.Size(611, 77) + Me.ucrBase.Size = New System.Drawing.Size(511, 65) Me.ucrBase.TabIndex = 9 ' 'dlgSelect ' - Me.AutoScaleDimensions = New System.Drawing.SizeF(144.0!, 144.0!) + Me.AutoScaleDimensions = New System.Drawing.SizeF(120.0!, 120.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi Me.AutoSize = True - Me.ClientSize = New System.Drawing.Size(644, 706) + Me.ClientSize = New System.Drawing.Size(537, 588) Me.Controls.Add(Me.grpOptions) Me.Controls.Add(Me.ucrInputNewDataFrameName) Me.Controls.Add(Me.lblNewDataFrameName) @@ -285,7 +280,6 @@ Partial Class dlgSelect Me.Controls.Add(Me.ucrBase) Me.Controls.Add(Me.grpApplyOptions) Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow - Me.Margin = New System.Windows.Forms.Padding(4) Me.MaximizeBox = False Me.MinimizeBox = False Me.Name = "dlgSelect" diff --git a/instat/dlgStartofRains.Designer.vb b/instat/dlgStartofRains.Designer.vb index ea3a0db2d9d..e5f35fb174b 100644 --- a/instat/dlgStartofRains.Designer.vb +++ b/instat/dlgStartofRains.Designer.vb @@ -66,9 +66,9 @@ Partial Class dlgStartofRains Me.rdoTRPercentile = New System.Windows.Forms.RadioButton() Me.ucrPnlTRCalculateBy = New instat.UcrPanel() Me.grpRainParameters = New System.Windows.Forms.GroupBox() + Me.ucrInputThreshold = New instat.ucrInputComboBox() Me.ucrInputFilterPreview = New instat.ucrInputTextBox() Me.cmdDoyRange = New System.Windows.Forms.Button() - Me.ucrNudThreshold = New instat.ucrNud() Me.lblThreshold = New System.Windows.Forms.Label() Me.lblDOY = New System.Windows.Forms.Label() Me.lblDate = New System.Windows.Forms.Label() @@ -409,9 +409,9 @@ Partial Class dlgStartofRains ' 'grpRainParameters ' + Me.grpRainParameters.Controls.Add(Me.ucrInputThreshold) Me.grpRainParameters.Controls.Add(Me.ucrInputFilterPreview) Me.grpRainParameters.Controls.Add(Me.cmdDoyRange) - Me.grpRainParameters.Controls.Add(Me.ucrNudThreshold) Me.grpRainParameters.Controls.Add(Me.lblThreshold) Me.grpRainParameters.Location = New System.Drawing.Point(4, 238) Me.grpRainParameters.Name = "grpRainParameters" @@ -419,6 +419,17 @@ Partial Class dlgStartofRains Me.grpRainParameters.TabIndex = 11 Me.grpRainParameters.TabStop = False ' + 'ucrInputThreshold + ' + Me.ucrInputThreshold.AddQuotesIfUnrecognised = True + Me.ucrInputThreshold.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrInputThreshold.GetSetSelectedIndex = -1 + Me.ucrInputThreshold.IsReadOnly = False + Me.ucrInputThreshold.Location = New System.Drawing.Point(70, 11) + Me.ucrInputThreshold.Name = "ucrInputThreshold" + Me.ucrInputThreshold.Size = New System.Drawing.Size(62, 21) + Me.ucrInputThreshold.TabIndex = 21 + ' 'ucrInputFilterPreview ' Me.ucrInputFilterPreview.AddQuotesIfUnrecognised = True @@ -441,19 +452,6 @@ Partial Class dlgStartofRains Me.cmdDoyRange.Text = "Day Range" Me.cmdDoyRange.UseVisualStyleBackColor = True ' - 'ucrNudThreshold - ' - Me.ucrNudThreshold.AutoSize = True - Me.ucrNudThreshold.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) - Me.ucrNudThreshold.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudThreshold.Location = New System.Drawing.Point(69, 11) - Me.ucrNudThreshold.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) - Me.ucrNudThreshold.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) - Me.ucrNudThreshold.Name = "ucrNudThreshold" - Me.ucrNudThreshold.Size = New System.Drawing.Size(42, 20) - Me.ucrNudThreshold.TabIndex = 1 - Me.ucrNudThreshold.Value = New Decimal(New Integer() {0, 0, 0, 0}) - ' 'lblThreshold ' Me.lblThreshold.AutoSize = True @@ -665,7 +663,7 @@ Partial Class dlgStartofRains Me.ucrBase.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink Me.ucrBase.Location = New System.Drawing.Point(5, 514) Me.ucrBase.Name = "ucrBase" - Me.ucrBase.Size = New System.Drawing.Size(405, 52) + Me.ucrBase.Size = New System.Drawing.Size(408, 52) Me.ucrBase.TabIndex = 20 ' 'dlgStartofRains @@ -741,7 +739,6 @@ Partial Class dlgStartofRains Friend WithEvents ucrPnlTRCalculateBy As UcrPanel Friend WithEvents ucrNudRDMinimumDays As ucrNud Friend WithEvents ucrNudRDOutOfDays As ucrNud - Friend WithEvents ucrNudThreshold As ucrNud Friend WithEvents ucrChkNumberOfRainyDays As ucrCheck Friend WithEvents ucrNudDSLengthOfTime As ucrNud Friend WithEvents ucrNudDSMaximumDays As ucrNud @@ -760,4 +757,5 @@ Partial Class dlgStartofRains Friend WithEvents ucrChkStatus As ucrCheck Friend WithEvents ucrInputNewStatusColumnName As ucrInputTextBox Friend WithEvents grpDisplay As GroupBox + Friend WithEvents ucrInputThreshold As ucrInputComboBox End Class \ No newline at end of file diff --git a/instat/dlgStartofRains.vb b/instat/dlgStartofRains.vb index 45a55caf552..8717e3e6506 100644 --- a/instat/dlgStartofRains.vb +++ b/instat/dlgStartofRains.vb @@ -87,6 +87,7 @@ Public Class dlgStartofRains Private Sub InitialiseDialog() ucrBase.iHelpTopicID = 199 + Dim dctInputThreshold As New Dictionary(Of String, String) ' setting the selector ucrSelectorForStartofRains.SetParameter(New RParameter("data_name", 0)) @@ -129,8 +130,17 @@ Public Class dlgStartofRains ucrReceiverRainfall.SetClimaticType("rain") ucrReceiverRainfall.bAutoFill = True - ucrNudThreshold.SetParameter(New RParameter("threshold", 1)) - ucrNudThreshold.DecimalPlaces = 2 + ucrInputThreshold.SetParameter(New RParameter("threshold", 1)) + dctInputThreshold.Add("0.85", "0.85") + dctInputThreshold.Add("0.5", "0.5") + dctInputThreshold.Add("0.05", "0.05") + dctInputThreshold.Add("0.99", "0.99") + ucrInputThreshold.SetItems(dctInputThreshold) + ucrInputThreshold.AddQuotesIfUnrecognised = False + ucrInputThreshold.SetLinkedDisplayControl(lblThreshold) + ucrInputThreshold.SetRDefault(0.85) + + 'Total Rainfall ucrPnlTRCalculateBy.AddRadioButton(rdoTRAmount) @@ -715,7 +725,7 @@ Public Class dlgStartofRains ucrReceiverRainfall.AddAdditionalCodeParameterPair(clsRainDayConditionOperator, New RParameter("rain", 0, bNewIncludeArgumentName:=False), iAdditionalPairNo:=3) ucrReceiverRainfall.AddAdditionalCodeParameterPair(clsFirstRain, New RParameter("x", 0), iAdditionalPairNo:=4) ucrReceiverRainfall.AddAdditionalCodeParameterPair(clsIsNaRain, New RParameter("x", 0), iAdditionalPairNo:=5) - ucrNudThreshold.AddAdditionalCodeParameterPair(clsRainDayConditionOperator, New RParameter("threshold", 1), iAdditionalPairNo:=1) + ucrInputThreshold.AddAdditionalCodeParameterPair(clsRainDayConditionOperator, New RParameter("threshold", 1), iAdditionalPairNo:=1) 'clsSORStartSummary.SetControlParameters(ucrReceiverRainfall, iAdditionalPairNo:=4) 'clsSORStatusSummary.SetControlParameters(ucrReceiverRainfall, iAdditionalPairNo:=5) @@ -727,7 +737,7 @@ Public Class dlgStartofRains ucrChkAsDoy.SetRCode(clsCombinationSubCalcList, bReset) ucrChkStatus.SetRCode(clsCombinationSubCalcList, bReset) ucrChkAsDate.SetRCode(clsCombinationSubCalcList, bReset) - ucrNudThreshold.SetRCode(clsRainDayOperator, bReset) + ucrInputThreshold.SetRCode(clsRainDayOperator, bReset) ucrReceiverDate.SetRCode(clsFirstDate, bReset) ucrInputNewDoyColumnName.SetRCode(clsCalcStartDOY, bReset) @@ -766,7 +776,7 @@ Public Class dlgStartofRains Not ucrReceiverDate.IsEmpty AndAlso Not ucrReceiverDOY.IsEmpty AndAlso Not ucrReceiverYear.IsEmpty AndAlso - ucrNudThreshold.GetText <> "" AndAlso + ucrInputThreshold.GetText <> "" AndAlso ( (ucrChkNumberOfRainyDays.Checked AndAlso ucrNudRDMinimumDays.GetText <> "" AndAlso ucrNudRDOutOfDays.GetText <> "") OrElse Not ucrChkNumberOfRainyDays.Checked) AndAlso @@ -970,7 +980,7 @@ Public Class dlgStartofRains End If End Sub - Private Sub CoreControls_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrReceiverRainfall.ControlContentsChanged, ucrInputNewDoyColumnName.ControlContentsChanged, ucrReceiverDate.ControlContentsChanged, ucrReceiverDOY.ControlContentsChanged, ucrReceiverYear.ControlContentsChanged, ucrNudThreshold.ControlContentsChanged, ucrChkNumberOfRainyDays.ControlContentsChanged, ucrNudRDMinimumDays.ControlContentsChanged, ucrNudRDOutOfDays.ControlContentsChanged, ucrChkTotalRainfall.ControlContentsChanged, ucrNudTROverDays.ControlContentsChanged, ucrPnlTRCalculateBy.ControlContentsChanged, ucrNudTRAmount.ControlContentsChanged, ucrNudTRPercentile.ControlContentsChanged, ucrChkDrySpell.ControlContentsChanged, ucrNudDSMaximumDays.ControlContentsChanged, ucrNudDSLengthOfTime.ControlContentsChanged, ucrNudDPMaxRain.ControlContentsChanged, ucrChkAsDoy.ControlContentsChanged, ucrChkAsDate.ControlContentsChanged, ucrInputNewDateColumnName.ControlContentsChanged, ucrChkStatus.ControlContentsChanged, ucrInputNewStatusColumnName.ControlContentsChanged + Private Sub CoreControls_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrReceiverRainfall.ControlContentsChanged, ucrInputNewDoyColumnName.ControlContentsChanged, ucrReceiverDate.ControlContentsChanged, ucrReceiverDOY.ControlContentsChanged, ucrReceiverYear.ControlContentsChanged, ucrInputThreshold.ControlContentsChanged, ucrChkNumberOfRainyDays.ControlContentsChanged, ucrNudRDMinimumDays.ControlContentsChanged, ucrNudRDOutOfDays.ControlContentsChanged, ucrChkTotalRainfall.ControlContentsChanged, ucrNudTROverDays.ControlContentsChanged, ucrPnlTRCalculateBy.ControlContentsChanged, ucrNudTRAmount.ControlContentsChanged, ucrNudTRPercentile.ControlContentsChanged, ucrChkDrySpell.ControlContentsChanged, ucrNudDSMaximumDays.ControlContentsChanged, ucrNudDSLengthOfTime.ControlContentsChanged, ucrNudDPMaxRain.ControlContentsChanged, ucrChkAsDoy.ControlContentsChanged, ucrChkAsDate.ControlContentsChanged, ucrInputNewDateColumnName.ControlContentsChanged, ucrChkStatus.ControlContentsChanged, ucrInputNewStatusColumnName.ControlContentsChanged TestOKEnabled() End Sub diff --git a/instat/dlgTaylorDiagram.vb b/instat/dlgTaylorDiagram.vb index 5bcefb92c15..5de43bf7299 100644 --- a/instat/dlgTaylorDiagram.vb +++ b/instat/dlgTaylorDiagram.vb @@ -35,6 +35,7 @@ Public Class dlgTaylorDiagram End Sub Private Sub InitialiseDialog() + ucrBase.iHelpTopicID= 643 ucrBase.clsRsyntax.iCallType = 3 ucrSelectorTaylorDiagram.SetParameter(New RParameter("mydata", 0)) diff --git a/instat/dlgTimeSeriesPlot.vb b/instat/dlgTimeSeriesPlot.vb index ced2eb9dd41..0ee96af11e3 100644 --- a/instat/dlgTimeSeriesPlot.vb +++ b/instat/dlgTimeSeriesPlot.vb @@ -194,7 +194,7 @@ Public Class dlgTimeSeriesPlot End Sub Private Sub InitialiseDialog() - 'ucrBase.iHelpTopicID = + ucrBase.iHelpTopicID = 639 ucrBase.clsRsyntax.bExcludeAssignedFunctionOutput = False ucrBase.clsRsyntax.iCallType = 3 diff --git a/instat/dlgTransformClimatic.Designer.vb b/instat/dlgTransformClimatic.Designer.vb index 90233cefd17..6878c7a9c9e 100644 --- a/instat/dlgTransformClimatic.Designer.vb +++ b/instat/dlgTransformClimatic.Designer.vb @@ -40,18 +40,26 @@ Partial Class dlgTransformClimatic Private Sub InitializeComponent() Me.components = New System.ComponentModel.Container() Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(dlgTransformClimatic)) - Me.lblYear = New System.Windows.Forms.Label() - Me.lblDate = New System.Windows.Forms.Label() - Me.lblStation = New System.Windows.Forms.Label() - Me.lblData = New System.Windows.Forms.Label() + Me.rdoWaterBalance = New System.Windows.Forms.RadioButton() + Me.ucrNudLimit = New instat.ucrNud() + Me.ucrNudMgdd = New instat.ucrNud() + Me.lblBaselineMgdd = New System.Windows.Forms.Label() + Me.lblLimit = New System.Windows.Forms.Label() + Me.ucrInputPosition = New instat.ucrInputComboBox() + Me.ucrChkCircular = New instat.ucrCheck() Me.rdoSpell = New System.Windows.Forms.RadioButton() + Me.lblRowsMultSpells = New System.Windows.Forms.Label() + Me.lblDate = New System.Windows.Forms.Label() + Me.ucrInputSpellUpper = New instat.ucrInputTextBox() Me.rdoMoving = New System.Windows.Forms.RadioButton() Me.rdoCount = New System.Windows.Forms.RadioButton() - Me.rdoWaterBalance = New System.Windows.Forms.RadioButton() - Me.lblSumRows = New System.Windows.Forms.Label() - Me.lblSumOver = New System.Windows.Forms.Label() - Me.lblCountOver = New System.Windows.Forms.Label() + Me.lblStation = New System.Windows.Forms.Label() + Me.lblYear = New System.Windows.Forms.Label() + Me.ucrChkUseMaxMin = New instat.ucrCheck() + Me.lblData = New System.Windows.Forms.Label() Me.grpTransform = New System.Windows.Forms.GroupBox() + Me.ucrNudWB = New instat.ucrNud() + Me.ucrChkWB = New instat.ucrCheck() Me.ucrInputSpellLower = New instat.ucrInputComboBox() Me.ucrChkOptions = New instat.ucrCheck() Me.ucrReceiverEvap = New instat.ucrReceiverSingle() @@ -62,26 +70,20 @@ Partial Class dlgTransformClimatic Me.ucrPnlEvap = New instat.UcrPanel() Me.ucrInputCircularPosition = New instat.ucrInputComboBox() Me.lblPosition = New System.Windows.Forms.Label() - Me.ucrInputPosition = New instat.ucrInputComboBox() - Me.ucrChkCircular = New instat.ucrCheck() Me.ucrNudMultSpells = New instat.ucrNud() - Me.lblRowsMultSpells = New System.Windows.Forms.Label() - Me.ucrInputSpellUpper = New instat.ucrInputTextBox() + Me.lblSumRows = New System.Windows.Forms.Label() Me.ucrInputCondition = New instat.ucrInputComboBox() Me.lblCondition = New System.Windows.Forms.Label() Me.lblWBEvaporation = New System.Windows.Forms.Label() + Me.lblCountOver = New System.Windows.Forms.Label() Me.ucrNudSumOver = New instat.ucrNud() Me.lblWBCapacity = New System.Windows.Forms.Label() Me.ucrNudWBCapacity = New instat.ucrNud() Me.ucrInputSum = New instat.ucrInputComboBox() + Me.lblSumOver = New System.Windows.Forms.Label() Me.ucrNudCountOver = New instat.ucrNud() Me.ucrInputCumulative = New instat.ucrInputComboBox() - Me.lblTMin = New System.Windows.Forms.Label() Me.grpDegree = New System.Windows.Forms.GroupBox() - Me.ucrNudLimit = New instat.ucrNud() - Me.ucrNudMgdd = New instat.ucrNud() - Me.lblBaselineMgdd = New System.Windows.Forms.Label() - Me.lblLimit = New System.Windows.Forms.Label() Me.rdoModifiedGDD = New System.Windows.Forms.RadioButton() Me.lblBaselineGDD = New System.Windows.Forms.Label() Me.rdoGrowingDegreeDays = New System.Windows.Forms.RadioButton() @@ -92,53 +94,87 @@ Partial Class dlgTransformClimatic Me.ucrNudHDD = New instat.ucrNud() Me.rdoDiurnalRange = New System.Windows.Forms.RadioButton() Me.ucrPnlDegree = New instat.UcrPanel() + Me.ucrReceiverData = New instat.ucrReceiverSingle() + Me.ttRdoGdd = New System.Windows.Forms.ToolTip(Me.components) + Me.lblTMin = New System.Windows.Forms.Label() + Me.ucrReceiverStation = New instat.ucrReceiverSingle() Me.rdoMultSpells = New System.Windows.Forms.RadioButton() - Me.rdoCumulative = New System.Windows.Forms.RadioButton() - Me.rdoDegree = New System.Windows.Forms.RadioButton() Me.lblTMax = New System.Windows.Forms.Label() Me.lblTMean = New System.Windows.Forms.Label() - Me.ucrSaveColumn = New instat.ucrSave() Me.ucrPnlTransform = New instat.UcrPanel() + Me.rdoDegree = New System.Windows.Forms.RadioButton() + Me.rdoCumulative = New System.Windows.Forms.RadioButton() Me.ucrReceiverDate = New instat.ucrReceiverSingle() - Me.ucrReceiverStation = New instat.ucrReceiverSingle() - Me.ucrSelectorTransform = New instat.ucrSelectorByDataFrameAddRemove() Me.ucrBase = New instat.ucrButtons() Me.ucrReceiverTMin = New instat.ucrReceiverSingle() + Me.ucrReceiverYear = New instat.ucrReceiverSingle() Me.ucrReceiverTMean = New instat.ucrReceiverSingle() Me.ucrReceiverTMax = New instat.ucrReceiverSingle() - Me.ucrReceiverData = New instat.ucrReceiverSingle() - Me.ucrReceiverYear = New instat.ucrReceiverSingle() - Me.ucrChkUseMaxMin = New instat.ucrCheck() - Me.ttRdoRange = New System.Windows.Forms.ToolTip(Me.components) + Me.ucrSaveColumn = New instat.ucrSave() + Me.ucrSelectorTransform = New instat.ucrSelectorByDataFrameAddRemove() Me.ttRdoTMean = New System.Windows.Forms.ToolTip(Me.components) Me.ttRdoHdd = New System.Windows.Forms.ToolTip(Me.components) - Me.ttRdoGdd = New System.Windows.Forms.ToolTip(Me.components) Me.ttRdoMgdd = New System.Windows.Forms.ToolTip(Me.components) - Me.ucrChkWB = New instat.ucrCheck() - Me.ucrNudWB = New instat.ucrNud() + Me.ttRdoRange = New System.Windows.Forms.ToolTip(Me.components) Me.grpTransform.SuspendLayout() Me.grpDegree.SuspendLayout() Me.SuspendLayout() ' - 'lblYear + 'rdoWaterBalance ' - resources.ApplyResources(Me.lblYear, "lblYear") - Me.lblYear.Name = "lblYear" + resources.ApplyResources(Me.rdoWaterBalance, "rdoWaterBalance") + Me.rdoWaterBalance.FlatAppearance.BorderColor = System.Drawing.SystemColors.ActiveCaption + Me.rdoWaterBalance.FlatAppearance.BorderSize = 2 + Me.rdoWaterBalance.FlatAppearance.CheckedBackColor = System.Drawing.SystemColors.ActiveCaption + Me.rdoWaterBalance.ForeColor = System.Drawing.SystemColors.ActiveCaptionText + Me.rdoWaterBalance.Name = "rdoWaterBalance" + Me.rdoWaterBalance.UseVisualStyleBackColor = True ' - 'lblDate + 'ucrNudLimit ' - resources.ApplyResources(Me.lblDate, "lblDate") - Me.lblDate.Name = "lblDate" + resources.ApplyResources(Me.ucrNudLimit, "ucrNudLimit") + Me.ucrNudLimit.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudLimit.Increment = New Decimal(New Integer() {1, 0, 0, 0}) + Me.ucrNudLimit.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) + Me.ucrNudLimit.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudLimit.Name = "ucrNudLimit" + Me.ucrNudLimit.Value = New Decimal(New Integer() {0, 0, 0, 0}) ' - 'lblStation + 'ucrNudMgdd ' - resources.ApplyResources(Me.lblStation, "lblStation") - Me.lblStation.Name = "lblStation" + resources.ApplyResources(Me.ucrNudMgdd, "ucrNudMgdd") + Me.ucrNudMgdd.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudMgdd.Increment = New Decimal(New Integer() {1, 0, 0, 0}) + Me.ucrNudMgdd.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) + Me.ucrNudMgdd.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudMgdd.Name = "ucrNudMgdd" + Me.ucrNudMgdd.Value = New Decimal(New Integer() {0, 0, 0, 0}) ' - 'lblData + 'lblBaselineMgdd ' - resources.ApplyResources(Me.lblData, "lblData") - Me.lblData.Name = "lblData" + resources.ApplyResources(Me.lblBaselineMgdd, "lblBaselineMgdd") + Me.lblBaselineMgdd.Name = "lblBaselineMgdd" + Me.lblBaselineMgdd.Tag = "Over" + ' + 'lblLimit + ' + resources.ApplyResources(Me.lblLimit, "lblLimit") + Me.lblLimit.Name = "lblLimit" + Me.lblLimit.Tag = "Over" + ' + 'ucrInputPosition + ' + Me.ucrInputPosition.AddQuotesIfUnrecognised = True + resources.ApplyResources(Me.ucrInputPosition, "ucrInputPosition") + Me.ucrInputPosition.GetSetSelectedIndex = -1 + Me.ucrInputPosition.IsReadOnly = False + Me.ucrInputPosition.Name = "ucrInputPosition" + ' + 'ucrChkCircular + ' + resources.ApplyResources(Me.ucrChkCircular, "ucrChkCircular") + Me.ucrChkCircular.Checked = False + Me.ucrChkCircular.Name = "ucrChkCircular" ' 'rdoSpell ' @@ -150,6 +186,25 @@ Partial Class dlgTransformClimatic Me.rdoSpell.Name = "rdoSpell" Me.rdoSpell.UseVisualStyleBackColor = True ' + 'lblRowsMultSpells + ' + resources.ApplyResources(Me.lblRowsMultSpells, "lblRowsMultSpells") + Me.lblRowsMultSpells.Name = "lblRowsMultSpells" + Me.lblRowsMultSpells.Tag = "Rows_to_Take_Over:" + ' + 'lblDate + ' + resources.ApplyResources(Me.lblDate, "lblDate") + Me.lblDate.Name = "lblDate" + ' + 'ucrInputSpellUpper + ' + Me.ucrInputSpellUpper.AddQuotesIfUnrecognised = True + resources.ApplyResources(Me.ucrInputSpellUpper, "ucrInputSpellUpper") + Me.ucrInputSpellUpper.IsMultiline = False + Me.ucrInputSpellUpper.IsReadOnly = False + Me.ucrInputSpellUpper.Name = "ucrInputSpellUpper" + ' 'rdoMoving ' resources.ApplyResources(Me.rdoMoving, "rdoMoving") @@ -171,33 +226,26 @@ Partial Class dlgTransformClimatic Me.rdoCount.Name = "rdoCount" Me.rdoCount.UseVisualStyleBackColor = True ' - 'rdoWaterBalance + 'lblStation ' - resources.ApplyResources(Me.rdoWaterBalance, "rdoWaterBalance") - Me.rdoWaterBalance.FlatAppearance.BorderColor = System.Drawing.SystemColors.ActiveCaption - Me.rdoWaterBalance.FlatAppearance.BorderSize = 2 - Me.rdoWaterBalance.FlatAppearance.CheckedBackColor = System.Drawing.SystemColors.ActiveCaption - Me.rdoWaterBalance.ForeColor = System.Drawing.SystemColors.ActiveCaptionText - Me.rdoWaterBalance.Name = "rdoWaterBalance" - Me.rdoWaterBalance.UseVisualStyleBackColor = True + resources.ApplyResources(Me.lblStation, "lblStation") + Me.lblStation.Name = "lblStation" ' - 'lblSumRows + 'lblYear ' - resources.ApplyResources(Me.lblSumRows, "lblSumRows") - Me.lblSumRows.Name = "lblSumRows" - Me.lblSumRows.Tag = "Rows" + resources.ApplyResources(Me.lblYear, "lblYear") + Me.lblYear.Name = "lblYear" ' - 'lblSumOver + 'ucrChkUseMaxMin ' - resources.ApplyResources(Me.lblSumOver, "lblSumOver") - Me.lblSumOver.Name = "lblSumOver" - Me.lblSumOver.Tag = "Over" + resources.ApplyResources(Me.ucrChkUseMaxMin, "ucrChkUseMaxMin") + Me.ucrChkUseMaxMin.Checked = True + Me.ucrChkUseMaxMin.Name = "ucrChkUseMaxMin" ' - 'lblCountOver + 'lblData ' - resources.ApplyResources(Me.lblCountOver, "lblCountOver") - Me.lblCountOver.Name = "lblCountOver" - Me.lblCountOver.Tag = "Rows_to_Count_Over:" + resources.ApplyResources(Me.lblData, "lblData") + Me.lblData.Name = "lblData" ' 'grpTransform ' @@ -234,6 +282,22 @@ Partial Class dlgTransformClimatic Me.grpTransform.Name = "grpTransform" Me.grpTransform.TabStop = False ' + 'ucrNudWB + ' + resources.ApplyResources(Me.ucrNudWB, "ucrNudWB") + Me.ucrNudWB.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudWB.Increment = New Decimal(New Integer() {1, 0, 0, 0}) + Me.ucrNudWB.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) + Me.ucrNudWB.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudWB.Name = "ucrNudWB" + Me.ucrNudWB.Value = New Decimal(New Integer() {0, 0, 0, 0}) + ' + 'ucrChkWB + ' + resources.ApplyResources(Me.ucrChkWB, "ucrChkWB") + Me.ucrChkWB.Checked = False + Me.ucrChkWB.Name = "ucrChkWB" + ' 'ucrInputSpellLower ' Me.ucrInputSpellLower.AddQuotesIfUnrecognised = True @@ -303,20 +367,6 @@ Partial Class dlgTransformClimatic resources.ApplyResources(Me.lblPosition, "lblPosition") Me.lblPosition.Name = "lblPosition" ' - 'ucrInputPosition - ' - Me.ucrInputPosition.AddQuotesIfUnrecognised = True - resources.ApplyResources(Me.ucrInputPosition, "ucrInputPosition") - Me.ucrInputPosition.GetSetSelectedIndex = -1 - Me.ucrInputPosition.IsReadOnly = False - Me.ucrInputPosition.Name = "ucrInputPosition" - ' - 'ucrChkCircular - ' - resources.ApplyResources(Me.ucrChkCircular, "ucrChkCircular") - Me.ucrChkCircular.Checked = False - Me.ucrChkCircular.Name = "ucrChkCircular" - ' 'ucrNudMultSpells ' resources.ApplyResources(Me.ucrNudMultSpells, "ucrNudMultSpells") @@ -327,19 +377,11 @@ Partial Class dlgTransformClimatic Me.ucrNudMultSpells.Name = "ucrNudMultSpells" Me.ucrNudMultSpells.Value = New Decimal(New Integer() {0, 0, 0, 0}) ' - 'lblRowsMultSpells - ' - resources.ApplyResources(Me.lblRowsMultSpells, "lblRowsMultSpells") - Me.lblRowsMultSpells.Name = "lblRowsMultSpells" - Me.lblRowsMultSpells.Tag = "Rows_to_Take_Over:" - ' - 'ucrInputSpellUpper + 'lblSumRows ' - Me.ucrInputSpellUpper.AddQuotesIfUnrecognised = True - resources.ApplyResources(Me.ucrInputSpellUpper, "ucrInputSpellUpper") - Me.ucrInputSpellUpper.IsMultiline = False - Me.ucrInputSpellUpper.IsReadOnly = False - Me.ucrInputSpellUpper.Name = "ucrInputSpellUpper" + resources.ApplyResources(Me.lblSumRows, "lblSumRows") + Me.lblSumRows.Name = "lblSumRows" + Me.lblSumRows.Tag = "Rows" ' 'ucrInputCondition ' @@ -361,6 +403,12 @@ Partial Class dlgTransformClimatic Me.lblWBEvaporation.Name = "lblWBEvaporation" Me.lblWBEvaporation.Tag = "Evaporation" ' + 'lblCountOver + ' + resources.ApplyResources(Me.lblCountOver, "lblCountOver") + Me.lblCountOver.Name = "lblCountOver" + Me.lblCountOver.Tag = "Rows_to_Count_Over:" + ' 'ucrNudSumOver ' resources.ApplyResources(Me.ucrNudSumOver, "ucrNudSumOver") @@ -395,6 +443,12 @@ Partial Class dlgTransformClimatic Me.ucrInputSum.IsReadOnly = False Me.ucrInputSum.Name = "ucrInputSum" ' + 'lblSumOver + ' + resources.ApplyResources(Me.lblSumOver, "lblSumOver") + Me.lblSumOver.Name = "lblSumOver" + Me.lblSumOver.Tag = "Over" + ' 'ucrNudCountOver ' resources.ApplyResources(Me.ucrNudCountOver, "ucrNudCountOver") @@ -413,11 +467,6 @@ Partial Class dlgTransformClimatic Me.ucrInputCumulative.IsReadOnly = False Me.ucrInputCumulative.Name = "ucrInputCumulative" ' - 'lblTMin - ' - resources.ApplyResources(Me.lblTMin, "lblTMin") - Me.lblTMin.Name = "lblTMin" - ' 'grpDegree ' Me.grpDegree.Controls.Add(Me.ucrNudLimit) @@ -438,46 +487,14 @@ Partial Class dlgTransformClimatic Me.grpDegree.Name = "grpDegree" Me.grpDegree.TabStop = False ' - 'ucrNudLimit - ' - resources.ApplyResources(Me.ucrNudLimit, "ucrNudLimit") - Me.ucrNudLimit.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) - Me.ucrNudLimit.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudLimit.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) - Me.ucrNudLimit.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) - Me.ucrNudLimit.Name = "ucrNudLimit" - Me.ucrNudLimit.Value = New Decimal(New Integer() {0, 0, 0, 0}) + 'rdoModifiedGDD ' - 'ucrNudMgdd + resources.ApplyResources(Me.rdoModifiedGDD, "rdoModifiedGDD") + Me.rdoModifiedGDD.Name = "rdoModifiedGDD" + Me.rdoModifiedGDD.TabStop = True + Me.rdoModifiedGDD.UseVisualStyleBackColor = True ' - resources.ApplyResources(Me.ucrNudMgdd, "ucrNudMgdd") - Me.ucrNudMgdd.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) - Me.ucrNudMgdd.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudMgdd.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) - Me.ucrNudMgdd.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) - Me.ucrNudMgdd.Name = "ucrNudMgdd" - Me.ucrNudMgdd.Value = New Decimal(New Integer() {0, 0, 0, 0}) - ' - 'lblBaselineMgdd - ' - resources.ApplyResources(Me.lblBaselineMgdd, "lblBaselineMgdd") - Me.lblBaselineMgdd.Name = "lblBaselineMgdd" - Me.lblBaselineMgdd.Tag = "Over" - ' - 'lblLimit - ' - resources.ApplyResources(Me.lblLimit, "lblLimit") - Me.lblLimit.Name = "lblLimit" - Me.lblLimit.Tag = "Over" - ' - 'rdoModifiedGDD - ' - resources.ApplyResources(Me.rdoModifiedGDD, "rdoModifiedGDD") - Me.rdoModifiedGDD.Name = "rdoModifiedGDD" - Me.rdoModifiedGDD.TabStop = True - Me.rdoModifiedGDD.UseVisualStyleBackColor = True - ' - 'lblBaselineGDD + 'lblBaselineGDD ' resources.ApplyResources(Me.lblBaselineGDD, "lblBaselineGDD") Me.lblBaselineGDD.Name = "lblBaselineGDD" @@ -542,6 +559,29 @@ Partial Class dlgTransformClimatic resources.ApplyResources(Me.ucrPnlDegree, "ucrPnlDegree") Me.ucrPnlDegree.Name = "ucrPnlDegree" ' + 'ucrReceiverData + ' + resources.ApplyResources(Me.ucrReceiverData, "ucrReceiverData") + Me.ucrReceiverData.frmParent = Me + Me.ucrReceiverData.Name = "ucrReceiverData" + Me.ucrReceiverData.Selector = Nothing + Me.ucrReceiverData.strNcFilePath = "" + Me.ucrReceiverData.ucrSelector = Nothing + ' + 'lblTMin + ' + resources.ApplyResources(Me.lblTMin, "lblTMin") + Me.lblTMin.Name = "lblTMin" + ' + 'ucrReceiverStation + ' + resources.ApplyResources(Me.ucrReceiverStation, "ucrReceiverStation") + Me.ucrReceiverStation.frmParent = Me + Me.ucrReceiverStation.Name = "ucrReceiverStation" + Me.ucrReceiverStation.Selector = Nothing + Me.ucrReceiverStation.strNcFilePath = "" + Me.ucrReceiverStation.ucrSelector = Nothing + ' 'rdoMultSpells ' resources.ApplyResources(Me.rdoMultSpells, "rdoMultSpells") @@ -552,26 +592,6 @@ Partial Class dlgTransformClimatic Me.rdoMultSpells.Name = "rdoMultSpells" Me.rdoMultSpells.UseVisualStyleBackColor = True ' - 'rdoCumulative - ' - resources.ApplyResources(Me.rdoCumulative, "rdoCumulative") - Me.rdoCumulative.FlatAppearance.BorderColor = System.Drawing.SystemColors.ActiveCaption - Me.rdoCumulative.FlatAppearance.BorderSize = 2 - Me.rdoCumulative.FlatAppearance.CheckedBackColor = System.Drawing.SystemColors.ActiveCaption - Me.rdoCumulative.ForeColor = System.Drawing.SystemColors.ActiveCaptionText - Me.rdoCumulative.Name = "rdoCumulative" - Me.rdoCumulative.UseVisualStyleBackColor = True - ' - 'rdoDegree - ' - resources.ApplyResources(Me.rdoDegree, "rdoDegree") - Me.rdoDegree.FlatAppearance.BorderColor = System.Drawing.SystemColors.ActiveCaption - Me.rdoDegree.FlatAppearance.BorderSize = 2 - Me.rdoDegree.FlatAppearance.CheckedBackColor = System.Drawing.SystemColors.ActiveCaption - Me.rdoDegree.ForeColor = System.Drawing.SystemColors.ActiveCaptionText - Me.rdoDegree.Name = "rdoDegree" - Me.rdoDegree.UseVisualStyleBackColor = True - ' 'lblTMax ' resources.ApplyResources(Me.lblTMax, "lblTMax") @@ -582,16 +602,31 @@ Partial Class dlgTransformClimatic resources.ApplyResources(Me.lblTMean, "lblTMean") Me.lblTMean.Name = "lblTMean" ' - 'ucrSaveColumn - ' - resources.ApplyResources(Me.ucrSaveColumn, "ucrSaveColumn") - Me.ucrSaveColumn.Name = "ucrSaveColumn" - ' 'ucrPnlTransform ' resources.ApplyResources(Me.ucrPnlTransform, "ucrPnlTransform") Me.ucrPnlTransform.Name = "ucrPnlTransform" ' + 'rdoDegree + ' + resources.ApplyResources(Me.rdoDegree, "rdoDegree") + Me.rdoDegree.FlatAppearance.BorderColor = System.Drawing.SystemColors.ActiveCaption + Me.rdoDegree.FlatAppearance.BorderSize = 2 + Me.rdoDegree.FlatAppearance.CheckedBackColor = System.Drawing.SystemColors.ActiveCaption + Me.rdoDegree.ForeColor = System.Drawing.SystemColors.ActiveCaptionText + Me.rdoDegree.Name = "rdoDegree" + Me.rdoDegree.UseVisualStyleBackColor = True + ' + 'rdoCumulative + ' + resources.ApplyResources(Me.rdoCumulative, "rdoCumulative") + Me.rdoCumulative.FlatAppearance.BorderColor = System.Drawing.SystemColors.ActiveCaption + Me.rdoCumulative.FlatAppearance.BorderSize = 2 + Me.rdoCumulative.FlatAppearance.CheckedBackColor = System.Drawing.SystemColors.ActiveCaption + Me.rdoCumulative.ForeColor = System.Drawing.SystemColors.ActiveCaptionText + Me.rdoCumulative.Name = "rdoCumulative" + Me.rdoCumulative.UseVisualStyleBackColor = True + ' 'ucrReceiverDate ' resources.ApplyResources(Me.ucrReceiverDate, "ucrReceiverDate") @@ -601,23 +636,6 @@ Partial Class dlgTransformClimatic Me.ucrReceiverDate.strNcFilePath = "" Me.ucrReceiverDate.ucrSelector = Nothing ' - 'ucrReceiverStation - ' - resources.ApplyResources(Me.ucrReceiverStation, "ucrReceiverStation") - Me.ucrReceiverStation.frmParent = Me - Me.ucrReceiverStation.Name = "ucrReceiverStation" - Me.ucrReceiverStation.Selector = Nothing - Me.ucrReceiverStation.strNcFilePath = "" - Me.ucrReceiverStation.ucrSelector = Nothing - ' - 'ucrSelectorTransform - ' - resources.ApplyResources(Me.ucrSelectorTransform, "ucrSelectorTransform") - Me.ucrSelectorTransform.bDropUnusedFilterLevels = False - Me.ucrSelectorTransform.bShowHiddenColumns = False - Me.ucrSelectorTransform.bUseCurrentFilter = True - Me.ucrSelectorTransform.Name = "ucrSelectorTransform" - ' 'ucrBase ' resources.ApplyResources(Me.ucrBase, "ucrBase") @@ -632,6 +650,15 @@ Partial Class dlgTransformClimatic Me.ucrReceiverTMin.strNcFilePath = "" Me.ucrReceiverTMin.ucrSelector = Nothing ' + 'ucrReceiverYear + ' + resources.ApplyResources(Me.ucrReceiverYear, "ucrReceiverYear") + Me.ucrReceiverYear.frmParent = Me + Me.ucrReceiverYear.Name = "ucrReceiverYear" + Me.ucrReceiverYear.Selector = Nothing + Me.ucrReceiverYear.strNcFilePath = "" + Me.ucrReceiverYear.ucrSelector = Nothing + ' 'ucrReceiverTMean ' resources.ApplyResources(Me.ucrReceiverTMean, "ucrReceiverTMean") @@ -650,78 +677,51 @@ Partial Class dlgTransformClimatic Me.ucrReceiverTMax.strNcFilePath = "" Me.ucrReceiverTMax.ucrSelector = Nothing ' - 'ucrReceiverData - ' - resources.ApplyResources(Me.ucrReceiverData, "ucrReceiverData") - Me.ucrReceiverData.frmParent = Me - Me.ucrReceiverData.Name = "ucrReceiverData" - Me.ucrReceiverData.Selector = Nothing - Me.ucrReceiverData.strNcFilePath = "" - Me.ucrReceiverData.ucrSelector = Nothing - ' - 'ucrReceiverYear - ' - resources.ApplyResources(Me.ucrReceiverYear, "ucrReceiverYear") - Me.ucrReceiverYear.frmParent = Me - Me.ucrReceiverYear.Name = "ucrReceiverYear" - Me.ucrReceiverYear.Selector = Nothing - Me.ucrReceiverYear.strNcFilePath = "" - Me.ucrReceiverYear.ucrSelector = Nothing - ' - 'ucrChkUseMaxMin - ' - resources.ApplyResources(Me.ucrChkUseMaxMin, "ucrChkUseMaxMin") - Me.ucrChkUseMaxMin.Checked = True - Me.ucrChkUseMaxMin.Name = "ucrChkUseMaxMin" - ' - 'ucrChkWB + 'ucrSaveColumn ' - resources.ApplyResources(Me.ucrChkWB, "ucrChkWB") - Me.ucrChkWB.Checked = False - Me.ucrChkWB.Name = "ucrChkWB" + resources.ApplyResources(Me.ucrSaveColumn, "ucrSaveColumn") + Me.ucrSaveColumn.Name = "ucrSaveColumn" ' - 'ucrNudWB + 'ucrSelectorTransform ' - resources.ApplyResources(Me.ucrNudWB, "ucrNudWB") - Me.ucrNudWB.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) - Me.ucrNudWB.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudWB.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) - Me.ucrNudWB.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) - Me.ucrNudWB.Name = "ucrNudWB" - Me.ucrNudWB.Value = New Decimal(New Integer() {0, 0, 0, 0}) + resources.ApplyResources(Me.ucrSelectorTransform, "ucrSelectorTransform") + Me.ucrSelectorTransform.bDropUnusedFilterLevels = False + Me.ucrSelectorTransform.bShowHiddenColumns = False + Me.ucrSelectorTransform.bUseCurrentFilter = True + Me.ucrSelectorTransform.Name = "ucrSelectorTransform" ' 'dlgTransformClimatic ' resources.ApplyResources(Me, "$this") Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi - Me.Controls.Add(Me.rdoDegree) - Me.Controls.Add(Me.ucrSaveColumn) - Me.Controls.Add(Me.rdoCumulative) - Me.Controls.Add(Me.rdoMultSpells) Me.Controls.Add(Me.rdoWaterBalance) Me.Controls.Add(Me.rdoSpell) + Me.Controls.Add(Me.lblDate) Me.Controls.Add(Me.rdoMoving) Me.Controls.Add(Me.rdoCount) - Me.Controls.Add(Me.ucrPnlTransform) Me.Controls.Add(Me.lblStation) - Me.Controls.Add(Me.ucrReceiverDate) - Me.Controls.Add(Me.ucrReceiverStation) - Me.Controls.Add(Me.ucrSelectorTransform) - Me.Controls.Add(Me.ucrBase) Me.Controls.Add(Me.lblYear) - Me.Controls.Add(Me.lblDate) - Me.Controls.Add(Me.ucrReceiverTMin) + Me.Controls.Add(Me.ucrChkUseMaxMin) + Me.Controls.Add(Me.lblData) + Me.Controls.Add(Me.grpTransform) Me.Controls.Add(Me.grpDegree) - Me.Controls.Add(Me.ucrReceiverTMean) + Me.Controls.Add(Me.ucrReceiverData) Me.Controls.Add(Me.lblTMin) + Me.Controls.Add(Me.ucrReceiverStation) + Me.Controls.Add(Me.rdoMultSpells) Me.Controls.Add(Me.lblTMax) - Me.Controls.Add(Me.ucrReceiverTMax) - Me.Controls.Add(Me.ucrReceiverData) - Me.Controls.Add(Me.ucrReceiverYear) - Me.Controls.Add(Me.ucrChkUseMaxMin) Me.Controls.Add(Me.lblTMean) - Me.Controls.Add(Me.lblData) - Me.Controls.Add(Me.grpTransform) + Me.Controls.Add(Me.ucrPnlTransform) + Me.Controls.Add(Me.rdoDegree) + Me.Controls.Add(Me.rdoCumulative) + Me.Controls.Add(Me.ucrReceiverDate) + Me.Controls.Add(Me.ucrBase) + Me.Controls.Add(Me.ucrReceiverTMin) + Me.Controls.Add(Me.ucrReceiverYear) + Me.Controls.Add(Me.ucrReceiverTMean) + Me.Controls.Add(Me.ucrReceiverTMax) + Me.Controls.Add(Me.ucrSaveColumn) + Me.Controls.Add(Me.ucrSelectorTransform) Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow Me.MaximizeBox = False Me.MinimizeBox = False @@ -735,80 +735,80 @@ Partial Class dlgTransformClimatic End Sub - Friend WithEvents ucrBase As ucrButtons - Friend WithEvents ucrReceiverYear As ucrReceiverSingle - Friend WithEvents lblYear As Label - Friend WithEvents lblDate As Label - Friend WithEvents ucrReceiverDate As ucrReceiverSingle - Friend WithEvents lblStation As Label - Friend WithEvents ucrReceiverStation As ucrReceiverSingle - Friend WithEvents ucrSelectorTransform As ucrSelectorByDataFrameAddRemove - Friend WithEvents lblData As Label - Friend WithEvents ucrReceiverData As ucrReceiverSingle Friend WithEvents rdoWaterBalance As RadioButton + Friend WithEvents ucrNudLimit As ucrNud + Friend WithEvents ucrNudMgdd As ucrNud + Friend WithEvents lblBaselineMgdd As Label + Friend WithEvents lblLimit As Label + Friend WithEvents ucrInputPosition As ucrInputComboBox + Friend WithEvents ucrChkCircular As ucrCheck Friend WithEvents rdoSpell As RadioButton + Friend WithEvents lblRowsMultSpells As Label + Friend WithEvents lblDate As Label + Friend WithEvents ucrInputSpellUpper As ucrInputTextBox Friend WithEvents rdoMoving As RadioButton Friend WithEvents rdoCount As RadioButton - Friend WithEvents ucrPnlTransform As UcrPanel - Friend WithEvents lblSumRows As Label - Friend WithEvents ucrNudSumOver As ucrNud - Friend WithEvents lblSumOver As Label - Friend WithEvents ucrInputSum As ucrInputComboBox - Friend WithEvents ucrNudCountOver As ucrNud - Friend WithEvents lblCountOver As Label - Friend WithEvents lblWBEvaporation As Label - Friend WithEvents ucrNudWBCapacity As ucrNud - Friend WithEvents lblWBCapacity As Label + Friend WithEvents lblStation As Label + Friend WithEvents lblYear As Label + Friend WithEvents ucrChkUseMaxMin As ucrCheck + Friend WithEvents lblData As Label Friend WithEvents grpTransform As GroupBox - Friend WithEvents ucrInputSpellUpper As ucrInputTextBox - Friend WithEvents ucrInputCondition As ucrInputComboBox - Friend WithEvents lblCondition As Label - Friend WithEvents rdoMultSpells As RadioButton - Friend WithEvents ucrChkGroupByYear As ucrCheck - Friend WithEvents ucrNudMultSpells As ucrNud - Friend WithEvents lblRowsMultSpells As Label - Friend WithEvents ucrInputEvaporation As ucrInputTextBox - Friend WithEvents ucrPnlEvap As UcrPanel + Friend WithEvents ucrNudWB As ucrNud + Friend WithEvents ucrChkWB As ucrCheck + Friend WithEvents ucrInputSpellLower As ucrInputComboBox + Friend WithEvents ucrChkOptions As ucrCheck Friend WithEvents ucrReceiverEvap As ucrReceiverSingle - Friend WithEvents rdoEvapVariable As RadioButton - Friend WithEvents rdoEvapValue As RadioButton - Friend WithEvents lblPosition As Label - Friend WithEvents ucrInputPosition As ucrInputComboBox - Friend WithEvents ucrChkCircular As ucrCheck - Friend WithEvents ucrInputCircularPosition As ucrInputComboBox - Friend WithEvents rdoCumulative As RadioButton - Friend WithEvents ucrInputCumulative As ucrInputComboBox - Friend WithEvents ucrSaveColumn As ucrSave - Friend WithEvents ucrReceiverTMean As ucrReceiverSingle - Friend WithEvents lblTMean As Label - Friend WithEvents ucrReceiverTMin As ucrReceiverSingle - Friend WithEvents lblTMax As Label - Friend WithEvents ucrReceiverTMax As ucrReceiverSingle - Friend WithEvents lblTMin As Label - Friend WithEvents ucrChkUseMaxMin As ucrCheck - Friend WithEvents rdoDegree As RadioButton - Friend WithEvents rdoDiurnalRange As RadioButton - Friend WithEvents ucrPnlDegree As UcrPanel - Friend WithEvents rdoModifiedGDD As RadioButton - Friend WithEvents rdoGrowingDegreeDays As RadioButton - Friend WithEvents rdoHeatingDegreeDays As RadioButton - Friend WithEvents rdoTMean As RadioButton Friend WithEvents grpDegree As GroupBox + Friend WithEvents rdoModifiedGDD As RadioButton Friend WithEvents lblBaselineGDD As Label + Friend WithEvents rdoGrowingDegreeDays As RadioButton Friend WithEvents lblBaselineHDD As Label + Friend WithEvents rdoHeatingDegreeDays As RadioButton Friend WithEvents ucrNudGDD As ucrNud + Friend WithEvents rdoTMean As RadioButton Friend WithEvents ucrNudHDD As ucrNud - Friend WithEvents lblLimit As Label - Friend WithEvents ucrChkOptions As ucrCheck - Friend WithEvents ucrInputSpellLower As ucrInputComboBox - Friend WithEvents ucrNudMgdd As ucrNud - Friend WithEvents lblBaselineMgdd As Label - Friend WithEvents ucrNudLimit As ucrNud - Friend WithEvents ttRdoRange As ToolTip + Friend WithEvents rdoDiurnalRange As RadioButton + Friend WithEvents ucrPnlDegree As UcrPanel + Friend WithEvents ucrReceiverData As ucrReceiverSingle + Friend WithEvents lblTMin As Label + Friend WithEvents ucrReceiverStation As ucrReceiverSingle + Friend WithEvents rdoMultSpells As RadioButton + Friend WithEvents lblTMax As Label + Friend WithEvents lblTMean As Label + Friend WithEvents ucrPnlTransform As UcrPanel + Friend WithEvents rdoDegree As RadioButton + Friend WithEvents rdoCumulative As RadioButton + Friend WithEvents ucrReceiverDate As ucrReceiverSingle + Friend WithEvents ucrBase As ucrButtons + Friend WithEvents ucrReceiverTMin As ucrReceiverSingle + Friend WithEvents ucrReceiverYear As ucrReceiverSingle + Friend WithEvents ucrReceiverTMean As ucrReceiverSingle + Friend WithEvents ucrReceiverTMax As ucrReceiverSingle + Friend WithEvents ucrSaveColumn As ucrSave + Friend WithEvents ucrSelectorTransform As ucrSelectorByDataFrameAddRemove + Friend WithEvents ucrInputEvaporation As ucrInputTextBox + Friend WithEvents ucrChkGroupByYear As ucrCheck + Friend WithEvents rdoEvapVariable As RadioButton + Friend WithEvents rdoEvapValue As RadioButton + Friend WithEvents ucrPnlEvap As UcrPanel + Friend WithEvents ucrInputCircularPosition As ucrInputComboBox + Friend WithEvents lblPosition As Label + Friend WithEvents ucrNudMultSpells As ucrNud + Friend WithEvents lblSumRows As Label + Friend WithEvents ucrInputCondition As ucrInputComboBox + Friend WithEvents lblCondition As Label + Friend WithEvents lblWBEvaporation As Label + Friend WithEvents lblCountOver As Label + Friend WithEvents ucrNudSumOver As ucrNud + Friend WithEvents lblWBCapacity As Label + Friend WithEvents ucrNudWBCapacity As ucrNud + Friend WithEvents ucrInputSum As ucrInputComboBox + Friend WithEvents lblSumOver As Label + Friend WithEvents ucrNudCountOver As ucrNud + Friend WithEvents ucrInputCumulative As ucrInputComboBox + Friend WithEvents ttRdoGdd As ToolTip Friend WithEvents ttRdoTMean As ToolTip Friend WithEvents ttRdoHdd As ToolTip - Friend WithEvents ttRdoGdd As ToolTip Friend WithEvents ttRdoMgdd As ToolTip - Friend WithEvents ucrNudWB As ucrNud - Friend WithEvents ucrChkWB As ucrCheck + Friend WithEvents ttRdoRange As ToolTip End Class diff --git a/instat/dlgTransformClimatic.resx b/instat/dlgTransformClimatic.resx index b41733cce82..7df82c09ec8 100644 --- a/instat/dlgTransformClimatic.resx +++ b/instat/dlgTransformClimatic.resx @@ -117,141 +117,219 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - True - - - NoControl + + Button + + + None - - 408, 250 + + MiddleCenter - - 4, 0, 4, 0 + + Flat - - 47, 20 + + NoControl - - 12 + + 358, 8 - - Year: + + 71, 40 - - lblYear + + + 75 - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + Water Balance - + + MiddleCenter + + + rdoWaterBalance + + + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + $this - - 14 + + 0 - + True - - NoControl + + 136, 122 - - 408, 176 + + 6, 6, 6, 6 - - 4, 0, 4, 0 + + 50, 20 - - 48, 20 + + 45 - - 8 + + ucrNudLimit - - Date: + + instat.ucrNud, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - lblDate + + grpDegree - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 0 - - $this + + True - - 15 + + 136, 97 - + + 6, 6, 6, 6 + + + 50, 20 + + + 44 + + + ucrNudMgdd + + + instat.ucrNud, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + + grpDegree + + + 1 + + True - + NoControl - - 408, 100 - - - 4, 0, 4, 0 + + 85, 101 - - 64, 20 + + 50, 13 - - 6 + + 45 - - Station: + + Baseline: - - lblStation + + lblBaselineMgdd - + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - $this + + grpDegree - - 9 + + 2 - + True - + NoControl - - 408, 326 - - - 4, 0, 4, 0 + + 101, 124 - - 72, 20 + + 31, 13 - - 16 + + 44 - - Element: + + Limit: - - lblData + + lblLimit - + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - $this + + grpDegree - + + 3 + + + GrowAndShrink + + + 199, 55 + + + 9, 9, 9, 9 + + + 137, 21 + + + 24 + + + ucrInputPosition + + + instat.ucrInputComboBox, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + + grpTransform + + + 12 + + + True + + + 24, 58 + + + 6, 6, 6, 6 + + + 100, 34 + + 26 + + ucrChkCircular + + + instat.ucrCheck, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + + grpTransform + + + 13 + Button @@ -268,16 +346,13 @@ NoControl - 332, 22 - - - 4, 4, 4, 4 + 220, 8 - 106, 60 + 71, 40 - 3 + 74 Spell @@ -295,43 +370,127 @@ $this - 5 - - - Button - - - None - - - MiddleCenter + 1 - - Flat + + True - + NoControl - - 228, 22 + + 12, 25 - - 4, 4, 4, 4 + + 126, 13 - - 106, 60 + + 14 - - 2 + + Rows to Take Max Over: - - Moving + + lblRowsMultSpells - - MiddleCenter + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - rdoMoving + + grpTransform + + + 15 + + + True + + + NoControl + + + 257, 110 + + + 33, 13 + + + 79 + + + Date: + + + lblDate + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 2 + + + True + + + 285, 50 + + + 9, 9, 9, 9 + + + 49, 21 + + + 13 + + + ucrInputSpellUpper + + + instat.ucrInputTextBox, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + + grpTransform + + + 16 + + + Button + + + None + + + MiddleCenter + + + Flat + + + NoControl + + + 151, 8 + + + 71, 40 + + + 73 + + + Moving + + + MiddleCenter + + + rdoMoving System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -340,7 +499,7 @@ $this - 6 + 3 Button @@ -355,16 +514,13 @@ NoControl - 21, 22 - - - 4, 4, 4, 4 + 13, 8 - 106, 60 + 71, 40 - 1 + 72 Count @@ -382,163 +538,136 @@ $this - 7 - - - Button - - - None - - - MiddleCenter + 4 - - Flat + + True - + NoControl - - 538, 22 - - - 4, 4, 4, 4 - - - 106, 60 + + 257, 60 - - 4 + + 43, 13 - - Water Balance + + 77 - - MiddleCenter + + Station: - - rdoWaterBalance + + lblStation - - System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + $this - - 4 + + 5 - + True - + NoControl - - 368, 36 - - - 4, 0, 4, 0 + + 257, 160 - - 49, 20 + + 32, 13 - - 5 + + 81 - - Rows + + Year: - - lblSumRows + + lblYear - + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - grpTransform + + $this - - 17 + + 6 - + True - - NoControl - - - 236, 36 - - - 4, 0, 4, 0 + + 260, 173 - - 42, 20 + + 6, 6, 6, 6 - - 3 + + 144, 24 - - Over + + 91 - - lblSumOver + + ucrChkUseMaxMin - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + instat.ucrCheck, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - grpTransform + + $this - - 26 + + 7 - + True - + NoControl - - 18, 36 - - - 4, 0, 4, 0 + + 258, 210 - - 155, 20 + + 48, 13 - - 8 + + 83 - - Rows to Count Over: + + Element: - - lblCountOver + + lblData - + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - grpTransform + + $this - - 21 + + 8 True - 186, 122 + 124, 81 - 9, 9, 9, 9 + 6, 6, 6, 6 - 75, 30 + 50, 20 45 @@ -559,13 +688,13 @@ True - 23, 122 + 15, 81 - 6, 6, 6, 6 + 4, 4, 4, 4 - 150, 34 + 100, 23 44 @@ -586,13 +715,13 @@ GrowAndShrink - 106, 76 + 71, 51 - 14, 14, 14, 14 + 9, 9, 9, 9 - 74, 32 + 49, 21 43 @@ -613,493 +742,46 @@ True - 399, 168 + 266, 112 - 9, 9, 9, 9 + 6, 6, 6, 6 - 114, 51 - - - 38 - - - False - - - ucrChkOptions - - - instat.ucrCheck, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - - grpTransform - - - 3 - - - True - - - True - - - 144, 144 - - - True - - - 1154, 735 - - - Button - - - None - - - MiddleCenter - - - Flat - - - NoControl - - - 642, 22 - - - 4, 4, 4, 4 - - - 106, 60 - - - 26 - - - Degrees - - - MiddleCenter - - - rdoDegree - - - System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - 0 - - - GrowAndShrink - - - 16, 616 - - - 6, 8, 6, 8 - - - 502, 32 - - - 20 - - - ucrSaveColumn - - - instat.ucrSave, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - - $this - - - 1 - - - Button - - - None - - - MiddleCenter - - - Flat - - - NoControl - - - 124, 22 - - - 4, 4, 4, 4 - - - 106, 60 - - - 25 - - - Cumulative - - - MiddleCenter - - - rdoCumulative - - - System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - 2 - - - Button - - - None - - - MiddleCenter - - - Flat - - - NoControl - - - 435, 22 - - - 4, 4, 4, 4 - - - 106, 60 - - - 23 - - - Multiple Spells - - - MiddleCenter - - - rdoMultSpells - - - System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - 3 - - - GrowAndShrink - - - 16, 14 - - - 9, 9, 9, 9 - - - 746, 74 - - - 0 - - - ucrPnlTransform - - - instat.UcrPanel, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - - $this - - - 8 - - - True - - - 412, 195 - - - 0, 0, 0, 0 - - - 206, 30 - - - 9 - - - ucrReceiverDate - - - instat.ucrReceiverSingle, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - - $this - - - 10 - - - True - - - 412, 120 - - - 0, 0, 0, 0 - - - 206, 30 - - - 7 - - - ucrReceiverStation - - - instat.ucrReceiverSingle, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - - $this - - - 11 - - - True - - - 15, 92 - - - 0, 0, 0, 0 - - - 320, 274 - - - 5 - - - ucrSelectorTransform - - - instat.ucrSelectorByDataFrameAddRemove, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - - $this - - - 12 - - - True - - - GrowAndShrink - - - 15, 656 - - - 6, 6, 6, 6 - - - 611, 77 - - - 21 - - - ucrBase - - - instat.ucrButtons, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - - $this - - - 13 - - - True - - - 412, 420 - - - 0, 0, 0, 0 - - - 206, 30 - - - 31 - - - ucrReceiverTMin - - - instat.ucrReceiverSingle, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - - $this - - - 16 - - - True - - - 266, 183 - - - 9, 9, 9, 9 - - - 75, 30 - - - 45 - - - ucrNudLimit - - - instat.ucrNud, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - - grpDegree - - - 0 - - - True - - - 266, 146 - - - 9, 9, 9, 9 - - - 75, 30 - - - 44 - - - ucrNudMgdd - - - instat.ucrNud, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - - grpDegree - - - 1 - - - True - - - NoControl - - - 184, 150 - - - 4, 0, 4, 0 - - - 74, 20 - - - 45 - - - Baseline: - - - lblBaselineMgdd - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - grpDegree - - - 2 - - - True + 100, 34 - - NoControl + + 38 - - 204, 186 + + False - - 4, 0, 4, 0 + + ucrChkOptions - - 46, 20 + + instat.ucrCheck, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - 44 + + grpTransform - - Limit: + + 3 - - lblLimit + + True - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + True + + + 96, 96 - - grpDegree + + True - - 3 + + 516, 490 True @@ -1108,13 +790,10 @@ NoControl - 22, 183 - - - 4, 4, 4, 4 + 10, 122 - 139, 24 + 95, 17 41 @@ -1141,13 +820,10 @@ NoControl - 184, 150 - - - 4, 0, 4, 0 + 85, 100 - 74, 20 + 50, 13 43 @@ -1174,13 +850,10 @@ NoControl - 22, 148 - - - 4, 4, 4, 4 + 10, 99 - 75, 24 + 52, 17 40 @@ -1207,13 +880,10 @@ NoControl - 184, 116 - - - 4, 0, 4, 0 + 85, 77 - 74, 20 + 50, 13 43 @@ -1240,13 +910,10 @@ NoControl - 22, 114 - - - 4, 4, 4, 4 + 10, 76 - 74, 24 + 52, 17 39 @@ -1270,13 +937,13 @@ True - 266, 146 + 137, 97 - 9, 9, 9, 9 + 6, 6, 6, 6 - 75, 30 + 50, 20 43 @@ -1300,13 +967,10 @@ NoControl - 22, 80 - - - 4, 4, 4, 4 + 10, 53 - 87, 24 + 61, 17 38 @@ -1330,13 +994,13 @@ True - 266, 110 + 136, 73 - 9, 9, 9, 9 + 6, 6, 6, 6 - 75, 30 + 50, 20 43 @@ -1360,13 +1024,10 @@ NoControl - 22, 45 - - - 4, 4, 4, 4 + 10, 30 - 140, 24 + 96, 17 37 @@ -1390,220 +1051,448 @@ GrowAndShrink - 9, 28 + 6, 19 - 9, 9, 9, 9 + 6, 6, 6, 6 - 178, 190 + 99, 127 34 - - ucrPnlDegree + + ucrPnlDegree + + + instat.UcrPanel, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + + grpDegree + + + 13 + + + 9, 246 + + + 195, 151 + + + 98 + + + Options: + + + grpDegree + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 10 + + + True + + + 260, 223 + + + 0, 0, 0, 0 + + + 123, 20 + + + 84 + + + ucrReceiverData + + + instat.ucrReceiverSingle, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + + $this + + + 11 + + + True + + + NoControl + + + 257, 260 + + + 33, 13 + + + 92 + + + Tmin: + + + lblTMin + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 12 + + + True + + + 260, 73 + + + 0, 0, 0, 0 + + + 123, 20 + + + 78 + + + ucrReceiverStation + + + instat.ucrReceiverSingle, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + + $this + + + 13 + + + Button + + + None + + + MiddleCenter + + + Flat + + + NoControl + + + 289, 8 + + + 71, 40 + + + 88 + + + Multiple Spells + + + MiddleCenter + + + rdoMultSpells + + + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 14 + + + True + + + NoControl + + + 257, 210 + + + 36, 13 + + + 94 + + + Tmax: + + + lblTMax + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 15 + + + True + + + NoControl + + + 255, 210 + + + 43, 13 + + + 96 + + + Tmean: + + + lblTMean + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 16 + + + GrowAndShrink - - instat.UcrPanel, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + 10, 2 - - grpDegree + + 6, 6, 6, 6 - - 13 + + 497, 49 - - 785, 176 + + 71 - - 4, 4, 4, 4 + + ucrPnlTransform - - 4, 4, 4, 4 + + instat.UcrPanel, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - 356, 226 + + $this - - 42 + + 17 - - Options: + + Button - - grpDegree + + None - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + MiddleCenter - - $this + + Flat - - 17 + + NoControl - - True + + 427, 8 - - 412, 345 + + 71, 40 - - 0, 0, 0, 0 + + 90 - - 206, 30 + + Degrees - - 33 + + MiddleCenter - - ucrReceiverTMean + + rdoDegree - - instat.ucrReceiverSingle, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + $this - + 18 - - True + + Button - + + None + + + MiddleCenter + + + Flat + + NoControl - - 408, 400 + + 82, 8 - - 4, 0, 4, 0 + + 71, 40 - - 47, 20 + + 89 - - 28 + + Cumulative - - Tmin: + + MiddleCenter - - lblTMin + + rdoCumulative - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + $this - + 19 - + True - - NoControl - - - 408, 326 - - - 4, 0, 4, 0 + + 260, 123 - - 51, 20 + + 0, 0, 0, 0 - - 30 + + 123, 20 - - Tmax: + + 80 - - lblTMax + + ucrReceiverDate - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + instat.ucrReceiverSingle, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - + $this - + 20 - + True - - 412, 345 + + GrowAndShrink - - 0, 0, 0, 0 + + 9, 430 - - 206, 30 + + 4, 4, 4, 4 - - 29 + + 408, 52 - - ucrReceiverTMax + + 87 - - instat.ucrReceiverSingle, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + ucrBase - + + instat.ucrButtons, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + $this - + 21 - + True - - 412, 345 + + 260, 273 - + 0, 0, 0, 0 - - 206, 30 + + 123, 20 - - 17 + + 95 - - ucrReceiverData + + ucrReceiverTMin - + instat.ucrReceiverSingle, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - + $this - + 22 True - 412, 270 + 260, 173 0, 0, 0, 0 - 206, 30 + 123, 20 - 13 + 82 ucrReceiverYear @@ -1617,68 +1506,113 @@ 23 - + True - - 412, 270 + + 260, 223 - - 9, 9, 9, 9 + + 0, 0, 0, 0 - - 206, 36 + + 123, 20 - - 27 + + 97 - - ucrChkUseMaxMin + + ucrReceiverTMean + + + instat.ucrReceiverSingle, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + + $this + + + 24 + + + True + + + 260, 223 + + + 0, 0, 0, 0 + + + 123, 20 + + + 93 + + + ucrReceiverTMax + + + instat.ucrReceiverSingle, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + + $this + + + 25 + + + GrowAndShrink + + + 10, 404 + + + 4, 5, 4, 5 + + + 335, 21 + + + 86 + + + ucrSaveColumn - - instat.ucrCheck, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + instat.ucrSave, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - + $this - - 24 + + 26 - + True - - NoControl - - - 408, 326 - - - 4, 0, 4, 0 + + 9, 54 - - 62, 20 + + 0, 0, 0, 0 - - 32 + + 213, 183 - - Tmean: + + 76 - - lblTMean + + ucrSelectorTransform - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + instat.ucrSelectorByDataFrameAddRemove, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - + $this - - 25 - - - 4, 4, 4, 4 + + 27 CenterScreen @@ -1686,10 +1620,10 @@ Transform - - ttRdoRange + + ttRdoGdd - + System.Windows.Forms.ToolTip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -1704,18 +1638,18 @@ System.Windows.Forms.ToolTip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - ttRdoGdd - - - System.Windows.Forms.ToolTip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - ttRdoMgdd System.Windows.Forms.ToolTip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + ttRdoRange + + + System.Windows.Forms.ToolTip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + dlgTransformClimatic @@ -1723,13 +1657,13 @@ System.Windows.Forms.Form, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - 530, 80 + 310, 53 0, 0, 0, 0 - 154, 30 + 103, 20 37 @@ -1750,13 +1684,13 @@ True - 232, 80 + 151, 53 - 14, 14, 14, 14 + 9, 9, 9, 9 - 154, 32 + 88, 21 31 @@ -1777,13 +1711,13 @@ True - 36, 168 + 24, 112 - 9, 9, 9, 9 + 6, 6, 6, 6 - 261, 51 + 174, 34 22 @@ -1807,13 +1741,10 @@ NoControl - 430, 83 - - - 4, 4, 4, 4 + 247, 55 - 92, 24 + 63, 17 36 @@ -1840,13 +1771,10 @@ NoControl - 129, 82 - - - 4, 4, 4, 4 + 86, 55 - 75, 24 + 52, 17 35 @@ -1870,13 +1798,13 @@ GrowAndShrink - 123, 70 + 82, 47 - 9, 9, 9, 9 + 6, 6, 6, 6 - 578, 44 + 343, 29 29 @@ -1897,13 +1825,13 @@ GrowAndShrink - 298, 82 + 199, 55 - 14, 14, 14, 14 + 9, 9, 9, 9 - 206, 32 + 137, 21 27 @@ -1927,13 +1855,10 @@ NoControl - 226, 88 - - - 4, 0, 4, 0 + 151, 59 - 69, 20 + 47, 13 25 @@ -1953,71 +1878,17 @@ 11 - - GrowAndShrink - - - 298, 82 - - - 14, 14, 14, 14 - - - 206, 32 - - - 24 - - - ucrInputPosition - - - instat.ucrInputComboBox, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - - grpTransform - - - 12 - - - True - - - 36, 87 - - - 9, 9, 9, 9 - - - 150, 51 - - - 26 - - - ucrChkCircular - - - instat.ucrCheck, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - - grpTransform - - - 13 - True - 291, 32 + 194, 21 - 9, 9, 9, 9 + 6, 6, 6, 6 - 75, 30 + 50, 20 15 @@ -2034,77 +1905,47 @@ 14 - + True - + NoControl - - 18, 38 - - - 4, 0, 4, 0 + + 245, 24 - - 180, 20 + + 34, 13 - - 14 + + 5 - - Rows to Take Max Over: + + Rows - - lblRowsMultSpells + + lblSumRows - + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - grpTransform - - - 15 - - - True - - - 428, 75 - - - 14, 14, 14, 14 - - - 74, 32 - - - 13 - - - ucrInputSpellUpper - - - instat.ucrInputTextBox, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - + grpTransform - - 16 + + 17 GrowAndShrink - 186, 75 + 124, 50 - 14, 14, 14, 14 + 9, 9, 9, 9 - 232, 32 + 155, 21 12 @@ -2128,13 +1969,10 @@ NoControl - 18, 80 - - - 4, 0, 4, 0 + 12, 53 - 80, 20 + 54, 13 10 @@ -2161,13 +1999,10 @@ NoControl - 20, 82 - - - 4, 0, 4, 0 + 13, 55 - 98, 20 + 67, 13 6 @@ -2187,17 +2022,47 @@ 20 + + True + + + NoControl + + + 12, 24 + + + 106, 13 + + + 8 + + + Rows to Count Over: + + + lblCountOver + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpTransform + + + 21 + True - 290, 32 + 193, 21 - 9, 9, 9, 9 + 6, 6, 6, 6 - 75, 30 + 50, 20 4 @@ -2221,13 +2086,10 @@ NoControl - 20, 38 - - - 4, 0, 4, 0 + 13, 25 - 74, 20 + 51, 13 1 @@ -2251,13 +2113,13 @@ True - 129, 32 + 86, 21 - 9, 9, 9, 9 + 6, 6, 6, 6 - 75, 30 + 50, 20 2 @@ -2278,13 +2140,13 @@ GrowAndShrink - 36, 32 + 24, 21 - 14, 14, 14, 14 + 9, 9, 9, 9 - 168, 32 + 112, 21 0 @@ -2301,17 +2163,47 @@ 25 + + True + + + NoControl + + + 157, 24 + + + 30, 13 + + + 3 + + + Over + + + lblSumOver + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpTransform + + + 26 + True - 201, 32 + 134, 21 - 9, 9, 9, 9 + 6, 6, 6, 6 - 75, 30 + 50, 20 9 @@ -2332,13 +2224,13 @@ GrowAndShrink - 36, 32 + 24, 21 - 14, 14, 14, 14 + 9, 9, 9, 9 - 168, 32 + 112, 21 26 @@ -2356,19 +2248,13 @@ 28 - 15, 392 - - - 4, 4, 4, 4 - - - 4, 4, 4, 4 + 9, 254 - 733, 213 + 428, 151 - 18 + 85 Options @@ -2383,21 +2269,21 @@ $this - 27 + 9 - - 17, 17 + + 38, 8 - 133, 17 + 170, 8 - 252, 17 - - - 357, 17 + 289, 8 - 462, 17 + 405, 12 + + + 520, 12 \ No newline at end of file diff --git a/instat/dlgTransformClimatic.vb b/instat/dlgTransformClimatic.vb index 1aefa1e19c8..d4b2ae83e7f 100644 --- a/instat/dlgTransformClimatic.vb +++ b/instat/dlgTransformClimatic.vb @@ -35,8 +35,8 @@ Public Class dlgTransformClimatic Private clsGreaterThanOperator, clsLessThanOperator As New ROperator ' Water Balance - Private clsPMinFunctionMax, clsPMaxFunctionMax, clsRWaterBalanceFunction As New RFunction - Private clsPMaxOperatorMax, clsReduceOpEvapValue As New ROperator + Private clsPMinFunctionMax, clsPMaxFunctionMax, clsRWaterBalanceFunction, clsTailFunction, clsWBEvaporation As New RFunction + Private clsPMaxOperatorMax, clsReduceOpEvapValue, clsWBOperator As New ROperator 'Degree Private clsDiurnalRangeOperator, clsTMeanAddOperator, clsTMeanDivideOperator As New ROperator @@ -230,9 +230,10 @@ Public Class dlgTransformClimatic ucrChkWB.SetValuesCheckedAndUnchecked("TRUE", "FALSE") ucrChkWB.SetText("Reducing") - ucrNudWB.SetParameter(New RParameter("WB_evap_value")) + ucrNudWB.SetParameter(New RParameter("WB_evap_value", 2)) ucrNudWB.SetMinMax(0, 1) ucrNudWB.Increment = 0.01 + ucrNudWB.DecimalPlaces = 2 ' Count ucrNudCountOver.SetParameter(New RParameter("width", 1)) @@ -322,7 +323,7 @@ Public Class dlgTransformClimatic ucrPnlDegree.AddToLinkedControls(ucrNudHDD, {rdoHeatingDegreeDays}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:=15.0) ucrPnlDegree.AddToLinkedControls(ucrNudLimit, {rdoModifiedGDD}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:=30.0) - ucrChkWB.AddToLinkedControls(ucrNudWB, {True}, bNewLinkedHideIfParameterMissing:=True) + ucrChkWB.AddToLinkedControls(ucrNudWB, {True}, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:=0.5) ucrPnlTransform.AddToLinkedControls({ucrInputCumulative}, {rdoCumulative}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:="Sum") ucrPnlTransform.AddToLinkedControls({ucrNudCountOver}, {rdoCount}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:=1) @@ -337,7 +338,6 @@ Public Class dlgTransformClimatic ucrPnlTransform.AddToLinkedControls({ucrReceiverYear, ucrReceiverData, ucrChkOptions}, {rdoCumulative, rdoCount, rdoMoving, rdoMultSpells, rdoSpell, rdoWaterBalance}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) ucrPnlTransform.AddToLinkedControls({ucrChkUseMaxMin, ucrPnlDegree}, {rdoDegree}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) ucrPnlTransform.AddToLinkedControls({ucrChkWB}, {rdoWaterBalance}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) - ucrChkCircular.AddToLinkedControls(ucrInputCircularPosition, {True}, bNewLinkedHideIfParameterMissing:=True) ucrChkCircular.AddToLinkedControls(ucrInputPosition, {False}, bNewLinkedHideIfParameterMissing:=True) @@ -366,7 +366,8 @@ Public Class dlgTransformClimatic clsReplaceNAasElement = New RFunction clsRCountFunction = New RFunction clsRWaterBalanceFunction = New RFunction - + clsWBEvaporation = New RFunction + clsTailFunction = New RFunction clsRRaindayMatch = New RFunction clsRRaindayAndOperator = New ROperator clsRRaindayOrOperator = New ROperator @@ -395,6 +396,7 @@ Public Class dlgTransformClimatic clsPMinFunctionMax = New RFunction clsPMaxFunctionMax = New RFunction clsPMaxOperatorMax = New ROperator + clsWBOperator = New ROperator clsGroupByYear.Clear() clsReduceOpEvapValue.Clear() clsGreaterThanOperator.Clear() @@ -496,8 +498,26 @@ Public Class dlgTransformClimatic clsPMinFunctionMax.AddParameter("capacity", 60, iPosition:=1, bIncludeArgumentName:=False) clsRWaterBalanceFunction.AddParameter("replace_na", iPosition:=1, bIncludeArgumentName:=False) clsRWaterBalanceFunction.AddParameter("accumulate", "TRUE", iPosition:=2) - '"Reduce(function(x, y) pmin(pmax(x + y - " & ucrInputEvaporation.GetText & ", 0), " & ucrNudCapacity.Value & "), Rain, accumulate=TRUE)" & Chr(34)) + clsWBOperator.SetOperation("-") + clsWBOperator.AddParameter("left", "x + y", iPosition:=0) + clsWBOperator.AddParameter("right", clsRFunctionParameter:=clsWBEvaporation, iPosition:=1) + clsWBOperator.bSpaceAroundOperation = True + clsWBOperator.bBrackets = False + + clsReduceOpEvapValue.SetOperation("-") + + clsWBEvaporation.SetRCommand("WB_evaporation") + clsWBEvaporation.AddParameter("water_balance", "x", iPosition:=0, bIncludeArgumentName:=False) + clsWBEvaporation.AddParameter("WB_evap_value", 0.5, iPosition:=1, bIncludeArgumentName:=False) + clsWBEvaporation.AddParameter("capacity", 60, iPosition:=2, bIncludeArgumentName:=False) + clsWBEvaporation.AddParameter("evaporation_value", 5, iPosition:=3, bIncludeArgumentName:=False) + clsWBEvaporation.AddParameter("rain", "rain", iPosition:=4, bIncludeArgumentName:=False) + + clsTailFunction.SetPackageName("utils") + clsTailFunction.SetRCommand("tail") + clsTailFunction.AddParameter("x", "rain", iPosition:=0) + clsTailFunction.AddParameter("n", "-1", iPosition:=1) ' Degree clsDiurnalRangeOperator.SetOperation("-") clsDiurnalRangeOperator.bToScriptAsRString = True @@ -660,9 +680,9 @@ Public Class dlgTransformClimatic ' Water Balance ucrPnlEvap.SetRCode(clsPMaxOperatorMax, bReset) - ucrInputEvaporation.SetRCode(clsPMaxOperatorMax, bReset) ucrReceiverEvap.SetRCode(clsReduceOpEvapValue, bReset) ucrNudWBCapacity.SetRCode(clsPMinFunctionMax, bReset) + ucrNudWB.SetRCode(clsWBOperator, bReset) 'Degree ucrReceiverTMin.SetRCode(clsDiurnalRangeOperator, bReset) @@ -675,6 +695,9 @@ Public Class dlgTransformClimatic ucrPnlDegree.SetRCode(clsDummyFunction, bReset) ucrSaveColumn.SetRCode(clsRTransform, bReset) + If bReset Then + ucrInputEvaporation.SetRCode(clsPMaxOperatorMax, bReset) + End If End Sub Private Sub TestOkEnabled() @@ -779,7 +802,8 @@ Public Class dlgTransformClimatic clsRTransform.RemoveParameterByName("sub_calculations") clsTransformCheck = clsRTransform End If - Evaporation() + ReduceWaterBalance() + 'Evaporation() AddCalculate() SetAssignName() GroupByStation() @@ -901,28 +925,12 @@ Public Class dlgTransformClimatic clsRTransform.AddParameter("calculated_from", "list(" & strCurrDataName & "=" & ucrReceiverData.GetVariableNames & ")", iPosition:=3) End Sub - Private Sub Evaporation() - If rdoWaterBalance.Checked Then - If rdoEvapValue.Checked Then - ucrReceiverData.SetMeAsReceiver() - clsRTransform.AddParameter("calculated_from", "list(" & strCurrDataName & "=" & ucrReceiverData.GetVariableNames & ")") - clsPMaxOperatorMax.AddParameter("evaporation.value", 5, iPosition:=1, bIncludeArgumentName:=False) - ElseIf rdoEvapVariable.Checked Then - ucrReceiverEvap.SetMeAsReceiver() - clsRTransform.AddParameter("calculated_from", "list(" & strCurrDataName & "=" & ucrReceiverData.GetVariableNames & ", " & strCurrDataName & "=" & ucrReceiverEvap.GetVariableNames & ")") - clsReduceOpEvapValue.SetOperation("-") - clsRWaterBalanceFunction.AddParameter("replace_na", clsROperatorParameter:=clsReduceOpEvapValue, iPosition:=1, bIncludeArgumentName:=False) - clsPMaxOperatorMax.RemoveParameterByName("evaporation.value") - End If - End If - End Sub - Private Sub ucrSelectorTransform_ControlValueChanged(ucrchangedControl As ucrCore) Handles ucrSelectorTransform.ControlValueChanged strCurrDataName = Chr(34) & ucrSelectorTransform.ucrAvailableDataFrames.cboAvailableDataFrames.SelectedItem & Chr(34) RainDays() GroupByYear() GroupByStation() - Evaporation() + ReduceWaterBalance() ChangeFunctions() AddCalculate() End Sub @@ -933,7 +941,7 @@ Public Class dlgTransformClimatic Private Sub ucrReceiverData_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrReceiverData.ControlValueChanged, ucrReceiverEvap.ControlValueChanged RainDays() - Evaporation() + ReduceWaterBalance() End Sub Private Sub ucrReceiverStation_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrReceiverStation.ControlValueChanged @@ -955,7 +963,7 @@ Public Class dlgTransformClimatic End Sub Private Sub ucrInputEvaporation_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrInputEvaporation.ControlContentsChanged, ucrPnlEvap.ControlContentsChanged - Evaporation() + ReduceWaterBalance() End Sub Private Sub RasterFunction() @@ -1086,4 +1094,38 @@ Public Class dlgTransformClimatic AddRemoveMeanOperator() AddCalculate() End Sub + Private Sub ReduceWaterBalance() + If rdoWaterBalance.Checked Then + If rdoEvapValue.Checked Then + clsRTransform.RemoveParameterByName("calculated_from") + ucrReceiverData.SetMeAsReceiver() + clsRTransform.AddParameter("calculated_from", "list(" & strCurrDataName & "=" & ucrReceiverData.GetVariableNames & ")") + If ucrChkWB.Checked Then + clsPMaxFunctionMax.AddParameter("0", 0, iPosition:=1, bIncludeArgumentName:=False) + clsPMaxOperatorMax.AddParameter("wb", clsROperatorParameter:=clsWBOperator, iPosition:=0, bIncludeArgumentName:=False) + clsPMaxOperatorMax.RemoveParameterByName("first") + clsPMaxOperatorMax.RemoveParameterByName("evaporation.value") + clsRWaterBalanceFunction.AddParameter("replace_na", clsRFunctionParameter:=clsTailFunction, iPosition:=2, bIncludeArgumentName:=False) + clsRWaterBalanceFunction.AddParameter("init", "0", iPosition:=3, bIncludeArgumentName:=False) + Else + clsPMaxOperatorMax.AddParameter("evaporation.value", 5, iPosition:=1, bIncludeArgumentName:=False) + clsPMaxFunctionMax.RemoveParameterByName("wb") + End If + + ElseIf rdoEvapVariable.Checked Then + ucrReceiverEvap.SetMeAsReceiver() + clsRTransform.AddParameter("calculated_from", "list(" & strCurrDataName & "=" & ucrReceiverData.GetVariableNames & ", " & strCurrDataName & "=" & ucrReceiverEvap.GetVariableNames & ")") + clsRWaterBalanceFunction.AddParameter("replace_na", clsROperatorParameter:=clsReduceOpEvapValue, iPosition:=1, bIncludeArgumentName:=False) + clsPMaxOperatorMax.RemoveParameterByName("evaporation.value") + End If + End If + End Sub + + Private Sub ucrChkWB_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkWB.ControlValueChanged + ReduceWaterBalance() + End Sub + + Private Sub rdoEvapValue_CheckedChanged(sender As Object, e As EventArgs) Handles rdoEvapValue.CheckedChanged, rdoEvapVariable.CheckedChanged + ReduceWaterBalance() + End Sub End Class \ No newline at end of file diff --git a/instat/dlgTwoWayFrequencies.vb b/instat/dlgTwoWayFrequencies.vb index 1596adc64c1..9d07336cc92 100644 --- a/instat/dlgTwoWayFrequencies.vb +++ b/instat/dlgTwoWayFrequencies.vb @@ -48,7 +48,7 @@ Public Class dlgTwoWayFrequencies End Sub Private Sub InitialiseDialog() - ucrBase.iHelpTopicID = 415 + ucrBase.iHelpTopicID = 289 ucrBase.clsRsyntax.bExcludeAssignedFunctionOutput = False ucrReceiverColumnFactor.Selector = ucrSelectorTwoWayFrequencies diff --git a/instat/dlgVisualizeData.Designer.vb b/instat/dlgVisualizeData.Designer.vb index e74fb59e6e4..0cf2aca7215 100644 --- a/instat/dlgVisualizeData.Designer.vb +++ b/instat/dlgVisualizeData.Designer.vb @@ -31,6 +31,11 @@ Partial Class dlgVisualizeData Me.lblMillionDataPoints = New System.Windows.Forms.Label() Me.lblPaltte = New System.Windows.Forms.Label() Me.lblSampling = New System.Windows.Forms.Label() + Me.rdoNumeric = New System.Windows.Forms.RadioButton() + Me.lblColour = New System.Windows.Forms.Label() + Me.lblpalettecolor = New System.Windows.Forms.Label() + Me.ucrInputColourPalette = New instat.ucrInputComboBox() + Me.ucrInputColour = New instat.ucrInputComboBox() Me.ucrNudAdjustSize = New instat.ucrNud() Me.ucrChkAdjustSize = New instat.ucrCheck() Me.ucrNudSamplingFunction = New instat.ucrNud() @@ -43,6 +48,8 @@ Partial Class dlgVisualizeData Me.ucrSaveGraph = New instat.ucrSave() Me.ucrSelectorVisualizeData = New instat.ucrSelectorByDataFrameAddRemove() Me.ucrBase = New instat.ucrButtons() + Me.ucrByFactorsReceiver = New instat.ucrReceiverSingle() + Me.ucrChkFacet = New instat.ucrCheck() Me.SuspendLayout() ' 'rdoVisDat @@ -52,12 +59,12 @@ Partial Class dlgVisualizeData Me.rdoVisDat.FlatAppearance.BorderSize = 2 Me.rdoVisDat.FlatAppearance.CheckedBackColor = System.Drawing.SystemColors.ActiveCaption Me.rdoVisDat.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.rdoVisDat.Location = New System.Drawing.Point(60, 11) + Me.rdoVisDat.Location = New System.Drawing.Point(28, 11) Me.rdoVisDat.Name = "rdoVisDat" Me.rdoVisDat.Size = New System.Drawing.Size(100, 28) Me.rdoVisDat.TabIndex = 1 Me.rdoVisDat.TabStop = True - Me.rdoVisDat.Text = "Data" + Me.rdoVisDat.Text = "Column Type " Me.rdoVisDat.TextAlign = System.Drawing.ContentAlignment.MiddleCenter Me.rdoVisDat.UseVisualStyleBackColor = True ' @@ -68,9 +75,9 @@ Partial Class dlgVisualizeData Me.rdoVisMiss.FlatAppearance.BorderSize = 2 Me.rdoVisMiss.FlatAppearance.CheckedBackColor = System.Drawing.SystemColors.ActiveCaption Me.rdoVisMiss.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.rdoVisMiss.Location = New System.Drawing.Point(156, 11) + Me.rdoVisMiss.Location = New System.Drawing.Point(126, 11) Me.rdoVisMiss.Name = "rdoVisMiss" - Me.rdoVisMiss.Size = New System.Drawing.Size(100, 28) + Me.rdoVisMiss.Size = New System.Drawing.Size(77, 28) Me.rdoVisMiss.TabIndex = 2 Me.rdoVisMiss.TabStop = True Me.rdoVisMiss.Text = "Missing" @@ -84,12 +91,12 @@ Partial Class dlgVisualizeData Me.rdoVisGuess.FlatAppearance.BorderSize = 2 Me.rdoVisGuess.FlatAppearance.CheckedBackColor = System.Drawing.SystemColors.ActiveCaption Me.rdoVisGuess.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.rdoVisGuess.Location = New System.Drawing.Point(252, 11) + Me.rdoVisGuess.Location = New System.Drawing.Point(201, 11) Me.rdoVisGuess.Name = "rdoVisGuess" Me.rdoVisGuess.Size = New System.Drawing.Size(100, 28) Me.rdoVisGuess.TabIndex = 3 Me.rdoVisGuess.TabStop = True - Me.rdoVisGuess.Text = "Guess" + Me.rdoVisGuess.Text = "Row Type" Me.rdoVisGuess.TextAlign = System.Drawing.ContentAlignment.MiddleCenter Me.rdoVisGuess.UseVisualStyleBackColor = True ' @@ -144,12 +151,68 @@ Partial Class dlgVisualizeData 'lblSampling ' Me.lblSampling.AutoSize = True - Me.lblSampling.Location = New System.Drawing.Point(191, 244) + Me.lblSampling.Location = New System.Drawing.Point(191, 275) Me.lblSampling.Name = "lblSampling" Me.lblSampling.Size = New System.Drawing.Size(94, 13) Me.lblSampling.TabIndex = 9 Me.lblSampling.Text = "Sampling Fraction:" ' + 'rdoNumeric + ' + Me.rdoNumeric.Appearance = System.Windows.Forms.Appearance.Button + Me.rdoNumeric.FlatAppearance.BorderColor = System.Drawing.SystemColors.ActiveCaption + Me.rdoNumeric.FlatAppearance.BorderSize = 2 + Me.rdoNumeric.FlatAppearance.CheckedBackColor = System.Drawing.SystemColors.ActiveCaption + Me.rdoNumeric.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.rdoNumeric.Location = New System.Drawing.Point(288, 11) + Me.rdoNumeric.Name = "rdoNumeric" + Me.rdoNumeric.Size = New System.Drawing.Size(94, 28) + Me.rdoNumeric.TabIndex = 21 + Me.rdoNumeric.TabStop = True + Me.rdoNumeric.Text = "Numeric" + Me.rdoNumeric.TextAlign = System.Drawing.ContentAlignment.MiddleCenter + Me.rdoNumeric.UseVisualStyleBackColor = True + ' + 'lblColour + ' + Me.lblColour.AutoSize = True + Me.lblColour.Location = New System.Drawing.Point(10, 296) + Me.lblColour.Name = "lblColour" + Me.lblColour.Size = New System.Drawing.Size(40, 13) + Me.lblColour.TabIndex = 23 + Me.lblColour.Text = "Colour:" + ' + 'lblpalettecolor + ' + Me.lblpalettecolor.AutoSize = True + Me.lblpalettecolor.Location = New System.Drawing.Point(7, 269) + Me.lblpalettecolor.Name = "lblpalettecolor" + Me.lblpalettecolor.Size = New System.Drawing.Size(43, 13) + Me.lblpalettecolor.TabIndex = 24 + Me.lblpalettecolor.Text = "Palette:" + ' + 'ucrInputColourPalette + ' + Me.ucrInputColourPalette.AddQuotesIfUnrecognised = True + Me.ucrInputColourPalette.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrInputColourPalette.GetSetSelectedIndex = -1 + Me.ucrInputColourPalette.IsReadOnly = False + Me.ucrInputColourPalette.Location = New System.Drawing.Point(55, 266) + Me.ucrInputColourPalette.Name = "ucrInputColourPalette" + Me.ucrInputColourPalette.Size = New System.Drawing.Size(85, 21) + Me.ucrInputColourPalette.TabIndex = 25 + ' + 'ucrInputColour + ' + Me.ucrInputColour.AddQuotesIfUnrecognised = True + Me.ucrInputColour.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrInputColour.GetSetSelectedIndex = -1 + Me.ucrInputColour.IsReadOnly = False + Me.ucrInputColour.Location = New System.Drawing.Point(55, 293) + Me.ucrInputColour.Name = "ucrInputColour" + Me.ucrInputColour.Size = New System.Drawing.Size(85, 21) + Me.ucrInputColour.TabIndex = 22 + ' 'ucrNudAdjustSize ' Me.ucrNudAdjustSize.AutoSize = True @@ -177,7 +240,7 @@ Partial Class dlgVisualizeData Me.ucrNudSamplingFunction.AutoSize = True Me.ucrNudSamplingFunction.DecimalPlaces = New Decimal(New Integer() {1, 0, 0, 0}) Me.ucrNudSamplingFunction.Increment = New Decimal(New Integer() {0, 0, 0, 0}) - Me.ucrNudSamplingFunction.Location = New System.Drawing.Point(330, 242) + Me.ucrNudSamplingFunction.Location = New System.Drawing.Point(330, 273) Me.ucrNudSamplingFunction.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) Me.ucrNudSamplingFunction.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudSamplingFunction.Name = "ucrNudSamplingFunction" @@ -242,9 +305,9 @@ Partial Class dlgVisualizeData 'ucrPnlVisualizeData ' Me.ucrPnlVisualizeData.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrPnlVisualizeData.Location = New System.Drawing.Point(44, 1) + Me.ucrPnlVisualizeData.Location = New System.Drawing.Point(12, 1) Me.ucrPnlVisualizeData.Name = "ucrPnlVisualizeData" - Me.ucrPnlVisualizeData.Size = New System.Drawing.Size(324, 46) + Me.ucrPnlVisualizeData.Size = New System.Drawing.Size(388, 46) Me.ucrPnlVisualizeData.TabIndex = 0 ' 'ucrSaveGraph @@ -277,12 +340,41 @@ Partial Class dlgVisualizeData Me.ucrBase.Size = New System.Drawing.Size(408, 52) Me.ucrBase.TabIndex = 18 ' + 'ucrByFactorsReceiver + ' + Me.ucrByFactorsReceiver.AutoSize = True + Me.ucrByFactorsReceiver.frmParent = Me + Me.ucrByFactorsReceiver.Location = New System.Drawing.Point(262, 245) + Me.ucrByFactorsReceiver.Margin = New System.Windows.Forms.Padding(0) + Me.ucrByFactorsReceiver.Name = "ucrByFactorsReceiver" + Me.ucrByFactorsReceiver.Selector = Nothing + Me.ucrByFactorsReceiver.Size = New System.Drawing.Size(120, 20) + Me.ucrByFactorsReceiver.strNcFilePath = "" + Me.ucrByFactorsReceiver.TabIndex = 26 + Me.ucrByFactorsReceiver.ucrSelector = Nothing + ' + 'ucrChkFacet + ' + Me.ucrChkFacet.AutoSize = True + Me.ucrChkFacet.Checked = False + Me.ucrChkFacet.Location = New System.Drawing.Point(258, 222) + Me.ucrChkFacet.Name = "ucrChkFacet" + Me.ucrChkFacet.Size = New System.Drawing.Size(124, 23) + Me.ucrChkFacet.TabIndex = 27 + ' 'dlgVisualizeData ' 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(418, 441) + Me.Controls.Add(Me.ucrChkFacet) + Me.Controls.Add(Me.ucrByFactorsReceiver) + Me.Controls.Add(Me.ucrInputColourPalette) + Me.Controls.Add(Me.lblpalettecolor) + Me.Controls.Add(Me.lblColour) + Me.Controls.Add(Me.ucrInputColour) + Me.Controls.Add(Me.rdoNumeric) Me.Controls.Add(Me.ucrNudAdjustSize) Me.Controls.Add(Me.ucrChkAdjustSize) Me.Controls.Add(Me.lblSampling) @@ -336,4 +428,11 @@ Partial Class dlgVisualizeData Friend WithEvents ucrNudSamplingFunction As ucrNud Friend WithEvents ucrNudAdjustSize As ucrNud Friend WithEvents ucrChkAdjustSize As ucrCheck + Friend WithEvents rdoNumeric As RadioButton + Friend WithEvents ucrInputColour As ucrInputComboBox + Friend WithEvents lblColour As Label + Friend WithEvents ucrInputColourPalette As ucrInputComboBox + Friend WithEvents lblpalettecolor As Label + Friend WithEvents ucrChkFacet As ucrCheck + Friend WithEvents ucrByFactorsReceiver As ucrReceiverSingle End Class \ No newline at end of file diff --git a/instat/dlgVisualizeData.vb b/instat/dlgVisualizeData.vb index 3a915058943..0e1a6850d2e 100644 --- a/instat/dlgVisualizeData.vb +++ b/instat/dlgVisualizeData.vb @@ -17,20 +17,26 @@ Imports instat.Translations Public Class dlgVisualizeData + Public enumVisualizeMode As String = VisualizeMode.Prepare + Public Enum VisualizeMode + Prepare + Describe + Climatic + End Enum Private bFirstLoad As Boolean = True Private bReset As Boolean = True Private clsVisDatFunction As New RFunction Private clsVisMissFunction As New RFunction Private clsVisGuessFunction As New RFunction + Private clsVisValueFunction As New RFunction Private clsCurrBaseFunction As New RFunction Private clsFilterFunction As New RFunction Private clsAsLogicalFunction As New RFunction Private clsRBinonFunction As New RFunction - Private clsElementTextFunction As New RFunction - Private clsThemeFunction As New RFunction + Private clsGetVariableFunction As New RFunction + Private clsDummyFunction As New RFunction Private clsNRowFunction As New RFunction Private clsPipeOperator As New ROperator - Private clsBaseOperator As New ROperator Private Sub dlgVisualizeData_Load(sender As Object, e As EventArgs) Handles MyBase.Load If bFirstLoad Then @@ -41,17 +47,18 @@ Public Class dlgVisualizeData SetDefaults() End If SetRCodeForControls(bReset) + SetHelpOptions() bReset = False autoTranslate(Me) TestOkEnabled() End Sub Private Sub InitialiseDialog() - ucrBase.iHelpTopicID = 54 Dim lstMaximumControls As New List(Of Control) Dim lstMaximumSizeControls As New List(Of Control) Dim dctPalette As New Dictionary(Of String, String) Dim dctPaletteGuess As New Dictionary(Of String, String) + Dim dctColourPallette As New Dictionary(Of String, String) ucrBase.clsRsyntax.bExcludeAssignedFunctionOutput = False ucrBase.clsRsyntax.iCallType = 3 @@ -59,16 +66,35 @@ Public Class dlgVisualizeData ucrPnlVisualizeData.AddRadioButton(rdoVisDat) ucrPnlVisualizeData.AddRadioButton(rdoVisMiss) ucrPnlVisualizeData.AddRadioButton(rdoVisGuess) + ucrPnlVisualizeData.AddRadioButton(rdoNumeric) ucrPnlVisualizeData.AddFunctionNamesCondition(rdoVisDat, "vis_dat") ucrPnlVisualizeData.AddFunctionNamesCondition(rdoVisMiss, "vis_miss") ucrPnlVisualizeData.AddFunctionNamesCondition(rdoVisGuess, "vis_guess") - + ucrPnlVisualizeData.AddFunctionNamesCondition(rdoNumeric, "vis_value") + + ucrByFactorsReceiver.SetParameter(New RParameter("facet", 3)) + ucrByFactorsReceiver.Selector = ucrSelectorVisualizeData + ucrByFactorsReceiver.SetIncludedDataTypes({"factor", "ordered,factor"}) + ucrByFactorsReceiver.SetSelectorHeading("Factor") + ucrByFactorsReceiver.SetParameterIsString() + ucrByFactorsReceiver.bWithQuotes = False + ucrByFactorsReceiver.SetValuesToIgnore({Chr(34) & Chr(34)}) + ucrByFactorsReceiver.bAddParameterIfEmpty = True + + ucrPnlVisualizeData.AddToLinkedControls(ucrChkFacet, {rdoVisDat, rdoVisMiss}, bNewLinkedHideIfParameterMissing:=True) ucrPnlVisualizeData.AddToLinkedControls(ucrChkSortVariables, {rdoVisDat, rdoVisMiss}, bNewLinkedHideIfParameterMissing:=True) ucrPnlVisualizeData.AddToLinkedControls(ucrInputComboboxPalette, {rdoVisDat, rdoVisGuess}, bNewLinkedHideIfParameterMissing:=True) ucrPnlVisualizeData.AddToLinkedControls(ucrNudMaximumSize, {rdoVisDat, rdoVisMiss}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:=0.9) ucrPnlSelectData.AddRadioButton(rdoWholeDataFrame) ucrPnlSelectData.AddRadioButton(rdoSelectedColumn) + ucrPnlVisualizeData.AddToLinkedControls(ucrInputColourPalette, {rdoNumeric}, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:="Viridis") + ucrPnlVisualizeData.AddToLinkedControls({ucrInputColour}, {rdoNumeric}, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:="Grey") + + ucrInputColour.SetParameter(New RParameter("na_colour", 4)) + ucrInputColour.SetLinkedDisplayControl(lblColour) + ucrInputColour.SetRDefault(Chr(34) & "Grey" & Chr(34)) + ucrInputColour.SetItems(New Dictionary(Of String, String)(GgplotDefaults.dctColour)) ucrPnlSelectData.AddParameterPresentCondition(rdoWholeDataFrame, "data") ucrPnlSelectData.AddParameterPresentCondition(rdoSelectedColumn, "x") @@ -77,6 +103,15 @@ Public Class dlgVisualizeData ucrChkSortVariables.SetText("Sort Variables") ucrChkSortVariables.SetValuesCheckedAndUnchecked("TRUE", "FALSE") + ucrInputColourPalette.SetParameter(New RParameter("viridis_option", 3)) + dctColourPallette.Add("Viridis", Chr(34) & "A" & Chr(34)) + dctColourPallette.Add("Magma", Chr(34) & "B" & Chr(34)) + dctColourPallette.Add("Inferno", Chr(34) & "C" & Chr(34)) + dctColourPallette.Add("Plasma", Chr(34) & "D" & Chr(34)) + dctColourPallette.Add("Cividis", Chr(34) & "E" & Chr(34)) + ucrInputColourPalette.SetItems(dctColourPallette) + ucrInputColourPalette.SetDropDownStyleAsNonEditable() + ucrInputComboboxPalette.SetParameter(New RParameter("palette", 2)) dctPalette.Add("default", Chr(34) & "default" & Chr(34)) dctPalette.Add("qual", Chr(34) & "qual" & Chr(34)) @@ -84,24 +119,17 @@ Public Class dlgVisualizeData ucrInputComboboxPalette.SetDropDownStyleAsNonEditable() ucrInputComboboxPalette.SetItems(dctPalette) - ucrNudMaximumSize.SetMinMax(0.1, Integer.MaxValue) ucrNudMaximumSize.DecimalPlaces = 1 ucrNudMaximumSize.Increment = 0.1 + ucrNudMaximumSize.Minimum = 0.1 + ucrNudMaximumSize.Maximum = Integer.MaxValue ' Not yet implemented ucrNudSamplingFunction.SetParameter(New RParameter("prob", 2)) - ucrNudSamplingFunction.SetMinMax(0.01, 1) ucrNudSamplingFunction.DecimalPlaces = 2 ucrNudSamplingFunction.Increment = 0.01 - - ucrChkAdjustSize.SetText("Adjust size of variable names:") - ucrChkAdjustSize.AddToLinkedControls(ucrNudAdjustSize, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:=5) - ucrNudAdjustSize.SetParameter(New RParameter("size", 0)) - ucrNudAdjustSize.SetMinMax(0.1, 15) - ucrNudAdjustSize.DecimalPlaces = 1 - ucrNudAdjustSize.Increment = 0.1 - ucrChkAdjustSize.AddParameterPresentCondition(True, "size") - ucrChkAdjustSize.AddParameterPresentCondition(False, "size", False) + ucrNudSamplingFunction.Minimum = 0.01 + ucrNudSamplingFunction.Maximum = 1 ucrReceiverVisualizeData.SetParameter(New RParameter("x", 0)) ucrReceiverVisualizeData.SetParameterIsRFunction() @@ -116,6 +144,12 @@ Public Class dlgVisualizeData lstMaximumSizeControls.Add(lblMillionDataPoints) lstMaximumSizeControls.Add(lblMaximumSize) ucrNudMaximumSize.SetLinkedDisplayControl(lstMaximumSizeControls) + ucrInputColourPalette.SetLinkedDisplayControl(lblpalettecolor) + + ucrChkFacet.SetText("Facets") + ucrChkFacet.AddToLinkedControls(ucrByFactorsReceiver, {True}, bNewLinkedHideIfParameterMissing:=True) + ucrChkFacet.AddParameterValuesCondition(True, "checked", "True") + ucrChkFacet.AddParameterValuesCondition(False, "checked", "False") ucrNudSamplingFunction.SetLinkedDisplayControl(lblSampling) ucrPnlSelectData.AddToLinkedControls(ucrReceiverVisualizeData, {rdoSelectedColumn}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) @@ -131,43 +165,45 @@ Public Class dlgVisualizeData clsVisDatFunction = New RFunction clsVisMissFunction = New RFunction clsVisGuessFunction = New RFunction + clsVisValueFunction = New RFunction clsFilterFunction = New RFunction clsRBinonFunction = New RFunction + clsDummyFunction = New RFunction clsAsLogicalFunction = New RFunction clsNRowFunction = New RFunction - clsElementTextFunction = New RFunction - clsThemeFunction = New RFunction - clsBaseOperator = New ROperator - + clsGetVariableFunction = New RFunction clsPipeOperator = New ROperator ucrSelectorVisualizeData.Reset() ucrSaveGraph.Reset() clsCurrBaseFunction = clsVisDatFunction - clsThemeFunction.SetPackageName("ggplot2") - clsThemeFunction.SetRCommand("theme") - clsThemeFunction.AddParameter("axis.text.x", clsRFunctionParameter:=clsElementTextFunction, iPosition:=0) - - clsElementTextFunction.SetPackageName("ggplot2") - clsElementTextFunction.SetRCommand("element_text") + clsGetVariableFunction.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$get_columns_from_data") + clsGetVariableFunction.SetAssignTo("colnames") + clsGetVariableFunction.AddParameter("force_as_data_frame", "TRUE") clsVisDatFunction.SetPackageName("visdat") clsVisDatFunction.SetRCommand("vis_dat") - clsVisDatFunction.AddParameter("data", clsRFunctionParameter:=ucrSelectorVisualizeData.ucrAvailableDataFrames.clsCurrDataFrame, bIncludeArgumentName:=False, iPosition:=0) + clsVisDatFunction.AddParameter("data", clsRFunctionParameter:=clsGetVariableFunction, bIncludeArgumentName:=False, iPosition:=0) clsVisDatFunction.AddParameter("sort_type", "FALSE", iPosition:=1) clsVisDatFunction.AddParameter("palette", Chr(34) & "default" & Chr(34), iPosition:=2) clsVisDatFunction.AddParameter("warn_large_data", "TRUE", iPosition:=3) clsVisMissFunction.SetPackageName("visdat") clsVisMissFunction.SetRCommand("vis_miss") - clsVisMissFunction.AddParameter("data", clsRFunctionParameter:=ucrSelectorVisualizeData.ucrAvailableDataFrames.clsCurrDataFrame, bIncludeArgumentName:=False, iPosition:=0) + clsVisMissFunction.AddParameter("data", clsRFunctionParameter:=clsGetVariableFunction, bIncludeArgumentName:=False, iPosition:=0) clsVisMissFunction.AddParameter("cluster", "FALSE", iPosition:=1) clsVisMissFunction.AddParameter("sort_miss", "FALSE", iPosition:=2) clsVisMissFunction.AddParameter("show_perc", "TRUE", iPosition:=3) clsVisMissFunction.AddParameter("show_perc_col", "TRUE", iPosition:=4) clsVisMissFunction.AddParameter("warn_large_data", "TRUE", iPosition:=6) + clsVisValueFunction.SetPackageName("visdat") + clsVisValueFunction.SetRCommand("vis_value") + clsVisValueFunction.AddParameter("data", clsRFunctionParameter:=clsGetVariableFunction, bIncludeArgumentName:=False, iPosition:=0) + clsVisValueFunction.AddParameter("viridis_option", Chr(34) & "A" & Chr(34), iPosition:=1) + clsVisValueFunction.AddParameter("na_colour", Chr(34) & "grey" & Chr(34), iPosition:=2) + clsPipeOperator.SetOperation("%>%") clsPipeOperator.AddParameter("right", clsRFunctionParameter:=clsFilterFunction, iPosition:=1) @@ -189,30 +225,35 @@ Public Class dlgVisualizeData clsVisGuessFunction.SetRCommand("vis_guess") clsVisGuessFunction.AddParameter("data", clsRFunctionParameter:=ucrSelectorVisualizeData.ucrAvailableDataFrames.clsCurrDataFrame, bIncludeArgumentName:=False, iPosition:=0) - clsBaseOperator.SetOperation("+") - clsBaseOperator.AddParameter("left", clsRFunctionParameter:=clsCurrBaseFunction, iPosition:=0) - - clsBaseOperator.SetAssignTo("last_graph", strTempDataframe:=ucrSelectorVisualizeData.ucrAvailableDataFrames.cboAvailableDataFrames.Text, strTempGraph:="last_graph") - ucrBase.clsRsyntax.SetBaseROperator(clsBaseOperator) + clsCurrBaseFunction.SetAssignTo("last_graph", strTempDataframe:=ucrSelectorVisualizeData.ucrAvailableDataFrames.cboAvailableDataFrames.Text, strTempGraph:="last_graph") + ucrBase.clsRsyntax.SetBaseRFunction(clsCurrBaseFunction) End Sub Private Sub SetRCodeForControls(bReset As Boolean) ucrReceiverVisualizeData.AddAdditionalCodeParameterPair(clsVisMissFunction, New RParameter("x", 0), 1) ucrReceiverVisualizeData.AddAdditionalCodeParameterPair(clsVisGuessFunction, New RParameter("x", 0), 2) + ucrReceiverVisualizeData.AddAdditionalCodeParameterPair(clsVisValueFunction, New RParameter("x", 0), 3) + ucrReceiverVisualizeData.AddAdditionalCodeParameterPair(clsPipeOperator, New RParameter("left", 0, bNewIncludeArgumentName:=False), 4) + ucrSelectorVisualizeData.AddAdditionalCodeParameterPair(clsPipeOperator, New RParameter("left", 0, bNewIncludeArgumentName:=False), 1) + ucrSaveGraph.AddAdditionalRCode(clsVisMissFunction, iAdditionalPairNo:=1) + ucrSaveGraph.AddAdditionalRCode(clsVisGuessFunction, iAdditionalPairNo:=2) + ucrSaveGraph.AddAdditionalRCode(clsVisValueFunction, iAdditionalPairNo:=3) ucrInputComboboxPalette.AddAdditionalCodeParameterPair(clsVisGuessFunction, New RParameter("palette", 1), iAdditionalPairNo:=1) ucrChkSortVariables.AddAdditionalCodeParameterPair(clsVisMissFunction, New RParameter("sort_miss", 2), iAdditionalPairNo:=1) - ucrPnlSelectData.SetRCode(clsCurrBaseFunction, bReset) ucrPnlVisualizeData.SetRCode(clsCurrBaseFunction, bReset) - ucrReceiverVisualizeData.SetRCode(clsVisDatFunction, bReset) ucrSelectorVisualizeData.SetRCode(clsNRowFunction, bReset) - ucrSaveGraph.SetRCode(clsBaseOperator, bReset) + ucrSaveGraph.SetRCode(clsVisDatFunction, bReset) ucrInputComboboxPalette.SetRCode(clsVisDatFunction, bReset) + ucrInputColourPalette.SetRCode(clsVisValueFunction, bReset) + ucrInputColour.SetRCode(clsVisValueFunction, bReset) ucrChkSortVariables.SetRCode(clsVisDatFunction) - ucrNudAdjustSize.SetRCode(clsElementTextFunction, bReset) - ucrChkAdjustSize.SetRCode(clsElementTextFunction, bReset) ucrNudSamplingFunction.SetRCode(clsRBinonFunction, bReset) + If bReset Then + ucrReceiverVisualizeData.SetRCode(clsVisDatFunction, bReset) + ucrChkFacet.SetRCode(clsDummyFunction, bReset) + End If End Sub Private Sub TestOkEnabled() @@ -233,25 +274,43 @@ Public Class dlgVisualizeData Private Sub ucrPnlVisualizeData_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrPnlVisualizeData.ControlValueChanged If rdoVisDat.Checked Then + ucrReceiverVisualizeData.SetIncludedDataTypes({"numeric", "logical", "factor", "character", "interger", "Date"}) ucrSaveGraph.SetPrefix("vis_dat") clsCurrBaseFunction = clsVisDatFunction ElseIf rdoVisMiss.Checked Then + ucrReceiverVisualizeData.SetIncludedDataTypes({"numeric", "logical", "factor", "character", "interger", "Date"}) ucrSaveGraph.SetPrefix("vis_miss") clsCurrBaseFunction = clsVisMissFunction ElseIf rdoVisGuess.Checked Then + ucrReceiverVisualizeData.SetIncludedDataTypes({"numeric", "logical", "factor", "character", "interger", "Date"}) ucrSaveGraph.SetPrefix("vis_guess") clsCurrBaseFunction = clsVisGuessFunction + ElseIf rdoNumeric.Checked Then + ucrReceiverVisualizeData.SetIncludedDataTypes({"numeric", "logical", "interger"}) + ucrSaveGraph.SetPrefix("vis_value") + clsCurrBaseFunction = clsVisValueFunction End If - ucrBase.clsRsyntax.SetBaseROperator(clsBaseOperator) + ucrBase.clsRsyntax.SetBaseRFunction(clsCurrBaseFunction) AddRemoveDataHideOptionsButtons() + If rdoNumeric.Checked Then + rdoWholeDataFrame.Enabled = False + Else + rdoWholeDataFrame.Enabled = True + End If End Sub Private Sub AddRemoveDataHideOptionsButtons() If rdoWholeDataFrame.Checked Then - ucrSelectorVisualizeData.lstAvailableVariable.Visible = False - ucrSelectorVisualizeData.btnAdd.Visible = False - ucrSelectorVisualizeData.btnDataOptions.Visible = False - ElseIf rdoSelectedColumn.Checked Then + If ucrChkFacet.Checked Then + ucrSelectorVisualizeData.lstAvailableVariable.Visible = True + ucrSelectorVisualizeData.btnAdd.Visible = True + ucrSelectorVisualizeData.btnDataOptions.Visible = True + Else + ucrSelectorVisualizeData.lstAvailableVariable.Visible = False + ucrSelectorVisualizeData.btnAdd.Visible = False + ucrSelectorVisualizeData.btnDataOptions.Visible = False + End If + Else ucrSelectorVisualizeData.lstAvailableVariable.Visible = True ucrSelectorVisualizeData.btnAdd.Visible = True ucrSelectorVisualizeData.btnDataOptions.Visible = True @@ -276,6 +335,17 @@ Public Class dlgVisualizeData End If End Sub + Private Sub SetHelpOptions() + Select Case enumVisualizeMode + Case VisualizeMode.Prepare + ucrBase.iHelpTopicID = 54 + Case VisualizeMode.Describe + ucrBase.iHelpTopicID = 600 + Case VisualizeMode.Climatic + ucrBase.iHelpTopicID = 524 + End Select + End Sub + Private Sub ucrNudMaximumSize_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrNudMaximumSize.ControlValueChanged MaximumDataPoint() End Sub @@ -285,13 +355,16 @@ Public Class dlgVisualizeData clsVisDatFunction.RemoveParameterByName("data") clsVisGuessFunction.RemoveParameterByName("data") clsVisMissFunction.RemoveParameterByName("data") + clsVisValueFunction.RemoveParameterByName("data") If ucrNudSamplingFunction.Value = 1 Then clsVisDatFunction.RemoveParameterByName("x") clsVisGuessFunction.RemoveParameterByName("x") clsVisMissFunction.RemoveParameterByName("x") - clsVisDatFunction.AddParameter("x", clsRFunctionParameter:=ucrReceiverVisualizeData.GetVariables(True), bIncludeArgumentName:=False, iPosition:=0) + clsVisValueFunction.RemoveParameterByName("x") + clsVisValueFunction.AddParameter("x", clsRFunctionParameter:=clsGetVariableFunction, bIncludeArgumentName:=False, iPosition:=0) + clsVisDatFunction.AddParameter("x", clsRFunctionParameter:=clsGetVariableFunction, bIncludeArgumentName:=False, iPosition:=0) clsVisGuessFunction.AddParameter("x", clsRFunctionParameter:=ucrReceiverVisualizeData.GetVariables(True), bIncludeArgumentName:=False, iPosition:=0) - clsVisMissFunction.AddParameter("x", clsRFunctionParameter:=ucrReceiverVisualizeData.GetVariables(True), bIncludeArgumentName:=False, iPosition:=0) + clsVisMissFunction.AddParameter("x", clsRFunctionParameter:=clsGetVariableFunction, bIncludeArgumentName:=False, iPosition:=0) Else ' if it is not checked we run vis_dat(col = columns selected) clsVisDatFunction.RemoveParameterByName("x") clsVisGuessFunction.RemoveParameterByName("x") @@ -300,35 +373,62 @@ Public Class dlgVisualizeData clsVisDatFunction.AddParameter("x", clsROperatorParameter:=clsPipeOperator, iPosition:=0) clsVisGuessFunction.AddParameter("x", clsROperatorParameter:=clsPipeOperator, iPosition:=0) clsVisMissFunction.AddParameter("x", clsROperatorParameter:=clsPipeOperator, iPosition:=0) + clsVisValueFunction.AddParameter("x", clsROperatorParameter:=clsPipeOperator, iPosition:=0) clsPipeOperator.AddParameter("left", clsRFunctionParameter:=ucrReceiverVisualizeData.GetVariables(True), iPosition:=0) End If ElseIf rdoWholeDataFrame.Checked Then clsVisDatFunction.RemoveParameterByName("x") clsVisGuessFunction.RemoveParameterByName("x") clsVisMissFunction.RemoveParameterByName("x") + clsVisValueFunction.RemoveParameterByName("x") If ucrNudSamplingFunction.Value = 1 Then clsVisDatFunction.AddParameter("data", clsRFunctionParameter:=ucrSelectorVisualizeData.ucrAvailableDataFrames.clsCurrDataFrame, bIncludeArgumentName:=False, iPosition:=0) clsVisGuessFunction.AddParameter("data", clsRFunctionParameter:=ucrSelectorVisualizeData.ucrAvailableDataFrames.clsCurrDataFrame, bIncludeArgumentName:=False, iPosition:=0) clsVisMissFunction.AddParameter("data", clsRFunctionParameter:=ucrSelectorVisualizeData.ucrAvailableDataFrames.clsCurrDataFrame, bIncludeArgumentName:=False, iPosition:=0) + clsVisValueFunction.AddParameter("data", clsRFunctionParameter:=ucrSelectorVisualizeData.ucrAvailableDataFrames.clsCurrDataFrame, bIncludeArgumentName:=False, iPosition:=0) Else clsPipeOperator.RemoveParameterByName("left") clsPipeOperator.AddParameter("left", clsRFunctionParameter:=ucrSelectorVisualizeData.ucrAvailableDataFrames.clsCurrDataFrame, iPosition:=0) clsVisDatFunction.AddParameter("data", clsROperatorParameter:=clsPipeOperator, iPosition:=0, bIncludeArgumentName:=False) clsVisGuessFunction.AddParameter("data", clsROperatorParameter:=clsPipeOperator, iPosition:=0, bIncludeArgumentName:=False) clsVisMissFunction.AddParameter("data", clsROperatorParameter:=clsPipeOperator, iPosition:=0, bIncludeArgumentName:=False) + clsVisValueFunction.AddParameter("data", clsROperatorParameter:=clsPipeOperator, iPosition:=0, bIncludeArgumentName:=False) End If End If End Sub - Private Sub ucrChkAdjustSize_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkAdjustSize.ControlValueChanged - If ucrChkAdjustSize.Checked Then - clsBaseOperator.AddParameter("right", clsRFunctionParameter:=clsThemeFunction, iPosition:=1) + Private Sub ucrCore_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrReceiverVisualizeData.ControlContentsChanged, ucrSelectorVisualizeData.ControlContentsChanged, ucrPnlSelectData.ControlContentsChanged, ucrSaveGraph.ControlContentsChanged, ucrNudMaximumSize.ControlValueChanged, ucrNudSamplingFunction.ControlValueChanged + TestOkEnabled() + End Sub + + Private Sub ucrChkFacet_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkFacet.ControlValueChanged, ucrByFactorsReceiver.ControlValueChanged + If ucrChkFacet.Checked Then + ucrByFactorsReceiver.SetMeAsReceiver() + If Not ucrByFactorsReceiver.IsEmpty Then + clsVisDatFunction.AddParameter("facet", ucrByFactorsReceiver.GetVariableNames(bWithQuotes:=False)) + clsVisMissFunction.AddParameter("facet", ucrByFactorsReceiver.GetVariableNames(bWithQuotes:=False)) + Else + clsVisDatFunction.RemoveParameterByName("facet") + clsVisMissFunction.RemoveParameterByName("facet") + End If Else - clsBaseOperator.RemoveParameterByName("right") + ucrReceiverVisualizeData.SetMeAsReceiver() + clsVisDatFunction.RemoveParameterByName("facet") + clsVisMissFunction.RemoveParameterByName("facet") End If + AddRemoveDataHideOptionsButtons() End Sub - Private Sub ucrCore_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrReceiverVisualizeData.ControlContentsChanged, ucrSelectorVisualizeData.ControlContentsChanged, ucrPnlSelectData.ControlContentsChanged, ucrSaveGraph.ControlContentsChanged, ucrNudMaximumSize.ControlValueChanged, ucrNudSamplingFunction.ControlValueChanged - TestOkEnabled() + Private Sub ucrByFactorsReceiver_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrByFactorsReceiver.ControlValueChanged, ucrReceiverVisualizeData.ControlValueChanged, ucrSelectorVisualizeData.ControlValueChanged, ucrPnlVisualizeData.ControlValueChanged + If ucrReceiverVisualizeData.lstSelectedVariables.Items.Count <= 0 Then + Exit Sub + End If + Dim lstvariable As List(Of String) = ucrReceiverVisualizeData.GetVariableNamesAsList + Dim strFacetvariable As String = ucrByFactorsReceiver.GetVariableNames(False) + If Not ucrByFactorsReceiver.IsEmpty AndAlso (rdoVisDat.Checked OrElse rdoVisMiss.Checked) AndAlso Not lstvariable.Contains(strFacetvariable) Then + lstvariable.Add(strFacetvariable) + End If + clsGetVariableFunction.AddParameter("data_name", Chr(34) & ucrSelectorVisualizeData.ucrAvailableDataFrames.strCurrDataFrame & Chr(34), iPosition:=0) + clsGetVariableFunction.AddParameter("col_names", frmMain.clsRLink.GetListAsRString(lstvariable, bWithQuotes:=True), iPosition:=1) End Sub End Class \ No newline at end of file diff --git a/instat/dlgWindPollutionRose.vb b/instat/dlgWindPollutionRose.vb index c34d8af07ce..79c87d4b71d 100644 --- a/instat/dlgWindPollutionRose.vb +++ b/instat/dlgWindPollutionRose.vb @@ -41,7 +41,7 @@ Public Class dlgWindPollutionRose Dim dctStatistic As New Dictionary(Of String, String) Dim dctPosition As New Dictionary(Of String, String) Dim dctColor As New Dictionary(Of String, String) - + ucrBase.iHelpTopicID = 184 ucrBase.clsRsyntax.iCallType = 3 ucrSelectorWindPollutionRose.SetParameter(New RParameter("mydata", 0)) diff --git a/instat/frmConvertToNumeric.vb b/instat/frmConvertToNumeric.vb index 1e96b686967..d4a6082d7c0 100644 --- a/instat/frmConvertToNumeric.vb +++ b/instat/frmConvertToNumeric.vb @@ -68,9 +68,7 @@ Public Class frmConvertToNumeric End Sub Private Sub cmdHelp_Click(sender As Object, e As EventArgs) Handles cmdHelp.Click - Help.ShowHelp(Me.Parent, frmMain.strStaticPath & "\" & frmMain.strHelpFilePath, HelpNavigator.TableOfContents) - 'Replace with specific page once written - 'Help.ShowHelp(Me.Parent, frmMain.strStaticPath & "\" & frmMain.strHelpFilePath, HelpNavigator.TopicId, iHelpTopicID.ToString()) + Help.ShowHelp(Me.Parent, frmMain.strStaticPath & "\" & frmMain.strHelpFilePath, HelpNavigator.TopicId, "614") End Sub Private Sub cmdInspectValues_Click(sender As Object, e As EventArgs) Handles cmdInspectValues.Click diff --git a/instat/frmMain.Designer.vb b/instat/frmMain.Designer.vb index a9172782aa6..123b0175b38 100644 --- a/instat/frmMain.Designer.vb +++ b/instat/frmMain.Designer.vb @@ -189,6 +189,8 @@ Partial Class frmMain Me.mnuClimaticFileExportToClimsoft = New System.Windows.Forms.ToolStripMenuItem() Me.mnuClimaticFileExportToCPT = New System.Windows.Forms.ToolStripMenuItem() Me.mnuExportToWWRToolStrip = New System.Windows.Forms.ToolStripMenuItem() + Me.mnuClimaticFileExportToClimpact = New System.Windows.Forms.ToolStripMenuItem() + Me.mnuClimaticFileExportToGoogleBucketsToolStrip = New System.Windows.Forms.ToolStripMenuItem() Me.ToolStripSeparator18 = New System.Windows.Forms.ToolStripSeparator() Me.mnuExamineEditData = New System.Windows.Forms.ToolStripMenuItem() Me.mnuClimaticExamineEditDataVisualiseData = New System.Windows.Forms.ToolStripMenuItem() @@ -281,6 +283,7 @@ Partial Class frmMain Me.mnuClimaticPICSA = New System.Windows.Forms.ToolStripMenuItem() Me.mnuClimaticPICSARainfallGraph = New System.Windows.Forms.ToolStripMenuItem() Me.mnuClimaticPICSATemperatureGraph = New System.Windows.Forms.ToolStripMenuItem() + Me.mnuClimaticPICSAGeneralGrap = New System.Windows.Forms.ToolStripMenuItem() Me.ToolStripSeparator73 = New System.Windows.Forms.ToolStripSeparator() Me.mnuClimaticPICSACumExeedenceGraph = New System.Windows.Forms.ToolStripMenuItem() Me.mnuClimaticPICSACrops = New System.Windows.Forms.ToolStripMenuItem() @@ -1630,7 +1633,7 @@ Partial Class frmMain ' 'mnuClimaticFile ' - Me.mnuClimaticFile.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticFileImportSST, Me.mnuClimaticFileImportfromIRIDataLibrary, Me.mnuClimaticFileImportfromClimateDataStore, Me.mnuClimaticFileImportandTidyNetCDF, Me.mnuClimaticFileImportandTidyShapefile, Me.ToolStripSeparator20, Me.mnuClimateFileImportfromClimSoft, Me.mnuClimateFileImportfromClimSoftWizard, Me.mnuClimaticFileImportfromCliData, Me.ToolStripSeparator15, Me.mnuClimaticFileExportToClimsoft, Me.mnuClimaticFileExportToCPT, Me.mnuExportToWWRToolStrip}) + Me.mnuClimaticFile.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticFileImportSST, Me.mnuClimaticFileImportfromIRIDataLibrary, Me.mnuClimaticFileImportfromClimateDataStore, Me.mnuClimaticFileImportandTidyNetCDF, Me.mnuClimaticFileImportandTidyShapefile, Me.ToolStripSeparator20, Me.mnuClimateFileImportfromClimSoft, Me.mnuClimateFileImportfromClimSoftWizard, Me.mnuClimaticFileImportfromCliData, Me.ToolStripSeparator15, Me.mnuClimaticFileExportToClimsoft, Me.mnuClimaticFileExportToCPT, Me.mnuExportToWWRToolStrip, Me.mnuClimaticFileExportToClimpact, Me.mnuClimaticFileExportToGoogleBucketsToolStrip}) Me.mnuClimaticFile.Name = "mnuClimaticFile" Me.mnuClimaticFile.Size = New System.Drawing.Size(212, 22) Me.mnuClimaticFile.Text = "File" @@ -1714,6 +1717,19 @@ Partial Class frmMain Me.mnuExportToWWRToolStrip.Size = New System.Drawing.Size(282, 22) Me.mnuExportToWWRToolStrip.Text = "Export to World Weather Records..." ' + 'mnuClimaticFileExportToClimpact + ' + Me.mnuClimaticFileExportToClimpact.Name = "mnuClimaticFileExportToClimpact" + Me.mnuClimaticFileExportToClimpact.Size = New System.Drawing.Size(282, 22) + Me.mnuClimaticFileExportToClimpact.Text = "Export to Climpact..." + ' + 'mnuClimaticFileExportToGoogleBucketsToolStrip + ' + Me.mnuClimaticFileExportToGoogleBucketsToolStrip.Enabled = False + Me.mnuClimaticFileExportToGoogleBucketsToolStrip.Name = "mnuClimaticFileExportToGoogleBucketsToolStrip" + Me.mnuClimaticFileExportToGoogleBucketsToolStrip.Size = New System.Drawing.Size(282, 22) + Me.mnuClimaticFileExportToGoogleBucketsToolStrip.Text = "Export to Google Buckets..." + ' 'ToolStripSeparator18 ' Me.ToolStripSeparator18.Name = "ToolStripSeparator18" @@ -2197,7 +2213,6 @@ Partial Class frmMain ' 'mnuClimaticDescribeIDF ' - Me.mnuClimaticDescribeIDF.Enabled = False Me.mnuClimaticDescribeIDF.Name = "mnuClimaticDescribeIDF" Me.mnuClimaticDescribeIDF.Size = New System.Drawing.Size(211, 22) Me.mnuClimaticDescribeIDF.Text = "IDF..." @@ -2270,7 +2285,7 @@ Partial Class frmMain ' 'mnuClimaticPICSA ' - Me.mnuClimaticPICSA.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticPICSARainfallGraph, Me.mnuClimaticPICSATemperatureGraph, Me.ToolStripSeparator73, Me.mnuClimaticPICSACumExeedenceGraph, Me.mnuClimaticPICSACrops}) + Me.mnuClimaticPICSA.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticPICSARainfallGraph, Me.mnuClimaticPICSATemperatureGraph, Me.mnuClimaticPICSAGeneralGrap, Me.ToolStripSeparator73, Me.mnuClimaticPICSACumExeedenceGraph, Me.mnuClimaticPICSACrops}) Me.mnuClimaticPICSA.Name = "mnuClimaticPICSA" Me.mnuClimaticPICSA.Size = New System.Drawing.Size(212, 22) Me.mnuClimaticPICSA.Text = "PICSA" @@ -2287,6 +2302,12 @@ Partial Class frmMain Me.mnuClimaticPICSATemperatureGraph.Size = New System.Drawing.Size(246, 22) Me.mnuClimaticPICSATemperatureGraph.Text = "Temperature Graph..." ' + 'mnuClimaticPICSAGeneralGrap + ' + Me.mnuClimaticPICSAGeneralGrap.Name = "mnuClimaticPICSAGeneralGrap" + Me.mnuClimaticPICSAGeneralGrap.Size = New System.Drawing.Size(246, 22) + Me.mnuClimaticPICSAGeneralGrap.Text = "General Graph..." + ' 'ToolStripSeparator73 ' Me.ToolStripSeparator73.Name = "ToolStripSeparator73" @@ -2886,7 +2907,7 @@ Partial Class frmMain ' Me.mnuEditFind.Name = "mnuEditFind" Me.mnuEditFind.ShortcutKeys = CType((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.F), System.Windows.Forms.Keys) - Me.mnuEditFind.Size = New System.Drawing.Size(167, 22) + Me.mnuEditFind.Size = New System.Drawing.Size(192, 22) Me.mnuEditFind.Tag = "Find" Me.mnuEditFind.Text = "Find" ' @@ -2894,7 +2915,7 @@ Partial Class frmMain ' Me.mnuEditCopy.Name = "mnuEditCopy" Me.mnuEditCopy.ShortcutKeys = CType((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.C), System.Windows.Forms.Keys) - Me.mnuEditCopy.Size = New System.Drawing.Size(167, 22) + Me.mnuEditCopy.Size = New System.Drawing.Size(192, 22) Me.mnuEditCopy.Tag = "Copy" Me.mnuEditCopy.Text = "Copy" ' @@ -2902,27 +2923,27 @@ Partial Class frmMain ' Me.mnuEditPaste.Name = "mnuEditPaste" Me.mnuEditPaste.ShortcutKeys = CType((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.V), System.Windows.Forms.Keys) - Me.mnuEditPaste.Size = New System.Drawing.Size(167, 22) + Me.mnuEditPaste.Size = New System.Drawing.Size(192, 22) Me.mnuEditPaste.Tag = "Paste" Me.mnuEditPaste.Text = "Paste" ' 'mnuEditPasteNew ' Me.mnuEditPasteNew.Name = "mnuEditPasteNew" - Me.mnuEditPasteNew.Size = New System.Drawing.Size(167, 22) - Me.mnuEditPasteNew.Text = "Paste New" + Me.mnuEditPasteNew.Size = New System.Drawing.Size(192, 22) + Me.mnuEditPasteNew.Text = "Paste New Data Frame" ' 'mnuEditWordwrap ' Me.mnuEditWordwrap.Name = "mnuEditWordwrap" - Me.mnuEditWordwrap.Size = New System.Drawing.Size(167, 22) + Me.mnuEditWordwrap.Size = New System.Drawing.Size(192, 22) Me.mnuEditWordwrap.Text = "Wordwrap" ' 'mnuEditSelectAll ' Me.mnuEditSelectAll.Name = "mnuEditSelectAll" Me.mnuEditSelectAll.ShortcutKeys = CType((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.A), System.Windows.Forms.Keys) - Me.mnuEditSelectAll.Size = New System.Drawing.Size(167, 22) + Me.mnuEditSelectAll.Size = New System.Drawing.Size(192, 22) Me.mnuEditSelectAll.Tag = "Select_All" Me.mnuEditSelectAll.Text = "Select All " ' @@ -4925,7 +4946,7 @@ Partial Class frmMain Me.splOverall.Panel2.BackColor = System.Drawing.SystemColors.Control Me.splOverall.Panel2.Controls.Add(Me.splDataOutput) Me.splOverall.Size = New System.Drawing.Size(834, 399) - Me.splOverall.SplitterDistance = 164 + Me.splOverall.SplitterDistance = 163 Me.splOverall.SplitterWidth = 5 Me.splOverall.TabIndex = 10 ' @@ -4945,8 +4966,8 @@ Partial Class frmMain ' Me.splExtraWindows.Panel2.BackColor = System.Drawing.SystemColors.Control Me.splExtraWindows.Panel2.Controls.Add(Me.ucrScriptWindow) - Me.splExtraWindows.Size = New System.Drawing.Size(834, 164) - Me.splExtraWindows.SplitterDistance = 254 + Me.splExtraWindows.Size = New System.Drawing.Size(834, 163) + Me.splExtraWindows.SplitterDistance = 253 Me.splExtraWindows.SplitterWidth = 5 Me.splExtraWindows.TabIndex = 0 ' @@ -4965,8 +4986,8 @@ Partial Class frmMain ' Me.splMetadata.Panel2.BackColor = System.Drawing.SystemColors.Control Me.splMetadata.Panel2.Controls.Add(Me.ucrDataFrameMeta) - Me.splMetadata.Size = New System.Drawing.Size(254, 164) - Me.splMetadata.SplitterDistance = 70 + Me.splMetadata.Size = New System.Drawing.Size(253, 163) + Me.splMetadata.SplitterDistance = 69 Me.splMetadata.SplitterWidth = 5 Me.splMetadata.TabIndex = 0 ' @@ -4979,7 +5000,7 @@ Partial Class frmMain Me.ucrColumnMeta.Location = New System.Drawing.Point(0, 0) Me.ucrColumnMeta.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.ucrColumnMeta.Name = "ucrColumnMeta" - Me.ucrColumnMeta.Size = New System.Drawing.Size(70, 164) + Me.ucrColumnMeta.Size = New System.Drawing.Size(69, 163) Me.ucrColumnMeta.TabIndex = 0 ' 'ucrDataFrameMeta @@ -4990,7 +5011,7 @@ Partial Class frmMain Me.ucrDataFrameMeta.Location = New System.Drawing.Point(0, 0) Me.ucrDataFrameMeta.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.ucrDataFrameMeta.Name = "ucrDataFrameMeta" - Me.ucrDataFrameMeta.Size = New System.Drawing.Size(179, 164) + Me.ucrDataFrameMeta.Size = New System.Drawing.Size(179, 163) Me.ucrDataFrameMeta.TabIndex = 0 ' 'ucrScriptWindow @@ -5001,7 +5022,7 @@ Partial Class frmMain Me.ucrScriptWindow.Location = New System.Drawing.Point(0, 0) Me.ucrScriptWindow.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.ucrScriptWindow.Name = "ucrScriptWindow" - Me.ucrScriptWindow.Size = New System.Drawing.Size(575, 164) + Me.ucrScriptWindow.Size = New System.Drawing.Size(576, 163) Me.ucrScriptWindow.strActiveTabText = "" Me.ucrScriptWindow.TabIndex = 2 Me.ucrScriptWindow.Tag = "Script_Window" @@ -5022,8 +5043,8 @@ Partial Class frmMain ' Me.splDataOutput.Panel2.BackColor = System.Drawing.SystemColors.Control Me.splDataOutput.Panel2.Controls.Add(Me.ucrOutput) - Me.splDataOutput.Size = New System.Drawing.Size(834, 230) - Me.splDataOutput.SplitterDistance = 384 + Me.splDataOutput.Size = New System.Drawing.Size(834, 231) + Me.splDataOutput.SplitterDistance = 383 Me.splDataOutput.SplitterWidth = 5 Me.splDataOutput.TabIndex = 0 ' @@ -5036,7 +5057,7 @@ Partial Class frmMain Me.ucrDataViewer.Location = New System.Drawing.Point(0, 0) Me.ucrDataViewer.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.ucrDataViewer.Name = "ucrDataViewer" - Me.ucrDataViewer.Size = New System.Drawing.Size(384, 230) + Me.ucrDataViewer.Size = New System.Drawing.Size(383, 231) Me.ucrDataViewer.TabIndex = 0 Me.ucrDataViewer.Tag = "Data_View" ' @@ -5048,7 +5069,7 @@ Partial Class frmMain Me.ucrOutput.Location = New System.Drawing.Point(0, 0) Me.ucrOutput.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.ucrOutput.Name = "ucrOutput" - Me.ucrOutput.Size = New System.Drawing.Size(445, 230) + Me.ucrOutput.Size = New System.Drawing.Size(446, 231) Me.ucrOutput.TabIndex = 0 ' 'mnuPlotly @@ -5100,8 +5121,8 @@ Partial Class frmMain Me.MainMenuStrip = Me.mnuBar Me.Name = "frmMain" Me.Text = "R-Instat " + My.Application.Info.Version.Major.ToString + "." + - My.Application.Info.Version.Minor.ToString + "." + - My.Application.Info.Version.Build.ToString() + My.Application.Info.Version.Minor.ToString + "." + + My.Application.Info.Version.Build.ToString Me.WindowState = System.Windows.Forms.FormWindowState.Maximized Me.stsStrip.ResumeLayout(False) Me.stsStrip.PerformLayout() @@ -5779,7 +5800,12 @@ Partial Class frmMain Friend WithEvents mnuClimaticDescribeOtherRosePlots As ToolStripMenuItem Friend WithEvents mnuClimaticDescribeTrendGraph As ToolStripMenuItem Friend WithEvents mnuClimaticDescribeSeasonalGraph As ToolStripMenuItem + + Friend WithEvents mnuClimaticFileExportToClimpact As ToolStripMenuItem + Friend WithEvents mnuViewSwapDataAndScript As ToolStripMenuItem Friend WithEvents mnuClimaticExamineEditDataVisualiseData As ToolStripMenuItem Friend WithEvents ToolStripSeparator27 As ToolStripSeparator + Friend WithEvents mnuClimaticPICSAGeneralGrap As ToolStripMenuItem + Friend WithEvents mnuClimaticFileExportToGoogleBucketsToolStrip As ToolStripMenuItem End Class diff --git a/instat/frmMain.vb b/instat/frmMain.vb index 4b8d4749022..551eec97e90 100644 --- a/instat/frmMain.vb +++ b/instat/frmMain.vb @@ -2281,6 +2281,7 @@ Public Class frmMain End Sub Private Sub mnuPrepareCheckDataVisualiseData_Click(sender As Object, e As EventArgs) Handles mnuPrepareCheckDataVisualiseData.Click + dlgVisualizeData.enumVisualizeMode = dlgVisualizeData.VisualizeMode.Prepare dlgVisualizeData.ShowDialog() End Sub @@ -2476,11 +2477,16 @@ Public Class frmMain dlgExportToClimsoft.ShowDialog() End Sub + Private Sub mnuClimaticFileExportToClimpact_Click(sender As Object, e As EventArgs) Handles mnuClimaticFileExportToClimpact.Click + dlgExportForClimpact.ShowDialog() + End Sub + Private Sub mnuPrepareDataReshapeScaleOrDistance_Click(sender As Object, e As EventArgs) Handles mnuPrepareDataReshapeScaleOrDistance.Click dlgCluster.ShowDialog() End Sub Private Sub mnuDescribeOneVariableVisualiseData_Click(sender As Object, e As EventArgs) Handles mnuDescribeOneVariableVisualiseData.Click + dlgVisualizeData.enumVisualizeMode = dlgVisualizeData.VisualizeMode.Describe dlgVisualizeData.ShowDialog() End Sub @@ -2668,6 +2674,20 @@ Public Class frmMain End Sub Private Sub mnuClimaticExamineEditDataVisualiseData_Click(sender As Object, e As EventArgs) Handles mnuClimaticExamineEditDataVisualiseData.Click + dlgVisualizeData.enumVisualizeMode = dlgVisualizeData.VisualizeMode.Climatic dlgVisualizeData.ShowDialog() End Sub + + Private Sub mnuClimaticPICSAGeneralGrap_Click(sender As Object, e As EventArgs) Handles mnuClimaticPICSAGeneralGrap.Click + dlgPICSARainfall.enumPICSAMode = dlgPICSARainfall.PICSAMode.General + dlgPICSARainfall.ShowDialog() + End Sub + + Private Sub mnuClimaticDescribeClimograph_Click(sender As Object, e As EventArgs) Handles mnuClimaticDescribeClimograph.Click + dlgClimograph.ShowDialog() + End Sub + + Private Sub mnuClimaticFileExportToGoogleBucketsToolStrip_Click(sender As Object, e As EventArgs) Handles mnuClimaticFileExportToGoogleBucketsToolStrip.Click + dlgExportClimaticDefinitions.ShowDialog() + End Sub End Class diff --git a/instat/instat.vbproj b/instat/instat.vbproj index 305340244de..a9f2605da8b 100644 --- a/instat/instat.vbproj +++ b/instat/instat.vbproj @@ -152,11 +152,11 @@ - - ..\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.7\lib\net461\RInsightF461.dll + + ..\packages\RInsightF461.0.0.10\lib\net461\RInsightF461.dll ..\packages\jacobslusser.ScintillaNET.3.6.3\lib\net40\ScintillaNET.dll @@ -227,6 +227,12 @@ Form + + dlgClimograph.vb + + + Form + dlgClusterAnalysis.vb @@ -239,6 +245,18 @@ Form + + dlgExportClimaticDefinitions.vb + + + Form + + + dlgExportForClimpact.vb + + + Form + dlgFindInVariableOrFilter.vb @@ -3043,6 +3061,9 @@ dlgClimaticNCMPVariogram.vb + + dlgClimograph.vb + dlgClimsoftWizard.vb @@ -3068,6 +3089,12 @@ dlgEdit.vb + + dlgExportClimaticDefinitions.vb + + + dlgExportForClimpact.vb + dlgExportToClimsoft.vb diff --git a/instat/packages.config b/instat/packages.config index 82fa6c86ff3..04fd4772f43 100644 --- a/instat/packages.config +++ b/instat/packages.config @@ -10,8 +10,8 @@ - - + + diff --git a/instat/sdgCalculationsSummmary.Designer.vb b/instat/sdgCalculationsSummmary.Designer.vb index ca1adec54dd..2d6baad1aed 100644 --- a/instat/sdgCalculationsSummmary.Designer.vb +++ b/instat/sdgCalculationsSummmary.Designer.vb @@ -82,9 +82,10 @@ Partial Class sdgCalculationsSummmary Me.tbSummaryCalcs.Controls.Add(Me.tbManipulations) Me.tbSummaryCalcs.Controls.Add(Me.tbSubCalcs) Me.tbSummaryCalcs.Location = New System.Drawing.Point(0, 0) + Me.tbSummaryCalcs.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.tbSummaryCalcs.Name = "tbSummaryCalcs" Me.tbSummaryCalcs.SelectedIndex = 0 - Me.tbSummaryCalcs.Size = New System.Drawing.Size(803, 533) + Me.tbSummaryCalcs.Size = New System.Drawing.Size(1004, 666) Me.tbSummaryCalcs.TabIndex = 1 ' 'tbMain @@ -104,10 +105,11 @@ Partial Class sdgCalculationsSummmary Me.tbMain.Controls.Add(Me.ucrSelectorBy) Me.tbMain.Controls.Add(Me.ucrPnlSave) Me.tbMain.Controls.Add(Me.ucrCalcSummary) - Me.tbMain.Location = New System.Drawing.Point(4, 22) + Me.tbMain.Location = New System.Drawing.Point(4, 25) + Me.tbMain.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.tbMain.Name = "tbMain" - Me.tbMain.Padding = New System.Windows.Forms.Padding(3) - Me.tbMain.Size = New System.Drawing.Size(795, 507) + Me.tbMain.Padding = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.tbMain.Size = New System.Drawing.Size(996, 637) Me.tbMain.TabIndex = 0 Me.tbMain.Text = "Main" Me.tbMain.UseVisualStyleBackColor = True @@ -115,20 +117,21 @@ Partial Class sdgCalculationsSummmary 'ucrDefineFilter ' Me.ucrDefineFilter.AutoSize = True - Me.ucrDefineFilter.Location = New System.Drawing.Point(8, 55) + Me.ucrDefineFilter.Location = New System.Drawing.Point(10, 69) + Me.ucrDefineFilter.Margin = New System.Windows.Forms.Padding(5, 5, 5, 5) Me.ucrDefineFilter.Name = "ucrDefineFilter" - Me.ucrDefineFilter.Size = New System.Drawing.Size(770, 389) + Me.ucrDefineFilter.Size = New System.Drawing.Size(962, 608) Me.ucrDefineFilter.TabIndex = 19 ' 'ucrReceiverByOrSort ' Me.ucrReceiverByOrSort.AutoSize = True Me.ucrReceiverByOrSort.frmParent = Nothing - Me.ucrReceiverByOrSort.Location = New System.Drawing.Point(239, 143) + Me.ucrReceiverByOrSort.Location = New System.Drawing.Point(299, 179) Me.ucrReceiverByOrSort.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverByOrSort.Name = "ucrReceiverByOrSort" Me.ucrReceiverByOrSort.Selector = Nothing - Me.ucrReceiverByOrSort.Size = New System.Drawing.Size(120, 100) + Me.ucrReceiverByOrSort.Size = New System.Drawing.Size(150, 125) Me.ucrReceiverByOrSort.strNcFilePath = "" Me.ucrReceiverByOrSort.TabIndex = 18 Me.ucrReceiverByOrSort.ucrSelector = Nothing @@ -139,17 +142,19 @@ Partial Class sdgCalculationsSummmary Me.ucrInputCalculationName.AutoSize = True Me.ucrInputCalculationName.IsMultiline = False Me.ucrInputCalculationName.IsReadOnly = False - Me.ucrInputCalculationName.Location = New System.Drawing.Point(373, 439) + Me.ucrInputCalculationName.Location = New System.Drawing.Point(466, 549) + Me.ucrInputCalculationName.Margin = New System.Windows.Forms.Padding(8, 8, 8, 8) Me.ucrInputCalculationName.Name = "ucrInputCalculationName" - Me.ucrInputCalculationName.Size = New System.Drawing.Size(137, 21) + Me.ucrInputCalculationName.Size = New System.Drawing.Size(171, 26) Me.ucrInputCalculationName.TabIndex = 12 ' 'lblReceiverLabel ' Me.lblReceiverLabel.AutoSize = True - Me.lblReceiverLabel.Location = New System.Drawing.Point(236, 126) + Me.lblReceiverLabel.Location = New System.Drawing.Point(295, 158) + Me.lblReceiverLabel.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblReceiverLabel.Name = "lblReceiverLabel" - Me.lblReceiverLabel.Size = New System.Drawing.Size(45, 13) + Me.lblReceiverLabel.Size = New System.Drawing.Size(55, 16) Me.lblReceiverLabel.TabIndex = 15 Me.lblReceiverLabel.Text = "Factors:" ' @@ -159,35 +164,39 @@ Partial Class sdgCalculationsSummmary Me.ucrInputResultName.AutoSize = True Me.ucrInputResultName.IsMultiline = False Me.ucrInputResultName.IsReadOnly = False - Me.ucrInputResultName.Location = New System.Drawing.Point(102, 439) + Me.ucrInputResultName.Location = New System.Drawing.Point(128, 549) + Me.ucrInputResultName.Margin = New System.Windows.Forms.Padding(8, 8, 8, 8) Me.ucrInputResultName.Name = "ucrInputResultName" - Me.ucrInputResultName.Size = New System.Drawing.Size(137, 21) + Me.ucrInputResultName.Size = New System.Drawing.Size(171, 26) Me.ucrInputResultName.TabIndex = 13 ' 'lblResultName ' Me.lblResultName.AutoSize = True - Me.lblResultName.Location = New System.Drawing.Point(12, 442) + Me.lblResultName.Location = New System.Drawing.Point(15, 552) + Me.lblResultName.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblResultName.Name = "lblResultName" - Me.lblResultName.Size = New System.Drawing.Size(71, 13) + Me.lblResultName.Size = New System.Drawing.Size(88, 16) Me.lblResultName.TabIndex = 10 Me.lblResultName.Text = "Result Name:" ' 'lblCalcName ' Me.lblCalcName.AutoSize = True - Me.lblCalcName.Location = New System.Drawing.Point(273, 442) + Me.lblCalcName.Location = New System.Drawing.Point(341, 552) + Me.lblCalcName.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblCalcName.Name = "lblCalcName" - Me.lblCalcName.Size = New System.Drawing.Size(93, 13) + Me.lblCalcName.Size = New System.Drawing.Size(116, 16) Me.lblCalcName.TabIndex = 9 Me.lblCalcName.Text = "Calculation Name:" ' 'rdoSaveCalcAndResult ' Me.rdoSaveCalcAndResult.AutoSize = True - Me.rdoSaveCalcAndResult.Location = New System.Drawing.Point(12, 476) + Me.rdoSaveCalcAndResult.Location = New System.Drawing.Point(15, 595) + Me.rdoSaveCalcAndResult.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.rdoSaveCalcAndResult.Name = "rdoSaveCalcAndResult" - Me.rdoSaveCalcAndResult.Size = New System.Drawing.Size(159, 17) + Me.rdoSaveCalcAndResult.Size = New System.Drawing.Size(196, 20) Me.rdoSaveCalcAndResult.TabIndex = 8 Me.rdoSaveCalcAndResult.TabStop = True Me.rdoSaveCalcAndResult.Text = "Save Calculation and Result" @@ -196,9 +205,10 @@ Partial Class sdgCalculationsSummmary 'rdoSaveCalculation ' Me.rdoSaveCalculation.AutoSize = True - Me.rdoSaveCalculation.Location = New System.Drawing.Point(186, 476) + Me.rdoSaveCalculation.Location = New System.Drawing.Point(232, 595) + Me.rdoSaveCalculation.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.rdoSaveCalculation.Name = "rdoSaveCalculation" - Me.rdoSaveCalculation.Size = New System.Drawing.Size(129, 17) + Me.rdoSaveCalculation.Size = New System.Drawing.Size(159, 20) Me.rdoSaveCalculation.TabIndex = 7 Me.rdoSaveCalculation.TabStop = True Me.rdoSaveCalculation.Text = "Save Calculation Only" @@ -207,9 +217,10 @@ Partial Class sdgCalculationsSummmary 'rdoDoNotSave ' Me.rdoDoNotSave.AutoSize = True - Me.rdoDoNotSave.Location = New System.Drawing.Point(330, 476) + Me.rdoDoNotSave.Location = New System.Drawing.Point(412, 595) + Me.rdoDoNotSave.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.rdoDoNotSave.Name = "rdoDoNotSave" - Me.rdoDoNotSave.Size = New System.Drawing.Size(90, 17) + Me.rdoDoNotSave.Size = New System.Drawing.Size(109, 20) Me.rdoDoNotSave.TabIndex = 6 Me.rdoDoNotSave.TabStop = True Me.rdoDoNotSave.Text = "Save Nothing" @@ -218,9 +229,10 @@ Partial Class sdgCalculationsSummmary 'lblType ' Me.lblType.AutoSize = True - Me.lblType.Location = New System.Drawing.Point(9, 12) + Me.lblType.Location = New System.Drawing.Point(11, 15) + Me.lblType.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblType.Name = "lblType" - Me.lblType.Size = New System.Drawing.Size(34, 13) + Me.lblType.Size = New System.Drawing.Size(42, 16) Me.lblType.TabIndex = 4 Me.lblType.Text = "Type:" ' @@ -230,9 +242,10 @@ Partial Class sdgCalculationsSummmary Me.ucrInputType.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink Me.ucrInputType.GetSetSelectedIndex = -1 Me.ucrInputType.IsReadOnly = False - Me.ucrInputType.Location = New System.Drawing.Point(8, 28) + Me.ucrInputType.Location = New System.Drawing.Point(10, 35) + Me.ucrInputType.Margin = New System.Windows.Forms.Padding(8, 8, 8, 8) Me.ucrInputType.Name = "ucrInputType" - Me.ucrInputType.Size = New System.Drawing.Size(120, 21) + Me.ucrInputType.Size = New System.Drawing.Size(150, 26) Me.ucrInputType.TabIndex = 3 ' 'ucrSelectorBy @@ -241,40 +254,43 @@ Partial Class sdgCalculationsSummmary Me.ucrSelectorBy.bDropUnusedFilterLevels = False Me.ucrSelectorBy.bShowHiddenColumns = False Me.ucrSelectorBy.bUseCurrentFilter = True - Me.ucrSelectorBy.Location = New System.Drawing.Point(8, 114) + Me.ucrSelectorBy.Location = New System.Drawing.Point(10, 142) Me.ucrSelectorBy.Margin = New System.Windows.Forms.Padding(0) Me.ucrSelectorBy.Name = "ucrSelectorBy" - Me.ucrSelectorBy.Size = New System.Drawing.Size(213, 183) + Me.ucrSelectorBy.Size = New System.Drawing.Size(334, 285) Me.ucrSelectorBy.TabIndex = 14 ' 'ucrPnlSave ' Me.ucrPnlSave.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrPnlSave.Location = New System.Drawing.Point(3, 466) + Me.ucrPnlSave.Location = New System.Drawing.Point(4, 582) + Me.ucrPnlSave.Margin = New System.Windows.Forms.Padding(6, 6, 6, 6) Me.ucrPnlSave.Name = "ucrPnlSave" - Me.ucrPnlSave.Size = New System.Drawing.Size(427, 38) + Me.ucrPnlSave.Size = New System.Drawing.Size(534, 48) Me.ucrPnlSave.TabIndex = 20 ' 'ucrCalcSummary ' Me.ucrCalcSummary.AutoSize = True - Me.ucrCalcSummary.Location = New System.Drawing.Point(8, 50) + Me.ucrCalcSummary.Location = New System.Drawing.Point(10, 62) + Me.ucrCalcSummary.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.ucrCalcSummary.Name = "ucrCalcSummary" - Me.ucrCalcSummary.Size = New System.Drawing.Size(860, 338) + Me.ucrCalcSummary.Size = New System.Drawing.Size(1355, 518) Me.ucrCalcSummary.TabIndex = 17 ' 'tbManipulations ' - Me.tbManipulations.Controls.Add(Me.ucrManipulations) Me.tbManipulations.Controls.Add(Me.cmdManipDuplicate) Me.tbManipulations.Controls.Add(Me.cmdManipDelete) Me.tbManipulations.Controls.Add(Me.lblManipulations) Me.tbManipulations.Controls.Add(Me.cmdManipEdit) Me.tbManipulations.Controls.Add(Me.cmdManipAdd) - Me.tbManipulations.Location = New System.Drawing.Point(4, 22) + Me.tbManipulations.Controls.Add(Me.ucrManipulations) + Me.tbManipulations.Location = New System.Drawing.Point(4, 25) + Me.tbManipulations.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.tbManipulations.Name = "tbManipulations" - Me.tbManipulations.Padding = New System.Windows.Forms.Padding(3) - Me.tbManipulations.Size = New System.Drawing.Size(795, 507) + Me.tbManipulations.Padding = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.tbManipulations.Size = New System.Drawing.Size(996, 637) Me.tbManipulations.TabIndex = 1 Me.tbManipulations.Text = "Manipulations" Me.tbManipulations.UseVisualStyleBackColor = True @@ -282,27 +298,30 @@ Partial Class sdgCalculationsSummmary 'ucrManipulations ' Me.ucrManipulations.AutoSize = True - Me.ucrManipulations.Location = New System.Drawing.Point(6, 32) + Me.ucrManipulations.Location = New System.Drawing.Point(8, 40) + Me.ucrManipulations.Margin = New System.Windows.Forms.Padding(6, 6, 6, 6) Me.ucrManipulations.Name = "ucrManipulations" - Me.ucrManipulations.Size = New System.Drawing.Size(199, 150) + Me.ucrManipulations.Size = New System.Drawing.Size(375, 235) Me.ucrManipulations.TabIndex = 21 Me.ucrManipulations.ucrDataFrameList = Nothing Me.ucrManipulations.ucrReceiver = Nothing ' 'cmdManipDuplicate ' - Me.cmdManipDuplicate.Location = New System.Drawing.Point(166, 132) + Me.cmdManipDuplicate.Location = New System.Drawing.Point(273, 199) + Me.cmdManipDuplicate.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.cmdManipDuplicate.Name = "cmdManipDuplicate" - Me.cmdManipDuplicate.Size = New System.Drawing.Size(75, 23) + Me.cmdManipDuplicate.Size = New System.Drawing.Size(94, 29) Me.cmdManipDuplicate.TabIndex = 20 Me.cmdManipDuplicate.Text = "Duplicate" Me.cmdManipDuplicate.UseVisualStyleBackColor = True ' 'cmdManipDelete ' - Me.cmdManipDelete.Location = New System.Drawing.Point(166, 103) + Me.cmdManipDelete.Location = New System.Drawing.Point(273, 163) + Me.cmdManipDelete.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.cmdManipDelete.Name = "cmdManipDelete" - Me.cmdManipDelete.Size = New System.Drawing.Size(75, 23) + Me.cmdManipDelete.Size = New System.Drawing.Size(94, 29) Me.cmdManipDelete.TabIndex = 17 Me.cmdManipDelete.Text = "Delete" Me.cmdManipDelete.UseVisualStyleBackColor = True @@ -310,26 +329,29 @@ Partial Class sdgCalculationsSummmary 'lblManipulations ' Me.lblManipulations.AutoSize = True - Me.lblManipulations.Location = New System.Drawing.Point(9, 17) + Me.lblManipulations.Location = New System.Drawing.Point(11, 21) + Me.lblManipulations.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblManipulations.Name = "lblManipulations" - Me.lblManipulations.Size = New System.Drawing.Size(75, 13) + Me.lblManipulations.Size = New System.Drawing.Size(93, 16) Me.lblManipulations.TabIndex = 16 Me.lblManipulations.Text = "Manipulations:" ' 'cmdManipEdit ' - Me.cmdManipEdit.Location = New System.Drawing.Point(166, 74) + Me.cmdManipEdit.Location = New System.Drawing.Point(273, 126) + Me.cmdManipEdit.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.cmdManipEdit.Name = "cmdManipEdit" - Me.cmdManipEdit.Size = New System.Drawing.Size(75, 23) + Me.cmdManipEdit.Size = New System.Drawing.Size(94, 29) Me.cmdManipEdit.TabIndex = 18 Me.cmdManipEdit.Text = "Edit" Me.cmdManipEdit.UseVisualStyleBackColor = True ' 'cmdManipAdd ' - Me.cmdManipAdd.Location = New System.Drawing.Point(166, 45) + Me.cmdManipAdd.Location = New System.Drawing.Point(273, 90) + Me.cmdManipAdd.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.cmdManipAdd.Name = "cmdManipAdd" - Me.cmdManipAdd.Size = New System.Drawing.Size(75, 23) + Me.cmdManipAdd.Size = New System.Drawing.Size(94, 29) Me.cmdManipAdd.TabIndex = 19 Me.cmdManipAdd.Text = "Add" Me.cmdManipAdd.UseVisualStyleBackColor = True @@ -342,10 +364,11 @@ Partial Class sdgCalculationsSummmary Me.tbSubCalcs.Controls.Add(Me.cmdSubCalcAdd) Me.tbSubCalcs.Controls.Add(Me.lblSubCalcs) Me.tbSubCalcs.Controls.Add(Me.cmdSubCalcEdit) - Me.tbSubCalcs.Location = New System.Drawing.Point(4, 22) + Me.tbSubCalcs.Location = New System.Drawing.Point(4, 25) + Me.tbSubCalcs.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.tbSubCalcs.Name = "tbSubCalcs" - Me.tbSubCalcs.Padding = New System.Windows.Forms.Padding(3) - Me.tbSubCalcs.Size = New System.Drawing.Size(795, 507) + Me.tbSubCalcs.Padding = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.tbSubCalcs.Size = New System.Drawing.Size(996, 637) Me.tbSubCalcs.TabIndex = 2 Me.tbSubCalcs.Text = "Sub Calculations" Me.tbSubCalcs.UseVisualStyleBackColor = True @@ -353,36 +376,40 @@ Partial Class sdgCalculationsSummmary 'lstSubCalcs ' Me.lstSubCalcs.HideSelection = False - Me.lstSubCalcs.Location = New System.Drawing.Point(9, 33) + Me.lstSubCalcs.Location = New System.Drawing.Point(11, 41) + Me.lstSubCalcs.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.lstSubCalcs.Name = "lstSubCalcs" - Me.lstSubCalcs.Size = New System.Drawing.Size(121, 133) + Me.lstSubCalcs.Size = New System.Drawing.Size(150, 165) Me.lstSubCalcs.TabIndex = 21 Me.lstSubCalcs.UseCompatibleStateImageBehavior = False Me.lstSubCalcs.View = System.Windows.Forms.View.List ' 'cmdSubCalcDuplicate ' - Me.cmdSubCalcDuplicate.Location = New System.Drawing.Point(166, 132) + Me.cmdSubCalcDuplicate.Location = New System.Drawing.Point(208, 165) + Me.cmdSubCalcDuplicate.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.cmdSubCalcDuplicate.Name = "cmdSubCalcDuplicate" - Me.cmdSubCalcDuplicate.Size = New System.Drawing.Size(75, 23) + Me.cmdSubCalcDuplicate.Size = New System.Drawing.Size(94, 29) Me.cmdSubCalcDuplicate.TabIndex = 26 Me.cmdSubCalcDuplicate.Text = "Duplicate" Me.cmdSubCalcDuplicate.UseVisualStyleBackColor = True ' 'cmdSubCalcDelete ' - Me.cmdSubCalcDelete.Location = New System.Drawing.Point(166, 103) + Me.cmdSubCalcDelete.Location = New System.Drawing.Point(208, 129) + Me.cmdSubCalcDelete.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.cmdSubCalcDelete.Name = "cmdSubCalcDelete" - Me.cmdSubCalcDelete.Size = New System.Drawing.Size(75, 23) + Me.cmdSubCalcDelete.Size = New System.Drawing.Size(94, 29) Me.cmdSubCalcDelete.TabIndex = 23 Me.cmdSubCalcDelete.Text = "Delete" Me.cmdSubCalcDelete.UseVisualStyleBackColor = True ' 'cmdSubCalcAdd ' - Me.cmdSubCalcAdd.Location = New System.Drawing.Point(166, 45) + Me.cmdSubCalcAdd.Location = New System.Drawing.Point(208, 56) + Me.cmdSubCalcAdd.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.cmdSubCalcAdd.Name = "cmdSubCalcAdd" - Me.cmdSubCalcAdd.Size = New System.Drawing.Size(75, 23) + Me.cmdSubCalcAdd.Size = New System.Drawing.Size(94, 29) Me.cmdSubCalcAdd.TabIndex = 25 Me.cmdSubCalcAdd.Text = "Add" Me.cmdSubCalcAdd.UseVisualStyleBackColor = True @@ -390,17 +417,19 @@ Partial Class sdgCalculationsSummmary 'lblSubCalcs ' Me.lblSubCalcs.AutoSize = True - Me.lblSubCalcs.Location = New System.Drawing.Point(9, 17) + Me.lblSubCalcs.Location = New System.Drawing.Point(11, 21) + Me.lblSubCalcs.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblSubCalcs.Name = "lblSubCalcs" - Me.lblSubCalcs.Size = New System.Drawing.Size(89, 13) + Me.lblSubCalcs.Size = New System.Drawing.Size(111, 16) Me.lblSubCalcs.TabIndex = 22 Me.lblSubCalcs.Text = "Sub-Calculations:" ' 'cmdSubCalcEdit ' - Me.cmdSubCalcEdit.Location = New System.Drawing.Point(166, 74) + Me.cmdSubCalcEdit.Location = New System.Drawing.Point(208, 92) + Me.cmdSubCalcEdit.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.cmdSubCalcEdit.Name = "cmdSubCalcEdit" - Me.cmdSubCalcEdit.Size = New System.Drawing.Size(75, 23) + Me.cmdSubCalcEdit.Size = New System.Drawing.Size(94, 29) Me.cmdSubCalcEdit.TabIndex = 24 Me.cmdSubCalcEdit.Text = "Edit" Me.cmdSubCalcEdit.UseVisualStyleBackColor = True @@ -408,20 +437,22 @@ Partial Class sdgCalculationsSummmary 'ucrBaseSubDialog ' Me.ucrBaseSubDialog.AutoSize = True - Me.ucrBaseSubDialog.Location = New System.Drawing.Point(307, 533) + Me.ucrBaseSubDialog.Location = New System.Drawing.Point(384, 666) + Me.ucrBaseSubDialog.Margin = New System.Windows.Forms.Padding(5, 5, 5, 5) Me.ucrBaseSubDialog.Name = "ucrBaseSubDialog" - Me.ucrBaseSubDialog.Size = New System.Drawing.Size(224, 30) + Me.ucrBaseSubDialog.Size = New System.Drawing.Size(281, 38) Me.ucrBaseSubDialog.TabIndex = 0 ' 'sdgCalculationsSummmary ' - Me.AutoScaleDimensions = New System.Drawing.SizeF(96.0!, 96.0!) + Me.AutoScaleDimensions = New System.Drawing.SizeF(120.0!, 120.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi Me.AutoSize = True - Me.ClientSize = New System.Drawing.Size(806, 565) + Me.ClientSize = New System.Drawing.Size(1008, 706) Me.Controls.Add(Me.ucrBaseSubDialog) Me.Controls.Add(Me.tbSummaryCalcs) Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow + Me.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.MaximizeBox = False Me.MinimizeBox = False Me.Name = "sdgCalculationsSummmary" diff --git a/instat/sdgCalculationsSummmary.vb b/instat/sdgCalculationsSummmary.vb index 499067c9172..5e0aea31c49 100644 --- a/instat/sdgCalculationsSummmary.vb +++ b/instat/sdgCalculationsSummmary.vb @@ -61,8 +61,6 @@ Public Class sdgCalculationsSummmary ucrManipulations.lstAvailableData.View = View.List - ucrCalcSummary.ucrReceiverForCalculation.bAttachedToPrimaryDataFrame = False - 'temp until working ucrCalcSummary.ucrSaveResultInto.Visible = False 'ucrCalcSummary.ucrTryModelling.Visible = False @@ -345,16 +343,18 @@ Public Class sdgCalculationsSummmary Private Sub ucrCalcSummary_SelectionChanged() Handles ucrCalcSummary.SelectionChanged If {"Calculation", "Summary"}.Contains(ucrInputType.GetText()) Then + Dim strExpression As String = ucrCalcSummary.ucrReceiverForCalculation.GetText() If Not ucrCalcSummary.ucrReceiverForCalculation.IsEmpty Then - clsCalculationFunction.AddParameter("function_exp", Chr(34) & ucrCalcSummary.ucrReceiverForCalculation.GetText() & Chr(34)) + clsCalculationFunction.AddParameter("function_exp", Chr(34) & strExpression & Chr(34)) Else clsCalculationFunction.RemoveParameterByName("function_exp") End If - If Not ucrCalcSummary.ucrSelectorForCalculations.CurrentReceiver.IsEmpty Then - clsCalculationFunction.AddParameter("calculated_from", CreateCalcFromList( - ucrCalcSummary.ucrSelectorForCalculations.CurrentReceiver.GetVariableNamesList(bWithQuotes:=False), - ucrCalcSummary.ucrSelectorForCalculations)) + If ucrCalcSummary.ucrSelectorForCalculations.lstAvailableVariable.Items.Count > 0 AndAlso + Not ucrCalcSummary.ucrReceiverForCalculation.IsEmpty Then + Dim lstItems As String() = ucrCalcSummary.ucrSelectorForCalculations.lstAvailableVariable.Items.Cast(Of ListViewItem)().Select(Function(item) item.Text).ToArray() + Dim strSelectedVariables As String() = lstItems.Where(Function(variable) strExpression.Contains(variable)).ToArray() + clsCalculationFunction.AddParameter("calculated_from", CreateCalcFromList(strSelectedVariables, ucrCalcSummary.ucrSelectorForCalculations)) Else clsCalculationFunction.RemoveParameterByName("calculated_from") End If @@ -374,14 +374,23 @@ Public Class sdgCalculationsSummmary 'Need to do this instead of with RFunctions because the calculated_from list can have multiple items with the same label Private Function CreateCalcFromList(lstVariables As String(), ucrCurrentSelector As ucrSelectorByDataFrame) As String + + If lstVariables Is Nothing Then + Return "" + End If + Dim strCalcFromList As String strCalcFromList = "list(" For i = 0 To lstVariables.Count - 1 - If i > 0 Then - strCalcFromList = strCalcFromList & "," + Dim strDataName As String = lstVariables(i) + If Not String.IsNullOrEmpty(strDataName) Then + If i > 0 Then + strCalcFromList = strCalcFromList & "," + End If + + strCalcFromList = strCalcFromList & ucrCurrentSelector.strCurrentDataFrame & " = " & Chr(34) & strDataName & Chr(34) End If - strCalcFromList = strCalcFromList & ucrCurrentSelector.strCurrentDataFrame & " = " & Chr(34) & lstVariables(i) & Chr(34) Next strCalcFromList = strCalcFromList & ")" Return strCalcFromList diff --git a/instat/sdgPlots.Designer.vb b/instat/sdgPlots.Designer.vb index 098aefc6814..0397580dd62 100644 --- a/instat/sdgPlots.Designer.vb +++ b/instat/sdgPlots.Designer.vb @@ -126,6 +126,47 @@ Partial Class sdgPlots Me.ucrChkSameScale = New instat.ucrCheck() Me.ucrChkHorizontalPlot = New instat.ucrCheck() Me.tbpColour = New System.Windows.Forms.TabPage() + Me.grpfillmanual = New System.Windows.Forms.GroupBox() + Me.ucrInputNavaluesManual = New instat.ucrInputTextBox() + Me.ucrInputBreackmanual = New instat.ucrInputTextBox() + Me.ucrInputLimitsmanual = New instat.ucrInputTextBox() + Me.ucrChkaesth = New instat.ucrCheck() + Me.ucrChkLimitsManual = New instat.ucrCheck() + Me.ucrChkBreacksManual = New instat.ucrCheck() + Me.ucrChkNavaluemanual = New instat.ucrCheck() + Me.ucrChkValueManual = New instat.ucrCheck() + Me.grpmanualColour = New System.Windows.Forms.GroupBox() + Me.ucrInputNavaluesManualColor = New instat.ucrInputTextBox() + Me.ucrInputBreackmanualcolor = New instat.ucrInputTextBox() + Me.ucrInputLimitsmanualcolor = New instat.ucrInputTextBox() + Me.ucrChkAesthColor = New instat.ucrCheck() + Me.ucrChkLimitsManualColor = New instat.ucrCheck() + Me.ucrChkBreacksManualColor = New instat.ucrCheck() + Me.ucrChkNavaluemanualColor = New instat.ucrCheck() + Me.ucrChkValueManualColor = New instat.ucrCheck() + Me.grpColourGradient = New System.Windows.Forms.GroupBox() + Me.ucrColorsHighColour = New instat.ucrColors() + Me.ucrColourText = New instat.ucrColors() + Me.ucrInputGradientPositionColour = New instat.ucrInputComboBox() + Me.ucrInputGradientTransColour = New instat.ucrInputComboBox() + Me.ucrInputGradientExpandColour = New instat.ucrInputTextBox() + Me.ucrChkGradientExpandColour = New instat.ucrCheck() + Me.ucrChkGradientPositionColour = New instat.ucrCheck() + Me.ucrChkGradientTransColour = New instat.ucrCheck() + Me.ucrChkLowColour = New instat.ucrCheck() + Me.ucrChkHighColour = New instat.ucrCheck() + Me.grpFillGradient = New System.Windows.Forms.GroupBox() + Me.ucrColorsLow = New instat.ucrColors() + Me.ucrColorsHigh = New instat.ucrColors() + Me.ucrInputGradientPosition = New instat.ucrInputComboBox() + Me.ucrInputGradientTrans = New instat.ucrInputComboBox() + Me.ucrInputGradientExpand = New instat.ucrInputTextBox() + Me.ucrChkGradientExpand = New instat.ucrCheck() + Me.ucrChkGradientPosition = New instat.ucrCheck() + Me.ucrChkGradientTrans = New instat.ucrCheck() + Me.ucrChkLow = New instat.ucrCheck() + Me.ucrChkHigh = New instat.ucrCheck() + Me.rdoGradient = New System.Windows.Forms.RadioButton() Me.ucrChkColour = New instat.ucrCheck() Me.lblCanvasFillPalette = New System.Windows.Forms.Label() Me.ucrInputCanvasFillPalette = New instat.ucrInputComboBox() @@ -608,51 +649,59 @@ Partial Class sdgPlots 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() - Me.tbpTitles.SuspendLayout() - Me.grpLegendTitle.SuspendLayout() - Me.tbpXAxis.SuspendLayout() - Me.tbpYAxis.SuspendLayout() - Me.tbpTheme.SuspendLayout() - Me.grpCommonOptions.SuspendLayout() - Me.tbpCoordinates.SuspendLayout() - Me.grpPolarCordinates.SuspendLayout() - Me.tbpColour.SuspendLayout() - Me.grpScalefillw.SuspendLayout() - Me.grpColourScale.SuspendLayout() - Me.grpScaleColorw.SuspendLayout() - Me.grpScalecolorcal.SuspendLayout() - Me.grpScalecolorhc.SuspendLayout() - Me.grpScalecolorfew.SuspendLayout() - Me.grpScalecolorsol.SuspendLayout() - Me.grpScalecolorpan.SuspendLayout() - Me.grpScalecolorg.SuspendLayout() - Me.grpColourScaleGgthemes.SuspendLayout() - Me.grpScalecolorEx.SuspendLayout() - Me.grpScalecolorEcon.SuspendLayout() - Me.grpScalecolorst.SuspendLayout() - Me.grpScalecolorExn.SuspendLayout() - Me.grpScaleColorfiv.SuspendLayout() - Me.grpScalecolorpt.SuspendLayout() - Me.grpScalefillg.SuspendLayout() - Me.grpScaleFillfiv.SuspendLayout() - Me.grpScalefillpt.SuspendLayout() - Me.grpScalefillst.SuspendLayout() - Me.grpScalefillpan.SuspendLayout() - Me.grpScalefillCal.SuspendLayout() - Me.grpScalefillEx.SuspendLayout() - Me.grpScalefillEcon.SuspendLayout() - Me.grpScalefillExn.SuspendLayout() - Me.grpScalefillsol.SuspendLayout() - Me.grpFillScaleggthemes.SuspendLayout() - Me.grpScalefillfew.SuspendLayout() - Me.grpScalefillhc.SuspendLayout() - Me.grpFillScale.SuspendLayout() - Me.tbpAnnotation.SuspendLayout() - Me.grpAnnotation.SuspendLayout() - Me.SuspendLayout() + Me.ucrInputAesth = New instat.ucrInputTextBox() + Me.ucrInputAthsColor = New instat.ucrInputTextBox() + Me.ucrInputValue = New instat.ucrInputTextBox() + Me.ucrInputValueColor = New instat.ucrInputTextBox() + Me.tbpPlotsOptions.SuspendLayout + Me.tbpFacet.SuspendLayout + Me.tbpLayers.SuspendLayout + Me.tbpTitles.SuspendLayout + Me.grpLegendTitle.SuspendLayout + Me.tbpXAxis.SuspendLayout + Me.tbpYAxis.SuspendLayout + Me.tbpTheme.SuspendLayout + Me.grpCommonOptions.SuspendLayout + Me.tbpCoordinates.SuspendLayout + Me.grpPolarCordinates.SuspendLayout + Me.tbpColour.SuspendLayout + Me.grpfillmanual.SuspendLayout + Me.grpmanualColour.SuspendLayout + Me.grpColourGradient.SuspendLayout + Me.grpFillGradient.SuspendLayout + Me.grpScalefillw.SuspendLayout + Me.grpColourScale.SuspendLayout + Me.grpScaleColorw.SuspendLayout + Me.grpScalecolorcal.SuspendLayout + Me.grpScalecolorhc.SuspendLayout + Me.grpScalecolorfew.SuspendLayout + Me.grpScalecolorsol.SuspendLayout + Me.grpScalecolorpan.SuspendLayout + Me.grpScalecolorg.SuspendLayout + Me.grpColourScaleGgthemes.SuspendLayout + Me.grpScalecolorEx.SuspendLayout + Me.grpScalecolorEcon.SuspendLayout + Me.grpScalecolorst.SuspendLayout + Me.grpScalecolorExn.SuspendLayout + Me.grpScaleColorfiv.SuspendLayout + Me.grpScalecolorpt.SuspendLayout + Me.grpScalefillg.SuspendLayout + Me.grpScaleFillfiv.SuspendLayout + Me.grpScalefillpt.SuspendLayout + Me.grpScalefillst.SuspendLayout + Me.grpScalefillpan.SuspendLayout + Me.grpScalefillCal.SuspendLayout + Me.grpScalefillEx.SuspendLayout + Me.grpScalefillEcon.SuspendLayout + Me.grpScalefillExn.SuspendLayout + Me.grpScalefillsol.SuspendLayout + Me.grpFillScaleggthemes.SuspendLayout + Me.grpScalefillfew.SuspendLayout + Me.grpScalefillhc.SuspendLayout + Me.grpFillScale.SuspendLayout + Me.tbpAnnotation.SuspendLayout + Me.grpAnnotation.SuspendLayout + Me.SuspendLayout ' 'tbpPlotsOptions ' @@ -1639,6 +1688,11 @@ Partial Class sdgPlots ' 'tbpColour ' + Me.tbpColour.Controls.Add(Me.grpfillmanual) + Me.tbpColour.Controls.Add(Me.grpmanualColour) + Me.tbpColour.Controls.Add(Me.grpColourGradient) + Me.tbpColour.Controls.Add(Me.grpFillGradient) + Me.tbpColour.Controls.Add(Me.rdoGradient) Me.tbpColour.Controls.Add(Me.ucrChkColour) Me.tbpColour.Controls.Add(Me.lblCanvasFillPalette) Me.tbpColour.Controls.Add(Me.ucrInputCanvasFillPalette) @@ -1704,6 +1758,458 @@ Partial Class sdgPlots Me.tbpColour.Text = "Colour" Me.tbpColour.UseVisualStyleBackColor = True ' + 'grpfillmanual + ' + Me.grpfillmanual.Controls.Add(Me.ucrInputValue) + Me.grpfillmanual.Controls.Add(Me.ucrInputAesth) + Me.grpfillmanual.Controls.Add(Me.ucrInputNavaluesManual) + Me.grpfillmanual.Controls.Add(Me.ucrInputBreackmanual) + Me.grpfillmanual.Controls.Add(Me.ucrInputLimitsmanual) + Me.grpfillmanual.Controls.Add(Me.ucrChkaesth) + Me.grpfillmanual.Controls.Add(Me.ucrChkLimitsManual) + Me.grpfillmanual.Controls.Add(Me.ucrChkBreacksManual) + Me.grpfillmanual.Controls.Add(Me.ucrChkNavaluemanual) + Me.grpfillmanual.Controls.Add(Me.ucrChkValueManual) + Me.grpfillmanual.Location = New System.Drawing.Point(17, 214) + Me.grpfillmanual.Name = "grpfillmanual" + Me.grpfillmanual.Size = New System.Drawing.Size(444, 165) + Me.grpfillmanual.TabIndex = 333 + Me.grpfillmanual.TabStop = False + Me.grpfillmanual.Text = "Fill Scale" + ' + 'ucrInputNavaluesManual + ' + Me.ucrInputNavaluesManual.AddQuotesIfUnrecognised = True + Me.ucrInputNavaluesManual.AutoSize = True + Me.ucrInputNavaluesManual.IsMultiline = False + Me.ucrInputNavaluesManual.IsReadOnly = False + Me.ucrInputNavaluesManual.Location = New System.Drawing.Point(250, 129) + Me.ucrInputNavaluesManual.Name = "ucrInputNavaluesManual" + Me.ucrInputNavaluesManual.Size = New System.Drawing.Size(177, 21) + Me.ucrInputNavaluesManual.TabIndex = 9 + ' + 'ucrInputBreackmanual + ' + Me.ucrInputBreackmanual.AddQuotesIfUnrecognised = True + Me.ucrInputBreackmanual.AutoSize = True + Me.ucrInputBreackmanual.IsMultiline = False + Me.ucrInputBreackmanual.IsReadOnly = False + Me.ucrInputBreackmanual.Location = New System.Drawing.Point(250, 101) + Me.ucrInputBreackmanual.Name = "ucrInputBreackmanual" + Me.ucrInputBreackmanual.Size = New System.Drawing.Size(177, 21) + Me.ucrInputBreackmanual.TabIndex = 8 + ' + 'ucrInputLimitsmanual + ' + Me.ucrInputLimitsmanual.AddQuotesIfUnrecognised = True + Me.ucrInputLimitsmanual.AutoSize = True + Me.ucrInputLimitsmanual.IsMultiline = False + Me.ucrInputLimitsmanual.IsReadOnly = False + Me.ucrInputLimitsmanual.Location = New System.Drawing.Point(250, 72) + Me.ucrInputLimitsmanual.Name = "ucrInputLimitsmanual" + Me.ucrInputLimitsmanual.Size = New System.Drawing.Size(177, 21) + Me.ucrInputLimitsmanual.TabIndex = 7 + ' + 'ucrChkaesth + ' + Me.ucrChkaesth.AutoSize = True + Me.ucrChkaesth.Checked = False + Me.ucrChkaesth.Location = New System.Drawing.Point(6, 40) + Me.ucrChkaesth.Name = "ucrChkaesth" + Me.ucrChkaesth.Size = New System.Drawing.Size(193, 23) + Me.ucrChkaesth.TabIndex = 4 + ' + 'ucrChkLimitsManual + ' + Me.ucrChkLimitsManual.AutoSize = True + Me.ucrChkLimitsManual.Checked = False + Me.ucrChkLimitsManual.Location = New System.Drawing.Point(6, 70) + Me.ucrChkLimitsManual.Name = "ucrChkLimitsManual" + Me.ucrChkLimitsManual.Size = New System.Drawing.Size(193, 23) + Me.ucrChkLimitsManual.TabIndex = 3 + ' + 'ucrChkBreacksManual + ' + Me.ucrChkBreacksManual.AutoSize = True + Me.ucrChkBreacksManual.Checked = False + Me.ucrChkBreacksManual.Location = New System.Drawing.Point(6, 98) + Me.ucrChkBreacksManual.Name = "ucrChkBreacksManual" + Me.ucrChkBreacksManual.Size = New System.Drawing.Size(193, 23) + Me.ucrChkBreacksManual.TabIndex = 2 + ' + 'ucrChkNavaluemanual + ' + Me.ucrChkNavaluemanual.AutoSize = True + Me.ucrChkNavaluemanual.Checked = False + Me.ucrChkNavaluemanual.Location = New System.Drawing.Point(6, 128) + Me.ucrChkNavaluemanual.Name = "ucrChkNavaluemanual" + Me.ucrChkNavaluemanual.Size = New System.Drawing.Size(193, 23) + Me.ucrChkNavaluemanual.TabIndex = 1 + ' + 'ucrChkValueManual + ' + Me.ucrChkValueManual.AutoSize = True + Me.ucrChkValueManual.Checked = False + Me.ucrChkValueManual.Location = New System.Drawing.Point(6, 15) + Me.ucrChkValueManual.Name = "ucrChkValueManual" + Me.ucrChkValueManual.Size = New System.Drawing.Size(193, 23) + Me.ucrChkValueManual.TabIndex = 0 + ' + 'grpmanualColour + ' + Me.grpmanualColour.Controls.Add(Me.ucrInputValueColor) + Me.grpmanualColour.Controls.Add(Me.ucrInputAthsColor) + Me.grpmanualColour.Controls.Add(Me.ucrInputNavaluesManualColor) + Me.grpmanualColour.Controls.Add(Me.ucrInputBreackmanualcolor) + Me.grpmanualColour.Controls.Add(Me.ucrInputLimitsmanualcolor) + Me.grpmanualColour.Controls.Add(Me.ucrChkAesthColor) + Me.grpmanualColour.Controls.Add(Me.ucrChkLimitsManualColor) + Me.grpmanualColour.Controls.Add(Me.ucrChkBreacksManualColor) + Me.grpmanualColour.Controls.Add(Me.ucrChkNavaluemanualColor) + Me.grpmanualColour.Controls.Add(Me.ucrChkValueManualColor) + Me.grpmanualColour.Location = New System.Drawing.Point(18, 215) + Me.grpmanualColour.Name = "grpmanualColour" + Me.grpmanualColour.Size = New System.Drawing.Size(444, 165) + Me.grpmanualColour.TabIndex = 332 + Me.grpmanualColour.TabStop = False + Me.grpmanualColour.Text = "Colour Scale" + ' + 'ucrInputNavaluesManualColor + ' + Me.ucrInputNavaluesManualColor.AddQuotesIfUnrecognised = True + Me.ucrInputNavaluesManualColor.AutoSize = True + Me.ucrInputNavaluesManualColor.IsMultiline = False + Me.ucrInputNavaluesManualColor.IsReadOnly = False + Me.ucrInputNavaluesManualColor.Location = New System.Drawing.Point(250, 130) + Me.ucrInputNavaluesManualColor.Name = "ucrInputNavaluesManualColor" + Me.ucrInputNavaluesManualColor.Size = New System.Drawing.Size(177, 21) + Me.ucrInputNavaluesManualColor.TabIndex = 11 + ' + 'ucrInputBreackmanualcolor + ' + Me.ucrInputBreackmanualcolor.AddQuotesIfUnrecognised = True + Me.ucrInputBreackmanualcolor.AutoSize = True + Me.ucrInputBreackmanualcolor.IsMultiline = False + Me.ucrInputBreackmanualcolor.IsReadOnly = False + Me.ucrInputBreackmanualcolor.Location = New System.Drawing.Point(250, 101) + Me.ucrInputBreackmanualcolor.Name = "ucrInputBreackmanualcolor" + Me.ucrInputBreackmanualcolor.Size = New System.Drawing.Size(177, 21) + Me.ucrInputBreackmanualcolor.TabIndex = 10 + ' + 'ucrInputLimitsmanualcolor + ' + Me.ucrInputLimitsmanualcolor.AddQuotesIfUnrecognised = True + Me.ucrInputLimitsmanualcolor.AutoSize = True + Me.ucrInputLimitsmanualcolor.IsMultiline = False + Me.ucrInputLimitsmanualcolor.IsReadOnly = False + Me.ucrInputLimitsmanualcolor.Location = New System.Drawing.Point(250, 72) + Me.ucrInputLimitsmanualcolor.Name = "ucrInputLimitsmanualcolor" + Me.ucrInputLimitsmanualcolor.Size = New System.Drawing.Size(177, 21) + Me.ucrInputLimitsmanualcolor.TabIndex = 9 + ' + 'ucrChkAesthColor + ' + Me.ucrChkAesthColor.AutoSize = True + Me.ucrChkAesthColor.Checked = False + Me.ucrChkAesthColor.Location = New System.Drawing.Point(6, 43) + Me.ucrChkAesthColor.Name = "ucrChkAesthColor" + Me.ucrChkAesthColor.Size = New System.Drawing.Size(193, 23) + Me.ucrChkAesthColor.TabIndex = 4 + ' + 'ucrChkLimitsManualColor + ' + Me.ucrChkLimitsManualColor.AutoSize = True + Me.ucrChkLimitsManualColor.Checked = False + Me.ucrChkLimitsManualColor.Location = New System.Drawing.Point(6, 70) + Me.ucrChkLimitsManualColor.Name = "ucrChkLimitsManualColor" + Me.ucrChkLimitsManualColor.Size = New System.Drawing.Size(193, 23) + Me.ucrChkLimitsManualColor.TabIndex = 3 + ' + 'ucrChkBreacksManualColor + ' + Me.ucrChkBreacksManualColor.AutoSize = True + Me.ucrChkBreacksManualColor.Checked = False + Me.ucrChkBreacksManualColor.Location = New System.Drawing.Point(6, 98) + Me.ucrChkBreacksManualColor.Name = "ucrChkBreacksManualColor" + Me.ucrChkBreacksManualColor.Size = New System.Drawing.Size(193, 23) + Me.ucrChkBreacksManualColor.TabIndex = 2 + ' + 'ucrChkNavaluemanualColor + ' + Me.ucrChkNavaluemanualColor.AutoSize = True + Me.ucrChkNavaluemanualColor.Checked = False + Me.ucrChkNavaluemanualColor.Location = New System.Drawing.Point(6, 128) + Me.ucrChkNavaluemanualColor.Name = "ucrChkNavaluemanualColor" + Me.ucrChkNavaluemanualColor.Size = New System.Drawing.Size(193, 23) + Me.ucrChkNavaluemanualColor.TabIndex = 1 + ' + 'ucrChkValueManualColor + ' + Me.ucrChkValueManualColor.AutoSize = True + Me.ucrChkValueManualColor.Checked = False + Me.ucrChkValueManualColor.Location = New System.Drawing.Point(6, 15) + Me.ucrChkValueManualColor.Name = "ucrChkValueManualColor" + Me.ucrChkValueManualColor.Size = New System.Drawing.Size(193, 23) + Me.ucrChkValueManualColor.TabIndex = 0 + ' + 'grpColourGradient + ' + Me.grpColourGradient.Controls.Add(Me.ucrColorsHighColour) + Me.grpColourGradient.Controls.Add(Me.ucrColourText) + Me.grpColourGradient.Controls.Add(Me.ucrInputGradientPositionColour) + Me.grpColourGradient.Controls.Add(Me.ucrInputGradientTransColour) + Me.grpColourGradient.Controls.Add(Me.ucrInputGradientExpandColour) + Me.grpColourGradient.Controls.Add(Me.ucrChkGradientExpandColour) + Me.grpColourGradient.Controls.Add(Me.ucrChkGradientPositionColour) + Me.grpColourGradient.Controls.Add(Me.ucrChkGradientTransColour) + Me.grpColourGradient.Controls.Add(Me.ucrChkLowColour) + Me.grpColourGradient.Controls.Add(Me.ucrChkHighColour) + Me.grpColourGradient.Location = New System.Drawing.Point(19, 214) + Me.grpColourGradient.Name = "grpColourGradient" + Me.grpColourGradient.Size = New System.Drawing.Size(444, 165) + Me.grpColourGradient.TabIndex = 331 + Me.grpColourGradient.TabStop = False + Me.grpColourGradient.Text = "Colour Scale" + ' + 'ucrColorsHighColour + ' + Me.ucrColorsHighColour.AddQuotesIfUnrecognised = True + Me.ucrColorsHighColour.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrColorsHighColour.GetSetSelectedIndex = -1 + Me.ucrColorsHighColour.IsReadOnly = False + Me.ucrColorsHighColour.Location = New System.Drawing.Point(282, 15) + Me.ucrColorsHighColour.Name = "ucrColorsHighColour" + Me.ucrColorsHighColour.Size = New System.Drawing.Size(137, 21) + Me.ucrColorsHighColour.TabIndex = 200 + ' + 'ucrColourText + ' + Me.ucrColourText.AddQuotesIfUnrecognised = True + Me.ucrColourText.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrColourText.GetSetSelectedIndex = -1 + Me.ucrColourText.IsReadOnly = False + Me.ucrColourText.Location = New System.Drawing.Point(283, 47) + Me.ucrColourText.Name = "ucrColourText" + Me.ucrColourText.Size = New System.Drawing.Size(137, 21) + Me.ucrColourText.TabIndex = 199 + ' + 'ucrInputGradientPositionColour + ' + Me.ucrInputGradientPositionColour.AddQuotesIfUnrecognised = True + Me.ucrInputGradientPositionColour.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrInputGradientPositionColour.GetSetSelectedIndex = -1 + Me.ucrInputGradientPositionColour.IsReadOnly = False + Me.ucrInputGradientPositionColour.Location = New System.Drawing.Point(283, 102) + Me.ucrInputGradientPositionColour.Name = "ucrInputGradientPositionColour" + Me.ucrInputGradientPositionColour.Size = New System.Drawing.Size(137, 21) + Me.ucrInputGradientPositionColour.TabIndex = 198 + ' + 'ucrInputGradientTransColour + ' + Me.ucrInputGradientTransColour.AddQuotesIfUnrecognised = True + Me.ucrInputGradientTransColour.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrInputGradientTransColour.GetSetSelectedIndex = -1 + Me.ucrInputGradientTransColour.IsReadOnly = False + Me.ucrInputGradientTransColour.Location = New System.Drawing.Point(283, 75) + Me.ucrInputGradientTransColour.Name = "ucrInputGradientTransColour" + Me.ucrInputGradientTransColour.Size = New System.Drawing.Size(137, 21) + Me.ucrInputGradientTransColour.TabIndex = 197 + ' + 'ucrInputGradientExpandColour + ' + Me.ucrInputGradientExpandColour.AddQuotesIfUnrecognised = True + Me.ucrInputGradientExpandColour.AutoSize = True + Me.ucrInputGradientExpandColour.IsMultiline = False + Me.ucrInputGradientExpandColour.IsReadOnly = False + Me.ucrInputGradientExpandColour.Location = New System.Drawing.Point(283, 132) + Me.ucrInputGradientExpandColour.Name = "ucrInputGradientExpandColour" + Me.ucrInputGradientExpandColour.Size = New System.Drawing.Size(137, 23) + Me.ucrInputGradientExpandColour.TabIndex = 195 + ' + 'ucrChkGradientExpandColour + ' + Me.ucrChkGradientExpandColour.AutoSize = True + Me.ucrChkGradientExpandColour.Checked = False + Me.ucrChkGradientExpandColour.Location = New System.Drawing.Point(10, 134) + Me.ucrChkGradientExpandColour.Name = "ucrChkGradientExpandColour" + Me.ucrChkGradientExpandColour.Size = New System.Drawing.Size(244, 23) + Me.ucrChkGradientExpandColour.TabIndex = 191 + ' + 'ucrChkGradientPositionColour + ' + Me.ucrChkGradientPositionColour.AutoSize = True + Me.ucrChkGradientPositionColour.Checked = False + Me.ucrChkGradientPositionColour.Location = New System.Drawing.Point(10, 105) + Me.ucrChkGradientPositionColour.Name = "ucrChkGradientPositionColour" + Me.ucrChkGradientPositionColour.Size = New System.Drawing.Size(244, 23) + Me.ucrChkGradientPositionColour.TabIndex = 190 + ' + 'ucrChkGradientTransColour + ' + Me.ucrChkGradientTransColour.AutoSize = True + Me.ucrChkGradientTransColour.Checked = False + Me.ucrChkGradientTransColour.Location = New System.Drawing.Point(10, 76) + Me.ucrChkGradientTransColour.Name = "ucrChkGradientTransColour" + Me.ucrChkGradientTransColour.Size = New System.Drawing.Size(244, 23) + Me.ucrChkGradientTransColour.TabIndex = 186 + ' + 'ucrChkLowColour + ' + Me.ucrChkLowColour.AutoSize = True + Me.ucrChkLowColour.Checked = False + Me.ucrChkLowColour.Location = New System.Drawing.Point(10, 47) + Me.ucrChkLowColour.Name = "ucrChkLowColour" + Me.ucrChkLowColour.Size = New System.Drawing.Size(244, 23) + Me.ucrChkLowColour.TabIndex = 185 + ' + 'ucrChkHighColour + ' + Me.ucrChkHighColour.AutoSize = True + Me.ucrChkHighColour.Checked = False + Me.ucrChkHighColour.Location = New System.Drawing.Point(10, 22) + Me.ucrChkHighColour.Name = "ucrChkHighColour" + Me.ucrChkHighColour.Size = New System.Drawing.Size(244, 23) + Me.ucrChkHighColour.TabIndex = 184 + ' + 'grpFillGradient + ' + Me.grpFillGradient.Controls.Add(Me.ucrColorsLow) + Me.grpFillGradient.Controls.Add(Me.ucrColorsHigh) + Me.grpFillGradient.Controls.Add(Me.ucrInputGradientPosition) + Me.grpFillGradient.Controls.Add(Me.ucrInputGradientTrans) + Me.grpFillGradient.Controls.Add(Me.ucrInputGradientExpand) + Me.grpFillGradient.Controls.Add(Me.ucrChkGradientExpand) + Me.grpFillGradient.Controls.Add(Me.ucrChkGradientPosition) + Me.grpFillGradient.Controls.Add(Me.ucrChkGradientTrans) + Me.grpFillGradient.Controls.Add(Me.ucrChkLow) + Me.grpFillGradient.Controls.Add(Me.ucrChkHigh) + Me.grpFillGradient.Location = New System.Drawing.Point(20, 215) + Me.grpFillGradient.Name = "grpFillGradient" + Me.grpFillGradient.Size = New System.Drawing.Size(444, 165) + Me.grpFillGradient.TabIndex = 330 + Me.grpFillGradient.TabStop = False + Me.grpFillGradient.Text = "Fill Scale" + ' + 'ucrColorsLow + ' + Me.ucrColorsLow.AddQuotesIfUnrecognised = True + Me.ucrColorsLow.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrColorsLow.GetSetSelectedIndex = -1 + Me.ucrColorsLow.IsReadOnly = False + Me.ucrColorsLow.Location = New System.Drawing.Point(282, 46) + Me.ucrColorsLow.Name = "ucrColorsLow" + Me.ucrColorsLow.Size = New System.Drawing.Size(137, 21) + Me.ucrColorsLow.TabIndex = 202 + ' + 'ucrColorsHigh + ' + Me.ucrColorsHigh.AddQuotesIfUnrecognised = True + Me.ucrColorsHigh.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrColorsHigh.GetSetSelectedIndex = -1 + Me.ucrColorsHigh.IsReadOnly = False + Me.ucrColorsHigh.Location = New System.Drawing.Point(282, 17) + Me.ucrColorsHigh.Name = "ucrColorsHigh" + Me.ucrColorsHigh.Size = New System.Drawing.Size(137, 21) + Me.ucrColorsHigh.TabIndex = 201 + ' + 'ucrInputGradientPosition + ' + Me.ucrInputGradientPosition.AddQuotesIfUnrecognised = True + Me.ucrInputGradientPosition.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrInputGradientPosition.GetSetSelectedIndex = -1 + Me.ucrInputGradientPosition.IsReadOnly = False + Me.ucrInputGradientPosition.Location = New System.Drawing.Point(283, 102) + Me.ucrInputGradientPosition.Name = "ucrInputGradientPosition" + Me.ucrInputGradientPosition.Size = New System.Drawing.Size(137, 21) + Me.ucrInputGradientPosition.TabIndex = 198 + ' + 'ucrInputGradientTrans + ' + Me.ucrInputGradientTrans.AddQuotesIfUnrecognised = True + Me.ucrInputGradientTrans.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrInputGradientTrans.GetSetSelectedIndex = -1 + Me.ucrInputGradientTrans.IsReadOnly = False + Me.ucrInputGradientTrans.Location = New System.Drawing.Point(283, 75) + Me.ucrInputGradientTrans.Name = "ucrInputGradientTrans" + Me.ucrInputGradientTrans.Size = New System.Drawing.Size(137, 21) + Me.ucrInputGradientTrans.TabIndex = 197 + ' + 'ucrInputGradientExpand + ' + Me.ucrInputGradientExpand.AddQuotesIfUnrecognised = True + Me.ucrInputGradientExpand.AutoSize = True + Me.ucrInputGradientExpand.IsMultiline = False + Me.ucrInputGradientExpand.IsReadOnly = False + Me.ucrInputGradientExpand.Location = New System.Drawing.Point(283, 132) + Me.ucrInputGradientExpand.Name = "ucrInputGradientExpand" + Me.ucrInputGradientExpand.Size = New System.Drawing.Size(137, 23) + Me.ucrInputGradientExpand.TabIndex = 195 + ' + 'ucrChkGradientExpand + ' + Me.ucrChkGradientExpand.AutoSize = True + Me.ucrChkGradientExpand.Checked = False + Me.ucrChkGradientExpand.Location = New System.Drawing.Point(10, 134) + Me.ucrChkGradientExpand.Name = "ucrChkGradientExpand" + Me.ucrChkGradientExpand.Size = New System.Drawing.Size(244, 23) + Me.ucrChkGradientExpand.TabIndex = 191 + ' + 'ucrChkGradientPosition + ' + Me.ucrChkGradientPosition.AutoSize = True + Me.ucrChkGradientPosition.Checked = False + Me.ucrChkGradientPosition.Location = New System.Drawing.Point(10, 105) + Me.ucrChkGradientPosition.Name = "ucrChkGradientPosition" + Me.ucrChkGradientPosition.Size = New System.Drawing.Size(244, 23) + Me.ucrChkGradientPosition.TabIndex = 190 + ' + 'ucrChkGradientTrans + ' + Me.ucrChkGradientTrans.AutoSize = True + Me.ucrChkGradientTrans.Checked = False + Me.ucrChkGradientTrans.Location = New System.Drawing.Point(10, 76) + Me.ucrChkGradientTrans.Name = "ucrChkGradientTrans" + Me.ucrChkGradientTrans.Size = New System.Drawing.Size(244, 23) + Me.ucrChkGradientTrans.TabIndex = 186 + ' + 'ucrChkLow + ' + Me.ucrChkLow.AutoSize = True + Me.ucrChkLow.Checked = False + Me.ucrChkLow.Location = New System.Drawing.Point(10, 46) + Me.ucrChkLow.Name = "ucrChkLow" + Me.ucrChkLow.Size = New System.Drawing.Size(244, 23) + Me.ucrChkLow.TabIndex = 185 + ' + 'ucrChkHigh + ' + Me.ucrChkHigh.AutoSize = True + Me.ucrChkHigh.Checked = False + Me.ucrChkHigh.Location = New System.Drawing.Point(10, 22) + Me.ucrChkHigh.Name = "ucrChkHigh" + Me.ucrChkHigh.Size = New System.Drawing.Size(244, 23) + Me.ucrChkHigh.TabIndex = 184 + ' + 'rdoGradient + ' + Me.rdoGradient.Appearance = System.Windows.Forms.Appearance.Button + Me.rdoGradient.BackColor = System.Drawing.SystemColors.Control + Me.rdoGradient.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None + Me.rdoGradient.CheckAlign = System.Drawing.ContentAlignment.MiddleCenter + Me.rdoGradient.FlatAppearance.BorderColor = System.Drawing.SystemColors.ActiveCaption + Me.rdoGradient.FlatAppearance.BorderSize = 2 + Me.rdoGradient.FlatAppearance.CheckedBackColor = System.Drawing.SystemColors.ActiveCaption + Me.rdoGradient.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.rdoGradient.ForeColor = System.Drawing.SystemColors.ActiveCaptionText + Me.rdoGradient.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.rdoGradient.Location = New System.Drawing.Point(505, 46) + Me.rdoGradient.Name = "rdoGradient" + Me.rdoGradient.Size = New System.Drawing.Size(91, 29) + Me.rdoGradient.TabIndex = 329 + Me.rdoGradient.Text = "Gradient" + Me.rdoGradient.TextAlign = System.Drawing.ContentAlignment.MiddleCenter + Me.rdoGradient.UseVisualStyleBackColor = True + ' 'ucrChkColour ' Me.ucrChkColour.AutoSize = True @@ -6135,7 +6641,7 @@ Partial Class sdgPlots Me.rdoGgthemes.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.rdoGgthemes.ForeColor = System.Drawing.SystemColors.ActiveCaptionText Me.rdoGgthemes.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.rdoGgthemes.Location = New System.Drawing.Point(467, 46) + Me.rdoGgthemes.Location = New System.Drawing.Point(416, 46) Me.rdoGgthemes.Name = "rdoGgthemes" Me.rdoGgthemes.Size = New System.Drawing.Size(91, 29) Me.rdoGgthemes.TabIndex = 279 @@ -6155,7 +6661,7 @@ Partial Class sdgPlots Me.rdoViridis.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.rdoViridis.ForeColor = System.Drawing.SystemColors.ActiveCaptionText Me.rdoViridis.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.rdoViridis.Location = New System.Drawing.Point(378, 46) + Me.rdoViridis.Location = New System.Drawing.Point(327, 46) Me.rdoViridis.Name = "rdoViridis" Me.rdoViridis.Size = New System.Drawing.Size(91, 29) Me.rdoViridis.TabIndex = 278 @@ -6185,7 +6691,7 @@ Partial Class sdgPlots Me.rdoQualitative.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.rdoQualitative.ForeColor = System.Drawing.SystemColors.ActiveCaptionText Me.rdoQualitative.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.rdoQualitative.Location = New System.Drawing.Point(289, 46) + Me.rdoQualitative.Location = New System.Drawing.Point(238, 46) Me.rdoQualitative.Name = "rdoQualitative" Me.rdoQualitative.Size = New System.Drawing.Size(91, 29) Me.rdoQualitative.TabIndex = 275 @@ -6205,7 +6711,7 @@ Partial Class sdgPlots Me.rdoSequential.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.rdoSequential.ForeColor = System.Drawing.SystemColors.ActiveCaptionText Me.rdoSequential.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.rdoSequential.Location = New System.Drawing.Point(111, 46) + Me.rdoSequential.Location = New System.Drawing.Point(60, 46) Me.rdoSequential.Name = "rdoSequential" Me.rdoSequential.Size = New System.Drawing.Size(91, 29) Me.rdoSequential.TabIndex = 273 @@ -6225,7 +6731,7 @@ Partial Class sdgPlots Me.rdoDiverging.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.rdoDiverging.ForeColor = System.Drawing.SystemColors.ActiveCaptionText Me.rdoDiverging.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.rdoDiverging.Location = New System.Drawing.Point(200, 46) + Me.rdoDiverging.Location = New System.Drawing.Point(149, 46) Me.rdoDiverging.Name = "rdoDiverging" Me.rdoDiverging.Size = New System.Drawing.Size(91, 29) Me.rdoDiverging.TabIndex = 274 @@ -6426,9 +6932,9 @@ Partial Class sdgPlots 'ucrPnlColourPalette ' Me.ucrPnlColourPalette.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrPnlColourPalette.Location = New System.Drawing.Point(111, 46) + Me.ucrPnlColourPalette.Location = New System.Drawing.Point(60, 46) Me.ucrPnlColourPalette.Name = "ucrPnlColourPalette" - Me.ucrPnlColourPalette.Size = New System.Drawing.Size(463, 29) + Me.ucrPnlColourPalette.Size = New System.Drawing.Size(565, 29) Me.ucrPnlColourPalette.TabIndex = 272 ' 'ucrInputAxisType @@ -7019,12 +7525,56 @@ Partial Class sdgPlots Me.ucrBaseSubdialog.Size = New System.Drawing.Size(224, 29) Me.ucrBaseSubdialog.TabIndex = 1 ' + 'ucrInputAesth + ' + Me.ucrInputAesth.AddQuotesIfUnrecognised = True + Me.ucrInputAesth.AutoSize = True + Me.ucrInputAesth.IsMultiline = False + Me.ucrInputAesth.IsReadOnly = False + Me.ucrInputAesth.Location = New System.Drawing.Point(250, 42) + Me.ucrInputAesth.Name = "ucrInputAesth" + Me.ucrInputAesth.Size = New System.Drawing.Size(177, 21) + Me.ucrInputAesth.TabIndex = 10 + ' + 'ucrInputAthsColor + ' + Me.ucrInputAthsColor.AddQuotesIfUnrecognised = True + Me.ucrInputAthsColor.AutoSize = True + Me.ucrInputAthsColor.IsMultiline = False + Me.ucrInputAthsColor.IsReadOnly = False + Me.ucrInputAthsColor.Location = New System.Drawing.Point(250, 43) + Me.ucrInputAthsColor.Name = "ucrInputAthsColor" + Me.ucrInputAthsColor.Size = New System.Drawing.Size(177, 21) + Me.ucrInputAthsColor.TabIndex = 12 + ' + 'ucrInputValue + ' + Me.ucrInputValue.AddQuotesIfUnrecognised = True + Me.ucrInputValue.AutoSize = True + Me.ucrInputValue.IsMultiline = False + Me.ucrInputValue.IsReadOnly = False + Me.ucrInputValue.Location = New System.Drawing.Point(250, 12) + Me.ucrInputValue.Name = "ucrInputValue" + Me.ucrInputValue.Size = New System.Drawing.Size(177, 21) + Me.ucrInputValue.TabIndex = 11 + ' + 'ucrInputValueColor + ' + Me.ucrInputValueColor.AddQuotesIfUnrecognised = True + Me.ucrInputValueColor.AutoSize = True + Me.ucrInputValueColor.IsMultiline = False + Me.ucrInputValueColor.IsReadOnly = False + Me.ucrInputValueColor.Location = New System.Drawing.Point(250, 13) + Me.ucrInputValueColor.Name = "ucrInputValueColor" + Me.ucrInputValueColor.Size = New System.Drawing.Size(177, 21) + Me.ucrInputValueColor.TabIndex = 13 + ' 'sdgPlots ' 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(687, 528) + Me.ClientSize = New System.Drawing.Size(687, 523) Me.Controls.Add(Me.ucrBaseSubdialog) Me.Controls.Add(Me.tbpPlotsOptions) Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow @@ -7036,93 +7586,101 @@ Partial Class sdgPlots Me.Text = "Plot Options" Me.tbpPlotsOptions.ResumeLayout(False) Me.tbpFacet.ResumeLayout(False) - Me.tbpFacet.PerformLayout() + Me.tbpFacet.PerformLayout Me.tbpLayers.ResumeLayout(False) - Me.tbpLayers.PerformLayout() + Me.tbpLayers.PerformLayout Me.tbpTitles.ResumeLayout(False) - Me.tbpTitles.PerformLayout() + Me.tbpTitles.PerformLayout Me.grpLegendTitle.ResumeLayout(False) - Me.grpLegendTitle.PerformLayout() + Me.grpLegendTitle.PerformLayout Me.tbpXAxis.ResumeLayout(False) - Me.tbpXAxis.PerformLayout() + Me.tbpXAxis.PerformLayout Me.tbpYAxis.ResumeLayout(False) - Me.tbpYAxis.PerformLayout() + Me.tbpYAxis.PerformLayout Me.tbpTheme.ResumeLayout(False) - Me.tbpTheme.PerformLayout() + Me.tbpTheme.PerformLayout Me.grpCommonOptions.ResumeLayout(False) - Me.grpCommonOptions.PerformLayout() + Me.grpCommonOptions.PerformLayout Me.tbpCoordinates.ResumeLayout(False) - Me.tbpCoordinates.PerformLayout() + Me.tbpCoordinates.PerformLayout Me.grpPolarCordinates.ResumeLayout(False) - Me.grpPolarCordinates.PerformLayout() + Me.grpPolarCordinates.PerformLayout Me.tbpColour.ResumeLayout(False) - Me.tbpColour.PerformLayout() + Me.tbpColour.PerformLayout + Me.grpfillmanual.ResumeLayout(False) + Me.grpfillmanual.PerformLayout + Me.grpmanualColour.ResumeLayout(False) + Me.grpmanualColour.PerformLayout + Me.grpColourGradient.ResumeLayout(False) + Me.grpColourGradient.PerformLayout + Me.grpFillGradient.ResumeLayout(False) + Me.grpFillGradient.PerformLayout Me.grpScalefillw.ResumeLayout(False) - Me.grpScalefillw.PerformLayout() + Me.grpScalefillw.PerformLayout Me.grpColourScale.ResumeLayout(False) - Me.grpColourScale.PerformLayout() + Me.grpColourScale.PerformLayout Me.grpScaleColorw.ResumeLayout(False) - Me.grpScaleColorw.PerformLayout() + Me.grpScaleColorw.PerformLayout Me.grpScalecolorcal.ResumeLayout(False) - Me.grpScalecolorcal.PerformLayout() + Me.grpScalecolorcal.PerformLayout Me.grpScalecolorhc.ResumeLayout(False) - Me.grpScalecolorhc.PerformLayout() + Me.grpScalecolorhc.PerformLayout Me.grpScalecolorfew.ResumeLayout(False) - Me.grpScalecolorfew.PerformLayout() + Me.grpScalecolorfew.PerformLayout Me.grpScalecolorsol.ResumeLayout(False) - Me.grpScalecolorsol.PerformLayout() + Me.grpScalecolorsol.PerformLayout Me.grpScalecolorpan.ResumeLayout(False) - Me.grpScalecolorpan.PerformLayout() + Me.grpScalecolorpan.PerformLayout Me.grpScalecolorg.ResumeLayout(False) - Me.grpScalecolorg.PerformLayout() + Me.grpScalecolorg.PerformLayout Me.grpColourScaleGgthemes.ResumeLayout(False) - Me.grpColourScaleGgthemes.PerformLayout() + Me.grpColourScaleGgthemes.PerformLayout Me.grpScalecolorEx.ResumeLayout(False) - Me.grpScalecolorEx.PerformLayout() + Me.grpScalecolorEx.PerformLayout Me.grpScalecolorEcon.ResumeLayout(False) - Me.grpScalecolorEcon.PerformLayout() + Me.grpScalecolorEcon.PerformLayout Me.grpScalecolorst.ResumeLayout(False) - Me.grpScalecolorst.PerformLayout() + Me.grpScalecolorst.PerformLayout Me.grpScalecolorExn.ResumeLayout(False) - Me.grpScalecolorExn.PerformLayout() + Me.grpScalecolorExn.PerformLayout Me.grpScaleColorfiv.ResumeLayout(False) - Me.grpScaleColorfiv.PerformLayout() + Me.grpScaleColorfiv.PerformLayout Me.grpScalecolorpt.ResumeLayout(False) - Me.grpScalecolorpt.PerformLayout() + Me.grpScalecolorpt.PerformLayout Me.grpScalefillg.ResumeLayout(False) - Me.grpScalefillg.PerformLayout() + Me.grpScalefillg.PerformLayout Me.grpScaleFillfiv.ResumeLayout(False) - Me.grpScaleFillfiv.PerformLayout() + Me.grpScaleFillfiv.PerformLayout Me.grpScalefillpt.ResumeLayout(False) - Me.grpScalefillpt.PerformLayout() + Me.grpScalefillpt.PerformLayout Me.grpScalefillst.ResumeLayout(False) - Me.grpScalefillst.PerformLayout() + Me.grpScalefillst.PerformLayout Me.grpScalefillpan.ResumeLayout(False) - Me.grpScalefillpan.PerformLayout() + Me.grpScalefillpan.PerformLayout Me.grpScalefillCal.ResumeLayout(False) - Me.grpScalefillCal.PerformLayout() + Me.grpScalefillCal.PerformLayout Me.grpScalefillEx.ResumeLayout(False) - Me.grpScalefillEx.PerformLayout() + Me.grpScalefillEx.PerformLayout Me.grpScalefillEcon.ResumeLayout(False) - Me.grpScalefillEcon.PerformLayout() + Me.grpScalefillEcon.PerformLayout Me.grpScalefillExn.ResumeLayout(False) - Me.grpScalefillExn.PerformLayout() + Me.grpScalefillExn.PerformLayout Me.grpScalefillsol.ResumeLayout(False) - Me.grpScalefillsol.PerformLayout() + Me.grpScalefillsol.PerformLayout Me.grpFillScaleggthemes.ResumeLayout(False) - Me.grpFillScaleggthemes.PerformLayout() + Me.grpFillScaleggthemes.PerformLayout Me.grpScalefillfew.ResumeLayout(False) - Me.grpScalefillfew.PerformLayout() + Me.grpScalefillfew.PerformLayout Me.grpScalefillhc.ResumeLayout(False) - Me.grpScalefillhc.PerformLayout() + Me.grpScalefillhc.PerformLayout Me.grpFillScale.ResumeLayout(False) - Me.grpFillScale.PerformLayout() + Me.grpFillScale.PerformLayout Me.tbpAnnotation.ResumeLayout(False) - Me.tbpAnnotation.PerformLayout() + Me.tbpAnnotation.PerformLayout Me.grpAnnotation.ResumeLayout(False) - Me.grpAnnotation.PerformLayout() + Me.grpAnnotation.PerformLayout Me.ResumeLayout(False) - Me.PerformLayout() + Me.PerformLayout End Sub @@ -7697,6 +8255,51 @@ Partial Class sdgPlots Friend WithEvents ucrChkNaValuew As ucrCheck Friend WithEvents ucrChkDropUnusedLevelsw As ucrCheck Friend WithEvents ucrChkColour As ucrCheck + Friend WithEvents rdoGradient As RadioButton + Friend WithEvents grpColourGradient As GroupBox + Friend WithEvents ucrInputGradientPositionColour As ucrInputComboBox + Friend WithEvents ucrInputGradientTransColour As ucrInputComboBox + Friend WithEvents ucrInputGradientExpandColour As ucrInputTextBox + Friend WithEvents ucrChkGradientExpandColour As ucrCheck + Friend WithEvents ucrChkGradientPositionColour As ucrCheck + Friend WithEvents ucrChkGradientTransColour As ucrCheck + Friend WithEvents ucrChkLowColour As ucrCheck + Friend WithEvents ucrChkHighColour As ucrCheck + Friend WithEvents grpFillGradient As GroupBox + Friend WithEvents ucrInputGradientPosition As ucrInputComboBox + Friend WithEvents ucrInputGradientTrans As ucrInputComboBox + Friend WithEvents ucrInputGradientExpand As ucrInputTextBox + Friend WithEvents ucrChkGradientExpand As ucrCheck + Friend WithEvents ucrChkGradientPosition As ucrCheck + Friend WithEvents ucrChkGradientTrans As ucrCheck + Friend WithEvents ucrChkLow As ucrCheck + Friend WithEvents ucrChkHigh As ucrCheck + Friend WithEvents ucrColourText As ucrColors + Friend WithEvents ucrColorsHighColour As ucrColors + Friend WithEvents ucrColorsLow As ucrColors + Friend WithEvents ucrColorsHigh As ucrColors + Friend WithEvents grpfillmanual As GroupBox + Friend WithEvents ucrChkaesth As ucrCheck + Friend WithEvents ucrChkLimitsManual As ucrCheck + Friend WithEvents ucrChkBreacksManual As ucrCheck + Friend WithEvents ucrChkNavaluemanual As ucrCheck + Friend WithEvents ucrChkValueManual As ucrCheck + Friend WithEvents grpmanualColour As GroupBox + Friend WithEvents ucrChkAesthColor As ucrCheck + Friend WithEvents ucrChkLimitsManualColor As ucrCheck + Friend WithEvents ucrChkBreacksManualColor As ucrCheck + Friend WithEvents ucrChkNavaluemanualColor As ucrCheck + Friend WithEvents ucrChkValueManualColor As ucrCheck + Friend WithEvents ucrInputNavaluesManual As ucrInputTextBox + Friend WithEvents ucrInputBreackmanual As ucrInputTextBox + Friend WithEvents ucrInputLimitsmanual As ucrInputTextBox + Friend WithEvents ucrInputNavaluesManualColor As ucrInputTextBox + Friend WithEvents ucrInputBreackmanualcolor As ucrInputTextBox + Friend WithEvents ucrInputLimitsmanualcolor As ucrInputTextBox + Friend WithEvents ucrInputValue As ucrInputTextBox + Friend WithEvents ucrInputAesth As ucrInputTextBox + Friend WithEvents ucrInputValueColor As ucrInputTextBox + Friend WithEvents ucrInputAthsColor As ucrInputTextBox End Class diff --git a/instat/sdgPlots.vb b/instat/sdgPlots.vb index de83d3ad2c9..18e491dd56f 100644 --- a/instat/sdgPlots.vb +++ b/instat/sdgPlots.vb @@ -68,6 +68,8 @@ Public Class sdgPlots Private clsScalecolorcanvaFunction, clsScalefillcanvaFunction As New RFunction Private clsScalecolorexcelnewFunction, clsScalefillexcelnewFunction As New RFunction Private clsScalecolorgradienttableauFunction, clsScalefillgradienttableauFunction As New RFunction + Private clsScalecolorgradientFunction, clsScalefillgradientFunction As New RFunction + Private clsScalecolormanualFunction, clsScalefillmanualFunction As New RFunction 'All the previous RFunctions will eventually be stored as parameters (or parameters of parameters) within the RSyntax building the big Ggplot command "ggplot(...) + geom_..(..) + ... + theme(...) + scales(...) ..." 'They are treated separately from the RSyntax for the sake of clarity, then sinked in eventually. Public bFirstLoad As Boolean = True @@ -595,6 +597,7 @@ Public Class sdgPlots ucrPnlColourPalette.AddRadioButton(rdoQualitative) ucrPnlColourPalette.AddRadioButton(rdoViridis) ucrPnlColourPalette.AddRadioButton(rdoGgthemes) + ucrPnlColourPalette.AddRadioButton(rdoGradient) ucrPnlScale.AddRadioButton(rdoColour) ucrPnlScale.AddRadioButton(rdoFill) @@ -694,7 +697,7 @@ Public Class sdgPlots ucrInputDropUnusedLevels.SetItems({"TRUE", "FALSE"}) ucrChkPosition.SetText("Position") - ucrChkPosition.AddToLinkedControls(ucrInputPosition, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:="Left") + ucrChkPosition.AddToLinkedControls(ucrInputPosition, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:="left") ucrInputPosition.SetDropDownStyleAsNonEditable() ucrInputPosition.SetParameter(New RParameter("position")) ucrInputPosition.SetItems({"left", "right", "bottom", "top"}) @@ -742,10 +745,8 @@ Public Class sdgPlots ucrInputAxisType.AddToLinkedControls(ucrInputPaletteContinuous, {"continuous"}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) ucrInputAxisType.AddToLinkedControls(ucrInputPalettes, {"discrete"}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) - 'ucrInputAxisType.SetRDefault("discrete") - ucrChkPositionColor.SetText("Position") - ucrChkPositionColor.AddToLinkedControls(ucrInputPositionColor, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:="Left") + ucrChkPositionColor.AddToLinkedControls(ucrInputPositionColor, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:="left") ucrInputPositionColor.SetDropDownStyleAsNonEditable() ucrInputPositionColor.SetParameter(New RParameter("position")) ucrInputPositionColor.SetItems({"left", "right", "bottom", "top"}) @@ -789,7 +790,7 @@ Public Class sdgPlots ucrInputDropUnusedLevelsCal.SetItems({"TRUE", "FALSE"}) ucrChkPositionCal.SetText("Position") - ucrChkPositionCal.AddToLinkedControls(ucrInputPositionCal, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:="Left") + ucrChkPositionCal.AddToLinkedControls(ucrInputPositionCal, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:="left") ucrInputPositionCal.SetDropDownStyleAsNonEditable() ucrInputPositionCal.SetParameter(New RParameter("position")) ucrInputPositionCal.SetItems({"left", "right", "bottom", "top"}) @@ -833,7 +834,7 @@ Public Class sdgPlots ucrInputDropUnusedLevelsColorCal.SetItems({"TRUE", "FALSE"}) ucrChkPositionColorCal.SetText("Position") - ucrChkPositionColorCal.AddToLinkedControls(ucrInputPositionColorCal, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:="Left") + ucrChkPositionColorCal.AddToLinkedControls(ucrInputPositionColorCal, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:="left") ucrInputPositionColorCal.SetDropDownStyleAsNonEditable() ucrInputPositionColorCal.SetParameter(New RParameter("position")) ucrInputPositionColorCal.SetItems({"left", "right", "bottom", "top"}) @@ -877,7 +878,7 @@ Public Class sdgPlots ucrInputDropUnusedLevelsEcon.SetItems({"TRUE", "FALSE"}) ucrChkPositionEcon.SetText("Position") - ucrChkPositionEcon.AddToLinkedControls(ucrInputPositionEcon, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:="Left") + ucrChkPositionEcon.AddToLinkedControls(ucrInputPositionEcon, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:="left") ucrInputPositionEcon.SetDropDownStyleAsNonEditable() ucrInputPositionEcon.SetParameter(New RParameter("position")) ucrInputPositionEcon.SetItems({"left", "right", "bottom", "top"}) @@ -921,7 +922,7 @@ Public Class sdgPlots ucrInputDropUnusedLevelsColorEcon.SetItems({"TRUE", "FALSE"}) ucrChkPositionColorEcon.SetText("Position") - ucrChkPositionColorEcon.AddToLinkedControls(ucrInputPositionColorEcon, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:="Left") + ucrChkPositionColorEcon.AddToLinkedControls(ucrInputPositionColorEcon, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:="left") ucrInputPositionColorEcon.SetDropDownStyleAsNonEditable() ucrInputPositionColorEcon.SetParameter(New RParameter("position")) ucrInputPositionColorEcon.SetItems({"left", "right", "bottom", "top"}) @@ -965,7 +966,7 @@ Public Class sdgPlots ucrInputDropUnusedLevelsEx.SetItems({"TRUE", "FALSE"}) ucrChkPositionEx.SetText("Position") - ucrChkPositionEx.AddToLinkedControls(ucrInputPositionEx, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:="Left") + ucrChkPositionEx.AddToLinkedControls(ucrInputPositionEx, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:="left") ucrInputPositionEx.SetDropDownStyleAsNonEditable() ucrInputPositionEx.SetParameter(New RParameter("position")) ucrInputPositionEx.SetItems({"left", "right", "bottom", "top"}) @@ -1009,7 +1010,7 @@ Public Class sdgPlots ucrInputDropUnusedLevelsColorEx.SetItems({"TRUE", "FALSE"}) ucrChkPositionColorEx.SetText("Position") - ucrChkPositionColorEx.AddToLinkedControls(ucrInputPositionColorEx, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:="Left") + ucrChkPositionColorEx.AddToLinkedControls(ucrInputPositionColorEx, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:="left") ucrInputPositionColorEx.SetDropDownStyleAsNonEditable() ucrInputPositionColorEx.SetParameter(New RParameter("position")) ucrInputPositionColorEx.SetItems({"left", "right", "bottom", "top"}) @@ -1053,7 +1054,7 @@ Public Class sdgPlots ucrInputDropUnusedLevelsExn.SetItems({"TRUE", "FALSE"}) ucrChkPositionExn.SetText("Position") - ucrChkPositionExn.AddToLinkedControls(ucrInputPositionExn, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:="Left") + ucrChkPositionExn.AddToLinkedControls(ucrInputPositionExn, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:="left") ucrInputPositionExn.SetDropDownStyleAsNonEditable() ucrInputPositionExn.SetParameter(New RParameter("position")) ucrInputPositionExn.SetItems({"left", "right", "bottom", "top"}) @@ -1097,7 +1098,7 @@ Public Class sdgPlots ucrInputDropUnusedLevelsColorExn.SetItems({"TRUE", "FALSE"}) ucrChkPositionColorExn.SetText("Position") - ucrChkPositionColorExn.AddToLinkedControls(ucrInputPositionColorExn, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:="Left") + ucrChkPositionColorExn.AddToLinkedControls(ucrInputPositionColorExn, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:="left") ucrInputPositionColorExn.SetDropDownStyleAsNonEditable() ucrInputPositionColorExn.SetParameter(New RParameter("position")) ucrInputPositionColorExn.SetItems({"left", "right", "bottom", "top"}) @@ -1159,7 +1160,7 @@ Public Class sdgPlots ucrInputDropUnusedLevelsfew.SetItems({"TRUE", "FALSE"}) ucrChkPositionfew.SetText("Position") - ucrChkPositionfew.AddToLinkedControls(ucrInputPositionfew, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:="Left") + ucrChkPositionfew.AddToLinkedControls(ucrInputPositionfew, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:="left") ucrInputPositionfew.SetDropDownStyleAsNonEditable() ucrInputPositionfew.SetParameter(New RParameter("position")) ucrInputPositionfew.SetItems({"left", "right", "bottom", "top"}) @@ -1203,7 +1204,7 @@ Public Class sdgPlots ucrInputDropUnusedLevelsColorfew.SetItems({"TRUE", "FALSE"}) ucrChkPositionColorfew.SetText("Position") - ucrChkPositionColorfew.AddToLinkedControls(ucrInputPositionColorfew, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:="Left") + ucrChkPositionColorfew.AddToLinkedControls(ucrInputPositionColorfew, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:="left") ucrInputPositionColorfew.SetDropDownStyleAsNonEditable() ucrInputPositionColorfew.SetParameter(New RParameter("position")) ucrInputPositionColorfew.SetItems({"left", "right", "bottom", "top"}) @@ -1247,7 +1248,7 @@ Public Class sdgPlots ucrInputDropUnusedLevelsfiv.SetItems({"TRUE", "FALSE"}) ucrChkPositionfiv.SetText("Position") - ucrChkPositionfiv.AddToLinkedControls(ucrInputPositionfiv, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:="Left") + ucrChkPositionfiv.AddToLinkedControls(ucrInputPositionfiv, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:="left") ucrInputPositionfiv.SetDropDownStyleAsNonEditable() ucrInputPositionfiv.SetParameter(New RParameter("position")) ucrInputPositionfiv.SetItems({"left", "right", "bottom", "top"}) @@ -1291,7 +1292,7 @@ Public Class sdgPlots ucrInputDropUnusedLevelsColorfiv.SetItems({"TRUE", "FALSE"}) ucrChkPositionColorfiv.SetText("Position") - ucrChkPositionColorfiv.AddToLinkedControls(ucrInputPositionColorfiv, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:="Left") + ucrChkPositionColorfiv.AddToLinkedControls(ucrInputPositionColorfiv, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:="left") ucrInputPositionColorfiv.SetDropDownStyleAsNonEditable() ucrInputPositionColorfiv.SetParameter(New RParameter("position")) ucrInputPositionColorfiv.SetItems({"left", "right", "bottom", "top"}) @@ -1335,7 +1336,7 @@ Public Class sdgPlots ucrInputDropUnusedLevelsg.SetItems({"TRUE", "FALSE"}) ucrChkPositiong.SetText("Position") - ucrChkPositiong.AddToLinkedControls(ucrInputPositiong, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:="Left") + ucrChkPositiong.AddToLinkedControls(ucrInputPositiong, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:="left") ucrInputPositiong.SetDropDownStyleAsNonEditable() ucrInputPositiong.SetParameter(New RParameter("position")) ucrInputPositiong.SetItems({"left", "right", "bottom", "top"}) @@ -1379,7 +1380,7 @@ Public Class sdgPlots ucrInputDropUnusedLevelsColorg.SetItems({"TRUE", "FALSE"}) ucrChkPositionColorg.SetText("Position") - ucrChkPositionColorg.AddToLinkedControls(ucrInputPositionColorg, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:="Left") + ucrChkPositionColorg.AddToLinkedControls(ucrInputPositionColorg, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:="left") ucrInputPositionColorg.SetDropDownStyleAsNonEditable() ucrInputPositionColorg.SetParameter(New RParameter("position")) ucrInputPositionColorg.SetItems({"left", "right", "bottom", "top"}) @@ -1423,7 +1424,7 @@ Public Class sdgPlots ucrInputDropUnusedLevelshc.SetItems({"TRUE", "FALSE"}) ucrChkPositionhc.SetText("Position") - ucrChkPositionhc.AddToLinkedControls(ucrInputPositionhc, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:="Left") + ucrChkPositionhc.AddToLinkedControls(ucrInputPositionhc, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:="left") ucrInputPositionhc.SetDropDownStyleAsNonEditable() ucrInputPositionhc.SetParameter(New RParameter("position")) ucrInputPositionhc.SetItems({"left", "right", "bottom", "top"}) @@ -1467,7 +1468,7 @@ Public Class sdgPlots ucrInputDropUnusedLevelsColorhc.SetItems({"TRUE", "FALSE"}) ucrChkPositionColorhc.SetText("Position") - ucrChkPositionColorhc.AddToLinkedControls(ucrInputPositionColorhc, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:="Left") + ucrChkPositionColorhc.AddToLinkedControls(ucrInputPositionColorhc, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:="left") ucrInputPositionColorhc.SetDropDownStyleAsNonEditable() ucrInputPositionColorhc.SetParameter(New RParameter("position")) ucrInputPositionColorhc.SetItems({"left", "right", "bottom", "top"}) @@ -1543,7 +1544,7 @@ Public Class sdgPlots ucrInputDropUnusedLevelspan.SetItems({"TRUE", "FALSE"}) ucrChkPositionpan.SetText("Position") - ucrChkPositionpan.AddToLinkedControls(ucrInputPositionpan, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:="Left") + ucrChkPositionpan.AddToLinkedControls(ucrInputPositionpan, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:="left") ucrInputPositionpan.SetDropDownStyleAsNonEditable() ucrInputPositionpan.SetParameter(New RParameter("position")) ucrInputPositionpan.SetItems({"left", "right", "bottom", "top"}) @@ -1587,7 +1588,7 @@ Public Class sdgPlots ucrInputDropUnusedLevelsColorpan.SetItems({"TRUE", "FALSE"}) ucrChkPositionColorpan.SetText("Position") - ucrChkPositionColorpan.AddToLinkedControls(ucrInputPositionColorpan, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:="Left") + ucrChkPositionColorpan.AddToLinkedControls(ucrInputPositionColorpan, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:="left") ucrInputPositionColorpan.SetDropDownStyleAsNonEditable() ucrInputPositionColorpan.SetParameter(New RParameter("position")) ucrInputPositionColorpan.SetItems({"left", "right", "bottom", "top"}) @@ -1631,7 +1632,7 @@ Public Class sdgPlots ucrInputDropUnusedLevelspt.SetItems({"TRUE", "FALSE"}) ucrChkPositionpt.SetText("Position") - ucrChkPositionpt.AddToLinkedControls(ucrInputPositionpt, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:="Left") + ucrChkPositionpt.AddToLinkedControls(ucrInputPositionpt, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:="left") ucrInputPositionpt.SetDropDownStyleAsNonEditable() ucrInputPositionpt.SetParameter(New RParameter("position")) ucrInputPositionpt.SetItems({"left", "right", "bottom", "top"}) @@ -1675,7 +1676,7 @@ Public Class sdgPlots ucrInputDropUnusedLevelsColorpt.SetItems({"TRUE", "FALSE"}) ucrChkPositionColorpt.SetText("Position") - ucrChkPositionColorpt.AddToLinkedControls(ucrInputPositionColorpt, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:="Left") + ucrChkPositionColorpt.AddToLinkedControls(ucrInputPositionColorpt, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:="left") ucrInputPositionColorpt.SetDropDownStyleAsNonEditable() ucrInputPositionColorpt.SetParameter(New RParameter("position")) ucrInputPositionColorpt.SetItems({"left", "right", "bottom", "top"}) @@ -1719,7 +1720,7 @@ Public Class sdgPlots ucrInputDropUnusedLevelssol.SetItems({"TRUE", "FALSE"}) ucrChkPositionsol.SetText("Position") - ucrChkPositionsol.AddToLinkedControls(ucrInputPositionsol, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:="Left") + ucrChkPositionsol.AddToLinkedControls(ucrInputPositionsol, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:="left") ucrInputPositionsol.SetDropDownStyleAsNonEditable() ucrInputPositionsol.SetParameter(New RParameter("position")) ucrInputPositionsol.SetItems({"left", "right", "bottom", "top"}) @@ -1763,7 +1764,7 @@ Public Class sdgPlots ucrInputDropUnusedLevelsColorsol.SetItems({"TRUE", "FALSE"}) ucrChkPositionColorsol.SetText("Position") - ucrChkPositionColorsol.AddToLinkedControls(ucrInputPositionColorsol, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:="Left") + ucrChkPositionColorsol.AddToLinkedControls(ucrInputPositionColorsol, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:="left") ucrInputPositionColorsol.SetDropDownStyleAsNonEditable() ucrInputPositionColorsol.SetParameter(New RParameter("position")) ucrInputPositionColorsol.SetItems({"left", "right", "bottom", "top"}) @@ -1807,7 +1808,7 @@ Public Class sdgPlots ucrInputDropUnusedLevelsst.SetItems({"TRUE", "FALSE"}) ucrChkPositionst.SetText("Position") - ucrChkPositionst.AddToLinkedControls(ucrInputPositionst, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:="Left") + ucrChkPositionst.AddToLinkedControls(ucrInputPositionst, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:="left") ucrInputPositionst.SetDropDownStyleAsNonEditable() ucrInputPositionst.SetParameter(New RParameter("position")) ucrInputPositionst.SetItems({"left", "right", "bottom", "top"}) @@ -1851,7 +1852,7 @@ Public Class sdgPlots ucrInputDropUnusedLevelsColorst.SetItems({"TRUE", "FALSE"}) ucrChkPositionColorst.SetText("Position") - ucrChkPositionColorst.AddToLinkedControls(ucrInputPositionColorst, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:="Left") + ucrChkPositionColorst.AddToLinkedControls(ucrInputPositionColorst, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:="left") ucrInputPositionColorst.SetDropDownStyleAsNonEditable() ucrInputPositionColorst.SetParameter(New RParameter("position")) ucrInputPositionColorst.SetItems({"left", "right", "bottom", "top"}) @@ -1911,7 +1912,7 @@ Public Class sdgPlots ucrInputDropUnusedLevelsw.SetItems({"TRUE", "FALSE"}) ucrChkPositionw.SetText("Position") - ucrChkPositionw.AddToLinkedControls(ucrInputPositionw, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:="Left") + ucrChkPositionw.AddToLinkedControls(ucrInputPositionw, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:="left") ucrInputPositionw.SetDropDownStyleAsNonEditable() ucrInputPositionw.SetParameter(New RParameter("position")) ucrInputPositionw.SetItems({"left", "right", "bottom", "top"}) @@ -1955,7 +1956,7 @@ Public Class sdgPlots ucrInputDropUnusedLevelsColorw.SetItems({"TRUE", "FALSE"}) ucrChkPositionColorw.SetText("Position") - ucrChkPositionColorw.AddToLinkedControls(ucrInputPositionColorw, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:="Left") + ucrChkPositionColorw.AddToLinkedControls(ucrInputPositionColorw, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:="left") ucrInputPositionColorw.SetDropDownStyleAsNonEditable() ucrInputPositionColorw.SetParameter(New RParameter("position")) ucrInputPositionColorw.SetItems({"left", "right", "bottom", "top"}) @@ -2027,6 +2028,7 @@ Public Class sdgPlots ucrPnlColourPalette.AddParameterValuesCondition(rdoQualitative, "palette", "qualitative") ucrPnlColourPalette.AddParameterValuesCondition(rdoViridis, "option", "viridis") ucrPnlColourPalette.AddParameterValuesCondition(rdoGgthemes, "palette", "ggthemes") + ucrPnlColourPalette.AddParameterValuesCondition(rdoGradient, "palette", "gradient") ucrPnlScale.AddParameterValuesCondition(rdoColour, "Check", "color") ucrPnlScale.AddParameterValuesCondition(rdoFill, "Check", "fill") ucrPnlColourPalette.AddToLinkedControls(ucrInputColorFunctions, {rdoGgthemes}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:="") @@ -2066,6 +2068,78 @@ Public Class sdgPlots ucrInputFillScaleColour.SetRDefault(Chr(34) & "viridis" & Chr(34)) ucrInputFillScaleColour.SetLinkedDisplayControl(lblFillScaleColourPalettte) + ucrChkGradientPosition.SetText("Position") + ucrChkGradientPosition.AddToLinkedControls(ucrInputGradientPosition, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:="left") + ucrInputGradientPosition.SetDropDownStyleAsNonEditable() + ucrInputGradientPosition.SetParameter(New RParameter("position")) + ucrInputGradientPosition.SetItems({"left", "right", "bottom", "top"}) + ucrChkGradientPosition.AddParameterPresentCondition(True, "position") + ucrChkGradientPosition.AddParameterPresentCondition(False, "position", False) + + ucrChkGradientExpand.SetText("Expand") + ucrChkGradientExpand.AddParameterPresentCondition(True, "expand") + ucrChkGradientExpand.AddParameterPresentCondition(False, "expand", False) + ucrChkGradientExpand.AddToLinkedControls(ucrInputGradientExpand, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:="0.05,0") + ucrInputGradientExpand.SetValidationTypeAsNumericList() + + ucrChkGradientPositionColour.SetText("Position") + ucrChkGradientPositionColour.AddToLinkedControls(ucrInputGradientPositionColour, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:="left") + ucrInputGradientPositionColour.SetDropDownStyleAsNonEditable() + ucrInputGradientPositionColour.SetParameter(New RParameter("position")) + ucrInputGradientPositionColour.SetItems({"left", "right", "bottom", "top"}) + ucrChkGradientPositionColour.AddParameterPresentCondition(True, "position") + ucrChkGradientPositionColour.AddParameterPresentCondition(False, "position", False) + + ucrChkGradientExpandColour.SetText("Expand") + ucrChkGradientExpandColour.AddParameterPresentCondition(True, "expand") + ucrChkGradientExpandColour.AddParameterPresentCondition(False, "expand", False) + ucrChkGradientExpandColour.AddToLinkedControls(ucrInputGradientExpandColour, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:="0.05,0") + ucrInputGradientExpandColour.SetValidationTypeAsNumericList() + + ucrChkGradientTransColour.SetText("Transformation") + ucrChkGradientTransColour.AddToLinkedControls(ucrInputGradientTransColour, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:="sqrt") + ucrInputGradientTransColour.SetDropDownStyleAsNonEditable() + ucrInputGradientTransColour.SetParameter(New RParameter("trans")) + ucrInputGradientTransColour.SetItems({"asn", "atanh", "boxcox", "date", "exp", "hms", "identity", "log", "log10", "log1p", "log2", "logit", "modulus", "probability", "probit", "pseudo_log", "reciprocal", "reverse", "sqrt", "time"}) + ucrChkGradientTransColour.AddParameterPresentCondition(True, "trans") + ucrChkGradientTransColour.AddParameterPresentCondition(False, "trans", False) + + ucrChkGradientTrans.SetText("Transformation") + ucrChkGradientTrans.AddToLinkedControls(ucrInputGradientTrans, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:="sqrt") + ucrInputGradientTrans.SetDropDownStyleAsNonEditable() + ucrInputGradientTrans.SetParameter(New RParameter("trans")) + ucrInputGradientTrans.SetItems({"asn", "atanh", "boxcox", "date", "exp", "hms", "identity", "log", "log10", "log1p", "log2", "logit", "modulus", "probability", "probit", "pseudo_log", "reciprocal", "reverse", "sqrt", "time"}) + ucrChkGradientTrans.AddParameterPresentCondition(True, "trans") + ucrChkGradientTrans.AddParameterPresentCondition(False, "trans", False) + + ucrChkHighColour.SetText("High") + ucrChkHighColour.AddToLinkedControls(ucrColorsHighColour, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:="black") + ucrColorsHighColour.SetParameter(New RParameter("high")) + ucrColorsHighColour.SetColours() + ucrChkHighColour.AddParameterPresentCondition(True, "high") + ucrChkHighColour.AddParameterPresentCondition(False, "high", False) + + ucrChkHigh.SetText("High") + ucrChkHigh.AddToLinkedControls(ucrColorsHigh, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:="black") + ucrColorsHigh.SetParameter(New RParameter("high")) + ucrColorsHigh.SetColours() + ucrChkHigh.AddParameterPresentCondition(True, "high") + ucrChkHigh.AddParameterPresentCondition(False, "high", False) + + ucrChkLowColour.SetText("Low") + ucrChkLowColour.AddToLinkedControls(ucrColourText, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:="black") + ucrColourText.SetParameter(New RParameter("low")) + ucrColourText.SetColours() + ucrChkLowColour.AddParameterPresentCondition(True, "low") + ucrChkLowColour.AddParameterPresentCondition(False, "low", False) + + ucrChkLow.SetText("Low") + ucrChkLow.AddToLinkedControls(ucrColorsLow, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:="black") + ucrColorsLow.SetParameter(New RParameter("low")) + ucrColorsLow.SetColours() + ucrChkLow.AddParameterPresentCondition(True, "low") + ucrChkLow.AddParameterPresentCondition(False, "low", False) + ucrNudFillScaleTransparency.SetParameter(New RParameter("alpha", iNewPosition:=1)) ucrNudFillScaleTransparency.SetMinMax(0, 1) ucrNudFillScaleTransparency.DecimalPlaces = 2 @@ -2140,13 +2214,81 @@ Public Class sdgPlots ucrChkColourDiscrete.SetParameter(New RParameter("discrete", iNewPosition:=5)) ucrChkColourDiscrete.SetRDefault("FALSE") ucrChkColourDiscrete.SetValuesCheckedAndUnchecked("TRUE", "FALSE") + + ucrChkBreacksManualColor.SetText("Breaks") + ucrChkBreacksManualColor.AddParameterPresentCondition(True, "breaks") + ucrChkBreacksManualColor.AddParameterPresentCondition(False, "breaks", False) + ucrChkBreacksManualColor.AddToLinkedControls(ucrInputBreackmanualcolor, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:="") + ucrInputBreackmanualcolor.SetValidationTypeAsList() + + ucrChkBreacksManual.SetText("Breaks") + ucrChkBreacksManual.AddParameterPresentCondition(True, "breaks") + ucrChkBreacksManual.AddParameterPresentCondition(False, "breaks", False) + ucrChkBreacksManual.AddToLinkedControls(ucrInputBreackmanual, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:="") + ucrInputBreackmanual.SetValidationTypeAsList() + + ucrChkLimitsManualColor.SetText("Limits") + ucrChkLimitsManualColor.AddParameterPresentCondition(True, "limit") + ucrChkLimitsManualColor.AddParameterPresentCondition(False, "limit", False) + ucrChkLimitsManualColor.AddToLinkedControls(ucrInputLimitsmanualcolor, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:="") + ucrInputLimitsmanualcolor.SetValidationTypeAsList() + + ucrChkLimitsManual.SetText("Limits") + ucrChkLimitsManual.AddParameterPresentCondition(True, "limit") + ucrChkLimitsManual.AddParameterPresentCondition(False, "limit", False) + ucrChkLimitsManual.AddToLinkedControls(ucrInputLimitsmanual, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:="") + ucrInputLimitsmanual.SetValidationTypeAsList() + + ucrInputNavaluesManualColor.SetParameter(New RParameter("na.value")) + ucrInputNavaluesManualColor.SetValidationTypeAsNumeric() + ucrInputNavaluesManualColor.bAddRemoveParameter = False + ucrInputNavaluesManualColor.AddQuotesIfUnrecognised = False + + ucrChkNavaluemanualColor.SetText("Replace Missing Values") + ucrChkNavaluemanualColor.AddParameterPresentCondition(True, "na.value") + ucrChkNavaluemanualColor.AddParameterPresentCondition(False, "na.value", False) + ucrChkNavaluemanualColor.AddToLinkedControls(ucrInputNavaluesManualColor, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:="") + + ucrInputNavaluesManual.SetParameter(New RParameter("na.value")) + ucrInputNavaluesManual.SetValidationTypeAsNumeric() + ucrInputNavaluesManual.bAddRemoveParameter = False + ucrInputNavaluesManual.AddQuotesIfUnrecognised = False + + ucrChkNavaluemanual.SetText("Replace Missing Values") + ucrChkNavaluemanual.AddParameterPresentCondition(True, "na.value") + ucrChkNavaluemanual.AddParameterPresentCondition(False, "na.value", False) + ucrChkNavaluemanual.AddToLinkedControls(ucrInputNavaluesManual, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:="") + + ucrChkAesthColor.SetText("Aesthetics") + ucrChkAesthColor.AddParameterPresentCondition(True, "aesthetics") + ucrChkAesthColor.AddParameterPresentCondition(False, "aesthetics", False) + ucrChkAesthColor.AddToLinkedControls(ucrInputAthsColor, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:="") + ucrInputAthsColor.SetValidationTypeAsList() + + ucrChkaesth.SetText("Aesthetics") + ucrChkaesth.AddParameterPresentCondition(True, "aesthetics") + ucrChkaesth.AddParameterPresentCondition(False, "aesthetics", False) + ucrChkaesth.AddToLinkedControls(ucrInputAesth, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:="") + ucrInputAesth.SetValidationTypeAsList() + + ucrChkValueManualColor.SetText("Values") + ucrChkValueManualColor.AddParameterPresentCondition(True, "values") + ucrChkValueManualColor.AddParameterPresentCondition(False, "values", False) + ucrChkValueManualColor.AddToLinkedControls(ucrInputValueColor, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:="") + ucrInputValueColor.SetValidationTypeAsList() + + ucrChkValueManual.SetText("Values") + ucrChkValueManual.AddParameterPresentCondition(True, "values") + ucrChkValueManual.AddParameterPresentCondition(False, "values", False) + ucrChkValueManual.AddToLinkedControls(ucrInputValue, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:="") + ucrInputValue.SetValidationTypeAsList() End Sub Public Sub SetRCode(clsNewOperator As ROperator, clsNewCoordPolarFunction As RFunction, clsNewCoordPolarStartOperator As ROperator, clsNewYScalecontinuousFunction As RFunction, clsNewXScalecontinuousFunction As RFunction, clsNewLabsFunction As RFunction, clsNewXLabsTitleFunction As RFunction, clsNewYLabTitleFunction As RFunction, clsNewFacetFunction As RFunction, clsNewThemeFunction As RFunction, dctNewThemeFunctions As Dictionary(Of String, RFunction), ucrNewBaseSelector As ucrSelector, bReset As Boolean, Optional clsNewGlobalAesFunction As RFunction = Nothing, Optional clsNewXScaleDateFunction As RFunction = Nothing, Optional clsNewYScaleDateFunction As RFunction = Nothing, Optional clsNewFacetVariablesOperator As ROperator = Nothing, Optional clsNewScaleFillViridisFunction As RFunction = Nothing, Optional clsNewScaleColourViridisFunction As RFunction = Nothing, Optional strMainDialogGeomParameterNames() As String = Nothing, Optional clsNewAnnotateFunction As RFunction = Nothing, - Optional bNewEnableFill As Boolean = True, Optional bNewChangeScales As Boolean = False, Optional bNewEnableColour As Boolean = True, Optional bNewEnableDiscrete As Boolean = True, Optional strNewAxisType As String = "discrete") + Optional bNewEnableFill As Boolean = True, Optional bChangeAesParameter As Boolean = False, Optional bNewChangeScales As Boolean = False, Optional bNewEnableColour As Boolean = True, Optional bNewEnableDiscrete As Boolean = True, Optional strNewAxisType As String = "discrete") Dim clsTempParam As RParameter bRCodeSet = False @@ -2364,6 +2506,18 @@ Public Class sdgPlots clsScalefillexcelnewFunction.SetPackageName("ggthemes") clsScalefillexcelnewFunction.SetRCommand("scale_fill_excel_new") + clsScalecolorgradientFunction = New RFunction + clsScalecolorgradientFunction.SetRCommand("scale_colour_gradient") + + clsScalefillgradientFunction = New RFunction + clsScalefillgradientFunction.SetRCommand("scale_fill_gradient") + + clsScalecolormanualFunction = New RFunction + clsScalecolormanualFunction.SetRCommand("scale_colour_manual") + + clsScalefillmanualFunction = New RFunction + clsScalefillmanualFunction.SetRCommand("scale_fill_manual") + If Not clsBaseOperator.ContainsParameter("theme_name") Then clsBaseOperator.AddParameter(GgplotDefaults.clsDefaultThemeParameter.Clone()) End If @@ -2383,6 +2537,7 @@ Public Class sdgPlots urChkSelectTheme.SetRCode(clsBaseOperator, bReset, bCloneIfNeeded:=True) ucrPnlHorizonatalVertical.SetRCode(clsFacetFunction, bReset, bCloneIfNeeded:=True) + ucr1stFactorReceiver.SetRCode(clsFacetVariablesOperator, bReset, bCloneIfNeeded:=True) ucr2ndFactorReceiver.SetRCode(clsFacetVariablesOperator, bReset, bCloneIfNeeded:=True) @@ -2391,11 +2546,11 @@ Public Class sdgPlots ucrChkFreeScalesX.SetRCode(clsFacetFunction, bReset, bCloneIfNeeded:=True) If bReset Then ucrChkFreeScalesY.SetRCode(clsFacetFunction, bReset, bCloneIfNeeded:=True) + ucrChkIncludeFacets.SetRCode(clsBaseOperator, bReset, bCloneIfNeeded:=True) End If ucrNudNumberofRows.SetRCode(clsFacetFunction, bReset, bCloneIfNeeded:=True) ucrChkLabeler.SetRCode(clsFacetFunction, bReset, bCloneIfNeeded:=True) ucrChkDrop.SetRCode(clsFacetFunction, bReset, bCloneIfNeeded:=True) - ucrChkIncludeFacets.SetRCode(clsBaseOperator, bReset, bCloneIfNeeded:=True) 'Annnotation ucrChkAnnotation.SetRCode(clsBaseOperator, bReset, bCloneIfNeeded:=True) @@ -2418,7 +2573,10 @@ Public Class sdgPlots ucrXAxis.SetRCodeForControl(bIsXAxis:=True, strNewAxisType:=GetAxisType(True, bStrictDiscrete:=IsFactor(True, GetAesParameterArgValue("x"))), clsNewXYlabTitleFunction:=clsXLabFunction, clsNewXYScaleContinuousFunction:=clsXScalecontinuousFunction, clsNewXYScaleDateFunction:=clsXScaleDateFunction, clsNewBaseOperator:=clsBaseOperator, bReset:=bReset, bCloneIfNeeded:=True, strDataFrame:=strDataFrame, strNewVariable:=GetAesParameterArgValue("x")) ucrYAxis.SetRCodeForControl(bIsXAxis:=False, strNewAxisType:=GetAxisType(False, bStrictDiscrete:=IsFactor(False, GetAesParameterArgValue("y"))), clsNewXYlabTitleFunction:=clsYLabFunction, clsNewXYScaleContinuousFunction:=clsYScalecontinuousFunction, clsNewBaseOperator:=clsBaseOperator, clsNewXYScaleDateFunction:=clsYScaleDateFunction, bReset:=bReset, bCloneIfNeeded:=True, strDataFrame:=strDataFrame, strNewVariable:=GetAesParameterArgValue("y")) - ucrInputAxisType.SetName(GetAxisType(False, bStrictDiscrete:=IsFactor(False, GetAesParameterArgValue("y")))) + Dim strAes As String = "" + strAes = If(bChangeAesParameter, "fill", "y") + ucrInputAxisType.SetName(GetAxisType(False, bStrictDiscrete:=IsFactor(False, GetAesParameterArgValue(strAes), bHeatMap:=bChangeAesParameter), bHeatMap:=bChangeAesParameter)) + 'Themes tab SetRcodeForCommonThemesControls(bReset) 'coordinates tab @@ -2445,6 +2603,46 @@ Public Class sdgPlots ucrChkFillDiscrete.SetRCode(clsScaleFillViridisFunction, bReset, bCloneIfNeeded:=True) ucrChkColourDiscrete.SetRCode(clsScaleColourViridisFunction, bReset, bCloneIfNeeded:=True) If bReset Then + ucrChkValueManualColor.SetRCode(clsScalecolormanualFunction, bReset, bCloneIfNeeded:=True) + ucrInputValueColor.SetRCode(clsScalecolormanualFunction, bReset, bCloneIfNeeded:=True) + ucrChkAesthColor.SetRCode(clsScalecolormanualFunction, bReset, bCloneIfNeeded:=True) + ucrInputAthsColor.SetRCode(clsScalecolormanualFunction, bReset, bCloneIfNeeded:=True) + ucrChkLimitsManualColor.SetRCode(clsScalecolormanualFunction, bReset, bCloneIfNeeded:=True) + ucrInputLimitsmanualcolor.SetRCode(clsScalecolormanualFunction, bReset, bCloneIfNeeded:=True) + ucrChkBreacksManualColor.SetRCode(clsScalecolormanualFunction, bReset, bCloneIfNeeded:=True) + ucrInputBreackmanualcolor.SetRCode(clsScalecolormanualFunction, bReset, bCloneIfNeeded:=True) + ucrChkNavaluemanualColor.SetRCode(clsScalecolormanualFunction, bReset, bCloneIfNeeded:=True) + ucrInputNavaluesManualColor.SetRCode(clsScalecolormanualFunction, bReset, bCloneIfNeeded:=True) + ucrChkValueManual.SetRCode(clsScalefillmanualFunction, bReset, bCloneIfNeeded:=True) + ucrInputValue.SetRCode(clsScalefillmanualFunction, bReset, bCloneIfNeeded:=True) + ucrChkaesth.SetRCode(clsScalefillmanualFunction, bReset, bCloneIfNeeded:=True) + ucrInputAesth.SetRCode(clsScalefillmanualFunction, bReset, bCloneIfNeeded:=True) + ucrChkLimitsManual.SetRCode(clsScalefillmanualFunction, bReset, bCloneIfNeeded:=True) + ucrInputLimitsmanual.SetRCode(clsScalefillmanualFunction, bReset, bCloneIfNeeded:=True) + ucrChkBreacksManual.SetRCode(clsScalefillmanualFunction, bReset, bCloneIfNeeded:=True) + ucrInputBreackmanual.SetRCode(clsScalefillmanualFunction, bReset, bCloneIfNeeded:=True) + ucrChkNavaluemanual.SetRCode(clsScalefillmanualFunction, bReset, bCloneIfNeeded:=True) + ucrInputNavaluesManual.SetRCode(clsScalefillmanualFunction, bReset, bCloneIfNeeded:=True) + ucrChkGradientTransColour.SetRCode(clsScalecolorgradientFunction, bReset, bCloneIfNeeded:=True) + ucrColourText.SetRCode(clsScalecolorgradientFunction, bReset, bCloneIfNeeded:=True) + ucrChkGradientTrans.SetRCode(clsScalefillgradientFunction, bReset, bCloneIfNeeded:=True) + ucrInputGradientTransColour.SetRCode(clsScalecolorgradientFunction, bReset, bCloneIfNeeded:=True) + ucrInputGradientTrans.SetRCode(clsScalefillgradientFunction, bReset, bCloneIfNeeded:=True) + ucrChkGradientPositionColour.SetRCode(clsScalecolorgradientFunction, bReset, bCloneIfNeeded:=True) + ucrChkGradientPosition.SetRCode(clsScalefillgradientFunction, bReset, bCloneIfNeeded:=True) + ucrInputGradientPosition.SetRCode(clsScalefillgradientFunction, bReset, bCloneIfNeeded:=True) + ucrInputGradientPositionColour.SetRCode(clsScalecolorgradientFunction, bReset, bCloneIfNeeded:=True) + ucrInputGradientExpand.SetRCode(clsScalefillgradientFunction, bReset, bCloneIfNeeded:=True) + ucrInputGradientExpandColour.SetRCode(clsScalecolorgradientFunction, bReset, bCloneIfNeeded:=True) + ucrChkGradientExpandColour.SetRCode(clsScalecolorgradientFunction, bReset, bCloneIfNeeded:=True) + ucrChkGradientExpand.SetRCode(clsScalefillgradientFunction, bReset, bCloneIfNeeded:=True) + ucrChkLow.SetRCode(clsScalefillgradientFunction, bReset, bCloneIfNeeded:=True) + ucrChkLowColour.SetRCode(clsScalecolorgradientFunction, bReset, bCloneIfNeeded:=True) + ucrChkHighColour.SetRCode(clsScalecolorgradientFunction, bReset, bCloneIfNeeded:=True) + ucrColorsHighColour.SetRCode(clsScalecolorgradientFunction, bReset, bCloneIfNeeded:=True) + ucrColorsLow.SetRCode(clsScalefillgradientFunction, bReset, bCloneIfNeeded:=True) + ucrColorsHigh.SetRCode(clsScalefillgradientFunction, bReset, bCloneIfNeeded:=True) + ucrChkHigh.SetRCode(clsScalefillgradientFunction, bReset, bCloneIfNeeded:=True) ucrChkColour.SetRCode(clsBaseOperator, bReset, bCloneIfNeeded:=True) ucrPnlScale.SetRCode(clsDummyFunction, bReset, bCloneIfNeeded:=True) ucrPnlColourPalette.SetRCode(clsDummyFunction, bReset, bCloneIfNeeded:=True) @@ -2847,9 +3045,17 @@ Public Class sdgPlots Return strVariable End Function - Private Function IsFactor(bIsX As Boolean, strVariable As String) As Boolean + Private Function IsFactor(bIsX As Boolean, strVariable As String, Optional bHeatMap As Boolean = False) As Boolean Dim strAes As String - strAes = If(bIsX, "x", "y") + If bIsX Then + strAes = "x" + Else + If bHeatMap Then + strAes = "fill" + Else + strAes = "y" + End If + End If Dim bIsFactor As Boolean = False If clsGlobalAesFunction IsNot Nothing AndAlso clsGlobalAesFunction.ContainsParameter(strAes) Then @@ -3089,13 +3295,17 @@ Public Class sdgPlots SetFacetParameters() End Sub - Private Function GetAxisType(bIsX As Boolean, Optional bStrictDiscrete As Boolean = False) As String + Private Function GetAxisType(bIsX As Boolean, Optional bStrictDiscrete As Boolean = False, Optional bHeatMap As Boolean = False) As String Dim strAes As String If bIsX Then strAes = "x" Else - strAes = "y" + If bHeatMap Then + strAes = "fill" + Else + strAes = "y" + End If End If If clsGlobalAesFunction IsNot Nothing Then If clsGlobalAesFunction.ContainsParameter(strAes) AndAlso clsGlobalAesFunction.GetParameter(strAes).strArgumentValue <> Chr(34) AndAlso Not bStrictDiscrete Then @@ -3381,6 +3591,8 @@ Public Class sdgPlots If ucrChkColour.Checked Then Select Case ucrInputAxisType.GetText Case "discrete" + clsBaseOperator.RemoveParameterByName("scale_colour_gradient") + clsBaseOperator.RemoveParameterByName("scale_fill_gradient") clsBaseOperator.RemoveParameterByName("scale_color_gradient_tableau") clsBaseOperator.RemoveParameterByName("scale_fill_gradient_tableau") clsBaseOperator.RemoveParameterByName("scale_color_distiller") @@ -3400,6 +3612,8 @@ Public Class sdgPlots End If End If Case "continuous" + clsBaseOperator.RemoveParameterByName("scale_colour_manual") + clsBaseOperator.RemoveParameterByName("scale_fill_manual") clsBaseOperator.RemoveParameterByName("scale_color_solarized") clsBaseOperator.RemoveParameterByName("scale_color_stata") clsBaseOperator.RemoveParameterByName("scale_color_hc") @@ -3484,6 +3698,12 @@ Public Class sdgPlots clsBaseOperator.RemoveParameterByName("scale_fill_gdocs") clsBaseOperator.RemoveParameterByName("scale_fill_hc") clsBaseOperator.RemoveParameterByName("scale_fill_ptol") + clsBaseOperator.RemoveParameterByName("scale_colour_gradient") + clsBaseOperator.RemoveParameterByName("scale_fill_gradient") + clsBaseOperator.RemoveParameterByName("scale_colour_manual") + clsBaseOperator.RemoveParameterByName("scale_fill_manual") + clsBaseOperator.RemoveParameterByName("scale_colour") + clsBaseOperator.RemoveParameterByName("scale_fill") End If End Sub @@ -3495,13 +3715,18 @@ Public Class sdgPlots GroupeColorScale() End Sub - Private Sub ucrInputAxisType_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrInputAxisType.ControlValueChanged + Private Sub ucrInputAxisType_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrInputAxisType.ControlValueChanged, ucrChkColour.ControlValueChanged, ucrInputPaletteContinuous.ControlValueChanged, ucrInputPalettes.ControlValueChanged HideShowCanvaFill() HideShowCanvacolor() GroupeColorScale() AddRemovePaletteDiscrete() - SetComboBoxItemsContinuous() - SetComboBoxItems() + MissingValues() + Palettes() + Position() + DropLevels() + Limits() + Breaks() + Expand() End Sub Private Sub GroupeColorScale() @@ -3511,6 +3736,8 @@ Public Class sdgPlots ucrInputPaletteContinuous.Hide() ucrInputcontinuouscolor.Hide() ucrInputContinousfill.Hide() + grpColourGradient.Hide() + grpFillGradient.Hide() If rdoColour.Checked AndAlso (rdoSequential.Checked OrElse rdoQualitative.Checked OrElse rdoDiverging.Checked) Then clsColourPaletteFunction.AddParameter("palette", Chr(34) & ucrInputPalettes.GetText & Chr(34), iPosition:=0) clsBaseOperator.AddParameter("scale_colour_brewer", clsRFunctionParameter:=clsColourPaletteFunction, iPosition:=15) @@ -3521,6 +3748,8 @@ Public Class sdgPlots clsBaseOperator.RemoveParameterByName("scale_color_hc") clsBaseOperator.RemoveParameterByName("scale_fill_hc") clsBaseOperator.RemoveParameterByName("scale_color_pander") + clsBaseOperator.RemoveParameterByName("scale_colour_manual") + clsBaseOperator.RemoveParameterByName("scale_fill_manual") clsBaseOperator.RemoveParameterByName("scale_fill_pander") clsBaseOperator.RemoveParameterByName("scale_color_colorblind") clsBaseOperator.RemoveParameterByName("scale_fill_colorblind") @@ -3551,6 +3780,8 @@ Public Class sdgPlots ucrInputFillFunction.Hide() grpFillScale.Hide() grpColourScale.Hide() + grpfillmanual.Hide() + grpmanualColour.Hide() grpFillScaleggthemes.Hide() grpColourScaleGgthemes.Hide() grpScalefillCal.Hide() @@ -3615,6 +3846,10 @@ Public Class sdgPlots clsBaseOperator.RemoveParameterByName("scale_fill") clsBaseOperator.RemoveParameterByName("scale_fill_brewer") clsBaseOperator.RemoveParameterByName("scale_color_brewer") + clsBaseOperator.RemoveParameterByName("scale_colour_manual") + clsBaseOperator.RemoveParameterByName("scale_fill_manual") + grpfillmanual.Hide() + grpmanualColour.Hide() ucrInputColorFunctions.Hide() ucrInputFillFunction.Hide() grpFillScale.Hide() @@ -3668,6 +3903,10 @@ Public Class sdgPlots clsBaseOperator.RemoveParameterByName("scale_fill_gdocs") clsBaseOperator.RemoveParameterByName("scale_fill_ptol") clsBaseOperator.RemoveParameterByName("scale_fill_calc") + clsBaseOperator.RemoveParameterByName("scale_colour_manual") + clsBaseOperator.RemoveParameterByName("scale_fill_manual") + grpfillmanual.Hide() + grpmanualColour.Hide() ucrInputColorFunctions.Show() ucrInputFillFunction.Hide() grpFillScale.Hide() @@ -4004,6 +4243,78 @@ Public Class sdgPlots clsBaseOperator.RemoveParameterByName("scale_color_gdocs") clsBaseOperator.RemoveParameterByName("scale_color_ptol") End If + ElseIf rdoColour.Checked AndAlso rdoGradient.Checked Then + clsBaseOperator.AddParameter("scale_colour_manual", clsRFunctionParameter:=clsScalecolormanualFunction, iPosition:=3) + clsBaseOperator.RemoveParameterByName("scale_fill_manual") + clsBaseOperator.RemoveParameterByName("scale_colour") + clsBaseOperator.RemoveParameterByName("scale_color_solarized") + clsBaseOperator.RemoveParameterByName("scale_fill_solarized") + clsBaseOperator.RemoveParameterByName("scale_fill_stata") + clsBaseOperator.RemoveParameterByName("scale_color_stata") + clsBaseOperator.RemoveParameterByName("scale_color_hc") + clsBaseOperator.RemoveParameterByName("scale_fill_hc") + clsBaseOperator.RemoveParameterByName("scale_color_pander") + clsBaseOperator.RemoveParameterByName("scale_fill_pander") + clsBaseOperator.RemoveParameterByName("scale_color_colorblind") + clsBaseOperator.RemoveParameterByName("scale_fill_colorblind") + clsBaseOperator.RemoveParameterByName("scale_color_wsj") + clsBaseOperator.RemoveParameterByName("scale_fill_wsj") + clsBaseOperator.RemoveParameterByName("scale_color_canva") + clsBaseOperator.RemoveParameterByName("scale_fill_canva") + clsBaseOperator.RemoveParameterByName("scale_color_economist") + clsBaseOperator.RemoveParameterByName("scale_fill_economist") + clsBaseOperator.RemoveParameterByName("scale_color_excel") + clsBaseOperator.RemoveParameterByName("scale_fill_excel") + clsBaseOperator.RemoveParameterByName("scale_color_excel_new") + clsBaseOperator.RemoveParameterByName("scale_fill_excel_new") + clsBaseOperator.RemoveParameterByName("scale_color_few") + clsBaseOperator.RemoveParameterByName("scale_fill_few") + clsBaseOperator.RemoveParameterByName("scale_color_fivethirtyeight") + clsBaseOperator.RemoveParameterByName("scale_fill_fivethirtyeight") + clsBaseOperator.RemoveParameterByName("scale_color_gdocs") + clsBaseOperator.RemoveParameterByName("scale_fill_gdocs") + clsBaseOperator.RemoveParameterByName("scale_color_ptol") + clsBaseOperator.RemoveParameterByName("scale_fill_ptol") + clsBaseOperator.RemoveParameterByName("scale_color_calc") + clsBaseOperator.RemoveParameterByName("scale_fill_calc") + clsBaseOperator.RemoveParameterByName("scale_fill") + clsBaseOperator.RemoveParameterByName("scale_fill_brewer") + clsBaseOperator.RemoveParameterByName("scale_color_brewer") + ucrInputColorFunctions.Hide() + ucrInputFillFunction.Hide() + grpFillScale.Hide() + grpColourScale.Hide() + grpmanualColour.Show() + grpFillScaleggthemes.Hide() + grpColourScaleGgthemes.Hide() + grpScalefillCal.Hide() + grpScalecolorcal.Hide() + grpScalefillEcon.Hide() + grpScalecolorEcon.Hide() + grpScalefillEx.Hide() + grpScalecolorEx.Hide() + grpScalefillExn.Hide() + grpScalecolorExn.Hide() + grpScalefillfew.Hide() + grpScaleFillfiv.Hide() + grpScaleColorfiv.Hide() + grpScalecolorfew.Hide() + grpScalefillg.Hide() + grpScalecolorg.Hide() + grpScalefillpan.Hide() + grpScalecolorpan.Hide() + grpScalefillpt.Hide() + grpScalecolorpt.Hide() + grpScalefillsol.Hide() + grpScalecolorsol.Hide() + grpScalefillst.Hide() + grpScalecolorst.Hide() + grpScalefillw.Hide() + grpScaleColorw.Hide() + grpScalefillhc.Hide() + grpScalecolorhc.Hide() + ucrInputPalettes.Hide() + grpfillmanual.Hide() ElseIf rdoFill.Checked AndAlso (rdoSequential.Checked OrElse rdoDiverging.Checked OrElse rdoQualitative.Checked) Then clsFillPaletteFunction.AddParameter("palette", Chr(34) & ucrInputPalettes.GetText & Chr(34), iPosition:=0) clsBaseOperator.AddParameter("scale_fill_brewer", clsRFunctionParameter:=clsFillPaletteFunction, iPosition:=15) @@ -4040,6 +4351,10 @@ Public Class sdgPlots clsBaseOperator.RemoveParameterByName("scale_fill_gdocs") clsBaseOperator.RemoveParameterByName("scale_fill_ptol") clsBaseOperator.RemoveParameterByName("scale_fill_wsj") + clsBaseOperator.RemoveParameterByName("scale_colour_manual") + clsBaseOperator.RemoveParameterByName("scale_fill_manual") + grpfillmanual.Hide() + grpmanualColour.Hide() ucrInputColorFunctions.Hide() ucrInputFillFunction.Hide() grpFillScale.Hide() @@ -4108,6 +4423,10 @@ Public Class sdgPlots clsBaseOperator.RemoveParameterByName("scale_color_brewer") clsBaseOperator.RemoveParameterByName("scale_fill_brewer") clsBaseOperator.RemoveParameterByName("scale_colour") + clsBaseOperator.RemoveParameterByName("scale_colour_manual") + clsBaseOperator.RemoveParameterByName("scale_fill_manual") + grpfillmanual.Hide() + grpmanualColour.Hide() ucrInputColorFunctions.Hide() ucrInputFillFunction.Hide() grpFillScale.Show() @@ -4161,6 +4480,10 @@ Public Class sdgPlots clsBaseOperator.RemoveParameterByName("scale_color_brewer") clsBaseOperator.RemoveParameterByName("scale_fill") clsBaseOperator.RemoveParameterByName("scale_colour") + clsBaseOperator.RemoveParameterByName("scale_colour_manual") + clsBaseOperator.RemoveParameterByName("scale_fill_manual") + grpfillmanual.Hide() + grpmanualColour.Hide() ucrInputColorFunctions.Hide() ucrInputFillFunction.Show() grpFillScale.Hide() @@ -4497,8 +4820,82 @@ Public Class sdgPlots clsBaseOperator.RemoveParameterByName("scale_fill_gdocs") clsBaseOperator.RemoveParameterByName("scale_fill_ptol") End If + ElseIf rdoFill.Checked AndAlso rdoGradient.Checked Then + clsBaseOperator.AddParameter("scale_fill_manual", clsRFunctionParameter:=clsScalefillmanualFunction, iPosition:=3) + clsBaseOperator.RemoveParameterByName("scale_color_solarized") + clsBaseOperator.RemoveParameterByName("scale_fill") + clsBaseOperator.RemoveParameterByName("scale_fill_solarized") + clsBaseOperator.RemoveParameterByName("scale_fill_stata") + clsBaseOperator.RemoveParameterByName("scale_color_stata") + clsBaseOperator.RemoveParameterByName("scale_color_hc") + clsBaseOperator.RemoveParameterByName("scale_fill_hc") + clsBaseOperator.RemoveParameterByName("scale_color_pander") + clsBaseOperator.RemoveParameterByName("scale_fill_pander") + clsBaseOperator.RemoveParameterByName("scale_color_colorblind") + clsBaseOperator.RemoveParameterByName("scale_fill_colorblind") + clsBaseOperator.RemoveParameterByName("scale_color_wsj") + clsBaseOperator.RemoveParameterByName("scale_fill_wsj") + clsBaseOperator.RemoveParameterByName("scale_color_canva") + clsBaseOperator.RemoveParameterByName("scale_fill_canva") + clsBaseOperator.RemoveParameterByName("scale_color_economist") + clsBaseOperator.RemoveParameterByName("scale_fill_economist") + clsBaseOperator.RemoveParameterByName("scale_color_excel") + clsBaseOperator.RemoveParameterByName("scale_fill_excel") + clsBaseOperator.RemoveParameterByName("scale_color_excel_new") + clsBaseOperator.RemoveParameterByName("scale_fill_excel_new") + clsBaseOperator.RemoveParameterByName("scale_color_few") + clsBaseOperator.RemoveParameterByName("scale_fill_few") + clsBaseOperator.RemoveParameterByName("scale_color_fivethirtyeight") + clsBaseOperator.RemoveParameterByName("scale_fill_fivethirtyeight") + clsBaseOperator.RemoveParameterByName("scale_color_gdocs") + clsBaseOperator.RemoveParameterByName("scale_fill_gdocs") + clsBaseOperator.RemoveParameterByName("scale_color_ptol") + clsBaseOperator.RemoveParameterByName("scale_fill_ptol") + clsBaseOperator.RemoveParameterByName("scale_color_calc") + clsBaseOperator.RemoveParameterByName("scale_fill_calc") + clsBaseOperator.RemoveParameterByName("scale_color_brewer") + clsBaseOperator.RemoveParameterByName("scale_fill_brewer") + clsBaseOperator.RemoveParameterByName("scale_colour") + clsBaseOperator.RemoveParameterByName("scale_colour_manual") + grpfillmanual.Show() + ucrInputColorFunctions.Hide() + ucrInputFillFunction.Hide() + grpFillScale.Hide() + grpColourScale.Hide() + grpFillScaleggthemes.Hide() + grpColourScaleGgthemes.Hide() + grpScalefillCal.Hide() + grpScalecolorcal.Hide() + grpScalefillEcon.Hide() + grpScalecolorEcon.Hide() + grpScalefillEx.Hide() + grpScalecolorEx.Hide() + grpScalefillExn.Hide() + grpScalecolorExn.Hide() + grpScalefillfew.Hide() + grpScaleFillfiv.Hide() + grpScaleColorfiv.Hide() + grpScalecolorfew.Hide() + grpScalefillg.Hide() + grpScalecolorg.Hide() + grpScalefillpan.Hide() + grpScalecolorpan.Hide() + grpScalefillpt.Hide() + grpScalecolorpt.Hide() + grpScalefillsol.Hide() + grpScalecolorsol.Hide() + grpScalefillst.Hide() + grpScalecolorst.Hide() + grpScalefillw.Hide() + grpScaleColorw.Hide() + grpScalefillhc.Hide() + grpScalecolorhc.Hide() + ucrInputPalettes.Hide() + grpmanualColour.Hide() End If Case "continuous" + grpmanualColour.Hide() + grpfillmanual.Hide() ucrInputColorFunctions.Hide() ucrInputFillFunction.Hide() grpFillScale.Hide() @@ -4535,6 +4932,8 @@ Public Class sdgPlots If rdoSequential.Checked OrElse rdoDiverging.Checked OrElse rdoQualitative.Checked Then grpColourScale.Hide() grpFillScale.Hide() + grpFillGradient.Hide() + grpColourGradient.Hide() ucrInputContinousfill.Hide() ucrInputcontinuouscolor.Hide() If rdoFill.Checked Or rdoColour.Checked Then @@ -4546,7 +4945,11 @@ Public Class sdgPlots clsBaseOperator.RemoveParameterByName("scale_fill_gradient_tableau") clsBaseOperator.RemoveParameterByName("scale_colour") clsBaseOperator.RemoveParameterByName("scale_fill") + clsBaseOperator.RemoveParameterByName("scale_colour_gradient") + clsBaseOperator.RemoveParameterByName("scale_fill_gradient") ElseIf rdoViridis.Checked Then + grpColourGradient.Hide() + grpFillGradient.Hide() ucrInputcontinuouscolor.Hide() ucrInputPaletteContinuous.Hide() ucrInputContinousfill.Hide() @@ -4555,6 +4958,8 @@ Public Class sdgPlots clsBaseOperator.RemoveParameterByName("scale_fill_gradient_tableau") clsBaseOperator.RemoveParameterByName("scale_color_distiller") clsBaseOperator.RemoveParameterByName("scale_fill_distiller") + clsBaseOperator.RemoveParameterByName("scale_colour_gradient") + clsBaseOperator.RemoveParameterByName("scale_fill_gradient") If rdoColour.Checked Then grpColourScale.Show() clsBaseOperator.AddParameter("scale_colour", clsRFunctionParameter:=clsScaleColourViridisFunction, iPosition:=3) @@ -4569,14 +4974,45 @@ Public Class sdgPlots clsBaseOperator.RemoveParameterByName("scale_fill") grpFillScale.Hide() End If + ElseIf rdoGradient.Checked Then + ucrInputcontinuouscolor.Hide() + ucrInputPaletteContinuous.Hide() + ucrInputContinousfill.Hide() + ucrInputPalettes.Hide() + grpFillScale.Hide() + grpColourScale.Hide() + clsBaseOperator.RemoveParameterByName("scale_color_gradient_tableau") + clsBaseOperator.RemoveParameterByName("scale_fill_gradient_tableau") + clsBaseOperator.RemoveParameterByName("scale_color_distiller") + clsBaseOperator.RemoveParameterByName("scale_fill_distiller") + clsBaseOperator.RemoveParameterByName("scale_colour") + clsBaseOperator.RemoveParameterByName("fill_colour") + If rdoColour.Checked Then + grpColourGradient.Show() + clsBaseOperator.AddParameter("scale_colour_gradient", clsRFunctionParameter:=clsScalecolorgradientFunction, iPosition:=3) + Else + clsBaseOperator.RemoveParameterByName("scale_colour_gradient") + grpColourGradient.Hide() + End If + If rdoFill.Checked Then + clsBaseOperator.AddParameter("scale_fill_gradient", clsRFunctionParameter:=clsScalefillgradientFunction, iPosition:=3) + grpFillGradient.Show() + Else + clsBaseOperator.RemoveParameterByName("scale_fill_gradient") + grpFillGradient.Hide() + End If ElseIf rdoGgthemes.Checked Then grpFillScale.Hide() grpColourScale.Hide() + grpFillGradient.Hide() + grpColourGradient.Hide() ucrInputPaletteContinuous.Hide() clsBaseOperator.RemoveParameterByName("scale_fill") clsBaseOperator.RemoveParameterByName("scale_colour") clsBaseOperator.RemoveParameterByName("scale_color_distiller") clsBaseOperator.RemoveParameterByName("scale_fill_distiller") + clsBaseOperator.RemoveParameterByName("scale_colour_gradient") + clsBaseOperator.RemoveParameterByName("scale_fill_gradient") If rdoColour.Checked Then ucrInputcontinuouscolor.Show() clsScalecolorgradienttableauFunction.AddParameter("palette", Chr(34) & ucrInputcontinuouscolor.GetText() & Chr(34), iPosition:=0) @@ -4632,6 +5068,10 @@ Public Class sdgPlots grpScalefillhc.Hide() grpScalecolorhc.Hide() ucrInputPalettes.Hide() + grpfillmanual.Hide() + grpmanualColour.Hide() + grpFillGradient.Hide() + grpColourGradient.Hide() End If End Sub @@ -4640,12 +5080,7 @@ Public Class sdgPlots HideShowCanvacolor() End Sub - Private Sub ucrInputTextExpand_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrInputTextExpand.ControlValueChanged, ucrChkExpand.ControlValueChanged, ucrInputTextExpandColor.ControlValueChanged, ucrChkExpandColor.ControlValueChanged, ucrChkExpandExn.ControlValueChanged, ucrInputTextExpandExn.ControlValueChanged, ucrInputTextExpandColorst.ControlValueChanged, ucrChkExpandColorst.ControlValueChanged, ucrChkExpandColorpan.ControlValueChanged, ucrInputTextExpandColorpan.ControlValueChanged, - ucrInputTextExpandCal.ControlValueChanged, ucrChkExpandg.ControlValueChanged, ucrInputTextExpandg.ControlValueChanged, ucrChkExpandhc.ControlValueChanged, ucrInputTextExpandhc.ControlValueChanged, ucrChkExpandfew.ControlValueChanged, ucrInputTextExpandfiv.ControlValueChanged, ucrChkExpandfiv.ControlValueChanged, ucrInputTextExpandfew.ControlValueChanged, ucrInputTextExpandst.ControlValueChanged, ucrChkExpandst.ControlValueChanged, ucrChkExpandpan.ControlValueChanged, ucrInputTextExpandpan.ControlValueChanged, - ucrInputTextExpandEx.ControlValueChanged, ucrChkExpandsol.ControlValueChanged, ucrInputTextExpandsol.ControlValueChanged, ucrChkExpandEx.ControlValueChanged, ucrChkExpandEcon.ControlValueChanged, ucrInputTextExpandEcon.ControlValueChanged, ucrChkExpandCal.ControlValueChanged, ucrChkExpandpt.ControlValueChanged, ucrInputTextExpandpt.ControlValueChanged, - ucrInputTextExpandColorCal.ControlValueChanged, ucrChkExpandColorg.ControlValueChanged, ucrInputTextExpandColorg.ControlValueChanged, ucrChkExpandColorhc.ControlValueChanged, ucrInputTextExpandColorhc.ControlValueChanged, ucrChkExpandColorfew.ControlValueChanged, ucrInputTextExpandColorfew.ControlValueChanged, ucrChkExpandColorExn.ControlValueChanged, ucrInputTextExpandColorExn.ControlValueChanged, ucrInputTextExpandColorfiv.ControlValueChanged, ucrChkExpandColorfiv.ControlValueChanged, - ucrInputTextExpandColorEx.ControlValueChanged, ucrChkExpandw.ControlValueChanged, ucrInputTextExpandw.ControlValueChanged, ucrChkExpandColorw.ControlValueChanged, ucrInputTextExpandColorw.ControlValueChanged, ucrChkExpandColorsol.ControlValueChanged, ucrInputTextExpandColorsol.ControlValueChanged, ucrChkExpandColorpt.ControlValueChanged, ucrInputTextExpandColorpt.ControlValueChanged, ucrChkExpandColorEx.ControlValueChanged, ucrChkExpandColorEcon.ControlValueChanged, ucrInputTextExpandColorEcon.ControlValueChanged, ucrChkExpandColorCal.ControlValueChanged - + Private Sub Expand() If ucrChkExpand.Checked AndAlso Not ucrInputTextExpand.IsEmpty Then clsScaleFillColorblindFunction.AddParameter("expand", clsRFunctionParameter:=ucrInputTextExpand.clsRList, iPosition:=4) Else @@ -4786,13 +5221,27 @@ Public Class sdgPlots Else clsScalecolorwsjFunction.RemoveParameterByName("expand") End If + If ucrChkGradientExpand.Checked AndAlso Not ucrInputGradientExpand.IsEmpty Then + clsScalefillgradientFunction.AddParameter("expand", clsRFunctionParameter:=ucrInputGradientExpand.clsRList, iPosition:=4) + Else + clsScalefillgradientFunction.RemoveParameterByName("expand") + End If + If ucrChkGradientExpandColour.Checked AndAlso Not ucrInputGradientExpandColour.IsEmpty Then + clsScalecolorgradientFunction.AddParameter("expand", clsRFunctionParameter:=ucrInputGradientExpandColour.clsRList, iPosition:=4) + Else + clsScalecolorgradientFunction.RemoveParameterByName("expand") + End If End Sub - Private Sub ucrChkBreaksCal_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkBreaksCal.ControlValueChanged, ucrInputTextBreaksCal.ControlValueChanged, ucrChkBreaksg.ControlValueChanged, ucrInputTextBreaksg.ControlValueChanged, ucrChkBreaksfiv.ControlValueChanged, ucrInputTextBreaksfiv.ControlValueChanged, ucrChkBreakshc.ControlValueChanged, ucrInputTextBreakshc.ControlValueChanged, ucrChkBreaksfew.ControlValueChanged, ucrInputTextBreaksfew.ControlValueChanged, ucrChkBreaksExn.ControlValueChanged, ucrInputTextBreaksExn.ControlValueChanged, - ucrInputTextBreaksEx.ControlValueChanged, ucrChkBreakssol.ControlValueChanged, ucrInputTextBreakssol.ControlValueChanged, ucrChkBreakspan.ControlValueChanged, ucrInputTextBreakspan.ControlValueChanged, ucrChkBreaksEx.ControlValueChanged, ucrInputTextBreaksColorEcon.ControlValueChanged, ucrChkBreakspt.ControlValueChanged, ucrInputTextBreakspt.ControlValueChanged, - ucrChkBreaksEcon.ControlValueChanged, ucrInputTextBreaksEcon.ControlValueChanged, ucrChkBreaksst.ControlValueChanged, ucrInputTextBreaksst.ControlValueChanged, ucrChkBreaks.ControlValueChanged, ucrInputTextBreaks.ControlValueChanged, ucrChkBreaksColorEcon.ControlValueChanged, ucrChkBreaksColorst.ControlValueChanged, ucrInputTextBreaksColorst.ControlValueChanged, ucrChkBreaksColor.ControlValueChanged, ucrInputTextBreaksColor.ControlValueChanged, ucrChkBreaksColorfiv.ControlValueChanged, ucrInputTextBreaksColorfiv.ControlValueChanged, - ucrChkBreaksColorCal.ControlValueChanged, ucrInputTextBreaksColorCal.ControlValueChanged, ucrChkBreaksColorg.ControlValueChanged, ucrInputTextBreaksColorg.ControlValueChanged, ucrChkBreaksColorhc.ControlValueChanged, ucrInputTextBreaksColorhc.ControlValueChanged, ucrChkBreaksColorfew.ControlValueChanged, ucrInputTextBreaksColorfew.ControlValueChanged, ucrChkBreaksColorExn.ControlValueChanged, ucrInputTextBreaksColorExn.ControlValueChanged, - ucrInputTextBreaksColorEx.ControlValueChanged, ucrInputTextBreaksw.ControlValueChanged, ucrChkBreaksw.ControlValueChanged, ucrInputTextBreaksColorw.ControlValueChanged, ucrChkBreaksColorw.ControlValueChanged, ucrChkBreaksColorsol.ControlValueChanged, ucrInputTextBreaksColorsol.ControlValueChanged, ucrChkBreaksColorpt.ControlValueChanged, ucrInputTextBreaksColorpt.ControlValueChanged, ucrChkBreaksColorpan.ControlValueChanged, ucrInputTextBreaksColorpan.ControlValueChanged, ucrChkBreaksColorEx.ControlValueChanged, ucrInputTextBreaksColorEcon.ControlValueChanged + Private Sub ucrInputTextExpand_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrInputTextExpand.ControlValueChanged, ucrChkExpand.ControlValueChanged, ucrInputTextExpandColor.ControlValueChanged, ucrChkExpandColor.ControlValueChanged, ucrChkExpandExn.ControlValueChanged, ucrInputTextExpandExn.ControlValueChanged, ucrInputTextExpandColorst.ControlValueChanged, ucrChkExpandColorst.ControlValueChanged, ucrChkExpandColorpan.ControlValueChanged, ucrInputTextExpandColorpan.ControlValueChanged, + ucrInputTextExpandCal.ControlValueChanged, ucrChkExpandg.ControlValueChanged, ucrInputTextExpandg.ControlValueChanged, ucrChkExpandhc.ControlValueChanged, ucrInputTextExpandhc.ControlValueChanged, ucrChkExpandfew.ControlValueChanged, ucrInputTextExpandfiv.ControlValueChanged, ucrChkExpandfiv.ControlValueChanged, ucrInputTextExpandfew.ControlValueChanged, ucrInputTextExpandst.ControlValueChanged, ucrChkExpandst.ControlValueChanged, ucrChkExpandpan.ControlValueChanged, ucrInputTextExpandpan.ControlValueChanged, + ucrInputTextExpandEx.ControlValueChanged, ucrChkExpandsol.ControlValueChanged, ucrInputTextExpandsol.ControlValueChanged, ucrChkExpandEx.ControlValueChanged, ucrChkExpandEcon.ControlValueChanged, ucrInputTextExpandEcon.ControlValueChanged, ucrChkExpandCal.ControlValueChanged, ucrChkExpandpt.ControlValueChanged, ucrInputTextExpandpt.ControlValueChanged, ucrChkGradientExpandColour.ControlValueChanged, ucrInputGradientExpand.ControlValueChanged, ucrInputGradientExpandColour.ControlValueChanged, ucrChkGradientExpand.ControlValueChanged, + ucrInputTextExpandColorCal.ControlValueChanged, ucrChkExpandColorg.ControlValueChanged, ucrInputTextExpandColorg.ControlValueChanged, ucrChkExpandColorhc.ControlValueChanged, ucrInputTextExpandColorhc.ControlValueChanged, ucrChkExpandColorfew.ControlValueChanged, ucrInputTextExpandColorfew.ControlValueChanged, ucrChkExpandColorExn.ControlValueChanged, ucrInputTextExpandColorExn.ControlValueChanged, ucrInputTextExpandColorfiv.ControlValueChanged, ucrChkExpandColorfiv.ControlValueChanged, + ucrInputTextExpandColorEx.ControlValueChanged, ucrChkExpandw.ControlValueChanged, ucrInputTextExpandw.ControlValueChanged, ucrChkExpandColorw.ControlValueChanged, ucrInputTextExpandColorw.ControlValueChanged, ucrChkExpandColorsol.ControlValueChanged, ucrInputTextExpandColorsol.ControlValueChanged, ucrChkExpandColorpt.ControlValueChanged, ucrInputTextExpandColorpt.ControlValueChanged, ucrChkExpandColorEx.ControlValueChanged, ucrChkExpandColorEcon.ControlValueChanged, ucrInputTextExpandColorEcon.ControlValueChanged, ucrChkExpandColorCal.ControlValueChanged + Expand() + End Sub + + Private Sub Breaks() If ucrChkBreaksCal.Checked AndAlso Not ucrInputTextBreaksCal.IsEmpty() Then clsScalefillcalcFunction.AddParameter("breaks", ucrInputTextBreaksCal.clsRList.ToScript()) Else @@ -4933,14 +5382,27 @@ Public Class sdgPlots Else clsScalefillwsjFunction.RemoveParameterByName("breaks") End If + If ucrChkBreacksManual.Checked AndAlso Not ucrInputBreackmanual.IsEmpty() Then + clsScalefillmanualFunction.AddParameter("breaks", ucrInputBreackmanual.clsRList.ToScript()) + Else + clsScalefillmanualFunction.RemoveParameterByName("breaks") + End If + If ucrChkBreacksManualColor.Checked AndAlso Not ucrInputBreackmanualcolor.IsEmpty() Then + clsScalecolormanualFunction.AddParameter("breaks", ucrInputBreackmanualcolor.clsRList.ToScript()) + Else + clsScalecolormanualFunction.RemoveParameterByName("breaks") + End If End Sub - Private Sub ucrChkLimitCal_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkLimitCal.ControlValueChanged, ucrInputTextLimitCal.ControlValueChanged, ucrInputTextLimitCal.ControlValueChanged, ucrChkLimit.ControlValueChanged, ucrInputTextLimit.ControlValueChanged, ucrChkLimitg.ControlValueChanged, ucrInputTextLimitg.ControlValueChanged, ucrChkLimithc.ControlValueChanged, ucrInputTextLimithc.ControlValueChanged, ucrChkLimitfiv.ControlValueChanged, - ucrInputTextLimitEx.ControlValueChanged, ucrChkLimitsol.ControlValueChanged, ucrInputTextLimitsol.ControlValueChanged, ucrChkLimitpan.ControlValueChanged, ucrInputTextLimitpan.ControlValueChanged, ucrChkLimitEx.ControlValueChanged, ucrChkLimitEcon.ControlValueChanged, ucrInputTextLimitColorfew.ControlValueChanged, ucrChkLimitColorExn.ControlValueChanged, ucrInputTextLimitColorExn.ControlValueChanged, - ucrInputTextLimitEcon.ControlValueChanged, ucrInputTextLimitst.ControlValueChanged, ucrChkLimitst.ControlValueChanged, ucrInputTextLimitColorEcon.ControlValueChanged, ucrInputTextLimitColorst.ControlValueChanged, ucrChkLimitColorst.ControlValueChanged, ucrInputTextLimitfiv.ControlValueChanged, ucrChkLimitfew.ControlValueChanged, ucrInputTextLimitfew.ControlValueChanged, ucrChkLimitExn.ControlValueChanged, ucrInputTextLimitExn.ControlValueChanged, ucrChkLimitpt.ControlValueChanged, ucrInputTextLimitpt.ControlValueChanged, - ucrChkLimitColorCal.ControlValueChanged, ucrInputTextLimitColorCal.ControlValueChanged, ucrChkLimitColor.ControlValueChanged, ucrInputTextLimitColor.ControlValueChanged, ucrChkLimitColorg.ControlValueChanged, ucrInputTextLimitColorg.ControlValueChanged, ucrChkLimitColorhc.ControlValueChanged, ucrInputTextLimitColorhc.ControlValueChanged, ucrChkLimitColorfew.ControlValueChanged, ucrInputTextLimitColorfiv.ControlValueChanged, ucrChkLimitColorfiv.ControlValueChanged, - ucrInputTextLimitColorEx.ControlValueChanged, ucrChkLimitw.ControlValueChanged, ucrInputTextLimitw.ControlValueChanged, ucrChkLimitColorw.ControlValueChanged, ucrInputTextLimitColorw.ControlValueChanged, ucrChkLimitColorsol.ControlValueChanged, ucrInputTextLimitColorsol.ControlValueChanged, ucrChkLimitColorpt.ControlValueChanged, ucrInputTextLimitColorpt.ControlValueChanged, ucrChkLimitColorpan.ControlValueChanged, ucrInputTextLimitColorpan.ControlValueChanged, ucrChkLimitColorEx.ControlValueChanged, ucrChkLimitColorEcon.ControlValueChanged + Private Sub ucrChkBreaksCal_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkBreaksCal.ControlValueChanged, ucrInputTextBreaksCal.ControlValueChanged, ucrChkBreaksg.ControlValueChanged, ucrInputTextBreaksg.ControlValueChanged, ucrChkBreaksfiv.ControlValueChanged, ucrInputTextBreaksfiv.ControlValueChanged, ucrChkBreakshc.ControlValueChanged, ucrInputTextBreakshc.ControlValueChanged, ucrChkBreaksfew.ControlValueChanged, ucrInputTextBreaksfew.ControlValueChanged, ucrChkBreaksExn.ControlValueChanged, ucrInputTextBreaksExn.ControlValueChanged, + ucrInputTextBreaksEx.ControlValueChanged, ucrChkBreakssol.ControlValueChanged, ucrInputTextBreakssol.ControlValueChanged, ucrChkBreakspan.ControlValueChanged, ucrInputTextBreakspan.ControlValueChanged, ucrChkBreaksEx.ControlValueChanged, ucrInputTextBreaksColorEcon.ControlValueChanged, ucrChkBreakspt.ControlValueChanged, ucrInputTextBreakspt.ControlValueChanged, ucrChkBreacksManual.ControlValueChanged, ucrChkBreacksManualColor.ControlValueChanged, ucrInputBreackmanual.ControlValueChanged, ucrInputBreackmanualcolor.ControlValueChanged, + ucrChkBreaksEcon.ControlValueChanged, ucrInputTextBreaksEcon.ControlValueChanged, ucrChkBreaksst.ControlValueChanged, ucrInputTextBreaksst.ControlValueChanged, ucrChkBreaks.ControlValueChanged, ucrInputTextBreaks.ControlValueChanged, ucrChkBreaksColorEcon.ControlValueChanged, ucrChkBreaksColorst.ControlValueChanged, ucrInputTextBreaksColorst.ControlValueChanged, ucrChkBreaksColor.ControlValueChanged, ucrInputTextBreaksColor.ControlValueChanged, ucrChkBreaksColorfiv.ControlValueChanged, ucrInputTextBreaksColorfiv.ControlValueChanged, + ucrChkBreaksColorCal.ControlValueChanged, ucrInputTextBreaksColorCal.ControlValueChanged, ucrChkBreaksColorg.ControlValueChanged, ucrInputTextBreaksColorg.ControlValueChanged, ucrChkBreaksColorhc.ControlValueChanged, ucrInputTextBreaksColorhc.ControlValueChanged, ucrChkBreaksColorfew.ControlValueChanged, ucrInputTextBreaksColorfew.ControlValueChanged, ucrChkBreaksColorExn.ControlValueChanged, ucrInputTextBreaksColorExn.ControlValueChanged, + ucrInputTextBreaksColorEx.ControlValueChanged, ucrInputTextBreaksw.ControlValueChanged, ucrChkBreaksw.ControlValueChanged, ucrInputTextBreaksColorw.ControlValueChanged, ucrChkBreaksColorw.ControlValueChanged, ucrChkBreaksColorsol.ControlValueChanged, ucrInputTextBreaksColorsol.ControlValueChanged, ucrChkBreaksColorpt.ControlValueChanged, ucrInputTextBreaksColorpt.ControlValueChanged, ucrChkBreaksColorpan.ControlValueChanged, ucrInputTextBreaksColorpan.ControlValueChanged, ucrChkBreaksColorEx.ControlValueChanged, ucrInputTextBreaksColorEcon.ControlValueChanged + Breaks() + End Sub + Private Sub Limits() If ucrChkLimitCal.Checked AndAlso Not ucrInputTextLimitCal.IsEmpty() Then clsScalefillcalcFunction.AddParameter("limit", ucrInputTextLimitCal.clsRList.ToScript()) Else @@ -5081,14 +5543,27 @@ Public Class sdgPlots Else clsScalecolorwsjFunction.RemoveParameterByName("limit") End If + If ucrChkLimitsManual.Checked AndAlso Not ucrInputLimitsmanual.IsEmpty() Then + clsScalefillmanualFunction.AddParameter("limit", ucrInputLimitsmanual.clsRList.ToScript()) + Else + clsScalefillmanualFunction.RemoveParameterByName("limit") + End If + If ucrChkLimitsManualColor.Checked AndAlso Not ucrInputLimitsmanualcolor.IsEmpty() Then + clsScalecolormanualFunction.AddParameter("limit", ucrInputLimitsmanualcolor.clsRList.ToScript()) + Else + clsScalecolormanualFunction.RemoveParameterByName("limit") + End If End Sub - Private Sub ucrChkDropUnusedLevelsCal_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkDropUnusedLevelsCal.ControlValueChanged, ucrInputDropUnusedLevelsCal.ControlValueChanged, ucrChkDropUnusedLevelshc.ControlValueChanged, ucrInputDropUnusedLevelshc.ControlValueChanged, ucrChkDropUnusedLevelsg.ControlValueChanged, ucrInputDropUnusedLevelsg.ControlValueChanged, ucrChkDropUnusedLevelsfiv.ControlValueChanged, ucrInputDropUnusedLevelsfiv.ControlValueChanged, ucrChkDropUnusedLevelsfew.ControlValueChanged, ucrInputDropUnusedLevelsfew.ControlValueChanged, ucrChkDropUnusedLevelsExn.ControlValueChanged, - ucrInputDropUnusedLevelsExn.ControlValueChanged, ucrChkDropUnusedLevelssol.ControlValueChanged, ucrInputDropUnusedLevelssol.ControlValueChanged, ucrChkDropUnusedLevelspan.ControlValueChanged, ucrInputDropUnusedLevelspan.ControlValueChanged, ucrInputDropUnusedLevelsEx.ControlValueChanged, ucrChkDropUnusedLevelspt.ControlValueChanged, ucrInputDropUnusedLevelspt.ControlValueChanged, ucrChkDropUnusedLevelsw.ControlValueChanged, ucrInputDropUnusedLevelsw.ControlValueChanged, - ucrChkDropUnusedLevelsEx.ControlValueChanged, ucrChkDropUnusedLevelsst.ControlValueChanged, ucrInputDropUnusedLevelsst.ControlValueChanged, ucrChkDropUnusedLevelsEcon.ControlValueChanged, ucrInputDropUnusedLevelsEcon.ControlValueChanged, ucrInputDropUnusedLevels.ControlValueChanged, ucrChkDropUnusedLevels.ControlValueChanged, ucrInputDropUnusedLevelsColorfew.ControlValueChanged, ucrChkDropUnusedLevelsColorExn.ControlValueChanged, - ucrChkDropUnusedLevelsColorCal.ControlValueChanged, ucrInputDropUnusedLevelsColorCal.ControlValueChanged, ucrChkDropUnusedLevelsColorhc.ControlValueChanged, ucrInputDropUnusedLevelsColorhc.ControlValueChanged, ucrChkDropUnusedLevelsColorg.ControlValueChanged, ucrInputDropUnusedLevelsColorg.ControlValueChanged, ucrChkDropUnusedLevelsColorfew.ControlValueChanged, ucrChkDropUnusedLevelsColorfiv.ControlValueChanged, ucrInputDropUnusedLevelsColorfiv.ControlValueChanged, - ucrInputDropUnusedLevelsColorExn.ControlValueChanged, ucrChkDropUnusedLevelsColorw.ControlValueChanged, ucrInputDropUnusedLevelsColorw.ControlValueChanged, ucrChkDropUnusedLevelsColorsol.ControlValueChanged, ucrInputDropUnusedLevelsColorsol.ControlValueChanged, ucrChkDropUnusedLevelsColorpt.ControlValueChanged, ucrInputDropUnusedLevelsColorpt.ControlValueChanged, ucrChkDropUnusedLevelsColorpan.ControlValueChanged, ucrInputDropUnusedLevelsColorpan.ControlValueChanged, ucrInputDropUnusedLevelsColorEx.ControlValueChanged, - ucrChkDropUnusedLevelsColorEx.ControlValueChanged, ucrChkDropUnusedLevelsColorst.ControlValueChanged, ucrInputDropUnusedLevelsColorst.ControlValueChanged, ucrChkDropUnusedLevelsColorEcon.ControlValueChanged, ucrInputDropUnusedLevelsColorEcon.ControlValueChanged, ucrInputDropUnusedLevelsColor.ControlValueChanged, ucrChkDropUnusedLevelsColor.ControlValueChanged + Private Sub ucrChkLimitCal_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkLimitCal.ControlValueChanged, ucrInputTextLimitCal.ControlValueChanged, ucrInputTextLimitCal.ControlValueChanged, ucrChkLimit.ControlValueChanged, ucrInputTextLimit.ControlValueChanged, ucrChkLimitg.ControlValueChanged, ucrInputTextLimitg.ControlValueChanged, ucrChkLimithc.ControlValueChanged, ucrInputTextLimithc.ControlValueChanged, ucrChkLimitfiv.ControlValueChanged, + ucrInputTextLimitEx.ControlValueChanged, ucrChkLimitsol.ControlValueChanged, ucrInputTextLimitsol.ControlValueChanged, ucrChkLimitpan.ControlValueChanged, ucrInputTextLimitpan.ControlValueChanged, ucrChkLimitEx.ControlValueChanged, ucrChkLimitEcon.ControlValueChanged, ucrInputTextLimitColorfew.ControlValueChanged, ucrChkLimitColorExn.ControlValueChanged, ucrInputTextLimitColorExn.ControlValueChanged, ucrChkLimitsManual.ControlValueChanged, ucrChkLimitsManualColor.ControlValueChanged, ucrInputLimitsmanual.ControlValueChanged, ucrInputLimitsmanualcolor.ControlValueChanged, + ucrInputTextLimitEcon.ControlValueChanged, ucrInputTextLimitst.ControlValueChanged, ucrChkLimitst.ControlValueChanged, ucrInputTextLimitColorEcon.ControlValueChanged, ucrInputTextLimitColorst.ControlValueChanged, ucrChkLimitColorst.ControlValueChanged, ucrInputTextLimitfiv.ControlValueChanged, ucrChkLimitfew.ControlValueChanged, ucrInputTextLimitfew.ControlValueChanged, ucrChkLimitExn.ControlValueChanged, ucrInputTextLimitExn.ControlValueChanged, ucrChkLimitpt.ControlValueChanged, ucrInputTextLimitpt.ControlValueChanged, + ucrChkLimitColorCal.ControlValueChanged, ucrInputTextLimitColorCal.ControlValueChanged, ucrChkLimitColor.ControlValueChanged, ucrInputTextLimitColor.ControlValueChanged, ucrChkLimitColorg.ControlValueChanged, ucrInputTextLimitColorg.ControlValueChanged, ucrChkLimitColorhc.ControlValueChanged, ucrInputTextLimitColorhc.ControlValueChanged, ucrChkLimitColorfew.ControlValueChanged, ucrInputTextLimitColorfiv.ControlValueChanged, ucrChkLimitColorfiv.ControlValueChanged, + ucrInputTextLimitColorEx.ControlValueChanged, ucrChkLimitw.ControlValueChanged, ucrInputTextLimitw.ControlValueChanged, ucrChkLimitColorw.ControlValueChanged, ucrInputTextLimitColorw.ControlValueChanged, ucrChkLimitColorsol.ControlValueChanged, ucrInputTextLimitColorsol.ControlValueChanged, ucrChkLimitColorpt.ControlValueChanged, ucrInputTextLimitColorpt.ControlValueChanged, ucrChkLimitColorpan.ControlValueChanged, ucrInputTextLimitColorpan.ControlValueChanged, ucrChkLimitColorEx.ControlValueChanged, ucrChkLimitColorEcon.ControlValueChanged + Limits() + End Sub + + Private Sub DropLevels() If ucrChkDropUnusedLevelsCal.Checked AndAlso Not ucrInputDropUnusedLevelsCal.IsEmpty Then clsScalefillcalcFunction.AddParameter("drop", ucrInputDropUnusedLevelsCal.GetText(), iPosition:=0) Else @@ -5231,10 +5706,16 @@ Public Class sdgPlots End If End Sub - Private Sub ucrChkPosition_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkPosition.ControlValueChanged, ucrInputPosition.ControlValueChanged, ucrChkPositionColor.ControlValueChanged, ucrInputPositionColor.ControlValueChanged, ucrChkPositionCal.ControlValueChanged, ucrInputPositionCal.ControlValueChanged, ucrChkPositionColorEcon.ControlValueChanged, ucrInputPositionColorEcon.ControlValueChanged, ucrChkPositionEcon.ControlValueChanged, ucrInputPositionEcon.ControlValueChanged, ucrChkPositionEx.ControlValueChanged, ucrInputPositionEx.ControlValueChanged, ucrChkPositionColorEx.ControlValueChanged, ucrInputPositionColorEx.ControlValueChanged, - ucrChkPositionColorExn.ControlValueChanged, ucrInputPositionColorExn.ControlValueChanged, ucrChkPositionExn.ControlValueChanged, ucrInputPositionExn.ControlValueChanged, ucrInputPositionfew.ControlValueChanged, ucrChkPositionfew.ControlValueChanged, ucrChkPositionColorfew.ControlValueChanged, ucrInputPositionColorfew.ControlValueChanged, ucrChkPositionfiv.ControlValueChanged, ucrInputPositionfiv.ControlValueChanged, ucrChkPositiong.ControlValueChanged, ucrInputPositiong.ControlValueChanged, ucrChkPositionColorg.ControlValueChanged, ucrInputPositionColorg.ControlValueChanged, ucrInputPositionhc.ControlValueChanged, ucrInputPositionhc.ControlValueChanged, - ucrChkPositionColorhc.ControlValueChanged, ucrInputPositionColorhc.ControlValueChanged, ucrChkPositionpan.ControlValueChanged, ucrInputPositionpan.ControlValueChanged, ucrChkPositionColorpan.ControlValueChanged, ucrInputPositionColorpan.ControlValueChanged, ucrChkPositionpt.ControlValueChanged, ucrInputPositionpt.ControlValueChanged, ucrChkPositionColorpt.ControlValueChanged, ucrInputPositionColorpt.ControlValueChanged, ucrChkPositionsol.ControlValueChanged, ucrInputPositionsol.ControlValueChanged, ucrChkPositionColorsol.ControlValueChanged, ucrInputPositionColorsol.ControlValueChanged, ucrChkPositionst.ControlValueChanged, ucrInputPosition.ControlValueChanged, - ucrChkPositionColorst.ControlValueChanged, ucrInputPositionColorst.ControlValueChanged, ucrInputPositionColorw.ControlValueChanged, ucrChkPositionColorw.ControlValueChanged, ucrInputPositionColorfiv.ControlValueChanged, ucrChkPositionColorfiv.ControlValueChanged, ucrChkPositionColorCal.ControlValueChanged, ucrInputPositionColorCal.ControlValueChanged, ucrChkPositionhc.ControlValueChanged, ucrInputPositionhc.ControlValueChanged, ucrChkPositionw.ControlValueChanged, ucrInputPositionw.ControlValueChanged + Private Sub ucrChkDropUnusedLevelsCal_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkDropUnusedLevelsCal.ControlValueChanged, ucrInputDropUnusedLevelsCal.ControlValueChanged, ucrChkDropUnusedLevelshc.ControlValueChanged, ucrInputDropUnusedLevelshc.ControlValueChanged, ucrChkDropUnusedLevelsg.ControlValueChanged, ucrInputDropUnusedLevelsg.ControlValueChanged, ucrChkDropUnusedLevelsfiv.ControlValueChanged, ucrInputDropUnusedLevelsfiv.ControlValueChanged, ucrChkDropUnusedLevelsfew.ControlValueChanged, ucrInputDropUnusedLevelsfew.ControlValueChanged, ucrChkDropUnusedLevelsExn.ControlValueChanged, + ucrInputDropUnusedLevelsExn.ControlValueChanged, ucrChkDropUnusedLevelssol.ControlValueChanged, ucrInputDropUnusedLevelssol.ControlValueChanged, ucrChkDropUnusedLevelspan.ControlValueChanged, ucrInputDropUnusedLevelspan.ControlValueChanged, ucrInputDropUnusedLevelsEx.ControlValueChanged, ucrChkDropUnusedLevelspt.ControlValueChanged, ucrInputDropUnusedLevelspt.ControlValueChanged, ucrChkDropUnusedLevelsw.ControlValueChanged, ucrInputDropUnusedLevelsw.ControlValueChanged, + ucrChkDropUnusedLevelsEx.ControlValueChanged, ucrChkDropUnusedLevelsst.ControlValueChanged, ucrInputDropUnusedLevelsst.ControlValueChanged, ucrChkDropUnusedLevelsEcon.ControlValueChanged, ucrInputDropUnusedLevelsEcon.ControlValueChanged, ucrInputDropUnusedLevels.ControlValueChanged, ucrChkDropUnusedLevels.ControlValueChanged, ucrInputDropUnusedLevelsColorfew.ControlValueChanged, ucrChkDropUnusedLevelsColorExn.ControlValueChanged, + ucrChkDropUnusedLevelsColorCal.ControlValueChanged, ucrInputDropUnusedLevelsColorCal.ControlValueChanged, ucrChkDropUnusedLevelsColorhc.ControlValueChanged, ucrInputDropUnusedLevelsColorhc.ControlValueChanged, ucrChkDropUnusedLevelsColorg.ControlValueChanged, ucrInputDropUnusedLevelsColorg.ControlValueChanged, ucrChkDropUnusedLevelsColorfew.ControlValueChanged, ucrChkDropUnusedLevelsColorfiv.ControlValueChanged, ucrInputDropUnusedLevelsColorfiv.ControlValueChanged, + ucrInputDropUnusedLevelsColorExn.ControlValueChanged, ucrChkDropUnusedLevelsColorw.ControlValueChanged, ucrInputDropUnusedLevelsColorw.ControlValueChanged, ucrChkDropUnusedLevelsColorsol.ControlValueChanged, ucrInputDropUnusedLevelsColorsol.ControlValueChanged, ucrChkDropUnusedLevelsColorpt.ControlValueChanged, ucrInputDropUnusedLevelsColorpt.ControlValueChanged, ucrChkDropUnusedLevelsColorpan.ControlValueChanged, ucrInputDropUnusedLevelsColorpan.ControlValueChanged, ucrInputDropUnusedLevelsColorEx.ControlValueChanged, + ucrChkDropUnusedLevelsColorEx.ControlValueChanged, ucrChkDropUnusedLevelsColorst.ControlValueChanged, ucrInputDropUnusedLevelsColorst.ControlValueChanged, ucrChkDropUnusedLevelsColorEcon.ControlValueChanged, ucrInputDropUnusedLevelsColorEcon.ControlValueChanged, ucrInputDropUnusedLevelsColor.ControlValueChanged, ucrChkDropUnusedLevelsColor.ControlValueChanged + DropLevels() + End Sub + + Private Sub Position() If ucrChkPositionCal.Checked AndAlso Not ucrInputPositionCal.IsEmpty() Then clsScalefillcalcFunction.AddParameter("position", Chr(34) & ucrInputPositionCal.GetText & Chr(34), iPosition:=3) Else @@ -5375,10 +5856,26 @@ Public Class sdgPlots Else clsScalefillwsjFunction.RemoveParameterByName("position") End If + If ucrChkGradientPositionColour.Checked AndAlso Not ucrInputGradientPositionColour.IsEmpty() Then + clsScalecolorgradientFunction.AddParameter("position", Chr(34) & ucrInputGradientPositionColour.GetText & Chr(34), iPosition:=3) + Else + clsScalecolorgradientFunction.RemoveParameterByName("position") + End If + If ucrChkGradientPosition.Checked AndAlso Not ucrInputGradientPosition.IsEmpty() Then + clsScalefillgradientFunction.AddParameter("position", Chr(34) & ucrInputGradientPosition.GetText & Chr(34), iPosition:=3) + Else + clsScalefillgradientFunction.RemoveParameterByName("position") + End If End Sub - Private Sub ucrChkPalettecolorw_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkPalettecolorw.ControlValueChanged, ucrInputPalettecolorw.ControlValueChanged, ucrChkPalettecolor.ControlValueChanged, ucrInputPalettecolor.ControlValueChanged, ucrInputPalettecolorhc.ControlValueChanged, ucrChkPalettecolorhc.ControlValueChanged, ucrInputPalettehc.ControlValueChanged, ucrChkpalettefillw.ControlValueChanged, ucrInputPalettefillw.ControlValueChanged, - ucrChkPalettehc.ControlValueChanged, ucrChkThemecolor.ControlValueChanged, ucrInputThemeColor.ControlValueChanged, ucrChkThemeFill.ControlValueChanged, ucrInputThemeFill.ControlValueChanged, ucrChkSchemecolor.ControlValueChanged, ucrInputThemeColor.ControlValueChanged, ucrChkSchemefill.ControlValueChanged, ucrInputThemeFill.ControlValueChanged, ucrChkPalettefill.ControlValueChanged, ucrInputPalettefill.ControlValueChanged + Private Sub ucrChkPosition_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkPosition.ControlValueChanged, ucrInputPosition.ControlValueChanged, ucrChkPositionColor.ControlValueChanged, ucrInputPositionColor.ControlValueChanged, ucrChkPositionCal.ControlValueChanged, ucrInputPositionCal.ControlValueChanged, ucrChkPositionColorEcon.ControlValueChanged, ucrInputPositionColorEcon.ControlValueChanged, ucrChkPositionEcon.ControlValueChanged, ucrInputPositionEcon.ControlValueChanged, ucrChkPositionEx.ControlValueChanged, ucrInputPositionEx.ControlValueChanged, ucrChkPositionColorEx.ControlValueChanged, ucrInputPositionColorEx.ControlValueChanged, + ucrChkPositionColorExn.ControlValueChanged, ucrInputPositionColorExn.ControlValueChanged, ucrChkPositionExn.ControlValueChanged, ucrInputPositionExn.ControlValueChanged, ucrInputPositionfew.ControlValueChanged, ucrChkPositionfew.ControlValueChanged, ucrChkPositionColorfew.ControlValueChanged, ucrInputPositionColorfew.ControlValueChanged, ucrChkPositionfiv.ControlValueChanged, ucrInputPositionfiv.ControlValueChanged, ucrChkPositiong.ControlValueChanged, ucrInputPositiong.ControlValueChanged, ucrChkPositionColorg.ControlValueChanged, ucrInputPositionColorg.ControlValueChanged, ucrInputPositionhc.ControlValueChanged, ucrInputPositionhc.ControlValueChanged, + ucrChkPositionColorhc.ControlValueChanged, ucrInputPositionColorhc.ControlValueChanged, ucrChkPositionpan.ControlValueChanged, ucrInputPositionpan.ControlValueChanged, ucrChkPositionColorpan.ControlValueChanged, ucrInputPositionColorpan.ControlValueChanged, ucrChkPositionpt.ControlValueChanged, ucrInputPositionpt.ControlValueChanged, ucrChkPositionColorpt.ControlValueChanged, ucrInputPositionColorpt.ControlValueChanged, ucrChkPositionsol.ControlValueChanged, ucrInputPositionsol.ControlValueChanged, ucrChkPositionColorsol.ControlValueChanged, ucrInputPositionColorsol.ControlValueChanged, ucrChkPositionst.ControlValueChanged, ucrInputPosition.ControlValueChanged, + ucrChkPositionColorst.ControlValueChanged, ucrInputPositionColorst.ControlValueChanged, ucrInputPositionColorw.ControlValueChanged, ucrChkPositionColorw.ControlValueChanged, ucrInputPositionColorfiv.ControlValueChanged, ucrChkPositionColorfiv.ControlValueChanged, ucrChkPositionColorCal.ControlValueChanged, ucrInputPositionColorCal.ControlValueChanged, ucrChkPositionhc.ControlValueChanged, ucrInputPositionhc.ControlValueChanged, ucrChkPositionw.ControlValueChanged, ucrInputPositionw.ControlValueChanged, ucrChkGradientPosition.ControlValueChanged, ucrChkGradientPositionColour.ControlValueChanged, ucrInputGradientPosition.ControlValueChanged, ucrInputGradientPositionColour.ControlValueChanged + Position() + End Sub + + Private Sub Palettes() If ucrChkPalettecolorw.Checked AndAlso Not ucrInputPalettecolorw.IsEmpty Then clsScalecolorwsjFunction.AddParameter("palette", Chr(34) & ucrInputPalettecolorw.GetText & Chr(34), iPosition:=6) Else @@ -5389,6 +5886,36 @@ Public Class sdgPlots Else clsScalefillwsjFunction.RemoveParameterByName("palette") End If + If ucrChkLowColour.Checked AndAlso Not ucrColourText.IsEmpty Then + clsScalecolorgradientFunction.AddParameter("low", Chr(34) & ucrColourText.GetText & Chr(34), iPosition:=1) + Else + clsScalecolorgradientFunction.RemoveParameterByName("low") + End If + If ucrChkLow.Checked AndAlso Not ucrColorsLow.IsEmpty Then + clsScalefillgradientFunction.AddParameter("low", Chr(34) & ucrColorsLow.GetText & Chr(34), iPosition:=1) + Else + clsScalefillgradientFunction.RemoveParameterByName("low") + End If + If ucrChkHighColour.Checked AndAlso Not ucrColorsHighColour.IsEmpty Then + clsScalecolorgradientFunction.AddParameter("high", Chr(34) & ucrColorsHighColour.GetText & Chr(34), iPosition:=0) + Else + clsScalecolorgradientFunction.RemoveParameterByName("high") + End If + If ucrChkHigh.Checked AndAlso Not ucrColorsHigh.IsEmpty Then + clsScalefillgradientFunction.AddParameter("high", Chr(34) & ucrColorsHigh.GetText & Chr(34), iPosition:=0) + Else + clsScalefillgradientFunction.RemoveParameterByName("high") + End If + If ucrChkGradientTransColour.Checked AndAlso Not ucrInputGradientTransColour.IsEmpty Then + clsScalecolorgradientFunction.AddParameter("trans", Chr(34) & ucrInputGradientTransColour.GetText & Chr(34), iPosition:=2) + Else + clsScalecolorgradientFunction.RemoveParameterByName("trans") + End If + If ucrChkGradientTrans.Checked AndAlso Not ucrInputGradientTrans.IsEmpty Then + clsScalefillgradientFunction.AddParameter("trans", Chr(34) & ucrInputGradientTrans.GetText & Chr(34), iPosition:=2) + Else + clsScalefillgradientFunction.RemoveParameterByName("trans") + End If If ucrChkPalettecolorhc.Checked AndAlso Not ucrInputPalettecolorhc.IsEmpty Then clsScalecolorhcFunction.AddParameter("palette", Chr(34) & ucrInputPalettecolorhc.GetText & Chr(34), iPosition:=6) Else @@ -5429,12 +5956,34 @@ Public Class sdgPlots Else clsScalefillstataFunction.RemoveParameterByName("scheme") End If + If ucrChkValueManual.Checked AndAlso Not ucrInputValue.IsEmpty() Then + clsScalefillmanualFunction.AddParameter("values", ucrInputValue.clsRList.ToScript()) + Else + clsScalefillmanualFunction.RemoveParameterByName("values") + End If + If ucrChkValueManualColor.Checked AndAlso Not ucrInputValueColor.IsEmpty() Then + clsScalecolormanualFunction.AddParameter("values", ucrInputValueColor.clsRList.ToScript()) + Else + clsScalecolormanualFunction.RemoveParameterByName("values") + End If + If ucrChkaesth.Checked AndAlso Not ucrInputAesth.IsEmpty() Then + clsScalefillmanualFunction.AddParameter("aesthetics", ucrInputAesth.clsRList.ToScript()) + Else + clsScalefillmanualFunction.RemoveParameterByName("aesthetics") + End If + If ucrChkAesthColor.Checked AndAlso Not ucrInputAthsColor.IsEmpty() Then + clsScalecolormanualFunction.AddParameter("aesthetics", ucrInputAthsColor.clsRList.ToScript()) + Else + clsScalecolormanualFunction.RemoveParameterByName("aesthetics") + End If End Sub - Private Sub ucrChkNaValue_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkNaValue.ControlValueChanged, ucrInputTextNaValue.ControlValueChanged, ucrInputTextNaValueColor.ControlValueChanged, ucrChkNaValueColor.ControlValueChanged, ucrChkNaValueCal.ControlValueChanged, ucrInputTextNaValueCal.ControlValueChanged, ucrChkNaValueColorCal.ControlValueChanged, ucrInputTextNaValueColorCal.ControlValueChanged, ucrInputTextNaValueColorpan.ControlValueChanged, ucrChkNaValuept.ControlValueChanged, ucrChkNaValuew.ControlValueChanged, ucrInputTextNaValuew.ControlValueChanged, - ucrChkNaValueColorEcon.ControlValueChanged, ucrInputTextNaValueColorEcon.ControlValueChanged, ucrChkNaValueEcon.ControlValueChanged, ucrInputTextNaValueEcon.ControlValueChanged, ucrChkNaValueColorEx.ControlValueChanged, ucrInputTextNaValueColorEx.ControlValueChanged, ucrChkNaValueEx.ControlValueChanged, ucrInputTextNaValueEx.ControlValueChanged, ucrChkNaValueExn.ControlValueChanged, ucrInputTextNaValueExn.ControlValueChanged, ucrInputTextNaValuept.ControlValueChanged, ucrChkNaValueColorpt.ControlValueChanged, ucrInputTextNaValueColorpt.ControlValueChanged, - ucrChkNaValueColorExn.ControlValueChanged, ucrInputTextNaValueColorExn.ControlValueChanged, ucrChkNaValueColorfew.ControlValueChanged, ucrInputTextNaValueColorfew.ControlValueChanged, ucrChkNaValuefew.ControlValueChanged, ucrInputTextNaValuefew.ControlValueChanged, ucrChkNaValuefiv.ControlValueChanged, ucrInputTextNaValueColorfiv.ControlValueChanged, ucrInputTextNaValuefiv.ControlValueChanged, ucrChkNaValueColorfiv.ControlValueChanged, ucrChkNaValuesol.ControlValueChanged, ucrInputTextNaValuesol.ControlValueChanged, ucrChkNaValueColorsol.ControlValueChanged, ucrChkNaValueColorw.ControlValueChanged, ucrInputTextNaValueColorw.ControlValueChanged, - ucrChkNaValueg.ControlValueChanged, ucrInputTextNaValueg.ControlValueChanged, ucrChkNaValueColorg.ControlValueChanged, ucrInputTextNaValueColorg.ControlValueChanged, ucrChkNaValuehc.ControlValueChanged, ucrInputTextNaValuehc.ControlValueChanged, ucrChkNaValueColorhc.ControlValueChanged, ucrInputTextNaValueColorhc.ControlValueChanged, ucrChkNaValuepan.ControlValueChanged, ucrInputTextNaValuepan.ControlValueChanged, ucrChkNaValueColorpan.ControlValueChanged, ucrInputTextNaValueColorsol.ControlValueChanged, ucrChkNaValuest.ControlValueChanged, ucrInputTextNaValuest.ControlValueChanged, ucrChkNaValueColorst.ControlValueChanged, ucrInputTextNaValueColorst.ControlValueChanged + Private Sub ucrChkPalettecolorw_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkPalettecolorw.ControlValueChanged, ucrInputPalettecolorw.ControlValueChanged, ucrChkPalettecolor.ControlValueChanged, ucrInputPalettecolor.ControlValueChanged, ucrInputPalettecolorhc.ControlValueChanged, ucrChkPalettecolorhc.ControlValueChanged, ucrInputPalettehc.ControlValueChanged, ucrChkpalettefillw.ControlValueChanged, ucrInputPalettefillw.ControlValueChanged, ucrColorsHigh.ControlValueChanged, ucrColorsLow.ControlValueChanged, ucrChkaesth.ControlValueChanged, ucrChkAesthColor.ControlValueChanged, ucrChkValueManual.ControlValueChanged, ucrChkValueManualColor.ControlValueChanged, ucrInputAesth.ControlValueChanged, ucrInputAthsColor.ControlValueChanged, ucrInputValue.ControlValueChanged, ucrInputValueColor.ControlValueChanged, + ucrChkPalettehc.ControlValueChanged, ucrChkThemecolor.ControlValueChanged, ucrInputThemeColor.ControlValueChanged, ucrChkThemeFill.ControlValueChanged, ucrInputThemeFill.ControlValueChanged, ucrChkSchemecolor.ControlValueChanged, ucrInputThemeColor.ControlValueChanged, ucrChkSchemefill.ControlValueChanged, ucrInputThemeFill.ControlValueChanged, ucrChkPalettefill.ControlValueChanged, ucrInputPalettefill.ControlValueChanged, ucrColourText.ControlValueChanged, ucrChkLow.ControlValueChanged, ucrChkLowColour.ControlValueChanged, ucrChkLow.ControlValueChanged, ucrChkLowColour.ControlValueChanged, ucrInputGradientTrans.ControlValueChanged, ucrInputGradientTransColour.ControlValueChanged, ucrChkGradientTrans.ControlValueChanged, ucrChkGradientTransColour.ControlValueChanged, ucrChkHigh.ControlValueChanged, ucrChkHighColour.ControlValueChanged, ucrColorsHighColour.ControlValueChanged + Palettes() + End Sub + + Private Sub MissingValues() If ucrChkNaValueCal.Checked AndAlso Not ucrInputTextNaValueCal.IsEmpty() Then clsScalefillcalcFunction.AddParameter("na.value", ucrInputTextNaValueCal.GetText, iPosition:=3) Else @@ -5575,18 +6124,27 @@ Public Class sdgPlots Else clsScalefillwsjFunction.RemoveParameterByName("na.value") End If + If ucrChkNavaluemanual.Checked AndAlso Not ucrInputNavaluesManual.IsEmpty() Then + clsScalefillmanualFunction.AddParameter("na.value", ucrInputNavaluesManual.GetText, iPosition:=3) + Else + clsScalefillmanualFunction.RemoveParameterByName("na.value") + End If + If ucrChkNavaluemanualColor.Checked AndAlso Not ucrInputNavaluesManualColor.IsEmpty() Then + clsScalecolormanualFunction.AddParameter("na.value", ucrInputNavaluesManualColor.GetText, iPosition:=3) + Else + clsScalecolormanualFunction.RemoveParameterByName("na.value") + End If End Sub - Private Sub ucrInputcontinuouscolor_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrInputcontinuouscolor.ControlValueChanged, ucrInputContinousfill.ControlValueChanged - GroupeColorScale() - End Sub - - Private Sub ucrInputPalettes_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrInputPalettes.ControlValueChanged - AddRemovePaletteDiscrete() + Private Sub ucrChkNaValue_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkNaValue.ControlValueChanged, ucrInputTextNaValue.ControlValueChanged, ucrInputTextNaValueColor.ControlValueChanged, ucrChkNaValueColor.ControlValueChanged, ucrChkNaValueCal.ControlValueChanged, ucrInputTextNaValueCal.ControlValueChanged, ucrChkNaValueColorCal.ControlValueChanged, ucrInputTextNaValueColorCal.ControlValueChanged, ucrInputTextNaValueColorpan.ControlValueChanged, ucrChkNaValuept.ControlValueChanged, ucrChkNaValuew.ControlValueChanged, ucrInputTextNaValuew.ControlValueChanged, ucrChkNavaluemanual.ControlValueChanged, ucrChkNavaluemanualColor.ControlValueChanged, + ucrChkNaValueColorEcon.ControlValueChanged, ucrInputTextNaValueColorEcon.ControlValueChanged, ucrChkNaValueEcon.ControlValueChanged, ucrInputTextNaValueEcon.ControlValueChanged, ucrChkNaValueColorEx.ControlValueChanged, ucrInputTextNaValueColorEx.ControlValueChanged, ucrChkNaValueEx.ControlValueChanged, ucrInputTextNaValueEx.ControlValueChanged, ucrChkNaValueExn.ControlValueChanged, ucrInputTextNaValueExn.ControlValueChanged, ucrInputTextNaValuept.ControlValueChanged, ucrChkNaValueColorpt.ControlValueChanged, ucrInputTextNaValueColorpt.ControlValueChanged, ucrInputNavaluesManual.ControlValueChanged, ucrInputNavaluesManualColor.ControlValueChanged, + ucrChkNaValueColorExn.ControlValueChanged, ucrInputTextNaValueColorExn.ControlValueChanged, ucrChkNaValueColorfew.ControlValueChanged, ucrInputTextNaValueColorfew.ControlValueChanged, ucrChkNaValuefew.ControlValueChanged, ucrInputTextNaValuefew.ControlValueChanged, ucrChkNaValuefiv.ControlValueChanged, ucrInputTextNaValueColorfiv.ControlValueChanged, ucrInputTextNaValuefiv.ControlValueChanged, ucrChkNaValueColorfiv.ControlValueChanged, ucrChkNaValuesol.ControlValueChanged, ucrInputTextNaValuesol.ControlValueChanged, ucrChkNaValueColorsol.ControlValueChanged, ucrChkNaValueColorw.ControlValueChanged, ucrInputTextNaValueColorw.ControlValueChanged, + ucrChkNaValueg.ControlValueChanged, ucrInputTextNaValueg.ControlValueChanged, ucrChkNaValueColorg.ControlValueChanged, ucrInputTextNaValueColorg.ControlValueChanged, ucrChkNaValuehc.ControlValueChanged, ucrInputTextNaValuehc.ControlValueChanged, ucrChkNaValueColorhc.ControlValueChanged, ucrInputTextNaValueColorhc.ControlValueChanged, ucrChkNaValuepan.ControlValueChanged, ucrInputTextNaValuepan.ControlValueChanged, ucrChkNaValueColorpan.ControlValueChanged, ucrInputTextNaValueColorsol.ControlValueChanged, ucrChkNaValuest.ControlValueChanged, ucrInputTextNaValuest.ControlValueChanged, ucrChkNaValueColorst.ControlValueChanged, ucrInputTextNaValueColorst.ControlValueChanged + MissingValues() End Sub - Private Sub ucrInputPaletteContinuous_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrInputPaletteContinuous.ControlValueChanged - AddRemovePaletteDiscrete() + Private Sub ucrInputcontinuouscolor_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrInputcontinuouscolor.ControlValueChanged, ucrInputContinousfill.ControlValueChanged + GroupeColorScale() End Sub Private Sub HideShowCanvaFill() @@ -5630,11 +6188,4 @@ Public Class sdgPlots HideShowCanvaFill() GroupeColorScale() End Sub - - Private Sub ucrChkColour_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkColour.ControlValueChanged - AddRemovePaletteDiscrete() - SetComboBoxItems() - SetComboBoxItemsContinuous() - GroupeColorScale() - End Sub End Class \ No newline at end of file diff --git a/instat/sdgProportionsPercentages.vb b/instat/sdgProportionsPercentages.vb index 2432df90623..b45d72b4af1 100644 --- a/instat/sdgProportionsPercentages.vb +++ b/instat/sdgProportionsPercentages.vb @@ -49,7 +49,6 @@ Public Class sdgProportionsPercentages ucrChkProportionsPercentages.SetParameter(New RParameter("percentage_type")) ucrChkProportionsPercentages.SetValuesCheckedAndUnchecked(Chr(34) & "factors" & Chr(34), Chr(34) & "none" & Chr(34)) - ucrChkProportionsPercentages.SetRDefault(Chr(34) & "none" & Chr(34)) ucrChkProportionsPercentages.SetText("Calculate Proportions or Percentages") ucrPnlBY.AddToLinkedControls({ucrReceiverByFactor, ucrChkDisplayAsDecimal}, objValues:={rdoByFactors}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) @@ -70,6 +69,8 @@ Public Class sdgProportionsPercentages InitialiseControls() End If clsDefaultFunction = clsNewDefaultFunction + clsDefaultFunction.AddParameter("percentage_type", Chr(34) & "factors" & Chr(34)) + SetRCode(Me, clsDefaultFunction, bReset) End Sub diff --git a/instat/sdgSummaries.Designer.vb b/instat/sdgSummaries.Designer.vb index 1a3609d27a0..4f1e8cd8ec8 100644 --- a/instat/sdgSummaries.Designer.vb +++ b/instat/sdgSummaries.Designer.vb @@ -41,96 +41,35 @@ Partial Class sdgSummaries Me.components = New System.ComponentModel.Container() Me.tbCircular = New System.Windows.Forms.TabPage() Me.grpCircScale = New System.Windows.Forms.GroupBox() - Me.ucrChkCircRange = New instat.ucrCheck() - Me.ucrChkAngVar = New instat.ucrCheck() - Me.ucrChkrho = New instat.ucrCheck() - Me.ucrChkAngDev = New instat.ucrCheck() - Me.ucrChkVar = New instat.ucrCheck() - Me.ucrChkSd = New instat.ucrCheck() Me.grpCircLocation = New System.Windows.Forms.GroupBox() - Me.ucrChkCircMedian = New instat.ucrCheck() - Me.ucrChkMin = New instat.ucrCheck() - Me.ucrChkMedianH = New instat.ucrCheck() - Me.ucrChkQ3 = New instat.ucrCheck() - Me.ucrChkQ1 = New instat.ucrCheck() - Me.ucrChkMax = New instat.ucrCheck() - Me.ucrChkCircMean = New instat.ucrCheck() Me.tbModel = New System.Windows.Forms.TabPage() - Me.ucrChkStandardErrorOfMean = New instat.ucrCheck() Me.tbPosition = New System.Windows.Forms.TabPage() - Me.ucrChkOrderBy = New instat.ucrCheck() Me.lblOrderBy = New System.Windows.Forms.Label() Me.grpPosition = New System.Windows.Forms.GroupBox() - Me.ucrChkSetseed = New instat.ucrCheck() - Me.ucrNudSeed = New instat.ucrNud() - Me.ucrChkSample = New instat.ucrCheck() - Me.ucrInputN = New instat.ucrInputTextBox() Me.lblInputN = New System.Windows.Forms.Label() - Me.ucrChkFirst = New instat.ucrCheck() - Me.ucrChkLast = New instat.ucrCheck() - Me.ucrChknth = New instat.ucrCheck() - Me.ucrSelectorOrderBy = New instat.ucrSelectorByDataFrameAddRemove() - Me.ucrReceiverOrderBy = New instat.ucrReceiverSingle() Me.tbTwoVariables = New System.Windows.Forms.TabPage() Me.lblSecondVariable = New System.Windows.Forms.Label() Me.grpRelationships = New System.Windows.Forms.GroupBox() - Me.ucrChkCovariance = New instat.ucrCheck() - Me.ucrChkCorrelations = New instat.ucrCheck() Me.grpHyroGOF = New System.Windows.Forms.GroupBox() Me.lblJmia = New System.Windows.Forms.Label() - Me.ucrInputJmia = New instat.ucrInputTextBox() - Me.ucrChkSelectAll = New instat.ucrCheck() - Me.ucrChkRelativeIndexOfAgreement = New instat.ucrCheck() - Me.ucrChkRatioOfStandardDeviation = New instat.ucrCheck() - Me.ucrChkCoefDetermination = New instat.ucrCheck() - Me.ucrChkRatioOfRootMeanSquaredError = New instat.ucrCheck() - Me.ucrChkRelativeNashSutcliffeEff = New instat.ucrCheck() - Me.ucrChkModifiedIndexOfAgreement = New instat.ucrCheck() - Me.ucrChkCoefPersistence = New instat.ucrCheck() - Me.ucrChkNashSutcliffeEfficiency = New instat.ucrCheck() - Me.ucrChkSumOfSquaredResiduals = New instat.ucrCheck() - Me.ucrChkKlingGuptaEfficiency = New instat.ucrCheck() - Me.ucrChkVolumetricEfficiency = New instat.ucrCheck() - Me.ucrChkPercentBias = New instat.ucrCheck() - Me.ucrChkModNashSutcliffeEff = New instat.ucrCheck() - Me.ucrChkMeanError = New instat.ucrCheck() - Me.ucrChkMeanSquaredError = New instat.ucrCheck() - Me.ucrChkRootMeanSquaredError = New instat.ucrCheck() Me.cmdHelp = New System.Windows.Forms.Button() - Me.ucrChkNormRootMeanSquaredError = New instat.ucrCheck() - Me.ucrChkMeanAbsoluteError = New instat.ucrCheck() - Me.ucrChkIndexOfAgreement = New instat.ucrCheck() - Me.ucrReceiverSecondVariable = New instat.ucrReceiverSingle() - Me.ucrSelectorSecondVariable = New instat.ucrSelectorByDataFrameAddRemove() Me.tbMore = New System.Windows.Forms.TabPage() Me.grpProportionsPercentiles = New System.Windows.Forms.GroupBox() - Me.ucrInputQuantile = New instat.ucrInputTextBox() - Me.ucrChkQuantile = New instat.ucrCheck() - Me.ucrInputCountValue = New instat.ucrInputTextBox() - Me.ucrInputComboCountTest = New instat.ucrInputComboBox() - Me.ucrChkProportion = New instat.ucrCheck() - Me.ucrChkCount = New instat.ucrCheck() - Me.ucrChkPercentage = New instat.ucrCheck() - Me.ucrInputPropValue = New instat.ucrInputTextBox() - Me.ucrInputComboPropTest = New instat.ucrInputComboBox() - Me.ucrInputPercentile = New instat.ucrInputTextBox() - Me.ucrChkPercentile = New instat.ucrCheck() Me.grpLocation = New System.Windows.Forms.GroupBox() Me.lblFractionTrimmed = New System.Windows.Forms.Label() - Me.ucrNudFraction = New instat.ucrNud() - Me.ucrChkTrimmedMean = New instat.ucrCheck() Me.grpScale = New System.Windows.Forms.GroupBox() - Me.ucrChkSn = New instat.ucrCheck() - Me.ucrChkQn = New instat.ucrCheck() - Me.ucrChkCoefficientOfVariation = New instat.ucrCheck() - Me.ucrChkMedianAbsoluteDeviation = New instat.ucrCheck() Me.grpSkewness = New System.Windows.Forms.GroupBox() - Me.ucrChkMc = New instat.ucrCheck() - Me.ucrChkSkewness = New instat.ucrCheck() Me.grpKurtosis = New System.Windows.Forms.GroupBox() - Me.ucrChkKurtosis = New instat.ucrCheck() + Me.cmdOptions = New System.Windows.Forms.Button() Me.tbsum = New System.Windows.Forms.TabPage() Me.grpDecilesQuintiles = New System.Windows.Forms.GroupBox() + Me.grpCommon = New System.Windows.Forms.GroupBox() + Me.grpQuartilesTerciles = New System.Windows.Forms.GroupBox() + Me.grpNotOrderedFactor = New System.Windows.Forms.GroupBox() + Me.grpNumeric = New System.Windows.Forms.GroupBox() + Me.tbSummaries = New System.Windows.Forms.TabControl() + Me.ttVerificationSummaries = New System.Windows.Forms.ToolTip(Me.components) + Me.ucrButtonsSummaries = New instat.ucrButtonsSubdialogue() Me.ucrChkP60 = New instat.ucrCheck() Me.ucrChkP90 = New instat.ucrCheck() Me.ucrChkP70 = New instat.ucrCheck() @@ -139,30 +78,94 @@ Partial Class sdgSummaries Me.ucrChkP30 = New instat.ucrCheck() Me.ucrChkP10 = New instat.ucrCheck() Me.ucrChkP20 = New instat.ucrCheck() - Me.grpCommon = New System.Windows.Forms.GroupBox() Me.ucrChkn_distinct = New instat.ucrCheck() Me.ucrChkNTotal = New instat.ucrCheck() Me.ucrChkMode = New instat.ucrCheck() Me.ucrChkNMissing = New instat.ucrCheck() Me.ucrChkNonMissing = New instat.ucrCheck() - Me.grpQuartilesTerciles = New System.Windows.Forms.GroupBox() Me.ucrChkP67 = New instat.ucrCheck() Me.ucrChkP33 = New instat.ucrCheck() Me.ucrChkP25 = New instat.ucrCheck() Me.ucrChkP75 = New instat.ucrCheck() - Me.grpNotOrderedFactor = New System.Windows.Forms.GroupBox() Me.ucrChkRange = New instat.ucrCheck() Me.ucrChkMaximum = New instat.ucrCheck() Me.ucrChkMinimum = New instat.ucrCheck() - Me.grpNumeric = New System.Windows.Forms.GroupBox() Me.ucrChkVariance = New instat.ucrCheck() Me.ucrChkMedian = New instat.ucrCheck() Me.ucrChkStdDev = New instat.ucrCheck() Me.ucrChkSum = New instat.ucrCheck() Me.ucrChkMean = New instat.ucrCheck() - Me.tbSummaries = New System.Windows.Forms.TabControl() - Me.ttVerificationSummaries = New System.Windows.Forms.ToolTip(Me.components) - Me.ucrButtonsSummaries = New instat.ucrButtonsSubdialogue() + Me.ucrInputQuantile = New instat.ucrInputTextBox() + Me.ucrChkQuantile = New instat.ucrCheck() + Me.ucrInputCountValue = New instat.ucrInputTextBox() + Me.ucrInputComboCountTest = New instat.ucrInputComboBox() + Me.ucrChkProportion = New instat.ucrCheck() + Me.ucrChkCount = New instat.ucrCheck() + Me.ucrChkPercentage = New instat.ucrCheck() + Me.ucrInputPropValue = New instat.ucrInputTextBox() + Me.ucrInputComboPropTest = New instat.ucrInputComboBox() + Me.ucrInputPercentile = New instat.ucrInputTextBox() + Me.ucrChkPercentile = New instat.ucrCheck() + Me.ucrNudFraction = New instat.ucrNud() + Me.ucrChkTrimmedMean = New instat.ucrCheck() + Me.ucrChkSn = New instat.ucrCheck() + Me.ucrChkQn = New instat.ucrCheck() + Me.ucrChkCoefficientOfVariation = New instat.ucrCheck() + Me.ucrChkMedianAbsoluteDeviation = New instat.ucrCheck() + Me.ucrChkMc = New instat.ucrCheck() + Me.ucrChkSkewness = New instat.ucrCheck() + Me.ucrChkProportionsPercentages = New instat.ucrCheck() + Me.ucrChkKurtosis = New instat.ucrCheck() + Me.ucrChkCovariance = New instat.ucrCheck() + Me.ucrChkCorrelations = New instat.ucrCheck() + Me.ucrInputJmia = New instat.ucrInputTextBox() + Me.ucrChkSelectAll = New instat.ucrCheck() + Me.ucrChkRelativeIndexOfAgreement = New instat.ucrCheck() + Me.ucrChkRatioOfStandardDeviation = New instat.ucrCheck() + Me.ucrChkCoefDetermination = New instat.ucrCheck() + Me.ucrChkRatioOfRootMeanSquaredError = New instat.ucrCheck() + Me.ucrChkRelativeNashSutcliffeEff = New instat.ucrCheck() + Me.ucrChkModifiedIndexOfAgreement = New instat.ucrCheck() + Me.ucrChkCoefPersistence = New instat.ucrCheck() + Me.ucrChkNashSutcliffeEfficiency = New instat.ucrCheck() + Me.ucrChkSumOfSquaredResiduals = New instat.ucrCheck() + Me.ucrChkKlingGuptaEfficiency = New instat.ucrCheck() + Me.ucrChkVolumetricEfficiency = New instat.ucrCheck() + Me.ucrChkPercentBias = New instat.ucrCheck() + Me.ucrChkModNashSutcliffeEff = New instat.ucrCheck() + Me.ucrChkMeanError = New instat.ucrCheck() + Me.ucrChkMeanSquaredError = New instat.ucrCheck() + Me.ucrChkRootMeanSquaredError = New instat.ucrCheck() + Me.ucrChkNormRootMeanSquaredError = New instat.ucrCheck() + Me.ucrChkMeanAbsoluteError = New instat.ucrCheck() + Me.ucrChkIndexOfAgreement = New instat.ucrCheck() + Me.ucrReceiverSecondVariable = New instat.ucrReceiverSingle() + Me.ucrSelectorSecondVariable = New instat.ucrSelectorByDataFrameAddRemove() + Me.ucrChkOrderBy = New instat.ucrCheck() + Me.ucrChkSetseed = New instat.ucrCheck() + Me.ucrNudSeed = New instat.ucrNud() + Me.ucrChkSample = New instat.ucrCheck() + Me.ucrInputN = New instat.ucrInputTextBox() + Me.ucrChkFirst = New instat.ucrCheck() + Me.ucrChkLast = New instat.ucrCheck() + Me.ucrChknth = New instat.ucrCheck() + Me.ucrSelectorOrderBy = New instat.ucrSelectorByDataFrameAddRemove() + Me.ucrReceiverOrderBy = New instat.ucrReceiverSingle() + Me.ucrChkStandardErrorOfMean = New instat.ucrCheck() + Me.ucrChkCircRange = New instat.ucrCheck() + Me.ucrChkAngVar = New instat.ucrCheck() + Me.ucrChkrho = New instat.ucrCheck() + Me.ucrChkAngDev = New instat.ucrCheck() + Me.ucrChkVar = New instat.ucrCheck() + Me.ucrChkSd = New instat.ucrCheck() + Me.ucrChkCircMedian = New instat.ucrCheck() + Me.ucrChkMin = New instat.ucrCheck() + Me.ucrChkMedianH = New instat.ucrCheck() + Me.ucrChkQ3 = New instat.ucrCheck() + Me.ucrChkQ1 = New instat.ucrCheck() + Me.ucrChkMax = New instat.ucrCheck() + Me.ucrChkCircMean = New instat.ucrCheck() + Me.GroupBox1 = New System.Windows.Forms.GroupBox() Me.tbCircular.SuspendLayout() Me.grpCircScale.SuspendLayout() Me.grpCircLocation.SuspendLayout() @@ -185,17 +188,17 @@ Partial Class sdgSummaries Me.grpNotOrderedFactor.SuspendLayout() Me.grpNumeric.SuspendLayout() Me.tbSummaries.SuspendLayout() + Me.GroupBox1.SuspendLayout() Me.SuspendLayout() ' 'tbCircular ' Me.tbCircular.Controls.Add(Me.grpCircScale) Me.tbCircular.Controls.Add(Me.grpCircLocation) - Me.tbCircular.Location = New System.Drawing.Point(4, 22) - Me.tbCircular.Margin = New System.Windows.Forms.Padding(2) + Me.tbCircular.Location = New System.Drawing.Point(4, 29) Me.tbCircular.Name = "tbCircular" - Me.tbCircular.Padding = New System.Windows.Forms.Padding(2) - Me.tbCircular.Size = New System.Drawing.Size(409, 383) + Me.tbCircular.Padding = New System.Windows.Forms.Padding(3) + Me.tbCircular.Size = New System.Drawing.Size(618, 581) Me.tbCircular.TabIndex = 8 Me.tbCircular.Text = "Circular" Me.tbCircular.UseVisualStyleBackColor = True @@ -208,75 +211,13 @@ Partial Class sdgSummaries Me.grpCircScale.Controls.Add(Me.ucrChkAngDev) Me.grpCircScale.Controls.Add(Me.ucrChkVar) Me.grpCircScale.Controls.Add(Me.ucrChkSd) - Me.grpCircScale.Location = New System.Drawing.Point(4, 103) - Me.grpCircScale.Margin = New System.Windows.Forms.Padding(2) + Me.grpCircScale.Location = New System.Drawing.Point(6, 154) Me.grpCircScale.Name = "grpCircScale" - Me.grpCircScale.Padding = New System.Windows.Forms.Padding(2) - Me.grpCircScale.Size = New System.Drawing.Size(401, 81) + Me.grpCircScale.Size = New System.Drawing.Size(602, 122) Me.grpCircScale.TabIndex = 1 Me.grpCircScale.TabStop = False Me.grpCircScale.Text = "Scale" ' - 'ucrChkCircRange - ' - Me.ucrChkCircRange.AutoSize = True - Me.ucrChkCircRange.Checked = False - Me.ucrChkCircRange.Location = New System.Drawing.Point(21, 47) - Me.ucrChkCircRange.Margin = New System.Windows.Forms.Padding(4) - Me.ucrChkCircRange.Name = "ucrChkCircRange" - Me.ucrChkCircRange.Size = New System.Drawing.Size(80, 23) - Me.ucrChkCircRange.TabIndex = 1 - ' - 'ucrChkAngVar - ' - Me.ucrChkAngVar.AutoSize = True - Me.ucrChkAngVar.Checked = False - Me.ucrChkAngVar.Location = New System.Drawing.Point(213, 21) - Me.ucrChkAngVar.Margin = New System.Windows.Forms.Padding(4) - Me.ucrChkAngVar.Name = "ucrChkAngVar" - Me.ucrChkAngVar.Size = New System.Drawing.Size(80, 23) - Me.ucrChkAngVar.TabIndex = 4 - ' - 'ucrChkrho - ' - Me.ucrChkrho.AutoSize = True - Me.ucrChkrho.Checked = False - Me.ucrChkrho.Location = New System.Drawing.Point(124, 47) - Me.ucrChkrho.Margin = New System.Windows.Forms.Padding(4) - Me.ucrChkrho.Name = "ucrChkrho" - Me.ucrChkrho.Size = New System.Drawing.Size(80, 23) - Me.ucrChkrho.TabIndex = 3 - ' - 'ucrChkAngDev - ' - Me.ucrChkAngDev.AutoSize = True - Me.ucrChkAngDev.Checked = False - Me.ucrChkAngDev.Location = New System.Drawing.Point(213, 47) - Me.ucrChkAngDev.Margin = New System.Windows.Forms.Padding(4) - Me.ucrChkAngDev.Name = "ucrChkAngDev" - Me.ucrChkAngDev.Size = New System.Drawing.Size(80, 23) - Me.ucrChkAngDev.TabIndex = 5 - ' - 'ucrChkVar - ' - Me.ucrChkVar.AutoSize = True - Me.ucrChkVar.Checked = False - Me.ucrChkVar.Location = New System.Drawing.Point(124, 19) - Me.ucrChkVar.Margin = New System.Windows.Forms.Padding(4) - Me.ucrChkVar.Name = "ucrChkVar" - Me.ucrChkVar.Size = New System.Drawing.Size(80, 23) - Me.ucrChkVar.TabIndex = 2 - ' - 'ucrChkSd - ' - Me.ucrChkSd.AutoSize = True - Me.ucrChkSd.Checked = False - Me.ucrChkSd.Location = New System.Drawing.Point(21, 19) - Me.ucrChkSd.Margin = New System.Windows.Forms.Padding(4) - Me.ucrChkSd.Name = "ucrChkSd" - Me.ucrChkSd.Size = New System.Drawing.Size(80, 23) - Me.ucrChkSd.TabIndex = 0 - ' 'grpCircLocation ' Me.grpCircLocation.Controls.Add(Me.ucrChkCircMedian) @@ -286,106 +227,25 @@ Partial Class sdgSummaries Me.grpCircLocation.Controls.Add(Me.ucrChkQ1) Me.grpCircLocation.Controls.Add(Me.ucrChkMax) Me.grpCircLocation.Controls.Add(Me.ucrChkCircMean) - Me.grpCircLocation.Location = New System.Drawing.Point(4, 9) - Me.grpCircLocation.Margin = New System.Windows.Forms.Padding(2) + Me.grpCircLocation.Location = New System.Drawing.Point(6, 14) Me.grpCircLocation.Name = "grpCircLocation" - Me.grpCircLocation.Padding = New System.Windows.Forms.Padding(2) - Me.grpCircLocation.Size = New System.Drawing.Size(401, 90) + Me.grpCircLocation.Size = New System.Drawing.Size(602, 135) Me.grpCircLocation.TabIndex = 0 Me.grpCircLocation.TabStop = False Me.grpCircLocation.Text = "Location" ' - 'ucrChkCircMedian - ' - Me.ucrChkCircMedian.AutoSize = True - Me.ucrChkCircMedian.Checked = False - Me.ucrChkCircMedian.Location = New System.Drawing.Point(124, 26) - Me.ucrChkCircMedian.Margin = New System.Windows.Forms.Padding(4) - Me.ucrChkCircMedian.Name = "ucrChkCircMedian" - Me.ucrChkCircMedian.Size = New System.Drawing.Size(81, 23) - Me.ucrChkCircMedian.TabIndex = 2 - ' - 'ucrChkMin - ' - Me.ucrChkMin.AutoSize = True - Me.ucrChkMin.Checked = False - Me.ucrChkMin.Location = New System.Drawing.Point(213, 26) - Me.ucrChkMin.Margin = New System.Windows.Forms.Padding(4) - Me.ucrChkMin.Name = "ucrChkMin" - Me.ucrChkMin.Size = New System.Drawing.Size(80, 23) - Me.ucrChkMin.TabIndex = 4 - ' - 'ucrChkMedianH - ' - Me.ucrChkMedianH.AutoSize = True - Me.ucrChkMedianH.Checked = False - Me.ucrChkMedianH.Location = New System.Drawing.Point(300, 26) - Me.ucrChkMedianH.Margin = New System.Windows.Forms.Padding(4) - Me.ucrChkMedianH.Name = "ucrChkMedianH" - Me.ucrChkMedianH.Size = New System.Drawing.Size(80, 23) - Me.ucrChkMedianH.TabIndex = 6 - ' - 'ucrChkQ3 - ' - Me.ucrChkQ3.AutoSize = True - Me.ucrChkQ3.Checked = False - Me.ucrChkQ3.Location = New System.Drawing.Point(124, 54) - Me.ucrChkQ3.Margin = New System.Windows.Forms.Padding(4) - Me.ucrChkQ3.Name = "ucrChkQ3" - Me.ucrChkQ3.Size = New System.Drawing.Size(80, 23) - Me.ucrChkQ3.TabIndex = 3 - ' - 'ucrChkQ1 - ' - Me.ucrChkQ1.AutoSize = True - Me.ucrChkQ1.Checked = False - Me.ucrChkQ1.Location = New System.Drawing.Point(21, 54) - Me.ucrChkQ1.Margin = New System.Windows.Forms.Padding(4) - Me.ucrChkQ1.Name = "ucrChkQ1" - Me.ucrChkQ1.Size = New System.Drawing.Size(80, 23) - Me.ucrChkQ1.TabIndex = 1 - ' - 'ucrChkMax - ' - Me.ucrChkMax.AutoSize = True - Me.ucrChkMax.Checked = False - Me.ucrChkMax.Location = New System.Drawing.Point(213, 54) - Me.ucrChkMax.Margin = New System.Windows.Forms.Padding(4) - Me.ucrChkMax.Name = "ucrChkMax" - Me.ucrChkMax.Size = New System.Drawing.Size(80, 23) - Me.ucrChkMax.TabIndex = 5 - ' - 'ucrChkCircMean - ' - Me.ucrChkCircMean.AutoSize = True - Me.ucrChkCircMean.Checked = False - Me.ucrChkCircMean.Location = New System.Drawing.Point(21, 26) - Me.ucrChkCircMean.Margin = New System.Windows.Forms.Padding(4) - Me.ucrChkCircMean.Name = "ucrChkCircMean" - Me.ucrChkCircMean.Size = New System.Drawing.Size(86, 23) - Me.ucrChkCircMean.TabIndex = 0 - ' 'tbModel ' Me.tbModel.Controls.Add(Me.ucrChkStandardErrorOfMean) - Me.tbModel.Location = New System.Drawing.Point(4, 22) + Me.tbModel.Location = New System.Drawing.Point(4, 29) + Me.tbModel.Margin = New System.Windows.Forms.Padding(4) Me.tbModel.Name = "tbModel" - Me.tbModel.Padding = New System.Windows.Forms.Padding(3) - Me.tbModel.Size = New System.Drawing.Size(409, 383) + Me.tbModel.Padding = New System.Windows.Forms.Padding(4) + Me.tbModel.Size = New System.Drawing.Size(618, 581) Me.tbModel.TabIndex = 6 Me.tbModel.Text = "Model" Me.tbModel.UseVisualStyleBackColor = True ' - 'ucrChkStandardErrorOfMean - ' - Me.ucrChkStandardErrorOfMean.AutoSize = True - Me.ucrChkStandardErrorOfMean.Checked = False - Me.ucrChkStandardErrorOfMean.Location = New System.Drawing.Point(16, 21) - Me.ucrChkStandardErrorOfMean.Margin = New System.Windows.Forms.Padding(5) - Me.ucrChkStandardErrorOfMean.Name = "ucrChkStandardErrorOfMean" - Me.ucrChkStandardErrorOfMean.Size = New System.Drawing.Size(295, 23) - Me.ucrChkStandardErrorOfMean.TabIndex = 1 - ' 'tbPosition ' Me.tbPosition.Controls.Add(Me.ucrChkOrderBy) @@ -393,31 +253,23 @@ Partial Class sdgSummaries Me.tbPosition.Controls.Add(Me.grpPosition) Me.tbPosition.Controls.Add(Me.ucrSelectorOrderBy) Me.tbPosition.Controls.Add(Me.ucrReceiverOrderBy) - Me.tbPosition.Location = New System.Drawing.Point(4, 22) + Me.tbPosition.Location = New System.Drawing.Point(4, 29) + Me.tbPosition.Margin = New System.Windows.Forms.Padding(4) Me.tbPosition.Name = "tbPosition" - Me.tbPosition.Padding = New System.Windows.Forms.Padding(3) - Me.tbPosition.Size = New System.Drawing.Size(409, 383) + Me.tbPosition.Padding = New System.Windows.Forms.Padding(4) + Me.tbPosition.Size = New System.Drawing.Size(618, 581) Me.tbPosition.TabIndex = 7 Me.tbPosition.Text = "Position" Me.tbPosition.UseVisualStyleBackColor = True ' - 'ucrChkOrderBy - ' - Me.ucrChkOrderBy.AutoSize = True - Me.ucrChkOrderBy.Checked = False - Me.ucrChkOrderBy.Location = New System.Drawing.Point(12, 101) - Me.ucrChkOrderBy.Margin = New System.Windows.Forms.Padding(5) - Me.ucrChkOrderBy.Name = "ucrChkOrderBy" - Me.ucrChkOrderBy.Size = New System.Drawing.Size(188, 23) - Me.ucrChkOrderBy.TabIndex = 1 - ' - 'lblOrderBy + 'lblOrderBy ' Me.lblOrderBy.AutoSize = True Me.lblOrderBy.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblOrderBy.Location = New System.Drawing.Point(229, 160) + Me.lblOrderBy.Location = New System.Drawing.Point(344, 240) + Me.lblOrderBy.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblOrderBy.Name = "lblOrderBy" - Me.lblOrderBy.Size = New System.Drawing.Size(51, 13) + Me.lblOrderBy.Size = New System.Drawing.Size(75, 20) Me.lblOrderBy.TabIndex = 3 Me.lblOrderBy.Text = "Order By:" ' @@ -431,124 +283,26 @@ Partial Class sdgSummaries Me.grpPosition.Controls.Add(Me.ucrChkFirst) Me.grpPosition.Controls.Add(Me.ucrChkLast) Me.grpPosition.Controls.Add(Me.ucrChknth) - Me.grpPosition.Location = New System.Drawing.Point(6, 6) + Me.grpPosition.Location = New System.Drawing.Point(9, 9) + Me.grpPosition.Margin = New System.Windows.Forms.Padding(4) Me.grpPosition.Name = "grpPosition" - Me.grpPosition.Size = New System.Drawing.Size(397, 80) + Me.grpPosition.Padding = New System.Windows.Forms.Padding(4) + Me.grpPosition.Size = New System.Drawing.Size(596, 120) Me.grpPosition.TabIndex = 0 Me.grpPosition.TabStop = False Me.grpPosition.Text = "Position" ' - 'ucrChkSetseed - ' - Me.ucrChkSetseed.AutoSize = True - Me.ucrChkSetseed.Checked = False - Me.ucrChkSetseed.Location = New System.Drawing.Point(166, 45) - Me.ucrChkSetseed.Margin = New System.Windows.Forms.Padding(5) - Me.ucrChkSetseed.Name = "ucrChkSetseed" - Me.ucrChkSetseed.Size = New System.Drawing.Size(101, 23) - Me.ucrChkSetseed.TabIndex = 8 - ' - 'ucrNudSeed - ' - Me.ucrNudSeed.AutoSize = True - Me.ucrNudSeed.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) - Me.ucrNudSeed.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudSeed.Location = New System.Drawing.Point(273, 45) - Me.ucrNudSeed.Margin = New System.Windows.Forms.Padding(5) - Me.ucrNudSeed.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) - Me.ucrNudSeed.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) - Me.ucrNudSeed.Name = "ucrNudSeed" - Me.ucrNudSeed.Size = New System.Drawing.Size(50, 20) - Me.ucrNudSeed.TabIndex = 7 - Me.ucrNudSeed.Value = New Decimal(New Integer() {0, 0, 0, 0}) - ' - 'ucrChkSample - ' - Me.ucrChkSample.AutoSize = True - Me.ucrChkSample.Checked = False - Me.ucrChkSample.Location = New System.Drawing.Point(8, 45) - Me.ucrChkSample.Margin = New System.Windows.Forms.Padding(5) - Me.ucrChkSample.Name = "ucrChkSample" - Me.ucrChkSample.Size = New System.Drawing.Size(113, 23) - Me.ucrChkSample.TabIndex = 5 - ' - 'ucrInputN - ' - Me.ucrInputN.AddQuotesIfUnrecognised = True - Me.ucrInputN.AutoSize = True - Me.ucrInputN.IsMultiline = False - Me.ucrInputN.IsReadOnly = False - Me.ucrInputN.Location = New System.Drawing.Point(233, 19) - Me.ucrInputN.Margin = New System.Windows.Forms.Padding(7, 6, 7, 6) - Me.ucrInputN.Name = "ucrInputN" - Me.ucrInputN.Size = New System.Drawing.Size(64, 20) - Me.ucrInputN.TabIndex = 3 - ' 'lblInputN ' Me.lblInputN.AutoSize = True Me.lblInputN.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblInputN.Location = New System.Drawing.Point(215, 22) + Me.lblInputN.Location = New System.Drawing.Point(322, 33) + Me.lblInputN.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblInputN.Name = "lblInputN" - Me.lblInputN.Size = New System.Drawing.Size(16, 13) + Me.lblInputN.Size = New System.Drawing.Size(22, 20) Me.lblInputN.TabIndex = 2 Me.lblInputN.Text = "n:" ' - 'ucrChkFirst - ' - Me.ucrChkFirst.AutoSize = True - Me.ucrChkFirst.Checked = False - Me.ucrChkFirst.Location = New System.Drawing.Point(8, 19) - Me.ucrChkFirst.Margin = New System.Windows.Forms.Padding(5) - Me.ucrChkFirst.Name = "ucrChkFirst" - Me.ucrChkFirst.Size = New System.Drawing.Size(101, 23) - Me.ucrChkFirst.TabIndex = 0 - ' - 'ucrChkLast - ' - Me.ucrChkLast.AutoSize = True - Me.ucrChkLast.Checked = False - Me.ucrChkLast.Location = New System.Drawing.Point(309, 19) - Me.ucrChkLast.Margin = New System.Windows.Forms.Padding(5) - Me.ucrChkLast.Name = "ucrChkLast" - Me.ucrChkLast.Size = New System.Drawing.Size(80, 23) - Me.ucrChkLast.TabIndex = 4 - ' - 'ucrChknth - ' - Me.ucrChknth.AutoSize = True - Me.ucrChknth.Checked = False - Me.ucrChknth.Location = New System.Drawing.Point(166, 21) - Me.ucrChknth.Margin = New System.Windows.Forms.Padding(5) - Me.ucrChknth.Name = "ucrChknth" - Me.ucrChknth.Size = New System.Drawing.Size(59, 23) - Me.ucrChknth.TabIndex = 1 - ' - 'ucrSelectorOrderBy - ' - Me.ucrSelectorOrderBy.AutoSize = True - Me.ucrSelectorOrderBy.bDropUnusedFilterLevels = False - Me.ucrSelectorOrderBy.bShowHiddenColumns = False - Me.ucrSelectorOrderBy.bUseCurrentFilter = True - Me.ucrSelectorOrderBy.Location = New System.Drawing.Point(10, 132) - Me.ucrSelectorOrderBy.Margin = New System.Windows.Forms.Padding(0) - Me.ucrSelectorOrderBy.Name = "ucrSelectorOrderBy" - Me.ucrSelectorOrderBy.Size = New System.Drawing.Size(213, 183) - Me.ucrSelectorOrderBy.TabIndex = 2 - ' - 'ucrReceiverOrderBy - ' - Me.ucrReceiverOrderBy.AutoSize = True - Me.ucrReceiverOrderBy.frmParent = Nothing - Me.ucrReceiverOrderBy.Location = New System.Drawing.Point(231, 176) - Me.ucrReceiverOrderBy.Margin = New System.Windows.Forms.Padding(0) - Me.ucrReceiverOrderBy.Name = "ucrReceiverOrderBy" - Me.ucrReceiverOrderBy.Selector = Nothing - Me.ucrReceiverOrderBy.Size = New System.Drawing.Size(120, 20) - Me.ucrReceiverOrderBy.strNcFilePath = "" - Me.ucrReceiverOrderBy.TabIndex = 4 - Me.ucrReceiverOrderBy.ucrSelector = Nothing - ' 'tbTwoVariables ' Me.tbTwoVariables.Controls.Add(Me.lblSecondVariable) @@ -556,10 +310,11 @@ Partial Class sdgSummaries Me.tbTwoVariables.Controls.Add(Me.grpHyroGOF) Me.tbTwoVariables.Controls.Add(Me.ucrReceiverSecondVariable) Me.tbTwoVariables.Controls.Add(Me.ucrSelectorSecondVariable) - Me.tbTwoVariables.Location = New System.Drawing.Point(4, 22) + Me.tbTwoVariables.Location = New System.Drawing.Point(4, 29) + Me.tbTwoVariables.Margin = New System.Windows.Forms.Padding(4) Me.tbTwoVariables.Name = "tbTwoVariables" - Me.tbTwoVariables.Padding = New System.Windows.Forms.Padding(3) - Me.tbTwoVariables.Size = New System.Drawing.Size(409, 383) + Me.tbTwoVariables.Padding = New System.Windows.Forms.Padding(4) + Me.tbTwoVariables.Size = New System.Drawing.Size(618, 581) Me.tbTwoVariables.TabIndex = 5 Me.tbTwoVariables.Text = " Two-Variables" Me.tbTwoVariables.UseVisualStyleBackColor = True @@ -568,9 +323,10 @@ Partial Class sdgSummaries ' Me.lblSecondVariable.AutoSize = True Me.lblSecondVariable.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblSecondVariable.Location = New System.Drawing.Point(263, 207) + Me.lblSecondVariable.Location = New System.Drawing.Point(394, 310) + Me.lblSecondVariable.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblSecondVariable.Name = "lblSecondVariable" - Me.lblSecondVariable.Size = New System.Drawing.Size(88, 13) + Me.lblSecondVariable.Size = New System.Drawing.Size(130, 20) Me.lblSecondVariable.TabIndex = 3 Me.lblSecondVariable.Text = "Second Variable:" ' @@ -578,33 +334,15 @@ Partial Class sdgSummaries ' Me.grpRelationships.Controls.Add(Me.ucrChkCovariance) Me.grpRelationships.Controls.Add(Me.ucrChkCorrelations) - Me.grpRelationships.Location = New System.Drawing.Point(4, 6) + Me.grpRelationships.Location = New System.Drawing.Point(6, 9) + Me.grpRelationships.Margin = New System.Windows.Forms.Padding(4) Me.grpRelationships.Name = "grpRelationships" - Me.grpRelationships.Size = New System.Drawing.Size(399, 38) + Me.grpRelationships.Padding = New System.Windows.Forms.Padding(4) + Me.grpRelationships.Size = New System.Drawing.Size(598, 57) Me.grpRelationships.TabIndex = 0 Me.grpRelationships.TabStop = False Me.grpRelationships.Text = "Relationships" ' - 'ucrChkCovariance - ' - Me.ucrChkCovariance.AutoSize = True - Me.ucrChkCovariance.Checked = False - Me.ucrChkCovariance.Location = New System.Drawing.Point(166, 10) - Me.ucrChkCovariance.Margin = New System.Windows.Forms.Padding(5) - Me.ucrChkCovariance.Name = "ucrChkCovariance" - Me.ucrChkCovariance.Size = New System.Drawing.Size(167, 23) - Me.ucrChkCovariance.TabIndex = 1 - ' - 'ucrChkCorrelations - ' - Me.ucrChkCorrelations.AutoSize = True - Me.ucrChkCorrelations.Checked = False - Me.ucrChkCorrelations.Location = New System.Drawing.Point(15, 13) - Me.ucrChkCorrelations.Margin = New System.Windows.Forms.Padding(5) - Me.ucrChkCorrelations.Name = "ucrChkCorrelations" - Me.ucrChkCorrelations.Size = New System.Drawing.Size(149, 23) - Me.ucrChkCorrelations.TabIndex = 0 - ' 'grpHyroGOF ' Me.grpHyroGOF.Controls.Add(Me.lblJmia) @@ -630,9 +368,11 @@ Partial Class sdgSummaries Me.grpHyroGOF.Controls.Add(Me.ucrChkNormRootMeanSquaredError) Me.grpHyroGOF.Controls.Add(Me.ucrChkMeanAbsoluteError) Me.grpHyroGOF.Controls.Add(Me.ucrChkIndexOfAgreement) - Me.grpHyroGOF.Location = New System.Drawing.Point(6, 45) + Me.grpHyroGOF.Location = New System.Drawing.Point(9, 68) + Me.grpHyroGOF.Margin = New System.Windows.Forms.Padding(4) Me.grpHyroGOF.Name = "grpHyroGOF" - Me.grpHyroGOF.Size = New System.Drawing.Size(399, 145) + Me.grpHyroGOF.Padding = New System.Windows.Forms.Padding(4) + Me.grpHyroGOF.Size = New System.Drawing.Size(598, 218) Me.grpHyroGOF.TabIndex = 1 Me.grpHyroGOF.TabStop = False Me.grpHyroGOF.Text = "HydroGOF" @@ -641,292 +381,514 @@ Partial Class sdgSummaries ' Me.lblJmia.AutoSize = True Me.lblJmia.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblJmia.Location = New System.Drawing.Point(284, 125) + Me.lblJmia.Location = New System.Drawing.Point(426, 188) + Me.lblJmia.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblJmia.Name = "lblJmia" - Me.lblJmia.Size = New System.Drawing.Size(12, 13) + Me.lblJmia.Size = New System.Drawing.Size(16, 20) Me.lblJmia.TabIndex = 20 Me.lblJmia.Text = "j:" ' - 'ucrInputJmia - ' - Me.ucrInputJmia.AddQuotesIfUnrecognised = True - Me.ucrInputJmia.AutoSize = True - Me.ucrInputJmia.IsMultiline = False - Me.ucrInputJmia.IsReadOnly = False - Me.ucrInputJmia.Location = New System.Drawing.Point(299, 122) - Me.ucrInputJmia.Name = "ucrInputJmia" - Me.ucrInputJmia.Size = New System.Drawing.Size(32, 21) - Me.ucrInputJmia.TabIndex = 21 - ' - 'ucrChkSelectAll - ' - Me.ucrChkSelectAll.AutoSize = True - Me.ucrChkSelectAll.Checked = False - Me.ucrChkSelectAll.Location = New System.Drawing.Point(9, 15) - Me.ucrChkSelectAll.Margin = New System.Windows.Forms.Padding(5) - Me.ucrChkSelectAll.Name = "ucrChkSelectAll" - Me.ucrChkSelectAll.Size = New System.Drawing.Size(87, 23) - Me.ucrChkSelectAll.TabIndex = 0 + 'cmdHelp ' - 'ucrChkRelativeIndexOfAgreement + Me.cmdHelp.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.cmdHelp.Location = New System.Drawing.Point(496, 180) + Me.cmdHelp.Margin = New System.Windows.Forms.Padding(4) + Me.cmdHelp.Name = "cmdHelp" + Me.cmdHelp.Size = New System.Drawing.Size(102, 34) + Me.cmdHelp.TabIndex = 22 + Me.cmdHelp.Text = "Help" + Me.cmdHelp.UseVisualStyleBackColor = True ' - Me.ucrChkRelativeIndexOfAgreement.AutoSize = True - Me.ucrChkRelativeIndexOfAgreement.Checked = False - Me.ucrChkRelativeIndexOfAgreement.Location = New System.Drawing.Point(204, 75) - Me.ucrChkRelativeIndexOfAgreement.Margin = New System.Windows.Forms.Padding(5) - Me.ucrChkRelativeIndexOfAgreement.Name = "ucrChkRelativeIndexOfAgreement" - Me.ucrChkRelativeIndexOfAgreement.Size = New System.Drawing.Size(87, 23) - Me.ucrChkRelativeIndexOfAgreement.TabIndex = 13 + 'tbMore ' - 'ucrChkRatioOfStandardDeviation + Me.tbMore.Controls.Add(Me.GroupBox1) + Me.tbMore.Controls.Add(Me.grpProportionsPercentiles) + Me.tbMore.Controls.Add(Me.grpLocation) + Me.tbMore.Controls.Add(Me.grpScale) + Me.tbMore.Controls.Add(Me.grpSkewness) + Me.tbMore.Controls.Add(Me.grpKurtosis) + Me.tbMore.Location = New System.Drawing.Point(4, 29) + Me.tbMore.Margin = New System.Windows.Forms.Padding(4) + Me.tbMore.Name = "tbMore" + Me.tbMore.Padding = New System.Windows.Forms.Padding(4) + Me.tbMore.Size = New System.Drawing.Size(618, 601) + Me.tbMore.TabIndex = 1 + Me.tbMore.Text = "More" + Me.tbMore.UseVisualStyleBackColor = True ' - Me.ucrChkRatioOfStandardDeviation.AutoSize = True - Me.ucrChkRatioOfStandardDeviation.Checked = False - Me.ucrChkRatioOfStandardDeviation.Location = New System.Drawing.Point(94, 54) - Me.ucrChkRatioOfStandardDeviation.Margin = New System.Windows.Forms.Padding(5) - Me.ucrChkRatioOfStandardDeviation.Name = "ucrChkRatioOfStandardDeviation" - Me.ucrChkRatioOfStandardDeviation.Size = New System.Drawing.Size(87, 23) - Me.ucrChkRatioOfStandardDeviation.TabIndex = 7 + 'grpProportionsPercentiles ' - 'ucrChkCoefDetermination + Me.grpProportionsPercentiles.Controls.Add(Me.ucrInputQuantile) + Me.grpProportionsPercentiles.Controls.Add(Me.ucrChkQuantile) + Me.grpProportionsPercentiles.Controls.Add(Me.ucrInputCountValue) + Me.grpProportionsPercentiles.Controls.Add(Me.ucrInputComboCountTest) + Me.grpProportionsPercentiles.Controls.Add(Me.ucrChkProportion) + Me.grpProportionsPercentiles.Controls.Add(Me.ucrChkCount) + Me.grpProportionsPercentiles.Controls.Add(Me.ucrChkPercentage) + Me.grpProportionsPercentiles.Controls.Add(Me.ucrInputPropValue) + Me.grpProportionsPercentiles.Controls.Add(Me.ucrInputComboPropTest) + Me.grpProportionsPercentiles.Controls.Add(Me.ucrInputPercentile) + Me.grpProportionsPercentiles.Controls.Add(Me.ucrChkPercentile) + Me.grpProportionsPercentiles.Location = New System.Drawing.Point(15, 9) + Me.grpProportionsPercentiles.Margin = New System.Windows.Forms.Padding(4) + Me.grpProportionsPercentiles.Name = "grpProportionsPercentiles" + Me.grpProportionsPercentiles.Padding = New System.Windows.Forms.Padding(4) + Me.grpProportionsPercentiles.Size = New System.Drawing.Size(590, 183) + Me.grpProportionsPercentiles.TabIndex = 0 + Me.grpProportionsPercentiles.TabStop = False + Me.grpProportionsPercentiles.Text = "Proportions/Percentiles/Count" ' - Me.ucrChkCoefDetermination.AutoSize = True - Me.ucrChkCoefDetermination.Checked = False - Me.ucrChkCoefDetermination.Location = New System.Drawing.Point(204, 116) - Me.ucrChkCoefDetermination.Margin = New System.Windows.Forms.Padding(5) - Me.ucrChkCoefDetermination.Name = "ucrChkCoefDetermination" - Me.ucrChkCoefDetermination.Size = New System.Drawing.Size(87, 23) - Me.ucrChkCoefDetermination.TabIndex = 15 + 'grpLocation ' - 'ucrChkRatioOfRootMeanSquaredError + Me.grpLocation.Controls.Add(Me.lblFractionTrimmed) + Me.grpLocation.Controls.Add(Me.ucrNudFraction) + Me.grpLocation.Controls.Add(Me.ucrChkTrimmedMean) + Me.grpLocation.Location = New System.Drawing.Point(15, 197) + Me.grpLocation.Margin = New System.Windows.Forms.Padding(4) + Me.grpLocation.Name = "grpLocation" + Me.grpLocation.Padding = New System.Windows.Forms.Padding(4) + Me.grpLocation.Size = New System.Drawing.Size(590, 78) + Me.grpLocation.TabIndex = 0 + Me.grpLocation.TabStop = False + Me.grpLocation.Text = "Location" ' - Me.ucrChkRatioOfRootMeanSquaredError.AutoSize = True - Me.ucrChkRatioOfRootMeanSquaredError.Checked = False - Me.ucrChkRatioOfRootMeanSquaredError.Location = New System.Drawing.Point(94, 34) - Me.ucrChkRatioOfRootMeanSquaredError.Margin = New System.Windows.Forms.Padding(5) - Me.ucrChkRatioOfRootMeanSquaredError.Name = "ucrChkRatioOfRootMeanSquaredError" - Me.ucrChkRatioOfRootMeanSquaredError.Size = New System.Drawing.Size(87, 23) - Me.ucrChkRatioOfRootMeanSquaredError.TabIndex = 6 + 'lblFractionTrimmed ' - 'ucrChkRelativeNashSutcliffeEff + Me.lblFractionTrimmed.AutoSize = True + Me.lblFractionTrimmed.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.lblFractionTrimmed.Location = New System.Drawing.Point(312, 32) + Me.lblFractionTrimmed.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblFractionTrimmed.Name = "lblFractionTrimmed" + Me.lblFractionTrimmed.Size = New System.Drawing.Size(136, 20) + Me.lblFractionTrimmed.TabIndex = 1 + Me.lblFractionTrimmed.Text = "Fraction Trimmed:" ' - Me.ucrChkRelativeNashSutcliffeEff.AutoSize = True - Me.ucrChkRelativeNashSutcliffeEff.Checked = False - Me.ucrChkRelativeNashSutcliffeEff.Location = New System.Drawing.Point(94, 115) - Me.ucrChkRelativeNashSutcliffeEff.Margin = New System.Windows.Forms.Padding(5) - Me.ucrChkRelativeNashSutcliffeEff.Name = "ucrChkRelativeNashSutcliffeEff" - Me.ucrChkRelativeNashSutcliffeEff.Size = New System.Drawing.Size(87, 23) - Me.ucrChkRelativeNashSutcliffeEff.TabIndex = 10 + 'grpScale ' - 'ucrChkModifiedIndexOfAgreement + Me.grpScale.Controls.Add(Me.ucrChkSn) + Me.grpScale.Controls.Add(Me.ucrChkQn) + Me.grpScale.Controls.Add(Me.ucrChkCoefficientOfVariation) + Me.grpScale.Controls.Add(Me.ucrChkMedianAbsoluteDeviation) + Me.grpScale.Location = New System.Drawing.Point(15, 279) + Me.grpScale.Margin = New System.Windows.Forms.Padding(4) + Me.grpScale.Name = "grpScale" + Me.grpScale.Padding = New System.Windows.Forms.Padding(4) + Me.grpScale.Size = New System.Drawing.Size(590, 111) + Me.grpScale.TabIndex = 1 + Me.grpScale.TabStop = False + Me.grpScale.Text = "Scale" ' - Me.ucrChkModifiedIndexOfAgreement.AutoSize = True - Me.ucrChkModifiedIndexOfAgreement.Checked = False - Me.ucrChkModifiedIndexOfAgreement.Location = New System.Drawing.Point(204, 36) - Me.ucrChkModifiedIndexOfAgreement.Margin = New System.Windows.Forms.Padding(5) - Me.ucrChkModifiedIndexOfAgreement.Name = "ucrChkModifiedIndexOfAgreement" - Me.ucrChkModifiedIndexOfAgreement.Size = New System.Drawing.Size(87, 23) - Me.ucrChkModifiedIndexOfAgreement.TabIndex = 11 + 'grpSkewness ' - 'ucrChkCoefPersistence + Me.grpSkewness.Controls.Add(Me.ucrChkMc) + Me.grpSkewness.Controls.Add(Me.ucrChkSkewness) + Me.grpSkewness.Location = New System.Drawing.Point(15, 395) + Me.grpSkewness.Margin = New System.Windows.Forms.Padding(4) + Me.grpSkewness.Name = "grpSkewness" + Me.grpSkewness.Padding = New System.Windows.Forms.Padding(4) + Me.grpSkewness.Size = New System.Drawing.Size(590, 74) + Me.grpSkewness.TabIndex = 2 + Me.grpSkewness.TabStop = False + Me.grpSkewness.Text = "Skewness" ' - Me.ucrChkCoefPersistence.AutoSize = True - Me.ucrChkCoefPersistence.Checked = False - Me.ucrChkCoefPersistence.Location = New System.Drawing.Point(204, 95) - Me.ucrChkCoefPersistence.Margin = New System.Windows.Forms.Padding(5) - Me.ucrChkCoefPersistence.Name = "ucrChkCoefPersistence" - Me.ucrChkCoefPersistence.Size = New System.Drawing.Size(87, 23) - Me.ucrChkCoefPersistence.TabIndex = 14 + 'grpKurtosis ' - 'ucrChkNashSutcliffeEfficiency + Me.grpKurtosis.Controls.Add(Me.ucrChkKurtosis) + Me.grpKurtosis.Location = New System.Drawing.Point(15, 467) + Me.grpKurtosis.Margin = New System.Windows.Forms.Padding(4) + Me.grpKurtosis.Name = "grpKurtosis" + Me.grpKurtosis.Padding = New System.Windows.Forms.Padding(4) + Me.grpKurtosis.Size = New System.Drawing.Size(590, 62) + Me.grpKurtosis.TabIndex = 3 + Me.grpKurtosis.TabStop = False + Me.grpKurtosis.Text = "Kurtosis" ' - Me.ucrChkNashSutcliffeEfficiency.AutoSize = True - Me.ucrChkNashSutcliffeEfficiency.Checked = False - Me.ucrChkNashSutcliffeEfficiency.Location = New System.Drawing.Point(94, 75) - Me.ucrChkNashSutcliffeEfficiency.Margin = New System.Windows.Forms.Padding(5) - Me.ucrChkNashSutcliffeEfficiency.Name = "ucrChkNashSutcliffeEfficiency" - Me.ucrChkNashSutcliffeEfficiency.Size = New System.Drawing.Size(87, 23) - Me.ucrChkNashSutcliffeEfficiency.TabIndex = 8 + 'cmdOptions ' - 'ucrChkSumOfSquaredResiduals + Me.cmdOptions.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.cmdOptions.Location = New System.Drawing.Point(471, 20) + Me.cmdOptions.Margin = New System.Windows.Forms.Padding(4) + Me.cmdOptions.Name = "cmdOptions" + Me.cmdOptions.Size = New System.Drawing.Size(111, 34) + Me.cmdOptions.TabIndex = 10 + Me.cmdOptions.Tag = "Options" + Me.cmdOptions.Text = "Options" + Me.cmdOptions.UseVisualStyleBackColor = True ' - Me.ucrChkSumOfSquaredResiduals.AutoSize = True - Me.ucrChkSumOfSquaredResiduals.Checked = False - Me.ucrChkSumOfSquaredResiduals.Location = New System.Drawing.Point(306, 100) - Me.ucrChkSumOfSquaredResiduals.Margin = New System.Windows.Forms.Padding(5) - Me.ucrChkSumOfSquaredResiduals.Name = "ucrChkSumOfSquaredResiduals" - Me.ucrChkSumOfSquaredResiduals.Size = New System.Drawing.Size(87, 23) - Me.ucrChkSumOfSquaredResiduals.TabIndex = 19 + 'tbsum ' - 'ucrChkKlingGuptaEfficiency + Me.tbsum.Controls.Add(Me.grpDecilesQuintiles) + Me.tbsum.Controls.Add(Me.grpCommon) + Me.tbsum.Controls.Add(Me.grpQuartilesTerciles) + Me.tbsum.Controls.Add(Me.grpNotOrderedFactor) + Me.tbsum.Controls.Add(Me.grpNumeric) + Me.tbsum.Location = New System.Drawing.Point(4, 29) + Me.tbsum.Margin = New System.Windows.Forms.Padding(4) + Me.tbsum.Name = "tbsum" + Me.tbsum.Padding = New System.Windows.Forms.Padding(4) + Me.tbsum.Size = New System.Drawing.Size(618, 581) + Me.tbsum.TabIndex = 0 + Me.tbsum.Text = "Summaries" + Me.tbsum.UseVisualStyleBackColor = True ' - Me.ucrChkKlingGuptaEfficiency.AutoSize = True - Me.ucrChkKlingGuptaEfficiency.Checked = False - Me.ucrChkKlingGuptaEfficiency.Location = New System.Drawing.Point(306, 38) - Me.ucrChkKlingGuptaEfficiency.Margin = New System.Windows.Forms.Padding(5) - Me.ucrChkKlingGuptaEfficiency.Name = "ucrChkKlingGuptaEfficiency" - Me.ucrChkKlingGuptaEfficiency.Size = New System.Drawing.Size(87, 23) - Me.ucrChkKlingGuptaEfficiency.TabIndex = 16 + 'grpDecilesQuintiles ' - 'ucrChkVolumetricEfficiency + Me.grpDecilesQuintiles.Controls.Add(Me.ucrChkP60) + Me.grpDecilesQuintiles.Controls.Add(Me.ucrChkP90) + Me.grpDecilesQuintiles.Controls.Add(Me.ucrChkP70) + Me.grpDecilesQuintiles.Controls.Add(Me.ucrChkP80) + Me.grpDecilesQuintiles.Controls.Add(Me.ucrChkP40) + Me.grpDecilesQuintiles.Controls.Add(Me.ucrChkP30) + Me.grpDecilesQuintiles.Controls.Add(Me.ucrChkP10) + Me.grpDecilesQuintiles.Controls.Add(Me.ucrChkP20) + Me.grpDecilesQuintiles.Location = New System.Drawing.Point(15, 434) + Me.grpDecilesQuintiles.Margin = New System.Windows.Forms.Padding(4) + Me.grpDecilesQuintiles.Name = "grpDecilesQuintiles" + Me.grpDecilesQuintiles.Padding = New System.Windows.Forms.Padding(4) + Me.grpDecilesQuintiles.Size = New System.Drawing.Size(590, 130) + Me.grpDecilesQuintiles.TabIndex = 4 + Me.grpDecilesQuintiles.TabStop = False + Me.grpDecilesQuintiles.Tag = "" + Me.grpDecilesQuintiles.Text = "Deciles && Quintiles" ' - Me.ucrChkVolumetricEfficiency.AutoSize = True - Me.ucrChkVolumetricEfficiency.Checked = False - Me.ucrChkVolumetricEfficiency.Location = New System.Drawing.Point(306, 58) - Me.ucrChkVolumetricEfficiency.Margin = New System.Windows.Forms.Padding(5) - Me.ucrChkVolumetricEfficiency.Name = "ucrChkVolumetricEfficiency" - Me.ucrChkVolumetricEfficiency.Size = New System.Drawing.Size(87, 23) - Me.ucrChkVolumetricEfficiency.TabIndex = 17 + 'grpCommon ' - 'ucrChkPercentBias + Me.grpCommon.Controls.Add(Me.ucrChkn_distinct) + Me.grpCommon.Controls.Add(Me.ucrChkNTotal) + Me.grpCommon.Controls.Add(Me.ucrChkMode) + Me.grpCommon.Controls.Add(Me.ucrChkNMissing) + Me.grpCommon.Controls.Add(Me.ucrChkNonMissing) + Me.grpCommon.Location = New System.Drawing.Point(15, 9) + Me.grpCommon.Margin = New System.Windows.Forms.Padding(4) + Me.grpCommon.Name = "grpCommon" + Me.grpCommon.Padding = New System.Windows.Forms.Padding(4) + Me.grpCommon.Size = New System.Drawing.Size(590, 120) + Me.grpCommon.TabIndex = 0 + Me.grpCommon.TabStop = False + Me.grpCommon.Tag = "Common" + Me.grpCommon.Text = "Common" ' - Me.ucrChkPercentBias.AutoSize = True - Me.ucrChkPercentBias.Checked = False - Me.ucrChkPercentBias.Location = New System.Drawing.Point(8, 116) - Me.ucrChkPercentBias.Margin = New System.Windows.Forms.Padding(5) - Me.ucrChkPercentBias.Name = "ucrChkPercentBias" - Me.ucrChkPercentBias.Size = New System.Drawing.Size(87, 23) - Me.ucrChkPercentBias.TabIndex = 5 + 'grpQuartilesTerciles ' - 'ucrChkModNashSutcliffeEff + Me.grpQuartilesTerciles.Controls.Add(Me.ucrChkP67) + Me.grpQuartilesTerciles.Controls.Add(Me.ucrChkP33) + Me.grpQuartilesTerciles.Controls.Add(Me.ucrChkP25) + Me.grpQuartilesTerciles.Controls.Add(Me.ucrChkP75) + Me.grpQuartilesTerciles.Location = New System.Drawing.Point(15, 345) + Me.grpQuartilesTerciles.Margin = New System.Windows.Forms.Padding(4) + Me.grpQuartilesTerciles.Name = "grpQuartilesTerciles" + Me.grpQuartilesTerciles.Padding = New System.Windows.Forms.Padding(4) + Me.grpQuartilesTerciles.Size = New System.Drawing.Size(590, 84) + Me.grpQuartilesTerciles.TabIndex = 3 + Me.grpQuartilesTerciles.TabStop = False + Me.grpQuartilesTerciles.Tag = "Quartiles" + Me.grpQuartilesTerciles.Text = "Quartiles && Terciles" ' - Me.ucrChkModNashSutcliffeEff.AutoSize = True - Me.ucrChkModNashSutcliffeEff.Checked = False - Me.ucrChkModNashSutcliffeEff.Location = New System.Drawing.Point(94, 95) - Me.ucrChkModNashSutcliffeEff.Margin = New System.Windows.Forms.Padding(5) - Me.ucrChkModNashSutcliffeEff.Name = "ucrChkModNashSutcliffeEff" - Me.ucrChkModNashSutcliffeEff.Size = New System.Drawing.Size(87, 23) - Me.ucrChkModNashSutcliffeEff.TabIndex = 9 + 'grpNotOrderedFactor ' - 'ucrChkMeanError + Me.grpNotOrderedFactor.Controls.Add(Me.ucrChkRange) + Me.grpNotOrderedFactor.Controls.Add(Me.ucrChkMaximum) + Me.grpNotOrderedFactor.Controls.Add(Me.ucrChkMinimum) + Me.grpNotOrderedFactor.Location = New System.Drawing.Point(15, 138) + Me.grpNotOrderedFactor.Margin = New System.Windows.Forms.Padding(4) + Me.grpNotOrderedFactor.Name = "grpNotOrderedFactor" + Me.grpNotOrderedFactor.Padding = New System.Windows.Forms.Padding(4) + Me.grpNotOrderedFactor.Size = New System.Drawing.Size(590, 76) + Me.grpNotOrderedFactor.TabIndex = 1 + Me.grpNotOrderedFactor.TabStop = False + Me.grpNotOrderedFactor.Tag = "All_but_unordered_Factor" + Me.grpNotOrderedFactor.Text = "All but (unordered) Factor" ' - Me.ucrChkMeanError.AutoSize = True - Me.ucrChkMeanError.Checked = False - Me.ucrChkMeanError.Location = New System.Drawing.Point(8, 34) - Me.ucrChkMeanError.Margin = New System.Windows.Forms.Padding(5) - Me.ucrChkMeanError.Name = "ucrChkMeanError" - Me.ucrChkMeanError.Size = New System.Drawing.Size(87, 23) - Me.ucrChkMeanError.TabIndex = 1 + 'grpNumeric ' - 'ucrChkMeanSquaredError + Me.grpNumeric.Controls.Add(Me.ucrChkVariance) + Me.grpNumeric.Controls.Add(Me.ucrChkMedian) + Me.grpNumeric.Controls.Add(Me.ucrChkStdDev) + Me.grpNumeric.Controls.Add(Me.ucrChkSum) + Me.grpNumeric.Controls.Add(Me.ucrChkMean) + Me.grpNumeric.Location = New System.Drawing.Point(15, 224) + Me.grpNumeric.Margin = New System.Windows.Forms.Padding(4) + Me.grpNumeric.Name = "grpNumeric" + Me.grpNumeric.Padding = New System.Windows.Forms.Padding(4) + Me.grpNumeric.Size = New System.Drawing.Size(590, 117) + Me.grpNumeric.TabIndex = 2 + Me.grpNumeric.TabStop = False + Me.grpNumeric.Tag = "Numeric" + Me.grpNumeric.Text = "Numeric" ' - Me.ucrChkMeanSquaredError.AutoSize = True - Me.ucrChkMeanSquaredError.Checked = False - Me.ucrChkMeanSquaredError.Location = New System.Drawing.Point(306, 79) - Me.ucrChkMeanSquaredError.Margin = New System.Windows.Forms.Padding(5) - Me.ucrChkMeanSquaredError.Name = "ucrChkMeanSquaredError" - Me.ucrChkMeanSquaredError.Size = New System.Drawing.Size(87, 23) - Me.ucrChkMeanSquaredError.TabIndex = 18 + 'tbSummaries ' - 'ucrChkRootMeanSquaredError + Me.tbSummaries.Controls.Add(Me.tbsum) + Me.tbSummaries.Controls.Add(Me.tbMore) + Me.tbSummaries.Controls.Add(Me.tbTwoVariables) + Me.tbSummaries.Controls.Add(Me.tbPosition) + Me.tbSummaries.Controls.Add(Me.tbModel) + Me.tbSummaries.Controls.Add(Me.tbCircular) + Me.tbSummaries.Location = New System.Drawing.Point(9, 10) + Me.tbSummaries.Margin = New System.Windows.Forms.Padding(4) + Me.tbSummaries.Name = "tbSummaries" + Me.tbSummaries.SelectedIndex = 0 + Me.tbSummaries.Size = New System.Drawing.Size(626, 634) + Me.tbSummaries.TabIndex = 0 ' - Me.ucrChkRootMeanSquaredError.AutoSize = True - Me.ucrChkRootMeanSquaredError.Checked = False - Me.ucrChkRootMeanSquaredError.Location = New System.Drawing.Point(8, 74) - Me.ucrChkRootMeanSquaredError.Margin = New System.Windows.Forms.Padding(5) - Me.ucrChkRootMeanSquaredError.Name = "ucrChkRootMeanSquaredError" - Me.ucrChkRootMeanSquaredError.Size = New System.Drawing.Size(87, 23) - Me.ucrChkRootMeanSquaredError.TabIndex = 3 + 'ucrButtonsSummaries ' - 'cmdHelp + Me.ucrButtonsSummaries.AutoSize = True + Me.ucrButtonsSummaries.Location = New System.Drawing.Point(153, 645) + Me.ucrButtonsSummaries.Margin = New System.Windows.Forms.Padding(6) + Me.ucrButtonsSummaries.Name = "ucrButtonsSummaries" + Me.ucrButtonsSummaries.Size = New System.Drawing.Size(336, 46) + Me.ucrButtonsSummaries.TabIndex = 1 ' - Me.cmdHelp.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdHelp.Location = New System.Drawing.Point(331, 120) - Me.cmdHelp.Name = "cmdHelp" - Me.cmdHelp.Size = New System.Drawing.Size(68, 23) - Me.cmdHelp.TabIndex = 22 - Me.cmdHelp.Text = "Help" - Me.cmdHelp.UseVisualStyleBackColor = True + 'ucrChkP60 ' - 'ucrChkNormRootMeanSquaredError + Me.ucrChkP60.AutoSize = True + Me.ucrChkP60.Checked = False + Me.ucrChkP60.Location = New System.Drawing.Point(10, 76) + Me.ucrChkP60.Margin = New System.Windows.Forms.Padding(8) + Me.ucrChkP60.Name = "ucrChkP60" + Me.ucrChkP60.Size = New System.Drawing.Size(128, 51) + Me.ucrChkP60.TabIndex = 7 ' - Me.ucrChkNormRootMeanSquaredError.AutoSize = True - Me.ucrChkNormRootMeanSquaredError.Checked = False - Me.ucrChkNormRootMeanSquaredError.Location = New System.Drawing.Point(8, 95) - Me.ucrChkNormRootMeanSquaredError.Margin = New System.Windows.Forms.Padding(5) - Me.ucrChkNormRootMeanSquaredError.Name = "ucrChkNormRootMeanSquaredError" - Me.ucrChkNormRootMeanSquaredError.Size = New System.Drawing.Size(87, 23) - Me.ucrChkNormRootMeanSquaredError.TabIndex = 4 + 'ucrChkP90 ' - 'ucrChkMeanAbsoluteError + Me.ucrChkP90.AutoSize = True + Me.ucrChkP90.Checked = False + Me.ucrChkP90.Location = New System.Drawing.Point(438, 76) + Me.ucrChkP90.Margin = New System.Windows.Forms.Padding(8) + Me.ucrChkP90.Name = "ucrChkP90" + Me.ucrChkP90.Size = New System.Drawing.Size(128, 51) + Me.ucrChkP90.TabIndex = 6 ' - Me.ucrChkMeanAbsoluteError.AutoSize = True - Me.ucrChkMeanAbsoluteError.Checked = False - Me.ucrChkMeanAbsoluteError.Location = New System.Drawing.Point(8, 54) - Me.ucrChkMeanAbsoluteError.Margin = New System.Windows.Forms.Padding(5) - Me.ucrChkMeanAbsoluteError.Name = "ucrChkMeanAbsoluteError" - Me.ucrChkMeanAbsoluteError.Size = New System.Drawing.Size(87, 23) - Me.ucrChkMeanAbsoluteError.TabIndex = 2 + 'ucrChkP70 ' - 'ucrChkIndexOfAgreement + Me.ucrChkP70.AutoSize = True + Me.ucrChkP70.Checked = False + Me.ucrChkP70.Location = New System.Drawing.Point(144, 76) + Me.ucrChkP70.Margin = New System.Windows.Forms.Padding(8) + Me.ucrChkP70.Name = "ucrChkP70" + Me.ucrChkP70.Size = New System.Drawing.Size(99, 51) + Me.ucrChkP70.TabIndex = 5 ' - Me.ucrChkIndexOfAgreement.AutoSize = True - Me.ucrChkIndexOfAgreement.Checked = False - Me.ucrChkIndexOfAgreement.Location = New System.Drawing.Point(204, 57) - Me.ucrChkIndexOfAgreement.Margin = New System.Windows.Forms.Padding(5) - Me.ucrChkIndexOfAgreement.Name = "ucrChkIndexOfAgreement" - Me.ucrChkIndexOfAgreement.Size = New System.Drawing.Size(87, 23) - Me.ucrChkIndexOfAgreement.TabIndex = 12 + 'ucrChkP80 ' - 'ucrReceiverSecondVariable + Me.ucrChkP80.AutoSize = True + Me.ucrChkP80.Checked = False + Me.ucrChkP80.Location = New System.Drawing.Point(252, 76) + Me.ucrChkP80.Margin = New System.Windows.Forms.Padding(8) + Me.ucrChkP80.Name = "ucrChkP80" + Me.ucrChkP80.Size = New System.Drawing.Size(128, 51) + Me.ucrChkP80.TabIndex = 4 ' - Me.ucrReceiverSecondVariable.AutoSize = True - Me.ucrReceiverSecondVariable.frmParent = Nothing - Me.ucrReceiverSecondVariable.Location = New System.Drawing.Point(266, 223) - Me.ucrReceiverSecondVariable.Margin = New System.Windows.Forms.Padding(0) - Me.ucrReceiverSecondVariable.Name = "ucrReceiverSecondVariable" - Me.ucrReceiverSecondVariable.Selector = Nothing - Me.ucrReceiverSecondVariable.Size = New System.Drawing.Size(120, 20) - Me.ucrReceiverSecondVariable.strNcFilePath = "" - Me.ucrReceiverSecondVariable.TabIndex = 4 - Me.ucrReceiverSecondVariable.ucrSelector = Nothing + 'ucrChkP40 ' - 'ucrSelectorSecondVariable + Me.ucrChkP40.AutoSize = True + Me.ucrChkP40.Checked = False + Me.ucrChkP40.Location = New System.Drawing.Point(438, 32) + Me.ucrChkP40.Margin = New System.Windows.Forms.Padding(8) + Me.ucrChkP40.Name = "ucrChkP40" + Me.ucrChkP40.Size = New System.Drawing.Size(128, 51) + Me.ucrChkP40.TabIndex = 3 ' - Me.ucrSelectorSecondVariable.AutoSize = True - Me.ucrSelectorSecondVariable.bDropUnusedFilterLevels = False - Me.ucrSelectorSecondVariable.bShowHiddenColumns = False - Me.ucrSelectorSecondVariable.bUseCurrentFilter = True - Me.ucrSelectorSecondVariable.Location = New System.Drawing.Point(8, 193) - Me.ucrSelectorSecondVariable.Margin = New System.Windows.Forms.Padding(0) - Me.ucrSelectorSecondVariable.Name = "ucrSelectorSecondVariable" - Me.ucrSelectorSecondVariable.Size = New System.Drawing.Size(213, 188) - Me.ucrSelectorSecondVariable.TabIndex = 2 + 'ucrChkP30 ' - 'tbMore + Me.ucrChkP30.AutoSize = True + Me.ucrChkP30.Checked = False + Me.ucrChkP30.Location = New System.Drawing.Point(252, 32) + Me.ucrChkP30.Margin = New System.Windows.Forms.Padding(8) + Me.ucrChkP30.Name = "ucrChkP30" + Me.ucrChkP30.Size = New System.Drawing.Size(128, 51) + Me.ucrChkP30.TabIndex = 2 ' - Me.tbMore.Controls.Add(Me.grpProportionsPercentiles) - Me.tbMore.Controls.Add(Me.grpLocation) - Me.tbMore.Controls.Add(Me.grpScale) - Me.tbMore.Controls.Add(Me.grpSkewness) - Me.tbMore.Controls.Add(Me.grpKurtosis) - Me.tbMore.Location = New System.Drawing.Point(4, 22) - Me.tbMore.Name = "tbMore" - Me.tbMore.Padding = New System.Windows.Forms.Padding(3) - Me.tbMore.Size = New System.Drawing.Size(409, 383) - Me.tbMore.TabIndex = 1 - Me.tbMore.Text = "More" - Me.tbMore.UseVisualStyleBackColor = True + 'ucrChkP10 ' - 'grpProportionsPercentiles + Me.ucrChkP10.AutoSize = True + Me.ucrChkP10.Checked = False + Me.ucrChkP10.Location = New System.Drawing.Point(10, 32) + Me.ucrChkP10.Margin = New System.Windows.Forms.Padding(8) + Me.ucrChkP10.Name = "ucrChkP10" + Me.ucrChkP10.Size = New System.Drawing.Size(128, 51) + Me.ucrChkP10.TabIndex = 0 ' - Me.grpProportionsPercentiles.Controls.Add(Me.ucrInputQuantile) - Me.grpProportionsPercentiles.Controls.Add(Me.ucrChkQuantile) - Me.grpProportionsPercentiles.Controls.Add(Me.ucrInputCountValue) - Me.grpProportionsPercentiles.Controls.Add(Me.ucrInputComboCountTest) - Me.grpProportionsPercentiles.Controls.Add(Me.ucrChkProportion) - Me.grpProportionsPercentiles.Controls.Add(Me.ucrChkCount) - Me.grpProportionsPercentiles.Controls.Add(Me.ucrChkPercentage) - Me.grpProportionsPercentiles.Controls.Add(Me.ucrInputPropValue) - Me.grpProportionsPercentiles.Controls.Add(Me.ucrInputComboPropTest) - Me.grpProportionsPercentiles.Controls.Add(Me.ucrInputPercentile) - Me.grpProportionsPercentiles.Controls.Add(Me.ucrChkPercentile) - Me.grpProportionsPercentiles.Location = New System.Drawing.Point(10, 6) - Me.grpProportionsPercentiles.Name = "grpProportionsPercentiles" - Me.grpProportionsPercentiles.Size = New System.Drawing.Size(393, 122) - Me.grpProportionsPercentiles.TabIndex = 0 - Me.grpProportionsPercentiles.TabStop = False - Me.grpProportionsPercentiles.Text = "Proportions/Percentiles/Count" + 'ucrChkP20 + ' + Me.ucrChkP20.AutoSize = True + Me.ucrChkP20.Checked = False + Me.ucrChkP20.Location = New System.Drawing.Point(144, 32) + Me.ucrChkP20.Margin = New System.Windows.Forms.Padding(8) + Me.ucrChkP20.Name = "ucrChkP20" + Me.ucrChkP20.Size = New System.Drawing.Size(99, 51) + Me.ucrChkP20.TabIndex = 1 + ' + 'ucrChkn_distinct + ' + Me.ucrChkn_distinct.AutoSize = True + Me.ucrChkn_distinct.Checked = False + Me.ucrChkn_distinct.Location = New System.Drawing.Point(252, 74) + Me.ucrChkn_distinct.Margin = New System.Windows.Forms.Padding(8) + Me.ucrChkn_distinct.Name = "ucrChkn_distinct" + Me.ucrChkn_distinct.Size = New System.Drawing.Size(152, 51) + Me.ucrChkn_distinct.TabIndex = 3 + ' + 'ucrChkNTotal + ' + Me.ucrChkNTotal.AutoSize = True + Me.ucrChkNTotal.Checked = False + Me.ucrChkNTotal.Location = New System.Drawing.Point(252, 28) + Me.ucrChkNTotal.Margin = New System.Windows.Forms.Padding(8) + Me.ucrChkNTotal.Name = "ucrChkNTotal" + Me.ucrChkNTotal.Size = New System.Drawing.Size(150, 51) + Me.ucrChkNTotal.TabIndex = 2 + ' + 'ucrChkMode + ' + Me.ucrChkMode.AutoSize = True + Me.ucrChkMode.Checked = False + Me.ucrChkMode.Location = New System.Drawing.Point(10, 74) + Me.ucrChkMode.Margin = New System.Windows.Forms.Padding(8) + Me.ucrChkMode.Name = "ucrChkMode" + Me.ucrChkMode.Size = New System.Drawing.Size(150, 51) + Me.ucrChkMode.TabIndex = 1 + ' + 'ucrChkNMissing + ' + Me.ucrChkNMissing.AutoSize = True + Me.ucrChkNMissing.Checked = False + Me.ucrChkNMissing.Location = New System.Drawing.Point(438, 28) + Me.ucrChkNMissing.Margin = New System.Windows.Forms.Padding(8) + Me.ucrChkNMissing.Name = "ucrChkNMissing" + Me.ucrChkNMissing.Size = New System.Drawing.Size(128, 51) + Me.ucrChkNMissing.TabIndex = 4 + ' + 'ucrChkNonMissing + ' + Me.ucrChkNonMissing.AutoSize = True + Me.ucrChkNonMissing.Checked = False + Me.ucrChkNonMissing.Location = New System.Drawing.Point(10, 28) + Me.ucrChkNonMissing.Margin = New System.Windows.Forms.Padding(8) + Me.ucrChkNonMissing.Name = "ucrChkNonMissing" + Me.ucrChkNonMissing.Size = New System.Drawing.Size(194, 51) + Me.ucrChkNonMissing.TabIndex = 0 + ' + 'ucrChkP67 + ' + Me.ucrChkP67.AutoSize = True + Me.ucrChkP67.Checked = False + Me.ucrChkP67.Location = New System.Drawing.Point(252, 28) + Me.ucrChkP67.Margin = New System.Windows.Forms.Padding(8) + Me.ucrChkP67.Name = "ucrChkP67" + Me.ucrChkP67.Size = New System.Drawing.Size(128, 51) + Me.ucrChkP67.TabIndex = 3 + ' + 'ucrChkP33 + ' + Me.ucrChkP33.AutoSize = True + Me.ucrChkP33.Checked = False + Me.ucrChkP33.Location = New System.Drawing.Point(144, 28) + Me.ucrChkP33.Margin = New System.Windows.Forms.Padding(8) + Me.ucrChkP33.Name = "ucrChkP33" + Me.ucrChkP33.Size = New System.Drawing.Size(99, 51) + Me.ucrChkP33.TabIndex = 2 + ' + 'ucrChkP25 + ' + Me.ucrChkP25.AutoSize = True + Me.ucrChkP25.Checked = False + Me.ucrChkP25.Location = New System.Drawing.Point(10, 28) + Me.ucrChkP25.Margin = New System.Windows.Forms.Padding(8) + Me.ucrChkP25.Name = "ucrChkP25" + Me.ucrChkP25.Size = New System.Drawing.Size(128, 51) + Me.ucrChkP25.TabIndex = 0 + ' + 'ucrChkP75 + ' + Me.ucrChkP75.AutoSize = True + Me.ucrChkP75.Checked = False + Me.ucrChkP75.Location = New System.Drawing.Point(438, 28) + Me.ucrChkP75.Margin = New System.Windows.Forms.Padding(8) + Me.ucrChkP75.Name = "ucrChkP75" + Me.ucrChkP75.Size = New System.Drawing.Size(128, 51) + Me.ucrChkP75.TabIndex = 1 + ' + 'ucrChkRange + ' + Me.ucrChkRange.AutoSize = True + Me.ucrChkRange.Checked = False + Me.ucrChkRange.Location = New System.Drawing.Point(438, 28) + Me.ucrChkRange.Margin = New System.Windows.Forms.Padding(8) + Me.ucrChkRange.Name = "ucrChkRange" + Me.ucrChkRange.Size = New System.Drawing.Size(128, 51) + Me.ucrChkRange.TabIndex = 1 + ' + 'ucrChkMaximum + ' + Me.ucrChkMaximum.AutoSize = True + Me.ucrChkMaximum.Checked = False + Me.ucrChkMaximum.Location = New System.Drawing.Point(252, 28) + Me.ucrChkMaximum.Margin = New System.Windows.Forms.Padding(8) + Me.ucrChkMaximum.Name = "ucrChkMaximum" + Me.ucrChkMaximum.Size = New System.Drawing.Size(150, 51) + Me.ucrChkMaximum.TabIndex = 2 + ' + 'ucrChkMinimum + ' + Me.ucrChkMinimum.AutoSize = True + Me.ucrChkMinimum.Checked = False + Me.ucrChkMinimum.Location = New System.Drawing.Point(10, 28) + Me.ucrChkMinimum.Margin = New System.Windows.Forms.Padding(8) + Me.ucrChkMinimum.Name = "ucrChkMinimum" + Me.ucrChkMinimum.Size = New System.Drawing.Size(150, 51) + Me.ucrChkMinimum.TabIndex = 0 + ' + 'ucrChkVariance + ' + Me.ucrChkVariance.AutoSize = True + Me.ucrChkVariance.Checked = False + Me.ucrChkVariance.Location = New System.Drawing.Point(252, 74) + Me.ucrChkVariance.Margin = New System.Windows.Forms.Padding(8) + Me.ucrChkVariance.Name = "ucrChkVariance" + Me.ucrChkVariance.Size = New System.Drawing.Size(236, 51) + Me.ucrChkVariance.TabIndex = 3 + ' + 'ucrChkMedian + ' + Me.ucrChkMedian.AutoSize = True + Me.ucrChkMedian.Checked = False + Me.ucrChkMedian.Location = New System.Drawing.Point(438, 28) + Me.ucrChkMedian.Margin = New System.Windows.Forms.Padding(8) + Me.ucrChkMedian.Name = "ucrChkMedian" + Me.ucrChkMedian.Size = New System.Drawing.Size(154, 51) + Me.ucrChkMedian.TabIndex = 4 + ' + 'ucrChkStdDev + ' + Me.ucrChkStdDev.AutoSize = True + Me.ucrChkStdDev.Checked = False + Me.ucrChkStdDev.Location = New System.Drawing.Point(10, 74) + Me.ucrChkStdDev.Margin = New System.Windows.Forms.Padding(8) + Me.ucrChkStdDev.Name = "ucrChkStdDev" + Me.ucrChkStdDev.Size = New System.Drawing.Size(232, 51) + Me.ucrChkStdDev.TabIndex = 1 + ' + 'ucrChkSum + ' + Me.ucrChkSum.AutoSize = True + Me.ucrChkSum.Checked = False + Me.ucrChkSum.Location = New System.Drawing.Point(10, 28) + Me.ucrChkSum.Margin = New System.Windows.Forms.Padding(8) + Me.ucrChkSum.Name = "ucrChkSum" + Me.ucrChkSum.Size = New System.Drawing.Size(150, 51) + Me.ucrChkSum.TabIndex = 0 + ' + 'ucrChkMean + ' + Me.ucrChkMean.AutoSize = True + Me.ucrChkMean.Checked = False + Me.ucrChkMean.Location = New System.Drawing.Point(252, 28) + Me.ucrChkMean.Margin = New System.Windows.Forms.Padding(8) + Me.ucrChkMean.Name = "ucrChkMean" + Me.ucrChkMean.Size = New System.Drawing.Size(150, 51) + Me.ucrChkMean.TabIndex = 2 ' 'ucrInputQuantile ' @@ -934,20 +896,20 @@ Partial Class sdgSummaries Me.ucrInputQuantile.AutoSize = True Me.ucrInputQuantile.IsMultiline = False Me.ucrInputQuantile.IsReadOnly = False - Me.ucrInputQuantile.Location = New System.Drawing.Point(119, 93) - Me.ucrInputQuantile.Margin = New System.Windows.Forms.Padding(5) + Me.ucrInputQuantile.Location = New System.Drawing.Point(178, 140) + Me.ucrInputQuantile.Margin = New System.Windows.Forms.Padding(8) Me.ucrInputQuantile.Name = "ucrInputQuantile" - Me.ucrInputQuantile.Size = New System.Drawing.Size(52, 21) + Me.ucrInputQuantile.Size = New System.Drawing.Size(78, 32) Me.ucrInputQuantile.TabIndex = 10 ' 'ucrChkQuantile ' Me.ucrChkQuantile.AutoSize = True Me.ucrChkQuantile.Checked = False - Me.ucrChkQuantile.Location = New System.Drawing.Point(7, 96) - Me.ucrChkQuantile.Margin = New System.Windows.Forms.Padding(4) + Me.ucrChkQuantile.Location = New System.Drawing.Point(10, 144) + Me.ucrChkQuantile.Margin = New System.Windows.Forms.Padding(6, 6, 6, 6) Me.ucrChkQuantile.Name = "ucrChkQuantile" - Me.ucrChkQuantile.Size = New System.Drawing.Size(108, 23) + Me.ucrChkQuantile.Size = New System.Drawing.Size(162, 51) Me.ucrChkQuantile.TabIndex = 9 ' 'ucrInputCountValue @@ -956,10 +918,10 @@ Partial Class sdgSummaries Me.ucrInputCountValue.AutoSize = True Me.ucrInputCountValue.IsMultiline = False Me.ucrInputCountValue.IsReadOnly = False - Me.ucrInputCountValue.Location = New System.Drawing.Point(175, 68) - Me.ucrInputCountValue.Margin = New System.Windows.Forms.Padding(7, 6, 7, 6) + Me.ucrInputCountValue.Location = New System.Drawing.Point(262, 102) + Me.ucrInputCountValue.Margin = New System.Windows.Forms.Padding(10, 9, 10, 9) Me.ucrInputCountValue.Name = "ucrInputCountValue" - Me.ucrInputCountValue.Size = New System.Drawing.Size(51, 20) + Me.ucrInputCountValue.Size = New System.Drawing.Size(76, 30) Me.ucrInputCountValue.TabIndex = 8 ' 'ucrInputComboCountTest @@ -969,40 +931,40 @@ Partial Class sdgSummaries Me.ucrInputComboCountTest.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink Me.ucrInputComboCountTest.GetSetSelectedIndex = -1 Me.ucrInputComboCountTest.IsReadOnly = False - Me.ucrInputComboCountTest.Location = New System.Drawing.Point(119, 68) - Me.ucrInputComboCountTest.Margin = New System.Windows.Forms.Padding(7, 6, 7, 6) + Me.ucrInputComboCountTest.Location = New System.Drawing.Point(178, 102) + Me.ucrInputComboCountTest.Margin = New System.Windows.Forms.Padding(10, 9, 10, 9) Me.ucrInputComboCountTest.Name = "ucrInputComboCountTest" - Me.ucrInputComboCountTest.Size = New System.Drawing.Size(51, 25) + Me.ucrInputComboCountTest.Size = New System.Drawing.Size(76, 38) Me.ucrInputComboCountTest.TabIndex = 7 ' 'ucrChkProportion ' Me.ucrChkProportion.AutoSize = True Me.ucrChkProportion.Checked = False - Me.ucrChkProportion.Location = New System.Drawing.Point(7, 45) - Me.ucrChkProportion.Margin = New System.Windows.Forms.Padding(5) + Me.ucrChkProportion.Location = New System.Drawing.Point(10, 68) + Me.ucrChkProportion.Margin = New System.Windows.Forms.Padding(8) Me.ucrChkProportion.Name = "ucrChkProportion" - Me.ucrChkProportion.Size = New System.Drawing.Size(108, 23) + Me.ucrChkProportion.Size = New System.Drawing.Size(162, 51) Me.ucrChkProportion.TabIndex = 2 ' 'ucrChkCount ' Me.ucrChkCount.AutoSize = True Me.ucrChkCount.Checked = False - Me.ucrChkCount.Location = New System.Drawing.Point(7, 71) - Me.ucrChkCount.Margin = New System.Windows.Forms.Padding(5) + Me.ucrChkCount.Location = New System.Drawing.Point(10, 106) + Me.ucrChkCount.Margin = New System.Windows.Forms.Padding(8) Me.ucrChkCount.Name = "ucrChkCount" - Me.ucrChkCount.Size = New System.Drawing.Size(108, 23) + Me.ucrChkCount.Size = New System.Drawing.Size(162, 51) Me.ucrChkCount.TabIndex = 6 ' 'ucrChkPercentage ' Me.ucrChkPercentage.AutoSize = True Me.ucrChkPercentage.Checked = False - Me.ucrChkPercentage.Location = New System.Drawing.Point(238, 45) - Me.ucrChkPercentage.Margin = New System.Windows.Forms.Padding(5) + Me.ucrChkPercentage.Location = New System.Drawing.Point(357, 68) + Me.ucrChkPercentage.Margin = New System.Windows.Forms.Padding(8) Me.ucrChkPercentage.Name = "ucrChkPercentage" - Me.ucrChkPercentage.Size = New System.Drawing.Size(101, 23) + Me.ucrChkPercentage.Size = New System.Drawing.Size(152, 51) Me.ucrChkPercentage.TabIndex = 5 ' 'ucrInputPropValue @@ -1011,10 +973,10 @@ Partial Class sdgSummaries Me.ucrInputPropValue.AutoSize = True Me.ucrInputPropValue.IsMultiline = False Me.ucrInputPropValue.IsReadOnly = False - Me.ucrInputPropValue.Location = New System.Drawing.Point(175, 43) - Me.ucrInputPropValue.Margin = New System.Windows.Forms.Padding(7, 6, 7, 6) + Me.ucrInputPropValue.Location = New System.Drawing.Point(262, 64) + Me.ucrInputPropValue.Margin = New System.Windows.Forms.Padding(10, 9, 10, 9) Me.ucrInputPropValue.Name = "ucrInputPropValue" - Me.ucrInputPropValue.Size = New System.Drawing.Size(51, 20) + Me.ucrInputPropValue.Size = New System.Drawing.Size(76, 30) Me.ucrInputPropValue.TabIndex = 4 ' 'ucrInputComboPropTest @@ -1024,10 +986,10 @@ Partial Class sdgSummaries Me.ucrInputComboPropTest.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink Me.ucrInputComboPropTest.GetSetSelectedIndex = -1 Me.ucrInputComboPropTest.IsReadOnly = False - Me.ucrInputComboPropTest.Location = New System.Drawing.Point(119, 43) - Me.ucrInputComboPropTest.Margin = New System.Windows.Forms.Padding(7, 6, 7, 6) + Me.ucrInputComboPropTest.Location = New System.Drawing.Point(178, 64) + Me.ucrInputComboPropTest.Margin = New System.Windows.Forms.Padding(10, 9, 10, 9) Me.ucrInputComboPropTest.Name = "ucrInputComboPropTest" - Me.ucrInputComboPropTest.Size = New System.Drawing.Size(51, 25) + Me.ucrInputComboPropTest.Size = New System.Drawing.Size(76, 38) Me.ucrInputComboPropTest.TabIndex = 3 ' 'ucrInputPercentile @@ -1036,55 +998,33 @@ Partial Class sdgSummaries Me.ucrInputPercentile.AutoSize = True Me.ucrInputPercentile.IsMultiline = False Me.ucrInputPercentile.IsReadOnly = False - Me.ucrInputPercentile.Location = New System.Drawing.Point(119, 19) - Me.ucrInputPercentile.Margin = New System.Windows.Forms.Padding(7, 6, 7, 6) + Me.ucrInputPercentile.Location = New System.Drawing.Point(178, 28) + Me.ucrInputPercentile.Margin = New System.Windows.Forms.Padding(10, 9, 10, 9) Me.ucrInputPercentile.Name = "ucrInputPercentile" - Me.ucrInputPercentile.Size = New System.Drawing.Size(51, 20) + Me.ucrInputPercentile.Size = New System.Drawing.Size(76, 30) Me.ucrInputPercentile.TabIndex = 1 ' 'ucrChkPercentile ' Me.ucrChkPercentile.AutoSize = True Me.ucrChkPercentile.Checked = False - Me.ucrChkPercentile.Location = New System.Drawing.Point(7, 19) - Me.ucrChkPercentile.Margin = New System.Windows.Forms.Padding(5) + Me.ucrChkPercentile.Location = New System.Drawing.Point(10, 28) + Me.ucrChkPercentile.Margin = New System.Windows.Forms.Padding(8) Me.ucrChkPercentile.Name = "ucrChkPercentile" - Me.ucrChkPercentile.Size = New System.Drawing.Size(108, 23) + Me.ucrChkPercentile.Size = New System.Drawing.Size(162, 51) Me.ucrChkPercentile.TabIndex = 0 ' - 'grpLocation - ' - Me.grpLocation.Controls.Add(Me.lblFractionTrimmed) - Me.grpLocation.Controls.Add(Me.ucrNudFraction) - Me.grpLocation.Controls.Add(Me.ucrChkTrimmedMean) - Me.grpLocation.Location = New System.Drawing.Point(10, 134) - Me.grpLocation.Name = "grpLocation" - Me.grpLocation.Size = New System.Drawing.Size(393, 52) - Me.grpLocation.TabIndex = 0 - Me.grpLocation.TabStop = False - Me.grpLocation.Text = "Location" - ' - 'lblFractionTrimmed - ' - Me.lblFractionTrimmed.AutoSize = True - Me.lblFractionTrimmed.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblFractionTrimmed.Location = New System.Drawing.Point(208, 21) - Me.lblFractionTrimmed.Name = "lblFractionTrimmed" - Me.lblFractionTrimmed.Size = New System.Drawing.Size(91, 13) - Me.lblFractionTrimmed.TabIndex = 1 - Me.lblFractionTrimmed.Text = "Fraction Trimmed:" - ' 'ucrNudFraction ' Me.ucrNudFraction.AutoSize = True Me.ucrNudFraction.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudFraction.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudFraction.Location = New System.Drawing.Point(303, 18) - Me.ucrNudFraction.Margin = New System.Windows.Forms.Padding(5) + Me.ucrNudFraction.Location = New System.Drawing.Point(454, 27) + Me.ucrNudFraction.Margin = New System.Windows.Forms.Padding(8) Me.ucrNudFraction.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) Me.ucrNudFraction.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudFraction.Name = "ucrNudFraction" - Me.ucrNudFraction.Size = New System.Drawing.Size(50, 20) + Me.ucrNudFraction.Size = New System.Drawing.Size(75, 30) Me.ucrNudFraction.TabIndex = 2 Me.ucrNudFraction.Value = New Decimal(New Integer() {0, 0, 0, 0}) ' @@ -1092,488 +1032,623 @@ Partial Class sdgSummaries ' Me.ucrChkTrimmedMean.AutoSize = True Me.ucrChkTrimmedMean.Checked = False - Me.ucrChkTrimmedMean.Location = New System.Drawing.Point(7, 19) - Me.ucrChkTrimmedMean.Margin = New System.Windows.Forms.Padding(5) + Me.ucrChkTrimmedMean.Location = New System.Drawing.Point(10, 28) + Me.ucrChkTrimmedMean.Margin = New System.Windows.Forms.Padding(8) Me.ucrChkTrimmedMean.Name = "ucrChkTrimmedMean" - Me.ucrChkTrimmedMean.Size = New System.Drawing.Size(120, 23) + Me.ucrChkTrimmedMean.Size = New System.Drawing.Size(180, 51) Me.ucrChkTrimmedMean.TabIndex = 0 ' - 'grpScale - ' - Me.grpScale.Controls.Add(Me.ucrChkSn) - Me.grpScale.Controls.Add(Me.ucrChkQn) - Me.grpScale.Controls.Add(Me.ucrChkCoefficientOfVariation) - Me.grpScale.Controls.Add(Me.ucrChkMedianAbsoluteDeviation) - Me.grpScale.Location = New System.Drawing.Point(10, 193) - Me.grpScale.Name = "grpScale" - Me.grpScale.Size = New System.Drawing.Size(393, 74) - Me.grpScale.TabIndex = 1 - Me.grpScale.TabStop = False - Me.grpScale.Text = "Scale" - ' 'ucrChkSn ' Me.ucrChkSn.AutoSize = True Me.ucrChkSn.Checked = False - Me.ucrChkSn.Location = New System.Drawing.Point(208, 46) - Me.ucrChkSn.Margin = New System.Windows.Forms.Padding(5) + Me.ucrChkSn.Location = New System.Drawing.Point(312, 69) + Me.ucrChkSn.Margin = New System.Windows.Forms.Padding(8) Me.ucrChkSn.Name = "ucrChkSn" - Me.ucrChkSn.Size = New System.Drawing.Size(101, 23) + Me.ucrChkSn.Size = New System.Drawing.Size(152, 51) Me.ucrChkSn.TabIndex = 3 ' 'ucrChkQn ' Me.ucrChkQn.AutoSize = True Me.ucrChkQn.Checked = False - Me.ucrChkQn.Location = New System.Drawing.Point(208, 19) - Me.ucrChkQn.Margin = New System.Windows.Forms.Padding(5) + Me.ucrChkQn.Location = New System.Drawing.Point(312, 28) + Me.ucrChkQn.Margin = New System.Windows.Forms.Padding(8) Me.ucrChkQn.Name = "ucrChkQn" - Me.ucrChkQn.Size = New System.Drawing.Size(101, 23) + Me.ucrChkQn.Size = New System.Drawing.Size(152, 51) Me.ucrChkQn.TabIndex = 2 ' 'ucrChkCoefficientOfVariation ' Me.ucrChkCoefficientOfVariation.AutoSize = True Me.ucrChkCoefficientOfVariation.Checked = False - Me.ucrChkCoefficientOfVariation.Location = New System.Drawing.Point(7, 19) - Me.ucrChkCoefficientOfVariation.Margin = New System.Windows.Forms.Padding(5) + Me.ucrChkCoefficientOfVariation.Location = New System.Drawing.Point(10, 28) + Me.ucrChkCoefficientOfVariation.Margin = New System.Windows.Forms.Padding(8) Me.ucrChkCoefficientOfVariation.Name = "ucrChkCoefficientOfVariation" - Me.ucrChkCoefficientOfVariation.Size = New System.Drawing.Size(200, 23) + Me.ucrChkCoefficientOfVariation.Size = New System.Drawing.Size(300, 51) Me.ucrChkCoefficientOfVariation.TabIndex = 0 ' 'ucrChkMedianAbsoluteDeviation ' Me.ucrChkMedianAbsoluteDeviation.AutoSize = True Me.ucrChkMedianAbsoluteDeviation.Checked = False - Me.ucrChkMedianAbsoluteDeviation.Location = New System.Drawing.Point(7, 45) - Me.ucrChkMedianAbsoluteDeviation.Margin = New System.Windows.Forms.Padding(5) + Me.ucrChkMedianAbsoluteDeviation.Location = New System.Drawing.Point(10, 68) + Me.ucrChkMedianAbsoluteDeviation.Margin = New System.Windows.Forms.Padding(8) Me.ucrChkMedianAbsoluteDeviation.Name = "ucrChkMedianAbsoluteDeviation" - Me.ucrChkMedianAbsoluteDeviation.Size = New System.Drawing.Size(262, 23) - Me.ucrChkMedianAbsoluteDeviation.TabIndex = 1 - ' - 'grpSkewness - ' - Me.grpSkewness.Controls.Add(Me.ucrChkMc) - Me.grpSkewness.Controls.Add(Me.ucrChkSkewness) - Me.grpSkewness.Location = New System.Drawing.Point(10, 273) - Me.grpSkewness.Name = "grpSkewness" - Me.grpSkewness.Size = New System.Drawing.Size(393, 49) - Me.grpSkewness.TabIndex = 2 - Me.grpSkewness.TabStop = False - Me.grpSkewness.Text = "Skewness" + Me.ucrChkMedianAbsoluteDeviation.Size = New System.Drawing.Size(393, 51) + Me.ucrChkMedianAbsoluteDeviation.TabIndex = 1 ' 'ucrChkMc ' Me.ucrChkMc.AutoSize = True Me.ucrChkMc.Checked = False - Me.ucrChkMc.Location = New System.Drawing.Point(208, 19) - Me.ucrChkMc.Margin = New System.Windows.Forms.Padding(5) + Me.ucrChkMc.Location = New System.Drawing.Point(312, 28) + Me.ucrChkMc.Margin = New System.Windows.Forms.Padding(8) Me.ucrChkMc.Name = "ucrChkMc" - Me.ucrChkMc.Size = New System.Drawing.Size(101, 23) + Me.ucrChkMc.Size = New System.Drawing.Size(152, 51) Me.ucrChkMc.TabIndex = 1 ' 'ucrChkSkewness ' Me.ucrChkSkewness.AutoSize = True Me.ucrChkSkewness.Checked = False - Me.ucrChkSkewness.Location = New System.Drawing.Point(7, 19) - Me.ucrChkSkewness.Margin = New System.Windows.Forms.Padding(5) + Me.ucrChkSkewness.Location = New System.Drawing.Point(10, 28) + Me.ucrChkSkewness.Margin = New System.Windows.Forms.Padding(8) Me.ucrChkSkewness.Name = "ucrChkSkewness" - Me.ucrChkSkewness.Size = New System.Drawing.Size(254, 23) + Me.ucrChkSkewness.Size = New System.Drawing.Size(381, 51) Me.ucrChkSkewness.TabIndex = 0 ' - 'grpKurtosis + 'ucrChkProportionsPercentages ' - Me.grpKurtosis.Controls.Add(Me.ucrChkKurtosis) - Me.grpKurtosis.Location = New System.Drawing.Point(10, 329) - Me.grpKurtosis.Name = "grpKurtosis" - Me.grpKurtosis.Size = New System.Drawing.Size(393, 50) - Me.grpKurtosis.TabIndex = 3 - Me.grpKurtosis.TabStop = False - Me.grpKurtosis.Text = "Kurtosis" + Me.ucrChkProportionsPercentages.AutoSize = True + Me.ucrChkProportionsPercentages.Checked = False + Me.ucrChkProportionsPercentages.Location = New System.Drawing.Point(10, 19) + Me.ucrChkProportionsPercentages.Margin = New System.Windows.Forms.Padding(9) + Me.ucrChkProportionsPercentages.Name = "ucrChkProportionsPercentages" + Me.ucrChkProportionsPercentages.Size = New System.Drawing.Size(438, 34) + Me.ucrChkProportionsPercentages.TabIndex = 1 ' 'ucrChkKurtosis ' Me.ucrChkKurtosis.AutoSize = True Me.ucrChkKurtosis.Checked = False - Me.ucrChkKurtosis.Location = New System.Drawing.Point(7, 19) - Me.ucrChkKurtosis.Margin = New System.Windows.Forms.Padding(5) + Me.ucrChkKurtosis.Location = New System.Drawing.Point(10, 25) + Me.ucrChkKurtosis.Margin = New System.Windows.Forms.Padding(8) Me.ucrChkKurtosis.Name = "ucrChkKurtosis" - Me.ucrChkKurtosis.Size = New System.Drawing.Size(120, 23) + Me.ucrChkKurtosis.Size = New System.Drawing.Size(180, 34) Me.ucrChkKurtosis.TabIndex = 0 ' - 'tbsum + 'ucrChkCovariance ' - Me.tbsum.Controls.Add(Me.grpDecilesQuintiles) - Me.tbsum.Controls.Add(Me.grpCommon) - Me.tbsum.Controls.Add(Me.grpQuartilesTerciles) - Me.tbsum.Controls.Add(Me.grpNotOrderedFactor) - Me.tbsum.Controls.Add(Me.grpNumeric) - Me.tbsum.Location = New System.Drawing.Point(4, 22) - Me.tbsum.Name = "tbsum" - Me.tbsum.Padding = New System.Windows.Forms.Padding(3) - Me.tbsum.Size = New System.Drawing.Size(409, 383) - Me.tbsum.TabIndex = 0 - Me.tbsum.Text = "Summaries" - Me.tbsum.UseVisualStyleBackColor = True + Me.ucrChkCovariance.AutoSize = True + Me.ucrChkCovariance.Checked = False + Me.ucrChkCovariance.Location = New System.Drawing.Point(249, 15) + Me.ucrChkCovariance.Margin = New System.Windows.Forms.Padding(8) + Me.ucrChkCovariance.Name = "ucrChkCovariance" + Me.ucrChkCovariance.Size = New System.Drawing.Size(250, 51) + Me.ucrChkCovariance.TabIndex = 1 ' - 'grpDecilesQuintiles + 'ucrChkCorrelations ' - Me.grpDecilesQuintiles.Controls.Add(Me.ucrChkP60) - Me.grpDecilesQuintiles.Controls.Add(Me.ucrChkP90) - Me.grpDecilesQuintiles.Controls.Add(Me.ucrChkP70) - Me.grpDecilesQuintiles.Controls.Add(Me.ucrChkP80) - Me.grpDecilesQuintiles.Controls.Add(Me.ucrChkP40) - Me.grpDecilesQuintiles.Controls.Add(Me.ucrChkP30) - Me.grpDecilesQuintiles.Controls.Add(Me.ucrChkP10) - Me.grpDecilesQuintiles.Controls.Add(Me.ucrChkP20) - Me.grpDecilesQuintiles.Location = New System.Drawing.Point(10, 289) - Me.grpDecilesQuintiles.Name = "grpDecilesQuintiles" - Me.grpDecilesQuintiles.Size = New System.Drawing.Size(393, 87) - Me.grpDecilesQuintiles.TabIndex = 4 - Me.grpDecilesQuintiles.TabStop = False - Me.grpDecilesQuintiles.Tag = "" - Me.grpDecilesQuintiles.Text = "Deciles && Quintiles" + Me.ucrChkCorrelations.AutoSize = True + Me.ucrChkCorrelations.Checked = False + Me.ucrChkCorrelations.Location = New System.Drawing.Point(22, 20) + Me.ucrChkCorrelations.Margin = New System.Windows.Forms.Padding(8) + Me.ucrChkCorrelations.Name = "ucrChkCorrelations" + Me.ucrChkCorrelations.Size = New System.Drawing.Size(224, 51) + Me.ucrChkCorrelations.TabIndex = 0 ' - 'ucrChkP60 + 'ucrInputJmia ' - Me.ucrChkP60.AutoSize = True - Me.ucrChkP60.Checked = False - Me.ucrChkP60.Location = New System.Drawing.Point(7, 51) - Me.ucrChkP60.Margin = New System.Windows.Forms.Padding(5) - Me.ucrChkP60.Name = "ucrChkP60" - Me.ucrChkP60.Size = New System.Drawing.Size(85, 23) - Me.ucrChkP60.TabIndex = 7 + Me.ucrInputJmia.AddQuotesIfUnrecognised = True + Me.ucrInputJmia.AutoSize = True + Me.ucrInputJmia.IsMultiline = False + Me.ucrInputJmia.IsReadOnly = False + Me.ucrInputJmia.Location = New System.Drawing.Point(448, 183) + Me.ucrInputJmia.Margin = New System.Windows.Forms.Padding(14) + Me.ucrInputJmia.Name = "ucrInputJmia" + Me.ucrInputJmia.Size = New System.Drawing.Size(48, 32) + Me.ucrInputJmia.TabIndex = 21 ' - 'ucrChkP90 + 'ucrChkSelectAll ' - Me.ucrChkP90.AutoSize = True - Me.ucrChkP90.Checked = False - Me.ucrChkP90.Location = New System.Drawing.Point(292, 51) - Me.ucrChkP90.Margin = New System.Windows.Forms.Padding(5) - Me.ucrChkP90.Name = "ucrChkP90" - Me.ucrChkP90.Size = New System.Drawing.Size(85, 23) - Me.ucrChkP90.TabIndex = 6 + Me.ucrChkSelectAll.AutoSize = True + Me.ucrChkSelectAll.Checked = False + Me.ucrChkSelectAll.Location = New System.Drawing.Point(14, 22) + Me.ucrChkSelectAll.Margin = New System.Windows.Forms.Padding(8) + Me.ucrChkSelectAll.Name = "ucrChkSelectAll" + Me.ucrChkSelectAll.Size = New System.Drawing.Size(130, 51) + Me.ucrChkSelectAll.TabIndex = 0 ' - 'ucrChkP70 + 'ucrChkRelativeIndexOfAgreement ' - Me.ucrChkP70.AutoSize = True - Me.ucrChkP70.Checked = False - Me.ucrChkP70.Location = New System.Drawing.Point(96, 51) - Me.ucrChkP70.Margin = New System.Windows.Forms.Padding(5) - Me.ucrChkP70.Name = "ucrChkP70" - Me.ucrChkP70.Size = New System.Drawing.Size(66, 23) - Me.ucrChkP70.TabIndex = 5 + Me.ucrChkRelativeIndexOfAgreement.AutoSize = True + Me.ucrChkRelativeIndexOfAgreement.Checked = False + Me.ucrChkRelativeIndexOfAgreement.Location = New System.Drawing.Point(306, 112) + Me.ucrChkRelativeIndexOfAgreement.Margin = New System.Windows.Forms.Padding(8) + Me.ucrChkRelativeIndexOfAgreement.Name = "ucrChkRelativeIndexOfAgreement" + Me.ucrChkRelativeIndexOfAgreement.Size = New System.Drawing.Size(130, 51) + Me.ucrChkRelativeIndexOfAgreement.TabIndex = 13 ' - 'ucrChkP80 + 'ucrChkRatioOfStandardDeviation ' - Me.ucrChkP80.AutoSize = True - Me.ucrChkP80.Checked = False - Me.ucrChkP80.Location = New System.Drawing.Point(168, 51) - Me.ucrChkP80.Margin = New System.Windows.Forms.Padding(5) - Me.ucrChkP80.Name = "ucrChkP80" - Me.ucrChkP80.Size = New System.Drawing.Size(85, 23) - Me.ucrChkP80.TabIndex = 4 + Me.ucrChkRatioOfStandardDeviation.AutoSize = True + Me.ucrChkRatioOfStandardDeviation.Checked = False + Me.ucrChkRatioOfStandardDeviation.Location = New System.Drawing.Point(141, 81) + Me.ucrChkRatioOfStandardDeviation.Margin = New System.Windows.Forms.Padding(8) + Me.ucrChkRatioOfStandardDeviation.Name = "ucrChkRatioOfStandardDeviation" + Me.ucrChkRatioOfStandardDeviation.Size = New System.Drawing.Size(130, 51) + Me.ucrChkRatioOfStandardDeviation.TabIndex = 7 ' - 'ucrChkP40 + 'ucrChkCoefDetermination ' - Me.ucrChkP40.AutoSize = True - Me.ucrChkP40.Checked = False - Me.ucrChkP40.Location = New System.Drawing.Point(292, 21) - Me.ucrChkP40.Margin = New System.Windows.Forms.Padding(5) - Me.ucrChkP40.Name = "ucrChkP40" - Me.ucrChkP40.Size = New System.Drawing.Size(85, 23) - Me.ucrChkP40.TabIndex = 3 + Me.ucrChkCoefDetermination.AutoSize = True + Me.ucrChkCoefDetermination.Checked = False + Me.ucrChkCoefDetermination.Location = New System.Drawing.Point(306, 174) + Me.ucrChkCoefDetermination.Margin = New System.Windows.Forms.Padding(8) + Me.ucrChkCoefDetermination.Name = "ucrChkCoefDetermination" + Me.ucrChkCoefDetermination.Size = New System.Drawing.Size(130, 51) + Me.ucrChkCoefDetermination.TabIndex = 15 ' - 'ucrChkP30 + 'ucrChkRatioOfRootMeanSquaredError ' - Me.ucrChkP30.AutoSize = True - Me.ucrChkP30.Checked = False - Me.ucrChkP30.Location = New System.Drawing.Point(168, 21) - Me.ucrChkP30.Margin = New System.Windows.Forms.Padding(5) - Me.ucrChkP30.Name = "ucrChkP30" - Me.ucrChkP30.Size = New System.Drawing.Size(85, 23) - Me.ucrChkP30.TabIndex = 2 + Me.ucrChkRatioOfRootMeanSquaredError.AutoSize = True + Me.ucrChkRatioOfRootMeanSquaredError.Checked = False + Me.ucrChkRatioOfRootMeanSquaredError.Location = New System.Drawing.Point(141, 51) + Me.ucrChkRatioOfRootMeanSquaredError.Margin = New System.Windows.Forms.Padding(8) + Me.ucrChkRatioOfRootMeanSquaredError.Name = "ucrChkRatioOfRootMeanSquaredError" + Me.ucrChkRatioOfRootMeanSquaredError.Size = New System.Drawing.Size(130, 51) + Me.ucrChkRatioOfRootMeanSquaredError.TabIndex = 6 ' - 'ucrChkP10 + 'ucrChkRelativeNashSutcliffeEff ' - Me.ucrChkP10.AutoSize = True - Me.ucrChkP10.Checked = False - Me.ucrChkP10.Location = New System.Drawing.Point(7, 21) - Me.ucrChkP10.Margin = New System.Windows.Forms.Padding(5) - Me.ucrChkP10.Name = "ucrChkP10" - Me.ucrChkP10.Size = New System.Drawing.Size(85, 23) - Me.ucrChkP10.TabIndex = 0 + Me.ucrChkRelativeNashSutcliffeEff.AutoSize = True + Me.ucrChkRelativeNashSutcliffeEff.Checked = False + Me.ucrChkRelativeNashSutcliffeEff.Location = New System.Drawing.Point(141, 172) + Me.ucrChkRelativeNashSutcliffeEff.Margin = New System.Windows.Forms.Padding(8) + Me.ucrChkRelativeNashSutcliffeEff.Name = "ucrChkRelativeNashSutcliffeEff" + Me.ucrChkRelativeNashSutcliffeEff.Size = New System.Drawing.Size(130, 51) + Me.ucrChkRelativeNashSutcliffeEff.TabIndex = 10 ' - 'ucrChkP20 + 'ucrChkModifiedIndexOfAgreement ' - Me.ucrChkP20.AutoSize = True - Me.ucrChkP20.Checked = False - Me.ucrChkP20.Location = New System.Drawing.Point(96, 21) - Me.ucrChkP20.Margin = New System.Windows.Forms.Padding(5) - Me.ucrChkP20.Name = "ucrChkP20" - Me.ucrChkP20.Size = New System.Drawing.Size(66, 23) - Me.ucrChkP20.TabIndex = 1 + Me.ucrChkModifiedIndexOfAgreement.AutoSize = True + Me.ucrChkModifiedIndexOfAgreement.Checked = False + Me.ucrChkModifiedIndexOfAgreement.Location = New System.Drawing.Point(306, 54) + Me.ucrChkModifiedIndexOfAgreement.Margin = New System.Windows.Forms.Padding(8) + Me.ucrChkModifiedIndexOfAgreement.Name = "ucrChkModifiedIndexOfAgreement" + Me.ucrChkModifiedIndexOfAgreement.Size = New System.Drawing.Size(130, 51) + Me.ucrChkModifiedIndexOfAgreement.TabIndex = 11 ' - 'grpCommon + 'ucrChkCoefPersistence ' - Me.grpCommon.Controls.Add(Me.ucrChkn_distinct) - Me.grpCommon.Controls.Add(Me.ucrChkNTotal) - Me.grpCommon.Controls.Add(Me.ucrChkMode) - Me.grpCommon.Controls.Add(Me.ucrChkNMissing) - Me.grpCommon.Controls.Add(Me.ucrChkNonMissing) - Me.grpCommon.Location = New System.Drawing.Point(10, 6) - Me.grpCommon.Name = "grpCommon" - Me.grpCommon.Size = New System.Drawing.Size(393, 80) - Me.grpCommon.TabIndex = 0 - Me.grpCommon.TabStop = False - Me.grpCommon.Tag = "Common" - Me.grpCommon.Text = "Common" + Me.ucrChkCoefPersistence.AutoSize = True + Me.ucrChkCoefPersistence.Checked = False + Me.ucrChkCoefPersistence.Location = New System.Drawing.Point(306, 142) + Me.ucrChkCoefPersistence.Margin = New System.Windows.Forms.Padding(8) + Me.ucrChkCoefPersistence.Name = "ucrChkCoefPersistence" + Me.ucrChkCoefPersistence.Size = New System.Drawing.Size(130, 51) + Me.ucrChkCoefPersistence.TabIndex = 14 + ' + 'ucrChkNashSutcliffeEfficiency + ' + Me.ucrChkNashSutcliffeEfficiency.AutoSize = True + Me.ucrChkNashSutcliffeEfficiency.Checked = False + Me.ucrChkNashSutcliffeEfficiency.Location = New System.Drawing.Point(141, 112) + Me.ucrChkNashSutcliffeEfficiency.Margin = New System.Windows.Forms.Padding(8) + Me.ucrChkNashSutcliffeEfficiency.Name = "ucrChkNashSutcliffeEfficiency" + Me.ucrChkNashSutcliffeEfficiency.Size = New System.Drawing.Size(130, 51) + Me.ucrChkNashSutcliffeEfficiency.TabIndex = 8 + ' + 'ucrChkSumOfSquaredResiduals + ' + Me.ucrChkSumOfSquaredResiduals.AutoSize = True + Me.ucrChkSumOfSquaredResiduals.Checked = False + Me.ucrChkSumOfSquaredResiduals.Location = New System.Drawing.Point(459, 150) + Me.ucrChkSumOfSquaredResiduals.Margin = New System.Windows.Forms.Padding(8) + Me.ucrChkSumOfSquaredResiduals.Name = "ucrChkSumOfSquaredResiduals" + Me.ucrChkSumOfSquaredResiduals.Size = New System.Drawing.Size(130, 51) + Me.ucrChkSumOfSquaredResiduals.TabIndex = 19 + ' + 'ucrChkKlingGuptaEfficiency + ' + Me.ucrChkKlingGuptaEfficiency.AutoSize = True + Me.ucrChkKlingGuptaEfficiency.Checked = False + Me.ucrChkKlingGuptaEfficiency.Location = New System.Drawing.Point(459, 57) + Me.ucrChkKlingGuptaEfficiency.Margin = New System.Windows.Forms.Padding(8) + Me.ucrChkKlingGuptaEfficiency.Name = "ucrChkKlingGuptaEfficiency" + Me.ucrChkKlingGuptaEfficiency.Size = New System.Drawing.Size(130, 51) + Me.ucrChkKlingGuptaEfficiency.TabIndex = 16 + ' + 'ucrChkVolumetricEfficiency + ' + Me.ucrChkVolumetricEfficiency.AutoSize = True + Me.ucrChkVolumetricEfficiency.Checked = False + Me.ucrChkVolumetricEfficiency.Location = New System.Drawing.Point(459, 87) + Me.ucrChkVolumetricEfficiency.Margin = New System.Windows.Forms.Padding(8) + Me.ucrChkVolumetricEfficiency.Name = "ucrChkVolumetricEfficiency" + Me.ucrChkVolumetricEfficiency.Size = New System.Drawing.Size(130, 51) + Me.ucrChkVolumetricEfficiency.TabIndex = 17 + ' + 'ucrChkPercentBias + ' + Me.ucrChkPercentBias.AutoSize = True + Me.ucrChkPercentBias.Checked = False + Me.ucrChkPercentBias.Location = New System.Drawing.Point(12, 174) + Me.ucrChkPercentBias.Margin = New System.Windows.Forms.Padding(8) + Me.ucrChkPercentBias.Name = "ucrChkPercentBias" + Me.ucrChkPercentBias.Size = New System.Drawing.Size(130, 51) + Me.ucrChkPercentBias.TabIndex = 5 + ' + 'ucrChkModNashSutcliffeEff + ' + Me.ucrChkModNashSutcliffeEff.AutoSize = True + Me.ucrChkModNashSutcliffeEff.Checked = False + Me.ucrChkModNashSutcliffeEff.Location = New System.Drawing.Point(141, 142) + Me.ucrChkModNashSutcliffeEff.Margin = New System.Windows.Forms.Padding(8) + Me.ucrChkModNashSutcliffeEff.Name = "ucrChkModNashSutcliffeEff" + Me.ucrChkModNashSutcliffeEff.Size = New System.Drawing.Size(130, 51) + Me.ucrChkModNashSutcliffeEff.TabIndex = 9 + ' + 'ucrChkMeanError + ' + Me.ucrChkMeanError.AutoSize = True + Me.ucrChkMeanError.Checked = False + Me.ucrChkMeanError.Location = New System.Drawing.Point(12, 51) + Me.ucrChkMeanError.Margin = New System.Windows.Forms.Padding(8) + Me.ucrChkMeanError.Name = "ucrChkMeanError" + Me.ucrChkMeanError.Size = New System.Drawing.Size(130, 51) + Me.ucrChkMeanError.TabIndex = 1 + ' + 'ucrChkMeanSquaredError + ' + Me.ucrChkMeanSquaredError.AutoSize = True + Me.ucrChkMeanSquaredError.Checked = False + Me.ucrChkMeanSquaredError.Location = New System.Drawing.Point(459, 118) + Me.ucrChkMeanSquaredError.Margin = New System.Windows.Forms.Padding(8) + Me.ucrChkMeanSquaredError.Name = "ucrChkMeanSquaredError" + Me.ucrChkMeanSquaredError.Size = New System.Drawing.Size(130, 51) + Me.ucrChkMeanSquaredError.TabIndex = 18 + ' + 'ucrChkRootMeanSquaredError + ' + Me.ucrChkRootMeanSquaredError.AutoSize = True + Me.ucrChkRootMeanSquaredError.Checked = False + Me.ucrChkRootMeanSquaredError.Location = New System.Drawing.Point(12, 111) + Me.ucrChkRootMeanSquaredError.Margin = New System.Windows.Forms.Padding(8) + Me.ucrChkRootMeanSquaredError.Name = "ucrChkRootMeanSquaredError" + Me.ucrChkRootMeanSquaredError.Size = New System.Drawing.Size(130, 51) + Me.ucrChkRootMeanSquaredError.TabIndex = 3 + ' + 'ucrChkNormRootMeanSquaredError + ' + Me.ucrChkNormRootMeanSquaredError.AutoSize = True + Me.ucrChkNormRootMeanSquaredError.Checked = False + Me.ucrChkNormRootMeanSquaredError.Location = New System.Drawing.Point(12, 142) + Me.ucrChkNormRootMeanSquaredError.Margin = New System.Windows.Forms.Padding(8) + Me.ucrChkNormRootMeanSquaredError.Name = "ucrChkNormRootMeanSquaredError" + Me.ucrChkNormRootMeanSquaredError.Size = New System.Drawing.Size(130, 51) + Me.ucrChkNormRootMeanSquaredError.TabIndex = 4 + ' + 'ucrChkMeanAbsoluteError + ' + Me.ucrChkMeanAbsoluteError.AutoSize = True + Me.ucrChkMeanAbsoluteError.Checked = False + Me.ucrChkMeanAbsoluteError.Location = New System.Drawing.Point(12, 81) + Me.ucrChkMeanAbsoluteError.Margin = New System.Windows.Forms.Padding(8) + Me.ucrChkMeanAbsoluteError.Name = "ucrChkMeanAbsoluteError" + Me.ucrChkMeanAbsoluteError.Size = New System.Drawing.Size(130, 51) + Me.ucrChkMeanAbsoluteError.TabIndex = 2 + ' + 'ucrChkIndexOfAgreement + ' + Me.ucrChkIndexOfAgreement.AutoSize = True + Me.ucrChkIndexOfAgreement.Checked = False + Me.ucrChkIndexOfAgreement.Location = New System.Drawing.Point(306, 86) + Me.ucrChkIndexOfAgreement.Margin = New System.Windows.Forms.Padding(8) + Me.ucrChkIndexOfAgreement.Name = "ucrChkIndexOfAgreement" + Me.ucrChkIndexOfAgreement.Size = New System.Drawing.Size(130, 51) + Me.ucrChkIndexOfAgreement.TabIndex = 12 + ' + 'ucrReceiverSecondVariable + ' + Me.ucrReceiverSecondVariable.AutoSize = True + Me.ucrReceiverSecondVariable.frmParent = Nothing + Me.ucrReceiverSecondVariable.Location = New System.Drawing.Point(399, 334) + Me.ucrReceiverSecondVariable.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverSecondVariable.Name = "ucrReceiverSecondVariable" + Me.ucrReceiverSecondVariable.Selector = Nothing + Me.ucrReceiverSecondVariable.Size = New System.Drawing.Size(180, 30) + Me.ucrReceiverSecondVariable.strNcFilePath = "" + Me.ucrReceiverSecondVariable.TabIndex = 4 + Me.ucrReceiverSecondVariable.ucrSelector = Nothing + ' + 'ucrSelectorSecondVariable + ' + Me.ucrSelectorSecondVariable.AutoSize = True + Me.ucrSelectorSecondVariable.bDropUnusedFilterLevels = False + Me.ucrSelectorSecondVariable.bShowHiddenColumns = False + Me.ucrSelectorSecondVariable.bUseCurrentFilter = True + Me.ucrSelectorSecondVariable.Location = New System.Drawing.Point(12, 290) + Me.ucrSelectorSecondVariable.Margin = New System.Windows.Forms.Padding(0) + Me.ucrSelectorSecondVariable.Name = "ucrSelectorSecondVariable" + Me.ucrSelectorSecondVariable.Size = New System.Drawing.Size(480, 411) + Me.ucrSelectorSecondVariable.TabIndex = 2 + ' + 'ucrChkOrderBy + ' + Me.ucrChkOrderBy.AutoSize = True + Me.ucrChkOrderBy.Checked = False + Me.ucrChkOrderBy.Location = New System.Drawing.Point(18, 152) + Me.ucrChkOrderBy.Margin = New System.Windows.Forms.Padding(8) + Me.ucrChkOrderBy.Name = "ucrChkOrderBy" + Me.ucrChkOrderBy.Size = New System.Drawing.Size(282, 51) + Me.ucrChkOrderBy.TabIndex = 1 + ' + 'ucrChkSetseed + ' + Me.ucrChkSetseed.AutoSize = True + Me.ucrChkSetseed.Checked = False + Me.ucrChkSetseed.Location = New System.Drawing.Point(249, 68) + Me.ucrChkSetseed.Margin = New System.Windows.Forms.Padding(8) + Me.ucrChkSetseed.Name = "ucrChkSetseed" + Me.ucrChkSetseed.Size = New System.Drawing.Size(152, 51) + Me.ucrChkSetseed.TabIndex = 8 ' - 'ucrChkn_distinct + 'ucrNudSeed ' - Me.ucrChkn_distinct.AutoSize = True - Me.ucrChkn_distinct.Checked = False - Me.ucrChkn_distinct.Location = New System.Drawing.Point(168, 49) - Me.ucrChkn_distinct.Margin = New System.Windows.Forms.Padding(5) - Me.ucrChkn_distinct.Name = "ucrChkn_distinct" - Me.ucrChkn_distinct.Size = New System.Drawing.Size(101, 23) - Me.ucrChkn_distinct.TabIndex = 3 + Me.ucrNudSeed.AutoSize = True + Me.ucrNudSeed.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudSeed.Increment = New Decimal(New Integer() {1, 0, 0, 0}) + Me.ucrNudSeed.Location = New System.Drawing.Point(410, 68) + Me.ucrNudSeed.Margin = New System.Windows.Forms.Padding(8) + Me.ucrNudSeed.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) + Me.ucrNudSeed.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudSeed.Name = "ucrNudSeed" + Me.ucrNudSeed.Size = New System.Drawing.Size(75, 30) + Me.ucrNudSeed.TabIndex = 7 + Me.ucrNudSeed.Value = New Decimal(New Integer() {0, 0, 0, 0}) ' - 'ucrChkNTotal + 'ucrChkSample ' - Me.ucrChkNTotal.AutoSize = True - Me.ucrChkNTotal.Checked = False - Me.ucrChkNTotal.Location = New System.Drawing.Point(168, 19) - Me.ucrChkNTotal.Margin = New System.Windows.Forms.Padding(5) - Me.ucrChkNTotal.Name = "ucrChkNTotal" - Me.ucrChkNTotal.Size = New System.Drawing.Size(100, 23) - Me.ucrChkNTotal.TabIndex = 2 + Me.ucrChkSample.AutoSize = True + Me.ucrChkSample.Checked = False + Me.ucrChkSample.Location = New System.Drawing.Point(12, 68) + Me.ucrChkSample.Margin = New System.Windows.Forms.Padding(8) + Me.ucrChkSample.Name = "ucrChkSample" + Me.ucrChkSample.Size = New System.Drawing.Size(170, 51) + Me.ucrChkSample.TabIndex = 5 ' - 'ucrChkMode + 'ucrInputN ' - Me.ucrChkMode.AutoSize = True - Me.ucrChkMode.Checked = False - Me.ucrChkMode.Location = New System.Drawing.Point(7, 49) - Me.ucrChkMode.Margin = New System.Windows.Forms.Padding(5) - Me.ucrChkMode.Name = "ucrChkMode" - Me.ucrChkMode.Size = New System.Drawing.Size(100, 23) - Me.ucrChkMode.TabIndex = 1 + Me.ucrInputN.AddQuotesIfUnrecognised = True + Me.ucrInputN.AutoSize = True + Me.ucrInputN.IsMultiline = False + Me.ucrInputN.IsReadOnly = False + Me.ucrInputN.Location = New System.Drawing.Point(350, 28) + Me.ucrInputN.Margin = New System.Windows.Forms.Padding(10, 9, 10, 9) + Me.ucrInputN.Name = "ucrInputN" + Me.ucrInputN.Size = New System.Drawing.Size(96, 30) + Me.ucrInputN.TabIndex = 3 ' - 'ucrChkNMissing + 'ucrChkFirst ' - Me.ucrChkNMissing.AutoSize = True - Me.ucrChkNMissing.Checked = False - Me.ucrChkNMissing.Location = New System.Drawing.Point(292, 19) - Me.ucrChkNMissing.Margin = New System.Windows.Forms.Padding(5) - Me.ucrChkNMissing.Name = "ucrChkNMissing" - Me.ucrChkNMissing.Size = New System.Drawing.Size(85, 23) - Me.ucrChkNMissing.TabIndex = 4 + Me.ucrChkFirst.AutoSize = True + Me.ucrChkFirst.Checked = False + Me.ucrChkFirst.Location = New System.Drawing.Point(12, 28) + Me.ucrChkFirst.Margin = New System.Windows.Forms.Padding(8) + Me.ucrChkFirst.Name = "ucrChkFirst" + Me.ucrChkFirst.Size = New System.Drawing.Size(152, 51) + Me.ucrChkFirst.TabIndex = 0 ' - 'ucrChkNonMissing + 'ucrChkLast ' - Me.ucrChkNonMissing.AutoSize = True - Me.ucrChkNonMissing.Checked = False - Me.ucrChkNonMissing.Location = New System.Drawing.Point(7, 19) - Me.ucrChkNonMissing.Margin = New System.Windows.Forms.Padding(5) - Me.ucrChkNonMissing.Name = "ucrChkNonMissing" - Me.ucrChkNonMissing.Size = New System.Drawing.Size(129, 23) - Me.ucrChkNonMissing.TabIndex = 0 + Me.ucrChkLast.AutoSize = True + Me.ucrChkLast.Checked = False + Me.ucrChkLast.Location = New System.Drawing.Point(464, 28) + Me.ucrChkLast.Margin = New System.Windows.Forms.Padding(8) + Me.ucrChkLast.Name = "ucrChkLast" + Me.ucrChkLast.Size = New System.Drawing.Size(120, 51) + Me.ucrChkLast.TabIndex = 4 ' - 'grpQuartilesTerciles + 'ucrChknth ' - Me.grpQuartilesTerciles.Controls.Add(Me.ucrChkP67) - Me.grpQuartilesTerciles.Controls.Add(Me.ucrChkP33) - Me.grpQuartilesTerciles.Controls.Add(Me.ucrChkP25) - Me.grpQuartilesTerciles.Controls.Add(Me.ucrChkP75) - Me.grpQuartilesTerciles.Location = New System.Drawing.Point(10, 230) - Me.grpQuartilesTerciles.Name = "grpQuartilesTerciles" - Me.grpQuartilesTerciles.Size = New System.Drawing.Size(393, 56) - Me.grpQuartilesTerciles.TabIndex = 3 - Me.grpQuartilesTerciles.TabStop = False - Me.grpQuartilesTerciles.Tag = "Quartiles" - Me.grpQuartilesTerciles.Text = "Quartiles && Terciles" + Me.ucrChknth.AutoSize = True + Me.ucrChknth.Checked = False + Me.ucrChknth.Location = New System.Drawing.Point(249, 32) + Me.ucrChknth.Margin = New System.Windows.Forms.Padding(8) + Me.ucrChknth.Name = "ucrChknth" + Me.ucrChknth.Size = New System.Drawing.Size(88, 51) + Me.ucrChknth.TabIndex = 1 ' - 'ucrChkP67 + 'ucrSelectorOrderBy ' - Me.ucrChkP67.AutoSize = True - Me.ucrChkP67.Checked = False - Me.ucrChkP67.Location = New System.Drawing.Point(168, 19) - Me.ucrChkP67.Margin = New System.Windows.Forms.Padding(5) - Me.ucrChkP67.Name = "ucrChkP67" - Me.ucrChkP67.Size = New System.Drawing.Size(85, 23) - Me.ucrChkP67.TabIndex = 3 + Me.ucrSelectorOrderBy.AutoSize = True + Me.ucrSelectorOrderBy.bDropUnusedFilterLevels = False + Me.ucrSelectorOrderBy.bShowHiddenColumns = False + Me.ucrSelectorOrderBy.bUseCurrentFilter = True + Me.ucrSelectorOrderBy.Location = New System.Drawing.Point(15, 198) + Me.ucrSelectorOrderBy.Margin = New System.Windows.Forms.Padding(0) + Me.ucrSelectorOrderBy.Name = "ucrSelectorOrderBy" + Me.ucrSelectorOrderBy.Size = New System.Drawing.Size(480, 411) + Me.ucrSelectorOrderBy.TabIndex = 2 ' - 'ucrChkP33 + 'ucrReceiverOrderBy ' - Me.ucrChkP33.AutoSize = True - Me.ucrChkP33.Checked = False - Me.ucrChkP33.Location = New System.Drawing.Point(96, 19) - Me.ucrChkP33.Margin = New System.Windows.Forms.Padding(5) - Me.ucrChkP33.Name = "ucrChkP33" - Me.ucrChkP33.Size = New System.Drawing.Size(66, 23) - Me.ucrChkP33.TabIndex = 2 + Me.ucrReceiverOrderBy.AutoSize = True + Me.ucrReceiverOrderBy.frmParent = Nothing + Me.ucrReceiverOrderBy.Location = New System.Drawing.Point(346, 264) + Me.ucrReceiverOrderBy.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverOrderBy.Name = "ucrReceiverOrderBy" + Me.ucrReceiverOrderBy.Selector = Nothing + Me.ucrReceiverOrderBy.Size = New System.Drawing.Size(180, 30) + Me.ucrReceiverOrderBy.strNcFilePath = "" + Me.ucrReceiverOrderBy.TabIndex = 4 + Me.ucrReceiverOrderBy.ucrSelector = Nothing ' - 'ucrChkP25 + 'ucrChkStandardErrorOfMean ' - Me.ucrChkP25.AutoSize = True - Me.ucrChkP25.Checked = False - Me.ucrChkP25.Location = New System.Drawing.Point(7, 19) - Me.ucrChkP25.Margin = New System.Windows.Forms.Padding(5) - Me.ucrChkP25.Name = "ucrChkP25" - Me.ucrChkP25.Size = New System.Drawing.Size(85, 23) - Me.ucrChkP25.TabIndex = 0 + Me.ucrChkStandardErrorOfMean.AutoSize = True + Me.ucrChkStandardErrorOfMean.Checked = False + Me.ucrChkStandardErrorOfMean.Location = New System.Drawing.Point(24, 32) + Me.ucrChkStandardErrorOfMean.Margin = New System.Windows.Forms.Padding(8) + Me.ucrChkStandardErrorOfMean.Name = "ucrChkStandardErrorOfMean" + Me.ucrChkStandardErrorOfMean.Size = New System.Drawing.Size(442, 51) + Me.ucrChkStandardErrorOfMean.TabIndex = 1 ' - 'ucrChkP75 + 'ucrChkCircRange ' - Me.ucrChkP75.AutoSize = True - Me.ucrChkP75.Checked = False - Me.ucrChkP75.Location = New System.Drawing.Point(292, 19) - Me.ucrChkP75.Margin = New System.Windows.Forms.Padding(5) - Me.ucrChkP75.Name = "ucrChkP75" - Me.ucrChkP75.Size = New System.Drawing.Size(85, 23) - Me.ucrChkP75.TabIndex = 1 + Me.ucrChkCircRange.AutoSize = True + Me.ucrChkCircRange.Checked = False + Me.ucrChkCircRange.Location = New System.Drawing.Point(32, 70) + Me.ucrChkCircRange.Margin = New System.Windows.Forms.Padding(6, 6, 6, 6) + Me.ucrChkCircRange.Name = "ucrChkCircRange" + Me.ucrChkCircRange.Size = New System.Drawing.Size(120, 51) + Me.ucrChkCircRange.TabIndex = 1 ' - 'grpNotOrderedFactor + 'ucrChkAngVar ' - Me.grpNotOrderedFactor.Controls.Add(Me.ucrChkRange) - Me.grpNotOrderedFactor.Controls.Add(Me.ucrChkMaximum) - Me.grpNotOrderedFactor.Controls.Add(Me.ucrChkMinimum) - Me.grpNotOrderedFactor.Location = New System.Drawing.Point(10, 92) - Me.grpNotOrderedFactor.Name = "grpNotOrderedFactor" - Me.grpNotOrderedFactor.Size = New System.Drawing.Size(393, 51) - Me.grpNotOrderedFactor.TabIndex = 1 - Me.grpNotOrderedFactor.TabStop = False - Me.grpNotOrderedFactor.Tag = "All_but_unordered_Factor" - Me.grpNotOrderedFactor.Text = "All but (unordered) Factor" + Me.ucrChkAngVar.AutoSize = True + Me.ucrChkAngVar.Checked = False + Me.ucrChkAngVar.Location = New System.Drawing.Point(320, 32) + Me.ucrChkAngVar.Margin = New System.Windows.Forms.Padding(6, 6, 6, 6) + Me.ucrChkAngVar.Name = "ucrChkAngVar" + Me.ucrChkAngVar.Size = New System.Drawing.Size(120, 51) + Me.ucrChkAngVar.TabIndex = 4 ' - 'ucrChkRange + 'ucrChkrho ' - Me.ucrChkRange.AutoSize = True - Me.ucrChkRange.Checked = False - Me.ucrChkRange.Location = New System.Drawing.Point(292, 19) - Me.ucrChkRange.Margin = New System.Windows.Forms.Padding(5) - Me.ucrChkRange.Name = "ucrChkRange" - Me.ucrChkRange.Size = New System.Drawing.Size(85, 23) - Me.ucrChkRange.TabIndex = 1 + Me.ucrChkrho.AutoSize = True + Me.ucrChkrho.Checked = False + Me.ucrChkrho.Location = New System.Drawing.Point(186, 70) + Me.ucrChkrho.Margin = New System.Windows.Forms.Padding(6, 6, 6, 6) + Me.ucrChkrho.Name = "ucrChkrho" + Me.ucrChkrho.Size = New System.Drawing.Size(120, 51) + Me.ucrChkrho.TabIndex = 3 ' - 'ucrChkMaximum + 'ucrChkAngDev ' - Me.ucrChkMaximum.AutoSize = True - Me.ucrChkMaximum.Checked = False - Me.ucrChkMaximum.Location = New System.Drawing.Point(168, 19) - Me.ucrChkMaximum.Margin = New System.Windows.Forms.Padding(5) - Me.ucrChkMaximum.Name = "ucrChkMaximum" - Me.ucrChkMaximum.Size = New System.Drawing.Size(100, 23) - Me.ucrChkMaximum.TabIndex = 2 + Me.ucrChkAngDev.AutoSize = True + Me.ucrChkAngDev.Checked = False + Me.ucrChkAngDev.Location = New System.Drawing.Point(320, 70) + Me.ucrChkAngDev.Margin = New System.Windows.Forms.Padding(6, 6, 6, 6) + Me.ucrChkAngDev.Name = "ucrChkAngDev" + Me.ucrChkAngDev.Size = New System.Drawing.Size(120, 51) + Me.ucrChkAngDev.TabIndex = 5 ' - 'ucrChkMinimum + 'ucrChkVar ' - Me.ucrChkMinimum.AutoSize = True - Me.ucrChkMinimum.Checked = False - Me.ucrChkMinimum.Location = New System.Drawing.Point(7, 19) - Me.ucrChkMinimum.Margin = New System.Windows.Forms.Padding(5) - Me.ucrChkMinimum.Name = "ucrChkMinimum" - Me.ucrChkMinimum.Size = New System.Drawing.Size(100, 23) - Me.ucrChkMinimum.TabIndex = 0 + Me.ucrChkVar.AutoSize = True + Me.ucrChkVar.Checked = False + Me.ucrChkVar.Location = New System.Drawing.Point(186, 28) + Me.ucrChkVar.Margin = New System.Windows.Forms.Padding(6, 6, 6, 6) + Me.ucrChkVar.Name = "ucrChkVar" + Me.ucrChkVar.Size = New System.Drawing.Size(120, 51) + Me.ucrChkVar.TabIndex = 2 ' - 'grpNumeric + 'ucrChkSd ' - Me.grpNumeric.Controls.Add(Me.ucrChkVariance) - Me.grpNumeric.Controls.Add(Me.ucrChkMedian) - Me.grpNumeric.Controls.Add(Me.ucrChkStdDev) - Me.grpNumeric.Controls.Add(Me.ucrChkSum) - Me.grpNumeric.Controls.Add(Me.ucrChkMean) - Me.grpNumeric.Location = New System.Drawing.Point(10, 149) - Me.grpNumeric.Name = "grpNumeric" - Me.grpNumeric.Size = New System.Drawing.Size(393, 78) - Me.grpNumeric.TabIndex = 2 - Me.grpNumeric.TabStop = False - Me.grpNumeric.Tag = "Numeric" - Me.grpNumeric.Text = "Numeric" + Me.ucrChkSd.AutoSize = True + Me.ucrChkSd.Checked = False + Me.ucrChkSd.Location = New System.Drawing.Point(32, 28) + Me.ucrChkSd.Margin = New System.Windows.Forms.Padding(6, 6, 6, 6) + Me.ucrChkSd.Name = "ucrChkSd" + Me.ucrChkSd.Size = New System.Drawing.Size(120, 51) + Me.ucrChkSd.TabIndex = 0 ' - 'ucrChkVariance + 'ucrChkCircMedian ' - Me.ucrChkVariance.AutoSize = True - Me.ucrChkVariance.Checked = False - Me.ucrChkVariance.Location = New System.Drawing.Point(168, 49) - Me.ucrChkVariance.Margin = New System.Windows.Forms.Padding(5) - Me.ucrChkVariance.Name = "ucrChkVariance" - Me.ucrChkVariance.Size = New System.Drawing.Size(157, 23) - Me.ucrChkVariance.TabIndex = 3 + Me.ucrChkCircMedian.AutoSize = True + Me.ucrChkCircMedian.Checked = False + Me.ucrChkCircMedian.Location = New System.Drawing.Point(186, 39) + Me.ucrChkCircMedian.Margin = New System.Windows.Forms.Padding(6, 6, 6, 6) + Me.ucrChkCircMedian.Name = "ucrChkCircMedian" + Me.ucrChkCircMedian.Size = New System.Drawing.Size(122, 51) + Me.ucrChkCircMedian.TabIndex = 2 ' - 'ucrChkMedian + 'ucrChkMin ' - Me.ucrChkMedian.AutoSize = True - Me.ucrChkMedian.Checked = False - Me.ucrChkMedian.Location = New System.Drawing.Point(292, 19) - Me.ucrChkMedian.Margin = New System.Windows.Forms.Padding(5) - Me.ucrChkMedian.Name = "ucrChkMedian" - Me.ucrChkMedian.Size = New System.Drawing.Size(103, 23) - Me.ucrChkMedian.TabIndex = 4 + Me.ucrChkMin.AutoSize = True + Me.ucrChkMin.Checked = False + Me.ucrChkMin.Location = New System.Drawing.Point(320, 39) + Me.ucrChkMin.Margin = New System.Windows.Forms.Padding(6, 6, 6, 6) + Me.ucrChkMin.Name = "ucrChkMin" + Me.ucrChkMin.Size = New System.Drawing.Size(120, 51) + Me.ucrChkMin.TabIndex = 4 ' - 'ucrChkStdDev + 'ucrChkMedianH ' - Me.ucrChkStdDev.AutoSize = True - Me.ucrChkStdDev.Checked = False - Me.ucrChkStdDev.Location = New System.Drawing.Point(7, 49) - Me.ucrChkStdDev.Margin = New System.Windows.Forms.Padding(5) - Me.ucrChkStdDev.Name = "ucrChkStdDev" - Me.ucrChkStdDev.Size = New System.Drawing.Size(155, 23) - Me.ucrChkStdDev.TabIndex = 1 + Me.ucrChkMedianH.AutoSize = True + Me.ucrChkMedianH.Checked = False + Me.ucrChkMedianH.Location = New System.Drawing.Point(450, 39) + Me.ucrChkMedianH.Margin = New System.Windows.Forms.Padding(6, 6, 6, 6) + Me.ucrChkMedianH.Name = "ucrChkMedianH" + Me.ucrChkMedianH.Size = New System.Drawing.Size(120, 51) + Me.ucrChkMedianH.TabIndex = 6 ' - 'ucrChkSum + 'ucrChkQ3 ' - Me.ucrChkSum.AutoSize = True - Me.ucrChkSum.Checked = False - Me.ucrChkSum.Location = New System.Drawing.Point(7, 19) - Me.ucrChkSum.Margin = New System.Windows.Forms.Padding(5) - Me.ucrChkSum.Name = "ucrChkSum" - Me.ucrChkSum.Size = New System.Drawing.Size(100, 23) - Me.ucrChkSum.TabIndex = 0 + Me.ucrChkQ3.AutoSize = True + Me.ucrChkQ3.Checked = False + Me.ucrChkQ3.Location = New System.Drawing.Point(186, 81) + Me.ucrChkQ3.Margin = New System.Windows.Forms.Padding(6, 6, 6, 6) + Me.ucrChkQ3.Name = "ucrChkQ3" + Me.ucrChkQ3.Size = New System.Drawing.Size(120, 51) + Me.ucrChkQ3.TabIndex = 3 ' - 'ucrChkMean + 'ucrChkQ1 ' - Me.ucrChkMean.AutoSize = True - Me.ucrChkMean.Checked = False - Me.ucrChkMean.Location = New System.Drawing.Point(168, 19) - Me.ucrChkMean.Margin = New System.Windows.Forms.Padding(5) - Me.ucrChkMean.Name = "ucrChkMean" - Me.ucrChkMean.Size = New System.Drawing.Size(100, 23) - Me.ucrChkMean.TabIndex = 2 + Me.ucrChkQ1.AutoSize = True + Me.ucrChkQ1.Checked = False + Me.ucrChkQ1.Location = New System.Drawing.Point(32, 81) + Me.ucrChkQ1.Margin = New System.Windows.Forms.Padding(6, 6, 6, 6) + Me.ucrChkQ1.Name = "ucrChkQ1" + Me.ucrChkQ1.Size = New System.Drawing.Size(120, 51) + Me.ucrChkQ1.TabIndex = 1 ' - 'tbSummaries + 'ucrChkMax ' - Me.tbSummaries.Controls.Add(Me.tbsum) - Me.tbSummaries.Controls.Add(Me.tbMore) - Me.tbSummaries.Controls.Add(Me.tbTwoVariables) - Me.tbSummaries.Controls.Add(Me.tbPosition) - Me.tbSummaries.Controls.Add(Me.tbModel) - Me.tbSummaries.Controls.Add(Me.tbCircular) - Me.tbSummaries.Location = New System.Drawing.Point(6, 7) - Me.tbSummaries.Name = "tbSummaries" - Me.tbSummaries.SelectedIndex = 0 - Me.tbSummaries.Size = New System.Drawing.Size(417, 409) - Me.tbSummaries.TabIndex = 0 + Me.ucrChkMax.AutoSize = True + Me.ucrChkMax.Checked = False + Me.ucrChkMax.Location = New System.Drawing.Point(320, 81) + Me.ucrChkMax.Margin = New System.Windows.Forms.Padding(6, 6, 6, 6) + Me.ucrChkMax.Name = "ucrChkMax" + Me.ucrChkMax.Size = New System.Drawing.Size(120, 51) + Me.ucrChkMax.TabIndex = 5 ' - 'ucrButtonsSummaries + 'ucrChkCircMean ' - Me.ucrButtonsSummaries.AutoSize = True - Me.ucrButtonsSummaries.Location = New System.Drawing.Point(100, 418) - Me.ucrButtonsSummaries.Margin = New System.Windows.Forms.Padding(4) - Me.ucrButtonsSummaries.Name = "ucrButtonsSummaries" - Me.ucrButtonsSummaries.Size = New System.Drawing.Size(224, 31) - Me.ucrButtonsSummaries.TabIndex = 1 + Me.ucrChkCircMean.AutoSize = True + Me.ucrChkCircMean.Checked = False + Me.ucrChkCircMean.Location = New System.Drawing.Point(32, 39) + Me.ucrChkCircMean.Margin = New System.Windows.Forms.Padding(6, 6, 6, 6) + Me.ucrChkCircMean.Name = "ucrChkCircMean" + Me.ucrChkCircMean.Size = New System.Drawing.Size(129, 51) + Me.ucrChkCircMean.TabIndex = 0 + ' + 'GroupBox1 + ' + Me.GroupBox1.Controls.Add(Me.cmdOptions) + Me.GroupBox1.Controls.Add(Me.ucrChkProportionsPercentages) + Me.GroupBox1.Location = New System.Drawing.Point(15, 528) + Me.GroupBox1.Margin = New System.Windows.Forms.Padding(4) + Me.GroupBox1.Name = "GroupBox1" + Me.GroupBox1.Padding = New System.Windows.Forms.Padding(4) + Me.GroupBox1.Size = New System.Drawing.Size(590, 62) + Me.GroupBox1.TabIndex = 4 + Me.GroupBox1.TabStop = False + Me.GroupBox1.Text = "Percentages" ' 'sdgSummaries ' - Me.AutoScaleDimensions = New System.Drawing.SizeF(96.0!, 96.0!) + Me.AutoScaleDimensions = New System.Drawing.SizeF(144.0!, 144.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi Me.AutoSize = True - Me.ClientSize = New System.Drawing.Size(429, 448) + Me.ClientSize = New System.Drawing.Size(644, 698) Me.Controls.Add(Me.ucrButtonsSummaries) Me.Controls.Add(Me.tbSummaries) Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow + Me.Margin = New System.Windows.Forms.Padding(4) Me.MaximizeBox = False Me.MinimizeBox = False Me.Name = "sdgSummaries" @@ -1620,6 +1695,8 @@ Partial Class sdgSummaries Me.grpNumeric.ResumeLayout(False) Me.grpNumeric.PerformLayout() Me.tbSummaries.ResumeLayout(False) + Me.GroupBox1.ResumeLayout(False) + Me.GroupBox1.PerformLayout() Me.ResumeLayout(False) Me.PerformLayout() @@ -1749,4 +1826,7 @@ Partial Class sdgSummaries Friend WithEvents ucrChkSample As ucrCheck Friend WithEvents ucrChkSetseed As ucrCheck Friend WithEvents ucrNudSeed As ucrNud + Friend WithEvents ucrChkProportionsPercentages As ucrCheck + Friend WithEvents cmdOptions As Button + Friend WithEvents GroupBox1 As GroupBox End Class \ No newline at end of file diff --git a/instat/sdgSummaries.vb b/instat/sdgSummaries.vb index 79d90333c37..ee20059ba3f 100644 --- a/instat/sdgSummaries.vb +++ b/instat/sdgSummaries.vb @@ -16,7 +16,7 @@ Imports instat.Translations Public Class sdgSummaries - Public clsListFunction, clsDefaultFunction, clsConcFunction As New RFunction + Public clsListFunction, clsDefaultFunction, clsConcFunction, clsDummyFunction As New RFunction Public bControlsInitialised As Boolean = False Private lstCheckboxes As New List(Of ucrCheck) Private lstVerifCheckboxes As New List(Of ucrCheck) @@ -25,6 +25,7 @@ Public Class sdgSummaries Private strWeightLabel As String Public bEnable2VariableTab As Boolean = True Public bOkEnabled As Boolean = True + Private bResetSubdialog As Boolean = False Private Sub sdgDescribe_Load(sender As Object, e As EventArgs) Handles MyBase.Load autoTranslate(Me) @@ -327,6 +328,10 @@ Public Class sdgSummaries ucrChkSetseed.AddParameterPresentCondition(True, "seed") ucrChkSetseed.AddParameterPresentCondition(False, "seed", False) + ucrChkProportionsPercentages.SetParameter(New RParameter("percentage_type")) + ucrChkProportionsPercentages.SetValuesCheckedAndUnchecked(Chr(34) & "factors" & Chr(34), Chr(34) & "none" & Chr(34)) + ucrChkProportionsPercentages.SetText("Add Percentages") + ucrNudSeed.SetParameter(New RParameter("seed", 11)) lstVerifCheckboxes.AddRange({ucrChkCorrelations, ucrChkCoefDetermination, ucrChkCoefPersistence, ucrChkIndexOfAgreement, ucrChkKlingGuptaEfficiency, ucrChkMeanAbsoluteError, ucrChkModifiedIndexOfAgreement, ucrChkMeanError, ucrChkModNashSutcliffeEff, ucrChkMeanSquaredError, ucrChkNormRootMeanSquaredError, ucrChkNashSutcliffeEfficiency, ucrChkPercentBias, ucrChkRelativeIndexOfAgreement, ucrChkRootMeanSquaredError, ucrChkRelativeNashSutcliffeEff, ucrChkRatioOfStandardDeviation, ucrChkRatioOfRootMeanSquaredError, ucrChkSumOfSquaredResiduals, ucrChkVolumetricEfficiency}) @@ -349,6 +354,8 @@ Public Class sdgSummaries ctrTemp.SetParameterIncludeArgumentName(False) ctrTemp.SetRDefault(Chr(34) & Chr(34)) Next + + cmdOptions.Visible = False bControlsInitialised = True TwoVariablesControls() PositionOptions() @@ -393,6 +400,8 @@ Public Class sdgSummaries ucrChkCorrelations.SetText("Correlations" & strWeightLabel) ucrChkCovariance.SetText("Covariance" & strWeightLabel) + clsDummyFunction.AddParameter("percentage_type", "none") + 'This is meant to force selector select the current dataframe as selected in the main dialog ucrBaseSelector = ucrNewBaseSelector If ucrBaseSelector IsNot Nothing AndAlso ucrBaseSelector.strCurrentDataFrame <> "" Then @@ -490,10 +499,12 @@ Public Class sdgSummaries ucrChkSumOfSquaredResiduals.SetRCode(clsListFunction, bReset, bCloneIfNeeded:=True) ucrChkVolumetricEfficiency.SetRCode(clsListFunction, bReset, bCloneIfNeeded:=True) ucrChkSample.SetRCode(clsListFunction, bReset, bCloneIfNeeded:=True) - + ucrChkProportionsPercentages.SetRCode(clsDefaultFunction, bReset, bCloneIfNeeded:=True) If bReset Then ucrSelectorSecondVariable.Reset() ucrSelectorOrderBy.Reset() + + If strDefaultTab <> "" Then For i As Integer = 0 To tbSummaries.TabPages.Count - 1 If tbSummaries.TabPages(i).Text = strDefaultTab Then @@ -510,6 +521,7 @@ Public Class sdgSummaries tbSummaries.SelectedIndex = 0 End If End If + bResetSubdialog = True End Sub Public ReadOnly Property SummaryCount As Integer @@ -605,6 +617,16 @@ Public Class sdgSummaries frmMain.clsRLink.RunScript(clsHelp.ToScript, strComment:="Opening help page for" & " " & strPackageName & " " & "Package. Generated from dialog Modelling", iCallType:=2, bSeparateThread:=False, bUpdateGrids:=False) End Sub + Private Sub cmdOptions_Click(sender As Object, e As EventArgs) Handles cmdOptions.Click + sdgProportionsPercentages.SetRFunction(clsDefaultFunction, bResetSubdialog) + sdgProportionsPercentages.ShowDialog() + bResetSubdialog = False + End Sub + + Private Sub ucrChkProportionsPercentages_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkProportionsPercentages.ControlValueChanged + cmdOptions.Visible = ucrChkProportionsPercentages.Checked + End Sub + Private Sub ucrChkOrderBy_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkOrderBy.ControlValueChanged PositionOptions() OrderByCheckEnabled() diff --git a/instat/sdgTimeSeries.vb b/instat/sdgTimeSeries.vb index 708ca1bff9c..c6c7eafe921 100644 --- a/instat/sdgTimeSeries.vb +++ b/instat/sdgTimeSeries.vb @@ -56,6 +56,7 @@ Public Class sdgTimeSeries End Sub Public Sub InitialiseControls() + ucrButtonsSummaries.iHelpTopicID = 268 ucrPnlSummaries.AddRadioButton(rdoComparison) ucrPnlSummaries.AddRadioButton(rdoIndividual) diff --git a/instat/static/Help/R-Instat.chm b/instat/static/Help/R-Instat.chm index 9ee589aac54..30d29a7fd41 100644 Binary files a/instat/static/Help/R-Instat.chm and b/instat/static/Help/R-Instat.chm differ diff --git a/instat/static/InstatObject/R/InstallPackages.R b/instat/static/InstatObject/R/InstallPackages.R index 76ea0465941..c1e29a3c110 100644 --- a/instat/static/InstatObject/R/InstallPackages.R +++ b/instat/static/InstatObject/R/InstallPackages.R @@ -23,75 +23,76 @@ packs <- c("abind", "agricolae", "agridat", "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", - "datasauRus", "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", - "fivethirtyeight", "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", - "HH", "highr", "HistData", "Hmisc", "hms", - "htmlTable", "htmltools", "htmlwidgets", "httpuv", - "httr", "httr2", "hydroGOF", "hydroTSM", - "hypergeo", "igraph", "imputeTS", "infer", - "ini", "inline", "insight", "interp", - "intervals", "ipred", "ISLR", "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", "modeldata", "ModelMetrics", - "modelr", "modeltools", "moderndive", "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", + "CGPfunctions", "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", "datasauRus", "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", "fivethirtyeight", "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", "ggside", "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", "HH", "highr", "HistData", + "Hmisc", "hms", "htmlTable", "htmltools", + "htmlwidgets", "httpuv", "httr", "httr2", + "hydroGOF", "hydroTSM", "hypergeo", "igraph", + "imputeTS", "infer", "ini", "inline", + "insight", "interp", "intervals", "inum", + "ipred", "ISLR", "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", "modeldata", "ModelMetrics", "modelr", + "modeltools", "moderndive", "mosaic", "mosaicCore", + "mosaicData", "multcomp", "multcompView", "munsell", + "mvtnorm", "ncdf4.helpers", "ncdf4", "nlme", + "nloptr", "nnet", "nortest", "numDeriv", + "nycflights13", "openair", "openssl", "openxlsx", + "operator.tools", "paletteer", "parallelly", + "parameters", "partykit", "patchwork", "pbapply", "pbkrtest", "pbs", "PCICt", "performance", "pillar", "pingr", "pkgbuild", "pkgconfig", "pkgdown", "pkgload", "plogr", "plotly", @@ -112,7 +113,7 @@ packs <- c("abind", "agricolae", "agridat", "rematch2", "remotes", "repr", "reshape", "reshape2", "rio", "rje", "rlang", "rmarkdown", "RMAWGEN", "Rmpfr", - #"RMySQL", + #"RMySQL", "robustbase", "rootSolve", "roxygen2", "rpart", "rpivotTable", "rprojroot", "rrefine", "RSQLite", "rstan", @@ -130,12 +131,12 @@ packs <- c("abind", "agricolae", "agridat", "splus2R", "SQUAREM", "StanHeaders", "stars", "statip", "statquotes", "statsr", "stinepack", "stringdist", - #"stringi", - #"stringr", + #"stringi", + #"stringr", "strucchange", "styler", "survival", "svglite", "sys", "systemfonts", "tensorA", - #"terra", + #"terra", "testthat", "texmex", "textshaping", "TH.data", "threejs", "tibble", "tidyr", "tidyselect", "tidytext", @@ -159,4 +160,5 @@ install.packages(packs, dependencies = FALSE, repos='https://cloud.r-project.org devtools::install_github("ianmoran11/mmtable2") devtools::install_github("michael-franke/aida-package") devtools::install_github("rijaf-iri/CDT") +devtools::install_github("IDEMSInternational/rapidpror") diff --git a/instat/static/InstatObject/R/Rsetup.R b/instat/static/InstatObject/R/Rsetup.R index 02c5c196961..3d93cfdecf2 100644 --- a/instat/static/InstatObject/R/Rsetup.R +++ b/instat/static/InstatObject/R/Rsetup.R @@ -9,75 +9,76 @@ packs <- c("abind", "agricolae", "agridat", "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", - "datasauRus", "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", - "fivethirtyeight", "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", - "HH", "highr", "HistData", "Hmisc", "hms", - "htmlTable", "htmltools", "htmlwidgets", "httpuv", - "httr", "httr2", "hydroGOF", "hydroTSM", - "hypergeo", "igraph", "imputeTS", "infer", - "ini", "inline", "insight", "interp", - "intervals", "ipred", "ISLR", "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", "modeldata", "ModelMetrics", - "modelr", "modeltools", "moderndive", "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", + "CGPfunctions", "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", "datasauRus", "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", "fivethirtyeight", "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", "ggside", "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", "HH", "highr", "HistData", + "Hmisc", "hms", "htmlTable", "htmltools", + "htmlwidgets", "httpuv", "httr", "httr2", + "hydroGOF", "hydroTSM", "hypergeo", "igraph", + "imputeTS", "infer", "ini", "inline", + "insight", "interp", "intervals", "inum", + "ipred", "ISLR", "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", "modeldata", "ModelMetrics", "modelr", + "modeltools", "moderndive", "mosaic", "mosaicCore", + "mosaicData", "multcomp", "multcompView", "munsell", + "mvtnorm", "ncdf4.helpers", "ncdf4", "nlme", + "nloptr", "nnet", "nortest", "numDeriv", + "nycflights13", "openair", "openssl", "openxlsx", + "operator.tools", "paletteer", "parallelly", + "parameters", "partykit", "patchwork", "pbapply", "pbkrtest", "pbs", "PCICt", "performance", "pillar", "pingr", "pkgbuild", "pkgconfig", "pkgdown", "pkgload", "plogr", "plotly", @@ -147,14 +148,14 @@ versions <- c("1.4-5", "1.3-5", "1.21", "0.1.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", + "6.0-94", "1.1.0", "0.6.3", "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", @@ -178,59 +179,61 @@ versions <- c("1.4-5", "1.3-5", "1.21", "0.1.5", "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", "3.1-49", "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", "1.0.4", - "0.3.1", "0.3.19", "0.19.1", "1.1-4", - "0.15.3", "0.9-14", "1.4", "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.1.0", "1.2.2.2", "0.1.11", + "0.9.3", "0.5.4", "3.0.0", "0.2.2", "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", "3.1-49", + "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", "1.0.4", "0.3.1", "0.3.19", "0.19.1", + "1.1-4", "0.15.3", "1.0-5", "0.9-14", + "1.4", "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.1.0", "1.2.2.2", "0.1.11", "0.2-23", "0.5.5", "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.9-1", "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", + "1.2-20", "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.9-1", "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", diff --git a/instat/static/InstatObject/R/install_packages.R b/instat/static/InstatObject/R/install_packages.R index 7a4768079d3..2b2530cb11a 100644 --- a/instat/static/InstatObject/R/install_packages.R +++ b/instat/static/InstatObject/R/install_packages.R @@ -176,6 +176,8 @@ pkgs <- "waffle", # 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/static/InstatObject/R/instat_object_R6.R b/instat/static/InstatObject/R/instat_object_R6.R index 53a7c82fb5e..fd19d0d0f00 100644 --- a/instat/static/InstatObject/R/instat_object_R6.R +++ b/instat/static/InstatObject/R/instat_object_R6.R @@ -1921,14 +1921,14 @@ DataBook$set("public", "export_workspace", function(data_names, file, include_gr for(temp_name in data_names) { e[[temp_name]] <- self$get_data_frame(temp_name, use_current_filter = FALSE) if(include_graphs) { - graphs <- self$get_graphs(temp_name) + graphs <- self$get_objects(data_name = temp_name, object_type_label = "graph") graph_names <- names(graphs) for(i in seq_along(graphs)) { e[[paste(temp_name, graph_names[i], sep = "_")]] <- graphs[[i]] } } if(include_models) { - models <- self$get_models(temp_name) + models <- self$get_objects(data_name = temp_name, object_type_label = "model") model_names <- names(models) for(i in seq_along(models)) { e[[paste(temp_name, model_names[i], sep = "_")]] <- models[[i]] diff --git a/instat/static/InstatObject/R/stand_alone_functions.R b/instat/static/InstatObject/R/stand_alone_functions.R index 09f224a2981..904794d2d2c 100644 --- a/instat/static/InstatObject/R/stand_alone_functions.R +++ b/instat/static/InstatObject/R/stand_alone_functions.R @@ -2556,7 +2556,9 @@ is.containValueLabel <- function(x){ is.containPartialValueLabel <- function(x) { if(is.containValueLabel(x)) { - return(!all(x[!is.na(x)] %in% attr(x, labels_label))) + levelCounts <- table(x) + return(!all(x[!is.na(x)] %in% attr(x, labels_label)) && + sum(levelCounts == 0) == 0) } else{return(FALSE)} } @@ -3006,3 +3008,43 @@ getExample <- function (topic, package = NULL, lib.loc = NULL, character.only = } return(example_text) } + +WB_evaporation <- function(water_balance, frac, capacity, evaporation_value, rain){ + if (water_balance >= frac*capacity){ + evaporation <- evaporation_value + } else { + if (rain == 0){ + evaporation <- evaporation_value * ((water_balance)/(frac*capacity)) + } else { + if (water_balance < frac*capacity){ + if (rain > evaporation_value){ + evaporation <- evaporation_value + } else { + evaporation <- evaporation_value * ((water_balance)/(frac*capacity)) + evaporation <- evaporation + ((evaporation_value - evaporation)*(rain/evaporation_value)) + } + } else { + evaporation <- evaporation_value + } + } + } + return(evaporation) +} + +write_weather_data <- function(year, month, day, rain, mn_tmp, mx_tmp, missing_code, output_file) { + # Create a data frame with the provided inputs + weather_data <- data.frame(year = year, + month = month, + day = day, + rain = rain, + mn_tmp = mn_tmp, + mx_tmp = mx_tmp) + + # Replace missing values with the specified code + weather_data[is.na(weather_data)] <- missing_code + + # Write the data frame to a text file + write.table(weather_data, file = output_file, sep = "\t", row.names = FALSE, col.names = TRUE, quote = FALSE) + + cat("Weather data has been written to", output_file, "\n") +} \ No newline at end of file diff --git a/instat/translations/rInstatTranslations.db b/instat/translations/rInstatTranslations.db index 82986ede7c3..7ec022bba69 100644 Binary files a/instat/translations/rInstatTranslations.db and b/instat/translations/rInstatTranslations.db differ diff --git a/instat/ucrCalculator.Designer.vb b/instat/ucrCalculator.Designer.vb index 08a0b89ce46..9989539db07 100644 --- a/instat/ucrCalculator.Designer.vb +++ b/instat/ucrCalculator.Designer.vb @@ -62,7 +62,6 @@ Partial Class ucrCalculator Me.cmd0 = New System.Windows.Forms.Button() Me.cmd1 = New System.Windows.Forms.Button() Me.grpDates = New System.Windows.Forms.GroupBox() - Me.cmdRHelp = New instat.ucrSplitButton() Me.ContextMenuStripDate = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.DateLubridateToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.DateHmsToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() @@ -119,7 +118,6 @@ Partial Class ucrCalculator Me.cmdGCD = New System.Windows.Forms.Button() Me.cmdGeneratePrimes = New System.Windows.Forms.Button() Me.cmdNthPrime = New System.Windows.Forms.Button() - Me.cmdIntegerRHelp = New instat.ucrSplitButton() Me.ContextMenuStripInteger = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.GmpToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.DescToolsToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() @@ -142,7 +140,6 @@ Partial Class ucrCalculator Me.cmdIsPrime = New System.Windows.Forms.Button() Me.cmdBigZ = New System.Windows.Forms.Button() Me.grpFactor = New System.Windows.Forms.GroupBox() - Me.cmdTransformHelp = New instat.ucrSplitButton() Me.ContextMenuStripFactor = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.FactorForcatsToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.cmdShuffle = New System.Windows.Forms.Button() @@ -166,7 +163,6 @@ Partial Class ucrCalculator Me.cmdFactor = New System.Windows.Forms.Button() Me.cmdAnon = New System.Windows.Forms.Button() Me.grpHydroGOF = New System.Windows.Forms.GroupBox() - Me.cmdHydroHelp = New instat.ucrSplitButton() Me.ContextMenuStripHydroGOF = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.HydroGOFToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.cmdVE = New System.Windows.Forms.Button() @@ -177,7 +173,7 @@ Partial Class ucrCalculator Me.cmdRNSE = New System.Windows.Forms.Button() Me.cmdRmse = New System.Windows.Forms.Button() Me.cmdRd = New System.Windows.Forms.Button() - Me.cmdPbiasfde = New System.Windows.Forms.Button() + Me.cmdPbiasfdc = New System.Windows.Forms.Button() Me.cmdPbias = New System.Windows.Forms.Button() Me.cmdNSE = New System.Windows.Forms.Button() Me.cmdNrmse = New System.Windows.Forms.Button() @@ -191,15 +187,15 @@ Partial Class ucrCalculator Me.cmdCp = New System.Windows.Forms.Button() Me.cmdBr2 = New System.Windows.Forms.Button() Me.grpWakefield = New System.Windows.Forms.GroupBox() - Me.cmdLinkert7 = New System.Windows.Forms.Button() + Me.cmdLikert7 = New System.Windows.Forms.Button() Me.cmdWakefield_Year = New System.Windows.Forms.Button() Me.cmdValid = New System.Windows.Forms.Button() - Me.cmdWakefield_Upper = New System.Windows.Forms.Button() + Me.cmdWakefieldUpper = New System.Windows.Forms.Button() Me.cmdString = New System.Windows.Forms.Button() Me.cmdState = New System.Windows.Forms.Button() Me.cmdSpeed = New System.Windows.Forms.Button() Me.cmdSmokes = New System.Windows.Forms.Button() - Me.cmdSex = New System.Windows.Forms.Button() + Me.cmdWakefieldTimes = New System.Windows.Forms.Button() Me.cmdSex_Inclusive = New System.Windows.Forms.Button() Me.cmdGender = New System.Windows.Forms.Button() Me.cmdSentence = New System.Windows.Forms.Button() @@ -215,9 +211,9 @@ Partial Class ucrCalculator Me.cmdLorem_ipsum = New System.Windows.Forms.Button() Me.cmdLikert = New System.Windows.Forms.Button() Me.cmdGpa = New System.Windows.Forms.Button() - Me.cmdEla = New System.Windows.Forms.Button() + Me.cmdWakefieldMinute = New System.Windows.Forms.Button() Me.cmdMath = New System.Windows.Forms.Button() - Me.cmdLevel = New System.Windows.Forms.Button() + Me.cmdWakefieldLower = New System.Windows.Forms.Button() Me.cmdLanguage = New System.Windows.Forms.Button() Me.cmdIq = New System.Windows.Forms.Button() Me.cmdInternet_Browser = New System.Windows.Forms.Button() @@ -229,9 +225,9 @@ Partial Class ucrCalculator Me.cmdDob = New System.Windows.Forms.Button() Me.cmdDna = New System.Windows.Forms.Button() Me.cmdDice = New System.Windows.Forms.Button() - Me.cmdDied = New System.Windows.Forms.Button() + Me.cmdGrade_Letter = New System.Windows.Forms.Button() Me.cmdDeath = New System.Windows.Forms.Button() - Me.cmdDate_Stamp = New System.Windows.Forms.Button() + Me.cmdWakefieldDates = New System.Windows.Forms.Button() Me.cmdPrimary = New System.Windows.Forms.Button() Me.cmdColor = New System.Windows.Forms.Button() Me.cmdCoin = New System.Windows.Forms.Button() @@ -247,9 +243,11 @@ Partial Class ucrCalculator Me.cmdGroup = New System.Windows.Forms.Button() Me.cmdGrade = New System.Windows.Forms.Button() Me.grpMaths = New System.Windows.Forms.GroupBox() - Me.cmdMathsHelp = New instat.ucrSplitButton() Me.ContextMenuStripMaths = New System.Windows.Forms.ContextMenuStrip(Me.components) + Me.MathsBaseStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.MathsStatsStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.MathsCarToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.MathsCircularToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.cmdAtan2 = New System.Windows.Forms.Button() Me.cmdLogistic = New System.Windows.Forms.Button() Me.cmdLogit = New System.Windows.Forms.Button() @@ -274,7 +272,10 @@ Partial Class ucrCalculator Me.cmdCos = New System.Windows.Forms.Button() Me.cmdSqrt = New System.Windows.Forms.Button() Me.grpSummary = New System.Windows.Forms.GroupBox() - Me.cmdSummaryRHelp = New instat.ucrSplitButton() + Me.cmdwheremin = New System.Windows.Forms.Button() + Me.cmdwhichmax = New System.Windows.Forms.Button() + Me.cmdwheremax = New System.Windows.Forms.Button() + Me.cmdwhichmin = New System.Windows.Forms.Button() Me.ContextMenuStripSummary = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.BaseToolStripMenuItem1 = New System.Windows.Forms.ToolStripMenuItem() Me.StatsToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() @@ -328,7 +329,6 @@ Partial Class ucrCalculator Me.cmdVar = New System.Windows.Forms.Button() Me.grpProbabilty = New System.Windows.Forms.GroupBox() Me.cmdPascal = New System.Windows.Forms.Button() - Me.cmdProbRHelp = New instat.ucrSplitButton() Me.ContextMenuStripProbability = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.ProbStatsToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.ProbBaseToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() @@ -377,7 +377,6 @@ Partial Class ucrCalculator Me.cmdDecimals = New System.Windows.Forms.Button() Me.cmdMASSFractions = New System.Windows.Forms.Button() Me.cmdScale = New System.Windows.Forms.Button() - Me.cmdTransformRHelp = New instat.ucrSplitButton() Me.ContextMenuStripTransform = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.BaseToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.DplyrToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() @@ -412,7 +411,6 @@ Partial Class ucrCalculator Me.cmdLead = New System.Windows.Forms.Button() Me.cmdLag = New System.Windows.Forms.Button() Me.grpLogical = New System.Windows.Forms.GroupBox() - Me.cmdLogicalHelp = New instat.ucrSplitButton() Me.ContextMenuStripLogical = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.LogBaseToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.LogDplyrToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() @@ -460,7 +458,6 @@ Partial Class ucrCalculator Me.cmdLocate2 = New System.Windows.Forms.Button() Me.cmdExtract2 = New System.Windows.Forms.Button() Me.cmdEncodeb = New System.Windows.Forms.Button() - Me.cmdSquishb = New System.Windows.Forms.Button() Me.cmdSub = New System.Windows.Forms.Button() Me.cmdCombine = New System.Windows.Forms.Button() Me.cmdDetect = New System.Windows.Forms.Button() @@ -474,13 +471,13 @@ Partial Class ucrCalculator Me.cmdExtract = New System.Windows.Forms.Button() Me.cmdCountstrings = New System.Windows.Forms.Button() Me.cmdLocate = New System.Windows.Forms.Button() + Me.cmdSquishb = New System.Windows.Forms.Button() Me.ttCalculator = New System.Windows.Forms.ToolTip(Me.components) Me.grpCircular = New System.Windows.Forms.GroupBox() - Me.cmdCircularHelp = New instat.ucrSplitButton() Me.ContextMenuStripCircular = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.CircularToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.cmdCircular = New System.Windows.Forms.Button() - Me.cmdCircQuantile = New System.Windows.Forms.Button() + Me.cmdCircQuantiles = New System.Windows.Forms.Button() Me.cmdCircMax = New System.Windows.Forms.Button() Me.cmdA1 = New System.Windows.Forms.Button() Me.cmdAngVar = New System.Windows.Forms.Button() @@ -517,7 +514,8 @@ Partial Class ucrCalculator Me.cmdbegin = New System.Windows.Forms.Button() Me.cmdAny1 = New System.Windows.Forms.Button() Me.grpComplex = New System.Windows.Forms.GroupBox() - Me.cmdComplexRHelp = New instat.ucrSplitButton() + Me.cmdAsComplex = New System.Windows.Forms.Button() + Me.cmdComplexi = New System.Windows.Forms.Button() Me.cmdComplexTanH = New System.Windows.Forms.Button() Me.cmdComplexTan = New System.Windows.Forms.Button() Me.cmdComplexPi = New System.Windows.Forms.Button() @@ -537,7 +535,7 @@ Partial Class ucrCalculator Me.cmdMod = New System.Windows.Forms.Button() Me.cmdImaginary = New System.Windows.Forms.Button() Me.cmdReal = New System.Windows.Forms.Button() - Me.cmdAsComplex = New System.Windows.Forms.Button() + Me.cmdComplex = New System.Windows.Forms.Button() Me.ContextMenuStripTxtString = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.TxTStringrToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.TxTBaseToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() @@ -608,50 +606,62 @@ Partial Class ucrCalculator Me.ucrInputCalOptions = New instat.ucrInputComboBox() Me.ucrSelectorForCalculations = New instat.ucrSelectorByDataFrameAddRemove() Me.ucrReceiverForCalculation = New instat.ucrReceiverExpression() - Me.grpBasic.SuspendLayout() - Me.grpDates.SuspendLayout() - Me.ContextMenuStripDate.SuspendLayout() - Me.ContextMenuStripComplex.SuspendLayout() - Me.grpInteger.SuspendLayout() - Me.ContextMenuStripInteger.SuspendLayout() - Me.grpFactor.SuspendLayout() - Me.ContextMenuStripFactor.SuspendLayout() - Me.grpHydroGOF.SuspendLayout() - Me.ContextMenuStripHydroGOF.SuspendLayout() - Me.grpWakefield.SuspendLayout() - Me.grpMaths.SuspendLayout() - Me.ContextMenuStripMaths.SuspendLayout() - Me.grpSummary.SuspendLayout() - Me.ContextMenuStripSummary.SuspendLayout() - Me.grpFrequencies.SuspendLayout() - Me.grpProbabilty.SuspendLayout() - Me.ContextMenuStripProbability.SuspendLayout() - Me.grpRandom.SuspendLayout() - Me.grpTransform.SuspendLayout() - Me.ContextMenuStripTransform.SuspendLayout() - Me.grpLogical.SuspendLayout() - Me.ContextMenuStripLogical.SuspendLayout() - Me.grpTestString.SuspendLayout() - Me.grpCircular.SuspendLayout() - Me.ContextMenuStripCircular.SuspendLayout() - Me.grpModifier.SuspendLayout() - Me.grpSymbols.SuspendLayout() - Me.grpComplex.SuspendLayout() - Me.ContextMenuStripTxtString.SuspendLayout() - Me.ContextMenuStripWakefield.SuspendLayout() - Me.ContextMenuStripList.SuspendLayout() - Me.grpList.SuspendLayout() - Me.GroupBox1.SuspendLayout() - Me.grpMathBloc.SuspendLayout() - Me.SuspendLayout() + Me.cmdCircularHelp = New instat.ucrSplitButton() + Me.cmdMathsHelp = New instat.ucrSplitButton() + Me.cmdProbRHelp = New instat.ucrSplitButton() + Me.cmdIntegerRHelp = New instat.ucrSplitButton() + Me.cmdComplexRHelp = New instat.ucrSplitButton() + Me.cmdSummaryRHelp = New instat.ucrSplitButton() + Me.cmdTransformRHelp = New instat.ucrSplitButton() + Me.cmdLogicalHelp = New instat.ucrSplitButton() + Me.cmdRHelp = New instat.ucrSplitButton() + Me.cmdHydroHelp = New instat.ucrSplitButton() + Me.cmdTransformHelp = New instat.ucrSplitButton() + Me.grpBasic.SuspendLayout + Me.grpDates.SuspendLayout + Me.ContextMenuStripDate.SuspendLayout + Me.ContextMenuStripComplex.SuspendLayout + Me.grpInteger.SuspendLayout + Me.ContextMenuStripInteger.SuspendLayout + Me.grpFactor.SuspendLayout + Me.ContextMenuStripFactor.SuspendLayout + Me.grpHydroGOF.SuspendLayout + Me.ContextMenuStripHydroGOF.SuspendLayout + Me.grpWakefield.SuspendLayout + Me.grpMaths.SuspendLayout + Me.ContextMenuStripMaths.SuspendLayout + Me.grpSummary.SuspendLayout + Me.ContextMenuStripSummary.SuspendLayout + Me.grpFrequencies.SuspendLayout + Me.grpProbabilty.SuspendLayout + Me.ContextMenuStripProbability.SuspendLayout + Me.grpRandom.SuspendLayout + Me.grpTransform.SuspendLayout + Me.ContextMenuStripTransform.SuspendLayout + Me.grpLogical.SuspendLayout + Me.ContextMenuStripLogical.SuspendLayout + Me.grpTestString.SuspendLayout + Me.grpCircular.SuspendLayout + Me.ContextMenuStripCircular.SuspendLayout + Me.grpModifier.SuspendLayout + Me.grpSymbols.SuspendLayout + Me.grpComplex.SuspendLayout + Me.ContextMenuStripTxtString.SuspendLayout + Me.ContextMenuStripWakefield.SuspendLayout + Me.ContextMenuStripList.SuspendLayout + Me.grpList.SuspendLayout + Me.GroupBox1.SuspendLayout + Me.grpMathBloc.SuspendLayout + Me.SuspendLayout ' 'lblExpression ' Me.lblExpression.AutoSize = True Me.lblExpression.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblExpression.Location = New System.Drawing.Point(9, 15) + Me.lblExpression.Location = New System.Drawing.Point(8, 12) + Me.lblExpression.Margin = New System.Windows.Forms.Padding(2, 0, 2, 0) Me.lblExpression.Name = "lblExpression" - Me.lblExpression.Size = New System.Drawing.Size(91, 20) + Me.lblExpression.Size = New System.Drawing.Size(77, 16) Me.lblExpression.TabIndex = 119 Me.lblExpression.Tag = "Expression" Me.lblExpression.Text = "Expression:" @@ -660,10 +670,9 @@ Partial Class ucrCalculator ' Me.chkShowParameters.AutoSize = True Me.chkShowParameters.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.chkShowParameters.Location = New System.Drawing.Point(105, 62) - Me.chkShowParameters.Margin = New System.Windows.Forms.Padding(4) + Me.chkShowParameters.Location = New System.Drawing.Point(88, 52) Me.chkShowParameters.Name = "chkShowParameters" - Me.chkShowParameters.Size = New System.Drawing.Size(161, 24) + Me.chkShowParameters.Size = New System.Drawing.Size(135, 20) Me.chkShowParameters.TabIndex = 181 Me.chkShowParameters.Text = "Show Parameters" Me.chkShowParameters.UseVisualStyleBackColor = True @@ -689,11 +698,11 @@ Partial Class ucrCalculator Me.grpBasic.Controls.Add(Me.cmd2) Me.grpBasic.Controls.Add(Me.cmd0) Me.grpBasic.Controls.Add(Me.cmd1) - Me.grpBasic.Location = New System.Drawing.Point(334, 104) - Me.grpBasic.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.grpBasic.Location = New System.Drawing.Point(278, 87) + Me.grpBasic.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.grpBasic.Name = "grpBasic" - Me.grpBasic.Padding = New System.Windows.Forms.Padding(3, 4, 3, 4) - Me.grpBasic.Size = New System.Drawing.Size(308, 201) + Me.grpBasic.Padding = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.grpBasic.Size = New System.Drawing.Size(257, 168) Me.grpBasic.TabIndex = 179 Me.grpBasic.TabStop = False Me.grpBasic.Text = "Basic" @@ -701,10 +710,10 @@ Partial Class ucrCalculator 'cmdClear ' Me.cmdClear.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdClear.Location = New System.Drawing.Point(226, 106) - Me.cmdClear.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdClear.Location = New System.Drawing.Point(188, 88) + Me.cmdClear.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdClear.Name = "cmdClear" - Me.cmdClear.Size = New System.Drawing.Size(74, 90) + Me.cmdClear.Size = New System.Drawing.Size(62, 75) Me.cmdClear.TabIndex = 190 Me.cmdClear.Text = "Clear" Me.cmdClear.UseVisualStyleBackColor = True @@ -713,10 +722,10 @@ Partial Class ucrCalculator ' Me.cmdComma.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!) Me.cmdComma.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdComma.Location = New System.Drawing.Point(4, 150) - Me.cmdComma.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdComma.Location = New System.Drawing.Point(3, 125) + Me.cmdComma.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdComma.Name = "cmdComma" - Me.cmdComma.Size = New System.Drawing.Size(57, 45) + Me.cmdComma.Size = New System.Drawing.Size(48, 38) Me.cmdComma.TabIndex = 138 Me.cmdComma.Text = "," Me.cmdComma.UseVisualStyleBackColor = True @@ -724,10 +733,10 @@ Partial Class ucrCalculator 'cmdBrackets ' Me.cmdBrackets.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdBrackets.Location = New System.Drawing.Point(116, 150) - Me.cmdBrackets.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdBrackets.Location = New System.Drawing.Point(97, 125) + Me.cmdBrackets.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdBrackets.Name = "cmdBrackets" - Me.cmdBrackets.Size = New System.Drawing.Size(57, 45) + Me.cmdBrackets.Size = New System.Drawing.Size(48, 38) Me.cmdBrackets.TabIndex = 136 Me.cmdBrackets.Text = "( )" Me.cmdBrackets.UseVisualStyleBackColor = True @@ -736,10 +745,10 @@ Partial Class ucrCalculator ' Me.cmdPower.Font = New System.Drawing.Font("Microsoft Sans Serif", 14.25!) Me.cmdPower.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdPower.Location = New System.Drawing.Point(226, 63) - Me.cmdPower.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdPower.Location = New System.Drawing.Point(188, 52) + Me.cmdPower.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdPower.Name = "cmdPower" - Me.cmdPower.Size = New System.Drawing.Size(74, 45) + Me.cmdPower.Size = New System.Drawing.Size(62, 38) Me.cmdPower.TabIndex = 133 Me.cmdPower.Text = "^" Me.cmdPower.UseVisualStyleBackColor = True @@ -748,10 +757,10 @@ Partial Class ucrCalculator ' Me.cmdDivide.Font = New System.Drawing.Font("Microsoft Sans Serif", 14.25!) Me.cmdDivide.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdDivide.Location = New System.Drawing.Point(171, 20) - Me.cmdDivide.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdDivide.Location = New System.Drawing.Point(142, 17) + Me.cmdDivide.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdDivide.Name = "cmdDivide" - Me.cmdDivide.Size = New System.Drawing.Size(57, 45) + Me.cmdDivide.Size = New System.Drawing.Size(48, 38) Me.cmdDivide.TabIndex = 131 Me.cmdDivide.Text = "/" Me.cmdDivide.UseVisualStyleBackColor = True @@ -760,10 +769,10 @@ Partial Class ucrCalculator ' Me.cmdPlus.Font = New System.Drawing.Font("Microsoft Sans Serif", 14.25!) Me.cmdPlus.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdPlus.Location = New System.Drawing.Point(171, 150) - Me.cmdPlus.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdPlus.Location = New System.Drawing.Point(142, 125) + Me.cmdPlus.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdPlus.Name = "cmdPlus" - Me.cmdPlus.Size = New System.Drawing.Size(57, 45) + Me.cmdPlus.Size = New System.Drawing.Size(48, 38) Me.cmdPlus.TabIndex = 130 Me.cmdPlus.Text = "+" Me.cmdPlus.UseVisualStyleBackColor = True @@ -772,10 +781,10 @@ Partial Class ucrCalculator ' Me.cmdMinus.Font = New System.Drawing.Font("Microsoft Sans Serif", 14.25!) Me.cmdMinus.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdMinus.Location = New System.Drawing.Point(171, 106) - Me.cmdMinus.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdMinus.Location = New System.Drawing.Point(142, 88) + Me.cmdMinus.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdMinus.Name = "cmdMinus" - Me.cmdMinus.Size = New System.Drawing.Size(57, 45) + Me.cmdMinus.Size = New System.Drawing.Size(48, 38) Me.cmdMinus.TabIndex = 129 Me.cmdMinus.Text = "-" Me.cmdMinus.UseVisualStyleBackColor = True @@ -784,10 +793,10 @@ Partial Class ucrCalculator ' Me.cmdMultiply.Font = New System.Drawing.Font("Microsoft Sans Serif", 14.25!) Me.cmdMultiply.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdMultiply.Location = New System.Drawing.Point(171, 63) - Me.cmdMultiply.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdMultiply.Location = New System.Drawing.Point(142, 52) + Me.cmdMultiply.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdMultiply.Name = "cmdMultiply" - Me.cmdMultiply.Size = New System.Drawing.Size(57, 45) + Me.cmdMultiply.Size = New System.Drawing.Size(48, 38) Me.cmdMultiply.TabIndex = 128 Me.cmdMultiply.Text = "*" Me.cmdMultiply.UseVisualStyleBackColor = True @@ -796,10 +805,10 @@ Partial Class ucrCalculator ' Me.cmdDot.Font = New System.Drawing.Font("Microsoft Sans Serif", 14.25!) Me.cmdDot.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdDot.Location = New System.Drawing.Point(226, 20) - Me.cmdDot.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdDot.Location = New System.Drawing.Point(188, 17) + Me.cmdDot.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdDot.Name = "cmdDot" - Me.cmdDot.Size = New System.Drawing.Size(74, 45) + Me.cmdDot.Size = New System.Drawing.Size(62, 38) Me.cmdDot.TabIndex = 127 Me.cmdDot.Text = "." Me.cmdDot.UseVisualStyleBackColor = True @@ -807,10 +816,10 @@ Partial Class ucrCalculator 'cmd9 ' Me.cmd9.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmd9.Location = New System.Drawing.Point(116, 20) - Me.cmd9.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmd9.Location = New System.Drawing.Point(97, 17) + Me.cmd9.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmd9.Name = "cmd9" - Me.cmd9.Size = New System.Drawing.Size(57, 45) + Me.cmd9.Size = New System.Drawing.Size(48, 38) Me.cmd9.TabIndex = 126 Me.cmd9.Text = "9" Me.cmd9.UseVisualStyleBackColor = True @@ -818,10 +827,10 @@ Partial Class ucrCalculator 'cmd8 ' Me.cmd8.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmd8.Location = New System.Drawing.Point(60, 20) - Me.cmd8.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmd8.Location = New System.Drawing.Point(50, 17) + Me.cmd8.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmd8.Name = "cmd8" - Me.cmd8.Size = New System.Drawing.Size(57, 45) + Me.cmd8.Size = New System.Drawing.Size(48, 38) Me.cmd8.TabIndex = 125 Me.cmd8.Text = "8" Me.cmd8.UseVisualStyleBackColor = True @@ -829,10 +838,10 @@ Partial Class ucrCalculator 'cmd7 ' Me.cmd7.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmd7.Location = New System.Drawing.Point(4, 20) - Me.cmd7.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmd7.Location = New System.Drawing.Point(3, 17) + Me.cmd7.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmd7.Name = "cmd7" - Me.cmd7.Size = New System.Drawing.Size(57, 45) + Me.cmd7.Size = New System.Drawing.Size(48, 38) Me.cmd7.TabIndex = 124 Me.cmd7.Text = "7" Me.cmd7.UseVisualStyleBackColor = True @@ -840,10 +849,10 @@ Partial Class ucrCalculator 'cmd6 ' Me.cmd6.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmd6.Location = New System.Drawing.Point(116, 63) - Me.cmd6.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmd6.Location = New System.Drawing.Point(97, 52) + Me.cmd6.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmd6.Name = "cmd6" - Me.cmd6.Size = New System.Drawing.Size(57, 45) + Me.cmd6.Size = New System.Drawing.Size(48, 38) Me.cmd6.TabIndex = 123 Me.cmd6.Text = "6" Me.cmd6.UseVisualStyleBackColor = True @@ -851,10 +860,10 @@ Partial Class ucrCalculator 'cmd5 ' Me.cmd5.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmd5.Location = New System.Drawing.Point(60, 63) - Me.cmd5.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmd5.Location = New System.Drawing.Point(50, 52) + Me.cmd5.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmd5.Name = "cmd5" - Me.cmd5.Size = New System.Drawing.Size(57, 45) + Me.cmd5.Size = New System.Drawing.Size(48, 38) Me.cmd5.TabIndex = 122 Me.cmd5.Text = "5" Me.cmd5.UseVisualStyleBackColor = True @@ -862,10 +871,10 @@ Partial Class ucrCalculator 'cmd4 ' Me.cmd4.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmd4.Location = New System.Drawing.Point(4, 63) - Me.cmd4.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmd4.Location = New System.Drawing.Point(3, 52) + Me.cmd4.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmd4.Name = "cmd4" - Me.cmd4.Size = New System.Drawing.Size(57, 45) + Me.cmd4.Size = New System.Drawing.Size(48, 38) Me.cmd4.TabIndex = 121 Me.cmd4.Text = "4" Me.cmd4.UseVisualStyleBackColor = True @@ -873,10 +882,10 @@ Partial Class ucrCalculator 'cmd3 ' Me.cmd3.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmd3.Location = New System.Drawing.Point(116, 106) - Me.cmd3.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmd3.Location = New System.Drawing.Point(97, 88) + Me.cmd3.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmd3.Name = "cmd3" - Me.cmd3.Size = New System.Drawing.Size(57, 45) + Me.cmd3.Size = New System.Drawing.Size(48, 38) Me.cmd3.TabIndex = 120 Me.cmd3.Text = "3" Me.cmd3.UseVisualStyleBackColor = True @@ -884,10 +893,10 @@ Partial Class ucrCalculator 'cmd2 ' Me.cmd2.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmd2.Location = New System.Drawing.Point(60, 106) - Me.cmd2.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmd2.Location = New System.Drawing.Point(50, 88) + Me.cmd2.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmd2.Name = "cmd2" - Me.cmd2.Size = New System.Drawing.Size(57, 45) + Me.cmd2.Size = New System.Drawing.Size(48, 38) Me.cmd2.TabIndex = 119 Me.cmd2.Text = "2" Me.cmd2.UseVisualStyleBackColor = True @@ -895,10 +904,10 @@ Partial Class ucrCalculator 'cmd0 ' Me.cmd0.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmd0.Location = New System.Drawing.Point(60, 150) - Me.cmd0.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmd0.Location = New System.Drawing.Point(50, 125) + Me.cmd0.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmd0.Name = "cmd0" - Me.cmd0.Size = New System.Drawing.Size(57, 45) + Me.cmd0.Size = New System.Drawing.Size(48, 38) Me.cmd0.TabIndex = 118 Me.cmd0.Text = "0" Me.cmd0.UseVisualStyleBackColor = True @@ -906,10 +915,10 @@ Partial Class ucrCalculator 'cmd1 ' Me.cmd1.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmd1.Location = New System.Drawing.Point(4, 106) - Me.cmd1.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmd1.Location = New System.Drawing.Point(3, 88) + Me.cmd1.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmd1.Name = "cmd1" - Me.cmd1.Size = New System.Drawing.Size(57, 45) + Me.cmd1.Size = New System.Drawing.Size(48, 38) Me.cmd1.TabIndex = 117 Me.cmd1.Text = "1" Me.cmd1.UseVisualStyleBackColor = True @@ -936,55 +945,39 @@ Partial Class ucrCalculator Me.grpDates.Controls.Add(Me.cmdMdy) Me.grpDates.Controls.Add(Me.cmdYmd) Me.grpDates.Controls.Add(Me.cmdLeap) - Me.grpDates.Location = New System.Drawing.Point(651, 93) - Me.grpDates.Margin = New System.Windows.Forms.Padding(4) + Me.grpDates.Location = New System.Drawing.Point(542, 78) Me.grpDates.Name = "grpDates" - Me.grpDates.Padding = New System.Windows.Forms.Padding(4) Me.grpDates.RightToLeft = System.Windows.Forms.RightToLeft.No - Me.grpDates.Size = New System.Drawing.Size(366, 243) + Me.grpDates.Size = New System.Drawing.Size(305, 205) Me.grpDates.TabIndex = 188 Me.grpDates.TabStop = False Me.grpDates.Text = "Dates/Times" ' - 'cmdRHelp - ' - Me.cmdRHelp.AutoSize = True - Me.cmdRHelp.ContextMenuStrip = Me.ContextMenuStripDate - Me.cmdRHelp.Location = New System.Drawing.Point(222, 202) - Me.cmdRHelp.Margin = New System.Windows.Forms.Padding(4) - Me.cmdRHelp.Name = "cmdRHelp" - Me.cmdRHelp.Size = New System.Drawing.Size(136, 45) - Me.cmdRHelp.SplitMenuStrip = Me.ContextMenuStripDate - Me.cmdRHelp.TabIndex = 212 - Me.cmdRHelp.Text = "R Help" - Me.cmdRHelp.UseVisualStyleBackColor = True - ' 'ContextMenuStripDate ' Me.ContextMenuStripDate.ImageScalingSize = New System.Drawing.Size(24, 24) Me.ContextMenuStripDate.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.DateLubridateToolStripMenuItem, Me.DateHmsToolStripMenuItem}) Me.ContextMenuStripDate.Name = "ContextMenuStrip1" - Me.ContextMenuStripDate.Size = New System.Drawing.Size(155, 68) + Me.ContextMenuStripDate.Size = New System.Drawing.Size(139, 52) ' 'DateLubridateToolStripMenuItem ' Me.DateLubridateToolStripMenuItem.Name = "DateLubridateToolStripMenuItem" - Me.DateLubridateToolStripMenuItem.Size = New System.Drawing.Size(154, 32) + Me.DateLubridateToolStripMenuItem.Size = New System.Drawing.Size(138, 24) Me.DateLubridateToolStripMenuItem.Text = "lubridate" ' 'DateHmsToolStripMenuItem ' Me.DateHmsToolStripMenuItem.Name = "DateHmsToolStripMenuItem" - Me.DateHmsToolStripMenuItem.Size = New System.Drawing.Size(154, 32) + Me.DateHmsToolStripMenuItem.Size = New System.Drawing.Size(138, 24) Me.DateHmsToolStripMenuItem.Text = "hms" ' 'cmdPm ' Me.cmdPm.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdPm.Location = New System.Drawing.Point(6, 195) - Me.cmdPm.Margin = New System.Windows.Forms.Padding(4) + Me.cmdPm.Location = New System.Drawing.Point(5, 162) Me.cmdPm.Name = "cmdPm" - Me.cmdPm.Size = New System.Drawing.Size(90, 45) + Me.cmdPm.Size = New System.Drawing.Size(75, 38) Me.cmdPm.TabIndex = 161 Me.cmdPm.Text = "pm" Me.cmdPm.UseVisualStyleBackColor = True @@ -992,10 +985,10 @@ Partial Class ucrCalculator 'cmdTime ' Me.cmdTime.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdTime.Location = New System.Drawing.Point(183, 21) - Me.cmdTime.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdTime.Location = New System.Drawing.Point(152, 18) + Me.cmdTime.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdTime.Name = "cmdTime" - Me.cmdTime.Size = New System.Drawing.Size(90, 45) + Me.cmdTime.Size = New System.Drawing.Size(75, 38) Me.cmdTime.TabIndex = 160 Me.cmdTime.Text = "time" Me.cmdTime.UseVisualStyleBackColor = True @@ -1003,10 +996,10 @@ Partial Class ucrCalculator 'cmdDateTime ' Me.cmdDateTime.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdDateTime.Location = New System.Drawing.Point(94, 21) - Me.cmdDateTime.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdDateTime.Location = New System.Drawing.Point(78, 18) + Me.cmdDateTime.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdDateTime.Name = "cmdDateTime" - Me.cmdDateTime.Size = New System.Drawing.Size(90, 45) + Me.cmdDateTime.Size = New System.Drawing.Size(75, 38) Me.cmdDateTime.TabIndex = 159 Me.cmdDateTime.Text = "datetime" Me.cmdDateTime.UseVisualStyleBackColor = True @@ -1014,10 +1007,9 @@ Partial Class ucrCalculator 'cmdQuarter ' Me.cmdQuarter.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdQuarter.Location = New System.Drawing.Point(94, 195) - Me.cmdQuarter.Margin = New System.Windows.Forms.Padding(4) + Me.cmdQuarter.Location = New System.Drawing.Point(78, 162) Me.cmdQuarter.Name = "cmdQuarter" - Me.cmdQuarter.Size = New System.Drawing.Size(90, 45) + Me.cmdQuarter.Size = New System.Drawing.Size(75, 38) Me.cmdQuarter.TabIndex = 157 Me.cmdQuarter.Text = "quarter" Me.cmdQuarter.UseVisualStyleBackColor = True @@ -1025,10 +1017,9 @@ Partial Class ucrCalculator 'cmdD_In_M ' Me.cmdD_In_M.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdD_In_M.Location = New System.Drawing.Point(94, 64) - Me.cmdD_In_M.Margin = New System.Windows.Forms.Padding(4) + Me.cmdD_In_M.Location = New System.Drawing.Point(78, 53) Me.cmdD_In_M.Name = "cmdD_In_M" - Me.cmdD_In_M.Size = New System.Drawing.Size(90, 45) + Me.cmdD_In_M.Size = New System.Drawing.Size(75, 38) Me.cmdD_In_M.TabIndex = 156 Me.cmdD_In_M.Text = "d_in_m" Me.cmdD_In_M.UseVisualStyleBackColor = True @@ -1036,10 +1027,9 @@ Partial Class ucrCalculator 'cmdAm ' Me.cmdAm.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdAm.Location = New System.Drawing.Point(272, 152) - Me.cmdAm.Margin = New System.Windows.Forms.Padding(4) + Me.cmdAm.Location = New System.Drawing.Point(227, 127) Me.cmdAm.Name = "cmdAm" - Me.cmdAm.Size = New System.Drawing.Size(90, 45) + Me.cmdAm.Size = New System.Drawing.Size(75, 38) Me.cmdAm.TabIndex = 155 Me.cmdAm.Text = "am" Me.cmdAm.UseVisualStyleBackColor = True @@ -1047,10 +1037,9 @@ Partial Class ucrCalculator 'cmdSec ' Me.cmdSec.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdSec.Location = New System.Drawing.Point(183, 152) - Me.cmdSec.Margin = New System.Windows.Forms.Padding(4) + Me.cmdSec.Location = New System.Drawing.Point(152, 127) Me.cmdSec.Name = "cmdSec" - Me.cmdSec.Size = New System.Drawing.Size(90, 45) + Me.cmdSec.Size = New System.Drawing.Size(75, 38) Me.cmdSec.TabIndex = 154 Me.cmdSec.Text = "sec" Me.cmdSec.UseVisualStyleBackColor = True @@ -1058,10 +1047,9 @@ Partial Class ucrCalculator 'cmdHour ' Me.cmdHour.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdHour.Location = New System.Drawing.Point(6, 152) - Me.cmdHour.Margin = New System.Windows.Forms.Padding(4) + Me.cmdHour.Location = New System.Drawing.Point(5, 127) Me.cmdHour.Name = "cmdHour" - Me.cmdHour.Size = New System.Drawing.Size(90, 45) + Me.cmdHour.Size = New System.Drawing.Size(75, 38) Me.cmdHour.TabIndex = 153 Me.cmdHour.Text = "hour" Me.cmdHour.UseVisualStyleBackColor = True @@ -1069,10 +1057,9 @@ Partial Class ucrCalculator 'cmdminutes ' Me.cmdminutes.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdminutes.Location = New System.Drawing.Point(94, 152) - Me.cmdminutes.Margin = New System.Windows.Forms.Padding(4) + Me.cmdminutes.Location = New System.Drawing.Point(78, 127) Me.cmdminutes.Name = "cmdminutes" - Me.cmdminutes.Size = New System.Drawing.Size(90, 45) + Me.cmdminutes.Size = New System.Drawing.Size(75, 38) Me.cmdminutes.TabIndex = 152 Me.cmdminutes.Text = "min" Me.cmdminutes.UseVisualStyleBackColor = True @@ -1080,10 +1067,10 @@ Partial Class ucrCalculator 'cmdDmy ' Me.cmdDmy.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdDmy.Location = New System.Drawing.Point(94, 108) - Me.cmdDmy.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdDmy.Location = New System.Drawing.Point(78, 90) + Me.cmdDmy.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdDmy.Name = "cmdDmy" - Me.cmdDmy.Size = New System.Drawing.Size(90, 45) + Me.cmdDmy.Size = New System.Drawing.Size(75, 38) Me.cmdDmy.TabIndex = 151 Me.cmdDmy.Tag = "dmy" Me.cmdDmy.Text = "dmy" @@ -1092,10 +1079,10 @@ Partial Class ucrCalculator 'cmdDay ' Me.cmdDay.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdDay.Location = New System.Drawing.Point(6, 64) - Me.cmdDay.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdDay.Location = New System.Drawing.Point(5, 53) + Me.cmdDay.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdDay.Name = "cmdDay" - Me.cmdDay.Size = New System.Drawing.Size(90, 45) + Me.cmdDay.Size = New System.Drawing.Size(75, 38) Me.cmdDay.TabIndex = 145 Me.cmdDay.Text = "day" Me.cmdDay.UseVisualStyleBackColor = True @@ -1103,11 +1090,11 @@ Partial Class ucrCalculator 'cmdMonth ' Me.cmdMonth.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdMonth.Location = New System.Drawing.Point(6, 64) - Me.cmdMonth.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdMonth.Location = New System.Drawing.Point(5, 53) + Me.cmdMonth.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdMonth.Name = "cmdMonth" Me.cmdMonth.RightToLeft = System.Windows.Forms.RightToLeft.No - Me.cmdMonth.Size = New System.Drawing.Size(90, 45) + Me.cmdMonth.Size = New System.Drawing.Size(75, 38) Me.cmdMonth.TabIndex = 144 Me.cmdMonth.Text = "month" Me.cmdMonth.UseVisualStyleBackColor = True @@ -1115,10 +1102,10 @@ Partial Class ucrCalculator 'cmdYear ' Me.cmdYear.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdYear.Location = New System.Drawing.Point(272, 21) - Me.cmdYear.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdYear.Location = New System.Drawing.Point(227, 18) + Me.cmdYear.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdYear.Name = "cmdYear" - Me.cmdYear.Size = New System.Drawing.Size(90, 45) + Me.cmdYear.Size = New System.Drawing.Size(75, 38) Me.cmdYear.TabIndex = 143 Me.cmdYear.Text = "year" Me.cmdYear.UseVisualStyleBackColor = True @@ -1126,10 +1113,10 @@ Partial Class ucrCalculator 'cmdDate ' Me.cmdDate.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdDate.Location = New System.Drawing.Point(6, 21) - Me.cmdDate.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdDate.Location = New System.Drawing.Point(5, 18) + Me.cmdDate.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdDate.Name = "cmdDate" - Me.cmdDate.Size = New System.Drawing.Size(90, 45) + Me.cmdDate.Size = New System.Drawing.Size(75, 38) Me.cmdDate.TabIndex = 142 Me.cmdDate.Text = "date" Me.cmdDate.UseVisualStyleBackColor = True @@ -1137,10 +1124,10 @@ Partial Class ucrCalculator 'cmdYday ' Me.cmdYday.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdYday.Location = New System.Drawing.Point(272, 64) - Me.cmdYday.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdYday.Location = New System.Drawing.Point(227, 53) + Me.cmdYday.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdYday.Name = "cmdYday" - Me.cmdYday.Size = New System.Drawing.Size(90, 45) + Me.cmdYday.Size = New System.Drawing.Size(75, 38) Me.cmdYday.TabIndex = 141 Me.cmdYday.Text = "yday" Me.cmdYday.UseVisualStyleBackColor = True @@ -1148,10 +1135,10 @@ Partial Class ucrCalculator 'cmdWday ' Me.cmdWday.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdWday.Location = New System.Drawing.Point(183, 64) - Me.cmdWday.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdWday.Location = New System.Drawing.Point(152, 53) + Me.cmdWday.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdWday.Name = "cmdWday" - Me.cmdWday.Size = New System.Drawing.Size(90, 45) + Me.cmdWday.Size = New System.Drawing.Size(75, 38) Me.cmdWday.TabIndex = 140 Me.cmdWday.Text = "wday" Me.cmdWday.UseVisualStyleBackColor = True @@ -1159,10 +1146,10 @@ Partial Class ucrCalculator 'cmdMdy ' Me.cmdMdy.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdMdy.Location = New System.Drawing.Point(183, 108) - Me.cmdMdy.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdMdy.Location = New System.Drawing.Point(152, 90) + Me.cmdMdy.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdMdy.Name = "cmdMdy" - Me.cmdMdy.Size = New System.Drawing.Size(90, 45) + Me.cmdMdy.Size = New System.Drawing.Size(75, 38) Me.cmdMdy.TabIndex = 139 Me.cmdMdy.Text = "mdy" Me.cmdMdy.UseVisualStyleBackColor = True @@ -1170,10 +1157,10 @@ Partial Class ucrCalculator 'cmdYmd ' Me.cmdYmd.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdYmd.Location = New System.Drawing.Point(6, 108) - Me.cmdYmd.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdYmd.Location = New System.Drawing.Point(5, 90) + Me.cmdYmd.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdYmd.Name = "cmdYmd" - Me.cmdYmd.Size = New System.Drawing.Size(90, 45) + Me.cmdYmd.Size = New System.Drawing.Size(75, 38) Me.cmdYmd.TabIndex = 138 Me.cmdYmd.Text = "ymd" Me.cmdYmd.UseVisualStyleBackColor = True @@ -1181,10 +1168,10 @@ Partial Class ucrCalculator 'cmdLeap ' Me.cmdLeap.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdLeap.Location = New System.Drawing.Point(272, 108) - Me.cmdLeap.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdLeap.Location = New System.Drawing.Point(227, 90) + Me.cmdLeap.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdLeap.Name = "cmdLeap" - Me.cmdLeap.Size = New System.Drawing.Size(90, 45) + Me.cmdLeap.Size = New System.Drawing.Size(75, 38) Me.cmdLeap.TabIndex = 136 Me.cmdLeap.Text = "leap" Me.cmdLeap.UseVisualStyleBackColor = True @@ -1194,12 +1181,12 @@ Partial Class ucrCalculator Me.ContextMenuStripComplex.ImageScalingSize = New System.Drawing.Size(24, 24) Me.ContextMenuStripComplex.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ComplexBaseToolStripMenuItem}) Me.ContextMenuStripComplex.Name = "ContextMenuStrip1" - Me.ContextMenuStripComplex.Size = New System.Drawing.Size(122, 36) + Me.ContextMenuStripComplex.Size = New System.Drawing.Size(110, 28) ' 'ComplexBaseToolStripMenuItem ' Me.ComplexBaseToolStripMenuItem.Name = "ComplexBaseToolStripMenuItem" - Me.ComplexBaseToolStripMenuItem.Size = New System.Drawing.Size(121, 32) + Me.ComplexBaseToolStripMenuItem.Size = New System.Drawing.Size(109, 24) Me.ComplexBaseToolStripMenuItem.Text = "base" ' 'grpInteger @@ -1249,11 +1236,9 @@ Partial Class ucrCalculator Me.grpInteger.Controls.Add(Me.cmdFactorial) Me.grpInteger.Controls.Add(Me.cmdIsPrime) Me.grpInteger.Controls.Add(Me.cmdBigZ) - Me.grpInteger.Location = New System.Drawing.Point(651, 92) - Me.grpInteger.Margin = New System.Windows.Forms.Padding(4) + Me.grpInteger.Location = New System.Drawing.Point(542, 77) Me.grpInteger.Name = "grpInteger" - Me.grpInteger.Padding = New System.Windows.Forms.Padding(4) - Me.grpInteger.Size = New System.Drawing.Size(462, 476) + Me.grpInteger.Size = New System.Drawing.Size(385, 397) Me.grpInteger.TabIndex = 183 Me.grpInteger.TabStop = False Me.grpInteger.Text = "Integer" @@ -1261,10 +1246,9 @@ Partial Class ucrCalculator 'cmdPrimorial ' Me.cmdPrimorial.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - Me.cmdPrimorial.Location = New System.Drawing.Point(334, 272) - Me.cmdPrimorial.Margin = New System.Windows.Forms.Padding(4) + Me.cmdPrimorial.Location = New System.Drawing.Point(278, 227) Me.cmdPrimorial.Name = "cmdPrimorial" - Me.cmdPrimorial.Size = New System.Drawing.Size(112, 34) + Me.cmdPrimorial.Size = New System.Drawing.Size(93, 28) Me.cmdPrimorial.TabIndex = 47 Me.cmdPrimorial.Text = "primorial" Me.cmdPrimorial.UseVisualStyleBackColor = True @@ -1272,30 +1256,27 @@ Partial Class ucrCalculator 'cmdFactorize2 ' Me.cmdFactorize2.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - Me.cmdFactorize2.Location = New System.Drawing.Point(224, 58) - Me.cmdFactorize2.Margin = New System.Windows.Forms.Padding(4) + Me.cmdFactorize2.Location = New System.Drawing.Point(187, 48) Me.cmdFactorize2.Name = "cmdFactorize2" - Me.cmdFactorize2.Size = New System.Drawing.Size(112, 34) + Me.cmdFactorize2.Size = New System.Drawing.Size(93, 28) Me.cmdFactorize2.TabIndex = 46 Me.cmdFactorize2.Text = "factorize2" Me.cmdFactorize2.UseVisualStyleBackColor = True ' 'cmdLucas ' - Me.cmdLucas.Location = New System.Drawing.Point(112, 92) - Me.cmdLucas.Margin = New System.Windows.Forms.Padding(4) + Me.cmdLucas.Location = New System.Drawing.Point(93, 77) Me.cmdLucas.Name = "cmdLucas" - Me.cmdLucas.Size = New System.Drawing.Size(112, 34) + Me.cmdLucas.Size = New System.Drawing.Size(93, 28) Me.cmdLucas.TabIndex = 45 Me.cmdLucas.Text = "lucas" Me.cmdLucas.UseVisualStyleBackColor = True ' 'cmdFactorize ' - Me.cmdFactorize.Location = New System.Drawing.Point(112, 58) - Me.cmdFactorize.Margin = New System.Windows.Forms.Padding(4) + Me.cmdFactorize.Location = New System.Drawing.Point(93, 48) Me.cmdFactorize.Name = "cmdFactorize" - Me.cmdFactorize.Size = New System.Drawing.Size(112, 34) + Me.cmdFactorize.Size = New System.Drawing.Size(93, 28) Me.cmdFactorize.TabIndex = 44 Me.cmdFactorize.Text = "factorize" Me.cmdFactorize.UseVisualStyleBackColor = True @@ -1303,10 +1284,9 @@ Partial Class ucrCalculator 'cmdSquare ' Me.cmdSquare.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - Me.cmdSquare.Location = New System.Drawing.Point(334, 386) - Me.cmdSquare.Margin = New System.Windows.Forms.Padding(4) + Me.cmdSquare.Location = New System.Drawing.Point(278, 322) Me.cmdSquare.Name = "cmdSquare" - Me.cmdSquare.Size = New System.Drawing.Size(112, 34) + Me.cmdSquare.Size = New System.Drawing.Size(93, 28) Me.cmdSquare.TabIndex = 43 Me.cmdSquare.Text = "square" Me.cmdSquare.UseVisualStyleBackColor = True @@ -1314,10 +1294,9 @@ Partial Class ucrCalculator 'cmdTriangle ' Me.cmdTriangle.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - Me.cmdTriangle.Location = New System.Drawing.Point(224, 386) - Me.cmdTriangle.Margin = New System.Windows.Forms.Padding(4) + Me.cmdTriangle.Location = New System.Drawing.Point(187, 322) Me.cmdTriangle.Name = "cmdTriangle" - Me.cmdTriangle.Size = New System.Drawing.Size(112, 34) + Me.cmdTriangle.Size = New System.Drawing.Size(93, 28) Me.cmdTriangle.TabIndex = 42 Me.cmdTriangle.Text = "triangle" Me.cmdTriangle.UseVisualStyleBackColor = True @@ -1325,10 +1304,9 @@ Partial Class ucrCalculator 'cmdPadovan ' Me.cmdPadovan.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - Me.cmdPadovan.Location = New System.Drawing.Point(112, 386) - Me.cmdPadovan.Margin = New System.Windows.Forms.Padding(4) + Me.cmdPadovan.Location = New System.Drawing.Point(93, 322) Me.cmdPadovan.Name = "cmdPadovan" - Me.cmdPadovan.Size = New System.Drawing.Size(112, 34) + Me.cmdPadovan.Size = New System.Drawing.Size(93, 28) Me.cmdPadovan.TabIndex = 41 Me.cmdPadovan.Text = "padovan" Me.cmdPadovan.UseVisualStyleBackColor = True @@ -1336,10 +1314,9 @@ Partial Class ucrCalculator 'cmdAchilles ' Me.cmdAchilles.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - Me.cmdAchilles.Location = New System.Drawing.Point(2, 386) - Me.cmdAchilles.Margin = New System.Windows.Forms.Padding(4) + Me.cmdAchilles.Location = New System.Drawing.Point(2, 322) Me.cmdAchilles.Name = "cmdAchilles" - Me.cmdAchilles.Size = New System.Drawing.Size(112, 34) + Me.cmdAchilles.Size = New System.Drawing.Size(93, 28) Me.cmdAchilles.TabIndex = 40 Me.cmdAchilles.Text = "achilles" Me.cmdAchilles.UseVisualStyleBackColor = True @@ -1347,10 +1324,9 @@ Partial Class ucrCalculator 'cmdHappy ' Me.cmdHappy.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - Me.cmdHappy.Location = New System.Drawing.Point(334, 352) - Me.cmdHappy.Margin = New System.Windows.Forms.Padding(4) + Me.cmdHappy.Location = New System.Drawing.Point(278, 293) Me.cmdHappy.Name = "cmdHappy" - Me.cmdHappy.Size = New System.Drawing.Size(112, 34) + Me.cmdHappy.Size = New System.Drawing.Size(93, 28) Me.cmdHappy.TabIndex = 39 Me.cmdHappy.Text = "happy" Me.cmdHappy.UseVisualStyleBackColor = True @@ -1358,10 +1334,9 @@ Partial Class ucrCalculator 'cmdUgly ' Me.cmdUgly.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - Me.cmdUgly.Location = New System.Drawing.Point(224, 352) - Me.cmdUgly.Margin = New System.Windows.Forms.Padding(4) + Me.cmdUgly.Location = New System.Drawing.Point(187, 293) Me.cmdUgly.Name = "cmdUgly" - Me.cmdUgly.Size = New System.Drawing.Size(112, 34) + Me.cmdUgly.Size = New System.Drawing.Size(93, 28) Me.cmdUgly.TabIndex = 38 Me.cmdUgly.Text = "ugly" Me.cmdUgly.UseVisualStyleBackColor = True @@ -1369,10 +1344,9 @@ Partial Class ucrCalculator 'cmdPowerful ' Me.cmdPowerful.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - Me.cmdPowerful.Location = New System.Drawing.Point(112, 352) - Me.cmdPowerful.Margin = New System.Windows.Forms.Padding(4) + Me.cmdPowerful.Location = New System.Drawing.Point(93, 293) Me.cmdPowerful.Name = "cmdPowerful" - Me.cmdPowerful.Size = New System.Drawing.Size(112, 34) + Me.cmdPowerful.Size = New System.Drawing.Size(93, 28) Me.cmdPowerful.TabIndex = 37 Me.cmdPowerful.Text = "powerful" Me.cmdPowerful.UseVisualStyleBackColor = True @@ -1380,10 +1354,9 @@ Partial Class ucrCalculator 'cmdFrugal ' Me.cmdFrugal.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - Me.cmdFrugal.Location = New System.Drawing.Point(2, 352) - Me.cmdFrugal.Margin = New System.Windows.Forms.Padding(4) + Me.cmdFrugal.Location = New System.Drawing.Point(2, 293) Me.cmdFrugal.Name = "cmdFrugal" - Me.cmdFrugal.Size = New System.Drawing.Size(112, 34) + Me.cmdFrugal.Size = New System.Drawing.Size(93, 28) Me.cmdFrugal.TabIndex = 36 Me.cmdFrugal.Text = "frugal" Me.cmdFrugal.UseVisualStyleBackColor = True @@ -1391,10 +1364,9 @@ Partial Class ucrCalculator 'cmdPerfect ' Me.cmdPerfect.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - Me.cmdPerfect.Location = New System.Drawing.Point(334, 320) - Me.cmdPerfect.Margin = New System.Windows.Forms.Padding(4) + Me.cmdPerfect.Location = New System.Drawing.Point(278, 267) Me.cmdPerfect.Name = "cmdPerfect" - Me.cmdPerfect.Size = New System.Drawing.Size(112, 34) + Me.cmdPerfect.Size = New System.Drawing.Size(93, 28) Me.cmdPerfect.TabIndex = 35 Me.cmdPerfect.Text = "perfect" Me.cmdPerfect.UseVisualStyleBackColor = True @@ -1402,10 +1374,9 @@ Partial Class ucrCalculator 'cmdAbundant ' Me.cmdAbundant.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - Me.cmdAbundant.Location = New System.Drawing.Point(224, 320) - Me.cmdAbundant.Margin = New System.Windows.Forms.Padding(4) + Me.cmdAbundant.Location = New System.Drawing.Point(187, 267) Me.cmdAbundant.Name = "cmdAbundant" - Me.cmdAbundant.Size = New System.Drawing.Size(112, 34) + Me.cmdAbundant.Size = New System.Drawing.Size(93, 28) Me.cmdAbundant.TabIndex = 34 Me.cmdAbundant.Text = "abundant" Me.cmdAbundant.UseVisualStyleBackColor = True @@ -1413,10 +1384,9 @@ Partial Class ucrCalculator 'cmdFibonacci2 ' Me.cmdFibonacci2.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - Me.cmdFibonacci2.Location = New System.Drawing.Point(112, 320) - Me.cmdFibonacci2.Margin = New System.Windows.Forms.Padding(4) + Me.cmdFibonacci2.Location = New System.Drawing.Point(93, 267) Me.cmdFibonacci2.Name = "cmdFibonacci2" - Me.cmdFibonacci2.Size = New System.Drawing.Size(112, 34) + Me.cmdFibonacci2.Size = New System.Drawing.Size(93, 28) Me.cmdFibonacci2.TabIndex = 33 Me.cmdFibonacci2.Text = "fibonacci2" Me.cmdFibonacci2.UseVisualStyleBackColor = True @@ -1424,10 +1394,9 @@ Partial Class ucrCalculator 'cmdPalindrome ' Me.cmdPalindrome.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - Me.cmdPalindrome.Location = New System.Drawing.Point(2, 320) - Me.cmdPalindrome.Margin = New System.Windows.Forms.Padding(4) + Me.cmdPalindrome.Location = New System.Drawing.Point(2, 267) Me.cmdPalindrome.Name = "cmdPalindrome" - Me.cmdPalindrome.Size = New System.Drawing.Size(112, 34) + Me.cmdPalindrome.Size = New System.Drawing.Size(93, 28) Me.cmdPalindrome.TabIndex = 32 Me.cmdPalindrome.Text = "palindrome" Me.cmdPalindrome.UseVisualStyleBackColor = True @@ -1435,10 +1404,9 @@ Partial Class ucrCalculator 'cmdRoman ' Me.cmdRoman.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - Me.cmdRoman.Location = New System.Drawing.Point(224, 158) - Me.cmdRoman.Margin = New System.Windows.Forms.Padding(4) + Me.cmdRoman.Location = New System.Drawing.Point(187, 132) Me.cmdRoman.Name = "cmdRoman" - Me.cmdRoman.Size = New System.Drawing.Size(112, 34) + Me.cmdRoman.Size = New System.Drawing.Size(93, 28) Me.cmdRoman.TabIndex = 31 Me.cmdRoman.Text = "roman" Me.cmdRoman.UseVisualStyleBackColor = True @@ -1446,10 +1414,9 @@ Partial Class ucrCalculator 'cmdHexmode ' Me.cmdHexmode.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - Me.cmdHexmode.Location = New System.Drawing.Point(334, 124) - Me.cmdHexmode.Margin = New System.Windows.Forms.Padding(4) + Me.cmdHexmode.Location = New System.Drawing.Point(278, 103) Me.cmdHexmode.Name = "cmdHexmode" - Me.cmdHexmode.Size = New System.Drawing.Size(112, 34) + Me.cmdHexmode.Size = New System.Drawing.Size(93, 28) Me.cmdHexmode.TabIndex = 30 Me.cmdHexmode.Text = "hexmode" Me.cmdHexmode.UseVisualStyleBackColor = True @@ -1457,10 +1424,9 @@ Partial Class ucrCalculator 'cmdOctmode ' Me.cmdOctmode.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - Me.cmdOctmode.Location = New System.Drawing.Point(224, 124) - Me.cmdOctmode.Margin = New System.Windows.Forms.Padding(4) + Me.cmdOctmode.Location = New System.Drawing.Point(187, 103) Me.cmdOctmode.Name = "cmdOctmode" - Me.cmdOctmode.Size = New System.Drawing.Size(112, 34) + Me.cmdOctmode.Size = New System.Drawing.Size(93, 28) Me.cmdOctmode.TabIndex = 29 Me.cmdOctmode.Text = "octmode" Me.cmdOctmode.UseVisualStyleBackColor = True @@ -1468,10 +1434,9 @@ Partial Class ucrCalculator 'cmdKTuple ' Me.cmdKTuple.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - Me.cmdKTuple.Location = New System.Drawing.Point(224, 272) - Me.cmdKTuple.Margin = New System.Windows.Forms.Padding(4) + Me.cmdKTuple.Location = New System.Drawing.Point(187, 227) Me.cmdKTuple.Name = "cmdKTuple" - Me.cmdKTuple.Size = New System.Drawing.Size(112, 34) + Me.cmdKTuple.Size = New System.Drawing.Size(93, 28) Me.cmdKTuple.TabIndex = 28 Me.cmdKTuple.Text = "k-tuple" Me.cmdKTuple.UseVisualStyleBackColor = True @@ -1479,10 +1444,9 @@ Partial Class ucrCalculator 'cmdTriplets ' Me.cmdTriplets.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - Me.cmdTriplets.Location = New System.Drawing.Point(112, 272) - Me.cmdTriplets.Margin = New System.Windows.Forms.Padding(4) + Me.cmdTriplets.Location = New System.Drawing.Point(93, 227) Me.cmdTriplets.Name = "cmdTriplets" - Me.cmdTriplets.Size = New System.Drawing.Size(112, 34) + Me.cmdTriplets.Size = New System.Drawing.Size(93, 28) Me.cmdTriplets.TabIndex = 27 Me.cmdTriplets.Text = "triplets" Me.cmdTriplets.UseVisualStyleBackColor = True @@ -1490,10 +1454,9 @@ Partial Class ucrCalculator 'cmdThird ' Me.cmdThird.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - Me.cmdThird.Location = New System.Drawing.Point(2, 272) - Me.cmdThird.Margin = New System.Windows.Forms.Padding(4) + Me.cmdThird.Location = New System.Drawing.Point(2, 227) Me.cmdThird.Name = "cmdThird" - Me.cmdThird.Size = New System.Drawing.Size(112, 34) + Me.cmdThird.Size = New System.Drawing.Size(93, 28) Me.cmdThird.TabIndex = 26 Me.cmdThird.Text = "third" Me.cmdThird.UseVisualStyleBackColor = True @@ -1501,10 +1464,9 @@ Partial Class ucrCalculator 'cmdSexy ' Me.cmdSexy.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - Me.cmdSexy.Location = New System.Drawing.Point(334, 238) - Me.cmdSexy.Margin = New System.Windows.Forms.Padding(4) + Me.cmdSexy.Location = New System.Drawing.Point(278, 198) Me.cmdSexy.Name = "cmdSexy" - Me.cmdSexy.Size = New System.Drawing.Size(112, 34) + Me.cmdSexy.Size = New System.Drawing.Size(93, 28) Me.cmdSexy.TabIndex = 25 Me.cmdSexy.Text = "sexy" Me.cmdSexy.UseVisualStyleBackColor = True @@ -1512,10 +1474,9 @@ Partial Class ucrCalculator 'cmdCousin ' Me.cmdCousin.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - Me.cmdCousin.Location = New System.Drawing.Point(224, 238) - Me.cmdCousin.Margin = New System.Windows.Forms.Padding(4) + Me.cmdCousin.Location = New System.Drawing.Point(187, 198) Me.cmdCousin.Name = "cmdCousin" - Me.cmdCousin.Size = New System.Drawing.Size(112, 34) + Me.cmdCousin.Size = New System.Drawing.Size(93, 28) Me.cmdCousin.TabIndex = 24 Me.cmdCousin.Text = "cousin" Me.cmdCousin.UseVisualStyleBackColor = True @@ -1523,10 +1484,9 @@ Partial Class ucrCalculator 'cmdTwin ' Me.cmdTwin.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - Me.cmdTwin.Location = New System.Drawing.Point(112, 238) - Me.cmdTwin.Margin = New System.Windows.Forms.Padding(4) + Me.cmdTwin.Location = New System.Drawing.Point(93, 198) Me.cmdTwin.Name = "cmdTwin" - Me.cmdTwin.Size = New System.Drawing.Size(112, 34) + Me.cmdTwin.Size = New System.Drawing.Size(93, 28) Me.cmdTwin.TabIndex = 23 Me.cmdTwin.Text = "twin" Me.cmdTwin.UseVisualStyleBackColor = True @@ -1534,10 +1494,9 @@ Partial Class ucrCalculator 'cmdPhi ' Me.cmdPhi.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - Me.cmdPhi.Location = New System.Drawing.Point(112, 158) - Me.cmdPhi.Margin = New System.Windows.Forms.Padding(4) + Me.cmdPhi.Location = New System.Drawing.Point(93, 132) Me.cmdPhi.Name = "cmdPhi" - Me.cmdPhi.Size = New System.Drawing.Size(112, 34) + Me.cmdPhi.Size = New System.Drawing.Size(93, 28) Me.cmdPhi.TabIndex = 22 Me.cmdPhi.Text = "phi" Me.cmdPhi.UseVisualStyleBackColor = True @@ -1545,10 +1504,9 @@ Partial Class ucrCalculator 'cmdCoprime ' Me.cmdCoprime.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - Me.cmdCoprime.Location = New System.Drawing.Point(2, 238) - Me.cmdCoprime.Margin = New System.Windows.Forms.Padding(4) + Me.cmdCoprime.Location = New System.Drawing.Point(2, 198) Me.cmdCoprime.Name = "cmdCoprime" - Me.cmdCoprime.Size = New System.Drawing.Size(112, 34) + Me.cmdCoprime.Size = New System.Drawing.Size(93, 28) Me.cmdCoprime.TabIndex = 21 Me.cmdCoprime.Text = "coprime" Me.cmdCoprime.UseVisualStyleBackColor = True @@ -1556,10 +1514,9 @@ Partial Class ucrCalculator 'cmdSCM ' Me.cmdSCM.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - Me.cmdSCM.Location = New System.Drawing.Point(2, 158) - Me.cmdSCM.Margin = New System.Windows.Forms.Padding(4) + Me.cmdSCM.Location = New System.Drawing.Point(2, 132) Me.cmdSCM.Name = "cmdSCM" - Me.cmdSCM.Size = New System.Drawing.Size(112, 34) + Me.cmdSCM.Size = New System.Drawing.Size(93, 28) Me.cmdSCM.TabIndex = 20 Me.cmdSCM.Text = "scm" Me.cmdSCM.UseVisualStyleBackColor = True @@ -1567,10 +1524,9 @@ Partial Class ucrCalculator 'cmdGCD ' Me.cmdGCD.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - Me.cmdGCD.Location = New System.Drawing.Point(334, 158) - Me.cmdGCD.Margin = New System.Windows.Forms.Padding(4) + Me.cmdGCD.Location = New System.Drawing.Point(278, 132) Me.cmdGCD.Name = "cmdGCD" - Me.cmdGCD.Size = New System.Drawing.Size(112, 34) + Me.cmdGCD.Size = New System.Drawing.Size(93, 28) Me.cmdGCD.TabIndex = 19 Me.cmdGCD.Text = "gcd" Me.cmdGCD.UseVisualStyleBackColor = True @@ -1578,93 +1534,77 @@ Partial Class ucrCalculator 'cmdGeneratePrimes ' Me.cmdGeneratePrimes.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - Me.cmdGeneratePrimes.Location = New System.Drawing.Point(2, 206) - Me.cmdGeneratePrimes.Margin = New System.Windows.Forms.Padding(4) + Me.cmdGeneratePrimes.Location = New System.Drawing.Point(2, 172) Me.cmdGeneratePrimes.Name = "cmdGeneratePrimes" - Me.cmdGeneratePrimes.Size = New System.Drawing.Size(112, 34) + Me.cmdGeneratePrimes.Size = New System.Drawing.Size(93, 28) Me.cmdGeneratePrimes.TabIndex = 18 Me.cmdGeneratePrimes.Text = "primes" Me.cmdGeneratePrimes.UseVisualStyleBackColor = True ' 'cmdNthPrime ' - Me.cmdNthPrime.Location = New System.Drawing.Point(112, 206) - Me.cmdNthPrime.Margin = New System.Windows.Forms.Padding(4) + Me.cmdNthPrime.Location = New System.Drawing.Point(93, 172) Me.cmdNthPrime.Name = "cmdNthPrime" - Me.cmdNthPrime.Size = New System.Drawing.Size(112, 34) + Me.cmdNthPrime.Size = New System.Drawing.Size(93, 28) Me.cmdNthPrime.TabIndex = 17 Me.cmdNthPrime.Text = "nth_prime" Me.cmdNthPrime.UseVisualStyleBackColor = True ' - 'cmdIntegerRHelp - ' - Me.cmdIntegerRHelp.AutoSize = True - Me.cmdIntegerRHelp.ContextMenuStrip = Me.ContextMenuStripInteger - Me.cmdIntegerRHelp.Location = New System.Drawing.Point(315, 434) - Me.cmdIntegerRHelp.Margin = New System.Windows.Forms.Padding(4) - Me.cmdIntegerRHelp.Name = "cmdIntegerRHelp" - Me.cmdIntegerRHelp.Size = New System.Drawing.Size(136, 45) - Me.cmdIntegerRHelp.SplitMenuStrip = Me.ContextMenuStripInteger - Me.cmdIntegerRHelp.TabIndex = 16 - Me.cmdIntegerRHelp.Text = "R Help" - Me.cmdIntegerRHelp.UseVisualStyleBackColor = True - ' 'ContextMenuStripInteger ' Me.ContextMenuStripInteger.ImageScalingSize = New System.Drawing.Size(24, 24) Me.ContextMenuStripInteger.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.GmpToolStripMenuItem, Me.DescToolsToolStripMenuItem, Me.RutilsToolStripMenuItem, Me.PrimesToolStripMenuItem, Me.ZseqToolStripMenuItem, Me.UtilsToolStripMenuItem, Me.ConfdesignToolStripMenuItem}) Me.ContextMenuStripInteger.Name = "ContextMenuStripInteger" - Me.ContextMenuStripInteger.Size = New System.Drawing.Size(180, 228) + Me.ContextMenuStripInteger.Size = New System.Drawing.Size(157, 172) ' 'GmpToolStripMenuItem ' Me.GmpToolStripMenuItem.Name = "GmpToolStripMenuItem" - Me.GmpToolStripMenuItem.Size = New System.Drawing.Size(179, 32) + Me.GmpToolStripMenuItem.Size = New System.Drawing.Size(156, 24) Me.GmpToolStripMenuItem.Text = "Gmp" ' 'DescToolsToolStripMenuItem ' Me.DescToolsToolStripMenuItem.Name = "DescToolsToolStripMenuItem" - Me.DescToolsToolStripMenuItem.Size = New System.Drawing.Size(179, 32) + Me.DescToolsToolStripMenuItem.Size = New System.Drawing.Size(156, 24) Me.DescToolsToolStripMenuItem.Text = "DescTools" ' 'RutilsToolStripMenuItem ' Me.RutilsToolStripMenuItem.Name = "RutilsToolStripMenuItem" - Me.RutilsToolStripMenuItem.Size = New System.Drawing.Size(179, 32) + Me.RutilsToolStripMenuItem.Size = New System.Drawing.Size(156, 24) Me.RutilsToolStripMenuItem.Text = "R.utils" ' 'PrimesToolStripMenuItem ' Me.PrimesToolStripMenuItem.Name = "PrimesToolStripMenuItem" - Me.PrimesToolStripMenuItem.Size = New System.Drawing.Size(179, 32) + Me.PrimesToolStripMenuItem.Size = New System.Drawing.Size(156, 24) Me.PrimesToolStripMenuItem.Text = "Primes" ' 'ZseqToolStripMenuItem ' Me.ZseqToolStripMenuItem.Name = "ZseqToolStripMenuItem" - Me.ZseqToolStripMenuItem.Size = New System.Drawing.Size(179, 32) + Me.ZseqToolStripMenuItem.Size = New System.Drawing.Size(156, 24) Me.ZseqToolStripMenuItem.Text = "Zseq" ' 'UtilsToolStripMenuItem ' Me.UtilsToolStripMenuItem.Name = "UtilsToolStripMenuItem" - Me.UtilsToolStripMenuItem.Size = New System.Drawing.Size(179, 32) + Me.UtilsToolStripMenuItem.Size = New System.Drawing.Size(156, 24) Me.UtilsToolStripMenuItem.Text = "R Utils" ' 'ConfdesignToolStripMenuItem ' Me.ConfdesignToolStripMenuItem.Name = "ConfdesignToolStripMenuItem" - Me.ConfdesignToolStripMenuItem.Size = New System.Drawing.Size(179, 32) + Me.ConfdesignToolStripMenuItem.Size = New System.Drawing.Size(156, 24) Me.ConfdesignToolStripMenuItem.Text = "Conf.design" ' 'cmdHex ' Me.cmdHex.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - Me.cmdHex.Location = New System.Drawing.Point(112, 124) - Me.cmdHex.Margin = New System.Windows.Forms.Padding(4) + Me.cmdHex.Location = New System.Drawing.Point(93, 103) Me.cmdHex.Name = "cmdHex" - Me.cmdHex.Size = New System.Drawing.Size(112, 34) + Me.cmdHex.Size = New System.Drawing.Size(93, 28) Me.cmdHex.TabIndex = 15 Me.cmdHex.Text = "hex" Me.cmdHex.UseVisualStyleBackColor = True @@ -1672,10 +1612,9 @@ Partial Class ucrCalculator 'cmdOctal ' Me.cmdOctal.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - Me.cmdOctal.Location = New System.Drawing.Point(2, 124) - Me.cmdOctal.Margin = New System.Windows.Forms.Padding(4) + Me.cmdOctal.Location = New System.Drawing.Point(2, 103) Me.cmdOctal.Name = "cmdOctal" - Me.cmdOctal.Size = New System.Drawing.Size(112, 34) + Me.cmdOctal.Size = New System.Drawing.Size(93, 28) Me.cmdOctal.TabIndex = 14 Me.cmdOctal.Text = "octal" Me.cmdOctal.UseVisualStyleBackColor = True @@ -1683,10 +1622,9 @@ Partial Class ucrCalculator 'cmdBinary ' Me.cmdBinary.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - Me.cmdBinary.Location = New System.Drawing.Point(334, 92) - Me.cmdBinary.Margin = New System.Windows.Forms.Padding(4) + Me.cmdBinary.Location = New System.Drawing.Point(278, 77) Me.cmdBinary.Name = "cmdBinary" - Me.cmdBinary.Size = New System.Drawing.Size(112, 34) + Me.cmdBinary.Size = New System.Drawing.Size(93, 28) Me.cmdBinary.TabIndex = 13 Me.cmdBinary.Text = "binary" Me.cmdBinary.UseVisualStyleBackColor = True @@ -1694,20 +1632,18 @@ Partial Class ucrCalculator 'cmdBigQ ' Me.cmdBigQ.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - Me.cmdBigQ.Location = New System.Drawing.Point(112, 26) - Me.cmdBigQ.Margin = New System.Windows.Forms.Padding(4) + Me.cmdBigQ.Location = New System.Drawing.Point(93, 22) Me.cmdBigQ.Name = "cmdBigQ" - Me.cmdBigQ.Size = New System.Drawing.Size(112, 34) + Me.cmdBigQ.Size = New System.Drawing.Size(93, 28) Me.cmdBigQ.TabIndex = 12 Me.cmdBigQ.Text = "bigq" Me.cmdBigQ.UseVisualStyleBackColor = True ' 'cmdDigitSum ' - Me.cmdDigitSum.Location = New System.Drawing.Point(334, 58) - Me.cmdDigitSum.Margin = New System.Windows.Forms.Padding(4) + Me.cmdDigitSum.Location = New System.Drawing.Point(278, 48) Me.cmdDigitSum.Name = "cmdDigitSum" - Me.cmdDigitSum.Size = New System.Drawing.Size(112, 34) + Me.cmdDigitSum.Size = New System.Drawing.Size(93, 28) Me.cmdDigitSum.TabIndex = 10 Me.cmdDigitSum.Text = "digitsum" Me.cmdDigitSum.UseVisualStyleBackColor = True @@ -1715,60 +1651,54 @@ Partial Class ucrCalculator 'cmdRankPercent ' Me.cmdRankPercent.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - Me.cmdRankPercent.Location = New System.Drawing.Point(224, 92) - Me.cmdRankPercent.Margin = New System.Windows.Forms.Padding(4) + Me.cmdRankPercent.Location = New System.Drawing.Point(187, 77) Me.cmdRankPercent.Name = "cmdRankPercent" - Me.cmdRankPercent.Size = New System.Drawing.Size(112, 34) + Me.cmdRankPercent.Size = New System.Drawing.Size(93, 28) Me.cmdRankPercent.TabIndex = 9 Me.cmdRankPercent.Text = "percentrank" Me.cmdRankPercent.UseVisualStyleBackColor = True ' 'cmdDivisors ' - Me.cmdDivisors.Location = New System.Drawing.Point(2, 58) - Me.cmdDivisors.Margin = New System.Windows.Forms.Padding(4) + Me.cmdDivisors.Location = New System.Drawing.Point(2, 48) Me.cmdDivisors.Name = "cmdDivisors" - Me.cmdDivisors.Size = New System.Drawing.Size(112, 34) + Me.cmdDivisors.Size = New System.Drawing.Size(93, 28) Me.cmdDivisors.TabIndex = 8 Me.cmdDivisors.Text = "divisors" Me.cmdDivisors.UseVisualStyleBackColor = True ' 'cmdFibonacci ' - Me.cmdFibonacci.Location = New System.Drawing.Point(2, 92) - Me.cmdFibonacci.Margin = New System.Windows.Forms.Padding(4) + Me.cmdFibonacci.Location = New System.Drawing.Point(2, 77) Me.cmdFibonacci.Name = "cmdFibonacci" - Me.cmdFibonacci.Size = New System.Drawing.Size(112, 34) + Me.cmdFibonacci.Size = New System.Drawing.Size(93, 28) Me.cmdFibonacci.TabIndex = 7 Me.cmdFibonacci.Text = "fibonacci" Me.cmdFibonacci.UseVisualStyleBackColor = True ' 'cmdNextPrime ' - Me.cmdNextPrime.Location = New System.Drawing.Point(224, 206) - Me.cmdNextPrime.Margin = New System.Windows.Forms.Padding(4) + Me.cmdNextPrime.Location = New System.Drawing.Point(187, 172) Me.cmdNextPrime.Name = "cmdNextPrime" - Me.cmdNextPrime.Size = New System.Drawing.Size(112, 34) + Me.cmdNextPrime.Size = New System.Drawing.Size(93, 28) Me.cmdNextPrime.TabIndex = 5 Me.cmdNextPrime.Text = "next prime" Me.cmdNextPrime.UseVisualStyleBackColor = True ' 'cmdChoosez ' - Me.cmdChoosez.Location = New System.Drawing.Point(334, 26) - Me.cmdChoosez.Margin = New System.Windows.Forms.Padding(4) + Me.cmdChoosez.Location = New System.Drawing.Point(278, 22) Me.cmdChoosez.Name = "cmdChoosez" - Me.cmdChoosez.Size = New System.Drawing.Size(112, 34) + Me.cmdChoosez.Size = New System.Drawing.Size(93, 28) Me.cmdChoosez.TabIndex = 4 Me.cmdChoosez.Text = "choose" Me.cmdChoosez.UseVisualStyleBackColor = True ' 'cmdFactorial ' - Me.cmdFactorial.Location = New System.Drawing.Point(224, 26) - Me.cmdFactorial.Margin = New System.Windows.Forms.Padding(4) + Me.cmdFactorial.Location = New System.Drawing.Point(187, 22) Me.cmdFactorial.Name = "cmdFactorial" - Me.cmdFactorial.Size = New System.Drawing.Size(112, 34) + Me.cmdFactorial.Size = New System.Drawing.Size(93, 28) Me.cmdFactorial.TabIndex = 2 Me.cmdFactorial.Text = "factorial" Me.cmdFactorial.UseVisualStyleBackColor = True @@ -1776,10 +1706,9 @@ Partial Class ucrCalculator 'cmdIsPrime ' Me.cmdIsPrime.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - Me.cmdIsPrime.Location = New System.Drawing.Point(334, 206) - Me.cmdIsPrime.Margin = New System.Windows.Forms.Padding(4) + Me.cmdIsPrime.Location = New System.Drawing.Point(278, 172) Me.cmdIsPrime.Name = "cmdIsPrime" - Me.cmdIsPrime.Size = New System.Drawing.Size(112, 34) + Me.cmdIsPrime.Size = New System.Drawing.Size(93, 28) Me.cmdIsPrime.TabIndex = 1 Me.cmdIsPrime.Text = "is_prime" Me.cmdIsPrime.UseVisualStyleBackColor = True @@ -1787,10 +1716,9 @@ Partial Class ucrCalculator 'cmdBigZ ' Me.cmdBigZ.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - Me.cmdBigZ.Location = New System.Drawing.Point(2, 26) - Me.cmdBigZ.Margin = New System.Windows.Forms.Padding(4) + Me.cmdBigZ.Location = New System.Drawing.Point(2, 22) Me.cmdBigZ.Name = "cmdBigZ" - Me.cmdBigZ.Size = New System.Drawing.Size(112, 34) + Me.cmdBigZ.Size = New System.Drawing.Size(93, 28) Me.cmdBigZ.TabIndex = 0 Me.cmdBigZ.Text = "bigz" Me.cmdBigZ.UseVisualStyleBackColor = True @@ -1818,45 +1746,35 @@ Partial Class ucrCalculator Me.grpFactor.Controls.Add(Me.cmdLabelled) Me.grpFactor.Controls.Add(Me.cmdFactor) Me.grpFactor.Controls.Add(Me.cmdAnon) - Me.grpFactor.Location = New System.Drawing.Point(651, 92) + Me.grpFactor.Location = New System.Drawing.Point(542, 77) + Me.grpFactor.Margin = New System.Windows.Forms.Padding(2) Me.grpFactor.Name = "grpFactor" - Me.grpFactor.Size = New System.Drawing.Size(372, 312) + Me.grpFactor.Padding = New System.Windows.Forms.Padding(2) + Me.grpFactor.Size = New System.Drawing.Size(310, 260) Me.grpFactor.TabIndex = 191 Me.grpFactor.TabStop = False Me.grpFactor.Text = "Factor" ' - 'cmdTransformHelp - ' - Me.cmdTransformHelp.AutoSize = True - Me.cmdTransformHelp.ContextMenuStrip = Me.ContextMenuStripFactor - Me.cmdTransformHelp.Location = New System.Drawing.Point(226, 262) - Me.cmdTransformHelp.Margin = New System.Windows.Forms.Padding(4) - Me.cmdTransformHelp.Name = "cmdTransformHelp" - Me.cmdTransformHelp.Size = New System.Drawing.Size(136, 45) - Me.cmdTransformHelp.SplitMenuStrip = Me.ContextMenuStripFactor - Me.cmdTransformHelp.TabIndex = 212 - Me.cmdTransformHelp.Text = "R Help" - Me.cmdTransformHelp.UseVisualStyleBackColor = True - ' 'ContextMenuStripFactor ' Me.ContextMenuStripFactor.ImageScalingSize = New System.Drawing.Size(24, 24) Me.ContextMenuStripFactor.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.FactorForcatsToolStripMenuItem}) Me.ContextMenuStripFactor.Name = "ContextMenuStrip1" - Me.ContextMenuStripFactor.Size = New System.Drawing.Size(139, 36) + Me.ContextMenuStripFactor.Size = New System.Drawing.Size(124, 28) ' 'FactorForcatsToolStripMenuItem ' Me.FactorForcatsToolStripMenuItem.Name = "FactorForcatsToolStripMenuItem" - Me.FactorForcatsToolStripMenuItem.Size = New System.Drawing.Size(138, 32) + Me.FactorForcatsToolStripMenuItem.Size = New System.Drawing.Size(123, 24) Me.FactorForcatsToolStripMenuItem.Text = "forcats" ' 'cmdShuffle ' Me.cmdShuffle.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdShuffle.Location = New System.Drawing.Point(273, 214) + Me.cmdShuffle.Location = New System.Drawing.Point(228, 178) + Me.cmdShuffle.Margin = New System.Windows.Forms.Padding(2) Me.cmdShuffle.Name = "cmdShuffle" - Me.cmdShuffle.Size = New System.Drawing.Size(90, 48) + Me.cmdShuffle.Size = New System.Drawing.Size(75, 40) Me.cmdShuffle.TabIndex = 210 Me.cmdShuffle.Text = "shuffle" Me.cmdShuffle.UseVisualStyleBackColor = True @@ -1864,9 +1782,10 @@ Partial Class ucrCalculator 'cmdShift ' Me.cmdShift.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdShift.Location = New System.Drawing.Point(184, 214) + Me.cmdShift.Location = New System.Drawing.Point(153, 178) + Me.cmdShift.Margin = New System.Windows.Forms.Padding(2) Me.cmdShift.Name = "cmdShift" - Me.cmdShift.Size = New System.Drawing.Size(90, 48) + Me.cmdShift.Size = New System.Drawing.Size(75, 40) Me.cmdShift.TabIndex = 209 Me.cmdShift.Text = "shift" Me.cmdShift.UseVisualStyleBackColor = True @@ -1874,9 +1793,10 @@ Partial Class ucrCalculator 'cmdReverse ' Me.cmdReverse.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdReverse.Location = New System.Drawing.Point(96, 214) + Me.cmdReverse.Location = New System.Drawing.Point(80, 178) + Me.cmdReverse.Margin = New System.Windows.Forms.Padding(2) Me.cmdReverse.Name = "cmdReverse" - Me.cmdReverse.Size = New System.Drawing.Size(90, 48) + Me.cmdReverse.Size = New System.Drawing.Size(75, 40) Me.cmdReverse.TabIndex = 208 Me.cmdReverse.Text = "reverse" Me.cmdReverse.UseVisualStyleBackColor = True @@ -1884,9 +1804,10 @@ Partial Class ucrCalculator 'cmdReorder ' Me.cmdReorder.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdReorder.Location = New System.Drawing.Point(6, 214) + Me.cmdReorder.Location = New System.Drawing.Point(5, 178) + Me.cmdReorder.Margin = New System.Windows.Forms.Padding(2) Me.cmdReorder.Name = "cmdReorder" - Me.cmdReorder.Size = New System.Drawing.Size(90, 48) + Me.cmdReorder.Size = New System.Drawing.Size(75, 40) Me.cmdReorder.TabIndex = 207 Me.cmdReorder.Text = "reorder" Me.cmdReorder.UseVisualStyleBackColor = True @@ -1894,9 +1815,10 @@ Partial Class ucrCalculator 'cmdRelevel ' Me.cmdRelevel.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdRelevel.Location = New System.Drawing.Point(273, 166) + Me.cmdRelevel.Location = New System.Drawing.Point(228, 138) + Me.cmdRelevel.Margin = New System.Windows.Forms.Padding(2) Me.cmdRelevel.Name = "cmdRelevel" - Me.cmdRelevel.Size = New System.Drawing.Size(90, 48) + Me.cmdRelevel.Size = New System.Drawing.Size(75, 40) Me.cmdRelevel.TabIndex = 206 Me.cmdRelevel.Text = "relevel" Me.cmdRelevel.UseVisualStyleBackColor = True @@ -1904,9 +1826,10 @@ Partial Class ucrCalculator 'cmdRecode ' Me.cmdRecode.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdRecode.Location = New System.Drawing.Point(184, 166) + Me.cmdRecode.Location = New System.Drawing.Point(153, 138) + Me.cmdRecode.Margin = New System.Windows.Forms.Padding(2) Me.cmdRecode.Name = "cmdRecode" - Me.cmdRecode.Size = New System.Drawing.Size(90, 48) + Me.cmdRecode.Size = New System.Drawing.Size(75, 40) Me.cmdRecode.TabIndex = 205 Me.cmdRecode.Text = "recode" Me.cmdRecode.UseVisualStyleBackColor = True @@ -1914,9 +1837,10 @@ Partial Class ucrCalculator 'cmdOther ' Me.cmdOther.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdOther.Location = New System.Drawing.Point(96, 166) + Me.cmdOther.Location = New System.Drawing.Point(80, 138) + Me.cmdOther.Margin = New System.Windows.Forms.Padding(2) Me.cmdOther.Name = "cmdOther" - Me.cmdOther.Size = New System.Drawing.Size(90, 48) + Me.cmdOther.Size = New System.Drawing.Size(75, 40) Me.cmdOther.TabIndex = 204 Me.cmdOther.Text = "other" Me.cmdOther.UseVisualStyleBackColor = True @@ -1924,9 +1848,10 @@ Partial Class ucrCalculator 'cmdFmatch ' Me.cmdFmatch.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdFmatch.Location = New System.Drawing.Point(6, 166) + Me.cmdFmatch.Location = New System.Drawing.Point(5, 138) + Me.cmdFmatch.Margin = New System.Windows.Forms.Padding(2) Me.cmdFmatch.Name = "cmdFmatch" - Me.cmdFmatch.Size = New System.Drawing.Size(90, 48) + Me.cmdFmatch.Size = New System.Drawing.Size(75, 40) Me.cmdFmatch.TabIndex = 203 Me.cmdFmatch.Text = "match" Me.cmdFmatch.UseVisualStyleBackColor = True @@ -1934,9 +1859,10 @@ Partial Class ucrCalculator 'cmdLump ' Me.cmdLump.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdLump.Location = New System.Drawing.Point(273, 120) + Me.cmdLump.Location = New System.Drawing.Point(228, 100) + Me.cmdLump.Margin = New System.Windows.Forms.Padding(2) Me.cmdLump.Name = "cmdLump" - Me.cmdLump.Size = New System.Drawing.Size(90, 48) + Me.cmdLump.Size = New System.Drawing.Size(75, 40) Me.cmdLump.TabIndex = 202 Me.cmdLump.Text = "lump" Me.cmdLump.UseVisualStyleBackColor = True @@ -1944,9 +1870,10 @@ Partial Class ucrCalculator 'cmdInseq ' Me.cmdInseq.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdInseq.Location = New System.Drawing.Point(184, 120) + Me.cmdInseq.Location = New System.Drawing.Point(153, 100) + Me.cmdInseq.Margin = New System.Windows.Forms.Padding(2) Me.cmdInseq.Name = "cmdInseq" - Me.cmdInseq.Size = New System.Drawing.Size(90, 48) + Me.cmdInseq.Size = New System.Drawing.Size(75, 40) Me.cmdInseq.TabIndex = 201 Me.cmdInseq.Text = "inseq" Me.cmdInseq.UseVisualStyleBackColor = True @@ -1954,9 +1881,10 @@ Partial Class ucrCalculator 'cmdInfreq ' Me.cmdInfreq.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdInfreq.Location = New System.Drawing.Point(96, 120) + Me.cmdInfreq.Location = New System.Drawing.Point(80, 100) + Me.cmdInfreq.Margin = New System.Windows.Forms.Padding(2) Me.cmdInfreq.Name = "cmdInfreq" - Me.cmdInfreq.Size = New System.Drawing.Size(90, 48) + Me.cmdInfreq.Size = New System.Drawing.Size(75, 40) Me.cmdInfreq.TabIndex = 200 Me.cmdInfreq.Text = "infreq" Me.cmdInfreq.UseVisualStyleBackColor = True @@ -1964,9 +1892,10 @@ Partial Class ucrCalculator 'cmdInorder ' Me.cmdInorder.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdInorder.Location = New System.Drawing.Point(6, 120) + Me.cmdInorder.Location = New System.Drawing.Point(5, 100) + Me.cmdInorder.Margin = New System.Windows.Forms.Padding(2) Me.cmdInorder.Name = "cmdInorder" - Me.cmdInorder.Size = New System.Drawing.Size(90, 48) + Me.cmdInorder.Size = New System.Drawing.Size(75, 40) Me.cmdInorder.TabIndex = 199 Me.cmdInorder.Text = "inorder" Me.cmdInorder.UseVisualStyleBackColor = True @@ -1974,9 +1903,10 @@ Partial Class ucrCalculator 'cmdAdd_na ' Me.cmdAdd_na.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdAdd_na.Location = New System.Drawing.Point(273, 72) + Me.cmdAdd_na.Location = New System.Drawing.Point(228, 60) + Me.cmdAdd_na.Margin = New System.Windows.Forms.Padding(2) Me.cmdAdd_na.Name = "cmdAdd_na" - Me.cmdAdd_na.Size = New System.Drawing.Size(90, 48) + Me.cmdAdd_na.Size = New System.Drawing.Size(75, 40) Me.cmdAdd_na.TabIndex = 198 Me.cmdAdd_na.Text = "add_na" Me.cmdAdd_na.UseVisualStyleBackColor = True @@ -1984,9 +1914,10 @@ Partial Class ucrCalculator 'cmdExpand ' Me.cmdExpand.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdExpand.Location = New System.Drawing.Point(184, 72) + Me.cmdExpand.Location = New System.Drawing.Point(153, 60) + Me.cmdExpand.Margin = New System.Windows.Forms.Padding(2) Me.cmdExpand.Name = "cmdExpand" - Me.cmdExpand.Size = New System.Drawing.Size(90, 48) + Me.cmdExpand.Size = New System.Drawing.Size(75, 40) Me.cmdExpand.TabIndex = 197 Me.cmdExpand.Text = "expand" Me.cmdExpand.UseVisualStyleBackColor = True @@ -1994,9 +1925,10 @@ Partial Class ucrCalculator 'cmdDrop ' Me.cmdDrop.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdDrop.Location = New System.Drawing.Point(96, 72) + Me.cmdDrop.Location = New System.Drawing.Point(80, 60) + Me.cmdDrop.Margin = New System.Windows.Forms.Padding(2) Me.cmdDrop.Name = "cmdDrop" - Me.cmdDrop.Size = New System.Drawing.Size(90, 48) + Me.cmdDrop.Size = New System.Drawing.Size(75, 40) Me.cmdDrop.TabIndex = 196 Me.cmdDrop.Text = "drop" Me.cmdDrop.UseVisualStyleBackColor = True @@ -2004,9 +1936,10 @@ Partial Class ucrCalculator 'cmdCross ' Me.cmdCross.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdCross.Location = New System.Drawing.Point(6, 72) + Me.cmdCross.Location = New System.Drawing.Point(5, 60) + Me.cmdCross.Margin = New System.Windows.Forms.Padding(2) Me.cmdCross.Name = "cmdCross" - Me.cmdCross.Size = New System.Drawing.Size(90, 48) + Me.cmdCross.Size = New System.Drawing.Size(75, 40) Me.cmdCross.TabIndex = 195 Me.cmdCross.Text = "cross" Me.cmdCross.UseVisualStyleBackColor = True @@ -2014,9 +1947,10 @@ Partial Class ucrCalculator 'cmdCollapse ' Me.cmdCollapse.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdCollapse.Location = New System.Drawing.Point(273, 24) + Me.cmdCollapse.Location = New System.Drawing.Point(228, 20) + Me.cmdCollapse.Margin = New System.Windows.Forms.Padding(2) Me.cmdCollapse.Name = "cmdCollapse" - Me.cmdCollapse.Size = New System.Drawing.Size(90, 48) + Me.cmdCollapse.Size = New System.Drawing.Size(75, 40) Me.cmdCollapse.TabIndex = 194 Me.cmdCollapse.Text = "collapse" Me.cmdCollapse.UseVisualStyleBackColor = True @@ -2024,9 +1958,10 @@ Partial Class ucrCalculator 'cmdLabelled ' Me.cmdLabelled.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdLabelled.Location = New System.Drawing.Point(184, 24) + Me.cmdLabelled.Location = New System.Drawing.Point(153, 20) + Me.cmdLabelled.Margin = New System.Windows.Forms.Padding(2) Me.cmdLabelled.Name = "cmdLabelled" - Me.cmdLabelled.Size = New System.Drawing.Size(90, 48) + Me.cmdLabelled.Size = New System.Drawing.Size(75, 40) Me.cmdLabelled.TabIndex = 193 Me.cmdLabelled.Text = "labelled " Me.cmdLabelled.UseVisualStyleBackColor = True @@ -2034,9 +1969,10 @@ Partial Class ucrCalculator 'cmdFactor ' Me.cmdFactor.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdFactor.Location = New System.Drawing.Point(6, 24) + Me.cmdFactor.Location = New System.Drawing.Point(5, 20) + Me.cmdFactor.Margin = New System.Windows.Forms.Padding(2) Me.cmdFactor.Name = "cmdFactor" - Me.cmdFactor.Size = New System.Drawing.Size(90, 48) + Me.cmdFactor.Size = New System.Drawing.Size(75, 40) Me.cmdFactor.TabIndex = 191 Me.cmdFactor.Text = "factor" Me.cmdFactor.UseVisualStyleBackColor = True @@ -2044,9 +1980,10 @@ Partial Class ucrCalculator 'cmdAnon ' Me.cmdAnon.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdAnon.Location = New System.Drawing.Point(96, 24) + Me.cmdAnon.Location = New System.Drawing.Point(80, 20) + Me.cmdAnon.Margin = New System.Windows.Forms.Padding(2) Me.cmdAnon.Name = "cmdAnon" - Me.cmdAnon.Size = New System.Drawing.Size(90, 48) + Me.cmdAnon.Size = New System.Drawing.Size(75, 40) Me.cmdAnon.TabIndex = 192 Me.cmdAnon.Text = "anon" Me.cmdAnon.UseVisualStyleBackColor = True @@ -2062,7 +1999,7 @@ Partial Class ucrCalculator Me.grpHydroGOF.Controls.Add(Me.cmdRNSE) Me.grpHydroGOF.Controls.Add(Me.cmdRmse) Me.grpHydroGOF.Controls.Add(Me.cmdRd) - Me.grpHydroGOF.Controls.Add(Me.cmdPbiasfde) + Me.grpHydroGOF.Controls.Add(Me.cmdPbiasfdc) Me.grpHydroGOF.Controls.Add(Me.cmdPbias) Me.grpHydroGOF.Controls.Add(Me.cmdNSE) Me.grpHydroGOF.Controls.Add(Me.cmdNrmse) @@ -2075,45 +2012,35 @@ Partial Class ucrCalculator Me.grpHydroGOF.Controls.Add(Me.cmdD) Me.grpHydroGOF.Controls.Add(Me.cmdCp) Me.grpHydroGOF.Controls.Add(Me.cmdBr2) - Me.grpHydroGOF.Location = New System.Drawing.Point(651, 92) + Me.grpHydroGOF.Location = New System.Drawing.Point(542, 77) + Me.grpHydroGOF.Margin = New System.Windows.Forms.Padding(2) Me.grpHydroGOF.Name = "grpHydroGOF" - Me.grpHydroGOF.Size = New System.Drawing.Size(274, 404) + Me.grpHydroGOF.Padding = New System.Windows.Forms.Padding(2) + Me.grpHydroGOF.Size = New System.Drawing.Size(228, 337) Me.grpHydroGOF.TabIndex = 195 Me.grpHydroGOF.TabStop = False Me.grpHydroGOF.Text = "hydroGOF " ' - 'cmdHydroHelp - ' - Me.cmdHydroHelp.AutoSize = True - Me.cmdHydroHelp.ContextMenuStrip = Me.ContextMenuStripHydroGOF - Me.cmdHydroHelp.Location = New System.Drawing.Point(166, 358) - Me.cmdHydroHelp.Margin = New System.Windows.Forms.Padding(4) - Me.cmdHydroHelp.Name = "cmdHydroHelp" - Me.cmdHydroHelp.Size = New System.Drawing.Size(129, 45) - Me.cmdHydroHelp.SplitMenuStrip = Me.ContextMenuStripHydroGOF - Me.cmdHydroHelp.TabIndex = 212 - Me.cmdHydroHelp.Text = "R Help" - Me.cmdHydroHelp.UseVisualStyleBackColor = True - ' 'ContextMenuStripHydroGOF ' Me.ContextMenuStripHydroGOF.ImageScalingSize = New System.Drawing.Size(24, 24) Me.ContextMenuStripHydroGOF.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.HydroGOFToolStripMenuItem}) Me.ContextMenuStripHydroGOF.Name = "ContextMenuStrip1" - Me.ContextMenuStripHydroGOF.Size = New System.Drawing.Size(167, 36) + Me.ContextMenuStripHydroGOF.Size = New System.Drawing.Size(145, 28) ' 'HydroGOFToolStripMenuItem ' Me.HydroGOFToolStripMenuItem.Name = "HydroGOFToolStripMenuItem" - Me.HydroGOFToolStripMenuItem.Size = New System.Drawing.Size(166, 32) + Me.HydroGOFToolStripMenuItem.Size = New System.Drawing.Size(144, 24) Me.HydroGOFToolStripMenuItem.Text = "hydroGOF" ' 'cmdVE ' Me.cmdVE.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdVE.Location = New System.Drawing.Point(180, 309) + Me.cmdVE.Location = New System.Drawing.Point(150, 258) + Me.cmdVE.Margin = New System.Windows.Forms.Padding(2) Me.cmdVE.Name = "cmdVE" - Me.cmdVE.Size = New System.Drawing.Size(90, 48) + Me.cmdVE.Size = New System.Drawing.Size(75, 40) Me.cmdVE.TabIndex = 20 Me.cmdVE.Text = "VE" Me.cmdVE.UseVisualStyleBackColor = True @@ -2121,9 +2048,10 @@ Partial Class ucrCalculator 'cmdSsq ' Me.cmdSsq.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdSsq.Location = New System.Drawing.Point(92, 309) + Me.cmdSsq.Location = New System.Drawing.Point(77, 258) + Me.cmdSsq.Margin = New System.Windows.Forms.Padding(2) Me.cmdSsq.Name = "cmdSsq" - Me.cmdSsq.Size = New System.Drawing.Size(90, 48) + Me.cmdSsq.Size = New System.Drawing.Size(75, 40) Me.cmdSsq.TabIndex = 19 Me.cmdSsq.Text = "ssq" Me.cmdSsq.UseVisualStyleBackColor = True @@ -2131,9 +2059,10 @@ Partial Class ucrCalculator 'cmdRsr ' Me.cmdRsr.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdRsr.Location = New System.Drawing.Point(3, 309) + Me.cmdRsr.Location = New System.Drawing.Point(2, 258) + Me.cmdRsr.Margin = New System.Windows.Forms.Padding(2) Me.cmdRsr.Name = "cmdRsr" - Me.cmdRsr.Size = New System.Drawing.Size(90, 48) + Me.cmdRsr.Size = New System.Drawing.Size(75, 40) Me.cmdRsr.TabIndex = 18 Me.cmdRsr.Text = "rsr" Me.cmdRsr.UseVisualStyleBackColor = True @@ -2141,9 +2070,10 @@ Partial Class ucrCalculator 'cmdRSD ' Me.cmdRSD.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdRSD.Location = New System.Drawing.Point(180, 262) + Me.cmdRSD.Location = New System.Drawing.Point(150, 218) + Me.cmdRSD.Margin = New System.Windows.Forms.Padding(2) Me.cmdRSD.Name = "cmdRSD" - Me.cmdRSD.Size = New System.Drawing.Size(90, 48) + Me.cmdRSD.Size = New System.Drawing.Size(75, 40) Me.cmdRSD.TabIndex = 17 Me.cmdRSD.Text = "rSD" Me.cmdRSD.UseVisualStyleBackColor = True @@ -2151,9 +2081,10 @@ Partial Class ucrCalculator 'cmdRPearson ' Me.cmdRPearson.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdRPearson.Location = New System.Drawing.Point(92, 262) + Me.cmdRPearson.Location = New System.Drawing.Point(77, 218) + Me.cmdRPearson.Margin = New System.Windows.Forms.Padding(2) Me.cmdRPearson.Name = "cmdRPearson" - Me.cmdRPearson.Size = New System.Drawing.Size(90, 48) + Me.cmdRPearson.Size = New System.Drawing.Size(75, 40) Me.cmdRPearson.TabIndex = 16 Me.cmdRPearson.Text = "rPearson" Me.cmdRPearson.UseVisualStyleBackColor = True @@ -2161,9 +2092,10 @@ Partial Class ucrCalculator 'cmdRNSE ' Me.cmdRNSE.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdRNSE.Location = New System.Drawing.Point(3, 262) + Me.cmdRNSE.Location = New System.Drawing.Point(2, 218) + Me.cmdRNSE.Margin = New System.Windows.Forms.Padding(2) Me.cmdRNSE.Name = "cmdRNSE" - Me.cmdRNSE.Size = New System.Drawing.Size(90, 48) + Me.cmdRNSE.Size = New System.Drawing.Size(75, 40) Me.cmdRNSE.TabIndex = 15 Me.cmdRNSE.Text = "rNSE" Me.cmdRNSE.UseVisualStyleBackColor = True @@ -2171,9 +2103,10 @@ Partial Class ucrCalculator 'cmdRmse ' Me.cmdRmse.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdRmse.Location = New System.Drawing.Point(180, 214) + Me.cmdRmse.Location = New System.Drawing.Point(150, 178) + Me.cmdRmse.Margin = New System.Windows.Forms.Padding(2) Me.cmdRmse.Name = "cmdRmse" - Me.cmdRmse.Size = New System.Drawing.Size(90, 48) + Me.cmdRmse.Size = New System.Drawing.Size(75, 40) Me.cmdRmse.TabIndex = 14 Me.cmdRmse.Text = "rmse" Me.cmdRmse.UseVisualStyleBackColor = True @@ -2181,29 +2114,32 @@ Partial Class ucrCalculator 'cmdRd ' Me.cmdRd.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdRd.Location = New System.Drawing.Point(92, 214) + Me.cmdRd.Location = New System.Drawing.Point(77, 178) + Me.cmdRd.Margin = New System.Windows.Forms.Padding(2) Me.cmdRd.Name = "cmdRd" - Me.cmdRd.Size = New System.Drawing.Size(90, 48) + Me.cmdRd.Size = New System.Drawing.Size(75, 40) Me.cmdRd.TabIndex = 13 Me.cmdRd.Text = "rd" Me.cmdRd.UseVisualStyleBackColor = True ' - 'cmdPbiasfde + 'cmdPbiasfdc ' - Me.cmdPbiasfde.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdPbiasfde.Location = New System.Drawing.Point(3, 214) - Me.cmdPbiasfde.Name = "cmdPbiasfde" - Me.cmdPbiasfde.Size = New System.Drawing.Size(90, 48) - Me.cmdPbiasfde.TabIndex = 12 - Me.cmdPbiasfde.Text = "pbiasfdc" - Me.cmdPbiasfde.UseVisualStyleBackColor = True + Me.cmdPbiasfdc.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.cmdPbiasfdc.Location = New System.Drawing.Point(2, 178) + Me.cmdPbiasfdc.Margin = New System.Windows.Forms.Padding(2) + Me.cmdPbiasfdc.Name = "cmdPbiasfdc" + Me.cmdPbiasfdc.Size = New System.Drawing.Size(75, 40) + Me.cmdPbiasfdc.TabIndex = 12 + Me.cmdPbiasfdc.Text = "pbiasfdc" + Me.cmdPbiasfdc.UseVisualStyleBackColor = True ' 'cmdPbias ' Me.cmdPbias.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdPbias.Location = New System.Drawing.Point(180, 166) + Me.cmdPbias.Location = New System.Drawing.Point(150, 138) + Me.cmdPbias.Margin = New System.Windows.Forms.Padding(2) Me.cmdPbias.Name = "cmdPbias" - Me.cmdPbias.Size = New System.Drawing.Size(90, 48) + Me.cmdPbias.Size = New System.Drawing.Size(75, 40) Me.cmdPbias.TabIndex = 11 Me.cmdPbias.Text = "pbias" Me.cmdPbias.UseVisualStyleBackColor = True @@ -2211,9 +2147,10 @@ Partial Class ucrCalculator 'cmdNSE ' Me.cmdNSE.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdNSE.Location = New System.Drawing.Point(92, 166) + Me.cmdNSE.Location = New System.Drawing.Point(77, 138) + Me.cmdNSE.Margin = New System.Windows.Forms.Padding(2) Me.cmdNSE.Name = "cmdNSE" - Me.cmdNSE.Size = New System.Drawing.Size(90, 48) + Me.cmdNSE.Size = New System.Drawing.Size(75, 40) Me.cmdNSE.TabIndex = 10 Me.cmdNSE.Text = "NSE" Me.cmdNSE.UseVisualStyleBackColor = True @@ -2221,9 +2158,10 @@ Partial Class ucrCalculator 'cmdNrmse ' Me.cmdNrmse.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdNrmse.Location = New System.Drawing.Point(3, 166) + Me.cmdNrmse.Location = New System.Drawing.Point(2, 138) + Me.cmdNrmse.Margin = New System.Windows.Forms.Padding(2) Me.cmdNrmse.Name = "cmdNrmse" - Me.cmdNrmse.Size = New System.Drawing.Size(90, 48) + Me.cmdNrmse.Size = New System.Drawing.Size(75, 40) Me.cmdNrmse.TabIndex = 9 Me.cmdNrmse.Text = "nrmse" Me.cmdNrmse.UseVisualStyleBackColor = True @@ -2231,9 +2169,10 @@ Partial Class ucrCalculator 'cmdMse ' Me.cmdMse.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdMse.Location = New System.Drawing.Point(180, 120) + Me.cmdMse.Location = New System.Drawing.Point(150, 100) + Me.cmdMse.Margin = New System.Windows.Forms.Padding(2) Me.cmdMse.Name = "cmdMse" - Me.cmdMse.Size = New System.Drawing.Size(90, 48) + Me.cmdMse.Size = New System.Drawing.Size(75, 40) Me.cmdMse.TabIndex = 8 Me.cmdMse.Text = "mse" Me.cmdMse.UseVisualStyleBackColor = True @@ -2241,9 +2180,10 @@ Partial Class ucrCalculator 'cmdmNSE ' Me.cmdmNSE.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdmNSE.Location = New System.Drawing.Point(92, 120) + Me.cmdmNSE.Location = New System.Drawing.Point(77, 100) + Me.cmdmNSE.Margin = New System.Windows.Forms.Padding(2) Me.cmdmNSE.Name = "cmdmNSE" - Me.cmdmNSE.Size = New System.Drawing.Size(90, 48) + Me.cmdmNSE.Size = New System.Drawing.Size(75, 40) Me.cmdmNSE.TabIndex = 7 Me.cmdmNSE.Text = "mNSE" Me.cmdmNSE.UseVisualStyleBackColor = True @@ -2251,9 +2191,10 @@ Partial Class ucrCalculator 'cmdMe ' Me.cmdMe.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdMe.Location = New System.Drawing.Point(3, 120) + Me.cmdMe.Location = New System.Drawing.Point(2, 100) + Me.cmdMe.Margin = New System.Windows.Forms.Padding(2) Me.cmdMe.Name = "cmdMe" - Me.cmdMe.Size = New System.Drawing.Size(90, 48) + Me.cmdMe.Size = New System.Drawing.Size(75, 40) Me.cmdMe.TabIndex = 6 Me.cmdMe.Text = "me" Me.cmdMe.UseVisualStyleBackColor = True @@ -2261,9 +2202,10 @@ Partial Class ucrCalculator 'cmdMd ' Me.cmdMd.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdMd.Location = New System.Drawing.Point(180, 72) + Me.cmdMd.Location = New System.Drawing.Point(150, 60) + Me.cmdMd.Margin = New System.Windows.Forms.Padding(2) Me.cmdMd.Name = "cmdMd" - Me.cmdMd.Size = New System.Drawing.Size(90, 48) + Me.cmdMd.Size = New System.Drawing.Size(75, 40) Me.cmdMd.TabIndex = 5 Me.cmdMd.Text = "md" Me.cmdMd.UseVisualStyleBackColor = True @@ -2271,9 +2213,10 @@ Partial Class ucrCalculator 'cmdMae ' Me.cmdMae.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdMae.Location = New System.Drawing.Point(92, 72) + Me.cmdMae.Location = New System.Drawing.Point(77, 60) + Me.cmdMae.Margin = New System.Windows.Forms.Padding(2) Me.cmdMae.Name = "cmdMae" - Me.cmdMae.Size = New System.Drawing.Size(90, 48) + Me.cmdMae.Size = New System.Drawing.Size(75, 40) Me.cmdMae.TabIndex = 4 Me.cmdMae.Text = "mae" Me.cmdMae.UseVisualStyleBackColor = True @@ -2281,9 +2224,10 @@ Partial Class ucrCalculator 'cmdKGE ' Me.cmdKGE.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdKGE.Location = New System.Drawing.Point(3, 72) + Me.cmdKGE.Location = New System.Drawing.Point(2, 60) + Me.cmdKGE.Margin = New System.Windows.Forms.Padding(2) Me.cmdKGE.Name = "cmdKGE" - Me.cmdKGE.Size = New System.Drawing.Size(90, 48) + Me.cmdKGE.Size = New System.Drawing.Size(75, 40) Me.cmdKGE.TabIndex = 3 Me.cmdKGE.Text = "KGE" Me.cmdKGE.UseVisualStyleBackColor = True @@ -2291,9 +2235,10 @@ Partial Class ucrCalculator 'cmdD ' Me.cmdD.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdD.Location = New System.Drawing.Point(180, 24) + Me.cmdD.Location = New System.Drawing.Point(150, 20) + Me.cmdD.Margin = New System.Windows.Forms.Padding(2) Me.cmdD.Name = "cmdD" - Me.cmdD.Size = New System.Drawing.Size(90, 48) + Me.cmdD.Size = New System.Drawing.Size(75, 40) Me.cmdD.TabIndex = 2 Me.cmdD.Text = "d" Me.cmdD.UseVisualStyleBackColor = True @@ -2301,9 +2246,10 @@ Partial Class ucrCalculator 'cmdCp ' Me.cmdCp.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdCp.Location = New System.Drawing.Point(92, 24) + Me.cmdCp.Location = New System.Drawing.Point(77, 20) + Me.cmdCp.Margin = New System.Windows.Forms.Padding(2) Me.cmdCp.Name = "cmdCp" - Me.cmdCp.Size = New System.Drawing.Size(90, 48) + Me.cmdCp.Size = New System.Drawing.Size(75, 40) Me.cmdCp.TabIndex = 1 Me.cmdCp.Text = "cp" Me.cmdCp.UseVisualStyleBackColor = True @@ -2311,24 +2257,25 @@ Partial Class ucrCalculator 'cmdBr2 ' Me.cmdBr2.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdBr2.Location = New System.Drawing.Point(3, 24) + Me.cmdBr2.Location = New System.Drawing.Point(2, 20) + Me.cmdBr2.Margin = New System.Windows.Forms.Padding(2) Me.cmdBr2.Name = "cmdBr2" - Me.cmdBr2.Size = New System.Drawing.Size(90, 48) + Me.cmdBr2.Size = New System.Drawing.Size(75, 40) Me.cmdBr2.TabIndex = 0 Me.cmdBr2.Text = "br2" Me.cmdBr2.UseVisualStyleBackColor = True ' 'grpWakefield ' - Me.grpWakefield.Controls.Add(Me.cmdLinkert7) + Me.grpWakefield.Controls.Add(Me.cmdLikert7) Me.grpWakefield.Controls.Add(Me.cmdWakefield_Year) Me.grpWakefield.Controls.Add(Me.cmdValid) - Me.grpWakefield.Controls.Add(Me.cmdWakefield_Upper) + Me.grpWakefield.Controls.Add(Me.cmdWakefieldUpper) Me.grpWakefield.Controls.Add(Me.cmdString) Me.grpWakefield.Controls.Add(Me.cmdState) Me.grpWakefield.Controls.Add(Me.cmdSpeed) Me.grpWakefield.Controls.Add(Me.cmdSmokes) - Me.grpWakefield.Controls.Add(Me.cmdSex) + Me.grpWakefield.Controls.Add(Me.cmdWakefieldTimes) Me.grpWakefield.Controls.Add(Me.cmdSex_Inclusive) Me.grpWakefield.Controls.Add(Me.cmdGender) Me.grpWakefield.Controls.Add(Me.cmdSentence) @@ -2344,9 +2291,9 @@ Partial Class ucrCalculator Me.grpWakefield.Controls.Add(Me.cmdLorem_ipsum) Me.grpWakefield.Controls.Add(Me.cmdLikert) Me.grpWakefield.Controls.Add(Me.cmdGpa) - Me.grpWakefield.Controls.Add(Me.cmdEla) + Me.grpWakefield.Controls.Add(Me.cmdWakefieldMinute) Me.grpWakefield.Controls.Add(Me.cmdMath) - Me.grpWakefield.Controls.Add(Me.cmdLevel) + Me.grpWakefield.Controls.Add(Me.cmdWakefieldLower) Me.grpWakefield.Controls.Add(Me.cmdLanguage) Me.grpWakefield.Controls.Add(Me.cmdIq) Me.grpWakefield.Controls.Add(Me.cmdInternet_Browser) @@ -2358,9 +2305,9 @@ Partial Class ucrCalculator Me.grpWakefield.Controls.Add(Me.cmdDob) Me.grpWakefield.Controls.Add(Me.cmdDna) Me.grpWakefield.Controls.Add(Me.cmdDice) - Me.grpWakefield.Controls.Add(Me.cmdDied) + Me.grpWakefield.Controls.Add(Me.cmdGrade_Letter) Me.grpWakefield.Controls.Add(Me.cmdDeath) - Me.grpWakefield.Controls.Add(Me.cmdDate_Stamp) + Me.grpWakefield.Controls.Add(Me.cmdWakefieldDates) Me.grpWakefield.Controls.Add(Me.cmdPrimary) Me.grpWakefield.Controls.Add(Me.cmdColor) Me.grpWakefield.Controls.Add(Me.cmdCoin) @@ -2375,35 +2322,31 @@ Partial Class ucrCalculator Me.grpWakefield.Controls.Add(Me.cmdHair) Me.grpWakefield.Controls.Add(Me.cmdGroup) Me.grpWakefield.Controls.Add(Me.cmdGrade) - Me.grpWakefield.Location = New System.Drawing.Point(650, 93) - Me.grpWakefield.Margin = New System.Windows.Forms.Padding(4) + Me.grpWakefield.Location = New System.Drawing.Point(542, 78) Me.grpWakefield.Name = "grpWakefield" - Me.grpWakefield.Padding = New System.Windows.Forms.Padding(4) - Me.grpWakefield.Size = New System.Drawing.Size(652, 519) + Me.grpWakefield.Size = New System.Drawing.Size(543, 432) Me.grpWakefield.TabIndex = 191 Me.grpWakefield.TabStop = False Me.grpWakefield.Text = "Wakefield" ' - 'cmdLinkert7 + 'cmdLikert7 ' - Me.cmdLinkert7.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.25!) - Me.cmdLinkert7.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdLinkert7.Location = New System.Drawing.Point(512, 459) - Me.cmdLinkert7.Margin = New System.Windows.Forms.Padding(4) - Me.cmdLinkert7.Name = "cmdLinkert7" - Me.cmdLinkert7.Size = New System.Drawing.Size(128, 45) - Me.cmdLinkert7.TabIndex = 54 - Me.cmdLinkert7.Text = "linkert7 (o.f)" - Me.cmdLinkert7.UseVisualStyleBackColor = True + Me.cmdLikert7.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.25!) + Me.cmdLikert7.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.cmdLikert7.Location = New System.Drawing.Point(427, 382) + Me.cmdLikert7.Name = "cmdLikert7" + Me.cmdLikert7.Size = New System.Drawing.Size(107, 38) + Me.cmdLikert7.TabIndex = 54 + Me.cmdLikert7.Text = "likert7 (O.F)" + Me.cmdLikert7.UseVisualStyleBackColor = True ' 'cmdWakefield_Year ' Me.cmdWakefield_Year.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.25!) Me.cmdWakefield_Year.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdWakefield_Year.Location = New System.Drawing.Point(386, 459) - Me.cmdWakefield_Year.Margin = New System.Windows.Forms.Padding(4) + Me.cmdWakefield_Year.Location = New System.Drawing.Point(322, 382) Me.cmdWakefield_Year.Name = "cmdWakefield_Year" - Me.cmdWakefield_Year.Size = New System.Drawing.Size(128, 45) + Me.cmdWakefield_Year.Size = New System.Drawing.Size(107, 38) Me.cmdWakefield_Year.TabIndex = 53 Me.cmdWakefield_Year.Text = "year" Me.cmdWakefield_Year.UseVisualStyleBackColor = True @@ -2412,58 +2355,53 @@ Partial Class ucrCalculator ' Me.cmdValid.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.25!) Me.cmdValid.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdValid.Location = New System.Drawing.Point(260, 459) - Me.cmdValid.Margin = New System.Windows.Forms.Padding(4) + Me.cmdValid.Location = New System.Drawing.Point(217, 382) Me.cmdValid.Name = "cmdValid" - Me.cmdValid.Size = New System.Drawing.Size(128, 45) + Me.cmdValid.Size = New System.Drawing.Size(107, 38) Me.cmdValid.TabIndex = 52 Me.cmdValid.Text = "valid (L)" Me.cmdValid.UseVisualStyleBackColor = True ' - 'cmdWakefield_Upper + 'cmdWakefieldUpper ' - Me.cmdWakefield_Upper.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.25!) - Me.cmdWakefield_Upper.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdWakefield_Upper.Location = New System.Drawing.Point(134, 459) - Me.cmdWakefield_Upper.Margin = New System.Windows.Forms.Padding(4) - Me.cmdWakefield_Upper.Name = "cmdWakefield_Upper" - Me.cmdWakefield_Upper.Size = New System.Drawing.Size(128, 45) - Me.cmdWakefield_Upper.TabIndex = 51 - Me.cmdWakefield_Upper.Text = "upper (c)" - Me.cmdWakefield_Upper.UseVisualStyleBackColor = True + Me.cmdWakefieldUpper.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.25!) + Me.cmdWakefieldUpper.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.cmdWakefieldUpper.Location = New System.Drawing.Point(112, 382) + Me.cmdWakefieldUpper.Name = "cmdWakefieldUpper" + Me.cmdWakefieldUpper.Size = New System.Drawing.Size(107, 38) + Me.cmdWakefieldUpper.TabIndex = 51 + Me.cmdWakefieldUpper.Text = "upper (F)" + Me.cmdWakefieldUpper.UseVisualStyleBackColor = True ' 'cmdString ' Me.cmdString.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.25!) Me.cmdString.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdString.Location = New System.Drawing.Point(8, 459) - Me.cmdString.Margin = New System.Windows.Forms.Padding(4) + Me.cmdString.Location = New System.Drawing.Point(7, 382) Me.cmdString.Name = "cmdString" - Me.cmdString.Size = New System.Drawing.Size(128, 45) + Me.cmdString.Size = New System.Drawing.Size(107, 38) Me.cmdString.TabIndex = 50 - Me.cmdString.Text = "string (c)" + Me.cmdString.Text = "string (C)" Me.cmdString.UseVisualStyleBackColor = True ' 'cmdState ' Me.cmdState.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.25!) Me.cmdState.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdState.Location = New System.Drawing.Point(512, 416) - Me.cmdState.Margin = New System.Windows.Forms.Padding(4) + Me.cmdState.Location = New System.Drawing.Point(427, 347) Me.cmdState.Name = "cmdState" - Me.cmdState.Size = New System.Drawing.Size(128, 45) + Me.cmdState.Size = New System.Drawing.Size(107, 38) Me.cmdState.TabIndex = 49 - Me.cmdState.Text = "state (f)" + Me.cmdState.Text = "state (F)" Me.cmdState.UseVisualStyleBackColor = True ' 'cmdSpeed ' Me.cmdSpeed.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.25!) Me.cmdSpeed.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdSpeed.Location = New System.Drawing.Point(386, 416) - Me.cmdSpeed.Margin = New System.Windows.Forms.Padding(4) + Me.cmdSpeed.Location = New System.Drawing.Point(322, 347) Me.cmdSpeed.Name = "cmdSpeed" - Me.cmdSpeed.Size = New System.Drawing.Size(128, 45) + Me.cmdSpeed.Size = New System.Drawing.Size(107, 38) Me.cmdSpeed.TabIndex = 48 Me.cmdSpeed.Text = "speed" Me.cmdSpeed.UseVisualStyleBackColor = True @@ -2472,70 +2410,64 @@ Partial Class ucrCalculator ' Me.cmdSmokes.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.25!) Me.cmdSmokes.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdSmokes.Location = New System.Drawing.Point(260, 416) - Me.cmdSmokes.Margin = New System.Windows.Forms.Padding(4) + Me.cmdSmokes.Location = New System.Drawing.Point(217, 347) Me.cmdSmokes.Name = "cmdSmokes" - Me.cmdSmokes.Size = New System.Drawing.Size(128, 45) + Me.cmdSmokes.Size = New System.Drawing.Size(107, 38) Me.cmdSmokes.TabIndex = 47 Me.cmdSmokes.Text = "smokes (L)" Me.cmdSmokes.UseVisualStyleBackColor = True ' - 'cmdSex + 'cmdWakefieldTimes ' - Me.cmdSex.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.25!) - Me.cmdSex.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdSex.Location = New System.Drawing.Point(134, 416) - Me.cmdSex.Margin = New System.Windows.Forms.Padding(4) - Me.cmdSex.Name = "cmdSex" - Me.cmdSex.Size = New System.Drawing.Size(128, 45) - Me.cmdSex.TabIndex = 46 - Me.cmdSex.Text = "sex (f)" - Me.cmdSex.UseVisualStyleBackColor = True + Me.cmdWakefieldTimes.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.25!) + Me.cmdWakefieldTimes.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.cmdWakefieldTimes.Location = New System.Drawing.Point(112, 347) + Me.cmdWakefieldTimes.Name = "cmdWakefieldTimes" + Me.cmdWakefieldTimes.Size = New System.Drawing.Size(107, 38) + Me.cmdWakefieldTimes.TabIndex = 46 + Me.cmdWakefieldTimes.Text = "times (T)" + Me.cmdWakefieldTimes.UseVisualStyleBackColor = True ' 'cmdSex_Inclusive ' Me.cmdSex_Inclusive.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.25!) Me.cmdSex_Inclusive.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdSex_Inclusive.Location = New System.Drawing.Point(8, 416) - Me.cmdSex_Inclusive.Margin = New System.Windows.Forms.Padding(4) + Me.cmdSex_Inclusive.Location = New System.Drawing.Point(7, 347) Me.cmdSex_Inclusive.Name = "cmdSex_Inclusive" - Me.cmdSex_Inclusive.Size = New System.Drawing.Size(128, 45) + Me.cmdSex_Inclusive.Size = New System.Drawing.Size(107, 38) Me.cmdSex_Inclusive.TabIndex = 45 - Me.cmdSex_Inclusive.Text = "sex_inclusive (f)" + Me.cmdSex_Inclusive.Text = "sex_inclusive (F)" Me.cmdSex_Inclusive.UseVisualStyleBackColor = True ' 'cmdGender ' Me.cmdGender.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.25!) Me.cmdGender.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdGender.Location = New System.Drawing.Point(512, 372) - Me.cmdGender.Margin = New System.Windows.Forms.Padding(4) + Me.cmdGender.Location = New System.Drawing.Point(427, 310) Me.cmdGender.Name = "cmdGender" - Me.cmdGender.Size = New System.Drawing.Size(128, 45) + Me.cmdGender.Size = New System.Drawing.Size(107, 38) Me.cmdGender.TabIndex = 44 - Me.cmdGender.Text = "gender (f)" + Me.cmdGender.Text = "gender (F)" Me.cmdGender.UseVisualStyleBackColor = True ' 'cmdSentence ' Me.cmdSentence.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.25!) Me.cmdSentence.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdSentence.Location = New System.Drawing.Point(386, 372) - Me.cmdSentence.Margin = New System.Windows.Forms.Padding(4) + Me.cmdSentence.Location = New System.Drawing.Point(322, 310) Me.cmdSentence.Name = "cmdSentence" - Me.cmdSentence.Size = New System.Drawing.Size(128, 45) + Me.cmdSentence.Size = New System.Drawing.Size(107, 38) Me.cmdSentence.TabIndex = 43 - Me.cmdSentence.Text = "sentence (c)" + Me.cmdSentence.Text = "sentence (C)" Me.cmdSentence.UseVisualStyleBackColor = True ' 'cmdSat ' Me.cmdSat.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.25!) Me.cmdSat.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdSat.Location = New System.Drawing.Point(260, 372) - Me.cmdSat.Margin = New System.Windows.Forms.Padding(4) + Me.cmdSat.Location = New System.Drawing.Point(217, 310) Me.cmdSat.Name = "cmdSat" - Me.cmdSat.Size = New System.Drawing.Size(128, 45) + Me.cmdSat.Size = New System.Drawing.Size(107, 38) Me.cmdSat.TabIndex = 42 Me.cmdSat.Text = "sat" Me.cmdSat.UseVisualStyleBackColor = True @@ -2544,46 +2476,42 @@ Partial Class ucrCalculator ' Me.cmdReligion.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.25!) Me.cmdReligion.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdReligion.Location = New System.Drawing.Point(134, 372) - Me.cmdReligion.Margin = New System.Windows.Forms.Padding(4) + Me.cmdReligion.Location = New System.Drawing.Point(112, 310) Me.cmdReligion.Name = "cmdReligion" - Me.cmdReligion.Size = New System.Drawing.Size(128, 45) + Me.cmdReligion.Size = New System.Drawing.Size(107, 38) Me.cmdReligion.TabIndex = 41 - Me.cmdReligion.Text = "religion (f)" + Me.cmdReligion.Text = "religion (F)" Me.cmdReligion.UseVisualStyleBackColor = True ' 'cmdRace ' Me.cmdRace.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.25!) Me.cmdRace.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdRace.Location = New System.Drawing.Point(8, 372) - Me.cmdRace.Margin = New System.Windows.Forms.Padding(4) + Me.cmdRace.Location = New System.Drawing.Point(7, 310) Me.cmdRace.Name = "cmdRace" - Me.cmdRace.Size = New System.Drawing.Size(128, 45) + Me.cmdRace.Size = New System.Drawing.Size(107, 38) Me.cmdRace.TabIndex = 40 - Me.cmdRace.Text = "race (f)" + Me.cmdRace.Text = "race (F)" Me.cmdRace.UseVisualStyleBackColor = True ' 'cmdPolitical ' Me.cmdPolitical.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.25!) Me.cmdPolitical.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdPolitical.Location = New System.Drawing.Point(512, 328) - Me.cmdPolitical.Margin = New System.Windows.Forms.Padding(4) + Me.cmdPolitical.Location = New System.Drawing.Point(427, 273) Me.cmdPolitical.Name = "cmdPolitical" - Me.cmdPolitical.Size = New System.Drawing.Size(128, 45) + Me.cmdPolitical.Size = New System.Drawing.Size(107, 38) Me.cmdPolitical.TabIndex = 39 - Me.cmdPolitical.Text = "political (f)" + Me.cmdPolitical.Text = "political (F)" Me.cmdPolitical.UseVisualStyleBackColor = True ' 'cmdNormal ' Me.cmdNormal.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.25!) Me.cmdNormal.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdNormal.Location = New System.Drawing.Point(386, 328) - Me.cmdNormal.Margin = New System.Windows.Forms.Padding(4) + Me.cmdNormal.Location = New System.Drawing.Point(322, 273) Me.cmdNormal.Name = "cmdNormal" - Me.cmdNormal.Size = New System.Drawing.Size(128, 45) + Me.cmdNormal.Size = New System.Drawing.Size(107, 38) Me.cmdNormal.TabIndex = 38 Me.cmdNormal.Text = "normal" Me.cmdNormal.UseVisualStyleBackColor = True @@ -2592,142 +2520,130 @@ Partial Class ucrCalculator ' Me.cmdName.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.25!) Me.cmdName.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdName.Location = New System.Drawing.Point(260, 328) - Me.cmdName.Margin = New System.Windows.Forms.Padding(4) + Me.cmdName.Location = New System.Drawing.Point(217, 273) Me.cmdName.Name = "cmdName" - Me.cmdName.Size = New System.Drawing.Size(128, 45) + Me.cmdName.Size = New System.Drawing.Size(107, 38) Me.cmdName.TabIndex = 37 - Me.cmdName.Text = "name (c)" + Me.cmdName.Text = "name (C)" Me.cmdName.UseVisualStyleBackColor = True ' 'cmdWakefield_Month ' Me.cmdWakefield_Month.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.25!) Me.cmdWakefield_Month.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdWakefield_Month.Location = New System.Drawing.Point(134, 328) - Me.cmdWakefield_Month.Margin = New System.Windows.Forms.Padding(4) + Me.cmdWakefield_Month.Location = New System.Drawing.Point(112, 273) Me.cmdWakefield_Month.Name = "cmdWakefield_Month" - Me.cmdWakefield_Month.Size = New System.Drawing.Size(128, 45) + Me.cmdWakefield_Month.Size = New System.Drawing.Size(107, 38) Me.cmdWakefield_Month.TabIndex = 36 - Me.cmdWakefield_Month.Text = "month (f)" + Me.cmdWakefield_Month.Text = "month (F)" Me.cmdWakefield_Month.UseVisualStyleBackColor = True ' 'cmdMilitary ' Me.cmdMilitary.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.25!) Me.cmdMilitary.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdMilitary.Location = New System.Drawing.Point(8, 328) - Me.cmdMilitary.Margin = New System.Windows.Forms.Padding(4) + Me.cmdMilitary.Location = New System.Drawing.Point(7, 273) Me.cmdMilitary.Name = "cmdMilitary" - Me.cmdMilitary.Size = New System.Drawing.Size(128, 45) + Me.cmdMilitary.Size = New System.Drawing.Size(107, 38) Me.cmdMilitary.TabIndex = 35 - Me.cmdMilitary.Text = "military (f)" + Me.cmdMilitary.Text = "military (F)" Me.cmdMilitary.UseVisualStyleBackColor = True ' 'cmdMarital ' Me.cmdMarital.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.25!) Me.cmdMarital.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdMarital.Location = New System.Drawing.Point(512, 284) - Me.cmdMarital.Margin = New System.Windows.Forms.Padding(4) + Me.cmdMarital.Location = New System.Drawing.Point(427, 237) Me.cmdMarital.Name = "cmdMarital" - Me.cmdMarital.Size = New System.Drawing.Size(128, 45) + Me.cmdMarital.Size = New System.Drawing.Size(107, 38) Me.cmdMarital.TabIndex = 34 - Me.cmdMarital.Text = "marital (f)" + Me.cmdMarital.Text = "marital (F)" Me.cmdMarital.UseVisualStyleBackColor = True ' 'cmdLorem_ipsum ' Me.cmdLorem_ipsum.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.25!) Me.cmdLorem_ipsum.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdLorem_ipsum.Location = New System.Drawing.Point(386, 284) - Me.cmdLorem_ipsum.Margin = New System.Windows.Forms.Padding(4) + Me.cmdLorem_ipsum.Location = New System.Drawing.Point(322, 237) Me.cmdLorem_ipsum.Name = "cmdLorem_ipsum" - Me.cmdLorem_ipsum.Size = New System.Drawing.Size(128, 45) + Me.cmdLorem_ipsum.Size = New System.Drawing.Size(107, 38) Me.cmdLorem_ipsum.TabIndex = 33 - Me.cmdLorem_ipsum.Text = "lorem_ipsum (c)" + Me.cmdLorem_ipsum.Text = "lorem_ipsum (C)" Me.cmdLorem_ipsum.UseVisualStyleBackColor = True ' 'cmdLikert ' Me.cmdLikert.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.25!) Me.cmdLikert.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdLikert.Location = New System.Drawing.Point(260, 284) - Me.cmdLikert.Margin = New System.Windows.Forms.Padding(4) + Me.cmdLikert.Location = New System.Drawing.Point(217, 237) Me.cmdLikert.Name = "cmdLikert" - Me.cmdLikert.Size = New System.Drawing.Size(128, 45) + Me.cmdLikert.Size = New System.Drawing.Size(107, 38) Me.cmdLikert.TabIndex = 32 - Me.cmdLikert.Text = "likert (o.f)" + Me.cmdLikert.Text = "likert (O.F)" Me.cmdLikert.UseVisualStyleBackColor = True ' 'cmdGpa ' Me.cmdGpa.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.25!) Me.cmdGpa.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdGpa.Location = New System.Drawing.Point(134, 284) - Me.cmdGpa.Margin = New System.Windows.Forms.Padding(4) + Me.cmdGpa.Location = New System.Drawing.Point(112, 237) Me.cmdGpa.Name = "cmdGpa" - Me.cmdGpa.Size = New System.Drawing.Size(128, 45) + Me.cmdGpa.Size = New System.Drawing.Size(107, 38) Me.cmdGpa.TabIndex = 31 Me.cmdGpa.Text = "gpa" Me.cmdGpa.UseVisualStyleBackColor = True ' - 'cmdEla + 'cmdWakefieldMinute ' - Me.cmdEla.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.25!) - Me.cmdEla.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdEla.Location = New System.Drawing.Point(8, 284) - Me.cmdEla.Margin = New System.Windows.Forms.Padding(4) - Me.cmdEla.Name = "cmdEla" - Me.cmdEla.Size = New System.Drawing.Size(128, 45) - Me.cmdEla.TabIndex = 30 - Me.cmdEla.Text = "ela" - Me.cmdEla.UseVisualStyleBackColor = True + Me.cmdWakefieldMinute.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.25!) + Me.cmdWakefieldMinute.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.cmdWakefieldMinute.Location = New System.Drawing.Point(7, 237) + Me.cmdWakefieldMinute.Name = "cmdWakefieldMinute" + Me.cmdWakefieldMinute.Size = New System.Drawing.Size(107, 38) + Me.cmdWakefieldMinute.TabIndex = 30 + Me.cmdWakefieldMinute.Text = "minute (T)" + Me.cmdWakefieldMinute.UseVisualStyleBackColor = True ' 'cmdMath ' Me.cmdMath.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.25!) Me.cmdMath.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdMath.Location = New System.Drawing.Point(512, 240) - Me.cmdMath.Margin = New System.Windows.Forms.Padding(4) + Me.cmdMath.Location = New System.Drawing.Point(427, 200) Me.cmdMath.Name = "cmdMath" - Me.cmdMath.Size = New System.Drawing.Size(128, 45) + Me.cmdMath.Size = New System.Drawing.Size(107, 38) Me.cmdMath.TabIndex = 29 Me.cmdMath.Text = "math" Me.cmdMath.UseVisualStyleBackColor = True ' - 'cmdLevel + 'cmdWakefieldLower ' - Me.cmdLevel.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.25!) - Me.cmdLevel.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdLevel.Location = New System.Drawing.Point(386, 240) - Me.cmdLevel.Margin = New System.Windows.Forms.Padding(4) - Me.cmdLevel.Name = "cmdLevel" - Me.cmdLevel.Size = New System.Drawing.Size(128, 45) - Me.cmdLevel.TabIndex = 28 - Me.cmdLevel.Text = "level" - Me.cmdLevel.UseVisualStyleBackColor = True + Me.cmdWakefieldLower.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.25!) + Me.cmdWakefieldLower.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.cmdWakefieldLower.Location = New System.Drawing.Point(322, 200) + Me.cmdWakefieldLower.Name = "cmdWakefieldLower" + Me.cmdWakefieldLower.Size = New System.Drawing.Size(107, 38) + Me.cmdWakefieldLower.TabIndex = 28 + Me.cmdWakefieldLower.Text = "lower(F)" + Me.cmdWakefieldLower.UseVisualStyleBackColor = True ' 'cmdLanguage ' Me.cmdLanguage.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.25!) Me.cmdLanguage.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdLanguage.Location = New System.Drawing.Point(260, 240) - Me.cmdLanguage.Margin = New System.Windows.Forms.Padding(4) + Me.cmdLanguage.Location = New System.Drawing.Point(217, 200) Me.cmdLanguage.Name = "cmdLanguage" - Me.cmdLanguage.Size = New System.Drawing.Size(128, 45) + Me.cmdLanguage.Size = New System.Drawing.Size(107, 38) Me.cmdLanguage.TabIndex = 27 - Me.cmdLanguage.Text = "language (f)" + Me.cmdLanguage.Text = "language (F)" Me.cmdLanguage.UseVisualStyleBackColor = True ' 'cmdIq ' Me.cmdIq.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.25!) Me.cmdIq.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdIq.Location = New System.Drawing.Point(134, 240) - Me.cmdIq.Margin = New System.Windows.Forms.Padding(4) + Me.cmdIq.Location = New System.Drawing.Point(112, 200) Me.cmdIq.Name = "cmdIq" - Me.cmdIq.Size = New System.Drawing.Size(128, 45) + Me.cmdIq.Size = New System.Drawing.Size(107, 38) Me.cmdIq.TabIndex = 26 Me.cmdIq.Text = "iq" Me.cmdIq.UseVisualStyleBackColor = True @@ -2736,70 +2652,64 @@ Partial Class ucrCalculator ' Me.cmdInternet_Browser.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.25!) Me.cmdInternet_Browser.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdInternet_Browser.Location = New System.Drawing.Point(8, 240) - Me.cmdInternet_Browser.Margin = New System.Windows.Forms.Padding(4) + Me.cmdInternet_Browser.Location = New System.Drawing.Point(7, 200) Me.cmdInternet_Browser.Name = "cmdInternet_Browser" - Me.cmdInternet_Browser.Size = New System.Drawing.Size(128, 45) + Me.cmdInternet_Browser.Size = New System.Drawing.Size(107, 38) Me.cmdInternet_Browser.TabIndex = 25 - Me.cmdInternet_Browser.Text = "browser (f)" + Me.cmdInternet_Browser.Text = "browser (F)" Me.cmdInternet_Browser.UseVisualStyleBackColor = True ' 'cmdGrade_Level ' Me.cmdGrade_Level.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.25!) Me.cmdGrade_Level.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdGrade_Level.Location = New System.Drawing.Point(512, 153) - Me.cmdGrade_Level.Margin = New System.Windows.Forms.Padding(4) + Me.cmdGrade_Level.Location = New System.Drawing.Point(427, 128) Me.cmdGrade_Level.Name = "cmdGrade_Level" - Me.cmdGrade_Level.Size = New System.Drawing.Size(128, 45) + Me.cmdGrade_Level.Size = New System.Drawing.Size(107, 38) Me.cmdGrade_Level.TabIndex = 19 - Me.cmdGrade_Level.Text = "grade_level (f)" + Me.cmdGrade_Level.Text = "grade_level (F)" Me.cmdGrade_Level.UseVisualStyleBackColor = True ' 'cmdEye ' Me.cmdEye.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.25!) Me.cmdEye.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdEye.Location = New System.Drawing.Point(386, 153) - Me.cmdEye.Margin = New System.Windows.Forms.Padding(4) + Me.cmdEye.Location = New System.Drawing.Point(322, 128) Me.cmdEye.Name = "cmdEye" - Me.cmdEye.Size = New System.Drawing.Size(128, 45) + Me.cmdEye.Size = New System.Drawing.Size(107, 38) Me.cmdEye.TabIndex = 18 - Me.cmdEye.Text = "eye (f)" + Me.cmdEye.Text = "eye (F)" Me.cmdEye.UseVisualStyleBackColor = True ' 'cmdEmployment ' Me.cmdEmployment.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.25!) Me.cmdEmployment.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdEmployment.Location = New System.Drawing.Point(260, 153) - Me.cmdEmployment.Margin = New System.Windows.Forms.Padding(4) + Me.cmdEmployment.Location = New System.Drawing.Point(217, 128) Me.cmdEmployment.Name = "cmdEmployment" - Me.cmdEmployment.Size = New System.Drawing.Size(128, 45) + Me.cmdEmployment.Size = New System.Drawing.Size(107, 38) Me.cmdEmployment.TabIndex = 17 - Me.cmdEmployment.Text = "employment (f)" + Me.cmdEmployment.Text = "employment (F)" Me.cmdEmployment.UseVisualStyleBackColor = True ' 'cmdEducation ' Me.cmdEducation.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.25!) Me.cmdEducation.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdEducation.Location = New System.Drawing.Point(134, 153) - Me.cmdEducation.Margin = New System.Windows.Forms.Padding(4) + Me.cmdEducation.Location = New System.Drawing.Point(112, 128) Me.cmdEducation.Name = "cmdEducation" - Me.cmdEducation.Size = New System.Drawing.Size(128, 45) + Me.cmdEducation.Size = New System.Drawing.Size(107, 38) Me.cmdEducation.TabIndex = 16 - Me.cmdEducation.Text = "education (f)" + Me.cmdEducation.Text = "education (F)" Me.cmdEducation.UseVisualStyleBackColor = True ' 'cmdDummy ' Me.cmdDummy.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.25!) Me.cmdDummy.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdDummy.Location = New System.Drawing.Point(8, 153) - Me.cmdDummy.Margin = New System.Windows.Forms.Padding(4) + Me.cmdDummy.Location = New System.Drawing.Point(7, 128) Me.cmdDummy.Name = "cmdDummy" - Me.cmdDummy.Size = New System.Drawing.Size(128, 45) + Me.cmdDummy.Size = New System.Drawing.Size(107, 38) Me.cmdDummy.TabIndex = 15 Me.cmdDummy.Text = "dummy" Me.cmdDummy.UseVisualStyleBackColor = True @@ -2808,10 +2718,9 @@ Partial Class ucrCalculator ' Me.cmdDob.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.25!) Me.cmdDob.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdDob.Location = New System.Drawing.Point(512, 108) - Me.cmdDob.Margin = New System.Windows.Forms.Padding(4) + Me.cmdDob.Location = New System.Drawing.Point(427, 90) Me.cmdDob.Name = "cmdDob" - Me.cmdDob.Size = New System.Drawing.Size(128, 45) + Me.cmdDob.Size = New System.Drawing.Size(107, 38) Me.cmdDob.TabIndex = 14 Me.cmdDob.Text = "dob (D)" Me.cmdDob.UseVisualStyleBackColor = True @@ -2820,106 +2729,97 @@ Partial Class ucrCalculator ' Me.cmdDna.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.25!) Me.cmdDna.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdDna.Location = New System.Drawing.Point(386, 108) - Me.cmdDna.Margin = New System.Windows.Forms.Padding(4) + Me.cmdDna.Location = New System.Drawing.Point(322, 90) Me.cmdDna.Name = "cmdDna" - Me.cmdDna.Size = New System.Drawing.Size(128, 45) + Me.cmdDna.Size = New System.Drawing.Size(107, 38) Me.cmdDna.TabIndex = 13 - Me.cmdDna.Text = "dna (f)" + Me.cmdDna.Text = "dna (F)" Me.cmdDna.UseVisualStyleBackColor = True ' 'cmdDice ' Me.cmdDice.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.25!) Me.cmdDice.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdDice.Location = New System.Drawing.Point(260, 108) - Me.cmdDice.Margin = New System.Windows.Forms.Padding(4) + Me.cmdDice.Location = New System.Drawing.Point(217, 90) Me.cmdDice.Name = "cmdDice" - Me.cmdDice.Size = New System.Drawing.Size(128, 45) + Me.cmdDice.Size = New System.Drawing.Size(107, 38) Me.cmdDice.TabIndex = 12 Me.cmdDice.Text = "dice" Me.cmdDice.UseVisualStyleBackColor = True ' - 'cmdDied + 'cmdGrade_Letter ' - Me.cmdDied.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.25!) - Me.cmdDied.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdDied.Location = New System.Drawing.Point(134, 108) - Me.cmdDied.Margin = New System.Windows.Forms.Padding(4) - Me.cmdDied.Name = "cmdDied" - Me.cmdDied.Size = New System.Drawing.Size(128, 45) - Me.cmdDied.TabIndex = 11 - Me.cmdDied.Text = "died (L)" - Me.cmdDied.UseVisualStyleBackColor = True + Me.cmdGrade_Letter.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.25!) + Me.cmdGrade_Letter.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.cmdGrade_Letter.Location = New System.Drawing.Point(112, 90) + Me.cmdGrade_Letter.Name = "cmdGrade_Letter" + Me.cmdGrade_Letter.Size = New System.Drawing.Size(107, 38) + Me.cmdGrade_Letter.TabIndex = 11 + Me.cmdGrade_Letter.Text = "grade_letter(F)" + Me.cmdGrade_Letter.UseVisualStyleBackColor = True ' 'cmdDeath ' Me.cmdDeath.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.25!) Me.cmdDeath.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdDeath.Location = New System.Drawing.Point(8, 108) - Me.cmdDeath.Margin = New System.Windows.Forms.Padding(4) + Me.cmdDeath.Location = New System.Drawing.Point(7, 90) Me.cmdDeath.Name = "cmdDeath" - Me.cmdDeath.Size = New System.Drawing.Size(128, 45) + Me.cmdDeath.Size = New System.Drawing.Size(107, 38) Me.cmdDeath.TabIndex = 10 Me.cmdDeath.Text = "death (L)" Me.cmdDeath.UseVisualStyleBackColor = True ' - 'cmdDate_Stamp + 'cmdWakefieldDates ' - Me.cmdDate_Stamp.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.25!) - Me.cmdDate_Stamp.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdDate_Stamp.Location = New System.Drawing.Point(512, 64) - Me.cmdDate_Stamp.Margin = New System.Windows.Forms.Padding(4) - Me.cmdDate_Stamp.Name = "cmdDate_Stamp" - Me.cmdDate_Stamp.Size = New System.Drawing.Size(128, 45) - Me.cmdDate_Stamp.TabIndex = 9 - Me.cmdDate_Stamp.Text = "date_stamp" - Me.cmdDate_Stamp.UseVisualStyleBackColor = True + Me.cmdWakefieldDates.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.25!) + Me.cmdWakefieldDates.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.cmdWakefieldDates.Location = New System.Drawing.Point(427, 53) + Me.cmdWakefieldDates.Name = "cmdWakefieldDates" + Me.cmdWakefieldDates.Size = New System.Drawing.Size(107, 38) + Me.cmdWakefieldDates.TabIndex = 9 + Me.cmdWakefieldDates.Text = "dates (D)" + Me.cmdWakefieldDates.UseVisualStyleBackColor = True ' 'cmdPrimary ' Me.cmdPrimary.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.25!) Me.cmdPrimary.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdPrimary.Location = New System.Drawing.Point(386, 64) - Me.cmdPrimary.Margin = New System.Windows.Forms.Padding(4) + Me.cmdPrimary.Location = New System.Drawing.Point(322, 53) Me.cmdPrimary.Name = "cmdPrimary" - Me.cmdPrimary.Size = New System.Drawing.Size(128, 45) + Me.cmdPrimary.Size = New System.Drawing.Size(107, 38) Me.cmdPrimary.TabIndex = 8 - Me.cmdPrimary.Text = "primary (f)" + Me.cmdPrimary.Text = "primary (F)" Me.cmdPrimary.UseVisualStyleBackColor = True ' 'cmdColor ' Me.cmdColor.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.25!) Me.cmdColor.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdColor.Location = New System.Drawing.Point(260, 64) - Me.cmdColor.Margin = New System.Windows.Forms.Padding(4) + Me.cmdColor.Location = New System.Drawing.Point(217, 53) Me.cmdColor.Name = "cmdColor" - Me.cmdColor.Size = New System.Drawing.Size(128, 45) + Me.cmdColor.Size = New System.Drawing.Size(107, 38) Me.cmdColor.TabIndex = 7 - Me.cmdColor.Text = "color (f)" + Me.cmdColor.Text = "color (F)" Me.cmdColor.UseVisualStyleBackColor = True ' 'cmdCoin ' Me.cmdCoin.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.25!) Me.cmdCoin.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdCoin.Location = New System.Drawing.Point(134, 64) - Me.cmdCoin.Margin = New System.Windows.Forms.Padding(4) + Me.cmdCoin.Location = New System.Drawing.Point(112, 53) Me.cmdCoin.Name = "cmdCoin" - Me.cmdCoin.Size = New System.Drawing.Size(128, 45) + Me.cmdCoin.Size = New System.Drawing.Size(107, 38) Me.cmdCoin.TabIndex = 6 - Me.cmdCoin.Text = "coin (f)" + Me.cmdCoin.Text = "coin (F)" Me.cmdCoin.UseVisualStyleBackColor = True ' 'cmdChildren ' Me.cmdChildren.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.25!) Me.cmdChildren.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdChildren.Location = New System.Drawing.Point(8, 64) - Me.cmdChildren.Margin = New System.Windows.Forms.Padding(4) + Me.cmdChildren.Location = New System.Drawing.Point(7, 53) Me.cmdChildren.Name = "cmdChildren" - Me.cmdChildren.Size = New System.Drawing.Size(128, 45) + Me.cmdChildren.Size = New System.Drawing.Size(107, 38) Me.cmdChildren.TabIndex = 5 Me.cmdChildren.Text = "children" Me.cmdChildren.UseVisualStyleBackColor = True @@ -2928,58 +2828,53 @@ Partial Class ucrCalculator ' Me.cmdCar.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.25!) Me.cmdCar.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdCar.Location = New System.Drawing.Point(512, 21) - Me.cmdCar.Margin = New System.Windows.Forms.Padding(4) + Me.cmdCar.Location = New System.Drawing.Point(427, 18) Me.cmdCar.Name = "cmdCar" - Me.cmdCar.Size = New System.Drawing.Size(128, 45) + Me.cmdCar.Size = New System.Drawing.Size(107, 38) Me.cmdCar.TabIndex = 4 - Me.cmdCar.Text = "car (f)" + Me.cmdCar.Text = "car (F)" Me.cmdCar.UseVisualStyleBackColor = True ' 'cmdAnswer ' Me.cmdAnswer.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.25!) Me.cmdAnswer.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdAnswer.Location = New System.Drawing.Point(386, 21) - Me.cmdAnswer.Margin = New System.Windows.Forms.Padding(4) + Me.cmdAnswer.Location = New System.Drawing.Point(322, 18) Me.cmdAnswer.Name = "cmdAnswer" - Me.cmdAnswer.Size = New System.Drawing.Size(128, 45) + Me.cmdAnswer.Size = New System.Drawing.Size(107, 38) Me.cmdAnswer.TabIndex = 3 - Me.cmdAnswer.Text = "answer (f)" + Me.cmdAnswer.Text = "answer (F)" Me.cmdAnswer.UseVisualStyleBackColor = True ' 'cmdPet ' Me.cmdPet.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.25!) Me.cmdPet.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdPet.Location = New System.Drawing.Point(260, 21) - Me.cmdPet.Margin = New System.Windows.Forms.Padding(4) + Me.cmdPet.Location = New System.Drawing.Point(217, 18) Me.cmdPet.Name = "cmdPet" - Me.cmdPet.Size = New System.Drawing.Size(128, 45) + Me.cmdPet.Size = New System.Drawing.Size(107, 38) Me.cmdPet.TabIndex = 2 - Me.cmdPet.Text = "pet (f)" + Me.cmdPet.Text = "pet (F)" Me.cmdPet.UseVisualStyleBackColor = True ' 'cmdAnimal ' Me.cmdAnimal.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.25!) Me.cmdAnimal.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdAnimal.Location = New System.Drawing.Point(134, 21) - Me.cmdAnimal.Margin = New System.Windows.Forms.Padding(4) + Me.cmdAnimal.Location = New System.Drawing.Point(112, 18) Me.cmdAnimal.Name = "cmdAnimal" - Me.cmdAnimal.Size = New System.Drawing.Size(128, 45) + Me.cmdAnimal.Size = New System.Drawing.Size(107, 38) Me.cmdAnimal.TabIndex = 1 - Me.cmdAnimal.Text = "animal (f)" + Me.cmdAnimal.Text = "animal (F)" Me.cmdAnimal.UseVisualStyleBackColor = True ' 'cmdAge ' Me.cmdAge.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.25!) Me.cmdAge.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdAge.Location = New System.Drawing.Point(8, 21) - Me.cmdAge.Margin = New System.Windows.Forms.Padding(4) + Me.cmdAge.Location = New System.Drawing.Point(7, 18) Me.cmdAge.Name = "cmdAge" - Me.cmdAge.Size = New System.Drawing.Size(128, 45) + Me.cmdAge.Size = New System.Drawing.Size(107, 38) Me.cmdAge.TabIndex = 0 Me.cmdAge.Text = "age" Me.cmdAge.UseVisualStyleBackColor = True @@ -2988,10 +2883,9 @@ Partial Class ucrCalculator ' Me.cmdIncome.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.25!) Me.cmdIncome.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdIncome.Location = New System.Drawing.Point(512, 196) - Me.cmdIncome.Margin = New System.Windows.Forms.Padding(4) + Me.cmdIncome.Location = New System.Drawing.Point(427, 163) Me.cmdIncome.Name = "cmdIncome" - Me.cmdIncome.Size = New System.Drawing.Size(128, 45) + Me.cmdIncome.Size = New System.Drawing.Size(107, 38) Me.cmdIncome.TabIndex = 24 Me.cmdIncome.Text = "income" Me.cmdIncome.UseVisualStyleBackColor = True @@ -3000,10 +2894,9 @@ Partial Class ucrCalculator ' Me.cmdHeight.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.25!) Me.cmdHeight.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdHeight.Location = New System.Drawing.Point(386, 196) - Me.cmdHeight.Margin = New System.Windows.Forms.Padding(4) + Me.cmdHeight.Location = New System.Drawing.Point(322, 163) Me.cmdHeight.Name = "cmdHeight" - Me.cmdHeight.Size = New System.Drawing.Size(128, 45) + Me.cmdHeight.Size = New System.Drawing.Size(107, 38) Me.cmdHeight.TabIndex = 23 Me.cmdHeight.Text = "height" Me.cmdHeight.UseVisualStyleBackColor = True @@ -3012,34 +2905,31 @@ Partial Class ucrCalculator ' Me.cmdHair.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.25!) Me.cmdHair.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdHair.Location = New System.Drawing.Point(260, 196) - Me.cmdHair.Margin = New System.Windows.Forms.Padding(4) + Me.cmdHair.Location = New System.Drawing.Point(217, 163) Me.cmdHair.Name = "cmdHair" - Me.cmdHair.Size = New System.Drawing.Size(128, 45) + Me.cmdHair.Size = New System.Drawing.Size(107, 38) Me.cmdHair.TabIndex = 22 - Me.cmdHair.Text = "hair (f)" + Me.cmdHair.Text = "hair (F)" Me.cmdHair.UseVisualStyleBackColor = True ' 'cmdGroup ' Me.cmdGroup.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.25!) Me.cmdGroup.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdGroup.Location = New System.Drawing.Point(134, 196) - Me.cmdGroup.Margin = New System.Windows.Forms.Padding(4) + Me.cmdGroup.Location = New System.Drawing.Point(112, 163) Me.cmdGroup.Name = "cmdGroup" - Me.cmdGroup.Size = New System.Drawing.Size(128, 45) + Me.cmdGroup.Size = New System.Drawing.Size(107, 38) Me.cmdGroup.TabIndex = 21 - Me.cmdGroup.Text = "group (f)" + Me.cmdGroup.Text = "group (F)" Me.cmdGroup.UseVisualStyleBackColor = True ' 'cmdGrade ' Me.cmdGrade.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.25!) Me.cmdGrade.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdGrade.Location = New System.Drawing.Point(8, 196) - Me.cmdGrade.Margin = New System.Windows.Forms.Padding(4) + Me.cmdGrade.Location = New System.Drawing.Point(7, 163) Me.cmdGrade.Name = "cmdGrade" - Me.cmdGrade.Size = New System.Drawing.Size(128, 45) + Me.cmdGrade.Size = New System.Drawing.Size(107, 38) Me.cmdGrade.TabIndex = 20 Me.cmdGrade.Text = "grade" Me.cmdGrade.UseVisualStyleBackColor = True @@ -3070,48 +2960,52 @@ Partial Class ucrCalculator Me.grpMaths.Controls.Add(Me.cmdAcos) Me.grpMaths.Controls.Add(Me.cmdCos) Me.grpMaths.Controls.Add(Me.cmdSqrt) - Me.grpMaths.Location = New System.Drawing.Point(650, 93) - Me.grpMaths.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.grpMaths.Location = New System.Drawing.Point(542, 78) + Me.grpMaths.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.grpMaths.Name = "grpMaths" - Me.grpMaths.Padding = New System.Windows.Forms.Padding(3, 4, 3, 4) - Me.grpMaths.Size = New System.Drawing.Size(384, 246) + Me.grpMaths.Padding = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.grpMaths.Size = New System.Drawing.Size(320, 205) Me.grpMaths.TabIndex = 184 Me.grpMaths.TabStop = False Me.grpMaths.Text = "Maths" ' - 'cmdMathsHelp - ' - Me.cmdMathsHelp.AutoSize = True - Me.cmdMathsHelp.ContextMenuStrip = Me.ContextMenuStripMaths - Me.cmdMathsHelp.Location = New System.Drawing.Point(264, 198) - Me.cmdMathsHelp.Margin = New System.Windows.Forms.Padding(4) - Me.cmdMathsHelp.Name = "cmdMathsHelp" - Me.cmdMathsHelp.Size = New System.Drawing.Size(129, 45) - Me.cmdMathsHelp.SplitMenuStrip = Me.ContextMenuStripMaths - Me.cmdMathsHelp.TabIndex = 211 - Me.cmdMathsHelp.Text = "R Help" - Me.cmdMathsHelp.UseVisualStyleBackColor = True - ' 'ContextMenuStripMaths ' Me.ContextMenuStripMaths.ImageScalingSize = New System.Drawing.Size(24, 24) - Me.ContextMenuStripMaths.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.MathsStatsStripMenuItem}) + Me.ContextMenuStripMaths.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.MathsBaseStripMenuItem, Me.MathsStatsStripMenuItem, Me.MathsCarToolStripMenuItem, Me.MathsCircularToolStripMenuItem}) Me.ContextMenuStripMaths.Name = "ContextMenuStrip1" - Me.ContextMenuStripMaths.Size = New System.Drawing.Size(122, 36) + Me.ContextMenuStripMaths.Size = New System.Drawing.Size(127, 100) + ' + 'MathsBaseStripMenuItem + ' + Me.MathsBaseStripMenuItem.Name = "MathsBaseStripMenuItem" + Me.MathsBaseStripMenuItem.Size = New System.Drawing.Size(126, 24) + Me.MathsBaseStripMenuItem.Text = "base" ' 'MathsStatsStripMenuItem ' Me.MathsStatsStripMenuItem.Name = "MathsStatsStripMenuItem" - Me.MathsStatsStripMenuItem.Size = New System.Drawing.Size(121, 32) + Me.MathsStatsStripMenuItem.Size = New System.Drawing.Size(126, 24) Me.MathsStatsStripMenuItem.Text = "stats" ' + 'MathsCarToolStripMenuItem + ' + Me.MathsCarToolStripMenuItem.Name = "MathsCarToolStripMenuItem" + Me.MathsCarToolStripMenuItem.Size = New System.Drawing.Size(126, 24) + Me.MathsCarToolStripMenuItem.Text = "car" + ' + 'MathsCircularToolStripMenuItem + ' + Me.MathsCircularToolStripMenuItem.Name = "MathsCircularToolStripMenuItem" + Me.MathsCircularToolStripMenuItem.Size = New System.Drawing.Size(126, 24) + Me.MathsCircularToolStripMenuItem.Text = "circular" + ' 'cmdAtan2 ' Me.cmdAtan2.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdAtan2.Location = New System.Drawing.Point(153, 195) - Me.cmdAtan2.Margin = New System.Windows.Forms.Padding(4) + Me.cmdAtan2.Location = New System.Drawing.Point(128, 162) Me.cmdAtan2.Name = "cmdAtan2" - Me.cmdAtan2.Size = New System.Drawing.Size(76, 45) + Me.cmdAtan2.Size = New System.Drawing.Size(63, 38) Me.cmdAtan2.TabIndex = 151 Me.cmdAtan2.Text = "atan2" Me.cmdAtan2.UseVisualStyleBackColor = True @@ -3119,10 +3013,9 @@ Partial Class ucrCalculator 'cmdLogistic ' Me.cmdLogistic.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdLogistic.Location = New System.Drawing.Point(78, 195) - Me.cmdLogistic.Margin = New System.Windows.Forms.Padding(4) + Me.cmdLogistic.Location = New System.Drawing.Point(65, 162) Me.cmdLogistic.Name = "cmdLogistic" - Me.cmdLogistic.Size = New System.Drawing.Size(76, 45) + Me.cmdLogistic.Size = New System.Drawing.Size(63, 38) Me.cmdLogistic.TabIndex = 149 Me.cmdLogistic.Text = "logistic" Me.cmdLogistic.UseVisualStyleBackColor = True @@ -3130,10 +3023,9 @@ Partial Class ucrCalculator 'cmdLogit ' Me.cmdLogit.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdLogit.Location = New System.Drawing.Point(3, 195) - Me.cmdLogit.Margin = New System.Windows.Forms.Padding(4) + Me.cmdLogit.Location = New System.Drawing.Point(2, 162) Me.cmdLogit.Name = "cmdLogit" - Me.cmdLogit.Size = New System.Drawing.Size(76, 45) + Me.cmdLogit.Size = New System.Drawing.Size(63, 38) Me.cmdLogit.TabIndex = 148 Me.cmdLogit.Text = "logit" Me.cmdLogit.UseVisualStyleBackColor = True @@ -3141,10 +3033,10 @@ Partial Class ucrCalculator 'cmdSign ' Me.cmdSign.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdSign.Location = New System.Drawing.Point(304, 152) - Me.cmdSign.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdSign.Location = New System.Drawing.Point(253, 127) + Me.cmdSign.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdSign.Name = "cmdSign" - Me.cmdSign.Size = New System.Drawing.Size(76, 45) + Me.cmdSign.Size = New System.Drawing.Size(63, 38) Me.cmdSign.TabIndex = 147 Me.cmdSign.Text = "sign" Me.cmdSign.UseVisualStyleBackColor = True @@ -3153,10 +3045,10 @@ Partial Class ucrCalculator ' Me.cmdRound.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdRound.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdRound.Location = New System.Drawing.Point(230, 152) - Me.cmdRound.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdRound.Location = New System.Drawing.Point(192, 127) + Me.cmdRound.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdRound.Name = "cmdRound" - Me.cmdRound.Size = New System.Drawing.Size(76, 45) + Me.cmdRound.Size = New System.Drawing.Size(63, 38) Me.cmdRound.TabIndex = 146 Me.cmdRound.Text = "round" Me.cmdRound.UseVisualStyleBackColor = True @@ -3165,10 +3057,10 @@ Partial Class ucrCalculator ' Me.cmdSiginf.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdSiginf.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdSiginf.Location = New System.Drawing.Point(154, 152) - Me.cmdSiginf.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdSiginf.Location = New System.Drawing.Point(128, 127) + Me.cmdSiginf.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdSiginf.Name = "cmdSiginf" - Me.cmdSiginf.Size = New System.Drawing.Size(76, 45) + Me.cmdSiginf.Size = New System.Drawing.Size(63, 38) Me.cmdSiginf.TabIndex = 145 Me.cmdSiginf.Text = "siginf" Me.cmdSiginf.UseVisualStyleBackColor = True @@ -3176,10 +3068,10 @@ Partial Class ucrCalculator 'cmdAbs ' Me.cmdAbs.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdAbs.Location = New System.Drawing.Point(78, 152) - Me.cmdAbs.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdAbs.Location = New System.Drawing.Point(65, 127) + Me.cmdAbs.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdAbs.Name = "cmdAbs" - Me.cmdAbs.Size = New System.Drawing.Size(76, 45) + Me.cmdAbs.Size = New System.Drawing.Size(63, 38) Me.cmdAbs.TabIndex = 144 Me.cmdAbs.Text = "abs" Me.cmdAbs.UseVisualStyleBackColor = True @@ -3187,10 +3079,10 @@ Partial Class ucrCalculator 'cmdExp ' Me.cmdExp.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdExp.Location = New System.Drawing.Point(3, 152) - Me.cmdExp.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdExp.Location = New System.Drawing.Point(2, 127) + Me.cmdExp.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdExp.Name = "cmdExp" - Me.cmdExp.Size = New System.Drawing.Size(76, 45) + Me.cmdExp.Size = New System.Drawing.Size(63, 38) Me.cmdExp.TabIndex = 143 Me.cmdExp.Text = "exp" Me.cmdExp.UseVisualStyleBackColor = True @@ -3198,10 +3090,10 @@ Partial Class ucrCalculator 'cmdDeg ' Me.cmdDeg.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdDeg.Location = New System.Drawing.Point(304, 108) - Me.cmdDeg.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdDeg.Location = New System.Drawing.Point(253, 90) + Me.cmdDeg.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdDeg.Name = "cmdDeg" - Me.cmdDeg.Size = New System.Drawing.Size(76, 45) + Me.cmdDeg.Size = New System.Drawing.Size(63, 38) Me.cmdDeg.TabIndex = 142 Me.cmdDeg.Text = "deg" Me.cmdDeg.UseVisualStyleBackColor = True @@ -3210,10 +3102,10 @@ Partial Class ucrCalculator ' Me.cmdTrunc.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdTrunc.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdTrunc.Location = New System.Drawing.Point(230, 108) - Me.cmdTrunc.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdTrunc.Location = New System.Drawing.Point(192, 90) + Me.cmdTrunc.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdTrunc.Name = "cmdTrunc" - Me.cmdTrunc.Size = New System.Drawing.Size(76, 45) + Me.cmdTrunc.Size = New System.Drawing.Size(63, 38) Me.cmdTrunc.TabIndex = 141 Me.cmdTrunc.Text = "trunc" Me.cmdTrunc.UseVisualStyleBackColor = True @@ -3221,10 +3113,10 @@ Partial Class ucrCalculator 'cmdAtan ' Me.cmdAtan.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdAtan.Location = New System.Drawing.Point(154, 108) - Me.cmdAtan.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdAtan.Location = New System.Drawing.Point(128, 90) + Me.cmdAtan.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdAtan.Name = "cmdAtan" - Me.cmdAtan.Size = New System.Drawing.Size(76, 45) + Me.cmdAtan.Size = New System.Drawing.Size(63, 38) Me.cmdAtan.TabIndex = 140 Me.cmdAtan.Text = "atan" Me.cmdAtan.UseVisualStyleBackColor = True @@ -3232,10 +3124,10 @@ Partial Class ucrCalculator 'cmdTan ' Me.cmdTan.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdTan.Location = New System.Drawing.Point(78, 108) - Me.cmdTan.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdTan.Location = New System.Drawing.Point(65, 90) + Me.cmdTan.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdTan.Name = "cmdTan" - Me.cmdTan.Size = New System.Drawing.Size(76, 45) + Me.cmdTan.Size = New System.Drawing.Size(63, 38) Me.cmdTan.TabIndex = 139 Me.cmdTan.Text = "tan" Me.cmdTan.UseVisualStyleBackColor = True @@ -3244,10 +3136,10 @@ Partial Class ucrCalculator ' Me.cmdLogTen.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdLogTen.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdLogTen.Location = New System.Drawing.Point(3, 108) - Me.cmdLogTen.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdLogTen.Location = New System.Drawing.Point(2, 90) + Me.cmdLogTen.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdLogTen.Name = "cmdLogTen" - Me.cmdLogTen.Size = New System.Drawing.Size(76, 45) + Me.cmdLogTen.Size = New System.Drawing.Size(63, 38) Me.cmdLogTen.TabIndex = 138 Me.cmdLogTen.Text = "log10" Me.cmdLogTen.UseVisualStyleBackColor = True @@ -3255,10 +3147,10 @@ Partial Class ucrCalculator 'cmdRad ' Me.cmdRad.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdRad.Location = New System.Drawing.Point(304, 64) - Me.cmdRad.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdRad.Location = New System.Drawing.Point(253, 53) + Me.cmdRad.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdRad.Name = "cmdRad" - Me.cmdRad.Size = New System.Drawing.Size(76, 45) + Me.cmdRad.Size = New System.Drawing.Size(63, 38) Me.cmdRad.TabIndex = 137 Me.cmdRad.Text = "rad" Me.cmdRad.UseVisualStyleBackColor = True @@ -3267,10 +3159,10 @@ Partial Class ucrCalculator ' Me.cmdFloor.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdFloor.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdFloor.Location = New System.Drawing.Point(230, 64) - Me.cmdFloor.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdFloor.Location = New System.Drawing.Point(192, 53) + Me.cmdFloor.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdFloor.Name = "cmdFloor" - Me.cmdFloor.Size = New System.Drawing.Size(76, 45) + Me.cmdFloor.Size = New System.Drawing.Size(63, 38) Me.cmdFloor.TabIndex = 136 Me.cmdFloor.Text = "floor" Me.cmdFloor.UseVisualStyleBackColor = True @@ -3278,10 +3170,10 @@ Partial Class ucrCalculator 'cmdAsin ' Me.cmdAsin.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdAsin.Location = New System.Drawing.Point(154, 64) - Me.cmdAsin.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdAsin.Location = New System.Drawing.Point(128, 53) + Me.cmdAsin.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdAsin.Name = "cmdAsin" - Me.cmdAsin.Size = New System.Drawing.Size(76, 45) + Me.cmdAsin.Size = New System.Drawing.Size(63, 38) Me.cmdAsin.TabIndex = 135 Me.cmdAsin.Text = "asin" Me.cmdAsin.UseVisualStyleBackColor = True @@ -3289,10 +3181,10 @@ Partial Class ucrCalculator 'cmdSin ' Me.cmdSin.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdSin.Location = New System.Drawing.Point(78, 64) - Me.cmdSin.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdSin.Location = New System.Drawing.Point(65, 53) + Me.cmdSin.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdSin.Name = "cmdSin" - Me.cmdSin.Size = New System.Drawing.Size(76, 45) + Me.cmdSin.Size = New System.Drawing.Size(63, 38) Me.cmdSin.TabIndex = 134 Me.cmdSin.Text = "sin" Me.cmdSin.UseVisualStyleBackColor = True @@ -3300,10 +3192,10 @@ Partial Class ucrCalculator 'cmdLog ' Me.cmdLog.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdLog.Location = New System.Drawing.Point(3, 64) - Me.cmdLog.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdLog.Location = New System.Drawing.Point(2, 53) + Me.cmdLog.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdLog.Name = "cmdLog" - Me.cmdLog.Size = New System.Drawing.Size(76, 45) + Me.cmdLog.Size = New System.Drawing.Size(63, 38) Me.cmdLog.TabIndex = 133 Me.cmdLog.Text = "log" Me.cmdLog.UseVisualStyleBackColor = True @@ -3311,10 +3203,10 @@ Partial Class ucrCalculator 'cmdPi ' Me.cmdPi.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdPi.Location = New System.Drawing.Point(304, 21) - Me.cmdPi.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdPi.Location = New System.Drawing.Point(253, 18) + Me.cmdPi.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdPi.Name = "cmdPi" - Me.cmdPi.Size = New System.Drawing.Size(76, 45) + Me.cmdPi.Size = New System.Drawing.Size(63, 38) Me.cmdPi.TabIndex = 132 Me.cmdPi.Text = "pi" Me.cmdPi.UseVisualStyleBackColor = True @@ -3323,10 +3215,10 @@ Partial Class ucrCalculator ' Me.cmdCeiling.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdCeiling.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdCeiling.Location = New System.Drawing.Point(230, 21) - Me.cmdCeiling.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdCeiling.Location = New System.Drawing.Point(192, 18) + Me.cmdCeiling.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdCeiling.Name = "cmdCeiling" - Me.cmdCeiling.Size = New System.Drawing.Size(76, 45) + Me.cmdCeiling.Size = New System.Drawing.Size(63, 38) Me.cmdCeiling.TabIndex = 131 Me.cmdCeiling.Text = "ceiling" Me.cmdCeiling.UseVisualStyleBackColor = True @@ -3334,10 +3226,10 @@ Partial Class ucrCalculator 'cmdAcos ' Me.cmdAcos.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdAcos.Location = New System.Drawing.Point(154, 21) - Me.cmdAcos.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdAcos.Location = New System.Drawing.Point(128, 18) + Me.cmdAcos.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdAcos.Name = "cmdAcos" - Me.cmdAcos.Size = New System.Drawing.Size(76, 45) + Me.cmdAcos.Size = New System.Drawing.Size(63, 38) Me.cmdAcos.TabIndex = 130 Me.cmdAcos.Text = "acos" Me.cmdAcos.UseVisualStyleBackColor = True @@ -3345,10 +3237,10 @@ Partial Class ucrCalculator 'cmdCos ' Me.cmdCos.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdCos.Location = New System.Drawing.Point(78, 21) - Me.cmdCos.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdCos.Location = New System.Drawing.Point(65, 18) + Me.cmdCos.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdCos.Name = "cmdCos" - Me.cmdCos.Size = New System.Drawing.Size(76, 45) + Me.cmdCos.Size = New System.Drawing.Size(63, 38) Me.cmdCos.TabIndex = 129 Me.cmdCos.Text = "cos" Me.cmdCos.UseVisualStyleBackColor = True @@ -3356,16 +3248,20 @@ Partial Class ucrCalculator 'cmdSqrt ' Me.cmdSqrt.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdSqrt.Location = New System.Drawing.Point(3, 21) - Me.cmdSqrt.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdSqrt.Location = New System.Drawing.Point(2, 18) + Me.cmdSqrt.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdSqrt.Name = "cmdSqrt" - Me.cmdSqrt.Size = New System.Drawing.Size(76, 45) + Me.cmdSqrt.Size = New System.Drawing.Size(63, 38) Me.cmdSqrt.TabIndex = 128 Me.cmdSqrt.Text = "sqrt" Me.cmdSqrt.UseVisualStyleBackColor = True ' 'grpSummary ' + Me.grpSummary.Controls.Add(Me.cmdwheremin) + Me.grpSummary.Controls.Add(Me.cmdwhichmax) + Me.grpSummary.Controls.Add(Me.cmdwheremax) + Me.grpSummary.Controls.Add(Me.cmdwhichmin) Me.grpSummary.Controls.Add(Me.cmdSummaryRHelp) Me.grpSummary.Controls.Add(Me.grpFrequencies) Me.grpSummary.Controls.Add(Me.cmdKurtosis) @@ -3396,69 +3292,102 @@ Partial Class ucrCalculator Me.grpSummary.Controls.Add(Me.cmdLength) Me.grpSummary.Controls.Add(Me.cmdSum) Me.grpSummary.Controls.Add(Me.cmdVar) - Me.grpSummary.Location = New System.Drawing.Point(651, 94) - Me.grpSummary.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.grpSummary.Location = New System.Drawing.Point(542, 78) + Me.grpSummary.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.grpSummary.Name = "grpSummary" - Me.grpSummary.Padding = New System.Windows.Forms.Padding(3, 4, 3, 4) - Me.grpSummary.Size = New System.Drawing.Size(432, 489) + Me.grpSummary.Padding = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.grpSummary.Size = New System.Drawing.Size(360, 421) Me.grpSummary.TabIndex = 185 Me.grpSummary.TabStop = False Me.grpSummary.Text = "Summary" ' - 'cmdSummaryRHelp - ' - Me.cmdSummaryRHelp.AutoSize = True - Me.cmdSummaryRHelp.ContextMenuStrip = Me.ContextMenuStripSummary - Me.cmdSummaryRHelp.Location = New System.Drawing.Point(291, 246) - Me.cmdSummaryRHelp.Margin = New System.Windows.Forms.Padding(4) - Me.cmdSummaryRHelp.Name = "cmdSummaryRHelp" - Me.cmdSummaryRHelp.Size = New System.Drawing.Size(136, 45) - Me.cmdSummaryRHelp.SplitMenuStrip = Me.ContextMenuStripSummary - Me.cmdSummaryRHelp.TabIndex = 185 - Me.cmdSummaryRHelp.Text = "R Help" - Me.cmdSummaryRHelp.UseVisualStyleBackColor = True + 'cmdwheremin + ' + Me.cmdwheremin.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) + Me.cmdwheremin.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.cmdwheremin.Location = New System.Drawing.Point(269, 199) + Me.cmdwheremin.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdwheremin.Name = "cmdwheremin" + Me.cmdwheremin.Size = New System.Drawing.Size(90, 38) + Me.cmdwheremin.TabIndex = 193 + Me.cmdwheremin.Text = "where.min" + Me.cmdwheremin.UseVisualStyleBackColor = True + ' + 'cmdwhichmax + ' + Me.cmdwhichmax.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.cmdwhichmax.Location = New System.Drawing.Point(2, 199) + Me.cmdwhichmax.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdwhichmax.Name = "cmdwhichmax" + Me.cmdwhichmax.Size = New System.Drawing.Size(90, 38) + Me.cmdwhichmax.TabIndex = 192 + Me.cmdwhichmax.Text = "which.max" + Me.cmdwhichmax.UseVisualStyleBackColor = True + ' + 'cmdwheremax + ' + Me.cmdwheremax.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.cmdwheremax.Location = New System.Drawing.Point(91, 199) + Me.cmdwheremax.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdwheremax.Name = "cmdwheremax" + Me.cmdwheremax.Size = New System.Drawing.Size(90, 38) + Me.cmdwheremax.TabIndex = 191 + Me.cmdwheremax.Text = "where.max" + Me.cmdwheremax.UseVisualStyleBackColor = True + ' + 'cmdwhichmin + ' + Me.cmdwhichmin.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) + Me.cmdwhichmin.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.cmdwhichmin.Location = New System.Drawing.Point(180, 199) + Me.cmdwhichmin.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdwhichmin.Name = "cmdwhichmin" + Me.cmdwhichmin.Size = New System.Drawing.Size(90, 38) + Me.cmdwhichmin.TabIndex = 190 + Me.cmdwhichmin.Text = "which.min" + Me.cmdwhichmin.UseVisualStyleBackColor = True ' 'ContextMenuStripSummary ' Me.ContextMenuStripSummary.ImageScalingSize = New System.Drawing.Size(24, 24) Me.ContextMenuStripSummary.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.BaseToolStripMenuItem1, Me.StatsToolStripMenuItem, Me.StatipToolStripMenuItem, Me.E1071ToolStripMenuItem, Me.RobustbaseToolStripMenuItem, Me.RasterToolStripMenuItem}) Me.ContextMenuStripSummary.Name = "ContextMenuStripSummary" - Me.ContextMenuStripSummary.Size = New System.Drawing.Size(178, 196) + Me.ContextMenuStripSummary.Size = New System.Drawing.Size(156, 148) ' 'BaseToolStripMenuItem1 ' Me.BaseToolStripMenuItem1.Name = "BaseToolStripMenuItem1" - Me.BaseToolStripMenuItem1.Size = New System.Drawing.Size(177, 32) + Me.BaseToolStripMenuItem1.Size = New System.Drawing.Size(155, 24) Me.BaseToolStripMenuItem1.Text = "Base" ' 'StatsToolStripMenuItem ' Me.StatsToolStripMenuItem.Name = "StatsToolStripMenuItem" - Me.StatsToolStripMenuItem.Size = New System.Drawing.Size(177, 32) + Me.StatsToolStripMenuItem.Size = New System.Drawing.Size(155, 24) Me.StatsToolStripMenuItem.Text = "Stats" ' 'StatipToolStripMenuItem ' Me.StatipToolStripMenuItem.Name = "StatipToolStripMenuItem" - Me.StatipToolStripMenuItem.Size = New System.Drawing.Size(177, 32) + Me.StatipToolStripMenuItem.Size = New System.Drawing.Size(155, 24) Me.StatipToolStripMenuItem.Text = "Statip" ' 'E1071ToolStripMenuItem ' Me.E1071ToolStripMenuItem.Name = "E1071ToolStripMenuItem" - Me.E1071ToolStripMenuItem.Size = New System.Drawing.Size(177, 32) + Me.E1071ToolStripMenuItem.Size = New System.Drawing.Size(155, 24) Me.E1071ToolStripMenuItem.Text = "e1071" ' 'RobustbaseToolStripMenuItem ' Me.RobustbaseToolStripMenuItem.Name = "RobustbaseToolStripMenuItem" - Me.RobustbaseToolStripMenuItem.Size = New System.Drawing.Size(177, 32) + Me.RobustbaseToolStripMenuItem.Size = New System.Drawing.Size(155, 24) Me.RobustbaseToolStripMenuItem.Text = "Robustbase" ' 'RasterToolStripMenuItem ' Me.RasterToolStripMenuItem.Name = "RasterToolStripMenuItem" - Me.RasterToolStripMenuItem.Size = New System.Drawing.Size(177, 32) + Me.RasterToolStripMenuItem.Size = New System.Drawing.Size(155, 24) Me.RasterToolStripMenuItem.Text = "Raster" ' 'grpFrequencies @@ -3478,11 +3407,9 @@ Partial Class ucrCalculator Me.grpFrequencies.Controls.Add(Me.cmdFreqMin) Me.grpFrequencies.Controls.Add(Me.cmdFreqSum) Me.grpFrequencies.Controls.Add(Me.cmdFreqLength) - Me.grpFrequencies.Location = New System.Drawing.Point(3, 312) - Me.grpFrequencies.Margin = New System.Windows.Forms.Padding(4) + Me.grpFrequencies.Location = New System.Drawing.Point(2, 283) Me.grpFrequencies.Name = "grpFrequencies" - Me.grpFrequencies.Padding = New System.Windows.Forms.Padding(4) - Me.grpFrequencies.Size = New System.Drawing.Size(424, 160) + Me.grpFrequencies.Size = New System.Drawing.Size(353, 133) Me.grpFrequencies.TabIndex = 184 Me.grpFrequencies.TabStop = False Me.grpFrequencies.Text = "Frequencies" @@ -3491,10 +3418,10 @@ Partial Class ucrCalculator ' Me.cmdFreqQuantile.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdFreqQuantile.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdFreqQuantile.Location = New System.Drawing.Point(338, 108) - Me.cmdFreqQuantile.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdFreqQuantile.Location = New System.Drawing.Point(282, 90) + Me.cmdFreqQuantile.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdFreqQuantile.Name = "cmdFreqQuantile" - Me.cmdFreqQuantile.Size = New System.Drawing.Size(86, 45) + Me.cmdFreqQuantile.Size = New System.Drawing.Size(72, 38) Me.cmdFreqQuantile.TabIndex = 186 Me.cmdFreqQuantile.Text = "quantile" Me.cmdFreqQuantile.UseVisualStyleBackColor = True @@ -3503,10 +3430,10 @@ Partial Class ucrCalculator ' Me.cmdFreqPropn.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdFreqPropn.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdFreqPropn.Location = New System.Drawing.Point(254, 108) - Me.cmdFreqPropn.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdFreqPropn.Location = New System.Drawing.Point(212, 90) + Me.cmdFreqPropn.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdFreqPropn.Name = "cmdFreqPropn" - Me.cmdFreqPropn.Size = New System.Drawing.Size(86, 45) + Me.cmdFreqPropn.Size = New System.Drawing.Size(72, 38) Me.cmdFreqPropn.TabIndex = 185 Me.cmdFreqPropn.Text = "propn" Me.cmdFreqPropn.UseVisualStyleBackColor = True @@ -3515,10 +3442,10 @@ Partial Class ucrCalculator ' Me.cmdFreqDistinct.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdFreqDistinct.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdFreqDistinct.Location = New System.Drawing.Point(170, 108) - Me.cmdFreqDistinct.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdFreqDistinct.Location = New System.Drawing.Point(142, 90) + Me.cmdFreqDistinct.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdFreqDistinct.Name = "cmdFreqDistinct" - Me.cmdFreqDistinct.Size = New System.Drawing.Size(86, 45) + Me.cmdFreqDistinct.Size = New System.Drawing.Size(72, 38) Me.cmdFreqDistinct.TabIndex = 184 Me.cmdFreqDistinct.Text = "distinct" Me.cmdFreqDistinct.UseVisualStyleBackColor = True @@ -3527,10 +3454,10 @@ Partial Class ucrCalculator ' Me.cmdFreqIQR.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdFreqIQR.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdFreqIQR.Location = New System.Drawing.Point(84, 108) - Me.cmdFreqIQR.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdFreqIQR.Location = New System.Drawing.Point(70, 90) + Me.cmdFreqIQR.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdFreqIQR.Name = "cmdFreqIQR" - Me.cmdFreqIQR.Size = New System.Drawing.Size(87, 45) + Me.cmdFreqIQR.Size = New System.Drawing.Size(72, 38) Me.cmdFreqIQR.TabIndex = 183 Me.cmdFreqIQR.Text = "IQR" Me.cmdFreqIQR.UseVisualStyleBackColor = True @@ -3539,10 +3466,10 @@ Partial Class ucrCalculator ' Me.cmdFreqMedian.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdFreqMedian.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdFreqMedian.Location = New System.Drawing.Point(170, 64) - Me.cmdFreqMedian.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdFreqMedian.Location = New System.Drawing.Point(142, 53) + Me.cmdFreqMedian.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdFreqMedian.Name = "cmdFreqMedian" - Me.cmdFreqMedian.Size = New System.Drawing.Size(86, 45) + Me.cmdFreqMedian.Size = New System.Drawing.Size(72, 38) Me.cmdFreqMedian.TabIndex = 182 Me.cmdFreqMedian.Text = "median" Me.cmdFreqMedian.UseVisualStyleBackColor = True @@ -3551,10 +3478,10 @@ Partial Class ucrCalculator ' Me.cmdFreqSd.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdFreqSd.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdFreqSd.Location = New System.Drawing.Point(338, 64) - Me.cmdFreqSd.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdFreqSd.Location = New System.Drawing.Point(282, 53) + Me.cmdFreqSd.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdFreqSd.Name = "cmdFreqSd" - Me.cmdFreqSd.Size = New System.Drawing.Size(86, 45) + Me.cmdFreqSd.Size = New System.Drawing.Size(72, 38) Me.cmdFreqSd.TabIndex = 181 Me.cmdFreqSd.Text = "sd" Me.cmdFreqSd.UseVisualStyleBackColor = True @@ -3563,10 +3490,10 @@ Partial Class ucrCalculator ' Me.cmdFreqVar.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdFreqVar.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdFreqVar.Location = New System.Drawing.Point(254, 64) - Me.cmdFreqVar.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdFreqVar.Location = New System.Drawing.Point(212, 53) + Me.cmdFreqVar.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdFreqVar.Name = "cmdFreqVar" - Me.cmdFreqVar.Size = New System.Drawing.Size(86, 45) + Me.cmdFreqVar.Size = New System.Drawing.Size(72, 38) Me.cmdFreqVar.TabIndex = 180 Me.cmdFreqVar.Text = "var" Me.cmdFreqVar.UseVisualStyleBackColor = True @@ -3575,10 +3502,10 @@ Partial Class ucrCalculator ' Me.cmdFreqMean.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdFreqMean.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdFreqMean.Location = New System.Drawing.Point(84, 64) - Me.cmdFreqMean.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdFreqMean.Location = New System.Drawing.Point(70, 53) + Me.cmdFreqMean.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdFreqMean.Name = "cmdFreqMean" - Me.cmdFreqMean.Size = New System.Drawing.Size(87, 45) + Me.cmdFreqMean.Size = New System.Drawing.Size(72, 38) Me.cmdFreqMean.TabIndex = 179 Me.cmdFreqMean.Text = "mean" Me.cmdFreqMean.UseVisualStyleBackColor = True @@ -3587,10 +3514,10 @@ Partial Class ucrCalculator ' Me.cmdFreqMad.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdFreqMad.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdFreqMad.Location = New System.Drawing.Point(0, 108) - Me.cmdFreqMad.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdFreqMad.Location = New System.Drawing.Point(0, 90) + Me.cmdFreqMad.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdFreqMad.Name = "cmdFreqMad" - Me.cmdFreqMad.Size = New System.Drawing.Size(86, 45) + Me.cmdFreqMad.Size = New System.Drawing.Size(72, 38) Me.cmdFreqMad.TabIndex = 178 Me.cmdFreqMad.Text = "mad" Me.cmdFreqMad.UseVisualStyleBackColor = True @@ -3599,10 +3526,10 @@ Partial Class ucrCalculator ' Me.cmdFreqMiss.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdFreqMiss.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdFreqMiss.Location = New System.Drawing.Point(0, 64) - Me.cmdFreqMiss.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdFreqMiss.Location = New System.Drawing.Point(0, 53) + Me.cmdFreqMiss.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdFreqMiss.Name = "cmdFreqMiss" - Me.cmdFreqMiss.Size = New System.Drawing.Size(86, 45) + Me.cmdFreqMiss.Size = New System.Drawing.Size(72, 38) Me.cmdFreqMiss.TabIndex = 177 Me.cmdFreqMiss.Text = "miss" Me.cmdFreqMiss.UseVisualStyleBackColor = True @@ -3611,10 +3538,10 @@ Partial Class ucrCalculator ' Me.cmdFreqMode1.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdFreqMode1.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdFreqMode1.Location = New System.Drawing.Point(338, 21) - Me.cmdFreqMode1.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdFreqMode1.Location = New System.Drawing.Point(282, 18) + Me.cmdFreqMode1.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdFreqMode1.Name = "cmdFreqMode1" - Me.cmdFreqMode1.Size = New System.Drawing.Size(86, 45) + Me.cmdFreqMode1.Size = New System.Drawing.Size(72, 38) Me.cmdFreqMode1.TabIndex = 176 Me.cmdFreqMode1.Text = "mode1" Me.cmdFreqMode1.UseVisualStyleBackColor = True @@ -3623,10 +3550,10 @@ Partial Class ucrCalculator ' Me.cmdFreqMax.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdFreqMax.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdFreqMax.Location = New System.Drawing.Point(254, 21) - Me.cmdFreqMax.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdFreqMax.Location = New System.Drawing.Point(212, 18) + Me.cmdFreqMax.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdFreqMax.Name = "cmdFreqMax" - Me.cmdFreqMax.Size = New System.Drawing.Size(86, 45) + Me.cmdFreqMax.Size = New System.Drawing.Size(72, 38) Me.cmdFreqMax.TabIndex = 175 Me.cmdFreqMax.Text = "max" Me.cmdFreqMax.UseVisualStyleBackColor = True @@ -3635,10 +3562,10 @@ Partial Class ucrCalculator ' Me.cmdFreqMin.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdFreqMin.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdFreqMin.Location = New System.Drawing.Point(170, 21) - Me.cmdFreqMin.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdFreqMin.Location = New System.Drawing.Point(142, 18) + Me.cmdFreqMin.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdFreqMin.Name = "cmdFreqMin" - Me.cmdFreqMin.Size = New System.Drawing.Size(86, 45) + Me.cmdFreqMin.Size = New System.Drawing.Size(72, 38) Me.cmdFreqMin.TabIndex = 174 Me.cmdFreqMin.Text = "min" Me.cmdFreqMin.UseVisualStyleBackColor = True @@ -3647,10 +3574,10 @@ Partial Class ucrCalculator ' Me.cmdFreqSum.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdFreqSum.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdFreqSum.Location = New System.Drawing.Point(84, 21) - Me.cmdFreqSum.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdFreqSum.Location = New System.Drawing.Point(70, 18) + Me.cmdFreqSum.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdFreqSum.Name = "cmdFreqSum" - Me.cmdFreqSum.Size = New System.Drawing.Size(87, 45) + Me.cmdFreqSum.Size = New System.Drawing.Size(72, 38) Me.cmdFreqSum.TabIndex = 173 Me.cmdFreqSum.Text = "sum" Me.cmdFreqSum.UseVisualStyleBackColor = True @@ -3659,10 +3586,10 @@ Partial Class ucrCalculator ' Me.cmdFreqLength.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdFreqLength.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdFreqLength.Location = New System.Drawing.Point(0, 21) - Me.cmdFreqLength.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdFreqLength.Location = New System.Drawing.Point(0, 18) + Me.cmdFreqLength.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdFreqLength.Name = "cmdFreqLength" - Me.cmdFreqLength.Size = New System.Drawing.Size(86, 45) + Me.cmdFreqLength.Size = New System.Drawing.Size(72, 38) Me.cmdFreqLength.TabIndex = 172 Me.cmdFreqLength.Text = "length" Me.cmdFreqLength.UseVisualStyleBackColor = True @@ -3671,10 +3598,10 @@ Partial Class ucrCalculator ' Me.cmdKurtosis.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdKurtosis.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdKurtosis.Location = New System.Drawing.Point(344, 150) - Me.cmdKurtosis.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdKurtosis.Location = New System.Drawing.Point(287, 125) + Me.cmdKurtosis.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdKurtosis.Name = "cmdKurtosis" - Me.cmdKurtosis.Size = New System.Drawing.Size(84, 45) + Me.cmdKurtosis.Size = New System.Drawing.Size(70, 38) Me.cmdKurtosis.TabIndex = 182 Me.cmdKurtosis.Text = "kurtosis" Me.cmdKurtosis.UseVisualStyleBackColor = True @@ -3682,10 +3609,10 @@ Partial Class ucrCalculator 'cmdMode1 ' Me.cmdMode1.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdMode1.Location = New System.Drawing.Point(344, 63) - Me.cmdMode1.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdMode1.Location = New System.Drawing.Point(287, 52) + Me.cmdMode1.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdMode1.Name = "cmdMode1" - Me.cmdMode1.Size = New System.Drawing.Size(84, 45) + Me.cmdMode1.Size = New System.Drawing.Size(70, 38) Me.cmdMode1.TabIndex = 180 Me.cmdMode1.Text = "mode1" Me.cmdMode1.UseVisualStyleBackColor = True @@ -3693,10 +3620,10 @@ Partial Class ucrCalculator 'cmdMode ' Me.cmdMode.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdMode.Location = New System.Drawing.Point(261, 63) - Me.cmdMode.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdMode.Location = New System.Drawing.Point(218, 52) + Me.cmdMode.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdMode.Name = "cmdMode" - Me.cmdMode.Size = New System.Drawing.Size(84, 45) + Me.cmdMode.Size = New System.Drawing.Size(70, 38) Me.cmdMode.TabIndex = 179 Me.cmdMode.Text = "mode" Me.cmdMode.UseVisualStyleBackColor = True @@ -3704,10 +3631,10 @@ Partial Class ucrCalculator 'cmdFirst ' Me.cmdFirst.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdFirst.Location = New System.Drawing.Point(178, 194) - Me.cmdFirst.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdFirst.Location = New System.Drawing.Point(148, 162) + Me.cmdFirst.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdFirst.Name = "cmdFirst" - Me.cmdFirst.Size = New System.Drawing.Size(84, 45) + Me.cmdFirst.Size = New System.Drawing.Size(70, 38) Me.cmdFirst.TabIndex = 178 Me.cmdFirst.Text = "first" Me.cmdFirst.UseVisualStyleBackColor = True @@ -3715,10 +3642,10 @@ Partial Class ucrCalculator 'cmdLast ' Me.cmdLast.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdLast.Location = New System.Drawing.Point(261, 194) - Me.cmdLast.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdLast.Location = New System.Drawing.Point(218, 162) + Me.cmdLast.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdLast.Name = "cmdLast" - Me.cmdLast.Size = New System.Drawing.Size(84, 45) + Me.cmdLast.Size = New System.Drawing.Size(70, 38) Me.cmdLast.TabIndex = 177 Me.cmdLast.Text = "last" Me.cmdLast.UseVisualStyleBackColor = True @@ -3726,10 +3653,10 @@ Partial Class ucrCalculator 'cmdnth ' Me.cmdnth.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdnth.Location = New System.Drawing.Point(344, 194) - Me.cmdnth.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdnth.Location = New System.Drawing.Point(287, 162) + Me.cmdnth.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdnth.Name = "cmdnth" - Me.cmdnth.Size = New System.Drawing.Size(84, 45) + Me.cmdnth.Size = New System.Drawing.Size(70, 38) Me.cmdnth.TabIndex = 176 Me.cmdnth.Text = "nth" Me.cmdnth.UseVisualStyleBackColor = True @@ -3737,10 +3664,10 @@ Partial Class ucrCalculator 'cmdCor ' Me.cmdCor.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdCor.Location = New System.Drawing.Point(3, 237) - Me.cmdCor.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdCor.Location = New System.Drawing.Point(2, 235) + Me.cmdCor.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdCor.Name = "cmdCor" - Me.cmdCor.Size = New System.Drawing.Size(94, 45) + Me.cmdCor.Size = New System.Drawing.Size(78, 38) Me.cmdCor.TabIndex = 175 Me.cmdCor.Text = "cor" Me.cmdCor.UseVisualStyleBackColor = True @@ -3748,10 +3675,10 @@ Partial Class ucrCalculator 'cmdCov ' Me.cmdCov.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdCov.Location = New System.Drawing.Point(96, 237) - Me.cmdCov.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdCov.Location = New System.Drawing.Point(79, 235) + Me.cmdCov.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdCov.Name = "cmdCov" - Me.cmdCov.Size = New System.Drawing.Size(84, 45) + Me.cmdCov.Size = New System.Drawing.Size(70, 38) Me.cmdCov.TabIndex = 174 Me.cmdCov.Text = "cov" Me.cmdCov.UseVisualStyleBackColor = True @@ -3760,10 +3687,10 @@ Partial Class ucrCalculator ' Me.cmdMad.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdMad.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdMad.Location = New System.Drawing.Point(261, 106) - Me.cmdMad.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdMad.Location = New System.Drawing.Point(218, 88) + Me.cmdMad.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdMad.Name = "cmdMad" - Me.cmdMad.Size = New System.Drawing.Size(84, 45) + Me.cmdMad.Size = New System.Drawing.Size(70, 38) Me.cmdMad.TabIndex = 173 Me.cmdMad.Text = "mad" Me.cmdMad.UseVisualStyleBackColor = True @@ -3772,10 +3699,10 @@ Partial Class ucrCalculator ' Me.cmdMc.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdMc.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdMc.Location = New System.Drawing.Point(178, 150) - Me.cmdMc.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdMc.Location = New System.Drawing.Point(148, 125) + Me.cmdMc.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdMc.Name = "cmdMc" - Me.cmdMc.Size = New System.Drawing.Size(84, 45) + Me.cmdMc.Size = New System.Drawing.Size(70, 38) Me.cmdMc.TabIndex = 172 Me.cmdMc.Text = "mc" Me.cmdMc.UseVisualStyleBackColor = True @@ -3784,10 +3711,10 @@ Partial Class ucrCalculator ' Me.cmdPropn.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdPropn.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdPropn.Location = New System.Drawing.Point(96, 194) - Me.cmdPropn.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdPropn.Location = New System.Drawing.Point(80, 162) + Me.cmdPropn.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdPropn.Name = "cmdPropn" - Me.cmdPropn.Size = New System.Drawing.Size(84, 45) + Me.cmdPropn.Size = New System.Drawing.Size(70, 38) Me.cmdPropn.TabIndex = 171 Me.cmdPropn.Text = "propn" Me.cmdPropn.UseVisualStyleBackColor = True @@ -3796,10 +3723,10 @@ Partial Class ucrCalculator ' Me.cmdCv.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdCv.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdCv.Location = New System.Drawing.Point(96, 150) - Me.cmdCv.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdCv.Location = New System.Drawing.Point(80, 125) + Me.cmdCv.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdCv.Name = "cmdCv" - Me.cmdCv.Size = New System.Drawing.Size(84, 45) + Me.cmdCv.Size = New System.Drawing.Size(70, 38) Me.cmdCv.TabIndex = 170 Me.cmdCv.Text = "cv" Me.cmdCv.UseVisualStyleBackColor = True @@ -3808,10 +3735,10 @@ Partial Class ucrCalculator ' Me.cmdSkew.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdSkew.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdSkew.Location = New System.Drawing.Point(261, 150) - Me.cmdSkew.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdSkew.Location = New System.Drawing.Point(218, 125) + Me.cmdSkew.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdSkew.Name = "cmdSkew" - Me.cmdSkew.Size = New System.Drawing.Size(84, 45) + Me.cmdSkew.Size = New System.Drawing.Size(70, 38) Me.cmdSkew.TabIndex = 169 Me.cmdSkew.Text = "skew" Me.cmdSkew.UseVisualStyleBackColor = True @@ -3820,10 +3747,10 @@ Partial Class ucrCalculator ' Me.cmdAnyDup.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdAnyDup.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdAnyDup.Location = New System.Drawing.Point(3, 194) - Me.cmdAnyDup.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdAnyDup.Location = New System.Drawing.Point(2, 162) + Me.cmdAnyDup.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdAnyDup.Name = "cmdAnyDup" - Me.cmdAnyDup.Size = New System.Drawing.Size(94, 45) + Me.cmdAnyDup.Size = New System.Drawing.Size(78, 38) Me.cmdAnyDup.TabIndex = 168 Me.cmdAnyDup.Text = "anyDup" Me.cmdAnyDup.UseVisualStyleBackColor = True @@ -3831,10 +3758,10 @@ Partial Class ucrCalculator 'cmdDistinct ' Me.cmdDistinct.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdDistinct.Location = New System.Drawing.Point(3, 150) - Me.cmdDistinct.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdDistinct.Location = New System.Drawing.Point(2, 125) + Me.cmdDistinct.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdDistinct.Name = "cmdDistinct" - Me.cmdDistinct.Size = New System.Drawing.Size(94, 45) + Me.cmdDistinct.Size = New System.Drawing.Size(78, 38) Me.cmdDistinct.TabIndex = 167 Me.cmdDistinct.Text = "distinct" Me.cmdDistinct.UseVisualStyleBackColor = True @@ -3842,10 +3769,10 @@ Partial Class ucrCalculator 'cmdNonMiss ' Me.cmdNonMiss.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdNonMiss.Location = New System.Drawing.Point(3, 106) - Me.cmdNonMiss.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdNonMiss.Location = New System.Drawing.Point(2, 88) + Me.cmdNonMiss.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdNonMiss.Name = "cmdNonMiss" - Me.cmdNonMiss.Size = New System.Drawing.Size(94, 45) + Me.cmdNonMiss.Size = New System.Drawing.Size(78, 38) Me.cmdNonMiss.TabIndex = 166 Me.cmdNonMiss.Text = "non miss" Me.cmdNonMiss.UseVisualStyleBackColor = True @@ -3854,10 +3781,10 @@ Partial Class ucrCalculator ' Me.cmdIQR.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdIQR.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdIQR.Location = New System.Drawing.Point(344, 106) - Me.cmdIQR.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdIQR.Location = New System.Drawing.Point(287, 88) + Me.cmdIQR.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdIQR.Name = "cmdIQR" - Me.cmdIQR.Size = New System.Drawing.Size(84, 45) + Me.cmdIQR.Size = New System.Drawing.Size(70, 38) Me.cmdIQR.TabIndex = 165 Me.cmdIQR.Text = "IQR" Me.cmdIQR.UseVisualStyleBackColor = True @@ -3866,10 +3793,10 @@ Partial Class ucrCalculator ' Me.cmdQuantile.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdQuantile.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdQuantile.Location = New System.Drawing.Point(178, 237) - Me.cmdQuantile.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdQuantile.Location = New System.Drawing.Point(148, 235) + Me.cmdQuantile.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdQuantile.Name = "cmdQuantile" - Me.cmdQuantile.Size = New System.Drawing.Size(84, 45) + Me.cmdQuantile.Size = New System.Drawing.Size(70, 38) Me.cmdQuantile.TabIndex = 164 Me.cmdQuantile.Text = "quantile" Me.cmdQuantile.UseVisualStyleBackColor = True @@ -3878,10 +3805,10 @@ Partial Class ucrCalculator ' Me.cmdRange.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdRange.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdRange.Location = New System.Drawing.Point(344, 20) - Me.cmdRange.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdRange.Location = New System.Drawing.Point(287, 17) + Me.cmdRange.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdRange.Name = "cmdRange" - Me.cmdRange.Size = New System.Drawing.Size(84, 45) + Me.cmdRange.Size = New System.Drawing.Size(70, 38) Me.cmdRange.TabIndex = 163 Me.cmdRange.Text = "range" Me.cmdRange.UseVisualStyleBackColor = True @@ -3889,10 +3816,10 @@ Partial Class ucrCalculator 'cmdSd ' Me.cmdSd.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdSd.Location = New System.Drawing.Point(178, 106) - Me.cmdSd.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdSd.Location = New System.Drawing.Point(148, 88) + Me.cmdSd.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdSd.Name = "cmdSd" - Me.cmdSd.Size = New System.Drawing.Size(84, 45) + Me.cmdSd.Size = New System.Drawing.Size(70, 38) Me.cmdSd.TabIndex = 160 Me.cmdSd.Text = "sd" Me.cmdSd.UseVisualStyleBackColor = True @@ -3901,10 +3828,10 @@ Partial Class ucrCalculator ' Me.cmdMedian.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdMedian.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdMedian.Location = New System.Drawing.Point(178, 63) - Me.cmdMedian.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdMedian.Location = New System.Drawing.Point(148, 52) + Me.cmdMedian.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdMedian.Name = "cmdMedian" - Me.cmdMedian.Size = New System.Drawing.Size(84, 45) + Me.cmdMedian.Size = New System.Drawing.Size(70, 38) Me.cmdMedian.TabIndex = 158 Me.cmdMedian.Text = "median" Me.cmdMedian.UseVisualStyleBackColor = True @@ -3912,10 +3839,10 @@ Partial Class ucrCalculator 'cmdMin ' Me.cmdMin.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdMin.Location = New System.Drawing.Point(178, 20) - Me.cmdMin.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdMin.Location = New System.Drawing.Point(148, 17) + Me.cmdMin.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdMin.Name = "cmdMin" - Me.cmdMin.Size = New System.Drawing.Size(84, 45) + Me.cmdMin.Size = New System.Drawing.Size(70, 38) Me.cmdMin.TabIndex = 155 Me.cmdMin.Text = "min" Me.cmdMin.UseVisualStyleBackColor = True @@ -3923,10 +3850,10 @@ Partial Class ucrCalculator 'cmdMax ' Me.cmdMax.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdMax.Location = New System.Drawing.Point(261, 20) - Me.cmdMax.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdMax.Location = New System.Drawing.Point(218, 17) + Me.cmdMax.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdMax.Name = "cmdMax" - Me.cmdMax.Size = New System.Drawing.Size(84, 45) + Me.cmdMax.Size = New System.Drawing.Size(70, 38) Me.cmdMax.TabIndex = 154 Me.cmdMax.Text = "max" Me.cmdMax.UseVisualStyleBackColor = True @@ -3935,10 +3862,10 @@ Partial Class ucrCalculator ' Me.cmdMean.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdMean.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdMean.Location = New System.Drawing.Point(96, 63) - Me.cmdMean.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdMean.Location = New System.Drawing.Point(80, 52) + Me.cmdMean.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdMean.Name = "cmdMean" - Me.cmdMean.Size = New System.Drawing.Size(84, 45) + Me.cmdMean.Size = New System.Drawing.Size(70, 38) Me.cmdMean.TabIndex = 153 Me.cmdMean.Text = "mean" Me.cmdMean.UseVisualStyleBackColor = True @@ -3946,10 +3873,10 @@ Partial Class ucrCalculator 'cmdMiss ' Me.cmdMiss.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdMiss.Location = New System.Drawing.Point(3, 63) - Me.cmdMiss.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdMiss.Location = New System.Drawing.Point(2, 52) + Me.cmdMiss.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdMiss.Name = "cmdMiss" - Me.cmdMiss.Size = New System.Drawing.Size(94, 45) + Me.cmdMiss.Size = New System.Drawing.Size(78, 38) Me.cmdMiss.TabIndex = 149 Me.cmdMiss.Text = "miss" Me.cmdMiss.UseVisualStyleBackColor = True @@ -3958,10 +3885,10 @@ Partial Class ucrCalculator ' Me.cmdLength.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdLength.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdLength.Location = New System.Drawing.Point(3, 20) - Me.cmdLength.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdLength.Location = New System.Drawing.Point(2, 17) + Me.cmdLength.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdLength.Name = "cmdLength" - Me.cmdLength.Size = New System.Drawing.Size(94, 45) + Me.cmdLength.Size = New System.Drawing.Size(78, 38) Me.cmdLength.TabIndex = 148 Me.cmdLength.Text = "length" Me.cmdLength.UseVisualStyleBackColor = True @@ -3969,10 +3896,10 @@ Partial Class ucrCalculator 'cmdSum ' Me.cmdSum.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdSum.Location = New System.Drawing.Point(96, 20) - Me.cmdSum.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdSum.Location = New System.Drawing.Point(80, 17) + Me.cmdSum.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdSum.Name = "cmdSum" - Me.cmdSum.Size = New System.Drawing.Size(84, 45) + Me.cmdSum.Size = New System.Drawing.Size(70, 38) Me.cmdSum.TabIndex = 150 Me.cmdSum.Text = "sum" Me.cmdSum.UseVisualStyleBackColor = True @@ -3980,10 +3907,10 @@ Partial Class ucrCalculator 'cmdVar ' Me.cmdVar.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdVar.Location = New System.Drawing.Point(96, 106) - Me.cmdVar.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdVar.Location = New System.Drawing.Point(80, 88) + Me.cmdVar.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdVar.Name = "cmdVar" - Me.cmdVar.Size = New System.Drawing.Size(84, 45) + Me.cmdVar.Size = New System.Drawing.Size(70, 38) Me.cmdVar.TabIndex = 159 Me.cmdVar.Text = "var" Me.cmdVar.UseVisualStyleBackColor = True @@ -4023,11 +3950,9 @@ Partial Class ucrCalculator Me.grpProbabilty.Controls.Add(Me.cmdTrigamma) Me.grpProbabilty.Controls.Add(Me.cmdBeta) Me.grpProbabilty.Controls.Add(Me.cmdDigamma) - Me.grpProbabilty.Location = New System.Drawing.Point(651, 93) - Me.grpProbabilty.Margin = New System.Windows.Forms.Padding(4) + Me.grpProbabilty.Location = New System.Drawing.Point(542, 78) Me.grpProbabilty.Name = "grpProbabilty" - Me.grpProbabilty.Padding = New System.Windows.Forms.Padding(4) - Me.grpProbabilty.Size = New System.Drawing.Size(474, 482) + Me.grpProbabilty.Size = New System.Drawing.Size(395, 402) Me.grpProbabilty.TabIndex = 187 Me.grpProbabilty.TabStop = False Me.grpProbabilty.Text = "Probability" @@ -4036,44 +3961,31 @@ Partial Class ucrCalculator ' Me.cmdPascal.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdPascal.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdPascal.Location = New System.Drawing.Point(3, 284) - Me.cmdPascal.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdPascal.Location = New System.Drawing.Point(2, 237) + Me.cmdPascal.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdPascal.Name = "cmdPascal" - Me.cmdPascal.Size = New System.Drawing.Size(93, 45) + Me.cmdPascal.Size = New System.Drawing.Size(78, 38) Me.cmdPascal.TabIndex = 213 Me.cmdPascal.Text = "pascal" Me.cmdPascal.UseVisualStyleBackColor = True ' - 'cmdProbRHelp - ' - Me.cmdProbRHelp.AutoSize = True - Me.cmdProbRHelp.ContextMenuStrip = Me.ContextMenuStripProbability - Me.cmdProbRHelp.Location = New System.Drawing.Point(360, 285) - Me.cmdProbRHelp.Margin = New System.Windows.Forms.Padding(4) - Me.cmdProbRHelp.Name = "cmdProbRHelp" - Me.cmdProbRHelp.Size = New System.Drawing.Size(129, 45) - Me.cmdProbRHelp.SplitMenuStrip = Me.ContextMenuStripProbability - Me.cmdProbRHelp.TabIndex = 212 - Me.cmdProbRHelp.Text = "R Help" - Me.cmdProbRHelp.UseVisualStyleBackColor = True - ' 'ContextMenuStripProbability ' Me.ContextMenuStripProbability.ImageScalingSize = New System.Drawing.Size(24, 24) Me.ContextMenuStripProbability.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ProbStatsToolStripMenuItem, Me.ProbBaseToolStripMenuItem}) Me.ContextMenuStripProbability.Name = "ContextMenuStrip1" - Me.ContextMenuStripProbability.Size = New System.Drawing.Size(122, 68) + Me.ContextMenuStripProbability.Size = New System.Drawing.Size(110, 52) ' 'ProbStatsToolStripMenuItem ' Me.ProbStatsToolStripMenuItem.Name = "ProbStatsToolStripMenuItem" - Me.ProbStatsToolStripMenuItem.Size = New System.Drawing.Size(121, 32) + Me.ProbStatsToolStripMenuItem.Size = New System.Drawing.Size(109, 24) Me.ProbStatsToolStripMenuItem.Text = "stats" ' 'ProbBaseToolStripMenuItem ' Me.ProbBaseToolStripMenuItem.Name = "ProbBaseToolStripMenuItem" - Me.ProbBaseToolStripMenuItem.Size = New System.Drawing.Size(121, 32) + Me.ProbBaseToolStripMenuItem.Size = New System.Drawing.Size(109, 24) Me.ProbBaseToolStripMenuItem.Text = "base" ' 'grpRandom @@ -4088,11 +4000,9 @@ Partial Class ucrCalculator Me.grpRandom.Controls.Add(Me.cmduni_integer) Me.grpRandom.Controls.Add(Me.cmdRan_normal) Me.grpRandom.Controls.Add(Me.cmduniform) - Me.grpRandom.Location = New System.Drawing.Point(9, 342) - Me.grpRandom.Margin = New System.Windows.Forms.Padding(4) + Me.grpRandom.Location = New System.Drawing.Point(8, 285) Me.grpRandom.Name = "grpRandom" - Me.grpRandom.Padding = New System.Windows.Forms.Padding(4) - Me.grpRandom.Size = New System.Drawing.Size(459, 126) + Me.grpRandom.Size = New System.Drawing.Size(382, 105) Me.grpRandom.TabIndex = 199 Me.grpRandom.TabStop = False Me.grpRandom.Text = "Random" @@ -4101,10 +4011,10 @@ Partial Class ucrCalculator ' Me.cmdnbinomial.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdnbinomial.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdnbinomial.Location = New System.Drawing.Point(174, 64) - Me.cmdnbinomial.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdnbinomial.Location = New System.Drawing.Point(145, 53) + Me.cmdnbinomial.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdnbinomial.Name = "cmdnbinomial" - Me.cmdnbinomial.Size = New System.Drawing.Size(108, 45) + Me.cmdnbinomial.Size = New System.Drawing.Size(90, 38) Me.cmdnbinomial.TabIndex = 182 Me.cmdnbinomial.Text = "nbinomial" Me.cmdnbinomial.UseVisualStyleBackColor = True @@ -4113,10 +4023,10 @@ Partial Class ucrCalculator ' Me.cmdRan_sample.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdRan_sample.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdRan_sample.Location = New System.Drawing.Point(364, 64) - Me.cmdRan_sample.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdRan_sample.Location = New System.Drawing.Point(303, 53) + Me.cmdRan_sample.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdRan_sample.Name = "cmdRan_sample" - Me.cmdRan_sample.Size = New System.Drawing.Size(86, 45) + Me.cmdRan_sample.Size = New System.Drawing.Size(72, 38) Me.cmdRan_sample.TabIndex = 181 Me.cmdRan_sample.Text = "sample" Me.cmdRan_sample.UseVisualStyleBackColor = True @@ -4125,10 +4035,10 @@ Partial Class ucrCalculator ' Me.cmdRan_beta.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdRan_beta.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdRan_beta.Location = New System.Drawing.Point(280, 64) - Me.cmdRan_beta.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdRan_beta.Location = New System.Drawing.Point(233, 53) + Me.cmdRan_beta.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdRan_beta.Name = "cmdRan_beta" - Me.cmdRan_beta.Size = New System.Drawing.Size(86, 45) + Me.cmdRan_beta.Size = New System.Drawing.Size(72, 38) Me.cmdRan_beta.TabIndex = 180 Me.cmdRan_beta.Text = "beta" Me.cmdRan_beta.UseVisualStyleBackColor = True @@ -4137,10 +4047,10 @@ Partial Class ucrCalculator ' Me.cmdRan_gamma.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdRan_gamma.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdRan_gamma.Location = New System.Drawing.Point(88, 64) - Me.cmdRan_gamma.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdRan_gamma.Location = New System.Drawing.Point(73, 53) + Me.cmdRan_gamma.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdRan_gamma.Name = "cmdRan_gamma" - Me.cmdRan_gamma.Size = New System.Drawing.Size(87, 45) + Me.cmdRan_gamma.Size = New System.Drawing.Size(72, 38) Me.cmdRan_gamma.TabIndex = 179 Me.cmdRan_gamma.Text = "gamma" Me.cmdRan_gamma.UseVisualStyleBackColor = True @@ -4149,10 +4059,10 @@ Partial Class ucrCalculator ' Me.cmdpoisson.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdpoisson.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdpoisson.Location = New System.Drawing.Point(4, 64) - Me.cmdpoisson.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdpoisson.Location = New System.Drawing.Point(3, 53) + Me.cmdpoisson.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdpoisson.Name = "cmdpoisson" - Me.cmdpoisson.Size = New System.Drawing.Size(86, 45) + Me.cmdpoisson.Size = New System.Drawing.Size(72, 38) Me.cmdpoisson.TabIndex = 177 Me.cmdpoisson.Text = "poisson" Me.cmdpoisson.UseVisualStyleBackColor = True @@ -4161,10 +4071,10 @@ Partial Class ucrCalculator ' Me.cmdbinomial.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdbinomial.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdbinomial.Location = New System.Drawing.Point(364, 21) - Me.cmdbinomial.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdbinomial.Location = New System.Drawing.Point(303, 18) + Me.cmdbinomial.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdbinomial.Name = "cmdbinomial" - Me.cmdbinomial.Size = New System.Drawing.Size(86, 45) + Me.cmdbinomial.Size = New System.Drawing.Size(72, 38) Me.cmdbinomial.TabIndex = 176 Me.cmdbinomial.Text = "binomial" Me.cmdbinomial.UseVisualStyleBackColor = True @@ -4173,10 +4083,10 @@ Partial Class ucrCalculator ' Me.cmdbernoulli.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdbernoulli.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdbernoulli.Location = New System.Drawing.Point(280, 21) - Me.cmdbernoulli.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdbernoulli.Location = New System.Drawing.Point(233, 18) + Me.cmdbernoulli.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdbernoulli.Name = "cmdbernoulli" - Me.cmdbernoulli.Size = New System.Drawing.Size(86, 45) + Me.cmdbernoulli.Size = New System.Drawing.Size(72, 38) Me.cmdbernoulli.TabIndex = 175 Me.cmdbernoulli.Text = "bernoulli" Me.cmdbernoulli.UseVisualStyleBackColor = True @@ -4185,10 +4095,10 @@ Partial Class ucrCalculator ' Me.cmduni_integer.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmduni_integer.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmduni_integer.Location = New System.Drawing.Point(174, 21) - Me.cmduni_integer.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmduni_integer.Location = New System.Drawing.Point(145, 18) + Me.cmduni_integer.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmduni_integer.Name = "cmduni_integer" - Me.cmduni_integer.Size = New System.Drawing.Size(108, 45) + Me.cmduni_integer.Size = New System.Drawing.Size(90, 38) Me.cmduni_integer.TabIndex = 174 Me.cmduni_integer.Text = "uni_integer" Me.cmduni_integer.UseVisualStyleBackColor = True @@ -4197,10 +4107,10 @@ Partial Class ucrCalculator ' Me.cmdRan_normal.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdRan_normal.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdRan_normal.Location = New System.Drawing.Point(88, 21) - Me.cmdRan_normal.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdRan_normal.Location = New System.Drawing.Point(73, 18) + Me.cmdRan_normal.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdRan_normal.Name = "cmdRan_normal" - Me.cmdRan_normal.Size = New System.Drawing.Size(87, 45) + Me.cmdRan_normal.Size = New System.Drawing.Size(72, 38) Me.cmdRan_normal.TabIndex = 173 Me.cmdRan_normal.Text = "normal" Me.cmdRan_normal.UseVisualStyleBackColor = True @@ -4209,10 +4119,10 @@ Partial Class ucrCalculator ' Me.cmduniform.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmduniform.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmduniform.Location = New System.Drawing.Point(4, 21) - Me.cmduniform.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmduniform.Location = New System.Drawing.Point(3, 18) + Me.cmduniform.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmduniform.Name = "cmduniform" - Me.cmduniform.Size = New System.Drawing.Size(86, 45) + Me.cmduniform.Size = New System.Drawing.Size(72, 38) Me.cmduniform.TabIndex = 172 Me.cmduniform.Text = "uniform" Me.cmduniform.UseVisualStyleBackColor = True @@ -4221,10 +4131,10 @@ Partial Class ucrCalculator ' Me.cmdQnbin.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdQnbin.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdQnbin.Location = New System.Drawing.Point(369, 153) - Me.cmdQnbin.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdQnbin.Location = New System.Drawing.Point(308, 128) + Me.cmdQnbin.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdQnbin.Name = "cmdQnbin" - Me.cmdQnbin.Size = New System.Drawing.Size(93, 45) + Me.cmdQnbin.Size = New System.Drawing.Size(78, 38) Me.cmdQnbin.TabIndex = 176 Me.cmdQnbin.Text = "qnbin" Me.cmdQnbin.UseVisualStyleBackColor = True @@ -4233,10 +4143,10 @@ Partial Class ucrCalculator ' Me.cmdQpois.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdQpois.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdQpois.Location = New System.Drawing.Point(278, 153) - Me.cmdQpois.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdQpois.Location = New System.Drawing.Point(232, 128) + Me.cmdQpois.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdQpois.Name = "cmdQpois" - Me.cmdQpois.Size = New System.Drawing.Size(93, 45) + Me.cmdQpois.Size = New System.Drawing.Size(78, 38) Me.cmdQpois.TabIndex = 175 Me.cmdQpois.Text = "qpois" Me.cmdQpois.UseVisualStyleBackColor = True @@ -4245,10 +4155,10 @@ Partial Class ucrCalculator ' Me.cmdQbinom.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdQbinom.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdQbinom.Location = New System.Drawing.Point(186, 153) - Me.cmdQbinom.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdQbinom.Location = New System.Drawing.Point(155, 128) + Me.cmdQbinom.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdQbinom.Name = "cmdQbinom" - Me.cmdQbinom.Size = New System.Drawing.Size(93, 45) + Me.cmdQbinom.Size = New System.Drawing.Size(78, 38) Me.cmdQbinom.TabIndex = 174 Me.cmdQbinom.Text = "qbinom" Me.cmdQbinom.UseVisualStyleBackColor = True @@ -4257,10 +4167,10 @@ Partial Class ucrCalculator ' Me.cmdQbirth.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdQbirth.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdQbirth.Location = New System.Drawing.Point(94, 153) - Me.cmdQbirth.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdQbirth.Location = New System.Drawing.Point(78, 128) + Me.cmdQbirth.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdQbirth.Name = "cmdQbirth" - Me.cmdQbirth.Size = New System.Drawing.Size(93, 45) + Me.cmdQbirth.Size = New System.Drawing.Size(78, 38) Me.cmdQbirth.TabIndex = 173 Me.cmdQbirth.Text = "qbirth" Me.cmdQbirth.UseVisualStyleBackColor = True @@ -4269,10 +4179,10 @@ Partial Class ucrCalculator ' Me.cmdQbeta.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdQbeta.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdQbeta.Location = New System.Drawing.Point(3, 153) - Me.cmdQbeta.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdQbeta.Location = New System.Drawing.Point(2, 128) + Me.cmdQbeta.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdQbeta.Name = "cmdQbeta" - Me.cmdQbeta.Size = New System.Drawing.Size(93, 45) + Me.cmdQbeta.Size = New System.Drawing.Size(78, 38) Me.cmdQbeta.TabIndex = 172 Me.cmdQbeta.Text = "qbeta" Me.cmdQbeta.UseVisualStyleBackColor = True @@ -4281,10 +4191,10 @@ Partial Class ucrCalculator ' Me.cmdPnbin.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdPnbin.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdPnbin.Location = New System.Drawing.Point(369, 110) - Me.cmdPnbin.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdPnbin.Location = New System.Drawing.Point(308, 92) + Me.cmdPnbin.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdPnbin.Name = "cmdPnbin" - Me.cmdPnbin.Size = New System.Drawing.Size(93, 45) + Me.cmdPnbin.Size = New System.Drawing.Size(78, 38) Me.cmdPnbin.TabIndex = 171 Me.cmdPnbin.Text = "pnbin" Me.cmdPnbin.UseVisualStyleBackColor = True @@ -4293,10 +4203,10 @@ Partial Class ucrCalculator ' Me.cmdPpois.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdPpois.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdPpois.Location = New System.Drawing.Point(278, 110) - Me.cmdPpois.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdPpois.Location = New System.Drawing.Point(232, 92) + Me.cmdPpois.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdPpois.Name = "cmdPpois" - Me.cmdPpois.Size = New System.Drawing.Size(93, 45) + Me.cmdPpois.Size = New System.Drawing.Size(78, 38) Me.cmdPpois.TabIndex = 170 Me.cmdPpois.Text = "ppois" Me.cmdPpois.UseVisualStyleBackColor = True @@ -4305,10 +4215,10 @@ Partial Class ucrCalculator ' Me.cmdPbinom.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdPbinom.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdPbinom.Location = New System.Drawing.Point(186, 110) - Me.cmdPbinom.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdPbinom.Location = New System.Drawing.Point(155, 92) + Me.cmdPbinom.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdPbinom.Name = "cmdPbinom" - Me.cmdPbinom.Size = New System.Drawing.Size(93, 45) + Me.cmdPbinom.Size = New System.Drawing.Size(78, 38) Me.cmdPbinom.TabIndex = 169 Me.cmdPbinom.Text = "pbinom" Me.cmdPbinom.UseVisualStyleBackColor = True @@ -4317,10 +4227,10 @@ Partial Class ucrCalculator ' Me.cmdPbirth.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdPbirth.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdPbirth.Location = New System.Drawing.Point(94, 110) - Me.cmdPbirth.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdPbirth.Location = New System.Drawing.Point(78, 92) + Me.cmdPbirth.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdPbirth.Name = "cmdPbirth" - Me.cmdPbirth.Size = New System.Drawing.Size(93, 45) + Me.cmdPbirth.Size = New System.Drawing.Size(78, 38) Me.cmdPbirth.TabIndex = 168 Me.cmdPbirth.Text = "pbirth" Me.cmdPbirth.UseVisualStyleBackColor = True @@ -4329,10 +4239,10 @@ Partial Class ucrCalculator ' Me.cmdPbeta.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdPbeta.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdPbeta.Location = New System.Drawing.Point(3, 110) - Me.cmdPbeta.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdPbeta.Location = New System.Drawing.Point(2, 92) + Me.cmdPbeta.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdPbeta.Name = "cmdPbeta" - Me.cmdPbeta.Size = New System.Drawing.Size(93, 45) + Me.cmdPbeta.Size = New System.Drawing.Size(78, 38) Me.cmdPbeta.TabIndex = 167 Me.cmdPbeta.Text = "pbeta" Me.cmdPbeta.UseVisualStyleBackColor = True @@ -4341,10 +4251,10 @@ Partial Class ucrCalculator ' Me.cmdQgamma.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdQgamma.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdQgamma.Location = New System.Drawing.Point(369, 66) - Me.cmdQgamma.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdQgamma.Location = New System.Drawing.Point(308, 55) + Me.cmdQgamma.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdQgamma.Name = "cmdQgamma" - Me.cmdQgamma.Size = New System.Drawing.Size(93, 45) + Me.cmdQgamma.Size = New System.Drawing.Size(78, 38) Me.cmdQgamma.TabIndex = 166 Me.cmdQgamma.Text = "qgamma" Me.cmdQgamma.UseVisualStyleBackColor = True @@ -4353,10 +4263,10 @@ Partial Class ucrCalculator ' Me.cmdPgamma.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdPgamma.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdPgamma.Location = New System.Drawing.Point(369, 22) - Me.cmdPgamma.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdPgamma.Location = New System.Drawing.Point(308, 18) + Me.cmdPgamma.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdPgamma.Name = "cmdPgamma" - Me.cmdPgamma.Size = New System.Drawing.Size(93, 45) + Me.cmdPgamma.Size = New System.Drawing.Size(78, 38) Me.cmdPgamma.TabIndex = 165 Me.cmdPgamma.Text = "pgamma" Me.cmdPgamma.UseVisualStyleBackColor = True @@ -4365,10 +4275,10 @@ Partial Class ucrCalculator ' Me.cmdGamma.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdGamma.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdGamma.Location = New System.Drawing.Point(278, 196) - Me.cmdGamma.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdGamma.Location = New System.Drawing.Point(232, 163) + Me.cmdGamma.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdGamma.Name = "cmdGamma" - Me.cmdGamma.Size = New System.Drawing.Size(93, 45) + Me.cmdGamma.Size = New System.Drawing.Size(78, 38) Me.cmdGamma.TabIndex = 163 Me.cmdGamma.Tag = "" Me.cmdGamma.Text = "gamma" @@ -4378,10 +4288,10 @@ Partial Class ucrCalculator ' Me.cmdLbeta.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdLbeta.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdLbeta.Location = New System.Drawing.Point(186, 240) - Me.cmdLbeta.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdLbeta.Location = New System.Drawing.Point(155, 200) + Me.cmdLbeta.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdLbeta.Name = "cmdLbeta" - Me.cmdLbeta.Size = New System.Drawing.Size(93, 45) + Me.cmdLbeta.Size = New System.Drawing.Size(78, 38) Me.cmdLbeta.TabIndex = 159 Me.cmdLbeta.Text = "lbeta" Me.cmdLbeta.UseVisualStyleBackColor = True @@ -4390,10 +4300,10 @@ Partial Class ucrCalculator ' Me.cmdqF.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdqF.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdqF.Location = New System.Drawing.Point(278, 66) - Me.cmdqF.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdqF.Location = New System.Drawing.Point(232, 55) + Me.cmdqF.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdqF.Name = "cmdqF" - Me.cmdqF.Size = New System.Drawing.Size(93, 45) + Me.cmdqF.Size = New System.Drawing.Size(78, 38) Me.cmdqF.TabIndex = 162 Me.cmdqF.Text = "qf" Me.cmdqF.UseVisualStyleBackColor = True @@ -4402,10 +4312,10 @@ Partial Class ucrCalculator ' Me.cmdFact.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdFact.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdFact.Location = New System.Drawing.Point(3, 196) - Me.cmdFact.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdFact.Location = New System.Drawing.Point(2, 163) + Me.cmdFact.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdFact.Name = "cmdFact" - Me.cmdFact.Size = New System.Drawing.Size(93, 45) + Me.cmdFact.Size = New System.Drawing.Size(78, 38) Me.cmdFact.TabIndex = 154 Me.cmdFact.Text = "fact" Me.cmdFact.UseVisualStyleBackColor = True @@ -4414,10 +4324,10 @@ Partial Class ucrCalculator ' Me.cmdChoose.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdChoose.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdChoose.Location = New System.Drawing.Point(94, 196) - Me.cmdChoose.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdChoose.Location = New System.Drawing.Point(78, 163) + Me.cmdChoose.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdChoose.Name = "cmdChoose" - Me.cmdChoose.Size = New System.Drawing.Size(93, 45) + Me.cmdChoose.Size = New System.Drawing.Size(78, 38) Me.cmdChoose.TabIndex = 161 Me.cmdChoose.Text = "choose" Me.cmdChoose.UseVisualStyleBackColor = True @@ -4426,10 +4336,10 @@ Partial Class ucrCalculator ' Me.cmdPf.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdPf.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdPf.Location = New System.Drawing.Point(278, 22) - Me.cmdPf.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdPf.Location = New System.Drawing.Point(232, 18) + Me.cmdPf.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdPf.Name = "cmdPf" - Me.cmdPf.Size = New System.Drawing.Size(93, 45) + Me.cmdPf.Size = New System.Drawing.Size(78, 38) Me.cmdPf.TabIndex = 156 Me.cmdPf.Text = "pf" Me.cmdPf.UseVisualStyleBackColor = True @@ -4438,10 +4348,10 @@ Partial Class ucrCalculator ' Me.cmdPChisq.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdPChisq.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdPChisq.Location = New System.Drawing.Point(186, 22) - Me.cmdPChisq.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdPChisq.Location = New System.Drawing.Point(155, 18) + Me.cmdPChisq.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdPChisq.Name = "cmdPChisq" - Me.cmdPChisq.Size = New System.Drawing.Size(93, 45) + Me.cmdPChisq.Size = New System.Drawing.Size(78, 38) Me.cmdPChisq.TabIndex = 155 Me.cmdPChisq.Text = "pchisq" Me.cmdPChisq.UseVisualStyleBackColor = True @@ -4450,10 +4360,10 @@ Partial Class ucrCalculator ' Me.cmdLgamma.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdLgamma.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdLgamma.Location = New System.Drawing.Point(278, 240) - Me.cmdLgamma.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdLgamma.Location = New System.Drawing.Point(232, 200) + Me.cmdLgamma.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdLgamma.Name = "cmdLgamma" - Me.cmdLgamma.Size = New System.Drawing.Size(93, 45) + Me.cmdLgamma.Size = New System.Drawing.Size(78, 38) Me.cmdLgamma.TabIndex = 152 Me.cmdLgamma.Text = "lgamma" Me.cmdLgamma.UseVisualStyleBackColor = True @@ -4462,10 +4372,10 @@ Partial Class ucrCalculator ' Me.cmdPnorm.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdPnorm.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdPnorm.Location = New System.Drawing.Point(3, 22) - Me.cmdPnorm.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdPnorm.Location = New System.Drawing.Point(2, 18) + Me.cmdPnorm.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdPnorm.Name = "cmdPnorm" - Me.cmdPnorm.Size = New System.Drawing.Size(93, 45) + Me.cmdPnorm.Size = New System.Drawing.Size(78, 38) Me.cmdPnorm.TabIndex = 148 Me.cmdPnorm.Text = "pnorm" Me.cmdPnorm.UseVisualStyleBackColor = True @@ -4474,10 +4384,10 @@ Partial Class ucrCalculator ' Me.cmdQchisq.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdQchisq.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdQchisq.Location = New System.Drawing.Point(186, 66) - Me.cmdQchisq.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdQchisq.Location = New System.Drawing.Point(155, 55) + Me.cmdQchisq.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdQchisq.Name = "cmdQchisq" - Me.cmdQchisq.Size = New System.Drawing.Size(93, 45) + Me.cmdQchisq.Size = New System.Drawing.Size(78, 38) Me.cmdQchisq.TabIndex = 160 Me.cmdQchisq.Text = "qchisq" Me.cmdQchisq.UseVisualStyleBackColor = True @@ -4486,10 +4396,10 @@ Partial Class ucrCalculator ' Me.cmdQt.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdQt.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdQt.Location = New System.Drawing.Point(94, 66) - Me.cmdQt.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdQt.Location = New System.Drawing.Point(78, 55) + Me.cmdQt.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdQt.Name = "cmdQt" - Me.cmdQt.Size = New System.Drawing.Size(93, 45) + Me.cmdQt.Size = New System.Drawing.Size(78, 38) Me.cmdQt.TabIndex = 158 Me.cmdQt.Text = "qt" Me.cmdQt.UseVisualStyleBackColor = True @@ -4498,10 +4408,10 @@ Partial Class ucrCalculator ' Me.cmdQnorm.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdQnorm.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdQnorm.Location = New System.Drawing.Point(3, 66) - Me.cmdQnorm.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdQnorm.Location = New System.Drawing.Point(2, 55) + Me.cmdQnorm.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdQnorm.Name = "cmdQnorm" - Me.cmdQnorm.Size = New System.Drawing.Size(93, 45) + Me.cmdQnorm.Size = New System.Drawing.Size(78, 38) Me.cmdQnorm.TabIndex = 157 Me.cmdQnorm.Text = "qnorm" Me.cmdQnorm.UseVisualStyleBackColor = True @@ -4510,10 +4420,10 @@ Partial Class ucrCalculator ' Me.cmdPt.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdPt.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdPt.Location = New System.Drawing.Point(94, 22) - Me.cmdPt.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdPt.Location = New System.Drawing.Point(78, 18) + Me.cmdPt.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdPt.Name = "cmdPt" - Me.cmdPt.Size = New System.Drawing.Size(93, 45) + Me.cmdPt.Size = New System.Drawing.Size(78, 38) Me.cmdPt.TabIndex = 153 Me.cmdPt.Text = "pt" Me.cmdPt.UseVisualStyleBackColor = True @@ -4522,10 +4432,10 @@ Partial Class ucrCalculator ' Me.cmdLchoose.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdLchoose.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdLchoose.Location = New System.Drawing.Point(94, 240) - Me.cmdLchoose.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdLchoose.Location = New System.Drawing.Point(78, 200) + Me.cmdLchoose.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdLchoose.Name = "cmdLchoose" - Me.cmdLchoose.Size = New System.Drawing.Size(93, 45) + Me.cmdLchoose.Size = New System.Drawing.Size(78, 38) Me.cmdLchoose.TabIndex = 151 Me.cmdLchoose.Text = "lchoose" Me.cmdLchoose.UseVisualStyleBackColor = True @@ -4534,10 +4444,10 @@ Partial Class ucrCalculator ' Me.cmdLfact.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdLfact.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdLfact.Location = New System.Drawing.Point(3, 240) - Me.cmdLfact.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdLfact.Location = New System.Drawing.Point(2, 200) + Me.cmdLfact.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdLfact.Name = "cmdLfact" - Me.cmdLfact.Size = New System.Drawing.Size(93, 45) + Me.cmdLfact.Size = New System.Drawing.Size(78, 38) Me.cmdLfact.TabIndex = 150 Me.cmdLfact.Text = "lfact" Me.cmdLfact.UseVisualStyleBackColor = True @@ -4546,10 +4456,10 @@ Partial Class ucrCalculator ' Me.cmdTrigamma.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdTrigamma.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdTrigamma.Location = New System.Drawing.Point(369, 240) - Me.cmdTrigamma.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdTrigamma.Location = New System.Drawing.Point(308, 200) + Me.cmdTrigamma.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdTrigamma.Name = "cmdTrigamma" - Me.cmdTrigamma.Size = New System.Drawing.Size(93, 45) + Me.cmdTrigamma.Size = New System.Drawing.Size(78, 38) Me.cmdTrigamma.TabIndex = 149 Me.cmdTrigamma.Text = "trigamma" Me.cmdTrigamma.UseVisualStyleBackColor = True @@ -4558,10 +4468,10 @@ Partial Class ucrCalculator ' Me.cmdBeta.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdBeta.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdBeta.Location = New System.Drawing.Point(186, 196) - Me.cmdBeta.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdBeta.Location = New System.Drawing.Point(155, 163) + Me.cmdBeta.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdBeta.Name = "cmdBeta" - Me.cmdBeta.Size = New System.Drawing.Size(93, 45) + Me.cmdBeta.Size = New System.Drawing.Size(78, 38) Me.cmdBeta.TabIndex = 149 Me.cmdBeta.Text = "beta" Me.cmdBeta.UseVisualStyleBackColor = True @@ -4570,10 +4480,10 @@ Partial Class ucrCalculator ' Me.cmdDigamma.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdDigamma.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdDigamma.Location = New System.Drawing.Point(369, 196) - Me.cmdDigamma.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdDigamma.Location = New System.Drawing.Point(308, 163) + Me.cmdDigamma.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdDigamma.Name = "cmdDigamma" - Me.cmdDigamma.Size = New System.Drawing.Size(93, 45) + Me.cmdDigamma.Size = New System.Drawing.Size(78, 38) Me.cmdDigamma.TabIndex = 164 Me.cmdDigamma.Text = "digamma" Me.cmdDigamma.UseVisualStyleBackColor = True @@ -4612,11 +4522,9 @@ Partial Class ucrCalculator Me.grpTransform.Controls.Add(Me.cmdPMax) Me.grpTransform.Controls.Add(Me.cmdLead) Me.grpTransform.Controls.Add(Me.cmdLag) - Me.grpTransform.Location = New System.Drawing.Point(651, 93) - Me.grpTransform.Margin = New System.Windows.Forms.Padding(4) + Me.grpTransform.Location = New System.Drawing.Point(542, 78) Me.grpTransform.Name = "grpTransform" - Me.grpTransform.Padding = New System.Windows.Forms.Padding(4) - Me.grpTransform.Size = New System.Drawing.Size(465, 376) + Me.grpTransform.Size = New System.Drawing.Size(388, 313) Me.grpTransform.TabIndex = 189 Me.grpTransform.TabStop = False Me.grpTransform.Text = "Transform" @@ -4624,10 +4532,9 @@ Partial Class ucrCalculator 'cmdDecimals ' Me.cmdDecimals.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdDecimals.Location = New System.Drawing.Point(3, 284) - Me.cmdDecimals.Margin = New System.Windows.Forms.Padding(4) + Me.cmdDecimals.Location = New System.Drawing.Point(2, 237) Me.cmdDecimals.Name = "cmdDecimals" - Me.cmdDecimals.Size = New System.Drawing.Size(93, 45) + Me.cmdDecimals.Size = New System.Drawing.Size(78, 38) Me.cmdDecimals.TabIndex = 207 Me.cmdDecimals.Text = "decimals" Me.cmdDecimals.UseVisualStyleBackColor = True @@ -4635,10 +4542,9 @@ Partial Class ucrCalculator 'cmdMASSFractions ' Me.cmdMASSFractions.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdMASSFractions.Location = New System.Drawing.Point(3, 240) - Me.cmdMASSFractions.Margin = New System.Windows.Forms.Padding(4) + Me.cmdMASSFractions.Location = New System.Drawing.Point(2, 200) Me.cmdMASSFractions.Name = "cmdMASSFractions" - Me.cmdMASSFractions.Size = New System.Drawing.Size(93, 45) + Me.cmdMASSFractions.Size = New System.Drawing.Size(78, 38) Me.cmdMASSFractions.TabIndex = 206 Me.cmdMASSFractions.Text = "fractions" Me.cmdMASSFractions.UseVisualStyleBackColor = True @@ -4646,65 +4552,50 @@ Partial Class ucrCalculator 'cmdScale ' Me.cmdScale.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdScale.Location = New System.Drawing.Point(3, 196) - Me.cmdScale.Margin = New System.Windows.Forms.Padding(4) + Me.cmdScale.Location = New System.Drawing.Point(2, 163) Me.cmdScale.Name = "cmdScale" - Me.cmdScale.Size = New System.Drawing.Size(93, 45) + Me.cmdScale.Size = New System.Drawing.Size(78, 38) Me.cmdScale.TabIndex = 205 Me.cmdScale.Text = "scale" Me.cmdScale.UseVisualStyleBackColor = True ' - 'cmdTransformRHelp - ' - Me.cmdTransformRHelp.AutoSize = True - Me.cmdTransformRHelp.ContextMenuStrip = Me.ContextMenuStripTransform - Me.cmdTransformRHelp.Location = New System.Drawing.Point(324, 330) - Me.cmdTransformRHelp.Margin = New System.Windows.Forms.Padding(4) - Me.cmdTransformRHelp.Name = "cmdTransformRHelp" - Me.cmdTransformRHelp.Size = New System.Drawing.Size(136, 45) - Me.cmdTransformRHelp.SplitMenuStrip = Me.ContextMenuStripTransform - Me.cmdTransformRHelp.TabIndex = 204 - Me.cmdTransformRHelp.Text = "R Help" - Me.cmdTransformRHelp.UseVisualStyleBackColor = True - ' 'ContextMenuStripTransform ' Me.ContextMenuStripTransform.ImageScalingSize = New System.Drawing.Size(24, 24) Me.ContextMenuStripTransform.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.BaseToolStripMenuItem, Me.DplyrToolStripMenuItem, Me.MASSToolStripMenuItem, Me.ZooToolStripMenuItem}) Me.ContextMenuStripTransform.Name = "ContextMenuStrip1" - Me.ContextMenuStripTransform.Size = New System.Drawing.Size(133, 132) + Me.ContextMenuStripTransform.Size = New System.Drawing.Size(118, 100) ' 'BaseToolStripMenuItem ' Me.BaseToolStripMenuItem.Name = "BaseToolStripMenuItem" - Me.BaseToolStripMenuItem.Size = New System.Drawing.Size(132, 32) + Me.BaseToolStripMenuItem.Size = New System.Drawing.Size(117, 24) Me.BaseToolStripMenuItem.Text = "base" ' 'DplyrToolStripMenuItem ' Me.DplyrToolStripMenuItem.Name = "DplyrToolStripMenuItem" - Me.DplyrToolStripMenuItem.Size = New System.Drawing.Size(132, 32) + Me.DplyrToolStripMenuItem.Size = New System.Drawing.Size(117, 24) Me.DplyrToolStripMenuItem.Text = "dplyr" ' 'MASSToolStripMenuItem ' Me.MASSToolStripMenuItem.Name = "MASSToolStripMenuItem" - Me.MASSToolStripMenuItem.Size = New System.Drawing.Size(132, 32) + Me.MASSToolStripMenuItem.Size = New System.Drawing.Size(117, 24) Me.MASSToolStripMenuItem.Text = "MASS" ' 'ZooToolStripMenuItem ' Me.ZooToolStripMenuItem.Name = "ZooToolStripMenuItem" - Me.ZooToolStripMenuItem.Size = New System.Drawing.Size(132, 32) + Me.ZooToolStripMenuItem.Size = New System.Drawing.Size(117, 24) Me.ZooToolStripMenuItem.Text = "zoo" ' 'cmdRev ' Me.cmdRev.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdRev.Location = New System.Drawing.Point(186, 153) - Me.cmdRev.Margin = New System.Windows.Forms.Padding(4) + Me.cmdRev.Location = New System.Drawing.Point(155, 128) Me.cmdRev.Name = "cmdRev" - Me.cmdRev.Size = New System.Drawing.Size(93, 45) + Me.cmdRev.Size = New System.Drawing.Size(78, 38) Me.cmdRev.TabIndex = 203 Me.cmdRev.Text = "rev" Me.cmdRev.UseVisualStyleBackColor = True @@ -4712,10 +4603,9 @@ Partial Class ucrCalculator 'cmdMovProd ' Me.cmdMovProd.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdMovProd.Location = New System.Drawing.Point(186, 110) - Me.cmdMovProd.Margin = New System.Windows.Forms.Padding(4) + Me.cmdMovProd.Location = New System.Drawing.Point(155, 92) Me.cmdMovProd.Name = "cmdMovProd" - Me.cmdMovProd.Size = New System.Drawing.Size(93, 45) + Me.cmdMovProd.Size = New System.Drawing.Size(78, 38) Me.cmdMovProd.TabIndex = 202 Me.cmdMovProd.Text = "movprod" Me.cmdMovProd.UseVisualStyleBackColor = True @@ -4723,10 +4613,9 @@ Partial Class ucrCalculator 'cmdCumProd ' Me.cmdCumProd.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdCumProd.Location = New System.Drawing.Point(186, 66) - Me.cmdCumProd.Margin = New System.Windows.Forms.Padding(4) + Me.cmdCumProd.Location = New System.Drawing.Point(155, 55) Me.cmdCumProd.Name = "cmdCumProd" - Me.cmdCumProd.Size = New System.Drawing.Size(93, 45) + Me.cmdCumProd.Size = New System.Drawing.Size(78, 38) Me.cmdCumProd.TabIndex = 201 Me.cmdCumProd.Text = "cumprod" Me.cmdCumProd.UseVisualStyleBackColor = True @@ -4734,10 +4623,9 @@ Partial Class ucrCalculator 'cmdSortF ' Me.cmdSortF.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdSortF.Location = New System.Drawing.Point(3, 22) - Me.cmdSortF.Margin = New System.Windows.Forms.Padding(4) + Me.cmdSortF.Location = New System.Drawing.Point(2, 18) Me.cmdSortF.Name = "cmdSortF" - Me.cmdSortF.Size = New System.Drawing.Size(93, 45) + Me.cmdSortF.Size = New System.Drawing.Size(78, 38) Me.cmdSortF.TabIndex = 198 Me.cmdSortF.Text = "sort" Me.cmdSortF.UseVisualStyleBackColor = True @@ -4745,10 +4633,9 @@ Partial Class ucrCalculator 'cmdNasplin ' Me.cmdNasplin.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdNasplin.Location = New System.Drawing.Point(369, 240) - Me.cmdNasplin.Margin = New System.Windows.Forms.Padding(4) + Me.cmdNasplin.Location = New System.Drawing.Point(308, 200) Me.cmdNasplin.Name = "cmdNasplin" - Me.cmdNasplin.Size = New System.Drawing.Size(93, 45) + Me.cmdNasplin.Size = New System.Drawing.Size(78, 38) Me.cmdNasplin.TabIndex = 197 Me.cmdNasplin.Text = "nasplin" Me.cmdNasplin.UseVisualStyleBackColor = True @@ -4756,10 +4643,9 @@ Partial Class ucrCalculator 'cmdNaapprox ' Me.cmdNaapprox.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdNaapprox.Location = New System.Drawing.Point(278, 240) - Me.cmdNaapprox.Margin = New System.Windows.Forms.Padding(4) + Me.cmdNaapprox.Location = New System.Drawing.Point(232, 200) Me.cmdNaapprox.Name = "cmdNaapprox" - Me.cmdNaapprox.Size = New System.Drawing.Size(93, 45) + Me.cmdNaapprox.Size = New System.Drawing.Size(78, 38) Me.cmdNaapprox.TabIndex = 196 Me.cmdNaapprox.Text = "naapprox" Me.cmdNaapprox.UseVisualStyleBackColor = True @@ -4767,10 +4653,9 @@ Partial Class ucrCalculator 'cmdNaest ' Me.cmdNaest.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdNaest.Location = New System.Drawing.Point(186, 240) - Me.cmdNaest.Margin = New System.Windows.Forms.Padding(4) + Me.cmdNaest.Location = New System.Drawing.Point(155, 200) Me.cmdNaest.Name = "cmdNaest" - Me.cmdNaest.Size = New System.Drawing.Size(93, 45) + Me.cmdNaest.Size = New System.Drawing.Size(78, 38) Me.cmdNaest.TabIndex = 195 Me.cmdNaest.Text = "naest" Me.cmdNaest.UseVisualStyleBackColor = True @@ -4778,10 +4663,9 @@ Partial Class ucrCalculator 'cmdNafill ' Me.cmdNafill.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdNafill.Location = New System.Drawing.Point(94, 240) - Me.cmdNafill.Margin = New System.Windows.Forms.Padding(4) + Me.cmdNafill.Location = New System.Drawing.Point(78, 200) Me.cmdNafill.Name = "cmdNafill" - Me.cmdNafill.Size = New System.Drawing.Size(93, 45) + Me.cmdNafill.Size = New System.Drawing.Size(78, 38) Me.cmdNafill.TabIndex = 194 Me.cmdNafill.Text = "nafill" Me.cmdNafill.UseVisualStyleBackColor = True @@ -4789,10 +4673,9 @@ Partial Class ucrCalculator 'cmdMovmin ' Me.cmdMovmin.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdMovmin.Location = New System.Drawing.Point(369, 110) - Me.cmdMovmin.Margin = New System.Windows.Forms.Padding(4) + Me.cmdMovmin.Location = New System.Drawing.Point(308, 92) Me.cmdMovmin.Name = "cmdMovmin" - Me.cmdMovmin.Size = New System.Drawing.Size(93, 45) + Me.cmdMovmin.Size = New System.Drawing.Size(78, 38) Me.cmdMovmin.TabIndex = 193 Me.cmdMovmin.Text = "movmin" Me.cmdMovmin.UseVisualStyleBackColor = True @@ -4800,10 +4683,9 @@ Partial Class ucrCalculator 'cmdRowRank ' Me.cmdRowRank.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdRowRank.Location = New System.Drawing.Point(94, 196) - Me.cmdRowRank.Margin = New System.Windows.Forms.Padding(4) + Me.cmdRowRank.Location = New System.Drawing.Point(78, 163) Me.cmdRowRank.Name = "cmdRowRank" - Me.cmdRowRank.Size = New System.Drawing.Size(93, 45) + Me.cmdRowRank.Size = New System.Drawing.Size(78, 38) Me.cmdRowRank.TabIndex = 192 Me.cmdRowRank.Text = "r_rank" Me.cmdRowRank.UseVisualStyleBackColor = True @@ -4811,10 +4693,9 @@ Partial Class ucrCalculator 'cmdDiff ' Me.cmdDiff.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdDiff.Location = New System.Drawing.Point(94, 153) - Me.cmdDiff.Margin = New System.Windows.Forms.Padding(4) + Me.cmdDiff.Location = New System.Drawing.Point(78, 128) Me.cmdDiff.Name = "cmdDiff" - Me.cmdDiff.Size = New System.Drawing.Size(93, 45) + Me.cmdDiff.Size = New System.Drawing.Size(78, 38) Me.cmdDiff.TabIndex = 191 Me.cmdDiff.Text = "diff" Me.cmdDiff.UseVisualStyleBackColor = True @@ -4822,10 +4703,9 @@ Partial Class ucrCalculator 'cmdCumdist ' Me.cmdCumdist.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdCumdist.Location = New System.Drawing.Point(369, 153) - Me.cmdCumdist.Margin = New System.Windows.Forms.Padding(4) + Me.cmdCumdist.Location = New System.Drawing.Point(308, 128) Me.cmdCumdist.Name = "cmdCumdist" - Me.cmdCumdist.Size = New System.Drawing.Size(93, 45) + Me.cmdCumdist.Size = New System.Drawing.Size(78, 38) Me.cmdCumdist.TabIndex = 190 Me.cmdCumdist.Text = "cumdist" Me.cmdCumdist.UseVisualStyleBackColor = True @@ -4833,10 +4713,9 @@ Partial Class ucrCalculator 'cmdMovMean ' Me.cmdMovMean.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdMovMean.Location = New System.Drawing.Point(278, 110) - Me.cmdMovMean.Margin = New System.Windows.Forms.Padding(4) + Me.cmdMovMean.Location = New System.Drawing.Point(232, 92) Me.cmdMovMean.Name = "cmdMovMean" - Me.cmdMovMean.Size = New System.Drawing.Size(93, 45) + Me.cmdMovMean.Size = New System.Drawing.Size(78, 38) Me.cmdMovMean.TabIndex = 189 Me.cmdMovMean.Text = "movmean" Me.cmdMovMean.UseVisualStyleBackColor = True @@ -4844,10 +4723,9 @@ Partial Class ucrCalculator 'cmdCumMean ' Me.cmdCumMean.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdCumMean.Location = New System.Drawing.Point(278, 66) - Me.cmdCumMean.Margin = New System.Windows.Forms.Padding(4) + Me.cmdCumMean.Location = New System.Drawing.Point(232, 55) Me.cmdCumMean.Name = "cmdCumMean" - Me.cmdCumMean.Size = New System.Drawing.Size(93, 45) + Me.cmdCumMean.Size = New System.Drawing.Size(78, 38) Me.cmdCumMean.TabIndex = 188 Me.cmdCumMean.Text = "cummean" Me.cmdCumMean.UseVisualStyleBackColor = True @@ -4855,10 +4733,9 @@ Partial Class ucrCalculator 'cmdNtile ' Me.cmdNtile.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdNtile.Location = New System.Drawing.Point(278, 153) - Me.cmdNtile.Margin = New System.Windows.Forms.Padding(4) + Me.cmdNtile.Location = New System.Drawing.Point(232, 128) Me.cmdNtile.Name = "cmdNtile" - Me.cmdNtile.Size = New System.Drawing.Size(93, 45) + Me.cmdNtile.Size = New System.Drawing.Size(78, 38) Me.cmdNtile.TabIndex = 187 Me.cmdNtile.Text = "ntile" Me.cmdNtile.UseVisualStyleBackColor = True @@ -4866,10 +4743,9 @@ Partial Class ucrCalculator 'cmMovMed ' Me.cmMovMed.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmMovMed.Location = New System.Drawing.Point(3, 153) - Me.cmMovMed.Margin = New System.Windows.Forms.Padding(4) + Me.cmMovMed.Location = New System.Drawing.Point(2, 128) Me.cmMovMed.Name = "cmMovMed" - Me.cmMovMed.Size = New System.Drawing.Size(93, 45) + Me.cmMovMed.Size = New System.Drawing.Size(78, 38) Me.cmMovMed.TabIndex = 186 Me.cmMovMed.Text = "movmed" Me.cmMovMed.UseVisualStyleBackColor = True @@ -4877,10 +4753,9 @@ Partial Class ucrCalculator 'cmdMRank ' Me.cmdMRank.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdMRank.Location = New System.Drawing.Point(369, 196) - Me.cmdMRank.Margin = New System.Windows.Forms.Padding(4) + Me.cmdMRank.Location = New System.Drawing.Point(308, 163) Me.cmdMRank.Name = "cmdMRank" - Me.cmdMRank.Size = New System.Drawing.Size(93, 45) + Me.cmdMRank.Size = New System.Drawing.Size(78, 38) Me.cmdMRank.TabIndex = 185 Me.cmdMRank.Text = "m_rank" Me.cmdMRank.UseVisualStyleBackColor = True @@ -4888,10 +4763,9 @@ Partial Class ucrCalculator 'cmdDRank ' Me.cmdDRank.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdDRank.Location = New System.Drawing.Point(278, 196) - Me.cmdDRank.Margin = New System.Windows.Forms.Padding(4) + Me.cmdDRank.Location = New System.Drawing.Point(232, 163) Me.cmdDRank.Name = "cmdDRank" - Me.cmdDRank.Size = New System.Drawing.Size(93, 45) + Me.cmdDRank.Size = New System.Drawing.Size(78, 38) Me.cmdDRank.TabIndex = 184 Me.cmdDRank.Text = "d_rank" Me.cmdDRank.UseVisualStyleBackColor = True @@ -4899,10 +4773,9 @@ Partial Class ucrCalculator 'cmdMovMax ' Me.cmdMovMax.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdMovMax.Location = New System.Drawing.Point(3, 110) - Me.cmdMovMax.Margin = New System.Windows.Forms.Padding(4) + Me.cmdMovMax.Location = New System.Drawing.Point(2, 92) Me.cmdMovMax.Name = "cmdMovMax" - Me.cmdMovMax.Size = New System.Drawing.Size(93, 45) + Me.cmdMovMax.Size = New System.Drawing.Size(78, 38) Me.cmdMovMax.TabIndex = 183 Me.cmdMovMax.Text = "movmax" Me.cmdMovMax.UseVisualStyleBackColor = True @@ -4910,10 +4783,9 @@ Partial Class ucrCalculator 'cmdMovSum ' Me.cmdMovSum.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdMovSum.Location = New System.Drawing.Point(94, 110) - Me.cmdMovSum.Margin = New System.Windows.Forms.Padding(4) + Me.cmdMovSum.Location = New System.Drawing.Point(78, 92) Me.cmdMovSum.Name = "cmdMovSum" - Me.cmdMovSum.Size = New System.Drawing.Size(93, 45) + Me.cmdMovSum.Size = New System.Drawing.Size(78, 38) Me.cmdMovSum.TabIndex = 182 Me.cmdMovSum.Text = "movsum" Me.cmdMovSum.UseVisualStyleBackColor = True @@ -4922,10 +4794,10 @@ Partial Class ucrCalculator ' Me.cmdPercentRank.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdPercentRank.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdPercentRank.Location = New System.Drawing.Point(186, 196) - Me.cmdPercentRank.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdPercentRank.Location = New System.Drawing.Point(155, 163) + Me.cmdPercentRank.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdPercentRank.Name = "cmdPercentRank" - Me.cmdPercentRank.Size = New System.Drawing.Size(93, 45) + Me.cmdPercentRank.Size = New System.Drawing.Size(78, 38) Me.cmdPercentRank.TabIndex = 181 Me.cmdPercentRank.Text = "% rank" Me.cmdPercentRank.UseVisualStyleBackColor = True @@ -4933,10 +4805,9 @@ Partial Class ucrCalculator 'cmdCumSum ' Me.cmdCumSum.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdCumSum.Location = New System.Drawing.Point(94, 66) - Me.cmdCumSum.Margin = New System.Windows.Forms.Padding(4) + Me.cmdCumSum.Location = New System.Drawing.Point(78, 55) Me.cmdCumSum.Name = "cmdCumSum" - Me.cmdCumSum.Size = New System.Drawing.Size(93, 45) + Me.cmdCumSum.Size = New System.Drawing.Size(78, 38) Me.cmdCumSum.TabIndex = 180 Me.cmdCumSum.Text = "cumsum" Me.cmdCumSum.UseVisualStyleBackColor = True @@ -4944,10 +4815,9 @@ Partial Class ucrCalculator 'cmdCumMin ' Me.cmdCumMin.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdCumMin.Location = New System.Drawing.Point(369, 66) - Me.cmdCumMin.Margin = New System.Windows.Forms.Padding(4) + Me.cmdCumMin.Location = New System.Drawing.Point(308, 55) Me.cmdCumMin.Name = "cmdCumMin" - Me.cmdCumMin.Size = New System.Drawing.Size(93, 45) + Me.cmdCumMin.Size = New System.Drawing.Size(78, 38) Me.cmdCumMin.TabIndex = 179 Me.cmdCumMin.Text = "cummin" Me.cmdCumMin.UseVisualStyleBackColor = True @@ -4955,10 +4825,9 @@ Partial Class ucrCalculator 'cmdCumMax ' Me.cmdCumMax.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdCumMax.Location = New System.Drawing.Point(3, 66) - Me.cmdCumMax.Margin = New System.Windows.Forms.Padding(4) + Me.cmdCumMax.Location = New System.Drawing.Point(2, 55) Me.cmdCumMax.Name = "cmdCumMax" - Me.cmdCumMax.Size = New System.Drawing.Size(93, 45) + Me.cmdCumMax.Size = New System.Drawing.Size(78, 38) Me.cmdCumMax.TabIndex = 178 Me.cmdCumMax.Text = "cummax" Me.cmdCumMax.UseVisualStyleBackColor = True @@ -4966,10 +4835,9 @@ Partial Class ucrCalculator 'cmdPMin ' Me.cmdPMin.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdPMin.Location = New System.Drawing.Point(369, 22) - Me.cmdPMin.Margin = New System.Windows.Forms.Padding(4) + Me.cmdPMin.Location = New System.Drawing.Point(308, 18) Me.cmdPMin.Name = "cmdPMin" - Me.cmdPMin.Size = New System.Drawing.Size(93, 45) + Me.cmdPMin.Size = New System.Drawing.Size(78, 38) Me.cmdPMin.TabIndex = 177 Me.cmdPMin.Text = "pmin" Me.cmdPMin.UseVisualStyleBackColor = True @@ -4977,10 +4845,9 @@ Partial Class ucrCalculator 'cmdPMax ' Me.cmdPMax.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdPMax.Location = New System.Drawing.Point(278, 22) - Me.cmdPMax.Margin = New System.Windows.Forms.Padding(4) + Me.cmdPMax.Location = New System.Drawing.Point(232, 18) Me.cmdPMax.Name = "cmdPMax" - Me.cmdPMax.Size = New System.Drawing.Size(93, 45) + Me.cmdPMax.Size = New System.Drawing.Size(78, 38) Me.cmdPMax.TabIndex = 176 Me.cmdPMax.Text = "pmax" Me.cmdPMax.UseVisualStyleBackColor = True @@ -4988,10 +4855,9 @@ Partial Class ucrCalculator 'cmdLead ' Me.cmdLead.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdLead.Location = New System.Drawing.Point(186, 22) - Me.cmdLead.Margin = New System.Windows.Forms.Padding(4) + Me.cmdLead.Location = New System.Drawing.Point(155, 18) Me.cmdLead.Name = "cmdLead" - Me.cmdLead.Size = New System.Drawing.Size(93, 45) + Me.cmdLead.Size = New System.Drawing.Size(78, 38) Me.cmdLead.TabIndex = 175 Me.cmdLead.Text = "lead" Me.cmdLead.UseVisualStyleBackColor = True @@ -4999,10 +4865,9 @@ Partial Class ucrCalculator 'cmdLag ' Me.cmdLag.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdLag.Location = New System.Drawing.Point(94, 22) - Me.cmdLag.Margin = New System.Windows.Forms.Padding(4) + Me.cmdLag.Location = New System.Drawing.Point(78, 18) Me.cmdLag.Name = "cmdLag" - Me.cmdLag.Size = New System.Drawing.Size(93, 45) + Me.cmdLag.Size = New System.Drawing.Size(78, 38) Me.cmdLag.TabIndex = 174 Me.cmdLag.Text = "lag" Me.cmdLag.UseVisualStyleBackColor = True @@ -5040,54 +4905,40 @@ Partial Class ucrCalculator Me.grpLogical.Controls.Add(Me.cmdNot) Me.grpLogical.Controls.Add(Me.cmdNotEqualsTo) Me.grpLogical.Controls.Add(Me.cmdEquivalent) - Me.grpLogical.Location = New System.Drawing.Point(650, 93) - Me.grpLogical.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.grpLogical.Location = New System.Drawing.Point(542, 78) + Me.grpLogical.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.grpLogical.Name = "grpLogical" - Me.grpLogical.Padding = New System.Windows.Forms.Padding(3, 4, 3, 4) - Me.grpLogical.Size = New System.Drawing.Size(387, 320) + Me.grpLogical.Padding = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.grpLogical.Size = New System.Drawing.Size(322, 276) Me.grpLogical.TabIndex = 183 Me.grpLogical.TabStop = False Me.grpLogical.Text = "Logical and Symbols" ' - 'cmdLogicalHelp - ' - Me.cmdLogicalHelp.AutoSize = True - Me.cmdLogicalHelp.ContextMenuStrip = Me.ContextMenuStripLogical - Me.cmdLogicalHelp.Location = New System.Drawing.Point(279, 280) - Me.cmdLogicalHelp.Margin = New System.Windows.Forms.Padding(4) - Me.cmdLogicalHelp.Name = "cmdLogicalHelp" - Me.cmdLogicalHelp.Size = New System.Drawing.Size(129, 45) - Me.cmdLogicalHelp.SplitMenuStrip = Me.ContextMenuStripLogical - Me.cmdLogicalHelp.TabIndex = 212 - Me.cmdLogicalHelp.Text = "R Help" - Me.cmdLogicalHelp.UseVisualStyleBackColor = True - ' 'ContextMenuStripLogical ' Me.ContextMenuStripLogical.ImageScalingSize = New System.Drawing.Size(24, 24) Me.ContextMenuStripLogical.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.LogBaseToolStripMenuItem, Me.LogDplyrToolStripMenuItem}) Me.ContextMenuStripLogical.Name = "ContextMenuStrip1" - Me.ContextMenuStripLogical.Size = New System.Drawing.Size(126, 68) + Me.ContextMenuStripLogical.Size = New System.Drawing.Size(113, 52) ' 'LogBaseToolStripMenuItem ' Me.LogBaseToolStripMenuItem.Name = "LogBaseToolStripMenuItem" - Me.LogBaseToolStripMenuItem.Size = New System.Drawing.Size(125, 32) + Me.LogBaseToolStripMenuItem.Size = New System.Drawing.Size(112, 24) Me.LogBaseToolStripMenuItem.Text = "base" ' 'LogDplyrToolStripMenuItem ' Me.LogDplyrToolStripMenuItem.Name = "LogDplyrToolStripMenuItem" - Me.LogDplyrToolStripMenuItem.Size = New System.Drawing.Size(125, 32) + Me.LogDplyrToolStripMenuItem.Size = New System.Drawing.Size(112, 24) Me.LogDplyrToolStripMenuItem.Text = "dplyr" ' 'cmdFalse ' Me.cmdFalse.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdFalse.Location = New System.Drawing.Point(303, 63) - Me.cmdFalse.Margin = New System.Windows.Forms.Padding(4) + Me.cmdFalse.Location = New System.Drawing.Point(252, 52) Me.cmdFalse.Name = "cmdFalse" - Me.cmdFalse.Size = New System.Drawing.Size(78, 45) + Me.cmdFalse.Size = New System.Drawing.Size(65, 38) Me.cmdFalse.TabIndex = 207 Me.cmdFalse.Text = "FALSE" Me.cmdFalse.UseVisualStyleBackColor = True @@ -5095,10 +4946,9 @@ Partial Class ucrCalculator 'cmdTrue ' Me.cmdTrue.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdTrue.Location = New System.Drawing.Point(303, 20) - Me.cmdTrue.Margin = New System.Windows.Forms.Padding(4) + Me.cmdTrue.Location = New System.Drawing.Point(252, 17) Me.cmdTrue.Name = "cmdTrue" - Me.cmdTrue.Size = New System.Drawing.Size(78, 45) + Me.cmdTrue.Size = New System.Drawing.Size(65, 38) Me.cmdTrue.TabIndex = 206 Me.cmdTrue.Text = "TRUE" Me.cmdTrue.UseVisualStyleBackColor = True @@ -5106,9 +4956,10 @@ Partial Class ucrCalculator 'cmdDoubleSqrBrackets ' Me.cmdDoubleSqrBrackets.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdDoubleSqrBrackets.Location = New System.Drawing.Point(192, 106) + Me.cmdDoubleSqrBrackets.Location = New System.Drawing.Point(160, 88) + Me.cmdDoubleSqrBrackets.Margin = New System.Windows.Forms.Padding(2) Me.cmdDoubleSqrBrackets.Name = "cmdDoubleSqrBrackets" - Me.cmdDoubleSqrBrackets.Size = New System.Drawing.Size(54, 45) + Me.cmdDoubleSqrBrackets.Size = New System.Drawing.Size(45, 38) Me.cmdDoubleSqrBrackets.TabIndex = 205 Me.cmdDoubleSqrBrackets.Text = "[[ ]]" Me.cmdDoubleSqrBrackets.UseVisualStyleBackColor = True @@ -5116,10 +4967,10 @@ Partial Class ucrCalculator 'cmdIn ' Me.cmdIn.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdIn.Location = New System.Drawing.Point(192, 150) - Me.cmdIn.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdIn.Location = New System.Drawing.Point(160, 125) + Me.cmdIn.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdIn.Name = "cmdIn" - Me.cmdIn.Size = New System.Drawing.Size(98, 45) + Me.cmdIn.Size = New System.Drawing.Size(82, 38) Me.cmdIn.TabIndex = 204 Me.cmdIn.Text = "%in%" Me.cmdIn.UseVisualStyleBackColor = True @@ -5127,10 +4978,9 @@ Partial Class ucrCalculator 'cmdWhich ' Me.cmdWhich.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdWhich.Location = New System.Drawing.Point(288, 150) - Me.cmdWhich.Margin = New System.Windows.Forms.Padding(4) + Me.cmdWhich.Location = New System.Drawing.Point(240, 125) Me.cmdWhich.Name = "cmdWhich" - Me.cmdWhich.Size = New System.Drawing.Size(93, 45) + Me.cmdWhich.Size = New System.Drawing.Size(78, 38) Me.cmdWhich.TabIndex = 203 Me.cmdWhich.Text = "which" Me.cmdWhich.UseVisualStyleBackColor = True @@ -5138,10 +4988,10 @@ Partial Class ucrCalculator 'cmdNA ' Me.cmdNA.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdNA.Location = New System.Drawing.Point(244, 63) - Me.cmdNA.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdNA.Location = New System.Drawing.Point(203, 52) + Me.cmdNA.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdNA.Name = "cmdNA" - Me.cmdNA.Size = New System.Drawing.Size(60, 45) + Me.cmdNA.Size = New System.Drawing.Size(50, 38) Me.cmdNA.TabIndex = 202 Me.cmdNA.Text = "NA" Me.cmdNA.UseVisualStyleBackColor = True @@ -5149,10 +4999,9 @@ Partial Class ucrCalculator 'cmdNear ' Me.cmdNear.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdNear.Location = New System.Drawing.Point(288, 237) - Me.cmdNear.Margin = New System.Windows.Forms.Padding(4) + Me.cmdNear.Location = New System.Drawing.Point(240, 198) Me.cmdNear.Name = "cmdNear" - Me.cmdNear.Size = New System.Drawing.Size(93, 45) + Me.cmdNear.Size = New System.Drawing.Size(78, 38) Me.cmdNear.TabIndex = 201 Me.cmdNear.Text = "near" Me.cmdNear.UseVisualStyleBackColor = True @@ -5160,10 +5009,9 @@ Partial Class ucrCalculator 'cmdBetween ' Me.cmdBetween.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdBetween.Location = New System.Drawing.Point(288, 194) - Me.cmdBetween.Margin = New System.Windows.Forms.Padding(4) + Me.cmdBetween.Location = New System.Drawing.Point(240, 162) Me.cmdBetween.Name = "cmdBetween" - Me.cmdBetween.Size = New System.Drawing.Size(93, 45) + Me.cmdBetween.Size = New System.Drawing.Size(78, 38) Me.cmdBetween.TabIndex = 200 Me.cmdBetween.Text = "between" Me.cmdBetween.UseVisualStyleBackColor = True @@ -5171,10 +5019,9 @@ Partial Class ucrCalculator 'cmdIsNa ' Me.cmdIsNa.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdIsNa.Location = New System.Drawing.Point(6, 237) - Me.cmdIsNa.Margin = New System.Windows.Forms.Padding(4) + Me.cmdIsNa.Location = New System.Drawing.Point(5, 198) Me.cmdIsNa.Name = "cmdIsNa" - Me.cmdIsNa.Size = New System.Drawing.Size(93, 45) + Me.cmdIsNa.Size = New System.Drawing.Size(78, 38) Me.cmdIsNa.TabIndex = 195 Me.cmdIsNa.Text = "is.na" Me.cmdIsNa.UseVisualStyleBackColor = True @@ -5182,10 +5029,9 @@ Partial Class ucrCalculator 'cmdNotIsNa ' Me.cmdNotIsNa.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdNotIsNa.Location = New System.Drawing.Point(98, 237) - Me.cmdNotIsNa.Margin = New System.Windows.Forms.Padding(4) + Me.cmdNotIsNa.Location = New System.Drawing.Point(82, 198) Me.cmdNotIsNa.Name = "cmdNotIsNa" - Me.cmdNotIsNa.Size = New System.Drawing.Size(94, 45) + Me.cmdNotIsNa.Size = New System.Drawing.Size(78, 38) Me.cmdNotIsNa.TabIndex = 194 Me.cmdNotIsNa.Text = "!is.na" Me.cmdNotIsNa.UseVisualStyleBackColor = True @@ -5193,10 +5039,9 @@ Partial Class ucrCalculator 'cmdDuplicate ' Me.cmdDuplicate.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdDuplicate.Location = New System.Drawing.Point(192, 237) - Me.cmdDuplicate.Margin = New System.Windows.Forms.Padding(4) + Me.cmdDuplicate.Location = New System.Drawing.Point(160, 198) Me.cmdDuplicate.Name = "cmdDuplicate" - Me.cmdDuplicate.Size = New System.Drawing.Size(98, 45) + Me.cmdDuplicate.Size = New System.Drawing.Size(82, 38) Me.cmdDuplicate.TabIndex = 193 Me.cmdDuplicate.Text = "duplicated" Me.cmdDuplicate.UseVisualStyleBackColor = True @@ -5204,10 +5049,9 @@ Partial Class ucrCalculator 'cmdIfelse ' Me.cmdIfelse.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdIfelse.Location = New System.Drawing.Point(6, 194) - Me.cmdIfelse.Margin = New System.Windows.Forms.Padding(4) + Me.cmdIfelse.Location = New System.Drawing.Point(5, 162) Me.cmdIfelse.Name = "cmdIfelse" - Me.cmdIfelse.Size = New System.Drawing.Size(93, 45) + Me.cmdIfelse.Size = New System.Drawing.Size(78, 38) Me.cmdIfelse.TabIndex = 192 Me.cmdIfelse.Text = "ifelse" Me.cmdIfelse.UseVisualStyleBackColor = True @@ -5215,10 +5059,9 @@ Partial Class ucrCalculator 'cmdmatch ' Me.cmdmatch.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdmatch.Location = New System.Drawing.Point(98, 194) - Me.cmdmatch.Margin = New System.Windows.Forms.Padding(4) + Me.cmdmatch.Location = New System.Drawing.Point(82, 162) Me.cmdmatch.Name = "cmdmatch" - Me.cmdmatch.Size = New System.Drawing.Size(94, 45) + Me.cmdmatch.Size = New System.Drawing.Size(78, 38) Me.cmdmatch.TabIndex = 191 Me.cmdmatch.Text = "match" Me.cmdmatch.UseVisualStyleBackColor = True @@ -5226,10 +5069,9 @@ Partial Class ucrCalculator 'cmdwhen ' Me.cmdwhen.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdwhen.Location = New System.Drawing.Point(192, 194) - Me.cmdwhen.Margin = New System.Windows.Forms.Padding(4) + Me.cmdwhen.Location = New System.Drawing.Point(160, 162) Me.cmdwhen.Name = "cmdwhen" - Me.cmdwhen.Size = New System.Drawing.Size(98, 45) + Me.cmdwhen.Size = New System.Drawing.Size(82, 38) Me.cmdwhen.TabIndex = 190 Me.cmdwhen.Text = "when" Me.cmdwhen.UseVisualStyleBackColor = True @@ -5237,10 +5079,10 @@ Partial Class ucrCalculator 'cmdOpeningBracket ' Me.cmdOpeningBracket.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdOpeningBracket.Location = New System.Drawing.Point(244, 106) - Me.cmdOpeningBracket.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdOpeningBracket.Location = New System.Drawing.Point(203, 88) + Me.cmdOpeningBracket.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdOpeningBracket.Name = "cmdOpeningBracket" - Me.cmdOpeningBracket.Size = New System.Drawing.Size(60, 45) + Me.cmdOpeningBracket.Size = New System.Drawing.Size(50, 38) Me.cmdOpeningBracket.TabIndex = 139 Me.cmdOpeningBracket.Text = "(" Me.cmdOpeningBracket.UseVisualStyleBackColor = True @@ -5249,10 +5091,10 @@ Partial Class ucrCalculator ' Me.cmdColon.Font = New System.Drawing.Font("Microsoft Sans Serif", 15.75!) Me.cmdColon.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdColon.Location = New System.Drawing.Point(64, 106) - Me.cmdColon.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdColon.Location = New System.Drawing.Point(53, 88) + Me.cmdColon.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdColon.Name = "cmdColon" - Me.cmdColon.Size = New System.Drawing.Size(60, 45) + Me.cmdColon.Size = New System.Drawing.Size(50, 38) Me.cmdColon.TabIndex = 139 Me.cmdColon.Text = ":" Me.cmdColon.UseVisualStyleBackColor = True @@ -5260,10 +5102,10 @@ Partial Class ucrCalculator 'cmdGreaterOrEqualsTo ' Me.cmdGreaterOrEqualsTo.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdGreaterOrEqualsTo.Location = New System.Drawing.Point(192, 20) - Me.cmdGreaterOrEqualsTo.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdGreaterOrEqualsTo.Location = New System.Drawing.Point(160, 17) + Me.cmdGreaterOrEqualsTo.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdGreaterOrEqualsTo.Name = "cmdGreaterOrEqualsTo" - Me.cmdGreaterOrEqualsTo.Size = New System.Drawing.Size(54, 45) + Me.cmdGreaterOrEqualsTo.Size = New System.Drawing.Size(45, 38) Me.cmdGreaterOrEqualsTo.TabIndex = 138 Me.cmdGreaterOrEqualsTo.Text = ">=" Me.cmdGreaterOrEqualsTo.UseVisualStyleBackColor = True @@ -5271,10 +5113,10 @@ Partial Class ucrCalculator 'cmdClossingBracket ' Me.cmdClossingBracket.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdClossingBracket.Location = New System.Drawing.Point(303, 106) - Me.cmdClossingBracket.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdClossingBracket.Location = New System.Drawing.Point(252, 88) + Me.cmdClossingBracket.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdClossingBracket.Name = "cmdClossingBracket" - Me.cmdClossingBracket.Size = New System.Drawing.Size(78, 45) + Me.cmdClossingBracket.Size = New System.Drawing.Size(65, 38) Me.cmdClossingBracket.TabIndex = 137 Me.cmdClossingBracket.Tag = "" Me.cmdClossingBracket.Text = ")" @@ -5284,10 +5126,10 @@ Partial Class ucrCalculator ' Me.cmdAnd.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!) Me.cmdAnd.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdAnd.Location = New System.Drawing.Point(192, 63) - Me.cmdAnd.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdAnd.Location = New System.Drawing.Point(160, 52) + Me.cmdAnd.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdAnd.Name = "cmdAnd" - Me.cmdAnd.Size = New System.Drawing.Size(54, 45) + Me.cmdAnd.Size = New System.Drawing.Size(45, 38) Me.cmdAnd.TabIndex = 137 Me.cmdAnd.Tag = "And" Me.cmdAnd.Text = "&&" @@ -5297,10 +5139,10 @@ Partial Class ucrCalculator ' Me.cmdQuotes.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!) Me.cmdQuotes.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdQuotes.Location = New System.Drawing.Point(244, 20) - Me.cmdQuotes.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdQuotes.Location = New System.Drawing.Point(203, 17) + Me.cmdQuotes.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdQuotes.Name = "cmdQuotes" - Me.cmdQuotes.Size = New System.Drawing.Size(60, 45) + Me.cmdQuotes.Size = New System.Drawing.Size(50, 38) Me.cmdQuotes.TabIndex = 135 Me.cmdQuotes.Text = """ """ Me.cmdQuotes.UseVisualStyleBackColor = True @@ -5308,9 +5150,10 @@ Partial Class ucrCalculator 'cmdSquareBrackets ' Me.cmdSquareBrackets.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdSquareBrackets.Location = New System.Drawing.Point(123, 106) + Me.cmdSquareBrackets.Location = New System.Drawing.Point(102, 88) + Me.cmdSquareBrackets.Margin = New System.Windows.Forms.Padding(2) Me.cmdSquareBrackets.Name = "cmdSquareBrackets" - Me.cmdSquareBrackets.Size = New System.Drawing.Size(69, 45) + Me.cmdSquareBrackets.Size = New System.Drawing.Size(58, 38) Me.cmdSquareBrackets.TabIndex = 134 Me.cmdSquareBrackets.Text = "[ ]" Me.cmdSquareBrackets.UseVisualStyleBackColor = True @@ -5318,10 +5161,10 @@ Partial Class ucrCalculator 'cmdIntegerDivision ' Me.cmdIntegerDivision.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdIntegerDivision.Location = New System.Drawing.Point(98, 150) - Me.cmdIntegerDivision.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdIntegerDivision.Location = New System.Drawing.Point(82, 125) + Me.cmdIntegerDivision.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdIntegerDivision.Name = "cmdIntegerDivision" - Me.cmdIntegerDivision.Size = New System.Drawing.Size(94, 45) + Me.cmdIntegerDivision.Size = New System.Drawing.Size(78, 38) Me.cmdIntegerDivision.TabIndex = 135 Me.cmdIntegerDivision.Text = "div (%/%)" Me.cmdIntegerDivision.UseVisualStyleBackColor = True @@ -5329,9 +5172,10 @@ Partial Class ucrCalculator 'cmdModulas ' Me.cmdModulas.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdModulas.Location = New System.Drawing.Point(6, 150) + Me.cmdModulas.Location = New System.Drawing.Point(5, 125) + Me.cmdModulas.Margin = New System.Windows.Forms.Padding(2) Me.cmdModulas.Name = "cmdModulas" - Me.cmdModulas.Size = New System.Drawing.Size(93, 45) + Me.cmdModulas.Size = New System.Drawing.Size(78, 38) Me.cmdModulas.TabIndex = 134 Me.cmdModulas.Text = "mod (%%)" Me.cmdModulas.UseVisualStyleBackColor = True @@ -5339,10 +5183,10 @@ Partial Class ucrCalculator 'cmdGreater ' Me.cmdGreater.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdGreater.Location = New System.Drawing.Point(123, 20) - Me.cmdGreater.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdGreater.Location = New System.Drawing.Point(102, 17) + Me.cmdGreater.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdGreater.Name = "cmdGreater" - Me.cmdGreater.Size = New System.Drawing.Size(69, 45) + Me.cmdGreater.Size = New System.Drawing.Size(58, 38) Me.cmdGreater.TabIndex = 133 Me.cmdGreater.Text = ">" Me.cmdGreater.UseVisualStyleBackColor = True @@ -5350,10 +5194,10 @@ Partial Class ucrCalculator 'cmdLesserOrEqualsTo ' Me.cmdLesserOrEqualsTo.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdLesserOrEqualsTo.Location = New System.Drawing.Point(64, 20) - Me.cmdLesserOrEqualsTo.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdLesserOrEqualsTo.Location = New System.Drawing.Point(53, 17) + Me.cmdLesserOrEqualsTo.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdLesserOrEqualsTo.Name = "cmdLesserOrEqualsTo" - Me.cmdLesserOrEqualsTo.Size = New System.Drawing.Size(60, 45) + Me.cmdLesserOrEqualsTo.Size = New System.Drawing.Size(50, 38) Me.cmdLesserOrEqualsTo.TabIndex = 132 Me.cmdLesserOrEqualsTo.Text = "<=" Me.cmdLesserOrEqualsTo.UseVisualStyleBackColor = True @@ -5361,9 +5205,10 @@ Partial Class ucrCalculator 'cmdLesser ' Me.cmdLesser.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdLesser.Location = New System.Drawing.Point(6, 20) + Me.cmdLesser.Location = New System.Drawing.Point(5, 17) + Me.cmdLesser.Margin = New System.Windows.Forms.Padding(2) Me.cmdLesser.Name = "cmdLesser" - Me.cmdLesser.Size = New System.Drawing.Size(58, 45) + Me.cmdLesser.Size = New System.Drawing.Size(48, 38) Me.cmdLesser.TabIndex = 131 Me.cmdLesser.Text = "<" Me.cmdLesser.UseVisualStyleBackColor = True @@ -5371,10 +5216,10 @@ Partial Class ucrCalculator 'cmdOr ' Me.cmdOr.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdOr.Location = New System.Drawing.Point(123, 63) - Me.cmdOr.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdOr.Location = New System.Drawing.Point(102, 52) + Me.cmdOr.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdOr.Name = "cmdOr" - Me.cmdOr.Size = New System.Drawing.Size(69, 45) + Me.cmdOr.Size = New System.Drawing.Size(58, 38) Me.cmdOr.TabIndex = 130 Me.cmdOr.Text = "|" Me.cmdOr.UseVisualStyleBackColor = True @@ -5383,10 +5228,10 @@ Partial Class ucrCalculator ' Me.cmdNot.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!) Me.cmdNot.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdNot.Location = New System.Drawing.Point(6, 106) - Me.cmdNot.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdNot.Location = New System.Drawing.Point(5, 88) + Me.cmdNot.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdNot.Name = "cmdNot" - Me.cmdNot.Size = New System.Drawing.Size(58, 45) + Me.cmdNot.Size = New System.Drawing.Size(48, 38) Me.cmdNot.TabIndex = 129 Me.cmdNot.Text = "!" Me.cmdNot.UseVisualStyleBackColor = True @@ -5394,10 +5239,10 @@ Partial Class ucrCalculator 'cmdNotEqualsTo ' Me.cmdNotEqualsTo.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdNotEqualsTo.Location = New System.Drawing.Point(64, 63) - Me.cmdNotEqualsTo.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdNotEqualsTo.Location = New System.Drawing.Point(53, 52) + Me.cmdNotEqualsTo.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdNotEqualsTo.Name = "cmdNotEqualsTo" - Me.cmdNotEqualsTo.Size = New System.Drawing.Size(60, 45) + Me.cmdNotEqualsTo.Size = New System.Drawing.Size(50, 38) Me.cmdNotEqualsTo.TabIndex = 128 Me.cmdNotEqualsTo.Text = "!=" Me.cmdNotEqualsTo.UseVisualStyleBackColor = True @@ -5405,9 +5250,10 @@ Partial Class ucrCalculator 'cmdEquivalent ' Me.cmdEquivalent.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdEquivalent.Location = New System.Drawing.Point(6, 63) + Me.cmdEquivalent.Location = New System.Drawing.Point(5, 52) + Me.cmdEquivalent.Margin = New System.Windows.Forms.Padding(2) Me.cmdEquivalent.Name = "cmdEquivalent" - Me.cmdEquivalent.Size = New System.Drawing.Size(58, 45) + Me.cmdEquivalent.Size = New System.Drawing.Size(48, 38) Me.cmdEquivalent.TabIndex = 127 Me.cmdEquivalent.Text = "==" Me.cmdEquivalent.UseVisualStyleBackColor = True @@ -5427,7 +5273,6 @@ Partial Class ucrCalculator Me.grpTestString.Controls.Add(Me.cmdLocate2) Me.grpTestString.Controls.Add(Me.cmdExtract2) Me.grpTestString.Controls.Add(Me.cmdEncodeb) - Me.grpTestString.Controls.Add(Me.cmdSquishb) Me.grpTestString.Controls.Add(Me.cmdSub) Me.grpTestString.Controls.Add(Me.cmdCombine) Me.grpTestString.Controls.Add(Me.cmdDetect) @@ -5441,12 +5286,11 @@ Partial Class ucrCalculator Me.grpTestString.Controls.Add(Me.cmdExtract) Me.grpTestString.Controls.Add(Me.cmdCountstrings) Me.grpTestString.Controls.Add(Me.cmdLocate) + Me.grpTestString.Controls.Add(Me.cmdSquishb) Me.grpTestString.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - Me.grpTestString.Location = New System.Drawing.Point(651, 92) - Me.grpTestString.Margin = New System.Windows.Forms.Padding(4) + Me.grpTestString.Location = New System.Drawing.Point(542, 77) Me.grpTestString.Name = "grpTestString" - Me.grpTestString.Padding = New System.Windows.Forms.Padding(4) - Me.grpTestString.Size = New System.Drawing.Size(454, 246) + Me.grpTestString.Size = New System.Drawing.Size(378, 205) Me.grpTestString.TabIndex = 186 Me.grpTestString.TabStop = False Me.grpTestString.Text = "Text/Strings (Character Columns)" @@ -5455,10 +5299,10 @@ Partial Class ucrCalculator ' Me.cmdReverseStr.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdReverseStr.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdReverseStr.Location = New System.Drawing.Point(369, 153) - Me.cmdReverseStr.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdReverseStr.Location = New System.Drawing.Point(308, 128) + Me.cmdReverseStr.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdReverseStr.Name = "cmdReverseStr" - Me.cmdReverseStr.Size = New System.Drawing.Size(78, 45) + Me.cmdReverseStr.Size = New System.Drawing.Size(65, 38) Me.cmdReverseStr.TabIndex = 165 Me.cmdReverseStr.Tag = "" Me.cmdReverseStr.Text = "reverse" @@ -5467,10 +5311,9 @@ Partial Class ucrCalculator 'cmdEnds ' Me.cmdEnds.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdEnds.Location = New System.Drawing.Point(180, 110) - Me.cmdEnds.Margin = New System.Windows.Forms.Padding(4) + Me.cmdEnds.Location = New System.Drawing.Point(150, 92) Me.cmdEnds.Name = "cmdEnds" - Me.cmdEnds.Size = New System.Drawing.Size(90, 45) + Me.cmdEnds.Size = New System.Drawing.Size(75, 38) Me.cmdEnds.TabIndex = 164 Me.cmdEnds.Text = "ends" Me.cmdEnds.UseVisualStyleBackColor = True @@ -5479,10 +5322,10 @@ Partial Class ucrCalculator ' Me.cmdTrunck.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdTrunck.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdTrunck.Location = New System.Drawing.Point(369, 196) - Me.cmdTrunck.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdTrunck.Location = New System.Drawing.Point(308, 163) + Me.cmdTrunck.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdTrunck.Name = "cmdTrunck" - Me.cmdTrunck.Size = New System.Drawing.Size(78, 45) + Me.cmdTrunck.Size = New System.Drawing.Size(65, 38) Me.cmdTrunck.TabIndex = 163 Me.cmdTrunck.Text = "trunc " Me.cmdTrunck.UseVisualStyleBackColor = True @@ -5491,10 +5334,10 @@ Partial Class ucrCalculator ' Me.cmdLenth.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdLenth.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdLenth.Location = New System.Drawing.Point(242, 153) - Me.cmdLenth.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdLenth.Location = New System.Drawing.Point(202, 128) + Me.cmdLenth.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdLenth.Name = "cmdLenth" - Me.cmdLenth.Size = New System.Drawing.Size(66, 45) + Me.cmdLenth.Size = New System.Drawing.Size(55, 38) Me.cmdLenth.TabIndex = 162 Me.cmdLenth.Text = "length" Me.cmdLenth.UseVisualStyleBackColor = True @@ -5503,10 +5346,10 @@ Partial Class ucrCalculator ' Me.cmdGlue.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdGlue.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdGlue.Location = New System.Drawing.Point(306, 153) - Me.cmdGlue.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdGlue.Location = New System.Drawing.Point(255, 128) + Me.cmdGlue.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdGlue.Name = "cmdGlue" - Me.cmdGlue.Size = New System.Drawing.Size(64, 45) + Me.cmdGlue.Size = New System.Drawing.Size(53, 38) Me.cmdGlue.TabIndex = 161 Me.cmdGlue.Text = "glue" Me.cmdGlue.UseVisualStyleBackColor = True @@ -5515,10 +5358,10 @@ Partial Class ucrCalculator ' Me.cmdStarts.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdStarts.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdStarts.Location = New System.Drawing.Point(302, 196) - Me.cmdStarts.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdStarts.Location = New System.Drawing.Point(252, 163) + Me.cmdStarts.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdStarts.Name = "cmdStarts" - Me.cmdStarts.Size = New System.Drawing.Size(69, 45) + Me.cmdStarts.Size = New System.Drawing.Size(58, 38) Me.cmdStarts.TabIndex = 160 Me.cmdStarts.Tag = "" Me.cmdStarts.Text = "starts" @@ -5528,10 +5371,10 @@ Partial Class ucrCalculator ' Me.cmdReplace2.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdReplace2.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdReplace2.Location = New System.Drawing.Point(165, 196) - Me.cmdReplace2.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdReplace2.Location = New System.Drawing.Point(138, 163) + Me.cmdReplace2.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdReplace2.Name = "cmdReplace2" - Me.cmdReplace2.Size = New System.Drawing.Size(90, 45) + Me.cmdReplace2.Size = New System.Drawing.Size(75, 38) Me.cmdReplace2.TabIndex = 159 Me.cmdReplace2.Tag = "" Me.cmdReplace2.Text = "replace2" @@ -5541,10 +5384,10 @@ Partial Class ucrCalculator ' Me.cmdReplace.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdReplace.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdReplace.Location = New System.Drawing.Point(92, 196) - Me.cmdReplace.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdReplace.Location = New System.Drawing.Point(77, 163) + Me.cmdReplace.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdReplace.Name = "cmdReplace" - Me.cmdReplace.Size = New System.Drawing.Size(75, 45) + Me.cmdReplace.Size = New System.Drawing.Size(62, 38) Me.cmdReplace.TabIndex = 158 Me.cmdReplace.Tag = "" Me.cmdReplace.Text = "replace" @@ -5554,10 +5397,10 @@ Partial Class ucrCalculator ' Me.cmdRemove2.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdRemove2.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdRemove2.Location = New System.Drawing.Point(3, 196) - Me.cmdRemove2.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdRemove2.Location = New System.Drawing.Point(2, 163) + Me.cmdRemove2.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdRemove2.Name = "cmdRemove2" - Me.cmdRemove2.Size = New System.Drawing.Size(90, 45) + Me.cmdRemove2.Size = New System.Drawing.Size(75, 38) Me.cmdRemove2.TabIndex = 157 Me.cmdRemove2.Tag = "" Me.cmdRemove2.Text = "remove2" @@ -5567,10 +5410,10 @@ Partial Class ucrCalculator ' Me.cmdRemove1.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdRemove1.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdRemove1.Location = New System.Drawing.Point(165, 153) - Me.cmdRemove1.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdRemove1.Location = New System.Drawing.Point(138, 128) + Me.cmdRemove1.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdRemove1.Name = "cmdRemove1" - Me.cmdRemove1.Size = New System.Drawing.Size(78, 45) + Me.cmdRemove1.Size = New System.Drawing.Size(65, 38) Me.cmdRemove1.TabIndex = 156 Me.cmdRemove1.Tag = "" Me.cmdRemove1.Text = "remove" @@ -5580,10 +5423,10 @@ Partial Class ucrCalculator ' Me.cmdLocate2.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdLocate2.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdLocate2.Location = New System.Drawing.Point(92, 153) - Me.cmdLocate2.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdLocate2.Location = New System.Drawing.Point(77, 128) + Me.cmdLocate2.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdLocate2.Name = "cmdLocate2" - Me.cmdLocate2.Size = New System.Drawing.Size(75, 45) + Me.cmdLocate2.Size = New System.Drawing.Size(62, 38) Me.cmdLocate2.TabIndex = 155 Me.cmdLocate2.Tag = "" Me.cmdLocate2.Text = "locate2" @@ -5593,10 +5436,10 @@ Partial Class ucrCalculator ' Me.cmdExtract2.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdExtract2.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdExtract2.Location = New System.Drawing.Point(357, 110) - Me.cmdExtract2.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdExtract2.Location = New System.Drawing.Point(298, 92) + Me.cmdExtract2.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdExtract2.Name = "cmdExtract2" - Me.cmdExtract2.Size = New System.Drawing.Size(90, 45) + Me.cmdExtract2.Size = New System.Drawing.Size(75, 38) Me.cmdExtract2.TabIndex = 154 Me.cmdExtract2.Tag = "" Me.cmdExtract2.Text = "extract2" @@ -5606,34 +5449,22 @@ Partial Class ucrCalculator ' Me.cmdEncodeb.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdEncodeb.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdEncodeb.Location = New System.Drawing.Point(357, 66) - Me.cmdEncodeb.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdEncodeb.Location = New System.Drawing.Point(298, 55) + Me.cmdEncodeb.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdEncodeb.Name = "cmdEncodeb" - Me.cmdEncodeb.Size = New System.Drawing.Size(90, 45) + Me.cmdEncodeb.Size = New System.Drawing.Size(75, 38) Me.cmdEncodeb.TabIndex = 151 Me.cmdEncodeb.Text = "encode " Me.cmdEncodeb.UseVisualStyleBackColor = True ' - 'cmdSquishb - ' - Me.cmdSquishb.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - Me.cmdSquishb.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdSquishb.Location = New System.Drawing.Point(357, 22) - Me.cmdSquishb.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) - Me.cmdSquishb.Name = "cmdSquishb" - Me.cmdSquishb.Size = New System.Drawing.Size(90, 45) - Me.cmdSquishb.TabIndex = 150 - Me.cmdSquishb.Text = "squish " - Me.cmdSquishb.UseVisualStyleBackColor = True - ' 'cmdSub ' Me.cmdSub.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdSub.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdSub.Location = New System.Drawing.Point(254, 196) - Me.cmdSub.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdSub.Location = New System.Drawing.Point(212, 163) + Me.cmdSub.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdSub.Name = "cmdSub" - Me.cmdSub.Size = New System.Drawing.Size(50, 45) + Me.cmdSub.Size = New System.Drawing.Size(42, 38) Me.cmdSub.TabIndex = 149 Me.cmdSub.Tag = "" Me.cmdSub.Text = "sub" @@ -5643,10 +5474,10 @@ Partial Class ucrCalculator ' Me.cmdCombine.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdCombine.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdCombine.Location = New System.Drawing.Point(268, 66) - Me.cmdCombine.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdCombine.Location = New System.Drawing.Point(223, 55) + Me.cmdCombine.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdCombine.Name = "cmdCombine" - Me.cmdCombine.Size = New System.Drawing.Size(90, 45) + Me.cmdCombine.Size = New System.Drawing.Size(75, 38) Me.cmdCombine.TabIndex = 148 Me.cmdCombine.Text = "combine" Me.cmdCombine.UseVisualStyleBackColor = True @@ -5655,10 +5486,10 @@ Partial Class ucrCalculator ' Me.cmdDetect.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdDetect.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdDetect.Location = New System.Drawing.Point(92, 110) - Me.cmdDetect.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdDetect.Location = New System.Drawing.Point(77, 92) + Me.cmdDetect.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdDetect.Name = "cmdDetect" - Me.cmdDetect.Size = New System.Drawing.Size(90, 45) + Me.cmdDetect.Size = New System.Drawing.Size(75, 38) Me.cmdDetect.TabIndex = 147 Me.cmdDetect.Tag = "" Me.cmdDetect.Text = "detect" @@ -5668,10 +5499,10 @@ Partial Class ucrCalculator ' Me.cmdTrim.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdTrim.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdTrim.Location = New System.Drawing.Point(268, 22) - Me.cmdTrim.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdTrim.Location = New System.Drawing.Point(223, 18) + Me.cmdTrim.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdTrim.Name = "cmdTrim" - Me.cmdTrim.Size = New System.Drawing.Size(90, 45) + Me.cmdTrim.Size = New System.Drawing.Size(75, 38) Me.cmdTrim.TabIndex = 146 Me.cmdTrim.Text = "trim" Me.cmdTrim.UseVisualStyleBackColor = True @@ -5680,10 +5511,10 @@ Partial Class ucrCalculator ' Me.cmdTitle.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdTitle.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdTitle.Location = New System.Drawing.Point(180, 22) - Me.cmdTitle.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdTitle.Location = New System.Drawing.Point(150, 18) + Me.cmdTitle.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdTitle.Name = "cmdTitle" - Me.cmdTitle.Size = New System.Drawing.Size(90, 45) + Me.cmdTitle.Size = New System.Drawing.Size(75, 38) Me.cmdTitle.TabIndex = 142 Me.cmdTitle.Text = "title" Me.cmdTitle.UseVisualStyleBackColor = True @@ -5692,10 +5523,10 @@ Partial Class ucrCalculator ' Me.cmdLower.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdLower.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdLower.Location = New System.Drawing.Point(92, 22) - Me.cmdLower.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdLower.Location = New System.Drawing.Point(77, 18) + Me.cmdLower.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdLower.Name = "cmdLower" - Me.cmdLower.Size = New System.Drawing.Size(90, 45) + Me.cmdLower.Size = New System.Drawing.Size(75, 38) Me.cmdLower.TabIndex = 141 Me.cmdLower.Text = "lower" Me.cmdLower.UseVisualStyleBackColor = True @@ -5704,10 +5535,10 @@ Partial Class ucrCalculator ' Me.cmdUpper.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdUpper.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdUpper.Location = New System.Drawing.Point(3, 22) - Me.cmdUpper.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdUpper.Location = New System.Drawing.Point(2, 18) + Me.cmdUpper.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdUpper.Name = "cmdUpper" - Me.cmdUpper.Size = New System.Drawing.Size(90, 45) + Me.cmdUpper.Size = New System.Drawing.Size(75, 38) Me.cmdUpper.TabIndex = 140 Me.cmdUpper.Text = "upper" Me.cmdUpper.UseVisualStyleBackColor = True @@ -5716,10 +5547,10 @@ Partial Class ucrCalculator ' Me.cmdSort.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdSort.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdSort.Location = New System.Drawing.Point(180, 66) - Me.cmdSort.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdSort.Location = New System.Drawing.Point(150, 55) + Me.cmdSort.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdSort.Name = "cmdSort" - Me.cmdSort.Size = New System.Drawing.Size(90, 45) + Me.cmdSort.Size = New System.Drawing.Size(75, 38) Me.cmdSort.TabIndex = 139 Me.cmdSort.Text = "sort" Me.cmdSort.UseVisualStyleBackColor = True @@ -5728,10 +5559,10 @@ Partial Class ucrCalculator ' Me.cmdOrder.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdOrder.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdOrder.Location = New System.Drawing.Point(92, 66) - Me.cmdOrder.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdOrder.Location = New System.Drawing.Point(77, 55) + Me.cmdOrder.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdOrder.Name = "cmdOrder" - Me.cmdOrder.Size = New System.Drawing.Size(90, 45) + Me.cmdOrder.Size = New System.Drawing.Size(75, 38) Me.cmdOrder.TabIndex = 138 Me.cmdOrder.Text = "order" Me.cmdOrder.UseVisualStyleBackColor = True @@ -5740,10 +5571,10 @@ Partial Class ucrCalculator ' Me.cmdPad.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdPad.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdPad.Location = New System.Drawing.Point(3, 66) - Me.cmdPad.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdPad.Location = New System.Drawing.Point(2, 55) + Me.cmdPad.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdPad.Name = "cmdPad" - Me.cmdPad.Size = New System.Drawing.Size(90, 45) + Me.cmdPad.Size = New System.Drawing.Size(75, 38) Me.cmdPad.TabIndex = 137 Me.cmdPad.Text = "pad" Me.cmdPad.UseVisualStyleBackColor = True @@ -5752,10 +5583,10 @@ Partial Class ucrCalculator ' Me.cmdExtract.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdExtract.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdExtract.Location = New System.Drawing.Point(268, 110) - Me.cmdExtract.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdExtract.Location = New System.Drawing.Point(223, 92) + Me.cmdExtract.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdExtract.Name = "cmdExtract" - Me.cmdExtract.Size = New System.Drawing.Size(90, 45) + Me.cmdExtract.Size = New System.Drawing.Size(75, 38) Me.cmdExtract.TabIndex = 136 Me.cmdExtract.Text = "extract" Me.cmdExtract.UseVisualStyleBackColor = True @@ -5764,10 +5595,10 @@ Partial Class ucrCalculator ' Me.cmdCountstrings.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdCountstrings.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdCountstrings.Location = New System.Drawing.Point(3, 110) - Me.cmdCountstrings.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdCountstrings.Location = New System.Drawing.Point(2, 92) + Me.cmdCountstrings.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdCountstrings.Name = "cmdCountstrings" - Me.cmdCountstrings.Size = New System.Drawing.Size(90, 45) + Me.cmdCountstrings.Size = New System.Drawing.Size(75, 38) Me.cmdCountstrings.TabIndex = 134 Me.cmdCountstrings.Text = "count" Me.cmdCountstrings.UseVisualStyleBackColor = True @@ -5776,14 +5607,26 @@ Partial Class ucrCalculator ' Me.cmdLocate.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdLocate.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdLocate.Location = New System.Drawing.Point(3, 153) - Me.cmdLocate.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdLocate.Location = New System.Drawing.Point(2, 128) + Me.cmdLocate.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdLocate.Name = "cmdLocate" - Me.cmdLocate.Size = New System.Drawing.Size(90, 45) + Me.cmdLocate.Size = New System.Drawing.Size(75, 38) Me.cmdLocate.TabIndex = 133 Me.cmdLocate.Text = "locate" Me.cmdLocate.UseVisualStyleBackColor = True ' + 'cmdSquishb + ' + Me.cmdSquishb.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) + Me.cmdSquishb.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.cmdSquishb.Location = New System.Drawing.Point(298, 18) + Me.cmdSquishb.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdSquishb.Name = "cmdSquishb" + Me.cmdSquishb.Size = New System.Drawing.Size(75, 38) + Me.cmdSquishb.TabIndex = 150 + Me.cmdSquishb.Text = "squish " + Me.cmdSquishb.UseVisualStyleBackColor = True + ' 'ttCalculator ' Me.ttCalculator.AutoPopDelay = 10000 @@ -5794,7 +5637,7 @@ Partial Class ucrCalculator ' Me.grpCircular.Controls.Add(Me.cmdCircularHelp) Me.grpCircular.Controls.Add(Me.cmdCircular) - Me.grpCircular.Controls.Add(Me.cmdCircQuantile) + Me.grpCircular.Controls.Add(Me.cmdCircQuantiles) Me.grpCircular.Controls.Add(Me.cmdCircMax) Me.grpCircular.Controls.Add(Me.cmdA1) Me.grpCircular.Controls.Add(Me.cmdAngVar) @@ -5809,65 +5652,57 @@ Partial Class ucrCalculator Me.grpCircular.Controls.Add(Me.cmdMedianHL) Me.grpCircular.Controls.Add(Me.cmdCircMedian) Me.grpCircular.Controls.Add(Me.cmdCircMean) - Me.grpCircular.Location = New System.Drawing.Point(651, 92) + Me.grpCircular.Location = New System.Drawing.Point(542, 77) + Me.grpCircular.Margin = New System.Windows.Forms.Padding(2) Me.grpCircular.Name = "grpCircular" - Me.grpCircular.Size = New System.Drawing.Size(372, 252) + Me.grpCircular.Padding = New System.Windows.Forms.Padding(2) + Me.grpCircular.Size = New System.Drawing.Size(310, 217) Me.grpCircular.TabIndex = 192 Me.grpCircular.TabStop = False Me.grpCircular.Text = "Circular" ' - 'cmdCircularHelp - ' - Me.cmdCircularHelp.AutoSize = True - Me.cmdCircularHelp.ContextMenuStrip = Me.ContextMenuStripCircular - Me.cmdCircularHelp.Location = New System.Drawing.Point(261, 213) - Me.cmdCircularHelp.Margin = New System.Windows.Forms.Padding(4) - Me.cmdCircularHelp.Name = "cmdCircularHelp" - Me.cmdCircularHelp.Size = New System.Drawing.Size(129, 45) - Me.cmdCircularHelp.SplitMenuStrip = Me.ContextMenuStripCircular - Me.cmdCircularHelp.TabIndex = 212 - Me.cmdCircularHelp.Text = "R Help" - Me.cmdCircularHelp.UseVisualStyleBackColor = True - ' 'ContextMenuStripCircular ' Me.ContextMenuStripCircular.ImageScalingSize = New System.Drawing.Size(24, 24) Me.ContextMenuStripCircular.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.CircularToolStripMenuItem}) Me.ContextMenuStripCircular.Name = "ContextMenuStrip1" - Me.ContextMenuStripCircular.Size = New System.Drawing.Size(140, 36) + Me.ContextMenuStripCircular.Size = New System.Drawing.Size(127, 28) ' 'CircularToolStripMenuItem ' Me.CircularToolStripMenuItem.Name = "CircularToolStripMenuItem" - Me.CircularToolStripMenuItem.Size = New System.Drawing.Size(139, 32) + Me.CircularToolStripMenuItem.Size = New System.Drawing.Size(126, 24) Me.CircularToolStripMenuItem.Text = "circular" ' 'cmdCircular ' Me.cmdCircular.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdCircular.Location = New System.Drawing.Point(3, 27) + Me.cmdCircular.Location = New System.Drawing.Point(2, 22) + Me.cmdCircular.Margin = New System.Windows.Forms.Padding(2) Me.cmdCircular.Name = "cmdCircular" - Me.cmdCircular.Size = New System.Drawing.Size(90, 48) + Me.cmdCircular.Size = New System.Drawing.Size(75, 40) Me.cmdCircular.TabIndex = 15 Me.cmdCircular.Text = "circular" Me.cmdCircular.UseVisualStyleBackColor = True ' - 'cmdCircQuantile + 'cmdCircQuantiles ' - Me.cmdCircQuantile.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdCircQuantile.Location = New System.Drawing.Point(180, 120) - Me.cmdCircQuantile.Name = "cmdCircQuantile" - Me.cmdCircQuantile.Size = New System.Drawing.Size(90, 48) - Me.cmdCircQuantile.TabIndex = 13 - Me.cmdCircQuantile.Text = "quantile" - Me.cmdCircQuantile.UseVisualStyleBackColor = True + Me.cmdCircQuantiles.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.cmdCircQuantiles.Location = New System.Drawing.Point(150, 100) + Me.cmdCircQuantiles.Margin = New System.Windows.Forms.Padding(2) + Me.cmdCircQuantiles.Name = "cmdCircQuantiles" + Me.cmdCircQuantiles.Size = New System.Drawing.Size(75, 40) + Me.cmdCircQuantiles.TabIndex = 13 + Me.cmdCircQuantiles.Text = "quantiles" + Me.cmdCircQuantiles.UseVisualStyleBackColor = True ' 'cmdCircMax ' Me.cmdCircMax.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdCircMax.Location = New System.Drawing.Point(268, 166) + Me.cmdCircMax.Location = New System.Drawing.Point(223, 138) + Me.cmdCircMax.Margin = New System.Windows.Forms.Padding(2) Me.cmdCircMax.Name = "cmdCircMax" - Me.cmdCircMax.Size = New System.Drawing.Size(98, 48) + Me.cmdCircMax.Size = New System.Drawing.Size(82, 40) Me.cmdCircMax.TabIndex = 10 Me.cmdCircMax.Text = "max" Me.cmdCircMax.UseVisualStyleBackColor = True @@ -5875,9 +5710,10 @@ Partial Class ucrCalculator 'cmdA1 ' Me.cmdA1.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdA1.Location = New System.Drawing.Point(3, 120) + Me.cmdA1.Location = New System.Drawing.Point(2, 100) + Me.cmdA1.Margin = New System.Windows.Forms.Padding(2) Me.cmdA1.Name = "cmdA1" - Me.cmdA1.Size = New System.Drawing.Size(90, 48) + Me.cmdA1.Size = New System.Drawing.Size(75, 40) Me.cmdA1.TabIndex = 8 Me.cmdA1.Text = "A1" Me.cmdA1.UseVisualStyleBackColor = True @@ -5885,9 +5721,10 @@ Partial Class ucrCalculator 'cmdAngVar ' Me.cmdAngVar.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdAngVar.Location = New System.Drawing.Point(92, 120) + Me.cmdAngVar.Location = New System.Drawing.Point(77, 100) + Me.cmdAngVar.Margin = New System.Windows.Forms.Padding(2) Me.cmdAngVar.Name = "cmdAngVar" - Me.cmdAngVar.Size = New System.Drawing.Size(90, 48) + Me.cmdAngVar.Size = New System.Drawing.Size(75, 40) Me.cmdAngVar.TabIndex = 6 Me.cmdAngVar.Text = "ang.var" Me.cmdAngVar.UseVisualStyleBackColor = True @@ -5895,9 +5732,10 @@ Partial Class ucrCalculator 'cmdCircRho ' Me.cmdCircRho.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdCircRho.Location = New System.Drawing.Point(268, 120) + Me.cmdCircRho.Location = New System.Drawing.Point(223, 100) + Me.cmdCircRho.Margin = New System.Windows.Forms.Padding(2) Me.cmdCircRho.Name = "cmdCircRho" - Me.cmdCircRho.Size = New System.Drawing.Size(98, 48) + Me.cmdCircRho.Size = New System.Drawing.Size(82, 40) Me.cmdCircRho.TabIndex = 14 Me.cmdCircRho.Text = "rho" Me.cmdCircRho.UseVisualStyleBackColor = True @@ -5905,9 +5743,10 @@ Partial Class ucrCalculator 'cmdCircQ3 ' Me.cmdCircQ3.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdCircQ3.Location = New System.Drawing.Point(180, 166) + Me.cmdCircQ3.Location = New System.Drawing.Point(150, 138) + Me.cmdCircQ3.Margin = New System.Windows.Forms.Padding(2) Me.cmdCircQ3.Name = "cmdCircQ3" - Me.cmdCircQ3.Size = New System.Drawing.Size(90, 48) + Me.cmdCircQ3.Size = New System.Drawing.Size(75, 40) Me.cmdCircQ3.TabIndex = 12 Me.cmdCircQ3.Text = "q3" Me.cmdCircQ3.UseVisualStyleBackColor = True @@ -5915,9 +5754,10 @@ Partial Class ucrCalculator 'cmdCircQ1 ' Me.cmdCircQ1.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdCircQ1.Location = New System.Drawing.Point(92, 166) + Me.cmdCircQ1.Location = New System.Drawing.Point(77, 138) + Me.cmdCircQ1.Margin = New System.Windows.Forms.Padding(2) Me.cmdCircQ1.Name = "cmdCircQ1" - Me.cmdCircQ1.Size = New System.Drawing.Size(90, 48) + Me.cmdCircQ1.Size = New System.Drawing.Size(75, 40) Me.cmdCircQ1.TabIndex = 11 Me.cmdCircQ1.Text = "q1" Me.cmdCircQ1.UseVisualStyleBackColor = True @@ -5925,9 +5765,10 @@ Partial Class ucrCalculator 'cmdCircMin ' Me.cmdCircMin.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdCircMin.Location = New System.Drawing.Point(3, 166) + Me.cmdCircMin.Location = New System.Drawing.Point(2, 138) + Me.cmdCircMin.Margin = New System.Windows.Forms.Padding(2) Me.cmdCircMin.Name = "cmdCircMin" - Me.cmdCircMin.Size = New System.Drawing.Size(90, 48) + Me.cmdCircMin.Size = New System.Drawing.Size(75, 40) Me.cmdCircMin.TabIndex = 9 Me.cmdCircMin.Text = "min" Me.cmdCircMin.UseVisualStyleBackColor = True @@ -5935,9 +5776,10 @@ Partial Class ucrCalculator 'cmdAngDev ' Me.cmdAngDev.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdAngDev.Location = New System.Drawing.Point(180, 74) + Me.cmdAngDev.Location = New System.Drawing.Point(150, 62) + Me.cmdAngDev.Margin = New System.Windows.Forms.Padding(2) Me.cmdAngDev.Name = "cmdAngDev" - Me.cmdAngDev.Size = New System.Drawing.Size(90, 48) + Me.cmdAngDev.Size = New System.Drawing.Size(75, 40) Me.cmdAngDev.TabIndex = 7 Me.cmdAngDev.Text = "ang.dev" Me.cmdAngDev.UseVisualStyleBackColor = True @@ -5945,9 +5787,10 @@ Partial Class ucrCalculator 'cmdCircVar ' Me.cmdCircVar.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdCircVar.Location = New System.Drawing.Point(268, 74) + Me.cmdCircVar.Location = New System.Drawing.Point(223, 62) + Me.cmdCircVar.Margin = New System.Windows.Forms.Padding(2) Me.cmdCircVar.Name = "cmdCircVar" - Me.cmdCircVar.Size = New System.Drawing.Size(98, 48) + Me.cmdCircVar.Size = New System.Drawing.Size(82, 40) Me.cmdCircVar.TabIndex = 5 Me.cmdCircVar.Text = "var" Me.cmdCircVar.UseVisualStyleBackColor = True @@ -5955,9 +5798,10 @@ Partial Class ucrCalculator 'cmdCircSd ' Me.cmdCircSd.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdCircSd.Location = New System.Drawing.Point(92, 74) + Me.cmdCircSd.Location = New System.Drawing.Point(77, 62) + Me.cmdCircSd.Margin = New System.Windows.Forms.Padding(2) Me.cmdCircSd.Name = "cmdCircSd" - Me.cmdCircSd.Size = New System.Drawing.Size(90, 48) + Me.cmdCircSd.Size = New System.Drawing.Size(75, 40) Me.cmdCircSd.TabIndex = 4 Me.cmdCircSd.Text = "sd" Me.cmdCircSd.UseVisualStyleBackColor = True @@ -5965,9 +5809,10 @@ Partial Class ucrCalculator 'cmdCircRange ' Me.cmdCircRange.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdCircRange.Location = New System.Drawing.Point(3, 74) + Me.cmdCircRange.Location = New System.Drawing.Point(2, 62) + Me.cmdCircRange.Margin = New System.Windows.Forms.Padding(2) Me.cmdCircRange.Name = "cmdCircRange" - Me.cmdCircRange.Size = New System.Drawing.Size(90, 48) + Me.cmdCircRange.Size = New System.Drawing.Size(75, 40) Me.cmdCircRange.TabIndex = 3 Me.cmdCircRange.Text = "range" Me.cmdCircRange.UseVisualStyleBackColor = True @@ -5975,9 +5820,10 @@ Partial Class ucrCalculator 'cmdMedianHL ' Me.cmdMedianHL.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdMedianHL.Location = New System.Drawing.Point(268, 27) + Me.cmdMedianHL.Location = New System.Drawing.Point(223, 22) + Me.cmdMedianHL.Margin = New System.Windows.Forms.Padding(2) Me.cmdMedianHL.Name = "cmdMedianHL" - Me.cmdMedianHL.Size = New System.Drawing.Size(98, 48) + Me.cmdMedianHL.Size = New System.Drawing.Size(82, 40) Me.cmdMedianHL.TabIndex = 2 Me.cmdMedianHL.Text = "medianHL" Me.cmdMedianHL.UseVisualStyleBackColor = True @@ -5985,9 +5831,10 @@ Partial Class ucrCalculator 'cmdCircMedian ' Me.cmdCircMedian.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdCircMedian.Location = New System.Drawing.Point(180, 27) + Me.cmdCircMedian.Location = New System.Drawing.Point(150, 22) + Me.cmdCircMedian.Margin = New System.Windows.Forms.Padding(2) Me.cmdCircMedian.Name = "cmdCircMedian" - Me.cmdCircMedian.Size = New System.Drawing.Size(90, 48) + Me.cmdCircMedian.Size = New System.Drawing.Size(75, 40) Me.cmdCircMedian.TabIndex = 1 Me.cmdCircMedian.Text = "median" Me.cmdCircMedian.UseVisualStyleBackColor = True @@ -5995,9 +5842,10 @@ Partial Class ucrCalculator 'cmdCircMean ' Me.cmdCircMean.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdCircMean.Location = New System.Drawing.Point(92, 27) + Me.cmdCircMean.Location = New System.Drawing.Point(77, 22) + Me.cmdCircMean.Margin = New System.Windows.Forms.Padding(2) Me.cmdCircMean.Name = "cmdCircMean" - Me.cmdCircMean.Size = New System.Drawing.Size(90, 48) + Me.cmdCircMean.Size = New System.Drawing.Size(75, 40) Me.cmdCircMean.TabIndex = 0 Me.cmdCircMean.Text = "mean" Me.cmdCircMean.UseVisualStyleBackColor = True @@ -6008,9 +5856,11 @@ Partial Class ucrCalculator Me.grpModifier.Controls.Add(Me.cmdFixed) Me.grpModifier.Controls.Add(Me.cmdCollate) Me.grpModifier.Controls.Add(Me.cmdBoundary) - Me.grpModifier.Location = New System.Drawing.Point(651, 344) + Me.grpModifier.Location = New System.Drawing.Point(542, 287) + Me.grpModifier.Margin = New System.Windows.Forms.Padding(2) Me.grpModifier.Name = "grpModifier" - Me.grpModifier.Size = New System.Drawing.Size(384, 80) + Me.grpModifier.Padding = New System.Windows.Forms.Padding(2) + Me.grpModifier.Size = New System.Drawing.Size(320, 67) Me.grpModifier.TabIndex = 192 Me.grpModifier.TabStop = False Me.grpModifier.Text = "Modifier" @@ -6018,9 +5868,10 @@ Partial Class ucrCalculator 'cmdRegex ' Me.cmdRegex.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdRegex.Location = New System.Drawing.Point(282, 20) + Me.cmdRegex.Location = New System.Drawing.Point(235, 17) + Me.cmdRegex.Margin = New System.Windows.Forms.Padding(2) Me.cmdRegex.Name = "cmdRegex" - Me.cmdRegex.Size = New System.Drawing.Size(94, 45) + Me.cmdRegex.Size = New System.Drawing.Size(78, 38) Me.cmdRegex.TabIndex = 3 Me.cmdRegex.Text = "regex" Me.cmdRegex.UseVisualStyleBackColor = True @@ -6028,9 +5879,10 @@ Partial Class ucrCalculator 'cmdFixed ' Me.cmdFixed.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdFixed.Location = New System.Drawing.Point(189, 20) + Me.cmdFixed.Location = New System.Drawing.Point(158, 17) + Me.cmdFixed.Margin = New System.Windows.Forms.Padding(2) Me.cmdFixed.Name = "cmdFixed" - Me.cmdFixed.Size = New System.Drawing.Size(94, 45) + Me.cmdFixed.Size = New System.Drawing.Size(78, 38) Me.cmdFixed.TabIndex = 2 Me.cmdFixed.Text = "fixed" Me.cmdFixed.UseVisualStyleBackColor = True @@ -6038,9 +5890,10 @@ Partial Class ucrCalculator 'cmdCollate ' Me.cmdCollate.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdCollate.Location = New System.Drawing.Point(96, 20) + Me.cmdCollate.Location = New System.Drawing.Point(80, 17) + Me.cmdCollate.Margin = New System.Windows.Forms.Padding(2) Me.cmdCollate.Name = "cmdCollate" - Me.cmdCollate.Size = New System.Drawing.Size(94, 45) + Me.cmdCollate.Size = New System.Drawing.Size(78, 38) Me.cmdCollate.TabIndex = 1 Me.cmdCollate.Text = "collate" Me.cmdCollate.UseVisualStyleBackColor = True @@ -6048,9 +5901,10 @@ Partial Class ucrCalculator 'cmdBoundary ' Me.cmdBoundary.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdBoundary.Location = New System.Drawing.Point(3, 20) + Me.cmdBoundary.Location = New System.Drawing.Point(2, 17) + Me.cmdBoundary.Margin = New System.Windows.Forms.Padding(2) Me.cmdBoundary.Name = "cmdBoundary" - Me.cmdBoundary.Size = New System.Drawing.Size(94, 45) + Me.cmdBoundary.Size = New System.Drawing.Size(78, 38) Me.cmdBoundary.TabIndex = 0 Me.cmdBoundary.Text = "boundary" Me.cmdBoundary.UseVisualStyleBackColor = True @@ -6072,9 +5926,11 @@ Partial Class ucrCalculator Me.grpSymbols.Controls.Add(Me.cmdEnd1) Me.grpSymbols.Controls.Add(Me.cmdbegin) Me.grpSymbols.Controls.Add(Me.cmdAny1) - Me.grpSymbols.Location = New System.Drawing.Point(650, 426) + Me.grpSymbols.Location = New System.Drawing.Point(542, 355) + Me.grpSymbols.Margin = New System.Windows.Forms.Padding(2) Me.grpSymbols.Name = "grpSymbols" - Me.grpSymbols.Size = New System.Drawing.Size(474, 168) + Me.grpSymbols.Padding = New System.Windows.Forms.Padding(2) + Me.grpSymbols.Size = New System.Drawing.Size(395, 140) Me.grpSymbols.TabIndex = 193 Me.grpSymbols.TabStop = False Me.grpSymbols.Text = "Symbols" @@ -6082,9 +5938,10 @@ Partial Class ucrCalculator 'cmdOr3 ' Me.cmdOr3.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdOr3.Location = New System.Drawing.Point(190, 69) + Me.cmdOr3.Location = New System.Drawing.Point(158, 58) + Me.cmdOr3.Margin = New System.Windows.Forms.Padding(2) Me.cmdOr3.Name = "cmdOr3" - Me.cmdOr3.Size = New System.Drawing.Size(94, 45) + Me.cmdOr3.Size = New System.Drawing.Size(78, 38) Me.cmdOr3.TabIndex = 16 Me.cmdOr3.Text = "| or" Me.cmdOr3.UseVisualStyleBackColor = True @@ -6092,9 +5949,10 @@ Partial Class ucrCalculator 'cmdEscape ' Me.cmdEscape.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdEscape.Location = New System.Drawing.Point(284, 112) + Me.cmdEscape.Location = New System.Drawing.Point(237, 93) + Me.cmdEscape.Margin = New System.Windows.Forms.Padding(2) Me.cmdEscape.Name = "cmdEscape" - Me.cmdEscape.Size = New System.Drawing.Size(94, 45) + Me.cmdEscape.Size = New System.Drawing.Size(78, 38) Me.cmdEscape.TabIndex = 14 Me.cmdEscape.Text = "\\ escape" Me.cmdEscape.UseVisualStyleBackColor = True @@ -6102,9 +5960,10 @@ Partial Class ucrCalculator 'cmdPlusZero ' Me.cmdPlusZero.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdPlusZero.Location = New System.Drawing.Point(376, 112) + Me.cmdPlusZero.Location = New System.Drawing.Point(313, 93) + Me.cmdPlusZero.Margin = New System.Windows.Forms.Padding(2) Me.cmdPlusZero.Name = "cmdPlusZero" - Me.cmdPlusZero.Size = New System.Drawing.Size(94, 45) + Me.cmdPlusZero.Size = New System.Drawing.Size(78, 38) Me.cmdPlusZero.TabIndex = 15 Me.cmdPlusZero.Text = "- to" Me.cmdPlusZero.UseVisualStyleBackColor = True @@ -6112,9 +5971,10 @@ Partial Class ucrCalculator 'cmdZero ' Me.cmdZero.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdZero.Location = New System.Drawing.Point(190, 112) + Me.cmdZero.Location = New System.Drawing.Point(158, 93) + Me.cmdZero.Margin = New System.Windows.Forms.Padding(2) Me.cmdZero.Name = "cmdZero" - Me.cmdZero.Size = New System.Drawing.Size(94, 45) + Me.cmdZero.Size = New System.Drawing.Size(78, 38) Me.cmdZero.TabIndex = 13 Me.cmdZero.Text = "* 0+" Me.cmdZero.UseVisualStyleBackColor = True @@ -6122,9 +5982,10 @@ Partial Class ucrCalculator 'cmdPlusOne ' Me.cmdPlusOne.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdPlusOne.Location = New System.Drawing.Point(96, 112) + Me.cmdPlusOne.Location = New System.Drawing.Point(80, 93) + Me.cmdPlusOne.Margin = New System.Windows.Forms.Padding(2) Me.cmdPlusOne.Name = "cmdPlusOne" - Me.cmdPlusOne.Size = New System.Drawing.Size(94, 45) + Me.cmdPlusOne.Size = New System.Drawing.Size(78, 38) Me.cmdPlusOne.TabIndex = 12 Me.cmdPlusOne.Text = "+ 1+" Me.cmdPlusOne.UseVisualStyleBackColor = True @@ -6132,9 +5993,10 @@ Partial Class ucrCalculator 'cmdZeroOrOne ' Me.cmdZeroOrOne.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdZeroOrOne.Location = New System.Drawing.Point(3, 112) + Me.cmdZeroOrOne.Location = New System.Drawing.Point(2, 93) + Me.cmdZeroOrOne.Margin = New System.Windows.Forms.Padding(2) Me.cmdZeroOrOne.Name = "cmdZeroOrOne" - Me.cmdZeroOrOne.Size = New System.Drawing.Size(94, 45) + Me.cmdZeroOrOne.Size = New System.Drawing.Size(78, 38) Me.cmdZeroOrOne.TabIndex = 11 Me.cmdZeroOrOne.Text = "? 0 or 1" Me.cmdZeroOrOne.UseVisualStyleBackColor = True @@ -6142,9 +6004,10 @@ Partial Class ucrCalculator 'cmdNumbers ' Me.cmdNumbers.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdNumbers.Location = New System.Drawing.Point(376, 69) + Me.cmdNumbers.Location = New System.Drawing.Point(313, 58) + Me.cmdNumbers.Margin = New System.Windows.Forms.Padding(2) Me.cmdNumbers.Name = "cmdNumbers" - Me.cmdNumbers.Size = New System.Drawing.Size(94, 45) + Me.cmdNumbers.Size = New System.Drawing.Size(78, 38) Me.cmdNumbers.TabIndex = 10 Me.cmdNumbers.Text = "{ m,n } " Me.cmdNumbers.UseVisualStyleBackColor = True @@ -6152,9 +6015,10 @@ Partial Class ucrCalculator 'cmdNot1 ' Me.cmdNot1.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdNot1.Location = New System.Drawing.Point(96, 69) + Me.cmdNot1.Location = New System.Drawing.Point(80, 58) + Me.cmdNot1.Margin = New System.Windows.Forms.Padding(2) Me.cmdNot1.Name = "cmdNot1" - Me.cmdNot1.Size = New System.Drawing.Size(94, 45) + Me.cmdNot1.Size = New System.Drawing.Size(78, 38) Me.cmdNot1.TabIndex = 8 Me.cmdNot1.Text = "[^ ] not" Me.cmdNot1.UseVisualStyleBackColor = True @@ -6162,9 +6026,10 @@ Partial Class ucrCalculator 'cmdOr2 ' Me.cmdOr2.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdOr2.Location = New System.Drawing.Point(284, 69) + Me.cmdOr2.Location = New System.Drawing.Point(237, 58) + Me.cmdOr2.Margin = New System.Windows.Forms.Padding(2) Me.cmdOr2.Name = "cmdOr2" - Me.cmdOr2.Size = New System.Drawing.Size(94, 45) + Me.cmdOr2.Size = New System.Drawing.Size(78, 38) Me.cmdOr2.TabIndex = 9 Me.cmdOr2.Text = "{ n} " Me.cmdOr2.UseVisualStyleBackColor = True @@ -6172,9 +6037,10 @@ Partial Class ucrCalculator 'cmdOr1 ' Me.cmdOr1.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdOr1.Location = New System.Drawing.Point(3, 69) + Me.cmdOr1.Location = New System.Drawing.Point(2, 58) + Me.cmdOr1.Margin = New System.Windows.Forms.Padding(2) Me.cmdOr1.Name = "cmdOr1" - Me.cmdOr1.Size = New System.Drawing.Size(94, 45) + Me.cmdOr1.Size = New System.Drawing.Size(78, 38) Me.cmdOr1.TabIndex = 7 Me.cmdOr1.Text = "[ ] or" Me.cmdOr1.UseVisualStyleBackColor = True @@ -6182,9 +6048,10 @@ Partial Class ucrCalculator 'cmdSpace ' Me.cmdSpace.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdSpace.Location = New System.Drawing.Point(376, 24) + Me.cmdSpace.Location = New System.Drawing.Point(313, 20) + Me.cmdSpace.Margin = New System.Windows.Forms.Padding(2) Me.cmdSpace.Name = "cmdSpace" - Me.cmdSpace.Size = New System.Drawing.Size(94, 45) + Me.cmdSpace.Size = New System.Drawing.Size(78, 38) Me.cmdSpace.TabIndex = 6 Me.cmdSpace.Text = "\\s space" Me.cmdSpace.UseVisualStyleBackColor = True @@ -6192,9 +6059,10 @@ Partial Class ucrCalculator 'cmdDigit ' Me.cmdDigit.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdDigit.Location = New System.Drawing.Point(284, 24) + Me.cmdDigit.Location = New System.Drawing.Point(237, 20) + Me.cmdDigit.Margin = New System.Windows.Forms.Padding(2) Me.cmdDigit.Name = "cmdDigit" - Me.cmdDigit.Size = New System.Drawing.Size(94, 45) + Me.cmdDigit.Size = New System.Drawing.Size(78, 38) Me.cmdDigit.TabIndex = 5 Me.cmdDigit.Text = "\\d digit" Me.cmdDigit.UseVisualStyleBackColor = True @@ -6202,9 +6070,10 @@ Partial Class ucrCalculator 'cmdEnd1 ' Me.cmdEnd1.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdEnd1.Location = New System.Drawing.Point(190, 24) + Me.cmdEnd1.Location = New System.Drawing.Point(158, 20) + Me.cmdEnd1.Margin = New System.Windows.Forms.Padding(2) Me.cmdEnd1.Name = "cmdEnd1" - Me.cmdEnd1.Size = New System.Drawing.Size(94, 45) + Me.cmdEnd1.Size = New System.Drawing.Size(78, 38) Me.cmdEnd1.TabIndex = 4 Me.cmdEnd1.Text = "$ end" Me.cmdEnd1.UseVisualStyleBackColor = True @@ -6212,9 +6081,10 @@ Partial Class ucrCalculator 'cmdbegin ' Me.cmdbegin.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdbegin.Location = New System.Drawing.Point(96, 24) + Me.cmdbegin.Location = New System.Drawing.Point(80, 20) + Me.cmdbegin.Margin = New System.Windows.Forms.Padding(2) Me.cmdbegin.Name = "cmdbegin" - Me.cmdbegin.Size = New System.Drawing.Size(94, 45) + Me.cmdbegin.Size = New System.Drawing.Size(78, 38) Me.cmdbegin.TabIndex = 3 Me.cmdbegin.Text = "^ begin" Me.cmdbegin.UseVisualStyleBackColor = True @@ -6222,15 +6092,18 @@ Partial Class ucrCalculator 'cmdAny1 ' Me.cmdAny1.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdAny1.Location = New System.Drawing.Point(3, 24) + Me.cmdAny1.Location = New System.Drawing.Point(2, 20) + Me.cmdAny1.Margin = New System.Windows.Forms.Padding(2) Me.cmdAny1.Name = "cmdAny1" - Me.cmdAny1.Size = New System.Drawing.Size(94, 45) + Me.cmdAny1.Size = New System.Drawing.Size(78, 38) Me.cmdAny1.TabIndex = 2 Me.cmdAny1.Text = ". any" Me.cmdAny1.UseVisualStyleBackColor = True ' 'grpComplex ' + Me.grpComplex.Controls.Add(Me.cmdAsComplex) + Me.grpComplex.Controls.Add(Me.cmdComplexi) Me.grpComplex.Controls.Add(Me.cmdComplexRHelp) Me.grpComplex.Controls.Add(Me.cmdComplexTanH) Me.grpComplex.Controls.Add(Me.cmdComplexTan) @@ -6251,37 +6124,46 @@ Partial Class ucrCalculator Me.grpComplex.Controls.Add(Me.cmdMod) Me.grpComplex.Controls.Add(Me.cmdImaginary) Me.grpComplex.Controls.Add(Me.cmdReal) - Me.grpComplex.Controls.Add(Me.cmdAsComplex) - Me.grpComplex.Location = New System.Drawing.Point(651, 104) - Me.grpComplex.Margin = New System.Windows.Forms.Padding(4) + Me.grpComplex.Controls.Add(Me.cmdComplex) + Me.grpComplex.Location = New System.Drawing.Point(542, 87) Me.grpComplex.Name = "grpComplex" - Me.grpComplex.Padding = New System.Windows.Forms.Padding(4) - Me.grpComplex.Size = New System.Drawing.Size(432, 339) + Me.grpComplex.Size = New System.Drawing.Size(360, 282) Me.grpComplex.TabIndex = 198 Me.grpComplex.TabStop = False Me.grpComplex.Text = "Complex" ' - 'cmdComplexRHelp + 'cmdAsComplex ' - Me.cmdComplexRHelp.AutoSize = True - Me.cmdComplexRHelp.ContextMenuStrip = Me.ContextMenuStripComplex - Me.cmdComplexRHelp.Location = New System.Drawing.Point(274, 254) - Me.cmdComplexRHelp.Margin = New System.Windows.Forms.Padding(4) - Me.cmdComplexRHelp.Name = "cmdComplexRHelp" - Me.cmdComplexRHelp.Size = New System.Drawing.Size(136, 45) - Me.cmdComplexRHelp.SplitMenuStrip = Me.ContextMenuStripComplex - Me.cmdComplexRHelp.TabIndex = 209 - Me.cmdComplexRHelp.Text = "R Help" - Me.cmdComplexRHelp.UseVisualStyleBackColor = True + Me.cmdAsComplex.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) + Me.cmdAsComplex.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.cmdAsComplex.Location = New System.Drawing.Point(111, 22) + Me.cmdAsComplex.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdAsComplex.Name = "cmdAsComplex" + Me.cmdAsComplex.Size = New System.Drawing.Size(88, 38) + Me.cmdAsComplex.TabIndex = 211 + Me.cmdAsComplex.Text = "as.complex" + Me.cmdAsComplex.UseVisualStyleBackColor = True + ' + 'cmdComplexi + ' + Me.cmdComplexi.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) + Me.cmdComplexi.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.cmdComplexi.Location = New System.Drawing.Point(111, 202) + Me.cmdComplexi.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdComplexi.Name = "cmdComplexi" + Me.cmdComplexi.Size = New System.Drawing.Size(88, 38) + Me.cmdComplexi.TabIndex = 210 + Me.cmdComplexi.Text = "i" + Me.cmdComplexi.UseVisualStyleBackColor = True ' 'cmdComplexTanH ' Me.cmdComplexTanH.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdComplexTanH.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdComplexTanH.Location = New System.Drawing.Point(318, 156) - Me.cmdComplexTanH.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdComplexTanH.Location = New System.Drawing.Point(198, 128) + Me.cmdComplexTanH.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdComplexTanH.Name = "cmdComplexTanH" - Me.cmdComplexTanH.Size = New System.Drawing.Size(87, 45) + Me.cmdComplexTanH.Size = New System.Drawing.Size(82, 38) Me.cmdComplexTanH.TabIndex = 208 Me.cmdComplexTanH.Text = "tanh" Me.cmdComplexTanH.UseVisualStyleBackColor = True @@ -6290,10 +6172,10 @@ Partial Class ucrCalculator ' Me.cmdComplexTan.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdComplexTan.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdComplexTan.Location = New System.Drawing.Point(318, 112) - Me.cmdComplexTan.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdComplexTan.Location = New System.Drawing.Point(198, 92) + Me.cmdComplexTan.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdComplexTan.Name = "cmdComplexTan" - Me.cmdComplexTan.Size = New System.Drawing.Size(87, 45) + Me.cmdComplexTan.Size = New System.Drawing.Size(82, 38) Me.cmdComplexTan.TabIndex = 207 Me.cmdComplexTan.Text = "tan" Me.cmdComplexTan.UseVisualStyleBackColor = True @@ -6302,10 +6184,10 @@ Partial Class ucrCalculator ' Me.cmdComplexPi.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdComplexPi.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdComplexPi.Location = New System.Drawing.Point(318, 200) - Me.cmdComplexPi.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdComplexPi.Location = New System.Drawing.Point(31, 202) + Me.cmdComplexPi.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdComplexPi.Name = "cmdComplexPi" - Me.cmdComplexPi.Size = New System.Drawing.Size(87, 45) + Me.cmdComplexPi.Size = New System.Drawing.Size(81, 38) Me.cmdComplexPi.TabIndex = 206 Me.cmdComplexPi.Text = "pi" Me.cmdComplexPi.UseVisualStyleBackColor = True @@ -6314,10 +6196,10 @@ Partial Class ucrCalculator ' Me.cmdComplexDeg.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdComplexDeg.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdComplexDeg.Location = New System.Drawing.Point(318, 69) - Me.cmdComplexDeg.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdComplexDeg.Location = New System.Drawing.Point(279, 92) + Me.cmdComplexDeg.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdComplexDeg.Name = "cmdComplexDeg" - Me.cmdComplexDeg.Size = New System.Drawing.Size(87, 45) + Me.cmdComplexDeg.Size = New System.Drawing.Size(79, 38) Me.cmdComplexDeg.TabIndex = 205 Me.cmdComplexDeg.Text = "deg" Me.cmdComplexDeg.UseVisualStyleBackColor = True @@ -6326,10 +6208,10 @@ Partial Class ucrCalculator ' Me.cmdComplexRad.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdComplexRad.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdComplexRad.Location = New System.Drawing.Point(318, 26) - Me.cmdComplexRad.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdComplexRad.Location = New System.Drawing.Point(279, 58) + Me.cmdComplexRad.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdComplexRad.Name = "cmdComplexRad" - Me.cmdComplexRad.Size = New System.Drawing.Size(87, 45) + Me.cmdComplexRad.Size = New System.Drawing.Size(79, 38) Me.cmdComplexRad.TabIndex = 204 Me.cmdComplexRad.Text = "rad" Me.cmdComplexRad.UseVisualStyleBackColor = True @@ -6338,10 +6220,10 @@ Partial Class ucrCalculator ' Me.cmdComplexSignif.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdComplexSignif.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdComplexSignif.Location = New System.Drawing.Point(220, 200) - Me.cmdComplexSignif.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdComplexSignif.Location = New System.Drawing.Point(198, 165) + Me.cmdComplexSignif.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdComplexSignif.Name = "cmdComplexSignif" - Me.cmdComplexSignif.Size = New System.Drawing.Size(98, 45) + Me.cmdComplexSignif.Size = New System.Drawing.Size(82, 38) Me.cmdComplexSignif.TabIndex = 203 Me.cmdComplexSignif.Text = "signif" Me.cmdComplexSignif.UseVisualStyleBackColor = True @@ -6350,10 +6232,10 @@ Partial Class ucrCalculator ' Me.cmdComplexCosH.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdComplexCosH.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdComplexCosH.Location = New System.Drawing.Point(220, 156) - Me.cmdComplexCosH.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdComplexCosH.Location = New System.Drawing.Point(111, 128) + Me.cmdComplexCosH.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdComplexCosH.Name = "cmdComplexCosH" - Me.cmdComplexCosH.Size = New System.Drawing.Size(98, 45) + Me.cmdComplexCosH.Size = New System.Drawing.Size(88, 38) Me.cmdComplexCosH.TabIndex = 202 Me.cmdComplexCosH.Text = "cosh" Me.cmdComplexCosH.UseVisualStyleBackColor = True @@ -6362,10 +6244,10 @@ Partial Class ucrCalculator ' Me.cmdComplexSinH.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdComplexSinH.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdComplexSinH.Location = New System.Drawing.Point(134, 156) - Me.cmdComplexSinH.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdComplexSinH.Location = New System.Drawing.Point(30, 128) + Me.cmdComplexSinH.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdComplexSinH.Name = "cmdComplexSinH" - Me.cmdComplexSinH.Size = New System.Drawing.Size(87, 45) + Me.cmdComplexSinH.Size = New System.Drawing.Size(82, 38) Me.cmdComplexSinH.TabIndex = 201 Me.cmdComplexSinH.Text = "sinh" Me.cmdComplexSinH.UseVisualStyleBackColor = True @@ -6374,10 +6256,10 @@ Partial Class ucrCalculator ' Me.cmdComplexCos.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdComplexCos.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdComplexCos.Location = New System.Drawing.Point(220, 112) - Me.cmdComplexCos.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdComplexCos.Location = New System.Drawing.Point(111, 92) + Me.cmdComplexCos.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdComplexCos.Name = "cmdComplexCos" - Me.cmdComplexCos.Size = New System.Drawing.Size(98, 45) + Me.cmdComplexCos.Size = New System.Drawing.Size(88, 38) Me.cmdComplexCos.TabIndex = 200 Me.cmdComplexCos.Text = "cos" Me.cmdComplexCos.UseVisualStyleBackColor = True @@ -6386,10 +6268,10 @@ Partial Class ucrCalculator ' Me.cmdComplexSin.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdComplexSin.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdComplexSin.Location = New System.Drawing.Point(134, 112) - Me.cmdComplexSin.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdComplexSin.Location = New System.Drawing.Point(30, 92) + Me.cmdComplexSin.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdComplexSin.Name = "cmdComplexSin" - Me.cmdComplexSin.Size = New System.Drawing.Size(87, 45) + Me.cmdComplexSin.Size = New System.Drawing.Size(82, 38) Me.cmdComplexSin.TabIndex = 199 Me.cmdComplexSin.Text = "sin" Me.cmdComplexSin.UseVisualStyleBackColor = True @@ -6398,10 +6280,10 @@ Partial Class ucrCalculator ' Me.cmdComplexExp.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdComplexExp.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdComplexExp.Location = New System.Drawing.Point(36, 112) - Me.cmdComplexExp.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdComplexExp.Location = New System.Drawing.Point(279, 128) + Me.cmdComplexExp.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdComplexExp.Name = "cmdComplexExp" - Me.cmdComplexExp.Size = New System.Drawing.Size(98, 45) + Me.cmdComplexExp.Size = New System.Drawing.Size(79, 38) Me.cmdComplexExp.TabIndex = 192 Me.cmdComplexExp.Text = "exp" Me.cmdComplexExp.UseVisualStyleBackColor = True @@ -6410,10 +6292,10 @@ Partial Class ucrCalculator ' Me.cmdComplexRound.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdComplexRound.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdComplexRound.Location = New System.Drawing.Point(134, 200) - Me.cmdComplexRound.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdComplexRound.Location = New System.Drawing.Point(111, 165) + Me.cmdComplexRound.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdComplexRound.Name = "cmdComplexRound" - Me.cmdComplexRound.Size = New System.Drawing.Size(87, 45) + Me.cmdComplexRound.Size = New System.Drawing.Size(88, 38) Me.cmdComplexRound.TabIndex = 191 Me.cmdComplexRound.Text = "round" Me.cmdComplexRound.UseVisualStyleBackColor = True @@ -6422,10 +6304,10 @@ Partial Class ucrCalculator ' Me.cmdComplexLog.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdComplexLog.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdComplexLog.Location = New System.Drawing.Point(36, 156) - Me.cmdComplexLog.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdComplexLog.Location = New System.Drawing.Point(279, 165) + Me.cmdComplexLog.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdComplexLog.Name = "cmdComplexLog" - Me.cmdComplexLog.Size = New System.Drawing.Size(98, 45) + Me.cmdComplexLog.Size = New System.Drawing.Size(79, 38) Me.cmdComplexLog.TabIndex = 190 Me.cmdComplexLog.Text = "log" Me.cmdComplexLog.UseVisualStyleBackColor = True @@ -6434,10 +6316,10 @@ Partial Class ucrCalculator ' Me.cmdComplexSqrt.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdComplexSqrt.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdComplexSqrt.Location = New System.Drawing.Point(36, 200) - Me.cmdComplexSqrt.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdComplexSqrt.Location = New System.Drawing.Point(30, 165) + Me.cmdComplexSqrt.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdComplexSqrt.Name = "cmdComplexSqrt" - Me.cmdComplexSqrt.Size = New System.Drawing.Size(98, 45) + Me.cmdComplexSqrt.Size = New System.Drawing.Size(82, 38) Me.cmdComplexSqrt.TabIndex = 189 Me.cmdComplexSqrt.Text = "sqrt" Me.cmdComplexSqrt.UseVisualStyleBackColor = True @@ -6446,10 +6328,10 @@ Partial Class ucrCalculator ' Me.cmdConjugate.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdConjugate.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdConjugate.Location = New System.Drawing.Point(220, 69) - Me.cmdConjugate.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdConjugate.Location = New System.Drawing.Point(198, 58) + Me.cmdConjugate.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdConjugate.Name = "cmdConjugate" - Me.cmdConjugate.Size = New System.Drawing.Size(98, 45) + Me.cmdConjugate.Size = New System.Drawing.Size(82, 38) Me.cmdConjugate.TabIndex = 188 Me.cmdConjugate.Text = "conjugate" Me.cmdConjugate.UseVisualStyleBackColor = True @@ -6458,10 +6340,10 @@ Partial Class ucrCalculator ' Me.cmdArg.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdArg.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdArg.Location = New System.Drawing.Point(134, 69) - Me.cmdArg.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdArg.Location = New System.Drawing.Point(111, 58) + Me.cmdArg.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdArg.Name = "cmdArg" - Me.cmdArg.Size = New System.Drawing.Size(87, 45) + Me.cmdArg.Size = New System.Drawing.Size(88, 38) Me.cmdArg.TabIndex = 187 Me.cmdArg.Text = "arg" Me.cmdArg.UseVisualStyleBackColor = True @@ -6470,10 +6352,10 @@ Partial Class ucrCalculator ' Me.cmdMod.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdMod.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdMod.Location = New System.Drawing.Point(36, 69) - Me.cmdMod.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdMod.Location = New System.Drawing.Point(30, 58) + Me.cmdMod.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdMod.Name = "cmdMod" - Me.cmdMod.Size = New System.Drawing.Size(98, 45) + Me.cmdMod.Size = New System.Drawing.Size(82, 38) Me.cmdMod.TabIndex = 186 Me.cmdMod.Text = "mod" Me.cmdMod.UseVisualStyleBackColor = True @@ -6482,10 +6364,10 @@ Partial Class ucrCalculator ' Me.cmdImaginary.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdImaginary.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdImaginary.Location = New System.Drawing.Point(220, 26) - Me.cmdImaginary.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdImaginary.Location = New System.Drawing.Point(279, 22) + Me.cmdImaginary.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdImaginary.Name = "cmdImaginary" - Me.cmdImaginary.Size = New System.Drawing.Size(98, 45) + Me.cmdImaginary.Size = New System.Drawing.Size(79, 38) Me.cmdImaginary.TabIndex = 185 Me.cmdImaginary.Text = "imaginary" Me.cmdImaginary.UseVisualStyleBackColor = True @@ -6494,43 +6376,43 @@ Partial Class ucrCalculator ' Me.cmdReal.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdReal.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdReal.Location = New System.Drawing.Point(134, 26) - Me.cmdReal.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdReal.Location = New System.Drawing.Point(198, 22) + Me.cmdReal.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdReal.Name = "cmdReal" - Me.cmdReal.Size = New System.Drawing.Size(87, 45) + Me.cmdReal.Size = New System.Drawing.Size(82, 38) Me.cmdReal.TabIndex = 177 Me.cmdReal.Text = "real" Me.cmdReal.UseVisualStyleBackColor = True ' - 'cmdAsComplex + 'cmdComplex ' - Me.cmdAsComplex.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - Me.cmdAsComplex.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdAsComplex.Location = New System.Drawing.Point(36, 26) - Me.cmdAsComplex.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) - Me.cmdAsComplex.Name = "cmdAsComplex" - Me.cmdAsComplex.Size = New System.Drawing.Size(98, 45) - Me.cmdAsComplex.TabIndex = 176 - Me.cmdAsComplex.Text = "complex" - Me.cmdAsComplex.UseVisualStyleBackColor = True + Me.cmdComplex.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) + Me.cmdComplex.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.cmdComplex.Location = New System.Drawing.Point(30, 22) + Me.cmdComplex.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdComplex.Name = "cmdComplex" + Me.cmdComplex.Size = New System.Drawing.Size(82, 38) + Me.cmdComplex.TabIndex = 176 + Me.cmdComplex.Text = "complex" + Me.cmdComplex.UseVisualStyleBackColor = True ' 'ContextMenuStripTxtString ' Me.ContextMenuStripTxtString.ImageScalingSize = New System.Drawing.Size(24, 24) Me.ContextMenuStripTxtString.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.TxTStringrToolStripMenuItem, Me.TxTBaseToolStripMenuItem}) Me.ContextMenuStripTxtString.Name = "ContextMenuStrip1" - Me.ContextMenuStripTxtString.Size = New System.Drawing.Size(137, 68) + Me.ContextMenuStripTxtString.Size = New System.Drawing.Size(123, 52) ' 'TxTStringrToolStripMenuItem ' Me.TxTStringrToolStripMenuItem.Name = "TxTStringrToolStripMenuItem" - Me.TxTStringrToolStripMenuItem.Size = New System.Drawing.Size(136, 32) + Me.TxTStringrToolStripMenuItem.Size = New System.Drawing.Size(122, 24) Me.TxTStringrToolStripMenuItem.Text = "Stringr" ' 'TxTBaseToolStripMenuItem ' Me.TxTBaseToolStripMenuItem.Name = "TxTBaseToolStripMenuItem" - Me.TxTBaseToolStripMenuItem.Size = New System.Drawing.Size(136, 32) + Me.TxTBaseToolStripMenuItem.Size = New System.Drawing.Size(122, 24) Me.TxTBaseToolStripMenuItem.Text = "base" ' 'ContextMenuStripWakefield @@ -6538,12 +6420,12 @@ Partial Class ucrCalculator Me.ContextMenuStripWakefield.ImageScalingSize = New System.Drawing.Size(24, 24) Me.ContextMenuStripWakefield.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.WakefieldToolStripMenuItem}) Me.ContextMenuStripWakefield.Name = "ContextMenuStrip1" - Me.ContextMenuStripWakefield.Size = New System.Drawing.Size(159, 36) + Me.ContextMenuStripWakefield.Size = New System.Drawing.Size(143, 28) ' 'WakefieldToolStripMenuItem ' Me.WakefieldToolStripMenuItem.Name = "WakefieldToolStripMenuItem" - Me.WakefieldToolStripMenuItem.Size = New System.Drawing.Size(158, 32) + Me.WakefieldToolStripMenuItem.Size = New System.Drawing.Size(142, 24) Me.WakefieldToolStripMenuItem.Text = "wakefield" ' 'ContextMenuStripList @@ -6551,24 +6433,24 @@ Partial Class ucrCalculator Me.ContextMenuStripList.ImageScalingSize = New System.Drawing.Size(24, 24) Me.ContextMenuStripList.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ListBaseToolStripMenuItem, Me.ListStatsToolStripMenuItem, Me.ListStatipToolStripMenuItem}) Me.ContextMenuStripList.Name = "ContextMenuStrip1" - Me.ContextMenuStripList.Size = New System.Drawing.Size(129, 100) + Me.ContextMenuStripList.Size = New System.Drawing.Size(116, 76) ' 'ListBaseToolStripMenuItem ' Me.ListBaseToolStripMenuItem.Name = "ListBaseToolStripMenuItem" - Me.ListBaseToolStripMenuItem.Size = New System.Drawing.Size(128, 32) + Me.ListBaseToolStripMenuItem.Size = New System.Drawing.Size(115, 24) Me.ListBaseToolStripMenuItem.Text = "base" ' 'ListStatsToolStripMenuItem ' Me.ListStatsToolStripMenuItem.Name = "ListStatsToolStripMenuItem" - Me.ListStatsToolStripMenuItem.Size = New System.Drawing.Size(128, 32) + Me.ListStatsToolStripMenuItem.Size = New System.Drawing.Size(115, 24) Me.ListStatsToolStripMenuItem.Text = "stats" ' 'ListStatipToolStripMenuItem ' Me.ListStatipToolStripMenuItem.Name = "ListStatipToolStripMenuItem" - Me.ListStatipToolStripMenuItem.Size = New System.Drawing.Size(128, 32) + Me.ListStatipToolStripMenuItem.Size = New System.Drawing.Size(115, 24) Me.ListStatipToolStripMenuItem.Text = "statip" ' 'grpList @@ -6600,11 +6482,9 @@ Partial Class ucrCalculator Me.grpList.Controls.Add(Me.cmdListSum) Me.grpList.Controls.Add(Me.cmdListSumd) Me.grpList.Controls.Add(Me.cmdListMissing) - Me.grpList.Location = New System.Drawing.Point(657, 62) - Me.grpList.Margin = New System.Windows.Forms.Padding(4) + Me.grpList.Location = New System.Drawing.Point(548, 52) Me.grpList.Name = "grpList" - Me.grpList.Padding = New System.Windows.Forms.Padding(4) - Me.grpList.Size = New System.Drawing.Size(474, 550) + Me.grpList.Size = New System.Drawing.Size(395, 458) Me.grpList.TabIndex = 214 Me.grpList.TabStop = False Me.grpList.Text = "Summary" @@ -6626,11 +6506,9 @@ Partial Class ucrCalculator Me.GroupBox1.Controls.Add(Me.cmdListLag) Me.GroupBox1.Controls.Add(Me.cmdListRank) Me.GroupBox1.Controls.Add(Me.cmdListSort) - Me.GroupBox1.Location = New System.Drawing.Point(6, 372) - Me.GroupBox1.Margin = New System.Windows.Forms.Padding(4) + Me.GroupBox1.Location = New System.Drawing.Point(5, 310) Me.GroupBox1.Name = "GroupBox1" - Me.GroupBox1.Padding = New System.Windows.Forms.Padding(4) - Me.GroupBox1.Size = New System.Drawing.Size(466, 164) + Me.GroupBox1.Size = New System.Drawing.Size(388, 137) Me.GroupBox1.TabIndex = 200 Me.GroupBox1.TabStop = False Me.GroupBox1.Text = "Transform" @@ -6639,10 +6517,10 @@ Partial Class ucrCalculator ' Me.cmdListDuplicated.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdListDuplicated.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdListDuplicated.Location = New System.Drawing.Point(362, 108) - Me.cmdListDuplicated.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdListDuplicated.Location = New System.Drawing.Point(302, 90) + Me.cmdListDuplicated.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdListDuplicated.Name = "cmdListDuplicated" - Me.cmdListDuplicated.Size = New System.Drawing.Size(98, 45) + Me.cmdListDuplicated.Size = New System.Drawing.Size(82, 38) Me.cmdListDuplicated.TabIndex = 186 Me.cmdListDuplicated.Text = "duplicated" Me.cmdListDuplicated.UseVisualStyleBackColor = True @@ -6651,10 +6529,10 @@ Partial Class ucrCalculator ' Me.cmdListOperator.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdListOperator.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdListOperator.Location = New System.Drawing.Point(279, 108) - Me.cmdListOperator.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdListOperator.Location = New System.Drawing.Point(232, 90) + Me.cmdListOperator.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdListOperator.Name = "cmdListOperator" - Me.cmdListOperator.Size = New System.Drawing.Size(84, 45) + Me.cmdListOperator.Size = New System.Drawing.Size(70, 38) Me.cmdListOperator.TabIndex = 185 Me.cmdListOperator.Text = ">" Me.cmdListOperator.UseVisualStyleBackColor = True @@ -6663,10 +6541,10 @@ Partial Class ucrCalculator ' Me.cmdListDiv.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdListDiv.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdListDiv.Location = New System.Drawing.Point(190, 108) - Me.cmdListDiv.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdListDiv.Location = New System.Drawing.Point(158, 90) + Me.cmdListDiv.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdListDiv.Name = "cmdListDiv" - Me.cmdListDiv.Size = New System.Drawing.Size(90, 45) + Me.cmdListDiv.Size = New System.Drawing.Size(75, 38) Me.cmdListDiv.TabIndex = 184 Me.cmdListDiv.Text = "div (%/%)" Me.cmdListDiv.UseVisualStyleBackColor = True @@ -6675,10 +6553,10 @@ Partial Class ucrCalculator ' Me.cmdListMod.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdListMod.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdListMod.Location = New System.Drawing.Point(86, 108) - Me.cmdListMod.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdListMod.Location = New System.Drawing.Point(72, 90) + Me.cmdListMod.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdListMod.Name = "cmdListMod" - Me.cmdListMod.Size = New System.Drawing.Size(106, 45) + Me.cmdListMod.Size = New System.Drawing.Size(88, 38) Me.cmdListMod.TabIndex = 183 Me.cmdListMod.Text = "mod (%%)" Me.cmdListMod.UseVisualStyleBackColor = True @@ -6687,10 +6565,10 @@ Partial Class ucrCalculator ' Me.cmdListIfelse.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdListIfelse.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdListIfelse.Location = New System.Drawing.Point(2, 108) - Me.cmdListIfelse.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdListIfelse.Location = New System.Drawing.Point(2, 90) + Me.cmdListIfelse.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdListIfelse.Name = "cmdListIfelse" - Me.cmdListIfelse.Size = New System.Drawing.Size(86, 45) + Me.cmdListIfelse.Size = New System.Drawing.Size(72, 38) Me.cmdListIfelse.TabIndex = 182 Me.cmdListIfelse.Text = "ifelse" Me.cmdListIfelse.UseVisualStyleBackColor = True @@ -6699,10 +6577,10 @@ Partial Class ucrCalculator ' Me.cmdListOmit.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdListOmit.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdListOmit.Location = New System.Drawing.Point(362, 64) - Me.cmdListOmit.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdListOmit.Location = New System.Drawing.Point(302, 53) + Me.cmdListOmit.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdListOmit.Name = "cmdListOmit" - Me.cmdListOmit.Size = New System.Drawing.Size(98, 45) + Me.cmdListOmit.Size = New System.Drawing.Size(82, 38) Me.cmdListOmit.TabIndex = 181 Me.cmdListOmit.Text = "omit.na" Me.cmdListOmit.UseVisualStyleBackColor = True @@ -6711,10 +6589,10 @@ Partial Class ucrCalculator ' Me.cmdListRev.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdListRev.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdListRev.Location = New System.Drawing.Point(279, 64) - Me.cmdListRev.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdListRev.Location = New System.Drawing.Point(232, 53) + Me.cmdListRev.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdListRev.Name = "cmdListRev" - Me.cmdListRev.Size = New System.Drawing.Size(84, 45) + Me.cmdListRev.Size = New System.Drawing.Size(70, 38) Me.cmdListRev.TabIndex = 180 Me.cmdListRev.Text = "rev" Me.cmdListRev.UseVisualStyleBackColor = True @@ -6723,10 +6601,10 @@ Partial Class ucrCalculator ' Me.cmdListMovsum.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdListMovsum.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdListMovsum.Location = New System.Drawing.Point(190, 64) - Me.cmdListMovsum.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdListMovsum.Location = New System.Drawing.Point(158, 53) + Me.cmdListMovsum.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdListMovsum.Name = "cmdListMovsum" - Me.cmdListMovsum.Size = New System.Drawing.Size(90, 45) + Me.cmdListMovsum.Size = New System.Drawing.Size(75, 38) Me.cmdListMovsum.TabIndex = 179 Me.cmdListMovsum.Text = "movsum" Me.cmdListMovsum.UseVisualStyleBackColor = True @@ -6735,10 +6613,10 @@ Partial Class ucrCalculator ' Me.cmdListCumsum.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdListCumsum.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdListCumsum.Location = New System.Drawing.Point(86, 64) - Me.cmdListCumsum.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdListCumsum.Location = New System.Drawing.Point(72, 53) + Me.cmdListCumsum.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdListCumsum.Name = "cmdListCumsum" - Me.cmdListCumsum.Size = New System.Drawing.Size(106, 45) + Me.cmdListCumsum.Size = New System.Drawing.Size(88, 38) Me.cmdListCumsum.TabIndex = 178 Me.cmdListCumsum.Text = "cumsum" Me.cmdListCumsum.UseVisualStyleBackColor = True @@ -6747,10 +6625,10 @@ Partial Class ucrCalculator ' Me.cmdListScale.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdListScale.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdListScale.Location = New System.Drawing.Point(2, 64) - Me.cmdListScale.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdListScale.Location = New System.Drawing.Point(2, 53) + Me.cmdListScale.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdListScale.Name = "cmdListScale" - Me.cmdListScale.Size = New System.Drawing.Size(86, 45) + Me.cmdListScale.Size = New System.Drawing.Size(72, 38) Me.cmdListScale.TabIndex = 177 Me.cmdListScale.Text = " scale" Me.cmdListScale.UseVisualStyleBackColor = True @@ -6759,10 +6637,10 @@ Partial Class ucrCalculator ' Me.cmdListDiff.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdListDiff.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdListDiff.Location = New System.Drawing.Point(362, 21) - Me.cmdListDiff.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdListDiff.Location = New System.Drawing.Point(302, 18) + Me.cmdListDiff.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdListDiff.Name = "cmdListDiff" - Me.cmdListDiff.Size = New System.Drawing.Size(98, 45) + Me.cmdListDiff.Size = New System.Drawing.Size(82, 38) Me.cmdListDiff.TabIndex = 176 Me.cmdListDiff.Text = "diff" Me.cmdListDiff.UseVisualStyleBackColor = True @@ -6771,10 +6649,10 @@ Partial Class ucrCalculator ' Me.cmdListLead.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdListLead.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdListLead.Location = New System.Drawing.Point(279, 21) - Me.cmdListLead.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdListLead.Location = New System.Drawing.Point(232, 18) + Me.cmdListLead.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdListLead.Name = "cmdListLead" - Me.cmdListLead.Size = New System.Drawing.Size(84, 45) + Me.cmdListLead.Size = New System.Drawing.Size(70, 38) Me.cmdListLead.TabIndex = 175 Me.cmdListLead.Text = "lead" Me.cmdListLead.UseVisualStyleBackColor = True @@ -6783,10 +6661,10 @@ Partial Class ucrCalculator ' Me.cmdListLag.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdListLag.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdListLag.Location = New System.Drawing.Point(190, 21) - Me.cmdListLag.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdListLag.Location = New System.Drawing.Point(158, 18) + Me.cmdListLag.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdListLag.Name = "cmdListLag" - Me.cmdListLag.Size = New System.Drawing.Size(90, 45) + Me.cmdListLag.Size = New System.Drawing.Size(75, 38) Me.cmdListLag.TabIndex = 174 Me.cmdListLag.Text = "lag" Me.cmdListLag.UseVisualStyleBackColor = True @@ -6795,10 +6673,10 @@ Partial Class ucrCalculator ' Me.cmdListRank.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdListRank.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdListRank.Location = New System.Drawing.Point(86, 21) - Me.cmdListRank.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdListRank.Location = New System.Drawing.Point(72, 18) + Me.cmdListRank.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdListRank.Name = "cmdListRank" - Me.cmdListRank.Size = New System.Drawing.Size(106, 45) + Me.cmdListRank.Size = New System.Drawing.Size(88, 38) Me.cmdListRank.TabIndex = 173 Me.cmdListRank.Text = "rank" Me.cmdListRank.UseVisualStyleBackColor = True @@ -6807,10 +6685,10 @@ Partial Class ucrCalculator ' Me.cmdListSort.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdListSort.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdListSort.Location = New System.Drawing.Point(2, 21) - Me.cmdListSort.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdListSort.Location = New System.Drawing.Point(2, 18) + Me.cmdListSort.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdListSort.Name = "cmdListSort" - Me.cmdListSort.Size = New System.Drawing.Size(86, 45) + Me.cmdListSort.Size = New System.Drawing.Size(72, 38) Me.cmdListSort.TabIndex = 172 Me.cmdListSort.Text = "sort" Me.cmdListSort.UseVisualStyleBackColor = True @@ -6827,11 +6705,9 @@ Partial Class ucrCalculator Me.grpMathBloc.Controls.Add(Me.cmdListMultiply) Me.grpMathBloc.Controls.Add(Me.cmdListSubtract) Me.grpMathBloc.Controls.Add(Me.cmdListAdd) - Me.grpMathBloc.Location = New System.Drawing.Point(4, 244) - Me.grpMathBloc.Margin = New System.Windows.Forms.Padding(4) + Me.grpMathBloc.Location = New System.Drawing.Point(3, 203) Me.grpMathBloc.Name = "grpMathBloc" - Me.grpMathBloc.Padding = New System.Windows.Forms.Padding(4) - Me.grpMathBloc.Size = New System.Drawing.Size(466, 126) + Me.grpMathBloc.Size = New System.Drawing.Size(388, 105) Me.grpMathBloc.TabIndex = 199 Me.grpMathBloc.TabStop = False Me.grpMathBloc.Text = "Maths" @@ -6840,10 +6716,10 @@ Partial Class ucrCalculator ' Me.cmdListSQRT.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdListSQRT.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdListSQRT.Location = New System.Drawing.Point(368, 64) - Me.cmdListSQRT.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdListSQRT.Location = New System.Drawing.Point(307, 53) + Me.cmdListSQRT.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdListSQRT.Name = "cmdListSQRT" - Me.cmdListSQRT.Size = New System.Drawing.Size(88, 45) + Me.cmdListSQRT.Size = New System.Drawing.Size(73, 38) Me.cmdListSQRT.TabIndex = 181 Me.cmdListSQRT.Text = "sqrt" Me.cmdListSQRT.UseVisualStyleBackColor = True @@ -6852,10 +6728,10 @@ Partial Class ucrCalculator ' Me.cmdListPercent2.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdListPercent2.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdListPercent2.Location = New System.Drawing.Point(279, 64) - Me.cmdListPercent2.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdListPercent2.Location = New System.Drawing.Point(232, 53) + Me.cmdListPercent2.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdListPercent2.Name = "cmdListPercent2" - Me.cmdListPercent2.Size = New System.Drawing.Size(90, 45) + Me.cmdListPercent2.Size = New System.Drawing.Size(75, 38) Me.cmdListPercent2.TabIndex = 180 Me.cmdListPercent2.Text = "percent2" Me.cmdListPercent2.UseVisualStyleBackColor = True @@ -6864,10 +6740,10 @@ Partial Class ucrCalculator ' Me.cmdListPercent.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdListPercent.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdListPercent.Location = New System.Drawing.Point(190, 64) - Me.cmdListPercent.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdListPercent.Location = New System.Drawing.Point(158, 53) + Me.cmdListPercent.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdListPercent.Name = "cmdListPercent" - Me.cmdListPercent.Size = New System.Drawing.Size(90, 45) + Me.cmdListPercent.Size = New System.Drawing.Size(75, 38) Me.cmdListPercent.TabIndex = 179 Me.cmdListPercent.Text = "percent" Me.cmdListPercent.UseVisualStyleBackColor = True @@ -6876,10 +6752,10 @@ Partial Class ucrCalculator ' Me.cmdListProportion.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdListProportion.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdListProportion.Location = New System.Drawing.Point(86, 64) - Me.cmdListProportion.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdListProportion.Location = New System.Drawing.Point(72, 53) + Me.cmdListProportion.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdListProportion.Name = "cmdListProportion" - Me.cmdListProportion.Size = New System.Drawing.Size(106, 45) + Me.cmdListProportion.Size = New System.Drawing.Size(88, 38) Me.cmdListProportion.TabIndex = 178 Me.cmdListProportion.Text = "proportion" Me.cmdListProportion.UseVisualStyleBackColor = True @@ -6888,10 +6764,10 @@ Partial Class ucrCalculator ' Me.cmdListRound.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdListRound.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdListRound.Location = New System.Drawing.Point(2, 64) - Me.cmdListRound.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdListRound.Location = New System.Drawing.Point(2, 53) + Me.cmdListRound.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdListRound.Name = "cmdListRound" - Me.cmdListRound.Size = New System.Drawing.Size(86, 45) + Me.cmdListRound.Size = New System.Drawing.Size(72, 38) Me.cmdListRound.TabIndex = 177 Me.cmdListRound.Text = "round" Me.cmdListRound.UseVisualStyleBackColor = True @@ -6900,10 +6776,10 @@ Partial Class ucrCalculator ' Me.cmdListSquare.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdListSquare.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdListSquare.Location = New System.Drawing.Point(368, 21) - Me.cmdListSquare.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdListSquare.Location = New System.Drawing.Point(307, 18) + Me.cmdListSquare.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdListSquare.Name = "cmdListSquare" - Me.cmdListSquare.Size = New System.Drawing.Size(88, 45) + Me.cmdListSquare.Size = New System.Drawing.Size(73, 38) Me.cmdListSquare.TabIndex = 176 Me.cmdListSquare.Text = "power (^)" Me.cmdListSquare.UseVisualStyleBackColor = True @@ -6912,10 +6788,10 @@ Partial Class ucrCalculator ' Me.cmdListDivide.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdListDivide.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdListDivide.Location = New System.Drawing.Point(279, 21) - Me.cmdListDivide.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdListDivide.Location = New System.Drawing.Point(232, 18) + Me.cmdListDivide.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdListDivide.Name = "cmdListDivide" - Me.cmdListDivide.Size = New System.Drawing.Size(90, 45) + Me.cmdListDivide.Size = New System.Drawing.Size(75, 38) Me.cmdListDivide.TabIndex = 175 Me.cmdListDivide.Text = "divide (/)" Me.cmdListDivide.UseVisualStyleBackColor = True @@ -6924,10 +6800,10 @@ Partial Class ucrCalculator ' Me.cmdListMultiply.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdListMultiply.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdListMultiply.Location = New System.Drawing.Point(190, 21) - Me.cmdListMultiply.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdListMultiply.Location = New System.Drawing.Point(158, 18) + Me.cmdListMultiply.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdListMultiply.Name = "cmdListMultiply" - Me.cmdListMultiply.Size = New System.Drawing.Size(90, 45) + Me.cmdListMultiply.Size = New System.Drawing.Size(75, 38) Me.cmdListMultiply.TabIndex = 174 Me.cmdListMultiply.Text = "times (*)" Me.cmdListMultiply.UseVisualStyleBackColor = True @@ -6936,10 +6812,10 @@ Partial Class ucrCalculator ' Me.cmdListSubtract.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdListSubtract.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdListSubtract.Location = New System.Drawing.Point(86, 21) - Me.cmdListSubtract.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdListSubtract.Location = New System.Drawing.Point(72, 18) + Me.cmdListSubtract.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdListSubtract.Name = "cmdListSubtract" - Me.cmdListSubtract.Size = New System.Drawing.Size(106, 45) + Me.cmdListSubtract.Size = New System.Drawing.Size(88, 38) Me.cmdListSubtract.TabIndex = 173 Me.cmdListSubtract.Text = " subtract (-)" Me.cmdListSubtract.UseVisualStyleBackColor = True @@ -6948,10 +6824,10 @@ Partial Class ucrCalculator ' Me.cmdListAdd.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdListAdd.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdListAdd.Location = New System.Drawing.Point(2, 21) - Me.cmdListAdd.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdListAdd.Location = New System.Drawing.Point(2, 18) + Me.cmdListAdd.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdListAdd.Name = "cmdListAdd" - Me.cmdListAdd.Size = New System.Drawing.Size(86, 45) + Me.cmdListAdd.Size = New System.Drawing.Size(72, 38) Me.cmdListAdd.TabIndex = 172 Me.cmdListAdd.Text = "sum (+)" Me.cmdListAdd.UseVisualStyleBackColor = True @@ -6960,10 +6836,10 @@ Partial Class ucrCalculator ' Me.cmdListNth.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdListNth.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdListNth.Location = New System.Drawing.Point(370, 152) - Me.cmdListNth.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdListNth.Location = New System.Drawing.Point(308, 127) + Me.cmdListNth.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdListNth.Name = "cmdListNth" - Me.cmdListNth.Size = New System.Drawing.Size(93, 45) + Me.cmdListNth.Size = New System.Drawing.Size(78, 38) Me.cmdListNth.TabIndex = 176 Me.cmdListNth.Text = "nth" Me.cmdListNth.UseVisualStyleBackColor = True @@ -6972,10 +6848,10 @@ Partial Class ucrCalculator ' Me.cmdListLast.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdListLast.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdListLast.Location = New System.Drawing.Point(279, 152) - Me.cmdListLast.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdListLast.Location = New System.Drawing.Point(232, 127) + Me.cmdListLast.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdListLast.Name = "cmdListLast" - Me.cmdListLast.Size = New System.Drawing.Size(93, 45) + Me.cmdListLast.Size = New System.Drawing.Size(78, 38) Me.cmdListLast.TabIndex = 175 Me.cmdListLast.Text = "last" Me.cmdListLast.UseVisualStyleBackColor = True @@ -6984,10 +6860,10 @@ Partial Class ucrCalculator ' Me.cmdListFirst.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdListFirst.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdListFirst.Location = New System.Drawing.Point(188, 152) - Me.cmdListFirst.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdListFirst.Location = New System.Drawing.Point(157, 127) + Me.cmdListFirst.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdListFirst.Name = "cmdListFirst" - Me.cmdListFirst.Size = New System.Drawing.Size(93, 45) + Me.cmdListFirst.Size = New System.Drawing.Size(78, 38) Me.cmdListFirst.TabIndex = 174 Me.cmdListFirst.Text = "first" Me.cmdListFirst.UseVisualStyleBackColor = True @@ -6996,10 +6872,10 @@ Partial Class ucrCalculator ' Me.cmdListAnyDup.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdListAnyDup.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdListAnyDup.Location = New System.Drawing.Point(96, 152) - Me.cmdListAnyDup.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdListAnyDup.Location = New System.Drawing.Point(80, 127) + Me.cmdListAnyDup.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdListAnyDup.Name = "cmdListAnyDup" - Me.cmdListAnyDup.Size = New System.Drawing.Size(93, 45) + Me.cmdListAnyDup.Size = New System.Drawing.Size(78, 38) Me.cmdListAnyDup.TabIndex = 173 Me.cmdListAnyDup.Text = "anydup" Me.cmdListAnyDup.UseVisualStyleBackColor = True @@ -7008,10 +6884,10 @@ Partial Class ucrCalculator ' Me.cmdListDistinct.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdListDistinct.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdListDistinct.Location = New System.Drawing.Point(4, 152) - Me.cmdListDistinct.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdListDistinct.Location = New System.Drawing.Point(3, 127) + Me.cmdListDistinct.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdListDistinct.Name = "cmdListDistinct" - Me.cmdListDistinct.Size = New System.Drawing.Size(93, 45) + Me.cmdListDistinct.Size = New System.Drawing.Size(78, 38) Me.cmdListDistinct.TabIndex = 172 Me.cmdListDistinct.Text = "distinct" Me.cmdListDistinct.UseVisualStyleBackColor = True @@ -7020,10 +6896,10 @@ Partial Class ucrCalculator ' Me.cmdListIQR.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdListIQR.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdListIQR.Location = New System.Drawing.Point(370, 108) - Me.cmdListIQR.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdListIQR.Location = New System.Drawing.Point(308, 90) + Me.cmdListIQR.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdListIQR.Name = "cmdListIQR" - Me.cmdListIQR.Size = New System.Drawing.Size(93, 45) + Me.cmdListIQR.Size = New System.Drawing.Size(78, 38) Me.cmdListIQR.TabIndex = 171 Me.cmdListIQR.Text = "IQR" Me.cmdListIQR.UseVisualStyleBackColor = True @@ -7032,10 +6908,10 @@ Partial Class ucrCalculator ' Me.cmdListMad.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdListMad.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdListMad.Location = New System.Drawing.Point(279, 108) - Me.cmdListMad.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdListMad.Location = New System.Drawing.Point(232, 90) + Me.cmdListMad.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdListMad.Name = "cmdListMad" - Me.cmdListMad.Size = New System.Drawing.Size(93, 45) + Me.cmdListMad.Size = New System.Drawing.Size(78, 38) Me.cmdListMad.TabIndex = 170 Me.cmdListMad.Text = "mad" Me.cmdListMad.UseVisualStyleBackColor = True @@ -7044,10 +6920,10 @@ Partial Class ucrCalculator ' Me.cmdListSd.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdListSd.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdListSd.Location = New System.Drawing.Point(188, 108) - Me.cmdListSd.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdListSd.Location = New System.Drawing.Point(157, 90) + Me.cmdListSd.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdListSd.Name = "cmdListSd" - Me.cmdListSd.Size = New System.Drawing.Size(93, 45) + Me.cmdListSd.Size = New System.Drawing.Size(78, 38) Me.cmdListSd.TabIndex = 169 Me.cmdListSd.Text = "sd" Me.cmdListSd.UseVisualStyleBackColor = True @@ -7056,10 +6932,10 @@ Partial Class ucrCalculator ' Me.cmdListVar.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdListVar.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdListVar.Location = New System.Drawing.Point(96, 108) - Me.cmdListVar.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdListVar.Location = New System.Drawing.Point(80, 90) + Me.cmdListVar.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdListVar.Name = "cmdListVar" - Me.cmdListVar.Size = New System.Drawing.Size(93, 45) + Me.cmdListVar.Size = New System.Drawing.Size(78, 38) Me.cmdListVar.TabIndex = 168 Me.cmdListVar.Text = "var" Me.cmdListVar.UseVisualStyleBackColor = True @@ -7068,10 +6944,10 @@ Partial Class ucrCalculator ' Me.cmdListSsq.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdListSsq.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdListSsq.Location = New System.Drawing.Point(4, 108) - Me.cmdListSsq.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdListSsq.Location = New System.Drawing.Point(3, 90) + Me.cmdListSsq.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdListSsq.Name = "cmdListSsq" - Me.cmdListSsq.Size = New System.Drawing.Size(93, 45) + Me.cmdListSsq.Size = New System.Drawing.Size(78, 38) Me.cmdListSsq.TabIndex = 167 Me.cmdListSsq.Text = "ssq" Me.cmdListSsq.UseVisualStyleBackColor = True @@ -7080,10 +6956,10 @@ Partial Class ucrCalculator ' Me.cmdListMode1.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdListMode1.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdListMode1.Location = New System.Drawing.Point(370, 64) - Me.cmdListMode1.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdListMode1.Location = New System.Drawing.Point(308, 53) + Me.cmdListMode1.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdListMode1.Name = "cmdListMode1" - Me.cmdListMode1.Size = New System.Drawing.Size(93, 45) + Me.cmdListMode1.Size = New System.Drawing.Size(78, 38) Me.cmdListMode1.TabIndex = 166 Me.cmdListMode1.Text = "mode1" Me.cmdListMode1.UseVisualStyleBackColor = True @@ -7092,10 +6968,10 @@ Partial Class ucrCalculator ' Me.cmdListMax.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdListMax.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdListMax.Location = New System.Drawing.Point(370, 21) - Me.cmdListMax.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdListMax.Location = New System.Drawing.Point(308, 18) + Me.cmdListMax.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdListMax.Name = "cmdListMax" - Me.cmdListMax.Size = New System.Drawing.Size(93, 45) + Me.cmdListMax.Size = New System.Drawing.Size(78, 38) Me.cmdListMax.TabIndex = 165 Me.cmdListMax.Text = "max" Me.cmdListMax.UseVisualStyleBackColor = True @@ -7104,10 +6980,10 @@ Partial Class ucrCalculator ' Me.cmdListFivenum.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdListFivenum.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdListFivenum.Location = New System.Drawing.Point(279, 195) - Me.cmdListFivenum.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdListFivenum.Location = New System.Drawing.Point(232, 162) + Me.cmdListFivenum.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdListFivenum.Name = "cmdListFivenum" - Me.cmdListFivenum.Size = New System.Drawing.Size(93, 45) + Me.cmdListFivenum.Size = New System.Drawing.Size(78, 38) Me.cmdListFivenum.TabIndex = 163 Me.cmdListFivenum.Tag = "" Me.cmdListFivenum.Text = "fivenum" @@ -7117,10 +6993,10 @@ Partial Class ucrCalculator ' Me.cmdListMode.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdListMode.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdListMode.Location = New System.Drawing.Point(279, 64) - Me.cmdListMode.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdListMode.Location = New System.Drawing.Point(232, 53) + Me.cmdListMode.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdListMode.Name = "cmdListMode" - Me.cmdListMode.Size = New System.Drawing.Size(93, 45) + Me.cmdListMode.Size = New System.Drawing.Size(78, 38) Me.cmdListMode.TabIndex = 162 Me.cmdListMode.Text = "mode" Me.cmdListMode.UseVisualStyleBackColor = True @@ -7129,10 +7005,10 @@ Partial Class ucrCalculator ' Me.cmdListQuantile.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdListQuantile.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdListQuantile.Location = New System.Drawing.Point(4, 195) - Me.cmdListQuantile.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdListQuantile.Location = New System.Drawing.Point(3, 162) + Me.cmdListQuantile.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdListQuantile.Name = "cmdListQuantile" - Me.cmdListQuantile.Size = New System.Drawing.Size(93, 45) + Me.cmdListQuantile.Size = New System.Drawing.Size(78, 38) Me.cmdListQuantile.TabIndex = 154 Me.cmdListQuantile.Text = "quantile" Me.cmdListQuantile.UseVisualStyleBackColor = True @@ -7141,10 +7017,10 @@ Partial Class ucrCalculator ' Me.cmdListDigitsum.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdListDigitsum.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdListDigitsum.Location = New System.Drawing.Point(96, 195) - Me.cmdListDigitsum.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdListDigitsum.Location = New System.Drawing.Point(80, 162) + Me.cmdListDigitsum.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdListDigitsum.Name = "cmdListDigitsum" - Me.cmdListDigitsum.Size = New System.Drawing.Size(93, 45) + Me.cmdListDigitsum.Size = New System.Drawing.Size(78, 38) Me.cmdListDigitsum.TabIndex = 161 Me.cmdListDigitsum.Text = "digitsum" Me.cmdListDigitsum.UseVisualStyleBackColor = True @@ -7153,10 +7029,10 @@ Partial Class ucrCalculator ' Me.cmdListMin.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdListMin.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdListMin.Location = New System.Drawing.Point(279, 21) - Me.cmdListMin.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdListMin.Location = New System.Drawing.Point(232, 18) + Me.cmdListMin.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdListMin.Name = "cmdListMin" - Me.cmdListMin.Size = New System.Drawing.Size(93, 45) + Me.cmdListMin.Size = New System.Drawing.Size(78, 38) Me.cmdListMin.TabIndex = 156 Me.cmdListMin.Text = "min" Me.cmdListMin.UseVisualStyleBackColor = True @@ -7165,10 +7041,10 @@ Partial Class ucrCalculator ' Me.cmdListProd.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdListProd.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdListProd.Location = New System.Drawing.Point(188, 21) - Me.cmdListProd.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdListProd.Location = New System.Drawing.Point(157, 18) + Me.cmdListProd.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdListProd.Name = "cmdListProd" - Me.cmdListProd.Size = New System.Drawing.Size(93, 45) + Me.cmdListProd.Size = New System.Drawing.Size(78, 38) Me.cmdListProd.TabIndex = 155 Me.cmdListProd.Text = "prod" Me.cmdListProd.UseVisualStyleBackColor = True @@ -7177,10 +7053,10 @@ Partial Class ucrCalculator ' Me.cmdListLength.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdListLength.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdListLength.Location = New System.Drawing.Point(4, 21) - Me.cmdListLength.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdListLength.Location = New System.Drawing.Point(3, 18) + Me.cmdListLength.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdListLength.Name = "cmdListLength" - Me.cmdListLength.Size = New System.Drawing.Size(93, 45) + Me.cmdListLength.Size = New System.Drawing.Size(78, 38) Me.cmdListLength.TabIndex = 148 Me.cmdListLength.Text = "length" Me.cmdListLength.UseVisualStyleBackColor = True @@ -7189,10 +7065,10 @@ Partial Class ucrCalculator ' Me.cmdListMedian.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdListMedian.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdListMedian.Location = New System.Drawing.Point(188, 64) - Me.cmdListMedian.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdListMedian.Location = New System.Drawing.Point(157, 53) + Me.cmdListMedian.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdListMedian.Name = "cmdListMedian" - Me.cmdListMedian.Size = New System.Drawing.Size(93, 45) + Me.cmdListMedian.Size = New System.Drawing.Size(78, 38) Me.cmdListMedian.TabIndex = 160 Me.cmdListMedian.Text = "median" Me.cmdListMedian.UseVisualStyleBackColor = True @@ -7201,10 +7077,10 @@ Partial Class ucrCalculator ' Me.cmdListMean.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdListMean.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdListMean.Location = New System.Drawing.Point(96, 64) - Me.cmdListMean.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdListMean.Location = New System.Drawing.Point(80, 53) + Me.cmdListMean.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdListMean.Name = "cmdListMean" - Me.cmdListMean.Size = New System.Drawing.Size(93, 45) + Me.cmdListMean.Size = New System.Drawing.Size(78, 38) Me.cmdListMean.TabIndex = 158 Me.cmdListMean.Text = "mean" Me.cmdListMean.UseVisualStyleBackColor = True @@ -7213,10 +7089,10 @@ Partial Class ucrCalculator ' Me.cmdListRange.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdListRange.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdListRange.Location = New System.Drawing.Point(4, 64) - Me.cmdListRange.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdListRange.Location = New System.Drawing.Point(3, 53) + Me.cmdListRange.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdListRange.Name = "cmdListRange" - Me.cmdListRange.Size = New System.Drawing.Size(93, 45) + Me.cmdListRange.Size = New System.Drawing.Size(78, 38) Me.cmdListRange.TabIndex = 157 Me.cmdListRange.Text = "range" Me.cmdListRange.UseVisualStyleBackColor = True @@ -7225,10 +7101,10 @@ Partial Class ucrCalculator ' Me.cmdListSum.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdListSum.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdListSum.Location = New System.Drawing.Point(96, 21) - Me.cmdListSum.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdListSum.Location = New System.Drawing.Point(80, 18) + Me.cmdListSum.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdListSum.Name = "cmdListSum" - Me.cmdListSum.Size = New System.Drawing.Size(93, 45) + Me.cmdListSum.Size = New System.Drawing.Size(78, 38) Me.cmdListSum.TabIndex = 153 Me.cmdListSum.Text = "sum" Me.cmdListSum.UseVisualStyleBackColor = True @@ -7237,10 +7113,10 @@ Partial Class ucrCalculator ' Me.cmdListSumd.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdListSumd.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdListSumd.Location = New System.Drawing.Point(188, 195) - Me.cmdListSumd.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdListSumd.Location = New System.Drawing.Point(157, 162) + Me.cmdListSumd.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdListSumd.Name = "cmdListSumd" - Me.cmdListSumd.Size = New System.Drawing.Size(93, 45) + Me.cmdListSumd.Size = New System.Drawing.Size(78, 38) Me.cmdListSumd.TabIndex = 149 Me.cmdListSumd.Text = "sumd" Me.cmdListSumd.UseVisualStyleBackColor = True @@ -7249,10 +7125,10 @@ Partial Class ucrCalculator ' Me.cmdListMissing.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdListMissing.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdListMissing.Location = New System.Drawing.Point(370, 195) - Me.cmdListMissing.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdListMissing.Location = New System.Drawing.Point(308, 162) + Me.cmdListMissing.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdListMissing.Name = "cmdListMissing" - Me.cmdListMissing.Size = New System.Drawing.Size(93, 45) + Me.cmdListMissing.Size = New System.Drawing.Size(78, 38) Me.cmdListMissing.TabIndex = 164 Me.cmdListMissing.Text = "missing" Me.cmdListMissing.UseVisualStyleBackColor = True @@ -7261,10 +7137,9 @@ Partial Class ucrCalculator ' Me.cmdRhelpList.AutoSize = True Me.cmdRhelpList.ContextMenuStrip = Me.ContextMenuStripList - Me.cmdRhelpList.Location = New System.Drawing.Point(1011, 39) - Me.cmdRhelpList.Margin = New System.Windows.Forms.Padding(4) + Me.cmdRhelpList.Location = New System.Drawing.Point(842, 32) Me.cmdRhelpList.Name = "cmdRhelpList" - Me.cmdRhelpList.Size = New System.Drawing.Size(102, 34) + Me.cmdRhelpList.Size = New System.Drawing.Size(85, 28) Me.cmdRhelpList.SplitMenuStrip = Me.ContextMenuStripList Me.cmdRhelpList.TabIndex = 212 Me.cmdRhelpList.Text = "R Help" @@ -7274,10 +7149,9 @@ Partial Class ucrCalculator ' Me.cmdWakefieldHelp.AutoSize = True Me.cmdWakefieldHelp.ContextMenuStrip = Me.ContextMenuStripWakefield - Me.cmdWakefieldHelp.Location = New System.Drawing.Point(1161, 62) - Me.cmdWakefieldHelp.Margin = New System.Windows.Forms.Padding(4) + Me.cmdWakefieldHelp.Location = New System.Drawing.Point(967, 43) Me.cmdWakefieldHelp.Name = "cmdWakefieldHelp" - Me.cmdWakefieldHelp.Size = New System.Drawing.Size(136, 34) + Me.cmdWakefieldHelp.Size = New System.Drawing.Size(113, 28) Me.cmdWakefieldHelp.SplitMenuStrip = Me.ContextMenuStripWakefield Me.cmdWakefieldHelp.TabIndex = 211 Me.cmdWakefieldHelp.Text = "R Help" @@ -7287,10 +7161,9 @@ Partial Class ucrCalculator ' Me.cmdStringRHelp.AutoSize = True Me.cmdStringRHelp.ContextMenuStrip = Me.ContextMenuStripTxtString - Me.cmdStringRHelp.Location = New System.Drawing.Point(970, 62) - Me.cmdStringRHelp.Margin = New System.Windows.Forms.Padding(4) + Me.cmdStringRHelp.Location = New System.Drawing.Point(808, 52) Me.cmdStringRHelp.Name = "cmdStringRHelp" - Me.cmdStringRHelp.Size = New System.Drawing.Size(136, 34) + Me.cmdStringRHelp.Size = New System.Drawing.Size(113, 28) Me.cmdStringRHelp.SplitMenuStrip = Me.ContextMenuStripTxtString Me.cmdStringRHelp.TabIndex = 210 Me.cmdStringRHelp.Text = "R Help" @@ -7299,20 +7172,20 @@ Partial Class ucrCalculator 'ucrSaveResultInto ' Me.ucrSaveResultInto.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrSaveResultInto.Location = New System.Drawing.Point(16, 455) - Me.ucrSaveResultInto.Margin = New System.Windows.Forms.Padding(6, 8, 6, 8) + Me.ucrSaveResultInto.Location = New System.Drawing.Point(13, 379) + Me.ucrSaveResultInto.Margin = New System.Windows.Forms.Padding(5, 7, 5, 7) Me.ucrSaveResultInto.Name = "ucrSaveResultInto" - Me.ucrSaveResultInto.Size = New System.Drawing.Size(490, 33) + Me.ucrSaveResultInto.Size = New System.Drawing.Size(408, 28) Me.ucrSaveResultInto.TabIndex = 196 ' 'ucrTryCalculator ' Me.ucrTryCalculator.AutoSize = True - Me.ucrTryCalculator.Location = New System.Drawing.Point(2, 384) - Me.ucrTryCalculator.Margin = New System.Windows.Forms.Padding(6) + Me.ucrTryCalculator.Location = New System.Drawing.Point(2, 320) + Me.ucrTryCalculator.Margin = New System.Windows.Forms.Padding(5) Me.ucrTryCalculator.Name = "ucrTryCalculator" Me.ucrTryCalculator.RunCommandAsMultipleLines = False - Me.ucrTryCalculator.Size = New System.Drawing.Size(594, 55) + Me.ucrTryCalculator.Size = New System.Drawing.Size(495, 46) Me.ucrTryCalculator.TabIndex = 194 ' 'ucrInputCalOptions @@ -7321,10 +7194,10 @@ Partial Class ucrCalculator Me.ucrInputCalOptions.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink Me.ucrInputCalOptions.GetSetSelectedIndex = -1 Me.ucrInputCalOptions.IsReadOnly = False - Me.ucrInputCalOptions.Location = New System.Drawing.Point(339, 62) - Me.ucrInputCalOptions.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.ucrInputCalOptions.Location = New System.Drawing.Point(282, 52) + Me.ucrInputCalOptions.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.ucrInputCalOptions.Name = "ucrInputCalOptions" - Me.ucrInputCalOptions.Size = New System.Drawing.Size(206, 33) + Me.ucrInputCalOptions.Size = New System.Drawing.Size(172, 28) Me.ucrInputCalOptions.TabIndex = 180 ' 'ucrSelectorForCalculations @@ -7333,60 +7206,191 @@ Partial Class ucrCalculator Me.ucrSelectorForCalculations.bDropUnusedFilterLevels = False Me.ucrSelectorForCalculations.bShowHiddenColumns = False Me.ucrSelectorForCalculations.bUseCurrentFilter = True - Me.ucrSelectorForCalculations.Location = New System.Drawing.Point(0, 96) + Me.ucrSelectorForCalculations.Location = New System.Drawing.Point(0, 80) Me.ucrSelectorForCalculations.Margin = New System.Windows.Forms.Padding(0) Me.ucrSelectorForCalculations.Name = "ucrSelectorForCalculations" - Me.ucrSelectorForCalculations.Size = New System.Drawing.Size(320, 274) + Me.ucrSelectorForCalculations.Size = New System.Drawing.Size(267, 228) Me.ucrSelectorForCalculations.TabIndex = 173 ' 'ucrReceiverForCalculation ' Me.ucrReceiverForCalculation.AutoSize = True Me.ucrReceiverForCalculation.frmParent = Nothing - Me.ucrReceiverForCalculation.Location = New System.Drawing.Point(105, 9) - Me.ucrReceiverForCalculation.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.ucrReceiverForCalculation.Location = New System.Drawing.Point(88, 8) + Me.ucrReceiverForCalculation.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.ucrReceiverForCalculation.Name = "ucrReceiverForCalculation" Me.ucrReceiverForCalculation.Selector = Nothing - Me.ucrReceiverForCalculation.Size = New System.Drawing.Size(586, 44) + Me.ucrReceiverForCalculation.Size = New System.Drawing.Size(488, 37) Me.ucrReceiverForCalculation.strNcFilePath = "" Me.ucrReceiverForCalculation.TabIndex = 120 Me.ucrReceiverForCalculation.ucrSelector = Nothing ' + 'cmdCircularHelp + ' + Me.cmdCircularHelp.AutoSize = True + Me.cmdCircularHelp.ContextMenuStrip = Me.ContextMenuStripCircular + Me.cmdCircularHelp.Location = New System.Drawing.Point(197, 178) + Me.cmdCircularHelp.Name = "cmdCircularHelp" + Me.cmdCircularHelp.Size = New System.Drawing.Size(108, 38) + Me.cmdCircularHelp.SplitMenuStrip = Me.ContextMenuStripCircular + Me.cmdCircularHelp.TabIndex = 212 + Me.cmdCircularHelp.Text = "R Help" + Me.cmdCircularHelp.UseVisualStyleBackColor = True + ' + 'cmdMathsHelp + ' + Me.cmdMathsHelp.AutoSize = True + Me.cmdMathsHelp.ContextMenuStrip = Me.ContextMenuStripMaths + Me.cmdMathsHelp.Location = New System.Drawing.Point(204, 165) + Me.cmdMathsHelp.Name = "cmdMathsHelp" + Me.cmdMathsHelp.Size = New System.Drawing.Size(108, 38) + Me.cmdMathsHelp.SplitMenuStrip = Me.ContextMenuStripMaths + Me.cmdMathsHelp.TabIndex = 211 + Me.cmdMathsHelp.Text = "R Help" + Me.cmdMathsHelp.UseVisualStyleBackColor = True + ' + 'cmdProbRHelp + ' + Me.cmdProbRHelp.AutoSize = True + Me.cmdProbRHelp.ContextMenuStrip = Me.ContextMenuStripProbability + Me.cmdProbRHelp.Location = New System.Drawing.Point(269, 239) + Me.cmdProbRHelp.Name = "cmdProbRHelp" + Me.cmdProbRHelp.Size = New System.Drawing.Size(108, 38) + Me.cmdProbRHelp.SplitMenuStrip = Me.ContextMenuStripProbability + Me.cmdProbRHelp.TabIndex = 212 + Me.cmdProbRHelp.Text = "R Help" + Me.cmdProbRHelp.UseVisualStyleBackColor = True + ' + 'cmdIntegerRHelp + ' + Me.cmdIntegerRHelp.AutoSize = True + Me.cmdIntegerRHelp.ContextMenuStrip = Me.ContextMenuStripInteger + Me.cmdIntegerRHelp.Location = New System.Drawing.Point(262, 354) + Me.cmdIntegerRHelp.Name = "cmdIntegerRHelp" + Me.cmdIntegerRHelp.Size = New System.Drawing.Size(113, 38) + Me.cmdIntegerRHelp.SplitMenuStrip = Me.ContextMenuStripInteger + Me.cmdIntegerRHelp.TabIndex = 16 + Me.cmdIntegerRHelp.Text = "R Help" + Me.cmdIntegerRHelp.UseVisualStyleBackColor = True + ' + 'cmdComplexRHelp + ' + Me.cmdComplexRHelp.AutoSize = True + Me.cmdComplexRHelp.ContextMenuStrip = Me.ContextMenuStripComplex + Me.cmdComplexRHelp.Location = New System.Drawing.Point(228, 212) + Me.cmdComplexRHelp.Name = "cmdComplexRHelp" + Me.cmdComplexRHelp.Size = New System.Drawing.Size(113, 38) + Me.cmdComplexRHelp.SplitMenuStrip = Me.ContextMenuStripComplex + Me.cmdComplexRHelp.TabIndex = 209 + Me.cmdComplexRHelp.Text = "R Help" + Me.cmdComplexRHelp.UseVisualStyleBackColor = True + ' + 'cmdSummaryRHelp + ' + Me.cmdSummaryRHelp.AutoSize = True + Me.cmdSummaryRHelp.ContextMenuStrip = Me.ContextMenuStripSummary + Me.cmdSummaryRHelp.Location = New System.Drawing.Point(228, 238) + Me.cmdSummaryRHelp.Name = "cmdSummaryRHelp" + Me.cmdSummaryRHelp.Size = New System.Drawing.Size(113, 38) + Me.cmdSummaryRHelp.SplitMenuStrip = Me.ContextMenuStripSummary + Me.cmdSummaryRHelp.TabIndex = 185 + Me.cmdSummaryRHelp.Text = "R Help" + Me.cmdSummaryRHelp.UseVisualStyleBackColor = True + ' + 'cmdTransformRHelp + ' + Me.cmdTransformRHelp.AutoSize = True + Me.cmdTransformRHelp.ContextMenuStrip = Me.ContextMenuStripTransform + Me.cmdTransformRHelp.Location = New System.Drawing.Point(267, 245) + Me.cmdTransformRHelp.Name = "cmdTransformRHelp" + Me.cmdTransformRHelp.Size = New System.Drawing.Size(113, 38) + Me.cmdTransformRHelp.SplitMenuStrip = Me.ContextMenuStripTransform + Me.cmdTransformRHelp.TabIndex = 204 + Me.cmdTransformRHelp.Text = "R Help" + Me.cmdTransformRHelp.UseVisualStyleBackColor = True + ' + 'cmdLogicalHelp + ' + Me.cmdLogicalHelp.AutoSize = True + Me.cmdLogicalHelp.ContextMenuStrip = Me.ContextMenuStripLogical + Me.cmdLogicalHelp.Location = New System.Drawing.Point(207, 234) + Me.cmdLogicalHelp.Name = "cmdLogicalHelp" + Me.cmdLogicalHelp.Size = New System.Drawing.Size(108, 38) + Me.cmdLogicalHelp.SplitMenuStrip = Me.ContextMenuStripLogical + Me.cmdLogicalHelp.TabIndex = 212 + Me.cmdLogicalHelp.Text = "R Help" + Me.cmdLogicalHelp.UseVisualStyleBackColor = True + ' + 'cmdRHelp + ' + Me.cmdRHelp.AutoSize = True + Me.cmdRHelp.ContextMenuStrip = Me.ContextMenuStripDate + Me.cmdRHelp.Location = New System.Drawing.Point(186, 164) + Me.cmdRHelp.Name = "cmdRHelp" + Me.cmdRHelp.Size = New System.Drawing.Size(113, 38) + Me.cmdRHelp.SplitMenuStrip = Me.ContextMenuStripDate + Me.cmdRHelp.TabIndex = 212 + Me.cmdRHelp.Text = "R Help" + Me.cmdRHelp.UseVisualStyleBackColor = True + ' + 'cmdHydroHelp + ' + Me.cmdHydroHelp.AutoSize = True + Me.cmdHydroHelp.ContextMenuStrip = Me.ContextMenuStripHydroGOF + Me.cmdHydroHelp.Location = New System.Drawing.Point(113, 298) + Me.cmdHydroHelp.Name = "cmdHydroHelp" + Me.cmdHydroHelp.Size = New System.Drawing.Size(108, 38) + Me.cmdHydroHelp.SplitMenuStrip = Me.ContextMenuStripHydroGOF + Me.cmdHydroHelp.TabIndex = 212 + Me.cmdHydroHelp.Text = "R Help" + Me.cmdHydroHelp.UseVisualStyleBackColor = True + ' + 'cmdTransformHelp + ' + Me.cmdTransformHelp.AutoSize = True + Me.cmdTransformHelp.ContextMenuStrip = Me.ContextMenuStripFactor + Me.cmdTransformHelp.Location = New System.Drawing.Point(188, 218) + Me.cmdTransformHelp.Name = "cmdTransformHelp" + Me.cmdTransformHelp.Size = New System.Drawing.Size(113, 38) + Me.cmdTransformHelp.SplitMenuStrip = Me.ContextMenuStripFactor + Me.cmdTransformHelp.TabIndex = 212 + Me.cmdTransformHelp.Text = "R Help" + Me.cmdTransformHelp.UseVisualStyleBackColor = True + ' 'ucrCalculator ' - Me.AutoScaleDimensions = New System.Drawing.SizeF(144.0!, 144.0!) + Me.AutoScaleDimensions = New System.Drawing.SizeF(120.0!, 120.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi Me.AutoSize = True - Me.Controls.Add(Me.cmdRhelpList) Me.Controls.Add(Me.grpList) - Me.Controls.Add(Me.grpProbabilty) - Me.Controls.Add(Me.grpInteger) + Me.Controls.Add(Me.grpWakefield) + Me.Controls.Add(Me.cmdRhelpList) Me.Controls.Add(Me.cmdWakefieldHelp) Me.Controls.Add(Me.cmdStringRHelp) Me.Controls.Add(Me.ucrSaveResultInto) Me.Controls.Add(Me.ucrTryCalculator) - Me.Controls.Add(Me.grpSymbols) Me.Controls.Add(Me.chkShowParameters) Me.Controls.Add(Me.ucrInputCalOptions) Me.Controls.Add(Me.grpBasic) Me.Controls.Add(Me.ucrSelectorForCalculations) Me.Controls.Add(Me.ucrReceiverForCalculation) Me.Controls.Add(Me.lblExpression) + Me.Controls.Add(Me.grpSymbols) + Me.Controls.Add(Me.grpCircular) + Me.Controls.Add(Me.grpMaths) + Me.Controls.Add(Me.grpProbabilty) + Me.Controls.Add(Me.grpInteger) Me.Controls.Add(Me.grpTestString) Me.Controls.Add(Me.grpModifier) Me.Controls.Add(Me.grpComplex) Me.Controls.Add(Me.grpSummary) - Me.Controls.Add(Me.grpWakefield) Me.Controls.Add(Me.grpTransform) Me.Controls.Add(Me.grpLogical) Me.Controls.Add(Me.grpDates) Me.Controls.Add(Me.grpHydroGOF) Me.Controls.Add(Me.grpFactor) - Me.Controls.Add(Me.grpCircular) - Me.Controls.Add(Me.grpMaths) - Me.Margin = New System.Windows.Forms.Padding(4) Me.Name = "ucrCalculator" - Me.Size = New System.Drawing.Size(1348, 686) + Me.Size = New System.Drawing.Size(1123, 572) Me.grpBasic.ResumeLayout(False) Me.grpDates.ResumeLayout(False) Me.grpDates.PerformLayout() @@ -7610,12 +7614,12 @@ Partial Class ucrCalculator Friend WithEvents ttCalculator As ToolTip Friend WithEvents cmdWakefield_Year As Button Friend WithEvents cmdValid As Button - Friend WithEvents cmdWakefield_Upper As Button + Friend WithEvents cmdWakefieldUpper As Button Friend WithEvents cmdString As Button Friend WithEvents cmdState As Button Friend WithEvents cmdSpeed As Button Friend WithEvents cmdSmokes As Button - Friend WithEvents cmdSex As Button + Friend WithEvents cmdWakefieldTimes As Button Friend WithEvents cmdSex_Inclusive As Button Friend WithEvents cmdGender As Button Friend WithEvents cmdSentence As Button @@ -7630,9 +7634,9 @@ Partial Class ucrCalculator Friend WithEvents cmdMarital As Button Friend WithEvents cmdLorem_ipsum As Button Friend WithEvents cmdGpa As Button - Friend WithEvents cmdEla As Button + Friend WithEvents cmdWakefieldMinute As Button Friend WithEvents cmdMath As Button - Friend WithEvents cmdLevel As Button + Friend WithEvents cmdWakefieldLower As Button Friend WithEvents cmdLanguage As Button Friend WithEvents cmdIq As Button Friend WithEvents cmdInternet_Browser As Button @@ -7644,9 +7648,9 @@ Partial Class ucrCalculator Friend WithEvents cmdDob As Button Friend WithEvents cmdDna As Button Friend WithEvents cmdDice As Button - Friend WithEvents cmdDied As Button + Friend WithEvents cmdGrade_Letter As Button Friend WithEvents cmdDeath As Button - Friend WithEvents cmdDate_Stamp As Button + Friend WithEvents cmdWakefieldDates As Button Friend WithEvents cmdPrimary As Button Friend WithEvents cmdColor As Button Friend WithEvents cmdCoin As Button @@ -7687,7 +7691,7 @@ Partial Class ucrCalculator Friend WithEvents cmdCircRange As Button Friend WithEvents cmdMedianHL As Button Friend WithEvents cmdCircRho As Button - Friend WithEvents cmdCircQuantile As Button + Friend WithEvents cmdCircQuantiles As Button Friend WithEvents cmdCircular As Button Friend WithEvents cmdMovmin As Button @@ -7729,7 +7733,7 @@ Partial Class ucrCalculator Friend WithEvents cmdQbinom As Button Friend WithEvents cmdQbirth As Button Friend WithEvents cmdQbeta As Button - Friend WithEvents cmdLinkert7 As Button + Friend WithEvents cmdLikert7 As Button Friend WithEvents cmdEncodeb As Button Friend WithEvents cmdSquishb As Button Friend WithEvents cmdExtract2 As Button @@ -7778,7 +7782,7 @@ Partial Class ucrCalculator Friend WithEvents cmdNrmse As Button Friend WithEvents cmdRmse As Button Friend WithEvents cmdRd As Button - Friend WithEvents cmdPbiasfde As Button + Friend WithEvents cmdPbiasfdc As Button Friend WithEvents cmdRSD As Button Friend WithEvents cmdRPearson As Button Friend WithEvents cmdRNSE As Button @@ -7891,7 +7895,7 @@ Partial Class ucrCalculator Friend WithEvents cmduniform As Button Friend WithEvents grpComplex As GroupBox Friend WithEvents cmdReal As Button - Friend WithEvents cmdAsComplex As Button + Friend WithEvents cmdComplex As Button Friend WithEvents cmdComplexExp As Button Friend WithEvents cmdComplexRound As Button Friend WithEvents cmdComplexLog As Button @@ -8014,4 +8018,13 @@ Partial Class ucrCalculator Friend WithEvents cmdListDiv As Button Friend WithEvents cmdListMod As Button Friend WithEvents cmdListIfelse As Button + Friend WithEvents cmdwheremin As Button + Friend WithEvents cmdwhichmax As Button + Friend WithEvents cmdwheremax As Button + Friend WithEvents cmdwhichmin As Button + Friend WithEvents MathsBaseStripMenuItem As ToolStripMenuItem + Friend WithEvents MathsCarToolStripMenuItem As ToolStripMenuItem + Friend WithEvents MathsCircularToolStripMenuItem As ToolStripMenuItem + Friend WithEvents cmdComplexi As Button + Friend WithEvents cmdAsComplex As Button End Class diff --git a/instat/ucrCalculator.resx b/instat/ucrCalculator.resx index 4338810a0ad..b436018d56a 100644 --- a/instat/ucrCalculator.resx +++ b/instat/ucrCalculator.resx @@ -163,6 +163,6 @@ 759, 103 - 36 + 99 \ No newline at end of file diff --git a/instat/ucrCalculator.vb b/instat/ucrCalculator.vb index 452d7b8475a..d06fd9b9e64 100644 --- a/instat/ucrCalculator.vb +++ b/instat/ucrCalculator.vb @@ -1,4 +1,4 @@ -' R- Instat +'R- Instat ' Copyright (C) 2015-2017 ' ' This program is free software: you can redistribute it and/or modify @@ -105,7 +105,6 @@ Public Class ucrCalculator ttCalculator.SetToolTip(cmdNasplin, "Spline interpolation of missing values. For example na.spline(c(NA,NA,NA,2,2,NA,4,7,NA),maxgap=2,na.rm=FALSE) = (NA,NA,NA,2,2,2.5,4,7,12)") ttCalculator.SetToolTip(cmdNaest, "Missing values as the mean (usually) overall or with a factor. For example na.aggregate(c(NA,NA,NA,2,2,NA,4,7,NA),maxgap=2,na.rm=FALSE) = (NA,NA,NA,2,2,3.75,4,7,3.75)") - ttCalculator.SetToolTip(cmdPower, "power(^)or exponent and can also be given as **. For example 2^3 = 8") ttCalculator.SetToolTip(cmdLesser, "less than(<). For example (2 < 3) is TRUE. (2 < 2) is FALSE, (2 < 1) is FALSE") ttCalculator.SetToolTip(cmdLesserOrEqualsTo, "less than or equals(<=). For example (2 <= 3) is TRUE, (2 <=2) is TRUE, (2 <= 1) is FALSE") @@ -162,6 +161,14 @@ Public Class ucrCalculator ttCalculator.SetToolTip(cmdQt, "t quantiles. For example qt(0.05, 5) = -2.015; qt(0.05, 100) = -1.66") ttCalculator.SetToolTip(cmdqF, "F quantiles. For example qf(0.95,1,10) = 4.965; qf(0.95, 50,50)= 1.599") + 'maths keyboard tooltips + ttCalculator.SetToolTip(cmdDeg, "Change from radians to degrees. For example deg(pi/2) = 90.") + ttCalculator.SetToolTip(cmdExp, "The exponential function. exp(1) = e = 2.71828. exp(0) = 1, exp(-2) = 0.1353 = 1/exp(2). It is the inverse of the log function, so exp(6.238) = 512, while log(512) = 6.238.") + ttCalculator.SetToolTip(cmdAbs, "The absolute (or positive) value. For example abs (-4.4) = abs(4.4) = 4.4.") + ttCalculator.SetToolTip(cmdSign, "The sign of the corresponding values. So sign(4.2)=1, sign(-20)=-1, sign(c(-2,-1,0,1,2,3))= (-1,-1,0,1,1,1)") + ttCalculator.SetToolTip(cmdLogit, "log(p/(1-p)) for p between 0 and 1, or between 0 and 100 if you have percentages. For example logit(c(0.2, 0.5, 0.95)) is (-1.386, 0, 2.944).") + ttCalculator.SetToolTip(cmdLogistic, "Distribution function for the logistic distribution. For example dlogis(c(-2,-1,0,1,2), 0, 5513) = (0.026, 0.14, 0.5, 0.86, 0.974). The scale of 0.5513 gives a standard deviation of 1.") + ttCalculator.SetToolTip(cmdAtan2, "atan2(x,y) gives the angle between the x axis and the vector between to origin and the point (x,y). For example atan2(1,1) = 0.7854 = pi/4 (=45 degrees).") ttCalculator.SetToolTip(cmdSqrt, "square root. For example sqrt(3) = 3 ^ 0.5 = 1.732") ttCalculator.SetToolTip(cmdCos, "cosine of angle in radians. For example cos(pi) = -1, cos(rad(90)) = (almost) 0.") ttCalculator.SetToolTip(cmdAcos, "angle corresponding to a given cosine (in the range 0 to pi). For example acos(0) = 1.57 = pi/2; deg(acos(-1))=180.") @@ -174,7 +181,9 @@ Public Class ucrCalculator ttCalculator.SetToolTip(cmdRad, "change from degrees to radians. For example rad(90) = 2*pi * 90/360 = 1.57 ( = pi/2)") ttCalculator.SetToolTip(cmdLogTen, "logarithm to base 10. For example log10(1000) =3 (=10^3)") ttCalculator.SetToolTip(cmdTan, " tangent of angle in radians. For example tan(pi/4) = sin(pi/4)/cos(pi/4) = tan(rad(45)) = 1") - ttCalculator.SetToolTip(cmdAtan, "angle corresponding to a given tangent (in the range 0 to pi). For example atan(1) = 0..7854 (= pi/4); deg(atan(1)) = 45.") + ttCalculator.SetToolTip(cmdAtan, "angle corresponding to a given tangent (in the range 0 to pi). For example atan(1) = 0.7854 (= pi/4); deg(atan(1)) = 45.") + ttCalculator.SetToolTip(cmdTrunc, "truncates the values towards 0. So trunc(3.5) = 3, trunc(-3.5)= -3") + '---------------------------------------------------------------------------------------------------- ttCalculator.SetToolTip(cmdUpper, "Change to upper case. For example str_to_upper(""Dr. Foster"") gives ""DR. FOSTER""") ttCalculator.SetToolTip(cmdLower, "Change to lower case. For example str_to_lower(""Dr. Foster"") gives ""dr. foster""") @@ -268,6 +277,103 @@ Public Class ucrCalculator ttCalculator.SetToolTip(cmdLucas, "generates Lucas numbers to the length of the dataframe. For example the 10th Lucas number is 76") ttCalculator.SetToolTip(cmdPrimorial, "gives the primorial (like the factorial, but just the primes up to the number) for a variable. For example primorial(c(7,8,9)) = 235*7 = (210, 210, 210)") + ' Complex keyboard tooltips + ttCalculator.SetToolTip(cmdComplexPi, "pi = 3.14159") + ttCalculator.SetToolTip(cmdComplexi, "i is defined as the square root of -1. So sqrt(as.complex(-1)) = 0 + 1i") + ttCalculator.SetToolTip(cmdComplex, "Construct a complex number. For example complex(3, 2) gives 3 + 2i.") + ttCalculator.SetToolTip(cmdAsComplex, "Define a variable as complex. For example as.complex(-1) gives 1 + 0i") + ttCalculator.SetToolTip(cmdReal, "The real part of a complex number. For example Re(3 + 2i) gives 3.") + ttCalculator.SetToolTip(cmdImaginary, "The imaginary part of a complex number or variable. For example Im(3 + 2i) gives 2.") + ttCalculator.SetToolTip(cmdMod, "The modulus (polar coordinate) of a complex number or variable. For example Mod(3 + 2i) gives 3.606, which is sqrt(3*3 + 2*2). Also abs(3 + 2i) is the same as Mod(3 + 2i).") + ttCalculator.SetToolTip(cmdArg, " The argument (polar coordinate) of a complex number or variable. For example Arg(3 + 2i) gives 0.588 where 3 = 3.606cos(0.588) and 2 = 3.606sin(0.588).") + ttCalculator.SetToolTip(cmdConjugate, "Conjugate of a complex number or variable: For example Conj(3 + 2i) gives 3 - 2i.") + ttCalculator.SetToolTip(cmdComplexRad, "Change from degrees to radians. For example rad(90 + 180i) gives (1.571 + 3.142i)") + ttCalculator.SetToolTip(cmdComplexDeg, " Change from radians to degrees. For example deg(pi/2 + 3.142i) gives (90 + 180i)") + ttCalculator.SetToolTip(cmdComplexSqrt, "Square root. For example sqrt(-9 + 0i) gives (0 + 3i) or just 3i. sqrt(-9 + 2i) gives 0.331 + 3.018i)") + 'to add ttCalculator.SetToolTip(cmdComplexExp, "The exponential function. For example exp(3 + 2i) gives") + ttCalculator.SetToolTip(cmdComplexRound, "round(pi/2 + 3.14259i) gives 2 + 3i) so rounds to whole numbers. round(pi/2 + 3.14259i, 2) gives 1.57 + 3.14i, so rounds to 2 decimals.") + ttCalculator.SetToolTip(cmdComplexSignif, "Rounds to give the specified number off digits in the larger of the components. For example signif(0.424 + 511.38i, 3) gives (0 + 511i)") + + 'Hydro GOF keyboard tooltips + ttCalculator.SetToolTip(cmdBr2, "r-squared times the slope of the regression line between sim and obs") + ttCalculator.SetToolTip(cmdCp, "coefficent of persistence between sim and obs") + ttCalculator.SetToolTip(cmdD, "Index of agreement between sim and obs") + ttCalculator.SetToolTip(cmdKGE, "Kling-Gupta efficiency between sim and obs") + ttCalculator.SetToolTip(cmdMae, "mean absolute error between sim and obs") + ttCalculator.SetToolTip(cmdMd, "modified index of agreement between sim and obsmNSE") + ttCalculator.SetToolTip(cmdMe, "mean error between sim and obs") + ttCalculator.SetToolTip(cmdmNSE, "modified Nash-Sutcliffe efficiency between sim and obs") + ttCalculator.SetToolTip(cmdMse, "mean squared error between sim and obs") + ttCalculator.SetToolTip(cmdNrmse, "normalized root mean square error between sim and obs") + ttCalculator.SetToolTip(cmdNSE, "Nash-Sutcliffe efficiency between sim and obs") + ttCalculator.SetToolTip(cmdPbias, "percent bias between sim and obs") + ttCalculator.SetToolTip(cmdPbiasfdc, "percent bias in the slope of the midsegment of the flow duration curve") + ttCalculator.SetToolTip(cmdRd, "relative index of agreement (d) between sim and obs. (Value is between 0 and 1)") + ttCalculator.SetToolTip(cmdRmse, "root mean square error between sim and obs, so the standard deviation of the model prediction error") + ttCalculator.SetToolTip(cmdRNSE, "relative Nash-Sutcliffe efficiency between sim and obs") + ttCalculator.SetToolTip(cmdRPearson, "correlation between sim and obs") + ttCalculator.SetToolTip(cmdRSD, "ratio of standard deviations between sim and obs") + ttCalculator.SetToolTip(cmdRsr, "ratio of the root mean square error between sim and obs to the standard deviation of obs") + ttCalculator.SetToolTip(cmdSsq, "sum of squared residuals between sim and obs") + ttCalculator.SetToolTip(cmdVE, " volumetric efficiency between sim and obs (Value is between 0 and 1)") + + 'Wakefield Tooltips + ttCalculator.SetToolTip(cmdAge, "Sample of ages, with default from 20 to 35") + ttCalculator.SetToolTip(cmdAnimal, "Sample of animals, with default of 10 from a list of 591 animals!") + ttCalculator.SetToolTip(cmdPet, "Sample of pets. Default is dog, cat, none, bird, horse, with given probabilities") + ttCalculator.SetToolTip(cmdAnswer, " Sample of No or Yes, with defaults of equal probability") + ttCalculator.SetToolTip(cmdCar, "Sample of cars, with datasets mtcars makes as default") + ttCalculator.SetToolTip(cmdChildren, "Sample of number of children, with default 0 to 10 and defined probabilities") + ttCalculator.SetToolTip(cmdCoin, "Sample giving heads or tails with default of equal probability") + ttCalculator.SetToolTip(cmdColor, "Sample by default from the 657 colours in the grDevices package") + ttCalculator.SetToolTip(cmdPrimary, "Sample by default from the colours, red, green, blue, yellow, black, and white. Are those your primary colours?") + ttCalculator.SetToolTip(cmdWakefieldDates, " Sample of dates with default being dates in order, by month, for the past year") + ttCalculator.SetToolTip(cmdDeath, "Sample giving FALSE/TRUE with default being equally likely") + ttCalculator.SetToolTip(cmdDice, "Sample with default being equally likely from a 6 sided dice") + ttCalculator.SetToolTip(cmdDna, "Sample with default being equally likely from Guanine, Adenine, Thymine, Cytosine") + ttCalculator.SetToolTip(cmdDob, "Sample of dates, with default being for 2 years, starting 15 years ago") + ttCalculator.SetToolTip(cmdDummy, "Sample of 0 and 1, with default equally likely") + ttCalculator.SetToolTip(cmdEducation, "Sample of 12 education levels from No education to doctorate with defined probabilities") + ttCalculator.SetToolTip(cmdEmployment, "Sample of 5 employment levels, namely: full-time, part-time, unemployed, retired, student") + ttCalculator.SetToolTip(cmdEye, "Sample of 5 eye colours, namely: brown, blue green, hazel, grey") + ttCalculator.SetToolTip(cmdGrade_Level, "Sample of grade levels from 1 to 12") + ttCalculator.SetToolTip(cmdGrade, "Sample from normal disribution with default mean 88 and sd 4. See also grade_letter and gpa") + ttCalculator.SetToolTip(cmdGrade_Letter, "Sample from normal distribution with default mean 88 snd sd 4, with fixed translation into A+ to F") + ttCalculator.SetToolTip(cmdGpa, "Sample from normal distribution with default mean 88 and sd 4, with fixed translation into gpa of 4 to 0") + ttCalculator.SetToolTip(cmdGroup, "Sample generating 2 groups, with default of random assignment to Control and Treatment, with equal probabilities") + ttCalculator.SetToolTip(cmdHair, "Sample with default of 4 hair colours, brown, black, blonde, red, and defined probabilities") + ttCalculator.SetToolTip(cmdHeight, "Sample from normal distribution with default mean 69, and sd 3.75, min 1, and no specified max, rounded to no decimals") + ttCalculator.SetToolTip(cmdIncome, "Sample from a gamma distribution with mean 40,000 and shape 2. (Multiply the result to change the mean)") + ttCalculator.SetToolTip(cmdInternet_Browser, "Sample from ""Which browser do you use?"" with Chrome, IE, Firefox, Safari, Opera, Android, being the options") + ttCalculator.SetToolTip(cmdIq, "Sample from normal distribution with default of mean 100 and sd 15 - not 10 as provided by the package") + ttCalculator.SetToolTip(cmdLanguage, "Sample of world's languages with default being list of 99 languages, provided, together with their proportions") + ttCalculator.SetToolTip(cmdWakefieldLower, "Sample of single letters, with default being one of a,b,c,d,e") + ttCalculator.SetToolTip(cmdMath, "Sample of integers with default of 1 to 4, and probabilities based on New York grading in maths for Grades 3 to 8 children. (Called level instead if equally likely)") + ttCalculator.SetToolTip(cmdWakefieldMinute, "Sample of minutes as H:M:S time elements. (Tweak command to hours or seconds if needed)") + ttCalculator.SetToolTip(cmdLikert, "Sample from 5-point scale, ranging from strongly agree to strongly disagree, with default of equal probabilities") + ttCalculator.SetToolTip(cmdLorem_ipsum, "Provides random gibberish text, based on Latin") + ttCalculator.SetToolTip(cmdMarital, "Sample with default of 5 categories, Married, Divorced, Widowed, Separated, Never Married, equally likely") + ttCalculator.SetToolTip(cmdMilitary, "Sample with default of 5 categories, Army, etc, and proportions to match US military") + ttCalculator.SetToolTip(cmdWakefield_Month, "Sample of months with default using full names for all months and equal proportions") + ttCalculator.SetToolTip(cmdName, "Sample of names, with default from provided list of 95,025 different gender-neutral names, (so sampled without replacement)") + ttCalculator.SetToolTip(cmdNormal, "Sample from normal distribution, with default being standard normal, (mean 0, sd 1) and no min or max values specified") + ttCalculator.SetToolTip(cmdPolitical, "Sample of political parties with default being 5 categories based on US registered voters") + ttCalculator.SetToolTip(cmdRace, "Sample with default of 8 races (white, to Hawaiaan) and US proportions") + ttCalculator.SetToolTip(cmdReligion, "Sample with default of 8 religions and world ratios of numbers in each") + ttCalculator.SetToolTip(cmdSat, "Sample of SAT scores. Normal distribution and default changed from package values to give mean of 1000 and maximum of 1600") + ttCalculator.SetToolTip(cmdSentence, "Sample of sentences with default supplied list from 2012 presidential debate") + ttCalculator.SetToolTip(cmdGender, "Sample of male, female with default proportions matching gender makeup") + ttCalculator.SetToolTip(cmdSex_Inclusive, "Sample of male, female, intersex, with default proportion of transgender from 2011 report") + ttCalculator.SetToolTip(cmdWakefieldTimes, "Sample of times of day as H:M:S time elements") + ttCalculator.SetToolTip(cmdSmokes, "Logical (TRUE/FALSE) sample with default of 18% smokers") + ttCalculator.SetToolTip(cmdSpeed, "Sample from normal distribution, with default mean 55 and sd 10") + ttCalculator.SetToolTip(cmdState, "Sample with default from the 50 US states in proportion to their 2010 populations") + ttCalculator.SetToolTip(cmdString, "Sample with default of 10 random alphanumeric characters") + ttCalculator.SetToolTip(cmdWakefieldUpper, "Sample of single capital letter, with default being one of A, B, C, D, E") + ttCalculator.SetToolTip(cmdValid, "Logical (TRUE/FALSE) sample with default being equal probability") + ttCalculator.SetToolTip(cmdWakefield_Year, "Sample of years with default from 1996 to current year, with equal probability") + ttCalculator.SetToolTip(cmdLikert7, " Sample from 7-point scale, ranging from strongly agree to strongly disagree, with default of equal probabilities") + Const strTooltipCmdLength = "number of observations: For example length(c(1,2,3,4,NA)) = 5 " ttCalculator.SetToolTip(cmdLength, strTooltipCmdLength) ttCalculator.SetToolTip(cmdListLength, strTooltipCmdLength) @@ -342,7 +448,10 @@ Public Class ucrCalculator ttCalculator.SetToolTip(cmdCor, "correlation between 2 variables. It is a value between -1 and +1.") ttCalculator.SetToolTip(cmdCov, "covariance between 2 variables.") ttCalculator.SetToolTip(cmdQuantile, "a quantile, given a value between 0 and 1. So quantile(c(1,2,3,4,10), 0.25) = 2 and is the lower quartile.") - + ttCalculator.SetToolTip(cmdwhichmax, "Row number of the maximum value. So which.max(c(4,3,10,1,2)) is 3") + ttCalculator.SetToolTip(cmdwhichmin, "Row number of the minimum value. So which.min(c(4,3,10,1,2)) is 4") + ttCalculator.SetToolTip(cmdwheremax, "Value of a variable at the which.max position. So for c(""a"",""b"",""c"",""d"",""e""), is ""c"", for the data in which.max tooltip.") + ttCalculator.SetToolTip(cmdwheremin, "Value of a variable at the which.min position. So for c(""a"",""b"",""c"",""d"",""e""), is ""d"", for the data in which.min tooltip.") ttCalculator.SetToolTip(cmdFreqDistinct, "complete the command by rep(d ,f) for data in variable called d and frequencies in f") ttCalculator.SetToolTip(cmdFreqIQR, "complete the command by rep(d ,f) for data in variable called d and frequencies in f") ttCalculator.SetToolTip(cmdFreqLength, "complete the command by rep(d ,f) for data in variable called d and frequencies in f") @@ -1797,7 +1906,7 @@ Public Class ucrCalculator Private Sub cmdMc_Click(sender As Object, e As EventArgs) Handles cmdMc.Click If chkShowParameters.Checked Then - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("robustbase::mc(x = , na.rm = TRUE, doReflect = (length(x = ) <= 100),doScale = TRUE, maxit = 100, trace.lev = 0, full.result = FALSE)", 113) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("robustbase::mc(x = , na.rm = TRUE, doReflect = (length(x = ) <= 100),doScale = TRUE, maxit= 100, trace.lev= 0, full.result= FALSE)", 113) Else ucrReceiverForCalculation.AddToReceiverAtCursorPosition("robustbase::mc( , na.rm = TRUE)", 16) End If @@ -2136,7 +2245,7 @@ Public Class ucrCalculator ucrReceiverForCalculation.AddToReceiverAtCursorPosition(clsWakefieldPrimaryFunction.ToScript, 0) End Sub - Private Sub cmdDate_Stamp_Click(sender As Object, e As EventArgs) Handles cmdDate_Stamp.Click + Private Sub cmdWakefieldDates_Click(sender As Object, e As EventArgs) Handles cmdWakefieldDates.Click Dim clsWakefieldDateStampFunction As New RFunction Dim clsWakefieldNrowFunction As New RFunction Dim clsStartDateFunction As New RFunction @@ -2176,20 +2285,21 @@ Public Class ucrCalculator ucrReceiverForCalculation.AddToReceiverAtCursorPosition(clsWakefieldDeathFunction.ToScript, 0) End Sub - Private Sub cmdDied_Click(sender As Object, e As EventArgs) Handles cmdDied.Click - Dim clsWakefieldDiedFunction As New RFunction + Private Sub cmdGrade_Letter_Click(sender As Object, e As EventArgs) Handles cmdGrade_Letter.Click + Dim clsWakefieldgrade_letterFunction As New RFunction Dim clsWakefieldNrowFunction As New RFunction clsWakefieldNrowFunction.SetRCommand("nrow") clsWakefieldNrowFunction.AddParameter("x", ucrSelectorForCalculations.ucrAvailableDataFrames.cboAvailableDataFrames.SelectedItem, iPosition:=0) - clsWakefieldDiedFunction.SetPackageName("wakefield") - clsWakefieldDiedFunction.SetRCommand("died") - clsWakefieldDiedFunction.AddParameter("n", clsRFunctionParameter:=clsWakefieldNrowFunction, iPosition:=0) - clsWakefieldDiedFunction.AddParameter("prob", "NULL", iPosition:=1) - clsWakefieldDiedFunction.AddParameter("name", Chr(34) & "Died" & Chr(34), iPosition:=2) + clsWakefieldgrade_letterFunction.SetPackageName("wakefield") + clsWakefieldgrade_letterFunction.SetRCommand("grade_letter") + clsWakefieldgrade_letterFunction.AddParameter("n", clsRFunctionParameter:=clsWakefieldNrowFunction, iPosition:=0) + clsWakefieldgrade_letterFunction.AddParameter("mean", "88", iPosition:=1) + clsWakefieldgrade_letterFunction.AddParameter("sd", "4", iPosition:=2) + clsWakefieldgrade_letterFunction.AddParameter("name", Chr(34) & "Grade_Letter" & Chr(34), iPosition:=3) - ucrReceiverForCalculation.AddToReceiverAtCursorPosition(clsWakefieldDiedFunction.ToScript, 0) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition(clsWakefieldgrade_letterFunction.ToScript, 0) End Sub Private Sub cmdDice_Click(sender As Object, e As EventArgs) Handles cmdDice.Click @@ -2580,7 +2690,7 @@ Public Class ucrCalculator clsWakefieldIQFunction.SetRCommand("iq") clsWakefieldIQFunction.AddParameter("n", clsRFunctionParameter:=clsWakefieldNrowFunction, iPosition:=0) clsWakefieldIQFunction.AddParameter("mean", "100", iPosition:=1) - clsWakefieldIQFunction.AddParameter("sd", "10", iPosition:=2) + clsWakefieldIQFunction.AddParameter("sd", "15", iPosition:=2) clsWakefieldIQFunction.AddParameter("min", "0", iPosition:=3) clsWakefieldIQFunction.AddParameter("max", "NULL", iPosition:=4) clsWakefieldIQFunction.AddParameter("digits", "0", iPosition:=5) @@ -2607,22 +2717,6 @@ Public Class ucrCalculator ucrReceiverForCalculation.AddToReceiverAtCursorPosition(clsWakefieldLanguageFunction.ToScript, 0) End Sub - Private Sub cmdLevel_Click(sender As Object, e As EventArgs) Handles cmdLevel.Click - Dim clsWakefieldLevelFunction As New RFunction - Dim clsWakefieldNrowFunction As New RFunction - - clsWakefieldNrowFunction.SetRCommand("nrow") - clsWakefieldNrowFunction.AddParameter("x", ucrSelectorForCalculations.ucrAvailableDataFrames.cboAvailableDataFrames.SelectedItem, iPosition:=0) - - clsWakefieldLevelFunction.SetPackageName("wakefield") - clsWakefieldLevelFunction.SetRCommand("level") - clsWakefieldLevelFunction.AddParameter("n", clsRFunctionParameter:=clsWakefieldNrowFunction, iPosition:=0) - clsWakefieldLevelFunction.AddParameter("x", "1:4", iPosition:=1) - clsWakefieldLevelFunction.AddParameter("prob", "NULL", iPosition:=2) - clsWakefieldLevelFunction.AddParameter("name", Chr(34) & "Level" & Chr(34), iPosition:=3) - - ucrReceiverForCalculation.AddToReceiverAtCursorPosition(clsWakefieldLevelFunction.ToScript, 0) - End Sub Private Sub cmdMath_Click(sender As Object, e As EventArgs) Handles cmdMath.Click Dim clsWakefieldMathFunction As New RFunction Dim clsWakefieldNrowFunction As New RFunction @@ -2647,28 +2741,22 @@ Public Class ucrCalculator ucrReceiverForCalculation.AddToReceiverAtCursorPosition(clsWakefieldMathFunction.ToScript, 0) End Sub - Private Sub cmdEla_Click(sender As Object, e As EventArgs) Handles cmdEla.Click - Dim clsWakefieldElaFunction As New RFunction + Private Sub cmdWakefieldMinute_Click(sender As Object, e As EventArgs) Handles cmdWakefieldMinute.Click + Dim clsWakefieldMinuteFunction As New RFunction Dim clsWakefieldNrowFunction As New RFunction - Dim clsELAProbFunction As New RFunction clsWakefieldNrowFunction.SetRCommand("nrow") clsWakefieldNrowFunction.AddParameter("x", ucrSelectorForCalculations.ucrAvailableDataFrames.cboAvailableDataFrames.SelectedItem, iPosition:=0) - clsELAProbFunction.SetRCommand("c") - clsELAProbFunction.AddParameter("0.3161", "0.29829", iPosition:=0, bIncludeArgumentName:=False) - clsELAProbFunction.AddParameter("0.37257", "0.37257", iPosition:=1, bIncludeArgumentName:=False) - clsELAProbFunction.AddParameter("0.2233", "0.2233", iPosition:=2, bIncludeArgumentName:=False) - clsELAProbFunction.AddParameter("0.08803", "0.08803", iPosition:=3, bIncludeArgumentName:=False) - - clsWakefieldElaFunction.SetPackageName("wakefield") - clsWakefieldElaFunction.SetRCommand("ela") - clsWakefieldElaFunction.AddParameter("n", clsRFunctionParameter:=clsWakefieldNrowFunction, iPosition:=0) - clsWakefieldElaFunction.AddParameter("x", "1:4", iPosition:=1) - clsWakefieldElaFunction.AddParameter("prob", clsRFunctionParameter:=clsELAProbFunction, iPosition:=2) - clsWakefieldElaFunction.AddParameter("name", Chr(34) & "ELA" & Chr(34), iPosition:=3) + clsWakefieldMinuteFunction.SetPackageName("wakefield") + clsWakefieldMinuteFunction.SetRCommand("minute") + clsWakefieldMinuteFunction.AddParameter("n", clsRFunctionParameter:=clsWakefieldNrowFunction, iPosition:=0) + clsWakefieldMinuteFunction.AddParameter("x", "seq(0, 59, by = 1)/60 ", iPosition:=1) + clsWakefieldMinuteFunction.AddParameter("prob", "NULL", iPosition:=2) + clsWakefieldMinuteFunction.AddParameter("random", "FALSE", iPosition:=3) + clsWakefieldMinuteFunction.AddParameter("name", Chr(34) & "Minute" & Chr(34), iPosition:=4) - ucrReceiverForCalculation.AddToReceiverAtCursorPosition(clsWakefieldElaFunction.ToScript, 0) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition(clsWakefieldMinuteFunction.ToScript, 0) End Sub Private Sub cmdGpa_Click(sender As Object, e As EventArgs) Handles cmdGpa.Click @@ -2961,10 +3049,10 @@ Public Class ucrCalculator clsWakefieldSatFunction.SetPackageName("wakefield") clsWakefieldSatFunction.SetRCommand("sat") clsWakefieldSatFunction.AddParameter("n", clsRFunctionParameter:=clsWakefieldNrowFunction, iPosition:=0) - clsWakefieldSatFunction.AddParameter("mean", "1500", iPosition:=1) - clsWakefieldSatFunction.AddParameter("sd", "100", iPosition:=2) - clsWakefieldSatFunction.AddParameter("min", "0", iPosition:=3) - clsWakefieldSatFunction.AddParameter("max", "2400", iPosition:=4) + clsWakefieldSatFunction.AddParameter("mean", "1000", iPosition:=1) + clsWakefieldSatFunction.AddParameter("sd", "150", iPosition:=2) + clsWakefieldSatFunction.AddParameter("min", "400", iPosition:=3) + clsWakefieldSatFunction.AddParameter("max", "1600", iPosition:=4) clsWakefieldSatFunction.AddParameter("digits", "0", iPosition:=5) clsWakefieldSatFunction.AddParameter("name", Chr(34) & "SAT" & Chr(34), iPosition:=6) @@ -3038,31 +3126,22 @@ Public Class ucrCalculator ucrReceiverForCalculation.AddToReceiverAtCursorPosition(clsWakefieldSexInclusiveFunction.ToScript, 0) End Sub - Private Sub cmdSex_Click(sender As Object, e As EventArgs) Handles cmdSex.Click - Dim clsWakefieldSexFunction As New RFunction + Private Sub cmdWakefieldTimes_Click(sender As Object, e As EventArgs) Handles cmdWakefieldTimes.Click + Dim clsWakefieldTimestampFunction As New RFunction Dim clsWakefieldNrowFunction As New RFunction - Dim clsSexListFunction As New RFunction - Dim clsSexProbFunction As New RFunction clsWakefieldNrowFunction.SetRCommand("nrow") clsWakefieldNrowFunction.AddParameter("x", ucrSelectorForCalculations.ucrAvailableDataFrames.cboAvailableDataFrames.SelectedItem, iPosition:=0) - clsSexListFunction.SetRCommand("c") - clsSexListFunction.AddParameter("male", Chr(34) & "Male" & Chr(34), iPosition:=0, bIncludeArgumentName:=False) - clsSexListFunction.AddParameter("female", Chr(34) & "Female" & Chr(34), iPosition:=1, bIncludeArgumentName:=False) - - clsSexProbFunction.SetRCommand("c") - clsSexProbFunction.AddParameter("0.51219512195122", "0.51219512195122", iPosition:=0, bIncludeArgumentName:=False) - clsSexProbFunction.AddParameter("0.48780487804878", "0.48780487804878", iPosition:=1, bIncludeArgumentName:=False) + clsWakefieldTimestampFunction.SetPackageName("wakefield") + clsWakefieldTimestampFunction.SetRCommand("time_stamp") + clsWakefieldTimestampFunction.AddParameter("n", clsRFunctionParameter:=clsWakefieldNrowFunction, iPosition:=0) + clsWakefieldTimestampFunction.AddParameter("x", "seq(0, 23, by = 1)", iPosition:=1) + clsWakefieldTimestampFunction.AddParameter("prob", "NULL", iPosition:=2) + clsWakefieldTimestampFunction.AddParameter("random", "FALSE", iPosition:=3) + clsWakefieldTimestampFunction.AddParameter("name", Chr(34) & "Time" & Chr(34), iPosition:=4) - clsWakefieldSexFunction.SetPackageName("wakefield") - clsWakefieldSexFunction.SetRCommand("sex") - clsWakefieldSexFunction.AddParameter("n", clsRFunctionParameter:=clsWakefieldNrowFunction, iPosition:=0) - clsWakefieldSexFunction.AddParameter("x", clsRFunctionParameter:=clsSexListFunction, iPosition:=1) - clsWakefieldSexFunction.AddParameter("prob", clsRFunctionParameter:=clsSexProbFunction, iPosition:=2) - clsWakefieldSexFunction.AddParameter("name", Chr(34) & "Sex" & Chr(34), iPosition:=3) - - ucrReceiverForCalculation.AddToReceiverAtCursorPosition(clsWakefieldSexFunction.ToScript, 0) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition(clsWakefieldTimestampFunction.ToScript, 0) End Sub Private Sub cmdSmokes_Click(sender As Object, e As EventArgs) Handles cmdSmokes.Click @@ -3140,22 +3219,40 @@ Public Class ucrCalculator ucrReceiverForCalculation.AddToReceiverAtCursorPosition(clsWakefieldStringFunction.ToScript, 0) End Sub - Private Sub cmdWakefield_Upper_Click(sender As Object, e As EventArgs) Handles cmdWakefield_Upper.Click - Dim clsWakefieldUpperFunction As New RFunction + Private Sub cmdWakefield_Upper_Click(sender As Object, e As EventArgs) Handles cmdWakefieldUpper.Click + Dim clsWakefieldUpper_factorFunction As New RFunction Dim clsWakefieldNrowFunction As New RFunction clsWakefieldNrowFunction.SetRCommand("nrow") clsWakefieldNrowFunction.AddParameter("x", ucrSelectorForCalculations.ucrAvailableDataFrames.cboAvailableDataFrames.SelectedItem, iPosition:=0) - clsWakefieldUpperFunction.SetPackageName("wakefield") - clsWakefieldUpperFunction.SetRCommand("upper") - clsWakefieldUpperFunction.AddParameter("n", clsRFunctionParameter:=clsWakefieldNrowFunction, iPosition:=0) - clsWakefieldUpperFunction.AddParameter("k", "5", iPosition:=1) - clsWakefieldUpperFunction.AddParameter("x", "LETTERS", iPosition:=2) - clsWakefieldUpperFunction.AddParameter("prob", "NULL", iPosition:=3) - clsWakefieldUpperFunction.AddParameter("name", Chr(34) & "Upper" & Chr(34), iPosition:=4) + clsWakefieldUpper_factorFunction.SetPackageName("wakefield") + clsWakefieldUpper_factorFunction.SetRCommand("upper_factor") + clsWakefieldUpper_factorFunction.AddParameter("n", clsRFunctionParameter:=clsWakefieldNrowFunction, iPosition:=0) + clsWakefieldUpper_factorFunction.AddParameter("k", "5", iPosition:=1) + clsWakefieldUpper_factorFunction.AddParameter("x", "LETTERS", iPosition:=2) + clsWakefieldUpper_factorFunction.AddParameter("prob", "NULL", iPosition:=3) + clsWakefieldUpper_factorFunction.AddParameter("name", Chr(34) & "Upper" & Chr(34), iPosition:=4) - ucrReceiverForCalculation.AddToReceiverAtCursorPosition(clsWakefieldUpperFunction.ToScript, 0) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition(clsWakefieldUpper_factorFunction.ToScript, 0) + End Sub + + Private Sub cmdWakefieldLower_click(sender As Object, e As EventArgs) Handles cmdWakefieldLower.Click + Dim clsWakefieldLower_FactorFunction As New RFunction + Dim clsWakefieldNrowFunction As New RFunction + + clsWakefieldNrowFunction.SetRCommand("nrow") + clsWakefieldNrowFunction.AddParameter("x", ucrSelectorForCalculations.ucrAvailableDataFrames.cboAvailableDataFrames.SelectedItem, iPosition:=0) + + clsWakefieldLower_FactorFunction.SetPackageName("wakefield") + clsWakefieldLower_FactorFunction.SetRCommand("lower_factor") + clsWakefieldLower_FactorFunction.AddParameter("n", clsRFunctionParameter:=clsWakefieldNrowFunction, iPosition:=0) + clsWakefieldLower_FactorFunction.AddParameter("k", "5", iPosition:=1) + clsWakefieldLower_FactorFunction.AddParameter("x", "letters", iPosition:=2) + clsWakefieldLower_FactorFunction.AddParameter("prob", "NULL", iPosition:=3) + clsWakefieldLower_FactorFunction.AddParameter("name", Chr(34) & "Lower" & Chr(34), iPosition:=4) + + ucrReceiverForCalculation.AddToReceiverAtCursorPosition(clsWakefieldLower_FactorFunction.ToScript, 0) End Sub Private Sub cmdValid_Click(sender As Object, e As EventArgs) Handles cmdValid.Click @@ -3295,7 +3392,7 @@ Public Class ucrCalculator End If End Sub - Private Sub cmdCircQuantile_Click_1(sender As Object, e As EventArgs) Handles cmdCircQuantile.Click + Private Sub cmdCircQuantiles_Click_1(sender As Object, e As EventArgs) Handles cmdCircQuantiles.Click If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("circular::quantile.circular(x = , probs = seq(0, 1, 0.25), na.rm = FALSE, names = TRUE, type = 7)", 66) Else @@ -3619,7 +3716,7 @@ Public Class ucrCalculator End If End Sub - Private Sub cmdLinkert7_Click(sender As Object, e As EventArgs) Handles cmdLinkert7.Click + Private Sub cmdLikert7_Click(sender As Object, e As EventArgs) Handles cmdLikert7.Click Dim clsWakefieldLikert7Function As New RFunction Dim clsWakefieldNrowFunction As New RFunction Dim clsLikert7ListFunction As New RFunction @@ -3641,7 +3738,7 @@ Public Class ucrCalculator clsWakefieldLikert7Function.AddParameter("n", clsRFunctionParameter:=clsWakefieldNrowFunction, iPosition:=0) clsWakefieldLikert7Function.AddParameter("x", clsRFunctionParameter:=clsLikert7ListFunction, iPosition:=1) clsWakefieldLikert7Function.AddParameter("prob", "NULL", iPosition:=2) - clsWakefieldLikert7Function.AddParameter("name", Chr(34) & "Likert" & Chr(34), iPosition:=3) + clsWakefieldLikert7Function.AddParameter("name", Chr(34) & "Likert7" & Chr(34), iPosition:=3) ucrReceiverForCalculation.AddToReceiverAtCursorPosition(clsWakefieldLikert7Function.ToScript, 0) End Sub @@ -3914,7 +4011,7 @@ Public Class ucrCalculator End If End Sub - Private Sub cmdPbiasfde_Click(sender As Object, e As EventArgs) Handles cmdPbiasfde.Click + Private Sub cmdPbiasfdc_Click(sender As Object, e As EventArgs) Handles cmdPbiasfdc.Click If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("hydroGOF::pbiasfdc(sim = , obs = , plot = FALSE)", 24) Else @@ -4784,14 +4881,35 @@ Public Class ucrCalculator OpenHelpPage() End Sub - Private Sub cmdMathsHelp_Click(sender As Object, e As EventArgs) Handles cmdMathsHelp.Click, MathsStatsStripMenuItem.Click + Private Sub cmdMathsHelp_Click(sender As Object, e As EventArgs) Handles cmdMathsHelp.Click, MathsBaseStripMenuItem.Click CalculationsOptions() + If ucrInputCalOptions.GetText = "Maths" Then + strPackageName = "base" + End If + OpenHelpPage() + End Sub + + Private Sub MathsStatsStripMenuItem_Click(sender As Object, e As EventArgs) Handles MathsStatsStripMenuItem.Click If ucrInputCalOptions.GetText = "Maths" Then strPackageName = "stats" End If OpenHelpPage() End Sub + Private Sub MathsCarToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles MathsCarToolStripMenuItem.Click + If ucrInputCalOptions.GetText = "Maths" Then + strPackageName = "car" + End If + OpenHelpPage() + End Sub + + Private Sub MathsCircularToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles MathsCircularToolStripMenuItem.Click + If ucrInputCalOptions.GetText = "Maths" Then + strPackageName = "circular" + End If + OpenHelpPage() + End Sub + Private Sub cmdTransformHelp_Click(sender As Object, e As EventArgs) Handles cmdTransformHelp.Click, FactorForcatsToolStripMenuItem.Click CalculationsOptions() If ucrInputCalOptions.GetText = "Factor" Then @@ -5003,11 +5121,11 @@ Public Class ucrCalculator ucrReceiverForCalculation.AddToReceiverAtCursorPosition(clsSampleFunction.ToScript, 36) End Sub - Private Sub cmdAsComplex_Click(sender As Object, e As EventArgs) Handles cmdAsComplex.Click + Private Sub cmdAsComplex_Click(sender As Object, e As EventArgs) Handles cmdComplex.Click If chkShowParameters.Checked Then - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("as.complex(x = )", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("complex(x = )", 1) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("as.complex( )", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("complex( )", 1) End If End Sub @@ -5148,7 +5266,7 @@ Public Class ucrCalculator End Sub Private Sub cmdComplexPi_Click(sender As Object, e As EventArgs) Handles cmdComplexPi.Click - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("pi()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("pi", -1) End Sub Private Sub cmdPascal_Click(sender As Object, e As EventArgs) Handles cmdPascal.Click @@ -5374,4 +5492,48 @@ Public Class ucrCalculator Private Sub cmdListDuplicated_Click(sender As Object, e As EventArgs) Handles cmdListDuplicated.Click ucrReceiverForCalculation.AddToReceiverAtCursorPosition("sapply( ,duplicated)", 13) End Sub + + Private Sub cmdwhichmax_Click(sender As Object, e As EventArgs) Handles cmdwhichmax.Click + If chkShowParameters.Checked Then + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("which.max(x= )", 1) + Else + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("which.max()", 1) + End If + End Sub + + Private Sub cmdwheremin_Click(sender As Object, e As EventArgs) Handles cmdwheremin.Click + If chkShowParameters.Checked Then + ucrReceiverForCalculation.AddToReceiverAtCursorPosition(" [which.min(x= )]", 17) + Else + ucrReceiverForCalculation.AddToReceiverAtCursorPosition(" [which.min( )]", 15) + End If + End Sub + + Private Sub cmdwhichmin_Click(sender As Object, e As EventArgs) Handles cmdwhichmin.Click + If chkShowParameters.Checked Then + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("which.min(x= )", 1) + Else + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("which.min()", 1) + End If + End Sub + + Private Sub cmdwheremax_Click(sender As Object, e As EventArgs) Handles cmdwheremax.Click + If chkShowParameters.Checked Then + ucrReceiverForCalculation.AddToReceiverAtCursorPosition(" [which.max(x= )]", 17) + Else + ucrReceiverForCalculation.AddToReceiverAtCursorPosition(" [which.max( )]", 15) + End If + End Sub + + Private Sub cmdComplexi_Click(sender As Object, e As EventArgs) Handles cmdComplexi.Click + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("i", -1) + End Sub + + Private Sub cmdAsComplex_Click_1(sender As Object, e As EventArgs) Handles cmdAsComplex.Click + If chkShowParameters.Checked Then + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("as.complex(x = )", 1) + Else + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("as.complex( )", 1) + End If + End Sub End Class diff --git a/instat/ucrGeom.vb b/instat/ucrGeom.vb index 48dd0d564fd..9f293a0eb11 100644 --- a/instat/ucrGeom.vb +++ b/instat/ucrGeom.vb @@ -34,7 +34,7 @@ Public Class ucrGeom Public bPauseChanges As Boolean = False Dim strLineType As String() = {Chr(34) & "blank" & Chr(34), Chr(34) & "solid" & Chr(34), Chr(34) & "dashed" & Chr(34), Chr(34) & "dotted" & Chr(34), Chr(34) & "dotdash" & Chr(34), Chr(34) & "longdash" & Chr(34), Chr(34) & "twodash" & Chr(34)} Dim strShapePoint As String() = {Chr(34) & "circle" & Chr(34), Chr(34) & "circle open" & Chr(34), Chr(34) & "circle filled" & Chr(34), Chr(34) & "circle cross" & Chr(34), Chr(34) & "circle plus" & Chr(34), Chr(34) & "circle small" & Chr(34), Chr(34) & "bullet" & Chr(34), Chr(34) & "square" & Chr(34), Chr(34) & "square open" & Chr(34), Chr(34) & "square filled" & Chr(34), Chr(34) & "square cross" & Chr(34), Chr(34) & "square plus" & Chr(34), Chr(34) & "square triangle" & Chr(34), Chr(34) & "diamond" & Chr(34), Chr(34) & "diamond open" & Chr(34), Chr(34) & "diamond filled" & Chr(34), Chr(34) & "diamond plus" & Chr(34), Chr(34) & "triangle" & Chr(34), Chr(34) & "triangle open" & Chr(34), Chr(34) & "triangle filled" & Chr(34), Chr(34) & "triangle square" & Chr(34), Chr(34) & "triangle down open" & Chr(34), Chr(34) & "triangle down filled" & Chr(34), Chr(34) & "plus" & Chr(34), Chr(34) & "cross" & Chr(34), Chr(34) & "asterisk" & Chr(34)} - Dim strBoxShapePoint As String() = {Chr(34) & "NA" & Chr(34), Chr(34) & "circle" & Chr(34), Chr(34) & "circle open" & Chr(34), Chr(34) & "circle filled" & Chr(34), Chr(34) & "circle cross" & Chr(34), Chr(34) & "circle plus" & Chr(34), Chr(34) & "circle small" & Chr(34), Chr(34) & "bullet" & Chr(34), Chr(34) & "square" & Chr(34), Chr(34) & "square open" & Chr(34), Chr(34) & "square filled" & Chr(34), Chr(34) & "square cross" & Chr(34), Chr(34) & "square plus" & Chr(34), Chr(34) & "square triangle" & Chr(34), Chr(34) & "diamond" & Chr(34), Chr(34) & "diamond open" & Chr(34), Chr(34) & "diamond filled" & Chr(34), Chr(34) & "diamond plus" & Chr(34), Chr(34) & "triangle" & Chr(34), Chr(34) & "triangle open" & Chr(34), Chr(34) & "triangle filled" & Chr(34), Chr(34) & "triangle square" & Chr(34), Chr(34) & "triangle down open" & Chr(34), Chr(34) & "triangle down filled" & Chr(34), Chr(34) & "plus" & Chr(34), Chr(34) & "cross" & Chr(34), Chr(34) & "asterisk" & Chr(34)} + Dim strBoxShapePoint As String() = {"NA", Chr(34) & "circle" & Chr(34), Chr(34) & "circle open" & Chr(34), Chr(34) & "circle filled" & Chr(34), Chr(34) & "circle cross" & Chr(34), Chr(34) & "circle plus" & Chr(34), Chr(34) & "circle small" & Chr(34), Chr(34) & "bullet" & Chr(34), Chr(34) & "square" & Chr(34), Chr(34) & "square open" & Chr(34), Chr(34) & "square filled" & Chr(34), Chr(34) & "square cross" & Chr(34), Chr(34) & "square plus" & Chr(34), Chr(34) & "square triangle" & Chr(34), Chr(34) & "diamond" & Chr(34), Chr(34) & "diamond open" & Chr(34), Chr(34) & "diamond filled" & Chr(34), Chr(34) & "diamond plus" & Chr(34), Chr(34) & "triangle" & Chr(34), Chr(34) & "triangle open" & Chr(34), Chr(34) & "triangle filled" & Chr(34), Chr(34) & "triangle square" & Chr(34), Chr(34) & "triangle down open" & Chr(34), Chr(34) & "triangle down filled" & Chr(34), Chr(34) & "plus" & Chr(34), Chr(34) & "cross" & Chr(34), Chr(34) & "asterisk" & Chr(34)} Private bResetGlobal As Boolean = False Public Sub New() @@ -150,6 +150,8 @@ Public Class ucrGeom Dim clsgeom_lollipop As New Geoms Dim clsgeom_map As New Geoms Dim clsgeom_mosaic As New Geoms + Dim clsgeom_mosaic_text As New Geoms + Dim clsgeom_mosaic_jitter As New Geoms Dim clsgeom_parallel_slopes As New Geoms Dim clsgeom_path As New Geoms Dim clsgeom_point As New Geoms @@ -332,8 +334,8 @@ Public Class ucrGeom clsgeom_statcor.AddLayerParameter("label.sep", "editablelist", Chr(34) & ", " & Chr(34), lstParameterStrings:={Chr(34) & ", " & Chr(34)}) clsgeom_statcor.AddLayerParameter("label.x.npc", "list", Chr(34) & "left" & Chr(34), lstParameterStrings:={Chr(34) & "left" & Chr(34), Chr(34) & "right" & Chr(34), Chr(34) & "center" & Chr(34), Chr(34) & "centre" & Chr(34), Chr(34) & "middle" & Chr(34)}) clsgeom_statcor.AddLayerParameter("label.y.npc", "list", Chr(34) & "top" & Chr(34), lstParameterStrings:={Chr(34) & "top" & Chr(34), Chr(34) & "bottom" & Chr(34), Chr(34) & "center" & Chr(34), Chr(34) & "centre" & Chr(34), Chr(34) & "middle" & Chr(34)}) - clsgeom_statcor.AddLayerParameter("label.x", "editablelist", Chr(34) & "NULL" & Chr(34), lstParameterStrings:={Chr(34) & "NULL" & Chr(34)}) - clsgeom_statcor.AddLayerParameter("label.y", "editablelist", Chr(34) & "NULL" & Chr(34), lstParameterStrings:={Chr(34) & "NULL" & Chr(34)}) + clsgeom_statcor.AddLayerParameter("label.x", "text", 0, lstParameterStrings:={0, -1000, 1000}) + clsgeom_statcor.AddLayerParameter("label.y", "text", 0, lstParameterStrings:={0, -1000, 1000}) clsgeom_statcor.AddLayerParameter("output.type", "list", Chr(34) & "expression" & Chr(34), lstParameterStrings:={Chr(34) & "expression" & Chr(34), Chr(34) & "latex" & Chr(34), Chr(34) & "tex" & Chr(34), Chr(34) & "text" & Chr(34)}) clsgeom_statcor.AddLayerParameter("digits", "numeric", "2", lstParameterStrings:={0, 1, 5}) clsgeom_statcor.AddLayerParameter("r.digits", "numeric", "2", lstParameterStrings:={0, 1, 5}) @@ -361,8 +363,8 @@ Public Class ucrGeom clsgeom_statReglineEquation.AddLayerParameter("formula", "editablelist", Chr(34) & "y~x" & Chr(34), lstParameterStrings:={Chr(34) & "y~x" & Chr(34)}) clsgeom_statReglineEquation.AddLayerParameter("label.x.npc", "list", Chr(34) & "left" & Chr(34), lstParameterStrings:={Chr(34) & "left" & Chr(34), Chr(34) & "right" & Chr(34), Chr(34) & "center" & Chr(34), Chr(34) & "centre" & Chr(34), Chr(34) & "middle" & Chr(34)}) clsgeom_statReglineEquation.AddLayerParameter("label.y.npc", "list", Chr(34) & "top" & Chr(34), lstParameterStrings:={Chr(34) & "top" & Chr(34), Chr(34) & "bottom" & Chr(34), Chr(34) & "center" & Chr(34), Chr(34) & "centre" & Chr(34), Chr(34) & "middle" & Chr(34)}) - clsgeom_statReglineEquation.AddLayerParameter("label.x", "editablelist", Chr(34) & "NULL" & Chr(34), lstParameterStrings:={Chr(34) & "NULL" & Chr(34)}) - clsgeom_statReglineEquation.AddLayerParameter("label.y", "editablelist", Chr(34) & "NULL" & Chr(34), lstParameterStrings:={Chr(34) & "NULL" & Chr(34)}) + clsgeom_statReglineEquation.AddLayerParameter("label.x", "text", "0", lstParameterStrings:={0, -1000, 1000}) + clsgeom_statReglineEquation.AddLayerParameter("label.y", "text", "0", lstParameterStrings:={0, -1000, 1000}) clsgeom_statReglineEquation.AddLayerParameter("output.type", "list", Chr(34) & "expression" & Chr(34), lstParameterStrings:={Chr(34) & "expression" & Chr(34), Chr(34) & "latex" & Chr(34), Chr(34) & "text" & Chr(34)}) clsgeom_statReglineEquation.AddLayerParameter("geom", "editablelist", Chr(34) & "text" & Chr(34), lstParameterStrings:={Chr(34) & "text" & Chr(34)}) clsgeom_statReglineEquation.AddLayerParameter("position", "editablelist", Chr(34) & "identity" & Chr(34), lstParameterStrings:={Chr(34) & "identity" & Chr(34)}) @@ -1457,10 +1459,10 @@ Public Class ucrGeom clsgeom_mosaic.SetGeomPackage("ggmosaic") clsgeom_mosaic.strGeomName = "geom_mosaic" 'mandatory - 'clsgeom_mosaic.AddAesParameter("x", bIsMandatory:=True, strIncludedDataTypes:={"factor"}) - 'clsgeom_mosaic.AddAesParameter("fill", bIsMandatory:=True, strIncludedDataTypes:={"factor"}) - 'clsgeom_mosaic.AddAesParameter("conds", strIncludedDataTypes:={"factor"}) - 'clsgeom_mosaic.AddAesParameter("weight", strIncludedDataTypes:={"numeric"}) + clsgeom_mosaic.AddAesParameter("x", bIsMandatory:=True, strIncludedDataTypes:={"factor"}) + clsgeom_mosaic.AddAesParameter("fill", bIsMandatory:=True, strIncludedDataTypes:={"factor"}) + clsgeom_mosaic.AddAesParameter("conds", strIncludedDataTypes:={"factor"}) + clsgeom_mosaic.AddAesParameter("weight", strIncludedDataTypes:={"numeric"}) 'adding layerParameters clsgeom_mosaic.AddLayerParameter("divider", "editablelist", "ggmosaic::mosaic(" & Chr(34) & "h" & Chr(34) & ")", lstParameterStrings:={Chr(34) & "vspine" & Chr(34), Chr(34) & "hspine" & Chr(34), Chr(34) & "vbar" & Chr(34), Chr(34) & "hbar" & Chr(34), "ggmosaic::mosaic(" & Chr(34) & "h" & Chr(34) & ")", "ggmosaic::mosaic(" & Chr(34) & "v" & Chr(34) & ")", "ggmosaic::ddecker()"}) @@ -1473,6 +1475,44 @@ Public Class ucrGeom clsgeom_mosaic.AddLayerParameter("show.legend", "list", "TRUE", lstParameterStrings:={"NA", "TRUE", "FALSE"}) lstAllGeoms.Add(clsgeom_mosaic) + clsgeom_mosaic_jitter.SetGeomPackage("ggmosaic") + clsgeom_mosaic_jitter.strGeomName = "geom_mosaic_jitter" + 'mandatory + clsgeom_mosaic_jitter.AddAesParameter("x", bIsMandatory:=True, strIncludedDataTypes:={"factor"}) + clsgeom_mosaic_jitter.AddAesParameter("fill", bIsMandatory:=True, strIncludedDataTypes:={"factor"}) + clsgeom_mosaic_jitter.AddAesParameter("conds", strIncludedDataTypes:={"factor"}) + clsgeom_mosaic_jitter.AddAesParameter("color", strIncludedDataTypes:={"numeric"}) + + 'adding layerParameters + clsgeom_mosaic_jitter.AddLayerParameter("divider", "editablelist", "ggmosaic::mosaic(" & Chr(34) & "h" & Chr(34) & ")", lstParameterStrings:={Chr(34) & "vspine" & Chr(34), Chr(34) & "hspine" & Chr(34), Chr(34) & "vbar" & Chr(34), Chr(34) & "hbar" & Chr(34), "ggmosaic::mosaic(" & Chr(34) & "h" & Chr(34) & ")", "ggmosaic::mosaic(" & Chr(34) & "v" & Chr(34) & ")", "ggmosaic::ddecker()"}) + clsgeom_mosaic_jitter.AddLayerParameter("offset", "numeric", "0.01", lstParameterStrings:={2, 0, 1}) 'not sure if it goes beyond 1 + clsgeom_mosaic_jitter.AddLayerParameter("stat", "editablelist", Chr(34) & "mosaic" & Chr(34), lstParameterStrings:={Chr(34) & "mosaic" & Chr(34)}) ' Made this editable because am not sure what other stats go here + clsgeom_mosaic_jitter.AddLayerParameter("position", "editablelist", Chr(34) & "identity" & Chr(34), lstParameterStrings:={Chr(34) & "identity" & Chr(34)}) ' Made this editable because am not sure what other positions go here + clsgeom_mosaic_jitter.AddLayerParameter("colour", "colour", Chr(34) & "black" & Chr(34)) + clsgeom_mosaic_jitter.AddLayerParameter("size", "numeric", "1", lstParameterStrings:={1, 1}) + clsgeom_mosaic_jitter.AddLayerParameter("na.rm", "boolean", "FALSE") + clsgeom_mosaic_jitter.AddLayerParameter("show.legend", "list", "TRUE", lstParameterStrings:={"NA", "TRUE", "FALSE"}) + lstAllGeoms.Add(clsgeom_mosaic_jitter) + + clsgeom_mosaic_text.SetGeomPackage("ggmosaic") + clsgeom_mosaic_text.strGeomName = "geom_mosaic_text" + 'mandatory + clsgeom_mosaic_text.AddAesParameter("x", bIsMandatory:=True, strIncludedDataTypes:={"factor"}) + clsgeom_mosaic_text.AddAesParameter("fill", bIsMandatory:=True, strIncludedDataTypes:={"factor"}) + clsgeom_mosaic_text.AddAesParameter("conds", strIncludedDataTypes:={"factor"}) + clsgeom_mosaic_text.AddAesParameter("weight", strIncludedDataTypes:={"numeric"}) + + 'adding layerParameters + clsgeom_mosaic_text.AddLayerParameter("divider", "editablelist", "ggmosaic::mosaic(" & Chr(34) & "h" & Chr(34) & ")", lstParameterStrings:={Chr(34) & "vspine" & Chr(34), Chr(34) & "hspine" & Chr(34), Chr(34) & "vbar" & Chr(34), Chr(34) & "hbar" & Chr(34), "ggmosaic::mosaic(" & Chr(34) & "h" & Chr(34) & ")", "ggmosaic::mosaic(" & Chr(34) & "v" & Chr(34) & ")", "ggmosaic::ddecker()"}) + clsgeom_mosaic_text.AddLayerParameter("offset", "numeric", "0.01", lstParameterStrings:={2, 0, 1}) 'not sure if it goes beyond 1 + clsgeom_mosaic_text.AddLayerParameter("stat", "editablelist", Chr(34) & "mosaic" & Chr(34), lstParameterStrings:={Chr(34) & "mosaic" & Chr(34)}) ' Made this editable because am not sure what other stats go here + clsgeom_mosaic_text.AddLayerParameter("position", "editablelist", Chr(34) & "identity" & Chr(34), lstParameterStrings:={Chr(34) & "identity" & Chr(34)}) ' Made this editable because am not sure what other positions go here + clsgeom_mosaic_text.AddLayerParameter("colour", "colour", Chr(34) & "black" & Chr(34)) + clsgeom_mosaic_text.AddLayerParameter("size", "numeric", "1", lstParameterStrings:={1, 1}) + clsgeom_mosaic_text.AddLayerParameter("na.rm", "boolean", "FALSE") + clsgeom_mosaic_text.AddLayerParameter("show.legend", "list", "TRUE", lstParameterStrings:={"NA", "TRUE", "FALSE"}) + lstAllGeoms.Add(clsgeom_mosaic_text) + clsgeom_parallel_slopes.SetGeomPackage("moderndive") clsgeom_parallel_slopes.SetGeomName("geom_parallel_slopes") 'Mandatory Aesthetics diff --git a/instat/ucrReceiverMetadataProperty.Designer.vb b/instat/ucrReceiverMetadataProperty.Designer.vb index f4a98e957a4..98703adf800 100644 --- a/instat/ucrReceiverMetadataProperty.Designer.vb +++ b/instat/ucrReceiverMetadataProperty.Designer.vb @@ -46,7 +46,8 @@ Partial Class ucrReceiverMetadataProperty ' 'ucrInputTextValue ' - Me.ucrInputTextValue.AddQuotesIfUnrecognised = True + Me.ucrInputTextValue.AddQuotesIfUnrecognised = False + Me.ucrInputTextValue.AutoSize = True Me.ucrInputTextValue.Dock = System.Windows.Forms.DockStyle.Fill Me.ucrInputTextValue.IsMultiline = False Me.ucrInputTextValue.IsReadOnly = False @@ -81,6 +82,7 @@ Partial Class ucrReceiverMetadataProperty ' 'ucrNudParamValue ' + Me.ucrNudParamValue.AutoSize = True Me.ucrNudParamValue.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudParamValue.Dock = System.Windows.Forms.DockStyle.Fill Me.ucrNudParamValue.Increment = New Decimal(New Integer() {1, 0, 0, 0}) @@ -103,6 +105,7 @@ Partial Class ucrReceiverMetadataProperty Me.Name = "ucrReceiverMetadataProperty" Me.Size = New System.Drawing.Size(140, 22) Me.ResumeLayout(False) + Me.PerformLayout() End Sub Friend WithEvents ucrColor As ucrColors diff --git a/instat/ucrReceiverMultiple.vb b/instat/ucrReceiverMultiple.vb index 16063dcb64e..5206b0554cd 100644 --- a/instat/ucrReceiverMultiple.vb +++ b/instat/ucrReceiverMultiple.vb @@ -21,12 +21,12 @@ Public Class ucrReceiverMultiple Public bSingleType As Boolean = False ' If bSingleType and bCategoricalNumeric then categorical and numeric are the only considered types Public bCategoricalNumeric As Boolean = False + Public iMaxItems As Integer Private Sub ucrReceiverMultiple_Load(sender As Object, e As EventArgs) Handles Me.Load If bFirstLoad Then If lstSelectedVariables.Columns.Count = 0 Then lstSelectedVariables.Columns.Add("Selected Data") - lstSelectedVariables.Columns(0).Width = lstSelectedVariables.Width - 25 End If 'by default multiple receivers will not be autoswitched on selection change bAutoSwitchFromReceiver = False @@ -56,8 +56,12 @@ Public Class ucrReceiverMultiple Exit Sub End If - 'then add the new items + 'Then add the new items with limit check For Each kvpTempItem As KeyValuePair(Of String, String) In lstActualItemsToAdd + If iMaxItems <> 0 AndAlso lstSelectedVariables.Items.Count >= iMaxItems Then + MessageBox.Show($"Cannot add more than {iMaxItems} items.", "Item Limit Exceeded", MessageBoxButtons.OK, MessageBoxIcon.Warning) + Exit For ' Exit the loop if the maximum limit is reached + End If lstSelectedVariables.Items.Add(New ListViewItem With { .Name = kvpTempItem.Value, .Text = kvpTempItem.Value, @@ -153,6 +157,7 @@ Public Class ucrReceiverMultiple lstSelectedVariables.Items.Remove(lvi) Next + SetGroupHeaderVariablesCount() OnSelectionChanged() MyBase.RemoveSelected() End Sub @@ -168,12 +173,21 @@ Public Class ucrReceiverMultiple 'it's not clear when the receiver will ever have more than one data frame 'reset the header text with the name - lstSelectedVariables.Groups(0).Header = lstSelectedVariables.Groups(0).Name + lstSelectedVariables.Groups(0).Header = ShortenString(lstSelectedVariables.Groups(0).Name) If lstSelectedVariables.Groups.Count = 1 AndAlso lstSelectedVariables.Items.Count > 0 Then lstSelectedVariables.Groups(0).Header = lstSelectedVariables.Groups(0).Header & " (" & lstSelectedVariables.Items.Count & ")" End If End Sub + Private Function ShortenString(strText As String) As String + Dim maxLength As Integer = 10 + If strText.Length > maxLength Then + ' Trim the string to the specified length and add ellipsis + Return strText.Substring(0, maxLength) & "..." + End If + Return strText + End Function + Public Overrides Function IsEmpty() As Boolean Return lstSelectedVariables.Items.Count = 0 End Function @@ -308,7 +322,7 @@ Public Class ucrReceiverMultiple End Function Public Overrides Function GetVariableNamesList(Optional bWithQuotes As Boolean = True, Optional strQuotes As String = Chr(34)) As String() - Dim arrItems(lstSelectedVariables.Items.Count) As String + Dim arrItems(lstSelectedVariables.Items.Count - 1) As String Dim strQuoteHolder As String = If(bWithQuotes, strQuotes, "") For i = 0 To lstSelectedVariables.Items.Count - 1 arrItems(i) = strQuoteHolder & lstSelectedVariables.Items(i).Text & strQuoteHolder @@ -502,6 +516,12 @@ Public Class ucrReceiverMultiple CheckSingleType() End Sub + Private Sub lstSelectedVariables_ClientSizeChanged(ByVal sender As Object, ByVal e As EventArgs) Handles lstSelectedVariables.ClientSizeChanged + If lstSelectedVariables.Columns.Count > 0 Then + lstSelectedVariables.Columns(0).Width = lstSelectedVariables.ClientSize.Width + End If + End Sub + Private Sub ucrReceiverMultiple_SelectionChanged(sender As Object, e As EventArgs) Handles Me.SelectionChanged CheckSingleType() End Sub diff --git a/instat/ucrSave.Designer.vb b/instat/ucrSave.Designer.vb index 96343812c86..fdbb2c62663 100644 --- a/instat/ucrSave.Designer.vb +++ b/instat/ucrSave.Designer.vb @@ -50,17 +50,18 @@ Partial Class ucrSave Me.ucrChkSave.AutoSize = True Me.ucrChkSave.Checked = False Me.ucrChkSave.Location = New System.Drawing.Point(0, 0) - Me.ucrChkSave.Margin = New System.Windows.Forms.Padding(6, 8, 6, 8) + Me.ucrChkSave.Margin = New System.Windows.Forms.Padding(8, 10, 8, 10) Me.ucrChkSave.Name = "ucrChkSave" - Me.ucrChkSave.Size = New System.Drawing.Size(100, 23) + Me.ucrChkSave.Size = New System.Drawing.Size(125, 29) Me.ucrChkSave.TabIndex = 0 ' 'lblSaveText ' Me.lblSaveText.AutoSize = True - Me.lblSaveText.Location = New System.Drawing.Point(0, 3) + Me.lblSaveText.Location = New System.Drawing.Point(0, 4) + Me.lblSaveText.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblSaveText.Name = "lblSaveText" - Me.lblSaveText.Size = New System.Drawing.Size(39, 13) + Me.lblSaveText.Size = New System.Drawing.Size(48, 16) Me.lblSaveText.TabIndex = 1 Me.lblSaveText.Text = "Label1" ' @@ -71,10 +72,10 @@ Partial Class ucrSave Me.ucrInputComboSave.Dock = System.Windows.Forms.DockStyle.Right Me.ucrInputComboSave.GetSetSelectedIndex = -1 Me.ucrInputComboSave.IsReadOnly = False - Me.ucrInputComboSave.Location = New System.Drawing.Point(194, 0) - Me.ucrInputComboSave.Margin = New System.Windows.Forms.Padding(9, 12, 9, 12) + Me.ucrInputComboSave.Location = New System.Drawing.Point(245, 0) + Me.ucrInputComboSave.Margin = New System.Windows.Forms.Padding(11, 15, 11, 15) Me.ucrInputComboSave.Name = "ucrInputComboSave" - Me.ucrInputComboSave.Size = New System.Drawing.Size(155, 34) + Me.ucrInputComboSave.Size = New System.Drawing.Size(194, 42) Me.ucrInputComboSave.TabIndex = 4 ' 'ucrInputTextSave @@ -83,10 +84,10 @@ Partial Class ucrSave Me.ucrInputTextSave.AutoSize = True Me.ucrInputTextSave.IsMultiline = False Me.ucrInputTextSave.IsReadOnly = False - Me.ucrInputTextSave.Location = New System.Drawing.Point(194, 0) - Me.ucrInputTextSave.Margin = New System.Windows.Forms.Padding(9, 12, 9, 12) + Me.ucrInputTextSave.Location = New System.Drawing.Point(182, 0) + Me.ucrInputTextSave.Margin = New System.Windows.Forms.Padding(11, 15, 11, 15) Me.ucrInputTextSave.Name = "ucrInputTextSave" - Me.ucrInputTextSave.Size = New System.Drawing.Size(155, 34) + Me.ucrInputTextSave.Size = New System.Drawing.Size(194, 42) Me.ucrInputTextSave.TabIndex = 3 ' 'btnColumnPosition @@ -94,16 +95,17 @@ Partial Class ucrSave Me.btnColumnPosition.AutoSize = True Me.btnColumnPosition.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink Me.btnColumnPosition.Dock = System.Windows.Forms.DockStyle.Right - Me.btnColumnPosition.Location = New System.Drawing.Point(349, 0) + Me.btnColumnPosition.Location = New System.Drawing.Point(439, 0) + Me.btnColumnPosition.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.btnColumnPosition.Name = "btnColumnPosition" - Me.btnColumnPosition.Size = New System.Drawing.Size(54, 34) + Me.btnColumnPosition.Size = New System.Drawing.Size(65, 42) Me.btnColumnPosition.TabIndex = 5 Me.btnColumnPosition.Text = "Position" Me.btnColumnPosition.UseVisualStyleBackColor = True ' 'ucrSave ' - Me.AutoScaleDimensions = New System.Drawing.SizeF(96.0!, 96.0!) + Me.AutoScaleDimensions = New System.Drawing.SizeF(120.0!, 120.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi Me.AutoSize = False Me.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink @@ -112,9 +114,9 @@ Partial Class ucrSave Me.Controls.Add(Me.lblSaveText) Me.Controls.Add(Me.ucrChkSave) Me.Controls.Add(Me.btnColumnPosition) - Me.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) + Me.Margin = New System.Windows.Forms.Padding(5, 6, 5, 6) Me.Name = "ucrSave" - Me.Size = New System.Drawing.Size(403, 34) + Me.Size = New System.Drawing.Size(504, 42) Me.ResumeLayout(False) Me.PerformLayout() diff --git a/instat/ucrScript.vb b/instat/ucrScript.vb index 8186584b1a6..ebfb3d73b3e 100644 --- a/instat/ucrScript.vb +++ b/instat/ucrScript.vb @@ -25,6 +25,7 @@ Public Class ucrScript Private bIsTextChanged = False Private iMaxLineNumberCharLength As Integer = 0 Private Const iTabIndexLog As Integer = 0 + Private clsRScript As RScript = Nothing Private strRInstatLogFilesFolderPath As String = Path.Combine(Path.GetFullPath(FileIO.SpecialDirectories.MyDocuments), "R-Instat_Log_files") Friend WithEvents clsScriptActive As Scintilla @@ -214,6 +215,7 @@ Public Class ucrScript Using dlgSave As New SaveFileDialog dlgSave.Title = "Save " & If(bIsLog, "Log", "Script") & " To File" dlgSave.Filter = "R Script File (*.R)|*.R|Text File (*.txt)|*.txt" + dlgSave.FileName = Path.GetFileName(TabControl.SelectedTab.Text) 'Ensure that dialog opens in correct folder. 'In theory, we should be able to use `dlgLoad.RestoreDirectory = True` but this does @@ -225,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) @@ -297,6 +300,7 @@ Public Class ucrScript TabControl.SelectedTab = tabPageAdded bIsTextChanged = False + clsRScript = Nothing EnableDisableButtons() End Sub @@ -543,7 +547,8 @@ Public Class ucrScript TabControl.SelectedTab.Text = System.IO.Path.GetFileNameWithoutExtension(dlgLoad.FileName) strInitialDirectory = Path.GetDirectoryName(dlgLoad.FileName) bIsTextChanged = False - frmMain.clsRecentItems.addToMenu(Replace(Path.Combine(Path.GetFullPath(FileIO.SpecialDirectories.MyDocuments), System.IO.Path.GetFileName(dlgLoad.FileName)), "\", "/")) + clsRScript = Nothing + 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 & @@ -642,7 +647,10 @@ Public Class ucrScript Try Dim dctRStatements As OrderedDictionary Try - dctRStatements = New RScript(clsScriptActive.Text).statements + If clsRScript Is Nothing Then + clsRScript = New RScript(clsScriptActive.Text) + End If + dctRStatements = clsRScript.statements Catch ex As Exception MsgBox("R script parsing failed with message:" & Environment.NewLine _ & Environment.NewLine & ex.Message & Environment.NewLine & Environment.NewLine _ @@ -762,6 +770,7 @@ Public Class ucrScript Private Sub clsScriptActive_TextChanged(sender As Object, e As EventArgs) Handles clsScriptActive.TextChanged bIsTextChanged = True + clsRScript = Nothing EnableDisableButtons() SetLineNumberMarginWidth(clsScriptActive.Lines.Count.ToString().Length) End Sub @@ -979,7 +988,7 @@ Public Class ucrScript 'This is just to be on the safe side. It is not worth the extra complexity of 'checking if the script is the same as the associated file name bIsTextChanged = clsScriptActive.TextLength > 0 - + clsRScript = Nothing EnableDisableButtons() Exit Sub End If diff --git a/instat/ucrSplitButton.vb b/instat/ucrSplitButton.vb index de6826314e7..95776041dba 100644 --- a/instat/ucrSplitButton.vb +++ b/instat/ucrSplitButton.vb @@ -232,14 +232,19 @@ Public Class ucrSplitButton If mevent.Button = MouseButtons.Right AndAlso ClientRectangle.Contains(mevent.Location) AndAlso Not _bSplitMenuVisible Then ShowContextMenuStrip() ElseIf _contextSplitMenuStrip Is Nothing OrElse Not _bSplitMenuVisible Then - SetButtonDrawState() - If ClientRectangle.Contains(mevent.Location) AndAlso Not _dropDownRectangle.Contains(mevent.Location) Then - OnClick(New EventArgs()) + ' Trigger the Click event + OnClick(EventArgs.Empty) End If End If + + ' Set the button state to Normal regardless of other conditions + State = PushButtonState.Normal + + MyBase.OnMouseUp(mevent) End Sub + Protected Overrides Sub OnPaint(pevent As PaintEventArgs) MyBase.OnPaint(pevent) If Not _bShowSplit Then Exit Sub @@ -585,9 +590,66 @@ Public Class ucrSplitButton State = PushButtonState.Pressed + Dim tmpForm As New Form With { + .AutoScaleMode = AutoScaleMode.None, + .FormBorderStyle = FormBorderStyle.None, + .StartPosition = FormStartPosition.Manual, + .ShowInTaskbar = False + } + Dim panel As New Panel With { + .Dock = DockStyle.Fill, + .BorderStyle = BorderStyle.None + } + _contextSplitMenuStrip.TopLevel = False + _contextSplitMenuStrip.Dock = DockStyle.Top + _contextSplitMenuStrip.ShowImageMargin = False + + AddHandler _contextSplitMenuStrip.ItemClicked, Sub(sender As Object, e As ToolStripItemClickedEventArgs) + tmpForm.Close() + End Sub + + AddHandler tmpForm.FormClosed, Sub(sender As Object, e As FormClosedEventArgs) + If panel.Controls.Contains(_contextSplitMenuStrip) Then + panel.Controls.Remove(_contextSplitMenuStrip) + End If + End Sub + + AddHandler tmpForm.LostFocus, Sub(sender As Object, e As EventArgs) + _bSplitMenuVisible = False + tmpForm.Close() + End Sub + + panel.Controls.Add(_contextSplitMenuStrip) + ' Set a maximum height for the form + Dim maxHeight As Integer = 250 + + ' Ensure that the panel fits the preferred size of the context menu without extra space + Dim preferredSize As Size = _contextSplitMenuStrip.PreferredSize + If preferredSize.Height > maxHeight Then + panel.AutoScroll = True + preferredSize.Height = maxHeight + Else + panel.AutoScroll = False + End If + If _contextSplitMenuStrip IsNot Nothing Then - _contextSplitMenuStrip.Show(Me, New Point(0, Height), ToolStripDropDownDirection.BelowRight) + _contextSplitMenuStrip.Show() + End If + + ' Calculate whether to show the form above or below + Dim screenRect As Rectangle = Screen.FromControl(Me).WorkingArea + Dim showUp As Boolean = PointToScreen(New Point(0, Height + PreferredSize.Height)).Y > screenRect.Bottom + + ' Set the form size and location accordingly + tmpForm.Size = New Size(PreferredSize.Width, PreferredSize.Height) + If showUp Then + tmpForm.Location = PointToScreen(New Point(0, Height - tmpForm.Height)) + Else + tmpForm.Location = PointToScreen(New Point(0, Height)) End If + + tmpForm.Controls.Add(panel) + tmpForm.Show() End Sub Private Sub SplitMenuStrip_Opening(sender As Object, e As CancelEventArgs) 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.