From 49c3908c44a036bc08440ef62f591429eefd25ea Mon Sep 17 00:00:00 2001 From: Wycklife Bonyo Date: Mon, 8 Apr 2019 12:02:27 +0300 Subject: [PATCH 1/9] Adding group box for each of the two selectors and a receiver (Designer Changes) to Climatic > Mapping dialog. --- instat/dlgClimaticStationMaps.Designer.vb | 335 +++++++++++++--------- 1 file changed, 195 insertions(+), 140 deletions(-) diff --git a/instat/dlgClimaticStationMaps.Designer.vb b/instat/dlgClimaticStationMaps.Designer.vb index 8f0ed0b46f7..f73ab3a59d6 100644 --- a/instat/dlgClimaticStationMaps.Designer.vb +++ b/instat/dlgClimaticStationMaps.Designer.vb @@ -22,53 +22,47 @@ Partial Class dlgClimaticStationMaps 'Do not modify it using the code editor. Private Sub InitializeComponent() - Me.lblFill = New System.Windows.Forms.Label() Me.cmdPlotOptions = New System.Windows.Forms.Button() Me.cmdMapOptions = New System.Windows.Forms.Button() Me.cmdSFOptions = New System.Windows.Forms.Button() - Me.lblLongitude = New System.Windows.Forms.Label() - Me.lbllatitude = New System.Windows.Forms.Label() - Me.labelShape = New System.Windows.Forms.Label() - Me.LabelColor = New System.Windows.Forms.Label() + Me.ucrSaveMap = New instat.ucrSave() + Me.ucrBase = New instat.ucrButtons() + Me.grpStation = New System.Windows.Forms.GroupBox() + Me.lblStation = New System.Windows.Forms.Label() + Me.ucrReceiverStation = New instat.ucrReceiverSingle() + Me.lblFacet = New System.Windows.Forms.Label() + Me.ucrReceiverFacet = New instat.ucrReceiverSingle() Me.ucrSelectorStation = New instat.ucrSelectorByDataFrameAddRemove() + Me.lblColor = New System.Windows.Forms.Label() + Me.lblShape = New System.Windows.Forms.Label() + Me.lbllatitude = New System.Windows.Forms.Label() Me.ucrReceiverColor = New instat.ucrReceiverSingle() + Me.lblLongitude = New System.Windows.Forms.Label() Me.ucrReceiverShape = New instat.ucrReceiverSingle() Me.ucrReceiverLatitude = New instat.ucrReceiverSingle() Me.ucrReceiverLongitude = New instat.ucrReceiverSingle() - Me.ucrSaveMap = New instat.ucrSave() - Me.ucrBase = New instat.ucrButtons() + Me.grpMapOutline = New System.Windows.Forms.GroupBox() + Me.lblFill = New System.Windows.Forms.Label() Me.ucrReceiverFill = New instat.ucrReceiverSingle() Me.ucrSelectorOutline = New instat.ucrSelectorByDataFrameAddRemove() - Me.ucrReceiverFacet = New instat.ucrReceiverSingle() - Me.LabelFacet = New System.Windows.Forms.Label() + Me.grpStation.SuspendLayout() + Me.grpMapOutline.SuspendLayout() Me.SuspendLayout() ' - 'lblFill - ' - Me.lblFill.AutoSize = True - Me.lblFill.Location = New System.Drawing.Point(354, 53) - Me.lblFill.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) - Me.lblFill.Name = "lblFill" - Me.lblFill.Size = New System.Drawing.Size(32, 20) - Me.lblFill.TabIndex = 1 - Me.lblFill.Text = "Fill:" - ' 'cmdPlotOptions ' - Me.cmdPlotOptions.Location = New System.Drawing.Point(14, 339) - Me.cmdPlotOptions.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) + Me.cmdPlotOptions.Location = New System.Drawing.Point(10, 263) Me.cmdPlotOptions.Name = "cmdPlotOptions" - Me.cmdPlotOptions.Size = New System.Drawing.Size(154, 35) + Me.cmdPlotOptions.Size = New System.Drawing.Size(103, 23) Me.cmdPlotOptions.TabIndex = 12 Me.cmdPlotOptions.Text = "Plot Options" Me.cmdPlotOptions.UseVisualStyleBackColor = True ' 'cmdMapOptions ' - Me.cmdMapOptions.Location = New System.Drawing.Point(14, 430) - Me.cmdMapOptions.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) + Me.cmdMapOptions.Location = New System.Drawing.Point(10, 322) Me.cmdMapOptions.Name = "cmdMapOptions" - Me.cmdMapOptions.Size = New System.Drawing.Size(154, 35) + Me.cmdMapOptions.Size = New System.Drawing.Size(103, 23) Me.cmdMapOptions.TabIndex = 14 Me.cmdMapOptions.Text = "Map Options" Me.cmdMapOptions.UseVisualStyleBackColor = True @@ -76,135 +70,224 @@ Partial Class dlgClimaticStationMaps 'cmdSFOptions ' Me.cmdSFOptions.Enabled = False - Me.cmdSFOptions.Location = New System.Drawing.Point(14, 384) - Me.cmdSFOptions.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) + Me.cmdSFOptions.Location = New System.Drawing.Point(10, 293) Me.cmdSFOptions.Name = "cmdSFOptions" - Me.cmdSFOptions.Size = New System.Drawing.Size(154, 35) + Me.cmdSFOptions.Size = New System.Drawing.Size(103, 23) Me.cmdSFOptions.TabIndex = 13 Me.cmdSFOptions.Text = "SF Options" Me.cmdSFOptions.UseVisualStyleBackColor = True ' - 'lblLongitude - ' - Me.lblLongitude.AutoSize = True - Me.lblLongitude.Location = New System.Drawing.Point(897, 60) - Me.lblLongitude.Name = "lblLongitude" - Me.lblLongitude.Size = New System.Drawing.Size(84, 20) - Me.lblLongitude.TabIndex = 4 - Me.lblLongitude.Text = "Longitude:" + 'ucrSaveMap ' - 'lbllatitude + Me.ucrSaveMap.Location = New System.Drawing.Point(8, 356) + Me.ucrSaveMap.Margin = New System.Windows.Forms.Padding(6, 8, 6, 8) + Me.ucrSaveMap.Name = "ucrSaveMap" + Me.ucrSaveMap.Size = New System.Drawing.Size(244, 24) + Me.ucrSaveMap.TabIndex = 15 ' - Me.lbllatitude.AutoSize = True - Me.lbllatitude.Location = New System.Drawing.Point(893, 125) - Me.lbllatitude.Name = "lbllatitude" - Me.lbllatitude.Size = New System.Drawing.Size(71, 20) - Me.lbllatitude.TabIndex = 6 - Me.lbllatitude.Text = "Latitude:" + 'ucrBase ' - 'labelShape + Me.ucrBase.Location = New System.Drawing.Point(8, 387) + Me.ucrBase.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) + Me.ucrBase.Name = "ucrBase" + Me.ucrBase.Size = New System.Drawing.Size(410, 52) + Me.ucrBase.TabIndex = 16 ' - Me.labelShape.AutoSize = True - Me.labelShape.Location = New System.Drawing.Point(893, 190) - Me.labelShape.Name = "labelShape" - Me.labelShape.Size = New System.Drawing.Size(129, 20) - Me.labelShape.TabIndex = 8 - Me.labelShape.Text = "Shape(Optional):" + 'grpStation + ' + Me.grpStation.Controls.Add(Me.lblStation) + Me.grpStation.Controls.Add(Me.ucrReceiverStation) + Me.grpStation.Controls.Add(Me.lblFacet) + Me.grpStation.Controls.Add(Me.ucrReceiverFacet) + Me.grpStation.Controls.Add(Me.ucrSelectorStation) + Me.grpStation.Controls.Add(Me.lblColor) + Me.grpStation.Controls.Add(Me.lblShape) + Me.grpStation.Controls.Add(Me.lbllatitude) + Me.grpStation.Controls.Add(Me.ucrReceiverColor) + Me.grpStation.Controls.Add(Me.lblLongitude) + Me.grpStation.Controls.Add(Me.ucrReceiverShape) + Me.grpStation.Controls.Add(Me.ucrReceiverLatitude) + Me.grpStation.Controls.Add(Me.ucrReceiverLongitude) + Me.grpStation.Location = New System.Drawing.Point(373, 8) + Me.grpStation.Name = "grpStation" + Me.grpStation.Size = New System.Drawing.Size(371, 292) + Me.grpStation.TabIndex = 21 + Me.grpStation.TabStop = False + Me.grpStation.Text = "Station" + ' + 'lblStation + ' + Me.lblStation.AutoSize = True + Me.lblStation.Location = New System.Drawing.Point(243, 17) + Me.lblStation.Name = "lblStation" + Me.lblStation.Size = New System.Drawing.Size(43, 13) + Me.lblStation.TabIndex = 33 + Me.lblStation.Text = "Station " + ' + 'ucrReceiverStation + ' + Me.ucrReceiverStation.frmParent = Me + Me.ucrReceiverStation.Location = New System.Drawing.Point(240, 37) + 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 = 32 + Me.ucrReceiverStation.ucrSelector = Nothing + ' + 'lblFacet + ' + Me.lblFacet.AutoSize = True + Me.lblFacet.Location = New System.Drawing.Point(240, 235) + Me.lblFacet.Margin = New System.Windows.Forms.Padding(2, 0, 2, 0) + Me.lblFacet.Name = "lblFacet" + Me.lblFacet.Size = New System.Drawing.Size(39, 13) + Me.lblFacet.TabIndex = 31 + Me.lblFacet.Text = "Facets" ' - 'LabelColor + 'ucrReceiverFacet ' - Me.LabelColor.AutoSize = True - Me.LabelColor.Location = New System.Drawing.Point(894, 255) - Me.LabelColor.Name = "LabelColor" - Me.LabelColor.Size = New System.Drawing.Size(119, 20) - Me.LabelColor.TabIndex = 10 - Me.LabelColor.Text = "Color(Optional):" + Me.ucrReceiverFacet.frmParent = Me + Me.ucrReceiverFacet.Location = New System.Drawing.Point(241, 256) + Me.ucrReceiverFacet.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverFacet.Name = "ucrReceiverFacet" + Me.ucrReceiverFacet.Selector = Nothing + Me.ucrReceiverFacet.Size = New System.Drawing.Size(120, 20) + Me.ucrReceiverFacet.strNcFilePath = "" + Me.ucrReceiverFacet.TabIndex = 30 + Me.ucrReceiverFacet.ucrSelector = Nothing ' 'ucrSelectorStation ' Me.ucrSelectorStation.bDropUnusedFilterLevels = False Me.ucrSelectorStation.bShowHiddenColumns = False Me.ucrSelectorStation.bUseCurrentFilter = True - Me.ucrSelectorStation.Location = New System.Drawing.Point(549, 45) + Me.ucrSelectorStation.Location = New System.Drawing.Point(8, 16) Me.ucrSelectorStation.Margin = New System.Windows.Forms.Padding(0) Me.ucrSelectorStation.Name = "ucrSelectorStation" - Me.ucrSelectorStation.Size = New System.Drawing.Size(315, 277) - Me.ucrSelectorStation.TabIndex = 3 + Me.ucrSelectorStation.Size = New System.Drawing.Size(210, 180) + Me.ucrSelectorStation.TabIndex = 21 + ' + 'lblColor + ' + Me.lblColor.AutoSize = True + Me.lblColor.Location = New System.Drawing.Point(238, 190) + Me.lblColor.Margin = New System.Windows.Forms.Padding(2, 0, 2, 0) + Me.lblColor.Name = "lblColor" + Me.lblColor.Size = New System.Drawing.Size(79, 13) + Me.lblColor.TabIndex = 28 + Me.lblColor.Text = "Color(Optional):" + ' + 'lblShape + ' + Me.lblShape.AutoSize = True + Me.lblShape.Location = New System.Drawing.Point(237, 147) + Me.lblShape.Margin = New System.Windows.Forms.Padding(2, 0, 2, 0) + Me.lblShape.Name = "lblShape" + Me.lblShape.Size = New System.Drawing.Size(86, 13) + Me.lblShape.TabIndex = 26 + Me.lblShape.Text = "Shape(Optional):" + ' + 'lbllatitude + ' + Me.lbllatitude.AutoSize = True + Me.lbllatitude.Location = New System.Drawing.Point(237, 108) + Me.lbllatitude.Margin = New System.Windows.Forms.Padding(2, 0, 2, 0) + Me.lbllatitude.Name = "lbllatitude" + Me.lbllatitude.Size = New System.Drawing.Size(48, 13) + Me.lbllatitude.TabIndex = 24 + Me.lbllatitude.Text = "Latitude:" ' 'ucrReceiverColor ' Me.ucrReceiverColor.frmParent = Me - Me.ucrReceiverColor.Location = New System.Drawing.Point(897, 281) + Me.ucrReceiverColor.Location = New System.Drawing.Point(240, 209) Me.ucrReceiverColor.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverColor.Name = "ucrReceiverColor" Me.ucrReceiverColor.Selector = Nothing - Me.ucrReceiverColor.Size = New System.Drawing.Size(180, 31) + Me.ucrReceiverColor.Size = New System.Drawing.Size(120, 20) Me.ucrReceiverColor.strNcFilePath = "" - Me.ucrReceiverColor.TabIndex = 11 + Me.ucrReceiverColor.TabIndex = 29 Me.ucrReceiverColor.ucrSelector = Nothing ' + 'lblLongitude + ' + Me.lblLongitude.AutoSize = True + Me.lblLongitude.Location = New System.Drawing.Point(240, 65) + Me.lblLongitude.Margin = New System.Windows.Forms.Padding(2, 0, 2, 0) + Me.lblLongitude.Name = "lblLongitude" + Me.lblLongitude.Size = New System.Drawing.Size(57, 13) + Me.lblLongitude.TabIndex = 22 + Me.lblLongitude.Text = "Longitude:" + ' 'ucrReceiverShape ' Me.ucrReceiverShape.frmParent = Me - Me.ucrReceiverShape.Location = New System.Drawing.Point(897, 216) + Me.ucrReceiverShape.Location = New System.Drawing.Point(240, 165) Me.ucrReceiverShape.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverShape.Name = "ucrReceiverShape" Me.ucrReceiverShape.Selector = Nothing - Me.ucrReceiverShape.Size = New System.Drawing.Size(180, 31) + Me.ucrReceiverShape.Size = New System.Drawing.Size(120, 20) Me.ucrReceiverShape.strNcFilePath = "" - Me.ucrReceiverShape.TabIndex = 9 + Me.ucrReceiverShape.TabIndex = 27 Me.ucrReceiverShape.ucrSelector = Nothing ' 'ucrReceiverLatitude ' Me.ucrReceiverLatitude.frmParent = Me - Me.ucrReceiverLatitude.Location = New System.Drawing.Point(897, 151) + Me.ucrReceiverLatitude.Location = New System.Drawing.Point(240, 125) Me.ucrReceiverLatitude.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverLatitude.Name = "ucrReceiverLatitude" Me.ucrReceiverLatitude.Selector = Nothing - Me.ucrReceiverLatitude.Size = New System.Drawing.Size(180, 31) + Me.ucrReceiverLatitude.Size = New System.Drawing.Size(120, 20) Me.ucrReceiverLatitude.strNcFilePath = "" - Me.ucrReceiverLatitude.TabIndex = 7 + Me.ucrReceiverLatitude.TabIndex = 25 Me.ucrReceiverLatitude.ucrSelector = Nothing ' 'ucrReceiverLongitude ' Me.ucrReceiverLongitude.frmParent = Me - Me.ucrReceiverLongitude.Location = New System.Drawing.Point(897, 87) + Me.ucrReceiverLongitude.Location = New System.Drawing.Point(240, 84) Me.ucrReceiverLongitude.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverLongitude.Name = "ucrReceiverLongitude" Me.ucrReceiverLongitude.Selector = Nothing - Me.ucrReceiverLongitude.Size = New System.Drawing.Size(180, 31) + Me.ucrReceiverLongitude.Size = New System.Drawing.Size(120, 20) Me.ucrReceiverLongitude.strNcFilePath = "" - Me.ucrReceiverLongitude.TabIndex = 5 + Me.ucrReceiverLongitude.TabIndex = 23 Me.ucrReceiverLongitude.ucrSelector = Nothing ' - 'ucrSaveMap + 'grpMapOutline ' - Me.ucrSaveMap.Location = New System.Drawing.Point(10, 482) - Me.ucrSaveMap.Margin = New System.Windows.Forms.Padding(9, 12, 9, 12) - Me.ucrSaveMap.Name = "ucrSaveMap" - Me.ucrSaveMap.Size = New System.Drawing.Size(366, 37) - Me.ucrSaveMap.TabIndex = 15 + Me.grpMapOutline.Controls.Add(Me.lblFill) + Me.grpMapOutline.Controls.Add(Me.ucrReceiverFill) + Me.grpMapOutline.Controls.Add(Me.ucrSelectorOutline) + Me.grpMapOutline.Location = New System.Drawing.Point(10, 12) + Me.grpMapOutline.Name = "grpMapOutline" + Me.grpMapOutline.Size = New System.Drawing.Size(357, 245) + Me.grpMapOutline.TabIndex = 22 + Me.grpMapOutline.TabStop = False + Me.grpMapOutline.Text = "Map Outline" ' - 'ucrBase + 'lblFill ' - Me.ucrBase.Location = New System.Drawing.Point(10, 529) - Me.ucrBase.Margin = New System.Windows.Forms.Padding(6, 8, 6, 8) - Me.ucrBase.Name = "ucrBase" - Me.ucrBase.Size = New System.Drawing.Size(615, 80) - Me.ucrBase.TabIndex = 16 + Me.lblFill.AutoSize = True + Me.lblFill.Location = New System.Drawing.Point(231, 7) + Me.lblFill.Name = "lblFill" + Me.lblFill.Size = New System.Drawing.Size(22, 13) + Me.lblFill.TabIndex = 4 + Me.lblFill.Text = "Fill:" ' 'ucrReceiverFill ' Me.ucrReceiverFill.frmParent = Me - Me.ucrReceiverFill.Location = New System.Drawing.Point(355, 78) + Me.ucrReceiverFill.Location = New System.Drawing.Point(231, 25) Me.ucrReceiverFill.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverFill.Name = "ucrReceiverFill" Me.ucrReceiverFill.Selector = Nothing - Me.ucrReceiverFill.Size = New System.Drawing.Size(180, 31) + Me.ucrReceiverFill.Size = New System.Drawing.Size(120, 20) Me.ucrReceiverFill.strNcFilePath = "" - Me.ucrReceiverFill.TabIndex = 2 + Me.ucrReceiverFill.TabIndex = 5 Me.ucrReceiverFill.ucrSelector = Nothing ' 'ucrSelectorOutline @@ -212,86 +295,58 @@ Partial Class dlgClimaticStationMaps Me.ucrSelectorOutline.bDropUnusedFilterLevels = False Me.ucrSelectorOutline.bShowHiddenColumns = False Me.ucrSelectorOutline.bUseCurrentFilter = True - Me.ucrSelectorOutline.Location = New System.Drawing.Point(10, 45) + Me.ucrSelectorOutline.Location = New System.Drawing.Point(4, 15) Me.ucrSelectorOutline.Margin = New System.Windows.Forms.Padding(0) Me.ucrSelectorOutline.Name = "ucrSelectorOutline" - Me.ucrSelectorOutline.Size = New System.Drawing.Size(317, 277) - Me.ucrSelectorOutline.TabIndex = 0 - ' - 'ucrReceiverFacet - ' - Me.ucrReceiverFacet.frmParent = Me - Me.ucrReceiverFacet.Location = New System.Drawing.Point(898, 342) - Me.ucrReceiverFacet.Margin = New System.Windows.Forms.Padding(0) - Me.ucrReceiverFacet.Name = "ucrReceiverFacet" - Me.ucrReceiverFacet.Selector = Nothing - Me.ucrReceiverFacet.Size = New System.Drawing.Size(180, 31) - Me.ucrReceiverFacet.strNcFilePath = "" - Me.ucrReceiverFacet.TabIndex = 17 - Me.ucrReceiverFacet.ucrSelector = Nothing - ' - 'LabelFacet - ' - Me.LabelFacet.AutoSize = True - Me.LabelFacet.Location = New System.Drawing.Point(897, 319) - Me.LabelFacet.Name = "LabelFacet" - Me.LabelFacet.Size = New System.Drawing.Size(58, 20) - Me.LabelFacet.TabIndex = 18 - Me.LabelFacet.Text = "Facets" + Me.ucrSelectorOutline.Size = New System.Drawing.Size(220, 189) + Me.ucrSelectorOutline.TabIndex = 3 ' 'dlgClimaticStationMaps ' - Me.AutoScaleDimensions = New System.Drawing.SizeF(9.0!, 20.0!) + Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(1102, 626) - Me.Controls.Add(Me.LabelFacet) - Me.Controls.Add(Me.ucrReceiverFacet) - Me.Controls.Add(Me.ucrSelectorStation) - Me.Controls.Add(Me.LabelColor) - Me.Controls.Add(Me.labelShape) - Me.Controls.Add(Me.lbllatitude) - Me.Controls.Add(Me.ucrReceiverColor) - Me.Controls.Add(Me.lblLongitude) - Me.Controls.Add(Me.ucrReceiverShape) - Me.Controls.Add(Me.ucrReceiverLatitude) - Me.Controls.Add(Me.ucrReceiverLongitude) + Me.ClientSize = New System.Drawing.Size(756, 456) + Me.Controls.Add(Me.grpMapOutline) + Me.Controls.Add(Me.grpStation) Me.Controls.Add(Me.cmdSFOptions) Me.Controls.Add(Me.cmdMapOptions) Me.Controls.Add(Me.cmdPlotOptions) Me.Controls.Add(Me.ucrSaveMap) Me.Controls.Add(Me.ucrBase) - Me.Controls.Add(Me.lblFill) - Me.Controls.Add(Me.ucrReceiverFill) - Me.Controls.Add(Me.ucrSelectorOutline) Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow - Me.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.MaximizeBox = False Me.MinimizeBox = False Me.Name = "dlgClimaticStationMaps" Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen Me.Text = "Climatic Maps" + Me.grpStation.ResumeLayout(False) + Me.grpStation.PerformLayout() + Me.grpMapOutline.ResumeLayout(False) + Me.grpMapOutline.PerformLayout() Me.ResumeLayout(False) - Me.PerformLayout() End Sub - - Friend WithEvents ucrSelectorOutline As ucrSelectorByDataFrameAddRemove Friend WithEvents ucrBase As ucrButtons - Friend WithEvents lblFill As Label - Friend WithEvents ucrReceiverFill As ucrReceiverSingle Friend WithEvents cmdPlotOptions As Button Friend WithEvents ucrSaveMap As ucrSave Friend WithEvents cmdSFOptions As Button Friend WithEvents cmdMapOptions As Button + Friend WithEvents grpStation As GroupBox + Friend WithEvents lblStation As Label + Friend WithEvents ucrReceiverStation As ucrReceiverSingle + Friend WithEvents grpMapOutline As GroupBox + Friend WithEvents lblFill As Label + Friend WithEvents ucrReceiverFill As ucrReceiverSingle + Friend WithEvents ucrSelectorOutline As ucrSelectorByDataFrameAddRemove + Friend WithEvents lblFacet As Label + Friend WithEvents ucrReceiverFacet As ucrReceiverSingle + Friend WithEvents ucrSelectorStation As ucrSelectorByDataFrameAddRemove + Friend WithEvents lblColor As Label + Friend WithEvents lblShape As Label + Friend WithEvents lbllatitude As Label + Friend WithEvents ucrReceiverColor As ucrReceiverSingle Friend WithEvents lblLongitude As Label Friend WithEvents ucrReceiverShape As ucrReceiverSingle Friend WithEvents ucrReceiverLatitude As ucrReceiverSingle Friend WithEvents ucrReceiverLongitude As ucrReceiverSingle - Friend WithEvents ucrReceiverColor As ucrReceiverSingle - Friend WithEvents LabelColor As Label - Friend WithEvents labelShape As Label - Friend WithEvents lbllatitude As Label - Friend WithEvents ucrSelectorStation As ucrSelectorByDataFrameAddRemove - Friend WithEvents LabelFacet As Label - Friend WithEvents ucrReceiverFacet As ucrReceiverSingle End Class From 910f051b257ef658fbf5caedb2e06ea654a9706d Mon Sep 17 00:00:00 2001 From: Wycklife Bonyo Date: Mon, 8 Apr 2019 14:42:57 +0300 Subject: [PATCH 2/9] Setting the properties for the Receiver and adding the ggrepel fuctions to the code --- instat/dlgClimaticStationMaps.vb | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/instat/dlgClimaticStationMaps.vb b/instat/dlgClimaticStationMaps.vb index 3ad7e980428..a8d03cc054e 100644 --- a/instat/dlgClimaticStationMaps.vb +++ b/instat/dlgClimaticStationMaps.vb @@ -18,7 +18,7 @@ Imports instat.Translations Public Class dlgClimaticStationMaps Private bFirstLoad As Boolean = True Private bReset As Boolean = True - Private clsGgplotFunction, clsGeomSfFunction, clsGeomPointFunction, clsSfAesFunction, clsGeomPointAesFunction, clsFacetFunction, clsScaleShapeFunction As RFunction + Private clsGgplotFunction, clsGeomSfFunction, clsGeomPointFunction, clsSfAesFunction, clsGeomPointAesFunction, clsFacetFunction, clsScaleShapeFunction, clsLabelRepelFunction As RFunction Private clsGGplotOperator, clsFacetOp As New ROperator Private clsLabsFunction As New RFunction @@ -94,6 +94,11 @@ Public Class dlgClimaticStationMaps ucrReceiverFacet.SetParameterIsString() ucrReceiverFacet.bWithQuotes = False + ucrReceiverStation.SetParameter(New RParameter("data", bNewIncludeArgumentName:=False)) + ucrReceiverStation.Selector = ucrSelectorStation + ucrReceiverStation.SetParameterIsString() + ucrReceiverStation.bWithQuotes = False + ucrSaveMap.SetPrefix("Map") ucrSaveMap.SetSaveTypeAsGraph() ucrSaveMap.SetIsComboBox() @@ -111,6 +116,7 @@ Public Class dlgClimaticStationMaps clsGeomPointAesFunction = New RFunction clsFacetFunction = New RFunction clsScaleShapeFunction = New RFunction + clsLabelRepelFunction = New RFunction clsGGplotOperator = New ROperator clsXlimFunction = New RFunction @@ -154,6 +160,10 @@ Public Class dlgClimaticStationMaps clsFacetFunction.SetRCommand("facet_wrap") clsFacetFunction.AddParameter("facet", clsROperatorParameter:=clsFacetOp, bIncludeArgumentName:=False) + clsLabelRepelFunction.SetPackageName("ggrepel") + clsLabelRepelFunction.SetRCommand("geom_label_repel") + clsLabelRepelFunction.AddParameter("label", clsROperatorParameter:=clsFacetOp, bIncludeArgumentName:=False) + clsGGplotOperator.SetOperation("+") clsGGplotOperator.AddParameter("ggplot", clsRFunctionParameter:=clsGgplotFunction, bIncludeArgumentName:=False, iPosition:=0) clsGGplotOperator.AddParameter("geom_sf", clsRFunctionParameter:=clsGeomSfFunction, bIncludeArgumentName:=False, iPosition:=1) @@ -192,6 +202,7 @@ Public Class dlgClimaticStationMaps ucrReceiverShape.SetRCode(clsGeomPointAesFunction, bReset) ucrReceiverColor.SetRCode(clsGeomPointAesFunction, bReset) ucrReceiverFacet.SetRCode(clsFacetOp, bReset) + ucrReceiverStation.SetRCode(clsLabelRepelFunction, bReset) End Sub Private Sub cmdSFOptions_Click(sender As Object, e As EventArgs) Handles cmdSFOptions.Click @@ -258,4 +269,12 @@ Public Class dlgClimaticStationMaps clsGGplotOperator.RemoveParameterByName("facets") End If End Sub + + Private Sub ucrReceiverStation_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrReceiverStation.ControlValueChanged + If Not ucrReceiverStation.IsEmpty Then + clsGGplotOperator.AddParameter("labels", clsRFunctionParameter:=clsLabelRepelFunction, bIncludeArgumentName:=False, iPosition:=2) + Else + clsGGplotOperator.RemoveParameterByName("labels") + End If + End Sub End Class \ No newline at end of file From c8a9323b6c8c761b22835c056816b48195726042 Mon Sep 17 00:00:00 2001 From: Wycklife Bonyo Date: Wed, 10 Apr 2019 09:38:22 +0300 Subject: [PATCH 3/9] Small designer change --- instat/dlgClimaticStationMaps.Designer.vb | 54 +++++++++++------------ 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/instat/dlgClimaticStationMaps.Designer.vb b/instat/dlgClimaticStationMaps.Designer.vb index f73ab3a59d6..f7eff7ca9e6 100644 --- a/instat/dlgClimaticStationMaps.Designer.vb +++ b/instat/dlgClimaticStationMaps.Designer.vb @@ -27,7 +27,7 @@ Partial Class dlgClimaticStationMaps Me.cmdSFOptions = New System.Windows.Forms.Button() Me.ucrSaveMap = New instat.ucrSave() Me.ucrBase = New instat.ucrButtons() - Me.grpStation = New System.Windows.Forms.GroupBox() + Me.grpPoints = New System.Windows.Forms.GroupBox() Me.lblStation = New System.Windows.Forms.Label() Me.ucrReceiverStation = New instat.ucrReceiverSingle() Me.lblFacet = New System.Windows.Forms.Label() @@ -45,7 +45,7 @@ Partial Class dlgClimaticStationMaps Me.lblFill = New System.Windows.Forms.Label() Me.ucrReceiverFill = New instat.ucrReceiverSingle() Me.ucrSelectorOutline = New instat.ucrSelectorByDataFrameAddRemove() - Me.grpStation.SuspendLayout() + Me.grpPoints.SuspendLayout() Me.grpMapOutline.SuspendLayout() Me.SuspendLayout() ' @@ -93,27 +93,27 @@ Partial Class dlgClimaticStationMaps Me.ucrBase.Size = New System.Drawing.Size(410, 52) Me.ucrBase.TabIndex = 16 ' - 'grpStation - ' - Me.grpStation.Controls.Add(Me.lblStation) - Me.grpStation.Controls.Add(Me.ucrReceiverStation) - Me.grpStation.Controls.Add(Me.lblFacet) - Me.grpStation.Controls.Add(Me.ucrReceiverFacet) - Me.grpStation.Controls.Add(Me.ucrSelectorStation) - Me.grpStation.Controls.Add(Me.lblColor) - Me.grpStation.Controls.Add(Me.lblShape) - Me.grpStation.Controls.Add(Me.lbllatitude) - Me.grpStation.Controls.Add(Me.ucrReceiverColor) - Me.grpStation.Controls.Add(Me.lblLongitude) - Me.grpStation.Controls.Add(Me.ucrReceiverShape) - Me.grpStation.Controls.Add(Me.ucrReceiverLatitude) - Me.grpStation.Controls.Add(Me.ucrReceiverLongitude) - Me.grpStation.Location = New System.Drawing.Point(373, 8) - Me.grpStation.Name = "grpStation" - Me.grpStation.Size = New System.Drawing.Size(371, 292) - Me.grpStation.TabIndex = 21 - Me.grpStation.TabStop = False - Me.grpStation.Text = "Station" + 'grpPoints + ' + Me.grpPoints.Controls.Add(Me.lblStation) + Me.grpPoints.Controls.Add(Me.ucrReceiverStation) + Me.grpPoints.Controls.Add(Me.lblFacet) + Me.grpPoints.Controls.Add(Me.ucrReceiverFacet) + Me.grpPoints.Controls.Add(Me.ucrSelectorStation) + Me.grpPoints.Controls.Add(Me.lblColor) + Me.grpPoints.Controls.Add(Me.lblShape) + Me.grpPoints.Controls.Add(Me.lbllatitude) + Me.grpPoints.Controls.Add(Me.ucrReceiverColor) + Me.grpPoints.Controls.Add(Me.lblLongitude) + Me.grpPoints.Controls.Add(Me.ucrReceiverShape) + Me.grpPoints.Controls.Add(Me.ucrReceiverLatitude) + Me.grpPoints.Controls.Add(Me.ucrReceiverLongitude) + Me.grpPoints.Location = New System.Drawing.Point(373, 8) + Me.grpPoints.Name = "grpPoints" + Me.grpPoints.Size = New System.Drawing.Size(371, 292) + Me.grpPoints.TabIndex = 21 + Me.grpPoints.TabStop = False + Me.grpPoints.Text = "Points" ' 'lblStation ' @@ -307,7 +307,7 @@ Partial Class dlgClimaticStationMaps Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.ClientSize = New System.Drawing.Size(756, 456) Me.Controls.Add(Me.grpMapOutline) - Me.Controls.Add(Me.grpStation) + Me.Controls.Add(Me.grpPoints) Me.Controls.Add(Me.cmdSFOptions) Me.Controls.Add(Me.cmdMapOptions) Me.Controls.Add(Me.cmdPlotOptions) @@ -319,8 +319,8 @@ Partial Class dlgClimaticStationMaps Me.Name = "dlgClimaticStationMaps" Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen Me.Text = "Climatic Maps" - Me.grpStation.ResumeLayout(False) - Me.grpStation.PerformLayout() + Me.grpPoints.ResumeLayout(False) + Me.grpPoints.PerformLayout() Me.grpMapOutline.ResumeLayout(False) Me.grpMapOutline.PerformLayout() Me.ResumeLayout(False) @@ -331,7 +331,7 @@ Partial Class dlgClimaticStationMaps Friend WithEvents ucrSaveMap As ucrSave Friend WithEvents cmdSFOptions As Button Friend WithEvents cmdMapOptions As Button - Friend WithEvents grpStation As GroupBox + Friend WithEvents grpPoints As GroupBox Friend WithEvents lblStation As Label Friend WithEvents ucrReceiverStation As ucrReceiverSingle Friend WithEvents grpMapOutline As GroupBox From 36b85212cef84b82af77b61ca109ee42580579fb Mon Sep 17 00:00:00 2001 From: Wycklife Bonyo Date: Wed, 24 Apr 2019 12:35:20 +0300 Subject: [PATCH 4/9] More changes on Climatic>Mapping dialog --- instat/dlgClimaticStationMaps.Designer.vb | 20 ++++++++++---------- instat/dlgClimaticStationMaps.vb | 17 ++++++++++++++--- 2 files changed, 24 insertions(+), 13 deletions(-) diff --git a/instat/dlgClimaticStationMaps.Designer.vb b/instat/dlgClimaticStationMaps.Designer.vb index f7eff7ca9e6..9eac04c9ec3 100644 --- a/instat/dlgClimaticStationMaps.Designer.vb +++ b/instat/dlgClimaticStationMaps.Designer.vb @@ -28,7 +28,7 @@ Partial Class dlgClimaticStationMaps Me.ucrSaveMap = New instat.ucrSave() Me.ucrBase = New instat.ucrButtons() Me.grpPoints = New System.Windows.Forms.GroupBox() - Me.lblStation = New System.Windows.Forms.Label() + Me.lblStationNames = New System.Windows.Forms.Label() Me.ucrReceiverStation = New instat.ucrReceiverSingle() Me.lblFacet = New System.Windows.Forms.Label() Me.ucrReceiverFacet = New instat.ucrReceiverSingle() @@ -95,7 +95,7 @@ Partial Class dlgClimaticStationMaps ' 'grpPoints ' - Me.grpPoints.Controls.Add(Me.lblStation) + Me.grpPoints.Controls.Add(Me.lblStationNames) Me.grpPoints.Controls.Add(Me.ucrReceiverStation) Me.grpPoints.Controls.Add(Me.lblFacet) Me.grpPoints.Controls.Add(Me.ucrReceiverFacet) @@ -115,14 +115,14 @@ Partial Class dlgClimaticStationMaps Me.grpPoints.TabStop = False Me.grpPoints.Text = "Points" ' - 'lblStation + 'lblStationNames ' - Me.lblStation.AutoSize = True - Me.lblStation.Location = New System.Drawing.Point(243, 17) - Me.lblStation.Name = "lblStation" - Me.lblStation.Size = New System.Drawing.Size(43, 13) - Me.lblStation.TabIndex = 33 - Me.lblStation.Text = "Station " + Me.lblStationNames.AutoSize = True + Me.lblStationNames.Location = New System.Drawing.Point(243, 17) + Me.lblStationNames.Name = "lblStationNames" + Me.lblStationNames.Size = New System.Drawing.Size(79, 13) + Me.lblStationNames.TabIndex = 33 + Me.lblStationNames.Text = "Station Names:" ' 'ucrReceiverStation ' @@ -332,7 +332,7 @@ Partial Class dlgClimaticStationMaps Friend WithEvents cmdSFOptions As Button Friend WithEvents cmdMapOptions As Button Friend WithEvents grpPoints As GroupBox - Friend WithEvents lblStation As Label + Friend WithEvents lblStationNames As Label Friend WithEvents ucrReceiverStation As ucrReceiverSingle Friend WithEvents grpMapOutline As GroupBox Friend WithEvents lblFill As Label diff --git a/instat/dlgClimaticStationMaps.vb b/instat/dlgClimaticStationMaps.vb index a8d03cc054e..526514012f6 100644 --- a/instat/dlgClimaticStationMaps.vb +++ b/instat/dlgClimaticStationMaps.vb @@ -33,6 +33,7 @@ Public Class dlgClimaticStationMaps Private clsLocalRaesFunction As New RFunction Private bResetSubdialog As Boolean = True Private bResetSFLayerSubdialog As Boolean = True + Private clsLabelRepelAesFunction As New RFunction Private Sub dlgClimaticMaps_Load(sender As Object, e As EventArgs) Handles MyBase.Load If bFirstLoad Then @@ -94,7 +95,7 @@ Public Class dlgClimaticStationMaps ucrReceiverFacet.SetParameterIsString() ucrReceiverFacet.bWithQuotes = False - ucrReceiverStation.SetParameter(New RParameter("data", bNewIncludeArgumentName:=False)) + ucrReceiverStation.SetParameter(New RParameter("label", 2)) ucrReceiverStation.Selector = ucrSelectorStation ucrReceiverStation.SetParameterIsString() ucrReceiverStation.bWithQuotes = False @@ -117,6 +118,7 @@ Public Class dlgClimaticStationMaps clsFacetFunction = New RFunction clsScaleShapeFunction = New RFunction clsLabelRepelFunction = New RFunction + clsLabelRepelAesFunction = New RFunction clsGGplotOperator = New ROperator clsXlimFunction = New RFunction @@ -162,7 +164,11 @@ Public Class dlgClimaticStationMaps clsLabelRepelFunction.SetPackageName("ggrepel") clsLabelRepelFunction.SetRCommand("geom_label_repel") - clsLabelRepelFunction.AddParameter("label", clsROperatorParameter:=clsFacetOp, bIncludeArgumentName:=False) + + clsLabelRepelAesFunction.SetPackageName("ggplot2") + clsLabelRepelAesFunction.SetRCommand("aes") + clsLabelRepelFunction.AddParameter("aes", clsRFunctionParameter:=clsLabelRepelAesFunction, bIncludeArgumentName:=False) + clsGGplotOperator.SetOperation("+") clsGGplotOperator.AddParameter("ggplot", clsRFunctionParameter:=clsGgplotFunction, bIncludeArgumentName:=False, iPosition:=0) @@ -193,6 +199,10 @@ Public Class dlgClimaticStationMaps End Sub Private Sub SetRCodeForControls(bReset As Boolean) + ucrReceiverLongitude.AddAdditionalCodeParameterPair(clsLabelRepelAesFunction, ucrReceiverLongitude.GetParameter()) + ucrReceiverLatitude.AddAdditionalCodeParameterPair(clsLabelRepelAesFunction, ucrReceiverLatitude.GetParameter()) + ucrSelectorStation.AddAdditionalCodeParameterPair(clsLabelRepelFunction, ucrSelectorStation.GetParameter()) + ucrSelectorOutline.SetRCode(clsGeomSfFunction, bReset) ucrReceiverFill.SetRCode(clsSfAesFunction, bReset) ucrSaveMap.SetRCode(clsGGplotOperator, bReset) @@ -202,7 +212,8 @@ Public Class dlgClimaticStationMaps ucrReceiverShape.SetRCode(clsGeomPointAesFunction, bReset) ucrReceiverColor.SetRCode(clsGeomPointAesFunction, bReset) ucrReceiverFacet.SetRCode(clsFacetOp, bReset) - ucrReceiverStation.SetRCode(clsLabelRepelFunction, bReset) + + ucrReceiverStation.SetRCode(clsLabelRepelAesFunction, bReset) End Sub Private Sub cmdSFOptions_Click(sender As Object, e As EventArgs) Handles cmdSFOptions.Click From 090735bec2baf094f31baf2a86b10e495bfaf7bf Mon Sep 17 00:00:00 2001 From: Wycklife Bonyo Date: Fri, 26 Apr 2019 11:32:07 +0300 Subject: [PATCH 5/9] Changes on TestOk --- instat/dlgClimaticStationMaps.vb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/instat/dlgClimaticStationMaps.vb b/instat/dlgClimaticStationMaps.vb index 526514012f6..81891c29f11 100644 --- a/instat/dlgClimaticStationMaps.vb +++ b/instat/dlgClimaticStationMaps.vb @@ -242,6 +242,8 @@ Public Class dlgClimaticStationMaps bOkEnabled = False ElseIf ucrReceiverLongitude.IsEmpty AndAlso Not ucrReceiverLatitude.IsEmpty Then bOkEnabled = False + ElseIf Not ucrReceiverStation.IsEmpty AndAlso ucrReceiverLongitude.IsEmpty AndAlso ucrReceiverLatitude.IsEmpty Then + bOkEnabled = False Else bOkEnabled = True End If @@ -269,7 +271,7 @@ Public Class dlgClimaticStationMaps End If End Sub - Private Sub ucrReceiverFill_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrReceiverFill.ControlContentsChanged, ucrReceiverLongitude.ControlContentsChanged, ucrReceiverLatitude.ControlContentsChanged, ucrSaveMap.ControlContentsChanged + Private Sub ucrReceiverFill_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrReceiverFill.ControlContentsChanged, ucrReceiverLongitude.ControlContentsChanged, ucrReceiverLatitude.ControlContentsChanged, ucrSaveMap.ControlContentsChanged, ucrReceiverStation.ControlContentsChanged TestOkEnabled() End Sub From 9407b85609676284073b6bf503956e701cdb929a Mon Sep 17 00:00:00 2001 From: Wycklife Bonyo Date: Thu, 2 May 2019 11:56:52 +0300 Subject: [PATCH 6/9] Added Three parameters to the RepelAesFunction --- instat/dlgClimaticStationMaps.vb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/instat/dlgClimaticStationMaps.vb b/instat/dlgClimaticStationMaps.vb index 81891c29f11..5435431a1d0 100644 --- a/instat/dlgClimaticStationMaps.vb +++ b/instat/dlgClimaticStationMaps.vb @@ -167,6 +167,9 @@ Public Class dlgClimaticStationMaps clsLabelRepelAesFunction.SetPackageName("ggplot2") clsLabelRepelAesFunction.SetRCommand("aes") + clsLabelRepelAesFunction.AddParameter("force", 10, iPosition:=2) + clsLabelRepelAesFunction.AddParameter("size", 4, iPosition:=3) + clsLabelRepelAesFunction.AddParameter("direction", Chr(34) & "both" & Chr(34), iPosition:=4) clsLabelRepelFunction.AddParameter("aes", clsRFunctionParameter:=clsLabelRepelAesFunction, bIncludeArgumentName:=False) From 90c293e68b1ef81365656a9f530d336f9acaa62e Mon Sep 17 00:00:00 2001 From: Wycklife Bonyo Date: Mon, 20 May 2019 16:01:17 +0300 Subject: [PATCH 7/9] Small changes --- instat/dlgClimaticStationMaps.vb | 3 --- 1 file changed, 3 deletions(-) diff --git a/instat/dlgClimaticStationMaps.vb b/instat/dlgClimaticStationMaps.vb index 5435431a1d0..81891c29f11 100644 --- a/instat/dlgClimaticStationMaps.vb +++ b/instat/dlgClimaticStationMaps.vb @@ -167,9 +167,6 @@ Public Class dlgClimaticStationMaps clsLabelRepelAesFunction.SetPackageName("ggplot2") clsLabelRepelAesFunction.SetRCommand("aes") - clsLabelRepelAesFunction.AddParameter("force", 10, iPosition:=2) - clsLabelRepelAesFunction.AddParameter("size", 4, iPosition:=3) - clsLabelRepelAesFunction.AddParameter("direction", Chr(34) & "both" & Chr(34), iPosition:=4) clsLabelRepelFunction.AddParameter("aes", clsRFunctionParameter:=clsLabelRepelAesFunction, bIncludeArgumentName:=False) From 911a8c998cf570c478d6ab6bf4ecdc141ae0f6b1 Mon Sep 17 00:00:00 2001 From: Maxwell Fundi Date: Thu, 30 May 2019 23:03:33 +0300 Subject: [PATCH 8/9] Update dlgClimaticStationMaps.vb --- instat/dlgClimaticStationMaps.vb | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/instat/dlgClimaticStationMaps.vb b/instat/dlgClimaticStationMaps.vb index 81891c29f11..7b1c426897a 100644 --- a/instat/dlgClimaticStationMaps.vb +++ b/instat/dlgClimaticStationMaps.vb @@ -95,7 +95,7 @@ Public Class dlgClimaticStationMaps ucrReceiverFacet.SetParameterIsString() ucrReceiverFacet.bWithQuotes = False - ucrReceiverStation.SetParameter(New RParameter("label", 2)) + ucrReceiverStation.SetParameter(New RParameter("geom_label_repel", 2)) ucrReceiverStation.Selector = ucrSelectorStation ucrReceiverStation.SetParameterIsString() ucrReceiverStation.bWithQuotes = False @@ -138,14 +138,14 @@ Public Class dlgClimaticStationMaps clsGeomSfFunction.SetPackageName("ggplot2") clsGeomSfFunction.SetRCommand("geom_sf") - clsGeomSfFunction.AddParameter("aes", clsRFunctionParameter:=clsSfAesFunction, bIncludeArgumentName:=False, iPosition:=1) + clsGeomSfFunction.AddParameter("mapping", clsRFunctionParameter:=clsSfAesFunction, iPosition:=1) clsSfAesFunction.SetPackageName("ggplot2") clsSfAesFunction.SetRCommand("aes") clsGeomPointFunction.SetPackageName("ggplot2") clsGeomPointFunction.SetRCommand("geom_point") - clsGeomPointFunction.AddParameter("aes", clsRFunctionParameter:=clsGeomPointAesFunction, bIncludeArgumentName:=False, iPosition:=1) + clsGeomPointFunction.AddParameter("mapping", clsRFunctionParameter:=clsGeomPointAesFunction,iPosition:=1) clsGeomPointAesFunction.SetPackageName("ggplot2") clsGeomPointAesFunction.SetRCommand("aes") @@ -167,7 +167,7 @@ Public Class dlgClimaticStationMaps clsLabelRepelAesFunction.SetPackageName("ggplot2") clsLabelRepelAesFunction.SetRCommand("aes") - clsLabelRepelFunction.AddParameter("aes", clsRFunctionParameter:=clsLabelRepelAesFunction, bIncludeArgumentName:=False) + clsLabelRepelFunction.AddParameter("mapping", clsRFunctionParameter:=clsLabelRepelAesFunction,iPosition:=1) clsGGplotOperator.SetOperation("+") @@ -285,9 +285,9 @@ Public Class dlgClimaticStationMaps Private Sub ucrReceiverStation_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrReceiverStation.ControlValueChanged If Not ucrReceiverStation.IsEmpty Then - clsGGplotOperator.AddParameter("labels", clsRFunctionParameter:=clsLabelRepelFunction, bIncludeArgumentName:=False, iPosition:=2) + clsGGplotOperator.AddParameter("geom_label_repel", clsRFunctionParameter:=clsLabelRepelFunction, bIncludeArgumentName:=False, iPosition:=2) Else - clsGGplotOperator.RemoveParameterByName("labels") + clsGGplotOperator.RemoveParameterByName("geom_label_repel") End If End Sub -End Class \ No newline at end of file +End Class From 340fc24581e7b72fda8b6fc77c25915d3cc70957 Mon Sep 17 00:00:00 2001 From: Wycklife <33898404+Wycklife@users.noreply.github.com> Date: Fri, 31 May 2019 12:13:59 +0300 Subject: [PATCH 9/9] Update instat/dlgClimaticStationMaps.vb Co-Authored-By: Danny Parsons --- instat/dlgClimaticStationMaps.vb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/instat/dlgClimaticStationMaps.vb b/instat/dlgClimaticStationMaps.vb index 7b1c426897a..62e5f043f70 100644 --- a/instat/dlgClimaticStationMaps.vb +++ b/instat/dlgClimaticStationMaps.vb @@ -95,7 +95,7 @@ Public Class dlgClimaticStationMaps ucrReceiverFacet.SetParameterIsString() ucrReceiverFacet.bWithQuotes = False - ucrReceiverStation.SetParameter(New RParameter("geom_label_repel", 2)) + ucrReceiverStation.SetParameter(New RParameter("label", 2)) ucrReceiverStation.Selector = ucrSelectorStation ucrReceiverStation.SetParameterIsString() ucrReceiverStation.bWithQuotes = False