From a9da9288235039b5f3b0252d7d150781997d816f Mon Sep 17 00:00:00 2001 From: Stephen Kogo Date: Mon, 20 Mar 2017 15:13:40 +0300 Subject: [PATCH 001/154] Tyding up and enabling password --- instat/sdgImportFromClimSoft.vb | 17 ++++------------- instat/static/InstatObject/R/instat_object_R6.R | 4 ++-- 2 files changed, 6 insertions(+), 15 deletions(-) diff --git a/instat/sdgImportFromClimSoft.vb b/instat/sdgImportFromClimSoft.vb index becf51bf263..c0cb9185121 100644 --- a/instat/sdgImportFromClimSoft.vb +++ b/instat/sdgImportFromClimSoft.vb @@ -34,14 +34,14 @@ Public Class sdgImportFromClimSoft Private Sub InitialiseControls() ucrInputDatabaseName.SetParameter(New RParameter("dbname")) - ucrInputDatabaseName.SetRDefault("mariadb_climsoft_test_db_v4") + 'ucrInputDatabaseName.SetRDefault("mariadb_climsoft_test_db_v4") ucrInputHost.SetParameter(New RParameter("host")) - ucrInputHost.SetRDefault("127.0.0.1") + 'ucrInputHost.SetRDefault("127.0.0.1") ucrInputPort.SetParameter(New RParameter("port")) 'ucrInputPort.SetRDefault("3308") ucrInputPort.AddQuotesIfUnrecognised = False ucrInputUserName.SetParameter(New RParameter("user")) - ucrInputUserName.SetRDefault("root") + 'ucrInputUserName.SetRDefault("root") bControlsInitialised = True End Sub @@ -61,16 +61,7 @@ Public Class sdgImportFromClimSoft Private Sub cmdEnterPassword_Click(sender As Object, e As EventArgs) Handles cmdEnterPassword.Click Dim expTemp As SymbolicExpression - Dim message, title, defaultPassword As String - Dim myValue As Object - ' Set prompt. - message = "Enter the password" - ' Set title. - title = "Climsoft Password" - 'defaultPassword = "admin" - myValue = InputBox(message, title) - clsRDatabaseConnect.AddParameter("password", Chr(34) & myValue & Chr(34)) - + If bConnected Then frmMain.clsRLink.RunScript(clsRDatabaseDisconnect.ToScript(), strComment:="Disconnect database connection.") End If diff --git a/instat/static/InstatObject/R/instat_object_R6.R b/instat/static/InstatObject/R/instat_object_R6.R index 6a610b26d1c..28652533f3f 100644 --- a/instat/static/InstatObject/R/instat_object_R6.R +++ b/instat/static/InstatObject/R/instat_object_R6.R @@ -1234,8 +1234,8 @@ instat_object$set("public", "has_database_connection", function() { } ) -instat_object$set("public", "database_connect", function(dbname, user, host, port, drv = MySQL(), password) { - #password <- getPass(paste0(username, " password:")) +instat_object$set("public", "database_connect", function(dbname, user, host, port, drv = MySQL()) { + password <- getPass(paste0(user, " password:")) out <- NULL out <- dbConnect(drv = drv, dbname = dbname, user = user, password = password, host = host, port = port) if(!is.null(out)) { From 5e4f2404a06b5df450a8c107cdd61f42e1042802 Mon Sep 17 00:00:00 2001 From: Stephen Kogo Date: Tue, 28 Mar 2017 10:13:57 +0300 Subject: [PATCH 002/154] Ordering parameters in subdialog --- instat/sdgImportFromClimSoft.vb | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/instat/sdgImportFromClimSoft.vb b/instat/sdgImportFromClimSoft.vb index c0cb9185121..431f2a3d44d 100644 --- a/instat/sdgImportFromClimSoft.vb +++ b/instat/sdgImportFromClimSoft.vb @@ -27,21 +27,18 @@ Public Class sdgImportFromClimSoft Private strNoConnection As String = "No Connection" Private Sub sdgImportFromClimSoft_Load(sender As Object, e As EventArgs) Handles MyBase.Load + autoTranslate(Me) If Not bControlsInitialised Then InitialiseControls() End If End Sub Private Sub InitialiseControls() - ucrInputDatabaseName.SetParameter(New RParameter("dbname")) - 'ucrInputDatabaseName.SetRDefault("mariadb_climsoft_test_db_v4") - ucrInputHost.SetParameter(New RParameter("host")) - 'ucrInputHost.SetRDefault("127.0.0.1") - ucrInputPort.SetParameter(New RParameter("port")) - 'ucrInputPort.SetRDefault("3308") + ucrInputDatabaseName.SetParameter(New RParameter("dbname", 0)) + ucrInputHost.SetParameter(New RParameter("host", 1)) + ucrInputPort.SetParameter(New RParameter("port", 2)) ucrInputPort.AddQuotesIfUnrecognised = False - ucrInputUserName.SetParameter(New RParameter("user")) - 'ucrInputUserName.SetRDefault("root") + ucrInputUserName.SetParameter(New RParameter("user", 3)) bControlsInitialised = True End Sub From fc408bd16f1298461d7124d168e27ec0c4f27c35 Mon Sep 17 00:00:00 2001 From: Stephen Kogo Date: Tue, 28 Mar 2017 11:51:19 +0300 Subject: [PATCH 003/154] fixing the links between controls --- instat/dlgClimSoft.vb | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/instat/dlgClimSoft.vb b/instat/dlgClimSoft.vb index 0db51a57f4f..30b0e81a932 100644 --- a/instat/dlgClimSoft.vb +++ b/instat/dlgClimSoft.vb @@ -54,20 +54,22 @@ Public Class dlgClimSoft ucrReceiverMultipleElements.SetParameterIsString() ucrReceiverMultipleElements.Selector = ucrSelectorForClimSoft ucrReceiverMultipleElements.SetItemType("database_variables") - ucrReceiverMultipleElements.strDatabaseQuery = "SELECT obselement.elementName FROM obselement,observationfinal WHERE obselement.elementId=observationfinal.describedBy AND observationfinal.recordedFrom in (10202200,10306100) GROUP BY observationfinal.describedBy;" + ucrReceiverMultipleElements.strDatabaseQuery = "SELECT obselement.elementName FROM obselement,observationfinal WHERE obselement.elementId=observationfinal.describedBy AND observationfinal.recordedFrom in (102,104) GROUP BY observationfinal.describedBy;" + ucrReceiverMultipleElements.SetLinkedDisplayControl(lblElements) ucrChkObservationData.SetText("Observation Data") ucrChkObservationData.SetParameter(New RParameter("include_observation_data", 2)) ucrChkObservationData.SetValuesCheckedAndUnchecked("TRUE", "FALSE") ucrChkObservationData.SetRDefault("FALSE") + ucrInputStartDate.SetParameter(New RParameter("start_date", 3)) ucrInputStartDate.SetLinkedDisplayControl(lblStartDate) ttClimsoft.SetToolTip(ucrInputStartDate.txtInput, "yyyy-mm-dd") ucrInputEndDate.SetParameter(New RParameter("end_date", 4)) ucrInputEndDate.SetLinkedDisplayControl(lblEndDate) ttClimsoft.SetToolTip(ucrInputEndDate.txtInput, "yyyy-mm-dd") - ucrChkObservationData.AddToLinkedControls({ucrInputStartDate, ucrInputEndDate}, {True}, bNewLinkedAddRemoveParameter:=False, bNewLinkedHideIfParameterMissing:=True) + ucrChkObservationData.AddToLinkedControls({ucrInputStartDate, ucrInputEndDate, ucrReceiverMultipleElements}, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) End Sub Private Sub TestOKEnabled() @@ -103,7 +105,6 @@ Public Class dlgClimSoft End Sub Private Sub cmdEstablishConnection_Click(sender As Object, e As EventArgs) Handles cmdEstablishConnection.Click - sdgImportFromClimSoft.SetRDatabaseConnection(clsRDatabaseConnect, clsRDatabaseDisconnect, clsHasConnection, bConnectionActive, bResetSubdialog) bResetSubdialog = False sdgImportFromClimSoft.ShowDialog() @@ -122,6 +123,7 @@ Public Class dlgClimSoft Private Sub ucrReceiverMultipleStations_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrReceiverMultipleStations.ControlValueChanged If ucrReceiverMultipleStations.IsEmpty Then + 'Danny needs to clarify this. ucrReceiverMultipleElements.strDatabaseQuery = "SELECT obselement.elementName FROM obselement,observationfinal WHERE obselement.elementId=observationfinal.describedBy GROUP BY observationfinal.describedBy;" Else ucrReceiverMultipleElements.strDatabaseQuery = "SELECT obselement.elementName FROM obselement,observationfinal WHERE obselement.elementId=observationfinal.describedBy AND observationfinal.recordedFrom IN (" & String.Join(",", ucrReceiverMultipleStations.GetVariableNamesList(bWithQuotes:=False)) & ") GROUP BY observationfinal.describedBy;" From d26f6a77d325d8f4aa7415fbc78f8666373ad753 Mon Sep 17 00:00:00 2001 From: Stephen Kogo Date: Wed, 19 Apr 2017 12:42:23 +0300 Subject: [PATCH 004/154] refreshing receiver on click return --- instat/sdgImportFromClimSoft.vb | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/instat/sdgImportFromClimSoft.vb b/instat/sdgImportFromClimSoft.vb index 431f2a3d44d..48a9df04494 100644 --- a/instat/sdgImportFromClimSoft.vb +++ b/instat/sdgImportFromClimSoft.vb @@ -39,6 +39,11 @@ Public Class sdgImportFromClimSoft ucrInputPort.SetParameter(New RParameter("port", 2)) ucrInputPort.AddQuotesIfUnrecognised = False ucrInputUserName.SetParameter(New RParameter("user", 3)) + ucrInputDatabaseName.SetRDefault("mariadb_climsoft_test_db_v4") + ucrInputHost.SetRDefault("127.0.0.1") + 'ucrInputPort.SetRDefault("3308") + ucrInputUserName.SetRDefault("root") + bControlsInitialised = True End Sub @@ -58,7 +63,7 @@ Public Class sdgImportFromClimSoft Private Sub cmdEnterPassword_Click(sender As Object, e As EventArgs) Handles cmdEnterPassword.Click Dim expTemp As SymbolicExpression - + If bConnected Then frmMain.clsRLink.RunScript(clsRDatabaseDisconnect.ToScript(), strComment:="Disconnect database connection.") End If @@ -75,6 +80,9 @@ Public Class sdgImportFromClimSoft Else lblConnection.Text = strNoConnection End If - dlgClimSoft.ucrReceiverMultipleStations.SetMeAsReceiver() 'this is necessary to refresh the selector in the main dialog. Should happen on click return from subdialog + End Sub + + Private Sub ucrBaseSdgClimSoft_ClickReturn(sender As Object, e As EventArgs) Handles ucrBaseSdgClimSoft.ClickReturn + dlgClimSoft.ucrReceiverMultipleStations.SetMeAsReceiver() End Sub End Class \ No newline at end of file From 78f71dd0acc2018a2a7b2ccf1e6af3b3f7b3df8a Mon Sep 17 00:00:00 2001 From: Stephen Kogo Date: Thu, 20 Apr 2017 10:10:45 +0300 Subject: [PATCH 005/154] edits --- instat/dlgClimSoft.vb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/instat/dlgClimSoft.vb b/instat/dlgClimSoft.vb index 30b0e81a932..25cfa5d02c6 100644 --- a/instat/dlgClimSoft.vb +++ b/instat/dlgClimSoft.vb @@ -54,7 +54,7 @@ Public Class dlgClimSoft ucrReceiverMultipleElements.SetParameterIsString() ucrReceiverMultipleElements.Selector = ucrSelectorForClimSoft ucrReceiverMultipleElements.SetItemType("database_variables") - ucrReceiverMultipleElements.strDatabaseQuery = "SELECT obselement.elementName FROM obselement,observationfinal WHERE obselement.elementId=observationfinal.describedBy AND observationfinal.recordedFrom in (102,104) GROUP BY observationfinal.describedBy;" + 'ucrReceiverMultipleElements.strDatabaseQuery = "SELECT obselement.elementName FROM obselement,observationfinal WHERE obselement.elementId=observationfinal.describedBy AND observationfinal.recordedFrom in (102,104) GROUP BY observationfinal.describedBy;" ucrReceiverMultipleElements.SetLinkedDisplayControl(lblElements) ucrChkObservationData.SetText("Observation Data") @@ -124,7 +124,7 @@ Public Class dlgClimSoft Private Sub ucrReceiverMultipleStations_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrReceiverMultipleStations.ControlValueChanged If ucrReceiverMultipleStations.IsEmpty Then 'Danny needs to clarify this. - ucrReceiverMultipleElements.strDatabaseQuery = "SELECT obselement.elementName FROM obselement,observationfinal WHERE obselement.elementId=observationfinal.describedBy GROUP BY observationfinal.describedBy;" + 'ucrReceiverMultipleElements.strDatabaseQuery = "SELECT obselement.elementName FROM obselement,observationfinal WHERE obselement.elementId=observationfinal.describedBy GROUP BY observationfinal.describedBy;" Else ucrReceiverMultipleElements.strDatabaseQuery = "SELECT obselement.elementName FROM obselement,observationfinal WHERE obselement.elementId=observationfinal.describedBy AND observationfinal.recordedFrom IN (" & String.Join(",", ucrReceiverMultipleStations.GetVariableNamesList(bWithQuotes:=False)) & ") GROUP BY observationfinal.describedBy;" End If From cac656e91a6d398e0c2002ba1b858d145cb5511b Mon Sep 17 00:00:00 2001 From: Stephen Kogo Date: Fri, 21 Apr 2017 12:53:41 +0300 Subject: [PATCH 006/154] edits to climsoft dialog --- instat/dlgClimSoft.vb | 6 ++++-- .../static/InstatObject/R/instat_object_R6.R | 19 ++++++++++++++++--- 2 files changed, 20 insertions(+), 5 deletions(-) diff --git a/instat/dlgClimSoft.vb b/instat/dlgClimSoft.vb index 25cfa5d02c6..a309ce5029f 100644 --- a/instat/dlgClimSoft.vb +++ b/instat/dlgClimSoft.vb @@ -55,6 +55,7 @@ Public Class dlgClimSoft ucrReceiverMultipleElements.Selector = ucrSelectorForClimSoft ucrReceiverMultipleElements.SetItemType("database_variables") 'ucrReceiverMultipleElements.strDatabaseQuery = "SELECT obselement.elementName FROM obselement,observationfinal WHERE obselement.elementId=observationfinal.describedBy AND observationfinal.recordedFrom in (102,104) GROUP BY observationfinal.describedBy;" + ucrReceiverMultipleElements.strDatabaseQuery = "SELECT obselement.elementName FROM obselement,observationfinal WHERE obselement.elementId=observationfinal.describedBy GROUP BY observationfinal.describedBy;" ucrReceiverMultipleElements.SetLinkedDisplayControl(lblElements) ucrChkObservationData.SetText("Observation Data") @@ -73,7 +74,8 @@ Public Class dlgClimSoft End Sub Private Sub TestOKEnabled() - If (Not ucrReceiverMultipleStations.IsEmpty() AndAlso Not ucrChkObservationData.Checked) OrElse (Not ucrReceiverMultipleStations.IsEmpty() AndAlso Not ucrReceiverMultipleElements.IsEmpty() AndAlso ucrChkObservationData.Checked) Then + ' If (Not ucrReceiverMultipleStations.IsEmpty() AndAlso Not ucrChkObservationData.Checked) OrElse (Not ucrReceiverMultipleStations.IsEmpty() AndAlso Not ucrReceiverMultipleElements.IsEmpty() AndAlso ucrChkObservationData.Checked) Then + If (Not ucrReceiverMultipleStations.IsEmpty() AndAlso Not ucrChkObservationData.Checked) OrElse (Not ucrReceiverMultipleElements.IsEmpty() AndAlso ucrChkObservationData.Checked) Then ucrBase.OKEnabled(True) Else ucrBase.OKEnabled(False) @@ -124,7 +126,7 @@ Public Class dlgClimSoft Private Sub ucrReceiverMultipleStations_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrReceiverMultipleStations.ControlValueChanged If ucrReceiverMultipleStations.IsEmpty Then 'Danny needs to clarify this. - 'ucrReceiverMultipleElements.strDatabaseQuery = "SELECT obselement.elementName FROM obselement,observationfinal WHERE obselement.elementId=observationfinal.describedBy GROUP BY observationfinal.describedBy;" + ucrReceiverMultipleElements.strDatabaseQuery = "SELECT obselement.elementName FROM obselement,observationfinal WHERE obselement.elementId=observationfinal.describedBy GROUP BY observationfinal.describedBy;" Else ucrReceiverMultipleElements.strDatabaseQuery = "SELECT obselement.elementName FROM obselement,observationfinal WHERE obselement.elementId=observationfinal.describedBy AND observationfinal.recordedFrom IN (" & String.Join(",", ucrReceiverMultipleStations.GetVariableNamesList(bWithQuotes:=False)) & ") GROUP BY observationfinal.describedBy;" End If diff --git a/instat/static/InstatObject/R/instat_object_R6.R b/instat/static/InstatObject/R/instat_object_R6.R index 1839fa51898..e9dc6b12e3f 100644 --- a/instat/static/InstatObject/R/instat_object_R6.R +++ b/instat/static/InstatObject/R/instat_object_R6.R @@ -1282,8 +1282,11 @@ instat_object$set("public", "database_disconnect", function() { instat_object$set("public", "import_from_climsoft", function(stations = c(), elements = c(), include_observation_data = FALSE, start_date = "", end_date = "") { #need to perform checks here con = self$get_database_connection() - my_stations = paste0("(", paste(as.character(stations), collapse=", "), ")") - station_info <- dbGetQuery(con, paste0("SELECT * FROM station WHERE stationID in ", my_stations, ";")) + if(!is.null(stations)){ + my_stations = paste0("(", paste(as.character(stations), collapse=", "), ")") + station_info <- dbGetQuery(con, paste0("SELECT * FROM station WHERE stationID in ", my_stations, ";")) + } + date_bounds="" if(start_date!=""){ if(try(!is.na(as.Date( start_date, format= "%Y-%m-%d")))){ @@ -1309,7 +1312,17 @@ instat_object$set("public", "import_from_climsoft", function(stations = c(), ele element_id_vec = paste0("(", paste0(sprintf("%d", element_ids$elementID), collapse = ", "), ")") } if(include_observation_data){ - station_data <- dbGetQuery(con, paste0("SELECT observationfinal.recordedFrom, observationfinal.describedBy, obselement.abbreviation, obselement.elementName,observationfinal.obsDatetime,observationfinal.obsValue FROM obselement,observationfinal WHERE obselement.elementId=observationfinal.describedBy AND observationfinal.recordedFrom IN", my_stations, "AND observationfinal.describedBy IN", element_id_vec, date_bounds, " ORDER BY observationfinal.recordedFrom, observationfinal.describedBy;")) + if(!is.null(stations)){ + station_data <- dbGetQuery(con, paste0("SELECT observationfinal.recordedFrom, observationfinal.describedBy, obselement.abbreviation, obselement.elementName,observationfinal.obsDatetime,observationfinal.obsValue FROM obselement,observationfinal WHERE obselement.elementId=observationfinal.describedBy AND observationfinal.recordedFrom IN", my_stations, "AND observationfinal.describedBy IN", element_id_vec, date_bounds, " ORDER BY observationfinal.recordedFrom, observationfinal.describedBy;")) + + + } + else{ + station_data <- dbGetQuery(con, paste0("SELECT observationfinal.recordedFrom, observationfinal.describedBy, obselement.abbreviation, obselement.elementName,observationfinal.obsDatetime,observationfinal.obsValue FROM obselement,observationfinal WHERE obselement.elementId=observationfinal.describedBy AND observationfinal.describedBy IN", element_id_vec, date_bounds, " ORDER BY observationfinal.recordedFrom, observationfinal.describedBy;")) + my_stations = paste0("(", paste(as.character(unique(station_data$recordedFrom)), collapse=", "), ")") + station_info <- dbGetQuery(con, paste0("SELECT * FROM station WHERE stationID in ", my_stations, ";")) + } + data_list <- list(station_info, station_data) names(data_list) = c("station_info","station_data") } From b6145dcd64e214d50ff71fbfd8bdd5a19036442c Mon Sep 17 00:00:00 2001 From: Stephen Kogo Date: Fri, 21 Apr 2017 14:53:52 +0300 Subject: [PATCH 007/154] minor edits --- instat/static/InstatObject/R/instat_object_R6.R | 5 ----- 1 file changed, 5 deletions(-) diff --git a/instat/static/InstatObject/R/instat_object_R6.R b/instat/static/InstatObject/R/instat_object_R6.R index e9dc6b12e3f..8c077b46642 100644 --- a/instat/static/InstatObject/R/instat_object_R6.R +++ b/instat/static/InstatObject/R/instat_object_R6.R @@ -1286,7 +1286,6 @@ instat_object$set("public", "import_from_climsoft", function(stations = c(), ele my_stations = paste0("(", paste(as.character(stations), collapse=", "), ")") station_info <- dbGetQuery(con, paste0("SELECT * FROM station WHERE stationID in ", my_stations, ";")) } - date_bounds="" if(start_date!=""){ if(try(!is.na(as.Date( start_date, format= "%Y-%m-%d")))){ @@ -1296,7 +1295,6 @@ instat_object$set("public", "import_from_climsoft", function(stations = c(), ele stop("start_date format should be yyyy-mm-yy.") } } - if(end_date!=""){ if(try(!is.na(as.Date(end_date, format= "%Y-%m-%d")))){ date_bounds = paste0(date_bounds, " AND obsDatetime <",sQuote(end_date)) @@ -1314,15 +1312,12 @@ instat_object$set("public", "import_from_climsoft", function(stations = c(), ele if(include_observation_data){ if(!is.null(stations)){ station_data <- dbGetQuery(con, paste0("SELECT observationfinal.recordedFrom, observationfinal.describedBy, obselement.abbreviation, obselement.elementName,observationfinal.obsDatetime,observationfinal.obsValue FROM obselement,observationfinal WHERE obselement.elementId=observationfinal.describedBy AND observationfinal.recordedFrom IN", my_stations, "AND observationfinal.describedBy IN", element_id_vec, date_bounds, " ORDER BY observationfinal.recordedFrom, observationfinal.describedBy;")) - - } else{ station_data <- dbGetQuery(con, paste0("SELECT observationfinal.recordedFrom, observationfinal.describedBy, obselement.abbreviation, obselement.elementName,observationfinal.obsDatetime,observationfinal.obsValue FROM obselement,observationfinal WHERE obselement.elementId=observationfinal.describedBy AND observationfinal.describedBy IN", element_id_vec, date_bounds, " ORDER BY observationfinal.recordedFrom, observationfinal.describedBy;")) my_stations = paste0("(", paste(as.character(unique(station_data$recordedFrom)), collapse=", "), ")") station_info <- dbGetQuery(con, paste0("SELECT * FROM station WHERE stationID in ", my_stations, ";")) } - data_list <- list(station_info, station_data) names(data_list) = c("station_info","station_data") } From 5773b917ba90274683b430e2ae716e9371482585 Mon Sep 17 00:00:00 2001 From: Stephen Kogo Date: Mon, 24 Apr 2017 12:50:09 +0300 Subject: [PATCH 008/154] edits --- instat/dlgClimSoft.vb | 1 - 1 file changed, 1 deletion(-) diff --git a/instat/dlgClimSoft.vb b/instat/dlgClimSoft.vb index a309ce5029f..b579a2d435d 100644 --- a/instat/dlgClimSoft.vb +++ b/instat/dlgClimSoft.vb @@ -63,7 +63,6 @@ Public Class dlgClimSoft ucrChkObservationData.SetValuesCheckedAndUnchecked("TRUE", "FALSE") ucrChkObservationData.SetRDefault("FALSE") - ucrInputStartDate.SetParameter(New RParameter("start_date", 3)) ucrInputStartDate.SetLinkedDisplayControl(lblStartDate) ttClimsoft.SetToolTip(ucrInputStartDate.txtInput, "yyyy-mm-dd") From 8aaf4b30aa11c136612943b9d7ffa074dc89ac35 Mon Sep 17 00:00:00 2001 From: Stephen Kogo Date: Wed, 26 Apr 2017 10:27:41 +0300 Subject: [PATCH 009/154] Fixing inconsistencies when selecting elements not in a station --- instat/dlgClimSoft.vb | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/instat/dlgClimSoft.vb b/instat/dlgClimSoft.vb index b579a2d435d..8fb3f84b689 100644 --- a/instat/dlgClimSoft.vb +++ b/instat/dlgClimSoft.vb @@ -54,7 +54,6 @@ Public Class dlgClimSoft ucrReceiverMultipleElements.SetParameterIsString() ucrReceiverMultipleElements.Selector = ucrSelectorForClimSoft ucrReceiverMultipleElements.SetItemType("database_variables") - 'ucrReceiverMultipleElements.strDatabaseQuery = "SELECT obselement.elementName FROM obselement,observationfinal WHERE obselement.elementId=observationfinal.describedBy AND observationfinal.recordedFrom in (102,104) GROUP BY observationfinal.describedBy;" ucrReceiverMultipleElements.strDatabaseQuery = "SELECT obselement.elementName FROM obselement,observationfinal WHERE obselement.elementId=observationfinal.describedBy GROUP BY observationfinal.describedBy;" ucrReceiverMultipleElements.SetLinkedDisplayControl(lblElements) @@ -73,7 +72,6 @@ Public Class dlgClimSoft End Sub Private Sub TestOKEnabled() - ' If (Not ucrReceiverMultipleStations.IsEmpty() AndAlso Not ucrChkObservationData.Checked) OrElse (Not ucrReceiverMultipleStations.IsEmpty() AndAlso Not ucrReceiverMultipleElements.IsEmpty() AndAlso ucrChkObservationData.Checked) Then If (Not ucrReceiverMultipleStations.IsEmpty() AndAlso Not ucrChkObservationData.Checked) OrElse (Not ucrReceiverMultipleElements.IsEmpty() AndAlso ucrChkObservationData.Checked) Then ucrBase.OKEnabled(True) Else @@ -124,9 +122,9 @@ Public Class dlgClimSoft Private Sub ucrReceiverMultipleStations_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrReceiverMultipleStations.ControlValueChanged If ucrReceiverMultipleStations.IsEmpty Then - 'Danny needs to clarify this. ucrReceiverMultipleElements.strDatabaseQuery = "SELECT obselement.elementName FROM obselement,observationfinal WHERE obselement.elementId=observationfinal.describedBy GROUP BY observationfinal.describedBy;" Else + ucrReceiverMultipleElements.Clear() ucrReceiverMultipleElements.strDatabaseQuery = "SELECT obselement.elementName FROM obselement,observationfinal WHERE obselement.elementId=observationfinal.describedBy AND observationfinal.recordedFrom IN (" & String.Join(",", ucrReceiverMultipleStations.GetVariableNamesList(bWithQuotes:=False)) & ") GROUP BY observationfinal.describedBy;" End If TestOKEnabled() From 30dc0801fdaae9460552b755156a12b14eaae421 Mon Sep 17 00:00:00 2001 From: Stephen Kogo Date: Thu, 4 May 2017 17:06:59 +0300 Subject: [PATCH 010/154] fixing reset in ucrinputs --- instat/dlgClimSoft.vb | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/instat/dlgClimSoft.vb b/instat/dlgClimSoft.vb index 8fb3f84b689..00514fa4645 100644 --- a/instat/dlgClimSoft.vb +++ b/instat/dlgClimSoft.vb @@ -91,9 +91,8 @@ Public Class dlgClimSoft clsRImportFromClimsoft = New RFunction ucrSelectorForClimSoft.Reset() ucrReceiverMultipleStations.SetMeAsReceiver() - ucrInputStartDate.SetText("") - ucrInputEndDate.SetText("") - + ucrInputStartDate.SetName("") + ucrInputEndDate.SetName("") clsRDatabaseConnect.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$database_connect") clsRDatabaseDisconnect.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$database_disconnect") clsRImportFromClimsoft.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$import_from_climsoft") From 247e6b71338e518887d3a5046c2e448a73922cb6 Mon Sep 17 00:00:00 2001 From: Stephen Kogo Date: Mon, 15 May 2017 16:53:38 +0300 Subject: [PATCH 011/154] connecting and disconnecting database --- instat/sdgImportFromClimSoft.vb | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/instat/sdgImportFromClimSoft.vb b/instat/sdgImportFromClimSoft.vb index 48a9df04494..7fcb9e7f202 100644 --- a/instat/sdgImportFromClimSoft.vb +++ b/instat/sdgImportFromClimSoft.vb @@ -63,7 +63,7 @@ Public Class sdgImportFromClimSoft Private Sub cmdEnterPassword_Click(sender As Object, e As EventArgs) Handles cmdEnterPassword.Click Dim expTemp As SymbolicExpression - + cmdEnterPassword.Enabled = False If bConnected Then frmMain.clsRLink.RunScript(clsRDatabaseDisconnect.ToScript(), strComment:="Disconnect database connection.") End If @@ -72,6 +72,7 @@ Public Class sdgImportFromClimSoft expTemp = frmMain.clsRLink.RunInternalScriptGetValue(clsHasConnection.ToScript()) If Not expTemp.Type = Internals.SymbolicExpressionType.Null Then bConnected = expTemp.AsLogical(0) + cmdEnterPassword.Enabled = True Else bConnected = False End If @@ -85,4 +86,11 @@ Public Class sdgImportFromClimSoft Private Sub ucrBaseSdgClimSoft_ClickReturn(sender As Object, e As EventArgs) Handles ucrBaseSdgClimSoft.ClickReturn dlgClimSoft.ucrReceiverMultipleStations.SetMeAsReceiver() End Sub + + Private Sub ucrControlsContents_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrInputDatabaseName.ControlContentsChanged, ucrInputHost.ControlContentsChanged, ucrInputPort.ControlContentsChanged, ucrInputUserName.ControlContentsChanged + If bConnected Then + frmMain.clsRLink.RunScript(clsRDatabaseDisconnect.ToScript(), strComment:="Disconnect database connection.") + lblConnection.Text = strNoConnection + End If + End Sub End Class \ No newline at end of file From c643821f42228d99d71990503172441f70c01232 Mon Sep 17 00:00:00 2001 From: Stephen Kogo Date: Mon, 15 May 2017 18:12:48 +0300 Subject: [PATCH 012/154] edits --- instat/dlgClimSoft.Designer.vb | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/instat/dlgClimSoft.Designer.vb b/instat/dlgClimSoft.Designer.vb index 352b434a197..cb1891ea943 100644 --- a/instat/dlgClimSoft.Designer.vb +++ b/instat/dlgClimSoft.Designer.vb @@ -1,9 +1,9 @@ - _ + Partial Class dlgClimSoft 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 dlgClimSoft '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.cmdEstablishConnection = New System.Windows.Forms.Button() @@ -129,7 +129,9 @@ Partial Class dlgClimSoft Me.ucrReceiverMultipleElements.Name = "ucrReceiverMultipleElements" Me.ucrReceiverMultipleElements.Selector = Nothing Me.ucrReceiverMultipleElements.Size = New System.Drawing.Size(120, 100) + Me.ucrReceiverMultipleElements.strNcFilePath = "" Me.ucrReceiverMultipleElements.TabIndex = 5 + Me.ucrReceiverMultipleElements.ucrSelector = Nothing ' 'ucrReceiverMultipleStations ' @@ -139,7 +141,9 @@ Partial Class dlgClimSoft Me.ucrReceiverMultipleStations.Name = "ucrReceiverMultipleStations" Me.ucrReceiverMultipleStations.Selector = Nothing Me.ucrReceiverMultipleStations.Size = New System.Drawing.Size(120, 100) + Me.ucrReceiverMultipleStations.strNcFilePath = "" Me.ucrReceiverMultipleStations.TabIndex = 3 + Me.ucrReceiverMultipleStations.ucrSelector = Nothing ' 'ucrBase ' From 4d0970b8d03b8f307007ee151db02e55acf90ef3 Mon Sep 17 00:00:00 2001 From: Stephen Kogo Date: Tue, 16 May 2017 12:32:37 +0300 Subject: [PATCH 013/154] fixing conrol contents issue on the subdialog input controls --- instat/dlgClimSoft.vb | 1 + instat/sdgImportFromClimSoft.vb | 34 ++++++++++++++++++++++++++++++--- 2 files changed, 32 insertions(+), 3 deletions(-) diff --git a/instat/dlgClimSoft.vb b/instat/dlgClimSoft.vb index 00514fa4645..fc9fdefbd42 100644 --- a/instat/dlgClimSoft.vb +++ b/instat/dlgClimSoft.vb @@ -107,6 +107,7 @@ Public Class dlgClimSoft bResetSubdialog = False sdgImportFromClimSoft.ShowDialog() SetConnectionActiveStatus(sdgImportFromClimSoft.GetConnectionActiveStatus()) + ucrReceiverMultipleStations.SetMeAsReceiver() End Sub Private Sub SetConnectionActiveStatus(bCurrentStatus As Boolean) diff --git a/instat/sdgImportFromClimSoft.vb b/instat/sdgImportFromClimSoft.vb index 7fcb9e7f202..994f36ee53d 100644 --- a/instat/sdgImportFromClimSoft.vb +++ b/instat/sdgImportFromClimSoft.vb @@ -72,7 +72,7 @@ Public Class sdgImportFromClimSoft expTemp = frmMain.clsRLink.RunInternalScriptGetValue(clsHasConnection.ToScript()) If Not expTemp.Type = Internals.SymbolicExpressionType.Null Then bConnected = expTemp.AsLogical(0) - cmdEnterPassword.Enabled = True + 'cmdEnterPassword.Enabled = True Else bConnected = False End If @@ -81,16 +81,44 @@ Public Class sdgImportFromClimSoft Else lblConnection.Text = strNoConnection End If + cmdEnterPassword.Enabled = True End Sub Private Sub ucrBaseSdgClimSoft_ClickReturn(sender As Object, e As EventArgs) Handles ucrBaseSdgClimSoft.ClickReturn - dlgClimSoft.ucrReceiverMultipleStations.SetMeAsReceiver() + 'dlgClimSoft.ucrReceiverMultipleStations.SetMeAsReceiver() End Sub + 'Private Sub ucrControlsValue_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrInputDatabaseName.ControlValueChanged, ucrInputHost.ControlValueChanged, ucrInputPort.ControlValueChanged, ucrInputUserName.ControlValueChanged + ' If bConnected Then + ' frmMain.clsRLink.RunScript(clsRDatabaseDisconnect.ToScript(), strComment:="Disconnect database connection.") + ' lblConnection.Text = strNoConnection + ' End If + 'End Sub + Private Sub ucrControlsContents_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrInputDatabaseName.ControlContentsChanged, ucrInputHost.ControlContentsChanged, ucrInputPort.ControlContentsChanged, ucrInputUserName.ControlContentsChanged - If bConnected Then + Dim strHost As String = "" + Dim strUser As String = "" + Dim strPort As String = "" + Dim strDatabaseName As String = "" + + If clsRDatabaseConnect IsNot Nothing Then + If clsRDatabaseConnect.ContainsParameter("host") Then + strHost = clsRDatabaseConnect.GetParameter("host").strArgumentValue + End If + If clsRDatabaseConnect.ContainsParameter("user") Then + strUser = clsRDatabaseConnect.GetParameter("user").strArgumentValue + End If + If clsRDatabaseConnect.ContainsParameter("port") Then + strPort = clsRDatabaseConnect.GetParameter("port").strArgumentValue + End If + If clsRDatabaseConnect.ContainsParameter("dbname") Then + strDatabaseName = clsRDatabaseConnect.GetParameter("dbname").strArgumentValue + End If + End If + If bConnected AndAlso (strPort <> ucrInputPort.GetText() OrElse strDatabaseName <> Chr(34) & ucrInputDatabaseName.GetText() & Chr(34) OrElse strHost <> Chr(34) & ucrInputHost.GetText() & Chr(34) OrElse strUser <> Chr(34) & ucrInputUserName.GetText() & Chr(34)) Then frmMain.clsRLink.RunScript(clsRDatabaseDisconnect.ToScript(), strComment:="Disconnect database connection.") lblConnection.Text = strNoConnection + bConnected = False End If End Sub End Class \ No newline at end of file From 16f599e6da04fe1fec5eb7c02a6b48ef22e5dc91 Mon Sep 17 00:00:00 2001 From: Stephen Kogo Date: Tue, 16 May 2017 12:39:47 +0300 Subject: [PATCH 014/154] tyding up --- instat/sdgImportFromClimSoft.vb | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/instat/sdgImportFromClimSoft.vb b/instat/sdgImportFromClimSoft.vb index 994f36ee53d..3d79f06eedd 100644 --- a/instat/sdgImportFromClimSoft.vb +++ b/instat/sdgImportFromClimSoft.vb @@ -72,7 +72,6 @@ Public Class sdgImportFromClimSoft expTemp = frmMain.clsRLink.RunInternalScriptGetValue(clsHasConnection.ToScript()) If Not expTemp.Type = Internals.SymbolicExpressionType.Null Then bConnected = expTemp.AsLogical(0) - 'cmdEnterPassword.Enabled = True Else bConnected = False End If @@ -84,17 +83,6 @@ Public Class sdgImportFromClimSoft cmdEnterPassword.Enabled = True End Sub - Private Sub ucrBaseSdgClimSoft_ClickReturn(sender As Object, e As EventArgs) Handles ucrBaseSdgClimSoft.ClickReturn - 'dlgClimSoft.ucrReceiverMultipleStations.SetMeAsReceiver() - End Sub - - 'Private Sub ucrControlsValue_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrInputDatabaseName.ControlValueChanged, ucrInputHost.ControlValueChanged, ucrInputPort.ControlValueChanged, ucrInputUserName.ControlValueChanged - ' If bConnected Then - ' frmMain.clsRLink.RunScript(clsRDatabaseDisconnect.ToScript(), strComment:="Disconnect database connection.") - ' lblConnection.Text = strNoConnection - ' End If - 'End Sub - Private Sub ucrControlsContents_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrInputDatabaseName.ControlContentsChanged, ucrInputHost.ControlContentsChanged, ucrInputPort.ControlContentsChanged, ucrInputUserName.ControlContentsChanged Dim strHost As String = "" Dim strUser As String = "" From 688e45a485e48fcb387086ecfeb40e8272270c01 Mon Sep 17 00:00:00 2001 From: Stephen Kogo Date: Tue, 16 May 2017 13:23:09 +0300 Subject: [PATCH 015/154] added disconnection option to the sub dialog --- instat/sdgImportFromClimSoft.vb | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/instat/sdgImportFromClimSoft.vb b/instat/sdgImportFromClimSoft.vb index 3d79f06eedd..ec7b794ba8d 100644 --- a/instat/sdgImportFromClimSoft.vb +++ b/instat/sdgImportFromClimSoft.vb @@ -66,19 +66,22 @@ Public Class sdgImportFromClimSoft cmdEnterPassword.Enabled = False If bConnected Then frmMain.clsRLink.RunScript(clsRDatabaseDisconnect.ToScript(), strComment:="Disconnect database connection.") - End If - frmMain.clsRLink.RunScript(clsRDatabaseConnect.ToScript(), strComment:="Connect database connection.") - - expTemp = frmMain.clsRLink.RunInternalScriptGetValue(clsHasConnection.ToScript()) - If Not expTemp.Type = Internals.SymbolicExpressionType.Null Then - bConnected = expTemp.AsLogical(0) - Else bConnected = False + Else + frmMain.clsRLink.RunScript(clsRDatabaseConnect.ToScript(), strComment:="Connect database connection.") + expTemp = frmMain.clsRLink.RunInternalScriptGetValue(clsHasConnection.ToScript()) + If Not expTemp.Type = Internals.SymbolicExpressionType.Null Then + bConnected = expTemp.AsLogical(0) + Else + bConnected = False + End If End If If bConnected Then lblConnection.Text = strConnected + cmdEnterPassword.Text = "Diconnnect" Else lblConnection.Text = strNoConnection + cmdEnterPassword.Text = "Enter Password" End If cmdEnterPassword.Enabled = True End Sub @@ -108,5 +111,12 @@ Public Class sdgImportFromClimSoft lblConnection.Text = strNoConnection bConnected = False End If + If bConnected Then + lblConnection.Text = strConnected + cmdEnterPassword.Text = "Diconnnect" + Else + lblConnection.Text = strNoConnection + cmdEnterPassword.Text = "Enter Password" + End If End Sub End Class \ No newline at end of file From 73ce9045fff6a06a0879af53025b9bd36cdf9aeb Mon Sep 17 00:00:00 2001 From: Stephen Kogo Date: Tue, 16 May 2017 13:31:55 +0300 Subject: [PATCH 016/154] tyding up the code --- instat/sdgImportFromClimSoft.vb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/instat/sdgImportFromClimSoft.vb b/instat/sdgImportFromClimSoft.vb index ec7b794ba8d..c9b12c8664b 100644 --- a/instat/sdgImportFromClimSoft.vb +++ b/instat/sdgImportFromClimSoft.vb @@ -39,6 +39,8 @@ Public Class sdgImportFromClimSoft ucrInputPort.SetParameter(New RParameter("port", 2)) ucrInputPort.AddQuotesIfUnrecognised = False ucrInputUserName.SetParameter(New RParameter("user", 3)) + + 'to be deleted once the dialog is ready ucrInputDatabaseName.SetRDefault("mariadb_climsoft_test_db_v4") ucrInputHost.SetRDefault("127.0.0.1") 'ucrInputPort.SetRDefault("3308") From bd7c7ed8deda76f86d637708463bd42f46e2140d Mon Sep 17 00:00:00 2001 From: John Lunalo Date: Wed, 17 May 2017 12:29:22 +0300 Subject: [PATCH 017/154] Updating delete Rows or Columns --- instat/dlgDeleteRowsOrColums.vb | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/instat/dlgDeleteRowsOrColums.vb b/instat/dlgDeleteRowsOrColums.vb index 818f8469137..7c487fb0d9a 100644 --- a/instat/dlgDeleteRowsOrColums.vb +++ b/instat/dlgDeleteRowsOrColums.vb @@ -14,12 +14,11 @@ ' You should have received a copy of the GNU General Public License k ' along with this program. If not, see . -Imports instat Imports instat.Translations Public Class dlgDeleteRowsOrColums Public bFirstLoad As Boolean = True Private bReset As Boolean = True - + Private clsDeleteRows, clsDeleteColumns As RFunction Private Sub dlgDeleteRows_Load(sender As Object, e As EventArgs) Handles MyBase.Load autoTranslate(Me) If bFirstLoad Then @@ -67,17 +66,23 @@ Public Class dlgDeleteRowsOrColums End Sub Private Sub SetDefaults() - Dim clsDefaultFunction As New RFunction + clsDeleteColumns = New RFunction + clsDeleteRows = New RFunction ucrSelectorForDeleteColumns.Reset() - clsDefaultFunction.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$remove_columns_in_data") - ucrBase.clsRsyntax.SetBaseRFunction(clsDefaultFunction.Clone()) + clsDeleteRows.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$remove_rows_in_data") + clsDeleteColumns.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$remove_columns_in_data") + ucrBase.clsRsyntax.SetBaseRFunction(clsDeleteColumns) End Sub Private Sub SetRCodeForControls(bReset As Boolean) - SetRCode(Me, ucrBase.clsRsyntax.clsBaseFunction, bReset) + ucrSelectorForDeleteColumns.AddAdditionalCodeParameterPair(clsDeleteColumns, ucrSelectorForDeleteColumns.GetParameter, iAdditionalPairNo:=1) + ucrPnlColumnsOrRows.SetRCode(clsDeleteRows) + ucrPnlColumnsOrRows.SetRCode(clsDeleteColumns) + ucrNudRowsToDelete.SetRCode(clsDeleteRows) + ucrReceiverForColumnsToDelete.SetRCode(clsDeleteColumns) + ucrSelectorForDeleteColumns.SetRCode(clsDeleteRows) End Sub - Private Sub TestOKEnabled() If rdoColumns.Checked Then If Not ucrReceiverForColumnsToDelete.IsEmpty() Then @@ -115,10 +120,10 @@ Public Class dlgDeleteRowsOrColums Private Sub ucrPnlColumnsOrRows_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrPnlColumnsOrRows.ControlValueChanged If rdoColumns.Checked Then - ucrBase.clsRsyntax.SetFunction(frmMain.clsRLink.strInstatDataObject & "$remove_columns_in_data") + ucrBase.clsRsyntax.SetBaseRFunction(clsDeleteColumns) ucrSelectorForDeleteColumns.SetVariablesVisible(True) ElseIf rdoRows.Checked Then - ucrBase.clsRsyntax.SetFunction(frmMain.clsRLink.strInstatDataObject & "$remove_rows_in_data") + ucrBase.clsRsyntax.SetBaseRFunction(clsDeleteRows) ucrSelectorForDeleteColumns.SetVariablesVisible(False) End If End Sub From 29d1868b79e321fef3b5b1995765627e2fa80900 Mon Sep 17 00:00:00 2001 From: John Lunalo Date: Wed, 17 May 2017 16:21:34 +0300 Subject: [PATCH 018/154] setting default for nnud to allow for proper resetting --- instat/dlgDeleteRowsOrColums.vb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/instat/dlgDeleteRowsOrColums.vb b/instat/dlgDeleteRowsOrColums.vb index 7c487fb0d9a..ab71147054e 100644 --- a/instat/dlgDeleteRowsOrColums.vb +++ b/instat/dlgDeleteRowsOrColums.vb @@ -57,9 +57,8 @@ Public Class dlgDeleteRowsOrColums ucrReceiverForColumnsToDelete.SetLinkedDisplayControl(lblColumnsToDelete) ucrNudRowsToDelete.SetParameter(New RParameter("row_names", 1)) - ucrNudRowsToDelete.Minimum = 1 + ucrNudRowsToDelete.SetMinMax(1, ucrSelectorForDeleteColumns.ucrAvailableDataFrames.iDataFrameLength) ucrNudRowsToDelete.SetLinkedDisplayControl(lblRowNames) - ucrNudRowsToDelete.SetRDefault(1) ucrDataFrameLengthForDeleteRows.SetLinkedDisplayControl(lblNumberofRows) ucrDataFrameLengthForDeleteRows.SetDataFrameSelector(ucrSelectorForDeleteColumns.ucrAvailableDataFrames) @@ -68,8 +67,8 @@ Public Class dlgDeleteRowsOrColums Private Sub SetDefaults() clsDeleteColumns = New RFunction clsDeleteRows = New RFunction - ucrSelectorForDeleteColumns.Reset() + clsDeleteRows.AddParameter("row_names", 1) clsDeleteRows.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$remove_rows_in_data") clsDeleteColumns.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$remove_columns_in_data") ucrBase.clsRsyntax.SetBaseRFunction(clsDeleteColumns) @@ -83,6 +82,7 @@ Public Class dlgDeleteRowsOrColums ucrReceiverForColumnsToDelete.SetRCode(clsDeleteColumns) ucrSelectorForDeleteColumns.SetRCode(clsDeleteRows) End Sub + Private Sub TestOKEnabled() If rdoColumns.Checked Then If Not ucrReceiverForColumnsToDelete.IsEmpty() Then From 0d91d1a51bd73090de16ba75a9647624b798a673 Mon Sep 17 00:00:00 2001 From: Lily Date: Wed, 17 May 2017 16:11:04 +0100 Subject: [PATCH 019/154] General layout and fixes --- instat/dlgClimSoft.Designer.vb | 26 ++++++------ instat/dlgClimSoft.vb | 54 +++++++++++++----------- instat/sdgImportFromClimSoft.Designer.vb | 24 +++++------ instat/sdgImportFromClimSoft.vb | 2 +- 4 files changed, 56 insertions(+), 50 deletions(-) diff --git a/instat/dlgClimSoft.Designer.vb b/instat/dlgClimSoft.Designer.vb index cb1891ea943..964cf795e89 100644 --- a/instat/dlgClimSoft.Designer.vb +++ b/instat/dlgClimSoft.Designer.vb @@ -40,17 +40,17 @@ Partial Class dlgClimSoft ' 'cmdEstablishConnection ' - Me.cmdEstablishConnection.Location = New System.Drawing.Point(10, 12) + Me.cmdEstablishConnection.Location = New System.Drawing.Point(10, 14) Me.cmdEstablishConnection.Name = "cmdEstablishConnection" - Me.cmdEstablishConnection.Size = New System.Drawing.Size(114, 23) + Me.cmdEstablishConnection.Size = New System.Drawing.Size(121, 23) Me.cmdEstablishConnection.TabIndex = 0 - Me.cmdEstablishConnection.Text = "Establish Connection" + Me.cmdEstablishConnection.Text = "Establish Connection.." Me.cmdEstablishConnection.UseVisualStyleBackColor = True ' 'lblElements ' Me.lblElements.AutoSize = True - Me.lblElements.Location = New System.Drawing.Point(260, 176) + Me.lblElements.Location = New System.Drawing.Point(260, 178) Me.lblElements.Name = "lblElements" Me.lblElements.Size = New System.Drawing.Size(53, 13) Me.lblElements.TabIndex = 4 @@ -59,7 +59,7 @@ Partial Class dlgClimSoft 'lblStations ' Me.lblStations.AutoSize = True - Me.lblStations.Location = New System.Drawing.Point(260, 45) + Me.lblStations.Location = New System.Drawing.Point(260, 42) Me.lblStations.Name = "lblStations" Me.lblStations.Size = New System.Drawing.Size(48, 13) Me.lblStations.TabIndex = 2 @@ -69,7 +69,7 @@ Partial Class dlgClimSoft 'lblStartDate ' Me.lblStartDate.AutoSize = True - Me.lblStartDate.Location = New System.Drawing.Point(10, 239) + Me.lblStartDate.Location = New System.Drawing.Point(10, 232) Me.lblStartDate.Name = "lblStartDate" Me.lblStartDate.Size = New System.Drawing.Size(58, 13) Me.lblStartDate.TabIndex = 7 @@ -78,7 +78,7 @@ Partial Class dlgClimSoft 'lblEndDate ' Me.lblEndDate.AutoSize = True - Me.lblEndDate.Location = New System.Drawing.Point(10, 288) + Me.lblEndDate.Location = New System.Drawing.Point(10, 281) Me.lblEndDate.Name = "lblEndDate" Me.lblEndDate.Size = New System.Drawing.Size(55, 13) Me.lblEndDate.TabIndex = 9 @@ -89,7 +89,7 @@ Partial Class dlgClimSoft Me.ucrInputEndDate.AddQuotesIfUnrecognised = True Me.ucrInputEndDate.IsMultiline = False Me.ucrInputEndDate.IsReadOnly = False - Me.ucrInputEndDate.Location = New System.Drawing.Point(10, 304) + Me.ucrInputEndDate.Location = New System.Drawing.Point(10, 296) Me.ucrInputEndDate.Name = "ucrInputEndDate" Me.ucrInputEndDate.Size = New System.Drawing.Size(137, 21) Me.ucrInputEndDate.TabIndex = 10 @@ -99,7 +99,7 @@ Partial Class dlgClimSoft Me.ucrInputStartDate.AddQuotesIfUnrecognised = True Me.ucrInputStartDate.IsMultiline = False Me.ucrInputStartDate.IsReadOnly = False - Me.ucrInputStartDate.Location = New System.Drawing.Point(10, 255) + Me.ucrInputStartDate.Location = New System.Drawing.Point(10, 247) Me.ucrInputStartDate.Name = "ucrInputStartDate" Me.ucrInputStartDate.Size = New System.Drawing.Size(137, 21) Me.ucrInputStartDate.TabIndex = 8 @@ -107,7 +107,7 @@ Partial Class dlgClimSoft 'ucrChkObservationData ' Me.ucrChkObservationData.Checked = False - Me.ucrChkObservationData.Location = New System.Drawing.Point(10, 207) + Me.ucrChkObservationData.Location = New System.Drawing.Point(10, 203) Me.ucrChkObservationData.Name = "ucrChkObservationData" Me.ucrChkObservationData.Size = New System.Drawing.Size(178, 20) Me.ucrChkObservationData.TabIndex = 6 @@ -136,7 +136,7 @@ Partial Class dlgClimSoft 'ucrReceiverMultipleStations ' Me.ucrReceiverMultipleStations.frmParent = Me - Me.ucrReceiverMultipleStations.Location = New System.Drawing.Point(260, 60) + Me.ucrReceiverMultipleStations.Location = New System.Drawing.Point(260, 57) Me.ucrReceiverMultipleStations.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverMultipleStations.Name = "ucrReceiverMultipleStations" Me.ucrReceiverMultipleStations.Selector = Nothing @@ -147,7 +147,7 @@ Partial Class dlgClimSoft ' 'ucrBase ' - Me.ucrBase.Location = New System.Drawing.Point(10, 337) + Me.ucrBase.Location = New System.Drawing.Point(10, 325) Me.ucrBase.Name = "ucrBase" Me.ucrBase.Size = New System.Drawing.Size(410, 52) Me.ucrBase.TabIndex = 11 @@ -156,7 +156,7 @@ Partial Class dlgClimSoft ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(423, 394) + Me.ClientSize = New System.Drawing.Size(421, 384) Me.Controls.Add(Me.ucrInputEndDate) Me.Controls.Add(Me.ucrInputStartDate) Me.Controls.Add(Me.ucrChkObservationData) diff --git a/instat/dlgClimSoft.vb b/instat/dlgClimSoft.vb index fc9fdefbd42..1ea5dc5a41e 100644 --- a/instat/dlgClimSoft.vb +++ b/instat/dlgClimSoft.vb @@ -14,8 +14,8 @@ ' You should have received a copy of the GNU General Public License k ' along with this program. If not, see . -Imports instat Imports instat.Translations + Public Class dlgClimSoft Private bFirstLoad As Boolean = True Private bReset As Boolean = True @@ -40,6 +40,7 @@ Public Class dlgClimSoft ReopenDialog() autoTranslate(Me) End Sub + Private Sub InitialiseDialog() ucrBase.iHelpTopicID = 329 @@ -57,51 +58,62 @@ Public Class dlgClimSoft ucrReceiverMultipleElements.strDatabaseQuery = "SELECT obselement.elementName FROM obselement,observationfinal WHERE obselement.elementId=observationfinal.describedBy GROUP BY observationfinal.describedBy;" ucrReceiverMultipleElements.SetLinkedDisplayControl(lblElements) - ucrChkObservationData.SetText("Observation Data") ucrChkObservationData.SetParameter(New RParameter("include_observation_data", 2)) + ucrChkObservationData.SetText("Observation Data") ucrChkObservationData.SetValuesCheckedAndUnchecked("TRUE", "FALSE") ucrChkObservationData.SetRDefault("FALSE") ucrInputStartDate.SetParameter(New RParameter("start_date", 3)) ucrInputStartDate.SetLinkedDisplayControl(lblStartDate) ttClimsoft.SetToolTip(ucrInputStartDate.txtInput, "yyyy-mm-dd") + ucrInputEndDate.SetParameter(New RParameter("end_date", 4)) ucrInputEndDate.SetLinkedDisplayControl(lblEndDate) ttClimsoft.SetToolTip(ucrInputEndDate.txtInput, "yyyy-mm-dd") - ucrChkObservationData.AddToLinkedControls({ucrInputStartDate, ucrInputEndDate, ucrReceiverMultipleElements}, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) - End Sub - Private Sub TestOKEnabled() - If (Not ucrReceiverMultipleStations.IsEmpty() AndAlso Not ucrChkObservationData.Checked) OrElse (Not ucrReceiverMultipleElements.IsEmpty() AndAlso ucrChkObservationData.Checked) Then - ucrBase.OKEnabled(True) - Else - ucrBase.OKEnabled(False) - End If - End Sub - - Private Sub ReopenDialog() - - End Sub - - Public Sub SetRCodeForControls(bReset As Boolean) - SetRCode(Me, ucrBase.clsRsyntax.clsBaseFunction, bReset) + ucrChkObservationData.AddToLinkedControls({ucrInputStartDate, ucrInputEndDate, ucrReceiverMultipleElements}, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) End Sub Private Sub SetDefaults() clsRImportFromClimsoft = New RFunction + ucrSelectorForClimSoft.Reset() ucrReceiverMultipleStations.SetMeAsReceiver() ucrInputStartDate.SetName("") ucrInputEndDate.SetName("") + clsRDatabaseConnect.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$database_connect") clsRDatabaseDisconnect.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$database_disconnect") clsRImportFromClimsoft.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$import_from_climsoft") clsHasConnection.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$has_database_connection") ucrBase.clsRsyntax.AddParameter("include_observation_data", "FALSE") ucrBase.clsRsyntax.SetBaseRFunction(clsRImportFromClimsoft) + bResetSubdialog = True End Sub + Public Sub SetRCodeForControls(bReset As Boolean) + SetRCode(Me, ucrBase.clsRsyntax.clsBaseFunction, bReset) + End Sub + + Private Sub TestOKEnabled() + If (Not ucrReceiverMultipleStations.IsEmpty() AndAlso Not ucrChkObservationData.Checked) OrElse (Not ucrReceiverMultipleElements.IsEmpty() AndAlso ucrChkObservationData.Checked) Then + ucrBase.OKEnabled(True) + Else + ucrBase.OKEnabled(False) + End If + End Sub + + Private Sub ReopenDialog() + + End Sub + + Private Sub ucrBase_ClickReset(sender As Object, e As EventArgs) Handles ucrBase.ClickReset + SetDefaults() + SetRCodeForControls(True) + TestOKEnabled() + End Sub + Private Sub cmdEstablishConnection_Click(sender As Object, e As EventArgs) Handles cmdEstablishConnection.Click sdgImportFromClimSoft.SetRDatabaseConnection(clsRDatabaseConnect, clsRDatabaseDisconnect, clsHasConnection, bConnectionActive, bResetSubdialog) bResetSubdialog = False @@ -114,12 +126,6 @@ Public Class dlgClimSoft bConnectionActive = bCurrentStatus End Sub - Private Sub ucrBase_ClickReset(sender As Object, e As EventArgs) Handles ucrBase.ClickReset - SetDefaults() - SetRCodeForControls(True) - TestOKEnabled() - End Sub - Private Sub ucrReceiverMultipleStations_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrReceiverMultipleStations.ControlValueChanged If ucrReceiverMultipleStations.IsEmpty Then ucrReceiverMultipleElements.strDatabaseQuery = "SELECT obselement.elementName FROM obselement,observationfinal WHERE obselement.elementId=observationfinal.describedBy GROUP BY observationfinal.describedBy;" diff --git a/instat/sdgImportFromClimSoft.Designer.vb b/instat/sdgImportFromClimSoft.Designer.vb index 699638e2644..f933d5b1aea 100644 --- a/instat/sdgImportFromClimSoft.Designer.vb +++ b/instat/sdgImportFromClimSoft.Designer.vb @@ -40,7 +40,7 @@ Partial Class sdgImportFromClimSoft Me.ucrInputDatabaseName.AddQuotesIfUnrecognised = True Me.ucrInputDatabaseName.IsMultiline = False Me.ucrInputDatabaseName.IsReadOnly = False - Me.ucrInputDatabaseName.Location = New System.Drawing.Point(101, 12) + Me.ucrInputDatabaseName.Location = New System.Drawing.Point(103, 21) Me.ucrInputDatabaseName.Name = "ucrInputDatabaseName" Me.ucrInputDatabaseName.Size = New System.Drawing.Size(137, 21) Me.ucrInputDatabaseName.TabIndex = 1 @@ -48,7 +48,7 @@ Partial Class sdgImportFromClimSoft 'lblDatabaseName ' Me.lblDatabaseName.AutoSize = True - Me.lblDatabaseName.Location = New System.Drawing.Point(10, 15) + Me.lblDatabaseName.Location = New System.Drawing.Point(12, 24) Me.lblDatabaseName.Name = "lblDatabaseName" Me.lblDatabaseName.Size = New System.Drawing.Size(87, 13) Me.lblDatabaseName.TabIndex = 0 @@ -59,7 +59,7 @@ Partial Class sdgImportFromClimSoft Me.ucrInputHost.AddQuotesIfUnrecognised = True Me.ucrInputHost.IsMultiline = False Me.ucrInputHost.IsReadOnly = False - Me.ucrInputHost.Location = New System.Drawing.Point(101, 46) + Me.ucrInputHost.Location = New System.Drawing.Point(103, 48) Me.ucrInputHost.Name = "ucrInputHost" Me.ucrInputHost.Size = New System.Drawing.Size(137, 21) Me.ucrInputHost.TabIndex = 3 @@ -67,7 +67,7 @@ Partial Class sdgImportFromClimSoft 'lblHost ' Me.lblHost.AutoSize = True - Me.lblHost.Location = New System.Drawing.Point(10, 50) + Me.lblHost.Location = New System.Drawing.Point(12, 52) Me.lblHost.Name = "lblHost" Me.lblHost.Size = New System.Drawing.Size(32, 13) Me.lblHost.TabIndex = 2 @@ -78,7 +78,7 @@ Partial Class sdgImportFromClimSoft Me.ucrInputPort.AddQuotesIfUnrecognised = True Me.ucrInputPort.IsMultiline = False Me.ucrInputPort.IsReadOnly = False - Me.ucrInputPort.Location = New System.Drawing.Point(101, 80) + Me.ucrInputPort.Location = New System.Drawing.Point(103, 75) Me.ucrInputPort.Name = "ucrInputPort" Me.ucrInputPort.Size = New System.Drawing.Size(137, 21) Me.ucrInputPort.TabIndex = 5 @@ -86,7 +86,7 @@ Partial Class sdgImportFromClimSoft 'lblPort ' Me.lblPort.AutoSize = True - Me.lblPort.Location = New System.Drawing.Point(10, 85) + Me.lblPort.Location = New System.Drawing.Point(12, 79) Me.lblPort.Name = "lblPort" Me.lblPort.Size = New System.Drawing.Size(29, 13) Me.lblPort.TabIndex = 4 @@ -97,7 +97,7 @@ Partial Class sdgImportFromClimSoft Me.ucrInputUserName.AddQuotesIfUnrecognised = True Me.ucrInputUserName.IsMultiline = False Me.ucrInputUserName.IsReadOnly = False - Me.ucrInputUserName.Location = New System.Drawing.Point(101, 114) + Me.ucrInputUserName.Location = New System.Drawing.Point(103, 102) Me.ucrInputUserName.Name = "ucrInputUserName" Me.ucrInputUserName.Size = New System.Drawing.Size(137, 21) Me.ucrInputUserName.TabIndex = 7 @@ -105,7 +105,7 @@ Partial Class sdgImportFromClimSoft 'lblUserName ' Me.lblUserName.AutoSize = True - Me.lblUserName.Location = New System.Drawing.Point(10, 119) + Me.lblUserName.Location = New System.Drawing.Point(12, 106) Me.lblUserName.Name = "lblUserName" Me.lblUserName.Size = New System.Drawing.Size(58, 13) Me.lblUserName.TabIndex = 6 @@ -114,7 +114,7 @@ Partial Class sdgImportFromClimSoft 'lblConnection ' Me.lblConnection.AutoSize = True - Me.lblConnection.Location = New System.Drawing.Point(162, 148) + Me.lblConnection.Location = New System.Drawing.Point(162, 134) Me.lblConnection.Name = "lblConnection" Me.lblConnection.Size = New System.Drawing.Size(78, 13) Me.lblConnection.TabIndex = 9 @@ -122,14 +122,14 @@ Partial Class sdgImportFromClimSoft ' 'ucrBaseSdgClimSoft ' - Me.ucrBaseSdgClimSoft.Location = New System.Drawing.Point(72, 178) + Me.ucrBaseSdgClimSoft.Location = New System.Drawing.Point(57, 168) Me.ucrBaseSdgClimSoft.Name = "ucrBaseSdgClimSoft" Me.ucrBaseSdgClimSoft.Size = New System.Drawing.Size(142, 30) Me.ucrBaseSdgClimSoft.TabIndex = 10 ' 'cmdEnterPassword ' - Me.cmdEnterPassword.Location = New System.Drawing.Point(10, 148) + Me.cmdEnterPassword.Location = New System.Drawing.Point(12, 129) Me.cmdEnterPassword.Name = "cmdEnterPassword" Me.cmdEnterPassword.Size = New System.Drawing.Size(107, 22) Me.cmdEnterPassword.TabIndex = 8 @@ -140,7 +140,7 @@ Partial Class sdgImportFromClimSoft ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(289, 220) + Me.ClientSize = New System.Drawing.Size(257, 203) Me.Controls.Add(Me.ucrBaseSdgClimSoft) Me.Controls.Add(Me.lblConnection) Me.Controls.Add(Me.cmdEnterPassword) diff --git a/instat/sdgImportFromClimSoft.vb b/instat/sdgImportFromClimSoft.vb index c9b12c8664b..5059fc214da 100644 --- a/instat/sdgImportFromClimSoft.vb +++ b/instat/sdgImportFromClimSoft.vb @@ -115,7 +115,7 @@ Public Class sdgImportFromClimSoft End If If bConnected Then lblConnection.Text = strConnected - cmdEnterPassword.Text = "Diconnnect" + cmdEnterPassword.Text = "Disconnnect" Else lblConnection.Text = strNoConnection cmdEnterPassword.Text = "Enter Password" From 5a5ff3917d6af15dd6cb8b5466d4a11ec85eb90e Mon Sep 17 00:00:00 2001 From: Stephen Kogo Date: Thu, 18 May 2017 12:16:08 +0300 Subject: [PATCH 020/154] edits --- instat/dlgClimSoft.vb | 5 +++++ instat/sdgImportFromClimSoft.vb | 12 ++++++------ 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/instat/dlgClimSoft.vb b/instat/dlgClimSoft.vb index 1ea5dc5a41e..45ceb154db0 100644 --- a/instat/dlgClimSoft.vb +++ b/instat/dlgClimSoft.vb @@ -83,6 +83,11 @@ Public Class dlgClimSoft ucrInputEndDate.SetName("") clsRDatabaseConnect.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$database_connect") + clsRDatabaseConnect.AddParameter("dbname", "hh") + clsRDatabaseConnect.AddParameter("host", "yy") + clsRDatabaseConnect.AddParameter("user", "kk") + clsRDatabaseConnect.AddParameter("port", "yy") + clsRDatabaseDisconnect.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$database_disconnect") clsRImportFromClimsoft.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$import_from_climsoft") clsHasConnection.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$has_database_connection") diff --git a/instat/sdgImportFromClimSoft.vb b/instat/sdgImportFromClimSoft.vb index 5059fc214da..887d7f8e23e 100644 --- a/instat/sdgImportFromClimSoft.vb +++ b/instat/sdgImportFromClimSoft.vb @@ -41,10 +41,10 @@ Public Class sdgImportFromClimSoft ucrInputUserName.SetParameter(New RParameter("user", 3)) 'to be deleted once the dialog is ready - ucrInputDatabaseName.SetRDefault("mariadb_climsoft_test_db_v4") - ucrInputHost.SetRDefault("127.0.0.1") - 'ucrInputPort.SetRDefault("3308") - ucrInputUserName.SetRDefault("root") + 'ucrInputDatabaseName.SetRDefault("mariadb_climsoft_test_db_v4") + 'ucrInputHost.SetRDefault("127.0.0.1") + ''ucrInputPort.SetRDefault("3308") + 'ucrInputUserName.SetRDefault("root") bControlsInitialised = True End Sub @@ -60,7 +60,7 @@ Public Class sdgImportFromClimSoft If Not bControlsInitialised Then InitialiseControls() End If - SetRCode(Me, clsRDatabaseConnect, bResetSubdialog) + SetRCode(Me, clsRDatabaseConnect, bResetSubdialog = True) End Sub Private Sub cmdEnterPassword_Click(sender As Object, e As EventArgs) Handles cmdEnterPassword.Click @@ -80,7 +80,7 @@ Public Class sdgImportFromClimSoft End If If bConnected Then lblConnection.Text = strConnected - cmdEnterPassword.Text = "Diconnnect" + cmdEnterPassword.Text = "Disconnnect" Else lblConnection.Text = strNoConnection cmdEnterPassword.Text = "Enter Password" From b379f7b1339e595a3d4be84d8b65e7bfeace8945 Mon Sep 17 00:00:00 2001 From: John Lunalo Date: Thu, 18 May 2017 13:28:30 +0300 Subject: [PATCH 021/154] Adding start position and end position of the rows to be selected --- instat/dlgDeleteRowsOrColums.vb | 38 ++++++++++++++++++++++++--------- 1 file changed, 28 insertions(+), 10 deletions(-) diff --git a/instat/dlgDeleteRowsOrColums.vb b/instat/dlgDeleteRowsOrColums.vb index ab71147054e..de630fcca28 100644 --- a/instat/dlgDeleteRowsOrColums.vb +++ b/instat/dlgDeleteRowsOrColums.vb @@ -14,10 +14,12 @@ ' You should have received a copy of the GNU General Public License k ' along with this program. If not, see . +Imports instat Imports instat.Translations Public Class dlgDeleteRowsOrColums Public bFirstLoad As Boolean = True Private bReset As Boolean = True + Private clsOperator As New ROperator Private clsDeleteRows, clsDeleteColumns As RFunction Private Sub dlgDeleteRows_Load(sender As Object, e As EventArgs) Handles MyBase.Load autoTranslate(Me) @@ -44,7 +46,8 @@ Public Class dlgDeleteRowsOrColums ucrPnlColumnsOrRows.AddFunctionNamesCondition(rdoRows, frmMain.clsRLink.strInstatDataObject & "$remove_rows_in_data") ucrPnlColumnsOrRows.AddToLinkedControls(ucrReceiverForColumnsToDelete, {rdoColumns}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) - ucrPnlColumnsOrRows.AddToLinkedControls(ucrNudRowsToDelete, {rdoRows}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) + ucrPnlColumnsOrRows.AddToLinkedControls(ucrNudFrom, {rdoRows}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) + ucrPnlColumnsOrRows.AddToLinkedControls(ucrNudTo, {rdoRows}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) ucrPnlColumnsOrRows.AddToLinkedControls(ucrDataFrameLengthForDeleteRows, {rdoRows}, bNewLinkedHideIfParameterMissing:=True) ucrSelectorForDeleteColumns.SetParameter(New RParameter("data_name", 0)) @@ -55,10 +58,13 @@ Public Class dlgDeleteRowsOrColums ucrReceiverForColumnsToDelete.SetMeAsReceiver() ucrReceiverForColumnsToDelete.SetParameterIsString() ucrReceiverForColumnsToDelete.SetLinkedDisplayControl(lblColumnsToDelete) + ucrNudFrom.SetParameter(New RParameter("From", 0)) + ucrNudTo.SetParameter(New RParameter("To", 2)) + ucrNudFrom.SetMinMax(1, ucrSelectorForDeleteColumns.ucrAvailableDataFrames.iDataFrameLength) + ucrNudFrom.SetLinkedDisplayControl(lblFrom) - ucrNudRowsToDelete.SetParameter(New RParameter("row_names", 1)) - ucrNudRowsToDelete.SetMinMax(1, ucrSelectorForDeleteColumns.ucrAvailableDataFrames.iDataFrameLength) - ucrNudRowsToDelete.SetLinkedDisplayControl(lblRowNames) + ucrNudTo.SetMinMax(1, ucrSelectorForDeleteColumns.ucrAvailableDataFrames.iDataFrameLength) + ucrNudTo.SetLinkedDisplayControl(lblTo) ucrDataFrameLengthForDeleteRows.SetLinkedDisplayControl(lblNumberofRows) ucrDataFrameLengthForDeleteRows.SetDataFrameSelector(ucrSelectorForDeleteColumns.ucrAvailableDataFrames) @@ -68,9 +74,16 @@ Public Class dlgDeleteRowsOrColums clsDeleteColumns = New RFunction clsDeleteRows = New RFunction ucrSelectorForDeleteColumns.Reset() - clsDeleteRows.AddParameter("row_names", 1) + clsOperator = New ROperator + + clsOperator.SetOperation(":") clsDeleteRows.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$remove_rows_in_data") clsDeleteColumns.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$remove_columns_in_data") + + clsOperator.AddParameter("From", 1, iPosition:=0) + clsOperator.AddParameter("To", 1, iPosition:=2) + + clsDeleteRows.AddParameter("row_names", clsROperatorParameter:=clsOperator) ucrBase.clsRsyntax.SetBaseRFunction(clsDeleteColumns) End Sub @@ -78,9 +91,11 @@ Public Class dlgDeleteRowsOrColums ucrSelectorForDeleteColumns.AddAdditionalCodeParameterPair(clsDeleteColumns, ucrSelectorForDeleteColumns.GetParameter, iAdditionalPairNo:=1) ucrPnlColumnsOrRows.SetRCode(clsDeleteRows) ucrPnlColumnsOrRows.SetRCode(clsDeleteColumns) - ucrNudRowsToDelete.SetRCode(clsDeleteRows) ucrReceiverForColumnsToDelete.SetRCode(clsDeleteColumns) ucrSelectorForDeleteColumns.SetRCode(clsDeleteRows) + ucrNudTo.SetRCode(clsOperator, bReset) + ucrNudFrom.SetRCode(clsOperator, bReset) + End Sub Private Sub TestOKEnabled() @@ -91,7 +106,7 @@ Public Class dlgDeleteRowsOrColums ucrBase.OKEnabled(False) End If ElseIf rdoRows.Checked Then - If ucrNudRowsToDelete.GetText() <> "" Then + If ucrNudFrom.GetText() <> "" AndAlso ucrNudTo.GetText() <> "" Then ucrBase.OKEnabled(True) Else ucrBase.OKEnabled(False) @@ -104,7 +119,8 @@ Public Class dlgDeleteRowsOrColums Private Sub ReopenDialog() If ucrSelectorForDeleteColumns.ucrAvailableDataFrames.cboAvailableDataFrames.Text <> "" Then Try - ucrNudRowsToDelete.Maximum = frmMain.clsRLink.GetDataFrameLength(ucrSelectorForDeleteColumns.ucrAvailableDataFrames.cboAvailableDataFrames.Text) + ucrNudFrom.Maximum = frmMain.clsRLink.GetDataFrameLength(ucrSelectorForDeleteColumns.ucrAvailableDataFrames.cboAvailableDataFrames.Text) + ucrNudTo.Maximum = frmMain.clsRLink.GetDataFrameLength(ucrSelectorForDeleteColumns.ucrAvailableDataFrames.cboAvailableDataFrames.Text) Catch ex As Exception End Try End If @@ -129,10 +145,12 @@ Public Class dlgDeleteRowsOrColums End Sub Private Sub ucrSelectorForDeleteColumns_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrSelectorForDeleteColumns.ControlValueChanged - ucrNudRowsToDelete.Maximum = ucrSelectorForDeleteColumns.ucrAvailableDataFrames.iDataFrameLength + ucrNudFrom.Maximum = ucrSelectorForDeleteColumns.ucrAvailableDataFrames.iDataFrameLength + ucrNudTo.Maximum = ucrSelectorForDeleteColumns.ucrAvailableDataFrames.iDataFrameLength End Sub - Private Sub CoreControls_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrReceiverForColumnsToDelete.ControlContentsChanged, ucrNudRowsToDelete.ControlContentsChanged, ucrPnlColumnsOrRows.ControlContentsChanged + Private Sub CoreControls_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrReceiverForColumnsToDelete.ControlContentsChanged, ucrNudFrom.ControlContentsChanged, ucrPnlColumnsOrRows.ControlContentsChanged, ucrNudFrom.ControlContentsChanged TestOKEnabled() End Sub + End Class \ No newline at end of file From 2c34964f77ac0ce7206fd8e38e3290e47494d2ba Mon Sep 17 00:00:00 2001 From: John Lunalo Date: Thu, 18 May 2017 18:22:25 +0300 Subject: [PATCH 022/154] designer code --- instat/dlgDeleteRowsOrColums.Designer.vb | 164 +++++++++++++---------- 1 file changed, 96 insertions(+), 68 deletions(-) diff --git a/instat/dlgDeleteRowsOrColums.Designer.vb b/instat/dlgDeleteRowsOrColums.Designer.vb index 99d4935d467..429be883638 100644 --- a/instat/dlgDeleteRowsOrColums.Designer.vb +++ b/instat/dlgDeleteRowsOrColums.Designer.vb @@ -24,15 +24,17 @@ Partial Class dlgDeleteRowsOrColums Private Sub InitializeComponent() Me.lblNumberofRows = New System.Windows.Forms.Label() Me.lblColumnsToDelete = New System.Windows.Forms.Label() - Me.lblRowNames = New System.Windows.Forms.Label() - Me.ucrNudRowsToDelete = New instat.ucrNud() - Me.ucrSelectorForDeleteColumns = New instat.ucrSelectorByDataFrameAddRemove() - Me.ucrReceiverForColumnsToDelete = New instat.ucrReceiverMultiple() - Me.ucrDataFrameLengthForDeleteRows = New instat.ucrDataFrameLength() - Me.ucrBase = New instat.ucrButtons() + Me.lblFrom = New System.Windows.Forms.Label() Me.rdoColumns = New System.Windows.Forms.RadioButton() Me.rdoRows = New System.Windows.Forms.RadioButton() Me.ucrPnlColumnsOrRows = New instat.UcrPanel() + Me.ucrDataFrameLengthForDeleteRows = New instat.ucrDataFrameLength() + Me.ucrNudFrom = New instat.ucrNud() + Me.ucrSelectorForDeleteColumns = New instat.ucrSelectorByDataFrameAddRemove() + Me.ucrReceiverForColumnsToDelete = New instat.ucrReceiverMultiple() + Me.ucrBase = New instat.ucrButtons() + Me.lblTo = New System.Windows.Forms.Label() + Me.ucrNudTo = New instat.ucrNud() Me.SuspendLayout() ' 'lblNumberofRows @@ -55,64 +57,15 @@ Partial Class dlgDeleteRowsOrColums Me.lblColumnsToDelete.Tag = "Columns_to_Delete" Me.lblColumnsToDelete.Text = "Columns to Delete:" ' - 'lblRowNames - ' - Me.lblRowNames.AutoSize = True - Me.lblRowNames.Location = New System.Drawing.Point(9, 166) - Me.lblRowNames.Name = "lblRowNames" - Me.lblRowNames.Size = New System.Drawing.Size(78, 13) - Me.lblRowNames.TabIndex = 8 - Me.lblRowNames.Tag = "" - Me.lblRowNames.Text = "Row to Delete:" - ' - 'ucrNudRowsToDelete - ' - Me.ucrNudRowsToDelete.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) - Me.ucrNudRowsToDelete.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudRowsToDelete.Location = New System.Drawing.Point(100, 163) - Me.ucrNudRowsToDelete.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) - Me.ucrNudRowsToDelete.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) - Me.ucrNudRowsToDelete.Name = "ucrNudRowsToDelete" - Me.ucrNudRowsToDelete.Size = New System.Drawing.Size(50, 20) - Me.ucrNudRowsToDelete.TabIndex = 9 - Me.ucrNudRowsToDelete.Value = New Decimal(New Integer() {0, 0, 0, 0}) - ' - 'ucrSelectorForDeleteColumns - ' - Me.ucrSelectorForDeleteColumns.bShowHiddenColumns = False - Me.ucrSelectorForDeleteColumns.bUseCurrentFilter = True - Me.ucrSelectorForDeleteColumns.Location = New System.Drawing.Point(9, 54) - Me.ucrSelectorForDeleteColumns.Margin = New System.Windows.Forms.Padding(0) - Me.ucrSelectorForDeleteColumns.Name = "ucrSelectorForDeleteColumns" - Me.ucrSelectorForDeleteColumns.Size = New System.Drawing.Size(210, 180) - Me.ucrSelectorForDeleteColumns.TabIndex = 3 - ' - 'ucrReceiverForColumnsToDelete - ' - Me.ucrReceiverForColumnsToDelete.frmParent = Me - Me.ucrReceiverForColumnsToDelete.Location = New System.Drawing.Point(254, 104) - Me.ucrReceiverForColumnsToDelete.Margin = New System.Windows.Forms.Padding(0) - Me.ucrReceiverForColumnsToDelete.Name = "ucrReceiverForColumnsToDelete" - Me.ucrReceiverForColumnsToDelete.Selector = Nothing - Me.ucrReceiverForColumnsToDelete.Size = New System.Drawing.Size(120, 100) - Me.ucrReceiverForColumnsToDelete.strNcFilePath = "" - Me.ucrReceiverForColumnsToDelete.TabIndex = 5 - Me.ucrReceiverForColumnsToDelete.ucrSelector = Nothing - ' - 'ucrDataFrameLengthForDeleteRows + 'lblFrom ' - Me.ucrDataFrameLengthForDeleteRows.Location = New System.Drawing.Point(100, 129) - Me.ucrDataFrameLengthForDeleteRows.Name = "ucrDataFrameLengthForDeleteRows" - Me.ucrDataFrameLengthForDeleteRows.Size = New System.Drawing.Size(55, 24) - Me.ucrDataFrameLengthForDeleteRows.TabIndex = 7 - Me.ucrDataFrameLengthForDeleteRows.ucrDataFrameSelector = Nothing - ' - 'ucrBase - ' - Me.ucrBase.Location = New System.Drawing.Point(9, 243) - Me.ucrBase.Name = "ucrBase" - Me.ucrBase.Size = New System.Drawing.Size(410, 52) - Me.ucrBase.TabIndex = 10 + Me.lblFrom.AutoSize = True + Me.lblFrom.Location = New System.Drawing.Point(9, 166) + Me.lblFrom.Name = "lblFrom" + Me.lblFrom.Size = New System.Drawing.Size(33, 13) + Me.lblFrom.TabIndex = 8 + Me.lblFrom.Tag = "" + Me.lblFrom.Text = "From:" ' 'rdoColumns ' @@ -155,18 +108,91 @@ Partial Class dlgDeleteRowsOrColums Me.ucrPnlColumnsOrRows.Size = New System.Drawing.Size(214, 29) Me.ucrPnlColumnsOrRows.TabIndex = 0 ' + 'ucrDataFrameLengthForDeleteRows + ' + Me.ucrDataFrameLengthForDeleteRows.Location = New System.Drawing.Point(100, 129) + Me.ucrDataFrameLengthForDeleteRows.Name = "ucrDataFrameLengthForDeleteRows" + Me.ucrDataFrameLengthForDeleteRows.Size = New System.Drawing.Size(55, 24) + Me.ucrDataFrameLengthForDeleteRows.TabIndex = 7 + Me.ucrDataFrameLengthForDeleteRows.ucrDataFrameSelector = Nothing + ' + 'ucrNudFrom + ' + Me.ucrNudFrom.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudFrom.Increment = New Decimal(New Integer() {1, 0, 0, 0}) + Me.ucrNudFrom.Location = New System.Drawing.Point(48, 164) + Me.ucrNudFrom.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) + Me.ucrNudFrom.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudFrom.Name = "ucrNudFrom" + Me.ucrNudFrom.Size = New System.Drawing.Size(50, 20) + Me.ucrNudFrom.TabIndex = 9 + Me.ucrNudFrom.Value = New Decimal(New Integer() {0, 0, 0, 0}) + ' + 'ucrSelectorForDeleteColumns + ' + Me.ucrSelectorForDeleteColumns.bShowHiddenColumns = False + Me.ucrSelectorForDeleteColumns.bUseCurrentFilter = True + Me.ucrSelectorForDeleteColumns.Location = New System.Drawing.Point(9, 43) + Me.ucrSelectorForDeleteColumns.Margin = New System.Windows.Forms.Padding(0) + Me.ucrSelectorForDeleteColumns.Name = "ucrSelectorForDeleteColumns" + Me.ucrSelectorForDeleteColumns.Size = New System.Drawing.Size(210, 180) + Me.ucrSelectorForDeleteColumns.TabIndex = 3 + ' + 'ucrReceiverForColumnsToDelete + ' + Me.ucrReceiverForColumnsToDelete.frmParent = Me + Me.ucrReceiverForColumnsToDelete.Location = New System.Drawing.Point(254, 104) + Me.ucrReceiverForColumnsToDelete.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverForColumnsToDelete.Name = "ucrReceiverForColumnsToDelete" + Me.ucrReceiverForColumnsToDelete.Selector = Nothing + Me.ucrReceiverForColumnsToDelete.Size = New System.Drawing.Size(120, 100) + Me.ucrReceiverForColumnsToDelete.strNcFilePath = "" + Me.ucrReceiverForColumnsToDelete.TabIndex = 5 + Me.ucrReceiverForColumnsToDelete.ucrSelector = Nothing + ' + 'ucrBase + ' + Me.ucrBase.Location = New System.Drawing.Point(9, 243) + Me.ucrBase.Name = "ucrBase" + Me.ucrBase.Size = New System.Drawing.Size(410, 52) + Me.ucrBase.TabIndex = 10 + ' + 'lblTo + ' + Me.lblTo.AutoSize = True + Me.lblTo.Location = New System.Drawing.Point(104, 168) + Me.lblTo.Name = "lblTo" + Me.lblTo.Size = New System.Drawing.Size(23, 13) + Me.lblTo.TabIndex = 11 + Me.lblTo.Tag = "" + Me.lblTo.Text = "To:" + ' + 'ucrNudTo + ' + Me.ucrNudTo.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudTo.Increment = New Decimal(New Integer() {1, 0, 0, 0}) + Me.ucrNudTo.Location = New System.Drawing.Point(143, 166) + Me.ucrNudTo.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) + Me.ucrNudTo.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudTo.Name = "ucrNudTo" + Me.ucrNudTo.Size = New System.Drawing.Size(50, 20) + Me.ucrNudTo.TabIndex = 12 + Me.ucrNudTo.Value = New Decimal(New Integer() {0, 0, 0, 0}) + ' 'dlgDeleteRowsOrColums ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(415, 299) + Me.ClientSize = New System.Drawing.Size(416, 299) + Me.Controls.Add(Me.lblTo) + Me.Controls.Add(Me.ucrNudTo) Me.Controls.Add(Me.rdoColumns) Me.Controls.Add(Me.rdoRows) Me.Controls.Add(Me.ucrPnlColumnsOrRows) Me.Controls.Add(Me.ucrDataFrameLengthForDeleteRows) - Me.Controls.Add(Me.lblRowNames) + Me.Controls.Add(Me.lblFrom) Me.Controls.Add(Me.lblNumberofRows) - Me.Controls.Add(Me.ucrNudRowsToDelete) + Me.Controls.Add(Me.ucrNudFrom) Me.Controls.Add(Me.ucrSelectorForDeleteColumns) Me.Controls.Add(Me.lblColumnsToDelete) Me.Controls.Add(Me.ucrReceiverForColumnsToDelete) @@ -189,9 +215,11 @@ Partial Class dlgDeleteRowsOrColums Friend WithEvents ucrSelectorForDeleteColumns As ucrSelectorByDataFrameAddRemove Friend WithEvents ucrReceiverForColumnsToDelete As ucrReceiverMultiple Friend WithEvents lblColumnsToDelete As Label - Friend WithEvents lblRowNames As Label - Friend WithEvents ucrNudRowsToDelete As ucrNud + Friend WithEvents lblFrom As Label + Friend WithEvents ucrNudFrom As ucrNud Friend WithEvents rdoColumns As RadioButton Friend WithEvents rdoRows As RadioButton Friend WithEvents ucrPnlColumnsOrRows As UcrPanel + Friend WithEvents lblTo As Label + Friend WithEvents ucrNudTo As ucrNud End Class From 8745c0fe85996f857aded4f51eb8a15bc5f9e9ba Mon Sep 17 00:00:00 2001 From: Lily Date: Thu, 18 May 2017 19:32:21 +0100 Subject: [PATCH 023/154] Minor edits --- instat/dlgDeleteRowsOrColums.Designer.vb | 18 +++++++++--------- instat/dlgDeleteRowsOrColums.vb | 11 +++++------ 2 files changed, 14 insertions(+), 15 deletions(-) diff --git a/instat/dlgDeleteRowsOrColums.Designer.vb b/instat/dlgDeleteRowsOrColums.Designer.vb index 429be883638..fe43d779602 100644 --- a/instat/dlgDeleteRowsOrColums.Designer.vb +++ b/instat/dlgDeleteRowsOrColums.Designer.vb @@ -60,12 +60,12 @@ Partial Class dlgDeleteRowsOrColums 'lblFrom ' Me.lblFrom.AutoSize = True - Me.lblFrom.Location = New System.Drawing.Point(9, 166) + Me.lblFrom.Location = New System.Drawing.Point(7, 168) Me.lblFrom.Name = "lblFrom" - Me.lblFrom.Size = New System.Drawing.Size(33, 13) + Me.lblFrom.Size = New System.Drawing.Size(67, 13) Me.lblFrom.TabIndex = 8 Me.lblFrom.Tag = "" - Me.lblFrom.Text = "From:" + Me.lblFrom.Text = "Delete From:" ' 'rdoColumns ' @@ -120,7 +120,7 @@ Partial Class dlgDeleteRowsOrColums ' Me.ucrNudFrom.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudFrom.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudFrom.Location = New System.Drawing.Point(48, 164) + Me.ucrNudFrom.Location = New System.Drawing.Point(100, 164) Me.ucrNudFrom.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) Me.ucrNudFrom.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudFrom.Name = "ucrNudFrom" @@ -155,15 +155,15 @@ Partial Class dlgDeleteRowsOrColums Me.ucrBase.Location = New System.Drawing.Point(9, 243) Me.ucrBase.Name = "ucrBase" Me.ucrBase.Size = New System.Drawing.Size(410, 52) - Me.ucrBase.TabIndex = 10 + Me.ucrBase.TabIndex = 12 ' 'lblTo ' Me.lblTo.AutoSize = True - Me.lblTo.Location = New System.Drawing.Point(104, 168) + Me.lblTo.Location = New System.Drawing.Point(51, 194) Me.lblTo.Name = "lblTo" Me.lblTo.Size = New System.Drawing.Size(23, 13) - Me.lblTo.TabIndex = 11 + Me.lblTo.TabIndex = 10 Me.lblTo.Tag = "" Me.lblTo.Text = "To:" ' @@ -171,12 +171,12 @@ Partial Class dlgDeleteRowsOrColums ' Me.ucrNudTo.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudTo.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudTo.Location = New System.Drawing.Point(143, 166) + Me.ucrNudTo.Location = New System.Drawing.Point(100, 190) Me.ucrNudTo.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) Me.ucrNudTo.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudTo.Name = "ucrNudTo" Me.ucrNudTo.Size = New System.Drawing.Size(50, 20) - Me.ucrNudTo.TabIndex = 12 + Me.ucrNudTo.TabIndex = 11 Me.ucrNudTo.Value = New Decimal(New Integer() {0, 0, 0, 0}) ' 'dlgDeleteRowsOrColums diff --git a/instat/dlgDeleteRowsOrColums.vb b/instat/dlgDeleteRowsOrColums.vb index de630fcca28..d54e55e60db 100644 --- a/instat/dlgDeleteRowsOrColums.vb +++ b/instat/dlgDeleteRowsOrColums.vb @@ -14,7 +14,6 @@ ' You should have received a copy of the GNU General Public License k ' along with this program. If not, see . -Imports instat Imports instat.Translations Public Class dlgDeleteRowsOrColums Public bFirstLoad As Boolean = True @@ -58,11 +57,12 @@ Public Class dlgDeleteRowsOrColums ucrReceiverForColumnsToDelete.SetMeAsReceiver() ucrReceiverForColumnsToDelete.SetParameterIsString() ucrReceiverForColumnsToDelete.SetLinkedDisplayControl(lblColumnsToDelete) + ucrNudFrom.SetParameter(New RParameter("From", 0)) - ucrNudTo.SetParameter(New RParameter("To", 2)) ucrNudFrom.SetMinMax(1, ucrSelectorForDeleteColumns.ucrAvailableDataFrames.iDataFrameLength) ucrNudFrom.SetLinkedDisplayControl(lblFrom) + ucrNudTo.SetParameter(New RParameter("To", 2)) ucrNudTo.SetMinMax(1, ucrSelectorForDeleteColumns.ucrAvailableDataFrames.iDataFrameLength) ucrNudTo.SetLinkedDisplayControl(lblTo) @@ -73,13 +73,14 @@ Public Class dlgDeleteRowsOrColums Private Sub SetDefaults() clsDeleteColumns = New RFunction clsDeleteRows = New RFunction - ucrSelectorForDeleteColumns.Reset() clsOperator = New ROperator - clsOperator.SetOperation(":") + ucrSelectorForDeleteColumns.Reset() + clsDeleteRows.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$remove_rows_in_data") clsDeleteColumns.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$remove_columns_in_data") + clsOperator.SetOperation(":") clsOperator.AddParameter("From", 1, iPosition:=0) clsOperator.AddParameter("To", 1, iPosition:=2) @@ -95,7 +96,6 @@ Public Class dlgDeleteRowsOrColums ucrSelectorForDeleteColumns.SetRCode(clsDeleteRows) ucrNudTo.SetRCode(clsOperator, bReset) ucrNudFrom.SetRCode(clsOperator, bReset) - End Sub Private Sub TestOKEnabled() @@ -152,5 +152,4 @@ Public Class dlgDeleteRowsOrColums Private Sub CoreControls_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrReceiverForColumnsToDelete.ControlContentsChanged, ucrNudFrom.ControlContentsChanged, ucrPnlColumnsOrRows.ControlContentsChanged, ucrNudFrom.ControlContentsChanged TestOKEnabled() End Sub - End Class \ No newline at end of file From 196f9afc1c65bc656e3afcdf522f8e597a94d394 Mon Sep 17 00:00:00 2001 From: Lily Date: Thu, 18 May 2017 19:36:31 +0100 Subject: [PATCH 024/154] layout --- instat/dlgDeleteRowsOrColums.Designer.vb | 56 ++++++++++++------------ 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/instat/dlgDeleteRowsOrColums.Designer.vb b/instat/dlgDeleteRowsOrColums.Designer.vb index fe43d779602..038524833e9 100644 --- a/instat/dlgDeleteRowsOrColums.Designer.vb +++ b/instat/dlgDeleteRowsOrColums.Designer.vb @@ -27,20 +27,20 @@ Partial Class dlgDeleteRowsOrColums Me.lblFrom = New System.Windows.Forms.Label() Me.rdoColumns = New System.Windows.Forms.RadioButton() Me.rdoRows = New System.Windows.Forms.RadioButton() + Me.lblTo = New System.Windows.Forms.Label() + Me.ucrNudTo = New instat.ucrNud() Me.ucrPnlColumnsOrRows = New instat.UcrPanel() Me.ucrDataFrameLengthForDeleteRows = New instat.ucrDataFrameLength() Me.ucrNudFrom = New instat.ucrNud() Me.ucrSelectorForDeleteColumns = New instat.ucrSelectorByDataFrameAddRemove() Me.ucrReceiverForColumnsToDelete = New instat.ucrReceiverMultiple() Me.ucrBase = New instat.ucrButtons() - Me.lblTo = New System.Windows.Forms.Label() - Me.ucrNudTo = New instat.ucrNud() Me.SuspendLayout() ' 'lblNumberofRows ' Me.lblNumberofRows.AutoSize = True - Me.lblNumberofRows.Location = New System.Drawing.Point(7, 133) + Me.lblNumberofRows.Location = New System.Drawing.Point(7, 108) Me.lblNumberofRows.Name = "lblNumberofRows" Me.lblNumberofRows.Size = New System.Drawing.Size(89, 13) Me.lblNumberofRows.TabIndex = 6 @@ -60,7 +60,7 @@ Partial Class dlgDeleteRowsOrColums 'lblFrom ' Me.lblFrom.AutoSize = True - Me.lblFrom.Location = New System.Drawing.Point(7, 168) + Me.lblFrom.Location = New System.Drawing.Point(7, 143) Me.lblFrom.Name = "lblFrom" Me.lblFrom.Size = New System.Drawing.Size(67, 13) Me.lblFrom.TabIndex = 8 @@ -101,6 +101,28 @@ Partial Class dlgDeleteRowsOrColums Me.rdoRows.TextAlign = System.Drawing.ContentAlignment.TopCenter Me.rdoRows.UseVisualStyleBackColor = True ' + 'lblTo + ' + Me.lblTo.AutoSize = True + Me.lblTo.Location = New System.Drawing.Point(51, 169) + Me.lblTo.Name = "lblTo" + Me.lblTo.Size = New System.Drawing.Size(23, 13) + Me.lblTo.TabIndex = 10 + Me.lblTo.Tag = "" + Me.lblTo.Text = "To:" + ' + 'ucrNudTo + ' + Me.ucrNudTo.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudTo.Increment = New Decimal(New Integer() {1, 0, 0, 0}) + Me.ucrNudTo.Location = New System.Drawing.Point(100, 165) + Me.ucrNudTo.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) + Me.ucrNudTo.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudTo.Name = "ucrNudTo" + Me.ucrNudTo.Size = New System.Drawing.Size(50, 20) + Me.ucrNudTo.TabIndex = 11 + Me.ucrNudTo.Value = New Decimal(New Integer() {0, 0, 0, 0}) + ' 'ucrPnlColumnsOrRows ' Me.ucrPnlColumnsOrRows.Location = New System.Drawing.Point(97, 11) @@ -110,7 +132,7 @@ Partial Class dlgDeleteRowsOrColums ' 'ucrDataFrameLengthForDeleteRows ' - Me.ucrDataFrameLengthForDeleteRows.Location = New System.Drawing.Point(100, 129) + Me.ucrDataFrameLengthForDeleteRows.Location = New System.Drawing.Point(100, 104) Me.ucrDataFrameLengthForDeleteRows.Name = "ucrDataFrameLengthForDeleteRows" Me.ucrDataFrameLengthForDeleteRows.Size = New System.Drawing.Size(55, 24) Me.ucrDataFrameLengthForDeleteRows.TabIndex = 7 @@ -120,7 +142,7 @@ Partial Class dlgDeleteRowsOrColums ' Me.ucrNudFrom.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudFrom.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudFrom.Location = New System.Drawing.Point(100, 164) + Me.ucrNudFrom.Location = New System.Drawing.Point(100, 139) Me.ucrNudFrom.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) Me.ucrNudFrom.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudFrom.Name = "ucrNudFrom" @@ -157,28 +179,6 @@ Partial Class dlgDeleteRowsOrColums Me.ucrBase.Size = New System.Drawing.Size(410, 52) Me.ucrBase.TabIndex = 12 ' - 'lblTo - ' - Me.lblTo.AutoSize = True - Me.lblTo.Location = New System.Drawing.Point(51, 194) - Me.lblTo.Name = "lblTo" - Me.lblTo.Size = New System.Drawing.Size(23, 13) - Me.lblTo.TabIndex = 10 - Me.lblTo.Tag = "" - Me.lblTo.Text = "To:" - ' - 'ucrNudTo - ' - Me.ucrNudTo.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) - Me.ucrNudTo.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudTo.Location = New System.Drawing.Point(100, 190) - Me.ucrNudTo.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) - Me.ucrNudTo.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) - Me.ucrNudTo.Name = "ucrNudTo" - Me.ucrNudTo.Size = New System.Drawing.Size(50, 20) - Me.ucrNudTo.TabIndex = 11 - Me.ucrNudTo.Value = New Decimal(New Integer() {0, 0, 0, 0}) - ' 'dlgDeleteRowsOrColums ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) From 8b7af9e8bcfa3b08075792b6bb5dc6b7f3aacfd9 Mon Sep 17 00:00:00 2001 From: Stephen Kogo Date: Fri, 19 May 2017 12:00:06 +0300 Subject: [PATCH 025/154] fixed reset on the dialog and subdialog --- instat/dlgClimSoft.vb | 15 +++++++++------ instat/sdgImportFromClimSoft.vb | 8 +------- 2 files changed, 10 insertions(+), 13 deletions(-) diff --git a/instat/dlgClimSoft.vb b/instat/dlgClimSoft.vb index 45ceb154db0..98f16458287 100644 --- a/instat/dlgClimSoft.vb +++ b/instat/dlgClimSoft.vb @@ -76,17 +76,18 @@ Public Class dlgClimSoft Private Sub SetDefaults() clsRImportFromClimsoft = New RFunction - - ucrSelectorForClimSoft.Reset() + clsRDatabaseConnect = New RFunction + clsHasConnection = New RFunction + clsRDatabaseDisconnect = New RFunction ucrReceiverMultipleStations.SetMeAsReceiver() ucrInputStartDate.SetName("") ucrInputEndDate.SetName("") clsRDatabaseConnect.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$database_connect") - clsRDatabaseConnect.AddParameter("dbname", "hh") - clsRDatabaseConnect.AddParameter("host", "yy") - clsRDatabaseConnect.AddParameter("user", "kk") - clsRDatabaseConnect.AddParameter("port", "yy") + clsRDatabaseConnect.AddParameter("dbname", "") + clsRDatabaseConnect.AddParameter("host", "") + clsRDatabaseConnect.AddParameter("user", "") + clsRDatabaseConnect.AddParameter("port", "") clsRDatabaseDisconnect.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$database_disconnect") clsRImportFromClimsoft.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$import_from_climsoft") @@ -94,6 +95,8 @@ Public Class dlgClimSoft ucrBase.clsRsyntax.AddParameter("include_observation_data", "FALSE") ucrBase.clsRsyntax.SetBaseRFunction(clsRImportFromClimsoft) + frmMain.clsRLink.RunScript(clsRDatabaseDisconnect.ToScript(), strComment:="Disconnect database connection.") + ucrSelectorForClimSoft.Reset() bResetSubdialog = True End Sub diff --git a/instat/sdgImportFromClimSoft.vb b/instat/sdgImportFromClimSoft.vb index 887d7f8e23e..a3f3e0ab49b 100644 --- a/instat/sdgImportFromClimSoft.vb +++ b/instat/sdgImportFromClimSoft.vb @@ -40,12 +40,6 @@ Public Class sdgImportFromClimSoft ucrInputPort.AddQuotesIfUnrecognised = False ucrInputUserName.SetParameter(New RParameter("user", 3)) - 'to be deleted once the dialog is ready - 'ucrInputDatabaseName.SetRDefault("mariadb_climsoft_test_db_v4") - 'ucrInputHost.SetRDefault("127.0.0.1") - ''ucrInputPort.SetRDefault("3308") - 'ucrInputUserName.SetRDefault("root") - bControlsInitialised = True End Sub @@ -60,7 +54,7 @@ Public Class sdgImportFromClimSoft If Not bControlsInitialised Then InitialiseControls() End If - SetRCode(Me, clsRDatabaseConnect, bResetSubdialog = True) + SetRCode(Me, clsRDatabaseConnect, False) End Sub Private Sub cmdEnterPassword_Click(sender As Object, e As EventArgs) Handles cmdEnterPassword.Click From b14df47e4d306ab53093c20466788005458ef7df Mon Sep 17 00:00:00 2001 From: John Lunalo Date: Fri, 19 May 2017 12:24:14 +0300 Subject: [PATCH 026/154] proper setting of r code --- instat/dlgDeleteRowsOrColums.vb | 1 - 1 file changed, 1 deletion(-) diff --git a/instat/dlgDeleteRowsOrColums.vb b/instat/dlgDeleteRowsOrColums.vb index d54e55e60db..95769dea74e 100644 --- a/instat/dlgDeleteRowsOrColums.vb +++ b/instat/dlgDeleteRowsOrColums.vb @@ -90,7 +90,6 @@ Public Class dlgDeleteRowsOrColums Private Sub SetRCodeForControls(bReset As Boolean) ucrSelectorForDeleteColumns.AddAdditionalCodeParameterPair(clsDeleteColumns, ucrSelectorForDeleteColumns.GetParameter, iAdditionalPairNo:=1) - ucrPnlColumnsOrRows.SetRCode(clsDeleteRows) ucrPnlColumnsOrRows.SetRCode(clsDeleteColumns) ucrReceiverForColumnsToDelete.SetRCode(clsDeleteColumns) ucrSelectorForDeleteColumns.SetRCode(clsDeleteRows) From 564f2474d21b8c6aa916a61aa1e4968931bae79b Mon Sep 17 00:00:00 2001 From: Stephen Kogo Date: Fri, 19 May 2017 13:10:28 +0300 Subject: [PATCH 027/154] enabling and disabling the enter password control --- instat/sdgImportFromClimSoft.vb | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/instat/sdgImportFromClimSoft.vb b/instat/sdgImportFromClimSoft.vb index a3f3e0ab49b..591befba357 100644 --- a/instat/sdgImportFromClimSoft.vb +++ b/instat/sdgImportFromClimSoft.vb @@ -39,7 +39,7 @@ Public Class sdgImportFromClimSoft ucrInputPort.SetParameter(New RParameter("port", 2)) ucrInputPort.AddQuotesIfUnrecognised = False ucrInputUserName.SetParameter(New RParameter("user", 3)) - + cmdEnterPassword.Enabled = False bControlsInitialised = True End Sub @@ -88,6 +88,12 @@ Public Class sdgImportFromClimSoft Dim strPort As String = "" Dim strDatabaseName As String = "" + If ucrInputPort.GetText() <> "" AndAlso ucrInputUserName.GetText() <> "" AndAlso ucrInputHost.GetText() <> "" AndAlso ucrInputDatabaseName.GetText() <> "" Then + cmdEnterPassword.Enabled = True + Else + cmdEnterPassword.Enabled = False + End If + If clsRDatabaseConnect IsNot Nothing Then If clsRDatabaseConnect.ContainsParameter("host") Then strHost = clsRDatabaseConnect.GetParameter("host").strArgumentValue From 7d74307e51aa9e412b7ed49cc1c391a93c1562d5 Mon Sep 17 00:00:00 2001 From: shadrack kibet Date: Mon, 22 May 2017 14:09:11 +0300 Subject: [PATCH 028/154] code edditions --- instat/dlgInsertColumn.vb | 36 +++++++++++++++++++++++------------- 1 file changed, 23 insertions(+), 13 deletions(-) diff --git a/instat/dlgInsertColumn.vb b/instat/dlgInsertColumn.vb index b957d14af45..cba8ce7b121 100644 --- a/instat/dlgInsertColumn.vb +++ b/instat/dlgInsertColumn.vb @@ -15,22 +15,26 @@ ' along with this program. If not, see . Imports instat.Translations -Public Class dlgInsertColumn - Dim bFirstLoad As Boolean = True - +Public Class dlgInsertColumn + Private bFirstload As Boolean = True + Private bReset As Boolean = True + Private clsInsertRowFunction, clsAddColumnFunction As New RFunction Private Sub dlgInsertColumn_Load(sender As Object, e As EventArgs) Handles MyBase.Load - ucrBase.iHelpTopicID = 164 - If bFirstLoad Then - InitialiseDialog() - SetDefaults() - bFirstLoad = False - Else - ReopenDialog() - End If + 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 = 164 ucrReceiverColumnsToInsert.Selector = ucrSelectorInseertColumns ucrReceiverColumnsToInsert.SetMeAsReceiver() ucrInputBeforeAfter.SetItems({"Before", "After"}) @@ -68,6 +72,9 @@ Public Class dlgInsertColumn End Sub Private Sub SetDefaults() + clsAddColumnFunction = New RFunction + clsInsertRowFunction = New RFunction + rdoInsertColumns.Checked = True ucrInputPrefixForInsertedColumns.SetName("X") ucrInputDefaultValue.SetName("NA") @@ -83,6 +90,10 @@ Public Class dlgInsertColumn End If End Sub + Private Sub SetRCodeForControls(bReset) + + End Sub + Private Sub nudPos_TextChanged(sender As Object, e As EventArgs) Handles nudPos.TextChanged startpo() End Sub @@ -116,10 +127,9 @@ Public Class dlgInsertColumn End If End Sub - - Private Sub ucrBase_ClickReset(sender As Object, e As EventArgs) Handles ucrBase.ClickReset SetDefaults() + SetRCodeForControls(True) TestOKEnabled() End Sub From 0139ff0dddb38ec6e894bc7179095644b1f8e5d5 Mon Sep 17 00:00:00 2001 From: shadrack kibet Date: Mon, 22 May 2017 20:01:19 +0300 Subject: [PATCH 029/154] edits --- instat/dlgInsertColumn.Designer.vb | 120 +++++++-------- instat/dlgInsertColumn.resx | 238 ++++++++++++++--------------- instat/dlgInsertColumn.vb | 67 ++++---- 3 files changed, 218 insertions(+), 207 deletions(-) diff --git a/instat/dlgInsertColumn.Designer.vb b/instat/dlgInsertColumn.Designer.vb index a2a8c7cf998..b8bbdc99c9e 100644 --- a/instat/dlgInsertColumn.Designer.vb +++ b/instat/dlgInsertColumn.Designer.vb @@ -36,17 +36,17 @@ Partial Class dlgInsertColumn Me.nudInsertColumns = New System.Windows.Forms.NumericUpDown() Me.lblDefaultValue = New System.Windows.Forms.Label() Me.lblPrefixforInsertedColumns = New System.Windows.Forms.Label() - Me.ucrInputPrefixForInsertedColumns = New instat.ucrInputTextBox() - Me.ucrInputDefaultValue = New instat.ucrInputTextBox() - Me.ucrSelectorInseertColumns = New instat.ucrSelectorAddRemove() - Me.ucrBase = New instat.ucrButtons() - Me.ucrDataFramesList = New instat.ucrDataFrame() Me.grpOPtions = New System.Windows.Forms.GroupBox() Me.rdoAfter = New System.Windows.Forms.RadioButton() Me.rdoBefore = New System.Windows.Forms.RadioButton() Me.rdoInsertColumns = New System.Windows.Forms.RadioButton() - Me.ucrPnlColumnsOrRows = New instat.UcrPanel() Me.rdoInsertRows = New System.Windows.Forms.RadioButton() + Me.ucrPnlColumnsOrRows = New instat.UcrPanel() + Me.ucrInputPrefixForInsertedColumns = New instat.ucrInputTextBox() + Me.ucrInputDefaultValue = New instat.ucrInputTextBox() + Me.ucrSelectorInsertColumns = New instat.ucrSelectorAddRemove() + Me.ucrBase = New instat.ucrButtons() + Me.ucrDataFramesList = New instat.ucrDataFrame() CType(Me.nudPos, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.nudNumCols, System.ComponentModel.ISupportInitialize).BeginInit() Me.grpInsert.SuspendLayout() @@ -191,51 +191,6 @@ Partial Class dlgInsertColumn Me.lblPrefixforInsertedColumns.TabIndex = 15 Me.lblPrefixforInsertedColumns.Text = "Prefix for Inserted Column(s):" ' - 'ucrInputPrefixForInsertedColumns - ' - Me.ucrInputPrefixForInsertedColumns.AddQuotesIfUnrecognised = True - Me.ucrInputPrefixForInsertedColumns.IsMultiline = False - Me.ucrInputPrefixForInsertedColumns.IsReadOnly = False - Me.ucrInputPrefixForInsertedColumns.Location = New System.Drawing.Point(158, 246) - Me.ucrInputPrefixForInsertedColumns.Name = "ucrInputPrefixForInsertedColumns" - Me.ucrInputPrefixForInsertedColumns.Size = New System.Drawing.Size(250, 21) - Me.ucrInputPrefixForInsertedColumns.TabIndex = 16 - ' - 'ucrInputDefaultValue - ' - Me.ucrInputDefaultValue.AddQuotesIfUnrecognised = True - Me.ucrInputDefaultValue.IsMultiline = False - Me.ucrInputDefaultValue.IsReadOnly = False - Me.ucrInputDefaultValue.Location = New System.Drawing.Point(408, 204) - Me.ucrInputDefaultValue.Name = "ucrInputDefaultValue" - Me.ucrInputDefaultValue.Size = New System.Drawing.Size(45, 21) - Me.ucrInputDefaultValue.TabIndex = 14 - ' - 'ucrSelectorInseertColumns - ' - Me.ucrSelectorInseertColumns.bShowHiddenColumns = False - Me.ucrSelectorInseertColumns.Location = New System.Drawing.Point(9, 97) - Me.ucrSelectorInseertColumns.Margin = New System.Windows.Forms.Padding(0) - Me.ucrSelectorInseertColumns.Name = "ucrSelectorInseertColumns" - Me.ucrSelectorInseertColumns.Size = New System.Drawing.Size(202, 148) - Me.ucrSelectorInseertColumns.TabIndex = 4 - ' - 'ucrBase - ' - Me.ucrBase.Location = New System.Drawing.Point(10, 270) - Me.ucrBase.Name = "ucrBase" - Me.ucrBase.Size = New System.Drawing.Size(410, 53) - Me.ucrBase.TabIndex = 17 - ' - 'ucrDataFramesList - ' - Me.ucrDataFramesList.bUseCurrentFilter = True - Me.ucrDataFramesList.Location = New System.Drawing.Point(10, 52) - Me.ucrDataFramesList.Margin = New System.Windows.Forms.Padding(0) - Me.ucrDataFramesList.Name = "ucrDataFramesList" - Me.ucrDataFramesList.Size = New System.Drawing.Size(127, 41) - Me.ucrDataFramesList.TabIndex = 3 - ' 'grpOPtions ' Me.grpOPtions.Controls.Add(Me.rdoAfter) @@ -285,13 +240,6 @@ Partial Class dlgInsertColumn Me.rdoInsertColumns.TextAlign = System.Drawing.ContentAlignment.MiddleCenter Me.rdoInsertColumns.UseVisualStyleBackColor = True ' - 'ucrPnlColumnsOrRows - ' - Me.ucrPnlColumnsOrRows.Location = New System.Drawing.Point(132, 11) - Me.ucrPnlColumnsOrRows.Name = "ucrPnlColumnsOrRows" - Me.ucrPnlColumnsOrRows.Size = New System.Drawing.Size(214, 29) - Me.ucrPnlColumnsOrRows.TabIndex = 0 - ' 'rdoInsertRows ' Me.rdoInsertRows.Appearance = System.Windows.Forms.Appearance.Button @@ -308,6 +256,58 @@ Partial Class dlgInsertColumn Me.rdoInsertRows.TextAlign = System.Drawing.ContentAlignment.MiddleCenter Me.rdoInsertRows.UseVisualStyleBackColor = True ' + 'ucrPnlColumnsOrRows + ' + Me.ucrPnlColumnsOrRows.Location = New System.Drawing.Point(132, 11) + Me.ucrPnlColumnsOrRows.Name = "ucrPnlColumnsOrRows" + Me.ucrPnlColumnsOrRows.Size = New System.Drawing.Size(214, 29) + Me.ucrPnlColumnsOrRows.TabIndex = 0 + ' + 'ucrInputPrefixForInsertedColumns + ' + Me.ucrInputPrefixForInsertedColumns.AddQuotesIfUnrecognised = True + Me.ucrInputPrefixForInsertedColumns.IsMultiline = False + Me.ucrInputPrefixForInsertedColumns.IsReadOnly = False + Me.ucrInputPrefixForInsertedColumns.Location = New System.Drawing.Point(158, 246) + Me.ucrInputPrefixForInsertedColumns.Name = "ucrInputPrefixForInsertedColumns" + Me.ucrInputPrefixForInsertedColumns.Size = New System.Drawing.Size(250, 21) + Me.ucrInputPrefixForInsertedColumns.TabIndex = 16 + ' + 'ucrInputDefaultValue + ' + Me.ucrInputDefaultValue.AddQuotesIfUnrecognised = True + Me.ucrInputDefaultValue.IsMultiline = False + Me.ucrInputDefaultValue.IsReadOnly = False + Me.ucrInputDefaultValue.Location = New System.Drawing.Point(408, 204) + Me.ucrInputDefaultValue.Name = "ucrInputDefaultValue" + Me.ucrInputDefaultValue.Size = New System.Drawing.Size(45, 21) + Me.ucrInputDefaultValue.TabIndex = 14 + ' + 'ucrSelectorInsertColumns + ' + Me.ucrSelectorInsertColumns.bShowHiddenColumns = False + Me.ucrSelectorInsertColumns.Location = New System.Drawing.Point(9, 97) + Me.ucrSelectorInsertColumns.Margin = New System.Windows.Forms.Padding(0) + Me.ucrSelectorInsertColumns.Name = "ucrSelectorInsertColumns" + Me.ucrSelectorInsertColumns.Size = New System.Drawing.Size(202, 148) + Me.ucrSelectorInsertColumns.TabIndex = 4 + ' + 'ucrBase + ' + Me.ucrBase.Location = New System.Drawing.Point(10, 270) + Me.ucrBase.Name = "ucrBase" + Me.ucrBase.Size = New System.Drawing.Size(410, 53) + Me.ucrBase.TabIndex = 17 + ' + 'ucrDataFramesList + ' + Me.ucrDataFramesList.bUseCurrentFilter = True + Me.ucrDataFramesList.Location = New System.Drawing.Point(10, 52) + Me.ucrDataFramesList.Margin = New System.Windows.Forms.Padding(0) + Me.ucrDataFramesList.Name = "ucrDataFramesList" + Me.ucrDataFramesList.Size = New System.Drawing.Size(127, 41) + Me.ucrDataFramesList.TabIndex = 3 + ' 'dlgInsertColumn ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -324,7 +324,7 @@ Partial Class dlgInsertColumn Me.Controls.Add(Me.nudInsertColumns) Me.Controls.Add(Me.lblNumberOfColumnsToInsert) Me.Controls.Add(Me.grpInsert) - Me.Controls.Add(Me.ucrSelectorInseertColumns) + Me.Controls.Add(Me.ucrSelectorInsertColumns) Me.Controls.Add(Me.lblStartPos) Me.Controls.Add(Me.nudNumCols) Me.Controls.Add(Me.nudPos) @@ -355,7 +355,7 @@ Partial Class dlgInsertColumn Friend WithEvents nudPos As NumericUpDown Friend WithEvents nudNumCols As NumericUpDown Friend WithEvents lblNumberOfRowsToInsert As Label - Friend WithEvents ucrSelectorInseertColumns As ucrSelectorAddRemove + Friend WithEvents ucrSelectorInsertColumns As ucrSelectorAddRemove Friend WithEvents grpInsert As GroupBox Friend WithEvents ucrInputBeforeAfter As ucrInputComboBox Friend WithEvents rdoBeforeAfter As RadioButton diff --git a/instat/dlgInsertColumn.resx b/instat/dlgInsertColumn.resx index 1af7de150c9..29dcb1b3a35 100644 --- a/instat/dlgInsertColumn.resx +++ b/instat/dlgInsertColumn.resx @@ -1,120 +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 - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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/dlgInsertColumn.vb b/instat/dlgInsertColumn.vb index cba8ce7b121..6986b6a0f57 100644 --- a/instat/dlgInsertColumn.vb +++ b/instat/dlgInsertColumn.vb @@ -35,29 +35,17 @@ Public Class dlgInsertColumn Private Sub InitialiseDialog() ucrBase.iHelpTopicID = 164 - ucrReceiverColumnsToInsert.Selector = ucrSelectorInseertColumns + ucrReceiverColumnsToInsert.Selector = ucrSelectorInsertColumns ucrReceiverColumnsToInsert.SetMeAsReceiver() ucrInputBeforeAfter.SetItems({"Before", "After"}) ucrInputPrefixForInsertedColumns.SetValidationTypeAsRVariable() - End Sub - - Private Sub TestOKEnabled() - If rdoInsertColumns.Checked Then - If ((nudInsertColumns.Text <> "") And (Not ucrInputDefaultValue.IsEmpty) And (Not ucrInputPrefixForInsertedColumns.IsEmpty) And (ucrDataFramesList.cboAvailableDataFrames.Text <> "")) Then - ucrBase.OKEnabled(True) - Else - ucrBase.OKEnabled(False) - End If - ElseIf rdoInsertRows.Checked Then - If ((nudNumCols.Text <> "") And (nudPos.Text <> "") And (ucrDataFramesList.cboAvailableDataFrames.Text <> "")) Then - ucrBase.OKEnabled(True) - Else - ucrBase.OKEnabled(False) - End If - Else - ucrBase.OKEnabled(False) - End If + ucrPnlColumnsOrRows.AddRadioButton(rdoInsertColumns) + ucrPnlColumnsOrRows.AddRadioButton(rdoInsertRows) + + ucrPnlColumnsOrRows.AddFunctionNamesCondition(rdoInsertColumns, "$add_columns_to_data") + ucrPnlColumnsOrRows.AddFunctionNamesCondition(rdoInsertRows, "$insert_row_in_data") + End Sub Private Sub ReopenDialog() @@ -75,11 +63,15 @@ Public Class dlgInsertColumn clsAddColumnFunction = New RFunction clsInsertRowFunction = New RFunction + clsAddColumnFunction.SetRCommand("$add_columns_to_data") + clsInsertRowFunction.SetRCommand("$insert_row_in_data") + ucrSelectorInsertColumns.Reset() + rdoInsertColumns.Checked = True ucrInputPrefixForInsertedColumns.SetName("X") ucrInputDefaultValue.SetName("NA") ucrDataFramesList.Reset() - RowsOrColumns() + 'RowsOrColumns() rdoAtEnd.Checked = True rdoAfter.Checked = True ucrInputBeforeAfter.SetName("After") @@ -94,6 +86,25 @@ Public Class dlgInsertColumn End Sub + Private Sub TestOKEnabled() + If rdoInsertColumns.Checked Then + If ((nudInsertColumns.Text <> "") And (Not ucrInputDefaultValue.IsEmpty) And (Not ucrInputPrefixForInsertedColumns.IsEmpty) And (ucrDataFramesList.cboAvailableDataFrames.Text <> "")) Then + ucrBase.OKEnabled(True) + Else + ucrBase.OKEnabled(False) + + End If + ElseIf rdoInsertRows.Checked Then + If ((nudNumCols.Text <> "") And (nudPos.Text <> "") And (ucrDataFramesList.cboAvailableDataFrames.Text <> "")) Then + ucrBase.OKEnabled(True) + Else + ucrBase.OKEnabled(False) + End If + Else + ucrBase.OKEnabled(False) + End If + End Sub + Private Sub nudPos_TextChanged(sender As Object, e As EventArgs) Handles nudPos.TextChanged startpo() End Sub @@ -135,8 +146,8 @@ Public Class dlgInsertColumn Private Sub ucrDataFramesList_DataFrameChanged() Handles ucrDataFramesList.DataFrameChanged ucrBase.clsRsyntax.AddParameter("data_name", Chr(34) & ucrDataFramesList.cboAvailableDataFrames.SelectedItem & Chr(34)) - ucrSelectorInseertColumns.strCurrentDataFrame = ucrDataFramesList.cboAvailableDataFrames.SelectedItem - ucrSelectorInseertColumns.LoadList() + ucrSelectorInsertColumns.strCurrentDataFrame = ucrDataFramesList.cboAvailableDataFrames.SelectedItem + ucrSelectorInsertColumns.LoadList() TestOKEnabled() End Sub @@ -190,7 +201,7 @@ Public Class dlgInsertColumn addColumData() ColsToInsert() OPtionstoInsert() - startpo() + 'startpo() BeforeParameter() lblPrefixforInsertedColumns.Visible = True lblDefaultValue.Visible = True @@ -210,7 +221,7 @@ Public Class dlgInsertColumn nudNumCols.Value = 1 NumberofColumnsOrRows() dataFrameListMaxMinPos() - startpo() + 'startpo() nudNumCols.Maximum = 1000 addColumData() InsertParam() @@ -219,7 +230,7 @@ Public Class dlgInsertColumn ColsToInsert() ColName() BeforeParameter() - ucrSelectorInseertColumns.Visible = False + ucrSelectorInsertColumns.Visible = False nudNumCols.Visible = True nudPos.Visible = True lblStartPos.Visible = True @@ -247,15 +258,15 @@ Public Class dlgInsertColumn ucrBase.clsRsyntax.AddParameter("before", "FALSE") ucrBase.clsRsyntax.RemoveParameter("adjacent_column") ucrReceiverColumnsToInsert.Visible = False - ucrSelectorInseertColumns.Visible = False + ucrSelectorInsertColumns.Visible = False ElseIf rdoAtStart.Checked Then ucrBase.clsRsyntax.AddParameter("before", "TRUE") ucrBase.clsRsyntax.RemoveParameter("adjacent_column") ucrReceiverColumnsToInsert.Visible = False - ucrSelectorInseertColumns.Visible = False + ucrSelectorInsertColumns.Visible = False Else ucrReceiverColumnsToInsert.Visible = True - ucrSelectorInseertColumns.Visible = True + ucrSelectorInsertColumns.Visible = True End If If rdoBeforeAfter.Checked Then ucrInputBeforeAfter.Enabled = True From bce53f4446a55fe54b5394bb6f08bb05d4756e32 Mon Sep 17 00:00:00 2001 From: shadrack kibet Date: Tue, 23 May 2017 13:17:47 +0300 Subject: [PATCH 030/154] designer and code edits --- instat/dlgInsertColumn.Designer.vb | 179 ++++++++------- instat/dlgInsertColumn.vb | 345 ++++++++++++++++------------- 2 files changed, 289 insertions(+), 235 deletions(-) diff --git a/instat/dlgInsertColumn.Designer.vb b/instat/dlgInsertColumn.Designer.vb index b8bbdc99c9e..f0de26f02ea 100644 --- a/instat/dlgInsertColumn.Designer.vb +++ b/instat/dlgInsertColumn.Designer.vb @@ -23,22 +23,21 @@ Partial Class dlgInsertColumn Private Sub InitializeComponent() Me.lblStartPos = New System.Windows.Forms.Label() - Me.nudPos = New System.Windows.Forms.NumericUpDown() - Me.nudNumCols = New System.Windows.Forms.NumericUpDown() Me.lblNumberOfRowsToInsert = New System.Windows.Forms.Label() Me.grpInsert = New System.Windows.Forms.GroupBox() Me.ucrInputBeforeAfter = New instat.ucrInputComboBox() - Me.rdoBeforeAfter = New System.Windows.Forms.RadioButton() Me.rdoAtStart = New System.Windows.Forms.RadioButton() - Me.rdoAtEnd = New System.Windows.Forms.RadioButton() + Me.rdoBeforeAfter = New System.Windows.Forms.RadioButton() Me.ucrReceiverColumnsToInsert = New instat.ucrReceiverSingle() + Me.rdoAtEnd = New System.Windows.Forms.RadioButton() + Me.ucrPnlStartEnd = New instat.UcrPanel() Me.lblNumberOfColumnsToInsert = New System.Windows.Forms.Label() - Me.nudInsertColumns = New System.Windows.Forms.NumericUpDown() Me.lblDefaultValue = New System.Windows.Forms.Label() Me.lblPrefixforInsertedColumns = New System.Windows.Forms.Label() Me.grpOPtions = New System.Windows.Forms.GroupBox() Me.rdoAfter = New System.Windows.Forms.RadioButton() Me.rdoBefore = New System.Windows.Forms.RadioButton() + Me.ucrPnlBeforeAfter = New instat.UcrPanel() Me.rdoInsertColumns = New System.Windows.Forms.RadioButton() Me.rdoInsertRows = New System.Windows.Forms.RadioButton() Me.ucrPnlColumnsOrRows = New instat.UcrPanel() @@ -47,10 +46,10 @@ Partial Class dlgInsertColumn Me.ucrSelectorInsertColumns = New instat.ucrSelectorAddRemove() Me.ucrBase = New instat.ucrButtons() Me.ucrDataFramesList = New instat.ucrDataFrame() - CType(Me.nudPos, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.nudNumCols, System.ComponentModel.ISupportInitialize).BeginInit() + Me.ucrNudNumberOfRows = New instat.ucrNud() + Me.ucrNudStartRow = New instat.ucrNud() + Me.ucrNudNumberOfColumns = New instat.ucrNud() Me.grpInsert.SuspendLayout() - CType(Me.nudInsertColumns, System.ComponentModel.ISupportInitialize).BeginInit() Me.grpOPtions.SuspendLayout() Me.SuspendLayout() ' @@ -63,24 +62,6 @@ Partial Class dlgInsertColumn Me.lblStartPos.TabIndex = 7 Me.lblStartPos.Text = "Insert at Position:" ' - 'nudPos - ' - Me.nudPos.Location = New System.Drawing.Point(148, 127) - Me.nudPos.Minimum = New Decimal(New Integer() {1, 0, 0, 0}) - Me.nudPos.Name = "nudPos" - Me.nudPos.Size = New System.Drawing.Size(52, 20) - Me.nudPos.TabIndex = 8 - Me.nudPos.Value = New Decimal(New Integer() {1, 0, 0, 0}) - ' - 'nudNumCols - ' - Me.nudNumCols.Location = New System.Drawing.Point(148, 101) - Me.nudNumCols.Minimum = New Decimal(New Integer() {1, 0, 0, 0}) - Me.nudNumCols.Name = "nudNumCols" - Me.nudNumCols.Size = New System.Drawing.Size(52, 20) - Me.nudNumCols.TabIndex = 6 - Me.nudNumCols.Value = New Decimal(New Integer() {1, 0, 0, 0}) - ' 'lblNumberOfRowsToInsert ' Me.lblNumberOfRowsToInsert.AutoSize = True @@ -93,13 +74,14 @@ Partial Class dlgInsertColumn 'grpInsert ' Me.grpInsert.Controls.Add(Me.ucrInputBeforeAfter) - Me.grpInsert.Controls.Add(Me.rdoBeforeAfter) Me.grpInsert.Controls.Add(Me.rdoAtStart) - Me.grpInsert.Controls.Add(Me.rdoAtEnd) + Me.grpInsert.Controls.Add(Me.rdoBeforeAfter) Me.grpInsert.Controls.Add(Me.ucrReceiverColumnsToInsert) - Me.grpInsert.Location = New System.Drawing.Point(265, 78) + Me.grpInsert.Controls.Add(Me.rdoAtEnd) + Me.grpInsert.Controls.Add(Me.ucrPnlStartEnd) + Me.grpInsert.Location = New System.Drawing.Point(266, 73) Me.grpInsert.Name = "grpInsert" - Me.grpInsert.Size = New System.Drawing.Size(215, 92) + Me.grpInsert.Size = New System.Drawing.Size(215, 107) Me.grpInsert.TabIndex = 10 Me.grpInsert.TabStop = False Me.grpInsert.Text = "Insert" @@ -108,31 +90,43 @@ Partial Class dlgInsertColumn ' Me.ucrInputBeforeAfter.AddQuotesIfUnrecognised = True Me.ucrInputBeforeAfter.IsReadOnly = False - Me.ucrInputBeforeAfter.Location = New System.Drawing.Point(26, 65) + Me.ucrInputBeforeAfter.Location = New System.Drawing.Point(26, 75) Me.ucrInputBeforeAfter.Name = "ucrInputBeforeAfter" Me.ucrInputBeforeAfter.Size = New System.Drawing.Size(93, 21) Me.ucrInputBeforeAfter.TabIndex = 3 ' + 'rdoAtStart + ' + Me.rdoAtStart.AutoSize = True + Me.rdoAtStart.Location = New System.Drawing.Point(6, 47) + Me.rdoAtStart.Name = "rdoAtStart" + Me.rdoAtStart.Size = New System.Drawing.Size(60, 17) + Me.rdoAtStart.TabIndex = 1 + Me.rdoAtStart.TabStop = True + Me.rdoAtStart.Text = "At Start" + Me.rdoAtStart.UseVisualStyleBackColor = True + ' 'rdoBeforeAfter ' Me.rdoBeforeAfter.AutoSize = True - Me.rdoBeforeAfter.Location = New System.Drawing.Point(6, 70) + Me.rdoBeforeAfter.Location = New System.Drawing.Point(6, 79) Me.rdoBeforeAfter.Name = "rdoBeforeAfter" Me.rdoBeforeAfter.Size = New System.Drawing.Size(14, 13) Me.rdoBeforeAfter.TabIndex = 2 Me.rdoBeforeAfter.TabStop = True Me.rdoBeforeAfter.UseVisualStyleBackColor = True ' - 'rdoAtStart + 'ucrReceiverColumnsToInsert ' - Me.rdoAtStart.AutoSize = True - Me.rdoAtStart.Location = New System.Drawing.Point(6, 42) - Me.rdoAtStart.Name = "rdoAtStart" - Me.rdoAtStart.Size = New System.Drawing.Size(60, 17) - Me.rdoAtStart.TabIndex = 1 - Me.rdoAtStart.TabStop = True - Me.rdoAtStart.Text = "At Start" - Me.rdoAtStart.UseVisualStyleBackColor = True + Me.ucrReceiverColumnsToInsert.frmParent = Me + Me.ucrReceiverColumnsToInsert.Location = New System.Drawing.Point(129, 74) + Me.ucrReceiverColumnsToInsert.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverColumnsToInsert.Name = "ucrReceiverColumnsToInsert" + Me.ucrReceiverColumnsToInsert.Selector = Nothing + Me.ucrReceiverColumnsToInsert.Size = New System.Drawing.Size(75, 20) + Me.ucrReceiverColumnsToInsert.strNcFilePath = "" + Me.ucrReceiverColumnsToInsert.TabIndex = 4 + Me.ucrReceiverColumnsToInsert.ucrSelector = Nothing ' 'rdoAtEnd ' @@ -145,17 +139,12 @@ Partial Class dlgInsertColumn Me.rdoAtEnd.Text = "At End" Me.rdoAtEnd.UseVisualStyleBackColor = True ' - 'ucrReceiverColumnsToInsert + 'ucrPnlStartEnd ' - Me.ucrReceiverColumnsToInsert.frmParent = Me - Me.ucrReceiverColumnsToInsert.Location = New System.Drawing.Point(128, 65) - Me.ucrReceiverColumnsToInsert.Margin = New System.Windows.Forms.Padding(0) - Me.ucrReceiverColumnsToInsert.Name = "ucrReceiverColumnsToInsert" - Me.ucrReceiverColumnsToInsert.Selector = Nothing - Me.ucrReceiverColumnsToInsert.Size = New System.Drawing.Size(75, 20) - Me.ucrReceiverColumnsToInsert.strNcFilePath = "" - Me.ucrReceiverColumnsToInsert.TabIndex = 4 - Me.ucrReceiverColumnsToInsert.ucrSelector = Nothing + Me.ucrPnlStartEnd.Location = New System.Drawing.Point(6, 14) + Me.ucrPnlStartEnd.Name = "ucrPnlStartEnd" + Me.ucrPnlStartEnd.Size = New System.Drawing.Size(78, 88) + Me.ucrPnlStartEnd.TabIndex = 22 ' 'lblNumberOfColumnsToInsert ' @@ -166,13 +155,6 @@ Partial Class dlgInsertColumn Me.lblNumberOfColumnsToInsert.TabIndex = 11 Me.lblNumberOfColumnsToInsert.Text = "Number of Columns to Insert:" ' - 'nudInsertColumns - ' - Me.nudInsertColumns.Location = New System.Drawing.Point(408, 179) - Me.nudInsertColumns.Name = "nudInsertColumns" - Me.nudInsertColumns.Size = New System.Drawing.Size(45, 20) - Me.nudInsertColumns.TabIndex = 12 - ' 'lblDefaultValue ' Me.lblDefaultValue.AutoSize = True @@ -185,7 +167,7 @@ Partial Class dlgInsertColumn 'lblPrefixforInsertedColumns ' Me.lblPrefixforInsertedColumns.AutoSize = True - Me.lblPrefixforInsertedColumns.Location = New System.Drawing.Point(10, 248) + Me.lblPrefixforInsertedColumns.Location = New System.Drawing.Point(10, 304) Me.lblPrefixforInsertedColumns.Name = "lblPrefixforInsertedColumns" Me.lblPrefixforInsertedColumns.Size = New System.Drawing.Size(141, 13) Me.lblPrefixforInsertedColumns.TabIndex = 15 @@ -195,9 +177,10 @@ Partial Class dlgInsertColumn ' Me.grpOPtions.Controls.Add(Me.rdoAfter) Me.grpOPtions.Controls.Add(Me.rdoBefore) - Me.grpOPtions.Location = New System.Drawing.Point(265, 78) + Me.grpOPtions.Controls.Add(Me.ucrPnlBeforeAfter) + Me.grpOPtions.Location = New System.Drawing.Point(268, 63) Me.grpOPtions.Name = "grpOPtions" - Me.grpOPtions.Size = New System.Drawing.Size(124, 67) + Me.grpOPtions.Size = New System.Drawing.Size(124, 82) Me.grpOPtions.TabIndex = 9 Me.grpOPtions.TabStop = False Me.grpOPtions.Text = "Options" @@ -205,7 +188,7 @@ Partial Class dlgInsertColumn 'rdoAfter ' Me.rdoAfter.AutoSize = True - Me.rdoAfter.Location = New System.Drawing.Point(6, 44) + Me.rdoAfter.Location = New System.Drawing.Point(5, 53) Me.rdoAfter.Name = "rdoAfter" Me.rdoAfter.Size = New System.Drawing.Size(47, 17) Me.rdoAfter.TabIndex = 1 @@ -216,7 +199,7 @@ Partial Class dlgInsertColumn 'rdoBefore ' Me.rdoBefore.AutoSize = True - Me.rdoBefore.Location = New System.Drawing.Point(6, 20) + Me.rdoBefore.Location = New System.Drawing.Point(6, 26) Me.rdoBefore.Name = "rdoBefore" Me.rdoBefore.Size = New System.Drawing.Size(56, 17) Me.rdoBefore.TabIndex = 0 @@ -224,6 +207,13 @@ Partial Class dlgInsertColumn Me.rdoBefore.Text = "Before" Me.rdoBefore.UseVisualStyleBackColor = True ' + 'ucrPnlBeforeAfter + ' + Me.ucrPnlBeforeAfter.Location = New System.Drawing.Point(4, 18) + Me.ucrPnlBeforeAfter.Name = "ucrPnlBeforeAfter" + Me.ucrPnlBeforeAfter.Size = New System.Drawing.Size(98, 57) + Me.ucrPnlBeforeAfter.TabIndex = 21 + ' 'rdoInsertColumns ' Me.rdoInsertColumns.Appearance = System.Windows.Forms.Appearance.Button @@ -268,7 +258,7 @@ Partial Class dlgInsertColumn Me.ucrInputPrefixForInsertedColumns.AddQuotesIfUnrecognised = True Me.ucrInputPrefixForInsertedColumns.IsMultiline = False Me.ucrInputPrefixForInsertedColumns.IsReadOnly = False - Me.ucrInputPrefixForInsertedColumns.Location = New System.Drawing.Point(158, 246) + Me.ucrInputPrefixForInsertedColumns.Location = New System.Drawing.Point(158, 302) Me.ucrInputPrefixForInsertedColumns.Name = "ucrInputPrefixForInsertedColumns" Me.ucrInputPrefixForInsertedColumns.Size = New System.Drawing.Size(250, 21) Me.ucrInputPrefixForInsertedColumns.TabIndex = 16 @@ -286,7 +276,7 @@ Partial Class dlgInsertColumn 'ucrSelectorInsertColumns ' Me.ucrSelectorInsertColumns.bShowHiddenColumns = False - Me.ucrSelectorInsertColumns.Location = New System.Drawing.Point(9, 97) + Me.ucrSelectorInsertColumns.Location = New System.Drawing.Point(20, 151) Me.ucrSelectorInsertColumns.Margin = New System.Windows.Forms.Padding(0) Me.ucrSelectorInsertColumns.Name = "ucrSelectorInsertColumns" Me.ucrSelectorInsertColumns.Size = New System.Drawing.Size(202, 148) @@ -294,7 +284,7 @@ Partial Class dlgInsertColumn ' 'ucrBase ' - Me.ucrBase.Location = New System.Drawing.Point(10, 270) + Me.ucrBase.Location = New System.Drawing.Point(10, 323) Me.ucrBase.Name = "ucrBase" Me.ucrBase.Size = New System.Drawing.Size(410, 53) Me.ucrBase.TabIndex = 17 @@ -308,26 +298,62 @@ Partial Class dlgInsertColumn Me.ucrDataFramesList.Size = New System.Drawing.Size(127, 41) Me.ucrDataFramesList.TabIndex = 3 ' + 'ucrNudNumberOfRows + ' + Me.ucrNudNumberOfRows.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudNumberOfRows.Increment = New Decimal(New Integer() {1, 0, 0, 0}) + Me.ucrNudNumberOfRows.Location = New System.Drawing.Point(148, 101) + Me.ucrNudNumberOfRows.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) + Me.ucrNudNumberOfRows.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudNumberOfRows.Name = "ucrNudNumberOfRows" + Me.ucrNudNumberOfRows.Size = New System.Drawing.Size(50, 20) + Me.ucrNudNumberOfRows.TabIndex = 18 + Me.ucrNudNumberOfRows.Value = New Decimal(New Integer() {0, 0, 0, 0}) + ' + 'ucrNudStartRow + ' + Me.ucrNudStartRow.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudStartRow.Increment = New Decimal(New Integer() {1, 0, 0, 0}) + Me.ucrNudStartRow.Location = New System.Drawing.Point(148, 129) + Me.ucrNudStartRow.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) + Me.ucrNudStartRow.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudStartRow.Name = "ucrNudStartRow" + Me.ucrNudStartRow.Size = New System.Drawing.Size(50, 20) + Me.ucrNudStartRow.TabIndex = 19 + Me.ucrNudStartRow.Value = New Decimal(New Integer() {0, 0, 0, 0}) + ' + 'ucrNudNumberOfColumns + ' + Me.ucrNudNumberOfColumns.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudNumberOfColumns.Increment = New Decimal(New Integer() {1, 0, 0, 0}) + Me.ucrNudNumberOfColumns.Location = New System.Drawing.Point(408, 180) + Me.ucrNudNumberOfColumns.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) + Me.ucrNudNumberOfColumns.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudNumberOfColumns.Name = "ucrNudNumberOfColumns" + Me.ucrNudNumberOfColumns.Size = New System.Drawing.Size(50, 20) + Me.ucrNudNumberOfColumns.TabIndex = 20 + Me.ucrNudNumberOfColumns.Value = New Decimal(New Integer() {0, 0, 0, 0}) + ' 'dlgInsertColumn ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(492, 327) + Me.ClientSize = New System.Drawing.Size(490, 384) + Me.Controls.Add(Me.ucrNudNumberOfColumns) + Me.Controls.Add(Me.ucrNudStartRow) + Me.Controls.Add(Me.ucrNudNumberOfRows) Me.Controls.Add(Me.rdoInsertRows) Me.Controls.Add(Me.rdoInsertColumns) - Me.Controls.Add(Me.ucrPnlColumnsOrRows) Me.Controls.Add(Me.grpOPtions) + Me.Controls.Add(Me.ucrPnlColumnsOrRows) Me.Controls.Add(Me.ucrInputPrefixForInsertedColumns) Me.Controls.Add(Me.lblPrefixforInsertedColumns) Me.Controls.Add(Me.ucrInputDefaultValue) Me.Controls.Add(Me.lblDefaultValue) - Me.Controls.Add(Me.nudInsertColumns) Me.Controls.Add(Me.lblNumberOfColumnsToInsert) Me.Controls.Add(Me.grpInsert) Me.Controls.Add(Me.ucrSelectorInsertColumns) Me.Controls.Add(Me.lblStartPos) - Me.Controls.Add(Me.nudNumCols) - Me.Controls.Add(Me.nudPos) Me.Controls.Add(Me.lblNumberOfRowsToInsert) Me.Controls.Add(Me.ucrBase) Me.Controls.Add(Me.ucrDataFramesList) @@ -337,11 +363,8 @@ Partial Class dlgInsertColumn Me.Name = "dlgInsertColumn" Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen Me.Text = "Insert Columns/Rows" - CType(Me.nudPos, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.nudNumCols, System.ComponentModel.ISupportInitialize).EndInit() Me.grpInsert.ResumeLayout(False) Me.grpInsert.PerformLayout() - CType(Me.nudInsertColumns, System.ComponentModel.ISupportInitialize).EndInit() Me.grpOPtions.ResumeLayout(False) Me.grpOPtions.PerformLayout() Me.ResumeLayout(False) @@ -352,8 +375,6 @@ Partial Class dlgInsertColumn Friend WithEvents ucrDataFramesList As ucrDataFrame Friend WithEvents lblStartPos As Label Friend WithEvents ucrBase As ucrButtons - Friend WithEvents nudPos As NumericUpDown - Friend WithEvents nudNumCols As NumericUpDown Friend WithEvents lblNumberOfRowsToInsert As Label Friend WithEvents ucrSelectorInsertColumns As ucrSelectorAddRemove Friend WithEvents grpInsert As GroupBox @@ -363,7 +384,6 @@ Partial Class dlgInsertColumn Friend WithEvents rdoAtEnd As RadioButton Friend WithEvents ucrReceiverColumnsToInsert As ucrReceiverSingle Friend WithEvents lblNumberOfColumnsToInsert As Label - Friend WithEvents nudInsertColumns As NumericUpDown Friend WithEvents lblDefaultValue As Label Friend WithEvents ucrInputDefaultValue As ucrInputTextBox Friend WithEvents lblPrefixforInsertedColumns As Label @@ -374,4 +394,9 @@ Partial Class dlgInsertColumn Friend WithEvents rdoInsertColumns As RadioButton Friend WithEvents ucrPnlColumnsOrRows As UcrPanel Friend WithEvents rdoInsertRows As RadioButton + Friend WithEvents ucrNudNumberOfColumns As ucrNud + Friend WithEvents ucrNudStartRow As ucrNud + Friend WithEvents ucrNudNumberOfRows As ucrNud + Friend WithEvents ucrPnlBeforeAfter As UcrPanel + Friend WithEvents ucrPnlStartEnd As UcrPanel End Class diff --git a/instat/dlgInsertColumn.vb b/instat/dlgInsertColumn.vb index 6986b6a0f57..7d96139eeb7 100644 --- a/instat/dlgInsertColumn.vb +++ b/instat/dlgInsertColumn.vb @@ -43,43 +43,71 @@ Public Class dlgInsertColumn ucrPnlColumnsOrRows.AddRadioButton(rdoInsertColumns) ucrPnlColumnsOrRows.AddRadioButton(rdoInsertRows) - ucrPnlColumnsOrRows.AddFunctionNamesCondition(rdoInsertColumns, "$add_columns_to_data") - ucrPnlColumnsOrRows.AddFunctionNamesCondition(rdoInsertRows, "$insert_row_in_data") + ucrPnlBeforeAfter.AddRadioButton(rdoBefore) + ucrPnlBeforeAfter.AddRadioButton(rdoAfter) + + ucrPnlStartEnd.AddRadioButton(rdoAtStart) + ucrPnlStartEnd.AddRadioButton(rdoAtEnd) + ucrPnlStartEnd.AddRadioButton(rdoBeforeAfter) + + ucrNudNumberOfRows.SetParameter(New RParameter("number_rows")) + ucrNudStartRow.SetParameter(New RParameter("start_row")) + ucrNudNumberOfColumns.SetParameter(New RParameter("number_rows")) + + + 'Setting Display of the group boxes in the dialog + ucrPnlColumnsOrRows.AddToLinkedControls(ucrPnlStartEnd, {rdoInsertColumns}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) + ucrPnlColumnsOrRows.AddToLinkedControls(ucrInputBeforeAfter, {rdoInsertColumns}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) + ucrPnlColumnsOrRows.AddToLinkedControls(ucrReceiverColumnsToInsert, {rdoInsertColumns}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) + ucrPnlColumnsOrRows.AddToLinkedControls(ucrNudNumberOfColumns, {rdoInsertColumns}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) + ucrPnlColumnsOrRows.AddToLinkedControls(ucrInputDefaultValue, {rdoInsertColumns}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) + + ucrPnlColumnsOrRows.AddToLinkedControls(ucrPnlBeforeAfter, {rdoInsertRows}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) + ucrPnlColumnsOrRows.AddToLinkedControls(ucrNudNumberOfRows, {rdoInsertRows}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) + ucrPnlColumnsOrRows.AddToLinkedControls(ucrNudStartRow, {rdoInsertRows}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) + + 'ucrSelectorInsertColumns.AddToLinkedControls(ucrNudStartRow, {rdoInsertRows}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) + ucrNudNumberOfColumns.SetLinkedDisplayControl(lblNumberOfColumnsToInsert) + ucrInputDefaultValue.SetLinkedDisplayControl(lblDefaultValue) + ucrNudNumberOfRows.SetLinkedDisplayControl(lblNumberOfRowsToInsert) + ucrNudStartRow.SetLinkedDisplayControl(lblStartPos) + + ucrBase.clsRsyntax.SetBaseRFunction(clsAddColumnFunction) End Sub - Private Sub ReopenDialog() - ucrDataFramesList.Reset() - If rdoInsertRows.Checked Then - If nudPos.Value = ucrDataFramesList.iDataFrameLength Then - nudPos.Value = ucrDataFramesList.iDataFrameLength - ucrBase.clsRsyntax.AddParameter("number_rows", nudNumCols.Value) - End If - Else - End If - End Sub + 'Private Sub ReopenDialog() + ' ucrDataFramesList.Reset() + ' If rdoInsertRows.Checked Then + ' If nudPos.Value = ucrDataFramesList.iDataFrameLength Then + ' nudPos.Value = ucrDataFramesList.iDataFrameLength + ' ucrBase.clsRsyntax.AddParameter("number_rows", nudNumCols.Value) + ' End If + ' Else + ' End If + 'End Sub Private Sub SetDefaults() clsAddColumnFunction = New RFunction clsInsertRowFunction = New RFunction - clsAddColumnFunction.SetRCommand("$add_columns_to_data") - clsInsertRowFunction.SetRCommand("$insert_row_in_data") + clsAddColumnFunction.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$add_columns_to_data") + clsInsertRowFunction.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$insert_row_in_data") ucrSelectorInsertColumns.Reset() - rdoInsertColumns.Checked = True + 'rdoInsertColumns.Checked = True ucrInputPrefixForInsertedColumns.SetName("X") ucrInputDefaultValue.SetName("NA") ucrDataFramesList.Reset() 'RowsOrColumns() - rdoAtEnd.Checked = True - rdoAfter.Checked = True + 'rdoAtEnd.Checked = True + 'rdoAfter.Checked = True ucrInputBeforeAfter.SetName("After") - If ucrDataFramesList.iDataFrameLength >= nudPos.Minimum AndAlso ucrDataFramesList.iDataFrameLength <= nudPos.Maximum Then - nudPos.Value = ucrDataFramesList.iDataFrameLength - Else - nudPos.Value = 1 - End If + ''If ucrDataFramesList.iDataFrameLength >= nudPos.Minimum AndAlso ucrDataFramesList.iDataFrameLength <= nudPos.Maximum Then + '' nudPos.Value = ucrDataFramesList.iDataFrameLength + ''Else + '' nudPos.Value = 1 + 'End If End Sub Private Sub SetRCodeForControls(bReset) @@ -87,56 +115,57 @@ Public Class dlgInsertColumn End Sub Private Sub TestOKEnabled() - If rdoInsertColumns.Checked Then - If ((nudInsertColumns.Text <> "") And (Not ucrInputDefaultValue.IsEmpty) And (Not ucrInputPrefixForInsertedColumns.IsEmpty) And (ucrDataFramesList.cboAvailableDataFrames.Text <> "")) Then - ucrBase.OKEnabled(True) - Else - ucrBase.OKEnabled(False) + 'If rdoInsertColumns.Checked Then + ' If ((ucrNudNumberOfColumns.Text <> "") And (Not ucrInputDefaultValue.IsEmpty) And (Not ucrInputPrefixForInsertedColumns.IsEmpty) And (ucrDataFramesList.cboAvailableDataFrames.Text <> "")) Then + ' ucrBase.OKEnabled(True) + ' Else + ' ucrBase.OKEnabled(False) - End If - ElseIf rdoInsertRows.Checked Then - If ((nudNumCols.Text <> "") And (nudPos.Text <> "") And (ucrDataFramesList.cboAvailableDataFrames.Text <> "")) Then - ucrBase.OKEnabled(True) - Else - ucrBase.OKEnabled(False) - End If - Else - ucrBase.OKEnabled(False) - End If + ' End If + 'ElseIf rdoInsertRows.Checked Then + ' If ((ucrNudNumberOfRows.Text <> "") And (ucrNudStartRow.Text <> "") And (ucrDataFramesList.cboAvailableDataFrames.Text <> "")) Then + ' ucrBase.OKEnabled(True) + ' Else + ' ucrBase.OKEnabled(False) + ' End If + 'Else + ' ucrBase.OKEnabled(False) + 'End If + ucrBase.OKEnabled(True) End Sub - Private Sub nudPos_TextChanged(sender As Object, e As EventArgs) Handles nudPos.TextChanged - startpo() - End Sub + 'Private Sub nudPos_TextChanged(sender As Object, e As EventArgs) + ' startpo() + 'End Sub - Private Sub startpo() - If rdoInsertRows.Checked Then - If Not nudPos.Text = "" Then - ucrBase.clsRsyntax.AddParameter("start_row", nudPos.Value) - Else - ucrBase.clsRsyntax.RemoveParameter("start_row") - End If - Else - ucrBase.clsRsyntax.RemoveParameter("start_row") - End If - End Sub + 'Private Sub startpo() + ' If rdoInsertRows.Checked Then + ' If Not nudPos.Text = "" Then + ' ucrBase.clsRsyntax.AddParameter("start_row", nudPos.Value) + ' Else + ' ucrBase.clsRsyntax.RemoveParameter("start_row") + ' End If + ' Else + ' ucrBase.clsRsyntax.RemoveParameter("start_row") + ' End If + 'End Sub - Private Sub nudNumCols_TextChanged(sender As Object, e As EventArgs) Handles nudNumCols.TextChanged - NumberofColumnsOrRows() - TestOKEnabled() - End Sub + 'Private Sub nudNumCols_TextChanged(sender As Object, e As EventArgs) + ' NumberofColumnsOrRows() + ' TestOKEnabled() + 'End Sub - Private Sub NumberofColumnsOrRows() - If rdoInsertRows.Checked Then - If Not nudNumCols.Text = "" Then - ucrBase.clsRsyntax.AddParameter("number_rows", nudNumCols.Value) - Else - ucrBase.clsRsyntax.RemoveParameter("number_rows") - End If - Else - ucrBase.clsRsyntax.RemoveParameter("number_rows") - End If - End Sub + 'Private Sub NumberofColumnsOrRows() + ' If rdoInsertRows.Checked Then + ' If Not nudNumCols.Text = "" Then + ' ucrBase.clsRsyntax.AddParameter("number_rows", nudNumCols.Value) + ' Else + ' ucrBase.clsRsyntax.RemoveParameter("number_rows") + ' End If + ' Else + ' ucrBase.clsRsyntax.RemoveParameter("number_rows") + ' End If + 'End Sub Private Sub ucrBase_ClickReset(sender As Object, e As EventArgs) Handles ucrBase.ClickReset SetDefaults() @@ -152,21 +181,21 @@ Public Class dlgInsertColumn End Sub - Private Sub ucrDataFramesList_DataFrameChanged(sender As Object, e As EventArgs, strPrevDataFrame As String) Handles ucrDataFramesList.DataFrameChanged - dataFrameListMaxMinPos() - End Sub + 'Private Sub ucrDataFramesList_DataFrameChanged(sender As Object, e As EventArgs, strPrevDataFrame As String) Handles ucrDataFramesList.DataFrameChanged + ' dataFrameListMaxMinPos() + 'End Sub - Private Sub dataFrameListMaxMinPos() - If rdoInsertRows.Checked Then - nudPos.Maximum = ucrDataFramesList.iDataFrameLength - nudPos.Value = ucrDataFramesList.iDataFrameLength - Else - End If - End Sub + 'Private Sub dataFrameListMaxMinPos() + ' If rdoInsertRows.Checked Then + ' nudPos.Maximum = ucrDataFramesList.iDataFrameLength + ' nudPos.Value = ucrDataFramesList.iDataFrameLength + ' Else + ' End If + 'End Sub - Private Sub RowsOrColumns_CheckedChanged(sender As Object, e As EventArgs) Handles rdoInsertColumns.CheckedChanged, rdoInsertRows.CheckedChanged - RowsOrColumns() - End Sub + 'Private Sub RowsOrColumns_CheckedChanged(sender As Object, e As EventArgs) Handles rdoInsertColumns.CheckedChanged, rdoInsertRows.CheckedChanged + ' RowsOrColumns() + 'End Sub Private Sub grpOPtions_CheckedChanged(sender As Object, e As EventArgs) Handles rdoBefore.CheckedChanged, rdoAfter.CheckedChanged OPtionstoInsert() @@ -182,72 +211,72 @@ Public Class dlgInsertColumn End If End Sub - Private Sub RowsOrColumns() - If rdoInsertColumns.Checked Then - ucrBase.clsRsyntax.SetFunction(frmMain.clsRLink.strInstatDataObject & "$add_columns_to_data") - ucrBase.clsRsyntax.AddParameter("use_col_name_as_prefix", "TRUE") - BeforeAfterPara() - InsertParam() - ucrBase.clsRsyntax.RemoveParameter("number_rows") - nudInsertColumns.Value = 1 - NumberofColumnsOrRows() - dataFrameListMaxMinPos() - ColName() - grpInsert.Visible = True - grpOPtions.Visible = False - nudInsertColumns.Maximum = 100 - nudNumCols.Visible = False - nudPos.Visible = False - addColumData() - ColsToInsert() - OPtionstoInsert() - 'startpo() - BeforeParameter() - lblPrefixforInsertedColumns.Visible = True - lblDefaultValue.Visible = True - ucrInputPrefixForInsertedColumns.Visible = True - ucrInputDefaultValue.Visible = True - lblNumberOfColumnsToInsert.Visible = True - nudInsertColumns.Visible = True - lblNumberOfRowsToInsert.Visible = False - lblStartPos.Visible = False - nudNumCols.Focus() - nudPos.Focus() - ElseIf rdoInsertRows.Checked Then - ucrBase.clsRsyntax.SetFunction(frmMain.clsRLink.strInstatDataObject & "$insert_row_in_data") - lblNumberOfRowsToInsert.Visible = True - ucrBase.clsRsyntax.RemoveParameter("num_cols") - ucrBase.clsRsyntax.RemoveParameter("use_col_name_as_prefix") - nudNumCols.Value = 1 - NumberofColumnsOrRows() - dataFrameListMaxMinPos() - 'startpo() - nudNumCols.Maximum = 1000 - addColumData() - InsertParam() - BeforeAfterPara() - OPtionstoInsert() - ColsToInsert() - ColName() - BeforeParameter() - ucrSelectorInsertColumns.Visible = False - nudNumCols.Visible = True - nudPos.Visible = True - lblStartPos.Visible = True - lblPrefixforInsertedColumns.Visible = False - lblDefaultValue.Visible = False - ucrInputPrefixForInsertedColumns.Visible = False - ucrInputDefaultValue.Visible = False - lblNumberOfColumnsToInsert.Visible = False - nudInsertColumns.Visible = False - ucrReceiverColumnsToInsert.Visible = False - nudInsertColumns.Focus() - grpInsert.Visible = False - grpOPtions.Visible = True + 'Private Sub RowsOrColumns() + ' If rdoInsertColumns.Checked Then + ' 'ucrBase.clsRsyntax.SetFunction(frmMain.clsRLink.strInstatDataObject & "$add_columns_to_data") + ' ucrBase.clsRsyntax.AddParameter("use_col_name_as_prefix", "TRUE") + ' BeforeAfterPara() + ' InsertParam() + ' ucrBase.clsRsyntax.RemoveParameter("number_rows") + ' 'nudInsertColumns.Value = 1 + ' 'NumberofColumnsOrRows() + ' 'dataFrameListMaxMinPos() + ' 'ColName() + ' 'grpInsert.Visible = True + ' 'grpOPtions.Visible = False + ' 'nudInsertColumns.Maximum = 100 + ' 'nudNumCols.Visible = False + ' 'nudPos.Visible = False + ' addColumData() + ' ColsToInsert() + ' OPtionstoInsert() + ' 'startpo() + ' BeforeParameter() + ' 'lblPrefixforInsertedColumns.Visible = True + ' 'lblDefaultValue.Visible = True + ' 'ucrInputPrefixForInsertedColumns.Visible = True + ' 'ucrInputDefaultValue.Visible = True + ' 'lblNumberOfColumnsToInsert.Visible = True + ' 'nudInsertColumns.Visible = True + ' 'lblNumberOfRowsToInsert.Visible = False + ' 'lblStartPos.Visible = False + ' 'nudNumCols.Focus() + ' 'nudPos.Focus() + ' ElseIf rdoInsertRows.Checked Then + ' 'ucrBase.clsRsyntax.SetFunction(frmMain.clsRLink.strInstatDataObject & "$insert_row_in_data") + ' lblNumberOfRowsToInsert.Visible = True + ' ucrBase.clsRsyntax.RemoveParameter("num_cols") + ' ucrBase.clsRsyntax.RemoveParameter("use_col_name_as_prefix") + ' nudNumCols.Value = 1 + ' NumberofColumnsOrRows() + ' dataFrameListMaxMinPos() + ' 'startpo() + ' nudNumCols.Maximum = 1000 + ' addColumData() + ' InsertParam() + ' BeforeAfterPara() + ' OPtionstoInsert() + ' ColsToInsert() + ' ColName() + ' BeforeParameter() + ' ucrSelectorInsertColumns.Visible = False + ' nudNumCols.Visible = True + ' nudPos.Visible = True + ' lblStartPos.Visible = True + ' lblPrefixforInsertedColumns.Visible = False + ' lblDefaultValue.Visible = False + ' ucrInputPrefixForInsertedColumns.Visible = False + ' ucrInputDefaultValue.Visible = False + ' lblNumberOfColumnsToInsert.Visible = False + ' nudInsertColumns.Visible = False + ' ucrReceiverColumnsToInsert.Visible = False + ' nudInsertColumns.Focus() + ' grpInsert.Visible = False + ' grpOPtions.Visible = True - End If + ' End If - End Sub + 'End Sub Private Sub grpInsert_CheckedChanged(sender As Object, e As EventArgs) Handles rdoAtEnd.CheckedChanged, rdoAtStart.CheckedChanged, rdoBeforeAfter.CheckedChanged InsertParam() @@ -361,21 +390,21 @@ Public Class dlgInsertColumn End If End Sub - Private Sub nudInsertColumns_TextChanged(sender As Object, e As EventArgs) Handles nudInsertColumns.TextChanged - ColsToInsert() - TestOKEnabled() - End Sub + 'Private Sub nudInsertColumns_TextChanged(sender As Object, e As EventArgs) + ' ColsToInsert() + ' TestOKEnabled() + 'End Sub - Private Sub ColsToInsert() - If rdoInsertColumns.Checked Then - If Not nudInsertColumns.Text = "" Then - ucrBase.clsRsyntax.AddParameter("num_cols", nudInsertColumns.Value) - Else - ucrBase.clsRsyntax.RemoveParameter("num_cols") - End If - Else - ucrBase.clsRsyntax.RemoveParameter("num_cols") - End If - End Sub + 'Private Sub ColsToInsert() + ' If rdoInsertColumns.Checked Then + ' If Not nudInsertColumns.Text = "" Then + ' ucrBase.clsRsyntax.AddParameter("num_cols", nudInsertColumns.Value) + ' Else + ' ucrBase.clsRsyntax.RemoveParameter("num_cols") + ' End If + ' Else + ' ucrBase.clsRsyntax.RemoveParameter("num_cols") + ' End If + 'End Sub End Class \ No newline at end of file From 3a7262deeef14ff3342cfaeedaacb1446e6f5a26 Mon Sep 17 00:00:00 2001 From: Stephen Kogo Date: Tue, 23 May 2017 15:13:11 +0300 Subject: [PATCH 031/154] editing reset controls --- instat/dlgClimSoft.vb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/instat/dlgClimSoft.vb b/instat/dlgClimSoft.vb index 98f16458287..e4058e8f637 100644 --- a/instat/dlgClimSoft.vb +++ b/instat/dlgClimSoft.vb @@ -84,10 +84,10 @@ Public Class dlgClimSoft ucrInputEndDate.SetName("") clsRDatabaseConnect.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$database_connect") - clsRDatabaseConnect.AddParameter("dbname", "") - clsRDatabaseConnect.AddParameter("host", "") - clsRDatabaseConnect.AddParameter("user", "") - clsRDatabaseConnect.AddParameter("port", "") + sdgImportFromClimSoft.ucrInputDatabaseName.SetName("") + sdgImportFromClimSoft.ucrInputHost.SetName("") + sdgImportFromClimSoft.ucrInputPort.SetName("") + sdgImportFromClimSoft.ucrInputUserName.SetName("") clsRDatabaseDisconnect.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$database_disconnect") clsRImportFromClimsoft.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$import_from_climsoft") From 38c8d71d2ad9dfb509daa36fa9c16a6a6ef1b231 Mon Sep 17 00:00:00 2001 From: shadrack kibet Date: Tue, 23 May 2017 20:16:21 +0300 Subject: [PATCH 032/154] code additions --- instat/dlgInsertColumn.vb | 33 ++++++++++++++++++++------------- 1 file changed, 20 insertions(+), 13 deletions(-) diff --git a/instat/dlgInsertColumn.vb b/instat/dlgInsertColumn.vb index 7d96139eeb7..a7fcbfccbb8 100644 --- a/instat/dlgInsertColumn.vb +++ b/instat/dlgInsertColumn.vb @@ -43,16 +43,20 @@ Public Class dlgInsertColumn ucrPnlColumnsOrRows.AddRadioButton(rdoInsertColumns) ucrPnlColumnsOrRows.AddRadioButton(rdoInsertRows) - ucrPnlBeforeAfter.AddRadioButton(rdoBefore) - ucrPnlBeforeAfter.AddRadioButton(rdoAfter) + ucrPnlBeforeAfter.SetParameter(New RParameter("before")) + ucrPnlBeforeAfter.AddRadioButton(rdoBefore, "TRUE") + ucrPnlBeforeAfter.AddRadioButton(rdoAfter, "FALSE") ucrPnlStartEnd.AddRadioButton(rdoAtStart) ucrPnlStartEnd.AddRadioButton(rdoAtEnd) ucrPnlStartEnd.AddRadioButton(rdoBeforeAfter) + ucrDataFramesList.SetParameter(New RParameter("data_name")) ucrNudNumberOfRows.SetParameter(New RParameter("number_rows")) ucrNudStartRow.SetParameter(New RParameter("start_row")) - ucrNudNumberOfColumns.SetParameter(New RParameter("number_rows")) + + ucrReceiverColumnsToInsert.SetParameter(New RParameter("adjacent_column")) + 'Setting Display of the group boxes in the dialog @@ -72,16 +76,14 @@ Public Class dlgInsertColumn ucrNudNumberOfRows.SetLinkedDisplayControl(lblNumberOfRowsToInsert) ucrNudStartRow.SetLinkedDisplayControl(lblStartPos) - ucrBase.clsRsyntax.SetBaseRFunction(clsAddColumnFunction) - End Sub - 'Private Sub ReopenDialog() + 'Private Sub reopendialog() ' ucrDataFramesList.Reset() ' If rdoInsertRows.Checked Then - ' If nudPos.Value = ucrDataFramesList.iDataFrameLength Then - ' nudPos.Value = ucrDataFramesList.iDataFrameLength - ' ucrBase.clsRsyntax.AddParameter("number_rows", nudNumCols.Value) + ' If nudpos.value = ucrDataFramesList.iDataFrameLength Then + ' nudpos.value = ucrDataFramesList.iDataFrameLength + ' ucrBase.clsRsyntax.AddParameter("number_rows", nudnumcols.value) ' End If ' Else ' End If @@ -95,6 +97,10 @@ Public Class dlgInsertColumn clsInsertRowFunction.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$insert_row_in_data") ucrSelectorInsertColumns.Reset() + ucrNudNumberOfRows.SetRDefault(1) + + ucrBase.clsRsyntax.SetBaseRFunction(clsInsertRowFunction) + 'rdoInsertColumns.Checked = True ucrInputPrefixForInsertedColumns.SetName("X") ucrInputDefaultValue.SetName("NA") @@ -111,7 +117,8 @@ Public Class dlgInsertColumn End Sub Private Sub SetRCodeForControls(bReset) - + ucrNudNumberOfRows.SetRCode(clsInsertRowFunction, bReset) + ucrNudStartRow.SetRCode(clsInsertRowFunction, bReset) End Sub Private Sub TestOKEnabled() @@ -155,10 +162,10 @@ Public Class dlgInsertColumn ' TestOKEnabled() 'End Sub - 'Private Sub NumberofColumnsOrRows() + 'Private Sub numberofcolumnsorrows() ' If rdoInsertRows.Checked Then - ' If Not nudNumCols.Text = "" Then - ' ucrBase.clsRsyntax.AddParameter("number_rows", nudNumCols.Value) + ' If Not nudnumcols.text = "" Then + ' ucrBase.clsRsyntax.AddParameter("number_rows", nudnumcols.value) ' Else ' ucrBase.clsRsyntax.RemoveParameter("number_rows") ' End If From 3f4af8899a7f8689fca294d72fead5d1451b45c1 Mon Sep 17 00:00:00 2001 From: shadrack kibet Date: Tue, 23 May 2017 22:10:04 +0300 Subject: [PATCH 033/154] Insertcolumn parameters set --- instat/dlgInsertColumn.vb | 52 +++++++++++++++++++++------------------ 1 file changed, 28 insertions(+), 24 deletions(-) diff --git a/instat/dlgInsertColumn.vb b/instat/dlgInsertColumn.vb index a7fcbfccbb8..13395bceb78 100644 --- a/instat/dlgInsertColumn.vb +++ b/instat/dlgInsertColumn.vb @@ -18,7 +18,7 @@ Imports instat.Translations Public Class dlgInsertColumn Private bFirstload As Boolean = True Private bReset As Boolean = True - Private clsInsertRowFunction, clsAddColumnFunction As New RFunction + Private clsInsertRowFunction, clsInsertColumnFunction As New RFunction Private Sub dlgInsertColumn_Load(sender As Object, e As EventArgs) Handles MyBase.Load If bFirstload Then InitialiseDialog() @@ -37,7 +37,7 @@ Public Class dlgInsertColumn ucrBase.iHelpTopicID = 164 ucrReceiverColumnsToInsert.Selector = ucrSelectorInsertColumns ucrReceiverColumnsToInsert.SetMeAsReceiver() - ucrInputBeforeAfter.SetItems({"Before", "After"}) + 'ucrInputBeforeAfter.SetItems({"Before", "After"}) ucrInputPrefixForInsertedColumns.SetValidationTypeAsRVariable() ucrPnlColumnsOrRows.AddRadioButton(rdoInsertColumns) @@ -52,6 +52,7 @@ Public Class dlgInsertColumn ucrPnlStartEnd.AddRadioButton(rdoBeforeAfter) ucrDataFramesList.SetParameter(New RParameter("data_name")) + ucrDataFramesList.SetParameterIsString() ucrNudNumberOfRows.SetParameter(New RParameter("number_rows")) ucrNudStartRow.SetParameter(New RParameter("start_row")) @@ -90,16 +91,17 @@ Public Class dlgInsertColumn 'End Sub Private Sub SetDefaults() - clsAddColumnFunction = New RFunction + clsInsertColumnFunction = New RFunction clsInsertRowFunction = New RFunction - clsAddColumnFunction.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$add_columns_to_data") + clsInsertColumnFunction.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$add_columns_to_data") clsInsertRowFunction.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$insert_row_in_data") ucrSelectorInsertColumns.Reset() ucrNudNumberOfRows.SetRDefault(1) ucrBase.clsRsyntax.SetBaseRFunction(clsInsertRowFunction) + clsInsertRowFunction.AddParameter("start_row", ucrDataFramesList.iDataFrameLength) 'rdoInsertColumns.Checked = True ucrInputPrefixForInsertedColumns.SetName("X") @@ -119,6 +121,8 @@ Public Class dlgInsertColumn Private Sub SetRCodeForControls(bReset) ucrNudNumberOfRows.SetRCode(clsInsertRowFunction, bReset) ucrNudStartRow.SetRCode(clsInsertRowFunction, bReset) + ucrDataFramesList.SetRCode(clsInsertRowFunction, bReset) + ucrPnlBeforeAfter.SetRCode(clsInsertRowFunction, bReset) End Sub Private Sub TestOKEnabled() @@ -178,14 +182,14 @@ Public Class dlgInsertColumn SetDefaults() SetRCodeForControls(True) TestOKEnabled() - End Sub - - Private Sub ucrDataFramesList_DataFrameChanged() Handles ucrDataFramesList.DataFrameChanged - ucrBase.clsRsyntax.AddParameter("data_name", Chr(34) & ucrDataFramesList.cboAvailableDataFrames.SelectedItem & Chr(34)) - ucrSelectorInsertColumns.strCurrentDataFrame = ucrDataFramesList.cboAvailableDataFrames.SelectedItem - ucrSelectorInsertColumns.LoadList() - TestOKEnabled() - End Sub + End Sub + + 'Private Sub ucrDataFramesList_DataFrameChanged() Handles ucrDataFramesList.DataFrameChanged + 'ucrBase.clsRsyntax.AddParameter("data_name", Chr(34) & ucrDataFramesList.cboAvailableDataFrames.SelectedItem & Chr(34)) + 'ucrSelectorInsertColumns.strCurrentDataFrame = ucrDataFramesList.cboAvailableDataFrames.SelectedItem + 'ucrSelectorInsertColumns.LoadList() + 'TestOKEnabled() + 'End Sub 'Private Sub ucrDataFramesList_DataFrameChanged(sender As Object, e As EventArgs, strPrevDataFrame As String) Handles ucrDataFramesList.DataFrameChanged @@ -204,19 +208,19 @@ Public Class dlgInsertColumn ' RowsOrColumns() 'End Sub - Private Sub grpOPtions_CheckedChanged(sender As Object, e As EventArgs) Handles rdoBefore.CheckedChanged, rdoAfter.CheckedChanged - OPtionstoInsert() - End Sub + 'Private Sub grpOPtions_CheckedChanged(sender As Object, e As EventArgs) Handles rdoBefore.CheckedChanged, rdoAfter.CheckedChanged + ' OPtionstoInsert() + 'End Sub - Private Sub OPtionstoInsert() - If rdoInsertRows.Checked Then - If rdoAfter.Checked Then - ucrBase.clsRsyntax.AddParameter("before", "FALSE") - ElseIf rdoBefore.Checked Then - ucrBase.clsRsyntax.AddParameter("before", "TRUE") - End If - End If - End Sub + 'Private Sub OPtionstoInsert() + ' If rdoInsertRows.Checked Then + ' If rdoAfter.Checked Then + ' ucrBase.clsRsyntax.AddParameter("before", "FALSE") + ' ElseIf rdoBefore.Checked Then + ' ucrBase.clsRsyntax.AddParameter("before", "TRUE") + ' End If + ' End If + 'End Sub 'Private Sub RowsOrColumns() ' If rdoInsertColumns.Checked Then From 1bd14f03d22ab79a3ba1b6c38c06de2432b3b35a Mon Sep 17 00:00:00 2001 From: shadrack kibet Date: Tue, 23 May 2017 22:58:32 +0300 Subject: [PATCH 034/154] code and designer additions --- instat/dlgInsertColumn.Designer.vb | 26 +++--- instat/dlgInsertColumn.vb | 145 ++++++++++++++++------------- 2 files changed, 93 insertions(+), 78 deletions(-) diff --git a/instat/dlgInsertColumn.Designer.vb b/instat/dlgInsertColumn.Designer.vb index f0de26f02ea..49f14583d50 100644 --- a/instat/dlgInsertColumn.Designer.vb +++ b/instat/dlgInsertColumn.Designer.vb @@ -79,7 +79,7 @@ Partial Class dlgInsertColumn Me.grpInsert.Controls.Add(Me.ucrReceiverColumnsToInsert) Me.grpInsert.Controls.Add(Me.rdoAtEnd) Me.grpInsert.Controls.Add(Me.ucrPnlStartEnd) - Me.grpInsert.Location = New System.Drawing.Point(266, 73) + Me.grpInsert.Location = New System.Drawing.Point(233, 73) Me.grpInsert.Name = "grpInsert" Me.grpInsert.Size = New System.Drawing.Size(215, 107) Me.grpInsert.TabIndex = 10 @@ -98,7 +98,7 @@ Partial Class dlgInsertColumn 'rdoAtStart ' Me.rdoAtStart.AutoSize = True - Me.rdoAtStart.Location = New System.Drawing.Point(6, 47) + Me.rdoAtStart.Location = New System.Drawing.Point(6, 50) Me.rdoAtStart.Name = "rdoAtStart" Me.rdoAtStart.Size = New System.Drawing.Size(60, 17) Me.rdoAtStart.TabIndex = 1 @@ -109,7 +109,7 @@ Partial Class dlgInsertColumn 'rdoBeforeAfter ' Me.rdoBeforeAfter.AutoSize = True - Me.rdoBeforeAfter.Location = New System.Drawing.Point(6, 79) + Me.rdoBeforeAfter.Location = New System.Drawing.Point(6, 85) Me.rdoBeforeAfter.Name = "rdoBeforeAfter" Me.rdoBeforeAfter.Size = New System.Drawing.Size(14, 13) Me.rdoBeforeAfter.TabIndex = 2 @@ -119,7 +119,7 @@ Partial Class dlgInsertColumn 'ucrReceiverColumnsToInsert ' Me.ucrReceiverColumnsToInsert.frmParent = Me - Me.ucrReceiverColumnsToInsert.Location = New System.Drawing.Point(129, 74) + Me.ucrReceiverColumnsToInsert.Location = New System.Drawing.Point(130, 75) Me.ucrReceiverColumnsToInsert.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverColumnsToInsert.Name = "ucrReceiverColumnsToInsert" Me.ucrReceiverColumnsToInsert.Selector = Nothing @@ -149,7 +149,7 @@ Partial Class dlgInsertColumn 'lblNumberOfColumnsToInsert ' Me.lblNumberOfColumnsToInsert.AutoSize = True - Me.lblNumberOfColumnsToInsert.Location = New System.Drawing.Point(263, 183) + Me.lblNumberOfColumnsToInsert.Location = New System.Drawing.Point(232, 184) Me.lblNumberOfColumnsToInsert.Name = "lblNumberOfColumnsToInsert" Me.lblNumberOfColumnsToInsert.Size = New System.Drawing.Size(143, 13) Me.lblNumberOfColumnsToInsert.TabIndex = 11 @@ -158,7 +158,7 @@ Partial Class dlgInsertColumn 'lblDefaultValue ' Me.lblDefaultValue.AutoSize = True - Me.lblDefaultValue.Location = New System.Drawing.Point(264, 208) + Me.lblDefaultValue.Location = New System.Drawing.Point(233, 208) Me.lblDefaultValue.Name = "lblDefaultValue" Me.lblDefaultValue.Size = New System.Drawing.Size(74, 13) Me.lblDefaultValue.TabIndex = 13 @@ -178,7 +178,7 @@ Partial Class dlgInsertColumn Me.grpOPtions.Controls.Add(Me.rdoAfter) Me.grpOPtions.Controls.Add(Me.rdoBefore) Me.grpOPtions.Controls.Add(Me.ucrPnlBeforeAfter) - Me.grpOPtions.Location = New System.Drawing.Point(268, 63) + Me.grpOPtions.Location = New System.Drawing.Point(451, 73) Me.grpOPtions.Name = "grpOPtions" Me.grpOPtions.Size = New System.Drawing.Size(124, 82) Me.grpOPtions.TabIndex = 9 @@ -268,7 +268,7 @@ Partial Class dlgInsertColumn Me.ucrInputDefaultValue.AddQuotesIfUnrecognised = True Me.ucrInputDefaultValue.IsMultiline = False Me.ucrInputDefaultValue.IsReadOnly = False - Me.ucrInputDefaultValue.Location = New System.Drawing.Point(408, 204) + Me.ucrInputDefaultValue.Location = New System.Drawing.Point(374, 204) Me.ucrInputDefaultValue.Name = "ucrInputDefaultValue" Me.ucrInputDefaultValue.Size = New System.Drawing.Size(45, 21) Me.ucrInputDefaultValue.TabIndex = 14 @@ -276,7 +276,7 @@ Partial Class dlgInsertColumn 'ucrSelectorInsertColumns ' Me.ucrSelectorInsertColumns.bShowHiddenColumns = False - Me.ucrSelectorInsertColumns.Location = New System.Drawing.Point(20, 151) + Me.ucrSelectorInsertColumns.Location = New System.Drawing.Point(9, 93) Me.ucrSelectorInsertColumns.Margin = New System.Windows.Forms.Padding(0) Me.ucrSelectorInsertColumns.Name = "ucrSelectorInsertColumns" Me.ucrSelectorInsertColumns.Size = New System.Drawing.Size(202, 148) @@ -326,7 +326,7 @@ Partial Class dlgInsertColumn ' Me.ucrNudNumberOfColumns.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudNumberOfColumns.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudNumberOfColumns.Location = New System.Drawing.Point(408, 180) + Me.ucrNudNumberOfColumns.Location = New System.Drawing.Point(373, 180) Me.ucrNudNumberOfColumns.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) Me.ucrNudNumberOfColumns.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudNumberOfColumns.Name = "ucrNudNumberOfColumns" @@ -338,10 +338,8 @@ Partial Class dlgInsertColumn ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(490, 384) + Me.ClientSize = New System.Drawing.Size(580, 384) Me.Controls.Add(Me.ucrNudNumberOfColumns) - Me.Controls.Add(Me.ucrNudStartRow) - Me.Controls.Add(Me.ucrNudNumberOfRows) Me.Controls.Add(Me.rdoInsertRows) Me.Controls.Add(Me.rdoInsertColumns) Me.Controls.Add(Me.grpOPtions) @@ -357,6 +355,8 @@ Partial Class dlgInsertColumn Me.Controls.Add(Me.lblNumberOfRowsToInsert) Me.Controls.Add(Me.ucrBase) Me.Controls.Add(Me.ucrDataFramesList) + Me.Controls.Add(Me.ucrNudNumberOfRows) + Me.Controls.Add(Me.ucrNudStartRow) Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow Me.MaximizeBox = False Me.MinimizeBox = False diff --git a/instat/dlgInsertColumn.vb b/instat/dlgInsertColumn.vb index 13395bceb78..8b543ea321d 100644 --- a/instat/dlgInsertColumn.vb +++ b/instat/dlgInsertColumn.vb @@ -47,6 +47,11 @@ Public Class dlgInsertColumn ucrPnlBeforeAfter.AddRadioButton(rdoBefore, "TRUE") ucrPnlBeforeAfter.AddRadioButton(rdoAfter, "FALSE") + ucrPnlStartEnd.SetParameter(New RParameter("before")) + ucrPnlStartEnd.AddRadioButton(rdoAtEnd, "TRUE") + ucrPnlStartEnd.AddRadioButton(rdoAtStart, "FALSE") + ucrPnlStartEnd.AddRadioButton(rdoBeforeAfter, "FALSE") + ucrPnlStartEnd.AddRadioButton(rdoAtStart) ucrPnlStartEnd.AddRadioButton(rdoAtEnd) ucrPnlStartEnd.AddRadioButton(rdoBeforeAfter) @@ -57,8 +62,13 @@ Public Class dlgInsertColumn ucrNudStartRow.SetParameter(New RParameter("start_row")) ucrReceiverColumnsToInsert.SetParameter(New RParameter("adjacent_column")) + ucrNudNumberOfColumns.SetParameter(New RParameter("num_cols")) - + Dim dctBeforeAfter As New Dictionary(Of String, String) + dctBeforeAfter.Add("Before", 1) + dctBeforeAfter.Add("After", 2) + ucrInputBeforeAfter.SetItems(dctBeforeAfter) + ucrInputBeforeAfter.SetRDefault(1) 'Setting Display of the group boxes in the dialog ucrPnlColumnsOrRows.AddToLinkedControls(ucrPnlStartEnd, {rdoInsertColumns}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) @@ -70,6 +80,7 @@ Public Class dlgInsertColumn ucrPnlColumnsOrRows.AddToLinkedControls(ucrPnlBeforeAfter, {rdoInsertRows}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) ucrPnlColumnsOrRows.AddToLinkedControls(ucrNudNumberOfRows, {rdoInsertRows}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) ucrPnlColumnsOrRows.AddToLinkedControls(ucrNudStartRow, {rdoInsertRows}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) + ucrPnlStartEnd.AddToLinkedControls(ucrSelectorInsertColumns, {rdoBeforeAfter}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) 'ucrSelectorInsertColumns.AddToLinkedControls(ucrNudStartRow, {rdoInsertRows}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) ucrNudNumberOfColumns.SetLinkedDisplayControl(lblNumberOfColumnsToInsert) @@ -99,18 +110,20 @@ Public Class dlgInsertColumn ucrSelectorInsertColumns.Reset() ucrNudNumberOfRows.SetRDefault(1) + ucrNudNumberOfColumns.SetRDefault(1) + ucrInputDefaultValue.SetRDefault("NA") ucrBase.clsRsyntax.SetBaseRFunction(clsInsertRowFunction) clsInsertRowFunction.AddParameter("start_row", ucrDataFramesList.iDataFrameLength) 'rdoInsertColumns.Checked = True ucrInputPrefixForInsertedColumns.SetName("X") - ucrInputDefaultValue.SetName("NA") + 'ucrInputDefaultValue.SetName("NA") ucrDataFramesList.Reset() 'RowsOrColumns() 'rdoAtEnd.Checked = True 'rdoAfter.Checked = True - ucrInputBeforeAfter.SetName("After") + 'ucrInputBeforeAfter.SetName("After") ''If ucrDataFramesList.iDataFrameLength >= nudPos.Minimum AndAlso ucrDataFramesList.iDataFrameLength <= nudPos.Maximum Then '' nudPos.Value = ucrDataFramesList.iDataFrameLength ''Else @@ -123,6 +136,8 @@ Public Class dlgInsertColumn ucrNudStartRow.SetRCode(clsInsertRowFunction, bReset) ucrDataFramesList.SetRCode(clsInsertRowFunction, bReset) ucrPnlBeforeAfter.SetRCode(clsInsertRowFunction, bReset) + ucrPnlStartEnd.SetRCode(clsInsertColumnFunction, bReset) + ucrNudNumberOfColumns.SetRCode(clsInsertColumnFunction, bReset) End Sub Private Sub TestOKEnabled() @@ -289,73 +304,73 @@ Public Class dlgInsertColumn 'End Sub - Private Sub grpInsert_CheckedChanged(sender As Object, e As EventArgs) Handles rdoAtEnd.CheckedChanged, rdoAtStart.CheckedChanged, rdoBeforeAfter.CheckedChanged - InsertParam() - End Sub + 'Private Sub grpInsert_CheckedChanged(sender As Object, e As EventArgs) Handles rdoAtEnd.CheckedChanged, rdoAtStart.CheckedChanged, rdoBeforeAfter.CheckedChanged + ' InsertParam() + 'End Sub - Private Sub InsertParam() - If rdoAtEnd.Checked Then - ucrBase.clsRsyntax.AddParameter("before", "FALSE") - ucrBase.clsRsyntax.RemoveParameter("adjacent_column") - ucrReceiverColumnsToInsert.Visible = False - ucrSelectorInsertColumns.Visible = False - ElseIf rdoAtStart.Checked Then - ucrBase.clsRsyntax.AddParameter("before", "TRUE") - ucrBase.clsRsyntax.RemoveParameter("adjacent_column") - ucrReceiverColumnsToInsert.Visible = False - ucrSelectorInsertColumns.Visible = False - Else - ucrReceiverColumnsToInsert.Visible = True - ucrSelectorInsertColumns.Visible = True - End If - If rdoBeforeAfter.Checked Then - ucrInputBeforeAfter.Enabled = True - Else - ucrInputBeforeAfter.Enabled = False - ucrReceiverColumnsToInsert.Clear() - End If - BeforeParameter() - End Sub + 'Private Sub InsertParam() + ' If rdoAtEnd.Checked Then + ' ucrBase.clsRsyntax.AddParameter("before", "FALSE") + ' ucrBase.clsRsyntax.RemoveParameter("adjacent_column") + ' ucrReceiverColumnsToInsert.Visible = False + ' ucrSelectorInsertColumns.Visible = False + ' ElseIf rdoAtStart.Checked Then + ' ucrBase.clsRsyntax.AddParameter("before", "TRUE") + ' ucrBase.clsRsyntax.RemoveParameter("adjacent_column") + ' ucrReceiverColumnsToInsert.Visible = False + ' ucrSelectorInsertColumns.Visible = False + ' Else + ' ucrReceiverColumnsToInsert.Visible = True + ' ucrSelectorInsertColumns.Visible = True + ' End If + ' If rdoBeforeAfter.Checked Then + ' ucrInputBeforeAfter.Enabled = True + ' Else + ' ucrInputBeforeAfter.Enabled = False + ' ucrReceiverColumnsToInsert.Clear() + ' End If + ' BeforeParameter() + 'End Sub - Private Sub ucrInputBeforeAfter_NameChanged() Handles ucrInputBeforeAfter.NameChanged - BeforeParameter() - End Sub + 'Private Sub ucrInputBeforeAfter_NameChanged() Handles ucrInputBeforeAfter.NameChanged + ' BeforeParameter() + 'End Sub - Private Sub BeforeParameter() - If rdoInsertColumns.Checked Then - If rdoBeforeAfter.Checked Then - Select Case ucrInputBeforeAfter.GetText - Case "Before" - ucrBase.clsRsyntax.AddParameter("before", "TRUE") - Case Else - ucrBase.clsRsyntax.AddParameter("before", "FALSE") - End Select - End If - Else - ucrBase.clsRsyntax.RemoveParameter("before") - End If - End Sub + 'Private Sub BeforeParameter() + ' If rdoInsertColumns.Checked Then + ' If rdoBeforeAfter.Checked Then + ' Select Case ucrInputBeforeAfter.GetText + ' Case "Before" + ' ucrBase.clsRsyntax.AddParameter("before", "TRUE") + ' Case Else + ' ucrBase.clsRsyntax.AddParameter("before", "FALSE") + ' End Select + ' End If + ' Else + ' ucrBase.clsRsyntax.RemoveParameter("before") + ' End If + 'End Sub - Private Sub ucrReceiverColumnsToInsert_SelectionChanged(sender As Object, e As EventArgs) Handles ucrReceiverColumnsToInsert.SelectionChanged - BeforeAfterPara() - TestOKEnabled() - End Sub + 'Private Sub ucrReceiverColumnsToInsert_SelectionChanged(sender As Object, e As EventArgs) Handles ucrReceiverColumnsToInsert.SelectionChanged + ' BeforeAfterPara() + ' TestOKEnabled() + 'End Sub - Private Sub BeforeAfterPara() - If rdoInsertColumns.Checked Then - If rdoBeforeAfter.Checked Then - If Not ucrReceiverColumnsToInsert.IsEmpty Then - ucrBase.clsRsyntax.AddParameter("adjacent_column", ucrReceiverColumnsToInsert.GetVariableNames()) - Else - ucrBase.clsRsyntax.RemoveParameter("adjacent_column") - End If - Else - ucrBase.clsRsyntax.RemoveParameter("adjacent_column") - End If - Else - ucrBase.clsRsyntax.RemoveParameter("adjacent_column") - End If - End Sub + 'Private Sub BeforeAfterPara() + ' If rdoInsertColumns.Checked Then + ' If rdoBeforeAfter.Checked Then + ' If Not ucrReceiverColumnsToInsert.IsEmpty Then + ' ucrBase.clsRsyntax.AddParameter("adjacent_column", ucrReceiverColumnsToInsert.GetVariableNames()) + ' Else + ' ucrBase.clsRsyntax.RemoveParameter("adjacent_column") + ' End If + ' Else + ' ucrBase.clsRsyntax.RemoveParameter("adjacent_column") + ' End If + ' Else + ' ucrBase.clsRsyntax.RemoveParameter("adjacent_column") + ' End If + 'End Sub Private Sub ucrInputDefaultValue_NameChanged() Handles ucrInputDefaultValue.NameChanged addColumData() From 8075b38b276e82ce07c0b52f05fd1b24916d343f Mon Sep 17 00:00:00 2001 From: shadrack kibet Date: Wed, 24 May 2017 18:40:55 +0300 Subject: [PATCH 035/154] edits --- instat/dlgInsertColumn.Designer.vb | 83 ++++++--------- instat/dlgInsertColumn.vb | 165 +++++++++++++++-------------- 2 files changed, 121 insertions(+), 127 deletions(-) diff --git a/instat/dlgInsertColumn.Designer.vb b/instat/dlgInsertColumn.Designer.vb index 49f14583d50..cdc5ea84879 100644 --- a/instat/dlgInsertColumn.Designer.vb +++ b/instat/dlgInsertColumn.Designer.vb @@ -33,22 +33,21 @@ Partial Class dlgInsertColumn Me.ucrPnlStartEnd = New instat.UcrPanel() Me.lblNumberOfColumnsToInsert = New System.Windows.Forms.Label() Me.lblDefaultValue = New System.Windows.Forms.Label() - Me.lblPrefixforInsertedColumns = New System.Windows.Forms.Label() Me.grpOPtions = New System.Windows.Forms.GroupBox() Me.rdoAfter = New System.Windows.Forms.RadioButton() Me.rdoBefore = New System.Windows.Forms.RadioButton() Me.ucrPnlBeforeAfter = New instat.UcrPanel() Me.rdoInsertColumns = New System.Windows.Forms.RadioButton() Me.rdoInsertRows = New System.Windows.Forms.RadioButton() + Me.ucrSaveInsertColumn = New instat.ucrSave() + Me.ucrNudNumberOfColumns = New instat.ucrNud() Me.ucrPnlColumnsOrRows = New instat.UcrPanel() - Me.ucrInputPrefixForInsertedColumns = New instat.ucrInputTextBox() Me.ucrInputDefaultValue = New instat.ucrInputTextBox() Me.ucrSelectorInsertColumns = New instat.ucrSelectorAddRemove() Me.ucrBase = New instat.ucrButtons() Me.ucrDataFramesList = New instat.ucrDataFrame() Me.ucrNudNumberOfRows = New instat.ucrNud() Me.ucrNudStartRow = New instat.ucrNud() - Me.ucrNudNumberOfColumns = New instat.ucrNud() Me.grpInsert.SuspendLayout() Me.grpOPtions.SuspendLayout() Me.SuspendLayout() @@ -81,7 +80,7 @@ Partial Class dlgInsertColumn Me.grpInsert.Controls.Add(Me.ucrPnlStartEnd) Me.grpInsert.Location = New System.Drawing.Point(233, 73) Me.grpInsert.Name = "grpInsert" - Me.grpInsert.Size = New System.Drawing.Size(215, 107) + Me.grpInsert.Size = New System.Drawing.Size(212, 101) Me.grpInsert.TabIndex = 10 Me.grpInsert.TabStop = False Me.grpInsert.Text = "Insert" @@ -90,7 +89,7 @@ Partial Class dlgInsertColumn ' Me.ucrInputBeforeAfter.AddQuotesIfUnrecognised = True Me.ucrInputBeforeAfter.IsReadOnly = False - Me.ucrInputBeforeAfter.Location = New System.Drawing.Point(26, 75) + Me.ucrInputBeforeAfter.Location = New System.Drawing.Point(37, 66) Me.ucrInputBeforeAfter.Name = "ucrInputBeforeAfter" Me.ucrInputBeforeAfter.Size = New System.Drawing.Size(93, 21) Me.ucrInputBeforeAfter.TabIndex = 3 @@ -98,7 +97,7 @@ Partial Class dlgInsertColumn 'rdoAtStart ' Me.rdoAtStart.AutoSize = True - Me.rdoAtStart.Location = New System.Drawing.Point(6, 50) + Me.rdoAtStart.Location = New System.Drawing.Point(18, 42) Me.rdoAtStart.Name = "rdoAtStart" Me.rdoAtStart.Size = New System.Drawing.Size(60, 17) Me.rdoAtStart.TabIndex = 1 @@ -109,7 +108,7 @@ Partial Class dlgInsertColumn 'rdoBeforeAfter ' Me.rdoBeforeAfter.AutoSize = True - Me.rdoBeforeAfter.Location = New System.Drawing.Point(6, 85) + Me.rdoBeforeAfter.Location = New System.Drawing.Point(17, 70) Me.rdoBeforeAfter.Name = "rdoBeforeAfter" Me.rdoBeforeAfter.Size = New System.Drawing.Size(14, 13) Me.rdoBeforeAfter.TabIndex = 2 @@ -119,7 +118,7 @@ Partial Class dlgInsertColumn 'ucrReceiverColumnsToInsert ' Me.ucrReceiverColumnsToInsert.frmParent = Me - Me.ucrReceiverColumnsToInsert.Location = New System.Drawing.Point(130, 75) + Me.ucrReceiverColumnsToInsert.Location = New System.Drawing.Point(134, 68) Me.ucrReceiverColumnsToInsert.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverColumnsToInsert.Name = "ucrReceiverColumnsToInsert" Me.ucrReceiverColumnsToInsert.Selector = Nothing @@ -131,7 +130,7 @@ Partial Class dlgInsertColumn 'rdoAtEnd ' Me.rdoAtEnd.AutoSize = True - Me.rdoAtEnd.Location = New System.Drawing.Point(6, 19) + Me.rdoAtEnd.Location = New System.Drawing.Point(18, 21) Me.rdoAtEnd.Name = "rdoAtEnd" Me.rdoAtEnd.Size = New System.Drawing.Size(57, 17) Me.rdoAtEnd.TabIndex = 0 @@ -141,9 +140,9 @@ Partial Class dlgInsertColumn ' 'ucrPnlStartEnd ' - Me.ucrPnlStartEnd.Location = New System.Drawing.Point(6, 14) + Me.ucrPnlStartEnd.Location = New System.Drawing.Point(5, 14) Me.ucrPnlStartEnd.Name = "ucrPnlStartEnd" - Me.ucrPnlStartEnd.Size = New System.Drawing.Size(78, 88) + Me.ucrPnlStartEnd.Size = New System.Drawing.Size(78, 81) Me.ucrPnlStartEnd.TabIndex = 22 ' 'lblNumberOfColumnsToInsert @@ -164,21 +163,12 @@ Partial Class dlgInsertColumn Me.lblDefaultValue.TabIndex = 13 Me.lblDefaultValue.Text = "Default Value:" ' - 'lblPrefixforInsertedColumns - ' - Me.lblPrefixforInsertedColumns.AutoSize = True - Me.lblPrefixforInsertedColumns.Location = New System.Drawing.Point(10, 304) - Me.lblPrefixforInsertedColumns.Name = "lblPrefixforInsertedColumns" - Me.lblPrefixforInsertedColumns.Size = New System.Drawing.Size(141, 13) - Me.lblPrefixforInsertedColumns.TabIndex = 15 - Me.lblPrefixforInsertedColumns.Text = "Prefix for Inserted Column(s):" - ' 'grpOPtions ' Me.grpOPtions.Controls.Add(Me.rdoAfter) Me.grpOPtions.Controls.Add(Me.rdoBefore) Me.grpOPtions.Controls.Add(Me.ucrPnlBeforeAfter) - Me.grpOPtions.Location = New System.Drawing.Point(451, 73) + Me.grpOPtions.Location = New System.Drawing.Point(448, 73) Me.grpOPtions.Name = "grpOPtions" Me.grpOPtions.Size = New System.Drawing.Size(124, 82) Me.grpOPtions.TabIndex = 9 @@ -246,6 +236,25 @@ Partial Class dlgInsertColumn Me.rdoInsertRows.TextAlign = System.Drawing.ContentAlignment.MiddleCenter Me.rdoInsertRows.UseVisualStyleBackColor = True ' + 'ucrSaveInsertColumn + ' + Me.ucrSaveInsertColumn.Location = New System.Drawing.Point(10, 235) + Me.ucrSaveInsertColumn.Name = "ucrSaveInsertColumn" + Me.ucrSaveInsertColumn.Size = New System.Drawing.Size(343, 24) + Me.ucrSaveInsertColumn.TabIndex = 21 + ' + 'ucrNudNumberOfColumns + ' + Me.ucrNudNumberOfColumns.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudNumberOfColumns.Increment = New Decimal(New Integer() {1, 0, 0, 0}) + Me.ucrNudNumberOfColumns.Location = New System.Drawing.Point(373, 180) + Me.ucrNudNumberOfColumns.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) + Me.ucrNudNumberOfColumns.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudNumberOfColumns.Name = "ucrNudNumberOfColumns" + Me.ucrNudNumberOfColumns.Size = New System.Drawing.Size(50, 20) + Me.ucrNudNumberOfColumns.TabIndex = 20 + Me.ucrNudNumberOfColumns.Value = New Decimal(New Integer() {0, 0, 0, 0}) + ' 'ucrPnlColumnsOrRows ' Me.ucrPnlColumnsOrRows.Location = New System.Drawing.Point(132, 11) @@ -253,16 +262,6 @@ Partial Class dlgInsertColumn Me.ucrPnlColumnsOrRows.Size = New System.Drawing.Size(214, 29) Me.ucrPnlColumnsOrRows.TabIndex = 0 ' - 'ucrInputPrefixForInsertedColumns - ' - Me.ucrInputPrefixForInsertedColumns.AddQuotesIfUnrecognised = True - Me.ucrInputPrefixForInsertedColumns.IsMultiline = False - Me.ucrInputPrefixForInsertedColumns.IsReadOnly = False - Me.ucrInputPrefixForInsertedColumns.Location = New System.Drawing.Point(158, 302) - Me.ucrInputPrefixForInsertedColumns.Name = "ucrInputPrefixForInsertedColumns" - Me.ucrInputPrefixForInsertedColumns.Size = New System.Drawing.Size(250, 21) - Me.ucrInputPrefixForInsertedColumns.TabIndex = 16 - ' 'ucrInputDefaultValue ' Me.ucrInputDefaultValue.AddQuotesIfUnrecognised = True @@ -284,7 +283,7 @@ Partial Class dlgInsertColumn ' 'ucrBase ' - Me.ucrBase.Location = New System.Drawing.Point(10, 323) + Me.ucrBase.Location = New System.Drawing.Point(10, 260) Me.ucrBase.Name = "ucrBase" Me.ucrBase.Size = New System.Drawing.Size(410, 53) Me.ucrBase.TabIndex = 17 @@ -322,30 +321,17 @@ Partial Class dlgInsertColumn Me.ucrNudStartRow.TabIndex = 19 Me.ucrNudStartRow.Value = New Decimal(New Integer() {0, 0, 0, 0}) ' - 'ucrNudNumberOfColumns - ' - Me.ucrNudNumberOfColumns.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) - Me.ucrNudNumberOfColumns.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudNumberOfColumns.Location = New System.Drawing.Point(373, 180) - Me.ucrNudNumberOfColumns.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) - Me.ucrNudNumberOfColumns.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) - Me.ucrNudNumberOfColumns.Name = "ucrNudNumberOfColumns" - Me.ucrNudNumberOfColumns.Size = New System.Drawing.Size(50, 20) - Me.ucrNudNumberOfColumns.TabIndex = 20 - Me.ucrNudNumberOfColumns.Value = New Decimal(New Integer() {0, 0, 0, 0}) - ' 'dlgInsertColumn ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(580, 384) + Me.ClientSize = New System.Drawing.Size(574, 325) + Me.Controls.Add(Me.ucrSaveInsertColumn) Me.Controls.Add(Me.ucrNudNumberOfColumns) Me.Controls.Add(Me.rdoInsertRows) Me.Controls.Add(Me.rdoInsertColumns) Me.Controls.Add(Me.grpOPtions) Me.Controls.Add(Me.ucrPnlColumnsOrRows) - Me.Controls.Add(Me.ucrInputPrefixForInsertedColumns) - Me.Controls.Add(Me.lblPrefixforInsertedColumns) Me.Controls.Add(Me.ucrInputDefaultValue) Me.Controls.Add(Me.lblDefaultValue) Me.Controls.Add(Me.lblNumberOfColumnsToInsert) @@ -386,8 +372,6 @@ Partial Class dlgInsertColumn Friend WithEvents lblNumberOfColumnsToInsert As Label Friend WithEvents lblDefaultValue As Label Friend WithEvents ucrInputDefaultValue As ucrInputTextBox - Friend WithEvents lblPrefixforInsertedColumns As Label - Friend WithEvents ucrInputPrefixForInsertedColumns As ucrInputTextBox Friend WithEvents grpOPtions As GroupBox Friend WithEvents rdoAfter As RadioButton Friend WithEvents rdoBefore As RadioButton @@ -399,4 +383,5 @@ Partial Class dlgInsertColumn Friend WithEvents ucrNudNumberOfRows As ucrNud Friend WithEvents ucrPnlBeforeAfter As UcrPanel Friend WithEvents ucrPnlStartEnd As UcrPanel + Friend WithEvents ucrSaveInsertColumn As ucrSave End Class diff --git a/instat/dlgInsertColumn.vb b/instat/dlgInsertColumn.vb index 8b543ea321d..e9a79403fd3 100644 --- a/instat/dlgInsertColumn.vb +++ b/instat/dlgInsertColumn.vb @@ -1,19 +1,19 @@ -' Instat-R -' Copyright (C) 2015 -' -' 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 k -' along with this program. If not, see . - +' Instat-R +' Copyright (C) 2015 +' +' 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 k +' along with this program. If not, see . + Imports instat.Translations Public Class dlgInsertColumn Private bFirstload As Boolean = True @@ -38,7 +38,7 @@ Public Class dlgInsertColumn ucrReceiverColumnsToInsert.Selector = ucrSelectorInsertColumns ucrReceiverColumnsToInsert.SetMeAsReceiver() 'ucrInputBeforeAfter.SetItems({"Before", "After"}) - ucrInputPrefixForInsertedColumns.SetValidationTypeAsRVariable() + 'ucrInputPrefixForInsertedColumns.SetValidationTypeAsRVariable() ucrPnlColumnsOrRows.AddRadioButton(rdoInsertColumns) ucrPnlColumnsOrRows.AddRadioButton(rdoInsertRows) @@ -47,28 +47,29 @@ Public Class dlgInsertColumn ucrPnlBeforeAfter.AddRadioButton(rdoBefore, "TRUE") ucrPnlBeforeAfter.AddRadioButton(rdoAfter, "FALSE") - ucrPnlStartEnd.SetParameter(New RParameter("before")) - ucrPnlStartEnd.AddRadioButton(rdoAtEnd, "TRUE") - ucrPnlStartEnd.AddRadioButton(rdoAtStart, "FALSE") - ucrPnlStartEnd.AddRadioButton(rdoBeforeAfter, "FALSE") - - ucrPnlStartEnd.AddRadioButton(rdoAtStart) - ucrPnlStartEnd.AddRadioButton(rdoAtEnd) - ucrPnlStartEnd.AddRadioButton(rdoBeforeAfter) - ucrDataFramesList.SetParameter(New RParameter("data_name")) ucrDataFramesList.SetParameterIsString() ucrNudNumberOfRows.SetParameter(New RParameter("number_rows")) ucrNudStartRow.SetParameter(New RParameter("start_row")) + ucrNudNumberOfRows.SetRDefault(1) + ucrNudNumberOfColumns.SetRDefault(1) + + ucrPnlStartEnd.SetParameter(New RParameter("before")) + ucrPnlStartEnd.AddRadioButton(rdoAtEnd, "TRUE") + ucrPnlStartEnd.AddRadioButton(rdoAtStart, "FALSE") + 'ucrPnlStartEnd.AddRadioButton(rdoBeforeAfter, "FALSE") ucrReceiverColumnsToInsert.SetParameter(New RParameter("adjacent_column")) ucrNudNumberOfColumns.SetParameter(New RParameter("num_cols")) + ucrInputDefaultValue.SetParameter(New RParameter("col_data")) + ucrSaveInsertColumn.SetParameter(New RParameter("col_name")) + ucrInputDefaultValue.SetRDefault("NA") Dim dctBeforeAfter As New Dictionary(Of String, String) - dctBeforeAfter.Add("Before", 1) - dctBeforeAfter.Add("After", 2) + dctBeforeAfter.Add("Before", "TRUE") + dctBeforeAfter.Add("After", "FALSE") ucrInputBeforeAfter.SetItems(dctBeforeAfter) - ucrInputBeforeAfter.SetRDefault(1) + ucrInputBeforeAfter.SetRDefault("FALSE") 'Setting Display of the group boxes in the dialog ucrPnlColumnsOrRows.AddToLinkedControls(ucrPnlStartEnd, {rdoInsertColumns}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) @@ -77,17 +78,25 @@ Public Class dlgInsertColumn ucrPnlColumnsOrRows.AddToLinkedControls(ucrNudNumberOfColumns, {rdoInsertColumns}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) ucrPnlColumnsOrRows.AddToLinkedControls(ucrInputDefaultValue, {rdoInsertColumns}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) + ucrPnlColumnsOrRows.AddToLinkedControls(ucrSaveInsertColumn, {rdoInsertColumns}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) + ucrPnlColumnsOrRows.AddToLinkedControls(ucrPnlBeforeAfter, {rdoInsertRows}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) ucrPnlColumnsOrRows.AddToLinkedControls(ucrNudNumberOfRows, {rdoInsertRows}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) ucrPnlColumnsOrRows.AddToLinkedControls(ucrNudStartRow, {rdoInsertRows}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) ucrPnlStartEnd.AddToLinkedControls(ucrSelectorInsertColumns, {rdoBeforeAfter}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) + 'ucrSelectorInsertColumns.AddToLinkedControls(ucrNudStartRow, {rdoInsertRows}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) ucrNudNumberOfColumns.SetLinkedDisplayControl(lblNumberOfColumnsToInsert) ucrInputDefaultValue.SetLinkedDisplayControl(lblDefaultValue) ucrNudNumberOfRows.SetLinkedDisplayControl(lblNumberOfRowsToInsert) ucrNudStartRow.SetLinkedDisplayControl(lblStartPos) + ucrSaveInsertColumn.SetPrefix("X") + ucrSaveInsertColumn.SetSaveTypeAsColumn() + ucrSaveInsertColumn.SetIsTextBox() + ucrSaveInsertColumn.SetLabelText("Prefix For New Column:") + End Sub 'Private Sub reopendialog() @@ -104,22 +113,19 @@ Public Class dlgInsertColumn Private Sub SetDefaults() clsInsertColumnFunction = New RFunction clsInsertRowFunction = New RFunction - - clsInsertColumnFunction.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$add_columns_to_data") - clsInsertRowFunction.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$insert_row_in_data") ucrSelectorInsertColumns.Reset() + ucrDataFramesList.Reset() - ucrNudNumberOfRows.SetRDefault(1) - ucrNudNumberOfColumns.SetRDefault(1) - ucrInputDefaultValue.SetRDefault("NA") + clsInsertRowFunction.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$insert_row_in_data") + clsInsertColumnFunction.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$add_columns_to_data") + clsInsertRowFunction.AddParameter("start_row", ucrDataFramesList.iDataFrameLength) ucrBase.clsRsyntax.SetBaseRFunction(clsInsertRowFunction) - clsInsertRowFunction.AddParameter("start_row", ucrDataFramesList.iDataFrameLength) + 'rdoInsertColumns.Checked = True - ucrInputPrefixForInsertedColumns.SetName("X") + 'ucrInputPrefixForInsertedColumns.SetName("X") 'ucrInputDefaultValue.SetName("NA") - ucrDataFramesList.Reset() 'RowsOrColumns() 'rdoAtEnd.Checked = True 'rdoAfter.Checked = True @@ -138,6 +144,9 @@ Public Class dlgInsertColumn ucrPnlBeforeAfter.SetRCode(clsInsertRowFunction, bReset) ucrPnlStartEnd.SetRCode(clsInsertColumnFunction, bReset) ucrNudNumberOfColumns.SetRCode(clsInsertColumnFunction, bReset) + ucrInputDefaultValue.SetRCode(clsInsertColumnFunction, bReset) + ucrSaveInsertColumn.SetRCode(clsInsertColumnFunction, bReset) + ucrReceiverColumnsToInsert.SetRCode(clsInsertColumnFunction, bReset) End Sub Private Sub TestOKEnabled() @@ -372,49 +381,49 @@ Public Class dlgInsertColumn ' End If 'End Sub - Private Sub ucrInputDefaultValue_NameChanged() Handles ucrInputDefaultValue.NameChanged - addColumData() - TestOKEnabled() - End Sub + 'Private Sub ucrInputDefaultValue_NameChanged() Handles ucrInputDefaultValue.NameChanged + ' addColumData() + ' TestOKEnabled() + 'End Sub - Private Sub addColumData() - If rdoInsertColumns.Checked Then - If Not ucrInputDefaultValue.IsEmpty Then - If (ucrInputDefaultValue.GetText.ToLower()) = "true" Then - ucrBase.clsRsyntax.AddParameter("col_data", "TRUE") - ElseIf (ucrInputDefaultValue.GetText.ToLower()) = "false" Then - ucrBase.clsRsyntax.AddParameter("col_data", "FALSE") - ElseIf (ucrInputDefaultValue.GetText.ToLower()) = "na" - ucrBase.clsRsyntax.AddParameter("col_data", "NA") - ElseIf IsNumeric(ucrInputDefaultValue.GetText) Then - ucrBase.clsRsyntax.AddParameter("col_data", ucrInputDefaultValue.GetText) - Else - ucrBase.clsRsyntax.AddParameter("col_data", Chr(34) & ucrInputDefaultValue.GetText & Chr(34)) - End If - Else - ucrBase.clsRsyntax.RemoveParameter("col_data") - End If - Else - ucrBase.clsRsyntax.RemoveParameter("col_data") - End If - End Sub + 'Private Sub addColumData() + ' If rdoInsertColumns.Checked Then + ' If Not ucrInputDefaultValue.IsEmpty Then + ' If (ucrInputDefaultValue.GetText.ToLower()) = "true" Then + ' ucrBase.clsRsyntax.AddParameter("col_data", "TRUE") + ' ElseIf (ucrInputDefaultValue.GetText.ToLower()) = "false" Then + ' ucrBase.clsRsyntax.AddParameter("col_data", "FALSE") + ' ElseIf (ucrInputDefaultValue.GetText.ToLower()) = "na" + ' ucrBase.clsRsyntax.AddParameter("col_data", "NA") + ' ElseIf IsNumeric(ucrInputDefaultValue.GetText) Then + ' ucrBase.clsRsyntax.AddParameter("col_data", ucrInputDefaultValue.GetText) + ' Else + ' ucrBase.clsRsyntax.AddParameter("col_data", Chr(34) & ucrInputDefaultValue.GetText & Chr(34)) + ' End If + ' Else + ' ucrBase.clsRsyntax.RemoveParameter("col_data") + ' End If + ' Else + ' ucrBase.clsRsyntax.RemoveParameter("col_data") + ' End If + 'End Sub - Private Sub ucrInputPrefixForInsertedColumns_NameChanged() Handles ucrInputPrefixForInsertedColumns.NameChanged - ColName() - TestOKEnabled() - End Sub + 'Private Sub ucrInputPrefixForInsertedColumns_NameChanged() Handles ucrInputPrefixForInsertedColumns.NameChanged + ' ColName() + ' TestOKEnabled() + 'End Sub - Private Sub ColName() - If rdoInsertColumns.Checked Then - If Not ucrInputPrefixForInsertedColumns.IsEmpty Then - ucrBase.clsRsyntax.AddParameter("col_name", Chr(34) & ucrInputPrefixForInsertedColumns.GetText & Chr(34)) - Else - ucrBase.clsRsyntax.RemoveParameter("col_name") - End If - Else - ucrBase.clsRsyntax.RemoveParameter("col_name") - End If - End Sub + 'Private Sub ColName() + ' If rdoInsertColumns.Checked Then + ' If Not ucrInputPrefixForInsertedColumns.IsEmpty Then + ' ucrBase.clsRsyntax.AddParameter("col_name", Chr(34) & ucrInputPrefixForInsertedColumns.GetText & Chr(34)) + ' Else + ' ucrBase.clsRsyntax.RemoveParameter("col_name") + ' End If + ' Else + ' ucrBase.clsRsyntax.RemoveParameter("col_name") + ' End If + 'End Sub 'Private Sub nudInsertColumns_TextChanged(sender As Object, e As EventArgs) ' ColsToInsert() From 9d96e6e96631ee18cead3fd7ab893973c4542bab Mon Sep 17 00:00:00 2001 From: shadrack kibet Date: Thu, 25 May 2017 11:16:17 +0300 Subject: [PATCH 036/154] designer and code additions --- instat/dlgInsertColumn.Designer.vb | 71 +++++++++++++++--------------- instat/dlgInsertColumn.vb | 27 +++++++++--- 2 files changed, 56 insertions(+), 42 deletions(-) diff --git a/instat/dlgInsertColumn.Designer.vb b/instat/dlgInsertColumn.Designer.vb index cdc5ea84879..999e4bfb84b 100644 --- a/instat/dlgInsertColumn.Designer.vb +++ b/instat/dlgInsertColumn.Designer.vb @@ -25,11 +25,11 @@ Partial Class dlgInsertColumn Me.lblStartPos = New System.Windows.Forms.Label() Me.lblNumberOfRowsToInsert = New System.Windows.Forms.Label() Me.grpInsert = New System.Windows.Forms.GroupBox() - Me.ucrInputBeforeAfter = New instat.ucrInputComboBox() - Me.rdoAtStart = New System.Windows.Forms.RadioButton() Me.rdoBeforeAfter = New System.Windows.Forms.RadioButton() + Me.ucrInputBeforeAfter = New instat.ucrInputComboBox() Me.ucrReceiverColumnsToInsert = New instat.ucrReceiverSingle() Me.rdoAtEnd = New System.Windows.Forms.RadioButton() + Me.rdoAtStart = New System.Windows.Forms.RadioButton() Me.ucrPnlStartEnd = New instat.UcrPanel() Me.lblNumberOfColumnsToInsert = New System.Windows.Forms.Label() Me.lblDefaultValue = New System.Windows.Forms.Label() @@ -72,53 +72,43 @@ Partial Class dlgInsertColumn ' 'grpInsert ' - Me.grpInsert.Controls.Add(Me.ucrInputBeforeAfter) - Me.grpInsert.Controls.Add(Me.rdoAtStart) Me.grpInsert.Controls.Add(Me.rdoBeforeAfter) + Me.grpInsert.Controls.Add(Me.ucrInputBeforeAfter) Me.grpInsert.Controls.Add(Me.ucrReceiverColumnsToInsert) Me.grpInsert.Controls.Add(Me.rdoAtEnd) + Me.grpInsert.Controls.Add(Me.rdoAtStart) Me.grpInsert.Controls.Add(Me.ucrPnlStartEnd) - Me.grpInsert.Location = New System.Drawing.Point(233, 73) + Me.grpInsert.Location = New System.Drawing.Point(228, 73) Me.grpInsert.Name = "grpInsert" - Me.grpInsert.Size = New System.Drawing.Size(212, 101) + Me.grpInsert.Size = New System.Drawing.Size(298, 101) Me.grpInsert.TabIndex = 10 Me.grpInsert.TabStop = False Me.grpInsert.Text = "Insert" ' + 'rdoBeforeAfter + ' + Me.rdoBeforeAfter.AutoSize = True + Me.rdoBeforeAfter.Location = New System.Drawing.Point(20, 71) + Me.rdoBeforeAfter.Name = "rdoBeforeAfter" + Me.rdoBeforeAfter.Size = New System.Drawing.Size(96, 17) + Me.rdoBeforeAfter.TabIndex = 23 + Me.rdoBeforeAfter.TabStop = True + Me.rdoBeforeAfter.Text = "Before or After:" + Me.rdoBeforeAfter.UseVisualStyleBackColor = True + ' 'ucrInputBeforeAfter ' Me.ucrInputBeforeAfter.AddQuotesIfUnrecognised = True Me.ucrInputBeforeAfter.IsReadOnly = False - Me.ucrInputBeforeAfter.Location = New System.Drawing.Point(37, 66) + Me.ucrInputBeforeAfter.Location = New System.Drawing.Point(121, 70) Me.ucrInputBeforeAfter.Name = "ucrInputBeforeAfter" Me.ucrInputBeforeAfter.Size = New System.Drawing.Size(93, 21) Me.ucrInputBeforeAfter.TabIndex = 3 ' - 'rdoAtStart - ' - Me.rdoAtStart.AutoSize = True - Me.rdoAtStart.Location = New System.Drawing.Point(18, 42) - Me.rdoAtStart.Name = "rdoAtStart" - Me.rdoAtStart.Size = New System.Drawing.Size(60, 17) - Me.rdoAtStart.TabIndex = 1 - Me.rdoAtStart.TabStop = True - Me.rdoAtStart.Text = "At Start" - Me.rdoAtStart.UseVisualStyleBackColor = True - ' - 'rdoBeforeAfter - ' - Me.rdoBeforeAfter.AutoSize = True - Me.rdoBeforeAfter.Location = New System.Drawing.Point(17, 70) - Me.rdoBeforeAfter.Name = "rdoBeforeAfter" - Me.rdoBeforeAfter.Size = New System.Drawing.Size(14, 13) - Me.rdoBeforeAfter.TabIndex = 2 - Me.rdoBeforeAfter.TabStop = True - Me.rdoBeforeAfter.UseVisualStyleBackColor = True - ' 'ucrReceiverColumnsToInsert ' Me.ucrReceiverColumnsToInsert.frmParent = Me - Me.ucrReceiverColumnsToInsert.Location = New System.Drawing.Point(134, 68) + Me.ucrReceiverColumnsToInsert.Location = New System.Drawing.Point(218, 69) Me.ucrReceiverColumnsToInsert.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverColumnsToInsert.Name = "ucrReceiverColumnsToInsert" Me.ucrReceiverColumnsToInsert.Selector = Nothing @@ -130,7 +120,7 @@ Partial Class dlgInsertColumn 'rdoAtEnd ' Me.rdoAtEnd.AutoSize = True - Me.rdoAtEnd.Location = New System.Drawing.Point(18, 21) + Me.rdoAtEnd.Location = New System.Drawing.Point(21, 18) Me.rdoAtEnd.Name = "rdoAtEnd" Me.rdoAtEnd.Size = New System.Drawing.Size(57, 17) Me.rdoAtEnd.TabIndex = 0 @@ -138,9 +128,20 @@ Partial Class dlgInsertColumn Me.rdoAtEnd.Text = "At End" Me.rdoAtEnd.UseVisualStyleBackColor = True ' + 'rdoAtStart + ' + Me.rdoAtStart.AutoSize = True + Me.rdoAtStart.Location = New System.Drawing.Point(21, 43) + Me.rdoAtStart.Name = "rdoAtStart" + Me.rdoAtStart.Size = New System.Drawing.Size(60, 17) + Me.rdoAtStart.TabIndex = 1 + Me.rdoAtStart.TabStop = True + Me.rdoAtStart.Text = "At Start" + Me.rdoAtStart.UseVisualStyleBackColor = True + ' 'ucrPnlStartEnd ' - Me.ucrPnlStartEnd.Location = New System.Drawing.Point(5, 14) + Me.ucrPnlStartEnd.Location = New System.Drawing.Point(6, 14) Me.ucrPnlStartEnd.Name = "ucrPnlStartEnd" Me.ucrPnlStartEnd.Size = New System.Drawing.Size(78, 81) Me.ucrPnlStartEnd.TabIndex = 22 @@ -168,7 +169,7 @@ Partial Class dlgInsertColumn Me.grpOPtions.Controls.Add(Me.rdoAfter) Me.grpOPtions.Controls.Add(Me.rdoBefore) Me.grpOPtions.Controls.Add(Me.ucrPnlBeforeAfter) - Me.grpOPtions.Location = New System.Drawing.Point(448, 73) + Me.grpOPtions.Location = New System.Drawing.Point(349, 57) Me.grpOPtions.Name = "grpOPtions" Me.grpOPtions.Size = New System.Drawing.Size(124, 82) Me.grpOPtions.TabIndex = 9 @@ -326,16 +327,16 @@ Partial Class dlgInsertColumn Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.ClientSize = New System.Drawing.Size(574, 325) + Me.Controls.Add(Me.grpOPtions) + Me.Controls.Add(Me.grpInsert) Me.Controls.Add(Me.ucrSaveInsertColumn) Me.Controls.Add(Me.ucrNudNumberOfColumns) Me.Controls.Add(Me.rdoInsertRows) Me.Controls.Add(Me.rdoInsertColumns) - Me.Controls.Add(Me.grpOPtions) Me.Controls.Add(Me.ucrPnlColumnsOrRows) Me.Controls.Add(Me.ucrInputDefaultValue) Me.Controls.Add(Me.lblDefaultValue) Me.Controls.Add(Me.lblNumberOfColumnsToInsert) - Me.Controls.Add(Me.grpInsert) Me.Controls.Add(Me.ucrSelectorInsertColumns) Me.Controls.Add(Me.lblStartPos) Me.Controls.Add(Me.lblNumberOfRowsToInsert) @@ -365,7 +366,6 @@ Partial Class dlgInsertColumn Friend WithEvents ucrSelectorInsertColumns As ucrSelectorAddRemove Friend WithEvents grpInsert As GroupBox Friend WithEvents ucrInputBeforeAfter As ucrInputComboBox - Friend WithEvents rdoBeforeAfter As RadioButton Friend WithEvents rdoAtStart As RadioButton Friend WithEvents rdoAtEnd As RadioButton Friend WithEvents ucrReceiverColumnsToInsert As ucrReceiverSingle @@ -384,4 +384,5 @@ Partial Class dlgInsertColumn Friend WithEvents ucrPnlBeforeAfter As UcrPanel Friend WithEvents ucrPnlStartEnd As UcrPanel Friend WithEvents ucrSaveInsertColumn As ucrSave + Friend WithEvents rdoBeforeAfter As RadioButton End Class diff --git a/instat/dlgInsertColumn.vb b/instat/dlgInsertColumn.vb index e9a79403fd3..d6e4a02d6f9 100644 --- a/instat/dlgInsertColumn.vb +++ b/instat/dlgInsertColumn.vb @@ -14,6 +14,7 @@ ' You should have received a copy of the GNU General Public License k ' along with this program. If not, see . +Imports instat Imports instat.Translations Public Class dlgInsertColumn Private bFirstload As Boolean = True @@ -57,7 +58,7 @@ Public Class dlgInsertColumn ucrPnlStartEnd.SetParameter(New RParameter("before")) ucrPnlStartEnd.AddRadioButton(rdoAtEnd, "TRUE") ucrPnlStartEnd.AddRadioButton(rdoAtStart, "FALSE") - 'ucrPnlStartEnd.AddRadioButton(rdoBeforeAfter, "FALSE") + ucrPnlStartEnd.AddRadioButton(rdoBeforeAfter, "FALSE") ucrReceiverColumnsToInsert.SetParameter(New RParameter("adjacent_column")) ucrNudNumberOfColumns.SetParameter(New RParameter("num_cols")) @@ -66,11 +67,14 @@ Public Class dlgInsertColumn ucrInputDefaultValue.SetRDefault("NA") Dim dctBeforeAfter As New Dictionary(Of String, String) + ucrInputBeforeAfter.SetParameter(New RParameter("before")) dctBeforeAfter.Add("Before", "TRUE") dctBeforeAfter.Add("After", "FALSE") ucrInputBeforeAfter.SetItems(dctBeforeAfter) ucrInputBeforeAfter.SetRDefault("FALSE") + ucrPnlColumnsOrRows.AddFunctionNamesCondition(rdoInsertRows, frmMain.clsRLink.strInstatDataObject & "$insert_row_in_data") + ucrPnlColumnsOrRows.AddFunctionNamesCondition(rdoInsertColumns, frmMain.clsRLink.strInstatDataObject & "$add_columns_to_data") 'Setting Display of the group boxes in the dialog ucrPnlColumnsOrRows.AddToLinkedControls(ucrPnlStartEnd, {rdoInsertColumns}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) ucrPnlColumnsOrRows.AddToLinkedControls(ucrInputBeforeAfter, {rdoInsertColumns}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) @@ -85,6 +89,8 @@ Public Class dlgInsertColumn ucrPnlColumnsOrRows.AddToLinkedControls(ucrNudStartRow, {rdoInsertRows}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) ucrPnlStartEnd.AddToLinkedControls(ucrSelectorInsertColumns, {rdoBeforeAfter}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) + ucrPnlStartEnd.AddToLinkedControls(ucrInputBeforeAfter, {rdoBeforeAfter}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) + ucrPnlStartEnd.AddToLinkedControls(ucrReceiverColumnsToInsert, {rdoBeforeAfter}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) 'ucrSelectorInsertColumns.AddToLinkedControls(ucrNudStartRow, {rdoInsertRows}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) ucrNudNumberOfColumns.SetLinkedDisplayControl(lblNumberOfColumnsToInsert) @@ -116,12 +122,11 @@ Public Class dlgInsertColumn ucrSelectorInsertColumns.Reset() ucrDataFramesList.Reset() - clsInsertRowFunction.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$insert_row_in_data") clsInsertColumnFunction.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$add_columns_to_data") + clsInsertRowFunction.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$insert_row_in_data") clsInsertRowFunction.AddParameter("start_row", ucrDataFramesList.iDataFrameLength) - ucrBase.clsRsyntax.SetBaseRFunction(clsInsertRowFunction) - + ucrBase.clsRsyntax.SetBaseRFunction(clsInsertColumnFunction) 'rdoInsertColumns.Checked = True 'ucrInputPrefixForInsertedColumns.SetName("X") @@ -208,14 +213,22 @@ Public Class dlgInsertColumn TestOKEnabled() End Sub + Private Sub ucrPnlColumnsOrRows_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrPnlColumnsOrRows.ControlValueChanged + If rdoInsertColumns.Checked Then + ucrBase.clsRsyntax.SetBaseRFunction(clsInsertColumnFunction) + ElseIf rdoInsertRows.Checked Then + ucrBase.clsRsyntax.SetBaseRFunction(clsInsertRowFunction) + End If + End Sub + 'Private Sub ucrDataFramesList_DataFrameChanged() Handles ucrDataFramesList.DataFrameChanged 'ucrBase.clsRsyntax.AddParameter("data_name", Chr(34) & ucrDataFramesList.cboAvailableDataFrames.SelectedItem & Chr(34)) 'ucrSelectorInsertColumns.strCurrentDataFrame = ucrDataFramesList.cboAvailableDataFrames.SelectedItem 'ucrSelectorInsertColumns.LoadList() 'TestOKEnabled() - 'End Sub - - + 'End Sub + + 'Private Sub ucrDataFramesList_DataFrameChanged(sender As Object, e As EventArgs, strPrevDataFrame As String) Handles ucrDataFramesList.DataFrameChanged ' dataFrameListMaxMinPos() 'End Sub From 9c0628acfab4048c8f7395cc6a527ec8f94a62da Mon Sep 17 00:00:00 2001 From: shadrack kibet Date: Thu, 25 May 2017 13:17:22 +0300 Subject: [PATCH 037/154] more edits --- instat/dlgInsertColumn.Designer.vb | 20 +- instat/dlgInsertColumn.vb | 338 +++-------------------------- 2 files changed, 38 insertions(+), 320 deletions(-) diff --git a/instat/dlgInsertColumn.Designer.vb b/instat/dlgInsertColumn.Designer.vb index 999e4bfb84b..fe9318eec9d 100644 --- a/instat/dlgInsertColumn.Designer.vb +++ b/instat/dlgInsertColumn.Designer.vb @@ -80,7 +80,7 @@ Partial Class dlgInsertColumn Me.grpInsert.Controls.Add(Me.ucrPnlStartEnd) Me.grpInsert.Location = New System.Drawing.Point(228, 73) Me.grpInsert.Name = "grpInsert" - Me.grpInsert.Size = New System.Drawing.Size(298, 101) + Me.grpInsert.Size = New System.Drawing.Size(344, 101) Me.grpInsert.TabIndex = 10 Me.grpInsert.TabStop = False Me.grpInsert.Text = "Insert" @@ -88,7 +88,7 @@ Partial Class dlgInsertColumn 'rdoBeforeAfter ' Me.rdoBeforeAfter.AutoSize = True - Me.rdoBeforeAfter.Location = New System.Drawing.Point(20, 71) + Me.rdoBeforeAfter.Location = New System.Drawing.Point(24, 73) Me.rdoBeforeAfter.Name = "rdoBeforeAfter" Me.rdoBeforeAfter.Size = New System.Drawing.Size(96, 17) Me.rdoBeforeAfter.TabIndex = 23 @@ -100,7 +100,7 @@ Partial Class dlgInsertColumn ' Me.ucrInputBeforeAfter.AddQuotesIfUnrecognised = True Me.ucrInputBeforeAfter.IsReadOnly = False - Me.ucrInputBeforeAfter.Location = New System.Drawing.Point(121, 70) + Me.ucrInputBeforeAfter.Location = New System.Drawing.Point(140, 71) Me.ucrInputBeforeAfter.Name = "ucrInputBeforeAfter" Me.ucrInputBeforeAfter.Size = New System.Drawing.Size(93, 21) Me.ucrInputBeforeAfter.TabIndex = 3 @@ -108,7 +108,7 @@ Partial Class dlgInsertColumn 'ucrReceiverColumnsToInsert ' Me.ucrReceiverColumnsToInsert.frmParent = Me - Me.ucrReceiverColumnsToInsert.Location = New System.Drawing.Point(218, 69) + Me.ucrReceiverColumnsToInsert.Location = New System.Drawing.Point(250, 70) Me.ucrReceiverColumnsToInsert.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverColumnsToInsert.Name = "ucrReceiverColumnsToInsert" Me.ucrReceiverColumnsToInsert.Selector = Nothing @@ -120,7 +120,7 @@ Partial Class dlgInsertColumn 'rdoAtEnd ' Me.rdoAtEnd.AutoSize = True - Me.rdoAtEnd.Location = New System.Drawing.Point(21, 18) + Me.rdoAtEnd.Location = New System.Drawing.Point(15, 18) Me.rdoAtEnd.Name = "rdoAtEnd" Me.rdoAtEnd.Size = New System.Drawing.Size(57, 17) Me.rdoAtEnd.TabIndex = 0 @@ -131,7 +131,7 @@ Partial Class dlgInsertColumn 'rdoAtStart ' Me.rdoAtStart.AutoSize = True - Me.rdoAtStart.Location = New System.Drawing.Point(21, 43) + Me.rdoAtStart.Location = New System.Drawing.Point(15, 46) Me.rdoAtStart.Name = "rdoAtStart" Me.rdoAtStart.Size = New System.Drawing.Size(60, 17) Me.rdoAtStart.TabIndex = 1 @@ -169,7 +169,7 @@ Partial Class dlgInsertColumn Me.grpOPtions.Controls.Add(Me.rdoAfter) Me.grpOPtions.Controls.Add(Me.rdoBefore) Me.grpOPtions.Controls.Add(Me.ucrPnlBeforeAfter) - Me.grpOPtions.Location = New System.Drawing.Point(349, 57) + Me.grpOPtions.Location = New System.Drawing.Point(236, 60) Me.grpOPtions.Name = "grpOPtions" Me.grpOPtions.Size = New System.Drawing.Size(124, 82) Me.grpOPtions.TabIndex = 9 @@ -179,7 +179,7 @@ Partial Class dlgInsertColumn 'rdoAfter ' Me.rdoAfter.AutoSize = True - Me.rdoAfter.Location = New System.Drawing.Point(5, 53) + Me.rdoAfter.Location = New System.Drawing.Point(6, 51) Me.rdoAfter.Name = "rdoAfter" Me.rdoAfter.Size = New System.Drawing.Size(47, 17) Me.rdoAfter.TabIndex = 1 @@ -200,7 +200,7 @@ Partial Class dlgInsertColumn ' 'ucrPnlBeforeAfter ' - Me.ucrPnlBeforeAfter.Location = New System.Drawing.Point(4, 18) + Me.ucrPnlBeforeAfter.Location = New System.Drawing.Point(8, 19) Me.ucrPnlBeforeAfter.Name = "ucrPnlBeforeAfter" Me.ucrPnlBeforeAfter.Size = New System.Drawing.Size(98, 57) Me.ucrPnlBeforeAfter.TabIndex = 21 @@ -326,7 +326,7 @@ Partial Class dlgInsertColumn ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(574, 325) + Me.ClientSize = New System.Drawing.Size(581, 325) Me.Controls.Add(Me.grpOPtions) Me.Controls.Add(Me.grpInsert) Me.Controls.Add(Me.ucrSaveInsertColumn) diff --git a/instat/dlgInsertColumn.vb b/instat/dlgInsertColumn.vb index d6e4a02d6f9..98a520d2015 100644 --- a/instat/dlgInsertColumn.vb +++ b/instat/dlgInsertColumn.vb @@ -36,17 +36,18 @@ Public Class dlgInsertColumn Private Sub InitialiseDialog() ucrBase.iHelpTopicID = 164 + ucrReceiverColumnsToInsert.Selector = ucrSelectorInsertColumns ucrReceiverColumnsToInsert.SetMeAsReceiver() - 'ucrInputBeforeAfter.SetItems({"Before", "After"}) - 'ucrInputPrefixForInsertedColumns.SetValidationTypeAsRVariable() + ucrReceiverColumnsToInsert.SetParameter(New RParameter("adjacent_column")) + ucrReceiverColumnsToInsert.SetParameterIsString() ucrPnlColumnsOrRows.AddRadioButton(rdoInsertColumns) ucrPnlColumnsOrRows.AddRadioButton(rdoInsertRows) ucrPnlBeforeAfter.SetParameter(New RParameter("before")) - ucrPnlBeforeAfter.AddRadioButton(rdoBefore, "TRUE") - ucrPnlBeforeAfter.AddRadioButton(rdoAfter, "FALSE") + ucrPnlBeforeAfter.AddRadioButton(rdoBefore, "FALSE") + ucrPnlBeforeAfter.AddRadioButton(rdoAfter, "TRUE") ucrDataFramesList.SetParameter(New RParameter("data_name")) ucrDataFramesList.SetParameterIsString() @@ -55,24 +56,25 @@ Public Class dlgInsertColumn ucrNudNumberOfRows.SetRDefault(1) ucrNudNumberOfColumns.SetRDefault(1) - ucrPnlStartEnd.SetParameter(New RParameter("before")) - ucrPnlStartEnd.AddRadioButton(rdoAtEnd, "TRUE") - ucrPnlStartEnd.AddRadioButton(rdoAtStart, "FALSE") + + Dim dctBeforeAfter As New Dictionary(Of String, String) + ucrInputBeforeAfter.SetParameter(New RParameter("before")) + dctBeforeAfter.Add("Before", "FALSE") + dctBeforeAfter.Add("After", "TRUE") + ucrInputBeforeAfter.SetItems(dctBeforeAfter) + ucrInputBeforeAfter.SetRDefault("FALSE") + + + ucrPnlStartEnd.SetParameter(ucrInputBeforeAfter.GetParameter) + ucrPnlStartEnd.AddRadioButton(rdoAtEnd, "FALSE") + ucrPnlStartEnd.AddRadioButton(rdoAtStart, "TRUE") ucrPnlStartEnd.AddRadioButton(rdoBeforeAfter, "FALSE") - ucrReceiverColumnsToInsert.SetParameter(New RParameter("adjacent_column")) ucrNudNumberOfColumns.SetParameter(New RParameter("num_cols")) ucrInputDefaultValue.SetParameter(New RParameter("col_data")) ucrSaveInsertColumn.SetParameter(New RParameter("col_name")) ucrInputDefaultValue.SetRDefault("NA") - Dim dctBeforeAfter As New Dictionary(Of String, String) - ucrInputBeforeAfter.SetParameter(New RParameter("before")) - dctBeforeAfter.Add("Before", "TRUE") - dctBeforeAfter.Add("After", "FALSE") - ucrInputBeforeAfter.SetItems(dctBeforeAfter) - ucrInputBeforeAfter.SetRDefault("FALSE") - ucrPnlColumnsOrRows.AddFunctionNamesCondition(rdoInsertRows, frmMain.clsRLink.strInstatDataObject & "$insert_row_in_data") ucrPnlColumnsOrRows.AddFunctionNamesCondition(rdoInsertColumns, frmMain.clsRLink.strInstatDataObject & "$add_columns_to_data") 'Setting Display of the group boxes in the dialog @@ -88,10 +90,10 @@ Public Class dlgInsertColumn ucrPnlColumnsOrRows.AddToLinkedControls(ucrNudNumberOfRows, {rdoInsertRows}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) ucrPnlColumnsOrRows.AddToLinkedControls(ucrNudStartRow, {rdoInsertRows}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) ucrPnlStartEnd.AddToLinkedControls(ucrSelectorInsertColumns, {rdoBeforeAfter}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) - + ucrPnlBeforeAfter.SetLinkedDisplayControl(grpOPtions) ucrPnlStartEnd.AddToLinkedControls(ucrInputBeforeAfter, {rdoBeforeAfter}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) ucrPnlStartEnd.AddToLinkedControls(ucrReceiverColumnsToInsert, {rdoBeforeAfter}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) - + ucrPnlStartEnd.SetLinkedDisplayControl(grpInsert) 'ucrSelectorInsertColumns.AddToLinkedControls(ucrNudStartRow, {rdoInsertRows}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) ucrNudNumberOfColumns.SetLinkedDisplayControl(lblNumberOfColumnsToInsert) ucrInputDefaultValue.SetLinkedDisplayControl(lblDefaultValue) @@ -105,44 +107,27 @@ Public Class dlgInsertColumn End Sub - 'Private Sub reopendialog() - ' ucrDataFramesList.Reset() - ' If rdoInsertRows.Checked Then - ' If nudpos.value = ucrDataFramesList.iDataFrameLength Then - ' nudpos.value = ucrDataFramesList.iDataFrameLength - ' ucrBase.clsRsyntax.AddParameter("number_rows", nudnumcols.value) - ' End If - ' Else - ' End If - 'End Sub - Private Sub SetDefaults() clsInsertColumnFunction = New RFunction clsInsertRowFunction = New RFunction ucrSelectorInsertColumns.Reset() ucrDataFramesList.Reset() + clsInsertColumnFunction.AddParameter("before", "FALSE") + clsInsertRowFunction.AddParameter("before", "FALSE") clsInsertColumnFunction.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$add_columns_to_data") clsInsertRowFunction.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$insert_row_in_data") clsInsertRowFunction.AddParameter("start_row", ucrDataFramesList.iDataFrameLength) - ucrBase.clsRsyntax.SetBaseRFunction(clsInsertColumnFunction) - - 'rdoInsertColumns.Checked = True - 'ucrInputPrefixForInsertedColumns.SetName("X") - 'ucrInputDefaultValue.SetName("NA") - 'RowsOrColumns() - 'rdoAtEnd.Checked = True - 'rdoAfter.Checked = True - 'ucrInputBeforeAfter.SetName("After") - ''If ucrDataFramesList.iDataFrameLength >= nudPos.Minimum AndAlso ucrDataFramesList.iDataFrameLength <= nudPos.Maximum Then - '' nudPos.Value = ucrDataFramesList.iDataFrameLength - ''Else - '' nudPos.Value = 1 - 'End If + ucrBase.clsRsyntax.SetBaseRFunction(clsInsertRowFunction) End Sub Private Sub SetRCodeForControls(bReset) + ucrDataFramesList.AddAdditionalCodeParameterPair(clsInsertColumnFunction, New RParameter("data_name"), iAdditionalPairNo:=1) + + ucrPnlStartEnd.AddAdditionalCodeParameterPair(clsInsertColumnFunction, New RParameter("before"), iAdditionalPairNo:=1) + ucrDataFramesList.SetParameterIsString() + ucrNudNumberOfRows.SetRCode(clsInsertRowFunction, bReset) ucrNudStartRow.SetRCode(clsInsertRowFunction, bReset) ucrDataFramesList.SetRCode(clsInsertRowFunction, bReset) @@ -152,6 +137,7 @@ Public Class dlgInsertColumn ucrInputDefaultValue.SetRCode(clsInsertColumnFunction, bReset) ucrSaveInsertColumn.SetRCode(clsInsertColumnFunction, bReset) ucrReceiverColumnsToInsert.SetRCode(clsInsertColumnFunction, bReset) + ucrDataFramesList.SetRCode(clsInsertColumnFunction, bReset) End Sub Private Sub TestOKEnabled() @@ -174,39 +160,6 @@ Public Class dlgInsertColumn ucrBase.OKEnabled(True) End Sub - 'Private Sub nudPos_TextChanged(sender As Object, e As EventArgs) - ' startpo() - 'End Sub - - 'Private Sub startpo() - ' If rdoInsertRows.Checked Then - ' If Not nudPos.Text = "" Then - ' ucrBase.clsRsyntax.AddParameter("start_row", nudPos.Value) - ' Else - ' ucrBase.clsRsyntax.RemoveParameter("start_row") - ' End If - ' Else - ' ucrBase.clsRsyntax.RemoveParameter("start_row") - ' End If - 'End Sub - - 'Private Sub nudNumCols_TextChanged(sender As Object, e As EventArgs) - ' NumberofColumnsOrRows() - ' TestOKEnabled() - 'End Sub - - 'Private Sub numberofcolumnsorrows() - ' If rdoInsertRows.Checked Then - ' If Not nudnumcols.text = "" Then - ' ucrBase.clsRsyntax.AddParameter("number_rows", nudnumcols.value) - ' Else - ' ucrBase.clsRsyntax.RemoveParameter("number_rows") - ' End If - ' Else - ' ucrBase.clsRsyntax.RemoveParameter("number_rows") - ' End If - 'End Sub - Private Sub ucrBase_ClickReset(sender As Object, e As EventArgs) Handles ucrBase.ClickReset SetDefaults() SetRCodeForControls(True) @@ -220,239 +173,4 @@ Public Class dlgInsertColumn ucrBase.clsRsyntax.SetBaseRFunction(clsInsertRowFunction) End If End Sub - - 'Private Sub ucrDataFramesList_DataFrameChanged() Handles ucrDataFramesList.DataFrameChanged - 'ucrBase.clsRsyntax.AddParameter("data_name", Chr(34) & ucrDataFramesList.cboAvailableDataFrames.SelectedItem & Chr(34)) - 'ucrSelectorInsertColumns.strCurrentDataFrame = ucrDataFramesList.cboAvailableDataFrames.SelectedItem - 'ucrSelectorInsertColumns.LoadList() - 'TestOKEnabled() - 'End Sub - - - 'Private Sub ucrDataFramesList_DataFrameChanged(sender As Object, e As EventArgs, strPrevDataFrame As String) Handles ucrDataFramesList.DataFrameChanged - ' dataFrameListMaxMinPos() - 'End Sub - - 'Private Sub dataFrameListMaxMinPos() - ' If rdoInsertRows.Checked Then - ' nudPos.Maximum = ucrDataFramesList.iDataFrameLength - ' nudPos.Value = ucrDataFramesList.iDataFrameLength - ' Else - ' End If - 'End Sub - - 'Private Sub RowsOrColumns_CheckedChanged(sender As Object, e As EventArgs) Handles rdoInsertColumns.CheckedChanged, rdoInsertRows.CheckedChanged - ' RowsOrColumns() - 'End Sub - - 'Private Sub grpOPtions_CheckedChanged(sender As Object, e As EventArgs) Handles rdoBefore.CheckedChanged, rdoAfter.CheckedChanged - ' OPtionstoInsert() - 'End Sub - - 'Private Sub OPtionstoInsert() - ' If rdoInsertRows.Checked Then - ' If rdoAfter.Checked Then - ' ucrBase.clsRsyntax.AddParameter("before", "FALSE") - ' ElseIf rdoBefore.Checked Then - ' ucrBase.clsRsyntax.AddParameter("before", "TRUE") - ' End If - ' End If - 'End Sub - - 'Private Sub RowsOrColumns() - ' If rdoInsertColumns.Checked Then - ' 'ucrBase.clsRsyntax.SetFunction(frmMain.clsRLink.strInstatDataObject & "$add_columns_to_data") - ' ucrBase.clsRsyntax.AddParameter("use_col_name_as_prefix", "TRUE") - ' BeforeAfterPara() - ' InsertParam() - ' ucrBase.clsRsyntax.RemoveParameter("number_rows") - ' 'nudInsertColumns.Value = 1 - ' 'NumberofColumnsOrRows() - ' 'dataFrameListMaxMinPos() - ' 'ColName() - ' 'grpInsert.Visible = True - ' 'grpOPtions.Visible = False - ' 'nudInsertColumns.Maximum = 100 - ' 'nudNumCols.Visible = False - ' 'nudPos.Visible = False - ' addColumData() - ' ColsToInsert() - ' OPtionstoInsert() - ' 'startpo() - ' BeforeParameter() - ' 'lblPrefixforInsertedColumns.Visible = True - ' 'lblDefaultValue.Visible = True - ' 'ucrInputPrefixForInsertedColumns.Visible = True - ' 'ucrInputDefaultValue.Visible = True - ' 'lblNumberOfColumnsToInsert.Visible = True - ' 'nudInsertColumns.Visible = True - ' 'lblNumberOfRowsToInsert.Visible = False - ' 'lblStartPos.Visible = False - ' 'nudNumCols.Focus() - ' 'nudPos.Focus() - ' ElseIf rdoInsertRows.Checked Then - ' 'ucrBase.clsRsyntax.SetFunction(frmMain.clsRLink.strInstatDataObject & "$insert_row_in_data") - ' lblNumberOfRowsToInsert.Visible = True - ' ucrBase.clsRsyntax.RemoveParameter("num_cols") - ' ucrBase.clsRsyntax.RemoveParameter("use_col_name_as_prefix") - ' nudNumCols.Value = 1 - ' NumberofColumnsOrRows() - ' dataFrameListMaxMinPos() - ' 'startpo() - ' nudNumCols.Maximum = 1000 - ' addColumData() - ' InsertParam() - ' BeforeAfterPara() - ' OPtionstoInsert() - ' ColsToInsert() - ' ColName() - ' BeforeParameter() - ' ucrSelectorInsertColumns.Visible = False - ' nudNumCols.Visible = True - ' nudPos.Visible = True - ' lblStartPos.Visible = True - ' lblPrefixforInsertedColumns.Visible = False - ' lblDefaultValue.Visible = False - ' ucrInputPrefixForInsertedColumns.Visible = False - ' ucrInputDefaultValue.Visible = False - ' lblNumberOfColumnsToInsert.Visible = False - ' nudInsertColumns.Visible = False - ' ucrReceiverColumnsToInsert.Visible = False - ' nudInsertColumns.Focus() - ' grpInsert.Visible = False - ' grpOPtions.Visible = True - - ' End If - - 'End Sub - - 'Private Sub grpInsert_CheckedChanged(sender As Object, e As EventArgs) Handles rdoAtEnd.CheckedChanged, rdoAtStart.CheckedChanged, rdoBeforeAfter.CheckedChanged - ' InsertParam() - 'End Sub - - 'Private Sub InsertParam() - ' If rdoAtEnd.Checked Then - ' ucrBase.clsRsyntax.AddParameter("before", "FALSE") - ' ucrBase.clsRsyntax.RemoveParameter("adjacent_column") - ' ucrReceiverColumnsToInsert.Visible = False - ' ucrSelectorInsertColumns.Visible = False - ' ElseIf rdoAtStart.Checked Then - ' ucrBase.clsRsyntax.AddParameter("before", "TRUE") - ' ucrBase.clsRsyntax.RemoveParameter("adjacent_column") - ' ucrReceiverColumnsToInsert.Visible = False - ' ucrSelectorInsertColumns.Visible = False - ' Else - ' ucrReceiverColumnsToInsert.Visible = True - ' ucrSelectorInsertColumns.Visible = True - ' End If - ' If rdoBeforeAfter.Checked Then - ' ucrInputBeforeAfter.Enabled = True - ' Else - ' ucrInputBeforeAfter.Enabled = False - ' ucrReceiverColumnsToInsert.Clear() - ' End If - ' BeforeParameter() - 'End Sub - - 'Private Sub ucrInputBeforeAfter_NameChanged() Handles ucrInputBeforeAfter.NameChanged - ' BeforeParameter() - 'End Sub - - 'Private Sub BeforeParameter() - ' If rdoInsertColumns.Checked Then - ' If rdoBeforeAfter.Checked Then - ' Select Case ucrInputBeforeAfter.GetText - ' Case "Before" - ' ucrBase.clsRsyntax.AddParameter("before", "TRUE") - ' Case Else - ' ucrBase.clsRsyntax.AddParameter("before", "FALSE") - ' End Select - ' End If - ' Else - ' ucrBase.clsRsyntax.RemoveParameter("before") - ' End If - 'End Sub - - 'Private Sub ucrReceiverColumnsToInsert_SelectionChanged(sender As Object, e As EventArgs) Handles ucrReceiverColumnsToInsert.SelectionChanged - ' BeforeAfterPara() - ' TestOKEnabled() - 'End Sub - - 'Private Sub BeforeAfterPara() - ' If rdoInsertColumns.Checked Then - ' If rdoBeforeAfter.Checked Then - ' If Not ucrReceiverColumnsToInsert.IsEmpty Then - ' ucrBase.clsRsyntax.AddParameter("adjacent_column", ucrReceiverColumnsToInsert.GetVariableNames()) - ' Else - ' ucrBase.clsRsyntax.RemoveParameter("adjacent_column") - ' End If - ' Else - ' ucrBase.clsRsyntax.RemoveParameter("adjacent_column") - ' End If - ' Else - ' ucrBase.clsRsyntax.RemoveParameter("adjacent_column") - ' End If - 'End Sub - - 'Private Sub ucrInputDefaultValue_NameChanged() Handles ucrInputDefaultValue.NameChanged - ' addColumData() - ' TestOKEnabled() - 'End Sub - - 'Private Sub addColumData() - ' If rdoInsertColumns.Checked Then - ' If Not ucrInputDefaultValue.IsEmpty Then - ' If (ucrInputDefaultValue.GetText.ToLower()) = "true" Then - ' ucrBase.clsRsyntax.AddParameter("col_data", "TRUE") - ' ElseIf (ucrInputDefaultValue.GetText.ToLower()) = "false" Then - ' ucrBase.clsRsyntax.AddParameter("col_data", "FALSE") - ' ElseIf (ucrInputDefaultValue.GetText.ToLower()) = "na" - ' ucrBase.clsRsyntax.AddParameter("col_data", "NA") - ' ElseIf IsNumeric(ucrInputDefaultValue.GetText) Then - ' ucrBase.clsRsyntax.AddParameter("col_data", ucrInputDefaultValue.GetText) - ' Else - ' ucrBase.clsRsyntax.AddParameter("col_data", Chr(34) & ucrInputDefaultValue.GetText & Chr(34)) - ' End If - ' Else - ' ucrBase.clsRsyntax.RemoveParameter("col_data") - ' End If - ' Else - ' ucrBase.clsRsyntax.RemoveParameter("col_data") - ' End If - 'End Sub - - 'Private Sub ucrInputPrefixForInsertedColumns_NameChanged() Handles ucrInputPrefixForInsertedColumns.NameChanged - ' ColName() - ' TestOKEnabled() - 'End Sub - - 'Private Sub ColName() - ' If rdoInsertColumns.Checked Then - ' If Not ucrInputPrefixForInsertedColumns.IsEmpty Then - ' ucrBase.clsRsyntax.AddParameter("col_name", Chr(34) & ucrInputPrefixForInsertedColumns.GetText & Chr(34)) - ' Else - ' ucrBase.clsRsyntax.RemoveParameter("col_name") - ' End If - ' Else - ' ucrBase.clsRsyntax.RemoveParameter("col_name") - ' End If - 'End Sub - - 'Private Sub nudInsertColumns_TextChanged(sender As Object, e As EventArgs) - ' ColsToInsert() - ' TestOKEnabled() - 'End Sub - - 'Private Sub ColsToInsert() - ' If rdoInsertColumns.Checked Then - ' If Not nudInsertColumns.Text = "" Then - ' ucrBase.clsRsyntax.AddParameter("num_cols", nudInsertColumns.Value) - ' Else - ' ucrBase.clsRsyntax.RemoveParameter("num_cols") - ' End If - ' Else - ' ucrBase.clsRsyntax.RemoveParameter("num_cols") - ' End If - 'End Sub - End Class \ No newline at end of file From 6b29729599d3bb8a86a0968d51f92b6b6c98bc71 Mon Sep 17 00:00:00 2001 From: shadrack kibet Date: Thu, 25 May 2017 17:42:36 +0300 Subject: [PATCH 038/154] Adding parameter values conditions --- instat/dlgInsertColumn.Designer.vb | 110 ++++++++++++++--------------- instat/dlgInsertColumn.vb | 35 +++++---- 2 files changed, 78 insertions(+), 67 deletions(-) diff --git a/instat/dlgInsertColumn.Designer.vb b/instat/dlgInsertColumn.Designer.vb index fe9318eec9d..c8d78a303a9 100644 --- a/instat/dlgInsertColumn.Designer.vb +++ b/instat/dlgInsertColumn.Designer.vb @@ -25,6 +25,10 @@ Partial Class dlgInsertColumn Me.lblStartPos = New System.Windows.Forms.Label() Me.lblNumberOfRowsToInsert = New System.Windows.Forms.Label() Me.grpInsert = New System.Windows.Forms.GroupBox() + Me.grpOPtions = New System.Windows.Forms.GroupBox() + Me.rdoAfter = New System.Windows.Forms.RadioButton() + Me.rdoBefore = New System.Windows.Forms.RadioButton() + Me.ucrPnlBeforeAfter = New instat.UcrPanel() Me.rdoBeforeAfter = New System.Windows.Forms.RadioButton() Me.ucrInputBeforeAfter = New instat.ucrInputComboBox() Me.ucrReceiverColumnsToInsert = New instat.ucrReceiverSingle() @@ -33,10 +37,6 @@ Partial Class dlgInsertColumn Me.ucrPnlStartEnd = New instat.UcrPanel() Me.lblNumberOfColumnsToInsert = New System.Windows.Forms.Label() Me.lblDefaultValue = New System.Windows.Forms.Label() - Me.grpOPtions = New System.Windows.Forms.GroupBox() - Me.rdoAfter = New System.Windows.Forms.RadioButton() - Me.rdoBefore = New System.Windows.Forms.RadioButton() - Me.ucrPnlBeforeAfter = New instat.UcrPanel() Me.rdoInsertColumns = New System.Windows.Forms.RadioButton() Me.rdoInsertRows = New System.Windows.Forms.RadioButton() Me.ucrSaveInsertColumn = New instat.ucrSave() @@ -72,6 +72,7 @@ Partial Class dlgInsertColumn ' 'grpInsert ' + Me.grpInsert.Controls.Add(Me.grpOPtions) Me.grpInsert.Controls.Add(Me.rdoBeforeAfter) Me.grpInsert.Controls.Add(Me.ucrInputBeforeAfter) Me.grpInsert.Controls.Add(Me.ucrReceiverColumnsToInsert) @@ -80,15 +81,56 @@ Partial Class dlgInsertColumn Me.grpInsert.Controls.Add(Me.ucrPnlStartEnd) Me.grpInsert.Location = New System.Drawing.Point(228, 73) Me.grpInsert.Name = "grpInsert" - Me.grpInsert.Size = New System.Drawing.Size(344, 101) + Me.grpInsert.Size = New System.Drawing.Size(316, 101) Me.grpInsert.TabIndex = 10 Me.grpInsert.TabStop = False Me.grpInsert.Text = "Insert" ' + 'grpOPtions + ' + Me.grpOPtions.Controls.Add(Me.rdoAfter) + Me.grpOPtions.Controls.Add(Me.rdoBefore) + Me.grpOPtions.Controls.Add(Me.ucrPnlBeforeAfter) + Me.grpOPtions.Location = New System.Drawing.Point(6, 13) + Me.grpOPtions.Name = "grpOPtions" + Me.grpOPtions.Size = New System.Drawing.Size(124, 82) + Me.grpOPtions.TabIndex = 9 + Me.grpOPtions.TabStop = False + Me.grpOPtions.Text = "Options" + ' + 'rdoAfter + ' + Me.rdoAfter.AutoSize = True + Me.rdoAfter.Location = New System.Drawing.Point(6, 51) + Me.rdoAfter.Name = "rdoAfter" + Me.rdoAfter.Size = New System.Drawing.Size(47, 17) + Me.rdoAfter.TabIndex = 1 + Me.rdoAfter.TabStop = True + Me.rdoAfter.Text = "After" + Me.rdoAfter.UseVisualStyleBackColor = True + ' + 'rdoBefore + ' + Me.rdoBefore.AutoSize = True + Me.rdoBefore.Location = New System.Drawing.Point(6, 26) + Me.rdoBefore.Name = "rdoBefore" + Me.rdoBefore.Size = New System.Drawing.Size(56, 17) + Me.rdoBefore.TabIndex = 0 + Me.rdoBefore.TabStop = True + Me.rdoBefore.Text = "Before" + Me.rdoBefore.UseVisualStyleBackColor = True + ' + 'ucrPnlBeforeAfter + ' + Me.ucrPnlBeforeAfter.Location = New System.Drawing.Point(8, 19) + Me.ucrPnlBeforeAfter.Name = "ucrPnlBeforeAfter" + Me.ucrPnlBeforeAfter.Size = New System.Drawing.Size(98, 57) + Me.ucrPnlBeforeAfter.TabIndex = 21 + ' 'rdoBeforeAfter ' Me.rdoBeforeAfter.AutoSize = True - Me.rdoBeforeAfter.Location = New System.Drawing.Point(24, 73) + Me.rdoBeforeAfter.Location = New System.Drawing.Point(14, 64) Me.rdoBeforeAfter.Name = "rdoBeforeAfter" Me.rdoBeforeAfter.Size = New System.Drawing.Size(96, 17) Me.rdoBeforeAfter.TabIndex = 23 @@ -100,7 +142,7 @@ Partial Class dlgInsertColumn ' Me.ucrInputBeforeAfter.AddQuotesIfUnrecognised = True Me.ucrInputBeforeAfter.IsReadOnly = False - Me.ucrInputBeforeAfter.Location = New System.Drawing.Point(140, 71) + Me.ucrInputBeforeAfter.Location = New System.Drawing.Point(131, 63) Me.ucrInputBeforeAfter.Name = "ucrInputBeforeAfter" Me.ucrInputBeforeAfter.Size = New System.Drawing.Size(93, 21) Me.ucrInputBeforeAfter.TabIndex = 3 @@ -108,7 +150,7 @@ Partial Class dlgInsertColumn 'ucrReceiverColumnsToInsert ' Me.ucrReceiverColumnsToInsert.frmParent = Me - Me.ucrReceiverColumnsToInsert.Location = New System.Drawing.Point(250, 70) + Me.ucrReceiverColumnsToInsert.Location = New System.Drawing.Point(234, 64) Me.ucrReceiverColumnsToInsert.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverColumnsToInsert.Name = "ucrReceiverColumnsToInsert" Me.ucrReceiverColumnsToInsert.Selector = Nothing @@ -131,7 +173,7 @@ Partial Class dlgInsertColumn 'rdoAtStart ' Me.rdoAtStart.AutoSize = True - Me.rdoAtStart.Location = New System.Drawing.Point(15, 46) + Me.rdoAtStart.Location = New System.Drawing.Point(16, 38) Me.rdoAtStart.Name = "rdoAtStart" Me.rdoAtStart.Size = New System.Drawing.Size(60, 17) Me.rdoAtStart.TabIndex = 1 @@ -143,7 +185,7 @@ Partial Class dlgInsertColumn ' Me.ucrPnlStartEnd.Location = New System.Drawing.Point(6, 14) Me.ucrPnlStartEnd.Name = "ucrPnlStartEnd" - Me.ucrPnlStartEnd.Size = New System.Drawing.Size(78, 81) + Me.ucrPnlStartEnd.Size = New System.Drawing.Size(112, 81) Me.ucrPnlStartEnd.TabIndex = 22 ' 'lblNumberOfColumnsToInsert @@ -164,47 +206,6 @@ Partial Class dlgInsertColumn Me.lblDefaultValue.TabIndex = 13 Me.lblDefaultValue.Text = "Default Value:" ' - 'grpOPtions - ' - Me.grpOPtions.Controls.Add(Me.rdoAfter) - Me.grpOPtions.Controls.Add(Me.rdoBefore) - Me.grpOPtions.Controls.Add(Me.ucrPnlBeforeAfter) - Me.grpOPtions.Location = New System.Drawing.Point(236, 60) - Me.grpOPtions.Name = "grpOPtions" - Me.grpOPtions.Size = New System.Drawing.Size(124, 82) - Me.grpOPtions.TabIndex = 9 - Me.grpOPtions.TabStop = False - Me.grpOPtions.Text = "Options" - ' - 'rdoAfter - ' - Me.rdoAfter.AutoSize = True - Me.rdoAfter.Location = New System.Drawing.Point(6, 51) - Me.rdoAfter.Name = "rdoAfter" - Me.rdoAfter.Size = New System.Drawing.Size(47, 17) - Me.rdoAfter.TabIndex = 1 - Me.rdoAfter.TabStop = True - Me.rdoAfter.Text = "After" - Me.rdoAfter.UseVisualStyleBackColor = True - ' - 'rdoBefore - ' - Me.rdoBefore.AutoSize = True - Me.rdoBefore.Location = New System.Drawing.Point(6, 26) - Me.rdoBefore.Name = "rdoBefore" - Me.rdoBefore.Size = New System.Drawing.Size(56, 17) - Me.rdoBefore.TabIndex = 0 - Me.rdoBefore.TabStop = True - Me.rdoBefore.Text = "Before" - Me.rdoBefore.UseVisualStyleBackColor = True - ' - 'ucrPnlBeforeAfter - ' - Me.ucrPnlBeforeAfter.Location = New System.Drawing.Point(8, 19) - Me.ucrPnlBeforeAfter.Name = "ucrPnlBeforeAfter" - Me.ucrPnlBeforeAfter.Size = New System.Drawing.Size(98, 57) - Me.ucrPnlBeforeAfter.TabIndex = 21 - ' 'rdoInsertColumns ' Me.rdoInsertColumns.Appearance = System.Windows.Forms.Appearance.Button @@ -258,9 +259,9 @@ Partial Class dlgInsertColumn ' 'ucrPnlColumnsOrRows ' - Me.ucrPnlColumnsOrRows.Location = New System.Drawing.Point(132, 11) + Me.ucrPnlColumnsOrRows.Location = New System.Drawing.Point(132, 12) Me.ucrPnlColumnsOrRows.Name = "ucrPnlColumnsOrRows" - Me.ucrPnlColumnsOrRows.Size = New System.Drawing.Size(214, 29) + Me.ucrPnlColumnsOrRows.Size = New System.Drawing.Size(214, 37) Me.ucrPnlColumnsOrRows.TabIndex = 0 ' 'ucrInputDefaultValue @@ -279,7 +280,7 @@ Partial Class dlgInsertColumn Me.ucrSelectorInsertColumns.Location = New System.Drawing.Point(9, 93) Me.ucrSelectorInsertColumns.Margin = New System.Windows.Forms.Padding(0) Me.ucrSelectorInsertColumns.Name = "ucrSelectorInsertColumns" - Me.ucrSelectorInsertColumns.Size = New System.Drawing.Size(202, 148) + Me.ucrSelectorInsertColumns.Size = New System.Drawing.Size(202, 139) Me.ucrSelectorInsertColumns.TabIndex = 4 ' 'ucrBase @@ -327,7 +328,6 @@ Partial Class dlgInsertColumn Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.ClientSize = New System.Drawing.Size(581, 325) - Me.Controls.Add(Me.grpOPtions) Me.Controls.Add(Me.grpInsert) Me.Controls.Add(Me.ucrSaveInsertColumn) Me.Controls.Add(Me.ucrNudNumberOfColumns) diff --git a/instat/dlgInsertColumn.vb b/instat/dlgInsertColumn.vb index 98a520d2015..535779792b0 100644 --- a/instat/dlgInsertColumn.vb +++ b/instat/dlgInsertColumn.vb @@ -44,6 +44,8 @@ Public Class dlgInsertColumn ucrPnlColumnsOrRows.AddRadioButton(rdoInsertColumns) ucrPnlColumnsOrRows.AddRadioButton(rdoInsertRows) + ucrPnlColumnsOrRows.AddFunctionNamesCondition(rdoInsertRows, frmMain.clsRLink.strInstatDataObject & "$insert_row_in_data") + ucrPnlColumnsOrRows.AddFunctionNamesCondition(rdoInsertColumns, frmMain.clsRLink.strInstatDataObject & "$add_columns_to_data") ucrPnlBeforeAfter.SetParameter(New RParameter("before")) ucrPnlBeforeAfter.AddRadioButton(rdoBefore, "FALSE") @@ -64,20 +66,26 @@ Public Class dlgInsertColumn ucrInputBeforeAfter.SetItems(dctBeforeAfter) ucrInputBeforeAfter.SetRDefault("FALSE") - - ucrPnlStartEnd.SetParameter(ucrInputBeforeAfter.GetParameter) - ucrPnlStartEnd.AddRadioButton(rdoAtEnd, "FALSE") - ucrPnlStartEnd.AddRadioButton(rdoAtStart, "TRUE") - ucrPnlStartEnd.AddRadioButton(rdoBeforeAfter, "FALSE") + ucrPnlStartEnd.AddRadioButton(rdoAtEnd) + ucrPnlStartEnd.AddRadioButton(rdoAtStart) + ucrPnlStartEnd.AddRadioButton(rdoBeforeAfter) ucrNudNumberOfColumns.SetParameter(New RParameter("num_cols")) ucrInputDefaultValue.SetParameter(New RParameter("col_data")) ucrSaveInsertColumn.SetParameter(New RParameter("col_name")) ucrInputDefaultValue.SetRDefault("NA") - ucrPnlColumnsOrRows.AddFunctionNamesCondition(rdoInsertRows, frmMain.clsRLink.strInstatDataObject & "$insert_row_in_data") - ucrPnlColumnsOrRows.AddFunctionNamesCondition(rdoInsertColumns, frmMain.clsRLink.strInstatDataObject & "$add_columns_to_data") - 'Setting Display of the group boxes in the dialog + ucrPnlStartEnd.AddParameterValuesCondition(rdoAtStart, "before", "FALSE") + ucrPnlStartEnd.AddParameterValuesCondition(rdoAtStart, "before", "TRUE", False) + ucrPnlStartEnd.AddParameterPresentCondition(rdoAtStart, "adjacent", False) + + ucrPnlStartEnd.AddParameterValuesCondition(rdoAtEnd, "before", "TRUE") + ucrPnlStartEnd.AddParameterValuesCondition(rdoAtEnd, "before", "FALSE", False) + ucrPnlStartEnd.AddParameterPresentCondition(rdoAtEnd, "adjacent", False) + + ucrPnlStartEnd.AddParameterValuesCondition(rdoBeforeAfter, "before", {"TRUE", "FALSE"}) + ucrPnlStartEnd.AddParameterPresentCondition(rdoBeforeAfter, "adjacent") + ucrPnlColumnsOrRows.AddToLinkedControls(ucrPnlStartEnd, {rdoInsertColumns}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) ucrPnlColumnsOrRows.AddToLinkedControls(ucrInputBeforeAfter, {rdoInsertColumns}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) ucrPnlColumnsOrRows.AddToLinkedControls(ucrReceiverColumnsToInsert, {rdoInsertColumns}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) @@ -102,6 +110,7 @@ Public Class dlgInsertColumn ucrSaveInsertColumn.SetPrefix("X") ucrSaveInsertColumn.SetSaveTypeAsColumn() + 'ucrSaveInsertColumn.SetDataFrameSelector(ucrSelectorInsertColumns.ucrAvailableDataFrames) ucrSaveInsertColumn.SetIsTextBox() ucrSaveInsertColumn.SetLabelText("Prefix For New Column:") @@ -112,6 +121,7 @@ Public Class dlgInsertColumn clsInsertRowFunction = New RFunction ucrSelectorInsertColumns.Reset() ucrDataFramesList.Reset() + ucrInputBeforeAfter.Reset() clsInsertColumnFunction.AddParameter("before", "FALSE") clsInsertRowFunction.AddParameter("before", "FALSE") @@ -122,10 +132,9 @@ Public Class dlgInsertColumn ucrBase.clsRsyntax.SetBaseRFunction(clsInsertRowFunction) End Sub - Private Sub SetRCodeForControls(bReset) - ucrDataFramesList.AddAdditionalCodeParameterPair(clsInsertColumnFunction, New RParameter("data_name"), iAdditionalPairNo:=1) + Private Sub SetRCodeForControls(bReset As Boolean) - ucrPnlStartEnd.AddAdditionalCodeParameterPair(clsInsertColumnFunction, New RParameter("before"), iAdditionalPairNo:=1) + ucrDataFramesList.AddAdditionalCodeParameterPair(clsInsertColumnFunction, New RParameter("data_name"), iAdditionalPairNo:=1) ucrDataFramesList.SetParameterIsString() ucrNudNumberOfRows.SetRCode(clsInsertRowFunction, bReset) @@ -138,11 +147,13 @@ Public Class dlgInsertColumn ucrSaveInsertColumn.SetRCode(clsInsertColumnFunction, bReset) ucrReceiverColumnsToInsert.SetRCode(clsInsertColumnFunction, bReset) ucrDataFramesList.SetRCode(clsInsertColumnFunction, bReset) + ucrPnlColumnsOrRows.SetRCode(clsInsertRowFunction, bReset) + End Sub Private Sub TestOKEnabled() 'If rdoInsertColumns.Checked Then - ' If ((ucrNudNumberOfColumns.Text <> "") And (Not ucrInputDefaultValue.IsEmpty) And (Not ucrInputPrefixForInsertedColumns.IsEmpty) And (ucrDataFramesList.cboAvailableDataFrames.Text <> "")) Then + ' If ((ucrNudNumberOfColumns.Text <> "") And (Not ucrInputDefaultValue.IsEmpty) And (Not ucrInputPrefixForInsertedColumns.IsEmpty) And (ucrDataFramesList.cboAvailableDataFrames.Text <> "")) Then ' ucrBase.OKEnabled(True) ' Else ' ucrBase.OKEnabled(False) From f615fdfe95833cbb7c50e0f2ea09a37bc66fe44c Mon Sep 17 00:00:00 2001 From: shadrack kibet Date: Thu, 25 May 2017 19:10:43 +0300 Subject: [PATCH 039/154] changing defaults --- instat/dlgInsertColumn.Designer.vb | 144 ++++++++++++++--------------- instat/dlgInsertColumn.vb | 9 +- 2 files changed, 77 insertions(+), 76 deletions(-) diff --git a/instat/dlgInsertColumn.Designer.vb b/instat/dlgInsertColumn.Designer.vb index c8d78a303a9..1f2db6dcc91 100644 --- a/instat/dlgInsertColumn.Designer.vb +++ b/instat/dlgInsertColumn.Designer.vb @@ -25,16 +25,16 @@ Partial Class dlgInsertColumn Me.lblStartPos = New System.Windows.Forms.Label() Me.lblNumberOfRowsToInsert = New System.Windows.Forms.Label() Me.grpInsert = New System.Windows.Forms.GroupBox() - Me.grpOPtions = New System.Windows.Forms.GroupBox() - Me.rdoAfter = New System.Windows.Forms.RadioButton() - Me.rdoBefore = New System.Windows.Forms.RadioButton() - Me.ucrPnlBeforeAfter = New instat.UcrPanel() - Me.rdoBeforeAfter = New System.Windows.Forms.RadioButton() Me.ucrInputBeforeAfter = New instat.ucrInputComboBox() Me.ucrReceiverColumnsToInsert = New instat.ucrReceiverSingle() - Me.rdoAtEnd = New System.Windows.Forms.RadioButton() + Me.rdoBeforeAfter = New System.Windows.Forms.RadioButton() Me.rdoAtStart = New System.Windows.Forms.RadioButton() + Me.rdoAtEnd = New System.Windows.Forms.RadioButton() Me.ucrPnlStartEnd = New instat.UcrPanel() + Me.grpOPtions = New System.Windows.Forms.GroupBox() + Me.rdoAfter = New System.Windows.Forms.RadioButton() + Me.rdoBefore = New System.Windows.Forms.RadioButton() + Me.ucrPnlBeforeAfter = New instat.UcrPanel() Me.lblNumberOfColumnsToInsert = New System.Windows.Forms.Label() Me.lblDefaultValue = New System.Windows.Forms.Label() Me.rdoInsertColumns = New System.Windows.Forms.RadioButton() @@ -72,12 +72,11 @@ Partial Class dlgInsertColumn ' 'grpInsert ' - Me.grpInsert.Controls.Add(Me.grpOPtions) - Me.grpInsert.Controls.Add(Me.rdoBeforeAfter) Me.grpInsert.Controls.Add(Me.ucrInputBeforeAfter) Me.grpInsert.Controls.Add(Me.ucrReceiverColumnsToInsert) - Me.grpInsert.Controls.Add(Me.rdoAtEnd) + Me.grpInsert.Controls.Add(Me.rdoBeforeAfter) Me.grpInsert.Controls.Add(Me.rdoAtStart) + Me.grpInsert.Controls.Add(Me.rdoAtEnd) Me.grpInsert.Controls.Add(Me.ucrPnlStartEnd) Me.grpInsert.Location = New System.Drawing.Point(228, 73) Me.grpInsert.Name = "grpInsert" @@ -86,58 +85,6 @@ Partial Class dlgInsertColumn Me.grpInsert.TabStop = False Me.grpInsert.Text = "Insert" ' - 'grpOPtions - ' - Me.grpOPtions.Controls.Add(Me.rdoAfter) - Me.grpOPtions.Controls.Add(Me.rdoBefore) - Me.grpOPtions.Controls.Add(Me.ucrPnlBeforeAfter) - Me.grpOPtions.Location = New System.Drawing.Point(6, 13) - Me.grpOPtions.Name = "grpOPtions" - Me.grpOPtions.Size = New System.Drawing.Size(124, 82) - Me.grpOPtions.TabIndex = 9 - Me.grpOPtions.TabStop = False - Me.grpOPtions.Text = "Options" - ' - 'rdoAfter - ' - Me.rdoAfter.AutoSize = True - Me.rdoAfter.Location = New System.Drawing.Point(6, 51) - Me.rdoAfter.Name = "rdoAfter" - Me.rdoAfter.Size = New System.Drawing.Size(47, 17) - Me.rdoAfter.TabIndex = 1 - Me.rdoAfter.TabStop = True - Me.rdoAfter.Text = "After" - Me.rdoAfter.UseVisualStyleBackColor = True - ' - 'rdoBefore - ' - Me.rdoBefore.AutoSize = True - Me.rdoBefore.Location = New System.Drawing.Point(6, 26) - Me.rdoBefore.Name = "rdoBefore" - Me.rdoBefore.Size = New System.Drawing.Size(56, 17) - Me.rdoBefore.TabIndex = 0 - Me.rdoBefore.TabStop = True - Me.rdoBefore.Text = "Before" - Me.rdoBefore.UseVisualStyleBackColor = True - ' - 'ucrPnlBeforeAfter - ' - Me.ucrPnlBeforeAfter.Location = New System.Drawing.Point(8, 19) - Me.ucrPnlBeforeAfter.Name = "ucrPnlBeforeAfter" - Me.ucrPnlBeforeAfter.Size = New System.Drawing.Size(98, 57) - Me.ucrPnlBeforeAfter.TabIndex = 21 - ' - 'rdoBeforeAfter - ' - Me.rdoBeforeAfter.AutoSize = True - Me.rdoBeforeAfter.Location = New System.Drawing.Point(14, 64) - Me.rdoBeforeAfter.Name = "rdoBeforeAfter" - Me.rdoBeforeAfter.Size = New System.Drawing.Size(96, 17) - Me.rdoBeforeAfter.TabIndex = 23 - Me.rdoBeforeAfter.TabStop = True - Me.rdoBeforeAfter.Text = "Before or After:" - Me.rdoBeforeAfter.UseVisualStyleBackColor = True - ' 'ucrInputBeforeAfter ' Me.ucrInputBeforeAfter.AddQuotesIfUnrecognised = True @@ -159,21 +106,21 @@ Partial Class dlgInsertColumn Me.ucrReceiverColumnsToInsert.TabIndex = 4 Me.ucrReceiverColumnsToInsert.ucrSelector = Nothing ' - 'rdoAtEnd + 'rdoBeforeAfter ' - Me.rdoAtEnd.AutoSize = True - Me.rdoAtEnd.Location = New System.Drawing.Point(15, 18) - Me.rdoAtEnd.Name = "rdoAtEnd" - Me.rdoAtEnd.Size = New System.Drawing.Size(57, 17) - Me.rdoAtEnd.TabIndex = 0 - Me.rdoAtEnd.TabStop = True - Me.rdoAtEnd.Text = "At End" - Me.rdoAtEnd.UseVisualStyleBackColor = True + Me.rdoBeforeAfter.AutoSize = True + Me.rdoBeforeAfter.Location = New System.Drawing.Point(21, 64) + Me.rdoBeforeAfter.Name = "rdoBeforeAfter" + Me.rdoBeforeAfter.Size = New System.Drawing.Size(96, 17) + Me.rdoBeforeAfter.TabIndex = 23 + Me.rdoBeforeAfter.TabStop = True + Me.rdoBeforeAfter.Text = "Before or After:" + Me.rdoBeforeAfter.UseVisualStyleBackColor = True ' 'rdoAtStart ' Me.rdoAtStart.AutoSize = True - Me.rdoAtStart.Location = New System.Drawing.Point(16, 38) + Me.rdoAtStart.Location = New System.Drawing.Point(22, 38) Me.rdoAtStart.Name = "rdoAtStart" Me.rdoAtStart.Size = New System.Drawing.Size(60, 17) Me.rdoAtStart.TabIndex = 1 @@ -181,6 +128,17 @@ Partial Class dlgInsertColumn Me.rdoAtStart.Text = "At Start" Me.rdoAtStart.UseVisualStyleBackColor = True ' + 'rdoAtEnd + ' + Me.rdoAtEnd.AutoSize = True + Me.rdoAtEnd.Location = New System.Drawing.Point(22, 18) + Me.rdoAtEnd.Name = "rdoAtEnd" + Me.rdoAtEnd.Size = New System.Drawing.Size(57, 17) + Me.rdoAtEnd.TabIndex = 0 + Me.rdoAtEnd.TabStop = True + Me.rdoAtEnd.Text = "At End" + Me.rdoAtEnd.UseVisualStyleBackColor = True + ' 'ucrPnlStartEnd ' Me.ucrPnlStartEnd.Location = New System.Drawing.Point(6, 14) @@ -188,6 +146,47 @@ Partial Class dlgInsertColumn Me.ucrPnlStartEnd.Size = New System.Drawing.Size(112, 81) Me.ucrPnlStartEnd.TabIndex = 22 ' + 'grpOPtions + ' + Me.grpOPtions.Controls.Add(Me.rdoAfter) + Me.grpOPtions.Controls.Add(Me.rdoBefore) + Me.grpOPtions.Controls.Add(Me.ucrPnlBeforeAfter) + Me.grpOPtions.Location = New System.Drawing.Point(228, 86) + Me.grpOPtions.Name = "grpOPtions" + Me.grpOPtions.Size = New System.Drawing.Size(124, 82) + Me.grpOPtions.TabIndex = 9 + Me.grpOPtions.TabStop = False + Me.grpOPtions.Text = "Options" + ' + 'rdoAfter + ' + Me.rdoAfter.AutoSize = True + Me.rdoAfter.Location = New System.Drawing.Point(6, 51) + Me.rdoAfter.Name = "rdoAfter" + Me.rdoAfter.Size = New System.Drawing.Size(47, 17) + Me.rdoAfter.TabIndex = 1 + Me.rdoAfter.TabStop = True + Me.rdoAfter.Text = "After" + Me.rdoAfter.UseVisualStyleBackColor = True + ' + 'rdoBefore + ' + Me.rdoBefore.AutoSize = True + Me.rdoBefore.Location = New System.Drawing.Point(6, 26) + Me.rdoBefore.Name = "rdoBefore" + Me.rdoBefore.Size = New System.Drawing.Size(56, 17) + Me.rdoBefore.TabIndex = 0 + Me.rdoBefore.TabStop = True + Me.rdoBefore.Text = "Before" + Me.rdoBefore.UseVisualStyleBackColor = True + ' + 'ucrPnlBeforeAfter + ' + Me.ucrPnlBeforeAfter.Location = New System.Drawing.Point(3, 16) + Me.ucrPnlBeforeAfter.Name = "ucrPnlBeforeAfter" + Me.ucrPnlBeforeAfter.Size = New System.Drawing.Size(71, 57) + Me.ucrPnlBeforeAfter.TabIndex = 21 + ' 'lblNumberOfColumnsToInsert ' Me.lblNumberOfColumnsToInsert.AutoSize = True @@ -328,12 +327,12 @@ Partial Class dlgInsertColumn Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.ClientSize = New System.Drawing.Size(581, 325) - Me.Controls.Add(Me.grpInsert) Me.Controls.Add(Me.ucrSaveInsertColumn) Me.Controls.Add(Me.ucrNudNumberOfColumns) Me.Controls.Add(Me.rdoInsertRows) Me.Controls.Add(Me.rdoInsertColumns) Me.Controls.Add(Me.ucrPnlColumnsOrRows) + Me.Controls.Add(Me.grpOPtions) Me.Controls.Add(Me.ucrInputDefaultValue) Me.Controls.Add(Me.lblDefaultValue) Me.Controls.Add(Me.lblNumberOfColumnsToInsert) @@ -344,6 +343,7 @@ Partial Class dlgInsertColumn Me.Controls.Add(Me.ucrDataFramesList) Me.Controls.Add(Me.ucrNudNumberOfRows) Me.Controls.Add(Me.ucrNudStartRow) + Me.Controls.Add(Me.grpInsert) Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow Me.MaximizeBox = False Me.MinimizeBox = False diff --git a/instat/dlgInsertColumn.vb b/instat/dlgInsertColumn.vb index 535779792b0..0d5c63053c5 100644 --- a/instat/dlgInsertColumn.vb +++ b/instat/dlgInsertColumn.vb @@ -102,7 +102,6 @@ Public Class dlgInsertColumn ucrPnlStartEnd.AddToLinkedControls(ucrInputBeforeAfter, {rdoBeforeAfter}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) ucrPnlStartEnd.AddToLinkedControls(ucrReceiverColumnsToInsert, {rdoBeforeAfter}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) ucrPnlStartEnd.SetLinkedDisplayControl(grpInsert) - 'ucrSelectorInsertColumns.AddToLinkedControls(ucrNudStartRow, {rdoInsertRows}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) ucrNudNumberOfColumns.SetLinkedDisplayControl(lblNumberOfColumnsToInsert) ucrInputDefaultValue.SetLinkedDisplayControl(lblDefaultValue) ucrNudNumberOfRows.SetLinkedDisplayControl(lblNumberOfRowsToInsert) @@ -110,7 +109,7 @@ Public Class dlgInsertColumn ucrSaveInsertColumn.SetPrefix("X") ucrSaveInsertColumn.SetSaveTypeAsColumn() - 'ucrSaveInsertColumn.SetDataFrameSelector(ucrSelectorInsertColumns.ucrAvailableDataFrames) + ucrSaveInsertColumn.SetDataFrameSelector(ucrDataFramesList) ucrSaveInsertColumn.SetIsTextBox() ucrSaveInsertColumn.SetLabelText("Prefix For New Column:") @@ -122,6 +121,8 @@ Public Class dlgInsertColumn ucrSelectorInsertColumns.Reset() ucrDataFramesList.Reset() ucrInputBeforeAfter.Reset() + ucrInputDefaultValue.Reset() + ucrSaveInsertColumn.Reset() clsInsertColumnFunction.AddParameter("before", "FALSE") clsInsertRowFunction.AddParameter("before", "FALSE") @@ -129,7 +130,7 @@ Public Class dlgInsertColumn clsInsertRowFunction.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$insert_row_in_data") clsInsertRowFunction.AddParameter("start_row", ucrDataFramesList.iDataFrameLength) - ucrBase.clsRsyntax.SetBaseRFunction(clsInsertRowFunction) + ucrBase.clsRsyntax.SetBaseRFunction(clsInsertColumnFunction) End Sub Private Sub SetRCodeForControls(bReset As Boolean) @@ -147,7 +148,7 @@ Public Class dlgInsertColumn ucrSaveInsertColumn.SetRCode(clsInsertColumnFunction, bReset) ucrReceiverColumnsToInsert.SetRCode(clsInsertColumnFunction, bReset) ucrDataFramesList.SetRCode(clsInsertColumnFunction, bReset) - ucrPnlColumnsOrRows.SetRCode(clsInsertRowFunction, bReset) + ucrPnlColumnsOrRows.SetRCode(clsInsertColumnFunction, bReset) End Sub From 752932e53e7abef4813bde718e7c32a05614b91d Mon Sep 17 00:00:00 2001 From: shadrack kibet Date: Thu, 25 May 2017 21:27:32 +0300 Subject: [PATCH 040/154] Code addition --- instat/dlgInsertColumn.vb | 30 ++++++++++++------------------ 1 file changed, 12 insertions(+), 18 deletions(-) diff --git a/instat/dlgInsertColumn.vb b/instat/dlgInsertColumn.vb index 0d5c63053c5..99d828648c9 100644 --- a/instat/dlgInsertColumn.vb +++ b/instat/dlgInsertColumn.vb @@ -109,7 +109,7 @@ Public Class dlgInsertColumn ucrSaveInsertColumn.SetPrefix("X") ucrSaveInsertColumn.SetSaveTypeAsColumn() - ucrSaveInsertColumn.SetDataFrameSelector(ucrDataFramesList) + 'ucrSaveInsertColumn.SetDataFrameSelector(ucrDataFramesList) ucrSaveInsertColumn.SetIsTextBox() ucrSaveInsertColumn.SetLabelText("Prefix For New Column:") @@ -153,23 +153,13 @@ Public Class dlgInsertColumn End Sub Private Sub TestOKEnabled() - 'If rdoInsertColumns.Checked Then - ' If ((ucrNudNumberOfColumns.Text <> "") And (Not ucrInputDefaultValue.IsEmpty) And (Not ucrInputPrefixForInsertedColumns.IsEmpty) And (ucrDataFramesList.cboAvailableDataFrames.Text <> "")) Then - ' ucrBase.OKEnabled(True) - ' Else - ' ucrBase.OKEnabled(False) - - ' End If - 'ElseIf rdoInsertRows.Checked Then - ' If ((ucrNudNumberOfRows.Text <> "") And (ucrNudStartRow.Text <> "") And (ucrDataFramesList.cboAvailableDataFrames.Text <> "")) Then - ' ucrBase.OKEnabled(True) - ' Else - ' ucrBase.OKEnabled(False) - ' End If - 'Else - ' ucrBase.OKEnabled(False) - 'End If - ucrBase.OKEnabled(True) + If (rdoInsertColumns.Checked AndAlso ucrNudNumberOfColumns.Text <> "" AndAlso Not ucrInputDefaultValue.IsEmpty AndAlso ucrSaveInsertColumn.IsComplete OrElse rdoAtEnd.Checked OrElse rdoAtStart.Checked OrElse rdoBeforeAfter.Checked) Then + ucrBase.OKEnabled(True) + ElseIf (rdoInsertRows.Checked AndAlso ucrNudNumberOfRows.Text <> "" AndAlso ucrNudStartRow.Text <> "" OrElse rdoAfter.Checked OrElse rdoBefore.Checked) Then + ucrBase.OKEnabled(True) + Else + ucrBase.OKEnabled(False) + End If End Sub Private Sub ucrBase_ClickReset(sender As Object, e As EventArgs) Handles ucrBase.ClickReset @@ -185,4 +175,8 @@ Public Class dlgInsertColumn ucrBase.clsRsyntax.SetBaseRFunction(clsInsertRowFunction) End If End Sub + + Private Sub ucrReceiverColumnsToInsert_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrReceiverColumnsToInsert.ControlContentsChanged + TestOKEnabled() + End Sub End Class \ No newline at end of file From f5474a2a2212ef2d3eb88b935e1057d6712309a6 Mon Sep 17 00:00:00 2001 From: shadrack kibet Date: Fri, 26 May 2017 11:37:51 +0300 Subject: [PATCH 041/154] changing ucrsave to Input textBox --- instat/dlgInsertColumn.Designer.vb | 37 +++++++++++++++++++++--------- instat/dlgInsertColumn.vb | 33 +++++++++++++------------- 2 files changed, 43 insertions(+), 27 deletions(-) diff --git a/instat/dlgInsertColumn.Designer.vb b/instat/dlgInsertColumn.Designer.vb index 1f2db6dcc91..a3a439fae9b 100644 --- a/instat/dlgInsertColumn.Designer.vb +++ b/instat/dlgInsertColumn.Designer.vb @@ -39,7 +39,6 @@ Partial Class dlgInsertColumn Me.lblDefaultValue = New System.Windows.Forms.Label() Me.rdoInsertColumns = New System.Windows.Forms.RadioButton() Me.rdoInsertRows = New System.Windows.Forms.RadioButton() - Me.ucrSaveInsertColumn = New instat.ucrSave() Me.ucrNudNumberOfColumns = New instat.ucrNud() Me.ucrPnlColumnsOrRows = New instat.UcrPanel() Me.ucrInputDefaultValue = New instat.ucrInputTextBox() @@ -48,6 +47,8 @@ Partial Class dlgInsertColumn Me.ucrDataFramesList = New instat.ucrDataFrame() Me.ucrNudNumberOfRows = New instat.ucrNud() Me.ucrNudStartRow = New instat.ucrNud() + Me.ucrInputPrefixForNewColumn = New instat.ucrInputTextBox() + Me.lblInputPrefix = New System.Windows.Forms.Label() Me.grpInsert.SuspendLayout() Me.grpOPtions.SuspendLayout() Me.SuspendLayout() @@ -237,13 +238,6 @@ Partial Class dlgInsertColumn Me.rdoInsertRows.TextAlign = System.Drawing.ContentAlignment.MiddleCenter Me.rdoInsertRows.UseVisualStyleBackColor = True ' - 'ucrSaveInsertColumn - ' - Me.ucrSaveInsertColumn.Location = New System.Drawing.Point(10, 235) - Me.ucrSaveInsertColumn.Name = "ucrSaveInsertColumn" - Me.ucrSaveInsertColumn.Size = New System.Drawing.Size(343, 24) - Me.ucrSaveInsertColumn.TabIndex = 21 - ' 'ucrNudNumberOfColumns ' Me.ucrNudNumberOfColumns.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) @@ -322,12 +316,32 @@ Partial Class dlgInsertColumn Me.ucrNudStartRow.TabIndex = 19 Me.ucrNudStartRow.Value = New Decimal(New Integer() {0, 0, 0, 0}) ' + 'ucrInputPrefixForNewColumn + ' + Me.ucrInputPrefixForNewColumn.AddQuotesIfUnrecognised = True + Me.ucrInputPrefixForNewColumn.IsMultiline = False + Me.ucrInputPrefixForNewColumn.IsReadOnly = False + Me.ucrInputPrefixForNewColumn.Location = New System.Drawing.Point(165, 235) + Me.ucrInputPrefixForNewColumn.Name = "ucrInputPrefixForNewColumn" + Me.ucrInputPrefixForNewColumn.Size = New System.Drawing.Size(137, 21) + Me.ucrInputPrefixForNewColumn.TabIndex = 21 + ' + 'lblInputPrefix + ' + Me.lblInputPrefix.AutoSize = True + Me.lblInputPrefix.Location = New System.Drawing.Point(16, 235) + Me.lblInputPrefix.Name = "lblInputPrefix" + Me.lblInputPrefix.Size = New System.Drawing.Size(117, 13) + Me.lblInputPrefix.TabIndex = 22 + Me.lblInputPrefix.Text = "Prefix For New Column:" + ' 'dlgInsertColumn ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(581, 325) - Me.Controls.Add(Me.ucrSaveInsertColumn) + Me.ClientSize = New System.Drawing.Size(548, 325) + Me.Controls.Add(Me.lblInputPrefix) + Me.Controls.Add(Me.ucrInputPrefixForNewColumn) Me.Controls.Add(Me.ucrNudNumberOfColumns) Me.Controls.Add(Me.rdoInsertRows) Me.Controls.Add(Me.rdoInsertColumns) @@ -383,6 +397,7 @@ Partial Class dlgInsertColumn Friend WithEvents ucrNudNumberOfRows As ucrNud Friend WithEvents ucrPnlBeforeAfter As UcrPanel Friend WithEvents ucrPnlStartEnd As UcrPanel - Friend WithEvents ucrSaveInsertColumn As ucrSave Friend WithEvents rdoBeforeAfter As RadioButton + Friend WithEvents lblInputPrefix As Label + Friend WithEvents ucrInputPrefixForNewColumn As ucrInputTextBox End Class diff --git a/instat/dlgInsertColumn.vb b/instat/dlgInsertColumn.vb index 99d828648c9..a4a5ae635f5 100644 --- a/instat/dlgInsertColumn.vb +++ b/instat/dlgInsertColumn.vb @@ -14,7 +14,6 @@ ' You should have received a copy of the GNU General Public License k ' along with this program. If not, see . -Imports instat Imports instat.Translations Public Class dlgInsertColumn Private bFirstload As Boolean = True @@ -58,7 +57,6 @@ Public Class dlgInsertColumn ucrNudNumberOfRows.SetRDefault(1) ucrNudNumberOfColumns.SetRDefault(1) - Dim dctBeforeAfter As New Dictionary(Of String, String) ucrInputBeforeAfter.SetParameter(New RParameter("before")) dctBeforeAfter.Add("Before", "FALSE") @@ -72,7 +70,7 @@ Public Class dlgInsertColumn ucrNudNumberOfColumns.SetParameter(New RParameter("num_cols")) ucrInputDefaultValue.SetParameter(New RParameter("col_data")) - ucrSaveInsertColumn.SetParameter(New RParameter("col_name")) + ucrInputPrefixForNewColumn.SetParameter(New RParameter("col_name")) ucrInputDefaultValue.SetRDefault("NA") ucrPnlStartEnd.AddParameterValuesCondition(rdoAtStart, "before", "FALSE") @@ -92,7 +90,7 @@ Public Class dlgInsertColumn ucrPnlColumnsOrRows.AddToLinkedControls(ucrNudNumberOfColumns, {rdoInsertColumns}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) ucrPnlColumnsOrRows.AddToLinkedControls(ucrInputDefaultValue, {rdoInsertColumns}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) - ucrPnlColumnsOrRows.AddToLinkedControls(ucrSaveInsertColumn, {rdoInsertColumns}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) + ucrPnlColumnsOrRows.AddToLinkedControls(ucrInputPrefixForNewColumn, {rdoInsertColumns}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) ucrPnlColumnsOrRows.AddToLinkedControls(ucrPnlBeforeAfter, {rdoInsertRows}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) ucrPnlColumnsOrRows.AddToLinkedControls(ucrNudNumberOfRows, {rdoInsertRows}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) @@ -107,11 +105,11 @@ Public Class dlgInsertColumn ucrNudNumberOfRows.SetLinkedDisplayControl(lblNumberOfRowsToInsert) ucrNudStartRow.SetLinkedDisplayControl(lblStartPos) - ucrSaveInsertColumn.SetPrefix("X") - ucrSaveInsertColumn.SetSaveTypeAsColumn() + ucrInputPrefixForNewColumn.SetName("X") + 'ucrSaveInsertColumn.SetSaveTypeAsColumn() 'ucrSaveInsertColumn.SetDataFrameSelector(ucrDataFramesList) - ucrSaveInsertColumn.SetIsTextBox() - ucrSaveInsertColumn.SetLabelText("Prefix For New Column:") + 'ucrSaveInsertColumn.SetIsTextBox() + 'ucrSaveInsertColumn.SetLabelText("Prefix For New Column:") End Sub @@ -122,14 +120,14 @@ Public Class dlgInsertColumn ucrDataFramesList.Reset() ucrInputBeforeAfter.Reset() ucrInputDefaultValue.Reset() - ucrSaveInsertColumn.Reset() + ucrInputPrefixForNewColumn.Reset() + clsInsertColumnFunction.AddParameter("use_col_name_as_prefix", "TRUE") clsInsertColumnFunction.AddParameter("before", "FALSE") clsInsertRowFunction.AddParameter("before", "FALSE") clsInsertColumnFunction.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$add_columns_to_data") clsInsertRowFunction.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$insert_row_in_data") clsInsertRowFunction.AddParameter("start_row", ucrDataFramesList.iDataFrameLength) - ucrBase.clsRsyntax.SetBaseRFunction(clsInsertColumnFunction) End Sub @@ -142,20 +140,23 @@ Public Class dlgInsertColumn ucrNudStartRow.SetRCode(clsInsertRowFunction, bReset) ucrDataFramesList.SetRCode(clsInsertRowFunction, bReset) ucrPnlBeforeAfter.SetRCode(clsInsertRowFunction, bReset) - ucrPnlStartEnd.SetRCode(clsInsertColumnFunction, bReset) + ucrNudNumberOfColumns.SetRCode(clsInsertColumnFunction, bReset) ucrInputDefaultValue.SetRCode(clsInsertColumnFunction, bReset) - ucrSaveInsertColumn.SetRCode(clsInsertColumnFunction, bReset) + + ucrInputPrefixForNewColumn.SetRCode(clsInsertColumnFunction, bReset) ucrReceiverColumnsToInsert.SetRCode(clsInsertColumnFunction, bReset) ucrDataFramesList.SetRCode(clsInsertColumnFunction, bReset) ucrPnlColumnsOrRows.SetRCode(clsInsertColumnFunction, bReset) - + ucrPnlStartEnd.SetRCode(clsInsertColumnFunction, bReset) End Sub Private Sub TestOKEnabled() - If (rdoInsertColumns.Checked AndAlso ucrNudNumberOfColumns.Text <> "" AndAlso Not ucrInputDefaultValue.IsEmpty AndAlso ucrSaveInsertColumn.IsComplete OrElse rdoAtEnd.Checked OrElse rdoAtStart.Checked OrElse rdoBeforeAfter.Checked) Then + If ((rdoInsertColumns.Checked AndAlso rdoAtEnd.Checked OrElse rdoAtStart.Checked) AndAlso ucrNudNumberOfColumns.GetText <> "" AndAlso Not ucrInputDefaultValue.IsEmpty AndAlso Not ucrInputPrefixForNewColumn.IsEmpty) Then + ucrBase.OKEnabled(True) + ElseIf (rdoInsertColumns.Checked AndAlso rdoBeforeAfter.Checked AndAlso Not ucrInputBeforeAfter.IsEmpty AndAlso Not ucrReceiverColumnsToInsert.IsEmpty AndAlso Not ucrInputPrefixForNewColumn.IsEmpty AndAlso Not ucrNudNumberOfColumns.GetText <> "" AndAlso Not ucrInputDefaultValue.IsEmpty) ucrBase.OKEnabled(True) - ElseIf (rdoInsertRows.Checked AndAlso ucrNudNumberOfRows.Text <> "" AndAlso ucrNudStartRow.Text <> "" OrElse rdoAfter.Checked OrElse rdoBefore.Checked) Then + ElseIf (rdoInsertRows.Checked AndAlso ucrNudNumberOfRows.GetText <> "" AndAlso ucrNudStartRow.GetText <> "" OrElse rdoAfter.Checked OrElse rdoBefore.Checked) Then ucrBase.OKEnabled(True) Else ucrBase.OKEnabled(False) @@ -176,7 +177,7 @@ Public Class dlgInsertColumn End If End Sub - Private Sub ucrReceiverColumnsToInsert_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrReceiverColumnsToInsert.ControlContentsChanged + Private Sub ucrReceiverColumnsToInsert_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrReceiverColumnsToInsert.ControlContentsChanged, ucrPnlColumnsOrRows.ControlContentsChanged, ucrPnlStartEnd.ControlContentsChanged TestOKEnabled() End Sub End Class \ No newline at end of file From 1582cfca7139a353d4d5b833e0d36e66dffd333a Mon Sep 17 00:00:00 2001 From: shadrack kibet Date: Fri, 26 May 2017 11:45:40 +0300 Subject: [PATCH 042/154] Tab order --- instat/dlgInsertColumn.Designer.vb | 40 +++++++++++++++--------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/instat/dlgInsertColumn.Designer.vb b/instat/dlgInsertColumn.Designer.vb index a3a439fae9b..6a28cbfb2f7 100644 --- a/instat/dlgInsertColumn.Designer.vb +++ b/instat/dlgInsertColumn.Designer.vb @@ -79,10 +79,11 @@ Partial Class dlgInsertColumn Me.grpInsert.Controls.Add(Me.rdoAtStart) Me.grpInsert.Controls.Add(Me.rdoAtEnd) Me.grpInsert.Controls.Add(Me.ucrPnlStartEnd) + Me.grpInsert.Controls.Add(Me.grpOPtions) Me.grpInsert.Location = New System.Drawing.Point(228, 73) Me.grpInsert.Name = "grpInsert" Me.grpInsert.Size = New System.Drawing.Size(316, 101) - Me.grpInsert.TabIndex = 10 + Me.grpInsert.TabIndex = 4 Me.grpInsert.TabStop = False Me.grpInsert.Text = "Insert" ' @@ -93,7 +94,7 @@ Partial Class dlgInsertColumn Me.ucrInputBeforeAfter.Location = New System.Drawing.Point(131, 63) Me.ucrInputBeforeAfter.Name = "ucrInputBeforeAfter" Me.ucrInputBeforeAfter.Size = New System.Drawing.Size(93, 21) - Me.ucrInputBeforeAfter.TabIndex = 3 + Me.ucrInputBeforeAfter.TabIndex = 4 ' 'ucrReceiverColumnsToInsert ' @@ -104,7 +105,7 @@ Partial Class dlgInsertColumn Me.ucrReceiverColumnsToInsert.Selector = Nothing Me.ucrReceiverColumnsToInsert.Size = New System.Drawing.Size(75, 20) Me.ucrReceiverColumnsToInsert.strNcFilePath = "" - Me.ucrReceiverColumnsToInsert.TabIndex = 4 + Me.ucrReceiverColumnsToInsert.TabIndex = 5 Me.ucrReceiverColumnsToInsert.ucrSelector = Nothing ' 'rdoBeforeAfter @@ -113,7 +114,7 @@ Partial Class dlgInsertColumn Me.rdoBeforeAfter.Location = New System.Drawing.Point(21, 64) Me.rdoBeforeAfter.Name = "rdoBeforeAfter" Me.rdoBeforeAfter.Size = New System.Drawing.Size(96, 17) - Me.rdoBeforeAfter.TabIndex = 23 + Me.rdoBeforeAfter.TabIndex = 3 Me.rdoBeforeAfter.TabStop = True Me.rdoBeforeAfter.Text = "Before or After:" Me.rdoBeforeAfter.UseVisualStyleBackColor = True @@ -124,7 +125,7 @@ Partial Class dlgInsertColumn Me.rdoAtStart.Location = New System.Drawing.Point(22, 38) Me.rdoAtStart.Name = "rdoAtStart" Me.rdoAtStart.Size = New System.Drawing.Size(60, 17) - Me.rdoAtStart.TabIndex = 1 + Me.rdoAtStart.TabIndex = 2 Me.rdoAtStart.TabStop = True Me.rdoAtStart.Text = "At Start" Me.rdoAtStart.UseVisualStyleBackColor = True @@ -135,7 +136,7 @@ Partial Class dlgInsertColumn Me.rdoAtEnd.Location = New System.Drawing.Point(22, 18) Me.rdoAtEnd.Name = "rdoAtEnd" Me.rdoAtEnd.Size = New System.Drawing.Size(57, 17) - Me.rdoAtEnd.TabIndex = 0 + Me.rdoAtEnd.TabIndex = 1 Me.rdoAtEnd.TabStop = True Me.rdoAtEnd.Text = "At End" Me.rdoAtEnd.UseVisualStyleBackColor = True @@ -145,17 +146,17 @@ Partial Class dlgInsertColumn Me.ucrPnlStartEnd.Location = New System.Drawing.Point(6, 14) Me.ucrPnlStartEnd.Name = "ucrPnlStartEnd" Me.ucrPnlStartEnd.Size = New System.Drawing.Size(112, 81) - Me.ucrPnlStartEnd.TabIndex = 22 + Me.ucrPnlStartEnd.TabIndex = 0 ' 'grpOPtions ' Me.grpOPtions.Controls.Add(Me.rdoAfter) Me.grpOPtions.Controls.Add(Me.rdoBefore) Me.grpOPtions.Controls.Add(Me.ucrPnlBeforeAfter) - Me.grpOPtions.Location = New System.Drawing.Point(228, 86) + Me.grpOPtions.Location = New System.Drawing.Point(0, 14) Me.grpOPtions.Name = "grpOPtions" Me.grpOPtions.Size = New System.Drawing.Size(124, 82) - Me.grpOPtions.TabIndex = 9 + Me.grpOPtions.TabIndex = 5 Me.grpOPtions.TabStop = False Me.grpOPtions.Text = "Options" ' @@ -165,7 +166,7 @@ Partial Class dlgInsertColumn Me.rdoAfter.Location = New System.Drawing.Point(6, 51) Me.rdoAfter.Name = "rdoAfter" Me.rdoAfter.Size = New System.Drawing.Size(47, 17) - Me.rdoAfter.TabIndex = 1 + Me.rdoAfter.TabIndex = 2 Me.rdoAfter.TabStop = True Me.rdoAfter.Text = "After" Me.rdoAfter.UseVisualStyleBackColor = True @@ -176,7 +177,7 @@ Partial Class dlgInsertColumn Me.rdoBefore.Location = New System.Drawing.Point(6, 26) Me.rdoBefore.Name = "rdoBefore" Me.rdoBefore.Size = New System.Drawing.Size(56, 17) - Me.rdoBefore.TabIndex = 0 + Me.rdoBefore.TabIndex = 1 Me.rdoBefore.TabStop = True Me.rdoBefore.Text = "Before" Me.rdoBefore.UseVisualStyleBackColor = True @@ -186,7 +187,7 @@ Partial Class dlgInsertColumn Me.ucrPnlBeforeAfter.Location = New System.Drawing.Point(3, 16) Me.ucrPnlBeforeAfter.Name = "ucrPnlBeforeAfter" Me.ucrPnlBeforeAfter.Size = New System.Drawing.Size(71, 57) - Me.ucrPnlBeforeAfter.TabIndex = 21 + Me.ucrPnlBeforeAfter.TabIndex = 0 ' 'lblNumberOfColumnsToInsert ' @@ -194,7 +195,7 @@ Partial Class dlgInsertColumn Me.lblNumberOfColumnsToInsert.Location = New System.Drawing.Point(232, 184) Me.lblNumberOfColumnsToInsert.Name = "lblNumberOfColumnsToInsert" Me.lblNumberOfColumnsToInsert.Size = New System.Drawing.Size(143, 13) - Me.lblNumberOfColumnsToInsert.TabIndex = 11 + Me.lblNumberOfColumnsToInsert.TabIndex = 6 Me.lblNumberOfColumnsToInsert.Text = "Number of Columns to Insert:" ' 'lblDefaultValue @@ -203,7 +204,7 @@ Partial Class dlgInsertColumn Me.lblDefaultValue.Location = New System.Drawing.Point(233, 208) Me.lblDefaultValue.Name = "lblDefaultValue" Me.lblDefaultValue.Size = New System.Drawing.Size(74, 13) - Me.lblDefaultValue.TabIndex = 13 + Me.lblDefaultValue.TabIndex = 8 Me.lblDefaultValue.Text = "Default Value:" ' 'rdoInsertColumns @@ -247,7 +248,7 @@ Partial Class dlgInsertColumn Me.ucrNudNumberOfColumns.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudNumberOfColumns.Name = "ucrNudNumberOfColumns" Me.ucrNudNumberOfColumns.Size = New System.Drawing.Size(50, 20) - Me.ucrNudNumberOfColumns.TabIndex = 20 + Me.ucrNudNumberOfColumns.TabIndex = 7 Me.ucrNudNumberOfColumns.Value = New Decimal(New Integer() {0, 0, 0, 0}) ' 'ucrPnlColumnsOrRows @@ -265,7 +266,7 @@ Partial Class dlgInsertColumn Me.ucrInputDefaultValue.Location = New System.Drawing.Point(374, 204) Me.ucrInputDefaultValue.Name = "ucrInputDefaultValue" Me.ucrInputDefaultValue.Size = New System.Drawing.Size(45, 21) - Me.ucrInputDefaultValue.TabIndex = 14 + Me.ucrInputDefaultValue.TabIndex = 9 ' 'ucrSelectorInsertColumns ' @@ -281,7 +282,7 @@ Partial Class dlgInsertColumn Me.ucrBase.Location = New System.Drawing.Point(10, 260) Me.ucrBase.Name = "ucrBase" Me.ucrBase.Size = New System.Drawing.Size(410, 53) - Me.ucrBase.TabIndex = 17 + Me.ucrBase.TabIndex = 12 ' 'ucrDataFramesList ' @@ -324,7 +325,7 @@ Partial Class dlgInsertColumn Me.ucrInputPrefixForNewColumn.Location = New System.Drawing.Point(165, 235) Me.ucrInputPrefixForNewColumn.Name = "ucrInputPrefixForNewColumn" Me.ucrInputPrefixForNewColumn.Size = New System.Drawing.Size(137, 21) - Me.ucrInputPrefixForNewColumn.TabIndex = 21 + Me.ucrInputPrefixForNewColumn.TabIndex = 11 ' 'lblInputPrefix ' @@ -332,7 +333,7 @@ Partial Class dlgInsertColumn Me.lblInputPrefix.Location = New System.Drawing.Point(16, 235) Me.lblInputPrefix.Name = "lblInputPrefix" Me.lblInputPrefix.Size = New System.Drawing.Size(117, 13) - Me.lblInputPrefix.TabIndex = 22 + Me.lblInputPrefix.TabIndex = 10 Me.lblInputPrefix.Text = "Prefix For New Column:" ' 'dlgInsertColumn @@ -346,7 +347,6 @@ Partial Class dlgInsertColumn Me.Controls.Add(Me.rdoInsertRows) Me.Controls.Add(Me.rdoInsertColumns) Me.Controls.Add(Me.ucrPnlColumnsOrRows) - Me.Controls.Add(Me.grpOPtions) Me.Controls.Add(Me.ucrInputDefaultValue) Me.Controls.Add(Me.lblDefaultValue) Me.Controls.Add(Me.lblNumberOfColumnsToInsert) From d200d437c201a6609247aac4737499324045a0bc Mon Sep 17 00:00:00 2001 From: shadrack kibet Date: Fri, 26 May 2017 19:50:45 +0300 Subject: [PATCH 043/154] edits --- instat/dlgInsertColumn.Designer.vb | 74 +++++++++++++++--------------- instat/dlgInsertColumn.vb | 32 +++++++------ 2 files changed, 54 insertions(+), 52 deletions(-) diff --git a/instat/dlgInsertColumn.Designer.vb b/instat/dlgInsertColumn.Designer.vb index 6a28cbfb2f7..1f6621385c2 100644 --- a/instat/dlgInsertColumn.Designer.vb +++ b/instat/dlgInsertColumn.Designer.vb @@ -39,6 +39,8 @@ Partial Class dlgInsertColumn Me.lblDefaultValue = New System.Windows.Forms.Label() Me.rdoInsertColumns = New System.Windows.Forms.RadioButton() Me.rdoInsertRows = New System.Windows.Forms.RadioButton() + Me.lblInputPrefix = New System.Windows.Forms.Label() + Me.ucrInputPrefixForNewColumn = New instat.ucrInputTextBox() Me.ucrNudNumberOfColumns = New instat.ucrNud() Me.ucrPnlColumnsOrRows = New instat.UcrPanel() Me.ucrInputDefaultValue = New instat.ucrInputTextBox() @@ -47,8 +49,6 @@ Partial Class dlgInsertColumn Me.ucrDataFramesList = New instat.ucrDataFrame() Me.ucrNudNumberOfRows = New instat.ucrNud() Me.ucrNudStartRow = New instat.ucrNud() - Me.ucrInputPrefixForNewColumn = New instat.ucrInputTextBox() - Me.lblInputPrefix = New System.Windows.Forms.Label() Me.grpInsert.SuspendLayout() Me.grpOPtions.SuspendLayout() Me.SuspendLayout() @@ -59,7 +59,7 @@ Partial Class dlgInsertColumn Me.lblStartPos.Location = New System.Drawing.Point(12, 129) Me.lblStartPos.Name = "lblStartPos" Me.lblStartPos.Size = New System.Drawing.Size(88, 13) - Me.lblStartPos.TabIndex = 7 + Me.lblStartPos.TabIndex = 11 Me.lblStartPos.Text = "Insert at Position:" ' 'lblNumberOfRowsToInsert @@ -68,7 +68,7 @@ Partial Class dlgInsertColumn Me.lblNumberOfRowsToInsert.Location = New System.Drawing.Point(12, 103) Me.lblNumberOfRowsToInsert.Name = "lblNumberOfRowsToInsert" Me.lblNumberOfRowsToInsert.Size = New System.Drawing.Size(130, 13) - Me.lblNumberOfRowsToInsert.TabIndex = 5 + Me.lblNumberOfRowsToInsert.TabIndex = 9 Me.lblNumberOfRowsToInsert.Text = "Number of Rows to Insert:" ' 'grpInsert @@ -79,8 +79,7 @@ Partial Class dlgInsertColumn Me.grpInsert.Controls.Add(Me.rdoAtStart) Me.grpInsert.Controls.Add(Me.rdoAtEnd) Me.grpInsert.Controls.Add(Me.ucrPnlStartEnd) - Me.grpInsert.Controls.Add(Me.grpOPtions) - Me.grpInsert.Location = New System.Drawing.Point(228, 73) + Me.grpInsert.Location = New System.Drawing.Point(235, 91) Me.grpInsert.Name = "grpInsert" Me.grpInsert.Size = New System.Drawing.Size(316, 101) Me.grpInsert.TabIndex = 4 @@ -153,10 +152,10 @@ Partial Class dlgInsertColumn Me.grpOPtions.Controls.Add(Me.rdoAfter) Me.grpOPtions.Controls.Add(Me.rdoBefore) Me.grpOPtions.Controls.Add(Me.ucrPnlBeforeAfter) - Me.grpOPtions.Location = New System.Drawing.Point(0, 14) + Me.grpOPtions.Location = New System.Drawing.Point(235, 67) Me.grpOPtions.Name = "grpOPtions" Me.grpOPtions.Size = New System.Drawing.Size(124, 82) - Me.grpOPtions.TabIndex = 5 + Me.grpOPtions.TabIndex = 13 Me.grpOPtions.TabStop = False Me.grpOPtions.Text = "Options" ' @@ -195,7 +194,7 @@ Partial Class dlgInsertColumn Me.lblNumberOfColumnsToInsert.Location = New System.Drawing.Point(232, 184) Me.lblNumberOfColumnsToInsert.Name = "lblNumberOfColumnsToInsert" Me.lblNumberOfColumnsToInsert.Size = New System.Drawing.Size(143, 13) - Me.lblNumberOfColumnsToInsert.TabIndex = 6 + Me.lblNumberOfColumnsToInsert.TabIndex = 5 Me.lblNumberOfColumnsToInsert.Text = "Number of Columns to Insert:" ' 'lblDefaultValue @@ -204,7 +203,7 @@ Partial Class dlgInsertColumn Me.lblDefaultValue.Location = New System.Drawing.Point(233, 208) Me.lblDefaultValue.Name = "lblDefaultValue" Me.lblDefaultValue.Size = New System.Drawing.Size(74, 13) - Me.lblDefaultValue.TabIndex = 8 + Me.lblDefaultValue.TabIndex = 7 Me.lblDefaultValue.Text = "Default Value:" ' 'rdoInsertColumns @@ -239,6 +238,25 @@ Partial Class dlgInsertColumn Me.rdoInsertRows.TextAlign = System.Drawing.ContentAlignment.MiddleCenter Me.rdoInsertRows.UseVisualStyleBackColor = True ' + 'lblInputPrefix + ' + Me.lblInputPrefix.AutoSize = True + Me.lblInputPrefix.Location = New System.Drawing.Point(16, 235) + Me.lblInputPrefix.Name = "lblInputPrefix" + Me.lblInputPrefix.Size = New System.Drawing.Size(117, 13) + Me.lblInputPrefix.TabIndex = 15 + Me.lblInputPrefix.Text = "Prefix For New Column:" + ' + 'ucrInputPrefixForNewColumn + ' + Me.ucrInputPrefixForNewColumn.AddQuotesIfUnrecognised = True + Me.ucrInputPrefixForNewColumn.IsMultiline = False + Me.ucrInputPrefixForNewColumn.IsReadOnly = False + Me.ucrInputPrefixForNewColumn.Location = New System.Drawing.Point(165, 235) + Me.ucrInputPrefixForNewColumn.Name = "ucrInputPrefixForNewColumn" + Me.ucrInputPrefixForNewColumn.Size = New System.Drawing.Size(137, 21) + Me.ucrInputPrefixForNewColumn.TabIndex = 16 + ' 'ucrNudNumberOfColumns ' Me.ucrNudNumberOfColumns.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) @@ -248,7 +266,7 @@ Partial Class dlgInsertColumn Me.ucrNudNumberOfColumns.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudNumberOfColumns.Name = "ucrNudNumberOfColumns" Me.ucrNudNumberOfColumns.Size = New System.Drawing.Size(50, 20) - Me.ucrNudNumberOfColumns.TabIndex = 7 + Me.ucrNudNumberOfColumns.TabIndex = 6 Me.ucrNudNumberOfColumns.Value = New Decimal(New Integer() {0, 0, 0, 0}) ' 'ucrPnlColumnsOrRows @@ -266,23 +284,23 @@ Partial Class dlgInsertColumn Me.ucrInputDefaultValue.Location = New System.Drawing.Point(374, 204) Me.ucrInputDefaultValue.Name = "ucrInputDefaultValue" Me.ucrInputDefaultValue.Size = New System.Drawing.Size(45, 21) - Me.ucrInputDefaultValue.TabIndex = 9 + Me.ucrInputDefaultValue.TabIndex = 8 ' 'ucrSelectorInsertColumns ' Me.ucrSelectorInsertColumns.bShowHiddenColumns = False - Me.ucrSelectorInsertColumns.Location = New System.Drawing.Point(9, 93) + Me.ucrSelectorInsertColumns.Location = New System.Drawing.Point(9, 91) Me.ucrSelectorInsertColumns.Margin = New System.Windows.Forms.Padding(0) Me.ucrSelectorInsertColumns.Name = "ucrSelectorInsertColumns" Me.ucrSelectorInsertColumns.Size = New System.Drawing.Size(202, 139) - Me.ucrSelectorInsertColumns.TabIndex = 4 + Me.ucrSelectorInsertColumns.TabIndex = 14 ' 'ucrBase ' Me.ucrBase.Location = New System.Drawing.Point(10, 260) Me.ucrBase.Name = "ucrBase" Me.ucrBase.Size = New System.Drawing.Size(410, 53) - Me.ucrBase.TabIndex = 12 + Me.ucrBase.TabIndex = 17 ' 'ucrDataFramesList ' @@ -302,7 +320,7 @@ Partial Class dlgInsertColumn Me.ucrNudNumberOfRows.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudNumberOfRows.Name = "ucrNudNumberOfRows" Me.ucrNudNumberOfRows.Size = New System.Drawing.Size(50, 20) - Me.ucrNudNumberOfRows.TabIndex = 18 + Me.ucrNudNumberOfRows.TabIndex = 10 Me.ucrNudNumberOfRows.Value = New Decimal(New Integer() {0, 0, 0, 0}) ' 'ucrNudStartRow @@ -314,39 +332,21 @@ Partial Class dlgInsertColumn Me.ucrNudStartRow.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudStartRow.Name = "ucrNudStartRow" Me.ucrNudStartRow.Size = New System.Drawing.Size(50, 20) - Me.ucrNudStartRow.TabIndex = 19 + Me.ucrNudStartRow.TabIndex = 12 Me.ucrNudStartRow.Value = New Decimal(New Integer() {0, 0, 0, 0}) ' - 'ucrInputPrefixForNewColumn - ' - Me.ucrInputPrefixForNewColumn.AddQuotesIfUnrecognised = True - Me.ucrInputPrefixForNewColumn.IsMultiline = False - Me.ucrInputPrefixForNewColumn.IsReadOnly = False - Me.ucrInputPrefixForNewColumn.Location = New System.Drawing.Point(165, 235) - Me.ucrInputPrefixForNewColumn.Name = "ucrInputPrefixForNewColumn" - Me.ucrInputPrefixForNewColumn.Size = New System.Drawing.Size(137, 21) - Me.ucrInputPrefixForNewColumn.TabIndex = 11 - ' - 'lblInputPrefix - ' - Me.lblInputPrefix.AutoSize = True - Me.lblInputPrefix.Location = New System.Drawing.Point(16, 235) - Me.lblInputPrefix.Name = "lblInputPrefix" - Me.lblInputPrefix.Size = New System.Drawing.Size(117, 13) - Me.lblInputPrefix.TabIndex = 10 - Me.lblInputPrefix.Text = "Prefix For New Column:" - ' 'dlgInsertColumn ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(548, 325) + Me.ClientSize = New System.Drawing.Size(557, 325) Me.Controls.Add(Me.lblInputPrefix) Me.Controls.Add(Me.ucrInputPrefixForNewColumn) Me.Controls.Add(Me.ucrNudNumberOfColumns) Me.Controls.Add(Me.rdoInsertRows) Me.Controls.Add(Me.rdoInsertColumns) Me.Controls.Add(Me.ucrPnlColumnsOrRows) + Me.Controls.Add(Me.grpOPtions) Me.Controls.Add(Me.ucrInputDefaultValue) Me.Controls.Add(Me.lblDefaultValue) Me.Controls.Add(Me.lblNumberOfColumnsToInsert) diff --git a/instat/dlgInsertColumn.vb b/instat/dlgInsertColumn.vb index a4a5ae635f5..1a1d1e71c6a 100644 --- a/instat/dlgInsertColumn.vb +++ b/instat/dlgInsertColumn.vb @@ -35,7 +35,6 @@ Public Class dlgInsertColumn Private Sub InitialiseDialog() ucrBase.iHelpTopicID = 164 - ucrReceiverColumnsToInsert.Selector = ucrSelectorInsertColumns ucrReceiverColumnsToInsert.SetMeAsReceiver() ucrReceiverColumnsToInsert.SetParameter(New RParameter("adjacent_column")) @@ -64,14 +63,17 @@ Public Class dlgInsertColumn ucrInputBeforeAfter.SetItems(dctBeforeAfter) ucrInputBeforeAfter.SetRDefault("FALSE") - ucrPnlStartEnd.AddRadioButton(rdoAtEnd) - ucrPnlStartEnd.AddRadioButton(rdoAtStart) + ucrPnlStartEnd.SetParameter(New RParameter("before")) + ucrPnlStartEnd.AddRadioButton(rdoAtStart, "TRUE") + ucrPnlStartEnd.AddRadioButton(rdoAtEnd, "FALSE") ucrPnlStartEnd.AddRadioButton(rdoBeforeAfter) + 'ucrPnlStartEnd.AddRadioButton(rdoBeforeAfter, "FALSE") + ucrPnlStartEnd.bAllowNonConditionValues = True ucrNudNumberOfColumns.SetParameter(New RParameter("num_cols")) ucrInputDefaultValue.SetParameter(New RParameter("col_data")) ucrInputPrefixForNewColumn.SetParameter(New RParameter("col_name")) - ucrInputDefaultValue.SetRDefault("NA") + ucrInputDefaultValue.SetName("NA") ucrPnlStartEnd.AddParameterValuesCondition(rdoAtStart, "before", "FALSE") ucrPnlStartEnd.AddParameterValuesCondition(rdoAtStart, "before", "TRUE", False) @@ -104,35 +106,34 @@ Public Class dlgInsertColumn ucrInputDefaultValue.SetLinkedDisplayControl(lblDefaultValue) ucrNudNumberOfRows.SetLinkedDisplayControl(lblNumberOfRowsToInsert) ucrNudStartRow.SetLinkedDisplayControl(lblStartPos) - - ucrInputPrefixForNewColumn.SetName("X") - 'ucrSaveInsertColumn.SetSaveTypeAsColumn() - 'ucrSaveInsertColumn.SetDataFrameSelector(ucrDataFramesList) - 'ucrSaveInsertColumn.SetIsTextBox() - 'ucrSaveInsertColumn.SetLabelText("Prefix For New Column:") + ucrInputPrefixForNewColumn.SetPrefix("X") End Sub Private Sub SetDefaults() clsInsertColumnFunction = New RFunction clsInsertRowFunction = New RFunction + + clsInsertColumnFunction.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$add_columns_to_data") + clsInsertRowFunction.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$insert_row_in_data") + ucrSelectorInsertColumns.Reset() ucrDataFramesList.Reset() ucrInputBeforeAfter.Reset() ucrInputDefaultValue.Reset() ucrInputPrefixForNewColumn.Reset() + ucrInputPrefixForNewColumn.SetName("X") + ucrInputDefaultValue.SetName("NA") clsInsertColumnFunction.AddParameter("use_col_name_as_prefix", "TRUE") clsInsertColumnFunction.AddParameter("before", "FALSE") + 'clsInsertColumnFunction.AddParameter("before", "TRUE") clsInsertRowFunction.AddParameter("before", "FALSE") - clsInsertColumnFunction.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$add_columns_to_data") - clsInsertRowFunction.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$insert_row_in_data") clsInsertRowFunction.AddParameter("start_row", ucrDataFramesList.iDataFrameLength) ucrBase.clsRsyntax.SetBaseRFunction(clsInsertColumnFunction) End Sub Private Sub SetRCodeForControls(bReset As Boolean) - ucrDataFramesList.AddAdditionalCodeParameterPair(clsInsertColumnFunction, New RParameter("data_name"), iAdditionalPairNo:=1) ucrDataFramesList.SetParameterIsString() @@ -149,10 +150,11 @@ Public Class dlgInsertColumn ucrDataFramesList.SetRCode(clsInsertColumnFunction, bReset) ucrPnlColumnsOrRows.SetRCode(clsInsertColumnFunction, bReset) ucrPnlStartEnd.SetRCode(clsInsertColumnFunction, bReset) + ucrInputBeforeAfter.SetRCode(clsInsertColumnFunction, bReset) End Sub Private Sub TestOKEnabled() - If ((rdoInsertColumns.Checked AndAlso rdoAtEnd.Checked OrElse rdoAtStart.Checked) AndAlso ucrNudNumberOfColumns.GetText <> "" AndAlso Not ucrInputDefaultValue.IsEmpty AndAlso Not ucrInputPrefixForNewColumn.IsEmpty) Then + If ((rdoInsertColumns.Checked AndAlso (rdoAtEnd.Checked OrElse rdoAtStart.Checked)) AndAlso ucrNudNumberOfColumns.GetText <> "" AndAlso Not ucrInputDefaultValue.IsEmpty AndAlso Not ucrInputPrefixForNewColumn.IsEmpty) Then ucrBase.OKEnabled(True) ElseIf (rdoInsertColumns.Checked AndAlso rdoBeforeAfter.Checked AndAlso Not ucrInputBeforeAfter.IsEmpty AndAlso Not ucrReceiverColumnsToInsert.IsEmpty AndAlso Not ucrInputPrefixForNewColumn.IsEmpty AndAlso Not ucrNudNumberOfColumns.GetText <> "" AndAlso Not ucrInputDefaultValue.IsEmpty) ucrBase.OKEnabled(True) @@ -177,7 +179,7 @@ Public Class dlgInsertColumn End If End Sub - Private Sub ucrReceiverColumnsToInsert_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrReceiverColumnsToInsert.ControlContentsChanged, ucrPnlColumnsOrRows.ControlContentsChanged, ucrPnlStartEnd.ControlContentsChanged + Private Sub ucrReceiverColumnsToInsert_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrReceiverColumnsToInsert.ControlContentsChanged, ucrPnlColumnsOrRows.ControlContentsChanged, ucrPnlBeforeAfter.ControlContentsChanged, ucrPnlStartEnd.ControlContentsChanged, ucrInputPrefixForNewColumn.ControlContentsChanged, ucrInputDefaultValue.ControlContentsChanged, ucrInputBeforeAfter.ControlContentsChanged TestOKEnabled() End Sub End Class \ No newline at end of file From 0e2e3a905c1b862e63e54864429c8c1b91e963e8 Mon Sep 17 00:00:00 2001 From: shadrack kibet Date: Mon, 29 May 2017 08:41:12 +0300 Subject: [PATCH 044/154] edits --- instat/dlgInsertColumn.vb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/instat/dlgInsertColumn.vb b/instat/dlgInsertColumn.vb index 1a1d1e71c6a..62d42658c74 100644 --- a/instat/dlgInsertColumn.vb +++ b/instat/dlgInsertColumn.vb @@ -156,9 +156,9 @@ Public Class dlgInsertColumn Private Sub TestOKEnabled() If ((rdoInsertColumns.Checked AndAlso (rdoAtEnd.Checked OrElse rdoAtStart.Checked)) AndAlso ucrNudNumberOfColumns.GetText <> "" AndAlso Not ucrInputDefaultValue.IsEmpty AndAlso Not ucrInputPrefixForNewColumn.IsEmpty) Then ucrBase.OKEnabled(True) - ElseIf (rdoInsertColumns.Checked AndAlso rdoBeforeAfter.Checked AndAlso Not ucrInputBeforeAfter.IsEmpty AndAlso Not ucrReceiverColumnsToInsert.IsEmpty AndAlso Not ucrInputPrefixForNewColumn.IsEmpty AndAlso Not ucrNudNumberOfColumns.GetText <> "" AndAlso Not ucrInputDefaultValue.IsEmpty) + ElseIf (rdoInsertColumns.Checked AndAlso rdoBeforeAfter.Checked AndAlso Not ucrInputBeforeAfter.IsEmpty AndAlso Not ucrReceiverColumnsToInsert.IsEmpty AndAlso Not ucrInputPrefixForNewColumn.IsEmpty AndAlso Not ucrNudNumberOfColumns.Text <> "" AndAlso Not ucrInputDefaultValue.IsEmpty) ucrBase.OKEnabled(True) - ElseIf (rdoInsertRows.Checked AndAlso ucrNudNumberOfRows.GetText <> "" AndAlso ucrNudStartRow.GetText <> "" OrElse rdoAfter.Checked OrElse rdoBefore.Checked) Then + ElseIf (rdoInsertRows.Checked AndAlso ucrNudNumberOfRows.Text <> "" AndAlso ucrNudStartRow.Text <> "" OrElse rdoAfter.Checked OrElse rdoBefore.Checked) Then ucrBase.OKEnabled(True) Else ucrBase.OKEnabled(False) From c073e72ac22e650d0df959b1b2516fe226b14547 Mon Sep 17 00:00:00 2001 From: Steven Date: Mon, 29 May 2017 11:35:46 +0300 Subject: [PATCH 045/154] edits --- instat/dlgInsertColumn.vb | 87 +++++++++++++++++++++++---------------- 1 file changed, 52 insertions(+), 35 deletions(-) diff --git a/instat/dlgInsertColumn.vb b/instat/dlgInsertColumn.vb index 62d42658c74..5f4ed67c36e 100644 --- a/instat/dlgInsertColumn.vb +++ b/instat/dlgInsertColumn.vb @@ -14,12 +14,12 @@ ' You should have received a copy of the GNU General Public License k ' along with this program. If not, see . -Imports instat.Translations +Imports instat.Translations Public Class dlgInsertColumn Private bFirstload As Boolean = True Private bReset As Boolean = True Private clsInsertRowFunction, clsInsertColumnFunction As New RFunction - Private Sub dlgInsertColumn_Load(sender As Object, e As EventArgs) Handles MyBase.Load + Private Sub dlgInsertColumn_Load(sender As Object, e As EventArgs) Handles MyBase.Load If bFirstload Then InitialiseDialog() bFirstload = False @@ -31,8 +31,8 @@ Public Class dlgInsertColumn bReset = False autoTranslate(Me) TestOKEnabled() - End Sub - + End Sub + Private Sub InitialiseDialog() ucrBase.iHelpTopicID = 164 ucrReceiverColumnsToInsert.Selector = ucrSelectorInsertColumns @@ -46,8 +46,8 @@ Public Class dlgInsertColumn ucrPnlColumnsOrRows.AddFunctionNamesCondition(rdoInsertColumns, frmMain.clsRLink.strInstatDataObject & "$add_columns_to_data") ucrPnlBeforeAfter.SetParameter(New RParameter("before")) - ucrPnlBeforeAfter.AddRadioButton(rdoBefore, "FALSE") - ucrPnlBeforeAfter.AddRadioButton(rdoAfter, "TRUE") + ucrPnlBeforeAfter.AddRadioButton(rdoBefore, "TRUE") + ucrPnlBeforeAfter.AddRadioButton(rdoAfter, "FALSE") ucrDataFramesList.SetParameter(New RParameter("data_name")) ucrDataFramesList.SetParameterIsString() @@ -58,33 +58,35 @@ Public Class dlgInsertColumn Dim dctBeforeAfter As New Dictionary(Of String, String) ucrInputBeforeAfter.SetParameter(New RParameter("before")) - dctBeforeAfter.Add("Before", "FALSE") - dctBeforeAfter.Add("After", "TRUE") + dctBeforeAfter.Add("Before", "TRUE") + dctBeforeAfter.Add("After", "FALSE") ucrInputBeforeAfter.SetItems(dctBeforeAfter) ucrInputBeforeAfter.SetRDefault("FALSE") ucrPnlStartEnd.SetParameter(New RParameter("before")) ucrPnlStartEnd.AddRadioButton(rdoAtStart, "TRUE") ucrPnlStartEnd.AddRadioButton(rdoAtEnd, "FALSE") - ucrPnlStartEnd.AddRadioButton(rdoBeforeAfter) - 'ucrPnlStartEnd.AddRadioButton(rdoBeforeAfter, "FALSE") - ucrPnlStartEnd.bAllowNonConditionValues = True + ucrPnlStartEnd.AddRadioButton(rdoBeforeAfter, "FALSE") + ucrPnlStartEnd.bAllowNonConditionValues = False ucrNudNumberOfColumns.SetParameter(New RParameter("num_cols")) ucrInputDefaultValue.SetParameter(New RParameter("col_data")) ucrInputPrefixForNewColumn.SetParameter(New RParameter("col_name")) - ucrInputDefaultValue.SetName("NA") + ucrInputDefaultValue.SetRDefault("NA") + + 'ucrPnlStartEnd.AddParameterValuesCondition(rdoAtStart, "before", "TRUE") + 'ucrPnlStartEnd.AddParameterValuesCondition(rdoAtStart, "before", "FALSE", False) + 'ucrPnlStartEnd.AddParameterPresentCondition(rdoAtStart, "adjacent_column", False) - ucrPnlStartEnd.AddParameterValuesCondition(rdoAtStart, "before", "FALSE") - ucrPnlStartEnd.AddParameterValuesCondition(rdoAtStart, "before", "TRUE", False) - ucrPnlStartEnd.AddParameterPresentCondition(rdoAtStart, "adjacent", False) + 'ucrPnlStartEnd.AddParameterValuesCondition(rdoAtEnd, "before", "FALSE") + 'ucrPnlStartEnd.AddParameterValuesCondition(rdoAtEnd, "before", "TRUE", False) + 'ucrPnlStartEnd.AddParameterPresentCondition(rdoAtEnd, "adjacent_column", False) - ucrPnlStartEnd.AddParameterValuesCondition(rdoAtEnd, "before", "TRUE") - ucrPnlStartEnd.AddParameterValuesCondition(rdoAtEnd, "before", "FALSE", False) - ucrPnlStartEnd.AddParameterPresentCondition(rdoAtEnd, "adjacent", False) + '' ucrPnlStartEnd.AddParameterValuesCondition(rdoBeforeAfter, "before", "TRUE") + ''ucrPnlStartEnd.AddParameterValuesCondition(rdoBeforeAfter, "before", "FALSE") + 'ucrPnlStartEnd.AddParameterPresentCondition(rdoBeforeAfter, "adjacent_column") + ''ucrPnlStartEnd.SetRDefault("FALSE") - ucrPnlStartEnd.AddParameterValuesCondition(rdoBeforeAfter, "before", {"TRUE", "FALSE"}) - ucrPnlStartEnd.AddParameterPresentCondition(rdoBeforeAfter, "adjacent") ucrPnlColumnsOrRows.AddToLinkedControls(ucrPnlStartEnd, {rdoInsertColumns}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) ucrPnlColumnsOrRows.AddToLinkedControls(ucrInputBeforeAfter, {rdoInsertColumns}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) @@ -93,6 +95,7 @@ Public Class dlgInsertColumn ucrPnlColumnsOrRows.AddToLinkedControls(ucrInputDefaultValue, {rdoInsertColumns}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) ucrPnlColumnsOrRows.AddToLinkedControls(ucrInputPrefixForNewColumn, {rdoInsertColumns}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) + ucrInputPrefixForNewColumn.SetLinkedDisplayControl(lblInputPrefix) ucrPnlColumnsOrRows.AddToLinkedControls(ucrPnlBeforeAfter, {rdoInsertRows}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) ucrPnlColumnsOrRows.AddToLinkedControls(ucrNudNumberOfRows, {rdoInsertRows}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) @@ -108,8 +111,8 @@ Public Class dlgInsertColumn ucrNudStartRow.SetLinkedDisplayControl(lblStartPos) ucrInputPrefixForNewColumn.SetPrefix("X") - End Sub - + End Sub + Private Sub SetDefaults() clsInsertColumnFunction = New RFunction clsInsertRowFunction = New RFunction @@ -127,12 +130,11 @@ Public Class dlgInsertColumn clsInsertColumnFunction.AddParameter("use_col_name_as_prefix", "TRUE") clsInsertColumnFunction.AddParameter("before", "FALSE") - 'clsInsertColumnFunction.AddParameter("before", "TRUE") clsInsertRowFunction.AddParameter("before", "FALSE") clsInsertRowFunction.AddParameter("start_row", ucrDataFramesList.iDataFrameLength) ucrBase.clsRsyntax.SetBaseRFunction(clsInsertColumnFunction) - End Sub - + End Sub + Private Sub SetRCodeForControls(bReset As Boolean) ucrDataFramesList.AddAdditionalCodeParameterPair(clsInsertColumnFunction, New RParameter("data_name"), iAdditionalPairNo:=1) ucrDataFramesList.SetParameterIsString() @@ -154,18 +156,24 @@ Public Class dlgInsertColumn End Sub Private Sub TestOKEnabled() - If ((rdoInsertColumns.Checked AndAlso (rdoAtEnd.Checked OrElse rdoAtStart.Checked)) AndAlso ucrNudNumberOfColumns.GetText <> "" AndAlso Not ucrInputDefaultValue.IsEmpty AndAlso Not ucrInputPrefixForNewColumn.IsEmpty) Then - ucrBase.OKEnabled(True) - ElseIf (rdoInsertColumns.Checked AndAlso rdoBeforeAfter.Checked AndAlso Not ucrInputBeforeAfter.IsEmpty AndAlso Not ucrReceiverColumnsToInsert.IsEmpty AndAlso Not ucrInputPrefixForNewColumn.IsEmpty AndAlso Not ucrNudNumberOfColumns.Text <> "" AndAlso Not ucrInputDefaultValue.IsEmpty) - ucrBase.OKEnabled(True) - ElseIf (rdoInsertRows.Checked AndAlso ucrNudNumberOfRows.Text <> "" AndAlso ucrNudStartRow.Text <> "" OrElse rdoAfter.Checked OrElse rdoBefore.Checked) Then - ucrBase.OKEnabled(True) - Else - ucrBase.OKEnabled(False) + If rdoInsertColumns.Checked Then + If (rdoBeforeAfter.Checked AndAlso Not ucrInputBeforeAfter.IsEmpty AndAlso Not ucrReceiverColumnsToInsert.IsEmpty AndAlso Not ucrInputPrefixForNewColumn.IsEmpty AndAlso ucrNudNumberOfColumns.GetText <> "" AndAlso Not ucrInputDefaultValue.IsEmpty) Then + ucrBase.OKEnabled(True) + ElseIf ((rdoAtEnd.Checked OrElse rdoAtStart.Checked) AndAlso ucrNudNumberOfColumns.GetText <> "" AndAlso Not ucrInputDefaultValue.IsEmpty AndAlso Not ucrInputPrefixForNewColumn.IsEmpty) Then + ucrBase.OKEnabled(True) + Else + ucrBase.OKEnabled(False) + End If + ElseIf rdoInsertRows.Checked Then + If (ucrNudNumberOfRows.GetText <> "" AndAlso ucrNudStartRow.GetText <> "" OrElse rdoAfter.Checked OrElse rdoBefore.Checked) Then + ucrBase.OKEnabled(True) + Else + ucrBase.OKEnabled(False) + End If End If End Sub - Private Sub ucrBase_ClickReset(sender As Object, e As EventArgs) Handles ucrBase.ClickReset + Private Sub ucrBase_ClickReset(sender As Object, e As EventArgs) Handles ucrBase.ClickReset SetDefaults() SetRCodeForControls(True) TestOKEnabled() @@ -179,7 +187,16 @@ Public Class dlgInsertColumn End If End Sub - Private Sub ucrReceiverColumnsToInsert_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrReceiverColumnsToInsert.ControlContentsChanged, ucrPnlColumnsOrRows.ControlContentsChanged, ucrPnlBeforeAfter.ControlContentsChanged, ucrPnlStartEnd.ControlContentsChanged, ucrInputPrefixForNewColumn.ControlContentsChanged, ucrInputDefaultValue.ControlContentsChanged, ucrInputBeforeAfter.ControlContentsChanged + Private Sub ucrPnlStartEnd_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrPnlStartEnd.ControlValueChanged + If rdoBeforeAfter.Checked Then + ucrInputBeforeAfter.Text = "After" + clsInsertColumnFunction.AddParameter("before", "FALSE") + ucrInputBeforeAfter.Text = "Before" + clsInsertColumnFunction.AddParameter("before", "TRUE") + End If + End Sub + + Private Sub ucrReceiverColumnsToInsert_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrReceiverColumnsToInsert.ControlContentsChanged, ucrPnlColumnsOrRows.ControlContentsChanged, ucrPnlBeforeAfter.ControlContentsChanged, ucrPnlStartEnd.ControlContentsChanged, ucrInputPrefixForNewColumn.ControlContentsChanged, ucrInputDefaultValue.ControlContentsChanged, ucrInputBeforeAfter.ControlContentsChanged, ucrNudNumberOfRows.ControlContentsChanged, ucrNudStartRow.ControlContentsChanged, ucrNudNumberOfColumns.ControlContentsChanged TestOKEnabled() End Sub End Class \ No newline at end of file From 50d2b39eb198682a254212626b70b9500b9237a0 Mon Sep 17 00:00:00 2001 From: Steven Date: Mon, 29 May 2017 14:26:45 +0300 Subject: [PATCH 046/154] Setting conditions properly --- instat/dlgInsertColumn.Designer.vb | 36 +++++++++--------- instat/dlgInsertColumn.vb | 60 +++++++++++++++--------------- 2 files changed, 48 insertions(+), 48 deletions(-) diff --git a/instat/dlgInsertColumn.Designer.vb b/instat/dlgInsertColumn.Designer.vb index 1f6621385c2..3c33b627069 100644 --- a/instat/dlgInsertColumn.Designer.vb +++ b/instat/dlgInsertColumn.Designer.vb @@ -30,7 +30,7 @@ Partial Class dlgInsertColumn Me.rdoBeforeAfter = New System.Windows.Forms.RadioButton() Me.rdoAtStart = New System.Windows.Forms.RadioButton() Me.rdoAtEnd = New System.Windows.Forms.RadioButton() - Me.ucrPnlStartEnd = New instat.UcrPanel() + Me.ucrPnlInsertColumns = New instat.UcrPanel() Me.grpOPtions = New System.Windows.Forms.GroupBox() Me.rdoAfter = New System.Windows.Forms.RadioButton() Me.rdoBefore = New System.Windows.Forms.RadioButton() @@ -78,7 +78,8 @@ Partial Class dlgInsertColumn Me.grpInsert.Controls.Add(Me.rdoBeforeAfter) Me.grpInsert.Controls.Add(Me.rdoAtStart) Me.grpInsert.Controls.Add(Me.rdoAtEnd) - Me.grpInsert.Controls.Add(Me.ucrPnlStartEnd) + Me.grpInsert.Controls.Add(Me.ucrPnlInsertColumns) + Me.grpInsert.Controls.Add(Me.grpOPtions) Me.grpInsert.Location = New System.Drawing.Point(235, 91) Me.grpInsert.Name = "grpInsert" Me.grpInsert.Size = New System.Drawing.Size(316, 101) @@ -140,19 +141,19 @@ Partial Class dlgInsertColumn Me.rdoAtEnd.Text = "At End" Me.rdoAtEnd.UseVisualStyleBackColor = True ' - 'ucrPnlStartEnd + 'ucrPnlInsertColumns ' - Me.ucrPnlStartEnd.Location = New System.Drawing.Point(6, 14) - Me.ucrPnlStartEnd.Name = "ucrPnlStartEnd" - Me.ucrPnlStartEnd.Size = New System.Drawing.Size(112, 81) - Me.ucrPnlStartEnd.TabIndex = 0 + Me.ucrPnlInsertColumns.Location = New System.Drawing.Point(6, 14) + Me.ucrPnlInsertColumns.Name = "ucrPnlInsertColumns" + Me.ucrPnlInsertColumns.Size = New System.Drawing.Size(304, 81) + Me.ucrPnlInsertColumns.TabIndex = 0 ' 'grpOPtions ' Me.grpOPtions.Controls.Add(Me.rdoAfter) Me.grpOPtions.Controls.Add(Me.rdoBefore) Me.grpOPtions.Controls.Add(Me.ucrPnlBeforeAfter) - Me.grpOPtions.Location = New System.Drawing.Point(235, 67) + Me.grpOPtions.Location = New System.Drawing.Point(1, 2) Me.grpOPtions.Name = "grpOPtions" Me.grpOPtions.Size = New System.Drawing.Size(124, 82) Me.grpOPtions.TabIndex = 13 @@ -191,7 +192,7 @@ Partial Class dlgInsertColumn 'lblNumberOfColumnsToInsert ' Me.lblNumberOfColumnsToInsert.AutoSize = True - Me.lblNumberOfColumnsToInsert.Location = New System.Drawing.Point(232, 184) + Me.lblNumberOfColumnsToInsert.Location = New System.Drawing.Point(232, 197) Me.lblNumberOfColumnsToInsert.Name = "lblNumberOfColumnsToInsert" Me.lblNumberOfColumnsToInsert.Size = New System.Drawing.Size(143, 13) Me.lblNumberOfColumnsToInsert.TabIndex = 5 @@ -200,7 +201,7 @@ Partial Class dlgInsertColumn 'lblDefaultValue ' Me.lblDefaultValue.AutoSize = True - Me.lblDefaultValue.Location = New System.Drawing.Point(233, 208) + Me.lblDefaultValue.Location = New System.Drawing.Point(233, 221) Me.lblDefaultValue.Name = "lblDefaultValue" Me.lblDefaultValue.Size = New System.Drawing.Size(74, 13) Me.lblDefaultValue.TabIndex = 7 @@ -241,7 +242,7 @@ Partial Class dlgInsertColumn 'lblInputPrefix ' Me.lblInputPrefix.AutoSize = True - Me.lblInputPrefix.Location = New System.Drawing.Point(16, 235) + Me.lblInputPrefix.Location = New System.Drawing.Point(16, 255) Me.lblInputPrefix.Name = "lblInputPrefix" Me.lblInputPrefix.Size = New System.Drawing.Size(117, 13) Me.lblInputPrefix.TabIndex = 15 @@ -252,7 +253,7 @@ Partial Class dlgInsertColumn Me.ucrInputPrefixForNewColumn.AddQuotesIfUnrecognised = True Me.ucrInputPrefixForNewColumn.IsMultiline = False Me.ucrInputPrefixForNewColumn.IsReadOnly = False - Me.ucrInputPrefixForNewColumn.Location = New System.Drawing.Point(165, 235) + Me.ucrInputPrefixForNewColumn.Location = New System.Drawing.Point(165, 255) Me.ucrInputPrefixForNewColumn.Name = "ucrInputPrefixForNewColumn" Me.ucrInputPrefixForNewColumn.Size = New System.Drawing.Size(137, 21) Me.ucrInputPrefixForNewColumn.TabIndex = 16 @@ -261,7 +262,7 @@ Partial Class dlgInsertColumn ' Me.ucrNudNumberOfColumns.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudNumberOfColumns.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudNumberOfColumns.Location = New System.Drawing.Point(373, 180) + Me.ucrNudNumberOfColumns.Location = New System.Drawing.Point(373, 193) Me.ucrNudNumberOfColumns.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) Me.ucrNudNumberOfColumns.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudNumberOfColumns.Name = "ucrNudNumberOfColumns" @@ -281,7 +282,7 @@ Partial Class dlgInsertColumn Me.ucrInputDefaultValue.AddQuotesIfUnrecognised = True Me.ucrInputDefaultValue.IsMultiline = False Me.ucrInputDefaultValue.IsReadOnly = False - Me.ucrInputDefaultValue.Location = New System.Drawing.Point(374, 204) + Me.ucrInputDefaultValue.Location = New System.Drawing.Point(374, 217) Me.ucrInputDefaultValue.Name = "ucrInputDefaultValue" Me.ucrInputDefaultValue.Size = New System.Drawing.Size(45, 21) Me.ucrInputDefaultValue.TabIndex = 8 @@ -297,7 +298,7 @@ Partial Class dlgInsertColumn ' 'ucrBase ' - Me.ucrBase.Location = New System.Drawing.Point(10, 260) + Me.ucrBase.Location = New System.Drawing.Point(10, 280) Me.ucrBase.Name = "ucrBase" Me.ucrBase.Size = New System.Drawing.Size(410, 53) Me.ucrBase.TabIndex = 17 @@ -339,14 +340,13 @@ Partial Class dlgInsertColumn ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(557, 325) + Me.ClientSize = New System.Drawing.Size(557, 343) Me.Controls.Add(Me.lblInputPrefix) Me.Controls.Add(Me.ucrInputPrefixForNewColumn) Me.Controls.Add(Me.ucrNudNumberOfColumns) Me.Controls.Add(Me.rdoInsertRows) Me.Controls.Add(Me.rdoInsertColumns) Me.Controls.Add(Me.ucrPnlColumnsOrRows) - Me.Controls.Add(Me.grpOPtions) Me.Controls.Add(Me.ucrInputDefaultValue) Me.Controls.Add(Me.lblDefaultValue) Me.Controls.Add(Me.lblNumberOfColumnsToInsert) @@ -396,7 +396,7 @@ Partial Class dlgInsertColumn Friend WithEvents ucrNudStartRow As ucrNud Friend WithEvents ucrNudNumberOfRows As ucrNud Friend WithEvents ucrPnlBeforeAfter As UcrPanel - Friend WithEvents ucrPnlStartEnd As UcrPanel + Friend WithEvents ucrPnlInsertColumns As UcrPanel Friend WithEvents rdoBeforeAfter As RadioButton Friend WithEvents lblInputPrefix As Label Friend WithEvents ucrInputPrefixForNewColumn As ucrInputTextBox diff --git a/instat/dlgInsertColumn.vb b/instat/dlgInsertColumn.vb index 5f4ed67c36e..c626e51b863 100644 --- a/instat/dlgInsertColumn.vb +++ b/instat/dlgInsertColumn.vb @@ -63,32 +63,32 @@ Public Class dlgInsertColumn ucrInputBeforeAfter.SetItems(dctBeforeAfter) ucrInputBeforeAfter.SetRDefault("FALSE") - ucrPnlStartEnd.SetParameter(New RParameter("before")) - ucrPnlStartEnd.AddRadioButton(rdoAtStart, "TRUE") - ucrPnlStartEnd.AddRadioButton(rdoAtEnd, "FALSE") - ucrPnlStartEnd.AddRadioButton(rdoBeforeAfter, "FALSE") - ucrPnlStartEnd.bAllowNonConditionValues = False + ucrPnlInsertColumns.SetParameter(New RParameter("before")) + ucrPnlInsertColumns.AddRadioButton(rdoAtStart, "TRUE") + ucrPnlInsertColumns.AddRadioButton(rdoAtEnd, "FALSE") + ucrPnlInsertColumns.AddRadioButton(rdoBeforeAfter, "TRUE") + ' ucrPnlInsertColumns.bAllowNonConditionValues = False ucrNudNumberOfColumns.SetParameter(New RParameter("num_cols")) ucrInputDefaultValue.SetParameter(New RParameter("col_data")) ucrInputPrefixForNewColumn.SetParameter(New RParameter("col_name")) ucrInputDefaultValue.SetRDefault("NA") - 'ucrPnlStartEnd.AddParameterValuesCondition(rdoAtStart, "before", "TRUE") - 'ucrPnlStartEnd.AddParameterValuesCondition(rdoAtStart, "before", "FALSE", False) - 'ucrPnlStartEnd.AddParameterPresentCondition(rdoAtStart, "adjacent_column", False) + ucrPnlInsertColumns.AddParameterValuesCondition(rdoAtStart, "before", "TRUE") + ucrPnlInsertColumns.AddParameterValuesCondition(rdoAtStart, "before", "FALSE", False) + ucrPnlInsertColumns.AddParameterPresentCondition(rdoAtStart, "adjacent_column", False) - 'ucrPnlStartEnd.AddParameterValuesCondition(rdoAtEnd, "before", "FALSE") - 'ucrPnlStartEnd.AddParameterValuesCondition(rdoAtEnd, "before", "TRUE", False) - 'ucrPnlStartEnd.AddParameterPresentCondition(rdoAtEnd, "adjacent_column", False) + ucrPnlInsertColumns.AddParameterValuesCondition(rdoAtEnd, "before", "FALSE") + ucrPnlInsertColumns.AddParameterValuesCondition(rdoAtEnd, "before", "TRUE", False) + ucrPnlInsertColumns.AddParameterPresentCondition(rdoAtEnd, "adjacent_column", False) - '' ucrPnlStartEnd.AddParameterValuesCondition(rdoBeforeAfter, "before", "TRUE") - ''ucrPnlStartEnd.AddParameterValuesCondition(rdoBeforeAfter, "before", "FALSE") - 'ucrPnlStartEnd.AddParameterPresentCondition(rdoBeforeAfter, "adjacent_column") - ''ucrPnlStartEnd.SetRDefault("FALSE") + ucrPnlInsertColumns.AddParameterValuesCondition(rdoBeforeAfter, "before", "TRUE") + ucrPnlInsertColumns.AddParameterValuesCondition(rdoBeforeAfter, "before", "FALSE") + ucrPnlInsertColumns.AddParameterPresentCondition(rdoBeforeAfter, "adjacent_column") + ucrPnlInsertColumns.SetRDefault("FALSE") - ucrPnlColumnsOrRows.AddToLinkedControls(ucrPnlStartEnd, {rdoInsertColumns}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) + ucrPnlColumnsOrRows.AddToLinkedControls(ucrPnlInsertColumns, {rdoInsertColumns}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) ucrPnlColumnsOrRows.AddToLinkedControls(ucrInputBeforeAfter, {rdoInsertColumns}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) ucrPnlColumnsOrRows.AddToLinkedControls(ucrReceiverColumnsToInsert, {rdoInsertColumns}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) ucrPnlColumnsOrRows.AddToLinkedControls(ucrNudNumberOfColumns, {rdoInsertColumns}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) @@ -100,11 +100,11 @@ Public Class dlgInsertColumn ucrPnlColumnsOrRows.AddToLinkedControls(ucrPnlBeforeAfter, {rdoInsertRows}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) ucrPnlColumnsOrRows.AddToLinkedControls(ucrNudNumberOfRows, {rdoInsertRows}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) ucrPnlColumnsOrRows.AddToLinkedControls(ucrNudStartRow, {rdoInsertRows}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) - ucrPnlStartEnd.AddToLinkedControls(ucrSelectorInsertColumns, {rdoBeforeAfter}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) + ucrPnlInsertColumns.AddToLinkedControls(ucrSelectorInsertColumns, {rdoBeforeAfter}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) ucrPnlBeforeAfter.SetLinkedDisplayControl(grpOPtions) - ucrPnlStartEnd.AddToLinkedControls(ucrInputBeforeAfter, {rdoBeforeAfter}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) - ucrPnlStartEnd.AddToLinkedControls(ucrReceiverColumnsToInsert, {rdoBeforeAfter}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) - ucrPnlStartEnd.SetLinkedDisplayControl(grpInsert) + ucrPnlInsertColumns.AddToLinkedControls(ucrInputBeforeAfter, {rdoBeforeAfter}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) + ucrPnlInsertColumns.AddToLinkedControls(ucrReceiverColumnsToInsert, {rdoBeforeAfter}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) + ucrPnlInsertColumns.SetLinkedDisplayControl(grpInsert) ucrNudNumberOfColumns.SetLinkedDisplayControl(lblNumberOfColumnsToInsert) ucrInputDefaultValue.SetLinkedDisplayControl(lblDefaultValue) ucrNudNumberOfRows.SetLinkedDisplayControl(lblNumberOfRowsToInsert) @@ -136,8 +136,9 @@ Public Class dlgInsertColumn End Sub Private Sub SetRCodeForControls(bReset As Boolean) - ucrDataFramesList.AddAdditionalCodeParameterPair(clsInsertColumnFunction, New RParameter("data_name"), iAdditionalPairNo:=1) - ucrDataFramesList.SetParameterIsString() + ucrDataFramesList.SetRCode(clsInsertColumnFunction, bReset) + ucrDataFramesList.AddAdditionalCodeParameterPair(clsInsertColumnFunction, ucrDataFramesList.GetParameter, iAdditionalPairNo:=1) + ' ucrDataFramesList.SetParameterIsString() ucrNudNumberOfRows.SetRCode(clsInsertRowFunction, bReset) ucrNudStartRow.SetRCode(clsInsertRowFunction, bReset) @@ -149,9 +150,9 @@ Public Class dlgInsertColumn ucrInputPrefixForNewColumn.SetRCode(clsInsertColumnFunction, bReset) ucrReceiverColumnsToInsert.SetRCode(clsInsertColumnFunction, bReset) - ucrDataFramesList.SetRCode(clsInsertColumnFunction, bReset) + ucrPnlColumnsOrRows.SetRCode(clsInsertColumnFunction, bReset) - ucrPnlStartEnd.SetRCode(clsInsertColumnFunction, bReset) + ucrPnlInsertColumns.SetRCode(clsInsertColumnFunction, bReset) ucrInputBeforeAfter.SetRCode(clsInsertColumnFunction, bReset) End Sub @@ -179,7 +180,7 @@ Public Class dlgInsertColumn TestOKEnabled() End Sub - Private Sub ucrPnlColumnsOrRows_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrPnlColumnsOrRows.ControlValueChanged + Private Sub ucrBase_BeforeClickOk(sender As Object, e As EventArgs) Handles ucrBase.BeforeClickOk If rdoInsertColumns.Checked Then ucrBase.clsRsyntax.SetBaseRFunction(clsInsertColumnFunction) ElseIf rdoInsertRows.Checked Then @@ -187,16 +188,15 @@ Public Class dlgInsertColumn End If End Sub - Private Sub ucrPnlStartEnd_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrPnlStartEnd.ControlValueChanged - If rdoBeforeAfter.Checked Then - ucrInputBeforeAfter.Text = "After" + Private Sub ucrPnlStartEnd_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrPnlInsertColumns.ControlValueChanged + If rdoAtEnd.Checked Then clsInsertColumnFunction.AddParameter("before", "FALSE") - ucrInputBeforeAfter.Text = "Before" + ElseIf rdoAtStart.Checked clsInsertColumnFunction.AddParameter("before", "TRUE") End If End Sub - Private Sub ucrReceiverColumnsToInsert_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrReceiverColumnsToInsert.ControlContentsChanged, ucrPnlColumnsOrRows.ControlContentsChanged, ucrPnlBeforeAfter.ControlContentsChanged, ucrPnlStartEnd.ControlContentsChanged, ucrInputPrefixForNewColumn.ControlContentsChanged, ucrInputDefaultValue.ControlContentsChanged, ucrInputBeforeAfter.ControlContentsChanged, ucrNudNumberOfRows.ControlContentsChanged, ucrNudStartRow.ControlContentsChanged, ucrNudNumberOfColumns.ControlContentsChanged + Private Sub ucrReceiverColumnsToInsert_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrReceiverColumnsToInsert.ControlContentsChanged, ucrPnlColumnsOrRows.ControlContentsChanged, ucrPnlBeforeAfter.ControlContentsChanged, ucrPnlInsertColumns.ControlContentsChanged, ucrInputPrefixForNewColumn.ControlContentsChanged, ucrInputDefaultValue.ControlContentsChanged, ucrInputBeforeAfter.ControlContentsChanged, ucrNudNumberOfRows.ControlContentsChanged, ucrNudStartRow.ControlContentsChanged, ucrNudNumberOfColumns.ControlContentsChanged TestOKEnabled() End Sub End Class \ No newline at end of file From 93c3cfc2b6778cbecde0960c129a79b638f5958d Mon Sep 17 00:00:00 2001 From: Steven Date: Mon, 29 May 2017 14:28:57 +0300 Subject: [PATCH 047/154] Design edits --- instat/dlgInsertColumn.Designer.vb | 12 ++++++------ instat/dlgInsertColumn.vb | 4 ++++ 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/instat/dlgInsertColumn.Designer.vb b/instat/dlgInsertColumn.Designer.vb index 3c33b627069..76e0f3accd0 100644 --- a/instat/dlgInsertColumn.Designer.vb +++ b/instat/dlgInsertColumn.Designer.vb @@ -153,9 +153,9 @@ Partial Class dlgInsertColumn Me.grpOPtions.Controls.Add(Me.rdoAfter) Me.grpOPtions.Controls.Add(Me.rdoBefore) Me.grpOPtions.Controls.Add(Me.ucrPnlBeforeAfter) - Me.grpOPtions.Location = New System.Drawing.Point(1, 2) + Me.grpOPtions.Location = New System.Drawing.Point(3, -20) Me.grpOPtions.Name = "grpOPtions" - Me.grpOPtions.Size = New System.Drawing.Size(124, 82) + Me.grpOPtions.Size = New System.Drawing.Size(85, 82) Me.grpOPtions.TabIndex = 13 Me.grpOPtions.TabStop = False Me.grpOPtions.Text = "Options" @@ -192,7 +192,7 @@ Partial Class dlgInsertColumn 'lblNumberOfColumnsToInsert ' Me.lblNumberOfColumnsToInsert.AutoSize = True - Me.lblNumberOfColumnsToInsert.Location = New System.Drawing.Point(232, 197) + Me.lblNumberOfColumnsToInsert.Location = New System.Drawing.Point(232, 201) Me.lblNumberOfColumnsToInsert.Name = "lblNumberOfColumnsToInsert" Me.lblNumberOfColumnsToInsert.Size = New System.Drawing.Size(143, 13) Me.lblNumberOfColumnsToInsert.TabIndex = 5 @@ -201,7 +201,7 @@ Partial Class dlgInsertColumn 'lblDefaultValue ' Me.lblDefaultValue.AutoSize = True - Me.lblDefaultValue.Location = New System.Drawing.Point(233, 221) + Me.lblDefaultValue.Location = New System.Drawing.Point(233, 225) Me.lblDefaultValue.Name = "lblDefaultValue" Me.lblDefaultValue.Size = New System.Drawing.Size(74, 13) Me.lblDefaultValue.TabIndex = 7 @@ -262,7 +262,7 @@ Partial Class dlgInsertColumn ' Me.ucrNudNumberOfColumns.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudNumberOfColumns.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudNumberOfColumns.Location = New System.Drawing.Point(373, 193) + Me.ucrNudNumberOfColumns.Location = New System.Drawing.Point(373, 197) Me.ucrNudNumberOfColumns.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) Me.ucrNudNumberOfColumns.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudNumberOfColumns.Name = "ucrNudNumberOfColumns" @@ -282,7 +282,7 @@ Partial Class dlgInsertColumn Me.ucrInputDefaultValue.AddQuotesIfUnrecognised = True Me.ucrInputDefaultValue.IsMultiline = False Me.ucrInputDefaultValue.IsReadOnly = False - Me.ucrInputDefaultValue.Location = New System.Drawing.Point(374, 217) + Me.ucrInputDefaultValue.Location = New System.Drawing.Point(374, 221) Me.ucrInputDefaultValue.Name = "ucrInputDefaultValue" Me.ucrInputDefaultValue.Size = New System.Drawing.Size(45, 21) Me.ucrInputDefaultValue.TabIndex = 8 diff --git a/instat/dlgInsertColumn.vb b/instat/dlgInsertColumn.vb index c626e51b863..1861b89ad8a 100644 --- a/instat/dlgInsertColumn.vb +++ b/instat/dlgInsertColumn.vb @@ -196,6 +196,10 @@ Public Class dlgInsertColumn End If End Sub + Private Sub ucrPnlColumnsOrRows_ControlValueChanged(ucrChangedControl As ucrCore) + + End Sub + Private Sub ucrReceiverColumnsToInsert_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrReceiverColumnsToInsert.ControlContentsChanged, ucrPnlColumnsOrRows.ControlContentsChanged, ucrPnlBeforeAfter.ControlContentsChanged, ucrPnlInsertColumns.ControlContentsChanged, ucrInputPrefixForNewColumn.ControlContentsChanged, ucrInputDefaultValue.ControlContentsChanged, ucrInputBeforeAfter.ControlContentsChanged, ucrNudNumberOfRows.ControlContentsChanged, ucrNudStartRow.ControlContentsChanged, ucrNudNumberOfColumns.ControlContentsChanged TestOKEnabled() End Sub From 03ca31976114275dc8336cccf0c7a87f4a92befd Mon Sep 17 00:00:00 2001 From: shadrack kibet Date: Mon, 29 May 2017 14:34:58 +0300 Subject: [PATCH 048/154] removing unnecessary sub --- instat/dlgInsertColumn.vb | 4 ---- 1 file changed, 4 deletions(-) diff --git a/instat/dlgInsertColumn.vb b/instat/dlgInsertColumn.vb index 1861b89ad8a..c626e51b863 100644 --- a/instat/dlgInsertColumn.vb +++ b/instat/dlgInsertColumn.vb @@ -196,10 +196,6 @@ Public Class dlgInsertColumn End If End Sub - Private Sub ucrPnlColumnsOrRows_ControlValueChanged(ucrChangedControl As ucrCore) - - End Sub - Private Sub ucrReceiverColumnsToInsert_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrReceiverColumnsToInsert.ControlContentsChanged, ucrPnlColumnsOrRows.ControlContentsChanged, ucrPnlBeforeAfter.ControlContentsChanged, ucrPnlInsertColumns.ControlContentsChanged, ucrInputPrefixForNewColumn.ControlContentsChanged, ucrInputDefaultValue.ControlContentsChanged, ucrInputBeforeAfter.ControlContentsChanged, ucrNudNumberOfRows.ControlContentsChanged, ucrNudStartRow.ControlContentsChanged, ucrNudNumberOfColumns.ControlContentsChanged TestOKEnabled() End Sub From f3811612738d18ee9bbe8ebbf2be311c2d578c56 Mon Sep 17 00:00:00 2001 From: shadrack kibet Date: Mon, 29 May 2017 15:32:24 +0300 Subject: [PATCH 049/154] Designer and code additions --- instat/dlgInsertColumn.Designer.vb | 36 ++++++++++++++++++++---------- instat/dlgInsertColumn.vb | 13 ++++++----- 2 files changed, 32 insertions(+), 17 deletions(-) diff --git a/instat/dlgInsertColumn.Designer.vb b/instat/dlgInsertColumn.Designer.vb index 76e0f3accd0..60fb4d03cce 100644 --- a/instat/dlgInsertColumn.Designer.vb +++ b/instat/dlgInsertColumn.Designer.vb @@ -49,6 +49,7 @@ Partial Class dlgInsertColumn Me.ucrDataFramesList = New instat.ucrDataFrame() Me.ucrNudNumberOfRows = New instat.ucrNud() Me.ucrNudStartRow = New instat.ucrNud() + Me.Label1 = New System.Windows.Forms.Label() Me.grpInsert.SuspendLayout() Me.grpOPtions.SuspendLayout() Me.SuspendLayout() @@ -73,16 +74,16 @@ Partial Class dlgInsertColumn ' 'grpInsert ' + Me.grpInsert.Controls.Add(Me.Label1) Me.grpInsert.Controls.Add(Me.ucrInputBeforeAfter) Me.grpInsert.Controls.Add(Me.ucrReceiverColumnsToInsert) Me.grpInsert.Controls.Add(Me.rdoBeforeAfter) Me.grpInsert.Controls.Add(Me.rdoAtStart) Me.grpInsert.Controls.Add(Me.rdoAtEnd) Me.grpInsert.Controls.Add(Me.ucrPnlInsertColumns) - Me.grpInsert.Controls.Add(Me.grpOPtions) Me.grpInsert.Location = New System.Drawing.Point(235, 91) Me.grpInsert.Name = "grpInsert" - Me.grpInsert.Size = New System.Drawing.Size(316, 101) + Me.grpInsert.Size = New System.Drawing.Size(344, 101) Me.grpInsert.TabIndex = 4 Me.grpInsert.TabStop = False Me.grpInsert.Text = "Insert" @@ -91,7 +92,7 @@ Partial Class dlgInsertColumn ' Me.ucrInputBeforeAfter.AddQuotesIfUnrecognised = True Me.ucrInputBeforeAfter.IsReadOnly = False - Me.ucrInputBeforeAfter.Location = New System.Drawing.Point(131, 63) + Me.ucrInputBeforeAfter.Location = New System.Drawing.Point(158, 63) Me.ucrInputBeforeAfter.Name = "ucrInputBeforeAfter" Me.ucrInputBeforeAfter.Size = New System.Drawing.Size(93, 21) Me.ucrInputBeforeAfter.TabIndex = 4 @@ -99,7 +100,7 @@ Partial Class dlgInsertColumn 'ucrReceiverColumnsToInsert ' Me.ucrReceiverColumnsToInsert.frmParent = Me - Me.ucrReceiverColumnsToInsert.Location = New System.Drawing.Point(234, 64) + Me.ucrReceiverColumnsToInsert.Location = New System.Drawing.Point(253, 64) Me.ucrReceiverColumnsToInsert.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverColumnsToInsert.Name = "ucrReceiverColumnsToInsert" Me.ucrReceiverColumnsToInsert.Selector = Nothing @@ -113,10 +114,10 @@ Partial Class dlgInsertColumn Me.rdoBeforeAfter.AutoSize = True Me.rdoBeforeAfter.Location = New System.Drawing.Point(21, 64) Me.rdoBeforeAfter.Name = "rdoBeforeAfter" - Me.rdoBeforeAfter.Size = New System.Drawing.Size(96, 17) + Me.rdoBeforeAfter.Size = New System.Drawing.Size(134, 17) Me.rdoBeforeAfter.TabIndex = 3 Me.rdoBeforeAfter.TabStop = True - Me.rdoBeforeAfter.Text = "Before or After:" + Me.rdoBeforeAfter.Text = "Before or After Column:" Me.rdoBeforeAfter.UseVisualStyleBackColor = True ' 'rdoAtStart @@ -145,7 +146,7 @@ Partial Class dlgInsertColumn ' Me.ucrPnlInsertColumns.Location = New System.Drawing.Point(6, 14) Me.ucrPnlInsertColumns.Name = "ucrPnlInsertColumns" - Me.ucrPnlInsertColumns.Size = New System.Drawing.Size(304, 81) + Me.ucrPnlInsertColumns.Size = New System.Drawing.Size(328, 81) Me.ucrPnlInsertColumns.TabIndex = 0 ' 'grpOPtions @@ -153,7 +154,7 @@ Partial Class dlgInsertColumn Me.grpOPtions.Controls.Add(Me.rdoAfter) Me.grpOPtions.Controls.Add(Me.rdoBefore) Me.grpOPtions.Controls.Add(Me.ucrPnlBeforeAfter) - Me.grpOPtions.Location = New System.Drawing.Point(3, -20) + Me.grpOPtions.Location = New System.Drawing.Point(232, 93) Me.grpOPtions.Name = "grpOPtions" Me.grpOPtions.Size = New System.Drawing.Size(85, 82) Me.grpOPtions.TabIndex = 13 @@ -242,7 +243,7 @@ Partial Class dlgInsertColumn 'lblInputPrefix ' Me.lblInputPrefix.AutoSize = True - Me.lblInputPrefix.Location = New System.Drawing.Point(16, 255) + Me.lblInputPrefix.Location = New System.Drawing.Point(10, 259) Me.lblInputPrefix.Name = "lblInputPrefix" Me.lblInputPrefix.Size = New System.Drawing.Size(117, 13) Me.lblInputPrefix.TabIndex = 15 @@ -253,9 +254,9 @@ Partial Class dlgInsertColumn Me.ucrInputPrefixForNewColumn.AddQuotesIfUnrecognised = True Me.ucrInputPrefixForNewColumn.IsMultiline = False Me.ucrInputPrefixForNewColumn.IsReadOnly = False - Me.ucrInputPrefixForNewColumn.Location = New System.Drawing.Point(165, 255) + Me.ucrInputPrefixForNewColumn.Location = New System.Drawing.Point(129, 255) Me.ucrInputPrefixForNewColumn.Name = "ucrInputPrefixForNewColumn" - Me.ucrInputPrefixForNewColumn.Size = New System.Drawing.Size(137, 21) + Me.ucrInputPrefixForNewColumn.Size = New System.Drawing.Size(163, 21) Me.ucrInputPrefixForNewColumn.TabIndex = 16 ' 'ucrNudNumberOfColumns @@ -336,17 +337,27 @@ Partial Class dlgInsertColumn Me.ucrNudStartRow.TabIndex = 12 Me.ucrNudStartRow.Value = New Decimal(New Integer() {0, 0, 0, 0}) ' + 'Label1 + ' + Me.Label1.AutoSize = True + Me.Label1.Location = New System.Drawing.Point(250, 48) + Me.Label1.Name = "Label1" + Me.Label1.Size = New System.Drawing.Size(45, 13) + Me.Label1.TabIndex = 8 + Me.Label1.Text = "Column:" + ' 'dlgInsertColumn ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(557, 343) + Me.ClientSize = New System.Drawing.Size(591, 343) Me.Controls.Add(Me.lblInputPrefix) Me.Controls.Add(Me.ucrInputPrefixForNewColumn) Me.Controls.Add(Me.ucrNudNumberOfColumns) Me.Controls.Add(Me.rdoInsertRows) Me.Controls.Add(Me.rdoInsertColumns) Me.Controls.Add(Me.ucrPnlColumnsOrRows) + Me.Controls.Add(Me.grpOPtions) Me.Controls.Add(Me.ucrInputDefaultValue) Me.Controls.Add(Me.lblDefaultValue) Me.Controls.Add(Me.lblNumberOfColumnsToInsert) @@ -400,4 +411,5 @@ Partial Class dlgInsertColumn Friend WithEvents rdoBeforeAfter As RadioButton Friend WithEvents lblInputPrefix As Label Friend WithEvents ucrInputPrefixForNewColumn As ucrInputTextBox + Friend WithEvents Label1 As Label End Class diff --git a/instat/dlgInsertColumn.vb b/instat/dlgInsertColumn.vb index c626e51b863..1554b8e8268 100644 --- a/instat/dlgInsertColumn.vb +++ b/instat/dlgInsertColumn.vb @@ -52,9 +52,12 @@ Public Class dlgInsertColumn ucrDataFramesList.SetParameter(New RParameter("data_name")) ucrDataFramesList.SetParameterIsString() ucrNudNumberOfRows.SetParameter(New RParameter("number_rows")) - ucrNudStartRow.SetParameter(New RParameter("start_row")) + ucrNudNumberOfRows.SetMinMax(1, Integer.MaxValue) ucrNudNumberOfRows.SetRDefault(1) - ucrNudNumberOfColumns.SetRDefault(1) + ucrNudStartRow.SetParameter(New RParameter("start_row")) + ucrNudStartRow.SetMinMax(1, Integer.MaxValue) + + Dim dctBeforeAfter As New Dictionary(Of String, String) ucrInputBeforeAfter.SetParameter(New RParameter("before")) @@ -67,13 +70,15 @@ Public Class dlgInsertColumn ucrPnlInsertColumns.AddRadioButton(rdoAtStart, "TRUE") ucrPnlInsertColumns.AddRadioButton(rdoAtEnd, "FALSE") ucrPnlInsertColumns.AddRadioButton(rdoBeforeAfter, "TRUE") - ' ucrPnlInsertColumns.bAllowNonConditionValues = False ucrNudNumberOfColumns.SetParameter(New RParameter("num_cols")) + ucrNudNumberOfColumns.SetRDefault(1) + ucrNudNumberOfColumns.SetMinMax(1, Integer.MaxValue) ucrInputDefaultValue.SetParameter(New RParameter("col_data")) ucrInputPrefixForNewColumn.SetParameter(New RParameter("col_name")) ucrInputDefaultValue.SetRDefault("NA") + ucrPnlInsertColumns.AddParameterValuesCondition(rdoAtStart, "before", "TRUE") ucrPnlInsertColumns.AddParameterValuesCondition(rdoAtStart, "before", "FALSE", False) ucrPnlInsertColumns.AddParameterPresentCondition(rdoAtStart, "adjacent_column", False) @@ -87,7 +92,6 @@ Public Class dlgInsertColumn ucrPnlInsertColumns.AddParameterPresentCondition(rdoBeforeAfter, "adjacent_column") ucrPnlInsertColumns.SetRDefault("FALSE") - ucrPnlColumnsOrRows.AddToLinkedControls(ucrPnlInsertColumns, {rdoInsertColumns}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) ucrPnlColumnsOrRows.AddToLinkedControls(ucrInputBeforeAfter, {rdoInsertColumns}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) ucrPnlColumnsOrRows.AddToLinkedControls(ucrReceiverColumnsToInsert, {rdoInsertColumns}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) @@ -138,7 +142,6 @@ Public Class dlgInsertColumn Private Sub SetRCodeForControls(bReset As Boolean) ucrDataFramesList.SetRCode(clsInsertColumnFunction, bReset) ucrDataFramesList.AddAdditionalCodeParameterPair(clsInsertColumnFunction, ucrDataFramesList.GetParameter, iAdditionalPairNo:=1) - ' ucrDataFramesList.SetParameterIsString() ucrNudNumberOfRows.SetRCode(clsInsertRowFunction, bReset) ucrNudStartRow.SetRCode(clsInsertRowFunction, bReset) From 08db1312700b88a7b1bf2c92aa780d8bb3acdb28 Mon Sep 17 00:00:00 2001 From: shadrack kibet Date: Mon, 29 May 2017 16:20:29 +0300 Subject: [PATCH 050/154] linking set and minor fixes --- instat/dlgInsertColumn.Designer.vb | 46 +++++++++++++++--------------- instat/dlgInsertColumn.vb | 3 +- 2 files changed, 24 insertions(+), 25 deletions(-) diff --git a/instat/dlgInsertColumn.Designer.vb b/instat/dlgInsertColumn.Designer.vb index 60fb4d03cce..ab12bf7e4ca 100644 --- a/instat/dlgInsertColumn.Designer.vb +++ b/instat/dlgInsertColumn.Designer.vb @@ -25,6 +25,7 @@ Partial Class dlgInsertColumn Me.lblStartPos = New System.Windows.Forms.Label() Me.lblNumberOfRowsToInsert = New System.Windows.Forms.Label() Me.grpInsert = New System.Windows.Forms.GroupBox() + Me.lblColumn = New System.Windows.Forms.Label() Me.ucrInputBeforeAfter = New instat.ucrInputComboBox() Me.ucrReceiverColumnsToInsert = New instat.ucrReceiverSingle() Me.rdoBeforeAfter = New System.Windows.Forms.RadioButton() @@ -49,7 +50,6 @@ Partial Class dlgInsertColumn Me.ucrDataFramesList = New instat.ucrDataFrame() Me.ucrNudNumberOfRows = New instat.ucrNud() Me.ucrNudStartRow = New instat.ucrNud() - Me.Label1 = New System.Windows.Forms.Label() Me.grpInsert.SuspendLayout() Me.grpOPtions.SuspendLayout() Me.SuspendLayout() @@ -57,7 +57,7 @@ Partial Class dlgInsertColumn 'lblStartPos ' Me.lblStartPos.AutoSize = True - Me.lblStartPos.Location = New System.Drawing.Point(12, 129) + Me.lblStartPos.Location = New System.Drawing.Point(14, 162) Me.lblStartPos.Name = "lblStartPos" Me.lblStartPos.Size = New System.Drawing.Size(88, 13) Me.lblStartPos.TabIndex = 11 @@ -66,7 +66,7 @@ Partial Class dlgInsertColumn 'lblNumberOfRowsToInsert ' Me.lblNumberOfRowsToInsert.AutoSize = True - Me.lblNumberOfRowsToInsert.Location = New System.Drawing.Point(12, 103) + Me.lblNumberOfRowsToInsert.Location = New System.Drawing.Point(12, 126) Me.lblNumberOfRowsToInsert.Name = "lblNumberOfRowsToInsert" Me.lblNumberOfRowsToInsert.Size = New System.Drawing.Size(130, 13) Me.lblNumberOfRowsToInsert.TabIndex = 9 @@ -74,12 +74,13 @@ Partial Class dlgInsertColumn ' 'grpInsert ' - Me.grpInsert.Controls.Add(Me.Label1) + Me.grpInsert.Controls.Add(Me.lblColumn) Me.grpInsert.Controls.Add(Me.ucrInputBeforeAfter) Me.grpInsert.Controls.Add(Me.ucrReceiverColumnsToInsert) Me.grpInsert.Controls.Add(Me.rdoBeforeAfter) Me.grpInsert.Controls.Add(Me.rdoAtStart) Me.grpInsert.Controls.Add(Me.rdoAtEnd) + Me.grpInsert.Controls.Add(Me.grpOPtions) Me.grpInsert.Controls.Add(Me.ucrPnlInsertColumns) Me.grpInsert.Location = New System.Drawing.Point(235, 91) Me.grpInsert.Name = "grpInsert" @@ -88,6 +89,15 @@ Partial Class dlgInsertColumn Me.grpInsert.TabStop = False Me.grpInsert.Text = "Insert" ' + 'lblColumn + ' + Me.lblColumn.AutoSize = True + Me.lblColumn.Location = New System.Drawing.Point(250, 48) + Me.lblColumn.Name = "lblColumn" + Me.lblColumn.Size = New System.Drawing.Size(45, 13) + Me.lblColumn.TabIndex = 8 + Me.lblColumn.Text = "Column:" + ' 'ucrInputBeforeAfter ' Me.ucrInputBeforeAfter.AddQuotesIfUnrecognised = True @@ -112,7 +122,7 @@ Partial Class dlgInsertColumn 'rdoBeforeAfter ' Me.rdoBeforeAfter.AutoSize = True - Me.rdoBeforeAfter.Location = New System.Drawing.Point(21, 64) + Me.rdoBeforeAfter.Location = New System.Drawing.Point(21, 70) Me.rdoBeforeAfter.Name = "rdoBeforeAfter" Me.rdoBeforeAfter.Size = New System.Drawing.Size(134, 17) Me.rdoBeforeAfter.TabIndex = 3 @@ -123,7 +133,7 @@ Partial Class dlgInsertColumn 'rdoAtStart ' Me.rdoAtStart.AutoSize = True - Me.rdoAtStart.Location = New System.Drawing.Point(22, 38) + Me.rdoAtStart.Location = New System.Drawing.Point(22, 44) Me.rdoAtStart.Name = "rdoAtStart" Me.rdoAtStart.Size = New System.Drawing.Size(60, 17) Me.rdoAtStart.TabIndex = 2 @@ -154,9 +164,9 @@ Partial Class dlgInsertColumn Me.grpOPtions.Controls.Add(Me.rdoAfter) Me.grpOPtions.Controls.Add(Me.rdoBefore) Me.grpOPtions.Controls.Add(Me.ucrPnlBeforeAfter) - Me.grpOPtions.Location = New System.Drawing.Point(232, 93) + Me.grpOPtions.Location = New System.Drawing.Point(21, 19) Me.grpOPtions.Name = "grpOPtions" - Me.grpOPtions.Size = New System.Drawing.Size(85, 82) + Me.grpOPtions.Size = New System.Drawing.Size(106, 82) Me.grpOPtions.TabIndex = 13 Me.grpOPtions.TabStop = False Me.grpOPtions.Text = "Options" @@ -285,13 +295,13 @@ Partial Class dlgInsertColumn Me.ucrInputDefaultValue.IsReadOnly = False Me.ucrInputDefaultValue.Location = New System.Drawing.Point(374, 221) Me.ucrInputDefaultValue.Name = "ucrInputDefaultValue" - Me.ucrInputDefaultValue.Size = New System.Drawing.Size(45, 21) + Me.ucrInputDefaultValue.Size = New System.Drawing.Size(49, 21) Me.ucrInputDefaultValue.TabIndex = 8 ' 'ucrSelectorInsertColumns ' Me.ucrSelectorInsertColumns.bShowHiddenColumns = False - Me.ucrSelectorInsertColumns.Location = New System.Drawing.Point(9, 91) + Me.ucrSelectorInsertColumns.Location = New System.Drawing.Point(9, 103) Me.ucrSelectorInsertColumns.Margin = New System.Windows.Forms.Padding(0) Me.ucrSelectorInsertColumns.Name = "ucrSelectorInsertColumns" Me.ucrSelectorInsertColumns.Size = New System.Drawing.Size(202, 139) @@ -317,7 +327,7 @@ Partial Class dlgInsertColumn ' Me.ucrNudNumberOfRows.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudNumberOfRows.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudNumberOfRows.Location = New System.Drawing.Point(148, 101) + Me.ucrNudNumberOfRows.Location = New System.Drawing.Point(148, 122) Me.ucrNudNumberOfRows.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) Me.ucrNudNumberOfRows.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudNumberOfRows.Name = "ucrNudNumberOfRows" @@ -329,7 +339,7 @@ Partial Class dlgInsertColumn ' Me.ucrNudStartRow.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudStartRow.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudStartRow.Location = New System.Drawing.Point(148, 129) + Me.ucrNudStartRow.Location = New System.Drawing.Point(148, 159) Me.ucrNudStartRow.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) Me.ucrNudStartRow.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudStartRow.Name = "ucrNudStartRow" @@ -337,15 +347,6 @@ Partial Class dlgInsertColumn Me.ucrNudStartRow.TabIndex = 12 Me.ucrNudStartRow.Value = New Decimal(New Integer() {0, 0, 0, 0}) ' - 'Label1 - ' - Me.Label1.AutoSize = True - Me.Label1.Location = New System.Drawing.Point(250, 48) - Me.Label1.Name = "Label1" - Me.Label1.Size = New System.Drawing.Size(45, 13) - Me.Label1.TabIndex = 8 - Me.Label1.Text = "Column:" - ' 'dlgInsertColumn ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -357,7 +358,6 @@ Partial Class dlgInsertColumn Me.Controls.Add(Me.rdoInsertRows) Me.Controls.Add(Me.rdoInsertColumns) Me.Controls.Add(Me.ucrPnlColumnsOrRows) - Me.Controls.Add(Me.grpOPtions) Me.Controls.Add(Me.ucrInputDefaultValue) Me.Controls.Add(Me.lblDefaultValue) Me.Controls.Add(Me.lblNumberOfColumnsToInsert) @@ -411,5 +411,5 @@ Partial Class dlgInsertColumn Friend WithEvents rdoBeforeAfter As RadioButton Friend WithEvents lblInputPrefix As Label Friend WithEvents ucrInputPrefixForNewColumn As ucrInputTextBox - Friend WithEvents Label1 As Label + Friend WithEvents lblColumn As Label End Class diff --git a/instat/dlgInsertColumn.vb b/instat/dlgInsertColumn.vb index 1554b8e8268..6c9f8b29fd0 100644 --- a/instat/dlgInsertColumn.vb +++ b/instat/dlgInsertColumn.vb @@ -57,8 +57,6 @@ Public Class dlgInsertColumn ucrNudStartRow.SetParameter(New RParameter("start_row")) ucrNudStartRow.SetMinMax(1, Integer.MaxValue) - - Dim dctBeforeAfter As New Dictionary(Of String, String) ucrInputBeforeAfter.SetParameter(New RParameter("before")) dctBeforeAfter.Add("Before", "TRUE") @@ -105,6 +103,7 @@ Public Class dlgInsertColumn ucrPnlColumnsOrRows.AddToLinkedControls(ucrNudNumberOfRows, {rdoInsertRows}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) ucrPnlColumnsOrRows.AddToLinkedControls(ucrNudStartRow, {rdoInsertRows}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) ucrPnlInsertColumns.AddToLinkedControls(ucrSelectorInsertColumns, {rdoBeforeAfter}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) + ucrSelectorInsertColumns.SetLinkedDisplayControl(lblColumn) ucrPnlBeforeAfter.SetLinkedDisplayControl(grpOPtions) ucrPnlInsertColumns.AddToLinkedControls(ucrInputBeforeAfter, {rdoBeforeAfter}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) ucrPnlInsertColumns.AddToLinkedControls(ucrReceiverColumnsToInsert, {rdoBeforeAfter}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) From efbb0af93e009ecbe3a3b3d6c416b2e345ff2153 Mon Sep 17 00:00:00 2001 From: shadrack kibet Date: Mon, 29 May 2017 16:57:13 +0300 Subject: [PATCH 051/154] designer changes --- instat/dlgInsertColumn.Designer.vb | 26 +++++++++++++------------- instat/dlgInsertColumn.vb | 1 - 2 files changed, 13 insertions(+), 14 deletions(-) diff --git a/instat/dlgInsertColumn.Designer.vb b/instat/dlgInsertColumn.Designer.vb index ab12bf7e4ca..5e973cda958 100644 --- a/instat/dlgInsertColumn.Designer.vb +++ b/instat/dlgInsertColumn.Designer.vb @@ -31,11 +31,11 @@ Partial Class dlgInsertColumn Me.rdoBeforeAfter = New System.Windows.Forms.RadioButton() Me.rdoAtStart = New System.Windows.Forms.RadioButton() Me.rdoAtEnd = New System.Windows.Forms.RadioButton() - Me.ucrPnlInsertColumns = New instat.UcrPanel() Me.grpOPtions = New System.Windows.Forms.GroupBox() Me.rdoAfter = New System.Windows.Forms.RadioButton() Me.rdoBefore = New System.Windows.Forms.RadioButton() Me.ucrPnlBeforeAfter = New instat.UcrPanel() + Me.ucrPnlInsertColumns = New instat.UcrPanel() Me.lblNumberOfColumnsToInsert = New System.Windows.Forms.Label() Me.lblDefaultValue = New System.Windows.Forms.Label() Me.rdoInsertColumns = New System.Windows.Forms.RadioButton() @@ -80,7 +80,6 @@ Partial Class dlgInsertColumn Me.grpInsert.Controls.Add(Me.rdoBeforeAfter) Me.grpInsert.Controls.Add(Me.rdoAtStart) Me.grpInsert.Controls.Add(Me.rdoAtEnd) - Me.grpInsert.Controls.Add(Me.grpOPtions) Me.grpInsert.Controls.Add(Me.ucrPnlInsertColumns) Me.grpInsert.Location = New System.Drawing.Point(235, 91) Me.grpInsert.Name = "grpInsert" @@ -92,7 +91,7 @@ Partial Class dlgInsertColumn 'lblColumn ' Me.lblColumn.AutoSize = True - Me.lblColumn.Location = New System.Drawing.Point(250, 48) + Me.lblColumn.Location = New System.Drawing.Point(258, 55) Me.lblColumn.Name = "lblColumn" Me.lblColumn.Size = New System.Drawing.Size(45, 13) Me.lblColumn.TabIndex = 8 @@ -102,7 +101,7 @@ Partial Class dlgInsertColumn ' Me.ucrInputBeforeAfter.AddQuotesIfUnrecognised = True Me.ucrInputBeforeAfter.IsReadOnly = False - Me.ucrInputBeforeAfter.Location = New System.Drawing.Point(158, 63) + Me.ucrInputBeforeAfter.Location = New System.Drawing.Point(154, 70) Me.ucrInputBeforeAfter.Name = "ucrInputBeforeAfter" Me.ucrInputBeforeAfter.Size = New System.Drawing.Size(93, 21) Me.ucrInputBeforeAfter.TabIndex = 4 @@ -110,7 +109,7 @@ Partial Class dlgInsertColumn 'ucrReceiverColumnsToInsert ' Me.ucrReceiverColumnsToInsert.frmParent = Me - Me.ucrReceiverColumnsToInsert.Location = New System.Drawing.Point(253, 64) + Me.ucrReceiverColumnsToInsert.Location = New System.Drawing.Point(258, 71) Me.ucrReceiverColumnsToInsert.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverColumnsToInsert.Name = "ucrReceiverColumnsToInsert" Me.ucrReceiverColumnsToInsert.Selector = Nothing @@ -152,19 +151,12 @@ Partial Class dlgInsertColumn Me.rdoAtEnd.Text = "At End" Me.rdoAtEnd.UseVisualStyleBackColor = True ' - 'ucrPnlInsertColumns - ' - Me.ucrPnlInsertColumns.Location = New System.Drawing.Point(6, 14) - Me.ucrPnlInsertColumns.Name = "ucrPnlInsertColumns" - Me.ucrPnlInsertColumns.Size = New System.Drawing.Size(328, 81) - Me.ucrPnlInsertColumns.TabIndex = 0 - ' 'grpOPtions ' Me.grpOPtions.Controls.Add(Me.rdoAfter) Me.grpOPtions.Controls.Add(Me.rdoBefore) Me.grpOPtions.Controls.Add(Me.ucrPnlBeforeAfter) - Me.grpOPtions.Location = New System.Drawing.Point(21, 19) + Me.grpOPtions.Location = New System.Drawing.Point(236, 105) Me.grpOPtions.Name = "grpOPtions" Me.grpOPtions.Size = New System.Drawing.Size(106, 82) Me.grpOPtions.TabIndex = 13 @@ -200,6 +192,13 @@ Partial Class dlgInsertColumn Me.ucrPnlBeforeAfter.Size = New System.Drawing.Size(71, 57) Me.ucrPnlBeforeAfter.TabIndex = 0 ' + 'ucrPnlInsertColumns + ' + Me.ucrPnlInsertColumns.Location = New System.Drawing.Point(6, 14) + Me.ucrPnlInsertColumns.Name = "ucrPnlInsertColumns" + Me.ucrPnlInsertColumns.Size = New System.Drawing.Size(328, 81) + Me.ucrPnlInsertColumns.TabIndex = 0 + ' 'lblNumberOfColumnsToInsert ' Me.lblNumberOfColumnsToInsert.AutoSize = True @@ -358,6 +357,7 @@ Partial Class dlgInsertColumn Me.Controls.Add(Me.rdoInsertRows) Me.Controls.Add(Me.rdoInsertColumns) Me.Controls.Add(Me.ucrPnlColumnsOrRows) + Me.Controls.Add(Me.grpOPtions) Me.Controls.Add(Me.ucrInputDefaultValue) Me.Controls.Add(Me.lblDefaultValue) Me.Controls.Add(Me.lblNumberOfColumnsToInsert) diff --git a/instat/dlgInsertColumn.vb b/instat/dlgInsertColumn.vb index 6c9f8b29fd0..b909081a811 100644 --- a/instat/dlgInsertColumn.vb +++ b/instat/dlgInsertColumn.vb @@ -76,7 +76,6 @@ Public Class dlgInsertColumn ucrInputPrefixForNewColumn.SetParameter(New RParameter("col_name")) ucrInputDefaultValue.SetRDefault("NA") - ucrPnlInsertColumns.AddParameterValuesCondition(rdoAtStart, "before", "TRUE") ucrPnlInsertColumns.AddParameterValuesCondition(rdoAtStart, "before", "FALSE", False) ucrPnlInsertColumns.AddParameterPresentCondition(rdoAtStart, "adjacent_column", False) From 9f2aec6d055cbfc03cd2a29a881a679c06ee5f5a Mon Sep 17 00:00:00 2001 From: shadrack kibet Date: Mon, 29 May 2017 18:13:25 +0300 Subject: [PATCH 052/154] edits on naming --- instat/dlgInsertColumn.Designer.vb | 42 +++++++++++++++--------------- instat/dlgInsertColumn.vb | 2 +- 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/instat/dlgInsertColumn.Designer.vb b/instat/dlgInsertColumn.Designer.vb index 5e973cda958..92218b6295a 100644 --- a/instat/dlgInsertColumn.Designer.vb +++ b/instat/dlgInsertColumn.Designer.vb @@ -31,16 +31,16 @@ Partial Class dlgInsertColumn Me.rdoBeforeAfter = New System.Windows.Forms.RadioButton() Me.rdoAtStart = New System.Windows.Forms.RadioButton() Me.rdoAtEnd = New System.Windows.Forms.RadioButton() + Me.ucrPnlInsertColumns = New instat.UcrPanel() Me.grpOPtions = New System.Windows.Forms.GroupBox() Me.rdoAfter = New System.Windows.Forms.RadioButton() Me.rdoBefore = New System.Windows.Forms.RadioButton() Me.ucrPnlBeforeAfter = New instat.UcrPanel() - Me.ucrPnlInsertColumns = New instat.UcrPanel() Me.lblNumberOfColumnsToInsert = New System.Windows.Forms.Label() Me.lblDefaultValue = New System.Windows.Forms.Label() Me.rdoInsertColumns = New System.Windows.Forms.RadioButton() Me.rdoInsertRows = New System.Windows.Forms.RadioButton() - Me.lblInputPrefix = New System.Windows.Forms.Label() + Me.lblInputColumnPrefix = New System.Windows.Forms.Label() Me.ucrInputPrefixForNewColumn = New instat.ucrInputTextBox() Me.ucrNudNumberOfColumns = New instat.ucrNud() Me.ucrPnlColumnsOrRows = New instat.UcrPanel() @@ -91,7 +91,7 @@ Partial Class dlgInsertColumn 'lblColumn ' Me.lblColumn.AutoSize = True - Me.lblColumn.Location = New System.Drawing.Point(258, 55) + Me.lblColumn.Location = New System.Drawing.Point(256, 55) Me.lblColumn.Name = "lblColumn" Me.lblColumn.Size = New System.Drawing.Size(45, 13) Me.lblColumn.TabIndex = 8 @@ -151,6 +151,13 @@ Partial Class dlgInsertColumn Me.rdoAtEnd.Text = "At End" Me.rdoAtEnd.UseVisualStyleBackColor = True ' + 'ucrPnlInsertColumns + ' + Me.ucrPnlInsertColumns.Location = New System.Drawing.Point(6, 14) + Me.ucrPnlInsertColumns.Name = "ucrPnlInsertColumns" + Me.ucrPnlInsertColumns.Size = New System.Drawing.Size(328, 81) + Me.ucrPnlInsertColumns.TabIndex = 0 + ' 'grpOPtions ' Me.grpOPtions.Controls.Add(Me.rdoAfter) @@ -192,13 +199,6 @@ Partial Class dlgInsertColumn Me.ucrPnlBeforeAfter.Size = New System.Drawing.Size(71, 57) Me.ucrPnlBeforeAfter.TabIndex = 0 ' - 'ucrPnlInsertColumns - ' - Me.ucrPnlInsertColumns.Location = New System.Drawing.Point(6, 14) - Me.ucrPnlInsertColumns.Name = "ucrPnlInsertColumns" - Me.ucrPnlInsertColumns.Size = New System.Drawing.Size(328, 81) - Me.ucrPnlInsertColumns.TabIndex = 0 - ' 'lblNumberOfColumnsToInsert ' Me.lblNumberOfColumnsToInsert.AutoSize = True @@ -249,21 +249,21 @@ Partial Class dlgInsertColumn Me.rdoInsertRows.TextAlign = System.Drawing.ContentAlignment.MiddleCenter Me.rdoInsertRows.UseVisualStyleBackColor = True ' - 'lblInputPrefix + 'lblInputColumnPrefix ' - Me.lblInputPrefix.AutoSize = True - Me.lblInputPrefix.Location = New System.Drawing.Point(10, 259) - Me.lblInputPrefix.Name = "lblInputPrefix" - Me.lblInputPrefix.Size = New System.Drawing.Size(117, 13) - Me.lblInputPrefix.TabIndex = 15 - Me.lblInputPrefix.Text = "Prefix For New Column:" + Me.lblInputColumnPrefix.AutoSize = True + Me.lblInputColumnPrefix.Location = New System.Drawing.Point(10, 259) + Me.lblInputColumnPrefix.Name = "lblInputColumnPrefix" + Me.lblInputColumnPrefix.Size = New System.Drawing.Size(144, 13) + Me.lblInputColumnPrefix.TabIndex = 15 + Me.lblInputColumnPrefix.Text = "Prefix For Inserted Column(s):" ' 'ucrInputPrefixForNewColumn ' Me.ucrInputPrefixForNewColumn.AddQuotesIfUnrecognised = True Me.ucrInputPrefixForNewColumn.IsMultiline = False Me.ucrInputPrefixForNewColumn.IsReadOnly = False - Me.ucrInputPrefixForNewColumn.Location = New System.Drawing.Point(129, 255) + Me.ucrInputPrefixForNewColumn.Location = New System.Drawing.Point(157, 255) Me.ucrInputPrefixForNewColumn.Name = "ucrInputPrefixForNewColumn" Me.ucrInputPrefixForNewColumn.Size = New System.Drawing.Size(163, 21) Me.ucrInputPrefixForNewColumn.TabIndex = 16 @@ -272,7 +272,7 @@ Partial Class dlgInsertColumn ' Me.ucrNudNumberOfColumns.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudNumberOfColumns.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudNumberOfColumns.Location = New System.Drawing.Point(373, 197) + Me.ucrNudNumberOfColumns.Location = New System.Drawing.Point(378, 197) Me.ucrNudNumberOfColumns.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) Me.ucrNudNumberOfColumns.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudNumberOfColumns.Name = "ucrNudNumberOfColumns" @@ -351,7 +351,7 @@ Partial Class dlgInsertColumn Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.ClientSize = New System.Drawing.Size(591, 343) - Me.Controls.Add(Me.lblInputPrefix) + Me.Controls.Add(Me.lblInputColumnPrefix) Me.Controls.Add(Me.ucrInputPrefixForNewColumn) Me.Controls.Add(Me.ucrNudNumberOfColumns) Me.Controls.Add(Me.rdoInsertRows) @@ -409,7 +409,7 @@ Partial Class dlgInsertColumn Friend WithEvents ucrPnlBeforeAfter As UcrPanel Friend WithEvents ucrPnlInsertColumns As UcrPanel Friend WithEvents rdoBeforeAfter As RadioButton - Friend WithEvents lblInputPrefix As Label + Friend WithEvents lblInputColumnPrefix As Label Friend WithEvents ucrInputPrefixForNewColumn As ucrInputTextBox Friend WithEvents lblColumn As Label End Class diff --git a/instat/dlgInsertColumn.vb b/instat/dlgInsertColumn.vb index b909081a811..f25ca261aa8 100644 --- a/instat/dlgInsertColumn.vb +++ b/instat/dlgInsertColumn.vb @@ -96,7 +96,7 @@ Public Class dlgInsertColumn ucrPnlColumnsOrRows.AddToLinkedControls(ucrInputDefaultValue, {rdoInsertColumns}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) ucrPnlColumnsOrRows.AddToLinkedControls(ucrInputPrefixForNewColumn, {rdoInsertColumns}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) - ucrInputPrefixForNewColumn.SetLinkedDisplayControl(lblInputPrefix) + ucrInputPrefixForNewColumn.SetLinkedDisplayControl(lblInputColumnPrefix) ucrPnlColumnsOrRows.AddToLinkedControls(ucrPnlBeforeAfter, {rdoInsertRows}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) ucrPnlColumnsOrRows.AddToLinkedControls(ucrNudNumberOfRows, {rdoInsertRows}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) From 336923f4e01cde9e8f1659cda67611acbfa47b02 Mon Sep 17 00:00:00 2001 From: Lily Date: Tue, 30 May 2017 10:01:37 +0100 Subject: [PATCH 053/154] Layout edits, bug fixes --- instat/dlgInsertColumn.Designer.vb | 116 ++++++++++++++--------------- instat/dlgInsertColumn.vb | 39 +++++----- 2 files changed, 79 insertions(+), 76 deletions(-) diff --git a/instat/dlgInsertColumn.Designer.vb b/instat/dlgInsertColumn.Designer.vb index 92218b6295a..43e54989df8 100644 --- a/instat/dlgInsertColumn.Designer.vb +++ b/instat/dlgInsertColumn.Designer.vb @@ -32,7 +32,7 @@ Partial Class dlgInsertColumn Me.rdoAtStart = New System.Windows.Forms.RadioButton() Me.rdoAtEnd = New System.Windows.Forms.RadioButton() Me.ucrPnlInsertColumns = New instat.UcrPanel() - Me.grpOPtions = New System.Windows.Forms.GroupBox() + Me.grpOptions = New System.Windows.Forms.GroupBox() Me.rdoAfter = New System.Windows.Forms.RadioButton() Me.rdoBefore = New System.Windows.Forms.RadioButton() Me.ucrPnlBeforeAfter = New instat.UcrPanel() @@ -51,22 +51,22 @@ Partial Class dlgInsertColumn Me.ucrNudNumberOfRows = New instat.ucrNud() Me.ucrNudStartRow = New instat.ucrNud() Me.grpInsert.SuspendLayout() - Me.grpOPtions.SuspendLayout() + Me.grpOptions.SuspendLayout() Me.SuspendLayout() ' 'lblStartPos ' Me.lblStartPos.AutoSize = True - Me.lblStartPos.Location = New System.Drawing.Point(14, 162) + Me.lblStartPos.Location = New System.Drawing.Point(7, 107) Me.lblStartPos.Name = "lblStartPos" Me.lblStartPos.Size = New System.Drawing.Size(88, 13) - Me.lblStartPos.TabIndex = 11 + Me.lblStartPos.TabIndex = 7 Me.lblStartPos.Text = "Insert at Position:" ' 'lblNumberOfRowsToInsert ' Me.lblNumberOfRowsToInsert.AutoSize = True - Me.lblNumberOfRowsToInsert.Location = New System.Drawing.Point(12, 126) + Me.lblNumberOfRowsToInsert.Location = New System.Drawing.Point(7, 137) Me.lblNumberOfRowsToInsert.Name = "lblNumberOfRowsToInsert" Me.lblNumberOfRowsToInsert.Size = New System.Drawing.Size(130, 13) Me.lblNumberOfRowsToInsert.TabIndex = 9 @@ -81,17 +81,17 @@ Partial Class dlgInsertColumn Me.grpInsert.Controls.Add(Me.rdoAtStart) Me.grpInsert.Controls.Add(Me.rdoAtEnd) Me.grpInsert.Controls.Add(Me.ucrPnlInsertColumns) - Me.grpInsert.Location = New System.Drawing.Point(235, 91) + Me.grpInsert.Location = New System.Drawing.Point(235, 85) Me.grpInsert.Name = "grpInsert" - Me.grpInsert.Size = New System.Drawing.Size(344, 101) - Me.grpInsert.TabIndex = 4 + Me.grpInsert.Size = New System.Drawing.Size(286, 122) + Me.grpInsert.TabIndex = 5 Me.grpInsert.TabStop = False Me.grpInsert.Text = "Insert" ' 'lblColumn ' Me.lblColumn.AutoSize = True - Me.lblColumn.Location = New System.Drawing.Point(256, 55) + Me.lblColumn.Location = New System.Drawing.Point(152, 73) Me.lblColumn.Name = "lblColumn" Me.lblColumn.Size = New System.Drawing.Size(45, 13) Me.lblColumn.TabIndex = 8 @@ -101,7 +101,7 @@ Partial Class dlgInsertColumn ' Me.ucrInputBeforeAfter.AddQuotesIfUnrecognised = True Me.ucrInputBeforeAfter.IsReadOnly = False - Me.ucrInputBeforeAfter.Location = New System.Drawing.Point(154, 70) + Me.ucrInputBeforeAfter.Location = New System.Drawing.Point(51, 87) Me.ucrInputBeforeAfter.Name = "ucrInputBeforeAfter" Me.ucrInputBeforeAfter.Size = New System.Drawing.Size(93, 21) Me.ucrInputBeforeAfter.TabIndex = 4 @@ -109,11 +109,11 @@ Partial Class dlgInsertColumn 'ucrReceiverColumnsToInsert ' Me.ucrReceiverColumnsToInsert.frmParent = Me - Me.ucrReceiverColumnsToInsert.Location = New System.Drawing.Point(258, 71) + Me.ucrReceiverColumnsToInsert.Location = New System.Drawing.Point(151, 88) Me.ucrReceiverColumnsToInsert.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverColumnsToInsert.Name = "ucrReceiverColumnsToInsert" Me.ucrReceiverColumnsToInsert.Selector = Nothing - Me.ucrReceiverColumnsToInsert.Size = New System.Drawing.Size(75, 20) + Me.ucrReceiverColumnsToInsert.Size = New System.Drawing.Size(116, 20) Me.ucrReceiverColumnsToInsert.strNcFilePath = "" Me.ucrReceiverColumnsToInsert.TabIndex = 5 Me.ucrReceiverColumnsToInsert.ucrSelector = Nothing @@ -121,18 +121,18 @@ Partial Class dlgInsertColumn 'rdoBeforeAfter ' Me.rdoBeforeAfter.AutoSize = True - Me.rdoBeforeAfter.Location = New System.Drawing.Point(21, 70) + Me.rdoBeforeAfter.Location = New System.Drawing.Point(10, 64) Me.rdoBeforeAfter.Name = "rdoBeforeAfter" - Me.rdoBeforeAfter.Size = New System.Drawing.Size(134, 17) + Me.rdoBeforeAfter.Size = New System.Drawing.Size(131, 17) Me.rdoBeforeAfter.TabIndex = 3 Me.rdoBeforeAfter.TabStop = True - Me.rdoBeforeAfter.Text = "Before or After Column:" + Me.rdoBeforeAfter.Text = "Before or After Column" Me.rdoBeforeAfter.UseVisualStyleBackColor = True ' 'rdoAtStart ' Me.rdoAtStart.AutoSize = True - Me.rdoAtStart.Location = New System.Drawing.Point(22, 44) + Me.rdoAtStart.Location = New System.Drawing.Point(10, 18) Me.rdoAtStart.Name = "rdoAtStart" Me.rdoAtStart.Size = New System.Drawing.Size(60, 17) Me.rdoAtStart.TabIndex = 2 @@ -143,7 +143,7 @@ Partial Class dlgInsertColumn 'rdoAtEnd ' Me.rdoAtEnd.AutoSize = True - Me.rdoAtEnd.Location = New System.Drawing.Point(22, 18) + Me.rdoAtEnd.Location = New System.Drawing.Point(10, 41) Me.rdoAtEnd.Name = "rdoAtEnd" Me.rdoAtEnd.Size = New System.Drawing.Size(57, 17) Me.rdoAtEnd.TabIndex = 1 @@ -153,27 +153,27 @@ Partial Class dlgInsertColumn ' 'ucrPnlInsertColumns ' - Me.ucrPnlInsertColumns.Location = New System.Drawing.Point(6, 14) + Me.ucrPnlInsertColumns.Location = New System.Drawing.Point(3, 17) Me.ucrPnlInsertColumns.Name = "ucrPnlInsertColumns" - Me.ucrPnlInsertColumns.Size = New System.Drawing.Size(328, 81) + Me.ucrPnlInsertColumns.Size = New System.Drawing.Size(277, 101) Me.ucrPnlInsertColumns.TabIndex = 0 ' - 'grpOPtions + 'grpOptions ' - Me.grpOPtions.Controls.Add(Me.rdoAfter) - Me.grpOPtions.Controls.Add(Me.rdoBefore) - Me.grpOPtions.Controls.Add(Me.ucrPnlBeforeAfter) - Me.grpOPtions.Location = New System.Drawing.Point(236, 105) - Me.grpOPtions.Name = "grpOPtions" - Me.grpOPtions.Size = New System.Drawing.Size(106, 82) - Me.grpOPtions.TabIndex = 13 - Me.grpOPtions.TabStop = False - Me.grpOPtions.Text = "Options" + Me.grpOptions.Controls.Add(Me.rdoAfter) + Me.grpOptions.Controls.Add(Me.rdoBefore) + Me.grpOptions.Controls.Add(Me.ucrPnlBeforeAfter) + Me.grpOptions.Location = New System.Drawing.Point(235, 85) + Me.grpOptions.Name = "grpOptions" + Me.grpOptions.Size = New System.Drawing.Size(106, 71) + Me.grpOptions.TabIndex = 6 + Me.grpOptions.TabStop = False + Me.grpOptions.Text = "Options" ' 'rdoAfter ' Me.rdoAfter.AutoSize = True - Me.rdoAfter.Location = New System.Drawing.Point(6, 51) + Me.rdoAfter.Location = New System.Drawing.Point(10, 41) Me.rdoAfter.Name = "rdoAfter" Me.rdoAfter.Size = New System.Drawing.Size(47, 17) Me.rdoAfter.TabIndex = 2 @@ -184,7 +184,7 @@ Partial Class dlgInsertColumn 'rdoBefore ' Me.rdoBefore.AutoSize = True - Me.rdoBefore.Location = New System.Drawing.Point(6, 26) + Me.rdoBefore.Location = New System.Drawing.Point(10, 18) Me.rdoBefore.Name = "rdoBefore" Me.rdoBefore.Size = New System.Drawing.Size(56, 17) Me.rdoBefore.TabIndex = 1 @@ -196,25 +196,25 @@ Partial Class dlgInsertColumn ' Me.ucrPnlBeforeAfter.Location = New System.Drawing.Point(3, 16) Me.ucrPnlBeforeAfter.Name = "ucrPnlBeforeAfter" - Me.ucrPnlBeforeAfter.Size = New System.Drawing.Size(71, 57) + Me.ucrPnlBeforeAfter.Size = New System.Drawing.Size(86, 49) Me.ucrPnlBeforeAfter.TabIndex = 0 ' 'lblNumberOfColumnsToInsert ' Me.lblNumberOfColumnsToInsert.AutoSize = True - Me.lblNumberOfColumnsToInsert.Location = New System.Drawing.Point(232, 201) + Me.lblNumberOfColumnsToInsert.Location = New System.Drawing.Point(11, 236) Me.lblNumberOfColumnsToInsert.Name = "lblNumberOfColumnsToInsert" Me.lblNumberOfColumnsToInsert.Size = New System.Drawing.Size(143, 13) - Me.lblNumberOfColumnsToInsert.TabIndex = 5 + Me.lblNumberOfColumnsToInsert.TabIndex = 11 Me.lblNumberOfColumnsToInsert.Text = "Number of Columns to Insert:" ' 'lblDefaultValue ' Me.lblDefaultValue.AutoSize = True - Me.lblDefaultValue.Location = New System.Drawing.Point(233, 225) + Me.lblDefaultValue.Location = New System.Drawing.Point(11, 263) Me.lblDefaultValue.Name = "lblDefaultValue" Me.lblDefaultValue.Size = New System.Drawing.Size(74, 13) - Me.lblDefaultValue.TabIndex = 7 + Me.lblDefaultValue.TabIndex = 13 Me.lblDefaultValue.Text = "Default Value:" ' 'rdoInsertColumns @@ -225,7 +225,7 @@ Partial Class dlgInsertColumn Me.rdoInsertColumns.FlatAppearance.CheckedBackColor = System.Drawing.SystemColors.ActiveCaption Me.rdoInsertColumns.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.rdoInsertColumns.ForeColor = System.Drawing.SystemColors.ControlText - Me.rdoInsertColumns.Location = New System.Drawing.Point(140, 12) + Me.rdoInsertColumns.Location = New System.Drawing.Point(169, 12) Me.rdoInsertColumns.Name = "rdoInsertColumns" Me.rdoInsertColumns.Size = New System.Drawing.Size(100, 28) Me.rdoInsertColumns.TabIndex = 1 @@ -241,7 +241,7 @@ Partial Class dlgInsertColumn Me.rdoInsertRows.FlatAppearance.CheckedBackColor = System.Drawing.SystemColors.ActiveCaption Me.rdoInsertRows.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.rdoInsertRows.ForeColor = System.Drawing.SystemColors.ControlText - Me.rdoInsertRows.Location = New System.Drawing.Point(238, 12) + Me.rdoInsertRows.Location = New System.Drawing.Point(267, 12) Me.rdoInsertRows.Name = "rdoInsertRows" Me.rdoInsertRows.Size = New System.Drawing.Size(100, 28) Me.rdoInsertRows.TabIndex = 2 @@ -252,7 +252,7 @@ Partial Class dlgInsertColumn 'lblInputColumnPrefix ' Me.lblInputColumnPrefix.AutoSize = True - Me.lblInputColumnPrefix.Location = New System.Drawing.Point(10, 259) + Me.lblInputColumnPrefix.Location = New System.Drawing.Point(11, 289) Me.lblInputColumnPrefix.Name = "lblInputColumnPrefix" Me.lblInputColumnPrefix.Size = New System.Drawing.Size(144, 13) Me.lblInputColumnPrefix.TabIndex = 15 @@ -263,7 +263,7 @@ Partial Class dlgInsertColumn Me.ucrInputPrefixForNewColumn.AddQuotesIfUnrecognised = True Me.ucrInputPrefixForNewColumn.IsMultiline = False Me.ucrInputPrefixForNewColumn.IsReadOnly = False - Me.ucrInputPrefixForNewColumn.Location = New System.Drawing.Point(157, 255) + Me.ucrInputPrefixForNewColumn.Location = New System.Drawing.Point(159, 286) Me.ucrInputPrefixForNewColumn.Name = "ucrInputPrefixForNewColumn" Me.ucrInputPrefixForNewColumn.Size = New System.Drawing.Size(163, 21) Me.ucrInputPrefixForNewColumn.TabIndex = 16 @@ -272,17 +272,17 @@ Partial Class dlgInsertColumn ' Me.ucrNudNumberOfColumns.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudNumberOfColumns.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudNumberOfColumns.Location = New System.Drawing.Point(378, 197) + Me.ucrNudNumberOfColumns.Location = New System.Drawing.Point(159, 233) Me.ucrNudNumberOfColumns.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) Me.ucrNudNumberOfColumns.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudNumberOfColumns.Name = "ucrNudNumberOfColumns" Me.ucrNudNumberOfColumns.Size = New System.Drawing.Size(50, 20) - Me.ucrNudNumberOfColumns.TabIndex = 6 + Me.ucrNudNumberOfColumns.TabIndex = 12 Me.ucrNudNumberOfColumns.Value = New Decimal(New Integer() {0, 0, 0, 0}) ' 'ucrPnlColumnsOrRows ' - Me.ucrPnlColumnsOrRows.Location = New System.Drawing.Point(132, 12) + Me.ucrPnlColumnsOrRows.Location = New System.Drawing.Point(161, 12) Me.ucrPnlColumnsOrRows.Name = "ucrPnlColumnsOrRows" Me.ucrPnlColumnsOrRows.Size = New System.Drawing.Size(214, 37) Me.ucrPnlColumnsOrRows.TabIndex = 0 @@ -292,23 +292,23 @@ Partial Class dlgInsertColumn Me.ucrInputDefaultValue.AddQuotesIfUnrecognised = True Me.ucrInputDefaultValue.IsMultiline = False Me.ucrInputDefaultValue.IsReadOnly = False - Me.ucrInputDefaultValue.Location = New System.Drawing.Point(374, 221) + Me.ucrInputDefaultValue.Location = New System.Drawing.Point(159, 259) Me.ucrInputDefaultValue.Name = "ucrInputDefaultValue" Me.ucrInputDefaultValue.Size = New System.Drawing.Size(49, 21) - Me.ucrInputDefaultValue.TabIndex = 8 + Me.ucrInputDefaultValue.TabIndex = 14 ' 'ucrSelectorInsertColumns ' Me.ucrSelectorInsertColumns.bShowHiddenColumns = False - Me.ucrSelectorInsertColumns.Location = New System.Drawing.Point(9, 103) + Me.ucrSelectorInsertColumns.Location = New System.Drawing.Point(10, 95) Me.ucrSelectorInsertColumns.Margin = New System.Windows.Forms.Padding(0) Me.ucrSelectorInsertColumns.Name = "ucrSelectorInsertColumns" Me.ucrSelectorInsertColumns.Size = New System.Drawing.Size(202, 139) - Me.ucrSelectorInsertColumns.TabIndex = 14 + Me.ucrSelectorInsertColumns.TabIndex = 4 ' 'ucrBase ' - Me.ucrBase.Location = New System.Drawing.Point(10, 280) + Me.ucrBase.Location = New System.Drawing.Point(10, 313) Me.ucrBase.Name = "ucrBase" Me.ucrBase.Size = New System.Drawing.Size(410, 53) Me.ucrBase.TabIndex = 17 @@ -316,7 +316,7 @@ Partial Class dlgInsertColumn 'ucrDataFramesList ' Me.ucrDataFramesList.bUseCurrentFilter = True - Me.ucrDataFramesList.Location = New System.Drawing.Point(10, 52) + Me.ucrDataFramesList.Location = New System.Drawing.Point(10, 46) Me.ucrDataFramesList.Margin = New System.Windows.Forms.Padding(0) Me.ucrDataFramesList.Name = "ucrDataFramesList" Me.ucrDataFramesList.Size = New System.Drawing.Size(127, 41) @@ -326,7 +326,7 @@ Partial Class dlgInsertColumn ' Me.ucrNudNumberOfRows.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudNumberOfRows.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudNumberOfRows.Location = New System.Drawing.Point(148, 122) + Me.ucrNudNumberOfRows.Location = New System.Drawing.Point(139, 134) Me.ucrNudNumberOfRows.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) Me.ucrNudNumberOfRows.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudNumberOfRows.Name = "ucrNudNumberOfRows" @@ -338,30 +338,30 @@ Partial Class dlgInsertColumn ' Me.ucrNudStartRow.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudStartRow.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudStartRow.Location = New System.Drawing.Point(148, 159) + Me.ucrNudStartRow.Location = New System.Drawing.Point(101, 105) Me.ucrNudStartRow.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) Me.ucrNudStartRow.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudStartRow.Name = "ucrNudStartRow" Me.ucrNudStartRow.Size = New System.Drawing.Size(50, 20) - Me.ucrNudStartRow.TabIndex = 12 + Me.ucrNudStartRow.TabIndex = 8 Me.ucrNudStartRow.Value = New Decimal(New Integer() {0, 0, 0, 0}) ' 'dlgInsertColumn ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(591, 343) + Me.ClientSize = New System.Drawing.Size(531, 369) Me.Controls.Add(Me.lblInputColumnPrefix) Me.Controls.Add(Me.ucrInputPrefixForNewColumn) Me.Controls.Add(Me.ucrNudNumberOfColumns) Me.Controls.Add(Me.rdoInsertRows) Me.Controls.Add(Me.rdoInsertColumns) Me.Controls.Add(Me.ucrPnlColumnsOrRows) - Me.Controls.Add(Me.grpOPtions) + Me.Controls.Add(Me.grpOptions) + Me.Controls.Add(Me.ucrSelectorInsertColumns) Me.Controls.Add(Me.ucrInputDefaultValue) Me.Controls.Add(Me.lblDefaultValue) Me.Controls.Add(Me.lblNumberOfColumnsToInsert) - Me.Controls.Add(Me.ucrSelectorInsertColumns) Me.Controls.Add(Me.lblStartPos) Me.Controls.Add(Me.lblNumberOfRowsToInsert) Me.Controls.Add(Me.ucrBase) @@ -377,8 +377,8 @@ Partial Class dlgInsertColumn Me.Text = "Insert Columns/Rows" Me.grpInsert.ResumeLayout(False) Me.grpInsert.PerformLayout() - Me.grpOPtions.ResumeLayout(False) - Me.grpOPtions.PerformLayout() + Me.grpOptions.ResumeLayout(False) + Me.grpOptions.PerformLayout() Me.ResumeLayout(False) Me.PerformLayout() @@ -397,7 +397,7 @@ Partial Class dlgInsertColumn Friend WithEvents lblNumberOfColumnsToInsert As Label Friend WithEvents lblDefaultValue As Label Friend WithEvents ucrInputDefaultValue As ucrInputTextBox - Friend WithEvents grpOPtions As GroupBox + Friend WithEvents grpOptions As GroupBox Friend WithEvents rdoAfter As RadioButton Friend WithEvents rdoBefore As RadioButton Friend WithEvents rdoInsertColumns As RadioButton diff --git a/instat/dlgInsertColumn.vb b/instat/dlgInsertColumn.vb index f25ca261aa8..c860f3e041a 100644 --- a/instat/dlgInsertColumn.vb +++ b/instat/dlgInsertColumn.vb @@ -34,11 +34,16 @@ Public Class dlgInsertColumn End Sub Private Sub InitialiseDialog() + Dim dctBeforeAfter As New Dictionary(Of String, String) ucrBase.iHelpTopicID = 164 - ucrReceiverColumnsToInsert.Selector = ucrSelectorInsertColumns - ucrReceiverColumnsToInsert.SetMeAsReceiver() + + ucrDataFramesList.SetParameter(New RParameter("data_name")) + ucrDataFramesList.SetParameterIsString() + ucrReceiverColumnsToInsert.SetParameter(New RParameter("adjacent_column")) ucrReceiverColumnsToInsert.SetParameterIsString() + ucrReceiverColumnsToInsert.Selector = ucrSelectorInsertColumns + ucrReceiverColumnsToInsert.SetMeAsReceiver() ucrPnlColumnsOrRows.AddRadioButton(rdoInsertColumns) ucrPnlColumnsOrRows.AddRadioButton(rdoInsertRows) @@ -49,15 +54,13 @@ Public Class dlgInsertColumn ucrPnlBeforeAfter.AddRadioButton(rdoBefore, "TRUE") ucrPnlBeforeAfter.AddRadioButton(rdoAfter, "FALSE") - ucrDataFramesList.SetParameter(New RParameter("data_name")) - ucrDataFramesList.SetParameterIsString() ucrNudNumberOfRows.SetParameter(New RParameter("number_rows")) ucrNudNumberOfRows.SetMinMax(1, Integer.MaxValue) ucrNudNumberOfRows.SetRDefault(1) + ucrNudStartRow.SetParameter(New RParameter("start_row")) ucrNudStartRow.SetMinMax(1, Integer.MaxValue) - Dim dctBeforeAfter As New Dictionary(Of String, String) ucrInputBeforeAfter.SetParameter(New RParameter("before")) dctBeforeAfter.Add("Before", "TRUE") dctBeforeAfter.Add("After", "FALSE") @@ -72,8 +75,8 @@ Public Class dlgInsertColumn ucrNudNumberOfColumns.SetParameter(New RParameter("num_cols")) ucrNudNumberOfColumns.SetRDefault(1) ucrNudNumberOfColumns.SetMinMax(1, Integer.MaxValue) + ucrInputDefaultValue.SetParameter(New RParameter("col_data")) - ucrInputPrefixForNewColumn.SetParameter(New RParameter("col_name")) ucrInputDefaultValue.SetRDefault("NA") ucrPnlInsertColumns.AddParameterValuesCondition(rdoAtStart, "before", "TRUE") @@ -94,34 +97,32 @@ Public Class dlgInsertColumn ucrPnlColumnsOrRows.AddToLinkedControls(ucrReceiverColumnsToInsert, {rdoInsertColumns}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) ucrPnlColumnsOrRows.AddToLinkedControls(ucrNudNumberOfColumns, {rdoInsertColumns}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) ucrPnlColumnsOrRows.AddToLinkedControls(ucrInputDefaultValue, {rdoInsertColumns}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) + ucrNudNumberOfColumns.SetLinkedDisplayControl(lblNumberOfColumnsToInsert) + ucrInputDefaultValue.SetLinkedDisplayControl(lblDefaultValue) + ucrInputPrefixForNewColumn.SetParameter(New RParameter("col_name")) ucrPnlColumnsOrRows.AddToLinkedControls(ucrInputPrefixForNewColumn, {rdoInsertColumns}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) ucrInputPrefixForNewColumn.SetLinkedDisplayControl(lblInputColumnPrefix) + ucrInputPrefixForNewColumn.SetPrefix("X") ucrPnlColumnsOrRows.AddToLinkedControls(ucrPnlBeforeAfter, {rdoInsertRows}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) ucrPnlColumnsOrRows.AddToLinkedControls(ucrNudNumberOfRows, {rdoInsertRows}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) ucrPnlColumnsOrRows.AddToLinkedControls(ucrNudStartRow, {rdoInsertRows}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) + ucrPnlBeforeAfter.SetLinkedDisplayControl(grpOptions) + ucrNudNumberOfRows.SetLinkedDisplayControl(lblNumberOfRowsToInsert) + ucrNudStartRow.SetLinkedDisplayControl(lblStartPos) + ucrPnlInsertColumns.AddToLinkedControls(ucrSelectorInsertColumns, {rdoBeforeAfter}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) - ucrSelectorInsertColumns.SetLinkedDisplayControl(lblColumn) - ucrPnlBeforeAfter.SetLinkedDisplayControl(grpOPtions) ucrPnlInsertColumns.AddToLinkedControls(ucrInputBeforeAfter, {rdoBeforeAfter}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) ucrPnlInsertColumns.AddToLinkedControls(ucrReceiverColumnsToInsert, {rdoBeforeAfter}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) + ucrSelectorInsertColumns.SetLinkedDisplayControl(lblColumn) ucrPnlInsertColumns.SetLinkedDisplayControl(grpInsert) - ucrNudNumberOfColumns.SetLinkedDisplayControl(lblNumberOfColumnsToInsert) - ucrInputDefaultValue.SetLinkedDisplayControl(lblDefaultValue) - ucrNudNumberOfRows.SetLinkedDisplayControl(lblNumberOfRowsToInsert) - ucrNudStartRow.SetLinkedDisplayControl(lblStartPos) - ucrInputPrefixForNewColumn.SetPrefix("X") - End Sub Private Sub SetDefaults() clsInsertColumnFunction = New RFunction clsInsertRowFunction = New RFunction - clsInsertColumnFunction.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$add_columns_to_data") - clsInsertRowFunction.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$insert_row_in_data") - ucrSelectorInsertColumns.Reset() ucrDataFramesList.Reset() ucrInputBeforeAfter.Reset() @@ -130,15 +131,17 @@ Public Class dlgInsertColumn ucrInputPrefixForNewColumn.SetName("X") ucrInputDefaultValue.SetName("NA") + clsInsertColumnFunction.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$add_columns_to_data") clsInsertColumnFunction.AddParameter("use_col_name_as_prefix", "TRUE") clsInsertColumnFunction.AddParameter("before", "FALSE") + + clsInsertRowFunction.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$insert_row_in_data") clsInsertRowFunction.AddParameter("before", "FALSE") clsInsertRowFunction.AddParameter("start_row", ucrDataFramesList.iDataFrameLength) ucrBase.clsRsyntax.SetBaseRFunction(clsInsertColumnFunction) End Sub Private Sub SetRCodeForControls(bReset As Boolean) - ucrDataFramesList.SetRCode(clsInsertColumnFunction, bReset) ucrDataFramesList.AddAdditionalCodeParameterPair(clsInsertColumnFunction, ucrDataFramesList.GetParameter, iAdditionalPairNo:=1) ucrNudNumberOfRows.SetRCode(clsInsertRowFunction, bReset) From 07dfdd5ed17bc7ca228b7eae93d1b589a7b3ea90 Mon Sep 17 00:00:00 2001 From: Lily Date: Tue, 30 May 2017 10:08:50 +0100 Subject: [PATCH 054/154] Tab order re-readdressed --- instat/dlgInsertColumn.Designer.vb | 38 +++++++++++++++--------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/instat/dlgInsertColumn.Designer.vb b/instat/dlgInsertColumn.Designer.vb index 43e54989df8..c78f01fdd9e 100644 --- a/instat/dlgInsertColumn.Designer.vb +++ b/instat/dlgInsertColumn.Designer.vb @@ -60,7 +60,7 @@ Partial Class dlgInsertColumn Me.lblStartPos.Location = New System.Drawing.Point(7, 107) Me.lblStartPos.Name = "lblStartPos" Me.lblStartPos.Size = New System.Drawing.Size(88, 13) - Me.lblStartPos.TabIndex = 7 + Me.lblStartPos.TabIndex = 8 Me.lblStartPos.Text = "Insert at Position:" ' 'lblNumberOfRowsToInsert @@ -69,7 +69,7 @@ Partial Class dlgInsertColumn Me.lblNumberOfRowsToInsert.Location = New System.Drawing.Point(7, 137) Me.lblNumberOfRowsToInsert.Name = "lblNumberOfRowsToInsert" Me.lblNumberOfRowsToInsert.Size = New System.Drawing.Size(130, 13) - Me.lblNumberOfRowsToInsert.TabIndex = 9 + Me.lblNumberOfRowsToInsert.TabIndex = 10 Me.lblNumberOfRowsToInsert.Text = "Number of Rows to Insert:" ' 'grpInsert @@ -94,7 +94,7 @@ Partial Class dlgInsertColumn Me.lblColumn.Location = New System.Drawing.Point(152, 73) Me.lblColumn.Name = "lblColumn" Me.lblColumn.Size = New System.Drawing.Size(45, 13) - Me.lblColumn.TabIndex = 8 + Me.lblColumn.TabIndex = 6 Me.lblColumn.Text = "Column:" ' 'ucrInputBeforeAfter @@ -115,7 +115,7 @@ Partial Class dlgInsertColumn Me.ucrReceiverColumnsToInsert.Selector = Nothing Me.ucrReceiverColumnsToInsert.Size = New System.Drawing.Size(116, 20) Me.ucrReceiverColumnsToInsert.strNcFilePath = "" - Me.ucrReceiverColumnsToInsert.TabIndex = 5 + Me.ucrReceiverColumnsToInsert.TabIndex = 0 Me.ucrReceiverColumnsToInsert.ucrSelector = Nothing ' 'rdoBeforeAfter @@ -135,7 +135,7 @@ Partial Class dlgInsertColumn Me.rdoAtStart.Location = New System.Drawing.Point(10, 18) Me.rdoAtStart.Name = "rdoAtStart" Me.rdoAtStart.Size = New System.Drawing.Size(60, 17) - Me.rdoAtStart.TabIndex = 2 + Me.rdoAtStart.TabIndex = 1 Me.rdoAtStart.TabStop = True Me.rdoAtStart.Text = "At Start" Me.rdoAtStart.UseVisualStyleBackColor = True @@ -146,7 +146,7 @@ Partial Class dlgInsertColumn Me.rdoAtEnd.Location = New System.Drawing.Point(10, 41) Me.rdoAtEnd.Name = "rdoAtEnd" Me.rdoAtEnd.Size = New System.Drawing.Size(57, 17) - Me.rdoAtEnd.TabIndex = 1 + Me.rdoAtEnd.TabIndex = 2 Me.rdoAtEnd.TabStop = True Me.rdoAtEnd.Text = "At End" Me.rdoAtEnd.UseVisualStyleBackColor = True @@ -156,7 +156,7 @@ Partial Class dlgInsertColumn Me.ucrPnlInsertColumns.Location = New System.Drawing.Point(3, 17) Me.ucrPnlInsertColumns.Name = "ucrPnlInsertColumns" Me.ucrPnlInsertColumns.Size = New System.Drawing.Size(277, 101) - Me.ucrPnlInsertColumns.TabIndex = 0 + Me.ucrPnlInsertColumns.TabIndex = 5 ' 'grpOptions ' @@ -166,7 +166,7 @@ Partial Class dlgInsertColumn Me.grpOptions.Location = New System.Drawing.Point(235, 85) Me.grpOptions.Name = "grpOptions" Me.grpOptions.Size = New System.Drawing.Size(106, 71) - Me.grpOptions.TabIndex = 6 + Me.grpOptions.TabIndex = 7 Me.grpOptions.TabStop = False Me.grpOptions.Text = "Options" ' @@ -205,7 +205,7 @@ Partial Class dlgInsertColumn Me.lblNumberOfColumnsToInsert.Location = New System.Drawing.Point(11, 236) Me.lblNumberOfColumnsToInsert.Name = "lblNumberOfColumnsToInsert" Me.lblNumberOfColumnsToInsert.Size = New System.Drawing.Size(143, 13) - Me.lblNumberOfColumnsToInsert.TabIndex = 11 + Me.lblNumberOfColumnsToInsert.TabIndex = 12 Me.lblNumberOfColumnsToInsert.Text = "Number of Columns to Insert:" ' 'lblDefaultValue @@ -214,7 +214,7 @@ Partial Class dlgInsertColumn Me.lblDefaultValue.Location = New System.Drawing.Point(11, 263) Me.lblDefaultValue.Name = "lblDefaultValue" Me.lblDefaultValue.Size = New System.Drawing.Size(74, 13) - Me.lblDefaultValue.TabIndex = 13 + Me.lblDefaultValue.TabIndex = 14 Me.lblDefaultValue.Text = "Default Value:" ' 'rdoInsertColumns @@ -255,7 +255,7 @@ Partial Class dlgInsertColumn Me.lblInputColumnPrefix.Location = New System.Drawing.Point(11, 289) Me.lblInputColumnPrefix.Name = "lblInputColumnPrefix" Me.lblInputColumnPrefix.Size = New System.Drawing.Size(144, 13) - Me.lblInputColumnPrefix.TabIndex = 15 + Me.lblInputColumnPrefix.TabIndex = 16 Me.lblInputColumnPrefix.Text = "Prefix For Inserted Column(s):" ' 'ucrInputPrefixForNewColumn @@ -266,7 +266,7 @@ Partial Class dlgInsertColumn Me.ucrInputPrefixForNewColumn.Location = New System.Drawing.Point(159, 286) Me.ucrInputPrefixForNewColumn.Name = "ucrInputPrefixForNewColumn" Me.ucrInputPrefixForNewColumn.Size = New System.Drawing.Size(163, 21) - Me.ucrInputPrefixForNewColumn.TabIndex = 16 + Me.ucrInputPrefixForNewColumn.TabIndex = 17 ' 'ucrNudNumberOfColumns ' @@ -277,7 +277,7 @@ Partial Class dlgInsertColumn Me.ucrNudNumberOfColumns.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudNumberOfColumns.Name = "ucrNudNumberOfColumns" Me.ucrNudNumberOfColumns.Size = New System.Drawing.Size(50, 20) - Me.ucrNudNumberOfColumns.TabIndex = 12 + Me.ucrNudNumberOfColumns.TabIndex = 13 Me.ucrNudNumberOfColumns.Value = New Decimal(New Integer() {0, 0, 0, 0}) ' 'ucrPnlColumnsOrRows @@ -295,23 +295,23 @@ Partial Class dlgInsertColumn Me.ucrInputDefaultValue.Location = New System.Drawing.Point(159, 259) Me.ucrInputDefaultValue.Name = "ucrInputDefaultValue" Me.ucrInputDefaultValue.Size = New System.Drawing.Size(49, 21) - Me.ucrInputDefaultValue.TabIndex = 14 + Me.ucrInputDefaultValue.TabIndex = 15 ' 'ucrSelectorInsertColumns ' Me.ucrSelectorInsertColumns.bShowHiddenColumns = False - Me.ucrSelectorInsertColumns.Location = New System.Drawing.Point(10, 95) + Me.ucrSelectorInsertColumns.Location = New System.Drawing.Point(10, 91) Me.ucrSelectorInsertColumns.Margin = New System.Windows.Forms.Padding(0) Me.ucrSelectorInsertColumns.Name = "ucrSelectorInsertColumns" Me.ucrSelectorInsertColumns.Size = New System.Drawing.Size(202, 139) - Me.ucrSelectorInsertColumns.TabIndex = 4 + Me.ucrSelectorInsertColumns.TabIndex = 6 ' 'ucrBase ' Me.ucrBase.Location = New System.Drawing.Point(10, 313) Me.ucrBase.Name = "ucrBase" Me.ucrBase.Size = New System.Drawing.Size(410, 53) - Me.ucrBase.TabIndex = 17 + Me.ucrBase.TabIndex = 0 ' 'ucrDataFramesList ' @@ -331,7 +331,7 @@ Partial Class dlgInsertColumn Me.ucrNudNumberOfRows.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudNumberOfRows.Name = "ucrNudNumberOfRows" Me.ucrNudNumberOfRows.Size = New System.Drawing.Size(50, 20) - Me.ucrNudNumberOfRows.TabIndex = 10 + Me.ucrNudNumberOfRows.TabIndex = 11 Me.ucrNudNumberOfRows.Value = New Decimal(New Integer() {0, 0, 0, 0}) ' 'ucrNudStartRow @@ -343,7 +343,7 @@ Partial Class dlgInsertColumn Me.ucrNudStartRow.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudStartRow.Name = "ucrNudStartRow" Me.ucrNudStartRow.Size = New System.Drawing.Size(50, 20) - Me.ucrNudStartRow.TabIndex = 8 + Me.ucrNudStartRow.TabIndex = 9 Me.ucrNudStartRow.Value = New Decimal(New Integer() {0, 0, 0, 0}) ' 'dlgInsertColumn From 249857febe7a06f7dc45a62ae6d1e3d004bef5c9 Mon Sep 17 00:00:00 2001 From: Lily Date: Tue, 30 May 2017 10:12:07 +0100 Subject: [PATCH 055/154] TestOK fix --- instat/dlgInsertColumn.vb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/instat/dlgInsertColumn.vb b/instat/dlgInsertColumn.vb index c860f3e041a..187a4b756e1 100644 --- a/instat/dlgInsertColumn.vb +++ b/instat/dlgInsertColumn.vb @@ -170,7 +170,7 @@ Public Class dlgInsertColumn ucrBase.OKEnabled(False) End If ElseIf rdoInsertRows.Checked Then - If (ucrNudNumberOfRows.GetText <> "" AndAlso ucrNudStartRow.GetText <> "" OrElse rdoAfter.Checked OrElse rdoBefore.Checked) Then + If (ucrNudNumberOfRows.GetText <> "" AndAlso ucrNudStartRow.GetText <> "") Then ucrBase.OKEnabled(True) Else ucrBase.OKEnabled(False) From 5bfa74b2418be54951958832a1e73303a4d66a22 Mon Sep 17 00:00:00 2001 From: shadrack kibet Date: Tue, 30 May 2017 16:50:06 +0300 Subject: [PATCH 056/154] parameter positions --- instat/dlgInsertColumn.vb | 37 +++++++++++++++++++------------------ 1 file changed, 19 insertions(+), 18 deletions(-) diff --git a/instat/dlgInsertColumn.vb b/instat/dlgInsertColumn.vb index 187a4b756e1..c84433f3be5 100644 --- a/instat/dlgInsertColumn.vb +++ b/instat/dlgInsertColumn.vb @@ -37,10 +37,10 @@ Public Class dlgInsertColumn Dim dctBeforeAfter As New Dictionary(Of String, String) ucrBase.iHelpTopicID = 164 - ucrDataFramesList.SetParameter(New RParameter("data_name")) + ucrDataFramesList.SetParameter(New RParameter("data_name", 0)) ucrDataFramesList.SetParameterIsString() - ucrReceiverColumnsToInsert.SetParameter(New RParameter("adjacent_column")) + ucrReceiverColumnsToInsert.SetParameter(New RParameter("adjacent_column", 1)) ucrReceiverColumnsToInsert.SetParameterIsString() ucrReceiverColumnsToInsert.Selector = ucrSelectorInsertColumns ucrReceiverColumnsToInsert.SetMeAsReceiver() @@ -50,33 +50,33 @@ Public Class dlgInsertColumn ucrPnlColumnsOrRows.AddFunctionNamesCondition(rdoInsertRows, frmMain.clsRLink.strInstatDataObject & "$insert_row_in_data") ucrPnlColumnsOrRows.AddFunctionNamesCondition(rdoInsertColumns, frmMain.clsRLink.strInstatDataObject & "$add_columns_to_data") - ucrPnlBeforeAfter.SetParameter(New RParameter("before")) + ucrPnlBeforeAfter.SetParameter(New RParameter("before", 1)) ucrPnlBeforeAfter.AddRadioButton(rdoBefore, "TRUE") ucrPnlBeforeAfter.AddRadioButton(rdoAfter, "FALSE") - ucrNudNumberOfRows.SetParameter(New RParameter("number_rows")) + ucrNudNumberOfRows.SetParameter(New RParameter("number_rows", 2)) ucrNudNumberOfRows.SetMinMax(1, Integer.MaxValue) ucrNudNumberOfRows.SetRDefault(1) - ucrNudStartRow.SetParameter(New RParameter("start_row")) + ucrNudStartRow.SetParameter(New RParameter("start_row", 3)) ucrNudStartRow.SetMinMax(1, Integer.MaxValue) - ucrInputBeforeAfter.SetParameter(New RParameter("before")) + ucrInputBeforeAfter.SetParameter(New RParameter("before", 2)) dctBeforeAfter.Add("Before", "TRUE") dctBeforeAfter.Add("After", "FALSE") ucrInputBeforeAfter.SetItems(dctBeforeAfter) ucrInputBeforeAfter.SetRDefault("FALSE") - ucrPnlInsertColumns.SetParameter(New RParameter("before")) + ucrPnlInsertColumns.SetParameter(New RParameter("before", 3)) ucrPnlInsertColumns.AddRadioButton(rdoAtStart, "TRUE") ucrPnlInsertColumns.AddRadioButton(rdoAtEnd, "FALSE") ucrPnlInsertColumns.AddRadioButton(rdoBeforeAfter, "TRUE") - ucrNudNumberOfColumns.SetParameter(New RParameter("num_cols")) + ucrNudNumberOfColumns.SetParameter(New RParameter("num_cols", 4)) ucrNudNumberOfColumns.SetRDefault(1) ucrNudNumberOfColumns.SetMinMax(1, Integer.MaxValue) - ucrInputDefaultValue.SetParameter(New RParameter("col_data")) + ucrInputDefaultValue.SetParameter(New RParameter("col_data", 5)) ucrInputDefaultValue.SetRDefault("NA") ucrPnlInsertColumns.AddParameterValuesCondition(rdoAtStart, "before", "TRUE") @@ -92,29 +92,30 @@ Public Class dlgInsertColumn ucrPnlInsertColumns.AddParameterPresentCondition(rdoBeforeAfter, "adjacent_column") ucrPnlInsertColumns.SetRDefault("FALSE") + ucrPnlInsertColumns.AddToLinkedControls(ucrSelectorInsertColumns, {rdoBeforeAfter}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) + ucrPnlInsertColumns.AddToLinkedControls(ucrInputBeforeAfter, {rdoBeforeAfter}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) + ucrPnlInsertColumns.AddToLinkedControls(ucrReceiverColumnsToInsert, {rdoBeforeAfter}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) + ucrPnlColumnsOrRows.AddToLinkedControls(ucrPnlInsertColumns, {rdoInsertColumns}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) ucrPnlColumnsOrRows.AddToLinkedControls(ucrInputBeforeAfter, {rdoInsertColumns}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) ucrPnlColumnsOrRows.AddToLinkedControls(ucrReceiverColumnsToInsert, {rdoInsertColumns}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) ucrPnlColumnsOrRows.AddToLinkedControls(ucrNudNumberOfColumns, {rdoInsertColumns}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) ucrPnlColumnsOrRows.AddToLinkedControls(ucrInputDefaultValue, {rdoInsertColumns}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) + ucrPnlColumnsOrRows.AddToLinkedControls(ucrInputPrefixForNewColumn, {rdoInsertColumns}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) + ucrPnlColumnsOrRows.AddToLinkedControls(ucrPnlBeforeAfter, {rdoInsertRows}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) + ucrPnlColumnsOrRows.AddToLinkedControls(ucrNudNumberOfRows, {rdoInsertRows}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) + ucrPnlColumnsOrRows.AddToLinkedControls(ucrNudStartRow, {rdoInsertRows}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) + ucrNudNumberOfColumns.SetLinkedDisplayControl(lblNumberOfColumnsToInsert) ucrInputDefaultValue.SetLinkedDisplayControl(lblDefaultValue) - ucrInputPrefixForNewColumn.SetParameter(New RParameter("col_name")) - ucrPnlColumnsOrRows.AddToLinkedControls(ucrInputPrefixForNewColumn, {rdoInsertColumns}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) + ucrInputPrefixForNewColumn.SetParameter(New RParameter("col_name", 6)) ucrInputPrefixForNewColumn.SetLinkedDisplayControl(lblInputColumnPrefix) ucrInputPrefixForNewColumn.SetPrefix("X") - ucrPnlColumnsOrRows.AddToLinkedControls(ucrPnlBeforeAfter, {rdoInsertRows}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) - ucrPnlColumnsOrRows.AddToLinkedControls(ucrNudNumberOfRows, {rdoInsertRows}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) - ucrPnlColumnsOrRows.AddToLinkedControls(ucrNudStartRow, {rdoInsertRows}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) ucrPnlBeforeAfter.SetLinkedDisplayControl(grpOptions) ucrNudNumberOfRows.SetLinkedDisplayControl(lblNumberOfRowsToInsert) ucrNudStartRow.SetLinkedDisplayControl(lblStartPos) - - ucrPnlInsertColumns.AddToLinkedControls(ucrSelectorInsertColumns, {rdoBeforeAfter}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) - ucrPnlInsertColumns.AddToLinkedControls(ucrInputBeforeAfter, {rdoBeforeAfter}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) - ucrPnlInsertColumns.AddToLinkedControls(ucrReceiverColumnsToInsert, {rdoBeforeAfter}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) ucrSelectorInsertColumns.SetLinkedDisplayControl(lblColumn) ucrPnlInsertColumns.SetLinkedDisplayControl(grpInsert) End Sub From 2122ed2ebc060d211b1bd08888fd7a21f858df2d Mon Sep 17 00:00:00 2001 From: shadrack kibet Date: Tue, 30 May 2017 17:12:29 +0300 Subject: [PATCH 057/154] setting MinMax for Nud --- instat/dlgInsertColumn.vb | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/instat/dlgInsertColumn.vb b/instat/dlgInsertColumn.vb index c84433f3be5..10e34913bd7 100644 --- a/instat/dlgInsertColumn.vb +++ b/instat/dlgInsertColumn.vb @@ -14,6 +14,7 @@ ' You should have received a copy of the GNU General Public License k ' along with this program. If not, see . +Imports instat Imports instat.Translations Public Class dlgInsertColumn Private bFirstload As Boolean = True @@ -59,7 +60,7 @@ Public Class dlgInsertColumn ucrNudNumberOfRows.SetRDefault(1) ucrNudStartRow.SetParameter(New RParameter("start_row", 3)) - ucrNudStartRow.SetMinMax(1, Integer.MaxValue) + ucrInputBeforeAfter.SetParameter(New RParameter("before", 2)) dctBeforeAfter.Add("Before", "TRUE") @@ -204,4 +205,8 @@ Public Class dlgInsertColumn Private Sub ucrReceiverColumnsToInsert_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrReceiverColumnsToInsert.ControlContentsChanged, ucrPnlColumnsOrRows.ControlContentsChanged, ucrPnlBeforeAfter.ControlContentsChanged, ucrPnlInsertColumns.ControlContentsChanged, ucrInputPrefixForNewColumn.ControlContentsChanged, ucrInputDefaultValue.ControlContentsChanged, ucrInputBeforeAfter.ControlContentsChanged, ucrNudNumberOfRows.ControlContentsChanged, ucrNudStartRow.ControlContentsChanged, ucrNudNumberOfColumns.ControlContentsChanged TestOKEnabled() End Sub + + Private Sub ucrSelectorInsertColumns_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrSelectorInsertColumns.ControlValueChanged, ucrNudStartRow.ControlValueChanged + ucrNudStartRow.SetMinMax(1, ucrDataFramesList.iDataFrameLength) + End Sub End Class \ No newline at end of file From 467675dbfbd6a153b37eb92050c29046d878ad40 Mon Sep 17 00:00:00 2001 From: shadrack kibet Date: Tue, 30 May 2017 17:42:51 +0300 Subject: [PATCH 058/154] removing unnecessary linking --- instat/dlgInsertColumn.vb | 3 --- 1 file changed, 3 deletions(-) diff --git a/instat/dlgInsertColumn.vb b/instat/dlgInsertColumn.vb index 10e34913bd7..8dfd58edc53 100644 --- a/instat/dlgInsertColumn.vb +++ b/instat/dlgInsertColumn.vb @@ -61,7 +61,6 @@ Public Class dlgInsertColumn ucrNudStartRow.SetParameter(New RParameter("start_row", 3)) - ucrInputBeforeAfter.SetParameter(New RParameter("before", 2)) dctBeforeAfter.Add("Before", "TRUE") dctBeforeAfter.Add("After", "FALSE") @@ -98,8 +97,6 @@ Public Class dlgInsertColumn ucrPnlInsertColumns.AddToLinkedControls(ucrReceiverColumnsToInsert, {rdoBeforeAfter}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) ucrPnlColumnsOrRows.AddToLinkedControls(ucrPnlInsertColumns, {rdoInsertColumns}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) - ucrPnlColumnsOrRows.AddToLinkedControls(ucrInputBeforeAfter, {rdoInsertColumns}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) - ucrPnlColumnsOrRows.AddToLinkedControls(ucrReceiverColumnsToInsert, {rdoInsertColumns}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) ucrPnlColumnsOrRows.AddToLinkedControls(ucrNudNumberOfColumns, {rdoInsertColumns}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) ucrPnlColumnsOrRows.AddToLinkedControls(ucrInputDefaultValue, {rdoInsertColumns}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) ucrPnlColumnsOrRows.AddToLinkedControls(ucrInputPrefixForNewColumn, {rdoInsertColumns}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) From 00a71972e6f667adbb94aaf2d94a33bc8549274f Mon Sep 17 00:00:00 2001 From: Stephen Kogo Date: Tue, 30 May 2017 21:57:11 +0300 Subject: [PATCH 059/154] edits --- instat/dlgClimSoft.vb | 7 +------ instat/sdgImportFromClimSoft.vb | 4 ++-- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/instat/dlgClimSoft.vb b/instat/dlgClimSoft.vb index e4058e8f637..b56f72adf96 100644 --- a/instat/dlgClimSoft.vb +++ b/instat/dlgClimSoft.vb @@ -37,7 +37,6 @@ Public Class dlgClimSoft SetRCodeForControls(bReset) bReset = False TestOKEnabled() - ReopenDialog() autoTranslate(Me) End Sub @@ -112,10 +111,6 @@ Public Class dlgClimSoft End If End Sub - Private Sub ReopenDialog() - - End Sub - Private Sub ucrBase_ClickReset(sender As Object, e As EventArgs) Handles ucrBase.ClickReset SetDefaults() SetRCodeForControls(True) @@ -123,7 +118,7 @@ Public Class dlgClimSoft End Sub Private Sub cmdEstablishConnection_Click(sender As Object, e As EventArgs) Handles cmdEstablishConnection.Click - sdgImportFromClimSoft.SetRDatabaseConnection(clsRDatabaseConnect, clsRDatabaseDisconnect, clsHasConnection, bConnectionActive, bResetSubdialog) + sdgImportFromClimSoft.SetRDatabaseConnection(clsRDatabaseConnect, clsRDatabaseDisconnect, clsHasConnection, bConnectionActive, bReset) bResetSubdialog = False sdgImportFromClimSoft.ShowDialog() SetConnectionActiveStatus(sdgImportFromClimSoft.GetConnectionActiveStatus()) diff --git a/instat/sdgImportFromClimSoft.vb b/instat/sdgImportFromClimSoft.vb index 591befba357..2a84eec6402 100644 --- a/instat/sdgImportFromClimSoft.vb +++ b/instat/sdgImportFromClimSoft.vb @@ -47,14 +47,14 @@ Public Class sdgImportFromClimSoft Return bConnected End Function - Public Sub SetRDatabaseConnection(clsNewRDatabaseConnect As RFunction, clsNewRDatabaseDisconnect As RFunction, clsNewHasConnection As RFunction, Optional bConnectionActive As Boolean = False, Optional bResetSubdialog As Boolean = False) + Public Sub SetRDatabaseConnection(clsNewRDatabaseConnect As RFunction, clsNewRDatabaseDisconnect As RFunction, clsNewHasConnection As RFunction, Optional bConnectionActive As Boolean = False, Optional bReset As Boolean = False) clsRDatabaseConnect = clsNewRDatabaseConnect clsRDatabaseDisconnect = clsNewRDatabaseDisconnect clsHasConnection = clsNewHasConnection If Not bControlsInitialised Then InitialiseControls() End If - SetRCode(Me, clsRDatabaseConnect, False) + SetRCode(Me, clsRDatabaseConnect, bReset) End Sub Private Sub cmdEnterPassword_Click(sender As Object, e As EventArgs) Handles cmdEnterPassword.Click From 01e5f1cba5f8d09f113735544b9e1ac7728144fc Mon Sep 17 00:00:00 2001 From: Stephen Kogo Date: Wed, 31 May 2017 10:24:45 +0300 Subject: [PATCH 060/154] editing host default --- instat/dlgClimSoft.vb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/instat/dlgClimSoft.vb b/instat/dlgClimSoft.vb index b56f72adf96..6ca7e824cf4 100644 --- a/instat/dlgClimSoft.vb +++ b/instat/dlgClimSoft.vb @@ -83,8 +83,8 @@ Public Class dlgClimSoft ucrInputEndDate.SetName("") clsRDatabaseConnect.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$database_connect") + clsRDatabaseConnect.AddParameter("host", "127.0.0.1") sdgImportFromClimSoft.ucrInputDatabaseName.SetName("") - sdgImportFromClimSoft.ucrInputHost.SetName("") sdgImportFromClimSoft.ucrInputPort.SetName("") sdgImportFromClimSoft.ucrInputUserName.SetName("") @@ -118,7 +118,7 @@ Public Class dlgClimSoft End Sub Private Sub cmdEstablishConnection_Click(sender As Object, e As EventArgs) Handles cmdEstablishConnection.Click - sdgImportFromClimSoft.SetRDatabaseConnection(clsRDatabaseConnect, clsRDatabaseDisconnect, clsHasConnection, bConnectionActive, bReset) + sdgImportFromClimSoft.SetRDatabaseConnection(clsRDatabaseConnect, clsRDatabaseDisconnect, clsHasConnection, bConnectionActive, bResetSubdialog) bResetSubdialog = False sdgImportFromClimSoft.ShowDialog() SetConnectionActiveStatus(sdgImportFromClimSoft.GetConnectionActiveStatus()) From 9b6356428908335133f3b100d611de105b7fe72f Mon Sep 17 00:00:00 2001 From: shadrack kibet Date: Wed, 31 May 2017 14:59:25 +0300 Subject: [PATCH 061/154] fixing developer error --- instat/dlgInsertColumn.vb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/instat/dlgInsertColumn.vb b/instat/dlgInsertColumn.vb index 8dfd58edc53..8c4461c7e20 100644 --- a/instat/dlgInsertColumn.vb +++ b/instat/dlgInsertColumn.vb @@ -201,9 +201,10 @@ Public Class dlgInsertColumn Private Sub ucrReceiverColumnsToInsert_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrReceiverColumnsToInsert.ControlContentsChanged, ucrPnlColumnsOrRows.ControlContentsChanged, ucrPnlBeforeAfter.ControlContentsChanged, ucrPnlInsertColumns.ControlContentsChanged, ucrInputPrefixForNewColumn.ControlContentsChanged, ucrInputDefaultValue.ControlContentsChanged, ucrInputBeforeAfter.ControlContentsChanged, ucrNudNumberOfRows.ControlContentsChanged, ucrNudStartRow.ControlContentsChanged, ucrNudNumberOfColumns.ControlContentsChanged TestOKEnabled() + ucrNudStartRow.SetMinMax(1, ucrDataFramesList.iDataFrameLength) End Sub - Private Sub ucrSelectorInsertColumns_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrSelectorInsertColumns.ControlValueChanged, ucrNudStartRow.ControlValueChanged + Private Sub ucrSelectorInsertColumns_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrSelectorInsertColumns.ControlValueChanged, ucrNudStartRow.ControlValueChanged, ucrPnlBeforeAfter.ControlContentsChanged ucrNudStartRow.SetMinMax(1, ucrDataFramesList.iDataFrameLength) End Sub End Class \ No newline at end of file From f496f9b95c2e074858a85973b2d9aa8ffd976ee3 Mon Sep 17 00:00:00 2001 From: shadrack kibet Date: Wed, 31 May 2017 15:02:56 +0300 Subject: [PATCH 062/154] minor edit --- instat/dlgInsertColumn.vb | 1 - 1 file changed, 1 deletion(-) diff --git a/instat/dlgInsertColumn.vb b/instat/dlgInsertColumn.vb index 8c4461c7e20..7a5f549d9ca 100644 --- a/instat/dlgInsertColumn.vb +++ b/instat/dlgInsertColumn.vb @@ -14,7 +14,6 @@ ' You should have received a copy of the GNU General Public License k ' along with this program. If not, see . -Imports instat Imports instat.Translations Public Class dlgInsertColumn Private bFirstload As Boolean = True From d9ab9508d5faed99be94db49a48c038e71d35e38 Mon Sep 17 00:00:00 2001 From: Steven Date: Thu, 1 Jun 2017 12:32:19 +0300 Subject: [PATCH 063/154] Setting up controls --- instat/sdgThemes.Designer.vb | 574 ++++++++++++++++++++++++++++++++++- instat/sdgThemes.vb | 6 + 2 files changed, 575 insertions(+), 5 deletions(-) diff --git a/instat/sdgThemes.Designer.vb b/instat/sdgThemes.Designer.vb index aceb0065a61..0f1510c2a80 100644 --- a/instat/sdgThemes.Designer.vb +++ b/instat/sdgThemes.Designer.vb @@ -1,9 +1,9 @@ - _ + Partial Class sdgThemes 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,23 +20,532 @@ Partial Class sdgThemes '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.ucrBaseSubdialogue = New instat.ucrButtonsSubdialogue() + Me.tbXaxis = New System.Windows.Forms.TabControl() + Me.tbAxis = New System.Windows.Forms.TabPage() + Me.grpTableOptions = New System.Windows.Forms.GroupBox() + Me.GroupBox1 = New System.Windows.Forms.GroupBox() + Me.lblSizeSegment = New System.Windows.Forms.Label() + Me.ucrNudSizeSegment = New instat.ucrNud() + Me.lblColourSegment = New System.Windows.Forms.Label() + Me.ucrInputColourSegment = New instat.ucrInputComboBox() + Me.lblLineType = New System.Windows.Forms.Label() + Me.ucrInputLineType = New instat.ucrInputComboBox() + Me.grpThemetext = New System.Windows.Forms.GroupBox() + Me.lblVjust = New System.Windows.Forms.Label() + Me.ucrNudVjust = New instat.ucrNud() + Me.lblLineHeight = New System.Windows.Forms.Label() + Me.ucrNudLineHeight = New instat.ucrNud() + Me.lblAngle = New System.Windows.Forms.Label() + Me.ucrNudAngle = New instat.ucrNud() + Me.lblHjust = New System.Windows.Forms.Label() + Me.ucrNudHjust = New instat.ucrNud() + Me.lblSize = New System.Windows.Forms.Label() + Me.ucrNudsize = New instat.ucrNud() + Me.Label2 = New System.Windows.Forms.Label() + Me.ucrInputColour = New instat.ucrInputComboBox() + Me.lblFace = New System.Windows.Forms.Label() + Me.ucrInputFace = New instat.ucrInputComboBox() + Me.lblFamily = New System.Windows.Forms.Label() + Me.ucrInputFamily = New instat.ucrInputComboBox() + Me.tbYaxis = New System.Windows.Forms.TabPage() + Me.grpGraphOptions = New System.Windows.Forms.GroupBox() + Me.lblTitle = New System.Windows.Forms.Label() + Me.lblHjust5 = New System.Windows.Forms.Label() + Me.lblVjust1 = New System.Windows.Forms.Label() + Me.ucrInputGraphTitle = New instat.ucrInputTextBox() + Me.ucrInputHorizontalLabels = New instat.ucrInputComboBox() + Me.ucrInputVerticalLabels = New instat.ucrInputComboBox() + Me.ucrChkShowMissing = New instat.ucrCheck() + Me.ucrChkShowPercentage = New instat.ucrCheck() + Me.ucrChkShowCount = New instat.ucrCheck() + Me.grpGraphType = New System.Windows.Forms.GroupBox() + Me.rdoLine = New System.Windows.Forms.RadioButton() + Me.rdoDot = New System.Windows.Forms.RadioButton() + Me.rdoBar = New System.Windows.Forms.RadioButton() + Me.ucrPnlGraphType = New instat.UcrPanel() + Me.tbXaxis.SuspendLayout() + Me.tbAxis.SuspendLayout() + Me.grpTableOptions.SuspendLayout() + Me.GroupBox1.SuspendLayout() + Me.grpThemetext.SuspendLayout() + Me.tbYaxis.SuspendLayout() + Me.grpGraphOptions.SuspendLayout() + Me.grpGraphType.SuspendLayout() Me.SuspendLayout() ' 'ucrBaseSubdialogue ' - Me.ucrBaseSubdialogue.Location = New System.Drawing.Point(131, 205) + Me.ucrBaseSubdialogue.Location = New System.Drawing.Point(157, 441) Me.ucrBaseSubdialogue.Name = "ucrBaseSubdialogue" Me.ucrBaseSubdialogue.Size = New System.Drawing.Size(142, 30) Me.ucrBaseSubdialogue.TabIndex = 0 ' + 'tbXaxis + ' + Me.tbXaxis.Controls.Add(Me.tbAxis) + Me.tbXaxis.Controls.Add(Me.tbYaxis) + Me.tbXaxis.Location = New System.Drawing.Point(22, 1) + Me.tbXaxis.Name = "tbXaxis" + Me.tbXaxis.SelectedIndex = 0 + Me.tbXaxis.Size = New System.Drawing.Size(506, 421) + Me.tbXaxis.TabIndex = 1 + ' + 'tbAxis + ' + Me.tbAxis.Controls.Add(Me.grpTableOptions) + Me.tbAxis.Location = New System.Drawing.Point(4, 22) + Me.tbAxis.Name = "tbAxis" + Me.tbAxis.Padding = New System.Windows.Forms.Padding(3) + Me.tbAxis.Size = New System.Drawing.Size(498, 395) + Me.tbAxis.TabIndex = 0 + Me.tbAxis.Text = "X-axis" + Me.tbAxis.UseVisualStyleBackColor = True + ' + 'grpTableOptions + ' + Me.grpTableOptions.Controls.Add(Me.GroupBox1) + Me.grpTableOptions.Controls.Add(Me.grpThemetext) + Me.grpTableOptions.Location = New System.Drawing.Point(0, 3) + Me.grpTableOptions.Name = "grpTableOptions" + Me.grpTableOptions.Size = New System.Drawing.Size(502, 397) + Me.grpTableOptions.TabIndex = 0 + Me.grpTableOptions.TabStop = False + Me.grpTableOptions.Text = "More Options" + ' + 'GroupBox1 + ' + Me.GroupBox1.Controls.Add(Me.lblSizeSegment) + Me.GroupBox1.Controls.Add(Me.ucrNudSizeSegment) + Me.GroupBox1.Controls.Add(Me.lblColourSegment) + Me.GroupBox1.Controls.Add(Me.ucrInputColourSegment) + Me.GroupBox1.Controls.Add(Me.lblLineType) + Me.GroupBox1.Controls.Add(Me.ucrInputLineType) + Me.GroupBox1.Location = New System.Drawing.Point(251, 22) + Me.GroupBox1.Name = "GroupBox1" + Me.GroupBox1.Size = New System.Drawing.Size(230, 110) + Me.GroupBox1.TabIndex = 39 + Me.GroupBox1.TabStop = False + Me.GroupBox1.Text = "Segment Theme" + ' + 'lblSizeSegment + ' + Me.lblSizeSegment.AutoSize = True + Me.lblSizeSegment.Location = New System.Drawing.Point(13, 22) + Me.lblSizeSegment.Name = "lblSizeSegment" + Me.lblSizeSegment.Size = New System.Drawing.Size(30, 13) + Me.lblSizeSegment.TabIndex = 29 + Me.lblSizeSegment.Text = "Size:" + ' + 'ucrNudSizeSegment + ' + Me.ucrNudSizeSegment.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudSizeSegment.Increment = New Decimal(New Integer() {1, 0, 0, 0}) + Me.ucrNudSizeSegment.Location = New System.Drawing.Point(94, 17) + Me.ucrNudSizeSegment.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) + Me.ucrNudSizeSegment.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudSizeSegment.Name = "ucrNudSizeSegment" + Me.ucrNudSizeSegment.Size = New System.Drawing.Size(50, 20) + Me.ucrNudSizeSegment.TabIndex = 30 + Me.ucrNudSizeSegment.Value = New Decimal(New Integer() {0, 0, 0, 0}) + ' + 'lblColourSegment + ' + Me.lblColourSegment.AutoSize = True + Me.lblColourSegment.Location = New System.Drawing.Point(12, 76) + Me.lblColourSegment.Name = "lblColourSegment" + Me.lblColourSegment.Size = New System.Drawing.Size(40, 13) + Me.lblColourSegment.TabIndex = 27 + Me.lblColourSegment.Text = "Colour:" + ' + 'ucrInputColourSegment + ' + Me.ucrInputColourSegment.AddQuotesIfUnrecognised = True + Me.ucrInputColourSegment.IsReadOnly = False + Me.ucrInputColourSegment.Location = New System.Drawing.Point(72, 68) + Me.ucrInputColourSegment.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) + Me.ucrInputColourSegment.Name = "ucrInputColourSegment" + Me.ucrInputColourSegment.Size = New System.Drawing.Size(137, 21) + Me.ucrInputColourSegment.TabIndex = 28 + ' + 'lblLineType + ' + Me.lblLineType.AutoSize = True + Me.lblLineType.Location = New System.Drawing.Point(12, 47) + Me.lblLineType.Name = "lblLineType" + Me.lblLineType.Size = New System.Drawing.Size(57, 13) + Me.lblLineType.TabIndex = 25 + Me.lblLineType.Text = "Line Type:" + ' + 'ucrInputLineType + ' + Me.ucrInputLineType.AddQuotesIfUnrecognised = True + Me.ucrInputLineType.IsReadOnly = False + Me.ucrInputLineType.Location = New System.Drawing.Point(72, 40) + Me.ucrInputLineType.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) + Me.ucrInputLineType.Name = "ucrInputLineType" + Me.ucrInputLineType.Size = New System.Drawing.Size(137, 21) + Me.ucrInputLineType.TabIndex = 26 + ' + 'grpThemetext + ' + Me.grpThemetext.Controls.Add(Me.lblVjust) + Me.grpThemetext.Controls.Add(Me.ucrNudVjust) + Me.grpThemetext.Controls.Add(Me.lblLineHeight) + Me.grpThemetext.Controls.Add(Me.ucrNudLineHeight) + Me.grpThemetext.Controls.Add(Me.lblAngle) + Me.grpThemetext.Controls.Add(Me.ucrNudAngle) + Me.grpThemetext.Controls.Add(Me.lblHjust) + Me.grpThemetext.Controls.Add(Me.ucrNudHjust) + Me.grpThemetext.Controls.Add(Me.lblSize) + Me.grpThemetext.Controls.Add(Me.ucrNudsize) + Me.grpThemetext.Controls.Add(Me.Label2) + Me.grpThemetext.Controls.Add(Me.ucrInputColour) + Me.grpThemetext.Controls.Add(Me.lblFace) + Me.grpThemetext.Controls.Add(Me.ucrInputFace) + Me.grpThemetext.Controls.Add(Me.lblFamily) + Me.grpThemetext.Controls.Add(Me.ucrInputFamily) + Me.grpThemetext.Location = New System.Drawing.Point(15, 19) + Me.grpThemetext.Name = "grpThemetext" + Me.grpThemetext.Size = New System.Drawing.Size(230, 291) + Me.grpThemetext.TabIndex = 23 + Me.grpThemetext.TabStop = False + Me.grpThemetext.Text = "Text Theme" + ' + 'lblVjust + ' + Me.lblVjust.AutoSize = True + Me.lblVjust.Location = New System.Drawing.Point(13, 80) + Me.lblVjust.Name = "lblVjust" + Me.lblVjust.Size = New System.Drawing.Size(33, 13) + Me.lblVjust.TabIndex = 37 + Me.lblVjust.Text = "Vjust:" + ' + 'ucrNudVjust + ' + Me.ucrNudVjust.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudVjust.Increment = New Decimal(New Integer() {1, 0, 0, 0}) + Me.ucrNudVjust.Location = New System.Drawing.Point(94, 75) + Me.ucrNudVjust.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) + Me.ucrNudVjust.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudVjust.Name = "ucrNudVjust" + Me.ucrNudVjust.Size = New System.Drawing.Size(50, 20) + Me.ucrNudVjust.TabIndex = 38 + Me.ucrNudVjust.Value = New Decimal(New Integer() {0, 0, 0, 0}) + ' + 'lblLineHeight + ' + Me.lblLineHeight.AutoSize = True + Me.lblLineHeight.Location = New System.Drawing.Point(13, 111) + Me.lblLineHeight.Name = "lblLineHeight" + Me.lblLineHeight.Size = New System.Drawing.Size(64, 13) + Me.lblLineHeight.TabIndex = 35 + Me.lblLineHeight.Text = "Line Height:" + ' + 'ucrNudLineHeight + ' + Me.ucrNudLineHeight.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudLineHeight.Increment = New Decimal(New Integer() {1, 0, 0, 0}) + Me.ucrNudLineHeight.Location = New System.Drawing.Point(94, 106) + Me.ucrNudLineHeight.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) + Me.ucrNudLineHeight.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudLineHeight.Name = "ucrNudLineHeight" + Me.ucrNudLineHeight.Size = New System.Drawing.Size(50, 20) + Me.ucrNudLineHeight.TabIndex = 36 + Me.ucrNudLineHeight.Value = New Decimal(New Integer() {0, 0, 0, 0}) + ' + 'lblAngle + ' + Me.lblAngle.AutoSize = True + Me.lblAngle.Location = New System.Drawing.Point(13, 144) + Me.lblAngle.Name = "lblAngle" + Me.lblAngle.Size = New System.Drawing.Size(37, 13) + Me.lblAngle.TabIndex = 33 + Me.lblAngle.Text = "Angle:" + ' + 'ucrNudAngle + ' + Me.ucrNudAngle.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudAngle.Increment = New Decimal(New Integer() {1, 0, 0, 0}) + Me.ucrNudAngle.Location = New System.Drawing.Point(94, 139) + Me.ucrNudAngle.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) + Me.ucrNudAngle.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudAngle.Name = "ucrNudAngle" + Me.ucrNudAngle.Size = New System.Drawing.Size(50, 20) + Me.ucrNudAngle.TabIndex = 34 + Me.ucrNudAngle.Value = New Decimal(New Integer() {0, 0, 0, 0}) + ' + 'lblHjust + ' + Me.lblHjust.AutoSize = True + Me.lblHjust.Location = New System.Drawing.Point(13, 48) + Me.lblHjust.Name = "lblHjust" + Me.lblHjust.Size = New System.Drawing.Size(34, 13) + Me.lblHjust.TabIndex = 31 + Me.lblHjust.Text = "Hjust:" + ' + 'ucrNudHjust + ' + Me.ucrNudHjust.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudHjust.Increment = New Decimal(New Integer() {1, 0, 0, 0}) + Me.ucrNudHjust.Location = New System.Drawing.Point(94, 43) + Me.ucrNudHjust.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) + Me.ucrNudHjust.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudHjust.Name = "ucrNudHjust" + Me.ucrNudHjust.Size = New System.Drawing.Size(50, 20) + Me.ucrNudHjust.TabIndex = 32 + Me.ucrNudHjust.Value = New Decimal(New Integer() {0, 0, 0, 0}) + ' + 'lblSize + ' + Me.lblSize.AutoSize = True + Me.lblSize.Location = New System.Drawing.Point(13, 22) + Me.lblSize.Name = "lblSize" + Me.lblSize.Size = New System.Drawing.Size(30, 13) + Me.lblSize.TabIndex = 29 + Me.lblSize.Text = "Size:" + ' + 'ucrNudsize + ' + 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(94, 17) + 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" + Me.ucrNudsize.Size = New System.Drawing.Size(50, 20) + Me.ucrNudsize.TabIndex = 30 + Me.ucrNudsize.Value = New Decimal(New Integer() {0, 0, 0, 0}) + ' + 'Label2 + ' + Me.Label2.AutoSize = True + Me.Label2.Location = New System.Drawing.Point(13, 237) + Me.Label2.Name = "Label2" + Me.Label2.Size = New System.Drawing.Size(40, 13) + Me.Label2.TabIndex = 27 + Me.Label2.Text = "Colour:" + ' + 'ucrInputColour + ' + Me.ucrInputColour.AddQuotesIfUnrecognised = True + Me.ucrInputColour.IsReadOnly = False + Me.ucrInputColour.Location = New System.Drawing.Point(73, 229) + Me.ucrInputColour.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) + Me.ucrInputColour.Name = "ucrInputColour" + Me.ucrInputColour.Size = New System.Drawing.Size(137, 21) + Me.ucrInputColour.TabIndex = 28 + ' + 'lblFace + ' + Me.lblFace.AutoSize = True + Me.lblFace.Location = New System.Drawing.Point(13, 209) + Me.lblFace.Name = "lblFace" + Me.lblFace.Size = New System.Drawing.Size(34, 13) + Me.lblFace.TabIndex = 25 + Me.lblFace.Text = "Face:" + ' + 'ucrInputFace + ' + Me.ucrInputFace.AddQuotesIfUnrecognised = True + Me.ucrInputFace.IsReadOnly = False + Me.ucrInputFace.Location = New System.Drawing.Point(73, 201) + Me.ucrInputFace.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) + Me.ucrInputFace.Name = "ucrInputFace" + Me.ucrInputFace.Size = New System.Drawing.Size(137, 21) + Me.ucrInputFace.TabIndex = 26 + ' + 'lblFamily + ' + Me.lblFamily.AutoSize = True + Me.lblFamily.Location = New System.Drawing.Point(13, 182) + Me.lblFamily.Name = "lblFamily" + Me.lblFamily.Size = New System.Drawing.Size(39, 13) + Me.lblFamily.TabIndex = 23 + Me.lblFamily.Text = "Family:" + ' + 'ucrInputFamily + ' + Me.ucrInputFamily.AddQuotesIfUnrecognised = True + Me.ucrInputFamily.IsReadOnly = False + Me.ucrInputFamily.Location = New System.Drawing.Point(73, 174) + Me.ucrInputFamily.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) + Me.ucrInputFamily.Name = "ucrInputFamily" + Me.ucrInputFamily.Size = New System.Drawing.Size(137, 21) + Me.ucrInputFamily.TabIndex = 24 + ' + 'tbYaxis + ' + Me.tbYaxis.Controls.Add(Me.grpGraphOptions) + Me.tbYaxis.Controls.Add(Me.grpGraphType) + Me.tbYaxis.Location = New System.Drawing.Point(4, 22) + Me.tbYaxis.Name = "tbYaxis" + Me.tbYaxis.Padding = New System.Windows.Forms.Padding(3) + Me.tbYaxis.Size = New System.Drawing.Size(498, 395) + Me.tbYaxis.TabIndex = 1 + Me.tbYaxis.Text = "Y-axis" + Me.tbYaxis.UseVisualStyleBackColor = True + ' + 'grpGraphOptions + ' + Me.grpGraphOptions.Controls.Add(Me.lblTitle) + Me.grpGraphOptions.Controls.Add(Me.lblHjust5) + Me.grpGraphOptions.Controls.Add(Me.lblVjust1) + Me.grpGraphOptions.Controls.Add(Me.ucrInputGraphTitle) + Me.grpGraphOptions.Controls.Add(Me.ucrInputHorizontalLabels) + Me.grpGraphOptions.Controls.Add(Me.ucrInputVerticalLabels) + Me.grpGraphOptions.Controls.Add(Me.ucrChkShowMissing) + Me.grpGraphOptions.Controls.Add(Me.ucrChkShowPercentage) + Me.grpGraphOptions.Controls.Add(Me.ucrChkShowCount) + Me.grpGraphOptions.Location = New System.Drawing.Point(6, 59) + Me.grpGraphOptions.Name = "grpGraphOptions" + Me.grpGraphOptions.Size = New System.Drawing.Size(329, 184) + Me.grpGraphOptions.TabIndex = 1 + Me.grpGraphOptions.TabStop = False + Me.grpGraphOptions.Text = "Graph Options" + ' + 'lblTitle + ' + Me.lblTitle.AutoSize = True + Me.lblTitle.Location = New System.Drawing.Point(12, 155) + Me.lblTitle.Name = "lblTitle" + Me.lblTitle.Size = New System.Drawing.Size(62, 13) + Me.lblTitle.TabIndex = 7 + Me.lblTitle.Text = "Graph Title:" + ' + 'lblHjust5 + ' + Me.lblHjust5.AutoSize = True + Me.lblHjust5.Location = New System.Drawing.Point(12, 127) + Me.lblHjust5.Name = "lblHjust5" + Me.lblHjust5.Size = New System.Drawing.Size(126, 13) + Me.lblHjust5.TabIndex = 5 + Me.lblHjust5.Text = "Horizontal Label Position:" + ' + 'lblVjust1 + ' + Me.lblVjust1.AutoSize = True + Me.lblVjust1.Location = New System.Drawing.Point(12, 99) + Me.lblVjust1.Name = "lblVjust1" + Me.lblVjust1.Size = New System.Drawing.Size(114, 13) + Me.lblVjust1.TabIndex = 3 + Me.lblVjust1.Text = "Vertical Label Position:" + ' + 'ucrInputGraphTitle + ' + Me.ucrInputGraphTitle.AddQuotesIfUnrecognised = True + Me.ucrInputGraphTitle.IsMultiline = False + Me.ucrInputGraphTitle.IsReadOnly = False + Me.ucrInputGraphTitle.Location = New System.Drawing.Point(141, 151) + Me.ucrInputGraphTitle.Name = "ucrInputGraphTitle" + Me.ucrInputGraphTitle.Size = New System.Drawing.Size(137, 21) + Me.ucrInputGraphTitle.TabIndex = 8 + ' + 'ucrInputHorizontalLabels + ' + Me.ucrInputHorizontalLabels.AddQuotesIfUnrecognised = True + Me.ucrInputHorizontalLabels.IsReadOnly = False + Me.ucrInputHorizontalLabels.Location = New System.Drawing.Point(141, 123) + Me.ucrInputHorizontalLabels.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) + Me.ucrInputHorizontalLabels.Name = "ucrInputHorizontalLabels" + Me.ucrInputHorizontalLabels.Size = New System.Drawing.Size(137, 21) + Me.ucrInputHorizontalLabels.TabIndex = 6 + ' + 'ucrInputVerticalLabels + ' + Me.ucrInputVerticalLabels.AddQuotesIfUnrecognised = True + Me.ucrInputVerticalLabels.IsReadOnly = False + Me.ucrInputVerticalLabels.Location = New System.Drawing.Point(141, 95) + Me.ucrInputVerticalLabels.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) + Me.ucrInputVerticalLabels.Name = "ucrInputVerticalLabels" + Me.ucrInputVerticalLabels.Size = New System.Drawing.Size(137, 21) + Me.ucrInputVerticalLabels.TabIndex = 4 + ' + 'ucrChkShowMissing + ' + Me.ucrChkShowMissing.Checked = False + Me.ucrChkShowMissing.Location = New System.Drawing.Point(12, 73) + Me.ucrChkShowMissing.Name = "ucrChkShowMissing" + Me.ucrChkShowMissing.Size = New System.Drawing.Size(145, 20) + Me.ucrChkShowMissing.TabIndex = 2 + ' + 'ucrChkShowPercentage + ' + Me.ucrChkShowPercentage.Checked = False + Me.ucrChkShowPercentage.Location = New System.Drawing.Point(12, 19) + Me.ucrChkShowPercentage.Name = "ucrChkShowPercentage" + Me.ucrChkShowPercentage.Size = New System.Drawing.Size(145, 20) + Me.ucrChkShowPercentage.TabIndex = 0 + ' + 'ucrChkShowCount + ' + Me.ucrChkShowCount.Checked = False + Me.ucrChkShowCount.Location = New System.Drawing.Point(12, 46) + Me.ucrChkShowCount.Name = "ucrChkShowCount" + Me.ucrChkShowCount.Size = New System.Drawing.Size(145, 20) + Me.ucrChkShowCount.TabIndex = 1 + ' + 'grpGraphType + ' + Me.grpGraphType.Controls.Add(Me.rdoLine) + Me.grpGraphType.Controls.Add(Me.rdoDot) + Me.grpGraphType.Controls.Add(Me.rdoBar) + Me.grpGraphType.Controls.Add(Me.ucrPnlGraphType) + Me.grpGraphType.Location = New System.Drawing.Point(6, 6) + Me.grpGraphType.Name = "grpGraphType" + Me.grpGraphType.Size = New System.Drawing.Size(327, 48) + Me.grpGraphType.TabIndex = 0 + Me.grpGraphType.TabStop = False + Me.grpGraphType.Text = "Type of Graph" + ' + 'rdoLine + ' + Me.rdoLine.AutoSize = True + Me.rdoLine.Location = New System.Drawing.Point(242, 19) + Me.rdoLine.Name = "rdoLine" + Me.rdoLine.Size = New System.Drawing.Size(77, 17) + Me.rdoLine.TabIndex = 3 + Me.rdoLine.TabStop = True + Me.rdoLine.Text = "Line Graph" + Me.rdoLine.UseVisualStyleBackColor = True + ' + 'rdoDot + ' + Me.rdoDot.AutoSize = True + Me.rdoDot.Location = New System.Drawing.Point(118, 19) + Me.rdoDot.Name = "rdoDot" + Me.rdoDot.Size = New System.Drawing.Size(74, 17) + Me.rdoDot.TabIndex = 2 + Me.rdoDot.TabStop = True + Me.rdoDot.Text = "Dot Graph" + Me.rdoDot.UseVisualStyleBackColor = True + ' + 'rdoBar + ' + Me.rdoBar.AutoSize = True + Me.rdoBar.Location = New System.Drawing.Point(6, 19) + Me.rdoBar.Name = "rdoBar" + Me.rdoBar.Size = New System.Drawing.Size(73, 17) + Me.rdoBar.TabIndex = 1 + Me.rdoBar.TabStop = True + Me.rdoBar.Text = "Bar Graph" + Me.rdoBar.UseVisualStyleBackColor = True + ' + 'ucrPnlGraphType + ' + Me.ucrPnlGraphType.Location = New System.Drawing.Point(6, 7) + Me.ucrPnlGraphType.Name = "ucrPnlGraphType" + Me.ucrPnlGraphType.Size = New System.Drawing.Size(323, 44) + Me.ucrPnlGraphType.TabIndex = 0 + ' 'sdgThemes ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(393, 261) + Me.ClientSize = New System.Drawing.Size(520, 472) + Me.Controls.Add(Me.tbXaxis) Me.Controls.Add(Me.ucrBaseSubdialogue) Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog Me.MaximizeBox = False @@ -44,9 +553,64 @@ Partial Class sdgThemes Me.Name = "sdgThemes" Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen Me.Text = "Themes" + Me.tbXaxis.ResumeLayout(False) + Me.tbAxis.ResumeLayout(False) + Me.grpTableOptions.ResumeLayout(False) + Me.GroupBox1.ResumeLayout(False) + Me.GroupBox1.PerformLayout() + Me.grpThemetext.ResumeLayout(False) + Me.grpThemetext.PerformLayout() + Me.tbYaxis.ResumeLayout(False) + Me.grpGraphOptions.ResumeLayout(False) + Me.grpGraphOptions.PerformLayout() + Me.grpGraphType.ResumeLayout(False) + Me.grpGraphType.PerformLayout() Me.ResumeLayout(False) End Sub Friend WithEvents ucrBaseSubdialogue As ucrButtonsSubdialogue + Friend WithEvents tbXaxis As TabControl + Friend WithEvents tbAxis As TabPage + Friend WithEvents grpTableOptions As GroupBox + Friend WithEvents tbYaxis As TabPage + Friend WithEvents grpGraphOptions As GroupBox + Friend WithEvents lblTitle As Label + Friend WithEvents lblHjust5 As Label + Friend WithEvents lblVjust1 As Label + Friend WithEvents ucrInputGraphTitle As ucrInputTextBox + Friend WithEvents ucrInputHorizontalLabels As ucrInputComboBox + Friend WithEvents ucrInputVerticalLabels As ucrInputComboBox + Friend WithEvents ucrChkShowMissing As ucrCheck + Friend WithEvents ucrChkShowPercentage As ucrCheck + Friend WithEvents ucrChkShowCount As ucrCheck + Friend WithEvents grpGraphType As GroupBox + Friend WithEvents rdoLine As RadioButton + Friend WithEvents rdoDot As RadioButton + Friend WithEvents rdoBar As RadioButton + Friend WithEvents ucrPnlGraphType As UcrPanel + Friend WithEvents GroupBox1 As GroupBox + Friend WithEvents lblSizeSegment As Label + Friend WithEvents ucrNudSizeSegment As ucrNud + Friend WithEvents lblColourSegment As Label + Friend WithEvents ucrInputColourSegment As ucrInputComboBox + Friend WithEvents lblLineType As Label + Friend WithEvents ucrInputLineType As ucrInputComboBox + Friend WithEvents grpThemetext As GroupBox + Friend WithEvents lblVjust As Label + Friend WithEvents ucrNudVjust As ucrNud + Friend WithEvents lblLineHeight As Label + Friend WithEvents ucrNudLineHeight As ucrNud + Friend WithEvents lblAngle As Label + Friend WithEvents ucrNudAngle As ucrNud + Friend WithEvents lblHjust As Label + Friend WithEvents ucrNudHjust As ucrNud + Friend WithEvents lblSize As Label + Friend WithEvents ucrNudsize As ucrNud + Friend WithEvents Label2 As Label + Friend WithEvents ucrInputColour As ucrInputComboBox + Friend WithEvents lblFace As Label + Friend WithEvents ucrInputFace As ucrInputComboBox + Friend WithEvents lblFamily As Label + Friend WithEvents ucrInputFamily As ucrInputComboBox End Class diff --git a/instat/sdgThemes.vb b/instat/sdgThemes.vb index 1309ee020c6..ff602fdf08e 100644 --- a/instat/sdgThemes.vb +++ b/instat/sdgThemes.vb @@ -25,4 +25,10 @@ Public Class sdgThemes Public Sub InitialiseControls() End Sub + + Private Sub lblAngle_Click(sender As Object, e As EventArgs) Handles lblAngle.Click + + End Sub + + End Class \ No newline at end of file From 2b07c0d23de77255fb447db1ea61a0e1b47c380a Mon Sep 17 00:00:00 2001 From: Steven Date: Thu, 1 Jun 2017 17:04:56 +0300 Subject: [PATCH 064/154] Setting theme_text and theme_segment parameters --- instat/sdgThemes.Designer.vb | 6 +++--- instat/sdgThemes.vb | 29 ++++++++++++++++++++++++----- 2 files changed, 27 insertions(+), 8 deletions(-) diff --git a/instat/sdgThemes.Designer.vb b/instat/sdgThemes.Designer.vb index 0f1510c2a80..e938b4a344e 100644 --- a/instat/sdgThemes.Designer.vb +++ b/instat/sdgThemes.Designer.vb @@ -87,7 +87,7 @@ Partial Class sdgThemes ' Me.tbXaxis.Controls.Add(Me.tbAxis) Me.tbXaxis.Controls.Add(Me.tbYaxis) - Me.tbXaxis.Location = New System.Drawing.Point(22, 1) + Me.tbXaxis.Location = New System.Drawing.Point(4, 8) Me.tbXaxis.Name = "tbXaxis" Me.tbXaxis.SelectedIndex = 0 Me.tbXaxis.Size = New System.Drawing.Size(506, 421) @@ -108,9 +108,9 @@ Partial Class sdgThemes ' Me.grpTableOptions.Controls.Add(Me.GroupBox1) Me.grpTableOptions.Controls.Add(Me.grpThemetext) - Me.grpTableOptions.Location = New System.Drawing.Point(0, 3) + Me.grpTableOptions.Location = New System.Drawing.Point(-1, 3) Me.grpTableOptions.Name = "grpTableOptions" - Me.grpTableOptions.Size = New System.Drawing.Size(502, 397) + Me.grpTableOptions.Size = New System.Drawing.Size(492, 397) Me.grpTableOptions.TabIndex = 0 Me.grpTableOptions.TabStop = False Me.grpTableOptions.Text = "More Options" diff --git a/instat/sdgThemes.vb b/instat/sdgThemes.vb index ff602fdf08e..cb3c4d7aac5 100644 --- a/instat/sdgThemes.vb +++ b/instat/sdgThemes.vb @@ -17,18 +17,37 @@ Imports instat.Translations Public Class sdgThemes Public bControlsInitialised As Boolean = False - + Public clsTextTheme, clsSegmentTheme As New RFunction Private Sub sdgThemes_Load(sender As Object, e As EventArgs) Handles MyBase.Load autoTranslate(Me) End Sub Public Sub InitialiseControls() - + 'Text Theme + ucrNudsize.SetParameter(New RParameter("size")) + ucrNudAngle.SetParameter(New RParameter("angle")) + ucrNudHjust.SetParameter(New RParameter("hjust")) + ucrNudVjust.SetParameter(New RParameter("vjust")) + ucrNudsize.SetParameter(New RParameter("lineheight")) + + ucrInputColour.SetParameter(New RParameter("colour")) + ucrInputFace.SetParameter(New RParameter("face")) + ucrInputFamily.SetParameter(New RParameter("family")) + + 'Segment Theme + ucrNudSizeSegment.SetParameter(New RParameter("size")) + ucrInputLineType.SetParameter(New RParameter("linetype")) + ucrInputColourSegment.SetParameter(New RParameter("colour")) + + bControlsInitialised = True End Sub - Private Sub lblAngle_Click(sender As Object, e As EventArgs) Handles lblAngle.Click - + Public Sub SetRFunction(clsNewTextTheme As RFunction, clsNewSegmentTheme As RFunction, Optional bReset As Boolean = False) + If Not bControlsInitialised Then + InitialiseControls() + End If + clsTextTheme = clsNewTextTheme + clsSegmentTheme = clsNewSegmentTheme End Sub - End Class \ No newline at end of file From b23608fac30bcfa68a6227a37bdd5c826e25bd45 Mon Sep 17 00:00:00 2001 From: John Lunalo Date: Fri, 2 Jun 2017 09:25:52 +0300 Subject: [PATCH 065/154] minor edits --- instat/dlgDeleteRowsOrColums.vb | 23 ++++++++--------------- 1 file changed, 8 insertions(+), 15 deletions(-) diff --git a/instat/dlgDeleteRowsOrColums.vb b/instat/dlgDeleteRowsOrColums.vb index 95769dea74e..be9d751c264 100644 --- a/instat/dlgDeleteRowsOrColums.vb +++ b/instat/dlgDeleteRowsOrColums.vb @@ -18,7 +18,7 @@ Imports instat.Translations Public Class dlgDeleteRowsOrColums Public bFirstLoad As Boolean = True Private bReset As Boolean = True - Private clsOperator As New ROperator + Private clsOperatorRowNames As New ROperator Private clsDeleteRows, clsDeleteColumns As RFunction Private Sub dlgDeleteRows_Load(sender As Object, e As EventArgs) Handles MyBase.Load autoTranslate(Me) @@ -73,18 +73,18 @@ Public Class dlgDeleteRowsOrColums Private Sub SetDefaults() clsDeleteColumns = New RFunction clsDeleteRows = New RFunction - clsOperator = New ROperator + clsOperatorRowNames = New ROperator ucrSelectorForDeleteColumns.Reset() clsDeleteRows.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$remove_rows_in_data") clsDeleteColumns.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$remove_columns_in_data") - clsOperator.SetOperation(":") - clsOperator.AddParameter("From", 1, iPosition:=0) - clsOperator.AddParameter("To", 1, iPosition:=2) + clsOperatorRowNames.SetOperation(":") + clsOperatorRowNames.AddParameter("From", 1, iPosition:=0) + clsOperatorRowNames.AddParameter("To", 1, iPosition:=1) - clsDeleteRows.AddParameter("row_names", clsROperatorParameter:=clsOperator) + clsDeleteRows.AddParameter("row_names", clsROperatorParameter:=clsOperatorRowNames) ucrBase.clsRsyntax.SetBaseRFunction(clsDeleteColumns) End Sub @@ -93,8 +93,8 @@ Public Class dlgDeleteRowsOrColums ucrPnlColumnsOrRows.SetRCode(clsDeleteColumns) ucrReceiverForColumnsToDelete.SetRCode(clsDeleteColumns) ucrSelectorForDeleteColumns.SetRCode(clsDeleteRows) - ucrNudTo.SetRCode(clsOperator, bReset) - ucrNudFrom.SetRCode(clsOperator, bReset) + ucrNudTo.SetRCode(clsOperatorRowNames, bReset) + ucrNudFrom.SetRCode(clsOperatorRowNames, bReset) End Sub Private Sub TestOKEnabled() @@ -116,13 +116,6 @@ Public Class dlgDeleteRowsOrColums End Sub Private Sub ReopenDialog() - If ucrSelectorForDeleteColumns.ucrAvailableDataFrames.cboAvailableDataFrames.Text <> "" Then - Try - ucrNudFrom.Maximum = frmMain.clsRLink.GetDataFrameLength(ucrSelectorForDeleteColumns.ucrAvailableDataFrames.cboAvailableDataFrames.Text) - ucrNudTo.Maximum = frmMain.clsRLink.GetDataFrameLength(ucrSelectorForDeleteColumns.ucrAvailableDataFrames.cboAvailableDataFrames.Text) - Catch ex As Exception - End Try - End If 'temp fix to receiver containing deleted column on reopen ucrReceiverForColumnsToDelete.Clear() End Sub From e3247f1ace56ff47de5723c5c1dca600c031de2e Mon Sep 17 00:00:00 2001 From: Steven Date: Fri, 2 Jun 2017 09:36:01 +0300 Subject: [PATCH 066/154] more edits --- instat/sdgThemes.vb | 59 +++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 54 insertions(+), 5 deletions(-) diff --git a/instat/sdgThemes.vb b/instat/sdgThemes.vb index cb3c4d7aac5..955cab357fd 100644 --- a/instat/sdgThemes.vb +++ b/instat/sdgThemes.vb @@ -17,37 +17,86 @@ Imports instat.Translations Public Class sdgThemes Public bControlsInitialised As Boolean = False - Public clsTextTheme, clsSegmentTheme As New RFunction + Public clsTextTheme, clsSegmentTheme, clsGgThemes As New RFunction + Private clsBaseOperator As New ROperator Private Sub sdgThemes_Load(sender As Object, e As EventArgs) Handles MyBase.Load autoTranslate(Me) End Sub Public Sub InitialiseControls() + Dim dctucrInputColour As New Dictionary(Of String, String) + Dim dctucrInputColourSegment As New Dictionary(Of String, String) + Dim dctucrInputFace As New Dictionary(Of String, String) + Dim dctucrInputFamily As New Dictionary(Of String, String) + 'Text Theme ucrNudsize.SetParameter(New RParameter("size")) ucrNudAngle.SetParameter(New RParameter("angle")) + ucrNudAngle.SetMinMax(0, 360) ucrNudHjust.SetParameter(New RParameter("hjust")) + ucrNudHjust.Increment = 0.1 + ucrNudHjust.SetMinMax(0, 1) ucrNudVjust.SetParameter(New RParameter("vjust")) - ucrNudsize.SetParameter(New RParameter("lineheight")) + ucrNudVjust.Increment = 0.1 + ucrNudVjust.SetMinMax(0, 1) + ucrNudLineHeight.SetParameter(New RParameter("lineheight")) ucrInputColour.SetParameter(New RParameter("colour")) ucrInputFace.SetParameter(New RParameter("face")) ucrInputFamily.SetParameter(New RParameter("family")) + dctucrInputFace.Add("Plain", Chr(34) & "plain" & Chr(34)) + dctucrInputFace.Add("Bold", Chr(34) & "bold" & Chr(34)) + dctucrInputFace.Add("Italic", Chr(34) & "italic" & Chr(34)) + ucrInputFace.SetItems(dctucrInputFace) + ucrInputFace.SetRDefault(Chr(34) & "plain" & Chr(34)) + + dctucrInputFamily.Add("Times Roman", Chr(34) & "Times" & Chr(34)) + dctucrInputFamily.Add("Courier", Chr(34) & "Courier" & Chr(34)) + dctucrInputFamily.Add("Serif", Chr(34) & "serif" & Chr(34)) + dctucrInputFamily.Add("NimbusSanCond", Chr(34) & "NimbusSanCond" & Chr(34)) + dctucrInputFamily.Add("CenturySch", Chr(34) & "CenturySch" & Chr(34)) + dctucrInputFamily.Add("NewCenturySchoolbook", Chr(34) & "NewCenturySchoolbook" & Chr(34)) + dctucrInputFamily.Add("Palatino", Chr(34) & "Palatino" & Chr(34)) + dctucrInputFamily.Add("Bookman", Chr(34) & "Bookman" & Chr(34)) + dctucrInputFamily.Add("URWGothic", Chr(34) & "URWGothic" & Chr(34)) + ucrInputFace.SetItems(dctucrInputFamily) + ucrInputFace.SetRDefault(Chr(34) & "Times" & Chr(34)) 'Segment Theme ucrNudSizeSegment.SetParameter(New RParameter("size")) ucrInputLineType.SetParameter(New RParameter("linetype")) ucrInputColourSegment.SetParameter(New RParameter("colour")) + bControlsInitialised = True End Sub - Public Sub SetRFunction(clsNewTextTheme As RFunction, clsNewSegmentTheme As RFunction, Optional bReset As Boolean = False) + Public Sub SetRFunction(clsBaseOperator As ROperator, Optional bReset As Boolean = False) If Not bControlsInitialised Then InitialiseControls() End If - clsTextTheme = clsNewTextTheme - clsSegmentTheme = clsNewSegmentTheme + + + clsBaseOperator.AddParameter("theme", clsRFunctionParameter:=clsGgThemes, iPosition:=15) + clsGgThemes.SetRCommand("theme") + clsSegmentTheme.SetRCommand("element_line") + clsTextTheme.SetRCommand("element_text") + clsGgThemes.AddParameter("axis.ticks", clsRFunctionParameter:=clsSegmentTheme) + clsGgThemes.AddParameter(" axis.text.x", clsRFunctionParameter:=clsTextTheme) + + + ucrNudAngle.SetRCode(clsTextTheme, bReset) + ucrNudHjust.SetRCode(clsTextTheme, bReset) + ucrNudLineHeight.SetRCode(clsTextTheme, bReset) + ucrNudsize.SetRCode(clsTextTheme, bReset) + ucrNudVjust.SetRCode(clsTextTheme, bReset) + ucrInputColour.SetRCode(clsTextTheme, bReset) + ucrInputFace.SetRCode(clsTextTheme, bReset) + ucrInputFamily.SetRCode(clsTextTheme, bReset) + + ucrNudSizeSegment.SetRCode(clsSegmentTheme, bReset) + ucrInputColourSegment.SetRCode(clsSegmentTheme, bReset) + ucrInputLineType.SetRCode(clsSegmentTheme, bReset) End Sub End Class \ No newline at end of file From 762143346cc14e449556c2463bb56ec73808b45d Mon Sep 17 00:00:00 2001 From: Steven Date: Fri, 2 Jun 2017 10:01:32 +0300 Subject: [PATCH 067/154] Adding dictionaries --- instat/sdgThemes.Designer.vb | 14 +++++++------- instat/sdgThemes.vb | 23 +++++++++++++++++++++-- 2 files changed, 28 insertions(+), 9 deletions(-) diff --git a/instat/sdgThemes.Designer.vb b/instat/sdgThemes.Designer.vb index e938b4a344e..2170fbf2577 100644 --- a/instat/sdgThemes.Designer.vb +++ b/instat/sdgThemes.Designer.vb @@ -225,10 +225,10 @@ Partial Class sdgThemes ' 'ucrNudVjust ' - Me.ucrNudVjust.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) - Me.ucrNudVjust.Increment = New Decimal(New Integer() {1, 0, 0, 0}) + Me.ucrNudVjust.DecimalPlaces = New Decimal(New Integer() {1, 0, 0, 0}) + Me.ucrNudVjust.Increment = New Decimal(New Integer() {1, 0, 0, 65536}) Me.ucrNudVjust.Location = New System.Drawing.Point(94, 75) - Me.ucrNudVjust.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) + Me.ucrNudVjust.Maximum = New Decimal(New Integer() {1, 0, 0, 0}) Me.ucrNudVjust.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudVjust.Name = "ucrNudVjust" Me.ucrNudVjust.Size = New System.Drawing.Size(50, 20) @@ -246,7 +246,7 @@ Partial Class sdgThemes ' 'ucrNudLineHeight ' - Me.ucrNudLineHeight.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudLineHeight.DecimalPlaces = New Decimal(New Integer() {1, 0, 0, 0}) Me.ucrNudLineHeight.Increment = New Decimal(New Integer() {1, 0, 0, 0}) Me.ucrNudLineHeight.Location = New System.Drawing.Point(94, 106) Me.ucrNudLineHeight.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) @@ -288,10 +288,10 @@ Partial Class sdgThemes ' 'ucrNudHjust ' - Me.ucrNudHjust.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) - Me.ucrNudHjust.Increment = New Decimal(New Integer() {1, 0, 0, 0}) + Me.ucrNudHjust.DecimalPlaces = New Decimal(New Integer() {1, 0, 0, 0}) + Me.ucrNudHjust.Increment = New Decimal(New Integer() {1, 0, 0, 65536}) Me.ucrNudHjust.Location = New System.Drawing.Point(94, 43) - Me.ucrNudHjust.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) + Me.ucrNudHjust.Maximum = New Decimal(New Integer() {1, 0, 0, 0}) Me.ucrNudHjust.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudHjust.Name = "ucrNudHjust" Me.ucrNudHjust.Size = New System.Drawing.Size(50, 20) diff --git a/instat/sdgThemes.vb b/instat/sdgThemes.vb index 955cab357fd..64b0e630b5c 100644 --- a/instat/sdgThemes.vb +++ b/instat/sdgThemes.vb @@ -51,6 +51,24 @@ Public Class sdgThemes ucrInputFace.SetItems(dctucrInputFace) ucrInputFace.SetRDefault(Chr(34) & "plain" & Chr(34)) + dctucrInputColour.Add("Black", Chr(34) & "black" & Chr(34)) + dctucrInputColour.Add("Red", Chr(34) & "red" & Chr(34)) + dctucrInputColour.Add("Blue", Chr(34) & "blue" & Chr(34)) + dctucrInputColour.Add("Grey", Chr(34) & "grey" & Chr(34)) + dctucrInputColour.Add("Yellow", Chr(34) & "yellow" & Chr(34)) + dctucrInputColour.Add("Yellow-Green", Chr(34) & "yellowgreen" & Chr(34)) + ucrInputColour.SetItems(dctucrInputColour) + ucrInputColour.SetRDefault(Chr(34) & "black" & Chr(34)) + + dctucrInputColourSegment.Add("Black", Chr(34) & "black" & Chr(34)) + dctucrInputColourSegment.Add("Red", Chr(34) & "red" & Chr(34)) + dctucrInputColourSegment.Add("Blue", Chr(34) & "blue" & Chr(34)) + dctucrInputColourSegment.Add("Grey", Chr(34) & "grey" & Chr(34)) + dctucrInputColourSegment.Add("Yellow", Chr(34) & "yellow" & Chr(34)) + dctucrInputColourSegment.Add("Yellow-Green", Chr(34) & "yellowgreen" & Chr(34)) + ucrInputColourSegment.SetItems(dctucrInputColourSegment) + ucrInputColourSegment.SetRDefault(Chr(34) & "black" & Chr(34)) + dctucrInputFamily.Add("Times Roman", Chr(34) & "Times" & Chr(34)) dctucrInputFamily.Add("Courier", Chr(34) & "Courier" & Chr(34)) dctucrInputFamily.Add("Serif", Chr(34) & "serif" & Chr(34)) @@ -60,8 +78,9 @@ Public Class sdgThemes dctucrInputFamily.Add("Palatino", Chr(34) & "Palatino" & Chr(34)) dctucrInputFamily.Add("Bookman", Chr(34) & "Bookman" & Chr(34)) dctucrInputFamily.Add("URWGothic", Chr(34) & "URWGothic" & Chr(34)) - ucrInputFace.SetItems(dctucrInputFamily) - ucrInputFace.SetRDefault(Chr(34) & "Times" & Chr(34)) + ucrInputFamily.SetItems(dctucrInputFamily) + ucrInputFamily.SetRDefault(Chr(34) & "Times" & Chr(34)) + 'Segment Theme ucrNudSizeSegment.SetParameter(New RParameter("size")) ucrInputLineType.SetParameter(New RParameter("linetype")) From 3188d5d5d500d64050ff7f41f3c2512ce97f72a9 Mon Sep 17 00:00:00 2001 From: Steven Date: Fri, 2 Jun 2017 10:28:23 +0300 Subject: [PATCH 068/154] edits --- instat/sdgThemes.Designer.vb | 2 +- instat/sdgThemes.vb | 39 +++++++++++++++++++++++++++--------- 2 files changed, 30 insertions(+), 11 deletions(-) diff --git a/instat/sdgThemes.Designer.vb b/instat/sdgThemes.Designer.vb index 2170fbf2577..87f4546a6da 100644 --- a/instat/sdgThemes.Designer.vb +++ b/instat/sdgThemes.Designer.vb @@ -247,7 +247,7 @@ Partial Class sdgThemes 'ucrNudLineHeight ' Me.ucrNudLineHeight.DecimalPlaces = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudLineHeight.Increment = New Decimal(New Integer() {1, 0, 0, 0}) + Me.ucrNudLineHeight.Increment = New Decimal(New Integer() {1, 0, 0, 65536}) Me.ucrNudLineHeight.Location = New System.Drawing.Point(94, 106) Me.ucrNudLineHeight.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) Me.ucrNudLineHeight.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) diff --git a/instat/sdgThemes.vb b/instat/sdgThemes.vb index 64b0e630b5c..1c0eb9dde57 100644 --- a/instat/sdgThemes.vb +++ b/instat/sdgThemes.vb @@ -28,6 +28,7 @@ Public Class sdgThemes Dim dctucrInputColourSegment As New Dictionary(Of String, String) Dim dctucrInputFace As New Dictionary(Of String, String) Dim dctucrInputFamily As New Dictionary(Of String, String) + Dim dctucrInputLineType As New Dictionary(Of String, String) 'Text Theme ucrNudsize.SetParameter(New RParameter("size")) @@ -59,15 +60,7 @@ Public Class sdgThemes dctucrInputColour.Add("Yellow-Green", Chr(34) & "yellowgreen" & Chr(34)) ucrInputColour.SetItems(dctucrInputColour) ucrInputColour.SetRDefault(Chr(34) & "black" & Chr(34)) - - dctucrInputColourSegment.Add("Black", Chr(34) & "black" & Chr(34)) - dctucrInputColourSegment.Add("Red", Chr(34) & "red" & Chr(34)) - dctucrInputColourSegment.Add("Blue", Chr(34) & "blue" & Chr(34)) - dctucrInputColourSegment.Add("Grey", Chr(34) & "grey" & Chr(34)) - dctucrInputColourSegment.Add("Yellow", Chr(34) & "yellow" & Chr(34)) - dctucrInputColourSegment.Add("Yellow-Green", Chr(34) & "yellowgreen" & Chr(34)) - ucrInputColourSegment.SetItems(dctucrInputColourSegment) - ucrInputColourSegment.SetRDefault(Chr(34) & "black" & Chr(34)) + ucrInputColour.bUpdateRCodeFromControl = False dctucrInputFamily.Add("Times Roman", Chr(34) & "Times" & Chr(34)) dctucrInputFamily.Add("Courier", Chr(34) & "Courier" & Chr(34)) @@ -80,12 +73,36 @@ Public Class sdgThemes dctucrInputFamily.Add("URWGothic", Chr(34) & "URWGothic" & Chr(34)) ucrInputFamily.SetItems(dctucrInputFamily) ucrInputFamily.SetRDefault(Chr(34) & "Times" & Chr(34)) + ucrInputFamily.bUpdateRCodeFromControl = False 'Segment Theme ucrNudSizeSegment.SetParameter(New RParameter("size")) + ucrInputLineType.SetParameter(New RParameter("linetype")) - ucrInputColourSegment.SetParameter(New RParameter("colour")) + dctucrInputLineType.Add("Blank", Chr(34) & "blank" & Chr(34)) + dctucrInputLineType.Add("Solid", Chr(34) & "solid" & Chr(34)) + dctucrInputLineType.Add("Dashed", Chr(34) & "dashed" & Chr(34)) + dctucrInputLineType.Add("Dotted", Chr(34) & "dotted" & Chr(34)) + dctucrInputLineType.Add("Dot-dash", Chr(34) & "dotdash" & Chr(34)) + dctucrInputLineType.Add("Long-dash", Chr(34) & "longdash" & Chr(34)) + dctucrInputLineType.Add("Two-Dash", Chr(34) & "twodash" & Chr(34)) + dctucrInputLineType.Add("1F", Chr(34) & "1F" & Chr(34)) + dctucrInputLineType.Add("F1", Chr(34) & "F1" & Chr(34)) + dctucrInputLineType.Add("4C88C488", Chr(34) & "4C88C488" & Chr(34)) + dctucrInputLineType.Add("12345678", Chr(34) & "12345678" & Chr(34)) + ucrInputLineType.SetItems(dctucrInputLineType) + ucrInputLineType.SetRDefault(Chr(34) & "blank" & Chr(34)) + ucrInputLineType.bUpdateRCodeFromControl = False + ucrInputColourSegment.SetParameter(New RParameter("colour")) + dctucrInputColourSegment.Add("Black", Chr(34) & "black" & Chr(34)) + dctucrInputColourSegment.Add("Red", Chr(34) & "red" & Chr(34)) + dctucrInputColourSegment.Add("Blue", Chr(34) & "blue" & Chr(34)) + dctucrInputColourSegment.Add("Grey", Chr(34) & "grey" & Chr(34)) + dctucrInputColourSegment.Add("Yellow", Chr(34) & "yellow" & Chr(34)) + dctucrInputColourSegment.Add("Yellow-Green", Chr(34) & "yellowgreen" & Chr(34)) + ucrInputColourSegment.SetItems(dctucrInputColourSegment) + ucrInputColourSegment.SetRDefault(Chr(34) & "black" & Chr(34)) bControlsInitialised = True End Sub @@ -99,7 +116,9 @@ Public Class sdgThemes clsBaseOperator.AddParameter("theme", clsRFunctionParameter:=clsGgThemes, iPosition:=15) clsGgThemes.SetRCommand("theme") clsSegmentTheme.SetRCommand("element_line") + clsSegmentTheme.AddParameter() clsTextTheme.SetRCommand("element_text") + clsTextTheme.AddParameter("") clsGgThemes.AddParameter("axis.ticks", clsRFunctionParameter:=clsSegmentTheme) clsGgThemes.AddParameter(" axis.text.x", clsRFunctionParameter:=clsTextTheme) From 793ead101c41c1bccaaa0e01caab9319e28e0ed7 Mon Sep 17 00:00:00 2001 From: Steven Date: Fri, 2 Jun 2017 11:03:57 +0300 Subject: [PATCH 069/154] more edits --- instat/sdgThemes.vb | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/instat/sdgThemes.vb b/instat/sdgThemes.vb index 1c0eb9dde57..049854289ca 100644 --- a/instat/sdgThemes.vb +++ b/instat/sdgThemes.vb @@ -115,10 +115,21 @@ Public Class sdgThemes clsBaseOperator.AddParameter("theme", clsRFunctionParameter:=clsGgThemes, iPosition:=15) clsGgThemes.SetRCommand("theme") - clsSegmentTheme.SetRCommand("element_line") - clsSegmentTheme.AddParameter() + clsTextTheme.SetRCommand("element_text") - clsTextTheme.AddParameter("") + + 'For Setting default values for the nuds + '' clsTextTheme.AddParameter("size", 10) + '' clsTextTheme.AddParameter("angle", 45) + ''clsTextTheme.AddParameter("hjust", 0.5) + ''clsTextTheme.AddParameter("vjust", 0.5) + ''clsTextTheme.AddParameter("lineheight", 1.1) + + clsSegmentTheme.SetRCommand("element_line") + + 'For Setting default values for the nuds + '' clsSegmentTheme.AddParameter("size", 0.5) + '' clsSegmentTheme.AddParameter("linetype", 1) clsGgThemes.AddParameter("axis.ticks", clsRFunctionParameter:=clsSegmentTheme) clsGgThemes.AddParameter(" axis.text.x", clsRFunctionParameter:=clsTextTheme) From 0e8e3b72a967fd9e2a0591af296ed394670d1283 Mon Sep 17 00:00:00 2001 From: Steven Date: Fri, 2 Jun 2017 12:33:34 +0300 Subject: [PATCH 070/154] more additions and changes --- instat/sdgThemes.Designer.vb | 27 ++++++++++++++++++++++++++- instat/sdgThemes.vb | 21 +++++++++++++++++++++ 2 files changed, 47 insertions(+), 1 deletion(-) diff --git a/instat/sdgThemes.Designer.vb b/instat/sdgThemes.Designer.vb index 87f4546a6da..fd7213d1009 100644 --- a/instat/sdgThemes.Designer.vb +++ b/instat/sdgThemes.Designer.vb @@ -66,6 +66,8 @@ Partial Class sdgThemes Me.rdoDot = New System.Windows.Forms.RadioButton() Me.rdoBar = New System.Windows.Forms.RadioButton() Me.ucrPnlGraphType = New instat.UcrPanel() + Me.lblLineEnd = New System.Windows.Forms.Label() + Me.ucrInputLineEnd = New instat.ucrInputComboBox() Me.tbXaxis.SuspendLayout() Me.tbAxis.SuspendLayout() Me.grpTableOptions.SuspendLayout() @@ -117,6 +119,8 @@ Partial Class sdgThemes ' 'GroupBox1 ' + Me.GroupBox1.Controls.Add(Me.lblLineEnd) + Me.GroupBox1.Controls.Add(Me.ucrInputLineEnd) Me.GroupBox1.Controls.Add(Me.lblSizeSegment) Me.GroupBox1.Controls.Add(Me.ucrNudSizeSegment) Me.GroupBox1.Controls.Add(Me.lblColourSegment) @@ -125,7 +129,7 @@ Partial Class sdgThemes Me.GroupBox1.Controls.Add(Me.ucrInputLineType) Me.GroupBox1.Location = New System.Drawing.Point(251, 22) Me.GroupBox1.Name = "GroupBox1" - Me.GroupBox1.Size = New System.Drawing.Size(230, 110) + Me.GroupBox1.Size = New System.Drawing.Size(230, 154) Me.GroupBox1.TabIndex = 39 Me.GroupBox1.TabStop = False Me.GroupBox1.Text = "Segment Theme" @@ -540,6 +544,25 @@ Partial Class sdgThemes Me.ucrPnlGraphType.Size = New System.Drawing.Size(323, 44) Me.ucrPnlGraphType.TabIndex = 0 ' + 'lblLineEnd + ' + Me.lblLineEnd.AutoSize = True + Me.lblLineEnd.Location = New System.Drawing.Point(12, 108) + Me.lblLineEnd.Name = "lblLineEnd" + Me.lblLineEnd.Size = New System.Drawing.Size(52, 13) + Me.lblLineEnd.TabIndex = 31 + Me.lblLineEnd.Text = "Line End:" + ' + 'ucrInputLineEnd + ' + Me.ucrInputLineEnd.AddQuotesIfUnrecognised = True + Me.ucrInputLineEnd.IsReadOnly = False + Me.ucrInputLineEnd.Location = New System.Drawing.Point(72, 100) + Me.ucrInputLineEnd.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) + Me.ucrInputLineEnd.Name = "ucrInputLineEnd" + Me.ucrInputLineEnd.Size = New System.Drawing.Size(137, 21) + Me.ucrInputLineEnd.TabIndex = 32 + ' 'sdgThemes ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -613,4 +636,6 @@ Partial Class sdgThemes Friend WithEvents ucrInputFace As ucrInputComboBox Friend WithEvents lblFamily As Label Friend WithEvents ucrInputFamily As ucrInputComboBox + Friend WithEvents lblLineEnd As Label + Friend WithEvents ucrInputLineEnd As ucrInputComboBox End Class diff --git a/instat/sdgThemes.vb b/instat/sdgThemes.vb index 049854289ca..8976e0dad34 100644 --- a/instat/sdgThemes.vb +++ b/instat/sdgThemes.vb @@ -29,6 +29,7 @@ Public Class sdgThemes Dim dctucrInputFace As New Dictionary(Of String, String) Dim dctucrInputFamily As New Dictionary(Of String, String) Dim dctucrInputLineType As New Dictionary(Of String, String) + Dim dctucrInputLineEnd As New Dictionary(Of String, String) 'Text Theme ucrNudsize.SetParameter(New RParameter("size")) @@ -49,6 +50,7 @@ Public Class sdgThemes dctucrInputFace.Add("Plain", Chr(34) & "plain" & Chr(34)) dctucrInputFace.Add("Bold", Chr(34) & "bold" & Chr(34)) dctucrInputFace.Add("Italic", Chr(34) & "italic" & Chr(34)) + dctucrInputFace.Add("Bold italic", Chr(34) & "bold.italic" & Chr(34)) ucrInputFace.SetItems(dctucrInputFace) ucrInputFace.SetRDefault(Chr(34) & "plain" & Chr(34)) @@ -64,13 +66,23 @@ Public Class sdgThemes dctucrInputFamily.Add("Times Roman", Chr(34) & "Times" & Chr(34)) dctucrInputFamily.Add("Courier", Chr(34) & "Courier" & Chr(34)) + dctucrInputFamily.Add("Couriersans", Chr(34) & "Couriersans" & Chr(34)) dctucrInputFamily.Add("Serif", Chr(34) & "serif" & Chr(34)) dctucrInputFamily.Add("NimbusSanCond", Chr(34) & "NimbusSanCond" & Chr(34)) dctucrInputFamily.Add("CenturySch", Chr(34) & "CenturySch" & Chr(34)) dctucrInputFamily.Add("NewCenturySchoolbook", Chr(34) & "NewCenturySchoolbook" & Chr(34)) dctucrInputFamily.Add("Palatino", Chr(34) & "Palatino" & Chr(34)) dctucrInputFamily.Add("Bookman", Chr(34) & "Bookman" & Chr(34)) + dctucrInputFamily.Add("URWBookman", Chr(34) & "URWBookman" & Chr(34)) dctucrInputFamily.Add("URWGothic", Chr(34) & "URWGothic" & Chr(34)) + dctucrInputFamily.Add("NimbusRom", Chr(34) & "NimbusRom" & Chr(34)) + dctucrInputFamily.Add("URWPalladioURWTimes", Chr(34) & "URWPalladioURWTimes" & Chr(34)) + dctucrInputFamily.Add("NimbusMonURWHelvetica", Chr(34) & "NimbusMonURWHelvetica" & Chr(34)) + dctucrInputFamily.Add("Helvetica - Narrow", Chr(34) & "Helvetica - Narrow" & Chr(34)) + dctucrInputFamily.Add("Helveticaserif", Chr(34) & "Helveticaserif" & Chr(34)) + dctucrInputFamily.Add("Short", Chr(34) & "Short" & Chr(34)) + dctucrInputFamily.Add("Canonicalmono", Chr(34) & "Canonicalmono" & Chr(34)) + dctucrInputFamily.Add("AvantGarde", Chr(34) & "AvantGarde" & Chr(34)) ucrInputFamily.SetItems(dctucrInputFamily) ucrInputFamily.SetRDefault(Chr(34) & "Times" & Chr(34)) ucrInputFamily.bUpdateRCodeFromControl = False @@ -104,6 +116,15 @@ Public Class sdgThemes ucrInputColourSegment.SetItems(dctucrInputColourSegment) ucrInputColourSegment.SetRDefault(Chr(34) & "black" & Chr(34)) + ucrInputLineEnd.SetParameter(New RParameter("lineend")) + dctucrInputLineEnd.Add("NULL", Chr(34) & "NULL" & Chr(34)) + dctucrInputLineEnd.Add("round", Chr(34) & "round" & Chr(34)) + dctucrInputLineEnd.Add("butt", Chr(34) & "butt" & Chr(34)) + dctucrInputLineEnd.Add("square", Chr(34) & "square" & Chr(34)) + ucrInputLineEnd.SetItems(dctucrInputLineEnd) + ucrInputLineEnd.SetRDefault(Chr(34) & "NULL" & Chr(34)) + ucrInputLineEnd.bUpdateRCodeFromControl = False + bControlsInitialised = True End Sub From d69c701648f386fcd1fa11c00523cb465d88618d Mon Sep 17 00:00:00 2001 From: Steven Date: Fri, 2 Jun 2017 13:34:48 +0300 Subject: [PATCH 071/154] Yaxis Tab --- instat/sdgThemes.Designer.vb | 608 ++++++++++++++++++++++------------- instat/sdgThemes.vb | 17 +- 2 files changed, 395 insertions(+), 230 deletions(-) diff --git a/instat/sdgThemes.Designer.vb b/instat/sdgThemes.Designer.vb index fd7213d1009..3cc41ecfa99 100644 --- a/instat/sdgThemes.Designer.vb +++ b/instat/sdgThemes.Designer.vb @@ -27,6 +27,8 @@ Partial Class sdgThemes Me.tbAxis = New System.Windows.Forms.TabPage() Me.grpTableOptions = New System.Windows.Forms.GroupBox() Me.GroupBox1 = New System.Windows.Forms.GroupBox() + Me.lblLineEnd = New System.Windows.Forms.Label() + Me.ucrInputLineEnd = New instat.ucrInputComboBox() Me.lblSizeSegment = New System.Windows.Forms.Label() Me.ucrNudSizeSegment = New instat.ucrNud() Me.lblColourSegment = New System.Windows.Forms.Label() @@ -51,31 +53,40 @@ Partial Class sdgThemes Me.lblFamily = New System.Windows.Forms.Label() Me.ucrInputFamily = New instat.ucrInputComboBox() Me.tbYaxis = New System.Windows.Forms.TabPage() - Me.grpGraphOptions = New System.Windows.Forms.GroupBox() - Me.lblTitle = New System.Windows.Forms.Label() - Me.lblHjust5 = New System.Windows.Forms.Label() - Me.lblVjust1 = New System.Windows.Forms.Label() - Me.ucrInputGraphTitle = New instat.ucrInputTextBox() - Me.ucrInputHorizontalLabels = New instat.ucrInputComboBox() - Me.ucrInputVerticalLabels = New instat.ucrInputComboBox() - Me.ucrChkShowMissing = New instat.ucrCheck() - Me.ucrChkShowPercentage = New instat.ucrCheck() - Me.ucrChkShowCount = New instat.ucrCheck() - Me.grpGraphType = New System.Windows.Forms.GroupBox() - Me.rdoLine = New System.Windows.Forms.RadioButton() - Me.rdoDot = New System.Windows.Forms.RadioButton() - Me.rdoBar = New System.Windows.Forms.RadioButton() - Me.ucrPnlGraphType = New instat.UcrPanel() - Me.lblLineEnd = New System.Windows.Forms.Label() - Me.ucrInputLineEnd = New instat.ucrInputComboBox() + Me.GroupBox2 = New System.Windows.Forms.GroupBox() + Me.Label1 = New System.Windows.Forms.Label() + Me.UcrNud1 = New instat.ucrNud() + Me.Label3 = New System.Windows.Forms.Label() + Me.UcrNud2 = New instat.ucrNud() + Me.Label4 = New System.Windows.Forms.Label() + Me.UcrNud3 = New instat.ucrNud() + Me.Label5 = New System.Windows.Forms.Label() + Me.UcrNud4 = New instat.ucrNud() + Me.Label6 = New System.Windows.Forms.Label() + Me.UcrNud5 = New instat.ucrNud() + Me.Label7 = New System.Windows.Forms.Label() + Me.UcrInputComboBox1 = New instat.ucrInputComboBox() + Me.Label8 = New System.Windows.Forms.Label() + Me.UcrInputComboBox2 = New instat.ucrInputComboBox() + Me.Label9 = New System.Windows.Forms.Label() + Me.UcrInputComboBox3 = New instat.ucrInputComboBox() + Me.GroupBox3 = New System.Windows.Forms.GroupBox() + Me.Label10 = New System.Windows.Forms.Label() + Me.UcrInputComboBox4 = New instat.ucrInputComboBox() + Me.Label11 = New System.Windows.Forms.Label() + Me.UcrNud6 = New instat.ucrNud() + Me.Label12 = New System.Windows.Forms.Label() + Me.UcrInputComboBox5 = New instat.ucrInputComboBox() + Me.Label13 = New System.Windows.Forms.Label() + Me.UcrInputComboBox6 = New instat.ucrInputComboBox() Me.tbXaxis.SuspendLayout() Me.tbAxis.SuspendLayout() Me.grpTableOptions.SuspendLayout() Me.GroupBox1.SuspendLayout() Me.grpThemetext.SuspendLayout() Me.tbYaxis.SuspendLayout() - Me.grpGraphOptions.SuspendLayout() - Me.grpGraphType.SuspendLayout() + Me.GroupBox2.SuspendLayout() + Me.GroupBox3.SuspendLayout() Me.SuspendLayout() ' 'ucrBaseSubdialogue @@ -132,7 +143,26 @@ Partial Class sdgThemes Me.GroupBox1.Size = New System.Drawing.Size(230, 154) Me.GroupBox1.TabIndex = 39 Me.GroupBox1.TabStop = False - Me.GroupBox1.Text = "Segment Theme" + Me.GroupBox1.Text = "tick marks along axes" + ' + 'lblLineEnd + ' + Me.lblLineEnd.AutoSize = True + Me.lblLineEnd.Location = New System.Drawing.Point(12, 108) + Me.lblLineEnd.Name = "lblLineEnd" + Me.lblLineEnd.Size = New System.Drawing.Size(52, 13) + Me.lblLineEnd.TabIndex = 31 + Me.lblLineEnd.Text = "Line End:" + ' + 'ucrInputLineEnd + ' + Me.ucrInputLineEnd.AddQuotesIfUnrecognised = True + Me.ucrInputLineEnd.IsReadOnly = False + Me.ucrInputLineEnd.Location = New System.Drawing.Point(72, 100) + Me.ucrInputLineEnd.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) + Me.ucrInputLineEnd.Name = "ucrInputLineEnd" + Me.ucrInputLineEnd.Size = New System.Drawing.Size(137, 21) + Me.ucrInputLineEnd.TabIndex = 32 ' 'lblSizeSegment ' @@ -213,15 +243,15 @@ Partial Class sdgThemes Me.grpThemetext.Controls.Add(Me.ucrInputFamily) Me.grpThemetext.Location = New System.Drawing.Point(15, 19) Me.grpThemetext.Name = "grpThemetext" - Me.grpThemetext.Size = New System.Drawing.Size(230, 291) + Me.grpThemetext.Size = New System.Drawing.Size(230, 245) Me.grpThemetext.TabIndex = 23 Me.grpThemetext.TabStop = False - Me.grpThemetext.Text = "Text Theme" + Me.grpThemetext.Text = "X axis label" ' 'lblVjust ' Me.lblVjust.AutoSize = True - Me.lblVjust.Location = New System.Drawing.Point(13, 80) + Me.lblVjust.Location = New System.Drawing.Point(13, 77) Me.lblVjust.Name = "lblVjust" Me.lblVjust.Size = New System.Drawing.Size(33, 13) Me.lblVjust.TabIndex = 37 @@ -231,7 +261,7 @@ Partial Class sdgThemes ' Me.ucrNudVjust.DecimalPlaces = New Decimal(New Integer() {1, 0, 0, 0}) Me.ucrNudVjust.Increment = New Decimal(New Integer() {1, 0, 0, 65536}) - Me.ucrNudVjust.Location = New System.Drawing.Point(94, 75) + Me.ucrNudVjust.Location = New System.Drawing.Point(94, 76) Me.ucrNudVjust.Maximum = New Decimal(New Integer() {1, 0, 0, 0}) Me.ucrNudVjust.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudVjust.Name = "ucrNudVjust" @@ -242,7 +272,7 @@ Partial Class sdgThemes 'lblLineHeight ' Me.lblLineHeight.AutoSize = True - Me.lblLineHeight.Location = New System.Drawing.Point(13, 111) + Me.lblLineHeight.Location = New System.Drawing.Point(13, 105) Me.lblLineHeight.Name = "lblLineHeight" Me.lblLineHeight.Size = New System.Drawing.Size(64, 13) Me.lblLineHeight.TabIndex = 35 @@ -263,7 +293,7 @@ Partial Class sdgThemes 'lblAngle ' Me.lblAngle.AutoSize = True - Me.lblAngle.Location = New System.Drawing.Point(13, 144) + Me.lblAngle.Location = New System.Drawing.Point(13, 133) Me.lblAngle.Name = "lblAngle" Me.lblAngle.Size = New System.Drawing.Size(37, 13) Me.lblAngle.TabIndex = 33 @@ -273,7 +303,7 @@ Partial Class sdgThemes ' Me.ucrNudAngle.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudAngle.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudAngle.Location = New System.Drawing.Point(94, 139) + Me.ucrNudAngle.Location = New System.Drawing.Point(94, 136) Me.ucrNudAngle.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) Me.ucrNudAngle.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudAngle.Name = "ucrNudAngle" @@ -284,7 +314,7 @@ Partial Class sdgThemes 'lblHjust ' Me.lblHjust.AutoSize = True - Me.lblHjust.Location = New System.Drawing.Point(13, 48) + Me.lblHjust.Location = New System.Drawing.Point(13, 49) Me.lblHjust.Name = "lblHjust" Me.lblHjust.Size = New System.Drawing.Size(34, 13) Me.lblHjust.TabIndex = 31 @@ -294,7 +324,7 @@ Partial Class sdgThemes ' Me.ucrNudHjust.DecimalPlaces = New Decimal(New Integer() {1, 0, 0, 0}) Me.ucrNudHjust.Increment = New Decimal(New Integer() {1, 0, 0, 65536}) - Me.ucrNudHjust.Location = New System.Drawing.Point(94, 43) + Me.ucrNudHjust.Location = New System.Drawing.Point(94, 46) Me.ucrNudHjust.Maximum = New Decimal(New Integer() {1, 0, 0, 0}) Me.ucrNudHjust.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudHjust.Name = "ucrNudHjust" @@ -305,7 +335,7 @@ Partial Class sdgThemes 'lblSize ' Me.lblSize.AutoSize = True - Me.lblSize.Location = New System.Drawing.Point(13, 22) + Me.lblSize.Location = New System.Drawing.Point(13, 21) Me.lblSize.Name = "lblSize" Me.lblSize.Size = New System.Drawing.Size(30, 13) Me.lblSize.TabIndex = 29 @@ -315,7 +345,7 @@ Partial Class sdgThemes ' 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(94, 17) + Me.ucrNudsize.Location = New System.Drawing.Point(94, 16) 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" @@ -326,7 +356,7 @@ Partial Class sdgThemes 'Label2 ' Me.Label2.AutoSize = True - Me.Label2.Location = New System.Drawing.Point(13, 237) + Me.Label2.Location = New System.Drawing.Point(13, 220) Me.Label2.Name = "Label2" Me.Label2.Size = New System.Drawing.Size(40, 13) Me.Label2.TabIndex = 27 @@ -336,7 +366,7 @@ Partial Class sdgThemes ' Me.ucrInputColour.AddQuotesIfUnrecognised = True Me.ucrInputColour.IsReadOnly = False - Me.ucrInputColour.Location = New System.Drawing.Point(73, 229) + Me.ucrInputColour.Location = New System.Drawing.Point(73, 217) Me.ucrInputColour.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) Me.ucrInputColour.Name = "ucrInputColour" Me.ucrInputColour.Size = New System.Drawing.Size(137, 21) @@ -345,7 +375,7 @@ Partial Class sdgThemes 'lblFace ' Me.lblFace.AutoSize = True - Me.lblFace.Location = New System.Drawing.Point(13, 209) + Me.lblFace.Location = New System.Drawing.Point(13, 196) Me.lblFace.Name = "lblFace" Me.lblFace.Size = New System.Drawing.Size(34, 13) Me.lblFace.TabIndex = 25 @@ -355,7 +385,7 @@ Partial Class sdgThemes ' Me.ucrInputFace.AddQuotesIfUnrecognised = True Me.ucrInputFace.IsReadOnly = False - Me.ucrInputFace.Location = New System.Drawing.Point(73, 201) + Me.ucrInputFace.Location = New System.Drawing.Point(73, 189) Me.ucrInputFace.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) Me.ucrInputFace.Name = "ucrInputFace" Me.ucrInputFace.Size = New System.Drawing.Size(137, 21) @@ -364,7 +394,7 @@ Partial Class sdgThemes 'lblFamily ' Me.lblFamily.AutoSize = True - Me.lblFamily.Location = New System.Drawing.Point(13, 182) + Me.lblFamily.Location = New System.Drawing.Point(13, 166) Me.lblFamily.Name = "lblFamily" Me.lblFamily.Size = New System.Drawing.Size(39, 13) Me.lblFamily.TabIndex = 23 @@ -374,7 +404,7 @@ Partial Class sdgThemes ' Me.ucrInputFamily.AddQuotesIfUnrecognised = True Me.ucrInputFamily.IsReadOnly = False - Me.ucrInputFamily.Location = New System.Drawing.Point(73, 174) + Me.ucrInputFamily.Location = New System.Drawing.Point(73, 162) Me.ucrInputFamily.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) Me.ucrInputFamily.Name = "ucrInputFamily" Me.ucrInputFamily.Size = New System.Drawing.Size(137, 21) @@ -382,8 +412,8 @@ Partial Class sdgThemes ' 'tbYaxis ' - Me.tbYaxis.Controls.Add(Me.grpGraphOptions) - Me.tbYaxis.Controls.Add(Me.grpGraphType) + Me.tbYaxis.Controls.Add(Me.GroupBox3) + Me.tbYaxis.Controls.Add(Me.GroupBox2) Me.tbYaxis.Location = New System.Drawing.Point(4, 22) Me.tbYaxis.Name = "tbYaxis" Me.tbYaxis.Padding = New System.Windows.Forms.Padding(3) @@ -392,176 +422,287 @@ Partial Class sdgThemes Me.tbYaxis.Text = "Y-axis" Me.tbYaxis.UseVisualStyleBackColor = True ' - 'grpGraphOptions - ' - Me.grpGraphOptions.Controls.Add(Me.lblTitle) - Me.grpGraphOptions.Controls.Add(Me.lblHjust5) - Me.grpGraphOptions.Controls.Add(Me.lblVjust1) - Me.grpGraphOptions.Controls.Add(Me.ucrInputGraphTitle) - Me.grpGraphOptions.Controls.Add(Me.ucrInputHorizontalLabels) - Me.grpGraphOptions.Controls.Add(Me.ucrInputVerticalLabels) - Me.grpGraphOptions.Controls.Add(Me.ucrChkShowMissing) - Me.grpGraphOptions.Controls.Add(Me.ucrChkShowPercentage) - Me.grpGraphOptions.Controls.Add(Me.ucrChkShowCount) - Me.grpGraphOptions.Location = New System.Drawing.Point(6, 59) - Me.grpGraphOptions.Name = "grpGraphOptions" - Me.grpGraphOptions.Size = New System.Drawing.Size(329, 184) - Me.grpGraphOptions.TabIndex = 1 - Me.grpGraphOptions.TabStop = False - Me.grpGraphOptions.Text = "Graph Options" - ' - 'lblTitle - ' - Me.lblTitle.AutoSize = True - Me.lblTitle.Location = New System.Drawing.Point(12, 155) - Me.lblTitle.Name = "lblTitle" - Me.lblTitle.Size = New System.Drawing.Size(62, 13) - Me.lblTitle.TabIndex = 7 - Me.lblTitle.Text = "Graph Title:" - ' - 'lblHjust5 - ' - Me.lblHjust5.AutoSize = True - Me.lblHjust5.Location = New System.Drawing.Point(12, 127) - Me.lblHjust5.Name = "lblHjust5" - Me.lblHjust5.Size = New System.Drawing.Size(126, 13) - Me.lblHjust5.TabIndex = 5 - Me.lblHjust5.Text = "Horizontal Label Position:" - ' - 'lblVjust1 - ' - Me.lblVjust1.AutoSize = True - Me.lblVjust1.Location = New System.Drawing.Point(12, 99) - Me.lblVjust1.Name = "lblVjust1" - Me.lblVjust1.Size = New System.Drawing.Size(114, 13) - Me.lblVjust1.TabIndex = 3 - Me.lblVjust1.Text = "Vertical Label Position:" - ' - 'ucrInputGraphTitle - ' - Me.ucrInputGraphTitle.AddQuotesIfUnrecognised = True - Me.ucrInputGraphTitle.IsMultiline = False - Me.ucrInputGraphTitle.IsReadOnly = False - Me.ucrInputGraphTitle.Location = New System.Drawing.Point(141, 151) - Me.ucrInputGraphTitle.Name = "ucrInputGraphTitle" - Me.ucrInputGraphTitle.Size = New System.Drawing.Size(137, 21) - Me.ucrInputGraphTitle.TabIndex = 8 - ' - 'ucrInputHorizontalLabels - ' - Me.ucrInputHorizontalLabels.AddQuotesIfUnrecognised = True - Me.ucrInputHorizontalLabels.IsReadOnly = False - Me.ucrInputHorizontalLabels.Location = New System.Drawing.Point(141, 123) - Me.ucrInputHorizontalLabels.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) - Me.ucrInputHorizontalLabels.Name = "ucrInputHorizontalLabels" - Me.ucrInputHorizontalLabels.Size = New System.Drawing.Size(137, 21) - Me.ucrInputHorizontalLabels.TabIndex = 6 - ' - 'ucrInputVerticalLabels - ' - Me.ucrInputVerticalLabels.AddQuotesIfUnrecognised = True - Me.ucrInputVerticalLabels.IsReadOnly = False - Me.ucrInputVerticalLabels.Location = New System.Drawing.Point(141, 95) - Me.ucrInputVerticalLabels.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) - Me.ucrInputVerticalLabels.Name = "ucrInputVerticalLabels" - Me.ucrInputVerticalLabels.Size = New System.Drawing.Size(137, 21) - Me.ucrInputVerticalLabels.TabIndex = 4 - ' - 'ucrChkShowMissing - ' - Me.ucrChkShowMissing.Checked = False - Me.ucrChkShowMissing.Location = New System.Drawing.Point(12, 73) - Me.ucrChkShowMissing.Name = "ucrChkShowMissing" - Me.ucrChkShowMissing.Size = New System.Drawing.Size(145, 20) - Me.ucrChkShowMissing.TabIndex = 2 - ' - 'ucrChkShowPercentage - ' - Me.ucrChkShowPercentage.Checked = False - Me.ucrChkShowPercentage.Location = New System.Drawing.Point(12, 19) - Me.ucrChkShowPercentage.Name = "ucrChkShowPercentage" - Me.ucrChkShowPercentage.Size = New System.Drawing.Size(145, 20) - Me.ucrChkShowPercentage.TabIndex = 0 - ' - 'ucrChkShowCount - ' - Me.ucrChkShowCount.Checked = False - Me.ucrChkShowCount.Location = New System.Drawing.Point(12, 46) - Me.ucrChkShowCount.Name = "ucrChkShowCount" - Me.ucrChkShowCount.Size = New System.Drawing.Size(145, 20) - Me.ucrChkShowCount.TabIndex = 1 - ' - 'grpGraphType - ' - Me.grpGraphType.Controls.Add(Me.rdoLine) - Me.grpGraphType.Controls.Add(Me.rdoDot) - Me.grpGraphType.Controls.Add(Me.rdoBar) - Me.grpGraphType.Controls.Add(Me.ucrPnlGraphType) - Me.grpGraphType.Location = New System.Drawing.Point(6, 6) - Me.grpGraphType.Name = "grpGraphType" - Me.grpGraphType.Size = New System.Drawing.Size(327, 48) - Me.grpGraphType.TabIndex = 0 - Me.grpGraphType.TabStop = False - Me.grpGraphType.Text = "Type of Graph" - ' - 'rdoLine - ' - Me.rdoLine.AutoSize = True - Me.rdoLine.Location = New System.Drawing.Point(242, 19) - Me.rdoLine.Name = "rdoLine" - Me.rdoLine.Size = New System.Drawing.Size(77, 17) - Me.rdoLine.TabIndex = 3 - Me.rdoLine.TabStop = True - Me.rdoLine.Text = "Line Graph" - Me.rdoLine.UseVisualStyleBackColor = True - ' - 'rdoDot - ' - Me.rdoDot.AutoSize = True - Me.rdoDot.Location = New System.Drawing.Point(118, 19) - Me.rdoDot.Name = "rdoDot" - Me.rdoDot.Size = New System.Drawing.Size(74, 17) - Me.rdoDot.TabIndex = 2 - Me.rdoDot.TabStop = True - Me.rdoDot.Text = "Dot Graph" - Me.rdoDot.UseVisualStyleBackColor = True - ' - 'rdoBar - ' - Me.rdoBar.AutoSize = True - Me.rdoBar.Location = New System.Drawing.Point(6, 19) - Me.rdoBar.Name = "rdoBar" - Me.rdoBar.Size = New System.Drawing.Size(73, 17) - Me.rdoBar.TabIndex = 1 - Me.rdoBar.TabStop = True - Me.rdoBar.Text = "Bar Graph" - Me.rdoBar.UseVisualStyleBackColor = True - ' - 'ucrPnlGraphType - ' - Me.ucrPnlGraphType.Location = New System.Drawing.Point(6, 7) - Me.ucrPnlGraphType.Name = "ucrPnlGraphType" - Me.ucrPnlGraphType.Size = New System.Drawing.Size(323, 44) - Me.ucrPnlGraphType.TabIndex = 0 - ' - 'lblLineEnd - ' - Me.lblLineEnd.AutoSize = True - Me.lblLineEnd.Location = New System.Drawing.Point(12, 108) - Me.lblLineEnd.Name = "lblLineEnd" - Me.lblLineEnd.Size = New System.Drawing.Size(52, 13) - Me.lblLineEnd.TabIndex = 31 - Me.lblLineEnd.Text = "Line End:" - ' - 'ucrInputLineEnd - ' - Me.ucrInputLineEnd.AddQuotesIfUnrecognised = True - Me.ucrInputLineEnd.IsReadOnly = False - Me.ucrInputLineEnd.Location = New System.Drawing.Point(72, 100) - Me.ucrInputLineEnd.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) - Me.ucrInputLineEnd.Name = "ucrInputLineEnd" - Me.ucrInputLineEnd.Size = New System.Drawing.Size(137, 21) - Me.ucrInputLineEnd.TabIndex = 32 + 'GroupBox2 + ' + Me.GroupBox2.Controls.Add(Me.Label1) + Me.GroupBox2.Controls.Add(Me.UcrNud1) + Me.GroupBox2.Controls.Add(Me.Label3) + Me.GroupBox2.Controls.Add(Me.UcrNud2) + Me.GroupBox2.Controls.Add(Me.Label4) + Me.GroupBox2.Controls.Add(Me.UcrNud3) + Me.GroupBox2.Controls.Add(Me.Label5) + Me.GroupBox2.Controls.Add(Me.UcrNud4) + Me.GroupBox2.Controls.Add(Me.Label6) + Me.GroupBox2.Controls.Add(Me.UcrNud5) + Me.GroupBox2.Controls.Add(Me.Label7) + Me.GroupBox2.Controls.Add(Me.UcrInputComboBox1) + Me.GroupBox2.Controls.Add(Me.Label8) + Me.GroupBox2.Controls.Add(Me.UcrInputComboBox2) + Me.GroupBox2.Controls.Add(Me.Label9) + Me.GroupBox2.Controls.Add(Me.UcrInputComboBox3) + Me.GroupBox2.Location = New System.Drawing.Point(6, 6) + Me.GroupBox2.Name = "GroupBox2" + Me.GroupBox2.Size = New System.Drawing.Size(230, 245) + Me.GroupBox2.TabIndex = 24 + Me.GroupBox2.TabStop = False + Me.GroupBox2.Text = "Y axis label" + ' + 'Label1 + ' + Me.Label1.AutoSize = True + Me.Label1.Location = New System.Drawing.Point(13, 77) + Me.Label1.Name = "Label1" + Me.Label1.Size = New System.Drawing.Size(33, 13) + Me.Label1.TabIndex = 37 + Me.Label1.Text = "Vjust:" + ' + 'UcrNud1 + ' + Me.UcrNud1.DecimalPlaces = New Decimal(New Integer() {1, 0, 0, 0}) + Me.UcrNud1.Increment = New Decimal(New Integer() {1, 0, 0, 65536}) + Me.UcrNud1.Location = New System.Drawing.Point(94, 76) + Me.UcrNud1.Maximum = New Decimal(New Integer() {1, 0, 0, 0}) + Me.UcrNud1.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) + Me.UcrNud1.Name = "UcrNud1" + Me.UcrNud1.Size = New System.Drawing.Size(50, 20) + Me.UcrNud1.TabIndex = 38 + Me.UcrNud1.Value = New Decimal(New Integer() {0, 0, 0, 0}) + ' + 'Label3 + ' + Me.Label3.AutoSize = True + Me.Label3.Location = New System.Drawing.Point(13, 105) + Me.Label3.Name = "Label3" + Me.Label3.Size = New System.Drawing.Size(64, 13) + Me.Label3.TabIndex = 35 + Me.Label3.Text = "Line Height:" + ' + 'UcrNud2 + ' + Me.UcrNud2.DecimalPlaces = New Decimal(New Integer() {1, 0, 0, 0}) + Me.UcrNud2.Increment = New Decimal(New Integer() {1, 0, 0, 65536}) + Me.UcrNud2.Location = New System.Drawing.Point(94, 106) + Me.UcrNud2.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) + Me.UcrNud2.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) + Me.UcrNud2.Name = "UcrNud2" + Me.UcrNud2.Size = New System.Drawing.Size(50, 20) + Me.UcrNud2.TabIndex = 36 + Me.UcrNud2.Value = New Decimal(New Integer() {0, 0, 0, 0}) + ' + 'Label4 + ' + Me.Label4.AutoSize = True + Me.Label4.Location = New System.Drawing.Point(13, 133) + Me.Label4.Name = "Label4" + Me.Label4.Size = New System.Drawing.Size(37, 13) + Me.Label4.TabIndex = 33 + Me.Label4.Text = "Angle:" + ' + 'UcrNud3 + ' + Me.UcrNud3.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) + Me.UcrNud3.Increment = New Decimal(New Integer() {1, 0, 0, 0}) + Me.UcrNud3.Location = New System.Drawing.Point(94, 136) + Me.UcrNud3.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) + Me.UcrNud3.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) + Me.UcrNud3.Name = "UcrNud3" + Me.UcrNud3.Size = New System.Drawing.Size(50, 20) + Me.UcrNud3.TabIndex = 34 + Me.UcrNud3.Value = New Decimal(New Integer() {0, 0, 0, 0}) + ' + 'Label5 + ' + Me.Label5.AutoSize = True + Me.Label5.Location = New System.Drawing.Point(13, 49) + Me.Label5.Name = "Label5" + Me.Label5.Size = New System.Drawing.Size(34, 13) + Me.Label5.TabIndex = 31 + Me.Label5.Text = "Hjust:" + ' + 'UcrNud4 + ' + Me.UcrNud4.DecimalPlaces = New Decimal(New Integer() {1, 0, 0, 0}) + Me.UcrNud4.Increment = New Decimal(New Integer() {1, 0, 0, 65536}) + Me.UcrNud4.Location = New System.Drawing.Point(94, 46) + Me.UcrNud4.Maximum = New Decimal(New Integer() {1, 0, 0, 0}) + Me.UcrNud4.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) + Me.UcrNud4.Name = "UcrNud4" + Me.UcrNud4.Size = New System.Drawing.Size(50, 20) + Me.UcrNud4.TabIndex = 32 + Me.UcrNud4.Value = New Decimal(New Integer() {0, 0, 0, 0}) + ' + 'Label6 + ' + Me.Label6.AutoSize = True + Me.Label6.Location = New System.Drawing.Point(13, 21) + Me.Label6.Name = "Label6" + Me.Label6.Size = New System.Drawing.Size(30, 13) + Me.Label6.TabIndex = 29 + Me.Label6.Text = "Size:" + ' + 'UcrNud5 + ' + Me.UcrNud5.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) + Me.UcrNud5.Increment = New Decimal(New Integer() {1, 0, 0, 0}) + Me.UcrNud5.Location = New System.Drawing.Point(94, 16) + Me.UcrNud5.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) + Me.UcrNud5.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) + Me.UcrNud5.Name = "UcrNud5" + Me.UcrNud5.Size = New System.Drawing.Size(50, 20) + Me.UcrNud5.TabIndex = 30 + Me.UcrNud5.Value = New Decimal(New Integer() {0, 0, 0, 0}) + ' + 'Label7 + ' + Me.Label7.AutoSize = True + Me.Label7.Location = New System.Drawing.Point(13, 220) + Me.Label7.Name = "Label7" + Me.Label7.Size = New System.Drawing.Size(40, 13) + Me.Label7.TabIndex = 27 + Me.Label7.Text = "Colour:" + ' + 'UcrInputComboBox1 + ' + Me.UcrInputComboBox1.AddQuotesIfUnrecognised = True + Me.UcrInputComboBox1.IsReadOnly = False + Me.UcrInputComboBox1.Location = New System.Drawing.Point(73, 217) + Me.UcrInputComboBox1.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) + Me.UcrInputComboBox1.Name = "UcrInputComboBox1" + Me.UcrInputComboBox1.Size = New System.Drawing.Size(137, 21) + Me.UcrInputComboBox1.TabIndex = 28 + ' + 'Label8 + ' + Me.Label8.AutoSize = True + Me.Label8.Location = New System.Drawing.Point(13, 196) + Me.Label8.Name = "Label8" + Me.Label8.Size = New System.Drawing.Size(34, 13) + Me.Label8.TabIndex = 25 + Me.Label8.Text = "Face:" + ' + 'UcrInputComboBox2 + ' + Me.UcrInputComboBox2.AddQuotesIfUnrecognised = True + Me.UcrInputComboBox2.IsReadOnly = False + Me.UcrInputComboBox2.Location = New System.Drawing.Point(73, 189) + Me.UcrInputComboBox2.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) + Me.UcrInputComboBox2.Name = "UcrInputComboBox2" + Me.UcrInputComboBox2.Size = New System.Drawing.Size(137, 21) + Me.UcrInputComboBox2.TabIndex = 26 + ' + 'Label9 + ' + Me.Label9.AutoSize = True + Me.Label9.Location = New System.Drawing.Point(13, 166) + Me.Label9.Name = "Label9" + Me.Label9.Size = New System.Drawing.Size(39, 13) + Me.Label9.TabIndex = 23 + Me.Label9.Text = "Family:" + ' + 'UcrInputComboBox3 + ' + Me.UcrInputComboBox3.AddQuotesIfUnrecognised = True + Me.UcrInputComboBox3.IsReadOnly = False + Me.UcrInputComboBox3.Location = New System.Drawing.Point(73, 162) + Me.UcrInputComboBox3.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) + Me.UcrInputComboBox3.Name = "UcrInputComboBox3" + Me.UcrInputComboBox3.Size = New System.Drawing.Size(137, 21) + Me.UcrInputComboBox3.TabIndex = 24 + ' + 'GroupBox3 + ' + Me.GroupBox3.Controls.Add(Me.Label10) + Me.GroupBox3.Controls.Add(Me.UcrInputComboBox4) + Me.GroupBox3.Controls.Add(Me.Label11) + Me.GroupBox3.Controls.Add(Me.UcrNud6) + Me.GroupBox3.Controls.Add(Me.Label12) + Me.GroupBox3.Controls.Add(Me.UcrInputComboBox5) + Me.GroupBox3.Controls.Add(Me.Label13) + Me.GroupBox3.Controls.Add(Me.UcrInputComboBox6) + Me.GroupBox3.Location = New System.Drawing.Point(252, 8) + Me.GroupBox3.Name = "GroupBox3" + Me.GroupBox3.Size = New System.Drawing.Size(230, 154) + Me.GroupBox3.TabIndex = 40 + Me.GroupBox3.TabStop = False + Me.GroupBox3.Text = "tick marks along axes" + ' + 'Label10 + ' + Me.Label10.AutoSize = True + Me.Label10.Location = New System.Drawing.Point(12, 108) + Me.Label10.Name = "Label10" + Me.Label10.Size = New System.Drawing.Size(52, 13) + Me.Label10.TabIndex = 31 + Me.Label10.Text = "Line End:" + ' + 'UcrInputComboBox4 + ' + Me.UcrInputComboBox4.AddQuotesIfUnrecognised = True + Me.UcrInputComboBox4.IsReadOnly = False + Me.UcrInputComboBox4.Location = New System.Drawing.Point(72, 100) + Me.UcrInputComboBox4.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) + Me.UcrInputComboBox4.Name = "UcrInputComboBox4" + Me.UcrInputComboBox4.Size = New System.Drawing.Size(137, 21) + Me.UcrInputComboBox4.TabIndex = 32 + ' + 'Label11 + ' + Me.Label11.AutoSize = True + Me.Label11.Location = New System.Drawing.Point(13, 22) + Me.Label11.Name = "Label11" + Me.Label11.Size = New System.Drawing.Size(30, 13) + Me.Label11.TabIndex = 29 + Me.Label11.Text = "Size:" + ' + 'UcrNud6 + ' + Me.UcrNud6.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) + Me.UcrNud6.Increment = New Decimal(New Integer() {1, 0, 0, 0}) + Me.UcrNud6.Location = New System.Drawing.Point(94, 17) + Me.UcrNud6.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) + Me.UcrNud6.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) + Me.UcrNud6.Name = "UcrNud6" + Me.UcrNud6.Size = New System.Drawing.Size(50, 20) + Me.UcrNud6.TabIndex = 30 + Me.UcrNud6.Value = New Decimal(New Integer() {0, 0, 0, 0}) + ' + 'Label12 + ' + Me.Label12.AutoSize = True + Me.Label12.Location = New System.Drawing.Point(12, 76) + Me.Label12.Name = "Label12" + Me.Label12.Size = New System.Drawing.Size(40, 13) + Me.Label12.TabIndex = 27 + Me.Label12.Text = "Colour:" + ' + 'UcrInputComboBox5 + ' + Me.UcrInputComboBox5.AddQuotesIfUnrecognised = True + Me.UcrInputComboBox5.IsReadOnly = False + Me.UcrInputComboBox5.Location = New System.Drawing.Point(72, 68) + Me.UcrInputComboBox5.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) + Me.UcrInputComboBox5.Name = "UcrInputComboBox5" + Me.UcrInputComboBox5.Size = New System.Drawing.Size(137, 21) + Me.UcrInputComboBox5.TabIndex = 28 + ' + 'Label13 + ' + Me.Label13.AutoSize = True + Me.Label13.Location = New System.Drawing.Point(12, 47) + Me.Label13.Name = "Label13" + Me.Label13.Size = New System.Drawing.Size(57, 13) + Me.Label13.TabIndex = 25 + Me.Label13.Text = "Line Type:" + ' + 'UcrInputComboBox6 + ' + Me.UcrInputComboBox6.AddQuotesIfUnrecognised = True + Me.UcrInputComboBox6.IsReadOnly = False + Me.UcrInputComboBox6.Location = New System.Drawing.Point(72, 40) + Me.UcrInputComboBox6.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) + Me.UcrInputComboBox6.Name = "UcrInputComboBox6" + Me.UcrInputComboBox6.Size = New System.Drawing.Size(137, 21) + Me.UcrInputComboBox6.TabIndex = 26 ' 'sdgThemes ' @@ -584,10 +725,10 @@ Partial Class sdgThemes Me.grpThemetext.ResumeLayout(False) Me.grpThemetext.PerformLayout() Me.tbYaxis.ResumeLayout(False) - Me.grpGraphOptions.ResumeLayout(False) - Me.grpGraphOptions.PerformLayout() - Me.grpGraphType.ResumeLayout(False) - Me.grpGraphType.PerformLayout() + Me.GroupBox2.ResumeLayout(False) + Me.GroupBox2.PerformLayout() + Me.GroupBox3.ResumeLayout(False) + Me.GroupBox3.PerformLayout() Me.ResumeLayout(False) End Sub @@ -597,21 +738,6 @@ Partial Class sdgThemes Friend WithEvents tbAxis As TabPage Friend WithEvents grpTableOptions As GroupBox Friend WithEvents tbYaxis As TabPage - Friend WithEvents grpGraphOptions As GroupBox - Friend WithEvents lblTitle As Label - Friend WithEvents lblHjust5 As Label - Friend WithEvents lblVjust1 As Label - Friend WithEvents ucrInputGraphTitle As ucrInputTextBox - Friend WithEvents ucrInputHorizontalLabels As ucrInputComboBox - Friend WithEvents ucrInputVerticalLabels As ucrInputComboBox - Friend WithEvents ucrChkShowMissing As ucrCheck - Friend WithEvents ucrChkShowPercentage As ucrCheck - Friend WithEvents ucrChkShowCount As ucrCheck - Friend WithEvents grpGraphType As GroupBox - Friend WithEvents rdoLine As RadioButton - Friend WithEvents rdoDot As RadioButton - Friend WithEvents rdoBar As RadioButton - Friend WithEvents ucrPnlGraphType As UcrPanel Friend WithEvents GroupBox1 As GroupBox Friend WithEvents lblSizeSegment As Label Friend WithEvents ucrNudSizeSegment As ucrNud @@ -638,4 +764,30 @@ Partial Class sdgThemes Friend WithEvents ucrInputFamily As ucrInputComboBox Friend WithEvents lblLineEnd As Label Friend WithEvents ucrInputLineEnd As ucrInputComboBox + Friend WithEvents GroupBox2 As GroupBox + Friend WithEvents Label1 As Label + Friend WithEvents UcrNud1 As ucrNud + Friend WithEvents Label3 As Label + Friend WithEvents UcrNud2 As ucrNud + Friend WithEvents Label4 As Label + Friend WithEvents UcrNud3 As ucrNud + Friend WithEvents Label5 As Label + Friend WithEvents UcrNud4 As ucrNud + Friend WithEvents Label6 As Label + Friend WithEvents UcrNud5 As ucrNud + Friend WithEvents Label7 As Label + Friend WithEvents UcrInputComboBox1 As ucrInputComboBox + Friend WithEvents Label8 As Label + Friend WithEvents UcrInputComboBox2 As ucrInputComboBox + Friend WithEvents Label9 As Label + Friend WithEvents UcrInputComboBox3 As ucrInputComboBox + Friend WithEvents GroupBox3 As GroupBox + Friend WithEvents Label10 As Label + Friend WithEvents UcrInputComboBox4 As ucrInputComboBox + Friend WithEvents Label11 As Label + Friend WithEvents UcrNud6 As ucrNud + Friend WithEvents Label12 As Label + Friend WithEvents UcrInputComboBox5 As ucrInputComboBox + Friend WithEvents Label13 As Label + Friend WithEvents UcrInputComboBox6 As ucrInputComboBox End Class diff --git a/instat/sdgThemes.vb b/instat/sdgThemes.vb index 8976e0dad34..e6d156ac556 100644 --- a/instat/sdgThemes.vb +++ b/instat/sdgThemes.vb @@ -23,6 +23,11 @@ Public Class sdgThemes autoTranslate(Me) End Sub + Private Sub lblHjust_Click(sender As Object, e As EventArgs) Handles lblHjust.Click + + End Sub + + Public Sub InitialiseControls() Dim dctucrInputColour As New Dictionary(Of String, String) Dim dctucrInputColourSegment As New Dictionary(Of String, String) @@ -138,6 +143,7 @@ Public Class sdgThemes clsGgThemes.SetRCommand("theme") clsTextTheme.SetRCommand("element_text") + clsSegmentTheme.SetRCommand("element_line") 'For Setting default values for the nuds '' clsTextTheme.AddParameter("size", 10) @@ -146,13 +152,20 @@ Public Class sdgThemes ''clsTextTheme.AddParameter("vjust", 0.5) ''clsTextTheme.AddParameter("lineheight", 1.1) - clsSegmentTheme.SetRCommand("element_line") + 'For Setting default values for the nuds '' clsSegmentTheme.AddParameter("size", 0.5) '' clsSegmentTheme.AddParameter("linetype", 1) clsGgThemes.AddParameter("axis.ticks", clsRFunctionParameter:=clsSegmentTheme) - clsGgThemes.AddParameter(" axis.text.x", clsRFunctionParameter:=clsTextTheme) + clsGgThemes.AddParameter("axis.title", clsRFunctionParameter:=clsTextTheme) + clsGgThemes.AddParameter("axis.text.x", clsRFunctionParameter:=clsTextTheme) + clsGgThemes.AddParameter("axis.text", clsRFunctionParameter:=clsTextTheme) + clsGgThemes.AddParameter("axis.text", clsRFunctionParameter:=clsTextTheme) + clsGgThemes.AddParameter("title", clsRFunctionParameter:=clsTextTheme) + + clsGgThemes.AddParameter("axis.title.y.right", clsRFunctionParameter:=clsTextTheme) + clsGgThemes.AddParameter("axis.title.y", clsRFunctionParameter:=clsTextTheme) ucrNudAngle.SetRCode(clsTextTheme, bReset) From 3ed5b976772ace8fffcbc8c02e90118f3846c1b6 Mon Sep 17 00:00:00 2001 From: shadrack kibet Date: Fri, 2 Jun 2017 14:03:09 +0300 Subject: [PATCH 072/154] minor edits --- instat/dlgInsertColumn.vb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/instat/dlgInsertColumn.vb b/instat/dlgInsertColumn.vb index 7a5f549d9ca..db54c121476 100644 --- a/instat/dlgInsertColumn.vb +++ b/instat/dlgInsertColumn.vb @@ -137,6 +137,7 @@ Public Class dlgInsertColumn clsInsertRowFunction.AddParameter("before", "FALSE") clsInsertRowFunction.AddParameter("start_row", ucrDataFramesList.iDataFrameLength) ucrBase.clsRsyntax.SetBaseRFunction(clsInsertColumnFunction) + ucrNudStartRow.SetMinMax(1, ucrDataFramesList.iDataFrameLength) End Sub Private Sub SetRCodeForControls(bReset As Boolean) @@ -198,12 +199,11 @@ Public Class dlgInsertColumn End If End Sub - Private Sub ucrReceiverColumnsToInsert_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrReceiverColumnsToInsert.ControlContentsChanged, ucrPnlColumnsOrRows.ControlContentsChanged, ucrPnlBeforeAfter.ControlContentsChanged, ucrPnlInsertColumns.ControlContentsChanged, ucrInputPrefixForNewColumn.ControlContentsChanged, ucrInputDefaultValue.ControlContentsChanged, ucrInputBeforeAfter.ControlContentsChanged, ucrNudNumberOfRows.ControlContentsChanged, ucrNudStartRow.ControlContentsChanged, ucrNudNumberOfColumns.ControlContentsChanged - TestOKEnabled() + Private Sub ucrSelectorInsertColumns_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrDataFramesList.ControlValueChanged ucrNudStartRow.SetMinMax(1, ucrDataFramesList.iDataFrameLength) End Sub - Private Sub ucrSelectorInsertColumns_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrSelectorInsertColumns.ControlValueChanged, ucrNudStartRow.ControlValueChanged, ucrPnlBeforeAfter.ControlContentsChanged - ucrNudStartRow.SetMinMax(1, ucrDataFramesList.iDataFrameLength) + Private Sub ucrReceiverColumnsToInsert_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrReceiverColumnsToInsert.ControlContentsChanged, ucrPnlColumnsOrRows.ControlContentsChanged, ucrPnlBeforeAfter.ControlContentsChanged, ucrPnlInsertColumns.ControlContentsChanged, ucrInputPrefixForNewColumn.ControlContentsChanged, ucrInputDefaultValue.ControlContentsChanged, ucrInputBeforeAfter.ControlContentsChanged, ucrNudNumberOfRows.ControlContentsChanged, ucrNudStartRow.ControlContentsChanged, ucrNudNumberOfColumns.ControlContentsChanged + TestOKEnabled() End Sub End Class \ No newline at end of file From ff589c0d5b121f68acf7eac35c50422817e9acf0 Mon Sep 17 00:00:00 2001 From: Steven Date: Fri, 2 Jun 2017 16:05:25 +0300 Subject: [PATCH 073/154] Setting rcode --- instat/sdgThemes.Designer.vb | 1172 +++++++++++++++++++++++++++------- instat/sdgThemes.vb | 177 ++++- 2 files changed, 1071 insertions(+), 278 deletions(-) diff --git a/instat/sdgThemes.Designer.vb b/instat/sdgThemes.Designer.vb index 3cc41ecfa99..527e5389a3c 100644 --- a/instat/sdgThemes.Designer.vb +++ b/instat/sdgThemes.Designer.vb @@ -22,10 +22,35 @@ Partial Class sdgThemes 'Do not modify it using the code editor. Private Sub InitializeComponent() - Me.ucrBaseSubdialogue = New instat.ucrButtonsSubdialogue() Me.tbXaxis = New System.Windows.Forms.TabControl() Me.tbAxis = New System.Windows.Forms.TabPage() Me.grpTableOptions = New System.Windows.Forms.GroupBox() + Me.grpTickLabels = New System.Windows.Forms.GroupBox() + Me.lblLineEndXtickMarks = New System.Windows.Forms.Label() + Me.ucrInputLineEndXTickMarks = New instat.ucrInputComboBox() + Me.lblSizeXTickMarks = New System.Windows.Forms.Label() + Me.ucrNudSizeXTickMarks = New instat.ucrNud() + Me.lblColourXTickMarks = New System.Windows.Forms.Label() + Me.ucrInputColourXTickMarks = New instat.ucrInputComboBox() + Me.lbllineTypeXTickMarks = New System.Windows.Forms.Label() + Me.ucrInputLineTypeXTickMarks = New instat.ucrInputComboBox() + Me.grpAxisLabelTopAxis = New System.Windows.Forms.GroupBox() + Me.lblVjustTopAxis = New System.Windows.Forms.Label() + Me.ucrNudVjustTopAxis = New instat.ucrNud() + Me.lblLineHeightTopAxis = New System.Windows.Forms.Label() + Me.ucrNudLineHeightTopAxis = New instat.ucrNud() + Me.lblAngleTop = New System.Windows.Forms.Label() + Me.ucrNudAngleTopAxis = New instat.ucrNud() + Me.lblHjustTopAxis = New System.Windows.Forms.Label() + Me.ucrNudHjustTopAxis = New instat.ucrNud() + Me.lblSizeTopaxis = New System.Windows.Forms.Label() + Me.ucrNudSizeTopaxis = New instat.ucrNud() + Me.lblColourTopAxis = New System.Windows.Forms.Label() + Me.ucrInputColourTopAxis = New instat.ucrInputComboBox() + Me.lblFaceTopAxis = New System.Windows.Forms.Label() + Me.ucrInputFaceTopAxis = New instat.ucrInputComboBox() + Me.lblFamilyTopAxis = New System.Windows.Forms.Label() + Me.ucrInputFamilyTopAxis = New instat.ucrInputComboBox() Me.GroupBox1 = New System.Windows.Forms.GroupBox() Me.lblLineEnd = New System.Windows.Forms.Label() Me.ucrInputLineEnd = New instat.ucrInputComboBox() @@ -35,7 +60,7 @@ Partial Class sdgThemes Me.ucrInputColourSegment = New instat.ucrInputComboBox() Me.lblLineType = New System.Windows.Forms.Label() Me.ucrInputLineType = New instat.ucrInputComboBox() - Me.grpThemetext = New System.Windows.Forms.GroupBox() + Me.grpAxisLabel = New System.Windows.Forms.GroupBox() Me.lblVjust = New System.Windows.Forms.Label() Me.ucrNudVjust = New instat.ucrNud() Me.lblLineHeight = New System.Windows.Forms.Label() @@ -53,49 +78,73 @@ Partial Class sdgThemes Me.lblFamily = New System.Windows.Forms.Label() Me.ucrInputFamily = New instat.ucrInputComboBox() Me.tbYaxis = New System.Windows.Forms.TabPage() + Me.ucrBaseSubdialogue = New instat.ucrButtonsSubdialogue() Me.GroupBox2 = New System.Windows.Forms.GroupBox() Me.Label1 = New System.Windows.Forms.Label() - Me.UcrNud1 = New instat.ucrNud() + Me.UcrInputComboBox1 = New instat.ucrInputComboBox() Me.Label3 = New System.Windows.Forms.Label() - Me.UcrNud2 = New instat.ucrNud() + Me.UcrNud1 = New instat.ucrNud() Me.Label4 = New System.Windows.Forms.Label() - Me.UcrNud3 = New instat.ucrNud() + Me.UcrInputComboBox2 = New instat.ucrInputComboBox() Me.Label5 = New System.Windows.Forms.Label() - Me.UcrNud4 = New instat.ucrNud() + Me.UcrInputComboBox3 = New instat.ucrInputComboBox() + Me.GroupBox3 = New System.Windows.Forms.GroupBox() Me.Label6 = New System.Windows.Forms.Label() - Me.UcrNud5 = New instat.ucrNud() + Me.UcrNud2 = New instat.ucrNud() Me.Label7 = New System.Windows.Forms.Label() - Me.UcrInputComboBox1 = New instat.ucrInputComboBox() + Me.UcrNud3 = New instat.ucrNud() Me.Label8 = New System.Windows.Forms.Label() - Me.UcrInputComboBox2 = New instat.ucrInputComboBox() + Me.UcrNud4 = New instat.ucrNud() Me.Label9 = New System.Windows.Forms.Label() - Me.UcrInputComboBox3 = New instat.ucrInputComboBox() - Me.GroupBox3 = New System.Windows.Forms.GroupBox() + Me.UcrNud5 = New instat.ucrNud() Me.Label10 = New System.Windows.Forms.Label() - Me.UcrInputComboBox4 = New instat.ucrInputComboBox() - Me.Label11 = New System.Windows.Forms.Label() Me.UcrNud6 = New instat.ucrNud() + Me.Label11 = New System.Windows.Forms.Label() + Me.UcrInputComboBox4 = New instat.ucrInputComboBox() Me.Label12 = New System.Windows.Forms.Label() Me.UcrInputComboBox5 = New instat.ucrInputComboBox() Me.Label13 = New System.Windows.Forms.Label() Me.UcrInputComboBox6 = New instat.ucrInputComboBox() + Me.GroupBox4 = New System.Windows.Forms.GroupBox() + Me.Label14 = New System.Windows.Forms.Label() + Me.UcrInputComboBox7 = New instat.ucrInputComboBox() + Me.Label15 = New System.Windows.Forms.Label() + Me.UcrNud7 = New instat.ucrNud() + Me.Label16 = New System.Windows.Forms.Label() + Me.UcrInputComboBox8 = New instat.ucrInputComboBox() + Me.Label17 = New System.Windows.Forms.Label() + Me.UcrInputComboBox9 = New instat.ucrInputComboBox() + Me.GroupBox5 = New System.Windows.Forms.GroupBox() + Me.Label18 = New System.Windows.Forms.Label() + Me.UcrNud8 = New instat.ucrNud() + Me.Label19 = New System.Windows.Forms.Label() + Me.UcrNud9 = New instat.ucrNud() + Me.Label20 = New System.Windows.Forms.Label() + Me.UcrNud10 = New instat.ucrNud() + Me.Label21 = New System.Windows.Forms.Label() + Me.UcrNud11 = New instat.ucrNud() + Me.Label22 = New System.Windows.Forms.Label() + Me.UcrNud12 = New instat.ucrNud() + Me.Label23 = New System.Windows.Forms.Label() + Me.UcrInputComboBox10 = New instat.ucrInputComboBox() + Me.Label24 = New System.Windows.Forms.Label() + Me.UcrInputComboBox11 = New instat.ucrInputComboBox() + Me.Label25 = New System.Windows.Forms.Label() + Me.UcrInputComboBox12 = New instat.ucrInputComboBox() Me.tbXaxis.SuspendLayout() Me.tbAxis.SuspendLayout() Me.grpTableOptions.SuspendLayout() + Me.grpTickLabels.SuspendLayout() + Me.grpAxisLabelTopAxis.SuspendLayout() Me.GroupBox1.SuspendLayout() - Me.grpThemetext.SuspendLayout() + Me.grpAxisLabel.SuspendLayout() Me.tbYaxis.SuspendLayout() Me.GroupBox2.SuspendLayout() Me.GroupBox3.SuspendLayout() + Me.GroupBox4.SuspendLayout() + Me.GroupBox5.SuspendLayout() Me.SuspendLayout() ' - 'ucrBaseSubdialogue - ' - Me.ucrBaseSubdialogue.Location = New System.Drawing.Point(157, 441) - Me.ucrBaseSubdialogue.Name = "ucrBaseSubdialogue" - Me.ucrBaseSubdialogue.Size = New System.Drawing.Size(142, 30) - Me.ucrBaseSubdialogue.TabIndex = 0 - ' 'tbXaxis ' Me.tbXaxis.Controls.Add(Me.tbAxis) @@ -103,7 +152,7 @@ Partial Class sdgThemes Me.tbXaxis.Location = New System.Drawing.Point(4, 8) Me.tbXaxis.Name = "tbXaxis" Me.tbXaxis.SelectedIndex = 0 - Me.tbXaxis.Size = New System.Drawing.Size(506, 421) + Me.tbXaxis.Size = New System.Drawing.Size(506, 473) Me.tbXaxis.TabIndex = 1 ' 'tbAxis @@ -112,22 +161,306 @@ Partial Class sdgThemes Me.tbAxis.Location = New System.Drawing.Point(4, 22) Me.tbAxis.Name = "tbAxis" Me.tbAxis.Padding = New System.Windows.Forms.Padding(3) - Me.tbAxis.Size = New System.Drawing.Size(498, 395) + Me.tbAxis.Size = New System.Drawing.Size(498, 447) Me.tbAxis.TabIndex = 0 Me.tbAxis.Text = "X-axis" Me.tbAxis.UseVisualStyleBackColor = True ' 'grpTableOptions ' + Me.grpTableOptions.Controls.Add(Me.grpTickLabels) + Me.grpTableOptions.Controls.Add(Me.grpAxisLabelTopAxis) Me.grpTableOptions.Controls.Add(Me.GroupBox1) - Me.grpTableOptions.Controls.Add(Me.grpThemetext) + Me.grpTableOptions.Controls.Add(Me.grpAxisLabel) Me.grpTableOptions.Location = New System.Drawing.Point(-1, 3) Me.grpTableOptions.Name = "grpTableOptions" - Me.grpTableOptions.Size = New System.Drawing.Size(492, 397) + Me.grpTableOptions.Size = New System.Drawing.Size(492, 427) Me.grpTableOptions.TabIndex = 0 Me.grpTableOptions.TabStop = False Me.grpTableOptions.Text = "More Options" ' + 'grpTickLabels + ' + Me.grpTickLabels.Controls.Add(Me.lblLineEndXtickMarks) + Me.grpTickLabels.Controls.Add(Me.ucrInputLineEndXTickMarks) + Me.grpTickLabels.Controls.Add(Me.lblSizeXTickMarks) + Me.grpTickLabels.Controls.Add(Me.ucrNudSizeXTickMarks) + Me.grpTickLabels.Controls.Add(Me.lblColourXTickMarks) + Me.grpTickLabels.Controls.Add(Me.ucrInputColourXTickMarks) + Me.grpTickLabels.Controls.Add(Me.lbllineTypeXTickMarks) + Me.grpTickLabels.Controls.Add(Me.ucrInputLineTypeXTickMarks) + Me.grpTickLabels.Location = New System.Drawing.Point(260, 273) + Me.grpTickLabels.Name = "grpTickLabels" + Me.grpTickLabels.Size = New System.Drawing.Size(230, 154) + Me.grpTickLabels.TabIndex = 40 + Me.grpTickLabels.TabStop = False + Me.grpTickLabels.Text = "X axis tick labels" + ' + 'lblLineEndXtickMarks + ' + Me.lblLineEndXtickMarks.AutoSize = True + Me.lblLineEndXtickMarks.Location = New System.Drawing.Point(12, 108) + Me.lblLineEndXtickMarks.Name = "lblLineEndXtickMarks" + Me.lblLineEndXtickMarks.Size = New System.Drawing.Size(52, 13) + Me.lblLineEndXtickMarks.TabIndex = 31 + Me.lblLineEndXtickMarks.Text = "Line End:" + ' + 'ucrInputLineEndXTickMarks + ' + Me.ucrInputLineEndXTickMarks.AddQuotesIfUnrecognised = True + Me.ucrInputLineEndXTickMarks.IsReadOnly = False + Me.ucrInputLineEndXTickMarks.Location = New System.Drawing.Point(72, 100) + Me.ucrInputLineEndXTickMarks.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) + Me.ucrInputLineEndXTickMarks.Name = "ucrInputLineEndXTickMarks" + Me.ucrInputLineEndXTickMarks.Size = New System.Drawing.Size(137, 21) + Me.ucrInputLineEndXTickMarks.TabIndex = 32 + ' + 'lblSizeXTickMarks + ' + Me.lblSizeXTickMarks.AutoSize = True + Me.lblSizeXTickMarks.Location = New System.Drawing.Point(13, 22) + Me.lblSizeXTickMarks.Name = "lblSizeXTickMarks" + Me.lblSizeXTickMarks.Size = New System.Drawing.Size(30, 13) + Me.lblSizeXTickMarks.TabIndex = 29 + Me.lblSizeXTickMarks.Text = "Size:" + ' + 'ucrNudSizeXTickMarks + ' + Me.ucrNudSizeXTickMarks.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudSizeXTickMarks.Increment = New Decimal(New Integer() {1, 0, 0, 0}) + Me.ucrNudSizeXTickMarks.Location = New System.Drawing.Point(94, 17) + Me.ucrNudSizeXTickMarks.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) + Me.ucrNudSizeXTickMarks.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudSizeXTickMarks.Name = "ucrNudSizeXTickMarks" + Me.ucrNudSizeXTickMarks.Size = New System.Drawing.Size(50, 20) + Me.ucrNudSizeXTickMarks.TabIndex = 30 + Me.ucrNudSizeXTickMarks.Value = New Decimal(New Integer() {0, 0, 0, 0}) + ' + 'lblColourXTickMarks + ' + Me.lblColourXTickMarks.AutoSize = True + Me.lblColourXTickMarks.Location = New System.Drawing.Point(12, 76) + Me.lblColourXTickMarks.Name = "lblColourXTickMarks" + Me.lblColourXTickMarks.Size = New System.Drawing.Size(40, 13) + Me.lblColourXTickMarks.TabIndex = 27 + Me.lblColourXTickMarks.Text = "Colour:" + ' + 'ucrInputColourXTickMarks + ' + Me.ucrInputColourXTickMarks.AddQuotesIfUnrecognised = True + Me.ucrInputColourXTickMarks.IsReadOnly = False + Me.ucrInputColourXTickMarks.Location = New System.Drawing.Point(72, 68) + Me.ucrInputColourXTickMarks.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) + Me.ucrInputColourXTickMarks.Name = "ucrInputColourXTickMarks" + Me.ucrInputColourXTickMarks.Size = New System.Drawing.Size(137, 21) + Me.ucrInputColourXTickMarks.TabIndex = 28 + ' + 'lbllineTypeXTickMarks + ' + Me.lbllineTypeXTickMarks.AutoSize = True + Me.lbllineTypeXTickMarks.Location = New System.Drawing.Point(12, 47) + Me.lbllineTypeXTickMarks.Name = "lbllineTypeXTickMarks" + Me.lbllineTypeXTickMarks.Size = New System.Drawing.Size(57, 13) + Me.lbllineTypeXTickMarks.TabIndex = 25 + Me.lbllineTypeXTickMarks.Text = "Line Type:" + ' + 'ucrInputLineTypeXTickMarks + ' + Me.ucrInputLineTypeXTickMarks.AddQuotesIfUnrecognised = True + Me.ucrInputLineTypeXTickMarks.IsReadOnly = False + Me.ucrInputLineTypeXTickMarks.Location = New System.Drawing.Point(72, 40) + Me.ucrInputLineTypeXTickMarks.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) + Me.ucrInputLineTypeXTickMarks.Name = "ucrInputLineTypeXTickMarks" + Me.ucrInputLineTypeXTickMarks.Size = New System.Drawing.Size(137, 21) + Me.ucrInputLineTypeXTickMarks.TabIndex = 26 + ' + 'grpAxisLabelTopAxis + ' + Me.grpAxisLabelTopAxis.Controls.Add(Me.lblVjustTopAxis) + Me.grpAxisLabelTopAxis.Controls.Add(Me.ucrNudVjustTopAxis) + Me.grpAxisLabelTopAxis.Controls.Add(Me.lblLineHeightTopAxis) + Me.grpAxisLabelTopAxis.Controls.Add(Me.ucrNudLineHeightTopAxis) + Me.grpAxisLabelTopAxis.Controls.Add(Me.lblAngleTop) + Me.grpAxisLabelTopAxis.Controls.Add(Me.ucrNudAngleTopAxis) + Me.grpAxisLabelTopAxis.Controls.Add(Me.lblHjustTopAxis) + Me.grpAxisLabelTopAxis.Controls.Add(Me.ucrNudHjustTopAxis) + Me.grpAxisLabelTopAxis.Controls.Add(Me.lblSizeTopaxis) + Me.grpAxisLabelTopAxis.Controls.Add(Me.ucrNudSizeTopaxis) + Me.grpAxisLabelTopAxis.Controls.Add(Me.lblColourTopAxis) + Me.grpAxisLabelTopAxis.Controls.Add(Me.ucrInputColourTopAxis) + Me.grpAxisLabelTopAxis.Controls.Add(Me.lblFaceTopAxis) + Me.grpAxisLabelTopAxis.Controls.Add(Me.ucrInputFaceTopAxis) + Me.grpAxisLabelTopAxis.Controls.Add(Me.lblFamilyTopAxis) + Me.grpAxisLabelTopAxis.Controls.Add(Me.ucrInputFamilyTopAxis) + Me.grpAxisLabelTopAxis.Location = New System.Drawing.Point(260, 19) + Me.grpAxisLabelTopAxis.Name = "grpAxisLabelTopAxis" + Me.grpAxisLabelTopAxis.Size = New System.Drawing.Size(230, 245) + Me.grpAxisLabelTopAxis.TabIndex = 40 + Me.grpAxisLabelTopAxis.TabStop = False + Me.grpAxisLabelTopAxis.Text = "X axis label on top axis" + ' + 'lblVjustTopAxis + ' + Me.lblVjustTopAxis.AutoSize = True + Me.lblVjustTopAxis.Location = New System.Drawing.Point(13, 77) + Me.lblVjustTopAxis.Name = "lblVjustTopAxis" + Me.lblVjustTopAxis.Size = New System.Drawing.Size(33, 13) + Me.lblVjustTopAxis.TabIndex = 37 + Me.lblVjustTopAxis.Text = "Vjust:" + ' + 'ucrNudVjustTopAxis + ' + Me.ucrNudVjustTopAxis.DecimalPlaces = New Decimal(New Integer() {1, 0, 0, 0}) + Me.ucrNudVjustTopAxis.Increment = New Decimal(New Integer() {1, 0, 0, 65536}) + Me.ucrNudVjustTopAxis.Location = New System.Drawing.Point(94, 76) + Me.ucrNudVjustTopAxis.Maximum = New Decimal(New Integer() {1, 0, 0, 0}) + Me.ucrNudVjustTopAxis.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudVjustTopAxis.Name = "ucrNudVjustTopAxis" + Me.ucrNudVjustTopAxis.Size = New System.Drawing.Size(50, 20) + Me.ucrNudVjustTopAxis.TabIndex = 38 + Me.ucrNudVjustTopAxis.Value = New Decimal(New Integer() {0, 0, 0, 0}) + ' + 'lblLineHeightTopAxis + ' + Me.lblLineHeightTopAxis.AutoSize = True + Me.lblLineHeightTopAxis.Location = New System.Drawing.Point(13, 105) + Me.lblLineHeightTopAxis.Name = "lblLineHeightTopAxis" + Me.lblLineHeightTopAxis.Size = New System.Drawing.Size(64, 13) + Me.lblLineHeightTopAxis.TabIndex = 35 + Me.lblLineHeightTopAxis.Text = "Line Height:" + ' + 'ucrNudLineHeightTopAxis + ' + Me.ucrNudLineHeightTopAxis.DecimalPlaces = New Decimal(New Integer() {1, 0, 0, 0}) + Me.ucrNudLineHeightTopAxis.Increment = New Decimal(New Integer() {1, 0, 0, 65536}) + Me.ucrNudLineHeightTopAxis.Location = New System.Drawing.Point(94, 106) + Me.ucrNudLineHeightTopAxis.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) + Me.ucrNudLineHeightTopAxis.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudLineHeightTopAxis.Name = "ucrNudLineHeightTopAxis" + Me.ucrNudLineHeightTopAxis.Size = New System.Drawing.Size(50, 20) + Me.ucrNudLineHeightTopAxis.TabIndex = 36 + Me.ucrNudLineHeightTopAxis.Value = New Decimal(New Integer() {0, 0, 0, 0}) + ' + 'lblAngleTop + ' + Me.lblAngleTop.AutoSize = True + Me.lblAngleTop.Location = New System.Drawing.Point(13, 133) + Me.lblAngleTop.Name = "lblAngleTop" + Me.lblAngleTop.Size = New System.Drawing.Size(37, 13) + Me.lblAngleTop.TabIndex = 33 + Me.lblAngleTop.Text = "Angle:" + ' + 'ucrNudAngleTopAxis + ' + Me.ucrNudAngleTopAxis.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudAngleTopAxis.Increment = New Decimal(New Integer() {1, 0, 0, 0}) + Me.ucrNudAngleTopAxis.Location = New System.Drawing.Point(94, 134) + Me.ucrNudAngleTopAxis.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) + Me.ucrNudAngleTopAxis.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudAngleTopAxis.Name = "ucrNudAngleTopAxis" + Me.ucrNudAngleTopAxis.Size = New System.Drawing.Size(50, 20) + Me.ucrNudAngleTopAxis.TabIndex = 34 + Me.ucrNudAngleTopAxis.Value = New Decimal(New Integer() {0, 0, 0, 0}) + ' + 'lblHjustTopAxis + ' + Me.lblHjustTopAxis.AutoSize = True + Me.lblHjustTopAxis.Location = New System.Drawing.Point(13, 49) + Me.lblHjustTopAxis.Name = "lblHjustTopAxis" + Me.lblHjustTopAxis.Size = New System.Drawing.Size(34, 13) + Me.lblHjustTopAxis.TabIndex = 31 + Me.lblHjustTopAxis.Text = "Hjust:" + ' + 'ucrNudHjustTopAxis + ' + Me.ucrNudHjustTopAxis.DecimalPlaces = New Decimal(New Integer() {1, 0, 0, 0}) + Me.ucrNudHjustTopAxis.Increment = New Decimal(New Integer() {1, 0, 0, 65536}) + Me.ucrNudHjustTopAxis.Location = New System.Drawing.Point(94, 46) + Me.ucrNudHjustTopAxis.Maximum = New Decimal(New Integer() {1, 0, 0, 0}) + Me.ucrNudHjustTopAxis.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudHjustTopAxis.Name = "ucrNudHjustTopAxis" + Me.ucrNudHjustTopAxis.Size = New System.Drawing.Size(50, 20) + Me.ucrNudHjustTopAxis.TabIndex = 32 + Me.ucrNudHjustTopAxis.Value = New Decimal(New Integer() {0, 0, 0, 0}) + ' + 'lblSizeTopaxis + ' + Me.lblSizeTopaxis.AutoSize = True + Me.lblSizeTopaxis.Location = New System.Drawing.Point(13, 21) + Me.lblSizeTopaxis.Name = "lblSizeTopaxis" + Me.lblSizeTopaxis.Size = New System.Drawing.Size(30, 13) + Me.lblSizeTopaxis.TabIndex = 29 + Me.lblSizeTopaxis.Text = "Size:" + ' + 'ucrNudSizeTopaxis + ' + Me.ucrNudSizeTopaxis.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudSizeTopaxis.Increment = New Decimal(New Integer() {1, 0, 0, 0}) + Me.ucrNudSizeTopaxis.Location = New System.Drawing.Point(94, 16) + Me.ucrNudSizeTopaxis.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) + Me.ucrNudSizeTopaxis.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudSizeTopaxis.Name = "ucrNudSizeTopaxis" + Me.ucrNudSizeTopaxis.Size = New System.Drawing.Size(50, 20) + Me.ucrNudSizeTopaxis.TabIndex = 30 + Me.ucrNudSizeTopaxis.Value = New Decimal(New Integer() {0, 0, 0, 0}) + ' + 'lblColourTopAxis + ' + Me.lblColourTopAxis.AutoSize = True + Me.lblColourTopAxis.Location = New System.Drawing.Point(13, 220) + Me.lblColourTopAxis.Name = "lblColourTopAxis" + Me.lblColourTopAxis.Size = New System.Drawing.Size(40, 13) + Me.lblColourTopAxis.TabIndex = 27 + Me.lblColourTopAxis.Text = "Colour:" + ' + 'ucrInputColourTopAxis + ' + Me.ucrInputColourTopAxis.AddQuotesIfUnrecognised = True + Me.ucrInputColourTopAxis.IsReadOnly = False + Me.ucrInputColourTopAxis.Location = New System.Drawing.Point(73, 217) + Me.ucrInputColourTopAxis.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) + Me.ucrInputColourTopAxis.Name = "ucrInputColourTopAxis" + Me.ucrInputColourTopAxis.Size = New System.Drawing.Size(137, 21) + Me.ucrInputColourTopAxis.TabIndex = 28 + ' + 'lblFaceTopAxis + ' + Me.lblFaceTopAxis.AutoSize = True + Me.lblFaceTopAxis.Location = New System.Drawing.Point(13, 196) + Me.lblFaceTopAxis.Name = "lblFaceTopAxis" + Me.lblFaceTopAxis.Size = New System.Drawing.Size(34, 13) + Me.lblFaceTopAxis.TabIndex = 25 + Me.lblFaceTopAxis.Text = "Face:" + ' + 'ucrInputFaceTopAxis + ' + Me.ucrInputFaceTopAxis.AddQuotesIfUnrecognised = True + Me.ucrInputFaceTopAxis.IsReadOnly = False + Me.ucrInputFaceTopAxis.Location = New System.Drawing.Point(73, 189) + Me.ucrInputFaceTopAxis.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) + Me.ucrInputFaceTopAxis.Name = "ucrInputFaceTopAxis" + Me.ucrInputFaceTopAxis.Size = New System.Drawing.Size(137, 21) + Me.ucrInputFaceTopAxis.TabIndex = 26 + ' + 'lblFamilyTopAxis + ' + Me.lblFamilyTopAxis.AutoSize = True + Me.lblFamilyTopAxis.Location = New System.Drawing.Point(13, 166) + Me.lblFamilyTopAxis.Name = "lblFamilyTopAxis" + Me.lblFamilyTopAxis.Size = New System.Drawing.Size(39, 13) + Me.lblFamilyTopAxis.TabIndex = 23 + Me.lblFamilyTopAxis.Text = "Family:" + ' + 'ucrInputFamilyTopAxis + ' + Me.ucrInputFamilyTopAxis.AddQuotesIfUnrecognised = True + Me.ucrInputFamilyTopAxis.IsReadOnly = False + Me.ucrInputFamilyTopAxis.Location = New System.Drawing.Point(73, 162) + Me.ucrInputFamilyTopAxis.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) + Me.ucrInputFamilyTopAxis.Name = "ucrInputFamilyTopAxis" + Me.ucrInputFamilyTopAxis.Size = New System.Drawing.Size(137, 21) + Me.ucrInputFamilyTopAxis.TabIndex = 24 + ' 'GroupBox1 ' Me.GroupBox1.Controls.Add(Me.lblLineEnd) @@ -138,12 +471,12 @@ Partial Class sdgThemes Me.GroupBox1.Controls.Add(Me.ucrInputColourSegment) Me.GroupBox1.Controls.Add(Me.lblLineType) Me.GroupBox1.Controls.Add(Me.ucrInputLineType) - Me.GroupBox1.Location = New System.Drawing.Point(251, 22) + Me.GroupBox1.Location = New System.Drawing.Point(15, 270) Me.GroupBox1.Name = "GroupBox1" Me.GroupBox1.Size = New System.Drawing.Size(230, 154) Me.GroupBox1.TabIndex = 39 Me.GroupBox1.TabStop = False - Me.GroupBox1.Text = "tick marks along axes" + Me.GroupBox1.Text = "Tick marks along axes" ' 'lblLineEnd ' @@ -223,30 +556,30 @@ Partial Class sdgThemes Me.ucrInputLineType.Size = New System.Drawing.Size(137, 21) Me.ucrInputLineType.TabIndex = 26 ' - 'grpThemetext - ' - Me.grpThemetext.Controls.Add(Me.lblVjust) - Me.grpThemetext.Controls.Add(Me.ucrNudVjust) - Me.grpThemetext.Controls.Add(Me.lblLineHeight) - Me.grpThemetext.Controls.Add(Me.ucrNudLineHeight) - Me.grpThemetext.Controls.Add(Me.lblAngle) - Me.grpThemetext.Controls.Add(Me.ucrNudAngle) - Me.grpThemetext.Controls.Add(Me.lblHjust) - Me.grpThemetext.Controls.Add(Me.ucrNudHjust) - Me.grpThemetext.Controls.Add(Me.lblSize) - Me.grpThemetext.Controls.Add(Me.ucrNudsize) - Me.grpThemetext.Controls.Add(Me.Label2) - Me.grpThemetext.Controls.Add(Me.ucrInputColour) - Me.grpThemetext.Controls.Add(Me.lblFace) - Me.grpThemetext.Controls.Add(Me.ucrInputFace) - Me.grpThemetext.Controls.Add(Me.lblFamily) - Me.grpThemetext.Controls.Add(Me.ucrInputFamily) - Me.grpThemetext.Location = New System.Drawing.Point(15, 19) - Me.grpThemetext.Name = "grpThemetext" - Me.grpThemetext.Size = New System.Drawing.Size(230, 245) - Me.grpThemetext.TabIndex = 23 - Me.grpThemetext.TabStop = False - Me.grpThemetext.Text = "X axis label" + 'grpAxisLabel + ' + Me.grpAxisLabel.Controls.Add(Me.lblVjust) + Me.grpAxisLabel.Controls.Add(Me.ucrNudVjust) + Me.grpAxisLabel.Controls.Add(Me.lblLineHeight) + Me.grpAxisLabel.Controls.Add(Me.ucrNudLineHeight) + Me.grpAxisLabel.Controls.Add(Me.lblAngle) + Me.grpAxisLabel.Controls.Add(Me.ucrNudAngle) + Me.grpAxisLabel.Controls.Add(Me.lblHjust) + Me.grpAxisLabel.Controls.Add(Me.ucrNudHjust) + Me.grpAxisLabel.Controls.Add(Me.lblSize) + Me.grpAxisLabel.Controls.Add(Me.ucrNudsize) + Me.grpAxisLabel.Controls.Add(Me.Label2) + Me.grpAxisLabel.Controls.Add(Me.ucrInputColour) + Me.grpAxisLabel.Controls.Add(Me.lblFace) + Me.grpAxisLabel.Controls.Add(Me.ucrInputFace) + Me.grpAxisLabel.Controls.Add(Me.lblFamily) + Me.grpAxisLabel.Controls.Add(Me.ucrInputFamily) + Me.grpAxisLabel.Location = New System.Drawing.Point(15, 19) + Me.grpAxisLabel.Name = "grpAxisLabel" + Me.grpAxisLabel.Size = New System.Drawing.Size(230, 245) + Me.grpAxisLabel.TabIndex = 23 + Me.grpAxisLabel.TabStop = False + Me.grpAxisLabel.Text = "X axis label" ' 'lblVjust ' @@ -272,7 +605,7 @@ Partial Class sdgThemes 'lblLineHeight ' Me.lblLineHeight.AutoSize = True - Me.lblLineHeight.Location = New System.Drawing.Point(13, 105) + Me.lblLineHeight.Location = New System.Drawing.Point(13, 108) Me.lblLineHeight.Name = "lblLineHeight" Me.lblLineHeight.Size = New System.Drawing.Size(64, 13) Me.lblLineHeight.TabIndex = 35 @@ -293,7 +626,7 @@ Partial Class sdgThemes 'lblAngle ' Me.lblAngle.AutoSize = True - Me.lblAngle.Location = New System.Drawing.Point(13, 133) + Me.lblAngle.Location = New System.Drawing.Point(13, 137) Me.lblAngle.Name = "lblAngle" Me.lblAngle.Size = New System.Drawing.Size(37, 13) Me.lblAngle.TabIndex = 33 @@ -412,253 +745,243 @@ Partial Class sdgThemes ' 'tbYaxis ' - Me.tbYaxis.Controls.Add(Me.GroupBox3) Me.tbYaxis.Controls.Add(Me.GroupBox2) + Me.tbYaxis.Controls.Add(Me.GroupBox3) + Me.tbYaxis.Controls.Add(Me.GroupBox4) + Me.tbYaxis.Controls.Add(Me.GroupBox5) Me.tbYaxis.Location = New System.Drawing.Point(4, 22) Me.tbYaxis.Name = "tbYaxis" Me.tbYaxis.Padding = New System.Windows.Forms.Padding(3) - Me.tbYaxis.Size = New System.Drawing.Size(498, 395) + Me.tbYaxis.Size = New System.Drawing.Size(498, 447) Me.tbYaxis.TabIndex = 1 Me.tbYaxis.Text = "Y-axis" Me.tbYaxis.UseVisualStyleBackColor = True ' + 'ucrBaseSubdialogue + ' + Me.ucrBaseSubdialogue.Location = New System.Drawing.Point(168, 487) + Me.ucrBaseSubdialogue.Name = "ucrBaseSubdialogue" + Me.ucrBaseSubdialogue.Size = New System.Drawing.Size(142, 30) + Me.ucrBaseSubdialogue.TabIndex = 0 + ' 'GroupBox2 ' Me.GroupBox2.Controls.Add(Me.Label1) - Me.GroupBox2.Controls.Add(Me.UcrNud1) + Me.GroupBox2.Controls.Add(Me.UcrInputComboBox1) Me.GroupBox2.Controls.Add(Me.Label3) - Me.GroupBox2.Controls.Add(Me.UcrNud2) + Me.GroupBox2.Controls.Add(Me.UcrNud1) Me.GroupBox2.Controls.Add(Me.Label4) - Me.GroupBox2.Controls.Add(Me.UcrNud3) - Me.GroupBox2.Controls.Add(Me.Label5) - Me.GroupBox2.Controls.Add(Me.UcrNud4) - Me.GroupBox2.Controls.Add(Me.Label6) - Me.GroupBox2.Controls.Add(Me.UcrNud5) - Me.GroupBox2.Controls.Add(Me.Label7) - Me.GroupBox2.Controls.Add(Me.UcrInputComboBox1) - Me.GroupBox2.Controls.Add(Me.Label8) Me.GroupBox2.Controls.Add(Me.UcrInputComboBox2) - Me.GroupBox2.Controls.Add(Me.Label9) + Me.GroupBox2.Controls.Add(Me.Label5) Me.GroupBox2.Controls.Add(Me.UcrInputComboBox3) - Me.GroupBox2.Location = New System.Drawing.Point(6, 6) + Me.GroupBox2.Location = New System.Drawing.Point(251, 259) Me.GroupBox2.Name = "GroupBox2" - Me.GroupBox2.Size = New System.Drawing.Size(230, 245) - Me.GroupBox2.TabIndex = 24 + Me.GroupBox2.Size = New System.Drawing.Size(230, 154) + Me.GroupBox2.TabIndex = 43 Me.GroupBox2.TabStop = False - Me.GroupBox2.Text = "Y axis label" + Me.GroupBox2.Text = "X axis tick labels" ' 'Label1 ' Me.Label1.AutoSize = True - Me.Label1.Location = New System.Drawing.Point(13, 77) + Me.Label1.Location = New System.Drawing.Point(12, 108) Me.Label1.Name = "Label1" - Me.Label1.Size = New System.Drawing.Size(33, 13) - Me.Label1.TabIndex = 37 - Me.Label1.Text = "Vjust:" + Me.Label1.Size = New System.Drawing.Size(52, 13) + Me.Label1.TabIndex = 31 + Me.Label1.Text = "Line End:" ' - 'UcrNud1 + 'UcrInputComboBox1 ' - Me.UcrNud1.DecimalPlaces = New Decimal(New Integer() {1, 0, 0, 0}) - Me.UcrNud1.Increment = New Decimal(New Integer() {1, 0, 0, 65536}) - Me.UcrNud1.Location = New System.Drawing.Point(94, 76) - Me.UcrNud1.Maximum = New Decimal(New Integer() {1, 0, 0, 0}) - Me.UcrNud1.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) - Me.UcrNud1.Name = "UcrNud1" - Me.UcrNud1.Size = New System.Drawing.Size(50, 20) - Me.UcrNud1.TabIndex = 38 - Me.UcrNud1.Value = New Decimal(New Integer() {0, 0, 0, 0}) + Me.UcrInputComboBox1.AddQuotesIfUnrecognised = True + Me.UcrInputComboBox1.IsReadOnly = False + Me.UcrInputComboBox1.Location = New System.Drawing.Point(72, 100) + Me.UcrInputComboBox1.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) + Me.UcrInputComboBox1.Name = "UcrInputComboBox1" + Me.UcrInputComboBox1.Size = New System.Drawing.Size(137, 21) + Me.UcrInputComboBox1.TabIndex = 32 ' 'Label3 ' Me.Label3.AutoSize = True - Me.Label3.Location = New System.Drawing.Point(13, 105) + Me.Label3.Location = New System.Drawing.Point(13, 22) Me.Label3.Name = "Label3" - Me.Label3.Size = New System.Drawing.Size(64, 13) - Me.Label3.TabIndex = 35 - Me.Label3.Text = "Line Height:" + Me.Label3.Size = New System.Drawing.Size(30, 13) + Me.Label3.TabIndex = 29 + Me.Label3.Text = "Size:" ' - 'UcrNud2 + 'UcrNud1 ' - Me.UcrNud2.DecimalPlaces = New Decimal(New Integer() {1, 0, 0, 0}) - Me.UcrNud2.Increment = New Decimal(New Integer() {1, 0, 0, 65536}) - Me.UcrNud2.Location = New System.Drawing.Point(94, 106) - Me.UcrNud2.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) - Me.UcrNud2.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) - Me.UcrNud2.Name = "UcrNud2" - Me.UcrNud2.Size = New System.Drawing.Size(50, 20) - Me.UcrNud2.TabIndex = 36 - Me.UcrNud2.Value = New Decimal(New Integer() {0, 0, 0, 0}) + Me.UcrNud1.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) + Me.UcrNud1.Increment = New Decimal(New Integer() {1, 0, 0, 0}) + Me.UcrNud1.Location = New System.Drawing.Point(94, 17) + Me.UcrNud1.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) + Me.UcrNud1.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) + Me.UcrNud1.Name = "UcrNud1" + Me.UcrNud1.Size = New System.Drawing.Size(50, 20) + Me.UcrNud1.TabIndex = 30 + Me.UcrNud1.Value = New Decimal(New Integer() {0, 0, 0, 0}) ' 'Label4 ' Me.Label4.AutoSize = True - Me.Label4.Location = New System.Drawing.Point(13, 133) + Me.Label4.Location = New System.Drawing.Point(12, 76) Me.Label4.Name = "Label4" - Me.Label4.Size = New System.Drawing.Size(37, 13) - Me.Label4.TabIndex = 33 - Me.Label4.Text = "Angle:" + Me.Label4.Size = New System.Drawing.Size(40, 13) + Me.Label4.TabIndex = 27 + Me.Label4.Text = "Colour:" ' - 'UcrNud3 + 'UcrInputComboBox2 ' - Me.UcrNud3.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) - Me.UcrNud3.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.UcrNud3.Location = New System.Drawing.Point(94, 136) - Me.UcrNud3.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) - Me.UcrNud3.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) - Me.UcrNud3.Name = "UcrNud3" - Me.UcrNud3.Size = New System.Drawing.Size(50, 20) - Me.UcrNud3.TabIndex = 34 - Me.UcrNud3.Value = New Decimal(New Integer() {0, 0, 0, 0}) + Me.UcrInputComboBox2.AddQuotesIfUnrecognised = True + Me.UcrInputComboBox2.IsReadOnly = False + Me.UcrInputComboBox2.Location = New System.Drawing.Point(72, 68) + Me.UcrInputComboBox2.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) + Me.UcrInputComboBox2.Name = "UcrInputComboBox2" + Me.UcrInputComboBox2.Size = New System.Drawing.Size(137, 21) + Me.UcrInputComboBox2.TabIndex = 28 ' 'Label5 ' Me.Label5.AutoSize = True - Me.Label5.Location = New System.Drawing.Point(13, 49) + Me.Label5.Location = New System.Drawing.Point(12, 47) Me.Label5.Name = "Label5" - Me.Label5.Size = New System.Drawing.Size(34, 13) - Me.Label5.TabIndex = 31 - Me.Label5.Text = "Hjust:" + Me.Label5.Size = New System.Drawing.Size(57, 13) + Me.Label5.TabIndex = 25 + Me.Label5.Text = "Line Type:" ' - 'UcrNud4 + 'UcrInputComboBox3 ' - Me.UcrNud4.DecimalPlaces = New Decimal(New Integer() {1, 0, 0, 0}) - Me.UcrNud4.Increment = New Decimal(New Integer() {1, 0, 0, 65536}) - Me.UcrNud4.Location = New System.Drawing.Point(94, 46) - Me.UcrNud4.Maximum = New Decimal(New Integer() {1, 0, 0, 0}) - Me.UcrNud4.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) - Me.UcrNud4.Name = "UcrNud4" - Me.UcrNud4.Size = New System.Drawing.Size(50, 20) - Me.UcrNud4.TabIndex = 32 - Me.UcrNud4.Value = New Decimal(New Integer() {0, 0, 0, 0}) + Me.UcrInputComboBox3.AddQuotesIfUnrecognised = True + Me.UcrInputComboBox3.IsReadOnly = False + Me.UcrInputComboBox3.Location = New System.Drawing.Point(72, 40) + Me.UcrInputComboBox3.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) + Me.UcrInputComboBox3.Name = "UcrInputComboBox3" + Me.UcrInputComboBox3.Size = New System.Drawing.Size(137, 21) + Me.UcrInputComboBox3.TabIndex = 26 + ' + 'GroupBox3 + ' + Me.GroupBox3.Controls.Add(Me.Label6) + Me.GroupBox3.Controls.Add(Me.UcrNud2) + Me.GroupBox3.Controls.Add(Me.Label7) + Me.GroupBox3.Controls.Add(Me.UcrNud3) + Me.GroupBox3.Controls.Add(Me.Label8) + Me.GroupBox3.Controls.Add(Me.UcrNud4) + Me.GroupBox3.Controls.Add(Me.Label9) + Me.GroupBox3.Controls.Add(Me.UcrNud5) + Me.GroupBox3.Controls.Add(Me.Label10) + Me.GroupBox3.Controls.Add(Me.UcrNud6) + Me.GroupBox3.Controls.Add(Me.Label11) + Me.GroupBox3.Controls.Add(Me.UcrInputComboBox4) + Me.GroupBox3.Controls.Add(Me.Label12) + Me.GroupBox3.Controls.Add(Me.UcrInputComboBox5) + Me.GroupBox3.Controls.Add(Me.Label13) + Me.GroupBox3.Controls.Add(Me.UcrInputComboBox6) + Me.GroupBox3.Location = New System.Drawing.Point(251, 5) + Me.GroupBox3.Name = "GroupBox3" + Me.GroupBox3.Size = New System.Drawing.Size(230, 245) + Me.GroupBox3.TabIndex = 44 + Me.GroupBox3.TabStop = False + Me.GroupBox3.Text = "X axis label on top axis" ' 'Label6 ' Me.Label6.AutoSize = True - Me.Label6.Location = New System.Drawing.Point(13, 21) + Me.Label6.Location = New System.Drawing.Point(13, 77) Me.Label6.Name = "Label6" - Me.Label6.Size = New System.Drawing.Size(30, 13) - Me.Label6.TabIndex = 29 - Me.Label6.Text = "Size:" + Me.Label6.Size = New System.Drawing.Size(33, 13) + Me.Label6.TabIndex = 37 + Me.Label6.Text = "Vjust:" ' - 'UcrNud5 + 'UcrNud2 ' - Me.UcrNud5.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) - Me.UcrNud5.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.UcrNud5.Location = New System.Drawing.Point(94, 16) - Me.UcrNud5.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) - Me.UcrNud5.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) - Me.UcrNud5.Name = "UcrNud5" - Me.UcrNud5.Size = New System.Drawing.Size(50, 20) - Me.UcrNud5.TabIndex = 30 - Me.UcrNud5.Value = New Decimal(New Integer() {0, 0, 0, 0}) + Me.UcrNud2.DecimalPlaces = New Decimal(New Integer() {1, 0, 0, 0}) + Me.UcrNud2.Increment = New Decimal(New Integer() {1, 0, 0, 65536}) + Me.UcrNud2.Location = New System.Drawing.Point(94, 76) + Me.UcrNud2.Maximum = New Decimal(New Integer() {1, 0, 0, 0}) + Me.UcrNud2.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) + Me.UcrNud2.Name = "UcrNud2" + Me.UcrNud2.Size = New System.Drawing.Size(50, 20) + Me.UcrNud2.TabIndex = 38 + Me.UcrNud2.Value = New Decimal(New Integer() {0, 0, 0, 0}) ' 'Label7 ' Me.Label7.AutoSize = True - Me.Label7.Location = New System.Drawing.Point(13, 220) + Me.Label7.Location = New System.Drawing.Point(13, 105) Me.Label7.Name = "Label7" - Me.Label7.Size = New System.Drawing.Size(40, 13) - Me.Label7.TabIndex = 27 - Me.Label7.Text = "Colour:" + Me.Label7.Size = New System.Drawing.Size(64, 13) + Me.Label7.TabIndex = 35 + Me.Label7.Text = "Line Height:" ' - 'UcrInputComboBox1 + 'UcrNud3 ' - Me.UcrInputComboBox1.AddQuotesIfUnrecognised = True - Me.UcrInputComboBox1.IsReadOnly = False - Me.UcrInputComboBox1.Location = New System.Drawing.Point(73, 217) - Me.UcrInputComboBox1.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) - Me.UcrInputComboBox1.Name = "UcrInputComboBox1" - Me.UcrInputComboBox1.Size = New System.Drawing.Size(137, 21) - Me.UcrInputComboBox1.TabIndex = 28 + Me.UcrNud3.DecimalPlaces = New Decimal(New Integer() {1, 0, 0, 0}) + Me.UcrNud3.Increment = New Decimal(New Integer() {1, 0, 0, 65536}) + Me.UcrNud3.Location = New System.Drawing.Point(94, 106) + Me.UcrNud3.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) + Me.UcrNud3.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) + Me.UcrNud3.Name = "UcrNud3" + Me.UcrNud3.Size = New System.Drawing.Size(50, 20) + Me.UcrNud3.TabIndex = 36 + Me.UcrNud3.Value = New Decimal(New Integer() {0, 0, 0, 0}) ' 'Label8 ' Me.Label8.AutoSize = True - Me.Label8.Location = New System.Drawing.Point(13, 196) + Me.Label8.Location = New System.Drawing.Point(13, 133) Me.Label8.Name = "Label8" - Me.Label8.Size = New System.Drawing.Size(34, 13) - Me.Label8.TabIndex = 25 - Me.Label8.Text = "Face:" + Me.Label8.Size = New System.Drawing.Size(37, 13) + Me.Label8.TabIndex = 33 + Me.Label8.Text = "Angle:" ' - 'UcrInputComboBox2 + 'UcrNud4 ' - Me.UcrInputComboBox2.AddQuotesIfUnrecognised = True - Me.UcrInputComboBox2.IsReadOnly = False - Me.UcrInputComboBox2.Location = New System.Drawing.Point(73, 189) - Me.UcrInputComboBox2.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) - Me.UcrInputComboBox2.Name = "UcrInputComboBox2" - Me.UcrInputComboBox2.Size = New System.Drawing.Size(137, 21) - Me.UcrInputComboBox2.TabIndex = 26 + Me.UcrNud4.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) + Me.UcrNud4.Increment = New Decimal(New Integer() {1, 0, 0, 0}) + Me.UcrNud4.Location = New System.Drawing.Point(94, 134) + Me.UcrNud4.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) + Me.UcrNud4.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) + Me.UcrNud4.Name = "UcrNud4" + Me.UcrNud4.Size = New System.Drawing.Size(50, 20) + Me.UcrNud4.TabIndex = 34 + Me.UcrNud4.Value = New Decimal(New Integer() {0, 0, 0, 0}) ' 'Label9 ' Me.Label9.AutoSize = True - Me.Label9.Location = New System.Drawing.Point(13, 166) + Me.Label9.Location = New System.Drawing.Point(13, 49) Me.Label9.Name = "Label9" - Me.Label9.Size = New System.Drawing.Size(39, 13) - Me.Label9.TabIndex = 23 - Me.Label9.Text = "Family:" - ' - 'UcrInputComboBox3 - ' - Me.UcrInputComboBox3.AddQuotesIfUnrecognised = True - Me.UcrInputComboBox3.IsReadOnly = False - Me.UcrInputComboBox3.Location = New System.Drawing.Point(73, 162) - Me.UcrInputComboBox3.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) - Me.UcrInputComboBox3.Name = "UcrInputComboBox3" - Me.UcrInputComboBox3.Size = New System.Drawing.Size(137, 21) - Me.UcrInputComboBox3.TabIndex = 24 + Me.Label9.Size = New System.Drawing.Size(34, 13) + Me.Label9.TabIndex = 31 + Me.Label9.Text = "Hjust:" ' - 'GroupBox3 + 'UcrNud5 ' - Me.GroupBox3.Controls.Add(Me.Label10) - Me.GroupBox3.Controls.Add(Me.UcrInputComboBox4) - Me.GroupBox3.Controls.Add(Me.Label11) - Me.GroupBox3.Controls.Add(Me.UcrNud6) - Me.GroupBox3.Controls.Add(Me.Label12) - Me.GroupBox3.Controls.Add(Me.UcrInputComboBox5) - Me.GroupBox3.Controls.Add(Me.Label13) - Me.GroupBox3.Controls.Add(Me.UcrInputComboBox6) - Me.GroupBox3.Location = New System.Drawing.Point(252, 8) - Me.GroupBox3.Name = "GroupBox3" - Me.GroupBox3.Size = New System.Drawing.Size(230, 154) - Me.GroupBox3.TabIndex = 40 - Me.GroupBox3.TabStop = False - Me.GroupBox3.Text = "tick marks along axes" + Me.UcrNud5.DecimalPlaces = New Decimal(New Integer() {1, 0, 0, 0}) + Me.UcrNud5.Increment = New Decimal(New Integer() {1, 0, 0, 65536}) + Me.UcrNud5.Location = New System.Drawing.Point(94, 46) + Me.UcrNud5.Maximum = New Decimal(New Integer() {1, 0, 0, 0}) + Me.UcrNud5.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) + Me.UcrNud5.Name = "UcrNud5" + Me.UcrNud5.Size = New System.Drawing.Size(50, 20) + Me.UcrNud5.TabIndex = 32 + Me.UcrNud5.Value = New Decimal(New Integer() {0, 0, 0, 0}) ' 'Label10 ' Me.Label10.AutoSize = True - Me.Label10.Location = New System.Drawing.Point(12, 108) + Me.Label10.Location = New System.Drawing.Point(13, 21) Me.Label10.Name = "Label10" - Me.Label10.Size = New System.Drawing.Size(52, 13) - Me.Label10.TabIndex = 31 - Me.Label10.Text = "Line End:" - ' - 'UcrInputComboBox4 - ' - Me.UcrInputComboBox4.AddQuotesIfUnrecognised = True - Me.UcrInputComboBox4.IsReadOnly = False - Me.UcrInputComboBox4.Location = New System.Drawing.Point(72, 100) - Me.UcrInputComboBox4.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) - Me.UcrInputComboBox4.Name = "UcrInputComboBox4" - Me.UcrInputComboBox4.Size = New System.Drawing.Size(137, 21) - Me.UcrInputComboBox4.TabIndex = 32 - ' - 'Label11 - ' - Me.Label11.AutoSize = True - Me.Label11.Location = New System.Drawing.Point(13, 22) - Me.Label11.Name = "Label11" - Me.Label11.Size = New System.Drawing.Size(30, 13) - Me.Label11.TabIndex = 29 - Me.Label11.Text = "Size:" + Me.Label10.Size = New System.Drawing.Size(30, 13) + Me.Label10.TabIndex = 29 + Me.Label10.Text = "Size:" ' 'UcrNud6 ' Me.UcrNud6.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) Me.UcrNud6.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.UcrNud6.Location = New System.Drawing.Point(94, 17) + Me.UcrNud6.Location = New System.Drawing.Point(94, 16) Me.UcrNud6.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) Me.UcrNud6.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) Me.UcrNud6.Name = "UcrNud6" @@ -666,49 +989,350 @@ Partial Class sdgThemes Me.UcrNud6.TabIndex = 30 Me.UcrNud6.Value = New Decimal(New Integer() {0, 0, 0, 0}) ' + 'Label11 + ' + Me.Label11.AutoSize = True + Me.Label11.Location = New System.Drawing.Point(13, 220) + Me.Label11.Name = "Label11" + Me.Label11.Size = New System.Drawing.Size(40, 13) + Me.Label11.TabIndex = 27 + Me.Label11.Text = "Colour:" + ' + 'UcrInputComboBox4 + ' + Me.UcrInputComboBox4.AddQuotesIfUnrecognised = True + Me.UcrInputComboBox4.IsReadOnly = False + Me.UcrInputComboBox4.Location = New System.Drawing.Point(73, 217) + Me.UcrInputComboBox4.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) + Me.UcrInputComboBox4.Name = "UcrInputComboBox4" + Me.UcrInputComboBox4.Size = New System.Drawing.Size(137, 21) + Me.UcrInputComboBox4.TabIndex = 28 + ' 'Label12 ' Me.Label12.AutoSize = True - Me.Label12.Location = New System.Drawing.Point(12, 76) + Me.Label12.Location = New System.Drawing.Point(13, 196) Me.Label12.Name = "Label12" - Me.Label12.Size = New System.Drawing.Size(40, 13) - Me.Label12.TabIndex = 27 - Me.Label12.Text = "Colour:" + Me.Label12.Size = New System.Drawing.Size(34, 13) + Me.Label12.TabIndex = 25 + Me.Label12.Text = "Face:" ' 'UcrInputComboBox5 ' Me.UcrInputComboBox5.AddQuotesIfUnrecognised = True Me.UcrInputComboBox5.IsReadOnly = False - Me.UcrInputComboBox5.Location = New System.Drawing.Point(72, 68) + Me.UcrInputComboBox5.Location = New System.Drawing.Point(73, 189) Me.UcrInputComboBox5.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) Me.UcrInputComboBox5.Name = "UcrInputComboBox5" Me.UcrInputComboBox5.Size = New System.Drawing.Size(137, 21) - Me.UcrInputComboBox5.TabIndex = 28 + Me.UcrInputComboBox5.TabIndex = 26 ' 'Label13 ' Me.Label13.AutoSize = True - Me.Label13.Location = New System.Drawing.Point(12, 47) + Me.Label13.Location = New System.Drawing.Point(13, 166) Me.Label13.Name = "Label13" - Me.Label13.Size = New System.Drawing.Size(57, 13) - Me.Label13.TabIndex = 25 - Me.Label13.Text = "Line Type:" + Me.Label13.Size = New System.Drawing.Size(39, 13) + Me.Label13.TabIndex = 23 + Me.Label13.Text = "Family:" ' 'UcrInputComboBox6 ' Me.UcrInputComboBox6.AddQuotesIfUnrecognised = True Me.UcrInputComboBox6.IsReadOnly = False - Me.UcrInputComboBox6.Location = New System.Drawing.Point(72, 40) + Me.UcrInputComboBox6.Location = New System.Drawing.Point(73, 162) Me.UcrInputComboBox6.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) Me.UcrInputComboBox6.Name = "UcrInputComboBox6" Me.UcrInputComboBox6.Size = New System.Drawing.Size(137, 21) - Me.UcrInputComboBox6.TabIndex = 26 + Me.UcrInputComboBox6.TabIndex = 24 + ' + 'GroupBox4 + ' + Me.GroupBox4.Controls.Add(Me.Label14) + Me.GroupBox4.Controls.Add(Me.UcrInputComboBox7) + Me.GroupBox4.Controls.Add(Me.Label15) + Me.GroupBox4.Controls.Add(Me.UcrNud7) + Me.GroupBox4.Controls.Add(Me.Label16) + Me.GroupBox4.Controls.Add(Me.UcrInputComboBox8) + Me.GroupBox4.Controls.Add(Me.Label17) + Me.GroupBox4.Controls.Add(Me.UcrInputComboBox9) + Me.GroupBox4.Location = New System.Drawing.Point(6, 256) + Me.GroupBox4.Name = "GroupBox4" + Me.GroupBox4.Size = New System.Drawing.Size(230, 154) + Me.GroupBox4.TabIndex = 42 + Me.GroupBox4.TabStop = False + Me.GroupBox4.Text = "Tick marks along axes" + ' + 'Label14 + ' + Me.Label14.AutoSize = True + Me.Label14.Location = New System.Drawing.Point(12, 108) + Me.Label14.Name = "Label14" + Me.Label14.Size = New System.Drawing.Size(52, 13) + Me.Label14.TabIndex = 31 + Me.Label14.Text = "Line End:" + ' + 'UcrInputComboBox7 + ' + Me.UcrInputComboBox7.AddQuotesIfUnrecognised = True + Me.UcrInputComboBox7.IsReadOnly = False + Me.UcrInputComboBox7.Location = New System.Drawing.Point(72, 100) + Me.UcrInputComboBox7.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) + Me.UcrInputComboBox7.Name = "UcrInputComboBox7" + Me.UcrInputComboBox7.Size = New System.Drawing.Size(137, 21) + Me.UcrInputComboBox7.TabIndex = 32 + ' + 'Label15 + ' + Me.Label15.AutoSize = True + Me.Label15.Location = New System.Drawing.Point(13, 22) + Me.Label15.Name = "Label15" + Me.Label15.Size = New System.Drawing.Size(30, 13) + Me.Label15.TabIndex = 29 + Me.Label15.Text = "Size:" + ' + 'UcrNud7 + ' + Me.UcrNud7.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) + Me.UcrNud7.Increment = New Decimal(New Integer() {1, 0, 0, 0}) + Me.UcrNud7.Location = New System.Drawing.Point(94, 17) + Me.UcrNud7.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) + Me.UcrNud7.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) + Me.UcrNud7.Name = "UcrNud7" + Me.UcrNud7.Size = New System.Drawing.Size(50, 20) + Me.UcrNud7.TabIndex = 30 + Me.UcrNud7.Value = New Decimal(New Integer() {0, 0, 0, 0}) + ' + 'Label16 + ' + Me.Label16.AutoSize = True + Me.Label16.Location = New System.Drawing.Point(12, 76) + Me.Label16.Name = "Label16" + Me.Label16.Size = New System.Drawing.Size(40, 13) + Me.Label16.TabIndex = 27 + Me.Label16.Text = "Colour:" + ' + 'UcrInputComboBox8 + ' + Me.UcrInputComboBox8.AddQuotesIfUnrecognised = True + Me.UcrInputComboBox8.IsReadOnly = False + Me.UcrInputComboBox8.Location = New System.Drawing.Point(72, 68) + Me.UcrInputComboBox8.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) + Me.UcrInputComboBox8.Name = "UcrInputComboBox8" + Me.UcrInputComboBox8.Size = New System.Drawing.Size(137, 21) + Me.UcrInputComboBox8.TabIndex = 28 + ' + 'Label17 + ' + Me.Label17.AutoSize = True + Me.Label17.Location = New System.Drawing.Point(12, 47) + Me.Label17.Name = "Label17" + Me.Label17.Size = New System.Drawing.Size(57, 13) + Me.Label17.TabIndex = 25 + Me.Label17.Text = "Line Type:" + ' + 'UcrInputComboBox9 + ' + Me.UcrInputComboBox9.AddQuotesIfUnrecognised = True + Me.UcrInputComboBox9.IsReadOnly = False + Me.UcrInputComboBox9.Location = New System.Drawing.Point(72, 40) + Me.UcrInputComboBox9.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) + Me.UcrInputComboBox9.Name = "UcrInputComboBox9" + Me.UcrInputComboBox9.Size = New System.Drawing.Size(137, 21) + Me.UcrInputComboBox9.TabIndex = 26 + ' + 'GroupBox5 + ' + Me.GroupBox5.Controls.Add(Me.Label18) + Me.GroupBox5.Controls.Add(Me.UcrNud8) + Me.GroupBox5.Controls.Add(Me.Label19) + Me.GroupBox5.Controls.Add(Me.UcrNud9) + Me.GroupBox5.Controls.Add(Me.Label20) + Me.GroupBox5.Controls.Add(Me.UcrNud10) + Me.GroupBox5.Controls.Add(Me.Label21) + Me.GroupBox5.Controls.Add(Me.UcrNud11) + Me.GroupBox5.Controls.Add(Me.Label22) + Me.GroupBox5.Controls.Add(Me.UcrNud12) + Me.GroupBox5.Controls.Add(Me.Label23) + Me.GroupBox5.Controls.Add(Me.UcrInputComboBox10) + Me.GroupBox5.Controls.Add(Me.Label24) + Me.GroupBox5.Controls.Add(Me.UcrInputComboBox11) + Me.GroupBox5.Controls.Add(Me.Label25) + Me.GroupBox5.Controls.Add(Me.UcrInputComboBox12) + Me.GroupBox5.Location = New System.Drawing.Point(6, 5) + Me.GroupBox5.Name = "GroupBox5" + Me.GroupBox5.Size = New System.Drawing.Size(230, 245) + Me.GroupBox5.TabIndex = 41 + Me.GroupBox5.TabStop = False + Me.GroupBox5.Text = "Y axis label" + ' + 'Label18 + ' + Me.Label18.AutoSize = True + Me.Label18.Location = New System.Drawing.Point(13, 77) + Me.Label18.Name = "Label18" + Me.Label18.Size = New System.Drawing.Size(33, 13) + Me.Label18.TabIndex = 37 + Me.Label18.Text = "Vjust:" + ' + 'UcrNud8 + ' + Me.UcrNud8.DecimalPlaces = New Decimal(New Integer() {1, 0, 0, 0}) + Me.UcrNud8.Increment = New Decimal(New Integer() {1, 0, 0, 65536}) + Me.UcrNud8.Location = New System.Drawing.Point(94, 76) + Me.UcrNud8.Maximum = New Decimal(New Integer() {1, 0, 0, 0}) + Me.UcrNud8.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) + Me.UcrNud8.Name = "UcrNud8" + Me.UcrNud8.Size = New System.Drawing.Size(50, 20) + Me.UcrNud8.TabIndex = 38 + Me.UcrNud8.Value = New Decimal(New Integer() {0, 0, 0, 0}) + ' + 'Label19 + ' + Me.Label19.AutoSize = True + Me.Label19.Location = New System.Drawing.Point(13, 108) + Me.Label19.Name = "Label19" + Me.Label19.Size = New System.Drawing.Size(64, 13) + Me.Label19.TabIndex = 35 + Me.Label19.Text = "Line Height:" + ' + 'UcrNud9 + ' + Me.UcrNud9.DecimalPlaces = New Decimal(New Integer() {1, 0, 0, 0}) + Me.UcrNud9.Increment = New Decimal(New Integer() {1, 0, 0, 65536}) + Me.UcrNud9.Location = New System.Drawing.Point(94, 106) + Me.UcrNud9.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) + Me.UcrNud9.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) + Me.UcrNud9.Name = "UcrNud9" + Me.UcrNud9.Size = New System.Drawing.Size(50, 20) + Me.UcrNud9.TabIndex = 36 + Me.UcrNud9.Value = New Decimal(New Integer() {0, 0, 0, 0}) + ' + 'Label20 + ' + Me.Label20.AutoSize = True + Me.Label20.Location = New System.Drawing.Point(13, 137) + Me.Label20.Name = "Label20" + Me.Label20.Size = New System.Drawing.Size(37, 13) + Me.Label20.TabIndex = 33 + Me.Label20.Text = "Angle:" + ' + 'UcrNud10 + ' + Me.UcrNud10.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) + Me.UcrNud10.Increment = New Decimal(New Integer() {1, 0, 0, 0}) + Me.UcrNud10.Location = New System.Drawing.Point(94, 136) + Me.UcrNud10.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) + Me.UcrNud10.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) + Me.UcrNud10.Name = "UcrNud10" + Me.UcrNud10.Size = New System.Drawing.Size(50, 20) + Me.UcrNud10.TabIndex = 34 + Me.UcrNud10.Value = New Decimal(New Integer() {0, 0, 0, 0}) + ' + 'Label21 + ' + Me.Label21.AutoSize = True + Me.Label21.Location = New System.Drawing.Point(13, 49) + Me.Label21.Name = "Label21" + Me.Label21.Size = New System.Drawing.Size(34, 13) + Me.Label21.TabIndex = 31 + Me.Label21.Text = "Hjust:" + ' + 'UcrNud11 + ' + Me.UcrNud11.DecimalPlaces = New Decimal(New Integer() {1, 0, 0, 0}) + Me.UcrNud11.Increment = New Decimal(New Integer() {1, 0, 0, 65536}) + Me.UcrNud11.Location = New System.Drawing.Point(94, 46) + Me.UcrNud11.Maximum = New Decimal(New Integer() {1, 0, 0, 0}) + Me.UcrNud11.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) + Me.UcrNud11.Name = "UcrNud11" + Me.UcrNud11.Size = New System.Drawing.Size(50, 20) + Me.UcrNud11.TabIndex = 32 + Me.UcrNud11.Value = New Decimal(New Integer() {0, 0, 0, 0}) + ' + 'Label22 + ' + Me.Label22.AutoSize = True + Me.Label22.Location = New System.Drawing.Point(13, 21) + Me.Label22.Name = "Label22" + Me.Label22.Size = New System.Drawing.Size(30, 13) + Me.Label22.TabIndex = 29 + Me.Label22.Text = "Size:" + ' + 'UcrNud12 + ' + Me.UcrNud12.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) + Me.UcrNud12.Increment = New Decimal(New Integer() {1, 0, 0, 0}) + Me.UcrNud12.Location = New System.Drawing.Point(94, 16) + Me.UcrNud12.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) + Me.UcrNud12.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) + Me.UcrNud12.Name = "UcrNud12" + Me.UcrNud12.Size = New System.Drawing.Size(50, 20) + Me.UcrNud12.TabIndex = 30 + Me.UcrNud12.Value = New Decimal(New Integer() {0, 0, 0, 0}) + ' + 'Label23 + ' + Me.Label23.AutoSize = True + Me.Label23.Location = New System.Drawing.Point(13, 220) + Me.Label23.Name = "Label23" + Me.Label23.Size = New System.Drawing.Size(40, 13) + Me.Label23.TabIndex = 27 + Me.Label23.Text = "Colour:" + ' + 'UcrInputComboBox10 + ' + Me.UcrInputComboBox10.AddQuotesIfUnrecognised = True + Me.UcrInputComboBox10.IsReadOnly = False + Me.UcrInputComboBox10.Location = New System.Drawing.Point(73, 217) + Me.UcrInputComboBox10.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) + Me.UcrInputComboBox10.Name = "UcrInputComboBox10" + Me.UcrInputComboBox10.Size = New System.Drawing.Size(137, 21) + Me.UcrInputComboBox10.TabIndex = 28 + ' + 'Label24 + ' + Me.Label24.AutoSize = True + Me.Label24.Location = New System.Drawing.Point(13, 196) + Me.Label24.Name = "Label24" + Me.Label24.Size = New System.Drawing.Size(34, 13) + Me.Label24.TabIndex = 25 + Me.Label24.Text = "Face:" + ' + 'UcrInputComboBox11 + ' + Me.UcrInputComboBox11.AddQuotesIfUnrecognised = True + Me.UcrInputComboBox11.IsReadOnly = False + Me.UcrInputComboBox11.Location = New System.Drawing.Point(73, 189) + Me.UcrInputComboBox11.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) + Me.UcrInputComboBox11.Name = "UcrInputComboBox11" + Me.UcrInputComboBox11.Size = New System.Drawing.Size(137, 21) + Me.UcrInputComboBox11.TabIndex = 26 + ' + 'Label25 + ' + Me.Label25.AutoSize = True + Me.Label25.Location = New System.Drawing.Point(13, 166) + Me.Label25.Name = "Label25" + Me.Label25.Size = New System.Drawing.Size(39, 13) + Me.Label25.TabIndex = 23 + Me.Label25.Text = "Family:" + ' + 'UcrInputComboBox12 + ' + Me.UcrInputComboBox12.AddQuotesIfUnrecognised = True + Me.UcrInputComboBox12.IsReadOnly = False + Me.UcrInputComboBox12.Location = New System.Drawing.Point(73, 162) + Me.UcrInputComboBox12.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) + Me.UcrInputComboBox12.Name = "UcrInputComboBox12" + Me.UcrInputComboBox12.Size = New System.Drawing.Size(137, 21) + Me.UcrInputComboBox12.TabIndex = 24 ' 'sdgThemes ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(520, 472) + Me.ClientSize = New System.Drawing.Size(520, 546) Me.Controls.Add(Me.tbXaxis) Me.Controls.Add(Me.ucrBaseSubdialogue) Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog @@ -720,15 +1344,23 @@ Partial Class sdgThemes Me.tbXaxis.ResumeLayout(False) Me.tbAxis.ResumeLayout(False) Me.grpTableOptions.ResumeLayout(False) + Me.grpTickLabels.ResumeLayout(False) + Me.grpTickLabels.PerformLayout() + Me.grpAxisLabelTopAxis.ResumeLayout(False) + Me.grpAxisLabelTopAxis.PerformLayout() Me.GroupBox1.ResumeLayout(False) Me.GroupBox1.PerformLayout() - Me.grpThemetext.ResumeLayout(False) - Me.grpThemetext.PerformLayout() + Me.grpAxisLabel.ResumeLayout(False) + Me.grpAxisLabel.PerformLayout() Me.tbYaxis.ResumeLayout(False) Me.GroupBox2.ResumeLayout(False) Me.GroupBox2.PerformLayout() Me.GroupBox3.ResumeLayout(False) Me.GroupBox3.PerformLayout() + Me.GroupBox4.ResumeLayout(False) + Me.GroupBox4.PerformLayout() + Me.GroupBox5.ResumeLayout(False) + Me.GroupBox5.PerformLayout() Me.ResumeLayout(False) End Sub @@ -745,7 +1377,7 @@ Partial Class sdgThemes Friend WithEvents ucrInputColourSegment As ucrInputComboBox Friend WithEvents lblLineType As Label Friend WithEvents ucrInputLineType As ucrInputComboBox - Friend WithEvents grpThemetext As GroupBox + Friend WithEvents grpAxisLabel As GroupBox Friend WithEvents lblVjust As Label Friend WithEvents ucrNudVjust As ucrNud Friend WithEvents lblLineHeight As Label @@ -764,30 +1396,82 @@ Partial Class sdgThemes Friend WithEvents ucrInputFamily As ucrInputComboBox Friend WithEvents lblLineEnd As Label Friend WithEvents ucrInputLineEnd As ucrInputComboBox + Friend WithEvents grpAxisLabelTopAxis As GroupBox + Friend WithEvents lblVjustTopAxis As Label + Friend WithEvents ucrNudVjustTopAxis As ucrNud + Friend WithEvents lblLineHeightTopAxis As Label + Friend WithEvents ucrNudLineHeightTopAxis As ucrNud + Friend WithEvents lblAngleTop As Label + Friend WithEvents ucrNudAngleTopAxis As ucrNud + Friend WithEvents lblHjustTopAxis As Label + Friend WithEvents ucrNudHjustTopAxis As ucrNud + Friend WithEvents lblSizeTopaxis As Label + Friend WithEvents ucrNudSizeTopaxis As ucrNud + Friend WithEvents lblColourTopAxis As Label + Friend WithEvents ucrInputColourTopAxis As ucrInputComboBox + Friend WithEvents lblFaceTopAxis As Label + Friend WithEvents ucrInputFaceTopAxis As ucrInputComboBox + Friend WithEvents lblFamilyTopAxis As Label + Friend WithEvents ucrInputFamilyTopAxis As ucrInputComboBox + Friend WithEvents grpTickLabels As GroupBox + Friend WithEvents lblLineEndXtickMarks As Label + Friend WithEvents ucrInputLineEndXTickMarks As ucrInputComboBox + Friend WithEvents lblSizeXTickMarks As Label + Friend WithEvents ucrNudSizeXTickMarks As ucrNud + Friend WithEvents lblColourXTickMarks As Label + Friend WithEvents ucrInputColourXTickMarks As ucrInputComboBox + Friend WithEvents lbllineTypeXTickMarks As Label + Friend WithEvents ucrInputLineTypeXTickMarks As ucrInputComboBox Friend WithEvents GroupBox2 As GroupBox Friend WithEvents Label1 As Label - Friend WithEvents UcrNud1 As ucrNud + Friend WithEvents UcrInputComboBox1 As ucrInputComboBox Friend WithEvents Label3 As Label - Friend WithEvents UcrNud2 As ucrNud + Friend WithEvents UcrNud1 As ucrNud Friend WithEvents Label4 As Label - Friend WithEvents UcrNud3 As ucrNud + Friend WithEvents UcrInputComboBox2 As ucrInputComboBox Friend WithEvents Label5 As Label - Friend WithEvents UcrNud4 As ucrNud + Friend WithEvents UcrInputComboBox3 As ucrInputComboBox + Friend WithEvents GroupBox3 As GroupBox Friend WithEvents Label6 As Label - Friend WithEvents UcrNud5 As ucrNud + Friend WithEvents UcrNud2 As ucrNud Friend WithEvents Label7 As Label - Friend WithEvents UcrInputComboBox1 As ucrInputComboBox + Friend WithEvents UcrNud3 As ucrNud Friend WithEvents Label8 As Label - Friend WithEvents UcrInputComboBox2 As ucrInputComboBox + Friend WithEvents UcrNud4 As ucrNud Friend WithEvents Label9 As Label - Friend WithEvents UcrInputComboBox3 As ucrInputComboBox - Friend WithEvents GroupBox3 As GroupBox + Friend WithEvents UcrNud5 As ucrNud Friend WithEvents Label10 As Label - Friend WithEvents UcrInputComboBox4 As ucrInputComboBox - Friend WithEvents Label11 As Label Friend WithEvents UcrNud6 As ucrNud + Friend WithEvents Label11 As Label + Friend WithEvents UcrInputComboBox4 As ucrInputComboBox Friend WithEvents Label12 As Label Friend WithEvents UcrInputComboBox5 As ucrInputComboBox Friend WithEvents Label13 As Label Friend WithEvents UcrInputComboBox6 As ucrInputComboBox + Friend WithEvents GroupBox4 As GroupBox + Friend WithEvents Label14 As Label + Friend WithEvents UcrInputComboBox7 As ucrInputComboBox + Friend WithEvents Label15 As Label + Friend WithEvents UcrNud7 As ucrNud + Friend WithEvents Label16 As Label + Friend WithEvents UcrInputComboBox8 As ucrInputComboBox + Friend WithEvents Label17 As Label + Friend WithEvents UcrInputComboBox9 As ucrInputComboBox + Friend WithEvents GroupBox5 As GroupBox + Friend WithEvents Label18 As Label + Friend WithEvents UcrNud8 As ucrNud + Friend WithEvents Label19 As Label + Friend WithEvents UcrNud9 As ucrNud + Friend WithEvents Label20 As Label + Friend WithEvents UcrNud10 As ucrNud + Friend WithEvents Label21 As Label + Friend WithEvents UcrNud11 As ucrNud + Friend WithEvents Label22 As Label + Friend WithEvents UcrNud12 As ucrNud + Friend WithEvents Label23 As Label + Friend WithEvents UcrInputComboBox10 As ucrInputComboBox + Friend WithEvents Label24 As Label + Friend WithEvents UcrInputComboBox11 As ucrInputComboBox + Friend WithEvents Label25 As Label + Friend WithEvents UcrInputComboBox12 As ucrInputComboBox End Class diff --git a/instat/sdgThemes.vb b/instat/sdgThemes.vb index e6d156ac556..9984a0dbda7 100644 --- a/instat/sdgThemes.vb +++ b/instat/sdgThemes.vb @@ -17,26 +17,27 @@ Imports instat.Translations Public Class sdgThemes Public bControlsInitialised As Boolean = False - Public clsTextTheme, clsSegmentTheme, clsGgThemes As New RFunction + Public clsElementText, clsElementLine, clsGgThemes As New RFunction Private clsBaseOperator As New ROperator Private Sub sdgThemes_Load(sender As Object, e As EventArgs) Handles MyBase.Load autoTranslate(Me) End Sub - Private Sub lblHjust_Click(sender As Object, e As EventArgs) Handles lblHjust.Click - - End Sub - - Public Sub InitialiseControls() Dim dctucrInputColour As New Dictionary(Of String, String) + Dim dctucrInputColourTopAxis As New Dictionary(Of String, String) Dim dctucrInputColourSegment As New Dictionary(Of String, String) Dim dctucrInputFace As New Dictionary(Of String, String) + Dim dctucrInputFaceTopAxis As New Dictionary(Of String, String) Dim dctucrInputFamily As New Dictionary(Of String, String) + Dim dctucrInputFamilyTopAxis As New Dictionary(Of String, String) Dim dctucrInputLineType As New Dictionary(Of String, String) + Dim dctucrInputLineTypeXTickMarks As New Dictionary(Of String, String) + Dim dctucrInputColourXTickMarkst As New Dictionary(Of String, String) Dim dctucrInputLineEnd As New Dictionary(Of String, String) + Dim dctucrInputLineEndXTickMarks As New Dictionary(Of String, String) - 'Text Theme + 'X axis Label ucrNudsize.SetParameter(New RParameter("size")) ucrNudAngle.SetParameter(New RParameter("angle")) ucrNudAngle.SetMinMax(0, 360) @@ -47,7 +48,6 @@ Public Class sdgThemes ucrNudVjust.Increment = 0.1 ucrNudVjust.SetMinMax(0, 1) ucrNudLineHeight.SetParameter(New RParameter("lineheight")) - ucrInputColour.SetParameter(New RParameter("colour")) ucrInputFace.SetParameter(New RParameter("face")) ucrInputFamily.SetParameter(New RParameter("family")) @@ -92,7 +92,7 @@ Public Class sdgThemes ucrInputFamily.SetRDefault(Chr(34) & "Times" & Chr(34)) ucrInputFamily.bUpdateRCodeFromControl = False - 'Segment Theme + 'Tick Marks Along Axes ucrNudSizeSegment.SetParameter(New RParameter("size")) ucrInputLineType.SetParameter(New RParameter("linetype")) @@ -130,6 +130,99 @@ Public Class sdgThemes ucrInputLineEnd.SetRDefault(Chr(34) & "NULL" & Chr(34)) ucrInputLineEnd.bUpdateRCodeFromControl = False + 'X axis Label Top Axis + ucrNudSizeTopaxis.SetParameter(New RParameter("size")) + ucrNudAngleTopAxis.SetParameter(New RParameter("angle")) + ucrNudAngleTopAxis.SetMinMax(0, 360) + ucrNudHjustTopAxis.SetParameter(New RParameter("hjust")) + ucrNudHjustTopAxis.Increment = 0.1 + ucrNudHjustTopAxis.SetMinMax(0, 1) + ucrNudVjustTopAxis.SetParameter(New RParameter("vjust")) + ucrNudVjustTopAxis.Increment = 0.1 + ucrNudVjustTopAxis.SetMinMax(0, 1) + ucrNudLineHeightTopAxis.SetParameter(New RParameter("lineheight")) + + ucrInputFaceTopAxis.SetParameter(New RParameter("face")) + dctucrInputFaceTopAxis.Add("Plain", Chr(34) & "plain" & Chr(34)) + dctucrInputFaceTopAxis.Add("Bold", Chr(34) & "bold" & Chr(34)) + dctucrInputFaceTopAxis.Add("Italic", Chr(34) & "italic" & Chr(34)) + dctucrInputFaceTopAxis.Add("Bold italic", Chr(34) & "bold.italic" & Chr(34)) + ucrInputFaceTopAxis.SetItems(dctucrInputFaceTopAxis) + ucrInputFaceTopAxis.SetRDefault(Chr(34) & "plain" & Chr(34)) + + ucrInputColourTopAxis.SetParameter(New RParameter("colour")) + dctucrInputColourTopAxis.Add("Black", Chr(34) & "black" & Chr(34)) + dctucrInputColourTopAxis.Add("Red", Chr(34) & "red" & Chr(34)) + dctucrInputColourTopAxis.Add("Blue", Chr(34) & "blue" & Chr(34)) + dctucrInputColourTopAxis.Add("Grey", Chr(34) & "grey" & Chr(34)) + dctucrInputColourTopAxis.Add("Yellow", Chr(34) & "yellow" & Chr(34)) + dctucrInputColourTopAxis.Add("Yellow-Green", Chr(34) & "yellowgreen" & Chr(34)) + ucrInputColourTopAxis.SetItems(dctucrInputColourTopAxis) + ucrInputColourTopAxis.SetRDefault(Chr(34) & "black" & Chr(34)) + ucrInputColourTopAxis.bUpdateRCodeFromControl = False + + ucrInputFamilyTopAxis.SetParameter(New RParameter("family")) + dctucrInputFamilyTopAxis.Add("Times Roman", Chr(34) & "Times" & Chr(34)) + dctucrInputFamilyTopAxis.Add("Courier", Chr(34) & "Courier" & Chr(34)) + dctucrInputFamilyTopAxis.Add("Couriersans", Chr(34) & "Couriersans" & Chr(34)) + dctucrInputFamilyTopAxis.Add("Serif", Chr(34) & "serif" & Chr(34)) + dctucrInputFamilyTopAxis.Add("NimbusSanCond", Chr(34) & "NimbusSanCond" & Chr(34)) + dctucrInputFamilyTopAxis.Add("CenturySch", Chr(34) & "CenturySch" & Chr(34)) + dctucrInputFamilyTopAxis.Add("NewCenturySchoolbook", Chr(34) & "NewCenturySchoolbook" & Chr(34)) + dctucrInputFamilyTopAxis.Add("Palatino", Chr(34) & "Palatino" & Chr(34)) + dctucrInputFamilyTopAxis.Add("Bookman", Chr(34) & "Bookman" & Chr(34)) + dctucrInputFamilyTopAxis.Add("URWBookman", Chr(34) & "URWBookman" & Chr(34)) + dctucrInputFamilyTopAxis.Add("URWGothic", Chr(34) & "URWGothic" & Chr(34)) + dctucrInputFamilyTopAxis.Add("NimbusRom", Chr(34) & "NimbusRom" & Chr(34)) + dctucrInputFamilyTopAxis.Add("URWPalladioURWTimes", Chr(34) & "URWPalladioURWTimes" & Chr(34)) + dctucrInputFamilyTopAxis.Add("NimbusMonURWHelvetica", Chr(34) & "NimbusMonURWHelvetica" & Chr(34)) + dctucrInputFamilyTopAxis.Add("Helvetica - Narrow", Chr(34) & "Helvetica - Narrow" & Chr(34)) + dctucrInputFamilyTopAxis.Add("Helveticaserif", Chr(34) & "Helveticaserif" & Chr(34)) + dctucrInputFamilyTopAxis.Add("Short", Chr(34) & "Short" & Chr(34)) + dctucrInputFamilyTopAxis.Add("Canonicalmono", Chr(34) & "Canonicalmono" & Chr(34)) + dctucrInputFamilyTopAxis.Add("AvantGarde", Chr(34) & "AvantGarde" & Chr(34)) + ucrInputFamilyTopAxis.SetItems(dctucrInputFamilyTopAxis) + ucrInputFamilyTopAxis.SetRDefault(Chr(34) & "Times" & Chr(34)) + ucrInputFamilyTopAxis.bUpdateRCodeFromControl = False + + 'Tick Marks Along Axes + ucrNudSizeXTickMarks.SetParameter(New RParameter("size")) + + ucrInputLineTypeXTickMarks.SetParameter(New RParameter("linetype")) + dctucrInputLineTypeXTickMarks.Add("Blank", Chr(34) & "blank" & Chr(34)) + dctucrInputLineTypeXTickMarks.Add("Solid", Chr(34) & "solid" & Chr(34)) + dctucrInputLineTypeXTickMarks.Add("Dashed", Chr(34) & "dashed" & Chr(34)) + dctucrInputLineTypeXTickMarks.Add("Dotted", Chr(34) & "dotted" & Chr(34)) + dctucrInputLineTypeXTickMarks.Add("Dot-dash", Chr(34) & "dotdash" & Chr(34)) + dctucrInputLineTypeXTickMarks.Add("Long-dash", Chr(34) & "longdash" & Chr(34)) + dctucrInputLineTypeXTickMarks.Add("Two-Dash", Chr(34) & "twodash" & Chr(34)) + dctucrInputLineTypeXTickMarks.Add("1F", Chr(34) & "1F" & Chr(34)) + dctucrInputLineTypeXTickMarks.Add("F1", Chr(34) & "F1" & Chr(34)) + dctucrInputLineTypeXTickMarks.Add("4C88C488", Chr(34) & "4C88C488" & Chr(34)) + dctucrInputLineTypeXTickMarks.Add("12345678", Chr(34) & "12345678" & Chr(34)) + ucrInputLineTypeXTickMarks.SetItems(dctucrInputLineTypeXTickMarks) + ucrInputLineTypeXTickMarks.SetRDefault(Chr(34) & "blank" & Chr(34)) + ucrInputLineTypeXTickMarks.bUpdateRCodeFromControl = False + + ucrInputColourXTickMarks.SetParameter(New RParameter("colour")) + dctucrInputColourXTickMarkst.Add("Black", Chr(34) & "black" & Chr(34)) + dctucrInputColourXTickMarkst.Add("Red", Chr(34) & "red" & Chr(34)) + dctucrInputColourXTickMarkst.Add("Blue", Chr(34) & "blue" & Chr(34)) + dctucrInputColourXTickMarkst.Add("Grey", Chr(34) & "grey" & Chr(34)) + dctucrInputColourXTickMarkst.Add("Yellow", Chr(34) & "yellow" & Chr(34)) + dctucrInputColourXTickMarkst.Add("Yellow-Green", Chr(34) & "yellowgreen" & Chr(34)) + ucrInputColourXTickMarks.SetItems(dctucrInputColourXTickMarkst) + 'ucrInputColourXTickMarks.SetRDefault(Chr(34) & "black" & Chr(34)) + + ucrInputLineEndXTickMarks.SetParameter(New RParameter("lineend")) + dctucrInputLineEndXTickMarks.Add("None", Chr(34) & "NULL" & Chr(34)) + dctucrInputLineEndXTickMarks.Add("round", Chr(34) & "round" & Chr(34)) + dctucrInputLineEndXTickMarks.Add("butt", Chr(34) & "butt" & Chr(34)) + dctucrInputLineEndXTickMarks.Add("square", Chr(34) & "square" & Chr(34)) + ucrInputLineEndXTickMarks.SetItems(dctucrInputLineEndXTickMarks) + ucrInputLineEndXTickMarks.SetRDefault(Chr(34) & "NULL" & Chr(34)) + ucrInputLineEndXTickMarks.bUpdateRCodeFromControl = False + bControlsInitialised = True End Sub @@ -142,8 +235,8 @@ Public Class sdgThemes clsBaseOperator.AddParameter("theme", clsRFunctionParameter:=clsGgThemes, iPosition:=15) clsGgThemes.SetRCommand("theme") - clsTextTheme.SetRCommand("element_text") - clsSegmentTheme.SetRCommand("element_line") + clsElementText.SetRCommand("element_text") + clsElementLine.SetRCommand("element_line") 'For Setting default values for the nuds '' clsTextTheme.AddParameter("size", 10) @@ -157,29 +250,45 @@ Public Class sdgThemes 'For Setting default values for the nuds '' clsSegmentTheme.AddParameter("size", 0.5) '' clsSegmentTheme.AddParameter("linetype", 1) - clsGgThemes.AddParameter("axis.ticks", clsRFunctionParameter:=clsSegmentTheme) - clsGgThemes.AddParameter("axis.title", clsRFunctionParameter:=clsTextTheme) - clsGgThemes.AddParameter("axis.text.x", clsRFunctionParameter:=clsTextTheme) - clsGgThemes.AddParameter("axis.text", clsRFunctionParameter:=clsTextTheme) - clsGgThemes.AddParameter("axis.text", clsRFunctionParameter:=clsTextTheme) - clsGgThemes.AddParameter("title", clsRFunctionParameter:=clsTextTheme) - - clsGgThemes.AddParameter("axis.title.y.right", clsRFunctionParameter:=clsTextTheme) - clsGgThemes.AddParameter("axis.title.y", clsRFunctionParameter:=clsTextTheme) - - - ucrNudAngle.SetRCode(clsTextTheme, bReset) - ucrNudHjust.SetRCode(clsTextTheme, bReset) - ucrNudLineHeight.SetRCode(clsTextTheme, bReset) - ucrNudsize.SetRCode(clsTextTheme, bReset) - ucrNudVjust.SetRCode(clsTextTheme, bReset) - ucrInputColour.SetRCode(clsTextTheme, bReset) - ucrInputFace.SetRCode(clsTextTheme, bReset) - ucrInputFamily.SetRCode(clsTextTheme, bReset) - - ucrNudSizeSegment.SetRCode(clsSegmentTheme, bReset) - ucrInputColourSegment.SetRCode(clsSegmentTheme, bReset) - ucrInputLineType.SetRCode(clsSegmentTheme, bReset) + clsGgThemes.AddParameter("axis.ticks", clsRFunctionParameter:=clsElementLine) + clsGgThemes.AddParameter("axis.ticks.x", clsRFunctionParameter:=clsElementLine) + clsGgThemes.AddParameter("axis.text.x", clsRFunctionParameter:=clsElementText) + clsGgThemes.AddParameter("axis.text.x.top", clsRFunctionParameter:=clsElementText) + 'clsGgThemes.AddParameter("axis.text", clsRFunctionParameter:=clsTextTheme) + ' clsGgThemes.AddParameter("title", clsRFunctionParameter:=clsTextTheme) + + ' clsGgThemes.AddParameter("axis.title.y.right", clsRFunctionParameter:=clsTextTheme) + 'clsGgThemes.AddParameter("axis.title.y", clsRFunctionParameter:=clsTextTheme) + + 'X axis Label + ucrNudAngle.SetRCode(clsElementText, bReset) + ucrNudHjust.SetRCode(clsElementText, bReset) + ucrNudLineHeight.SetRCode(clsElementText, bReset) + ucrNudsize.SetRCode(clsElementText, bReset) + ucrNudVjust.SetRCode(clsElementText, bReset) + ucrInputColour.SetRCode(clsElementText, bReset) + ucrInputFace.SetRCode(clsElementText, bReset) + ucrInputFamily.SetRCode(clsElementText, bReset) + + 'X axis Label Top Axis + ucrNudSizeSegment.SetRCode(clsElementLine, bReset) + ucrInputColourSegment.SetRCode(clsElementLine, bReset) + ucrInputLineType.SetRCode(clsElementLine, bReset) + ucrInputLineEnd.SetRCode(clsElementLine, bReset) + + ucrNudAngleTopAxis.SetRCode(clsElementText, bReset) + ucrNudHjustTopAxis.SetRCode(clsElementText, bReset) + ucrNudLineHeightTopAxis.SetRCode(clsElementText, bReset) + ucrNudSizeTopaxis.SetRCode(clsElementText, bReset) + ucrNudVjustTopAxis.SetRCode(clsElementText, bReset) + ucrInputColourTopAxis.SetRCode(clsElementText, bReset) + ucrInputFaceTopAxis.SetRCode(clsElementText, bReset) + ucrInputFamilyTopAxis.SetRCode(clsElementText, bReset) + + ucrNudSizeXTickMarks.SetRCode(clsElementLine, bReset) + ucrInputColourXTickMarks.SetRCode(clsElementLine, bReset) + ucrInputLineTypeXTickMarks.SetRCode(clsElementLine, bReset) + ucrInputLineEndXTickMarks.SetRCode(clsElementLine, bReset) End Sub End Class \ No newline at end of file From a7d52297547d2d9bf255fc6c0d6f7f81e747ceeb Mon Sep 17 00:00:00 2001 From: Steven Date: Fri, 2 Jun 2017 21:15:13 +0300 Subject: [PATCH 074/154] More additions and corrections on the code --- instat/sdgThemes.Designer.vb | 1250 +++++++++++++++++----------------- instat/sdgThemes.vb | 45 +- 2 files changed, 647 insertions(+), 648 deletions(-) diff --git a/instat/sdgThemes.Designer.vb b/instat/sdgThemes.Designer.vb index 527e5389a3c..9444d5d5491 100644 --- a/instat/sdgThemes.Designer.vb +++ b/instat/sdgThemes.Designer.vb @@ -27,110 +27,110 @@ Partial Class sdgThemes Me.grpTableOptions = New System.Windows.Forms.GroupBox() Me.grpTickLabels = New System.Windows.Forms.GroupBox() Me.lblLineEndXtickMarks = New System.Windows.Forms.Label() - Me.ucrInputLineEndXTickMarks = New instat.ucrInputComboBox() Me.lblSizeXTickMarks = New System.Windows.Forms.Label() - Me.ucrNudSizeXTickMarks = New instat.ucrNud() Me.lblColourXTickMarks = New System.Windows.Forms.Label() - Me.ucrInputColourXTickMarks = New instat.ucrInputComboBox() Me.lbllineTypeXTickMarks = New System.Windows.Forms.Label() - Me.ucrInputLineTypeXTickMarks = New instat.ucrInputComboBox() Me.grpAxisLabelTopAxis = New System.Windows.Forms.GroupBox() Me.lblVjustTopAxis = New System.Windows.Forms.Label() - Me.ucrNudVjustTopAxis = New instat.ucrNud() Me.lblLineHeightTopAxis = New System.Windows.Forms.Label() - Me.ucrNudLineHeightTopAxis = New instat.ucrNud() Me.lblAngleTop = New System.Windows.Forms.Label() - Me.ucrNudAngleTopAxis = New instat.ucrNud() Me.lblHjustTopAxis = New System.Windows.Forms.Label() - Me.ucrNudHjustTopAxis = New instat.ucrNud() Me.lblSizeTopaxis = New System.Windows.Forms.Label() - Me.ucrNudSizeTopaxis = New instat.ucrNud() Me.lblColourTopAxis = New System.Windows.Forms.Label() - Me.ucrInputColourTopAxis = New instat.ucrInputComboBox() Me.lblFaceTopAxis = New System.Windows.Forms.Label() - Me.ucrInputFaceTopAxis = New instat.ucrInputComboBox() Me.lblFamilyTopAxis = New System.Windows.Forms.Label() - Me.ucrInputFamilyTopAxis = New instat.ucrInputComboBox() Me.GroupBox1 = New System.Windows.Forms.GroupBox() - Me.lblLineEnd = New System.Windows.Forms.Label() - Me.ucrInputLineEnd = New instat.ucrInputComboBox() - Me.lblSizeSegment = New System.Windows.Forms.Label() - Me.ucrNudSizeSegment = New instat.ucrNud() - Me.lblColourSegment = New System.Windows.Forms.Label() - Me.ucrInputColourSegment = New instat.ucrInputComboBox() - Me.lblLineType = New System.Windows.Forms.Label() - Me.ucrInputLineType = New instat.ucrInputComboBox() + Me.lblLineEndTickMarks = New System.Windows.Forms.Label() + Me.lblSizeTickMarks = New System.Windows.Forms.Label() + Me.lblColourTickMarks = New System.Windows.Forms.Label() + Me.lblLineTypeTickMarks = New System.Windows.Forms.Label() Me.grpAxisLabel = New System.Windows.Forms.GroupBox() Me.lblVjust = New System.Windows.Forms.Label() - Me.ucrNudVjust = New instat.ucrNud() Me.lblLineHeight = New System.Windows.Forms.Label() - Me.ucrNudLineHeight = New instat.ucrNud() Me.lblAngle = New System.Windows.Forms.Label() - Me.ucrNudAngle = New instat.ucrNud() Me.lblHjust = New System.Windows.Forms.Label() - Me.ucrNudHjust = New instat.ucrNud() Me.lblSize = New System.Windows.Forms.Label() - Me.ucrNudsize = New instat.ucrNud() Me.Label2 = New System.Windows.Forms.Label() - Me.ucrInputColour = New instat.ucrInputComboBox() Me.lblFace = New System.Windows.Forms.Label() - Me.ucrInputFace = New instat.ucrInputComboBox() Me.lblFamily = New System.Windows.Forms.Label() - Me.ucrInputFamily = New instat.ucrInputComboBox() Me.tbYaxis = New System.Windows.Forms.TabPage() - Me.ucrBaseSubdialogue = New instat.ucrButtonsSubdialogue() Me.GroupBox2 = New System.Windows.Forms.GroupBox() Me.Label1 = New System.Windows.Forms.Label() - Me.UcrInputComboBox1 = New instat.ucrInputComboBox() Me.Label3 = New System.Windows.Forms.Label() - Me.UcrNud1 = New instat.ucrNud() Me.Label4 = New System.Windows.Forms.Label() - Me.UcrInputComboBox2 = New instat.ucrInputComboBox() Me.Label5 = New System.Windows.Forms.Label() - Me.UcrInputComboBox3 = New instat.ucrInputComboBox() Me.GroupBox3 = New System.Windows.Forms.GroupBox() Me.Label6 = New System.Windows.Forms.Label() - Me.UcrNud2 = New instat.ucrNud() Me.Label7 = New System.Windows.Forms.Label() - Me.UcrNud3 = New instat.ucrNud() Me.Label8 = New System.Windows.Forms.Label() - Me.UcrNud4 = New instat.ucrNud() Me.Label9 = New System.Windows.Forms.Label() - Me.UcrNud5 = New instat.ucrNud() Me.Label10 = New System.Windows.Forms.Label() - Me.UcrNud6 = New instat.ucrNud() Me.Label11 = New System.Windows.Forms.Label() - Me.UcrInputComboBox4 = New instat.ucrInputComboBox() Me.Label12 = New System.Windows.Forms.Label() - Me.UcrInputComboBox5 = New instat.ucrInputComboBox() Me.Label13 = New System.Windows.Forms.Label() - Me.UcrInputComboBox6 = New instat.ucrInputComboBox() Me.GroupBox4 = New System.Windows.Forms.GroupBox() Me.Label14 = New System.Windows.Forms.Label() - Me.UcrInputComboBox7 = New instat.ucrInputComboBox() Me.Label15 = New System.Windows.Forms.Label() - Me.UcrNud7 = New instat.ucrNud() Me.Label16 = New System.Windows.Forms.Label() - Me.UcrInputComboBox8 = New instat.ucrInputComboBox() Me.Label17 = New System.Windows.Forms.Label() - Me.UcrInputComboBox9 = New instat.ucrInputComboBox() Me.GroupBox5 = New System.Windows.Forms.GroupBox() Me.Label18 = New System.Windows.Forms.Label() - Me.UcrNud8 = New instat.ucrNud() Me.Label19 = New System.Windows.Forms.Label() - Me.UcrNud9 = New instat.ucrNud() Me.Label20 = New System.Windows.Forms.Label() + Me.lblHjustYAxis = New System.Windows.Forms.Label() + Me.lblSizeYAxis = New System.Windows.Forms.Label() + Me.Label23 = New System.Windows.Forms.Label() + Me.Label24 = New System.Windows.Forms.Label() + Me.Label25 = New System.Windows.Forms.Label() + Me.ucrInputLineEndXTickMarks = New instat.ucrInputComboBox() + Me.ucrNudSizeXTickMarks = New instat.ucrNud() + Me.ucrInputColourXTickMarks = New instat.ucrInputComboBox() + Me.ucrInputLineTypeXTickMarks = New instat.ucrInputComboBox() + Me.ucrNudVjustTopAxis = New instat.ucrNud() + Me.ucrNudLineHeightTopAxis = New instat.ucrNud() + Me.ucrNudAngleTopAxis = New instat.ucrNud() + Me.ucrNudHjustTopAxis = New instat.ucrNud() + Me.ucrNudSizeTopaxis = New instat.ucrNud() + Me.ucrInputColourTopAxis = New instat.ucrInputComboBox() + Me.ucrInputFaceTopAxis = New instat.ucrInputComboBox() + Me.ucrInputFamilyTopAxis = New instat.ucrInputComboBox() + Me.ucrInputLineEndTickMarks = New instat.ucrInputComboBox() + Me.ucrNudSizeTickMarks = New instat.ucrNud() + Me.ucrInputColourTickMarks = New instat.ucrInputComboBox() + Me.ucrInputLineTypeTickMarks = New instat.ucrInputComboBox() + Me.ucrNudVjust = New instat.ucrNud() + Me.ucrNudLineHeight = New instat.ucrNud() + Me.ucrNudAngle = New instat.ucrNud() + Me.ucrNudHjust = New instat.ucrNud() + Me.ucrNudsize = New instat.ucrNud() + Me.ucrInputColour = New instat.ucrInputComboBox() + Me.ucrInputFace = New instat.ucrInputComboBox() + Me.ucrInputFamily = New instat.ucrInputComboBox() + Me.UcrInputComboBox1 = New instat.ucrInputComboBox() + Me.UcrNud1 = New instat.ucrNud() + Me.UcrInputComboBox2 = New instat.ucrInputComboBox() + Me.UcrInputComboBox3 = New instat.ucrInputComboBox() + Me.UcrNud2 = New instat.ucrNud() + Me.UcrNud3 = New instat.ucrNud() + Me.UcrNud4 = New instat.ucrNud() + Me.UcrNud5 = New instat.ucrNud() + Me.UcrNud6 = New instat.ucrNud() + Me.UcrInputComboBox4 = New instat.ucrInputComboBox() + Me.UcrInputComboBox5 = New instat.ucrInputComboBox() + Me.UcrInputComboBox6 = New instat.ucrInputComboBox() + Me.UcrInputComboBox7 = New instat.ucrInputComboBox() + Me.UcrNud7 = New instat.ucrNud() + Me.UcrInputComboBox8 = New instat.ucrInputComboBox() + Me.UcrInputComboBox9 = New instat.ucrInputComboBox() + Me.UcrNud8 = New instat.ucrNud() + Me.UcrNud9 = New instat.ucrNud() Me.UcrNud10 = New instat.ucrNud() - Me.Label21 = New System.Windows.Forms.Label() Me.UcrNud11 = New instat.ucrNud() - Me.Label22 = New System.Windows.Forms.Label() Me.UcrNud12 = New instat.ucrNud() - Me.Label23 = New System.Windows.Forms.Label() Me.UcrInputComboBox10 = New instat.ucrInputComboBox() - Me.Label24 = New System.Windows.Forms.Label() Me.UcrInputComboBox11 = New instat.ucrInputComboBox() - Me.Label25 = New System.Windows.Forms.Label() Me.UcrInputComboBox12 = New instat.ucrInputComboBox() + Me.ucrBaseSubdialogue = New instat.ucrButtonsSubdialogue() Me.tbXaxis.SuspendLayout() Me.tbAxis.SuspendLayout() Me.grpTableOptions.SuspendLayout() @@ -205,16 +205,6 @@ Partial Class sdgThemes Me.lblLineEndXtickMarks.TabIndex = 31 Me.lblLineEndXtickMarks.Text = "Line End:" ' - 'ucrInputLineEndXTickMarks - ' - Me.ucrInputLineEndXTickMarks.AddQuotesIfUnrecognised = True - Me.ucrInputLineEndXTickMarks.IsReadOnly = False - Me.ucrInputLineEndXTickMarks.Location = New System.Drawing.Point(72, 100) - Me.ucrInputLineEndXTickMarks.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) - Me.ucrInputLineEndXTickMarks.Name = "ucrInputLineEndXTickMarks" - Me.ucrInputLineEndXTickMarks.Size = New System.Drawing.Size(137, 21) - Me.ucrInputLineEndXTickMarks.TabIndex = 32 - ' 'lblSizeXTickMarks ' Me.lblSizeXTickMarks.AutoSize = True @@ -224,18 +214,6 @@ Partial Class sdgThemes Me.lblSizeXTickMarks.TabIndex = 29 Me.lblSizeXTickMarks.Text = "Size:" ' - 'ucrNudSizeXTickMarks - ' - Me.ucrNudSizeXTickMarks.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) - Me.ucrNudSizeXTickMarks.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudSizeXTickMarks.Location = New System.Drawing.Point(94, 17) - Me.ucrNudSizeXTickMarks.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) - Me.ucrNudSizeXTickMarks.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) - Me.ucrNudSizeXTickMarks.Name = "ucrNudSizeXTickMarks" - Me.ucrNudSizeXTickMarks.Size = New System.Drawing.Size(50, 20) - Me.ucrNudSizeXTickMarks.TabIndex = 30 - Me.ucrNudSizeXTickMarks.Value = New Decimal(New Integer() {0, 0, 0, 0}) - ' 'lblColourXTickMarks ' Me.lblColourXTickMarks.AutoSize = True @@ -245,16 +223,6 @@ Partial Class sdgThemes Me.lblColourXTickMarks.TabIndex = 27 Me.lblColourXTickMarks.Text = "Colour:" ' - 'ucrInputColourXTickMarks - ' - Me.ucrInputColourXTickMarks.AddQuotesIfUnrecognised = True - Me.ucrInputColourXTickMarks.IsReadOnly = False - Me.ucrInputColourXTickMarks.Location = New System.Drawing.Point(72, 68) - Me.ucrInputColourXTickMarks.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) - Me.ucrInputColourXTickMarks.Name = "ucrInputColourXTickMarks" - Me.ucrInputColourXTickMarks.Size = New System.Drawing.Size(137, 21) - Me.ucrInputColourXTickMarks.TabIndex = 28 - ' 'lbllineTypeXTickMarks ' Me.lbllineTypeXTickMarks.AutoSize = True @@ -264,16 +232,6 @@ Partial Class sdgThemes Me.lbllineTypeXTickMarks.TabIndex = 25 Me.lbllineTypeXTickMarks.Text = "Line Type:" ' - 'ucrInputLineTypeXTickMarks - ' - Me.ucrInputLineTypeXTickMarks.AddQuotesIfUnrecognised = True - Me.ucrInputLineTypeXTickMarks.IsReadOnly = False - Me.ucrInputLineTypeXTickMarks.Location = New System.Drawing.Point(72, 40) - Me.ucrInputLineTypeXTickMarks.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) - Me.ucrInputLineTypeXTickMarks.Name = "ucrInputLineTypeXTickMarks" - Me.ucrInputLineTypeXTickMarks.Size = New System.Drawing.Size(137, 21) - Me.ucrInputLineTypeXTickMarks.TabIndex = 26 - ' 'grpAxisLabelTopAxis ' Me.grpAxisLabelTopAxis.Controls.Add(Me.lblVjustTopAxis) @@ -308,18 +266,6 @@ Partial Class sdgThemes Me.lblVjustTopAxis.TabIndex = 37 Me.lblVjustTopAxis.Text = "Vjust:" ' - 'ucrNudVjustTopAxis - ' - Me.ucrNudVjustTopAxis.DecimalPlaces = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudVjustTopAxis.Increment = New Decimal(New Integer() {1, 0, 0, 65536}) - Me.ucrNudVjustTopAxis.Location = New System.Drawing.Point(94, 76) - Me.ucrNudVjustTopAxis.Maximum = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudVjustTopAxis.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) - Me.ucrNudVjustTopAxis.Name = "ucrNudVjustTopAxis" - Me.ucrNudVjustTopAxis.Size = New System.Drawing.Size(50, 20) - Me.ucrNudVjustTopAxis.TabIndex = 38 - Me.ucrNudVjustTopAxis.Value = New Decimal(New Integer() {0, 0, 0, 0}) - ' 'lblLineHeightTopAxis ' Me.lblLineHeightTopAxis.AutoSize = True @@ -329,18 +275,6 @@ Partial Class sdgThemes Me.lblLineHeightTopAxis.TabIndex = 35 Me.lblLineHeightTopAxis.Text = "Line Height:" ' - 'ucrNudLineHeightTopAxis - ' - Me.ucrNudLineHeightTopAxis.DecimalPlaces = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudLineHeightTopAxis.Increment = New Decimal(New Integer() {1, 0, 0, 65536}) - Me.ucrNudLineHeightTopAxis.Location = New System.Drawing.Point(94, 106) - Me.ucrNudLineHeightTopAxis.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) - Me.ucrNudLineHeightTopAxis.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) - Me.ucrNudLineHeightTopAxis.Name = "ucrNudLineHeightTopAxis" - Me.ucrNudLineHeightTopAxis.Size = New System.Drawing.Size(50, 20) - Me.ucrNudLineHeightTopAxis.TabIndex = 36 - Me.ucrNudLineHeightTopAxis.Value = New Decimal(New Integer() {0, 0, 0, 0}) - ' 'lblAngleTop ' Me.lblAngleTop.AutoSize = True @@ -350,18 +284,6 @@ Partial Class sdgThemes Me.lblAngleTop.TabIndex = 33 Me.lblAngleTop.Text = "Angle:" ' - 'ucrNudAngleTopAxis - ' - Me.ucrNudAngleTopAxis.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) - Me.ucrNudAngleTopAxis.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudAngleTopAxis.Location = New System.Drawing.Point(94, 134) - Me.ucrNudAngleTopAxis.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) - Me.ucrNudAngleTopAxis.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) - Me.ucrNudAngleTopAxis.Name = "ucrNudAngleTopAxis" - Me.ucrNudAngleTopAxis.Size = New System.Drawing.Size(50, 20) - Me.ucrNudAngleTopAxis.TabIndex = 34 - Me.ucrNudAngleTopAxis.Value = New Decimal(New Integer() {0, 0, 0, 0}) - ' 'lblHjustTopAxis ' Me.lblHjustTopAxis.AutoSize = True @@ -371,18 +293,6 @@ Partial Class sdgThemes Me.lblHjustTopAxis.TabIndex = 31 Me.lblHjustTopAxis.Text = "Hjust:" ' - 'ucrNudHjustTopAxis - ' - Me.ucrNudHjustTopAxis.DecimalPlaces = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudHjustTopAxis.Increment = New Decimal(New Integer() {1, 0, 0, 65536}) - Me.ucrNudHjustTopAxis.Location = New System.Drawing.Point(94, 46) - Me.ucrNudHjustTopAxis.Maximum = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudHjustTopAxis.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) - Me.ucrNudHjustTopAxis.Name = "ucrNudHjustTopAxis" - Me.ucrNudHjustTopAxis.Size = New System.Drawing.Size(50, 20) - Me.ucrNudHjustTopAxis.TabIndex = 32 - Me.ucrNudHjustTopAxis.Value = New Decimal(New Integer() {0, 0, 0, 0}) - ' 'lblSizeTopaxis ' Me.lblSizeTopaxis.AutoSize = True @@ -392,18 +302,6 @@ Partial Class sdgThemes Me.lblSizeTopaxis.TabIndex = 29 Me.lblSizeTopaxis.Text = "Size:" ' - 'ucrNudSizeTopaxis - ' - Me.ucrNudSizeTopaxis.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) - Me.ucrNudSizeTopaxis.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudSizeTopaxis.Location = New System.Drawing.Point(94, 16) - Me.ucrNudSizeTopaxis.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) - Me.ucrNudSizeTopaxis.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) - Me.ucrNudSizeTopaxis.Name = "ucrNudSizeTopaxis" - Me.ucrNudSizeTopaxis.Size = New System.Drawing.Size(50, 20) - Me.ucrNudSizeTopaxis.TabIndex = 30 - Me.ucrNudSizeTopaxis.Value = New Decimal(New Integer() {0, 0, 0, 0}) - ' 'lblColourTopAxis ' Me.lblColourTopAxis.AutoSize = True @@ -413,16 +311,6 @@ Partial Class sdgThemes Me.lblColourTopAxis.TabIndex = 27 Me.lblColourTopAxis.Text = "Colour:" ' - 'ucrInputColourTopAxis - ' - Me.ucrInputColourTopAxis.AddQuotesIfUnrecognised = True - Me.ucrInputColourTopAxis.IsReadOnly = False - Me.ucrInputColourTopAxis.Location = New System.Drawing.Point(73, 217) - Me.ucrInputColourTopAxis.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) - Me.ucrInputColourTopAxis.Name = "ucrInputColourTopAxis" - Me.ucrInputColourTopAxis.Size = New System.Drawing.Size(137, 21) - Me.ucrInputColourTopAxis.TabIndex = 28 - ' 'lblFaceTopAxis ' Me.lblFaceTopAxis.AutoSize = True @@ -432,16 +320,6 @@ Partial Class sdgThemes Me.lblFaceTopAxis.TabIndex = 25 Me.lblFaceTopAxis.Text = "Face:" ' - 'ucrInputFaceTopAxis - ' - Me.ucrInputFaceTopAxis.AddQuotesIfUnrecognised = True - Me.ucrInputFaceTopAxis.IsReadOnly = False - Me.ucrInputFaceTopAxis.Location = New System.Drawing.Point(73, 189) - Me.ucrInputFaceTopAxis.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) - Me.ucrInputFaceTopAxis.Name = "ucrInputFaceTopAxis" - Me.ucrInputFaceTopAxis.Size = New System.Drawing.Size(137, 21) - Me.ucrInputFaceTopAxis.TabIndex = 26 - ' 'lblFamilyTopAxis ' Me.lblFamilyTopAxis.AutoSize = True @@ -451,26 +329,16 @@ Partial Class sdgThemes Me.lblFamilyTopAxis.TabIndex = 23 Me.lblFamilyTopAxis.Text = "Family:" ' - 'ucrInputFamilyTopAxis - ' - Me.ucrInputFamilyTopAxis.AddQuotesIfUnrecognised = True - Me.ucrInputFamilyTopAxis.IsReadOnly = False - Me.ucrInputFamilyTopAxis.Location = New System.Drawing.Point(73, 162) - Me.ucrInputFamilyTopAxis.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) - Me.ucrInputFamilyTopAxis.Name = "ucrInputFamilyTopAxis" - Me.ucrInputFamilyTopAxis.Size = New System.Drawing.Size(137, 21) - Me.ucrInputFamilyTopAxis.TabIndex = 24 - ' 'GroupBox1 ' - Me.GroupBox1.Controls.Add(Me.lblLineEnd) - Me.GroupBox1.Controls.Add(Me.ucrInputLineEnd) - Me.GroupBox1.Controls.Add(Me.lblSizeSegment) - Me.GroupBox1.Controls.Add(Me.ucrNudSizeSegment) - Me.GroupBox1.Controls.Add(Me.lblColourSegment) - Me.GroupBox1.Controls.Add(Me.ucrInputColourSegment) - Me.GroupBox1.Controls.Add(Me.lblLineType) - Me.GroupBox1.Controls.Add(Me.ucrInputLineType) + Me.GroupBox1.Controls.Add(Me.lblLineEndTickMarks) + Me.GroupBox1.Controls.Add(Me.ucrInputLineEndTickMarks) + Me.GroupBox1.Controls.Add(Me.lblSizeTickMarks) + Me.GroupBox1.Controls.Add(Me.ucrNudSizeTickMarks) + Me.GroupBox1.Controls.Add(Me.lblColourTickMarks) + Me.GroupBox1.Controls.Add(Me.ucrInputColourTickMarks) + Me.GroupBox1.Controls.Add(Me.lblLineTypeTickMarks) + Me.GroupBox1.Controls.Add(Me.ucrInputLineTypeTickMarks) Me.GroupBox1.Location = New System.Drawing.Point(15, 270) Me.GroupBox1.Name = "GroupBox1" Me.GroupBox1.Size = New System.Drawing.Size(230, 154) @@ -478,83 +346,41 @@ Partial Class sdgThemes Me.GroupBox1.TabStop = False Me.GroupBox1.Text = "Tick marks along axes" ' - 'lblLineEnd - ' - Me.lblLineEnd.AutoSize = True - Me.lblLineEnd.Location = New System.Drawing.Point(12, 108) - Me.lblLineEnd.Name = "lblLineEnd" - Me.lblLineEnd.Size = New System.Drawing.Size(52, 13) - Me.lblLineEnd.TabIndex = 31 - Me.lblLineEnd.Text = "Line End:" - ' - 'ucrInputLineEnd - ' - Me.ucrInputLineEnd.AddQuotesIfUnrecognised = True - Me.ucrInputLineEnd.IsReadOnly = False - Me.ucrInputLineEnd.Location = New System.Drawing.Point(72, 100) - Me.ucrInputLineEnd.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) - Me.ucrInputLineEnd.Name = "ucrInputLineEnd" - Me.ucrInputLineEnd.Size = New System.Drawing.Size(137, 21) - Me.ucrInputLineEnd.TabIndex = 32 - ' - 'lblSizeSegment - ' - Me.lblSizeSegment.AutoSize = True - Me.lblSizeSegment.Location = New System.Drawing.Point(13, 22) - Me.lblSizeSegment.Name = "lblSizeSegment" - Me.lblSizeSegment.Size = New System.Drawing.Size(30, 13) - Me.lblSizeSegment.TabIndex = 29 - Me.lblSizeSegment.Text = "Size:" - ' - 'ucrNudSizeSegment - ' - Me.ucrNudSizeSegment.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) - Me.ucrNudSizeSegment.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudSizeSegment.Location = New System.Drawing.Point(94, 17) - Me.ucrNudSizeSegment.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) - Me.ucrNudSizeSegment.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) - Me.ucrNudSizeSegment.Name = "ucrNudSizeSegment" - Me.ucrNudSizeSegment.Size = New System.Drawing.Size(50, 20) - Me.ucrNudSizeSegment.TabIndex = 30 - Me.ucrNudSizeSegment.Value = New Decimal(New Integer() {0, 0, 0, 0}) - ' - 'lblColourSegment - ' - Me.lblColourSegment.AutoSize = True - Me.lblColourSegment.Location = New System.Drawing.Point(12, 76) - Me.lblColourSegment.Name = "lblColourSegment" - Me.lblColourSegment.Size = New System.Drawing.Size(40, 13) - Me.lblColourSegment.TabIndex = 27 - Me.lblColourSegment.Text = "Colour:" - ' - 'ucrInputColourSegment - ' - Me.ucrInputColourSegment.AddQuotesIfUnrecognised = True - Me.ucrInputColourSegment.IsReadOnly = False - Me.ucrInputColourSegment.Location = New System.Drawing.Point(72, 68) - Me.ucrInputColourSegment.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) - Me.ucrInputColourSegment.Name = "ucrInputColourSegment" - Me.ucrInputColourSegment.Size = New System.Drawing.Size(137, 21) - Me.ucrInputColourSegment.TabIndex = 28 - ' - 'lblLineType - ' - Me.lblLineType.AutoSize = True - Me.lblLineType.Location = New System.Drawing.Point(12, 47) - Me.lblLineType.Name = "lblLineType" - Me.lblLineType.Size = New System.Drawing.Size(57, 13) - Me.lblLineType.TabIndex = 25 - Me.lblLineType.Text = "Line Type:" - ' - 'ucrInputLineType - ' - Me.ucrInputLineType.AddQuotesIfUnrecognised = True - Me.ucrInputLineType.IsReadOnly = False - Me.ucrInputLineType.Location = New System.Drawing.Point(72, 40) - Me.ucrInputLineType.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) - Me.ucrInputLineType.Name = "ucrInputLineType" - Me.ucrInputLineType.Size = New System.Drawing.Size(137, 21) - Me.ucrInputLineType.TabIndex = 26 + 'lblLineEndTickMarks + ' + Me.lblLineEndTickMarks.AutoSize = True + Me.lblLineEndTickMarks.Location = New System.Drawing.Point(12, 108) + Me.lblLineEndTickMarks.Name = "lblLineEndTickMarks" + Me.lblLineEndTickMarks.Size = New System.Drawing.Size(52, 13) + Me.lblLineEndTickMarks.TabIndex = 31 + Me.lblLineEndTickMarks.Text = "Line End:" + ' + 'lblSizeTickMarks + ' + Me.lblSizeTickMarks.AutoSize = True + Me.lblSizeTickMarks.Location = New System.Drawing.Point(13, 22) + Me.lblSizeTickMarks.Name = "lblSizeTickMarks" + Me.lblSizeTickMarks.Size = New System.Drawing.Size(30, 13) + Me.lblSizeTickMarks.TabIndex = 29 + Me.lblSizeTickMarks.Text = "Size:" + ' + 'lblColourTickMarks + ' + Me.lblColourTickMarks.AutoSize = True + Me.lblColourTickMarks.Location = New System.Drawing.Point(12, 76) + Me.lblColourTickMarks.Name = "lblColourTickMarks" + Me.lblColourTickMarks.Size = New System.Drawing.Size(40, 13) + Me.lblColourTickMarks.TabIndex = 27 + Me.lblColourTickMarks.Text = "Colour:" + ' + 'lblLineTypeTickMarks + ' + Me.lblLineTypeTickMarks.AutoSize = True + Me.lblLineTypeTickMarks.Location = New System.Drawing.Point(12, 47) + Me.lblLineTypeTickMarks.Name = "lblLineTypeTickMarks" + Me.lblLineTypeTickMarks.Size = New System.Drawing.Size(57, 13) + Me.lblLineTypeTickMarks.TabIndex = 25 + Me.lblLineTypeTickMarks.Text = "Line Type:" ' 'grpAxisLabel ' @@ -590,18 +416,6 @@ Partial Class sdgThemes Me.lblVjust.TabIndex = 37 Me.lblVjust.Text = "Vjust:" ' - 'ucrNudVjust - ' - Me.ucrNudVjust.DecimalPlaces = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudVjust.Increment = New Decimal(New Integer() {1, 0, 0, 65536}) - Me.ucrNudVjust.Location = New System.Drawing.Point(94, 76) - Me.ucrNudVjust.Maximum = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudVjust.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) - Me.ucrNudVjust.Name = "ucrNudVjust" - Me.ucrNudVjust.Size = New System.Drawing.Size(50, 20) - Me.ucrNudVjust.TabIndex = 38 - Me.ucrNudVjust.Value = New Decimal(New Integer() {0, 0, 0, 0}) - ' 'lblLineHeight ' Me.lblLineHeight.AutoSize = True @@ -611,18 +425,6 @@ Partial Class sdgThemes Me.lblLineHeight.TabIndex = 35 Me.lblLineHeight.Text = "Line Height:" ' - 'ucrNudLineHeight - ' - Me.ucrNudLineHeight.DecimalPlaces = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudLineHeight.Increment = New Decimal(New Integer() {1, 0, 0, 65536}) - Me.ucrNudLineHeight.Location = New System.Drawing.Point(94, 106) - Me.ucrNudLineHeight.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) - Me.ucrNudLineHeight.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) - Me.ucrNudLineHeight.Name = "ucrNudLineHeight" - Me.ucrNudLineHeight.Size = New System.Drawing.Size(50, 20) - Me.ucrNudLineHeight.TabIndex = 36 - Me.ucrNudLineHeight.Value = New Decimal(New Integer() {0, 0, 0, 0}) - ' 'lblAngle ' Me.lblAngle.AutoSize = True @@ -632,19 +434,7 @@ Partial Class sdgThemes Me.lblAngle.TabIndex = 33 Me.lblAngle.Text = "Angle:" ' - 'ucrNudAngle - ' - Me.ucrNudAngle.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) - Me.ucrNudAngle.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudAngle.Location = New System.Drawing.Point(94, 136) - Me.ucrNudAngle.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) - Me.ucrNudAngle.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) - Me.ucrNudAngle.Name = "ucrNudAngle" - Me.ucrNudAngle.Size = New System.Drawing.Size(50, 20) - Me.ucrNudAngle.TabIndex = 34 - Me.ucrNudAngle.Value = New Decimal(New Integer() {0, 0, 0, 0}) - ' - 'lblHjust + 'lblHjust ' Me.lblHjust.AutoSize = True Me.lblHjust.Location = New System.Drawing.Point(13, 49) @@ -653,18 +443,6 @@ Partial Class sdgThemes Me.lblHjust.TabIndex = 31 Me.lblHjust.Text = "Hjust:" ' - 'ucrNudHjust - ' - Me.ucrNudHjust.DecimalPlaces = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudHjust.Increment = New Decimal(New Integer() {1, 0, 0, 65536}) - Me.ucrNudHjust.Location = New System.Drawing.Point(94, 46) - Me.ucrNudHjust.Maximum = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudHjust.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) - Me.ucrNudHjust.Name = "ucrNudHjust" - Me.ucrNudHjust.Size = New System.Drawing.Size(50, 20) - Me.ucrNudHjust.TabIndex = 32 - Me.ucrNudHjust.Value = New Decimal(New Integer() {0, 0, 0, 0}) - ' 'lblSize ' Me.lblSize.AutoSize = True @@ -674,18 +452,6 @@ Partial Class sdgThemes Me.lblSize.TabIndex = 29 Me.lblSize.Text = "Size:" ' - 'ucrNudsize - ' - 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(94, 16) - 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" - Me.ucrNudsize.Size = New System.Drawing.Size(50, 20) - Me.ucrNudsize.TabIndex = 30 - Me.ucrNudsize.Value = New Decimal(New Integer() {0, 0, 0, 0}) - ' 'Label2 ' Me.Label2.AutoSize = True @@ -695,16 +461,6 @@ Partial Class sdgThemes Me.Label2.TabIndex = 27 Me.Label2.Text = "Colour:" ' - 'ucrInputColour - ' - Me.ucrInputColour.AddQuotesIfUnrecognised = True - Me.ucrInputColour.IsReadOnly = False - Me.ucrInputColour.Location = New System.Drawing.Point(73, 217) - Me.ucrInputColour.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) - Me.ucrInputColour.Name = "ucrInputColour" - Me.ucrInputColour.Size = New System.Drawing.Size(137, 21) - Me.ucrInputColour.TabIndex = 28 - ' 'lblFace ' Me.lblFace.AutoSize = True @@ -714,16 +470,6 @@ Partial Class sdgThemes Me.lblFace.TabIndex = 25 Me.lblFace.Text = "Face:" ' - 'ucrInputFace - ' - Me.ucrInputFace.AddQuotesIfUnrecognised = True - Me.ucrInputFace.IsReadOnly = False - Me.ucrInputFace.Location = New System.Drawing.Point(73, 189) - Me.ucrInputFace.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) - Me.ucrInputFace.Name = "ucrInputFace" - Me.ucrInputFace.Size = New System.Drawing.Size(137, 21) - Me.ucrInputFace.TabIndex = 26 - ' 'lblFamily ' Me.lblFamily.AutoSize = True @@ -733,16 +479,6 @@ Partial Class sdgThemes Me.lblFamily.TabIndex = 23 Me.lblFamily.Text = "Family:" ' - 'ucrInputFamily - ' - Me.ucrInputFamily.AddQuotesIfUnrecognised = True - Me.ucrInputFamily.IsReadOnly = False - Me.ucrInputFamily.Location = New System.Drawing.Point(73, 162) - Me.ucrInputFamily.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) - Me.ucrInputFamily.Name = "ucrInputFamily" - Me.ucrInputFamily.Size = New System.Drawing.Size(137, 21) - Me.ucrInputFamily.TabIndex = 24 - ' 'tbYaxis ' Me.tbYaxis.Controls.Add(Me.GroupBox2) @@ -757,13 +493,6 @@ Partial Class sdgThemes Me.tbYaxis.Text = "Y-axis" Me.tbYaxis.UseVisualStyleBackColor = True ' - 'ucrBaseSubdialogue - ' - Me.ucrBaseSubdialogue.Location = New System.Drawing.Point(168, 487) - Me.ucrBaseSubdialogue.Name = "ucrBaseSubdialogue" - Me.ucrBaseSubdialogue.Size = New System.Drawing.Size(142, 30) - Me.ucrBaseSubdialogue.TabIndex = 0 - ' 'GroupBox2 ' Me.GroupBox2.Controls.Add(Me.Label1) @@ -779,7 +508,7 @@ Partial Class sdgThemes Me.GroupBox2.Size = New System.Drawing.Size(230, 154) Me.GroupBox2.TabIndex = 43 Me.GroupBox2.TabStop = False - Me.GroupBox2.Text = "X axis tick labels" + Me.GroupBox2.Text = "Y axis tick labels" ' 'Label1 ' @@ -790,16 +519,6 @@ Partial Class sdgThemes Me.Label1.TabIndex = 31 Me.Label1.Text = "Line End:" ' - 'UcrInputComboBox1 - ' - Me.UcrInputComboBox1.AddQuotesIfUnrecognised = True - Me.UcrInputComboBox1.IsReadOnly = False - Me.UcrInputComboBox1.Location = New System.Drawing.Point(72, 100) - Me.UcrInputComboBox1.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) - Me.UcrInputComboBox1.Name = "UcrInputComboBox1" - Me.UcrInputComboBox1.Size = New System.Drawing.Size(137, 21) - Me.UcrInputComboBox1.TabIndex = 32 - ' 'Label3 ' Me.Label3.AutoSize = True @@ -809,18 +528,6 @@ Partial Class sdgThemes Me.Label3.TabIndex = 29 Me.Label3.Text = "Size:" ' - 'UcrNud1 - ' - Me.UcrNud1.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) - Me.UcrNud1.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.UcrNud1.Location = New System.Drawing.Point(94, 17) - Me.UcrNud1.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) - Me.UcrNud1.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) - Me.UcrNud1.Name = "UcrNud1" - Me.UcrNud1.Size = New System.Drawing.Size(50, 20) - Me.UcrNud1.TabIndex = 30 - Me.UcrNud1.Value = New Decimal(New Integer() {0, 0, 0, 0}) - ' 'Label4 ' Me.Label4.AutoSize = True @@ -830,16 +537,6 @@ Partial Class sdgThemes Me.Label4.TabIndex = 27 Me.Label4.Text = "Colour:" ' - 'UcrInputComboBox2 - ' - Me.UcrInputComboBox2.AddQuotesIfUnrecognised = True - Me.UcrInputComboBox2.IsReadOnly = False - Me.UcrInputComboBox2.Location = New System.Drawing.Point(72, 68) - Me.UcrInputComboBox2.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) - Me.UcrInputComboBox2.Name = "UcrInputComboBox2" - Me.UcrInputComboBox2.Size = New System.Drawing.Size(137, 21) - Me.UcrInputComboBox2.TabIndex = 28 - ' 'Label5 ' Me.Label5.AutoSize = True @@ -849,16 +546,6 @@ Partial Class sdgThemes Me.Label5.TabIndex = 25 Me.Label5.Text = "Line Type:" ' - 'UcrInputComboBox3 - ' - Me.UcrInputComboBox3.AddQuotesIfUnrecognised = True - Me.UcrInputComboBox3.IsReadOnly = False - Me.UcrInputComboBox3.Location = New System.Drawing.Point(72, 40) - Me.UcrInputComboBox3.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) - Me.UcrInputComboBox3.Name = "UcrInputComboBox3" - Me.UcrInputComboBox3.Size = New System.Drawing.Size(137, 21) - Me.UcrInputComboBox3.TabIndex = 26 - ' 'GroupBox3 ' Me.GroupBox3.Controls.Add(Me.Label6) @@ -882,7 +569,7 @@ Partial Class sdgThemes Me.GroupBox3.Size = New System.Drawing.Size(230, 245) Me.GroupBox3.TabIndex = 44 Me.GroupBox3.TabStop = False - Me.GroupBox3.Text = "X axis label on top axis" + Me.GroupBox3.Text = "Y axis label on top axis" ' 'Label6 ' @@ -893,18 +580,6 @@ Partial Class sdgThemes Me.Label6.TabIndex = 37 Me.Label6.Text = "Vjust:" ' - 'UcrNud2 - ' - Me.UcrNud2.DecimalPlaces = New Decimal(New Integer() {1, 0, 0, 0}) - Me.UcrNud2.Increment = New Decimal(New Integer() {1, 0, 0, 65536}) - Me.UcrNud2.Location = New System.Drawing.Point(94, 76) - Me.UcrNud2.Maximum = New Decimal(New Integer() {1, 0, 0, 0}) - Me.UcrNud2.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) - Me.UcrNud2.Name = "UcrNud2" - Me.UcrNud2.Size = New System.Drawing.Size(50, 20) - Me.UcrNud2.TabIndex = 38 - Me.UcrNud2.Value = New Decimal(New Integer() {0, 0, 0, 0}) - ' 'Label7 ' Me.Label7.AutoSize = True @@ -914,18 +589,6 @@ Partial Class sdgThemes Me.Label7.TabIndex = 35 Me.Label7.Text = "Line Height:" ' - 'UcrNud3 - ' - Me.UcrNud3.DecimalPlaces = New Decimal(New Integer() {1, 0, 0, 0}) - Me.UcrNud3.Increment = New Decimal(New Integer() {1, 0, 0, 65536}) - Me.UcrNud3.Location = New System.Drawing.Point(94, 106) - Me.UcrNud3.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) - Me.UcrNud3.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) - Me.UcrNud3.Name = "UcrNud3" - Me.UcrNud3.Size = New System.Drawing.Size(50, 20) - Me.UcrNud3.TabIndex = 36 - Me.UcrNud3.Value = New Decimal(New Integer() {0, 0, 0, 0}) - ' 'Label8 ' Me.Label8.AutoSize = True @@ -935,18 +598,6 @@ Partial Class sdgThemes Me.Label8.TabIndex = 33 Me.Label8.Text = "Angle:" ' - 'UcrNud4 - ' - Me.UcrNud4.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) - Me.UcrNud4.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.UcrNud4.Location = New System.Drawing.Point(94, 134) - Me.UcrNud4.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) - Me.UcrNud4.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) - Me.UcrNud4.Name = "UcrNud4" - Me.UcrNud4.Size = New System.Drawing.Size(50, 20) - Me.UcrNud4.TabIndex = 34 - Me.UcrNud4.Value = New Decimal(New Integer() {0, 0, 0, 0}) - ' 'Label9 ' Me.Label9.AutoSize = True @@ -956,18 +607,6 @@ Partial Class sdgThemes Me.Label9.TabIndex = 31 Me.Label9.Text = "Hjust:" ' - 'UcrNud5 - ' - Me.UcrNud5.DecimalPlaces = New Decimal(New Integer() {1, 0, 0, 0}) - Me.UcrNud5.Increment = New Decimal(New Integer() {1, 0, 0, 65536}) - Me.UcrNud5.Location = New System.Drawing.Point(94, 46) - Me.UcrNud5.Maximum = New Decimal(New Integer() {1, 0, 0, 0}) - Me.UcrNud5.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) - Me.UcrNud5.Name = "UcrNud5" - Me.UcrNud5.Size = New System.Drawing.Size(50, 20) - Me.UcrNud5.TabIndex = 32 - Me.UcrNud5.Value = New Decimal(New Integer() {0, 0, 0, 0}) - ' 'Label10 ' Me.Label10.AutoSize = True @@ -977,18 +616,6 @@ Partial Class sdgThemes Me.Label10.TabIndex = 29 Me.Label10.Text = "Size:" ' - 'UcrNud6 - ' - Me.UcrNud6.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) - Me.UcrNud6.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.UcrNud6.Location = New System.Drawing.Point(94, 16) - Me.UcrNud6.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) - Me.UcrNud6.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) - Me.UcrNud6.Name = "UcrNud6" - Me.UcrNud6.Size = New System.Drawing.Size(50, 20) - Me.UcrNud6.TabIndex = 30 - Me.UcrNud6.Value = New Decimal(New Integer() {0, 0, 0, 0}) - ' 'Label11 ' Me.Label11.AutoSize = True @@ -998,16 +625,6 @@ Partial Class sdgThemes Me.Label11.TabIndex = 27 Me.Label11.Text = "Colour:" ' - 'UcrInputComboBox4 - ' - Me.UcrInputComboBox4.AddQuotesIfUnrecognised = True - Me.UcrInputComboBox4.IsReadOnly = False - Me.UcrInputComboBox4.Location = New System.Drawing.Point(73, 217) - Me.UcrInputComboBox4.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) - Me.UcrInputComboBox4.Name = "UcrInputComboBox4" - Me.UcrInputComboBox4.Size = New System.Drawing.Size(137, 21) - Me.UcrInputComboBox4.TabIndex = 28 - ' 'Label12 ' Me.Label12.AutoSize = True @@ -1017,16 +634,6 @@ Partial Class sdgThemes Me.Label12.TabIndex = 25 Me.Label12.Text = "Face:" ' - 'UcrInputComboBox5 - ' - Me.UcrInputComboBox5.AddQuotesIfUnrecognised = True - Me.UcrInputComboBox5.IsReadOnly = False - Me.UcrInputComboBox5.Location = New System.Drawing.Point(73, 189) - Me.UcrInputComboBox5.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) - Me.UcrInputComboBox5.Name = "UcrInputComboBox5" - Me.UcrInputComboBox5.Size = New System.Drawing.Size(137, 21) - Me.UcrInputComboBox5.TabIndex = 26 - ' 'Label13 ' Me.Label13.AutoSize = True @@ -1036,16 +643,6 @@ Partial Class sdgThemes Me.Label13.TabIndex = 23 Me.Label13.Text = "Family:" ' - 'UcrInputComboBox6 - ' - Me.UcrInputComboBox6.AddQuotesIfUnrecognised = True - Me.UcrInputComboBox6.IsReadOnly = False - Me.UcrInputComboBox6.Location = New System.Drawing.Point(73, 162) - Me.UcrInputComboBox6.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) - Me.UcrInputComboBox6.Name = "UcrInputComboBox6" - Me.UcrInputComboBox6.Size = New System.Drawing.Size(137, 21) - Me.UcrInputComboBox6.TabIndex = 24 - ' 'GroupBox4 ' Me.GroupBox4.Controls.Add(Me.Label14) @@ -1072,16 +669,6 @@ Partial Class sdgThemes Me.Label14.TabIndex = 31 Me.Label14.Text = "Line End:" ' - 'UcrInputComboBox7 - ' - Me.UcrInputComboBox7.AddQuotesIfUnrecognised = True - Me.UcrInputComboBox7.IsReadOnly = False - Me.UcrInputComboBox7.Location = New System.Drawing.Point(72, 100) - Me.UcrInputComboBox7.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) - Me.UcrInputComboBox7.Name = "UcrInputComboBox7" - Me.UcrInputComboBox7.Size = New System.Drawing.Size(137, 21) - Me.UcrInputComboBox7.TabIndex = 32 - ' 'Label15 ' Me.Label15.AutoSize = True @@ -1091,18 +678,6 @@ Partial Class sdgThemes Me.Label15.TabIndex = 29 Me.Label15.Text = "Size:" ' - 'UcrNud7 - ' - Me.UcrNud7.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) - Me.UcrNud7.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.UcrNud7.Location = New System.Drawing.Point(94, 17) - Me.UcrNud7.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) - Me.UcrNud7.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) - Me.UcrNud7.Name = "UcrNud7" - Me.UcrNud7.Size = New System.Drawing.Size(50, 20) - Me.UcrNud7.TabIndex = 30 - Me.UcrNud7.Value = New Decimal(New Integer() {0, 0, 0, 0}) - ' 'Label16 ' Me.Label16.AutoSize = True @@ -1112,16 +687,6 @@ Partial Class sdgThemes Me.Label16.TabIndex = 27 Me.Label16.Text = "Colour:" ' - 'UcrInputComboBox8 - ' - Me.UcrInputComboBox8.AddQuotesIfUnrecognised = True - Me.UcrInputComboBox8.IsReadOnly = False - Me.UcrInputComboBox8.Location = New System.Drawing.Point(72, 68) - Me.UcrInputComboBox8.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) - Me.UcrInputComboBox8.Name = "UcrInputComboBox8" - Me.UcrInputComboBox8.Size = New System.Drawing.Size(137, 21) - Me.UcrInputComboBox8.TabIndex = 28 - ' 'Label17 ' Me.Label17.AutoSize = True @@ -1131,16 +696,6 @@ Partial Class sdgThemes Me.Label17.TabIndex = 25 Me.Label17.Text = "Line Type:" ' - 'UcrInputComboBox9 - ' - Me.UcrInputComboBox9.AddQuotesIfUnrecognised = True - Me.UcrInputComboBox9.IsReadOnly = False - Me.UcrInputComboBox9.Location = New System.Drawing.Point(72, 40) - Me.UcrInputComboBox9.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) - Me.UcrInputComboBox9.Name = "UcrInputComboBox9" - Me.UcrInputComboBox9.Size = New System.Drawing.Size(137, 21) - Me.UcrInputComboBox9.TabIndex = 26 - ' 'GroupBox5 ' Me.GroupBox5.Controls.Add(Me.Label18) @@ -1149,9 +704,9 @@ Partial Class sdgThemes Me.GroupBox5.Controls.Add(Me.UcrNud9) Me.GroupBox5.Controls.Add(Me.Label20) Me.GroupBox5.Controls.Add(Me.UcrNud10) - Me.GroupBox5.Controls.Add(Me.Label21) + Me.GroupBox5.Controls.Add(Me.lblHjustYAxis) Me.GroupBox5.Controls.Add(Me.UcrNud11) - Me.GroupBox5.Controls.Add(Me.Label22) + Me.GroupBox5.Controls.Add(Me.lblSizeYAxis) Me.GroupBox5.Controls.Add(Me.UcrNud12) Me.GroupBox5.Controls.Add(Me.Label23) Me.GroupBox5.Controls.Add(Me.UcrInputComboBox10) @@ -1175,18 +730,6 @@ Partial Class sdgThemes Me.Label18.TabIndex = 37 Me.Label18.Text = "Vjust:" ' - 'UcrNud8 - ' - Me.UcrNud8.DecimalPlaces = New Decimal(New Integer() {1, 0, 0, 0}) - Me.UcrNud8.Increment = New Decimal(New Integer() {1, 0, 0, 65536}) - Me.UcrNud8.Location = New System.Drawing.Point(94, 76) - Me.UcrNud8.Maximum = New Decimal(New Integer() {1, 0, 0, 0}) - Me.UcrNud8.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) - Me.UcrNud8.Name = "UcrNud8" - Me.UcrNud8.Size = New System.Drawing.Size(50, 20) - Me.UcrNud8.TabIndex = 38 - Me.UcrNud8.Value = New Decimal(New Integer() {0, 0, 0, 0}) - ' 'Label19 ' Me.Label19.AutoSize = True @@ -1196,19 +739,7 @@ Partial Class sdgThemes Me.Label19.TabIndex = 35 Me.Label19.Text = "Line Height:" ' - 'UcrNud9 - ' - Me.UcrNud9.DecimalPlaces = New Decimal(New Integer() {1, 0, 0, 0}) - Me.UcrNud9.Increment = New Decimal(New Integer() {1, 0, 0, 65536}) - Me.UcrNud9.Location = New System.Drawing.Point(94, 106) - Me.UcrNud9.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) - Me.UcrNud9.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) - Me.UcrNud9.Name = "UcrNud9" - Me.UcrNud9.Size = New System.Drawing.Size(50, 20) - Me.UcrNud9.TabIndex = 36 - Me.UcrNud9.Value = New Decimal(New Integer() {0, 0, 0, 0}) - ' - 'Label20 + 'Label20 ' Me.Label20.AutoSize = True Me.Label20.Location = New System.Drawing.Point(13, 137) @@ -1217,6 +748,513 @@ Partial Class sdgThemes Me.Label20.TabIndex = 33 Me.Label20.Text = "Angle:" ' + 'lblHjustYAxis + ' + Me.lblHjustYAxis.AutoSize = True + Me.lblHjustYAxis.Location = New System.Drawing.Point(13, 49) + Me.lblHjustYAxis.Name = "lblHjustYAxis" + Me.lblHjustYAxis.Size = New System.Drawing.Size(34, 13) + Me.lblHjustYAxis.TabIndex = 31 + Me.lblHjustYAxis.Text = "Hjust:" + ' + 'lblSizeYAxis + ' + Me.lblSizeYAxis.AutoSize = True + Me.lblSizeYAxis.Location = New System.Drawing.Point(13, 21) + Me.lblSizeYAxis.Name = "lblSizeYAxis" + Me.lblSizeYAxis.Size = New System.Drawing.Size(30, 13) + Me.lblSizeYAxis.TabIndex = 29 + Me.lblSizeYAxis.Text = "Size:" + ' + 'Label23 + ' + Me.Label23.AutoSize = True + Me.Label23.Location = New System.Drawing.Point(13, 220) + Me.Label23.Name = "Label23" + Me.Label23.Size = New System.Drawing.Size(40, 13) + Me.Label23.TabIndex = 27 + Me.Label23.Text = "Colour:" + ' + 'Label24 + ' + Me.Label24.AutoSize = True + Me.Label24.Location = New System.Drawing.Point(13, 196) + Me.Label24.Name = "Label24" + Me.Label24.Size = New System.Drawing.Size(34, 13) + Me.Label24.TabIndex = 25 + Me.Label24.Text = "Face:" + ' + 'Label25 + ' + Me.Label25.AutoSize = True + Me.Label25.Location = New System.Drawing.Point(13, 166) + Me.Label25.Name = "Label25" + Me.Label25.Size = New System.Drawing.Size(39, 13) + Me.Label25.TabIndex = 23 + Me.Label25.Text = "Family:" + ' + 'ucrInputLineEndXTickMarks + ' + Me.ucrInputLineEndXTickMarks.AddQuotesIfUnrecognised = True + Me.ucrInputLineEndXTickMarks.IsReadOnly = False + Me.ucrInputLineEndXTickMarks.Location = New System.Drawing.Point(72, 100) + Me.ucrInputLineEndXTickMarks.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) + Me.ucrInputLineEndXTickMarks.Name = "ucrInputLineEndXTickMarks" + Me.ucrInputLineEndXTickMarks.Size = New System.Drawing.Size(137, 21) + Me.ucrInputLineEndXTickMarks.TabIndex = 32 + ' + 'ucrNudSizeXTickMarks + ' + Me.ucrNudSizeXTickMarks.DecimalPlaces = New Decimal(New Integer() {1, 0, 0, 0}) + Me.ucrNudSizeXTickMarks.Increment = New Decimal(New Integer() {1, 0, 0, 0}) + Me.ucrNudSizeXTickMarks.Location = New System.Drawing.Point(94, 17) + Me.ucrNudSizeXTickMarks.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) + Me.ucrNudSizeXTickMarks.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudSizeXTickMarks.Name = "ucrNudSizeXTickMarks" + Me.ucrNudSizeXTickMarks.Size = New System.Drawing.Size(50, 20) + Me.ucrNudSizeXTickMarks.TabIndex = 30 + Me.ucrNudSizeXTickMarks.Value = New Decimal(New Integer() {0, 0, 0, 0}) + ' + 'ucrInputColourXTickMarks + ' + Me.ucrInputColourXTickMarks.AddQuotesIfUnrecognised = True + Me.ucrInputColourXTickMarks.IsReadOnly = False + Me.ucrInputColourXTickMarks.Location = New System.Drawing.Point(72, 68) + Me.ucrInputColourXTickMarks.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) + Me.ucrInputColourXTickMarks.Name = "ucrInputColourXTickMarks" + Me.ucrInputColourXTickMarks.Size = New System.Drawing.Size(137, 21) + Me.ucrInputColourXTickMarks.TabIndex = 28 + ' + 'ucrInputLineTypeXTickMarks + ' + Me.ucrInputLineTypeXTickMarks.AddQuotesIfUnrecognised = True + Me.ucrInputLineTypeXTickMarks.IsReadOnly = False + Me.ucrInputLineTypeXTickMarks.Location = New System.Drawing.Point(72, 40) + Me.ucrInputLineTypeXTickMarks.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) + Me.ucrInputLineTypeXTickMarks.Name = "ucrInputLineTypeXTickMarks" + Me.ucrInputLineTypeXTickMarks.Size = New System.Drawing.Size(137, 21) + Me.ucrInputLineTypeXTickMarks.TabIndex = 26 + ' + 'ucrNudVjustTopAxis + ' + Me.ucrNudVjustTopAxis.DecimalPlaces = New Decimal(New Integer() {1, 0, 0, 0}) + Me.ucrNudVjustTopAxis.Increment = New Decimal(New Integer() {1, 0, 0, 65536}) + Me.ucrNudVjustTopAxis.Location = New System.Drawing.Point(94, 76) + Me.ucrNudVjustTopAxis.Maximum = New Decimal(New Integer() {1, 0, 0, 0}) + Me.ucrNudVjustTopAxis.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudVjustTopAxis.Name = "ucrNudVjustTopAxis" + Me.ucrNudVjustTopAxis.Size = New System.Drawing.Size(50, 20) + Me.ucrNudVjustTopAxis.TabIndex = 38 + Me.ucrNudVjustTopAxis.Value = New Decimal(New Integer() {0, 0, 0, 0}) + ' + 'ucrNudLineHeightTopAxis + ' + Me.ucrNudLineHeightTopAxis.DecimalPlaces = New Decimal(New Integer() {1, 0, 0, 0}) + Me.ucrNudLineHeightTopAxis.Increment = New Decimal(New Integer() {1, 0, 0, 65536}) + Me.ucrNudLineHeightTopAxis.Location = New System.Drawing.Point(94, 106) + Me.ucrNudLineHeightTopAxis.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) + Me.ucrNudLineHeightTopAxis.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudLineHeightTopAxis.Name = "ucrNudLineHeightTopAxis" + Me.ucrNudLineHeightTopAxis.Size = New System.Drawing.Size(50, 20) + Me.ucrNudLineHeightTopAxis.TabIndex = 36 + Me.ucrNudLineHeightTopAxis.Value = New Decimal(New Integer() {0, 0, 0, 0}) + ' + 'ucrNudAngleTopAxis + ' + Me.ucrNudAngleTopAxis.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudAngleTopAxis.Increment = New Decimal(New Integer() {1, 0, 0, 0}) + Me.ucrNudAngleTopAxis.Location = New System.Drawing.Point(94, 134) + Me.ucrNudAngleTopAxis.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) + Me.ucrNudAngleTopAxis.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudAngleTopAxis.Name = "ucrNudAngleTopAxis" + Me.ucrNudAngleTopAxis.Size = New System.Drawing.Size(50, 20) + Me.ucrNudAngleTopAxis.TabIndex = 34 + Me.ucrNudAngleTopAxis.Value = New Decimal(New Integer() {0, 0, 0, 0}) + ' + 'ucrNudHjustTopAxis + ' + Me.ucrNudHjustTopAxis.DecimalPlaces = New Decimal(New Integer() {1, 0, 0, 0}) + Me.ucrNudHjustTopAxis.Increment = New Decimal(New Integer() {1, 0, 0, 65536}) + Me.ucrNudHjustTopAxis.Location = New System.Drawing.Point(94, 46) + Me.ucrNudHjustTopAxis.Maximum = New Decimal(New Integer() {1, 0, 0, 0}) + Me.ucrNudHjustTopAxis.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudHjustTopAxis.Name = "ucrNudHjustTopAxis" + Me.ucrNudHjustTopAxis.Size = New System.Drawing.Size(50, 20) + Me.ucrNudHjustTopAxis.TabIndex = 32 + Me.ucrNudHjustTopAxis.Value = New Decimal(New Integer() {0, 0, 0, 0}) + ' + 'ucrNudSizeTopaxis + ' + Me.ucrNudSizeTopaxis.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudSizeTopaxis.Increment = New Decimal(New Integer() {1, 0, 0, 0}) + Me.ucrNudSizeTopaxis.Location = New System.Drawing.Point(94, 16) + Me.ucrNudSizeTopaxis.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) + Me.ucrNudSizeTopaxis.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudSizeTopaxis.Name = "ucrNudSizeTopaxis" + Me.ucrNudSizeTopaxis.Size = New System.Drawing.Size(50, 20) + Me.ucrNudSizeTopaxis.TabIndex = 30 + Me.ucrNudSizeTopaxis.Value = New Decimal(New Integer() {0, 0, 0, 0}) + ' + 'ucrInputColourTopAxis + ' + Me.ucrInputColourTopAxis.AddQuotesIfUnrecognised = True + Me.ucrInputColourTopAxis.IsReadOnly = False + Me.ucrInputColourTopAxis.Location = New System.Drawing.Point(73, 217) + Me.ucrInputColourTopAxis.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) + Me.ucrInputColourTopAxis.Name = "ucrInputColourTopAxis" + Me.ucrInputColourTopAxis.Size = New System.Drawing.Size(137, 21) + Me.ucrInputColourTopAxis.TabIndex = 28 + ' + 'ucrInputFaceTopAxis + ' + Me.ucrInputFaceTopAxis.AddQuotesIfUnrecognised = True + Me.ucrInputFaceTopAxis.IsReadOnly = False + Me.ucrInputFaceTopAxis.Location = New System.Drawing.Point(73, 189) + Me.ucrInputFaceTopAxis.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) + Me.ucrInputFaceTopAxis.Name = "ucrInputFaceTopAxis" + Me.ucrInputFaceTopAxis.Size = New System.Drawing.Size(137, 21) + Me.ucrInputFaceTopAxis.TabIndex = 26 + ' + 'ucrInputFamilyTopAxis + ' + Me.ucrInputFamilyTopAxis.AddQuotesIfUnrecognised = True + Me.ucrInputFamilyTopAxis.IsReadOnly = False + Me.ucrInputFamilyTopAxis.Location = New System.Drawing.Point(73, 162) + Me.ucrInputFamilyTopAxis.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) + Me.ucrInputFamilyTopAxis.Name = "ucrInputFamilyTopAxis" + Me.ucrInputFamilyTopAxis.Size = New System.Drawing.Size(137, 21) + Me.ucrInputFamilyTopAxis.TabIndex = 24 + ' + 'ucrInputLineEndTickMarks + ' + Me.ucrInputLineEndTickMarks.AddQuotesIfUnrecognised = True + Me.ucrInputLineEndTickMarks.IsReadOnly = False + Me.ucrInputLineEndTickMarks.Location = New System.Drawing.Point(72, 100) + Me.ucrInputLineEndTickMarks.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) + Me.ucrInputLineEndTickMarks.Name = "ucrInputLineEndTickMarks" + Me.ucrInputLineEndTickMarks.Size = New System.Drawing.Size(137, 21) + Me.ucrInputLineEndTickMarks.TabIndex = 32 + ' + 'ucrNudSizeTickMarks + ' + Me.ucrNudSizeTickMarks.DecimalPlaces = New Decimal(New Integer() {1, 0, 0, 0}) + Me.ucrNudSizeTickMarks.Increment = New Decimal(New Integer() {1, 0, 0, 0}) + Me.ucrNudSizeTickMarks.Location = New System.Drawing.Point(94, 17) + Me.ucrNudSizeTickMarks.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) + Me.ucrNudSizeTickMarks.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudSizeTickMarks.Name = "ucrNudSizeTickMarks" + Me.ucrNudSizeTickMarks.Size = New System.Drawing.Size(50, 20) + Me.ucrNudSizeTickMarks.TabIndex = 30 + Me.ucrNudSizeTickMarks.Value = New Decimal(New Integer() {0, 0, 0, 0}) + ' + 'ucrInputColourTickMarks + ' + Me.ucrInputColourTickMarks.AddQuotesIfUnrecognised = True + Me.ucrInputColourTickMarks.IsReadOnly = False + Me.ucrInputColourTickMarks.Location = New System.Drawing.Point(72, 68) + Me.ucrInputColourTickMarks.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) + Me.ucrInputColourTickMarks.Name = "ucrInputColourTickMarks" + Me.ucrInputColourTickMarks.Size = New System.Drawing.Size(137, 21) + Me.ucrInputColourTickMarks.TabIndex = 28 + ' + 'ucrInputLineTypeTickMarks + ' + Me.ucrInputLineTypeTickMarks.AddQuotesIfUnrecognised = True + Me.ucrInputLineTypeTickMarks.IsReadOnly = False + Me.ucrInputLineTypeTickMarks.Location = New System.Drawing.Point(72, 40) + Me.ucrInputLineTypeTickMarks.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) + Me.ucrInputLineTypeTickMarks.Name = "ucrInputLineTypeTickMarks" + Me.ucrInputLineTypeTickMarks.Size = New System.Drawing.Size(137, 21) + Me.ucrInputLineTypeTickMarks.TabIndex = 26 + ' + 'ucrNudVjust + ' + Me.ucrNudVjust.DecimalPlaces = New Decimal(New Integer() {1, 0, 0, 0}) + Me.ucrNudVjust.Increment = New Decimal(New Integer() {1, 0, 0, 65536}) + Me.ucrNudVjust.Location = New System.Drawing.Point(94, 76) + Me.ucrNudVjust.Maximum = New Decimal(New Integer() {1, 0, 0, 0}) + Me.ucrNudVjust.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudVjust.Name = "ucrNudVjust" + Me.ucrNudVjust.Size = New System.Drawing.Size(50, 20) + Me.ucrNudVjust.TabIndex = 38 + Me.ucrNudVjust.Value = New Decimal(New Integer() {0, 0, 0, 0}) + ' + 'ucrNudLineHeight + ' + Me.ucrNudLineHeight.DecimalPlaces = New Decimal(New Integer() {1, 0, 0, 0}) + Me.ucrNudLineHeight.Increment = New Decimal(New Integer() {1, 0, 0, 65536}) + Me.ucrNudLineHeight.Location = New System.Drawing.Point(94, 106) + Me.ucrNudLineHeight.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) + Me.ucrNudLineHeight.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudLineHeight.Name = "ucrNudLineHeight" + Me.ucrNudLineHeight.Size = New System.Drawing.Size(50, 20) + Me.ucrNudLineHeight.TabIndex = 36 + Me.ucrNudLineHeight.Value = New Decimal(New Integer() {0, 0, 0, 0}) + ' + 'ucrNudAngle + ' + Me.ucrNudAngle.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudAngle.Increment = New Decimal(New Integer() {1, 0, 0, 0}) + Me.ucrNudAngle.Location = New System.Drawing.Point(94, 136) + Me.ucrNudAngle.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) + Me.ucrNudAngle.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudAngle.Name = "ucrNudAngle" + Me.ucrNudAngle.Size = New System.Drawing.Size(50, 20) + Me.ucrNudAngle.TabIndex = 34 + Me.ucrNudAngle.Value = New Decimal(New Integer() {0, 0, 0, 0}) + ' + 'ucrNudHjust + ' + Me.ucrNudHjust.DecimalPlaces = New Decimal(New Integer() {1, 0, 0, 0}) + Me.ucrNudHjust.Increment = New Decimal(New Integer() {1, 0, 0, 65536}) + Me.ucrNudHjust.Location = New System.Drawing.Point(94, 46) + Me.ucrNudHjust.Maximum = New Decimal(New Integer() {1, 0, 0, 0}) + Me.ucrNudHjust.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudHjust.Name = "ucrNudHjust" + Me.ucrNudHjust.Size = New System.Drawing.Size(50, 20) + Me.ucrNudHjust.TabIndex = 32 + Me.ucrNudHjust.Value = New Decimal(New Integer() {0, 0, 0, 0}) + ' + 'ucrNudsize + ' + 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(94, 16) + 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" + Me.ucrNudsize.Size = New System.Drawing.Size(50, 20) + Me.ucrNudsize.TabIndex = 30 + Me.ucrNudsize.Value = New Decimal(New Integer() {0, 0, 0, 0}) + ' + 'ucrInputColour + ' + Me.ucrInputColour.AddQuotesIfUnrecognised = True + Me.ucrInputColour.IsReadOnly = False + Me.ucrInputColour.Location = New System.Drawing.Point(73, 217) + Me.ucrInputColour.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) + Me.ucrInputColour.Name = "ucrInputColour" + Me.ucrInputColour.Size = New System.Drawing.Size(137, 21) + Me.ucrInputColour.TabIndex = 28 + ' + 'ucrInputFace + ' + Me.ucrInputFace.AddQuotesIfUnrecognised = True + Me.ucrInputFace.IsReadOnly = False + Me.ucrInputFace.Location = New System.Drawing.Point(73, 189) + Me.ucrInputFace.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) + Me.ucrInputFace.Name = "ucrInputFace" + Me.ucrInputFace.Size = New System.Drawing.Size(137, 21) + Me.ucrInputFace.TabIndex = 26 + ' + 'ucrInputFamily + ' + Me.ucrInputFamily.AddQuotesIfUnrecognised = True + Me.ucrInputFamily.IsReadOnly = False + Me.ucrInputFamily.Location = New System.Drawing.Point(73, 162) + Me.ucrInputFamily.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) + Me.ucrInputFamily.Name = "ucrInputFamily" + Me.ucrInputFamily.Size = New System.Drawing.Size(137, 21) + Me.ucrInputFamily.TabIndex = 24 + ' + 'UcrInputComboBox1 + ' + Me.UcrInputComboBox1.AddQuotesIfUnrecognised = True + Me.UcrInputComboBox1.IsReadOnly = False + Me.UcrInputComboBox1.Location = New System.Drawing.Point(72, 100) + Me.UcrInputComboBox1.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) + Me.UcrInputComboBox1.Name = "UcrInputComboBox1" + Me.UcrInputComboBox1.Size = New System.Drawing.Size(137, 21) + Me.UcrInputComboBox1.TabIndex = 32 + ' + 'UcrNud1 + ' + Me.UcrNud1.DecimalPlaces = New Decimal(New Integer() {1, 0, 0, 0}) + Me.UcrNud1.Increment = New Decimal(New Integer() {1, 0, 0, 0}) + Me.UcrNud1.Location = New System.Drawing.Point(94, 17) + Me.UcrNud1.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) + Me.UcrNud1.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) + Me.UcrNud1.Name = "UcrNud1" + Me.UcrNud1.Size = New System.Drawing.Size(50, 20) + Me.UcrNud1.TabIndex = 30 + Me.UcrNud1.Value = New Decimal(New Integer() {0, 0, 0, 0}) + ' + 'UcrInputComboBox2 + ' + Me.UcrInputComboBox2.AddQuotesIfUnrecognised = True + Me.UcrInputComboBox2.IsReadOnly = False + Me.UcrInputComboBox2.Location = New System.Drawing.Point(72, 68) + Me.UcrInputComboBox2.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) + Me.UcrInputComboBox2.Name = "UcrInputComboBox2" + Me.UcrInputComboBox2.Size = New System.Drawing.Size(137, 21) + Me.UcrInputComboBox2.TabIndex = 28 + ' + 'UcrInputComboBox3 + ' + Me.UcrInputComboBox3.AddQuotesIfUnrecognised = True + Me.UcrInputComboBox3.IsReadOnly = False + Me.UcrInputComboBox3.Location = New System.Drawing.Point(72, 40) + Me.UcrInputComboBox3.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) + Me.UcrInputComboBox3.Name = "UcrInputComboBox3" + Me.UcrInputComboBox3.Size = New System.Drawing.Size(137, 21) + Me.UcrInputComboBox3.TabIndex = 26 + ' + 'UcrNud2 + ' + Me.UcrNud2.DecimalPlaces = New Decimal(New Integer() {1, 0, 0, 0}) + Me.UcrNud2.Increment = New Decimal(New Integer() {1, 0, 0, 65536}) + Me.UcrNud2.Location = New System.Drawing.Point(94, 76) + Me.UcrNud2.Maximum = New Decimal(New Integer() {1, 0, 0, 0}) + Me.UcrNud2.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) + Me.UcrNud2.Name = "UcrNud2" + Me.UcrNud2.Size = New System.Drawing.Size(50, 20) + Me.UcrNud2.TabIndex = 38 + Me.UcrNud2.Value = New Decimal(New Integer() {0, 0, 0, 0}) + ' + 'UcrNud3 + ' + Me.UcrNud3.DecimalPlaces = New Decimal(New Integer() {1, 0, 0, 0}) + Me.UcrNud3.Increment = New Decimal(New Integer() {1, 0, 0, 65536}) + Me.UcrNud3.Location = New System.Drawing.Point(94, 106) + Me.UcrNud3.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) + Me.UcrNud3.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) + Me.UcrNud3.Name = "UcrNud3" + Me.UcrNud3.Size = New System.Drawing.Size(50, 20) + Me.UcrNud3.TabIndex = 36 + Me.UcrNud3.Value = New Decimal(New Integer() {0, 0, 0, 0}) + ' + 'UcrNud4 + ' + Me.UcrNud4.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) + Me.UcrNud4.Increment = New Decimal(New Integer() {1, 0, 0, 0}) + Me.UcrNud4.Location = New System.Drawing.Point(94, 134) + Me.UcrNud4.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) + Me.UcrNud4.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) + Me.UcrNud4.Name = "UcrNud4" + Me.UcrNud4.Size = New System.Drawing.Size(50, 20) + Me.UcrNud4.TabIndex = 34 + Me.UcrNud4.Value = New Decimal(New Integer() {0, 0, 0, 0}) + ' + 'UcrNud5 + ' + Me.UcrNud5.DecimalPlaces = New Decimal(New Integer() {1, 0, 0, 0}) + Me.UcrNud5.Increment = New Decimal(New Integer() {1, 0, 0, 65536}) + Me.UcrNud5.Location = New System.Drawing.Point(94, 46) + Me.UcrNud5.Maximum = New Decimal(New Integer() {1, 0, 0, 0}) + Me.UcrNud5.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) + Me.UcrNud5.Name = "UcrNud5" + Me.UcrNud5.Size = New System.Drawing.Size(50, 20) + Me.UcrNud5.TabIndex = 32 + Me.UcrNud5.Value = New Decimal(New Integer() {0, 0, 0, 0}) + ' + 'UcrNud6 + ' + Me.UcrNud6.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) + Me.UcrNud6.Increment = New Decimal(New Integer() {1, 0, 0, 0}) + Me.UcrNud6.Location = New System.Drawing.Point(94, 16) + Me.UcrNud6.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) + Me.UcrNud6.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) + Me.UcrNud6.Name = "UcrNud6" + Me.UcrNud6.Size = New System.Drawing.Size(50, 20) + Me.UcrNud6.TabIndex = 30 + Me.UcrNud6.Value = New Decimal(New Integer() {0, 0, 0, 0}) + ' + 'UcrInputComboBox4 + ' + Me.UcrInputComboBox4.AddQuotesIfUnrecognised = True + Me.UcrInputComboBox4.IsReadOnly = False + Me.UcrInputComboBox4.Location = New System.Drawing.Point(73, 217) + Me.UcrInputComboBox4.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) + Me.UcrInputComboBox4.Name = "UcrInputComboBox4" + Me.UcrInputComboBox4.Size = New System.Drawing.Size(137, 21) + Me.UcrInputComboBox4.TabIndex = 28 + ' + 'UcrInputComboBox5 + ' + Me.UcrInputComboBox5.AddQuotesIfUnrecognised = True + Me.UcrInputComboBox5.IsReadOnly = False + Me.UcrInputComboBox5.Location = New System.Drawing.Point(73, 189) + Me.UcrInputComboBox5.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) + Me.UcrInputComboBox5.Name = "UcrInputComboBox5" + Me.UcrInputComboBox5.Size = New System.Drawing.Size(137, 21) + Me.UcrInputComboBox5.TabIndex = 26 + ' + 'UcrInputComboBox6 + ' + Me.UcrInputComboBox6.AddQuotesIfUnrecognised = True + Me.UcrInputComboBox6.IsReadOnly = False + Me.UcrInputComboBox6.Location = New System.Drawing.Point(73, 162) + Me.UcrInputComboBox6.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) + Me.UcrInputComboBox6.Name = "UcrInputComboBox6" + Me.UcrInputComboBox6.Size = New System.Drawing.Size(137, 21) + Me.UcrInputComboBox6.TabIndex = 24 + ' + 'UcrInputComboBox7 + ' + Me.UcrInputComboBox7.AddQuotesIfUnrecognised = True + Me.UcrInputComboBox7.IsReadOnly = False + Me.UcrInputComboBox7.Location = New System.Drawing.Point(72, 100) + Me.UcrInputComboBox7.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) + Me.UcrInputComboBox7.Name = "UcrInputComboBox7" + Me.UcrInputComboBox7.Size = New System.Drawing.Size(137, 21) + Me.UcrInputComboBox7.TabIndex = 32 + ' + 'UcrNud7 + ' + Me.UcrNud7.DecimalPlaces = New Decimal(New Integer() {1, 0, 0, 0}) + Me.UcrNud7.Increment = New Decimal(New Integer() {1, 0, 0, 0}) + Me.UcrNud7.Location = New System.Drawing.Point(94, 17) + Me.UcrNud7.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) + Me.UcrNud7.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) + Me.UcrNud7.Name = "UcrNud7" + Me.UcrNud7.Size = New System.Drawing.Size(50, 20) + Me.UcrNud7.TabIndex = 30 + Me.UcrNud7.Value = New Decimal(New Integer() {0, 0, 0, 0}) + ' + 'UcrInputComboBox8 + ' + Me.UcrInputComboBox8.AddQuotesIfUnrecognised = True + Me.UcrInputComboBox8.IsReadOnly = False + Me.UcrInputComboBox8.Location = New System.Drawing.Point(72, 68) + Me.UcrInputComboBox8.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) + Me.UcrInputComboBox8.Name = "UcrInputComboBox8" + Me.UcrInputComboBox8.Size = New System.Drawing.Size(137, 21) + Me.UcrInputComboBox8.TabIndex = 28 + ' + 'UcrInputComboBox9 + ' + Me.UcrInputComboBox9.AddQuotesIfUnrecognised = True + Me.UcrInputComboBox9.IsReadOnly = False + Me.UcrInputComboBox9.Location = New System.Drawing.Point(72, 40) + Me.UcrInputComboBox9.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) + Me.UcrInputComboBox9.Name = "UcrInputComboBox9" + Me.UcrInputComboBox9.Size = New System.Drawing.Size(137, 21) + Me.UcrInputComboBox9.TabIndex = 26 + ' + 'UcrNud8 + ' + Me.UcrNud8.DecimalPlaces = New Decimal(New Integer() {1, 0, 0, 0}) + Me.UcrNud8.Increment = New Decimal(New Integer() {1, 0, 0, 65536}) + Me.UcrNud8.Location = New System.Drawing.Point(94, 76) + Me.UcrNud8.Maximum = New Decimal(New Integer() {1, 0, 0, 0}) + Me.UcrNud8.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) + Me.UcrNud8.Name = "UcrNud8" + Me.UcrNud8.Size = New System.Drawing.Size(50, 20) + Me.UcrNud8.TabIndex = 38 + Me.UcrNud8.Value = New Decimal(New Integer() {0, 0, 0, 0}) + ' + 'UcrNud9 + ' + Me.UcrNud9.DecimalPlaces = New Decimal(New Integer() {1, 0, 0, 0}) + Me.UcrNud9.Increment = New Decimal(New Integer() {1, 0, 0, 65536}) + Me.UcrNud9.Location = New System.Drawing.Point(94, 106) + Me.UcrNud9.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) + Me.UcrNud9.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) + Me.UcrNud9.Name = "UcrNud9" + Me.UcrNud9.Size = New System.Drawing.Size(50, 20) + Me.UcrNud9.TabIndex = 36 + Me.UcrNud9.Value = New Decimal(New Integer() {0, 0, 0, 0}) + ' 'UcrNud10 ' Me.UcrNud10.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) @@ -1229,15 +1267,6 @@ Partial Class sdgThemes Me.UcrNud10.TabIndex = 34 Me.UcrNud10.Value = New Decimal(New Integer() {0, 0, 0, 0}) ' - 'Label21 - ' - Me.Label21.AutoSize = True - Me.Label21.Location = New System.Drawing.Point(13, 49) - Me.Label21.Name = "Label21" - Me.Label21.Size = New System.Drawing.Size(34, 13) - Me.Label21.TabIndex = 31 - Me.Label21.Text = "Hjust:" - ' 'UcrNud11 ' Me.UcrNud11.DecimalPlaces = New Decimal(New Integer() {1, 0, 0, 0}) @@ -1250,15 +1279,6 @@ Partial Class sdgThemes Me.UcrNud11.TabIndex = 32 Me.UcrNud11.Value = New Decimal(New Integer() {0, 0, 0, 0}) ' - 'Label22 - ' - Me.Label22.AutoSize = True - Me.Label22.Location = New System.Drawing.Point(13, 21) - Me.Label22.Name = "Label22" - Me.Label22.Size = New System.Drawing.Size(30, 13) - Me.Label22.TabIndex = 29 - Me.Label22.Text = "Size:" - ' 'UcrNud12 ' Me.UcrNud12.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) @@ -1271,15 +1291,6 @@ Partial Class sdgThemes Me.UcrNud12.TabIndex = 30 Me.UcrNud12.Value = New Decimal(New Integer() {0, 0, 0, 0}) ' - 'Label23 - ' - Me.Label23.AutoSize = True - Me.Label23.Location = New System.Drawing.Point(13, 220) - Me.Label23.Name = "Label23" - Me.Label23.Size = New System.Drawing.Size(40, 13) - Me.Label23.TabIndex = 27 - Me.Label23.Text = "Colour:" - ' 'UcrInputComboBox10 ' Me.UcrInputComboBox10.AddQuotesIfUnrecognised = True @@ -1290,15 +1301,6 @@ Partial Class sdgThemes Me.UcrInputComboBox10.Size = New System.Drawing.Size(137, 21) Me.UcrInputComboBox10.TabIndex = 28 ' - 'Label24 - ' - Me.Label24.AutoSize = True - Me.Label24.Location = New System.Drawing.Point(13, 196) - Me.Label24.Name = "Label24" - Me.Label24.Size = New System.Drawing.Size(34, 13) - Me.Label24.TabIndex = 25 - Me.Label24.Text = "Face:" - ' 'UcrInputComboBox11 ' Me.UcrInputComboBox11.AddQuotesIfUnrecognised = True @@ -1309,15 +1311,6 @@ Partial Class sdgThemes Me.UcrInputComboBox11.Size = New System.Drawing.Size(137, 21) Me.UcrInputComboBox11.TabIndex = 26 ' - 'Label25 - ' - Me.Label25.AutoSize = True - Me.Label25.Location = New System.Drawing.Point(13, 166) - Me.Label25.Name = "Label25" - Me.Label25.Size = New System.Drawing.Size(39, 13) - Me.Label25.TabIndex = 23 - Me.Label25.Text = "Family:" - ' 'UcrInputComboBox12 ' Me.UcrInputComboBox12.AddQuotesIfUnrecognised = True @@ -1328,6 +1321,13 @@ Partial Class sdgThemes Me.UcrInputComboBox12.Size = New System.Drawing.Size(137, 21) Me.UcrInputComboBox12.TabIndex = 24 ' + 'ucrBaseSubdialogue + ' + Me.ucrBaseSubdialogue.Location = New System.Drawing.Point(168, 487) + Me.ucrBaseSubdialogue.Name = "ucrBaseSubdialogue" + Me.ucrBaseSubdialogue.Size = New System.Drawing.Size(142, 30) + Me.ucrBaseSubdialogue.TabIndex = 0 + ' 'sdgThemes ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -1371,12 +1371,12 @@ Partial Class sdgThemes Friend WithEvents grpTableOptions As GroupBox Friend WithEvents tbYaxis As TabPage Friend WithEvents GroupBox1 As GroupBox - Friend WithEvents lblSizeSegment As Label - Friend WithEvents ucrNudSizeSegment As ucrNud - Friend WithEvents lblColourSegment As Label - Friend WithEvents ucrInputColourSegment As ucrInputComboBox - Friend WithEvents lblLineType As Label - Friend WithEvents ucrInputLineType As ucrInputComboBox + Friend WithEvents lblSizeTickMarks As Label + Friend WithEvents ucrNudSizeTickMarks As ucrNud + Friend WithEvents lblColourTickMarks As Label + Friend WithEvents ucrInputColourTickMarks As ucrInputComboBox + Friend WithEvents lblLineTypeTickMarks As Label + Friend WithEvents ucrInputLineTypeTickMarks As ucrInputComboBox Friend WithEvents grpAxisLabel As GroupBox Friend WithEvents lblVjust As Label Friend WithEvents ucrNudVjust As ucrNud @@ -1394,8 +1394,8 @@ Partial Class sdgThemes Friend WithEvents ucrInputFace As ucrInputComboBox Friend WithEvents lblFamily As Label Friend WithEvents ucrInputFamily As ucrInputComboBox - Friend WithEvents lblLineEnd As Label - Friend WithEvents ucrInputLineEnd As ucrInputComboBox + Friend WithEvents lblLineEndTickMarks As Label + Friend WithEvents ucrInputLineEndTickMarks As ucrInputComboBox Friend WithEvents grpAxisLabelTopAxis As GroupBox Friend WithEvents lblVjustTopAxis As Label Friend WithEvents ucrNudVjustTopAxis As ucrNud @@ -1464,9 +1464,9 @@ Partial Class sdgThemes Friend WithEvents UcrNud9 As ucrNud Friend WithEvents Label20 As Label Friend WithEvents UcrNud10 As ucrNud - Friend WithEvents Label21 As Label + Friend WithEvents lblHjustYAxis As Label Friend WithEvents UcrNud11 As ucrNud - Friend WithEvents Label22 As Label + Friend WithEvents lblSizeYAxis As Label Friend WithEvents UcrNud12 As ucrNud Friend WithEvents Label23 As Label Friend WithEvents UcrInputComboBox10 As ucrInputComboBox diff --git a/instat/sdgThemes.vb b/instat/sdgThemes.vb index 9984a0dbda7..e659e5f35a8 100644 --- a/instat/sdgThemes.vb +++ b/instat/sdgThemes.vb @@ -93,9 +93,9 @@ Public Class sdgThemes ucrInputFamily.bUpdateRCodeFromControl = False 'Tick Marks Along Axes - ucrNudSizeSegment.SetParameter(New RParameter("size")) + ucrNudSizeTickMarks.SetParameter(New RParameter("size")) - ucrInputLineType.SetParameter(New RParameter("linetype")) + ucrInputLineTypeTickMarks.SetParameter(New RParameter("linetype")) dctucrInputLineType.Add("Blank", Chr(34) & "blank" & Chr(34)) dctucrInputLineType.Add("Solid", Chr(34) & "solid" & Chr(34)) dctucrInputLineType.Add("Dashed", Chr(34) & "dashed" & Chr(34)) @@ -107,31 +107,32 @@ Public Class sdgThemes dctucrInputLineType.Add("F1", Chr(34) & "F1" & Chr(34)) dctucrInputLineType.Add("4C88C488", Chr(34) & "4C88C488" & Chr(34)) dctucrInputLineType.Add("12345678", Chr(34) & "12345678" & Chr(34)) - ucrInputLineType.SetItems(dctucrInputLineType) - ucrInputLineType.SetRDefault(Chr(34) & "blank" & Chr(34)) - ucrInputLineType.bUpdateRCodeFromControl = False + ucrInputLineTypeTickMarks.SetItems(dctucrInputLineType) + ucrInputLineTypeTickMarks.SetRDefault(Chr(34) & "blank" & Chr(34)) + ucrInputLineTypeTickMarks.bUpdateRCodeFromControl = False - ucrInputColourSegment.SetParameter(New RParameter("colour")) + ucrInputColourTickMarks.SetParameter(New RParameter("colour")) dctucrInputColourSegment.Add("Black", Chr(34) & "black" & Chr(34)) dctucrInputColourSegment.Add("Red", Chr(34) & "red" & Chr(34)) dctucrInputColourSegment.Add("Blue", Chr(34) & "blue" & Chr(34)) dctucrInputColourSegment.Add("Grey", Chr(34) & "grey" & Chr(34)) dctucrInputColourSegment.Add("Yellow", Chr(34) & "yellow" & Chr(34)) dctucrInputColourSegment.Add("Yellow-Green", Chr(34) & "yellowgreen" & Chr(34)) - ucrInputColourSegment.SetItems(dctucrInputColourSegment) - ucrInputColourSegment.SetRDefault(Chr(34) & "black" & Chr(34)) + ucrInputColourTickMarks.SetItems(dctucrInputColourSegment) + ucrInputColourTickMarks.SetRDefault(Chr(34) & "black" & Chr(34)) - ucrInputLineEnd.SetParameter(New RParameter("lineend")) - dctucrInputLineEnd.Add("NULL", Chr(34) & "NULL" & Chr(34)) + ucrInputLineEndTickMarks.SetParameter(New RParameter("lineend")) + ' dctucrInputLineEnd.Add("NULL", Chr(34) & "NULL" & Chr(34)) dctucrInputLineEnd.Add("round", Chr(34) & "round" & Chr(34)) dctucrInputLineEnd.Add("butt", Chr(34) & "butt" & Chr(34)) dctucrInputLineEnd.Add("square", Chr(34) & "square" & Chr(34)) - ucrInputLineEnd.SetItems(dctucrInputLineEnd) - ucrInputLineEnd.SetRDefault(Chr(34) & "NULL" & Chr(34)) - ucrInputLineEnd.bUpdateRCodeFromControl = False + ucrInputLineEndTickMarks.SetItems(dctucrInputLineEnd) + ucrInputLineEndTickMarks.SetRDefault(Chr(34) & "square" & Chr(34)) + ucrInputLineEndTickMarks.bUpdateRCodeFromControl = False 'X axis Label Top Axis ucrNudSizeTopaxis.SetParameter(New RParameter("size")) + ucrNudSizeTopaxis.Increment = 0.1 ucrNudAngleTopAxis.SetParameter(New RParameter("angle")) ucrNudAngleTopAxis.SetMinMax(0, 360) ucrNudHjustTopAxis.SetParameter(New RParameter("hjust")) @@ -187,7 +188,7 @@ Public Class sdgThemes 'Tick Marks Along Axes ucrNudSizeXTickMarks.SetParameter(New RParameter("size")) - + ucrNudSizeXTickMarks.Increment = 0.1 ucrInputLineTypeXTickMarks.SetParameter(New RParameter("linetype")) dctucrInputLineTypeXTickMarks.Add("Blank", Chr(34) & "blank" & Chr(34)) dctucrInputLineTypeXTickMarks.Add("Solid", Chr(34) & "solid" & Chr(34)) @@ -212,15 +213,15 @@ Public Class sdgThemes dctucrInputColourXTickMarkst.Add("Yellow", Chr(34) & "yellow" & Chr(34)) dctucrInputColourXTickMarkst.Add("Yellow-Green", Chr(34) & "yellowgreen" & Chr(34)) ucrInputColourXTickMarks.SetItems(dctucrInputColourXTickMarkst) - 'ucrInputColourXTickMarks.SetRDefault(Chr(34) & "black" & Chr(34)) + ucrInputColourXTickMarks.SetRDefault(Chr(34) & "black" & Chr(34)) ucrInputLineEndXTickMarks.SetParameter(New RParameter("lineend")) - dctucrInputLineEndXTickMarks.Add("None", Chr(34) & "NULL" & Chr(34)) + 'dctucrInputLineEndXTickMarks.Add("None", Chr(34) & "NULL" & Chr(34)) dctucrInputLineEndXTickMarks.Add("round", Chr(34) & "round" & Chr(34)) dctucrInputLineEndXTickMarks.Add("butt", Chr(34) & "butt" & Chr(34)) dctucrInputLineEndXTickMarks.Add("square", Chr(34) & "square" & Chr(34)) ucrInputLineEndXTickMarks.SetItems(dctucrInputLineEndXTickMarks) - ucrInputLineEndXTickMarks.SetRDefault(Chr(34) & "NULL" & Chr(34)) + ucrInputLineEndXTickMarks.SetRDefault(Chr(34) & "square" & Chr(34)) ucrInputLineEndXTickMarks.bUpdateRCodeFromControl = False bControlsInitialised = True @@ -230,8 +231,6 @@ Public Class sdgThemes If Not bControlsInitialised Then InitialiseControls() End If - - clsBaseOperator.AddParameter("theme", clsRFunctionParameter:=clsGgThemes, iPosition:=15) clsGgThemes.SetRCommand("theme") @@ -271,10 +270,10 @@ Public Class sdgThemes ucrInputFamily.SetRCode(clsElementText, bReset) 'X axis Label Top Axis - ucrNudSizeSegment.SetRCode(clsElementLine, bReset) - ucrInputColourSegment.SetRCode(clsElementLine, bReset) - ucrInputLineType.SetRCode(clsElementLine, bReset) - ucrInputLineEnd.SetRCode(clsElementLine, bReset) + ucrNudSizeTickMarks.SetRCode(clsElementLine, bReset) + ucrInputColourTickMarks.SetRCode(clsElementLine, bReset) + ucrInputLineTypeTickMarks.SetRCode(clsElementLine, bReset) + ucrInputLineEndTickMarks.SetRCode(clsElementLine, bReset) ucrNudAngleTopAxis.SetRCode(clsElementText, bReset) ucrNudHjustTopAxis.SetRCode(clsElementText, bReset) From a29f4e15bdd3096f447108f132c48f83f73ae969 Mon Sep 17 00:00:00 2001 From: Steven Date: Fri, 2 Jun 2017 22:36:54 +0300 Subject: [PATCH 075/154] . --- instat/sdgPlots.vb | 1 - instat/sdgThemes.vb | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/instat/sdgPlots.vb b/instat/sdgPlots.vb index 9ae100ea982..cbc46a7fd57 100644 --- a/instat/sdgPlots.vb +++ b/instat/sdgPlots.vb @@ -471,7 +471,6 @@ Public Class sdgPlots End Sub - 'Warning/Task to be discussed: need to disable ok on dlg's when layers are not complete on subdialogues + warning message... 'Warning: actually this will be very hard to implement until the global aes, set from the main layer are properly communicated to plots. Global aes might fill in missing mandatory aes... End Class \ No newline at end of file diff --git a/instat/sdgThemes.vb b/instat/sdgThemes.vb index e659e5f35a8..3289e322797 100644 --- a/instat/sdgThemes.vb +++ b/instat/sdgThemes.vb @@ -94,6 +94,7 @@ Public Class sdgThemes 'Tick Marks Along Axes ucrNudSizeTickMarks.SetParameter(New RParameter("size")) + ucrNudSizeTickMarks.Increment = 0.1 ucrInputLineTypeTickMarks.SetParameter(New RParameter("linetype")) dctucrInputLineType.Add("Blank", Chr(34) & "blank" & Chr(34)) From 76d7f00e054e0f85f0c6d8406911e024dd6635f2 Mon Sep 17 00:00:00 2001 From: Steven Date: Fri, 2 Jun 2017 23:02:53 +0300 Subject: [PATCH 076/154] . --- instat/sdgThemes.Designer.vb | 1300 +++++++++++++++++----------------- instat/sdgThemes.vb | 7 +- 2 files changed, 654 insertions(+), 653 deletions(-) diff --git a/instat/sdgThemes.Designer.vb b/instat/sdgThemes.Designer.vb index 9444d5d5491..802330a8611 100644 --- a/instat/sdgThemes.Designer.vb +++ b/instat/sdgThemes.Designer.vb @@ -27,109 +27,109 @@ Partial Class sdgThemes Me.grpTableOptions = New System.Windows.Forms.GroupBox() Me.grpTickLabels = New System.Windows.Forms.GroupBox() Me.lblLineEndXtickMarks = New System.Windows.Forms.Label() + Me.ucrInputLineEndXTickMarks = New instat.ucrInputComboBox() Me.lblSizeXTickMarks = New System.Windows.Forms.Label() + Me.ucrNudSizeXTickLabels = New instat.ucrNud() Me.lblColourXTickMarks = New System.Windows.Forms.Label() + Me.ucrInputColourXTickMarks = New instat.ucrInputComboBox() Me.lbllineTypeXTickMarks = New System.Windows.Forms.Label() + Me.ucrInputLineTypeXTickMarks = New instat.ucrInputComboBox() Me.grpAxisLabelTopAxis = New System.Windows.Forms.GroupBox() Me.lblVjustTopAxis = New System.Windows.Forms.Label() + Me.ucrNudVjustTopAxis = New instat.ucrNud() Me.lblLineHeightTopAxis = New System.Windows.Forms.Label() + Me.ucrNudLineHeightTopAxis = New instat.ucrNud() Me.lblAngleTop = New System.Windows.Forms.Label() + Me.ucrNudAngleTopAxis = New instat.ucrNud() Me.lblHjustTopAxis = New System.Windows.Forms.Label() + Me.ucrNudHjustTopAxis = New instat.ucrNud() Me.lblSizeTopaxis = New System.Windows.Forms.Label() + Me.ucrNudSizeTopaxis = New instat.ucrNud() Me.lblColourTopAxis = New System.Windows.Forms.Label() + Me.ucrInputColourTopAxis = New instat.ucrInputComboBox() Me.lblFaceTopAxis = New System.Windows.Forms.Label() + Me.ucrInputFaceTopAxis = New instat.ucrInputComboBox() Me.lblFamilyTopAxis = New System.Windows.Forms.Label() + Me.ucrInputFamilyTopAxis = New instat.ucrInputComboBox() Me.GroupBox1 = New System.Windows.Forms.GroupBox() Me.lblLineEndTickMarks = New System.Windows.Forms.Label() + Me.ucrInputLineEndTickMarks = New instat.ucrInputComboBox() Me.lblSizeTickMarks = New System.Windows.Forms.Label() + Me.ucrNudSizeTickMarks = New instat.ucrNud() Me.lblColourTickMarks = New System.Windows.Forms.Label() + Me.ucrInputColourTickMarks = New instat.ucrInputComboBox() Me.lblLineTypeTickMarks = New System.Windows.Forms.Label() + Me.ucrInputLineTypeTickMarks = New instat.ucrInputComboBox() Me.grpAxisLabel = New System.Windows.Forms.GroupBox() Me.lblVjust = New System.Windows.Forms.Label() + Me.ucrNudVjust = New instat.ucrNud() Me.lblLineHeight = New System.Windows.Forms.Label() + Me.ucrNudLineHeight = New instat.ucrNud() Me.lblAngle = New System.Windows.Forms.Label() + Me.ucrNudAngle = New instat.ucrNud() Me.lblHjust = New System.Windows.Forms.Label() + Me.ucrNudHjust = New instat.ucrNud() Me.lblSize = New System.Windows.Forms.Label() + Me.ucrNudsize = New instat.ucrNud() Me.Label2 = New System.Windows.Forms.Label() + Me.ucrInputColour = New instat.ucrInputComboBox() Me.lblFace = New System.Windows.Forms.Label() + Me.ucrInputFace = New instat.ucrInputComboBox() Me.lblFamily = New System.Windows.Forms.Label() + Me.ucrInputFamily = New instat.ucrInputComboBox() Me.tbYaxis = New System.Windows.Forms.TabPage() Me.GroupBox2 = New System.Windows.Forms.GroupBox() Me.Label1 = New System.Windows.Forms.Label() + Me.UcrInputComboBox1 = New instat.ucrInputComboBox() Me.Label3 = New System.Windows.Forms.Label() + Me.ucrNudSizeTickLabelsYAxis = New instat.ucrNud() Me.Label4 = New System.Windows.Forms.Label() + Me.UcrInputComboBox2 = New instat.ucrInputComboBox() Me.Label5 = New System.Windows.Forms.Label() + Me.UcrInputComboBox3 = New instat.ucrInputComboBox() Me.GroupBox3 = New System.Windows.Forms.GroupBox() Me.Label6 = New System.Windows.Forms.Label() + Me.ucrNudVjustTopYAxis = New instat.ucrNud() Me.Label7 = New System.Windows.Forms.Label() + Me.ucrNudLineHeightTopYAxis = New instat.ucrNud() Me.Label8 = New System.Windows.Forms.Label() + Me.ucrNudAngleTopYAxis = New instat.ucrNud() Me.Label9 = New System.Windows.Forms.Label() + Me.ucrNudHjustTopYAxis = New instat.ucrNud() Me.Label10 = New System.Windows.Forms.Label() + Me.ucrNudSizeTopYAxis = New instat.ucrNud() Me.Label11 = New System.Windows.Forms.Label() + Me.UcrInputComboBox4 = New instat.ucrInputComboBox() Me.Label12 = New System.Windows.Forms.Label() + Me.UcrInputComboBox5 = New instat.ucrInputComboBox() Me.Label13 = New System.Windows.Forms.Label() + Me.UcrInputComboBox6 = New instat.ucrInputComboBox() Me.GroupBox4 = New System.Windows.Forms.GroupBox() Me.Label14 = New System.Windows.Forms.Label() + Me.UcrInputComboBox7 = New instat.ucrInputComboBox() Me.Label15 = New System.Windows.Forms.Label() + Me.ucrNudSizeTickMarksYAxis = New instat.ucrNud() Me.Label16 = New System.Windows.Forms.Label() + Me.UcrInputComboBox8 = New instat.ucrInputComboBox() Me.Label17 = New System.Windows.Forms.Label() + Me.UcrInputComboBox9 = New instat.ucrInputComboBox() Me.GroupBox5 = New System.Windows.Forms.GroupBox() - Me.Label18 = New System.Windows.Forms.Label() - Me.Label19 = New System.Windows.Forms.Label() + Me.lblVjustYAxis = New System.Windows.Forms.Label() + Me.ucrNudVjustYAxis = New instat.ucrNud() + Me.lblLineHeightYAxis = New System.Windows.Forms.Label() + Me.ucrNudLineHeightYAxis = New instat.ucrNud() Me.Label20 = New System.Windows.Forms.Label() + Me.ucrNudLAngle = New instat.ucrNud() Me.lblHjustYAxis = New System.Windows.Forms.Label() + Me.ucrNudHjustYAxis = New instat.ucrNud() Me.lblSizeYAxis = New System.Windows.Forms.Label() - Me.Label23 = New System.Windows.Forms.Label() - Me.Label24 = New System.Windows.Forms.Label() - Me.Label25 = New System.Windows.Forms.Label() - Me.ucrInputLineEndXTickMarks = New instat.ucrInputComboBox() - Me.ucrNudSizeXTickMarks = New instat.ucrNud() - Me.ucrInputColourXTickMarks = New instat.ucrInputComboBox() - Me.ucrInputLineTypeXTickMarks = New instat.ucrInputComboBox() - Me.ucrNudVjustTopAxis = New instat.ucrNud() - Me.ucrNudLineHeightTopAxis = New instat.ucrNud() - Me.ucrNudAngleTopAxis = New instat.ucrNud() - Me.ucrNudHjustTopAxis = New instat.ucrNud() - Me.ucrNudSizeTopaxis = New instat.ucrNud() - Me.ucrInputColourTopAxis = New instat.ucrInputComboBox() - Me.ucrInputFaceTopAxis = New instat.ucrInputComboBox() - Me.ucrInputFamilyTopAxis = New instat.ucrInputComboBox() - Me.ucrInputLineEndTickMarks = New instat.ucrInputComboBox() - Me.ucrNudSizeTickMarks = New instat.ucrNud() - Me.ucrInputColourTickMarks = New instat.ucrInputComboBox() - Me.ucrInputLineTypeTickMarks = New instat.ucrInputComboBox() - Me.ucrNudVjust = New instat.ucrNud() - Me.ucrNudLineHeight = New instat.ucrNud() - Me.ucrNudAngle = New instat.ucrNud() - Me.ucrNudHjust = New instat.ucrNud() - Me.ucrNudsize = New instat.ucrNud() - Me.ucrInputColour = New instat.ucrInputComboBox() - Me.ucrInputFace = New instat.ucrInputComboBox() - Me.ucrInputFamily = New instat.ucrInputComboBox() - Me.UcrInputComboBox1 = New instat.ucrInputComboBox() - Me.UcrNud1 = New instat.ucrNud() - Me.UcrInputComboBox2 = New instat.ucrInputComboBox() - Me.UcrInputComboBox3 = New instat.ucrInputComboBox() - Me.UcrNud2 = New instat.ucrNud() - Me.UcrNud3 = New instat.ucrNud() - Me.UcrNud4 = New instat.ucrNud() - Me.UcrNud5 = New instat.ucrNud() - Me.UcrNud6 = New instat.ucrNud() - Me.UcrInputComboBox4 = New instat.ucrInputComboBox() - Me.UcrInputComboBox5 = New instat.ucrInputComboBox() - Me.UcrInputComboBox6 = New instat.ucrInputComboBox() - Me.UcrInputComboBox7 = New instat.ucrInputComboBox() - Me.UcrNud7 = New instat.ucrNud() - Me.UcrInputComboBox8 = New instat.ucrInputComboBox() - Me.UcrInputComboBox9 = New instat.ucrInputComboBox() - Me.UcrNud8 = New instat.ucrNud() - Me.UcrNud9 = New instat.ucrNud() - Me.UcrNud10 = New instat.ucrNud() - Me.UcrNud11 = New instat.ucrNud() - Me.UcrNud12 = New instat.ucrNud() + Me.ucrNudSizeYAxis = New instat.ucrNud() + Me.lblColourYAxis = New System.Windows.Forms.Label() Me.UcrInputComboBox10 = New instat.ucrInputComboBox() + Me.lblFaceYAxis = New System.Windows.Forms.Label() Me.UcrInputComboBox11 = New instat.ucrInputComboBox() - Me.UcrInputComboBox12 = New instat.ucrInputComboBox() + Me.lblFamilyYAxis = New System.Windows.Forms.Label() + Me.crInputComboBox12 = New instat.ucrInputComboBox() Me.ucrBaseSubdialogue = New instat.ucrButtonsSubdialogue() Me.tbXaxis.SuspendLayout() Me.tbAxis.SuspendLayout() @@ -184,7 +184,7 @@ Partial Class sdgThemes Me.grpTickLabels.Controls.Add(Me.lblLineEndXtickMarks) Me.grpTickLabels.Controls.Add(Me.ucrInputLineEndXTickMarks) Me.grpTickLabels.Controls.Add(Me.lblSizeXTickMarks) - Me.grpTickLabels.Controls.Add(Me.ucrNudSizeXTickMarks) + Me.grpTickLabels.Controls.Add(Me.ucrNudSizeXTickLabels) Me.grpTickLabels.Controls.Add(Me.lblColourXTickMarks) Me.grpTickLabels.Controls.Add(Me.ucrInputColourXTickMarks) Me.grpTickLabels.Controls.Add(Me.lbllineTypeXTickMarks) @@ -205,6 +205,16 @@ Partial Class sdgThemes Me.lblLineEndXtickMarks.TabIndex = 31 Me.lblLineEndXtickMarks.Text = "Line End:" ' + 'ucrInputLineEndXTickMarks + ' + Me.ucrInputLineEndXTickMarks.AddQuotesIfUnrecognised = True + Me.ucrInputLineEndXTickMarks.IsReadOnly = False + Me.ucrInputLineEndXTickMarks.Location = New System.Drawing.Point(72, 100) + Me.ucrInputLineEndXTickMarks.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) + Me.ucrInputLineEndXTickMarks.Name = "ucrInputLineEndXTickMarks" + Me.ucrInputLineEndXTickMarks.Size = New System.Drawing.Size(137, 21) + Me.ucrInputLineEndXTickMarks.TabIndex = 32 + ' 'lblSizeXTickMarks ' Me.lblSizeXTickMarks.AutoSize = True @@ -214,6 +224,18 @@ Partial Class sdgThemes Me.lblSizeXTickMarks.TabIndex = 29 Me.lblSizeXTickMarks.Text = "Size:" ' + 'ucrNudSizeXTickLabels + ' + Me.ucrNudSizeXTickLabels.DecimalPlaces = New Decimal(New Integer() {1, 0, 0, 0}) + Me.ucrNudSizeXTickLabels.Increment = New Decimal(New Integer() {1, 0, 0, 0}) + Me.ucrNudSizeXTickLabels.Location = New System.Drawing.Point(94, 17) + Me.ucrNudSizeXTickLabels.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) + Me.ucrNudSizeXTickLabels.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudSizeXTickLabels.Name = "ucrNudSizeXTickLabels" + Me.ucrNudSizeXTickLabels.Size = New System.Drawing.Size(50, 20) + Me.ucrNudSizeXTickLabels.TabIndex = 30 + Me.ucrNudSizeXTickLabels.Value = New Decimal(New Integer() {0, 0, 0, 0}) + ' 'lblColourXTickMarks ' Me.lblColourXTickMarks.AutoSize = True @@ -223,6 +245,16 @@ Partial Class sdgThemes Me.lblColourXTickMarks.TabIndex = 27 Me.lblColourXTickMarks.Text = "Colour:" ' + 'ucrInputColourXTickMarks + ' + Me.ucrInputColourXTickMarks.AddQuotesIfUnrecognised = True + Me.ucrInputColourXTickMarks.IsReadOnly = False + Me.ucrInputColourXTickMarks.Location = New System.Drawing.Point(72, 68) + Me.ucrInputColourXTickMarks.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) + Me.ucrInputColourXTickMarks.Name = "ucrInputColourXTickMarks" + Me.ucrInputColourXTickMarks.Size = New System.Drawing.Size(137, 21) + Me.ucrInputColourXTickMarks.TabIndex = 28 + ' 'lbllineTypeXTickMarks ' Me.lbllineTypeXTickMarks.AutoSize = True @@ -232,6 +264,16 @@ Partial Class sdgThemes Me.lbllineTypeXTickMarks.TabIndex = 25 Me.lbllineTypeXTickMarks.Text = "Line Type:" ' + 'ucrInputLineTypeXTickMarks + ' + Me.ucrInputLineTypeXTickMarks.AddQuotesIfUnrecognised = True + Me.ucrInputLineTypeXTickMarks.IsReadOnly = False + Me.ucrInputLineTypeXTickMarks.Location = New System.Drawing.Point(72, 40) + Me.ucrInputLineTypeXTickMarks.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) + Me.ucrInputLineTypeXTickMarks.Name = "ucrInputLineTypeXTickMarks" + Me.ucrInputLineTypeXTickMarks.Size = New System.Drawing.Size(137, 21) + Me.ucrInputLineTypeXTickMarks.TabIndex = 26 + ' 'grpAxisLabelTopAxis ' Me.grpAxisLabelTopAxis.Controls.Add(Me.lblVjustTopAxis) @@ -266,6 +308,18 @@ Partial Class sdgThemes Me.lblVjustTopAxis.TabIndex = 37 Me.lblVjustTopAxis.Text = "Vjust:" ' + 'ucrNudVjustTopAxis + ' + Me.ucrNudVjustTopAxis.DecimalPlaces = New Decimal(New Integer() {1, 0, 0, 0}) + Me.ucrNudVjustTopAxis.Increment = New Decimal(New Integer() {1, 0, 0, 65536}) + Me.ucrNudVjustTopAxis.Location = New System.Drawing.Point(94, 76) + Me.ucrNudVjustTopAxis.Maximum = New Decimal(New Integer() {1, 0, 0, 0}) + Me.ucrNudVjustTopAxis.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudVjustTopAxis.Name = "ucrNudVjustTopAxis" + Me.ucrNudVjustTopAxis.Size = New System.Drawing.Size(50, 20) + Me.ucrNudVjustTopAxis.TabIndex = 38 + Me.ucrNudVjustTopAxis.Value = New Decimal(New Integer() {0, 0, 0, 0}) + ' 'lblLineHeightTopAxis ' Me.lblLineHeightTopAxis.AutoSize = True @@ -275,6 +329,18 @@ Partial Class sdgThemes Me.lblLineHeightTopAxis.TabIndex = 35 Me.lblLineHeightTopAxis.Text = "Line Height:" ' + 'ucrNudLineHeightTopAxis + ' + Me.ucrNudLineHeightTopAxis.DecimalPlaces = New Decimal(New Integer() {1, 0, 0, 0}) + Me.ucrNudLineHeightTopAxis.Increment = New Decimal(New Integer() {1, 0, 0, 65536}) + Me.ucrNudLineHeightTopAxis.Location = New System.Drawing.Point(94, 106) + Me.ucrNudLineHeightTopAxis.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) + Me.ucrNudLineHeightTopAxis.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudLineHeightTopAxis.Name = "ucrNudLineHeightTopAxis" + Me.ucrNudLineHeightTopAxis.Size = New System.Drawing.Size(50, 20) + Me.ucrNudLineHeightTopAxis.TabIndex = 36 + Me.ucrNudLineHeightTopAxis.Value = New Decimal(New Integer() {0, 0, 0, 0}) + ' 'lblAngleTop ' Me.lblAngleTop.AutoSize = True @@ -284,6 +350,18 @@ Partial Class sdgThemes Me.lblAngleTop.TabIndex = 33 Me.lblAngleTop.Text = "Angle:" ' + 'ucrNudAngleTopAxis + ' + Me.ucrNudAngleTopAxis.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudAngleTopAxis.Increment = New Decimal(New Integer() {1, 0, 0, 0}) + Me.ucrNudAngleTopAxis.Location = New System.Drawing.Point(94, 134) + Me.ucrNudAngleTopAxis.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) + Me.ucrNudAngleTopAxis.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudAngleTopAxis.Name = "ucrNudAngleTopAxis" + Me.ucrNudAngleTopAxis.Size = New System.Drawing.Size(50, 20) + Me.ucrNudAngleTopAxis.TabIndex = 34 + Me.ucrNudAngleTopAxis.Value = New Decimal(New Integer() {0, 0, 0, 0}) + ' 'lblHjustTopAxis ' Me.lblHjustTopAxis.AutoSize = True @@ -293,6 +371,18 @@ Partial Class sdgThemes Me.lblHjustTopAxis.TabIndex = 31 Me.lblHjustTopAxis.Text = "Hjust:" ' + 'ucrNudHjustTopAxis + ' + Me.ucrNudHjustTopAxis.DecimalPlaces = New Decimal(New Integer() {1, 0, 0, 0}) + Me.ucrNudHjustTopAxis.Increment = New Decimal(New Integer() {1, 0, 0, 65536}) + Me.ucrNudHjustTopAxis.Location = New System.Drawing.Point(94, 46) + Me.ucrNudHjustTopAxis.Maximum = New Decimal(New Integer() {1, 0, 0, 0}) + Me.ucrNudHjustTopAxis.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudHjustTopAxis.Name = "ucrNudHjustTopAxis" + Me.ucrNudHjustTopAxis.Size = New System.Drawing.Size(50, 20) + Me.ucrNudHjustTopAxis.TabIndex = 32 + Me.ucrNudHjustTopAxis.Value = New Decimal(New Integer() {0, 0, 0, 0}) + ' 'lblSizeTopaxis ' Me.lblSizeTopaxis.AutoSize = True @@ -302,6 +392,18 @@ Partial Class sdgThemes Me.lblSizeTopaxis.TabIndex = 29 Me.lblSizeTopaxis.Text = "Size:" ' + 'ucrNudSizeTopaxis + ' + Me.ucrNudSizeTopaxis.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudSizeTopaxis.Increment = New Decimal(New Integer() {1, 0, 0, 0}) + Me.ucrNudSizeTopaxis.Location = New System.Drawing.Point(94, 16) + Me.ucrNudSizeTopaxis.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) + Me.ucrNudSizeTopaxis.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudSizeTopaxis.Name = "ucrNudSizeTopaxis" + Me.ucrNudSizeTopaxis.Size = New System.Drawing.Size(50, 20) + Me.ucrNudSizeTopaxis.TabIndex = 30 + Me.ucrNudSizeTopaxis.Value = New Decimal(New Integer() {0, 0, 0, 0}) + ' 'lblColourTopAxis ' Me.lblColourTopAxis.AutoSize = True @@ -311,6 +413,16 @@ Partial Class sdgThemes Me.lblColourTopAxis.TabIndex = 27 Me.lblColourTopAxis.Text = "Colour:" ' + 'ucrInputColourTopAxis + ' + Me.ucrInputColourTopAxis.AddQuotesIfUnrecognised = True + Me.ucrInputColourTopAxis.IsReadOnly = False + Me.ucrInputColourTopAxis.Location = New System.Drawing.Point(73, 217) + Me.ucrInputColourTopAxis.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) + Me.ucrInputColourTopAxis.Name = "ucrInputColourTopAxis" + Me.ucrInputColourTopAxis.Size = New System.Drawing.Size(137, 21) + Me.ucrInputColourTopAxis.TabIndex = 28 + ' 'lblFaceTopAxis ' Me.lblFaceTopAxis.AutoSize = True @@ -320,6 +432,16 @@ Partial Class sdgThemes Me.lblFaceTopAxis.TabIndex = 25 Me.lblFaceTopAxis.Text = "Face:" ' + 'ucrInputFaceTopAxis + ' + Me.ucrInputFaceTopAxis.AddQuotesIfUnrecognised = True + Me.ucrInputFaceTopAxis.IsReadOnly = False + Me.ucrInputFaceTopAxis.Location = New System.Drawing.Point(73, 189) + Me.ucrInputFaceTopAxis.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) + Me.ucrInputFaceTopAxis.Name = "ucrInputFaceTopAxis" + Me.ucrInputFaceTopAxis.Size = New System.Drawing.Size(137, 21) + Me.ucrInputFaceTopAxis.TabIndex = 26 + ' 'lblFamilyTopAxis ' Me.lblFamilyTopAxis.AutoSize = True @@ -329,6 +451,16 @@ Partial Class sdgThemes Me.lblFamilyTopAxis.TabIndex = 23 Me.lblFamilyTopAxis.Text = "Family:" ' + 'ucrInputFamilyTopAxis + ' + Me.ucrInputFamilyTopAxis.AddQuotesIfUnrecognised = True + Me.ucrInputFamilyTopAxis.IsReadOnly = False + Me.ucrInputFamilyTopAxis.Location = New System.Drawing.Point(73, 162) + Me.ucrInputFamilyTopAxis.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) + Me.ucrInputFamilyTopAxis.Name = "ucrInputFamilyTopAxis" + Me.ucrInputFamilyTopAxis.Size = New System.Drawing.Size(137, 21) + Me.ucrInputFamilyTopAxis.TabIndex = 24 + ' 'GroupBox1 ' Me.GroupBox1.Controls.Add(Me.lblLineEndTickMarks) @@ -355,6 +487,16 @@ Partial Class sdgThemes Me.lblLineEndTickMarks.TabIndex = 31 Me.lblLineEndTickMarks.Text = "Line End:" ' + 'ucrInputLineEndTickMarks + ' + Me.ucrInputLineEndTickMarks.AddQuotesIfUnrecognised = True + Me.ucrInputLineEndTickMarks.IsReadOnly = False + Me.ucrInputLineEndTickMarks.Location = New System.Drawing.Point(72, 100) + Me.ucrInputLineEndTickMarks.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) + Me.ucrInputLineEndTickMarks.Name = "ucrInputLineEndTickMarks" + Me.ucrInputLineEndTickMarks.Size = New System.Drawing.Size(137, 21) + Me.ucrInputLineEndTickMarks.TabIndex = 32 + ' 'lblSizeTickMarks ' Me.lblSizeTickMarks.AutoSize = True @@ -364,6 +506,18 @@ Partial Class sdgThemes Me.lblSizeTickMarks.TabIndex = 29 Me.lblSizeTickMarks.Text = "Size:" ' + 'ucrNudSizeTickMarks + ' + Me.ucrNudSizeTickMarks.DecimalPlaces = New Decimal(New Integer() {1, 0, 0, 0}) + Me.ucrNudSizeTickMarks.Increment = New Decimal(New Integer() {1, 0, 0, 0}) + Me.ucrNudSizeTickMarks.Location = New System.Drawing.Point(94, 17) + Me.ucrNudSizeTickMarks.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) + Me.ucrNudSizeTickMarks.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudSizeTickMarks.Name = "ucrNudSizeTickMarks" + Me.ucrNudSizeTickMarks.Size = New System.Drawing.Size(50, 20) + Me.ucrNudSizeTickMarks.TabIndex = 30 + Me.ucrNudSizeTickMarks.Value = New Decimal(New Integer() {0, 0, 0, 0}) + ' 'lblColourTickMarks ' Me.lblColourTickMarks.AutoSize = True @@ -373,6 +527,16 @@ Partial Class sdgThemes Me.lblColourTickMarks.TabIndex = 27 Me.lblColourTickMarks.Text = "Colour:" ' + 'ucrInputColourTickMarks + ' + Me.ucrInputColourTickMarks.AddQuotesIfUnrecognised = True + Me.ucrInputColourTickMarks.IsReadOnly = False + Me.ucrInputColourTickMarks.Location = New System.Drawing.Point(72, 68) + Me.ucrInputColourTickMarks.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) + Me.ucrInputColourTickMarks.Name = "ucrInputColourTickMarks" + Me.ucrInputColourTickMarks.Size = New System.Drawing.Size(137, 21) + Me.ucrInputColourTickMarks.TabIndex = 28 + ' 'lblLineTypeTickMarks ' Me.lblLineTypeTickMarks.AutoSize = True @@ -382,6 +546,16 @@ Partial Class sdgThemes Me.lblLineTypeTickMarks.TabIndex = 25 Me.lblLineTypeTickMarks.Text = "Line Type:" ' + 'ucrInputLineTypeTickMarks + ' + Me.ucrInputLineTypeTickMarks.AddQuotesIfUnrecognised = True + Me.ucrInputLineTypeTickMarks.IsReadOnly = False + Me.ucrInputLineTypeTickMarks.Location = New System.Drawing.Point(72, 40) + Me.ucrInputLineTypeTickMarks.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) + Me.ucrInputLineTypeTickMarks.Name = "ucrInputLineTypeTickMarks" + Me.ucrInputLineTypeTickMarks.Size = New System.Drawing.Size(137, 21) + Me.ucrInputLineTypeTickMarks.TabIndex = 26 + ' 'grpAxisLabel ' Me.grpAxisLabel.Controls.Add(Me.lblVjust) @@ -416,6 +590,18 @@ Partial Class sdgThemes Me.lblVjust.TabIndex = 37 Me.lblVjust.Text = "Vjust:" ' + 'ucrNudVjust + ' + Me.ucrNudVjust.DecimalPlaces = New Decimal(New Integer() {1, 0, 0, 0}) + Me.ucrNudVjust.Increment = New Decimal(New Integer() {1, 0, 0, 65536}) + Me.ucrNudVjust.Location = New System.Drawing.Point(94, 76) + Me.ucrNudVjust.Maximum = New Decimal(New Integer() {1, 0, 0, 0}) + Me.ucrNudVjust.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudVjust.Name = "ucrNudVjust" + Me.ucrNudVjust.Size = New System.Drawing.Size(50, 20) + Me.ucrNudVjust.TabIndex = 38 + Me.ucrNudVjust.Value = New Decimal(New Integer() {0, 0, 0, 0}) + ' 'lblLineHeight ' Me.lblLineHeight.AutoSize = True @@ -425,6 +611,18 @@ Partial Class sdgThemes Me.lblLineHeight.TabIndex = 35 Me.lblLineHeight.Text = "Line Height:" ' + 'ucrNudLineHeight + ' + Me.ucrNudLineHeight.DecimalPlaces = New Decimal(New Integer() {1, 0, 0, 0}) + Me.ucrNudLineHeight.Increment = New Decimal(New Integer() {1, 0, 0, 65536}) + Me.ucrNudLineHeight.Location = New System.Drawing.Point(94, 106) + Me.ucrNudLineHeight.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) + Me.ucrNudLineHeight.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudLineHeight.Name = "ucrNudLineHeight" + Me.ucrNudLineHeight.Size = New System.Drawing.Size(50, 20) + Me.ucrNudLineHeight.TabIndex = 36 + Me.ucrNudLineHeight.Value = New Decimal(New Integer() {0, 0, 0, 0}) + ' 'lblAngle ' Me.lblAngle.AutoSize = True @@ -434,15 +632,39 @@ Partial Class sdgThemes Me.lblAngle.TabIndex = 33 Me.lblAngle.Text = "Angle:" ' - 'lblHjust + 'ucrNudAngle ' - Me.lblHjust.AutoSize = True - Me.lblHjust.Location = New System.Drawing.Point(13, 49) + Me.ucrNudAngle.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudAngle.Increment = New Decimal(New Integer() {1, 0, 0, 0}) + Me.ucrNudAngle.Location = New System.Drawing.Point(94, 136) + Me.ucrNudAngle.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) + Me.ucrNudAngle.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudAngle.Name = "ucrNudAngle" + Me.ucrNudAngle.Size = New System.Drawing.Size(50, 20) + Me.ucrNudAngle.TabIndex = 34 + Me.ucrNudAngle.Value = New Decimal(New Integer() {0, 0, 0, 0}) + ' + 'lblHjust + ' + Me.lblHjust.AutoSize = True + Me.lblHjust.Location = New System.Drawing.Point(13, 49) Me.lblHjust.Name = "lblHjust" Me.lblHjust.Size = New System.Drawing.Size(34, 13) Me.lblHjust.TabIndex = 31 Me.lblHjust.Text = "Hjust:" ' + 'ucrNudHjust + ' + Me.ucrNudHjust.DecimalPlaces = New Decimal(New Integer() {1, 0, 0, 0}) + Me.ucrNudHjust.Increment = New Decimal(New Integer() {1, 0, 0, 65536}) + Me.ucrNudHjust.Location = New System.Drawing.Point(94, 46) + Me.ucrNudHjust.Maximum = New Decimal(New Integer() {1, 0, 0, 0}) + Me.ucrNudHjust.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudHjust.Name = "ucrNudHjust" + Me.ucrNudHjust.Size = New System.Drawing.Size(50, 20) + Me.ucrNudHjust.TabIndex = 32 + Me.ucrNudHjust.Value = New Decimal(New Integer() {0, 0, 0, 0}) + ' 'lblSize ' Me.lblSize.AutoSize = True @@ -452,6 +674,18 @@ Partial Class sdgThemes Me.lblSize.TabIndex = 29 Me.lblSize.Text = "Size:" ' + 'ucrNudsize + ' + 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(94, 16) + 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" + Me.ucrNudsize.Size = New System.Drawing.Size(50, 20) + Me.ucrNudsize.TabIndex = 30 + Me.ucrNudsize.Value = New Decimal(New Integer() {0, 0, 0, 0}) + ' 'Label2 ' Me.Label2.AutoSize = True @@ -461,6 +695,16 @@ Partial Class sdgThemes Me.Label2.TabIndex = 27 Me.Label2.Text = "Colour:" ' + 'ucrInputColour + ' + Me.ucrInputColour.AddQuotesIfUnrecognised = True + Me.ucrInputColour.IsReadOnly = False + Me.ucrInputColour.Location = New System.Drawing.Point(73, 217) + Me.ucrInputColour.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) + Me.ucrInputColour.Name = "ucrInputColour" + Me.ucrInputColour.Size = New System.Drawing.Size(137, 21) + Me.ucrInputColour.TabIndex = 28 + ' 'lblFace ' Me.lblFace.AutoSize = True @@ -470,6 +714,16 @@ Partial Class sdgThemes Me.lblFace.TabIndex = 25 Me.lblFace.Text = "Face:" ' + 'ucrInputFace + ' + Me.ucrInputFace.AddQuotesIfUnrecognised = True + Me.ucrInputFace.IsReadOnly = False + Me.ucrInputFace.Location = New System.Drawing.Point(73, 189) + Me.ucrInputFace.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) + Me.ucrInputFace.Name = "ucrInputFace" + Me.ucrInputFace.Size = New System.Drawing.Size(137, 21) + Me.ucrInputFace.TabIndex = 26 + ' 'lblFamily ' Me.lblFamily.AutoSize = True @@ -479,6 +733,16 @@ Partial Class sdgThemes Me.lblFamily.TabIndex = 23 Me.lblFamily.Text = "Family:" ' + 'ucrInputFamily + ' + Me.ucrInputFamily.AddQuotesIfUnrecognised = True + Me.ucrInputFamily.IsReadOnly = False + Me.ucrInputFamily.Location = New System.Drawing.Point(73, 162) + Me.ucrInputFamily.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) + Me.ucrInputFamily.Name = "ucrInputFamily" + Me.ucrInputFamily.Size = New System.Drawing.Size(137, 21) + Me.ucrInputFamily.TabIndex = 24 + ' 'tbYaxis ' Me.tbYaxis.Controls.Add(Me.GroupBox2) @@ -498,7 +762,7 @@ Partial Class sdgThemes Me.GroupBox2.Controls.Add(Me.Label1) Me.GroupBox2.Controls.Add(Me.UcrInputComboBox1) Me.GroupBox2.Controls.Add(Me.Label3) - Me.GroupBox2.Controls.Add(Me.UcrNud1) + Me.GroupBox2.Controls.Add(Me.ucrNudSizeTickLabelsYAxis) Me.GroupBox2.Controls.Add(Me.Label4) Me.GroupBox2.Controls.Add(Me.UcrInputComboBox2) Me.GroupBox2.Controls.Add(Me.Label5) @@ -519,6 +783,16 @@ Partial Class sdgThemes Me.Label1.TabIndex = 31 Me.Label1.Text = "Line End:" ' + 'UcrInputComboBox1 + ' + Me.UcrInputComboBox1.AddQuotesIfUnrecognised = True + Me.UcrInputComboBox1.IsReadOnly = False + Me.UcrInputComboBox1.Location = New System.Drawing.Point(72, 100) + Me.UcrInputComboBox1.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) + Me.UcrInputComboBox1.Name = "UcrInputComboBox1" + Me.UcrInputComboBox1.Size = New System.Drawing.Size(137, 21) + Me.UcrInputComboBox1.TabIndex = 32 + ' 'Label3 ' Me.Label3.AutoSize = True @@ -528,6 +802,18 @@ Partial Class sdgThemes Me.Label3.TabIndex = 29 Me.Label3.Text = "Size:" ' + 'ucrNudSizeTickLabelsYAxis + ' + Me.ucrNudSizeTickLabelsYAxis.DecimalPlaces = New Decimal(New Integer() {1, 0, 0, 0}) + Me.ucrNudSizeTickLabelsYAxis.Increment = New Decimal(New Integer() {1, 0, 0, 0}) + Me.ucrNudSizeTickLabelsYAxis.Location = New System.Drawing.Point(94, 17) + Me.ucrNudSizeTickLabelsYAxis.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) + Me.ucrNudSizeTickLabelsYAxis.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudSizeTickLabelsYAxis.Name = "ucrNudSizeTickLabelsYAxis" + Me.ucrNudSizeTickLabelsYAxis.Size = New System.Drawing.Size(50, 20) + Me.ucrNudSizeTickLabelsYAxis.TabIndex = 30 + Me.ucrNudSizeTickLabelsYAxis.Value = New Decimal(New Integer() {0, 0, 0, 0}) + ' 'Label4 ' Me.Label4.AutoSize = True @@ -537,6 +823,16 @@ Partial Class sdgThemes Me.Label4.TabIndex = 27 Me.Label4.Text = "Colour:" ' + 'UcrInputComboBox2 + ' + Me.UcrInputComboBox2.AddQuotesIfUnrecognised = True + Me.UcrInputComboBox2.IsReadOnly = False + Me.UcrInputComboBox2.Location = New System.Drawing.Point(72, 68) + Me.UcrInputComboBox2.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) + Me.UcrInputComboBox2.Name = "UcrInputComboBox2" + Me.UcrInputComboBox2.Size = New System.Drawing.Size(137, 21) + Me.UcrInputComboBox2.TabIndex = 28 + ' 'Label5 ' Me.Label5.AutoSize = True @@ -546,18 +842,28 @@ Partial Class sdgThemes Me.Label5.TabIndex = 25 Me.Label5.Text = "Line Type:" ' + 'UcrInputComboBox3 + ' + Me.UcrInputComboBox3.AddQuotesIfUnrecognised = True + Me.UcrInputComboBox3.IsReadOnly = False + Me.UcrInputComboBox3.Location = New System.Drawing.Point(72, 40) + Me.UcrInputComboBox3.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) + Me.UcrInputComboBox3.Name = "UcrInputComboBox3" + Me.UcrInputComboBox3.Size = New System.Drawing.Size(137, 21) + Me.UcrInputComboBox3.TabIndex = 26 + ' 'GroupBox3 ' Me.GroupBox3.Controls.Add(Me.Label6) - Me.GroupBox3.Controls.Add(Me.UcrNud2) + Me.GroupBox3.Controls.Add(Me.ucrNudVjustTopYAxis) Me.GroupBox3.Controls.Add(Me.Label7) - Me.GroupBox3.Controls.Add(Me.UcrNud3) + Me.GroupBox3.Controls.Add(Me.ucrNudLineHeightTopYAxis) Me.GroupBox3.Controls.Add(Me.Label8) - Me.GroupBox3.Controls.Add(Me.UcrNud4) + Me.GroupBox3.Controls.Add(Me.ucrNudAngleTopYAxis) Me.GroupBox3.Controls.Add(Me.Label9) - Me.GroupBox3.Controls.Add(Me.UcrNud5) + Me.GroupBox3.Controls.Add(Me.ucrNudHjustTopYAxis) Me.GroupBox3.Controls.Add(Me.Label10) - Me.GroupBox3.Controls.Add(Me.UcrNud6) + Me.GroupBox3.Controls.Add(Me.ucrNudSizeTopYAxis) Me.GroupBox3.Controls.Add(Me.Label11) Me.GroupBox3.Controls.Add(Me.UcrInputComboBox4) Me.GroupBox3.Controls.Add(Me.Label12) @@ -580,6 +886,18 @@ Partial Class sdgThemes Me.Label6.TabIndex = 37 Me.Label6.Text = "Vjust:" ' + 'ucrNudVjustTopYAxis + ' + Me.ucrNudVjustTopYAxis.DecimalPlaces = New Decimal(New Integer() {1, 0, 0, 0}) + Me.ucrNudVjustTopYAxis.Increment = New Decimal(New Integer() {1, 0, 0, 65536}) + Me.ucrNudVjustTopYAxis.Location = New System.Drawing.Point(94, 76) + Me.ucrNudVjustTopYAxis.Maximum = New Decimal(New Integer() {1, 0, 0, 0}) + Me.ucrNudVjustTopYAxis.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudVjustTopYAxis.Name = "ucrNudVjustTopYAxis" + Me.ucrNudVjustTopYAxis.Size = New System.Drawing.Size(50, 20) + Me.ucrNudVjustTopYAxis.TabIndex = 38 + Me.ucrNudVjustTopYAxis.Value = New Decimal(New Integer() {0, 0, 0, 0}) + ' 'Label7 ' Me.Label7.AutoSize = True @@ -589,6 +907,18 @@ Partial Class sdgThemes Me.Label7.TabIndex = 35 Me.Label7.Text = "Line Height:" ' + 'ucrNudLineHeightTopYAxis + ' + Me.ucrNudLineHeightTopYAxis.DecimalPlaces = New Decimal(New Integer() {1, 0, 0, 0}) + Me.ucrNudLineHeightTopYAxis.Increment = New Decimal(New Integer() {1, 0, 0, 65536}) + Me.ucrNudLineHeightTopYAxis.Location = New System.Drawing.Point(94, 106) + Me.ucrNudLineHeightTopYAxis.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) + Me.ucrNudLineHeightTopYAxis.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudLineHeightTopYAxis.Name = "ucrNudLineHeightTopYAxis" + Me.ucrNudLineHeightTopYAxis.Size = New System.Drawing.Size(50, 20) + Me.ucrNudLineHeightTopYAxis.TabIndex = 36 + Me.ucrNudLineHeightTopYAxis.Value = New Decimal(New Integer() {0, 0, 0, 0}) + ' 'Label8 ' Me.Label8.AutoSize = True @@ -598,6 +928,18 @@ Partial Class sdgThemes Me.Label8.TabIndex = 33 Me.Label8.Text = "Angle:" ' + 'ucrNudAngleTopYAxis + ' + Me.ucrNudAngleTopYAxis.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudAngleTopYAxis.Increment = New Decimal(New Integer() {1, 0, 0, 0}) + Me.ucrNudAngleTopYAxis.Location = New System.Drawing.Point(94, 134) + Me.ucrNudAngleTopYAxis.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) + Me.ucrNudAngleTopYAxis.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudAngleTopYAxis.Name = "ucrNudAngleTopYAxis" + Me.ucrNudAngleTopYAxis.Size = New System.Drawing.Size(50, 20) + Me.ucrNudAngleTopYAxis.TabIndex = 34 + Me.ucrNudAngleTopYAxis.Value = New Decimal(New Integer() {0, 0, 0, 0}) + ' 'Label9 ' Me.Label9.AutoSize = True @@ -607,6 +949,18 @@ Partial Class sdgThemes Me.Label9.TabIndex = 31 Me.Label9.Text = "Hjust:" ' + 'ucrNudHjustTopYAxis + ' + Me.ucrNudHjustTopYAxis.DecimalPlaces = New Decimal(New Integer() {1, 0, 0, 0}) + Me.ucrNudHjustTopYAxis.Increment = New Decimal(New Integer() {1, 0, 0, 65536}) + Me.ucrNudHjustTopYAxis.Location = New System.Drawing.Point(94, 46) + Me.ucrNudHjustTopYAxis.Maximum = New Decimal(New Integer() {1, 0, 0, 0}) + Me.ucrNudHjustTopYAxis.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudHjustTopYAxis.Name = "ucrNudHjustTopYAxis" + Me.ucrNudHjustTopYAxis.Size = New System.Drawing.Size(50, 20) + Me.ucrNudHjustTopYAxis.TabIndex = 32 + Me.ucrNudHjustTopYAxis.Value = New Decimal(New Integer() {0, 0, 0, 0}) + ' 'Label10 ' Me.Label10.AutoSize = True @@ -616,6 +970,18 @@ Partial Class sdgThemes Me.Label10.TabIndex = 29 Me.Label10.Text = "Size:" ' + 'ucrNudSizeTopYAxis + ' + Me.ucrNudSizeTopYAxis.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudSizeTopYAxis.Increment = New Decimal(New Integer() {1, 0, 0, 0}) + Me.ucrNudSizeTopYAxis.Location = New System.Drawing.Point(94, 16) + Me.ucrNudSizeTopYAxis.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) + Me.ucrNudSizeTopYAxis.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudSizeTopYAxis.Name = "ucrNudSizeTopYAxis" + Me.ucrNudSizeTopYAxis.Size = New System.Drawing.Size(50, 20) + Me.ucrNudSizeTopYAxis.TabIndex = 30 + Me.ucrNudSizeTopYAxis.Value = New Decimal(New Integer() {0, 0, 0, 0}) + ' 'Label11 ' Me.Label11.AutoSize = True @@ -625,6 +991,16 @@ Partial Class sdgThemes Me.Label11.TabIndex = 27 Me.Label11.Text = "Colour:" ' + 'UcrInputComboBox4 + ' + Me.UcrInputComboBox4.AddQuotesIfUnrecognised = True + Me.UcrInputComboBox4.IsReadOnly = False + Me.UcrInputComboBox4.Location = New System.Drawing.Point(73, 217) + Me.UcrInputComboBox4.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) + Me.UcrInputComboBox4.Name = "UcrInputComboBox4" + Me.UcrInputComboBox4.Size = New System.Drawing.Size(137, 21) + Me.UcrInputComboBox4.TabIndex = 28 + ' 'Label12 ' Me.Label12.AutoSize = True @@ -634,6 +1010,16 @@ Partial Class sdgThemes Me.Label12.TabIndex = 25 Me.Label12.Text = "Face:" ' + 'UcrInputComboBox5 + ' + Me.UcrInputComboBox5.AddQuotesIfUnrecognised = True + Me.UcrInputComboBox5.IsReadOnly = False + Me.UcrInputComboBox5.Location = New System.Drawing.Point(73, 189) + Me.UcrInputComboBox5.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) + Me.UcrInputComboBox5.Name = "UcrInputComboBox5" + Me.UcrInputComboBox5.Size = New System.Drawing.Size(137, 21) + Me.UcrInputComboBox5.TabIndex = 26 + ' 'Label13 ' Me.Label13.AutoSize = True @@ -643,12 +1029,22 @@ Partial Class sdgThemes Me.Label13.TabIndex = 23 Me.Label13.Text = "Family:" ' + 'UcrInputComboBox6 + ' + Me.UcrInputComboBox6.AddQuotesIfUnrecognised = True + Me.UcrInputComboBox6.IsReadOnly = False + Me.UcrInputComboBox6.Location = New System.Drawing.Point(73, 162) + Me.UcrInputComboBox6.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) + Me.UcrInputComboBox6.Name = "UcrInputComboBox6" + Me.UcrInputComboBox6.Size = New System.Drawing.Size(137, 21) + Me.UcrInputComboBox6.TabIndex = 24 + ' 'GroupBox4 ' Me.GroupBox4.Controls.Add(Me.Label14) Me.GroupBox4.Controls.Add(Me.UcrInputComboBox7) Me.GroupBox4.Controls.Add(Me.Label15) - Me.GroupBox4.Controls.Add(Me.UcrNud7) + Me.GroupBox4.Controls.Add(Me.ucrNudSizeTickMarksYAxis) Me.GroupBox4.Controls.Add(Me.Label16) Me.GroupBox4.Controls.Add(Me.UcrInputComboBox8) Me.GroupBox4.Controls.Add(Me.Label17) @@ -669,6 +1065,16 @@ Partial Class sdgThemes Me.Label14.TabIndex = 31 Me.Label14.Text = "Line End:" ' + 'UcrInputComboBox7 + ' + Me.UcrInputComboBox7.AddQuotesIfUnrecognised = True + Me.UcrInputComboBox7.IsReadOnly = False + Me.UcrInputComboBox7.Location = New System.Drawing.Point(72, 100) + Me.UcrInputComboBox7.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) + Me.UcrInputComboBox7.Name = "UcrInputComboBox7" + Me.UcrInputComboBox7.Size = New System.Drawing.Size(137, 21) + Me.UcrInputComboBox7.TabIndex = 32 + ' 'Label15 ' Me.Label15.AutoSize = True @@ -678,6 +1084,18 @@ Partial Class sdgThemes Me.Label15.TabIndex = 29 Me.Label15.Text = "Size:" ' + 'ucrNudSizeTickMarksYAxis + ' + Me.ucrNudSizeTickMarksYAxis.DecimalPlaces = New Decimal(New Integer() {1, 0, 0, 0}) + Me.ucrNudSizeTickMarksYAxis.Increment = New Decimal(New Integer() {1, 0, 0, 0}) + Me.ucrNudSizeTickMarksYAxis.Location = New System.Drawing.Point(94, 17) + Me.ucrNudSizeTickMarksYAxis.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) + Me.ucrNudSizeTickMarksYAxis.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudSizeTickMarksYAxis.Name = "ucrNudSizeTickMarksYAxis" + Me.ucrNudSizeTickMarksYAxis.Size = New System.Drawing.Size(50, 20) + Me.ucrNudSizeTickMarksYAxis.TabIndex = 30 + Me.ucrNudSizeTickMarksYAxis.Value = New Decimal(New Integer() {0, 0, 0, 0}) + ' 'Label16 ' Me.Label16.AutoSize = True @@ -687,6 +1105,16 @@ Partial Class sdgThemes Me.Label16.TabIndex = 27 Me.Label16.Text = "Colour:" ' + 'UcrInputComboBox8 + ' + Me.UcrInputComboBox8.AddQuotesIfUnrecognised = True + Me.UcrInputComboBox8.IsReadOnly = False + Me.UcrInputComboBox8.Location = New System.Drawing.Point(72, 68) + Me.UcrInputComboBox8.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) + Me.UcrInputComboBox8.Name = "UcrInputComboBox8" + Me.UcrInputComboBox8.Size = New System.Drawing.Size(137, 21) + Me.UcrInputComboBox8.TabIndex = 28 + ' 'Label17 ' Me.Label17.AutoSize = True @@ -696,24 +1124,34 @@ Partial Class sdgThemes Me.Label17.TabIndex = 25 Me.Label17.Text = "Line Type:" ' + 'UcrInputComboBox9 + ' + Me.UcrInputComboBox9.AddQuotesIfUnrecognised = True + Me.UcrInputComboBox9.IsReadOnly = False + Me.UcrInputComboBox9.Location = New System.Drawing.Point(72, 40) + Me.UcrInputComboBox9.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) + Me.UcrInputComboBox9.Name = "UcrInputComboBox9" + Me.UcrInputComboBox9.Size = New System.Drawing.Size(137, 21) + Me.UcrInputComboBox9.TabIndex = 26 + ' 'GroupBox5 ' - Me.GroupBox5.Controls.Add(Me.Label18) - Me.GroupBox5.Controls.Add(Me.UcrNud8) - Me.GroupBox5.Controls.Add(Me.Label19) - Me.GroupBox5.Controls.Add(Me.UcrNud9) + Me.GroupBox5.Controls.Add(Me.lblVjustYAxis) + Me.GroupBox5.Controls.Add(Me.ucrNudVjustYAxis) + Me.GroupBox5.Controls.Add(Me.lblLineHeightYAxis) + Me.GroupBox5.Controls.Add(Me.ucrNudLineHeightYAxis) Me.GroupBox5.Controls.Add(Me.Label20) - Me.GroupBox5.Controls.Add(Me.UcrNud10) + Me.GroupBox5.Controls.Add(Me.ucrNudLAngle) Me.GroupBox5.Controls.Add(Me.lblHjustYAxis) - Me.GroupBox5.Controls.Add(Me.UcrNud11) + Me.GroupBox5.Controls.Add(Me.ucrNudHjustYAxis) Me.GroupBox5.Controls.Add(Me.lblSizeYAxis) - Me.GroupBox5.Controls.Add(Me.UcrNud12) - Me.GroupBox5.Controls.Add(Me.Label23) + Me.GroupBox5.Controls.Add(Me.ucrNudSizeYAxis) + Me.GroupBox5.Controls.Add(Me.lblColourYAxis) Me.GroupBox5.Controls.Add(Me.UcrInputComboBox10) - Me.GroupBox5.Controls.Add(Me.Label24) + Me.GroupBox5.Controls.Add(Me.lblFaceYAxis) Me.GroupBox5.Controls.Add(Me.UcrInputComboBox11) - Me.GroupBox5.Controls.Add(Me.Label25) - Me.GroupBox5.Controls.Add(Me.UcrInputComboBox12) + Me.GroupBox5.Controls.Add(Me.lblFamilyYAxis) + Me.GroupBox5.Controls.Add(Me.crInputComboBox12) Me.GroupBox5.Location = New System.Drawing.Point(6, 5) Me.GroupBox5.Name = "GroupBox5" Me.GroupBox5.Size = New System.Drawing.Size(230, 245) @@ -721,23 +1159,47 @@ Partial Class sdgThemes Me.GroupBox5.TabStop = False Me.GroupBox5.Text = "Y axis label" ' - 'Label18 - ' - Me.Label18.AutoSize = True - Me.Label18.Location = New System.Drawing.Point(13, 77) - Me.Label18.Name = "Label18" - Me.Label18.Size = New System.Drawing.Size(33, 13) - Me.Label18.TabIndex = 37 - Me.Label18.Text = "Vjust:" - ' - 'Label19 - ' - Me.Label19.AutoSize = True - Me.Label19.Location = New System.Drawing.Point(13, 108) - Me.Label19.Name = "Label19" - Me.Label19.Size = New System.Drawing.Size(64, 13) - Me.Label19.TabIndex = 35 - Me.Label19.Text = "Line Height:" + 'lblVjustYAxis + ' + Me.lblVjustYAxis.AutoSize = True + Me.lblVjustYAxis.Location = New System.Drawing.Point(13, 77) + Me.lblVjustYAxis.Name = "lblVjustYAxis" + Me.lblVjustYAxis.Size = New System.Drawing.Size(33, 13) + Me.lblVjustYAxis.TabIndex = 37 + Me.lblVjustYAxis.Text = "Vjust:" + ' + 'ucrNudVjustYAxis + ' + Me.ucrNudVjustYAxis.DecimalPlaces = New Decimal(New Integer() {1, 0, 0, 0}) + Me.ucrNudVjustYAxis.Increment = New Decimal(New Integer() {1, 0, 0, 65536}) + Me.ucrNudVjustYAxis.Location = New System.Drawing.Point(94, 76) + Me.ucrNudVjustYAxis.Maximum = New Decimal(New Integer() {1, 0, 0, 0}) + Me.ucrNudVjustYAxis.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudVjustYAxis.Name = "ucrNudVjustYAxis" + Me.ucrNudVjustYAxis.Size = New System.Drawing.Size(50, 20) + Me.ucrNudVjustYAxis.TabIndex = 38 + Me.ucrNudVjustYAxis.Value = New Decimal(New Integer() {0, 0, 0, 0}) + ' + 'lblLineHeightYAxis + ' + Me.lblLineHeightYAxis.AutoSize = True + Me.lblLineHeightYAxis.Location = New System.Drawing.Point(13, 108) + Me.lblLineHeightYAxis.Name = "lblLineHeightYAxis" + Me.lblLineHeightYAxis.Size = New System.Drawing.Size(64, 13) + Me.lblLineHeightYAxis.TabIndex = 35 + Me.lblLineHeightYAxis.Text = "Line Height:" + ' + 'ucrNudLineHeightYAxis + ' + Me.ucrNudLineHeightYAxis.DecimalPlaces = New Decimal(New Integer() {1, 0, 0, 0}) + Me.ucrNudLineHeightYAxis.Increment = New Decimal(New Integer() {1, 0, 0, 65536}) + Me.ucrNudLineHeightYAxis.Location = New System.Drawing.Point(94, 106) + Me.ucrNudLineHeightYAxis.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) + Me.ucrNudLineHeightYAxis.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudLineHeightYAxis.Name = "ucrNudLineHeightYAxis" + Me.ucrNudLineHeightYAxis.Size = New System.Drawing.Size(50, 20) + Me.ucrNudLineHeightYAxis.TabIndex = 36 + Me.ucrNudLineHeightYAxis.Value = New Decimal(New Integer() {0, 0, 0, 0}) ' 'Label20 ' @@ -748,6 +1210,18 @@ Partial Class sdgThemes Me.Label20.TabIndex = 33 Me.Label20.Text = "Angle:" ' + 'ucrNudLAngle + ' + Me.ucrNudLAngle.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudLAngle.Increment = New Decimal(New Integer() {1, 0, 0, 0}) + Me.ucrNudLAngle.Location = New System.Drawing.Point(94, 136) + Me.ucrNudLAngle.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) + Me.ucrNudLAngle.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudLAngle.Name = "ucrNudLAngle" + Me.ucrNudLAngle.Size = New System.Drawing.Size(50, 20) + Me.ucrNudLAngle.TabIndex = 34 + Me.ucrNudLAngle.Value = New Decimal(New Integer() {0, 0, 0, 0}) + ' 'lblHjustYAxis ' Me.lblHjustYAxis.AutoSize = True @@ -757,6 +1231,18 @@ Partial Class sdgThemes Me.lblHjustYAxis.TabIndex = 31 Me.lblHjustYAxis.Text = "Hjust:" ' + 'ucrNudHjustYAxis + ' + Me.ucrNudHjustYAxis.DecimalPlaces = New Decimal(New Integer() {1, 0, 0, 0}) + Me.ucrNudHjustYAxis.Increment = New Decimal(New Integer() {1, 0, 0, 65536}) + Me.ucrNudHjustYAxis.Location = New System.Drawing.Point(94, 46) + Me.ucrNudHjustYAxis.Maximum = New Decimal(New Integer() {1, 0, 0, 0}) + Me.ucrNudHjustYAxis.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudHjustYAxis.Name = "ucrNudHjustYAxis" + Me.ucrNudHjustYAxis.Size = New System.Drawing.Size(50, 20) + Me.ucrNudHjustYAxis.TabIndex = 32 + Me.ucrNudHjustYAxis.Value = New Decimal(New Integer() {0, 0, 0, 0}) + ' 'lblSizeYAxis ' Me.lblSizeYAxis.AutoSize = True @@ -766,560 +1252,74 @@ Partial Class sdgThemes Me.lblSizeYAxis.TabIndex = 29 Me.lblSizeYAxis.Text = "Size:" ' - 'Label23 - ' - Me.Label23.AutoSize = True - Me.Label23.Location = New System.Drawing.Point(13, 220) - Me.Label23.Name = "Label23" - Me.Label23.Size = New System.Drawing.Size(40, 13) - Me.Label23.TabIndex = 27 - Me.Label23.Text = "Colour:" - ' - 'Label24 - ' - Me.Label24.AutoSize = True - Me.Label24.Location = New System.Drawing.Point(13, 196) - Me.Label24.Name = "Label24" - Me.Label24.Size = New System.Drawing.Size(34, 13) - Me.Label24.TabIndex = 25 - Me.Label24.Text = "Face:" - ' - 'Label25 - ' - Me.Label25.AutoSize = True - Me.Label25.Location = New System.Drawing.Point(13, 166) - Me.Label25.Name = "Label25" - Me.Label25.Size = New System.Drawing.Size(39, 13) - Me.Label25.TabIndex = 23 - Me.Label25.Text = "Family:" - ' - 'ucrInputLineEndXTickMarks - ' - Me.ucrInputLineEndXTickMarks.AddQuotesIfUnrecognised = True - Me.ucrInputLineEndXTickMarks.IsReadOnly = False - Me.ucrInputLineEndXTickMarks.Location = New System.Drawing.Point(72, 100) - Me.ucrInputLineEndXTickMarks.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) - Me.ucrInputLineEndXTickMarks.Name = "ucrInputLineEndXTickMarks" - Me.ucrInputLineEndXTickMarks.Size = New System.Drawing.Size(137, 21) - Me.ucrInputLineEndXTickMarks.TabIndex = 32 - ' - 'ucrNudSizeXTickMarks + 'ucrNudSizeYAxis ' - Me.ucrNudSizeXTickMarks.DecimalPlaces = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudSizeXTickMarks.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudSizeXTickMarks.Location = New System.Drawing.Point(94, 17) - Me.ucrNudSizeXTickMarks.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) - Me.ucrNudSizeXTickMarks.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) - Me.ucrNudSizeXTickMarks.Name = "ucrNudSizeXTickMarks" - Me.ucrNudSizeXTickMarks.Size = New System.Drawing.Size(50, 20) - Me.ucrNudSizeXTickMarks.TabIndex = 30 - Me.ucrNudSizeXTickMarks.Value = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudSizeYAxis.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudSizeYAxis.Increment = New Decimal(New Integer() {1, 0, 0, 0}) + Me.ucrNudSizeYAxis.Location = New System.Drawing.Point(94, 16) + Me.ucrNudSizeYAxis.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) + Me.ucrNudSizeYAxis.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudSizeYAxis.Name = "ucrNudSizeYAxis" + Me.ucrNudSizeYAxis.Size = New System.Drawing.Size(50, 20) + Me.ucrNudSizeYAxis.TabIndex = 30 + Me.ucrNudSizeYAxis.Value = New Decimal(New Integer() {0, 0, 0, 0}) ' - 'ucrInputColourXTickMarks + 'lblColourYAxis ' - Me.ucrInputColourXTickMarks.AddQuotesIfUnrecognised = True - Me.ucrInputColourXTickMarks.IsReadOnly = False - Me.ucrInputColourXTickMarks.Location = New System.Drawing.Point(72, 68) - Me.ucrInputColourXTickMarks.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) - Me.ucrInputColourXTickMarks.Name = "ucrInputColourXTickMarks" - Me.ucrInputColourXTickMarks.Size = New System.Drawing.Size(137, 21) - Me.ucrInputColourXTickMarks.TabIndex = 28 + Me.lblColourYAxis.AutoSize = True + Me.lblColourYAxis.Location = New System.Drawing.Point(13, 220) + Me.lblColourYAxis.Name = "lblColourYAxis" + Me.lblColourYAxis.Size = New System.Drawing.Size(40, 13) + Me.lblColourYAxis.TabIndex = 27 + Me.lblColourYAxis.Text = "Colour:" ' - 'ucrInputLineTypeXTickMarks + 'UcrInputComboBox10 ' - Me.ucrInputLineTypeXTickMarks.AddQuotesIfUnrecognised = True - Me.ucrInputLineTypeXTickMarks.IsReadOnly = False - Me.ucrInputLineTypeXTickMarks.Location = New System.Drawing.Point(72, 40) - Me.ucrInputLineTypeXTickMarks.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) - Me.ucrInputLineTypeXTickMarks.Name = "ucrInputLineTypeXTickMarks" - Me.ucrInputLineTypeXTickMarks.Size = New System.Drawing.Size(137, 21) - Me.ucrInputLineTypeXTickMarks.TabIndex = 26 + Me.UcrInputComboBox10.AddQuotesIfUnrecognised = True + Me.UcrInputComboBox10.IsReadOnly = False + Me.UcrInputComboBox10.Location = New System.Drawing.Point(73, 217) + Me.UcrInputComboBox10.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) + Me.UcrInputComboBox10.Name = "UcrInputComboBox10" + Me.UcrInputComboBox10.Size = New System.Drawing.Size(137, 21) + Me.UcrInputComboBox10.TabIndex = 28 ' - 'ucrNudVjustTopAxis + 'lblFaceYAxis ' - Me.ucrNudVjustTopAxis.DecimalPlaces = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudVjustTopAxis.Increment = New Decimal(New Integer() {1, 0, 0, 65536}) - Me.ucrNudVjustTopAxis.Location = New System.Drawing.Point(94, 76) - Me.ucrNudVjustTopAxis.Maximum = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudVjustTopAxis.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) - Me.ucrNudVjustTopAxis.Name = "ucrNudVjustTopAxis" - Me.ucrNudVjustTopAxis.Size = New System.Drawing.Size(50, 20) - Me.ucrNudVjustTopAxis.TabIndex = 38 - Me.ucrNudVjustTopAxis.Value = New Decimal(New Integer() {0, 0, 0, 0}) + Me.lblFaceYAxis.AutoSize = True + Me.lblFaceYAxis.Location = New System.Drawing.Point(13, 196) + Me.lblFaceYAxis.Name = "lblFaceYAxis" + Me.lblFaceYAxis.Size = New System.Drawing.Size(34, 13) + Me.lblFaceYAxis.TabIndex = 25 + Me.lblFaceYAxis.Text = "Face:" ' - 'ucrNudLineHeightTopAxis + 'UcrInputComboBox11 ' - Me.ucrNudLineHeightTopAxis.DecimalPlaces = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudLineHeightTopAxis.Increment = New Decimal(New Integer() {1, 0, 0, 65536}) - Me.ucrNudLineHeightTopAxis.Location = New System.Drawing.Point(94, 106) - Me.ucrNudLineHeightTopAxis.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) - Me.ucrNudLineHeightTopAxis.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) - Me.ucrNudLineHeightTopAxis.Name = "ucrNudLineHeightTopAxis" - Me.ucrNudLineHeightTopAxis.Size = New System.Drawing.Size(50, 20) - Me.ucrNudLineHeightTopAxis.TabIndex = 36 - Me.ucrNudLineHeightTopAxis.Value = New Decimal(New Integer() {0, 0, 0, 0}) + Me.UcrInputComboBox11.AddQuotesIfUnrecognised = True + Me.UcrInputComboBox11.IsReadOnly = False + Me.UcrInputComboBox11.Location = New System.Drawing.Point(73, 189) + Me.UcrInputComboBox11.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) + Me.UcrInputComboBox11.Name = "UcrInputComboBox11" + Me.UcrInputComboBox11.Size = New System.Drawing.Size(137, 21) + Me.UcrInputComboBox11.TabIndex = 26 ' - 'ucrNudAngleTopAxis + 'lblFamilyYAxis ' - Me.ucrNudAngleTopAxis.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) - Me.ucrNudAngleTopAxis.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudAngleTopAxis.Location = New System.Drawing.Point(94, 134) - Me.ucrNudAngleTopAxis.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) - Me.ucrNudAngleTopAxis.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) - Me.ucrNudAngleTopAxis.Name = "ucrNudAngleTopAxis" - Me.ucrNudAngleTopAxis.Size = New System.Drawing.Size(50, 20) - Me.ucrNudAngleTopAxis.TabIndex = 34 - Me.ucrNudAngleTopAxis.Value = New Decimal(New Integer() {0, 0, 0, 0}) - ' - 'ucrNudHjustTopAxis - ' - Me.ucrNudHjustTopAxis.DecimalPlaces = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudHjustTopAxis.Increment = New Decimal(New Integer() {1, 0, 0, 65536}) - Me.ucrNudHjustTopAxis.Location = New System.Drawing.Point(94, 46) - Me.ucrNudHjustTopAxis.Maximum = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudHjustTopAxis.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) - Me.ucrNudHjustTopAxis.Name = "ucrNudHjustTopAxis" - Me.ucrNudHjustTopAxis.Size = New System.Drawing.Size(50, 20) - Me.ucrNudHjustTopAxis.TabIndex = 32 - Me.ucrNudHjustTopAxis.Value = New Decimal(New Integer() {0, 0, 0, 0}) - ' - 'ucrNudSizeTopaxis - ' - Me.ucrNudSizeTopaxis.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) - Me.ucrNudSizeTopaxis.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudSizeTopaxis.Location = New System.Drawing.Point(94, 16) - Me.ucrNudSizeTopaxis.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) - Me.ucrNudSizeTopaxis.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) - Me.ucrNudSizeTopaxis.Name = "ucrNudSizeTopaxis" - Me.ucrNudSizeTopaxis.Size = New System.Drawing.Size(50, 20) - Me.ucrNudSizeTopaxis.TabIndex = 30 - Me.ucrNudSizeTopaxis.Value = New Decimal(New Integer() {0, 0, 0, 0}) - ' - 'ucrInputColourTopAxis - ' - Me.ucrInputColourTopAxis.AddQuotesIfUnrecognised = True - Me.ucrInputColourTopAxis.IsReadOnly = False - Me.ucrInputColourTopAxis.Location = New System.Drawing.Point(73, 217) - Me.ucrInputColourTopAxis.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) - Me.ucrInputColourTopAxis.Name = "ucrInputColourTopAxis" - Me.ucrInputColourTopAxis.Size = New System.Drawing.Size(137, 21) - Me.ucrInputColourTopAxis.TabIndex = 28 - ' - 'ucrInputFaceTopAxis - ' - Me.ucrInputFaceTopAxis.AddQuotesIfUnrecognised = True - Me.ucrInputFaceTopAxis.IsReadOnly = False - Me.ucrInputFaceTopAxis.Location = New System.Drawing.Point(73, 189) - Me.ucrInputFaceTopAxis.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) - Me.ucrInputFaceTopAxis.Name = "ucrInputFaceTopAxis" - Me.ucrInputFaceTopAxis.Size = New System.Drawing.Size(137, 21) - Me.ucrInputFaceTopAxis.TabIndex = 26 - ' - 'ucrInputFamilyTopAxis - ' - Me.ucrInputFamilyTopAxis.AddQuotesIfUnrecognised = True - Me.ucrInputFamilyTopAxis.IsReadOnly = False - Me.ucrInputFamilyTopAxis.Location = New System.Drawing.Point(73, 162) - Me.ucrInputFamilyTopAxis.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) - Me.ucrInputFamilyTopAxis.Name = "ucrInputFamilyTopAxis" - Me.ucrInputFamilyTopAxis.Size = New System.Drawing.Size(137, 21) - Me.ucrInputFamilyTopAxis.TabIndex = 24 - ' - 'ucrInputLineEndTickMarks - ' - Me.ucrInputLineEndTickMarks.AddQuotesIfUnrecognised = True - Me.ucrInputLineEndTickMarks.IsReadOnly = False - Me.ucrInputLineEndTickMarks.Location = New System.Drawing.Point(72, 100) - Me.ucrInputLineEndTickMarks.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) - Me.ucrInputLineEndTickMarks.Name = "ucrInputLineEndTickMarks" - Me.ucrInputLineEndTickMarks.Size = New System.Drawing.Size(137, 21) - Me.ucrInputLineEndTickMarks.TabIndex = 32 - ' - 'ucrNudSizeTickMarks - ' - Me.ucrNudSizeTickMarks.DecimalPlaces = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudSizeTickMarks.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudSizeTickMarks.Location = New System.Drawing.Point(94, 17) - Me.ucrNudSizeTickMarks.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) - Me.ucrNudSizeTickMarks.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) - Me.ucrNudSizeTickMarks.Name = "ucrNudSizeTickMarks" - Me.ucrNudSizeTickMarks.Size = New System.Drawing.Size(50, 20) - Me.ucrNudSizeTickMarks.TabIndex = 30 - Me.ucrNudSizeTickMarks.Value = New Decimal(New Integer() {0, 0, 0, 0}) - ' - 'ucrInputColourTickMarks - ' - Me.ucrInputColourTickMarks.AddQuotesIfUnrecognised = True - Me.ucrInputColourTickMarks.IsReadOnly = False - Me.ucrInputColourTickMarks.Location = New System.Drawing.Point(72, 68) - Me.ucrInputColourTickMarks.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) - Me.ucrInputColourTickMarks.Name = "ucrInputColourTickMarks" - Me.ucrInputColourTickMarks.Size = New System.Drawing.Size(137, 21) - Me.ucrInputColourTickMarks.TabIndex = 28 - ' - 'ucrInputLineTypeTickMarks - ' - Me.ucrInputLineTypeTickMarks.AddQuotesIfUnrecognised = True - Me.ucrInputLineTypeTickMarks.IsReadOnly = False - Me.ucrInputLineTypeTickMarks.Location = New System.Drawing.Point(72, 40) - Me.ucrInputLineTypeTickMarks.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) - Me.ucrInputLineTypeTickMarks.Name = "ucrInputLineTypeTickMarks" - Me.ucrInputLineTypeTickMarks.Size = New System.Drawing.Size(137, 21) - Me.ucrInputLineTypeTickMarks.TabIndex = 26 - ' - 'ucrNudVjust - ' - Me.ucrNudVjust.DecimalPlaces = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudVjust.Increment = New Decimal(New Integer() {1, 0, 0, 65536}) - Me.ucrNudVjust.Location = New System.Drawing.Point(94, 76) - Me.ucrNudVjust.Maximum = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudVjust.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) - Me.ucrNudVjust.Name = "ucrNudVjust" - Me.ucrNudVjust.Size = New System.Drawing.Size(50, 20) - Me.ucrNudVjust.TabIndex = 38 - Me.ucrNudVjust.Value = New Decimal(New Integer() {0, 0, 0, 0}) - ' - 'ucrNudLineHeight - ' - Me.ucrNudLineHeight.DecimalPlaces = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudLineHeight.Increment = New Decimal(New Integer() {1, 0, 0, 65536}) - Me.ucrNudLineHeight.Location = New System.Drawing.Point(94, 106) - Me.ucrNudLineHeight.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) - Me.ucrNudLineHeight.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) - Me.ucrNudLineHeight.Name = "ucrNudLineHeight" - Me.ucrNudLineHeight.Size = New System.Drawing.Size(50, 20) - Me.ucrNudLineHeight.TabIndex = 36 - Me.ucrNudLineHeight.Value = New Decimal(New Integer() {0, 0, 0, 0}) - ' - 'ucrNudAngle - ' - Me.ucrNudAngle.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) - Me.ucrNudAngle.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudAngle.Location = New System.Drawing.Point(94, 136) - Me.ucrNudAngle.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) - Me.ucrNudAngle.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) - Me.ucrNudAngle.Name = "ucrNudAngle" - Me.ucrNudAngle.Size = New System.Drawing.Size(50, 20) - Me.ucrNudAngle.TabIndex = 34 - Me.ucrNudAngle.Value = New Decimal(New Integer() {0, 0, 0, 0}) - ' - 'ucrNudHjust - ' - Me.ucrNudHjust.DecimalPlaces = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudHjust.Increment = New Decimal(New Integer() {1, 0, 0, 65536}) - Me.ucrNudHjust.Location = New System.Drawing.Point(94, 46) - Me.ucrNudHjust.Maximum = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudHjust.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) - Me.ucrNudHjust.Name = "ucrNudHjust" - Me.ucrNudHjust.Size = New System.Drawing.Size(50, 20) - Me.ucrNudHjust.TabIndex = 32 - Me.ucrNudHjust.Value = New Decimal(New Integer() {0, 0, 0, 0}) - ' - 'ucrNudsize - ' - 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(94, 16) - 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" - Me.ucrNudsize.Size = New System.Drawing.Size(50, 20) - Me.ucrNudsize.TabIndex = 30 - Me.ucrNudsize.Value = New Decimal(New Integer() {0, 0, 0, 0}) - ' - 'ucrInputColour - ' - Me.ucrInputColour.AddQuotesIfUnrecognised = True - Me.ucrInputColour.IsReadOnly = False - Me.ucrInputColour.Location = New System.Drawing.Point(73, 217) - Me.ucrInputColour.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) - Me.ucrInputColour.Name = "ucrInputColour" - Me.ucrInputColour.Size = New System.Drawing.Size(137, 21) - Me.ucrInputColour.TabIndex = 28 - ' - 'ucrInputFace - ' - Me.ucrInputFace.AddQuotesIfUnrecognised = True - Me.ucrInputFace.IsReadOnly = False - Me.ucrInputFace.Location = New System.Drawing.Point(73, 189) - Me.ucrInputFace.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) - Me.ucrInputFace.Name = "ucrInputFace" - Me.ucrInputFace.Size = New System.Drawing.Size(137, 21) - Me.ucrInputFace.TabIndex = 26 - ' - 'ucrInputFamily - ' - Me.ucrInputFamily.AddQuotesIfUnrecognised = True - Me.ucrInputFamily.IsReadOnly = False - Me.ucrInputFamily.Location = New System.Drawing.Point(73, 162) - Me.ucrInputFamily.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) - Me.ucrInputFamily.Name = "ucrInputFamily" - Me.ucrInputFamily.Size = New System.Drawing.Size(137, 21) - Me.ucrInputFamily.TabIndex = 24 - ' - 'UcrInputComboBox1 - ' - Me.UcrInputComboBox1.AddQuotesIfUnrecognised = True - Me.UcrInputComboBox1.IsReadOnly = False - Me.UcrInputComboBox1.Location = New System.Drawing.Point(72, 100) - Me.UcrInputComboBox1.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) - Me.UcrInputComboBox1.Name = "UcrInputComboBox1" - Me.UcrInputComboBox1.Size = New System.Drawing.Size(137, 21) - Me.UcrInputComboBox1.TabIndex = 32 - ' - 'UcrNud1 - ' - Me.UcrNud1.DecimalPlaces = New Decimal(New Integer() {1, 0, 0, 0}) - Me.UcrNud1.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.UcrNud1.Location = New System.Drawing.Point(94, 17) - Me.UcrNud1.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) - Me.UcrNud1.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) - Me.UcrNud1.Name = "UcrNud1" - Me.UcrNud1.Size = New System.Drawing.Size(50, 20) - Me.UcrNud1.TabIndex = 30 - Me.UcrNud1.Value = New Decimal(New Integer() {0, 0, 0, 0}) - ' - 'UcrInputComboBox2 - ' - Me.UcrInputComboBox2.AddQuotesIfUnrecognised = True - Me.UcrInputComboBox2.IsReadOnly = False - Me.UcrInputComboBox2.Location = New System.Drawing.Point(72, 68) - Me.UcrInputComboBox2.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) - Me.UcrInputComboBox2.Name = "UcrInputComboBox2" - Me.UcrInputComboBox2.Size = New System.Drawing.Size(137, 21) - Me.UcrInputComboBox2.TabIndex = 28 - ' - 'UcrInputComboBox3 - ' - Me.UcrInputComboBox3.AddQuotesIfUnrecognised = True - Me.UcrInputComboBox3.IsReadOnly = False - Me.UcrInputComboBox3.Location = New System.Drawing.Point(72, 40) - Me.UcrInputComboBox3.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) - Me.UcrInputComboBox3.Name = "UcrInputComboBox3" - Me.UcrInputComboBox3.Size = New System.Drawing.Size(137, 21) - Me.UcrInputComboBox3.TabIndex = 26 - ' - 'UcrNud2 - ' - Me.UcrNud2.DecimalPlaces = New Decimal(New Integer() {1, 0, 0, 0}) - Me.UcrNud2.Increment = New Decimal(New Integer() {1, 0, 0, 65536}) - Me.UcrNud2.Location = New System.Drawing.Point(94, 76) - Me.UcrNud2.Maximum = New Decimal(New Integer() {1, 0, 0, 0}) - Me.UcrNud2.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) - Me.UcrNud2.Name = "UcrNud2" - Me.UcrNud2.Size = New System.Drawing.Size(50, 20) - Me.UcrNud2.TabIndex = 38 - Me.UcrNud2.Value = New Decimal(New Integer() {0, 0, 0, 0}) - ' - 'UcrNud3 - ' - Me.UcrNud3.DecimalPlaces = New Decimal(New Integer() {1, 0, 0, 0}) - Me.UcrNud3.Increment = New Decimal(New Integer() {1, 0, 0, 65536}) - Me.UcrNud3.Location = New System.Drawing.Point(94, 106) - Me.UcrNud3.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) - Me.UcrNud3.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) - Me.UcrNud3.Name = "UcrNud3" - Me.UcrNud3.Size = New System.Drawing.Size(50, 20) - Me.UcrNud3.TabIndex = 36 - Me.UcrNud3.Value = New Decimal(New Integer() {0, 0, 0, 0}) - ' - 'UcrNud4 - ' - Me.UcrNud4.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) - Me.UcrNud4.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.UcrNud4.Location = New System.Drawing.Point(94, 134) - Me.UcrNud4.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) - Me.UcrNud4.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) - Me.UcrNud4.Name = "UcrNud4" - Me.UcrNud4.Size = New System.Drawing.Size(50, 20) - Me.UcrNud4.TabIndex = 34 - Me.UcrNud4.Value = New Decimal(New Integer() {0, 0, 0, 0}) - ' - 'UcrNud5 - ' - Me.UcrNud5.DecimalPlaces = New Decimal(New Integer() {1, 0, 0, 0}) - Me.UcrNud5.Increment = New Decimal(New Integer() {1, 0, 0, 65536}) - Me.UcrNud5.Location = New System.Drawing.Point(94, 46) - Me.UcrNud5.Maximum = New Decimal(New Integer() {1, 0, 0, 0}) - Me.UcrNud5.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) - Me.UcrNud5.Name = "UcrNud5" - Me.UcrNud5.Size = New System.Drawing.Size(50, 20) - Me.UcrNud5.TabIndex = 32 - Me.UcrNud5.Value = New Decimal(New Integer() {0, 0, 0, 0}) - ' - 'UcrNud6 - ' - Me.UcrNud6.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) - Me.UcrNud6.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.UcrNud6.Location = New System.Drawing.Point(94, 16) - Me.UcrNud6.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) - Me.UcrNud6.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) - Me.UcrNud6.Name = "UcrNud6" - Me.UcrNud6.Size = New System.Drawing.Size(50, 20) - Me.UcrNud6.TabIndex = 30 - Me.UcrNud6.Value = New Decimal(New Integer() {0, 0, 0, 0}) - ' - 'UcrInputComboBox4 - ' - Me.UcrInputComboBox4.AddQuotesIfUnrecognised = True - Me.UcrInputComboBox4.IsReadOnly = False - Me.UcrInputComboBox4.Location = New System.Drawing.Point(73, 217) - Me.UcrInputComboBox4.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) - Me.UcrInputComboBox4.Name = "UcrInputComboBox4" - Me.UcrInputComboBox4.Size = New System.Drawing.Size(137, 21) - Me.UcrInputComboBox4.TabIndex = 28 - ' - 'UcrInputComboBox5 - ' - Me.UcrInputComboBox5.AddQuotesIfUnrecognised = True - Me.UcrInputComboBox5.IsReadOnly = False - Me.UcrInputComboBox5.Location = New System.Drawing.Point(73, 189) - Me.UcrInputComboBox5.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) - Me.UcrInputComboBox5.Name = "UcrInputComboBox5" - Me.UcrInputComboBox5.Size = New System.Drawing.Size(137, 21) - Me.UcrInputComboBox5.TabIndex = 26 - ' - 'UcrInputComboBox6 - ' - Me.UcrInputComboBox6.AddQuotesIfUnrecognised = True - Me.UcrInputComboBox6.IsReadOnly = False - Me.UcrInputComboBox6.Location = New System.Drawing.Point(73, 162) - Me.UcrInputComboBox6.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) - Me.UcrInputComboBox6.Name = "UcrInputComboBox6" - Me.UcrInputComboBox6.Size = New System.Drawing.Size(137, 21) - Me.UcrInputComboBox6.TabIndex = 24 - ' - 'UcrInputComboBox7 - ' - Me.UcrInputComboBox7.AddQuotesIfUnrecognised = True - Me.UcrInputComboBox7.IsReadOnly = False - Me.UcrInputComboBox7.Location = New System.Drawing.Point(72, 100) - Me.UcrInputComboBox7.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) - Me.UcrInputComboBox7.Name = "UcrInputComboBox7" - Me.UcrInputComboBox7.Size = New System.Drawing.Size(137, 21) - Me.UcrInputComboBox7.TabIndex = 32 - ' - 'UcrNud7 - ' - Me.UcrNud7.DecimalPlaces = New Decimal(New Integer() {1, 0, 0, 0}) - Me.UcrNud7.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.UcrNud7.Location = New System.Drawing.Point(94, 17) - Me.UcrNud7.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) - Me.UcrNud7.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) - Me.UcrNud7.Name = "UcrNud7" - Me.UcrNud7.Size = New System.Drawing.Size(50, 20) - Me.UcrNud7.TabIndex = 30 - Me.UcrNud7.Value = New Decimal(New Integer() {0, 0, 0, 0}) - ' - 'UcrInputComboBox8 - ' - Me.UcrInputComboBox8.AddQuotesIfUnrecognised = True - Me.UcrInputComboBox8.IsReadOnly = False - Me.UcrInputComboBox8.Location = New System.Drawing.Point(72, 68) - Me.UcrInputComboBox8.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) - Me.UcrInputComboBox8.Name = "UcrInputComboBox8" - Me.UcrInputComboBox8.Size = New System.Drawing.Size(137, 21) - Me.UcrInputComboBox8.TabIndex = 28 - ' - 'UcrInputComboBox9 - ' - Me.UcrInputComboBox9.AddQuotesIfUnrecognised = True - Me.UcrInputComboBox9.IsReadOnly = False - Me.UcrInputComboBox9.Location = New System.Drawing.Point(72, 40) - Me.UcrInputComboBox9.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) - Me.UcrInputComboBox9.Name = "UcrInputComboBox9" - Me.UcrInputComboBox9.Size = New System.Drawing.Size(137, 21) - Me.UcrInputComboBox9.TabIndex = 26 - ' - 'UcrNud8 - ' - Me.UcrNud8.DecimalPlaces = New Decimal(New Integer() {1, 0, 0, 0}) - Me.UcrNud8.Increment = New Decimal(New Integer() {1, 0, 0, 65536}) - Me.UcrNud8.Location = New System.Drawing.Point(94, 76) - Me.UcrNud8.Maximum = New Decimal(New Integer() {1, 0, 0, 0}) - Me.UcrNud8.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) - Me.UcrNud8.Name = "UcrNud8" - Me.UcrNud8.Size = New System.Drawing.Size(50, 20) - Me.UcrNud8.TabIndex = 38 - Me.UcrNud8.Value = New Decimal(New Integer() {0, 0, 0, 0}) - ' - 'UcrNud9 - ' - Me.UcrNud9.DecimalPlaces = New Decimal(New Integer() {1, 0, 0, 0}) - Me.UcrNud9.Increment = New Decimal(New Integer() {1, 0, 0, 65536}) - Me.UcrNud9.Location = New System.Drawing.Point(94, 106) - Me.UcrNud9.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) - Me.UcrNud9.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) - Me.UcrNud9.Name = "UcrNud9" - Me.UcrNud9.Size = New System.Drawing.Size(50, 20) - Me.UcrNud9.TabIndex = 36 - Me.UcrNud9.Value = New Decimal(New Integer() {0, 0, 0, 0}) - ' - 'UcrNud10 - ' - Me.UcrNud10.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) - Me.UcrNud10.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.UcrNud10.Location = New System.Drawing.Point(94, 136) - Me.UcrNud10.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) - Me.UcrNud10.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) - Me.UcrNud10.Name = "UcrNud10" - Me.UcrNud10.Size = New System.Drawing.Size(50, 20) - Me.UcrNud10.TabIndex = 34 - Me.UcrNud10.Value = New Decimal(New Integer() {0, 0, 0, 0}) - ' - 'UcrNud11 - ' - Me.UcrNud11.DecimalPlaces = New Decimal(New Integer() {1, 0, 0, 0}) - Me.UcrNud11.Increment = New Decimal(New Integer() {1, 0, 0, 65536}) - Me.UcrNud11.Location = New System.Drawing.Point(94, 46) - Me.UcrNud11.Maximum = New Decimal(New Integer() {1, 0, 0, 0}) - Me.UcrNud11.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) - Me.UcrNud11.Name = "UcrNud11" - Me.UcrNud11.Size = New System.Drawing.Size(50, 20) - Me.UcrNud11.TabIndex = 32 - Me.UcrNud11.Value = New Decimal(New Integer() {0, 0, 0, 0}) - ' - 'UcrNud12 - ' - Me.UcrNud12.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) - Me.UcrNud12.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.UcrNud12.Location = New System.Drawing.Point(94, 16) - Me.UcrNud12.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) - Me.UcrNud12.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) - Me.UcrNud12.Name = "UcrNud12" - Me.UcrNud12.Size = New System.Drawing.Size(50, 20) - Me.UcrNud12.TabIndex = 30 - Me.UcrNud12.Value = New Decimal(New Integer() {0, 0, 0, 0}) - ' - 'UcrInputComboBox10 - ' - Me.UcrInputComboBox10.AddQuotesIfUnrecognised = True - Me.UcrInputComboBox10.IsReadOnly = False - Me.UcrInputComboBox10.Location = New System.Drawing.Point(73, 217) - Me.UcrInputComboBox10.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) - Me.UcrInputComboBox10.Name = "UcrInputComboBox10" - Me.UcrInputComboBox10.Size = New System.Drawing.Size(137, 21) - Me.UcrInputComboBox10.TabIndex = 28 - ' - 'UcrInputComboBox11 - ' - Me.UcrInputComboBox11.AddQuotesIfUnrecognised = True - Me.UcrInputComboBox11.IsReadOnly = False - Me.UcrInputComboBox11.Location = New System.Drawing.Point(73, 189) - Me.UcrInputComboBox11.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) - Me.UcrInputComboBox11.Name = "UcrInputComboBox11" - Me.UcrInputComboBox11.Size = New System.Drawing.Size(137, 21) - Me.UcrInputComboBox11.TabIndex = 26 + Me.lblFamilyYAxis.AutoSize = True + Me.lblFamilyYAxis.Location = New System.Drawing.Point(13, 166) + Me.lblFamilyYAxis.Name = "lblFamilyYAxis" + Me.lblFamilyYAxis.Size = New System.Drawing.Size(39, 13) + Me.lblFamilyYAxis.TabIndex = 23 + Me.lblFamilyYAxis.Text = "Family:" ' - 'UcrInputComboBox12 + 'crInputComboBox12 ' - Me.UcrInputComboBox12.AddQuotesIfUnrecognised = True - Me.UcrInputComboBox12.IsReadOnly = False - Me.UcrInputComboBox12.Location = New System.Drawing.Point(73, 162) - Me.UcrInputComboBox12.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) - Me.UcrInputComboBox12.Name = "UcrInputComboBox12" - Me.UcrInputComboBox12.Size = New System.Drawing.Size(137, 21) - Me.UcrInputComboBox12.TabIndex = 24 + Me.crInputComboBox12.AddQuotesIfUnrecognised = True + Me.crInputComboBox12.IsReadOnly = False + Me.crInputComboBox12.Location = New System.Drawing.Point(73, 162) + Me.crInputComboBox12.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) + Me.crInputComboBox12.Name = "crInputComboBox12" + Me.crInputComboBox12.Size = New System.Drawing.Size(137, 21) + Me.crInputComboBox12.TabIndex = 24 ' 'ucrBaseSubdialogue ' @@ -1417,7 +1417,7 @@ Partial Class sdgThemes Friend WithEvents lblLineEndXtickMarks As Label Friend WithEvents ucrInputLineEndXTickMarks As ucrInputComboBox Friend WithEvents lblSizeXTickMarks As Label - Friend WithEvents ucrNudSizeXTickMarks As ucrNud + Friend WithEvents ucrNudSizeXTickLabels As ucrNud Friend WithEvents lblColourXTickMarks As Label Friend WithEvents ucrInputColourXTickMarks As ucrInputComboBox Friend WithEvents lbllineTypeXTickMarks As Label @@ -1426,22 +1426,22 @@ Partial Class sdgThemes Friend WithEvents Label1 As Label Friend WithEvents UcrInputComboBox1 As ucrInputComboBox Friend WithEvents Label3 As Label - Friend WithEvents UcrNud1 As ucrNud + Friend WithEvents ucrNudSizeTickLabelsYAxis As ucrNud Friend WithEvents Label4 As Label Friend WithEvents UcrInputComboBox2 As ucrInputComboBox Friend WithEvents Label5 As Label Friend WithEvents UcrInputComboBox3 As ucrInputComboBox Friend WithEvents GroupBox3 As GroupBox Friend WithEvents Label6 As Label - Friend WithEvents UcrNud2 As ucrNud + Friend WithEvents ucrNudVjustTopYAxis As ucrNud Friend WithEvents Label7 As Label - Friend WithEvents UcrNud3 As ucrNud + Friend WithEvents ucrNudLineHeightTopYAxis As ucrNud Friend WithEvents Label8 As Label - Friend WithEvents UcrNud4 As ucrNud + Friend WithEvents ucrNudAngleTopYAxis As ucrNud Friend WithEvents Label9 As Label - Friend WithEvents UcrNud5 As ucrNud + Friend WithEvents ucrNudHjustTopYAxis As ucrNud Friend WithEvents Label10 As Label - Friend WithEvents UcrNud6 As ucrNud + Friend WithEvents ucrNudSizeTopYAxis As ucrNud Friend WithEvents Label11 As Label Friend WithEvents UcrInputComboBox4 As ucrInputComboBox Friend WithEvents Label12 As Label @@ -1452,26 +1452,26 @@ Partial Class sdgThemes Friend WithEvents Label14 As Label Friend WithEvents UcrInputComboBox7 As ucrInputComboBox Friend WithEvents Label15 As Label - Friend WithEvents UcrNud7 As ucrNud + Friend WithEvents ucrNudSizeTickMarksYAxis As ucrNud Friend WithEvents Label16 As Label Friend WithEvents UcrInputComboBox8 As ucrInputComboBox Friend WithEvents Label17 As Label Friend WithEvents UcrInputComboBox9 As ucrInputComboBox Friend WithEvents GroupBox5 As GroupBox - Friend WithEvents Label18 As Label - Friend WithEvents UcrNud8 As ucrNud - Friend WithEvents Label19 As Label - Friend WithEvents UcrNud9 As ucrNud + Friend WithEvents lblVjustYAxis As Label + Friend WithEvents ucrNudVjustYAxis As ucrNud + Friend WithEvents lblLineHeightYAxis As Label + Friend WithEvents ucrNudLineHeightYAxis As ucrNud Friend WithEvents Label20 As Label - Friend WithEvents UcrNud10 As ucrNud + Friend WithEvents ucrNudLAngle As ucrNud Friend WithEvents lblHjustYAxis As Label - Friend WithEvents UcrNud11 As ucrNud + Friend WithEvents ucrNudHjustYAxis As ucrNud Friend WithEvents lblSizeYAxis As Label - Friend WithEvents UcrNud12 As ucrNud - Friend WithEvents Label23 As Label + Friend WithEvents ucrNudSizeYAxis As ucrNud + Friend WithEvents lblColourYAxis As Label Friend WithEvents UcrInputComboBox10 As ucrInputComboBox - Friend WithEvents Label24 As Label + Friend WithEvents lblFaceYAxis As Label Friend WithEvents UcrInputComboBox11 As ucrInputComboBox - Friend WithEvents Label25 As Label - Friend WithEvents UcrInputComboBox12 As ucrInputComboBox + Friend WithEvents lblFamilyYAxis As Label + Friend WithEvents crInputComboBox12 As ucrInputComboBox End Class diff --git a/instat/sdgThemes.vb b/instat/sdgThemes.vb index 3289e322797..a8e72a8c3ac 100644 --- a/instat/sdgThemes.vb +++ b/instat/sdgThemes.vb @@ -23,6 +23,7 @@ Public Class sdgThemes autoTranslate(Me) End Sub + Public Sub InitialiseControls() Dim dctucrInputColour As New Dictionary(Of String, String) Dim dctucrInputColourTopAxis As New Dictionary(Of String, String) @@ -188,8 +189,8 @@ Public Class sdgThemes ucrInputFamilyTopAxis.bUpdateRCodeFromControl = False 'Tick Marks Along Axes - ucrNudSizeXTickMarks.SetParameter(New RParameter("size")) - ucrNudSizeXTickMarks.Increment = 0.1 + ucrNudSizeXTickLabels.SetParameter(New RParameter("size")) + ucrNudSizeXTickLabels.Increment = 0.1 ucrInputLineTypeXTickMarks.SetParameter(New RParameter("linetype")) dctucrInputLineTypeXTickMarks.Add("Blank", Chr(34) & "blank" & Chr(34)) dctucrInputLineTypeXTickMarks.Add("Solid", Chr(34) & "solid" & Chr(34)) @@ -285,7 +286,7 @@ Public Class sdgThemes ucrInputFaceTopAxis.SetRCode(clsElementText, bReset) ucrInputFamilyTopAxis.SetRCode(clsElementText, bReset) - ucrNudSizeXTickMarks.SetRCode(clsElementLine, bReset) + ucrNudSizeXTickLabels.SetRCode(clsElementLine, bReset) ucrInputColourXTickMarks.SetRCode(clsElementLine, bReset) ucrInputLineTypeXTickMarks.SetRCode(clsElementLine, bReset) ucrInputLineEndXTickMarks.SetRCode(clsElementLine, bReset) From 147f62fa5373598742a3e2f591b49db50ce0b3eb Mon Sep 17 00:00:00 2001 From: Steven Date: Sat, 3 Jun 2017 10:23:42 +0300 Subject: [PATCH 077/154] Yaxis Tab design --- instat/sdgThemes.Designer.vb | 862 +++++++++++++++++------------------ instat/sdgThemes.vb | 15 + 2 files changed, 446 insertions(+), 431 deletions(-) diff --git a/instat/sdgThemes.Designer.vb b/instat/sdgThemes.Designer.vb index 802330a8611..98d6627ac04 100644 --- a/instat/sdgThemes.Designer.vb +++ b/instat/sdgThemes.Designer.vb @@ -78,58 +78,58 @@ Partial Class sdgThemes Me.lblFamily = New System.Windows.Forms.Label() Me.ucrInputFamily = New instat.ucrInputComboBox() Me.tbYaxis = New System.Windows.Forms.TabPage() - Me.GroupBox2 = New System.Windows.Forms.GroupBox() - Me.Label1 = New System.Windows.Forms.Label() - Me.UcrInputComboBox1 = New instat.ucrInputComboBox() - Me.Label3 = New System.Windows.Forms.Label() + Me.grpTickLabelYAxis = New System.Windows.Forms.GroupBox() + Me.LlblLinEndTickLabelYAxis = New System.Windows.Forms.Label() + Me.ucrInputLineEndTickLabelsYAxis = New instat.ucrInputComboBox() + Me.lblSizeTickLabelYAxis = New System.Windows.Forms.Label() Me.ucrNudSizeTickLabelsYAxis = New instat.ucrNud() - Me.Label4 = New System.Windows.Forms.Label() - Me.UcrInputComboBox2 = New instat.ucrInputComboBox() - Me.Label5 = New System.Windows.Forms.Label() - Me.UcrInputComboBox3 = New instat.ucrInputComboBox() - Me.GroupBox3 = New System.Windows.Forms.GroupBox() - Me.Label6 = New System.Windows.Forms.Label() + Me.lblColourTickLabelYAxis = New System.Windows.Forms.Label() + Me.ucrInputColourTickLabelsYAxis = New instat.ucrInputComboBox() + Me.lblLineHeightTickLabelsYAxis = New System.Windows.Forms.Label() + Me.ucrInputLineTypeTopYAxis = New instat.ucrInputComboBox() + Me.grpYAxisTopLabels = New System.Windows.Forms.GroupBox() + Me.lblVjustTopYAxis = New System.Windows.Forms.Label() Me.ucrNudVjustTopYAxis = New instat.ucrNud() - Me.Label7 = New System.Windows.Forms.Label() + Me.lblLineHeightTopYAxis = New System.Windows.Forms.Label() Me.ucrNudLineHeightTopYAxis = New instat.ucrNud() - Me.Label8 = New System.Windows.Forms.Label() + Me.lblAngleTopYAxis = New System.Windows.Forms.Label() Me.ucrNudAngleTopYAxis = New instat.ucrNud() - Me.Label9 = New System.Windows.Forms.Label() + Me.lblHjustTopYAxis = New System.Windows.Forms.Label() Me.ucrNudHjustTopYAxis = New instat.ucrNud() - Me.Label10 = New System.Windows.Forms.Label() + Me.lblSizeTopYAxis = New System.Windows.Forms.Label() Me.ucrNudSizeTopYAxis = New instat.ucrNud() - Me.Label11 = New System.Windows.Forms.Label() - Me.UcrInputComboBox4 = New instat.ucrInputComboBox() - Me.Label12 = New System.Windows.Forms.Label() - Me.UcrInputComboBox5 = New instat.ucrInputComboBox() - Me.Label13 = New System.Windows.Forms.Label() - Me.UcrInputComboBox6 = New instat.ucrInputComboBox() - Me.GroupBox4 = New System.Windows.Forms.GroupBox() - Me.Label14 = New System.Windows.Forms.Label() - Me.UcrInputComboBox7 = New instat.ucrInputComboBox() - Me.Label15 = New System.Windows.Forms.Label() + Me.lblColourTopYAxis = New System.Windows.Forms.Label() + Me.ucrInputColourTopYAxis = New instat.ucrInputComboBox() + Me.lblFaceTopYAxis = New System.Windows.Forms.Label() + Me.ucrInputFaceTopYAxis = New instat.ucrInputComboBox() + Me.lblFamilyTopYaxis = New System.Windows.Forms.Label() + Me.ucrInputFamilyTopYAxis = New instat.ucrInputComboBox() + Me.grpTickMarksYAxis = New System.Windows.Forms.GroupBox() + Me.lblLineEndTickMarksYAxis = New System.Windows.Forms.Label() + Me.ucrInputLineEndTickMarksYAxis = New instat.ucrInputComboBox() + Me.lblSizeTickMarksYAxis = New System.Windows.Forms.Label() Me.ucrNudSizeTickMarksYAxis = New instat.ucrNud() - Me.Label16 = New System.Windows.Forms.Label() - Me.UcrInputComboBox8 = New instat.ucrInputComboBox() - Me.Label17 = New System.Windows.Forms.Label() - Me.UcrInputComboBox9 = New instat.ucrInputComboBox() - Me.GroupBox5 = New System.Windows.Forms.GroupBox() + Me.lblColourTickMarksYAxis = New System.Windows.Forms.Label() + Me.ucrInputColourTickMarksYAxis = New instat.ucrInputComboBox() + Me.lblLineHeightTickMarksYAxis = New System.Windows.Forms.Label() + Me.ucrInputLineTypeYAxis = New instat.ucrInputComboBox() + Me.grpYAxisLabels = New System.Windows.Forms.GroupBox() Me.lblVjustYAxis = New System.Windows.Forms.Label() Me.ucrNudVjustYAxis = New instat.ucrNud() Me.lblLineHeightYAxis = New System.Windows.Forms.Label() Me.ucrNudLineHeightYAxis = New instat.ucrNud() - Me.Label20 = New System.Windows.Forms.Label() - Me.ucrNudLAngle = New instat.ucrNud() + Me.lblAngleYAxis = New System.Windows.Forms.Label() + Me.ucrNudLAngleYAxis = New instat.ucrNud() Me.lblHjustYAxis = New System.Windows.Forms.Label() Me.ucrNudHjustYAxis = New instat.ucrNud() Me.lblSizeYAxis = New System.Windows.Forms.Label() Me.ucrNudSizeYAxis = New instat.ucrNud() Me.lblColourYAxis = New System.Windows.Forms.Label() - Me.UcrInputComboBox10 = New instat.ucrInputComboBox() + Me.ucrInputColourYAxis = New instat.ucrInputComboBox() Me.lblFaceYAxis = New System.Windows.Forms.Label() - Me.UcrInputComboBox11 = New instat.ucrInputComboBox() + Me.ucrInputFaceYAxis = New instat.ucrInputComboBox() Me.lblFamilyYAxis = New System.Windows.Forms.Label() - Me.crInputComboBox12 = New instat.ucrInputComboBox() + Me.ucrInputFamilyYAxis = New instat.ucrInputComboBox() Me.ucrBaseSubdialogue = New instat.ucrButtonsSubdialogue() Me.tbXaxis.SuspendLayout() Me.tbAxis.SuspendLayout() @@ -139,10 +139,10 @@ Partial Class sdgThemes Me.GroupBox1.SuspendLayout() Me.grpAxisLabel.SuspendLayout() Me.tbYaxis.SuspendLayout() - Me.GroupBox2.SuspendLayout() - Me.GroupBox3.SuspendLayout() - Me.GroupBox4.SuspendLayout() - Me.GroupBox5.SuspendLayout() + Me.grpTickLabelYAxis.SuspendLayout() + Me.grpYAxisTopLabels.SuspendLayout() + Me.grpTickMarksYAxis.SuspendLayout() + Me.grpYAxisLabels.SuspendLayout() Me.SuspendLayout() ' 'tbXaxis @@ -745,10 +745,10 @@ Partial Class sdgThemes ' 'tbYaxis ' - Me.tbYaxis.Controls.Add(Me.GroupBox2) - Me.tbYaxis.Controls.Add(Me.GroupBox3) - Me.tbYaxis.Controls.Add(Me.GroupBox4) - Me.tbYaxis.Controls.Add(Me.GroupBox5) + Me.tbYaxis.Controls.Add(Me.grpTickLabelYAxis) + Me.tbYaxis.Controls.Add(Me.grpYAxisTopLabels) + Me.tbYaxis.Controls.Add(Me.grpTickMarksYAxis) + Me.tbYaxis.Controls.Add(Me.grpYAxisLabels) Me.tbYaxis.Location = New System.Drawing.Point(4, 22) Me.tbYaxis.Name = "tbYaxis" Me.tbYaxis.Padding = New System.Windows.Forms.Padding(3) @@ -757,50 +757,50 @@ Partial Class sdgThemes Me.tbYaxis.Text = "Y-axis" Me.tbYaxis.UseVisualStyleBackColor = True ' - 'GroupBox2 - ' - Me.GroupBox2.Controls.Add(Me.Label1) - Me.GroupBox2.Controls.Add(Me.UcrInputComboBox1) - Me.GroupBox2.Controls.Add(Me.Label3) - Me.GroupBox2.Controls.Add(Me.ucrNudSizeTickLabelsYAxis) - Me.GroupBox2.Controls.Add(Me.Label4) - Me.GroupBox2.Controls.Add(Me.UcrInputComboBox2) - Me.GroupBox2.Controls.Add(Me.Label5) - Me.GroupBox2.Controls.Add(Me.UcrInputComboBox3) - Me.GroupBox2.Location = New System.Drawing.Point(251, 259) - Me.GroupBox2.Name = "GroupBox2" - Me.GroupBox2.Size = New System.Drawing.Size(230, 154) - Me.GroupBox2.TabIndex = 43 - Me.GroupBox2.TabStop = False - Me.GroupBox2.Text = "Y axis tick labels" - ' - 'Label1 - ' - Me.Label1.AutoSize = True - Me.Label1.Location = New System.Drawing.Point(12, 108) - Me.Label1.Name = "Label1" - Me.Label1.Size = New System.Drawing.Size(52, 13) - Me.Label1.TabIndex = 31 - Me.Label1.Text = "Line End:" - ' - 'UcrInputComboBox1 - ' - Me.UcrInputComboBox1.AddQuotesIfUnrecognised = True - Me.UcrInputComboBox1.IsReadOnly = False - Me.UcrInputComboBox1.Location = New System.Drawing.Point(72, 100) - Me.UcrInputComboBox1.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) - Me.UcrInputComboBox1.Name = "UcrInputComboBox1" - Me.UcrInputComboBox1.Size = New System.Drawing.Size(137, 21) - Me.UcrInputComboBox1.TabIndex = 32 - ' - 'Label3 - ' - Me.Label3.AutoSize = True - Me.Label3.Location = New System.Drawing.Point(13, 22) - Me.Label3.Name = "Label3" - Me.Label3.Size = New System.Drawing.Size(30, 13) - Me.Label3.TabIndex = 29 - Me.Label3.Text = "Size:" + 'grpTickLabelYAxis + ' + Me.grpTickLabelYAxis.Controls.Add(Me.LlblLinEndTickLabelYAxis) + Me.grpTickLabelYAxis.Controls.Add(Me.ucrInputLineEndTickLabelsYAxis) + Me.grpTickLabelYAxis.Controls.Add(Me.lblSizeTickLabelYAxis) + Me.grpTickLabelYAxis.Controls.Add(Me.ucrNudSizeTickLabelsYAxis) + Me.grpTickLabelYAxis.Controls.Add(Me.lblColourTickLabelYAxis) + Me.grpTickLabelYAxis.Controls.Add(Me.ucrInputColourTickLabelsYAxis) + Me.grpTickLabelYAxis.Controls.Add(Me.lblLineHeightTickLabelsYAxis) + Me.grpTickLabelYAxis.Controls.Add(Me.ucrInputLineTypeTopYAxis) + Me.grpTickLabelYAxis.Location = New System.Drawing.Point(251, 259) + Me.grpTickLabelYAxis.Name = "grpTickLabelYAxis" + Me.grpTickLabelYAxis.Size = New System.Drawing.Size(230, 154) + Me.grpTickLabelYAxis.TabIndex = 43 + Me.grpTickLabelYAxis.TabStop = False + Me.grpTickLabelYAxis.Text = "Y axis tick labels" + ' + 'LlblLinEndTickLabelYAxis + ' + Me.LlblLinEndTickLabelYAxis.AutoSize = True + Me.LlblLinEndTickLabelYAxis.Location = New System.Drawing.Point(12, 108) + Me.LlblLinEndTickLabelYAxis.Name = "LlblLinEndTickLabelYAxis" + Me.LlblLinEndTickLabelYAxis.Size = New System.Drawing.Size(52, 13) + Me.LlblLinEndTickLabelYAxis.TabIndex = 31 + Me.LlblLinEndTickLabelYAxis.Text = "Line End:" + ' + 'ucrInputLineEndTickLabelsYAxis + ' + Me.ucrInputLineEndTickLabelsYAxis.AddQuotesIfUnrecognised = True + Me.ucrInputLineEndTickLabelsYAxis.IsReadOnly = False + Me.ucrInputLineEndTickLabelsYAxis.Location = New System.Drawing.Point(72, 100) + Me.ucrInputLineEndTickLabelsYAxis.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) + Me.ucrInputLineEndTickLabelsYAxis.Name = "ucrInputLineEndTickLabelsYAxis" + Me.ucrInputLineEndTickLabelsYAxis.Size = New System.Drawing.Size(137, 21) + Me.ucrInputLineEndTickLabelsYAxis.TabIndex = 32 + ' + 'lblSizeTickLabelYAxis + ' + Me.lblSizeTickLabelYAxis.AutoSize = True + Me.lblSizeTickLabelYAxis.Location = New System.Drawing.Point(13, 22) + Me.lblSizeTickLabelYAxis.Name = "lblSizeTickLabelYAxis" + Me.lblSizeTickLabelYAxis.Size = New System.Drawing.Size(30, 13) + Me.lblSizeTickLabelYAxis.TabIndex = 29 + Me.lblSizeTickLabelYAxis.Text = "Size:" ' 'ucrNudSizeTickLabelsYAxis ' @@ -814,77 +814,77 @@ Partial Class sdgThemes Me.ucrNudSizeTickLabelsYAxis.TabIndex = 30 Me.ucrNudSizeTickLabelsYAxis.Value = New Decimal(New Integer() {0, 0, 0, 0}) ' - 'Label4 - ' - Me.Label4.AutoSize = True - Me.Label4.Location = New System.Drawing.Point(12, 76) - Me.Label4.Name = "Label4" - Me.Label4.Size = New System.Drawing.Size(40, 13) - Me.Label4.TabIndex = 27 - Me.Label4.Text = "Colour:" - ' - 'UcrInputComboBox2 - ' - Me.UcrInputComboBox2.AddQuotesIfUnrecognised = True - Me.UcrInputComboBox2.IsReadOnly = False - Me.UcrInputComboBox2.Location = New System.Drawing.Point(72, 68) - Me.UcrInputComboBox2.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) - Me.UcrInputComboBox2.Name = "UcrInputComboBox2" - Me.UcrInputComboBox2.Size = New System.Drawing.Size(137, 21) - Me.UcrInputComboBox2.TabIndex = 28 - ' - 'Label5 - ' - Me.Label5.AutoSize = True - Me.Label5.Location = New System.Drawing.Point(12, 47) - Me.Label5.Name = "Label5" - Me.Label5.Size = New System.Drawing.Size(57, 13) - Me.Label5.TabIndex = 25 - Me.Label5.Text = "Line Type:" - ' - 'UcrInputComboBox3 - ' - Me.UcrInputComboBox3.AddQuotesIfUnrecognised = True - Me.UcrInputComboBox3.IsReadOnly = False - Me.UcrInputComboBox3.Location = New System.Drawing.Point(72, 40) - Me.UcrInputComboBox3.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) - Me.UcrInputComboBox3.Name = "UcrInputComboBox3" - Me.UcrInputComboBox3.Size = New System.Drawing.Size(137, 21) - Me.UcrInputComboBox3.TabIndex = 26 - ' - 'GroupBox3 - ' - Me.GroupBox3.Controls.Add(Me.Label6) - Me.GroupBox3.Controls.Add(Me.ucrNudVjustTopYAxis) - Me.GroupBox3.Controls.Add(Me.Label7) - Me.GroupBox3.Controls.Add(Me.ucrNudLineHeightTopYAxis) - Me.GroupBox3.Controls.Add(Me.Label8) - Me.GroupBox3.Controls.Add(Me.ucrNudAngleTopYAxis) - Me.GroupBox3.Controls.Add(Me.Label9) - Me.GroupBox3.Controls.Add(Me.ucrNudHjustTopYAxis) - Me.GroupBox3.Controls.Add(Me.Label10) - Me.GroupBox3.Controls.Add(Me.ucrNudSizeTopYAxis) - Me.GroupBox3.Controls.Add(Me.Label11) - Me.GroupBox3.Controls.Add(Me.UcrInputComboBox4) - Me.GroupBox3.Controls.Add(Me.Label12) - Me.GroupBox3.Controls.Add(Me.UcrInputComboBox5) - Me.GroupBox3.Controls.Add(Me.Label13) - Me.GroupBox3.Controls.Add(Me.UcrInputComboBox6) - Me.GroupBox3.Location = New System.Drawing.Point(251, 5) - Me.GroupBox3.Name = "GroupBox3" - Me.GroupBox3.Size = New System.Drawing.Size(230, 245) - Me.GroupBox3.TabIndex = 44 - Me.GroupBox3.TabStop = False - Me.GroupBox3.Text = "Y axis label on top axis" - ' - 'Label6 - ' - Me.Label6.AutoSize = True - Me.Label6.Location = New System.Drawing.Point(13, 77) - Me.Label6.Name = "Label6" - Me.Label6.Size = New System.Drawing.Size(33, 13) - Me.Label6.TabIndex = 37 - Me.Label6.Text = "Vjust:" + 'lblColourTickLabelYAxis + ' + Me.lblColourTickLabelYAxis.AutoSize = True + Me.lblColourTickLabelYAxis.Location = New System.Drawing.Point(12, 76) + Me.lblColourTickLabelYAxis.Name = "lblColourTickLabelYAxis" + Me.lblColourTickLabelYAxis.Size = New System.Drawing.Size(40, 13) + Me.lblColourTickLabelYAxis.TabIndex = 27 + Me.lblColourTickLabelYAxis.Text = "Colour:" + ' + 'ucrInputColourTickLabelsYAxis + ' + Me.ucrInputColourTickLabelsYAxis.AddQuotesIfUnrecognised = True + Me.ucrInputColourTickLabelsYAxis.IsReadOnly = False + Me.ucrInputColourTickLabelsYAxis.Location = New System.Drawing.Point(72, 68) + Me.ucrInputColourTickLabelsYAxis.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) + Me.ucrInputColourTickLabelsYAxis.Name = "ucrInputColourTickLabelsYAxis" + Me.ucrInputColourTickLabelsYAxis.Size = New System.Drawing.Size(137, 21) + Me.ucrInputColourTickLabelsYAxis.TabIndex = 28 + ' + 'lblLineHeightTickLabelsYAxis + ' + Me.lblLineHeightTickLabelsYAxis.AutoSize = True + Me.lblLineHeightTickLabelsYAxis.Location = New System.Drawing.Point(12, 47) + Me.lblLineHeightTickLabelsYAxis.Name = "lblLineHeightTickLabelsYAxis" + Me.lblLineHeightTickLabelsYAxis.Size = New System.Drawing.Size(57, 13) + Me.lblLineHeightTickLabelsYAxis.TabIndex = 25 + Me.lblLineHeightTickLabelsYAxis.Text = "Line Type:" + ' + 'ucrInputLineTypeTopYAxis + ' + Me.ucrInputLineTypeTopYAxis.AddQuotesIfUnrecognised = True + Me.ucrInputLineTypeTopYAxis.IsReadOnly = False + Me.ucrInputLineTypeTopYAxis.Location = New System.Drawing.Point(72, 40) + Me.ucrInputLineTypeTopYAxis.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) + Me.ucrInputLineTypeTopYAxis.Name = "ucrInputLineTypeTopYAxis" + Me.ucrInputLineTypeTopYAxis.Size = New System.Drawing.Size(137, 21) + Me.ucrInputLineTypeTopYAxis.TabIndex = 26 + ' + 'grpYAxisTopLabels + ' + Me.grpYAxisTopLabels.Controls.Add(Me.lblVjustTopYAxis) + Me.grpYAxisTopLabels.Controls.Add(Me.ucrNudVjustTopYAxis) + Me.grpYAxisTopLabels.Controls.Add(Me.lblLineHeightTopYAxis) + Me.grpYAxisTopLabels.Controls.Add(Me.ucrNudLineHeightTopYAxis) + Me.grpYAxisTopLabels.Controls.Add(Me.lblAngleTopYAxis) + Me.grpYAxisTopLabels.Controls.Add(Me.ucrNudAngleTopYAxis) + Me.grpYAxisTopLabels.Controls.Add(Me.lblHjustTopYAxis) + Me.grpYAxisTopLabels.Controls.Add(Me.ucrNudHjustTopYAxis) + Me.grpYAxisTopLabels.Controls.Add(Me.lblSizeTopYAxis) + Me.grpYAxisTopLabels.Controls.Add(Me.ucrNudSizeTopYAxis) + Me.grpYAxisTopLabels.Controls.Add(Me.lblColourTopYAxis) + Me.grpYAxisTopLabels.Controls.Add(Me.ucrInputColourTopYAxis) + Me.grpYAxisTopLabels.Controls.Add(Me.lblFaceTopYAxis) + Me.grpYAxisTopLabels.Controls.Add(Me.ucrInputFaceTopYAxis) + Me.grpYAxisTopLabels.Controls.Add(Me.lblFamilyTopYaxis) + Me.grpYAxisTopLabels.Controls.Add(Me.ucrInputFamilyTopYAxis) + Me.grpYAxisTopLabels.Location = New System.Drawing.Point(251, 5) + Me.grpYAxisTopLabels.Name = "grpYAxisTopLabels" + Me.grpYAxisTopLabels.Size = New System.Drawing.Size(230, 245) + Me.grpYAxisTopLabels.TabIndex = 44 + Me.grpYAxisTopLabels.TabStop = False + Me.grpYAxisTopLabels.Text = "Y axis label on top axis" + ' + 'lblVjustTopYAxis + ' + Me.lblVjustTopYAxis.AutoSize = True + Me.lblVjustTopYAxis.Location = New System.Drawing.Point(13, 77) + Me.lblVjustTopYAxis.Name = "lblVjustTopYAxis" + Me.lblVjustTopYAxis.Size = New System.Drawing.Size(33, 13) + Me.lblVjustTopYAxis.TabIndex = 37 + Me.lblVjustTopYAxis.Text = "Vjust:" ' 'ucrNudVjustTopYAxis ' @@ -898,14 +898,14 @@ Partial Class sdgThemes Me.ucrNudVjustTopYAxis.TabIndex = 38 Me.ucrNudVjustTopYAxis.Value = New Decimal(New Integer() {0, 0, 0, 0}) ' - 'Label7 + 'lblLineHeightTopYAxis ' - Me.Label7.AutoSize = True - Me.Label7.Location = New System.Drawing.Point(13, 105) - Me.Label7.Name = "Label7" - Me.Label7.Size = New System.Drawing.Size(64, 13) - Me.Label7.TabIndex = 35 - Me.Label7.Text = "Line Height:" + Me.lblLineHeightTopYAxis.AutoSize = True + Me.lblLineHeightTopYAxis.Location = New System.Drawing.Point(13, 105) + Me.lblLineHeightTopYAxis.Name = "lblLineHeightTopYAxis" + Me.lblLineHeightTopYAxis.Size = New System.Drawing.Size(64, 13) + Me.lblLineHeightTopYAxis.TabIndex = 35 + Me.lblLineHeightTopYAxis.Text = "Line Height:" ' 'ucrNudLineHeightTopYAxis ' @@ -919,14 +919,14 @@ Partial Class sdgThemes Me.ucrNudLineHeightTopYAxis.TabIndex = 36 Me.ucrNudLineHeightTopYAxis.Value = New Decimal(New Integer() {0, 0, 0, 0}) ' - 'Label8 + 'lblAngleTopYAxis ' - Me.Label8.AutoSize = True - Me.Label8.Location = New System.Drawing.Point(13, 133) - Me.Label8.Name = "Label8" - Me.Label8.Size = New System.Drawing.Size(37, 13) - Me.Label8.TabIndex = 33 - Me.Label8.Text = "Angle:" + Me.lblAngleTopYAxis.AutoSize = True + Me.lblAngleTopYAxis.Location = New System.Drawing.Point(13, 133) + Me.lblAngleTopYAxis.Name = "lblAngleTopYAxis" + Me.lblAngleTopYAxis.Size = New System.Drawing.Size(37, 13) + Me.lblAngleTopYAxis.TabIndex = 33 + Me.lblAngleTopYAxis.Text = "Angle:" ' 'ucrNudAngleTopYAxis ' @@ -940,14 +940,14 @@ Partial Class sdgThemes Me.ucrNudAngleTopYAxis.TabIndex = 34 Me.ucrNudAngleTopYAxis.Value = New Decimal(New Integer() {0, 0, 0, 0}) ' - 'Label9 + 'lblHjustTopYAxis ' - Me.Label9.AutoSize = True - Me.Label9.Location = New System.Drawing.Point(13, 49) - Me.Label9.Name = "Label9" - Me.Label9.Size = New System.Drawing.Size(34, 13) - Me.Label9.TabIndex = 31 - Me.Label9.Text = "Hjust:" + Me.lblHjustTopYAxis.AutoSize = True + Me.lblHjustTopYAxis.Location = New System.Drawing.Point(13, 49) + Me.lblHjustTopYAxis.Name = "lblHjustTopYAxis" + Me.lblHjustTopYAxis.Size = New System.Drawing.Size(34, 13) + Me.lblHjustTopYAxis.TabIndex = 31 + Me.lblHjustTopYAxis.Text = "Hjust:" ' 'ucrNudHjustTopYAxis ' @@ -961,14 +961,14 @@ Partial Class sdgThemes Me.ucrNudHjustTopYAxis.TabIndex = 32 Me.ucrNudHjustTopYAxis.Value = New Decimal(New Integer() {0, 0, 0, 0}) ' - 'Label10 + 'lblSizeTopYAxis ' - Me.Label10.AutoSize = True - Me.Label10.Location = New System.Drawing.Point(13, 21) - Me.Label10.Name = "Label10" - Me.Label10.Size = New System.Drawing.Size(30, 13) - Me.Label10.TabIndex = 29 - Me.Label10.Text = "Size:" + Me.lblSizeTopYAxis.AutoSize = True + Me.lblSizeTopYAxis.Location = New System.Drawing.Point(13, 21) + Me.lblSizeTopYAxis.Name = "lblSizeTopYAxis" + Me.lblSizeTopYAxis.Size = New System.Drawing.Size(30, 13) + Me.lblSizeTopYAxis.TabIndex = 29 + Me.lblSizeTopYAxis.Text = "Size:" ' 'ucrNudSizeTopYAxis ' @@ -982,107 +982,107 @@ Partial Class sdgThemes Me.ucrNudSizeTopYAxis.TabIndex = 30 Me.ucrNudSizeTopYAxis.Value = New Decimal(New Integer() {0, 0, 0, 0}) ' - 'Label11 - ' - Me.Label11.AutoSize = True - Me.Label11.Location = New System.Drawing.Point(13, 220) - Me.Label11.Name = "Label11" - Me.Label11.Size = New System.Drawing.Size(40, 13) - Me.Label11.TabIndex = 27 - Me.Label11.Text = "Colour:" - ' - 'UcrInputComboBox4 - ' - Me.UcrInputComboBox4.AddQuotesIfUnrecognised = True - Me.UcrInputComboBox4.IsReadOnly = False - Me.UcrInputComboBox4.Location = New System.Drawing.Point(73, 217) - Me.UcrInputComboBox4.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) - Me.UcrInputComboBox4.Name = "UcrInputComboBox4" - Me.UcrInputComboBox4.Size = New System.Drawing.Size(137, 21) - Me.UcrInputComboBox4.TabIndex = 28 - ' - 'Label12 - ' - Me.Label12.AutoSize = True - Me.Label12.Location = New System.Drawing.Point(13, 196) - Me.Label12.Name = "Label12" - Me.Label12.Size = New System.Drawing.Size(34, 13) - Me.Label12.TabIndex = 25 - Me.Label12.Text = "Face:" - ' - 'UcrInputComboBox5 - ' - Me.UcrInputComboBox5.AddQuotesIfUnrecognised = True - Me.UcrInputComboBox5.IsReadOnly = False - Me.UcrInputComboBox5.Location = New System.Drawing.Point(73, 189) - Me.UcrInputComboBox5.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) - Me.UcrInputComboBox5.Name = "UcrInputComboBox5" - Me.UcrInputComboBox5.Size = New System.Drawing.Size(137, 21) - Me.UcrInputComboBox5.TabIndex = 26 - ' - 'Label13 - ' - Me.Label13.AutoSize = True - Me.Label13.Location = New System.Drawing.Point(13, 166) - Me.Label13.Name = "Label13" - Me.Label13.Size = New System.Drawing.Size(39, 13) - Me.Label13.TabIndex = 23 - Me.Label13.Text = "Family:" - ' - 'UcrInputComboBox6 - ' - Me.UcrInputComboBox6.AddQuotesIfUnrecognised = True - Me.UcrInputComboBox6.IsReadOnly = False - Me.UcrInputComboBox6.Location = New System.Drawing.Point(73, 162) - Me.UcrInputComboBox6.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) - Me.UcrInputComboBox6.Name = "UcrInputComboBox6" - Me.UcrInputComboBox6.Size = New System.Drawing.Size(137, 21) - Me.UcrInputComboBox6.TabIndex = 24 - ' - 'GroupBox4 - ' - Me.GroupBox4.Controls.Add(Me.Label14) - Me.GroupBox4.Controls.Add(Me.UcrInputComboBox7) - Me.GroupBox4.Controls.Add(Me.Label15) - Me.GroupBox4.Controls.Add(Me.ucrNudSizeTickMarksYAxis) - Me.GroupBox4.Controls.Add(Me.Label16) - Me.GroupBox4.Controls.Add(Me.UcrInputComboBox8) - Me.GroupBox4.Controls.Add(Me.Label17) - Me.GroupBox4.Controls.Add(Me.UcrInputComboBox9) - Me.GroupBox4.Location = New System.Drawing.Point(6, 256) - Me.GroupBox4.Name = "GroupBox4" - Me.GroupBox4.Size = New System.Drawing.Size(230, 154) - Me.GroupBox4.TabIndex = 42 - Me.GroupBox4.TabStop = False - Me.GroupBox4.Text = "Tick marks along axes" - ' - 'Label14 - ' - Me.Label14.AutoSize = True - Me.Label14.Location = New System.Drawing.Point(12, 108) - Me.Label14.Name = "Label14" - Me.Label14.Size = New System.Drawing.Size(52, 13) - Me.Label14.TabIndex = 31 - Me.Label14.Text = "Line End:" - ' - 'UcrInputComboBox7 - ' - Me.UcrInputComboBox7.AddQuotesIfUnrecognised = True - Me.UcrInputComboBox7.IsReadOnly = False - Me.UcrInputComboBox7.Location = New System.Drawing.Point(72, 100) - Me.UcrInputComboBox7.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) - Me.UcrInputComboBox7.Name = "UcrInputComboBox7" - Me.UcrInputComboBox7.Size = New System.Drawing.Size(137, 21) - Me.UcrInputComboBox7.TabIndex = 32 - ' - 'Label15 - ' - Me.Label15.AutoSize = True - Me.Label15.Location = New System.Drawing.Point(13, 22) - Me.Label15.Name = "Label15" - Me.Label15.Size = New System.Drawing.Size(30, 13) - Me.Label15.TabIndex = 29 - Me.Label15.Text = "Size:" + 'lblColourTopYAxis + ' + Me.lblColourTopYAxis.AutoSize = True + Me.lblColourTopYAxis.Location = New System.Drawing.Point(13, 220) + Me.lblColourTopYAxis.Name = "lblColourTopYAxis" + Me.lblColourTopYAxis.Size = New System.Drawing.Size(40, 13) + Me.lblColourTopYAxis.TabIndex = 27 + Me.lblColourTopYAxis.Text = "Colour:" + ' + 'ucrInputColourTopYAxis + ' + Me.ucrInputColourTopYAxis.AddQuotesIfUnrecognised = True + Me.ucrInputColourTopYAxis.IsReadOnly = False + Me.ucrInputColourTopYAxis.Location = New System.Drawing.Point(73, 217) + Me.ucrInputColourTopYAxis.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) + Me.ucrInputColourTopYAxis.Name = "ucrInputColourTopYAxis" + Me.ucrInputColourTopYAxis.Size = New System.Drawing.Size(137, 21) + Me.ucrInputColourTopYAxis.TabIndex = 28 + ' + 'lblFaceTopYAxis + ' + Me.lblFaceTopYAxis.AutoSize = True + Me.lblFaceTopYAxis.Location = New System.Drawing.Point(13, 196) + Me.lblFaceTopYAxis.Name = "lblFaceTopYAxis" + Me.lblFaceTopYAxis.Size = New System.Drawing.Size(34, 13) + Me.lblFaceTopYAxis.TabIndex = 25 + Me.lblFaceTopYAxis.Text = "Face:" + ' + 'ucrInputFaceTopYAxis + ' + Me.ucrInputFaceTopYAxis.AddQuotesIfUnrecognised = True + Me.ucrInputFaceTopYAxis.IsReadOnly = False + Me.ucrInputFaceTopYAxis.Location = New System.Drawing.Point(73, 189) + Me.ucrInputFaceTopYAxis.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) + Me.ucrInputFaceTopYAxis.Name = "ucrInputFaceTopYAxis" + Me.ucrInputFaceTopYAxis.Size = New System.Drawing.Size(137, 21) + Me.ucrInputFaceTopYAxis.TabIndex = 26 + ' + 'lblFamilyTopYaxis + ' + Me.lblFamilyTopYaxis.AutoSize = True + Me.lblFamilyTopYaxis.Location = New System.Drawing.Point(13, 166) + Me.lblFamilyTopYaxis.Name = "lblFamilyTopYaxis" + Me.lblFamilyTopYaxis.Size = New System.Drawing.Size(39, 13) + Me.lblFamilyTopYaxis.TabIndex = 23 + Me.lblFamilyTopYaxis.Text = "Family:" + ' + 'ucrInputFamilyTopYAxis + ' + Me.ucrInputFamilyTopYAxis.AddQuotesIfUnrecognised = True + Me.ucrInputFamilyTopYAxis.IsReadOnly = False + Me.ucrInputFamilyTopYAxis.Location = New System.Drawing.Point(73, 162) + Me.ucrInputFamilyTopYAxis.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) + Me.ucrInputFamilyTopYAxis.Name = "ucrInputFamilyTopYAxis" + Me.ucrInputFamilyTopYAxis.Size = New System.Drawing.Size(137, 21) + Me.ucrInputFamilyTopYAxis.TabIndex = 24 + ' + 'grpTickMarksYAxis + ' + Me.grpTickMarksYAxis.Controls.Add(Me.lblLineEndTickMarksYAxis) + Me.grpTickMarksYAxis.Controls.Add(Me.ucrInputLineEndTickMarksYAxis) + Me.grpTickMarksYAxis.Controls.Add(Me.lblSizeTickMarksYAxis) + Me.grpTickMarksYAxis.Controls.Add(Me.ucrNudSizeTickMarksYAxis) + Me.grpTickMarksYAxis.Controls.Add(Me.lblColourTickMarksYAxis) + Me.grpTickMarksYAxis.Controls.Add(Me.ucrInputColourTickMarksYAxis) + Me.grpTickMarksYAxis.Controls.Add(Me.lblLineHeightTickMarksYAxis) + Me.grpTickMarksYAxis.Controls.Add(Me.ucrInputLineTypeYAxis) + Me.grpTickMarksYAxis.Location = New System.Drawing.Point(6, 256) + Me.grpTickMarksYAxis.Name = "grpTickMarksYAxis" + Me.grpTickMarksYAxis.Size = New System.Drawing.Size(230, 154) + Me.grpTickMarksYAxis.TabIndex = 42 + Me.grpTickMarksYAxis.TabStop = False + Me.grpTickMarksYAxis.Text = "Tick marks along axes" + ' + 'lblLineEndTickMarksYAxis + ' + Me.lblLineEndTickMarksYAxis.AutoSize = True + Me.lblLineEndTickMarksYAxis.Location = New System.Drawing.Point(12, 108) + Me.lblLineEndTickMarksYAxis.Name = "lblLineEndTickMarksYAxis" + Me.lblLineEndTickMarksYAxis.Size = New System.Drawing.Size(52, 13) + Me.lblLineEndTickMarksYAxis.TabIndex = 31 + Me.lblLineEndTickMarksYAxis.Text = "Line End:" + ' + 'ucrInputLineEndTickMarksYAxis + ' + Me.ucrInputLineEndTickMarksYAxis.AddQuotesIfUnrecognised = True + Me.ucrInputLineEndTickMarksYAxis.IsReadOnly = False + Me.ucrInputLineEndTickMarksYAxis.Location = New System.Drawing.Point(72, 100) + Me.ucrInputLineEndTickMarksYAxis.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) + Me.ucrInputLineEndTickMarksYAxis.Name = "ucrInputLineEndTickMarksYAxis" + Me.ucrInputLineEndTickMarksYAxis.Size = New System.Drawing.Size(137, 21) + Me.ucrInputLineEndTickMarksYAxis.TabIndex = 32 + ' + 'lblSizeTickMarksYAxis + ' + Me.lblSizeTickMarksYAxis.AutoSize = True + Me.lblSizeTickMarksYAxis.Location = New System.Drawing.Point(13, 22) + Me.lblSizeTickMarksYAxis.Name = "lblSizeTickMarksYAxis" + Me.lblSizeTickMarksYAxis.Size = New System.Drawing.Size(30, 13) + Me.lblSizeTickMarksYAxis.TabIndex = 29 + Me.lblSizeTickMarksYAxis.Text = "Size:" ' 'ucrNudSizeTickMarksYAxis ' @@ -1096,68 +1096,68 @@ Partial Class sdgThemes Me.ucrNudSizeTickMarksYAxis.TabIndex = 30 Me.ucrNudSizeTickMarksYAxis.Value = New Decimal(New Integer() {0, 0, 0, 0}) ' - 'Label16 - ' - Me.Label16.AutoSize = True - Me.Label16.Location = New System.Drawing.Point(12, 76) - Me.Label16.Name = "Label16" - Me.Label16.Size = New System.Drawing.Size(40, 13) - Me.Label16.TabIndex = 27 - Me.Label16.Text = "Colour:" - ' - 'UcrInputComboBox8 - ' - Me.UcrInputComboBox8.AddQuotesIfUnrecognised = True - Me.UcrInputComboBox8.IsReadOnly = False - Me.UcrInputComboBox8.Location = New System.Drawing.Point(72, 68) - Me.UcrInputComboBox8.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) - Me.UcrInputComboBox8.Name = "UcrInputComboBox8" - Me.UcrInputComboBox8.Size = New System.Drawing.Size(137, 21) - Me.UcrInputComboBox8.TabIndex = 28 - ' - 'Label17 - ' - Me.Label17.AutoSize = True - Me.Label17.Location = New System.Drawing.Point(12, 47) - Me.Label17.Name = "Label17" - Me.Label17.Size = New System.Drawing.Size(57, 13) - Me.Label17.TabIndex = 25 - Me.Label17.Text = "Line Type:" - ' - 'UcrInputComboBox9 - ' - Me.UcrInputComboBox9.AddQuotesIfUnrecognised = True - Me.UcrInputComboBox9.IsReadOnly = False - Me.UcrInputComboBox9.Location = New System.Drawing.Point(72, 40) - Me.UcrInputComboBox9.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) - Me.UcrInputComboBox9.Name = "UcrInputComboBox9" - Me.UcrInputComboBox9.Size = New System.Drawing.Size(137, 21) - Me.UcrInputComboBox9.TabIndex = 26 - ' - 'GroupBox5 - ' - Me.GroupBox5.Controls.Add(Me.lblVjustYAxis) - Me.GroupBox5.Controls.Add(Me.ucrNudVjustYAxis) - Me.GroupBox5.Controls.Add(Me.lblLineHeightYAxis) - Me.GroupBox5.Controls.Add(Me.ucrNudLineHeightYAxis) - Me.GroupBox5.Controls.Add(Me.Label20) - Me.GroupBox5.Controls.Add(Me.ucrNudLAngle) - Me.GroupBox5.Controls.Add(Me.lblHjustYAxis) - Me.GroupBox5.Controls.Add(Me.ucrNudHjustYAxis) - Me.GroupBox5.Controls.Add(Me.lblSizeYAxis) - Me.GroupBox5.Controls.Add(Me.ucrNudSizeYAxis) - Me.GroupBox5.Controls.Add(Me.lblColourYAxis) - Me.GroupBox5.Controls.Add(Me.UcrInputComboBox10) - Me.GroupBox5.Controls.Add(Me.lblFaceYAxis) - Me.GroupBox5.Controls.Add(Me.UcrInputComboBox11) - Me.GroupBox5.Controls.Add(Me.lblFamilyYAxis) - Me.GroupBox5.Controls.Add(Me.crInputComboBox12) - Me.GroupBox5.Location = New System.Drawing.Point(6, 5) - Me.GroupBox5.Name = "GroupBox5" - Me.GroupBox5.Size = New System.Drawing.Size(230, 245) - Me.GroupBox5.TabIndex = 41 - Me.GroupBox5.TabStop = False - Me.GroupBox5.Text = "Y axis label" + 'lblColourTickMarksYAxis + ' + Me.lblColourTickMarksYAxis.AutoSize = True + Me.lblColourTickMarksYAxis.Location = New System.Drawing.Point(12, 76) + Me.lblColourTickMarksYAxis.Name = "lblColourTickMarksYAxis" + Me.lblColourTickMarksYAxis.Size = New System.Drawing.Size(40, 13) + Me.lblColourTickMarksYAxis.TabIndex = 27 + Me.lblColourTickMarksYAxis.Text = "Colour:" + ' + 'ucrInputColourTickMarksYAxis + ' + Me.ucrInputColourTickMarksYAxis.AddQuotesIfUnrecognised = True + Me.ucrInputColourTickMarksYAxis.IsReadOnly = False + Me.ucrInputColourTickMarksYAxis.Location = New System.Drawing.Point(72, 68) + Me.ucrInputColourTickMarksYAxis.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) + Me.ucrInputColourTickMarksYAxis.Name = "ucrInputColourTickMarksYAxis" + Me.ucrInputColourTickMarksYAxis.Size = New System.Drawing.Size(137, 21) + Me.ucrInputColourTickMarksYAxis.TabIndex = 28 + ' + 'lblLineHeightTickMarksYAxis + ' + Me.lblLineHeightTickMarksYAxis.AutoSize = True + Me.lblLineHeightTickMarksYAxis.Location = New System.Drawing.Point(12, 47) + Me.lblLineHeightTickMarksYAxis.Name = "lblLineHeightTickMarksYAxis" + Me.lblLineHeightTickMarksYAxis.Size = New System.Drawing.Size(57, 13) + Me.lblLineHeightTickMarksYAxis.TabIndex = 25 + Me.lblLineHeightTickMarksYAxis.Text = "Line Type:" + ' + 'ucrInputLineTypeYAxis + ' + Me.ucrInputLineTypeYAxis.AddQuotesIfUnrecognised = True + Me.ucrInputLineTypeYAxis.IsReadOnly = False + Me.ucrInputLineTypeYAxis.Location = New System.Drawing.Point(72, 40) + Me.ucrInputLineTypeYAxis.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) + Me.ucrInputLineTypeYAxis.Name = "ucrInputLineTypeYAxis" + Me.ucrInputLineTypeYAxis.Size = New System.Drawing.Size(137, 21) + Me.ucrInputLineTypeYAxis.TabIndex = 26 + ' + 'grpYAxisLabels + ' + Me.grpYAxisLabels.Controls.Add(Me.lblVjustYAxis) + Me.grpYAxisLabels.Controls.Add(Me.ucrNudVjustYAxis) + Me.grpYAxisLabels.Controls.Add(Me.lblLineHeightYAxis) + Me.grpYAxisLabels.Controls.Add(Me.ucrNudLineHeightYAxis) + Me.grpYAxisLabels.Controls.Add(Me.lblAngleYAxis) + Me.grpYAxisLabels.Controls.Add(Me.ucrNudLAngleYAxis) + Me.grpYAxisLabels.Controls.Add(Me.lblHjustYAxis) + Me.grpYAxisLabels.Controls.Add(Me.ucrNudHjustYAxis) + Me.grpYAxisLabels.Controls.Add(Me.lblSizeYAxis) + Me.grpYAxisLabels.Controls.Add(Me.ucrNudSizeYAxis) + Me.grpYAxisLabels.Controls.Add(Me.lblColourYAxis) + Me.grpYAxisLabels.Controls.Add(Me.ucrInputColourYAxis) + Me.grpYAxisLabels.Controls.Add(Me.lblFaceYAxis) + Me.grpYAxisLabels.Controls.Add(Me.ucrInputFaceYAxis) + Me.grpYAxisLabels.Controls.Add(Me.lblFamilyYAxis) + Me.grpYAxisLabels.Controls.Add(Me.ucrInputFamilyYAxis) + Me.grpYAxisLabels.Location = New System.Drawing.Point(6, 5) + Me.grpYAxisLabels.Name = "grpYAxisLabels" + Me.grpYAxisLabels.Size = New System.Drawing.Size(230, 245) + Me.grpYAxisLabels.TabIndex = 41 + Me.grpYAxisLabels.TabStop = False + Me.grpYAxisLabels.Text = "Y axis label" ' 'lblVjustYAxis ' @@ -1201,26 +1201,26 @@ Partial Class sdgThemes Me.ucrNudLineHeightYAxis.TabIndex = 36 Me.ucrNudLineHeightYAxis.Value = New Decimal(New Integer() {0, 0, 0, 0}) ' - 'Label20 + 'lblAngleYAxis ' - Me.Label20.AutoSize = True - Me.Label20.Location = New System.Drawing.Point(13, 137) - Me.Label20.Name = "Label20" - Me.Label20.Size = New System.Drawing.Size(37, 13) - Me.Label20.TabIndex = 33 - Me.Label20.Text = "Angle:" + Me.lblAngleYAxis.AutoSize = True + Me.lblAngleYAxis.Location = New System.Drawing.Point(13, 137) + Me.lblAngleYAxis.Name = "lblAngleYAxis" + Me.lblAngleYAxis.Size = New System.Drawing.Size(37, 13) + Me.lblAngleYAxis.TabIndex = 33 + Me.lblAngleYAxis.Text = "Angle:" ' - 'ucrNudLAngle + 'ucrNudLAngleYAxis ' - Me.ucrNudLAngle.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) - Me.ucrNudLAngle.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudLAngle.Location = New System.Drawing.Point(94, 136) - Me.ucrNudLAngle.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) - Me.ucrNudLAngle.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) - Me.ucrNudLAngle.Name = "ucrNudLAngle" - Me.ucrNudLAngle.Size = New System.Drawing.Size(50, 20) - Me.ucrNudLAngle.TabIndex = 34 - Me.ucrNudLAngle.Value = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudLAngleYAxis.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudLAngleYAxis.Increment = New Decimal(New Integer() {1, 0, 0, 0}) + Me.ucrNudLAngleYAxis.Location = New System.Drawing.Point(94, 136) + Me.ucrNudLAngleYAxis.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) + Me.ucrNudLAngleYAxis.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudLAngleYAxis.Name = "ucrNudLAngleYAxis" + Me.ucrNudLAngleYAxis.Size = New System.Drawing.Size(50, 20) + Me.ucrNudLAngleYAxis.TabIndex = 34 + Me.ucrNudLAngleYAxis.Value = New Decimal(New Integer() {0, 0, 0, 0}) ' 'lblHjustYAxis ' @@ -1273,15 +1273,15 @@ Partial Class sdgThemes Me.lblColourYAxis.TabIndex = 27 Me.lblColourYAxis.Text = "Colour:" ' - 'UcrInputComboBox10 + 'ucrInputColourYAxis ' - Me.UcrInputComboBox10.AddQuotesIfUnrecognised = True - Me.UcrInputComboBox10.IsReadOnly = False - Me.UcrInputComboBox10.Location = New System.Drawing.Point(73, 217) - Me.UcrInputComboBox10.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) - Me.UcrInputComboBox10.Name = "UcrInputComboBox10" - Me.UcrInputComboBox10.Size = New System.Drawing.Size(137, 21) - Me.UcrInputComboBox10.TabIndex = 28 + Me.ucrInputColourYAxis.AddQuotesIfUnrecognised = True + Me.ucrInputColourYAxis.IsReadOnly = False + Me.ucrInputColourYAxis.Location = New System.Drawing.Point(73, 217) + Me.ucrInputColourYAxis.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) + Me.ucrInputColourYAxis.Name = "ucrInputColourYAxis" + Me.ucrInputColourYAxis.Size = New System.Drawing.Size(137, 21) + Me.ucrInputColourYAxis.TabIndex = 28 ' 'lblFaceYAxis ' @@ -1292,15 +1292,15 @@ Partial Class sdgThemes Me.lblFaceYAxis.TabIndex = 25 Me.lblFaceYAxis.Text = "Face:" ' - 'UcrInputComboBox11 + 'ucrInputFaceYAxis ' - Me.UcrInputComboBox11.AddQuotesIfUnrecognised = True - Me.UcrInputComboBox11.IsReadOnly = False - Me.UcrInputComboBox11.Location = New System.Drawing.Point(73, 189) - Me.UcrInputComboBox11.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) - Me.UcrInputComboBox11.Name = "UcrInputComboBox11" - Me.UcrInputComboBox11.Size = New System.Drawing.Size(137, 21) - Me.UcrInputComboBox11.TabIndex = 26 + Me.ucrInputFaceYAxis.AddQuotesIfUnrecognised = True + Me.ucrInputFaceYAxis.IsReadOnly = False + Me.ucrInputFaceYAxis.Location = New System.Drawing.Point(73, 189) + Me.ucrInputFaceYAxis.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) + Me.ucrInputFaceYAxis.Name = "ucrInputFaceYAxis" + Me.ucrInputFaceYAxis.Size = New System.Drawing.Size(137, 21) + Me.ucrInputFaceYAxis.TabIndex = 26 ' 'lblFamilyYAxis ' @@ -1311,15 +1311,15 @@ Partial Class sdgThemes Me.lblFamilyYAxis.TabIndex = 23 Me.lblFamilyYAxis.Text = "Family:" ' - 'crInputComboBox12 + 'ucrInputFamilyYAxis ' - Me.crInputComboBox12.AddQuotesIfUnrecognised = True - Me.crInputComboBox12.IsReadOnly = False - Me.crInputComboBox12.Location = New System.Drawing.Point(73, 162) - Me.crInputComboBox12.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) - Me.crInputComboBox12.Name = "crInputComboBox12" - Me.crInputComboBox12.Size = New System.Drawing.Size(137, 21) - Me.crInputComboBox12.TabIndex = 24 + Me.ucrInputFamilyYAxis.AddQuotesIfUnrecognised = True + Me.ucrInputFamilyYAxis.IsReadOnly = False + Me.ucrInputFamilyYAxis.Location = New System.Drawing.Point(73, 162) + Me.ucrInputFamilyYAxis.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) + Me.ucrInputFamilyYAxis.Name = "ucrInputFamilyYAxis" + Me.ucrInputFamilyYAxis.Size = New System.Drawing.Size(137, 21) + Me.ucrInputFamilyYAxis.TabIndex = 24 ' 'ucrBaseSubdialogue ' @@ -1353,14 +1353,14 @@ Partial Class sdgThemes Me.grpAxisLabel.ResumeLayout(False) Me.grpAxisLabel.PerformLayout() Me.tbYaxis.ResumeLayout(False) - Me.GroupBox2.ResumeLayout(False) - Me.GroupBox2.PerformLayout() - Me.GroupBox3.ResumeLayout(False) - Me.GroupBox3.PerformLayout() - Me.GroupBox4.ResumeLayout(False) - Me.GroupBox4.PerformLayout() - Me.GroupBox5.ResumeLayout(False) - Me.GroupBox5.PerformLayout() + Me.grpTickLabelYAxis.ResumeLayout(False) + Me.grpTickLabelYAxis.PerformLayout() + Me.grpYAxisTopLabels.ResumeLayout(False) + Me.grpYAxisTopLabels.PerformLayout() + Me.grpTickMarksYAxis.ResumeLayout(False) + Me.grpTickMarksYAxis.PerformLayout() + Me.grpYAxisLabels.ResumeLayout(False) + Me.grpYAxisLabels.PerformLayout() Me.ResumeLayout(False) End Sub @@ -1422,56 +1422,56 @@ Partial Class sdgThemes Friend WithEvents ucrInputColourXTickMarks As ucrInputComboBox Friend WithEvents lbllineTypeXTickMarks As Label Friend WithEvents ucrInputLineTypeXTickMarks As ucrInputComboBox - Friend WithEvents GroupBox2 As GroupBox - Friend WithEvents Label1 As Label - Friend WithEvents UcrInputComboBox1 As ucrInputComboBox - Friend WithEvents Label3 As Label + Friend WithEvents grpTickLabelYAxis As GroupBox + Friend WithEvents LlblLinEndTickLabelYAxis As Label + Friend WithEvents ucrInputLineEndTickLabelsYAxis As ucrInputComboBox + Friend WithEvents lblSizeTickLabelYAxis As Label Friend WithEvents ucrNudSizeTickLabelsYAxis As ucrNud - Friend WithEvents Label4 As Label - Friend WithEvents UcrInputComboBox2 As ucrInputComboBox - Friend WithEvents Label5 As Label - Friend WithEvents UcrInputComboBox3 As ucrInputComboBox - Friend WithEvents GroupBox3 As GroupBox - Friend WithEvents Label6 As Label + Friend WithEvents lblColourTickLabelYAxis As Label + Friend WithEvents ucrInputColourTickLabelsYAxis As ucrInputComboBox + Friend WithEvents lblLineHeightTickLabelsYAxis As Label + Friend WithEvents ucrInputLineTypeTopYAxis As ucrInputComboBox + Friend WithEvents grpYAxisTopLabels As GroupBox + Friend WithEvents lblVjustTopYAxis As Label Friend WithEvents ucrNudVjustTopYAxis As ucrNud - Friend WithEvents Label7 As Label + Friend WithEvents lblLineHeightTopYAxis As Label Friend WithEvents ucrNudLineHeightTopYAxis As ucrNud - Friend WithEvents Label8 As Label + Friend WithEvents lblAngleTopYAxis As Label Friend WithEvents ucrNudAngleTopYAxis As ucrNud - Friend WithEvents Label9 As Label + Friend WithEvents lblHjustTopYAxis As Label Friend WithEvents ucrNudHjustTopYAxis As ucrNud - Friend WithEvents Label10 As Label + Friend WithEvents lblSizeTopYAxis As Label Friend WithEvents ucrNudSizeTopYAxis As ucrNud - Friend WithEvents Label11 As Label - Friend WithEvents UcrInputComboBox4 As ucrInputComboBox - Friend WithEvents Label12 As Label - Friend WithEvents UcrInputComboBox5 As ucrInputComboBox - Friend WithEvents Label13 As Label - Friend WithEvents UcrInputComboBox6 As ucrInputComboBox - Friend WithEvents GroupBox4 As GroupBox - Friend WithEvents Label14 As Label - Friend WithEvents UcrInputComboBox7 As ucrInputComboBox - Friend WithEvents Label15 As Label + Friend WithEvents lblColourTopYAxis As Label + Friend WithEvents ucrInputColourTopYAxis As ucrInputComboBox + Friend WithEvents lblFaceTopYAxis As Label + Friend WithEvents ucrInputFaceTopYAxis As ucrInputComboBox + Friend WithEvents lblFamilyTopYaxis As Label + Friend WithEvents ucrInputFamilyTopYAxis As ucrInputComboBox + Friend WithEvents grpTickMarksYAxis As GroupBox + Friend WithEvents lblLineEndTickMarksYAxis As Label + Friend WithEvents ucrInputLineEndTickMarksYAxis As ucrInputComboBox + Friend WithEvents lblSizeTickMarksYAxis As Label Friend WithEvents ucrNudSizeTickMarksYAxis As ucrNud - Friend WithEvents Label16 As Label - Friend WithEvents UcrInputComboBox8 As ucrInputComboBox - Friend WithEvents Label17 As Label - Friend WithEvents UcrInputComboBox9 As ucrInputComboBox - Friend WithEvents GroupBox5 As GroupBox + Friend WithEvents lblColourTickMarksYAxis As Label + Friend WithEvents ucrInputColourTickMarksYAxis As ucrInputComboBox + Friend WithEvents lblLineHeightTickMarksYAxis As Label + Friend WithEvents ucrInputLineTypeYAxis As ucrInputComboBox + Friend WithEvents grpYAxisLabels As GroupBox Friend WithEvents lblVjustYAxis As Label Friend WithEvents ucrNudVjustYAxis As ucrNud Friend WithEvents lblLineHeightYAxis As Label Friend WithEvents ucrNudLineHeightYAxis As ucrNud - Friend WithEvents Label20 As Label - Friend WithEvents ucrNudLAngle As ucrNud + Friend WithEvents lblAngleYAxis As Label + Friend WithEvents ucrNudLAngleYAxis As ucrNud Friend WithEvents lblHjustYAxis As Label Friend WithEvents ucrNudHjustYAxis As ucrNud Friend WithEvents lblSizeYAxis As Label Friend WithEvents ucrNudSizeYAxis As ucrNud Friend WithEvents lblColourYAxis As Label - Friend WithEvents UcrInputComboBox10 As ucrInputComboBox + Friend WithEvents ucrInputColourYAxis As ucrInputComboBox Friend WithEvents lblFaceYAxis As Label - Friend WithEvents UcrInputComboBox11 As ucrInputComboBox + Friend WithEvents ucrInputFaceYAxis As ucrInputComboBox Friend WithEvents lblFamilyYAxis As Label - Friend WithEvents crInputComboBox12 As ucrInputComboBox + Friend WithEvents ucrInputFamilyYAxis As ucrInputComboBox End Class diff --git a/instat/sdgThemes.vb b/instat/sdgThemes.vb index a8e72a8c3ac..3be253e143b 100644 --- a/instat/sdgThemes.vb +++ b/instat/sdgThemes.vb @@ -23,6 +23,21 @@ Public Class sdgThemes autoTranslate(Me) End Sub + Private Sub ucrNudSizeTopYAxis_Load(sender As Object, e As EventArgs) Handles ucrNudSizeTopYAxis.Load + + End Sub + + Private Sub UcrInputComboBox6_Load(sender As Object, e As EventArgs) Handles ucrInputFamilyTopYAxis.Load + + End Sub + + Private Sub UcrInputComboBox7_Load(sender As Object, e As EventArgs) Handles ucrInputLineEndTickMarksYAxis.Load + + End Sub + + Private Sub ucrInputLineEndTickMarks_Load(sender As Object, e As EventArgs) Handles ucrInputLineEndTickMarks.Load + + End Sub Public Sub InitialiseControls() Dim dctucrInputColour As New Dictionary(Of String, String) From fce35d5029d0cd84c34eb21ffb2aa5f37368f808 Mon Sep 17 00:00:00 2001 From: Steven Date: Sat, 3 Jun 2017 13:04:01 +0300 Subject: [PATCH 078/154] bug fix --- instat/sdgThemes.vb | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/instat/sdgThemes.vb b/instat/sdgThemes.vb index 3be253e143b..5c7b6ab8d59 100644 --- a/instat/sdgThemes.vb +++ b/instat/sdgThemes.vb @@ -17,7 +17,7 @@ Imports instat.Translations Public Class sdgThemes Public bControlsInitialised As Boolean = False - Public clsElementText, clsElementLine, clsGgThemes As New RFunction + Public clsElementText, clsElementTextTop, clsElementLine, clsElementLineTop, clsGgThemes As New RFunction Private clsBaseOperator As New ROperator Private Sub sdgThemes_Load(sender As Object, e As EventArgs) Handles MyBase.Load autoTranslate(Me) @@ -252,7 +252,9 @@ Public Class sdgThemes clsGgThemes.SetRCommand("theme") clsElementText.SetRCommand("element_text") + clsElementTextTop.SetRCommand("element_text") clsElementLine.SetRCommand("element_line") + clsElementLineTop.SetRCommand("element_line") 'For Setting default values for the nuds '' clsTextTheme.AddParameter("size", 10) @@ -269,7 +271,7 @@ Public Class sdgThemes clsGgThemes.AddParameter("axis.ticks", clsRFunctionParameter:=clsElementLine) clsGgThemes.AddParameter("axis.ticks.x", clsRFunctionParameter:=clsElementLine) clsGgThemes.AddParameter("axis.text.x", clsRFunctionParameter:=clsElementText) - clsGgThemes.AddParameter("axis.text.x.top", clsRFunctionParameter:=clsElementText) + clsGgThemes.AddParameter("axis.text.x.top", clsRFunctionParameter:=clsElementTextTop) 'clsGgThemes.AddParameter("axis.text", clsRFunctionParameter:=clsTextTheme) ' clsGgThemes.AddParameter("title", clsRFunctionParameter:=clsTextTheme) @@ -292,14 +294,14 @@ Public Class sdgThemes ucrInputLineTypeTickMarks.SetRCode(clsElementLine, bReset) ucrInputLineEndTickMarks.SetRCode(clsElementLine, bReset) - ucrNudAngleTopAxis.SetRCode(clsElementText, bReset) - ucrNudHjustTopAxis.SetRCode(clsElementText, bReset) - ucrNudLineHeightTopAxis.SetRCode(clsElementText, bReset) - ucrNudSizeTopaxis.SetRCode(clsElementText, bReset) - ucrNudVjustTopAxis.SetRCode(clsElementText, bReset) - ucrInputColourTopAxis.SetRCode(clsElementText, bReset) - ucrInputFaceTopAxis.SetRCode(clsElementText, bReset) - ucrInputFamilyTopAxis.SetRCode(clsElementText, bReset) + ucrNudAngleTopAxis.SetRCode(clsElementTextTop, bReset) + ucrNudHjustTopAxis.SetRCode(clsElementTextTop, bReset) + ucrNudLineHeightTopAxis.SetRCode(clsElementTextTop, bReset) + ucrNudSizeTopaxis.SetRCode(clsElementTextTop, bReset) + ucrNudVjustTopAxis.SetRCode(clsElementTextTop, bReset) + ucrInputColourTopAxis.SetRCode(clsElementTextTop, bReset) + ucrInputFaceTopAxis.SetRCode(clsElementTextTop, bReset) + ucrInputFamilyTopAxis.SetRCode(clsElementTextTop, bReset) ucrNudSizeXTickLabels.SetRCode(clsElementLine, bReset) ucrInputColourXTickMarks.SetRCode(clsElementLine, bReset) From c8add66cf508c9011775498ab5130717ae1dc269 Mon Sep 17 00:00:00 2001 From: Steven Date: Sat, 3 Jun 2017 17:41:38 +0300 Subject: [PATCH 079/154] Changing labels to check boxes --- instat/sdgThemes.Designer.vb | 1250 ++++++++++++++++------------------ instat/sdgThemes.vb | 340 ++++++++- 2 files changed, 911 insertions(+), 679 deletions(-) diff --git a/instat/sdgThemes.Designer.vb b/instat/sdgThemes.Designer.vb index 98d6627ac04..38a209a8fb6 100644 --- a/instat/sdgThemes.Designer.vb +++ b/instat/sdgThemes.Designer.vb @@ -26,109 +26,109 @@ Partial Class sdgThemes Me.tbAxis = New System.Windows.Forms.TabPage() Me.grpTableOptions = New System.Windows.Forms.GroupBox() Me.grpTickLabels = New System.Windows.Forms.GroupBox() - Me.lblLineEndXtickMarks = New System.Windows.Forms.Label() + Me.ucrChkLineEndTickLabelsXAxis = New instat.ucrCheck() + Me.ucrChkSizeTickLabelsXAxis = New instat.ucrCheck() + Me.ucrChkLineTypeTickLabelsXAxis = New instat.ucrCheck() + Me.ucrChkColourTickLabelsXAxis = New instat.ucrCheck() Me.ucrInputLineEndXTickMarks = New instat.ucrInputComboBox() - Me.lblSizeXTickMarks = New System.Windows.Forms.Label() Me.ucrNudSizeXTickLabels = New instat.ucrNud() - Me.lblColourXTickMarks = New System.Windows.Forms.Label() Me.ucrInputColourXTickMarks = New instat.ucrInputComboBox() - Me.lbllineTypeXTickMarks = New System.Windows.Forms.Label() Me.ucrInputLineTypeXTickMarks = New instat.ucrInputComboBox() Me.grpAxisLabelTopAxis = New System.Windows.Forms.GroupBox() - Me.lblVjustTopAxis = New System.Windows.Forms.Label() + Me.ucrChkColourTopXAxis = New instat.ucrCheck() + Me.ucrChkFaceTopXAxis = New instat.ucrCheck() + Me.ucrChkFamilyTopXAxis = New instat.ucrCheck() + Me.ucrChkAngleTopXAxis = New instat.ucrCheck() + Me.ucrChkHjustTopXAxis = New instat.ucrCheck() + Me.ucrChkVjustTopXAxis = New instat.ucrCheck() + Me.ucrChkLineHeightTopXAxis = New instat.ucrCheck() + Me.ucrChkSizeTopXAxis = New instat.ucrCheck() Me.ucrNudVjustTopAxis = New instat.ucrNud() - Me.lblLineHeightTopAxis = New System.Windows.Forms.Label() Me.ucrNudLineHeightTopAxis = New instat.ucrNud() - Me.lblAngleTop = New System.Windows.Forms.Label() Me.ucrNudAngleTopAxis = New instat.ucrNud() - Me.lblHjustTopAxis = New System.Windows.Forms.Label() Me.ucrNudHjustTopAxis = New instat.ucrNud() - Me.lblSizeTopaxis = New System.Windows.Forms.Label() Me.ucrNudSizeTopaxis = New instat.ucrNud() - Me.lblColourTopAxis = New System.Windows.Forms.Label() Me.ucrInputColourTopAxis = New instat.ucrInputComboBox() - Me.lblFaceTopAxis = New System.Windows.Forms.Label() Me.ucrInputFaceTopAxis = New instat.ucrInputComboBox() - Me.lblFamilyTopAxis = New System.Windows.Forms.Label() Me.ucrInputFamilyTopAxis = New instat.ucrInputComboBox() Me.GroupBox1 = New System.Windows.Forms.GroupBox() - Me.lblLineEndTickMarks = New System.Windows.Forms.Label() + Me.ucrChkLineEndTickMarksXAxis = New instat.ucrCheck() + Me.ucrChkSizeTickMarksXAxis = New instat.ucrCheck() + Me.ucrChkLineTypeTickMarksXAxis = New instat.ucrCheck() + Me.ucrChkColourTickMarksXAxis = New instat.ucrCheck() Me.ucrInputLineEndTickMarks = New instat.ucrInputComboBox() - Me.lblSizeTickMarks = New System.Windows.Forms.Label() Me.ucrNudSizeTickMarks = New instat.ucrNud() - Me.lblColourTickMarks = New System.Windows.Forms.Label() Me.ucrInputColourTickMarks = New instat.ucrInputComboBox() - Me.lblLineTypeTickMarks = New System.Windows.Forms.Label() Me.ucrInputLineTypeTickMarks = New instat.ucrInputComboBox() Me.grpAxisLabel = New System.Windows.Forms.GroupBox() - Me.lblVjust = New System.Windows.Forms.Label() + Me.ucrChkColour = New instat.ucrCheck() + Me.ucrChkFace = New instat.ucrCheck() + Me.ucrChkFamily = New instat.ucrCheck() + Me.ucrChkAngle = New instat.ucrCheck() + Me.ucrChkHjust = New instat.ucrCheck() + Me.ucrChkVjust = New instat.ucrCheck() + Me.ucrChkLineHeight = New instat.ucrCheck() + Me.ucrChkSize = New instat.ucrCheck() Me.ucrNudVjust = New instat.ucrNud() - Me.lblLineHeight = New System.Windows.Forms.Label() Me.ucrNudLineHeight = New instat.ucrNud() - Me.lblAngle = New System.Windows.Forms.Label() Me.ucrNudAngle = New instat.ucrNud() - Me.lblHjust = New System.Windows.Forms.Label() Me.ucrNudHjust = New instat.ucrNud() - Me.lblSize = New System.Windows.Forms.Label() Me.ucrNudsize = New instat.ucrNud() - Me.Label2 = New System.Windows.Forms.Label() Me.ucrInputColour = New instat.ucrInputComboBox() - Me.lblFace = New System.Windows.Forms.Label() Me.ucrInputFace = New instat.ucrInputComboBox() - Me.lblFamily = New System.Windows.Forms.Label() Me.ucrInputFamily = New instat.ucrInputComboBox() Me.tbYaxis = New System.Windows.Forms.TabPage() Me.grpTickLabelYAxis = New System.Windows.Forms.GroupBox() - Me.LlblLinEndTickLabelYAxis = New System.Windows.Forms.Label() + Me.UcrCheck45 = New instat.ucrCheck() + Me.UcrCheck46 = New instat.ucrCheck() + Me.UcrCheck47 = New instat.ucrCheck() + Me.UcrCheck48 = New instat.ucrCheck() Me.ucrInputLineEndTickLabelsYAxis = New instat.ucrInputComboBox() - Me.lblSizeTickLabelYAxis = New System.Windows.Forms.Label() Me.ucrNudSizeTickLabelsYAxis = New instat.ucrNud() - Me.lblColourTickLabelYAxis = New System.Windows.Forms.Label() Me.ucrInputColourTickLabelsYAxis = New instat.ucrInputComboBox() - Me.lblLineHeightTickLabelsYAxis = New System.Windows.Forms.Label() - Me.ucrInputLineTypeTopYAxis = New instat.ucrInputComboBox() + Me.ucrInputLineTypeTickLabelsYAxis = New instat.ucrInputComboBox() Me.grpYAxisTopLabels = New System.Windows.Forms.GroupBox() - Me.lblVjustTopYAxis = New System.Windows.Forms.Label() + Me.UcrCheck9 = New instat.ucrCheck() + Me.UcrCheck10 = New instat.ucrCheck() + Me.UcrCheck11 = New instat.ucrCheck() + Me.UcrCheck12 = New instat.ucrCheck() + Me.UcrCheck13 = New instat.ucrCheck() + Me.UcrCheck14 = New instat.ucrCheck() + Me.UcrCheck15 = New instat.ucrCheck() + Me.UcrCheck16 = New instat.ucrCheck() Me.ucrNudVjustTopYAxis = New instat.ucrNud() - Me.lblLineHeightTopYAxis = New System.Windows.Forms.Label() Me.ucrNudLineHeightTopYAxis = New instat.ucrNud() - Me.lblAngleTopYAxis = New System.Windows.Forms.Label() Me.ucrNudAngleTopYAxis = New instat.ucrNud() - Me.lblHjustTopYAxis = New System.Windows.Forms.Label() Me.ucrNudHjustTopYAxis = New instat.ucrNud() - Me.lblSizeTopYAxis = New System.Windows.Forms.Label() Me.ucrNudSizeTopYAxis = New instat.ucrNud() - Me.lblColourTopYAxis = New System.Windows.Forms.Label() Me.ucrInputColourTopYAxis = New instat.ucrInputComboBox() - Me.lblFaceTopYAxis = New System.Windows.Forms.Label() Me.ucrInputFaceTopYAxis = New instat.ucrInputComboBox() - Me.lblFamilyTopYaxis = New System.Windows.Forms.Label() Me.ucrInputFamilyTopYAxis = New instat.ucrInputComboBox() Me.grpTickMarksYAxis = New System.Windows.Forms.GroupBox() - Me.lblLineEndTickMarksYAxis = New System.Windows.Forms.Label() + Me.UcrCheck41 = New instat.ucrCheck() + Me.UcrCheck42 = New instat.ucrCheck() + Me.UcrCheck43 = New instat.ucrCheck() + Me.UcrCheck44 = New instat.ucrCheck() Me.ucrInputLineEndTickMarksYAxis = New instat.ucrInputComboBox() - Me.lblSizeTickMarksYAxis = New System.Windows.Forms.Label() Me.ucrNudSizeTickMarksYAxis = New instat.ucrNud() - Me.lblColourTickMarksYAxis = New System.Windows.Forms.Label() Me.ucrInputColourTickMarksYAxis = New instat.ucrInputComboBox() - Me.lblLineHeightTickMarksYAxis = New System.Windows.Forms.Label() - Me.ucrInputLineTypeYAxis = New instat.ucrInputComboBox() + Me.ucrInputLineTypeTickMarksYAxis = New instat.ucrInputComboBox() Me.grpYAxisLabels = New System.Windows.Forms.GroupBox() - Me.lblVjustYAxis = New System.Windows.Forms.Label() + Me.UcrCheck8 = New instat.ucrCheck() + Me.UcrCheck7 = New instat.ucrCheck() + Me.UcrCheck6 = New instat.ucrCheck() + Me.UcrCheck5 = New instat.ucrCheck() + Me.UcrCheck4 = New instat.ucrCheck() + Me.UcrCheck3 = New instat.ucrCheck() + Me.UcrCheck2 = New instat.ucrCheck() + Me.UcrCheck1 = New instat.ucrCheck() Me.ucrNudVjustYAxis = New instat.ucrNud() - Me.lblLineHeightYAxis = New System.Windows.Forms.Label() Me.ucrNudLineHeightYAxis = New instat.ucrNud() - Me.lblAngleYAxis = New System.Windows.Forms.Label() Me.ucrNudLAngleYAxis = New instat.ucrNud() - Me.lblHjustYAxis = New System.Windows.Forms.Label() Me.ucrNudHjustYAxis = New instat.ucrNud() - Me.lblSizeYAxis = New System.Windows.Forms.Label() Me.ucrNudSizeYAxis = New instat.ucrNud() - Me.lblColourYAxis = New System.Windows.Forms.Label() Me.ucrInputColourYAxis = New instat.ucrInputComboBox() - Me.lblFaceYAxis = New System.Windows.Forms.Label() Me.ucrInputFaceYAxis = New instat.ucrInputComboBox() - Me.lblFamilyYAxis = New System.Windows.Forms.Label() Me.ucrInputFamilyYAxis = New instat.ucrInputComboBox() Me.ucrBaseSubdialogue = New instat.ucrButtonsSubdialogue() Me.tbXaxis.SuspendLayout() @@ -152,7 +152,7 @@ Partial Class sdgThemes Me.tbXaxis.Location = New System.Drawing.Point(4, 8) Me.tbXaxis.Name = "tbXaxis" Me.tbXaxis.SelectedIndex = 0 - Me.tbXaxis.Size = New System.Drawing.Size(506, 473) + Me.tbXaxis.Size = New System.Drawing.Size(556, 473) Me.tbXaxis.TabIndex = 1 ' 'tbAxis @@ -161,7 +161,7 @@ Partial Class sdgThemes Me.tbAxis.Location = New System.Drawing.Point(4, 22) Me.tbAxis.Name = "tbAxis" Me.tbAxis.Padding = New System.Windows.Forms.Padding(3) - Me.tbAxis.Size = New System.Drawing.Size(498, 447) + Me.tbAxis.Size = New System.Drawing.Size(548, 447) Me.tbAxis.TabIndex = 0 Me.tbAxis.Text = "X-axis" Me.tbAxis.UseVisualStyleBackColor = True @@ -174,61 +174,75 @@ Partial Class sdgThemes Me.grpTableOptions.Controls.Add(Me.grpAxisLabel) Me.grpTableOptions.Location = New System.Drawing.Point(-1, 3) Me.grpTableOptions.Name = "grpTableOptions" - Me.grpTableOptions.Size = New System.Drawing.Size(492, 427) + Me.grpTableOptions.Size = New System.Drawing.Size(543, 427) Me.grpTableOptions.TabIndex = 0 Me.grpTableOptions.TabStop = False Me.grpTableOptions.Text = "More Options" ' 'grpTickLabels ' - Me.grpTickLabels.Controls.Add(Me.lblLineEndXtickMarks) + Me.grpTickLabels.Controls.Add(Me.ucrChkLineEndTickLabelsXAxis) + Me.grpTickLabels.Controls.Add(Me.ucrChkSizeTickLabelsXAxis) + Me.grpTickLabels.Controls.Add(Me.ucrChkLineTypeTickLabelsXAxis) + Me.grpTickLabels.Controls.Add(Me.ucrChkColourTickLabelsXAxis) Me.grpTickLabels.Controls.Add(Me.ucrInputLineEndXTickMarks) - Me.grpTickLabels.Controls.Add(Me.lblSizeXTickMarks) Me.grpTickLabels.Controls.Add(Me.ucrNudSizeXTickLabels) - Me.grpTickLabels.Controls.Add(Me.lblColourXTickMarks) Me.grpTickLabels.Controls.Add(Me.ucrInputColourXTickMarks) - Me.grpTickLabels.Controls.Add(Me.lbllineTypeXTickMarks) Me.grpTickLabels.Controls.Add(Me.ucrInputLineTypeXTickMarks) - Me.grpTickLabels.Location = New System.Drawing.Point(260, 273) + Me.grpTickLabels.Location = New System.Drawing.Point(282, 273) Me.grpTickLabels.Name = "grpTickLabels" - Me.grpTickLabels.Size = New System.Drawing.Size(230, 154) + Me.grpTickLabels.Size = New System.Drawing.Size(264, 154) Me.grpTickLabels.TabIndex = 40 Me.grpTickLabels.TabStop = False Me.grpTickLabels.Text = "X axis tick labels" ' - 'lblLineEndXtickMarks + 'ucrChkLineEndTickLabelsXAxis ' - Me.lblLineEndXtickMarks.AutoSize = True - Me.lblLineEndXtickMarks.Location = New System.Drawing.Point(12, 108) - Me.lblLineEndXtickMarks.Name = "lblLineEndXtickMarks" - Me.lblLineEndXtickMarks.Size = New System.Drawing.Size(52, 13) - Me.lblLineEndXtickMarks.TabIndex = 31 - Me.lblLineEndXtickMarks.Text = "Line End:" + Me.ucrChkLineEndTickLabelsXAxis.Checked = False + Me.ucrChkLineEndTickLabelsXAxis.Location = New System.Drawing.Point(19, 104) + Me.ucrChkLineEndTickLabelsXAxis.Name = "ucrChkLineEndTickLabelsXAxis" + Me.ucrChkLineEndTickLabelsXAxis.Size = New System.Drawing.Size(100, 20) + Me.ucrChkLineEndTickLabelsXAxis.TabIndex = 54 + ' + 'ucrChkSizeTickLabelsXAxis + ' + Me.ucrChkSizeTickLabelsXAxis.Checked = False + Me.ucrChkSizeTickLabelsXAxis.Location = New System.Drawing.Point(19, 20) + Me.ucrChkSizeTickLabelsXAxis.Name = "ucrChkSizeTickLabelsXAxis" + Me.ucrChkSizeTickLabelsXAxis.Size = New System.Drawing.Size(100, 20) + Me.ucrChkSizeTickLabelsXAxis.TabIndex = 53 + ' + 'ucrChkLineTypeTickLabelsXAxis + ' + Me.ucrChkLineTypeTickLabelsXAxis.Checked = False + Me.ucrChkLineTypeTickLabelsXAxis.Location = New System.Drawing.Point(19, 45) + Me.ucrChkLineTypeTickLabelsXAxis.Name = "ucrChkLineTypeTickLabelsXAxis" + Me.ucrChkLineTypeTickLabelsXAxis.Size = New System.Drawing.Size(100, 20) + Me.ucrChkLineTypeTickLabelsXAxis.TabIndex = 52 + ' + 'ucrChkColourTickLabelsXAxis + ' + Me.ucrChkColourTickLabelsXAxis.Checked = False + Me.ucrChkColourTickLabelsXAxis.Location = New System.Drawing.Point(19, 72) + Me.ucrChkColourTickLabelsXAxis.Name = "ucrChkColourTickLabelsXAxis" + Me.ucrChkColourTickLabelsXAxis.Size = New System.Drawing.Size(100, 20) + Me.ucrChkColourTickLabelsXAxis.TabIndex = 51 ' 'ucrInputLineEndXTickMarks ' Me.ucrInputLineEndXTickMarks.AddQuotesIfUnrecognised = True Me.ucrInputLineEndXTickMarks.IsReadOnly = False - Me.ucrInputLineEndXTickMarks.Location = New System.Drawing.Point(72, 100) + Me.ucrInputLineEndXTickMarks.Location = New System.Drawing.Point(122, 102) Me.ucrInputLineEndXTickMarks.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) Me.ucrInputLineEndXTickMarks.Name = "ucrInputLineEndXTickMarks" Me.ucrInputLineEndXTickMarks.Size = New System.Drawing.Size(137, 21) Me.ucrInputLineEndXTickMarks.TabIndex = 32 ' - 'lblSizeXTickMarks - ' - Me.lblSizeXTickMarks.AutoSize = True - Me.lblSizeXTickMarks.Location = New System.Drawing.Point(13, 22) - Me.lblSizeXTickMarks.Name = "lblSizeXTickMarks" - Me.lblSizeXTickMarks.Size = New System.Drawing.Size(30, 13) - Me.lblSizeXTickMarks.TabIndex = 29 - Me.lblSizeXTickMarks.Text = "Size:" - ' 'ucrNudSizeXTickLabels ' Me.ucrNudSizeXTickLabels.DecimalPlaces = New Decimal(New Integer() {1, 0, 0, 0}) Me.ucrNudSizeXTickLabels.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudSizeXTickLabels.Location = New System.Drawing.Point(94, 17) + Me.ucrNudSizeXTickLabels.Location = New System.Drawing.Point(144, 17) Me.ucrNudSizeXTickLabels.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) Me.ucrNudSizeXTickLabels.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudSizeXTickLabels.Name = "ucrNudSizeXTickLabels" @@ -236,39 +250,21 @@ Partial Class sdgThemes Me.ucrNudSizeXTickLabels.TabIndex = 30 Me.ucrNudSizeXTickLabels.Value = New Decimal(New Integer() {0, 0, 0, 0}) ' - 'lblColourXTickMarks - ' - Me.lblColourXTickMarks.AutoSize = True - Me.lblColourXTickMarks.Location = New System.Drawing.Point(12, 76) - Me.lblColourXTickMarks.Name = "lblColourXTickMarks" - Me.lblColourXTickMarks.Size = New System.Drawing.Size(40, 13) - Me.lblColourXTickMarks.TabIndex = 27 - Me.lblColourXTickMarks.Text = "Colour:" - ' 'ucrInputColourXTickMarks ' Me.ucrInputColourXTickMarks.AddQuotesIfUnrecognised = True Me.ucrInputColourXTickMarks.IsReadOnly = False - Me.ucrInputColourXTickMarks.Location = New System.Drawing.Point(72, 68) + Me.ucrInputColourXTickMarks.Location = New System.Drawing.Point(122, 70) Me.ucrInputColourXTickMarks.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) Me.ucrInputColourXTickMarks.Name = "ucrInputColourXTickMarks" Me.ucrInputColourXTickMarks.Size = New System.Drawing.Size(137, 21) Me.ucrInputColourXTickMarks.TabIndex = 28 ' - 'lbllineTypeXTickMarks - ' - Me.lbllineTypeXTickMarks.AutoSize = True - Me.lbllineTypeXTickMarks.Location = New System.Drawing.Point(12, 47) - Me.lbllineTypeXTickMarks.Name = "lbllineTypeXTickMarks" - Me.lbllineTypeXTickMarks.Size = New System.Drawing.Size(57, 13) - Me.lbllineTypeXTickMarks.TabIndex = 25 - Me.lbllineTypeXTickMarks.Text = "Line Type:" - ' 'ucrInputLineTypeXTickMarks ' Me.ucrInputLineTypeXTickMarks.AddQuotesIfUnrecognised = True Me.ucrInputLineTypeXTickMarks.IsReadOnly = False - Me.ucrInputLineTypeXTickMarks.Location = New System.Drawing.Point(72, 40) + Me.ucrInputLineTypeXTickMarks.Location = New System.Drawing.Point(122, 42) Me.ucrInputLineTypeXTickMarks.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) Me.ucrInputLineTypeXTickMarks.Name = "ucrInputLineTypeXTickMarks" Me.ucrInputLineTypeXTickMarks.Size = New System.Drawing.Size(137, 21) @@ -276,43 +272,98 @@ Partial Class sdgThemes ' 'grpAxisLabelTopAxis ' - Me.grpAxisLabelTopAxis.Controls.Add(Me.lblVjustTopAxis) + Me.grpAxisLabelTopAxis.Controls.Add(Me.ucrChkColourTopXAxis) + Me.grpAxisLabelTopAxis.Controls.Add(Me.ucrChkFaceTopXAxis) + Me.grpAxisLabelTopAxis.Controls.Add(Me.ucrChkFamilyTopXAxis) + Me.grpAxisLabelTopAxis.Controls.Add(Me.ucrChkAngleTopXAxis) + Me.grpAxisLabelTopAxis.Controls.Add(Me.ucrChkHjustTopXAxis) + Me.grpAxisLabelTopAxis.Controls.Add(Me.ucrChkVjustTopXAxis) + Me.grpAxisLabelTopAxis.Controls.Add(Me.ucrChkLineHeightTopXAxis) + Me.grpAxisLabelTopAxis.Controls.Add(Me.ucrChkSizeTopXAxis) Me.grpAxisLabelTopAxis.Controls.Add(Me.ucrNudVjustTopAxis) - Me.grpAxisLabelTopAxis.Controls.Add(Me.lblLineHeightTopAxis) Me.grpAxisLabelTopAxis.Controls.Add(Me.ucrNudLineHeightTopAxis) - Me.grpAxisLabelTopAxis.Controls.Add(Me.lblAngleTop) Me.grpAxisLabelTopAxis.Controls.Add(Me.ucrNudAngleTopAxis) - Me.grpAxisLabelTopAxis.Controls.Add(Me.lblHjustTopAxis) Me.grpAxisLabelTopAxis.Controls.Add(Me.ucrNudHjustTopAxis) - Me.grpAxisLabelTopAxis.Controls.Add(Me.lblSizeTopaxis) Me.grpAxisLabelTopAxis.Controls.Add(Me.ucrNudSizeTopaxis) - Me.grpAxisLabelTopAxis.Controls.Add(Me.lblColourTopAxis) Me.grpAxisLabelTopAxis.Controls.Add(Me.ucrInputColourTopAxis) - Me.grpAxisLabelTopAxis.Controls.Add(Me.lblFaceTopAxis) Me.grpAxisLabelTopAxis.Controls.Add(Me.ucrInputFaceTopAxis) - Me.grpAxisLabelTopAxis.Controls.Add(Me.lblFamilyTopAxis) Me.grpAxisLabelTopAxis.Controls.Add(Me.ucrInputFamilyTopAxis) - Me.grpAxisLabelTopAxis.Location = New System.Drawing.Point(260, 19) + Me.grpAxisLabelTopAxis.Location = New System.Drawing.Point(283, 19) Me.grpAxisLabelTopAxis.Name = "grpAxisLabelTopAxis" - Me.grpAxisLabelTopAxis.Size = New System.Drawing.Size(230, 245) + Me.grpAxisLabelTopAxis.Size = New System.Drawing.Size(277, 245) Me.grpAxisLabelTopAxis.TabIndex = 40 Me.grpAxisLabelTopAxis.TabStop = False Me.grpAxisLabelTopAxis.Text = "X axis label on top axis" ' - 'lblVjustTopAxis + 'ucrChkColourTopXAxis + ' + Me.ucrChkColourTopXAxis.Checked = False + Me.ucrChkColourTopXAxis.Location = New System.Drawing.Point(10, 215) + Me.ucrChkColourTopXAxis.Name = "ucrChkColourTopXAxis" + Me.ucrChkColourTopXAxis.Size = New System.Drawing.Size(100, 20) + Me.ucrChkColourTopXAxis.TabIndex = 53 + ' + 'ucrChkFaceTopXAxis + ' + Me.ucrChkFaceTopXAxis.Checked = False + Me.ucrChkFaceTopXAxis.Location = New System.Drawing.Point(10, 187) + Me.ucrChkFaceTopXAxis.Name = "ucrChkFaceTopXAxis" + Me.ucrChkFaceTopXAxis.Size = New System.Drawing.Size(100, 20) + Me.ucrChkFaceTopXAxis.TabIndex = 52 + ' + 'ucrChkFamilyTopXAxis + ' + Me.ucrChkFamilyTopXAxis.Checked = False + Me.ucrChkFamilyTopXAxis.Location = New System.Drawing.Point(10, 159) + Me.ucrChkFamilyTopXAxis.Name = "ucrChkFamilyTopXAxis" + Me.ucrChkFamilyTopXAxis.Size = New System.Drawing.Size(100, 20) + Me.ucrChkFamilyTopXAxis.TabIndex = 51 + ' + 'ucrChkAngleTopXAxis + ' + Me.ucrChkAngleTopXAxis.Checked = False + Me.ucrChkAngleTopXAxis.Location = New System.Drawing.Point(10, 131) + Me.ucrChkAngleTopXAxis.Name = "ucrChkAngleTopXAxis" + Me.ucrChkAngleTopXAxis.Size = New System.Drawing.Size(100, 20) + Me.ucrChkAngleTopXAxis.TabIndex = 50 + ' + 'ucrChkHjustTopXAxis ' - Me.lblVjustTopAxis.AutoSize = True - Me.lblVjustTopAxis.Location = New System.Drawing.Point(13, 77) - Me.lblVjustTopAxis.Name = "lblVjustTopAxis" - Me.lblVjustTopAxis.Size = New System.Drawing.Size(33, 13) - Me.lblVjustTopAxis.TabIndex = 37 - Me.lblVjustTopAxis.Text = "Vjust:" + Me.ucrChkHjustTopXAxis.Checked = False + Me.ucrChkHjustTopXAxis.Location = New System.Drawing.Point(10, 47) + Me.ucrChkHjustTopXAxis.Name = "ucrChkHjustTopXAxis" + Me.ucrChkHjustTopXAxis.Size = New System.Drawing.Size(100, 20) + Me.ucrChkHjustTopXAxis.TabIndex = 49 + ' + 'ucrChkVjustTopXAxis + ' + Me.ucrChkVjustTopXAxis.Checked = False + Me.ucrChkVjustTopXAxis.Location = New System.Drawing.Point(10, 75) + Me.ucrChkVjustTopXAxis.Name = "ucrChkVjustTopXAxis" + Me.ucrChkVjustTopXAxis.Size = New System.Drawing.Size(100, 20) + Me.ucrChkVjustTopXAxis.TabIndex = 48 + ' + 'ucrChkLineHeightTopXAxis + ' + Me.ucrChkLineHeightTopXAxis.Checked = False + Me.ucrChkLineHeightTopXAxis.Location = New System.Drawing.Point(10, 103) + Me.ucrChkLineHeightTopXAxis.Name = "ucrChkLineHeightTopXAxis" + Me.ucrChkLineHeightTopXAxis.Size = New System.Drawing.Size(100, 20) + Me.ucrChkLineHeightTopXAxis.TabIndex = 47 + ' + 'ucrChkSizeTopXAxis + ' + Me.ucrChkSizeTopXAxis.Checked = False + Me.ucrChkSizeTopXAxis.Location = New System.Drawing.Point(10, 19) + Me.ucrChkSizeTopXAxis.Name = "ucrChkSizeTopXAxis" + Me.ucrChkSizeTopXAxis.Size = New System.Drawing.Size(100, 20) + Me.ucrChkSizeTopXAxis.TabIndex = 46 ' 'ucrNudVjustTopAxis ' Me.ucrNudVjustTopAxis.DecimalPlaces = New Decimal(New Integer() {1, 0, 0, 0}) Me.ucrNudVjustTopAxis.Increment = New Decimal(New Integer() {1, 0, 0, 65536}) - Me.ucrNudVjustTopAxis.Location = New System.Drawing.Point(94, 76) + Me.ucrNudVjustTopAxis.Location = New System.Drawing.Point(115, 76) Me.ucrNudVjustTopAxis.Maximum = New Decimal(New Integer() {1, 0, 0, 0}) Me.ucrNudVjustTopAxis.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudVjustTopAxis.Name = "ucrNudVjustTopAxis" @@ -320,20 +371,11 @@ Partial Class sdgThemes Me.ucrNudVjustTopAxis.TabIndex = 38 Me.ucrNudVjustTopAxis.Value = New Decimal(New Integer() {0, 0, 0, 0}) ' - 'lblLineHeightTopAxis - ' - Me.lblLineHeightTopAxis.AutoSize = True - Me.lblLineHeightTopAxis.Location = New System.Drawing.Point(13, 105) - Me.lblLineHeightTopAxis.Name = "lblLineHeightTopAxis" - Me.lblLineHeightTopAxis.Size = New System.Drawing.Size(64, 13) - Me.lblLineHeightTopAxis.TabIndex = 35 - Me.lblLineHeightTopAxis.Text = "Line Height:" - ' 'ucrNudLineHeightTopAxis ' Me.ucrNudLineHeightTopAxis.DecimalPlaces = New Decimal(New Integer() {1, 0, 0, 0}) Me.ucrNudLineHeightTopAxis.Increment = New Decimal(New Integer() {1, 0, 0, 65536}) - Me.ucrNudLineHeightTopAxis.Location = New System.Drawing.Point(94, 106) + Me.ucrNudLineHeightTopAxis.Location = New System.Drawing.Point(115, 106) Me.ucrNudLineHeightTopAxis.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) Me.ucrNudLineHeightTopAxis.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudLineHeightTopAxis.Name = "ucrNudLineHeightTopAxis" @@ -341,20 +383,11 @@ Partial Class sdgThemes Me.ucrNudLineHeightTopAxis.TabIndex = 36 Me.ucrNudLineHeightTopAxis.Value = New Decimal(New Integer() {0, 0, 0, 0}) ' - 'lblAngleTop - ' - Me.lblAngleTop.AutoSize = True - Me.lblAngleTop.Location = New System.Drawing.Point(13, 133) - Me.lblAngleTop.Name = "lblAngleTop" - Me.lblAngleTop.Size = New System.Drawing.Size(37, 13) - Me.lblAngleTop.TabIndex = 33 - Me.lblAngleTop.Text = "Angle:" - ' 'ucrNudAngleTopAxis ' Me.ucrNudAngleTopAxis.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudAngleTopAxis.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudAngleTopAxis.Location = New System.Drawing.Point(94, 134) + Me.ucrNudAngleTopAxis.Location = New System.Drawing.Point(115, 134) Me.ucrNudAngleTopAxis.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) Me.ucrNudAngleTopAxis.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudAngleTopAxis.Name = "ucrNudAngleTopAxis" @@ -362,20 +395,11 @@ Partial Class sdgThemes Me.ucrNudAngleTopAxis.TabIndex = 34 Me.ucrNudAngleTopAxis.Value = New Decimal(New Integer() {0, 0, 0, 0}) ' - 'lblHjustTopAxis - ' - Me.lblHjustTopAxis.AutoSize = True - Me.lblHjustTopAxis.Location = New System.Drawing.Point(13, 49) - Me.lblHjustTopAxis.Name = "lblHjustTopAxis" - Me.lblHjustTopAxis.Size = New System.Drawing.Size(34, 13) - Me.lblHjustTopAxis.TabIndex = 31 - Me.lblHjustTopAxis.Text = "Hjust:" - ' 'ucrNudHjustTopAxis ' Me.ucrNudHjustTopAxis.DecimalPlaces = New Decimal(New Integer() {1, 0, 0, 0}) Me.ucrNudHjustTopAxis.Increment = New Decimal(New Integer() {1, 0, 0, 65536}) - Me.ucrNudHjustTopAxis.Location = New System.Drawing.Point(94, 46) + Me.ucrNudHjustTopAxis.Location = New System.Drawing.Point(115, 46) Me.ucrNudHjustTopAxis.Maximum = New Decimal(New Integer() {1, 0, 0, 0}) Me.ucrNudHjustTopAxis.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudHjustTopAxis.Name = "ucrNudHjustTopAxis" @@ -383,20 +407,11 @@ Partial Class sdgThemes Me.ucrNudHjustTopAxis.TabIndex = 32 Me.ucrNudHjustTopAxis.Value = New Decimal(New Integer() {0, 0, 0, 0}) ' - 'lblSizeTopaxis - ' - Me.lblSizeTopaxis.AutoSize = True - Me.lblSizeTopaxis.Location = New System.Drawing.Point(13, 21) - Me.lblSizeTopaxis.Name = "lblSizeTopaxis" - Me.lblSizeTopaxis.Size = New System.Drawing.Size(30, 13) - Me.lblSizeTopaxis.TabIndex = 29 - Me.lblSizeTopaxis.Text = "Size:" - ' 'ucrNudSizeTopaxis ' Me.ucrNudSizeTopaxis.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudSizeTopaxis.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudSizeTopaxis.Location = New System.Drawing.Point(94, 16) + Me.ucrNudSizeTopaxis.Location = New System.Drawing.Point(115, 16) Me.ucrNudSizeTopaxis.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) Me.ucrNudSizeTopaxis.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudSizeTopaxis.Name = "ucrNudSizeTopaxis" @@ -404,58 +419,31 @@ Partial Class sdgThemes Me.ucrNudSizeTopaxis.TabIndex = 30 Me.ucrNudSizeTopaxis.Value = New Decimal(New Integer() {0, 0, 0, 0}) ' - 'lblColourTopAxis - ' - Me.lblColourTopAxis.AutoSize = True - Me.lblColourTopAxis.Location = New System.Drawing.Point(13, 220) - Me.lblColourTopAxis.Name = "lblColourTopAxis" - Me.lblColourTopAxis.Size = New System.Drawing.Size(40, 13) - Me.lblColourTopAxis.TabIndex = 27 - Me.lblColourTopAxis.Text = "Colour:" - ' 'ucrInputColourTopAxis ' Me.ucrInputColourTopAxis.AddQuotesIfUnrecognised = True Me.ucrInputColourTopAxis.IsReadOnly = False - Me.ucrInputColourTopAxis.Location = New System.Drawing.Point(73, 217) + Me.ucrInputColourTopAxis.Location = New System.Drawing.Point(115, 217) Me.ucrInputColourTopAxis.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) Me.ucrInputColourTopAxis.Name = "ucrInputColourTopAxis" Me.ucrInputColourTopAxis.Size = New System.Drawing.Size(137, 21) Me.ucrInputColourTopAxis.TabIndex = 28 ' - 'lblFaceTopAxis - ' - Me.lblFaceTopAxis.AutoSize = True - Me.lblFaceTopAxis.Location = New System.Drawing.Point(13, 196) - Me.lblFaceTopAxis.Name = "lblFaceTopAxis" - Me.lblFaceTopAxis.Size = New System.Drawing.Size(34, 13) - Me.lblFaceTopAxis.TabIndex = 25 - Me.lblFaceTopAxis.Text = "Face:" - ' 'ucrInputFaceTopAxis ' Me.ucrInputFaceTopAxis.AddQuotesIfUnrecognised = True Me.ucrInputFaceTopAxis.IsReadOnly = False - Me.ucrInputFaceTopAxis.Location = New System.Drawing.Point(73, 189) + Me.ucrInputFaceTopAxis.Location = New System.Drawing.Point(115, 189) Me.ucrInputFaceTopAxis.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) Me.ucrInputFaceTopAxis.Name = "ucrInputFaceTopAxis" Me.ucrInputFaceTopAxis.Size = New System.Drawing.Size(137, 21) Me.ucrInputFaceTopAxis.TabIndex = 26 ' - 'lblFamilyTopAxis - ' - Me.lblFamilyTopAxis.AutoSize = True - Me.lblFamilyTopAxis.Location = New System.Drawing.Point(13, 166) - Me.lblFamilyTopAxis.Name = "lblFamilyTopAxis" - Me.lblFamilyTopAxis.Size = New System.Drawing.Size(39, 13) - Me.lblFamilyTopAxis.TabIndex = 23 - Me.lblFamilyTopAxis.Text = "Family:" - ' 'ucrInputFamilyTopAxis ' Me.ucrInputFamilyTopAxis.AddQuotesIfUnrecognised = True Me.ucrInputFamilyTopAxis.IsReadOnly = False - Me.ucrInputFamilyTopAxis.Location = New System.Drawing.Point(73, 162) + Me.ucrInputFamilyTopAxis.Location = New System.Drawing.Point(115, 162) Me.ucrInputFamilyTopAxis.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) Me.ucrInputFamilyTopAxis.Name = "ucrInputFamilyTopAxis" Me.ucrInputFamilyTopAxis.Size = New System.Drawing.Size(137, 21) @@ -463,54 +451,68 @@ Partial Class sdgThemes ' 'GroupBox1 ' - Me.GroupBox1.Controls.Add(Me.lblLineEndTickMarks) + Me.GroupBox1.Controls.Add(Me.ucrChkLineEndTickMarksXAxis) + Me.GroupBox1.Controls.Add(Me.ucrChkSizeTickMarksXAxis) + Me.GroupBox1.Controls.Add(Me.ucrChkLineTypeTickMarksXAxis) + Me.GroupBox1.Controls.Add(Me.ucrChkColourTickMarksXAxis) Me.GroupBox1.Controls.Add(Me.ucrInputLineEndTickMarks) - Me.GroupBox1.Controls.Add(Me.lblSizeTickMarks) Me.GroupBox1.Controls.Add(Me.ucrNudSizeTickMarks) - Me.GroupBox1.Controls.Add(Me.lblColourTickMarks) Me.GroupBox1.Controls.Add(Me.ucrInputColourTickMarks) - Me.GroupBox1.Controls.Add(Me.lblLineTypeTickMarks) Me.GroupBox1.Controls.Add(Me.ucrInputLineTypeTickMarks) Me.GroupBox1.Location = New System.Drawing.Point(15, 270) Me.GroupBox1.Name = "GroupBox1" - Me.GroupBox1.Size = New System.Drawing.Size(230, 154) + Me.GroupBox1.Size = New System.Drawing.Size(262, 154) Me.GroupBox1.TabIndex = 39 Me.GroupBox1.TabStop = False Me.GroupBox1.Text = "Tick marks along axes" ' - 'lblLineEndTickMarks + 'ucrChkLineEndTickMarksXAxis ' - Me.lblLineEndTickMarks.AutoSize = True - Me.lblLineEndTickMarks.Location = New System.Drawing.Point(12, 108) - Me.lblLineEndTickMarks.Name = "lblLineEndTickMarks" - Me.lblLineEndTickMarks.Size = New System.Drawing.Size(52, 13) - Me.lblLineEndTickMarks.TabIndex = 31 - Me.lblLineEndTickMarks.Text = "Line End:" + Me.ucrChkLineEndTickMarksXAxis.Checked = False + Me.ucrChkLineEndTickMarksXAxis.Location = New System.Drawing.Point(11, 111) + Me.ucrChkLineEndTickMarksXAxis.Name = "ucrChkLineEndTickMarksXAxis" + Me.ucrChkLineEndTickMarksXAxis.Size = New System.Drawing.Size(100, 20) + Me.ucrChkLineEndTickMarksXAxis.TabIndex = 54 + ' + 'ucrChkSizeTickMarksXAxis + ' + Me.ucrChkSizeTickMarksXAxis.Checked = False + Me.ucrChkSizeTickMarksXAxis.Location = New System.Drawing.Point(11, 24) + Me.ucrChkSizeTickMarksXAxis.Name = "ucrChkSizeTickMarksXAxis" + Me.ucrChkSizeTickMarksXAxis.Size = New System.Drawing.Size(100, 20) + Me.ucrChkSizeTickMarksXAxis.TabIndex = 53 + ' + 'ucrChkLineTypeTickMarksXAxis + ' + Me.ucrChkLineTypeTickMarksXAxis.Checked = False + Me.ucrChkLineTypeTickMarksXAxis.Location = New System.Drawing.Point(11, 53) + Me.ucrChkLineTypeTickMarksXAxis.Name = "ucrChkLineTypeTickMarksXAxis" + Me.ucrChkLineTypeTickMarksXAxis.Size = New System.Drawing.Size(100, 20) + Me.ucrChkLineTypeTickMarksXAxis.TabIndex = 52 + ' + 'ucrChkColourTickMarksXAxis + ' + Me.ucrChkColourTickMarksXAxis.Checked = False + Me.ucrChkColourTickMarksXAxis.Location = New System.Drawing.Point(11, 82) + Me.ucrChkColourTickMarksXAxis.Name = "ucrChkColourTickMarksXAxis" + Me.ucrChkColourTickMarksXAxis.Size = New System.Drawing.Size(100, 20) + Me.ucrChkColourTickMarksXAxis.TabIndex = 51 ' 'ucrInputLineEndTickMarks ' Me.ucrInputLineEndTickMarks.AddQuotesIfUnrecognised = True Me.ucrInputLineEndTickMarks.IsReadOnly = False - Me.ucrInputLineEndTickMarks.Location = New System.Drawing.Point(72, 100) + Me.ucrInputLineEndTickMarks.Location = New System.Drawing.Point(118, 110) Me.ucrInputLineEndTickMarks.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) Me.ucrInputLineEndTickMarks.Name = "ucrInputLineEndTickMarks" Me.ucrInputLineEndTickMarks.Size = New System.Drawing.Size(137, 21) Me.ucrInputLineEndTickMarks.TabIndex = 32 ' - 'lblSizeTickMarks - ' - Me.lblSizeTickMarks.AutoSize = True - Me.lblSizeTickMarks.Location = New System.Drawing.Point(13, 22) - Me.lblSizeTickMarks.Name = "lblSizeTickMarks" - Me.lblSizeTickMarks.Size = New System.Drawing.Size(30, 13) - Me.lblSizeTickMarks.TabIndex = 29 - Me.lblSizeTickMarks.Text = "Size:" - ' 'ucrNudSizeTickMarks ' Me.ucrNudSizeTickMarks.DecimalPlaces = New Decimal(New Integer() {1, 0, 0, 0}) Me.ucrNudSizeTickMarks.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudSizeTickMarks.Location = New System.Drawing.Point(94, 17) + Me.ucrNudSizeTickMarks.Location = New System.Drawing.Point(140, 24) Me.ucrNudSizeTickMarks.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) Me.ucrNudSizeTickMarks.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudSizeTickMarks.Name = "ucrNudSizeTickMarks" @@ -518,39 +520,21 @@ Partial Class sdgThemes Me.ucrNudSizeTickMarks.TabIndex = 30 Me.ucrNudSizeTickMarks.Value = New Decimal(New Integer() {0, 0, 0, 0}) ' - 'lblColourTickMarks - ' - Me.lblColourTickMarks.AutoSize = True - Me.lblColourTickMarks.Location = New System.Drawing.Point(12, 76) - Me.lblColourTickMarks.Name = "lblColourTickMarks" - Me.lblColourTickMarks.Size = New System.Drawing.Size(40, 13) - Me.lblColourTickMarks.TabIndex = 27 - Me.lblColourTickMarks.Text = "Colour:" - ' 'ucrInputColourTickMarks ' Me.ucrInputColourTickMarks.AddQuotesIfUnrecognised = True Me.ucrInputColourTickMarks.IsReadOnly = False - Me.ucrInputColourTickMarks.Location = New System.Drawing.Point(72, 68) + Me.ucrInputColourTickMarks.Location = New System.Drawing.Point(118, 82) Me.ucrInputColourTickMarks.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) Me.ucrInputColourTickMarks.Name = "ucrInputColourTickMarks" Me.ucrInputColourTickMarks.Size = New System.Drawing.Size(137, 21) Me.ucrInputColourTickMarks.TabIndex = 28 ' - 'lblLineTypeTickMarks - ' - Me.lblLineTypeTickMarks.AutoSize = True - Me.lblLineTypeTickMarks.Location = New System.Drawing.Point(12, 47) - Me.lblLineTypeTickMarks.Name = "lblLineTypeTickMarks" - Me.lblLineTypeTickMarks.Size = New System.Drawing.Size(57, 13) - Me.lblLineTypeTickMarks.TabIndex = 25 - Me.lblLineTypeTickMarks.Text = "Line Type:" - ' 'ucrInputLineTypeTickMarks ' Me.ucrInputLineTypeTickMarks.AddQuotesIfUnrecognised = True Me.ucrInputLineTypeTickMarks.IsReadOnly = False - Me.ucrInputLineTypeTickMarks.Location = New System.Drawing.Point(72, 40) + Me.ucrInputLineTypeTickMarks.Location = New System.Drawing.Point(118, 52) Me.ucrInputLineTypeTickMarks.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) Me.ucrInputLineTypeTickMarks.Name = "ucrInputLineTypeTickMarks" Me.ucrInputLineTypeTickMarks.Size = New System.Drawing.Size(137, 21) @@ -558,43 +542,98 @@ Partial Class sdgThemes ' 'grpAxisLabel ' - Me.grpAxisLabel.Controls.Add(Me.lblVjust) + Me.grpAxisLabel.Controls.Add(Me.ucrChkColour) + Me.grpAxisLabel.Controls.Add(Me.ucrChkFace) + Me.grpAxisLabel.Controls.Add(Me.ucrChkFamily) + Me.grpAxisLabel.Controls.Add(Me.ucrChkAngle) + Me.grpAxisLabel.Controls.Add(Me.ucrChkHjust) + Me.grpAxisLabel.Controls.Add(Me.ucrChkVjust) + Me.grpAxisLabel.Controls.Add(Me.ucrChkLineHeight) + Me.grpAxisLabel.Controls.Add(Me.ucrChkSize) Me.grpAxisLabel.Controls.Add(Me.ucrNudVjust) - Me.grpAxisLabel.Controls.Add(Me.lblLineHeight) Me.grpAxisLabel.Controls.Add(Me.ucrNudLineHeight) - Me.grpAxisLabel.Controls.Add(Me.lblAngle) Me.grpAxisLabel.Controls.Add(Me.ucrNudAngle) - Me.grpAxisLabel.Controls.Add(Me.lblHjust) Me.grpAxisLabel.Controls.Add(Me.ucrNudHjust) - Me.grpAxisLabel.Controls.Add(Me.lblSize) Me.grpAxisLabel.Controls.Add(Me.ucrNudsize) - Me.grpAxisLabel.Controls.Add(Me.Label2) Me.grpAxisLabel.Controls.Add(Me.ucrInputColour) - Me.grpAxisLabel.Controls.Add(Me.lblFace) Me.grpAxisLabel.Controls.Add(Me.ucrInputFace) - Me.grpAxisLabel.Controls.Add(Me.lblFamily) Me.grpAxisLabel.Controls.Add(Me.ucrInputFamily) Me.grpAxisLabel.Location = New System.Drawing.Point(15, 19) Me.grpAxisLabel.Name = "grpAxisLabel" - Me.grpAxisLabel.Size = New System.Drawing.Size(230, 245) + Me.grpAxisLabel.Size = New System.Drawing.Size(262, 245) Me.grpAxisLabel.TabIndex = 23 Me.grpAxisLabel.TabStop = False Me.grpAxisLabel.Text = "X axis label" ' - 'lblVjust + 'ucrChkColour + ' + Me.ucrChkColour.Checked = False + Me.ucrChkColour.Location = New System.Drawing.Point(11, 209) + Me.ucrChkColour.Name = "ucrChkColour" + Me.ucrChkColour.Size = New System.Drawing.Size(100, 20) + Me.ucrChkColour.TabIndex = 53 + ' + 'ucrChkFace + ' + Me.ucrChkFace.Checked = False + Me.ucrChkFace.Location = New System.Drawing.Point(11, 182) + Me.ucrChkFace.Name = "ucrChkFace" + Me.ucrChkFace.Size = New System.Drawing.Size(100, 20) + Me.ucrChkFace.TabIndex = 52 + ' + 'ucrChkFamily + ' + Me.ucrChkFamily.Checked = False + Me.ucrChkFamily.Location = New System.Drawing.Point(11, 155) + Me.ucrChkFamily.Name = "ucrChkFamily" + Me.ucrChkFamily.Size = New System.Drawing.Size(100, 20) + Me.ucrChkFamily.TabIndex = 51 + ' + 'ucrChkAngle + ' + Me.ucrChkAngle.Checked = False + Me.ucrChkAngle.Location = New System.Drawing.Point(11, 128) + Me.ucrChkAngle.Name = "ucrChkAngle" + Me.ucrChkAngle.Size = New System.Drawing.Size(100, 20) + Me.ucrChkAngle.TabIndex = 50 + ' + 'ucrChkHjust ' - Me.lblVjust.AutoSize = True - Me.lblVjust.Location = New System.Drawing.Point(13, 77) - Me.lblVjust.Name = "lblVjust" - Me.lblVjust.Size = New System.Drawing.Size(33, 13) - Me.lblVjust.TabIndex = 37 - Me.lblVjust.Text = "Vjust:" + Me.ucrChkHjust.Checked = False + Me.ucrChkHjust.Location = New System.Drawing.Point(11, 47) + Me.ucrChkHjust.Name = "ucrChkHjust" + Me.ucrChkHjust.Size = New System.Drawing.Size(100, 20) + Me.ucrChkHjust.TabIndex = 49 + ' + 'ucrChkVjust + ' + Me.ucrChkVjust.Checked = False + Me.ucrChkVjust.Location = New System.Drawing.Point(11, 74) + Me.ucrChkVjust.Name = "ucrChkVjust" + Me.ucrChkVjust.Size = New System.Drawing.Size(100, 20) + Me.ucrChkVjust.TabIndex = 48 + ' + 'ucrChkLineHeight + ' + Me.ucrChkLineHeight.Checked = False + Me.ucrChkLineHeight.Location = New System.Drawing.Point(11, 101) + Me.ucrChkLineHeight.Name = "ucrChkLineHeight" + Me.ucrChkLineHeight.Size = New System.Drawing.Size(100, 20) + Me.ucrChkLineHeight.TabIndex = 47 + ' + 'ucrChkSize + ' + Me.ucrChkSize.Checked = False + Me.ucrChkSize.Location = New System.Drawing.Point(11, 20) + Me.ucrChkSize.Name = "ucrChkSize" + Me.ucrChkSize.Size = New System.Drawing.Size(100, 20) + Me.ucrChkSize.TabIndex = 46 ' 'ucrNudVjust ' Me.ucrNudVjust.DecimalPlaces = New Decimal(New Integer() {1, 0, 0, 0}) Me.ucrNudVjust.Increment = New Decimal(New Integer() {1, 0, 0, 65536}) - Me.ucrNudVjust.Location = New System.Drawing.Point(94, 76) + Me.ucrNudVjust.Location = New System.Drawing.Point(113, 76) Me.ucrNudVjust.Maximum = New Decimal(New Integer() {1, 0, 0, 0}) Me.ucrNudVjust.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudVjust.Name = "ucrNudVjust" @@ -602,20 +641,11 @@ Partial Class sdgThemes Me.ucrNudVjust.TabIndex = 38 Me.ucrNudVjust.Value = New Decimal(New Integer() {0, 0, 0, 0}) ' - 'lblLineHeight - ' - Me.lblLineHeight.AutoSize = True - Me.lblLineHeight.Location = New System.Drawing.Point(13, 108) - Me.lblLineHeight.Name = "lblLineHeight" - Me.lblLineHeight.Size = New System.Drawing.Size(64, 13) - Me.lblLineHeight.TabIndex = 35 - Me.lblLineHeight.Text = "Line Height:" - ' 'ucrNudLineHeight ' Me.ucrNudLineHeight.DecimalPlaces = New Decimal(New Integer() {1, 0, 0, 0}) Me.ucrNudLineHeight.Increment = New Decimal(New Integer() {1, 0, 0, 65536}) - Me.ucrNudLineHeight.Location = New System.Drawing.Point(94, 106) + Me.ucrNudLineHeight.Location = New System.Drawing.Point(113, 106) Me.ucrNudLineHeight.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) Me.ucrNudLineHeight.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudLineHeight.Name = "ucrNudLineHeight" @@ -623,20 +653,11 @@ Partial Class sdgThemes Me.ucrNudLineHeight.TabIndex = 36 Me.ucrNudLineHeight.Value = New Decimal(New Integer() {0, 0, 0, 0}) ' - 'lblAngle - ' - Me.lblAngle.AutoSize = True - Me.lblAngle.Location = New System.Drawing.Point(13, 137) - Me.lblAngle.Name = "lblAngle" - Me.lblAngle.Size = New System.Drawing.Size(37, 13) - Me.lblAngle.TabIndex = 33 - Me.lblAngle.Text = "Angle:" - ' 'ucrNudAngle ' Me.ucrNudAngle.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudAngle.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudAngle.Location = New System.Drawing.Point(94, 136) + Me.ucrNudAngle.Location = New System.Drawing.Point(113, 136) Me.ucrNudAngle.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) Me.ucrNudAngle.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudAngle.Name = "ucrNudAngle" @@ -644,20 +665,11 @@ Partial Class sdgThemes Me.ucrNudAngle.TabIndex = 34 Me.ucrNudAngle.Value = New Decimal(New Integer() {0, 0, 0, 0}) ' - 'lblHjust - ' - Me.lblHjust.AutoSize = True - Me.lblHjust.Location = New System.Drawing.Point(13, 49) - Me.lblHjust.Name = "lblHjust" - Me.lblHjust.Size = New System.Drawing.Size(34, 13) - Me.lblHjust.TabIndex = 31 - Me.lblHjust.Text = "Hjust:" - ' 'ucrNudHjust ' Me.ucrNudHjust.DecimalPlaces = New Decimal(New Integer() {1, 0, 0, 0}) Me.ucrNudHjust.Increment = New Decimal(New Integer() {1, 0, 0, 65536}) - Me.ucrNudHjust.Location = New System.Drawing.Point(94, 46) + Me.ucrNudHjust.Location = New System.Drawing.Point(113, 46) Me.ucrNudHjust.Maximum = New Decimal(New Integer() {1, 0, 0, 0}) Me.ucrNudHjust.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudHjust.Name = "ucrNudHjust" @@ -665,20 +677,11 @@ Partial Class sdgThemes Me.ucrNudHjust.TabIndex = 32 Me.ucrNudHjust.Value = New Decimal(New Integer() {0, 0, 0, 0}) ' - 'lblSize - ' - Me.lblSize.AutoSize = True - Me.lblSize.Location = New System.Drawing.Point(13, 21) - Me.lblSize.Name = "lblSize" - Me.lblSize.Size = New System.Drawing.Size(30, 13) - Me.lblSize.TabIndex = 29 - Me.lblSize.Text = "Size:" - ' 'ucrNudsize ' 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(94, 16) + Me.ucrNudsize.Location = New System.Drawing.Point(113, 16) 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" @@ -686,58 +689,31 @@ Partial Class sdgThemes Me.ucrNudsize.TabIndex = 30 Me.ucrNudsize.Value = New Decimal(New Integer() {0, 0, 0, 0}) ' - 'Label2 - ' - Me.Label2.AutoSize = True - Me.Label2.Location = New System.Drawing.Point(13, 220) - Me.Label2.Name = "Label2" - Me.Label2.Size = New System.Drawing.Size(40, 13) - Me.Label2.TabIndex = 27 - Me.Label2.Text = "Colour:" - ' 'ucrInputColour ' Me.ucrInputColour.AddQuotesIfUnrecognised = True Me.ucrInputColour.IsReadOnly = False - Me.ucrInputColour.Location = New System.Drawing.Point(73, 217) + Me.ucrInputColour.Location = New System.Drawing.Point(113, 217) Me.ucrInputColour.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) Me.ucrInputColour.Name = "ucrInputColour" Me.ucrInputColour.Size = New System.Drawing.Size(137, 21) Me.ucrInputColour.TabIndex = 28 ' - 'lblFace - ' - Me.lblFace.AutoSize = True - Me.lblFace.Location = New System.Drawing.Point(13, 196) - Me.lblFace.Name = "lblFace" - Me.lblFace.Size = New System.Drawing.Size(34, 13) - Me.lblFace.TabIndex = 25 - Me.lblFace.Text = "Face:" - ' 'ucrInputFace ' Me.ucrInputFace.AddQuotesIfUnrecognised = True Me.ucrInputFace.IsReadOnly = False - Me.ucrInputFace.Location = New System.Drawing.Point(73, 189) + Me.ucrInputFace.Location = New System.Drawing.Point(113, 189) Me.ucrInputFace.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) Me.ucrInputFace.Name = "ucrInputFace" Me.ucrInputFace.Size = New System.Drawing.Size(137, 21) Me.ucrInputFace.TabIndex = 26 ' - 'lblFamily - ' - Me.lblFamily.AutoSize = True - Me.lblFamily.Location = New System.Drawing.Point(13, 166) - Me.lblFamily.Name = "lblFamily" - Me.lblFamily.Size = New System.Drawing.Size(39, 13) - Me.lblFamily.TabIndex = 23 - Me.lblFamily.Text = "Family:" - ' 'ucrInputFamily ' Me.ucrInputFamily.AddQuotesIfUnrecognised = True Me.ucrInputFamily.IsReadOnly = False - Me.ucrInputFamily.Location = New System.Drawing.Point(73, 162) + Me.ucrInputFamily.Location = New System.Drawing.Point(113, 162) Me.ucrInputFamily.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) Me.ucrInputFamily.Name = "ucrInputFamily" Me.ucrInputFamily.Size = New System.Drawing.Size(137, 21) @@ -752,61 +728,75 @@ Partial Class sdgThemes Me.tbYaxis.Location = New System.Drawing.Point(4, 22) Me.tbYaxis.Name = "tbYaxis" Me.tbYaxis.Padding = New System.Windows.Forms.Padding(3) - Me.tbYaxis.Size = New System.Drawing.Size(498, 447) + Me.tbYaxis.Size = New System.Drawing.Size(548, 447) Me.tbYaxis.TabIndex = 1 Me.tbYaxis.Text = "Y-axis" Me.tbYaxis.UseVisualStyleBackColor = True ' 'grpTickLabelYAxis ' - Me.grpTickLabelYAxis.Controls.Add(Me.LlblLinEndTickLabelYAxis) + Me.grpTickLabelYAxis.Controls.Add(Me.UcrCheck45) + Me.grpTickLabelYAxis.Controls.Add(Me.UcrCheck46) + Me.grpTickLabelYAxis.Controls.Add(Me.UcrCheck47) + Me.grpTickLabelYAxis.Controls.Add(Me.UcrCheck48) Me.grpTickLabelYAxis.Controls.Add(Me.ucrInputLineEndTickLabelsYAxis) - Me.grpTickLabelYAxis.Controls.Add(Me.lblSizeTickLabelYAxis) Me.grpTickLabelYAxis.Controls.Add(Me.ucrNudSizeTickLabelsYAxis) - Me.grpTickLabelYAxis.Controls.Add(Me.lblColourTickLabelYAxis) Me.grpTickLabelYAxis.Controls.Add(Me.ucrInputColourTickLabelsYAxis) - Me.grpTickLabelYAxis.Controls.Add(Me.lblLineHeightTickLabelsYAxis) - Me.grpTickLabelYAxis.Controls.Add(Me.ucrInputLineTypeTopYAxis) - Me.grpTickLabelYAxis.Location = New System.Drawing.Point(251, 259) + Me.grpTickLabelYAxis.Controls.Add(Me.ucrInputLineTypeTickLabelsYAxis) + Me.grpTickLabelYAxis.Location = New System.Drawing.Point(262, 263) Me.grpTickLabelYAxis.Name = "grpTickLabelYAxis" - Me.grpTickLabelYAxis.Size = New System.Drawing.Size(230, 154) + Me.grpTickLabelYAxis.Size = New System.Drawing.Size(264, 154) Me.grpTickLabelYAxis.TabIndex = 43 Me.grpTickLabelYAxis.TabStop = False Me.grpTickLabelYAxis.Text = "Y axis tick labels" ' - 'LlblLinEndTickLabelYAxis + 'UcrCheck45 ' - Me.LlblLinEndTickLabelYAxis.AutoSize = True - Me.LlblLinEndTickLabelYAxis.Location = New System.Drawing.Point(12, 108) - Me.LlblLinEndTickLabelYAxis.Name = "LlblLinEndTickLabelYAxis" - Me.LlblLinEndTickLabelYAxis.Size = New System.Drawing.Size(52, 13) - Me.LlblLinEndTickLabelYAxis.TabIndex = 31 - Me.LlblLinEndTickLabelYAxis.Text = "Line End:" + Me.UcrCheck45.Checked = False + Me.UcrCheck45.Location = New System.Drawing.Point(14, 111) + Me.UcrCheck45.Name = "UcrCheck45" + Me.UcrCheck45.Size = New System.Drawing.Size(100, 20) + Me.UcrCheck45.TabIndex = 58 + ' + 'UcrCheck46 + ' + Me.UcrCheck46.Checked = False + Me.UcrCheck46.Location = New System.Drawing.Point(14, 24) + Me.UcrCheck46.Name = "UcrCheck46" + Me.UcrCheck46.Size = New System.Drawing.Size(100, 20) + Me.UcrCheck46.TabIndex = 57 + ' + 'UcrCheck47 + ' + Me.UcrCheck47.Checked = False + Me.UcrCheck47.Location = New System.Drawing.Point(14, 53) + Me.UcrCheck47.Name = "UcrCheck47" + Me.UcrCheck47.Size = New System.Drawing.Size(100, 20) + Me.UcrCheck47.TabIndex = 56 + ' + 'UcrCheck48 + ' + Me.UcrCheck48.Checked = False + Me.UcrCheck48.Location = New System.Drawing.Point(14, 82) + Me.UcrCheck48.Name = "UcrCheck48" + Me.UcrCheck48.Size = New System.Drawing.Size(100, 20) + Me.UcrCheck48.TabIndex = 55 ' 'ucrInputLineEndTickLabelsYAxis ' Me.ucrInputLineEndTickLabelsYAxis.AddQuotesIfUnrecognised = True Me.ucrInputLineEndTickLabelsYAxis.IsReadOnly = False - Me.ucrInputLineEndTickLabelsYAxis.Location = New System.Drawing.Point(72, 100) + Me.ucrInputLineEndTickLabelsYAxis.Location = New System.Drawing.Point(115, 100) Me.ucrInputLineEndTickLabelsYAxis.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) Me.ucrInputLineEndTickLabelsYAxis.Name = "ucrInputLineEndTickLabelsYAxis" Me.ucrInputLineEndTickLabelsYAxis.Size = New System.Drawing.Size(137, 21) Me.ucrInputLineEndTickLabelsYAxis.TabIndex = 32 ' - 'lblSizeTickLabelYAxis - ' - Me.lblSizeTickLabelYAxis.AutoSize = True - Me.lblSizeTickLabelYAxis.Location = New System.Drawing.Point(13, 22) - Me.lblSizeTickLabelYAxis.Name = "lblSizeTickLabelYAxis" - Me.lblSizeTickLabelYAxis.Size = New System.Drawing.Size(30, 13) - Me.lblSizeTickLabelYAxis.TabIndex = 29 - Me.lblSizeTickLabelYAxis.Text = "Size:" - ' 'ucrNudSizeTickLabelsYAxis ' Me.ucrNudSizeTickLabelsYAxis.DecimalPlaces = New Decimal(New Integer() {1, 0, 0, 0}) Me.ucrNudSizeTickLabelsYAxis.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudSizeTickLabelsYAxis.Location = New System.Drawing.Point(94, 17) + Me.ucrNudSizeTickLabelsYAxis.Location = New System.Drawing.Point(137, 17) Me.ucrNudSizeTickLabelsYAxis.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) Me.ucrNudSizeTickLabelsYAxis.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudSizeTickLabelsYAxis.Name = "ucrNudSizeTickLabelsYAxis" @@ -814,83 +804,120 @@ Partial Class sdgThemes Me.ucrNudSizeTickLabelsYAxis.TabIndex = 30 Me.ucrNudSizeTickLabelsYAxis.Value = New Decimal(New Integer() {0, 0, 0, 0}) ' - 'lblColourTickLabelYAxis - ' - Me.lblColourTickLabelYAxis.AutoSize = True - Me.lblColourTickLabelYAxis.Location = New System.Drawing.Point(12, 76) - Me.lblColourTickLabelYAxis.Name = "lblColourTickLabelYAxis" - Me.lblColourTickLabelYAxis.Size = New System.Drawing.Size(40, 13) - Me.lblColourTickLabelYAxis.TabIndex = 27 - Me.lblColourTickLabelYAxis.Text = "Colour:" - ' 'ucrInputColourTickLabelsYAxis ' Me.ucrInputColourTickLabelsYAxis.AddQuotesIfUnrecognised = True Me.ucrInputColourTickLabelsYAxis.IsReadOnly = False - Me.ucrInputColourTickLabelsYAxis.Location = New System.Drawing.Point(72, 68) + Me.ucrInputColourTickLabelsYAxis.Location = New System.Drawing.Point(115, 68) Me.ucrInputColourTickLabelsYAxis.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) Me.ucrInputColourTickLabelsYAxis.Name = "ucrInputColourTickLabelsYAxis" Me.ucrInputColourTickLabelsYAxis.Size = New System.Drawing.Size(137, 21) Me.ucrInputColourTickLabelsYAxis.TabIndex = 28 ' - 'lblLineHeightTickLabelsYAxis + 'ucrInputLineTypeTickLabelsYAxis ' - Me.lblLineHeightTickLabelsYAxis.AutoSize = True - Me.lblLineHeightTickLabelsYAxis.Location = New System.Drawing.Point(12, 47) - Me.lblLineHeightTickLabelsYAxis.Name = "lblLineHeightTickLabelsYAxis" - Me.lblLineHeightTickLabelsYAxis.Size = New System.Drawing.Size(57, 13) - Me.lblLineHeightTickLabelsYAxis.TabIndex = 25 - Me.lblLineHeightTickLabelsYAxis.Text = "Line Type:" - ' - 'ucrInputLineTypeTopYAxis - ' - Me.ucrInputLineTypeTopYAxis.AddQuotesIfUnrecognised = True - Me.ucrInputLineTypeTopYAxis.IsReadOnly = False - Me.ucrInputLineTypeTopYAxis.Location = New System.Drawing.Point(72, 40) - Me.ucrInputLineTypeTopYAxis.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) - Me.ucrInputLineTypeTopYAxis.Name = "ucrInputLineTypeTopYAxis" - Me.ucrInputLineTypeTopYAxis.Size = New System.Drawing.Size(137, 21) - Me.ucrInputLineTypeTopYAxis.TabIndex = 26 + Me.ucrInputLineTypeTickLabelsYAxis.AddQuotesIfUnrecognised = True + Me.ucrInputLineTypeTickLabelsYAxis.IsReadOnly = False + Me.ucrInputLineTypeTickLabelsYAxis.Location = New System.Drawing.Point(115, 40) + Me.ucrInputLineTypeTickLabelsYAxis.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) + Me.ucrInputLineTypeTickLabelsYAxis.Name = "ucrInputLineTypeTickLabelsYAxis" + Me.ucrInputLineTypeTickLabelsYAxis.Size = New System.Drawing.Size(137, 21) + Me.ucrInputLineTypeTickLabelsYAxis.TabIndex = 26 ' 'grpYAxisTopLabels ' - Me.grpYAxisTopLabels.Controls.Add(Me.lblVjustTopYAxis) + Me.grpYAxisTopLabels.Controls.Add(Me.UcrCheck9) + Me.grpYAxisTopLabels.Controls.Add(Me.UcrCheck10) + Me.grpYAxisTopLabels.Controls.Add(Me.UcrCheck11) + Me.grpYAxisTopLabels.Controls.Add(Me.UcrCheck12) + Me.grpYAxisTopLabels.Controls.Add(Me.UcrCheck13) + Me.grpYAxisTopLabels.Controls.Add(Me.UcrCheck14) + Me.grpYAxisTopLabels.Controls.Add(Me.UcrCheck15) + Me.grpYAxisTopLabels.Controls.Add(Me.UcrCheck16) Me.grpYAxisTopLabels.Controls.Add(Me.ucrNudVjustTopYAxis) - Me.grpYAxisTopLabels.Controls.Add(Me.lblLineHeightTopYAxis) Me.grpYAxisTopLabels.Controls.Add(Me.ucrNudLineHeightTopYAxis) - Me.grpYAxisTopLabels.Controls.Add(Me.lblAngleTopYAxis) Me.grpYAxisTopLabels.Controls.Add(Me.ucrNudAngleTopYAxis) - Me.grpYAxisTopLabels.Controls.Add(Me.lblHjustTopYAxis) Me.grpYAxisTopLabels.Controls.Add(Me.ucrNudHjustTopYAxis) - Me.grpYAxisTopLabels.Controls.Add(Me.lblSizeTopYAxis) Me.grpYAxisTopLabels.Controls.Add(Me.ucrNudSizeTopYAxis) - Me.grpYAxisTopLabels.Controls.Add(Me.lblColourTopYAxis) Me.grpYAxisTopLabels.Controls.Add(Me.ucrInputColourTopYAxis) - Me.grpYAxisTopLabels.Controls.Add(Me.lblFaceTopYAxis) Me.grpYAxisTopLabels.Controls.Add(Me.ucrInputFaceTopYAxis) - Me.grpYAxisTopLabels.Controls.Add(Me.lblFamilyTopYaxis) Me.grpYAxisTopLabels.Controls.Add(Me.ucrInputFamilyTopYAxis) - Me.grpYAxisTopLabels.Location = New System.Drawing.Point(251, 5) + Me.grpYAxisTopLabels.Location = New System.Drawing.Point(262, 5) Me.grpYAxisTopLabels.Name = "grpYAxisTopLabels" - Me.grpYAxisTopLabels.Size = New System.Drawing.Size(230, 245) + Me.grpYAxisTopLabels.Size = New System.Drawing.Size(264, 245) Me.grpYAxisTopLabels.TabIndex = 44 Me.grpYAxisTopLabels.TabStop = False Me.grpYAxisTopLabels.Text = "Y axis label on top axis" ' - 'lblVjustTopYAxis + 'UcrCheck9 + ' + Me.UcrCheck9.Checked = False + Me.UcrCheck9.Location = New System.Drawing.Point(14, 213) + Me.UcrCheck9.Name = "UcrCheck9" + Me.UcrCheck9.Size = New System.Drawing.Size(100, 20) + Me.UcrCheck9.TabIndex = 53 + ' + 'UcrCheck10 + ' + Me.UcrCheck10.Checked = False + Me.UcrCheck10.Location = New System.Drawing.Point(14, 184) + Me.UcrCheck10.Name = "UcrCheck10" + Me.UcrCheck10.Size = New System.Drawing.Size(100, 20) + Me.UcrCheck10.TabIndex = 52 + ' + 'UcrCheck11 + ' + Me.UcrCheck11.Checked = False + Me.UcrCheck11.Location = New System.Drawing.Point(14, 161) + Me.UcrCheck11.Name = "UcrCheck11" + Me.UcrCheck11.Size = New System.Drawing.Size(100, 20) + Me.UcrCheck11.TabIndex = 51 + ' + 'UcrCheck12 + ' + Me.UcrCheck12.Checked = False + Me.UcrCheck12.Location = New System.Drawing.Point(14, 128) + Me.UcrCheck12.Name = "UcrCheck12" + Me.UcrCheck12.Size = New System.Drawing.Size(100, 20) + Me.UcrCheck12.TabIndex = 50 + ' + 'UcrCheck13 ' - Me.lblVjustTopYAxis.AutoSize = True - Me.lblVjustTopYAxis.Location = New System.Drawing.Point(13, 77) - Me.lblVjustTopYAxis.Name = "lblVjustTopYAxis" - Me.lblVjustTopYAxis.Size = New System.Drawing.Size(33, 13) - Me.lblVjustTopYAxis.TabIndex = 37 - Me.lblVjustTopYAxis.Text = "Vjust:" + Me.UcrCheck13.Checked = False + Me.UcrCheck13.Location = New System.Drawing.Point(14, 41) + Me.UcrCheck13.Name = "UcrCheck13" + Me.UcrCheck13.Size = New System.Drawing.Size(100, 20) + Me.UcrCheck13.TabIndex = 49 + ' + 'UcrCheck14 + ' + Me.UcrCheck14.Checked = False + Me.UcrCheck14.Location = New System.Drawing.Point(14, 67) + Me.UcrCheck14.Name = "UcrCheck14" + Me.UcrCheck14.Size = New System.Drawing.Size(100, 20) + Me.UcrCheck14.TabIndex = 48 + ' + 'UcrCheck15 + ' + Me.UcrCheck15.Checked = False + Me.UcrCheck15.Location = New System.Drawing.Point(14, 93) + Me.UcrCheck15.Name = "UcrCheck15" + Me.UcrCheck15.Size = New System.Drawing.Size(100, 20) + Me.UcrCheck15.TabIndex = 47 + ' + 'UcrCheck16 + ' + Me.UcrCheck16.Checked = False + Me.UcrCheck16.Location = New System.Drawing.Point(14, 11) + Me.UcrCheck16.Name = "UcrCheck16" + Me.UcrCheck16.Size = New System.Drawing.Size(100, 20) + Me.UcrCheck16.TabIndex = 46 ' 'ucrNudVjustTopYAxis ' Me.ucrNudVjustTopYAxis.DecimalPlaces = New Decimal(New Integer() {1, 0, 0, 0}) Me.ucrNudVjustTopYAxis.Increment = New Decimal(New Integer() {1, 0, 0, 65536}) - Me.ucrNudVjustTopYAxis.Location = New System.Drawing.Point(94, 76) + Me.ucrNudVjustTopYAxis.Location = New System.Drawing.Point(117, 76) Me.ucrNudVjustTopYAxis.Maximum = New Decimal(New Integer() {1, 0, 0, 0}) Me.ucrNudVjustTopYAxis.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudVjustTopYAxis.Name = "ucrNudVjustTopYAxis" @@ -898,20 +925,11 @@ Partial Class sdgThemes Me.ucrNudVjustTopYAxis.TabIndex = 38 Me.ucrNudVjustTopYAxis.Value = New Decimal(New Integer() {0, 0, 0, 0}) ' - 'lblLineHeightTopYAxis - ' - Me.lblLineHeightTopYAxis.AutoSize = True - Me.lblLineHeightTopYAxis.Location = New System.Drawing.Point(13, 105) - Me.lblLineHeightTopYAxis.Name = "lblLineHeightTopYAxis" - Me.lblLineHeightTopYAxis.Size = New System.Drawing.Size(64, 13) - Me.lblLineHeightTopYAxis.TabIndex = 35 - Me.lblLineHeightTopYAxis.Text = "Line Height:" - ' 'ucrNudLineHeightTopYAxis ' Me.ucrNudLineHeightTopYAxis.DecimalPlaces = New Decimal(New Integer() {1, 0, 0, 0}) Me.ucrNudLineHeightTopYAxis.Increment = New Decimal(New Integer() {1, 0, 0, 65536}) - Me.ucrNudLineHeightTopYAxis.Location = New System.Drawing.Point(94, 106) + Me.ucrNudLineHeightTopYAxis.Location = New System.Drawing.Point(117, 106) Me.ucrNudLineHeightTopYAxis.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) Me.ucrNudLineHeightTopYAxis.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudLineHeightTopYAxis.Name = "ucrNudLineHeightTopYAxis" @@ -919,20 +937,11 @@ Partial Class sdgThemes Me.ucrNudLineHeightTopYAxis.TabIndex = 36 Me.ucrNudLineHeightTopYAxis.Value = New Decimal(New Integer() {0, 0, 0, 0}) ' - 'lblAngleTopYAxis - ' - Me.lblAngleTopYAxis.AutoSize = True - Me.lblAngleTopYAxis.Location = New System.Drawing.Point(13, 133) - Me.lblAngleTopYAxis.Name = "lblAngleTopYAxis" - Me.lblAngleTopYAxis.Size = New System.Drawing.Size(37, 13) - Me.lblAngleTopYAxis.TabIndex = 33 - Me.lblAngleTopYAxis.Text = "Angle:" - ' 'ucrNudAngleTopYAxis ' Me.ucrNudAngleTopYAxis.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudAngleTopYAxis.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudAngleTopYAxis.Location = New System.Drawing.Point(94, 134) + Me.ucrNudAngleTopYAxis.Location = New System.Drawing.Point(117, 134) Me.ucrNudAngleTopYAxis.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) Me.ucrNudAngleTopYAxis.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudAngleTopYAxis.Name = "ucrNudAngleTopYAxis" @@ -940,20 +949,11 @@ Partial Class sdgThemes Me.ucrNudAngleTopYAxis.TabIndex = 34 Me.ucrNudAngleTopYAxis.Value = New Decimal(New Integer() {0, 0, 0, 0}) ' - 'lblHjustTopYAxis - ' - Me.lblHjustTopYAxis.AutoSize = True - Me.lblHjustTopYAxis.Location = New System.Drawing.Point(13, 49) - Me.lblHjustTopYAxis.Name = "lblHjustTopYAxis" - Me.lblHjustTopYAxis.Size = New System.Drawing.Size(34, 13) - Me.lblHjustTopYAxis.TabIndex = 31 - Me.lblHjustTopYAxis.Text = "Hjust:" - ' 'ucrNudHjustTopYAxis ' Me.ucrNudHjustTopYAxis.DecimalPlaces = New Decimal(New Integer() {1, 0, 0, 0}) Me.ucrNudHjustTopYAxis.Increment = New Decimal(New Integer() {1, 0, 0, 65536}) - Me.ucrNudHjustTopYAxis.Location = New System.Drawing.Point(94, 46) + Me.ucrNudHjustTopYAxis.Location = New System.Drawing.Point(117, 46) Me.ucrNudHjustTopYAxis.Maximum = New Decimal(New Integer() {1, 0, 0, 0}) Me.ucrNudHjustTopYAxis.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudHjustTopYAxis.Name = "ucrNudHjustTopYAxis" @@ -961,20 +961,11 @@ Partial Class sdgThemes Me.ucrNudHjustTopYAxis.TabIndex = 32 Me.ucrNudHjustTopYAxis.Value = New Decimal(New Integer() {0, 0, 0, 0}) ' - 'lblSizeTopYAxis - ' - Me.lblSizeTopYAxis.AutoSize = True - Me.lblSizeTopYAxis.Location = New System.Drawing.Point(13, 21) - Me.lblSizeTopYAxis.Name = "lblSizeTopYAxis" - Me.lblSizeTopYAxis.Size = New System.Drawing.Size(30, 13) - Me.lblSizeTopYAxis.TabIndex = 29 - Me.lblSizeTopYAxis.Text = "Size:" - ' 'ucrNudSizeTopYAxis ' Me.ucrNudSizeTopYAxis.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudSizeTopYAxis.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudSizeTopYAxis.Location = New System.Drawing.Point(94, 16) + Me.ucrNudSizeTopYAxis.Location = New System.Drawing.Point(117, 16) Me.ucrNudSizeTopYAxis.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) Me.ucrNudSizeTopYAxis.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudSizeTopYAxis.Name = "ucrNudSizeTopYAxis" @@ -982,58 +973,31 @@ Partial Class sdgThemes Me.ucrNudSizeTopYAxis.TabIndex = 30 Me.ucrNudSizeTopYAxis.Value = New Decimal(New Integer() {0, 0, 0, 0}) ' - 'lblColourTopYAxis - ' - Me.lblColourTopYAxis.AutoSize = True - Me.lblColourTopYAxis.Location = New System.Drawing.Point(13, 220) - Me.lblColourTopYAxis.Name = "lblColourTopYAxis" - Me.lblColourTopYAxis.Size = New System.Drawing.Size(40, 13) - Me.lblColourTopYAxis.TabIndex = 27 - Me.lblColourTopYAxis.Text = "Colour:" - ' 'ucrInputColourTopYAxis ' Me.ucrInputColourTopYAxis.AddQuotesIfUnrecognised = True Me.ucrInputColourTopYAxis.IsReadOnly = False - Me.ucrInputColourTopYAxis.Location = New System.Drawing.Point(73, 217) + Me.ucrInputColourTopYAxis.Location = New System.Drawing.Point(117, 217) Me.ucrInputColourTopYAxis.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) Me.ucrInputColourTopYAxis.Name = "ucrInputColourTopYAxis" Me.ucrInputColourTopYAxis.Size = New System.Drawing.Size(137, 21) Me.ucrInputColourTopYAxis.TabIndex = 28 ' - 'lblFaceTopYAxis - ' - Me.lblFaceTopYAxis.AutoSize = True - Me.lblFaceTopYAxis.Location = New System.Drawing.Point(13, 196) - Me.lblFaceTopYAxis.Name = "lblFaceTopYAxis" - Me.lblFaceTopYAxis.Size = New System.Drawing.Size(34, 13) - Me.lblFaceTopYAxis.TabIndex = 25 - Me.lblFaceTopYAxis.Text = "Face:" - ' 'ucrInputFaceTopYAxis ' Me.ucrInputFaceTopYAxis.AddQuotesIfUnrecognised = True Me.ucrInputFaceTopYAxis.IsReadOnly = False - Me.ucrInputFaceTopYAxis.Location = New System.Drawing.Point(73, 189) + Me.ucrInputFaceTopYAxis.Location = New System.Drawing.Point(117, 189) Me.ucrInputFaceTopYAxis.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) Me.ucrInputFaceTopYAxis.Name = "ucrInputFaceTopYAxis" Me.ucrInputFaceTopYAxis.Size = New System.Drawing.Size(137, 21) Me.ucrInputFaceTopYAxis.TabIndex = 26 ' - 'lblFamilyTopYaxis - ' - Me.lblFamilyTopYaxis.AutoSize = True - Me.lblFamilyTopYaxis.Location = New System.Drawing.Point(13, 166) - Me.lblFamilyTopYaxis.Name = "lblFamilyTopYaxis" - Me.lblFamilyTopYaxis.Size = New System.Drawing.Size(39, 13) - Me.lblFamilyTopYaxis.TabIndex = 23 - Me.lblFamilyTopYaxis.Text = "Family:" - ' 'ucrInputFamilyTopYAxis ' Me.ucrInputFamilyTopYAxis.AddQuotesIfUnrecognised = True Me.ucrInputFamilyTopYAxis.IsReadOnly = False - Me.ucrInputFamilyTopYAxis.Location = New System.Drawing.Point(73, 162) + Me.ucrInputFamilyTopYAxis.Location = New System.Drawing.Point(117, 162) Me.ucrInputFamilyTopYAxis.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) Me.ucrInputFamilyTopYAxis.Name = "ucrInputFamilyTopYAxis" Me.ucrInputFamilyTopYAxis.Size = New System.Drawing.Size(137, 21) @@ -1041,54 +1005,68 @@ Partial Class sdgThemes ' 'grpTickMarksYAxis ' - Me.grpTickMarksYAxis.Controls.Add(Me.lblLineEndTickMarksYAxis) + Me.grpTickMarksYAxis.Controls.Add(Me.UcrCheck41) + Me.grpTickMarksYAxis.Controls.Add(Me.UcrCheck42) + Me.grpTickMarksYAxis.Controls.Add(Me.UcrCheck43) + Me.grpTickMarksYAxis.Controls.Add(Me.UcrCheck44) Me.grpTickMarksYAxis.Controls.Add(Me.ucrInputLineEndTickMarksYAxis) - Me.grpTickMarksYAxis.Controls.Add(Me.lblSizeTickMarksYAxis) Me.grpTickMarksYAxis.Controls.Add(Me.ucrNudSizeTickMarksYAxis) - Me.grpTickMarksYAxis.Controls.Add(Me.lblColourTickMarksYAxis) Me.grpTickMarksYAxis.Controls.Add(Me.ucrInputColourTickMarksYAxis) - Me.grpTickMarksYAxis.Controls.Add(Me.lblLineHeightTickMarksYAxis) - Me.grpTickMarksYAxis.Controls.Add(Me.ucrInputLineTypeYAxis) + Me.grpTickMarksYAxis.Controls.Add(Me.ucrInputLineTypeTickMarksYAxis) Me.grpTickMarksYAxis.Location = New System.Drawing.Point(6, 256) Me.grpTickMarksYAxis.Name = "grpTickMarksYAxis" - Me.grpTickMarksYAxis.Size = New System.Drawing.Size(230, 154) + Me.grpTickMarksYAxis.Size = New System.Drawing.Size(250, 154) Me.grpTickMarksYAxis.TabIndex = 42 Me.grpTickMarksYAxis.TabStop = False Me.grpTickMarksYAxis.Text = "Tick marks along axes" ' - 'lblLineEndTickMarksYAxis + 'UcrCheck41 ' - Me.lblLineEndTickMarksYAxis.AutoSize = True - Me.lblLineEndTickMarksYAxis.Location = New System.Drawing.Point(12, 108) - Me.lblLineEndTickMarksYAxis.Name = "lblLineEndTickMarksYAxis" - Me.lblLineEndTickMarksYAxis.Size = New System.Drawing.Size(52, 13) - Me.lblLineEndTickMarksYAxis.TabIndex = 31 - Me.lblLineEndTickMarksYAxis.Text = "Line End:" + Me.UcrCheck41.Checked = False + Me.UcrCheck41.Location = New System.Drawing.Point(6, 111) + Me.UcrCheck41.Name = "UcrCheck41" + Me.UcrCheck41.Size = New System.Drawing.Size(100, 20) + Me.UcrCheck41.TabIndex = 58 + ' + 'UcrCheck42 + ' + Me.UcrCheck42.Checked = False + Me.UcrCheck42.Location = New System.Drawing.Point(6, 24) + Me.UcrCheck42.Name = "UcrCheck42" + Me.UcrCheck42.Size = New System.Drawing.Size(100, 20) + Me.UcrCheck42.TabIndex = 57 + ' + 'UcrCheck43 + ' + Me.UcrCheck43.Checked = False + Me.UcrCheck43.Location = New System.Drawing.Point(6, 53) + Me.UcrCheck43.Name = "UcrCheck43" + Me.UcrCheck43.Size = New System.Drawing.Size(100, 20) + Me.UcrCheck43.TabIndex = 56 + ' + 'UcrCheck44 + ' + Me.UcrCheck44.Checked = False + Me.UcrCheck44.Location = New System.Drawing.Point(6, 82) + Me.UcrCheck44.Name = "UcrCheck44" + Me.UcrCheck44.Size = New System.Drawing.Size(100, 20) + Me.UcrCheck44.TabIndex = 55 ' 'ucrInputLineEndTickMarksYAxis ' Me.ucrInputLineEndTickMarksYAxis.AddQuotesIfUnrecognised = True Me.ucrInputLineEndTickMarksYAxis.IsReadOnly = False - Me.ucrInputLineEndTickMarksYAxis.Location = New System.Drawing.Point(72, 100) + Me.ucrInputLineEndTickMarksYAxis.Location = New System.Drawing.Point(110, 100) Me.ucrInputLineEndTickMarksYAxis.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) Me.ucrInputLineEndTickMarksYAxis.Name = "ucrInputLineEndTickMarksYAxis" Me.ucrInputLineEndTickMarksYAxis.Size = New System.Drawing.Size(137, 21) Me.ucrInputLineEndTickMarksYAxis.TabIndex = 32 ' - 'lblSizeTickMarksYAxis - ' - Me.lblSizeTickMarksYAxis.AutoSize = True - Me.lblSizeTickMarksYAxis.Location = New System.Drawing.Point(13, 22) - Me.lblSizeTickMarksYAxis.Name = "lblSizeTickMarksYAxis" - Me.lblSizeTickMarksYAxis.Size = New System.Drawing.Size(30, 13) - Me.lblSizeTickMarksYAxis.TabIndex = 29 - Me.lblSizeTickMarksYAxis.Text = "Size:" - ' 'ucrNudSizeTickMarksYAxis ' Me.ucrNudSizeTickMarksYAxis.DecimalPlaces = New Decimal(New Integer() {1, 0, 0, 0}) Me.ucrNudSizeTickMarksYAxis.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudSizeTickMarksYAxis.Location = New System.Drawing.Point(94, 17) + Me.ucrNudSizeTickMarksYAxis.Location = New System.Drawing.Point(132, 17) Me.ucrNudSizeTickMarksYAxis.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) Me.ucrNudSizeTickMarksYAxis.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudSizeTickMarksYAxis.Name = "ucrNudSizeTickMarksYAxis" @@ -1096,83 +1074,120 @@ Partial Class sdgThemes Me.ucrNudSizeTickMarksYAxis.TabIndex = 30 Me.ucrNudSizeTickMarksYAxis.Value = New Decimal(New Integer() {0, 0, 0, 0}) ' - 'lblColourTickMarksYAxis - ' - Me.lblColourTickMarksYAxis.AutoSize = True - Me.lblColourTickMarksYAxis.Location = New System.Drawing.Point(12, 76) - Me.lblColourTickMarksYAxis.Name = "lblColourTickMarksYAxis" - Me.lblColourTickMarksYAxis.Size = New System.Drawing.Size(40, 13) - Me.lblColourTickMarksYAxis.TabIndex = 27 - Me.lblColourTickMarksYAxis.Text = "Colour:" - ' 'ucrInputColourTickMarksYAxis ' Me.ucrInputColourTickMarksYAxis.AddQuotesIfUnrecognised = True Me.ucrInputColourTickMarksYAxis.IsReadOnly = False - Me.ucrInputColourTickMarksYAxis.Location = New System.Drawing.Point(72, 68) + Me.ucrInputColourTickMarksYAxis.Location = New System.Drawing.Point(110, 68) Me.ucrInputColourTickMarksYAxis.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) Me.ucrInputColourTickMarksYAxis.Name = "ucrInputColourTickMarksYAxis" Me.ucrInputColourTickMarksYAxis.Size = New System.Drawing.Size(137, 21) Me.ucrInputColourTickMarksYAxis.TabIndex = 28 ' - 'lblLineHeightTickMarksYAxis + 'ucrInputLineTypeTickMarksYAxis ' - Me.lblLineHeightTickMarksYAxis.AutoSize = True - Me.lblLineHeightTickMarksYAxis.Location = New System.Drawing.Point(12, 47) - Me.lblLineHeightTickMarksYAxis.Name = "lblLineHeightTickMarksYAxis" - Me.lblLineHeightTickMarksYAxis.Size = New System.Drawing.Size(57, 13) - Me.lblLineHeightTickMarksYAxis.TabIndex = 25 - Me.lblLineHeightTickMarksYAxis.Text = "Line Type:" - ' - 'ucrInputLineTypeYAxis - ' - Me.ucrInputLineTypeYAxis.AddQuotesIfUnrecognised = True - Me.ucrInputLineTypeYAxis.IsReadOnly = False - Me.ucrInputLineTypeYAxis.Location = New System.Drawing.Point(72, 40) - Me.ucrInputLineTypeYAxis.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) - Me.ucrInputLineTypeYAxis.Name = "ucrInputLineTypeYAxis" - Me.ucrInputLineTypeYAxis.Size = New System.Drawing.Size(137, 21) - Me.ucrInputLineTypeYAxis.TabIndex = 26 + Me.ucrInputLineTypeTickMarksYAxis.AddQuotesIfUnrecognised = True + Me.ucrInputLineTypeTickMarksYAxis.IsReadOnly = False + Me.ucrInputLineTypeTickMarksYAxis.Location = New System.Drawing.Point(110, 40) + Me.ucrInputLineTypeTickMarksYAxis.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) + Me.ucrInputLineTypeTickMarksYAxis.Name = "ucrInputLineTypeTickMarksYAxis" + Me.ucrInputLineTypeTickMarksYAxis.Size = New System.Drawing.Size(137, 21) + Me.ucrInputLineTypeTickMarksYAxis.TabIndex = 26 ' 'grpYAxisLabels ' - Me.grpYAxisLabels.Controls.Add(Me.lblVjustYAxis) + Me.grpYAxisLabels.Controls.Add(Me.UcrCheck8) + Me.grpYAxisLabels.Controls.Add(Me.UcrCheck7) + Me.grpYAxisLabels.Controls.Add(Me.UcrCheck6) + Me.grpYAxisLabels.Controls.Add(Me.UcrCheck5) + Me.grpYAxisLabels.Controls.Add(Me.UcrCheck4) + Me.grpYAxisLabels.Controls.Add(Me.UcrCheck3) + Me.grpYAxisLabels.Controls.Add(Me.UcrCheck2) + Me.grpYAxisLabels.Controls.Add(Me.UcrCheck1) Me.grpYAxisLabels.Controls.Add(Me.ucrNudVjustYAxis) - Me.grpYAxisLabels.Controls.Add(Me.lblLineHeightYAxis) Me.grpYAxisLabels.Controls.Add(Me.ucrNudLineHeightYAxis) - Me.grpYAxisLabels.Controls.Add(Me.lblAngleYAxis) Me.grpYAxisLabels.Controls.Add(Me.ucrNudLAngleYAxis) - Me.grpYAxisLabels.Controls.Add(Me.lblHjustYAxis) Me.grpYAxisLabels.Controls.Add(Me.ucrNudHjustYAxis) - Me.grpYAxisLabels.Controls.Add(Me.lblSizeYAxis) Me.grpYAxisLabels.Controls.Add(Me.ucrNudSizeYAxis) - Me.grpYAxisLabels.Controls.Add(Me.lblColourYAxis) Me.grpYAxisLabels.Controls.Add(Me.ucrInputColourYAxis) - Me.grpYAxisLabels.Controls.Add(Me.lblFaceYAxis) Me.grpYAxisLabels.Controls.Add(Me.ucrInputFaceYAxis) - Me.grpYAxisLabels.Controls.Add(Me.lblFamilyYAxis) Me.grpYAxisLabels.Controls.Add(Me.ucrInputFamilyYAxis) Me.grpYAxisLabels.Location = New System.Drawing.Point(6, 5) Me.grpYAxisLabels.Name = "grpYAxisLabels" - Me.grpYAxisLabels.Size = New System.Drawing.Size(230, 245) + Me.grpYAxisLabels.Size = New System.Drawing.Size(250, 245) Me.grpYAxisLabels.TabIndex = 41 Me.grpYAxisLabels.TabStop = False Me.grpYAxisLabels.Text = "Y axis label" ' - 'lblVjustYAxis + 'UcrCheck8 + ' + Me.UcrCheck8.Checked = False + Me.UcrCheck8.Location = New System.Drawing.Point(6, 218) + Me.UcrCheck8.Name = "UcrCheck8" + Me.UcrCheck8.Size = New System.Drawing.Size(100, 20) + Me.UcrCheck8.TabIndex = 45 + ' + 'UcrCheck7 + ' + Me.UcrCheck7.Checked = False + Me.UcrCheck7.Location = New System.Drawing.Point(6, 189) + Me.UcrCheck7.Name = "UcrCheck7" + Me.UcrCheck7.Size = New System.Drawing.Size(100, 20) + Me.UcrCheck7.TabIndex = 44 + ' + 'UcrCheck6 + ' + Me.UcrCheck6.Checked = False + Me.UcrCheck6.Location = New System.Drawing.Point(6, 166) + Me.UcrCheck6.Name = "UcrCheck6" + Me.UcrCheck6.Size = New System.Drawing.Size(100, 20) + Me.UcrCheck6.TabIndex = 43 + ' + 'UcrCheck5 + ' + Me.UcrCheck5.Checked = False + Me.UcrCheck5.Location = New System.Drawing.Point(6, 133) + Me.UcrCheck5.Name = "UcrCheck5" + Me.UcrCheck5.Size = New System.Drawing.Size(100, 20) + Me.UcrCheck5.TabIndex = 42 + ' + 'UcrCheck4 ' - Me.lblVjustYAxis.AutoSize = True - Me.lblVjustYAxis.Location = New System.Drawing.Point(13, 77) - Me.lblVjustYAxis.Name = "lblVjustYAxis" - Me.lblVjustYAxis.Size = New System.Drawing.Size(33, 13) - Me.lblVjustYAxis.TabIndex = 37 - Me.lblVjustYAxis.Text = "Vjust:" + Me.UcrCheck4.Checked = False + Me.UcrCheck4.Location = New System.Drawing.Point(6, 46) + Me.UcrCheck4.Name = "UcrCheck4" + Me.UcrCheck4.Size = New System.Drawing.Size(100, 20) + Me.UcrCheck4.TabIndex = 41 + ' + 'UcrCheck3 + ' + Me.UcrCheck3.Checked = False + Me.UcrCheck3.Location = New System.Drawing.Point(6, 72) + Me.UcrCheck3.Name = "UcrCheck3" + Me.UcrCheck3.Size = New System.Drawing.Size(100, 20) + Me.UcrCheck3.TabIndex = 40 + ' + 'UcrCheck2 + ' + Me.UcrCheck2.Checked = False + Me.UcrCheck2.Location = New System.Drawing.Point(6, 98) + Me.UcrCheck2.Name = "UcrCheck2" + Me.UcrCheck2.Size = New System.Drawing.Size(100, 20) + Me.UcrCheck2.TabIndex = 39 + ' + 'UcrCheck1 + ' + Me.UcrCheck1.Checked = False + Me.UcrCheck1.Location = New System.Drawing.Point(6, 16) + Me.UcrCheck1.Name = "UcrCheck1" + Me.UcrCheck1.Size = New System.Drawing.Size(100, 20) + Me.UcrCheck1.TabIndex = 33 ' 'ucrNudVjustYAxis ' Me.ucrNudVjustYAxis.DecimalPlaces = New Decimal(New Integer() {1, 0, 0, 0}) Me.ucrNudVjustYAxis.Increment = New Decimal(New Integer() {1, 0, 0, 65536}) - Me.ucrNudVjustYAxis.Location = New System.Drawing.Point(94, 76) + Me.ucrNudVjustYAxis.Location = New System.Drawing.Point(110, 76) Me.ucrNudVjustYAxis.Maximum = New Decimal(New Integer() {1, 0, 0, 0}) Me.ucrNudVjustYAxis.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudVjustYAxis.Name = "ucrNudVjustYAxis" @@ -1180,20 +1195,11 @@ Partial Class sdgThemes Me.ucrNudVjustYAxis.TabIndex = 38 Me.ucrNudVjustYAxis.Value = New Decimal(New Integer() {0, 0, 0, 0}) ' - 'lblLineHeightYAxis - ' - Me.lblLineHeightYAxis.AutoSize = True - Me.lblLineHeightYAxis.Location = New System.Drawing.Point(13, 108) - Me.lblLineHeightYAxis.Name = "lblLineHeightYAxis" - Me.lblLineHeightYAxis.Size = New System.Drawing.Size(64, 13) - Me.lblLineHeightYAxis.TabIndex = 35 - Me.lblLineHeightYAxis.Text = "Line Height:" - ' 'ucrNudLineHeightYAxis ' Me.ucrNudLineHeightYAxis.DecimalPlaces = New Decimal(New Integer() {1, 0, 0, 0}) Me.ucrNudLineHeightYAxis.Increment = New Decimal(New Integer() {1, 0, 0, 65536}) - Me.ucrNudLineHeightYAxis.Location = New System.Drawing.Point(94, 106) + Me.ucrNudLineHeightYAxis.Location = New System.Drawing.Point(110, 106) Me.ucrNudLineHeightYAxis.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) Me.ucrNudLineHeightYAxis.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudLineHeightYAxis.Name = "ucrNudLineHeightYAxis" @@ -1201,20 +1207,11 @@ Partial Class sdgThemes Me.ucrNudLineHeightYAxis.TabIndex = 36 Me.ucrNudLineHeightYAxis.Value = New Decimal(New Integer() {0, 0, 0, 0}) ' - 'lblAngleYAxis - ' - Me.lblAngleYAxis.AutoSize = True - Me.lblAngleYAxis.Location = New System.Drawing.Point(13, 137) - Me.lblAngleYAxis.Name = "lblAngleYAxis" - Me.lblAngleYAxis.Size = New System.Drawing.Size(37, 13) - Me.lblAngleYAxis.TabIndex = 33 - Me.lblAngleYAxis.Text = "Angle:" - ' 'ucrNudLAngleYAxis ' Me.ucrNudLAngleYAxis.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudLAngleYAxis.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudLAngleYAxis.Location = New System.Drawing.Point(94, 136) + Me.ucrNudLAngleYAxis.Location = New System.Drawing.Point(110, 136) Me.ucrNudLAngleYAxis.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) Me.ucrNudLAngleYAxis.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudLAngleYAxis.Name = "ucrNudLAngleYAxis" @@ -1222,20 +1219,11 @@ Partial Class sdgThemes Me.ucrNudLAngleYAxis.TabIndex = 34 Me.ucrNudLAngleYAxis.Value = New Decimal(New Integer() {0, 0, 0, 0}) ' - 'lblHjustYAxis - ' - Me.lblHjustYAxis.AutoSize = True - Me.lblHjustYAxis.Location = New System.Drawing.Point(13, 49) - Me.lblHjustYAxis.Name = "lblHjustYAxis" - Me.lblHjustYAxis.Size = New System.Drawing.Size(34, 13) - Me.lblHjustYAxis.TabIndex = 31 - Me.lblHjustYAxis.Text = "Hjust:" - ' 'ucrNudHjustYAxis ' Me.ucrNudHjustYAxis.DecimalPlaces = New Decimal(New Integer() {1, 0, 0, 0}) Me.ucrNudHjustYAxis.Increment = New Decimal(New Integer() {1, 0, 0, 65536}) - Me.ucrNudHjustYAxis.Location = New System.Drawing.Point(94, 46) + Me.ucrNudHjustYAxis.Location = New System.Drawing.Point(110, 46) Me.ucrNudHjustYAxis.Maximum = New Decimal(New Integer() {1, 0, 0, 0}) Me.ucrNudHjustYAxis.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudHjustYAxis.Name = "ucrNudHjustYAxis" @@ -1243,20 +1231,11 @@ Partial Class sdgThemes Me.ucrNudHjustYAxis.TabIndex = 32 Me.ucrNudHjustYAxis.Value = New Decimal(New Integer() {0, 0, 0, 0}) ' - 'lblSizeYAxis - ' - Me.lblSizeYAxis.AutoSize = True - Me.lblSizeYAxis.Location = New System.Drawing.Point(13, 21) - Me.lblSizeYAxis.Name = "lblSizeYAxis" - Me.lblSizeYAxis.Size = New System.Drawing.Size(30, 13) - Me.lblSizeYAxis.TabIndex = 29 - Me.lblSizeYAxis.Text = "Size:" - ' 'ucrNudSizeYAxis ' Me.ucrNudSizeYAxis.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudSizeYAxis.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudSizeYAxis.Location = New System.Drawing.Point(94, 16) + Me.ucrNudSizeYAxis.Location = New System.Drawing.Point(110, 16) Me.ucrNudSizeYAxis.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) Me.ucrNudSizeYAxis.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudSizeYAxis.Name = "ucrNudSizeYAxis" @@ -1264,58 +1243,31 @@ Partial Class sdgThemes Me.ucrNudSizeYAxis.TabIndex = 30 Me.ucrNudSizeYAxis.Value = New Decimal(New Integer() {0, 0, 0, 0}) ' - 'lblColourYAxis - ' - Me.lblColourYAxis.AutoSize = True - Me.lblColourYAxis.Location = New System.Drawing.Point(13, 220) - Me.lblColourYAxis.Name = "lblColourYAxis" - Me.lblColourYAxis.Size = New System.Drawing.Size(40, 13) - Me.lblColourYAxis.TabIndex = 27 - Me.lblColourYAxis.Text = "Colour:" - ' 'ucrInputColourYAxis ' Me.ucrInputColourYAxis.AddQuotesIfUnrecognised = True Me.ucrInputColourYAxis.IsReadOnly = False - Me.ucrInputColourYAxis.Location = New System.Drawing.Point(73, 217) + Me.ucrInputColourYAxis.Location = New System.Drawing.Point(110, 217) Me.ucrInputColourYAxis.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) Me.ucrInputColourYAxis.Name = "ucrInputColourYAxis" Me.ucrInputColourYAxis.Size = New System.Drawing.Size(137, 21) Me.ucrInputColourYAxis.TabIndex = 28 ' - 'lblFaceYAxis - ' - Me.lblFaceYAxis.AutoSize = True - Me.lblFaceYAxis.Location = New System.Drawing.Point(13, 196) - Me.lblFaceYAxis.Name = "lblFaceYAxis" - Me.lblFaceYAxis.Size = New System.Drawing.Size(34, 13) - Me.lblFaceYAxis.TabIndex = 25 - Me.lblFaceYAxis.Text = "Face:" - ' 'ucrInputFaceYAxis ' Me.ucrInputFaceYAxis.AddQuotesIfUnrecognised = True Me.ucrInputFaceYAxis.IsReadOnly = False - Me.ucrInputFaceYAxis.Location = New System.Drawing.Point(73, 189) + Me.ucrInputFaceYAxis.Location = New System.Drawing.Point(110, 189) Me.ucrInputFaceYAxis.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) Me.ucrInputFaceYAxis.Name = "ucrInputFaceYAxis" Me.ucrInputFaceYAxis.Size = New System.Drawing.Size(137, 21) Me.ucrInputFaceYAxis.TabIndex = 26 ' - 'lblFamilyYAxis - ' - Me.lblFamilyYAxis.AutoSize = True - Me.lblFamilyYAxis.Location = New System.Drawing.Point(13, 166) - Me.lblFamilyYAxis.Name = "lblFamilyYAxis" - Me.lblFamilyYAxis.Size = New System.Drawing.Size(39, 13) - Me.lblFamilyYAxis.TabIndex = 23 - Me.lblFamilyYAxis.Text = "Family:" - ' 'ucrInputFamilyYAxis ' Me.ucrInputFamilyYAxis.AddQuotesIfUnrecognised = True Me.ucrInputFamilyYAxis.IsReadOnly = False - Me.ucrInputFamilyYAxis.Location = New System.Drawing.Point(73, 162) + Me.ucrInputFamilyYAxis.Location = New System.Drawing.Point(110, 162) Me.ucrInputFamilyYAxis.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) Me.ucrInputFamilyYAxis.Name = "ucrInputFamilyYAxis" Me.ucrInputFamilyYAxis.Size = New System.Drawing.Size(137, 21) @@ -1332,7 +1284,7 @@ Partial Class sdgThemes ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(520, 546) + Me.ClientSize = New System.Drawing.Size(567, 546) Me.Controls.Add(Me.tbXaxis) Me.Controls.Add(Me.ucrBaseSubdialogue) Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog @@ -1345,22 +1297,14 @@ Partial Class sdgThemes Me.tbAxis.ResumeLayout(False) Me.grpTableOptions.ResumeLayout(False) Me.grpTickLabels.ResumeLayout(False) - Me.grpTickLabels.PerformLayout() Me.grpAxisLabelTopAxis.ResumeLayout(False) - Me.grpAxisLabelTopAxis.PerformLayout() Me.GroupBox1.ResumeLayout(False) - Me.GroupBox1.PerformLayout() Me.grpAxisLabel.ResumeLayout(False) - Me.grpAxisLabel.PerformLayout() Me.tbYaxis.ResumeLayout(False) Me.grpTickLabelYAxis.ResumeLayout(False) - Me.grpTickLabelYAxis.PerformLayout() Me.grpYAxisTopLabels.ResumeLayout(False) - Me.grpYAxisTopLabels.PerformLayout() Me.grpTickMarksYAxis.ResumeLayout(False) - Me.grpTickMarksYAxis.PerformLayout() Me.grpYAxisLabels.ResumeLayout(False) - Me.grpYAxisLabels.PerformLayout() Me.ResumeLayout(False) End Sub @@ -1371,107 +1315,107 @@ Partial Class sdgThemes Friend WithEvents grpTableOptions As GroupBox Friend WithEvents tbYaxis As TabPage Friend WithEvents GroupBox1 As GroupBox - Friend WithEvents lblSizeTickMarks As Label Friend WithEvents ucrNudSizeTickMarks As ucrNud - Friend WithEvents lblColourTickMarks As Label Friend WithEvents ucrInputColourTickMarks As ucrInputComboBox - Friend WithEvents lblLineTypeTickMarks As Label Friend WithEvents ucrInputLineTypeTickMarks As ucrInputComboBox Friend WithEvents grpAxisLabel As GroupBox - Friend WithEvents lblVjust As Label Friend WithEvents ucrNudVjust As ucrNud - Friend WithEvents lblLineHeight As Label Friend WithEvents ucrNudLineHeight As ucrNud - Friend WithEvents lblAngle As Label Friend WithEvents ucrNudAngle As ucrNud - Friend WithEvents lblHjust As Label Friend WithEvents ucrNudHjust As ucrNud - Friend WithEvents lblSize As Label Friend WithEvents ucrNudsize As ucrNud - Friend WithEvents Label2 As Label Friend WithEvents ucrInputColour As ucrInputComboBox - Friend WithEvents lblFace As Label Friend WithEvents ucrInputFace As ucrInputComboBox - Friend WithEvents lblFamily As Label Friend WithEvents ucrInputFamily As ucrInputComboBox - Friend WithEvents lblLineEndTickMarks As Label Friend WithEvents ucrInputLineEndTickMarks As ucrInputComboBox Friend WithEvents grpAxisLabelTopAxis As GroupBox - Friend WithEvents lblVjustTopAxis As Label Friend WithEvents ucrNudVjustTopAxis As ucrNud - Friend WithEvents lblLineHeightTopAxis As Label Friend WithEvents ucrNudLineHeightTopAxis As ucrNud - Friend WithEvents lblAngleTop As Label Friend WithEvents ucrNudAngleTopAxis As ucrNud - Friend WithEvents lblHjustTopAxis As Label Friend WithEvents ucrNudHjustTopAxis As ucrNud - Friend WithEvents lblSizeTopaxis As Label Friend WithEvents ucrNudSizeTopaxis As ucrNud - Friend WithEvents lblColourTopAxis As Label Friend WithEvents ucrInputColourTopAxis As ucrInputComboBox - Friend WithEvents lblFaceTopAxis As Label Friend WithEvents ucrInputFaceTopAxis As ucrInputComboBox - Friend WithEvents lblFamilyTopAxis As Label Friend WithEvents ucrInputFamilyTopAxis As ucrInputComboBox Friend WithEvents grpTickLabels As GroupBox - Friend WithEvents lblLineEndXtickMarks As Label Friend WithEvents ucrInputLineEndXTickMarks As ucrInputComboBox - Friend WithEvents lblSizeXTickMarks As Label Friend WithEvents ucrNudSizeXTickLabels As ucrNud - Friend WithEvents lblColourXTickMarks As Label Friend WithEvents ucrInputColourXTickMarks As ucrInputComboBox - Friend WithEvents lbllineTypeXTickMarks As Label Friend WithEvents ucrInputLineTypeXTickMarks As ucrInputComboBox Friend WithEvents grpTickLabelYAxis As GroupBox - Friend WithEvents LlblLinEndTickLabelYAxis As Label Friend WithEvents ucrInputLineEndTickLabelsYAxis As ucrInputComboBox - Friend WithEvents lblSizeTickLabelYAxis As Label Friend WithEvents ucrNudSizeTickLabelsYAxis As ucrNud - Friend WithEvents lblColourTickLabelYAxis As Label Friend WithEvents ucrInputColourTickLabelsYAxis As ucrInputComboBox - Friend WithEvents lblLineHeightTickLabelsYAxis As Label - Friend WithEvents ucrInputLineTypeTopYAxis As ucrInputComboBox + Friend WithEvents ucrInputLineTypeTickLabelsYAxis As ucrInputComboBox Friend WithEvents grpYAxisTopLabels As GroupBox - Friend WithEvents lblVjustTopYAxis As Label Friend WithEvents ucrNudVjustTopYAxis As ucrNud - Friend WithEvents lblLineHeightTopYAxis As Label Friend WithEvents ucrNudLineHeightTopYAxis As ucrNud - Friend WithEvents lblAngleTopYAxis As Label Friend WithEvents ucrNudAngleTopYAxis As ucrNud - Friend WithEvents lblHjustTopYAxis As Label Friend WithEvents ucrNudHjustTopYAxis As ucrNud - Friend WithEvents lblSizeTopYAxis As Label Friend WithEvents ucrNudSizeTopYAxis As ucrNud - Friend WithEvents lblColourTopYAxis As Label Friend WithEvents ucrInputColourTopYAxis As ucrInputComboBox - Friend WithEvents lblFaceTopYAxis As Label Friend WithEvents ucrInputFaceTopYAxis As ucrInputComboBox - Friend WithEvents lblFamilyTopYaxis As Label Friend WithEvents ucrInputFamilyTopYAxis As ucrInputComboBox Friend WithEvents grpTickMarksYAxis As GroupBox - Friend WithEvents lblLineEndTickMarksYAxis As Label Friend WithEvents ucrInputLineEndTickMarksYAxis As ucrInputComboBox - Friend WithEvents lblSizeTickMarksYAxis As Label Friend WithEvents ucrNudSizeTickMarksYAxis As ucrNud - Friend WithEvents lblColourTickMarksYAxis As Label Friend WithEvents ucrInputColourTickMarksYAxis As ucrInputComboBox - Friend WithEvents lblLineHeightTickMarksYAxis As Label - Friend WithEvents ucrInputLineTypeYAxis As ucrInputComboBox + Friend WithEvents ucrInputLineTypeTickMarksYAxis As ucrInputComboBox Friend WithEvents grpYAxisLabels As GroupBox - Friend WithEvents lblVjustYAxis As Label Friend WithEvents ucrNudVjustYAxis As ucrNud - Friend WithEvents lblLineHeightYAxis As Label Friend WithEvents ucrNudLineHeightYAxis As ucrNud - Friend WithEvents lblAngleYAxis As Label Friend WithEvents ucrNudLAngleYAxis As ucrNud - Friend WithEvents lblHjustYAxis As Label Friend WithEvents ucrNudHjustYAxis As ucrNud - Friend WithEvents lblSizeYAxis As Label Friend WithEvents ucrNudSizeYAxis As ucrNud - Friend WithEvents lblColourYAxis As Label Friend WithEvents ucrInputColourYAxis As ucrInputComboBox - Friend WithEvents lblFaceYAxis As Label Friend WithEvents ucrInputFaceYAxis As ucrInputComboBox - Friend WithEvents lblFamilyYAxis As Label Friend WithEvents ucrInputFamilyYAxis As ucrInputComboBox + Friend WithEvents UcrCheck4 As ucrCheck + Friend WithEvents UcrCheck3 As ucrCheck + Friend WithEvents UcrCheck2 As ucrCheck + Friend WithEvents UcrCheck1 As ucrCheck + Friend WithEvents UcrCheck8 As ucrCheck + Friend WithEvents UcrCheck7 As ucrCheck + Friend WithEvents UcrCheck6 As ucrCheck + Friend WithEvents UcrCheck5 As ucrCheck + Friend WithEvents UcrCheck9 As ucrCheck + Friend WithEvents UcrCheck10 As ucrCheck + Friend WithEvents UcrCheck11 As ucrCheck + Friend WithEvents UcrCheck12 As ucrCheck + Friend WithEvents UcrCheck13 As ucrCheck + Friend WithEvents UcrCheck14 As ucrCheck + Friend WithEvents UcrCheck15 As ucrCheck + Friend WithEvents UcrCheck16 As ucrCheck + Friend WithEvents ucrChkColour As ucrCheck + Friend WithEvents ucrChkFace As ucrCheck + Friend WithEvents ucrChkFamily As ucrCheck + Friend WithEvents ucrChkAngle As ucrCheck + Friend WithEvents ucrChkHjust As ucrCheck + Friend WithEvents ucrChkVjust As ucrCheck + Friend WithEvents ucrChkLineHeight As ucrCheck + Friend WithEvents ucrChkSize As ucrCheck + Friend WithEvents ucrChkColourTopXAxis As ucrCheck + Friend WithEvents ucrChkFaceTopXAxis As ucrCheck + Friend WithEvents ucrChkFamilyTopXAxis As ucrCheck + Friend WithEvents ucrChkAngleTopXAxis As ucrCheck + Friend WithEvents ucrChkHjustTopXAxis As ucrCheck + Friend WithEvents ucrChkVjustTopXAxis As ucrCheck + Friend WithEvents ucrChkLineHeightTopXAxis As ucrCheck + Friend WithEvents ucrChkSizeTopXAxis As ucrCheck + Friend WithEvents ucrChkLineEndTickLabelsXAxis As ucrCheck + Friend WithEvents ucrChkSizeTickLabelsXAxis As ucrCheck + Friend WithEvents ucrChkLineTypeTickLabelsXAxis As ucrCheck + Friend WithEvents ucrChkColourTickLabelsXAxis As ucrCheck + Friend WithEvents ucrChkLineEndTickMarksXAxis As ucrCheck + Friend WithEvents ucrChkSizeTickMarksXAxis As ucrCheck + Friend WithEvents ucrChkLineTypeTickMarksXAxis As ucrCheck + Friend WithEvents ucrChkColourTickMarksXAxis As ucrCheck + Friend WithEvents UcrCheck45 As ucrCheck + Friend WithEvents UcrCheck46 As ucrCheck + Friend WithEvents UcrCheck47 As ucrCheck + Friend WithEvents UcrCheck48 As ucrCheck + Friend WithEvents UcrCheck41 As ucrCheck + Friend WithEvents UcrCheck42 As ucrCheck + Friend WithEvents UcrCheck43 As ucrCheck + Friend WithEvents UcrCheck44 As ucrCheck End Class diff --git a/instat/sdgThemes.vb b/instat/sdgThemes.vb index 5c7b6ab8d59..8210c833f5f 100644 --- a/instat/sdgThemes.vb +++ b/instat/sdgThemes.vb @@ -23,23 +23,9 @@ Public Class sdgThemes autoTranslate(Me) End Sub - Private Sub ucrNudSizeTopYAxis_Load(sender As Object, e As EventArgs) Handles ucrNudSizeTopYAxis.Load - - End Sub - - Private Sub UcrInputComboBox6_Load(sender As Object, e As EventArgs) Handles ucrInputFamilyTopYAxis.Load - - End Sub - - Private Sub UcrInputComboBox7_Load(sender As Object, e As EventArgs) Handles ucrInputLineEndTickMarksYAxis.Load - - End Sub - - Private Sub ucrInputLineEndTickMarks_Load(sender As Object, e As EventArgs) Handles ucrInputLineEndTickMarks.Load - - End Sub Public Sub InitialiseControls() + 'X-Axis tab Dim dctucrInputColour As New Dictionary(Of String, String) Dim dctucrInputColourTopAxis As New Dictionary(Of String, String) Dim dctucrInputColourSegment As New Dictionary(Of String, String) @@ -49,25 +35,45 @@ Public Class sdgThemes Dim dctucrInputFamilyTopAxis As New Dictionary(Of String, String) Dim dctucrInputLineType As New Dictionary(Of String, String) Dim dctucrInputLineTypeXTickMarks As New Dictionary(Of String, String) - Dim dctucrInputColourXTickMarkst As New Dictionary(Of String, String) + Dim dctucrInputColourXTickMarks As New Dictionary(Of String, String) Dim dctucrInputLineEnd As New Dictionary(Of String, String) Dim dctucrInputLineEndXTickMarks As New Dictionary(Of String, String) + 'Y -Axis tab + Dim dctucrInputColourYAxis As New Dictionary(Of String, String) + Dim dctucrInputColourTopYAxis As New Dictionary(Of String, String) + 'Dim dctucrInputColour As New Dictionary(Of String, String) + Dim dctucrInputFaceYAxis As New Dictionary(Of String, String) + Dim dctucrInputFaceTopYAxis As New Dictionary(Of String, String) + Dim dctucrInputFamilyYAxis As New Dictionary(Of String, String) + Dim dctucrInputFamilyTopYAxis As New Dictionary(Of String, String) + Dim dctucrInputLineTypeTickLabelsYAxis As New Dictionary(Of String, String) + Dim dctucrInputLineEndTickLabelsYAxis As New Dictionary(Of String, String) + Dim dctucrInputColourTickMarksYAxis As New Dictionary(Of String, String) + 'Dim dctucrInputColourTickMarksYAxis As New Dictionary(Of String, String) + Dim dctucrInputColourTickLabelsYAxis As New Dictionary(Of String, String) + Dim dctucrInputLineTypeTickMarksYAxis As New Dictionary(Of String, String) + Dim dctucrInputLineEndTickMarksYAxis As New Dictionary(Of String, String) + 'X axis Label + ucrChkSize.SetText("Size") ucrNudsize.SetParameter(New RParameter("size")) + ucrChkAngle.SetText("Angle") ucrNudAngle.SetParameter(New RParameter("angle")) ucrNudAngle.SetMinMax(0, 360) + ucrChkHjust.SetText("Hjust") ucrNudHjust.SetParameter(New RParameter("hjust")) ucrNudHjust.Increment = 0.1 ucrNudHjust.SetMinMax(0, 1) + ucrChkVjust.SetText("Vjust") ucrNudVjust.SetParameter(New RParameter("vjust")) ucrNudVjust.Increment = 0.1 ucrNudVjust.SetMinMax(0, 1) + ucrChkLineHeight.SetText("Line Height") ucrNudLineHeight.SetParameter(New RParameter("lineheight")) - ucrInputColour.SetParameter(New RParameter("colour")) - ucrInputFace.SetParameter(New RParameter("face")) - ucrInputFamily.SetParameter(New RParameter("family")) + ucrChkFace.SetText("Face") + ucrInputFace.SetParameter(New RParameter("face")) dctucrInputFace.Add("Plain", Chr(34) & "plain" & Chr(34)) dctucrInputFace.Add("Bold", Chr(34) & "bold" & Chr(34)) dctucrInputFace.Add("Italic", Chr(34) & "italic" & Chr(34)) @@ -75,6 +81,8 @@ Public Class sdgThemes ucrInputFace.SetItems(dctucrInputFace) ucrInputFace.SetRDefault(Chr(34) & "plain" & Chr(34)) + ucrChkColour.SetText("Colour") + ucrInputColour.SetParameter(New RParameter("colour")) dctucrInputColour.Add("Black", Chr(34) & "black" & Chr(34)) dctucrInputColour.Add("Red", Chr(34) & "red" & Chr(34)) dctucrInputColour.Add("Blue", Chr(34) & "blue" & Chr(34)) @@ -85,6 +93,8 @@ Public Class sdgThemes ucrInputColour.SetRDefault(Chr(34) & "black" & Chr(34)) ucrInputColour.bUpdateRCodeFromControl = False + ucrChkFamily.SetText("Family") + ucrInputFamily.SetParameter(New RParameter("family")) dctucrInputFamily.Add("Times Roman", Chr(34) & "Times" & Chr(34)) dctucrInputFamily.Add("Courier", Chr(34) & "Courier" & Chr(34)) dctucrInputFamily.Add("Couriersans", Chr(34) & "Couriersans" & Chr(34)) @@ -109,9 +119,11 @@ Public Class sdgThemes ucrInputFamily.bUpdateRCodeFromControl = False 'Tick Marks Along Axes + ucrChkSizeTickMarksXAxis.SetText("Size") ucrNudSizeTickMarks.SetParameter(New RParameter("size")) ucrNudSizeTickMarks.Increment = 0.1 + ucrChkLineTypeTickMarksXAxis.SetText("Line Type") ucrInputLineTypeTickMarks.SetParameter(New RParameter("linetype")) dctucrInputLineType.Add("Blank", Chr(34) & "blank" & Chr(34)) dctucrInputLineType.Add("Solid", Chr(34) & "solid" & Chr(34)) @@ -128,6 +140,7 @@ Public Class sdgThemes ucrInputLineTypeTickMarks.SetRDefault(Chr(34) & "blank" & Chr(34)) ucrInputLineTypeTickMarks.bUpdateRCodeFromControl = False + ucrChkColourTickMarksXAxis.SetText("Colour") ucrInputColourTickMarks.SetParameter(New RParameter("colour")) dctucrInputColourSegment.Add("Black", Chr(34) & "black" & Chr(34)) dctucrInputColourSegment.Add("Red", Chr(34) & "red" & Chr(34)) @@ -138,6 +151,7 @@ Public Class sdgThemes ucrInputColourTickMarks.SetItems(dctucrInputColourSegment) ucrInputColourTickMarks.SetRDefault(Chr(34) & "black" & Chr(34)) + ucrChkLineEndTickMarksXAxis.SetText("Line End") ucrInputLineEndTickMarks.SetParameter(New RParameter("lineend")) ' dctucrInputLineEnd.Add("NULL", Chr(34) & "NULL" & Chr(34)) dctucrInputLineEnd.Add("round", Chr(34) & "round" & Chr(34)) @@ -148,18 +162,24 @@ Public Class sdgThemes ucrInputLineEndTickMarks.bUpdateRCodeFromControl = False 'X axis Label Top Axis + ucrChkSizeTopXAxis.SetText("Size") ucrNudSizeTopaxis.SetParameter(New RParameter("size")) ucrNudSizeTopaxis.Increment = 0.1 + ucrChkAngleTopXAxis.SetText("Angle") ucrNudAngleTopAxis.SetParameter(New RParameter("angle")) ucrNudAngleTopAxis.SetMinMax(0, 360) + ucrChkHjustTopXAxis.SetText("Hjust") ucrNudHjustTopAxis.SetParameter(New RParameter("hjust")) ucrNudHjustTopAxis.Increment = 0.1 ucrNudHjustTopAxis.SetMinMax(0, 1) + ucrChkVjustTopXAxis.SetText("Vjust") ucrNudVjustTopAxis.SetParameter(New RParameter("vjust")) ucrNudVjustTopAxis.Increment = 0.1 ucrNudVjustTopAxis.SetMinMax(0, 1) + ucrChkLineHeightTopXAxis.SetText("Line Height") ucrNudLineHeightTopAxis.SetParameter(New RParameter("lineheight")) + ucrChkFaceTopXAxis.SetText("Face") ucrInputFaceTopAxis.SetParameter(New RParameter("face")) dctucrInputFaceTopAxis.Add("Plain", Chr(34) & "plain" & Chr(34)) dctucrInputFaceTopAxis.Add("Bold", Chr(34) & "bold" & Chr(34)) @@ -168,6 +188,7 @@ Public Class sdgThemes ucrInputFaceTopAxis.SetItems(dctucrInputFaceTopAxis) ucrInputFaceTopAxis.SetRDefault(Chr(34) & "plain" & Chr(34)) + ucrChkColourTopXAxis.SetText("colour") ucrInputColourTopAxis.SetParameter(New RParameter("colour")) dctucrInputColourTopAxis.Add("Black", Chr(34) & "black" & Chr(34)) dctucrInputColourTopAxis.Add("Red", Chr(34) & "red" & Chr(34)) @@ -179,6 +200,7 @@ Public Class sdgThemes ucrInputColourTopAxis.SetRDefault(Chr(34) & "black" & Chr(34)) ucrInputColourTopAxis.bUpdateRCodeFromControl = False + ucrChkFamilyTopXAxis.SetText("Family") ucrInputFamilyTopAxis.SetParameter(New RParameter("family")) dctucrInputFamilyTopAxis.Add("Times Roman", Chr(34) & "Times" & Chr(34)) dctucrInputFamilyTopAxis.Add("Courier", Chr(34) & "Courier" & Chr(34)) @@ -204,6 +226,7 @@ Public Class sdgThemes ucrInputFamilyTopAxis.bUpdateRCodeFromControl = False 'Tick Marks Along Axes + ucrChkSizeTickLabelsXAxis.SetText("Size") ucrNudSizeXTickLabels.SetParameter(New RParameter("size")) ucrNudSizeXTickLabels.Increment = 0.1 ucrInputLineTypeXTickMarks.SetParameter(New RParameter("linetype")) @@ -222,16 +245,18 @@ Public Class sdgThemes ucrInputLineTypeXTickMarks.SetRDefault(Chr(34) & "blank" & Chr(34)) ucrInputLineTypeXTickMarks.bUpdateRCodeFromControl = False + ucrChkColourTickLabelsXAxis.SetText("Colour") ucrInputColourXTickMarks.SetParameter(New RParameter("colour")) - dctucrInputColourXTickMarkst.Add("Black", Chr(34) & "black" & Chr(34)) - dctucrInputColourXTickMarkst.Add("Red", Chr(34) & "red" & Chr(34)) - dctucrInputColourXTickMarkst.Add("Blue", Chr(34) & "blue" & Chr(34)) - dctucrInputColourXTickMarkst.Add("Grey", Chr(34) & "grey" & Chr(34)) - dctucrInputColourXTickMarkst.Add("Yellow", Chr(34) & "yellow" & Chr(34)) - dctucrInputColourXTickMarkst.Add("Yellow-Green", Chr(34) & "yellowgreen" & Chr(34)) - ucrInputColourXTickMarks.SetItems(dctucrInputColourXTickMarkst) + dctucrInputColourXTickMarks.Add("Black", Chr(34) & "black" & Chr(34)) + dctucrInputColourXTickMarks.Add("Red", Chr(34) & "red" & Chr(34)) + dctucrInputColourXTickMarks.Add("Blue", Chr(34) & "blue" & Chr(34)) + dctucrInputColourXTickMarks.Add("Grey", Chr(34) & "grey" & Chr(34)) + dctucrInputColourXTickMarks.Add("Yellow", Chr(34) & "yellow" & Chr(34)) + dctucrInputColourXTickMarks.Add("Yellow-Green", Chr(34) & "yellowgreen" & Chr(34)) + ucrInputColourXTickMarks.SetItems(dctucrInputColourXTickMarks) ucrInputColourXTickMarks.SetRDefault(Chr(34) & "black" & Chr(34)) + ucrChkLineEndTickLabelsXAxis.SetText("Line End") ucrInputLineEndXTickMarks.SetParameter(New RParameter("lineend")) 'dctucrInputLineEndXTickMarks.Add("None", Chr(34) & "NULL" & Chr(34)) dctucrInputLineEndXTickMarks.Add("round", Chr(34) & "round" & Chr(34)) @@ -241,6 +266,225 @@ Public Class sdgThemes ucrInputLineEndXTickMarks.SetRDefault(Chr(34) & "square" & Chr(34)) ucrInputLineEndXTickMarks.bUpdateRCodeFromControl = False + 'Linking + ucrChkSize.AddToLinkedControls(ucrNudsize, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) + ucrChkHjust.AddToLinkedControls(ucrNudHjust, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) + ucrChkVjust.AddToLinkedControls(ucrNudVjust, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) + ucrChkLineHeight.AddToLinkedControls(ucrNudLineHeight, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) + ucrChkAngle.AddToLinkedControls(ucrNudAngle, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) + ucrChkFace.AddToLinkedControls(ucrInputFace, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) + ucrChkFamily.AddToLinkedControls(ucrInputFamily, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) + ucrChkColour.AddToLinkedControls(ucrInputColour, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) + + ucrChkSizeTopXAxis.AddToLinkedControls(ucrNudSizeTopaxis, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) + ucrChkHjustTopXAxis.AddToLinkedControls(ucrNudHjustTopAxis, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) + ucrChkVjustTopXAxis.AddToLinkedControls(ucrNudVjustTopAxis, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) + ucrChkLineHeightTopXAxis.AddToLinkedControls(ucrNudLineHeightTopAxis, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) + ucrChkAngleTopXAxis.AddToLinkedControls(ucrNudAngleTopAxis, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) + ucrChkFaceTopXAxis.AddToLinkedControls(ucrInputFaceTopAxis, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) + ucrChkFamilyTopXAxis.AddToLinkedControls(ucrInputFamilyTopAxis, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) + ucrChkColourTopXAxis.AddToLinkedControls(ucrInputColourTopAxis, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) + + 'Y-axis Label + ucrNudSizeYAxis.SetParameter(New RParameter("size")) + ucrNudLAngleYAxis.SetParameter(New RParameter("angle")) + ucrNudLAngleYAxis.SetMinMax(0, 360) + ucrNudHjustYAxis.SetParameter(New RParameter("hjust")) + ucrNudHjustYAxis.Increment = 0.1 + ucrNudHjustYAxis.SetMinMax(0, 1) + ucrNudVjustYAxis.SetParameter(New RParameter("vjust")) + ucrNudVjustYAxis.Increment = 0.1 + ucrNudVjustYAxis.SetMinMax(0, 1) + ucrNudLineHeightYAxis.SetParameter(New RParameter("lineheight")) + + ucrInputFaceYAxis.SetParameter(New RParameter("face")) + dctucrInputFaceYAxis.Add("Plain", Chr(34) & "plain" & Chr(34)) + dctucrInputFaceYAxis.Add("Bold", Chr(34) & "bold" & Chr(34)) + dctucrInputFaceYAxis.Add("Italic", Chr(34) & "italic" & Chr(34)) + dctucrInputFaceYAxis.Add("Bold italic", Chr(34) & "bold.italic" & Chr(34)) + ucrInputFaceYAxis.SetItems(dctucrInputFaceYAxis) + ucrInputFaceYAxis.SetRDefault(Chr(34) & "plain" & Chr(34)) + + ucrInputColourYAxis.SetParameter(New RParameter("colour")) + dctucrInputColourYAxis.Add("Black", Chr(34) & "black" & Chr(34)) + dctucrInputColourYAxis.Add("Red", Chr(34) & "red" & Chr(34)) + dctucrInputColourYAxis.Add("Blue", Chr(34) & "blue" & Chr(34)) + dctucrInputColourYAxis.Add("Grey", Chr(34) & "grey" & Chr(34)) + dctucrInputColourYAxis.Add("Yellow", Chr(34) & "yellow" & Chr(34)) + dctucrInputColourYAxis.Add("Yellow-Green", Chr(34) & "yellowgreen" & Chr(34)) + ucrInputColourYAxis.SetItems(dctucrInputColourYAxis) + ucrInputColourYAxis.SetRDefault(Chr(34) & "black" & Chr(34)) + ucrInputColourYAxis.bUpdateRCodeFromControl = False + + ucrInputFamilyYAxis.SetParameter(New RParameter("family")) + dctucrInputFamilyYAxis.Add("Times Roman", Chr(34) & "Times" & Chr(34)) + dctucrInputFamilyYAxis.Add("Courier", Chr(34) & "Courier" & Chr(34)) + dctucrInputFamilyYAxis.Add("Couriersans", Chr(34) & "Couriersans" & Chr(34)) + dctucrInputFamilyYAxis.Add("Serif", Chr(34) & "serif" & Chr(34)) + dctucrInputFamilyYAxis.Add("NimbusSanCond", Chr(34) & "NimbusSanCond" & Chr(34)) + dctucrInputFamilyYAxis.Add("CenturySch", Chr(34) & "CenturySch" & Chr(34)) + dctucrInputFamilyYAxis.Add("NewCenturySchoolbook", Chr(34) & "NewCenturySchoolbook" & Chr(34)) + dctucrInputFamilyYAxis.Add("Palatino", Chr(34) & "Palatino" & Chr(34)) + dctucrInputFamilyYAxis.Add("Bookman", Chr(34) & "Bookman" & Chr(34)) + dctucrInputFamilyYAxis.Add("URWBookman", Chr(34) & "URWBookman" & Chr(34)) + dctucrInputFamilyYAxis.Add("URWGothic", Chr(34) & "URWGothic" & Chr(34)) + dctucrInputFamilyYAxis.Add("NimbusRom", Chr(34) & "NimbusRom" & Chr(34)) + dctucrInputFamilyYAxis.Add("URWPalladioURWTimes", Chr(34) & "URWPalladioURWTimes" & Chr(34)) + dctucrInputFamilyYAxis.Add("NimbusMonURWHelvetica", Chr(34) & "NimbusMonURWHelvetica" & Chr(34)) + dctucrInputFamilyYAxis.Add("Helvetica - Narrow", Chr(34) & "Helvetica - Narrow" & Chr(34)) + dctucrInputFamilyYAxis.Add("Helveticaserif", Chr(34) & "Helveticaserif" & Chr(34)) + dctucrInputFamilyYAxis.Add("Short", Chr(34) & "Short" & Chr(34)) + dctucrInputFamilyYAxis.Add("Canonicalmono", Chr(34) & "Canonicalmono" & Chr(34)) + dctucrInputFamilyYAxis.Add("AvantGarde", Chr(34) & "AvantGarde" & Chr(34)) + ucrInputFamilyYAxis.SetItems(dctucrInputFamilyYAxis) + ucrInputFamilyYAxis.SetRDefault(Chr(34) & "Times" & Chr(34)) + ucrInputFamilyYAxis.bUpdateRCodeFromControl = False + + 'Tick Marks Along-Axes + ucrNudSizeTickMarksYAxis.SetParameter(New RParameter("size")) + ucrNudSizeTickMarksYAxis.Increment = 0.1 + + ucrInputLineTypeTickLabelsYAxis.SetParameter(New RParameter("linetype")) + dctucrInputLineTypeTickLabelsYAxis.Add("Blank", Chr(34) & "blank" & Chr(34)) + dctucrInputLineTypeTickLabelsYAxis.Add("Solid", Chr(34) & "solid" & Chr(34)) + dctucrInputLineTypeTickLabelsYAxis.Add("Dashed", Chr(34) & "dashed" & Chr(34)) + dctucrInputLineTypeTickLabelsYAxis.Add("Dotted", Chr(34) & "dotted" & Chr(34)) + dctucrInputLineTypeTickLabelsYAxis.Add("Dot-dash", Chr(34) & "dotdash" & Chr(34)) + dctucrInputLineTypeTickLabelsYAxis.Add("Long-dash", Chr(34) & "longdash" & Chr(34)) + dctucrInputLineTypeTickLabelsYAxis.Add("Two-Dash", Chr(34) & "twodash" & Chr(34)) + dctucrInputLineTypeTickLabelsYAxis.Add("1F", Chr(34) & "1F" & Chr(34)) + dctucrInputLineTypeTickLabelsYAxis.Add("F1", Chr(34) & "F1" & Chr(34)) + dctucrInputLineTypeTickLabelsYAxis.Add("4C88C488", Chr(34) & "4C88C488" & Chr(34)) + dctucrInputLineTypeTickLabelsYAxis.Add("12345678", Chr(34) & "12345678" & Chr(34)) + ucrInputLineTypeTickLabelsYAxis.SetItems(dctucrInputLineTypeTickLabelsYAxis) + ucrInputLineTypeTickLabelsYAxis.SetRDefault(Chr(34) & "blank" & Chr(34)) + ucrInputLineTypeTickLabelsYAxis.bUpdateRCodeFromControl = False + + ucrInputColourTickMarksYAxis.SetParameter(New RParameter("colour")) + dctucrInputColourTickMarksYAxis.Add("Black", Chr(34) & "black" & Chr(34)) + dctucrInputColourTickMarksYAxis.Add("Red", Chr(34) & "red" & Chr(34)) + dctucrInputColourTickMarksYAxis.Add("Blue", Chr(34) & "blue" & Chr(34)) + dctucrInputColourTickMarksYAxis.Add("Grey", Chr(34) & "grey" & Chr(34)) + dctucrInputColourTickMarksYAxis.Add("Yellow", Chr(34) & "yellow" & Chr(34)) + dctucrInputColourTickMarksYAxis.Add("Yellow-Green", Chr(34) & "yellowgreen" & Chr(34)) + ucrInputColourTickMarksYAxis.SetItems(dctucrInputColourTickMarksYAxis) + ucrInputColourTickMarksYAxis.SetRDefault(Chr(34) & "black" & Chr(34)) + + ucrInputLineEndTickLabelsYAxis.SetParameter(New RParameter("lineend")) + ' dctucrInputLineEnd.Add("NULL", Chr(34) & "NULL" & Chr(34)) + dctucrInputLineEndTickLabelsYAxis.Add("round", Chr(34) & "round" & Chr(34)) + dctucrInputLineEndTickLabelsYAxis.Add("butt", Chr(34) & "butt" & Chr(34)) + dctucrInputLineEndTickLabelsYAxis.Add("square", Chr(34) & "square" & Chr(34)) + ucrInputLineEndTickLabelsYAxis.SetItems(dctucrInputLineEndTickLabelsYAxis) + ucrInputLineEndTickLabelsYAxis.SetRDefault(Chr(34) & "square" & Chr(34)) + ucrInputLineEndTickLabelsYAxis.bUpdateRCodeFromControl = False + + 'Y axis Label Top Axis + ucrNudSizeTopYAxis.SetParameter(New RParameter("size")) + ucrNudSizeTopYAxis.Increment = 0.1 + ucrNudAngleTopYAxis.SetParameter(New RParameter("angle")) + ucrNudAngleTopYAxis.SetMinMax(0, 360) + ucrNudHjustTopYAxis.SetParameter(New RParameter("hjust")) + ucrNudHjustTopYAxis.Increment = 0.1 + ucrNudHjustTopYAxis.SetMinMax(0, 1) + ucrNudHjustTopYAxis.SetParameter(New RParameter("vjust")) + ucrNudVjustTopYAxis.Increment = 0.1 + ucrNudVjustTopYAxis.SetMinMax(0, 1) + ucrNudLineHeightTopYAxis.SetParameter(New RParameter("lineheight")) + + ucrInputFaceTopYAxis.SetParameter(New RParameter("face")) + dctucrInputFaceTopYAxis.Add("Plain", Chr(34) & "plain" & Chr(34)) + dctucrInputFaceTopYAxis.Add("Bold", Chr(34) & "bold" & Chr(34)) + dctucrInputFaceTopYAxis.Add("Italic", Chr(34) & "italic" & Chr(34)) + dctucrInputFaceTopYAxis.Add("Bold italic", Chr(34) & "bold.italic" & Chr(34)) + ucrInputFaceTopYAxis.SetItems(dctucrInputFaceTopAxis) + ucrInputFaceTopYAxis.SetRDefault(Chr(34) & "plain" & Chr(34)) + + ucrInputColourTopYAxis.SetParameter(New RParameter("colour")) + dctucrInputColourTopYAxis.Add("Black", Chr(34) & "black" & Chr(34)) + dctucrInputColourTopYAxis.Add("Red", Chr(34) & "red" & Chr(34)) + dctucrInputColourTopYAxis.Add("Blue", Chr(34) & "blue" & Chr(34)) + dctucrInputColourTopYAxis.Add("Grey", Chr(34) & "grey" & Chr(34)) + dctucrInputColourTopYAxis.Add("Yellow", Chr(34) & "yellow" & Chr(34)) + dctucrInputColourTopYAxis.Add("Yellow-Green", Chr(34) & "yellowgreen" & Chr(34)) + ucrInputColourTopYAxis.SetItems(dctucrInputColourTopYAxis) + ucrInputColourTopYAxis.SetRDefault(Chr(34) & "black" & Chr(34)) + ucrInputColourTopYAxis.bUpdateRCodeFromControl = False + + ucrInputFamilyTopYAxis.SetParameter(New RParameter("family")) + 'dctucrInputFamilyYAxisTopAxis.Add("Times Roman", Chr(34) & "Times" & Chr(34)) + dctucrInputFamilyTopYAxis.Add("Courier", Chr(34) & "Courier" & Chr(34)) + dctucrInputFamilyTopYAxis.Add("Couriersans", Chr(34) & "Couriersans" & Chr(34)) + dctucrInputFamilyTopYAxis.Add("Serif", Chr(34) & "serif" & Chr(34)) + dctucrInputFamilyTopYAxis.Add("NimbusSanCond", Chr(34) & "NimbusSanCond" & Chr(34)) + dctucrInputFamilyTopYAxis.Add("CenturySch", Chr(34) & "CenturySch" & Chr(34)) + dctucrInputFamilyTopYAxis.Add("NewCenturySchoolbook", Chr(34) & "NewCenturySchoolbook" & Chr(34)) + dctucrInputFamilyTopYAxis.Add("Palatino", Chr(34) & "Palatino" & Chr(34)) + dctucrInputFamilyTopYAxis.Add("Bookman", Chr(34) & "Bookman" & Chr(34)) + dctucrInputFamilyTopYAxis.Add("URWBookman", Chr(34) & "URWBookman" & Chr(34)) + dctucrInputFamilyTopYAxis.Add("URWGothic", Chr(34) & "URWGothic" & Chr(34)) + dctucrInputFamilyTopYAxis.Add("NimbusRom", Chr(34) & "NimbusRom" & Chr(34)) + dctucrInputFamilyTopYAxis.Add("URWPalladioURWTimes", Chr(34) & "URWPalladioURWTimes" & Chr(34)) + dctucrInputFamilyTopYAxis.Add("NimbusMonURWHelvetica", Chr(34) & "NimbusMonURWHelvetica" & Chr(34)) + dctucrInputFamilyTopYAxis.Add("Helvetica - Narrow", Chr(34) & "Helvetica - Narrow" & Chr(34)) + dctucrInputFamilyTopYAxis.Add("Helveticaserif", Chr(34) & "Helveticaserif" & Chr(34)) + dctucrInputFamilyTopYAxis.Add("Short", Chr(34) & "Short" & Chr(34)) + dctucrInputFamilyTopYAxis.Add("Canonicalmono", Chr(34) & "Canonicalmono" & Chr(34)) + dctucrInputFamilyTopYAxis.Add("AvantGarde", Chr(34) & "AvantGarde" & Chr(34)) + ucrInputFamilyTopYAxis.SetItems(dctucrInputFamilyTopYAxis) + ucrInputFamilyTopYAxis.SetRDefault(Chr(34) & "Times" & Chr(34)) + ucrInputFamilyTopYAxis.bUpdateRCodeFromControl = False + + 'Tick Marks Along Axes + ucrNudSizeTickMarksYAxis.SetParameter(New RParameter("size")) + ucrNudSizeTickMarksYAxis.Increment = 0.1 + + ucrInputLineTypeTickMarksYAxis.SetParameter(New RParameter("linetype")) + dctucrInputLineTypeTickMarksYAxis.Add("Blank", Chr(34) & "blank" & Chr(34)) + dctucrInputLineTypeTickMarksYAxis.Add("Solid", Chr(34) & "solid" & Chr(34)) + dctucrInputLineTypeTickMarksYAxis.Add("Dashed", Chr(34) & "dashed" & Chr(34)) + dctucrInputLineTypeTickMarksYAxis.Add("Dotted", Chr(34) & "dotted" & Chr(34)) + dctucrInputLineTypeTickMarksYAxis.Add("Dot-dash", Chr(34) & "dotdash" & Chr(34)) + dctucrInputLineTypeTickMarksYAxis.Add("Long-dash", Chr(34) & "longdash" & Chr(34)) + dctucrInputLineTypeTickMarksYAxis.Add("Two-Dash", Chr(34) & "twodash" & Chr(34)) + dctucrInputLineTypeTickMarksYAxis.Add("1F", Chr(34) & "1F" & Chr(34)) + dctucrInputLineTypeTickMarksYAxis.Add("F1", Chr(34) & "F1" & Chr(34)) + dctucrInputLineTypeTickMarksYAxis.Add("4C88C488", Chr(34) & "4C88C488" & Chr(34)) + dctucrInputLineTypeTickMarksYAxis.Add("12345678", Chr(34) & "12345678" & Chr(34)) + ucrInputLineTypeTickMarksYAxis.SetItems(dctucrInputLineTypeTickMarksYAxis) + ucrInputLineTypeTickMarksYAxis.SetRDefault(Chr(34) & "blank" & Chr(34)) + ucrInputLineTypeTickMarksYAxis.bUpdateRCodeFromControl = False + + 'ucrInputColourTickMarksYAxis.SetParameter(New RParameter("colour")) + 'dctucrInputColourTickMarksYAxis.Add("Black", Chr(34) & "black" & Chr(34)) + 'dctucrInputColourTickMarksYAxis.Add("Red", Chr(34) & "red" & Chr(34)) + 'dctucrInputColourTickMarksYAxis.Add("Blue", Chr(34) & "blue" & Chr(34)) + 'dctucrInputColourTickMarksYAxis.Add("Grey", Chr(34) & "grey" & Chr(34)) + 'dctucrInputColourTickMarksYAxis.Add("Yellow", Chr(34) & "yellow" & Chr(34)) + 'dctucrInputColourTickMarksYAxis.Add("Yellow-Green", Chr(34) & "yellowgreen" & Chr(34)) + 'ucrInputColourTickMarksYAxis.SetItems(dctucrInputColourTickMarksYAxis) + 'ucrInputColourTickMarksYAxis.SetRDefault(Chr(34) & "black" & Chr(34)) + + ucrInputColourTickLabelsYAxis.SetParameter(New RParameter("colour")) + dctucrInputColourTickLabelsYAxis.Add("Black", Chr(34) & "black" & Chr(34)) + dctucrInputColourTickLabelsYAxis.Add("Red", Chr(34) & "red" & Chr(34)) + dctucrInputColourTickLabelsYAxis.Add("Blue", Chr(34) & "blue" & Chr(34)) + dctucrInputColourTickLabelsYAxis.Add("Grey", Chr(34) & "grey" & Chr(34)) + dctucrInputColourTickLabelsYAxis.Add("Yellow", Chr(34) & "yellow" & Chr(34)) + dctucrInputColourTickLabelsYAxis.Add("Yellow-Green", Chr(34) & "yellowgreen" & Chr(34)) + ucrInputColourTickLabelsYAxis.SetItems(dctucrInputColourTickMarksYAxis) + ucrInputColourTickLabelsYAxis.SetRDefault(Chr(34) & "black" & Chr(34)) + ucrInputColourTickLabelsYAxis.bUpdateRCodeFromControl = False + + ucrInputLineEndTickMarksYAxis.SetParameter(New RParameter("lineend")) + 'dctucrInputLineEndXTickMarks.Add("None", Chr(34) & "NULL" & Chr(34)) + dctucrInputLineEndTickMarksYAxis.Add("round", Chr(34) & "round" & Chr(34)) + dctucrInputLineEndTickMarksYAxis.Add("butt", Chr(34) & "butt" & Chr(34)) + dctucrInputLineEndTickMarksYAxis.Add("square", Chr(34) & "square" & Chr(34)) + ucrInputLineEndTickMarksYAxis.SetItems(dctucrInputLineEndTickMarksYAxis) + ucrInputLineEndTickMarksYAxis.SetRDefault(Chr(34) & "square" & Chr(34)) + ucrInputLineEndTickMarksYAxis.bUpdateRCodeFromControl = False + bControlsInitialised = True End Sub @@ -280,33 +524,77 @@ Public Class sdgThemes 'X axis Label ucrNudAngle.SetRCode(clsElementText, bReset) + ucrChkSize.SetRCode(clsElementText, bReset) + ucrNudHjust.SetRCode(clsElementText, bReset) + ucrChkHjust.SetRCode(clsElementText, bReset) + ucrNudLineHeight.SetRCode(clsElementText, bReset) + ucrChkLineHeight.SetRCode(clsElementText, bReset) + ucrNudsize.SetRCode(clsElementText, bReset) + ucrChkSize.SetRCode(clsElementText, bReset) + ucrNudVjust.SetRCode(clsElementText, bReset) + ucrChkVjust.SetRCode(clsElementText, bReset) + ucrInputColour.SetRCode(clsElementText, bReset) + ucrChkColour.SetRCode(clsElementText, bReset) + ucrInputFace.SetRCode(clsElementText, bReset) + ucrChkFace.SetRCode(clsElementText, bReset) + ucrInputFamily.SetRCode(clsElementText, bReset) + ucrChkFamily.SetRCode(clsElementText, bReset) 'X axis Label Top Axis ucrNudSizeTickMarks.SetRCode(clsElementLine, bReset) + ucrChkSizeTickMarksXAxis.SetRCode(clsElementLine, bReset) + ucrInputColourTickMarks.SetRCode(clsElementLine, bReset) + ucrChkColourTickMarksXAxis.SetRCode(clsElementLine, bReset) + ucrInputLineTypeTickMarks.SetRCode(clsElementLine, bReset) + ucrChkLineTypeTickMarksXAxis.SetRCode(clsElementLine, bReset) + ucrInputLineEndTickMarks.SetRCode(clsElementLine, bReset) + ucrChkLineEndTickMarksXAxis.SetRCode(clsElementLine, bReset) ucrNudAngleTopAxis.SetRCode(clsElementTextTop, bReset) + ucrChkAngleTopXAxis.SetRCode(clsElementTextTop, bReset) + ucrNudHjustTopAxis.SetRCode(clsElementTextTop, bReset) + ucrChkHjustTopXAxis.SetRCode(clsElementTextTop, bReset) + ucrNudLineHeightTopAxis.SetRCode(clsElementTextTop, bReset) + ucrChkLineHeightTopXAxis.SetRCode(clsElementTextTop, bReset) + ucrNudSizeTopaxis.SetRCode(clsElementTextTop, bReset) + ucrChkSizeTopXAxis.SetRCode(clsElementTextTop, bReset) + ucrNudVjustTopAxis.SetRCode(clsElementTextTop, bReset) + ucrChkVjustTopXAxis.SetRCode(clsElementTextTop, bReset) + ucrInputColourTopAxis.SetRCode(clsElementTextTop, bReset) + ucrChkColourTopXAxis.SetRCode(clsElementTextTop, bReset) + ucrInputFaceTopAxis.SetRCode(clsElementTextTop, bReset) + ucrChkFaceTopXAxis.SetRCode(clsElementTextTop, bReset) + ucrInputFamilyTopAxis.SetRCode(clsElementTextTop, bReset) + ucrChkFamilyTopXAxis.SetRCode(clsElementTextTop, bReset) ucrNudSizeXTickLabels.SetRCode(clsElementLine, bReset) + ucrChkSizeTickLabelsXAxis.SetRCode(clsElementLine, bReset) + ucrInputColourXTickMarks.SetRCode(clsElementLine, bReset) + ucrChkColourTickMarksXAxis.SetRCode(clsElementLine, bReset) + ucrInputLineTypeXTickMarks.SetRCode(clsElementLine, bReset) + ucrChkLineTypeTickMarksXAxis.SetRCode(clsElementLine, bReset) + ucrInputLineEndXTickMarks.SetRCode(clsElementLine, bReset) + ucrChkLineEndTickMarksXAxis.SetRCode(clsElementLine, bReset) End Sub End Class \ No newline at end of file From 5b13edfb97e9623033f846b44a560fe3a86bed5c Mon Sep 17 00:00:00 2001 From: Steven Date: Sat, 3 Jun 2017 18:31:58 +0300 Subject: [PATCH 080/154] edits --- instat/sdgThemes.Designer.vb | 170 +++++++++++++++++------------------ instat/sdgThemes.vb | 57 +++++++----- 2 files changed, 121 insertions(+), 106 deletions(-) diff --git a/instat/sdgThemes.Designer.vb b/instat/sdgThemes.Designer.vb index 38a209a8fb6..465a57d9a84 100644 --- a/instat/sdgThemes.Designer.vb +++ b/instat/sdgThemes.Designer.vb @@ -30,10 +30,10 @@ Partial Class sdgThemes Me.ucrChkSizeTickLabelsXAxis = New instat.ucrCheck() Me.ucrChkLineTypeTickLabelsXAxis = New instat.ucrCheck() Me.ucrChkColourTickLabelsXAxis = New instat.ucrCheck() - Me.ucrInputLineEndXTickMarks = New instat.ucrInputComboBox() - Me.ucrNudSizeXTickLabels = New instat.ucrNud() - Me.ucrInputColourXTickMarks = New instat.ucrInputComboBox() - Me.ucrInputLineTypeXTickMarks = New instat.ucrInputComboBox() + Me.ucrInputLineEndTickLabelsXAxis = New instat.ucrInputComboBox() + Me.ucrNudSizeTickLabelsXAxis = New instat.ucrNud() + Me.ucrInputColourTickLabelsXAxis = New instat.ucrInputComboBox() + Me.ucrInputLineTypeTickLabelsXAxis = New instat.ucrInputComboBox() Me.grpAxisLabelTopAxis = New System.Windows.Forms.GroupBox() Me.ucrChkColourTopXAxis = New instat.ucrCheck() Me.ucrChkFaceTopXAxis = New instat.ucrCheck() @@ -185,10 +185,10 @@ Partial Class sdgThemes Me.grpTickLabels.Controls.Add(Me.ucrChkSizeTickLabelsXAxis) Me.grpTickLabels.Controls.Add(Me.ucrChkLineTypeTickLabelsXAxis) Me.grpTickLabels.Controls.Add(Me.ucrChkColourTickLabelsXAxis) - Me.grpTickLabels.Controls.Add(Me.ucrInputLineEndXTickMarks) - Me.grpTickLabels.Controls.Add(Me.ucrNudSizeXTickLabels) - Me.grpTickLabels.Controls.Add(Me.ucrInputColourXTickMarks) - Me.grpTickLabels.Controls.Add(Me.ucrInputLineTypeXTickMarks) + Me.grpTickLabels.Controls.Add(Me.ucrInputLineEndTickLabelsXAxis) + Me.grpTickLabels.Controls.Add(Me.ucrNudSizeTickLabelsXAxis) + Me.grpTickLabels.Controls.Add(Me.ucrInputColourTickLabelsXAxis) + Me.grpTickLabels.Controls.Add(Me.ucrInputLineTypeTickLabelsXAxis) Me.grpTickLabels.Location = New System.Drawing.Point(282, 273) Me.grpTickLabels.Name = "grpTickLabels" Me.grpTickLabels.Size = New System.Drawing.Size(264, 154) @@ -199,7 +199,7 @@ Partial Class sdgThemes 'ucrChkLineEndTickLabelsXAxis ' Me.ucrChkLineEndTickLabelsXAxis.Checked = False - Me.ucrChkLineEndTickLabelsXAxis.Location = New System.Drawing.Point(19, 104) + Me.ucrChkLineEndTickLabelsXAxis.Location = New System.Drawing.Point(11, 104) Me.ucrChkLineEndTickLabelsXAxis.Name = "ucrChkLineEndTickLabelsXAxis" Me.ucrChkLineEndTickLabelsXAxis.Size = New System.Drawing.Size(100, 20) Me.ucrChkLineEndTickLabelsXAxis.TabIndex = 54 @@ -207,7 +207,7 @@ Partial Class sdgThemes 'ucrChkSizeTickLabelsXAxis ' Me.ucrChkSizeTickLabelsXAxis.Checked = False - Me.ucrChkSizeTickLabelsXAxis.Location = New System.Drawing.Point(19, 20) + Me.ucrChkSizeTickLabelsXAxis.Location = New System.Drawing.Point(11, 20) Me.ucrChkSizeTickLabelsXAxis.Name = "ucrChkSizeTickLabelsXAxis" Me.ucrChkSizeTickLabelsXAxis.Size = New System.Drawing.Size(100, 20) Me.ucrChkSizeTickLabelsXAxis.TabIndex = 53 @@ -215,7 +215,7 @@ Partial Class sdgThemes 'ucrChkLineTypeTickLabelsXAxis ' Me.ucrChkLineTypeTickLabelsXAxis.Checked = False - Me.ucrChkLineTypeTickLabelsXAxis.Location = New System.Drawing.Point(19, 45) + Me.ucrChkLineTypeTickLabelsXAxis.Location = New System.Drawing.Point(11, 45) Me.ucrChkLineTypeTickLabelsXAxis.Name = "ucrChkLineTypeTickLabelsXAxis" Me.ucrChkLineTypeTickLabelsXAxis.Size = New System.Drawing.Size(100, 20) Me.ucrChkLineTypeTickLabelsXAxis.TabIndex = 52 @@ -223,52 +223,52 @@ Partial Class sdgThemes 'ucrChkColourTickLabelsXAxis ' Me.ucrChkColourTickLabelsXAxis.Checked = False - Me.ucrChkColourTickLabelsXAxis.Location = New System.Drawing.Point(19, 72) + Me.ucrChkColourTickLabelsXAxis.Location = New System.Drawing.Point(11, 72) Me.ucrChkColourTickLabelsXAxis.Name = "ucrChkColourTickLabelsXAxis" Me.ucrChkColourTickLabelsXAxis.Size = New System.Drawing.Size(100, 20) Me.ucrChkColourTickLabelsXAxis.TabIndex = 51 ' - 'ucrInputLineEndXTickMarks - ' - Me.ucrInputLineEndXTickMarks.AddQuotesIfUnrecognised = True - Me.ucrInputLineEndXTickMarks.IsReadOnly = False - Me.ucrInputLineEndXTickMarks.Location = New System.Drawing.Point(122, 102) - Me.ucrInputLineEndXTickMarks.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) - Me.ucrInputLineEndXTickMarks.Name = "ucrInputLineEndXTickMarks" - Me.ucrInputLineEndXTickMarks.Size = New System.Drawing.Size(137, 21) - Me.ucrInputLineEndXTickMarks.TabIndex = 32 - ' - 'ucrNudSizeXTickLabels - ' - Me.ucrNudSizeXTickLabels.DecimalPlaces = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudSizeXTickLabels.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudSizeXTickLabels.Location = New System.Drawing.Point(144, 17) - Me.ucrNudSizeXTickLabels.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) - Me.ucrNudSizeXTickLabels.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) - Me.ucrNudSizeXTickLabels.Name = "ucrNudSizeXTickLabels" - Me.ucrNudSizeXTickLabels.Size = New System.Drawing.Size(50, 20) - Me.ucrNudSizeXTickLabels.TabIndex = 30 - Me.ucrNudSizeXTickLabels.Value = New Decimal(New Integer() {0, 0, 0, 0}) - ' - 'ucrInputColourXTickMarks - ' - Me.ucrInputColourXTickMarks.AddQuotesIfUnrecognised = True - Me.ucrInputColourXTickMarks.IsReadOnly = False - Me.ucrInputColourXTickMarks.Location = New System.Drawing.Point(122, 70) - Me.ucrInputColourXTickMarks.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) - Me.ucrInputColourXTickMarks.Name = "ucrInputColourXTickMarks" - Me.ucrInputColourXTickMarks.Size = New System.Drawing.Size(137, 21) - Me.ucrInputColourXTickMarks.TabIndex = 28 - ' - 'ucrInputLineTypeXTickMarks - ' - Me.ucrInputLineTypeXTickMarks.AddQuotesIfUnrecognised = True - Me.ucrInputLineTypeXTickMarks.IsReadOnly = False - Me.ucrInputLineTypeXTickMarks.Location = New System.Drawing.Point(122, 42) - Me.ucrInputLineTypeXTickMarks.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) - Me.ucrInputLineTypeXTickMarks.Name = "ucrInputLineTypeXTickMarks" - Me.ucrInputLineTypeXTickMarks.Size = New System.Drawing.Size(137, 21) - Me.ucrInputLineTypeXTickMarks.TabIndex = 26 + 'ucrInputLineEndTickLabelsXAxis + ' + Me.ucrInputLineEndTickLabelsXAxis.AddQuotesIfUnrecognised = True + Me.ucrInputLineEndTickLabelsXAxis.IsReadOnly = False + Me.ucrInputLineEndTickLabelsXAxis.Location = New System.Drawing.Point(117, 103) + Me.ucrInputLineEndTickLabelsXAxis.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) + Me.ucrInputLineEndTickLabelsXAxis.Name = "ucrInputLineEndTickLabelsXAxis" + Me.ucrInputLineEndTickLabelsXAxis.Size = New System.Drawing.Size(137, 21) + Me.ucrInputLineEndTickLabelsXAxis.TabIndex = 32 + ' + 'ucrNudSizeTickLabelsXAxis + ' + Me.ucrNudSizeTickLabelsXAxis.DecimalPlaces = New Decimal(New Integer() {1, 0, 0, 0}) + Me.ucrNudSizeTickLabelsXAxis.Increment = New Decimal(New Integer() {1, 0, 0, 0}) + Me.ucrNudSizeTickLabelsXAxis.Location = New System.Drawing.Point(116, 19) + Me.ucrNudSizeTickLabelsXAxis.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) + Me.ucrNudSizeTickLabelsXAxis.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudSizeTickLabelsXAxis.Name = "ucrNudSizeTickLabelsXAxis" + Me.ucrNudSizeTickLabelsXAxis.Size = New System.Drawing.Size(50, 20) + Me.ucrNudSizeTickLabelsXAxis.TabIndex = 30 + Me.ucrNudSizeTickLabelsXAxis.Value = New Decimal(New Integer() {0, 0, 0, 0}) + ' + 'ucrInputColourTickLabelsXAxis + ' + Me.ucrInputColourTickLabelsXAxis.AddQuotesIfUnrecognised = True + Me.ucrInputColourTickLabelsXAxis.IsReadOnly = False + Me.ucrInputColourTickLabelsXAxis.Location = New System.Drawing.Point(117, 72) + Me.ucrInputColourTickLabelsXAxis.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) + Me.ucrInputColourTickLabelsXAxis.Name = "ucrInputColourTickLabelsXAxis" + Me.ucrInputColourTickLabelsXAxis.Size = New System.Drawing.Size(137, 21) + Me.ucrInputColourTickLabelsXAxis.TabIndex = 28 + ' + 'ucrInputLineTypeTickLabelsXAxis + ' + Me.ucrInputLineTypeTickLabelsXAxis.AddQuotesIfUnrecognised = True + Me.ucrInputLineTypeTickLabelsXAxis.IsReadOnly = False + Me.ucrInputLineTypeTickLabelsXAxis.Location = New System.Drawing.Point(117, 44) + Me.ucrInputLineTypeTickLabelsXAxis.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) + Me.ucrInputLineTypeTickLabelsXAxis.Name = "ucrInputLineTypeTickLabelsXAxis" + Me.ucrInputLineTypeTickLabelsXAxis.Size = New System.Drawing.Size(137, 21) + Me.ucrInputLineTypeTickLabelsXAxis.TabIndex = 26 ' 'grpAxisLabelTopAxis ' @@ -298,7 +298,7 @@ Partial Class sdgThemes 'ucrChkColourTopXAxis ' Me.ucrChkColourTopXAxis.Checked = False - Me.ucrChkColourTopXAxis.Location = New System.Drawing.Point(10, 215) + Me.ucrChkColourTopXAxis.Location = New System.Drawing.Point(10, 209) Me.ucrChkColourTopXAxis.Name = "ucrChkColourTopXAxis" Me.ucrChkColourTopXAxis.Size = New System.Drawing.Size(100, 20) Me.ucrChkColourTopXAxis.TabIndex = 53 @@ -306,7 +306,7 @@ Partial Class sdgThemes 'ucrChkFaceTopXAxis ' Me.ucrChkFaceTopXAxis.Checked = False - Me.ucrChkFaceTopXAxis.Location = New System.Drawing.Point(10, 187) + Me.ucrChkFaceTopXAxis.Location = New System.Drawing.Point(10, 182) Me.ucrChkFaceTopXAxis.Name = "ucrChkFaceTopXAxis" Me.ucrChkFaceTopXAxis.Size = New System.Drawing.Size(100, 20) Me.ucrChkFaceTopXAxis.TabIndex = 52 @@ -314,7 +314,7 @@ Partial Class sdgThemes 'ucrChkFamilyTopXAxis ' Me.ucrChkFamilyTopXAxis.Checked = False - Me.ucrChkFamilyTopXAxis.Location = New System.Drawing.Point(10, 159) + Me.ucrChkFamilyTopXAxis.Location = New System.Drawing.Point(10, 155) Me.ucrChkFamilyTopXAxis.Name = "ucrChkFamilyTopXAxis" Me.ucrChkFamilyTopXAxis.Size = New System.Drawing.Size(100, 20) Me.ucrChkFamilyTopXAxis.TabIndex = 51 @@ -322,7 +322,7 @@ Partial Class sdgThemes 'ucrChkAngleTopXAxis ' Me.ucrChkAngleTopXAxis.Checked = False - Me.ucrChkAngleTopXAxis.Location = New System.Drawing.Point(10, 131) + Me.ucrChkAngleTopXAxis.Location = New System.Drawing.Point(10, 128) Me.ucrChkAngleTopXAxis.Name = "ucrChkAngleTopXAxis" Me.ucrChkAngleTopXAxis.Size = New System.Drawing.Size(100, 20) Me.ucrChkAngleTopXAxis.TabIndex = 50 @@ -338,7 +338,7 @@ Partial Class sdgThemes 'ucrChkVjustTopXAxis ' Me.ucrChkVjustTopXAxis.Checked = False - Me.ucrChkVjustTopXAxis.Location = New System.Drawing.Point(10, 75) + Me.ucrChkVjustTopXAxis.Location = New System.Drawing.Point(10, 74) Me.ucrChkVjustTopXAxis.Name = "ucrChkVjustTopXAxis" Me.ucrChkVjustTopXAxis.Size = New System.Drawing.Size(100, 20) Me.ucrChkVjustTopXAxis.TabIndex = 48 @@ -346,7 +346,7 @@ Partial Class sdgThemes 'ucrChkLineHeightTopXAxis ' Me.ucrChkLineHeightTopXAxis.Checked = False - Me.ucrChkLineHeightTopXAxis.Location = New System.Drawing.Point(10, 103) + Me.ucrChkLineHeightTopXAxis.Location = New System.Drawing.Point(10, 101) Me.ucrChkLineHeightTopXAxis.Name = "ucrChkLineHeightTopXAxis" Me.ucrChkLineHeightTopXAxis.Size = New System.Drawing.Size(100, 20) Me.ucrChkLineHeightTopXAxis.TabIndex = 47 @@ -354,7 +354,7 @@ Partial Class sdgThemes 'ucrChkSizeTopXAxis ' Me.ucrChkSizeTopXAxis.Checked = False - Me.ucrChkSizeTopXAxis.Location = New System.Drawing.Point(10, 19) + Me.ucrChkSizeTopXAxis.Location = New System.Drawing.Point(10, 20) Me.ucrChkSizeTopXAxis.Name = "ucrChkSizeTopXAxis" Me.ucrChkSizeTopXAxis.Size = New System.Drawing.Size(100, 20) Me.ucrChkSizeTopXAxis.TabIndex = 46 @@ -363,7 +363,7 @@ Partial Class sdgThemes ' Me.ucrNudVjustTopAxis.DecimalPlaces = New Decimal(New Integer() {1, 0, 0, 0}) Me.ucrNudVjustTopAxis.Increment = New Decimal(New Integer() {1, 0, 0, 65536}) - Me.ucrNudVjustTopAxis.Location = New System.Drawing.Point(115, 76) + Me.ucrNudVjustTopAxis.Location = New System.Drawing.Point(115, 74) Me.ucrNudVjustTopAxis.Maximum = New Decimal(New Integer() {1, 0, 0, 0}) Me.ucrNudVjustTopAxis.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudVjustTopAxis.Name = "ucrNudVjustTopAxis" @@ -375,7 +375,7 @@ Partial Class sdgThemes ' Me.ucrNudLineHeightTopAxis.DecimalPlaces = New Decimal(New Integer() {1, 0, 0, 0}) Me.ucrNudLineHeightTopAxis.Increment = New Decimal(New Integer() {1, 0, 0, 65536}) - Me.ucrNudLineHeightTopAxis.Location = New System.Drawing.Point(115, 106) + Me.ucrNudLineHeightTopAxis.Location = New System.Drawing.Point(115, 99) Me.ucrNudLineHeightTopAxis.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) Me.ucrNudLineHeightTopAxis.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudLineHeightTopAxis.Name = "ucrNudLineHeightTopAxis" @@ -387,7 +387,7 @@ Partial Class sdgThemes ' Me.ucrNudAngleTopAxis.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudAngleTopAxis.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudAngleTopAxis.Location = New System.Drawing.Point(115, 134) + Me.ucrNudAngleTopAxis.Location = New System.Drawing.Point(115, 128) Me.ucrNudAngleTopAxis.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) Me.ucrNudAngleTopAxis.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudAngleTopAxis.Name = "ucrNudAngleTopAxis" @@ -399,7 +399,7 @@ Partial Class sdgThemes ' Me.ucrNudHjustTopAxis.DecimalPlaces = New Decimal(New Integer() {1, 0, 0, 0}) Me.ucrNudHjustTopAxis.Increment = New Decimal(New Integer() {1, 0, 0, 65536}) - Me.ucrNudHjustTopAxis.Location = New System.Drawing.Point(115, 46) + Me.ucrNudHjustTopAxis.Location = New System.Drawing.Point(115, 47) Me.ucrNudHjustTopAxis.Maximum = New Decimal(New Integer() {1, 0, 0, 0}) Me.ucrNudHjustTopAxis.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudHjustTopAxis.Name = "ucrNudHjustTopAxis" @@ -411,7 +411,7 @@ Partial Class sdgThemes ' Me.ucrNudSizeTopaxis.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudSizeTopaxis.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudSizeTopaxis.Location = New System.Drawing.Point(115, 16) + Me.ucrNudSizeTopaxis.Location = New System.Drawing.Point(115, 20) Me.ucrNudSizeTopaxis.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) Me.ucrNudSizeTopaxis.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudSizeTopaxis.Name = "ucrNudSizeTopaxis" @@ -423,7 +423,7 @@ Partial Class sdgThemes ' Me.ucrInputColourTopAxis.AddQuotesIfUnrecognised = True Me.ucrInputColourTopAxis.IsReadOnly = False - Me.ucrInputColourTopAxis.Location = New System.Drawing.Point(115, 217) + Me.ucrInputColourTopAxis.Location = New System.Drawing.Point(116, 208) Me.ucrInputColourTopAxis.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) Me.ucrInputColourTopAxis.Name = "ucrInputColourTopAxis" Me.ucrInputColourTopAxis.Size = New System.Drawing.Size(137, 21) @@ -433,7 +433,7 @@ Partial Class sdgThemes ' Me.ucrInputFaceTopAxis.AddQuotesIfUnrecognised = True Me.ucrInputFaceTopAxis.IsReadOnly = False - Me.ucrInputFaceTopAxis.Location = New System.Drawing.Point(115, 189) + Me.ucrInputFaceTopAxis.Location = New System.Drawing.Point(115, 181) Me.ucrInputFaceTopAxis.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) Me.ucrInputFaceTopAxis.Name = "ucrInputFaceTopAxis" Me.ucrInputFaceTopAxis.Size = New System.Drawing.Size(137, 21) @@ -443,7 +443,7 @@ Partial Class sdgThemes ' Me.ucrInputFamilyTopAxis.AddQuotesIfUnrecognised = True Me.ucrInputFamilyTopAxis.IsReadOnly = False - Me.ucrInputFamilyTopAxis.Location = New System.Drawing.Point(115, 162) + Me.ucrInputFamilyTopAxis.Location = New System.Drawing.Point(115, 154) Me.ucrInputFamilyTopAxis.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) Me.ucrInputFamilyTopAxis.Name = "ucrInputFamilyTopAxis" Me.ucrInputFamilyTopAxis.Size = New System.Drawing.Size(137, 21) @@ -502,7 +502,7 @@ Partial Class sdgThemes ' Me.ucrInputLineEndTickMarks.AddQuotesIfUnrecognised = True Me.ucrInputLineEndTickMarks.IsReadOnly = False - Me.ucrInputLineEndTickMarks.Location = New System.Drawing.Point(118, 110) + Me.ucrInputLineEndTickMarks.Location = New System.Drawing.Point(111, 110) Me.ucrInputLineEndTickMarks.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) Me.ucrInputLineEndTickMarks.Name = "ucrInputLineEndTickMarks" Me.ucrInputLineEndTickMarks.Size = New System.Drawing.Size(137, 21) @@ -512,7 +512,7 @@ Partial Class sdgThemes ' Me.ucrNudSizeTickMarks.DecimalPlaces = New Decimal(New Integer() {1, 0, 0, 0}) Me.ucrNudSizeTickMarks.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudSizeTickMarks.Location = New System.Drawing.Point(140, 24) + Me.ucrNudSizeTickMarks.Location = New System.Drawing.Point(111, 24) Me.ucrNudSizeTickMarks.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) Me.ucrNudSizeTickMarks.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudSizeTickMarks.Name = "ucrNudSizeTickMarks" @@ -524,7 +524,7 @@ Partial Class sdgThemes ' Me.ucrInputColourTickMarks.AddQuotesIfUnrecognised = True Me.ucrInputColourTickMarks.IsReadOnly = False - Me.ucrInputColourTickMarks.Location = New System.Drawing.Point(118, 82) + Me.ucrInputColourTickMarks.Location = New System.Drawing.Point(111, 81) Me.ucrInputColourTickMarks.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) Me.ucrInputColourTickMarks.Name = "ucrInputColourTickMarks" Me.ucrInputColourTickMarks.Size = New System.Drawing.Size(137, 21) @@ -534,7 +534,7 @@ Partial Class sdgThemes ' Me.ucrInputLineTypeTickMarks.AddQuotesIfUnrecognised = True Me.ucrInputLineTypeTickMarks.IsReadOnly = False - Me.ucrInputLineTypeTickMarks.Location = New System.Drawing.Point(118, 52) + Me.ucrInputLineTypeTickMarks.Location = New System.Drawing.Point(111, 52) Me.ucrInputLineTypeTickMarks.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) Me.ucrInputLineTypeTickMarks.Name = "ucrInputLineTypeTickMarks" Me.ucrInputLineTypeTickMarks.Size = New System.Drawing.Size(137, 21) @@ -618,7 +618,7 @@ Partial Class sdgThemes Me.ucrChkLineHeight.Checked = False Me.ucrChkLineHeight.Location = New System.Drawing.Point(11, 101) Me.ucrChkLineHeight.Name = "ucrChkLineHeight" - Me.ucrChkLineHeight.Size = New System.Drawing.Size(100, 20) + Me.ucrChkLineHeight.Size = New System.Drawing.Size(96, 18) Me.ucrChkLineHeight.TabIndex = 47 ' 'ucrChkSize @@ -633,7 +633,7 @@ Partial Class sdgThemes ' Me.ucrNudVjust.DecimalPlaces = New Decimal(New Integer() {1, 0, 0, 0}) Me.ucrNudVjust.Increment = New Decimal(New Integer() {1, 0, 0, 65536}) - Me.ucrNudVjust.Location = New System.Drawing.Point(113, 76) + Me.ucrNudVjust.Location = New System.Drawing.Point(111, 74) Me.ucrNudVjust.Maximum = New Decimal(New Integer() {1, 0, 0, 0}) Me.ucrNudVjust.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudVjust.Name = "ucrNudVjust" @@ -645,7 +645,7 @@ Partial Class sdgThemes ' Me.ucrNudLineHeight.DecimalPlaces = New Decimal(New Integer() {1, 0, 0, 0}) Me.ucrNudLineHeight.Increment = New Decimal(New Integer() {1, 0, 0, 65536}) - Me.ucrNudLineHeight.Location = New System.Drawing.Point(113, 106) + Me.ucrNudLineHeight.Location = New System.Drawing.Point(111, 99) Me.ucrNudLineHeight.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) Me.ucrNudLineHeight.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudLineHeight.Name = "ucrNudLineHeight" @@ -657,7 +657,7 @@ Partial Class sdgThemes ' Me.ucrNudAngle.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudAngle.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudAngle.Location = New System.Drawing.Point(113, 136) + Me.ucrNudAngle.Location = New System.Drawing.Point(111, 128) Me.ucrNudAngle.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) Me.ucrNudAngle.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudAngle.Name = "ucrNudAngle" @@ -669,7 +669,7 @@ Partial Class sdgThemes ' Me.ucrNudHjust.DecimalPlaces = New Decimal(New Integer() {1, 0, 0, 0}) Me.ucrNudHjust.Increment = New Decimal(New Integer() {1, 0, 0, 65536}) - Me.ucrNudHjust.Location = New System.Drawing.Point(113, 46) + Me.ucrNudHjust.Location = New System.Drawing.Point(111, 47) Me.ucrNudHjust.Maximum = New Decimal(New Integer() {1, 0, 0, 0}) Me.ucrNudHjust.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudHjust.Name = "ucrNudHjust" @@ -681,7 +681,7 @@ Partial Class sdgThemes ' 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(113, 16) + Me.ucrNudsize.Location = New System.Drawing.Point(111, 20) 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" @@ -693,7 +693,7 @@ Partial Class sdgThemes ' Me.ucrInputColour.AddQuotesIfUnrecognised = True Me.ucrInputColour.IsReadOnly = False - Me.ucrInputColour.Location = New System.Drawing.Point(113, 217) + Me.ucrInputColour.Location = New System.Drawing.Point(111, 208) Me.ucrInputColour.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) Me.ucrInputColour.Name = "ucrInputColour" Me.ucrInputColour.Size = New System.Drawing.Size(137, 21) @@ -703,7 +703,7 @@ Partial Class sdgThemes ' Me.ucrInputFace.AddQuotesIfUnrecognised = True Me.ucrInputFace.IsReadOnly = False - Me.ucrInputFace.Location = New System.Drawing.Point(113, 189) + Me.ucrInputFace.Location = New System.Drawing.Point(111, 181) Me.ucrInputFace.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) Me.ucrInputFace.Name = "ucrInputFace" Me.ucrInputFace.Size = New System.Drawing.Size(137, 21) @@ -713,7 +713,7 @@ Partial Class sdgThemes ' Me.ucrInputFamily.AddQuotesIfUnrecognised = True Me.ucrInputFamily.IsReadOnly = False - Me.ucrInputFamily.Location = New System.Drawing.Point(113, 162) + Me.ucrInputFamily.Location = New System.Drawing.Point(111, 154) Me.ucrInputFamily.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) Me.ucrInputFamily.Name = "ucrInputFamily" Me.ucrInputFamily.Size = New System.Drawing.Size(137, 21) @@ -1338,10 +1338,10 @@ Partial Class sdgThemes Friend WithEvents ucrInputFaceTopAxis As ucrInputComboBox Friend WithEvents ucrInputFamilyTopAxis As ucrInputComboBox Friend WithEvents grpTickLabels As GroupBox - Friend WithEvents ucrInputLineEndXTickMarks As ucrInputComboBox - Friend WithEvents ucrNudSizeXTickLabels As ucrNud - Friend WithEvents ucrInputColourXTickMarks As ucrInputComboBox - Friend WithEvents ucrInputLineTypeXTickMarks As ucrInputComboBox + Friend WithEvents ucrInputLineEndTickLabelsXAxis As ucrInputComboBox + Friend WithEvents ucrNudSizeTickLabelsXAxis As ucrNud + Friend WithEvents ucrInputColourTickLabelsXAxis As ucrInputComboBox + Friend WithEvents ucrInputLineTypeTickLabelsXAxis As ucrInputComboBox Friend WithEvents grpTickLabelYAxis As GroupBox Friend WithEvents ucrInputLineEndTickLabelsYAxis As ucrInputComboBox Friend WithEvents ucrNudSizeTickLabelsYAxis As ucrNud diff --git a/instat/sdgThemes.vb b/instat/sdgThemes.vb index 8210c833f5f..2d91c09f2cb 100644 --- a/instat/sdgThemes.vb +++ b/instat/sdgThemes.vb @@ -123,6 +123,7 @@ Public Class sdgThemes ucrNudSizeTickMarks.SetParameter(New RParameter("size")) ucrNudSizeTickMarks.Increment = 0.1 + ucrChkLineTypeTickMarksXAxis.SetText("Line Type") ucrInputLineTypeTickMarks.SetParameter(New RParameter("linetype")) dctucrInputLineType.Add("Blank", Chr(34) & "blank" & Chr(34)) @@ -227,9 +228,11 @@ Public Class sdgThemes 'Tick Marks Along Axes ucrChkSizeTickLabelsXAxis.SetText("Size") - ucrNudSizeXTickLabels.SetParameter(New RParameter("size")) - ucrNudSizeXTickLabels.Increment = 0.1 - ucrInputLineTypeXTickMarks.SetParameter(New RParameter("linetype")) + ucrNudSizeTickLabelsXAxis.SetParameter(New RParameter("size")) + ucrNudSizeTickLabelsXAxis.Increment = 0.1 + + ucrChkLineTypeTickLabelsXAxis.SetText("Line Type") + ucrInputLineTypeTickLabelsXAxis.SetParameter(New RParameter("linetype")) dctucrInputLineTypeXTickMarks.Add("Blank", Chr(34) & "blank" & Chr(34)) dctucrInputLineTypeXTickMarks.Add("Solid", Chr(34) & "solid" & Chr(34)) dctucrInputLineTypeXTickMarks.Add("Dashed", Chr(34) & "dashed" & Chr(34)) @@ -241,30 +244,30 @@ Public Class sdgThemes dctucrInputLineTypeXTickMarks.Add("F1", Chr(34) & "F1" & Chr(34)) dctucrInputLineTypeXTickMarks.Add("4C88C488", Chr(34) & "4C88C488" & Chr(34)) dctucrInputLineTypeXTickMarks.Add("12345678", Chr(34) & "12345678" & Chr(34)) - ucrInputLineTypeXTickMarks.SetItems(dctucrInputLineTypeXTickMarks) - ucrInputLineTypeXTickMarks.SetRDefault(Chr(34) & "blank" & Chr(34)) - ucrInputLineTypeXTickMarks.bUpdateRCodeFromControl = False + ucrInputLineTypeTickLabelsXAxis.SetItems(dctucrInputLineTypeXTickMarks) + ucrInputLineTypeTickLabelsXAxis.SetRDefault(Chr(34) & "blank" & Chr(34)) + ucrInputLineTypeTickLabelsXAxis.bUpdateRCodeFromControl = False ucrChkColourTickLabelsXAxis.SetText("Colour") - ucrInputColourXTickMarks.SetParameter(New RParameter("colour")) + ucrInputColourTickLabelsXAxis.SetParameter(New RParameter("colour")) dctucrInputColourXTickMarks.Add("Black", Chr(34) & "black" & Chr(34)) dctucrInputColourXTickMarks.Add("Red", Chr(34) & "red" & Chr(34)) dctucrInputColourXTickMarks.Add("Blue", Chr(34) & "blue" & Chr(34)) dctucrInputColourXTickMarks.Add("Grey", Chr(34) & "grey" & Chr(34)) dctucrInputColourXTickMarks.Add("Yellow", Chr(34) & "yellow" & Chr(34)) dctucrInputColourXTickMarks.Add("Yellow-Green", Chr(34) & "yellowgreen" & Chr(34)) - ucrInputColourXTickMarks.SetItems(dctucrInputColourXTickMarks) - ucrInputColourXTickMarks.SetRDefault(Chr(34) & "black" & Chr(34)) + ucrInputColourTickLabelsXAxis.SetItems(dctucrInputColourXTickMarks) + ucrInputColourTickLabelsXAxis.SetRDefault(Chr(34) & "black" & Chr(34)) ucrChkLineEndTickLabelsXAxis.SetText("Line End") - ucrInputLineEndXTickMarks.SetParameter(New RParameter("lineend")) + ucrInputLineEndTickLabelsXAxis.SetParameter(New RParameter("lineend")) 'dctucrInputLineEndXTickMarks.Add("None", Chr(34) & "NULL" & Chr(34)) dctucrInputLineEndXTickMarks.Add("round", Chr(34) & "round" & Chr(34)) dctucrInputLineEndXTickMarks.Add("butt", Chr(34) & "butt" & Chr(34)) dctucrInputLineEndXTickMarks.Add("square", Chr(34) & "square" & Chr(34)) - ucrInputLineEndXTickMarks.SetItems(dctucrInputLineEndXTickMarks) - ucrInputLineEndXTickMarks.SetRDefault(Chr(34) & "square" & Chr(34)) - ucrInputLineEndXTickMarks.bUpdateRCodeFromControl = False + ucrInputLineEndTickLabelsXAxis.SetItems(dctucrInputLineEndXTickMarks) + ucrInputLineEndTickLabelsXAxis.SetRDefault(Chr(34) & "square" & Chr(34)) + ucrInputLineEndTickLabelsXAxis.bUpdateRCodeFromControl = False 'Linking ucrChkSize.AddToLinkedControls(ucrNudsize, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) @@ -285,6 +288,16 @@ Public Class sdgThemes ucrChkFamilyTopXAxis.AddToLinkedControls(ucrInputFamilyTopAxis, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) ucrChkColourTopXAxis.AddToLinkedControls(ucrInputColourTopAxis, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) + ucrChkSizeTickMarksXAxis.AddToLinkedControls(ucrNudSizeTickMarks, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) + ucrChkLineTypeTickMarksXAxis.AddToLinkedControls(ucrInputLineTypeTickMarks, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) + ucrChkLineEndTickMarksXAxis.AddToLinkedControls(ucrInputLineEndTickMarks, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) + ucrChkColourTickMarksXAxis.AddToLinkedControls(ucrInputColourTickMarks, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) + + ucrChkSizeTickLabelsXAxis.AddToLinkedControls(ucrNudSizeTickLabelsXAxis, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) + ucrChkLineTypeTickLabelsXAxis.AddToLinkedControls(ucrInputLineTypeTickLabelsXAxis, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) + ucrChkLineEndTickLabelsXAxis.AddToLinkedControls(ucrInputLineEndTickLabelsXAxis, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) + ucrChkColourTickLabelsXAxis.AddToLinkedControls(ucrInputColourTickLabelsXAxis, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) + 'Y-axis Label ucrNudSizeYAxis.SetParameter(New RParameter("size")) ucrNudLAngleYAxis.SetParameter(New RParameter("angle")) @@ -524,7 +537,7 @@ Public Class sdgThemes 'X axis Label ucrNudAngle.SetRCode(clsElementText, bReset) - ucrChkSize.SetRCode(clsElementText, bReset) + ucrChkAngle.SetRCode(clsElementText, bReset) ucrNudHjust.SetRCode(clsElementText, bReset) ucrChkHjust.SetRCode(clsElementText, bReset) @@ -584,17 +597,19 @@ Public Class sdgThemes ucrInputFamilyTopAxis.SetRCode(clsElementTextTop, bReset) ucrChkFamilyTopXAxis.SetRCode(clsElementTextTop, bReset) - ucrNudSizeXTickLabels.SetRCode(clsElementLine, bReset) + ucrNudSizeTickLabelsXAxis.SetRCode(clsElementLine, bReset) ucrChkSizeTickLabelsXAxis.SetRCode(clsElementLine, bReset) - ucrInputColourXTickMarks.SetRCode(clsElementLine, bReset) - ucrChkColourTickMarksXAxis.SetRCode(clsElementLine, bReset) + ucrInputColourTickLabelsXAxis.SetRCode(clsElementLine, bReset) + ucrChkColourTickLabelsXAxis.SetRCode(clsElementLine, bReset) + + ucrInputLineTypeTickLabelsXAxis.SetRCode(clsElementLine, bReset) + ucrChkLineTypeTickLabelsXAxis.SetRCode(clsElementLine, bReset) + + ucrInputLineEndTickLabelsXAxis.SetRCode(clsElementLine, bReset) + ucrChkLineEndTickLabelsXAxis.SetRCode(clsElementLine, bReset) - ucrInputLineTypeXTickMarks.SetRCode(clsElementLine, bReset) - ucrChkLineTypeTickMarksXAxis.SetRCode(clsElementLine, bReset) - ucrInputLineEndXTickMarks.SetRCode(clsElementLine, bReset) - ucrChkLineEndTickMarksXAxis.SetRCode(clsElementLine, bReset) End Sub End Class \ No newline at end of file From b70a711530ae4e094870531a1995e1188adeea90 Mon Sep 17 00:00:00 2001 From: Steven Date: Sun, 4 Jun 2017 08:18:58 +0300 Subject: [PATCH 081/154] Y tab code additions --- instat/sdgThemes.Designer.vb | 746 +++++++++++++++++------------------ instat/sdgThemes.vb | 318 ++++++++++----- 2 files changed, 593 insertions(+), 471 deletions(-) diff --git a/instat/sdgThemes.Designer.vb b/instat/sdgThemes.Designer.vb index 465a57d9a84..1f3c65e6aa7 100644 --- a/instat/sdgThemes.Designer.vb +++ b/instat/sdgThemes.Designer.vb @@ -79,52 +79,52 @@ Partial Class sdgThemes Me.ucrInputFamily = New instat.ucrInputComboBox() Me.tbYaxis = New System.Windows.Forms.TabPage() Me.grpTickLabelYAxis = New System.Windows.Forms.GroupBox() - Me.UcrCheck45 = New instat.ucrCheck() - Me.UcrCheck46 = New instat.ucrCheck() - Me.UcrCheck47 = New instat.ucrCheck() - Me.UcrCheck48 = New instat.ucrCheck() + Me.ucrChkLineEndTickLabelsYAxis = New instat.ucrCheck() + Me.ucrChkSizeTickLabelsYAxis = New instat.ucrCheck() + Me.ucrChkLineTypeTickLabelsYAxis = New instat.ucrCheck() + Me.ucrChkColourTickLabelsYAxis = New instat.ucrCheck() Me.ucrInputLineEndTickLabelsYAxis = New instat.ucrInputComboBox() Me.ucrNudSizeTickLabelsYAxis = New instat.ucrNud() Me.ucrInputColourTickLabelsYAxis = New instat.ucrInputComboBox() Me.ucrInputLineTypeTickLabelsYAxis = New instat.ucrInputComboBox() Me.grpYAxisTopLabels = New System.Windows.Forms.GroupBox() - Me.UcrCheck9 = New instat.ucrCheck() - Me.UcrCheck10 = New instat.ucrCheck() - Me.UcrCheck11 = New instat.ucrCheck() - Me.UcrCheck12 = New instat.ucrCheck() - Me.UcrCheck13 = New instat.ucrCheck() - Me.UcrCheck14 = New instat.ucrCheck() - Me.UcrCheck15 = New instat.ucrCheck() - Me.UcrCheck16 = New instat.ucrCheck() - Me.ucrNudVjustTopYAxis = New instat.ucrNud() - Me.ucrNudLineHeightTopYAxis = New instat.ucrNud() - Me.ucrNudAngleTopYAxis = New instat.ucrNud() - Me.ucrNudHjustTopYAxis = New instat.ucrNud() - Me.ucrNudSizeTopYAxis = New instat.ucrNud() - Me.ucrInputColourTopYAxis = New instat.ucrInputComboBox() - Me.ucrInputFaceTopYAxis = New instat.ucrInputComboBox() - Me.ucrInputFamilyTopYAxis = New instat.ucrInputComboBox() + Me.ucrChkColourRightYAxis = New instat.ucrCheck() + Me.ucrChkFaceRightYAxis = New instat.ucrCheck() + Me.ucrChkFamilyRightYAxis = New instat.ucrCheck() + Me.ucrChkAngleRightYAxis = New instat.ucrCheck() + Me.ucrChkHjustRightYAxis = New instat.ucrCheck() + Me.ucrChkVjustRightYAxis = New instat.ucrCheck() + Me.ucrChkLineHeightRightYAxis = New instat.ucrCheck() + Me.ucrChkSizeRightYAxis = New instat.ucrCheck() + Me.ucrNudVjustRightYAxis = New instat.ucrNud() + Me.ucrNudLineHeightRightYAxis = New instat.ucrNud() + Me.ucrNudAngleRightYAxis = New instat.ucrNud() + Me.ucrNudHjustRightYAxis = New instat.ucrNud() + Me.ucrNudSizeRightYAxis = New instat.ucrNud() + Me.ucrInputColourRightYAxis = New instat.ucrInputComboBox() + Me.ucrInputFaceRightYAxis = New instat.ucrInputComboBox() + Me.ucrInputFamilyRightYAxis = New instat.ucrInputComboBox() Me.grpTickMarksYAxis = New System.Windows.Forms.GroupBox() - Me.UcrCheck41 = New instat.ucrCheck() - Me.UcrCheck42 = New instat.ucrCheck() - Me.UcrCheck43 = New instat.ucrCheck() - Me.UcrCheck44 = New instat.ucrCheck() + Me.ucrChkLineEndTickMarksYAxis = New instat.ucrCheck() + Me.ucrChkSizeTickMarksYAxis = New instat.ucrCheck() + Me.ucrChkLineTypeTickMarksYAxis = New instat.ucrCheck() + Me.ucrChkColourTickMarksYAxis = New instat.ucrCheck() Me.ucrInputLineEndTickMarksYAxis = New instat.ucrInputComboBox() Me.ucrNudSizeTickMarksYAxis = New instat.ucrNud() Me.ucrInputColourTickMarksYAxis = New instat.ucrInputComboBox() Me.ucrInputLineTypeTickMarksYAxis = New instat.ucrInputComboBox() Me.grpYAxisLabels = New System.Windows.Forms.GroupBox() - Me.UcrCheck8 = New instat.ucrCheck() - Me.UcrCheck7 = New instat.ucrCheck() - Me.UcrCheck6 = New instat.ucrCheck() - Me.UcrCheck5 = New instat.ucrCheck() - Me.UcrCheck4 = New instat.ucrCheck() - Me.UcrCheck3 = New instat.ucrCheck() - Me.UcrCheck2 = New instat.ucrCheck() - Me.UcrCheck1 = New instat.ucrCheck() + Me.ucrChkColourYAxis = New instat.ucrCheck() + Me.ucrChkFaceYAxis = New instat.ucrCheck() + Me.ucrChkFamilyYAxis = New instat.ucrCheck() + Me.ucrChkAngleYAxis = New instat.ucrCheck() + Me.ucrChkHjustYAxis = New instat.ucrCheck() + Me.ucrChkVjustYAxis = New instat.ucrCheck() + Me.ucrChkLineHeightYAxis = New instat.ucrCheck() + Me.ucrChkSizeYAxis = New instat.ucrCheck() Me.ucrNudVjustYAxis = New instat.ucrNud() Me.ucrNudLineHeightYAxis = New instat.ucrNud() - Me.ucrNudLAngleYAxis = New instat.ucrNud() + Me.ucrNudAngleYAxis = New instat.ucrNud() Me.ucrNudHjustYAxis = New instat.ucrNud() Me.ucrNudSizeYAxis = New instat.ucrNud() Me.ucrInputColourYAxis = New instat.ucrInputComboBox() @@ -735,58 +735,58 @@ Partial Class sdgThemes ' 'grpTickLabelYAxis ' - Me.grpTickLabelYAxis.Controls.Add(Me.UcrCheck45) - Me.grpTickLabelYAxis.Controls.Add(Me.UcrCheck46) - Me.grpTickLabelYAxis.Controls.Add(Me.UcrCheck47) - Me.grpTickLabelYAxis.Controls.Add(Me.UcrCheck48) + Me.grpTickLabelYAxis.Controls.Add(Me.ucrChkLineEndTickLabelsYAxis) + Me.grpTickLabelYAxis.Controls.Add(Me.ucrChkSizeTickLabelsYAxis) + Me.grpTickLabelYAxis.Controls.Add(Me.ucrChkLineTypeTickLabelsYAxis) + Me.grpTickLabelYAxis.Controls.Add(Me.ucrChkColourTickLabelsYAxis) Me.grpTickLabelYAxis.Controls.Add(Me.ucrInputLineEndTickLabelsYAxis) Me.grpTickLabelYAxis.Controls.Add(Me.ucrNudSizeTickLabelsYAxis) Me.grpTickLabelYAxis.Controls.Add(Me.ucrInputColourTickLabelsYAxis) Me.grpTickLabelYAxis.Controls.Add(Me.ucrInputLineTypeTickLabelsYAxis) - Me.grpTickLabelYAxis.Location = New System.Drawing.Point(262, 263) + Me.grpTickLabelYAxis.Location = New System.Drawing.Point(263, 256) Me.grpTickLabelYAxis.Name = "grpTickLabelYAxis" Me.grpTickLabelYAxis.Size = New System.Drawing.Size(264, 154) Me.grpTickLabelYAxis.TabIndex = 43 Me.grpTickLabelYAxis.TabStop = False Me.grpTickLabelYAxis.Text = "Y axis tick labels" ' - 'UcrCheck45 + 'ucrChkLineEndTickLabelsYAxis ' - Me.UcrCheck45.Checked = False - Me.UcrCheck45.Location = New System.Drawing.Point(14, 111) - Me.UcrCheck45.Name = "UcrCheck45" - Me.UcrCheck45.Size = New System.Drawing.Size(100, 20) - Me.UcrCheck45.TabIndex = 58 + Me.ucrChkLineEndTickLabelsYAxis.Checked = False + Me.ucrChkLineEndTickLabelsYAxis.Location = New System.Drawing.Point(13, 107) + Me.ucrChkLineEndTickLabelsYAxis.Name = "ucrChkLineEndTickLabelsYAxis" + Me.ucrChkLineEndTickLabelsYAxis.Size = New System.Drawing.Size(100, 20) + Me.ucrChkLineEndTickLabelsYAxis.TabIndex = 58 ' - 'UcrCheck46 + 'ucrChkSizeTickLabelsYAxis ' - Me.UcrCheck46.Checked = False - Me.UcrCheck46.Location = New System.Drawing.Point(14, 24) - Me.UcrCheck46.Name = "UcrCheck46" - Me.UcrCheck46.Size = New System.Drawing.Size(100, 20) - Me.UcrCheck46.TabIndex = 57 + Me.ucrChkSizeTickLabelsYAxis.Checked = False + Me.ucrChkSizeTickLabelsYAxis.Location = New System.Drawing.Point(13, 20) + Me.ucrChkSizeTickLabelsYAxis.Name = "ucrChkSizeTickLabelsYAxis" + Me.ucrChkSizeTickLabelsYAxis.Size = New System.Drawing.Size(100, 20) + Me.ucrChkSizeTickLabelsYAxis.TabIndex = 57 ' - 'UcrCheck47 + 'ucrChkLineTypeTickLabelsYAxis ' - Me.UcrCheck47.Checked = False - Me.UcrCheck47.Location = New System.Drawing.Point(14, 53) - Me.UcrCheck47.Name = "UcrCheck47" - Me.UcrCheck47.Size = New System.Drawing.Size(100, 20) - Me.UcrCheck47.TabIndex = 56 + Me.ucrChkLineTypeTickLabelsYAxis.Checked = False + Me.ucrChkLineTypeTickLabelsYAxis.Location = New System.Drawing.Point(13, 49) + Me.ucrChkLineTypeTickLabelsYAxis.Name = "ucrChkLineTypeTickLabelsYAxis" + Me.ucrChkLineTypeTickLabelsYAxis.Size = New System.Drawing.Size(100, 20) + Me.ucrChkLineTypeTickLabelsYAxis.TabIndex = 56 ' - 'UcrCheck48 + 'ucrChkColourTickLabelsYAxis ' - Me.UcrCheck48.Checked = False - Me.UcrCheck48.Location = New System.Drawing.Point(14, 82) - Me.UcrCheck48.Name = "UcrCheck48" - Me.UcrCheck48.Size = New System.Drawing.Size(100, 20) - Me.UcrCheck48.TabIndex = 55 + Me.ucrChkColourTickLabelsYAxis.Checked = False + Me.ucrChkColourTickLabelsYAxis.Location = New System.Drawing.Point(13, 78) + Me.ucrChkColourTickLabelsYAxis.Name = "ucrChkColourTickLabelsYAxis" + Me.ucrChkColourTickLabelsYAxis.Size = New System.Drawing.Size(100, 20) + Me.ucrChkColourTickLabelsYAxis.TabIndex = 55 ' 'ucrInputLineEndTickLabelsYAxis ' Me.ucrInputLineEndTickLabelsYAxis.AddQuotesIfUnrecognised = True Me.ucrInputLineEndTickLabelsYAxis.IsReadOnly = False - Me.ucrInputLineEndTickLabelsYAxis.Location = New System.Drawing.Point(115, 100) + Me.ucrInputLineEndTickLabelsYAxis.Location = New System.Drawing.Point(114, 106) Me.ucrInputLineEndTickLabelsYAxis.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) Me.ucrInputLineEndTickLabelsYAxis.Name = "ucrInputLineEndTickLabelsYAxis" Me.ucrInputLineEndTickLabelsYAxis.Size = New System.Drawing.Size(137, 21) @@ -796,7 +796,7 @@ Partial Class sdgThemes ' Me.ucrNudSizeTickLabelsYAxis.DecimalPlaces = New Decimal(New Integer() {1, 0, 0, 0}) Me.ucrNudSizeTickLabelsYAxis.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudSizeTickLabelsYAxis.Location = New System.Drawing.Point(137, 17) + Me.ucrNudSizeTickLabelsYAxis.Location = New System.Drawing.Point(114, 19) Me.ucrNudSizeTickLabelsYAxis.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) Me.ucrNudSizeTickLabelsYAxis.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudSizeTickLabelsYAxis.Name = "ucrNudSizeTickLabelsYAxis" @@ -808,7 +808,7 @@ Partial Class sdgThemes ' Me.ucrInputColourTickLabelsYAxis.AddQuotesIfUnrecognised = True Me.ucrInputColourTickLabelsYAxis.IsReadOnly = False - Me.ucrInputColourTickLabelsYAxis.Location = New System.Drawing.Point(115, 68) + Me.ucrInputColourTickLabelsYAxis.Location = New System.Drawing.Point(114, 77) Me.ucrInputColourTickLabelsYAxis.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) Me.ucrInputColourTickLabelsYAxis.Name = "ucrInputColourTickLabelsYAxis" Me.ucrInputColourTickLabelsYAxis.Size = New System.Drawing.Size(137, 21) @@ -818,7 +818,7 @@ Partial Class sdgThemes ' Me.ucrInputLineTypeTickLabelsYAxis.AddQuotesIfUnrecognised = True Me.ucrInputLineTypeTickLabelsYAxis.IsReadOnly = False - Me.ucrInputLineTypeTickLabelsYAxis.Location = New System.Drawing.Point(115, 40) + Me.ucrInputLineTypeTickLabelsYAxis.Location = New System.Drawing.Point(114, 48) Me.ucrInputLineTypeTickLabelsYAxis.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) Me.ucrInputLineTypeTickLabelsYAxis.Name = "ucrInputLineTypeTickLabelsYAxis" Me.ucrInputLineTypeTickLabelsYAxis.Size = New System.Drawing.Size(137, 21) @@ -826,22 +826,22 @@ Partial Class sdgThemes ' 'grpYAxisTopLabels ' - Me.grpYAxisTopLabels.Controls.Add(Me.UcrCheck9) - Me.grpYAxisTopLabels.Controls.Add(Me.UcrCheck10) - Me.grpYAxisTopLabels.Controls.Add(Me.UcrCheck11) - Me.grpYAxisTopLabels.Controls.Add(Me.UcrCheck12) - Me.grpYAxisTopLabels.Controls.Add(Me.UcrCheck13) - Me.grpYAxisTopLabels.Controls.Add(Me.UcrCheck14) - Me.grpYAxisTopLabels.Controls.Add(Me.UcrCheck15) - Me.grpYAxisTopLabels.Controls.Add(Me.UcrCheck16) - Me.grpYAxisTopLabels.Controls.Add(Me.ucrNudVjustTopYAxis) - Me.grpYAxisTopLabels.Controls.Add(Me.ucrNudLineHeightTopYAxis) - Me.grpYAxisTopLabels.Controls.Add(Me.ucrNudAngleTopYAxis) - Me.grpYAxisTopLabels.Controls.Add(Me.ucrNudHjustTopYAxis) - Me.grpYAxisTopLabels.Controls.Add(Me.ucrNudSizeTopYAxis) - Me.grpYAxisTopLabels.Controls.Add(Me.ucrInputColourTopYAxis) - Me.grpYAxisTopLabels.Controls.Add(Me.ucrInputFaceTopYAxis) - Me.grpYAxisTopLabels.Controls.Add(Me.ucrInputFamilyTopYAxis) + Me.grpYAxisTopLabels.Controls.Add(Me.ucrChkColourRightYAxis) + Me.grpYAxisTopLabels.Controls.Add(Me.ucrChkFaceRightYAxis) + Me.grpYAxisTopLabels.Controls.Add(Me.ucrChkFamilyRightYAxis) + Me.grpYAxisTopLabels.Controls.Add(Me.ucrChkAngleRightYAxis) + Me.grpYAxisTopLabels.Controls.Add(Me.ucrChkHjustRightYAxis) + Me.grpYAxisTopLabels.Controls.Add(Me.ucrChkVjustRightYAxis) + Me.grpYAxisTopLabels.Controls.Add(Me.ucrChkLineHeightRightYAxis) + Me.grpYAxisTopLabels.Controls.Add(Me.ucrChkSizeRightYAxis) + Me.grpYAxisTopLabels.Controls.Add(Me.ucrNudVjustRightYAxis) + Me.grpYAxisTopLabels.Controls.Add(Me.ucrNudLineHeightRightYAxis) + Me.grpYAxisTopLabels.Controls.Add(Me.ucrNudAngleRightYAxis) + Me.grpYAxisTopLabels.Controls.Add(Me.ucrNudHjustRightYAxis) + Me.grpYAxisTopLabels.Controls.Add(Me.ucrNudSizeRightYAxis) + Me.grpYAxisTopLabels.Controls.Add(Me.ucrInputColourRightYAxis) + Me.grpYAxisTopLabels.Controls.Add(Me.ucrInputFaceRightYAxis) + Me.grpYAxisTopLabels.Controls.Add(Me.ucrInputFamilyRightYAxis) Me.grpYAxisTopLabels.Location = New System.Drawing.Point(262, 5) Me.grpYAxisTopLabels.Name = "grpYAxisTopLabels" Me.grpYAxisTopLabels.Size = New System.Drawing.Size(264, 245) @@ -849,166 +849,166 @@ Partial Class sdgThemes Me.grpYAxisTopLabels.TabStop = False Me.grpYAxisTopLabels.Text = "Y axis label on top axis" ' - 'UcrCheck9 - ' - Me.UcrCheck9.Checked = False - Me.UcrCheck9.Location = New System.Drawing.Point(14, 213) - Me.UcrCheck9.Name = "UcrCheck9" - Me.UcrCheck9.Size = New System.Drawing.Size(100, 20) - Me.UcrCheck9.TabIndex = 53 - ' - 'UcrCheck10 - ' - Me.UcrCheck10.Checked = False - Me.UcrCheck10.Location = New System.Drawing.Point(14, 184) - Me.UcrCheck10.Name = "UcrCheck10" - Me.UcrCheck10.Size = New System.Drawing.Size(100, 20) - Me.UcrCheck10.TabIndex = 52 - ' - 'UcrCheck11 - ' - Me.UcrCheck11.Checked = False - Me.UcrCheck11.Location = New System.Drawing.Point(14, 161) - Me.UcrCheck11.Name = "UcrCheck11" - Me.UcrCheck11.Size = New System.Drawing.Size(100, 20) - Me.UcrCheck11.TabIndex = 51 - ' - 'UcrCheck12 - ' - Me.UcrCheck12.Checked = False - Me.UcrCheck12.Location = New System.Drawing.Point(14, 128) - Me.UcrCheck12.Name = "UcrCheck12" - Me.UcrCheck12.Size = New System.Drawing.Size(100, 20) - Me.UcrCheck12.TabIndex = 50 - ' - 'UcrCheck13 - ' - Me.UcrCheck13.Checked = False - Me.UcrCheck13.Location = New System.Drawing.Point(14, 41) - Me.UcrCheck13.Name = "UcrCheck13" - Me.UcrCheck13.Size = New System.Drawing.Size(100, 20) - Me.UcrCheck13.TabIndex = 49 - ' - 'UcrCheck14 - ' - Me.UcrCheck14.Checked = False - Me.UcrCheck14.Location = New System.Drawing.Point(14, 67) - Me.UcrCheck14.Name = "UcrCheck14" - Me.UcrCheck14.Size = New System.Drawing.Size(100, 20) - Me.UcrCheck14.TabIndex = 48 - ' - 'UcrCheck15 - ' - Me.UcrCheck15.Checked = False - Me.UcrCheck15.Location = New System.Drawing.Point(14, 93) - Me.UcrCheck15.Name = "UcrCheck15" - Me.UcrCheck15.Size = New System.Drawing.Size(100, 20) - Me.UcrCheck15.TabIndex = 47 - ' - 'UcrCheck16 - ' - Me.UcrCheck16.Checked = False - Me.UcrCheck16.Location = New System.Drawing.Point(14, 11) - Me.UcrCheck16.Name = "UcrCheck16" - Me.UcrCheck16.Size = New System.Drawing.Size(100, 20) - Me.UcrCheck16.TabIndex = 46 - ' - 'ucrNudVjustTopYAxis - ' - Me.ucrNudVjustTopYAxis.DecimalPlaces = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudVjustTopYAxis.Increment = New Decimal(New Integer() {1, 0, 0, 65536}) - Me.ucrNudVjustTopYAxis.Location = New System.Drawing.Point(117, 76) - Me.ucrNudVjustTopYAxis.Maximum = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudVjustTopYAxis.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) - Me.ucrNudVjustTopYAxis.Name = "ucrNudVjustTopYAxis" - Me.ucrNudVjustTopYAxis.Size = New System.Drawing.Size(50, 20) - Me.ucrNudVjustTopYAxis.TabIndex = 38 - Me.ucrNudVjustTopYAxis.Value = New Decimal(New Integer() {0, 0, 0, 0}) - ' - 'ucrNudLineHeightTopYAxis - ' - Me.ucrNudLineHeightTopYAxis.DecimalPlaces = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudLineHeightTopYAxis.Increment = New Decimal(New Integer() {1, 0, 0, 65536}) - Me.ucrNudLineHeightTopYAxis.Location = New System.Drawing.Point(117, 106) - Me.ucrNudLineHeightTopYAxis.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) - Me.ucrNudLineHeightTopYAxis.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) - Me.ucrNudLineHeightTopYAxis.Name = "ucrNudLineHeightTopYAxis" - Me.ucrNudLineHeightTopYAxis.Size = New System.Drawing.Size(50, 20) - Me.ucrNudLineHeightTopYAxis.TabIndex = 36 - Me.ucrNudLineHeightTopYAxis.Value = New Decimal(New Integer() {0, 0, 0, 0}) - ' - 'ucrNudAngleTopYAxis - ' - Me.ucrNudAngleTopYAxis.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) - Me.ucrNudAngleTopYAxis.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudAngleTopYAxis.Location = New System.Drawing.Point(117, 134) - Me.ucrNudAngleTopYAxis.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) - Me.ucrNudAngleTopYAxis.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) - Me.ucrNudAngleTopYAxis.Name = "ucrNudAngleTopYAxis" - Me.ucrNudAngleTopYAxis.Size = New System.Drawing.Size(50, 20) - Me.ucrNudAngleTopYAxis.TabIndex = 34 - Me.ucrNudAngleTopYAxis.Value = New Decimal(New Integer() {0, 0, 0, 0}) - ' - 'ucrNudHjustTopYAxis - ' - Me.ucrNudHjustTopYAxis.DecimalPlaces = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudHjustTopYAxis.Increment = New Decimal(New Integer() {1, 0, 0, 65536}) - Me.ucrNudHjustTopYAxis.Location = New System.Drawing.Point(117, 46) - Me.ucrNudHjustTopYAxis.Maximum = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudHjustTopYAxis.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) - Me.ucrNudHjustTopYAxis.Name = "ucrNudHjustTopYAxis" - Me.ucrNudHjustTopYAxis.Size = New System.Drawing.Size(50, 20) - Me.ucrNudHjustTopYAxis.TabIndex = 32 - Me.ucrNudHjustTopYAxis.Value = New Decimal(New Integer() {0, 0, 0, 0}) - ' - 'ucrNudSizeTopYAxis - ' - Me.ucrNudSizeTopYAxis.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) - Me.ucrNudSizeTopYAxis.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudSizeTopYAxis.Location = New System.Drawing.Point(117, 16) - Me.ucrNudSizeTopYAxis.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) - Me.ucrNudSizeTopYAxis.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) - Me.ucrNudSizeTopYAxis.Name = "ucrNudSizeTopYAxis" - Me.ucrNudSizeTopYAxis.Size = New System.Drawing.Size(50, 20) - Me.ucrNudSizeTopYAxis.TabIndex = 30 - Me.ucrNudSizeTopYAxis.Value = New Decimal(New Integer() {0, 0, 0, 0}) - ' - 'ucrInputColourTopYAxis - ' - Me.ucrInputColourTopYAxis.AddQuotesIfUnrecognised = True - Me.ucrInputColourTopYAxis.IsReadOnly = False - Me.ucrInputColourTopYAxis.Location = New System.Drawing.Point(117, 217) - Me.ucrInputColourTopYAxis.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) - Me.ucrInputColourTopYAxis.Name = "ucrInputColourTopYAxis" - Me.ucrInputColourTopYAxis.Size = New System.Drawing.Size(137, 21) - Me.ucrInputColourTopYAxis.TabIndex = 28 - ' - 'ucrInputFaceTopYAxis - ' - Me.ucrInputFaceTopYAxis.AddQuotesIfUnrecognised = True - Me.ucrInputFaceTopYAxis.IsReadOnly = False - Me.ucrInputFaceTopYAxis.Location = New System.Drawing.Point(117, 189) - Me.ucrInputFaceTopYAxis.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) - Me.ucrInputFaceTopYAxis.Name = "ucrInputFaceTopYAxis" - Me.ucrInputFaceTopYAxis.Size = New System.Drawing.Size(137, 21) - Me.ucrInputFaceTopYAxis.TabIndex = 26 - ' - 'ucrInputFamilyTopYAxis - ' - Me.ucrInputFamilyTopYAxis.AddQuotesIfUnrecognised = True - Me.ucrInputFamilyTopYAxis.IsReadOnly = False - Me.ucrInputFamilyTopYAxis.Location = New System.Drawing.Point(117, 162) - Me.ucrInputFamilyTopYAxis.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) - Me.ucrInputFamilyTopYAxis.Name = "ucrInputFamilyTopYAxis" - Me.ucrInputFamilyTopYAxis.Size = New System.Drawing.Size(137, 21) - Me.ucrInputFamilyTopYAxis.TabIndex = 24 + 'ucrChkColourRightYAxis + ' + Me.ucrChkColourRightYAxis.Checked = False + Me.ucrChkColourRightYAxis.Location = New System.Drawing.Point(14, 212) + Me.ucrChkColourRightYAxis.Name = "ucrChkColourRightYAxis" + Me.ucrChkColourRightYAxis.Size = New System.Drawing.Size(100, 20) + Me.ucrChkColourRightYAxis.TabIndex = 53 + ' + 'ucrChkFaceRightYAxis + ' + Me.ucrChkFaceRightYAxis.Checked = False + Me.ucrChkFaceRightYAxis.Location = New System.Drawing.Point(14, 184) + Me.ucrChkFaceRightYAxis.Name = "ucrChkFaceRightYAxis" + Me.ucrChkFaceRightYAxis.Size = New System.Drawing.Size(100, 20) + Me.ucrChkFaceRightYAxis.TabIndex = 52 + ' + 'ucrChkFamilyRightYAxis + ' + Me.ucrChkFamilyRightYAxis.Checked = False + Me.ucrChkFamilyRightYAxis.Location = New System.Drawing.Point(14, 156) + Me.ucrChkFamilyRightYAxis.Name = "ucrChkFamilyRightYAxis" + Me.ucrChkFamilyRightYAxis.Size = New System.Drawing.Size(100, 20) + Me.ucrChkFamilyRightYAxis.TabIndex = 51 + ' + 'ucrChkAngleRightYAxis + ' + Me.ucrChkAngleRightYAxis.Checked = False + Me.ucrChkAngleRightYAxis.Location = New System.Drawing.Point(14, 128) + Me.ucrChkAngleRightYAxis.Name = "ucrChkAngleRightYAxis" + Me.ucrChkAngleRightYAxis.Size = New System.Drawing.Size(100, 20) + Me.ucrChkAngleRightYAxis.TabIndex = 50 + ' + 'ucrChkHjustRightYAxis + ' + Me.ucrChkHjustRightYAxis.Checked = False + Me.ucrChkHjustRightYAxis.Location = New System.Drawing.Point(14, 44) + Me.ucrChkHjustRightYAxis.Name = "ucrChkHjustRightYAxis" + Me.ucrChkHjustRightYAxis.Size = New System.Drawing.Size(100, 20) + Me.ucrChkHjustRightYAxis.TabIndex = 49 + ' + 'ucrChkVjustRightYAxis + ' + Me.ucrChkVjustRightYAxis.Checked = False + Me.ucrChkVjustRightYAxis.Location = New System.Drawing.Point(14, 72) + Me.ucrChkVjustRightYAxis.Name = "ucrChkVjustRightYAxis" + Me.ucrChkVjustRightYAxis.Size = New System.Drawing.Size(100, 20) + Me.ucrChkVjustRightYAxis.TabIndex = 48 + ' + 'ucrChkLineHeightRightYAxis + ' + Me.ucrChkLineHeightRightYAxis.Checked = False + Me.ucrChkLineHeightRightYAxis.Location = New System.Drawing.Point(14, 100) + Me.ucrChkLineHeightRightYAxis.Name = "ucrChkLineHeightRightYAxis" + Me.ucrChkLineHeightRightYAxis.Size = New System.Drawing.Size(100, 20) + Me.ucrChkLineHeightRightYAxis.TabIndex = 47 + ' + 'ucrChkSizeRightYAxis + ' + Me.ucrChkSizeRightYAxis.Checked = False + Me.ucrChkSizeRightYAxis.Location = New System.Drawing.Point(14, 16) + Me.ucrChkSizeRightYAxis.Name = "ucrChkSizeRightYAxis" + Me.ucrChkSizeRightYAxis.Size = New System.Drawing.Size(100, 20) + Me.ucrChkSizeRightYAxis.TabIndex = 46 + ' + 'ucrNudVjustRightYAxis + ' + Me.ucrNudVjustRightYAxis.DecimalPlaces = New Decimal(New Integer() {1, 0, 0, 0}) + Me.ucrNudVjustRightYAxis.Increment = New Decimal(New Integer() {1, 0, 0, 65536}) + Me.ucrNudVjustRightYAxis.Location = New System.Drawing.Point(115, 72) + Me.ucrNudVjustRightYAxis.Maximum = New Decimal(New Integer() {1, 0, 0, 0}) + Me.ucrNudVjustRightYAxis.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudVjustRightYAxis.Name = "ucrNudVjustRightYAxis" + Me.ucrNudVjustRightYAxis.Size = New System.Drawing.Size(50, 20) + Me.ucrNudVjustRightYAxis.TabIndex = 38 + Me.ucrNudVjustRightYAxis.Value = New Decimal(New Integer() {0, 0, 0, 0}) + ' + 'ucrNudLineHeightRightYAxis + ' + Me.ucrNudLineHeightRightYAxis.DecimalPlaces = New Decimal(New Integer() {1, 0, 0, 0}) + Me.ucrNudLineHeightRightYAxis.Increment = New Decimal(New Integer() {1, 0, 0, 65536}) + Me.ucrNudLineHeightRightYAxis.Location = New System.Drawing.Point(115, 100) + Me.ucrNudLineHeightRightYAxis.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) + Me.ucrNudLineHeightRightYAxis.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudLineHeightRightYAxis.Name = "ucrNudLineHeightRightYAxis" + Me.ucrNudLineHeightRightYAxis.Size = New System.Drawing.Size(50, 20) + Me.ucrNudLineHeightRightYAxis.TabIndex = 36 + Me.ucrNudLineHeightRightYAxis.Value = New Decimal(New Integer() {0, 0, 0, 0}) + ' + 'ucrNudAngleRightYAxis + ' + Me.ucrNudAngleRightYAxis.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudAngleRightYAxis.Increment = New Decimal(New Integer() {1, 0, 0, 0}) + Me.ucrNudAngleRightYAxis.Location = New System.Drawing.Point(115, 128) + Me.ucrNudAngleRightYAxis.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) + Me.ucrNudAngleRightYAxis.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudAngleRightYAxis.Name = "ucrNudAngleRightYAxis" + Me.ucrNudAngleRightYAxis.Size = New System.Drawing.Size(50, 20) + Me.ucrNudAngleRightYAxis.TabIndex = 34 + Me.ucrNudAngleRightYAxis.Value = New Decimal(New Integer() {0, 0, 0, 0}) + ' + 'ucrNudHjustRightYAxis + ' + Me.ucrNudHjustRightYAxis.DecimalPlaces = New Decimal(New Integer() {1, 0, 0, 0}) + Me.ucrNudHjustRightYAxis.Increment = New Decimal(New Integer() {1, 0, 0, 65536}) + Me.ucrNudHjustRightYAxis.Location = New System.Drawing.Point(115, 44) + Me.ucrNudHjustRightYAxis.Maximum = New Decimal(New Integer() {1, 0, 0, 0}) + Me.ucrNudHjustRightYAxis.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudHjustRightYAxis.Name = "ucrNudHjustRightYAxis" + Me.ucrNudHjustRightYAxis.Size = New System.Drawing.Size(50, 20) + Me.ucrNudHjustRightYAxis.TabIndex = 32 + Me.ucrNudHjustRightYAxis.Value = New Decimal(New Integer() {0, 0, 0, 0}) + ' + 'ucrNudSizeRightYAxis + ' + Me.ucrNudSizeRightYAxis.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudSizeRightYAxis.Increment = New Decimal(New Integer() {1, 0, 0, 0}) + Me.ucrNudSizeRightYAxis.Location = New System.Drawing.Point(115, 16) + Me.ucrNudSizeRightYAxis.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) + Me.ucrNudSizeRightYAxis.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudSizeRightYAxis.Name = "ucrNudSizeRightYAxis" + Me.ucrNudSizeRightYAxis.Size = New System.Drawing.Size(50, 20) + Me.ucrNudSizeRightYAxis.TabIndex = 30 + Me.ucrNudSizeRightYAxis.Value = New Decimal(New Integer() {0, 0, 0, 0}) + ' + 'ucrInputColourRightYAxis + ' + Me.ucrInputColourRightYAxis.AddQuotesIfUnrecognised = True + Me.ucrInputColourRightYAxis.IsReadOnly = False + Me.ucrInputColourRightYAxis.Location = New System.Drawing.Point(115, 212) + Me.ucrInputColourRightYAxis.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) + Me.ucrInputColourRightYAxis.Name = "ucrInputColourRightYAxis" + Me.ucrInputColourRightYAxis.Size = New System.Drawing.Size(137, 21) + Me.ucrInputColourRightYAxis.TabIndex = 28 + ' + 'ucrInputFaceRightYAxis + ' + Me.ucrInputFaceRightYAxis.AddQuotesIfUnrecognised = True + Me.ucrInputFaceRightYAxis.IsReadOnly = False + Me.ucrInputFaceRightYAxis.Location = New System.Drawing.Point(115, 183) + Me.ucrInputFaceRightYAxis.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) + Me.ucrInputFaceRightYAxis.Name = "ucrInputFaceRightYAxis" + Me.ucrInputFaceRightYAxis.Size = New System.Drawing.Size(137, 21) + Me.ucrInputFaceRightYAxis.TabIndex = 26 + ' + 'ucrInputFamilyRightYAxis + ' + Me.ucrInputFamilyRightYAxis.AddQuotesIfUnrecognised = True + Me.ucrInputFamilyRightYAxis.IsReadOnly = False + Me.ucrInputFamilyRightYAxis.Location = New System.Drawing.Point(115, 155) + Me.ucrInputFamilyRightYAxis.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) + Me.ucrInputFamilyRightYAxis.Name = "ucrInputFamilyRightYAxis" + Me.ucrInputFamilyRightYAxis.Size = New System.Drawing.Size(137, 21) + Me.ucrInputFamilyRightYAxis.TabIndex = 24 ' 'grpTickMarksYAxis ' - Me.grpTickMarksYAxis.Controls.Add(Me.UcrCheck41) - Me.grpTickMarksYAxis.Controls.Add(Me.UcrCheck42) - Me.grpTickMarksYAxis.Controls.Add(Me.UcrCheck43) - Me.grpTickMarksYAxis.Controls.Add(Me.UcrCheck44) + Me.grpTickMarksYAxis.Controls.Add(Me.ucrChkLineEndTickMarksYAxis) + Me.grpTickMarksYAxis.Controls.Add(Me.ucrChkSizeTickMarksYAxis) + Me.grpTickMarksYAxis.Controls.Add(Me.ucrChkLineTypeTickMarksYAxis) + Me.grpTickMarksYAxis.Controls.Add(Me.ucrChkColourTickMarksYAxis) Me.grpTickMarksYAxis.Controls.Add(Me.ucrInputLineEndTickMarksYAxis) Me.grpTickMarksYAxis.Controls.Add(Me.ucrNudSizeTickMarksYAxis) Me.grpTickMarksYAxis.Controls.Add(Me.ucrInputColourTickMarksYAxis) @@ -1020,43 +1020,43 @@ Partial Class sdgThemes Me.grpTickMarksYAxis.TabStop = False Me.grpTickMarksYAxis.Text = "Tick marks along axes" ' - 'UcrCheck41 + 'ucrChkLineEndTickMarksYAxis ' - Me.UcrCheck41.Checked = False - Me.UcrCheck41.Location = New System.Drawing.Point(6, 111) - Me.UcrCheck41.Name = "UcrCheck41" - Me.UcrCheck41.Size = New System.Drawing.Size(100, 20) - Me.UcrCheck41.TabIndex = 58 + Me.ucrChkLineEndTickMarksYAxis.Checked = False + Me.ucrChkLineEndTickMarksYAxis.Location = New System.Drawing.Point(6, 107) + Me.ucrChkLineEndTickMarksYAxis.Name = "ucrChkLineEndTickMarksYAxis" + Me.ucrChkLineEndTickMarksYAxis.Size = New System.Drawing.Size(100, 20) + Me.ucrChkLineEndTickMarksYAxis.TabIndex = 58 ' - 'UcrCheck42 + 'ucrChkSizeTickMarksYAxis ' - Me.UcrCheck42.Checked = False - Me.UcrCheck42.Location = New System.Drawing.Point(6, 24) - Me.UcrCheck42.Name = "UcrCheck42" - Me.UcrCheck42.Size = New System.Drawing.Size(100, 20) - Me.UcrCheck42.TabIndex = 57 + Me.ucrChkSizeTickMarksYAxis.Checked = False + Me.ucrChkSizeTickMarksYAxis.Location = New System.Drawing.Point(6, 20) + Me.ucrChkSizeTickMarksYAxis.Name = "ucrChkSizeTickMarksYAxis" + Me.ucrChkSizeTickMarksYAxis.Size = New System.Drawing.Size(100, 20) + Me.ucrChkSizeTickMarksYAxis.TabIndex = 57 ' - 'UcrCheck43 + 'ucrChkLineTypeTickMarksYAxis ' - Me.UcrCheck43.Checked = False - Me.UcrCheck43.Location = New System.Drawing.Point(6, 53) - Me.UcrCheck43.Name = "UcrCheck43" - Me.UcrCheck43.Size = New System.Drawing.Size(100, 20) - Me.UcrCheck43.TabIndex = 56 + Me.ucrChkLineTypeTickMarksYAxis.Checked = False + Me.ucrChkLineTypeTickMarksYAxis.Location = New System.Drawing.Point(6, 49) + Me.ucrChkLineTypeTickMarksYAxis.Name = "ucrChkLineTypeTickMarksYAxis" + Me.ucrChkLineTypeTickMarksYAxis.Size = New System.Drawing.Size(100, 20) + Me.ucrChkLineTypeTickMarksYAxis.TabIndex = 56 ' - 'UcrCheck44 + 'ucrChkColourTickMarksYAxis ' - Me.UcrCheck44.Checked = False - Me.UcrCheck44.Location = New System.Drawing.Point(6, 82) - Me.UcrCheck44.Name = "UcrCheck44" - Me.UcrCheck44.Size = New System.Drawing.Size(100, 20) - Me.UcrCheck44.TabIndex = 55 + Me.ucrChkColourTickMarksYAxis.Checked = False + Me.ucrChkColourTickMarksYAxis.Location = New System.Drawing.Point(6, 78) + Me.ucrChkColourTickMarksYAxis.Name = "ucrChkColourTickMarksYAxis" + Me.ucrChkColourTickMarksYAxis.Size = New System.Drawing.Size(100, 20) + Me.ucrChkColourTickMarksYAxis.TabIndex = 55 ' 'ucrInputLineEndTickMarksYAxis ' Me.ucrInputLineEndTickMarksYAxis.AddQuotesIfUnrecognised = True Me.ucrInputLineEndTickMarksYAxis.IsReadOnly = False - Me.ucrInputLineEndTickMarksYAxis.Location = New System.Drawing.Point(110, 100) + Me.ucrInputLineEndTickMarksYAxis.Location = New System.Drawing.Point(110, 106) Me.ucrInputLineEndTickMarksYAxis.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) Me.ucrInputLineEndTickMarksYAxis.Name = "ucrInputLineEndTickMarksYAxis" Me.ucrInputLineEndTickMarksYAxis.Size = New System.Drawing.Size(137, 21) @@ -1066,7 +1066,7 @@ Partial Class sdgThemes ' Me.ucrNudSizeTickMarksYAxis.DecimalPlaces = New Decimal(New Integer() {1, 0, 0, 0}) Me.ucrNudSizeTickMarksYAxis.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudSizeTickMarksYAxis.Location = New System.Drawing.Point(132, 17) + Me.ucrNudSizeTickMarksYAxis.Location = New System.Drawing.Point(110, 19) Me.ucrNudSizeTickMarksYAxis.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) Me.ucrNudSizeTickMarksYAxis.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudSizeTickMarksYAxis.Name = "ucrNudSizeTickMarksYAxis" @@ -1078,7 +1078,7 @@ Partial Class sdgThemes ' Me.ucrInputColourTickMarksYAxis.AddQuotesIfUnrecognised = True Me.ucrInputColourTickMarksYAxis.IsReadOnly = False - Me.ucrInputColourTickMarksYAxis.Location = New System.Drawing.Point(110, 68) + Me.ucrInputColourTickMarksYAxis.Location = New System.Drawing.Point(110, 77) Me.ucrInputColourTickMarksYAxis.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) Me.ucrInputColourTickMarksYAxis.Name = "ucrInputColourTickMarksYAxis" Me.ucrInputColourTickMarksYAxis.Size = New System.Drawing.Size(137, 21) @@ -1088,7 +1088,7 @@ Partial Class sdgThemes ' Me.ucrInputLineTypeTickMarksYAxis.AddQuotesIfUnrecognised = True Me.ucrInputLineTypeTickMarksYAxis.IsReadOnly = False - Me.ucrInputLineTypeTickMarksYAxis.Location = New System.Drawing.Point(110, 40) + Me.ucrInputLineTypeTickMarksYAxis.Location = New System.Drawing.Point(110, 48) Me.ucrInputLineTypeTickMarksYAxis.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) Me.ucrInputLineTypeTickMarksYAxis.Name = "ucrInputLineTypeTickMarksYAxis" Me.ucrInputLineTypeTickMarksYAxis.Size = New System.Drawing.Size(137, 21) @@ -1096,17 +1096,17 @@ Partial Class sdgThemes ' 'grpYAxisLabels ' - Me.grpYAxisLabels.Controls.Add(Me.UcrCheck8) - Me.grpYAxisLabels.Controls.Add(Me.UcrCheck7) - Me.grpYAxisLabels.Controls.Add(Me.UcrCheck6) - Me.grpYAxisLabels.Controls.Add(Me.UcrCheck5) - Me.grpYAxisLabels.Controls.Add(Me.UcrCheck4) - Me.grpYAxisLabels.Controls.Add(Me.UcrCheck3) - Me.grpYAxisLabels.Controls.Add(Me.UcrCheck2) - Me.grpYAxisLabels.Controls.Add(Me.UcrCheck1) + Me.grpYAxisLabels.Controls.Add(Me.ucrChkColourYAxis) + Me.grpYAxisLabels.Controls.Add(Me.ucrChkFaceYAxis) + Me.grpYAxisLabels.Controls.Add(Me.ucrChkFamilyYAxis) + Me.grpYAxisLabels.Controls.Add(Me.ucrChkAngleYAxis) + Me.grpYAxisLabels.Controls.Add(Me.ucrChkHjustYAxis) + Me.grpYAxisLabels.Controls.Add(Me.ucrChkVjustYAxis) + Me.grpYAxisLabels.Controls.Add(Me.ucrChkLineHeightYAxis) + Me.grpYAxisLabels.Controls.Add(Me.ucrChkSizeYAxis) Me.grpYAxisLabels.Controls.Add(Me.ucrNudVjustYAxis) Me.grpYAxisLabels.Controls.Add(Me.ucrNudLineHeightYAxis) - Me.grpYAxisLabels.Controls.Add(Me.ucrNudLAngleYAxis) + Me.grpYAxisLabels.Controls.Add(Me.ucrNudAngleYAxis) Me.grpYAxisLabels.Controls.Add(Me.ucrNudHjustYAxis) Me.grpYAxisLabels.Controls.Add(Me.ucrNudSizeYAxis) Me.grpYAxisLabels.Controls.Add(Me.ucrInputColourYAxis) @@ -1119,75 +1119,75 @@ Partial Class sdgThemes Me.grpYAxisLabels.TabStop = False Me.grpYAxisLabels.Text = "Y axis label" ' - 'UcrCheck8 + 'ucrChkColourYAxis ' - Me.UcrCheck8.Checked = False - Me.UcrCheck8.Location = New System.Drawing.Point(6, 218) - Me.UcrCheck8.Name = "UcrCheck8" - Me.UcrCheck8.Size = New System.Drawing.Size(100, 20) - Me.UcrCheck8.TabIndex = 45 + Me.ucrChkColourYAxis.Checked = False + Me.ucrChkColourYAxis.Location = New System.Drawing.Point(6, 212) + Me.ucrChkColourYAxis.Name = "ucrChkColourYAxis" + Me.ucrChkColourYAxis.Size = New System.Drawing.Size(100, 20) + Me.ucrChkColourYAxis.TabIndex = 45 ' - 'UcrCheck7 + 'ucrChkFaceYAxis ' - Me.UcrCheck7.Checked = False - Me.UcrCheck7.Location = New System.Drawing.Point(6, 189) - Me.UcrCheck7.Name = "UcrCheck7" - Me.UcrCheck7.Size = New System.Drawing.Size(100, 20) - Me.UcrCheck7.TabIndex = 44 + Me.ucrChkFaceYAxis.Checked = False + Me.ucrChkFaceYAxis.Location = New System.Drawing.Point(6, 184) + Me.ucrChkFaceYAxis.Name = "ucrChkFaceYAxis" + Me.ucrChkFaceYAxis.Size = New System.Drawing.Size(100, 20) + Me.ucrChkFaceYAxis.TabIndex = 44 ' - 'UcrCheck6 + 'ucrChkFamilyYAxis ' - Me.UcrCheck6.Checked = False - Me.UcrCheck6.Location = New System.Drawing.Point(6, 166) - Me.UcrCheck6.Name = "UcrCheck6" - Me.UcrCheck6.Size = New System.Drawing.Size(100, 20) - Me.UcrCheck6.TabIndex = 43 + Me.ucrChkFamilyYAxis.Checked = False + Me.ucrChkFamilyYAxis.Location = New System.Drawing.Point(6, 156) + Me.ucrChkFamilyYAxis.Name = "ucrChkFamilyYAxis" + Me.ucrChkFamilyYAxis.Size = New System.Drawing.Size(100, 20) + Me.ucrChkFamilyYAxis.TabIndex = 43 ' - 'UcrCheck5 + 'ucrChkAngleYAxis ' - Me.UcrCheck5.Checked = False - Me.UcrCheck5.Location = New System.Drawing.Point(6, 133) - Me.UcrCheck5.Name = "UcrCheck5" - Me.UcrCheck5.Size = New System.Drawing.Size(100, 20) - Me.UcrCheck5.TabIndex = 42 + Me.ucrChkAngleYAxis.Checked = False + Me.ucrChkAngleYAxis.Location = New System.Drawing.Point(6, 128) + Me.ucrChkAngleYAxis.Name = "ucrChkAngleYAxis" + Me.ucrChkAngleYAxis.Size = New System.Drawing.Size(100, 20) + Me.ucrChkAngleYAxis.TabIndex = 42 ' - 'UcrCheck4 + 'ucrChkHjustYAxis ' - Me.UcrCheck4.Checked = False - Me.UcrCheck4.Location = New System.Drawing.Point(6, 46) - Me.UcrCheck4.Name = "UcrCheck4" - Me.UcrCheck4.Size = New System.Drawing.Size(100, 20) - Me.UcrCheck4.TabIndex = 41 + Me.ucrChkHjustYAxis.Checked = False + Me.ucrChkHjustYAxis.Location = New System.Drawing.Point(6, 44) + Me.ucrChkHjustYAxis.Name = "ucrChkHjustYAxis" + Me.ucrChkHjustYAxis.Size = New System.Drawing.Size(100, 20) + Me.ucrChkHjustYAxis.TabIndex = 41 ' - 'UcrCheck3 + 'ucrChkVjustYAxis ' - Me.UcrCheck3.Checked = False - Me.UcrCheck3.Location = New System.Drawing.Point(6, 72) - Me.UcrCheck3.Name = "UcrCheck3" - Me.UcrCheck3.Size = New System.Drawing.Size(100, 20) - Me.UcrCheck3.TabIndex = 40 + Me.ucrChkVjustYAxis.Checked = False + Me.ucrChkVjustYAxis.Location = New System.Drawing.Point(6, 72) + Me.ucrChkVjustYAxis.Name = "ucrChkVjustYAxis" + Me.ucrChkVjustYAxis.Size = New System.Drawing.Size(100, 20) + Me.ucrChkVjustYAxis.TabIndex = 40 ' - 'UcrCheck2 + 'ucrChkLineHeightYAxis ' - Me.UcrCheck2.Checked = False - Me.UcrCheck2.Location = New System.Drawing.Point(6, 98) - Me.UcrCheck2.Name = "UcrCheck2" - Me.UcrCheck2.Size = New System.Drawing.Size(100, 20) - Me.UcrCheck2.TabIndex = 39 + Me.ucrChkLineHeightYAxis.Checked = False + Me.ucrChkLineHeightYAxis.Location = New System.Drawing.Point(6, 100) + Me.ucrChkLineHeightYAxis.Name = "ucrChkLineHeightYAxis" + Me.ucrChkLineHeightYAxis.Size = New System.Drawing.Size(100, 20) + Me.ucrChkLineHeightYAxis.TabIndex = 39 ' - 'UcrCheck1 + 'ucrChkSizeYAxis ' - Me.UcrCheck1.Checked = False - Me.UcrCheck1.Location = New System.Drawing.Point(6, 16) - Me.UcrCheck1.Name = "UcrCheck1" - Me.UcrCheck1.Size = New System.Drawing.Size(100, 20) - Me.UcrCheck1.TabIndex = 33 + Me.ucrChkSizeYAxis.Checked = False + Me.ucrChkSizeYAxis.Location = New System.Drawing.Point(6, 16) + Me.ucrChkSizeYAxis.Name = "ucrChkSizeYAxis" + Me.ucrChkSizeYAxis.Size = New System.Drawing.Size(100, 20) + Me.ucrChkSizeYAxis.TabIndex = 33 ' 'ucrNudVjustYAxis ' Me.ucrNudVjustYAxis.DecimalPlaces = New Decimal(New Integer() {1, 0, 0, 0}) Me.ucrNudVjustYAxis.Increment = New Decimal(New Integer() {1, 0, 0, 65536}) - Me.ucrNudVjustYAxis.Location = New System.Drawing.Point(110, 76) + Me.ucrNudVjustYAxis.Location = New System.Drawing.Point(110, 72) Me.ucrNudVjustYAxis.Maximum = New Decimal(New Integer() {1, 0, 0, 0}) Me.ucrNudVjustYAxis.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudVjustYAxis.Name = "ucrNudVjustYAxis" @@ -1199,7 +1199,7 @@ Partial Class sdgThemes ' Me.ucrNudLineHeightYAxis.DecimalPlaces = New Decimal(New Integer() {1, 0, 0, 0}) Me.ucrNudLineHeightYAxis.Increment = New Decimal(New Integer() {1, 0, 0, 65536}) - Me.ucrNudLineHeightYAxis.Location = New System.Drawing.Point(110, 106) + Me.ucrNudLineHeightYAxis.Location = New System.Drawing.Point(110, 100) Me.ucrNudLineHeightYAxis.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) Me.ucrNudLineHeightYAxis.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudLineHeightYAxis.Name = "ucrNudLineHeightYAxis" @@ -1207,23 +1207,23 @@ Partial Class sdgThemes Me.ucrNudLineHeightYAxis.TabIndex = 36 Me.ucrNudLineHeightYAxis.Value = New Decimal(New Integer() {0, 0, 0, 0}) ' - 'ucrNudLAngleYAxis + 'ucrNudAngleYAxis ' - Me.ucrNudLAngleYAxis.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) - Me.ucrNudLAngleYAxis.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudLAngleYAxis.Location = New System.Drawing.Point(110, 136) - Me.ucrNudLAngleYAxis.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) - Me.ucrNudLAngleYAxis.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) - Me.ucrNudLAngleYAxis.Name = "ucrNudLAngleYAxis" - Me.ucrNudLAngleYAxis.Size = New System.Drawing.Size(50, 20) - Me.ucrNudLAngleYAxis.TabIndex = 34 - Me.ucrNudLAngleYAxis.Value = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudAngleYAxis.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudAngleYAxis.Increment = New Decimal(New Integer() {1, 0, 0, 0}) + Me.ucrNudAngleYAxis.Location = New System.Drawing.Point(110, 128) + Me.ucrNudAngleYAxis.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) + Me.ucrNudAngleYAxis.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudAngleYAxis.Name = "ucrNudAngleYAxis" + Me.ucrNudAngleYAxis.Size = New System.Drawing.Size(50, 20) + Me.ucrNudAngleYAxis.TabIndex = 34 + Me.ucrNudAngleYAxis.Value = New Decimal(New Integer() {0, 0, 0, 0}) ' 'ucrNudHjustYAxis ' Me.ucrNudHjustYAxis.DecimalPlaces = New Decimal(New Integer() {1, 0, 0, 0}) Me.ucrNudHjustYAxis.Increment = New Decimal(New Integer() {1, 0, 0, 65536}) - Me.ucrNudHjustYAxis.Location = New System.Drawing.Point(110, 46) + Me.ucrNudHjustYAxis.Location = New System.Drawing.Point(110, 44) Me.ucrNudHjustYAxis.Maximum = New Decimal(New Integer() {1, 0, 0, 0}) Me.ucrNudHjustYAxis.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudHjustYAxis.Name = "ucrNudHjustYAxis" @@ -1247,7 +1247,7 @@ Partial Class sdgThemes ' Me.ucrInputColourYAxis.AddQuotesIfUnrecognised = True Me.ucrInputColourYAxis.IsReadOnly = False - Me.ucrInputColourYAxis.Location = New System.Drawing.Point(110, 217) + Me.ucrInputColourYAxis.Location = New System.Drawing.Point(110, 212) Me.ucrInputColourYAxis.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) Me.ucrInputColourYAxis.Name = "ucrInputColourYAxis" Me.ucrInputColourYAxis.Size = New System.Drawing.Size(137, 21) @@ -1257,7 +1257,7 @@ Partial Class sdgThemes ' Me.ucrInputFaceYAxis.AddQuotesIfUnrecognised = True Me.ucrInputFaceYAxis.IsReadOnly = False - Me.ucrInputFaceYAxis.Location = New System.Drawing.Point(110, 189) + Me.ucrInputFaceYAxis.Location = New System.Drawing.Point(110, 183) Me.ucrInputFaceYAxis.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) Me.ucrInputFaceYAxis.Name = "ucrInputFaceYAxis" Me.ucrInputFaceYAxis.Size = New System.Drawing.Size(137, 21) @@ -1267,7 +1267,7 @@ Partial Class sdgThemes ' Me.ucrInputFamilyYAxis.AddQuotesIfUnrecognised = True Me.ucrInputFamilyYAxis.IsReadOnly = False - Me.ucrInputFamilyYAxis.Location = New System.Drawing.Point(110, 162) + Me.ucrInputFamilyYAxis.Location = New System.Drawing.Point(110, 155) Me.ucrInputFamilyYAxis.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) Me.ucrInputFamilyYAxis.Name = "ucrInputFamilyYAxis" Me.ucrInputFamilyYAxis.Size = New System.Drawing.Size(137, 21) @@ -1348,14 +1348,14 @@ Partial Class sdgThemes Friend WithEvents ucrInputColourTickLabelsYAxis As ucrInputComboBox Friend WithEvents ucrInputLineTypeTickLabelsYAxis As ucrInputComboBox Friend WithEvents grpYAxisTopLabels As GroupBox - Friend WithEvents ucrNudVjustTopYAxis As ucrNud - Friend WithEvents ucrNudLineHeightTopYAxis As ucrNud - Friend WithEvents ucrNudAngleTopYAxis As ucrNud - Friend WithEvents ucrNudHjustTopYAxis As ucrNud - Friend WithEvents ucrNudSizeTopYAxis As ucrNud - Friend WithEvents ucrInputColourTopYAxis As ucrInputComboBox - Friend WithEvents ucrInputFaceTopYAxis As ucrInputComboBox - Friend WithEvents ucrInputFamilyTopYAxis As ucrInputComboBox + Friend WithEvents ucrNudVjustRightYAxis As ucrNud + Friend WithEvents ucrNudLineHeightRightYAxis As ucrNud + Friend WithEvents ucrNudAngleRightYAxis As ucrNud + Friend WithEvents ucrNudHjustRightYAxis As ucrNud + Friend WithEvents ucrNudSizeRightYAxis As ucrNud + Friend WithEvents ucrInputColourRightYAxis As ucrInputComboBox + Friend WithEvents ucrInputFaceRightYAxis As ucrInputComboBox + Friend WithEvents ucrInputFamilyRightYAxis As ucrInputComboBox Friend WithEvents grpTickMarksYAxis As GroupBox Friend WithEvents ucrInputLineEndTickMarksYAxis As ucrInputComboBox Friend WithEvents ucrNudSizeTickMarksYAxis As ucrNud @@ -1364,28 +1364,28 @@ Partial Class sdgThemes Friend WithEvents grpYAxisLabels As GroupBox Friend WithEvents ucrNudVjustYAxis As ucrNud Friend WithEvents ucrNudLineHeightYAxis As ucrNud - Friend WithEvents ucrNudLAngleYAxis As ucrNud + Friend WithEvents ucrNudAngleYAxis As ucrNud Friend WithEvents ucrNudHjustYAxis As ucrNud Friend WithEvents ucrNudSizeYAxis As ucrNud Friend WithEvents ucrInputColourYAxis As ucrInputComboBox Friend WithEvents ucrInputFaceYAxis As ucrInputComboBox Friend WithEvents ucrInputFamilyYAxis As ucrInputComboBox - Friend WithEvents UcrCheck4 As ucrCheck - Friend WithEvents UcrCheck3 As ucrCheck - Friend WithEvents UcrCheck2 As ucrCheck - Friend WithEvents UcrCheck1 As ucrCheck - Friend WithEvents UcrCheck8 As ucrCheck - Friend WithEvents UcrCheck7 As ucrCheck - Friend WithEvents UcrCheck6 As ucrCheck - Friend WithEvents UcrCheck5 As ucrCheck - Friend WithEvents UcrCheck9 As ucrCheck - Friend WithEvents UcrCheck10 As ucrCheck - Friend WithEvents UcrCheck11 As ucrCheck - Friend WithEvents UcrCheck12 As ucrCheck - Friend WithEvents UcrCheck13 As ucrCheck - Friend WithEvents UcrCheck14 As ucrCheck - Friend WithEvents UcrCheck15 As ucrCheck - Friend WithEvents UcrCheck16 As ucrCheck + Friend WithEvents ucrChkHjustYAxis As ucrCheck + Friend WithEvents ucrChkVjustYAxis As ucrCheck + Friend WithEvents ucrChkLineHeightYAxis As ucrCheck + Friend WithEvents ucrChkSizeYAxis As ucrCheck + Friend WithEvents ucrChkColourYAxis As ucrCheck + Friend WithEvents ucrChkFaceYAxis As ucrCheck + Friend WithEvents ucrChkFamilyYAxis As ucrCheck + Friend WithEvents ucrChkAngleYAxis As ucrCheck + Friend WithEvents ucrChkColourRightYAxis As ucrCheck + Friend WithEvents ucrChkFaceRightYAxis As ucrCheck + Friend WithEvents ucrChkFamilyRightYAxis As ucrCheck + Friend WithEvents ucrChkAngleRightYAxis As ucrCheck + Friend WithEvents ucrChkHjustRightYAxis As ucrCheck + Friend WithEvents ucrChkVjustRightYAxis As ucrCheck + Friend WithEvents ucrChkLineHeightRightYAxis As ucrCheck + Friend WithEvents ucrChkSizeRightYAxis As ucrCheck Friend WithEvents ucrChkColour As ucrCheck Friend WithEvents ucrChkFace As ucrCheck Friend WithEvents ucrChkFamily As ucrCheck @@ -1410,12 +1410,12 @@ Partial Class sdgThemes Friend WithEvents ucrChkSizeTickMarksXAxis As ucrCheck Friend WithEvents ucrChkLineTypeTickMarksXAxis As ucrCheck Friend WithEvents ucrChkColourTickMarksXAxis As ucrCheck - Friend WithEvents UcrCheck45 As ucrCheck - Friend WithEvents UcrCheck46 As ucrCheck - Friend WithEvents UcrCheck47 As ucrCheck - Friend WithEvents UcrCheck48 As ucrCheck - Friend WithEvents UcrCheck41 As ucrCheck - Friend WithEvents UcrCheck42 As ucrCheck - Friend WithEvents UcrCheck43 As ucrCheck - Friend WithEvents UcrCheck44 As ucrCheck + Friend WithEvents ucrChkLineEndTickLabelsYAxis As ucrCheck + Friend WithEvents ucrChkSizeTickLabelsYAxis As ucrCheck + Friend WithEvents ucrChkLineTypeTickLabelsYAxis As ucrCheck + Friend WithEvents ucrChkColourTickLabelsYAxis As ucrCheck + Friend WithEvents ucrChkLineEndTickMarksYAxis As ucrCheck + Friend WithEvents ucrChkSizeTickMarksYAxis As ucrCheck + Friend WithEvents ucrChkLineTypeTickMarksYAxis As ucrCheck + Friend WithEvents ucrChkColourTickMarksYAxis As ucrCheck End Class diff --git a/instat/sdgThemes.vb b/instat/sdgThemes.vb index 2d91c09f2cb..0dd72daec49 100644 --- a/instat/sdgThemes.vb +++ b/instat/sdgThemes.vb @@ -17,7 +17,7 @@ Imports instat.Translations Public Class sdgThemes Public bControlsInitialised As Boolean = False - Public clsElementText, clsElementTextTop, clsElementLine, clsElementLineTop, clsGgThemes As New RFunction + Public clsElementXAxisText, clsElementXAxisTextTop, clsElementXAxisLine, clsElementYAxisLine, clsElementYAxisText, clsElementYAxisTextRight, clsElementXAxisLineTop, clsGgThemes As New RFunction Private clsBaseOperator As New ROperator Private Sub sdgThemes_Load(sender As Object, e As EventArgs) Handles MyBase.Load autoTranslate(Me) @@ -299,17 +299,23 @@ Public Class sdgThemes ucrChkColourTickLabelsXAxis.AddToLinkedControls(ucrInputColourTickLabelsXAxis, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) 'Y-axis Label + ucrChkSizeYAxis.SetText("Size") ucrNudSizeYAxis.SetParameter(New RParameter("size")) - ucrNudLAngleYAxis.SetParameter(New RParameter("angle")) - ucrNudLAngleYAxis.SetMinMax(0, 360) + ucrChkAngleYAxis.SetText("Angle") + ucrNudAngleYAxis.SetParameter(New RParameter("angle")) + ucrNudAngleYAxis.SetMinMax(0, 360) + ucrChkHjustYAxis.SetText("Hjust") ucrNudHjustYAxis.SetParameter(New RParameter("hjust")) ucrNudHjustYAxis.Increment = 0.1 ucrNudHjustYAxis.SetMinMax(0, 1) + ucrChkVjustYAxis.SetText("Vjust") ucrNudVjustYAxis.SetParameter(New RParameter("vjust")) ucrNudVjustYAxis.Increment = 0.1 ucrNudVjustYAxis.SetMinMax(0, 1) + ucrChkLineHeightYAxis.SetText("Line Height") ucrNudLineHeightYAxis.SetParameter(New RParameter("lineheight")) + ucrChkFaceYAxis.SetText("Face") ucrInputFaceYAxis.SetParameter(New RParameter("face")) dctucrInputFaceYAxis.Add("Plain", Chr(34) & "plain" & Chr(34)) dctucrInputFaceYAxis.Add("Bold", Chr(34) & "bold" & Chr(34)) @@ -318,6 +324,7 @@ Public Class sdgThemes ucrInputFaceYAxis.SetItems(dctucrInputFaceYAxis) ucrInputFaceYAxis.SetRDefault(Chr(34) & "plain" & Chr(34)) + ucrChkColourYAxis.SetText("Colour") ucrInputColourYAxis.SetParameter(New RParameter("colour")) dctucrInputColourYAxis.Add("Black", Chr(34) & "black" & Chr(34)) dctucrInputColourYAxis.Add("Red", Chr(34) & "red" & Chr(34)) @@ -329,6 +336,7 @@ Public Class sdgThemes ucrInputColourYAxis.SetRDefault(Chr(34) & "black" & Chr(34)) ucrInputColourYAxis.bUpdateRCodeFromControl = False + ucrChkFamilyYAxis.SetText("Family") ucrInputFamilyYAxis.SetParameter(New RParameter("family")) dctucrInputFamilyYAxis.Add("Times Roman", Chr(34) & "Times" & Chr(34)) dctucrInputFamilyYAxis.Add("Courier", Chr(34) & "Courier" & Chr(34)) @@ -354,9 +362,11 @@ Public Class sdgThemes ucrInputFamilyYAxis.bUpdateRCodeFromControl = False 'Tick Marks Along-Axes + ucrChkSizeTickMarksYAxis.SetText("Size") ucrNudSizeTickMarksYAxis.SetParameter(New RParameter("size")) ucrNudSizeTickMarksYAxis.Increment = 0.1 + ucrChkLineTypeTickLabelsYAxis.SetText("Line Type") ucrInputLineTypeTickLabelsYAxis.SetParameter(New RParameter("linetype")) dctucrInputLineTypeTickLabelsYAxis.Add("Blank", Chr(34) & "blank" & Chr(34)) dctucrInputLineTypeTickLabelsYAxis.Add("Solid", Chr(34) & "solid" & Chr(34)) @@ -373,6 +383,7 @@ Public Class sdgThemes ucrInputLineTypeTickLabelsYAxis.SetRDefault(Chr(34) & "blank" & Chr(34)) ucrInputLineTypeTickLabelsYAxis.bUpdateRCodeFromControl = False + ucrChkColourTickMarksYAxis.SetText("Colour") ucrInputColourTickMarksYAxis.SetParameter(New RParameter("colour")) dctucrInputColourTickMarksYAxis.Add("Black", Chr(34) & "black" & Chr(34)) dctucrInputColourTickMarksYAxis.Add("Red", Chr(34) & "red" & Chr(34)) @@ -383,6 +394,7 @@ Public Class sdgThemes ucrInputColourTickMarksYAxis.SetItems(dctucrInputColourTickMarksYAxis) ucrInputColourTickMarksYAxis.SetRDefault(Chr(34) & "black" & Chr(34)) + ucrChkLineEndTickLabelsYAxis.SetText("Line End") ucrInputLineEndTickLabelsYAxis.SetParameter(New RParameter("lineend")) ' dctucrInputLineEnd.Add("NULL", Chr(34) & "NULL" & Chr(34)) dctucrInputLineEndTickLabelsYAxis.Add("round", Chr(34) & "round" & Chr(34)) @@ -393,38 +405,47 @@ Public Class sdgThemes ucrInputLineEndTickLabelsYAxis.bUpdateRCodeFromControl = False 'Y axis Label Top Axis - ucrNudSizeTopYAxis.SetParameter(New RParameter("size")) - ucrNudSizeTopYAxis.Increment = 0.1 - ucrNudAngleTopYAxis.SetParameter(New RParameter("angle")) - ucrNudAngleTopYAxis.SetMinMax(0, 360) - ucrNudHjustTopYAxis.SetParameter(New RParameter("hjust")) - ucrNudHjustTopYAxis.Increment = 0.1 - ucrNudHjustTopYAxis.SetMinMax(0, 1) - ucrNudHjustTopYAxis.SetParameter(New RParameter("vjust")) - ucrNudVjustTopYAxis.Increment = 0.1 - ucrNudVjustTopYAxis.SetMinMax(0, 1) - ucrNudLineHeightTopYAxis.SetParameter(New RParameter("lineheight")) - - ucrInputFaceTopYAxis.SetParameter(New RParameter("face")) + ucrChkSizeRightYAxis.SetText("Size") + ucrNudSizeRightYAxis.SetParameter(New RParameter("size")) + ucrNudSizeRightYAxis.Increment = 0.1 + ucrChkAngleRightYAxis.SetText("Angle") + ucrNudAngleRightYAxis.SetParameter(New RParameter("angle")) + ucrNudAngleRightYAxis.SetMinMax(0, 360) + ucrChkHjustRightYAxis.SetText("Hjust") + ucrNudHjustRightYAxis.SetParameter(New RParameter("hjust")) + ucrNudHjustRightYAxis.Increment = 0.1 + ucrNudHjustRightYAxis.SetMinMax(0, 1) + ucrChkVjustRightYAxis.SetText("Vjust") + ucrNudHjustRightYAxis.SetParameter(New RParameter("vjust")) + ucrNudVjustRightYAxis.Increment = 0.1 + ucrNudVjustRightYAxis.SetMinMax(0, 1) + ucrChkLineHeightRightYAxis.SetText("Line Height") + ucrNudLineHeightRightYAxis.SetParameter(New RParameter("lineheight")) + + ucrChkFaceRightYAxis.SetText("Face") + ucrInputFaceRightYAxis.SetParameter(New RParameter("face")) dctucrInputFaceTopYAxis.Add("Plain", Chr(34) & "plain" & Chr(34)) dctucrInputFaceTopYAxis.Add("Bold", Chr(34) & "bold" & Chr(34)) dctucrInputFaceTopYAxis.Add("Italic", Chr(34) & "italic" & Chr(34)) dctucrInputFaceTopYAxis.Add("Bold italic", Chr(34) & "bold.italic" & Chr(34)) - ucrInputFaceTopYAxis.SetItems(dctucrInputFaceTopAxis) - ucrInputFaceTopYAxis.SetRDefault(Chr(34) & "plain" & Chr(34)) + ucrInputFaceRightYAxis.SetItems(dctucrInputFaceTopAxis) + ucrInputFaceRightYAxis.SetRDefault(Chr(34) & "plain" & Chr(34)) + ucrInputFaceRightYAxis.bUpdateRCodeFromControl = False - ucrInputColourTopYAxis.SetParameter(New RParameter("colour")) + ucrChkColourRightYAxis.SetText("Colour") + ucrInputColourRightYAxis.SetParameter(New RParameter("colour")) dctucrInputColourTopYAxis.Add("Black", Chr(34) & "black" & Chr(34)) dctucrInputColourTopYAxis.Add("Red", Chr(34) & "red" & Chr(34)) dctucrInputColourTopYAxis.Add("Blue", Chr(34) & "blue" & Chr(34)) dctucrInputColourTopYAxis.Add("Grey", Chr(34) & "grey" & Chr(34)) dctucrInputColourTopYAxis.Add("Yellow", Chr(34) & "yellow" & Chr(34)) dctucrInputColourTopYAxis.Add("Yellow-Green", Chr(34) & "yellowgreen" & Chr(34)) - ucrInputColourTopYAxis.SetItems(dctucrInputColourTopYAxis) - ucrInputColourTopYAxis.SetRDefault(Chr(34) & "black" & Chr(34)) - ucrInputColourTopYAxis.bUpdateRCodeFromControl = False + ucrInputColourRightYAxis.SetItems(dctucrInputColourTopYAxis) + ucrInputColourRightYAxis.SetRDefault(Chr(34) & "black" & Chr(34)) + ucrInputColourRightYAxis.bUpdateRCodeFromControl = False - ucrInputFamilyTopYAxis.SetParameter(New RParameter("family")) + ucrChkFamilyRightYAxis.SetText("Family") + ucrInputFamilyRightYAxis.SetParameter(New RParameter("family")) 'dctucrInputFamilyYAxisTopAxis.Add("Times Roman", Chr(34) & "Times" & Chr(34)) dctucrInputFamilyTopYAxis.Add("Courier", Chr(34) & "Courier" & Chr(34)) dctucrInputFamilyTopYAxis.Add("Couriersans", Chr(34) & "Couriersans" & Chr(34)) @@ -444,14 +465,20 @@ Public Class sdgThemes dctucrInputFamilyTopYAxis.Add("Short", Chr(34) & "Short" & Chr(34)) dctucrInputFamilyTopYAxis.Add("Canonicalmono", Chr(34) & "Canonicalmono" & Chr(34)) dctucrInputFamilyTopYAxis.Add("AvantGarde", Chr(34) & "AvantGarde" & Chr(34)) - ucrInputFamilyTopYAxis.SetItems(dctucrInputFamilyTopYAxis) - ucrInputFamilyTopYAxis.SetRDefault(Chr(34) & "Times" & Chr(34)) - ucrInputFamilyTopYAxis.bUpdateRCodeFromControl = False + ucrInputFamilyRightYAxis.SetItems(dctucrInputFamilyTopYAxis) + ucrInputFamilyRightYAxis.SetRDefault(Chr(34) & "Times" & Chr(34)) + ucrInputFamilyRightYAxis.bUpdateRCodeFromControl = False 'Tick Marks Along Axes + ucrChkSizeTickMarksYAxis.SetText("Size") ucrNudSizeTickMarksYAxis.SetParameter(New RParameter("size")) ucrNudSizeTickMarksYAxis.Increment = 0.1 + ucrChkSizeTickLabelsYAxis.SetText("Size") + ucrNudSizeTickLabelsYAxis.SetParameter(New RParameter("size")) + ucrNudSizeTickLabelsYAxis.Increment = 0.1 + + ucrChkLineTypeTickMarksYAxis.SetText("Line Type") ucrInputLineTypeTickMarksYAxis.SetParameter(New RParameter("linetype")) dctucrInputLineTypeTickMarksYAxis.Add("Blank", Chr(34) & "blank" & Chr(34)) dctucrInputLineTypeTickMarksYAxis.Add("Solid", Chr(34) & "solid" & Chr(34)) @@ -478,6 +505,7 @@ Public Class sdgThemes 'ucrInputColourTickMarksYAxis.SetItems(dctucrInputColourTickMarksYAxis) 'ucrInputColourTickMarksYAxis.SetRDefault(Chr(34) & "black" & Chr(34)) + ucrChkColourTickLabelsYAxis.SetText("Colour") ucrInputColourTickLabelsYAxis.SetParameter(New RParameter("colour")) dctucrInputColourTickLabelsYAxis.Add("Black", Chr(34) & "black" & Chr(34)) dctucrInputColourTickLabelsYAxis.Add("Red", Chr(34) & "red" & Chr(34)) @@ -489,6 +517,7 @@ Public Class sdgThemes ucrInputColourTickLabelsYAxis.SetRDefault(Chr(34) & "black" & Chr(34)) ucrInputColourTickLabelsYAxis.bUpdateRCodeFromControl = False + ucrChkLineTypeTickMarksYAxis.SetText("Line End") ucrInputLineEndTickMarksYAxis.SetParameter(New RParameter("lineend")) 'dctucrInputLineEndXTickMarks.Add("None", Chr(34) & "NULL" & Chr(34)) dctucrInputLineEndTickMarksYAxis.Add("round", Chr(34) & "round" & Chr(34)) @@ -498,7 +527,34 @@ Public Class sdgThemes ucrInputLineEndTickMarksYAxis.SetRDefault(Chr(34) & "square" & Chr(34)) ucrInputLineEndTickMarksYAxis.bUpdateRCodeFromControl = False - bControlsInitialised = True + ucrChkSizeYAxis.AddToLinkedControls(ucrNudSizeYAxis, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) + ucrChkHjustYAxis.AddToLinkedControls(ucrNudHjustYAxis, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) + ucrChkVjustYAxis.AddToLinkedControls(ucrNudVjustYAxis, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) + ucrChkLineHeightYAxis.AddToLinkedControls(ucrNudLineHeightYAxis, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) + ucrChkAngleYAxis.AddToLinkedControls(ucrNudAngleYAxis, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) + ucrChkFaceYAxis.AddToLinkedControls(ucrInputFaceYAxis, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) + ucrChkFamilyYAxis.AddToLinkedControls(ucrInputFamilyYAxis, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) + ucrChkColourYAxis.AddToLinkedControls(ucrInputColourYAxis, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) + + ucrChkSizeRightYAxis.AddToLinkedControls(ucrNudSizeRightYAxis, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) + ucrChkHjustRightYAxis.AddToLinkedControls(ucrNudHjustRightYAxis, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) + ucrChkVjustRightYAxis.AddToLinkedControls(ucrNudVjustRightYAxis, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) + ucrChkLineHeightRightYAxis.AddToLinkedControls(ucrNudLineHeightRightYAxis, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) + ucrChkAngleRightYAxis.AddToLinkedControls(ucrNudAngleRightYAxis, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) + ucrChkFaceRightYAxis.AddToLinkedControls(ucrInputFaceRightYAxis, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) + ucrChkFamilyRightYAxis.AddToLinkedControls(ucrInputFamilyRightYAxis, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) + ucrChkColourRightYAxis.AddToLinkedControls(ucrInputColourRightYAxis, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) + + 'ucrChkSizeTickMarksXAxis.AddToLinkedControls(ucrNudSizeTickMarks, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) + 'ucrChkLineTypeTickMarksXAxis.AddToLinkedControls(ucrInputLineTypeTickMarks, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) + 'ucrChkLineEndTickMarksXAxis.AddToLinkedControls(ucrInputLineEndTickMarks, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) + 'ucrChkColourTickMarksXAxis.AddToLinkedControls(ucrInputColourTickMarks, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) + + 'ucrChkSizeTickLabelsXAxis.AddToLinkedControls(ucrNudSizeTickLabelsXAxis, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) + 'ucrChkLineTypeTickLabelsXAxis.AddToLinkedControls(ucrInputLineTypeTickLabelsXAxis, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) + 'ucrChkLineEndTickLabelsXAxis.AddToLinkedControls(ucrInputLineEndTickLabelsXAxis, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) + 'ucrChkColourTickLabelsXAxis.AddToLinkedControls(ucrInputColourTickLabelsXAxis, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) + End Sub Public Sub SetRFunction(clsBaseOperator As ROperator, Optional bReset As Boolean = False) @@ -508,107 +564,173 @@ Public Class sdgThemes clsBaseOperator.AddParameter("theme", clsRFunctionParameter:=clsGgThemes, iPosition:=15) clsGgThemes.SetRCommand("theme") - clsElementText.SetRCommand("element_text") - clsElementTextTop.SetRCommand("element_text") - clsElementLine.SetRCommand("element_line") - clsElementLineTop.SetRCommand("element_line") - - 'For Setting default values for the nuds - '' clsTextTheme.AddParameter("size", 10) - '' clsTextTheme.AddParameter("angle", 45) - ''clsTextTheme.AddParameter("hjust", 0.5) - ''clsTextTheme.AddParameter("vjust", 0.5) - ''clsTextTheme.AddParameter("lineheight", 1.1) - + clsElementXAxisText.SetRCommand("element_text") + clsElementXAxisTextTop.SetRCommand("element_text") + clsElementXAxisLine.SetRCommand("element_line") + clsElementXAxisLineTop.SetRCommand("element_line") + clsElementYAxisText.SetRCommand("element_text") + clsElementYAxisTextRight.SetRCommand("element_text") + clsElementYAxisLine.SetRCommand("element_line") + clsElementXAxisLineTop.SetRCommand("element_line") - 'For Setting default values for the nuds - '' clsSegmentTheme.AddParameter("size", 0.5) - '' clsSegmentTheme.AddParameter("linetype", 1) - clsGgThemes.AddParameter("axis.ticks", clsRFunctionParameter:=clsElementLine) - clsGgThemes.AddParameter("axis.ticks.x", clsRFunctionParameter:=clsElementLine) - clsGgThemes.AddParameter("axis.text.x", clsRFunctionParameter:=clsElementText) - clsGgThemes.AddParameter("axis.text.x.top", clsRFunctionParameter:=clsElementTextTop) - 'clsGgThemes.AddParameter("axis.text", clsRFunctionParameter:=clsTextTheme) - ' clsGgThemes.AddParameter("title", clsRFunctionParameter:=clsTextTheme) + clsGgThemes.AddParameter("axis.ticks", clsRFunctionParameter:=clsElementXAxisLine) + clsGgThemes.AddParameter("axis.ticks.x", clsRFunctionParameter:=clsElementXAxisLine) + clsGgThemes.AddParameter("axis.text.x", clsRFunctionParameter:=clsElementXAxisText) + clsGgThemes.AddParameter("axis.text.x.top", clsRFunctionParameter:=clsElementXAxisTextTop) - ' clsGgThemes.AddParameter("axis.title.y.right", clsRFunctionParameter:=clsTextTheme) - 'clsGgThemes.AddParameter("axis.title.y", clsRFunctionParameter:=clsTextTheme) + clsGgThemes.AddParameter("axis.ticks", clsRFunctionParameter:=clsElementYAxisLine) + clsGgThemes.AddParameter("axis.ticks.y", clsRFunctionParameter:=clsElementYAxisLine) + clsGgThemes.AddParameter("axis.text.y", clsRFunctionParameter:=clsElementYAxisText) + clsGgThemes.AddParameter("axis.text.y.right", clsRFunctionParameter:=clsElementYAxisTextRight) 'X axis Label - ucrNudAngle.SetRCode(clsElementText, bReset) - ucrChkAngle.SetRCode(clsElementText, bReset) + ucrNudAngle.SetRCode(clsElementXAxisText, bReset) + ucrChkAngle.SetRCode(clsElementXAxisText, bReset) - ucrNudHjust.SetRCode(clsElementText, bReset) - ucrChkHjust.SetRCode(clsElementText, bReset) + ucrNudHjust.SetRCode(clsElementXAxisText, bReset) + ucrChkHjust.SetRCode(clsElementXAxisText, bReset) - ucrNudLineHeight.SetRCode(clsElementText, bReset) - ucrChkLineHeight.SetRCode(clsElementText, bReset) + ucrNudLineHeight.SetRCode(clsElementXAxisText, bReset) + ucrChkLineHeight.SetRCode(clsElementXAxisText, bReset) - ucrNudsize.SetRCode(clsElementText, bReset) - ucrChkSize.SetRCode(clsElementText, bReset) + ucrNudsize.SetRCode(clsElementXAxisText, bReset) + ucrChkSize.SetRCode(clsElementXAxisText, bReset) - ucrNudVjust.SetRCode(clsElementText, bReset) - ucrChkVjust.SetRCode(clsElementText, bReset) + ucrNudVjust.SetRCode(clsElementXAxisText, bReset) + ucrChkVjust.SetRCode(clsElementXAxisText, bReset) - ucrInputColour.SetRCode(clsElementText, bReset) - ucrChkColour.SetRCode(clsElementText, bReset) + ucrInputColour.SetRCode(clsElementXAxisText, bReset) + ucrChkColour.SetRCode(clsElementXAxisText, bReset) - ucrInputFace.SetRCode(clsElementText, bReset) - ucrChkFace.SetRCode(clsElementText, bReset) + ucrInputFace.SetRCode(clsElementXAxisText, bReset) + ucrChkFace.SetRCode(clsElementXAxisText, bReset) - ucrInputFamily.SetRCode(clsElementText, bReset) - ucrChkFamily.SetRCode(clsElementText, bReset) + ucrInputFamily.SetRCode(clsElementXAxisText, bReset) + ucrChkFamily.SetRCode(clsElementXAxisText, bReset) 'X axis Label Top Axis - ucrNudSizeTickMarks.SetRCode(clsElementLine, bReset) - ucrChkSizeTickMarksXAxis.SetRCode(clsElementLine, bReset) + ucrNudSizeTickMarks.SetRCode(clsElementXAxisLine, bReset) + ucrChkSizeTickMarksXAxis.SetRCode(clsElementXAxisLine, bReset) + + ucrInputColourTickMarks.SetRCode(clsElementXAxisLine, bReset) + ucrChkColourTickMarksXAxis.SetRCode(clsElementXAxisLine, bReset) + + ucrInputLineTypeTickMarks.SetRCode(clsElementXAxisLine, bReset) + ucrChkLineTypeTickMarksXAxis.SetRCode(clsElementXAxisLine, bReset) + + ucrInputLineEndTickMarks.SetRCode(clsElementXAxisLine, bReset) + ucrChkLineEndTickMarksXAxis.SetRCode(clsElementXAxisLine, bReset) + + ucrNudAngleTopAxis.SetRCode(clsElementXAxisTextTop, bReset) + ucrChkAngleTopXAxis.SetRCode(clsElementXAxisTextTop, bReset) + + ucrNudHjustTopAxis.SetRCode(clsElementXAxisTextTop, bReset) + ucrChkHjustTopXAxis.SetRCode(clsElementXAxisTextTop, bReset) + + ucrNudLineHeightTopAxis.SetRCode(clsElementXAxisTextTop, bReset) + ucrChkLineHeightTopXAxis.SetRCode(clsElementXAxisTextTop, bReset) + + ucrNudSizeTopaxis.SetRCode(clsElementXAxisTextTop, bReset) + ucrChkSizeTopXAxis.SetRCode(clsElementXAxisTextTop, bReset) + + ucrNudVjustTopAxis.SetRCode(clsElementXAxisTextTop, bReset) + ucrChkVjustTopXAxis.SetRCode(clsElementXAxisTextTop, bReset) + + ucrInputColourTopAxis.SetRCode(clsElementXAxisTextTop, bReset) + ucrChkColourTopXAxis.SetRCode(clsElementXAxisTextTop, bReset) + + ucrInputFaceTopAxis.SetRCode(clsElementXAxisTextTop, bReset) + ucrChkFaceTopXAxis.SetRCode(clsElementXAxisTextTop, bReset) - ucrInputColourTickMarks.SetRCode(clsElementLine, bReset) - ucrChkColourTickMarksXAxis.SetRCode(clsElementLine, bReset) + ucrInputFamilyTopAxis.SetRCode(clsElementXAxisTextTop, bReset) + ucrChkFamilyTopXAxis.SetRCode(clsElementXAxisTextTop, bReset) + + ucrNudSizeTickLabelsXAxis.SetRCode(clsElementXAxisLine, bReset) + ucrChkSizeTickLabelsXAxis.SetRCode(clsElementXAxisLine, bReset) + + ucrInputColourTickLabelsXAxis.SetRCode(clsElementXAxisLine, bReset) + ucrChkColourTickLabelsXAxis.SetRCode(clsElementXAxisLine, bReset) + + ucrInputLineTypeTickLabelsXAxis.SetRCode(clsElementXAxisLine, bReset) + ucrChkLineTypeTickLabelsXAxis.SetRCode(clsElementXAxisLine, bReset) + + ucrInputLineEndTickLabelsXAxis.SetRCode(clsElementXAxisLine, bReset) + ucrChkLineEndTickLabelsXAxis.SetRCode(clsElementXAxisLine, bReset) + + 'Y axis Label + ucrNudAngleYAxis.SetRCode(clsElementYAxisText, bReset) + ucrChkAngleYAxis.SetRCode(clsElementYAxisText, bReset) + + ucrNudHjustYAxis.SetRCode(clsElementYAxisText, bReset) + ucrChkHjustYAxis.SetRCode(clsElementYAxisText, bReset) + + ucrNudLineHeightYAxis.SetRCode(clsElementYAxisText, bReset) + ucrChkLineHeightYAxis.SetRCode(clsElementYAxisText, bReset) + + ucrNudSizeYAxis.SetRCode(clsElementYAxisText, bReset) + ucrChkSizeYAxis.SetRCode(clsElementYAxisText, bReset) + + ucrNudVjustYAxis.SetRCode(clsElementYAxisText, bReset) + ucrChkVjustYAxis.SetRCode(clsElementYAxisText, bReset) + + ucrInputColourYAxis.SetRCode(clsElementYAxisText, bReset) + ucrChkColourYAxis.SetRCode(clsElementYAxisText, bReset) + + ucrInputFaceYAxis.SetRCode(clsElementYAxisText, bReset) + ucrChkFaceYAxis.SetRCode(clsElementYAxisText, bReset) + + ucrInputFamilyYAxis.SetRCode(clsElementYAxisText, bReset) + ucrChkFamilyYAxis.SetRCode(clsElementYAxisText, bReset) + + 'X axis Label Top Axis + ucrNudSizeTickMarksYAxis.SetRCode(clsElementYAxisLine, bReset) + ucrChkSizeTickMarksYAxis.SetRCode(clsElementYAxisLine, bReset) - ucrInputLineTypeTickMarks.SetRCode(clsElementLine, bReset) - ucrChkLineTypeTickMarksXAxis.SetRCode(clsElementLine, bReset) + ucrInputColourTickMarksYAxis.SetRCode(clsElementYAxisLine, bReset) + ucrChkColourTickLabelsYAxis.SetRCode(clsElementYAxisLine, bReset) - ucrInputLineEndTickMarks.SetRCode(clsElementLine, bReset) - ucrChkLineEndTickMarksXAxis.SetRCode(clsElementLine, bReset) + ucrInputLineTypeTickMarksYAxis.SetRCode(clsElementYAxisLine, bReset) + ucrChkLineTypeTickMarksYAxis.SetRCode(clsElementYAxisLine, bReset) - ucrNudAngleTopAxis.SetRCode(clsElementTextTop, bReset) - ucrChkAngleTopXAxis.SetRCode(clsElementTextTop, bReset) + ucrInputLineEndTickMarksYAxis.SetRCode(clsElementYAxisLine, bReset) + ucrChkLineEndTickMarksYAxis.SetRCode(clsElementYAxisLine, bReset) - ucrNudHjustTopAxis.SetRCode(clsElementTextTop, bReset) - ucrChkHjustTopXAxis.SetRCode(clsElementTextTop, bReset) + ucrNudAngleRightYAxis.SetRCode(clsElementYAxisTextRight, bReset) + ucrChkAngleRightYAxis.SetRCode(clsElementYAxisTextRight, bReset) - ucrNudLineHeightTopAxis.SetRCode(clsElementTextTop, bReset) - ucrChkLineHeightTopXAxis.SetRCode(clsElementTextTop, bReset) + ucrNudHjustRightYAxis.SetRCode(clsElementYAxisTextRight, bReset) + ucrChkHjustRightYAxis.SetRCode(clsElementYAxisTextRight, bReset) - ucrNudSizeTopaxis.SetRCode(clsElementTextTop, bReset) - ucrChkSizeTopXAxis.SetRCode(clsElementTextTop, bReset) + ucrNudLineHeightRightYAxis.SetRCode(clsElementYAxisTextRight, bReset) + ucrChkLineHeightRightYAxis.SetRCode(clsElementYAxisTextRight, bReset) - ucrNudVjustTopAxis.SetRCode(clsElementTextTop, bReset) - ucrChkVjustTopXAxis.SetRCode(clsElementTextTop, bReset) + ucrNudSizeRightYAxis.SetRCode(clsElementYAxisTextRight, bReset) + ucrChkSizeRightYAxis.SetRCode(clsElementYAxisTextRight, bReset) - ucrInputColourTopAxis.SetRCode(clsElementTextTop, bReset) - ucrChkColourTopXAxis.SetRCode(clsElementTextTop, bReset) + ucrNudVjustRightYAxis.SetRCode(clsElementYAxisTextRight, bReset) + ucrChkVjustRightYAxis.SetRCode(clsElementYAxisTextRight, bReset) - ucrInputFaceTopAxis.SetRCode(clsElementTextTop, bReset) - ucrChkFaceTopXAxis.SetRCode(clsElementTextTop, bReset) + ucrInputColourRightYAxis.SetRCode(clsElementYAxisTextRight, bReset) + ucrChkColourRightYAxis.SetRCode(clsElementYAxisTextRight, bReset) - ucrInputFamilyTopAxis.SetRCode(clsElementTextTop, bReset) - ucrChkFamilyTopXAxis.SetRCode(clsElementTextTop, bReset) + ucrInputFaceRightYAxis.SetRCode(clsElementYAxisTextRight, bReset) + ucrChkFaceRightYAxis.SetRCode(clsElementYAxisTextRight, bReset) - ucrNudSizeTickLabelsXAxis.SetRCode(clsElementLine, bReset) - ucrChkSizeTickLabelsXAxis.SetRCode(clsElementLine, bReset) + ucrInputFamilyRightYAxis.SetRCode(clsElementYAxisTextRight, bReset) + ucrChkFamilyRightYAxis.SetRCode(clsElementYAxisTextRight, bReset) - ucrInputColourTickLabelsXAxis.SetRCode(clsElementLine, bReset) - ucrChkColourTickLabelsXAxis.SetRCode(clsElementLine, bReset) + ucrNudSizeTickLabelsYAxis.SetRCode(clsElementYAxisLine, bReset) + ucrChkSizeTickLabelsYAxis.SetRCode(clsElementYAxisLine, bReset) - ucrInputLineTypeTickLabelsXAxis.SetRCode(clsElementLine, bReset) - ucrChkLineTypeTickLabelsXAxis.SetRCode(clsElementLine, bReset) + ucrInputColourTickLabelsYAxis.SetRCode(clsElementYAxisLine, bReset) + ucrChkColourTickLabelsYAxis.SetRCode(clsElementYAxisLine, bReset) - ucrInputLineEndTickLabelsXAxis.SetRCode(clsElementLine, bReset) - ucrChkLineEndTickLabelsXAxis.SetRCode(clsElementLine, bReset) + ucrInputLineTypeTickLabelsYAxis.SetRCode(clsElementYAxisLine, bReset) + ucrChkLineTypeTickLabelsYAxis.SetRCode(clsElementYAxisLine, bReset) + ucrInputLineEndTickLabelsYAxis.SetRCode(clsElementYAxisLine, bReset) + ucrChkLineEndTickLabelsYAxis.SetRCode(clsElementYAxisLine, bReset) End Sub From 1e743e1c7e86f243309c3a1201fdba9054dd1e8c Mon Sep 17 00:00:00 2001 From: Steven Date: Sun, 4 Jun 2017 09:04:39 +0300 Subject: [PATCH 082/154] more edits --- instat/sdgThemes.vb | 36 +++++++++++++----------------------- 1 file changed, 13 insertions(+), 23 deletions(-) diff --git a/instat/sdgThemes.vb b/instat/sdgThemes.vb index 0dd72daec49..84603a40671 100644 --- a/instat/sdgThemes.vb +++ b/instat/sdgThemes.vb @@ -495,16 +495,6 @@ Public Class sdgThemes ucrInputLineTypeTickMarksYAxis.SetRDefault(Chr(34) & "blank" & Chr(34)) ucrInputLineTypeTickMarksYAxis.bUpdateRCodeFromControl = False - 'ucrInputColourTickMarksYAxis.SetParameter(New RParameter("colour")) - 'dctucrInputColourTickMarksYAxis.Add("Black", Chr(34) & "black" & Chr(34)) - 'dctucrInputColourTickMarksYAxis.Add("Red", Chr(34) & "red" & Chr(34)) - 'dctucrInputColourTickMarksYAxis.Add("Blue", Chr(34) & "blue" & Chr(34)) - 'dctucrInputColourTickMarksYAxis.Add("Grey", Chr(34) & "grey" & Chr(34)) - 'dctucrInputColourTickMarksYAxis.Add("Yellow", Chr(34) & "yellow" & Chr(34)) - 'dctucrInputColourTickMarksYAxis.Add("Yellow-Green", Chr(34) & "yellowgreen" & Chr(34)) - 'ucrInputColourTickMarksYAxis.SetItems(dctucrInputColourTickMarksYAxis) - 'ucrInputColourTickMarksYAxis.SetRDefault(Chr(34) & "black" & Chr(34)) - ucrChkColourTickLabelsYAxis.SetText("Colour") ucrInputColourTickLabelsYAxis.SetParameter(New RParameter("colour")) dctucrInputColourTickLabelsYAxis.Add("Black", Chr(34) & "black" & Chr(34)) @@ -517,7 +507,7 @@ Public Class sdgThemes ucrInputColourTickLabelsYAxis.SetRDefault(Chr(34) & "black" & Chr(34)) ucrInputColourTickLabelsYAxis.bUpdateRCodeFromControl = False - ucrChkLineTypeTickMarksYAxis.SetText("Line End") + ucrChkLineEndTickMarksYAxis.SetText("Line End") ucrInputLineEndTickMarksYAxis.SetParameter(New RParameter("lineend")) 'dctucrInputLineEndXTickMarks.Add("None", Chr(34) & "NULL" & Chr(34)) dctucrInputLineEndTickMarksYAxis.Add("round", Chr(34) & "round" & Chr(34)) @@ -545,15 +535,15 @@ Public Class sdgThemes ucrChkFamilyRightYAxis.AddToLinkedControls(ucrInputFamilyRightYAxis, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) ucrChkColourRightYAxis.AddToLinkedControls(ucrInputColourRightYAxis, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) - 'ucrChkSizeTickMarksXAxis.AddToLinkedControls(ucrNudSizeTickMarks, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) - 'ucrChkLineTypeTickMarksXAxis.AddToLinkedControls(ucrInputLineTypeTickMarks, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) - 'ucrChkLineEndTickMarksXAxis.AddToLinkedControls(ucrInputLineEndTickMarks, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) - 'ucrChkColourTickMarksXAxis.AddToLinkedControls(ucrInputColourTickMarks, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) + ucrChkSizeTickMarksYAxis.AddToLinkedControls(ucrNudSizeTickMarksYAxis, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) + ucrChkLineTypeTickMarksYAxis.AddToLinkedControls(ucrInputLineTypeTickMarksYAxis, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) + ucrChkLineEndTickMarksYAxis.AddToLinkedControls(ucrInputLineEndTickMarksYAxis, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) + ucrChkColourTickMarksYAxis.AddToLinkedControls(ucrInputColourTickMarksYAxis, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) - 'ucrChkSizeTickLabelsXAxis.AddToLinkedControls(ucrNudSizeTickLabelsXAxis, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) - 'ucrChkLineTypeTickLabelsXAxis.AddToLinkedControls(ucrInputLineTypeTickLabelsXAxis, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) - 'ucrChkLineEndTickLabelsXAxis.AddToLinkedControls(ucrInputLineEndTickLabelsXAxis, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) - 'ucrChkColourTickLabelsXAxis.AddToLinkedControls(ucrInputColourTickLabelsXAxis, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) + ucrChkSizeTickLabelsYAxis.AddToLinkedControls(ucrNudSizeTickLabelsYAxis, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) + ucrChkLineTypeTickLabelsYAxis.AddToLinkedControls(ucrInputLineTypeTickLabelsYAxis, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) + ucrChkLineEndTickLabelsYAxis.AddToLinkedControls(ucrInputLineEndTickLabelsYAxis, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) + ucrChkColourTickLabelsYAxis.AddToLinkedControls(ucrInputColourTickLabelsYAxis, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) End Sub @@ -567,19 +557,19 @@ Public Class sdgThemes clsElementXAxisText.SetRCommand("element_text") clsElementXAxisTextTop.SetRCommand("element_text") clsElementXAxisLine.SetRCommand("element_line") - clsElementXAxisLineTop.SetRCommand("element_line") + ' clsElementXAxisLineTop.SetRCommand("element_line") clsElementYAxisText.SetRCommand("element_text") clsElementYAxisTextRight.SetRCommand("element_text") clsElementYAxisLine.SetRCommand("element_line") - clsElementXAxisLineTop.SetRCommand("element_line") + ' clsElementXAxisLineTop.SetRCommand("element_line") clsGgThemes.AddParameter("axis.ticks", clsRFunctionParameter:=clsElementXAxisLine) clsGgThemes.AddParameter("axis.ticks.x", clsRFunctionParameter:=clsElementXAxisLine) clsGgThemes.AddParameter("axis.text.x", clsRFunctionParameter:=clsElementXAxisText) clsGgThemes.AddParameter("axis.text.x.top", clsRFunctionParameter:=clsElementXAxisTextTop) - clsGgThemes.AddParameter("axis.ticks", clsRFunctionParameter:=clsElementYAxisLine) + 'clsGgThemes.AddParameter("axis.ticks", clsRFunctionParameter:=clsElementYAxisLine) clsGgThemes.AddParameter("axis.ticks.y", clsRFunctionParameter:=clsElementYAxisLine) clsGgThemes.AddParameter("axis.text.y", clsRFunctionParameter:=clsElementYAxisText) clsGgThemes.AddParameter("axis.text.y.right", clsRFunctionParameter:=clsElementYAxisTextRight) @@ -688,7 +678,7 @@ Public Class sdgThemes ucrChkSizeTickMarksYAxis.SetRCode(clsElementYAxisLine, bReset) ucrInputColourTickMarksYAxis.SetRCode(clsElementYAxisLine, bReset) - ucrChkColourTickLabelsYAxis.SetRCode(clsElementYAxisLine, bReset) + ucrChkColourTickMarksYAxis.SetRCode(clsElementYAxisLine, bReset) ucrInputLineTypeTickMarksYAxis.SetRCode(clsElementYAxisLine, bReset) ucrChkLineTypeTickMarksYAxis.SetRCode(clsElementYAxisLine, bReset) From dae3f4e6d8c9679b0764c6017620a274ac9ac3a0 Mon Sep 17 00:00:00 2001 From: Danny Parsons Date: Sun, 4 Jun 2017 23:07:46 +0100 Subject: [PATCH 083/154] initial linking themes sub dialog --- instat/clsGgplotDefaults.vb | 58 ++++++++++++++++++- instat/clsRFunction.vb | 2 + instat/dlgBarAndPieChart.vb | 2 +- instat/dlgBoxPlot.vb | 2 +- instat/dlgCumulativeDistribution.vb | 2 +- instat/dlgDotPlot.vb | 2 +- instat/dlgHistogram.vb | 2 +- instat/dlgLinePlot.vb | 2 +- instat/dlgRugPlot.vb | 2 +- instat/dlgScatterPlot.vb | 9 ++- instat/dlgSummaryBarOrPieChart.vb | 2 +- instat/sdgPlots.vb | 18 +++++- instat/sdgThemes.vb | 89 ++++++++++++++++------------- 13 files changed, 135 insertions(+), 57 deletions(-) diff --git a/instat/clsGgplotDefaults.vb b/instat/clsGgplotDefaults.vb index 690e319894f..80fca4a32fb 100644 --- a/instat/clsGgplotDefaults.vb +++ b/instat/clsGgplotDefaults.vb @@ -12,7 +12,7 @@ End Get End Property - Public Shared ReadOnly Property clsDefaultTheme As RParameter + Public Shared ReadOnly Property clsDefaultThemeParameter As RParameter Get Dim clsTempParam As New RParameter @@ -79,4 +79,58 @@ Return clsFacetTempFunc End Get End Property -End Class + + Public Shared ReadOnly Property dctThemeFunctions As Dictionary(Of String, RFunction) + Get + Dim dctTemp As New Dictionary(Of String, RFunction) + Dim clsElementText As RFunction + + clsElementText = New RFunction + clsElementText.SetPackageName("ggplot2") + clsElementText.SetRCommand("element_text") + + dctTemp.Add("axis.text.x", clsElementText.Clone()) + dctTemp.Add("axis.text.y", clsElementText.Clone()) + + Return dctTemp + End Get + End Property + + Public Shared ReadOnly Property dctFonts As Dictionary(Of String, String) + Get + Dim dctTemp As New Dictionary(Of String, String) + dctTemp.Add("Times Roman", Chr(34) & "Times" & Chr(34)) + dctTemp.Add("Courier", Chr(34) & "Courier" & Chr(34)) + dctTemp.Add("Couriersans", Chr(34) & "Couriersans" & Chr(34)) + dctTemp.Add("Serif", Chr(34) & "serif" & Chr(34)) + dctTemp.Add("NimbusSanCond", Chr(34) & "NimbusSanCond" & Chr(34)) + dctTemp.Add("CenturySch", Chr(34) & "CenturySch" & Chr(34)) + dctTemp.Add("NewCenturySchoolbook", Chr(34) & "NewCenturySchoolbook" & Chr(34)) + dctTemp.Add("Palatino", Chr(34) & "Palatino" & Chr(34)) + dctTemp.Add("Bookman", Chr(34) & "Bookman" & Chr(34)) + dctTemp.Add("URWBookman", Chr(34) & "URWBookman" & Chr(34)) + dctTemp.Add("URWGothic", Chr(34) & "URWGothic" & Chr(34)) + dctTemp.Add("NimbusRom", Chr(34) & "NimbusRom" & Chr(34)) + dctTemp.Add("URWPalladioURWTimes", Chr(34) & "URWPalladioURWTimes" & Chr(34)) + dctTemp.Add("NimbusMonURWHelvetica", Chr(34) & "NimbusMonURWHelvetica" & Chr(34)) + dctTemp.Add("Helvetica - Narrow", Chr(34) & "Helvetica - Narrow" & Chr(34)) + dctTemp.Add("Helveticaserif", Chr(34) & "Helveticaserif" & Chr(34)) + dctTemp.Add("Short", Chr(34) & "Short" & Chr(34)) + dctTemp.Add("Canonicalmono", Chr(34) & "Canonicalmono" & Chr(34)) + dctTemp.Add("AvantGarde", Chr(34) & "AvantGarde" & Chr(34)) + + Return dctTemp + End Get + End Property + + Public Shared ReadOnly Property clsDefaultThemeFunction As RFunction + Get + Dim clsTempFunc As New RFunction + + clsTempFunc.SetPackageName("ggplot2") + clsTempFunc.SetRCommand("theme") + + Return clsTempFunc + End Get + End Property +End Class \ No newline at end of file diff --git a/instat/clsRFunction.vb b/instat/clsRFunction.vb index a8f5555a4d6..22e131b3931 100644 --- a/instat/clsRFunction.vb +++ b/instat/clsRFunction.vb @@ -82,6 +82,8 @@ Public Class RFunction Dim clsRFunction As New RFunction Dim clsRParam As RParameter + + clsRFunction.strPackageName = strPackageName clsRFunction.strRCommand = strRCommand clsRFunction.strAssignTo = strAssignTo clsRFunction.strAssignToDataFrame = strAssignToDataFrame diff --git a/instat/dlgBarAndPieChart.vb b/instat/dlgBarAndPieChart.vb index 62413578fb3..f37a4d9053b 100644 --- a/instat/dlgBarAndPieChart.vb +++ b/instat/dlgBarAndPieChart.vb @@ -162,7 +162,7 @@ Public Class dlgBarAndPieChart clsYlabFunction = GgplotDefaults.clsYlabTitleFunction.Clone() clsXScalecontinuousFunction = GgplotDefaults.clsXScalecontinuousFunction.Clone() clsRFacetFunction = GgplotDefaults.clsFacetFunction.Clone() - clsBaseOperator.AddParameter(GgplotDefaults.clsDefaultTheme.Clone()) + clsBaseOperator.AddParameter(GgplotDefaults.clsDefaultThemeParameter.Clone()) clsBaseOperator.SetAssignTo("last_graph", strTempDataframe:=ucrBarChartSelector.ucrAvailableDataFrames.cboAvailableDataFrames.Text, strTempGraph:="last_graph") ucrBase.clsRsyntax.SetBaseROperator(clsBaseOperator) diff --git a/instat/dlgBoxPlot.vb b/instat/dlgBoxPlot.vb index e92186d1afc..b5565f6444f 100644 --- a/instat/dlgBoxPlot.vb +++ b/instat/dlgBoxPlot.vb @@ -138,7 +138,7 @@ Public Class dlgBoxplot clsRgeomPlotFunction.SetRCommand("geom_boxplot") clsRgeomPlotFunction.AddParameter("varwidth", "FALSE") - clsBaseOperator.AddParameter(GgplotDefaults.clsDefaultTheme.Clone()) + clsBaseOperator.AddParameter(GgplotDefaults.clsDefaultThemeParameter.Clone()) clsXlabsFunction = GgplotDefaults.clsXlabTitleFunction.Clone() clsLabsFunction = GgplotDefaults.clsDefaultLabs.Clone() clsXScalecontinuousFunction = GgplotDefaults.clsXScalecontinuousFunction.Clone() diff --git a/instat/dlgCumulativeDistribution.vb b/instat/dlgCumulativeDistribution.vb index 3f388ffb0c0..54d95cbcb74 100644 --- a/instat/dlgCumulativeDistribution.vb +++ b/instat/dlgCumulativeDistribution.vb @@ -127,7 +127,7 @@ Public Class dlgCumulativeDistribution clsRgeomCumDistFunction.SetPackageName("ggplot2") clsRgeomCumDistFunction.SetRCommand("stat_ecdf") - clsBaseOperator.AddParameter(GgplotDefaults.clsDefaultTheme.Clone()) + clsBaseOperator.AddParameter(GgplotDefaults.clsDefaultThemeParameter.Clone()) clsXlabsFunction = GgplotDefaults.clsXlabTitleFunction.Clone() clsLabsFunction = GgplotDefaults.clsDefaultLabs.Clone() clsXScalecontinuousFunction = GgplotDefaults.clsXScalecontinuousFunction.Clone() diff --git a/instat/dlgDotPlot.vb b/instat/dlgDotPlot.vb index d3592e5a880..fc4974e922f 100644 --- a/instat/dlgDotPlot.vb +++ b/instat/dlgDotPlot.vb @@ -140,7 +140,7 @@ Public Class dlgDotPlot clsRDotplotGeomFunction.SetRCommand("geom_dotplot") clsRDotplotGeomFunction.AddParameter("binaxis", Chr(34) & "x" & Chr(34)) - clsBaseOperator.AddParameter(GgplotDefaults.clsDefaultTheme.Clone()) + clsBaseOperator.AddParameter(GgplotDefaults.clsDefaultThemeParameter.Clone()) clsXlabsFunction = GgplotDefaults.clsXlabTitleFunction.Clone() clsLabsFunction = GgplotDefaults.clsDefaultLabs.Clone() clsXScalecontinuousFunction = GgplotDefaults.clsXScalecontinuousFunction.Clone() diff --git a/instat/dlgHistogram.vb b/instat/dlgHistogram.vb index 360c6869fd0..828f3b8dd53 100644 --- a/instat/dlgHistogram.vb +++ b/instat/dlgHistogram.vb @@ -111,7 +111,7 @@ Public Class dlgHistogram clsRgeomPlotFunction.SetPackageName("ggplot2") clsRgeomPlotFunction.SetRCommand("geom_histogram") - clsBaseOperator.AddParameter(GgplotDefaults.clsDefaultTheme.Clone()) + clsBaseOperator.AddParameter(GgplotDefaults.clsDefaultThemeParameter.Clone()) clsXlabsFunction = GgplotDefaults.clsXlabTitleFunction.Clone() clsLabsFunction = GgplotDefaults.clsDefaultLabs.Clone() clsXScalecontinuousFunction = GgplotDefaults.clsXScalecontinuousFunction.Clone() diff --git a/instat/dlgLinePlot.vb b/instat/dlgLinePlot.vb index c8f381b1f44..4ff470e51be 100644 --- a/instat/dlgLinePlot.vb +++ b/instat/dlgLinePlot.vb @@ -120,7 +120,7 @@ Public Class dlgLinePlot clsRgeomlineplotFunction.SetPackageName("ggplot2") clsRgeomlineplotFunction.SetRCommand("geom_line") - clsBaseOperator.AddParameter(GgplotDefaults.clsDefaultTheme.Clone()) + clsBaseOperator.AddParameter(GgplotDefaults.clsDefaultThemeParameter.Clone()) clsXlabsFunction = GgplotDefaults.clsXlabTitleFunction.Clone() clsLabsFunction = GgplotDefaults.clsDefaultLabs.Clone() clsXScalecontinuousFunction = GgplotDefaults.clsXScalecontinuousFunction.Clone() diff --git a/instat/dlgRugPlot.vb b/instat/dlgRugPlot.vb index a24cc68c7ee..238bacc44cd 100644 --- a/instat/dlgRugPlot.vb +++ b/instat/dlgRugPlot.vb @@ -104,7 +104,7 @@ Public Class dlgRugPlot clsRgeom_RugPlotFunction.SetPackageName("ggplot2") clsRgeom_RugPlotFunction.SetRCommand("geom_rug") - clsBaseOperator.AddParameter(GgplotDefaults.clsDefaultTheme.Clone()) + clsBaseOperator.AddParameter(GgplotDefaults.clsDefaultThemeParameter.Clone()) clsXlabsFunction = GgplotDefaults.clsXlabTitleFunction.Clone() clsLabsFunction = GgplotDefaults.clsDefaultLabs.Clone() clsXScalecontinuousFunction = GgplotDefaults.clsXScalecontinuousFunction.Clone() diff --git a/instat/dlgScatterPlot.vb b/instat/dlgScatterPlot.vb index b764f370377..2b781403831 100644 --- a/instat/dlgScatterPlot.vb +++ b/instat/dlgScatterPlot.vb @@ -29,6 +29,8 @@ Public Class dlgScatterPlot Private clsXScalecontinuousFunction As New RFunction Private clsYScalecontinuousFunction As New RFunction Private clsFacetsFunction As New RFunction + Private clsThemeFunction As New RFunction + Private dctThemeFunctions As New Dictionary(Of String, RFunction) Private Sub dlgScatterPlot_Load(sender As Object, e As EventArgs) Handles MyBase.Load autoTranslate(Me) @@ -112,14 +114,15 @@ Public Class dlgScatterPlot clsRScatterGeomFunction.SetPackageName("ggplot2") clsRScatterGeomFunction.SetRCommand("geom_point") - clsBaseOperator.AddParameter(GgplotDefaults.clsDefaultTheme.Clone()) + clsBaseOperator.AddParameter(GgplotDefaults.clsDefaultThemeParameter.Clone()) clsXlabsFunction = GgplotDefaults.clsXlabTitleFunction.Clone() clsYlabsFunction = GgplotDefaults.clsYlabTitleFunction.Clone() clsLabsFunction = GgplotDefaults.clsDefaultLabs.Clone() clsXScalecontinuousFunction = GgplotDefaults.clsXScalecontinuousFunction.Clone() clsYScalecontinuousFunction = GgplotDefaults.clsYScalecontinuousFunction.Clone() clsFacetsFunction = GgplotDefaults.clsFacetFunction.Clone() - + dctThemeFunctions = New Dictionary(Of String, RFunction)(GgplotDefaults.dctThemeFunctions) + clsThemeFunction = GgplotDefaults.clsDefaultThemeFunction clsBaseOperator.SetAssignTo("last_graph", strTempDataframe:=ucrSelectorForScatter.ucrAvailableDataFrames.cboAvailableDataFrames.Text, strTempGraph:="last_graph") ucrBase.clsRsyntax.SetBaseROperator(clsBaseOperator) End Sub @@ -150,7 +153,7 @@ Public Class dlgScatterPlot Private Sub cmdOptions_Click(sender As Object, e As EventArgs) Handles cmdOptions.Click 'sdgPlots.SetDataFrame(strNewDataFrame:=ucrSelectorForScatter.ucrAvailableDataFrames.cboAvailableDataFrames.Text) - sdgPlots.SetRCode(clsNewOperator:=ucrBase.clsRsyntax.clsBaseOperator, clsNewXScalecontinuousFunction:=clsXScalecontinuousFunction, clsNewLabsFunction:=clsLabsFunction, clsNewXLabsTitleFunction:=clsXlabsFunction, clsNewYLabTitleFunction:=clsYlabsFunction, clsNewFacetFunction:=clsFacetsFunction, strNewDataFrame:=ucrSelectorForScatter.ucrAvailableDataFrames.cboAvailableDataFrames.Text, bReset:=bResetSubdialog) + sdgPlots.SetRCode(clsNewOperator:=ucrBase.clsRsyntax.clsBaseOperator, clsNewXScalecontinuousFunction:=clsXScalecontinuousFunction, clsNewLabsFunction:=clsLabsFunction, clsNewXLabsTitleFunction:=clsXlabsFunction, clsNewYLabTitleFunction:=clsYlabsFunction, clsNewFacetFunction:=clsFacetsFunction, clsNewThemeFunction:=clsThemeFunction, dctNewThemeFunctions:=dctThemeFunctions, strNewDataFrame:=ucrSelectorForScatter.ucrAvailableDataFrames.cboAvailableDataFrames.Text, bReset:=bResetSubdialog) sdgPlots.ShowDialog() bResetSubdialog = False End Sub diff --git a/instat/dlgSummaryBarOrPieChart.vb b/instat/dlgSummaryBarOrPieChart.vb index d81afc46383..569a1369d16 100644 --- a/instat/dlgSummaryBarOrPieChart.vb +++ b/instat/dlgSummaryBarOrPieChart.vb @@ -119,7 +119,7 @@ Public Class dlgSummaryBarOrPieChart clsRgeomBarFunction.SetRCommand("geom_bar") clsRgeomBarFunction.AddParameter("stat", Chr(34) & "identity" & Chr(34)) - clsBaseOperator.AddParameter(GgplotDefaults.clsDefaultTheme.Clone()) + clsBaseOperator.AddParameter(GgplotDefaults.clsDefaultThemeParameter.Clone()) clsXlabsFunction = GgplotDefaults.clsXlabTitleFunction.Clone() clsLabsFunction = GgplotDefaults.clsDefaultLabs.Clone() clsXScalecontinuousFunction = GgplotDefaults.clsXScalecontinuousFunction.Clone() diff --git a/instat/sdgPlots.vb b/instat/sdgPlots.vb index f60cde7d424..40473e007d2 100644 --- a/instat/sdgPlots.vb +++ b/instat/sdgPlots.vb @@ -40,7 +40,10 @@ Public Class sdgPlots Private clsFacetVariablesOperator As New ROperator Private strFirstVariable As String Private strSecondvariable As String + Private clsThemeFunction As New RFunction + Private dctThemeFunctions As New Dictionary(Of String, RFunction) Private bRCodeSet As Boolean = False + Private bResetThemes As Boolean = True 'See bLayersDefaultIsGolobal below. Private Sub sdgPlots_Load(sender As Object, e As EventArgs) Handles MyBase.Load @@ -187,12 +190,12 @@ Public Class sdgPlots tbpLayers.Enabled = False tbpCoordinates.Enabled = False grpLegendTitle.Enabled = False - cmdAllOptions.Enabled = False + 'cmdAllOptions.Enabled = False GroupBox1.Visible = False bControlsInitialised = True End Sub - Public Sub SetRCode(clsNewOperator As ROperator, Optional clsNewYScalecontinuousFunction As RFunction = Nothing, Optional clsNewXScalecontinuousFunction As RFunction = Nothing, Optional clsNewLabsFunction As RFunction = Nothing, Optional clsNewXLabsTitleFunction As RFunction = Nothing, Optional clsNewYLabTitleFunction As RFunction = Nothing, Optional clsNewFacetFunction As RFunction = Nothing, Optional clsNewThemeParam As RParameter = Nothing, Optional strNewDataFrame As String = "", Optional bReset As Boolean = False) + Public Sub SetRCode(clsNewOperator As ROperator, Optional clsNewYScalecontinuousFunction As RFunction = Nothing, Optional clsNewXScalecontinuousFunction As RFunction = Nothing, Optional clsNewLabsFunction As RFunction = Nothing, Optional clsNewXLabsTitleFunction As RFunction = Nothing, Optional clsNewYLabTitleFunction As RFunction = Nothing, Optional clsNewFacetFunction As RFunction = Nothing, Optional clsNewThemeParam As RParameter = Nothing, Optional clsNewThemeFunction As RFunction = Nothing, Optional dctNewThemeFunctions As Dictionary(Of String, RFunction) = Nothing, Optional strNewDataFrame As String = "", Optional bReset As Boolean = False) Dim clsTempParam As RParameter bRCodeSet = False @@ -208,6 +211,8 @@ Public Class sdgPlots clsYLabFunction = clsNewYLabTitleFunction clsXScalecontinuousFunction = clsNewXScalecontinuousFunction clsFacetFunction = clsNewFacetFunction + clsThemeFunction = clsNewThemeFunction + dctThemeFunctions = dctNewThemeFunctions If clsFacetFunction.ContainsParameter("facets") Then clsTempParam = clsFacetFunction.GetParameter("facets") @@ -230,7 +235,7 @@ Public Class sdgPlots If clsNewThemeParam IsNot Nothing Then clsBaseOperator.AddParameter(clsNewThemeParam) Else - clsBaseOperator.AddParameter(GgplotDefaults.clsDefaultTheme.Clone()) + clsBaseOperator.AddParameter(GgplotDefaults.clsDefaultThemeParameter.Clone()) End If ucrInputGraphTitle.SetRCode(clsLabsFunction, bReset) @@ -262,6 +267,7 @@ Public Class sdgPlots If bReset Then ucr1stFactorReceiver.SetMeAsReceiver() tbpPlotsOptions.SelectedIndex = 0 + bResetThemes = True End If SetFacetParameters() End Sub @@ -607,6 +613,12 @@ Public Class sdgPlots Private Sub ucrChkNoOfRowsOrColumns_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkNoOfRowsOrColumns.ControlValueChanged SetFacetParameters() End Sub + + Private Sub cmdAllOptions_Click(sender As Object, e As EventArgs) Handles cmdAllOptions.Click + sdgThemes.SetRCode(clsBaseOperator, clsNewThemeFunction:=clsThemeFunction, dctNewThemeFunctions:=dctThemeFunctions, bReset:=bResetThemes) + sdgThemes.ShowDialog() + bResetThemes = False + End Sub 'Warning/Task to be discussed: need to disable ok on dlg's when layers are not complete on subdialogues + warning message... 'Warning: actually this will be very hard to implement until the global aes, set from the main layer are properly communicated to plots. Global aes might fill in missing mandatory aes... End Class \ No newline at end of file diff --git a/instat/sdgThemes.vb b/instat/sdgThemes.vb index 84603a40671..eec76779a11 100644 --- a/instat/sdgThemes.vb +++ b/instat/sdgThemes.vb @@ -13,17 +13,19 @@ ' ' You should have received a copy of the GNU General Public License k ' along with this program. If not, see . +Imports instat Imports instat.Translations Public Class sdgThemes Public bControlsInitialised As Boolean = False - Public clsElementXAxisText, clsElementXAxisTextTop, clsElementXAxisLine, clsElementYAxisLine, clsElementYAxisText, clsElementYAxisTextRight, clsElementXAxisLineTop, clsGgThemes As New RFunction + Private clsElementXAxisText, clsElementXAxisTextTop, clsElementXAxisLine, clsElementYAxisLine, clsElementYAxisText, clsElementYAxisTextRight, clsElementXAxisLineTop, clsThemeFunction As New RFunction Private clsBaseOperator As New ROperator + Private dctThemeFunctions As New Dictionary(Of String, RFunction) + Private Sub sdgThemes_Load(sender As Object, e As EventArgs) Handles MyBase.Load autoTranslate(Me) End Sub - Public Sub InitialiseControls() 'X-Axis tab Dim dctucrInputColour As New Dictionary(Of String, String) @@ -91,7 +93,6 @@ Public Class sdgThemes dctucrInputColour.Add("Yellow-Green", Chr(34) & "yellowgreen" & Chr(34)) ucrInputColour.SetItems(dctucrInputColour) ucrInputColour.SetRDefault(Chr(34) & "black" & Chr(34)) - ucrInputColour.bUpdateRCodeFromControl = False ucrChkFamily.SetText("Family") ucrInputFamily.SetParameter(New RParameter("family")) @@ -114,9 +115,8 @@ Public Class sdgThemes dctucrInputFamily.Add("Short", Chr(34) & "Short" & Chr(34)) dctucrInputFamily.Add("Canonicalmono", Chr(34) & "Canonicalmono" & Chr(34)) dctucrInputFamily.Add("AvantGarde", Chr(34) & "AvantGarde" & Chr(34)) - ucrInputFamily.SetItems(dctucrInputFamily) + ucrInputFamily.SetItems(New Dictionary(Of String, String)(GgplotDefaults.dctFonts)) ucrInputFamily.SetRDefault(Chr(34) & "Times" & Chr(34)) - ucrInputFamily.bUpdateRCodeFromControl = False 'Tick Marks Along Axes ucrChkSizeTickMarksXAxis.SetText("Size") @@ -139,7 +139,6 @@ Public Class sdgThemes dctucrInputLineType.Add("12345678", Chr(34) & "12345678" & Chr(34)) ucrInputLineTypeTickMarks.SetItems(dctucrInputLineType) ucrInputLineTypeTickMarks.SetRDefault(Chr(34) & "blank" & Chr(34)) - ucrInputLineTypeTickMarks.bUpdateRCodeFromControl = False ucrChkColourTickMarksXAxis.SetText("Colour") ucrInputColourTickMarks.SetParameter(New RParameter("colour")) @@ -160,7 +159,6 @@ Public Class sdgThemes dctucrInputLineEnd.Add("square", Chr(34) & "square" & Chr(34)) ucrInputLineEndTickMarks.SetItems(dctucrInputLineEnd) ucrInputLineEndTickMarks.SetRDefault(Chr(34) & "square" & Chr(34)) - ucrInputLineEndTickMarks.bUpdateRCodeFromControl = False 'X axis Label Top Axis ucrChkSizeTopXAxis.SetText("Size") @@ -199,7 +197,6 @@ Public Class sdgThemes dctucrInputColourTopAxis.Add("Yellow-Green", Chr(34) & "yellowgreen" & Chr(34)) ucrInputColourTopAxis.SetItems(dctucrInputColourTopAxis) ucrInputColourTopAxis.SetRDefault(Chr(34) & "black" & Chr(34)) - ucrInputColourTopAxis.bUpdateRCodeFromControl = False ucrChkFamilyTopXAxis.SetText("Family") ucrInputFamilyTopAxis.SetParameter(New RParameter("family")) @@ -224,7 +221,6 @@ Public Class sdgThemes dctucrInputFamilyTopAxis.Add("AvantGarde", Chr(34) & "AvantGarde" & Chr(34)) ucrInputFamilyTopAxis.SetItems(dctucrInputFamilyTopAxis) ucrInputFamilyTopAxis.SetRDefault(Chr(34) & "Times" & Chr(34)) - ucrInputFamilyTopAxis.bUpdateRCodeFromControl = False 'Tick Marks Along Axes ucrChkSizeTickLabelsXAxis.SetText("Size") @@ -246,7 +242,6 @@ Public Class sdgThemes dctucrInputLineTypeXTickMarks.Add("12345678", Chr(34) & "12345678" & Chr(34)) ucrInputLineTypeTickLabelsXAxis.SetItems(dctucrInputLineTypeXTickMarks) ucrInputLineTypeTickLabelsXAxis.SetRDefault(Chr(34) & "blank" & Chr(34)) - ucrInputLineTypeTickLabelsXAxis.bUpdateRCodeFromControl = False ucrChkColourTickLabelsXAxis.SetText("Colour") ucrInputColourTickLabelsXAxis.SetParameter(New RParameter("colour")) @@ -267,7 +262,6 @@ Public Class sdgThemes dctucrInputLineEndXTickMarks.Add("square", Chr(34) & "square" & Chr(34)) ucrInputLineEndTickLabelsXAxis.SetItems(dctucrInputLineEndXTickMarks) ucrInputLineEndTickLabelsXAxis.SetRDefault(Chr(34) & "square" & Chr(34)) - ucrInputLineEndTickLabelsXAxis.bUpdateRCodeFromControl = False 'Linking ucrChkSize.AddToLinkedControls(ucrNudsize, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) @@ -334,7 +328,6 @@ Public Class sdgThemes dctucrInputColourYAxis.Add("Yellow-Green", Chr(34) & "yellowgreen" & Chr(34)) ucrInputColourYAxis.SetItems(dctucrInputColourYAxis) ucrInputColourYAxis.SetRDefault(Chr(34) & "black" & Chr(34)) - ucrInputColourYAxis.bUpdateRCodeFromControl = False ucrChkFamilyYAxis.SetText("Family") ucrInputFamilyYAxis.SetParameter(New RParameter("family")) @@ -359,7 +352,6 @@ Public Class sdgThemes dctucrInputFamilyYAxis.Add("AvantGarde", Chr(34) & "AvantGarde" & Chr(34)) ucrInputFamilyYAxis.SetItems(dctucrInputFamilyYAxis) ucrInputFamilyYAxis.SetRDefault(Chr(34) & "Times" & Chr(34)) - ucrInputFamilyYAxis.bUpdateRCodeFromControl = False 'Tick Marks Along-Axes ucrChkSizeTickMarksYAxis.SetText("Size") @@ -381,7 +373,6 @@ Public Class sdgThemes dctucrInputLineTypeTickLabelsYAxis.Add("12345678", Chr(34) & "12345678" & Chr(34)) ucrInputLineTypeTickLabelsYAxis.SetItems(dctucrInputLineTypeTickLabelsYAxis) ucrInputLineTypeTickLabelsYAxis.SetRDefault(Chr(34) & "blank" & Chr(34)) - ucrInputLineTypeTickLabelsYAxis.bUpdateRCodeFromControl = False ucrChkColourTickMarksYAxis.SetText("Colour") ucrInputColourTickMarksYAxis.SetParameter(New RParameter("colour")) @@ -402,7 +393,6 @@ Public Class sdgThemes dctucrInputLineEndTickLabelsYAxis.Add("square", Chr(34) & "square" & Chr(34)) ucrInputLineEndTickLabelsYAxis.SetItems(dctucrInputLineEndTickLabelsYAxis) ucrInputLineEndTickLabelsYAxis.SetRDefault(Chr(34) & "square" & Chr(34)) - ucrInputLineEndTickLabelsYAxis.bUpdateRCodeFromControl = False 'Y axis Label Top Axis ucrChkSizeRightYAxis.SetText("Size") @@ -430,7 +420,6 @@ Public Class sdgThemes dctucrInputFaceTopYAxis.Add("Bold italic", Chr(34) & "bold.italic" & Chr(34)) ucrInputFaceRightYAxis.SetItems(dctucrInputFaceTopAxis) ucrInputFaceRightYAxis.SetRDefault(Chr(34) & "plain" & Chr(34)) - ucrInputFaceRightYAxis.bUpdateRCodeFromControl = False ucrChkColourRightYAxis.SetText("Colour") ucrInputColourRightYAxis.SetParameter(New RParameter("colour")) @@ -442,7 +431,6 @@ Public Class sdgThemes dctucrInputColourTopYAxis.Add("Yellow-Green", Chr(34) & "yellowgreen" & Chr(34)) ucrInputColourRightYAxis.SetItems(dctucrInputColourTopYAxis) ucrInputColourRightYAxis.SetRDefault(Chr(34) & "black" & Chr(34)) - ucrInputColourRightYAxis.bUpdateRCodeFromControl = False ucrChkFamilyRightYAxis.SetText("Family") ucrInputFamilyRightYAxis.SetParameter(New RParameter("family")) @@ -467,7 +455,6 @@ Public Class sdgThemes dctucrInputFamilyTopYAxis.Add("AvantGarde", Chr(34) & "AvantGarde" & Chr(34)) ucrInputFamilyRightYAxis.SetItems(dctucrInputFamilyTopYAxis) ucrInputFamilyRightYAxis.SetRDefault(Chr(34) & "Times" & Chr(34)) - ucrInputFamilyRightYAxis.bUpdateRCodeFromControl = False 'Tick Marks Along Axes ucrChkSizeTickMarksYAxis.SetText("Size") @@ -493,7 +480,6 @@ Public Class sdgThemes dctucrInputLineTypeTickMarksYAxis.Add("12345678", Chr(34) & "12345678" & Chr(34)) ucrInputLineTypeTickMarksYAxis.SetItems(dctucrInputLineTypeTickMarksYAxis) ucrInputLineTypeTickMarksYAxis.SetRDefault(Chr(34) & "blank" & Chr(34)) - ucrInputLineTypeTickMarksYAxis.bUpdateRCodeFromControl = False ucrChkColourTickLabelsYAxis.SetText("Colour") ucrInputColourTickLabelsYAxis.SetParameter(New RParameter("colour")) @@ -505,7 +491,6 @@ Public Class sdgThemes dctucrInputColourTickLabelsYAxis.Add("Yellow-Green", Chr(34) & "yellowgreen" & Chr(34)) ucrInputColourTickLabelsYAxis.SetItems(dctucrInputColourTickMarksYAxis) ucrInputColourTickLabelsYAxis.SetRDefault(Chr(34) & "black" & Chr(34)) - ucrInputColourTickLabelsYAxis.bUpdateRCodeFromControl = False ucrChkLineEndTickMarksYAxis.SetText("Line End") ucrInputLineEndTickMarksYAxis.SetParameter(New RParameter("lineend")) @@ -515,7 +500,6 @@ Public Class sdgThemes dctucrInputLineEndTickMarksYAxis.Add("square", Chr(34) & "square" & Chr(34)) ucrInputLineEndTickMarksYAxis.SetItems(dctucrInputLineEndTickMarksYAxis) ucrInputLineEndTickMarksYAxis.SetRDefault(Chr(34) & "square" & Chr(34)) - ucrInputLineEndTickMarksYAxis.bUpdateRCodeFromControl = False ucrChkSizeYAxis.AddToLinkedControls(ucrNudSizeYAxis, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) ucrChkHjustYAxis.AddToLinkedControls(ucrNudHjustYAxis, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) @@ -544,35 +528,37 @@ Public Class sdgThemes ucrChkLineTypeTickLabelsYAxis.AddToLinkedControls(ucrInputLineTypeTickLabelsYAxis, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) ucrChkLineEndTickLabelsYAxis.AddToLinkedControls(ucrInputLineEndTickLabelsYAxis, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) ucrChkColourTickLabelsYAxis.AddToLinkedControls(ucrInputColourTickLabelsYAxis, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) - End Sub - Public Sub SetRFunction(clsBaseOperator As ROperator, Optional bReset As Boolean = False) + Public Sub SetRCode(clsBaseOperator As ROperator, clsNewThemeFunction As RFunction, dctNewThemeFunctions As Dictionary(Of String, RFunction), Optional bReset As Boolean = False) If Not bControlsInitialised Then InitialiseControls() End If - clsBaseOperator.AddParameter("theme", clsRFunctionParameter:=clsGgThemes, iPosition:=15) - clsGgThemes.SetRCommand("theme") + clsBaseOperator.AddParameter("theme", clsRFunctionParameter:=clsThemeFunction, iPosition:=15) + clsThemeFunction = clsNewThemeFunction - clsElementXAxisText.SetRCommand("element_text") - clsElementXAxisTextTop.SetRCommand("element_text") - clsElementXAxisLine.SetRCommand("element_line") - ' clsElementXAxisLineTop.SetRCommand("element_line") + dctThemeFunctions = dctNewThemeFunctions + dctThemeFunctions.TryGetValue("axis.text.x", clsElementXAxisText) - clsElementYAxisText.SetRCommand("element_text") - clsElementYAxisTextRight.SetRCommand("element_text") - clsElementYAxisLine.SetRCommand("element_line") - ' clsElementXAxisLineTop.SetRCommand("element_line") + 'clsElementXAxisText.SetRCommand("element_text") + 'clsElementXAxisTextTop.SetRCommand("element_text") + 'clsElementXAxisLine.SetRCommand("element_line") + '' clsElementXAxisLineTop.SetRCommand("element_line") - clsGgThemes.AddParameter("axis.ticks", clsRFunctionParameter:=clsElementXAxisLine) - clsGgThemes.AddParameter("axis.ticks.x", clsRFunctionParameter:=clsElementXAxisLine) - clsGgThemes.AddParameter("axis.text.x", clsRFunctionParameter:=clsElementXAxisText) - clsGgThemes.AddParameter("axis.text.x.top", clsRFunctionParameter:=clsElementXAxisTextTop) + 'clsElementYAxisText.SetRCommand("element_text") + 'clsElementYAxisTextRight.SetRCommand("element_text") + 'clsElementYAxisLine.SetRCommand("element_line") + '' clsElementXAxisLineTop.SetRCommand("element_line") - 'clsGgThemes.AddParameter("axis.ticks", clsRFunctionParameter:=clsElementYAxisLine) - clsGgThemes.AddParameter("axis.ticks.y", clsRFunctionParameter:=clsElementYAxisLine) - clsGgThemes.AddParameter("axis.text.y", clsRFunctionParameter:=clsElementYAxisText) - clsGgThemes.AddParameter("axis.text.y.right", clsRFunctionParameter:=clsElementYAxisTextRight) + 'clsThemeFunction.AddParameter("axis.ticks", clsRFunctionParameter:=clsElementXAxisLine) + 'clsThemeFunction.AddParameter("axis.ticks.x", clsRFunctionParameter:=clsElementXAxisLine) + 'clsThemeFunction.AddParameter("axis.text.x", clsRFunctionParameter:=clsElementXAxisText) + 'clsThemeFunction.AddParameter("axis.text.x.top", clsRFunctionParameter:=clsElementXAxisTextTop) + + ''clsGgThemes.AddParameter("axis.ticks", clsRFunctionParameter:=clsElementYAxisLine) + 'clsThemeFunction.AddParameter("axis.ticks.y", clsRFunctionParameter:=clsElementYAxisLine) + 'clsThemeFunction.AddParameter("axis.text.y", clsRFunctionParameter:=clsElementYAxisText) + 'clsThemeFunction.AddParameter("axis.text.y.right", clsRFunctionParameter:=clsElementYAxisTextRight) 'X axis Label ucrNudAngle.SetRCode(clsElementXAxisText, bReset) @@ -722,6 +708,27 @@ Public Class sdgThemes ucrInputLineEndTickLabelsYAxis.SetRCode(clsElementYAxisLine, bReset) ucrChkLineEndTickLabelsYAxis.SetRCode(clsElementYAxisLine, bReset) + AddRemoveElementXAxisText() End Sub + Private Sub AddRemoveElementXAxisText() + If ucrChkAngle.Checked OrElse ucrChkHjust.Checked OrElse ucrChkLineHeight.Checked OrElse ucrChkSize.Checked OrElse ucrChkVjust.Checked OrElse ucrChkColour.Checked OrElse ucrChkFace.Checked OrElse ucrChkFamily.Checked Then + clsThemeFunction.AddParameter("axis.text.x", clsRFunctionParameter:=clsElementXAxisText) + Else + clsThemeFunction.RemoveParameterByName("axis.text.x") + End If + AddRemoveTheme() + 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 ElementXAxisTextControls_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkAngle.ControlValueChanged, ucrChkHjust.ControlValueChanged 'etc. add all controls for "axis.text.x" + AddRemoveElementXAxisText() + End Sub End Class \ No newline at end of file From 3ff21d6f8eb26306685e926320a6bd8b9800d5fa Mon Sep 17 00:00:00 2001 From: shadrack kibet Date: Mon, 5 Jun 2017 12:27:42 +0300 Subject: [PATCH 084/154] minor edit --- instat/dlgInsertColumn.vb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/instat/dlgInsertColumn.vb b/instat/dlgInsertColumn.vb index db54c121476..719bc5df0f0 100644 --- a/instat/dlgInsertColumn.vb +++ b/instat/dlgInsertColumn.vb @@ -200,7 +200,7 @@ Public Class dlgInsertColumn End Sub Private Sub ucrSelectorInsertColumns_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrDataFramesList.ControlValueChanged - ucrNudStartRow.SetMinMax(1, ucrDataFramesList.iDataFrameLength) + ucrNudStartRow.Value = ucrDataFramesList.iDataFrameLength End Sub Private Sub ucrReceiverColumnsToInsert_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrReceiverColumnsToInsert.ControlContentsChanged, ucrPnlColumnsOrRows.ControlContentsChanged, ucrPnlBeforeAfter.ControlContentsChanged, ucrPnlInsertColumns.ControlContentsChanged, ucrInputPrefixForNewColumn.ControlContentsChanged, ucrInputDefaultValue.ControlContentsChanged, ucrInputBeforeAfter.ControlContentsChanged, ucrNudNumberOfRows.ControlContentsChanged, ucrNudStartRow.ControlContentsChanged, ucrNudNumberOfColumns.ControlContentsChanged From 68bc737acff399bb9780575fae52f607e214529c Mon Sep 17 00:00:00 2001 From: shadrack kibet Date: Mon, 5 Jun 2017 13:07:49 +0300 Subject: [PATCH 085/154] edits --- instat/dlgInsertColumn.vb | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/instat/dlgInsertColumn.vb b/instat/dlgInsertColumn.vb index 719bc5df0f0..b8cae250894 100644 --- a/instat/dlgInsertColumn.vb +++ b/instat/dlgInsertColumn.vb @@ -30,6 +30,7 @@ Public Class dlgInsertColumn SetRCodeForControls(bReset) bReset = False autoTranslate(Me) + ReopenDialog() TestOKEnabled() End Sub @@ -136,8 +137,16 @@ Public Class dlgInsertColumn clsInsertRowFunction.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$insert_row_in_data") clsInsertRowFunction.AddParameter("before", "FALSE") clsInsertRowFunction.AddParameter("start_row", ucrDataFramesList.iDataFrameLength) + ucrNudStartRow.SetMinMax(1, ucrDataFramesList.iDataFrameLength) ucrBase.clsRsyntax.SetBaseRFunction(clsInsertColumnFunction) + End Sub + + Private Sub ReopenDialog() + ucrDataFramesList.Reset() ucrNudStartRow.SetMinMax(1, ucrDataFramesList.iDataFrameLength) + If ucrDataFramesList.cboAvailableDataFrames.Text <> "" Then + ucrNudStartRow.Value = ucrDataFramesList.iDataFrameLength + End If End Sub Private Sub SetRCodeForControls(bReset As Boolean) From 6924bd6e021c8c3830736c1f8b62aea88b120021 Mon Sep 17 00:00:00 2001 From: John Lunalo Date: Mon, 5 Jun 2017 15:31:19 +0300 Subject: [PATCH 086/154] Updating dlgContrast --- instat/dlgContrasts.vb | 125 ++++++++++++++++++++++------------------- 1 file changed, 68 insertions(+), 57 deletions(-) diff --git a/instat/dlgContrasts.vb b/instat/dlgContrasts.vb index cf76baf9343..4901a0e68de 100644 --- a/instat/dlgContrasts.vb +++ b/instat/dlgContrasts.vb @@ -21,7 +21,8 @@ Imports unvell.ReoGrid.Events Public Class dlgContrasts Public WithEvents grdCurrSheet As Worksheet Public bFirstLoad As Boolean = True - Public clsNlevels, clsFactorColumn, clsContractMatrix As New RFunction + Public bReset As Boolean = True + Public clsNlevels, clsFactorColumn, clsContractMatrix, clsSetContrast As New RFunction Public Sub New() @@ -38,15 +39,25 @@ Public Class dlgContrasts End Sub Private Sub dlgContrasts_Load(sender As Object, e As EventArgs) Handles MyBase.Load - autoTranslate(Me) - If bFirstLoad Then - InitialiseDialog() - SetDefaults() + 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 SetRCodeforControls(bReset As Boolean) + ucrSelectorForContrast.SetRCode(clsSetContrast, bReset) + ucrReceiverForContrasts.SetRCode(clsSetContrast, bReset) + ucrInputContrastName.SetRCode(clsSetContrast, bReset) + End Sub + Private Sub TestOKEnabled() If ucrReceiverForContrasts.IsEmpty OrElse (ucrInputContrastName.GetText = "User Defined" AndAlso IsEmptyCells()) Then ucrBase.OKEnabled(False) @@ -60,66 +71,50 @@ Public Class dlgContrasts ucrReceiverForContrasts.SetMeAsReceiver() ucrReceiverForContrasts.SetIncludedDataTypes({"factor"}) ucrBase.iHelpTopicID = 353 - clsNlevels.SetRCommand("nlevels") - clsContractMatrix.SetRCommand("matrix") - clsFactorColumn.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$get_columns_from_data") - ucrInputContrastName.SetItems({"Treatment/Control", "Helmert", "Polynomials", "Sum to Zero", "User Defined"}) - ucrBase.clsRsyntax.SetFunction(frmMain.clsRLink.strInstatDataObject & "$set_contrasts_of_factor") + + Dim dctContrastTypes As New Dictionary(Of String, String) + ucrInputContrastName.SetParameter(New RParameter("new_contrasts", 2)) + dctContrastTypes.Add("Treatment/Control", Chr(34) & "contr.treatment" & Chr(34)) + dctContrastTypes.Add("Helmert", Chr(34) & "contr.helmert" & Chr(34)) + dctContrastTypes.Add("Polynomials", Chr(34) & "contr.poly" & Chr(34)) + dctContrastTypes.Add("Sum to Zero", Chr(34) & "contr.sum" & Chr(34)) + dctContrastTypes.Add("User Defined", Chr(34) & "user_defined" & Chr(34)) + ucrInputContrastName.SetItems(dctContrastTypes) + ucrInputContrastName.SetLinkedDisplayControl(lblSelectContrastName) + + ucrSelectorForContrast.SetParameter(New RParameter("data_name", 0)) + ucrSelectorForContrast.SetParameterIsString() + + ucrReceiverForContrasts.SetParameter(New RParameter("col_name", 1)) + ucrReceiverForContrasts.SetParameterIsString() + End Sub Private Sub SetDefaults() - ucrInputContrastName.SetName("Treatment/Control") - ucrSelectorForContrast.Reset() - SelectContrast() + clsContractMatrix = New RFunction + clsNlevels = New RFunction + clsFactorColumn = New RFunction + clsSetContrast = New RFunction + grdCurrSheet.Reset() - TestOKEnabled() - End Sub - - Private Sub ucrBase_ClickReset(sender As Object, e As EventArgs) Handles ucrBase.ClickReset - SetDefaults() - End Sub - Private Sub ucrReceiverForContrasts_SelectionChanged(sender As Object, e As EventArgs) Handles ucrReceiverForContrasts.SelectionChanged - If Not ucrReceiverForContrasts.IsEmpty Then - grdLayoutForContrasts.Enabled = True - ucrBase.clsRsyntax.AddParameter("col_name", ucrReceiverForContrasts.GetVariableNames) - Else - grdLayoutForContrasts.Enabled = False - ucrBase.clsRsyntax.RemoveParameter("col_name") - End If - SelectContrast() - TestOKEnabled() - End Sub + ucrInputContrastName.Reset() + ucrSelectorForContrast.Reset() - Private Sub ucrSelectorForContrast_DataFrameChanged() Handles ucrSelectorForContrast.DataFrameChanged - clsFactorColumn.AddParameter("data_name", Chr(34) & ucrSelectorForContrast.ucrAvailableDataFrames.cboAvailableDataFrames.SelectedItem & Chr(34)) - ucrBase.clsRsyntax.AddParameter("data_name", Chr(34) & ucrSelectorForContrast.ucrAvailableDataFrames.cboAvailableDataFrames.SelectedItem & Chr(34)) - End Sub + clsSetContrast.AddParameter("new_contrasts", Chr(34) & "contr.treatment" & Chr(34)) - Private Sub ucrInputContrast_NameChangedChanged() Handles ucrInputContrastName.NameChanged - If Not ucrInputContrastName.IsEmpty Then - SelectContrast() - Else - ucrBase.clsRsyntax.RemoveParameter("new_contrasts") - End If - IsEmptyCells() - TestOKEnabled() - End Sub + clsNlevels.SetRCommand("nlevels") + clsContractMatrix.SetRCommand("matrix") + clsFactorColumn.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$get_columns_from_data") + clsSetContrast.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$set_contrasts_of_factor") - Private Sub SelectContrast() - Select Case ucrInputContrastName.GetText - Case "Treatment/Control" - ucrBase.clsRsyntax.AddParameter("new_contrasts", Chr(34) & "contr.treatment" & Chr(34)) - Case "Helmert" - ucrBase.clsRsyntax.AddParameter("new_contrasts", Chr(34) & "contr.helmert" & Chr(34)) - Case "Polynomials" - ucrBase.clsRsyntax.AddParameter("new_contrasts", Chr(34) & "contr.poly" & Chr(34)) - Case "Sum to Zero" - ucrBase.clsRsyntax.AddParameter("new_contrasts", Chr(34) & "contr.sum" & Chr(34)) - Case "User Defined" - ucrBase.clsRsyntax.AddParameter("new_contrasts", Chr(34) & "user_defined" & Chr(34)) - End Select - SetGridDimensions() + ucrBase.clsRsyntax.SetBaseRFunction(clsSetContrast) + End Sub + + Private Sub ucrBase_ClickReset(sender As Object, e As EventArgs) Handles ucrBase.ClickReset + SetDefaults() + SetRCodeforControls(True) + TestOKEnabled() End Sub Public Sub SetMatrixFunction() @@ -205,4 +200,20 @@ Public Class dlgContrasts SetMatrixFunction() TestOKEnabled() End Sub + + Private Sub ucrReceiverForContrasts_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrReceiverForContrasts.ControlContentsChanged + If Not ucrReceiverForContrasts.IsEmpty Then + grdLayoutForContrasts.Enabled = True + Else + grdLayoutForContrasts.Enabled = False + End If + SetGridDimensions() + TestOKEnabled() + End Sub + + Private Sub ucrInputContrastName_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrInputContrastName.ControlContentsChanged + SetGridDimensions() + IsEmptyCells() + TestOKEnabled() + End Sub End Class \ No newline at end of file From f235529fef55b8402b689094ca13c2396ea1f690 Mon Sep 17 00:00:00 2001 From: John Lunalo Date: Mon, 5 Jun 2017 16:09:33 +0300 Subject: [PATCH 087/154] more changes --- instat/dlgContrasts.vb | 1 + 1 file changed, 1 insertion(+) diff --git a/instat/dlgContrasts.vb b/instat/dlgContrasts.vb index 4901a0e68de..ee0dad4cb2c 100644 --- a/instat/dlgContrasts.vb +++ b/instat/dlgContrasts.vb @@ -149,6 +149,7 @@ Public Class dlgContrasts If Not ucrReceiverForContrasts.IsEmpty AndAlso ucrInputContrastName.GetText = "User Defined" Then Me.Size = New System.Drawing.Size(440 + grdLayoutForContrasts.Width, 294) clsFactorColumn.AddParameter("col_name", ucrReceiverForContrasts.GetVariableNames()) + clsFactorColumn.AddParameter("data_name", Chr(34) & ucrSelectorForContrast.ucrAvailableDataFrames.cboAvailableDataFrames.SelectedItem & Chr(34)) clsNlevels.AddParameter("x", clsRFunctionParameter:=clsFactorColumn) grdCurrSheet.Rows = frmMain.clsRLink.RunInternalScriptGetValue(clsNlevels.ToScript).AsNumeric(0) grdCurrSheet.Columns = grdCurrSheet.Rows - 1 From f009f1e4f6b37a70929257b373d7d9229f958cc5 Mon Sep 17 00:00:00 2001 From: Steven Date: Mon, 5 Jun 2017 16:15:09 +0300 Subject: [PATCH 088/154] edits --- instat/sdgPlots.vb | 3 +- instat/sdgThemes.Designer.vb | 538 +++++++++++++++++++++++------------ instat/sdgThemes.vb | 109 ++----- 3 files changed, 394 insertions(+), 256 deletions(-) diff --git a/instat/sdgPlots.vb b/instat/sdgPlots.vb index 40473e007d2..43820cc0ff1 100644 --- a/instat/sdgPlots.vb +++ b/instat/sdgPlots.vb @@ -212,7 +212,7 @@ Public Class sdgPlots clsXScalecontinuousFunction = clsNewXScalecontinuousFunction clsFacetFunction = clsNewFacetFunction clsThemeFunction = clsNewThemeFunction - dctThemeFunctions = dctNewThemeFunctions + dctThemeFunctions = GgplotDefaults.dctThemeFunctions If clsFacetFunction.ContainsParameter("facets") Then clsTempParam = clsFacetFunction.GetParameter("facets") @@ -616,6 +616,7 @@ Public Class sdgPlots Private Sub cmdAllOptions_Click(sender As Object, e As EventArgs) Handles cmdAllOptions.Click sdgThemes.SetRCode(clsBaseOperator, clsNewThemeFunction:=clsThemeFunction, dctNewThemeFunctions:=dctThemeFunctions, bReset:=bResetThemes) + Me.SendToBack() sdgThemes.ShowDialog() bResetThemes = False End Sub diff --git a/instat/sdgThemes.Designer.vb b/instat/sdgThemes.Designer.vb index 1f3c65e6aa7..8ce2db46e1b 100644 --- a/instat/sdgThemes.Designer.vb +++ b/instat/sdgThemes.Designer.vb @@ -26,6 +26,14 @@ Partial Class sdgThemes Me.tbAxis = New System.Windows.Forms.TabPage() Me.grpTableOptions = New System.Windows.Forms.GroupBox() Me.grpTickLabels = New System.Windows.Forms.GroupBox() + Me.grpAxisLabelTopAxis = New System.Windows.Forms.GroupBox() + Me.GroupBox1 = New System.Windows.Forms.GroupBox() + Me.grpAxisLabel = New System.Windows.Forms.GroupBox() + Me.tbYaxis = New System.Windows.Forms.TabPage() + Me.grpTickLabelYAxis = New System.Windows.Forms.GroupBox() + Me.grpYAxisTopLabels = New System.Windows.Forms.GroupBox() + Me.grpTickMarksYAxis = New System.Windows.Forms.GroupBox() + Me.grpYAxisLabels = New System.Windows.Forms.GroupBox() Me.ucrChkLineEndTickLabelsXAxis = New instat.ucrCheck() Me.ucrChkSizeTickLabelsXAxis = New instat.ucrCheck() Me.ucrChkLineTypeTickLabelsXAxis = New instat.ucrCheck() @@ -34,7 +42,6 @@ Partial Class sdgThemes Me.ucrNudSizeTickLabelsXAxis = New instat.ucrNud() Me.ucrInputColourTickLabelsXAxis = New instat.ucrInputComboBox() Me.ucrInputLineTypeTickLabelsXAxis = New instat.ucrInputComboBox() - Me.grpAxisLabelTopAxis = New System.Windows.Forms.GroupBox() Me.ucrChkColourTopXAxis = New instat.ucrCheck() Me.ucrChkFaceTopXAxis = New instat.ucrCheck() Me.ucrChkFamilyTopXAxis = New instat.ucrCheck() @@ -51,8 +58,13 @@ Partial Class sdgThemes Me.ucrInputColourTopAxis = New instat.ucrInputComboBox() Me.ucrInputFaceTopAxis = New instat.ucrInputComboBox() Me.ucrInputFamilyTopAxis = New instat.ucrInputComboBox() - Me.GroupBox1 = New System.Windows.Forms.GroupBox() + Me.ucrInputMargin = New instat.ucrInputTextBox() + Me.ucrChkMaigin = New instat.ucrCheck() + Me.ucrInputMarginUnits = New instat.ucrInputComboBox() + Me.ucrInputUnits = New instat.ucrInputTextBox() Me.ucrChkLineEndTickMarksXAxis = New instat.ucrCheck() + Me.ucrChkUnits = New instat.ucrCheck() + Me.ucrInputTickUnits = New instat.ucrInputComboBox() Me.ucrChkSizeTickMarksXAxis = New instat.ucrCheck() Me.ucrChkLineTypeTickMarksXAxis = New instat.ucrCheck() Me.ucrChkColourTickMarksXAxis = New instat.ucrCheck() @@ -60,7 +72,6 @@ Partial Class sdgThemes Me.ucrNudSizeTickMarks = New instat.ucrNud() Me.ucrInputColourTickMarks = New instat.ucrInputComboBox() Me.ucrInputLineTypeTickMarks = New instat.ucrInputComboBox() - Me.grpAxisLabel = New System.Windows.Forms.GroupBox() Me.ucrChkColour = New instat.ucrCheck() Me.ucrChkFace = New instat.ucrCheck() Me.ucrChkFamily = New instat.ucrCheck() @@ -77,8 +88,6 @@ Partial Class sdgThemes Me.ucrInputColour = New instat.ucrInputComboBox() Me.ucrInputFace = New instat.ucrInputComboBox() Me.ucrInputFamily = New instat.ucrInputComboBox() - Me.tbYaxis = New System.Windows.Forms.TabPage() - Me.grpTickLabelYAxis = New System.Windows.Forms.GroupBox() Me.ucrChkLineEndTickLabelsYAxis = New instat.ucrCheck() Me.ucrChkSizeTickLabelsYAxis = New instat.ucrCheck() Me.ucrChkLineTypeTickLabelsYAxis = New instat.ucrCheck() @@ -87,7 +96,6 @@ Partial Class sdgThemes Me.ucrNudSizeTickLabelsYAxis = New instat.ucrNud() Me.ucrInputColourTickLabelsYAxis = New instat.ucrInputComboBox() Me.ucrInputLineTypeTickLabelsYAxis = New instat.ucrInputComboBox() - Me.grpYAxisTopLabels = New System.Windows.Forms.GroupBox() Me.ucrChkColourRightYAxis = New instat.ucrCheck() Me.ucrChkFaceRightYAxis = New instat.ucrCheck() Me.ucrChkFamilyRightYAxis = New instat.ucrCheck() @@ -104,7 +112,6 @@ Partial Class sdgThemes Me.ucrInputColourRightYAxis = New instat.ucrInputComboBox() Me.ucrInputFaceRightYAxis = New instat.ucrInputComboBox() Me.ucrInputFamilyRightYAxis = New instat.ucrInputComboBox() - Me.grpTickMarksYAxis = New System.Windows.Forms.GroupBox() Me.ucrChkLineEndTickMarksYAxis = New instat.ucrCheck() Me.ucrChkSizeTickMarksYAxis = New instat.ucrCheck() Me.ucrChkLineTypeTickMarksYAxis = New instat.ucrCheck() @@ -113,7 +120,6 @@ Partial Class sdgThemes Me.ucrNudSizeTickMarksYAxis = New instat.ucrNud() Me.ucrInputColourTickMarksYAxis = New instat.ucrInputComboBox() Me.ucrInputLineTypeTickMarksYAxis = New instat.ucrInputComboBox() - Me.grpYAxisLabels = New System.Windows.Forms.GroupBox() Me.ucrChkColourYAxis = New instat.ucrCheck() Me.ucrChkFaceYAxis = New instat.ucrCheck() Me.ucrChkFamilyYAxis = New instat.ucrCheck() @@ -131,6 +137,15 @@ Partial Class sdgThemes Me.ucrInputFaceYAxis = New instat.ucrInputComboBox() Me.ucrInputFamilyYAxis = New instat.ucrInputComboBox() Me.ucrBaseSubdialogue = New instat.ucrButtonsSubdialogue() + Me.GroupBox2 = New System.Windows.Forms.GroupBox() + Me.UcrCheck1 = New instat.ucrCheck() + Me.UcrCheck2 = New instat.ucrCheck() + Me.UcrCheck3 = New instat.ucrCheck() + Me.UcrCheck4 = New instat.ucrCheck() + Me.UcrInputComboBox1 = New instat.ucrInputComboBox() + Me.UcrNud1 = New instat.ucrNud() + Me.UcrInputComboBox2 = New instat.ucrInputComboBox() + Me.UcrInputComboBox3 = New instat.ucrInputComboBox() Me.tbXaxis.SuspendLayout() Me.tbAxis.SuspendLayout() Me.grpTableOptions.SuspendLayout() @@ -143,6 +158,7 @@ Partial Class sdgThemes Me.grpYAxisTopLabels.SuspendLayout() Me.grpTickMarksYAxis.SuspendLayout() Me.grpYAxisLabels.SuspendLayout() + Me.GroupBox2.SuspendLayout() Me.SuspendLayout() ' 'tbXaxis @@ -152,7 +168,7 @@ Partial Class sdgThemes Me.tbXaxis.Location = New System.Drawing.Point(4, 8) Me.tbXaxis.Name = "tbXaxis" Me.tbXaxis.SelectedIndex = 0 - Me.tbXaxis.Size = New System.Drawing.Size(556, 473) + Me.tbXaxis.Size = New System.Drawing.Size(556, 603) Me.tbXaxis.TabIndex = 1 ' 'tbAxis @@ -161,20 +177,21 @@ Partial Class sdgThemes Me.tbAxis.Location = New System.Drawing.Point(4, 22) Me.tbAxis.Name = "tbAxis" Me.tbAxis.Padding = New System.Windows.Forms.Padding(3) - Me.tbAxis.Size = New System.Drawing.Size(548, 447) + Me.tbAxis.Size = New System.Drawing.Size(548, 577) Me.tbAxis.TabIndex = 0 Me.tbAxis.Text = "X-axis" Me.tbAxis.UseVisualStyleBackColor = True ' 'grpTableOptions ' + Me.grpTableOptions.Controls.Add(Me.GroupBox2) Me.grpTableOptions.Controls.Add(Me.grpTickLabels) Me.grpTableOptions.Controls.Add(Me.grpAxisLabelTopAxis) Me.grpTableOptions.Controls.Add(Me.GroupBox1) Me.grpTableOptions.Controls.Add(Me.grpAxisLabel) Me.grpTableOptions.Location = New System.Drawing.Point(-1, 3) Me.grpTableOptions.Name = "grpTableOptions" - Me.grpTableOptions.Size = New System.Drawing.Size(543, 427) + Me.grpTableOptions.Size = New System.Drawing.Size(543, 578) Me.grpTableOptions.TabIndex = 0 Me.grpTableOptions.TabStop = False Me.grpTableOptions.Text = "More Options" @@ -196,6 +213,177 @@ Partial Class sdgThemes Me.grpTickLabels.TabStop = False Me.grpTickLabels.Text = "X axis tick labels" ' + 'grpAxisLabelTopAxis + ' + Me.grpAxisLabelTopAxis.Controls.Add(Me.ucrChkColourTopXAxis) + Me.grpAxisLabelTopAxis.Controls.Add(Me.ucrChkFaceTopXAxis) + Me.grpAxisLabelTopAxis.Controls.Add(Me.ucrChkFamilyTopXAxis) + Me.grpAxisLabelTopAxis.Controls.Add(Me.ucrChkAngleTopXAxis) + Me.grpAxisLabelTopAxis.Controls.Add(Me.ucrChkHjustTopXAxis) + Me.grpAxisLabelTopAxis.Controls.Add(Me.ucrChkVjustTopXAxis) + Me.grpAxisLabelTopAxis.Controls.Add(Me.ucrChkLineHeightTopXAxis) + Me.grpAxisLabelTopAxis.Controls.Add(Me.ucrChkSizeTopXAxis) + Me.grpAxisLabelTopAxis.Controls.Add(Me.ucrNudVjustTopAxis) + Me.grpAxisLabelTopAxis.Controls.Add(Me.ucrNudLineHeightTopAxis) + Me.grpAxisLabelTopAxis.Controls.Add(Me.ucrNudAngleTopAxis) + Me.grpAxisLabelTopAxis.Controls.Add(Me.ucrNudHjustTopAxis) + Me.grpAxisLabelTopAxis.Controls.Add(Me.ucrNudSizeTopaxis) + Me.grpAxisLabelTopAxis.Controls.Add(Me.ucrInputColourTopAxis) + Me.grpAxisLabelTopAxis.Controls.Add(Me.ucrInputFaceTopAxis) + Me.grpAxisLabelTopAxis.Controls.Add(Me.ucrInputFamilyTopAxis) + Me.grpAxisLabelTopAxis.Location = New System.Drawing.Point(283, 19) + Me.grpAxisLabelTopAxis.Name = "grpAxisLabelTopAxis" + Me.grpAxisLabelTopAxis.Size = New System.Drawing.Size(277, 245) + Me.grpAxisLabelTopAxis.TabIndex = 40 + Me.grpAxisLabelTopAxis.TabStop = False + Me.grpAxisLabelTopAxis.Text = "X axis label on top axis" + ' + 'GroupBox1 + ' + Me.GroupBox1.Controls.Add(Me.ucrInputMargin) + Me.GroupBox1.Controls.Add(Me.ucrChkMaigin) + Me.GroupBox1.Controls.Add(Me.ucrInputMarginUnits) + Me.GroupBox1.Controls.Add(Me.ucrInputUnits) + Me.GroupBox1.Controls.Add(Me.ucrChkLineEndTickMarksXAxis) + Me.GroupBox1.Controls.Add(Me.ucrChkUnits) + Me.GroupBox1.Controls.Add(Me.ucrInputTickUnits) + Me.GroupBox1.Controls.Add(Me.ucrChkSizeTickMarksXAxis) + Me.GroupBox1.Controls.Add(Me.ucrChkLineTypeTickMarksXAxis) + Me.GroupBox1.Controls.Add(Me.ucrChkColourTickMarksXAxis) + Me.GroupBox1.Controls.Add(Me.ucrInputLineEndTickMarks) + Me.GroupBox1.Controls.Add(Me.ucrNudSizeTickMarks) + Me.GroupBox1.Controls.Add(Me.ucrInputColourTickMarks) + Me.GroupBox1.Controls.Add(Me.ucrInputLineTypeTickMarks) + Me.GroupBox1.Location = New System.Drawing.Point(15, 270) + Me.GroupBox1.Name = "GroupBox1" + Me.GroupBox1.Size = New System.Drawing.Size(262, 283) + Me.GroupBox1.TabIndex = 39 + Me.GroupBox1.TabStop = False + Me.GroupBox1.Text = "Tick marks along axes" + ' + 'grpAxisLabel + ' + Me.grpAxisLabel.Controls.Add(Me.ucrChkColour) + Me.grpAxisLabel.Controls.Add(Me.ucrChkFace) + Me.grpAxisLabel.Controls.Add(Me.ucrChkFamily) + Me.grpAxisLabel.Controls.Add(Me.ucrChkAngle) + Me.grpAxisLabel.Controls.Add(Me.ucrChkHjust) + Me.grpAxisLabel.Controls.Add(Me.ucrChkVjust) + Me.grpAxisLabel.Controls.Add(Me.ucrChkLineHeight) + Me.grpAxisLabel.Controls.Add(Me.ucrChkSize) + Me.grpAxisLabel.Controls.Add(Me.ucrNudVjust) + Me.grpAxisLabel.Controls.Add(Me.ucrNudLineHeight) + Me.grpAxisLabel.Controls.Add(Me.ucrNudAngle) + Me.grpAxisLabel.Controls.Add(Me.ucrNudHjust) + Me.grpAxisLabel.Controls.Add(Me.ucrNudsize) + Me.grpAxisLabel.Controls.Add(Me.ucrInputColour) + Me.grpAxisLabel.Controls.Add(Me.ucrInputFace) + Me.grpAxisLabel.Controls.Add(Me.ucrInputFamily) + Me.grpAxisLabel.Location = New System.Drawing.Point(15, 19) + Me.grpAxisLabel.Name = "grpAxisLabel" + Me.grpAxisLabel.Size = New System.Drawing.Size(262, 245) + Me.grpAxisLabel.TabIndex = 23 + Me.grpAxisLabel.TabStop = False + Me.grpAxisLabel.Text = "X axis label" + ' + 'tbYaxis + ' + Me.tbYaxis.Controls.Add(Me.grpTickLabelYAxis) + Me.tbYaxis.Controls.Add(Me.grpYAxisTopLabels) + Me.tbYaxis.Controls.Add(Me.grpTickMarksYAxis) + Me.tbYaxis.Controls.Add(Me.grpYAxisLabels) + Me.tbYaxis.Location = New System.Drawing.Point(4, 22) + Me.tbYaxis.Name = "tbYaxis" + Me.tbYaxis.Padding = New System.Windows.Forms.Padding(3) + Me.tbYaxis.Size = New System.Drawing.Size(548, 577) + Me.tbYaxis.TabIndex = 1 + Me.tbYaxis.Text = "Y-axis" + Me.tbYaxis.UseVisualStyleBackColor = True + ' + 'grpTickLabelYAxis + ' + Me.grpTickLabelYAxis.Controls.Add(Me.ucrChkLineEndTickLabelsYAxis) + Me.grpTickLabelYAxis.Controls.Add(Me.ucrChkSizeTickLabelsYAxis) + Me.grpTickLabelYAxis.Controls.Add(Me.ucrChkLineTypeTickLabelsYAxis) + Me.grpTickLabelYAxis.Controls.Add(Me.ucrChkColourTickLabelsYAxis) + Me.grpTickLabelYAxis.Controls.Add(Me.ucrInputLineEndTickLabelsYAxis) + Me.grpTickLabelYAxis.Controls.Add(Me.ucrNudSizeTickLabelsYAxis) + Me.grpTickLabelYAxis.Controls.Add(Me.ucrInputColourTickLabelsYAxis) + Me.grpTickLabelYAxis.Controls.Add(Me.ucrInputLineTypeTickLabelsYAxis) + Me.grpTickLabelYAxis.Location = New System.Drawing.Point(263, 256) + Me.grpTickLabelYAxis.Name = "grpTickLabelYAxis" + Me.grpTickLabelYAxis.Size = New System.Drawing.Size(264, 154) + Me.grpTickLabelYAxis.TabIndex = 43 + Me.grpTickLabelYAxis.TabStop = False + Me.grpTickLabelYAxis.Text = "Y axis tick labels" + ' + 'grpYAxisTopLabels + ' + Me.grpYAxisTopLabels.Controls.Add(Me.ucrChkColourRightYAxis) + Me.grpYAxisTopLabels.Controls.Add(Me.ucrChkFaceRightYAxis) + Me.grpYAxisTopLabels.Controls.Add(Me.ucrChkFamilyRightYAxis) + Me.grpYAxisTopLabels.Controls.Add(Me.ucrChkAngleRightYAxis) + Me.grpYAxisTopLabels.Controls.Add(Me.ucrChkHjustRightYAxis) + Me.grpYAxisTopLabels.Controls.Add(Me.ucrChkVjustRightYAxis) + Me.grpYAxisTopLabels.Controls.Add(Me.ucrChkLineHeightRightYAxis) + Me.grpYAxisTopLabels.Controls.Add(Me.ucrChkSizeRightYAxis) + Me.grpYAxisTopLabels.Controls.Add(Me.ucrNudVjustRightYAxis) + Me.grpYAxisTopLabels.Controls.Add(Me.ucrNudLineHeightRightYAxis) + Me.grpYAxisTopLabels.Controls.Add(Me.ucrNudAngleRightYAxis) + Me.grpYAxisTopLabels.Controls.Add(Me.ucrNudHjustRightYAxis) + Me.grpYAxisTopLabels.Controls.Add(Me.ucrNudSizeRightYAxis) + Me.grpYAxisTopLabels.Controls.Add(Me.ucrInputColourRightYAxis) + Me.grpYAxisTopLabels.Controls.Add(Me.ucrInputFaceRightYAxis) + Me.grpYAxisTopLabels.Controls.Add(Me.ucrInputFamilyRightYAxis) + Me.grpYAxisTopLabels.Location = New System.Drawing.Point(262, 5) + Me.grpYAxisTopLabels.Name = "grpYAxisTopLabels" + Me.grpYAxisTopLabels.Size = New System.Drawing.Size(264, 245) + Me.grpYAxisTopLabels.TabIndex = 44 + Me.grpYAxisTopLabels.TabStop = False + Me.grpYAxisTopLabels.Text = "Y axis label on top axis" + ' + 'grpTickMarksYAxis + ' + Me.grpTickMarksYAxis.Controls.Add(Me.ucrChkLineEndTickMarksYAxis) + Me.grpTickMarksYAxis.Controls.Add(Me.ucrChkSizeTickMarksYAxis) + Me.grpTickMarksYAxis.Controls.Add(Me.ucrChkLineTypeTickMarksYAxis) + Me.grpTickMarksYAxis.Controls.Add(Me.ucrChkColourTickMarksYAxis) + Me.grpTickMarksYAxis.Controls.Add(Me.ucrInputLineEndTickMarksYAxis) + Me.grpTickMarksYAxis.Controls.Add(Me.ucrNudSizeTickMarksYAxis) + Me.grpTickMarksYAxis.Controls.Add(Me.ucrInputColourTickMarksYAxis) + Me.grpTickMarksYAxis.Controls.Add(Me.ucrInputLineTypeTickMarksYAxis) + Me.grpTickMarksYAxis.Location = New System.Drawing.Point(6, 256) + Me.grpTickMarksYAxis.Name = "grpTickMarksYAxis" + Me.grpTickMarksYAxis.Size = New System.Drawing.Size(250, 154) + Me.grpTickMarksYAxis.TabIndex = 42 + Me.grpTickMarksYAxis.TabStop = False + Me.grpTickMarksYAxis.Text = "Tick marks along axes" + ' + 'grpYAxisLabels + ' + Me.grpYAxisLabels.Controls.Add(Me.ucrChkColourYAxis) + Me.grpYAxisLabels.Controls.Add(Me.ucrChkFaceYAxis) + Me.grpYAxisLabels.Controls.Add(Me.ucrChkFamilyYAxis) + Me.grpYAxisLabels.Controls.Add(Me.ucrChkAngleYAxis) + Me.grpYAxisLabels.Controls.Add(Me.ucrChkHjustYAxis) + Me.grpYAxisLabels.Controls.Add(Me.ucrChkVjustYAxis) + Me.grpYAxisLabels.Controls.Add(Me.ucrChkLineHeightYAxis) + Me.grpYAxisLabels.Controls.Add(Me.ucrChkSizeYAxis) + Me.grpYAxisLabels.Controls.Add(Me.ucrNudVjustYAxis) + Me.grpYAxisLabels.Controls.Add(Me.ucrNudLineHeightYAxis) + Me.grpYAxisLabels.Controls.Add(Me.ucrNudAngleYAxis) + Me.grpYAxisLabels.Controls.Add(Me.ucrNudHjustYAxis) + Me.grpYAxisLabels.Controls.Add(Me.ucrNudSizeYAxis) + Me.grpYAxisLabels.Controls.Add(Me.ucrInputColourYAxis) + Me.grpYAxisLabels.Controls.Add(Me.ucrInputFaceYAxis) + Me.grpYAxisLabels.Controls.Add(Me.ucrInputFamilyYAxis) + Me.grpYAxisLabels.Location = New System.Drawing.Point(6, 5) + Me.grpYAxisLabels.Name = "grpYAxisLabels" + Me.grpYAxisLabels.Size = New System.Drawing.Size(250, 245) + Me.grpYAxisLabels.TabIndex = 41 + Me.grpYAxisLabels.TabStop = False + Me.grpYAxisLabels.Text = "Y axis label" + ' 'ucrChkLineEndTickLabelsXAxis ' Me.ucrChkLineEndTickLabelsXAxis.Checked = False @@ -270,31 +458,6 @@ Partial Class sdgThemes Me.ucrInputLineTypeTickLabelsXAxis.Size = New System.Drawing.Size(137, 21) Me.ucrInputLineTypeTickLabelsXAxis.TabIndex = 26 ' - 'grpAxisLabelTopAxis - ' - Me.grpAxisLabelTopAxis.Controls.Add(Me.ucrChkColourTopXAxis) - Me.grpAxisLabelTopAxis.Controls.Add(Me.ucrChkFaceTopXAxis) - Me.grpAxisLabelTopAxis.Controls.Add(Me.ucrChkFamilyTopXAxis) - Me.grpAxisLabelTopAxis.Controls.Add(Me.ucrChkAngleTopXAxis) - Me.grpAxisLabelTopAxis.Controls.Add(Me.ucrChkHjustTopXAxis) - Me.grpAxisLabelTopAxis.Controls.Add(Me.ucrChkVjustTopXAxis) - Me.grpAxisLabelTopAxis.Controls.Add(Me.ucrChkLineHeightTopXAxis) - Me.grpAxisLabelTopAxis.Controls.Add(Me.ucrChkSizeTopXAxis) - Me.grpAxisLabelTopAxis.Controls.Add(Me.ucrNudVjustTopAxis) - Me.grpAxisLabelTopAxis.Controls.Add(Me.ucrNudLineHeightTopAxis) - Me.grpAxisLabelTopAxis.Controls.Add(Me.ucrNudAngleTopAxis) - Me.grpAxisLabelTopAxis.Controls.Add(Me.ucrNudHjustTopAxis) - Me.grpAxisLabelTopAxis.Controls.Add(Me.ucrNudSizeTopaxis) - Me.grpAxisLabelTopAxis.Controls.Add(Me.ucrInputColourTopAxis) - Me.grpAxisLabelTopAxis.Controls.Add(Me.ucrInputFaceTopAxis) - Me.grpAxisLabelTopAxis.Controls.Add(Me.ucrInputFamilyTopAxis) - Me.grpAxisLabelTopAxis.Location = New System.Drawing.Point(283, 19) - Me.grpAxisLabelTopAxis.Name = "grpAxisLabelTopAxis" - Me.grpAxisLabelTopAxis.Size = New System.Drawing.Size(277, 245) - Me.grpAxisLabelTopAxis.TabIndex = 40 - Me.grpAxisLabelTopAxis.TabStop = False - Me.grpAxisLabelTopAxis.Text = "X axis label on top axis" - ' 'ucrChkColourTopXAxis ' Me.ucrChkColourTopXAxis.Checked = False @@ -449,22 +612,43 @@ Partial Class sdgThemes Me.ucrInputFamilyTopAxis.Size = New System.Drawing.Size(137, 21) Me.ucrInputFamilyTopAxis.TabIndex = 24 ' - 'GroupBox1 + 'ucrInputMargin ' - Me.GroupBox1.Controls.Add(Me.ucrChkLineEndTickMarksXAxis) - Me.GroupBox1.Controls.Add(Me.ucrChkSizeTickMarksXAxis) - Me.GroupBox1.Controls.Add(Me.ucrChkLineTypeTickMarksXAxis) - Me.GroupBox1.Controls.Add(Me.ucrChkColourTickMarksXAxis) - Me.GroupBox1.Controls.Add(Me.ucrInputLineEndTickMarks) - Me.GroupBox1.Controls.Add(Me.ucrNudSizeTickMarks) - Me.GroupBox1.Controls.Add(Me.ucrInputColourTickMarks) - Me.GroupBox1.Controls.Add(Me.ucrInputLineTypeTickMarks) - Me.GroupBox1.Location = New System.Drawing.Point(15, 270) - Me.GroupBox1.Name = "GroupBox1" - Me.GroupBox1.Size = New System.Drawing.Size(262, 154) - Me.GroupBox1.TabIndex = 39 - Me.GroupBox1.TabStop = False - Me.GroupBox1.Text = "Tick marks along axes" + Me.ucrInputMargin.AddQuotesIfUnrecognised = True + Me.ucrInputMargin.IsMultiline = False + Me.ucrInputMargin.IsReadOnly = False + Me.ucrInputMargin.Location = New System.Drawing.Point(111, 199) + Me.ucrInputMargin.Name = "ucrInputMargin" + Me.ucrInputMargin.Size = New System.Drawing.Size(50, 23) + Me.ucrInputMargin.TabIndex = 59 + ' + 'ucrChkMaigin + ' + Me.ucrChkMaigin.Checked = False + Me.ucrChkMaigin.Location = New System.Drawing.Point(11, 199) + Me.ucrChkMaigin.Name = "ucrChkMaigin" + Me.ucrChkMaigin.Size = New System.Drawing.Size(100, 20) + Me.ucrChkMaigin.TabIndex = 58 + ' + 'ucrInputMarginUnits + ' + Me.ucrInputMarginUnits.AddQuotesIfUnrecognised = True + Me.ucrInputMarginUnits.IsReadOnly = False + Me.ucrInputMarginUnits.Location = New System.Drawing.Point(111, 231) + Me.ucrInputMarginUnits.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) + Me.ucrInputMarginUnits.Name = "ucrInputMarginUnits" + Me.ucrInputMarginUnits.Size = New System.Drawing.Size(137, 21) + Me.ucrInputMarginUnits.TabIndex = 57 + ' + 'ucrInputUnits + ' + Me.ucrInputUnits.AddQuotesIfUnrecognised = True + Me.ucrInputUnits.IsMultiline = False + Me.ucrInputUnits.IsReadOnly = False + Me.ucrInputUnits.Location = New System.Drawing.Point(111, 137) + Me.ucrInputUnits.Name = "ucrInputUnits" + Me.ucrInputUnits.Size = New System.Drawing.Size(50, 23) + Me.ucrInputUnits.TabIndex = 56 ' 'ucrChkLineEndTickMarksXAxis ' @@ -474,6 +658,24 @@ Partial Class sdgThemes Me.ucrChkLineEndTickMarksXAxis.Size = New System.Drawing.Size(100, 20) Me.ucrChkLineEndTickMarksXAxis.TabIndex = 54 ' + 'ucrChkUnits + ' + Me.ucrChkUnits.Checked = False + Me.ucrChkUnits.Location = New System.Drawing.Point(11, 137) + Me.ucrChkUnits.Name = "ucrChkUnits" + Me.ucrChkUnits.Size = New System.Drawing.Size(100, 20) + Me.ucrChkUnits.TabIndex = 55 + ' + 'ucrInputTickUnits + ' + Me.ucrInputTickUnits.AddQuotesIfUnrecognised = True + Me.ucrInputTickUnits.IsReadOnly = False + Me.ucrInputTickUnits.Location = New System.Drawing.Point(111, 169) + Me.ucrInputTickUnits.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) + Me.ucrInputTickUnits.Name = "ucrInputTickUnits" + Me.ucrInputTickUnits.Size = New System.Drawing.Size(137, 21) + Me.ucrInputTickUnits.TabIndex = 54 + ' 'ucrChkSizeTickMarksXAxis ' Me.ucrChkSizeTickMarksXAxis.Checked = False @@ -540,31 +742,6 @@ Partial Class sdgThemes Me.ucrInputLineTypeTickMarks.Size = New System.Drawing.Size(137, 21) Me.ucrInputLineTypeTickMarks.TabIndex = 26 ' - 'grpAxisLabel - ' - Me.grpAxisLabel.Controls.Add(Me.ucrChkColour) - Me.grpAxisLabel.Controls.Add(Me.ucrChkFace) - Me.grpAxisLabel.Controls.Add(Me.ucrChkFamily) - Me.grpAxisLabel.Controls.Add(Me.ucrChkAngle) - Me.grpAxisLabel.Controls.Add(Me.ucrChkHjust) - Me.grpAxisLabel.Controls.Add(Me.ucrChkVjust) - Me.grpAxisLabel.Controls.Add(Me.ucrChkLineHeight) - Me.grpAxisLabel.Controls.Add(Me.ucrChkSize) - Me.grpAxisLabel.Controls.Add(Me.ucrNudVjust) - Me.grpAxisLabel.Controls.Add(Me.ucrNudLineHeight) - Me.grpAxisLabel.Controls.Add(Me.ucrNudAngle) - Me.grpAxisLabel.Controls.Add(Me.ucrNudHjust) - Me.grpAxisLabel.Controls.Add(Me.ucrNudsize) - Me.grpAxisLabel.Controls.Add(Me.ucrInputColour) - Me.grpAxisLabel.Controls.Add(Me.ucrInputFace) - Me.grpAxisLabel.Controls.Add(Me.ucrInputFamily) - Me.grpAxisLabel.Location = New System.Drawing.Point(15, 19) - Me.grpAxisLabel.Name = "grpAxisLabel" - Me.grpAxisLabel.Size = New System.Drawing.Size(262, 245) - Me.grpAxisLabel.TabIndex = 23 - Me.grpAxisLabel.TabStop = False - Me.grpAxisLabel.Text = "X axis label" - ' 'ucrChkColour ' Me.ucrChkColour.Checked = False @@ -719,37 +896,6 @@ Partial Class sdgThemes Me.ucrInputFamily.Size = New System.Drawing.Size(137, 21) Me.ucrInputFamily.TabIndex = 24 ' - 'tbYaxis - ' - Me.tbYaxis.Controls.Add(Me.grpTickLabelYAxis) - Me.tbYaxis.Controls.Add(Me.grpYAxisTopLabels) - Me.tbYaxis.Controls.Add(Me.grpTickMarksYAxis) - Me.tbYaxis.Controls.Add(Me.grpYAxisLabels) - Me.tbYaxis.Location = New System.Drawing.Point(4, 22) - Me.tbYaxis.Name = "tbYaxis" - Me.tbYaxis.Padding = New System.Windows.Forms.Padding(3) - Me.tbYaxis.Size = New System.Drawing.Size(548, 447) - Me.tbYaxis.TabIndex = 1 - Me.tbYaxis.Text = "Y-axis" - Me.tbYaxis.UseVisualStyleBackColor = True - ' - 'grpTickLabelYAxis - ' - Me.grpTickLabelYAxis.Controls.Add(Me.ucrChkLineEndTickLabelsYAxis) - Me.grpTickLabelYAxis.Controls.Add(Me.ucrChkSizeTickLabelsYAxis) - Me.grpTickLabelYAxis.Controls.Add(Me.ucrChkLineTypeTickLabelsYAxis) - Me.grpTickLabelYAxis.Controls.Add(Me.ucrChkColourTickLabelsYAxis) - Me.grpTickLabelYAxis.Controls.Add(Me.ucrInputLineEndTickLabelsYAxis) - Me.grpTickLabelYAxis.Controls.Add(Me.ucrNudSizeTickLabelsYAxis) - Me.grpTickLabelYAxis.Controls.Add(Me.ucrInputColourTickLabelsYAxis) - Me.grpTickLabelYAxis.Controls.Add(Me.ucrInputLineTypeTickLabelsYAxis) - Me.grpTickLabelYAxis.Location = New System.Drawing.Point(263, 256) - Me.grpTickLabelYAxis.Name = "grpTickLabelYAxis" - Me.grpTickLabelYAxis.Size = New System.Drawing.Size(264, 154) - Me.grpTickLabelYAxis.TabIndex = 43 - Me.grpTickLabelYAxis.TabStop = False - Me.grpTickLabelYAxis.Text = "Y axis tick labels" - ' 'ucrChkLineEndTickLabelsYAxis ' Me.ucrChkLineEndTickLabelsYAxis.Checked = False @@ -824,31 +970,6 @@ Partial Class sdgThemes Me.ucrInputLineTypeTickLabelsYAxis.Size = New System.Drawing.Size(137, 21) Me.ucrInputLineTypeTickLabelsYAxis.TabIndex = 26 ' - 'grpYAxisTopLabels - ' - Me.grpYAxisTopLabels.Controls.Add(Me.ucrChkColourRightYAxis) - Me.grpYAxisTopLabels.Controls.Add(Me.ucrChkFaceRightYAxis) - Me.grpYAxisTopLabels.Controls.Add(Me.ucrChkFamilyRightYAxis) - Me.grpYAxisTopLabels.Controls.Add(Me.ucrChkAngleRightYAxis) - Me.grpYAxisTopLabels.Controls.Add(Me.ucrChkHjustRightYAxis) - Me.grpYAxisTopLabels.Controls.Add(Me.ucrChkVjustRightYAxis) - Me.grpYAxisTopLabels.Controls.Add(Me.ucrChkLineHeightRightYAxis) - Me.grpYAxisTopLabels.Controls.Add(Me.ucrChkSizeRightYAxis) - Me.grpYAxisTopLabels.Controls.Add(Me.ucrNudVjustRightYAxis) - Me.grpYAxisTopLabels.Controls.Add(Me.ucrNudLineHeightRightYAxis) - Me.grpYAxisTopLabels.Controls.Add(Me.ucrNudAngleRightYAxis) - Me.grpYAxisTopLabels.Controls.Add(Me.ucrNudHjustRightYAxis) - Me.grpYAxisTopLabels.Controls.Add(Me.ucrNudSizeRightYAxis) - Me.grpYAxisTopLabels.Controls.Add(Me.ucrInputColourRightYAxis) - Me.grpYAxisTopLabels.Controls.Add(Me.ucrInputFaceRightYAxis) - Me.grpYAxisTopLabels.Controls.Add(Me.ucrInputFamilyRightYAxis) - Me.grpYAxisTopLabels.Location = New System.Drawing.Point(262, 5) - Me.grpYAxisTopLabels.Name = "grpYAxisTopLabels" - Me.grpYAxisTopLabels.Size = New System.Drawing.Size(264, 245) - Me.grpYAxisTopLabels.TabIndex = 44 - Me.grpYAxisTopLabels.TabStop = False - Me.grpYAxisTopLabels.Text = "Y axis label on top axis" - ' 'ucrChkColourRightYAxis ' Me.ucrChkColourRightYAxis.Checked = False @@ -1003,23 +1124,6 @@ Partial Class sdgThemes Me.ucrInputFamilyRightYAxis.Size = New System.Drawing.Size(137, 21) Me.ucrInputFamilyRightYAxis.TabIndex = 24 ' - 'grpTickMarksYAxis - ' - Me.grpTickMarksYAxis.Controls.Add(Me.ucrChkLineEndTickMarksYAxis) - Me.grpTickMarksYAxis.Controls.Add(Me.ucrChkSizeTickMarksYAxis) - Me.grpTickMarksYAxis.Controls.Add(Me.ucrChkLineTypeTickMarksYAxis) - Me.grpTickMarksYAxis.Controls.Add(Me.ucrChkColourTickMarksYAxis) - Me.grpTickMarksYAxis.Controls.Add(Me.ucrInputLineEndTickMarksYAxis) - Me.grpTickMarksYAxis.Controls.Add(Me.ucrNudSizeTickMarksYAxis) - Me.grpTickMarksYAxis.Controls.Add(Me.ucrInputColourTickMarksYAxis) - Me.grpTickMarksYAxis.Controls.Add(Me.ucrInputLineTypeTickMarksYAxis) - Me.grpTickMarksYAxis.Location = New System.Drawing.Point(6, 256) - Me.grpTickMarksYAxis.Name = "grpTickMarksYAxis" - Me.grpTickMarksYAxis.Size = New System.Drawing.Size(250, 154) - Me.grpTickMarksYAxis.TabIndex = 42 - Me.grpTickMarksYAxis.TabStop = False - Me.grpTickMarksYAxis.Text = "Tick marks along axes" - ' 'ucrChkLineEndTickMarksYAxis ' Me.ucrChkLineEndTickMarksYAxis.Checked = False @@ -1094,31 +1198,6 @@ Partial Class sdgThemes Me.ucrInputLineTypeTickMarksYAxis.Size = New System.Drawing.Size(137, 21) Me.ucrInputLineTypeTickMarksYAxis.TabIndex = 26 ' - 'grpYAxisLabels - ' - Me.grpYAxisLabels.Controls.Add(Me.ucrChkColourYAxis) - Me.grpYAxisLabels.Controls.Add(Me.ucrChkFaceYAxis) - Me.grpYAxisLabels.Controls.Add(Me.ucrChkFamilyYAxis) - Me.grpYAxisLabels.Controls.Add(Me.ucrChkAngleYAxis) - Me.grpYAxisLabels.Controls.Add(Me.ucrChkHjustYAxis) - Me.grpYAxisLabels.Controls.Add(Me.ucrChkVjustYAxis) - Me.grpYAxisLabels.Controls.Add(Me.ucrChkLineHeightYAxis) - Me.grpYAxisLabels.Controls.Add(Me.ucrChkSizeYAxis) - Me.grpYAxisLabels.Controls.Add(Me.ucrNudVjustYAxis) - Me.grpYAxisLabels.Controls.Add(Me.ucrNudLineHeightYAxis) - Me.grpYAxisLabels.Controls.Add(Me.ucrNudAngleYAxis) - Me.grpYAxisLabels.Controls.Add(Me.ucrNudHjustYAxis) - Me.grpYAxisLabels.Controls.Add(Me.ucrNudSizeYAxis) - Me.grpYAxisLabels.Controls.Add(Me.ucrInputColourYAxis) - Me.grpYAxisLabels.Controls.Add(Me.ucrInputFaceYAxis) - Me.grpYAxisLabels.Controls.Add(Me.ucrInputFamilyYAxis) - Me.grpYAxisLabels.Location = New System.Drawing.Point(6, 5) - Me.grpYAxisLabels.Name = "grpYAxisLabels" - Me.grpYAxisLabels.Size = New System.Drawing.Size(250, 245) - Me.grpYAxisLabels.TabIndex = 41 - Me.grpYAxisLabels.TabStop = False - Me.grpYAxisLabels.Text = "Y axis label" - ' 'ucrChkColourYAxis ' Me.ucrChkColourYAxis.Checked = False @@ -1275,16 +1354,107 @@ Partial Class sdgThemes ' 'ucrBaseSubdialogue ' - Me.ucrBaseSubdialogue.Location = New System.Drawing.Point(168, 487) + Me.ucrBaseSubdialogue.Location = New System.Drawing.Point(215, 610) Me.ucrBaseSubdialogue.Name = "ucrBaseSubdialogue" Me.ucrBaseSubdialogue.Size = New System.Drawing.Size(142, 30) Me.ucrBaseSubdialogue.TabIndex = 0 ' + 'GroupBox2 + ' + Me.GroupBox2.Controls.Add(Me.UcrCheck1) + Me.GroupBox2.Controls.Add(Me.UcrCheck2) + Me.GroupBox2.Controls.Add(Me.UcrCheck3) + Me.GroupBox2.Controls.Add(Me.UcrCheck4) + Me.GroupBox2.Controls.Add(Me.UcrInputComboBox1) + Me.GroupBox2.Controls.Add(Me.UcrNud1) + Me.GroupBox2.Controls.Add(Me.UcrInputComboBox2) + Me.GroupBox2.Controls.Add(Me.UcrInputComboBox3) + Me.GroupBox2.Location = New System.Drawing.Point(284, 424) + Me.GroupBox2.Name = "GroupBox2" + Me.GroupBox2.Size = New System.Drawing.Size(264, 154) + Me.GroupBox2.TabIndex = 55 + Me.GroupBox2.TabStop = False + Me.GroupBox2.Text = "X axis tick labels" + ' + 'UcrCheck1 + ' + Me.UcrCheck1.Checked = False + Me.UcrCheck1.Location = New System.Drawing.Point(11, 104) + Me.UcrCheck1.Name = "UcrCheck1" + Me.UcrCheck1.Size = New System.Drawing.Size(100, 20) + Me.UcrCheck1.TabIndex = 54 + ' + 'UcrCheck2 + ' + Me.UcrCheck2.Checked = False + Me.UcrCheck2.Location = New System.Drawing.Point(11, 20) + Me.UcrCheck2.Name = "UcrCheck2" + Me.UcrCheck2.Size = New System.Drawing.Size(100, 20) + Me.UcrCheck2.TabIndex = 53 + ' + 'UcrCheck3 + ' + Me.UcrCheck3.Checked = False + Me.UcrCheck3.Location = New System.Drawing.Point(11, 45) + Me.UcrCheck3.Name = "UcrCheck3" + Me.UcrCheck3.Size = New System.Drawing.Size(100, 20) + Me.UcrCheck3.TabIndex = 52 + ' + 'UcrCheck4 + ' + Me.UcrCheck4.Checked = False + Me.UcrCheck4.Location = New System.Drawing.Point(11, 72) + Me.UcrCheck4.Name = "UcrCheck4" + Me.UcrCheck4.Size = New System.Drawing.Size(100, 20) + Me.UcrCheck4.TabIndex = 51 + ' + 'UcrInputComboBox1 + ' + Me.UcrInputComboBox1.AddQuotesIfUnrecognised = True + Me.UcrInputComboBox1.IsReadOnly = False + Me.UcrInputComboBox1.Location = New System.Drawing.Point(117, 103) + Me.UcrInputComboBox1.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) + Me.UcrInputComboBox1.Name = "UcrInputComboBox1" + Me.UcrInputComboBox1.Size = New System.Drawing.Size(137, 21) + Me.UcrInputComboBox1.TabIndex = 32 + ' + 'UcrNud1 + ' + Me.UcrNud1.DecimalPlaces = New Decimal(New Integer() {1, 0, 0, 0}) + Me.UcrNud1.Increment = New Decimal(New Integer() {1, 0, 0, 0}) + Me.UcrNud1.Location = New System.Drawing.Point(116, 19) + Me.UcrNud1.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) + Me.UcrNud1.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) + Me.UcrNud1.Name = "UcrNud1" + Me.UcrNud1.Size = New System.Drawing.Size(50, 20) + Me.UcrNud1.TabIndex = 30 + Me.UcrNud1.Value = New Decimal(New Integer() {0, 0, 0, 0}) + ' + 'UcrInputComboBox2 + ' + Me.UcrInputComboBox2.AddQuotesIfUnrecognised = True + Me.UcrInputComboBox2.IsReadOnly = False + Me.UcrInputComboBox2.Location = New System.Drawing.Point(117, 72) + Me.UcrInputComboBox2.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) + Me.UcrInputComboBox2.Name = "UcrInputComboBox2" + Me.UcrInputComboBox2.Size = New System.Drawing.Size(137, 21) + Me.UcrInputComboBox2.TabIndex = 28 + ' + 'UcrInputComboBox3 + ' + Me.UcrInputComboBox3.AddQuotesIfUnrecognised = True + Me.UcrInputComboBox3.IsReadOnly = False + Me.UcrInputComboBox3.Location = New System.Drawing.Point(117, 44) + Me.UcrInputComboBox3.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) + Me.UcrInputComboBox3.Name = "UcrInputComboBox3" + Me.UcrInputComboBox3.Size = New System.Drawing.Size(137, 21) + Me.UcrInputComboBox3.TabIndex = 26 + ' 'sdgThemes ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(567, 546) + Me.ClientSize = New System.Drawing.Size(567, 652) Me.Controls.Add(Me.tbXaxis) Me.Controls.Add(Me.ucrBaseSubdialogue) Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog @@ -1305,6 +1475,7 @@ Partial Class sdgThemes Me.grpYAxisTopLabels.ResumeLayout(False) Me.grpTickMarksYAxis.ResumeLayout(False) Me.grpYAxisLabels.ResumeLayout(False) + Me.GroupBox2.ResumeLayout(False) Me.ResumeLayout(False) End Sub @@ -1418,4 +1589,19 @@ Partial Class sdgThemes Friend WithEvents ucrChkSizeTickMarksYAxis As ucrCheck Friend WithEvents ucrChkLineTypeTickMarksYAxis As ucrCheck Friend WithEvents ucrChkColourTickMarksYAxis As ucrCheck + Friend WithEvents ucrInputUnits As ucrInputTextBox + Friend WithEvents ucrChkUnits As ucrCheck + Friend WithEvents ucrInputTickUnits As ucrInputComboBox + Friend WithEvents ucrInputMargin As ucrInputTextBox + Friend WithEvents ucrChkMaigin As ucrCheck + Friend WithEvents ucrInputMarginUnits As ucrInputComboBox + Friend WithEvents GroupBox2 As GroupBox + Friend WithEvents UcrCheck1 As ucrCheck + Friend WithEvents UcrCheck2 As ucrCheck + Friend WithEvents UcrCheck3 As ucrCheck + Friend WithEvents UcrCheck4 As ucrCheck + Friend WithEvents UcrInputComboBox1 As ucrInputComboBox + Friend WithEvents UcrNud1 As ucrNud + Friend WithEvents UcrInputComboBox2 As ucrInputComboBox + Friend WithEvents UcrInputComboBox3 As ucrInputComboBox End Class diff --git a/instat/sdgThemes.vb b/instat/sdgThemes.vb index eec76779a11..aa36216800f 100644 --- a/instat/sdgThemes.vb +++ b/instat/sdgThemes.vb @@ -20,6 +20,7 @@ Public Class sdgThemes Public bControlsInitialised As Boolean = False Private clsElementXAxisText, clsElementXAxisTextTop, clsElementXAxisLine, clsElementYAxisLine, clsElementYAxisText, clsElementYAxisTextRight, clsElementXAxisLineTop, clsThemeFunction As New RFunction Private clsBaseOperator As New ROperator + Private dctThemeFunctions As New Dictionary(Of String, RFunction) Private Sub sdgThemes_Load(sender As Object, e As EventArgs) Handles MyBase.Load @@ -29,6 +30,7 @@ Public Class sdgThemes Public Sub InitialiseControls() 'X-Axis tab Dim dctucrInputColour As New Dictionary(Of String, String) + Dim dctucrInputUnits As New Dictionary(Of String, String) Dim dctucrInputColourTopAxis As New Dictionary(Of String, String) Dim dctucrInputColourSegment As New Dictionary(Of String, String) Dim dctucrInputFace As New Dictionary(Of String, String) @@ -96,25 +98,6 @@ Public Class sdgThemes ucrChkFamily.SetText("Family") ucrInputFamily.SetParameter(New RParameter("family")) - dctucrInputFamily.Add("Times Roman", Chr(34) & "Times" & Chr(34)) - dctucrInputFamily.Add("Courier", Chr(34) & "Courier" & Chr(34)) - dctucrInputFamily.Add("Couriersans", Chr(34) & "Couriersans" & Chr(34)) - dctucrInputFamily.Add("Serif", Chr(34) & "serif" & Chr(34)) - dctucrInputFamily.Add("NimbusSanCond", Chr(34) & "NimbusSanCond" & Chr(34)) - dctucrInputFamily.Add("CenturySch", Chr(34) & "CenturySch" & Chr(34)) - dctucrInputFamily.Add("NewCenturySchoolbook", Chr(34) & "NewCenturySchoolbook" & Chr(34)) - dctucrInputFamily.Add("Palatino", Chr(34) & "Palatino" & Chr(34)) - dctucrInputFamily.Add("Bookman", Chr(34) & "Bookman" & Chr(34)) - dctucrInputFamily.Add("URWBookman", Chr(34) & "URWBookman" & Chr(34)) - dctucrInputFamily.Add("URWGothic", Chr(34) & "URWGothic" & Chr(34)) - dctucrInputFamily.Add("NimbusRom", Chr(34) & "NimbusRom" & Chr(34)) - dctucrInputFamily.Add("URWPalladioURWTimes", Chr(34) & "URWPalladioURWTimes" & Chr(34)) - dctucrInputFamily.Add("NimbusMonURWHelvetica", Chr(34) & "NimbusMonURWHelvetica" & Chr(34)) - dctucrInputFamily.Add("Helvetica - Narrow", Chr(34) & "Helvetica - Narrow" & Chr(34)) - dctucrInputFamily.Add("Helveticaserif", Chr(34) & "Helveticaserif" & Chr(34)) - dctucrInputFamily.Add("Short", Chr(34) & "Short" & Chr(34)) - dctucrInputFamily.Add("Canonicalmono", Chr(34) & "Canonicalmono" & Chr(34)) - dctucrInputFamily.Add("AvantGarde", Chr(34) & "AvantGarde" & Chr(34)) ucrInputFamily.SetItems(New Dictionary(Of String, String)(GgplotDefaults.dctFonts)) ucrInputFamily.SetRDefault(Chr(34) & "Times" & Chr(34)) @@ -200,26 +183,7 @@ Public Class sdgThemes ucrChkFamilyTopXAxis.SetText("Family") ucrInputFamilyTopAxis.SetParameter(New RParameter("family")) - dctucrInputFamilyTopAxis.Add("Times Roman", Chr(34) & "Times" & Chr(34)) - dctucrInputFamilyTopAxis.Add("Courier", Chr(34) & "Courier" & Chr(34)) - dctucrInputFamilyTopAxis.Add("Couriersans", Chr(34) & "Couriersans" & Chr(34)) - dctucrInputFamilyTopAxis.Add("Serif", Chr(34) & "serif" & Chr(34)) - dctucrInputFamilyTopAxis.Add("NimbusSanCond", Chr(34) & "NimbusSanCond" & Chr(34)) - dctucrInputFamilyTopAxis.Add("CenturySch", Chr(34) & "CenturySch" & Chr(34)) - dctucrInputFamilyTopAxis.Add("NewCenturySchoolbook", Chr(34) & "NewCenturySchoolbook" & Chr(34)) - dctucrInputFamilyTopAxis.Add("Palatino", Chr(34) & "Palatino" & Chr(34)) - dctucrInputFamilyTopAxis.Add("Bookman", Chr(34) & "Bookman" & Chr(34)) - dctucrInputFamilyTopAxis.Add("URWBookman", Chr(34) & "URWBookman" & Chr(34)) - dctucrInputFamilyTopAxis.Add("URWGothic", Chr(34) & "URWGothic" & Chr(34)) - dctucrInputFamilyTopAxis.Add("NimbusRom", Chr(34) & "NimbusRom" & Chr(34)) - dctucrInputFamilyTopAxis.Add("URWPalladioURWTimes", Chr(34) & "URWPalladioURWTimes" & Chr(34)) - dctucrInputFamilyTopAxis.Add("NimbusMonURWHelvetica", Chr(34) & "NimbusMonURWHelvetica" & Chr(34)) - dctucrInputFamilyTopAxis.Add("Helvetica - Narrow", Chr(34) & "Helvetica - Narrow" & Chr(34)) - dctucrInputFamilyTopAxis.Add("Helveticaserif", Chr(34) & "Helveticaserif" & Chr(34)) - dctucrInputFamilyTopAxis.Add("Short", Chr(34) & "Short" & Chr(34)) - dctucrInputFamilyTopAxis.Add("Canonicalmono", Chr(34) & "Canonicalmono" & Chr(34)) - dctucrInputFamilyTopAxis.Add("AvantGarde", Chr(34) & "AvantGarde" & Chr(34)) - ucrInputFamilyTopAxis.SetItems(dctucrInputFamilyTopAxis) + ucrInputFamilyTopAxis.SetItems(New Dictionary(Of String, String)(GgplotDefaults.dctFonts)) ucrInputFamilyTopAxis.SetRDefault(Chr(34) & "Times" & Chr(34)) 'Tick Marks Along Axes @@ -331,26 +295,7 @@ Public Class sdgThemes ucrChkFamilyYAxis.SetText("Family") ucrInputFamilyYAxis.SetParameter(New RParameter("family")) - dctucrInputFamilyYAxis.Add("Times Roman", Chr(34) & "Times" & Chr(34)) - dctucrInputFamilyYAxis.Add("Courier", Chr(34) & "Courier" & Chr(34)) - dctucrInputFamilyYAxis.Add("Couriersans", Chr(34) & "Couriersans" & Chr(34)) - dctucrInputFamilyYAxis.Add("Serif", Chr(34) & "serif" & Chr(34)) - dctucrInputFamilyYAxis.Add("NimbusSanCond", Chr(34) & "NimbusSanCond" & Chr(34)) - dctucrInputFamilyYAxis.Add("CenturySch", Chr(34) & "CenturySch" & Chr(34)) - dctucrInputFamilyYAxis.Add("NewCenturySchoolbook", Chr(34) & "NewCenturySchoolbook" & Chr(34)) - dctucrInputFamilyYAxis.Add("Palatino", Chr(34) & "Palatino" & Chr(34)) - dctucrInputFamilyYAxis.Add("Bookman", Chr(34) & "Bookman" & Chr(34)) - dctucrInputFamilyYAxis.Add("URWBookman", Chr(34) & "URWBookman" & Chr(34)) - dctucrInputFamilyYAxis.Add("URWGothic", Chr(34) & "URWGothic" & Chr(34)) - dctucrInputFamilyYAxis.Add("NimbusRom", Chr(34) & "NimbusRom" & Chr(34)) - dctucrInputFamilyYAxis.Add("URWPalladioURWTimes", Chr(34) & "URWPalladioURWTimes" & Chr(34)) - dctucrInputFamilyYAxis.Add("NimbusMonURWHelvetica", Chr(34) & "NimbusMonURWHelvetica" & Chr(34)) - dctucrInputFamilyYAxis.Add("Helvetica - Narrow", Chr(34) & "Helvetica - Narrow" & Chr(34)) - dctucrInputFamilyYAxis.Add("Helveticaserif", Chr(34) & "Helveticaserif" & Chr(34)) - dctucrInputFamilyYAxis.Add("Short", Chr(34) & "Short" & Chr(34)) - dctucrInputFamilyYAxis.Add("Canonicalmono", Chr(34) & "Canonicalmono" & Chr(34)) - dctucrInputFamilyYAxis.Add("AvantGarde", Chr(34) & "AvantGarde" & Chr(34)) - ucrInputFamilyYAxis.SetItems(dctucrInputFamilyYAxis) + ucrInputFamilyYAxis.SetItems(New Dictionary(Of String, String)(GgplotDefaults.dctFonts)) ucrInputFamilyYAxis.SetRDefault(Chr(34) & "Times" & Chr(34)) 'Tick Marks Along-Axes @@ -434,26 +379,7 @@ Public Class sdgThemes ucrChkFamilyRightYAxis.SetText("Family") ucrInputFamilyRightYAxis.SetParameter(New RParameter("family")) - 'dctucrInputFamilyYAxisTopAxis.Add("Times Roman", Chr(34) & "Times" & Chr(34)) - dctucrInputFamilyTopYAxis.Add("Courier", Chr(34) & "Courier" & Chr(34)) - dctucrInputFamilyTopYAxis.Add("Couriersans", Chr(34) & "Couriersans" & Chr(34)) - dctucrInputFamilyTopYAxis.Add("Serif", Chr(34) & "serif" & Chr(34)) - dctucrInputFamilyTopYAxis.Add("NimbusSanCond", Chr(34) & "NimbusSanCond" & Chr(34)) - dctucrInputFamilyTopYAxis.Add("CenturySch", Chr(34) & "CenturySch" & Chr(34)) - dctucrInputFamilyTopYAxis.Add("NewCenturySchoolbook", Chr(34) & "NewCenturySchoolbook" & Chr(34)) - dctucrInputFamilyTopYAxis.Add("Palatino", Chr(34) & "Palatino" & Chr(34)) - dctucrInputFamilyTopYAxis.Add("Bookman", Chr(34) & "Bookman" & Chr(34)) - dctucrInputFamilyTopYAxis.Add("URWBookman", Chr(34) & "URWBookman" & Chr(34)) - dctucrInputFamilyTopYAxis.Add("URWGothic", Chr(34) & "URWGothic" & Chr(34)) - dctucrInputFamilyTopYAxis.Add("NimbusRom", Chr(34) & "NimbusRom" & Chr(34)) - dctucrInputFamilyTopYAxis.Add("URWPalladioURWTimes", Chr(34) & "URWPalladioURWTimes" & Chr(34)) - dctucrInputFamilyTopYAxis.Add("NimbusMonURWHelvetica", Chr(34) & "NimbusMonURWHelvetica" & Chr(34)) - dctucrInputFamilyTopYAxis.Add("Helvetica - Narrow", Chr(34) & "Helvetica - Narrow" & Chr(34)) - dctucrInputFamilyTopYAxis.Add("Helveticaserif", Chr(34) & "Helveticaserif" & Chr(34)) - dctucrInputFamilyTopYAxis.Add("Short", Chr(34) & "Short" & Chr(34)) - dctucrInputFamilyTopYAxis.Add("Canonicalmono", Chr(34) & "Canonicalmono" & Chr(34)) - dctucrInputFamilyTopYAxis.Add("AvantGarde", Chr(34) & "AvantGarde" & Chr(34)) - ucrInputFamilyRightYAxis.SetItems(dctucrInputFamilyTopYAxis) + ucrInputFamilyRightYAxis.SetItems(New Dictionary(Of String, String)(GgplotDefaults.dctFonts)) ucrInputFamilyRightYAxis.SetRDefault(Chr(34) & "Times" & Chr(34)) 'Tick Marks Along Axes @@ -501,6 +427,30 @@ Public Class sdgThemes ucrInputLineEndTickMarksYAxis.SetItems(dctucrInputLineEndTickMarksYAxis) ucrInputLineEndTickMarksYAxis.SetRDefault(Chr(34) & "square" & Chr(34)) + 'Units + ucrChkUnits.SetText("Tick length") + ucrInputTickUnits.SetParameter(New RParameter("units")) + dctucrInputUnits.Add("Normalised Parent Coordinates", Chr(34) & "npc" & Chr(34)) + dctucrInputUnits.Add("Centimetres", Chr(34) & "cm" & Chr(34)) + dctucrInputUnits.Add("Inches", Chr(34) & "inches" & Chr(34)) + dctucrInputUnits.Add("Millimetres", Chr(34) & "mm" & Chr(34)) + dctucrInputUnits.Add("Points", Chr(34) & "points" & Chr(34)) + dctucrInputUnits.Add("Picas", Chr(34) & "picas" & Chr(34)) + dctucrInputUnits.Add("Big Points", Chr(34) & "bigpts" & Chr(34)) + dctucrInputUnits.Add("Dida", Chr(34) & "dida" & Chr(34)) + dctucrInputUnits.Add("Cicero", Chr(34) & "cicero" & Chr(34)) + dctucrInputUnits.Add("Scaled Points", Chr(34) & "scaledpts" & Chr(34)) + dctucrInputUnits.Add("Lines", Chr(34) & "lines" & Chr(34)) + dctucrInputUnits.Add("Character", Chr(34) & "char" & Chr(34)) + dctucrInputUnits.Add("Native", Chr(34) & "native" & Chr(34)) + dctucrInputUnits.Add("String Width", Chr(34) & "strwidth" & Chr(34)) + dctucrInputUnits.Add("String Height", Chr(34) & "strheight" & Chr(34)) + dctucrInputUnits.Add("Square Normalised Parent Coordinates", Chr(34) & "snpc" & Chr(34)) + dctucrInputUnits.Add("Grop Height", Chr(34) & "grobheight" & Chr(34)) + dctucrInputUnits.Add("Grop Width", Chr(34) & "grobwidth" & Chr(34)) + ucrInputTickUnits.SetItems(dctucrInputUnits) + ucrInputTickUnits.SetRDefault(Chr(34) & "npc" & Chr(34)) + ucrChkSizeYAxis.AddToLinkedControls(ucrNudSizeYAxis, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) ucrChkHjustYAxis.AddToLinkedControls(ucrNudHjustYAxis, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) ucrChkVjustYAxis.AddToLinkedControls(ucrNudVjustYAxis, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) @@ -539,6 +489,7 @@ Public Class sdgThemes dctThemeFunctions = dctNewThemeFunctions dctThemeFunctions.TryGetValue("axis.text.x", clsElementXAxisText) + dctThemeFunctions.TryGetValue("axis.text.y", clsElementYAxisText) 'clsElementXAxisText.SetRCommand("element_text") 'clsElementXAxisTextTop.SetRCommand("element_text") From 5427fc5c9377b14717666924a6ea7d2904809e68 Mon Sep 17 00:00:00 2001 From: Lily Date: Mon, 5 Jun 2017 16:05:12 +0100 Subject: [PATCH 089/154] Layout and tab order --- instat/dlgContrasts.Designer.vb | 29 +++++++++++++++++------------ instat/dlgContrasts.vb | 29 ++++++++++++++--------------- 2 files changed, 31 insertions(+), 27 deletions(-) diff --git a/instat/dlgContrasts.Designer.vb b/instat/dlgContrasts.Designer.vb index 1ae5311340c..947a41df357 100644 --- a/instat/dlgContrasts.Designer.vb +++ b/instat/dlgContrasts.Designer.vb @@ -35,28 +35,28 @@ Partial Class dlgContrasts 'lblFactorReceiver ' Me.lblFactorReceiver.AutoSize = True - Me.lblFactorReceiver.Location = New System.Drawing.Point(243, 20) + Me.lblFactorReceiver.Location = New System.Drawing.Point(260, 48) Me.lblFactorReceiver.Name = "lblFactorReceiver" Me.lblFactorReceiver.Size = New System.Drawing.Size(93, 13) - Me.lblFactorReceiver.TabIndex = 3 + Me.lblFactorReceiver.TabIndex = 1 Me.lblFactorReceiver.Text = "Selected Variable:" ' 'lblSelectContrastName ' Me.lblSelectContrastName.AutoSize = True - Me.lblSelectContrastName.Location = New System.Drawing.Point(244, 78) + Me.lblSelectContrastName.Location = New System.Drawing.Point(260, 99) Me.lblSelectContrastName.Name = "lblSelectContrastName" Me.lblSelectContrastName.Size = New System.Drawing.Size(113, 13) - Me.lblSelectContrastName.TabIndex = 14 + Me.lblSelectContrastName.TabIndex = 3 Me.lblSelectContrastName.Text = "Select Contrast Name:" ' 'lblDefineContrast ' Me.lblDefineContrast.AutoSize = True - Me.lblDefineContrast.Location = New System.Drawing.Point(442, 13) + Me.lblDefineContrast.Location = New System.Drawing.Point(445, 20) Me.lblDefineContrast.Name = "lblDefineContrast" Me.lblDefineContrast.Size = New System.Drawing.Size(92, 13) - Me.lblDefineContrast.TabIndex = 16 + Me.lblDefineContrast.TabIndex = 5 Me.lblDefineContrast.Text = "Define a Contrast:" ' 'grdLayoutForContrasts @@ -72,25 +72,30 @@ Partial Class dlgContrasts Me.grdLayoutForContrasts.SheetTabNewButtonVisible = True Me.grdLayoutForContrasts.SheetTabVisible = True Me.grdLayoutForContrasts.SheetTabWidth = 60 + Me.grdLayoutForContrasts.ShowScrollEndSpacing = True Me.grdLayoutForContrasts.Size = New System.Drawing.Size(333, 207) - Me.grdLayoutForContrasts.TabIndex = 19 + Me.grdLayoutForContrasts.TabIndex = 6 ' 'ucrInputContrastName ' + Me.ucrInputContrastName.AddQuotesIfUnrecognised = True Me.ucrInputContrastName.IsReadOnly = False - Me.ucrInputContrastName.Location = New System.Drawing.Point(244, 93) + Me.ucrInputContrastName.Location = New System.Drawing.Point(260, 114) Me.ucrInputContrastName.Name = "ucrInputContrastName" Me.ucrInputContrastName.Size = New System.Drawing.Size(120, 21) - Me.ucrInputContrastName.TabIndex = 13 + Me.ucrInputContrastName.TabIndex = 4 ' 'ucrReceiverForContrasts ' - Me.ucrReceiverForContrasts.Location = New System.Drawing.Point(244, 36) + Me.ucrReceiverForContrasts.frmParent = Me + Me.ucrReceiverForContrasts.Location = New System.Drawing.Point(260, 63) Me.ucrReceiverForContrasts.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverForContrasts.Name = "ucrReceiverForContrasts" Me.ucrReceiverForContrasts.Selector = Nothing Me.ucrReceiverForContrasts.Size = New System.Drawing.Size(120, 20) + Me.ucrReceiverForContrasts.strNcFilePath = "" Me.ucrReceiverForContrasts.TabIndex = 2 + Me.ucrReceiverForContrasts.ucrSelector = Nothing ' 'ucrSelectorForContrast ' @@ -100,14 +105,14 @@ Partial Class dlgContrasts Me.ucrSelectorForContrast.Margin = New System.Windows.Forms.Padding(0) Me.ucrSelectorForContrast.Name = "ucrSelectorForContrast" Me.ucrSelectorForContrast.Size = New System.Drawing.Size(210, 180) - Me.ucrSelectorForContrast.TabIndex = 1 + Me.ucrSelectorForContrast.TabIndex = 0 ' 'ucrBase ' Me.ucrBase.Location = New System.Drawing.Point(13, 200) Me.ucrBase.Name = "ucrBase" Me.ucrBase.Size = New System.Drawing.Size(410, 60) - Me.ucrBase.TabIndex = 0 + Me.ucrBase.TabIndex = 7 ' 'dlgContrasts ' diff --git a/instat/dlgContrasts.vb b/instat/dlgContrasts.vb index ee0dad4cb2c..a4583d89a75 100644 --- a/instat/dlgContrasts.vb +++ b/instat/dlgContrasts.vb @@ -25,7 +25,6 @@ Public Class dlgContrasts Public clsNlevels, clsFactorColumn, clsContractMatrix, clsSetContrast As New RFunction Public Sub New() - ' This call is required by the designer. InitializeComponent() @@ -52,20 +51,6 @@ Public Class dlgContrasts TestOKEnabled() End Sub - Private Sub SetRCodeforControls(bReset As Boolean) - ucrSelectorForContrast.SetRCode(clsSetContrast, bReset) - ucrReceiverForContrasts.SetRCode(clsSetContrast, bReset) - ucrInputContrastName.SetRCode(clsSetContrast, bReset) - End Sub - - Private Sub TestOKEnabled() - If ucrReceiverForContrasts.IsEmpty OrElse (ucrInputContrastName.GetText = "User Defined" AndAlso IsEmptyCells()) Then - ucrBase.OKEnabled(False) - Else - ucrBase.OKEnabled(True) - End If - End Sub - Private Sub InitialiseDialog() ucrReceiverForContrasts.Selector = ucrSelectorForContrast ucrReceiverForContrasts.SetMeAsReceiver() @@ -109,6 +94,20 @@ Public Class dlgContrasts clsSetContrast.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$set_contrasts_of_factor") ucrBase.clsRsyntax.SetBaseRFunction(clsSetContrast) + End Sub + + Private Sub SetRCodeforControls(bReset As Boolean) + ucrSelectorForContrast.SetRCode(clsSetContrast, bReset) + ucrReceiverForContrasts.SetRCode(clsSetContrast, bReset) + ucrInputContrastName.SetRCode(clsSetContrast, bReset) + End Sub + + Private Sub TestOKEnabled() + If ucrReceiverForContrasts.IsEmpty OrElse (ucrInputContrastName.GetText = "User Defined" AndAlso IsEmptyCells()) Then + ucrBase.OKEnabled(False) + Else + ucrBase.OKEnabled(True) + End If End Sub Private Sub ucrBase_ClickReset(sender As Object, e As EventArgs) Handles ucrBase.ClickReset From 910f6c249cb29a9048bdd81fed0b9f61e1148caf Mon Sep 17 00:00:00 2001 From: Lily Date: Mon, 5 Jun 2017 16:06:47 +0100 Subject: [PATCH 090/154] edits --- instat/dlgContrasts.vb | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/instat/dlgContrasts.vb b/instat/dlgContrasts.vb index a4583d89a75..2c26fe47151 100644 --- a/instat/dlgContrasts.vb +++ b/instat/dlgContrasts.vb @@ -52,12 +52,18 @@ Public Class dlgContrasts End Sub Private Sub InitialiseDialog() + ucrBase.iHelpTopicID = 353 + Dim dctContrastTypes As New Dictionary(Of String, String) + + ucrSelectorForContrast.SetParameter(New RParameter("data_name", 0)) + ucrSelectorForContrast.SetParameterIsString() + + ucrReceiverForContrasts.SetParameter(New RParameter("col_name", 1)) + ucrReceiverForContrasts.SetParameterIsString() ucrReceiverForContrasts.Selector = ucrSelectorForContrast ucrReceiverForContrasts.SetMeAsReceiver() ucrReceiverForContrasts.SetIncludedDataTypes({"factor"}) - ucrBase.iHelpTopicID = 353 - Dim dctContrastTypes As New Dictionary(Of String, String) ucrInputContrastName.SetParameter(New RParameter("new_contrasts", 2)) dctContrastTypes.Add("Treatment/Control", Chr(34) & "contr.treatment" & Chr(34)) dctContrastTypes.Add("Helmert", Chr(34) & "contr.helmert" & Chr(34)) @@ -66,13 +72,6 @@ Public Class dlgContrasts dctContrastTypes.Add("User Defined", Chr(34) & "user_defined" & Chr(34)) ucrInputContrastName.SetItems(dctContrastTypes) ucrInputContrastName.SetLinkedDisplayControl(lblSelectContrastName) - - ucrSelectorForContrast.SetParameter(New RParameter("data_name", 0)) - ucrSelectorForContrast.SetParameterIsString() - - ucrReceiverForContrasts.SetParameter(New RParameter("col_name", 1)) - ucrReceiverForContrasts.SetParameterIsString() - End Sub Private Sub SetDefaults() @@ -82,7 +81,6 @@ Public Class dlgContrasts clsSetContrast = New RFunction grdCurrSheet.Reset() - ucrInputContrastName.Reset() ucrSelectorForContrast.Reset() From 425ebcc4309dd73c50ed1bcfa1d02797e2a0dbb1 Mon Sep 17 00:00:00 2001 From: Lily Date: Mon, 5 Jun 2017 16:16:23 +0100 Subject: [PATCH 091/154] fix --- instat/dlgContrasts.Designer.vb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/instat/dlgContrasts.Designer.vb b/instat/dlgContrasts.Designer.vb index 947a41df357..c3c9d344474 100644 --- a/instat/dlgContrasts.Designer.vb +++ b/instat/dlgContrasts.Designer.vb @@ -78,7 +78,7 @@ Partial Class dlgContrasts ' 'ucrInputContrastName ' - Me.ucrInputContrastName.AddQuotesIfUnrecognised = True + ' Me.ucrInputContrastName.AddQuotesIfUnrecognised = True Me.ucrInputContrastName.IsReadOnly = False Me.ucrInputContrastName.Location = New System.Drawing.Point(260, 114) Me.ucrInputContrastName.Name = "ucrInputContrastName" From f9243046e9bcee3357138359005b4b264eca180a Mon Sep 17 00:00:00 2001 From: Lily Date: Mon, 5 Jun 2017 16:20:35 +0100 Subject: [PATCH 092/154] bug fix --- instat/dlgContrasts.vb | 1 + 1 file changed, 1 insertion(+) diff --git a/instat/dlgContrasts.vb b/instat/dlgContrasts.vb index 2c26fe47151..9e485b399ab 100644 --- a/instat/dlgContrasts.vb +++ b/instat/dlgContrasts.vb @@ -72,6 +72,7 @@ Public Class dlgContrasts dctContrastTypes.Add("User Defined", Chr(34) & "user_defined" & Chr(34)) ucrInputContrastName.SetItems(dctContrastTypes) ucrInputContrastName.SetLinkedDisplayControl(lblSelectContrastName) + ucrInputContrastName.SetDropDownStyleAsNonEditable() End Sub Private Sub SetDefaults() From b63a7aa162ab2bdec7f8c72e7d946dc6d589eb4c Mon Sep 17 00:00:00 2001 From: Steven Date: Mon, 5 Jun 2017 21:15:41 +0300 Subject: [PATCH 093/154] More Additions --- instat/clsGgplotDefaults.vb | 164 ++++++++++++++++++++++- instat/dlgBarAndPieChart.vb | 10 +- instat/sdgThemes.vb | 253 +++++++++--------------------------- 3 files changed, 222 insertions(+), 205 deletions(-) diff --git a/instat/clsGgplotDefaults.vb b/instat/clsGgplotDefaults.vb index 80fca4a32fb..ee6bd8a4406 100644 --- a/instat/clsGgplotDefaults.vb +++ b/instat/clsGgplotDefaults.vb @@ -83,19 +83,92 @@ Public Shared ReadOnly Property dctThemeFunctions As Dictionary(Of String, RFunction) Get Dim dctTemp As New Dictionary(Of String, RFunction) - Dim clsElementText As RFunction - + Dim clsElementText As RFunction + Dim clsElementLine As RFunction + Dim clsElementRect As RFunction + clsElementText = New RFunction - clsElementText.SetPackageName("ggplot2") - clsElementText.SetRCommand("element_text") + clsElementLine = New RFunction + clsElementRect = New RFunction + clsElementText.SetPackageName("ggplot2") + clsElementText.SetRCommand("element_text") + clsElementLine.SetRCommand("element_line") + clsElementRect.SetRCommand("element_rect") + + dctTemp.Add("line", clsElementLine.Clone()) + dctTemp.Add("rect", clsElementRect.Clone()) + dctTemp.Add("text", clsElementText.Clone()) + dctTemp.Add("title", clsElementText.Clone()) + 'dctTemp.Add("aspect.ratio", clsElementText.Clone()) + dctTemp.Add("axis.title", clsElementText.Clone()) + dctTemp.Add("axis.title.x", clsElementText.Clone()) + dctTemp.Add("axis.title.x.top", clsElementText.Clone()) + dctTemp.Add("axis.title.y", clsElementText.Clone()) + dctTemp.Add("axis.title.y.right", clsElementText.Clone()) + dctTemp.Add("axis.text", clsElementText.Clone()) dctTemp.Add("axis.text.x", clsElementText.Clone()) + dctTemp.Add(" axis.text.x.top", clsElementText.Clone()) dctTemp.Add("axis.text.y", clsElementText.Clone()) - + dctTemp.Add("axis.text.y.right", clsElementText.Clone()) + dctTemp.Add("axis.ticks", clsElementLine.Clone()) + dctTemp.Add("axis.ticks.x", clsElementLine.Clone()) + dctTemp.Add("axis.ticks.y", clsElementLine.Clone()) + 'dctTemp.Add(" axis.ticks.length", clsElementLine.Clone()) + dctTemp.Add("axis.line", clsElementLine.Clone()) + dctTemp.Add("axis.line.x", clsElementLine.Clone()) + dctTemp.Add("axis.line.y", clsElementLine.Clone()) + ' dctTemp.Add("axis.ticks.length", clsElementLine.Clone()) + dctTemp.Add("legend.background", clsElementRect.Clone()) + ' dctTemp.Add("legend.margin", clsElementLine.Clone()) + ' dctTemp.Add("legend.spacing", clsElementLine.Clone()) + ' dctTemp.Add("legend.spacing.x", clsElementText.Clone()) + 'dctTemp.Add("legend.spacing.y", clsElementText.Clone()) + 'dctTemp.Add("legend.key", clsElementText.Clone()) + ' dctTemp.Add("legend.key.size", clsElementText.Clone()) + 'dctTemp.Add("legend.key.height", clsElementText.Clone()) + ' dctTemp.Add("legend.key.width", clsElementText.Clone()) + dctTemp.Add("legend.text", clsElementText.Clone()) + 'dctTemp.Add("legend.text.align", clsElementText.Clone()) + dctTemp.Add("legend.title", clsElementText.Clone()) + ' dctTemp.Add("legend.title.align", clsElementText.Clone()) + 'dctTemp.Add("legend.position", clsElementText.Clone()) + '.Add("legend.direction", clsElementText.Clone()) + 'dctTemp.Add("legend.justification", clsElementText.Clone()) + 'dctTemp.Add(" legend.box", clsElementText.Clone()) + 'dctTemp.Add("legend.box.just", clsElementText.Clone()) + 'dctTemp.Add("legend.box.margin", clsElementText.Clone()) + ' dctTemp.Add("legend.box.background", clsElementRect.Clone()) + 'dctTemp.Add(" legend.box.spacing", clsElementText.Clone()) + dctTemp.Add("Panel.background", clsElementRect.Clone()) + dctTemp.Add("Panel.border", clsElementRect.Clone()) + 'dctTemp.Add("Panel.spacing", clsElementText.Clone()) + ' dctTemp.Add(" Panel.spacing.x", clsElementText.Clone()) + 'dctTemp.Add("Panel.spacing.y", clsElementText.Clone()) + dctTemp.Add("Panel.grid", clsElementLine.Clone()) + dctTemp.Add("Panel.grid.major", clsElementLine.Clone()) + dctTemp.Add(" Panel.grid.minor", clsElementLine.Clone()) + dctTemp.Add("Panel.grid.major.x", clsElementLine.Clone()) + dctTemp.Add("Panel.grid.major.y", clsElementLine.Clone()) + dctTemp.Add("Panel.grid.minor.x", clsElementLine.Clone()) + dctTemp.Add("Panel.grid.minor.y", clsElementLine.Clone()) + 'dctTemp.Add("Panel.ontop", clsElementRect.Clone()) + dctTemp.Add("plot.background", clsElementRect.Clone()) + dctTemp.Add("plot.title", clsElementText.Clone()) + dctTemp.Add("plot.subtitle", clsElementText.Clone()) + dctTemp.Add("plot.caption", clsElementText.Clone()) + ' dctTemp.Add("plot.margin", clsElementRect.Clone()) + dctTemp.Add("strip.background", clsElementRect.Clone()) + ' dctTemp.Add("strip.placement", clsElementLine.Clone()) + dctTemp.Add("strip.text", clsElementText.Clone()) + dctTemp.Add(" strip.text.x", clsElementText.Clone()) + dctTemp.Add("strip.text.y", clsElementText.Clone()) + 'dctTemp.Add("strip.switch.pad.grid", clsElementLine.Clone()) + 'dctTemp.Add("strip.switch.pad.wrap", clsElementLine.Clone()) Return dctTemp End Get - End Property - + End Property + Public Shared ReadOnly Property dctFonts As Dictionary(Of String, String) Get Dim dctTemp As New Dictionary(Of String, String) @@ -121,8 +194,85 @@ Return dctTemp End Get + End Property + + Public Shared ReadOnly Property dctFontFace As Dictionary(Of String, String) + Get + Dim dctTempFontFace As New Dictionary(Of String, String) + dctTempFontFace.Add("Plain", Chr(34) & "plain" & Chr(34)) + dctTempFontFace.Add("Bold", Chr(34) & "bold" & Chr(34)) + dctTempFontFace.Add("Italic", Chr(34) & "italic" & Chr(34)) + dctTempFontFace.Add("Bold italic", Chr(34) & "bold.italic" & Chr(34)) + Return dctTempFontFace + End Get + End Property + + Public Shared ReadOnly Property dctColour As Dictionary(Of String, String) + Get + Dim dctTempColour As New Dictionary(Of String, String) + dctTempColour.Add("Black", Chr(34) & "black" & Chr(34)) + dctTempColour.Add("Red", Chr(34) & "red" & Chr(34)) + dctTempColour.Add("Blue", Chr(34) & "blue" & Chr(34)) + dctTempColour.Add("Grey", Chr(34) & "grey" & Chr(34)) + dctTempColour.Add("Yellow", Chr(34) & "yellow" & Chr(34)) + dctTempColour.Add("Yellow-Green", Chr(34) & "yellowgreen" & Chr(34)) + Return dctTempColour + End Get + End Property + + Public Shared ReadOnly Property dctLineType As Dictionary(Of String, String) + Get + Dim dctTempLineType As New Dictionary(Of String, String) + dctTempLineType.Add("Blank", Chr(34) & "blank" & Chr(34)) + dctTempLineType.Add("Solid", Chr(34) & "solid" & Chr(34)) + dctTempLineType.Add("Dashed", Chr(34) & "dashed" & Chr(34)) + dctTempLineType.Add("Dotted", Chr(34) & "dotted" & Chr(34)) + dctTempLineType.Add("Dot-dash", Chr(34) & "dotdash" & Chr(34)) + dctTempLineType.Add("Long-dash", Chr(34) & "longdash" & Chr(34)) + dctTempLineType.Add("Two-Dash", Chr(34) & "twodash" & Chr(34)) + dctTempLineType.Add("1F", Chr(34) & "1F" & Chr(34)) + dctTempLineType.Add("F1", Chr(34) & "F1" & Chr(34)) + dctTempLineType.Add("4C88C488", Chr(34) & "4C88C488" & Chr(34)) + dctTempLineType.Add("12345678", Chr(34) & "12345678" & Chr(34)) + Return dctTempLineType + End Get End Property + Public Shared ReadOnly Property dctLineEnd As Dictionary(Of String, String) + Get + Dim dctTempLineEnd As New Dictionary(Of String, String) + dctTempLineEnd.Add("None", Chr(34) & "NULL" & Chr(34)) + dctTempLineEnd.Add("round", Chr(34) & "round" & Chr(34)) + dctTempLineEnd.Add("butt", Chr(34) & "butt" & Chr(34)) + dctTempLineEnd.Add("square", Chr(34) & "square" & Chr(34)) + Return dctTempLineEnd + End Get + End Property + + Public Shared ReadOnly Property dctUnits As Dictionary(Of String, String) + Get + Dim dctTempUnits As New Dictionary(Of String, String) + dctTempUnits.Add("Normalised Parent Coordinates", Chr(34) & "npc" & Chr(34)) + dctTempUnits.Add("Centimetres", Chr(34) & "cm" & Chr(34)) + dctTempUnits.Add("Inches", Chr(34) & "inches" & Chr(34)) + dctTempUnits.Add("Millimetres", Chr(34) & "mm" & Chr(34)) + dctTempUnits.Add("Points", Chr(34) & "points" & Chr(34)) + dctTempUnits.Add("Picas", Chr(34) & "picas" & Chr(34)) + dctTempUnits.Add("Big Points", Chr(34) & "bigpts" & Chr(34)) + dctTempUnits.Add("Dida", Chr(34) & "dida" & Chr(34)) + dctTempUnits.Add("Cicero", Chr(34) & "cicero" & Chr(34)) + dctTempUnits.Add("Scaled Points", Chr(34) & "scaledpts" & Chr(34)) + dctTempUnits.Add("Lines", Chr(34) & "lines" & Chr(34)) + dctTempUnits.Add("Character", Chr(34) & "char" & Chr(34)) + dctTempUnits.Add("Native", Chr(34) & "native" & Chr(34)) + dctTempUnits.Add("String Width", Chr(34) & "strwidth" & Chr(34)) + dctTempUnits.Add("String Height", Chr(34) & "strheight" & Chr(34)) + dctTempUnits.Add("Square Normalised Parent Coordinates", Chr(34) & "snpc" & Chr(34)) + dctTempUnits.Add("Grop Height", Chr(34) & "grobheight" & Chr(34)) + dctTempUnits.Add("Grop Width", Chr(34) & "grobwidth" & Chr(34)) + Return dctTempUnits + End Get + End Property Public Shared ReadOnly Property clsDefaultThemeFunction As RFunction Get Dim clsTempFunc As New RFunction diff --git a/instat/dlgBarAndPieChart.vb b/instat/dlgBarAndPieChart.vb index f37a4d9053b..3213f555d80 100644 --- a/instat/dlgBarAndPieChart.vb +++ b/instat/dlgBarAndPieChart.vb @@ -28,7 +28,9 @@ Public Class dlgBarAndPieChart Private clsYlabFunction As New RFunction Private clsXScalecontinuousFunction As New RFunction Private clsRFacetFunction As New RFunction - + Private clsThemeFuction As New RFunction + Private dctThemeTextFunctions As New Dictionary(Of String, RFunction) + Private dctThemeLineFunctions As New Dictionary(Of String, RFunction) Private bReset As Boolean = True Private bFirstLoad As Boolean = True Private bResetSubdialog As Boolean = True @@ -163,7 +165,9 @@ Public Class dlgBarAndPieChart clsXScalecontinuousFunction = GgplotDefaults.clsXScalecontinuousFunction.Clone() clsRFacetFunction = GgplotDefaults.clsFacetFunction.Clone() clsBaseOperator.AddParameter(GgplotDefaults.clsDefaultThemeParameter.Clone()) - + clsThemeFuction = GgplotDefaults.clsDefaultThemeFunction.Clone + dctThemeTextFunctions = GgplotDefaults.dctThemeTextFunctions + dctThemeLineFunctions = GgplotDefaults.dctThemeLineFunctions clsBaseOperator.SetAssignTo("last_graph", strTempDataframe:=ucrBarChartSelector.ucrAvailableDataFrames.cboAvailableDataFrames.Text, strTempGraph:="last_graph") ucrBase.clsRsyntax.SetBaseROperator(clsBaseOperator) End Sub @@ -197,7 +201,7 @@ Public Class dlgBarAndPieChart End Sub Private Sub cmdOptions_Click(sender As Object, e As EventArgs) Handles cmdOptions.Click - sdgPlots.SetRCode(clsBaseOperator, clsNewXScalecontinuousFunction:=clsXScalecontinuousFunction, clsNewXLabsTitleFunction:=clsXlabFunction, clsNewYLabTitleFunction:=clsYlabFunction, clsNewLabsFunction:=clsLabsFunction, clsNewFacetFunction:=clsRFacetFunction, strNewDataFrame:=ucrBarChartSelector.ucrAvailableDataFrames.cboAvailableDataFrames.Text, bReset:=bResetSubdialog) + sdgPlots.SetRCode(clsNewOperator:=clsBaseOperator, clsNewThemeFunction:=clsThemeFuction, dctNewThemeLineFunctions:=dctThemeLineFunctions, dctNewThemeTextFunctions:=dctThemeTextFunctions, clsNewXScalecontinuousFunction:=clsXScalecontinuousFunction, clsNewXLabsTitleFunction:=clsXlabFunction, clsNewYLabTitleFunction:=clsYlabFunction, clsNewLabsFunction:=clsLabsFunction, clsNewFacetFunction:=clsRFacetFunction, strNewDataFrame:=ucrBarChartSelector.ucrAvailableDataFrames.cboAvailableDataFrames.Text, bReset:=bResetSubdialog) 'sdgPlots.SetDataFrame(strNewDataFrame:=ucrBarChartSelector.ucrAvailableDataFrames.cboAvailableDataFrames.Text) sdgPlots.ShowDialog() bResetSubdialog = False diff --git a/instat/sdgThemes.vb b/instat/sdgThemes.vb index aa36216800f..85d98f79341 100644 --- a/instat/sdgThemes.vb +++ b/instat/sdgThemes.vb @@ -13,7 +13,7 @@ ' ' You should have received a copy of the GNU General Public License k ' along with this program. If not, see . -Imports instat + Imports instat.Translations Public Class sdgThemes @@ -28,36 +28,6 @@ Public Class sdgThemes End Sub Public Sub InitialiseControls() - 'X-Axis tab - Dim dctucrInputColour As New Dictionary(Of String, String) - Dim dctucrInputUnits As New Dictionary(Of String, String) - Dim dctucrInputColourTopAxis As New Dictionary(Of String, String) - Dim dctucrInputColourSegment As New Dictionary(Of String, String) - Dim dctucrInputFace As New Dictionary(Of String, String) - Dim dctucrInputFaceTopAxis As New Dictionary(Of String, String) - Dim dctucrInputFamily As New Dictionary(Of String, String) - Dim dctucrInputFamilyTopAxis As New Dictionary(Of String, String) - Dim dctucrInputLineType As New Dictionary(Of String, String) - Dim dctucrInputLineTypeXTickMarks As New Dictionary(Of String, String) - Dim dctucrInputColourXTickMarks As New Dictionary(Of String, String) - Dim dctucrInputLineEnd As New Dictionary(Of String, String) - Dim dctucrInputLineEndXTickMarks As New Dictionary(Of String, String) - - 'Y -Axis tab - Dim dctucrInputColourYAxis As New Dictionary(Of String, String) - Dim dctucrInputColourTopYAxis As New Dictionary(Of String, String) - 'Dim dctucrInputColour As New Dictionary(Of String, String) - Dim dctucrInputFaceYAxis As New Dictionary(Of String, String) - Dim dctucrInputFaceTopYAxis As New Dictionary(Of String, String) - Dim dctucrInputFamilyYAxis As New Dictionary(Of String, String) - Dim dctucrInputFamilyTopYAxis As New Dictionary(Of String, String) - Dim dctucrInputLineTypeTickLabelsYAxis As New Dictionary(Of String, String) - Dim dctucrInputLineEndTickLabelsYAxis As New Dictionary(Of String, String) - Dim dctucrInputColourTickMarksYAxis As New Dictionary(Of String, String) - 'Dim dctucrInputColourTickMarksYAxis As New Dictionary(Of String, String) - Dim dctucrInputColourTickLabelsYAxis As New Dictionary(Of String, String) - Dim dctucrInputLineTypeTickMarksYAxis As New Dictionary(Of String, String) - Dim dctucrInputLineEndTickMarksYAxis As New Dictionary(Of String, String) 'X axis Label ucrChkSize.SetText("Size") @@ -78,22 +48,12 @@ Public Class sdgThemes ucrChkFace.SetText("Face") ucrInputFace.SetParameter(New RParameter("face")) - dctucrInputFace.Add("Plain", Chr(34) & "plain" & Chr(34)) - dctucrInputFace.Add("Bold", Chr(34) & "bold" & Chr(34)) - dctucrInputFace.Add("Italic", Chr(34) & "italic" & Chr(34)) - dctucrInputFace.Add("Bold italic", Chr(34) & "bold.italic" & Chr(34)) - ucrInputFace.SetItems(dctucrInputFace) + ucrInputFace.SetItems(New Dictionary(Of String, String)(GgplotDefaults.dctFontFace)) ucrInputFace.SetRDefault(Chr(34) & "plain" & Chr(34)) ucrChkColour.SetText("Colour") ucrInputColour.SetParameter(New RParameter("colour")) - dctucrInputColour.Add("Black", Chr(34) & "black" & Chr(34)) - dctucrInputColour.Add("Red", Chr(34) & "red" & Chr(34)) - dctucrInputColour.Add("Blue", Chr(34) & "blue" & Chr(34)) - dctucrInputColour.Add("Grey", Chr(34) & "grey" & Chr(34)) - dctucrInputColour.Add("Yellow", Chr(34) & "yellow" & Chr(34)) - dctucrInputColour.Add("Yellow-Green", Chr(34) & "yellowgreen" & Chr(34)) - ucrInputColour.SetItems(dctucrInputColour) + ucrInputColour.SetItems(New Dictionary(Of String, String)(GgplotDefaults.dctColour)) ucrInputColour.SetRDefault(Chr(34) & "black" & Chr(34)) ucrChkFamily.SetText("Family") @@ -109,38 +69,17 @@ Public Class sdgThemes ucrChkLineTypeTickMarksXAxis.SetText("Line Type") ucrInputLineTypeTickMarks.SetParameter(New RParameter("linetype")) - dctucrInputLineType.Add("Blank", Chr(34) & "blank" & Chr(34)) - dctucrInputLineType.Add("Solid", Chr(34) & "solid" & Chr(34)) - dctucrInputLineType.Add("Dashed", Chr(34) & "dashed" & Chr(34)) - dctucrInputLineType.Add("Dotted", Chr(34) & "dotted" & Chr(34)) - dctucrInputLineType.Add("Dot-dash", Chr(34) & "dotdash" & Chr(34)) - dctucrInputLineType.Add("Long-dash", Chr(34) & "longdash" & Chr(34)) - dctucrInputLineType.Add("Two-Dash", Chr(34) & "twodash" & Chr(34)) - dctucrInputLineType.Add("1F", Chr(34) & "1F" & Chr(34)) - dctucrInputLineType.Add("F1", Chr(34) & "F1" & Chr(34)) - dctucrInputLineType.Add("4C88C488", Chr(34) & "4C88C488" & Chr(34)) - dctucrInputLineType.Add("12345678", Chr(34) & "12345678" & Chr(34)) - ucrInputLineTypeTickMarks.SetItems(dctucrInputLineType) + ucrInputLineTypeTickMarks.SetItems(New Dictionary(Of String, String)(GgplotDefaults.dctLineType)) ucrInputLineTypeTickMarks.SetRDefault(Chr(34) & "blank" & Chr(34)) ucrChkColourTickMarksXAxis.SetText("Colour") ucrInputColourTickMarks.SetParameter(New RParameter("colour")) - dctucrInputColourSegment.Add("Black", Chr(34) & "black" & Chr(34)) - dctucrInputColourSegment.Add("Red", Chr(34) & "red" & Chr(34)) - dctucrInputColourSegment.Add("Blue", Chr(34) & "blue" & Chr(34)) - dctucrInputColourSegment.Add("Grey", Chr(34) & "grey" & Chr(34)) - dctucrInputColourSegment.Add("Yellow", Chr(34) & "yellow" & Chr(34)) - dctucrInputColourSegment.Add("Yellow-Green", Chr(34) & "yellowgreen" & Chr(34)) - ucrInputColourTickMarks.SetItems(dctucrInputColourSegment) + ucrInputColourTickMarks.SetItems(New Dictionary(Of String, String)(GgplotDefaults.dctColour)) ucrInputColourTickMarks.SetRDefault(Chr(34) & "black" & Chr(34)) ucrChkLineEndTickMarksXAxis.SetText("Line End") ucrInputLineEndTickMarks.SetParameter(New RParameter("lineend")) - ' dctucrInputLineEnd.Add("NULL", Chr(34) & "NULL" & Chr(34)) - dctucrInputLineEnd.Add("round", Chr(34) & "round" & Chr(34)) - dctucrInputLineEnd.Add("butt", Chr(34) & "butt" & Chr(34)) - dctucrInputLineEnd.Add("square", Chr(34) & "square" & Chr(34)) - ucrInputLineEndTickMarks.SetItems(dctucrInputLineEnd) + ucrInputLineEndTickMarks.SetItems(New Dictionary(Of String, String)(GgplotDefaults.dctLineEnd)) ucrInputLineEndTickMarks.SetRDefault(Chr(34) & "square" & Chr(34)) 'X axis Label Top Axis @@ -163,22 +102,12 @@ Public Class sdgThemes ucrChkFaceTopXAxis.SetText("Face") ucrInputFaceTopAxis.SetParameter(New RParameter("face")) - dctucrInputFaceTopAxis.Add("Plain", Chr(34) & "plain" & Chr(34)) - dctucrInputFaceTopAxis.Add("Bold", Chr(34) & "bold" & Chr(34)) - dctucrInputFaceTopAxis.Add("Italic", Chr(34) & "italic" & Chr(34)) - dctucrInputFaceTopAxis.Add("Bold italic", Chr(34) & "bold.italic" & Chr(34)) - ucrInputFaceTopAxis.SetItems(dctucrInputFaceTopAxis) + ucrInputFaceTopAxis.SetItems(New Dictionary(Of String, String)(GgplotDefaults.dctFontFace)) ucrInputFaceTopAxis.SetRDefault(Chr(34) & "plain" & Chr(34)) ucrChkColourTopXAxis.SetText("colour") ucrInputColourTopAxis.SetParameter(New RParameter("colour")) - dctucrInputColourTopAxis.Add("Black", Chr(34) & "black" & Chr(34)) - dctucrInputColourTopAxis.Add("Red", Chr(34) & "red" & Chr(34)) - dctucrInputColourTopAxis.Add("Blue", Chr(34) & "blue" & Chr(34)) - dctucrInputColourTopAxis.Add("Grey", Chr(34) & "grey" & Chr(34)) - dctucrInputColourTopAxis.Add("Yellow", Chr(34) & "yellow" & Chr(34)) - dctucrInputColourTopAxis.Add("Yellow-Green", Chr(34) & "yellowgreen" & Chr(34)) - ucrInputColourTopAxis.SetItems(dctucrInputColourTopAxis) + ucrInputColourTopAxis.SetItems(New Dictionary(Of String, String)(GgplotDefaults.dctColour)) ucrInputColourTopAxis.SetRDefault(Chr(34) & "black" & Chr(34)) ucrChkFamilyTopXAxis.SetText("Family") @@ -193,38 +122,17 @@ Public Class sdgThemes ucrChkLineTypeTickLabelsXAxis.SetText("Line Type") ucrInputLineTypeTickLabelsXAxis.SetParameter(New RParameter("linetype")) - dctucrInputLineTypeXTickMarks.Add("Blank", Chr(34) & "blank" & Chr(34)) - dctucrInputLineTypeXTickMarks.Add("Solid", Chr(34) & "solid" & Chr(34)) - dctucrInputLineTypeXTickMarks.Add("Dashed", Chr(34) & "dashed" & Chr(34)) - dctucrInputLineTypeXTickMarks.Add("Dotted", Chr(34) & "dotted" & Chr(34)) - dctucrInputLineTypeXTickMarks.Add("Dot-dash", Chr(34) & "dotdash" & Chr(34)) - dctucrInputLineTypeXTickMarks.Add("Long-dash", Chr(34) & "longdash" & Chr(34)) - dctucrInputLineTypeXTickMarks.Add("Two-Dash", Chr(34) & "twodash" & Chr(34)) - dctucrInputLineTypeXTickMarks.Add("1F", Chr(34) & "1F" & Chr(34)) - dctucrInputLineTypeXTickMarks.Add("F1", Chr(34) & "F1" & Chr(34)) - dctucrInputLineTypeXTickMarks.Add("4C88C488", Chr(34) & "4C88C488" & Chr(34)) - dctucrInputLineTypeXTickMarks.Add("12345678", Chr(34) & "12345678" & Chr(34)) - ucrInputLineTypeTickLabelsXAxis.SetItems(dctucrInputLineTypeXTickMarks) + ucrInputLineTypeTickLabelsXAxis.SetItems(New Dictionary(Of String, String)(GgplotDefaults.dctLineType)) ucrInputLineTypeTickLabelsXAxis.SetRDefault(Chr(34) & "blank" & Chr(34)) ucrChkColourTickLabelsXAxis.SetText("Colour") ucrInputColourTickLabelsXAxis.SetParameter(New RParameter("colour")) - dctucrInputColourXTickMarks.Add("Black", Chr(34) & "black" & Chr(34)) - dctucrInputColourXTickMarks.Add("Red", Chr(34) & "red" & Chr(34)) - dctucrInputColourXTickMarks.Add("Blue", Chr(34) & "blue" & Chr(34)) - dctucrInputColourXTickMarks.Add("Grey", Chr(34) & "grey" & Chr(34)) - dctucrInputColourXTickMarks.Add("Yellow", Chr(34) & "yellow" & Chr(34)) - dctucrInputColourXTickMarks.Add("Yellow-Green", Chr(34) & "yellowgreen" & Chr(34)) - ucrInputColourTickLabelsXAxis.SetItems(dctucrInputColourXTickMarks) + ucrInputColourTickLabelsXAxis.SetItems(New Dictionary(Of String, String)(GgplotDefaults.dctColour)) ucrInputColourTickLabelsXAxis.SetRDefault(Chr(34) & "black" & Chr(34)) ucrChkLineEndTickLabelsXAxis.SetText("Line End") ucrInputLineEndTickLabelsXAxis.SetParameter(New RParameter("lineend")) - 'dctucrInputLineEndXTickMarks.Add("None", Chr(34) & "NULL" & Chr(34)) - dctucrInputLineEndXTickMarks.Add("round", Chr(34) & "round" & Chr(34)) - dctucrInputLineEndXTickMarks.Add("butt", Chr(34) & "butt" & Chr(34)) - dctucrInputLineEndXTickMarks.Add("square", Chr(34) & "square" & Chr(34)) - ucrInputLineEndTickLabelsXAxis.SetItems(dctucrInputLineEndXTickMarks) + ucrInputLineEndTickLabelsXAxis.SetItems(New Dictionary(Of String, String)(GgplotDefaults.dctColour)) ucrInputLineEndTickLabelsXAxis.SetRDefault(Chr(34) & "square" & Chr(34)) 'Linking @@ -275,22 +183,12 @@ Public Class sdgThemes ucrChkFaceYAxis.SetText("Face") ucrInputFaceYAxis.SetParameter(New RParameter("face")) - dctucrInputFaceYAxis.Add("Plain", Chr(34) & "plain" & Chr(34)) - dctucrInputFaceYAxis.Add("Bold", Chr(34) & "bold" & Chr(34)) - dctucrInputFaceYAxis.Add("Italic", Chr(34) & "italic" & Chr(34)) - dctucrInputFaceYAxis.Add("Bold italic", Chr(34) & "bold.italic" & Chr(34)) - ucrInputFaceYAxis.SetItems(dctucrInputFaceYAxis) + ucrInputFaceYAxis.SetItems(New Dictionary(Of String, String)(GgplotDefaults.dctFontFace)) ucrInputFaceYAxis.SetRDefault(Chr(34) & "plain" & Chr(34)) ucrChkColourYAxis.SetText("Colour") ucrInputColourYAxis.SetParameter(New RParameter("colour")) - dctucrInputColourYAxis.Add("Black", Chr(34) & "black" & Chr(34)) - dctucrInputColourYAxis.Add("Red", Chr(34) & "red" & Chr(34)) - dctucrInputColourYAxis.Add("Blue", Chr(34) & "blue" & Chr(34)) - dctucrInputColourYAxis.Add("Grey", Chr(34) & "grey" & Chr(34)) - dctucrInputColourYAxis.Add("Yellow", Chr(34) & "yellow" & Chr(34)) - dctucrInputColourYAxis.Add("Yellow-Green", Chr(34) & "yellowgreen" & Chr(34)) - ucrInputColourYAxis.SetItems(dctucrInputColourYAxis) + ucrInputColourYAxis.SetItems(New Dictionary(Of String, String)(GgplotDefaults.dctColour)) ucrInputColourYAxis.SetRDefault(Chr(34) & "black" & Chr(34)) ucrChkFamilyYAxis.SetText("Family") @@ -305,38 +203,18 @@ Public Class sdgThemes ucrChkLineTypeTickLabelsYAxis.SetText("Line Type") ucrInputLineTypeTickLabelsYAxis.SetParameter(New RParameter("linetype")) - dctucrInputLineTypeTickLabelsYAxis.Add("Blank", Chr(34) & "blank" & Chr(34)) - dctucrInputLineTypeTickLabelsYAxis.Add("Solid", Chr(34) & "solid" & Chr(34)) - dctucrInputLineTypeTickLabelsYAxis.Add("Dashed", Chr(34) & "dashed" & Chr(34)) - dctucrInputLineTypeTickLabelsYAxis.Add("Dotted", Chr(34) & "dotted" & Chr(34)) - dctucrInputLineTypeTickLabelsYAxis.Add("Dot-dash", Chr(34) & "dotdash" & Chr(34)) - dctucrInputLineTypeTickLabelsYAxis.Add("Long-dash", Chr(34) & "longdash" & Chr(34)) - dctucrInputLineTypeTickLabelsYAxis.Add("Two-Dash", Chr(34) & "twodash" & Chr(34)) - dctucrInputLineTypeTickLabelsYAxis.Add("1F", Chr(34) & "1F" & Chr(34)) - dctucrInputLineTypeTickLabelsYAxis.Add("F1", Chr(34) & "F1" & Chr(34)) - dctucrInputLineTypeTickLabelsYAxis.Add("4C88C488", Chr(34) & "4C88C488" & Chr(34)) - dctucrInputLineTypeTickLabelsYAxis.Add("12345678", Chr(34) & "12345678" & Chr(34)) - ucrInputLineTypeTickLabelsYAxis.SetItems(dctucrInputLineTypeTickLabelsYAxis) + + ucrInputLineTypeTickLabelsYAxis.SetItems(New Dictionary(Of String, String)(GgplotDefaults.dctLineType)) ucrInputLineTypeTickLabelsYAxis.SetRDefault(Chr(34) & "blank" & Chr(34)) ucrChkColourTickMarksYAxis.SetText("Colour") ucrInputColourTickMarksYAxis.SetParameter(New RParameter("colour")) - dctucrInputColourTickMarksYAxis.Add("Black", Chr(34) & "black" & Chr(34)) - dctucrInputColourTickMarksYAxis.Add("Red", Chr(34) & "red" & Chr(34)) - dctucrInputColourTickMarksYAxis.Add("Blue", Chr(34) & "blue" & Chr(34)) - dctucrInputColourTickMarksYAxis.Add("Grey", Chr(34) & "grey" & Chr(34)) - dctucrInputColourTickMarksYAxis.Add("Yellow", Chr(34) & "yellow" & Chr(34)) - dctucrInputColourTickMarksYAxis.Add("Yellow-Green", Chr(34) & "yellowgreen" & Chr(34)) - ucrInputColourTickMarksYAxis.SetItems(dctucrInputColourTickMarksYAxis) + ucrInputColourTickMarksYAxis.SetItems(New Dictionary(Of String, String)(GgplotDefaults.dctColour)) ucrInputColourTickMarksYAxis.SetRDefault(Chr(34) & "black" & Chr(34)) ucrChkLineEndTickLabelsYAxis.SetText("Line End") ucrInputLineEndTickLabelsYAxis.SetParameter(New RParameter("lineend")) - ' dctucrInputLineEnd.Add("NULL", Chr(34) & "NULL" & Chr(34)) - dctucrInputLineEndTickLabelsYAxis.Add("round", Chr(34) & "round" & Chr(34)) - dctucrInputLineEndTickLabelsYAxis.Add("butt", Chr(34) & "butt" & Chr(34)) - dctucrInputLineEndTickLabelsYAxis.Add("square", Chr(34) & "square" & Chr(34)) - ucrInputLineEndTickLabelsYAxis.SetItems(dctucrInputLineEndTickLabelsYAxis) + ucrInputLineEndTickLabelsYAxis.SetItems(New Dictionary(Of String, String)(GgplotDefaults.dctLineEnd)) ucrInputLineEndTickLabelsYAxis.SetRDefault(Chr(34) & "square" & Chr(34)) 'Y axis Label Top Axis @@ -359,22 +237,12 @@ Public Class sdgThemes ucrChkFaceRightYAxis.SetText("Face") ucrInputFaceRightYAxis.SetParameter(New RParameter("face")) - dctucrInputFaceTopYAxis.Add("Plain", Chr(34) & "plain" & Chr(34)) - dctucrInputFaceTopYAxis.Add("Bold", Chr(34) & "bold" & Chr(34)) - dctucrInputFaceTopYAxis.Add("Italic", Chr(34) & "italic" & Chr(34)) - dctucrInputFaceTopYAxis.Add("Bold italic", Chr(34) & "bold.italic" & Chr(34)) - ucrInputFaceRightYAxis.SetItems(dctucrInputFaceTopAxis) + ucrInputFaceRightYAxis.SetItems(New Dictionary(Of String, String)(GgplotDefaults.dctFontFace)) ucrInputFaceRightYAxis.SetRDefault(Chr(34) & "plain" & Chr(34)) ucrChkColourRightYAxis.SetText("Colour") ucrInputColourRightYAxis.SetParameter(New RParameter("colour")) - dctucrInputColourTopYAxis.Add("Black", Chr(34) & "black" & Chr(34)) - dctucrInputColourTopYAxis.Add("Red", Chr(34) & "red" & Chr(34)) - dctucrInputColourTopYAxis.Add("Blue", Chr(34) & "blue" & Chr(34)) - dctucrInputColourTopYAxis.Add("Grey", Chr(34) & "grey" & Chr(34)) - dctucrInputColourTopYAxis.Add("Yellow", Chr(34) & "yellow" & Chr(34)) - dctucrInputColourTopYAxis.Add("Yellow-Green", Chr(34) & "yellowgreen" & Chr(34)) - ucrInputColourRightYAxis.SetItems(dctucrInputColourTopYAxis) + ucrInputColourRightYAxis.SetItems(New Dictionary(Of String, String)(GgplotDefaults.dctColour)) ucrInputColourRightYAxis.SetRDefault(Chr(34) & "black" & Chr(34)) ucrChkFamilyRightYAxis.SetText("Family") @@ -393,62 +261,23 @@ Public Class sdgThemes ucrChkLineTypeTickMarksYAxis.SetText("Line Type") ucrInputLineTypeTickMarksYAxis.SetParameter(New RParameter("linetype")) - dctucrInputLineTypeTickMarksYAxis.Add("Blank", Chr(34) & "blank" & Chr(34)) - dctucrInputLineTypeTickMarksYAxis.Add("Solid", Chr(34) & "solid" & Chr(34)) - dctucrInputLineTypeTickMarksYAxis.Add("Dashed", Chr(34) & "dashed" & Chr(34)) - dctucrInputLineTypeTickMarksYAxis.Add("Dotted", Chr(34) & "dotted" & Chr(34)) - dctucrInputLineTypeTickMarksYAxis.Add("Dot-dash", Chr(34) & "dotdash" & Chr(34)) - dctucrInputLineTypeTickMarksYAxis.Add("Long-dash", Chr(34) & "longdash" & Chr(34)) - dctucrInputLineTypeTickMarksYAxis.Add("Two-Dash", Chr(34) & "twodash" & Chr(34)) - dctucrInputLineTypeTickMarksYAxis.Add("1F", Chr(34) & "1F" & Chr(34)) - dctucrInputLineTypeTickMarksYAxis.Add("F1", Chr(34) & "F1" & Chr(34)) - dctucrInputLineTypeTickMarksYAxis.Add("4C88C488", Chr(34) & "4C88C488" & Chr(34)) - dctucrInputLineTypeTickMarksYAxis.Add("12345678", Chr(34) & "12345678" & Chr(34)) - ucrInputLineTypeTickMarksYAxis.SetItems(dctucrInputLineTypeTickMarksYAxis) + ucrInputLineTypeTickMarksYAxis.SetItems(New Dictionary(Of String, String)(GgplotDefaults.dctLineType)) ucrInputLineTypeTickMarksYAxis.SetRDefault(Chr(34) & "blank" & Chr(34)) ucrChkColourTickLabelsYAxis.SetText("Colour") ucrInputColourTickLabelsYAxis.SetParameter(New RParameter("colour")) - dctucrInputColourTickLabelsYAxis.Add("Black", Chr(34) & "black" & Chr(34)) - dctucrInputColourTickLabelsYAxis.Add("Red", Chr(34) & "red" & Chr(34)) - dctucrInputColourTickLabelsYAxis.Add("Blue", Chr(34) & "blue" & Chr(34)) - dctucrInputColourTickLabelsYAxis.Add("Grey", Chr(34) & "grey" & Chr(34)) - dctucrInputColourTickLabelsYAxis.Add("Yellow", Chr(34) & "yellow" & Chr(34)) - dctucrInputColourTickLabelsYAxis.Add("Yellow-Green", Chr(34) & "yellowgreen" & Chr(34)) - ucrInputColourTickLabelsYAxis.SetItems(dctucrInputColourTickMarksYAxis) + ucrInputColourTickLabelsYAxis.SetItems(New Dictionary(Of String, String)(GgplotDefaults.dctColour)) ucrInputColourTickLabelsYAxis.SetRDefault(Chr(34) & "black" & Chr(34)) ucrChkLineEndTickMarksYAxis.SetText("Line End") ucrInputLineEndTickMarksYAxis.SetParameter(New RParameter("lineend")) - 'dctucrInputLineEndXTickMarks.Add("None", Chr(34) & "NULL" & Chr(34)) - dctucrInputLineEndTickMarksYAxis.Add("round", Chr(34) & "round" & Chr(34)) - dctucrInputLineEndTickMarksYAxis.Add("butt", Chr(34) & "butt" & Chr(34)) - dctucrInputLineEndTickMarksYAxis.Add("square", Chr(34) & "square" & Chr(34)) - ucrInputLineEndTickMarksYAxis.SetItems(dctucrInputLineEndTickMarksYAxis) + ucrInputLineEndTickMarksYAxis.SetItems(New Dictionary(Of String, String)(GgplotDefaults.dctLineEnd)) ucrInputLineEndTickMarksYAxis.SetRDefault(Chr(34) & "square" & Chr(34)) 'Units ucrChkUnits.SetText("Tick length") ucrInputTickUnits.SetParameter(New RParameter("units")) - dctucrInputUnits.Add("Normalised Parent Coordinates", Chr(34) & "npc" & Chr(34)) - dctucrInputUnits.Add("Centimetres", Chr(34) & "cm" & Chr(34)) - dctucrInputUnits.Add("Inches", Chr(34) & "inches" & Chr(34)) - dctucrInputUnits.Add("Millimetres", Chr(34) & "mm" & Chr(34)) - dctucrInputUnits.Add("Points", Chr(34) & "points" & Chr(34)) - dctucrInputUnits.Add("Picas", Chr(34) & "picas" & Chr(34)) - dctucrInputUnits.Add("Big Points", Chr(34) & "bigpts" & Chr(34)) - dctucrInputUnits.Add("Dida", Chr(34) & "dida" & Chr(34)) - dctucrInputUnits.Add("Cicero", Chr(34) & "cicero" & Chr(34)) - dctucrInputUnits.Add("Scaled Points", Chr(34) & "scaledpts" & Chr(34)) - dctucrInputUnits.Add("Lines", Chr(34) & "lines" & Chr(34)) - dctucrInputUnits.Add("Character", Chr(34) & "char" & Chr(34)) - dctucrInputUnits.Add("Native", Chr(34) & "native" & Chr(34)) - dctucrInputUnits.Add("String Width", Chr(34) & "strwidth" & Chr(34)) - dctucrInputUnits.Add("String Height", Chr(34) & "strheight" & Chr(34)) - dctucrInputUnits.Add("Square Normalised Parent Coordinates", Chr(34) & "snpc" & Chr(34)) - dctucrInputUnits.Add("Grop Height", Chr(34) & "grobheight" & Chr(34)) - dctucrInputUnits.Add("Grop Width", Chr(34) & "grobwidth" & Chr(34)) - ucrInputTickUnits.SetItems(dctucrInputUnits) + ucrInputTickUnits.SetItems(New Dictionary(Of String, String)(GgplotDefaults.dctFonts)) ucrInputTickUnits.SetRDefault(Chr(34) & "npc" & Chr(34)) ucrChkSizeYAxis.AddToLinkedControls(ucrNudSizeYAxis, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) @@ -484,12 +313,16 @@ Public Class sdgThemes If Not bControlsInitialised Then InitialiseControls() End If - clsBaseOperator.AddParameter("theme", clsRFunctionParameter:=clsThemeFunction, iPosition:=15) clsThemeFunction = clsNewThemeFunction + clsBaseOperator.AddParameter("theme", clsRFunctionParameter:=clsThemeFunction, iPosition:=15) + dctThemeFunctions = dctNewThemeFunctions dctThemeFunctions.TryGetValue("axis.text.x", clsElementXAxisText) dctThemeFunctions.TryGetValue("axis.text.y", clsElementYAxisText) + dctThemeFunctions.TryGetValue("axis.text.y", clsElementYAxisText) + dctThemeFunctions.TryGetValue("axis.ticks.x", clsElementXAxisText) + dctThemeFunctions.TryGetValue("axis.ticks.y", clsElementYAxisText) 'clsElementXAxisText.SetRCommand("element_text") 'clsElementXAxisTextTop.SetRCommand("element_text") @@ -660,6 +493,9 @@ Public Class sdgThemes ucrChkLineEndTickLabelsYAxis.SetRCode(clsElementYAxisLine, bReset) AddRemoveElementXAxisText() + AddRemoveElementYAxisText() + AddRemoveElementXTickLine() + AddRemoveElementYTickLine() End Sub Private Sub AddRemoveElementXAxisText() @@ -671,6 +507,33 @@ Public Class sdgThemes AddRemoveTheme() End Sub + Private Sub AddRemoveElementYAxisText() + If ucrChkAngle.Checked OrElse ucrChkHjust.Checked OrElse ucrChkLineHeight.Checked OrElse ucrChkSize.Checked OrElse ucrChkVjust.Checked OrElse ucrChkColour.Checked OrElse ucrChkFace.Checked OrElse ucrChkFamily.Checked Then + clsThemeFunction.AddParameter("axis.text.y", clsRFunctionParameter:=clsElementXAxisText) + Else + clsThemeFunction.RemoveParameterByName("axis.text.y") + End If + AddRemoveTheme() + End Sub + + Private Sub AddRemoveElementYTickLine() + If ucrChkAngle.Checked OrElse ucrChkHjust.Checked OrElse ucrChkLineHeight.Checked OrElse ucrChkSize.Checked OrElse ucrChkVjust.Checked OrElse ucrChkColour.Checked OrElse ucrChkFace.Checked OrElse ucrChkFamily.Checked Then + clsThemeFunction.AddParameter("axis.ticks.y", clsRFunctionParameter:=clsElementXAxisText) + Else + clsThemeFunction.RemoveParameterByName("axis.ticks.y") + End If + AddRemoveTheme() + End Sub + + Private Sub AddRemoveElementXTickLine() + If ucrChkAngle.Checked OrElse ucrChkHjust.Checked OrElse ucrChkLineHeight.Checked OrElse ucrChkSize.Checked OrElse ucrChkVjust.Checked OrElse ucrChkColour.Checked OrElse ucrChkFace.Checked OrElse ucrChkFamily.Checked Then + clsThemeFunction.AddParameter("axis.ticks.x", clsRFunctionParameter:=clsElementXAxisText) + Else + clsThemeFunction.RemoveParameterByName("axis.ticks.x") + End If + AddRemoveTheme() + End Sub + Private Sub AddRemoveTheme() If clsThemeFunction.iParameterCount > 0 Then clsBaseOperator.AddParameter("theme", clsRFunctionParameter:=clsThemeFunction, iPosition:=15) From b1d129b99aeaa12c98ddb1703cdf7b07f1a22672 Mon Sep 17 00:00:00 2001 From: Steven Date: Mon, 5 Jun 2017 23:33:24 +0300 Subject: [PATCH 094/154] Edits --- instat/clsGgplotDefaults.vb | 2 + instat/dlgBarAndPieChart.vb | 8 +-- instat/sdgThemes.vb | 120 +++++++++++++++--------------------- 3 files changed, 54 insertions(+), 76 deletions(-) diff --git a/instat/clsGgplotDefaults.vb b/instat/clsGgplotDefaults.vb index ee6bd8a4406..ac8d18a92eb 100644 --- a/instat/clsGgplotDefaults.vb +++ b/instat/clsGgplotDefaults.vb @@ -92,6 +92,8 @@ clsElementRect = New RFunction clsElementText.SetPackageName("ggplot2") + clsElementLine.SetPackageName("ggplot2") + clsElementRect.SetPackageName("ggplot2") clsElementText.SetRCommand("element_text") clsElementLine.SetRCommand("element_line") clsElementRect.SetRCommand("element_rect") diff --git a/instat/dlgBarAndPieChart.vb b/instat/dlgBarAndPieChart.vb index 3213f555d80..7e5478dd621 100644 --- a/instat/dlgBarAndPieChart.vb +++ b/instat/dlgBarAndPieChart.vb @@ -29,8 +29,7 @@ Public Class dlgBarAndPieChart Private clsXScalecontinuousFunction As New RFunction Private clsRFacetFunction As New RFunction Private clsThemeFuction As New RFunction - Private dctThemeTextFunctions As New Dictionary(Of String, RFunction) - Private dctThemeLineFunctions As New Dictionary(Of String, RFunction) + Private dctThemeFunctions As New Dictionary(Of String, RFunction) Private bReset As Boolean = True Private bFirstLoad As Boolean = True Private bResetSubdialog As Boolean = True @@ -166,8 +165,7 @@ Public Class dlgBarAndPieChart clsRFacetFunction = GgplotDefaults.clsFacetFunction.Clone() clsBaseOperator.AddParameter(GgplotDefaults.clsDefaultThemeParameter.Clone()) clsThemeFuction = GgplotDefaults.clsDefaultThemeFunction.Clone - dctThemeTextFunctions = GgplotDefaults.dctThemeTextFunctions - dctThemeLineFunctions = GgplotDefaults.dctThemeLineFunctions + dctThemeFunctions = GgplotDefaults.dctThemeFunctions clsBaseOperator.SetAssignTo("last_graph", strTempDataframe:=ucrBarChartSelector.ucrAvailableDataFrames.cboAvailableDataFrames.Text, strTempGraph:="last_graph") ucrBase.clsRsyntax.SetBaseROperator(clsBaseOperator) End Sub @@ -201,7 +199,7 @@ Public Class dlgBarAndPieChart End Sub Private Sub cmdOptions_Click(sender As Object, e As EventArgs) Handles cmdOptions.Click - sdgPlots.SetRCode(clsNewOperator:=clsBaseOperator, clsNewThemeFunction:=clsThemeFuction, dctNewThemeLineFunctions:=dctThemeLineFunctions, dctNewThemeTextFunctions:=dctThemeTextFunctions, clsNewXScalecontinuousFunction:=clsXScalecontinuousFunction, clsNewXLabsTitleFunction:=clsXlabFunction, clsNewYLabTitleFunction:=clsYlabFunction, clsNewLabsFunction:=clsLabsFunction, clsNewFacetFunction:=clsRFacetFunction, strNewDataFrame:=ucrBarChartSelector.ucrAvailableDataFrames.cboAvailableDataFrames.Text, bReset:=bResetSubdialog) + sdgPlots.SetRCode(clsNewOperator:=clsBaseOperator, clsNewThemeFunction:=clsThemeFuction, clsNewXScalecontinuousFunction:=clsXScalecontinuousFunction, clsNewXLabsTitleFunction:=clsXlabFunction, clsNewYLabTitleFunction:=clsYlabFunction, clsNewLabsFunction:=clsLabsFunction, clsNewFacetFunction:=clsRFacetFunction, strNewDataFrame:=ucrBarChartSelector.ucrAvailableDataFrames.cboAvailableDataFrames.Text, bReset:=bResetSubdialog) 'sdgPlots.SetDataFrame(strNewDataFrame:=ucrBarChartSelector.ucrAvailableDataFrames.cboAvailableDataFrames.Text) sdgPlots.ShowDialog() bResetSubdialog = False diff --git a/instat/sdgThemes.vb b/instat/sdgThemes.vb index 85d98f79341..d0c3845a250 100644 --- a/instat/sdgThemes.vb +++ b/instat/sdgThemes.vb @@ -18,7 +18,7 @@ Imports instat.Translations Public Class sdgThemes Public bControlsInitialised As Boolean = False - Private clsElementXAxisText, clsElementXAxisTextTop, clsElementXAxisLine, clsElementYAxisLine, clsElementYAxisText, clsElementYAxisTextRight, clsElementXAxisLineTop, clsThemeFunction As New RFunction + Private clsElementLine, clsElementXAxisTextTop, clsElementXAxisLine, clsElementYAxisLine, clsElementText, clsElementYAxisTextRight, clsElementXAxisLineTop, clsThemeFunction As New RFunction Private clsBaseOperator As New ROperator Private dctThemeFunctions As New Dictionary(Of String, RFunction) @@ -318,11 +318,11 @@ Public Class sdgThemes dctThemeFunctions = dctNewThemeFunctions - dctThemeFunctions.TryGetValue("axis.text.x", clsElementXAxisText) - dctThemeFunctions.TryGetValue("axis.text.y", clsElementYAxisText) - dctThemeFunctions.TryGetValue("axis.text.y", clsElementYAxisText) - dctThemeFunctions.TryGetValue("axis.ticks.x", clsElementXAxisText) - dctThemeFunctions.TryGetValue("axis.ticks.y", clsElementYAxisText) + dctThemeFunctions.TryGetValue("axis.text.x", clsElementText) + dctThemeFunctions.TryGetValue("axis.text.y", clsElementText) + dctThemeFunctions.TryGetValue("axis.text.y", clsElementText) + dctThemeFunctions.TryGetValue("axis.ticks.x", clsElementLine) + dctThemeFunctions.TryGetValue("axis.ticks.y", clsElementLine) 'clsElementXAxisText.SetRCommand("element_text") 'clsElementXAxisTextTop.SetRCommand("element_text") @@ -345,29 +345,29 @@ Public Class sdgThemes 'clsThemeFunction.AddParameter("axis.text.y.right", clsRFunctionParameter:=clsElementYAxisTextRight) 'X axis Label - ucrNudAngle.SetRCode(clsElementXAxisText, bReset) - ucrChkAngle.SetRCode(clsElementXAxisText, bReset) + ucrNudAngle.SetRCode(clsElementText, bReset) + ucrChkAngle.SetRCode(clsElementText, bReset) - ucrNudHjust.SetRCode(clsElementXAxisText, bReset) - ucrChkHjust.SetRCode(clsElementXAxisText, bReset) + ucrNudHjust.SetRCode(clsElementText, bReset) + ucrChkHjust.SetRCode(clsElementText, bReset) - ucrNudLineHeight.SetRCode(clsElementXAxisText, bReset) - ucrChkLineHeight.SetRCode(clsElementXAxisText, bReset) + ucrNudLineHeight.SetRCode(clsElementText, bReset) + ucrChkLineHeight.SetRCode(clsElementText, bReset) - ucrNudsize.SetRCode(clsElementXAxisText, bReset) - ucrChkSize.SetRCode(clsElementXAxisText, bReset) + ucrNudsize.SetRCode(clsElementText, bReset) + ucrChkSize.SetRCode(clsElementText, bReset) - ucrNudVjust.SetRCode(clsElementXAxisText, bReset) - ucrChkVjust.SetRCode(clsElementXAxisText, bReset) + ucrNudVjust.SetRCode(clsElementText, bReset) + ucrChkVjust.SetRCode(clsElementText, bReset) - ucrInputColour.SetRCode(clsElementXAxisText, bReset) - ucrChkColour.SetRCode(clsElementXAxisText, bReset) + ucrInputColour.SetRCode(clsElementText, bReset) + ucrChkColour.SetRCode(clsElementText, bReset) - ucrInputFace.SetRCode(clsElementXAxisText, bReset) - ucrChkFace.SetRCode(clsElementXAxisText, bReset) + ucrInputFace.SetRCode(clsElementText, bReset) + ucrChkFace.SetRCode(clsElementText, bReset) - ucrInputFamily.SetRCode(clsElementXAxisText, bReset) - ucrChkFamily.SetRCode(clsElementXAxisText, bReset) + ucrInputFamily.SetRCode(clsElementText, bReset) + ucrChkFamily.SetRCode(clsElementText, bReset) 'X axis Label Top Axis ucrNudSizeTickMarks.SetRCode(clsElementXAxisLine, bReset) @@ -418,30 +418,30 @@ Public Class sdgThemes ucrInputLineEndTickLabelsXAxis.SetRCode(clsElementXAxisLine, bReset) ucrChkLineEndTickLabelsXAxis.SetRCode(clsElementXAxisLine, bReset) - 'Y axis Label - ucrNudAngleYAxis.SetRCode(clsElementYAxisText, bReset) - ucrChkAngleYAxis.SetRCode(clsElementYAxisText, bReset) + ''Y axis Label + 'ucrNudAngleYAxis.SetRCode(clsElementYAxisText, bReset) + 'ucrChkAngleYAxis.SetRCode(clsElementYAxisText, bReset) - ucrNudHjustYAxis.SetRCode(clsElementYAxisText, bReset) - ucrChkHjustYAxis.SetRCode(clsElementYAxisText, bReset) + 'ucrNudHjustYAxis.SetRCode(clsElementYAxisText, bReset) + 'ucrChkHjustYAxis.SetRCode(clsElementYAxisText, bReset) - ucrNudLineHeightYAxis.SetRCode(clsElementYAxisText, bReset) - ucrChkLineHeightYAxis.SetRCode(clsElementYAxisText, bReset) + 'ucrNudLineHeightYAxis.SetRCode(clsElementYAxisText, bReset) + 'ucrChkLineHeightYAxis.SetRCode(clsElementYAxisText, bReset) - ucrNudSizeYAxis.SetRCode(clsElementYAxisText, bReset) - ucrChkSizeYAxis.SetRCode(clsElementYAxisText, bReset) + 'ucrNudSizeYAxis.SetRCode(clsElementYAxisText, bReset) + 'ucrChkSizeYAxis.SetRCode(clsElementYAxisText, bReset) - ucrNudVjustYAxis.SetRCode(clsElementYAxisText, bReset) - ucrChkVjustYAxis.SetRCode(clsElementYAxisText, bReset) + 'ucrNudVjustYAxis.SetRCode(clsElementYAxisText, bReset) + 'ucrChkVjustYAxis.SetRCode(clsElementYAxisText, bReset) - ucrInputColourYAxis.SetRCode(clsElementYAxisText, bReset) - ucrChkColourYAxis.SetRCode(clsElementYAxisText, bReset) + 'ucrInputColourYAxis.SetRCode(clsElementYAxisText, bReset) + 'ucrChkColourYAxis.SetRCode(clsElementYAxisText, bReset) - ucrInputFaceYAxis.SetRCode(clsElementYAxisText, bReset) - ucrChkFaceYAxis.SetRCode(clsElementYAxisText, bReset) + 'ucrInputFaceYAxis.SetRCode(clsElementYAxisText, bReset) + 'ucrChkFaceYAxis.SetRCode(clsElementYAxisText, bReset) - ucrInputFamilyYAxis.SetRCode(clsElementYAxisText, bReset) - ucrChkFamilyYAxis.SetRCode(clsElementYAxisText, bReset) + 'ucrInputFamilyYAxis.SetRCode(clsElementYAxisText, bReset) + 'ucrChkFamilyYAxis.SetRCode(clsElementYAxisText, bReset) 'X axis Label Top Axis ucrNudSizeTickMarksYAxis.SetRCode(clsElementYAxisLine, bReset) @@ -492,43 +492,21 @@ Public Class sdgThemes ucrInputLineEndTickLabelsYAxis.SetRCode(clsElementYAxisLine, bReset) ucrChkLineEndTickLabelsYAxis.SetRCode(clsElementYAxisLine, bReset) - AddRemoveElementXAxisText() - AddRemoveElementYAxisText() - AddRemoveElementXTickLine() - AddRemoveElementYTickLine() - End Sub + AddRemoveElementParameters() - Private Sub AddRemoveElementXAxisText() - If ucrChkAngle.Checked OrElse ucrChkHjust.Checked OrElse ucrChkLineHeight.Checked OrElse ucrChkSize.Checked OrElse ucrChkVjust.Checked OrElse ucrChkColour.Checked OrElse ucrChkFace.Checked OrElse ucrChkFamily.Checked Then - clsThemeFunction.AddParameter("axis.text.x", clsRFunctionParameter:=clsElementXAxisText) - Else - clsThemeFunction.RemoveParameterByName("axis.text.x") - End If - AddRemoveTheme() End Sub - Private Sub AddRemoveElementYAxisText() + Private Sub AddRemoveElementParameters() If ucrChkAngle.Checked OrElse ucrChkHjust.Checked OrElse ucrChkLineHeight.Checked OrElse ucrChkSize.Checked OrElse ucrChkVjust.Checked OrElse ucrChkColour.Checked OrElse ucrChkFace.Checked OrElse ucrChkFamily.Checked Then - clsThemeFunction.AddParameter("axis.text.y", clsRFunctionParameter:=clsElementXAxisText) - Else - clsThemeFunction.RemoveParameterByName("axis.text.y") - End If - AddRemoveTheme() - End Sub + clsThemeFunction.AddParameter("axis.text.x", clsRFunctionParameter:=clsElementText) + clsThemeFunction.AddParameter("axis.text.y", clsRFunctionParameter:=clsElementText) + clsThemeFunction.AddParameter("axis.ticks.y", clsRFunctionParameter:=clsElementLine) + clsThemeFunction.AddParameter("axis.ticks.x", clsRFunctionParameter:=clsElementLine) - Private Sub AddRemoveElementYTickLine() - If ucrChkAngle.Checked OrElse ucrChkHjust.Checked OrElse ucrChkLineHeight.Checked OrElse ucrChkSize.Checked OrElse ucrChkVjust.Checked OrElse ucrChkColour.Checked OrElse ucrChkFace.Checked OrElse ucrChkFamily.Checked Then - clsThemeFunction.AddParameter("axis.ticks.y", clsRFunctionParameter:=clsElementXAxisText) Else + clsThemeFunction.RemoveParameterByName("axis.text.x") + clsThemeFunction.RemoveParameterByName("axis.text.y") clsThemeFunction.RemoveParameterByName("axis.ticks.y") - End If - AddRemoveTheme() - End Sub - - Private Sub AddRemoveElementXTickLine() - If ucrChkAngle.Checked OrElse ucrChkHjust.Checked OrElse ucrChkLineHeight.Checked OrElse ucrChkSize.Checked OrElse ucrChkVjust.Checked OrElse ucrChkColour.Checked OrElse ucrChkFace.Checked OrElse ucrChkFamily.Checked Then - clsThemeFunction.AddParameter("axis.ticks.x", clsRFunctionParameter:=clsElementXAxisText) - Else clsThemeFunction.RemoveParameterByName("axis.ticks.x") End If AddRemoveTheme() @@ -542,7 +520,7 @@ Public Class sdgThemes End If End Sub - Private Sub ElementXAxisTextControls_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkAngle.ControlValueChanged, ucrChkHjust.ControlValueChanged 'etc. add all controls for "axis.text.x" - AddRemoveElementXAxisText() + Private Sub ElementXAxisTextControls_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkAngle.ControlValueChanged, ucrChkHjust.ControlValueChanged, ucrChkLineHeight.ControlValueChanged, ucrChkSize.ControlValueChanged, ucrChkVjust.ControlValueChanged, ucrChkColour.ControlValueChanged, ucrChkFace.ControlValueChanged, ucrChkFamily.ControlValueChanged + AddRemoveElementParameters() End Sub End Class \ No newline at end of file From f2fb3f36da43ea67211d6e8ef71969457f885327 Mon Sep 17 00:00:00 2001 From: John Lunalo Date: Tue, 6 Jun 2017 11:31:06 +0300 Subject: [PATCH 095/154] Adding option for unused levels --- instat/dlgRemoveUnusedLevels.Designer.vb | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/instat/dlgRemoveUnusedLevels.Designer.vb b/instat/dlgRemoveUnusedLevels.Designer.vb index 355f7a70475..3682fa261d9 100644 --- a/instat/dlgRemoveUnusedLevels.Designer.vb +++ b/instat/dlgRemoveUnusedLevels.Designer.vb @@ -27,6 +27,7 @@ Partial Class dlgRemoveUnusedLevels Me.ucrReceiverFactorColumn = New instat.ucrReceiverSingle() Me.ucrSelectorFactorColumn = New instat.ucrSelectorByDataFrameAddRemove() Me.ucrBase = New instat.ucrButtons() + Me.ucrInputUnusedLevels = New instat.ucrInputTextBox() Me.SuspendLayout() ' 'lblFactor @@ -49,6 +50,7 @@ Partial Class dlgRemoveUnusedLevels Me.ucrRemoveUnusedFactorLevels.shtCurrSheet = Nothing Me.ucrRemoveUnusedFactorLevels.Size = New System.Drawing.Size(255, 175) Me.ucrRemoveUnusedFactorLevels.TabIndex = 3 + Me.ucrRemoveUnusedFactorLevels.ucrChkLevels = Nothing ' 'ucrReceiverFactorColumn ' @@ -58,7 +60,9 @@ Partial Class dlgRemoveUnusedLevels Me.ucrReceiverFactorColumn.Name = "ucrReceiverFactorColumn" Me.ucrReceiverFactorColumn.Selector = Nothing Me.ucrReceiverFactorColumn.Size = New System.Drawing.Size(106, 26) + Me.ucrReceiverFactorColumn.strNcFilePath = "" Me.ucrReceiverFactorColumn.TabIndex = 2 + Me.ucrReceiverFactorColumn.ucrSelector = Nothing ' 'ucrSelectorFactorColumn ' @@ -72,16 +76,27 @@ Partial Class dlgRemoveUnusedLevels ' 'ucrBase ' - Me.ucrBase.Location = New System.Drawing.Point(10, 257) + Me.ucrBase.Location = New System.Drawing.Point(10, 283) Me.ucrBase.Name = "ucrBase" Me.ucrBase.Size = New System.Drawing.Size(410, 53) Me.ucrBase.TabIndex = 4 ' - 'dlgUnusedLevels + 'ucrInputUnusedLevels + ' + Me.ucrInputUnusedLevels.AddQuotesIfUnrecognised = True + Me.ucrInputUnusedLevels.IsMultiline = False + Me.ucrInputUnusedLevels.IsReadOnly = False + Me.ucrInputUnusedLevels.Location = New System.Drawing.Point(114, 258) + Me.ucrInputUnusedLevels.Name = "ucrInputUnusedLevels" + Me.ucrInputUnusedLevels.Size = New System.Drawing.Size(380, 21) + Me.ucrInputUnusedLevels.TabIndex = 5 + ' + 'dlgRemoveUnusedLevels ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(504, 313) + Me.ClientSize = New System.Drawing.Size(504, 348) + Me.Controls.Add(Me.ucrInputUnusedLevels) Me.Controls.Add(Me.ucrRemoveUnusedFactorLevels) Me.Controls.Add(Me.lblFactor) Me.Controls.Add(Me.ucrReceiverFactorColumn) @@ -90,7 +105,7 @@ Partial Class dlgRemoveUnusedLevels Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow Me.MaximizeBox = False Me.MinimizeBox = False - Me.Name = "dlgUnusedLevels" + Me.Name = "dlgRemoveUnusedLevels" Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen Me.Tag = "Remove_Unused_Factor_Levels" Me.Text = "Remove Unused Levels" @@ -104,4 +119,5 @@ Partial Class dlgRemoveUnusedLevels Friend WithEvents ucrReceiverFactorColumn As ucrReceiverSingle Friend WithEvents lblFactor As Label Friend WithEvents ucrRemoveUnusedFactorLevels As ucrFactor + Friend WithEvents ucrInputUnusedLevels As ucrInputTextBox End Class \ No newline at end of file From 3a7b39f315f1ae4afbdbdeb4cb7704f3aaf50d46 Mon Sep 17 00:00:00 2001 From: John Lunalo Date: Tue, 6 Jun 2017 11:31:28 +0300 Subject: [PATCH 096/154] code for the option --- instat/dlgRemoveUnusedLevels.vb | 27 +++++++++++++++++++++++++-- 1 file changed, 25 insertions(+), 2 deletions(-) diff --git a/instat/dlgRemoveUnusedLevels.vb b/instat/dlgRemoveUnusedLevels.vb index 04aef54866e..2cf99ad609e 100644 --- a/instat/dlgRemoveUnusedLevels.vb +++ b/instat/dlgRemoveUnusedLevels.vb @@ -14,11 +14,13 @@ ' You should have received a copy of the GNU General Public License k ' along with this program. If not, see . +Imports RDotNet Imports instat.Translations Public Class dlgRemoveUnusedLevels Private bFirstLoad As Boolean = True Private bReset As Boolean = True - Private clsUnusedLevels As New RFunction + Private clsUnusedLevels, clstable, clsSum As New RFunction + Private clsTableOperation As New ROperator Private Sub dlgRemoveUnusedLevels_Load(sender As Object, e As EventArgs) Handles MyBase.Load If bFirstLoad Then @@ -56,7 +58,6 @@ Public Class dlgRemoveUnusedLevels Private Sub SetDefaults() clsUnusedLevels = New RFunction ucrSelectorFactorColumn.Reset() - clsUnusedLevels.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$drop_unused_factor_levels") ucrBase.clsRsyntax.SetBaseRFunction(clsUnusedLevels) End Sub @@ -83,4 +84,26 @@ Public Class dlgRemoveUnusedLevels TestOKEnabled() End Sub + Private Sub ucrReceiverFactorColumn_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrReceiverFactorColumn.ControlValueChanged + Dim numOutput As Integer + clstable.SetRCommand("table") + clsSum.SetRCommand("sum") + If Not ucrReceiverFactorColumn.IsEmpty Then + clstable.AddParameter("x", clsRFunctionParameter:=ucrReceiverFactorColumn.GetVariables) + clsTableOperation.SetOperation("==") + clsTableOperation.AddParameter(clsRFunctionParameter:=clstable, iPosition:=0) + clsTableOperation.AddParameter("threshhold", 0, iPosition:=1) + + clsSum.AddParameter("x", clsROperatorParameter:=clsTableOperation) + + numOutput = frmMain.clsRLink.RunInternalScriptGetValue(clsSum.ToScript).AsNumeric(0) + If numOutput = 0 Then + ucrInputUnusedLevels.SetName("no unused levels to remove") + Else + ucrInputUnusedLevels.SetName(numOutput & " unused levels will be removed") + End If + Else + clstable.RemoveParameterByName("x") + End If + End Sub End Class \ No newline at end of file From 54a8fd1244ed458454f8df4bc9d6ed186c9e1a5b Mon Sep 17 00:00:00 2001 From: John Lunalo Date: Tue, 6 Jun 2017 12:25:56 +0300 Subject: [PATCH 097/154] more changes --- instat/dlgRemoveUnusedLevels.vb | 38 ++++++++++++++++++++++++--------- 1 file changed, 28 insertions(+), 10 deletions(-) diff --git a/instat/dlgRemoveUnusedLevels.vb b/instat/dlgRemoveUnusedLevels.vb index 2cf99ad609e..d3821856b04 100644 --- a/instat/dlgRemoveUnusedLevels.vb +++ b/instat/dlgRemoveUnusedLevels.vb @@ -16,10 +16,11 @@ Imports RDotNet Imports instat.Translations + Public Class dlgRemoveUnusedLevels Private bFirstLoad As Boolean = True Private bReset As Boolean = True - Private clsUnusedLevels, clstable, clsSum As New RFunction + Private clsUnusedLevels, clstable, clsSum, clsFactorColumn As New RFunction Private clsTableOperation As New ROperator Private Sub dlgRemoveUnusedLevels_Load(sender As Object, e As EventArgs) Handles MyBase.Load @@ -57,20 +58,36 @@ Public Class dlgRemoveUnusedLevels Private Sub SetDefaults() clsUnusedLevels = New RFunction + clstable = New RFunction + clsFactorColumn = New RFunction + clsSum = New RFunction + ucrSelectorFactorColumn.Reset() + ucrInputUnusedLevels.SetName("") + ucrInputUnusedLevels.Reset() + + clstable.SetRCommand("table") + clsSum.SetRCommand("sum") + clsFactorColumn.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$get_columns_from_data") clsUnusedLevels.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$drop_unused_factor_levels") + ucrBase.clsRsyntax.SetBaseRFunction(clsUnusedLevels) End Sub Private Sub SetRCodeforControls(bReset As Boolean) - SetRCode(Me, ucrBase.clsRsyntax.clsBaseFunction, bReset) + + ucrSelectorFactorColumn.AddAdditionalCodeParameterPair(clsFactorColumn, ucrSelectorFactorColumn.GetParameter, iAdditionalPairNo:=1) + ucrReceiverFactorColumn.AddAdditionalCodeParameterPair(clsFactorColumn, ucrReceiverFactorColumn.GetParameter, iAdditionalPairNo:=1) + + ucrSelectorFactorColumn.SetRCode(clsUnusedLevels, bReset) + ucrReceiverFactorColumn.SetRCode(clsUnusedLevels, bReset) End Sub Private Sub TestOKEnabled() - If ucrReceiverFactorColumn.IsEmpty() Then - ucrBase.OKEnabled(False) - Else + If Not ucrReceiverFactorColumn.IsEmpty() AndAlso Not ucrInputUnusedLevels.IsEmpty Then ucrBase.OKEnabled(True) + Else + ucrBase.OKEnabled(False) End If End Sub @@ -80,16 +97,15 @@ Public Class dlgRemoveUnusedLevels TestOKEnabled() End Sub - Private Sub Controls_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrReceiverFactorColumn.ControlContentsChanged + Private Sub Controls_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrReceiverFactorColumn.ControlContentsChanged, ucrInputUnusedLevels.ControlContentsChanged TestOKEnabled() End Sub - Private Sub ucrReceiverFactorColumn_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrReceiverFactorColumn.ControlValueChanged + Private Sub ucrReceiverFactorColumn_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrReceiverFactorColumn.ControlValueChanged, ucrRemoveUnusedFactorLevels.ControlValueChanged Dim numOutput As Integer - clstable.SetRCommand("table") - clsSum.SetRCommand("sum") + If Not ucrReceiverFactorColumn.IsEmpty Then - clstable.AddParameter("x", clsRFunctionParameter:=ucrReceiverFactorColumn.GetVariables) + clstable.AddParameter("x", clsRFunctionParameter:=clsFactorColumn) clsTableOperation.SetOperation("==") clsTableOperation.AddParameter(clsRFunctionParameter:=clstable, iPosition:=0) clsTableOperation.AddParameter("threshhold", 0, iPosition:=1) @@ -97,12 +113,14 @@ Public Class dlgRemoveUnusedLevels clsSum.AddParameter("x", clsROperatorParameter:=clsTableOperation) numOutput = frmMain.clsRLink.RunInternalScriptGetValue(clsSum.ToScript).AsNumeric(0) + ucrInputUnusedLevels.txtInput.BackColor = Color.Green If numOutput = 0 Then ucrInputUnusedLevels.SetName("no unused levels to remove") Else ucrInputUnusedLevels.SetName(numOutput & " unused levels will be removed") End If Else + ucrInputUnusedLevels.txtInput.BackColor = Color.White clstable.RemoveParameterByName("x") End If End Sub From 2fbb8642e146d33b28095c2690201af4d3e74d0e Mon Sep 17 00:00:00 2001 From: Lily Date: Tue, 6 Jun 2017 10:42:07 +0100 Subject: [PATCH 098/154] Minor edits --- instat/dlgClimSoft.Designer.vb | 2 +- instat/dlgClimSoft.vb | 3 ++- instat/sdgImportFromClimSoft.Designer.vb | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/instat/dlgClimSoft.Designer.vb b/instat/dlgClimSoft.Designer.vb index 964cf795e89..d86128ba60a 100644 --- a/instat/dlgClimSoft.Designer.vb +++ b/instat/dlgClimSoft.Designer.vb @@ -156,7 +156,7 @@ Partial Class dlgClimSoft ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(421, 384) + Me.ClientSize = New System.Drawing.Size(415, 382) Me.Controls.Add(Me.ucrInputEndDate) Me.Controls.Add(Me.ucrInputStartDate) Me.Controls.Add(Me.ucrChkObservationData) diff --git a/instat/dlgClimSoft.vb b/instat/dlgClimSoft.vb index 6ca7e824cf4..1e4ac9fd50f 100644 --- a/instat/dlgClimSoft.vb +++ b/instat/dlgClimSoft.vb @@ -78,6 +78,7 @@ Public Class dlgClimSoft clsRDatabaseConnect = New RFunction clsHasConnection = New RFunction clsRDatabaseDisconnect = New RFunction + ucrReceiverMultipleStations.SetMeAsReceiver() ucrInputStartDate.SetName("") ucrInputEndDate.SetName("") @@ -99,7 +100,7 @@ Public Class dlgClimSoft bResetSubdialog = True End Sub - Public Sub SetRCodeForControls(bReset As Boolean) + Private Sub SetRCodeForControls(bReset As Boolean) SetRCode(Me, ucrBase.clsRsyntax.clsBaseFunction, bReset) End Sub diff --git a/instat/sdgImportFromClimSoft.Designer.vb b/instat/sdgImportFromClimSoft.Designer.vb index f933d5b1aea..b1b3e95ccc5 100644 --- a/instat/sdgImportFromClimSoft.Designer.vb +++ b/instat/sdgImportFromClimSoft.Designer.vb @@ -129,7 +129,7 @@ Partial Class sdgImportFromClimSoft ' 'cmdEnterPassword ' - Me.cmdEnterPassword.Location = New System.Drawing.Point(12, 129) + Me.cmdEnterPassword.Location = New System.Drawing.Point(12, 130) Me.cmdEnterPassword.Name = "cmdEnterPassword" Me.cmdEnterPassword.Size = New System.Drawing.Size(107, 22) Me.cmdEnterPassword.TabIndex = 8 From 0969ade9a186808f6eed9283a81a54805d57b4d3 Mon Sep 17 00:00:00 2001 From: Lily Date: Tue, 6 Jun 2017 11:28:02 +0100 Subject: [PATCH 099/154] adding package names --- instat/static/InstatObject/R/instat_object_R6.R | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/instat/static/InstatObject/R/instat_object_R6.R b/instat/static/InstatObject/R/instat_object_R6.R index 067fbca3f80..b7bc68f5a7a 100644 --- a/instat/static/InstatObject/R/instat_object_R6.R +++ b/instat/static/InstatObject/R/instat_object_R6.R @@ -1253,8 +1253,8 @@ instat_object$set("public", "has_database_connection", function() { } ) -instat_object$set("public", "database_connect", function(dbname, user, host, port, drv = MySQL()) { - password <- getPass(paste0(user, " password:")) +instat_object$set("public", "database_connect", function(dbname, user, host, port, drv = RMySQL::MySQL()) { + password <- getPass::getPass(paste0(user, " password:")) out <- NULL out <- DBI::dbConnect(drv = drv, dbname = dbname, user = user, password = password, host = host, port = port) if(!is.null(out)) { From bb04674b39281b6c7b907ea7128dbe5f7c82ebeb Mon Sep 17 00:00:00 2001 From: John Lunalo Date: Tue, 6 Jun 2017 13:59:10 +0300 Subject: [PATCH 100/154] fixing resetting of textbox and proper naming --- instat/dlgRemoveUnusedLevels.vb | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/instat/dlgRemoveUnusedLevels.vb b/instat/dlgRemoveUnusedLevels.vb index d3821856b04..23ccd2772c8 100644 --- a/instat/dlgRemoveUnusedLevels.vb +++ b/instat/dlgRemoveUnusedLevels.vb @@ -102,7 +102,7 @@ Public Class dlgRemoveUnusedLevels End Sub Private Sub ucrReceiverFactorColumn_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrReceiverFactorColumn.ControlValueChanged, ucrRemoveUnusedFactorLevels.ControlValueChanged - Dim numOutput As Integer + Dim iNumOutput As Integer If Not ucrReceiverFactorColumn.IsEmpty Then clstable.AddParameter("x", clsRFunctionParameter:=clsFactorColumn) @@ -112,16 +112,19 @@ Public Class dlgRemoveUnusedLevels clsSum.AddParameter("x", clsROperatorParameter:=clsTableOperation) - numOutput = frmMain.clsRLink.RunInternalScriptGetValue(clsSum.ToScript).AsNumeric(0) + iNumOutput = frmMain.clsRLink.RunInternalScriptGetValue(clsSum.ToScript).AsNumeric(0) ucrInputUnusedLevels.txtInput.BackColor = Color.Green - If numOutput = 0 Then + If iNumOutput = 0 Then ucrInputUnusedLevels.SetName("no unused levels to remove") + ucrInputUnusedLevels.txtInput.BackColor = Color.Red Else - ucrInputUnusedLevels.SetName(numOutput & " unused levels will be removed") + ucrInputUnusedLevels.SetName(iNumOutput & " unused levels will be removed") + ucrInputUnusedLevels.txtInput.BackColor = Color.Green End If Else ucrInputUnusedLevels.txtInput.BackColor = Color.White clstable.RemoveParameterByName("x") + ucrInputUnusedLevels.ResetText() End If End Sub End Class \ No newline at end of file From 49c54c9625e050aabff21f87d01c3c4fa0a54fd8 Mon Sep 17 00:00:00 2001 From: John Lunalo Date: Tue, 6 Jun 2017 14:33:39 +0300 Subject: [PATCH 101/154] fixing set min max for the dialog --- instat/dlgDeleteRowsOrColums.vb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/instat/dlgDeleteRowsOrColums.vb b/instat/dlgDeleteRowsOrColums.vb index be9d751c264..bf44dd4399e 100644 --- a/instat/dlgDeleteRowsOrColums.vb +++ b/instat/dlgDeleteRowsOrColums.vb @@ -137,8 +137,8 @@ Public Class dlgDeleteRowsOrColums End Sub Private Sub ucrSelectorForDeleteColumns_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrSelectorForDeleteColumns.ControlValueChanged - ucrNudFrom.Maximum = ucrSelectorForDeleteColumns.ucrAvailableDataFrames.iDataFrameLength - ucrNudTo.Maximum = ucrSelectorForDeleteColumns.ucrAvailableDataFrames.iDataFrameLength + ucrNudFrom.SetMinMax(1, ucrSelectorForDeleteColumns.ucrAvailableDataFrames.iDataFrameLength) + ucrNudTo.SetMinMax(1, ucrSelectorForDeleteColumns.ucrAvailableDataFrames.iDataFrameLength) End Sub Private Sub CoreControls_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrReceiverForColumnsToDelete.ControlContentsChanged, ucrNudFrom.ControlContentsChanged, ucrPnlColumnsOrRows.ControlContentsChanged, ucrNudFrom.ControlContentsChanged From ec917dbe074fddb821d95bb196a3338036465005 Mon Sep 17 00:00:00 2001 From: Steven Date: Tue, 6 Jun 2017 14:50:55 +0300 Subject: [PATCH 102/154] Adding the theme user control --- instat/instat.vbproj | 9 + instat/sdgThemes.Designer.vb | 1256 ++++++------------------------- instat/sdgThemes.vb | 333 +------- instat/ucrThemeAxes.Designer.vb | 251 ++++++ instat/ucrThemeAxes.resx | 120 +++ instat/ucrThemeAxes.vb | 171 +++++ 6 files changed, 789 insertions(+), 1351 deletions(-) create mode 100644 instat/ucrThemeAxes.Designer.vb create mode 100644 instat/ucrThemeAxes.resx create mode 100644 instat/ucrThemeAxes.vb diff --git a/instat/instat.vbproj b/instat/instat.vbproj index f1ab5eec949..6dc942dfa29 100644 --- a/instat/instat.vbproj +++ b/instat/instat.vbproj @@ -2156,6 +2156,12 @@ UserControl + + ucrThemeAxes.vb + + + UserControl + ucrVariablename.vb @@ -4526,6 +4532,9 @@ ucrSelectorByDataFrameAddRemove.vb + + ucrThemeAxes.vb + ucrVariablename.vb diff --git a/instat/sdgThemes.Designer.vb b/instat/sdgThemes.Designer.vb index 8ce2db46e1b..43215967616 100644 --- a/instat/sdgThemes.Designer.vb +++ b/instat/sdgThemes.Designer.vb @@ -25,15 +25,18 @@ Partial Class sdgThemes Me.tbXaxis = New System.Windows.Forms.TabControl() Me.tbAxis = New System.Windows.Forms.TabPage() Me.grpTableOptions = New System.Windows.Forms.GroupBox() + Me.ucrThemeTopXAxis = New instat.ucrThemeAxes() + Me.ucrThemeBottomXAxis = New instat.ucrThemeAxes() + Me.GroupBox2 = New System.Windows.Forms.GroupBox() + Me.UcrCheck1 = New instat.ucrCheck() + Me.UcrCheck2 = New instat.ucrCheck() + Me.UcrCheck3 = New instat.ucrCheck() + Me.UcrCheck4 = New instat.ucrCheck() + Me.UcrInputComboBox1 = New instat.ucrInputComboBox() + Me.UcrNud1 = New instat.ucrNud() + Me.UcrInputComboBox2 = New instat.ucrInputComboBox() + Me.UcrInputComboBox3 = New instat.ucrInputComboBox() Me.grpTickLabels = New System.Windows.Forms.GroupBox() - Me.grpAxisLabelTopAxis = New System.Windows.Forms.GroupBox() - Me.GroupBox1 = New System.Windows.Forms.GroupBox() - Me.grpAxisLabel = New System.Windows.Forms.GroupBox() - Me.tbYaxis = New System.Windows.Forms.TabPage() - Me.grpTickLabelYAxis = New System.Windows.Forms.GroupBox() - Me.grpYAxisTopLabels = New System.Windows.Forms.GroupBox() - Me.grpTickMarksYAxis = New System.Windows.Forms.GroupBox() - Me.grpYAxisLabels = New System.Windows.Forms.GroupBox() Me.ucrChkLineEndTickLabelsXAxis = New instat.ucrCheck() Me.ucrChkSizeTickLabelsXAxis = New instat.ucrCheck() Me.ucrChkLineTypeTickLabelsXAxis = New instat.ucrCheck() @@ -42,22 +45,7 @@ Partial Class sdgThemes Me.ucrNudSizeTickLabelsXAxis = New instat.ucrNud() Me.ucrInputColourTickLabelsXAxis = New instat.ucrInputComboBox() Me.ucrInputLineTypeTickLabelsXAxis = New instat.ucrInputComboBox() - Me.ucrChkColourTopXAxis = New instat.ucrCheck() - Me.ucrChkFaceTopXAxis = New instat.ucrCheck() - Me.ucrChkFamilyTopXAxis = New instat.ucrCheck() - Me.ucrChkAngleTopXAxis = New instat.ucrCheck() - Me.ucrChkHjustTopXAxis = New instat.ucrCheck() - Me.ucrChkVjustTopXAxis = New instat.ucrCheck() - Me.ucrChkLineHeightTopXAxis = New instat.ucrCheck() - Me.ucrChkSizeTopXAxis = New instat.ucrCheck() - Me.ucrNudVjustTopAxis = New instat.ucrNud() - Me.ucrNudLineHeightTopAxis = New instat.ucrNud() - Me.ucrNudAngleTopAxis = New instat.ucrNud() - Me.ucrNudHjustTopAxis = New instat.ucrNud() - Me.ucrNudSizeTopaxis = New instat.ucrNud() - Me.ucrInputColourTopAxis = New instat.ucrInputComboBox() - Me.ucrInputFaceTopAxis = New instat.ucrInputComboBox() - Me.ucrInputFamilyTopAxis = New instat.ucrInputComboBox() + Me.GroupBox1 = New System.Windows.Forms.GroupBox() Me.ucrInputMargin = New instat.ucrInputTextBox() Me.ucrChkMaigin = New instat.ucrCheck() Me.ucrInputMarginUnits = New instat.ucrInputComboBox() @@ -72,22 +60,10 @@ Partial Class sdgThemes Me.ucrNudSizeTickMarks = New instat.ucrNud() Me.ucrInputColourTickMarks = New instat.ucrInputComboBox() Me.ucrInputLineTypeTickMarks = New instat.ucrInputComboBox() - Me.ucrChkColour = New instat.ucrCheck() - Me.ucrChkFace = New instat.ucrCheck() - Me.ucrChkFamily = New instat.ucrCheck() - Me.ucrChkAngle = New instat.ucrCheck() - Me.ucrChkHjust = New instat.ucrCheck() - Me.ucrChkVjust = New instat.ucrCheck() - Me.ucrChkLineHeight = New instat.ucrCheck() - Me.ucrChkSize = New instat.ucrCheck() - Me.ucrNudVjust = New instat.ucrNud() - Me.ucrNudLineHeight = New instat.ucrNud() - Me.ucrNudAngle = New instat.ucrNud() - Me.ucrNudHjust = New instat.ucrNud() - Me.ucrNudsize = New instat.ucrNud() - Me.ucrInputColour = New instat.ucrInputComboBox() - Me.ucrInputFace = New instat.ucrInputComboBox() - Me.ucrInputFamily = New instat.ucrInputComboBox() + Me.tbYaxis = New System.Windows.Forms.TabPage() + Me.ucrThemeRightYAxis = New instat.ucrThemeAxes() + Me.ucrThemeLeftYAxis = New instat.ucrThemeAxes() + Me.grpTickLabelYAxis = New System.Windows.Forms.GroupBox() Me.ucrChkLineEndTickLabelsYAxis = New instat.ucrCheck() Me.ucrChkSizeTickLabelsYAxis = New instat.ucrCheck() Me.ucrChkLineTypeTickLabelsYAxis = New instat.ucrCheck() @@ -96,22 +72,7 @@ Partial Class sdgThemes Me.ucrNudSizeTickLabelsYAxis = New instat.ucrNud() Me.ucrInputColourTickLabelsYAxis = New instat.ucrInputComboBox() Me.ucrInputLineTypeTickLabelsYAxis = New instat.ucrInputComboBox() - Me.ucrChkColourRightYAxis = New instat.ucrCheck() - Me.ucrChkFaceRightYAxis = New instat.ucrCheck() - Me.ucrChkFamilyRightYAxis = New instat.ucrCheck() - Me.ucrChkAngleRightYAxis = New instat.ucrCheck() - Me.ucrChkHjustRightYAxis = New instat.ucrCheck() - Me.ucrChkVjustRightYAxis = New instat.ucrCheck() - Me.ucrChkLineHeightRightYAxis = New instat.ucrCheck() - Me.ucrChkSizeRightYAxis = New instat.ucrCheck() - Me.ucrNudVjustRightYAxis = New instat.ucrNud() - Me.ucrNudLineHeightRightYAxis = New instat.ucrNud() - Me.ucrNudAngleRightYAxis = New instat.ucrNud() - Me.ucrNudHjustRightYAxis = New instat.ucrNud() - Me.ucrNudSizeRightYAxis = New instat.ucrNud() - Me.ucrInputColourRightYAxis = New instat.ucrInputComboBox() - Me.ucrInputFaceRightYAxis = New instat.ucrInputComboBox() - Me.ucrInputFamilyRightYAxis = New instat.ucrInputComboBox() + Me.grpTickMarksYAxis = New System.Windows.Forms.GroupBox() Me.ucrChkLineEndTickMarksYAxis = New instat.ucrCheck() Me.ucrChkSizeTickMarksYAxis = New instat.ucrCheck() Me.ucrChkLineTypeTickMarksYAxis = New instat.ucrCheck() @@ -120,45 +81,16 @@ Partial Class sdgThemes Me.ucrNudSizeTickMarksYAxis = New instat.ucrNud() Me.ucrInputColourTickMarksYAxis = New instat.ucrInputComboBox() Me.ucrInputLineTypeTickMarksYAxis = New instat.ucrInputComboBox() - Me.ucrChkColourYAxis = New instat.ucrCheck() - Me.ucrChkFaceYAxis = New instat.ucrCheck() - Me.ucrChkFamilyYAxis = New instat.ucrCheck() - Me.ucrChkAngleYAxis = New instat.ucrCheck() - Me.ucrChkHjustYAxis = New instat.ucrCheck() - Me.ucrChkVjustYAxis = New instat.ucrCheck() - Me.ucrChkLineHeightYAxis = New instat.ucrCheck() - Me.ucrChkSizeYAxis = New instat.ucrCheck() - Me.ucrNudVjustYAxis = New instat.ucrNud() - Me.ucrNudLineHeightYAxis = New instat.ucrNud() - Me.ucrNudAngleYAxis = New instat.ucrNud() - Me.ucrNudHjustYAxis = New instat.ucrNud() - Me.ucrNudSizeYAxis = New instat.ucrNud() - Me.ucrInputColourYAxis = New instat.ucrInputComboBox() - Me.ucrInputFaceYAxis = New instat.ucrInputComboBox() - Me.ucrInputFamilyYAxis = New instat.ucrInputComboBox() Me.ucrBaseSubdialogue = New instat.ucrButtonsSubdialogue() - Me.GroupBox2 = New System.Windows.Forms.GroupBox() - Me.UcrCheck1 = New instat.ucrCheck() - Me.UcrCheck2 = New instat.ucrCheck() - Me.UcrCheck3 = New instat.ucrCheck() - Me.UcrCheck4 = New instat.ucrCheck() - Me.UcrInputComboBox1 = New instat.ucrInputComboBox() - Me.UcrNud1 = New instat.ucrNud() - Me.UcrInputComboBox2 = New instat.ucrInputComboBox() - Me.UcrInputComboBox3 = New instat.ucrInputComboBox() Me.tbXaxis.SuspendLayout() Me.tbAxis.SuspendLayout() Me.grpTableOptions.SuspendLayout() + Me.GroupBox2.SuspendLayout() Me.grpTickLabels.SuspendLayout() - Me.grpAxisLabelTopAxis.SuspendLayout() Me.GroupBox1.SuspendLayout() - Me.grpAxisLabel.SuspendLayout() Me.tbYaxis.SuspendLayout() Me.grpTickLabelYAxis.SuspendLayout() - Me.grpYAxisTopLabels.SuspendLayout() Me.grpTickMarksYAxis.SuspendLayout() - Me.grpYAxisLabels.SuspendLayout() - Me.GroupBox2.SuspendLayout() Me.SuspendLayout() ' 'tbXaxis @@ -168,7 +100,7 @@ Partial Class sdgThemes Me.tbXaxis.Location = New System.Drawing.Point(4, 8) Me.tbXaxis.Name = "tbXaxis" Me.tbXaxis.SelectedIndex = 0 - Me.tbXaxis.Size = New System.Drawing.Size(556, 603) + Me.tbXaxis.Size = New System.Drawing.Size(605, 603) Me.tbXaxis.TabIndex = 1 ' 'tbAxis @@ -177,25 +109,130 @@ Partial Class sdgThemes Me.tbAxis.Location = New System.Drawing.Point(4, 22) Me.tbAxis.Name = "tbAxis" Me.tbAxis.Padding = New System.Windows.Forms.Padding(3) - Me.tbAxis.Size = New System.Drawing.Size(548, 577) + Me.tbAxis.Size = New System.Drawing.Size(597, 577) Me.tbAxis.TabIndex = 0 Me.tbAxis.Text = "X-axis" Me.tbAxis.UseVisualStyleBackColor = True ' 'grpTableOptions ' + Me.grpTableOptions.Controls.Add(Me.ucrThemeTopXAxis) + Me.grpTableOptions.Controls.Add(Me.ucrThemeBottomXAxis) Me.grpTableOptions.Controls.Add(Me.GroupBox2) Me.grpTableOptions.Controls.Add(Me.grpTickLabels) - Me.grpTableOptions.Controls.Add(Me.grpAxisLabelTopAxis) Me.grpTableOptions.Controls.Add(Me.GroupBox1) - Me.grpTableOptions.Controls.Add(Me.grpAxisLabel) Me.grpTableOptions.Location = New System.Drawing.Point(-1, 3) Me.grpTableOptions.Name = "grpTableOptions" - Me.grpTableOptions.Size = New System.Drawing.Size(543, 578) + Me.grpTableOptions.Size = New System.Drawing.Size(592, 578) Me.grpTableOptions.TabIndex = 0 Me.grpTableOptions.TabStop = False Me.grpTableOptions.Text = "More Options" ' + 'ucrThemeTopXAxis + ' + Me.ucrThemeTopXAxis.Location = New System.Drawing.Point(307, 10) + Me.ucrThemeTopXAxis.Name = "ucrThemeTopXAxis" + Me.ucrThemeTopXAxis.Size = New System.Drawing.Size(296, 260) + Me.ucrThemeTopXAxis.TabIndex = 57 + ' + 'ucrThemeBottomXAxis + ' + Me.ucrThemeBottomXAxis.Location = New System.Drawing.Point(5, 10) + Me.ucrThemeBottomXAxis.Name = "ucrThemeBottomXAxis" + Me.ucrThemeBottomXAxis.Size = New System.Drawing.Size(296, 260) + Me.ucrThemeBottomXAxis.TabIndex = 56 + ' + 'GroupBox2 + ' + Me.GroupBox2.Controls.Add(Me.UcrCheck1) + Me.GroupBox2.Controls.Add(Me.UcrCheck2) + Me.GroupBox2.Controls.Add(Me.UcrCheck3) + Me.GroupBox2.Controls.Add(Me.UcrCheck4) + Me.GroupBox2.Controls.Add(Me.UcrInputComboBox1) + Me.GroupBox2.Controls.Add(Me.UcrNud1) + Me.GroupBox2.Controls.Add(Me.UcrInputComboBox2) + Me.GroupBox2.Controls.Add(Me.UcrInputComboBox3) + Me.GroupBox2.Location = New System.Drawing.Point(284, 424) + Me.GroupBox2.Name = "GroupBox2" + Me.GroupBox2.Size = New System.Drawing.Size(264, 154) + Me.GroupBox2.TabIndex = 55 + Me.GroupBox2.TabStop = False + Me.GroupBox2.Text = "X axis tick labels" + ' + 'UcrCheck1 + ' + Me.UcrCheck1.Checked = False + Me.UcrCheck1.Location = New System.Drawing.Point(11, 104) + Me.UcrCheck1.Name = "UcrCheck1" + Me.UcrCheck1.Size = New System.Drawing.Size(100, 20) + Me.UcrCheck1.TabIndex = 54 + ' + 'UcrCheck2 + ' + Me.UcrCheck2.Checked = False + Me.UcrCheck2.Location = New System.Drawing.Point(11, 20) + Me.UcrCheck2.Name = "UcrCheck2" + Me.UcrCheck2.Size = New System.Drawing.Size(100, 20) + Me.UcrCheck2.TabIndex = 53 + ' + 'UcrCheck3 + ' + Me.UcrCheck3.Checked = False + Me.UcrCheck3.Location = New System.Drawing.Point(11, 45) + Me.UcrCheck3.Name = "UcrCheck3" + Me.UcrCheck3.Size = New System.Drawing.Size(100, 20) + Me.UcrCheck3.TabIndex = 52 + ' + 'UcrCheck4 + ' + Me.UcrCheck4.Checked = False + Me.UcrCheck4.Location = New System.Drawing.Point(11, 72) + Me.UcrCheck4.Name = "UcrCheck4" + Me.UcrCheck4.Size = New System.Drawing.Size(100, 20) + Me.UcrCheck4.TabIndex = 51 + ' + 'UcrInputComboBox1 + ' + Me.UcrInputComboBox1.AddQuotesIfUnrecognised = True + Me.UcrInputComboBox1.IsReadOnly = False + Me.UcrInputComboBox1.Location = New System.Drawing.Point(117, 103) + Me.UcrInputComboBox1.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) + Me.UcrInputComboBox1.Name = "UcrInputComboBox1" + Me.UcrInputComboBox1.Size = New System.Drawing.Size(137, 21) + Me.UcrInputComboBox1.TabIndex = 32 + ' + 'UcrNud1 + ' + Me.UcrNud1.DecimalPlaces = New Decimal(New Integer() {1, 0, 0, 0}) + Me.UcrNud1.Increment = New Decimal(New Integer() {1, 0, 0, 0}) + Me.UcrNud1.Location = New System.Drawing.Point(116, 19) + Me.UcrNud1.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) + Me.UcrNud1.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) + Me.UcrNud1.Name = "UcrNud1" + Me.UcrNud1.Size = New System.Drawing.Size(50, 20) + Me.UcrNud1.TabIndex = 30 + Me.UcrNud1.Value = New Decimal(New Integer() {0, 0, 0, 0}) + ' + 'UcrInputComboBox2 + ' + Me.UcrInputComboBox2.AddQuotesIfUnrecognised = True + Me.UcrInputComboBox2.IsReadOnly = False + Me.UcrInputComboBox2.Location = New System.Drawing.Point(117, 72) + Me.UcrInputComboBox2.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) + Me.UcrInputComboBox2.Name = "UcrInputComboBox2" + Me.UcrInputComboBox2.Size = New System.Drawing.Size(137, 21) + Me.UcrInputComboBox2.TabIndex = 28 + ' + 'UcrInputComboBox3 + ' + Me.UcrInputComboBox3.AddQuotesIfUnrecognised = True + Me.UcrInputComboBox3.IsReadOnly = False + Me.UcrInputComboBox3.Location = New System.Drawing.Point(117, 44) + Me.UcrInputComboBox3.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) + Me.UcrInputComboBox3.Name = "UcrInputComboBox3" + Me.UcrInputComboBox3.Size = New System.Drawing.Size(137, 21) + Me.UcrInputComboBox3.TabIndex = 26 + ' 'grpTickLabels ' Me.grpTickLabels.Controls.Add(Me.ucrChkLineEndTickLabelsXAxis) @@ -213,177 +250,6 @@ Partial Class sdgThemes Me.grpTickLabels.TabStop = False Me.grpTickLabels.Text = "X axis tick labels" ' - 'grpAxisLabelTopAxis - ' - Me.grpAxisLabelTopAxis.Controls.Add(Me.ucrChkColourTopXAxis) - Me.grpAxisLabelTopAxis.Controls.Add(Me.ucrChkFaceTopXAxis) - Me.grpAxisLabelTopAxis.Controls.Add(Me.ucrChkFamilyTopXAxis) - Me.grpAxisLabelTopAxis.Controls.Add(Me.ucrChkAngleTopXAxis) - Me.grpAxisLabelTopAxis.Controls.Add(Me.ucrChkHjustTopXAxis) - Me.grpAxisLabelTopAxis.Controls.Add(Me.ucrChkVjustTopXAxis) - Me.grpAxisLabelTopAxis.Controls.Add(Me.ucrChkLineHeightTopXAxis) - Me.grpAxisLabelTopAxis.Controls.Add(Me.ucrChkSizeTopXAxis) - Me.grpAxisLabelTopAxis.Controls.Add(Me.ucrNudVjustTopAxis) - Me.grpAxisLabelTopAxis.Controls.Add(Me.ucrNudLineHeightTopAxis) - Me.grpAxisLabelTopAxis.Controls.Add(Me.ucrNudAngleTopAxis) - Me.grpAxisLabelTopAxis.Controls.Add(Me.ucrNudHjustTopAxis) - Me.grpAxisLabelTopAxis.Controls.Add(Me.ucrNudSizeTopaxis) - Me.grpAxisLabelTopAxis.Controls.Add(Me.ucrInputColourTopAxis) - Me.grpAxisLabelTopAxis.Controls.Add(Me.ucrInputFaceTopAxis) - Me.grpAxisLabelTopAxis.Controls.Add(Me.ucrInputFamilyTopAxis) - Me.grpAxisLabelTopAxis.Location = New System.Drawing.Point(283, 19) - Me.grpAxisLabelTopAxis.Name = "grpAxisLabelTopAxis" - Me.grpAxisLabelTopAxis.Size = New System.Drawing.Size(277, 245) - Me.grpAxisLabelTopAxis.TabIndex = 40 - Me.grpAxisLabelTopAxis.TabStop = False - Me.grpAxisLabelTopAxis.Text = "X axis label on top axis" - ' - 'GroupBox1 - ' - Me.GroupBox1.Controls.Add(Me.ucrInputMargin) - Me.GroupBox1.Controls.Add(Me.ucrChkMaigin) - Me.GroupBox1.Controls.Add(Me.ucrInputMarginUnits) - Me.GroupBox1.Controls.Add(Me.ucrInputUnits) - Me.GroupBox1.Controls.Add(Me.ucrChkLineEndTickMarksXAxis) - Me.GroupBox1.Controls.Add(Me.ucrChkUnits) - Me.GroupBox1.Controls.Add(Me.ucrInputTickUnits) - Me.GroupBox1.Controls.Add(Me.ucrChkSizeTickMarksXAxis) - Me.GroupBox1.Controls.Add(Me.ucrChkLineTypeTickMarksXAxis) - Me.GroupBox1.Controls.Add(Me.ucrChkColourTickMarksXAxis) - Me.GroupBox1.Controls.Add(Me.ucrInputLineEndTickMarks) - Me.GroupBox1.Controls.Add(Me.ucrNudSizeTickMarks) - Me.GroupBox1.Controls.Add(Me.ucrInputColourTickMarks) - Me.GroupBox1.Controls.Add(Me.ucrInputLineTypeTickMarks) - Me.GroupBox1.Location = New System.Drawing.Point(15, 270) - Me.GroupBox1.Name = "GroupBox1" - Me.GroupBox1.Size = New System.Drawing.Size(262, 283) - Me.GroupBox1.TabIndex = 39 - Me.GroupBox1.TabStop = False - Me.GroupBox1.Text = "Tick marks along axes" - ' - 'grpAxisLabel - ' - Me.grpAxisLabel.Controls.Add(Me.ucrChkColour) - Me.grpAxisLabel.Controls.Add(Me.ucrChkFace) - Me.grpAxisLabel.Controls.Add(Me.ucrChkFamily) - Me.grpAxisLabel.Controls.Add(Me.ucrChkAngle) - Me.grpAxisLabel.Controls.Add(Me.ucrChkHjust) - Me.grpAxisLabel.Controls.Add(Me.ucrChkVjust) - Me.grpAxisLabel.Controls.Add(Me.ucrChkLineHeight) - Me.grpAxisLabel.Controls.Add(Me.ucrChkSize) - Me.grpAxisLabel.Controls.Add(Me.ucrNudVjust) - Me.grpAxisLabel.Controls.Add(Me.ucrNudLineHeight) - Me.grpAxisLabel.Controls.Add(Me.ucrNudAngle) - Me.grpAxisLabel.Controls.Add(Me.ucrNudHjust) - Me.grpAxisLabel.Controls.Add(Me.ucrNudsize) - Me.grpAxisLabel.Controls.Add(Me.ucrInputColour) - Me.grpAxisLabel.Controls.Add(Me.ucrInputFace) - Me.grpAxisLabel.Controls.Add(Me.ucrInputFamily) - Me.grpAxisLabel.Location = New System.Drawing.Point(15, 19) - Me.grpAxisLabel.Name = "grpAxisLabel" - Me.grpAxisLabel.Size = New System.Drawing.Size(262, 245) - Me.grpAxisLabel.TabIndex = 23 - Me.grpAxisLabel.TabStop = False - Me.grpAxisLabel.Text = "X axis label" - ' - 'tbYaxis - ' - Me.tbYaxis.Controls.Add(Me.grpTickLabelYAxis) - Me.tbYaxis.Controls.Add(Me.grpYAxisTopLabels) - Me.tbYaxis.Controls.Add(Me.grpTickMarksYAxis) - Me.tbYaxis.Controls.Add(Me.grpYAxisLabels) - Me.tbYaxis.Location = New System.Drawing.Point(4, 22) - Me.tbYaxis.Name = "tbYaxis" - Me.tbYaxis.Padding = New System.Windows.Forms.Padding(3) - Me.tbYaxis.Size = New System.Drawing.Size(548, 577) - Me.tbYaxis.TabIndex = 1 - Me.tbYaxis.Text = "Y-axis" - Me.tbYaxis.UseVisualStyleBackColor = True - ' - 'grpTickLabelYAxis - ' - Me.grpTickLabelYAxis.Controls.Add(Me.ucrChkLineEndTickLabelsYAxis) - Me.grpTickLabelYAxis.Controls.Add(Me.ucrChkSizeTickLabelsYAxis) - Me.grpTickLabelYAxis.Controls.Add(Me.ucrChkLineTypeTickLabelsYAxis) - Me.grpTickLabelYAxis.Controls.Add(Me.ucrChkColourTickLabelsYAxis) - Me.grpTickLabelYAxis.Controls.Add(Me.ucrInputLineEndTickLabelsYAxis) - Me.grpTickLabelYAxis.Controls.Add(Me.ucrNudSizeTickLabelsYAxis) - Me.grpTickLabelYAxis.Controls.Add(Me.ucrInputColourTickLabelsYAxis) - Me.grpTickLabelYAxis.Controls.Add(Me.ucrInputLineTypeTickLabelsYAxis) - Me.grpTickLabelYAxis.Location = New System.Drawing.Point(263, 256) - Me.grpTickLabelYAxis.Name = "grpTickLabelYAxis" - Me.grpTickLabelYAxis.Size = New System.Drawing.Size(264, 154) - Me.grpTickLabelYAxis.TabIndex = 43 - Me.grpTickLabelYAxis.TabStop = False - Me.grpTickLabelYAxis.Text = "Y axis tick labels" - ' - 'grpYAxisTopLabels - ' - Me.grpYAxisTopLabels.Controls.Add(Me.ucrChkColourRightYAxis) - Me.grpYAxisTopLabels.Controls.Add(Me.ucrChkFaceRightYAxis) - Me.grpYAxisTopLabels.Controls.Add(Me.ucrChkFamilyRightYAxis) - Me.grpYAxisTopLabels.Controls.Add(Me.ucrChkAngleRightYAxis) - Me.grpYAxisTopLabels.Controls.Add(Me.ucrChkHjustRightYAxis) - Me.grpYAxisTopLabels.Controls.Add(Me.ucrChkVjustRightYAxis) - Me.grpYAxisTopLabels.Controls.Add(Me.ucrChkLineHeightRightYAxis) - Me.grpYAxisTopLabels.Controls.Add(Me.ucrChkSizeRightYAxis) - Me.grpYAxisTopLabels.Controls.Add(Me.ucrNudVjustRightYAxis) - Me.grpYAxisTopLabels.Controls.Add(Me.ucrNudLineHeightRightYAxis) - Me.grpYAxisTopLabels.Controls.Add(Me.ucrNudAngleRightYAxis) - Me.grpYAxisTopLabels.Controls.Add(Me.ucrNudHjustRightYAxis) - Me.grpYAxisTopLabels.Controls.Add(Me.ucrNudSizeRightYAxis) - Me.grpYAxisTopLabels.Controls.Add(Me.ucrInputColourRightYAxis) - Me.grpYAxisTopLabels.Controls.Add(Me.ucrInputFaceRightYAxis) - Me.grpYAxisTopLabels.Controls.Add(Me.ucrInputFamilyRightYAxis) - Me.grpYAxisTopLabels.Location = New System.Drawing.Point(262, 5) - Me.grpYAxisTopLabels.Name = "grpYAxisTopLabels" - Me.grpYAxisTopLabels.Size = New System.Drawing.Size(264, 245) - Me.grpYAxisTopLabels.TabIndex = 44 - Me.grpYAxisTopLabels.TabStop = False - Me.grpYAxisTopLabels.Text = "Y axis label on top axis" - ' - 'grpTickMarksYAxis - ' - Me.grpTickMarksYAxis.Controls.Add(Me.ucrChkLineEndTickMarksYAxis) - Me.grpTickMarksYAxis.Controls.Add(Me.ucrChkSizeTickMarksYAxis) - Me.grpTickMarksYAxis.Controls.Add(Me.ucrChkLineTypeTickMarksYAxis) - Me.grpTickMarksYAxis.Controls.Add(Me.ucrChkColourTickMarksYAxis) - Me.grpTickMarksYAxis.Controls.Add(Me.ucrInputLineEndTickMarksYAxis) - Me.grpTickMarksYAxis.Controls.Add(Me.ucrNudSizeTickMarksYAxis) - Me.grpTickMarksYAxis.Controls.Add(Me.ucrInputColourTickMarksYAxis) - Me.grpTickMarksYAxis.Controls.Add(Me.ucrInputLineTypeTickMarksYAxis) - Me.grpTickMarksYAxis.Location = New System.Drawing.Point(6, 256) - Me.grpTickMarksYAxis.Name = "grpTickMarksYAxis" - Me.grpTickMarksYAxis.Size = New System.Drawing.Size(250, 154) - Me.grpTickMarksYAxis.TabIndex = 42 - Me.grpTickMarksYAxis.TabStop = False - Me.grpTickMarksYAxis.Text = "Tick marks along axes" - ' - 'grpYAxisLabels - ' - Me.grpYAxisLabels.Controls.Add(Me.ucrChkColourYAxis) - Me.grpYAxisLabels.Controls.Add(Me.ucrChkFaceYAxis) - Me.grpYAxisLabels.Controls.Add(Me.ucrChkFamilyYAxis) - Me.grpYAxisLabels.Controls.Add(Me.ucrChkAngleYAxis) - Me.grpYAxisLabels.Controls.Add(Me.ucrChkHjustYAxis) - Me.grpYAxisLabels.Controls.Add(Me.ucrChkVjustYAxis) - Me.grpYAxisLabels.Controls.Add(Me.ucrChkLineHeightYAxis) - Me.grpYAxisLabels.Controls.Add(Me.ucrChkSizeYAxis) - Me.grpYAxisLabels.Controls.Add(Me.ucrNudVjustYAxis) - Me.grpYAxisLabels.Controls.Add(Me.ucrNudLineHeightYAxis) - Me.grpYAxisLabels.Controls.Add(Me.ucrNudAngleYAxis) - Me.grpYAxisLabels.Controls.Add(Me.ucrNudHjustYAxis) - Me.grpYAxisLabels.Controls.Add(Me.ucrNudSizeYAxis) - Me.grpYAxisLabels.Controls.Add(Me.ucrInputColourYAxis) - Me.grpYAxisLabels.Controls.Add(Me.ucrInputFaceYAxis) - Me.grpYAxisLabels.Controls.Add(Me.ucrInputFamilyYAxis) - Me.grpYAxisLabels.Location = New System.Drawing.Point(6, 5) - Me.grpYAxisLabels.Name = "grpYAxisLabels" - Me.grpYAxisLabels.Size = New System.Drawing.Size(250, 245) - Me.grpYAxisLabels.TabIndex = 41 - Me.grpYAxisLabels.TabStop = False - Me.grpYAxisLabels.Text = "Y axis label" - ' 'ucrChkLineEndTickLabelsXAxis ' Me.ucrChkLineEndTickLabelsXAxis.Checked = False @@ -458,159 +324,28 @@ Partial Class sdgThemes Me.ucrInputLineTypeTickLabelsXAxis.Size = New System.Drawing.Size(137, 21) Me.ucrInputLineTypeTickLabelsXAxis.TabIndex = 26 ' - 'ucrChkColourTopXAxis - ' - Me.ucrChkColourTopXAxis.Checked = False - Me.ucrChkColourTopXAxis.Location = New System.Drawing.Point(10, 209) - Me.ucrChkColourTopXAxis.Name = "ucrChkColourTopXAxis" - Me.ucrChkColourTopXAxis.Size = New System.Drawing.Size(100, 20) - Me.ucrChkColourTopXAxis.TabIndex = 53 - ' - 'ucrChkFaceTopXAxis - ' - Me.ucrChkFaceTopXAxis.Checked = False - Me.ucrChkFaceTopXAxis.Location = New System.Drawing.Point(10, 182) - Me.ucrChkFaceTopXAxis.Name = "ucrChkFaceTopXAxis" - Me.ucrChkFaceTopXAxis.Size = New System.Drawing.Size(100, 20) - Me.ucrChkFaceTopXAxis.TabIndex = 52 - ' - 'ucrChkFamilyTopXAxis - ' - Me.ucrChkFamilyTopXAxis.Checked = False - Me.ucrChkFamilyTopXAxis.Location = New System.Drawing.Point(10, 155) - Me.ucrChkFamilyTopXAxis.Name = "ucrChkFamilyTopXAxis" - Me.ucrChkFamilyTopXAxis.Size = New System.Drawing.Size(100, 20) - Me.ucrChkFamilyTopXAxis.TabIndex = 51 - ' - 'ucrChkAngleTopXAxis - ' - Me.ucrChkAngleTopXAxis.Checked = False - Me.ucrChkAngleTopXAxis.Location = New System.Drawing.Point(10, 128) - Me.ucrChkAngleTopXAxis.Name = "ucrChkAngleTopXAxis" - Me.ucrChkAngleTopXAxis.Size = New System.Drawing.Size(100, 20) - Me.ucrChkAngleTopXAxis.TabIndex = 50 - ' - 'ucrChkHjustTopXAxis - ' - Me.ucrChkHjustTopXAxis.Checked = False - Me.ucrChkHjustTopXAxis.Location = New System.Drawing.Point(10, 47) - Me.ucrChkHjustTopXAxis.Name = "ucrChkHjustTopXAxis" - Me.ucrChkHjustTopXAxis.Size = New System.Drawing.Size(100, 20) - Me.ucrChkHjustTopXAxis.TabIndex = 49 - ' - 'ucrChkVjustTopXAxis - ' - Me.ucrChkVjustTopXAxis.Checked = False - Me.ucrChkVjustTopXAxis.Location = New System.Drawing.Point(10, 74) - Me.ucrChkVjustTopXAxis.Name = "ucrChkVjustTopXAxis" - Me.ucrChkVjustTopXAxis.Size = New System.Drawing.Size(100, 20) - Me.ucrChkVjustTopXAxis.TabIndex = 48 - ' - 'ucrChkLineHeightTopXAxis - ' - Me.ucrChkLineHeightTopXAxis.Checked = False - Me.ucrChkLineHeightTopXAxis.Location = New System.Drawing.Point(10, 101) - Me.ucrChkLineHeightTopXAxis.Name = "ucrChkLineHeightTopXAxis" - Me.ucrChkLineHeightTopXAxis.Size = New System.Drawing.Size(100, 20) - Me.ucrChkLineHeightTopXAxis.TabIndex = 47 - ' - 'ucrChkSizeTopXAxis - ' - Me.ucrChkSizeTopXAxis.Checked = False - Me.ucrChkSizeTopXAxis.Location = New System.Drawing.Point(10, 20) - Me.ucrChkSizeTopXAxis.Name = "ucrChkSizeTopXAxis" - Me.ucrChkSizeTopXAxis.Size = New System.Drawing.Size(100, 20) - Me.ucrChkSizeTopXAxis.TabIndex = 46 - ' - 'ucrNudVjustTopAxis - ' - Me.ucrNudVjustTopAxis.DecimalPlaces = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudVjustTopAxis.Increment = New Decimal(New Integer() {1, 0, 0, 65536}) - Me.ucrNudVjustTopAxis.Location = New System.Drawing.Point(115, 74) - Me.ucrNudVjustTopAxis.Maximum = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudVjustTopAxis.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) - Me.ucrNudVjustTopAxis.Name = "ucrNudVjustTopAxis" - Me.ucrNudVjustTopAxis.Size = New System.Drawing.Size(50, 20) - Me.ucrNudVjustTopAxis.TabIndex = 38 - Me.ucrNudVjustTopAxis.Value = New Decimal(New Integer() {0, 0, 0, 0}) - ' - 'ucrNudLineHeightTopAxis - ' - Me.ucrNudLineHeightTopAxis.DecimalPlaces = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudLineHeightTopAxis.Increment = New Decimal(New Integer() {1, 0, 0, 65536}) - Me.ucrNudLineHeightTopAxis.Location = New System.Drawing.Point(115, 99) - Me.ucrNudLineHeightTopAxis.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) - Me.ucrNudLineHeightTopAxis.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) - Me.ucrNudLineHeightTopAxis.Name = "ucrNudLineHeightTopAxis" - Me.ucrNudLineHeightTopAxis.Size = New System.Drawing.Size(50, 20) - Me.ucrNudLineHeightTopAxis.TabIndex = 36 - Me.ucrNudLineHeightTopAxis.Value = New Decimal(New Integer() {0, 0, 0, 0}) - ' - 'ucrNudAngleTopAxis - ' - Me.ucrNudAngleTopAxis.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) - Me.ucrNudAngleTopAxis.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudAngleTopAxis.Location = New System.Drawing.Point(115, 128) - Me.ucrNudAngleTopAxis.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) - Me.ucrNudAngleTopAxis.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) - Me.ucrNudAngleTopAxis.Name = "ucrNudAngleTopAxis" - Me.ucrNudAngleTopAxis.Size = New System.Drawing.Size(50, 20) - Me.ucrNudAngleTopAxis.TabIndex = 34 - Me.ucrNudAngleTopAxis.Value = New Decimal(New Integer() {0, 0, 0, 0}) - ' - 'ucrNudHjustTopAxis - ' - Me.ucrNudHjustTopAxis.DecimalPlaces = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudHjustTopAxis.Increment = New Decimal(New Integer() {1, 0, 0, 65536}) - Me.ucrNudHjustTopAxis.Location = New System.Drawing.Point(115, 47) - Me.ucrNudHjustTopAxis.Maximum = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudHjustTopAxis.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) - Me.ucrNudHjustTopAxis.Name = "ucrNudHjustTopAxis" - Me.ucrNudHjustTopAxis.Size = New System.Drawing.Size(50, 20) - Me.ucrNudHjustTopAxis.TabIndex = 32 - Me.ucrNudHjustTopAxis.Value = New Decimal(New Integer() {0, 0, 0, 0}) - ' - 'ucrNudSizeTopaxis - ' - Me.ucrNudSizeTopaxis.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) - Me.ucrNudSizeTopaxis.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudSizeTopaxis.Location = New System.Drawing.Point(115, 20) - Me.ucrNudSizeTopaxis.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) - Me.ucrNudSizeTopaxis.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) - Me.ucrNudSizeTopaxis.Name = "ucrNudSizeTopaxis" - Me.ucrNudSizeTopaxis.Size = New System.Drawing.Size(50, 20) - Me.ucrNudSizeTopaxis.TabIndex = 30 - Me.ucrNudSizeTopaxis.Value = New Decimal(New Integer() {0, 0, 0, 0}) - ' - 'ucrInputColourTopAxis - ' - Me.ucrInputColourTopAxis.AddQuotesIfUnrecognised = True - Me.ucrInputColourTopAxis.IsReadOnly = False - Me.ucrInputColourTopAxis.Location = New System.Drawing.Point(116, 208) - Me.ucrInputColourTopAxis.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) - Me.ucrInputColourTopAxis.Name = "ucrInputColourTopAxis" - Me.ucrInputColourTopAxis.Size = New System.Drawing.Size(137, 21) - Me.ucrInputColourTopAxis.TabIndex = 28 - ' - 'ucrInputFaceTopAxis - ' - Me.ucrInputFaceTopAxis.AddQuotesIfUnrecognised = True - Me.ucrInputFaceTopAxis.IsReadOnly = False - Me.ucrInputFaceTopAxis.Location = New System.Drawing.Point(115, 181) - Me.ucrInputFaceTopAxis.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) - Me.ucrInputFaceTopAxis.Name = "ucrInputFaceTopAxis" - Me.ucrInputFaceTopAxis.Size = New System.Drawing.Size(137, 21) - Me.ucrInputFaceTopAxis.TabIndex = 26 - ' - 'ucrInputFamilyTopAxis - ' - Me.ucrInputFamilyTopAxis.AddQuotesIfUnrecognised = True - Me.ucrInputFamilyTopAxis.IsReadOnly = False - Me.ucrInputFamilyTopAxis.Location = New System.Drawing.Point(115, 154) - Me.ucrInputFamilyTopAxis.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) - Me.ucrInputFamilyTopAxis.Name = "ucrInputFamilyTopAxis" - Me.ucrInputFamilyTopAxis.Size = New System.Drawing.Size(137, 21) - Me.ucrInputFamilyTopAxis.TabIndex = 24 + 'GroupBox1 + ' + Me.GroupBox1.Controls.Add(Me.ucrInputMargin) + Me.GroupBox1.Controls.Add(Me.ucrChkMaigin) + Me.GroupBox1.Controls.Add(Me.ucrInputMarginUnits) + Me.GroupBox1.Controls.Add(Me.ucrInputUnits) + Me.GroupBox1.Controls.Add(Me.ucrChkLineEndTickMarksXAxis) + Me.GroupBox1.Controls.Add(Me.ucrChkUnits) + Me.GroupBox1.Controls.Add(Me.ucrInputTickUnits) + Me.GroupBox1.Controls.Add(Me.ucrChkSizeTickMarksXAxis) + Me.GroupBox1.Controls.Add(Me.ucrChkLineTypeTickMarksXAxis) + Me.GroupBox1.Controls.Add(Me.ucrChkColourTickMarksXAxis) + Me.GroupBox1.Controls.Add(Me.ucrInputLineEndTickMarks) + Me.GroupBox1.Controls.Add(Me.ucrNudSizeTickMarks) + Me.GroupBox1.Controls.Add(Me.ucrInputColourTickMarks) + Me.GroupBox1.Controls.Add(Me.ucrInputLineTypeTickMarks) + Me.GroupBox1.Location = New System.Drawing.Point(15, 270) + Me.GroupBox1.Name = "GroupBox1" + Me.GroupBox1.Size = New System.Drawing.Size(262, 283) + Me.GroupBox1.TabIndex = 39 + Me.GroupBox1.TabStop = False + Me.GroupBox1.Text = "Tick marks along axes" ' 'ucrInputMargin ' @@ -742,159 +477,50 @@ Partial Class sdgThemes Me.ucrInputLineTypeTickMarks.Size = New System.Drawing.Size(137, 21) Me.ucrInputLineTypeTickMarks.TabIndex = 26 ' - 'ucrChkColour - ' - Me.ucrChkColour.Checked = False - Me.ucrChkColour.Location = New System.Drawing.Point(11, 209) - Me.ucrChkColour.Name = "ucrChkColour" - Me.ucrChkColour.Size = New System.Drawing.Size(100, 20) - Me.ucrChkColour.TabIndex = 53 - ' - 'ucrChkFace - ' - Me.ucrChkFace.Checked = False - Me.ucrChkFace.Location = New System.Drawing.Point(11, 182) - Me.ucrChkFace.Name = "ucrChkFace" - Me.ucrChkFace.Size = New System.Drawing.Size(100, 20) - Me.ucrChkFace.TabIndex = 52 - ' - 'ucrChkFamily - ' - Me.ucrChkFamily.Checked = False - Me.ucrChkFamily.Location = New System.Drawing.Point(11, 155) - Me.ucrChkFamily.Name = "ucrChkFamily" - Me.ucrChkFamily.Size = New System.Drawing.Size(100, 20) - Me.ucrChkFamily.TabIndex = 51 - ' - 'ucrChkAngle - ' - Me.ucrChkAngle.Checked = False - Me.ucrChkAngle.Location = New System.Drawing.Point(11, 128) - Me.ucrChkAngle.Name = "ucrChkAngle" - Me.ucrChkAngle.Size = New System.Drawing.Size(100, 20) - Me.ucrChkAngle.TabIndex = 50 - ' - 'ucrChkHjust - ' - Me.ucrChkHjust.Checked = False - Me.ucrChkHjust.Location = New System.Drawing.Point(11, 47) - Me.ucrChkHjust.Name = "ucrChkHjust" - Me.ucrChkHjust.Size = New System.Drawing.Size(100, 20) - Me.ucrChkHjust.TabIndex = 49 - ' - 'ucrChkVjust - ' - Me.ucrChkVjust.Checked = False - Me.ucrChkVjust.Location = New System.Drawing.Point(11, 74) - Me.ucrChkVjust.Name = "ucrChkVjust" - Me.ucrChkVjust.Size = New System.Drawing.Size(100, 20) - Me.ucrChkVjust.TabIndex = 48 - ' - 'ucrChkLineHeight - ' - Me.ucrChkLineHeight.Checked = False - Me.ucrChkLineHeight.Location = New System.Drawing.Point(11, 101) - Me.ucrChkLineHeight.Name = "ucrChkLineHeight" - Me.ucrChkLineHeight.Size = New System.Drawing.Size(96, 18) - Me.ucrChkLineHeight.TabIndex = 47 - ' - 'ucrChkSize - ' - Me.ucrChkSize.Checked = False - Me.ucrChkSize.Location = New System.Drawing.Point(11, 20) - Me.ucrChkSize.Name = "ucrChkSize" - Me.ucrChkSize.Size = New System.Drawing.Size(100, 20) - Me.ucrChkSize.TabIndex = 46 - ' - 'ucrNudVjust - ' - Me.ucrNudVjust.DecimalPlaces = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudVjust.Increment = New Decimal(New Integer() {1, 0, 0, 65536}) - Me.ucrNudVjust.Location = New System.Drawing.Point(111, 74) - Me.ucrNudVjust.Maximum = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudVjust.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) - Me.ucrNudVjust.Name = "ucrNudVjust" - Me.ucrNudVjust.Size = New System.Drawing.Size(50, 20) - Me.ucrNudVjust.TabIndex = 38 - Me.ucrNudVjust.Value = New Decimal(New Integer() {0, 0, 0, 0}) - ' - 'ucrNudLineHeight - ' - Me.ucrNudLineHeight.DecimalPlaces = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudLineHeight.Increment = New Decimal(New Integer() {1, 0, 0, 65536}) - Me.ucrNudLineHeight.Location = New System.Drawing.Point(111, 99) - Me.ucrNudLineHeight.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) - Me.ucrNudLineHeight.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) - Me.ucrNudLineHeight.Name = "ucrNudLineHeight" - Me.ucrNudLineHeight.Size = New System.Drawing.Size(50, 20) - Me.ucrNudLineHeight.TabIndex = 36 - Me.ucrNudLineHeight.Value = New Decimal(New Integer() {0, 0, 0, 0}) - ' - 'ucrNudAngle - ' - Me.ucrNudAngle.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) - Me.ucrNudAngle.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudAngle.Location = New System.Drawing.Point(111, 128) - Me.ucrNudAngle.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) - Me.ucrNudAngle.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) - Me.ucrNudAngle.Name = "ucrNudAngle" - Me.ucrNudAngle.Size = New System.Drawing.Size(50, 20) - Me.ucrNudAngle.TabIndex = 34 - Me.ucrNudAngle.Value = New Decimal(New Integer() {0, 0, 0, 0}) - ' - 'ucrNudHjust - ' - Me.ucrNudHjust.DecimalPlaces = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudHjust.Increment = New Decimal(New Integer() {1, 0, 0, 65536}) - Me.ucrNudHjust.Location = New System.Drawing.Point(111, 47) - Me.ucrNudHjust.Maximum = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudHjust.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) - Me.ucrNudHjust.Name = "ucrNudHjust" - Me.ucrNudHjust.Size = New System.Drawing.Size(50, 20) - Me.ucrNudHjust.TabIndex = 32 - Me.ucrNudHjust.Value = New Decimal(New Integer() {0, 0, 0, 0}) - ' - 'ucrNudsize - ' - 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(111, 20) - 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" - Me.ucrNudsize.Size = New System.Drawing.Size(50, 20) - Me.ucrNudsize.TabIndex = 30 - Me.ucrNudsize.Value = New Decimal(New Integer() {0, 0, 0, 0}) - ' - 'ucrInputColour - ' - Me.ucrInputColour.AddQuotesIfUnrecognised = True - Me.ucrInputColour.IsReadOnly = False - Me.ucrInputColour.Location = New System.Drawing.Point(111, 208) - Me.ucrInputColour.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) - Me.ucrInputColour.Name = "ucrInputColour" - Me.ucrInputColour.Size = New System.Drawing.Size(137, 21) - Me.ucrInputColour.TabIndex = 28 - ' - 'ucrInputFace - ' - Me.ucrInputFace.AddQuotesIfUnrecognised = True - Me.ucrInputFace.IsReadOnly = False - Me.ucrInputFace.Location = New System.Drawing.Point(111, 181) - Me.ucrInputFace.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) - Me.ucrInputFace.Name = "ucrInputFace" - Me.ucrInputFace.Size = New System.Drawing.Size(137, 21) - Me.ucrInputFace.TabIndex = 26 - ' - 'ucrInputFamily - ' - Me.ucrInputFamily.AddQuotesIfUnrecognised = True - Me.ucrInputFamily.IsReadOnly = False - Me.ucrInputFamily.Location = New System.Drawing.Point(111, 154) - Me.ucrInputFamily.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) - Me.ucrInputFamily.Name = "ucrInputFamily" - Me.ucrInputFamily.Size = New System.Drawing.Size(137, 21) - Me.ucrInputFamily.TabIndex = 24 + 'tbYaxis + ' + Me.tbYaxis.Controls.Add(Me.ucrThemeRightYAxis) + Me.tbYaxis.Controls.Add(Me.ucrThemeLeftYAxis) + Me.tbYaxis.Controls.Add(Me.grpTickLabelYAxis) + Me.tbYaxis.Controls.Add(Me.grpTickMarksYAxis) + Me.tbYaxis.Location = New System.Drawing.Point(4, 22) + Me.tbYaxis.Name = "tbYaxis" + Me.tbYaxis.Padding = New System.Windows.Forms.Padding(3) + Me.tbYaxis.Size = New System.Drawing.Size(597, 577) + Me.tbYaxis.TabIndex = 1 + Me.tbYaxis.Text = "Y-axis" + Me.tbYaxis.UseVisualStyleBackColor = True + ' + 'ucrThemeRightYAxis + ' + Me.ucrThemeRightYAxis.Location = New System.Drawing.Point(305, 10) + Me.ucrThemeRightYAxis.Name = "ucrThemeRightYAxis" + Me.ucrThemeRightYAxis.Size = New System.Drawing.Size(296, 260) + Me.ucrThemeRightYAxis.TabIndex = 58 + ' + 'ucrThemeLeftYAxis + ' + Me.ucrThemeLeftYAxis.Location = New System.Drawing.Point(12, 10) + Me.ucrThemeLeftYAxis.Name = "ucrThemeLeftYAxis" + Me.ucrThemeLeftYAxis.Size = New System.Drawing.Size(296, 260) + Me.ucrThemeLeftYAxis.TabIndex = 57 + ' + 'grpTickLabelYAxis + ' + Me.grpTickLabelYAxis.Controls.Add(Me.ucrChkLineEndTickLabelsYAxis) + Me.grpTickLabelYAxis.Controls.Add(Me.ucrChkSizeTickLabelsYAxis) + Me.grpTickLabelYAxis.Controls.Add(Me.ucrChkLineTypeTickLabelsYAxis) + Me.grpTickLabelYAxis.Controls.Add(Me.ucrChkColourTickLabelsYAxis) + Me.grpTickLabelYAxis.Controls.Add(Me.ucrInputLineEndTickLabelsYAxis) + Me.grpTickLabelYAxis.Controls.Add(Me.ucrNudSizeTickLabelsYAxis) + Me.grpTickLabelYAxis.Controls.Add(Me.ucrInputColourTickLabelsYAxis) + Me.grpTickLabelYAxis.Controls.Add(Me.ucrInputLineTypeTickLabelsYAxis) + Me.grpTickLabelYAxis.Location = New System.Drawing.Point(263, 256) + Me.grpTickLabelYAxis.Name = "grpTickLabelYAxis" + Me.grpTickLabelYAxis.Size = New System.Drawing.Size(264, 154) + Me.grpTickLabelYAxis.TabIndex = 43 + Me.grpTickLabelYAxis.TabStop = False + Me.grpTickLabelYAxis.Text = "Y axis tick labels" ' 'ucrChkLineEndTickLabelsYAxis ' @@ -970,159 +596,22 @@ Partial Class sdgThemes Me.ucrInputLineTypeTickLabelsYAxis.Size = New System.Drawing.Size(137, 21) Me.ucrInputLineTypeTickLabelsYAxis.TabIndex = 26 ' - 'ucrChkColourRightYAxis - ' - Me.ucrChkColourRightYAxis.Checked = False - Me.ucrChkColourRightYAxis.Location = New System.Drawing.Point(14, 212) - Me.ucrChkColourRightYAxis.Name = "ucrChkColourRightYAxis" - Me.ucrChkColourRightYAxis.Size = New System.Drawing.Size(100, 20) - Me.ucrChkColourRightYAxis.TabIndex = 53 - ' - 'ucrChkFaceRightYAxis - ' - Me.ucrChkFaceRightYAxis.Checked = False - Me.ucrChkFaceRightYAxis.Location = New System.Drawing.Point(14, 184) - Me.ucrChkFaceRightYAxis.Name = "ucrChkFaceRightYAxis" - Me.ucrChkFaceRightYAxis.Size = New System.Drawing.Size(100, 20) - Me.ucrChkFaceRightYAxis.TabIndex = 52 - ' - 'ucrChkFamilyRightYAxis - ' - Me.ucrChkFamilyRightYAxis.Checked = False - Me.ucrChkFamilyRightYAxis.Location = New System.Drawing.Point(14, 156) - Me.ucrChkFamilyRightYAxis.Name = "ucrChkFamilyRightYAxis" - Me.ucrChkFamilyRightYAxis.Size = New System.Drawing.Size(100, 20) - Me.ucrChkFamilyRightYAxis.TabIndex = 51 - ' - 'ucrChkAngleRightYAxis - ' - Me.ucrChkAngleRightYAxis.Checked = False - Me.ucrChkAngleRightYAxis.Location = New System.Drawing.Point(14, 128) - Me.ucrChkAngleRightYAxis.Name = "ucrChkAngleRightYAxis" - Me.ucrChkAngleRightYAxis.Size = New System.Drawing.Size(100, 20) - Me.ucrChkAngleRightYAxis.TabIndex = 50 - ' - 'ucrChkHjustRightYAxis - ' - Me.ucrChkHjustRightYAxis.Checked = False - Me.ucrChkHjustRightYAxis.Location = New System.Drawing.Point(14, 44) - Me.ucrChkHjustRightYAxis.Name = "ucrChkHjustRightYAxis" - Me.ucrChkHjustRightYAxis.Size = New System.Drawing.Size(100, 20) - Me.ucrChkHjustRightYAxis.TabIndex = 49 - ' - 'ucrChkVjustRightYAxis - ' - Me.ucrChkVjustRightYAxis.Checked = False - Me.ucrChkVjustRightYAxis.Location = New System.Drawing.Point(14, 72) - Me.ucrChkVjustRightYAxis.Name = "ucrChkVjustRightYAxis" - Me.ucrChkVjustRightYAxis.Size = New System.Drawing.Size(100, 20) - Me.ucrChkVjustRightYAxis.TabIndex = 48 - ' - 'ucrChkLineHeightRightYAxis - ' - Me.ucrChkLineHeightRightYAxis.Checked = False - Me.ucrChkLineHeightRightYAxis.Location = New System.Drawing.Point(14, 100) - Me.ucrChkLineHeightRightYAxis.Name = "ucrChkLineHeightRightYAxis" - Me.ucrChkLineHeightRightYAxis.Size = New System.Drawing.Size(100, 20) - Me.ucrChkLineHeightRightYAxis.TabIndex = 47 - ' - 'ucrChkSizeRightYAxis - ' - Me.ucrChkSizeRightYAxis.Checked = False - Me.ucrChkSizeRightYAxis.Location = New System.Drawing.Point(14, 16) - Me.ucrChkSizeRightYAxis.Name = "ucrChkSizeRightYAxis" - Me.ucrChkSizeRightYAxis.Size = New System.Drawing.Size(100, 20) - Me.ucrChkSizeRightYAxis.TabIndex = 46 - ' - 'ucrNudVjustRightYAxis - ' - Me.ucrNudVjustRightYAxis.DecimalPlaces = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudVjustRightYAxis.Increment = New Decimal(New Integer() {1, 0, 0, 65536}) - Me.ucrNudVjustRightYAxis.Location = New System.Drawing.Point(115, 72) - Me.ucrNudVjustRightYAxis.Maximum = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudVjustRightYAxis.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) - Me.ucrNudVjustRightYAxis.Name = "ucrNudVjustRightYAxis" - Me.ucrNudVjustRightYAxis.Size = New System.Drawing.Size(50, 20) - Me.ucrNudVjustRightYAxis.TabIndex = 38 - Me.ucrNudVjustRightYAxis.Value = New Decimal(New Integer() {0, 0, 0, 0}) - ' - 'ucrNudLineHeightRightYAxis - ' - Me.ucrNudLineHeightRightYAxis.DecimalPlaces = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudLineHeightRightYAxis.Increment = New Decimal(New Integer() {1, 0, 0, 65536}) - Me.ucrNudLineHeightRightYAxis.Location = New System.Drawing.Point(115, 100) - Me.ucrNudLineHeightRightYAxis.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) - Me.ucrNudLineHeightRightYAxis.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) - Me.ucrNudLineHeightRightYAxis.Name = "ucrNudLineHeightRightYAxis" - Me.ucrNudLineHeightRightYAxis.Size = New System.Drawing.Size(50, 20) - Me.ucrNudLineHeightRightYAxis.TabIndex = 36 - Me.ucrNudLineHeightRightYAxis.Value = New Decimal(New Integer() {0, 0, 0, 0}) - ' - 'ucrNudAngleRightYAxis - ' - Me.ucrNudAngleRightYAxis.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) - Me.ucrNudAngleRightYAxis.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudAngleRightYAxis.Location = New System.Drawing.Point(115, 128) - Me.ucrNudAngleRightYAxis.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) - Me.ucrNudAngleRightYAxis.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) - Me.ucrNudAngleRightYAxis.Name = "ucrNudAngleRightYAxis" - Me.ucrNudAngleRightYAxis.Size = New System.Drawing.Size(50, 20) - Me.ucrNudAngleRightYAxis.TabIndex = 34 - Me.ucrNudAngleRightYAxis.Value = New Decimal(New Integer() {0, 0, 0, 0}) - ' - 'ucrNudHjustRightYAxis - ' - Me.ucrNudHjustRightYAxis.DecimalPlaces = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudHjustRightYAxis.Increment = New Decimal(New Integer() {1, 0, 0, 65536}) - Me.ucrNudHjustRightYAxis.Location = New System.Drawing.Point(115, 44) - Me.ucrNudHjustRightYAxis.Maximum = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudHjustRightYAxis.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) - Me.ucrNudHjustRightYAxis.Name = "ucrNudHjustRightYAxis" - Me.ucrNudHjustRightYAxis.Size = New System.Drawing.Size(50, 20) - Me.ucrNudHjustRightYAxis.TabIndex = 32 - Me.ucrNudHjustRightYAxis.Value = New Decimal(New Integer() {0, 0, 0, 0}) - ' - 'ucrNudSizeRightYAxis - ' - Me.ucrNudSizeRightYAxis.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) - Me.ucrNudSizeRightYAxis.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudSizeRightYAxis.Location = New System.Drawing.Point(115, 16) - Me.ucrNudSizeRightYAxis.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) - Me.ucrNudSizeRightYAxis.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) - Me.ucrNudSizeRightYAxis.Name = "ucrNudSizeRightYAxis" - Me.ucrNudSizeRightYAxis.Size = New System.Drawing.Size(50, 20) - Me.ucrNudSizeRightYAxis.TabIndex = 30 - Me.ucrNudSizeRightYAxis.Value = New Decimal(New Integer() {0, 0, 0, 0}) - ' - 'ucrInputColourRightYAxis - ' - Me.ucrInputColourRightYAxis.AddQuotesIfUnrecognised = True - Me.ucrInputColourRightYAxis.IsReadOnly = False - Me.ucrInputColourRightYAxis.Location = New System.Drawing.Point(115, 212) - Me.ucrInputColourRightYAxis.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) - Me.ucrInputColourRightYAxis.Name = "ucrInputColourRightYAxis" - Me.ucrInputColourRightYAxis.Size = New System.Drawing.Size(137, 21) - Me.ucrInputColourRightYAxis.TabIndex = 28 - ' - 'ucrInputFaceRightYAxis - ' - Me.ucrInputFaceRightYAxis.AddQuotesIfUnrecognised = True - Me.ucrInputFaceRightYAxis.IsReadOnly = False - Me.ucrInputFaceRightYAxis.Location = New System.Drawing.Point(115, 183) - Me.ucrInputFaceRightYAxis.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) - Me.ucrInputFaceRightYAxis.Name = "ucrInputFaceRightYAxis" - Me.ucrInputFaceRightYAxis.Size = New System.Drawing.Size(137, 21) - Me.ucrInputFaceRightYAxis.TabIndex = 26 - ' - 'ucrInputFamilyRightYAxis - ' - Me.ucrInputFamilyRightYAxis.AddQuotesIfUnrecognised = True - Me.ucrInputFamilyRightYAxis.IsReadOnly = False - Me.ucrInputFamilyRightYAxis.Location = New System.Drawing.Point(115, 155) - Me.ucrInputFamilyRightYAxis.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) - Me.ucrInputFamilyRightYAxis.Name = "ucrInputFamilyRightYAxis" - Me.ucrInputFamilyRightYAxis.Size = New System.Drawing.Size(137, 21) - Me.ucrInputFamilyRightYAxis.TabIndex = 24 + 'grpTickMarksYAxis + ' + Me.grpTickMarksYAxis.Controls.Add(Me.ucrChkLineEndTickMarksYAxis) + Me.grpTickMarksYAxis.Controls.Add(Me.ucrChkSizeTickMarksYAxis) + Me.grpTickMarksYAxis.Controls.Add(Me.ucrChkLineTypeTickMarksYAxis) + Me.grpTickMarksYAxis.Controls.Add(Me.ucrChkColourTickMarksYAxis) + Me.grpTickMarksYAxis.Controls.Add(Me.ucrInputLineEndTickMarksYAxis) + Me.grpTickMarksYAxis.Controls.Add(Me.ucrNudSizeTickMarksYAxis) + Me.grpTickMarksYAxis.Controls.Add(Me.ucrInputColourTickMarksYAxis) + Me.grpTickMarksYAxis.Controls.Add(Me.ucrInputLineTypeTickMarksYAxis) + Me.grpTickMarksYAxis.Location = New System.Drawing.Point(6, 256) + Me.grpTickMarksYAxis.Name = "grpTickMarksYAxis" + Me.grpTickMarksYAxis.Size = New System.Drawing.Size(250, 154) + Me.grpTickMarksYAxis.TabIndex = 42 + Me.grpTickMarksYAxis.TabStop = False + Me.grpTickMarksYAxis.Text = "Tick marks along axes" ' 'ucrChkLineEndTickMarksYAxis ' @@ -1198,160 +687,6 @@ Partial Class sdgThemes Me.ucrInputLineTypeTickMarksYAxis.Size = New System.Drawing.Size(137, 21) Me.ucrInputLineTypeTickMarksYAxis.TabIndex = 26 ' - 'ucrChkColourYAxis - ' - Me.ucrChkColourYAxis.Checked = False - Me.ucrChkColourYAxis.Location = New System.Drawing.Point(6, 212) - Me.ucrChkColourYAxis.Name = "ucrChkColourYAxis" - Me.ucrChkColourYAxis.Size = New System.Drawing.Size(100, 20) - Me.ucrChkColourYAxis.TabIndex = 45 - ' - 'ucrChkFaceYAxis - ' - Me.ucrChkFaceYAxis.Checked = False - Me.ucrChkFaceYAxis.Location = New System.Drawing.Point(6, 184) - Me.ucrChkFaceYAxis.Name = "ucrChkFaceYAxis" - Me.ucrChkFaceYAxis.Size = New System.Drawing.Size(100, 20) - Me.ucrChkFaceYAxis.TabIndex = 44 - ' - 'ucrChkFamilyYAxis - ' - Me.ucrChkFamilyYAxis.Checked = False - Me.ucrChkFamilyYAxis.Location = New System.Drawing.Point(6, 156) - Me.ucrChkFamilyYAxis.Name = "ucrChkFamilyYAxis" - Me.ucrChkFamilyYAxis.Size = New System.Drawing.Size(100, 20) - Me.ucrChkFamilyYAxis.TabIndex = 43 - ' - 'ucrChkAngleYAxis - ' - Me.ucrChkAngleYAxis.Checked = False - Me.ucrChkAngleYAxis.Location = New System.Drawing.Point(6, 128) - Me.ucrChkAngleYAxis.Name = "ucrChkAngleYAxis" - Me.ucrChkAngleYAxis.Size = New System.Drawing.Size(100, 20) - Me.ucrChkAngleYAxis.TabIndex = 42 - ' - 'ucrChkHjustYAxis - ' - Me.ucrChkHjustYAxis.Checked = False - Me.ucrChkHjustYAxis.Location = New System.Drawing.Point(6, 44) - Me.ucrChkHjustYAxis.Name = "ucrChkHjustYAxis" - Me.ucrChkHjustYAxis.Size = New System.Drawing.Size(100, 20) - Me.ucrChkHjustYAxis.TabIndex = 41 - ' - 'ucrChkVjustYAxis - ' - Me.ucrChkVjustYAxis.Checked = False - Me.ucrChkVjustYAxis.Location = New System.Drawing.Point(6, 72) - Me.ucrChkVjustYAxis.Name = "ucrChkVjustYAxis" - Me.ucrChkVjustYAxis.Size = New System.Drawing.Size(100, 20) - Me.ucrChkVjustYAxis.TabIndex = 40 - ' - 'ucrChkLineHeightYAxis - ' - Me.ucrChkLineHeightYAxis.Checked = False - Me.ucrChkLineHeightYAxis.Location = New System.Drawing.Point(6, 100) - Me.ucrChkLineHeightYAxis.Name = "ucrChkLineHeightYAxis" - Me.ucrChkLineHeightYAxis.Size = New System.Drawing.Size(100, 20) - Me.ucrChkLineHeightYAxis.TabIndex = 39 - ' - 'ucrChkSizeYAxis - ' - Me.ucrChkSizeYAxis.Checked = False - Me.ucrChkSizeYAxis.Location = New System.Drawing.Point(6, 16) - Me.ucrChkSizeYAxis.Name = "ucrChkSizeYAxis" - Me.ucrChkSizeYAxis.Size = New System.Drawing.Size(100, 20) - Me.ucrChkSizeYAxis.TabIndex = 33 - ' - 'ucrNudVjustYAxis - ' - Me.ucrNudVjustYAxis.DecimalPlaces = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudVjustYAxis.Increment = New Decimal(New Integer() {1, 0, 0, 65536}) - Me.ucrNudVjustYAxis.Location = New System.Drawing.Point(110, 72) - Me.ucrNudVjustYAxis.Maximum = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudVjustYAxis.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) - Me.ucrNudVjustYAxis.Name = "ucrNudVjustYAxis" - Me.ucrNudVjustYAxis.Size = New System.Drawing.Size(50, 20) - Me.ucrNudVjustYAxis.TabIndex = 38 - Me.ucrNudVjustYAxis.Value = New Decimal(New Integer() {0, 0, 0, 0}) - ' - 'ucrNudLineHeightYAxis - ' - Me.ucrNudLineHeightYAxis.DecimalPlaces = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudLineHeightYAxis.Increment = New Decimal(New Integer() {1, 0, 0, 65536}) - Me.ucrNudLineHeightYAxis.Location = New System.Drawing.Point(110, 100) - Me.ucrNudLineHeightYAxis.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) - Me.ucrNudLineHeightYAxis.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) - Me.ucrNudLineHeightYAxis.Name = "ucrNudLineHeightYAxis" - Me.ucrNudLineHeightYAxis.Size = New System.Drawing.Size(50, 20) - Me.ucrNudLineHeightYAxis.TabIndex = 36 - Me.ucrNudLineHeightYAxis.Value = New Decimal(New Integer() {0, 0, 0, 0}) - ' - 'ucrNudAngleYAxis - ' - Me.ucrNudAngleYAxis.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) - Me.ucrNudAngleYAxis.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudAngleYAxis.Location = New System.Drawing.Point(110, 128) - Me.ucrNudAngleYAxis.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) - Me.ucrNudAngleYAxis.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) - Me.ucrNudAngleYAxis.Name = "ucrNudAngleYAxis" - Me.ucrNudAngleYAxis.Size = New System.Drawing.Size(50, 20) - Me.ucrNudAngleYAxis.TabIndex = 34 - Me.ucrNudAngleYAxis.Value = New Decimal(New Integer() {0, 0, 0, 0}) - ' - 'ucrNudHjustYAxis - ' - Me.ucrNudHjustYAxis.DecimalPlaces = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudHjustYAxis.Increment = New Decimal(New Integer() {1, 0, 0, 65536}) - Me.ucrNudHjustYAxis.Location = New System.Drawing.Point(110, 44) - Me.ucrNudHjustYAxis.Maximum = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudHjustYAxis.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) - Me.ucrNudHjustYAxis.Name = "ucrNudHjustYAxis" - Me.ucrNudHjustYAxis.Size = New System.Drawing.Size(50, 20) - Me.ucrNudHjustYAxis.TabIndex = 32 - Me.ucrNudHjustYAxis.Value = New Decimal(New Integer() {0, 0, 0, 0}) - ' - 'ucrNudSizeYAxis - ' - Me.ucrNudSizeYAxis.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) - Me.ucrNudSizeYAxis.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudSizeYAxis.Location = New System.Drawing.Point(110, 16) - Me.ucrNudSizeYAxis.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) - Me.ucrNudSizeYAxis.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) - Me.ucrNudSizeYAxis.Name = "ucrNudSizeYAxis" - Me.ucrNudSizeYAxis.Size = New System.Drawing.Size(50, 20) - Me.ucrNudSizeYAxis.TabIndex = 30 - Me.ucrNudSizeYAxis.Value = New Decimal(New Integer() {0, 0, 0, 0}) - ' - 'ucrInputColourYAxis - ' - Me.ucrInputColourYAxis.AddQuotesIfUnrecognised = True - Me.ucrInputColourYAxis.IsReadOnly = False - Me.ucrInputColourYAxis.Location = New System.Drawing.Point(110, 212) - Me.ucrInputColourYAxis.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) - Me.ucrInputColourYAxis.Name = "ucrInputColourYAxis" - Me.ucrInputColourYAxis.Size = New System.Drawing.Size(137, 21) - Me.ucrInputColourYAxis.TabIndex = 28 - ' - 'ucrInputFaceYAxis - ' - Me.ucrInputFaceYAxis.AddQuotesIfUnrecognised = True - Me.ucrInputFaceYAxis.IsReadOnly = False - Me.ucrInputFaceYAxis.Location = New System.Drawing.Point(110, 183) - Me.ucrInputFaceYAxis.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) - Me.ucrInputFaceYAxis.Name = "ucrInputFaceYAxis" - Me.ucrInputFaceYAxis.Size = New System.Drawing.Size(137, 21) - Me.ucrInputFaceYAxis.TabIndex = 26 - ' - 'ucrInputFamilyYAxis - ' - Me.ucrInputFamilyYAxis.AddQuotesIfUnrecognised = True - Me.ucrInputFamilyYAxis.IsReadOnly = False - Me.ucrInputFamilyYAxis.Location = New System.Drawing.Point(110, 155) - Me.ucrInputFamilyYAxis.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) - Me.ucrInputFamilyYAxis.Name = "ucrInputFamilyYAxis" - Me.ucrInputFamilyYAxis.Size = New System.Drawing.Size(137, 21) - Me.ucrInputFamilyYAxis.TabIndex = 24 - ' 'ucrBaseSubdialogue ' Me.ucrBaseSubdialogue.Location = New System.Drawing.Point(215, 610) @@ -1359,102 +694,11 @@ Partial Class sdgThemes Me.ucrBaseSubdialogue.Size = New System.Drawing.Size(142, 30) Me.ucrBaseSubdialogue.TabIndex = 0 ' - 'GroupBox2 - ' - Me.GroupBox2.Controls.Add(Me.UcrCheck1) - Me.GroupBox2.Controls.Add(Me.UcrCheck2) - Me.GroupBox2.Controls.Add(Me.UcrCheck3) - Me.GroupBox2.Controls.Add(Me.UcrCheck4) - Me.GroupBox2.Controls.Add(Me.UcrInputComboBox1) - Me.GroupBox2.Controls.Add(Me.UcrNud1) - Me.GroupBox2.Controls.Add(Me.UcrInputComboBox2) - Me.GroupBox2.Controls.Add(Me.UcrInputComboBox3) - Me.GroupBox2.Location = New System.Drawing.Point(284, 424) - Me.GroupBox2.Name = "GroupBox2" - Me.GroupBox2.Size = New System.Drawing.Size(264, 154) - Me.GroupBox2.TabIndex = 55 - Me.GroupBox2.TabStop = False - Me.GroupBox2.Text = "X axis tick labels" - ' - 'UcrCheck1 - ' - Me.UcrCheck1.Checked = False - Me.UcrCheck1.Location = New System.Drawing.Point(11, 104) - Me.UcrCheck1.Name = "UcrCheck1" - Me.UcrCheck1.Size = New System.Drawing.Size(100, 20) - Me.UcrCheck1.TabIndex = 54 - ' - 'UcrCheck2 - ' - Me.UcrCheck2.Checked = False - Me.UcrCheck2.Location = New System.Drawing.Point(11, 20) - Me.UcrCheck2.Name = "UcrCheck2" - Me.UcrCheck2.Size = New System.Drawing.Size(100, 20) - Me.UcrCheck2.TabIndex = 53 - ' - 'UcrCheck3 - ' - Me.UcrCheck3.Checked = False - Me.UcrCheck3.Location = New System.Drawing.Point(11, 45) - Me.UcrCheck3.Name = "UcrCheck3" - Me.UcrCheck3.Size = New System.Drawing.Size(100, 20) - Me.UcrCheck3.TabIndex = 52 - ' - 'UcrCheck4 - ' - Me.UcrCheck4.Checked = False - Me.UcrCheck4.Location = New System.Drawing.Point(11, 72) - Me.UcrCheck4.Name = "UcrCheck4" - Me.UcrCheck4.Size = New System.Drawing.Size(100, 20) - Me.UcrCheck4.TabIndex = 51 - ' - 'UcrInputComboBox1 - ' - Me.UcrInputComboBox1.AddQuotesIfUnrecognised = True - Me.UcrInputComboBox1.IsReadOnly = False - Me.UcrInputComboBox1.Location = New System.Drawing.Point(117, 103) - Me.UcrInputComboBox1.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) - Me.UcrInputComboBox1.Name = "UcrInputComboBox1" - Me.UcrInputComboBox1.Size = New System.Drawing.Size(137, 21) - Me.UcrInputComboBox1.TabIndex = 32 - ' - 'UcrNud1 - ' - Me.UcrNud1.DecimalPlaces = New Decimal(New Integer() {1, 0, 0, 0}) - Me.UcrNud1.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.UcrNud1.Location = New System.Drawing.Point(116, 19) - Me.UcrNud1.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) - Me.UcrNud1.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) - Me.UcrNud1.Name = "UcrNud1" - Me.UcrNud1.Size = New System.Drawing.Size(50, 20) - Me.UcrNud1.TabIndex = 30 - Me.UcrNud1.Value = New Decimal(New Integer() {0, 0, 0, 0}) - ' - 'UcrInputComboBox2 - ' - Me.UcrInputComboBox2.AddQuotesIfUnrecognised = True - Me.UcrInputComboBox2.IsReadOnly = False - Me.UcrInputComboBox2.Location = New System.Drawing.Point(117, 72) - Me.UcrInputComboBox2.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) - Me.UcrInputComboBox2.Name = "UcrInputComboBox2" - Me.UcrInputComboBox2.Size = New System.Drawing.Size(137, 21) - Me.UcrInputComboBox2.TabIndex = 28 - ' - 'UcrInputComboBox3 - ' - Me.UcrInputComboBox3.AddQuotesIfUnrecognised = True - Me.UcrInputComboBox3.IsReadOnly = False - Me.UcrInputComboBox3.Location = New System.Drawing.Point(117, 44) - Me.UcrInputComboBox3.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) - Me.UcrInputComboBox3.Name = "UcrInputComboBox3" - Me.UcrInputComboBox3.Size = New System.Drawing.Size(137, 21) - Me.UcrInputComboBox3.TabIndex = 26 - ' 'sdgThemes ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(567, 652) + Me.ClientSize = New System.Drawing.Size(621, 652) Me.Controls.Add(Me.tbXaxis) Me.Controls.Add(Me.ucrBaseSubdialogue) Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog @@ -1466,16 +710,12 @@ Partial Class sdgThemes Me.tbXaxis.ResumeLayout(False) Me.tbAxis.ResumeLayout(False) Me.grpTableOptions.ResumeLayout(False) + Me.GroupBox2.ResumeLayout(False) Me.grpTickLabels.ResumeLayout(False) - Me.grpAxisLabelTopAxis.ResumeLayout(False) Me.GroupBox1.ResumeLayout(False) - Me.grpAxisLabel.ResumeLayout(False) Me.tbYaxis.ResumeLayout(False) Me.grpTickLabelYAxis.ResumeLayout(False) - Me.grpYAxisTopLabels.ResumeLayout(False) Me.grpTickMarksYAxis.ResumeLayout(False) - Me.grpYAxisLabels.ResumeLayout(False) - Me.GroupBox2.ResumeLayout(False) Me.ResumeLayout(False) End Sub @@ -1489,25 +729,7 @@ Partial Class sdgThemes Friend WithEvents ucrNudSizeTickMarks As ucrNud Friend WithEvents ucrInputColourTickMarks As ucrInputComboBox Friend WithEvents ucrInputLineTypeTickMarks As ucrInputComboBox - Friend WithEvents grpAxisLabel As GroupBox - Friend WithEvents ucrNudVjust As ucrNud - Friend WithEvents ucrNudLineHeight As ucrNud - Friend WithEvents ucrNudAngle As ucrNud - Friend WithEvents ucrNudHjust As ucrNud - Friend WithEvents ucrNudsize As ucrNud - Friend WithEvents ucrInputColour As ucrInputComboBox - Friend WithEvents ucrInputFace As ucrInputComboBox - Friend WithEvents ucrInputFamily As ucrInputComboBox Friend WithEvents ucrInputLineEndTickMarks As ucrInputComboBox - Friend WithEvents grpAxisLabelTopAxis As GroupBox - Friend WithEvents ucrNudVjustTopAxis As ucrNud - Friend WithEvents ucrNudLineHeightTopAxis As ucrNud - Friend WithEvents ucrNudAngleTopAxis As ucrNud - Friend WithEvents ucrNudHjustTopAxis As ucrNud - Friend WithEvents ucrNudSizeTopaxis As ucrNud - Friend WithEvents ucrInputColourTopAxis As ucrInputComboBox - Friend WithEvents ucrInputFaceTopAxis As ucrInputComboBox - Friend WithEvents ucrInputFamilyTopAxis As ucrInputComboBox Friend WithEvents grpTickLabels As GroupBox Friend WithEvents ucrInputLineEndTickLabelsXAxis As ucrInputComboBox Friend WithEvents ucrNudSizeTickLabelsXAxis As ucrNud @@ -1518,61 +740,11 @@ Partial Class sdgThemes Friend WithEvents ucrNudSizeTickLabelsYAxis As ucrNud Friend WithEvents ucrInputColourTickLabelsYAxis As ucrInputComboBox Friend WithEvents ucrInputLineTypeTickLabelsYAxis As ucrInputComboBox - Friend WithEvents grpYAxisTopLabels As GroupBox - Friend WithEvents ucrNudVjustRightYAxis As ucrNud - Friend WithEvents ucrNudLineHeightRightYAxis As ucrNud - Friend WithEvents ucrNudAngleRightYAxis As ucrNud - Friend WithEvents ucrNudHjustRightYAxis As ucrNud - Friend WithEvents ucrNudSizeRightYAxis As ucrNud - Friend WithEvents ucrInputColourRightYAxis As ucrInputComboBox - Friend WithEvents ucrInputFaceRightYAxis As ucrInputComboBox - Friend WithEvents ucrInputFamilyRightYAxis As ucrInputComboBox Friend WithEvents grpTickMarksYAxis As GroupBox Friend WithEvents ucrInputLineEndTickMarksYAxis As ucrInputComboBox Friend WithEvents ucrNudSizeTickMarksYAxis As ucrNud Friend WithEvents ucrInputColourTickMarksYAxis As ucrInputComboBox Friend WithEvents ucrInputLineTypeTickMarksYAxis As ucrInputComboBox - Friend WithEvents grpYAxisLabels As GroupBox - Friend WithEvents ucrNudVjustYAxis As ucrNud - Friend WithEvents ucrNudLineHeightYAxis As ucrNud - Friend WithEvents ucrNudAngleYAxis As ucrNud - Friend WithEvents ucrNudHjustYAxis As ucrNud - Friend WithEvents ucrNudSizeYAxis As ucrNud - Friend WithEvents ucrInputColourYAxis As ucrInputComboBox - Friend WithEvents ucrInputFaceYAxis As ucrInputComboBox - Friend WithEvents ucrInputFamilyYAxis As ucrInputComboBox - Friend WithEvents ucrChkHjustYAxis As ucrCheck - Friend WithEvents ucrChkVjustYAxis As ucrCheck - Friend WithEvents ucrChkLineHeightYAxis As ucrCheck - Friend WithEvents ucrChkSizeYAxis As ucrCheck - Friend WithEvents ucrChkColourYAxis As ucrCheck - Friend WithEvents ucrChkFaceYAxis As ucrCheck - Friend WithEvents ucrChkFamilyYAxis As ucrCheck - Friend WithEvents ucrChkAngleYAxis As ucrCheck - Friend WithEvents ucrChkColourRightYAxis As ucrCheck - Friend WithEvents ucrChkFaceRightYAxis As ucrCheck - Friend WithEvents ucrChkFamilyRightYAxis As ucrCheck - Friend WithEvents ucrChkAngleRightYAxis As ucrCheck - Friend WithEvents ucrChkHjustRightYAxis As ucrCheck - Friend WithEvents ucrChkVjustRightYAxis As ucrCheck - Friend WithEvents ucrChkLineHeightRightYAxis As ucrCheck - Friend WithEvents ucrChkSizeRightYAxis As ucrCheck - Friend WithEvents ucrChkColour As ucrCheck - Friend WithEvents ucrChkFace As ucrCheck - Friend WithEvents ucrChkFamily As ucrCheck - Friend WithEvents ucrChkAngle As ucrCheck - Friend WithEvents ucrChkHjust As ucrCheck - Friend WithEvents ucrChkVjust As ucrCheck - Friend WithEvents ucrChkLineHeight As ucrCheck - Friend WithEvents ucrChkSize As ucrCheck - Friend WithEvents ucrChkColourTopXAxis As ucrCheck - Friend WithEvents ucrChkFaceTopXAxis As ucrCheck - Friend WithEvents ucrChkFamilyTopXAxis As ucrCheck - Friend WithEvents ucrChkAngleTopXAxis As ucrCheck - Friend WithEvents ucrChkHjustTopXAxis As ucrCheck - Friend WithEvents ucrChkVjustTopXAxis As ucrCheck - Friend WithEvents ucrChkLineHeightTopXAxis As ucrCheck - Friend WithEvents ucrChkSizeTopXAxis As ucrCheck Friend WithEvents ucrChkLineEndTickLabelsXAxis As ucrCheck Friend WithEvents ucrChkSizeTickLabelsXAxis As ucrCheck Friend WithEvents ucrChkLineTypeTickLabelsXAxis As ucrCheck @@ -1604,4 +776,8 @@ Partial Class sdgThemes Friend WithEvents UcrNud1 As ucrNud Friend WithEvents UcrInputComboBox2 As ucrInputComboBox Friend WithEvents UcrInputComboBox3 As ucrInputComboBox + Friend WithEvents ucrThemeBottomXAxis As ucrThemeAxes + Friend WithEvents ucrThemeTopXAxis As ucrThemeAxes + Friend WithEvents ucrThemeRightYAxis As ucrThemeAxes + Friend WithEvents ucrThemeLeftYAxis As ucrThemeAxes End Class diff --git a/instat/sdgThemes.vb b/instat/sdgThemes.vb index d0c3845a250..c4c7a17ae41 100644 --- a/instat/sdgThemes.vb +++ b/instat/sdgThemes.vb @@ -19,6 +19,7 @@ Imports instat.Translations Public Class sdgThemes Public bControlsInitialised As Boolean = False Private clsElementLine, clsElementXAxisTextTop, clsElementXAxisLine, clsElementYAxisLine, clsElementText, clsElementYAxisTextRight, clsElementXAxisLineTop, clsThemeFunction As New RFunction + Private clsBaseOperator As New ROperator Private dctThemeFunctions As New Dictionary(Of String, RFunction) @@ -29,37 +30,6 @@ Public Class sdgThemes Public Sub InitialiseControls() - 'X axis Label - ucrChkSize.SetText("Size") - ucrNudsize.SetParameter(New RParameter("size")) - ucrChkAngle.SetText("Angle") - ucrNudAngle.SetParameter(New RParameter("angle")) - ucrNudAngle.SetMinMax(0, 360) - ucrChkHjust.SetText("Hjust") - ucrNudHjust.SetParameter(New RParameter("hjust")) - ucrNudHjust.Increment = 0.1 - ucrNudHjust.SetMinMax(0, 1) - ucrChkVjust.SetText("Vjust") - ucrNudVjust.SetParameter(New RParameter("vjust")) - ucrNudVjust.Increment = 0.1 - ucrNudVjust.SetMinMax(0, 1) - ucrChkLineHeight.SetText("Line Height") - ucrNudLineHeight.SetParameter(New RParameter("lineheight")) - - ucrChkFace.SetText("Face") - ucrInputFace.SetParameter(New RParameter("face")) - ucrInputFace.SetItems(New Dictionary(Of String, String)(GgplotDefaults.dctFontFace)) - ucrInputFace.SetRDefault(Chr(34) & "plain" & Chr(34)) - - ucrChkColour.SetText("Colour") - ucrInputColour.SetParameter(New RParameter("colour")) - ucrInputColour.SetItems(New Dictionary(Of String, String)(GgplotDefaults.dctColour)) - ucrInputColour.SetRDefault(Chr(34) & "black" & Chr(34)) - - ucrChkFamily.SetText("Family") - ucrInputFamily.SetParameter(New RParameter("family")) - ucrInputFamily.SetItems(New Dictionary(Of String, String)(GgplotDefaults.dctFonts)) - ucrInputFamily.SetRDefault(Chr(34) & "Times" & Chr(34)) 'Tick Marks Along Axes ucrChkSizeTickMarksXAxis.SetText("Size") @@ -82,38 +52,6 @@ Public Class sdgThemes ucrInputLineEndTickMarks.SetItems(New Dictionary(Of String, String)(GgplotDefaults.dctLineEnd)) ucrInputLineEndTickMarks.SetRDefault(Chr(34) & "square" & Chr(34)) - 'X axis Label Top Axis - ucrChkSizeTopXAxis.SetText("Size") - ucrNudSizeTopaxis.SetParameter(New RParameter("size")) - ucrNudSizeTopaxis.Increment = 0.1 - ucrChkAngleTopXAxis.SetText("Angle") - ucrNudAngleTopAxis.SetParameter(New RParameter("angle")) - ucrNudAngleTopAxis.SetMinMax(0, 360) - ucrChkHjustTopXAxis.SetText("Hjust") - ucrNudHjustTopAxis.SetParameter(New RParameter("hjust")) - ucrNudHjustTopAxis.Increment = 0.1 - ucrNudHjustTopAxis.SetMinMax(0, 1) - ucrChkVjustTopXAxis.SetText("Vjust") - ucrNudVjustTopAxis.SetParameter(New RParameter("vjust")) - ucrNudVjustTopAxis.Increment = 0.1 - ucrNudVjustTopAxis.SetMinMax(0, 1) - ucrChkLineHeightTopXAxis.SetText("Line Height") - ucrNudLineHeightTopAxis.SetParameter(New RParameter("lineheight")) - - ucrChkFaceTopXAxis.SetText("Face") - ucrInputFaceTopAxis.SetParameter(New RParameter("face")) - ucrInputFaceTopAxis.SetItems(New Dictionary(Of String, String)(GgplotDefaults.dctFontFace)) - ucrInputFaceTopAxis.SetRDefault(Chr(34) & "plain" & Chr(34)) - - ucrChkColourTopXAxis.SetText("colour") - ucrInputColourTopAxis.SetParameter(New RParameter("colour")) - ucrInputColourTopAxis.SetItems(New Dictionary(Of String, String)(GgplotDefaults.dctColour)) - ucrInputColourTopAxis.SetRDefault(Chr(34) & "black" & Chr(34)) - - ucrChkFamilyTopXAxis.SetText("Family") - ucrInputFamilyTopAxis.SetParameter(New RParameter("family")) - ucrInputFamilyTopAxis.SetItems(New Dictionary(Of String, String)(GgplotDefaults.dctFonts)) - ucrInputFamilyTopAxis.SetRDefault(Chr(34) & "Times" & Chr(34)) 'Tick Marks Along Axes ucrChkSizeTickLabelsXAxis.SetText("Size") @@ -135,25 +73,6 @@ Public Class sdgThemes ucrInputLineEndTickLabelsXAxis.SetItems(New Dictionary(Of String, String)(GgplotDefaults.dctColour)) ucrInputLineEndTickLabelsXAxis.SetRDefault(Chr(34) & "square" & Chr(34)) - 'Linking - ucrChkSize.AddToLinkedControls(ucrNudsize, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) - ucrChkHjust.AddToLinkedControls(ucrNudHjust, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) - ucrChkVjust.AddToLinkedControls(ucrNudVjust, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) - ucrChkLineHeight.AddToLinkedControls(ucrNudLineHeight, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) - ucrChkAngle.AddToLinkedControls(ucrNudAngle, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) - ucrChkFace.AddToLinkedControls(ucrInputFace, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) - ucrChkFamily.AddToLinkedControls(ucrInputFamily, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) - ucrChkColour.AddToLinkedControls(ucrInputColour, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) - - ucrChkSizeTopXAxis.AddToLinkedControls(ucrNudSizeTopaxis, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) - ucrChkHjustTopXAxis.AddToLinkedControls(ucrNudHjustTopAxis, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) - ucrChkVjustTopXAxis.AddToLinkedControls(ucrNudVjustTopAxis, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) - ucrChkLineHeightTopXAxis.AddToLinkedControls(ucrNudLineHeightTopAxis, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) - ucrChkAngleTopXAxis.AddToLinkedControls(ucrNudAngleTopAxis, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) - ucrChkFaceTopXAxis.AddToLinkedControls(ucrInputFaceTopAxis, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) - ucrChkFamilyTopXAxis.AddToLinkedControls(ucrInputFamilyTopAxis, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) - ucrChkColourTopXAxis.AddToLinkedControls(ucrInputColourTopAxis, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) - ucrChkSizeTickMarksXAxis.AddToLinkedControls(ucrNudSizeTickMarks, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) ucrChkLineTypeTickMarksXAxis.AddToLinkedControls(ucrInputLineTypeTickMarks, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) ucrChkLineEndTickMarksXAxis.AddToLinkedControls(ucrInputLineEndTickMarks, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) @@ -164,37 +83,6 @@ Public Class sdgThemes ucrChkLineEndTickLabelsXAxis.AddToLinkedControls(ucrInputLineEndTickLabelsXAxis, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) ucrChkColourTickLabelsXAxis.AddToLinkedControls(ucrInputColourTickLabelsXAxis, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) - 'Y-axis Label - ucrChkSizeYAxis.SetText("Size") - ucrNudSizeYAxis.SetParameter(New RParameter("size")) - ucrChkAngleYAxis.SetText("Angle") - ucrNudAngleYAxis.SetParameter(New RParameter("angle")) - ucrNudAngleYAxis.SetMinMax(0, 360) - ucrChkHjustYAxis.SetText("Hjust") - ucrNudHjustYAxis.SetParameter(New RParameter("hjust")) - ucrNudHjustYAxis.Increment = 0.1 - ucrNudHjustYAxis.SetMinMax(0, 1) - ucrChkVjustYAxis.SetText("Vjust") - ucrNudVjustYAxis.SetParameter(New RParameter("vjust")) - ucrNudVjustYAxis.Increment = 0.1 - ucrNudVjustYAxis.SetMinMax(0, 1) - ucrChkLineHeightYAxis.SetText("Line Height") - ucrNudLineHeightYAxis.SetParameter(New RParameter("lineheight")) - - ucrChkFaceYAxis.SetText("Face") - ucrInputFaceYAxis.SetParameter(New RParameter("face")) - ucrInputFaceYAxis.SetItems(New Dictionary(Of String, String)(GgplotDefaults.dctFontFace)) - ucrInputFaceYAxis.SetRDefault(Chr(34) & "plain" & Chr(34)) - - ucrChkColourYAxis.SetText("Colour") - ucrInputColourYAxis.SetParameter(New RParameter("colour")) - ucrInputColourYAxis.SetItems(New Dictionary(Of String, String)(GgplotDefaults.dctColour)) - ucrInputColourYAxis.SetRDefault(Chr(34) & "black" & Chr(34)) - - ucrChkFamilyYAxis.SetText("Family") - ucrInputFamilyYAxis.SetParameter(New RParameter("family")) - ucrInputFamilyYAxis.SetItems(New Dictionary(Of String, String)(GgplotDefaults.dctFonts)) - ucrInputFamilyYAxis.SetRDefault(Chr(34) & "Times" & Chr(34)) 'Tick Marks Along-Axes ucrChkSizeTickMarksYAxis.SetText("Size") @@ -217,39 +105,6 @@ Public Class sdgThemes ucrInputLineEndTickLabelsYAxis.SetItems(New Dictionary(Of String, String)(GgplotDefaults.dctLineEnd)) ucrInputLineEndTickLabelsYAxis.SetRDefault(Chr(34) & "square" & Chr(34)) - 'Y axis Label Top Axis - ucrChkSizeRightYAxis.SetText("Size") - ucrNudSizeRightYAxis.SetParameter(New RParameter("size")) - ucrNudSizeRightYAxis.Increment = 0.1 - ucrChkAngleRightYAxis.SetText("Angle") - ucrNudAngleRightYAxis.SetParameter(New RParameter("angle")) - ucrNudAngleRightYAxis.SetMinMax(0, 360) - ucrChkHjustRightYAxis.SetText("Hjust") - ucrNudHjustRightYAxis.SetParameter(New RParameter("hjust")) - ucrNudHjustRightYAxis.Increment = 0.1 - ucrNudHjustRightYAxis.SetMinMax(0, 1) - ucrChkVjustRightYAxis.SetText("Vjust") - ucrNudHjustRightYAxis.SetParameter(New RParameter("vjust")) - ucrNudVjustRightYAxis.Increment = 0.1 - ucrNudVjustRightYAxis.SetMinMax(0, 1) - ucrChkLineHeightRightYAxis.SetText("Line Height") - ucrNudLineHeightRightYAxis.SetParameter(New RParameter("lineheight")) - - ucrChkFaceRightYAxis.SetText("Face") - ucrInputFaceRightYAxis.SetParameter(New RParameter("face")) - ucrInputFaceRightYAxis.SetItems(New Dictionary(Of String, String)(GgplotDefaults.dctFontFace)) - ucrInputFaceRightYAxis.SetRDefault(Chr(34) & "plain" & Chr(34)) - - ucrChkColourRightYAxis.SetText("Colour") - ucrInputColourRightYAxis.SetParameter(New RParameter("colour")) - ucrInputColourRightYAxis.SetItems(New Dictionary(Of String, String)(GgplotDefaults.dctColour)) - ucrInputColourRightYAxis.SetRDefault(Chr(34) & "black" & Chr(34)) - - ucrChkFamilyRightYAxis.SetText("Family") - ucrInputFamilyRightYAxis.SetParameter(New RParameter("family")) - ucrInputFamilyRightYAxis.SetItems(New Dictionary(Of String, String)(GgplotDefaults.dctFonts)) - ucrInputFamilyRightYAxis.SetRDefault(Chr(34) & "Times" & Chr(34)) - 'Tick Marks Along Axes ucrChkSizeTickMarksYAxis.SetText("Size") ucrNudSizeTickMarksYAxis.SetParameter(New RParameter("size")) @@ -280,24 +135,6 @@ Public Class sdgThemes ucrInputTickUnits.SetItems(New Dictionary(Of String, String)(GgplotDefaults.dctFonts)) ucrInputTickUnits.SetRDefault(Chr(34) & "npc" & Chr(34)) - ucrChkSizeYAxis.AddToLinkedControls(ucrNudSizeYAxis, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) - ucrChkHjustYAxis.AddToLinkedControls(ucrNudHjustYAxis, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) - ucrChkVjustYAxis.AddToLinkedControls(ucrNudVjustYAxis, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) - ucrChkLineHeightYAxis.AddToLinkedControls(ucrNudLineHeightYAxis, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) - ucrChkAngleYAxis.AddToLinkedControls(ucrNudAngleYAxis, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) - ucrChkFaceYAxis.AddToLinkedControls(ucrInputFaceYAxis, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) - ucrChkFamilyYAxis.AddToLinkedControls(ucrInputFamilyYAxis, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) - ucrChkColourYAxis.AddToLinkedControls(ucrInputColourYAxis, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) - - ucrChkSizeRightYAxis.AddToLinkedControls(ucrNudSizeRightYAxis, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) - ucrChkHjustRightYAxis.AddToLinkedControls(ucrNudHjustRightYAxis, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) - ucrChkVjustRightYAxis.AddToLinkedControls(ucrNudVjustRightYAxis, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) - ucrChkLineHeightRightYAxis.AddToLinkedControls(ucrNudLineHeightRightYAxis, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) - ucrChkAngleRightYAxis.AddToLinkedControls(ucrNudAngleRightYAxis, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) - ucrChkFaceRightYAxis.AddToLinkedControls(ucrInputFaceRightYAxis, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) - ucrChkFamilyRightYAxis.AddToLinkedControls(ucrInputFamilyRightYAxis, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) - ucrChkColourRightYAxis.AddToLinkedControls(ucrInputColourRightYAxis, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) - ucrChkSizeTickMarksYAxis.AddToLinkedControls(ucrNudSizeTickMarksYAxis, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) ucrChkLineTypeTickMarksYAxis.AddToLinkedControls(ucrInputLineTypeTickMarksYAxis, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) ucrChkLineEndTickMarksYAxis.AddToLinkedControls(ucrInputLineEndTickMarksYAxis, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) @@ -324,51 +161,6 @@ Public Class sdgThemes dctThemeFunctions.TryGetValue("axis.ticks.x", clsElementLine) dctThemeFunctions.TryGetValue("axis.ticks.y", clsElementLine) - 'clsElementXAxisText.SetRCommand("element_text") - 'clsElementXAxisTextTop.SetRCommand("element_text") - 'clsElementXAxisLine.SetRCommand("element_line") - '' clsElementXAxisLineTop.SetRCommand("element_line") - - 'clsElementYAxisText.SetRCommand("element_text") - 'clsElementYAxisTextRight.SetRCommand("element_text") - 'clsElementYAxisLine.SetRCommand("element_line") - '' clsElementXAxisLineTop.SetRCommand("element_line") - - 'clsThemeFunction.AddParameter("axis.ticks", clsRFunctionParameter:=clsElementXAxisLine) - 'clsThemeFunction.AddParameter("axis.ticks.x", clsRFunctionParameter:=clsElementXAxisLine) - 'clsThemeFunction.AddParameter("axis.text.x", clsRFunctionParameter:=clsElementXAxisText) - 'clsThemeFunction.AddParameter("axis.text.x.top", clsRFunctionParameter:=clsElementXAxisTextTop) - - ''clsGgThemes.AddParameter("axis.ticks", clsRFunctionParameter:=clsElementYAxisLine) - 'clsThemeFunction.AddParameter("axis.ticks.y", clsRFunctionParameter:=clsElementYAxisLine) - 'clsThemeFunction.AddParameter("axis.text.y", clsRFunctionParameter:=clsElementYAxisText) - 'clsThemeFunction.AddParameter("axis.text.y.right", clsRFunctionParameter:=clsElementYAxisTextRight) - - 'X axis Label - ucrNudAngle.SetRCode(clsElementText, bReset) - ucrChkAngle.SetRCode(clsElementText, bReset) - - ucrNudHjust.SetRCode(clsElementText, bReset) - ucrChkHjust.SetRCode(clsElementText, bReset) - - ucrNudLineHeight.SetRCode(clsElementText, bReset) - ucrChkLineHeight.SetRCode(clsElementText, bReset) - - ucrNudsize.SetRCode(clsElementText, bReset) - ucrChkSize.SetRCode(clsElementText, bReset) - - ucrNudVjust.SetRCode(clsElementText, bReset) - ucrChkVjust.SetRCode(clsElementText, bReset) - - ucrInputColour.SetRCode(clsElementText, bReset) - ucrChkColour.SetRCode(clsElementText, bReset) - - ucrInputFace.SetRCode(clsElementText, bReset) - ucrChkFace.SetRCode(clsElementText, bReset) - - ucrInputFamily.SetRCode(clsElementText, bReset) - ucrChkFamily.SetRCode(clsElementText, bReset) - 'X axis Label Top Axis ucrNudSizeTickMarks.SetRCode(clsElementXAxisLine, bReset) ucrChkSizeTickMarksXAxis.SetRCode(clsElementXAxisLine, bReset) @@ -382,67 +174,6 @@ Public Class sdgThemes ucrInputLineEndTickMarks.SetRCode(clsElementXAxisLine, bReset) ucrChkLineEndTickMarksXAxis.SetRCode(clsElementXAxisLine, bReset) - ucrNudAngleTopAxis.SetRCode(clsElementXAxisTextTop, bReset) - ucrChkAngleTopXAxis.SetRCode(clsElementXAxisTextTop, bReset) - - ucrNudHjustTopAxis.SetRCode(clsElementXAxisTextTop, bReset) - ucrChkHjustTopXAxis.SetRCode(clsElementXAxisTextTop, bReset) - - ucrNudLineHeightTopAxis.SetRCode(clsElementXAxisTextTop, bReset) - ucrChkLineHeightTopXAxis.SetRCode(clsElementXAxisTextTop, bReset) - - ucrNudSizeTopaxis.SetRCode(clsElementXAxisTextTop, bReset) - ucrChkSizeTopXAxis.SetRCode(clsElementXAxisTextTop, bReset) - - ucrNudVjustTopAxis.SetRCode(clsElementXAxisTextTop, bReset) - ucrChkVjustTopXAxis.SetRCode(clsElementXAxisTextTop, bReset) - - ucrInputColourTopAxis.SetRCode(clsElementXAxisTextTop, bReset) - ucrChkColourTopXAxis.SetRCode(clsElementXAxisTextTop, bReset) - - ucrInputFaceTopAxis.SetRCode(clsElementXAxisTextTop, bReset) - ucrChkFaceTopXAxis.SetRCode(clsElementXAxisTextTop, bReset) - - ucrInputFamilyTopAxis.SetRCode(clsElementXAxisTextTop, bReset) - ucrChkFamilyTopXAxis.SetRCode(clsElementXAxisTextTop, bReset) - - ucrNudSizeTickLabelsXAxis.SetRCode(clsElementXAxisLine, bReset) - ucrChkSizeTickLabelsXAxis.SetRCode(clsElementXAxisLine, bReset) - - ucrInputColourTickLabelsXAxis.SetRCode(clsElementXAxisLine, bReset) - ucrChkColourTickLabelsXAxis.SetRCode(clsElementXAxisLine, bReset) - - ucrInputLineTypeTickLabelsXAxis.SetRCode(clsElementXAxisLine, bReset) - ucrChkLineTypeTickLabelsXAxis.SetRCode(clsElementXAxisLine, bReset) - - ucrInputLineEndTickLabelsXAxis.SetRCode(clsElementXAxisLine, bReset) - ucrChkLineEndTickLabelsXAxis.SetRCode(clsElementXAxisLine, bReset) - - ''Y axis Label - 'ucrNudAngleYAxis.SetRCode(clsElementYAxisText, bReset) - 'ucrChkAngleYAxis.SetRCode(clsElementYAxisText, bReset) - - 'ucrNudHjustYAxis.SetRCode(clsElementYAxisText, bReset) - 'ucrChkHjustYAxis.SetRCode(clsElementYAxisText, bReset) - - 'ucrNudLineHeightYAxis.SetRCode(clsElementYAxisText, bReset) - 'ucrChkLineHeightYAxis.SetRCode(clsElementYAxisText, bReset) - - 'ucrNudSizeYAxis.SetRCode(clsElementYAxisText, bReset) - 'ucrChkSizeYAxis.SetRCode(clsElementYAxisText, bReset) - - 'ucrNudVjustYAxis.SetRCode(clsElementYAxisText, bReset) - 'ucrChkVjustYAxis.SetRCode(clsElementYAxisText, bReset) - - 'ucrInputColourYAxis.SetRCode(clsElementYAxisText, bReset) - 'ucrChkColourYAxis.SetRCode(clsElementYAxisText, bReset) - - 'ucrInputFaceYAxis.SetRCode(clsElementYAxisText, bReset) - 'ucrChkFaceYAxis.SetRCode(clsElementYAxisText, bReset) - - 'ucrInputFamilyYAxis.SetRCode(clsElementYAxisText, bReset) - 'ucrChkFamilyYAxis.SetRCode(clsElementYAxisText, bReset) - 'X axis Label Top Axis ucrNudSizeTickMarksYAxis.SetRCode(clsElementYAxisLine, bReset) ucrChkSizeTickMarksYAxis.SetRCode(clsElementYAxisLine, bReset) @@ -456,29 +187,6 @@ Public Class sdgThemes ucrInputLineEndTickMarksYAxis.SetRCode(clsElementYAxisLine, bReset) ucrChkLineEndTickMarksYAxis.SetRCode(clsElementYAxisLine, bReset) - ucrNudAngleRightYAxis.SetRCode(clsElementYAxisTextRight, bReset) - ucrChkAngleRightYAxis.SetRCode(clsElementYAxisTextRight, bReset) - - ucrNudHjustRightYAxis.SetRCode(clsElementYAxisTextRight, bReset) - ucrChkHjustRightYAxis.SetRCode(clsElementYAxisTextRight, bReset) - - ucrNudLineHeightRightYAxis.SetRCode(clsElementYAxisTextRight, bReset) - ucrChkLineHeightRightYAxis.SetRCode(clsElementYAxisTextRight, bReset) - - ucrNudSizeRightYAxis.SetRCode(clsElementYAxisTextRight, bReset) - ucrChkSizeRightYAxis.SetRCode(clsElementYAxisTextRight, bReset) - - ucrNudVjustRightYAxis.SetRCode(clsElementYAxisTextRight, bReset) - ucrChkVjustRightYAxis.SetRCode(clsElementYAxisTextRight, bReset) - - ucrInputColourRightYAxis.SetRCode(clsElementYAxisTextRight, bReset) - ucrChkColourRightYAxis.SetRCode(clsElementYAxisTextRight, bReset) - - ucrInputFaceRightYAxis.SetRCode(clsElementYAxisTextRight, bReset) - ucrChkFaceRightYAxis.SetRCode(clsElementYAxisTextRight, bReset) - - ucrInputFamilyRightYAxis.SetRCode(clsElementYAxisTextRight, bReset) - ucrChkFamilyRightYAxis.SetRCode(clsElementYAxisTextRight, bReset) ucrNudSizeTickLabelsYAxis.SetRCode(clsElementYAxisLine, bReset) ucrChkSizeTickLabelsYAxis.SetRCode(clsElementYAxisLine, bReset) @@ -492,26 +200,32 @@ Public Class sdgThemes ucrInputLineEndTickLabelsYAxis.SetRCode(clsElementYAxisLine, bReset) ucrChkLineEndTickLabelsYAxis.SetRCode(clsElementYAxisLine, bReset) - AddRemoveElementParameters() - End Sub + ucrThemeBottomXAxis.SetRCodeForControl(dctNewThemeFunctions:=dctThemeFunctions, clsNewThemeFUnction:=clsThemeFunction, clsNewBaseOperator:=clsBaseOperator, clsNewElementText:=clsElementText) + ucrThemeTopXAxis.SetRCodeForControl(dctNewThemeFunctions:=dctThemeFunctions, clsNewThemeFUnction:=clsThemeFunction, clsNewBaseOperator:=clsBaseOperator, clsNewElementText:=clsElementText) + ucrThemeLeftYAxis.SetRCodeForControl(dctNewThemeFunctions:=dctThemeFunctions, clsNewThemeFUnction:=clsThemeFunction, clsNewBaseOperator:=clsBaseOperator, clsNewElementText:=clsElementText) + ucrThemeRightYAxis.SetRCodeForControl(dctNewThemeFunctions:=dctThemeFunctions, clsNewThemeFUnction:=clsThemeFunction, clsNewBaseOperator:=clsBaseOperator, clsNewElementText:=clsElementText) - Private Sub AddRemoveElementParameters() - If ucrChkAngle.Checked OrElse ucrChkHjust.Checked OrElse ucrChkLineHeight.Checked OrElse ucrChkSize.Checked OrElse ucrChkVjust.Checked OrElse ucrChkColour.Checked OrElse ucrChkFace.Checked OrElse ucrChkFamily.Checked Then - clsThemeFunction.AddParameter("axis.text.x", clsRFunctionParameter:=clsElementText) - clsThemeFunction.AddParameter("axis.text.y", clsRFunctionParameter:=clsElementText) - clsThemeFunction.AddParameter("axis.ticks.y", clsRFunctionParameter:=clsElementLine) - clsThemeFunction.AddParameter("axis.ticks.x", clsRFunctionParameter:=clsElementLine) + 'AddRemoveElementParameters() - Else - clsThemeFunction.RemoveParameterByName("axis.text.x") - clsThemeFunction.RemoveParameterByName("axis.text.y") - clsThemeFunction.RemoveParameterByName("axis.ticks.y") - clsThemeFunction.RemoveParameterByName("axis.ticks.x") - End If - AddRemoveTheme() End Sub + 'Private Sub AddRemoveElementParameters() + ' If ucrChkAngle.Checked OrElse ucrChkHjust.Checked OrElse ucrChkLineHeight.Checked OrElse ucrChkSize.Checked OrElse ucrChkVjust.Checked OrElse ucrChkColour.Checked OrElse ucrChkFace.Checked OrElse ucrChkFamily.Checked Then + ' clsThemeFunction.AddParameter("axis.text.x", clsRFunctionParameter:=clsElementText) + ' clsThemeFunction.AddParameter("axis.text.y", clsRFunctionParameter:=clsElementText) + ' clsThemeFunction.AddParameter("axis.ticks.y", clsRFunctionParameter:=clsElementLine) + ' clsThemeFunction.AddParameter("axis.ticks.x", clsRFunctionParameter:=clsElementLine) + + ' Else + ' clsThemeFunction.RemoveParameterByName("axis.text.x") + ' clsThemeFunction.RemoveParameterByName("axis.text.y") + ' clsThemeFunction.RemoveParameterByName("axis.ticks.y") + ' clsThemeFunction.RemoveParameterByName("axis.ticks.x") + ' End If + ' AddRemoveTheme() + 'End Sub + Private Sub AddRemoveTheme() If clsThemeFunction.iParameterCount > 0 Then clsBaseOperator.AddParameter("theme", clsRFunctionParameter:=clsThemeFunction, iPosition:=15) @@ -520,7 +234,4 @@ Public Class sdgThemes End If End Sub - Private Sub ElementXAxisTextControls_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkAngle.ControlValueChanged, ucrChkHjust.ControlValueChanged, ucrChkLineHeight.ControlValueChanged, ucrChkSize.ControlValueChanged, ucrChkVjust.ControlValueChanged, ucrChkColour.ControlValueChanged, ucrChkFace.ControlValueChanged, ucrChkFamily.ControlValueChanged - AddRemoveElementParameters() - End Sub End Class \ No newline at end of file diff --git a/instat/ucrThemeAxes.Designer.vb b/instat/ucrThemeAxes.Designer.vb new file mode 100644 index 00000000000..3a84b81085b --- /dev/null +++ b/instat/ucrThemeAxes.Designer.vb @@ -0,0 +1,251 @@ + _ +Partial Class ucrThemeAxes + Inherits System.Windows.Forms.UserControl + + 'UserControl 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.grpAxisLabels = New System.Windows.Forms.GroupBox() + Me.ucrChkColour = New instat.ucrCheck() + Me.ucrChkFace = New instat.ucrCheck() + Me.ucrChkFamily = New instat.ucrCheck() + Me.ucrChkAngle = New instat.ucrCheck() + Me.ucrChkHjust = New instat.ucrCheck() + Me.ucrChkVjust = New instat.ucrCheck() + Me.ucrChkLineHeight = New instat.ucrCheck() + Me.ucrChkSize = New instat.ucrCheck() + Me.ucrNudVjust = New instat.ucrNud() + Me.ucrNudLineHeight = New instat.ucrNud() + Me.ucrNudAngle = New instat.ucrNud() + Me.ucrNudHjust = New instat.ucrNud() + Me.ucrNudsize = New instat.ucrNud() + Me.ucrInputFace = New instat.ucrInputComboBox() + Me.ucrInputFamily = New instat.ucrInputComboBox() + Me.ucrColors = New instat.ucrColors() + Me.grpAxisLabels.SuspendLayout() + Me.SuspendLayout() + ' + 'grpAxisLabels + ' + Me.grpAxisLabels.Controls.Add(Me.ucrColors) + Me.grpAxisLabels.Controls.Add(Me.ucrChkColour) + Me.grpAxisLabels.Controls.Add(Me.ucrChkFace) + Me.grpAxisLabels.Controls.Add(Me.ucrChkFamily) + Me.grpAxisLabels.Controls.Add(Me.ucrChkAngle) + Me.grpAxisLabels.Controls.Add(Me.ucrChkHjust) + Me.grpAxisLabels.Controls.Add(Me.ucrChkVjust) + Me.grpAxisLabels.Controls.Add(Me.ucrChkLineHeight) + Me.grpAxisLabels.Controls.Add(Me.ucrChkSize) + Me.grpAxisLabels.Controls.Add(Me.ucrNudVjust) + Me.grpAxisLabels.Controls.Add(Me.ucrNudLineHeight) + Me.grpAxisLabels.Controls.Add(Me.ucrNudAngle) + Me.grpAxisLabels.Controls.Add(Me.ucrNudHjust) + Me.grpAxisLabels.Controls.Add(Me.ucrNudsize) + Me.grpAxisLabels.Controls.Add(Me.ucrInputFace) + Me.grpAxisLabels.Controls.Add(Me.ucrInputFamily) + Me.grpAxisLabels.Location = New System.Drawing.Point(12, 10) + Me.grpAxisLabels.Name = "grpAxisLabels" + Me.grpAxisLabels.Size = New System.Drawing.Size(274, 240) + Me.grpAxisLabels.TabIndex = 71 + Me.grpAxisLabels.TabStop = False + Me.grpAxisLabels.Text = "Axis Labels" + ' + 'ucrChkColour + ' + Me.ucrChkColour.Checked = False + Me.ucrChkColour.Location = New System.Drawing.Point(19, 210) + Me.ucrChkColour.Name = "ucrChkColour" + Me.ucrChkColour.Size = New System.Drawing.Size(100, 20) + Me.ucrChkColour.TabIndex = 85 + ' + 'ucrChkFace + ' + Me.ucrChkFace.Checked = False + Me.ucrChkFace.Location = New System.Drawing.Point(19, 183) + Me.ucrChkFace.Name = "ucrChkFace" + Me.ucrChkFace.Size = New System.Drawing.Size(100, 20) + Me.ucrChkFace.TabIndex = 84 + ' + 'ucrChkFamily + ' + Me.ucrChkFamily.Checked = False + Me.ucrChkFamily.Location = New System.Drawing.Point(19, 156) + Me.ucrChkFamily.Name = "ucrChkFamily" + Me.ucrChkFamily.Size = New System.Drawing.Size(100, 20) + Me.ucrChkFamily.TabIndex = 83 + ' + 'ucrChkAngle + ' + Me.ucrChkAngle.Checked = False + Me.ucrChkAngle.Location = New System.Drawing.Point(19, 129) + Me.ucrChkAngle.Name = "ucrChkAngle" + Me.ucrChkAngle.Size = New System.Drawing.Size(100, 20) + Me.ucrChkAngle.TabIndex = 82 + ' + 'ucrChkHjust + ' + Me.ucrChkHjust.Checked = False + Me.ucrChkHjust.Location = New System.Drawing.Point(19, 48) + Me.ucrChkHjust.Name = "ucrChkHjust" + Me.ucrChkHjust.Size = New System.Drawing.Size(100, 20) + Me.ucrChkHjust.TabIndex = 81 + ' + 'ucrChkVjust + ' + Me.ucrChkVjust.Checked = False + Me.ucrChkVjust.Location = New System.Drawing.Point(19, 75) + Me.ucrChkVjust.Name = "ucrChkVjust" + Me.ucrChkVjust.Size = New System.Drawing.Size(100, 20) + Me.ucrChkVjust.TabIndex = 80 + ' + 'ucrChkLineHeight + ' + Me.ucrChkLineHeight.Checked = False + Me.ucrChkLineHeight.Location = New System.Drawing.Point(19, 102) + Me.ucrChkLineHeight.Name = "ucrChkLineHeight" + Me.ucrChkLineHeight.Size = New System.Drawing.Size(96, 18) + Me.ucrChkLineHeight.TabIndex = 79 + ' + 'ucrChkSize + ' + Me.ucrChkSize.Checked = False + Me.ucrChkSize.Location = New System.Drawing.Point(19, 21) + Me.ucrChkSize.Name = "ucrChkSize" + Me.ucrChkSize.Size = New System.Drawing.Size(100, 20) + Me.ucrChkSize.TabIndex = 78 + ' + 'ucrNudVjust + ' + Me.ucrNudVjust.DecimalPlaces = New Decimal(New Integer() {1, 0, 0, 0}) + Me.ucrNudVjust.Increment = New Decimal(New Integer() {1, 0, 0, 65536}) + Me.ucrNudVjust.Location = New System.Drawing.Point(119, 75) + Me.ucrNudVjust.Maximum = New Decimal(New Integer() {1, 0, 0, 0}) + Me.ucrNudVjust.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudVjust.Name = "ucrNudVjust" + Me.ucrNudVjust.Size = New System.Drawing.Size(50, 20) + Me.ucrNudVjust.TabIndex = 77 + Me.ucrNudVjust.Value = New Decimal(New Integer() {0, 0, 0, 0}) + ' + 'ucrNudLineHeight + ' + Me.ucrNudLineHeight.DecimalPlaces = New Decimal(New Integer() {1, 0, 0, 0}) + Me.ucrNudLineHeight.Increment = New Decimal(New Integer() {1, 0, 0, 65536}) + Me.ucrNudLineHeight.Location = New System.Drawing.Point(119, 100) + Me.ucrNudLineHeight.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) + Me.ucrNudLineHeight.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudLineHeight.Name = "ucrNudLineHeight" + Me.ucrNudLineHeight.Size = New System.Drawing.Size(50, 20) + Me.ucrNudLineHeight.TabIndex = 76 + Me.ucrNudLineHeight.Value = New Decimal(New Integer() {0, 0, 0, 0}) + ' + 'ucrNudAngle + ' + Me.ucrNudAngle.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudAngle.Increment = New Decimal(New Integer() {1, 0, 0, 0}) + Me.ucrNudAngle.Location = New System.Drawing.Point(119, 129) + Me.ucrNudAngle.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) + Me.ucrNudAngle.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudAngle.Name = "ucrNudAngle" + Me.ucrNudAngle.Size = New System.Drawing.Size(50, 20) + Me.ucrNudAngle.TabIndex = 75 + Me.ucrNudAngle.Value = New Decimal(New Integer() {0, 0, 0, 0}) + ' + 'ucrNudHjust + ' + Me.ucrNudHjust.DecimalPlaces = New Decimal(New Integer() {1, 0, 0, 0}) + Me.ucrNudHjust.Increment = New Decimal(New Integer() {1, 0, 0, 65536}) + Me.ucrNudHjust.Location = New System.Drawing.Point(119, 48) + Me.ucrNudHjust.Maximum = New Decimal(New Integer() {1, 0, 0, 0}) + Me.ucrNudHjust.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudHjust.Name = "ucrNudHjust" + Me.ucrNudHjust.Size = New System.Drawing.Size(50, 20) + Me.ucrNudHjust.TabIndex = 74 + Me.ucrNudHjust.Value = New Decimal(New Integer() {0, 0, 0, 0}) + ' + 'ucrNudsize + ' + 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(119, 21) + 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" + Me.ucrNudsize.Size = New System.Drawing.Size(50, 20) + Me.ucrNudsize.TabIndex = 73 + Me.ucrNudsize.Value = New Decimal(New Integer() {0, 0, 0, 0}) + ' + 'ucrInputFace + ' + Me.ucrInputFace.AddQuotesIfUnrecognised = True + Me.ucrInputFace.IsReadOnly = False + Me.ucrInputFace.Location = New System.Drawing.Point(119, 182) + Me.ucrInputFace.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) + Me.ucrInputFace.Name = "ucrInputFace" + Me.ucrInputFace.Size = New System.Drawing.Size(137, 21) + Me.ucrInputFace.TabIndex = 71 + ' + 'ucrInputFamily + ' + Me.ucrInputFamily.AddQuotesIfUnrecognised = True + Me.ucrInputFamily.IsReadOnly = False + Me.ucrInputFamily.Location = New System.Drawing.Point(119, 155) + Me.ucrInputFamily.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) + Me.ucrInputFamily.Name = "ucrInputFamily" + Me.ucrInputFamily.Size = New System.Drawing.Size(137, 21) + Me.ucrInputFamily.TabIndex = 70 + ' + 'ucrColors + ' + Me.ucrColors.AddQuotesIfUnrecognised = True + Me.ucrColors.IsReadOnly = False + Me.ucrColors.Location = New System.Drawing.Point(119, 209) + Me.ucrColors.Name = "ucrColors" + Me.ucrColors.Size = New System.Drawing.Size(137, 21) + Me.ucrColors.TabIndex = 86 + ' + 'ucrThemeAxes + ' + Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) + Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.Controls.Add(Me.grpAxisLabels) + Me.Name = "ucrThemeAxes" + Me.Size = New System.Drawing.Size(296, 260) + Me.grpAxisLabels.ResumeLayout(False) + Me.ResumeLayout(False) + + End Sub + Friend WithEvents grpAxisLabels As GroupBox + Friend WithEvents ucrChkFace As ucrCheck + Friend WithEvents ucrChkFamily As ucrCheck + Friend WithEvents ucrChkAngle As ucrCheck + Friend WithEvents ucrChkHjust As ucrCheck + Friend WithEvents ucrChkVjust As ucrCheck + Friend WithEvents ucrChkLineHeight As ucrCheck + Friend WithEvents ucrChkSize As ucrCheck + Friend WithEvents ucrNudVjust As ucrNud + Friend WithEvents ucrNudLineHeight As ucrNud + Friend WithEvents ucrNudAngle As ucrNud + Friend WithEvents ucrNudHjust As ucrNud + Friend WithEvents ucrNudsize As ucrNud + Friend WithEvents ucrInputFace As ucrInputComboBox + Friend WithEvents ucrInputFamily As ucrInputComboBox + Friend WithEvents ucrChkColour As ucrCheck + Friend WithEvents ucrColors As ucrColors +End Class diff --git a/instat/ucrThemeAxes.resx b/instat/ucrThemeAxes.resx new file mode 100644 index 00000000000..29dcb1b3a35 --- /dev/null +++ b/instat/ucrThemeAxes.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/ucrThemeAxes.vb b/instat/ucrThemeAxes.vb new file mode 100644 index 00000000000..54b0802f661 --- /dev/null +++ b/instat/ucrThemeAxes.vb @@ -0,0 +1,171 @@ +' Instat-R +' Copyright (C) 2015 +' +' 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 k +' along with this program. If not, see . + +Public Class ucrThemeAxes + Private bInitialiseControls As Boolean = False + Public bIsX As Boolean + Public bIsBottom As Boolean + Public bIsRight As Boolean + Public strAxis As String + Private clsThemeFunction As New RFunction + Private clsElementText As New RFunction + Private strParameter As String + Private clsBaseOperator As New ROperator + Public Sub InitialiseControl() + ucrChkSize.SetText("Size") + ucrNudsize.SetParameter(New RParameter("size")) + ucrChkAngle.SetText("Angle") + ucrNudAngle.SetParameter(New RParameter("angle")) + ucrNudAngle.SetMinMax(0, 360) + ucrChkHjust.SetText("Hjust") + ucrNudHjust.SetParameter(New RParameter("hjust")) + ucrNudHjust.Increment = 0.1 + ucrNudHjust.SetMinMax(0, 1) + ucrChkVjust.SetText("Vjust") + ucrNudVjust.SetParameter(New RParameter("vjust")) + ucrNudVjust.Increment = 0.1 + ucrNudVjust.SetMinMax(0, 1) + ucrChkLineHeight.SetText("Line Height") + ucrNudLineHeight.SetParameter(New RParameter("lineheight")) + + ucrChkFace.SetText("Face") + ucrInputFace.SetParameter(New RParameter("face")) + ucrInputFace.SetItems(New Dictionary(Of String, String)(GgplotDefaults.dctFontFace)) + ucrInputFace.SetRDefault(Chr(34) & "plain" & Chr(34)) + + ucrChkColour.SetText("Colour") + ucrColors.SetParameter(New RParameter("colour")) + ucrColors.AddQuotesIfUnrecognised = False + ' ucrInputColour.SetItems(New Dictionary(Of String, String)(GgplotDefaults.dctColour)) + 'ucrInputColour.SetRDefault(Chr(34) & "black" & Chr(34)) + + ucrChkFamily.SetText("Family") + ucrInputFamily.SetParameter(New RParameter("family")) + ucrInputFamily.SetItems(New Dictionary(Of String, String)(GgplotDefaults.dctFonts)) + ucrInputFamily.SetRDefault(Chr(34) & "Times" & Chr(34)) + + + 'Linking + ucrChkSize.AddToLinkedControls(ucrNudsize, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) + ucrChkHjust.AddToLinkedControls(ucrNudHjust, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) + ucrChkVjust.AddToLinkedControls(ucrNudVjust, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) + ucrChkLineHeight.AddToLinkedControls(ucrNudLineHeight, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) + ucrChkAngle.AddToLinkedControls(ucrNudAngle, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) + ucrChkFace.AddToLinkedControls(ucrInputFace, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) + ucrChkFamily.AddToLinkedControls(ucrInputFamily, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) + ucrChkColour.AddToLinkedControls(ucrColors, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) + + bInitialiseControls = True + End Sub + + Public Sub SetRCodeForControl(dctNewThemeFunctions As Dictionary(Of String, RFunction), Optional clsNewThemeFUnction As RFunction = Nothing, Optional clsNewElementText As RFunction = Nothing, Optional clsNewBaseOperator As ROperator = Nothing, Optional bReset As Boolean = False) + If Not bInitialiseControls Then + InitialiseControl() + End If + clsBaseOperator = clsNewBaseOperator + clsThemeFunction = clsNewThemeFUnction + clsElementText = clsNewElementText + + 'bIsX = bIsXAxis + 'bIsBottom = bIsBottomXAxis + + 'If bIsXAxis AndAlso bIsBottomXAxis Then + ' bIsX = True + ' bIsBottom = True + ' strAxis = "x-bottom" + 'ElseIf (bIsXAxis AndAlso bIsBottomXAxis = False) Then + ' bIsX = True + ' strAxis = "x-top" + 'ElseIf (bIsXAxis = False AndAlso bIsLeftYAxis = True) Then + ' bIsX = False + ' strAxis = "y-left" + 'ElseIf ((bIsXAxis = False AndAlso bIsLeftYAxis = False)) + ' bIsX = False + ' strAxis = "y-right" + 'End If + + 'If clsThemeFunction IsNot Nothing Then + ' clsThemeFunction.AddParameter("axis.text.x", clsRFunctionParameter:=clsNewElementText) + + 'Else + ' clsThemeFunction = GgplotDefaults.clsDefaultThemeFunction.Clone + 'End If + + + ucrNudAngle.SetRCode(clsElementText, bReset) + ucrChkAngle.SetRCode(clsElementText, bReset) + + ucrNudHjust.SetRCode(clsElementText, bReset) + ucrChkHjust.SetRCode(clsElementText, bReset) + + ucrNudLineHeight.SetRCode(clsElementText, bReset) + ucrChkLineHeight.SetRCode(clsElementText, bReset) + + ucrNudsize.SetRCode(clsElementText, bReset) + ucrChkSize.SetRCode(clsElementText, bReset) + + ucrNudVjust.SetRCode(clsElementText, bReset) + ucrChkVjust.SetRCode(clsElementText, bReset) + + ucrColors.SetRCode(clsElementText, bReset) + ucrChkColour.SetRCode(clsElementText, bReset) + + ucrInputFace.SetRCode(clsElementText, bReset) + ucrChkFace.SetRCode(clsElementText, bReset) + + ucrInputFamily.SetRCode(clsElementText, bReset) + ucrChkFamily.SetRCode(clsElementText, bReset) + + + If strParameter = "axis.text.x" Then + AddRemoveElementBottomXAxis() + End If + + AddRemoveElementLeftYAxis() + End Sub + + + Private Sub AddRemoveElementBottomXAxis() + If ucrChkAngle.Checked OrElse ucrChkHjust.Checked OrElse ucrChkLineHeight.Checked OrElse ucrChkSize.Checked OrElse ucrChkVjust.Checked OrElse ucrChkColour.Checked OrElse ucrChkFace.Checked OrElse ucrChkFamily.Checked Then + clsThemeFunction.AddParameter("axis.text.x", clsRFunctionParameter:=clsElementText) + Else + clsThemeFunction.RemoveParameterByName("axis.text.x") + End If + AddRemoveTheme() + End Sub + + Private Sub AddRemoveElementLeftYAxis() + If ucrChkAngle.Checked OrElse ucrChkHjust.Checked OrElse ucrChkLineHeight.Checked OrElse ucrChkSize.Checked OrElse ucrChkVjust.Checked OrElse ucrChkColour.Checked OrElse ucrChkFace.Checked OrElse ucrChkFamily.Checked Then + clsThemeFunction.AddParameter("axis.text.y", clsRFunctionParameter:=clsElementText) + Else + clsThemeFunction.RemoveParameterByName("axis.text.y") + End If + AddRemoveTheme() + 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 ElementXAxisTextControls_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkAngle.ControlValueChanged, ucrChkHjust.ControlValueChanged, ucrChkLineHeight.ControlValueChanged, ucrChkSize.ControlValueChanged, ucrChkVjust.ControlValueChanged, ucrChkColour.ControlValueChanged, ucrChkFace.ControlValueChanged, ucrChkFamily.ControlValueChanged + AddRemoveElementBottomXAxis() + End Sub + +End Class From bafc7a50ad11811049c613da696ee336395a3f3c Mon Sep 17 00:00:00 2001 From: Danny Parsons Date: Tue, 6 Jun 2017 13:24:22 +0100 Subject: [PATCH 103/154] updated themes controls --- instat/sdgThemes.vb | 26 +++++++++-------- instat/ucrThemeAxes.vb | 66 +++++++++--------------------------------- 2 files changed, 28 insertions(+), 64 deletions(-) diff --git a/instat/sdgThemes.vb b/instat/sdgThemes.vb index c4c7a17ae41..ce53fabfcce 100644 --- a/instat/sdgThemes.vb +++ b/instat/sdgThemes.vb @@ -147,17 +147,23 @@ Public Class sdgThemes End Sub Public Sub SetRCode(clsBaseOperator As ROperator, clsNewThemeFunction As RFunction, dctNewThemeFunctions As Dictionary(Of String, RFunction), Optional bReset As Boolean = False) + Dim clsXElementText As New RFunction + Dim clsYElementText As New RFunction + Dim clsXTopElementText As New RFunction + Dim clsYRightElementText As New RFunction + If Not bControlsInitialised Then InitialiseControls() End If clsThemeFunction = clsNewThemeFunction clsBaseOperator.AddParameter("theme", clsRFunctionParameter:=clsThemeFunction, iPosition:=15) - dctThemeFunctions = dctNewThemeFunctions - dctThemeFunctions.TryGetValue("axis.text.x", clsElementText) - dctThemeFunctions.TryGetValue("axis.text.y", clsElementText) - dctThemeFunctions.TryGetValue("axis.text.y", clsElementText) + dctThemeFunctions.TryGetValue("axis.text.x", clsXElementText) + dctThemeFunctions.TryGetValue("axis.text.y", clsYElementText) + dctThemeFunctions.TryGetValue("axis.text.x.top", clsXTopElementText) + dctThemeFunctions.TryGetValue("axis.text.y.right", clsYRightElementText) + dctThemeFunctions.TryGetValue("axis.ticks.x", clsElementLine) dctThemeFunctions.TryGetValue("axis.ticks.y", clsElementLine) @@ -187,7 +193,6 @@ Public Class sdgThemes ucrInputLineEndTickMarksYAxis.SetRCode(clsElementYAxisLine, bReset) ucrChkLineEndTickMarksYAxis.SetRCode(clsElementYAxisLine, bReset) - ucrNudSizeTickLabelsYAxis.SetRCode(clsElementYAxisLine, bReset) ucrChkSizeTickLabelsYAxis.SetRCode(clsElementYAxisLine, bReset) @@ -200,14 +205,11 @@ Public Class sdgThemes ucrInputLineEndTickLabelsYAxis.SetRCode(clsElementYAxisLine, bReset) ucrChkLineEndTickLabelsYAxis.SetRCode(clsElementYAxisLine, bReset) - - ucrThemeBottomXAxis.SetRCodeForControl(dctNewThemeFunctions:=dctThemeFunctions, clsNewThemeFUnction:=clsThemeFunction, clsNewBaseOperator:=clsBaseOperator, clsNewElementText:=clsElementText) - ucrThemeTopXAxis.SetRCodeForControl(dctNewThemeFunctions:=dctThemeFunctions, clsNewThemeFUnction:=clsThemeFunction, clsNewBaseOperator:=clsBaseOperator, clsNewElementText:=clsElementText) - ucrThemeLeftYAxis.SetRCodeForControl(dctNewThemeFunctions:=dctThemeFunctions, clsNewThemeFUnction:=clsThemeFunction, clsNewBaseOperator:=clsBaseOperator, clsNewElementText:=clsElementText) - ucrThemeRightYAxis.SetRCodeForControl(dctNewThemeFunctions:=dctThemeFunctions, clsNewThemeFUnction:=clsThemeFunction, clsNewBaseOperator:=clsBaseOperator, clsNewElementText:=clsElementText) - + ucrThemeBottomXAxis.SetRCodeForControl("axis.text.x", clsXElementText, clsNewThemeFunction:=clsThemeFunction, clsNewBaseOperator:=clsBaseOperator, bReset:=bReset) + ucrThemeTopXAxis.SetRCodeForControl("axis.text.x.top", clsXTopElementText, clsNewThemeFunction:=clsThemeFunction, clsNewBaseOperator:=clsBaseOperator, bReset:=bReset) + ucrThemeLeftYAxis.SetRCodeForControl("axis.text.y", clsYElementText, clsNewThemeFunction:=clsThemeFunction, clsNewBaseOperator:=clsBaseOperator, bReset:=bReset) + ucrThemeRightYAxis.SetRCodeForControl("axis.text.y.right", clsYRightElementText, clsNewThemeFunction:=clsThemeFunction, clsNewBaseOperator:=clsBaseOperator, bReset:=bReset) 'AddRemoveElementParameters() - End Sub 'Private Sub AddRemoveElementParameters() diff --git a/instat/ucrThemeAxes.vb b/instat/ucrThemeAxes.vb index 54b0802f661..887883f2c77 100644 --- a/instat/ucrThemeAxes.vb +++ b/instat/ucrThemeAxes.vb @@ -16,14 +16,12 @@ Public Class ucrThemeAxes Private bInitialiseControls As Boolean = False - Public bIsX As Boolean - Public bIsBottom As Boolean - Public bIsRight As Boolean Public strAxis As String Private clsThemeFunction As New RFunction Private clsElementText As New RFunction Private strParameter As String Private clsBaseOperator As New ROperator + Public Sub InitialiseControl() ucrChkSize.SetText("Size") ucrNudsize.SetParameter(New RParameter("size")) @@ -71,40 +69,20 @@ Public Class ucrThemeAxes bInitialiseControls = True End Sub - Public Sub SetRCodeForControl(dctNewThemeFunctions As Dictionary(Of String, RFunction), Optional clsNewThemeFUnction As RFunction = Nothing, Optional clsNewElementText As RFunction = Nothing, Optional clsNewBaseOperator As ROperator = Nothing, Optional bReset As Boolean = False) + Public Sub SetAxis(strNewAxis As String) + strAxis = strNewAxis + End Sub + + Public Sub SetRCodeForControl(strNewAxis As String, clsNewElementText As RFunction, clsNewThemeFunction As RFunction, clsNewBaseOperator As ROperator, Optional bReset As Boolean = False) If Not bInitialiseControls Then InitialiseControl() End If + + SetAxis(strNewAxis) clsBaseOperator = clsNewBaseOperator - clsThemeFunction = clsNewThemeFUnction + clsThemeFunction = clsNewThemeFunction clsElementText = clsNewElementText - 'bIsX = bIsXAxis - 'bIsBottom = bIsBottomXAxis - - 'If bIsXAxis AndAlso bIsBottomXAxis Then - ' bIsX = True - ' bIsBottom = True - ' strAxis = "x-bottom" - 'ElseIf (bIsXAxis AndAlso bIsBottomXAxis = False) Then - ' bIsX = True - ' strAxis = "x-top" - 'ElseIf (bIsXAxis = False AndAlso bIsLeftYAxis = True) Then - ' bIsX = False - ' strAxis = "y-left" - 'ElseIf ((bIsXAxis = False AndAlso bIsLeftYAxis = False)) - ' bIsX = False - ' strAxis = "y-right" - 'End If - - 'If clsThemeFunction IsNot Nothing Then - ' clsThemeFunction.AddParameter("axis.text.x", clsRFunctionParameter:=clsNewElementText) - - 'Else - ' clsThemeFunction = GgplotDefaults.clsDefaultThemeFunction.Clone - 'End If - - ucrNudAngle.SetRCode(clsElementText, bReset) ucrChkAngle.SetRCode(clsElementText, bReset) @@ -129,29 +107,14 @@ Public Class ucrThemeAxes ucrInputFamily.SetRCode(clsElementText, bReset) ucrChkFamily.SetRCode(clsElementText, bReset) - - If strParameter = "axis.text.x" Then - AddRemoveElementBottomXAxis() - End If - - AddRemoveElementLeftYAxis() - End Sub - - - Private Sub AddRemoveElementBottomXAxis() - If ucrChkAngle.Checked OrElse ucrChkHjust.Checked OrElse ucrChkLineHeight.Checked OrElse ucrChkSize.Checked OrElse ucrChkVjust.Checked OrElse ucrChkColour.Checked OrElse ucrChkFace.Checked OrElse ucrChkFamily.Checked Then - clsThemeFunction.AddParameter("axis.text.x", clsRFunctionParameter:=clsElementText) - Else - clsThemeFunction.RemoveParameterByName("axis.text.x") - End If - AddRemoveTheme() + AddRemoveElementAxis() End Sub - Private Sub AddRemoveElementLeftYAxis() + Private Sub AddRemoveElementAxis() If ucrChkAngle.Checked OrElse ucrChkHjust.Checked OrElse ucrChkLineHeight.Checked OrElse ucrChkSize.Checked OrElse ucrChkVjust.Checked OrElse ucrChkColour.Checked OrElse ucrChkFace.Checked OrElse ucrChkFamily.Checked Then - clsThemeFunction.AddParameter("axis.text.y", clsRFunctionParameter:=clsElementText) + clsThemeFunction.AddParameter(strAxis, clsRFunctionParameter:=clsElementText) Else - clsThemeFunction.RemoveParameterByName("axis.text.y") + clsThemeFunction.RemoveParameterByName(strAxis) End If AddRemoveTheme() End Sub @@ -165,7 +128,6 @@ Public Class ucrThemeAxes End Sub Private Sub ElementXAxisTextControls_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkAngle.ControlValueChanged, ucrChkHjust.ControlValueChanged, ucrChkLineHeight.ControlValueChanged, ucrChkSize.ControlValueChanged, ucrChkVjust.ControlValueChanged, ucrChkColour.ControlValueChanged, ucrChkFace.ControlValueChanged, ucrChkFamily.ControlValueChanged - AddRemoveElementBottomXAxis() + AddRemoveElementAxis() End Sub - End Class From 1b09fac7053ffe9427bbc495dd73f6a63abe05c4 Mon Sep 17 00:00:00 2001 From: shadrack kibet Date: Tue, 6 Jun 2017 15:37:19 +0300 Subject: [PATCH 104/154] designer and bug fixes --- instat/dlgInsertColumn.Designer.vb | 48 +++++++++++------------------- instat/dlgInsertColumn.vb | 44 +++++++++++++++++---------- 2 files changed, 47 insertions(+), 45 deletions(-) diff --git a/instat/dlgInsertColumn.Designer.vb b/instat/dlgInsertColumn.Designer.vb index c78f01fdd9e..cb359043d1a 100644 --- a/instat/dlgInsertColumn.Designer.vb +++ b/instat/dlgInsertColumn.Designer.vb @@ -41,13 +41,12 @@ Partial Class dlgInsertColumn Me.rdoInsertColumns = New System.Windows.Forms.RadioButton() Me.rdoInsertRows = New System.Windows.Forms.RadioButton() Me.lblInputColumnPrefix = New System.Windows.Forms.Label() + Me.ucrSelectorInsertColumns = New instat.ucrSelectorByDataFrameAddRemove() Me.ucrInputPrefixForNewColumn = New instat.ucrInputTextBox() Me.ucrNudNumberOfColumns = New instat.ucrNud() Me.ucrPnlColumnsOrRows = New instat.UcrPanel() Me.ucrInputDefaultValue = New instat.ucrInputTextBox() - Me.ucrSelectorInsertColumns = New instat.ucrSelectorAddRemove() Me.ucrBase = New instat.ucrButtons() - Me.ucrDataFramesList = New instat.ucrDataFrame() Me.ucrNudNumberOfRows = New instat.ucrNud() Me.ucrNudStartRow = New instat.ucrNud() Me.grpInsert.SuspendLayout() @@ -57,7 +56,7 @@ Partial Class dlgInsertColumn 'lblStartPos ' Me.lblStartPos.AutoSize = True - Me.lblStartPos.Location = New System.Drawing.Point(7, 107) + Me.lblStartPos.Location = New System.Drawing.Point(11, 105) Me.lblStartPos.Name = "lblStartPos" Me.lblStartPos.Size = New System.Drawing.Size(88, 13) Me.lblStartPos.TabIndex = 8 @@ -66,7 +65,7 @@ Partial Class dlgInsertColumn 'lblNumberOfRowsToInsert ' Me.lblNumberOfRowsToInsert.AutoSize = True - Me.lblNumberOfRowsToInsert.Location = New System.Drawing.Point(7, 137) + Me.lblNumberOfRowsToInsert.Location = New System.Drawing.Point(11, 135) Me.lblNumberOfRowsToInsert.Name = "lblNumberOfRowsToInsert" Me.lblNumberOfRowsToInsert.Size = New System.Drawing.Size(130, 13) Me.lblNumberOfRowsToInsert.TabIndex = 10 @@ -258,6 +257,16 @@ Partial Class dlgInsertColumn Me.lblInputColumnPrefix.TabIndex = 16 Me.lblInputColumnPrefix.Text = "Prefix For Inserted Column(s):" ' + 'ucrSelectorInsertColumns + ' + Me.ucrSelectorInsertColumns.bShowHiddenColumns = False + Me.ucrSelectorInsertColumns.bUseCurrentFilter = True + Me.ucrSelectorInsertColumns.Location = New System.Drawing.Point(11, 50) + Me.ucrSelectorInsertColumns.Margin = New System.Windows.Forms.Padding(0) + Me.ucrSelectorInsertColumns.Name = "ucrSelectorInsertColumns" + Me.ucrSelectorInsertColumns.Size = New System.Drawing.Size(210, 180) + Me.ucrSelectorInsertColumns.TabIndex = 7 + ' 'ucrInputPrefixForNewColumn ' Me.ucrInputPrefixForNewColumn.AddQuotesIfUnrecognised = True @@ -297,15 +306,6 @@ Partial Class dlgInsertColumn Me.ucrInputDefaultValue.Size = New System.Drawing.Size(49, 21) Me.ucrInputDefaultValue.TabIndex = 15 ' - 'ucrSelectorInsertColumns - ' - Me.ucrSelectorInsertColumns.bShowHiddenColumns = False - Me.ucrSelectorInsertColumns.Location = New System.Drawing.Point(10, 91) - Me.ucrSelectorInsertColumns.Margin = New System.Windows.Forms.Padding(0) - Me.ucrSelectorInsertColumns.Name = "ucrSelectorInsertColumns" - Me.ucrSelectorInsertColumns.Size = New System.Drawing.Size(202, 139) - Me.ucrSelectorInsertColumns.TabIndex = 6 - ' 'ucrBase ' Me.ucrBase.Location = New System.Drawing.Point(10, 313) @@ -313,20 +313,11 @@ Partial Class dlgInsertColumn Me.ucrBase.Size = New System.Drawing.Size(410, 53) Me.ucrBase.TabIndex = 0 ' - 'ucrDataFramesList - ' - Me.ucrDataFramesList.bUseCurrentFilter = True - Me.ucrDataFramesList.Location = New System.Drawing.Point(10, 46) - Me.ucrDataFramesList.Margin = New System.Windows.Forms.Padding(0) - Me.ucrDataFramesList.Name = "ucrDataFramesList" - Me.ucrDataFramesList.Size = New System.Drawing.Size(127, 41) - Me.ucrDataFramesList.TabIndex = 3 - ' 'ucrNudNumberOfRows ' Me.ucrNudNumberOfRows.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudNumberOfRows.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudNumberOfRows.Location = New System.Drawing.Point(139, 134) + Me.ucrNudNumberOfRows.Location = New System.Drawing.Point(143, 132) Me.ucrNudNumberOfRows.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) Me.ucrNudNumberOfRows.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudNumberOfRows.Name = "ucrNudNumberOfRows" @@ -338,7 +329,7 @@ Partial Class dlgInsertColumn ' Me.ucrNudStartRow.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudStartRow.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudStartRow.Location = New System.Drawing.Point(101, 105) + Me.ucrNudStartRow.Location = New System.Drawing.Point(105, 103) Me.ucrNudStartRow.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) Me.ucrNudStartRow.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudStartRow.Name = "ucrNudStartRow" @@ -350,7 +341,7 @@ Partial Class dlgInsertColumn ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(531, 369) + Me.ClientSize = New System.Drawing.Size(526, 369) Me.Controls.Add(Me.lblInputColumnPrefix) Me.Controls.Add(Me.ucrInputPrefixForNewColumn) Me.Controls.Add(Me.ucrNudNumberOfColumns) @@ -358,17 +349,16 @@ Partial Class dlgInsertColumn Me.Controls.Add(Me.rdoInsertColumns) Me.Controls.Add(Me.ucrPnlColumnsOrRows) Me.Controls.Add(Me.grpOptions) - Me.Controls.Add(Me.ucrSelectorInsertColumns) Me.Controls.Add(Me.ucrInputDefaultValue) Me.Controls.Add(Me.lblDefaultValue) Me.Controls.Add(Me.lblNumberOfColumnsToInsert) Me.Controls.Add(Me.lblStartPos) Me.Controls.Add(Me.lblNumberOfRowsToInsert) Me.Controls.Add(Me.ucrBase) - Me.Controls.Add(Me.ucrDataFramesList) Me.Controls.Add(Me.ucrNudNumberOfRows) Me.Controls.Add(Me.ucrNudStartRow) Me.Controls.Add(Me.grpInsert) + Me.Controls.Add(Me.ucrSelectorInsertColumns) Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow Me.MaximizeBox = False Me.MinimizeBox = False @@ -383,12 +373,9 @@ Partial Class dlgInsertColumn Me.PerformLayout() End Sub - - Friend WithEvents ucrDataFramesList As ucrDataFrame Friend WithEvents lblStartPos As Label Friend WithEvents ucrBase As ucrButtons Friend WithEvents lblNumberOfRowsToInsert As Label - Friend WithEvents ucrSelectorInsertColumns As ucrSelectorAddRemove Friend WithEvents grpInsert As GroupBox Friend WithEvents ucrInputBeforeAfter As ucrInputComboBox Friend WithEvents rdoAtStart As RadioButton @@ -412,4 +399,5 @@ Partial Class dlgInsertColumn Friend WithEvents lblInputColumnPrefix As Label Friend WithEvents ucrInputPrefixForNewColumn As ucrInputTextBox Friend WithEvents lblColumn As Label + Friend WithEvents ucrSelectorInsertColumns As ucrSelectorByDataFrameAddRemove End Class diff --git a/instat/dlgInsertColumn.vb b/instat/dlgInsertColumn.vb index b8cae250894..24009cf64ce 100644 --- a/instat/dlgInsertColumn.vb +++ b/instat/dlgInsertColumn.vb @@ -38,8 +38,8 @@ Public Class dlgInsertColumn Dim dctBeforeAfter As New Dictionary(Of String, String) ucrBase.iHelpTopicID = 164 - ucrDataFramesList.SetParameter(New RParameter("data_name", 0)) - ucrDataFramesList.SetParameterIsString() + ucrSelectorInsertColumns.SetParameter(New RParameter("data_name", 0)) + ucrSelectorInsertColumns.SetParameterIsString() ucrReceiverColumnsToInsert.SetParameter(New RParameter("adjacent_column", 1)) ucrReceiverColumnsToInsert.SetParameterIsString() @@ -66,6 +66,7 @@ Public Class dlgInsertColumn dctBeforeAfter.Add("After", "FALSE") ucrInputBeforeAfter.SetItems(dctBeforeAfter) ucrInputBeforeAfter.SetRDefault("FALSE") + ucrInputBeforeAfter.SetDropDownStyleAsNonEditable() ucrPnlInsertColumns.SetParameter(New RParameter("before", 3)) ucrPnlInsertColumns.AddRadioButton(rdoAtStart, "TRUE") @@ -92,7 +93,6 @@ Public Class dlgInsertColumn ucrPnlInsertColumns.AddParameterPresentCondition(rdoBeforeAfter, "adjacent_column") ucrPnlInsertColumns.SetRDefault("FALSE") - ucrPnlInsertColumns.AddToLinkedControls(ucrSelectorInsertColumns, {rdoBeforeAfter}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) ucrPnlInsertColumns.AddToLinkedControls(ucrInputBeforeAfter, {rdoBeforeAfter}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) ucrPnlInsertColumns.AddToLinkedControls(ucrReceiverColumnsToInsert, {rdoBeforeAfter}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) @@ -114,8 +114,8 @@ Public Class dlgInsertColumn ucrPnlBeforeAfter.SetLinkedDisplayControl(grpOptions) ucrNudNumberOfRows.SetLinkedDisplayControl(lblNumberOfRowsToInsert) ucrNudStartRow.SetLinkedDisplayControl(lblStartPos) - ucrSelectorInsertColumns.SetLinkedDisplayControl(lblColumn) ucrPnlInsertColumns.SetLinkedDisplayControl(grpInsert) + ucrReceiverColumnsToInsert.SetLinkedDisplayControl(lblColumn) End Sub Private Sub SetDefaults() @@ -123,7 +123,6 @@ Public Class dlgInsertColumn clsInsertRowFunction = New RFunction ucrSelectorInsertColumns.Reset() - ucrDataFramesList.Reset() ucrInputBeforeAfter.Reset() ucrInputDefaultValue.Reset() ucrInputPrefixForNewColumn.Reset() @@ -136,25 +135,24 @@ Public Class dlgInsertColumn clsInsertRowFunction.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$insert_row_in_data") clsInsertRowFunction.AddParameter("before", "FALSE") - clsInsertRowFunction.AddParameter("start_row", ucrDataFramesList.iDataFrameLength) - ucrNudStartRow.SetMinMax(1, ucrDataFramesList.iDataFrameLength) + clsInsertRowFunction.AddParameter("start_row", ucrSelectorInsertColumns.ucrAvailableDataFrames.iDataFrameLength) + ucrNudStartRow.SetMinMax(1, ucrSelectorInsertColumns.ucrAvailableDataFrames.iDataFrameLength) ucrBase.clsRsyntax.SetBaseRFunction(clsInsertColumnFunction) End Sub Private Sub ReopenDialog() - ucrDataFramesList.Reset() - ucrNudStartRow.SetMinMax(1, ucrDataFramesList.iDataFrameLength) - If ucrDataFramesList.cboAvailableDataFrames.Text <> "" Then - ucrNudStartRow.Value = ucrDataFramesList.iDataFrameLength + ucrSelectorInsertColumns.Reset() + ucrNudStartRow.SetMinMax(1, ucrSelectorInsertColumns.ucrAvailableDataFrames.iDataFrameLength) + If ucrSelectorInsertColumns.ucrAvailableDataFrames.cboAvailableDataFrames.Text <> "" Then + ucrNudStartRow.Value = ucrSelectorInsertColumns.ucrAvailableDataFrames.iDataFrameLength End If End Sub Private Sub SetRCodeForControls(bReset As Boolean) - ucrDataFramesList.AddAdditionalCodeParameterPair(clsInsertColumnFunction, ucrDataFramesList.GetParameter, iAdditionalPairNo:=1) + ucrSelectorInsertColumns.AddAdditionalCodeParameterPair(clsInsertRowFunction, ucrSelectorInsertColumns.GetParameter, iAdditionalPairNo:=1) ucrNudNumberOfRows.SetRCode(clsInsertRowFunction, bReset) ucrNudStartRow.SetRCode(clsInsertRowFunction, bReset) - ucrDataFramesList.SetRCode(clsInsertRowFunction, bReset) ucrPnlBeforeAfter.SetRCode(clsInsertRowFunction, bReset) ucrNudNumberOfColumns.SetRCode(clsInsertColumnFunction, bReset) @@ -163,6 +161,7 @@ Public Class dlgInsertColumn ucrInputPrefixForNewColumn.SetRCode(clsInsertColumnFunction, bReset) ucrReceiverColumnsToInsert.SetRCode(clsInsertColumnFunction, bReset) + ucrSelectorInsertColumns.SetRCode(clsInsertColumnFunction, bReset) ucrPnlColumnsOrRows.SetRCode(clsInsertColumnFunction, bReset) ucrPnlInsertColumns.SetRCode(clsInsertColumnFunction, bReset) ucrInputBeforeAfter.SetRCode(clsInsertColumnFunction, bReset) @@ -208,11 +207,26 @@ Public Class dlgInsertColumn End If End Sub - Private Sub ucrSelectorInsertColumns_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrDataFramesList.ControlValueChanged - ucrNudStartRow.Value = ucrDataFramesList.iDataFrameLength + Private Sub ucrSelectorInsertColumns_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrSelectorInsertColumns.ControlValueChanged + ucrNudStartRow.SetMinMax(1, ucrSelectorInsertColumns.ucrAvailableDataFrames.iDataFrameLength) + ucrNudStartRow.Value = ucrSelectorInsertColumns.ucrAvailableDataFrames.iDataFrameLength End Sub Private Sub ucrReceiverColumnsToInsert_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrReceiverColumnsToInsert.ControlContentsChanged, ucrPnlColumnsOrRows.ControlContentsChanged, ucrPnlBeforeAfter.ControlContentsChanged, ucrPnlInsertColumns.ControlContentsChanged, ucrInputPrefixForNewColumn.ControlContentsChanged, ucrInputDefaultValue.ControlContentsChanged, ucrInputBeforeAfter.ControlContentsChanged, ucrNudNumberOfRows.ControlContentsChanged, ucrNudStartRow.ControlContentsChanged, ucrNudNumberOfColumns.ControlContentsChanged TestOKEnabled() End Sub + + Private Sub ucrPnlColumnsOrRows_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrPnlColumnsOrRows.ControlValueChanged, ucrPnlInsertColumns.ControlValueChanged + If rdoInsertColumns.Checked Then + ucrBase.clsRsyntax.SetBaseRFunction(clsInsertColumnFunction) + If rdoAtEnd.Checked OrElse rdoAtStart.Checked Then + ucrSelectorInsertColumns.SetVariablesVisible(False) + ElseIf rdoBeforeAfter.Checked + ucrSelectorInsertColumns.SetVariablesVisible(True) + End If + Else + ucrBase.clsRsyntax.SetBaseRFunction(clsInsertRowFunction) + ucrSelectorInsertColumns.SetVariablesVisible(False) + End If + End Sub End Class \ No newline at end of file From 12e05142141d0edc99bd468cda34649e76576e26 Mon Sep 17 00:00:00 2001 From: John Lunalo Date: Tue, 6 Jun 2017 16:05:01 +0300 Subject: [PATCH 105/154] smalll change --- instat/dlgDeleteRowsOrColums.vb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/instat/dlgDeleteRowsOrColums.vb b/instat/dlgDeleteRowsOrColums.vb index bf44dd4399e..a36d7d3715d 100644 --- a/instat/dlgDeleteRowsOrColums.vb +++ b/instat/dlgDeleteRowsOrColums.vb @@ -16,7 +16,7 @@ Imports instat.Translations Public Class dlgDeleteRowsOrColums - Public bFirstLoad As Boolean = True + Private bFirstLoad As Boolean = True Private bReset As Boolean = True Private clsOperatorRowNames As New ROperator Private clsDeleteRows, clsDeleteColumns As RFunction @@ -26,7 +26,6 @@ Public Class dlgDeleteRowsOrColums InitialiseDialog() bFirstLoad = False End If - If bReset Then SetDefaults() End If From ee2fcac0eedd8392294d7c131dc5ca30a974face Mon Sep 17 00:00:00 2001 From: Danny Parsons Date: Tue, 6 Jun 2017 16:01:19 +0100 Subject: [PATCH 106/154] updated layer parameter controls to be core controls --- instat/dlgMetadata.vb | 5 +- instat/ucrCore.vb | 10 ++ instat/ucrLayerParameters.vb | 2 +- instat/ucrLayerParamsControls.Designer.vb | 28 +++-- instat/ucrLayerParamsControls.vb | 107 ++++++------------ .../ucrReceiverMetadataProperty.Designer.vb | 24 ++-- instat/ucrReceiverMetadataProperty.vb | 95 ++++++++-------- 7 files changed, 122 insertions(+), 149 deletions(-) diff --git a/instat/dlgMetadata.vb b/instat/dlgMetadata.vb index f6691877e6c..99ff5c47daa 100644 --- a/instat/dlgMetadata.vb +++ b/instat/dlgMetadata.vb @@ -45,8 +45,7 @@ Public Class dlgMetadata ' Also need to get current values of metadata to set in ucrReceiverMetadataProperty clsLayerParam.strLayerParameterDataType = "list" - ucrNewValue.clsLayerParam = clsLayerParam - ucrNewValue.SetControls() + ucrNewValue.SetControls(clsLayerParam) ucrReceiverChooseProperty.Selector = ucrSelectByMetadata ucrReceiverChooseColumns.Selector = ucrSelectByMetadata ucrReceiverChooseProperty.SetMeAsReceiver() @@ -130,7 +129,7 @@ Public Class dlgMetadata clsLayerParam.lstParameterStrings = strCurrMetadataValues.Distinct.ToArray bListSet = True End If - ucrNewValue.SetControls() + ucrNewValue.SetControls(clsLayerParam) End If If Not bSetCurrentValue Then ucrCurrentValue.SetName("") diff --git a/instat/ucrCore.vb b/instat/ucrCore.vb index 376f752f074..3f09251de17 100644 --- a/instat/ucrCore.vb +++ b/instat/ucrCore.vb @@ -555,4 +555,14 @@ Public Class ucrCore Protected Overridable Sub ResetControlValue() 'TODO implement in specific controls End Sub + + Public Overridable Sub ClearCodeAndParameters() + lstAllRCodes = New List(Of RCodeStructure) + lstAllRParameters = New List(Of RParameter) + UpdateControl() + End Sub + + Public Overridable Sub SetAddRemoveParameter(bNew As Boolean) + bAddRemoveParameter = bNew + End Sub End Class \ No newline at end of file diff --git a/instat/ucrLayerParameters.vb b/instat/ucrLayerParameters.vb index 2729350ba07..ff2d264f509 100644 --- a/instat/ucrLayerParameters.vb +++ b/instat/ucrLayerParameters.vb @@ -60,7 +60,7 @@ Public Class ucrLayerParameters If (i < clsCurrGeom.clsLayerParameters.Count) Then lstLayerParameterControl(i).SetLayerParameter(clsCurrGeom.clsLayerParameters(i)) Else - lstLayerParameterControl(i).SetLayerParameter(Nothing) + lstLayerParameterControl(i).SetControl(Nothing) End If Next End If diff --git a/instat/ucrLayerParamsControls.Designer.vb b/instat/ucrLayerParamsControls.Designer.vb index 4f12076573b..7508595aca3 100644 --- a/instat/ucrLayerParamsControls.Designer.vb +++ b/instat/ucrLayerParamsControls.Designer.vb @@ -1,6 +1,6 @@  Partial Class ucrLayerParamsControls - Inherits System.Windows.Forms.UserControl + Inherits instat.ucrCore 'UserControl overrides dispose to clean up the component list. @@ -22,19 +22,10 @@ Partial Class ucrLayerParamsControls 'Do not modify it using the code editor. Private Sub InitializeComponent() - Me.chkParamName = New System.Windows.Forms.CheckBox() Me.ucrReceiverMetadataProperty = New instat.ucrReceiverMetadataProperty() + Me.ucrChkParamName = New instat.ucrCheck() Me.SuspendLayout() ' - 'chkParamName - ' - Me.chkParamName.AutoSize = True - Me.chkParamName.Location = New System.Drawing.Point(3, 6) - Me.chkParamName.Name = "chkParamName" - Me.chkParamName.Size = New System.Drawing.Size(15, 14) - Me.chkParamName.TabIndex = 0 - Me.chkParamName.UseVisualStyleBackColor = True - ' 'ucrReceiverMetadataProperty ' Me.ucrReceiverMetadataProperty.Location = New System.Drawing.Point(101, 2) @@ -42,19 +33,26 @@ Partial Class ucrLayerParamsControls Me.ucrReceiverMetadataProperty.Size = New System.Drawing.Size(161, 23) Me.ucrReceiverMetadataProperty.TabIndex = 1 ' + 'ucrChkParamName + ' + Me.ucrChkParamName.Checked = False + Me.ucrChkParamName.Dock = System.Windows.Forms.DockStyle.Left + Me.ucrChkParamName.Location = New System.Drawing.Point(0, 0) + Me.ucrChkParamName.Name = "ucrChkParamName" + Me.ucrChkParamName.Size = New System.Drawing.Size(100, 25) + Me.ucrChkParamName.TabIndex = 2 + ' 'ucrLayerParamsControls ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.Controls.Add(Me.ucrChkParamName) Me.Controls.Add(Me.ucrReceiverMetadataProperty) - Me.Controls.Add(Me.chkParamName) Me.Name = "ucrLayerParamsControls" Me.Size = New System.Drawing.Size(265, 25) Me.ResumeLayout(False) - Me.PerformLayout() End Sub - - Friend WithEvents chkParamName As CheckBox Friend WithEvents ucrReceiverMetadataProperty As ucrReceiverMetadataProperty + Friend WithEvents ucrChkParamName As ucrCheck End Class diff --git a/instat/ucrLayerParamsControls.vb b/instat/ucrLayerParamsControls.vb index 795921b565c..02e1e596698 100644 --- a/instat/ucrLayerParamsControls.vb +++ b/instat/ucrLayerParamsControls.vb @@ -1,86 +1,51 @@ - -' Instat-R -' Copyright (C) 2015 -' -' 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 k +' Instat-R +' Copyright (C) 2015 +' +' 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 k ' along with this program. If not, see . -Public Class ucrLayerParamsControls - Public clsGeomFunction As RFunction - Private bEditGeomFunction As Boolean = True 'Warning/question: is there no load sub for this ucr ? We usually avoid to set defaults like this. - Public Event RParameterChanged(ucrControl As ucrLayerParamsControls) - - Private Sub InitialiseControl() +Imports instat - End Sub +Public Class ucrLayerParamsControls + Private bControlsInitialised As Boolean = False - Public Sub SetGeomFunction(clsTempFunction As RFunction) - clsGeomFunction = clsTempFunction - 'RaiseEvent RParameterChanged(Me) 'Warning : this was source of problems... the controls should adapt to the content of clsGeomFunction first, then when controls are changed, clsGeomFunction is changed in turn according to the content of the controls. + Private Sub InitialiseControls() + ucrReceiverMetadataProperty.bAddRemoveParameter = False + ucrChkParamName.AddToLinkedControls(ucrLinked:=ucrReceiverMetadataProperty, objValues:={True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True) ', objNewDefaultState:=1) End Sub - Public Sub SetLayerParameter(clsTempLayerParam As LayerParameter) - 'In the following (a little further), the ucrReceiverMetadateProperty will be setup according to the content of clsGeomFunction. While doing so, we don't want to change the content of clsGeomFunction according to the changes that have been made in the ucrReceiverMetadataProperty. Hence we set bEditGeomFunction to False (see ucrLayerParamsControls_RParameterChanged) - bEditGeomFunction = False - + Public Sub SetControl(clsNewRCode As RCodeStructure, Optional clsNewLayerParam As LayerParameter = Nothing, Optional bReset As Boolean = False) + If Not bControlsInitialised Then + InitialiseControls() + End If 'This sets up the Layer parameter of the current control. First get the right LayerParameter stored in the ucrReceiverMetadataProperty. - ucrReceiverMetadataProperty.clsLayerParam = clsTempLayerParam - 'The following sub sets the right form for the ucrReceiverProperty according to the type, default value and other features of the layer parameter (info from clsLayerParam). - ucrReceiverMetadataProperty.SetControls() + ucrReceiverMetadataProperty.SetControls(clsNewRCode:=clsNewRCode, clsNewLayerParam:=clsNewLayerParam, bReset:=bReset) 'Then the parameter's label, ucrReceiverMP, and value are set if clsLayerParameter is non-empty. Otherwise parameter name chk is hidden - If ucrReceiverMetadataProperty.clsLayerParam IsNot Nothing Then - chkParamName.Visible = True - chkParamName.Text = ucrReceiverMetadataProperty.clsLayerParam.strLayerParameterName - - 'If that parameter has already a value in the clsGeomFunction, it needs to be setup accordingly on the dialog. Otherwise defaults are applied. - If clsGeomFunction.GetParameter(ucrReceiverMetadataProperty.clsLayerParam.strLayerParameterName) Is Nothing Then - ucrReceiverMetadataProperty.SetValue(ucrReceiverMetadataProperty.clsLayerParam.strParameterDefaultValue) - chkParamName.Checked = False - Else - ucrReceiverMetadataProperty.SetValue(clsGeomFunction.GetParameter(ucrReceiverMetadataProperty.clsLayerParam.strLayerParameterName).strArgumentValue) - chkParamName.Checked = True - End If - 'If the parameter is checked, the value it takes should be visible. - ucrReceiverMPVisible() - ucrReceiverMetadataProperty.ctrActive.Visible = chkParamName.Checked + If clsNewLayerParam IsNot Nothing Then + ucrChkParamName.SetText(clsNewLayerParam.strLayerParameterName) + ucrChkParamName.AddParameterPresentCondition(True, clsNewLayerParam.strLayerParameterName) + ucrChkParamName.AddParameterPresentCondition(False, clsNewLayerParam.strLayerParameterName, False) + ucrChkParamName.Visible = True Else - chkParamName.Visible = False - End If - 'At the end of the procedure, bChangeclsGeomFunction is set to true again. - bEditGeomFunction = True - End Sub - - Private Sub ucrReceiverMPVisible() - ucrReceiverMetadataProperty.Visible = chkParamName.Checked - End Sub - Private Sub chkParamName_CheckedChanged(sender As Object, e As EventArgs) Handles chkParamName.CheckedChanged - ucrReceiverMPVisible() - ucrReceiverMetadataProperty.ctrActive.Visible = True - RaiseEvent RParameterChanged(Me) + ucrChkParamName.Visible = False + End If End Sub - Private Sub ucrLayerParamsControls_RParameterChanged(ucrControl As ucrLayerParamsControls) Handles Me.RParameterChanged - 'The clsGeomFunction's parameters are adapted to the content of the ucrMetadateReceiver, unless one of the components has not been populated or unless bEditGeomFunction is False. - If Not IsNothing(ucrReceiverMetadataProperty.clsLayerParam) AndAlso ucrReceiverMetadataProperty.ctrActive IsNot Nothing AndAlso Not IsNothing(clsGeomFunction) AndAlso bEditGeomFunction Then - If chkParamName.Checked AndAlso ucrReceiverMetadataProperty.ctrActive.Text <> "" Then - clsGeomFunction.AddParameter(ucrReceiverMetadataProperty.clsLayerParam.strLayerParameterName, ucrReceiverMetadataProperty.ctrActive.Text) - Else - clsGeomFunction.RemoveParameterByName(ucrReceiverMetadataProperty.clsLayerParam.strLayerParameterName) - End If - End If + Private Sub ucrReceiverMetadataProperty_ControlContentsChanged() Handles ucrReceiverMetadataProperty.ControlContentsChanged, ucrChkParamName.ControlContentsChanged + OnControlContentsChanged() End Sub - Private Sub ucrReceiverMetadataProperty_ControlContentsChanged() Handles ucrReceiverMetadataProperty.ControlContentsChanged - RaiseEvent RParameterChanged(Me) + Private Sub ucrReceiverMetadataProperty_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrReceiverMetadataProperty.ControlValueChanged, ucrChkParamName.ControlValueChanged + OnControlValueChanged() End Sub End Class \ No newline at end of file diff --git a/instat/ucrReceiverMetadataProperty.Designer.vb b/instat/ucrReceiverMetadataProperty.Designer.vb index b2f54eb6232..f12443f56b9 100644 --- a/instat/ucrReceiverMetadataProperty.Designer.vb +++ b/instat/ucrReceiverMetadataProperty.Designer.vb @@ -1,6 +1,6 @@  Partial Class ucrReceiverMetadataProperty - Inherits System.Windows.Forms.UserControl + Inherits instat.ucrCore 'UserControl overrides dispose to clean up the component list. @@ -23,7 +23,7 @@ Partial Class ucrReceiverMetadataProperty Private Sub InitializeComponent() Me.ucrInputTextValue = New instat.ucrInputTextBox() - Me.ucrCboParamValue = New instat.ucrInputComboBox() + Me.ucrInputCboParamValue = New instat.ucrInputComboBox() Me.ucrColor = New instat.ucrColors() Me.ucrNudParamValue = New instat.ucrNud() Me.SuspendLayout() @@ -39,15 +39,15 @@ Partial Class ucrReceiverMetadataProperty Me.ucrInputTextValue.Size = New System.Drawing.Size(140, 22) Me.ucrInputTextValue.TabIndex = 11 ' - 'ucrCboParamValue + 'ucrInputCboParamValue ' - Me.ucrCboParamValue.AddQuotesIfUnrecognised = True - Me.ucrCboParamValue.Dock = System.Windows.Forms.DockStyle.Fill - Me.ucrCboParamValue.IsReadOnly = False - Me.ucrCboParamValue.Location = New System.Drawing.Point(0, 0) - Me.ucrCboParamValue.Name = "ucrCboParamValue" - Me.ucrCboParamValue.Size = New System.Drawing.Size(140, 22) - Me.ucrCboParamValue.TabIndex = 10 + Me.ucrInputCboParamValue.AddQuotesIfUnrecognised = True + Me.ucrInputCboParamValue.Dock = System.Windows.Forms.DockStyle.Fill + Me.ucrInputCboParamValue.IsReadOnly = False + Me.ucrInputCboParamValue.Location = New System.Drawing.Point(0, 0) + Me.ucrInputCboParamValue.Name = "ucrInputCboParamValue" + Me.ucrInputCboParamValue.Size = New System.Drawing.Size(140, 22) + Me.ucrInputCboParamValue.TabIndex = 10 ' 'ucrColor ' @@ -78,7 +78,7 @@ Partial Class ucrReceiverMetadataProperty Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.Controls.Add(Me.ucrNudParamValue) Me.Controls.Add(Me.ucrInputTextValue) - Me.Controls.Add(Me.ucrCboParamValue) + Me.Controls.Add(Me.ucrInputCboParamValue) Me.Controls.Add(Me.ucrColor) Me.Name = "ucrReceiverMetadataProperty" Me.Size = New System.Drawing.Size(140, 22) @@ -86,7 +86,7 @@ Partial Class ucrReceiverMetadataProperty End Sub Friend WithEvents ucrColor As ucrColors - Friend WithEvents ucrCboParamValue As ucrInputComboBox + Friend WithEvents ucrInputCboParamValue As ucrInputComboBox Friend WithEvents ucrInputTextValue As ucrInputTextBox Friend WithEvents ucrNudParamValue As ucrNud End Class diff --git a/instat/ucrReceiverMetadataProperty.vb b/instat/ucrReceiverMetadataProperty.vb index 88950e5f4c8..556eedfe33a 100644 --- a/instat/ucrReceiverMetadataProperty.vb +++ b/instat/ucrReceiverMetadataProperty.vb @@ -1,31 +1,29 @@ - -' Instat-R -' Copyright (C) 2015 -' -' 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 k +' Instat-R +' Copyright (C) 2015 +' +' 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 k ' along with this program. If not, see . +Imports instat + Public Class ucrReceiverMetadataProperty Public clsLayerParam As LayerParameter - Public ctrActive As Control - Public Event ControlContentsChanged() + Public ctrActive As ucrCore - Public Sub SetControls() - 'This sub creates adapts the ucrReceiverMetadataProperty to the type of layer parameter, it's default value, the available values etc, stored within clsLayerParam. - ucrNudParamValue.Visible = False - ucrCboParamValue.Visible = False - ucrColor.Visible = False - ucrInputTextValue.Visible = False + Public Sub SetControls(clsNewRCode As RCodeStructure, Optional clsNewLayerParam As LayerParameter = Nothing, Optional bReset As Boolean = False) + clsLayerParam = clsNewLayerParam + 'This sub adapts the ucrReceiverMetadataProperty to the type of layer parameter, it's default value, the available values etc, stored within clsLayerParam. + ClearCodeAndParameters() If clsLayerParam IsNot Nothing Then If clsLayerParam.strLayerParameterDataType = "numeric" Then If clsLayerParam.lstParameterStrings.Count >= 1 Then @@ -46,49 +44,52 @@ Public Class ucrReceiverMetadataProperty End If ctrActive = ucrNudParamValue ElseIf clsLayerParam.strLayerParameterDataType = "boolean" Then - ctrActive = ucrCboParamValue - ucrCboParamValue.SetItems({"TRUE", "FALSE"}) + ctrActive = ucrInputCboParamValue + ucrInputCboParamValue.SetItems({"TRUE", "FALSE"}) ElseIf clsLayerParam.strLayerParameterDataType = "colour" Then ctrActive = ucrColor ElseIf clsLayerParam.strLayerParameterDataType = "list" Then - ctrActive = ucrCboParamValue + ctrActive = ucrInputCboParamValue If clsLayerParam.lstParameterStrings IsNot Nothing AndAlso clsLayerParam.lstParameterStrings.Count > 0 Then - ucrCboParamValue.SetItems(clsLayerParam.lstParameterStrings) + ucrInputCboParamValue.SetItems(clsLayerParam.lstParameterStrings) Else - ucrCboParamValue.cboInput.Items.Clear() + ucrInputCboParamValue.cboInput.Items.Clear() End If ElseIf clsLayerParam.strLayerParameterDataType = "text" Then ctrActive = ucrInputTextValue Else - ctrActive = New Control 'this should never actually be used but is here to ensure the code is stable even if a developper uses an incorrect datatype + ctrActive = New ucrCore 'this should never actually be used but is here to ensure the code is stable even if a developer uses an incorrect datatype End If ctrActive.Visible = True + ctrActive.SetParameter(New RParameter(clsLayerParam.strLayerParameterName)) + ctrActive.SetRCode(clsNewRCode, bReset) End If End Sub - Private Sub ucrNudParamValue_TextChanged(sender As Object, e As EventArgs) - RaiseEvent ControlContentsChanged() - End Sub - - Private Sub ucrCboParamValue_NameChanged() Handles ucrCboParamValue.NameChanged - RaiseEvent ControlContentsChanged() + Private Sub AllControls_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrColor.ControlContentsChanged, ucrInputCboParamValue.ControlContentsChanged, ucrInputTextValue.ControlContentsChanged, ucrNudParamValue.ControlContentsChanged + OnControlContentsChanged() End Sub - Private Sub ucrColor_NameChanged() Handles ucrColor.NameChanged - RaiseEvent ControlContentsChanged() + Private Sub AllControls_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrColor.ControlValueChanged, ucrInputCboParamValue.ControlValueChanged, ucrInputTextValue.ControlValueChanged, ucrNudParamValue.ControlValueChanged + OnControlValueChanged() End Sub - Private Sub ucrInputTextValue_NameChanged() Handles ucrInputTextValue.NameChanged - RaiseEvent ControlContentsChanged() + Public Overrides Sub ClearCodeAndParameters() + ucrNudParamValue.ClearCodeAndParameters() + ucrInputCboParamValue.ClearCodeAndParameters() + ucrInputTextValue.ClearCodeAndParameters() + ucrColor.ClearCodeAndParameters() + ucrNudParamValue.Visible = False + ucrInputCboParamValue.Visible = False + ucrColor.Visible = False + ucrInputTextValue.Visible = False End Sub - Public Sub SetValue(strValue As String) - If TypeOf (ctrActive) Is NumericUpDown Then - If strValue <> "" Then - ucrNudParamValue.Value = strValue - End If - Else - ctrActive.Text = strValue - End If + Public Overrides Sub SetAddRemoveParameter(bNew As Boolean) + MyBase.SetAddRemoveParameter(bNew) + ucrNudParamValue.SetAddRemoveParameter(bNew) + ucrInputCboParamValue.SetAddRemoveParameter(bNew) + ucrInputTextValue.SetAddRemoveParameter(bNew) + ucrColor.SetAddRemoveParameter(bNew) End Sub End Class \ No newline at end of file From 6c0b34155ad5fa8baee802f8da4a6588f2e211f2 Mon Sep 17 00:00:00 2001 From: Danny Parsons Date: Tue, 6 Jun 2017 17:43:00 +0100 Subject: [PATCH 107/154] update geom control to core control --- instat/UcrGeomListWithAes.vb | 10 ++-- instat/ucrGeom.designer.vb | 35 ++++++------ instat/ucrGeom.vb | 98 +++++++++++++++++++------------- instat/ucrInputComboBox.vb | 12 +++- instat/ucrLayerParameters.vb | 4 +- instat/ucrLayerParamsControls.vb | 2 - 6 files changed, 91 insertions(+), 70 deletions(-) diff --git a/instat/UcrGeomListWithAes.vb b/instat/UcrGeomListWithAes.vb index 631987d4b69..216320c5c09 100644 --- a/instat/UcrGeomListWithAes.vb +++ b/instat/UcrGeomListWithAes.vb @@ -89,12 +89,12 @@ Public Class UcrGeomListWithParameters ucrGeomWithAesSelector.SetDataframe(strDataFrameName, (Not chkApplyOnAllLayers.Checked) OrElse strGlobalDataFrame = "") End If End Sub - Public Overrides Sub Setup(clsTempGgPlot As RFunction, clsTempGeomFunc As RFunction, clsTempGlobalAesFunc As RFunction, Optional bFixAes As Boolean = False, Optional bFixGeom As Boolean = False, Optional strDataframe As String = "", Optional bApplyAesGlobally As Boolean = True, Optional bIgnoreGlobalAes As Boolean = False, Optional iNumVariablesForGeoms As Integer = -1, Optional clsTempLocalAes As RFunction = Nothing) + Public Overrides Sub Setup(clsNewGeomFunc As RFunction, clsNewGlobalAesFunc As RFunction, Optional bFixAes As Boolean = False, Optional bFixGeom As Boolean = False, Optional strDataframe As String = "", Optional bApplyAesGlobally As Boolean = True, Optional iNumVariablesForGeoms As Integer = -1, Optional clsNewLocalAes As RFunction = Nothing) 'See ucrAdditionalLayers and Specific Plots dlg to see how the SetUp Parameters are chosen within the sdgLayerOptions.SetupLayer call. - MyBase.Setup(clsTempGgPlot, clsTempGeomFunc, clsTempGlobalAesFunc, bFixAes, bFixGeom, strDataframe, bApplyAesGlobally, bIgnoreGlobalAes, iNumVariablesForGeoms, clsTempLocalAes) + MyBase.Setup(clsNewGeomFunc, clsNewGlobalAesFunc, bFixAes, bFixGeom, strDataframe, bApplyAesGlobally, iNumVariablesForGeoms, clsNewLocalAes) strGlobalDataFrame = strDataframe - If clsTempLocalAes IsNot Nothing Then - clsGeomAesFunction = clsTempLocalAes + If clsNewLocalAes IsNot Nothing Then + clsGeomAesFunction = clsNewLocalAes Else clsGeomAesFunction = New RFunction clsGeomAesFunction.SetRCommand("aes") @@ -146,7 +146,7 @@ Public Class UcrGeomListWithParameters 'When IgnoreGlobalAes is checked, we don't want the global aesthetics to appear in the receivers. 'Task: print global aesthetics in blue within the receivers and perhaps global aesthetics inherited from another dataframe in red ? If Not chkIgnoreGlobalAes.Checked Then - For Each clsParam In clsGgplotAesFunction.clsParameters + For Each clsParam In clsGlobalAesFunction.clsParameters If clsParam.strArgumentName = lstCurrArguments(i) Then 'For some geoms like LinePlot, when the x or y aes is not filled, ggplot R syntax requires to set x="". This x="" might be copied into the global aes if the ApplyOnAllLayers is set to true for a BoxPlot Layer. This might be copied from the GgplotAesFunction parameters into the aes receivers by error in subsequent layers. If Not ((clsParam.strArgumentName = "x" OrElse clsParam.strArgumentName = "y") AndAlso clsParam.strArgumentValue = Chr(34) & Chr(34)) Then diff --git a/instat/ucrGeom.designer.vb b/instat/ucrGeom.designer.vb index fe5d68ffebe..dbda16b4d36 100644 --- a/instat/ucrGeom.designer.vb +++ b/instat/ucrGeom.designer.vb @@ -1,6 +1,6 @@  _ Partial Class ucrGeom - Inherits System.Windows.Forms.UserControl + Inherits instat.ucrCore 'UserControl overrides dispose to clean up the component list. _ @@ -22,42 +22,41 @@ Partial Class ucrGeom 'Do not modify it using the code editor. _ Private Sub InitializeComponent() - Me.cboGeomList = New System.Windows.Forms.ComboBox() Me.lblTypeofLayer = New System.Windows.Forms.Label() + Me.ucrInputGeoms = New instat.ucrInputComboBox() Me.SuspendLayout() ' - 'cboGeomList - ' - Me.cboGeomList.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.cboGeomList.FormattingEnabled = True - Me.cboGeomList.Location = New System.Drawing.Point(3, 24) - Me.cboGeomList.Name = "cboGeomList" - Me.cboGeomList.Size = New System.Drawing.Size(164, 21) - Me.cboGeomList.TabIndex = 0 - ' 'lblTypeofLayer ' Me.lblTypeofLayer.AutoSize = True Me.lblTypeofLayer.Location = New System.Drawing.Point(4, 4) Me.lblTypeofLayer.Name = "lblTypeofLayer" - Me.lblTypeofLayer.Size = New System.Drawing.Size(109, 13) + Me.lblTypeofLayer.Size = New System.Drawing.Size(112, 13) Me.lblTypeofLayer.TabIndex = 1 - Me.lblTypeofLayer.Text = "Type of Layer(Geom):" + Me.lblTypeofLayer.Text = "Type of Layer (Geom):" Me.lblTypeofLayer.TextAlign = System.Drawing.ContentAlignment.TopCenter ' + 'ucrInputGeoms + ' + Me.ucrInputGeoms.AddQuotesIfUnrecognised = True + Me.ucrInputGeoms.IsReadOnly = False + Me.ucrInputGeoms.Location = New System.Drawing.Point(7, 22) + Me.ucrInputGeoms.Name = "ucrInputGeoms" + Me.ucrInputGeoms.Size = New System.Drawing.Size(151, 21) + Me.ucrInputGeoms.TabIndex = 2 + ' 'ucrGeom ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.Controls.Add(Me.ucrInputGeoms) Me.Controls.Add(Me.lblTypeofLayer) - Me.Controls.Add(Me.cboGeomList) Me.Name = "ucrGeom" - Me.Size = New System.Drawing.Size(182, 50) + Me.Size = New System.Drawing.Size(168, 50) Me.ResumeLayout(False) Me.PerformLayout() End Sub - - Friend WithEvents cboGeomList As ComboBox - Friend WithEvents lblTypeofLayer As Label + Friend WithEvents lblTypeofLayer As Label + Friend WithEvents ucrInputGeoms As ucrInputComboBox End Class diff --git a/instat/ucrGeom.vb b/instat/ucrGeom.vb index 49b9d133976..40ad94ee2bb 100644 --- a/instat/ucrGeom.vb +++ b/instat/ucrGeom.vb @@ -1,5 +1,4 @@ - -' Instat-R +' Instat-R ' Copyright (C) 2015 ' ' This program is free software: you can redistribute it and/or modify @@ -15,19 +14,19 @@ ' You should have received a copy of the GNU General Public License k ' along with this program. If not, see . +Imports instat + Public Class ucrGeom 'Ucr Geom is used to select the geom that will be used for a specific graph/layer. It is used in ucrGeomListWithAes and ucrLayerParameters both ucr's of sdgLayerOptions. 'It stores the definition of the different Geoms, using instances of clsGeom, including their R names, the relevant/available parameters and their description (type of values, values, default, ...). Public lstAllGeoms As New List(Of Geoms) - Public lstGgParameters As New List(Of RParameter) - 'Warning: This is used nowhere ... + 'Public lstGgParameters As New List(Of RParameter) 'Question: lstGgParameters lists of the ggplot parameters ? Let's delete ? Public clsCurrGeom As New Geoms Public clsGeomFunction As New RFunction - Public lstFunctionParameters As New List(Of RParameter) 'Question: clsGeomFunction is the RFunction associated to the clsCurrGeom ? Could it be included in clsCurrGeom, if yes do we wish that ? Used together with clsGgplotAesFunction... ? 'Similarly for lstFunctionParameters. Both, together with clsGgplotAesFunction are supposedly passed through to ucrAdditionalLayers and assigned to smth in ucrAdditionalLayers by calling sdgLayerOption.SetupLayer which calls setup ? Still need to figure out when/how they are used though... - Public clsGgplotAesFunction As New RFunction + Public clsGlobalAesFunction As New RFunction Private bFirstLoad As Boolean = True Public strGlobalDataFrame As String = "" @@ -40,51 +39,66 @@ Public Class ucrGeom CreateGeomList() End Sub + Public Overrides Sub SetRCode(clsNewCodeStructure As RCodeStructure, Optional bReset As Boolean = False) + Dim clsTempFunc As RFunction + Dim iGeomIndex As Integer + + MyBase.SetRCode(clsNewCodeStructure, bReset) + If clsNewCodeStructure IsNot Nothing AndAlso TypeOf (clsNewCodeStructure) Is RFunction Then + clsTempFunc = TryCast(clsNewCodeStructure, RFunction) + If clsTempFunc IsNot Nothing AndAlso clsTempFunc.strRCommand IsNot Nothing Then + iGeomIndex = lstAllGeoms.FindIndex(Function(x) x.strGeomName = clsTempFunc.strRCommand) + If iGeomIndex <> -1 Then + clsCurrGeom = lstAllGeoms(iGeomIndex) + ucrInputGeoms.SetName(clsCurrGeom.strGeomName) + Else + MsgBox("Developer error: Function set for " & Name & " is not a recognised geom.") + End If + Else + MsgBox("Developer error: Code set for " & Name & " is not an RFunction.") + End If + Else + MsgBox("Developer error: Code set for " & Name & " is not an RFunction.") + End If + End Sub + Private Sub UcrGeoms_Load(sender As Object, e As EventArgs) Handles MyBase.Load If bFirstLoad Then InitialiseControl() bFirstLoad = False + ucrInputGeoms.SetDropDownStyleAsNonEditable() End If End Sub Private Sub InitialiseControl() - clsGeomFunction.AddParameter("mapping", clsRFunctionParameter:=clsGgplotAesFunction) + clsGeomFunction.AddParameter("mapping", clsRFunctionParameter:=clsGlobalAesFunction) End Sub - Public Overridable Sub Setup(clsTempGgPlot As RFunction, clsTempGeomFunc As RFunction, clsTempAesFunc As RFunction, Optional bFixAes As Boolean = False, Optional bFixGeom As Boolean = False, Optional strDataframe As String = "", Optional bApplyAesGlobally As Boolean = True, Optional bIgnoreGlobalAes As Boolean = False, Optional iNumVariablesForGeoms As Integer = -1, Optional clsTempLocalAes As RFunction = Nothing) + Public Overridable Sub Setup(clsNewGeomFunc As RFunction, clsNewGlobalAesFunc As RFunction, Optional bFixAes As Boolean = False, Optional bFixGeom As Boolean = False, Optional strDataframe As String = "", Optional bApplyAesGlobally As Boolean = True, Optional iNumVariablesForGeoms As Integer = -1, Optional clsNewLocalAes As RFunction = Nothing) 'Setup is used to setup the parameters of ucrGeom as well as ucrGeomListWithAes and ucrLayerParameters as they override Setup from ucrGeom. The Setup function is also used within sdgLayerOptions.SetupLayer which plays the same role for the whole sdlLayerOption. 'These functions are called all together in the ucrAddLayers when a Layer is added or editted, as well as in specific plots dialogs such as dlgBoxPlot when the plot options sdgPlots (dealing with layers) is opened. Dim GeomCount As New Geoms 'Question to be discussed: Never went back to this... don't understand what's happening... - 'First we clear the content of the displayed list (in cboGeomList) of available geoms as this may change between different setup's according to the parameter iNumVariablesForGeoms (see below). - cboGeomList.Items.Clear() - 'Then we add geom names from our lstAllGeoms to cboGeomList when the number of available variables to associate to geom Aes (iNumVariablesForGeom) is greater or equal to the number of mandatory Aes of that geom. Correct ? + 'First we clear the content of the displayed list (in ucrInputGeoms) of available geoms as this may change between different setup's according to the parameter iNumVariablesForGeoms (see below). + ucrInputGeoms.SetItems() + 'Then we add geom names from our lstAllGeoms to ucrInputGeoms when the number of available variables to associate to geom Aes (iNumVariablesForGeom) is greater or equal to the number of mandatory Aes of that geom. Correct ? For Each GeomCount In lstAllGeoms - If iNumVariablesForGeoms <= GeomCount.iNumMandatoryAes Then - 'Warning: Should this not be greater or equal instead of lower or equal ? But then what would the default value be for iNumVariablesForGeom ? Not -1 !! - cboGeomList.Items.Add(GeomCount.strGeomName) + If iNumVariablesForGeoms = -1 OrElse iNumVariablesForGeoms >= GeomCount.iNumMandatoryAes Then + ucrInputGeoms.AddItems({GeomCount.strGeomName}) End If Next 'Next, the clsGeomFunction is set. Either this one is empty, or it has already been setup on the dialogue that is calling Setup... - SetGeomFunction(clsTempGeomFunc) - 'From the clsGeomFunction, the selected Geom in the cboGeomList is chosen. If clsGeomFunction is Nothing, then the default choice is geom_boxplot. Later, in cboGeomList_SelectedIndexChanged, the clsCurrGeom is chosen to be the selected geom, then the Rcommand of clsGeomFunction will be set according to the choice of clsCurrGeom. Hence the Rcommand sets the clsCurrGeom indirectly, then it is set by the clsCurrGeom. This looks like an inefficient loop, but it does no harm and actually sets clsGeomFunction when it was initially nothing. - If clsGeomFunction.strRCommand = Nothing OrElse cboGeomList.Items.IndexOf(clsGeomFunction.strRCommand) = -1 Then - cboGeomList.SelectedIndex = cboGeomList.Items.IndexOf("geom_boxplot") - Else - cboGeomList.SelectedIndex = cboGeomList.Items.IndexOf(clsGeomFunction.strRCommand) - End If - cboGeomList.Enabled = Not bFixGeom - clsGgplotAesFunction = clsTempAesFunc - clsGgplotAesFunction.SetRCommand("aes") + SetGeomFunction(clsNewGeomFunc) + ucrInputGeoms.Enabled = Not bFixGeom + clsGlobalAesFunction = clsNewGlobalAesFunc End Sub Public Overridable Sub SetGeomFunction(clsTempGeomFunc As RFunction) clsGeomFunction = clsTempGeomFunc + SetRCode(clsGeomFunction) End Sub - - Public Sub CreateGeomList() Dim clsgeom_abline As New Geoms Dim clsgeom_area As New Geoms @@ -1143,21 +1157,25 @@ Public Class ucrGeom lstAllGeoms.Add(clsgeom_vline) End Sub - Public Event GeomChanged(sender As Object, e As EventArgs) - Private Sub cboGeomList_SelectedIndexChanged(sender As Object, e As EventArgs) Handles cboGeomList.SelectedIndexChanged + + Public Event GeomChanged() + + Private Sub ucrInputGeoms_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrInputGeoms.ControlValueChanged Dim clsParam As New LayerParameter Dim iGeomIndex As Integer - 'Here, the clsCurrGeom is chosen according to the selected geom in cboGeomList. Then the Rcommand of the GeomFunction is chosen accordingly. - clsCurrGeom = lstAllGeoms(cboGeomList.SelectedIndex) - 'Erase layer parameters in the clsGeomFunction if geom in GeomFunction is different from CurrGeom... necessary to not have irrelevant parameters staying in the geom function when geom has changed... - iGeomIndex = lstAllGeoms.FindIndex(Function(x) x.strGeomName = clsGeomFunction.strRCommand) - If iGeomIndex <> -1 AndAlso clsGeomFunction.strRCommand <> clsCurrGeom.strGeomName Then - For Each clsParam In lstAllGeoms(iGeomIndex).clsLayerParameters - clsGeomFunction.RemoveParameterByName(clsParam.strLayerParameterName) - Next + Dim iPreviousGeomIndex As Integer + + iGeomIndex = lstAllGeoms.FindIndex(Function(x) x.strGeomName = ucrInputGeoms.GetText()) + iPreviousGeomIndex = lstAllGeoms.FindIndex(Function(x) x.strGeomName = clsGeomFunction.strRCommand) + If iGeomIndex <> -1 Then + clsCurrGeom = lstAllGeoms(iGeomIndex) + If clsGeomFunction.strRCommand <> clsCurrGeom.strGeomName Then + For Each clsParam In lstAllGeoms(iPreviousGeomIndex).clsLayerParameters + clsGeomFunction.RemoveParameterByName(clsParam.strLayerParameterName) + Next + RaiseEvent GeomChanged() + End If + clsGeomFunction.SetRCommand(clsCurrGeom.strGeomName) End If - clsGeomFunction.SetRCommand(clsCurrGeom.strGeomName) - - RaiseEvent GeomChanged(sender, e) End Sub -End Class +End Class \ No newline at end of file diff --git a/instat/ucrInputComboBox.vb b/instat/ucrInputComboBox.vb index fd4bc6ed3fb..0d2d338651b 100644 --- a/instat/ucrInputComboBox.vb +++ b/instat/ucrInputComboBox.vb @@ -130,12 +130,14 @@ Public Class ucrInputComboBox Return cboInput.Text End Function - Public Sub SetItems(strItems As String(), Optional bClearExisting As Boolean = True) + Public Sub SetItems(Optional strItems As String() = Nothing, Optional bClearExisting As Boolean = True) If bClearExisting Then cboInput.Items.Clear() End If - cboInput.Items.AddRange(strItems) - AdjustComboBoxWidth(cboInput) + If strItems IsNot Nothing Then + cboInput.Items.AddRange(strItems) + End If + AdjustComboBoxWidth(cboInput) End Sub Public Sub SetItems(dctItemParameterValuePairs As Dictionary(Of String, String), Optional bClearExisting As Boolean = True) @@ -156,6 +158,10 @@ Public Class ucrInputComboBox AdjustComboBoxWidth(cboInput) End Sub + Public Sub AddItems(strItems As String()) + SetItems(strItems, bClearExisting:=False) + End Sub + Private Sub cboInput_KeyPress(sender As Object, e As KeyPressEventArgs) Handles cboInput.KeyPress bUserTyped = True End Sub diff --git a/instat/ucrLayerParameters.vb b/instat/ucrLayerParameters.vb index ff2d264f509..4f5f0837748 100644 --- a/instat/ucrLayerParameters.vb +++ b/instat/ucrLayerParameters.vb @@ -40,8 +40,8 @@ Public Class ucrLayerParameters Private Sub InitialiseControl() End Sub - Public Overrides Sub Setup(clsTempGgPlot As RFunction, clsTempGeomFunc As RFunction, clsTempAesFunc As RFunction, Optional bFixAes As Boolean = False, Optional bFixGeom As Boolean = False, Optional strDataframe As String = "", Optional bApplyAesGlobally As Boolean = True, Optional bIgnoreGlobalAes As Boolean = False, Optional iNumVariablesForGeoms As Integer = -1, Optional clsTempLocalAes As RFunction = Nothing) - MyBase.Setup(clsTempGgPlot, clsTempGeomFunc, clsTempAesFunc, bFixAes, bFixGeom, strDataframe, bApplyAesGlobally, bIgnoreGlobalAes, iNumVariablesForGeoms, clsTempLocalAes) + Public Overrides Sub Setup(clsNewGeomFunc As RFunction, clsNewGlobalAesFunc As RFunction, Optional bFixAes As Boolean = False, Optional bFixGeom As Boolean = False, Optional strDataframe As String = "", Optional bApplyAesGlobally As Boolean = True, Optional iNumVariablesForGeoms As Integer = -1, Optional clsNewLocalAes As RFunction = Nothing) + MyBase.Setup(clsNewGeomFunc, clsNewGlobalAesFunc, bFixAes, bFixGeom, strDataframe, bApplyAesGlobally, iNumVariablesForGeoms, clsNewLocalAes) SetLayerParameters() End Sub diff --git a/instat/ucrLayerParamsControls.vb b/instat/ucrLayerParamsControls.vb index 02e1e596698..96e3dedd16b 100644 --- a/instat/ucrLayerParamsControls.vb +++ b/instat/ucrLayerParamsControls.vb @@ -28,9 +28,7 @@ Public Class ucrLayerParamsControls If Not bControlsInitialised Then InitialiseControls() End If - 'This sets up the Layer parameter of the current control. First get the right LayerParameter stored in the ucrReceiverMetadataProperty. ucrReceiverMetadataProperty.SetControls(clsNewRCode:=clsNewRCode, clsNewLayerParam:=clsNewLayerParam, bReset:=bReset) - 'Then the parameter's label, ucrReceiverMP, and value are set if clsLayerParameter is non-empty. Otherwise parameter name chk is hidden If clsNewLayerParam IsNot Nothing Then ucrChkParamName.SetText(clsNewLayerParam.strLayerParameterName) ucrChkParamName.AddParameterPresentCondition(True, clsNewLayerParam.strLayerParameterName) From a0abf58837a5106a7aa0c06a0eb29ab0dd3ce28f Mon Sep 17 00:00:00 2001 From: Danny Parsons Date: Tue, 6 Jun 2017 18:37:31 +0100 Subject: [PATCH 108/154] updating all inherited geom controls to be core controls --- instat/UcrGeomListWithAes.vb | 113 +++++++++++++++++------------------ instat/sdgLayerOptions.vb | 14 ++--- instat/ucrGeom.vb | 16 ++++- instat/ucrLayerParameters.vb | 26 +++----- 4 files changed, 84 insertions(+), 85 deletions(-) diff --git a/instat/UcrGeomListWithAes.vb b/instat/UcrGeomListWithAes.vb index 216320c5c09..88d2e988659 100644 --- a/instat/UcrGeomListWithAes.vb +++ b/instat/UcrGeomListWithAes.vb @@ -19,15 +19,13 @@ Imports instat Public Class UcrGeomListWithParameters Public lstAesParameterLabels As New List(Of Label) - Public lstAesParameterUcr As New List(Of ucrReceiverSingle) + Public lstAesParameterReceivers As New List(Of ucrReceiverSingle) 'The two previous fields are the lists of parameter labels and receivers on the ucr. Public lstCurrArguments As New List(Of String) 'lstCurrArguments is the list of aes parameters names of the current geom (ucrGeom.clsCurrGeom), i.e. the list of parameter names of clsGeomAesFunction. Public bFirstLoad As Boolean = True Public ucrLayersControl As ucrLayerParameters - Public bCheckEnabled As Boolean = True Public Event DataFrameChanged() - Public clsGeomAesFunction As RFunction 'clsGeomAesFunction stores the value (aes function) of the local mapping (of this particular layer). It is used as parameter in sdgLayerOptions.clsGeomFunction. Public bAddToLocalAes As Boolean = True Public bCurrentFixAes As Boolean = True @@ -38,13 +36,11 @@ Public Class UcrGeomListWithParameters InitializeComponent() ' Add any initialization after the InitializeComponent() call. - SetSelector() + 'Get the lists of parameter labels and receivers. lstAesParameterLabels.AddRange({lblGgParam1, lblGgParam2, lblGgParam3, lblGgParam4, lblGgParam5, lblGgParam6, lblGgParam7, lblGgParam8, lblGgParam9, lblGgParam10, lblGgParam11, lblGgParam12, lblGgParam13}) - lstAesParameterUcr.AddRange({ucrReceiverParam1, ucrReceiverParam2, ucrReceiverParam3, ucrReceiverParam4, ucrReceiverParam5, ucrReceiverParam6, ucrReceiverParam7, ucrReceiverParam8, ucrReceiverParam9, ucrReceiverParam10, ucrReceiverParam11, ucrReceiverParam12, ucrReceiverParam13}) - 'Set the R command of the local Aes function. - clsGeomAesFunction = New RFunction - clsGeomAesFunction.SetRCommand("aes") + lstAesParameterReceivers.AddRange({ucrReceiverParam1, ucrReceiverParam2, ucrReceiverParam3, ucrReceiverParam4, ucrReceiverParam5, ucrReceiverParam6, ucrReceiverParam7, ucrReceiverParam8, ucrReceiverParam9, ucrReceiverParam10, ucrReceiverParam11, ucrReceiverParam12, ucrReceiverParam13}) + SetSelector() End Sub Private Sub UcrGeomListWithParameters_Load(sender As Object, e As EventArgs) Handles MyBase.Load @@ -59,19 +55,11 @@ Public Class UcrGeomListWithParameters Private Sub SetSelector() 'Link the selector and the receivers - ucrReceiverParam1.Selector = ucrGeomWithAesSelector - ucrReceiverParam2.Selector = ucrGeomWithAesSelector - ucrReceiverParam3.Selector = ucrGeomWithAesSelector - ucrReceiverParam4.Selector = ucrGeomWithAesSelector - ucrReceiverParam5.Selector = ucrGeomWithAesSelector - ucrReceiverParam6.Selector = ucrGeomWithAesSelector - ucrReceiverParam7.Selector = ucrGeomWithAesSelector - ucrReceiverParam8.Selector = ucrGeomWithAesSelector - ucrReceiverParam9.Selector = ucrGeomWithAesSelector - ucrReceiverParam10.Selector = ucrGeomWithAesSelector - ucrReceiverParam11.Selector = ucrGeomWithAesSelector - ucrReceiverParam12.Selector = ucrGeomWithAesSelector - ucrReceiverParam13.Selector = ucrGeomWithAesSelector + For Each ucrTempReceiver In lstAesParameterReceivers + ucrTempReceiver.Selector = ucrGeomWithAesSelector + ucrTempReceiver.SetParameterIsString() + ucrTempReceiver.bWithQuotes = False + Next End Sub Private Sub InitialiseSelectedDataFrame() @@ -89,15 +77,16 @@ Public Class UcrGeomListWithParameters ucrGeomWithAesSelector.SetDataframe(strDataFrameName, (Not chkApplyOnAllLayers.Checked) OrElse strGlobalDataFrame = "") End If End Sub - Public Overrides Sub Setup(clsNewGeomFunc As RFunction, clsNewGlobalAesFunc As RFunction, Optional bFixAes As Boolean = False, Optional bFixGeom As Boolean = False, Optional strDataframe As String = "", Optional bApplyAesGlobally As Boolean = True, Optional iNumVariablesForGeoms As Integer = -1, Optional clsNewLocalAes As RFunction = Nothing) + + Public Overrides Sub Setup(clsNewGeomFunc As RFunction, clsNewGlobalAesFunc As RFunction, Optional bFixGeom As Boolean = False, Optional strDataframe As String = "", Optional bApplyAesGlobally As Boolean = True, Optional iNumVariablesForGeoms As Integer = -1, Optional clsNewLocalAes As RFunction = Nothing, Optional bReset As Boolean = False) 'See ucrAdditionalLayers and Specific Plots dlg to see how the SetUp Parameters are chosen within the sdgLayerOptions.SetupLayer call. - MyBase.Setup(clsNewGeomFunc, clsNewGlobalAesFunc, bFixAes, bFixGeom, strDataframe, bApplyAesGlobally, iNumVariablesForGeoms, clsNewLocalAes) + MyBase.Setup(clsNewGeomFunc, clsNewGlobalAesFunc, bFixGeom, strDataframe, bApplyAesGlobally, iNumVariablesForGeoms, clsNewLocalAes, bReset) strGlobalDataFrame = strDataframe If clsNewLocalAes IsNot Nothing Then - clsGeomAesFunction = clsNewLocalAes + clsLocalAesFunction = clsNewLocalAes Else - clsGeomAesFunction = New RFunction - clsGeomAesFunction.SetRCommand("aes") + clsLocalAesFunction = New RFunction + clsLocalAesFunction.SetRCommand("aes") End If 'ucrGeomWithAesSelector.Reset() 'Warning: Not sure this is necessary anymore... Testing will confirm. @@ -131,7 +120,8 @@ Public Class UcrGeomListWithParameters End If Return bValue End Function - Private Sub SetAes(Optional bFixAes As Boolean = False) + + Private Sub SetAes() 'This function fills in the aesthetic receivers with the appropriate values, starting with the values coming from the global aes (if IgnoreGlobalAes is not chacked) and then in the local aes. Dim bFirstEnabled As Boolean = True Dim iFirstEnabled As Integer = 0 @@ -141,8 +131,7 @@ Public Class UcrGeomListWithParameters 'Clear the potentially up to date content of the Aesthetics receivers. If the content of lstAesParameterUcr(i) is still relevant, then one of the parameters's name in clsGgplotAesFunction will match lstCurrArguments(i) and the value recovered accordingly. 'Warning/Question: when geom is changed, local aes of previous geom are not kept. Is that fine ? Could change the method for layer to remember the previous selection for common aes between the two geoms. 'Warning: the order in which the two following are called counts as clearing only operates when ucr is enabled. Not that this sub will always enable all ucr's that were previously disabled. - lstAesParameterUcr(i).Enabled = True - lstAesParameterUcr(i).Clear() + lstAesParameterReceivers(i).Clear() 'When IgnoreGlobalAes is checked, we don't want the global aesthetics to appear in the receivers. 'Task: print global aesthetics in blue within the receivers and perhaps global aesthetics inherited from another dataframe in red ? If Not chkIgnoreGlobalAes.Checked Then @@ -150,50 +139,51 @@ Public Class UcrGeomListWithParameters If clsParam.strArgumentName = lstCurrArguments(i) Then 'For some geoms like LinePlot, when the x or y aes is not filled, ggplot R syntax requires to set x="". This x="" might be copied into the global aes if the ApplyOnAllLayers is set to true for a BoxPlot Layer. This might be copied from the GgplotAesFunction parameters into the aes receivers by error in subsequent layers. If Not ((clsParam.strArgumentName = "x" OrElse clsParam.strArgumentName = "y") AndAlso clsParam.strArgumentValue = Chr(34) & Chr(34)) Then - lstAesParameterUcr(i).Add(clsParam.strArgumentValue) - lstAesParameterUcr(i).Enabled = Not bFixAes 'Warning/Question/Task: this is not flexible enough. Some of the aesthetics are set in the options. They cannot be editted on the main, however when coming back to options these are fixed and so cannot be editted anywhere anymore. Would need to be able to choose which aesthetics among a Layer should be fixed maybe. + lstAesParameterReceivers(i).Add(clsParam.strArgumentValue) Exit For End If End If Next End If - For Each clsParam In clsGeomAesFunction.clsParameters + For Each clsParam In clsLocalAesFunction.clsParameters If clsParam.strArgumentName = lstCurrArguments(i) Then If Not ((clsParam.strArgumentName = "x" OrElse clsParam.strArgumentName = "y") AndAlso clsParam.strArgumentValue = Chr(34) & Chr(34)) Then 'As before, check that x is not mapped to "" before putting in receivers. - lstAesParameterUcr(i).Add(clsParam.strArgumentValue) - lstAesParameterUcr(i).Enabled = True + lstAesParameterReceivers(i).Add(clsParam.strArgumentValue) + lstAesParameterReceivers(i).Enabled = True Exit For End If End If Next - If bFirstEnabled AndAlso lstAesParameterUcr(i).Enabled Then + If bFirstEnabled AndAlso lstAesParameterReceivers(i).Enabled Then iFirstEnabled = i bFirstEnabled = False End If Next - lstAesParameterUcr(iFirstEnabled).SetMeAsReceiver() + lstAesParameterReceivers(iFirstEnabled).SetMeAsReceiver() bAddToLocalAes = True End Sub Public Sub SetParameters() 'this will set function or aes parameters + Dim iMaxIndex As Integer + Dim i As Integer + Dim strParamName As String - Dim iMaxIndex As Integer = lstAesParameterLabels.Count + iMaxIndex = lstAesParameterLabels.Count 'iMaxIndex will be set as the minimum between the number of aes parameters in the current geom and the number of aesthetics recievers on the dialog. - Dim i As Integer = iMaxIndex 'i is just an index variable for the loops. 'Security check: our current geom has been populated. If clsCurrGeom IsNot Nothing Then 'The following two will be reset as desired. - clsGeomAesFunction.ClearParameters() + clsLocalAesFunction.ClearParameters() lstCurrArguments.Clear() - + ClearReceiversCodeAndParameter() If (clsCurrGeom.clsAesParameters.Count < iMaxIndex) Then 'If the number of aes parameters in the current geom is smaller than the number of receivers, then we hide the exceeding receivers and labels. iMaxIndex = clsCurrGeom.clsAesParameters.Count For i = iMaxIndex To (lstAesParameterLabels.Count - 1) lstAesParameterLabels(i).Visible = False - lstAesParameterUcr(i).Visible = False + lstAesParameterReceivers(i).Visible = False Next ElseIf (clsCurrGeom.clsAesParameters.Count > iMaxIndex) Then 'If the number of parameters in the current geom is greater than the number of receivers, then there is an error. @@ -201,26 +191,28 @@ Public Class UcrGeomListWithParameters End If 'In any case, we show all the receivers that have index lower than the iMaxIndex, and we populate the labels with the appropriate names. - i = 0 For i = 0 To (iMaxIndex - 1) + strParamName = clsCurrGeom.clsAesParameters(i).strAesParameterName lstAesParameterLabels(i).Visible = True - lstAesParameterUcr(i).Visible = True + lstAesParameterReceivers(i).Visible = True - lstAesParameterLabels(i).Text = clsCurrGeom.clsAesParameters(i).strAesParameterName & ":" - lstCurrArguments.Add(clsCurrGeom.clsAesParameters(i).strAesParameterName) - lstAesParameterUcr(i).Clear() + lstAesParameterLabels(i).Text = strParamName & ":" + lstCurrArguments.Add(strParamName) + lstAesParameterReceivers(i).SetParameter(New RParameter(strParamName)) If clsCurrGeom.clsAesParameters(i).bIsMandatory Then lstAesParameterLabels(i).Font = New Font(lstAesParameterLabels(i).Font, FontStyle.Bold) Else lstAesParameterLabels(i).Font = New Font(lstAesParameterLabels(i).Font, FontStyle.Regular) End If If clsCurrGeom.clsAesParameters(i).strIncludedDataTypes IsNot Nothing Then - lstAesParameterUcr(i).SetIncludedDataTypes(clsCurrGeom.clsAesParameters(i).strIncludedDataTypes) - Else lstAesParameterUcr(i).RemoveIncludedMetadataProperty("class") + lstAesParameterReceivers(i).SetIncludedDataTypes(clsCurrGeom.clsAesParameters(i).strIncludedDataTypes) + Else + lstAesParameterReceivers(i).RemoveIncludedMetadataProperty("class") End If If clsCurrGeom.clsAesParameters(i).strExcludedDataTypes IsNot Nothing Then - lstAesParameterUcr(i).SetExcludedDataTypes(clsCurrGeom.clsAesParameters(i).strExcludedDataTypes) - Else lstAesParameterUcr(i).RemoveExcludedMetadataProperty("class") + lstAesParameterReceivers(i).SetExcludedDataTypes(clsCurrGeom.clsAesParameters(i).strExcludedDataTypes) + Else + lstAesParameterReceivers(i).RemoveExcludedMetadataProperty("class") End If Next Else 'If the current geom has not been populated, then an error has been made in the code @@ -229,11 +221,9 @@ Public Class UcrGeomListWithParameters SetAes(bCurrentFixAes) End Sub - Public Sub UcrGeomListWithParameters_cboGeomListIndexChanged(sender As Object, e As EventArgs) Handles Me.GeomChanged - 'this would only work on sdgLayers only - 'sdgLayerOptions.ucrLayerParameter.cboGeomList.SelectedItem = Me.cboGeomList.SelectedItem + Public Sub UcrGeomListWithParameters_cboGeomListIndexChanged() Handles Me.GeomChanged If ucrLayersControl IsNot Nothing Then - ucrLayersControl.cboGeomList.SelectedItem = Me.cboGeomList.SelectedItem + ucrLayersControl.SetGeomName(GetGeomName()) End If SetParameters() End Sub @@ -242,11 +232,11 @@ Public Class UcrGeomListWithParameters Dim iIndex As Integer 'bApplyToLocalAes is used to avoid changing the content of clsGeomAesFunction when the receivers are setup according to the content of clsGeomAesFunction and clsGgplotAesFunction in SetAes(). If bAddToLocalAes Then - iIndex = lstAesParameterUcr.IndexOf(ucrChangedReceiver) + iIndex = lstAesParameterReceivers.IndexOf(ucrChangedReceiver) If Not ucrChangedReceiver.IsEmpty Then - clsGeomAesFunction.AddParameter(lstCurrArguments(iIndex), ucrChangedReceiver.GetVariableNames(False)) + clsLocalAesFunction.AddParameter(lstCurrArguments(iIndex), ucrChangedReceiver.GetVariableNames(False)) ElseIf iIndex < lstCurrArguments.Count Then 'Warning/Task: got an error here. The iIndex was longer than lstCurrArguments when clicking on edit layer. Don't really understand how this is possible. Just added the reality check but might need to put more thoughts into this... - clsGeomAesFunction.RemoveParameterByName(lstCurrArguments(iIndex)) + clsLocalAesFunction.RemoveParameterByName(lstCurrArguments(iIndex)) Else MsgBox("Developer Error: the iIndex (going through lstAesParameterUcr) in ucrReceiverParam_WithMeSelectionChanged is greater than lstAesParameterUcr.count. We beleive that this occurs when editting a layer with fewer aes parameters than there are filled aesthetics parameters in the GlobalAesthetics.", MsgBoxStyle.OkOnly) End If End If @@ -258,7 +248,7 @@ Public Class UcrGeomListWithParameters 'Added a proposal for jointly mandatory situations. For the moment the only case is two jointly mandatory aes.Turns out to be not necessary for geom_point so not used for now. 'If a mandatory aes or two jointly mandatory aes have empty mapping, then not ok, otherwise ok. For i = 0 To (clsCurrGeom.clsAesParameters.Count - 1) - If (lstAesParameterUcr(i).IsEmpty()) AndAlso clsCurrGeom.clsAesParameters(i).bIsMandatory Then + If (lstAesParameterReceivers(i).IsEmpty()) AndAlso clsCurrGeom.clsAesParameters(i).bIsMandatory Then ' If clsCurrGeom.clsAesParameters(i).bIsMandatory Then Return False 'ElseIf clsCurrGeom.clsAesParameters(i).bIsDependentlyMandatory Then @@ -308,4 +298,11 @@ Public Class UcrGeomListWithParameters End If 'Note SetAes will be called automatically if chkIgnoreGlobalAes.checked has been changed. End Sub + + Public Sub ClearReceiversCodeAndParameter() + For Each ucrTempReceiver As ucrReceiverSingle In lstAesParameterReceivers + ucrTempReceiver.ClearCodeAndParameters() + ucrTempReceiver.Clear() + Next + End Sub End Class diff --git a/instat/sdgLayerOptions.vb b/instat/sdgLayerOptions.vb index 71535c96f1b..5602f742942 100644 --- a/instat/sdgLayerOptions.vb +++ b/instat/sdgLayerOptions.vb @@ -79,14 +79,14 @@ Public Class sdgLayerOptions Dim bTempIgnoreGlobalAes As Boolean bTempIgnoreGlobalAes = ((clsGeomFunction.clsParameters.FindIndex(Function(x) x.strArgumentName = "inherit.aes") <> -1) AndAlso (clsGeomFunction.GetParameter("inherit.aes").strArgumentValue = "FALSE")) If clsGeomFunction.strRCommand = "geom_boxplot" OrElse clsGeomFunction.strRCommand = "geom_dotplot" Then - If (clsAesFunction.clsParameters.FindIndex(Function(x) x.strArgumentName = "x") = -1 OrElse bTempIgnoreGlobalAes) AndAlso ucrGeomWithAes.clsGeomAesFunction.clsParameters.FindIndex(Function(x) x.strArgumentName = "x") = -1 Then + If (clsAesFunction.clsParameters.FindIndex(Function(x) x.strArgumentName = "x") = -1 OrElse bTempIgnoreGlobalAes) AndAlso ucrGeomWithAes.clsLocalAesFunction.clsParameters.FindIndex(Function(x) x.strArgumentName = "x") = -1 Then clsRelevantAesFunction.AddParameter("x", Chr(34) & Chr(34)) End If ElseIf clsGeomFunction.strRCommand = "geom_point" OrElse clsGeomFunction.strRCommand = "geom_line" Then - If (clsAesFunction.clsParameters.FindIndex(Function(x) x.strArgumentName = "x") = -1 OrElse bTempIgnoreGlobalAes) AndAlso ucrGeomWithAes.clsGeomAesFunction.clsParameters.FindIndex(Function(x) x.strArgumentName = "x") = -1 Then + If (clsAesFunction.clsParameters.FindIndex(Function(x) x.strArgumentName = "x") = -1 OrElse bTempIgnoreGlobalAes) AndAlso ucrGeomWithAes.clsLocalAesFunction.clsParameters.FindIndex(Function(x) x.strArgumentName = "x") = -1 Then clsRelevantAesFunction.AddParameter("x", Chr(34) & Chr(34)) End If - If (clsAesFunction.clsParameters.FindIndex(Function(x) x.strArgumentName = "y") = -1 OrElse bTempIgnoreGlobalAes) AndAlso ucrGeomWithAes.clsGeomAesFunction.clsParameters.FindIndex(Function(x) x.strArgumentName = "y") = -1 Then + If (clsAesFunction.clsParameters.FindIndex(Function(x) x.strArgumentName = "y") = -1 OrElse bTempIgnoreGlobalAes) AndAlso ucrGeomWithAes.clsLocalAesFunction.clsParameters.FindIndex(Function(x) x.strArgumentName = "y") = -1 Then clsRelevantAesFunction.AddParameter("y", Chr(34) & Chr(34)) End If End If @@ -98,7 +98,7 @@ Public Class sdgLayerOptions 'Two situations: apply on all layers checked or not. Would edit the global or local aes accordingly. If ucrGeomWithAes.chkApplyOnAllLayers.Checked Then 'First, in case the chkApplyOnAllLayers is checked, what is by default understood as local mapping (clsGeomAesFunction) needs to become global mapping: the Aes parameters in clsGeomAesFunction are sent through to clsAesFunction. - For Each clsParam In ucrGeomWithAes.clsGeomAesFunction.clsParameters + For Each clsParam In ucrGeomWithAes.clsLocalAesFunction.clsParameters clsAesFunction.AddParameter(clsParam) 'Warning: This never removes the parameters that have been previously inserted... Next 'Now, we don't want the parameters "mapping" and "data" in the Layer as these will be fixed globally and then inherited. @@ -113,8 +113,8 @@ Public Class sdgLayerOptions strGlobalDataFrame = ucrGeomWithAes.ucrGeomWithAesSelector.ucrAvailableDataFrames.cboAvailableDataFrames.Text ucrGeomWithAes.strGlobalDataFrame = strGlobalDataFrame Else 'Warning: in case the sdgLayerOptions has been called by specific dlg, need to refill the aes on that dlg. Imagine the ApplyOnAllLayers has been unticked ? Problem... Also in order to solve this, would need to know on the specific dialog if it has been unticked or not in order to know how to fill in the aes receivers ! The linking will be restudied anyway. There are many ways to go, see discussion on github. - If ucrGeomWithAes.clsGeomAesFunction.iParameterCount > 0 Then - clsGeomFunction.AddParameter("mapping", clsRFunctionParameter:=ucrGeomWithAes.clsGeomAesFunction.Clone()) + If ucrGeomWithAes.clsLocalAesFunction.iParameterCount > 0 Then + clsGeomFunction.AddParameter("mapping", clsRFunctionParameter:=ucrGeomWithAes.clsLocalAesFunction.Clone()) Else clsGeomFunction.RemoveParameterByName("mapping") End If @@ -144,7 +144,7 @@ Public Class sdgLayerOptions 'Adding stat = identity method If clsGeomFunction.strRCommand = "geom_bar" OrElse clsGeomFunction.strRCommand = "geom_density" OrElse clsGeomFunction.strRCommand = "geom_freqpoly" Then '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 (((clsAesFunction.clsParameters.FindIndex(Function(x) x.strArgumentName = "y") <> -1) AndAlso ((clsGeomFunction.clsParameters.FindIndex(Function(x) x.strArgumentName = "inherit.aes") = -1) OrElse (clsGeomFunction.GetParameter("inherit.aes").strArgumentValue = "TRUE"))) OrElse (ucrGeomWithAes.clsGeomAesFunction.clsParameters.FindIndex(Function(x) x.strArgumentName = "y") <> -1)) AndAlso (clsGeomFunction.clsParameters.FindIndex(Function(x) x.strArgumentName = "stat") = -1) Then + If (((clsAesFunction.clsParameters.FindIndex(Function(x) x.strArgumentName = "y") <> -1) AndAlso ((clsGeomFunction.clsParameters.FindIndex(Function(x) x.strArgumentName = "inherit.aes") = -1) OrElse (clsGeomFunction.GetParameter("inherit.aes").strArgumentValue = "TRUE"))) OrElse (ucrGeomWithAes.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)) 'Task: send a message to the user saying that stat = identity has been added as a parameter in order to avoid error. Can be modified on the LayerParameter tab. 'In case the "y" mapping has been removed after editing the layer, the added "stat" parameter should probably be removed so it is important for the user to know it has been added in automatically, in case he wants to go to the layer parameters tab and remove it. diff --git a/instat/ucrGeom.vb b/instat/ucrGeom.vb index 40ad94ee2bb..991f80646f1 100644 --- a/instat/ucrGeom.vb +++ b/instat/ucrGeom.vb @@ -27,6 +27,7 @@ Public Class ucrGeom 'Question: clsGeomFunction is the RFunction associated to the clsCurrGeom ? Could it be included in clsCurrGeom, if yes do we wish that ? Used together with clsGgplotAesFunction... ? 'Similarly for lstFunctionParameters. Both, together with clsGgplotAesFunction are supposedly passed through to ucrAdditionalLayers and assigned to smth in ucrAdditionalLayers by calling sdgLayerOption.SetupLayer which calls setup ? Still need to figure out when/how they are used though... Public clsGlobalAesFunction As New RFunction + Public clsLocalAesFunction As RFunction Private bFirstLoad As Boolean = True Public strGlobalDataFrame As String = "" @@ -74,7 +75,7 @@ Public Class ucrGeom clsGeomFunction.AddParameter("mapping", clsRFunctionParameter:=clsGlobalAesFunction) End Sub - Public Overridable Sub Setup(clsNewGeomFunc As RFunction, clsNewGlobalAesFunc As RFunction, Optional bFixAes As Boolean = False, Optional bFixGeom As Boolean = False, Optional strDataframe As String = "", Optional bApplyAesGlobally As Boolean = True, Optional iNumVariablesForGeoms As Integer = -1, Optional clsNewLocalAes As RFunction = Nothing) + Public Overridable Sub Setup(clsNewGeomFunc As RFunction, clsNewGlobalAesFunc As RFunction, Optional bFixGeom As Boolean = False, Optional strDataframe As String = "", Optional bApplyAesGlobally As Boolean = True, Optional iNumVariablesForGeoms As Integer = -1, Optional clsNewLocalAes As RFunction = Nothing, Optional bReset As Boolean = False) 'Setup is used to setup the parameters of ucrGeom as well as ucrGeomListWithAes and ucrLayerParameters as they override Setup from ucrGeom. The Setup function is also used within sdgLayerOptions.SetupLayer which plays the same role for the whole sdlLayerOption. 'These functions are called all together in the ucrAddLayers when a Layer is added or editted, as well as in specific plots dialogs such as dlgBoxPlot when the plot options sdgPlots (dealing with layers) is opened. Dim GeomCount As New Geoms @@ -92,11 +93,12 @@ Public Class ucrGeom SetGeomFunction(clsNewGeomFunc) ucrInputGeoms.Enabled = Not bFixGeom clsGlobalAesFunction = clsNewGlobalAesFunc + clsLocalAesFunction = clsNewLocalAes End Sub - Public Overridable Sub SetGeomFunction(clsTempGeomFunc As RFunction) + Public Overridable Sub SetGeomFunction(clsTempGeomFunc As RFunction, Optional bReset As Boolean = False) clsGeomFunction = clsTempGeomFunc - SetRCode(clsGeomFunction) + SetRCode(clsGeomFunction, bReset) End Sub Public Sub CreateGeomList() @@ -1178,4 +1180,12 @@ Public Class ucrGeom clsGeomFunction.SetRCommand(clsCurrGeom.strGeomName) End If End Sub + + Public Sub SetGeomName(strNewGeom As String) + ucrInputGeoms.SetName(strNewGeom) + End Sub + + Public Function GetGeomName() As String + Return ucrInputGeoms.GetText() + End Function End Class \ No newline at end of file diff --git a/instat/ucrLayerParameters.vb b/instat/ucrLayerParameters.vb index 4f5f0837748..e0298209ab6 100644 --- a/instat/ucrLayerParameters.vb +++ b/instat/ucrLayerParameters.vb @@ -40,38 +40,30 @@ Public Class ucrLayerParameters Private Sub InitialiseControl() End Sub - Public Overrides Sub Setup(clsNewGeomFunc As RFunction, clsNewGlobalAesFunc As RFunction, Optional bFixAes As Boolean = False, Optional bFixGeom As Boolean = False, Optional strDataframe As String = "", Optional bApplyAesGlobally As Boolean = True, Optional iNumVariablesForGeoms As Integer = -1, Optional clsNewLocalAes As RFunction = Nothing) - MyBase.Setup(clsNewGeomFunc, clsNewGlobalAesFunc, bFixAes, bFixGeom, strDataframe, bApplyAesGlobally, iNumVariablesForGeoms, clsNewLocalAes) - SetLayerParameters() + Public Overrides Sub Setup(clsNewGeomFunc As RFunction, clsNewGlobalAesFunc As RFunction, Optional bFixGeom As Boolean = False, Optional strDataframe As String = "", Optional bApplyAesGlobally As Boolean = True, Optional iNumVariablesForGeoms As Integer = -1, Optional clsNewLocalAes As RFunction = Nothing, Optional bReset As Boolean = False) + MyBase.Setup(clsNewGeomFunc, clsNewGlobalAesFunc, bFixGeom, strDataframe, bApplyAesGlobally, iNumVariablesForGeoms, clsNewLocalAes, bReset) + SetLayerParameters(bReset) End Sub - Public Overrides Sub SetGeomFunction(clsTempGeomFunc As RFunction) - MyBase.SetGeomFunction(clsTempGeomFunc) - For i = 0 To (lstLayerParameterControl.Count - 1) - lstLayerParameterControl(i).SetGeomFunction(clsGeomFunction) - Next - End Sub - - Public Sub SetLayerParameters() + Public Sub SetLayerParameters(Optional bReset As Boolean = False) Dim i As Integer = 0 'fill the labels and checkboxes If clsCurrGeom IsNot Nothing Then For i = 0 To (lstLayerParameterControl.Count - 1) If (i < clsCurrGeom.clsLayerParameters.Count) Then - lstLayerParameterControl(i).SetLayerParameter(clsCurrGeom.clsLayerParameters(i)) + lstLayerParameterControl(i).SetControl(clsGeomFunction, clsCurrGeom.clsLayerParameters(i), bReset:=bReset) Else - lstLayerParameterControl(i).SetControl(Nothing) + lstLayerParameterControl(i).SetControl(clsGeomFunction, Nothing) End If Next End If End Sub - Public Sub ucrLayerParameters_cboGeomListIndexChanged(sender As Object, e As EventArgs) Handles Me.GeomChanged + Private Sub ucrLayerParameters_GeomChanged() Handles Me.GeomChanged If ucrGeomWithAes IsNot Nothing Then - ucrGeomWithAes.cboGeomList.SelectedItem = Me.cboGeomList.SelectedItem + ucrGeomWithAes.SetGeomName(GetGeomName()) End If - SetLayerParameters() + SetLayerParameters(False) End Sub - End Class From e5a10c45729902b4ea01f069569c8b2eefbe622a Mon Sep 17 00:00:00 2001 From: Stephen Kogo Date: Wed, 7 Jun 2017 09:53:07 +0300 Subject: [PATCH 109/154] edits --- instat/sdgImportFromClimSoft.Designer.vb | 1 - 1 file changed, 1 deletion(-) diff --git a/instat/sdgImportFromClimSoft.Designer.vb b/instat/sdgImportFromClimSoft.Designer.vb index 694ef76e878..16bf481de73 100644 --- a/instat/sdgImportFromClimSoft.Designer.vb +++ b/instat/sdgImportFromClimSoft.Designer.vb @@ -100,7 +100,6 @@ Partial Class sdgImportFromClimSoft Me.ucrInputUserName.Location = New System.Drawing.Point(103, 102) Me.ucrInputUserName.Name = "ucrInputUserName" Me.ucrInputUserName.Size = New System.Drawing.Size(137, 21) - Me.ucrInputUserName.Thttps://github.com/stevekogo/Instat/pull/393/conflict?name=instat%252FsdgImportFromClimSoft.Designer.vb&ancestor_oid=699638e264475760202e9b92515aa8cbf93e16e1&base_oid=b1b3e95ccc54969c96e89f35047659a9c46ba65c&head_oid=f933d5b1aeab0f0f7becc5eedbe5df88c87ebb29abIndex = 7 ' 'lblUserName ' From b7f996007d3a202c739b5f315b7367b29bad1293 Mon Sep 17 00:00:00 2001 From: Steven Date: Wed, 7 Jun 2017 14:50:47 +0300 Subject: [PATCH 110/154] Adding more controls and code for other tabs --- instat/clsGgplotDefaults.vb | 2 +- instat/instat.vbproj | 19 +- instat/sdgThemes.Designer.vb | 1079 +++++++---------- instat/sdgThemes.vb | 215 +--- instat/ucrAxes.vb | 1 + ...r.vb => ucrELementTextControl.Designer.vb} | 82 +- ...meAxes.resx => ucrELementTextControl.resx} | 0 ...rThemeAxes.vb => ucrELementTextControl.vb} | 16 +- instat/ucrElementLineControl.Designer.vb | 148 +++ instat/ucrElementLineControl.resx | 120 ++ instat/ucrElementLineControl.vb | 107 ++ 11 files changed, 937 insertions(+), 852 deletions(-) rename instat/{ucrThemeAxes.Designer.vb => ucrELementTextControl.Designer.vb} (81%) rename instat/{ucrThemeAxes.resx => ucrELementTextControl.resx} (100%) rename instat/{ucrThemeAxes.vb => ucrELementTextControl.vb} (92%) create mode 100644 instat/ucrElementLineControl.Designer.vb create mode 100644 instat/ucrElementLineControl.resx create mode 100644 instat/ucrElementLineControl.vb diff --git a/instat/clsGgplotDefaults.vb b/instat/clsGgplotDefaults.vb index ac8d18a92eb..40089202ee8 100644 --- a/instat/clsGgplotDefaults.vb +++ b/instat/clsGgplotDefaults.vb @@ -110,7 +110,7 @@ dctTemp.Add("axis.title.y.right", clsElementText.Clone()) dctTemp.Add("axis.text", clsElementText.Clone()) dctTemp.Add("axis.text.x", clsElementText.Clone()) - dctTemp.Add(" axis.text.x.top", clsElementText.Clone()) + dctTemp.Add("axis.text.x.top", clsElementText.Clone()) dctTemp.Add("axis.text.y", clsElementText.Clone()) dctTemp.Add("axis.text.y.right", clsElementText.Clone()) dctTemp.Add("axis.ticks", clsElementLine.Clone()) diff --git a/instat/instat.vbproj b/instat/instat.vbproj index 6dc942dfa29..dfb0e360a10 100644 --- a/instat/instat.vbproj +++ b/instat/instat.vbproj @@ -2156,10 +2156,16 @@ UserControl - - ucrThemeAxes.vb + + ucrELementTextControl.vb - + + UserControl + + + ucrElementLineControl.vb + + UserControl @@ -4532,8 +4538,11 @@ ucrSelectorByDataFrameAddRemove.vb - - ucrThemeAxes.vb + + ucrELementTextControl.vb + + + ucrElementLineControl.vb ucrVariablename.vb diff --git a/instat/sdgThemes.Designer.vb b/instat/sdgThemes.Designer.vb index 43215967616..dc4bb295b60 100644 --- a/instat/sdgThemes.Designer.vb +++ b/instat/sdgThemes.Designer.vb @@ -22,684 +22,472 @@ Partial Class sdgThemes 'Do not modify it using the code editor. Private Sub InitializeComponent() - Me.tbXaxis = New System.Windows.Forms.TabControl() - Me.tbAxis = New System.Windows.Forms.TabPage() + Me.ucrBaseSubdialogue = New instat.ucrButtonsSubdialogue() + Me.tbThemeFacets = New System.Windows.Forms.TabPage() + Me.tbThemePanelAndBackground = New System.Windows.Forms.TabPage() + Me.tbThemeLegend = New System.Windows.Forms.TabPage() + Me.tbThemeYaxis = New System.Windows.Forms.TabPage() + Me.GroupBox1 = New System.Windows.Forms.GroupBox() + Me.UcrTickMarksAndLabels1 = New instat.ucrElementLineControl() + Me.ucrYAxisLines = New instat.ucrElementLineControl() + Me.grpYAxisTitle = New System.Windows.Forms.GroupBox() + Me.ucrThemeTitleYRightAxis = New instat.ucrELementTextControl() + Me.ucrThemeTitleYAxis = New instat.ucrELementTextControl() + Me.grpTickMarkLabelsYAxis = New System.Windows.Forms.GroupBox() + Me.ucrThemeYRightAxis = New instat.ucrELementTextControl() + Me.ucrThemeLeftYAxis = New instat.ucrELementTextControl() + Me.grpTickMarkers = New System.Windows.Forms.GroupBox() + Me.ucrTickMarks = New instat.ucrElementLineControl() + Me.ucrTickMarksYAxis = New instat.ucrElementLineControl() + Me.tbThemeXAxis = New System.Windows.Forms.TabPage() Me.grpTableOptions = New System.Windows.Forms.GroupBox() - Me.ucrThemeTopXAxis = New instat.ucrThemeAxes() - Me.ucrThemeBottomXAxis = New instat.ucrThemeAxes() + Me.grpTickMarkLabelsXAxis = New System.Windows.Forms.GroupBox() + Me.ucrThemeTopXAxis = New instat.ucrELementTextControl() + Me.ucrThemeBottomXAxis = New instat.ucrELementTextControl() + Me.grpXAxisTitle = New System.Windows.Forms.GroupBox() + Me.ucrThemeTitleXTopAxis = New instat.ucrELementTextControl() + Me.ucrThemeTitleXAxis = New instat.ucrELementTextControl() + Me.grpXAxisLines = New System.Windows.Forms.GroupBox() + Me.UcrTickMarksAndLabels3 = New instat.ucrElementLineControl() + Me.ucrXAxisLines = New instat.ucrElementLineControl() + Me.GroupBox5 = New System.Windows.Forms.GroupBox() + Me.UcrTickMarksAndLabels5 = New instat.ucrElementLineControl() + Me.ucrTickMarksXAxis = New instat.ucrElementLineControl() + Me.tbLegend = New System.Windows.Forms.TabControl() + Me.tbTitle = New System.Windows.Forms.TabPage() + Me.ucrThemeAxesLines = New instat.ucrElementLineControl() + Me.ucrThemeAxesTickLabels = New instat.ucrELementTextControl() + Me.ucrTickMarksAxes = New instat.ucrElementLineControl() Me.GroupBox2 = New System.Windows.Forms.GroupBox() - Me.UcrCheck1 = New instat.ucrCheck() - Me.UcrCheck2 = New instat.ucrCheck() - Me.UcrCheck3 = New instat.ucrCheck() - Me.UcrCheck4 = New instat.ucrCheck() - Me.UcrInputComboBox1 = New instat.ucrInputComboBox() - Me.UcrNud1 = New instat.ucrNud() - Me.UcrInputComboBox2 = New instat.ucrInputComboBox() - Me.UcrInputComboBox3 = New instat.ucrInputComboBox() - Me.grpTickLabels = New System.Windows.Forms.GroupBox() - Me.ucrChkLineEndTickLabelsXAxis = New instat.ucrCheck() - Me.ucrChkSizeTickLabelsXAxis = New instat.ucrCheck() - Me.ucrChkLineTypeTickLabelsXAxis = New instat.ucrCheck() - Me.ucrChkColourTickLabelsXAxis = New instat.ucrCheck() - Me.ucrInputLineEndTickLabelsXAxis = New instat.ucrInputComboBox() - Me.ucrNudSizeTickLabelsXAxis = New instat.ucrNud() - Me.ucrInputColourTickLabelsXAxis = New instat.ucrInputComboBox() - Me.ucrInputLineTypeTickLabelsXAxis = New instat.ucrInputComboBox() - Me.GroupBox1 = New System.Windows.Forms.GroupBox() Me.ucrInputMargin = New instat.ucrInputTextBox() Me.ucrChkMaigin = New instat.ucrCheck() Me.ucrInputMarginUnits = New instat.ucrInputComboBox() Me.ucrInputUnits = New instat.ucrInputTextBox() - Me.ucrChkLineEndTickMarksXAxis = New instat.ucrCheck() Me.ucrChkUnits = New instat.ucrCheck() Me.ucrInputTickUnits = New instat.ucrInputComboBox() - Me.ucrChkSizeTickMarksXAxis = New instat.ucrCheck() - Me.ucrChkLineTypeTickMarksXAxis = New instat.ucrCheck() - Me.ucrChkColourTickMarksXAxis = New instat.ucrCheck() - Me.ucrInputLineEndTickMarks = New instat.ucrInputComboBox() - Me.ucrNudSizeTickMarks = New instat.ucrNud() - Me.ucrInputColourTickMarks = New instat.ucrInputComboBox() - Me.ucrInputLineTypeTickMarks = New instat.ucrInputComboBox() - Me.tbYaxis = New System.Windows.Forms.TabPage() - Me.ucrThemeRightYAxis = New instat.ucrThemeAxes() - Me.ucrThemeLeftYAxis = New instat.ucrThemeAxes() - Me.grpTickLabelYAxis = New System.Windows.Forms.GroupBox() - Me.ucrChkLineEndTickLabelsYAxis = New instat.ucrCheck() - Me.ucrChkSizeTickLabelsYAxis = New instat.ucrCheck() - Me.ucrChkLineTypeTickLabelsYAxis = New instat.ucrCheck() - Me.ucrChkColourTickLabelsYAxis = New instat.ucrCheck() - Me.ucrInputLineEndTickLabelsYAxis = New instat.ucrInputComboBox() - Me.ucrNudSizeTickLabelsYAxis = New instat.ucrNud() - Me.ucrInputColourTickLabelsYAxis = New instat.ucrInputComboBox() - Me.ucrInputLineTypeTickLabelsYAxis = New instat.ucrInputComboBox() - Me.grpTickMarksYAxis = New System.Windows.Forms.GroupBox() - Me.ucrChkLineEndTickMarksYAxis = New instat.ucrCheck() - Me.ucrChkSizeTickMarksYAxis = New instat.ucrCheck() - Me.ucrChkLineTypeTickMarksYAxis = New instat.ucrCheck() - Me.ucrChkColourTickMarksYAxis = New instat.ucrCheck() - Me.ucrInputLineEndTickMarksYAxis = New instat.ucrInputComboBox() - Me.ucrNudSizeTickMarksYAxis = New instat.ucrNud() - Me.ucrInputColourTickMarksYAxis = New instat.ucrInputComboBox() - Me.ucrInputLineTypeTickMarksYAxis = New instat.ucrInputComboBox() - Me.ucrBaseSubdialogue = New instat.ucrButtonsSubdialogue() - Me.tbXaxis.SuspendLayout() - Me.tbAxis.SuspendLayout() + Me.ucrThemeAxesTitle = New instat.ucrELementTextControl() + Me.tbThemeYaxis.SuspendLayout() + Me.GroupBox1.SuspendLayout() + Me.grpYAxisTitle.SuspendLayout() + Me.grpTickMarkLabelsYAxis.SuspendLayout() + Me.grpTickMarkers.SuspendLayout() + Me.tbThemeXAxis.SuspendLayout() Me.grpTableOptions.SuspendLayout() + Me.grpTickMarkLabelsXAxis.SuspendLayout() + Me.grpXAxisTitle.SuspendLayout() + Me.grpXAxisLines.SuspendLayout() + Me.GroupBox5.SuspendLayout() + Me.tbLegend.SuspendLayout() + Me.tbTitle.SuspendLayout() Me.GroupBox2.SuspendLayout() - Me.grpTickLabels.SuspendLayout() - Me.GroupBox1.SuspendLayout() - Me.tbYaxis.SuspendLayout() - Me.grpTickLabelYAxis.SuspendLayout() - Me.grpTickMarksYAxis.SuspendLayout() Me.SuspendLayout() ' - 'tbXaxis + 'ucrBaseSubdialogue + ' + Me.ucrBaseSubdialogue.Location = New System.Drawing.Point(349, 595) + Me.ucrBaseSubdialogue.Name = "ucrBaseSubdialogue" + Me.ucrBaseSubdialogue.Size = New System.Drawing.Size(142, 30) + Me.ucrBaseSubdialogue.TabIndex = 0 + ' + 'tbThemeFacets + ' + Me.tbThemeFacets.Location = New System.Drawing.Point(4, 22) + Me.tbThemeFacets.Name = "tbThemeFacets" + Me.tbThemeFacets.Size = New System.Drawing.Size(809, 555) + Me.tbThemeFacets.TabIndex = 4 + Me.tbThemeFacets.Text = "Facets" + Me.tbThemeFacets.UseVisualStyleBackColor = True + ' + 'tbThemePanelAndBackground + ' + Me.tbThemePanelAndBackground.Location = New System.Drawing.Point(4, 22) + Me.tbThemePanelAndBackground.Name = "tbThemePanelAndBackground" + Me.tbThemePanelAndBackground.Size = New System.Drawing.Size(809, 555) + Me.tbThemePanelAndBackground.TabIndex = 3 + Me.tbThemePanelAndBackground.Text = "Panel and Background " + Me.tbThemePanelAndBackground.UseVisualStyleBackColor = True + ' + 'tbThemeLegend + ' + Me.tbThemeLegend.Location = New System.Drawing.Point(4, 22) + Me.tbThemeLegend.Name = "tbThemeLegend" + Me.tbThemeLegend.Padding = New System.Windows.Forms.Padding(3) + Me.tbThemeLegend.Size = New System.Drawing.Size(809, 555) + Me.tbThemeLegend.TabIndex = 2 + Me.tbThemeLegend.Text = "Legend" + Me.tbThemeLegend.UseVisualStyleBackColor = True + ' + 'tbThemeYaxis + ' + Me.tbThemeYaxis.Controls.Add(Me.GroupBox1) + Me.tbThemeYaxis.Controls.Add(Me.grpYAxisTitle) + Me.tbThemeYaxis.Controls.Add(Me.grpTickMarkLabelsYAxis) + Me.tbThemeYaxis.Controls.Add(Me.grpTickMarkers) + Me.tbThemeYaxis.Location = New System.Drawing.Point(4, 22) + Me.tbThemeYaxis.Name = "tbThemeYaxis" + Me.tbThemeYaxis.Padding = New System.Windows.Forms.Padding(3) + Me.tbThemeYaxis.Size = New System.Drawing.Size(809, 555) + Me.tbThemeYaxis.TabIndex = 1 + Me.tbThemeYaxis.Text = "Y-axis" + Me.tbThemeYaxis.UseVisualStyleBackColor = True + ' + 'GroupBox1 + ' + Me.GroupBox1.Controls.Add(Me.UcrTickMarksAndLabels1) + Me.GroupBox1.Controls.Add(Me.ucrYAxisLines) + Me.GroupBox1.Location = New System.Drawing.Point(544, 289) + Me.GroupBox1.Name = "GroupBox1" + Me.GroupBox1.Size = New System.Drawing.Size(260, 264) + Me.GroupBox1.TabIndex = 66 + Me.GroupBox1.TabStop = False + Me.GroupBox1.Text = "Line Along Y-Axis" + ' + 'UcrTickMarksAndLabels1 + ' + Me.UcrTickMarksAndLabels1.Location = New System.Drawing.Point(4, 134) + Me.UcrTickMarksAndLabels1.Name = "UcrTickMarksAndLabels1" + Me.UcrTickMarksAndLabels1.Size = New System.Drawing.Size(254, 124) + Me.UcrTickMarksAndLabels1.TabIndex = 64 + ' + 'ucrYAxisLines + ' + Me.ucrYAxisLines.Location = New System.Drawing.Point(4, 12) + Me.ucrYAxisLines.Name = "ucrYAxisLines" + Me.ucrYAxisLines.Size = New System.Drawing.Size(254, 124) + Me.ucrYAxisLines.TabIndex = 63 + ' + 'grpYAxisTitle + ' + Me.grpYAxisTitle.Controls.Add(Me.ucrThemeTitleYRightAxis) + Me.grpYAxisTitle.Controls.Add(Me.ucrThemeTitleYAxis) + Me.grpYAxisTitle.Location = New System.Drawing.Point(4, 23) + Me.grpYAxisTitle.Name = "grpYAxisTitle" + Me.grpYAxisTitle.Size = New System.Drawing.Size(528, 247) + Me.grpYAxisTitle.TabIndex = 67 + Me.grpYAxisTitle.TabStop = False + Me.grpYAxisTitle.Text = "Y-Lab Title" + ' + 'ucrThemeTitleYRightAxis + ' + Me.ucrThemeTitleYRightAxis.Location = New System.Drawing.Point(264, 13) + Me.ucrThemeTitleYRightAxis.Name = "ucrThemeTitleYRightAxis" + Me.ucrThemeTitleYRightAxis.Size = New System.Drawing.Size(262, 227) + Me.ucrThemeTitleYRightAxis.TabIndex = 66 + ' + 'ucrThemeTitleYAxis + ' + Me.ucrThemeTitleYAxis.Location = New System.Drawing.Point(4, 13) + Me.ucrThemeTitleYAxis.Name = "ucrThemeTitleYAxis" + Me.ucrThemeTitleYAxis.Size = New System.Drawing.Size(259, 227) + Me.ucrThemeTitleYAxis.TabIndex = 65 + ' + 'grpTickMarkLabelsYAxis + ' + Me.grpTickMarkLabelsYAxis.Controls.Add(Me.ucrThemeYRightAxis) + Me.grpTickMarkLabelsYAxis.Controls.Add(Me.ucrThemeLeftYAxis) + Me.grpTickMarkLabelsYAxis.Location = New System.Drawing.Point(4, 289) + Me.grpTickMarkLabelsYAxis.Name = "grpTickMarkLabelsYAxis" + Me.grpTickMarkLabelsYAxis.Size = New System.Drawing.Size(528, 243) + Me.grpTickMarkLabelsYAxis.TabIndex = 66 + Me.grpTickMarkLabelsYAxis.TabStop = False + Me.grpTickMarkLabelsYAxis.Text = "Tick Mark Labels " + ' + 'ucrThemeYRightAxis + ' + Me.ucrThemeYRightAxis.Location = New System.Drawing.Point(268, 14) + Me.ucrThemeYRightAxis.Name = "ucrThemeYRightAxis" + Me.ucrThemeYRightAxis.Size = New System.Drawing.Size(262, 226) + Me.ucrThemeYRightAxis.TabIndex = 60 + ' + 'ucrThemeLeftYAxis + ' + Me.ucrThemeLeftYAxis.Location = New System.Drawing.Point(8, 14) + Me.ucrThemeLeftYAxis.Name = "ucrThemeLeftYAxis" + Me.ucrThemeLeftYAxis.Size = New System.Drawing.Size(259, 226) + Me.ucrThemeLeftYAxis.TabIndex = 59 + ' + 'grpTickMarkers + ' + Me.grpTickMarkers.Controls.Add(Me.ucrTickMarks) + Me.grpTickMarkers.Controls.Add(Me.ucrTickMarksYAxis) + Me.grpTickMarkers.Location = New System.Drawing.Point(540, 23) + Me.grpTickMarkers.Name = "grpTickMarkers" + Me.grpTickMarkers.Size = New System.Drawing.Size(264, 257) + Me.grpTickMarkers.TabIndex = 65 + Me.grpTickMarkers.TabStop = False + Me.grpTickMarkers.Text = "TickMarkers" + ' + 'ucrTickMarks + ' + Me.ucrTickMarks.Location = New System.Drawing.Point(4, 132) + Me.ucrTickMarks.Name = "ucrTickMarks" + Me.ucrTickMarks.Size = New System.Drawing.Size(254, 126) + Me.ucrTickMarks.TabIndex = 64 ' - Me.tbXaxis.Controls.Add(Me.tbAxis) - Me.tbXaxis.Controls.Add(Me.tbYaxis) - Me.tbXaxis.Location = New System.Drawing.Point(4, 8) - Me.tbXaxis.Name = "tbXaxis" - Me.tbXaxis.SelectedIndex = 0 - Me.tbXaxis.Size = New System.Drawing.Size(605, 603) - Me.tbXaxis.TabIndex = 1 + 'ucrTickMarksYAxis ' - 'tbAxis + Me.ucrTickMarksYAxis.Location = New System.Drawing.Point(4, 10) + Me.ucrTickMarksYAxis.Name = "ucrTickMarksYAxis" + Me.ucrTickMarksYAxis.Size = New System.Drawing.Size(254, 124) + Me.ucrTickMarksYAxis.TabIndex = 63 ' - Me.tbAxis.Controls.Add(Me.grpTableOptions) - Me.tbAxis.Location = New System.Drawing.Point(4, 22) - Me.tbAxis.Name = "tbAxis" - Me.tbAxis.Padding = New System.Windows.Forms.Padding(3) - Me.tbAxis.Size = New System.Drawing.Size(597, 577) - Me.tbAxis.TabIndex = 0 - Me.tbAxis.Text = "X-axis" - Me.tbAxis.UseVisualStyleBackColor = True + 'tbThemeXAxis + ' + Me.tbThemeXAxis.Controls.Add(Me.grpTableOptions) + Me.tbThemeXAxis.Location = New System.Drawing.Point(4, 22) + Me.tbThemeXAxis.Name = "tbThemeXAxis" + Me.tbThemeXAxis.Padding = New System.Windows.Forms.Padding(3) + Me.tbThemeXAxis.Size = New System.Drawing.Size(809, 555) + Me.tbThemeXAxis.TabIndex = 0 + Me.tbThemeXAxis.Text = "X-axis" + Me.tbThemeXAxis.UseVisualStyleBackColor = True ' 'grpTableOptions ' - Me.grpTableOptions.Controls.Add(Me.ucrThemeTopXAxis) - Me.grpTableOptions.Controls.Add(Me.ucrThemeBottomXAxis) - Me.grpTableOptions.Controls.Add(Me.GroupBox2) - Me.grpTableOptions.Controls.Add(Me.grpTickLabels) - Me.grpTableOptions.Controls.Add(Me.GroupBox1) + Me.grpTableOptions.Controls.Add(Me.grpTickMarkLabelsXAxis) + Me.grpTableOptions.Controls.Add(Me.grpXAxisTitle) + Me.grpTableOptions.Controls.Add(Me.grpXAxisLines) + Me.grpTableOptions.Controls.Add(Me.GroupBox5) Me.grpTableOptions.Location = New System.Drawing.Point(-1, 3) Me.grpTableOptions.Name = "grpTableOptions" - Me.grpTableOptions.Size = New System.Drawing.Size(592, 578) + Me.grpTableOptions.Size = New System.Drawing.Size(821, 678) Me.grpTableOptions.TabIndex = 0 Me.grpTableOptions.TabStop = False Me.grpTableOptions.Text = "More Options" ' + 'grpTickMarkLabelsXAxis + ' + Me.grpTickMarkLabelsXAxis.Controls.Add(Me.ucrThemeTopXAxis) + Me.grpTickMarkLabelsXAxis.Controls.Add(Me.ucrThemeBottomXAxis) + Me.grpTickMarkLabelsXAxis.Location = New System.Drawing.Point(7, 263) + Me.grpTickMarkLabelsXAxis.Name = "grpTickMarkLabelsXAxis" + Me.grpTickMarkLabelsXAxis.Size = New System.Drawing.Size(523, 245) + Me.grpTickMarkLabelsXAxis.TabIndex = 70 + Me.grpTickMarkLabelsXAxis.TabStop = False + Me.grpTickMarkLabelsXAxis.Text = "Tick Mark Labels " + ' 'ucrThemeTopXAxis ' - Me.ucrThemeTopXAxis.Location = New System.Drawing.Point(307, 10) + Me.ucrThemeTopXAxis.Location = New System.Drawing.Point(263, 12) Me.ucrThemeTopXAxis.Name = "ucrThemeTopXAxis" - Me.ucrThemeTopXAxis.Size = New System.Drawing.Size(296, 260) - Me.ucrThemeTopXAxis.TabIndex = 57 + Me.ucrThemeTopXAxis.Size = New System.Drawing.Size(258, 224) + Me.ucrThemeTopXAxis.TabIndex = 59 ' 'ucrThemeBottomXAxis ' - Me.ucrThemeBottomXAxis.Location = New System.Drawing.Point(5, 10) + Me.ucrThemeBottomXAxis.Location = New System.Drawing.Point(4, 12) Me.ucrThemeBottomXAxis.Name = "ucrThemeBottomXAxis" - Me.ucrThemeBottomXAxis.Size = New System.Drawing.Size(296, 260) - Me.ucrThemeBottomXAxis.TabIndex = 56 + Me.ucrThemeBottomXAxis.Size = New System.Drawing.Size(259, 224) + Me.ucrThemeBottomXAxis.TabIndex = 58 + ' + 'grpXAxisTitle + ' + Me.grpXAxisTitle.Controls.Add(Me.ucrThemeTitleXTopAxis) + Me.grpXAxisTitle.Controls.Add(Me.ucrThemeTitleXAxis) + Me.grpXAxisTitle.Location = New System.Drawing.Point(7, 15) + Me.grpXAxisTitle.Name = "grpXAxisTitle" + Me.grpXAxisTitle.Size = New System.Drawing.Size(522, 246) + Me.grpXAxisTitle.TabIndex = 69 + Me.grpXAxisTitle.TabStop = False + Me.grpXAxisTitle.Text = "X-Lab Title" + ' + 'ucrThemeTitleXTopAxis + ' + Me.ucrThemeTitleXTopAxis.Location = New System.Drawing.Point(266, 14) + Me.ucrThemeTitleXTopAxis.Name = "ucrThemeTitleXTopAxis" + Me.ucrThemeTitleXTopAxis.Size = New System.Drawing.Size(252, 230) + Me.ucrThemeTitleXTopAxis.TabIndex = 64 + ' + 'ucrThemeTitleXAxis + ' + Me.ucrThemeTitleXAxis.Location = New System.Drawing.Point(6, 11) + Me.ucrThemeTitleXAxis.Name = "ucrThemeTitleXAxis" + Me.ucrThemeTitleXAxis.Size = New System.Drawing.Size(260, 231) + Me.ucrThemeTitleXAxis.TabIndex = 63 + ' + 'grpXAxisLines + ' + Me.grpXAxisLines.Controls.Add(Me.UcrTickMarksAndLabels3) + Me.grpXAxisLines.Controls.Add(Me.ucrXAxisLines) + Me.grpXAxisLines.Location = New System.Drawing.Point(532, 276) + Me.grpXAxisLines.Name = "grpXAxisLines" + Me.grpXAxisLines.Size = New System.Drawing.Size(260, 264) + Me.grpXAxisLines.TabIndex = 68 + Me.grpXAxisLines.TabStop = False + Me.grpXAxisLines.Text = "Line Along X-Axis" + ' + 'UcrTickMarksAndLabels3 + ' + Me.UcrTickMarksAndLabels3.Location = New System.Drawing.Point(4, 134) + Me.UcrTickMarksAndLabels3.Name = "UcrTickMarksAndLabels3" + Me.UcrTickMarksAndLabels3.Size = New System.Drawing.Size(254, 124) + Me.UcrTickMarksAndLabels3.TabIndex = 64 + ' + 'ucrXAxisLines + ' + Me.ucrXAxisLines.Location = New System.Drawing.Point(4, 12) + Me.ucrXAxisLines.Name = "ucrXAxisLines" + Me.ucrXAxisLines.Size = New System.Drawing.Size(254, 124) + Me.ucrXAxisLines.TabIndex = 63 + ' + 'GroupBox5 + ' + Me.GroupBox5.Controls.Add(Me.UcrTickMarksAndLabels5) + Me.GroupBox5.Controls.Add(Me.ucrTickMarksXAxis) + Me.GroupBox5.Location = New System.Drawing.Point(528, 10) + Me.GroupBox5.Name = "GroupBox5" + Me.GroupBox5.Size = New System.Drawing.Size(264, 257) + Me.GroupBox5.TabIndex = 67 + Me.GroupBox5.TabStop = False + Me.GroupBox5.Text = "TickMarkers" + ' + 'UcrTickMarksAndLabels5 + ' + Me.UcrTickMarksAndLabels5.Location = New System.Drawing.Point(4, 132) + Me.UcrTickMarksAndLabels5.Name = "UcrTickMarksAndLabels5" + Me.UcrTickMarksAndLabels5.Size = New System.Drawing.Size(254, 126) + Me.UcrTickMarksAndLabels5.TabIndex = 64 + ' + 'ucrTickMarksXAxis + ' + Me.ucrTickMarksXAxis.Location = New System.Drawing.Point(4, 10) + Me.ucrTickMarksXAxis.Name = "ucrTickMarksXAxis" + Me.ucrTickMarksXAxis.Size = New System.Drawing.Size(254, 124) + Me.ucrTickMarksXAxis.TabIndex = 63 + ' + 'tbLegend + ' + Me.tbLegend.Controls.Add(Me.tbTitle) + Me.tbLegend.Controls.Add(Me.tbThemeXAxis) + Me.tbLegend.Controls.Add(Me.tbThemeYaxis) + Me.tbLegend.Controls.Add(Me.tbThemeLegend) + Me.tbLegend.Controls.Add(Me.tbThemePanelAndBackground) + Me.tbLegend.Controls.Add(Me.tbThemeFacets) + Me.tbLegend.Location = New System.Drawing.Point(4, 8) + Me.tbLegend.Name = "tbLegend" + Me.tbLegend.SelectedIndex = 0 + Me.tbLegend.Size = New System.Drawing.Size(824, 581) + Me.tbLegend.TabIndex = 1 + ' + 'tbTitle + ' + Me.tbTitle.Controls.Add(Me.ucrThemeAxesLines) + Me.tbTitle.Controls.Add(Me.ucrThemeAxesTickLabels) + Me.tbTitle.Controls.Add(Me.ucrTickMarksAxes) + Me.tbTitle.Controls.Add(Me.GroupBox2) + Me.tbTitle.Controls.Add(Me.ucrThemeAxesTitle) + Me.tbTitle.Location = New System.Drawing.Point(4, 22) + Me.tbTitle.Name = "tbTitle" + Me.tbTitle.Size = New System.Drawing.Size(816, 555) + Me.tbTitle.TabIndex = 6 + Me.tbTitle.Text = "General" + Me.tbTitle.UseVisualStyleBackColor = True + ' + 'ucrThemeAxesLines + ' + Me.ucrThemeAxesLines.Location = New System.Drawing.Point(271, 246) + Me.ucrThemeAxesLines.Name = "ucrThemeAxesLines" + Me.ucrThemeAxesLines.Size = New System.Drawing.Size(257, 122) + Me.ucrThemeAxesLines.TabIndex = 64 + ' + 'ucrThemeAxesTickLabels + ' + Me.ucrThemeAxesTickLabels.Location = New System.Drawing.Point(268, 13) + Me.ucrThemeAxesTickLabels.Name = "ucrThemeAxesTickLabels" + Me.ucrThemeAxesTickLabels.Size = New System.Drawing.Size(255, 228) + Me.ucrThemeAxesTickLabels.TabIndex = 63 + ' + 'ucrTickMarksAxes + ' + Me.ucrTickMarksAxes.Location = New System.Drawing.Point(4, 244) + Me.ucrTickMarksAxes.Name = "ucrTickMarksAxes" + Me.ucrTickMarksAxes.Size = New System.Drawing.Size(257, 122) + Me.ucrTickMarksAxes.TabIndex = 62 ' 'GroupBox2 ' - Me.GroupBox2.Controls.Add(Me.UcrCheck1) - Me.GroupBox2.Controls.Add(Me.UcrCheck2) - Me.GroupBox2.Controls.Add(Me.UcrCheck3) - Me.GroupBox2.Controls.Add(Me.UcrCheck4) - Me.GroupBox2.Controls.Add(Me.UcrInputComboBox1) - Me.GroupBox2.Controls.Add(Me.UcrNud1) - Me.GroupBox2.Controls.Add(Me.UcrInputComboBox2) - Me.GroupBox2.Controls.Add(Me.UcrInputComboBox3) - Me.GroupBox2.Location = New System.Drawing.Point(284, 424) + Me.GroupBox2.Controls.Add(Me.ucrInputMargin) + Me.GroupBox2.Controls.Add(Me.ucrChkMaigin) + Me.GroupBox2.Controls.Add(Me.ucrInputMarginUnits) + Me.GroupBox2.Controls.Add(Me.ucrInputUnits) + Me.GroupBox2.Controls.Add(Me.ucrChkUnits) + Me.GroupBox2.Controls.Add(Me.ucrInputTickUnits) + Me.GroupBox2.Location = New System.Drawing.Point(7, 372) Me.GroupBox2.Name = "GroupBox2" - Me.GroupBox2.Size = New System.Drawing.Size(264, 154) - Me.GroupBox2.TabIndex = 55 + Me.GroupBox2.Size = New System.Drawing.Size(264, 149) + Me.GroupBox2.TabIndex = 61 Me.GroupBox2.TabStop = False Me.GroupBox2.Text = "X axis tick labels" ' - 'UcrCheck1 - ' - Me.UcrCheck1.Checked = False - Me.UcrCheck1.Location = New System.Drawing.Point(11, 104) - Me.UcrCheck1.Name = "UcrCheck1" - Me.UcrCheck1.Size = New System.Drawing.Size(100, 20) - Me.UcrCheck1.TabIndex = 54 - ' - 'UcrCheck2 - ' - Me.UcrCheck2.Checked = False - Me.UcrCheck2.Location = New System.Drawing.Point(11, 20) - Me.UcrCheck2.Name = "UcrCheck2" - Me.UcrCheck2.Size = New System.Drawing.Size(100, 20) - Me.UcrCheck2.TabIndex = 53 - ' - 'UcrCheck3 - ' - Me.UcrCheck3.Checked = False - Me.UcrCheck3.Location = New System.Drawing.Point(11, 45) - Me.UcrCheck3.Name = "UcrCheck3" - Me.UcrCheck3.Size = New System.Drawing.Size(100, 20) - Me.UcrCheck3.TabIndex = 52 - ' - 'UcrCheck4 - ' - Me.UcrCheck4.Checked = False - Me.UcrCheck4.Location = New System.Drawing.Point(11, 72) - Me.UcrCheck4.Name = "UcrCheck4" - Me.UcrCheck4.Size = New System.Drawing.Size(100, 20) - Me.UcrCheck4.TabIndex = 51 - ' - 'UcrInputComboBox1 - ' - Me.UcrInputComboBox1.AddQuotesIfUnrecognised = True - Me.UcrInputComboBox1.IsReadOnly = False - Me.UcrInputComboBox1.Location = New System.Drawing.Point(117, 103) - Me.UcrInputComboBox1.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) - Me.UcrInputComboBox1.Name = "UcrInputComboBox1" - Me.UcrInputComboBox1.Size = New System.Drawing.Size(137, 21) - Me.UcrInputComboBox1.TabIndex = 32 - ' - 'UcrNud1 - ' - Me.UcrNud1.DecimalPlaces = New Decimal(New Integer() {1, 0, 0, 0}) - Me.UcrNud1.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.UcrNud1.Location = New System.Drawing.Point(116, 19) - Me.UcrNud1.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) - Me.UcrNud1.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) - Me.UcrNud1.Name = "UcrNud1" - Me.UcrNud1.Size = New System.Drawing.Size(50, 20) - Me.UcrNud1.TabIndex = 30 - Me.UcrNud1.Value = New Decimal(New Integer() {0, 0, 0, 0}) - ' - 'UcrInputComboBox2 - ' - Me.UcrInputComboBox2.AddQuotesIfUnrecognised = True - Me.UcrInputComboBox2.IsReadOnly = False - Me.UcrInputComboBox2.Location = New System.Drawing.Point(117, 72) - Me.UcrInputComboBox2.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) - Me.UcrInputComboBox2.Name = "UcrInputComboBox2" - Me.UcrInputComboBox2.Size = New System.Drawing.Size(137, 21) - Me.UcrInputComboBox2.TabIndex = 28 - ' - 'UcrInputComboBox3 - ' - Me.UcrInputComboBox3.AddQuotesIfUnrecognised = True - Me.UcrInputComboBox3.IsReadOnly = False - Me.UcrInputComboBox3.Location = New System.Drawing.Point(117, 44) - Me.UcrInputComboBox3.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) - Me.UcrInputComboBox3.Name = "UcrInputComboBox3" - Me.UcrInputComboBox3.Size = New System.Drawing.Size(137, 21) - Me.UcrInputComboBox3.TabIndex = 26 - ' - 'grpTickLabels - ' - Me.grpTickLabels.Controls.Add(Me.ucrChkLineEndTickLabelsXAxis) - Me.grpTickLabels.Controls.Add(Me.ucrChkSizeTickLabelsXAxis) - Me.grpTickLabels.Controls.Add(Me.ucrChkLineTypeTickLabelsXAxis) - Me.grpTickLabels.Controls.Add(Me.ucrChkColourTickLabelsXAxis) - Me.grpTickLabels.Controls.Add(Me.ucrInputLineEndTickLabelsXAxis) - Me.grpTickLabels.Controls.Add(Me.ucrNudSizeTickLabelsXAxis) - Me.grpTickLabels.Controls.Add(Me.ucrInputColourTickLabelsXAxis) - Me.grpTickLabels.Controls.Add(Me.ucrInputLineTypeTickLabelsXAxis) - Me.grpTickLabels.Location = New System.Drawing.Point(282, 273) - Me.grpTickLabels.Name = "grpTickLabels" - Me.grpTickLabels.Size = New System.Drawing.Size(264, 154) - Me.grpTickLabels.TabIndex = 40 - Me.grpTickLabels.TabStop = False - Me.grpTickLabels.Text = "X axis tick labels" - ' - 'ucrChkLineEndTickLabelsXAxis - ' - Me.ucrChkLineEndTickLabelsXAxis.Checked = False - Me.ucrChkLineEndTickLabelsXAxis.Location = New System.Drawing.Point(11, 104) - Me.ucrChkLineEndTickLabelsXAxis.Name = "ucrChkLineEndTickLabelsXAxis" - Me.ucrChkLineEndTickLabelsXAxis.Size = New System.Drawing.Size(100, 20) - Me.ucrChkLineEndTickLabelsXAxis.TabIndex = 54 - ' - 'ucrChkSizeTickLabelsXAxis - ' - Me.ucrChkSizeTickLabelsXAxis.Checked = False - Me.ucrChkSizeTickLabelsXAxis.Location = New System.Drawing.Point(11, 20) - Me.ucrChkSizeTickLabelsXAxis.Name = "ucrChkSizeTickLabelsXAxis" - Me.ucrChkSizeTickLabelsXAxis.Size = New System.Drawing.Size(100, 20) - Me.ucrChkSizeTickLabelsXAxis.TabIndex = 53 - ' - 'ucrChkLineTypeTickLabelsXAxis - ' - Me.ucrChkLineTypeTickLabelsXAxis.Checked = False - Me.ucrChkLineTypeTickLabelsXAxis.Location = New System.Drawing.Point(11, 45) - Me.ucrChkLineTypeTickLabelsXAxis.Name = "ucrChkLineTypeTickLabelsXAxis" - Me.ucrChkLineTypeTickLabelsXAxis.Size = New System.Drawing.Size(100, 20) - Me.ucrChkLineTypeTickLabelsXAxis.TabIndex = 52 - ' - 'ucrChkColourTickLabelsXAxis - ' - Me.ucrChkColourTickLabelsXAxis.Checked = False - Me.ucrChkColourTickLabelsXAxis.Location = New System.Drawing.Point(11, 72) - Me.ucrChkColourTickLabelsXAxis.Name = "ucrChkColourTickLabelsXAxis" - Me.ucrChkColourTickLabelsXAxis.Size = New System.Drawing.Size(100, 20) - Me.ucrChkColourTickLabelsXAxis.TabIndex = 51 - ' - 'ucrInputLineEndTickLabelsXAxis - ' - Me.ucrInputLineEndTickLabelsXAxis.AddQuotesIfUnrecognised = True - Me.ucrInputLineEndTickLabelsXAxis.IsReadOnly = False - Me.ucrInputLineEndTickLabelsXAxis.Location = New System.Drawing.Point(117, 103) - Me.ucrInputLineEndTickLabelsXAxis.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) - Me.ucrInputLineEndTickLabelsXAxis.Name = "ucrInputLineEndTickLabelsXAxis" - Me.ucrInputLineEndTickLabelsXAxis.Size = New System.Drawing.Size(137, 21) - Me.ucrInputLineEndTickLabelsXAxis.TabIndex = 32 - ' - 'ucrNudSizeTickLabelsXAxis - ' - Me.ucrNudSizeTickLabelsXAxis.DecimalPlaces = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudSizeTickLabelsXAxis.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudSizeTickLabelsXAxis.Location = New System.Drawing.Point(116, 19) - Me.ucrNudSizeTickLabelsXAxis.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) - Me.ucrNudSizeTickLabelsXAxis.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) - Me.ucrNudSizeTickLabelsXAxis.Name = "ucrNudSizeTickLabelsXAxis" - Me.ucrNudSizeTickLabelsXAxis.Size = New System.Drawing.Size(50, 20) - Me.ucrNudSizeTickLabelsXAxis.TabIndex = 30 - Me.ucrNudSizeTickLabelsXAxis.Value = New Decimal(New Integer() {0, 0, 0, 0}) - ' - 'ucrInputColourTickLabelsXAxis - ' - Me.ucrInputColourTickLabelsXAxis.AddQuotesIfUnrecognised = True - Me.ucrInputColourTickLabelsXAxis.IsReadOnly = False - Me.ucrInputColourTickLabelsXAxis.Location = New System.Drawing.Point(117, 72) - Me.ucrInputColourTickLabelsXAxis.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) - Me.ucrInputColourTickLabelsXAxis.Name = "ucrInputColourTickLabelsXAxis" - Me.ucrInputColourTickLabelsXAxis.Size = New System.Drawing.Size(137, 21) - Me.ucrInputColourTickLabelsXAxis.TabIndex = 28 - ' - 'ucrInputLineTypeTickLabelsXAxis - ' - Me.ucrInputLineTypeTickLabelsXAxis.AddQuotesIfUnrecognised = True - Me.ucrInputLineTypeTickLabelsXAxis.IsReadOnly = False - Me.ucrInputLineTypeTickLabelsXAxis.Location = New System.Drawing.Point(117, 44) - Me.ucrInputLineTypeTickLabelsXAxis.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) - Me.ucrInputLineTypeTickLabelsXAxis.Name = "ucrInputLineTypeTickLabelsXAxis" - Me.ucrInputLineTypeTickLabelsXAxis.Size = New System.Drawing.Size(137, 21) - Me.ucrInputLineTypeTickLabelsXAxis.TabIndex = 26 - ' - 'GroupBox1 - ' - Me.GroupBox1.Controls.Add(Me.ucrInputMargin) - Me.GroupBox1.Controls.Add(Me.ucrChkMaigin) - Me.GroupBox1.Controls.Add(Me.ucrInputMarginUnits) - Me.GroupBox1.Controls.Add(Me.ucrInputUnits) - Me.GroupBox1.Controls.Add(Me.ucrChkLineEndTickMarksXAxis) - Me.GroupBox1.Controls.Add(Me.ucrChkUnits) - Me.GroupBox1.Controls.Add(Me.ucrInputTickUnits) - Me.GroupBox1.Controls.Add(Me.ucrChkSizeTickMarksXAxis) - Me.GroupBox1.Controls.Add(Me.ucrChkLineTypeTickMarksXAxis) - Me.GroupBox1.Controls.Add(Me.ucrChkColourTickMarksXAxis) - Me.GroupBox1.Controls.Add(Me.ucrInputLineEndTickMarks) - Me.GroupBox1.Controls.Add(Me.ucrNudSizeTickMarks) - Me.GroupBox1.Controls.Add(Me.ucrInputColourTickMarks) - Me.GroupBox1.Controls.Add(Me.ucrInputLineTypeTickMarks) - Me.GroupBox1.Location = New System.Drawing.Point(15, 270) - Me.GroupBox1.Name = "GroupBox1" - Me.GroupBox1.Size = New System.Drawing.Size(262, 283) - Me.GroupBox1.TabIndex = 39 - Me.GroupBox1.TabStop = False - Me.GroupBox1.Text = "Tick marks along axes" - ' 'ucrInputMargin ' Me.ucrInputMargin.AddQuotesIfUnrecognised = True Me.ucrInputMargin.IsMultiline = False Me.ucrInputMargin.IsReadOnly = False - Me.ucrInputMargin.Location = New System.Drawing.Point(111, 199) + Me.ucrInputMargin.Location = New System.Drawing.Point(114, 82) Me.ucrInputMargin.Name = "ucrInputMargin" Me.ucrInputMargin.Size = New System.Drawing.Size(50, 23) - Me.ucrInputMargin.TabIndex = 59 + Me.ucrInputMargin.TabIndex = 65 ' 'ucrChkMaigin ' Me.ucrChkMaigin.Checked = False - Me.ucrChkMaigin.Location = New System.Drawing.Point(11, 199) + Me.ucrChkMaigin.Location = New System.Drawing.Point(14, 82) Me.ucrChkMaigin.Name = "ucrChkMaigin" Me.ucrChkMaigin.Size = New System.Drawing.Size(100, 20) - Me.ucrChkMaigin.TabIndex = 58 + Me.ucrChkMaigin.TabIndex = 64 ' 'ucrInputMarginUnits ' Me.ucrInputMarginUnits.AddQuotesIfUnrecognised = True Me.ucrInputMarginUnits.IsReadOnly = False - Me.ucrInputMarginUnits.Location = New System.Drawing.Point(111, 231) + Me.ucrInputMarginUnits.Location = New System.Drawing.Point(114, 114) Me.ucrInputMarginUnits.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) Me.ucrInputMarginUnits.Name = "ucrInputMarginUnits" Me.ucrInputMarginUnits.Size = New System.Drawing.Size(137, 21) - Me.ucrInputMarginUnits.TabIndex = 57 + Me.ucrInputMarginUnits.TabIndex = 63 ' 'ucrInputUnits ' Me.ucrInputUnits.AddQuotesIfUnrecognised = True Me.ucrInputUnits.IsMultiline = False Me.ucrInputUnits.IsReadOnly = False - Me.ucrInputUnits.Location = New System.Drawing.Point(111, 137) + Me.ucrInputUnits.Location = New System.Drawing.Point(114, 20) Me.ucrInputUnits.Name = "ucrInputUnits" Me.ucrInputUnits.Size = New System.Drawing.Size(50, 23) - Me.ucrInputUnits.TabIndex = 56 - ' - 'ucrChkLineEndTickMarksXAxis - ' - Me.ucrChkLineEndTickMarksXAxis.Checked = False - Me.ucrChkLineEndTickMarksXAxis.Location = New System.Drawing.Point(11, 111) - Me.ucrChkLineEndTickMarksXAxis.Name = "ucrChkLineEndTickMarksXAxis" - Me.ucrChkLineEndTickMarksXAxis.Size = New System.Drawing.Size(100, 20) - Me.ucrChkLineEndTickMarksXAxis.TabIndex = 54 + Me.ucrInputUnits.TabIndex = 62 ' 'ucrChkUnits ' Me.ucrChkUnits.Checked = False - Me.ucrChkUnits.Location = New System.Drawing.Point(11, 137) + Me.ucrChkUnits.Location = New System.Drawing.Point(14, 20) Me.ucrChkUnits.Name = "ucrChkUnits" Me.ucrChkUnits.Size = New System.Drawing.Size(100, 20) - Me.ucrChkUnits.TabIndex = 55 + Me.ucrChkUnits.TabIndex = 61 ' 'ucrInputTickUnits ' Me.ucrInputTickUnits.AddQuotesIfUnrecognised = True Me.ucrInputTickUnits.IsReadOnly = False - Me.ucrInputTickUnits.Location = New System.Drawing.Point(111, 169) + Me.ucrInputTickUnits.Location = New System.Drawing.Point(114, 52) Me.ucrInputTickUnits.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) Me.ucrInputTickUnits.Name = "ucrInputTickUnits" Me.ucrInputTickUnits.Size = New System.Drawing.Size(137, 21) - Me.ucrInputTickUnits.TabIndex = 54 - ' - 'ucrChkSizeTickMarksXAxis - ' - Me.ucrChkSizeTickMarksXAxis.Checked = False - Me.ucrChkSizeTickMarksXAxis.Location = New System.Drawing.Point(11, 24) - Me.ucrChkSizeTickMarksXAxis.Name = "ucrChkSizeTickMarksXAxis" - Me.ucrChkSizeTickMarksXAxis.Size = New System.Drawing.Size(100, 20) - Me.ucrChkSizeTickMarksXAxis.TabIndex = 53 - ' - 'ucrChkLineTypeTickMarksXAxis - ' - Me.ucrChkLineTypeTickMarksXAxis.Checked = False - Me.ucrChkLineTypeTickMarksXAxis.Location = New System.Drawing.Point(11, 53) - Me.ucrChkLineTypeTickMarksXAxis.Name = "ucrChkLineTypeTickMarksXAxis" - Me.ucrChkLineTypeTickMarksXAxis.Size = New System.Drawing.Size(100, 20) - Me.ucrChkLineTypeTickMarksXAxis.TabIndex = 52 - ' - 'ucrChkColourTickMarksXAxis - ' - Me.ucrChkColourTickMarksXAxis.Checked = False - Me.ucrChkColourTickMarksXAxis.Location = New System.Drawing.Point(11, 82) - Me.ucrChkColourTickMarksXAxis.Name = "ucrChkColourTickMarksXAxis" - Me.ucrChkColourTickMarksXAxis.Size = New System.Drawing.Size(100, 20) - Me.ucrChkColourTickMarksXAxis.TabIndex = 51 - ' - 'ucrInputLineEndTickMarks - ' - Me.ucrInputLineEndTickMarks.AddQuotesIfUnrecognised = True - Me.ucrInputLineEndTickMarks.IsReadOnly = False - Me.ucrInputLineEndTickMarks.Location = New System.Drawing.Point(111, 110) - Me.ucrInputLineEndTickMarks.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) - Me.ucrInputLineEndTickMarks.Name = "ucrInputLineEndTickMarks" - Me.ucrInputLineEndTickMarks.Size = New System.Drawing.Size(137, 21) - Me.ucrInputLineEndTickMarks.TabIndex = 32 - ' - 'ucrNudSizeTickMarks - ' - Me.ucrNudSizeTickMarks.DecimalPlaces = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudSizeTickMarks.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudSizeTickMarks.Location = New System.Drawing.Point(111, 24) - Me.ucrNudSizeTickMarks.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) - Me.ucrNudSizeTickMarks.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) - Me.ucrNudSizeTickMarks.Name = "ucrNudSizeTickMarks" - Me.ucrNudSizeTickMarks.Size = New System.Drawing.Size(50, 20) - Me.ucrNudSizeTickMarks.TabIndex = 30 - Me.ucrNudSizeTickMarks.Value = New Decimal(New Integer() {0, 0, 0, 0}) - ' - 'ucrInputColourTickMarks - ' - Me.ucrInputColourTickMarks.AddQuotesIfUnrecognised = True - Me.ucrInputColourTickMarks.IsReadOnly = False - Me.ucrInputColourTickMarks.Location = New System.Drawing.Point(111, 81) - Me.ucrInputColourTickMarks.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) - Me.ucrInputColourTickMarks.Name = "ucrInputColourTickMarks" - Me.ucrInputColourTickMarks.Size = New System.Drawing.Size(137, 21) - Me.ucrInputColourTickMarks.TabIndex = 28 - ' - 'ucrInputLineTypeTickMarks - ' - Me.ucrInputLineTypeTickMarks.AddQuotesIfUnrecognised = True - Me.ucrInputLineTypeTickMarks.IsReadOnly = False - Me.ucrInputLineTypeTickMarks.Location = New System.Drawing.Point(111, 52) - Me.ucrInputLineTypeTickMarks.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) - Me.ucrInputLineTypeTickMarks.Name = "ucrInputLineTypeTickMarks" - Me.ucrInputLineTypeTickMarks.Size = New System.Drawing.Size(137, 21) - Me.ucrInputLineTypeTickMarks.TabIndex = 26 - ' - 'tbYaxis - ' - Me.tbYaxis.Controls.Add(Me.ucrThemeRightYAxis) - Me.tbYaxis.Controls.Add(Me.ucrThemeLeftYAxis) - Me.tbYaxis.Controls.Add(Me.grpTickLabelYAxis) - Me.tbYaxis.Controls.Add(Me.grpTickMarksYAxis) - Me.tbYaxis.Location = New System.Drawing.Point(4, 22) - Me.tbYaxis.Name = "tbYaxis" - Me.tbYaxis.Padding = New System.Windows.Forms.Padding(3) - Me.tbYaxis.Size = New System.Drawing.Size(597, 577) - Me.tbYaxis.TabIndex = 1 - Me.tbYaxis.Text = "Y-axis" - Me.tbYaxis.UseVisualStyleBackColor = True - ' - 'ucrThemeRightYAxis - ' - Me.ucrThemeRightYAxis.Location = New System.Drawing.Point(305, 10) - Me.ucrThemeRightYAxis.Name = "ucrThemeRightYAxis" - Me.ucrThemeRightYAxis.Size = New System.Drawing.Size(296, 260) - Me.ucrThemeRightYAxis.TabIndex = 58 - ' - 'ucrThemeLeftYAxis + Me.ucrInputTickUnits.TabIndex = 60 ' - Me.ucrThemeLeftYAxis.Location = New System.Drawing.Point(12, 10) - Me.ucrThemeLeftYAxis.Name = "ucrThemeLeftYAxis" - Me.ucrThemeLeftYAxis.Size = New System.Drawing.Size(296, 260) - Me.ucrThemeLeftYAxis.TabIndex = 57 - ' - 'grpTickLabelYAxis - ' - Me.grpTickLabelYAxis.Controls.Add(Me.ucrChkLineEndTickLabelsYAxis) - Me.grpTickLabelYAxis.Controls.Add(Me.ucrChkSizeTickLabelsYAxis) - Me.grpTickLabelYAxis.Controls.Add(Me.ucrChkLineTypeTickLabelsYAxis) - Me.grpTickLabelYAxis.Controls.Add(Me.ucrChkColourTickLabelsYAxis) - Me.grpTickLabelYAxis.Controls.Add(Me.ucrInputLineEndTickLabelsYAxis) - Me.grpTickLabelYAxis.Controls.Add(Me.ucrNudSizeTickLabelsYAxis) - Me.grpTickLabelYAxis.Controls.Add(Me.ucrInputColourTickLabelsYAxis) - Me.grpTickLabelYAxis.Controls.Add(Me.ucrInputLineTypeTickLabelsYAxis) - Me.grpTickLabelYAxis.Location = New System.Drawing.Point(263, 256) - Me.grpTickLabelYAxis.Name = "grpTickLabelYAxis" - Me.grpTickLabelYAxis.Size = New System.Drawing.Size(264, 154) - Me.grpTickLabelYAxis.TabIndex = 43 - Me.grpTickLabelYAxis.TabStop = False - Me.grpTickLabelYAxis.Text = "Y axis tick labels" - ' - 'ucrChkLineEndTickLabelsYAxis - ' - Me.ucrChkLineEndTickLabelsYAxis.Checked = False - Me.ucrChkLineEndTickLabelsYAxis.Location = New System.Drawing.Point(13, 107) - Me.ucrChkLineEndTickLabelsYAxis.Name = "ucrChkLineEndTickLabelsYAxis" - Me.ucrChkLineEndTickLabelsYAxis.Size = New System.Drawing.Size(100, 20) - Me.ucrChkLineEndTickLabelsYAxis.TabIndex = 58 - ' - 'ucrChkSizeTickLabelsYAxis - ' - Me.ucrChkSizeTickLabelsYAxis.Checked = False - Me.ucrChkSizeTickLabelsYAxis.Location = New System.Drawing.Point(13, 20) - Me.ucrChkSizeTickLabelsYAxis.Name = "ucrChkSizeTickLabelsYAxis" - Me.ucrChkSizeTickLabelsYAxis.Size = New System.Drawing.Size(100, 20) - Me.ucrChkSizeTickLabelsYAxis.TabIndex = 57 - ' - 'ucrChkLineTypeTickLabelsYAxis - ' - Me.ucrChkLineTypeTickLabelsYAxis.Checked = False - Me.ucrChkLineTypeTickLabelsYAxis.Location = New System.Drawing.Point(13, 49) - Me.ucrChkLineTypeTickLabelsYAxis.Name = "ucrChkLineTypeTickLabelsYAxis" - Me.ucrChkLineTypeTickLabelsYAxis.Size = New System.Drawing.Size(100, 20) - Me.ucrChkLineTypeTickLabelsYAxis.TabIndex = 56 - ' - 'ucrChkColourTickLabelsYAxis - ' - Me.ucrChkColourTickLabelsYAxis.Checked = False - Me.ucrChkColourTickLabelsYAxis.Location = New System.Drawing.Point(13, 78) - Me.ucrChkColourTickLabelsYAxis.Name = "ucrChkColourTickLabelsYAxis" - Me.ucrChkColourTickLabelsYAxis.Size = New System.Drawing.Size(100, 20) - Me.ucrChkColourTickLabelsYAxis.TabIndex = 55 - ' - 'ucrInputLineEndTickLabelsYAxis - ' - Me.ucrInputLineEndTickLabelsYAxis.AddQuotesIfUnrecognised = True - Me.ucrInputLineEndTickLabelsYAxis.IsReadOnly = False - Me.ucrInputLineEndTickLabelsYAxis.Location = New System.Drawing.Point(114, 106) - Me.ucrInputLineEndTickLabelsYAxis.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) - Me.ucrInputLineEndTickLabelsYAxis.Name = "ucrInputLineEndTickLabelsYAxis" - Me.ucrInputLineEndTickLabelsYAxis.Size = New System.Drawing.Size(137, 21) - Me.ucrInputLineEndTickLabelsYAxis.TabIndex = 32 - ' - 'ucrNudSizeTickLabelsYAxis - ' - Me.ucrNudSizeTickLabelsYAxis.DecimalPlaces = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudSizeTickLabelsYAxis.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudSizeTickLabelsYAxis.Location = New System.Drawing.Point(114, 19) - Me.ucrNudSizeTickLabelsYAxis.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) - Me.ucrNudSizeTickLabelsYAxis.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) - Me.ucrNudSizeTickLabelsYAxis.Name = "ucrNudSizeTickLabelsYAxis" - Me.ucrNudSizeTickLabelsYAxis.Size = New System.Drawing.Size(50, 20) - Me.ucrNudSizeTickLabelsYAxis.TabIndex = 30 - Me.ucrNudSizeTickLabelsYAxis.Value = New Decimal(New Integer() {0, 0, 0, 0}) - ' - 'ucrInputColourTickLabelsYAxis - ' - Me.ucrInputColourTickLabelsYAxis.AddQuotesIfUnrecognised = True - Me.ucrInputColourTickLabelsYAxis.IsReadOnly = False - Me.ucrInputColourTickLabelsYAxis.Location = New System.Drawing.Point(114, 77) - Me.ucrInputColourTickLabelsYAxis.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) - Me.ucrInputColourTickLabelsYAxis.Name = "ucrInputColourTickLabelsYAxis" - Me.ucrInputColourTickLabelsYAxis.Size = New System.Drawing.Size(137, 21) - Me.ucrInputColourTickLabelsYAxis.TabIndex = 28 - ' - 'ucrInputLineTypeTickLabelsYAxis - ' - Me.ucrInputLineTypeTickLabelsYAxis.AddQuotesIfUnrecognised = True - Me.ucrInputLineTypeTickLabelsYAxis.IsReadOnly = False - Me.ucrInputLineTypeTickLabelsYAxis.Location = New System.Drawing.Point(114, 48) - Me.ucrInputLineTypeTickLabelsYAxis.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) - Me.ucrInputLineTypeTickLabelsYAxis.Name = "ucrInputLineTypeTickLabelsYAxis" - Me.ucrInputLineTypeTickLabelsYAxis.Size = New System.Drawing.Size(137, 21) - Me.ucrInputLineTypeTickLabelsYAxis.TabIndex = 26 - ' - 'grpTickMarksYAxis - ' - Me.grpTickMarksYAxis.Controls.Add(Me.ucrChkLineEndTickMarksYAxis) - Me.grpTickMarksYAxis.Controls.Add(Me.ucrChkSizeTickMarksYAxis) - Me.grpTickMarksYAxis.Controls.Add(Me.ucrChkLineTypeTickMarksYAxis) - Me.grpTickMarksYAxis.Controls.Add(Me.ucrChkColourTickMarksYAxis) - Me.grpTickMarksYAxis.Controls.Add(Me.ucrInputLineEndTickMarksYAxis) - Me.grpTickMarksYAxis.Controls.Add(Me.ucrNudSizeTickMarksYAxis) - Me.grpTickMarksYAxis.Controls.Add(Me.ucrInputColourTickMarksYAxis) - Me.grpTickMarksYAxis.Controls.Add(Me.ucrInputLineTypeTickMarksYAxis) - Me.grpTickMarksYAxis.Location = New System.Drawing.Point(6, 256) - Me.grpTickMarksYAxis.Name = "grpTickMarksYAxis" - Me.grpTickMarksYAxis.Size = New System.Drawing.Size(250, 154) - Me.grpTickMarksYAxis.TabIndex = 42 - Me.grpTickMarksYAxis.TabStop = False - Me.grpTickMarksYAxis.Text = "Tick marks along axes" - ' - 'ucrChkLineEndTickMarksYAxis - ' - Me.ucrChkLineEndTickMarksYAxis.Checked = False - Me.ucrChkLineEndTickMarksYAxis.Location = New System.Drawing.Point(6, 107) - Me.ucrChkLineEndTickMarksYAxis.Name = "ucrChkLineEndTickMarksYAxis" - Me.ucrChkLineEndTickMarksYAxis.Size = New System.Drawing.Size(100, 20) - Me.ucrChkLineEndTickMarksYAxis.TabIndex = 58 - ' - 'ucrChkSizeTickMarksYAxis - ' - Me.ucrChkSizeTickMarksYAxis.Checked = False - Me.ucrChkSizeTickMarksYAxis.Location = New System.Drawing.Point(6, 20) - Me.ucrChkSizeTickMarksYAxis.Name = "ucrChkSizeTickMarksYAxis" - Me.ucrChkSizeTickMarksYAxis.Size = New System.Drawing.Size(100, 20) - Me.ucrChkSizeTickMarksYAxis.TabIndex = 57 - ' - 'ucrChkLineTypeTickMarksYAxis - ' - Me.ucrChkLineTypeTickMarksYAxis.Checked = False - Me.ucrChkLineTypeTickMarksYAxis.Location = New System.Drawing.Point(6, 49) - Me.ucrChkLineTypeTickMarksYAxis.Name = "ucrChkLineTypeTickMarksYAxis" - Me.ucrChkLineTypeTickMarksYAxis.Size = New System.Drawing.Size(100, 20) - Me.ucrChkLineTypeTickMarksYAxis.TabIndex = 56 - ' - 'ucrChkColourTickMarksYAxis - ' - Me.ucrChkColourTickMarksYAxis.Checked = False - Me.ucrChkColourTickMarksYAxis.Location = New System.Drawing.Point(6, 78) - Me.ucrChkColourTickMarksYAxis.Name = "ucrChkColourTickMarksYAxis" - Me.ucrChkColourTickMarksYAxis.Size = New System.Drawing.Size(100, 20) - Me.ucrChkColourTickMarksYAxis.TabIndex = 55 - ' - 'ucrInputLineEndTickMarksYAxis - ' - Me.ucrInputLineEndTickMarksYAxis.AddQuotesIfUnrecognised = True - Me.ucrInputLineEndTickMarksYAxis.IsReadOnly = False - Me.ucrInputLineEndTickMarksYAxis.Location = New System.Drawing.Point(110, 106) - Me.ucrInputLineEndTickMarksYAxis.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) - Me.ucrInputLineEndTickMarksYAxis.Name = "ucrInputLineEndTickMarksYAxis" - Me.ucrInputLineEndTickMarksYAxis.Size = New System.Drawing.Size(137, 21) - Me.ucrInputLineEndTickMarksYAxis.TabIndex = 32 - ' - 'ucrNudSizeTickMarksYAxis - ' - Me.ucrNudSizeTickMarksYAxis.DecimalPlaces = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudSizeTickMarksYAxis.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudSizeTickMarksYAxis.Location = New System.Drawing.Point(110, 19) - Me.ucrNudSizeTickMarksYAxis.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) - Me.ucrNudSizeTickMarksYAxis.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) - Me.ucrNudSizeTickMarksYAxis.Name = "ucrNudSizeTickMarksYAxis" - Me.ucrNudSizeTickMarksYAxis.Size = New System.Drawing.Size(50, 20) - Me.ucrNudSizeTickMarksYAxis.TabIndex = 30 - Me.ucrNudSizeTickMarksYAxis.Value = New Decimal(New Integer() {0, 0, 0, 0}) - ' - 'ucrInputColourTickMarksYAxis - ' - Me.ucrInputColourTickMarksYAxis.AddQuotesIfUnrecognised = True - Me.ucrInputColourTickMarksYAxis.IsReadOnly = False - Me.ucrInputColourTickMarksYAxis.Location = New System.Drawing.Point(110, 77) - Me.ucrInputColourTickMarksYAxis.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) - Me.ucrInputColourTickMarksYAxis.Name = "ucrInputColourTickMarksYAxis" - Me.ucrInputColourTickMarksYAxis.Size = New System.Drawing.Size(137, 21) - Me.ucrInputColourTickMarksYAxis.TabIndex = 28 - ' - 'ucrInputLineTypeTickMarksYAxis - ' - Me.ucrInputLineTypeTickMarksYAxis.AddQuotesIfUnrecognised = True - Me.ucrInputLineTypeTickMarksYAxis.IsReadOnly = False - Me.ucrInputLineTypeTickMarksYAxis.Location = New System.Drawing.Point(110, 48) - Me.ucrInputLineTypeTickMarksYAxis.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) - Me.ucrInputLineTypeTickMarksYAxis.Name = "ucrInputLineTypeTickMarksYAxis" - Me.ucrInputLineTypeTickMarksYAxis.Size = New System.Drawing.Size(137, 21) - Me.ucrInputLineTypeTickMarksYAxis.TabIndex = 26 + 'ucrThemeAxesTitle ' - 'ucrBaseSubdialogue - ' - Me.ucrBaseSubdialogue.Location = New System.Drawing.Point(215, 610) - Me.ucrBaseSubdialogue.Name = "ucrBaseSubdialogue" - Me.ucrBaseSubdialogue.Size = New System.Drawing.Size(142, 30) - Me.ucrBaseSubdialogue.TabIndex = 0 + Me.ucrThemeAxesTitle.Location = New System.Drawing.Point(7, 13) + Me.ucrThemeAxesTitle.Name = "ucrThemeAxesTitle" + Me.ucrThemeAxesTitle.Size = New System.Drawing.Size(255, 228) + Me.ucrThemeAxesTitle.TabIndex = 59 ' 'sdgThemes ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(621, 652) - Me.Controls.Add(Me.tbXaxis) + Me.ClientSize = New System.Drawing.Size(833, 633) + Me.Controls.Add(Me.tbLegend) Me.Controls.Add(Me.ucrBaseSubdialogue) Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog Me.MaximizeBox = False @@ -707,77 +495,66 @@ Partial Class sdgThemes Me.Name = "sdgThemes" Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen Me.Text = "Themes" - Me.tbXaxis.ResumeLayout(False) - Me.tbAxis.ResumeLayout(False) + Me.tbThemeYaxis.ResumeLayout(False) + Me.GroupBox1.ResumeLayout(False) + Me.grpYAxisTitle.ResumeLayout(False) + Me.grpTickMarkLabelsYAxis.ResumeLayout(False) + Me.grpTickMarkers.ResumeLayout(False) + Me.tbThemeXAxis.ResumeLayout(False) Me.grpTableOptions.ResumeLayout(False) + Me.grpTickMarkLabelsXAxis.ResumeLayout(False) + Me.grpXAxisTitle.ResumeLayout(False) + Me.grpXAxisLines.ResumeLayout(False) + Me.GroupBox5.ResumeLayout(False) + Me.tbLegend.ResumeLayout(False) + Me.tbTitle.ResumeLayout(False) Me.GroupBox2.ResumeLayout(False) - Me.grpTickLabels.ResumeLayout(False) - Me.GroupBox1.ResumeLayout(False) - Me.tbYaxis.ResumeLayout(False) - Me.grpTickLabelYAxis.ResumeLayout(False) - Me.grpTickMarksYAxis.ResumeLayout(False) Me.ResumeLayout(False) End Sub Friend WithEvents ucrBaseSubdialogue As ucrButtonsSubdialogue - Friend WithEvents tbXaxis As TabControl - Friend WithEvents tbAxis As TabPage + Friend WithEvents tbThemeFacets As TabPage + Friend WithEvents tbThemePanelAndBackground As TabPage + Friend WithEvents tbThemeLegend As TabPage + Friend WithEvents tbThemeYaxis As TabPage + Friend WithEvents tbThemeXAxis As TabPage Friend WithEvents grpTableOptions As GroupBox - Friend WithEvents tbYaxis As TabPage + Friend WithEvents tbLegend As TabControl + Friend WithEvents tbTitle As TabPage + Friend WithEvents ucrThemeAxesTitle As ucrELementTextControl + Friend WithEvents grpTickMarkers As GroupBox + Friend WithEvents ucrTickMarks As ucrElementLineControl + Friend WithEvents ucrTickMarksYAxis As ucrElementLineControl + Friend WithEvents grpTickMarkLabelsYAxis As GroupBox + Friend WithEvents ucrThemeYRightAxis As ucrELementTextControl + Friend WithEvents ucrThemeLeftYAxis As ucrELementTextControl + Friend WithEvents grpYAxisTitle As GroupBox + Friend WithEvents ucrThemeTitleYRightAxis As ucrELementTextControl + Friend WithEvents ucrThemeTitleYAxis As ucrELementTextControl Friend WithEvents GroupBox1 As GroupBox - Friend WithEvents ucrNudSizeTickMarks As ucrNud - Friend WithEvents ucrInputColourTickMarks As ucrInputComboBox - Friend WithEvents ucrInputLineTypeTickMarks As ucrInputComboBox - Friend WithEvents ucrInputLineEndTickMarks As ucrInputComboBox - Friend WithEvents grpTickLabels As GroupBox - Friend WithEvents ucrInputLineEndTickLabelsXAxis As ucrInputComboBox - Friend WithEvents ucrNudSizeTickLabelsXAxis As ucrNud - Friend WithEvents ucrInputColourTickLabelsXAxis As ucrInputComboBox - Friend WithEvents ucrInputLineTypeTickLabelsXAxis As ucrInputComboBox - Friend WithEvents grpTickLabelYAxis As GroupBox - Friend WithEvents ucrInputLineEndTickLabelsYAxis As ucrInputComboBox - Friend WithEvents ucrNudSizeTickLabelsYAxis As ucrNud - Friend WithEvents ucrInputColourTickLabelsYAxis As ucrInputComboBox - Friend WithEvents ucrInputLineTypeTickLabelsYAxis As ucrInputComboBox - Friend WithEvents grpTickMarksYAxis As GroupBox - Friend WithEvents ucrInputLineEndTickMarksYAxis As ucrInputComboBox - Friend WithEvents ucrNudSizeTickMarksYAxis As ucrNud - Friend WithEvents ucrInputColourTickMarksYAxis As ucrInputComboBox - Friend WithEvents ucrInputLineTypeTickMarksYAxis As ucrInputComboBox - Friend WithEvents ucrChkLineEndTickLabelsXAxis As ucrCheck - Friend WithEvents ucrChkSizeTickLabelsXAxis As ucrCheck - Friend WithEvents ucrChkLineTypeTickLabelsXAxis As ucrCheck - Friend WithEvents ucrChkColourTickLabelsXAxis As ucrCheck - Friend WithEvents ucrChkLineEndTickMarksXAxis As ucrCheck - Friend WithEvents ucrChkSizeTickMarksXAxis As ucrCheck - Friend WithEvents ucrChkLineTypeTickMarksXAxis As ucrCheck - Friend WithEvents ucrChkColourTickMarksXAxis As ucrCheck - Friend WithEvents ucrChkLineEndTickLabelsYAxis As ucrCheck - Friend WithEvents ucrChkSizeTickLabelsYAxis As ucrCheck - Friend WithEvents ucrChkLineTypeTickLabelsYAxis As ucrCheck - Friend WithEvents ucrChkColourTickLabelsYAxis As ucrCheck - Friend WithEvents ucrChkLineEndTickMarksYAxis As ucrCheck - Friend WithEvents ucrChkSizeTickMarksYAxis As ucrCheck - Friend WithEvents ucrChkLineTypeTickMarksYAxis As ucrCheck - Friend WithEvents ucrChkColourTickMarksYAxis As ucrCheck - Friend WithEvents ucrInputUnits As ucrInputTextBox - Friend WithEvents ucrChkUnits As ucrCheck - Friend WithEvents ucrInputTickUnits As ucrInputComboBox + Friend WithEvents UcrTickMarksAndLabels1 As ucrElementLineControl + Friend WithEvents ucrYAxisLines As ucrElementLineControl + Friend WithEvents grpXAxisLines As GroupBox + Friend WithEvents UcrTickMarksAndLabels3 As ucrElementLineControl + Friend WithEvents ucrXAxisLines As ucrElementLineControl + Friend WithEvents GroupBox5 As GroupBox + Friend WithEvents UcrTickMarksAndLabels5 As ucrElementLineControl + Friend WithEvents ucrTickMarksXAxis As ucrElementLineControl + Friend WithEvents grpXAxisTitle As GroupBox + Friend WithEvents ucrThemeTitleXTopAxis As ucrELementTextControl + Friend WithEvents ucrThemeTitleXAxis As ucrELementTextControl + Friend WithEvents grpTickMarkLabelsXAxis As GroupBox + Friend WithEvents ucrThemeBottomXAxis As ucrELementTextControl + Friend WithEvents ucrThemeTopXAxis As ucrELementTextControl + Friend WithEvents ucrTickMarksAxes As ucrElementLineControl + Friend WithEvents GroupBox2 As GroupBox Friend WithEvents ucrInputMargin As ucrInputTextBox Friend WithEvents ucrChkMaigin As ucrCheck Friend WithEvents ucrInputMarginUnits As ucrInputComboBox - Friend WithEvents GroupBox2 As GroupBox - Friend WithEvents UcrCheck1 As ucrCheck - Friend WithEvents UcrCheck2 As ucrCheck - Friend WithEvents UcrCheck3 As ucrCheck - Friend WithEvents UcrCheck4 As ucrCheck - Friend WithEvents UcrInputComboBox1 As ucrInputComboBox - Friend WithEvents UcrNud1 As ucrNud - Friend WithEvents UcrInputComboBox2 As ucrInputComboBox - Friend WithEvents UcrInputComboBox3 As ucrInputComboBox - Friend WithEvents ucrThemeBottomXAxis As ucrThemeAxes - Friend WithEvents ucrThemeTopXAxis As ucrThemeAxes - Friend WithEvents ucrThemeRightYAxis As ucrThemeAxes - Friend WithEvents ucrThemeLeftYAxis As ucrThemeAxes + Friend WithEvents ucrInputUnits As ucrInputTextBox + Friend WithEvents ucrChkUnits As ucrCheck + Friend WithEvents ucrInputTickUnits As ucrInputComboBox + Friend WithEvents ucrThemeAxesTickLabels As ucrELementTextControl + Friend WithEvents ucrThemeAxesLines As ucrElementLineControl End Class diff --git a/instat/sdgThemes.vb b/instat/sdgThemes.vb index ce53fabfcce..22fd7c38587 100644 --- a/instat/sdgThemes.vb +++ b/instat/sdgThemes.vb @@ -20,6 +20,10 @@ Public Class sdgThemes Public bControlsInitialised As Boolean = False Private clsElementLine, clsElementXAxisTextTop, clsElementXAxisLine, clsElementYAxisLine, clsElementText, clsElementYAxisTextRight, clsElementXAxisLineTop, clsThemeFunction As New RFunction + Private Sub ucrThemeAxesTitle_Load(sender As Object, e As EventArgs) Handles ucrThemeAxesTitle.Load + + End Sub + Private clsBaseOperator As New ROperator Private dctThemeFunctions As New Dictionary(Of String, RFunction) @@ -30,127 +34,49 @@ Public Class sdgThemes Public Sub InitialiseControls() - - 'Tick Marks Along Axes - ucrChkSizeTickMarksXAxis.SetText("Size") - ucrNudSizeTickMarks.SetParameter(New RParameter("size")) - ucrNudSizeTickMarks.Increment = 0.1 - - - ucrChkLineTypeTickMarksXAxis.SetText("Line Type") - ucrInputLineTypeTickMarks.SetParameter(New RParameter("linetype")) - ucrInputLineTypeTickMarks.SetItems(New Dictionary(Of String, String)(GgplotDefaults.dctLineType)) - ucrInputLineTypeTickMarks.SetRDefault(Chr(34) & "blank" & Chr(34)) - - ucrChkColourTickMarksXAxis.SetText("Colour") - ucrInputColourTickMarks.SetParameter(New RParameter("colour")) - ucrInputColourTickMarks.SetItems(New Dictionary(Of String, String)(GgplotDefaults.dctColour)) - ucrInputColourTickMarks.SetRDefault(Chr(34) & "black" & Chr(34)) - - ucrChkLineEndTickMarksXAxis.SetText("Line End") - ucrInputLineEndTickMarks.SetParameter(New RParameter("lineend")) - ucrInputLineEndTickMarks.SetItems(New Dictionary(Of String, String)(GgplotDefaults.dctLineEnd)) - ucrInputLineEndTickMarks.SetRDefault(Chr(34) & "square" & Chr(34)) - - - 'Tick Marks Along Axes - ucrChkSizeTickLabelsXAxis.SetText("Size") - ucrNudSizeTickLabelsXAxis.SetParameter(New RParameter("size")) - ucrNudSizeTickLabelsXAxis.Increment = 0.1 - - ucrChkLineTypeTickLabelsXAxis.SetText("Line Type") - ucrInputLineTypeTickLabelsXAxis.SetParameter(New RParameter("linetype")) - ucrInputLineTypeTickLabelsXAxis.SetItems(New Dictionary(Of String, String)(GgplotDefaults.dctLineType)) - ucrInputLineTypeTickLabelsXAxis.SetRDefault(Chr(34) & "blank" & Chr(34)) - - ucrChkColourTickLabelsXAxis.SetText("Colour") - ucrInputColourTickLabelsXAxis.SetParameter(New RParameter("colour")) - ucrInputColourTickLabelsXAxis.SetItems(New Dictionary(Of String, String)(GgplotDefaults.dctColour)) - ucrInputColourTickLabelsXAxis.SetRDefault(Chr(34) & "black" & Chr(34)) - - ucrChkLineEndTickLabelsXAxis.SetText("Line End") - ucrInputLineEndTickLabelsXAxis.SetParameter(New RParameter("lineend")) - ucrInputLineEndTickLabelsXAxis.SetItems(New Dictionary(Of String, String)(GgplotDefaults.dctColour)) - ucrInputLineEndTickLabelsXAxis.SetRDefault(Chr(34) & "square" & Chr(34)) - - ucrChkSizeTickMarksXAxis.AddToLinkedControls(ucrNudSizeTickMarks, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) - ucrChkLineTypeTickMarksXAxis.AddToLinkedControls(ucrInputLineTypeTickMarks, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) - ucrChkLineEndTickMarksXAxis.AddToLinkedControls(ucrInputLineEndTickMarks, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) - ucrChkColourTickMarksXAxis.AddToLinkedControls(ucrInputColourTickMarks, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) - - ucrChkSizeTickLabelsXAxis.AddToLinkedControls(ucrNudSizeTickLabelsXAxis, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) - ucrChkLineTypeTickLabelsXAxis.AddToLinkedControls(ucrInputLineTypeTickLabelsXAxis, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) - ucrChkLineEndTickLabelsXAxis.AddToLinkedControls(ucrInputLineEndTickLabelsXAxis, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) - ucrChkColourTickLabelsXAxis.AddToLinkedControls(ucrInputColourTickLabelsXAxis, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) - - - 'Tick Marks Along-Axes - ucrChkSizeTickMarksYAxis.SetText("Size") - ucrNudSizeTickMarksYAxis.SetParameter(New RParameter("size")) - ucrNudSizeTickMarksYAxis.Increment = 0.1 - - ucrChkLineTypeTickLabelsYAxis.SetText("Line Type") - ucrInputLineTypeTickLabelsYAxis.SetParameter(New RParameter("linetype")) - - ucrInputLineTypeTickLabelsYAxis.SetItems(New Dictionary(Of String, String)(GgplotDefaults.dctLineType)) - ucrInputLineTypeTickLabelsYAxis.SetRDefault(Chr(34) & "blank" & Chr(34)) - - ucrChkColourTickMarksYAxis.SetText("Colour") - ucrInputColourTickMarksYAxis.SetParameter(New RParameter("colour")) - ucrInputColourTickMarksYAxis.SetItems(New Dictionary(Of String, String)(GgplotDefaults.dctColour)) - ucrInputColourTickMarksYAxis.SetRDefault(Chr(34) & "black" & Chr(34)) - - ucrChkLineEndTickLabelsYAxis.SetText("Line End") - ucrInputLineEndTickLabelsYAxis.SetParameter(New RParameter("lineend")) - ucrInputLineEndTickLabelsYAxis.SetItems(New Dictionary(Of String, String)(GgplotDefaults.dctLineEnd)) - ucrInputLineEndTickLabelsYAxis.SetRDefault(Chr(34) & "square" & Chr(34)) - - 'Tick Marks Along Axes - ucrChkSizeTickMarksYAxis.SetText("Size") - ucrNudSizeTickMarksYAxis.SetParameter(New RParameter("size")) - ucrNudSizeTickMarksYAxis.Increment = 0.1 - - ucrChkSizeTickLabelsYAxis.SetText("Size") - ucrNudSizeTickLabelsYAxis.SetParameter(New RParameter("size")) - ucrNudSizeTickLabelsYAxis.Increment = 0.1 - - ucrChkLineTypeTickMarksYAxis.SetText("Line Type") - ucrInputLineTypeTickMarksYAxis.SetParameter(New RParameter("linetype")) - ucrInputLineTypeTickMarksYAxis.SetItems(New Dictionary(Of String, String)(GgplotDefaults.dctLineType)) - ucrInputLineTypeTickMarksYAxis.SetRDefault(Chr(34) & "blank" & Chr(34)) - - ucrChkColourTickLabelsYAxis.SetText("Colour") - ucrInputColourTickLabelsYAxis.SetParameter(New RParameter("colour")) - ucrInputColourTickLabelsYAxis.SetItems(New Dictionary(Of String, String)(GgplotDefaults.dctColour)) - ucrInputColourTickLabelsYAxis.SetRDefault(Chr(34) & "black" & Chr(34)) - - ucrChkLineEndTickMarksYAxis.SetText("Line End") - ucrInputLineEndTickMarksYAxis.SetParameter(New RParameter("lineend")) - ucrInputLineEndTickMarksYAxis.SetItems(New Dictionary(Of String, String)(GgplotDefaults.dctLineEnd)) - ucrInputLineEndTickMarksYAxis.SetRDefault(Chr(34) & "square" & Chr(34)) - 'Units ucrChkUnits.SetText("Tick length") ucrInputTickUnits.SetParameter(New RParameter("units")) ucrInputTickUnits.SetItems(New Dictionary(Of String, String)(GgplotDefaults.dctFonts)) ucrInputTickUnits.SetRDefault(Chr(34) & "npc" & Chr(34)) - - ucrChkSizeTickMarksYAxis.AddToLinkedControls(ucrNudSizeTickMarksYAxis, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) - ucrChkLineTypeTickMarksYAxis.AddToLinkedControls(ucrInputLineTypeTickMarksYAxis, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) - ucrChkLineEndTickMarksYAxis.AddToLinkedControls(ucrInputLineEndTickMarksYAxis, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) - ucrChkColourTickMarksYAxis.AddToLinkedControls(ucrInputColourTickMarksYAxis, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) - - ucrChkSizeTickLabelsYAxis.AddToLinkedControls(ucrNudSizeTickLabelsYAxis, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) - ucrChkLineTypeTickLabelsYAxis.AddToLinkedControls(ucrInputLineTypeTickLabelsYAxis, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) - ucrChkLineEndTickLabelsYAxis.AddToLinkedControls(ucrInputLineEndTickLabelsYAxis, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) - ucrChkColourTickLabelsYAxis.AddToLinkedControls(ucrInputColourTickLabelsYAxis, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) + ucrThemeBottomXAxis.setlabel("X axis tick labels") + ucrThemeTopXAxis.setlabel("X axis tick labels on top axis") + ucrThemeLeftYAxis.setlabel("Y axis tick labels") + ucrThemeYRightAxis.setlabel("Y axis tick labels on right axis") + ucrThemeTitleXAxis.setlabel("X axis label ") + ucrThemeTitleXTopAxis.setlabel("X axis label on top axis") + ucrThemeTitleYAxis.setlabel("Y axis labels") + ucrThemeTitleYRightAxis.setlabel("Y axis labels on right axis") + ucrTickMarksYAxis.setlabel("Y axis tick marks") + ucrYAxisLines.setlabel("Line along y axis") + ucrTickMarksXAxis.setlabel("X axis tick marks") + ucrXAxisLines.setlabel("Line along x axis") + ucrTickMarksAxes.setlabel("Tick marks along axes") + ucrThemeAxesTitle.setlabel("Label of axes") + ucrThemeAxesTickLabels.setlabel("Tick marks along axes") + ucrThemeAxesLines.setlabel("Lines along axes") End Sub Public Sub SetRCode(clsBaseOperator As ROperator, clsNewThemeFunction As RFunction, dctNewThemeFunctions As Dictionary(Of String, RFunction), Optional bReset As Boolean = False) Dim clsXElementText As New RFunction + Dim clsElementTickText As New RFunction + Dim clsXElementTitleText As New RFunction Dim clsYElementText As New RFunction Dim clsXTopElementText As New RFunction Dim clsYRightElementText As New RFunction + Dim clsXElementTitle As New RFunction + Dim clsYElementTitle As New RFunction + Dim clsXTopElementTitle As New RFunction + Dim clsYRightElementTitle As New RFunction + + Dim clsXElementLine As New RFunction + Dim clsElementLineAxes As New RFunction + Dim clsYElementLine As New RFunction + Dim clsElementTickAxes As New RFunction + Dim clsElementTickXAxis As New RFunction + Dim clsElementTickYAxis As New RFunction + Dim clsElementLineXAxis As New RFunction + Dim clsElementLineYAxis As New RFunction If Not bControlsInitialised Then InitialiseControls() @@ -159,56 +85,45 @@ Public Class sdgThemes clsBaseOperator.AddParameter("theme", clsRFunctionParameter:=clsThemeFunction, iPosition:=15) dctThemeFunctions = dctNewThemeFunctions + dctThemeFunctions.TryGetValue("axis.text", clsElementTickText) dctThemeFunctions.TryGetValue("axis.text.x", clsXElementText) dctThemeFunctions.TryGetValue("axis.text.y", clsYElementText) dctThemeFunctions.TryGetValue("axis.text.x.top", clsXTopElementText) dctThemeFunctions.TryGetValue("axis.text.y.right", clsYRightElementText) - dctThemeFunctions.TryGetValue("axis.ticks.x", clsElementLine) - dctThemeFunctions.TryGetValue("axis.ticks.y", clsElementLine) - - 'X axis Label Top Axis - ucrNudSizeTickMarks.SetRCode(clsElementXAxisLine, bReset) - ucrChkSizeTickMarksXAxis.SetRCode(clsElementXAxisLine, bReset) - - ucrInputColourTickMarks.SetRCode(clsElementXAxisLine, bReset) - ucrChkColourTickMarksXAxis.SetRCode(clsElementXAxisLine, bReset) - - ucrInputLineTypeTickMarks.SetRCode(clsElementXAxisLine, bReset) - ucrChkLineTypeTickMarksXAxis.SetRCode(clsElementXAxisLine, bReset) - - ucrInputLineEndTickMarks.SetRCode(clsElementXAxisLine, bReset) - ucrChkLineEndTickMarksXAxis.SetRCode(clsElementXAxisLine, bReset) - - 'X axis Label Top Axis - ucrNudSizeTickMarksYAxis.SetRCode(clsElementYAxisLine, bReset) - ucrChkSizeTickMarksYAxis.SetRCode(clsElementYAxisLine, bReset) - - ucrInputColourTickMarksYAxis.SetRCode(clsElementYAxisLine, bReset) - ucrChkColourTickMarksYAxis.SetRCode(clsElementYAxisLine, bReset) - - ucrInputLineTypeTickMarksYAxis.SetRCode(clsElementYAxisLine, bReset) - ucrChkLineTypeTickMarksYAxis.SetRCode(clsElementYAxisLine, bReset) - - ucrInputLineEndTickMarksYAxis.SetRCode(clsElementYAxisLine, bReset) - ucrChkLineEndTickMarksYAxis.SetRCode(clsElementYAxisLine, bReset) - - ucrNudSizeTickLabelsYAxis.SetRCode(clsElementYAxisLine, bReset) - ucrChkSizeTickLabelsYAxis.SetRCode(clsElementYAxisLine, bReset) - - ucrInputColourTickLabelsYAxis.SetRCode(clsElementYAxisLine, bReset) - ucrChkColourTickLabelsYAxis.SetRCode(clsElementYAxisLine, bReset) - - ucrInputLineTypeTickLabelsYAxis.SetRCode(clsElementYAxisLine, bReset) - ucrChkLineTypeTickLabelsYAxis.SetRCode(clsElementYAxisLine, bReset) - - ucrInputLineEndTickLabelsYAxis.SetRCode(clsElementYAxisLine, bReset) - ucrChkLineEndTickLabelsYAxis.SetRCode(clsElementYAxisLine, bReset) + dctThemeFunctions.TryGetValue("axis.title", clsXElementTitleText) + dctThemeFunctions.TryGetValue("axis.title.x", clsXElementTitle) + dctThemeFunctions.TryGetValue("axis.title.y", clsYElementTitle) + dctThemeFunctions.TryGetValue("axis.title.x.top", clsXTopElementTitle) + dctThemeFunctions.TryGetValue("axis.title.y.right", clsYRightElementTitle) + + + dctThemeFunctions.TryGetValue("axis.ticks.x", clsXElementLine) + dctThemeFunctions.TryGetValue("axis.ticks.y", clsYElementLine) + dctThemeFunctions.TryGetValue("axis.line.x", clsElementLineXAxis) + dctThemeFunctions.TryGetValue("axis.line.y", clsElementLineYAxis) + dctThemeFunctions.TryGetValue("axis.ticks", clsElementTickAxes) + dctThemeFunctions.TryGetValue("axis.line", clsElementLineAxes) + + ucrTickMarksXAxis.SetRCodeForControl("axis.ticks.x", clsXElementLine, clsNewThemeFunction:=clsThemeFunction, clsNewBaseOperator:=clsBaseOperator, bReset:=bReset) + ucrTickMarksYAxis.SetRCodeForControl("axis.ticks.y", clsYElementLine, clsNewThemeFunction:=clsThemeFunction, clsNewBaseOperator:=clsBaseOperator, bReset:=bReset) + ucrXAxisLines.SetRCodeForControl("axis.line.x", clsElementLineXAxis, clsNewThemeFunction:=clsThemeFunction, clsNewBaseOperator:=clsBaseOperator, bReset:=bReset) + ucrYAxisLines.SetRCodeForControl("axis.line.y", clsElementLineYAxis, clsNewThemeFunction:=clsThemeFunction, clsNewBaseOperator:=clsBaseOperator, bReset:=bReset) + ucrThemeAxesTickLabels.SetRCodeForControl("axis.ticks", clsElementTickAxes, clsNewThemeFunction:=clsThemeFunction, clsNewBaseOperator:=clsBaseOperator, bReset:=bReset) + ucrTickMarksAxes.SetRCodeForControl("axis.text", clsElementTickText, clsNewThemeFunction:=clsThemeFunction, clsNewBaseOperator:=clsBaseOperator, bReset:=bReset) + ucrThemeAxesTitle.SetRCodeForControl("axis.title", clsXElementTitleText, clsNewThemeFunction:=clsThemeFunction, clsNewBaseOperator:=clsBaseOperator, bReset:=bReset) + ucrThemeAxesLines.SetRCodeForControl("axis.line", clsElementLineAxes, clsNewThemeFunction:=clsThemeFunction, clsNewBaseOperator:=clsBaseOperator, bReset:=bReset) ucrThemeBottomXAxis.SetRCodeForControl("axis.text.x", clsXElementText, clsNewThemeFunction:=clsThemeFunction, clsNewBaseOperator:=clsBaseOperator, bReset:=bReset) ucrThemeTopXAxis.SetRCodeForControl("axis.text.x.top", clsXTopElementText, clsNewThemeFunction:=clsThemeFunction, clsNewBaseOperator:=clsBaseOperator, bReset:=bReset) ucrThemeLeftYAxis.SetRCodeForControl("axis.text.y", clsYElementText, clsNewThemeFunction:=clsThemeFunction, clsNewBaseOperator:=clsBaseOperator, bReset:=bReset) - ucrThemeRightYAxis.SetRCodeForControl("axis.text.y.right", clsYRightElementText, clsNewThemeFunction:=clsThemeFunction, clsNewBaseOperator:=clsBaseOperator, bReset:=bReset) + ucrThemeYRightAxis.SetRCodeForControl("axis.text.y.right", clsYRightElementText, clsNewThemeFunction:=clsThemeFunction, clsNewBaseOperator:=clsBaseOperator, bReset:=bReset) + + ucrThemeTitleXAxis.SetRCodeForControl("axis.title.x", clsXElementTitle, clsNewThemeFunction:=clsThemeFunction, clsNewBaseOperator:=clsBaseOperator, bReset:=bReset) + ucrThemeTitleXTopAxis.SetRCodeForControl("axis.title.x.top", clsXTopElementTitle, clsNewThemeFunction:=clsThemeFunction, clsNewBaseOperator:=clsBaseOperator, bReset:=bReset) + ucrThemeTitleYAxis.SetRCodeForControl("axis.title.y", clsYElementTitle, clsNewThemeFunction:=clsThemeFunction, clsNewBaseOperator:=clsBaseOperator, bReset:=bReset) + ucrThemeTitleYRightAxis.SetRCodeForControl("axis.title.y.right", clsYRightElementTitle, clsNewThemeFunction:=clsThemeFunction, clsNewBaseOperator:=clsBaseOperator, bReset:=bReset) + 'AddRemoveElementParameters() End Sub diff --git a/instat/ucrAxes.vb b/instat/ucrAxes.vb index 1f66440f458..11cf68648a8 100644 --- a/instat/ucrAxes.vb +++ b/instat/ucrAxes.vb @@ -223,5 +223,6 @@ Public Class ucrAxes ' lblInStepsOf.Visible = True 'End If End Sub + End Class diff --git a/instat/ucrThemeAxes.Designer.vb b/instat/ucrELementTextControl.Designer.vb similarity index 81% rename from instat/ucrThemeAxes.Designer.vb rename to instat/ucrELementTextControl.Designer.vb index 3a84b81085b..7e0d1c42ba7 100644 --- a/instat/ucrThemeAxes.Designer.vb +++ b/instat/ucrELementTextControl.Designer.vb @@ -1,9 +1,9 @@ - _ -Partial Class ucrThemeAxes + +Partial Class ucrELementTextControl Inherits System.Windows.Forms.UserControl 'UserControl 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,9 +20,10 @@ Partial Class ucrThemeAxes '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.grpAxisLabels = New System.Windows.Forms.GroupBox() + Me.ucrColors = New instat.ucrColors() Me.ucrChkColour = New instat.ucrCheck() Me.ucrChkFace = New instat.ucrCheck() Me.ucrChkFamily = New instat.ucrCheck() @@ -38,7 +39,6 @@ Partial Class ucrThemeAxes Me.ucrNudsize = New instat.ucrNud() Me.ucrInputFace = New instat.ucrInputComboBox() Me.ucrInputFamily = New instat.ucrInputComboBox() - Me.ucrColors = New instat.ucrColors() Me.grpAxisLabels.SuspendLayout() Me.SuspendLayout() ' @@ -60,82 +60,91 @@ Partial Class ucrThemeAxes Me.grpAxisLabels.Controls.Add(Me.ucrNudsize) Me.grpAxisLabels.Controls.Add(Me.ucrInputFace) Me.grpAxisLabels.Controls.Add(Me.ucrInputFamily) - Me.grpAxisLabels.Location = New System.Drawing.Point(12, 10) + Me.grpAxisLabels.Location = New System.Drawing.Point(3, 0) Me.grpAxisLabels.Name = "grpAxisLabels" - Me.grpAxisLabels.Size = New System.Drawing.Size(274, 240) + Me.grpAxisLabels.Size = New System.Drawing.Size(246, 223) Me.grpAxisLabels.TabIndex = 71 Me.grpAxisLabels.TabStop = False - Me.grpAxisLabels.Text = "Axis Labels" + Me.grpAxisLabels.Text = "Element Text " + ' + 'ucrColors + ' + Me.ucrColors.AddQuotesIfUnrecognised = True + Me.ucrColors.IsReadOnly = False + Me.ucrColors.Location = New System.Drawing.Point(105, 191) + Me.ucrColors.Name = "ucrColors" + Me.ucrColors.Size = New System.Drawing.Size(137, 21) + Me.ucrColors.TabIndex = 86 ' 'ucrChkColour ' Me.ucrChkColour.Checked = False - Me.ucrChkColour.Location = New System.Drawing.Point(19, 210) + Me.ucrChkColour.Location = New System.Drawing.Point(8, 192) Me.ucrChkColour.Name = "ucrChkColour" - Me.ucrChkColour.Size = New System.Drawing.Size(100, 20) + Me.ucrChkColour.Size = New System.Drawing.Size(94, 20) Me.ucrChkColour.TabIndex = 85 ' 'ucrChkFace ' Me.ucrChkFace.Checked = False - Me.ucrChkFace.Location = New System.Drawing.Point(19, 183) + Me.ucrChkFace.Location = New System.Drawing.Point(8, 167) Me.ucrChkFace.Name = "ucrChkFace" - Me.ucrChkFace.Size = New System.Drawing.Size(100, 20) + Me.ucrChkFace.Size = New System.Drawing.Size(94, 20) Me.ucrChkFace.TabIndex = 84 ' 'ucrChkFamily ' Me.ucrChkFamily.Checked = False - Me.ucrChkFamily.Location = New System.Drawing.Point(19, 156) + Me.ucrChkFamily.Location = New System.Drawing.Point(8, 142) Me.ucrChkFamily.Name = "ucrChkFamily" - Me.ucrChkFamily.Size = New System.Drawing.Size(100, 20) + Me.ucrChkFamily.Size = New System.Drawing.Size(94, 20) Me.ucrChkFamily.TabIndex = 83 ' 'ucrChkAngle ' Me.ucrChkAngle.Checked = False - Me.ucrChkAngle.Location = New System.Drawing.Point(19, 129) + Me.ucrChkAngle.Location = New System.Drawing.Point(8, 117) Me.ucrChkAngle.Name = "ucrChkAngle" - Me.ucrChkAngle.Size = New System.Drawing.Size(100, 20) + Me.ucrChkAngle.Size = New System.Drawing.Size(94, 20) Me.ucrChkAngle.TabIndex = 82 ' 'ucrChkHjust ' Me.ucrChkHjust.Checked = False - Me.ucrChkHjust.Location = New System.Drawing.Point(19, 48) + Me.ucrChkHjust.Location = New System.Drawing.Point(8, 44) Me.ucrChkHjust.Name = "ucrChkHjust" - Me.ucrChkHjust.Size = New System.Drawing.Size(100, 20) + Me.ucrChkHjust.Size = New System.Drawing.Size(94, 20) Me.ucrChkHjust.TabIndex = 81 ' 'ucrChkVjust ' Me.ucrChkVjust.Checked = False - Me.ucrChkVjust.Location = New System.Drawing.Point(19, 75) + Me.ucrChkVjust.Location = New System.Drawing.Point(8, 69) Me.ucrChkVjust.Name = "ucrChkVjust" - Me.ucrChkVjust.Size = New System.Drawing.Size(100, 20) + Me.ucrChkVjust.Size = New System.Drawing.Size(94, 20) Me.ucrChkVjust.TabIndex = 80 ' 'ucrChkLineHeight ' Me.ucrChkLineHeight.Checked = False - Me.ucrChkLineHeight.Location = New System.Drawing.Point(19, 102) + Me.ucrChkLineHeight.Location = New System.Drawing.Point(8, 94) Me.ucrChkLineHeight.Name = "ucrChkLineHeight" - Me.ucrChkLineHeight.Size = New System.Drawing.Size(96, 18) + Me.ucrChkLineHeight.Size = New System.Drawing.Size(94, 18) Me.ucrChkLineHeight.TabIndex = 79 ' 'ucrChkSize ' Me.ucrChkSize.Checked = False - Me.ucrChkSize.Location = New System.Drawing.Point(19, 21) + Me.ucrChkSize.Location = New System.Drawing.Point(8, 19) Me.ucrChkSize.Name = "ucrChkSize" - Me.ucrChkSize.Size = New System.Drawing.Size(100, 20) + Me.ucrChkSize.Size = New System.Drawing.Size(94, 20) Me.ucrChkSize.TabIndex = 78 ' 'ucrNudVjust ' Me.ucrNudVjust.DecimalPlaces = New Decimal(New Integer() {1, 0, 0, 0}) Me.ucrNudVjust.Increment = New Decimal(New Integer() {1, 0, 0, 65536}) - Me.ucrNudVjust.Location = New System.Drawing.Point(119, 75) + Me.ucrNudVjust.Location = New System.Drawing.Point(105, 68) Me.ucrNudVjust.Maximum = New Decimal(New Integer() {1, 0, 0, 0}) Me.ucrNudVjust.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudVjust.Name = "ucrNudVjust" @@ -147,7 +156,7 @@ Partial Class ucrThemeAxes ' Me.ucrNudLineHeight.DecimalPlaces = New Decimal(New Integer() {1, 0, 0, 0}) Me.ucrNudLineHeight.Increment = New Decimal(New Integer() {1, 0, 0, 65536}) - Me.ucrNudLineHeight.Location = New System.Drawing.Point(119, 100) + Me.ucrNudLineHeight.Location = New System.Drawing.Point(105, 92) Me.ucrNudLineHeight.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) Me.ucrNudLineHeight.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudLineHeight.Name = "ucrNudLineHeight" @@ -159,7 +168,7 @@ Partial Class ucrThemeAxes ' Me.ucrNudAngle.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudAngle.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudAngle.Location = New System.Drawing.Point(119, 129) + Me.ucrNudAngle.Location = New System.Drawing.Point(105, 117) Me.ucrNudAngle.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) Me.ucrNudAngle.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudAngle.Name = "ucrNudAngle" @@ -171,7 +180,7 @@ Partial Class ucrThemeAxes ' Me.ucrNudHjust.DecimalPlaces = New Decimal(New Integer() {1, 0, 0, 0}) Me.ucrNudHjust.Increment = New Decimal(New Integer() {1, 0, 0, 65536}) - Me.ucrNudHjust.Location = New System.Drawing.Point(119, 48) + Me.ucrNudHjust.Location = New System.Drawing.Point(105, 43) Me.ucrNudHjust.Maximum = New Decimal(New Integer() {1, 0, 0, 0}) Me.ucrNudHjust.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudHjust.Name = "ucrNudHjust" @@ -183,7 +192,7 @@ Partial Class ucrThemeAxes ' 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(119, 21) + Me.ucrNudsize.Location = New System.Drawing.Point(105, 19) 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" @@ -195,7 +204,7 @@ Partial Class ucrThemeAxes ' Me.ucrInputFace.AddQuotesIfUnrecognised = True Me.ucrInputFace.IsReadOnly = False - Me.ucrInputFace.Location = New System.Drawing.Point(119, 182) + Me.ucrInputFace.Location = New System.Drawing.Point(105, 166) Me.ucrInputFace.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) Me.ucrInputFace.Name = "ucrInputFace" Me.ucrInputFace.Size = New System.Drawing.Size(137, 21) @@ -205,28 +214,19 @@ Partial Class ucrThemeAxes ' Me.ucrInputFamily.AddQuotesIfUnrecognised = True Me.ucrInputFamily.IsReadOnly = False - Me.ucrInputFamily.Location = New System.Drawing.Point(119, 155) + Me.ucrInputFamily.Location = New System.Drawing.Point(105, 141) Me.ucrInputFamily.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) Me.ucrInputFamily.Name = "ucrInputFamily" Me.ucrInputFamily.Size = New System.Drawing.Size(137, 21) Me.ucrInputFamily.TabIndex = 70 ' - 'ucrColors - ' - Me.ucrColors.AddQuotesIfUnrecognised = True - Me.ucrColors.IsReadOnly = False - Me.ucrColors.Location = New System.Drawing.Point(119, 209) - Me.ucrColors.Name = "ucrColors" - Me.ucrColors.Size = New System.Drawing.Size(137, 21) - Me.ucrColors.TabIndex = 86 - ' 'ucrThemeAxes ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.Controls.Add(Me.grpAxisLabels) Me.Name = "ucrThemeAxes" - Me.Size = New System.Drawing.Size(296, 260) + Me.Size = New System.Drawing.Size(259, 227) Me.grpAxisLabels.ResumeLayout(False) Me.ResumeLayout(False) diff --git a/instat/ucrThemeAxes.resx b/instat/ucrELementTextControl.resx similarity index 100% rename from instat/ucrThemeAxes.resx rename to instat/ucrELementTextControl.resx diff --git a/instat/ucrThemeAxes.vb b/instat/ucrELementTextControl.vb similarity index 92% rename from instat/ucrThemeAxes.vb rename to instat/ucrELementTextControl.vb index 887883f2c77..77752be68ea 100644 --- a/instat/ucrThemeAxes.vb +++ b/instat/ucrELementTextControl.vb @@ -14,12 +14,11 @@ ' You should have received a copy of the GNU General Public License k ' along with this program. If not, see . -Public Class ucrThemeAxes +Public Class ucrELementTextControl Private bInitialiseControls As Boolean = False Public strAxis As String Private clsThemeFunction As New RFunction Private clsElementText As New RFunction - Private strParameter As String Private clsBaseOperator As New ROperator Public Sub InitialiseControl() @@ -47,8 +46,8 @@ Public Class ucrThemeAxes ucrChkColour.SetText("Colour") ucrColors.SetParameter(New RParameter("colour")) ucrColors.AddQuotesIfUnrecognised = False - ' ucrInputColour.SetItems(New Dictionary(Of String, String)(GgplotDefaults.dctColour)) - 'ucrInputColour.SetRDefault(Chr(34) & "black" & Chr(34)) + 'ucrColors.bAllowNonConditionValues = True + ucrColors.SetName(Chr(34) & "NULL" & Chr(34)) ucrChkFamily.SetText("Family") ucrInputFamily.SetParameter(New RParameter("family")) @@ -130,4 +129,13 @@ Public Class ucrThemeAxes Private Sub ElementXAxisTextControls_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkAngle.ControlValueChanged, ucrChkHjust.ControlValueChanged, ucrChkLineHeight.ControlValueChanged, ucrChkSize.ControlValueChanged, ucrChkVjust.ControlValueChanged, ucrChkColour.ControlValueChanged, ucrChkFace.ControlValueChanged, ucrChkFamily.ControlValueChanged AddRemoveElementAxis() End Sub + + Private Sub grpAxisLabels_Enter(sender As Object, e As EventArgs) Handles grpAxisLabels.Enter + + End Sub + + Public Sub setlabel(strlabel As String) + grpAxisLabels.Text = strlabel + End Sub + End Class diff --git a/instat/ucrElementLineControl.Designer.vb b/instat/ucrElementLineControl.Designer.vb new file mode 100644 index 00000000000..92435e786eb --- /dev/null +++ b/instat/ucrElementLineControl.Designer.vb @@ -0,0 +1,148 @@ + +Partial Class ucrElementLineControl + Inherits System.Windows.Forms.UserControl + + 'UserControl 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.grpTickMarks = New System.Windows.Forms.GroupBox() + Me.ucrColors = New instat.ucrColors() + Me.ucrChkTickLineEnd = New instat.ucrCheck() + Me.ucrChkTickSize = New instat.ucrCheck() + Me.ucrChkTickLineType = New instat.ucrCheck() + Me.ucrChkTickColour = New instat.ucrCheck() + Me.ucrInpuTicktLineEnd = New instat.ucrInputComboBox() + Me.ucrNudTickSize = New instat.ucrNud() + Me.ucrInputTickLineType = New instat.ucrInputComboBox() + Me.grpTickMarks.SuspendLayout() + Me.SuspendLayout() + ' + 'grpTickMarks + ' + Me.grpTickMarks.Controls.Add(Me.ucrColors) + Me.grpTickMarks.Controls.Add(Me.ucrChkTickLineEnd) + Me.grpTickMarks.Controls.Add(Me.ucrChkTickSize) + Me.grpTickMarks.Controls.Add(Me.ucrChkTickLineType) + Me.grpTickMarks.Controls.Add(Me.ucrChkTickColour) + Me.grpTickMarks.Controls.Add(Me.ucrInpuTicktLineEnd) + Me.grpTickMarks.Controls.Add(Me.ucrNudTickSize) + Me.grpTickMarks.Controls.Add(Me.ucrInputTickLineType) + Me.grpTickMarks.Location = New System.Drawing.Point(2, 1) + Me.grpTickMarks.Name = "grpTickMarks" + Me.grpTickMarks.Size = New System.Drawing.Size(247, 119) + Me.grpTickMarks.TabIndex = 41 + Me.grpTickMarks.TabStop = False + Me.grpTickMarks.Text = "Element Line" + ' + 'ucrColors + ' + Me.ucrColors.AddQuotesIfUnrecognised = True + Me.ucrColors.IsReadOnly = False + Me.ucrColors.Location = New System.Drawing.Point(100, 66) + Me.ucrColors.Name = "ucrColors" + Me.ucrColors.Size = New System.Drawing.Size(137, 21) + Me.ucrColors.TabIndex = 87 + ' + 'ucrChkTickLineEnd + ' + Me.ucrChkTickLineEnd.Checked = False + Me.ucrChkTickLineEnd.Location = New System.Drawing.Point(11, 92) + Me.ucrChkTickLineEnd.Name = "ucrChkTickLineEnd" + Me.ucrChkTickLineEnd.Size = New System.Drawing.Size(88, 20) + Me.ucrChkTickLineEnd.TabIndex = 54 + ' + 'ucrChkTickSize + ' + Me.ucrChkTickSize.Checked = False + Me.ucrChkTickSize.Location = New System.Drawing.Point(11, 20) + Me.ucrChkTickSize.Name = "ucrChkTickSize" + Me.ucrChkTickSize.Size = New System.Drawing.Size(88, 20) + Me.ucrChkTickSize.TabIndex = 53 + ' + 'ucrChkTickLineType + ' + Me.ucrChkTickLineType.Checked = False + Me.ucrChkTickLineType.Location = New System.Drawing.Point(11, 44) + Me.ucrChkTickLineType.Name = "ucrChkTickLineType" + Me.ucrChkTickLineType.Size = New System.Drawing.Size(88, 20) + Me.ucrChkTickLineType.TabIndex = 52 + ' + 'ucrChkTickColour + ' + Me.ucrChkTickColour.Checked = False + Me.ucrChkTickColour.Location = New System.Drawing.Point(11, 68) + Me.ucrChkTickColour.Name = "ucrChkTickColour" + Me.ucrChkTickColour.Size = New System.Drawing.Size(88, 20) + Me.ucrChkTickColour.TabIndex = 51 + ' + 'ucrInpuTicktLineEnd + ' + Me.ucrInpuTicktLineEnd.AddQuotesIfUnrecognised = True + Me.ucrInpuTicktLineEnd.IsReadOnly = False + Me.ucrInpuTicktLineEnd.Location = New System.Drawing.Point(100, 90) + Me.ucrInpuTicktLineEnd.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) + Me.ucrInpuTicktLineEnd.Name = "ucrInpuTicktLineEnd" + Me.ucrInpuTicktLineEnd.Size = New System.Drawing.Size(137, 21) + Me.ucrInpuTicktLineEnd.TabIndex = 32 + ' + 'ucrNudTickSize + ' + Me.ucrNudTickSize.DecimalPlaces = New Decimal(New Integer() {1, 0, 0, 0}) + Me.ucrNudTickSize.Increment = New Decimal(New Integer() {1, 0, 0, 0}) + Me.ucrNudTickSize.Location = New System.Drawing.Point(100, 19) + Me.ucrNudTickSize.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) + Me.ucrNudTickSize.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudTickSize.Name = "ucrNudTickSize" + Me.ucrNudTickSize.Size = New System.Drawing.Size(50, 20) + Me.ucrNudTickSize.TabIndex = 30 + Me.ucrNudTickSize.Value = New Decimal(New Integer() {0, 0, 0, 0}) + ' + 'ucrInputTickLineType + ' + Me.ucrInputTickLineType.AddQuotesIfUnrecognised = True + Me.ucrInputTickLineType.IsReadOnly = False + Me.ucrInputTickLineType.Location = New System.Drawing.Point(100, 42) + Me.ucrInputTickLineType.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) + Me.ucrInputTickLineType.Name = "ucrInputTickLineType" + Me.ucrInputTickLineType.Size = New System.Drawing.Size(137, 21) + Me.ucrInputTickLineType.TabIndex = 26 + ' + 'ucrTickMarksAndLabels + ' + Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) + Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.Controls.Add(Me.grpTickMarks) + Me.Name = "ucrTickMarksAndLabels" + Me.Size = New System.Drawing.Size(255, 123) + Me.grpTickMarks.ResumeLayout(False) + Me.ResumeLayout(False) + + End Sub + + Friend WithEvents grpTickMarks As GroupBox + Friend WithEvents ucrChkTickLineEnd As ucrCheck + Friend WithEvents ucrChkTickSize As ucrCheck + Friend WithEvents ucrChkTickLineType As ucrCheck + Friend WithEvents ucrChkTickColour As ucrCheck + Friend WithEvents ucrInpuTicktLineEnd As ucrInputComboBox + Friend WithEvents ucrNudTickSize As ucrNud + Friend WithEvents ucrInputTickLineType As ucrInputComboBox + Friend WithEvents ucrColors As ucrColors +End Class diff --git a/instat/ucrElementLineControl.resx b/instat/ucrElementLineControl.resx new file mode 100644 index 00000000000..29dcb1b3a35 --- /dev/null +++ b/instat/ucrElementLineControl.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/ucrElementLineControl.vb b/instat/ucrElementLineControl.vb new file mode 100644 index 00000000000..66ea4ab5fe3 --- /dev/null +++ b/instat/ucrElementLineControl.vb @@ -0,0 +1,107 @@ +' Instat-R +' Copyright (C) 2015 +' +' 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 k +' along with this program. If not, see . + +Public Class ucrElementLineControl + Private bInitialiseControls As Boolean = False + Public strAxisLine As String + Private clsThemeFunction As New RFunction + Private clsElementLine As New RFunction + Private clsBaseOperator As New ROperator + Public Sub InitialiseControl() + + ucrChkTickSize.SetText("Size") + ucrNudTickSize.SetParameter(New RParameter("size")) + ucrNudTickSize.Increment = 0.1 + + + ucrChkTickLineType.SetText("Line Type") + ucrInputTickLineType.SetParameter(New RParameter("linetype")) + ucrInputTickLineType.SetItems(New Dictionary(Of String, String)(GgplotDefaults.dctLineType)) + ucrInputTickLineType.SetRDefault(Chr(34) & "blank" & Chr(34)) + + ucrChkTickColour.SetText("Colour") + ucrColors.SetParameter(New RParameter("colour")) + ucrColors.SetItems(New Dictionary(Of String, String)(GgplotDefaults.dctColour)) + ucrColors.AddQuotesIfUnrecognised = False + ucrColors.SetRDefault(Chr(34) & "black" & Chr(34)) + + ucrChkTickLineEnd.SetText("Line End") + ucrInpuTicktLineEnd.SetParameter(New RParameter("lineend")) + ucrInpuTicktLineEnd.SetItems(New Dictionary(Of String, String)(GgplotDefaults.dctLineEnd)) + ucrInpuTicktLineEnd.SetRDefault(Chr(34) & "square" & Chr(34)) + + + ucrChkTickSize.AddToLinkedControls(ucrNudTickSize, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) + ucrChkTickLineType.AddToLinkedControls(ucrInputTickLineType, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) + ucrChkTickLineEnd.AddToLinkedControls(ucrInpuTicktLineEnd, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) + ucrChkTickColour.AddToLinkedControls(ucrColors, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) + bInitialiseControls = True + End Sub + + Public Sub SetAxisLine(strNewAxis As String) + strAxisLine = strNewAxis + End Sub + + Public Sub SetRCodeForControl(strNewAxisLine As String, clsNewElementLine As RFunction, clsNewThemeFunction As RFunction, clsNewBaseOperator As ROperator, Optional bReset As Boolean = False) + If Not bInitialiseControls Then + InitialiseControl() + End If + + SetAxisLine(strNewAxisLine) + clsBaseOperator = clsNewBaseOperator + clsThemeFunction = clsNewThemeFunction + clsElementLine = clsNewElementLine + + ucrNudTickSize.SetRCode(clsElementLine, bReset) + ucrChkTickSize.SetRCode(clsElementLine, bReset) + + ucrColors.SetRCode(clsElementLine, bReset) + ucrChkTickColour.SetRCode(clsElementLine, bReset) + + ucrInputTickLineType.SetRCode(clsElementLine, bReset) + ucrChkTickLineType.SetRCode(clsElementLine, bReset) + + ucrInpuTicktLineEnd.SetRCode(clsElementLine, bReset) + ucrChkTickLineEnd.SetRCode(clsElementLine, bReset) + AddRemoveElementLineAxis() + End Sub + + Private Sub AddRemoveElementLineAxis() + If ucrChkTickColour.Checked OrElse ucrChkTickLineEnd.Checked OrElse ucrChkTickLineType.Checked OrElse ucrChkTickSize.Checked Then + clsThemeFunction.AddParameter(strAxisLine, clsRFunctionParameter:=clsElementLine) + Else + clsThemeFunction.RemoveParameterByName(strAxisLine) + End If + AddRemoveTheme() + 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 ElementTickAxisLineControls_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkTickLineType.ControlValueChanged, ucrChkTickSize.ControlValueChanged, ucrChkTickLineEnd.ControlValueChanged, ucrChkTickColour.ControlValueChanged + AddRemoveElementLineAxis() + End Sub + + Public Sub setlabel(strlabel As String) + grpTickMarks.Text = strlabel + End Sub + +End Class From 36a11adbe6111cf4893c2e88458afac9d5025625 Mon Sep 17 00:00:00 2001 From: Danny Parsons Date: Wed, 7 Jun 2017 13:30:22 +0100 Subject: [PATCH 111/154] geom aes rewriting linking --- instat/UcrGeomListWithAes.vb | 205 ++++++++++++++++++++++------------- instat/dlgMetadata.vb | 6 +- instat/sdgLayerOptions.vb | 14 +-- 3 files changed, 140 insertions(+), 85 deletions(-) diff --git a/instat/UcrGeomListWithAes.vb b/instat/UcrGeomListWithAes.vb index 88d2e988659..e7dfe60b574 100644 --- a/instat/UcrGeomListWithAes.vb +++ b/instat/UcrGeomListWithAes.vb @@ -28,7 +28,11 @@ Public Class UcrGeomListWithParameters Public Event DataFrameChanged() 'clsGeomAesFunction stores the value (aes function) of the local mapping (of this particular layer). It is used as parameter in sdgLayerOptions.clsGeomFunction. Public bAddToLocalAes As Boolean = True - Public bCurrentFixAes As Boolean = True + ' Intermediate aes function which is the combination of the current global aes and the local aes. + ' This is the function linked to the receivers with it updates and will update from + ' This is needed to prevent real time changes to global or local aes because this can change e.g. when apply globally is checked + ' When returning from this control, the intermediate aes with update the global and local aes appropriately + Private clsInterAesFunction As New RFunction Public Sub New() @@ -46,6 +50,8 @@ Public Class UcrGeomListWithParameters Private Sub UcrGeomListWithParameters_Load(sender As Object, e As EventArgs) Handles MyBase.Load If bFirstLoad Then SetParameters() + clsInterAesFunction.SetPackageName("ggplot2") + clsInterAesFunction.SetRCommand("aes") 'This one is called when the geom is changed, which is apparently the case when the Layer is loaded (first thing that happens). Left in for security but could be taken out. bFirstLoad = False End If @@ -81,17 +87,12 @@ Public Class UcrGeomListWithParameters Public Overrides Sub Setup(clsNewGeomFunc As RFunction, clsNewGlobalAesFunc As RFunction, Optional bFixGeom As Boolean = False, Optional strDataframe As String = "", Optional bApplyAesGlobally As Boolean = True, Optional iNumVariablesForGeoms As Integer = -1, Optional clsNewLocalAes As RFunction = Nothing, Optional bReset As Boolean = False) 'See ucrAdditionalLayers and Specific Plots dlg to see how the SetUp Parameters are chosen within the sdgLayerOptions.SetupLayer call. MyBase.Setup(clsNewGeomFunc, clsNewGlobalAesFunc, bFixGeom, strDataframe, bApplyAesGlobally, iNumVariablesForGeoms, clsNewLocalAes, bReset) - strGlobalDataFrame = strDataframe - If clsNewLocalAes IsNot Nothing Then - clsLocalAesFunction = clsNewLocalAes - Else - clsLocalAesFunction = New RFunction - clsLocalAesFunction.SetRCommand("aes") - End If - 'ucrGeomWithAesSelector.Reset() 'Warning: Not sure this is necessary anymore... Testing will confirm. + ' This might stay as data frame depends on global/local option and therefore can't be linked to a function InitialiseSelectedDataFrame() + SetInterAes(bReset) + 'Using the values of the two relevant parameters, the two following lines determine whether the chkBoxes ApplyToAllLayers and IgnoreGlobalAes should be ticked. 'Introduced a safety net: these can't be ticked at the same time, in that case an error has been made in the code and a message is sent to the user. If bApplyAesGlobally AndAlso bIgnoreGlobalAes Then @@ -102,65 +103,109 @@ Public Class UcrGeomListWithParameters chkApplyOnAllLayers.Checked = bApplyAesGlobally chkIgnoreGlobalAes.Checked = bIgnoreGlobalAes 'Note: raises the event check changed if the value has indeed changed. - - - - - bCurrentFixAes = bFixAes 'Warning/Question/Task: this is not flexible enough. Some of the aesthetics are set in the options. They cannot be editted on the main, however when coming back to options these are fixed and so cannot be editted anywhere anymore. Would need to be able to choose which aesthetics among a Layer should be fixed maybe. - 'SetAes needs to be called after the IgnoreGlobalAes has been setup as it determines whether the global aes are written in the rceivers or not. - SetAes(bCurrentFixAes) + SetAes() 'Warning: SetAes is called three times when a layer is created... one in the load, one in the setup, one when geom is set, ... End Sub - Private Function LocalAndGlobalDataFramesAreDifferent() As Boolean - 'This methods checks whether the dataframe used for this layer is different from the global dataframe. If they are different, then chkIgnoreGlobalAes is checked. See UcrSelector_DataFrameChanged. Might also be used to print global aes in red when dataframes are different. - Dim bValue As Boolean = False - If strGlobalDataFrame <> "" AndAlso ucrGeomWithAesSelector.strCurrentDataFrame <> strGlobalDataFrame Then 'Warning: if the CurrentDataframe is chosen appropriately, which is the case thanks to InitialiseSelectedDataFrame - bValue = True - End If - Return bValue - End Function + Private Sub SetInterAes(Optional bReset As Boolean = False) + Dim iFirstEmptyAes As Integer = 0 + Dim bAesFound As Boolean = False + Dim strCurrGeomAesParamName As String - Private Sub SetAes() - 'This function fills in the aesthetic receivers with the appropriate values, starting with the values coming from the global aes (if IgnoreGlobalAes is not chacked) and then in the local aes. - Dim bFirstEnabled As Boolean = True - Dim iFirstEnabled As Integer = 0 - bAddToLocalAes = False - 'We are changing the content of the receivers according to the info in the clsGgplotAesFunction and clsGeomAesFunction. We don't want to change the content of clsGeomAesFunction according to the changed content of the receivers. Hence we set bApplyToLocalAes to False at the beginning of this procedure, then reset it to True at the end (see ucrReceiverParam_WithMeSelectionChanged). + 'Clear code so receivers don't update until intermediate function is set + ClearReceiversCodeAndParameter() For i = 0 To clsCurrGeom.clsAesParameters.Count - 1 - 'Clear the potentially up to date content of the Aesthetics receivers. If the content of lstAesParameterUcr(i) is still relevant, then one of the parameters's name in clsGgplotAesFunction will match lstCurrArguments(i) and the value recovered accordingly. - 'Warning/Question: when geom is changed, local aes of previous geom are not kept. Is that fine ? Could change the method for layer to remember the previous selection for common aes between the two geoms. - 'Warning: the order in which the two following are called counts as clearing only operates when ucr is enabled. Not that this sub will always enable all ucr's that were previously disabled. - lstAesParameterReceivers(i).Clear() - 'When IgnoreGlobalAes is checked, we don't want the global aesthetics to appear in the receivers. + strCurrGeomAesParamName = clsCurrGeom.clsAesParameters(i).strAesParameterName + lstAesParameterReceivers(i).SetParameter(New RParameter(strCurrGeomAesParamName)) 'Task: print global aesthetics in blue within the receivers and perhaps global aesthetics inherited from another dataframe in red ? + 'When IgnoreGlobalAes is not checked, we want the applicable global aesthetics to appear in the intermediate function. If Not chkIgnoreGlobalAes.Checked Then - For Each clsParam In clsGlobalAesFunction.clsParameters - If clsParam.strArgumentName = lstCurrArguments(i) Then - 'For some geoms like LinePlot, when the x or y aes is not filled, ggplot R syntax requires to set x="". This x="" might be copied into the global aes if the ApplyOnAllLayers is set to true for a BoxPlot Layer. This might be copied from the GgplotAesFunction parameters into the aes receivers by error in subsequent layers. - If Not ((clsParam.strArgumentName = "x" OrElse clsParam.strArgumentName = "y") AndAlso clsParam.strArgumentValue = Chr(34) & Chr(34)) Then - lstAesParameterReceivers(i).Add(clsParam.strArgumentValue) - Exit For - End If - End If - Next - End If - For Each clsParam In clsLocalAesFunction.clsParameters - If clsParam.strArgumentName = lstCurrArguments(i) Then - If Not ((clsParam.strArgumentName = "x" OrElse clsParam.strArgumentName = "y") AndAlso clsParam.strArgumentValue = Chr(34) & Chr(34)) Then 'As before, check that x is not mapped to "" before putting in receivers. - lstAesParameterReceivers(i).Add(clsParam.strArgumentValue) - lstAesParameterReceivers(i).Enabled = True - Exit For - End If + 'For some geoms e.g. geom_line, when an aes is not filled in (usually x or y), ggplot syntax requires the aes to be set to "" e.g. x = "". + 'We do not need to copy this to the intermediate aes as they are affectively empty + If clsGlobalAesFunction.ContainsParameter(strCurrGeomAesParamName) AndAlso Not clsGlobalAesFunction.GetParameter(strCurrGeomAesParamName).strArgumentValue = Chr(34) & Chr(34) Then + bAesFound = True + clsInterAesFunction.AddParameter(clsGlobalAesFunction.GetParameter(strCurrGeomAesParamName).Clone()) End If - Next - If bFirstEnabled AndAlso lstAesParameterReceivers(i).Enabled Then - iFirstEnabled = i - bFirstEnabled = False + 'For Each clsParam In clsGlobalAesFunction.clsParameters + ' If clsParam.strArgumentName = lstCurrArguments(i) Then + ' If Not ((clsParam.strArgumentName = "x" OrElse clsParam.strArgumentName = "y") AndAlso clsParam.strArgumentValue = Chr(34) & Chr(34)) Then + ' lstAesParameterReceivers(i).Add(clsParam.strArgumentValue) + ' Exit For + ' End If + ' End If + 'Next + End If + If clsLocalAesFunction.ContainsParameter(strCurrGeomAesParamName) AndAlso Not clsLocalAesFunction.GetParameter(strCurrGeomAesParamName).strArgumentValue = Chr(34) & Chr(34) Then + bAesFound = True + clsInterAesFunction.AddParameter(clsGlobalAesFunction.GetParameter(strCurrGeomAesParamName).Clone()) End If + + 'For Each clsParam In clsLocalAesFunction.clsParameters + ' If clsParam.strArgumentName = lstCurrArguments(i) Then + ' If Not ((clsParam.strArgumentName = "x" OrElse clsParam.strArgumentName = "y") AndAlso clsParam.strArgumentValue = Chr(34) & Chr(34)) Then 'As before, check that x is not mapped to "" before putting in receivers. + ' lstAesParameterReceivers(i).Add(clsParam.strArgumentValue) + ' lstAesParameterReceivers(i).Enabled = True + ' Exit For + ' End If + ' End If + 'Next + If bAesFound Then + iFirstEmptyAes = i + End If + bAesFound = False Next - lstAesParameterReceivers(iFirstEnabled).SetMeAsReceiver() - bAddToLocalAes = True + SetRCodeForReceivers(clsInterAesFunction, bReset) + End Sub + + 'Private Function LocalAndGlobalDataFramesAreDifferent() As Boolean + ' 'This methods checks whether the dataframe used for this layer is different from the global dataframe. If they are different, then chkIgnoreGlobalAes is checked. See UcrSelector_DataFrameChanged. Might also be used to print global aes in red when dataframes are different. + ' Dim bValue As Boolean = False + ' If strGlobalDataFrame <> "" AndAlso ucrGeomWithAesSelector.strCurrentDataFrame <> strGlobalDataFrame Then 'Warning: if the CurrentDataframe is chosen appropriately, which is the case thanks to InitialiseSelectedDataFrame + ' bValue = True + ' End If + ' Return bValue + 'End Function + + Private Sub SetAes() + ''This function fills in the aesthetic receivers with the appropriate values, starting with the values coming from the global aes (if IgnoreGlobalAes is not chacked) and then in the local aes. + 'Dim bFirstEnabled As Boolean = True + 'Dim iFirstEnabled As Integer = 0 + 'bAddToLocalAes = False + ''We are changing the content of the receivers according to the info in the clsGgplotAesFunction and clsGeomAesFunction. We don't want to change the content of clsGeomAesFunction according to the changed content of the receivers. Hence we set bApplyToLocalAes to False at the beginning of this procedure, then reset it to True at the end (see ucrReceiverParam_WithMeSelectionChanged). + 'For i = 0 To clsCurrGeom.clsAesParameters.Count - 1 + ' 'Clear the potentially up to date content of the Aesthetics receivers. If the content of lstAesParameterUcr(i) is still relevant, then one of the parameters's name in clsGgplotAesFunction will match lstCurrArguments(i) and the value recovered accordingly. + ' 'Warning/Question: when geom is changed, local aes of previous geom are not kept. Is that fine ? Could change the method for layer to remember the previous selection for common aes between the two geoms. + ' 'Warning: the order in which the two following are called counts as clearing only operates when ucr is enabled. Not that this sub will always enable all ucr's that were previously disabled. + ' lstAesParameterReceivers(i).Clear() + ' 'When IgnoreGlobalAes is checked, we don't want the global aesthetics to appear in the receivers. + ' 'Task: print global aesthetics in blue within the receivers and perhaps global aesthetics inherited from another dataframe in red ? + ' If Not chkIgnoreGlobalAes.Checked Then + ' For Each clsParam In clsGlobalAesFunction.clsParameters + ' If clsParam.strArgumentName = lstCurrArguments(i) Then + ' 'For some geoms like LinePlot, when the x or y aes is not filled, ggplot R syntax requires to set x="". This x="" might be copied into the global aes if the ApplyOnAllLayers is set to true for a BoxPlot Layer. This might be copied from the GgplotAesFunction parameters into the aes receivers by error in subsequent layers. + ' If Not ((clsParam.strArgumentName = "x" OrElse clsParam.strArgumentName = "y") AndAlso clsParam.strArgumentValue = Chr(34) & Chr(34)) Then + ' lstAesParameterReceivers(i).Add(clsParam.strArgumentValue) + ' Exit For + ' End If + ' End If + ' Next + ' End If + ' For Each clsParam In clsLocalAesFunction.clsParameters + ' If clsParam.strArgumentName = lstCurrArguments(i) Then + ' If Not ((clsParam.strArgumentName = "x" OrElse clsParam.strArgumentName = "y") AndAlso clsParam.strArgumentValue = Chr(34) & Chr(34)) Then 'As before, check that x is not mapped to "" before putting in receivers. + ' lstAesParameterReceivers(i).Add(clsParam.strArgumentValue) + ' lstAesParameterReceivers(i).Enabled = True + ' Exit For + ' End If + ' End If + ' Next + ' If bFirstEnabled AndAlso lstAesParameterReceivers(i).Enabled Then + ' iFirstEnabled = i + ' bFirstEnabled = False + ' End If + 'Next + 'lstAesParameterReceivers(iFirstEnabled).SetMeAsReceiver() + 'bAddToLocalAes = True End Sub Public Sub SetParameters() 'this will set function or aes parameters @@ -218,7 +263,7 @@ Public Class UcrGeomListWithParameters Else 'If the current geom has not been populated, then an error has been made in the code MsgBox("Developer Error: the current geom (clsCurrGeom) has not been populated before setting the aes parameters for the ucrGeomListWithAes on the sdgLayerOptions.", MsgBoxStyle.OkOnly) End If - SetAes(bCurrentFixAes) + SetAes() End Sub Public Sub UcrGeomListWithParameters_cboGeomListIndexChanged() Handles Me.GeomChanged @@ -229,17 +274,17 @@ Public Class UcrGeomListWithParameters End Sub Private Sub ucrReceiverParam_WithMeSelectionChanged(ucrChangedReceiver As ucrReceiverSingle) Handles ucrReceiverParam1.WithMeSelectionChanged, ucrReceiverParam2.WithMeSelectionChanged, ucrReceiverParam3.WithMeSelectionChanged, ucrReceiverParam4.WithMeSelectionChanged, ucrReceiverParam5.WithMeSelectionChanged, ucrReceiverParam6.WithMeSelectionChanged, ucrReceiverParam7.WithMeSelectionChanged, ucrReceiverParam8.WithMeSelectionChanged, ucrReceiverParam9.WithMeSelectionChanged, ucrReceiverParam10.WithMeSelectionChanged, ucrReceiverParam11.WithMeSelectionChanged, ucrReceiverParam12.WithMeSelectionChanged, ucrReceiverParam13.WithMeSelectionChanged - Dim iIndex As Integer - 'bApplyToLocalAes is used to avoid changing the content of clsGeomAesFunction when the receivers are setup according to the content of clsGeomAesFunction and clsGgplotAesFunction in SetAes(). - If bAddToLocalAes Then - iIndex = lstAesParameterReceivers.IndexOf(ucrChangedReceiver) - If Not ucrChangedReceiver.IsEmpty Then - clsLocalAesFunction.AddParameter(lstCurrArguments(iIndex), ucrChangedReceiver.GetVariableNames(False)) - ElseIf iIndex < lstCurrArguments.Count Then 'Warning/Task: got an error here. The iIndex was longer than lstCurrArguments when clicking on edit layer. Don't really understand how this is possible. Just added the reality check but might need to put more thoughts into this... - clsLocalAesFunction.RemoveParameterByName(lstCurrArguments(iIndex)) - Else MsgBox("Developer Error: the iIndex (going through lstAesParameterUcr) in ucrReceiverParam_WithMeSelectionChanged is greater than lstAesParameterUcr.count. We beleive that this occurs when editting a layer with fewer aes parameters than there are filled aesthetics parameters in the GlobalAesthetics.", MsgBoxStyle.OkOnly) - End If - End If + 'Dim iIndex As Integer + ''bApplyToLocalAes is used to avoid changing the content of clsGeomAesFunction when the receivers are setup according to the content of clsGeomAesFunction and clsGgplotAesFunction in SetAes(). + 'If bAddToLocalAes Then + ' iIndex = lstAesParameterReceivers.IndexOf(ucrChangedReceiver) + ' If Not ucrChangedReceiver.IsEmpty Then + ' clsLocalAesFunction.AddParameter(lstCurrArguments(iIndex), ucrChangedReceiver.GetVariableNames(False)) + ' ElseIf iIndex < lstCurrArguments.Count Then 'Warning/Task: got an error here. The iIndex was longer than lstCurrArguments when clicking on edit layer. Don't really understand how this is possible. Just added the reality check but might need to put more thoughts into this... + ' clsLocalAesFunction.RemoveParameterByName(lstCurrArguments(iIndex)) + ' Else MsgBox("Developer Error: the iIndex (going through lstAesParameterUcr) in ucrReceiverParam_WithMeSelectionChanged is greater than lstAesParameterUcr.count. We beleive that this occurs when editting a layer with fewer aes parameters than there are filled aesthetics parameters in the GlobalAesthetics.", MsgBoxStyle.OkOnly) + ' End If + 'End If End Sub Public Function TestForOkEnabled() As Boolean @@ -288,14 +333,16 @@ Public Class UcrGeomListWithParameters Private Sub ucrGeomWithAesSelector_DataFrameChanged() Handles ucrGeomWithAesSelector.DataFrameChanged 'Warning: When the dataframes in local layers don't correspond to the data in the global ggplot function, inherit.aes should be set to false unless variables have the same name in different dataframes... 'Warning: in ggplot, one can work with data1 in the global ggplot function and data2 in some layer. If the parameter inherit.aes is not set to false, the mapping in ggplot function will be copied into the layer with different dataframe. Unless the variables used in data1 are also variables in data2, this will give an error and crash the software... - If LocalAndGlobalDataFramesAreDifferent() Then - chkIgnoreGlobalAes.Checked = True - Else - 'Task: add a warning message explaining the situation to the user when warning messages will have been implemented homogenuously through out the software... + 'Probably don't need. Could want global aes for different data frames if column names are the same + 'If LocalAndGlobalDataFramesAreDifferent() Then + 'chkIgnoreGlobalAes.Checked = True - 'chkIgnoreGlobalAes.Checked = False 'Warning, if IgnoreGlobalAes was checked before changing dataframe and coming back, then it will be unchecked now... - End If + 'Else + 'Task: add a warning message explaining the situation to the user when warning messages will have been implemented homogenuously through out the software... + + 'chkIgnoreGlobalAes.Checked = False 'Warning, if IgnoreGlobalAes was checked before changing dataframe and coming back, then it will be unchecked now... + 'End If 'Note SetAes will be called automatically if chkIgnoreGlobalAes.checked has been changed. End Sub @@ -305,4 +352,10 @@ Public Class UcrGeomListWithParameters ucrTempReceiver.Clear() Next End Sub + + Public Sub SetRCodeForReceivers(clsNewRCode As RCodeStructure, Optional bReset As Boolean = False) + For Each ucrTempReceiver As ucrReceiver In lstAesParameterReceivers + ucrTempReceiver.SetRCode(clsNewRCode, bReset) + Next + End Sub End Class diff --git a/instat/dlgMetadata.vb b/instat/dlgMetadata.vb index 99ff5c47daa..8e57eafce9f 100644 --- a/instat/dlgMetadata.vb +++ b/instat/dlgMetadata.vb @@ -45,7 +45,8 @@ Public Class dlgMetadata ' Also need to get current values of metadata to set in ucrReceiverMetadataProperty clsLayerParam.strLayerParameterDataType = "list" - ucrNewValue.SetControls(clsLayerParam) + 'To be updated, not correct + ucrNewValue.SetControls(Nothing, clsLayerParam) ucrReceiverChooseProperty.Selector = ucrSelectByMetadata ucrReceiverChooseColumns.Selector = ucrSelectByMetadata ucrReceiverChooseProperty.SetMeAsReceiver() @@ -129,7 +130,8 @@ Public Class dlgMetadata clsLayerParam.lstParameterStrings = strCurrMetadataValues.Distinct.ToArray bListSet = True End If - ucrNewValue.SetControls(clsLayerParam) + 'To be updated, not correct + ucrNewValue.SetControls(Nothing, clsLayerParam) End If If Not bSetCurrentValue Then ucrCurrentValue.SetName("") diff --git a/instat/sdgLayerOptions.vb b/instat/sdgLayerOptions.vb index 5602f742942..37f7bc4faf1 100644 --- a/instat/sdgLayerOptions.vb +++ b/instat/sdgLayerOptions.vb @@ -59,15 +59,15 @@ Public Class sdgLayerOptions End Sub - Public Sub SetupLayer(clsTempGgPlot As RFunction, clsTempGeomFunc As RFunction, clsTempAesFunc As RFunction, Optional bFixAes As Boolean = False, Optional bFixGeom As Boolean = False, Optional strDataframe As String = "", Optional bApplyAesGlobally As Boolean = True, Optional bIgnoreGlobalAes As Boolean = False, Optional iNumVariablesForGeoms As Integer = -1, Optional clsTempLocalAes As RFunction = Nothing) - If clsTempGeomFunc Is Nothing Then - clsTempGeomFunc = New RFunction + Public Sub SetupLayer(clsTempGgPlot As RFunction, clsNewGeomFunc As RFunction, clsNewGlobalAesFunc As RFunction, Optional bFixGeom As Boolean = False, Optional strDataframe As String = "", Optional bApplyAesGlobally As Boolean = True, Optional iNumVariablesForGeoms As Integer = -1, Optional clsNewLocalAes As RFunction = Nothing, Optional bReset As Boolean = False) + If clsNewGeomFunc Is Nothing Then + clsNewGeomFunc = New RFunction End If - clsGeomFunction = clsTempGeomFunc - clsAesFunction = clsTempAesFunc + clsGeomFunction = clsNewGeomFunc + clsAesFunction = clsNewGlobalAesFunc clsGgplotFunction = clsTempGgPlot - ucrGeomWithAes.Setup(clsTempGgPlot, clsTempGeomFunc, clsTempAesFunc, bFixAes, bFixGeom, strDataframe, bApplyAesGlobally, bIgnoreGlobalAes, iNumVariablesForGeoms, clsTempLocalAes) - ucrLayerParameter.Setup(clsTempGgPlot, clsTempGeomFunc, clsTempAesFunc, bFixAes, bFixGeom, strDataframe, bApplyAesGlobally, bIgnoreGlobalAes, iNumVariablesForGeoms, clsTempLocalAes) 'Don't really need to give all parameters through as this function just calls the mother Setup from ucrGeom who doesn't use some of them which are optional, such as clsTempLocalAes... + 'ucrGeomWithAes.Setup(clsTempGeomFunc, clsTempAesFunc, bFixGeom, strDataframe, bApplyAesGlobally, bIgnoreGlobalAes, iNumVariablesForGeoms, clsTempLocalAes) + 'ucrLayerParameter.Setup(clsTempGeomFunc, clsTempAesFunc, bFixAes, bFixGeom, strDataframe, bApplyAesGlobally, bIgnoreGlobalAes, iNumVariablesForGeoms, clsTempLocalAes) 'Don't really need to give all parameters through as this function just calls the mother Setup from ucrGeom who doesn't use some of them which are optional, such as clsTempLocalAes... End Sub Public Function TestForOKEnabled() As Boolean From a6ddbdadb5534d098d6f2e7074b67852f6f94bc6 Mon Sep 17 00:00:00 2001 From: Steven Date: Wed, 7 Jun 2017 16:08:52 +0300 Subject: [PATCH 112/154] adding ucrLengend --- instat/instat.vbproj | 9 ++ instat/sdgThemes.Designer.vb | 78 ++++++++--- instat/ucrElementRectControl.Designer.vb | 171 +++++++++++++++++++++++ instat/ucrElementRectControl.resx | 120 ++++++++++++++++ instat/ucrElementRectControl.vb | 120 ++++++++++++++++ 5 files changed, 482 insertions(+), 16 deletions(-) create mode 100644 instat/ucrElementRectControl.Designer.vb create mode 100644 instat/ucrElementRectControl.resx create mode 100644 instat/ucrElementRectControl.vb diff --git a/instat/instat.vbproj b/instat/instat.vbproj index dfb0e360a10..94e29aabc59 100644 --- a/instat/instat.vbproj +++ b/instat/instat.vbproj @@ -1266,6 +1266,12 @@ UserControl + + ucrElementRectControl.vb + + + UserControl + ucrFilter.vb @@ -4312,6 +4318,9 @@ ucrDistributionsWithParameters.vb + + ucrElementRectControl.vb + ucrFactor.vb diff --git a/instat/sdgThemes.Designer.vb b/instat/sdgThemes.Designer.vb index dc4bb295b60..521b8a2755c 100644 --- a/instat/sdgThemes.Designer.vb +++ b/instat/sdgThemes.Designer.vb @@ -25,7 +25,6 @@ Partial Class sdgThemes Me.ucrBaseSubdialogue = New instat.ucrButtonsSubdialogue() Me.tbThemeFacets = New System.Windows.Forms.TabPage() Me.tbThemePanelAndBackground = New System.Windows.Forms.TabPage() - Me.tbThemeLegend = New System.Windows.Forms.TabPage() Me.tbThemeYaxis = New System.Windows.Forms.TabPage() Me.GroupBox1 = New System.Windows.Forms.GroupBox() Me.UcrTickMarksAndLabels1 = New instat.ucrElementLineControl() @@ -66,6 +65,11 @@ Partial Class sdgThemes Me.ucrChkUnits = New instat.ucrCheck() Me.ucrInputTickUnits = New instat.ucrInputComboBox() Me.ucrThemeAxesTitle = New instat.ucrELementTextControl() + Me.UcrElementRectControl1 = New instat.ucrElementRectControl() + Me.UcrElementRectControl2 = New instat.ucrElementRectControl() + Me.UcrElementRectControl3 = New instat.ucrElementRectControl() + Me.tbThemeLegend = New System.Windows.Forms.TabPage() + Me.GroupBox3 = New System.Windows.Forms.GroupBox() Me.tbThemeYaxis.SuspendLayout() Me.GroupBox1.SuspendLayout() Me.grpYAxisTitle.SuspendLayout() @@ -80,6 +84,8 @@ Partial Class sdgThemes Me.tbLegend.SuspendLayout() Me.tbTitle.SuspendLayout() Me.GroupBox2.SuspendLayout() + Me.tbThemeLegend.SuspendLayout() + Me.GroupBox3.SuspendLayout() Me.SuspendLayout() ' 'ucrBaseSubdialogue @@ -93,7 +99,7 @@ Partial Class sdgThemes ' Me.tbThemeFacets.Location = New System.Drawing.Point(4, 22) Me.tbThemeFacets.Name = "tbThemeFacets" - Me.tbThemeFacets.Size = New System.Drawing.Size(809, 555) + Me.tbThemeFacets.Size = New System.Drawing.Size(816, 555) Me.tbThemeFacets.TabIndex = 4 Me.tbThemeFacets.Text = "Facets" Me.tbThemeFacets.UseVisualStyleBackColor = True @@ -102,21 +108,11 @@ Partial Class sdgThemes ' Me.tbThemePanelAndBackground.Location = New System.Drawing.Point(4, 22) Me.tbThemePanelAndBackground.Name = "tbThemePanelAndBackground" - Me.tbThemePanelAndBackground.Size = New System.Drawing.Size(809, 555) + Me.tbThemePanelAndBackground.Size = New System.Drawing.Size(816, 555) Me.tbThemePanelAndBackground.TabIndex = 3 Me.tbThemePanelAndBackground.Text = "Panel and Background " Me.tbThemePanelAndBackground.UseVisualStyleBackColor = True ' - 'tbThemeLegend - ' - Me.tbThemeLegend.Location = New System.Drawing.Point(4, 22) - Me.tbThemeLegend.Name = "tbThemeLegend" - Me.tbThemeLegend.Padding = New System.Windows.Forms.Padding(3) - Me.tbThemeLegend.Size = New System.Drawing.Size(809, 555) - Me.tbThemeLegend.TabIndex = 2 - Me.tbThemeLegend.Text = "Legend" - Me.tbThemeLegend.UseVisualStyleBackColor = True - ' 'tbThemeYaxis ' Me.tbThemeYaxis.Controls.Add(Me.GroupBox1) @@ -126,7 +122,7 @@ Partial Class sdgThemes Me.tbThemeYaxis.Location = New System.Drawing.Point(4, 22) Me.tbThemeYaxis.Name = "tbThemeYaxis" Me.tbThemeYaxis.Padding = New System.Windows.Forms.Padding(3) - Me.tbThemeYaxis.Size = New System.Drawing.Size(809, 555) + Me.tbThemeYaxis.Size = New System.Drawing.Size(816, 555) Me.tbThemeYaxis.TabIndex = 1 Me.tbThemeYaxis.Text = "Y-axis" Me.tbThemeYaxis.UseVisualStyleBackColor = True @@ -237,7 +233,7 @@ Partial Class sdgThemes Me.tbThemeXAxis.Location = New System.Drawing.Point(4, 22) Me.tbThemeXAxis.Name = "tbThemeXAxis" Me.tbThemeXAxis.Padding = New System.Windows.Forms.Padding(3) - Me.tbThemeXAxis.Size = New System.Drawing.Size(809, 555) + Me.tbThemeXAxis.Size = New System.Drawing.Size(816, 555) Me.tbThemeXAxis.TabIndex = 0 Me.tbThemeXAxis.Text = "X-axis" Me.tbThemeXAxis.UseVisualStyleBackColor = True @@ -482,6 +478,50 @@ Partial Class sdgThemes Me.ucrThemeAxesTitle.Size = New System.Drawing.Size(255, 228) Me.ucrThemeAxesTitle.TabIndex = 59 ' + 'UcrElementRectControl1 + ' + Me.UcrElementRectControl1.Location = New System.Drawing.Point(11, 19) + Me.UcrElementRectControl1.Name = "UcrElementRectControl1" + Me.UcrElementRectControl1.Size = New System.Drawing.Size(253, 155) + Me.UcrElementRectControl1.TabIndex = 0 + ' + 'UcrElementRectControl2 + ' + Me.UcrElementRectControl2.Location = New System.Drawing.Point(519, 19) + Me.UcrElementRectControl2.Name = "UcrElementRectControl2" + Me.UcrElementRectControl2.Size = New System.Drawing.Size(253, 155) + Me.UcrElementRectControl2.TabIndex = 1 + ' + 'UcrElementRectControl3 + ' + Me.UcrElementRectControl3.Location = New System.Drawing.Point(260, 19) + Me.UcrElementRectControl3.Name = "UcrElementRectControl3" + Me.UcrElementRectControl3.Size = New System.Drawing.Size(253, 155) + Me.UcrElementRectControl3.TabIndex = 2 + ' + 'tbThemeLegend + ' + Me.tbThemeLegend.Controls.Add(Me.GroupBox3) + Me.tbThemeLegend.Location = New System.Drawing.Point(4, 22) + Me.tbThemeLegend.Name = "tbThemeLegend" + Me.tbThemeLegend.Padding = New System.Windows.Forms.Padding(3) + Me.tbThemeLegend.Size = New System.Drawing.Size(816, 555) + Me.tbThemeLegend.TabIndex = 2 + Me.tbThemeLegend.Text = "Legend" + Me.tbThemeLegend.UseVisualStyleBackColor = True + ' + 'GroupBox3 + ' + Me.GroupBox3.Controls.Add(Me.UcrElementRectControl3) + Me.GroupBox3.Controls.Add(Me.UcrElementRectControl1) + Me.GroupBox3.Controls.Add(Me.UcrElementRectControl2) + Me.GroupBox3.Location = New System.Drawing.Point(6, 6) + Me.GroupBox3.Name = "GroupBox3" + Me.GroupBox3.Size = New System.Drawing.Size(783, 180) + Me.GroupBox3.TabIndex = 3 + Me.GroupBox3.TabStop = False + Me.GroupBox3.Text = "GroupBox3" + ' 'sdgThemes ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -509,6 +549,8 @@ Partial Class sdgThemes Me.tbLegend.ResumeLayout(False) Me.tbTitle.ResumeLayout(False) Me.GroupBox2.ResumeLayout(False) + Me.tbThemeLegend.ResumeLayout(False) + Me.GroupBox3.ResumeLayout(False) Me.ResumeLayout(False) End Sub @@ -516,7 +558,6 @@ Partial Class sdgThemes Friend WithEvents ucrBaseSubdialogue As ucrButtonsSubdialogue Friend WithEvents tbThemeFacets As TabPage Friend WithEvents tbThemePanelAndBackground As TabPage - Friend WithEvents tbThemeLegend As TabPage Friend WithEvents tbThemeYaxis As TabPage Friend WithEvents tbThemeXAxis As TabPage Friend WithEvents grpTableOptions As GroupBox @@ -557,4 +598,9 @@ Partial Class sdgThemes Friend WithEvents ucrInputTickUnits As ucrInputComboBox Friend WithEvents ucrThemeAxesTickLabels As ucrELementTextControl Friend WithEvents ucrThemeAxesLines As ucrElementLineControl + Friend WithEvents tbThemeLegend As TabPage + Friend WithEvents GroupBox3 As GroupBox + Friend WithEvents UcrElementRectControl3 As ucrElementRectControl + Friend WithEvents UcrElementRectControl1 As ucrElementRectControl + Friend WithEvents UcrElementRectControl2 As ucrElementRectControl End Class diff --git a/instat/ucrElementRectControl.Designer.vb b/instat/ucrElementRectControl.Designer.vb new file mode 100644 index 00000000000..4f2ff882b45 --- /dev/null +++ b/instat/ucrElementRectControl.Designer.vb @@ -0,0 +1,171 @@ + _ +Partial Class ucrElementRectControl + Inherits instat.ucrCore + + 'UserControl 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.grpElementRect = New System.Windows.Forms.GroupBox() + Me.ucrChkLegendLineEnd = New instat.ucrCheck() + Me.ucrInputLegendLineEnd = New instat.ucrInputComboBox() + Me.ucrLegendColors = New instat.ucrColors() + Me.ucrChkLegendFill = New instat.ucrCheck() + Me.ucrChkLegendSize = New instat.ucrCheck() + Me.ucrChkLegendLineType = New instat.ucrCheck() + Me.ucrChkLegendColour = New instat.ucrCheck() + Me.ucrNudLegendSize = New instat.ucrNud() + Me.ucrInputLegendLineType = New instat.ucrInputComboBox() + Me.ucrLegendFill = New instat.ucrColors() + Me.grpElementRect.SuspendLayout() + Me.SuspendLayout() + ' + 'grpElementRect + ' + Me.grpElementRect.Controls.Add(Me.ucrLegendFill) + Me.grpElementRect.Controls.Add(Me.ucrChkLegendLineEnd) + Me.grpElementRect.Controls.Add(Me.ucrInputLegendLineEnd) + Me.grpElementRect.Controls.Add(Me.ucrLegendColors) + Me.grpElementRect.Controls.Add(Me.ucrChkLegendFill) + Me.grpElementRect.Controls.Add(Me.ucrChkLegendSize) + Me.grpElementRect.Controls.Add(Me.ucrChkLegendLineType) + Me.grpElementRect.Controls.Add(Me.ucrChkLegendColour) + Me.grpElementRect.Controls.Add(Me.ucrNudLegendSize) + Me.grpElementRect.Controls.Add(Me.ucrInputLegendLineType) + Me.grpElementRect.Location = New System.Drawing.Point(8, 3) + Me.grpElementRect.Name = "grpElementRect" + Me.grpElementRect.Size = New System.Drawing.Size(238, 145) + Me.grpElementRect.TabIndex = 0 + Me.grpElementRect.TabStop = False + Me.grpElementRect.Text = "ElementRect" + ' + 'ucrChkLegendLineEnd + ' + Me.ucrChkLegendLineEnd.Checked = False + Me.ucrChkLegendLineEnd.Location = New System.Drawing.Point(6, 117) + Me.ucrChkLegendLineEnd.Name = "ucrChkLegendLineEnd" + Me.ucrChkLegendLineEnd.Size = New System.Drawing.Size(88, 20) + Me.ucrChkLegendLineEnd.TabIndex = 97 + ' + 'ucrInputLegendLineEnd + ' + Me.ucrInputLegendLineEnd.AddQuotesIfUnrecognised = True + Me.ucrInputLegendLineEnd.IsReadOnly = False + Me.ucrInputLegendLineEnd.Location = New System.Drawing.Point(95, 115) + Me.ucrInputLegendLineEnd.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) + Me.ucrInputLegendLineEnd.Name = "ucrInputLegendLineEnd" + Me.ucrInputLegendLineEnd.Size = New System.Drawing.Size(137, 21) + Me.ucrInputLegendLineEnd.TabIndex = 96 + ' + 'ucrLegendColors + ' + Me.ucrLegendColors.AddQuotesIfUnrecognised = True + Me.ucrLegendColors.IsReadOnly = False + Me.ucrLegendColors.Location = New System.Drawing.Point(95, 65) + Me.ucrLegendColors.Name = "ucrLegendColors" + Me.ucrLegendColors.Size = New System.Drawing.Size(137, 21) + Me.ucrLegendColors.TabIndex = 95 + ' + 'ucrChkLegendFill + ' + Me.ucrChkLegendFill.Checked = False + Me.ucrChkLegendFill.Location = New System.Drawing.Point(6, 91) + Me.ucrChkLegendFill.Name = "ucrChkLegendFill" + Me.ucrChkLegendFill.Size = New System.Drawing.Size(88, 20) + Me.ucrChkLegendFill.TabIndex = 94 + ' + 'ucrChkLegendSize + ' + Me.ucrChkLegendSize.Checked = False + Me.ucrChkLegendSize.Location = New System.Drawing.Point(6, 19) + Me.ucrChkLegendSize.Name = "ucrChkLegendSize" + Me.ucrChkLegendSize.Size = New System.Drawing.Size(88, 20) + Me.ucrChkLegendSize.TabIndex = 93 + ' + 'ucrChkLegendLineType + ' + Me.ucrChkLegendLineType.Checked = False + Me.ucrChkLegendLineType.Location = New System.Drawing.Point(6, 43) + Me.ucrChkLegendLineType.Name = "ucrChkLegendLineType" + Me.ucrChkLegendLineType.Size = New System.Drawing.Size(88, 20) + Me.ucrChkLegendLineType.TabIndex = 92 + ' + 'ucrChkLegendColour + ' + Me.ucrChkLegendColour.Checked = False + Me.ucrChkLegendColour.Location = New System.Drawing.Point(6, 67) + Me.ucrChkLegendColour.Name = "ucrChkLegendColour" + Me.ucrChkLegendColour.Size = New System.Drawing.Size(88, 20) + Me.ucrChkLegendColour.TabIndex = 91 + ' + 'ucrNudLegendSize + ' + Me.ucrNudLegendSize.DecimalPlaces = New Decimal(New Integer() {1, 0, 0, 0}) + Me.ucrNudLegendSize.Increment = New Decimal(New Integer() {1, 0, 0, 0}) + Me.ucrNudLegendSize.Location = New System.Drawing.Point(95, 18) + Me.ucrNudLegendSize.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) + Me.ucrNudLegendSize.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudLegendSize.Name = "ucrNudLegendSize" + Me.ucrNudLegendSize.Size = New System.Drawing.Size(50, 20) + Me.ucrNudLegendSize.TabIndex = 89 + Me.ucrNudLegendSize.Value = New Decimal(New Integer() {0, 0, 0, 0}) + ' + 'ucrInputLegendLineType + ' + Me.ucrInputLegendLineType.AddQuotesIfUnrecognised = True + Me.ucrInputLegendLineType.IsReadOnly = False + Me.ucrInputLegendLineType.Location = New System.Drawing.Point(95, 41) + Me.ucrInputLegendLineType.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) + Me.ucrInputLegendLineType.Name = "ucrInputLegendLineType" + Me.ucrInputLegendLineType.Size = New System.Drawing.Size(137, 21) + Me.ucrInputLegendLineType.TabIndex = 88 + ' + 'ucrLegendFill + ' + Me.ucrLegendFill.AddQuotesIfUnrecognised = True + Me.ucrLegendFill.IsReadOnly = False + Me.ucrLegendFill.Location = New System.Drawing.Point(95, 90) + Me.ucrLegendFill.Name = "ucrLegendFill" + Me.ucrLegendFill.Size = New System.Drawing.Size(137, 21) + Me.ucrLegendFill.TabIndex = 98 + ' + 'ucrElementRectControl + ' + Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) + Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.Controls.Add(Me.grpElementRect) + Me.Name = "ucrElementRectControl" + Me.Size = New System.Drawing.Size(253, 155) + Me.grpElementRect.ResumeLayout(False) + Me.ResumeLayout(False) + + End Sub + + Friend WithEvents grpElementRect As GroupBox + Friend WithEvents ucrLegendColors As ucrColors + Friend WithEvents ucrChkLegendFill As ucrCheck + Friend WithEvents ucrChkLegendSize As ucrCheck + Friend WithEvents ucrChkLegendLineType As ucrCheck + Friend WithEvents ucrChkLegendColour As ucrCheck + Friend WithEvents ucrNudLegendSize As ucrNud + Friend WithEvents ucrInputLegendLineType As ucrInputComboBox + Friend WithEvents ucrChkLegendLineEnd As ucrCheck + Friend WithEvents ucrInputLegendLineEnd As ucrInputComboBox + Friend WithEvents ucrLegendFill As ucrColors +End Class diff --git a/instat/ucrElementRectControl.resx b/instat/ucrElementRectControl.resx new file mode 100644 index 00000000000..29dcb1b3a35 --- /dev/null +++ b/instat/ucrElementRectControl.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/ucrElementRectControl.vb b/instat/ucrElementRectControl.vb new file mode 100644 index 00000000000..52e12d37ce6 --- /dev/null +++ b/instat/ucrElementRectControl.vb @@ -0,0 +1,120 @@ +' Instat-R +' Copyright (C) 2015 +' +' 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 k +' along with this program. If not, see . + +Public Class ucrElementRectControl + Private bInitialiseControls As Boolean = False + Public strLegend As String + Private clsThemeFunction As New RFunction + Private clsElementLine As New RFunction + Private clsBaseOperator As New ROperator + Public Sub InitialiseControl() + + ucrChkLegendSize.SetText("Size") + ucrNudLegendSize.SetParameter(New RParameter("size")) + ucrNudLegendSize.Increment = 0.1 + + + ucrChkLegendLineType.SetText("Line Type") + ucrInputLegendLineType.SetParameter(New RParameter("linetype")) + ucrInputLegendLineType.SetItems(New Dictionary(Of String, String)(GgplotDefaults.dctLineType)) + ucrInputLegendLineType.SetRDefault(Chr(34) & "blank" & Chr(34)) + + ucrChkLegendColour.SetText("Colour") + ucrLegendColors.SetParameter(New RParameter("colour")) + ucrLegendColors.SetItems(New Dictionary(Of String, String)(GgplotDefaults.dctColour)) + ucrLegendColors.AddQuotesIfUnrecognised = False + ucrLegendColors.SetRDefault(Chr(34) & "black" & Chr(34)) + + ucrChkLegendFill.SetText("Colour") + ucrLegendFill.SetParameter(New RParameter("fill")) + ucrLegendFill.SetItems(New Dictionary(Of String, String)(GgplotDefaults.dctColour)) + ucrLegendFill.AddQuotesIfUnrecognised = False + ucrLegendFill.SetRDefault(Chr(34) & "black" & Chr(34)) + + + ucrChkLegendLineEnd.SetText("Line End") + ucrInputLegendLineEnd.SetParameter(New RParameter("lineend")) + ucrInputLegendLineEnd.SetItems(New Dictionary(Of String, String)(GgplotDefaults.dctLineEnd)) + ucrInputLegendLineEnd.SetRDefault(Chr(34) & "square" & Chr(34)) + + + ucrChkLegendSize.AddToLinkedControls(ucrNudLegendSize, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) + ucrChkLegendLineType.AddToLinkedControls(ucrInputLegendLineType, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) + ucrChkLegendLineEnd.AddToLinkedControls(ucrInputLegendLineEnd, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) + ucrChkLegendColour.AddToLinkedControls(ucrLegendColors, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) + ucrChkLegendFill.AddToLinkedControls(ucrLegendFill, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) + + bInitialiseControls = True + End Sub + + Public Sub SetAxisLine(strNewLegend As String) + strLegend = strNewLegend + End Sub + + + Public Sub SetRCodeForControl(strNewLegend As String, clsNewElementLine As RFunction, clsNewThemeFunction As RFunction, clsNewBaseOperator As ROperator, Optional bReset As Boolean = False) + If Not bInitialiseControls Then + InitialiseControl() + End If + + SetAxisLine(strNewLegend) + clsBaseOperator = clsNewBaseOperator + clsThemeFunction = clsNewThemeFunction + clsElementLine = clsNewElementLine + + ucrNudLegendSize.SetRCode(clsElementLine, bReset) + ucrChkLegendSize.SetRCode(clsElementLine, bReset) + + ucrLegendColors.SetRCode(clsElementLine, bReset) + ucrChkLegendColour.SetRCode(clsElementLine, bReset) + + ucrLegendFill.SetRCode(clsElementLine, bReset) + ucrChkLegendFill.SetRCode(clsElementLine, bReset) + + ucrInputLegendLineType.SetRCode(clsElementLine, bReset) + ucrChkLegendLineType.SetRCode(clsElementLine, bReset) + + ucrInputLegendLineEnd.SetRCode(clsElementLine, bReset) + ucrChkLegendLineEnd.SetRCode(clsElementLine, bReset) + AddRemoveElementLineAxis() + End Sub + + Private Sub AddRemoveElementLineAxis() + If ucrChkLegendColour.Checked OrElse ucrChkLegendFill.Checked OrElse ucrChkLegendLineType.Checked OrElse ucrChkLegendSize.Checked OrElse ucrChkLegendFill.Checked Then + clsThemeFunction.AddParameter(strLegend, clsRFunctionParameter:=clsElementLine) + Else + clsThemeFunction.RemoveParameterByName(strLegend) + End If + AddRemoveTheme() + 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 ElementTickAxisLineControls_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkLegendLineType.ControlValueChanged, ucrChkLegendSize.ControlValueChanged, ucrChkLegendFill.ControlValueChanged, ucrChkLegendColour.ControlValueChanged, ucrChkLegendFill.ControlValueChanged + AddRemoveElementLineAxis() + End Sub + + Public Sub setlabel(strlabel As String) + grpElementRect.Text = strlabel + End Sub + +End Class From d8d7de59f06e3613d9628836a44dc8c695950f18 Mon Sep 17 00:00:00 2001 From: Steven Date: Wed, 7 Jun 2017 16:33:24 +0300 Subject: [PATCH 113/154] legendtab --- instat/sdgThemes.Designer.vb | 242 +++++++++++++++++++++++++++++------ instat/sdgThemes.vb | 24 ++++ 2 files changed, 229 insertions(+), 37 deletions(-) diff --git a/instat/sdgThemes.Designer.vb b/instat/sdgThemes.Designer.vb index 521b8a2755c..7db943d6d67 100644 --- a/instat/sdgThemes.Designer.vb +++ b/instat/sdgThemes.Designer.vb @@ -65,11 +65,25 @@ Partial Class sdgThemes Me.ucrChkUnits = New instat.ucrCheck() Me.ucrInputTickUnits = New instat.ucrInputComboBox() Me.ucrThemeAxesTitle = New instat.ucrELementTextControl() - Me.UcrElementRectControl1 = New instat.ucrElementRectControl() - Me.UcrElementRectControl2 = New instat.ucrElementRectControl() - Me.UcrElementRectControl3 = New instat.ucrElementRectControl() + Me.ucrLegendBackground = New instat.ucrElementRectControl() + Me.ucrLegendKey = New instat.ucrElementRectControl() + Me.ucrLegendBoxBackground = New instat.ucrElementRectControl() Me.tbThemeLegend = New System.Windows.Forms.TabPage() - Me.GroupBox3 = New System.Windows.Forms.GroupBox() + Me.grpLegendBackGroundAndKey = New System.Windows.Forms.GroupBox() + Me.grpLegendAdjustments = New System.Windows.Forms.GroupBox() + Me.ucrChkLegendJustification = New instat.ucrCheck() + Me.ucrInputLegendJustification = New instat.ucrInputComboBox() + Me.ucrChkLegendBox = New instat.ucrCheck() + Me.ucrInputLegendBox = New instat.ucrInputComboBox() + Me.urChkLegendPosition = New instat.ucrCheck() + Me.ucrChkLegendDirection = New instat.ucrCheck() + Me.ucrInputLegendPosition = New instat.ucrInputComboBox() + Me.ucrInputLegendDirection = New instat.ucrInputComboBox() + Me.urChkLegendBoxJust = New instat.ucrCheck() + Me.ucrInputLegendBoxJust = New instat.ucrInputComboBox() + Me.UcrELementTextControl1 = New instat.ucrELementTextControl() + Me.UcrELementTextControl2 = New instat.ucrELementTextControl() + Me.grpLegendTitleAndText = New System.Windows.Forms.GroupBox() Me.tbThemeYaxis.SuspendLayout() Me.GroupBox1.SuspendLayout() Me.grpYAxisTitle.SuspendLayout() @@ -85,7 +99,9 @@ Partial Class sdgThemes Me.tbTitle.SuspendLayout() Me.GroupBox2.SuspendLayout() Me.tbThemeLegend.SuspendLayout() - Me.GroupBox3.SuspendLayout() + Me.grpLegendBackGroundAndKey.SuspendLayout() + Me.grpLegendAdjustments.SuspendLayout() + Me.grpLegendTitleAndText.SuspendLayout() Me.SuspendLayout() ' 'ucrBaseSubdialogue @@ -478,30 +494,32 @@ Partial Class sdgThemes Me.ucrThemeAxesTitle.Size = New System.Drawing.Size(255, 228) Me.ucrThemeAxesTitle.TabIndex = 59 ' - 'UcrElementRectControl1 + 'ucrLegendBackground ' - Me.UcrElementRectControl1.Location = New System.Drawing.Point(11, 19) - Me.UcrElementRectControl1.Name = "UcrElementRectControl1" - Me.UcrElementRectControl1.Size = New System.Drawing.Size(253, 155) - Me.UcrElementRectControl1.TabIndex = 0 + Me.ucrLegendBackground.Location = New System.Drawing.Point(11, 19) + Me.ucrLegendBackground.Name = "ucrLegendBackground" + Me.ucrLegendBackground.Size = New System.Drawing.Size(253, 155) + Me.ucrLegendBackground.TabIndex = 0 ' - 'UcrElementRectControl2 + 'ucrLegendKey ' - Me.UcrElementRectControl2.Location = New System.Drawing.Point(519, 19) - Me.UcrElementRectControl2.Name = "UcrElementRectControl2" - Me.UcrElementRectControl2.Size = New System.Drawing.Size(253, 155) - Me.UcrElementRectControl2.TabIndex = 1 + Me.ucrLegendKey.Location = New System.Drawing.Point(519, 19) + Me.ucrLegendKey.Name = "ucrLegendKey" + Me.ucrLegendKey.Size = New System.Drawing.Size(253, 155) + Me.ucrLegendKey.TabIndex = 1 ' - 'UcrElementRectControl3 + 'ucrLegendBoxBackground ' - Me.UcrElementRectControl3.Location = New System.Drawing.Point(260, 19) - Me.UcrElementRectControl3.Name = "UcrElementRectControl3" - Me.UcrElementRectControl3.Size = New System.Drawing.Size(253, 155) - Me.UcrElementRectControl3.TabIndex = 2 + Me.ucrLegendBoxBackground.Location = New System.Drawing.Point(260, 19) + Me.ucrLegendBoxBackground.Name = "ucrLegendBoxBackground" + Me.ucrLegendBoxBackground.Size = New System.Drawing.Size(253, 155) + Me.ucrLegendBoxBackground.TabIndex = 2 ' 'tbThemeLegend ' - Me.tbThemeLegend.Controls.Add(Me.GroupBox3) + Me.tbThemeLegend.Controls.Add(Me.grpLegendTitleAndText) + Me.tbThemeLegend.Controls.Add(Me.grpLegendAdjustments) + Me.tbThemeLegend.Controls.Add(Me.grpLegendBackGroundAndKey) Me.tbThemeLegend.Location = New System.Drawing.Point(4, 22) Me.tbThemeLegend.Name = "tbThemeLegend" Me.tbThemeLegend.Padding = New System.Windows.Forms.Padding(3) @@ -510,17 +528,151 @@ Partial Class sdgThemes Me.tbThemeLegend.Text = "Legend" Me.tbThemeLegend.UseVisualStyleBackColor = True ' - 'GroupBox3 - ' - Me.GroupBox3.Controls.Add(Me.UcrElementRectControl3) - Me.GroupBox3.Controls.Add(Me.UcrElementRectControl1) - Me.GroupBox3.Controls.Add(Me.UcrElementRectControl2) - Me.GroupBox3.Location = New System.Drawing.Point(6, 6) - Me.GroupBox3.Name = "GroupBox3" - Me.GroupBox3.Size = New System.Drawing.Size(783, 180) - Me.GroupBox3.TabIndex = 3 - Me.GroupBox3.TabStop = False - Me.GroupBox3.Text = "GroupBox3" + 'grpLegendBackGroundAndKey + ' + Me.grpLegendBackGroundAndKey.Controls.Add(Me.ucrLegendBoxBackground) + Me.grpLegendBackGroundAndKey.Controls.Add(Me.ucrLegendBackground) + Me.grpLegendBackGroundAndKey.Controls.Add(Me.ucrLegendKey) + Me.grpLegendBackGroundAndKey.Location = New System.Drawing.Point(6, 246) + Me.grpLegendBackGroundAndKey.Name = "grpLegendBackGroundAndKey" + Me.grpLegendBackGroundAndKey.Size = New System.Drawing.Size(777, 176) + Me.grpLegendBackGroundAndKey.TabIndex = 3 + Me.grpLegendBackGroundAndKey.TabStop = False + Me.grpLegendBackGroundAndKey.Text = "Legend Background and Key" + ' + 'grpLegendAdjustments + ' + Me.grpLegendAdjustments.Controls.Add(Me.ucrChkLegendJustification) + Me.grpLegendAdjustments.Controls.Add(Me.ucrInputLegendJustification) + Me.grpLegendAdjustments.Controls.Add(Me.ucrChkLegendBox) + Me.grpLegendAdjustments.Controls.Add(Me.ucrInputLegendBox) + Me.grpLegendAdjustments.Controls.Add(Me.urChkLegendPosition) + Me.grpLegendAdjustments.Controls.Add(Me.ucrChkLegendDirection) + Me.grpLegendAdjustments.Controls.Add(Me.ucrInputLegendPosition) + Me.grpLegendAdjustments.Controls.Add(Me.ucrInputLegendDirection) + Me.grpLegendAdjustments.Controls.Add(Me.urChkLegendBoxJust) + Me.grpLegendAdjustments.Controls.Add(Me.ucrInputLegendBoxJust) + Me.grpLegendAdjustments.Location = New System.Drawing.Point(557, 6) + Me.grpLegendAdjustments.Name = "grpLegendAdjustments" + Me.grpLegendAdjustments.Size = New System.Drawing.Size(241, 161) + Me.grpLegendAdjustments.TabIndex = 100 + Me.grpLegendAdjustments.TabStop = False + Me.grpLegendAdjustments.Text = "Legend Adjustments" + ' + 'ucrChkLegendJustification + ' + Me.ucrChkLegendJustification.Checked = False + Me.ucrChkLegendJustification.Location = New System.Drawing.Point(6, 128) + Me.ucrChkLegendJustification.Name = "ucrChkLegendJustification" + Me.ucrChkLegendJustification.Size = New System.Drawing.Size(88, 20) + Me.ucrChkLegendJustification.TabIndex = 109 + ' + 'ucrInputLegendJustification + ' + Me.ucrInputLegendJustification.AddQuotesIfUnrecognised = True + Me.ucrInputLegendJustification.IsReadOnly = False + Me.ucrInputLegendJustification.Location = New System.Drawing.Point(95, 126) + Me.ucrInputLegendJustification.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) + Me.ucrInputLegendJustification.Name = "ucrInputLegendJustification" + Me.ucrInputLegendJustification.Size = New System.Drawing.Size(137, 21) + Me.ucrInputLegendJustification.TabIndex = 108 + ' + 'ucrChkLegendBox + ' + Me.ucrChkLegendBox.Checked = False + Me.ucrChkLegendBox.Location = New System.Drawing.Point(6, 100) + Me.ucrChkLegendBox.Name = "ucrChkLegendBox" + Me.ucrChkLegendBox.Size = New System.Drawing.Size(88, 20) + Me.ucrChkLegendBox.TabIndex = 107 + ' + 'ucrInputLegendBox + ' + Me.ucrInputLegendBox.AddQuotesIfUnrecognised = True + Me.ucrInputLegendBox.IsReadOnly = False + Me.ucrInputLegendBox.Location = New System.Drawing.Point(95, 98) + Me.ucrInputLegendBox.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) + Me.ucrInputLegendBox.Name = "ucrInputLegendBox" + Me.ucrInputLegendBox.Size = New System.Drawing.Size(137, 21) + Me.ucrInputLegendBox.TabIndex = 106 + ' + 'urChkLegendPosition + ' + Me.urChkLegendPosition.Checked = False + Me.urChkLegendPosition.Location = New System.Drawing.Point(6, 21) + Me.urChkLegendPosition.Name = "urChkLegendPosition" + Me.urChkLegendPosition.Size = New System.Drawing.Size(88, 20) + Me.urChkLegendPosition.TabIndex = 105 + ' + 'ucrChkLegendDirection + ' + Me.ucrChkLegendDirection.Checked = False + Me.ucrChkLegendDirection.Location = New System.Drawing.Point(6, 47) + Me.ucrChkLegendDirection.Name = "ucrChkLegendDirection" + Me.ucrChkLegendDirection.Size = New System.Drawing.Size(88, 20) + Me.ucrChkLegendDirection.TabIndex = 101 + ' + 'ucrInputLegendPosition + ' + Me.ucrInputLegendPosition.AddQuotesIfUnrecognised = True + Me.ucrInputLegendPosition.IsReadOnly = False + Me.ucrInputLegendPosition.Location = New System.Drawing.Point(95, 19) + Me.ucrInputLegendPosition.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) + Me.ucrInputLegendPosition.Name = "ucrInputLegendPosition" + Me.ucrInputLegendPosition.Size = New System.Drawing.Size(137, 21) + Me.ucrInputLegendPosition.TabIndex = 104 + ' + 'ucrInputLegendDirection + ' + Me.ucrInputLegendDirection.AddQuotesIfUnrecognised = True + Me.ucrInputLegendDirection.IsReadOnly = False + Me.ucrInputLegendDirection.Location = New System.Drawing.Point(95, 45) + Me.ucrInputLegendDirection.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) + Me.ucrInputLegendDirection.Name = "ucrInputLegendDirection" + Me.ucrInputLegendDirection.Size = New System.Drawing.Size(137, 21) + Me.ucrInputLegendDirection.TabIndex = 100 + ' + 'urChkLegendBoxJust + ' + Me.urChkLegendBoxJust.Checked = False + Me.urChkLegendBoxJust.Location = New System.Drawing.Point(6, 73) + Me.urChkLegendBoxJust.Name = "urChkLegendBoxJust" + Me.urChkLegendBoxJust.Size = New System.Drawing.Size(88, 20) + Me.urChkLegendBoxJust.TabIndex = 103 + ' + 'ucrInputLegendBoxJust + ' + Me.ucrInputLegendBoxJust.AddQuotesIfUnrecognised = True + Me.ucrInputLegendBoxJust.IsReadOnly = False + Me.ucrInputLegendBoxJust.Location = New System.Drawing.Point(95, 71) + Me.ucrInputLegendBoxJust.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) + Me.ucrInputLegendBoxJust.Name = "ucrInputLegendBoxJust" + Me.ucrInputLegendBoxJust.Size = New System.Drawing.Size(137, 21) + Me.ucrInputLegendBoxJust.TabIndex = 102 + ' + 'UcrELementTextControl1 + ' + Me.UcrELementTextControl1.Location = New System.Drawing.Point(275, 12) + Me.UcrELementTextControl1.Name = "UcrELementTextControl1" + Me.UcrELementTextControl1.Size = New System.Drawing.Size(255, 224) + Me.UcrELementTextControl1.TabIndex = 65 + ' + 'UcrELementTextControl2 + ' + Me.UcrELementTextControl2.Location = New System.Drawing.Point(14, 12) + Me.UcrELementTextControl2.Name = "UcrELementTextControl2" + Me.UcrELementTextControl2.Size = New System.Drawing.Size(255, 224) + Me.UcrELementTextControl2.TabIndex = 64 + ' + 'grpLegendTitleAndText + ' + Me.grpLegendTitleAndText.Controls.Add(Me.UcrELementTextControl1) + Me.grpLegendTitleAndText.Controls.Add(Me.UcrELementTextControl2) + Me.grpLegendTitleAndText.Location = New System.Drawing.Point(6, 6) + Me.grpLegendTitleAndText.Name = "grpLegendTitleAndText" + Me.grpLegendTitleAndText.Size = New System.Drawing.Size(545, 242) + Me.grpLegendTitleAndText.TabIndex = 101 + Me.grpLegendTitleAndText.TabStop = False + Me.grpLegendTitleAndText.Text = "Legend Title and Text" ' 'sdgThemes ' @@ -550,7 +702,9 @@ Partial Class sdgThemes Me.tbTitle.ResumeLayout(False) Me.GroupBox2.ResumeLayout(False) Me.tbThemeLegend.ResumeLayout(False) - Me.GroupBox3.ResumeLayout(False) + Me.grpLegendBackGroundAndKey.ResumeLayout(False) + Me.grpLegendAdjustments.ResumeLayout(False) + Me.grpLegendTitleAndText.ResumeLayout(False) Me.ResumeLayout(False) End Sub @@ -599,8 +753,22 @@ Partial Class sdgThemes Friend WithEvents ucrThemeAxesTickLabels As ucrELementTextControl Friend WithEvents ucrThemeAxesLines As ucrElementLineControl Friend WithEvents tbThemeLegend As TabPage - Friend WithEvents GroupBox3 As GroupBox - Friend WithEvents UcrElementRectControl3 As ucrElementRectControl - Friend WithEvents UcrElementRectControl1 As ucrElementRectControl - Friend WithEvents UcrElementRectControl2 As ucrElementRectControl + Friend WithEvents grpLegendBackGroundAndKey As GroupBox + Friend WithEvents ucrLegendBoxBackground As ucrElementRectControl + Friend WithEvents ucrLegendBackground As ucrElementRectControl + Friend WithEvents ucrLegendKey As ucrElementRectControl + Friend WithEvents grpLegendAdjustments As GroupBox + Friend WithEvents ucrChkLegendJustification As ucrCheck + Friend WithEvents ucrInputLegendJustification As ucrInputComboBox + Friend WithEvents ucrChkLegendBox As ucrCheck + Friend WithEvents ucrInputLegendBox As ucrInputComboBox + Friend WithEvents urChkLegendPosition As ucrCheck + Friend WithEvents ucrChkLegendDirection As ucrCheck + Friend WithEvents ucrInputLegendPosition As ucrInputComboBox + Friend WithEvents ucrInputLegendDirection As ucrInputComboBox + Friend WithEvents urChkLegendBoxJust As ucrCheck + Friend WithEvents ucrInputLegendBoxJust As ucrInputComboBox + Friend WithEvents grpLegendTitleAndText As GroupBox + Friend WithEvents UcrELementTextControl1 As ucrELementTextControl + Friend WithEvents UcrELementTextControl2 As ucrELementTextControl End Class diff --git a/instat/sdgThemes.vb b/instat/sdgThemes.vb index 22fd7c38587..6a83c32db38 100644 --- a/instat/sdgThemes.vb +++ b/instat/sdgThemes.vb @@ -20,6 +20,30 @@ Public Class sdgThemes Public bControlsInitialised As Boolean = False Private clsElementLine, clsElementXAxisTextTop, clsElementXAxisLine, clsElementYAxisLine, clsElementText, clsElementYAxisTextRight, clsElementXAxisLineTop, clsThemeFunction As New RFunction + Private Sub tbThemeLegend_Click(sender As Object, e As EventArgs) Handles tbThemeLegend.Click + + End Sub + + Private Sub UcrCheck1_Load(sender As Object, e As EventArgs) + + End Sub + + Private Sub UcrInputComboBox1_Load(sender As Object, e As EventArgs) + + End Sub + + Private Sub UcrCheck2_Load(sender As Object, e As EventArgs) + + End Sub + + Private Sub UcrInputComboBox2_Load(sender As Object, e As EventArgs) + + End Sub + + Private Sub grpLegendAdjustments_Enter(sender As Object, e As EventArgs) + + End Sub + Private Sub ucrThemeAxesTitle_Load(sender As Object, e As EventArgs) Handles ucrThemeAxesTitle.Load End Sub From 1e74239340f98dfd6455223b6073382e590d8215 Mon Sep 17 00:00:00 2001 From: shadrack kibet Date: Wed, 7 Jun 2017 16:41:02 +0300 Subject: [PATCH 114/154] tidying up --- instat/dlgInsertColumn.Designer.vb | 20 ++++++++++---------- instat/dlgInsertColumn.vb | 4 ---- 2 files changed, 10 insertions(+), 14 deletions(-) diff --git a/instat/dlgInsertColumn.Designer.vb b/instat/dlgInsertColumn.Designer.vb index cb359043d1a..090df7e1d84 100644 --- a/instat/dlgInsertColumn.Designer.vb +++ b/instat/dlgInsertColumn.Designer.vb @@ -83,7 +83,7 @@ Partial Class dlgInsertColumn Me.grpInsert.Location = New System.Drawing.Point(235, 85) Me.grpInsert.Name = "grpInsert" Me.grpInsert.Size = New System.Drawing.Size(286, 122) - Me.grpInsert.TabIndex = 5 + Me.grpInsert.TabIndex = 6 Me.grpInsert.TabStop = False Me.grpInsert.Text = "Insert" ' @@ -93,7 +93,7 @@ Partial Class dlgInsertColumn Me.lblColumn.Location = New System.Drawing.Point(152, 73) Me.lblColumn.Name = "lblColumn" Me.lblColumn.Size = New System.Drawing.Size(45, 13) - Me.lblColumn.TabIndex = 6 + Me.lblColumn.TabIndex = 2 Me.lblColumn.Text = "Column:" ' 'ucrInputBeforeAfter @@ -103,7 +103,7 @@ Partial Class dlgInsertColumn Me.ucrInputBeforeAfter.Location = New System.Drawing.Point(51, 87) Me.ucrInputBeforeAfter.Name = "ucrInputBeforeAfter" Me.ucrInputBeforeAfter.Size = New System.Drawing.Size(93, 21) - Me.ucrInputBeforeAfter.TabIndex = 4 + Me.ucrInputBeforeAfter.TabIndex = 1 ' 'ucrReceiverColumnsToInsert ' @@ -114,7 +114,7 @@ Partial Class dlgInsertColumn Me.ucrReceiverColumnsToInsert.Selector = Nothing Me.ucrReceiverColumnsToInsert.Size = New System.Drawing.Size(116, 20) Me.ucrReceiverColumnsToInsert.strNcFilePath = "" - Me.ucrReceiverColumnsToInsert.TabIndex = 0 + Me.ucrReceiverColumnsToInsert.TabIndex = 3 Me.ucrReceiverColumnsToInsert.ucrSelector = Nothing ' 'rdoBeforeAfter @@ -123,7 +123,7 @@ Partial Class dlgInsertColumn Me.rdoBeforeAfter.Location = New System.Drawing.Point(10, 64) Me.rdoBeforeAfter.Name = "rdoBeforeAfter" Me.rdoBeforeAfter.Size = New System.Drawing.Size(131, 17) - Me.rdoBeforeAfter.TabIndex = 3 + Me.rdoBeforeAfter.TabIndex = 0 Me.rdoBeforeAfter.TabStop = True Me.rdoBeforeAfter.Text = "Before or After Column" Me.rdoBeforeAfter.UseVisualStyleBackColor = True @@ -175,7 +175,7 @@ Partial Class dlgInsertColumn Me.rdoAfter.Location = New System.Drawing.Point(10, 41) Me.rdoAfter.Name = "rdoAfter" Me.rdoAfter.Size = New System.Drawing.Size(47, 17) - Me.rdoAfter.TabIndex = 2 + Me.rdoAfter.TabIndex = 1 Me.rdoAfter.TabStop = True Me.rdoAfter.Text = "After" Me.rdoAfter.UseVisualStyleBackColor = True @@ -186,7 +186,7 @@ Partial Class dlgInsertColumn Me.rdoBefore.Location = New System.Drawing.Point(10, 18) Me.rdoBefore.Name = "rdoBefore" Me.rdoBefore.Size = New System.Drawing.Size(56, 17) - Me.rdoBefore.TabIndex = 1 + Me.rdoBefore.TabIndex = 0 Me.rdoBefore.TabStop = True Me.rdoBefore.Text = "Before" Me.rdoBefore.UseVisualStyleBackColor = True @@ -265,7 +265,7 @@ Partial Class dlgInsertColumn Me.ucrSelectorInsertColumns.Margin = New System.Windows.Forms.Padding(0) Me.ucrSelectorInsertColumns.Name = "ucrSelectorInsertColumns" Me.ucrSelectorInsertColumns.Size = New System.Drawing.Size(210, 180) - Me.ucrSelectorInsertColumns.TabIndex = 7 + Me.ucrSelectorInsertColumns.TabIndex = 3 ' 'ucrInputPrefixForNewColumn ' @@ -275,7 +275,7 @@ Partial Class dlgInsertColumn Me.ucrInputPrefixForNewColumn.Location = New System.Drawing.Point(159, 286) Me.ucrInputPrefixForNewColumn.Name = "ucrInputPrefixForNewColumn" Me.ucrInputPrefixForNewColumn.Size = New System.Drawing.Size(163, 21) - Me.ucrInputPrefixForNewColumn.TabIndex = 17 + Me.ucrInputPrefixForNewColumn.TabIndex = 0 ' 'ucrNudNumberOfColumns ' @@ -311,7 +311,7 @@ Partial Class dlgInsertColumn Me.ucrBase.Location = New System.Drawing.Point(10, 313) Me.ucrBase.Name = "ucrBase" Me.ucrBase.Size = New System.Drawing.Size(410, 53) - Me.ucrBase.TabIndex = 0 + Me.ucrBase.TabIndex = 1 ' 'ucrNudNumberOfRows ' diff --git a/instat/dlgInsertColumn.vb b/instat/dlgInsertColumn.vb index 24009cf64ce..afc400fc141 100644 --- a/instat/dlgInsertColumn.vb +++ b/instat/dlgInsertColumn.vb @@ -95,7 +95,6 @@ Public Class dlgInsertColumn ucrPnlInsertColumns.AddToLinkedControls(ucrInputBeforeAfter, {rdoBeforeAfter}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) ucrPnlInsertColumns.AddToLinkedControls(ucrReceiverColumnsToInsert, {rdoBeforeAfter}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) - ucrPnlColumnsOrRows.AddToLinkedControls(ucrPnlInsertColumns, {rdoInsertColumns}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) ucrPnlColumnsOrRows.AddToLinkedControls(ucrNudNumberOfColumns, {rdoInsertColumns}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) ucrPnlColumnsOrRows.AddToLinkedControls(ucrInputDefaultValue, {rdoInsertColumns}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) @@ -150,17 +149,14 @@ Public Class dlgInsertColumn Private Sub SetRCodeForControls(bReset As Boolean) ucrSelectorInsertColumns.AddAdditionalCodeParameterPair(clsInsertRowFunction, ucrSelectorInsertColumns.GetParameter, iAdditionalPairNo:=1) - ucrNudNumberOfRows.SetRCode(clsInsertRowFunction, bReset) ucrNudStartRow.SetRCode(clsInsertRowFunction, bReset) ucrPnlBeforeAfter.SetRCode(clsInsertRowFunction, bReset) ucrNudNumberOfColumns.SetRCode(clsInsertColumnFunction, bReset) ucrInputDefaultValue.SetRCode(clsInsertColumnFunction, bReset) - ucrInputPrefixForNewColumn.SetRCode(clsInsertColumnFunction, bReset) ucrReceiverColumnsToInsert.SetRCode(clsInsertColumnFunction, bReset) - ucrSelectorInsertColumns.SetRCode(clsInsertColumnFunction, bReset) ucrPnlColumnsOrRows.SetRCode(clsInsertColumnFunction, bReset) ucrPnlInsertColumns.SetRCode(clsInsertColumnFunction, bReset) From 6ae3a4a90283c33e1cfaddd7778a9cc7721ee317 Mon Sep 17 00:00:00 2001 From: Danny Parsons Date: Wed, 7 Jun 2017 16:28:37 +0100 Subject: [PATCH 115/154] updated setup subs for geom controls --- instat/UcrGeomListWithAes.designer.vb | 203 +++++++++++++++----------- instat/UcrGeomListWithAes.vb | 201 +++++++++++++++++-------- instat/dlgBarAndPieChart.vb | 5 +- instat/dlgBoxPlot.vb | 2 +- instat/dlgDotPlot.vb | 2 +- instat/dlgHistogram.vb | 2 +- instat/dlgLinePlot.vb | 2 +- instat/dlgRugPlot.vb | 2 +- instat/dlgScatterPlot.vb | 2 +- instat/dlgSummaryBarOrPieChart.vb | 4 +- instat/sdgLayerOptions.vb | 91 +----------- instat/ucrAdditionalLayers.vb | 50 ++++--- instat/ucrColors.vb | 1 + instat/ucrCore.vb | 15 +- instat/ucrGeom.vb | 4 +- instat/ucrLayerParameters.vb | 4 +- instat/ucrReceiver.vb | 4 + instat/ucrReceiverMetadataProperty.vb | 17 ++- instat/ucrReceiverSingle.vb | 4 + 19 files changed, 349 insertions(+), 266 deletions(-) diff --git a/instat/UcrGeomListWithAes.designer.vb b/instat/UcrGeomListWithAes.designer.vb index 81e7442e37f..6085b13da21 100644 --- a/instat/UcrGeomListWithAes.designer.vb +++ b/instat/UcrGeomListWithAes.designer.vb @@ -27,6 +27,12 @@ Partial Class UcrGeomListWithParameters Me.ucrReceiverParam4 = New instat.ucrReceiverSingle() Me.ucrReceiverParam5 = New instat.ucrReceiverSingle() Me.grpAesList = New System.Windows.Forms.GroupBox() + Me.lblGgParam13 = New System.Windows.Forms.Label() + Me.ucrReceiverParam13 = New instat.ucrReceiverSingle() + Me.lblGgParam12 = New System.Windows.Forms.Label() + Me.ucrReceiverParam12 = New instat.ucrReceiverSingle() + Me.lblGgParam11 = New System.Windows.Forms.Label() + Me.ucrReceiverParam11 = New instat.ucrReceiverSingle() Me.lblGgParam6 = New System.Windows.Forms.Label() Me.lblGgParam10 = New System.Windows.Forms.Label() Me.lblGgParam9 = New System.Windows.Forms.Label() @@ -42,14 +48,8 @@ Partial Class UcrGeomListWithParameters Me.ucrReceiverParam8 = New instat.ucrReceiverSingle() Me.ucrReceiverParam7 = New instat.ucrReceiverSingle() Me.ucrReceiverParam6 = New instat.ucrReceiverSingle() - Me.chkApplyOnAllLayers = New System.Windows.Forms.CheckBox() - Me.chkIgnoreGlobalAes = New System.Windows.Forms.CheckBox() - Me.lblGgParam11 = New System.Windows.Forms.Label() - Me.ucrReceiverParam11 = New instat.ucrReceiverSingle() - Me.lblGgParam12 = New System.Windows.Forms.Label() - Me.ucrReceiverParam12 = New instat.ucrReceiverSingle() - Me.lblGgParam13 = New System.Windows.Forms.Label() - Me.ucrReceiverParam13 = New instat.ucrReceiverSingle() + Me.ucrChkIgnoreGlobalAes = New instat.ucrCheck() + Me.ucrChkApplyOnAllLayers = New instat.ucrCheck() Me.grpAesList.SuspendLayout() Me.SuspendLayout() ' @@ -73,48 +73,63 @@ Partial Class UcrGeomListWithParameters ' 'ucrReceiverParam1 ' + Me.ucrReceiverParam1.frmParent = Nothing Me.ucrReceiverParam1.Location = New System.Drawing.Point(97, 25) Me.ucrReceiverParam1.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverParam1.Name = "ucrReceiverParam1" Me.ucrReceiverParam1.Selector = Nothing Me.ucrReceiverParam1.Size = New System.Drawing.Size(106, 26) + Me.ucrReceiverParam1.strNcFilePath = "" Me.ucrReceiverParam1.TabIndex = 7 + Me.ucrReceiverParam1.ucrSelector = Nothing ' 'ucrReceiverParam2 ' + Me.ucrReceiverParam2.frmParent = Nothing Me.ucrReceiverParam2.Location = New System.Drawing.Point(97, 51) Me.ucrReceiverParam2.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverParam2.Name = "ucrReceiverParam2" Me.ucrReceiverParam2.Selector = Nothing Me.ucrReceiverParam2.Size = New System.Drawing.Size(106, 26) + Me.ucrReceiverParam2.strNcFilePath = "" Me.ucrReceiverParam2.TabIndex = 9 + Me.ucrReceiverParam2.ucrSelector = Nothing ' 'ucrReceiverParam3 ' + Me.ucrReceiverParam3.frmParent = Nothing Me.ucrReceiverParam3.Location = New System.Drawing.Point(97, 77) Me.ucrReceiverParam3.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverParam3.Name = "ucrReceiverParam3" Me.ucrReceiverParam3.Selector = Nothing Me.ucrReceiverParam3.Size = New System.Drawing.Size(106, 26) + Me.ucrReceiverParam3.strNcFilePath = "" Me.ucrReceiverParam3.TabIndex = 11 + Me.ucrReceiverParam3.ucrSelector = Nothing ' 'ucrReceiverParam4 ' + Me.ucrReceiverParam4.frmParent = Nothing Me.ucrReceiverParam4.Location = New System.Drawing.Point(97, 103) Me.ucrReceiverParam4.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverParam4.Name = "ucrReceiverParam4" Me.ucrReceiverParam4.Selector = Nothing Me.ucrReceiverParam4.Size = New System.Drawing.Size(106, 26) + Me.ucrReceiverParam4.strNcFilePath = "" Me.ucrReceiverParam4.TabIndex = 13 + Me.ucrReceiverParam4.ucrSelector = Nothing ' 'ucrReceiverParam5 ' + Me.ucrReceiverParam5.frmParent = Nothing Me.ucrReceiverParam5.Location = New System.Drawing.Point(97, 129) Me.ucrReceiverParam5.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverParam5.Name = "ucrReceiverParam5" Me.ucrReceiverParam5.Selector = Nothing Me.ucrReceiverParam5.Size = New System.Drawing.Size(106, 26) + Me.ucrReceiverParam5.strNcFilePath = "" Me.ucrReceiverParam5.TabIndex = 15 + Me.ucrReceiverParam5.ucrSelector = Nothing ' 'grpAesList ' @@ -151,6 +166,69 @@ Partial Class UcrGeomListWithParameters Me.grpAesList.TabStop = False Me.grpAesList.Text = "Geom Aesthetics:" ' + 'lblGgParam13 + ' + Me.lblGgParam13.AutoSize = True + Me.lblGgParam13.Location = New System.Drawing.Point(7, 341) + Me.lblGgParam13.Name = "lblGgParam13" + Me.lblGgParam13.Size = New System.Drawing.Size(39, 13) + Me.lblGgParam13.TabIndex = 30 + Me.lblGgParam13.Text = "Label3" + ' + 'ucrReceiverParam13 + ' + Me.ucrReceiverParam13.frmParent = Nothing + Me.ucrReceiverParam13.Location = New System.Drawing.Point(97, 337) + Me.ucrReceiverParam13.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverParam13.Name = "ucrReceiverParam13" + Me.ucrReceiverParam13.Selector = Nothing + Me.ucrReceiverParam13.Size = New System.Drawing.Size(106, 26) + Me.ucrReceiverParam13.strNcFilePath = "" + Me.ucrReceiverParam13.TabIndex = 31 + Me.ucrReceiverParam13.ucrSelector = Nothing + ' + 'lblGgParam12 + ' + Me.lblGgParam12.AutoSize = True + Me.lblGgParam12.Location = New System.Drawing.Point(7, 315) + Me.lblGgParam12.Name = "lblGgParam12" + Me.lblGgParam12.Size = New System.Drawing.Size(39, 13) + Me.lblGgParam12.TabIndex = 28 + Me.lblGgParam12.Text = "Label2" + ' + 'ucrReceiverParam12 + ' + Me.ucrReceiverParam12.frmParent = Nothing + Me.ucrReceiverParam12.Location = New System.Drawing.Point(97, 311) + Me.ucrReceiverParam12.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverParam12.Name = "ucrReceiverParam12" + Me.ucrReceiverParam12.Selector = Nothing + Me.ucrReceiverParam12.Size = New System.Drawing.Size(106, 26) + Me.ucrReceiverParam12.strNcFilePath = "" + Me.ucrReceiverParam12.TabIndex = 29 + Me.ucrReceiverParam12.ucrSelector = Nothing + ' + 'lblGgParam11 + ' + Me.lblGgParam11.AutoSize = True + Me.lblGgParam11.Location = New System.Drawing.Point(7, 289) + Me.lblGgParam11.Name = "lblGgParam11" + Me.lblGgParam11.Size = New System.Drawing.Size(39, 13) + Me.lblGgParam11.TabIndex = 26 + Me.lblGgParam11.Text = "Label2" + ' + 'ucrReceiverParam11 + ' + Me.ucrReceiverParam11.frmParent = Nothing + Me.ucrReceiverParam11.Location = New System.Drawing.Point(97, 285) + Me.ucrReceiverParam11.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverParam11.Name = "ucrReceiverParam11" + Me.ucrReceiverParam11.Selector = Nothing + Me.ucrReceiverParam11.Size = New System.Drawing.Size(106, 26) + Me.ucrReceiverParam11.strNcFilePath = "" + Me.ucrReceiverParam11.TabIndex = 27 + Me.ucrReceiverParam11.ucrSelector = Nothing + ' 'lblGgParam6 ' Me.lblGgParam6.AutoSize = True @@ -243,128 +321,85 @@ Partial Class UcrGeomListWithParameters ' 'ucrReceiverParam10 ' + Me.ucrReceiverParam10.frmParent = Nothing Me.ucrReceiverParam10.Location = New System.Drawing.Point(97, 259) Me.ucrReceiverParam10.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverParam10.Name = "ucrReceiverParam10" Me.ucrReceiverParam10.Selector = Nothing Me.ucrReceiverParam10.Size = New System.Drawing.Size(106, 26) + Me.ucrReceiverParam10.strNcFilePath = "" Me.ucrReceiverParam10.TabIndex = 25 + Me.ucrReceiverParam10.ucrSelector = Nothing ' 'ucrReceiverParam9 ' + Me.ucrReceiverParam9.frmParent = Nothing Me.ucrReceiverParam9.Location = New System.Drawing.Point(97, 233) Me.ucrReceiverParam9.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverParam9.Name = "ucrReceiverParam9" Me.ucrReceiverParam9.Selector = Nothing Me.ucrReceiverParam9.Size = New System.Drawing.Size(106, 26) + Me.ucrReceiverParam9.strNcFilePath = "" Me.ucrReceiverParam9.TabIndex = 23 + Me.ucrReceiverParam9.ucrSelector = Nothing ' 'ucrReceiverParam8 ' + Me.ucrReceiverParam8.frmParent = Nothing Me.ucrReceiverParam8.Location = New System.Drawing.Point(97, 207) Me.ucrReceiverParam8.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverParam8.Name = "ucrReceiverParam8" Me.ucrReceiverParam8.Selector = Nothing Me.ucrReceiverParam8.Size = New System.Drawing.Size(106, 26) + Me.ucrReceiverParam8.strNcFilePath = "" Me.ucrReceiverParam8.TabIndex = 21 + Me.ucrReceiverParam8.ucrSelector = Nothing ' 'ucrReceiverParam7 ' + Me.ucrReceiverParam7.frmParent = Nothing Me.ucrReceiverParam7.Location = New System.Drawing.Point(97, 181) Me.ucrReceiverParam7.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverParam7.Name = "ucrReceiverParam7" Me.ucrReceiverParam7.Selector = Nothing Me.ucrReceiverParam7.Size = New System.Drawing.Size(106, 26) + Me.ucrReceiverParam7.strNcFilePath = "" Me.ucrReceiverParam7.TabIndex = 19 + Me.ucrReceiverParam7.ucrSelector = Nothing ' 'ucrReceiverParam6 ' + Me.ucrReceiverParam6.frmParent = Nothing Me.ucrReceiverParam6.Location = New System.Drawing.Point(97, 155) Me.ucrReceiverParam6.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverParam6.Name = "ucrReceiverParam6" Me.ucrReceiverParam6.Selector = Nothing Me.ucrReceiverParam6.Size = New System.Drawing.Size(106, 26) + Me.ucrReceiverParam6.strNcFilePath = "" Me.ucrReceiverParam6.TabIndex = 17 + Me.ucrReceiverParam6.ucrSelector = Nothing ' - 'chkApplyOnAllLayers - ' - Me.chkApplyOnAllLayers.AutoSize = True - Me.chkApplyOnAllLayers.Location = New System.Drawing.Point(3, 245) - Me.chkApplyOnAllLayers.Name = "chkApplyOnAllLayers" - Me.chkApplyOnAllLayers.Size = New System.Drawing.Size(117, 17) - Me.chkApplyOnAllLayers.TabIndex = 3 - Me.chkApplyOnAllLayers.Text = "Apply On All Layers" - Me.chkApplyOnAllLayers.UseVisualStyleBackColor = True - ' - 'chkIgnoreGlobalAes - ' - Me.chkIgnoreGlobalAes.AutoSize = True - Me.chkIgnoreGlobalAes.Location = New System.Drawing.Point(3, 266) - Me.chkIgnoreGlobalAes.Name = "chkIgnoreGlobalAes" - Me.chkIgnoreGlobalAes.Size = New System.Drawing.Size(141, 17) - Me.chkIgnoreGlobalAes.TabIndex = 4 - Me.chkIgnoreGlobalAes.Text = "Ignore Global Aesthetics" - Me.chkIgnoreGlobalAes.UseVisualStyleBackColor = True - ' - 'lblGgParam11 - ' - Me.lblGgParam11.AutoSize = True - Me.lblGgParam11.Location = New System.Drawing.Point(7, 289) - Me.lblGgParam11.Name = "lblGgParam11" - Me.lblGgParam11.Size = New System.Drawing.Size(39, 13) - Me.lblGgParam11.TabIndex = 26 - Me.lblGgParam11.Text = "Label2" - ' - 'ucrReceiverParam11 - ' - Me.ucrReceiverParam11.Location = New System.Drawing.Point(97, 285) - Me.ucrReceiverParam11.Margin = New System.Windows.Forms.Padding(0) - Me.ucrReceiverParam11.Name = "ucrReceiverParam11" - Me.ucrReceiverParam11.Selector = Nothing - Me.ucrReceiverParam11.Size = New System.Drawing.Size(106, 26) - Me.ucrReceiverParam11.TabIndex = 27 - ' - 'lblGgParam12 - ' - Me.lblGgParam12.AutoSize = True - Me.lblGgParam12.Location = New System.Drawing.Point(7, 315) - Me.lblGgParam12.Name = "lblGgParam12" - Me.lblGgParam12.Size = New System.Drawing.Size(39, 13) - Me.lblGgParam12.TabIndex = 28 - Me.lblGgParam12.Text = "Label2" - ' - 'ucrReceiverParam12 - ' - Me.ucrReceiverParam12.Location = New System.Drawing.Point(97, 311) - Me.ucrReceiverParam12.Margin = New System.Windows.Forms.Padding(0) - Me.ucrReceiverParam12.Name = "ucrReceiverParam12" - Me.ucrReceiverParam12.Selector = Nothing - Me.ucrReceiverParam12.Size = New System.Drawing.Size(106, 26) - Me.ucrReceiverParam12.TabIndex = 29 + 'ucrChkIgnoreGlobalAes ' - 'lblGgParam13 + Me.ucrChkIgnoreGlobalAes.Checked = False + Me.ucrChkIgnoreGlobalAes.Location = New System.Drawing.Point(5, 280) + Me.ucrChkIgnoreGlobalAes.Name = "ucrChkIgnoreGlobalAes" + Me.ucrChkIgnoreGlobalAes.Size = New System.Drawing.Size(100, 20) + Me.ucrChkIgnoreGlobalAes.TabIndex = 7 ' - Me.lblGgParam13.AutoSize = True - Me.lblGgParam13.Location = New System.Drawing.Point(7, 341) - Me.lblGgParam13.Name = "lblGgParam13" - Me.lblGgParam13.Size = New System.Drawing.Size(39, 13) - Me.lblGgParam13.TabIndex = 30 - Me.lblGgParam13.Text = "Label3" + 'ucrChkApplyOnAllLayers ' - 'ucrReceiverParam13 - ' - Me.ucrReceiverParam13.Location = New System.Drawing.Point(97, 337) - Me.ucrReceiverParam13.Margin = New System.Windows.Forms.Padding(0) - Me.ucrReceiverParam13.Name = "ucrReceiverParam13" - Me.ucrReceiverParam13.Selector = Nothing - Me.ucrReceiverParam13.Size = New System.Drawing.Size(106, 26) - Me.ucrReceiverParam13.TabIndex = 31 + Me.ucrChkApplyOnAllLayers.Checked = False + Me.ucrChkApplyOnAllLayers.Location = New System.Drawing.Point(5, 254) + Me.ucrChkApplyOnAllLayers.Name = "ucrChkApplyOnAllLayers" + Me.ucrChkApplyOnAllLayers.Size = New System.Drawing.Size(100, 20) + Me.ucrChkApplyOnAllLayers.TabIndex = 8 ' 'UcrGeomListWithParameters ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) - Me.Controls.Add(Me.chkIgnoreGlobalAes) - Me.Controls.Add(Me.chkApplyOnAllLayers) + Me.Controls.Add(Me.ucrChkApplyOnAllLayers) + Me.Controls.Add(Me.ucrChkIgnoreGlobalAes) Me.Controls.Add(Me.grpAesList) Me.Controls.Add(Me.lblAesList) Me.Controls.Add(Me.ucrGeomWithAesSelector) @@ -373,8 +408,8 @@ Partial Class UcrGeomListWithParameters Me.Controls.SetChildIndex(Me.ucrGeomWithAesSelector, 0) Me.Controls.SetChildIndex(Me.lblAesList, 0) Me.Controls.SetChildIndex(Me.grpAesList, 0) - Me.Controls.SetChildIndex(Me.chkApplyOnAllLayers, 0) - Me.Controls.SetChildIndex(Me.chkIgnoreGlobalAes, 0) + Me.Controls.SetChildIndex(Me.ucrChkIgnoreGlobalAes, 0) + Me.Controls.SetChildIndex(Me.ucrChkApplyOnAllLayers, 0) Me.grpAesList.ResumeLayout(False) Me.grpAesList.PerformLayout() Me.ResumeLayout(False) @@ -402,8 +437,6 @@ Partial Class UcrGeomListWithParameters Friend WithEvents lblGgParam8 As Label Friend WithEvents ucrReceiverParam9 As ucrReceiverSingle Friend WithEvents ucrReceiverParam8 As ucrReceiverSingle - Friend WithEvents chkApplyOnAllLayers As CheckBox - Friend WithEvents chkIgnoreGlobalAes As CheckBox Friend WithEvents lblGgParam10 As Label Friend WithEvents ucrReceiverParam10 As ucrReceiverSingle Friend WithEvents lblGgParam13 As Label @@ -412,4 +445,6 @@ Partial Class UcrGeomListWithParameters Friend WithEvents ucrReceiverParam12 As ucrReceiverSingle Friend WithEvents lblGgParam11 As Label Friend WithEvents ucrReceiverParam11 As ucrReceiverSingle + Friend WithEvents ucrChkIgnoreGlobalAes As ucrCheck + Friend WithEvents ucrChkApplyOnAllLayers As ucrCheck End Class diff --git a/instat/UcrGeomListWithAes.vb b/instat/UcrGeomListWithAes.vb index e7dfe60b574..65e015df226 100644 --- a/instat/UcrGeomListWithAes.vb +++ b/instat/UcrGeomListWithAes.vb @@ -33,6 +33,7 @@ Public Class UcrGeomListWithParameters ' This is needed to prevent real time changes to global or local aes because this can change e.g. when apply globally is checked ' When returning from this control, the intermediate aes with update the global and local aes appropriately Private clsInterAesFunction As New RFunction + Private bControlsInitialised As Boolean = False Public Sub New() @@ -42,26 +43,36 @@ Public Class UcrGeomListWithParameters ' Add any initialization after the InitializeComponent() call. 'Get the lists of parameter labels and receivers. - lstAesParameterLabels.AddRange({lblGgParam1, lblGgParam2, lblGgParam3, lblGgParam4, lblGgParam5, lblGgParam6, lblGgParam7, lblGgParam8, lblGgParam9, lblGgParam10, lblGgParam11, lblGgParam12, lblGgParam13}) - lstAesParameterReceivers.AddRange({ucrReceiverParam1, ucrReceiverParam2, ucrReceiverParam3, ucrReceiverParam4, ucrReceiverParam5, ucrReceiverParam6, ucrReceiverParam7, ucrReceiverParam8, ucrReceiverParam9, ucrReceiverParam10, ucrReceiverParam11, ucrReceiverParam12, ucrReceiverParam13}) - SetSelector() End Sub Private Sub UcrGeomListWithParameters_Load(sender As Object, e As EventArgs) Handles MyBase.Load If bFirstLoad Then - SetParameters() - clsInterAesFunction.SetPackageName("ggplot2") - clsInterAesFunction.SetRCommand("aes") - 'This one is called when the geom is changed, which is apparently the case when the Layer is loaded (first thing that happens). Left in for security but could be taken out. bFirstLoad = False End If - 'SetAes(bCurrentFixAes) - 'Apparently, this is not necessary as SetAes is called several places, when geom is changed and when Layer is set up which always happen at load. + If Not bControlsInitialised Then + InitialiseControls() + End If + End Sub + + Private Sub InitialiseControls() + lstAesParameterLabels.AddRange({lblGgParam1, lblGgParam2, lblGgParam3, lblGgParam4, lblGgParam5, lblGgParam6, lblGgParam7, lblGgParam8, lblGgParam9, lblGgParam10, lblGgParam11, lblGgParam12, lblGgParam13}) + lstAesParameterReceivers.AddRange({ucrReceiverParam1, ucrReceiverParam2, ucrReceiverParam3, ucrReceiverParam4, ucrReceiverParam5, ucrReceiverParam6, ucrReceiverParam7, ucrReceiverParam8, ucrReceiverParam9, ucrReceiverParam10, ucrReceiverParam11, ucrReceiverParam12, ucrReceiverParam13}) + SetSelector() + + clsInterAesFunction.SetPackageName("ggplot2") + clsInterAesFunction.SetRCommand("aes") + ucrChkIgnoreGlobalAes.SetParameter(New RParameter("inherit.aes"), bNewChangeParameterValue:=True, strNewValueIfChecked:="FALSE", strNewValueIfUnchecked:="TRUE") + ucrChkIgnoreGlobalAes.SetRDefault("TRUE") + bControlsInitialised = True + End Sub + + Public Sub Reset() + ucrGeomWithAesSelector.Reset() End Sub Private Sub SetSelector() 'Link the selector and the receivers - For Each ucrTempReceiver In lstAesParameterReceivers + For Each ucrTempReceiver As ucrReceiver In lstAesParameterReceivers ucrTempReceiver.Selector = ucrGeomWithAesSelector ucrTempReceiver.SetParameterIsString() ucrTempReceiver.bWithQuotes = False @@ -74,36 +85,40 @@ Public Class UcrGeomListWithParameters Dim iIndexOfData_nameParameter As Integer strDataFrameName = strGlobalDataFrame - If clsGeomFunction.GetParameter("data") IsNot Nothing AndAlso clsGeomFunction.GetParameter("data").clsArgumentCodeStructure.clsParameters.FindIndex(Function(x) x.strArgumentName = "data_name") <> -1 Then + If clsGeomFunction.ContainsParameter("data") AndAlso clsGeomFunction.GetParameter("data").clsArgumentCodeStructure.clsParameters.FindIndex(Function(x) x.strArgumentName = "data_name") <> -1 Then iIndexOfData_nameParameter = clsGeomFunction.GetParameter("data").clsArgumentCodeStructure.clsParameters.FindIndex(Function(x) x.strArgumentName = "data_name") strDataFrameName = clsGeomFunction.GetParameter("data").clsArgumentCodeStructure.clsParameters(iIndexOfData_nameParameter).strArgumentValue strDataFrameName = strDataFrameName.Substring(1, strDataFrameName.Length - 2) 'The value of the parameter "data_name" has quotes around it that need to be erased as we merely want the name of the data_frame. ucrGeomWithAesSelector.SetDataframe(strDataFrameName) Else - ucrGeomWithAesSelector.SetDataframe(strDataFrameName, (Not chkApplyOnAllLayers.Checked) OrElse strGlobalDataFrame = "") + ucrGeomWithAesSelector.SetDataframe(strDataFrameName, (Not ucrChkApplyOnAllLayers.Checked) OrElse strGlobalDataFrame = "") End If End Sub - Public Overrides Sub Setup(clsNewGeomFunc As RFunction, clsNewGlobalAesFunc As RFunction, Optional bFixGeom As Boolean = False, Optional strDataframe As String = "", Optional bApplyAesGlobally As Boolean = True, Optional iNumVariablesForGeoms As Integer = -1, Optional clsNewLocalAes As RFunction = Nothing, Optional bReset As Boolean = False) - 'See ucrAdditionalLayers and Specific Plots dlg to see how the SetUp Parameters are chosen within the sdgLayerOptions.SetupLayer call. - MyBase.Setup(clsNewGeomFunc, clsNewGlobalAesFunc, bFixGeom, strDataframe, bApplyAesGlobally, iNumVariablesForGeoms, clsNewLocalAes, bReset) - - ' This might stay as data frame depends on global/local option and therefore can't be linked to a function - InitialiseSelectedDataFrame() + Public Overrides Sub Setup(clsNewGgplotFunction As RFunction, clsNewGeomFunc As RFunction, clsNewGlobalAesFunc As RFunction, clsNewLocalAes As RFunction, Optional bFixGeom As Boolean = False, Optional strDataframe As String = "", Optional bApplyAesGlobally As Boolean = True, Optional iNumVariablesForGeoms As Integer = -1, Optional bReset As Boolean = False) + If Not bControlsInitialised Then + InitialiseControls() + End If - SetInterAes(bReset) + MyBase.Setup(clsNewGgplotFunction, clsNewGeomFunc, clsNewGlobalAesFunc, clsNewLocalAes, bFixGeom, strDataframe, bApplyAesGlobally, iNumVariablesForGeoms, bReset) 'Using the values of the two relevant parameters, the two following lines determine whether the chkBoxes ApplyToAllLayers and IgnoreGlobalAes should be ticked. 'Introduced a safety net: these can't be ticked at the same time, in that case an error has been made in the code and a message is sent to the user. - If bApplyAesGlobally AndAlso bIgnoreGlobalAes Then - MsgBox("Error: the sdgLayerOptions.ucrGeomWithAes.Setup is asking to tick both check boxes ApplyOnAllLayers and IgnoreGlobalAesthetics which is not appropriate. An error has been made when setting the parameters bApplyAesGlobally and bIgnoreGlobalAes in ucrAdditionalLayers or in a Specific PLot dlg. Both check boxes have been unticked by default.", vbOKOnly) - bApplyAesGlobally = False - bIgnoreGlobalAes = False + ucrChkApplyOnAllLayers.Checked = bApplyAesGlobally + ucrChkIgnoreGlobalAes.SetRCode(clsGeomFunction, bReset) + If ucrChkApplyOnAllLayers.Checked AndAlso ucrChkIgnoreGlobalAes.Checked Then + MsgBox("Error: Cannot check both 'Apply On All Layers' and 'Ignore Global Aesthetics' as this will remove all aesthetics from this layer. Setting both values to checked.", vbOKOnly) + ucrChkApplyOnAllLayers.Checked = False + ucrChkIgnoreGlobalAes.Checked = False End If - chkApplyOnAllLayers.Checked = bApplyAesGlobally - chkIgnoreGlobalAes.Checked = bIgnoreGlobalAes 'Note: raises the event check changed if the value has indeed changed. - SetAes() + ' This might stay as data frame depends on global/local option and therefore can't be linked to a function + InitialiseSelectedDataFrame() + + SetParameters() + 'This is done last because it requires using correct value of ucrChkIgnoreGlobalAes.Checked + SetInterAes(bReset) + 'Warning: SetAes is called three times when a layer is created... one in the load, one in the setup, one when geom is set, ... End Sub @@ -113,18 +128,17 @@ Public Class UcrGeomListWithParameters Dim strCurrGeomAesParamName As String 'Clear code so receivers don't update until intermediate function is set - ClearReceiversCodeAndParameter() For i = 0 To clsCurrGeom.clsAesParameters.Count - 1 strCurrGeomAesParamName = clsCurrGeom.clsAesParameters(i).strAesParameterName - lstAesParameterReceivers(i).SetParameter(New RParameter(strCurrGeomAesParamName)) 'Task: print global aesthetics in blue within the receivers and perhaps global aesthetics inherited from another dataframe in red ? 'When IgnoreGlobalAes is not checked, we want the applicable global aesthetics to appear in the intermediate function. - If Not chkIgnoreGlobalAes.Checked Then + If Not ucrChkIgnoreGlobalAes.Checked Then 'For some geoms e.g. geom_line, when an aes is not filled in (usually x or y), ggplot syntax requires the aes to be set to "" e.g. x = "". 'We do not need to copy this to the intermediate aes as they are affectively empty If clsGlobalAesFunction.ContainsParameter(strCurrGeomAesParamName) AndAlso Not clsGlobalAesFunction.GetParameter(strCurrGeomAesParamName).strArgumentValue = Chr(34) & Chr(34) Then bAesFound = True clsInterAesFunction.AddParameter(clsGlobalAesFunction.GetParameter(strCurrGeomAesParamName).Clone()) + lstAesParameterReceivers(i).SetTextColour(Color.Blue) End If 'For Each clsParam In clsGlobalAesFunction.clsParameters ' If clsParam.strArgumentName = lstCurrArguments(i) Then @@ -138,6 +152,7 @@ Public Class UcrGeomListWithParameters If clsLocalAesFunction.ContainsParameter(strCurrGeomAesParamName) AndAlso Not clsLocalAesFunction.GetParameter(strCurrGeomAesParamName).strArgumentValue = Chr(34) & Chr(34) Then bAesFound = True clsInterAesFunction.AddParameter(clsGlobalAesFunction.GetParameter(strCurrGeomAesParamName).Clone()) + lstAesParameterReceivers(i).SetTextColour(Color.Black) End If 'For Each clsParam In clsLocalAesFunction.clsParameters @@ -149,12 +164,12 @@ Public Class UcrGeomListWithParameters ' End If ' End If 'Next - If bAesFound Then + If Not bAesFound Then iFirstEmptyAes = i End If bAesFound = False Next - SetRCodeForReceivers(clsInterAesFunction, bReset) + SetRCodeForReceivers(clsInterAesFunction, clsCurrGeom.clsAesParameters.Count, bReset) End Sub 'Private Function LocalAndGlobalDataFramesAreDifferent() As Boolean @@ -220,7 +235,6 @@ Public Class UcrGeomListWithParameters 'Security check: our current geom has been populated. If clsCurrGeom IsNot Nothing Then 'The following two will be reset as desired. - clsLocalAesFunction.ClearParameters() lstCurrArguments.Clear() ClearReceiversCodeAndParameter() If (clsCurrGeom.clsAesParameters.Count < iMaxIndex) Then @@ -242,7 +256,6 @@ Public Class UcrGeomListWithParameters lstAesParameterReceivers(i).Visible = True lstAesParameterLabels(i).Text = strParamName & ":" - lstCurrArguments.Add(strParamName) lstAesParameterReceivers(i).SetParameter(New RParameter(strParamName)) If clsCurrGeom.clsAesParameters(i).bIsMandatory Then lstAesParameterLabels(i).Font = New Font(lstAesParameterLabels(i).Font, FontStyle.Bold) @@ -263,7 +276,6 @@ Public Class UcrGeomListWithParameters Else 'If the current geom has not been populated, then an error has been made in the code MsgBox("Developer Error: the current geom (clsCurrGeom) has not been populated before setting the aes parameters for the ucrGeomListWithAes on the sdgLayerOptions.", MsgBoxStyle.OkOnly) End If - SetAes() End Sub Public Sub UcrGeomListWithParameters_cboGeomListIndexChanged() Handles Me.GeomChanged @@ -307,29 +319,20 @@ Public Class UcrGeomListWithParameters ' End If End Function - Private Sub chkChangeAes_CheckedChanged(sender As Object, e As EventArgs) Handles chkApplyOnAllLayers.CheckedChanged - 'Sets the dataframe to the globaldataframe and fixes it in case that one is not empty and chkApplyOnAllLayers is checked. - 'Question to be discussed: are we happy with this ? We don't want it to be the opposite, i.e. the global data frame to be changed when apply on all layers is ticked ? Would then need to "reset the global aes function"... See issue on github... All this should be revised when linking is studied. - ucrGeomWithAesSelector.SetDataframe(strGlobalDataFrame, (Not chkApplyOnAllLayers.Checked) OrElse strGlobalDataFrame = "") - 'Warning: the dataframe needs to be set first. Indeed, this will enable IgnoreGlobalAes in the "datafram_changed" sub. In the same sub, Ignore global aes will be unticked and thus setAes called. If not done in this order, Ignore global aes is unticked below before the check box has been enabled and thus the event IngnoreGlobalAes.check.changed is not raised, and set aes never called. - If chkApplyOnAllLayers.Checked Then - chkIgnoreGlobalAes.Checked = False - chkIgnoreGlobalAes.Hide() - Else - chkIgnoreGlobalAes.Show() - End If - End Sub + Private Sub chkChangeAes_CheckedChanged(sender As Object, e As EventArgs) - Private Sub chkIgnoreGlobalAes_CheckedChanged(sender As Object, e As EventArgs) Handles chkIgnoreGlobalAes.CheckedChanged - If chkIgnoreGlobalAes.Checked Then - clsGeomFunction.AddParameter("inherit.aes", "FALSE") - Else - clsGeomFunction.RemoveParameterByName("inherit.aes") - End If - 'When IgnoreGlobalAes is checked, we don't want the global aesthetics to appear in the receivers anymore. - SetAes() End Sub + 'Private Sub chkIgnoreGlobalAes_CheckedChanged(sender As Object, e As EventArgs) + ' If chkIgnoreGlobalAes.Checked Then + ' clsGeomFunction.AddParameter("inherit.aes", "FALSE") + ' Else + ' clsGeomFunction.RemoveParameterByName("inherit.aes") + ' End If + ' 'When IgnoreGlobalAes is checked, we don't want the global aesthetics to appear in the receivers anymore. + ' SetAes() + 'End Sub + Private Sub ucrGeomWithAesSelector_DataFrameChanged() Handles ucrGeomWithAesSelector.DataFrameChanged 'Warning: When the dataframes in local layers don't correspond to the data in the global ggplot function, inherit.aes should be set to false unless variables have the same name in different dataframes... 'Warning: in ggplot, one can work with data1 in the global ggplot function and data2 in some layer. If the parameter inherit.aes is not set to false, the mapping in ggplot function will be copied into the layer with different dataframe. Unless the variables used in data1 are also variables in data2, this will give an error and crash the software... @@ -353,9 +356,93 @@ Public Class UcrGeomListWithParameters Next End Sub - Public Sub SetRCodeForReceivers(clsNewRCode As RCodeStructure, Optional bReset As Boolean = False) - For Each ucrTempReceiver As ucrReceiver In lstAesParameterReceivers - ucrTempReceiver.SetRCode(clsNewRCode, bReset) + Public Sub SetRCodeForReceivers(clsNewRCode As RCodeStructure, iParameterCount As Integer, Optional bReset As Boolean = False) + For i As Integer = 0 To iParameterCount - 1 + lstAesParameterReceivers(i).SetRCode(clsNewRCode, bReset) Next End Sub + + Private Sub ucrChkIgnoreGlobalAes_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkIgnoreGlobalAes.ControlValueChanged + SetInterAes(False) + 'Sets the dataframe to the globaldataframe and fixes it in case that one is not empty and chkApplyOnAllLayers is checked. + 'Question to be discussed: are we happy with this ? We don't want it to be the opposite, i.e. the global data frame to be changed when apply on all layers is ticked ? Would then need to "reset the global aes function"... See issue on github... All this should be revised when linking is studied. + ucrGeomWithAesSelector.SetDataframe(strGlobalDataFrame, (Not ucrChkApplyOnAllLayers.Checked) OrElse strGlobalDataFrame = "") + 'Warning: the dataframe needs to be set first. Indeed, this will enable IgnoreGlobalAes in the "datafram_changed" sub. In the same sub, Ignore global aes will be unticked and thus setAes called. If not done in this order, Ignore global aes is unticked below before the check box has been enabled and thus the event IngnoreGlobalAes.check.changed is not raised, and set aes never called. + If ucrChkApplyOnAllLayers.Checked Then + ucrChkIgnoreGlobalAes.Checked = False + ucrChkIgnoreGlobalAes.Hide() + Else + ucrChkIgnoreGlobalAes.Show() + End If + 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 + + 'Two situations: apply on all layers checked or not. Would edit the global or local aes accordingly. + If ucrChkApplyOnAllLayers.Checked Then + 'If ucrChkApplyOnAllLayers is checked, inter aes become the global aes. + For Each clsParam In clsInterAesFunction.clsParameters + clsGlobalAesFunction.AddParameter(clsParam) 'Warning: This never removes the parameters that have been previously inserted... + Next + 'We need to remove local "mapping" and "data" parameters. + clsGeomFunction.RemoveParameterByName("mapping") + clsGeomFunction.RemoveParameterByName("data") + + 'Here the global ggplot function takes the relevant "mapping" and "data" parameters as required by "ApplyOnAllLayers". + 'This should not need to be done?? + 'clsGgplotFunction.AddParameter("mapping", clsRFunctionParameter:=clsAesFunction) + clsGgplotFunction.AddParameter("data", clsRFunctionParameter:=ucrGeomWithAesSelector.ucrAvailableDataFrames.clsCurrDataFrame.Clone()) + strGlobalDataFrame = ucrGeomWithAesSelector.ucrAvailableDataFrames.cboAvailableDataFrames.Text + Else 'Warning: in case the sdgLayerOptions has been called by specific dlg, need to refill the aes on that dlg. Imagine the ApplyOnAllLayers has been unticked ? Problem... Also in order to solve this, would need to know on the specific dialog if it has been unticked or not in order to know how to fill in the aes receivers ! The linking will be restudied anyway. There are many ways to go, see discussion on github. + clsLocalAesFunction = clsInterAesFunction.Clone() + 'If global data frame later changes, data parameter is needed in each geom? + If ucrGeomWithAesSelector.ucrAvailableDataFrames.cboAvailableDataFrames.Text <> strGlobalDataFrame Then + clsGeomFunction.AddParameter("data", clsRFunctionParameter:=ucrGeomWithAesSelector.ucrAvailableDataFrames.clsCurrDataFrame.Clone()) + Else + clsGeomFunction.RemoveParameterByName("data") + End If + End If + + 'clsCurrentAesFunction is the aes function where aes where additional aes should be added for the temporary fixes below + If ucrChkIgnoreGlobalAes.Checked Then + clsCurrentAesFunction = clsGlobalAesFunction + Else + clsCurrentAesFunction = clsLocalAesFunction + 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 (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 + ElseIf clsGeomFunction.strRCommand = "geom_point" OrElse clsGeomFunction.strRCommand = "geom_line" 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 (clsGlobalAesFunction.clsParameters.FindIndex(Function(x) x.strArgumentName = "y") = -1 OrElse ucrChkIgnoreGlobalAes.Checked) AndAlso clsLocalAesFunction.clsParameters.FindIndex(Function(x) x.strArgumentName = "y") = -1 Then + clsCurrentAesFunction.AddParameter("y", Chr(34) & Chr(34)) + End If + End If + 'Adding stat = identity method + If {"geom_bar", "geom_density", "geom_freqpoly"}.Contains(clsGeomFunction.strRCommand) Then + '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)) + 'Task: send a message to the user saying that stat = identity has been added as a parameter in order to avoid error. Can be modified on the LayerParameter tab. + 'In case the "y" mapping has been removed after editing the layer, the added "stat" parameter should probably be removed so it is important for the user to know it has been added in automatically, in case he wants to go to the layer parameters tab and remove it. + End If + End If + + 'Done after because aes may be added in from above + If Not ucrChkIgnoreGlobalAes.Checked Then + If clsLocalAesFunction.iParameterCount > 0 Then + clsGeomFunction.AddParameter("mapping", clsRFunctionParameter:=clsLocalAesFunction.Clone()) + Else + clsGeomFunction.RemoveParameterByName("mapping") + End If + End If + End Sub End Class diff --git a/instat/dlgBarAndPieChart.vb b/instat/dlgBarAndPieChart.vb index 62413578fb3..29322d8bc1a 100644 --- a/instat/dlgBarAndPieChart.vb +++ b/instat/dlgBarAndPieChart.vb @@ -205,7 +205,8 @@ Public Class dlgBarAndPieChart End Sub Private Sub cmdBarChartOptions_Click(sender As Object, e As EventArgs) Handles cmdBarChartOptions.Click - sdgLayerOptions.SetupLayer(clsTempGgPlot:=clsRggplotFunction, clsTempGeomFunc:=clsRgeomBarFunction, clsTempAesFunc:=clsBarAesFunction, bFixAes:=True, bFixGeom:=True, strDataframe:=ucrBarChartSelector.ucrAvailableDataFrames.cboAvailableDataFrames.Text, bApplyAesGlobally:=True, bIgnoreGlobalAes:=False) + 'What should global and local aes be? + sdgLayerOptions.SetupLayer(clsNewGgPlot:=clsRggplotFunction, clsNewGeomFunc:=clsRgeomBarFunction, clsNewGlobalAesFunc:=clsBarAesFunction, clsNewLocalAes:=clsBarAesFunction, bFixGeom:=True, strDataframe:=ucrBarChartSelector.ucrAvailableDataFrames.cboAvailableDataFrames.Text, bApplyAesGlobally:=True) sdgLayerOptions.ShowDialog() For Each clsParam In clsBarAesFunction.clsParameters If clsParam.strArgumentName = "x" Then @@ -218,7 +219,7 @@ Public Class dlgBarAndPieChart End Sub Private Sub cmdPieChartOptions_Click(sender As Object, e As EventArgs) Handles cmdPieChartOptions.Click - sdgLayerOptions.SetupLayer(clsTempGgPlot:=clsRggplotFunction, clsTempGeomFunc:=clsRgeomBarFunction, clsTempAesFunc:=clsPieAesFunction, bFixAes:=True, bFixGeom:=True, strDataframe:=ucrBarChartSelector.ucrAvailableDataFrames.cboAvailableDataFrames.Text, bApplyAesGlobally:=True) + 'sdgLayerOptions.SetupLayer(clsTempGgPlot:=clsRggplotFunction, clsTempGeomFunc:=clsRgeomBarFunction, clsTempAesFunc:=clsPieAesFunction, bFixAes:=True, bFixGeom:=True, strDataframe:=ucrBarChartSelector.ucrAvailableDataFrames.cboAvailableDataFrames.Text, bApplyAesGlobally:=True) sdgLayerOptions.ShowDialog() For Each clsParam In clsPieAesFunction.clsParameters If clsParam.strArgumentName = "x" Then diff --git a/instat/dlgBoxPlot.vb b/instat/dlgBoxPlot.vb index 15086acb706..2250807e025 100644 --- a/instat/dlgBoxPlot.vb +++ b/instat/dlgBoxPlot.vb @@ -188,7 +188,7 @@ Public Class dlgBoxplot Private Sub cmdBoxPlotOptions_Click(sender As Object, e As EventArgs) Handles cmdBoxPlotOptions.Click 'SetupLayer sends the components storing the plot info (clsRgeom_boxplotFunction, clsRggplotFunction, ...) of dlgBoxPlot through to sdgLayerOptions where these will be edited. - sdgLayerOptions.SetupLayer(clsTempGgPlot:=clsRggplotFunction, clsTempGeomFunc:=clsRgeomPlotFunction, clsTempAesFunc:=clsRaesFunction, bFixAes:=True, bFixGeom:=True, strDataframe:=ucrSelectorBoxPlot.ucrAvailableDataFrames.cboAvailableDataFrames.Text, bApplyAesGlobally:=True, bIgnoreGlobalAes:=False) + 'sdgLayerOptions.SetupLayer(clsTempGgPlot:=clsRggplotFunction, clsTempGeomFunc:=clsRgeomPlotFunction, clsTempAesFunc:=clsRaesFunction, bFixAes:=True, bFixGeom:=True, strDataframe:=ucrSelectorBoxPlot.ucrAvailableDataFrames.cboAvailableDataFrames.Text, bApplyAesGlobally:=True, bIgnoreGlobalAes:=False) sdgLayerOptions.ShowDialog() 'Coming from the sdgLayerOptions, clsRgeom_boxplot and others has been modified. One then needs to display these modifications on the dlgBoxPlot. If clsRgeomPlotFunction.GetParameter("varwidth") IsNot Nothing Then diff --git a/instat/dlgDotPlot.vb b/instat/dlgDotPlot.vb index e4c7e6b44c4..8c37b2afe36 100644 --- a/instat/dlgDotPlot.vb +++ b/instat/dlgDotPlot.vb @@ -162,7 +162,7 @@ Public Class dlgDotPlot Dim iIndex As Integer bEditAesFunction = False 'The content of the AesFunction should not be edited when we are setting up the dialogue according to the content of AesFunction, when coming back from LayerOptions. - sdgLayerOptions.SetupLayer(clsTempGgPlot:=clsRggPlotFunction, clsTempGeomFunc:=clsRDotplotGeomFunction, clsTempAesFunc:=clsRaesFunction, bFixAes:=True, bFixGeom:=True, strDataframe:=ucrDotPlotSelector.ucrAvailableDataFrames.cboAvailableDataFrames.Text, bApplyAesGlobally:=True, bIgnoreGlobalAes:=False) + 'sdgLayerOptions.SetupLayer(clsTempGgPlot:=clsRggPlotFunction, clsTempGeomFunc:=clsRDotplotGeomFunction, clsTempAesFunc:=clsRaesFunction, bFixAes:=True, bFixGeom:=True, strDataframe:=ucrDotPlotSelector.ucrAvailableDataFrames.cboAvailableDataFrames.Text, bApplyAesGlobally:=True, bIgnoreGlobalAes:=False) sdgLayerOptions.ShowDialog() iIndex = clsRDotplotGeomFunction.clsParameters.FindIndex(Function(x) x.strArgumentName = "binaxis") If iIndex <> -1 AndAlso clsRDotplotGeomFunction.clsParameters(iIndex).strArgumentValue = Chr(34) & "y" & Chr(34) Then diff --git a/instat/dlgHistogram.vb b/instat/dlgHistogram.vb index 5f342f4c19d..cf2347f7854 100644 --- a/instat/dlgHistogram.vb +++ b/instat/dlgHistogram.vb @@ -147,7 +147,7 @@ Public Class dlgHistogram End Sub Private Sub cmdHistogramOptions_Click(sender As Object, e As EventArgs) Handles cmdHistogramOptions.Click - sdgLayerOptions.SetupLayer(clsTempGgPlot:=clsRggplotFunction, clsTempGeomFunc:=clsRgeomPlotFunction, clsTempAesFunc:=clsRaesFunction, bFixAes:=True, bFixGeom:=True, strDataframe:=ucrHistogramSelector.ucrAvailableDataFrames.cboAvailableDataFrames.Text, bApplyAesGlobally:=True, bIgnoreGlobalAes:=False) + 'sdgLayerOptions.SetupLayer(clsTempGgPlot:=clsRggplotFunction, clsTempGeomFunc:=clsRgeomPlotFunction, clsTempAesFunc:=clsRaesFunction, bFixAes:=True, bFixGeom:=True, strDataframe:=ucrHistogramSelector.ucrAvailableDataFrames.cboAvailableDataFrames.Text, bApplyAesGlobally:=True, bIgnoreGlobalAes:=False) sdgLayerOptions.ShowDialog() For Each clsParam In clsRaesFunction.clsParameters If clsParam.strArgumentName = "x" AndAlso (clsParam.strArgumentValue <> "value" OrElse ucrVariablesAsFactorforHist.bSingleVariable) Then diff --git a/instat/dlgLinePlot.vb b/instat/dlgLinePlot.vb index 041d093a3f1..da466e3a766 100644 --- a/instat/dlgLinePlot.vb +++ b/instat/dlgLinePlot.vb @@ -175,7 +175,7 @@ Public Class dlgLinePlot End Sub Private Sub cmdLineOptions_Click(sender As Object, e As EventArgs) Handles cmdLineOptions.Click - sdgLayerOptions.SetupLayer(clsTempGgPlot:=clsRggplotFunction, clsTempGeomFunc:=clsRgeomlineplotFunction, clsTempAesFunc:=clsRaesFunction, bFixAes:=True, bFixGeom:=True, strDataframe:=ucrLinePlotSelector.ucrAvailableDataFrames.cboAvailableDataFrames.Text, bApplyAesGlobally:=True, bIgnoreGlobalAes:=False) + 'sdgLayerOptions.SetupLayer(clsTempGgPlot:=clsRggplotFunction, clsTempGeomFunc:=clsRgeomlineplotFunction, clsTempAesFunc:=clsRaesFunction, bFixAes:=True, bFixGeom:=True, strDataframe:=ucrLinePlotSelector.ucrAvailableDataFrames.cboAvailableDataFrames.Text, bApplyAesGlobally:=True, bIgnoreGlobalAes:=False) sdgLayerOptions.ShowDialog() 'Coming from the sdgLayerOptions, clsRaesFunction and others has been modified. One then needs to display these modifications on the dlgScatteredPlot. diff --git a/instat/dlgRugPlot.vb b/instat/dlgRugPlot.vb index da79c959c4b..b482fb56b37 100644 --- a/instat/dlgRugPlot.vb +++ b/instat/dlgRugPlot.vb @@ -152,7 +152,7 @@ Public Class dlgRugPlot Private Sub cmdRugPlotOptions_Click(sender As Object, e As EventArgs) Handles cmdRugPlotOptions.Click ''''''' i wonder if all this will be needed for the new system - sdgLayerOptions.SetupLayer(clsTempGgPlot:=clsDefaultFunction, clsTempGeomFunc:=clsRgeom_RugPlotFunction, clsTempAesFunc:=clsRaesFunction, bFixAes:=True, bFixGeom:=True, strDataframe:=ucrRugPlotSelector.ucrAvailableDataFrames.cboAvailableDataFrames.Text, bApplyAesGlobally:=True, bIgnoreGlobalAes:=False) + 'sdgLayerOptions.SetupLayer(clsTempGgPlot:=clsDefaultFunction, clsTempGeomFunc:=clsRgeom_RugPlotFunction, clsTempAesFunc:=clsRaesFunction, bFixAes:=True, bFixGeom:=True, strDataframe:=ucrRugPlotSelector.ucrAvailableDataFrames.cboAvailableDataFrames.Text, bApplyAesGlobally:=True, bIgnoreGlobalAes:=False) sdgLayerOptions.ShowDialog() For Each clsParam In clsRaesFunction.clsParameters diff --git a/instat/dlgScatterPlot.vb b/instat/dlgScatterPlot.vb index b764f370377..7b09bd0b1a1 100644 --- a/instat/dlgScatterPlot.vb +++ b/instat/dlgScatterPlot.vb @@ -157,7 +157,7 @@ Public Class dlgScatterPlot Private Sub cmdScatterPlotOptions_Click(sender As Object, e As EventArgs) Handles cmdScatterPlotOptions.Click 'SetupLayer sends the components storing the plot info (clsRaesFunction, clsRggplotFunction, ...) of dlgScatteredPlot through to sdgLayerOptions where these will be edited. - sdgLayerOptions.SetupLayer(clsTempGgPlot:=clsRggplotFunction, clsTempGeomFunc:=clsRScatterGeomFunction, clsTempAesFunc:=clsRaesFunction, bFixAes:=True, bFixGeom:=True, strDataframe:=ucrSelectorForScatter.ucrAvailableDataFrames.cboAvailableDataFrames.Text, bApplyAesGlobally:=True, bIgnoreGlobalAes:=False) + 'sdgLayerOptions.SetupLayer(clsTempGgPlot:=clsRggplotFunction, clsTempGeomFunc:=clsRScatterGeomFunction, clsTempAesFunc:=clsRaesFunction, bFixAes:=True, bFixGeom:=True, strDataframe:=ucrSelectorForScatter.ucrAvailableDataFrames.cboAvailableDataFrames.Text, bApplyAesGlobally:=True, bIgnoreGlobalAes:=False) sdgLayerOptions.ShowDialog() 'Coming from the sdgLayerOptions, clsRaesFunction and others has been modified. One then needs to display these modifications on the dlgScatteredPlot. diff --git a/instat/dlgSummaryBarOrPieChart.vb b/instat/dlgSummaryBarOrPieChart.vb index 9666c7f5739..6099d3519c3 100644 --- a/instat/dlgSummaryBarOrPieChart.vb +++ b/instat/dlgSummaryBarOrPieChart.vb @@ -161,7 +161,7 @@ Public Class dlgSummaryBarOrPieChart End Sub Private Sub cmdBarChartOptions_Click(sender As Object, e As EventArgs) Handles cmdBarChartOptions.Click - sdgLayerOptions.SetupLayer(clsTempGgPlot:=clsRggplotFunction, clsTempGeomFunc:=clsRgeomBarFunction, clsTempAesFunc:=clsRaesFunction, bFixAes:=True, bFixGeom:=True, strDataframe:=ucrSummaryBarSelector.ucrAvailableDataFrames.cboAvailableDataFrames.Text, bApplyAesGlobally:=True, bIgnoreGlobalAes:=False) + 'sdgLayerOptions.SetupLayer(clsTempGgPlot:=clsRggplotFunction, clsTempGeomFunc:=clsRgeomBarFunction, clsTempAesFunc:=clsRaesFunction, bFixAes:=True, bFixGeom:=True, strDataframe:=ucrSummaryBarSelector.ucrAvailableDataFrames.cboAvailableDataFrames.Text, bApplyAesGlobally:=True, bIgnoreGlobalAes:=False) sdgLayerOptions.ShowDialog() For Each clsParam In clsRaesFunction.clsParameters If clsParam.strArgumentName = "x" Then @@ -176,7 +176,7 @@ Public Class dlgSummaryBarOrPieChart End Sub Private Sub cmdPieChartOptions_Click(sender As Object, e As EventArgs) Handles cmdPieChartOptions.Click - sdgLayerOptions.SetupLayer(clsTempGgPlot:=clsRggplotFunction, clsTempGeomFunc:=clsRgeomBarFunction, clsTempAesFunc:=clsRaesFunction, bFixAes:=True, bFixGeom:=True, strDataframe:=ucrSummaryBarSelector.ucrAvailableDataFrames.cboAvailableDataFrames.Text, bApplyAesGlobally:=True) + 'sdgLayerOptions.SetupLayer(clsTempGgPlot:=clsRggplotFunction, clsTempGeomFunc:=clsRgeomBarFunction, clsTempAesFunc:=clsRaesFunction, bFixAes:=True, bFixGeom:=True, strDataframe:=ucrSummaryBarSelector.ucrAvailableDataFrames.cboAvailableDataFrames.Text, bApplyAesGlobally:=True) sdgLayerOptions.ShowDialog() For Each clsParam In clsRaesFunction.clsParameters If clsParam.strArgumentName = "y" Then diff --git a/instat/sdgLayerOptions.vb b/instat/sdgLayerOptions.vb index 37f7bc4faf1..e5fbd231629 100644 --- a/instat/sdgLayerOptions.vb +++ b/instat/sdgLayerOptions.vb @@ -50,7 +50,7 @@ Public Class sdgLayerOptions End Sub Private Sub SetDefaults() - ucrGeomWithAes.ucrGeomWithAesSelector.Reset() + ucrGeomWithAes.Reset() strGlobalDataFrame = "" End Sub @@ -58,98 +58,19 @@ Public Class sdgLayerOptions End Sub - - Public Sub SetupLayer(clsTempGgPlot As RFunction, clsNewGeomFunc As RFunction, clsNewGlobalAesFunc As RFunction, Optional bFixGeom As Boolean = False, Optional strDataframe As String = "", Optional bApplyAesGlobally As Boolean = True, Optional iNumVariablesForGeoms As Integer = -1, Optional clsNewLocalAes As RFunction = Nothing, Optional bReset As Boolean = False) - If clsNewGeomFunc Is Nothing Then - clsNewGeomFunc = New RFunction - End If + Public Sub SetupLayer(clsNewGgPlot As RFunction, clsNewGeomFunc As RFunction, clsNewGlobalAesFunc As RFunction, clsNewLocalAes As RFunction, Optional bFixGeom As Boolean = False, Optional strDataframe As String = "", Optional bApplyAesGlobally As Boolean = True, Optional iNumVariablesForGeoms As Integer = -1, Optional bReset As Boolean = False) clsGeomFunction = clsNewGeomFunc clsAesFunction = clsNewGlobalAesFunc - clsGgplotFunction = clsTempGgPlot - 'ucrGeomWithAes.Setup(clsTempGeomFunc, clsTempAesFunc, bFixGeom, strDataframe, bApplyAesGlobally, bIgnoreGlobalAes, iNumVariablesForGeoms, clsTempLocalAes) - 'ucrLayerParameter.Setup(clsTempGeomFunc, clsTempAesFunc, bFixAes, bFixGeom, strDataframe, bApplyAesGlobally, bIgnoreGlobalAes, iNumVariablesForGeoms, clsTempLocalAes) 'Don't really need to give all parameters through as this function just calls the mother Setup from ucrGeom who doesn't use some of them which are optional, such as clsTempLocalAes... + clsGgplotFunction = clsNewGgPlot + ucrGeomWithAes.Setup(clsNewGgPlot, clsNewGeomFunc, clsNewGlobalAesFunc, clsNewLocalAes, bFixGeom, strDataframe, bApplyAesGlobally, iNumVariablesForGeoms, bReset) + ucrLayerParameter.Setup(clsNewGgPlot, clsNewGeomFunc, clsNewGlobalAesFunc, clsNewLocalAes, bFixGeom, strDataframe, bApplyAesGlobally, iNumVariablesForGeoms, bReset) End Sub Public Function TestForOKEnabled() As Boolean Return ucrGeomWithAes.TestForOkEnabled() End Function - Private Sub PartiallyMandatoryAesFillingMethod(clsRelevantAesFunction As RFunction) - 'This sub is called to add "" mapping for axis x or y when no variables are mapped to them (only relavant for a few geoms). The mapping is added in the global or local aes depending on whether apply on all layers is checked or not (choice of clsRelevantAesFunction). - Dim bTempIgnoreGlobalAes As Boolean - bTempIgnoreGlobalAes = ((clsGeomFunction.clsParameters.FindIndex(Function(x) x.strArgumentName = "inherit.aes") <> -1) AndAlso (clsGeomFunction.GetParameter("inherit.aes").strArgumentValue = "FALSE")) - If clsGeomFunction.strRCommand = "geom_boxplot" OrElse clsGeomFunction.strRCommand = "geom_dotplot" Then - If (clsAesFunction.clsParameters.FindIndex(Function(x) x.strArgumentName = "x") = -1 OrElse bTempIgnoreGlobalAes) AndAlso ucrGeomWithAes.clsLocalAesFunction.clsParameters.FindIndex(Function(x) x.strArgumentName = "x") = -1 Then - clsRelevantAesFunction.AddParameter("x", Chr(34) & Chr(34)) - End If - ElseIf clsGeomFunction.strRCommand = "geom_point" OrElse clsGeomFunction.strRCommand = "geom_line" Then - If (clsAesFunction.clsParameters.FindIndex(Function(x) x.strArgumentName = "x") = -1 OrElse bTempIgnoreGlobalAes) AndAlso ucrGeomWithAes.clsLocalAesFunction.clsParameters.FindIndex(Function(x) x.strArgumentName = "x") = -1 Then - clsRelevantAesFunction.AddParameter("x", Chr(34) & Chr(34)) - End If - If (clsAesFunction.clsParameters.FindIndex(Function(x) x.strArgumentName = "y") = -1 OrElse bTempIgnoreGlobalAes) AndAlso ucrGeomWithAes.clsLocalAesFunction.clsParameters.FindIndex(Function(x) x.strArgumentName = "y") = -1 Then - clsRelevantAesFunction.AddParameter("y", Chr(34) & Chr(34)) - End If - End If - End Sub - Private Sub ucrSdgLayerBase_ClickReturn(sender As Object, e As EventArgs) Handles ucrSdgLayerBase.ClickReturn - Dim clsRelevantAesFunction As New RFunction 'Will be used in the partially mandatory aes filling method below. - - 'Two situations: apply on all layers checked or not. Would edit the global or local aes accordingly. - If ucrGeomWithAes.chkApplyOnAllLayers.Checked Then - 'First, in case the chkApplyOnAllLayers is checked, what is by default understood as local mapping (clsGeomAesFunction) needs to become global mapping: the Aes parameters in clsGeomAesFunction are sent through to clsAesFunction. - For Each clsParam In ucrGeomWithAes.clsLocalAesFunction.clsParameters - clsAesFunction.AddParameter(clsParam) 'Warning: This never removes the parameters that have been previously inserted... - Next - 'Now, we don't want the parameters "mapping" and "data" in the Layer as these will be fixed globally and then inherited. - clsGeomFunction.RemoveParameterByName("mapping") - clsGeomFunction.RemoveParameterByName("data") - 'Here the global ggplot function takes the relevant "mapping" and "data" parameters as required by "ApplyOnAllLayers". - clsGgplotFunction.AddParameter("mapping", clsRFunctionParameter:=clsAesFunction) - clsGgplotFunction.AddParameter("data", clsRFunctionParameter:=ucrGeomWithAes.ucrGeomWithAesSelector.ucrAvailableDataFrames.clsCurrDataFrame.Clone()) - 'The data frame that is selected in the dataframe selector (lives in ucrGeomWithAes) is communicated to the sdgLayerOptions and the ucrGeomWithAes - 'Question to be discussed: could these two strGlobalDataFrame and ucrGeomWithAes.strGlobalDataFrame not be linked together in sdgLayerOptions.initialisedialog() ? - 'Question: why do we even do this ? Should it not have been done earlier ? What's the point of changing parameters on sdgLayerOptions right before closing it ? - strGlobalDataFrame = ucrGeomWithAes.ucrGeomWithAesSelector.ucrAvailableDataFrames.cboAvailableDataFrames.Text - ucrGeomWithAes.strGlobalDataFrame = strGlobalDataFrame - Else 'Warning: in case the sdgLayerOptions has been called by specific dlg, need to refill the aes on that dlg. Imagine the ApplyOnAllLayers has been unticked ? Problem... Also in order to solve this, would need to know on the specific dialog if it has been unticked or not in order to know how to fill in the aes receivers ! The linking will be restudied anyway. There are many ways to go, see discussion on github. - If ucrGeomWithAes.clsLocalAesFunction.iParameterCount > 0 Then - clsGeomFunction.AddParameter("mapping", clsRFunctionParameter:=ucrGeomWithAes.clsLocalAesFunction.Clone()) - Else - clsGeomFunction.RemoveParameterByName("mapping") - End If - If ucrGeomWithAes.ucrGeomWithAesSelector.ucrAvailableDataFrames.cboAvailableDataFrames.Text <> strGlobalDataFrame Then - clsGeomFunction.AddParameter("data", clsRFunctionParameter:=ucrGeomWithAes.ucrGeomWithAesSelector.ucrAvailableDataFrames.clsCurrDataFrame.Clone()) - Else - clsGeomFunction.RemoveParameterByName("data") - End If - End If - - 'Partially mandatory aes filling method - If ucrGeomWithAes.chkApplyOnAllLayers.Checked Then - PartiallyMandatoryAesFillingMethod(clsAesFunction) - - 'Warning: in some cases, this is sources of errors in R: is a continuous variable is mapped to y (for instance plot1 <- ggplot(diamonds,aes(y=price,x="") + geom_boxplot()), and in some layer where global aes are ignored, "" is mapped to y (e.g. plot1 + geom_point(inherit.aes = FALSE, mapping = aes(x="",y="")) ), then an error occurs as a discrete vriable cannot be mapped to a continuous scale. - 'Warning: again coming from specific plots, If ApplyOnAllLayers is unticked, the linking will make this mehtod fail. - ElseIf clsGeomFunction.clsParameters.FindIndex(Function(x) x.strArgumentName = "mapping") <> -1 Then - PartiallyMandatoryAesFillingMethod(clsGeomFunction.clsParameters.Find(Function(x) x.strArgumentName = "mapping").clsArgumentCodeStructure) - Else - clsRelevantAesFunction.SetRCommand("aes") - PartiallyMandatoryAesFillingMethod(clsRelevantAesFunction) - If clsRelevantAesFunction.iParameterCount > 0 Then - clsGeomFunction.AddParameter("mapping", clsRFunctionParameter:=clsRelevantAesFunction.Clone()) - End If - End If - - 'Adding stat = identity method - If clsGeomFunction.strRCommand = "geom_bar" OrElse clsGeomFunction.strRCommand = "geom_density" OrElse clsGeomFunction.strRCommand = "geom_freqpoly" Then - '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 (((clsAesFunction.clsParameters.FindIndex(Function(x) x.strArgumentName = "y") <> -1) AndAlso ((clsGeomFunction.clsParameters.FindIndex(Function(x) x.strArgumentName = "inherit.aes") = -1) OrElse (clsGeomFunction.GetParameter("inherit.aes").strArgumentValue = "TRUE"))) OrElse (ucrGeomWithAes.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)) - 'Task: send a message to the user saying that stat = identity has been added as a parameter in order to avoid error. Can be modified on the LayerParameter tab. - 'In case the "y" mapping has been removed after editing the layer, the added "stat" parameter should probably be removed so it is important for the user to know it has been added in automatically, in case he wants to go to the layer parameters tab and remove it. - End If - End If - + ucrGeomWithAes.UpdateGlobalAndLocalAesFromInter() End Sub End Class \ No newline at end of file diff --git a/instat/ucrAdditionalLayers.vb b/instat/ucrAdditionalLayers.vb index 38bef486c24..d98d15bdc62 100644 --- a/instat/ucrAdditionalLayers.vb +++ b/instat/ucrAdditionalLayers.vb @@ -29,6 +29,7 @@ Public Class ucrAdditionalLayers 'Deciding if the first layer needs to be used for global aesthetics. 'Question to be discussed: What is this variable about again ? it is linked with sdgPlots.bAdditionalLayersSetGlobal in sdgPLots.bLayersDefaultIsGolobal. Public Event NumberOfLayersChanged() 'This event is raised when the number of Layers in the lstLayers on ucrAdditionalLayers has been changed, then handled by testOkEnabled On GeneralForGraphics. + Public Sub New() ' This call is required by the designer. @@ -58,6 +59,7 @@ Public Class ucrAdditionalLayers bFirstLoad = False End If End Sub + Private Sub SetDefaults() iLayerIndex = 0 lstLayers.Clear() @@ -72,11 +74,20 @@ Public Class ucrAdditionalLayers End Sub Private Sub cmdAdd_Click(sender As Object, e As EventArgs) Handles cmdAdd.Click - sdgLayerOptions.SetupLayer(clsTempGgPlot:=clsRggplotFunction, clsTempGeomFunc:=Nothing, clsTempAesFunc:=clsGgplotAesFunction, bFixAes:=False, bFixGeom:=False, strDataframe:=strGlobalDataFrame, bApplyAesGlobally:=(bSetGlobalIsDefault AndAlso lstLayers.Items.Count = 0), bIgnoreGlobalAes:=False) + Dim clsNewLocalAesFunction As New RFunction + Dim clsNewGeomFunction As New RFunction + + 'TODO add these in Ggplot default class + clsNewLocalAesFunction.SetPackageName("ggplot2") + clsNewLocalAesFunction.SetRCommand("aes") + clsNewGeomFunction.SetPackageName("ggplot2") + clsNewGeomFunction.SetRCommand("geom_boxplot") + + sdgLayerOptions.SetupLayer(clsNewGgPlot:=clsRggplotFunction, clsNewGeomFunc:=clsNewGeomFunction, clsNewGlobalAesFunc:=clsGgplotAesFunction, clsNewLocalAes:=clsNewLocalAesFunction, bFixGeom:=False, strDataframe:=strGlobalDataFrame, bApplyAesGlobally:=(bSetGlobalIsDefault AndAlso lstLayers.Items.Count = 0)) ParentForm.SendToBack() sdgLayerOptions.ShowDialog() strGlobalDataFrame = sdgLayerOptions.strGlobalDataFrame - AddLayers() + AddLayers(clsNewGeomFunction.strRCommand) End Sub Private Sub SetEditDeleteEnabled() @@ -88,16 +99,18 @@ Public Class ucrAdditionalLayers cmdEdit.Enabled = False End If End Sub + Private Sub lstLayers_SelectedIndexChanged(sender As Object, e As EventArgs) Handles lstLayers.SelectedIndexChanged SetEditDeleteEnabled() End Sub - Public Sub AddLayers(Optional lviCurrentItem As ListViewItem = Nothing) + + Public Sub AddLayers(strGeomName As String, Optional lviCurrentItem As ListViewItem = Nothing) Dim lviLayer As ListViewItem Dim strLayerName As String If lviCurrentItem Is Nothing Then iLayerIndex = iLayerIndex + 1 - strLayerName = iLayerIndex & "." & sdgLayerOptions.ucrGeomWithAes.cboGeomList.SelectedItem + strLayerName = iLayerIndex & "." & strGeomName lviLayer = New ListViewItem(text:=strLayerName) lstLayers.Items.Add(lviLayer) lstLayerComplete.Add(sdgLayerOptions.TestForOKEnabled()) @@ -132,36 +145,29 @@ Public Class ucrAdditionalLayers End Sub Private Sub cmdEdit_Click(sender As Object, e As EventArgs) Handles cmdEdit.Click - Dim clsSelectedGeom As RFunction + Dim clsSelectedGeomFunction As RFunction Dim clsLocalAes As RFunction - Dim bIgnoreGlobalAes As Boolean - 'bIgnoreGlobalAes is used in Setup(Layer) to determine whether the chkIgnoreGlobalAes should be ticked in the sdgLayerOptions. It's value is determined below. The following RParameter will be used in this procedure. 'The selected geom is found as the RFunction of the appropriate RParameter of RSyntax. The name of that Parameter is the name of the selected item in the lstLayers. That one is fetched using .SelectedItems(0) as there can only be one selected item at a time when the edit button is clicked. - clsSelectedGeom = clsRSyntax.GetParameter(lstLayers.SelectedItems(0).Text).clsArgumentCodeStructure - If clsSelectedGeom.GetParameter("mapping") IsNot Nothing Then - clsLocalAes = clsSelectedGeom.GetParameter("mapping").clsArgumentCodeStructure + clsSelectedGeomFunction = clsRSyntax.GetParameter(lstLayers.SelectedItems(0).Text).clsArgumentCodeStructure + If clsSelectedGeomFunction.ContainsParameter("mapping") Then + clsLocalAes = clsSelectedGeomFunction.GetParameter("mapping").clsArgumentCodeStructure Else - clsLocalAes = Nothing - End If - - 'Before we set-up the Layer in sdgLayerOptions, we determine the value of bIgnoreGlobalAes. We can detect if chkIgnoreGlobalAes was ticked last time the Layer was editted by looking at the "inherit.aes" parameter of the layer parameters. - If (clsSelectedGeom.GetParameter("inherit.aes") IsNot Nothing) AndAlso (clsSelectedGeom.GetParameter("inherit.aes").strArgumentValue = "FALSE") Then - bIgnoreGlobalAes = True - Else - bIgnoreGlobalAes = False + 'TODO should come from ggplot defaults class + clsLocalAes = New RFunction + clsLocalAes.SetPackageName("ggplot2") + clsLocalAes.SetRCommand("aes") End If 'Warning: sdgLayerOptions should not be setup using dlgGeneralForGraphics' fields !! These fields should be given through to the ucrAdditionalLayers (which should have all these) - sdgLayerOptions.SetupLayer(clsTempGgPlot:=clsRggplotFunction, clsTempGeomFunc:=clsSelectedGeom, clsTempAesFunc:=clsGgplotAesFunction, bFixAes:=False, bFixGeom:=True, strDataframe:=strGlobalDataFrame, bApplyAesGlobally:=False, bIgnoreGlobalAes:=bIgnoreGlobalAes, clsTempLocalAes:=clsLocalAes) - 'It has been chosen to fix the value of bApplyAesGlobally to False as when a Layer is editted, the choice to apply the Aes globally should be reconsidered no matter what it has been during last edit. + sdgLayerOptions.SetupLayer(clsNewGgPlot:=clsRggplotFunction, clsNewGeomFunc:=clsSelectedGeomFunction, clsNewGlobalAesFunc:=clsGgplotAesFunction, clsNewLocalAes:=clsLocalAes, bFixGeom:=True, strDataframe:=strGlobalDataFrame, bApplyAesGlobally:=False, bReset:=False) + 'It has been chosen to fix the value of bApplyAesGlobally to False as when a Layer is editted, the choice to apply the Aes globally should be reconsidered no matter what it has been during last edit. ParentForm.SendToBack() 'Otherwise sdgLayerOptions appears behind sdgPLotOptions sdgLayerOptions.ShowDialog() - AddLayers(lstLayers.SelectedItems(0)) + AddLayers(clsSelectedGeomFunction.strRCommand, lstLayers.SelectedItems(0)) End Sub Public Sub Reset() SetDefaults() End Sub - End Class diff --git a/instat/ucrColors.vb b/instat/ucrColors.vb index 6a3016acbc8..52f40cf7b0a 100644 --- a/instat/ucrColors.vb +++ b/instat/ucrColors.vb @@ -22,6 +22,7 @@ Public Class ucrColors Private Sub ucrColors_Load(sender As Object, e As EventArgs) Handles Me.Load SetItems(strColours) + bAllowNonConditionValues = True End Sub Private Sub ucrColors_NameChanged() Handles Me.NameChanged diff --git a/instat/ucrCore.vb b/instat/ucrCore.vb index 3f09251de17..865b7261c8a 100644 --- a/instat/ucrCore.vb +++ b/instat/ucrCore.vb @@ -345,7 +345,11 @@ Public Class ucrCore End Function Public Overridable Function GetParameter(Optional iIndex As Integer = 0) As RParameter - Return lstAllRParameters(iIndex) + If iIndex < lstAllRParameters.Count Then + Return lstAllRParameters(iIndex) + Else + Return Nothing + End If End Function Public Overridable Function GetRCode() As RCodeStructure @@ -480,10 +484,14 @@ Public Class ucrCore clsParameter.SetArgumentName(strNewName) End If If bClearConditions Then - dctConditions.Clear() + ClearConditions() End If End Sub + Public Sub ClearConditions() + dctConditions.Clear() + End Sub + Public Sub SetParameterValue(strNewValue As String) If clsParameter IsNot Nothing Then clsParameter.SetArgumentValue(strNewValue) @@ -559,6 +567,9 @@ Public Class ucrCore Public Overridable Sub ClearCodeAndParameters() lstAllRCodes = New List(Of RCodeStructure) lstAllRParameters = New List(Of RParameter) + 'Ensures there is always something at index 0 + lstAllRCodes.Add(Nothing) + lstAllRParameters.Add(Nothing) UpdateControl() End Sub diff --git a/instat/ucrGeom.vb b/instat/ucrGeom.vb index 991f80646f1..ef5bee733ef 100644 --- a/instat/ucrGeom.vb +++ b/instat/ucrGeom.vb @@ -28,6 +28,7 @@ Public Class ucrGeom 'Similarly for lstFunctionParameters. Both, together with clsGgplotAesFunction are supposedly passed through to ucrAdditionalLayers and assigned to smth in ucrAdditionalLayers by calling sdgLayerOption.SetupLayer which calls setup ? Still need to figure out when/how they are used though... Public clsGlobalAesFunction As New RFunction Public clsLocalAesFunction As RFunction + Public clsGgplotFunction As New RFunction Private bFirstLoad As Boolean = True Public strGlobalDataFrame As String = "" @@ -75,7 +76,7 @@ Public Class ucrGeom clsGeomFunction.AddParameter("mapping", clsRFunctionParameter:=clsGlobalAesFunction) End Sub - Public Overridable Sub Setup(clsNewGeomFunc As RFunction, clsNewGlobalAesFunc As RFunction, Optional bFixGeom As Boolean = False, Optional strDataframe As String = "", Optional bApplyAesGlobally As Boolean = True, Optional iNumVariablesForGeoms As Integer = -1, Optional clsNewLocalAes As RFunction = Nothing, Optional bReset As Boolean = False) + Public Overridable Sub Setup(clsNewGgplotFunction As RFunction, clsNewGeomFunc As RFunction, clsNewGlobalAesFunc As RFunction, clsNewLocalAes As RFunction, Optional bFixGeom As Boolean = False, Optional strDataframe As String = "", Optional bApplyAesGlobally As Boolean = True, Optional iNumVariablesForGeoms As Integer = -1, Optional bReset As Boolean = False) 'Setup is used to setup the parameters of ucrGeom as well as ucrGeomListWithAes and ucrLayerParameters as they override Setup from ucrGeom. The Setup function is also used within sdgLayerOptions.SetupLayer which plays the same role for the whole sdlLayerOption. 'These functions are called all together in the ucrAddLayers when a Layer is added or editted, as well as in specific plots dialogs such as dlgBoxPlot when the plot options sdgPlots (dealing with layers) is opened. Dim GeomCount As New Geoms @@ -94,6 +95,7 @@ Public Class ucrGeom ucrInputGeoms.Enabled = Not bFixGeom clsGlobalAesFunction = clsNewGlobalAesFunc clsLocalAesFunction = clsNewLocalAes + clsGgplotFunction = clsNewGgplotFunction End Sub Public Overridable Sub SetGeomFunction(clsTempGeomFunc As RFunction, Optional bReset As Boolean = False) diff --git a/instat/ucrLayerParameters.vb b/instat/ucrLayerParameters.vb index e0298209ab6..09b8d91641a 100644 --- a/instat/ucrLayerParameters.vb +++ b/instat/ucrLayerParameters.vb @@ -40,8 +40,8 @@ Public Class ucrLayerParameters Private Sub InitialiseControl() End Sub - Public Overrides Sub Setup(clsNewGeomFunc As RFunction, clsNewGlobalAesFunc As RFunction, Optional bFixGeom As Boolean = False, Optional strDataframe As String = "", Optional bApplyAesGlobally As Boolean = True, Optional iNumVariablesForGeoms As Integer = -1, Optional clsNewLocalAes As RFunction = Nothing, Optional bReset As Boolean = False) - MyBase.Setup(clsNewGeomFunc, clsNewGlobalAesFunc, bFixGeom, strDataframe, bApplyAesGlobally, iNumVariablesForGeoms, clsNewLocalAes, bReset) + Public Overrides Sub Setup(clsNewGgplotFunction As RFunction, clsNewGeomFunc As RFunction, clsNewGlobalAesFunc As RFunction, clsNewLocalAes As RFunction, Optional bFixGeom As Boolean = False, Optional strDataframe As String = "", Optional bApplyAesGlobally As Boolean = True, Optional iNumVariablesForGeoms As Integer = -1, Optional bReset As Boolean = False) + MyBase.Setup(clsNewGgplotFunction, clsNewGeomFunc, clsNewGlobalAesFunc, clsNewLocalAes, bFixGeom, strDataframe, bApplyAesGlobally, iNumVariablesForGeoms, bReset) SetLayerParameters(bReset) End Sub diff --git a/instat/ucrReceiver.vb b/instat/ucrReceiver.vb index 9315232f6de..762fa42013c 100644 --- a/instat/ucrReceiver.vb +++ b/instat/ucrReceiver.vb @@ -421,4 +421,8 @@ Public Class ucrReceiver Protected Overrides Sub ResetControlValue() Clear() End Sub + + Public Overridable Sub SetTextColour(clrNew As Color) + + End Sub End Class \ No newline at end of file diff --git a/instat/ucrReceiverMetadataProperty.vb b/instat/ucrReceiverMetadataProperty.vb index 556eedfe33a..4fff9ce3152 100644 --- a/instat/ucrReceiverMetadataProperty.vb +++ b/instat/ucrReceiverMetadataProperty.vb @@ -21,6 +21,11 @@ Public Class ucrReceiverMetadataProperty Public ctrActive As ucrCore Public Sub SetControls(clsNewRCode As RCodeStructure, Optional clsNewLayerParam As LayerParameter = Nothing, Optional bReset As Boolean = False) + Dim dctBooleanItems As New Dictionary(Of String, String) + + dctBooleanItems.Add("TRUE", "TRUE") + dctBooleanItems.Add("FALSE", "FALSE") + clsLayerParam = clsNewLayerParam 'This sub adapts the ucrReceiverMetadataProperty to the type of layer parameter, it's default value, the available values etc, stored within clsLayerParam. ClearCodeAndParameters() @@ -45,15 +50,14 @@ Public Class ucrReceiverMetadataProperty ctrActive = ucrNudParamValue ElseIf clsLayerParam.strLayerParameterDataType = "boolean" Then ctrActive = ucrInputCboParamValue - ucrInputCboParamValue.SetItems({"TRUE", "FALSE"}) ElseIf clsLayerParam.strLayerParameterDataType = "colour" Then ctrActive = ucrColor ElseIf clsLayerParam.strLayerParameterDataType = "list" Then ctrActive = ucrInputCboParamValue If clsLayerParam.lstParameterStrings IsNot Nothing AndAlso clsLayerParam.lstParameterStrings.Count > 0 Then - ucrInputCboParamValue.SetItems(clsLayerParam.lstParameterStrings) + ucrInputCboParamValue.SetItems(dctBooleanItems) Else - ucrInputCboParamValue.cboInput.Items.Clear() + ucrInputCboParamValue.SetItems() End If ElseIf clsLayerParam.strLayerParameterDataType = "text" Then ctrActive = ucrInputTextValue @@ -61,7 +65,14 @@ Public Class ucrReceiverMetadataProperty ctrActive = New ucrCore 'this should never actually be used but is here to ensure the code is stable even if a developer uses an incorrect datatype End If ctrActive.Visible = True + 'Needed to remove conditions from previous use of control + ctrActive.ClearConditions() + ctrActive.bUpdateRCodeFromControl = True ctrActive.SetParameter(New RParameter(clsLayerParam.strLayerParameterName)) + 'Must be done after parameter set because it affects the conditions + If ctrActive.Equals(ucrInputCboParamValue) Then + ucrInputCboParamValue.SetItems(dctBooleanItems) + End If ctrActive.SetRCode(clsNewRCode, bReset) End If End Sub diff --git a/instat/ucrReceiverSingle.vb b/instat/ucrReceiverSingle.vb index 2a5c8e97193..be28a64e630 100644 --- a/instat/ucrReceiverSingle.vb +++ b/instat/ucrReceiverSingle.vb @@ -281,4 +281,8 @@ Public Class ucrReceiverSingle bFirstLoad = False End If End Sub + + Public Overrides Sub SetTextColour(clrNew As Color) + txtReceiverSingle.ForeColor = clrNew + End Sub End Class \ No newline at end of file From d85e77e1e34e07311ff15566e8e196a3e8172f3c Mon Sep 17 00:00:00 2001 From: Danny Parsons Date: Wed, 7 Jun 2017 17:32:35 +0100 Subject: [PATCH 116/154] initial working of general graphics dialog --- instat/UcrGeomListWithAes.vb | 108 +++++--------------------- instat/dlgGeneralForGraphics.vb | 1 - instat/ucrGeom.vb | 4 +- instat/ucrInputComboBox.vb | 22 ++++-- instat/ucrLayerParamsControls.vb | 2 +- instat/ucrReceiverMetadataProperty.vb | 28 ++++--- 6 files changed, 56 insertions(+), 109 deletions(-) diff --git a/instat/UcrGeomListWithAes.vb b/instat/UcrGeomListWithAes.vb index 65e015df226..3a3623f24d1 100644 --- a/instat/UcrGeomListWithAes.vb +++ b/instat/UcrGeomListWithAes.vb @@ -61,6 +61,10 @@ Public Class UcrGeomListWithParameters clsInterAesFunction.SetPackageName("ggplot2") clsInterAesFunction.SetRCommand("aes") + + ucrChkApplyOnAllLayers.SetText("Apply on All Layers") + + ucrChkIgnoreGlobalAes.SetText("Ignore Global Aesthetics") ucrChkIgnoreGlobalAes.SetParameter(New RParameter("inherit.aes"), bNewChangeParameterValue:=True, strNewValueIfChecked:="FALSE", strNewValueIfUnchecked:="TRUE") ucrChkIgnoreGlobalAes.SetRDefault("TRUE") bControlsInitialised = True @@ -123,14 +127,15 @@ Public Class UcrGeomListWithParameters End Sub Private Sub SetInterAes(Optional bReset As Boolean = False) - Dim iFirstEmptyAes As Integer = 0 + Dim iFirstEmptyAes As Integer = -1 Dim bAesFound As Boolean = False + Dim bFirstEmptyFound As Boolean = False Dim strCurrGeomAesParamName As String 'Clear code so receivers don't update until intermediate function is set For i = 0 To clsCurrGeom.clsAesParameters.Count - 1 + bAesFound = False strCurrGeomAesParamName = clsCurrGeom.clsAesParameters(i).strAesParameterName - 'Task: print global aesthetics in blue within the receivers and perhaps global aesthetics inherited from another dataframe in red ? 'When IgnoreGlobalAes is not checked, we want the applicable global aesthetics to appear in the intermediate function. If Not ucrChkIgnoreGlobalAes.Checked Then 'For some geoms e.g. geom_line, when an aes is not filled in (usually x or y), ggplot syntax requires the aes to be set to "" e.g. x = "". @@ -138,7 +143,7 @@ Public Class UcrGeomListWithParameters If clsGlobalAesFunction.ContainsParameter(strCurrGeomAesParamName) AndAlso Not clsGlobalAesFunction.GetParameter(strCurrGeomAesParamName).strArgumentValue = Chr(34) & Chr(34) Then bAesFound = True clsInterAesFunction.AddParameter(clsGlobalAesFunction.GetParameter(strCurrGeomAesParamName).Clone()) - lstAesParameterReceivers(i).SetTextColour(Color.Blue) + lstAesParameterReceivers(i).SetTextColour(Color.DarkBlue) End If 'For Each clsParam In clsGlobalAesFunction.clsParameters ' If clsParam.strArgumentName = lstCurrArguments(i) Then @@ -164,10 +169,13 @@ Public Class UcrGeomListWithParameters ' End If ' End If 'Next - If Not bAesFound Then + If Not bFirstEmptyFound AndAlso Not bAesFound Then iFirstEmptyAes = i + bFirstEmptyFound = True + End If + If iFirstEmptyAes <> -1 Then + lstAesParameterReceivers(iFirstEmptyAes).SetMeAsReceiver() End If - bAesFound = False Next SetRCodeForReceivers(clsInterAesFunction, clsCurrGeom.clsAesParameters.Count, bReset) End Sub @@ -181,48 +189,6 @@ Public Class UcrGeomListWithParameters ' Return bValue 'End Function - Private Sub SetAes() - ''This function fills in the aesthetic receivers with the appropriate values, starting with the values coming from the global aes (if IgnoreGlobalAes is not chacked) and then in the local aes. - 'Dim bFirstEnabled As Boolean = True - 'Dim iFirstEnabled As Integer = 0 - 'bAddToLocalAes = False - ''We are changing the content of the receivers according to the info in the clsGgplotAesFunction and clsGeomAesFunction. We don't want to change the content of clsGeomAesFunction according to the changed content of the receivers. Hence we set bApplyToLocalAes to False at the beginning of this procedure, then reset it to True at the end (see ucrReceiverParam_WithMeSelectionChanged). - 'For i = 0 To clsCurrGeom.clsAesParameters.Count - 1 - ' 'Clear the potentially up to date content of the Aesthetics receivers. If the content of lstAesParameterUcr(i) is still relevant, then one of the parameters's name in clsGgplotAesFunction will match lstCurrArguments(i) and the value recovered accordingly. - ' 'Warning/Question: when geom is changed, local aes of previous geom are not kept. Is that fine ? Could change the method for layer to remember the previous selection for common aes between the two geoms. - ' 'Warning: the order in which the two following are called counts as clearing only operates when ucr is enabled. Not that this sub will always enable all ucr's that were previously disabled. - ' lstAesParameterReceivers(i).Clear() - ' 'When IgnoreGlobalAes is checked, we don't want the global aesthetics to appear in the receivers. - ' 'Task: print global aesthetics in blue within the receivers and perhaps global aesthetics inherited from another dataframe in red ? - ' If Not chkIgnoreGlobalAes.Checked Then - ' For Each clsParam In clsGlobalAesFunction.clsParameters - ' If clsParam.strArgumentName = lstCurrArguments(i) Then - ' 'For some geoms like LinePlot, when the x or y aes is not filled, ggplot R syntax requires to set x="". This x="" might be copied into the global aes if the ApplyOnAllLayers is set to true for a BoxPlot Layer. This might be copied from the GgplotAesFunction parameters into the aes receivers by error in subsequent layers. - ' If Not ((clsParam.strArgumentName = "x" OrElse clsParam.strArgumentName = "y") AndAlso clsParam.strArgumentValue = Chr(34) & Chr(34)) Then - ' lstAesParameterReceivers(i).Add(clsParam.strArgumentValue) - ' Exit For - ' End If - ' End If - ' Next - ' End If - ' For Each clsParam In clsLocalAesFunction.clsParameters - ' If clsParam.strArgumentName = lstCurrArguments(i) Then - ' If Not ((clsParam.strArgumentName = "x" OrElse clsParam.strArgumentName = "y") AndAlso clsParam.strArgumentValue = Chr(34) & Chr(34)) Then 'As before, check that x is not mapped to "" before putting in receivers. - ' lstAesParameterReceivers(i).Add(clsParam.strArgumentValue) - ' lstAesParameterReceivers(i).Enabled = True - ' Exit For - ' End If - ' End If - ' Next - ' If bFirstEnabled AndAlso lstAesParameterReceivers(i).Enabled Then - ' iFirstEnabled = i - ' bFirstEnabled = False - ' End If - 'Next - 'lstAesParameterReceivers(iFirstEnabled).SetMeAsReceiver() - 'bAddToLocalAes = True - End Sub - Public Sub SetParameters() 'this will set function or aes parameters Dim iMaxIndex As Integer Dim i As Integer @@ -283,20 +249,7 @@ Public Class UcrGeomListWithParameters ucrLayersControl.SetGeomName(GetGeomName()) End If SetParameters() - End Sub - - Private Sub ucrReceiverParam_WithMeSelectionChanged(ucrChangedReceiver As ucrReceiverSingle) Handles ucrReceiverParam1.WithMeSelectionChanged, ucrReceiverParam2.WithMeSelectionChanged, ucrReceiverParam3.WithMeSelectionChanged, ucrReceiverParam4.WithMeSelectionChanged, ucrReceiverParam5.WithMeSelectionChanged, ucrReceiverParam6.WithMeSelectionChanged, ucrReceiverParam7.WithMeSelectionChanged, ucrReceiverParam8.WithMeSelectionChanged, ucrReceiverParam9.WithMeSelectionChanged, ucrReceiverParam10.WithMeSelectionChanged, ucrReceiverParam11.WithMeSelectionChanged, ucrReceiverParam12.WithMeSelectionChanged, ucrReceiverParam13.WithMeSelectionChanged - 'Dim iIndex As Integer - ''bApplyToLocalAes is used to avoid changing the content of clsGeomAesFunction when the receivers are setup according to the content of clsGeomAesFunction and clsGgplotAesFunction in SetAes(). - 'If bAddToLocalAes Then - ' iIndex = lstAesParameterReceivers.IndexOf(ucrChangedReceiver) - ' If Not ucrChangedReceiver.IsEmpty Then - ' clsLocalAesFunction.AddParameter(lstCurrArguments(iIndex), ucrChangedReceiver.GetVariableNames(False)) - ' ElseIf iIndex < lstCurrArguments.Count Then 'Warning/Task: got an error here. The iIndex was longer than lstCurrArguments when clicking on edit layer. Don't really understand how this is possible. Just added the reality check but might need to put more thoughts into this... - ' clsLocalAesFunction.RemoveParameterByName(lstCurrArguments(iIndex)) - ' Else MsgBox("Developer Error: the iIndex (going through lstAesParameterUcr) in ucrReceiverParam_WithMeSelectionChanged is greater than lstAesParameterUcr.count. We beleive that this occurs when editting a layer with fewer aes parameters than there are filled aesthetics parameters in the GlobalAesthetics.", MsgBoxStyle.OkOnly) - ' End If - 'End If + SetInterAes() End Sub Public Function TestForOkEnabled() As Boolean @@ -319,20 +272,6 @@ Public Class UcrGeomListWithParameters ' End If End Function - Private Sub chkChangeAes_CheckedChanged(sender As Object, e As EventArgs) - - End Sub - - 'Private Sub chkIgnoreGlobalAes_CheckedChanged(sender As Object, e As EventArgs) - ' If chkIgnoreGlobalAes.Checked Then - ' clsGeomFunction.AddParameter("inherit.aes", "FALSE") - ' Else - ' clsGeomFunction.RemoveParameterByName("inherit.aes") - ' End If - ' 'When IgnoreGlobalAes is checked, we don't want the global aesthetics to appear in the receivers anymore. - ' SetAes() - 'End Sub - Private Sub ucrGeomWithAesSelector_DataFrameChanged() Handles ucrGeomWithAesSelector.DataFrameChanged 'Warning: When the dataframes in local layers don't correspond to the data in the global ggplot function, inherit.aes should be set to false unless variables have the same name in different dataframes... 'Warning: in ggplot, one can work with data1 in the global ggplot function and data2 in some layer. If the parameter inherit.aes is not set to false, the mapping in ggplot function will be copied into the layer with different dataframe. Unless the variables used in data1 are also variables in data2, this will give an error and crash the software... @@ -392,9 +331,10 @@ Public Class UcrGeomListWithParameters 'Here the global ggplot function takes the relevant "mapping" and "data" parameters as required by "ApplyOnAllLayers". 'This should not need to be done?? - 'clsGgplotFunction.AddParameter("mapping", clsRFunctionParameter:=clsAesFunction) + clsGgplotFunction.AddParameter("mapping", clsRFunctionParameter:=clsGlobalAesFunction) clsGgplotFunction.AddParameter("data", clsRFunctionParameter:=ucrGeomWithAesSelector.ucrAvailableDataFrames.clsCurrDataFrame.Clone()) strGlobalDataFrame = ucrGeomWithAesSelector.ucrAvailableDataFrames.cboAvailableDataFrames.Text + clsCurrentAesFunction = clsGlobalAesFunction Else 'Warning: in case the sdgLayerOptions has been called by specific dlg, need to refill the aes on that dlg. Imagine the ApplyOnAllLayers has been unticked ? Problem... Also in order to solve this, would need to know on the specific dialog if it has been unticked or not in order to know how to fill in the aes receivers ! The linking will be restudied anyway. There are many ways to go, see discussion on github. clsLocalAesFunction = clsInterAesFunction.Clone() 'If global data frame later changes, data parameter is needed in each geom? @@ -403,12 +343,6 @@ Public Class UcrGeomListWithParameters Else clsGeomFunction.RemoveParameterByName("data") End If - End If - - 'clsCurrentAesFunction is the aes function where aes where additional aes should be added for the temporary fixes below - If ucrChkIgnoreGlobalAes.Checked Then - clsCurrentAesFunction = clsGlobalAesFunction - Else clsCurrentAesFunction = clsLocalAesFunction End If @@ -437,12 +371,10 @@ Public Class UcrGeomListWithParameters End If 'Done after because aes may be added in from above - If Not ucrChkIgnoreGlobalAes.Checked Then - If clsLocalAesFunction.iParameterCount > 0 Then - clsGeomFunction.AddParameter("mapping", clsRFunctionParameter:=clsLocalAesFunction.Clone()) - Else - clsGeomFunction.RemoveParameterByName("mapping") - End If + If Not ucrChkApplyOnAllLayers.Checked AndAlso clsLocalAesFunction.iParameterCount > 0 Then + clsGeomFunction.AddParameter("mapping", clsRFunctionParameter:=clsLocalAesFunction.Clone()) + Else + clsGeomFunction.RemoveParameterByName("mapping") End If End Sub End Class diff --git a/instat/dlgGeneralForGraphics.vb b/instat/dlgGeneralForGraphics.vb index de16bf92d5c..9ebf2886125 100644 --- a/instat/dlgGeneralForGraphics.vb +++ b/instat/dlgGeneralForGraphics.vb @@ -52,7 +52,6 @@ Public Class dlgGeneralForGraphics ucrAdditionalLayers.SetGGplotFunction(clsRggplotFunction) ucrAdditionalLayers.SetAesFunction(clsGgplotAesFunction) ucrBase.clsRsyntax.bExcludeAssignedFunctionOutput = False - ucrBase.clsRsyntax.iCallType = 3 'By default, we want to put in the script the output of our Base R-command (in this case the ...+...+...) even when it has been assigned to some object (in which case we want the name of that object in the script so that it's called when the script is run). 'For example, when a graph is saved, it is assigned to it's place in an R-instat object. If we had set bExcludeAssignedFunctionOutput to True, then we would never print the graph when running the script. ucrBase.clsRsyntax.iCallType = 3 diff --git a/instat/ucrGeom.vb b/instat/ucrGeom.vb index ef5bee733ef..f65f3ffabbc 100644 --- a/instat/ucrGeom.vb +++ b/instat/ucrGeom.vb @@ -1177,9 +1177,11 @@ Public Class ucrGeom For Each clsParam In lstAllGeoms(iPreviousGeomIndex).clsLayerParameters clsGeomFunction.RemoveParameterByName(clsParam.strLayerParameterName) Next + clsGeomFunction.SetRCommand(clsCurrGeom.strGeomName) RaiseEvent GeomChanged() + Else + clsGeomFunction.SetRCommand(clsCurrGeom.strGeomName) End If - clsGeomFunction.SetRCommand(clsCurrGeom.strGeomName) End If End Sub diff --git a/instat/ucrInputComboBox.vb b/instat/ucrInputComboBox.vb index 0d2d338651b..0d8968b09a1 100644 --- a/instat/ucrInputComboBox.vb +++ b/instat/ucrInputComboBox.vb @@ -130,14 +130,22 @@ Public Class ucrInputComboBox Return cboInput.Text End Function - Public Sub SetItems(Optional strItems As String() = Nothing, Optional bClearExisting As Boolean = True) - If bClearExisting Then - cboInput.Items.Clear() - End If - If strItems IsNot Nothing Then - cboInput.Items.AddRange(strItems) + Public Sub SetItems(Optional strItems As String() = Nothing, Optional bClearExisting As Boolean = True, Optional bAddConditions As Boolean = False) + Dim dctValues As New Dictionary(Of String, String) + If bAddConditions Then + For Each strTemp As String In strItems + dctValues.Add(strTemp, strTemp) + Next + SetItems(dctValues, bClearExisting) + Else + If bClearExisting Then + cboInput.Items.Clear() + End If + If strItems IsNot Nothing Then + cboInput.Items.AddRange(strItems) + End If + AdjustComboBoxWidth(cboInput) End If - AdjustComboBoxWidth(cboInput) End Sub Public Sub SetItems(dctItemParameterValuePairs As Dictionary(Of String, String), Optional bClearExisting As Boolean = True) diff --git a/instat/ucrLayerParamsControls.vb b/instat/ucrLayerParamsControls.vb index 96e3dedd16b..e59a73b7e90 100644 --- a/instat/ucrLayerParamsControls.vb +++ b/instat/ucrLayerParamsControls.vb @@ -36,7 +36,7 @@ Public Class ucrLayerParamsControls ucrChkParamName.Visible = True Else ucrChkParamName.Visible = False - End If + End If End Sub Private Sub ucrReceiverMetadataProperty_ControlContentsChanged() Handles ucrReceiverMetadataProperty.ControlContentsChanged, ucrChkParamName.ControlContentsChanged diff --git a/instat/ucrReceiverMetadataProperty.vb b/instat/ucrReceiverMetadataProperty.vb index 4fff9ce3152..833258e2698 100644 --- a/instat/ucrReceiverMetadataProperty.vb +++ b/instat/ucrReceiverMetadataProperty.vb @@ -21,10 +21,7 @@ Public Class ucrReceiverMetadataProperty Public ctrActive As ucrCore Public Sub SetControls(clsNewRCode As RCodeStructure, Optional clsNewLayerParam As LayerParameter = Nothing, Optional bReset As Boolean = False) - Dim dctBooleanItems As New Dictionary(Of String, String) - - dctBooleanItems.Add("TRUE", "TRUE") - dctBooleanItems.Add("FALSE", "FALSE") + Dim clsTempParam As RParameter clsLayerParam = clsNewLayerParam 'This sub adapts the ucrReceiverMetadataProperty to the type of layer parameter, it's default value, the available values etc, stored within clsLayerParam. @@ -54,11 +51,6 @@ Public Class ucrReceiverMetadataProperty ctrActive = ucrColor ElseIf clsLayerParam.strLayerParameterDataType = "list" Then ctrActive = ucrInputCboParamValue - If clsLayerParam.lstParameterStrings IsNot Nothing AndAlso clsLayerParam.lstParameterStrings.Count > 0 Then - ucrInputCboParamValue.SetItems(dctBooleanItems) - Else - ucrInputCboParamValue.SetItems() - End If ElseIf clsLayerParam.strLayerParameterDataType = "text" Then ctrActive = ucrInputTextValue Else @@ -68,10 +60,24 @@ Public Class ucrReceiverMetadataProperty 'Needed to remove conditions from previous use of control ctrActive.ClearConditions() ctrActive.bUpdateRCodeFromControl = True - ctrActive.SetParameter(New RParameter(clsLayerParam.strLayerParameterName)) + ctrActive.bAddRemoveParameter = False + clsTempParam = New RParameter(clsLayerParam.strLayerParameterName) + If clsLayerParam.strParameterDefaultValue IsNot Nothing Then + clsTempParam.SetArgumentValue(clsLayerParam.strParameterDefaultValue) + End If + ctrActive.SetParameter(clsTempParam) 'Must be done after parameter set because it affects the conditions + If ctrActive.Equals(ucrInputCboParamValue) Then - ucrInputCboParamValue.SetItems(dctBooleanItems) + If clsLayerParam.strLayerParameterDataType = "boolean" Then + ucrInputCboParamValue.SetItems({"TRUE", "FALSE"}) + ElseIf clsLayerParam.strLayerParameterDataType = "list" Then + If clsLayerParam.lstParameterStrings IsNot Nothing AndAlso clsLayerParam.lstParameterStrings.Count > 0 Then + ucrInputCboParamValue.SetItems(clsLayerParam.lstParameterStrings) + Else + ucrInputCboParamValue.SetItems() + End If + End If End If ctrActive.SetRCode(clsNewRCode, bReset) End If From e5827d8f40f49642cb5ff3543e26dacde4e56d7d Mon Sep 17 00:00:00 2001 From: Danny Parsons Date: Wed, 7 Jun 2017 18:03:56 +0100 Subject: [PATCH 117/154] work on layers --- instat/UcrGeomListWithAes.vb | 5 +++++ instat/sdgLayerOptions.vb | 6 ++++-- instat/ucrAdditionalLayers.vb | 2 +- instat/ucrGeom.vb | 1 + 4 files changed, 11 insertions(+), 3 deletions(-) diff --git a/instat/UcrGeomListWithAes.vb b/instat/UcrGeomListWithAes.vb index 3a3623f24d1..ac43c133581 100644 --- a/instat/UcrGeomListWithAes.vb +++ b/instat/UcrGeomListWithAes.vb @@ -336,6 +336,11 @@ Public Class UcrGeomListWithParameters strGlobalDataFrame = ucrGeomWithAesSelector.ucrAvailableDataFrames.cboAvailableDataFrames.Text clsCurrentAesFunction = clsGlobalAesFunction Else 'Warning: in case the sdgLayerOptions has been called by specific dlg, need to refill the aes on that dlg. Imagine the ApplyOnAllLayers has been unticked ? Problem... Also in order to solve this, would need to know on the specific dialog if it has been unticked or not in order to know how to fill in the aes receivers ! The linking will be restudied anyway. There are many ways to go, see discussion on github. + For Each clsParam In clsInterAesFunction.clsParameters + If Not (clsGlobalAesFunction.ContainsParameter(clsParam.strArgumentName) AndAlso clsGlobalAesFunction.GetParameter(clsParam.strArgumentName).strArgumentValue = clsParam.strArgumentValue)) Then + clsLocalAesFunction.AddParameter(clsParam) + End If + Next clsLocalAesFunction = clsInterAesFunction.Clone() 'If global data frame later changes, data parameter is needed in each geom? If ucrGeomWithAesSelector.ucrAvailableDataFrames.cboAvailableDataFrames.Text <> strGlobalDataFrame Then diff --git a/instat/sdgLayerOptions.vb b/instat/sdgLayerOptions.vb index e5fbd231629..6e4cbead6d3 100644 --- a/instat/sdgLayerOptions.vb +++ b/instat/sdgLayerOptions.vb @@ -22,7 +22,6 @@ Public Class sdgLayerOptions 'clsGgplotFunction is the global ggplot function, linked through the ucrAdditionalLayers to either sdgPlots or dlgGeneralForGraphics. Public bFirstLoad As Boolean = True Public bAesInGeom As Boolean - Public strGlobalDataFrame As String Public Sub New() ' This call is required by the designer. @@ -51,7 +50,6 @@ Public Class sdgLayerOptions Private Sub SetDefaults() ucrGeomWithAes.Reset() - strGlobalDataFrame = "" End Sub Private Sub ReopenDialog() @@ -73,4 +71,8 @@ Public Class sdgLayerOptions Private Sub ucrSdgLayerBase_ClickReturn(sender As Object, e As EventArgs) Handles ucrSdgLayerBase.ClickReturn ucrGeomWithAes.UpdateGlobalAndLocalAesFromInter() End Sub + + Public Function GetGlobalDataFrame() As String + Return ucrGeomWithAes.strGlobalDataFrame + End Function End Class \ No newline at end of file diff --git a/instat/ucrAdditionalLayers.vb b/instat/ucrAdditionalLayers.vb index d98d15bdc62..408f205fe0b 100644 --- a/instat/ucrAdditionalLayers.vb +++ b/instat/ucrAdditionalLayers.vb @@ -86,7 +86,7 @@ Public Class ucrAdditionalLayers sdgLayerOptions.SetupLayer(clsNewGgPlot:=clsRggplotFunction, clsNewGeomFunc:=clsNewGeomFunction, clsNewGlobalAesFunc:=clsGgplotAesFunction, clsNewLocalAes:=clsNewLocalAesFunction, bFixGeom:=False, strDataframe:=strGlobalDataFrame, bApplyAesGlobally:=(bSetGlobalIsDefault AndAlso lstLayers.Items.Count = 0)) ParentForm.SendToBack() sdgLayerOptions.ShowDialog() - strGlobalDataFrame = sdgLayerOptions.strGlobalDataFrame + strGlobalDataFrame = sdgLayerOptions.GetGlobalDataFrame() AddLayers(clsNewGeomFunction.strRCommand) End Sub diff --git a/instat/ucrGeom.vb b/instat/ucrGeom.vb index f65f3ffabbc..f0b5f5c9d38 100644 --- a/instat/ucrGeom.vb +++ b/instat/ucrGeom.vb @@ -96,6 +96,7 @@ Public Class ucrGeom clsGlobalAesFunction = clsNewGlobalAesFunc clsLocalAesFunction = clsNewLocalAes clsGgplotFunction = clsNewGgplotFunction + strGlobalDataFrame = strDataframe End Sub Public Overridable Sub SetGeomFunction(clsTempGeomFunc As RFunction, Optional bReset As Boolean = False) From b8fc0ec2fe5842afbb7f0e315452ba937138736f Mon Sep 17 00:00:00 2001 From: Steven Date: Wed, 7 Jun 2017 21:23:22 +0300 Subject: [PATCH 118/154] more edits --- instat/clsGgplotDefaults.vb | 6 +- instat/sdgThemes.Designer.vb | 164 ++++++++++++++--------------- instat/sdgThemes.vb | 197 ++++++++++++++++++++++++++--------- 3 files changed, 231 insertions(+), 136 deletions(-) diff --git a/instat/clsGgplotDefaults.vb b/instat/clsGgplotDefaults.vb index 40089202ee8..e361330bc53 100644 --- a/instat/clsGgplotDefaults.vb +++ b/instat/clsGgplotDefaults.vb @@ -126,7 +126,7 @@ ' dctTemp.Add("legend.spacing", clsElementLine.Clone()) ' dctTemp.Add("legend.spacing.x", clsElementText.Clone()) 'dctTemp.Add("legend.spacing.y", clsElementText.Clone()) - 'dctTemp.Add("legend.key", clsElementText.Clone()) + dctTemp.Add("legend.key", clsElementRect.Clone()) ' dctTemp.Add("legend.key.size", clsElementText.Clone()) 'dctTemp.Add("legend.key.height", clsElementText.Clone()) ' dctTemp.Add("legend.key.width", clsElementText.Clone()) @@ -135,12 +135,12 @@ dctTemp.Add("legend.title", clsElementText.Clone()) ' dctTemp.Add("legend.title.align", clsElementText.Clone()) 'dctTemp.Add("legend.position", clsElementText.Clone()) - '.Add("legend.direction", clsElementText.Clone()) + 'dctTemp.Add("legend.direction", clsElementText.Clone()) 'dctTemp.Add("legend.justification", clsElementText.Clone()) 'dctTemp.Add(" legend.box", clsElementText.Clone()) 'dctTemp.Add("legend.box.just", clsElementText.Clone()) 'dctTemp.Add("legend.box.margin", clsElementText.Clone()) - ' dctTemp.Add("legend.box.background", clsElementRect.Clone()) + dctTemp.Add("legend.box.background", clsElementRect.Clone()) 'dctTemp.Add(" legend.box.spacing", clsElementText.Clone()) dctTemp.Add("Panel.background", clsElementRect.Clone()) dctTemp.Add("Panel.border", clsElementRect.Clone()) diff --git a/instat/sdgThemes.Designer.vb b/instat/sdgThemes.Designer.vb index 7db943d6d67..00d050aa1eb 100644 --- a/instat/sdgThemes.Designer.vb +++ b/instat/sdgThemes.Designer.vb @@ -22,7 +22,6 @@ Partial Class sdgThemes 'Do not modify it using the code editor. Private Sub InitializeComponent() - Me.ucrBaseSubdialogue = New instat.ucrButtonsSubdialogue() Me.tbThemeFacets = New System.Windows.Forms.TabPage() Me.tbThemePanelAndBackground = New System.Windows.Forms.TabPage() Me.tbThemeYaxis = New System.Windows.Forms.TabPage() @@ -65,11 +64,10 @@ Partial Class sdgThemes Me.ucrChkUnits = New instat.ucrCheck() Me.ucrInputTickUnits = New instat.ucrInputComboBox() Me.ucrThemeAxesTitle = New instat.ucrELementTextControl() - Me.ucrLegendBackground = New instat.ucrElementRectControl() - Me.ucrLegendKey = New instat.ucrElementRectControl() - Me.ucrLegendBoxBackground = New instat.ucrElementRectControl() Me.tbThemeLegend = New System.Windows.Forms.TabPage() - Me.grpLegendBackGroundAndKey = New System.Windows.Forms.GroupBox() + Me.grpLegendTitleAndText = New System.Windows.Forms.GroupBox() + Me.ucrLegendText = New instat.ucrELementTextControl() + Me.ucrLegendTitle = New instat.ucrELementTextControl() Me.grpLegendAdjustments = New System.Windows.Forms.GroupBox() Me.ucrChkLegendJustification = New instat.ucrCheck() Me.ucrInputLegendJustification = New instat.ucrInputComboBox() @@ -81,9 +79,11 @@ Partial Class sdgThemes Me.ucrInputLegendDirection = New instat.ucrInputComboBox() Me.urChkLegendBoxJust = New instat.ucrCheck() Me.ucrInputLegendBoxJust = New instat.ucrInputComboBox() - Me.UcrELementTextControl1 = New instat.ucrELementTextControl() - Me.UcrELementTextControl2 = New instat.ucrELementTextControl() - Me.grpLegendTitleAndText = New System.Windows.Forms.GroupBox() + Me.grpLegendBackGroundAndKey = New System.Windows.Forms.GroupBox() + Me.ucrLegendBoxBackground = New instat.ucrElementRectControl() + Me.ucrLegendBackground = New instat.ucrElementRectControl() + Me.ucrLegendKey = New instat.ucrElementRectControl() + Me.ucrBaseSubdialogue = New instat.ucrButtonsSubdialogue() Me.tbThemeYaxis.SuspendLayout() Me.GroupBox1.SuspendLayout() Me.grpYAxisTitle.SuspendLayout() @@ -99,18 +99,11 @@ Partial Class sdgThemes Me.tbTitle.SuspendLayout() Me.GroupBox2.SuspendLayout() Me.tbThemeLegend.SuspendLayout() - Me.grpLegendBackGroundAndKey.SuspendLayout() - Me.grpLegendAdjustments.SuspendLayout() Me.grpLegendTitleAndText.SuspendLayout() + Me.grpLegendAdjustments.SuspendLayout() + Me.grpLegendBackGroundAndKey.SuspendLayout() Me.SuspendLayout() ' - 'ucrBaseSubdialogue - ' - Me.ucrBaseSubdialogue.Location = New System.Drawing.Point(349, 595) - Me.ucrBaseSubdialogue.Name = "ucrBaseSubdialogue" - Me.ucrBaseSubdialogue.Size = New System.Drawing.Size(142, 30) - Me.ucrBaseSubdialogue.TabIndex = 0 - ' 'tbThemeFacets ' Me.tbThemeFacets.Location = New System.Drawing.Point(4, 22) @@ -494,27 +487,6 @@ Partial Class sdgThemes Me.ucrThemeAxesTitle.Size = New System.Drawing.Size(255, 228) Me.ucrThemeAxesTitle.TabIndex = 59 ' - 'ucrLegendBackground - ' - Me.ucrLegendBackground.Location = New System.Drawing.Point(11, 19) - Me.ucrLegendBackground.Name = "ucrLegendBackground" - Me.ucrLegendBackground.Size = New System.Drawing.Size(253, 155) - Me.ucrLegendBackground.TabIndex = 0 - ' - 'ucrLegendKey - ' - Me.ucrLegendKey.Location = New System.Drawing.Point(519, 19) - Me.ucrLegendKey.Name = "ucrLegendKey" - Me.ucrLegendKey.Size = New System.Drawing.Size(253, 155) - Me.ucrLegendKey.TabIndex = 1 - ' - 'ucrLegendBoxBackground - ' - Me.ucrLegendBoxBackground.Location = New System.Drawing.Point(260, 19) - Me.ucrLegendBoxBackground.Name = "ucrLegendBoxBackground" - Me.ucrLegendBoxBackground.Size = New System.Drawing.Size(253, 155) - Me.ucrLegendBoxBackground.TabIndex = 2 - ' 'tbThemeLegend ' Me.tbThemeLegend.Controls.Add(Me.grpLegendTitleAndText) @@ -528,17 +500,30 @@ Partial Class sdgThemes Me.tbThemeLegend.Text = "Legend" Me.tbThemeLegend.UseVisualStyleBackColor = True ' - 'grpLegendBackGroundAndKey + 'grpLegendTitleAndText ' - Me.grpLegendBackGroundAndKey.Controls.Add(Me.ucrLegendBoxBackground) - Me.grpLegendBackGroundAndKey.Controls.Add(Me.ucrLegendBackground) - Me.grpLegendBackGroundAndKey.Controls.Add(Me.ucrLegendKey) - Me.grpLegendBackGroundAndKey.Location = New System.Drawing.Point(6, 246) - Me.grpLegendBackGroundAndKey.Name = "grpLegendBackGroundAndKey" - Me.grpLegendBackGroundAndKey.Size = New System.Drawing.Size(777, 176) - Me.grpLegendBackGroundAndKey.TabIndex = 3 - Me.grpLegendBackGroundAndKey.TabStop = False - Me.grpLegendBackGroundAndKey.Text = "Legend Background and Key" + Me.grpLegendTitleAndText.Controls.Add(Me.ucrLegendText) + Me.grpLegendTitleAndText.Controls.Add(Me.ucrLegendTitle) + Me.grpLegendTitleAndText.Location = New System.Drawing.Point(6, 6) + Me.grpLegendTitleAndText.Name = "grpLegendTitleAndText" + Me.grpLegendTitleAndText.Size = New System.Drawing.Size(545, 242) + Me.grpLegendTitleAndText.TabIndex = 101 + Me.grpLegendTitleAndText.TabStop = False + Me.grpLegendTitleAndText.Text = "Legend Title and Text" + ' + 'ucrLegendText + ' + Me.ucrLegendText.Location = New System.Drawing.Point(275, 12) + Me.ucrLegendText.Name = "ucrLegendText" + Me.ucrLegendText.Size = New System.Drawing.Size(255, 224) + Me.ucrLegendText.TabIndex = 65 + ' + 'ucrLegendTitle + ' + Me.ucrLegendTitle.Location = New System.Drawing.Point(14, 12) + Me.ucrLegendTitle.Name = "ucrLegendTitle" + Me.ucrLegendTitle.Size = New System.Drawing.Size(255, 224) + Me.ucrLegendTitle.TabIndex = 64 ' 'grpLegendAdjustments ' @@ -554,7 +539,7 @@ Partial Class sdgThemes Me.grpLegendAdjustments.Controls.Add(Me.ucrInputLegendBoxJust) Me.grpLegendAdjustments.Location = New System.Drawing.Point(557, 6) Me.grpLegendAdjustments.Name = "grpLegendAdjustments" - Me.grpLegendAdjustments.Size = New System.Drawing.Size(241, 161) + Me.grpLegendAdjustments.Size = New System.Drawing.Size(259, 161) Me.grpLegendAdjustments.TabIndex = 100 Me.grpLegendAdjustments.TabStop = False Me.grpLegendAdjustments.Text = "Legend Adjustments" @@ -564,14 +549,14 @@ Partial Class sdgThemes Me.ucrChkLegendJustification.Checked = False Me.ucrChkLegendJustification.Location = New System.Drawing.Point(6, 128) Me.ucrChkLegendJustification.Name = "ucrChkLegendJustification" - Me.ucrChkLegendJustification.Size = New System.Drawing.Size(88, 20) + Me.ucrChkLegendJustification.Size = New System.Drawing.Size(108, 20) Me.ucrChkLegendJustification.TabIndex = 109 ' 'ucrInputLegendJustification ' Me.ucrInputLegendJustification.AddQuotesIfUnrecognised = True Me.ucrInputLegendJustification.IsReadOnly = False - Me.ucrInputLegendJustification.Location = New System.Drawing.Point(95, 126) + Me.ucrInputLegendJustification.Location = New System.Drawing.Point(114, 126) Me.ucrInputLegendJustification.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) Me.ucrInputLegendJustification.Name = "ucrInputLegendJustification" Me.ucrInputLegendJustification.Size = New System.Drawing.Size(137, 21) @@ -582,14 +567,14 @@ Partial Class sdgThemes Me.ucrChkLegendBox.Checked = False Me.ucrChkLegendBox.Location = New System.Drawing.Point(6, 100) Me.ucrChkLegendBox.Name = "ucrChkLegendBox" - Me.ucrChkLegendBox.Size = New System.Drawing.Size(88, 20) + Me.ucrChkLegendBox.Size = New System.Drawing.Size(108, 20) Me.ucrChkLegendBox.TabIndex = 107 ' 'ucrInputLegendBox ' Me.ucrInputLegendBox.AddQuotesIfUnrecognised = True Me.ucrInputLegendBox.IsReadOnly = False - Me.ucrInputLegendBox.Location = New System.Drawing.Point(95, 98) + Me.ucrInputLegendBox.Location = New System.Drawing.Point(114, 98) Me.ucrInputLegendBox.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) Me.ucrInputLegendBox.Name = "ucrInputLegendBox" Me.ucrInputLegendBox.Size = New System.Drawing.Size(137, 21) @@ -600,7 +585,7 @@ Partial Class sdgThemes Me.urChkLegendPosition.Checked = False Me.urChkLegendPosition.Location = New System.Drawing.Point(6, 21) Me.urChkLegendPosition.Name = "urChkLegendPosition" - Me.urChkLegendPosition.Size = New System.Drawing.Size(88, 20) + Me.urChkLegendPosition.Size = New System.Drawing.Size(108, 20) Me.urChkLegendPosition.TabIndex = 105 ' 'ucrChkLegendDirection @@ -608,14 +593,14 @@ Partial Class sdgThemes Me.ucrChkLegendDirection.Checked = False Me.ucrChkLegendDirection.Location = New System.Drawing.Point(6, 47) Me.ucrChkLegendDirection.Name = "ucrChkLegendDirection" - Me.ucrChkLegendDirection.Size = New System.Drawing.Size(88, 20) + Me.ucrChkLegendDirection.Size = New System.Drawing.Size(108, 20) Me.ucrChkLegendDirection.TabIndex = 101 ' 'ucrInputLegendPosition ' Me.ucrInputLegendPosition.AddQuotesIfUnrecognised = True Me.ucrInputLegendPosition.IsReadOnly = False - Me.ucrInputLegendPosition.Location = New System.Drawing.Point(95, 19) + Me.ucrInputLegendPosition.Location = New System.Drawing.Point(114, 19) Me.ucrInputLegendPosition.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) Me.ucrInputLegendPosition.Name = "ucrInputLegendPosition" Me.ucrInputLegendPosition.Size = New System.Drawing.Size(137, 21) @@ -625,7 +610,7 @@ Partial Class sdgThemes ' Me.ucrInputLegendDirection.AddQuotesIfUnrecognised = True Me.ucrInputLegendDirection.IsReadOnly = False - Me.ucrInputLegendDirection.Location = New System.Drawing.Point(95, 45) + Me.ucrInputLegendDirection.Location = New System.Drawing.Point(114, 45) Me.ucrInputLegendDirection.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) Me.ucrInputLegendDirection.Name = "ucrInputLegendDirection" Me.ucrInputLegendDirection.Size = New System.Drawing.Size(137, 21) @@ -636,43 +621,58 @@ Partial Class sdgThemes Me.urChkLegendBoxJust.Checked = False Me.urChkLegendBoxJust.Location = New System.Drawing.Point(6, 73) Me.urChkLegendBoxJust.Name = "urChkLegendBoxJust" - Me.urChkLegendBoxJust.Size = New System.Drawing.Size(88, 20) + Me.urChkLegendBoxJust.Size = New System.Drawing.Size(108, 20) Me.urChkLegendBoxJust.TabIndex = 103 ' 'ucrInputLegendBoxJust ' Me.ucrInputLegendBoxJust.AddQuotesIfUnrecognised = True Me.ucrInputLegendBoxJust.IsReadOnly = False - Me.ucrInputLegendBoxJust.Location = New System.Drawing.Point(95, 71) + Me.ucrInputLegendBoxJust.Location = New System.Drawing.Point(114, 71) Me.ucrInputLegendBoxJust.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) Me.ucrInputLegendBoxJust.Name = "ucrInputLegendBoxJust" Me.ucrInputLegendBoxJust.Size = New System.Drawing.Size(137, 21) Me.ucrInputLegendBoxJust.TabIndex = 102 ' - 'UcrELementTextControl1 + 'grpLegendBackGroundAndKey ' - Me.UcrELementTextControl1.Location = New System.Drawing.Point(275, 12) - Me.UcrELementTextControl1.Name = "UcrELementTextControl1" - Me.UcrELementTextControl1.Size = New System.Drawing.Size(255, 224) - Me.UcrELementTextControl1.TabIndex = 65 + Me.grpLegendBackGroundAndKey.Controls.Add(Me.ucrLegendBoxBackground) + Me.grpLegendBackGroundAndKey.Controls.Add(Me.ucrLegendBackground) + Me.grpLegendBackGroundAndKey.Controls.Add(Me.ucrLegendKey) + Me.grpLegendBackGroundAndKey.Location = New System.Drawing.Point(6, 246) + Me.grpLegendBackGroundAndKey.Name = "grpLegendBackGroundAndKey" + Me.grpLegendBackGroundAndKey.Size = New System.Drawing.Size(777, 176) + Me.grpLegendBackGroundAndKey.TabIndex = 3 + Me.grpLegendBackGroundAndKey.TabStop = False + Me.grpLegendBackGroundAndKey.Text = "Legend Background and Key" ' - 'UcrELementTextControl2 + 'ucrLegendBoxBackground ' - Me.UcrELementTextControl2.Location = New System.Drawing.Point(14, 12) - Me.UcrELementTextControl2.Name = "UcrELementTextControl2" - Me.UcrELementTextControl2.Size = New System.Drawing.Size(255, 224) - Me.UcrELementTextControl2.TabIndex = 64 + Me.ucrLegendBoxBackground.Location = New System.Drawing.Point(260, 19) + Me.ucrLegendBoxBackground.Name = "ucrLegendBoxBackground" + Me.ucrLegendBoxBackground.Size = New System.Drawing.Size(253, 155) + Me.ucrLegendBoxBackground.TabIndex = 2 ' - 'grpLegendTitleAndText + 'ucrLegendBackground ' - Me.grpLegendTitleAndText.Controls.Add(Me.UcrELementTextControl1) - Me.grpLegendTitleAndText.Controls.Add(Me.UcrELementTextControl2) - Me.grpLegendTitleAndText.Location = New System.Drawing.Point(6, 6) - Me.grpLegendTitleAndText.Name = "grpLegendTitleAndText" - Me.grpLegendTitleAndText.Size = New System.Drawing.Size(545, 242) - Me.grpLegendTitleAndText.TabIndex = 101 - Me.grpLegendTitleAndText.TabStop = False - Me.grpLegendTitleAndText.Text = "Legend Title and Text" + Me.ucrLegendBackground.Location = New System.Drawing.Point(11, 19) + Me.ucrLegendBackground.Name = "ucrLegendBackground" + Me.ucrLegendBackground.Size = New System.Drawing.Size(253, 155) + Me.ucrLegendBackground.TabIndex = 0 + ' + 'ucrLegendKey + ' + Me.ucrLegendKey.Location = New System.Drawing.Point(519, 19) + Me.ucrLegendKey.Name = "ucrLegendKey" + Me.ucrLegendKey.Size = New System.Drawing.Size(253, 155) + Me.ucrLegendKey.TabIndex = 1 + ' + 'ucrBaseSubdialogue + ' + Me.ucrBaseSubdialogue.Location = New System.Drawing.Point(349, 595) + Me.ucrBaseSubdialogue.Name = "ucrBaseSubdialogue" + Me.ucrBaseSubdialogue.Size = New System.Drawing.Size(142, 30) + Me.ucrBaseSubdialogue.TabIndex = 0 ' 'sdgThemes ' @@ -702,9 +702,9 @@ Partial Class sdgThemes Me.tbTitle.ResumeLayout(False) Me.GroupBox2.ResumeLayout(False) Me.tbThemeLegend.ResumeLayout(False) - Me.grpLegendBackGroundAndKey.ResumeLayout(False) - Me.grpLegendAdjustments.ResumeLayout(False) Me.grpLegendTitleAndText.ResumeLayout(False) + Me.grpLegendAdjustments.ResumeLayout(False) + Me.grpLegendBackGroundAndKey.ResumeLayout(False) Me.ResumeLayout(False) End Sub @@ -769,6 +769,6 @@ Partial Class sdgThemes Friend WithEvents urChkLegendBoxJust As ucrCheck Friend WithEvents ucrInputLegendBoxJust As ucrInputComboBox Friend WithEvents grpLegendTitleAndText As GroupBox - Friend WithEvents UcrELementTextControl1 As ucrELementTextControl - Friend WithEvents UcrELementTextControl2 As ucrELementTextControl + Friend WithEvents ucrLegendText As ucrELementTextControl + Friend WithEvents ucrLegendTitle As ucrELementTextControl End Class diff --git a/instat/sdgThemes.vb b/instat/sdgThemes.vb index 6a83c32db38..315be73b5b9 100644 --- a/instat/sdgThemes.vb +++ b/instat/sdgThemes.vb @@ -18,35 +18,7 @@ Imports instat.Translations Public Class sdgThemes Public bControlsInitialised As Boolean = False - Private clsElementLine, clsElementXAxisTextTop, clsElementXAxisLine, clsElementYAxisLine, clsElementText, clsElementYAxisTextRight, clsElementXAxisLineTop, clsThemeFunction As New RFunction - - Private Sub tbThemeLegend_Click(sender As Object, e As EventArgs) Handles tbThemeLegend.Click - - End Sub - - Private Sub UcrCheck1_Load(sender As Object, e As EventArgs) - - End Sub - - Private Sub UcrInputComboBox1_Load(sender As Object, e As EventArgs) - - End Sub - - Private Sub UcrCheck2_Load(sender As Object, e As EventArgs) - - End Sub - - Private Sub UcrInputComboBox2_Load(sender As Object, e As EventArgs) - - End Sub - - Private Sub grpLegendAdjustments_Enter(sender As Object, e As EventArgs) - - End Sub - - Private Sub ucrThemeAxesTitle_Load(sender As Object, e As EventArgs) Handles ucrThemeAxesTitle.Load - - End Sub + Private clsElementLine, clsElementRect, clsElementXAxisTextTop, clsElementXAxisLine, clsElementYAxisLine, clsElementText, clsElementYAxisTextRight, clsElementXAxisLineTop, clsThemeFunction As New RFunction Private clsBaseOperator As New ROperator @@ -57,12 +29,12 @@ Public Class sdgThemes End Sub Public Sub InitialiseControls() + Dim dctLegendPosition As New Dictionary(Of String, String) + Dim dctLegendDirection As New Dictionary(Of String, String) + Dim dctLegendBox As New Dictionary(Of String, String) + Dim dctLegendBoxJust As New Dictionary(Of String, String) + Dim dctLegendJustification As New Dictionary(Of String, String) - 'Units - ucrChkUnits.SetText("Tick length") - ucrInputTickUnits.SetParameter(New RParameter("units")) - ucrInputTickUnits.SetItems(New Dictionary(Of String, String)(GgplotDefaults.dctFonts)) - ucrInputTickUnits.SetRDefault(Chr(34) & "npc" & Chr(34)) ucrThemeBottomXAxis.setlabel("X axis tick labels") ucrThemeTopXAxis.setlabel("X axis tick labels on top axis") ucrThemeLeftYAxis.setlabel("Y axis tick labels") @@ -79,6 +51,72 @@ Public Class sdgThemes ucrThemeAxesTitle.setlabel("Label of axes") ucrThemeAxesTickLabels.setlabel("Tick marks along axes") ucrThemeAxesLines.setlabel("Lines along axes") + + ucrLegendTitle.setlabel("Title of legend") + ucrLegendText.setlabel("Legend item labels") + ucrLegendBackground.setlabel("Background of legend") + ucrLegendKey.setlabel("Background underneath legend keys") + ucrLegendBoxBackground.setlabel("Background of legend area") + + 'Units + ucrChkUnits.SetText("Tick length") + ucrInputTickUnits.SetParameter(New RParameter("units")) + ucrInputTickUnits.SetItems(New Dictionary(Of String, String)(GgplotDefaults.dctFonts)) + ucrInputTickUnits.SetRDefault(Chr(34) & "npc" & Chr(34)) + + + ' TODO: Find what this means: "two-element numeric vector" + urChkLegendPosition.SetText("Legend Position") + 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) + ucrInputLegendPosition.SetRDefault(Chr(34) & "none" & Chr(34)) + + ucrChkLegendBox.SetText("Multiple Legend Arrangement") + ucrInputLegendBox.SetParameter(New RParameter("legend.box")) + dctLegendBox.Add("Vertical", Chr(34) & "vertical" & Chr(34)) + dctLegendBox.Add("Horizontal", Chr(34) & "horizontal" & Chr(34)) + ucrInputLegendBox.SetItems(dctLegendBox) + ucrInputLegendBox.SetRDefault(Chr(34) & "vertical" & Chr(34)) + + urChkLegendBoxJust.SetText("Justification of Legend Box") + ucrInputLegendBoxJust.SetParameter(New RParameter("legend.box.just")) + dctLegendBoxJust.Add("Top", Chr(34) & "top" & Chr(34)) + dctLegendBoxJust.Add("Bottom", Chr(34) & "bottom" & Chr(34)) + dctLegendBoxJust.Add("Right", Chr(34) & "right" & Chr(34)) + dctLegendBoxJust.Add("Left", Chr(34) & "left" & Chr(34)) + ucrInputLegendBoxJust.SetItems(dctLegendBoxJust) + ucrInputLegendBoxJust.SetRDefault(Chr(34) & "top" & Chr(34)) + + + ucrChkLegendDirection.SetText("Legend Direction") + ucrInputLegendDirection.SetParameter(New RParameter("legend.direction")) + dctLegendDirection.Add("Vertical", Chr(34) & "vertical" & Chr(34)) + dctLegendDirection.Add("Horizontal", Chr(34) & "horizontal" & Chr(34)) + ucrInputLegendDirection.SetItems(dctLegendDirection) + ucrInputLegendDirection.SetRDefault(Chr(34) & "vertical" & Chr(34)) + + + ucrChkLegendJustification.SetText("Legend Justification") + ucrInputLegendJustification.SetParameter(New RParameter("legend.justification")) + dctLegendJustification.Add("Top", Chr(34) & "top" & Chr(34)) + dctLegendJustification.Add("Bottom", Chr(34) & "bottom" & Chr(34)) + dctLegendJustification.Add("Right", Chr(34) & "right" & Chr(34)) + dctLegendJustification.Add("Left", Chr(34) & "left" & Chr(34)) + dctLegendJustification.Add("Center", Chr(34) & "centre" & Chr(34)) + ucrInputLegendJustification.SetItems(dctLegendJustification) + ucrInputLegendJustification.SetRDefault(Chr(34) & "top" & Chr(34)) + + urChkLegendPosition.AddToLinkedControls(ucrInputLegendPosition, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) + ucrChkLegendBox.AddToLinkedControls(ucrInputLegendBox, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) + urChkLegendBoxJust.AddToLinkedControls(ucrInputLegendBoxJust, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) + ucrChkLegendDirection.AddToLinkedControls(ucrInputLegendDirection, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) + ucrChkLegendJustification.AddToLinkedControls(ucrInputLegendJustification, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) + End Sub Public Sub SetRCode(clsBaseOperator As ROperator, clsNewThemeFunction As RFunction, dctNewThemeFunctions As Dictionary(Of String, RFunction), Optional bReset As Boolean = False) @@ -92,6 +130,8 @@ Public Class sdgThemes Dim clsYElementTitle As New RFunction Dim clsXTopElementTitle As New RFunction Dim clsYRightElementTitle As New RFunction + Dim clsElementLegendText As New RFunction + Dim clsElementLegendTitle As New RFunction Dim clsXElementLine As New RFunction Dim clsElementLineAxes As New RFunction @@ -102,11 +142,15 @@ Public Class sdgThemes Dim clsElementLineXAxis As New RFunction Dim clsElementLineYAxis As New RFunction + Dim clsElementLegendBackground As New RFunction + Dim clsElementLegendBoxBackground As New RFunction + Dim clsElementLegendtKey As New RFunction + If Not bControlsInitialised Then InitialiseControls() End If - clsThemeFunction = clsNewThemeFunction clsBaseOperator.AddParameter("theme", clsRFunctionParameter:=clsThemeFunction, iPosition:=15) + clsThemeFunction = clsNewThemeFunction dctThemeFunctions = dctNewThemeFunctions dctThemeFunctions.TryGetValue("axis.text", clsElementTickText) @@ -115,6 +159,9 @@ Public Class sdgThemes dctThemeFunctions.TryGetValue("axis.text.x.top", clsXTopElementText) dctThemeFunctions.TryGetValue("axis.text.y.right", clsYRightElementText) + dctThemeFunctions.TryGetValue("legend.text", clsElementLegendText) + dctThemeFunctions.TryGetValue("legend.title", clsElementLegendTitle) + dctThemeFunctions.TryGetValue("axis.title", clsXElementTitleText) dctThemeFunctions.TryGetValue("axis.title.x", clsXElementTitle) dctThemeFunctions.TryGetValue("axis.title.y", clsYElementTitle) @@ -129,6 +176,12 @@ Public Class sdgThemes dctThemeFunctions.TryGetValue("axis.ticks", clsElementTickAxes) dctThemeFunctions.TryGetValue("axis.line", clsElementLineAxes) + + dctThemeFunctions.TryGetValue("legend.background", clsElementLegendBackground) + dctThemeFunctions.TryGetValue("legend.box.background", clsElementLegendBoxBackground) + dctThemeFunctions.TryGetValue("legend.key", clsElementLegendtKey) + ' dctThemeFunctions.TryGetValue("legend.background", clsElementLineAxes) + ucrTickMarksXAxis.SetRCodeForControl("axis.ticks.x", clsXElementLine, clsNewThemeFunction:=clsThemeFunction, clsNewBaseOperator:=clsBaseOperator, bReset:=bReset) ucrTickMarksYAxis.SetRCodeForControl("axis.ticks.y", clsYElementLine, clsNewThemeFunction:=clsThemeFunction, clsNewBaseOperator:=clsBaseOperator, bReset:=bReset) ucrXAxisLines.SetRCodeForControl("axis.line.x", clsElementLineXAxis, clsNewThemeFunction:=clsThemeFunction, clsNewBaseOperator:=clsBaseOperator, bReset:=bReset) @@ -148,24 +201,63 @@ Public Class sdgThemes ucrThemeTitleYAxis.SetRCodeForControl("axis.title.y", clsYElementTitle, clsNewThemeFunction:=clsThemeFunction, clsNewBaseOperator:=clsBaseOperator, bReset:=bReset) ucrThemeTitleYRightAxis.SetRCodeForControl("axis.title.y.right", clsYRightElementTitle, clsNewThemeFunction:=clsThemeFunction, clsNewBaseOperator:=clsBaseOperator, bReset:=bReset) - 'AddRemoveElementParameters() + ucrLegendTitle.SetRCodeForControl("legend.title", clsElementLegendTitle, clsNewThemeFunction:=clsThemeFunction, clsNewBaseOperator:=clsBaseOperator, bReset:=bReset) + ucrLegendText.SetRCodeForControl("legend.text", clsElementLegendText, clsNewThemeFunction:=clsThemeFunction, clsNewBaseOperator:=clsBaseOperator, bReset:=bReset) + ucrLegendBackground.SetRCodeForControl("legend.background", clsElementLegendBackground, clsNewThemeFunction:=clsThemeFunction, clsNewBaseOperator:=clsBaseOperator, bReset:=bReset) + ucrLegendBoxBackground.SetRCodeForControl("legend.box.background", clsElementLegendBoxBackground, clsNewThemeFunction:=clsThemeFunction, clsNewBaseOperator:=clsBaseOperator, bReset:=bReset) + ucrLegendKey.SetRCodeForControl("legend.key", clsElementLegendtKey, clsNewThemeFunction:=clsThemeFunction, clsNewBaseOperator:=clsBaseOperator, bReset:=bReset) + + + urChkLegendPosition.SetRCode(clsThemeFunction, bReset) + ucrInputLegendPosition.SetRCode(clsThemeFunction, bReset) + + ucrChkLegendBox.SetRCode(clsThemeFunction, bReset) + ucrInputLegendBox.SetRCode(clsThemeFunction, bReset) + + urChkLegendBoxJust.SetRCode(clsThemeFunction, bReset) + ucrInputLegendBoxJust.SetRCode(clsThemeFunction, bReset) + + ucrChkLegendDirection.SetRCode(clsThemeFunction, bReset) + ucrInputLegendDirection.SetRCode(clsThemeFunction, bReset) + + ucrChkLegendJustification.SetRCode(clsThemeFunction, bReset) + ucrInputLegendJustification.SetRCode(clsThemeFunction, bReset) + AddRemoveElementParameters() End Sub - 'Private Sub AddRemoveElementParameters() - ' If ucrChkAngle.Checked OrElse ucrChkHjust.Checked OrElse ucrChkLineHeight.Checked OrElse ucrChkSize.Checked OrElse ucrChkVjust.Checked OrElse ucrChkColour.Checked OrElse ucrChkFace.Checked OrElse ucrChkFamily.Checked Then - ' clsThemeFunction.AddParameter("axis.text.x", clsRFunctionParameter:=clsElementText) - ' clsThemeFunction.AddParameter("axis.text.y", clsRFunctionParameter:=clsElementText) - ' clsThemeFunction.AddParameter("axis.ticks.y", clsRFunctionParameter:=clsElementLine) - ' clsThemeFunction.AddParameter("axis.ticks.x", clsRFunctionParameter:=clsElementLine) - - ' Else - ' clsThemeFunction.RemoveParameterByName("axis.text.x") - ' clsThemeFunction.RemoveParameterByName("axis.text.y") - ' clsThemeFunction.RemoveParameterByName("axis.ticks.y") - ' clsThemeFunction.RemoveParameterByName("axis.ticks.x") - ' End If - ' AddRemoveTheme() - 'End Sub + Private Sub AddRemoveElementParameters() + 'If ucrChkLegendBox.Checked Then + ' clsThemeFunction.AddParameter("legend.box") + 'Else + ' clsThemeFunction.RemoveParameterByName("legend.box") + 'End If + + 'If ucrChkLegendDirection.Checked Then + ' clsThemeFunction.AddParameter("legend.direction") + 'Else + ' clsThemeFunction.RemoveParameterByName("legend.direction") + 'End If + + 'If ucrChkLegendJustification.Checked Then + ' clsThemeFunction.AddParameter("legend.justification") + 'Else + ' clsThemeFunction.RemoveParameterByName("legend.justification") + 'End If + + 'If urChkLegendBoxJust.Checked Then + ' clsThemeFunction.AddParameter("legend.box.just") + 'Else + ' clsThemeFunction.RemoveParameterByName("legend.box.just") + 'End If + + 'If urChkLegendPosition.Checked Then + ' clsThemeFunction.AddParameter("legend.position") + 'Else + ' clsThemeFunction.RemoveParameterByName("legend.position") + 'End If + + AddRemoveTheme() + End Sub Private Sub AddRemoveTheme() If clsThemeFunction.iParameterCount > 0 Then @@ -175,4 +267,7 @@ Public Class sdgThemes End If End Sub + Private Sub ElementLegendControls_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkLegendBox.ControlValueChanged, ucrChkLegendDirection.ControlValueChanged, ucrChkLegendJustification.ControlValueChanged, urChkLegendBoxJust.ControlValueChanged, urChkLegendPosition.ControlValueChanged + AddRemoveElementParameters() + End Sub End Class \ No newline at end of file From c2f7b9f38a4d83f29848317ceb3d3207c380a8ac Mon Sep 17 00:00:00 2001 From: Steven Date: Thu, 8 Jun 2017 10:35:53 +0300 Subject: [PATCH 119/154] Adding Plot Tab --- instat/sdgThemes.Designer.vb | 532 ++++++++++++++++++++------------ instat/sdgThemes.vb | 74 +++-- instat/ucrElementRectControl.vb | 2 +- 3 files changed, 377 insertions(+), 231 deletions(-) diff --git a/instat/sdgThemes.Designer.vb b/instat/sdgThemes.Designer.vb index 00d050aa1eb..388214c84cf 100644 --- a/instat/sdgThemes.Designer.vb +++ b/instat/sdgThemes.Designer.vb @@ -26,7 +26,6 @@ Partial Class sdgThemes Me.tbThemePanelAndBackground = New System.Windows.Forms.TabPage() Me.tbThemeYaxis = New System.Windows.Forms.TabPage() Me.GroupBox1 = New System.Windows.Forms.GroupBox() - Me.UcrTickMarksAndLabels1 = New instat.ucrElementLineControl() Me.ucrYAxisLines = New instat.ucrElementLineControl() Me.grpYAxisTitle = New System.Windows.Forms.GroupBox() Me.ucrThemeTitleYRightAxis = New instat.ucrELementTextControl() @@ -35,7 +34,6 @@ Partial Class sdgThemes Me.ucrThemeYRightAxis = New instat.ucrELementTextControl() Me.ucrThemeLeftYAxis = New instat.ucrELementTextControl() Me.grpTickMarkers = New System.Windows.Forms.GroupBox() - Me.ucrTickMarks = New instat.ucrElementLineControl() Me.ucrTickMarksYAxis = New instat.ucrElementLineControl() Me.tbThemeXAxis = New System.Windows.Forms.TabPage() Me.grpTableOptions = New System.Windows.Forms.GroupBox() @@ -52,18 +50,6 @@ Partial Class sdgThemes Me.UcrTickMarksAndLabels5 = New instat.ucrElementLineControl() Me.ucrTickMarksXAxis = New instat.ucrElementLineControl() Me.tbLegend = New System.Windows.Forms.TabControl() - Me.tbTitle = New System.Windows.Forms.TabPage() - Me.ucrThemeAxesLines = New instat.ucrElementLineControl() - Me.ucrThemeAxesTickLabels = New instat.ucrELementTextControl() - Me.ucrTickMarksAxes = New instat.ucrElementLineControl() - Me.GroupBox2 = New System.Windows.Forms.GroupBox() - Me.ucrInputMargin = New instat.ucrInputTextBox() - Me.ucrChkMaigin = New instat.ucrCheck() - Me.ucrInputMarginUnits = New instat.ucrInputComboBox() - Me.ucrInputUnits = New instat.ucrInputTextBox() - Me.ucrChkUnits = New instat.ucrCheck() - Me.ucrInputTickUnits = New instat.ucrInputComboBox() - Me.ucrThemeAxesTitle = New instat.ucrELementTextControl() Me.tbThemeLegend = New System.Windows.Forms.TabPage() Me.grpLegendTitleAndText = New System.Windows.Forms.GroupBox() Me.ucrLegendText = New instat.ucrELementTextControl() @@ -80,10 +66,37 @@ Partial Class sdgThemes Me.urChkLegendBoxJust = New instat.ucrCheck() Me.ucrInputLegendBoxJust = New instat.ucrInputComboBox() Me.grpLegendBackGroundAndKey = New System.Windows.Forms.GroupBox() - Me.ucrLegendBoxBackground = New instat.ucrElementRectControl() - Me.ucrLegendBackground = New instat.ucrElementRectControl() - Me.ucrLegendKey = New instat.ucrElementRectControl() Me.ucrBaseSubdialogue = New instat.ucrButtonsSubdialogue() + Me.grpPAnelGrid = New System.Windows.Forms.GroupBox() + Me.ucrPanelGrid = New instat.ucrElementLineControl() + Me.ucrPanelGridMajor = New instat.ucrElementLineControl() + Me.ucrPanelGridMinor = New instat.ucrElementLineControl() + Me.ucrLegendKey = New instat.ucrElementRectControl() + Me.ucrLegendBackground = New instat.ucrElementRectControl() + Me.ucrLegendBoxBackground = New instat.ucrElementRectControl() + Me.grpBorderAndBackground = New System.Windows.Forms.GroupBox() + Me.ucrPanelBackGround = New instat.ucrElementRectControl() + Me.ucrPanelBorder = New instat.ucrElementRectControl() + Me.tbPLot = New System.Windows.Forms.TabPage() + Me.ucrThemeAxesTitle = New instat.ucrELementTextControl() + Me.GroupBox2 = New System.Windows.Forms.GroupBox() + Me.ucrInputTickUnits = New instat.ucrInputComboBox() + Me.ucrChkUnits = New instat.ucrCheck() + Me.ucrInputUnits = New instat.ucrInputTextBox() + Me.ucrInputMarginUnits = New instat.ucrInputComboBox() + Me.ucrChkMaigin = New instat.ucrCheck() + Me.ucrInputMargin = New instat.ucrInputTextBox() + Me.ucrTickMarksAxes = New instat.ucrElementLineControl() + Me.ucrThemeAxesTickLabels = New instat.ucrELementTextControl() + Me.ucrThemeAxesLines = New instat.ucrElementLineControl() + Me.tbXYAxes = New System.Windows.Forms.TabPage() + Me.grpPlotTitleAndCaption = New System.Windows.Forms.GroupBox() + Me.ucrPlotSubTitle = New instat.ucrELementTextControl() + Me.ucrPlotTitle = New instat.ucrELementTextControl() + Me.ucrPlotCaption = New instat.ucrELementTextControl() + Me.grpPlotBackground = New System.Windows.Forms.GroupBox() + Me.ucrPlotBackGround = New instat.ucrElementRectControl() + Me.tbThemePanelAndBackground.SuspendLayout() Me.tbThemeYaxis.SuspendLayout() Me.GroupBox1.SuspendLayout() Me.grpYAxisTitle.SuspendLayout() @@ -96,12 +109,16 @@ Partial Class sdgThemes Me.grpXAxisLines.SuspendLayout() Me.GroupBox5.SuspendLayout() Me.tbLegend.SuspendLayout() - Me.tbTitle.SuspendLayout() - Me.GroupBox2.SuspendLayout() Me.tbThemeLegend.SuspendLayout() Me.grpLegendTitleAndText.SuspendLayout() Me.grpLegendAdjustments.SuspendLayout() Me.grpLegendBackGroundAndKey.SuspendLayout() + Me.grpPAnelGrid.SuspendLayout() + Me.grpBorderAndBackground.SuspendLayout() + Me.tbPLot.SuspendLayout() + Me.tbXYAxes.SuspendLayout() + Me.grpPlotTitleAndCaption.SuspendLayout() + Me.grpPlotBackground.SuspendLayout() Me.SuspendLayout() ' 'tbThemeFacets @@ -115,6 +132,8 @@ Partial Class sdgThemes ' 'tbThemePanelAndBackground ' + Me.tbThemePanelAndBackground.Controls.Add(Me.grpBorderAndBackground) + Me.tbThemePanelAndBackground.Controls.Add(Me.grpPAnelGrid) Me.tbThemePanelAndBackground.Location = New System.Drawing.Point(4, 22) Me.tbThemePanelAndBackground.Name = "tbThemePanelAndBackground" Me.tbThemePanelAndBackground.Size = New System.Drawing.Size(816, 555) @@ -138,22 +157,14 @@ Partial Class sdgThemes ' 'GroupBox1 ' - Me.GroupBox1.Controls.Add(Me.UcrTickMarksAndLabels1) Me.GroupBox1.Controls.Add(Me.ucrYAxisLines) Me.GroupBox1.Location = New System.Drawing.Point(544, 289) Me.GroupBox1.Name = "GroupBox1" - Me.GroupBox1.Size = New System.Drawing.Size(260, 264) + Me.GroupBox1.Size = New System.Drawing.Size(260, 136) Me.GroupBox1.TabIndex = 66 Me.GroupBox1.TabStop = False Me.GroupBox1.Text = "Line Along Y-Axis" ' - 'UcrTickMarksAndLabels1 - ' - Me.UcrTickMarksAndLabels1.Location = New System.Drawing.Point(4, 134) - Me.UcrTickMarksAndLabels1.Name = "UcrTickMarksAndLabels1" - Me.UcrTickMarksAndLabels1.Size = New System.Drawing.Size(254, 124) - Me.UcrTickMarksAndLabels1.TabIndex = 64 - ' 'ucrYAxisLines ' Me.ucrYAxisLines.Location = New System.Drawing.Point(4, 12) @@ -213,22 +224,14 @@ Partial Class sdgThemes ' 'grpTickMarkers ' - Me.grpTickMarkers.Controls.Add(Me.ucrTickMarks) Me.grpTickMarkers.Controls.Add(Me.ucrTickMarksYAxis) - Me.grpTickMarkers.Location = New System.Drawing.Point(540, 23) + Me.grpTickMarkers.Location = New System.Drawing.Point(540, 24) Me.grpTickMarkers.Name = "grpTickMarkers" - Me.grpTickMarkers.Size = New System.Drawing.Size(264, 257) + Me.grpTickMarkers.Size = New System.Drawing.Size(264, 137) Me.grpTickMarkers.TabIndex = 65 Me.grpTickMarkers.TabStop = False Me.grpTickMarkers.Text = "TickMarkers" ' - 'ucrTickMarks - ' - Me.ucrTickMarks.Location = New System.Drawing.Point(4, 132) - Me.ucrTickMarks.Name = "ucrTickMarks" - Me.ucrTickMarks.Size = New System.Drawing.Size(254, 126) - Me.ucrTickMarks.TabIndex = 64 - ' 'ucrTickMarksYAxis ' Me.ucrTickMarksYAxis.Location = New System.Drawing.Point(4, 10) @@ -362,7 +365,8 @@ Partial Class sdgThemes ' 'tbLegend ' - Me.tbLegend.Controls.Add(Me.tbTitle) + Me.tbLegend.Controls.Add(Me.tbPLot) + Me.tbLegend.Controls.Add(Me.tbXYAxes) Me.tbLegend.Controls.Add(Me.tbThemeXAxis) Me.tbLegend.Controls.Add(Me.tbThemeYaxis) Me.tbLegend.Controls.Add(Me.tbThemeLegend) @@ -374,119 +378,6 @@ Partial Class sdgThemes Me.tbLegend.Size = New System.Drawing.Size(824, 581) Me.tbLegend.TabIndex = 1 ' - 'tbTitle - ' - Me.tbTitle.Controls.Add(Me.ucrThemeAxesLines) - Me.tbTitle.Controls.Add(Me.ucrThemeAxesTickLabels) - Me.tbTitle.Controls.Add(Me.ucrTickMarksAxes) - Me.tbTitle.Controls.Add(Me.GroupBox2) - Me.tbTitle.Controls.Add(Me.ucrThemeAxesTitle) - Me.tbTitle.Location = New System.Drawing.Point(4, 22) - Me.tbTitle.Name = "tbTitle" - Me.tbTitle.Size = New System.Drawing.Size(816, 555) - Me.tbTitle.TabIndex = 6 - Me.tbTitle.Text = "General" - Me.tbTitle.UseVisualStyleBackColor = True - ' - 'ucrThemeAxesLines - ' - Me.ucrThemeAxesLines.Location = New System.Drawing.Point(271, 246) - Me.ucrThemeAxesLines.Name = "ucrThemeAxesLines" - Me.ucrThemeAxesLines.Size = New System.Drawing.Size(257, 122) - Me.ucrThemeAxesLines.TabIndex = 64 - ' - 'ucrThemeAxesTickLabels - ' - Me.ucrThemeAxesTickLabels.Location = New System.Drawing.Point(268, 13) - Me.ucrThemeAxesTickLabels.Name = "ucrThemeAxesTickLabels" - Me.ucrThemeAxesTickLabels.Size = New System.Drawing.Size(255, 228) - Me.ucrThemeAxesTickLabels.TabIndex = 63 - ' - 'ucrTickMarksAxes - ' - Me.ucrTickMarksAxes.Location = New System.Drawing.Point(4, 244) - Me.ucrTickMarksAxes.Name = "ucrTickMarksAxes" - Me.ucrTickMarksAxes.Size = New System.Drawing.Size(257, 122) - Me.ucrTickMarksAxes.TabIndex = 62 - ' - 'GroupBox2 - ' - Me.GroupBox2.Controls.Add(Me.ucrInputMargin) - Me.GroupBox2.Controls.Add(Me.ucrChkMaigin) - Me.GroupBox2.Controls.Add(Me.ucrInputMarginUnits) - Me.GroupBox2.Controls.Add(Me.ucrInputUnits) - Me.GroupBox2.Controls.Add(Me.ucrChkUnits) - Me.GroupBox2.Controls.Add(Me.ucrInputTickUnits) - Me.GroupBox2.Location = New System.Drawing.Point(7, 372) - Me.GroupBox2.Name = "GroupBox2" - Me.GroupBox2.Size = New System.Drawing.Size(264, 149) - Me.GroupBox2.TabIndex = 61 - Me.GroupBox2.TabStop = False - Me.GroupBox2.Text = "X axis tick labels" - ' - 'ucrInputMargin - ' - Me.ucrInputMargin.AddQuotesIfUnrecognised = True - Me.ucrInputMargin.IsMultiline = False - Me.ucrInputMargin.IsReadOnly = False - Me.ucrInputMargin.Location = New System.Drawing.Point(114, 82) - Me.ucrInputMargin.Name = "ucrInputMargin" - Me.ucrInputMargin.Size = New System.Drawing.Size(50, 23) - Me.ucrInputMargin.TabIndex = 65 - ' - 'ucrChkMaigin - ' - Me.ucrChkMaigin.Checked = False - Me.ucrChkMaigin.Location = New System.Drawing.Point(14, 82) - Me.ucrChkMaigin.Name = "ucrChkMaigin" - Me.ucrChkMaigin.Size = New System.Drawing.Size(100, 20) - Me.ucrChkMaigin.TabIndex = 64 - ' - 'ucrInputMarginUnits - ' - Me.ucrInputMarginUnits.AddQuotesIfUnrecognised = True - Me.ucrInputMarginUnits.IsReadOnly = False - Me.ucrInputMarginUnits.Location = New System.Drawing.Point(114, 114) - Me.ucrInputMarginUnits.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) - Me.ucrInputMarginUnits.Name = "ucrInputMarginUnits" - Me.ucrInputMarginUnits.Size = New System.Drawing.Size(137, 21) - Me.ucrInputMarginUnits.TabIndex = 63 - ' - 'ucrInputUnits - ' - Me.ucrInputUnits.AddQuotesIfUnrecognised = True - Me.ucrInputUnits.IsMultiline = False - Me.ucrInputUnits.IsReadOnly = False - Me.ucrInputUnits.Location = New System.Drawing.Point(114, 20) - Me.ucrInputUnits.Name = "ucrInputUnits" - Me.ucrInputUnits.Size = New System.Drawing.Size(50, 23) - Me.ucrInputUnits.TabIndex = 62 - ' - 'ucrChkUnits - ' - Me.ucrChkUnits.Checked = False - Me.ucrChkUnits.Location = New System.Drawing.Point(14, 20) - Me.ucrChkUnits.Name = "ucrChkUnits" - Me.ucrChkUnits.Size = New System.Drawing.Size(100, 20) - Me.ucrChkUnits.TabIndex = 61 - ' - 'ucrInputTickUnits - ' - Me.ucrInputTickUnits.AddQuotesIfUnrecognised = True - Me.ucrInputTickUnits.IsReadOnly = False - Me.ucrInputTickUnits.Location = New System.Drawing.Point(114, 52) - Me.ucrInputTickUnits.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) - Me.ucrInputTickUnits.Name = "ucrInputTickUnits" - Me.ucrInputTickUnits.Size = New System.Drawing.Size(137, 21) - Me.ucrInputTickUnits.TabIndex = 60 - ' - 'ucrThemeAxesTitle - ' - Me.ucrThemeAxesTitle.Location = New System.Drawing.Point(7, 13) - Me.ucrThemeAxesTitle.Name = "ucrThemeAxesTitle" - Me.ucrThemeAxesTitle.Size = New System.Drawing.Size(255, 228) - Me.ucrThemeAxesTitle.TabIndex = 59 - ' 'tbThemeLegend ' Me.tbThemeLegend.Controls.Add(Me.grpLegendTitleAndText) @@ -506,7 +397,7 @@ Partial Class sdgThemes Me.grpLegendTitleAndText.Controls.Add(Me.ucrLegendTitle) Me.grpLegendTitleAndText.Location = New System.Drawing.Point(6, 6) Me.grpLegendTitleAndText.Name = "grpLegendTitleAndText" - Me.grpLegendTitleAndText.Size = New System.Drawing.Size(545, 242) + Me.grpLegendTitleAndText.Size = New System.Drawing.Size(530, 242) Me.grpLegendTitleAndText.TabIndex = 101 Me.grpLegendTitleAndText.TabStop = False Me.grpLegendTitleAndText.Text = "Legend Title and Text" @@ -537,9 +428,9 @@ Partial Class sdgThemes Me.grpLegendAdjustments.Controls.Add(Me.ucrInputLegendDirection) Me.grpLegendAdjustments.Controls.Add(Me.urChkLegendBoxJust) Me.grpLegendAdjustments.Controls.Add(Me.ucrInputLegendBoxJust) - Me.grpLegendAdjustments.Location = New System.Drawing.Point(557, 6) + Me.grpLegendAdjustments.Location = New System.Drawing.Point(541, 6) Me.grpLegendAdjustments.Name = "grpLegendAdjustments" - Me.grpLegendAdjustments.Size = New System.Drawing.Size(259, 161) + Me.grpLegendAdjustments.Size = New System.Drawing.Size(272, 161) Me.grpLegendAdjustments.TabIndex = 100 Me.grpLegendAdjustments.TabStop = False Me.grpLegendAdjustments.Text = "Legend Adjustments" @@ -549,14 +440,14 @@ Partial Class sdgThemes Me.ucrChkLegendJustification.Checked = False Me.ucrChkLegendJustification.Location = New System.Drawing.Point(6, 128) Me.ucrChkLegendJustification.Name = "ucrChkLegendJustification" - Me.ucrChkLegendJustification.Size = New System.Drawing.Size(108, 20) + Me.ucrChkLegendJustification.Size = New System.Drawing.Size(122, 20) Me.ucrChkLegendJustification.TabIndex = 109 ' 'ucrInputLegendJustification ' Me.ucrInputLegendJustification.AddQuotesIfUnrecognised = True Me.ucrInputLegendJustification.IsReadOnly = False - Me.ucrInputLegendJustification.Location = New System.Drawing.Point(114, 126) + Me.ucrInputLegendJustification.Location = New System.Drawing.Point(130, 126) Me.ucrInputLegendJustification.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) Me.ucrInputLegendJustification.Name = "ucrInputLegendJustification" Me.ucrInputLegendJustification.Size = New System.Drawing.Size(137, 21) @@ -567,14 +458,14 @@ Partial Class sdgThemes Me.ucrChkLegendBox.Checked = False Me.ucrChkLegendBox.Location = New System.Drawing.Point(6, 100) Me.ucrChkLegendBox.Name = "ucrChkLegendBox" - Me.ucrChkLegendBox.Size = New System.Drawing.Size(108, 20) + Me.ucrChkLegendBox.Size = New System.Drawing.Size(122, 20) Me.ucrChkLegendBox.TabIndex = 107 ' 'ucrInputLegendBox ' Me.ucrInputLegendBox.AddQuotesIfUnrecognised = True Me.ucrInputLegendBox.IsReadOnly = False - Me.ucrInputLegendBox.Location = New System.Drawing.Point(114, 98) + Me.ucrInputLegendBox.Location = New System.Drawing.Point(130, 98) Me.ucrInputLegendBox.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) Me.ucrInputLegendBox.Name = "ucrInputLegendBox" Me.ucrInputLegendBox.Size = New System.Drawing.Size(137, 21) @@ -585,7 +476,7 @@ Partial Class sdgThemes Me.urChkLegendPosition.Checked = False Me.urChkLegendPosition.Location = New System.Drawing.Point(6, 21) Me.urChkLegendPosition.Name = "urChkLegendPosition" - Me.urChkLegendPosition.Size = New System.Drawing.Size(108, 20) + Me.urChkLegendPosition.Size = New System.Drawing.Size(122, 20) Me.urChkLegendPosition.TabIndex = 105 ' 'ucrChkLegendDirection @@ -593,14 +484,14 @@ Partial Class sdgThemes Me.ucrChkLegendDirection.Checked = False Me.ucrChkLegendDirection.Location = New System.Drawing.Point(6, 47) Me.ucrChkLegendDirection.Name = "ucrChkLegendDirection" - Me.ucrChkLegendDirection.Size = New System.Drawing.Size(108, 20) + Me.ucrChkLegendDirection.Size = New System.Drawing.Size(122, 20) Me.ucrChkLegendDirection.TabIndex = 101 ' 'ucrInputLegendPosition ' Me.ucrInputLegendPosition.AddQuotesIfUnrecognised = True Me.ucrInputLegendPosition.IsReadOnly = False - Me.ucrInputLegendPosition.Location = New System.Drawing.Point(114, 19) + Me.ucrInputLegendPosition.Location = New System.Drawing.Point(130, 19) Me.ucrInputLegendPosition.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) Me.ucrInputLegendPosition.Name = "ucrInputLegendPosition" Me.ucrInputLegendPosition.Size = New System.Drawing.Size(137, 21) @@ -610,7 +501,7 @@ Partial Class sdgThemes ' Me.ucrInputLegendDirection.AddQuotesIfUnrecognised = True Me.ucrInputLegendDirection.IsReadOnly = False - Me.ucrInputLegendDirection.Location = New System.Drawing.Point(114, 45) + Me.ucrInputLegendDirection.Location = New System.Drawing.Point(130, 45) Me.ucrInputLegendDirection.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) Me.ucrInputLegendDirection.Name = "ucrInputLegendDirection" Me.ucrInputLegendDirection.Size = New System.Drawing.Size(137, 21) @@ -621,14 +512,14 @@ Partial Class sdgThemes Me.urChkLegendBoxJust.Checked = False Me.urChkLegendBoxJust.Location = New System.Drawing.Point(6, 73) Me.urChkLegendBoxJust.Name = "urChkLegendBoxJust" - Me.urChkLegendBoxJust.Size = New System.Drawing.Size(108, 20) + Me.urChkLegendBoxJust.Size = New System.Drawing.Size(122, 20) Me.urChkLegendBoxJust.TabIndex = 103 ' 'ucrInputLegendBoxJust ' Me.ucrInputLegendBoxJust.AddQuotesIfUnrecognised = True Me.ucrInputLegendBoxJust.IsReadOnly = False - Me.ucrInputLegendBoxJust.Location = New System.Drawing.Point(114, 71) + Me.ucrInputLegendBoxJust.Location = New System.Drawing.Point(130, 71) Me.ucrInputLegendBoxJust.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) Me.ucrInputLegendBoxJust.Name = "ucrInputLegendBoxJust" Me.ucrInputLegendBoxJust.Size = New System.Drawing.Size(137, 21) @@ -646,19 +537,45 @@ Partial Class sdgThemes Me.grpLegendBackGroundAndKey.TabStop = False Me.grpLegendBackGroundAndKey.Text = "Legend Background and Key" ' - 'ucrLegendBoxBackground + 'ucrBaseSubdialogue ' - Me.ucrLegendBoxBackground.Location = New System.Drawing.Point(260, 19) - Me.ucrLegendBoxBackground.Name = "ucrLegendBoxBackground" - Me.ucrLegendBoxBackground.Size = New System.Drawing.Size(253, 155) - Me.ucrLegendBoxBackground.TabIndex = 2 + Me.ucrBaseSubdialogue.Location = New System.Drawing.Point(349, 595) + Me.ucrBaseSubdialogue.Name = "ucrBaseSubdialogue" + Me.ucrBaseSubdialogue.Size = New System.Drawing.Size(142, 30) + Me.ucrBaseSubdialogue.TabIndex = 0 ' - 'ucrLegendBackground + 'grpPAnelGrid ' - Me.ucrLegendBackground.Location = New System.Drawing.Point(11, 19) - Me.ucrLegendBackground.Name = "ucrLegendBackground" - Me.ucrLegendBackground.Size = New System.Drawing.Size(253, 155) - Me.ucrLegendBackground.TabIndex = 0 + Me.grpPAnelGrid.Controls.Add(Me.ucrPanelGridMinor) + Me.grpPAnelGrid.Controls.Add(Me.ucrPanelGridMajor) + Me.grpPAnelGrid.Controls.Add(Me.ucrPanelGrid) + Me.grpPAnelGrid.Location = New System.Drawing.Point(4, 12) + Me.grpPAnelGrid.Name = "grpPAnelGrid" + Me.grpPAnelGrid.Size = New System.Drawing.Size(786, 139) + Me.grpPAnelGrid.TabIndex = 67 + Me.grpPAnelGrid.TabStop = False + Me.grpPAnelGrid.Text = "Panel Grid" + ' + 'ucrPanelGrid + ' + Me.ucrPanelGrid.Location = New System.Drawing.Point(4, 12) + Me.ucrPanelGrid.Name = "ucrPanelGrid" + Me.ucrPanelGrid.Size = New System.Drawing.Size(254, 124) + Me.ucrPanelGrid.TabIndex = 63 + ' + 'ucrPanelGridMajor + ' + Me.ucrPanelGridMajor.Location = New System.Drawing.Point(264, 12) + Me.ucrPanelGridMajor.Name = "ucrPanelGridMajor" + Me.ucrPanelGridMajor.Size = New System.Drawing.Size(254, 124) + Me.ucrPanelGridMajor.TabIndex = 64 + ' + 'ucrPanelGridMinor + ' + Me.ucrPanelGridMinor.Location = New System.Drawing.Point(524, 12) + Me.ucrPanelGridMinor.Name = "ucrPanelGridMinor" + Me.ucrPanelGridMinor.Size = New System.Drawing.Size(254, 124) + Me.ucrPanelGridMinor.TabIndex = 65 ' 'ucrLegendKey ' @@ -667,12 +584,212 @@ Partial Class sdgThemes Me.ucrLegendKey.Size = New System.Drawing.Size(253, 155) Me.ucrLegendKey.TabIndex = 1 ' - 'ucrBaseSubdialogue + 'ucrLegendBackground ' - Me.ucrBaseSubdialogue.Location = New System.Drawing.Point(349, 595) - Me.ucrBaseSubdialogue.Name = "ucrBaseSubdialogue" - Me.ucrBaseSubdialogue.Size = New System.Drawing.Size(142, 30) - Me.ucrBaseSubdialogue.TabIndex = 0 + Me.ucrLegendBackground.Location = New System.Drawing.Point(11, 19) + Me.ucrLegendBackground.Name = "ucrLegendBackground" + Me.ucrLegendBackground.Size = New System.Drawing.Size(253, 155) + Me.ucrLegendBackground.TabIndex = 0 + ' + 'ucrLegendBoxBackground + ' + Me.ucrLegendBoxBackground.Location = New System.Drawing.Point(260, 19) + Me.ucrLegendBoxBackground.Name = "ucrLegendBoxBackground" + Me.ucrLegendBoxBackground.Size = New System.Drawing.Size(253, 155) + Me.ucrLegendBoxBackground.TabIndex = 2 + ' + 'grpBorderAndBackground + ' + Me.grpBorderAndBackground.Controls.Add(Me.ucrPanelBackGround) + Me.grpBorderAndBackground.Controls.Add(Me.ucrPanelBorder) + Me.grpBorderAndBackground.Location = New System.Drawing.Point(3, 157) + Me.grpBorderAndBackground.Name = "grpBorderAndBackground" + Me.grpBorderAndBackground.Size = New System.Drawing.Size(519, 176) + Me.grpBorderAndBackground.TabIndex = 68 + Me.grpBorderAndBackground.TabStop = False + Me.grpBorderAndBackground.Text = "Panel Border and Background " + ' + 'ucrPanelBackGround + ' + Me.ucrPanelBackGround.Location = New System.Drawing.Point(260, 19) + Me.ucrPanelBackGround.Name = "ucrPanelBackGround" + Me.ucrPanelBackGround.Size = New System.Drawing.Size(253, 155) + Me.ucrPanelBackGround.TabIndex = 2 + ' + 'ucrPanelBorder + ' + Me.ucrPanelBorder.Location = New System.Drawing.Point(11, 19) + Me.ucrPanelBorder.Name = "ucrPanelBorder" + Me.ucrPanelBorder.Size = New System.Drawing.Size(253, 155) + Me.ucrPanelBorder.TabIndex = 0 + ' + 'tbPLot + ' + Me.tbPLot.Controls.Add(Me.grpPlotBackground) + Me.tbPLot.Controls.Add(Me.grpPlotTitleAndCaption) + Me.tbPLot.Location = New System.Drawing.Point(4, 22) + Me.tbPLot.Name = "tbPLot" + Me.tbPLot.Padding = New System.Windows.Forms.Padding(3) + Me.tbPLot.Size = New System.Drawing.Size(816, 555) + Me.tbPLot.TabIndex = 7 + Me.tbPLot.Text = "Plot" + Me.tbPLot.UseVisualStyleBackColor = True + ' + 'ucrThemeAxesTitle + ' + Me.ucrThemeAxesTitle.Location = New System.Drawing.Point(7, 13) + Me.ucrThemeAxesTitle.Name = "ucrThemeAxesTitle" + Me.ucrThemeAxesTitle.Size = New System.Drawing.Size(255, 228) + Me.ucrThemeAxesTitle.TabIndex = 59 + ' + 'GroupBox2 + ' + Me.GroupBox2.Location = New System.Drawing.Point(7, 372) + Me.GroupBox2.Name = "GroupBox2" + Me.GroupBox2.Size = New System.Drawing.Size(264, 149) + Me.GroupBox2.TabIndex = 61 + Me.GroupBox2.TabStop = False + ' + 'ucrInputTickUnits + ' + Me.ucrInputTickUnits.AddQuotesIfUnrecognised = True + Me.ucrInputTickUnits.IsReadOnly = False + Me.ucrInputTickUnits.Location = New System.Drawing.Point(114, 52) + Me.ucrInputTickUnits.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) + Me.ucrInputTickUnits.Name = "ucrInputTickUnits" + Me.ucrInputTickUnits.Size = New System.Drawing.Size(137, 21) + Me.ucrInputTickUnits.TabIndex = 60 + ' + 'ucrChkUnits + ' + Me.ucrChkUnits.Checked = False + Me.ucrChkUnits.Location = New System.Drawing.Point(14, 20) + Me.ucrChkUnits.Name = "ucrChkUnits" + Me.ucrChkUnits.Size = New System.Drawing.Size(100, 20) + Me.ucrChkUnits.TabIndex = 61 + ' + 'ucrInputUnits + ' + Me.ucrInputUnits.AddQuotesIfUnrecognised = True + Me.ucrInputUnits.IsMultiline = False + Me.ucrInputUnits.IsReadOnly = False + Me.ucrInputUnits.Location = New System.Drawing.Point(114, 20) + Me.ucrInputUnits.Name = "ucrInputUnits" + Me.ucrInputUnits.Size = New System.Drawing.Size(50, 23) + Me.ucrInputUnits.TabIndex = 62 + ' + 'ucrInputMarginUnits + ' + Me.ucrInputMarginUnits.AddQuotesIfUnrecognised = True + Me.ucrInputMarginUnits.IsReadOnly = False + Me.ucrInputMarginUnits.Location = New System.Drawing.Point(114, 114) + Me.ucrInputMarginUnits.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) + Me.ucrInputMarginUnits.Name = "ucrInputMarginUnits" + Me.ucrInputMarginUnits.Size = New System.Drawing.Size(137, 21) + Me.ucrInputMarginUnits.TabIndex = 63 + ' + 'ucrChkMaigin + ' + Me.ucrChkMaigin.Checked = False + Me.ucrChkMaigin.Location = New System.Drawing.Point(14, 82) + Me.ucrChkMaigin.Name = "ucrChkMaigin" + Me.ucrChkMaigin.Size = New System.Drawing.Size(100, 20) + Me.ucrChkMaigin.TabIndex = 64 + ' + 'ucrInputMargin + ' + Me.ucrInputMargin.AddQuotesIfUnrecognised = True + Me.ucrInputMargin.IsMultiline = False + Me.ucrInputMargin.IsReadOnly = False + Me.ucrInputMargin.Location = New System.Drawing.Point(114, 82) + Me.ucrInputMargin.Name = "ucrInputMargin" + Me.ucrInputMargin.Size = New System.Drawing.Size(50, 23) + Me.ucrInputMargin.TabIndex = 65 + ' + 'ucrTickMarksAxes + ' + Me.ucrTickMarksAxes.Location = New System.Drawing.Point(4, 244) + Me.ucrTickMarksAxes.Name = "ucrTickMarksAxes" + Me.ucrTickMarksAxes.Size = New System.Drawing.Size(257, 122) + Me.ucrTickMarksAxes.TabIndex = 62 + ' + 'ucrThemeAxesTickLabels + ' + Me.ucrThemeAxesTickLabels.Location = New System.Drawing.Point(268, 13) + Me.ucrThemeAxesTickLabels.Name = "ucrThemeAxesTickLabels" + Me.ucrThemeAxesTickLabels.Size = New System.Drawing.Size(255, 228) + Me.ucrThemeAxesTickLabels.TabIndex = 63 + ' + 'ucrThemeAxesLines + ' + Me.ucrThemeAxesLines.Location = New System.Drawing.Point(271, 246) + Me.ucrThemeAxesLines.Name = "ucrThemeAxesLines" + Me.ucrThemeAxesLines.Size = New System.Drawing.Size(257, 122) + Me.ucrThemeAxesLines.TabIndex = 64 + ' + 'tbXYAxes + ' + Me.tbXYAxes.Controls.Add(Me.ucrThemeAxesLines) + Me.tbXYAxes.Controls.Add(Me.ucrThemeAxesTickLabels) + Me.tbXYAxes.Controls.Add(Me.ucrTickMarksAxes) + Me.tbXYAxes.Controls.Add(Me.GroupBox2) + Me.tbXYAxes.Controls.Add(Me.ucrThemeAxesTitle) + Me.tbXYAxes.Location = New System.Drawing.Point(4, 22) + Me.tbXYAxes.Name = "tbXYAxes" + Me.tbXYAxes.Size = New System.Drawing.Size(816, 555) + Me.tbXYAxes.TabIndex = 6 + Me.tbXYAxes.Text = "XY-Axes" + Me.tbXYAxes.UseVisualStyleBackColor = True + ' + 'grpPlotTitleAndCaption + ' + Me.grpPlotTitleAndCaption.Controls.Add(Me.ucrPlotCaption) + Me.grpPlotTitleAndCaption.Controls.Add(Me.ucrPlotSubTitle) + Me.grpPlotTitleAndCaption.Controls.Add(Me.ucrPlotTitle) + Me.grpPlotTitleAndCaption.Location = New System.Drawing.Point(6, 6) + Me.grpPlotTitleAndCaption.Name = "grpPlotTitleAndCaption" + Me.grpPlotTitleAndCaption.Size = New System.Drawing.Size(804, 244) + Me.grpPlotTitleAndCaption.TabIndex = 102 + Me.grpPlotTitleAndCaption.TabStop = False + Me.grpPlotTitleAndCaption.Text = "PLot Title and Caption" + ' + 'ucrPlotSubTitle + ' + Me.ucrPlotSubTitle.Location = New System.Drawing.Point(275, 12) + Me.ucrPlotSubTitle.Name = "ucrPlotSubTitle" + Me.ucrPlotSubTitle.Size = New System.Drawing.Size(255, 224) + Me.ucrPlotSubTitle.TabIndex = 65 + ' + 'ucrPlotTitle + ' + Me.ucrPlotTitle.Location = New System.Drawing.Point(14, 12) + Me.ucrPlotTitle.Name = "ucrPlotTitle" + Me.ucrPlotTitle.Size = New System.Drawing.Size(255, 224) + Me.ucrPlotTitle.TabIndex = 64 + ' + 'ucrPlotCaption + ' + Me.ucrPlotCaption.Location = New System.Drawing.Point(536, 12) + Me.ucrPlotCaption.Name = "ucrPlotCaption" + Me.ucrPlotCaption.Size = New System.Drawing.Size(255, 224) + Me.ucrPlotCaption.TabIndex = 66 + ' + 'grpPlotBackground + ' + Me.grpPlotBackground.Controls.Add(Me.ucrPlotBackGround) + Me.grpPlotBackground.Location = New System.Drawing.Point(6, 256) + Me.grpPlotBackground.Name = "grpPlotBackground" + Me.grpPlotBackground.Size = New System.Drawing.Size(269, 176) + Me.grpPlotBackground.TabIndex = 103 + Me.grpPlotBackground.TabStop = False + Me.grpPlotBackground.Text = "Plot Background " + ' + 'ucrPlotBackGround + ' + Me.ucrPlotBackGround.Location = New System.Drawing.Point(11, 19) + Me.ucrPlotBackGround.Name = "ucrPlotBackGround" + Me.ucrPlotBackGround.Size = New System.Drawing.Size(253, 155) + Me.ucrPlotBackGround.TabIndex = 0 ' 'sdgThemes ' @@ -687,6 +804,7 @@ Partial Class sdgThemes Me.Name = "sdgThemes" Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen Me.Text = "Themes" + Me.tbThemePanelAndBackground.ResumeLayout(False) Me.tbThemeYaxis.ResumeLayout(False) Me.GroupBox1.ResumeLayout(False) Me.grpYAxisTitle.ResumeLayout(False) @@ -699,12 +817,16 @@ Partial Class sdgThemes Me.grpXAxisLines.ResumeLayout(False) Me.GroupBox5.ResumeLayout(False) Me.tbLegend.ResumeLayout(False) - Me.tbTitle.ResumeLayout(False) - Me.GroupBox2.ResumeLayout(False) Me.tbThemeLegend.ResumeLayout(False) Me.grpLegendTitleAndText.ResumeLayout(False) Me.grpLegendAdjustments.ResumeLayout(False) Me.grpLegendBackGroundAndKey.ResumeLayout(False) + Me.grpPAnelGrid.ResumeLayout(False) + Me.grpBorderAndBackground.ResumeLayout(False) + Me.tbPLot.ResumeLayout(False) + Me.tbXYAxes.ResumeLayout(False) + Me.grpPlotTitleAndCaption.ResumeLayout(False) + Me.grpPlotBackground.ResumeLayout(False) Me.ResumeLayout(False) End Sub @@ -716,10 +838,7 @@ Partial Class sdgThemes Friend WithEvents tbThemeXAxis As TabPage Friend WithEvents grpTableOptions As GroupBox Friend WithEvents tbLegend As TabControl - Friend WithEvents tbTitle As TabPage - Friend WithEvents ucrThemeAxesTitle As ucrELementTextControl Friend WithEvents grpTickMarkers As GroupBox - Friend WithEvents ucrTickMarks As ucrElementLineControl Friend WithEvents ucrTickMarksYAxis As ucrElementLineControl Friend WithEvents grpTickMarkLabelsYAxis As GroupBox Friend WithEvents ucrThemeYRightAxis As ucrELementTextControl @@ -728,7 +847,6 @@ Partial Class sdgThemes Friend WithEvents ucrThemeTitleYRightAxis As ucrELementTextControl Friend WithEvents ucrThemeTitleYAxis As ucrELementTextControl Friend WithEvents GroupBox1 As GroupBox - Friend WithEvents UcrTickMarksAndLabels1 As ucrElementLineControl Friend WithEvents ucrYAxisLines As ucrElementLineControl Friend WithEvents grpXAxisLines As GroupBox Friend WithEvents UcrTickMarksAndLabels3 As ucrElementLineControl @@ -742,21 +860,8 @@ Partial Class sdgThemes Friend WithEvents grpTickMarkLabelsXAxis As GroupBox Friend WithEvents ucrThemeBottomXAxis As ucrELementTextControl Friend WithEvents ucrThemeTopXAxis As ucrELementTextControl - Friend WithEvents ucrTickMarksAxes As ucrElementLineControl - Friend WithEvents GroupBox2 As GroupBox - Friend WithEvents ucrInputMargin As ucrInputTextBox - Friend WithEvents ucrChkMaigin As ucrCheck - Friend WithEvents ucrInputMarginUnits As ucrInputComboBox - Friend WithEvents ucrInputUnits As ucrInputTextBox - Friend WithEvents ucrChkUnits As ucrCheck - Friend WithEvents ucrInputTickUnits As ucrInputComboBox - Friend WithEvents ucrThemeAxesTickLabels As ucrELementTextControl - Friend WithEvents ucrThemeAxesLines As ucrElementLineControl Friend WithEvents tbThemeLegend As TabPage Friend WithEvents grpLegendBackGroundAndKey As GroupBox - Friend WithEvents ucrLegendBoxBackground As ucrElementRectControl - Friend WithEvents ucrLegendBackground As ucrElementRectControl - Friend WithEvents ucrLegendKey As ucrElementRectControl Friend WithEvents grpLegendAdjustments As GroupBox Friend WithEvents ucrChkLegendJustification As ucrCheck Friend WithEvents ucrInputLegendJustification As ucrInputComboBox @@ -771,4 +876,33 @@ Partial Class sdgThemes Friend WithEvents grpLegendTitleAndText As GroupBox Friend WithEvents ucrLegendText As ucrELementTextControl Friend WithEvents ucrLegendTitle As ucrELementTextControl + Friend WithEvents grpPAnelGrid As GroupBox + Friend WithEvents ucrPanelGridMinor As ucrElementLineControl + Friend WithEvents ucrPanelGridMajor As ucrElementLineControl + Friend WithEvents ucrPanelGrid As ucrElementLineControl + Friend WithEvents ucrLegendBoxBackground As ucrElementRectControl + Friend WithEvents ucrLegendBackground As ucrElementRectControl + Friend WithEvents ucrLegendKey As ucrElementRectControl + Friend WithEvents grpBorderAndBackground As GroupBox + Friend WithEvents ucrPanelBackGround As ucrElementRectControl + Friend WithEvents ucrPanelBorder As ucrElementRectControl + Friend WithEvents tbPLot As TabPage + Friend WithEvents ucrThemeAxesTitle As ucrELementTextControl + Friend WithEvents GroupBox2 As GroupBox + Friend WithEvents ucrInputTickUnits As ucrInputComboBox + Friend WithEvents ucrChkUnits As ucrCheck + Friend WithEvents ucrInputUnits As ucrInputTextBox + Friend WithEvents ucrInputMarginUnits As ucrInputComboBox + Friend WithEvents ucrChkMaigin As ucrCheck + Friend WithEvents ucrInputMargin As ucrInputTextBox + Friend WithEvents ucrTickMarksAxes As ucrElementLineControl + Friend WithEvents ucrThemeAxesTickLabels As ucrELementTextControl + Friend WithEvents ucrThemeAxesLines As ucrElementLineControl + Friend WithEvents tbXYAxes As TabPage + Friend WithEvents grpPlotTitleAndCaption As GroupBox + Friend WithEvents ucrPlotCaption As ucrELementTextControl + Friend WithEvents ucrPlotSubTitle As ucrELementTextControl + Friend WithEvents ucrPlotTitle As ucrELementTextControl + Friend WithEvents grpPlotBackground As GroupBox + Friend WithEvents ucrPlotBackGround As ucrElementRectControl End Class diff --git a/instat/sdgThemes.vb b/instat/sdgThemes.vb index 315be73b5b9..d90e19d8469 100644 --- a/instat/sdgThemes.vb +++ b/instat/sdgThemes.vb @@ -20,6 +20,18 @@ Public Class sdgThemes Public bControlsInitialised As Boolean = False Private clsElementLine, clsElementRect, clsElementXAxisTextTop, clsElementXAxisLine, clsElementYAxisLine, clsElementText, clsElementYAxisTextRight, clsElementXAxisLineTop, clsThemeFunction As New RFunction + Private Sub GroupBox4_Enter(sender As Object, e As EventArgs) Handles grpBorderAndBackground.Enter + + End Sub + + Private Sub ucrPanelGrid_Load(sender As Object, e As EventArgs) Handles ucrPanelGrid.Load + + End Sub + + Private Sub UcrELementTextControl3_Load(sender As Object, e As EventArgs) Handles ucrPlotCaption.Load + + End Sub + Private clsBaseOperator As New ROperator Private dctThemeFunctions As New Dictionary(Of String, RFunction) @@ -76,14 +88,14 @@ Public Class sdgThemes ucrInputLegendPosition.SetItems(dctLegendPosition) ucrInputLegendPosition.SetRDefault(Chr(34) & "none" & Chr(34)) - ucrChkLegendBox.SetText("Multiple Legend Arrangement") + ucrChkLegendBox.SetText("Legend Layout") ucrInputLegendBox.SetParameter(New RParameter("legend.box")) dctLegendBox.Add("Vertical", Chr(34) & "vertical" & Chr(34)) dctLegendBox.Add("Horizontal", Chr(34) & "horizontal" & Chr(34)) ucrInputLegendBox.SetItems(dctLegendBox) ucrInputLegendBox.SetRDefault(Chr(34) & "vertical" & Chr(34)) - urChkLegendBoxJust.SetText("Justification of Legend Box") + urChkLegendBoxJust.SetText("Justify Legend Box") ucrInputLegendBoxJust.SetParameter(New RParameter("legend.box.just")) dctLegendBoxJust.Add("Top", Chr(34) & "top" & Chr(34)) dctLegendBoxJust.Add("Bottom", Chr(34) & "bottom" & Chr(34)) @@ -226,35 +238,35 @@ Public Class sdgThemes End Sub Private Sub AddRemoveElementParameters() - 'If ucrChkLegendBox.Checked Then - ' clsThemeFunction.AddParameter("legend.box") - 'Else - ' clsThemeFunction.RemoveParameterByName("legend.box") - 'End If - - 'If ucrChkLegendDirection.Checked Then - ' clsThemeFunction.AddParameter("legend.direction") - 'Else - ' clsThemeFunction.RemoveParameterByName("legend.direction") - 'End If - - 'If ucrChkLegendJustification.Checked Then - ' clsThemeFunction.AddParameter("legend.justification") - 'Else - ' clsThemeFunction.RemoveParameterByName("legend.justification") - 'End If - - 'If urChkLegendBoxJust.Checked Then - ' clsThemeFunction.AddParameter("legend.box.just") - 'Else - ' clsThemeFunction.RemoveParameterByName("legend.box.just") - 'End If - - 'If urChkLegendPosition.Checked Then - ' clsThemeFunction.AddParameter("legend.position") - 'Else - ' clsThemeFunction.RemoveParameterByName("legend.position") - 'End If + If ucrChkLegendBox.Checked Then + clsThemeFunction.AddParameter("legend.box") + Else + clsThemeFunction.RemoveParameterByName("legend.box") + End If + + If ucrChkLegendDirection.Checked Then + clsThemeFunction.AddParameter("legend.direction") + Else + clsThemeFunction.RemoveParameterByName("legend.direction") + End If + + If ucrChkLegendJustification.Checked Then + clsThemeFunction.AddParameter("legend.justification") + Else + clsThemeFunction.RemoveParameterByName("legend.justification") + End If + + If urChkLegendBoxJust.Checked Then + clsThemeFunction.AddParameter("legend.box.just") + Else + clsThemeFunction.RemoveParameterByName("legend.box.just") + End If + + If urChkLegendPosition.Checked Then + clsThemeFunction.AddParameter("legend.position") + Else + clsThemeFunction.RemoveParameterByName("legend.position") + End If AddRemoveTheme() End Sub diff --git a/instat/ucrElementRectControl.vb b/instat/ucrElementRectControl.vb index 52e12d37ce6..8e565853499 100644 --- a/instat/ucrElementRectControl.vb +++ b/instat/ucrElementRectControl.vb @@ -38,7 +38,7 @@ Public Class ucrElementRectControl ucrLegendColors.AddQuotesIfUnrecognised = False ucrLegendColors.SetRDefault(Chr(34) & "black" & Chr(34)) - ucrChkLegendFill.SetText("Colour") + ucrChkLegendFill.SetText("Fill") ucrLegendFill.SetParameter(New RParameter("fill")) ucrLegendFill.SetItems(New Dictionary(Of String, String)(GgplotDefaults.dctColour)) ucrLegendFill.AddQuotesIfUnrecognised = False From d18c5359367a354e7659fe1ce1f3a7356c4272bc Mon Sep 17 00:00:00 2001 From: Steven Date: Thu, 8 Jun 2017 10:57:26 +0300 Subject: [PATCH 120/154] Linkingpanel grid to the ucrElementine and text --- instat/sdgThemes.vb | 47 ++++++++++++++++++++++++++++++++------------- 1 file changed, 34 insertions(+), 13 deletions(-) diff --git a/instat/sdgThemes.vb b/instat/sdgThemes.vb index d90e19d8469..4ee4f660aa0 100644 --- a/instat/sdgThemes.vb +++ b/instat/sdgThemes.vb @@ -20,18 +20,6 @@ Public Class sdgThemes Public bControlsInitialised As Boolean = False Private clsElementLine, clsElementRect, clsElementXAxisTextTop, clsElementXAxisLine, clsElementYAxisLine, clsElementText, clsElementYAxisTextRight, clsElementXAxisLineTop, clsThemeFunction As New RFunction - Private Sub GroupBox4_Enter(sender As Object, e As EventArgs) Handles grpBorderAndBackground.Enter - - End Sub - - Private Sub ucrPanelGrid_Load(sender As Object, e As EventArgs) Handles ucrPanelGrid.Load - - End Sub - - Private Sub UcrELementTextControl3_Load(sender As Object, e As EventArgs) Handles ucrPlotCaption.Load - - End Sub - Private clsBaseOperator As New ROperator Private dctThemeFunctions As New Dictionary(Of String, RFunction) @@ -70,6 +58,17 @@ Public Class sdgThemes ucrLegendKey.setlabel("Background underneath legend keys") ucrLegendBoxBackground.setlabel("Background of legend area") + ucrPanelGrid.setlabel("Grid lines") + ucrPanelGridMajor.setlabel("Major grid lines ") + ucrPanelGridMinor.setlabel("Major grid lines ") + ucrPanelBorder.setlabel("Panel border") + ucrPanelBackGround.setlabel("Panel background") + + ucrPlotBackGround.setlabel("") + ucrPlotCaption.setlabel("") + ucrPlotSubTitle.setlabel("") + ucrPlotTitle.setlabel("") + 'Units ucrChkUnits.SetText("Tick length") ucrInputTickUnits.SetParameter(New RParameter("units")) @@ -158,6 +157,13 @@ Public Class sdgThemes Dim clsElementLegendBoxBackground As New RFunction Dim clsElementLegendtKey As New RFunction + Dim clsElementBorder As New RFunction + Dim clsElementPanelBackGround As New RFunction + + Dim clsElementPanelGrid As New RFunction + Dim clsElementPanelGridMajor As New RFunction + Dim clsElementPanelGridMinor As New RFunction + If Not bControlsInitialised Then InitialiseControls() End If @@ -188,11 +194,15 @@ Public Class sdgThemes dctThemeFunctions.TryGetValue("axis.ticks", clsElementTickAxes) dctThemeFunctions.TryGetValue("axis.line", clsElementLineAxes) + dctThemeFunctions.TryGetValue("Panel.grid", clsElementPanelGrid) + dctThemeFunctions.TryGetValue("Panel.grid.major", clsElementPanelGridMajor) + dctThemeFunctions.TryGetValue("Panel.grid.minor", clsElementPanelGridMinor) dctThemeFunctions.TryGetValue("legend.background", clsElementLegendBackground) dctThemeFunctions.TryGetValue("legend.box.background", clsElementLegendBoxBackground) dctThemeFunctions.TryGetValue("legend.key", clsElementLegendtKey) - ' dctThemeFunctions.TryGetValue("legend.background", clsElementLineAxes) + dctThemeFunctions.TryGetValue("Panel.background", clsElementPanelBackGround) + dctThemeFunctions.TryGetValue("Panel.border", clsElementBorder) ucrTickMarksXAxis.SetRCodeForControl("axis.ticks.x", clsXElementLine, clsNewThemeFunction:=clsThemeFunction, clsNewBaseOperator:=clsBaseOperator, bReset:=bReset) ucrTickMarksYAxis.SetRCodeForControl("axis.ticks.y", clsYElementLine, clsNewThemeFunction:=clsThemeFunction, clsNewBaseOperator:=clsBaseOperator, bReset:=bReset) @@ -219,6 +229,17 @@ Public Class sdgThemes ucrLegendBoxBackground.SetRCodeForControl("legend.box.background", clsElementLegendBoxBackground, clsNewThemeFunction:=clsThemeFunction, clsNewBaseOperator:=clsBaseOperator, bReset:=bReset) ucrLegendKey.SetRCodeForControl("legend.key", clsElementLegendtKey, clsNewThemeFunction:=clsThemeFunction, clsNewBaseOperator:=clsBaseOperator, bReset:=bReset) + ucrPanelGrid.SetRCodeForControl("Panel.grid", clsElementPanelGrid, clsNewThemeFunction:=clsThemeFunction, clsNewBaseOperator:=clsBaseOperator, bReset:=bReset) + ucrPanelGridMajor.SetRCodeForControl("Panel.grid.major", clsElementPanelGridMajor, clsNewThemeFunction:=clsThemeFunction, clsNewBaseOperator:=clsBaseOperator, bReset:=bReset) + ucrPanelGridMinor.SetRCodeForControl("Panel.grid.minor", clsElementPanelGridMinor, clsNewThemeFunction:=clsThemeFunction, clsNewBaseOperator:=clsBaseOperator, bReset:=bReset) + ucrPanelBorder.SetRCodeForControl("Panel.background", clsElementPanelBackGround, clsNewThemeFunction:=clsThemeFunction, clsNewBaseOperator:=clsBaseOperator, bReset:=bReset) + ucrPanelBackGround.SetRCodeForControl("Panel.border", clsElementBorder, clsNewThemeFunction:=clsThemeFunction, clsNewBaseOperator:=clsBaseOperator, bReset:=bReset) + + ucrPlotBackGround.SetRCodeForControl("Panel.border", clsElementBorder, clsNewThemeFunction:=clsThemeFunction, clsNewBaseOperator:=clsBaseOperator, bReset:=bReset) + ucrPlotCaption.SetRCodeForControl("Panel.border", clsElementBorder, clsNewThemeFunction:=clsThemeFunction, clsNewBaseOperator:=clsBaseOperator, bReset:=bReset) + ucrPlotSubTitle.SetRCodeForControl("Panel.border", clsElementBorder, clsNewThemeFunction:=clsThemeFunction, clsNewBaseOperator:=clsBaseOperator, bReset:=bReset) + ucrPlotTitle.SetRCodeForControl("Panel.border", clsElementBorder, clsNewThemeFunction:=clsThemeFunction, clsNewBaseOperator:=clsBaseOperator, bReset:=bReset) + urChkLegendPosition.SetRCode(clsThemeFunction, bReset) ucrInputLegendPosition.SetRCode(clsThemeFunction, bReset) From 898a0af781b0e6395714fec85434753b55a94514 Mon Sep 17 00:00:00 2001 From: Steven Date: Thu, 8 Jun 2017 11:43:49 +0300 Subject: [PATCH 121/154] Minor edits --- instat/clsGgplotDefaults.vb | 28 +- instat/sdgThemes.Designer.vb | 444 +++++++++++------------ instat/sdgThemes.vb | 47 ++- instat/ucrElementRectControl.Designer.vb | 44 +-- instat/ucrElementRectControl.vb | 10 - 5 files changed, 275 insertions(+), 298 deletions(-) diff --git a/instat/clsGgplotDefaults.vb b/instat/clsGgplotDefaults.vb index e361330bc53..f263f9b401b 100644 --- a/instat/clsGgplotDefaults.vb +++ b/instat/clsGgplotDefaults.vb @@ -141,19 +141,19 @@ 'dctTemp.Add("legend.box.just", clsElementText.Clone()) 'dctTemp.Add("legend.box.margin", clsElementText.Clone()) dctTemp.Add("legend.box.background", clsElementRect.Clone()) - 'dctTemp.Add(" legend.box.spacing", clsElementText.Clone()) - dctTemp.Add("Panel.background", clsElementRect.Clone()) - dctTemp.Add("Panel.border", clsElementRect.Clone()) - 'dctTemp.Add("Panel.spacing", clsElementText.Clone()) - ' dctTemp.Add(" Panel.spacing.x", clsElementText.Clone()) - 'dctTemp.Add("Panel.spacing.y", clsElementText.Clone()) - dctTemp.Add("Panel.grid", clsElementLine.Clone()) - dctTemp.Add("Panel.grid.major", clsElementLine.Clone()) - dctTemp.Add(" Panel.grid.minor", clsElementLine.Clone()) - dctTemp.Add("Panel.grid.major.x", clsElementLine.Clone()) - dctTemp.Add("Panel.grid.major.y", clsElementLine.Clone()) - dctTemp.Add("Panel.grid.minor.x", clsElementLine.Clone()) - dctTemp.Add("Panel.grid.minor.y", clsElementLine.Clone()) + 'dctTemp.Add("legend.box.spacing", clsElementText.Clone()) + dctTemp.Add("panel.background", clsElementRect.Clone()) + dctTemp.Add("panel.border", clsElementRect.Clone()) + 'dctTemp.Add("panel.spacing", clsElementText.Clone()) + ' dctTemp.Add("panel.spacing.x", clsElementText.Clone()) + 'dctTemp.Add("panel.spacing.y", clsElementText.Clone()) + dctTemp.Add("panel.grid", clsElementLine.Clone()) + dctTemp.Add("panel.grid.major", clsElementLine.Clone()) + dctTemp.Add("panel.grid.minor", clsElementLine.Clone()) + dctTemp.Add("panel.grid.major.x", clsElementLine.Clone()) + dctTemp.Add("panel.grid.major.y", clsElementLine.Clone()) + dctTemp.Add("panel.grid.minor.x", clsElementLine.Clone()) + dctTemp.Add("panel.grid.minor.y", clsElementLine.Clone()) 'dctTemp.Add("Panel.ontop", clsElementRect.Clone()) dctTemp.Add("plot.background", clsElementRect.Clone()) dctTemp.Add("plot.title", clsElementText.Clone()) @@ -163,7 +163,7 @@ dctTemp.Add("strip.background", clsElementRect.Clone()) ' dctTemp.Add("strip.placement", clsElementLine.Clone()) dctTemp.Add("strip.text", clsElementText.Clone()) - dctTemp.Add(" strip.text.x", clsElementText.Clone()) + dctTemp.Add("strip.text.x", clsElementText.Clone()) dctTemp.Add("strip.text.y", clsElementText.Clone()) 'dctTemp.Add("strip.switch.pad.grid", clsElementLine.Clone()) 'dctTemp.Add("strip.switch.pad.wrap", clsElementLine.Clone()) diff --git a/instat/sdgThemes.Designer.vb b/instat/sdgThemes.Designer.vb index 388214c84cf..162a8448e2d 100644 --- a/instat/sdgThemes.Designer.vb +++ b/instat/sdgThemes.Designer.vb @@ -24,6 +24,13 @@ Partial Class sdgThemes Private Sub InitializeComponent() Me.tbThemeFacets = New System.Windows.Forms.TabPage() Me.tbThemePanelAndBackground = New System.Windows.Forms.TabPage() + Me.grpBorderAndBackground = New System.Windows.Forms.GroupBox() + Me.ucrPanelBackGround = New instat.ucrElementRectControl() + Me.ucrPanelBorder = New instat.ucrElementRectControl() + Me.grpPAnelGrid = New System.Windows.Forms.GroupBox() + Me.ucrPanelGridMinor = New instat.ucrElementLineControl() + Me.ucrPanelGridMajor = New instat.ucrElementLineControl() + Me.ucrPanelGrid = New instat.ucrElementLineControl() Me.tbThemeYaxis = New System.Windows.Forms.TabPage() Me.GroupBox1 = New System.Windows.Forms.GroupBox() Me.ucrYAxisLines = New instat.ucrElementLineControl() @@ -50,6 +57,19 @@ Partial Class sdgThemes Me.UcrTickMarksAndLabels5 = New instat.ucrElementLineControl() Me.ucrTickMarksXAxis = New instat.ucrElementLineControl() Me.tbLegend = New System.Windows.Forms.TabControl() + Me.tbPLot = New System.Windows.Forms.TabPage() + Me.grpPlotBackground = New System.Windows.Forms.GroupBox() + Me.ucrPlotBackGround = New instat.ucrElementRectControl() + Me.grpPlotTitleAndCaption = New System.Windows.Forms.GroupBox() + Me.ucrPlotCaption = New instat.ucrELementTextControl() + Me.ucrPlotSubTitle = New instat.ucrELementTextControl() + Me.ucrPlotTitle = New instat.ucrELementTextControl() + Me.tbXYAxes = New System.Windows.Forms.TabPage() + Me.ucrThemeAxesLines = New instat.ucrElementLineControl() + Me.ucrThemeAxesTickLabels = New instat.ucrELementTextControl() + Me.ucrTickMarksAxes = New instat.ucrElementLineControl() + Me.GroupBox2 = New System.Windows.Forms.GroupBox() + Me.ucrThemeAxesTitle = New instat.ucrELementTextControl() Me.tbThemeLegend = New System.Windows.Forms.TabPage() Me.grpLegendTitleAndText = New System.Windows.Forms.GroupBox() Me.ucrLegendText = New instat.ucrELementTextControl() @@ -66,37 +86,19 @@ Partial Class sdgThemes Me.urChkLegendBoxJust = New instat.ucrCheck() Me.ucrInputLegendBoxJust = New instat.ucrInputComboBox() Me.grpLegendBackGroundAndKey = New System.Windows.Forms.GroupBox() - Me.ucrBaseSubdialogue = New instat.ucrButtonsSubdialogue() - Me.grpPAnelGrid = New System.Windows.Forms.GroupBox() - Me.ucrPanelGrid = New instat.ucrElementLineControl() - Me.ucrPanelGridMajor = New instat.ucrElementLineControl() - Me.ucrPanelGridMinor = New instat.ucrElementLineControl() - Me.ucrLegendKey = New instat.ucrElementRectControl() - Me.ucrLegendBackground = New instat.ucrElementRectControl() Me.ucrLegendBoxBackground = New instat.ucrElementRectControl() - Me.grpBorderAndBackground = New System.Windows.Forms.GroupBox() - Me.ucrPanelBackGround = New instat.ucrElementRectControl() - Me.ucrPanelBorder = New instat.ucrElementRectControl() - Me.tbPLot = New System.Windows.Forms.TabPage() - Me.ucrThemeAxesTitle = New instat.ucrELementTextControl() - Me.GroupBox2 = New System.Windows.Forms.GroupBox() + Me.ucrLegendBackground = New instat.ucrElementRectControl() + Me.ucrLegendKey = New instat.ucrElementRectControl() + Me.ucrBaseSubdialogue = New instat.ucrButtonsSubdialogue() Me.ucrInputTickUnits = New instat.ucrInputComboBox() Me.ucrChkUnits = New instat.ucrCheck() Me.ucrInputUnits = New instat.ucrInputTextBox() Me.ucrInputMarginUnits = New instat.ucrInputComboBox() Me.ucrChkMaigin = New instat.ucrCheck() Me.ucrInputMargin = New instat.ucrInputTextBox() - Me.ucrTickMarksAxes = New instat.ucrElementLineControl() - Me.ucrThemeAxesTickLabels = New instat.ucrELementTextControl() - Me.ucrThemeAxesLines = New instat.ucrElementLineControl() - Me.tbXYAxes = New System.Windows.Forms.TabPage() - Me.grpPlotTitleAndCaption = New System.Windows.Forms.GroupBox() - Me.ucrPlotSubTitle = New instat.ucrELementTextControl() - Me.ucrPlotTitle = New instat.ucrELementTextControl() - Me.ucrPlotCaption = New instat.ucrELementTextControl() - Me.grpPlotBackground = New System.Windows.Forms.GroupBox() - Me.ucrPlotBackGround = New instat.ucrElementRectControl() Me.tbThemePanelAndBackground.SuspendLayout() + Me.grpBorderAndBackground.SuspendLayout() + Me.grpPAnelGrid.SuspendLayout() Me.tbThemeYaxis.SuspendLayout() Me.GroupBox1.SuspendLayout() Me.grpYAxisTitle.SuspendLayout() @@ -109,16 +111,14 @@ Partial Class sdgThemes Me.grpXAxisLines.SuspendLayout() Me.GroupBox5.SuspendLayout() Me.tbLegend.SuspendLayout() + Me.tbPLot.SuspendLayout() + Me.grpPlotBackground.SuspendLayout() + Me.grpPlotTitleAndCaption.SuspendLayout() + Me.tbXYAxes.SuspendLayout() Me.tbThemeLegend.SuspendLayout() Me.grpLegendTitleAndText.SuspendLayout() Me.grpLegendAdjustments.SuspendLayout() Me.grpLegendBackGroundAndKey.SuspendLayout() - Me.grpPAnelGrid.SuspendLayout() - Me.grpBorderAndBackground.SuspendLayout() - Me.tbPLot.SuspendLayout() - Me.tbXYAxes.SuspendLayout() - Me.grpPlotTitleAndCaption.SuspendLayout() - Me.grpPlotBackground.SuspendLayout() Me.SuspendLayout() ' 'tbThemeFacets @@ -141,6 +141,64 @@ Partial Class sdgThemes Me.tbThemePanelAndBackground.Text = "Panel and Background " Me.tbThemePanelAndBackground.UseVisualStyleBackColor = True ' + 'grpBorderAndBackground + ' + Me.grpBorderAndBackground.Controls.Add(Me.ucrPanelBackGround) + Me.grpBorderAndBackground.Controls.Add(Me.ucrPanelBorder) + Me.grpBorderAndBackground.Location = New System.Drawing.Point(3, 157) + Me.grpBorderAndBackground.Name = "grpBorderAndBackground" + Me.grpBorderAndBackground.Size = New System.Drawing.Size(519, 151) + Me.grpBorderAndBackground.TabIndex = 68 + Me.grpBorderAndBackground.TabStop = False + Me.grpBorderAndBackground.Text = "Panel Border and Background " + ' + 'ucrPanelBackGround + ' + Me.ucrPanelBackGround.Location = New System.Drawing.Point(260, 19) + Me.ucrPanelBackGround.Name = "ucrPanelBackGround" + Me.ucrPanelBackGround.Size = New System.Drawing.Size(253, 132) + Me.ucrPanelBackGround.TabIndex = 2 + ' + 'ucrPanelBorder + ' + Me.ucrPanelBorder.Location = New System.Drawing.Point(11, 19) + Me.ucrPanelBorder.Name = "ucrPanelBorder" + Me.ucrPanelBorder.Size = New System.Drawing.Size(253, 132) + Me.ucrPanelBorder.TabIndex = 0 + ' + 'grpPAnelGrid + ' + Me.grpPAnelGrid.Controls.Add(Me.ucrPanelGridMinor) + Me.grpPAnelGrid.Controls.Add(Me.ucrPanelGridMajor) + Me.grpPAnelGrid.Controls.Add(Me.ucrPanelGrid) + Me.grpPAnelGrid.Location = New System.Drawing.Point(4, 12) + Me.grpPAnelGrid.Name = "grpPAnelGrid" + Me.grpPAnelGrid.Size = New System.Drawing.Size(786, 139) + Me.grpPAnelGrid.TabIndex = 67 + Me.grpPAnelGrid.TabStop = False + Me.grpPAnelGrid.Text = "Panel Grid" + ' + 'ucrPanelGridMinor + ' + Me.ucrPanelGridMinor.Location = New System.Drawing.Point(524, 12) + Me.ucrPanelGridMinor.Name = "ucrPanelGridMinor" + Me.ucrPanelGridMinor.Size = New System.Drawing.Size(254, 124) + Me.ucrPanelGridMinor.TabIndex = 65 + ' + 'ucrPanelGridMajor + ' + Me.ucrPanelGridMajor.Location = New System.Drawing.Point(264, 12) + Me.ucrPanelGridMajor.Name = "ucrPanelGridMajor" + Me.ucrPanelGridMajor.Size = New System.Drawing.Size(254, 124) + Me.ucrPanelGridMajor.TabIndex = 64 + ' + 'ucrPanelGrid + ' + Me.ucrPanelGrid.Location = New System.Drawing.Point(4, 12) + Me.ucrPanelGrid.Name = "ucrPanelGrid" + Me.ucrPanelGrid.Size = New System.Drawing.Size(254, 124) + Me.ucrPanelGrid.TabIndex = 63 + ' 'tbThemeYaxis ' Me.tbThemeYaxis.Controls.Add(Me.GroupBox1) @@ -378,6 +436,118 @@ Partial Class sdgThemes Me.tbLegend.Size = New System.Drawing.Size(824, 581) Me.tbLegend.TabIndex = 1 ' + 'tbPLot + ' + Me.tbPLot.Controls.Add(Me.grpPlotBackground) + Me.tbPLot.Controls.Add(Me.grpPlotTitleAndCaption) + Me.tbPLot.Location = New System.Drawing.Point(4, 22) + Me.tbPLot.Name = "tbPLot" + Me.tbPLot.Padding = New System.Windows.Forms.Padding(3) + Me.tbPLot.Size = New System.Drawing.Size(816, 555) + Me.tbPLot.TabIndex = 7 + Me.tbPLot.Text = "Plot" + Me.tbPLot.UseVisualStyleBackColor = True + ' + 'grpPlotBackground + ' + Me.grpPlotBackground.Controls.Add(Me.ucrPlotBackGround) + Me.grpPlotBackground.Location = New System.Drawing.Point(6, 256) + Me.grpPlotBackground.Name = "grpPlotBackground" + Me.grpPlotBackground.Size = New System.Drawing.Size(269, 148) + Me.grpPlotBackground.TabIndex = 103 + Me.grpPlotBackground.TabStop = False + Me.grpPlotBackground.Text = "Plot Background " + ' + 'ucrPlotBackGround + ' + Me.ucrPlotBackGround.Location = New System.Drawing.Point(11, 19) + Me.ucrPlotBackGround.Name = "ucrPlotBackGround" + Me.ucrPlotBackGround.Size = New System.Drawing.Size(253, 128) + Me.ucrPlotBackGround.TabIndex = 0 + ' + 'grpPlotTitleAndCaption + ' + Me.grpPlotTitleAndCaption.Controls.Add(Me.ucrPlotCaption) + Me.grpPlotTitleAndCaption.Controls.Add(Me.ucrPlotSubTitle) + Me.grpPlotTitleAndCaption.Controls.Add(Me.ucrPlotTitle) + Me.grpPlotTitleAndCaption.Location = New System.Drawing.Point(6, 6) + Me.grpPlotTitleAndCaption.Name = "grpPlotTitleAndCaption" + Me.grpPlotTitleAndCaption.Size = New System.Drawing.Size(804, 244) + Me.grpPlotTitleAndCaption.TabIndex = 102 + Me.grpPlotTitleAndCaption.TabStop = False + Me.grpPlotTitleAndCaption.Text = "PLot Title and Caption" + ' + 'ucrPlotCaption + ' + Me.ucrPlotCaption.Location = New System.Drawing.Point(536, 12) + Me.ucrPlotCaption.Name = "ucrPlotCaption" + Me.ucrPlotCaption.Size = New System.Drawing.Size(255, 224) + Me.ucrPlotCaption.TabIndex = 66 + ' + 'ucrPlotSubTitle + ' + Me.ucrPlotSubTitle.Location = New System.Drawing.Point(275, 12) + Me.ucrPlotSubTitle.Name = "ucrPlotSubTitle" + Me.ucrPlotSubTitle.Size = New System.Drawing.Size(255, 224) + Me.ucrPlotSubTitle.TabIndex = 65 + ' + 'ucrPlotTitle + ' + Me.ucrPlotTitle.Location = New System.Drawing.Point(14, 12) + Me.ucrPlotTitle.Name = "ucrPlotTitle" + Me.ucrPlotTitle.Size = New System.Drawing.Size(255, 224) + Me.ucrPlotTitle.TabIndex = 64 + ' + 'tbXYAxes + ' + Me.tbXYAxes.Controls.Add(Me.ucrThemeAxesLines) + Me.tbXYAxes.Controls.Add(Me.ucrThemeAxesTickLabels) + Me.tbXYAxes.Controls.Add(Me.ucrTickMarksAxes) + Me.tbXYAxes.Controls.Add(Me.GroupBox2) + Me.tbXYAxes.Controls.Add(Me.ucrThemeAxesTitle) + Me.tbXYAxes.Location = New System.Drawing.Point(4, 22) + Me.tbXYAxes.Name = "tbXYAxes" + Me.tbXYAxes.Size = New System.Drawing.Size(816, 555) + Me.tbXYAxes.TabIndex = 6 + Me.tbXYAxes.Text = "XY-Axes" + Me.tbXYAxes.UseVisualStyleBackColor = True + ' + 'ucrThemeAxesLines + ' + Me.ucrThemeAxesLines.Location = New System.Drawing.Point(271, 246) + Me.ucrThemeAxesLines.Name = "ucrThemeAxesLines" + Me.ucrThemeAxesLines.Size = New System.Drawing.Size(257, 122) + Me.ucrThemeAxesLines.TabIndex = 64 + ' + 'ucrThemeAxesTickLabels + ' + Me.ucrThemeAxesTickLabels.Location = New System.Drawing.Point(268, 13) + Me.ucrThemeAxesTickLabels.Name = "ucrThemeAxesTickLabels" + Me.ucrThemeAxesTickLabels.Size = New System.Drawing.Size(255, 228) + Me.ucrThemeAxesTickLabels.TabIndex = 63 + ' + 'ucrTickMarksAxes + ' + Me.ucrTickMarksAxes.Location = New System.Drawing.Point(4, 244) + Me.ucrTickMarksAxes.Name = "ucrTickMarksAxes" + Me.ucrTickMarksAxes.Size = New System.Drawing.Size(257, 122) + Me.ucrTickMarksAxes.TabIndex = 62 + ' + 'GroupBox2 + ' + Me.GroupBox2.Location = New System.Drawing.Point(7, 372) + Me.GroupBox2.Name = "GroupBox2" + Me.GroupBox2.Size = New System.Drawing.Size(264, 149) + Me.GroupBox2.TabIndex = 61 + Me.GroupBox2.TabStop = False + ' + 'ucrThemeAxesTitle + ' + Me.ucrThemeAxesTitle.Location = New System.Drawing.Point(7, 13) + Me.ucrThemeAxesTitle.Name = "ucrThemeAxesTitle" + Me.ucrThemeAxesTitle.Size = New System.Drawing.Size(255, 228) + Me.ucrThemeAxesTitle.TabIndex = 59 + ' 'tbThemeLegend ' Me.tbThemeLegend.Controls.Add(Me.grpLegendTitleAndText) @@ -532,123 +702,38 @@ Partial Class sdgThemes Me.grpLegendBackGroundAndKey.Controls.Add(Me.ucrLegendKey) Me.grpLegendBackGroundAndKey.Location = New System.Drawing.Point(6, 246) Me.grpLegendBackGroundAndKey.Name = "grpLegendBackGroundAndKey" - Me.grpLegendBackGroundAndKey.Size = New System.Drawing.Size(777, 176) + Me.grpLegendBackGroundAndKey.Size = New System.Drawing.Size(777, 150) Me.grpLegendBackGroundAndKey.TabIndex = 3 Me.grpLegendBackGroundAndKey.TabStop = False Me.grpLegendBackGroundAndKey.Text = "Legend Background and Key" ' - 'ucrBaseSubdialogue - ' - Me.ucrBaseSubdialogue.Location = New System.Drawing.Point(349, 595) - Me.ucrBaseSubdialogue.Name = "ucrBaseSubdialogue" - Me.ucrBaseSubdialogue.Size = New System.Drawing.Size(142, 30) - Me.ucrBaseSubdialogue.TabIndex = 0 - ' - 'grpPAnelGrid - ' - Me.grpPAnelGrid.Controls.Add(Me.ucrPanelGridMinor) - Me.grpPAnelGrid.Controls.Add(Me.ucrPanelGridMajor) - Me.grpPAnelGrid.Controls.Add(Me.ucrPanelGrid) - Me.grpPAnelGrid.Location = New System.Drawing.Point(4, 12) - Me.grpPAnelGrid.Name = "grpPAnelGrid" - Me.grpPAnelGrid.Size = New System.Drawing.Size(786, 139) - Me.grpPAnelGrid.TabIndex = 67 - Me.grpPAnelGrid.TabStop = False - Me.grpPAnelGrid.Text = "Panel Grid" - ' - 'ucrPanelGrid - ' - Me.ucrPanelGrid.Location = New System.Drawing.Point(4, 12) - Me.ucrPanelGrid.Name = "ucrPanelGrid" - Me.ucrPanelGrid.Size = New System.Drawing.Size(254, 124) - Me.ucrPanelGrid.TabIndex = 63 - ' - 'ucrPanelGridMajor - ' - Me.ucrPanelGridMajor.Location = New System.Drawing.Point(264, 12) - Me.ucrPanelGridMajor.Name = "ucrPanelGridMajor" - Me.ucrPanelGridMajor.Size = New System.Drawing.Size(254, 124) - Me.ucrPanelGridMajor.TabIndex = 64 - ' - 'ucrPanelGridMinor - ' - Me.ucrPanelGridMinor.Location = New System.Drawing.Point(524, 12) - Me.ucrPanelGridMinor.Name = "ucrPanelGridMinor" - Me.ucrPanelGridMinor.Size = New System.Drawing.Size(254, 124) - Me.ucrPanelGridMinor.TabIndex = 65 - ' - 'ucrLegendKey - ' - Me.ucrLegendKey.Location = New System.Drawing.Point(519, 19) - Me.ucrLegendKey.Name = "ucrLegendKey" - Me.ucrLegendKey.Size = New System.Drawing.Size(253, 155) - Me.ucrLegendKey.TabIndex = 1 - ' - 'ucrLegendBackground - ' - Me.ucrLegendBackground.Location = New System.Drawing.Point(11, 19) - Me.ucrLegendBackground.Name = "ucrLegendBackground" - Me.ucrLegendBackground.Size = New System.Drawing.Size(253, 155) - Me.ucrLegendBackground.TabIndex = 0 - ' 'ucrLegendBoxBackground ' Me.ucrLegendBoxBackground.Location = New System.Drawing.Point(260, 19) Me.ucrLegendBoxBackground.Name = "ucrLegendBoxBackground" - Me.ucrLegendBoxBackground.Size = New System.Drawing.Size(253, 155) + Me.ucrLegendBoxBackground.Size = New System.Drawing.Size(253, 130) Me.ucrLegendBoxBackground.TabIndex = 2 ' - 'grpBorderAndBackground - ' - Me.grpBorderAndBackground.Controls.Add(Me.ucrPanelBackGround) - Me.grpBorderAndBackground.Controls.Add(Me.ucrPanelBorder) - Me.grpBorderAndBackground.Location = New System.Drawing.Point(3, 157) - Me.grpBorderAndBackground.Name = "grpBorderAndBackground" - Me.grpBorderAndBackground.Size = New System.Drawing.Size(519, 176) - Me.grpBorderAndBackground.TabIndex = 68 - Me.grpBorderAndBackground.TabStop = False - Me.grpBorderAndBackground.Text = "Panel Border and Background " - ' - 'ucrPanelBackGround - ' - Me.ucrPanelBackGround.Location = New System.Drawing.Point(260, 19) - Me.ucrPanelBackGround.Name = "ucrPanelBackGround" - Me.ucrPanelBackGround.Size = New System.Drawing.Size(253, 155) - Me.ucrPanelBackGround.TabIndex = 2 - ' - 'ucrPanelBorder - ' - Me.ucrPanelBorder.Location = New System.Drawing.Point(11, 19) - Me.ucrPanelBorder.Name = "ucrPanelBorder" - Me.ucrPanelBorder.Size = New System.Drawing.Size(253, 155) - Me.ucrPanelBorder.TabIndex = 0 - ' - 'tbPLot + 'ucrLegendBackground ' - Me.tbPLot.Controls.Add(Me.grpPlotBackground) - Me.tbPLot.Controls.Add(Me.grpPlotTitleAndCaption) - Me.tbPLot.Location = New System.Drawing.Point(4, 22) - Me.tbPLot.Name = "tbPLot" - Me.tbPLot.Padding = New System.Windows.Forms.Padding(3) - Me.tbPLot.Size = New System.Drawing.Size(816, 555) - Me.tbPLot.TabIndex = 7 - Me.tbPLot.Text = "Plot" - Me.tbPLot.UseVisualStyleBackColor = True + Me.ucrLegendBackground.Location = New System.Drawing.Point(11, 19) + Me.ucrLegendBackground.Name = "ucrLegendBackground" + Me.ucrLegendBackground.Size = New System.Drawing.Size(253, 130) + Me.ucrLegendBackground.TabIndex = 0 ' - 'ucrThemeAxesTitle + 'ucrLegendKey ' - Me.ucrThemeAxesTitle.Location = New System.Drawing.Point(7, 13) - Me.ucrThemeAxesTitle.Name = "ucrThemeAxesTitle" - Me.ucrThemeAxesTitle.Size = New System.Drawing.Size(255, 228) - Me.ucrThemeAxesTitle.TabIndex = 59 + Me.ucrLegendKey.Location = New System.Drawing.Point(519, 19) + Me.ucrLegendKey.Name = "ucrLegendKey" + Me.ucrLegendKey.Size = New System.Drawing.Size(253, 130) + Me.ucrLegendKey.TabIndex = 1 ' - 'GroupBox2 + 'ucrBaseSubdialogue ' - Me.GroupBox2.Location = New System.Drawing.Point(7, 372) - Me.GroupBox2.Name = "GroupBox2" - Me.GroupBox2.Size = New System.Drawing.Size(264, 149) - Me.GroupBox2.TabIndex = 61 - Me.GroupBox2.TabStop = False + Me.ucrBaseSubdialogue.Location = New System.Drawing.Point(349, 595) + Me.ucrBaseSubdialogue.Name = "ucrBaseSubdialogue" + Me.ucrBaseSubdialogue.Size = New System.Drawing.Size(142, 30) + Me.ucrBaseSubdialogue.TabIndex = 0 ' 'ucrInputTickUnits ' @@ -706,91 +791,6 @@ Partial Class sdgThemes Me.ucrInputMargin.Size = New System.Drawing.Size(50, 23) Me.ucrInputMargin.TabIndex = 65 ' - 'ucrTickMarksAxes - ' - Me.ucrTickMarksAxes.Location = New System.Drawing.Point(4, 244) - Me.ucrTickMarksAxes.Name = "ucrTickMarksAxes" - Me.ucrTickMarksAxes.Size = New System.Drawing.Size(257, 122) - Me.ucrTickMarksAxes.TabIndex = 62 - ' - 'ucrThemeAxesTickLabels - ' - Me.ucrThemeAxesTickLabels.Location = New System.Drawing.Point(268, 13) - Me.ucrThemeAxesTickLabels.Name = "ucrThemeAxesTickLabels" - Me.ucrThemeAxesTickLabels.Size = New System.Drawing.Size(255, 228) - Me.ucrThemeAxesTickLabels.TabIndex = 63 - ' - 'ucrThemeAxesLines - ' - Me.ucrThemeAxesLines.Location = New System.Drawing.Point(271, 246) - Me.ucrThemeAxesLines.Name = "ucrThemeAxesLines" - Me.ucrThemeAxesLines.Size = New System.Drawing.Size(257, 122) - Me.ucrThemeAxesLines.TabIndex = 64 - ' - 'tbXYAxes - ' - Me.tbXYAxes.Controls.Add(Me.ucrThemeAxesLines) - Me.tbXYAxes.Controls.Add(Me.ucrThemeAxesTickLabels) - Me.tbXYAxes.Controls.Add(Me.ucrTickMarksAxes) - Me.tbXYAxes.Controls.Add(Me.GroupBox2) - Me.tbXYAxes.Controls.Add(Me.ucrThemeAxesTitle) - Me.tbXYAxes.Location = New System.Drawing.Point(4, 22) - Me.tbXYAxes.Name = "tbXYAxes" - Me.tbXYAxes.Size = New System.Drawing.Size(816, 555) - Me.tbXYAxes.TabIndex = 6 - Me.tbXYAxes.Text = "XY-Axes" - Me.tbXYAxes.UseVisualStyleBackColor = True - ' - 'grpPlotTitleAndCaption - ' - Me.grpPlotTitleAndCaption.Controls.Add(Me.ucrPlotCaption) - Me.grpPlotTitleAndCaption.Controls.Add(Me.ucrPlotSubTitle) - Me.grpPlotTitleAndCaption.Controls.Add(Me.ucrPlotTitle) - Me.grpPlotTitleAndCaption.Location = New System.Drawing.Point(6, 6) - Me.grpPlotTitleAndCaption.Name = "grpPlotTitleAndCaption" - Me.grpPlotTitleAndCaption.Size = New System.Drawing.Size(804, 244) - Me.grpPlotTitleAndCaption.TabIndex = 102 - Me.grpPlotTitleAndCaption.TabStop = False - Me.grpPlotTitleAndCaption.Text = "PLot Title and Caption" - ' - 'ucrPlotSubTitle - ' - Me.ucrPlotSubTitle.Location = New System.Drawing.Point(275, 12) - Me.ucrPlotSubTitle.Name = "ucrPlotSubTitle" - Me.ucrPlotSubTitle.Size = New System.Drawing.Size(255, 224) - Me.ucrPlotSubTitle.TabIndex = 65 - ' - 'ucrPlotTitle - ' - Me.ucrPlotTitle.Location = New System.Drawing.Point(14, 12) - Me.ucrPlotTitle.Name = "ucrPlotTitle" - Me.ucrPlotTitle.Size = New System.Drawing.Size(255, 224) - Me.ucrPlotTitle.TabIndex = 64 - ' - 'ucrPlotCaption - ' - Me.ucrPlotCaption.Location = New System.Drawing.Point(536, 12) - Me.ucrPlotCaption.Name = "ucrPlotCaption" - Me.ucrPlotCaption.Size = New System.Drawing.Size(255, 224) - Me.ucrPlotCaption.TabIndex = 66 - ' - 'grpPlotBackground - ' - Me.grpPlotBackground.Controls.Add(Me.ucrPlotBackGround) - Me.grpPlotBackground.Location = New System.Drawing.Point(6, 256) - Me.grpPlotBackground.Name = "grpPlotBackground" - Me.grpPlotBackground.Size = New System.Drawing.Size(269, 176) - Me.grpPlotBackground.TabIndex = 103 - Me.grpPlotBackground.TabStop = False - Me.grpPlotBackground.Text = "Plot Background " - ' - 'ucrPlotBackGround - ' - Me.ucrPlotBackGround.Location = New System.Drawing.Point(11, 19) - Me.ucrPlotBackGround.Name = "ucrPlotBackGround" - Me.ucrPlotBackGround.Size = New System.Drawing.Size(253, 155) - Me.ucrPlotBackGround.TabIndex = 0 - ' 'sdgThemes ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -805,6 +805,8 @@ Partial Class sdgThemes Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen Me.Text = "Themes" Me.tbThemePanelAndBackground.ResumeLayout(False) + Me.grpBorderAndBackground.ResumeLayout(False) + Me.grpPAnelGrid.ResumeLayout(False) Me.tbThemeYaxis.ResumeLayout(False) Me.GroupBox1.ResumeLayout(False) Me.grpYAxisTitle.ResumeLayout(False) @@ -817,16 +819,14 @@ Partial Class sdgThemes Me.grpXAxisLines.ResumeLayout(False) Me.GroupBox5.ResumeLayout(False) Me.tbLegend.ResumeLayout(False) + Me.tbPLot.ResumeLayout(False) + Me.grpPlotBackground.ResumeLayout(False) + Me.grpPlotTitleAndCaption.ResumeLayout(False) + Me.tbXYAxes.ResumeLayout(False) Me.tbThemeLegend.ResumeLayout(False) Me.grpLegendTitleAndText.ResumeLayout(False) Me.grpLegendAdjustments.ResumeLayout(False) Me.grpLegendBackGroundAndKey.ResumeLayout(False) - Me.grpPAnelGrid.ResumeLayout(False) - Me.grpBorderAndBackground.ResumeLayout(False) - Me.tbPLot.ResumeLayout(False) - Me.tbXYAxes.ResumeLayout(False) - Me.grpPlotTitleAndCaption.ResumeLayout(False) - Me.grpPlotBackground.ResumeLayout(False) Me.ResumeLayout(False) End Sub diff --git a/instat/sdgThemes.vb b/instat/sdgThemes.vb index 4ee4f660aa0..a81c482c32b 100644 --- a/instat/sdgThemes.vb +++ b/instat/sdgThemes.vb @@ -64,10 +64,10 @@ Public Class sdgThemes ucrPanelBorder.setlabel("Panel border") ucrPanelBackGround.setlabel("Panel background") - ucrPlotBackGround.setlabel("") - ucrPlotCaption.setlabel("") - ucrPlotSubTitle.setlabel("") - ucrPlotTitle.setlabel("") + ucrPlotBackGround.setlabel("Background of the entire plot") + ucrPlotCaption.setlabel("Plot title(text appearance)") + ucrPlotSubTitle.setlabel("Plot subtitle(text appearance)") + ucrPlotTitle.setlabel("Caption below the plot (text appearance)") 'Units ucrChkUnits.SetText("Tick length") @@ -144,6 +144,10 @@ Public Class sdgThemes Dim clsElementLegendText As New RFunction Dim clsElementLegendTitle As New RFunction + Dim clsElementPlotTitle As New RFunction + Dim clsElementPlotSubtitle As New RFunction + Dim clsElementPlotCaption As New RFunction + Dim clsXElementLine As New RFunction Dim clsElementLineAxes As New RFunction Dim clsYElementLine As New RFunction @@ -160,6 +164,8 @@ Public Class sdgThemes Dim clsElementBorder As New RFunction Dim clsElementPanelBackGround As New RFunction + Dim clsElementPlotBackground As New RFunction + Dim clsElementPanelGrid As New RFunction Dim clsElementPanelGridMajor As New RFunction Dim clsElementPanelGridMinor As New RFunction @@ -186,6 +192,9 @@ Public Class sdgThemes dctThemeFunctions.TryGetValue("axis.title.x.top", clsXTopElementTitle) dctThemeFunctions.TryGetValue("axis.title.y.right", clsYRightElementTitle) + dctThemeFunctions.TryGetValue("plot.title", clsElementPlotTitle) + dctThemeFunctions.TryGetValue("plot.subtitle", clsElementPlotSubtitle) + dctThemeFunctions.TryGetValue("plot.caption", clsElementPlotCaption) dctThemeFunctions.TryGetValue("axis.ticks.x", clsXElementLine) dctThemeFunctions.TryGetValue("axis.ticks.y", clsYElementLine) @@ -194,15 +203,17 @@ Public Class sdgThemes dctThemeFunctions.TryGetValue("axis.ticks", clsElementTickAxes) dctThemeFunctions.TryGetValue("axis.line", clsElementLineAxes) - dctThemeFunctions.TryGetValue("Panel.grid", clsElementPanelGrid) - dctThemeFunctions.TryGetValue("Panel.grid.major", clsElementPanelGridMajor) - dctThemeFunctions.TryGetValue("Panel.grid.minor", clsElementPanelGridMinor) + dctThemeFunctions.TryGetValue("panel.grid", clsElementPanelGrid) + dctThemeFunctions.TryGetValue("panel.grid.major", clsElementPanelGridMajor) + dctThemeFunctions.TryGetValue("panel.grid.minor", clsElementPanelGridMinor) dctThemeFunctions.TryGetValue("legend.background", clsElementLegendBackground) dctThemeFunctions.TryGetValue("legend.box.background", clsElementLegendBoxBackground) dctThemeFunctions.TryGetValue("legend.key", clsElementLegendtKey) - dctThemeFunctions.TryGetValue("Panel.background", clsElementPanelBackGround) - dctThemeFunctions.TryGetValue("Panel.border", clsElementBorder) + dctThemeFunctions.TryGetValue("panel.background", clsElementPanelBackGround) + dctThemeFunctions.TryGetValue("panel.border", clsElementBorder) + + dctThemeFunctions.TryGetValue("plot.background", clsElementPlotBackground) ucrTickMarksXAxis.SetRCodeForControl("axis.ticks.x", clsXElementLine, clsNewThemeFunction:=clsThemeFunction, clsNewBaseOperator:=clsBaseOperator, bReset:=bReset) ucrTickMarksYAxis.SetRCodeForControl("axis.ticks.y", clsYElementLine, clsNewThemeFunction:=clsThemeFunction, clsNewBaseOperator:=clsBaseOperator, bReset:=bReset) @@ -229,16 +240,16 @@ Public Class sdgThemes ucrLegendBoxBackground.SetRCodeForControl("legend.box.background", clsElementLegendBoxBackground, clsNewThemeFunction:=clsThemeFunction, clsNewBaseOperator:=clsBaseOperator, bReset:=bReset) ucrLegendKey.SetRCodeForControl("legend.key", clsElementLegendtKey, clsNewThemeFunction:=clsThemeFunction, clsNewBaseOperator:=clsBaseOperator, bReset:=bReset) - ucrPanelGrid.SetRCodeForControl("Panel.grid", clsElementPanelGrid, clsNewThemeFunction:=clsThemeFunction, clsNewBaseOperator:=clsBaseOperator, bReset:=bReset) - ucrPanelGridMajor.SetRCodeForControl("Panel.grid.major", clsElementPanelGridMajor, clsNewThemeFunction:=clsThemeFunction, clsNewBaseOperator:=clsBaseOperator, bReset:=bReset) - ucrPanelGridMinor.SetRCodeForControl("Panel.grid.minor", clsElementPanelGridMinor, clsNewThemeFunction:=clsThemeFunction, clsNewBaseOperator:=clsBaseOperator, bReset:=bReset) - ucrPanelBorder.SetRCodeForControl("Panel.background", clsElementPanelBackGround, clsNewThemeFunction:=clsThemeFunction, clsNewBaseOperator:=clsBaseOperator, bReset:=bReset) - ucrPanelBackGround.SetRCodeForControl("Panel.border", clsElementBorder, clsNewThemeFunction:=clsThemeFunction, clsNewBaseOperator:=clsBaseOperator, bReset:=bReset) + ucrPanelGrid.SetRCodeForControl("panel.grid", clsElementPanelGrid, clsNewThemeFunction:=clsThemeFunction, clsNewBaseOperator:=clsBaseOperator, bReset:=bReset) + ucrPanelGridMajor.SetRCodeForControl("panel.grid.major", clsElementPanelGridMajor, clsNewThemeFunction:=clsThemeFunction, clsNewBaseOperator:=clsBaseOperator, bReset:=bReset) + ucrPanelGridMinor.SetRCodeForControl("panel.grid.minor", clsElementPanelGridMinor, clsNewThemeFunction:=clsThemeFunction, clsNewBaseOperator:=clsBaseOperator, bReset:=bReset) + ucrPanelBackGround.SetRCodeForControl("panel.background", clsElementPanelBackGround, clsNewThemeFunction:=clsThemeFunction, clsNewBaseOperator:=clsBaseOperator, bReset:=bReset) + ucrPanelBorder.SetRCodeForControl("panel.border", clsElementBorder, clsNewThemeFunction:=clsThemeFunction, clsNewBaseOperator:=clsBaseOperator, bReset:=bReset) - ucrPlotBackGround.SetRCodeForControl("Panel.border", clsElementBorder, clsNewThemeFunction:=clsThemeFunction, clsNewBaseOperator:=clsBaseOperator, bReset:=bReset) - ucrPlotCaption.SetRCodeForControl("Panel.border", clsElementBorder, clsNewThemeFunction:=clsThemeFunction, clsNewBaseOperator:=clsBaseOperator, bReset:=bReset) - ucrPlotSubTitle.SetRCodeForControl("Panel.border", clsElementBorder, clsNewThemeFunction:=clsThemeFunction, clsNewBaseOperator:=clsBaseOperator, bReset:=bReset) - ucrPlotTitle.SetRCodeForControl("Panel.border", clsElementBorder, clsNewThemeFunction:=clsThemeFunction, clsNewBaseOperator:=clsBaseOperator, bReset:=bReset) + ucrPlotBackGround.SetRCodeForControl("plot.background", clsElementPlotBackground, clsNewThemeFunction:=clsThemeFunction, clsNewBaseOperator:=clsBaseOperator, bReset:=bReset) + ucrPlotCaption.SetRCodeForControl("plot.caption", clsElementPlotCaption, clsNewThemeFunction:=clsThemeFunction, clsNewBaseOperator:=clsBaseOperator, bReset:=bReset) + ucrPlotSubTitle.SetRCodeForControl("plot.subtitle", clsElementPlotSubtitle, clsNewThemeFunction:=clsThemeFunction, clsNewBaseOperator:=clsBaseOperator, bReset:=bReset) + ucrPlotTitle.SetRCodeForControl("plot.title", clsElementPlotTitle, clsNewThemeFunction:=clsThemeFunction, clsNewBaseOperator:=clsBaseOperator, bReset:=bReset) urChkLegendPosition.SetRCode(clsThemeFunction, bReset) diff --git a/instat/ucrElementRectControl.Designer.vb b/instat/ucrElementRectControl.Designer.vb index 4f2ff882b45..84ecfb2af51 100644 --- a/instat/ucrElementRectControl.Designer.vb +++ b/instat/ucrElementRectControl.Designer.vb @@ -23,8 +23,7 @@ Partial Class ucrElementRectControl _ Private Sub InitializeComponent() Me.grpElementRect = New System.Windows.Forms.GroupBox() - Me.ucrChkLegendLineEnd = New instat.ucrCheck() - Me.ucrInputLegendLineEnd = New instat.ucrInputComboBox() + Me.ucrLegendFill = New instat.ucrColors() Me.ucrLegendColors = New instat.ucrColors() Me.ucrChkLegendFill = New instat.ucrCheck() Me.ucrChkLegendSize = New instat.ucrCheck() @@ -32,15 +31,12 @@ Partial Class ucrElementRectControl Me.ucrChkLegendColour = New instat.ucrCheck() Me.ucrNudLegendSize = New instat.ucrNud() Me.ucrInputLegendLineType = New instat.ucrInputComboBox() - Me.ucrLegendFill = New instat.ucrColors() Me.grpElementRect.SuspendLayout() Me.SuspendLayout() ' 'grpElementRect ' Me.grpElementRect.Controls.Add(Me.ucrLegendFill) - Me.grpElementRect.Controls.Add(Me.ucrChkLegendLineEnd) - Me.grpElementRect.Controls.Add(Me.ucrInputLegendLineEnd) Me.grpElementRect.Controls.Add(Me.ucrLegendColors) Me.grpElementRect.Controls.Add(Me.ucrChkLegendFill) Me.grpElementRect.Controls.Add(Me.ucrChkLegendSize) @@ -50,28 +46,19 @@ Partial Class ucrElementRectControl Me.grpElementRect.Controls.Add(Me.ucrInputLegendLineType) Me.grpElementRect.Location = New System.Drawing.Point(8, 3) Me.grpElementRect.Name = "grpElementRect" - Me.grpElementRect.Size = New System.Drawing.Size(238, 145) + Me.grpElementRect.Size = New System.Drawing.Size(238, 122) Me.grpElementRect.TabIndex = 0 Me.grpElementRect.TabStop = False Me.grpElementRect.Text = "ElementRect" ' - 'ucrChkLegendLineEnd - ' - Me.ucrChkLegendLineEnd.Checked = False - Me.ucrChkLegendLineEnd.Location = New System.Drawing.Point(6, 117) - Me.ucrChkLegendLineEnd.Name = "ucrChkLegendLineEnd" - Me.ucrChkLegendLineEnd.Size = New System.Drawing.Size(88, 20) - Me.ucrChkLegendLineEnd.TabIndex = 97 - ' - 'ucrInputLegendLineEnd + 'ucrLegendFill ' - Me.ucrInputLegendLineEnd.AddQuotesIfUnrecognised = True - Me.ucrInputLegendLineEnd.IsReadOnly = False - Me.ucrInputLegendLineEnd.Location = New System.Drawing.Point(95, 115) - Me.ucrInputLegendLineEnd.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) - Me.ucrInputLegendLineEnd.Name = "ucrInputLegendLineEnd" - Me.ucrInputLegendLineEnd.Size = New System.Drawing.Size(137, 21) - Me.ucrInputLegendLineEnd.TabIndex = 96 + Me.ucrLegendFill.AddQuotesIfUnrecognised = True + Me.ucrLegendFill.IsReadOnly = False + Me.ucrLegendFill.Location = New System.Drawing.Point(95, 90) + Me.ucrLegendFill.Name = "ucrLegendFill" + Me.ucrLegendFill.Size = New System.Drawing.Size(137, 21) + Me.ucrLegendFill.TabIndex = 98 ' 'ucrLegendColors ' @@ -136,22 +123,13 @@ Partial Class ucrElementRectControl Me.ucrInputLegendLineType.Size = New System.Drawing.Size(137, 21) Me.ucrInputLegendLineType.TabIndex = 88 ' - 'ucrLegendFill - ' - Me.ucrLegendFill.AddQuotesIfUnrecognised = True - Me.ucrLegendFill.IsReadOnly = False - Me.ucrLegendFill.Location = New System.Drawing.Point(95, 90) - Me.ucrLegendFill.Name = "ucrLegendFill" - Me.ucrLegendFill.Size = New System.Drawing.Size(137, 21) - Me.ucrLegendFill.TabIndex = 98 - ' 'ucrElementRectControl ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.Controls.Add(Me.grpElementRect) Me.Name = "ucrElementRectControl" - Me.Size = New System.Drawing.Size(253, 155) + Me.Size = New System.Drawing.Size(253, 131) Me.grpElementRect.ResumeLayout(False) Me.ResumeLayout(False) @@ -165,7 +143,5 @@ Partial Class ucrElementRectControl Friend WithEvents ucrChkLegendColour As ucrCheck Friend WithEvents ucrNudLegendSize As ucrNud Friend WithEvents ucrInputLegendLineType As ucrInputComboBox - Friend WithEvents ucrChkLegendLineEnd As ucrCheck - Friend WithEvents ucrInputLegendLineEnd As ucrInputComboBox Friend WithEvents ucrLegendFill As ucrColors End Class diff --git a/instat/ucrElementRectControl.vb b/instat/ucrElementRectControl.vb index 8e565853499..6feead8d956 100644 --- a/instat/ucrElementRectControl.vb +++ b/instat/ucrElementRectControl.vb @@ -44,16 +44,8 @@ Public Class ucrElementRectControl ucrLegendFill.AddQuotesIfUnrecognised = False ucrLegendFill.SetRDefault(Chr(34) & "black" & Chr(34)) - - ucrChkLegendLineEnd.SetText("Line End") - ucrInputLegendLineEnd.SetParameter(New RParameter("lineend")) - ucrInputLegendLineEnd.SetItems(New Dictionary(Of String, String)(GgplotDefaults.dctLineEnd)) - ucrInputLegendLineEnd.SetRDefault(Chr(34) & "square" & Chr(34)) - - ucrChkLegendSize.AddToLinkedControls(ucrNudLegendSize, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) ucrChkLegendLineType.AddToLinkedControls(ucrInputLegendLineType, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) - ucrChkLegendLineEnd.AddToLinkedControls(ucrInputLegendLineEnd, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) ucrChkLegendColour.AddToLinkedControls(ucrLegendColors, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) ucrChkLegendFill.AddToLinkedControls(ucrLegendFill, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) @@ -87,8 +79,6 @@ Public Class ucrElementRectControl ucrInputLegendLineType.SetRCode(clsElementLine, bReset) ucrChkLegendLineType.SetRCode(clsElementLine, bReset) - ucrInputLegendLineEnd.SetRCode(clsElementLine, bReset) - ucrChkLegendLineEnd.SetRCode(clsElementLine, bReset) AddRemoveElementLineAxis() End Sub From 96d8f06c6e956d0d6dd0e984b5318dc22f436a20 Mon Sep 17 00:00:00 2001 From: John Lunalo Date: Thu, 8 Jun 2017 12:26:31 +0300 Subject: [PATCH 122/154] making combobox non editable --- instat/dlgContrasts.vb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/instat/dlgContrasts.vb b/instat/dlgContrasts.vb index ee0dad4cb2c..88fc24aaae6 100644 --- a/instat/dlgContrasts.vb +++ b/instat/dlgContrasts.vb @@ -81,7 +81,7 @@ Public Class dlgContrasts dctContrastTypes.Add("User Defined", Chr(34) & "user_defined" & Chr(34)) ucrInputContrastName.SetItems(dctContrastTypes) ucrInputContrastName.SetLinkedDisplayControl(lblSelectContrastName) - + ucrInputContrastName.SetDropDownStyleAsNonEditable() ucrSelectorForContrast.SetParameter(New RParameter("data_name", 0)) ucrSelectorForContrast.SetParameterIsString() From 979c1a64319af4534dcf312147ccdc997d09c26e Mon Sep 17 00:00:00 2001 From: Steven Date: Thu, 8 Jun 2017 14:34:03 +0300 Subject: [PATCH 123/154] Adding ucrUnit --- instat/clsGgplotDefaults.vb | 11 +- instat/instat.vbproj | 9 + instat/sdgThemes.Designer.vb | 1046 +++++++++++++++----------------- instat/sdgThemes.vb | 29 +- instat/ucrGridUnit.Designer.vb | 115 ++++ instat/ucrGridUnit.resx | 120 ++++ instat/ucrGridUnit.vb | 67 ++ 7 files changed, 850 insertions(+), 547 deletions(-) create mode 100644 instat/ucrGridUnit.Designer.vb create mode 100644 instat/ucrGridUnit.resx create mode 100644 instat/ucrGridUnit.vb diff --git a/instat/clsGgplotDefaults.vb b/instat/clsGgplotDefaults.vb index f263f9b401b..5016573f89f 100644 --- a/instat/clsGgplotDefaults.vb +++ b/instat/clsGgplotDefaults.vb @@ -87,16 +87,23 @@ Dim clsElementLine As RFunction Dim clsElementRect As RFunction + Dim clsUnit As RFunction + clsElementText = New RFunction clsElementLine = New RFunction + clsElementRect = New RFunction clsElementRect = New RFunction + clsUnit = New RFunction + + clsUnit.SetPackageName("grid") clsElementText.SetPackageName("ggplot2") clsElementLine.SetPackageName("ggplot2") clsElementRect.SetPackageName("ggplot2") clsElementText.SetRCommand("element_text") clsElementLine.SetRCommand("element_line") clsElementRect.SetRCommand("element_rect") + clsUnit.SetRCommand("unit") dctTemp.Add("line", clsElementLine.Clone()) dctTemp.Add("rect", clsElementRect.Clone()) @@ -116,11 +123,11 @@ dctTemp.Add("axis.ticks", clsElementLine.Clone()) dctTemp.Add("axis.ticks.x", clsElementLine.Clone()) dctTemp.Add("axis.ticks.y", clsElementLine.Clone()) - 'dctTemp.Add(" axis.ticks.length", clsElementLine.Clone()) + dctTemp.Add("axis.ticks.length", clsUnit.Clone()) dctTemp.Add("axis.line", clsElementLine.Clone()) dctTemp.Add("axis.line.x", clsElementLine.Clone()) dctTemp.Add("axis.line.y", clsElementLine.Clone()) - ' dctTemp.Add("axis.ticks.length", clsElementLine.Clone()) + dctTemp.Add("axis.ticks.length", clsUnit.Clone()) dctTemp.Add("legend.background", clsElementRect.Clone()) ' dctTemp.Add("legend.margin", clsElementLine.Clone()) ' dctTemp.Add("legend.spacing", clsElementLine.Clone()) diff --git a/instat/instat.vbproj b/instat/instat.vbproj index 94e29aabc59..1cc1af6683f 100644 --- a/instat/instat.vbproj +++ b/instat/instat.vbproj @@ -1290,6 +1290,12 @@ UserControl + + ucrGridUnit.vb + + + UserControl + ucrInputComboBox.vb @@ -4357,6 +4363,9 @@ ucrGeom.vb + + ucrGridUnit.vb + ucrInput.vb diff --git a/instat/sdgThemes.Designer.vb b/instat/sdgThemes.Designer.vb index 162a8448e2d..eaa071bcefa 100644 --- a/instat/sdgThemes.Designer.vb +++ b/instat/sdgThemes.Designer.vb @@ -22,7 +22,14 @@ Partial Class sdgThemes 'Do not modify it using the code editor. Private Sub InitializeComponent() + Me.ucrBaseSubdialogue = New instat.ucrButtonsSubdialogue() Me.tbThemeFacets = New System.Windows.Forms.TabPage() + Me.grpFacetBackground = New System.Windows.Forms.GroupBox() + Me.ucrStripBackGround = New instat.ucrElementRectControl() + Me.grpFacetLabels = New System.Windows.Forms.GroupBox() + Me.ucrStripTextYAxis = New instat.ucrELementTextControl() + Me.ucrStripTextXAxis = New instat.ucrELementTextControl() + Me.ucrStripText = New instat.ucrELementTextControl() Me.tbThemePanelAndBackground = New System.Windows.Forms.TabPage() Me.grpBorderAndBackground = New System.Windows.Forms.GroupBox() Me.ucrPanelBackGround = New instat.ucrElementRectControl() @@ -31,8 +38,27 @@ Partial Class sdgThemes Me.ucrPanelGridMinor = New instat.ucrElementLineControl() Me.ucrPanelGridMajor = New instat.ucrElementLineControl() Me.ucrPanelGrid = New instat.ucrElementLineControl() + Me.tbThemeLegend = New System.Windows.Forms.TabPage() + Me.grpLegendTitleAndText = New System.Windows.Forms.GroupBox() + Me.ucrLegendText = New instat.ucrELementTextControl() + Me.ucrLegendTitle = New instat.ucrELementTextControl() + Me.grpLegendAdjustments = New System.Windows.Forms.GroupBox() + Me.ucrChkLegendJustification = New instat.ucrCheck() + Me.ucrInputLegendJustification = New instat.ucrInputComboBox() + Me.ucrChkLegendBox = New instat.ucrCheck() + Me.ucrInputLegendBox = New instat.ucrInputComboBox() + Me.urChkLegendPosition = New instat.ucrCheck() + Me.ucrChkLegendDirection = New instat.ucrCheck() + Me.ucrInputLegendPosition = New instat.ucrInputComboBox() + Me.ucrInputLegendDirection = New instat.ucrInputComboBox() + Me.urChkLegendBoxJust = New instat.ucrCheck() + Me.ucrInputLegendBoxJust = New instat.ucrInputComboBox() + Me.grpLegendBackGroundAndKey = New System.Windows.Forms.GroupBox() + Me.ucrLegendBoxBackground = New instat.ucrElementRectControl() + Me.ucrLegendBackground = New instat.ucrElementRectControl() + Me.ucrLegendKey = New instat.ucrElementRectControl() Me.tbThemeYaxis = New System.Windows.Forms.TabPage() - Me.GroupBox1 = New System.Windows.Forms.GroupBox() + Me.grpLineAlongYAxis = New System.Windows.Forms.GroupBox() Me.ucrYAxisLines = New instat.ucrElementLineControl() Me.grpYAxisTitle = New System.Windows.Forms.GroupBox() Me.ucrThemeTitleYRightAxis = New instat.ucrELementTextControl() @@ -50,13 +76,14 @@ Partial Class sdgThemes Me.grpXAxisTitle = New System.Windows.Forms.GroupBox() Me.ucrThemeTitleXTopAxis = New instat.ucrELementTextControl() Me.ucrThemeTitleXAxis = New instat.ucrELementTextControl() - Me.grpXAxisLines = New System.Windows.Forms.GroupBox() - Me.UcrTickMarksAndLabels3 = New instat.ucrElementLineControl() + Me.grpTickMarks = New System.Windows.Forms.GroupBox() Me.ucrXAxisLines = New instat.ucrElementLineControl() - Me.GroupBox5 = New System.Windows.Forms.GroupBox() - Me.UcrTickMarksAndLabels5 = New instat.ucrElementLineControl() Me.ucrTickMarksXAxis = New instat.ucrElementLineControl() - Me.tbLegend = New System.Windows.Forms.TabControl() + Me.tbXYAxes = New System.Windows.Forms.TabPage() + Me.ucrThemeAxesLines = New instat.ucrElementLineControl() + Me.ucrThemeAxesTickLabels = New instat.ucrELementTextControl() + Me.ucrTickMarksAxes = New instat.ucrElementLineControl() + Me.ucrThemeAxesTitle = New instat.ucrELementTextControl() Me.tbPLot = New System.Windows.Forms.TabPage() Me.grpPlotBackground = New System.Windows.Forms.GroupBox() Me.ucrPlotBackGround = New instat.ucrElementRectControl() @@ -64,43 +91,19 @@ Partial Class sdgThemes Me.ucrPlotCaption = New instat.ucrELementTextControl() Me.ucrPlotSubTitle = New instat.ucrELementTextControl() Me.ucrPlotTitle = New instat.ucrELementTextControl() - Me.tbXYAxes = New System.Windows.Forms.TabPage() - Me.ucrThemeAxesLines = New instat.ucrElementLineControl() - Me.ucrThemeAxesTickLabels = New instat.ucrELementTextControl() - Me.ucrTickMarksAxes = New instat.ucrElementLineControl() - Me.GroupBox2 = New System.Windows.Forms.GroupBox() - Me.ucrThemeAxesTitle = New instat.ucrELementTextControl() - Me.tbThemeLegend = New System.Windows.Forms.TabPage() - Me.grpLegendTitleAndText = New System.Windows.Forms.GroupBox() - Me.ucrLegendText = New instat.ucrELementTextControl() - Me.ucrLegendTitle = New instat.ucrELementTextControl() - Me.grpLegendAdjustments = New System.Windows.Forms.GroupBox() - Me.ucrChkLegendJustification = New instat.ucrCheck() - Me.ucrInputLegendJustification = New instat.ucrInputComboBox() - Me.ucrChkLegendBox = New instat.ucrCheck() - Me.ucrInputLegendBox = New instat.ucrInputComboBox() - Me.urChkLegendPosition = New instat.ucrCheck() - Me.ucrChkLegendDirection = New instat.ucrCheck() - Me.ucrInputLegendPosition = New instat.ucrInputComboBox() - Me.ucrInputLegendDirection = New instat.ucrInputComboBox() - Me.urChkLegendBoxJust = New instat.ucrCheck() - Me.ucrInputLegendBoxJust = New instat.ucrInputComboBox() - Me.grpLegendBackGroundAndKey = New System.Windows.Forms.GroupBox() - Me.ucrLegendBoxBackground = New instat.ucrElementRectControl() - Me.ucrLegendBackground = New instat.ucrElementRectControl() - Me.ucrLegendKey = New instat.ucrElementRectControl() - Me.ucrBaseSubdialogue = New instat.ucrButtonsSubdialogue() - Me.ucrInputTickUnits = New instat.ucrInputComboBox() - Me.ucrChkUnits = New instat.ucrCheck() - Me.ucrInputUnits = New instat.ucrInputTextBox() - Me.ucrInputMarginUnits = New instat.ucrInputComboBox() - Me.ucrChkMaigin = New instat.ucrCheck() - Me.ucrInputMargin = New instat.ucrInputTextBox() + Me.tbLegend = New System.Windows.Forms.TabControl() + Me.tbThemeFacets.SuspendLayout() + Me.grpFacetBackground.SuspendLayout() + Me.grpFacetLabels.SuspendLayout() Me.tbThemePanelAndBackground.SuspendLayout() Me.grpBorderAndBackground.SuspendLayout() Me.grpPAnelGrid.SuspendLayout() + Me.tbThemeLegend.SuspendLayout() + Me.grpLegendTitleAndText.SuspendLayout() + Me.grpLegendAdjustments.SuspendLayout() + Me.grpLegendBackGroundAndKey.SuspendLayout() Me.tbThemeYaxis.SuspendLayout() - Me.GroupBox1.SuspendLayout() + Me.grpLineAlongYAxis.SuspendLayout() Me.grpYAxisTitle.SuspendLayout() Me.grpTickMarkLabelsYAxis.SuspendLayout() Me.grpTickMarkers.SuspendLayout() @@ -108,35 +111,89 @@ Partial Class sdgThemes Me.grpTableOptions.SuspendLayout() Me.grpTickMarkLabelsXAxis.SuspendLayout() Me.grpXAxisTitle.SuspendLayout() - Me.grpXAxisLines.SuspendLayout() - Me.GroupBox5.SuspendLayout() - Me.tbLegend.SuspendLayout() + Me.grpTickMarks.SuspendLayout() + Me.tbXYAxes.SuspendLayout() Me.tbPLot.SuspendLayout() Me.grpPlotBackground.SuspendLayout() Me.grpPlotTitleAndCaption.SuspendLayout() - Me.tbXYAxes.SuspendLayout() - Me.tbThemeLegend.SuspendLayout() - Me.grpLegendTitleAndText.SuspendLayout() - Me.grpLegendAdjustments.SuspendLayout() - Me.grpLegendBackGroundAndKey.SuspendLayout() + Me.tbLegend.SuspendLayout() Me.SuspendLayout() ' + 'ucrBaseSubdialogue + ' + Me.ucrBaseSubdialogue.Location = New System.Drawing.Point(340, 623) + Me.ucrBaseSubdialogue.Name = "ucrBaseSubdialogue" + Me.ucrBaseSubdialogue.Size = New System.Drawing.Size(142, 30) + Me.ucrBaseSubdialogue.TabIndex = 0 + ' 'tbThemeFacets ' + Me.tbThemeFacets.Controls.Add(Me.grpFacetBackground) + Me.tbThemeFacets.Controls.Add(Me.grpFacetLabels) Me.tbThemeFacets.Location = New System.Drawing.Point(4, 22) Me.tbThemeFacets.Name = "tbThemeFacets" - Me.tbThemeFacets.Size = New System.Drawing.Size(816, 555) + Me.tbThemeFacets.Size = New System.Drawing.Size(816, 564) Me.tbThemeFacets.TabIndex = 4 Me.tbThemeFacets.Text = "Facets" Me.tbThemeFacets.UseVisualStyleBackColor = True ' + 'grpFacetBackground + ' + Me.grpFacetBackground.Controls.Add(Me.ucrStripBackGround) + Me.grpFacetBackground.Location = New System.Drawing.Point(12, 264) + Me.grpFacetBackground.Name = "grpFacetBackground" + Me.grpFacetBackground.Size = New System.Drawing.Size(269, 148) + Me.grpFacetBackground.TabIndex = 104 + Me.grpFacetBackground.TabStop = False + Me.grpFacetBackground.Text = "Facet Label Background " + ' + 'ucrStripBackGround + ' + Me.ucrStripBackGround.Location = New System.Drawing.Point(11, 19) + Me.ucrStripBackGround.Name = "ucrStripBackGround" + Me.ucrStripBackGround.Size = New System.Drawing.Size(253, 128) + Me.ucrStripBackGround.TabIndex = 0 + ' + 'grpFacetLabels + ' + Me.grpFacetLabels.Controls.Add(Me.ucrStripTextYAxis) + Me.grpFacetLabels.Controls.Add(Me.ucrStripTextXAxis) + Me.grpFacetLabels.Controls.Add(Me.ucrStripText) + Me.grpFacetLabels.Location = New System.Drawing.Point(12, 3) + Me.grpFacetLabels.Name = "grpFacetLabels" + Me.grpFacetLabels.Size = New System.Drawing.Size(804, 244) + Me.grpFacetLabels.TabIndex = 103 + Me.grpFacetLabels.TabStop = False + Me.grpFacetLabels.Text = "Facet Labels" + ' + 'ucrStripTextYAxis + ' + Me.ucrStripTextYAxis.Location = New System.Drawing.Point(536, 12) + Me.ucrStripTextYAxis.Name = "ucrStripTextYAxis" + Me.ucrStripTextYAxis.Size = New System.Drawing.Size(255, 224) + Me.ucrStripTextYAxis.TabIndex = 66 + ' + 'ucrStripTextXAxis + ' + Me.ucrStripTextXAxis.Location = New System.Drawing.Point(275, 12) + Me.ucrStripTextXAxis.Name = "ucrStripTextXAxis" + Me.ucrStripTextXAxis.Size = New System.Drawing.Size(255, 224) + Me.ucrStripTextXAxis.TabIndex = 65 + ' + 'ucrStripText + ' + Me.ucrStripText.Location = New System.Drawing.Point(14, 12) + Me.ucrStripText.Name = "ucrStripText" + Me.ucrStripText.Size = New System.Drawing.Size(255, 224) + Me.ucrStripText.TabIndex = 64 + ' 'tbThemePanelAndBackground ' Me.tbThemePanelAndBackground.Controls.Add(Me.grpBorderAndBackground) Me.tbThemePanelAndBackground.Controls.Add(Me.grpPAnelGrid) Me.tbThemePanelAndBackground.Location = New System.Drawing.Point(4, 22) Me.tbThemePanelAndBackground.Name = "tbThemePanelAndBackground" - Me.tbThemePanelAndBackground.Size = New System.Drawing.Size(816, 555) + Me.tbThemePanelAndBackground.Size = New System.Drawing.Size(816, 564) Me.tbThemePanelAndBackground.TabIndex = 3 Me.tbThemePanelAndBackground.Text = "Panel and Background " Me.tbThemePanelAndBackground.UseVisualStyleBackColor = True @@ -199,123 +256,303 @@ Partial Class sdgThemes Me.ucrPanelGrid.Size = New System.Drawing.Size(254, 124) Me.ucrPanelGrid.TabIndex = 63 ' - 'tbThemeYaxis + 'tbThemeLegend ' - Me.tbThemeYaxis.Controls.Add(Me.GroupBox1) - Me.tbThemeYaxis.Controls.Add(Me.grpYAxisTitle) - Me.tbThemeYaxis.Controls.Add(Me.grpTickMarkLabelsYAxis) - Me.tbThemeYaxis.Controls.Add(Me.grpTickMarkers) - Me.tbThemeYaxis.Location = New System.Drawing.Point(4, 22) - Me.tbThemeYaxis.Name = "tbThemeYaxis" - Me.tbThemeYaxis.Padding = New System.Windows.Forms.Padding(3) - Me.tbThemeYaxis.Size = New System.Drawing.Size(816, 555) - Me.tbThemeYaxis.TabIndex = 1 - Me.tbThemeYaxis.Text = "Y-axis" - Me.tbThemeYaxis.UseVisualStyleBackColor = True + Me.tbThemeLegend.Controls.Add(Me.grpLegendTitleAndText) + Me.tbThemeLegend.Controls.Add(Me.grpLegendAdjustments) + Me.tbThemeLegend.Controls.Add(Me.grpLegendBackGroundAndKey) + Me.tbThemeLegend.Location = New System.Drawing.Point(4, 22) + Me.tbThemeLegend.Name = "tbThemeLegend" + Me.tbThemeLegend.Padding = New System.Windows.Forms.Padding(3) + Me.tbThemeLegend.Size = New System.Drawing.Size(816, 564) + Me.tbThemeLegend.TabIndex = 2 + Me.tbThemeLegend.Text = "Legend" + Me.tbThemeLegend.UseVisualStyleBackColor = True ' - 'GroupBox1 + 'grpLegendTitleAndText ' - Me.GroupBox1.Controls.Add(Me.ucrYAxisLines) - Me.GroupBox1.Location = New System.Drawing.Point(544, 289) - Me.GroupBox1.Name = "GroupBox1" - Me.GroupBox1.Size = New System.Drawing.Size(260, 136) - Me.GroupBox1.TabIndex = 66 - Me.GroupBox1.TabStop = False - Me.GroupBox1.Text = "Line Along Y-Axis" + Me.grpLegendTitleAndText.Controls.Add(Me.ucrLegendText) + Me.grpLegendTitleAndText.Controls.Add(Me.ucrLegendTitle) + Me.grpLegendTitleAndText.Location = New System.Drawing.Point(6, 6) + Me.grpLegendTitleAndText.Name = "grpLegendTitleAndText" + Me.grpLegendTitleAndText.Size = New System.Drawing.Size(530, 242) + Me.grpLegendTitleAndText.TabIndex = 101 + Me.grpLegendTitleAndText.TabStop = False + Me.grpLegendTitleAndText.Text = "Legend Title and Text" ' - 'ucrYAxisLines + 'ucrLegendText ' - Me.ucrYAxisLines.Location = New System.Drawing.Point(4, 12) - Me.ucrYAxisLines.Name = "ucrYAxisLines" - Me.ucrYAxisLines.Size = New System.Drawing.Size(254, 124) - Me.ucrYAxisLines.TabIndex = 63 + Me.ucrLegendText.Location = New System.Drawing.Point(275, 12) + Me.ucrLegendText.Name = "ucrLegendText" + Me.ucrLegendText.Size = New System.Drawing.Size(255, 224) + Me.ucrLegendText.TabIndex = 65 ' - 'grpYAxisTitle + 'ucrLegendTitle ' - Me.grpYAxisTitle.Controls.Add(Me.ucrThemeTitleYRightAxis) - Me.grpYAxisTitle.Controls.Add(Me.ucrThemeTitleYAxis) - Me.grpYAxisTitle.Location = New System.Drawing.Point(4, 23) - Me.grpYAxisTitle.Name = "grpYAxisTitle" - Me.grpYAxisTitle.Size = New System.Drawing.Size(528, 247) - Me.grpYAxisTitle.TabIndex = 67 - Me.grpYAxisTitle.TabStop = False - Me.grpYAxisTitle.Text = "Y-Lab Title" + Me.ucrLegendTitle.Location = New System.Drawing.Point(14, 12) + Me.ucrLegendTitle.Name = "ucrLegendTitle" + Me.ucrLegendTitle.Size = New System.Drawing.Size(255, 224) + Me.ucrLegendTitle.TabIndex = 64 ' - 'ucrThemeTitleYRightAxis + 'grpLegendAdjustments ' - Me.ucrThemeTitleYRightAxis.Location = New System.Drawing.Point(264, 13) - Me.ucrThemeTitleYRightAxis.Name = "ucrThemeTitleYRightAxis" - Me.ucrThemeTitleYRightAxis.Size = New System.Drawing.Size(262, 227) - Me.ucrThemeTitleYRightAxis.TabIndex = 66 + Me.grpLegendAdjustments.Controls.Add(Me.ucrChkLegendJustification) + Me.grpLegendAdjustments.Controls.Add(Me.ucrInputLegendJustification) + Me.grpLegendAdjustments.Controls.Add(Me.ucrChkLegendBox) + Me.grpLegendAdjustments.Controls.Add(Me.ucrInputLegendBox) + Me.grpLegendAdjustments.Controls.Add(Me.urChkLegendPosition) + Me.grpLegendAdjustments.Controls.Add(Me.ucrChkLegendDirection) + Me.grpLegendAdjustments.Controls.Add(Me.ucrInputLegendPosition) + Me.grpLegendAdjustments.Controls.Add(Me.ucrInputLegendDirection) + Me.grpLegendAdjustments.Controls.Add(Me.urChkLegendBoxJust) + Me.grpLegendAdjustments.Controls.Add(Me.ucrInputLegendBoxJust) + Me.grpLegendAdjustments.Location = New System.Drawing.Point(541, 6) + Me.grpLegendAdjustments.Name = "grpLegendAdjustments" + Me.grpLegendAdjustments.Size = New System.Drawing.Size(272, 161) + Me.grpLegendAdjustments.TabIndex = 100 + Me.grpLegendAdjustments.TabStop = False + Me.grpLegendAdjustments.Text = "Legend Adjustments" ' - 'ucrThemeTitleYAxis + 'ucrChkLegendJustification ' - Me.ucrThemeTitleYAxis.Location = New System.Drawing.Point(4, 13) - Me.ucrThemeTitleYAxis.Name = "ucrThemeTitleYAxis" - Me.ucrThemeTitleYAxis.Size = New System.Drawing.Size(259, 227) - Me.ucrThemeTitleYAxis.TabIndex = 65 + Me.ucrChkLegendJustification.Checked = False + Me.ucrChkLegendJustification.Location = New System.Drawing.Point(6, 128) + Me.ucrChkLegendJustification.Name = "ucrChkLegendJustification" + Me.ucrChkLegendJustification.Size = New System.Drawing.Size(122, 20) + Me.ucrChkLegendJustification.TabIndex = 109 ' - 'grpTickMarkLabelsYAxis + 'ucrInputLegendJustification ' - Me.grpTickMarkLabelsYAxis.Controls.Add(Me.ucrThemeYRightAxis) - Me.grpTickMarkLabelsYAxis.Controls.Add(Me.ucrThemeLeftYAxis) - Me.grpTickMarkLabelsYAxis.Location = New System.Drawing.Point(4, 289) - Me.grpTickMarkLabelsYAxis.Name = "grpTickMarkLabelsYAxis" - Me.grpTickMarkLabelsYAxis.Size = New System.Drawing.Size(528, 243) - Me.grpTickMarkLabelsYAxis.TabIndex = 66 - Me.grpTickMarkLabelsYAxis.TabStop = False - Me.grpTickMarkLabelsYAxis.Text = "Tick Mark Labels " + Me.ucrInputLegendJustification.AddQuotesIfUnrecognised = True + Me.ucrInputLegendJustification.IsReadOnly = False + Me.ucrInputLegendJustification.Location = New System.Drawing.Point(130, 126) + Me.ucrInputLegendJustification.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) + Me.ucrInputLegendJustification.Name = "ucrInputLegendJustification" + Me.ucrInputLegendJustification.Size = New System.Drawing.Size(137, 21) + Me.ucrInputLegendJustification.TabIndex = 108 ' - 'ucrThemeYRightAxis + 'ucrChkLegendBox ' - Me.ucrThemeYRightAxis.Location = New System.Drawing.Point(268, 14) - Me.ucrThemeYRightAxis.Name = "ucrThemeYRightAxis" - Me.ucrThemeYRightAxis.Size = New System.Drawing.Size(262, 226) - Me.ucrThemeYRightAxis.TabIndex = 60 + Me.ucrChkLegendBox.Checked = False + Me.ucrChkLegendBox.Location = New System.Drawing.Point(6, 100) + Me.ucrChkLegendBox.Name = "ucrChkLegendBox" + Me.ucrChkLegendBox.Size = New System.Drawing.Size(122, 20) + Me.ucrChkLegendBox.TabIndex = 107 ' - 'ucrThemeLeftYAxis + 'ucrInputLegendBox ' - Me.ucrThemeLeftYAxis.Location = New System.Drawing.Point(8, 14) - Me.ucrThemeLeftYAxis.Name = "ucrThemeLeftYAxis" - Me.ucrThemeLeftYAxis.Size = New System.Drawing.Size(259, 226) - Me.ucrThemeLeftYAxis.TabIndex = 59 + Me.ucrInputLegendBox.AddQuotesIfUnrecognised = True + Me.ucrInputLegendBox.IsReadOnly = False + Me.ucrInputLegendBox.Location = New System.Drawing.Point(130, 98) + Me.ucrInputLegendBox.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) + Me.ucrInputLegendBox.Name = "ucrInputLegendBox" + Me.ucrInputLegendBox.Size = New System.Drawing.Size(137, 21) + Me.ucrInputLegendBox.TabIndex = 106 ' - 'grpTickMarkers + 'urChkLegendPosition ' - Me.grpTickMarkers.Controls.Add(Me.ucrTickMarksYAxis) - Me.grpTickMarkers.Location = New System.Drawing.Point(540, 24) - Me.grpTickMarkers.Name = "grpTickMarkers" - Me.grpTickMarkers.Size = New System.Drawing.Size(264, 137) - Me.grpTickMarkers.TabIndex = 65 - Me.grpTickMarkers.TabStop = False - Me.grpTickMarkers.Text = "TickMarkers" + Me.urChkLegendPosition.Checked = False + Me.urChkLegendPosition.Location = New System.Drawing.Point(6, 21) + Me.urChkLegendPosition.Name = "urChkLegendPosition" + Me.urChkLegendPosition.Size = New System.Drawing.Size(122, 20) + Me.urChkLegendPosition.TabIndex = 105 ' - 'ucrTickMarksYAxis + 'ucrChkLegendDirection ' - Me.ucrTickMarksYAxis.Location = New System.Drawing.Point(4, 10) - Me.ucrTickMarksYAxis.Name = "ucrTickMarksYAxis" - Me.ucrTickMarksYAxis.Size = New System.Drawing.Size(254, 124) - Me.ucrTickMarksYAxis.TabIndex = 63 + Me.ucrChkLegendDirection.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle + Me.ucrChkLegendDirection.Checked = False + Me.ucrChkLegendDirection.Location = New System.Drawing.Point(6, 47) + Me.ucrChkLegendDirection.Name = "ucrChkLegendDirection" + Me.ucrChkLegendDirection.Size = New System.Drawing.Size(122, 20) + Me.ucrChkLegendDirection.TabIndex = 101 ' - 'tbThemeXAxis + 'ucrInputLegendPosition ' - Me.tbThemeXAxis.Controls.Add(Me.grpTableOptions) - Me.tbThemeXAxis.Location = New System.Drawing.Point(4, 22) - Me.tbThemeXAxis.Name = "tbThemeXAxis" - Me.tbThemeXAxis.Padding = New System.Windows.Forms.Padding(3) - Me.tbThemeXAxis.Size = New System.Drawing.Size(816, 555) - Me.tbThemeXAxis.TabIndex = 0 - Me.tbThemeXAxis.Text = "X-axis" - Me.tbThemeXAxis.UseVisualStyleBackColor = True + Me.ucrInputLegendPosition.AddQuotesIfUnrecognised = True + Me.ucrInputLegendPosition.IsReadOnly = False + Me.ucrInputLegendPosition.Location = New System.Drawing.Point(130, 19) + Me.ucrInputLegendPosition.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) + Me.ucrInputLegendPosition.Name = "ucrInputLegendPosition" + Me.ucrInputLegendPosition.Size = New System.Drawing.Size(137, 21) + Me.ucrInputLegendPosition.TabIndex = 104 ' - 'grpTableOptions + 'ucrInputLegendDirection ' - Me.grpTableOptions.Controls.Add(Me.grpTickMarkLabelsXAxis) - Me.grpTableOptions.Controls.Add(Me.grpXAxisTitle) - Me.grpTableOptions.Controls.Add(Me.grpXAxisLines) - Me.grpTableOptions.Controls.Add(Me.GroupBox5) - Me.grpTableOptions.Location = New System.Drawing.Point(-1, 3) - Me.grpTableOptions.Name = "grpTableOptions" + Me.ucrInputLegendDirection.AddQuotesIfUnrecognised = True + Me.ucrInputLegendDirection.IsReadOnly = False + Me.ucrInputLegendDirection.Location = New System.Drawing.Point(130, 45) + Me.ucrInputLegendDirection.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) + Me.ucrInputLegendDirection.Name = "ucrInputLegendDirection" + Me.ucrInputLegendDirection.Size = New System.Drawing.Size(137, 21) + Me.ucrInputLegendDirection.TabIndex = 100 + ' + 'urChkLegendBoxJust + ' + Me.urChkLegendBoxJust.Checked = False + Me.urChkLegendBoxJust.Location = New System.Drawing.Point(6, 73) + Me.urChkLegendBoxJust.Name = "urChkLegendBoxJust" + Me.urChkLegendBoxJust.Size = New System.Drawing.Size(122, 20) + Me.urChkLegendBoxJust.TabIndex = 103 + ' + 'ucrInputLegendBoxJust + ' + Me.ucrInputLegendBoxJust.AddQuotesIfUnrecognised = True + Me.ucrInputLegendBoxJust.IsReadOnly = False + Me.ucrInputLegendBoxJust.Location = New System.Drawing.Point(130, 71) + Me.ucrInputLegendBoxJust.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) + Me.ucrInputLegendBoxJust.Name = "ucrInputLegendBoxJust" + Me.ucrInputLegendBoxJust.Size = New System.Drawing.Size(137, 21) + Me.ucrInputLegendBoxJust.TabIndex = 102 + ' + 'grpLegendBackGroundAndKey + ' + Me.grpLegendBackGroundAndKey.Controls.Add(Me.ucrLegendBoxBackground) + Me.grpLegendBackGroundAndKey.Controls.Add(Me.ucrLegendBackground) + Me.grpLegendBackGroundAndKey.Controls.Add(Me.ucrLegendKey) + Me.grpLegendBackGroundAndKey.Location = New System.Drawing.Point(6, 246) + Me.grpLegendBackGroundAndKey.Name = "grpLegendBackGroundAndKey" + Me.grpLegendBackGroundAndKey.Size = New System.Drawing.Size(777, 150) + Me.grpLegendBackGroundAndKey.TabIndex = 3 + Me.grpLegendBackGroundAndKey.TabStop = False + Me.grpLegendBackGroundAndKey.Text = "Legend Background and Key" + ' + 'ucrLegendBoxBackground + ' + Me.ucrLegendBoxBackground.Location = New System.Drawing.Point(260, 19) + Me.ucrLegendBoxBackground.Name = "ucrLegendBoxBackground" + Me.ucrLegendBoxBackground.Size = New System.Drawing.Size(253, 130) + Me.ucrLegendBoxBackground.TabIndex = 2 + ' + 'ucrLegendBackground + ' + Me.ucrLegendBackground.Location = New System.Drawing.Point(11, 19) + Me.ucrLegendBackground.Name = "ucrLegendBackground" + Me.ucrLegendBackground.Size = New System.Drawing.Size(253, 130) + Me.ucrLegendBackground.TabIndex = 0 + ' + 'ucrLegendKey + ' + Me.ucrLegendKey.Location = New System.Drawing.Point(519, 19) + Me.ucrLegendKey.Name = "ucrLegendKey" + Me.ucrLegendKey.Size = New System.Drawing.Size(253, 130) + Me.ucrLegendKey.TabIndex = 1 + ' + 'tbThemeYaxis + ' + Me.tbThemeYaxis.Controls.Add(Me.grpLineAlongYAxis) + Me.tbThemeYaxis.Controls.Add(Me.grpYAxisTitle) + Me.tbThemeYaxis.Controls.Add(Me.grpTickMarkLabelsYAxis) + Me.tbThemeYaxis.Controls.Add(Me.grpTickMarkers) + Me.tbThemeYaxis.Location = New System.Drawing.Point(4, 22) + Me.tbThemeYaxis.Name = "tbThemeYaxis" + Me.tbThemeYaxis.Padding = New System.Windows.Forms.Padding(3) + Me.tbThemeYaxis.Size = New System.Drawing.Size(816, 564) + Me.tbThemeYaxis.TabIndex = 1 + Me.tbThemeYaxis.Text = "Y-axis" + Me.tbThemeYaxis.UseVisualStyleBackColor = True + ' + 'grpLineAlongYAxis + ' + Me.grpLineAlongYAxis.Controls.Add(Me.ucrYAxisLines) + Me.grpLineAlongYAxis.Location = New System.Drawing.Point(544, 289) + Me.grpLineAlongYAxis.Name = "grpLineAlongYAxis" + Me.grpLineAlongYAxis.Size = New System.Drawing.Size(260, 136) + Me.grpLineAlongYAxis.TabIndex = 66 + Me.grpLineAlongYAxis.TabStop = False + Me.grpLineAlongYAxis.Text = "Line Along Y-Axis" + ' + 'ucrYAxisLines + ' + Me.ucrYAxisLines.Location = New System.Drawing.Point(4, 12) + Me.ucrYAxisLines.Name = "ucrYAxisLines" + Me.ucrYAxisLines.Size = New System.Drawing.Size(254, 124) + Me.ucrYAxisLines.TabIndex = 63 + ' + 'grpYAxisTitle + ' + Me.grpYAxisTitle.Controls.Add(Me.ucrThemeTitleYRightAxis) + Me.grpYAxisTitle.Controls.Add(Me.ucrThemeTitleYAxis) + Me.grpYAxisTitle.Location = New System.Drawing.Point(4, 23) + Me.grpYAxisTitle.Name = "grpYAxisTitle" + Me.grpYAxisTitle.Size = New System.Drawing.Size(528, 247) + Me.grpYAxisTitle.TabIndex = 67 + Me.grpYAxisTitle.TabStop = False + Me.grpYAxisTitle.Text = "Y-Lab Title" + ' + 'ucrThemeTitleYRightAxis + ' + Me.ucrThemeTitleYRightAxis.Location = New System.Drawing.Point(264, 13) + Me.ucrThemeTitleYRightAxis.Name = "ucrThemeTitleYRightAxis" + Me.ucrThemeTitleYRightAxis.Size = New System.Drawing.Size(262, 227) + Me.ucrThemeTitleYRightAxis.TabIndex = 66 + ' + 'ucrThemeTitleYAxis + ' + Me.ucrThemeTitleYAxis.Location = New System.Drawing.Point(4, 13) + Me.ucrThemeTitleYAxis.Name = "ucrThemeTitleYAxis" + Me.ucrThemeTitleYAxis.Size = New System.Drawing.Size(259, 227) + Me.ucrThemeTitleYAxis.TabIndex = 65 + ' + 'grpTickMarkLabelsYAxis + ' + Me.grpTickMarkLabelsYAxis.Controls.Add(Me.ucrThemeYRightAxis) + Me.grpTickMarkLabelsYAxis.Controls.Add(Me.ucrThemeLeftYAxis) + Me.grpTickMarkLabelsYAxis.Location = New System.Drawing.Point(4, 289) + Me.grpTickMarkLabelsYAxis.Name = "grpTickMarkLabelsYAxis" + Me.grpTickMarkLabelsYAxis.Size = New System.Drawing.Size(528, 243) + Me.grpTickMarkLabelsYAxis.TabIndex = 66 + Me.grpTickMarkLabelsYAxis.TabStop = False + Me.grpTickMarkLabelsYAxis.Text = "Tick Mark Labels " + ' + 'ucrThemeYRightAxis + ' + Me.ucrThemeYRightAxis.Location = New System.Drawing.Point(268, 14) + Me.ucrThemeYRightAxis.Name = "ucrThemeYRightAxis" + Me.ucrThemeYRightAxis.Size = New System.Drawing.Size(262, 226) + Me.ucrThemeYRightAxis.TabIndex = 60 + ' + 'ucrThemeLeftYAxis + ' + Me.ucrThemeLeftYAxis.Location = New System.Drawing.Point(8, 14) + Me.ucrThemeLeftYAxis.Name = "ucrThemeLeftYAxis" + Me.ucrThemeLeftYAxis.Size = New System.Drawing.Size(259, 226) + Me.ucrThemeLeftYAxis.TabIndex = 59 + ' + 'grpTickMarkers + ' + Me.grpTickMarkers.Controls.Add(Me.ucrTickMarksYAxis) + Me.grpTickMarkers.Location = New System.Drawing.Point(540, 24) + Me.grpTickMarkers.Name = "grpTickMarkers" + Me.grpTickMarkers.Size = New System.Drawing.Size(264, 137) + Me.grpTickMarkers.TabIndex = 65 + Me.grpTickMarkers.TabStop = False + Me.grpTickMarkers.Text = "TickMarkers" + ' + 'ucrTickMarksYAxis + ' + Me.ucrTickMarksYAxis.Location = New System.Drawing.Point(4, 10) + Me.ucrTickMarksYAxis.Name = "ucrTickMarksYAxis" + Me.ucrTickMarksYAxis.Size = New System.Drawing.Size(254, 124) + Me.ucrTickMarksYAxis.TabIndex = 63 + ' + 'tbThemeXAxis + ' + Me.tbThemeXAxis.Controls.Add(Me.grpTableOptions) + Me.tbThemeXAxis.Location = New System.Drawing.Point(4, 22) + Me.tbThemeXAxis.Name = "tbThemeXAxis" + Me.tbThemeXAxis.Padding = New System.Windows.Forms.Padding(3) + Me.tbThemeXAxis.Size = New System.Drawing.Size(816, 564) + Me.tbThemeXAxis.TabIndex = 0 + Me.tbThemeXAxis.Text = "X-axis" + Me.tbThemeXAxis.UseVisualStyleBackColor = True + ' + 'grpTableOptions + ' + Me.grpTableOptions.Controls.Add(Me.grpTickMarkLabelsXAxis) + Me.grpTableOptions.Controls.Add(Me.grpXAxisTitle) + Me.grpTableOptions.Controls.Add(Me.grpTickMarks) + Me.grpTableOptions.Location = New System.Drawing.Point(-1, 3) + Me.grpTableOptions.Name = "grpTableOptions" Me.grpTableOptions.Size = New System.Drawing.Size(821, 678) Me.grpTableOptions.TabIndex = 0 Me.grpTableOptions.TabStop = False @@ -371,48 +608,23 @@ Partial Class sdgThemes Me.ucrThemeTitleXAxis.Size = New System.Drawing.Size(260, 231) Me.ucrThemeTitleXAxis.TabIndex = 63 ' - 'grpXAxisLines - ' - Me.grpXAxisLines.Controls.Add(Me.UcrTickMarksAndLabels3) - Me.grpXAxisLines.Controls.Add(Me.ucrXAxisLines) - Me.grpXAxisLines.Location = New System.Drawing.Point(532, 276) - Me.grpXAxisLines.Name = "grpXAxisLines" - Me.grpXAxisLines.Size = New System.Drawing.Size(260, 264) - Me.grpXAxisLines.TabIndex = 68 - Me.grpXAxisLines.TabStop = False - Me.grpXAxisLines.Text = "Line Along X-Axis" + 'grpTickMarks ' - 'UcrTickMarksAndLabels3 - ' - Me.UcrTickMarksAndLabels3.Location = New System.Drawing.Point(4, 134) - Me.UcrTickMarksAndLabels3.Name = "UcrTickMarksAndLabels3" - Me.UcrTickMarksAndLabels3.Size = New System.Drawing.Size(254, 124) - Me.UcrTickMarksAndLabels3.TabIndex = 64 + Me.grpTickMarks.Controls.Add(Me.ucrXAxisLines) + Me.grpTickMarks.Controls.Add(Me.ucrTickMarksXAxis) + Me.grpTickMarks.Location = New System.Drawing.Point(528, 10) + Me.grpTickMarks.Name = "grpTickMarks" + Me.grpTickMarks.Size = New System.Drawing.Size(264, 259) + Me.grpTickMarks.TabIndex = 67 + Me.grpTickMarks.TabStop = False + Me.grpTickMarks.Text = "TickMarkers" ' 'ucrXAxisLines ' - Me.ucrXAxisLines.Location = New System.Drawing.Point(4, 12) + Me.ucrXAxisLines.Location = New System.Drawing.Point(4, 136) Me.ucrXAxisLines.Name = "ucrXAxisLines" Me.ucrXAxisLines.Size = New System.Drawing.Size(254, 124) - Me.ucrXAxisLines.TabIndex = 63 - ' - 'GroupBox5 - ' - Me.GroupBox5.Controls.Add(Me.UcrTickMarksAndLabels5) - Me.GroupBox5.Controls.Add(Me.ucrTickMarksXAxis) - Me.GroupBox5.Location = New System.Drawing.Point(528, 10) - Me.GroupBox5.Name = "GroupBox5" - Me.GroupBox5.Size = New System.Drawing.Size(264, 257) - Me.GroupBox5.TabIndex = 67 - Me.GroupBox5.TabStop = False - Me.GroupBox5.Text = "TickMarkers" - ' - 'UcrTickMarksAndLabels5 - ' - Me.UcrTickMarksAndLabels5.Location = New System.Drawing.Point(4, 132) - Me.UcrTickMarksAndLabels5.Name = "UcrTickMarksAndLabels5" - Me.UcrTickMarksAndLabels5.Size = New System.Drawing.Size(254, 126) - Me.UcrTickMarksAndLabels5.TabIndex = 64 + Me.ucrXAxisLines.TabIndex = 64 ' 'ucrTickMarksXAxis ' @@ -421,20 +633,46 @@ Partial Class sdgThemes Me.ucrTickMarksXAxis.Size = New System.Drawing.Size(254, 124) Me.ucrTickMarksXAxis.TabIndex = 63 ' - 'tbLegend + 'tbXYAxes ' - Me.tbLegend.Controls.Add(Me.tbPLot) - Me.tbLegend.Controls.Add(Me.tbXYAxes) - Me.tbLegend.Controls.Add(Me.tbThemeXAxis) - Me.tbLegend.Controls.Add(Me.tbThemeYaxis) - Me.tbLegend.Controls.Add(Me.tbThemeLegend) - Me.tbLegend.Controls.Add(Me.tbThemePanelAndBackground) - Me.tbLegend.Controls.Add(Me.tbThemeFacets) - Me.tbLegend.Location = New System.Drawing.Point(4, 8) - Me.tbLegend.Name = "tbLegend" - Me.tbLegend.SelectedIndex = 0 - Me.tbLegend.Size = New System.Drawing.Size(824, 581) - Me.tbLegend.TabIndex = 1 + Me.tbXYAxes.Controls.Add(Me.ucrThemeAxesLines) + Me.tbXYAxes.Controls.Add(Me.ucrThemeAxesTickLabels) + Me.tbXYAxes.Controls.Add(Me.ucrTickMarksAxes) + Me.tbXYAxes.Controls.Add(Me.ucrThemeAxesTitle) + Me.tbXYAxes.Location = New System.Drawing.Point(4, 22) + Me.tbXYAxes.Name = "tbXYAxes" + Me.tbXYAxes.Size = New System.Drawing.Size(816, 564) + Me.tbXYAxes.TabIndex = 6 + Me.tbXYAxes.Text = "XY-Axes" + Me.tbXYAxes.UseVisualStyleBackColor = True + ' + 'ucrThemeAxesLines + ' + Me.ucrThemeAxesLines.Location = New System.Drawing.Point(271, 246) + Me.ucrThemeAxesLines.Name = "ucrThemeAxesLines" + Me.ucrThemeAxesLines.Size = New System.Drawing.Size(257, 122) + Me.ucrThemeAxesLines.TabIndex = 64 + ' + 'ucrThemeAxesTickLabels + ' + Me.ucrThemeAxesTickLabels.Location = New System.Drawing.Point(268, 13) + Me.ucrThemeAxesTickLabels.Name = "ucrThemeAxesTickLabels" + Me.ucrThemeAxesTickLabels.Size = New System.Drawing.Size(255, 228) + Me.ucrThemeAxesTickLabels.TabIndex = 63 + ' + 'ucrTickMarksAxes + ' + Me.ucrTickMarksAxes.Location = New System.Drawing.Point(4, 244) + Me.ucrTickMarksAxes.Name = "ucrTickMarksAxes" + Me.ucrTickMarksAxes.Size = New System.Drawing.Size(257, 122) + Me.ucrTickMarksAxes.TabIndex = 62 + ' + 'ucrThemeAxesTitle + ' + Me.ucrThemeAxesTitle.Location = New System.Drawing.Point(7, 13) + Me.ucrThemeAxesTitle.Name = "ucrThemeAxesTitle" + Me.ucrThemeAxesTitle.Size = New System.Drawing.Size(255, 228) + Me.ucrThemeAxesTitle.TabIndex = 59 ' 'tbPLot ' @@ -443,7 +681,7 @@ Partial Class sdgThemes Me.tbPLot.Location = New System.Drawing.Point(4, 22) Me.tbPLot.Name = "tbPLot" Me.tbPLot.Padding = New System.Windows.Forms.Padding(3) - Me.tbPLot.Size = New System.Drawing.Size(816, 555) + Me.tbPLot.Size = New System.Drawing.Size(816, 564) Me.tbPLot.TabIndex = 7 Me.tbPLot.Text = "Plot" Me.tbPLot.UseVisualStyleBackColor = True @@ -498,304 +736,26 @@ Partial Class sdgThemes Me.ucrPlotTitle.Size = New System.Drawing.Size(255, 224) Me.ucrPlotTitle.TabIndex = 64 ' - 'tbXYAxes - ' - Me.tbXYAxes.Controls.Add(Me.ucrThemeAxesLines) - Me.tbXYAxes.Controls.Add(Me.ucrThemeAxesTickLabels) - Me.tbXYAxes.Controls.Add(Me.ucrTickMarksAxes) - Me.tbXYAxes.Controls.Add(Me.GroupBox2) - Me.tbXYAxes.Controls.Add(Me.ucrThemeAxesTitle) - Me.tbXYAxes.Location = New System.Drawing.Point(4, 22) - Me.tbXYAxes.Name = "tbXYAxes" - Me.tbXYAxes.Size = New System.Drawing.Size(816, 555) - Me.tbXYAxes.TabIndex = 6 - Me.tbXYAxes.Text = "XY-Axes" - Me.tbXYAxes.UseVisualStyleBackColor = True - ' - 'ucrThemeAxesLines - ' - Me.ucrThemeAxesLines.Location = New System.Drawing.Point(271, 246) - Me.ucrThemeAxesLines.Name = "ucrThemeAxesLines" - Me.ucrThemeAxesLines.Size = New System.Drawing.Size(257, 122) - Me.ucrThemeAxesLines.TabIndex = 64 + 'tbLegend ' - 'ucrThemeAxesTickLabels + Me.tbLegend.Controls.Add(Me.tbPLot) + Me.tbLegend.Controls.Add(Me.tbXYAxes) + Me.tbLegend.Controls.Add(Me.tbThemeXAxis) + Me.tbLegend.Controls.Add(Me.tbThemeYaxis) + Me.tbLegend.Controls.Add(Me.tbThemeLegend) + Me.tbLegend.Controls.Add(Me.tbThemePanelAndBackground) + Me.tbLegend.Controls.Add(Me.tbThemeFacets) + Me.tbLegend.Location = New System.Drawing.Point(4, 8) + Me.tbLegend.Name = "tbLegend" + Me.tbLegend.SelectedIndex = 0 + Me.tbLegend.Size = New System.Drawing.Size(824, 590) + Me.tbLegend.TabIndex = 1 ' - Me.ucrThemeAxesTickLabels.Location = New System.Drawing.Point(268, 13) - Me.ucrThemeAxesTickLabels.Name = "ucrThemeAxesTickLabels" - Me.ucrThemeAxesTickLabels.Size = New System.Drawing.Size(255, 228) - Me.ucrThemeAxesTickLabels.TabIndex = 63 - ' - 'ucrTickMarksAxes - ' - Me.ucrTickMarksAxes.Location = New System.Drawing.Point(4, 244) - Me.ucrTickMarksAxes.Name = "ucrTickMarksAxes" - Me.ucrTickMarksAxes.Size = New System.Drawing.Size(257, 122) - Me.ucrTickMarksAxes.TabIndex = 62 - ' - 'GroupBox2 - ' - Me.GroupBox2.Location = New System.Drawing.Point(7, 372) - Me.GroupBox2.Name = "GroupBox2" - Me.GroupBox2.Size = New System.Drawing.Size(264, 149) - Me.GroupBox2.TabIndex = 61 - Me.GroupBox2.TabStop = False - ' - 'ucrThemeAxesTitle - ' - Me.ucrThemeAxesTitle.Location = New System.Drawing.Point(7, 13) - Me.ucrThemeAxesTitle.Name = "ucrThemeAxesTitle" - Me.ucrThemeAxesTitle.Size = New System.Drawing.Size(255, 228) - Me.ucrThemeAxesTitle.TabIndex = 59 - ' - 'tbThemeLegend - ' - Me.tbThemeLegend.Controls.Add(Me.grpLegendTitleAndText) - Me.tbThemeLegend.Controls.Add(Me.grpLegendAdjustments) - Me.tbThemeLegend.Controls.Add(Me.grpLegendBackGroundAndKey) - Me.tbThemeLegend.Location = New System.Drawing.Point(4, 22) - Me.tbThemeLegend.Name = "tbThemeLegend" - Me.tbThemeLegend.Padding = New System.Windows.Forms.Padding(3) - Me.tbThemeLegend.Size = New System.Drawing.Size(816, 555) - Me.tbThemeLegend.TabIndex = 2 - Me.tbThemeLegend.Text = "Legend" - Me.tbThemeLegend.UseVisualStyleBackColor = True - ' - 'grpLegendTitleAndText - ' - Me.grpLegendTitleAndText.Controls.Add(Me.ucrLegendText) - Me.grpLegendTitleAndText.Controls.Add(Me.ucrLegendTitle) - Me.grpLegendTitleAndText.Location = New System.Drawing.Point(6, 6) - Me.grpLegendTitleAndText.Name = "grpLegendTitleAndText" - Me.grpLegendTitleAndText.Size = New System.Drawing.Size(530, 242) - Me.grpLegendTitleAndText.TabIndex = 101 - Me.grpLegendTitleAndText.TabStop = False - Me.grpLegendTitleAndText.Text = "Legend Title and Text" - ' - 'ucrLegendText - ' - Me.ucrLegendText.Location = New System.Drawing.Point(275, 12) - Me.ucrLegendText.Name = "ucrLegendText" - Me.ucrLegendText.Size = New System.Drawing.Size(255, 224) - Me.ucrLegendText.TabIndex = 65 - ' - 'ucrLegendTitle - ' - Me.ucrLegendTitle.Location = New System.Drawing.Point(14, 12) - Me.ucrLegendTitle.Name = "ucrLegendTitle" - Me.ucrLegendTitle.Size = New System.Drawing.Size(255, 224) - Me.ucrLegendTitle.TabIndex = 64 - ' - 'grpLegendAdjustments - ' - Me.grpLegendAdjustments.Controls.Add(Me.ucrChkLegendJustification) - Me.grpLegendAdjustments.Controls.Add(Me.ucrInputLegendJustification) - Me.grpLegendAdjustments.Controls.Add(Me.ucrChkLegendBox) - Me.grpLegendAdjustments.Controls.Add(Me.ucrInputLegendBox) - Me.grpLegendAdjustments.Controls.Add(Me.urChkLegendPosition) - Me.grpLegendAdjustments.Controls.Add(Me.ucrChkLegendDirection) - Me.grpLegendAdjustments.Controls.Add(Me.ucrInputLegendPosition) - Me.grpLegendAdjustments.Controls.Add(Me.ucrInputLegendDirection) - Me.grpLegendAdjustments.Controls.Add(Me.urChkLegendBoxJust) - Me.grpLegendAdjustments.Controls.Add(Me.ucrInputLegendBoxJust) - Me.grpLegendAdjustments.Location = New System.Drawing.Point(541, 6) - Me.grpLegendAdjustments.Name = "grpLegendAdjustments" - Me.grpLegendAdjustments.Size = New System.Drawing.Size(272, 161) - Me.grpLegendAdjustments.TabIndex = 100 - Me.grpLegendAdjustments.TabStop = False - Me.grpLegendAdjustments.Text = "Legend Adjustments" - ' - 'ucrChkLegendJustification - ' - Me.ucrChkLegendJustification.Checked = False - Me.ucrChkLegendJustification.Location = New System.Drawing.Point(6, 128) - Me.ucrChkLegendJustification.Name = "ucrChkLegendJustification" - Me.ucrChkLegendJustification.Size = New System.Drawing.Size(122, 20) - Me.ucrChkLegendJustification.TabIndex = 109 - ' - 'ucrInputLegendJustification - ' - Me.ucrInputLegendJustification.AddQuotesIfUnrecognised = True - Me.ucrInputLegendJustification.IsReadOnly = False - Me.ucrInputLegendJustification.Location = New System.Drawing.Point(130, 126) - Me.ucrInputLegendJustification.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) - Me.ucrInputLegendJustification.Name = "ucrInputLegendJustification" - Me.ucrInputLegendJustification.Size = New System.Drawing.Size(137, 21) - Me.ucrInputLegendJustification.TabIndex = 108 - ' - 'ucrChkLegendBox - ' - Me.ucrChkLegendBox.Checked = False - Me.ucrChkLegendBox.Location = New System.Drawing.Point(6, 100) - Me.ucrChkLegendBox.Name = "ucrChkLegendBox" - Me.ucrChkLegendBox.Size = New System.Drawing.Size(122, 20) - Me.ucrChkLegendBox.TabIndex = 107 - ' - 'ucrInputLegendBox - ' - Me.ucrInputLegendBox.AddQuotesIfUnrecognised = True - Me.ucrInputLegendBox.IsReadOnly = False - Me.ucrInputLegendBox.Location = New System.Drawing.Point(130, 98) - Me.ucrInputLegendBox.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) - Me.ucrInputLegendBox.Name = "ucrInputLegendBox" - Me.ucrInputLegendBox.Size = New System.Drawing.Size(137, 21) - Me.ucrInputLegendBox.TabIndex = 106 - ' - 'urChkLegendPosition - ' - Me.urChkLegendPosition.Checked = False - Me.urChkLegendPosition.Location = New System.Drawing.Point(6, 21) - Me.urChkLegendPosition.Name = "urChkLegendPosition" - Me.urChkLegendPosition.Size = New System.Drawing.Size(122, 20) - Me.urChkLegendPosition.TabIndex = 105 - ' - 'ucrChkLegendDirection - ' - Me.ucrChkLegendDirection.Checked = False - Me.ucrChkLegendDirection.Location = New System.Drawing.Point(6, 47) - Me.ucrChkLegendDirection.Name = "ucrChkLegendDirection" - Me.ucrChkLegendDirection.Size = New System.Drawing.Size(122, 20) - Me.ucrChkLegendDirection.TabIndex = 101 - ' - 'ucrInputLegendPosition - ' - Me.ucrInputLegendPosition.AddQuotesIfUnrecognised = True - Me.ucrInputLegendPosition.IsReadOnly = False - Me.ucrInputLegendPosition.Location = New System.Drawing.Point(130, 19) - Me.ucrInputLegendPosition.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) - Me.ucrInputLegendPosition.Name = "ucrInputLegendPosition" - Me.ucrInputLegendPosition.Size = New System.Drawing.Size(137, 21) - Me.ucrInputLegendPosition.TabIndex = 104 - ' - 'ucrInputLegendDirection - ' - Me.ucrInputLegendDirection.AddQuotesIfUnrecognised = True - Me.ucrInputLegendDirection.IsReadOnly = False - Me.ucrInputLegendDirection.Location = New System.Drawing.Point(130, 45) - Me.ucrInputLegendDirection.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) - Me.ucrInputLegendDirection.Name = "ucrInputLegendDirection" - Me.ucrInputLegendDirection.Size = New System.Drawing.Size(137, 21) - Me.ucrInputLegendDirection.TabIndex = 100 - ' - 'urChkLegendBoxJust - ' - Me.urChkLegendBoxJust.Checked = False - Me.urChkLegendBoxJust.Location = New System.Drawing.Point(6, 73) - Me.urChkLegendBoxJust.Name = "urChkLegendBoxJust" - Me.urChkLegendBoxJust.Size = New System.Drawing.Size(122, 20) - Me.urChkLegendBoxJust.TabIndex = 103 - ' - 'ucrInputLegendBoxJust - ' - Me.ucrInputLegendBoxJust.AddQuotesIfUnrecognised = True - Me.ucrInputLegendBoxJust.IsReadOnly = False - Me.ucrInputLegendBoxJust.Location = New System.Drawing.Point(130, 71) - Me.ucrInputLegendBoxJust.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) - Me.ucrInputLegendBoxJust.Name = "ucrInputLegendBoxJust" - Me.ucrInputLegendBoxJust.Size = New System.Drawing.Size(137, 21) - Me.ucrInputLegendBoxJust.TabIndex = 102 - ' - 'grpLegendBackGroundAndKey - ' - Me.grpLegendBackGroundAndKey.Controls.Add(Me.ucrLegendBoxBackground) - Me.grpLegendBackGroundAndKey.Controls.Add(Me.ucrLegendBackground) - Me.grpLegendBackGroundAndKey.Controls.Add(Me.ucrLegendKey) - Me.grpLegendBackGroundAndKey.Location = New System.Drawing.Point(6, 246) - Me.grpLegendBackGroundAndKey.Name = "grpLegendBackGroundAndKey" - Me.grpLegendBackGroundAndKey.Size = New System.Drawing.Size(777, 150) - Me.grpLegendBackGroundAndKey.TabIndex = 3 - Me.grpLegendBackGroundAndKey.TabStop = False - Me.grpLegendBackGroundAndKey.Text = "Legend Background and Key" - ' - 'ucrLegendBoxBackground - ' - Me.ucrLegendBoxBackground.Location = New System.Drawing.Point(260, 19) - Me.ucrLegendBoxBackground.Name = "ucrLegendBoxBackground" - Me.ucrLegendBoxBackground.Size = New System.Drawing.Size(253, 130) - Me.ucrLegendBoxBackground.TabIndex = 2 - ' - 'ucrLegendBackground - ' - Me.ucrLegendBackground.Location = New System.Drawing.Point(11, 19) - Me.ucrLegendBackground.Name = "ucrLegendBackground" - Me.ucrLegendBackground.Size = New System.Drawing.Size(253, 130) - Me.ucrLegendBackground.TabIndex = 0 - ' - 'ucrLegendKey - ' - Me.ucrLegendKey.Location = New System.Drawing.Point(519, 19) - Me.ucrLegendKey.Name = "ucrLegendKey" - Me.ucrLegendKey.Size = New System.Drawing.Size(253, 130) - Me.ucrLegendKey.TabIndex = 1 - ' - 'ucrBaseSubdialogue - ' - Me.ucrBaseSubdialogue.Location = New System.Drawing.Point(349, 595) - Me.ucrBaseSubdialogue.Name = "ucrBaseSubdialogue" - Me.ucrBaseSubdialogue.Size = New System.Drawing.Size(142, 30) - Me.ucrBaseSubdialogue.TabIndex = 0 - ' - 'ucrInputTickUnits - ' - Me.ucrInputTickUnits.AddQuotesIfUnrecognised = True - Me.ucrInputTickUnits.IsReadOnly = False - Me.ucrInputTickUnits.Location = New System.Drawing.Point(114, 52) - Me.ucrInputTickUnits.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) - Me.ucrInputTickUnits.Name = "ucrInputTickUnits" - Me.ucrInputTickUnits.Size = New System.Drawing.Size(137, 21) - Me.ucrInputTickUnits.TabIndex = 60 - ' - 'ucrChkUnits - ' - Me.ucrChkUnits.Checked = False - Me.ucrChkUnits.Location = New System.Drawing.Point(14, 20) - Me.ucrChkUnits.Name = "ucrChkUnits" - Me.ucrChkUnits.Size = New System.Drawing.Size(100, 20) - Me.ucrChkUnits.TabIndex = 61 - ' - 'ucrInputUnits - ' - Me.ucrInputUnits.AddQuotesIfUnrecognised = True - Me.ucrInputUnits.IsMultiline = False - Me.ucrInputUnits.IsReadOnly = False - Me.ucrInputUnits.Location = New System.Drawing.Point(114, 20) - Me.ucrInputUnits.Name = "ucrInputUnits" - Me.ucrInputUnits.Size = New System.Drawing.Size(50, 23) - Me.ucrInputUnits.TabIndex = 62 - ' - 'ucrInputMarginUnits - ' - Me.ucrInputMarginUnits.AddQuotesIfUnrecognised = True - Me.ucrInputMarginUnits.IsReadOnly = False - Me.ucrInputMarginUnits.Location = New System.Drawing.Point(114, 114) - Me.ucrInputMarginUnits.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) - Me.ucrInputMarginUnits.Name = "ucrInputMarginUnits" - Me.ucrInputMarginUnits.Size = New System.Drawing.Size(137, 21) - Me.ucrInputMarginUnits.TabIndex = 63 - ' - 'ucrChkMaigin - ' - Me.ucrChkMaigin.Checked = False - Me.ucrChkMaigin.Location = New System.Drawing.Point(14, 82) - Me.ucrChkMaigin.Name = "ucrChkMaigin" - Me.ucrChkMaigin.Size = New System.Drawing.Size(100, 20) - Me.ucrChkMaigin.TabIndex = 64 - ' - 'ucrInputMargin - ' - Me.ucrInputMargin.AddQuotesIfUnrecognised = True - Me.ucrInputMargin.IsMultiline = False - Me.ucrInputMargin.IsReadOnly = False - Me.ucrInputMargin.Location = New System.Drawing.Point(114, 82) - Me.ucrInputMargin.Name = "ucrInputMargin" - Me.ucrInputMargin.Size = New System.Drawing.Size(50, 23) - Me.ucrInputMargin.TabIndex = 65 - ' - 'sdgThemes + 'sdgThemes ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(833, 633) + Me.ClientSize = New System.Drawing.Size(833, 653) Me.Controls.Add(Me.tbLegend) Me.Controls.Add(Me.ucrBaseSubdialogue) Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog @@ -804,11 +764,18 @@ Partial Class sdgThemes Me.Name = "sdgThemes" Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen Me.Text = "Themes" + Me.tbThemeFacets.ResumeLayout(False) + Me.grpFacetBackground.ResumeLayout(False) + Me.grpFacetLabels.ResumeLayout(False) Me.tbThemePanelAndBackground.ResumeLayout(False) Me.grpBorderAndBackground.ResumeLayout(False) Me.grpPAnelGrid.ResumeLayout(False) + Me.tbThemeLegend.ResumeLayout(False) + Me.grpLegendTitleAndText.ResumeLayout(False) + Me.grpLegendAdjustments.ResumeLayout(False) + Me.grpLegendBackGroundAndKey.ResumeLayout(False) Me.tbThemeYaxis.ResumeLayout(False) - Me.GroupBox1.ResumeLayout(False) + Me.grpLineAlongYAxis.ResumeLayout(False) Me.grpYAxisTitle.ResumeLayout(False) Me.grpTickMarkLabelsYAxis.ResumeLayout(False) Me.grpTickMarkers.ResumeLayout(False) @@ -816,52 +783,36 @@ Partial Class sdgThemes Me.grpTableOptions.ResumeLayout(False) Me.grpTickMarkLabelsXAxis.ResumeLayout(False) Me.grpXAxisTitle.ResumeLayout(False) - Me.grpXAxisLines.ResumeLayout(False) - Me.GroupBox5.ResumeLayout(False) - Me.tbLegend.ResumeLayout(False) + Me.grpTickMarks.ResumeLayout(False) + Me.tbXYAxes.ResumeLayout(False) Me.tbPLot.ResumeLayout(False) Me.grpPlotBackground.ResumeLayout(False) Me.grpPlotTitleAndCaption.ResumeLayout(False) - Me.tbXYAxes.ResumeLayout(False) - Me.tbThemeLegend.ResumeLayout(False) - Me.grpLegendTitleAndText.ResumeLayout(False) - Me.grpLegendAdjustments.ResumeLayout(False) - Me.grpLegendBackGroundAndKey.ResumeLayout(False) + Me.tbLegend.ResumeLayout(False) Me.ResumeLayout(False) End Sub Friend WithEvents ucrBaseSubdialogue As ucrButtonsSubdialogue Friend WithEvents tbThemeFacets As TabPage + Friend WithEvents grpFacetBackground As GroupBox + Friend WithEvents ucrStripBackGround As ucrElementRectControl + Friend WithEvents grpFacetLabels As GroupBox + Friend WithEvents ucrStripTextYAxis As ucrELementTextControl + Friend WithEvents ucrStripTextXAxis As ucrELementTextControl + Friend WithEvents ucrStripText As ucrELementTextControl Friend WithEvents tbThemePanelAndBackground As TabPage - Friend WithEvents tbThemeYaxis As TabPage - Friend WithEvents tbThemeXAxis As TabPage - Friend WithEvents grpTableOptions As GroupBox - Friend WithEvents tbLegend As TabControl - Friend WithEvents grpTickMarkers As GroupBox - Friend WithEvents ucrTickMarksYAxis As ucrElementLineControl - Friend WithEvents grpTickMarkLabelsYAxis As GroupBox - Friend WithEvents ucrThemeYRightAxis As ucrELementTextControl - Friend WithEvents ucrThemeLeftYAxis As ucrELementTextControl - Friend WithEvents grpYAxisTitle As GroupBox - Friend WithEvents ucrThemeTitleYRightAxis As ucrELementTextControl - Friend WithEvents ucrThemeTitleYAxis As ucrELementTextControl - Friend WithEvents GroupBox1 As GroupBox - Friend WithEvents ucrYAxisLines As ucrElementLineControl - Friend WithEvents grpXAxisLines As GroupBox - Friend WithEvents UcrTickMarksAndLabels3 As ucrElementLineControl - Friend WithEvents ucrXAxisLines As ucrElementLineControl - Friend WithEvents GroupBox5 As GroupBox - Friend WithEvents UcrTickMarksAndLabels5 As ucrElementLineControl - Friend WithEvents ucrTickMarksXAxis As ucrElementLineControl - Friend WithEvents grpXAxisTitle As GroupBox - Friend WithEvents ucrThemeTitleXTopAxis As ucrELementTextControl - Friend WithEvents ucrThemeTitleXAxis As ucrELementTextControl - Friend WithEvents grpTickMarkLabelsXAxis As GroupBox - Friend WithEvents ucrThemeBottomXAxis As ucrELementTextControl - Friend WithEvents ucrThemeTopXAxis As ucrELementTextControl + Friend WithEvents grpBorderAndBackground As GroupBox + Friend WithEvents ucrPanelBackGround As ucrElementRectControl + Friend WithEvents ucrPanelBorder As ucrElementRectControl + Friend WithEvents grpPAnelGrid As GroupBox + Friend WithEvents ucrPanelGridMinor As ucrElementLineControl + Friend WithEvents ucrPanelGridMajor As ucrElementLineControl + Friend WithEvents ucrPanelGrid As ucrElementLineControl Friend WithEvents tbThemeLegend As TabPage - Friend WithEvents grpLegendBackGroundAndKey As GroupBox + Friend WithEvents grpLegendTitleAndText As GroupBox + Friend WithEvents ucrLegendText As ucrELementTextControl + Friend WithEvents ucrLegendTitle As ucrELementTextControl Friend WithEvents grpLegendAdjustments As GroupBox Friend WithEvents ucrChkLegendJustification As ucrCheck Friend WithEvents ucrInputLegendJustification As ucrInputComboBox @@ -873,36 +824,43 @@ Partial Class sdgThemes Friend WithEvents ucrInputLegendDirection As ucrInputComboBox Friend WithEvents urChkLegendBoxJust As ucrCheck Friend WithEvents ucrInputLegendBoxJust As ucrInputComboBox - Friend WithEvents grpLegendTitleAndText As GroupBox - Friend WithEvents ucrLegendText As ucrELementTextControl - Friend WithEvents ucrLegendTitle As ucrELementTextControl - Friend WithEvents grpPAnelGrid As GroupBox - Friend WithEvents ucrPanelGridMinor As ucrElementLineControl - Friend WithEvents ucrPanelGridMajor As ucrElementLineControl - Friend WithEvents ucrPanelGrid As ucrElementLineControl + Friend WithEvents grpLegendBackGroundAndKey As GroupBox Friend WithEvents ucrLegendBoxBackground As ucrElementRectControl Friend WithEvents ucrLegendBackground As ucrElementRectControl Friend WithEvents ucrLegendKey As ucrElementRectControl - Friend WithEvents grpBorderAndBackground As GroupBox - Friend WithEvents ucrPanelBackGround As ucrElementRectControl - Friend WithEvents ucrPanelBorder As ucrElementRectControl - Friend WithEvents tbPLot As TabPage - Friend WithEvents ucrThemeAxesTitle As ucrELementTextControl - Friend WithEvents GroupBox2 As GroupBox - Friend WithEvents ucrInputTickUnits As ucrInputComboBox - Friend WithEvents ucrChkUnits As ucrCheck - Friend WithEvents ucrInputUnits As ucrInputTextBox - Friend WithEvents ucrInputMarginUnits As ucrInputComboBox - Friend WithEvents ucrChkMaigin As ucrCheck - Friend WithEvents ucrInputMargin As ucrInputTextBox - Friend WithEvents ucrTickMarksAxes As ucrElementLineControl - Friend WithEvents ucrThemeAxesTickLabels As ucrELementTextControl - Friend WithEvents ucrThemeAxesLines As ucrElementLineControl + Friend WithEvents tbThemeYaxis As TabPage + Friend WithEvents grpLineAlongYAxis As GroupBox + Friend WithEvents ucrYAxisLines As ucrElementLineControl + Friend WithEvents grpYAxisTitle As GroupBox + Friend WithEvents ucrThemeTitleYRightAxis As ucrELementTextControl + Friend WithEvents ucrThemeTitleYAxis As ucrELementTextControl + Friend WithEvents grpTickMarkLabelsYAxis As GroupBox + Friend WithEvents ucrThemeYRightAxis As ucrELementTextControl + Friend WithEvents ucrThemeLeftYAxis As ucrELementTextControl + Friend WithEvents grpTickMarkers As GroupBox + Friend WithEvents ucrTickMarksYAxis As ucrElementLineControl + Friend WithEvents tbThemeXAxis As TabPage + Friend WithEvents grpTableOptions As GroupBox + Friend WithEvents grpTickMarkLabelsXAxis As GroupBox + Friend WithEvents ucrThemeTopXAxis As ucrELementTextControl + Friend WithEvents ucrThemeBottomXAxis As ucrELementTextControl + Friend WithEvents grpXAxisTitle As GroupBox + Friend WithEvents ucrThemeTitleXTopAxis As ucrELementTextControl + Friend WithEvents ucrThemeTitleXAxis As ucrELementTextControl + Friend WithEvents grpTickMarks As GroupBox + Friend WithEvents ucrXAxisLines As ucrElementLineControl + Friend WithEvents ucrTickMarksXAxis As ucrElementLineControl Friend WithEvents tbXYAxes As TabPage + Friend WithEvents ucrThemeAxesLines As ucrElementLineControl + Friend WithEvents ucrThemeAxesTickLabels As ucrELementTextControl + Friend WithEvents ucrTickMarksAxes As ucrElementLineControl + Friend WithEvents ucrThemeAxesTitle As ucrELementTextControl + Friend WithEvents tbPLot As TabPage + Friend WithEvents grpPlotBackground As GroupBox + Friend WithEvents ucrPlotBackGround As ucrElementRectControl Friend WithEvents grpPlotTitleAndCaption As GroupBox Friend WithEvents ucrPlotCaption As ucrELementTextControl Friend WithEvents ucrPlotSubTitle As ucrELementTextControl Friend WithEvents ucrPlotTitle As ucrELementTextControl - Friend WithEvents grpPlotBackground As GroupBox - Friend WithEvents ucrPlotBackGround As ucrElementRectControl + Friend WithEvents tbLegend As TabControl End Class diff --git a/instat/sdgThemes.vb b/instat/sdgThemes.vb index a81c482c32b..c27d7ba779b 100644 --- a/instat/sdgThemes.vb +++ b/instat/sdgThemes.vb @@ -20,6 +20,14 @@ Public Class sdgThemes Public bControlsInitialised As Boolean = False Private clsElementLine, clsElementRect, clsElementXAxisTextTop, clsElementXAxisLine, clsElementYAxisLine, clsElementText, clsElementYAxisTextRight, clsElementXAxisLineTop, clsThemeFunction As New RFunction + Private Sub grpTableOptions_Enter(sender As Object, e As EventArgs) Handles grpTableOptions.Enter + + End Sub + + Private Sub ucrYAxisLines_Load(sender As Object, e As EventArgs) + + End Sub + Private clsBaseOperator As New ROperator Private dctThemeFunctions As New Dictionary(Of String, RFunction) @@ -69,6 +77,10 @@ Public Class sdgThemes ucrPlotSubTitle.setlabel("Plot subtitle(text appearance)") ucrPlotTitle.setlabel("Caption below the plot (text appearance)") + ucrStripBackGround.setlabel("Background of facet labels") + ucrStripText.setlabel("Facet labels") + ucrStripTextXAxis.setlabel("Facet labels along horizontal direction") + ucrStripTextYAxis.setlabel("Facet labels along vertical direction") 'Units ucrChkUnits.SetText("Tick length") ucrInputTickUnits.SetParameter(New RParameter("units")) @@ -148,6 +160,10 @@ Public Class sdgThemes Dim clsElementPlotSubtitle As New RFunction Dim clsElementPlotCaption As New RFunction + Dim clsElementStripText As New RFunction + Dim clsElementStripTextXAxis As New RFunction + Dim clsElementStripTextYAxis As New RFunction + Dim clsXElementLine As New RFunction Dim clsElementLineAxes As New RFunction Dim clsYElementLine As New RFunction @@ -165,6 +181,7 @@ Public Class sdgThemes Dim clsElementPanelBackGround As New RFunction Dim clsElementPlotBackground As New RFunction + Dim clsElementStripBackground As New RFunction Dim clsElementPanelGrid As New RFunction Dim clsElementPanelGridMajor As New RFunction @@ -196,6 +213,10 @@ Public Class sdgThemes dctThemeFunctions.TryGetValue("plot.subtitle", clsElementPlotSubtitle) dctThemeFunctions.TryGetValue("plot.caption", clsElementPlotCaption) + dctThemeFunctions.TryGetValue("strip.text", clsElementStripText) + dctThemeFunctions.TryGetValue("strip.text.x", clsElementStripTextXAxis) + dctThemeFunctions.TryGetValue("strip.text.y", clsElementStripTextYAxis) + dctThemeFunctions.TryGetValue("axis.ticks.x", clsXElementLine) dctThemeFunctions.TryGetValue("axis.ticks.y", clsYElementLine) dctThemeFunctions.TryGetValue("axis.line.x", clsElementLineXAxis) @@ -215,6 +236,8 @@ Public Class sdgThemes dctThemeFunctions.TryGetValue("plot.background", clsElementPlotBackground) + dctThemeFunctions.TryGetValue("strip.background", clsElementStripBackground) + ucrTickMarksXAxis.SetRCodeForControl("axis.ticks.x", clsXElementLine, clsNewThemeFunction:=clsThemeFunction, clsNewBaseOperator:=clsBaseOperator, bReset:=bReset) ucrTickMarksYAxis.SetRCodeForControl("axis.ticks.y", clsYElementLine, clsNewThemeFunction:=clsThemeFunction, clsNewBaseOperator:=clsBaseOperator, bReset:=bReset) ucrXAxisLines.SetRCodeForControl("axis.line.x", clsElementLineXAxis, clsNewThemeFunction:=clsThemeFunction, clsNewBaseOperator:=clsBaseOperator, bReset:=bReset) @@ -251,6 +274,10 @@ Public Class sdgThemes ucrPlotSubTitle.SetRCodeForControl("plot.subtitle", clsElementPlotSubtitle, clsNewThemeFunction:=clsThemeFunction, clsNewBaseOperator:=clsBaseOperator, bReset:=bReset) ucrPlotTitle.SetRCodeForControl("plot.title", clsElementPlotTitle, clsNewThemeFunction:=clsThemeFunction, clsNewBaseOperator:=clsBaseOperator, bReset:=bReset) + ucrStripBackGround.SetRCodeForControl("strip.background", clsElementStripBackground, clsNewThemeFunction:=clsThemeFunction, clsNewBaseOperator:=clsBaseOperator, bReset:=bReset) + ucrStripText.SetRCodeForControl("strip.text", clsElementStripText, clsNewThemeFunction:=clsThemeFunction, clsNewBaseOperator:=clsBaseOperator, bReset:=bReset) + ucrStripTextXAxis.SetRCodeForControl("strip.text.x", clsElementStripTextXAxis, clsNewThemeFunction:=clsThemeFunction, clsNewBaseOperator:=clsBaseOperator, bReset:=bReset) + ucrStripTextYAxis.SetRCodeForControl("strip.text.y", clsElementStripTextYAxis, clsNewThemeFunction:=clsThemeFunction, clsNewBaseOperator:=clsBaseOperator, bReset:=bReset) urChkLegendPosition.SetRCode(clsThemeFunction, bReset) ucrInputLegendPosition.SetRCode(clsThemeFunction, bReset) @@ -311,7 +338,7 @@ Public Class sdgThemes End If End Sub - Private Sub ElementLegendControls_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkLegendBox.ControlValueChanged, ucrChkLegendDirection.ControlValueChanged, ucrChkLegendJustification.ControlValueChanged, urChkLegendBoxJust.ControlValueChanged, urChkLegendPosition.ControlValueChanged + Private Sub ElementLegendControls_ControlValueChanged(ucrChangedControl As ucrCore) Handles urChkLegendPosition.ControlValueChanged, urChkLegendBoxJust.ControlValueChanged, ucrChkLegendJustification.ControlValueChanged, ucrChkLegendDirection.ControlValueChanged, ucrChkLegendBox.ControlValueChanged AddRemoveElementParameters() End Sub End Class \ No newline at end of file diff --git a/instat/ucrGridUnit.Designer.vb b/instat/ucrGridUnit.Designer.vb new file mode 100644 index 00000000000..cccd10c48ed --- /dev/null +++ b/instat/ucrGridUnit.Designer.vb @@ -0,0 +1,115 @@ + _ +Partial Class ucrGridUnit + Inherits System.Windows.Forms.UserControl + + 'UserControl 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.grpUnits = New System.Windows.Forms.GroupBox() + Me.ucrInputData = New instat.ucrInputTextBox() + Me.ucrInputVector = New instat.ucrInputTextBox() + Me.ucrInputUnits = New instat.ucrInputComboBox() + Me.ucrChkUnits = New instat.ucrCheck() + Me.Label1 = New System.Windows.Forms.Label() + Me.grpUnits.SuspendLayout() + Me.SuspendLayout() + ' + 'grpUnits + ' + Me.grpUnits.Controls.Add(Me.Label1) + Me.grpUnits.Controls.Add(Me.ucrInputData) + Me.grpUnits.Controls.Add(Me.ucrInputVector) + Me.grpUnits.Controls.Add(Me.ucrInputUnits) + Me.grpUnits.Controls.Add(Me.ucrChkUnits) + Me.grpUnits.Location = New System.Drawing.Point(-2, -3) + Me.grpUnits.Name = "grpUnits" + Me.grpUnits.Size = New System.Drawing.Size(279, 120) + Me.grpUnits.TabIndex = 108 + Me.grpUnits.TabStop = False + Me.grpUnits.Text = "Units" + ' + 'ucrInputData + ' + Me.ucrInputData.AddQuotesIfUnrecognised = True + Me.ucrInputData.IsMultiline = False + Me.ucrInputData.IsReadOnly = False + Me.ucrInputData.Location = New System.Drawing.Point(134, 89) + Me.ucrInputData.Name = "ucrInputData" + Me.ucrInputData.Size = New System.Drawing.Size(106, 23) + Me.ucrInputData.TabIndex = 111 + ' + 'ucrInputVector + ' + Me.ucrInputVector.AddQuotesIfUnrecognised = True + Me.ucrInputVector.IsMultiline = False + Me.ucrInputVector.IsReadOnly = False + Me.ucrInputVector.Location = New System.Drawing.Point(134, 18) + Me.ucrInputVector.Name = "ucrInputVector" + Me.ucrInputVector.Size = New System.Drawing.Size(106, 23) + Me.ucrInputVector.TabIndex = 110 + ' + 'ucrInputUnits + ' + Me.ucrInputUnits.AddQuotesIfUnrecognised = True + Me.ucrInputUnits.IsReadOnly = False + Me.ucrInputUnits.Location = New System.Drawing.Point(134, 42) + Me.ucrInputUnits.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) + Me.ucrInputUnits.Name = "ucrInputUnits" + Me.ucrInputUnits.Size = New System.Drawing.Size(137, 21) + Me.ucrInputUnits.TabIndex = 109 + ' + 'ucrChkUnits + ' + Me.ucrChkUnits.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle + Me.ucrChkUnits.Checked = False + Me.ucrChkUnits.Location = New System.Drawing.Point(10, 18) + Me.ucrChkUnits.Name = "ucrChkUnits" + Me.ucrChkUnits.Size = New System.Drawing.Size(122, 20) + Me.ucrChkUnits.TabIndex = 108 + ' + 'Label1 + ' + Me.Label1.AutoSize = True + Me.Label1.Location = New System.Drawing.Point(134, 69) + Me.Label1.Name = "Label1" + Me.Label1.Size = New System.Drawing.Size(78, 13) + Me.Label1.TabIndex = 112 + Me.Label1.Text = "Data (Optional)" + ' + 'ucrGridUnit + ' + Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) + Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.Controls.Add(Me.grpUnits) + Me.Name = "ucrGridUnit" + Me.Size = New System.Drawing.Size(280, 119) + Me.grpUnits.ResumeLayout(False) + Me.grpUnits.PerformLayout() + Me.ResumeLayout(False) + + End Sub + + Friend WithEvents grpUnits As GroupBox + Friend WithEvents ucrInputData As ucrInputTextBox + Friend WithEvents ucrInputVector As ucrInputTextBox + Friend WithEvents ucrInputUnits As ucrInputComboBox + Friend WithEvents ucrChkUnits As ucrCheck + Friend WithEvents Label1 As Label +End Class diff --git a/instat/ucrGridUnit.resx b/instat/ucrGridUnit.resx new file mode 100644 index 00000000000..29dcb1b3a35 --- /dev/null +++ b/instat/ucrGridUnit.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/ucrGridUnit.vb b/instat/ucrGridUnit.vb new file mode 100644 index 00000000000..01f6a8e7595 --- /dev/null +++ b/instat/ucrGridUnit.vb @@ -0,0 +1,67 @@ +' Instat-R +' Copyright (C) 2015 +' +' 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 k +' along with this program. If not, see . + +Public Class ucrGridUnit + + Private bInitialiseControls As Boolean = False + Public strUnit As String + Private clsThemeFunction As New RFunction + Private clsUnit As New RFunction + Private clsBaseOperator As New ROperator + Public Sub InitialiseControl() + + End Sub + + Public Sub SetUnits(strNewAxis As String) + strUnit = strNewAxis + End Sub + + Public Sub SetRCodeForControl(strNewUnit As String, clsNewUnit As RFunction, clsNewThemeFunction As RFunction, clsNewBaseOperator As ROperator, Optional bReset As Boolean = False) + If Not bInitialiseControls Then + InitialiseControl() + End If + + SetUnits(strNewUnit) + clsBaseOperator = clsNewBaseOperator + clsThemeFunction = clsNewThemeFunction + clsUnit = clsNewUnit + End Sub + + Private Sub AddRemoveElementLineAxis() + If ucrChkUnits.Checked Then + clsThemeFunction.AddParameter(strUnit, clsRFunctionParameter:=clsUnit) + Else + clsThemeFunction.RemoveParameterByName(strUnit) + End If + AddRemoveTheme() + 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 ElementTickAxisLineControls_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkUnits.ControlValueChanged + AddRemoveElementLineAxis() + End Sub + + Public Sub setlabel(strlabel As String) + grpUnits.Text = strlabel + End Sub +End Class From 1bc61f45ca14b7f5f0759fa86ce74c302a223f72 Mon Sep 17 00:00:00 2001 From: Steven Date: Thu, 8 Jun 2017 15:27:01 +0300 Subject: [PATCH 124/154] setting up ucrgridUnits --- instat/clsGgplotDefaults.vb | 1 - instat/sdgThemes.Designer.vb | 55 +++++++++++++++++++++++++++++++++- instat/sdgThemes.vb | 20 +++++-------- instat/ucrGridUnit.Designer.vb | 37 +++++++++++------------ instat/ucrGridUnit.vb | 25 ++++++++++++++++ 5 files changed, 104 insertions(+), 34 deletions(-) diff --git a/instat/clsGgplotDefaults.vb b/instat/clsGgplotDefaults.vb index 5016573f89f..ce95d82aa39 100644 --- a/instat/clsGgplotDefaults.vb +++ b/instat/clsGgplotDefaults.vb @@ -127,7 +127,6 @@ dctTemp.Add("axis.line", clsElementLine.Clone()) dctTemp.Add("axis.line.x", clsElementLine.Clone()) dctTemp.Add("axis.line.y", clsElementLine.Clone()) - dctTemp.Add("axis.ticks.length", clsUnit.Clone()) dctTemp.Add("legend.background", clsElementRect.Clone()) ' dctTemp.Add("legend.margin", clsElementLine.Clone()) ' dctTemp.Add("legend.spacing", clsElementLine.Clone()) diff --git a/instat/sdgThemes.Designer.vb b/instat/sdgThemes.Designer.vb index eaa071bcefa..cda3c64505a 100644 --- a/instat/sdgThemes.Designer.vb +++ b/instat/sdgThemes.Designer.vb @@ -85,6 +85,7 @@ Partial Class sdgThemes Me.ucrTickMarksAxes = New instat.ucrElementLineControl() Me.ucrThemeAxesTitle = New instat.ucrELementTextControl() Me.tbPLot = New System.Windows.Forms.TabPage() + Me.ucrTickLength = New instat.ucrGridUnit() Me.grpPlotBackground = New System.Windows.Forms.GroupBox() Me.ucrPlotBackGround = New instat.ucrElementRectControl() Me.grpPlotTitleAndCaption = New System.Windows.Forms.GroupBox() @@ -92,6 +93,10 @@ Partial Class sdgThemes Me.ucrPlotSubTitle = New instat.ucrELementTextControl() Me.ucrPlotTitle = New instat.ucrELementTextControl() Me.tbLegend = New System.Windows.Forms.TabControl() + Me.GroupBox1 = New System.Windows.Forms.GroupBox() + Me.UcrGridUnit1 = New instat.ucrGridUnit() + Me.UcrGridUnit2 = New instat.ucrGridUnit() + Me.UcrGridUnit3 = New instat.ucrGridUnit() Me.tbThemeFacets.SuspendLayout() Me.grpFacetBackground.SuspendLayout() Me.grpFacetLabels.SuspendLayout() @@ -117,6 +122,7 @@ Partial Class sdgThemes Me.grpPlotBackground.SuspendLayout() Me.grpPlotTitleAndCaption.SuspendLayout() Me.tbLegend.SuspendLayout() + Me.GroupBox1.SuspendLayout() Me.SuspendLayout() ' 'ucrBaseSubdialogue @@ -258,6 +264,7 @@ Partial Class sdgThemes ' 'tbThemeLegend ' + Me.tbThemeLegend.Controls.Add(Me.GroupBox1) Me.tbThemeLegend.Controls.Add(Me.grpLegendTitleAndText) Me.tbThemeLegend.Controls.Add(Me.grpLegendAdjustments) Me.tbThemeLegend.Controls.Add(Me.grpLegendBackGroundAndKey) @@ -359,7 +366,6 @@ Partial Class sdgThemes ' 'ucrChkLegendDirection ' - Me.ucrChkLegendDirection.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle Me.ucrChkLegendDirection.Checked = False Me.ucrChkLegendDirection.Location = New System.Drawing.Point(6, 47) Me.ucrChkLegendDirection.Name = "ucrChkLegendDirection" @@ -676,6 +682,7 @@ Partial Class sdgThemes ' 'tbPLot ' + Me.tbPLot.Controls.Add(Me.ucrTickLength) Me.tbPLot.Controls.Add(Me.grpPlotBackground) Me.tbPLot.Controls.Add(Me.grpPlotTitleAndCaption) Me.tbPLot.Location = New System.Drawing.Point(4, 22) @@ -686,6 +693,13 @@ Partial Class sdgThemes Me.tbPLot.Text = "Plot" Me.tbPLot.UseVisualStyleBackColor = True ' + 'ucrTickLength + ' + Me.ucrTickLength.Location = New System.Drawing.Point(332, 275) + Me.ucrTickLength.Name = "ucrTickLength" + Me.ucrTickLength.Size = New System.Drawing.Size(280, 119) + Me.ucrTickLength.TabIndex = 104 + ' 'grpPlotBackground ' Me.grpPlotBackground.Controls.Add(Me.ucrPlotBackGround) @@ -751,6 +765,39 @@ Partial Class sdgThemes Me.tbLegend.Size = New System.Drawing.Size(824, 590) Me.tbLegend.TabIndex = 1 ' + 'GroupBox1 + ' + Me.GroupBox1.Controls.Add(Me.UcrGridUnit3) + Me.GroupBox1.Controls.Add(Me.UcrGridUnit2) + Me.GroupBox1.Controls.Add(Me.UcrGridUnit1) + Me.GroupBox1.Location = New System.Drawing.Point(4, 402) + Me.GroupBox1.Name = "GroupBox1" + Me.GroupBox1.Size = New System.Drawing.Size(777, 150) + Me.GroupBox1.TabIndex = 4 + Me.GroupBox1.TabStop = False + Me.GroupBox1.Text = "Legend Background and Key" + ' + 'UcrGridUnit1 + ' + Me.UcrGridUnit1.Location = New System.Drawing.Point(13, 25) + Me.UcrGridUnit1.Name = "UcrGridUnit1" + Me.UcrGridUnit1.Size = New System.Drawing.Size(280, 119) + Me.UcrGridUnit1.TabIndex = 105 + ' + 'UcrGridUnit2 + ' + Me.UcrGridUnit2.Location = New System.Drawing.Point(299, 19) + Me.UcrGridUnit2.Name = "UcrGridUnit2" + Me.UcrGridUnit2.Size = New System.Drawing.Size(280, 119) + Me.UcrGridUnit2.TabIndex = 106 + ' + 'UcrGridUnit3 + ' + Me.UcrGridUnit3.Location = New System.Drawing.Point(529, 31) + Me.UcrGridUnit3.Name = "UcrGridUnit3" + Me.UcrGridUnit3.Size = New System.Drawing.Size(280, 119) + Me.UcrGridUnit3.TabIndex = 107 + ' 'sdgThemes ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -789,6 +836,7 @@ Partial Class sdgThemes Me.grpPlotBackground.ResumeLayout(False) Me.grpPlotTitleAndCaption.ResumeLayout(False) Me.tbLegend.ResumeLayout(False) + Me.GroupBox1.ResumeLayout(False) Me.ResumeLayout(False) End Sub @@ -863,4 +911,9 @@ Partial Class sdgThemes Friend WithEvents ucrPlotSubTitle As ucrELementTextControl Friend WithEvents ucrPlotTitle As ucrELementTextControl Friend WithEvents tbLegend As TabControl + Friend WithEvents ucrTickLength As ucrGridUnit + Friend WithEvents GroupBox1 As GroupBox + Friend WithEvents UcrGridUnit3 As ucrGridUnit + Friend WithEvents UcrGridUnit2 As ucrGridUnit + Friend WithEvents UcrGridUnit1 As ucrGridUnit End Class diff --git a/instat/sdgThemes.vb b/instat/sdgThemes.vb index c27d7ba779b..1d0bd105074 100644 --- a/instat/sdgThemes.vb +++ b/instat/sdgThemes.vb @@ -20,14 +20,6 @@ Public Class sdgThemes Public bControlsInitialised As Boolean = False Private clsElementLine, clsElementRect, clsElementXAxisTextTop, clsElementXAxisLine, clsElementYAxisLine, clsElementText, clsElementYAxisTextRight, clsElementXAxisLineTop, clsThemeFunction As New RFunction - Private Sub grpTableOptions_Enter(sender As Object, e As EventArgs) Handles grpTableOptions.Enter - - End Sub - - Private Sub ucrYAxisLines_Load(sender As Object, e As EventArgs) - - End Sub - Private clsBaseOperator As New ROperator Private dctThemeFunctions As New Dictionary(Of String, RFunction) @@ -81,12 +73,8 @@ Public Class sdgThemes ucrStripText.setlabel("Facet labels") ucrStripTextXAxis.setlabel("Facet labels along horizontal direction") ucrStripTextYAxis.setlabel("Facet labels along vertical direction") - 'Units - ucrChkUnits.SetText("Tick length") - ucrInputTickUnits.SetParameter(New RParameter("units")) - ucrInputTickUnits.SetItems(New Dictionary(Of String, String)(GgplotDefaults.dctFonts)) - ucrInputTickUnits.SetRDefault(Chr(34) & "npc" & Chr(34)) + ucrTickLength.setlabel("Length of tick marks") ' TODO: Find what this means: "two-element numeric vector" urChkLegendPosition.SetText("Legend Position") @@ -187,6 +175,8 @@ Public Class sdgThemes Dim clsElementPanelGridMajor As New RFunction Dim clsElementPanelGridMinor As New RFunction + Dim clsUnitAxisTickLength As New RFunction + If Not bControlsInitialised Then InitialiseControls() End If @@ -228,6 +218,8 @@ Public Class sdgThemes dctThemeFunctions.TryGetValue("panel.grid.major", clsElementPanelGridMajor) dctThemeFunctions.TryGetValue("panel.grid.minor", clsElementPanelGridMinor) + dctThemeFunctions.TryGetValue("axis.ticks.length", clsUnitAxisTickLength) + dctThemeFunctions.TryGetValue("legend.background", clsElementLegendBackground) dctThemeFunctions.TryGetValue("legend.box.background", clsElementLegendBoxBackground) dctThemeFunctions.TryGetValue("legend.key", clsElementLegendtKey) @@ -279,6 +271,8 @@ Public Class sdgThemes ucrStripTextXAxis.SetRCodeForControl("strip.text.x", clsElementStripTextXAxis, clsNewThemeFunction:=clsThemeFunction, clsNewBaseOperator:=clsBaseOperator, bReset:=bReset) ucrStripTextYAxis.SetRCodeForControl("strip.text.y", clsElementStripTextYAxis, clsNewThemeFunction:=clsThemeFunction, clsNewBaseOperator:=clsBaseOperator, bReset:=bReset) + ucrTickLength.SetRCodeForControl("axis.ticks.length", clsUnitAxisTickLength, clsNewThemeFunction:=clsThemeFunction, clsNewBaseOperator:=clsBaseOperator, bReset:=bReset) + urChkLegendPosition.SetRCode(clsThemeFunction, bReset) ucrInputLegendPosition.SetRCode(clsThemeFunction, bReset) diff --git a/instat/ucrGridUnit.Designer.vb b/instat/ucrGridUnit.Designer.vb index cccd10c48ed..84e5cfba884 100644 --- a/instat/ucrGridUnit.Designer.vb +++ b/instat/ucrGridUnit.Designer.vb @@ -23,34 +23,43 @@ Partial Class ucrGridUnit _ Private Sub InitializeComponent() Me.grpUnits = New System.Windows.Forms.GroupBox() + Me.lblData = New System.Windows.Forms.Label() Me.ucrInputData = New instat.ucrInputTextBox() Me.ucrInputVector = New instat.ucrInputTextBox() Me.ucrInputUnits = New instat.ucrInputComboBox() Me.ucrChkUnits = New instat.ucrCheck() - Me.Label1 = New System.Windows.Forms.Label() Me.grpUnits.SuspendLayout() Me.SuspendLayout() ' 'grpUnits ' - Me.grpUnits.Controls.Add(Me.Label1) + Me.grpUnits.Controls.Add(Me.lblData) Me.grpUnits.Controls.Add(Me.ucrInputData) Me.grpUnits.Controls.Add(Me.ucrInputVector) Me.grpUnits.Controls.Add(Me.ucrInputUnits) Me.grpUnits.Controls.Add(Me.ucrChkUnits) - Me.grpUnits.Location = New System.Drawing.Point(-2, -3) + Me.grpUnits.Location = New System.Drawing.Point(3, -3) Me.grpUnits.Name = "grpUnits" - Me.grpUnits.Size = New System.Drawing.Size(279, 120) + Me.grpUnits.Size = New System.Drawing.Size(249, 120) Me.grpUnits.TabIndex = 108 Me.grpUnits.TabStop = False Me.grpUnits.Text = "Units" ' + 'lblData + ' + Me.lblData.AutoSize = True + Me.lblData.Location = New System.Drawing.Point(108, 69) + Me.lblData.Name = "lblData" + Me.lblData.Size = New System.Drawing.Size(78, 13) + Me.lblData.TabIndex = 112 + Me.lblData.Text = "Data (Optional)" + ' 'ucrInputData ' Me.ucrInputData.AddQuotesIfUnrecognised = True Me.ucrInputData.IsMultiline = False Me.ucrInputData.IsReadOnly = False - Me.ucrInputData.Location = New System.Drawing.Point(134, 89) + Me.ucrInputData.Location = New System.Drawing.Point(108, 89) Me.ucrInputData.Name = "ucrInputData" Me.ucrInputData.Size = New System.Drawing.Size(106, 23) Me.ucrInputData.TabIndex = 111 @@ -60,7 +69,7 @@ Partial Class ucrGridUnit Me.ucrInputVector.AddQuotesIfUnrecognised = True Me.ucrInputVector.IsMultiline = False Me.ucrInputVector.IsReadOnly = False - Me.ucrInputVector.Location = New System.Drawing.Point(134, 18) + Me.ucrInputVector.Location = New System.Drawing.Point(108, 18) Me.ucrInputVector.Name = "ucrInputVector" Me.ucrInputVector.Size = New System.Drawing.Size(106, 23) Me.ucrInputVector.TabIndex = 110 @@ -69,7 +78,7 @@ Partial Class ucrGridUnit ' Me.ucrInputUnits.AddQuotesIfUnrecognised = True Me.ucrInputUnits.IsReadOnly = False - Me.ucrInputUnits.Location = New System.Drawing.Point(134, 42) + Me.ucrInputUnits.Location = New System.Drawing.Point(108, 42) Me.ucrInputUnits.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) Me.ucrInputUnits.Name = "ucrInputUnits" Me.ucrInputUnits.Size = New System.Drawing.Size(137, 21) @@ -77,22 +86,12 @@ Partial Class ucrGridUnit ' 'ucrChkUnits ' - Me.ucrChkUnits.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle Me.ucrChkUnits.Checked = False Me.ucrChkUnits.Location = New System.Drawing.Point(10, 18) Me.ucrChkUnits.Name = "ucrChkUnits" - Me.ucrChkUnits.Size = New System.Drawing.Size(122, 20) + Me.ucrChkUnits.Size = New System.Drawing.Size(100, 20) Me.ucrChkUnits.TabIndex = 108 ' - 'Label1 - ' - Me.Label1.AutoSize = True - Me.Label1.Location = New System.Drawing.Point(134, 69) - Me.Label1.Name = "Label1" - Me.Label1.Size = New System.Drawing.Size(78, 13) - Me.Label1.TabIndex = 112 - Me.Label1.Text = "Data (Optional)" - ' 'ucrGridUnit ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -110,6 +109,6 @@ Partial Class ucrGridUnit Friend WithEvents ucrInputData As ucrInputTextBox Friend WithEvents ucrInputVector As ucrInputTextBox Friend WithEvents ucrInputUnits As ucrInputComboBox + Friend WithEvents lblData As Label Friend WithEvents ucrChkUnits As ucrCheck - Friend WithEvents Label1 As Label End Class diff --git a/instat/ucrGridUnit.vb b/instat/ucrGridUnit.vb index 01f6a8e7595..b09d85e9bb3 100644 --- a/instat/ucrGridUnit.vb +++ b/instat/ucrGridUnit.vb @@ -22,6 +22,26 @@ Public Class ucrGridUnit Private clsUnit As New RFunction Private clsBaseOperator As New ROperator Public Sub InitialiseControl() + 'Units + ucrChkUnits.SetText("Tick length") + ucrInputUnits.SetParameter(New RParameter("units")) + ucrInputUnits.SetItems(New Dictionary(Of String, String)(GgplotDefaults.dctUnits)) + ucrInputUnits.SetRDefault(Chr(34) & "npc" & Chr(34)) + + ucrInputData.SetParameter(New RParameter("data")) + ucrInputData.SetRDefault("NULL") + ucrInputData.AddQuotesIfUnrecognised = False + ' ucrInputData.SetValidationTypeAsNumeric() + + ucrInputVector.SetParameter(New RParameter("x")) + ucrInputVector.AddQuotesIfUnrecognised = False + ' ucrInputVector.SetValidationTypeAsNumeric() + ucrInputVector.SetRDefault("1") + + ucrChkUnits.AddToLinkedControls(ucrInputUnits, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) + ucrChkUnits.AddToLinkedControls(ucrInputData, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) + ucrChkUnits.AddToLinkedControls(ucrInputVector, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) + ucrInputData.SetLinkedDisplayControl(lblData) End Sub @@ -38,6 +58,11 @@ Public Class ucrGridUnit clsBaseOperator = clsNewBaseOperator clsThemeFunction = clsNewThemeFunction clsUnit = clsNewUnit + + ucrChkUnits.SetRCode(clsUnit, bReset) + ucrInputUnits.SetRCode(clsUnit, bReset) + ucrInputData.SetRCode(clsUnit, bReset) + ucrInputVector.SetRCode(clsUnit, bReset) End Sub Private Sub AddRemoveElementLineAxis() From 5ba95e46e6a9d47032f145cc074f6f8461ddcb91 Mon Sep 17 00:00:00 2001 From: Lily Date: Thu, 8 Jun 2017 13:54:51 +0100 Subject: [PATCH 125/154] Adding package name --- instat/clsRLink.vb | 1 + 1 file changed, 1 insertion(+) diff --git a/instat/clsRLink.vb b/instat/clsRLink.vb index 48156f4399d..b83e6f6148b 100644 --- a/instat/clsRLink.vb +++ b/instat/clsRLink.vb @@ -272,6 +272,7 @@ Public Class RLink Try If iCallType = 3 Then If strGraphDisplayOption = "view_output_window" OrElse strGraphDisplayOption = "view_separate_window" Then + clsPNGFunction.SetPackageName("grDevices") clsPNGFunction.SetRCommand("png") clsPNGFunction.AddParameter("filename", Chr(34) & System.IO.Path.Combine(strTempGraphsDirectory & "/Graph.png").Replace("\", "/") & Chr(34)) clsPNGFunction.AddParameter("width", 4000) From de070e9822db9a476824b1721e586ed6e8000660 Mon Sep 17 00:00:00 2001 From: Danny Parsons Date: Thu, 8 Jun 2017 13:57:18 +0100 Subject: [PATCH 126/154] aesthetics working on layer options --- instat/UcrGeomListWithAes.designer.vb | 2 +- instat/UcrGeomListWithAes.vb | 124 +++++++++++++++----------- instat/dlgGeneralForGraphics.vb | 20 ++--- instat/sdgLayerOptions.Designer.vb | 4 +- instat/ucrAdditionalLayers.vb | 29 +++--- instat/ucrCore.vb | 2 +- instat/ucrLayerParameters.vb | 2 +- instat/ucrReceiverSingle.vb | 4 + 8 files changed, 106 insertions(+), 81 deletions(-) diff --git a/instat/UcrGeomListWithAes.designer.vb b/instat/UcrGeomListWithAes.designer.vb index 6085b13da21..112dda4410c 100644 --- a/instat/UcrGeomListWithAes.designer.vb +++ b/instat/UcrGeomListWithAes.designer.vb @@ -1,5 +1,5 @@  -Partial Class UcrGeomListWithParameters +Partial Class ucrGeomListWithParameters Inherits instat.ucrGeom 'Form overrides dispose to clean up the component list. diff --git a/instat/UcrGeomListWithAes.vb b/instat/UcrGeomListWithAes.vb index ac43c133581..016cb6dc5cb 100644 --- a/instat/UcrGeomListWithAes.vb +++ b/instat/UcrGeomListWithAes.vb @@ -17,7 +17,7 @@ Imports instat -Public Class UcrGeomListWithParameters +Public Class ucrGeomListWithParameters Public lstAesParameterLabels As New List(Of Label) Public lstAesParameterReceivers As New List(Of ucrReceiverSingle) 'The two previous fields are the lists of parameter labels and receivers on the ucr. @@ -34,6 +34,7 @@ Public Class UcrGeomListWithParameters ' When returning from this control, the intermediate aes with update the global and local aes appropriately Private clsInterAesFunction As New RFunction Private bControlsInitialised As Boolean = False + Private bAllowShowGlobalAsLocal As Boolean = False Public Sub New() @@ -103,7 +104,7 @@ Public Class UcrGeomListWithParameters If Not bControlsInitialised Then InitialiseControls() End If - + bAllowShowGlobalAsLocal = False MyBase.Setup(clsNewGgplotFunction, clsNewGeomFunc, clsNewGlobalAesFunc, clsNewLocalAes, bFixGeom, strDataframe, bApplyAesGlobally, iNumVariablesForGeoms, bReset) 'Using the values of the two relevant parameters, the two following lines determine whether the chkBoxes ApplyToAllLayers and IgnoreGlobalAes should be ticked. @@ -115,23 +116,27 @@ Public Class UcrGeomListWithParameters ucrChkApplyOnAllLayers.Checked = False ucrChkIgnoreGlobalAes.Checked = False End If + bAllowShowGlobalAsLocal = True ' This might stay as data frame depends on global/local option and therefore can't be linked to a function InitialiseSelectedDataFrame() SetParameters() 'This is done last because it requires using correct value of ucrChkIgnoreGlobalAes.Checked - SetInterAes(bReset) + SetInterAes(bReset, True) 'Warning: SetAes is called three times when a layer is created... one in the load, one in the setup, one when geom is set, ... End Sub - Private Sub SetInterAes(Optional bReset As Boolean = False) + Private Sub SetInterAes(Optional bReset As Boolean = False, Optional bClearInterAes As Boolean = False) Dim iFirstEmptyAes As Integer = -1 Dim bAesFound As Boolean = False Dim bFirstEmptyFound As Boolean = False Dim strCurrGeomAesParamName As String + If bClearInterAes Then + clsInterAesFunction.ClearParameters() + End If 'Clear code so receivers don't update until intermediate function is set For i = 0 To clsCurrGeom.clsAesParameters.Count - 1 bAesFound = False @@ -140,55 +145,30 @@ Public Class UcrGeomListWithParameters If Not ucrChkIgnoreGlobalAes.Checked Then 'For some geoms e.g. geom_line, when an aes is not filled in (usually x or y), ggplot syntax requires the aes to be set to "" e.g. x = "". 'We do not need to copy this to the intermediate aes as they are affectively empty - If clsGlobalAesFunction.ContainsParameter(strCurrGeomAesParamName) AndAlso Not clsGlobalAesFunction.GetParameter(strCurrGeomAesParamName).strArgumentValue = Chr(34) & Chr(34) Then + If Not clsInterAesFunction.ContainsParameter(strCurrGeomAesParamName) AndAlso clsGlobalAesFunction.ContainsParameter(strCurrGeomAesParamName) AndAlso Not clsGlobalAesFunction.GetParameter(strCurrGeomAesParamName).strArgumentValue = Chr(34) & Chr(34) Then bAesFound = True clsInterAesFunction.AddParameter(clsGlobalAesFunction.GetParameter(strCurrGeomAesParamName).Clone()) - lstAesParameterReceivers(i).SetTextColour(Color.DarkBlue) End If - 'For Each clsParam In clsGlobalAesFunction.clsParameters - ' If clsParam.strArgumentName = lstCurrArguments(i) Then - ' If Not ((clsParam.strArgumentName = "x" OrElse clsParam.strArgumentName = "y") AndAlso clsParam.strArgumentValue = Chr(34) & Chr(34)) Then - ' lstAesParameterReceivers(i).Add(clsParam.strArgumentValue) - ' Exit For - ' End If - ' End If - 'Next - End If - If clsLocalAesFunction.ContainsParameter(strCurrGeomAesParamName) AndAlso Not clsLocalAesFunction.GetParameter(strCurrGeomAesParamName).strArgumentValue = Chr(34) & Chr(34) Then - bAesFound = True - clsInterAesFunction.AddParameter(clsGlobalAesFunction.GetParameter(strCurrGeomAesParamName).Clone()) - lstAesParameterReceivers(i).SetTextColour(Color.Black) End If - 'For Each clsParam In clsLocalAesFunction.clsParameters - ' If clsParam.strArgumentName = lstCurrArguments(i) Then - ' If Not ((clsParam.strArgumentName = "x" OrElse clsParam.strArgumentName = "y") AndAlso clsParam.strArgumentValue = Chr(34) & Chr(34)) Then 'As before, check that x is not mapped to "" before putting in receivers. - ' lstAesParameterReceivers(i).Add(clsParam.strArgumentValue) - ' lstAesParameterReceivers(i).Enabled = True - ' Exit For - ' End If - ' End If - 'Next - If Not bFirstEmptyFound AndAlso Not bAesFound Then - iFirstEmptyAes = i - bFirstEmptyFound = True - End If - If iFirstEmptyAes <> -1 Then - lstAesParameterReceivers(iFirstEmptyAes).SetMeAsReceiver() + If bClearInterAes Then + If clsLocalAesFunction.ContainsParameter(strCurrGeomAesParamName) AndAlso Not clsLocalAesFunction.GetParameter(strCurrGeomAesParamName).strArgumentValue = Chr(34) & Chr(34) Then + bAesFound = True + clsInterAesFunction.AddParameter(clsLocalAesFunction.GetParameter(strCurrGeomAesParamName).Clone()) + End If + + If Not bFirstEmptyFound AndAlso Not bAesFound Then + iFirstEmptyAes = i + bFirstEmptyFound = True + End If End If Next + If iFirstEmptyAes <> -1 Then + lstAesParameterReceivers(iFirstEmptyAes).SetMeAsReceiver() + End If SetRCodeForReceivers(clsInterAesFunction, clsCurrGeom.clsAesParameters.Count, bReset) End Sub - 'Private Function LocalAndGlobalDataFramesAreDifferent() As Boolean - ' 'This methods checks whether the dataframe used for this layer is different from the global dataframe. If they are different, then chkIgnoreGlobalAes is checked. See UcrSelector_DataFrameChanged. Might also be used to print global aes in red when dataframes are different. - ' Dim bValue As Boolean = False - ' If strGlobalDataFrame <> "" AndAlso ucrGeomWithAesSelector.strCurrentDataFrame <> strGlobalDataFrame Then 'Warning: if the CurrentDataframe is chosen appropriately, which is the case thanks to InitialiseSelectedDataFrame - ' bValue = True - ' End If - ' Return bValue - 'End Function - Public Sub SetParameters() 'this will set function or aes parameters Dim iMaxIndex As Integer Dim i As Integer @@ -302,7 +282,7 @@ Public Class UcrGeomListWithParameters End Sub Private Sub ucrChkIgnoreGlobalAes_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkIgnoreGlobalAes.ControlValueChanged - SetInterAes(False) + SetInterAes(False, False) 'Sets the dataframe to the globaldataframe and fixes it in case that one is not empty and chkApplyOnAllLayers is checked. 'Question to be discussed: are we happy with this ? We don't want it to be the opposite, i.e. the global data frame to be changed when apply on all layers is ticked ? Would then need to "reset the global aes function"... See issue on github... All this should be revised when linking is studied. ucrGeomWithAesSelector.SetDataframe(strGlobalDataFrame, (Not ucrChkApplyOnAllLayers.Checked) OrElse strGlobalDataFrame = "") @@ -313,6 +293,7 @@ Public Class UcrGeomListWithParameters Else ucrChkIgnoreGlobalAes.Show() End If + SetReceiverColour() End Sub Public Sub UpdateGlobalAndLocalAesFromInter() @@ -322,26 +303,32 @@ Public Class UcrGeomListWithParameters 'Two situations: apply on all layers checked or not. Would edit the global or local aes accordingly. If ucrChkApplyOnAllLayers.Checked Then 'If ucrChkApplyOnAllLayers is checked, inter aes become the global aes. - For Each clsParam In clsInterAesFunction.clsParameters - clsGlobalAesFunction.AddParameter(clsParam) 'Warning: This never removes the parameters that have been previously inserted... + For Each clsAesParam As AesParameters In clsCurrGeom.clsAesParameters + If clsInterAesFunction.ContainsParameter(clsAesParam.strAesParameterName) Then + clsGlobalAesFunction.AddParameter(clsInterAesFunction.GetParameter(clsAesParam.strAesParameterName).Clone()) + Else + clsGlobalAesFunction.RemoveParameterByName(clsAesParam.strAesParameterName) + End If Next 'We need to remove local "mapping" and "data" parameters. clsGeomFunction.RemoveParameterByName("mapping") clsGeomFunction.RemoveParameterByName("data") 'Here the global ggplot function takes the relevant "mapping" and "data" parameters as required by "ApplyOnAllLayers". - 'This should not need to be done?? clsGgplotFunction.AddParameter("mapping", clsRFunctionParameter:=clsGlobalAesFunction) clsGgplotFunction.AddParameter("data", clsRFunctionParameter:=ucrGeomWithAesSelector.ucrAvailableDataFrames.clsCurrDataFrame.Clone()) + strGlobalDataFrame = ucrGeomWithAesSelector.ucrAvailableDataFrames.cboAvailableDataFrames.Text clsCurrentAesFunction = clsGlobalAesFunction Else 'Warning: in case the sdgLayerOptions has been called by specific dlg, need to refill the aes on that dlg. Imagine the ApplyOnAllLayers has been unticked ? Problem... Also in order to solve this, would need to know on the specific dialog if it has been unticked or not in order to know how to fill in the aes receivers ! The linking will be restudied anyway. There are many ways to go, see discussion on github. - For Each clsParam In clsInterAesFunction.clsParameters - If Not (clsGlobalAesFunction.ContainsParameter(clsParam.strArgumentName) AndAlso clsGlobalAesFunction.GetParameter(clsParam.strArgumentName).strArgumentValue = clsParam.strArgumentValue)) Then - clsLocalAesFunction.AddParameter(clsParam) + For Each clsAesParam As AesParameters In clsCurrGeom.clsAesParameters + If clsInterAesFunction.ContainsParameter(clsAesParam.strAesParameterName) AndAlso (ucrChkIgnoreGlobalAes.Checked OrElse Not (clsGlobalAesFunction.ContainsParameter(clsAesParam.strAesParameterName) AndAlso clsGlobalAesFunction.GetParameter(clsAesParam.strAesParameterName).strArgumentValue = clsInterAesFunction.GetParameter(clsAesParam.strAesParameterName).strArgumentValue)) Then + clsLocalAesFunction.AddParameter(clsInterAesFunction.GetParameter(clsAesParam.strAesParameterName).Clone()) + Else + clsLocalAesFunction.RemoveParameterByName(clsAesParam.strAesParameterName) End If Next - clsLocalAesFunction = clsInterAesFunction.Clone() + 'If global data frame later changes, data parameter is needed in each geom? If ucrGeomWithAesSelector.ucrAvailableDataFrames.cboAvailableDataFrames.Text <> strGlobalDataFrame Then clsGeomFunction.AddParameter("data", clsRFunctionParameter:=ucrGeomWithAesSelector.ucrAvailableDataFrames.clsCurrDataFrame.Clone()) @@ -382,4 +369,39 @@ Public Class UcrGeomListWithParameters clsGeomFunction.RemoveParameterByName("mapping") End If End Sub + + Private Function ContainsGlobalAes(ucrCurrReceiver As ucrReceiverSingle) + Dim strParamName + + strParamName = ucrCurrReceiver.GetParameterName() + If Not ucrChkIgnoreGlobalAes.Checked AndAlso clsGlobalAesFunction.ContainsParameter(strParamName) AndAlso clsGlobalAesFunction.GetParameter(strParamName).strArgumentValue = ucrCurrReceiver.GetVariableNames(False) Then + Return True + Else + Return False + End If + End Function + + Private Sub Receivers_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrReceiverParam1.ControlValueChanged, ucrReceiverParam2.ControlValueChanged, ucrReceiverParam3.ControlValueChanged, ucrReceiverParam4.ControlValueChanged, ucrReceiverParam5.ControlValueChanged, ucrReceiverParam6.ControlValueChanged, ucrReceiverParam7.ControlValueChanged, ucrReceiverParam8.ControlValueChanged, ucrReceiverParam9.ControlValueChanged, ucrReceiverParam10.ControlValueChanged, ucrReceiverParam11.ControlValueChanged, ucrReceiverParam12.ControlValueChanged, ucrReceiverParam13.ControlValueChanged + Dim ucrChangedReceiver As ucrReceiverSingle + + ucrChangedReceiver = TryCast(ucrChangedControl, ucrReceiverSingle) + If ucrChangedReceiver IsNot Nothing Then + SetReceiverColour(ucrChangedReceiver) + End If + End Sub + + Private Sub SetReceiverColour(Optional ucrCurrReceiver As ucrReceiverSingle = Nothing) + If ucrCurrReceiver IsNot Nothing Then + If ContainsGlobalAes(ucrCurrReceiver) Then + 'Should define these globally as options + ucrCurrReceiver.SetTextColour(Color.Blue) + Else + ucrCurrReceiver.SetTextColour(Color.Black) + End If + Else + For Each ucrTempReceiver In lstAesParameterReceivers + SetReceiverColour(ucrTempReceiver) + Next + End If + End Sub End Class diff --git a/instat/dlgGeneralForGraphics.vb b/instat/dlgGeneralForGraphics.vb index 9ebf2886125..ae0da60542c 100644 --- a/instat/dlgGeneralForGraphics.vb +++ b/instat/dlgGeneralForGraphics.vb @@ -15,13 +15,13 @@ ' along with this program. If not, see . Imports instat.Translations Public Class dlgGeneralForGraphics - Public clsRggplotFunction As New RFunction + Public clsGgplotFunction As New RFunction Private bFirstLoad As Boolean = True Private lstLayerComplete As New List(Of Boolean) 'list of completed layers. Private iLayerIndex As Integer 'current layer - Public WithEvents clsGgplotAesFunction As New RFunction + Public WithEvents clsGlobalAesFunction As New RFunction Private strGlobalDataFrame As String Public bDataFrameSet As Boolean @@ -40,17 +40,17 @@ Public Class dlgGeneralForGraphics Private Sub InitialiseDialog() 'setting the base ggplot functions ucrBase.clsRsyntax.SetOperation("+") - clsRggplotFunction.SetRCommand("ggplot") - clsGgplotAesFunction.SetRCommand("aes") - ucrBase.clsRsyntax.SetOperatorParameter(True, clsRFunc:=clsRggplotFunction) + clsGgplotFunction.SetRCommand("ggplot") + clsGlobalAesFunction.SetRCommand("aes") + ucrBase.clsRsyntax.SetOperatorParameter(True, clsRFunc:=clsGgplotFunction) 'True for "we are setting the first parameter, on the left of +". ucrBase.iHelpTopicID = 356 ucrSaveGraph.SetDataFrameSelector(sdgLayerOptions.ucrGeomWithAes.ucrGeomWithAesSelector.ucrAvailableDataFrames) ucrSaveGraph.strPrefix = "Graph" ucrAdditionalLayers.SetRSyntax(ucrBase.clsRsyntax) - ucrAdditionalLayers.SetGGplotFunction(clsRggplotFunction) - ucrAdditionalLayers.SetAesFunction(clsGgplotAesFunction) + ucrAdditionalLayers.SetGGplotFunction(clsGgplotFunction) + ucrAdditionalLayers.SetAesFunction(clsGlobalAesFunction) ucrBase.clsRsyntax.bExcludeAssignedFunctionOutput = False 'By default, we want to put in the script the output of our Base R-command (in this case the ...+...+...) even when it has been assigned to some object (in which case we want the name of that object in the script so that it's called when the script is run). 'For example, when a graph is saved, it is assigned to it's place in an R-instat object. If we had set bExcludeAssignedFunctionOutput to True, then we would never print the graph when running the script. @@ -65,8 +65,8 @@ Public Class dlgGeneralForGraphics 'SetEditDeleteEnabled() strGlobalDataFrame = "" bDataFrameSet = False - clsRggplotFunction.ClearParameters() - clsGgplotAesFunction.ClearParameters() + clsGgplotFunction.ClearParameters() + clsGlobalAesFunction.ClearParameters() ucrAdditionalLayers.Reset() If ucrBase.clsRsyntax.clsBaseOperator IsNot Nothing Then ucrBase.clsRsyntax.clsBaseOperator.RemoveAllAdditionalParameters() @@ -175,7 +175,7 @@ Public Class dlgGeneralForGraphics Private Sub SetupPlotOptions() 'Warning to be discussed: I m hoping to have a Setup function in sdgPlots itself... ? sdgPlots.SetRSyntax(ucrBase.clsRsyntax) - sdgPlots.SetGgplotFunction(clsRggplotFunction) + sdgPlots.SetGgplotFunction(clsGgplotFunction) End Sub Private Sub cmdOptions_Click(sender As Object, e As EventArgs) Handles cmdOptions.Click sdgPlots.DisableLayersTab() diff --git a/instat/sdgLayerOptions.Designer.vb b/instat/sdgLayerOptions.Designer.vb index ec31d33c391..c25594dd943 100644 --- a/instat/sdgLayerOptions.Designer.vb +++ b/instat/sdgLayerOptions.Designer.vb @@ -24,7 +24,7 @@ Partial Class sdgLayerOptions Private Sub InitializeComponent() Me.tbcLayers = New System.Windows.Forms.TabControl() Me.tbpAesthetics = New System.Windows.Forms.TabPage() - Me.ucrGeomWithAes = New instat.UcrGeomListWithParameters() + Me.ucrGeomWithAes = New instat.ucrGeomListWithParameters() Me.tbpGeomParameters = New System.Windows.Forms.TabPage() Me.ucrLayerParameter = New instat.ucrLayerParameters() Me.ucrSdgLayerBase = New instat.ucrButtonsSubdialogue() @@ -111,6 +111,6 @@ Partial Class sdgLayerOptions Friend WithEvents tbcLayers As TabControl Friend WithEvents tbpAesthetics As TabPage Friend WithEvents tbpGeomParameters As TabPage - Friend WithEvents ucrGeomWithAes As UcrGeomListWithParameters + Friend WithEvents ucrGeomWithAes As ucrGeomListWithParameters Friend WithEvents ucrLayerParameter As ucrLayerParameters End Class diff --git a/instat/ucrAdditionalLayers.vb b/instat/ucrAdditionalLayers.vb index 408f205fe0b..eb25b4e0ed6 100644 --- a/instat/ucrAdditionalLayers.vb +++ b/instat/ucrAdditionalLayers.vb @@ -1,18 +1,17 @@ - -' Instat-R -' Copyright (C) 2015 -' -' 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 k +' Instat-R +' Copyright (C) 2015 +' +' 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 k ' along with this program. If not, see . Public Class ucrAdditionalLayers diff --git a/instat/ucrCore.vb b/instat/ucrCore.vb index 64f54498976..56a08f34c62 100644 --- a/instat/ucrCore.vb +++ b/instat/ucrCore.vb @@ -218,8 +218,8 @@ Public Class ucrCore If bUpdateRCodeFromControl AndAlso CanUpdate() Then UpdateRCode(bReset) End If - UpdateControl(bReset) End If + UpdateControl(bReset) End Sub Protected Overridable Function CanUpdate() diff --git a/instat/ucrLayerParameters.vb b/instat/ucrLayerParameters.vb index 09b8d91641a..0bd303ee209 100644 --- a/instat/ucrLayerParameters.vb +++ b/instat/ucrLayerParameters.vb @@ -19,7 +19,7 @@ Imports instat Public Class ucrLayerParameters Public lstLayerParameterControl As New List(Of ucrLayerParamsControls) Private bFirstLoad As Boolean = True - Public WithEvents ucrGeomWithAes As UcrGeomListWithParameters + Public WithEvents ucrGeomWithAes As ucrGeomListWithParameters Public Sub New() diff --git a/instat/ucrReceiverSingle.vb b/instat/ucrReceiverSingle.vb index be28a64e630..d3a399389fa 100644 --- a/instat/ucrReceiverSingle.vb +++ b/instat/ucrReceiverSingle.vb @@ -206,6 +206,7 @@ Public Class ucrReceiverSingle OnSelectionChanged() End Sub + 'TODO make these global options Public Overrides Sub SetColor() txtReceiverSingle.BackColor = Color.Aqua End Sub @@ -279,6 +280,9 @@ Public Class ucrReceiverSingle AddHandler ParentForm.Shown, AddressOf ParentForm_Shown End If bFirstLoad = False + If Selector IsNot Nothing AndAlso Not Selector.CurrentReceiver.Equals(Me) Then + RemoveColor() + End If End If End Sub From 065239aaa4462a96452e58edd3d8326aaffe48a6 Mon Sep 17 00:00:00 2001 From: shadrack kibet Date: Thu, 8 Jun 2017 16:39:16 +0300 Subject: [PATCH 127/154] setting default value for a function --- instat/dlgInsertColumn.vb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/instat/dlgInsertColumn.vb b/instat/dlgInsertColumn.vb index afc400fc141..5a73c7e92f1 100644 --- a/instat/dlgInsertColumn.vb +++ b/instat/dlgInsertColumn.vb @@ -108,7 +108,6 @@ Public Class dlgInsertColumn ucrInputPrefixForNewColumn.SetParameter(New RParameter("col_name", 6)) ucrInputPrefixForNewColumn.SetLinkedDisplayControl(lblInputColumnPrefix) - ucrInputPrefixForNewColumn.SetPrefix("X") ucrPnlBeforeAfter.SetLinkedDisplayControl(grpOptions) ucrNudNumberOfRows.SetLinkedDisplayControl(lblNumberOfRowsToInsert) @@ -126,7 +125,7 @@ Public Class dlgInsertColumn ucrInputDefaultValue.Reset() ucrInputPrefixForNewColumn.Reset() ucrInputPrefixForNewColumn.SetName("X") - ucrInputDefaultValue.SetName("NA") + clsInsertColumnFunction.AddParameter("col_data", " NA") clsInsertColumnFunction.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$add_columns_to_data") clsInsertColumnFunction.AddParameter("use_col_name_as_prefix", "TRUE") From 60b1f1d9d020c6a75f41e43698d5b1b678d03380 Mon Sep 17 00:00:00 2001 From: Steven Date: Thu, 8 Jun 2017 16:57:18 +0300 Subject: [PATCH 128/154] More additions --- instat/clsGgplotDefaults.vb | 18 +- instat/sdgThemes.Designer.vb | 321 +++++++++++++++++++++++++++++++---- instat/sdgThemes.vb | 45 +++++ 3 files changed, 338 insertions(+), 46 deletions(-) diff --git a/instat/clsGgplotDefaults.vb b/instat/clsGgplotDefaults.vb index ce95d82aa39..424c1a6c414 100644 --- a/instat/clsGgplotDefaults.vb +++ b/instat/clsGgplotDefaults.vb @@ -133,9 +133,9 @@ ' dctTemp.Add("legend.spacing.x", clsElementText.Clone()) 'dctTemp.Add("legend.spacing.y", clsElementText.Clone()) dctTemp.Add("legend.key", clsElementRect.Clone()) - ' dctTemp.Add("legend.key.size", clsElementText.Clone()) - 'dctTemp.Add("legend.key.height", clsElementText.Clone()) - ' dctTemp.Add("legend.key.width", clsElementText.Clone()) + dctTemp.Add("legend.key.size", clsUnit.Clone()) + dctTemp.Add("legend.key.height", clsUnit.Clone()) + dctTemp.Add("legend.key.width", clsUnit.Clone()) dctTemp.Add("legend.text", clsElementText.Clone()) 'dctTemp.Add("legend.text.align", clsElementText.Clone()) dctTemp.Add("legend.title", clsElementText.Clone()) @@ -150,9 +150,9 @@ 'dctTemp.Add("legend.box.spacing", clsElementText.Clone()) dctTemp.Add("panel.background", clsElementRect.Clone()) dctTemp.Add("panel.border", clsElementRect.Clone()) - 'dctTemp.Add("panel.spacing", clsElementText.Clone()) - ' dctTemp.Add("panel.spacing.x", clsElementText.Clone()) - 'dctTemp.Add("panel.spacing.y", clsElementText.Clone()) + dctTemp.Add("panel.spacing", clsUnit.Clone()) + dctTemp.Add("panel.spacing.x", clsUnit.Clone()) + dctTemp.Add("panel.spacing.y", clsUnit.Clone()) dctTemp.Add("panel.grid", clsElementLine.Clone()) dctTemp.Add("panel.grid.major", clsElementLine.Clone()) dctTemp.Add("panel.grid.minor", clsElementLine.Clone()) @@ -165,14 +165,14 @@ dctTemp.Add("plot.title", clsElementText.Clone()) dctTemp.Add("plot.subtitle", clsElementText.Clone()) dctTemp.Add("plot.caption", clsElementText.Clone()) - ' dctTemp.Add("plot.margin", clsElementRect.Clone()) + dctTemp.Add("plot.margin", clsUnit.Clone()) dctTemp.Add("strip.background", clsElementRect.Clone()) ' dctTemp.Add("strip.placement", clsElementLine.Clone()) dctTemp.Add("strip.text", clsElementText.Clone()) dctTemp.Add("strip.text.x", clsElementText.Clone()) dctTemp.Add("strip.text.y", clsElementText.Clone()) - 'dctTemp.Add("strip.switch.pad.grid", clsElementLine.Clone()) - 'dctTemp.Add("strip.switch.pad.wrap", clsElementLine.Clone()) + dctTemp.Add("strip.switch.pad.grid", clsUnit.Clone()) + dctTemp.Add("strip.switch.pad.wrap", clsUnit.Clone()) Return dctTemp End Get End Property diff --git a/instat/sdgThemes.Designer.vb b/instat/sdgThemes.Designer.vb index cda3c64505a..f6c039df667 100644 --- a/instat/sdgThemes.Designer.vb +++ b/instat/sdgThemes.Designer.vb @@ -24,6 +24,9 @@ Partial Class sdgThemes Private Sub InitializeComponent() Me.ucrBaseSubdialogue = New instat.ucrButtonsSubdialogue() Me.tbThemeFacets = New System.Windows.Forms.TabPage() + Me.GroupBox1 = New System.Windows.Forms.GroupBox() + Me.ucrStripsSpaceWrap = New instat.ucrGridUnit() + Me.ucrStripsSpaceGrid = New instat.ucrGridUnit() Me.grpFacetBackground = New System.Windows.Forms.GroupBox() Me.ucrStripBackGround = New instat.ucrElementRectControl() Me.grpFacetLabels = New System.Windows.Forms.GroupBox() @@ -31,6 +34,10 @@ Partial Class sdgThemes Me.ucrStripTextXAxis = New instat.ucrELementTextControl() Me.ucrStripText = New instat.ucrELementTextControl() Me.tbThemePanelAndBackground = New System.Windows.Forms.TabPage() + Me.grpPanelSpacing = New System.Windows.Forms.GroupBox() + Me.ucrPanelSpacingYAxis = New instat.ucrGridUnit() + Me.ucrPanelSpacingXAxis = New instat.ucrGridUnit() + Me.ucrPanelSpacing = New instat.ucrGridUnit() Me.grpBorderAndBackground = New System.Windows.Forms.GroupBox() Me.ucrPanelBackGround = New instat.ucrElementRectControl() Me.ucrPanelBorder = New instat.ucrElementRectControl() @@ -39,6 +46,10 @@ Partial Class sdgThemes Me.ucrPanelGridMajor = New instat.ucrElementLineControl() Me.ucrPanelGrid = New instat.ucrElementLineControl() Me.tbThemeLegend = New System.Windows.Forms.TabPage() + Me.grpLegendKeyAdjustment = New System.Windows.Forms.GroupBox() + Me.ucrLegendKeyWidth = New instat.ucrGridUnit() + Me.ucrLegendKeyHeight = New instat.ucrGridUnit() + Me.ucrLegendKeySize = New instat.ucrGridUnit() Me.grpLegendTitleAndText = New System.Windows.Forms.GroupBox() Me.ucrLegendText = New instat.ucrELementTextControl() Me.ucrLegendTitle = New instat.ucrELementTextControl() @@ -80,12 +91,15 @@ Partial Class sdgThemes Me.ucrXAxisLines = New instat.ucrElementLineControl() Me.ucrTickMarksXAxis = New instat.ucrElementLineControl() Me.tbXYAxes = New System.Windows.Forms.TabPage() + Me.grpTickLength = New System.Windows.Forms.GroupBox() + Me.ucrTickLength = New instat.ucrGridUnit() Me.ucrThemeAxesLines = New instat.ucrElementLineControl() Me.ucrThemeAxesTickLabels = New instat.ucrELementTextControl() Me.ucrTickMarksAxes = New instat.ucrElementLineControl() Me.ucrThemeAxesTitle = New instat.ucrELementTextControl() Me.tbPLot = New System.Windows.Forms.TabPage() - Me.ucrTickLength = New instat.ucrGridUnit() + Me.grpPlotMargin = New System.Windows.Forms.GroupBox() + Me.ucrPlotMargin = New instat.ucrGridUnit() Me.grpPlotBackground = New System.Windows.Forms.GroupBox() Me.ucrPlotBackGround = New instat.ucrElementRectControl() Me.grpPlotTitleAndCaption = New System.Windows.Forms.GroupBox() @@ -93,17 +107,27 @@ Partial Class sdgThemes Me.ucrPlotSubTitle = New instat.ucrELementTextControl() Me.ucrPlotTitle = New instat.ucrELementTextControl() Me.tbLegend = New System.Windows.Forms.TabControl() - Me.GroupBox1 = New System.Windows.Forms.GroupBox() - Me.UcrGridUnit1 = New instat.ucrGridUnit() + Me.tbThemePanelMoreOptions = New System.Windows.Forms.TabPage() + Me.tbThemeLegendMoreOptions = New System.Windows.Forms.TabPage() + Me.GroupBox2 = New System.Windows.Forms.GroupBox() Me.UcrGridUnit2 = New instat.ucrGridUnit() Me.UcrGridUnit3 = New instat.ucrGridUnit() + Me.GroupBox3 = New System.Windows.Forms.GroupBox() + Me.UcrGridUnit5 = New instat.ucrGridUnit() + Me.UcrGridUnit6 = New instat.ucrGridUnit() + Me.GroupBox4 = New System.Windows.Forms.GroupBox() + Me.UcrGridUnit1 = New instat.ucrGridUnit() + Me.UcrGridUnit4 = New instat.ucrGridUnit() Me.tbThemeFacets.SuspendLayout() + Me.GroupBox1.SuspendLayout() Me.grpFacetBackground.SuspendLayout() Me.grpFacetLabels.SuspendLayout() Me.tbThemePanelAndBackground.SuspendLayout() + Me.grpPanelSpacing.SuspendLayout() Me.grpBorderAndBackground.SuspendLayout() Me.grpPAnelGrid.SuspendLayout() Me.tbThemeLegend.SuspendLayout() + Me.grpLegendKeyAdjustment.SuspendLayout() Me.grpLegendTitleAndText.SuspendLayout() Me.grpLegendAdjustments.SuspendLayout() Me.grpLegendBackGroundAndKey.SuspendLayout() @@ -118,11 +142,17 @@ Partial Class sdgThemes Me.grpXAxisTitle.SuspendLayout() Me.grpTickMarks.SuspendLayout() Me.tbXYAxes.SuspendLayout() + Me.grpTickLength.SuspendLayout() Me.tbPLot.SuspendLayout() + Me.grpPlotMargin.SuspendLayout() Me.grpPlotBackground.SuspendLayout() Me.grpPlotTitleAndCaption.SuspendLayout() Me.tbLegend.SuspendLayout() - Me.GroupBox1.SuspendLayout() + Me.tbThemePanelMoreOptions.SuspendLayout() + Me.tbThemeLegendMoreOptions.SuspendLayout() + Me.GroupBox2.SuspendLayout() + Me.GroupBox3.SuspendLayout() + Me.GroupBox4.SuspendLayout() Me.SuspendLayout() ' 'ucrBaseSubdialogue @@ -134,6 +164,7 @@ Partial Class sdgThemes ' 'tbThemeFacets ' + Me.tbThemeFacets.Controls.Add(Me.GroupBox1) Me.tbThemeFacets.Controls.Add(Me.grpFacetBackground) Me.tbThemeFacets.Controls.Add(Me.grpFacetLabels) Me.tbThemeFacets.Location = New System.Drawing.Point(4, 22) @@ -143,10 +174,35 @@ Partial Class sdgThemes Me.tbThemeFacets.Text = "Facets" Me.tbThemeFacets.UseVisualStyleBackColor = True ' + 'GroupBox1 + ' + Me.GroupBox1.Controls.Add(Me.ucrStripsSpaceWrap) + Me.GroupBox1.Controls.Add(Me.ucrStripsSpaceGrid) + Me.GroupBox1.Location = New System.Drawing.Point(11, 255) + Me.GroupBox1.Name = "GroupBox1" + Me.GroupBox1.Size = New System.Drawing.Size(531, 150) + Me.GroupBox1.TabIndex = 105 + Me.GroupBox1.TabStop = False + Me.GroupBox1.Text = "Space between Strips and Axes" + ' + 'ucrStripsSpaceWrap + ' + Me.ucrStripsSpaceWrap.Location = New System.Drawing.Point(271, 25) + Me.ucrStripsSpaceWrap.Name = "ucrStripsSpaceWrap" + Me.ucrStripsSpaceWrap.Size = New System.Drawing.Size(255, 119) + Me.ucrStripsSpaceWrap.TabIndex = 106 + ' + 'ucrStripsSpaceGrid + ' + Me.ucrStripsSpaceGrid.Location = New System.Drawing.Point(7, 19) + Me.ucrStripsSpaceGrid.Name = "ucrStripsSpaceGrid" + Me.ucrStripsSpaceGrid.Size = New System.Drawing.Size(258, 119) + Me.ucrStripsSpaceGrid.TabIndex = 105 + ' 'grpFacetBackground ' Me.grpFacetBackground.Controls.Add(Me.ucrStripBackGround) - Me.grpFacetBackground.Location = New System.Drawing.Point(12, 264) + Me.grpFacetBackground.Location = New System.Drawing.Point(7, 411) Me.grpFacetBackground.Name = "grpFacetBackground" Me.grpFacetBackground.Size = New System.Drawing.Size(269, 148) Me.grpFacetBackground.TabIndex = 104 @@ -195,6 +251,7 @@ Partial Class sdgThemes ' 'tbThemePanelAndBackground ' + Me.tbThemePanelAndBackground.Controls.Add(Me.grpPanelSpacing) Me.tbThemePanelAndBackground.Controls.Add(Me.grpBorderAndBackground) Me.tbThemePanelAndBackground.Controls.Add(Me.grpPAnelGrid) Me.tbThemePanelAndBackground.Location = New System.Drawing.Point(4, 22) @@ -204,6 +261,39 @@ Partial Class sdgThemes Me.tbThemePanelAndBackground.Text = "Panel and Background " Me.tbThemePanelAndBackground.UseVisualStyleBackColor = True ' + 'grpPanelSpacing + ' + Me.grpPanelSpacing.Controls.Add(Me.ucrPanelSpacingYAxis) + Me.grpPanelSpacing.Controls.Add(Me.ucrPanelSpacingXAxis) + Me.grpPanelSpacing.Controls.Add(Me.ucrPanelSpacing) + Me.grpPanelSpacing.Location = New System.Drawing.Point(4, 315) + Me.grpPanelSpacing.Name = "grpPanelSpacing" + Me.grpPanelSpacing.Size = New System.Drawing.Size(788, 150) + Me.grpPanelSpacing.TabIndex = 69 + Me.grpPanelSpacing.TabStop = False + Me.grpPanelSpacing.Text = "Panel Spacing" + ' + 'ucrPanelSpacingYAxis + ' + Me.ucrPanelSpacingYAxis.Location = New System.Drawing.Point(523, 25) + Me.ucrPanelSpacingYAxis.Name = "ucrPanelSpacingYAxis" + Me.ucrPanelSpacingYAxis.Size = New System.Drawing.Size(256, 119) + Me.ucrPanelSpacingYAxis.TabIndex = 107 + ' + 'ucrPanelSpacingXAxis + ' + Me.ucrPanelSpacingXAxis.Location = New System.Drawing.Point(271, 25) + Me.ucrPanelSpacingXAxis.Name = "ucrPanelSpacingXAxis" + Me.ucrPanelSpacingXAxis.Size = New System.Drawing.Size(255, 119) + Me.ucrPanelSpacingXAxis.TabIndex = 106 + ' + 'ucrPanelSpacing + ' + Me.ucrPanelSpacing.Location = New System.Drawing.Point(7, 19) + Me.ucrPanelSpacing.Name = "ucrPanelSpacing" + Me.ucrPanelSpacing.Size = New System.Drawing.Size(258, 119) + Me.ucrPanelSpacing.TabIndex = 105 + ' 'grpBorderAndBackground ' Me.grpBorderAndBackground.Controls.Add(Me.ucrPanelBackGround) @@ -264,7 +354,7 @@ Partial Class sdgThemes ' 'tbThemeLegend ' - Me.tbThemeLegend.Controls.Add(Me.GroupBox1) + Me.tbThemeLegend.Controls.Add(Me.grpLegendKeyAdjustment) Me.tbThemeLegend.Controls.Add(Me.grpLegendTitleAndText) Me.tbThemeLegend.Controls.Add(Me.grpLegendAdjustments) Me.tbThemeLegend.Controls.Add(Me.grpLegendBackGroundAndKey) @@ -276,6 +366,39 @@ Partial Class sdgThemes Me.tbThemeLegend.Text = "Legend" Me.tbThemeLegend.UseVisualStyleBackColor = True ' + 'grpLegendKeyAdjustment + ' + Me.grpLegendKeyAdjustment.Controls.Add(Me.ucrLegendKeyWidth) + Me.grpLegendKeyAdjustment.Controls.Add(Me.ucrLegendKeyHeight) + Me.grpLegendKeyAdjustment.Controls.Add(Me.ucrLegendKeySize) + Me.grpLegendKeyAdjustment.Location = New System.Drawing.Point(4, 402) + Me.grpLegendKeyAdjustment.Name = "grpLegendKeyAdjustment" + Me.grpLegendKeyAdjustment.Size = New System.Drawing.Size(788, 150) + Me.grpLegendKeyAdjustment.TabIndex = 4 + Me.grpLegendKeyAdjustment.TabStop = False + Me.grpLegendKeyAdjustment.Text = "Legend Key Measurement" + ' + 'ucrLegendKeyWidth + ' + Me.ucrLegendKeyWidth.Location = New System.Drawing.Point(523, 25) + Me.ucrLegendKeyWidth.Name = "ucrLegendKeyWidth" + Me.ucrLegendKeyWidth.Size = New System.Drawing.Size(256, 119) + Me.ucrLegendKeyWidth.TabIndex = 107 + ' + 'ucrLegendKeyHeight + ' + Me.ucrLegendKeyHeight.Location = New System.Drawing.Point(271, 25) + Me.ucrLegendKeyHeight.Name = "ucrLegendKeyHeight" + Me.ucrLegendKeyHeight.Size = New System.Drawing.Size(255, 119) + Me.ucrLegendKeyHeight.TabIndex = 106 + ' + 'ucrLegendKeySize + ' + Me.ucrLegendKeySize.Location = New System.Drawing.Point(7, 19) + Me.ucrLegendKeySize.Name = "ucrLegendKeySize" + Me.ucrLegendKeySize.Size = New System.Drawing.Size(258, 119) + Me.ucrLegendKeySize.TabIndex = 105 + ' 'grpLegendTitleAndText ' Me.grpLegendTitleAndText.Controls.Add(Me.ucrLegendText) @@ -641,6 +764,7 @@ Partial Class sdgThemes ' 'tbXYAxes ' + Me.tbXYAxes.Controls.Add(Me.grpTickLength) Me.tbXYAxes.Controls.Add(Me.ucrThemeAxesLines) Me.tbXYAxes.Controls.Add(Me.ucrThemeAxesTickLabels) Me.tbXYAxes.Controls.Add(Me.ucrTickMarksAxes) @@ -652,6 +776,23 @@ Partial Class sdgThemes Me.tbXYAxes.Text = "XY-Axes" Me.tbXYAxes.UseVisualStyleBackColor = True ' + 'grpTickLength + ' + Me.grpTickLength.Controls.Add(Me.ucrTickLength) + Me.grpTickLength.Location = New System.Drawing.Point(523, 13) + Me.grpTickLength.Name = "grpTickLength" + Me.grpTickLength.Size = New System.Drawing.Size(263, 137) + Me.grpTickLength.TabIndex = 106 + Me.grpTickLength.TabStop = False + Me.grpTickLength.Text = "grpTickLength" + ' + 'ucrTickLength + ' + Me.ucrTickLength.Location = New System.Drawing.Point(1, 15) + Me.ucrTickLength.Name = "ucrTickLength" + Me.ucrTickLength.Size = New System.Drawing.Size(256, 114) + Me.ucrTickLength.TabIndex = 104 + ' 'ucrThemeAxesLines ' Me.ucrThemeAxesLines.Location = New System.Drawing.Point(271, 246) @@ -682,7 +823,7 @@ Partial Class sdgThemes ' 'tbPLot ' - Me.tbPLot.Controls.Add(Me.ucrTickLength) + Me.tbPLot.Controls.Add(Me.grpPlotMargin) Me.tbPLot.Controls.Add(Me.grpPlotBackground) Me.tbPLot.Controls.Add(Me.grpPlotTitleAndCaption) Me.tbPLot.Location = New System.Drawing.Point(4, 22) @@ -693,12 +834,22 @@ Partial Class sdgThemes Me.tbPLot.Text = "Plot" Me.tbPLot.UseVisualStyleBackColor = True ' - 'ucrTickLength + 'grpPlotMargin ' - Me.ucrTickLength.Location = New System.Drawing.Point(332, 275) - Me.ucrTickLength.Name = "ucrTickLength" - Me.ucrTickLength.Size = New System.Drawing.Size(280, 119) - Me.ucrTickLength.TabIndex = 104 + Me.grpPlotMargin.Controls.Add(Me.ucrPlotMargin) + Me.grpPlotMargin.Location = New System.Drawing.Point(281, 266) + Me.grpPlotMargin.Name = "grpPlotMargin" + Me.grpPlotMargin.Size = New System.Drawing.Size(263, 137) + Me.grpPlotMargin.TabIndex = 106 + Me.grpPlotMargin.TabStop = False + Me.grpPlotMargin.Text = "Plot Margin" + ' + 'ucrPlotMargin + ' + Me.ucrPlotMargin.Location = New System.Drawing.Point(1, 15) + Me.ucrPlotMargin.Name = "ucrPlotMargin" + Me.ucrPlotMargin.Size = New System.Drawing.Size(256, 114) + Me.ucrPlotMargin.TabIndex = 104 ' 'grpPlotBackground ' @@ -757,7 +908,9 @@ Partial Class sdgThemes Me.tbLegend.Controls.Add(Me.tbThemeXAxis) Me.tbLegend.Controls.Add(Me.tbThemeYaxis) Me.tbLegend.Controls.Add(Me.tbThemeLegend) + Me.tbLegend.Controls.Add(Me.tbThemeLegendMoreOptions) Me.tbLegend.Controls.Add(Me.tbThemePanelAndBackground) + Me.tbLegend.Controls.Add(Me.tbThemePanelMoreOptions) Me.tbLegend.Controls.Add(Me.tbThemeFacets) Me.tbLegend.Location = New System.Drawing.Point(4, 8) Me.tbLegend.Name = "tbLegend" @@ -765,38 +918,102 @@ Partial Class sdgThemes Me.tbLegend.Size = New System.Drawing.Size(824, 590) Me.tbLegend.TabIndex = 1 ' - 'GroupBox1 - ' - Me.GroupBox1.Controls.Add(Me.UcrGridUnit3) - Me.GroupBox1.Controls.Add(Me.UcrGridUnit2) - Me.GroupBox1.Controls.Add(Me.UcrGridUnit1) - Me.GroupBox1.Location = New System.Drawing.Point(4, 402) - Me.GroupBox1.Name = "GroupBox1" - Me.GroupBox1.Size = New System.Drawing.Size(777, 150) - Me.GroupBox1.TabIndex = 4 - Me.GroupBox1.TabStop = False - Me.GroupBox1.Text = "Legend Background and Key" - ' - 'UcrGridUnit1 - ' - Me.UcrGridUnit1.Location = New System.Drawing.Point(13, 25) - Me.UcrGridUnit1.Name = "UcrGridUnit1" - Me.UcrGridUnit1.Size = New System.Drawing.Size(280, 119) - Me.UcrGridUnit1.TabIndex = 105 + 'tbThemePanelMoreOptions + ' + Me.tbThemePanelMoreOptions.Controls.Add(Me.GroupBox3) + Me.tbThemePanelMoreOptions.Controls.Add(Me.GroupBox2) + Me.tbThemePanelMoreOptions.Location = New System.Drawing.Point(4, 22) + Me.tbThemePanelMoreOptions.Name = "tbThemePanelMoreOptions" + Me.tbThemePanelMoreOptions.Padding = New System.Windows.Forms.Padding(3) + Me.tbThemePanelMoreOptions.Size = New System.Drawing.Size(816, 564) + Me.tbThemePanelMoreOptions.TabIndex = 9 + Me.tbThemePanelMoreOptions.Text = "Panel(More Options)" + Me.tbThemePanelMoreOptions.UseVisualStyleBackColor = True + ' + 'tbThemeLegendMoreOptions + ' + Me.tbThemeLegendMoreOptions.Controls.Add(Me.GroupBox4) + Me.tbThemeLegendMoreOptions.Location = New System.Drawing.Point(4, 22) + Me.tbThemeLegendMoreOptions.Name = "tbThemeLegendMoreOptions" + Me.tbThemeLegendMoreOptions.Size = New System.Drawing.Size(816, 564) + Me.tbThemeLegendMoreOptions.TabIndex = 10 + Me.tbThemeLegendMoreOptions.Text = "Legend(More Options)" + Me.tbThemeLegendMoreOptions.UseVisualStyleBackColor = True + ' + 'GroupBox2 + ' + Me.GroupBox2.Controls.Add(Me.UcrGridUnit2) + Me.GroupBox2.Controls.Add(Me.UcrGridUnit3) + Me.GroupBox2.Location = New System.Drawing.Point(6, 6) + Me.GroupBox2.Name = "GroupBox2" + Me.GroupBox2.Size = New System.Drawing.Size(537, 150) + Me.GroupBox2.TabIndex = 70 + Me.GroupBox2.TabStop = False + Me.GroupBox2.Text = "Panel Spacing" ' 'UcrGridUnit2 ' - Me.UcrGridUnit2.Location = New System.Drawing.Point(299, 19) + Me.UcrGridUnit2.Location = New System.Drawing.Point(271, 25) Me.UcrGridUnit2.Name = "UcrGridUnit2" - Me.UcrGridUnit2.Size = New System.Drawing.Size(280, 119) + Me.UcrGridUnit2.Size = New System.Drawing.Size(255, 119) Me.UcrGridUnit2.TabIndex = 106 ' 'UcrGridUnit3 ' - Me.UcrGridUnit3.Location = New System.Drawing.Point(529, 31) + Me.UcrGridUnit3.Location = New System.Drawing.Point(7, 19) Me.UcrGridUnit3.Name = "UcrGridUnit3" - Me.UcrGridUnit3.Size = New System.Drawing.Size(280, 119) - Me.UcrGridUnit3.TabIndex = 107 + Me.UcrGridUnit3.Size = New System.Drawing.Size(258, 119) + Me.UcrGridUnit3.TabIndex = 105 + ' + 'GroupBox3 + ' + Me.GroupBox3.Controls.Add(Me.UcrGridUnit5) + Me.GroupBox3.Controls.Add(Me.UcrGridUnit6) + Me.GroupBox3.Location = New System.Drawing.Point(6, 162) + Me.GroupBox3.Name = "GroupBox3" + Me.GroupBox3.Size = New System.Drawing.Size(537, 150) + Me.GroupBox3.TabIndex = 108 + Me.GroupBox3.TabStop = False + Me.GroupBox3.Text = "Panel Spacing" + ' + 'UcrGridUnit5 + ' + Me.UcrGridUnit5.Location = New System.Drawing.Point(271, 25) + Me.UcrGridUnit5.Name = "UcrGridUnit5" + Me.UcrGridUnit5.Size = New System.Drawing.Size(255, 119) + Me.UcrGridUnit5.TabIndex = 106 + ' + 'UcrGridUnit6 + ' + Me.UcrGridUnit6.Location = New System.Drawing.Point(7, 19) + Me.UcrGridUnit6.Name = "UcrGridUnit6" + Me.UcrGridUnit6.Size = New System.Drawing.Size(258, 119) + Me.UcrGridUnit6.TabIndex = 105 + ' + 'GroupBox4 + ' + Me.GroupBox4.Controls.Add(Me.UcrGridUnit1) + Me.GroupBox4.Controls.Add(Me.UcrGridUnit4) + Me.GroupBox4.Location = New System.Drawing.Point(4, 4) + Me.GroupBox4.Name = "GroupBox4" + Me.GroupBox4.Size = New System.Drawing.Size(537, 150) + Me.GroupBox4.TabIndex = 71 + Me.GroupBox4.TabStop = False + Me.GroupBox4.Text = "Panel Spacing" + ' + 'UcrGridUnit1 + ' + Me.UcrGridUnit1.Location = New System.Drawing.Point(271, 25) + Me.UcrGridUnit1.Name = "UcrGridUnit1" + Me.UcrGridUnit1.Size = New System.Drawing.Size(255, 119) + Me.UcrGridUnit1.TabIndex = 106 + ' + 'UcrGridUnit4 + ' + Me.UcrGridUnit4.Location = New System.Drawing.Point(7, 19) + Me.UcrGridUnit4.Name = "UcrGridUnit4" + Me.UcrGridUnit4.Size = New System.Drawing.Size(258, 119) + Me.UcrGridUnit4.TabIndex = 105 ' 'sdgThemes ' @@ -812,12 +1029,15 @@ Partial Class sdgThemes Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen Me.Text = "Themes" Me.tbThemeFacets.ResumeLayout(False) + Me.GroupBox1.ResumeLayout(False) Me.grpFacetBackground.ResumeLayout(False) Me.grpFacetLabels.ResumeLayout(False) Me.tbThemePanelAndBackground.ResumeLayout(False) + Me.grpPanelSpacing.ResumeLayout(False) Me.grpBorderAndBackground.ResumeLayout(False) Me.grpPAnelGrid.ResumeLayout(False) Me.tbThemeLegend.ResumeLayout(False) + Me.grpLegendKeyAdjustment.ResumeLayout(False) Me.grpLegendTitleAndText.ResumeLayout(False) Me.grpLegendAdjustments.ResumeLayout(False) Me.grpLegendBackGroundAndKey.ResumeLayout(False) @@ -832,11 +1052,17 @@ Partial Class sdgThemes Me.grpXAxisTitle.ResumeLayout(False) Me.grpTickMarks.ResumeLayout(False) Me.tbXYAxes.ResumeLayout(False) + Me.grpTickLength.ResumeLayout(False) Me.tbPLot.ResumeLayout(False) + Me.grpPlotMargin.ResumeLayout(False) Me.grpPlotBackground.ResumeLayout(False) Me.grpPlotTitleAndCaption.ResumeLayout(False) Me.tbLegend.ResumeLayout(False) - Me.GroupBox1.ResumeLayout(False) + Me.tbThemePanelMoreOptions.ResumeLayout(False) + Me.tbThemeLegendMoreOptions.ResumeLayout(False) + Me.GroupBox2.ResumeLayout(False) + Me.GroupBox3.ResumeLayout(False) + Me.GroupBox4.ResumeLayout(False) Me.ResumeLayout(False) End Sub @@ -911,9 +1137,30 @@ Partial Class sdgThemes Friend WithEvents ucrPlotSubTitle As ucrELementTextControl Friend WithEvents ucrPlotTitle As ucrELementTextControl Friend WithEvents tbLegend As TabControl + Friend WithEvents grpLegendKeyAdjustment As GroupBox + Friend WithEvents ucrLegendKeyWidth As ucrGridUnit + Friend WithEvents ucrLegendKeyHeight As ucrGridUnit + Friend WithEvents ucrLegendKeySize As ucrGridUnit + Friend WithEvents grpPanelSpacing As GroupBox + Friend WithEvents ucrPanelSpacingYAxis As ucrGridUnit + Friend WithEvents ucrPanelSpacingXAxis As ucrGridUnit + Friend WithEvents ucrPanelSpacing As ucrGridUnit + Friend WithEvents grpTickLength As GroupBox Friend WithEvents ucrTickLength As ucrGridUnit + Friend WithEvents grpPlotMargin As GroupBox + Friend WithEvents ucrPlotMargin As ucrGridUnit Friend WithEvents GroupBox1 As GroupBox - Friend WithEvents UcrGridUnit3 As ucrGridUnit + Friend WithEvents ucrStripsSpaceWrap As ucrGridUnit + Friend WithEvents ucrStripsSpaceGrid As ucrGridUnit + Friend WithEvents tbThemeLegendMoreOptions As TabPage + Friend WithEvents tbThemePanelMoreOptions As TabPage + Friend WithEvents GroupBox3 As GroupBox + Friend WithEvents UcrGridUnit5 As ucrGridUnit + Friend WithEvents UcrGridUnit6 As ucrGridUnit + Friend WithEvents GroupBox2 As GroupBox Friend WithEvents UcrGridUnit2 As ucrGridUnit + Friend WithEvents UcrGridUnit3 As ucrGridUnit + Friend WithEvents GroupBox4 As GroupBox Friend WithEvents UcrGridUnit1 As ucrGridUnit + Friend WithEvents UcrGridUnit4 As ucrGridUnit End Class diff --git a/instat/sdgThemes.vb b/instat/sdgThemes.vb index 1d0bd105074..81cb3d205cd 100644 --- a/instat/sdgThemes.vb +++ b/instat/sdgThemes.vb @@ -75,6 +75,18 @@ Public Class sdgThemes ucrStripTextYAxis.setlabel("Facet labels along vertical direction") ucrTickLength.setlabel("Length of tick marks") + ucrPlotMargin.setlabel("Margin around entire plot") + + ucrLegendKeySize.setlabel("Size of legend keys") + ucrLegendKeyHeight.setlabel("Key background height") + ucrLegendKeySize.setlabel("Key background width") + + ucrPanelSpacing.setlabel("Spacing between facet panels ") + ucrPanelSpacingXAxis.setlabel("Horizontal spacing between facet panels") + ucrPanelSpacingYAxis.setlabel("Vertical spacing between facet panels") + + ucrStripsSpaceGrid.setlabel("When strips are switched(Grid)") + ucrStripsSpaceWrap.setlabel("when strips are switched(wrap)") ' TODO: Find what this means: "two-element numeric vector" urChkLegendPosition.SetText("Legend Position") @@ -176,6 +188,15 @@ Public Class sdgThemes Dim clsElementPanelGridMinor As New RFunction Dim clsUnitAxisTickLength As New RFunction + Dim clsUnitLegendSize As New RFunction + Dim clsUnitLegendHeight As New RFunction + Dim clsUnitLegendWidth As New RFunction + Dim clsUnitPanelSpacing As New RFunction + Dim clsUnitPanelSpacingXAxis As New RFunction + Dim clsUnitPanelSpacingYAxis As New RFunction + Dim clsUnitPlotMargin As New RFunction + Dim clsUnitStripsGrid As New RFunction + Dim clsUnitStripsWrap As New RFunction If Not bControlsInitialised Then InitialiseControls() @@ -219,6 +240,15 @@ Public Class sdgThemes dctThemeFunctions.TryGetValue("panel.grid.minor", clsElementPanelGridMinor) dctThemeFunctions.TryGetValue("axis.ticks.length", clsUnitAxisTickLength) + dctThemeFunctions.TryGetValue("legend.key.size", clsUnitLegendSize) + dctThemeFunctions.TryGetValue("legend.key.height", clsUnitLegendHeight) + dctThemeFunctions.TryGetValue("legend.key.width", clsUnitLegendWidth) + dctThemeFunctions.TryGetValue("panel.spacing", clsUnitPanelSpacing) + dctThemeFunctions.TryGetValue("panel.spacing.x", clsUnitPanelSpacingXAxis) + dctThemeFunctions.TryGetValue("panel.spacing.y", clsUnitPanelSpacingYAxis) + dctThemeFunctions.TryGetValue("plot.margin", clsUnitPlotMargin) + dctThemeFunctions.TryGetValue("strip.switch.pad.grid", clsUnitStripsGrid) + dctThemeFunctions.TryGetValue("strip.switch.pad.wrap", clsUnitStripsWrap) dctThemeFunctions.TryGetValue("legend.background", clsElementLegendBackground) dctThemeFunctions.TryGetValue("legend.box.background", clsElementLegendBoxBackground) @@ -226,6 +256,8 @@ Public Class sdgThemes dctThemeFunctions.TryGetValue("panel.background", clsElementPanelBackGround) dctThemeFunctions.TryGetValue("panel.border", clsElementBorder) + + dctThemeFunctions.TryGetValue("plot.background", clsElementPlotBackground) dctThemeFunctions.TryGetValue("strip.background", clsElementStripBackground) @@ -273,6 +305,19 @@ Public Class sdgThemes ucrTickLength.SetRCodeForControl("axis.ticks.length", clsUnitAxisTickLength, clsNewThemeFunction:=clsThemeFunction, clsNewBaseOperator:=clsBaseOperator, bReset:=bReset) + ucrLegendKeySize.SetRCodeForControl("legend.key.size", clsUnitLegendSize, clsNewThemeFunction:=clsThemeFunction, clsNewBaseOperator:=clsBaseOperator, bReset:=bReset) + ucrLegendKeyHeight.SetRCodeForControl("legend.key.height", clsUnitLegendHeight, clsNewThemeFunction:=clsThemeFunction, clsNewBaseOperator:=clsBaseOperator, bReset:=bReset) + ucrLegendKeyWidth.SetRCodeForControl("legend.key.width", clsUnitLegendWidth, clsNewThemeFunction:=clsThemeFunction, clsNewBaseOperator:=clsBaseOperator, bReset:=bReset) + + ucrPanelSpacing.SetRCodeForControl("panel.spacing", clsUnitPanelSpacing, clsNewThemeFunction:=clsThemeFunction, clsNewBaseOperator:=clsBaseOperator, bReset:=bReset) + ucrPanelSpacingXAxis.SetRCodeForControl("panel.spacing.x", clsUnitPanelSpacingXAxis, clsNewThemeFunction:=clsThemeFunction, clsNewBaseOperator:=clsBaseOperator, bReset:=bReset) + ucrPanelSpacingYAxis.SetRCodeForControl("panel.spacing.y", clsUnitPanelSpacingYAxis, clsNewThemeFunction:=clsThemeFunction, clsNewBaseOperator:=clsBaseOperator, bReset:=bReset) + + ucrStripsSpaceGrid.SetRCodeForControl("strip.switch.pad.grid", clsUnitStripsGrid, clsNewThemeFunction:=clsThemeFunction, clsNewBaseOperator:=clsBaseOperator, bReset:=bReset) + ucrStripsSpaceWrap.SetRCodeForControl("strip.switch.pad.wrap", clsUnitStripsWrap, clsNewThemeFunction:=clsThemeFunction, clsNewBaseOperator:=clsBaseOperator, bReset:=bReset) + + ucrPlotMargin.SetRCodeForControl("plot.margin", clsUnitPlotMargin, clsNewThemeFunction:=clsThemeFunction, clsNewBaseOperator:=clsBaseOperator, bReset:=bReset) + urChkLegendPosition.SetRCode(clsThemeFunction, bReset) ucrInputLegendPosition.SetRCode(clsThemeFunction, bReset) From 03516e66c86d10e5c1010bc5758babc025becce7 Mon Sep 17 00:00:00 2001 From: Lily Date: Thu, 8 Jun 2017 15:19:18 +0100 Subject: [PATCH 129/154] lazyeval:: addition --- instat/static/InstatObject/R/data_object_R6.R | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/instat/static/InstatObject/R/data_object_R6.R b/instat/static/InstatObject/R/data_object_R6.R index 0c78cc5540e..0a54230d4b0 100644 --- a/instat/static/InstatObject/R/data_object_R6.R +++ b/instat/static/InstatObject/R/data_object_R6.R @@ -951,8 +951,8 @@ data_object$set("public", "sort_dataframe", function(col_names = c(), decreasing if(!(col_name %in% names(curr_data))) { stop(col_name, " is not a column in ", get_metadata(data_name_label)) } - if(decreasing) col_names_exp[[i]] <- interp(~ desc(var), var = as.name(col_name)) - else col_names_exp[[i]] <- interp(~ var, var = as.name(col_name)) + if(decreasing) col_names_exp[[i]] <- lazyeval::interp(~ desc(var), var = as.name(col_name)) + else col_names_exp[[i]] <- lazyeval::interp(~ var, var = as.name(col_name)) i = i + 1 } if(by_row_names) warning("Cannot sort by columns and row names. Sorting will be done by given columns only.") @@ -2156,10 +2156,10 @@ data_object$set("public","infill_missing_dates", function(date_name, factors) { col_names_exp <- c() for(i in seq_along(factors)) { col_name <- factors[i] - col_names_exp[[i]] <- interp(~ var, var = as.name(col_name)) + col_names_exp[[i]] <- lazyeval::interp(~ var, var = as.name(col_name)) } grouped_data <- self$get_data_frame(use_current_filter = FALSE) %>% dplyr::group_by_(.dots = col_names_exp) - date_ranges <- grouped_data %>% dplyr::summarise_(.dots = setNames(list(interp(~ min(var), var = as.name(date_name)), lazyeval::interp(~ max(var), var = as.name(date_name))), c("Min", "Max"))) + date_ranges <- grouped_data %>% dplyr::summarise_(.dots = setNames(list(lazyeval::interp(~ min(var), var = as.name(date_name)), lazyeval::interp(~ max(var), var = as.name(date_name))), c("Min", "Max"))) date_lengths <- grouped_data %>% dplyr::summarise(Count = n()) full_dates_list <- list() for(j in 1:nrow(date_ranges)) { From e7d83e92dafa7e6a33a8e4f29ca391d3e59d9357 Mon Sep 17 00:00:00 2001 From: Lily Date: Thu, 8 Jun 2017 15:32:00 +0100 Subject: [PATCH 130/154] Package name append --- instat/dlgAppend.vb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/instat/dlgAppend.vb b/instat/dlgAppend.vb index 740b42396d1..cfdab8217c9 100644 --- a/instat/dlgAppend.vb +++ b/instat/dlgAppend.vb @@ -50,7 +50,6 @@ Public Class dlgAppend ucrChkIncludeIDColumn.bChangeParameterValue = False ucrChkIncludeIDColumn.AddToLinkedControls(ucrLinked:=ucrInputIDColName, objValues:={True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) ucrInputIDColName.bAddRemoveParameter = False - ucrInputIDColName.SetLinkedDisplayControl(lblIDColName) ' ucrSave ucrSaveGraph.SetIsTextBox() @@ -65,6 +64,7 @@ Public Class dlgAppend ucrSelectorDataframes.Reset() ucrSaveGraph.Reset() + clsBindRows.SetPackageName("dplyr") clsBindRows.SetRCommand("bind_rows") clsBindRows.AddParameter(".id", Chr(34) & "id" & Chr(34)) clsBindRows.SetAssignTo(ucrSaveGraph.GetText(), strTempDataframe:=ucrSaveGraph.GetText()) From c1d9e3b582412b3be8797ae661d161adc41eeb19 Mon Sep 17 00:00:00 2001 From: Danny Parsons Date: Thu, 8 Jun 2017 15:35:43 +0100 Subject: [PATCH 131/154] working layer parameter options and link to options sub dialog --- instat/UcrGeomListWithAes.vb | 8 +- instat/dlgGeneralForGraphics.vb | 155 +++++++------------------- instat/sdgLayerOptions.vb | 5 +- instat/ucrAdditionalLayers.vb | 23 ++-- instat/ucrColors.vb | 21 +++- instat/ucrLayerParamsControls.vb | 4 +- instat/ucrReceiverMetadataProperty.vb | 18 ++- 7 files changed, 97 insertions(+), 137 deletions(-) diff --git a/instat/UcrGeomListWithAes.vb b/instat/UcrGeomListWithAes.vb index 016cb6dc5cb..c46934c859c 100644 --- a/instat/UcrGeomListWithAes.vb +++ b/instat/UcrGeomListWithAes.vb @@ -315,8 +315,8 @@ Public Class ucrGeomListWithParameters clsGeomFunction.RemoveParameterByName("data") 'Here the global ggplot function takes the relevant "mapping" and "data" parameters as required by "ApplyOnAllLayers". - clsGgplotFunction.AddParameter("mapping", clsRFunctionParameter:=clsGlobalAesFunction) - clsGgplotFunction.AddParameter("data", clsRFunctionParameter:=ucrGeomWithAesSelector.ucrAvailableDataFrames.clsCurrDataFrame.Clone()) + clsGgplotFunction.AddParameter("mapping", clsRFunctionParameter:=clsGlobalAesFunction, iPosition:=1) + clsGgplotFunction.AddParameter("data", clsRFunctionParameter:=ucrGeomWithAesSelector.ucrAvailableDataFrames.clsCurrDataFrame.Clone(), iPosition:=0) strGlobalDataFrame = ucrGeomWithAesSelector.ucrAvailableDataFrames.cboAvailableDataFrames.Text clsCurrentAesFunction = clsGlobalAesFunction @@ -331,7 +331,7 @@ Public Class ucrGeomListWithParameters 'If global data frame later changes, data parameter is needed in each geom? If ucrGeomWithAesSelector.ucrAvailableDataFrames.cboAvailableDataFrames.Text <> strGlobalDataFrame Then - clsGeomFunction.AddParameter("data", clsRFunctionParameter:=ucrGeomWithAesSelector.ucrAvailableDataFrames.clsCurrDataFrame.Clone()) + clsGeomFunction.AddParameter("data", clsRFunctionParameter:=ucrGeomWithAesSelector.ucrAvailableDataFrames.clsCurrDataFrame.Clone(), iPosition:=1) Else clsGeomFunction.RemoveParameterByName("data") End If @@ -364,7 +364,7 @@ Public Class ucrGeomListWithParameters 'Done after because aes may be added in from above If Not ucrChkApplyOnAllLayers.Checked AndAlso clsLocalAesFunction.iParameterCount > 0 Then - clsGeomFunction.AddParameter("mapping", clsRFunctionParameter:=clsLocalAesFunction.Clone()) + clsGeomFunction.AddParameter("mapping", clsRFunctionParameter:=clsLocalAesFunction.Clone(), iPosition:=0) Else clsGeomFunction.RemoveParameterByName("mapping") End If diff --git a/instat/dlgGeneralForGraphics.vb b/instat/dlgGeneralForGraphics.vb index ae0da60542c..762bd4a3976 100644 --- a/instat/dlgGeneralForGraphics.vb +++ b/instat/dlgGeneralForGraphics.vb @@ -14,16 +14,26 @@ ' You should have received a copy of the GNU General Public License k ' along with this program. If not, see . Imports instat.Translations + Public Class dlgGeneralForGraphics - Public clsGgplotFunction As New RFunction + Public clsGgplotFunction As RFunction Private bFirstLoad As Boolean = True Private lstLayerComplete As New List(Of Boolean) 'list of completed layers. Private iLayerIndex As Integer 'current layer - Public WithEvents clsGlobalAesFunction As New RFunction + Public clsGlobalAesFunction As RFunction + Public clsBaseOperator As ROperator Private strGlobalDataFrame As String Public bDataFrameSet As Boolean + Private bResetOptionsSubdialog As Boolean = True + + 'RFunctions for Options sub dialog + Private clsLabsFunction As New RFunction + Private clsXlabsFunction As New RFunction + Private clsYlabFunction As New RFunction + Private clsXScalecontinuousFunction As New RFunction + Private clsRFacetFunction As New RFunction Private Sub dlgGeneralForGraphics_Load(sender As Object, e As EventArgs) Handles MyBase.Load If bFirstLoad Then @@ -38,36 +48,44 @@ Public Class dlgGeneralForGraphics End Sub Private Sub InitialiseDialog() - 'setting the base ggplot functions - ucrBase.clsRsyntax.SetOperation("+") - clsGgplotFunction.SetRCommand("ggplot") - clsGlobalAesFunction.SetRCommand("aes") - ucrBase.clsRsyntax.SetOperatorParameter(True, clsRFunc:=clsGgplotFunction) - 'True for "we are setting the first parameter, on the left of +". ucrBase.iHelpTopicID = 356 - - ucrSaveGraph.SetDataFrameSelector(sdgLayerOptions.ucrGeomWithAes.ucrGeomWithAesSelector.ucrAvailableDataFrames) - ucrSaveGraph.strPrefix = "Graph" - ucrAdditionalLayers.SetRSyntax(ucrBase.clsRsyntax) - ucrAdditionalLayers.SetGGplotFunction(clsGgplotFunction) - ucrAdditionalLayers.SetAesFunction(clsGlobalAesFunction) - ucrBase.clsRsyntax.bExcludeAssignedFunctionOutput = False 'By default, we want to put in the script the output of our Base R-command (in this case the ...+...+...) even when it has been assigned to some object (in which case we want the name of that object in the script so that it's called when the script is run). 'For example, when a graph is saved, it is assigned to it's place in an R-instat object. If we had set bExcludeAssignedFunctionOutput to True, then we would never print the graph when running the script. - ucrBase.clsRsyntax.iCallType = 3 + ucrBase.clsRsyntax.bExcludeAssignedFunctionOutput = False 'iCalltype 3 corresponds to single graphics display in output window. + ucrBase.clsRsyntax.iCallType = 3 + + ucrSaveGraph.SetDataFrameSelector(sdgLayerOptions.ucrGeomWithAes.ucrGeomWithAesSelector.ucrAvailableDataFrames) + ucrSaveGraph.strPrefix = "Graph" End Sub Private Sub SetDefaults() iLayerIndex = 0 - 'lstLayers.Clear() + ucrAdditionalLayers.Reset() lstLayerComplete.Clear() - 'SetEditDeleteEnabled() strGlobalDataFrame = "" bDataFrameSet = False - clsGgplotFunction.ClearParameters() - clsGlobalAesFunction.ClearParameters() - ucrAdditionalLayers.Reset() + bResetOptionsSubdialog = True + + clsBaseOperator = New ROperator + clsBaseOperator.SetOperation("+") + + clsGgplotFunction = New RFunction + clsGgplotFunction.SetPackageName("ggplot2") + clsGgplotFunction.SetRCommand("ggplot") + + clsGlobalAesFunction = New RFunction + clsGlobalAesFunction.SetPackageName("ggplot2") + clsGlobalAesFunction.SetRCommand("aes") + + clsBaseOperator.AddParameter("ggplot2", clsRFunctionParameter:=clsGgplotFunction, iPosition:=0) + + ucrBase.clsRsyntax.SetBaseROperator(clsBaseOperator) + + ucrAdditionalLayers.SetBaseOperator(clsBaseOperator) + ucrAdditionalLayers.SetGGplotFunction(clsGgplotFunction) + ucrAdditionalLayers.SetAesFunction(clsGlobalAesFunction) + If ucrBase.clsRsyntax.clsBaseOperator IsNot Nothing Then ucrBase.clsRsyntax.clsBaseOperator.RemoveAllAdditionalParameters() End If @@ -84,38 +102,6 @@ Public Class dlgGeneralForGraphics SetDefaults() End Sub - 'Private Sub cmdAdd_Click(sender As Object, e As EventArgs) - ' sdgLayerOptions.SetupLayer(clsTempGgPlot:=clsRggplotFunction, clsTempGeomFunc:=Nothing, clsTempAesFunc:=clsGgplotAesFunction, bFixAes:=False, bFixGeom:=False, strDataframe:=strGlobalDataFrame, bApplyAesGlobally:=lstLayers.Items.Count = 0, bIgnoreGlobalAes:=False) - ' sdgLayerOptions.ShowDialog() - ' strGlobalDataFrame = sdgLayerOptions.strGlobalDataFrame - ' AddLayers() - 'End Sub - - 'Public Sub AddLayers(Optional lviCurrentItem As ListViewItem = Nothing) - ' Dim lviLayer As ListViewItem - ' Dim strLayerName As String - - ' If lviCurrentItem Is Nothing Then - ' iLayerIndex = iLayerIndex + 1 - ' strLayerName = iLayerIndex & "." & sdgLayerOptions.ucrGeomWithAes.cboGeomList.SelectedItem - ' lviLayer = New ListViewItem(text:=strLayerName) - ' lstLayers.Items.Add(lviLayer) - ' lstLayerComplete.Add(sdgLayerOptions.TestForOKEnabled()) - ' Else - ' lviLayer = lviCurrentItem - ' lstLayerComplete(lstLayers.Items.IndexOf(lviLayer)) = sdgLayerOptions.TestForOKEnabled() - ' strLayerName = lviCurrentItem.Text - ' End If - - ' If sdgLayerOptions.TestForOKEnabled() Then - ' lstLayers.Items(lstLayers.Items.IndexOf(lviLayer)).ForeColor = Color.Green - ' Else - ' lstLayers.Items(lstLayers.Items.IndexOf(lviLayer)).ForeColor = Color.Red - ' End If - ' ucrBase.clsRsyntax.SetOperatorParameter(False, strParameterName:=strLayerName, clsRFunc:=sdgLayerOptions.clsGeomFunction.Clone()) - ' TestOKEnabled() - 'End Sub - Public Sub TestOKEnabled() Dim bTemp As Boolean = False For Each bTemp In ucrAdditionalLayers.lstLayerComplete @@ -126,44 +112,6 @@ Public Class dlgGeneralForGraphics ucrBase.OKEnabled(bTemp) End Sub - 'Private Sub cmdDelete_Click(sender As Object, e As EventArgs) - ' If lstLayers.SelectedItems.Count = 1 Then - ' ucrBase.clsRsyntax.RemoveOperatorParameter(lstLayers.SelectedItems(0).Text) - ' lstLayerComplete.RemoveAt(lstLayers.SelectedIndices(0)) - ' lstLayers.Items.Remove(lstLayers.SelectedItems(0)) - ' End If - ' TestOKEnabled() - 'End Sub - - 'Private Sub lstLayers_SelectedIndexChanged(sender As Object, e As EventArgs) - ' SetEditDeleteEnabled() - 'End Sub - - 'Private Sub SetEditDeleteEnabled() - ' If lstLayers.SelectedItems.Count = 1 Then - ' cmdDelete.Enabled = True - ' cmdEdit.Enabled = True - ' Else - ' cmdDelete.Enabled = False - ' cmdEdit.Enabled = False - ' End If - 'End Sub - - 'Private Sub cmdEdit_Click(sender As Object, e As EventArgs) - ' Dim clsSelectedGeom As RFunction - ' Dim clsLocalAes As RFunction - - ' clsSelectedGeom = ucrBase.clsRsyntax.GetParameter(lstLayers.SelectedItems(0).Text).clsArgumentFunction - ' If clsSelectedGeom.GetParameter("mapping") IsNot Nothing Then - ' clsLocalAes = clsSelectedGeom.GetParameter("mapping").clsArgumentFunction - ' Else - ' clsLocalAes = Nothing - ' End If - ' sdgLayerOptions.SetupLayer(clsTempGgPlot:=clsRggplotFunction, clsTempGeomFunc:=clsSelectedGeom, clsTempAesFunc:=clsGgplotAesFunction, bFixAes:=False, bFixGeom:=True, strDataframe:=strGlobalDataFrame, bApplyAesGlobally:=False, bIgnoreGlobalAes:=False, clsTempLocalAes:=clsLocalAes) - ' sdgLayerOptions.ShowDialog() - ' AddLayers(lstLayers.SelectedItems(0)) - 'End Sub - Private Sub ucrSaveGraph_GraphNameChanged() Handles ucrSaveGraph.GraphNameChanged, ucrSaveGraph.SaveGraphCheckedChanged 'Warning/Task: this method seems weird to me, why do we get the dataframe from sdgLayerOptions ???! If ucrSaveGraph.bSaveGraph Then @@ -173,14 +121,11 @@ Public Class dlgGeneralForGraphics End If End Sub - Private Sub SetupPlotOptions() 'Warning to be discussed: I m hoping to have a Setup function in sdgPlots itself... ? - sdgPlots.SetRSyntax(ucrBase.clsRsyntax) - sdgPlots.SetGgplotFunction(clsGgplotFunction) - End Sub Private Sub cmdOptions_Click(sender As Object, e As EventArgs) Handles cmdOptions.Click sdgPlots.DisableLayersTab() - SetupPlotOptions() + sdgPlots.SetRCode(clsBaseOperator, clsNewXScalecontinuousFunction:=clsXScalecontinuousFunction, clsNewXLabsTitleFunction:=clsXlabsFunction, clsNewYLabTitleFunction:=clsYlabFunction, clsNewLabsFunction:=clsLabsFunction, clsNewFacetFunction:=clsRFacetFunction, strNewDataFrame:=strGlobalDataFrame, bReset:=bResetOptionsSubdialog) sdgPlots.ShowDialog() + bResetOptionsSubdialog = False sdgPlots.EnableLayersTab() End Sub @@ -188,22 +133,4 @@ Public Class dlgGeneralForGraphics 'When the number of Layers in the lstLayers on ucrAdditionalLayers need to check if OK is enabled on dlgGeneralForGraphics. TestOKEnabled() End Sub - - 'Private Sub DisplayGraphInOutputWindow_When_ClickOK(sender As Object, e As EventArgs) Handles ucrBase.ClickOk - 'Dim clsSaveFunction As New RFunction - 'Dim clsDeleteFunction As New RFunction - 'Dim strImageLocation As String - 'clsSaveFunction.SetRCommand("ggsave") - 'If file R_Instat_Temp__Graphs is not there, create it... Where do we do this ? In setup method ? For the moment it's on frmMain Load - 'frmMain.clsRLink.rtbOutput.CreateTempDirectory() - 'Need to add ggsave as a Secondary RCommand on every grph dialogue. - 'Need to edit RMethods producing ggplots to always ggsave in that file as well... Need to find a smart way to name things. - 'strImageLocation = IO.Path.GetTempPath() & "R_Instat_Temp_Graphs/" & ucrSaveGraph.strGraphName & ".jpg" - 'clsSaveFunction.AddParameter("filename", Chr(34) & strImageLocation.Replace("\", "/") & Chr(34)) - 'frmMain.clsRLink.RunScript(clsSaveFunction.ToScript(), strComment:="Temporarily saving the image of the last ggplot grph in the temp directory R_Instat_Temp_Graphs.") - 'frmMain.clsRLink.rtbOutput.DisplayGraph(strImageLocation) - 'clsDeleteFunction.SetRCommand("unlink") - 'clsDeleteFunction.AddParameter(strParameterName:="FileName", strParameterValue:=Chr(34) & strImageLocation.Replace("\", "/") & Chr(34), bIncludeArgumentName:=False) - 'frmMain.clsRLink.RunScript(clsDeleteFunction.ToScript(), strComment:="Deleting graph file from the temp file.") - 'End Sub End Class \ No newline at end of file diff --git a/instat/sdgLayerOptions.vb b/instat/sdgLayerOptions.vb index 6e4cbead6d3..1e57e8a20eb 100644 --- a/instat/sdgLayerOptions.vb +++ b/instat/sdgLayerOptions.vb @@ -56,7 +56,10 @@ Public Class sdgLayerOptions End Sub - Public Sub SetupLayer(clsNewGgPlot As RFunction, clsNewGeomFunc As RFunction, clsNewGlobalAesFunc As RFunction, clsNewLocalAes As RFunction, Optional bFixGeom As Boolean = False, Optional strDataframe As String = "", Optional bApplyAesGlobally As Boolean = True, Optional iNumVariablesForGeoms As Integer = -1, Optional bReset As Boolean = False) + Public Sub SetupLayer(clsNewGgPlot As RFunction, clsNewGeomFunc As RFunction, clsNewGlobalAesFunc As RFunction, clsNewLocalAes As RFunction, Optional bFixGeom As Boolean = False, Optional strDataframe As String = "", Optional bApplyAesGlobally As Boolean = True, Optional iNumVariablesForGeoms As Integer = -1, Optional bReset As Boolean = False, Optional iTabToDisplay As Integer = 0) + If iTabToDisplay > 0 AndAlso iTabToDisplay <= tbcLayers.TabCount - 1 Then + tbcLayers.SelectedIndex = iTabToDisplay + End If clsGeomFunction = clsNewGeomFunc clsAesFunction = clsNewGlobalAesFunc clsGgplotFunction = clsNewGgPlot diff --git a/instat/ucrAdditionalLayers.vb b/instat/ucrAdditionalLayers.vb index eb25b4e0ed6..8f308eda247 100644 --- a/instat/ucrAdditionalLayers.vb +++ b/instat/ucrAdditionalLayers.vb @@ -15,10 +15,10 @@ ' along with this program. If not, see . Public Class ucrAdditionalLayers - Public clsRSyntax As RSyntax + Public clsBaseOperator As ROperator 'clsRSyntax is playing the role of "+" operator in the construction of the whole ggplot2 command. It will take as first parameter clsRggplotFunction and as other parameters the sdgLayerOptions.clsGeomFunction's of different layers. - Public clsRggplotFunction As New RFunction - Public clsGgplotAesFunction As New RFunction + Public clsRggplotFunction As RFunction + Public clsGgplotAesFunction As RFunction 'clsRggplotFunction is the global ggplot function that takes as mapping parameter clsGgplotAesFunction. clsRggplotFunction is linked through to sdgLayerOptions where it might be modified when sdgLayerOptions.chkApplyOnAllLyers is ticked for instance. Public bFirstLoad As Boolean = True Public lstLayerComplete As New List(Of Boolean) @@ -38,10 +38,8 @@ Public Class ucrAdditionalLayers End Sub - 'The following three subs enable to link the RSyntax, clsGgplotFunction and clsAesFunction from ucrAdditionalLayers - 'to the corresponding fields in dlgGeneralForGraphics or sdgPlots (both have an instance of ucrAdditionalLayers). - Public Sub SetRSyntax(clsRSyntaxIn As RSyntax) - clsRSyntax = clsRSyntaxIn + Public Sub SetBaseOperator(clsNewBaseOperator As ROperator) + clsBaseOperator = clsNewBaseOperator End Sub Public Sub SetGGplotFunction(clsRggplotFunc As RFunction) @@ -72,6 +70,7 @@ Public Class ucrAdditionalLayers Private Sub InitialiseControl() End Sub + Private Sub cmdAdd_Click(sender As Object, e As EventArgs) Handles cmdAdd.Click Dim clsNewLocalAesFunction As New RFunction Dim clsNewGeomFunction As New RFunction @@ -82,7 +81,7 @@ Public Class ucrAdditionalLayers clsNewGeomFunction.SetPackageName("ggplot2") clsNewGeomFunction.SetRCommand("geom_boxplot") - sdgLayerOptions.SetupLayer(clsNewGgPlot:=clsRggplotFunction, clsNewGeomFunc:=clsNewGeomFunction, clsNewGlobalAesFunc:=clsGgplotAesFunction, clsNewLocalAes:=clsNewLocalAesFunction, bFixGeom:=False, strDataframe:=strGlobalDataFrame, bApplyAesGlobally:=(bSetGlobalIsDefault AndAlso lstLayers.Items.Count = 0)) + sdgLayerOptions.SetupLayer(clsNewGgPlot:=clsRggplotFunction, clsNewGeomFunc:=clsNewGeomFunction, clsNewGlobalAesFunc:=clsGgplotAesFunction, clsNewLocalAes:=clsNewLocalAesFunction, bFixGeom:=False, strDataframe:=strGlobalDataFrame, bApplyAesGlobally:=(bSetGlobalIsDefault AndAlso lstLayers.Items.Count = 0), iTabToDisplay:=0) ParentForm.SendToBack() sdgLayerOptions.ShowDialog() strGlobalDataFrame = sdgLayerOptions.GetGlobalDataFrame() @@ -125,7 +124,7 @@ Public Class ucrAdditionalLayers lstLayers.Items(lstLayers.Items.IndexOf(lviLayer)).ForeColor = Color.Red End If - clsRSyntax.SetOperatorParameter(iPosition:=iLayerIndex, strParameterName:=strLayerName, clsRFunc:=sdgLayerOptions.clsGeomFunction.Clone()) + clsBaseOperator.AddParameter(strParameterName:=strLayerName, clsRFunctionParameter:=sdgLayerOptions.clsGeomFunction.Clone(), iPosition:=iLayerIndex) 'Note: as the GeomFunction on sdgLayerOptions will be edited for different layers, it cannot be linked like clsGgplotFunction would, it needs to be cloned. 'When the number of Layers in the lstLayers on ucrAdditionalLayers need to check if OK is enabled on dlgGeneralForGraphics. @@ -134,7 +133,7 @@ Public Class ucrAdditionalLayers Private Sub cmdDelete_Click(sender As Object, e As EventArgs) Handles cmdDelete.Click If lstLayers.SelectedItems.Count = 1 Then - clsRSyntax.RemoveOperatorParameter(lstLayers.SelectedItems(0).Text) + clsBaseOperator.RemoveParameterByName(lstLayers.SelectedItems(0).Text) lstLayerComplete.RemoveAt(lstLayers.SelectedIndices(0)) lstLayers.Items.Remove(lstLayers.SelectedItems(0)) @@ -148,7 +147,7 @@ Public Class ucrAdditionalLayers Dim clsLocalAes As RFunction 'The selected geom is found as the RFunction of the appropriate RParameter of RSyntax. The name of that Parameter is the name of the selected item in the lstLayers. That one is fetched using .SelectedItems(0) as there can only be one selected item at a time when the edit button is clicked. - clsSelectedGeomFunction = clsRSyntax.GetParameter(lstLayers.SelectedItems(0).Text).clsArgumentCodeStructure + clsSelectedGeomFunction = clsBaseOperator.GetParameter(lstLayers.SelectedItems(0).Text).clsArgumentCodeStructure If clsSelectedGeomFunction.ContainsParameter("mapping") Then clsLocalAes = clsSelectedGeomFunction.GetParameter("mapping").clsArgumentCodeStructure Else @@ -159,7 +158,7 @@ Public Class ucrAdditionalLayers End If 'Warning: sdgLayerOptions should not be setup using dlgGeneralForGraphics' fields !! These fields should be given through to the ucrAdditionalLayers (which should have all these) - sdgLayerOptions.SetupLayer(clsNewGgPlot:=clsRggplotFunction, clsNewGeomFunc:=clsSelectedGeomFunction, clsNewGlobalAesFunc:=clsGgplotAesFunction, clsNewLocalAes:=clsLocalAes, bFixGeom:=True, strDataframe:=strGlobalDataFrame, bApplyAesGlobally:=False, bReset:=False) + sdgLayerOptions.SetupLayer(clsNewGgPlot:=clsRggplotFunction, clsNewGeomFunc:=clsSelectedGeomFunction, clsNewGlobalAesFunc:=clsGgplotAesFunction, clsNewLocalAes:=clsLocalAes, bFixGeom:=True, strDataframe:=strGlobalDataFrame, bApplyAesGlobally:=False, bReset:=False, iTabToDisplay:=0) 'It has been chosen to fix the value of bApplyAesGlobally to False as when a Layer is editted, the choice to apply the Aes globally should be reconsidered no matter what it has been during last edit. ParentForm.SendToBack() 'Otherwise sdgLayerOptions appears behind sdgPLotOptions sdgLayerOptions.ShowDialog() diff --git a/instat/ucrColors.vb b/instat/ucrColors.vb index 52f40cf7b0a..2521b5ac8b5 100644 --- a/instat/ucrColors.vb +++ b/instat/ucrColors.vb @@ -16,12 +16,27 @@ Public Class ucrColors Private strPickColour As String = "Pick Colour..." - Private strColours As String() = {"NULL", strPickColour, Chr(34) & "black" & Chr(34), Chr(34) & "white" & Chr(34), Chr(34) & "blue" & Chr(34), Chr(34) & "red" & Chr(34), Chr(34) & "yellow" & Chr(34), Chr(34) & "purple" & Chr(34), Chr(34) & "green" & Chr(34), Chr(34) & "orange" & Chr(34), Chr(34) & "grey" & Chr(34), Chr(34) & "brown" & Chr(34), Chr(34) & "pink" & Chr(34)} + Private dctColours As New Dictionary(Of String, String) 'TODO move this to a global location so that all controls can access the same colour dialog and user defined colours are kept Private dlgColour As New ColorDialog Private Sub ucrColors_Load(sender As Object, e As EventArgs) Handles Me.Load - SetItems(strColours) + If dctColours.Count = 0 Then + dctColours.Add("NULL", "NULL") + dctColours.Add(strPickColour, strPickColour) + dctColours.Add("Black", Chr(34) & "black" & Chr(34)) + dctColours.Add("White", Chr(34) & "white" & Chr(34)) + dctColours.Add("Blue", Chr(34) & "blue" & Chr(34)) + dctColours.Add("Red", Chr(34) & "red" & Chr(34)) + dctColours.Add("Yellow", Chr(34) & "yellow" & Chr(34)) + dctColours.Add("Purple", Chr(34) & "purple" & Chr(34)) + dctColours.Add("Green", Chr(34) & "green" & Chr(34)) + dctColours.Add("Orange", Chr(34) & "orange" & Chr(34)) + dctColours.Add("Grey", Chr(34) & "grey" & Chr(34)) + dctColours.Add("Brown", Chr(34) & "brown" & Chr(34)) + dctColours.Add("Pink", Chr(34) & "pink" & Chr(34)) + End If + SetItems(dctColours) bAllowNonConditionValues = True End Sub @@ -35,7 +50,7 @@ Public Class ucrColors clrTemp = dlgColour.Color 'first two character from Hex are fixed as FF for VB use, not part of colour value 'ggplot requires # in front of Hex colour values - strColourItem = Chr(34) & "#" & Hex(clrTemp.ToArgb).Substring(2, 6) & Chr(34) + strColourItem = "#" & Hex(clrTemp.ToArgb).Substring(2, 6) 'First item is NULL and needs to be changed before setting text otherwise value will not show in combobox cboInput.Items.Item(0) = strColourItem SetName(strColourItem) diff --git a/instat/ucrLayerParamsControls.vb b/instat/ucrLayerParamsControls.vb index e59a73b7e90..a1799f564e8 100644 --- a/instat/ucrLayerParamsControls.vb +++ b/instat/ucrLayerParamsControls.vb @@ -20,7 +20,8 @@ Public Class ucrLayerParamsControls Private bControlsInitialised As Boolean = False Private Sub InitialiseControls() - ucrReceiverMetadataProperty.bAddRemoveParameter = False + ucrReceiverMetadataProperty.SetAddRemoveParameter(False) + ucrChkParamName.bChangeParameterValue = False ucrChkParamName.AddToLinkedControls(ucrLinked:=ucrReceiverMetadataProperty, objValues:={True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True) ', objNewDefaultState:=1) End Sub @@ -29,6 +30,7 @@ Public Class ucrLayerParamsControls InitialiseControls() End If ucrReceiverMetadataProperty.SetControls(clsNewRCode:=clsNewRCode, clsNewLayerParam:=clsNewLayerParam, bReset:=bReset) + ucrChkParamName.SetRCode(clsNewRCode, bReset) If clsNewLayerParam IsNot Nothing Then ucrChkParamName.SetText(clsNewLayerParam.strLayerParameterName) ucrChkParamName.AddParameterPresentCondition(True, clsNewLayerParam.strLayerParameterName) diff --git a/instat/ucrReceiverMetadataProperty.vb b/instat/ucrReceiverMetadataProperty.vb index 833258e2698..62a4d450d38 100644 --- a/instat/ucrReceiverMetadataProperty.vb +++ b/instat/ucrReceiverMetadataProperty.vb @@ -70,10 +70,10 @@ Public Class ucrReceiverMetadataProperty If ctrActive.Equals(ucrInputCboParamValue) Then If clsLayerParam.strLayerParameterDataType = "boolean" Then - ucrInputCboParamValue.SetItems({"TRUE", "FALSE"}) + ucrInputCboParamValue.SetItems({"TRUE", "FALSE"}, bAddConditions:=True) ElseIf clsLayerParam.strLayerParameterDataType = "list" Then If clsLayerParam.lstParameterStrings IsNot Nothing AndAlso clsLayerParam.lstParameterStrings.Count > 0 Then - ucrInputCboParamValue.SetItems(clsLayerParam.lstParameterStrings) + ucrInputCboParamValue.SetItems(clsLayerParam.lstParameterStrings, bAddConditions:=True) Else ucrInputCboParamValue.SetItems() End If @@ -109,4 +109,18 @@ Public Class ucrReceiverMetadataProperty ucrInputTextValue.SetAddRemoveParameter(bNew) ucrColor.SetAddRemoveParameter(bNew) End Sub + + Public Overrides Sub AddOrRemoveParameter(bAdd As Boolean) + If ctrActive IsNot Nothing Then + ctrActive.AddOrRemoveParameter(bAdd) + End If + End Sub + + Public Overrides Function CanAddParameter() As Boolean + If ctrActive IsNot Nothing Then + Return ctrActive.CanAddParameter() + Else + Return False + End If + End Function End Class \ No newline at end of file From 8bbf4118dd753a8cad6c621aa16dbd58e6b48a69 Mon Sep 17 00:00:00 2001 From: Steven Date: Thu, 8 Jun 2017 17:40:12 +0300 Subject: [PATCH 132/154] More additions on Legend tab --- instat/sdgThemes.Designer.vb | 196 +++++++++++++++++------------------ instat/sdgThemes.vb | 22 ++++ instat/ucrGridUnit.vb | 3 +- 3 files changed, 120 insertions(+), 101 deletions(-) diff --git a/instat/sdgThemes.Designer.vb b/instat/sdgThemes.Designer.vb index f6c039df667..6e47d0c7593 100644 --- a/instat/sdgThemes.Designer.vb +++ b/instat/sdgThemes.Designer.vb @@ -107,17 +107,17 @@ Partial Class sdgThemes Me.ucrPlotSubTitle = New instat.ucrELementTextControl() Me.ucrPlotTitle = New instat.ucrELementTextControl() Me.tbLegend = New System.Windows.Forms.TabControl() - Me.tbThemePanelMoreOptions = New System.Windows.Forms.TabPage() Me.tbThemeLegendMoreOptions = New System.Windows.Forms.TabPage() - Me.GroupBox2 = New System.Windows.Forms.GroupBox() - Me.UcrGridUnit2 = New instat.ucrGridUnit() - Me.UcrGridUnit3 = New instat.ucrGridUnit() - Me.GroupBox3 = New System.Windows.Forms.GroupBox() - Me.UcrGridUnit5 = New instat.ucrGridUnit() - Me.UcrGridUnit6 = New instat.ucrGridUnit() - Me.GroupBox4 = New System.Windows.Forms.GroupBox() - Me.UcrGridUnit1 = New instat.ucrGridUnit() - Me.UcrGridUnit4 = New instat.ucrGridUnit() + Me.tbThemePanelMoreOptions = New System.Windows.Forms.TabPage() + Me.grpPanelGridMajorMinor = New System.Windows.Forms.GroupBox() + Me.ucrPanelGridMajorYAxis = New instat.ucrELementTextControl() + Me.ucrPanelGridMajorXAxis = New instat.ucrELementTextControl() + Me.ucrPanelGridMinorYAxis = New instat.ucrELementTextControl() + Me.ucrPanelGridMinorXAxis = New instat.ucrELementTextControl() + Me.grpLegendSpacing = New System.Windows.Forms.GroupBox() + Me.ucrLegendSpacingYAxis = New instat.ucrGridUnit() + Me.ucrLegendSpacingXAxis = New instat.ucrGridUnit() + Me.ucrLegendSpacing = New instat.ucrGridUnit() Me.tbThemeFacets.SuspendLayout() Me.GroupBox1.SuspendLayout() Me.grpFacetBackground.SuspendLayout() @@ -148,11 +148,10 @@ Partial Class sdgThemes Me.grpPlotBackground.SuspendLayout() Me.grpPlotTitleAndCaption.SuspendLayout() Me.tbLegend.SuspendLayout() - Me.tbThemePanelMoreOptions.SuspendLayout() Me.tbThemeLegendMoreOptions.SuspendLayout() - Me.GroupBox2.SuspendLayout() - Me.GroupBox3.SuspendLayout() - Me.GroupBox4.SuspendLayout() + Me.tbThemePanelMoreOptions.SuspendLayout() + Me.grpPanelGridMajorMinor.SuspendLayout() + Me.grpLegendSpacing.SuspendLayout() Me.SuspendLayout() ' 'ucrBaseSubdialogue @@ -169,7 +168,7 @@ Partial Class sdgThemes Me.tbThemeFacets.Controls.Add(Me.grpFacetLabels) Me.tbThemeFacets.Location = New System.Drawing.Point(4, 22) Me.tbThemeFacets.Name = "tbThemeFacets" - Me.tbThemeFacets.Size = New System.Drawing.Size(816, 564) + Me.tbThemeFacets.Size = New System.Drawing.Size(816, 583) Me.tbThemeFacets.TabIndex = 4 Me.tbThemeFacets.Text = "Facets" Me.tbThemeFacets.UseVisualStyleBackColor = True @@ -256,7 +255,7 @@ Partial Class sdgThemes Me.tbThemePanelAndBackground.Controls.Add(Me.grpPAnelGrid) Me.tbThemePanelAndBackground.Location = New System.Drawing.Point(4, 22) Me.tbThemePanelAndBackground.Name = "tbThemePanelAndBackground" - Me.tbThemePanelAndBackground.Size = New System.Drawing.Size(816, 564) + Me.tbThemePanelAndBackground.Size = New System.Drawing.Size(816, 583) Me.tbThemePanelAndBackground.TabIndex = 3 Me.tbThemePanelAndBackground.Text = "Panel and Background " Me.tbThemePanelAndBackground.UseVisualStyleBackColor = True @@ -575,7 +574,7 @@ Partial Class sdgThemes Me.tbThemeYaxis.Location = New System.Drawing.Point(4, 22) Me.tbThemeYaxis.Name = "tbThemeYaxis" Me.tbThemeYaxis.Padding = New System.Windows.Forms.Padding(3) - Me.tbThemeYaxis.Size = New System.Drawing.Size(816, 564) + Me.tbThemeYaxis.Size = New System.Drawing.Size(816, 583) Me.tbThemeYaxis.TabIndex = 1 Me.tbThemeYaxis.Text = "Y-axis" Me.tbThemeYaxis.UseVisualStyleBackColor = True @@ -670,7 +669,7 @@ Partial Class sdgThemes Me.tbThemeXAxis.Location = New System.Drawing.Point(4, 22) Me.tbThemeXAxis.Name = "tbThemeXAxis" Me.tbThemeXAxis.Padding = New System.Windows.Forms.Padding(3) - Me.tbThemeXAxis.Size = New System.Drawing.Size(816, 564) + Me.tbThemeXAxis.Size = New System.Drawing.Size(816, 583) Me.tbThemeXAxis.TabIndex = 0 Me.tbThemeXAxis.Text = "X-axis" Me.tbThemeXAxis.UseVisualStyleBackColor = True @@ -918,10 +917,19 @@ Partial Class sdgThemes Me.tbLegend.Size = New System.Drawing.Size(824, 590) Me.tbLegend.TabIndex = 1 ' + 'tbThemeLegendMoreOptions + ' + Me.tbThemeLegendMoreOptions.Controls.Add(Me.grpLegendSpacing) + Me.tbThemeLegendMoreOptions.Location = New System.Drawing.Point(4, 22) + Me.tbThemeLegendMoreOptions.Name = "tbThemeLegendMoreOptions" + Me.tbThemeLegendMoreOptions.Size = New System.Drawing.Size(816, 564) + Me.tbThemeLegendMoreOptions.TabIndex = 10 + Me.tbThemeLegendMoreOptions.Text = "Legend(More Options)" + Me.tbThemeLegendMoreOptions.UseVisualStyleBackColor = True + ' 'tbThemePanelMoreOptions ' - Me.tbThemePanelMoreOptions.Controls.Add(Me.GroupBox3) - Me.tbThemePanelMoreOptions.Controls.Add(Me.GroupBox2) + Me.tbThemePanelMoreOptions.Controls.Add(Me.grpPanelGridMajorMinor) Me.tbThemePanelMoreOptions.Location = New System.Drawing.Point(4, 22) Me.tbThemePanelMoreOptions.Name = "tbThemePanelMoreOptions" Me.tbThemePanelMoreOptions.Padding = New System.Windows.Forms.Padding(3) @@ -930,90 +938,79 @@ Partial Class sdgThemes Me.tbThemePanelMoreOptions.Text = "Panel(More Options)" Me.tbThemePanelMoreOptions.UseVisualStyleBackColor = True ' - 'tbThemeLegendMoreOptions - ' - Me.tbThemeLegendMoreOptions.Controls.Add(Me.GroupBox4) - Me.tbThemeLegendMoreOptions.Location = New System.Drawing.Point(4, 22) - Me.tbThemeLegendMoreOptions.Name = "tbThemeLegendMoreOptions" - Me.tbThemeLegendMoreOptions.Size = New System.Drawing.Size(816, 564) - Me.tbThemeLegendMoreOptions.TabIndex = 10 - Me.tbThemeLegendMoreOptions.Text = "Legend(More Options)" - Me.tbThemeLegendMoreOptions.UseVisualStyleBackColor = True - ' - 'GroupBox2 + 'grpPanelGridMajorMinor ' - Me.GroupBox2.Controls.Add(Me.UcrGridUnit2) - Me.GroupBox2.Controls.Add(Me.UcrGridUnit3) - Me.GroupBox2.Location = New System.Drawing.Point(6, 6) - Me.GroupBox2.Name = "GroupBox2" - Me.GroupBox2.Size = New System.Drawing.Size(537, 150) - Me.GroupBox2.TabIndex = 70 - Me.GroupBox2.TabStop = False - Me.GroupBox2.Text = "Panel Spacing" + Me.grpPanelGridMajorMinor.Controls.Add(Me.ucrPanelGridMinorYAxis) + Me.grpPanelGridMajorMinor.Controls.Add(Me.ucrPanelGridMinorXAxis) + Me.grpPanelGridMajorMinor.Controls.Add(Me.ucrPanelGridMajorYAxis) + Me.grpPanelGridMajorMinor.Controls.Add(Me.ucrPanelGridMajorXAxis) + Me.grpPanelGridMajorMinor.Location = New System.Drawing.Point(6, 6) + Me.grpPanelGridMajorMinor.Name = "grpPanelGridMajorMinor" + Me.grpPanelGridMajorMinor.Size = New System.Drawing.Size(523, 471) + Me.grpPanelGridMajorMinor.TabIndex = 71 + Me.grpPanelGridMajorMinor.TabStop = False + Me.grpPanelGridMajorMinor.Text = "Panel Grid" ' - 'UcrGridUnit2 + 'ucrPanelGridMajorYAxis ' - Me.UcrGridUnit2.Location = New System.Drawing.Point(271, 25) - Me.UcrGridUnit2.Name = "UcrGridUnit2" - Me.UcrGridUnit2.Size = New System.Drawing.Size(255, 119) - Me.UcrGridUnit2.TabIndex = 106 + Me.ucrPanelGridMajorYAxis.Location = New System.Drawing.Point(263, 12) + Me.ucrPanelGridMajorYAxis.Name = "ucrPanelGridMajorYAxis" + Me.ucrPanelGridMajorYAxis.Size = New System.Drawing.Size(258, 224) + Me.ucrPanelGridMajorYAxis.TabIndex = 59 ' - 'UcrGridUnit3 + 'ucrPanelGridMajorXAxis ' - Me.UcrGridUnit3.Location = New System.Drawing.Point(7, 19) - Me.UcrGridUnit3.Name = "UcrGridUnit3" - Me.UcrGridUnit3.Size = New System.Drawing.Size(258, 119) - Me.UcrGridUnit3.TabIndex = 105 + Me.ucrPanelGridMajorXAxis.Location = New System.Drawing.Point(4, 12) + Me.ucrPanelGridMajorXAxis.Name = "ucrPanelGridMajorXAxis" + Me.ucrPanelGridMajorXAxis.Size = New System.Drawing.Size(259, 224) + Me.ucrPanelGridMajorXAxis.TabIndex = 58 ' - 'GroupBox3 + 'ucrPanelGridMinorYAxis ' - Me.GroupBox3.Controls.Add(Me.UcrGridUnit5) - Me.GroupBox3.Controls.Add(Me.UcrGridUnit6) - Me.GroupBox3.Location = New System.Drawing.Point(6, 162) - Me.GroupBox3.Name = "GroupBox3" - Me.GroupBox3.Size = New System.Drawing.Size(537, 150) - Me.GroupBox3.TabIndex = 108 - Me.GroupBox3.TabStop = False - Me.GroupBox3.Text = "Panel Spacing" + Me.ucrPanelGridMinorYAxis.Location = New System.Drawing.Point(263, 242) + Me.ucrPanelGridMinorYAxis.Name = "ucrPanelGridMinorYAxis" + Me.ucrPanelGridMinorYAxis.Size = New System.Drawing.Size(258, 224) + Me.ucrPanelGridMinorYAxis.TabIndex = 61 ' - 'UcrGridUnit5 + 'ucrPanelGridMinorXAxis ' - Me.UcrGridUnit5.Location = New System.Drawing.Point(271, 25) - Me.UcrGridUnit5.Name = "UcrGridUnit5" - Me.UcrGridUnit5.Size = New System.Drawing.Size(255, 119) - Me.UcrGridUnit5.TabIndex = 106 + Me.ucrPanelGridMinorXAxis.Location = New System.Drawing.Point(4, 242) + Me.ucrPanelGridMinorXAxis.Name = "ucrPanelGridMinorXAxis" + Me.ucrPanelGridMinorXAxis.Size = New System.Drawing.Size(259, 224) + Me.ucrPanelGridMinorXAxis.TabIndex = 60 ' - 'UcrGridUnit6 + 'grpLegendSpacing ' - Me.UcrGridUnit6.Location = New System.Drawing.Point(7, 19) - Me.UcrGridUnit6.Name = "UcrGridUnit6" - Me.UcrGridUnit6.Size = New System.Drawing.Size(258, 119) - Me.UcrGridUnit6.TabIndex = 105 + Me.grpLegendSpacing.Controls.Add(Me.ucrLegendSpacingYAxis) + Me.grpLegendSpacing.Controls.Add(Me.ucrLegendSpacingXAxis) + Me.grpLegendSpacing.Controls.Add(Me.ucrLegendSpacing) + Me.grpLegendSpacing.Location = New System.Drawing.Point(4, 16) + Me.grpLegendSpacing.Name = "grpLegendSpacing" + Me.grpLegendSpacing.Size = New System.Drawing.Size(788, 150) + Me.grpLegendSpacing.TabIndex = 5 + Me.grpLegendSpacing.TabStop = False + Me.grpLegendSpacing.Text = "Legend Spacing" ' - 'GroupBox4 + 'ucrLegendSpacingYAxis ' - Me.GroupBox4.Controls.Add(Me.UcrGridUnit1) - Me.GroupBox4.Controls.Add(Me.UcrGridUnit4) - Me.GroupBox4.Location = New System.Drawing.Point(4, 4) - Me.GroupBox4.Name = "GroupBox4" - Me.GroupBox4.Size = New System.Drawing.Size(537, 150) - Me.GroupBox4.TabIndex = 71 - Me.GroupBox4.TabStop = False - Me.GroupBox4.Text = "Panel Spacing" + Me.ucrLegendSpacingYAxis.Location = New System.Drawing.Point(523, 25) + Me.ucrLegendSpacingYAxis.Name = "ucrLegendSpacingYAxis" + Me.ucrLegendSpacingYAxis.Size = New System.Drawing.Size(256, 119) + Me.ucrLegendSpacingYAxis.TabIndex = 107 ' - 'UcrGridUnit1 + 'ucrLegendSpacingXAxis ' - Me.UcrGridUnit1.Location = New System.Drawing.Point(271, 25) - Me.UcrGridUnit1.Name = "UcrGridUnit1" - Me.UcrGridUnit1.Size = New System.Drawing.Size(255, 119) - Me.UcrGridUnit1.TabIndex = 106 + Me.ucrLegendSpacingXAxis.Location = New System.Drawing.Point(271, 25) + Me.ucrLegendSpacingXAxis.Name = "ucrLegendSpacingXAxis" + Me.ucrLegendSpacingXAxis.Size = New System.Drawing.Size(255, 119) + Me.ucrLegendSpacingXAxis.TabIndex = 106 ' - 'UcrGridUnit4 + 'ucrLegendSpacing ' - Me.UcrGridUnit4.Location = New System.Drawing.Point(7, 19) - Me.UcrGridUnit4.Name = "UcrGridUnit4" - Me.UcrGridUnit4.Size = New System.Drawing.Size(258, 119) - Me.UcrGridUnit4.TabIndex = 105 + Me.ucrLegendSpacing.Location = New System.Drawing.Point(7, 19) + Me.ucrLegendSpacing.Name = "ucrLegendSpacing" + Me.ucrLegendSpacing.Size = New System.Drawing.Size(258, 119) + Me.ucrLegendSpacing.TabIndex = 105 ' 'sdgThemes ' @@ -1058,11 +1055,10 @@ Partial Class sdgThemes Me.grpPlotBackground.ResumeLayout(False) Me.grpPlotTitleAndCaption.ResumeLayout(False) Me.tbLegend.ResumeLayout(False) - Me.tbThemePanelMoreOptions.ResumeLayout(False) Me.tbThemeLegendMoreOptions.ResumeLayout(False) - Me.GroupBox2.ResumeLayout(False) - Me.GroupBox3.ResumeLayout(False) - Me.GroupBox4.ResumeLayout(False) + Me.tbThemePanelMoreOptions.ResumeLayout(False) + Me.grpPanelGridMajorMinor.ResumeLayout(False) + Me.grpLegendSpacing.ResumeLayout(False) Me.ResumeLayout(False) End Sub @@ -1154,13 +1150,13 @@ Partial Class sdgThemes Friend WithEvents ucrStripsSpaceGrid As ucrGridUnit Friend WithEvents tbThemeLegendMoreOptions As TabPage Friend WithEvents tbThemePanelMoreOptions As TabPage - Friend WithEvents GroupBox3 As GroupBox - Friend WithEvents UcrGridUnit5 As ucrGridUnit - Friend WithEvents UcrGridUnit6 As ucrGridUnit - Friend WithEvents GroupBox2 As GroupBox - Friend WithEvents UcrGridUnit2 As ucrGridUnit - Friend WithEvents UcrGridUnit3 As ucrGridUnit - Friend WithEvents GroupBox4 As GroupBox - Friend WithEvents UcrGridUnit1 As ucrGridUnit - Friend WithEvents UcrGridUnit4 As ucrGridUnit + Friend WithEvents grpPanelGridMajorMinor As GroupBox + Friend WithEvents ucrPanelGridMajorYAxis As ucrELementTextControl + Friend WithEvents ucrPanelGridMajorXAxis As ucrELementTextControl + Friend WithEvents ucrPanelGridMinorYAxis As ucrELementTextControl + Friend WithEvents ucrPanelGridMinorXAxis As ucrELementTextControl + Friend WithEvents grpLegendSpacing As GroupBox + Friend WithEvents ucrLegendSpacingYAxis As ucrGridUnit + Friend WithEvents ucrLegendSpacingXAxis As ucrGridUnit + Friend WithEvents ucrLegendSpacing As ucrGridUnit End Class diff --git a/instat/sdgThemes.vb b/instat/sdgThemes.vb index 81cb3d205cd..e39b8d6c685 100644 --- a/instat/sdgThemes.vb +++ b/instat/sdgThemes.vb @@ -58,6 +58,11 @@ Public Class sdgThemes ucrLegendKey.setlabel("Background underneath legend keys") ucrLegendBoxBackground.setlabel("Background of legend area") + ucrPanelGridMajorXAxis.setlabel("vertical major grid lines ") + ucrPanelGridMajorYAxis.setlabel("horizontal major grid lines ") + ucrPanelGridMinorXAxis.setlabel("vertical minor grid lines") + ucrPanelGridMinorXAxis.setlabel("horizontal minor grid lines") + ucrPanelGrid.setlabel("Grid lines") ucrPanelGridMajor.setlabel("Major grid lines ") ucrPanelGridMinor.setlabel("Major grid lines ") @@ -88,6 +93,10 @@ Public Class sdgThemes ucrStripsSpaceGrid.setlabel("When strips are switched(Grid)") ucrStripsSpaceWrap.setlabel("when strips are switched(wrap)") + ucrLegendSpacing.setlabel("") + ucrLegendSpacingXAxis.setlabel("") + ucrLegendSpacingYAxis.setlabel("") + ' TODO: Find what this means: "two-element numeric vector" urChkLegendPosition.SetText("Legend Position") ucrInputLegendPosition.SetParameter(New RParameter("legend.position")) @@ -186,6 +195,10 @@ Public Class sdgThemes Dim clsElementPanelGrid As New RFunction Dim clsElementPanelGridMajor As New RFunction Dim clsElementPanelGridMinor As New RFunction + Dim clsElementPanelGridMajorXAxis As New RFunction + Dim clsElementPanelGridMajorYAxis As New RFunction + Dim clsElementPanelGridMinorXAxis As New RFunction + Dim clsElementPanelGridMinorYAxis As New RFunction Dim clsUnitAxisTickLength As New RFunction Dim clsUnitLegendSize As New RFunction @@ -238,6 +251,10 @@ Public Class sdgThemes dctThemeFunctions.TryGetValue("panel.grid", clsElementPanelGrid) dctThemeFunctions.TryGetValue("panel.grid.major", clsElementPanelGridMajor) dctThemeFunctions.TryGetValue("panel.grid.minor", clsElementPanelGridMinor) + dctThemeFunctions.TryGetValue("panel.grid.major.x", clsElementPanelGridMajorXAxis) + dctThemeFunctions.TryGetValue("panel.grid.major.y", clsElementPanelGridMajorYAxis) + dctThemeFunctions.TryGetValue("panel.grid.minor.x", clsElementPanelGridMinorXAxis) + dctThemeFunctions.TryGetValue("panel.grid.minor.y", clsElementPanelGridMinorYAxis) dctThemeFunctions.TryGetValue("axis.ticks.length", clsUnitAxisTickLength) dctThemeFunctions.TryGetValue("legend.key.size", clsUnitLegendSize) @@ -287,6 +304,11 @@ Public Class sdgThemes ucrLegendBoxBackground.SetRCodeForControl("legend.box.background", clsElementLegendBoxBackground, clsNewThemeFunction:=clsThemeFunction, clsNewBaseOperator:=clsBaseOperator, bReset:=bReset) ucrLegendKey.SetRCodeForControl("legend.key", clsElementLegendtKey, clsNewThemeFunction:=clsThemeFunction, clsNewBaseOperator:=clsBaseOperator, bReset:=bReset) + ucrPanelGridMajorXAxis.SetRCodeForControl("panel.grid.major.x", clsElementPanelGridMajorXAxis, clsNewThemeFunction:=clsThemeFunction, clsNewBaseOperator:=clsBaseOperator, bReset:=bReset) + ucrPanelGridMajorYAxis.SetRCodeForControl("panel.grid.major.y", clsElementPanelGridMajorYAxis, clsNewThemeFunction:=clsThemeFunction, clsNewBaseOperator:=clsBaseOperator, bReset:=bReset) + ucrPanelGridMinorXAxis.SetRCodeForControl("panel.grid.minor.x", clsElementPanelGridMinorXAxis, clsNewThemeFunction:=clsThemeFunction, clsNewBaseOperator:=clsBaseOperator, bReset:=bReset) + ucrPanelGridMinorYAxis.SetRCodeForControl("panel.grid.minor.y", clsElementPanelGridMinorYAxis, clsNewThemeFunction:=clsThemeFunction, clsNewBaseOperator:=clsBaseOperator, bReset:=bReset) + ucrPanelGrid.SetRCodeForControl("panel.grid", clsElementPanelGrid, clsNewThemeFunction:=clsThemeFunction, clsNewBaseOperator:=clsBaseOperator, bReset:=bReset) ucrPanelGridMajor.SetRCodeForControl("panel.grid.major", clsElementPanelGridMajor, clsNewThemeFunction:=clsThemeFunction, clsNewBaseOperator:=clsBaseOperator, bReset:=bReset) ucrPanelGridMinor.SetRCodeForControl("panel.grid.minor", clsElementPanelGridMinor, clsNewThemeFunction:=clsThemeFunction, clsNewBaseOperator:=clsBaseOperator, bReset:=bReset) diff --git a/instat/ucrGridUnit.vb b/instat/ucrGridUnit.vb index b09d85e9bb3..0eb386a209c 100644 --- a/instat/ucrGridUnit.vb +++ b/instat/ucrGridUnit.vb @@ -26,7 +26,8 @@ Public Class ucrGridUnit ucrChkUnits.SetText("Tick length") ucrInputUnits.SetParameter(New RParameter("units")) ucrInputUnits.SetItems(New Dictionary(Of String, String)(GgplotDefaults.dctUnits)) - ucrInputUnits.SetRDefault(Chr(34) & "npc" & Chr(34)) + '? default npc + ' ucrInputUnits.SetRDefault(Chr(34) & "npc" & Chr(34)) ucrInputData.SetParameter(New RParameter("data")) ucrInputData.SetRDefault("NULL") From e29fd0a263bf7026fcc460d5db25e43d0a3fe63f Mon Sep 17 00:00:00 2001 From: Steven Date: Thu, 8 Jun 2017 17:51:19 +0300 Subject: [PATCH 133/154] More changes --- instat/clsGgplotDefaults.vb | 6 +++--- instat/sdgThemes.Designer.vb | 24 ++++++++++++++++++++++++ instat/sdgThemes.vb | 19 ++++++++++++++----- 3 files changed, 41 insertions(+), 8 deletions(-) diff --git a/instat/clsGgplotDefaults.vb b/instat/clsGgplotDefaults.vb index 424c1a6c414..2e0252d70a9 100644 --- a/instat/clsGgplotDefaults.vb +++ b/instat/clsGgplotDefaults.vb @@ -129,9 +129,9 @@ dctTemp.Add("axis.line.y", clsElementLine.Clone()) dctTemp.Add("legend.background", clsElementRect.Clone()) ' dctTemp.Add("legend.margin", clsElementLine.Clone()) - ' dctTemp.Add("legend.spacing", clsElementLine.Clone()) - ' dctTemp.Add("legend.spacing.x", clsElementText.Clone()) - 'dctTemp.Add("legend.spacing.y", clsElementText.Clone()) + dctTemp.Add("legend.spacing", clsUnit.Clone()) + dctTemp.Add("legend.spacing.x", clsUnit.Clone()) + dctTemp.Add("legend.spacing.y", clsUnit.Clone()) dctTemp.Add("legend.key", clsElementRect.Clone()) dctTemp.Add("legend.key.size", clsUnit.Clone()) dctTemp.Add("legend.key.height", clsUnit.Clone()) diff --git a/instat/sdgThemes.Designer.vb b/instat/sdgThemes.Designer.vb index 6e47d0c7593..0c16390509f 100644 --- a/instat/sdgThemes.Designer.vb +++ b/instat/sdgThemes.Designer.vb @@ -118,6 +118,8 @@ Partial Class sdgThemes Me.ucrLegendSpacingYAxis = New instat.ucrGridUnit() Me.ucrLegendSpacingXAxis = New instat.ucrGridUnit() Me.ucrLegendSpacing = New instat.ucrGridUnit() + Me.GroupBox2 = New System.Windows.Forms.GroupBox() + Me.UcrGridUnit1 = New instat.ucrGridUnit() Me.tbThemeFacets.SuspendLayout() Me.GroupBox1.SuspendLayout() Me.grpFacetBackground.SuspendLayout() @@ -152,6 +154,7 @@ Partial Class sdgThemes Me.tbThemePanelMoreOptions.SuspendLayout() Me.grpPanelGridMajorMinor.SuspendLayout() Me.grpLegendSpacing.SuspendLayout() + Me.GroupBox2.SuspendLayout() Me.SuspendLayout() ' 'ucrBaseSubdialogue @@ -919,6 +922,7 @@ Partial Class sdgThemes ' 'tbThemeLegendMoreOptions ' + Me.tbThemeLegendMoreOptions.Controls.Add(Me.GroupBox2) Me.tbThemeLegendMoreOptions.Controls.Add(Me.grpLegendSpacing) Me.tbThemeLegendMoreOptions.Location = New System.Drawing.Point(4, 22) Me.tbThemeLegendMoreOptions.Name = "tbThemeLegendMoreOptions" @@ -1012,6 +1016,23 @@ Partial Class sdgThemes Me.ucrLegendSpacing.Size = New System.Drawing.Size(258, 119) Me.ucrLegendSpacing.TabIndex = 105 ' + 'GroupBox2 + ' + Me.GroupBox2.Controls.Add(Me.UcrGridUnit1) + Me.GroupBox2.Location = New System.Drawing.Point(6, 172) + Me.GroupBox2.Name = "GroupBox2" + Me.GroupBox2.Size = New System.Drawing.Size(263, 137) + Me.GroupBox2.TabIndex = 107 + Me.GroupBox2.TabStop = False + Me.GroupBox2.Text = "GroupBox2" + ' + 'UcrGridUnit1 + ' + Me.UcrGridUnit1.Location = New System.Drawing.Point(1, 15) + Me.UcrGridUnit1.Name = "UcrGridUnit1" + Me.UcrGridUnit1.Size = New System.Drawing.Size(256, 114) + Me.UcrGridUnit1.TabIndex = 104 + ' 'sdgThemes ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -1059,6 +1080,7 @@ Partial Class sdgThemes Me.tbThemePanelMoreOptions.ResumeLayout(False) Me.grpPanelGridMajorMinor.ResumeLayout(False) Me.grpLegendSpacing.ResumeLayout(False) + Me.GroupBox2.ResumeLayout(False) Me.ResumeLayout(False) End Sub @@ -1159,4 +1181,6 @@ Partial Class sdgThemes Friend WithEvents ucrLegendSpacingYAxis As ucrGridUnit Friend WithEvents ucrLegendSpacingXAxis As ucrGridUnit Friend WithEvents ucrLegendSpacing As ucrGridUnit + Friend WithEvents GroupBox2 As GroupBox + Friend WithEvents UcrGridUnit1 As ucrGridUnit End Class diff --git a/instat/sdgThemes.vb b/instat/sdgThemes.vb index e39b8d6c685..b2f7e0d3492 100644 --- a/instat/sdgThemes.vb +++ b/instat/sdgThemes.vb @@ -58,6 +58,10 @@ Public Class sdgThemes ucrLegendKey.setlabel("Background underneath legend keys") ucrLegendBoxBackground.setlabel("Background of legend area") + ucrLegendSpacing.setlabel("Spacing between legends") + ucrLegendSpacingXAxis.setlabel("Horizontal spacing between legends") + ucrLegendSpacingYAxis.setlabel("Horizontal spacing between legends") + ucrPanelGridMajorXAxis.setlabel("vertical major grid lines ") ucrPanelGridMajorYAxis.setlabel("horizontal major grid lines ") ucrPanelGridMinorXAxis.setlabel("vertical minor grid lines") @@ -93,10 +97,6 @@ Public Class sdgThemes ucrStripsSpaceGrid.setlabel("When strips are switched(Grid)") ucrStripsSpaceWrap.setlabel("when strips are switched(wrap)") - ucrLegendSpacing.setlabel("") - ucrLegendSpacingXAxis.setlabel("") - ucrLegendSpacingYAxis.setlabel("") - ' TODO: Find what this means: "two-element numeric vector" urChkLegendPosition.SetText("Legend Position") ucrInputLegendPosition.SetParameter(New RParameter("legend.position")) @@ -210,6 +210,9 @@ Public Class sdgThemes Dim clsUnitPlotMargin As New RFunction Dim clsUnitStripsGrid As New RFunction Dim clsUnitStripsWrap As New RFunction + Dim clsUnitLegendSpacing As New RFunction + Dim clsUnitLegendSpacingXAxis As New RFunction + Dim clsUnitLegendSpacingYAxis As New RFunction If Not bControlsInitialised Then InitialiseControls() @@ -273,7 +276,9 @@ Public Class sdgThemes dctThemeFunctions.TryGetValue("panel.background", clsElementPanelBackGround) dctThemeFunctions.TryGetValue("panel.border", clsElementBorder) - + dctThemeFunctions.TryGetValue("legend.spacing", clsUnitLegendSpacing) + dctThemeFunctions.TryGetValue("legend.spacing.x", clsUnitLegendSpacingXAxis) + dctThemeFunctions.TryGetValue("legend.spacing.y", clsUnitLegendSpacingYAxis) dctThemeFunctions.TryGetValue("plot.background", clsElementPlotBackground) @@ -304,6 +309,10 @@ Public Class sdgThemes ucrLegendBoxBackground.SetRCodeForControl("legend.box.background", clsElementLegendBoxBackground, clsNewThemeFunction:=clsThemeFunction, clsNewBaseOperator:=clsBaseOperator, bReset:=bReset) ucrLegendKey.SetRCodeForControl("legend.key", clsElementLegendtKey, clsNewThemeFunction:=clsThemeFunction, clsNewBaseOperator:=clsBaseOperator, bReset:=bReset) + ucrLegendSpacing.SetRCodeForControl("legend.spacing", clsUnitLegendSpacing, clsNewThemeFunction:=clsThemeFunction, clsNewBaseOperator:=clsBaseOperator, bReset:=bReset) + ucrLegendSpacingXAxis.SetRCodeForControl("legend.spacing.x", clsUnitLegendSpacingXAxis, clsNewThemeFunction:=clsThemeFunction, clsNewBaseOperator:=clsBaseOperator, bReset:=bReset) + ucrLegendSpacingXAxis.SetRCodeForControl("legend.spacing.y", clsUnitLegendSpacingYAxis, clsNewThemeFunction:=clsThemeFunction, clsNewBaseOperator:=clsBaseOperator, bReset:=bReset) + ucrPanelGridMajorXAxis.SetRCodeForControl("panel.grid.major.x", clsElementPanelGridMajorXAxis, clsNewThemeFunction:=clsThemeFunction, clsNewBaseOperator:=clsBaseOperator, bReset:=bReset) ucrPanelGridMajorYAxis.SetRCodeForControl("panel.grid.major.y", clsElementPanelGridMajorYAxis, clsNewThemeFunction:=clsThemeFunction, clsNewBaseOperator:=clsBaseOperator, bReset:=bReset) ucrPanelGridMinorXAxis.SetRCodeForControl("panel.grid.minor.x", clsElementPanelGridMinorXAxis, clsNewThemeFunction:=clsThemeFunction, clsNewBaseOperator:=clsBaseOperator, bReset:=bReset) From 55dc85e425b38e771785db4e762bff6f86d65156 Mon Sep 17 00:00:00 2001 From: Lily Date: Thu, 8 Jun 2017 15:55:44 +0100 Subject: [PATCH 134/154] Package names and code tidy --- instat/dlgClimdex.Designer.vb | 60 ++++++++------- instat/dlgClimdex.vb | 135 ++++++++++++++++++---------------- 2 files changed, 107 insertions(+), 88 deletions(-) diff --git a/instat/dlgClimdex.Designer.vb b/instat/dlgClimdex.Designer.vb index cb849046b52..12c7b6019f9 100644 --- a/instat/dlgClimdex.Designer.vb +++ b/instat/dlgClimdex.Designer.vb @@ -39,38 +39,38 @@ Partial Class dlgClimdex 'lblTmax ' Me.lblTmax.AutoSize = True - Me.lblTmax.Location = New System.Drawing.Point(286, 63) + Me.lblTmax.Location = New System.Drawing.Point(256, 85) Me.lblTmax.Name = "lblTmax" - Me.lblTmax.Size = New System.Drawing.Size(33, 13) + Me.lblTmax.Size = New System.Drawing.Size(117, 13) Me.lblTmax.TabIndex = 3 - Me.lblTmax.Tag = "Tmax" - Me.lblTmax.Text = "Tmax" + Me.lblTmax.Tag = "Maximum Temperature:" + Me.lblTmax.Text = "Maximum Temperature:" ' 'lblTmin ' Me.lblTmin.AutoSize = True - Me.lblTmin.Location = New System.Drawing.Point(286, 100) + Me.lblTmin.Location = New System.Drawing.Point(256, 126) Me.lblTmin.Name = "lblTmin" - Me.lblTmin.Size = New System.Drawing.Size(30, 13) + Me.lblTmin.Size = New System.Drawing.Size(114, 13) Me.lblTmin.TabIndex = 5 - Me.lblTmin.Tag = "Tmin" - Me.lblTmin.Text = "Tmin" + Me.lblTmin.Tag = "Minimum Temperature:" + Me.lblTmin.Text = "Minimum Temperature:" ' 'lblPrec ' Me.lblPrec.AutoSize = True - Me.lblPrec.Location = New System.Drawing.Point(286, 139) + Me.lblPrec.Location = New System.Drawing.Point(256, 167) Me.lblPrec.Name = "lblPrec" - Me.lblPrec.Size = New System.Drawing.Size(29, 13) + Me.lblPrec.Size = New System.Drawing.Size(45, 13) Me.lblPrec.TabIndex = 7 - Me.lblPrec.Tag = "Prec" - Me.lblPrec.Text = "Prec" + Me.lblPrec.Tag = "Rainfall:" + Me.lblPrec.Text = "Rainfall:" ' 'cmdIndices ' - Me.cmdIndices.Location = New System.Drawing.Point(286, 193) + Me.cmdIndices.Location = New System.Drawing.Point(335, 213) Me.cmdIndices.Name = "cmdIndices" - Me.cmdIndices.Size = New System.Drawing.Size(62, 23) + Me.cmdIndices.Size = New System.Drawing.Size(74, 23) Me.cmdIndices.TabIndex = 10 Me.cmdIndices.Tag = "Indices..." Me.cmdIndices.Text = "Indices..." @@ -79,58 +79,66 @@ Partial Class dlgClimdex 'lblDate ' Me.lblDate.AutoSize = True - Me.lblDate.Location = New System.Drawing.Point(286, 20) + Me.lblDate.Location = New System.Drawing.Point(256, 44) Me.lblDate.Name = "lblDate" - Me.lblDate.Size = New System.Drawing.Size(30, 13) + Me.lblDate.Size = New System.Drawing.Size(33, 13) Me.lblDate.TabIndex = 1 - Me.lblDate.Tag = "Date" - Me.lblDate.Text = "Date" + Me.lblDate.Tag = "Date:" + Me.lblDate.Text = "Date:" ' 'ucrReceiverDate ' Me.ucrReceiverDate.frmParent = Me - Me.ucrReceiverDate.Location = New System.Drawing.Point(286, 39) + Me.ucrReceiverDate.Location = New System.Drawing.Point(256, 59) Me.ucrReceiverDate.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverDate.Name = "ucrReceiverDate" Me.ucrReceiverDate.Selector = Nothing Me.ucrReceiverDate.Size = New System.Drawing.Size(120, 20) + Me.ucrReceiverDate.strNcFilePath = "" Me.ucrReceiverDate.TabIndex = 2 + Me.ucrReceiverDate.ucrSelector = Nothing ' 'ucrReceiverPrec ' Me.ucrReceiverPrec.frmParent = Me - Me.ucrReceiverPrec.Location = New System.Drawing.Point(286, 156) + Me.ucrReceiverPrec.Location = New System.Drawing.Point(256, 182) 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 = 8 + Me.ucrReceiverPrec.ucrSelector = Nothing ' 'ucrReceiverTmin ' Me.ucrReceiverTmin.frmParent = Me - Me.ucrReceiverTmin.Location = New System.Drawing.Point(286, 116) + Me.ucrReceiverTmin.Location = New System.Drawing.Point(256, 141) Me.ucrReceiverTmin.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverTmin.Name = "ucrReceiverTmin" Me.ucrReceiverTmin.Selector = Nothing Me.ucrReceiverTmin.Size = New System.Drawing.Size(120, 20) + Me.ucrReceiverTmin.strNcFilePath = "" Me.ucrReceiverTmin.TabIndex = 6 + Me.ucrReceiverTmin.ucrSelector = Nothing ' 'ucrReceiverTmax ' Me.ucrReceiverTmax.frmParent = Me - Me.ucrReceiverTmax.Location = New System.Drawing.Point(286, 79) + Me.ucrReceiverTmax.Location = New System.Drawing.Point(256, 100) Me.ucrReceiverTmax.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverTmax.Name = "ucrReceiverTmax" Me.ucrReceiverTmax.Selector = Nothing Me.ucrReceiverTmax.Size = New System.Drawing.Size(120, 20) + Me.ucrReceiverTmax.strNcFilePath = "" Me.ucrReceiverTmax.TabIndex = 4 + Me.ucrReceiverTmax.ucrSelector = Nothing ' 'ucrSelectorClimdex ' Me.ucrSelectorClimdex.bShowHiddenColumns = False Me.ucrSelectorClimdex.bUseCurrentFilter = True - Me.ucrSelectorClimdex.Location = New System.Drawing.Point(10, 3) + Me.ucrSelectorClimdex.Location = New System.Drawing.Point(10, 10) Me.ucrSelectorClimdex.Margin = New System.Windows.Forms.Padding(0) Me.ucrSelectorClimdex.Name = "ucrSelectorClimdex" Me.ucrSelectorClimdex.Size = New System.Drawing.Size(210, 180) @@ -138,7 +146,7 @@ Partial Class dlgClimdex ' 'ucrBaseClimdex ' - Me.ucrBaseClimdex.Location = New System.Drawing.Point(10, 222) + Me.ucrBaseClimdex.Location = New System.Drawing.Point(12, 242) Me.ucrBaseClimdex.Name = "ucrBaseClimdex" Me.ucrBaseClimdex.Size = New System.Drawing.Size(410, 52) Me.ucrBaseClimdex.TabIndex = 11 @@ -146,7 +154,7 @@ Partial Class dlgClimdex 'ucrChkSave ' Me.ucrChkSave.Checked = False - Me.ucrChkSave.Location = New System.Drawing.Point(10, 196) + Me.ucrChkSave.Location = New System.Drawing.Point(12, 216) Me.ucrChkSave.Name = "ucrChkSave" Me.ucrChkSave.Size = New System.Drawing.Size(107, 20) Me.ucrChkSave.TabIndex = 9 @@ -155,7 +163,7 @@ Partial Class dlgClimdex ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(424, 278) + Me.ClientSize = New System.Drawing.Size(421, 302) Me.Controls.Add(Me.ucrChkSave) Me.Controls.Add(Me.lblDate) Me.Controls.Add(Me.ucrReceiverDate) diff --git a/instat/dlgClimdex.vb b/instat/dlgClimdex.vb index 14cfd7f506e..fd236a00e47 100644 --- a/instat/dlgClimdex.vb +++ b/instat/dlgClimdex.vb @@ -38,22 +38,69 @@ Public Class dlgClimdex TestOkEnabled() End Sub + Private Sub InitialiseDialog() + ucrBaseClimdex.iHelpTopicID = 190 + ucrBaseClimdex.clsRsyntax.iCallType = 0 + + ucrSelectorClimdex.SetParameter(New RParameter("data_name", 0)) + ucrSelectorClimdex.SetParameterIsString() + + ucrReceiverDate.SetParameter(New RParameter("col_name")) + ucrReceiverDate.Selector = ucrSelectorClimdex + ucrReceiverDate.SetClimaticType("date") + 'ucrReceiverDate.AddIncludedMetadataProperty("Climatic_Type", {"date"}) + ucrReceiverDate.bAutoFill = True + ucrReceiverDate.SetParameterIsString() + + ucrReceiverTmax.SetParameter(New RParameter("col_name")) + ucrReceiverTmax.Selector = ucrSelectorClimdex + ucrReceiverTmax.SetClimaticType("temp_max") + ucrReceiverTmax.bAutoFill = True + ucrReceiverTmax.SetParameterIsString() + + ucrReceiverTmin.SetParameter(New RParameter("col_name")) + ucrReceiverTmin.Selector = ucrSelectorClimdex + ucrReceiverTmin.SetClimaticType("temp_min") + ucrReceiverTmin.bAutoFill = True + ucrReceiverTmin.SetParameterIsString() + + ucrReceiverPrec.SetParameter(New RParameter("col_name")) + ucrReceiverPrec.Selector = ucrSelectorClimdex + ucrReceiverPrec.SetClimaticType("rain") + ucrReceiverPrec.bAutoFill = True + ucrReceiverPrec.SetParameterIsString() + + ucrChkSave.SetText("Save Indices") + ucrChkSave.bChangeParameterValue = False + End Sub + Private Sub SetDefaults() + clsDefaultFunction = New RFunction + clsRTmax = New RFunction + clsRTmin = New RFunction + clsRPrec = New RFunction + clsRDate = New RFunction + clsRPCIct = New RFunction + clsRChar = New RFunction + ucrSelectorClimdex.Reset() ucrSelectorClimdex.Focus() ucrReceiverDate.SetMeAsReceiver() ucrChkSave.Checked = True 'Define the default RFunction + clsDefaultFunction.SetPackageName("climdex.pcic") clsDefaultFunction.SetRCommand("climdexInput.raw") clsRTmax.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$get_columns_from_data") clsRTmin.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$get_columns_from_data") clsRPrec.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$get_columns_from_data") clsRDate.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$get_columns_from_data") + + clsRPCIct.SetPackageName("PCICt") clsRPCIct.SetRCommand("as.PCICt") - clsRChar.SetRCommand("as.character") clsRPCIct.AddParameter("cal", Chr(34) & "gregorian" & Chr(34)) + clsRChar.SetRCommand("as.character") clsRChar.AddParameter("x", clsRFunctionParameter:=clsRDate) clsRPCIct.AddParameter("x", clsRFunctionParameter:=clsRChar) clsDefaultFunction.SetAssignTo("climdex_input") @@ -72,40 +119,16 @@ Public Class dlgClimdex bResetSubdialog = True End Sub - Private Sub InitialiseDialog() - ucrBaseClimdex.iHelpTopicID = 190 - ucrBaseClimdex.clsRsyntax.iCallType = 0 - - ucrSelectorClimdex.SetParameter(New RParameter("data_name", 0)) - ucrSelectorClimdex.SetParameterIsString() - - ucrReceiverDate.Selector = ucrSelectorClimdex - ucrReceiverDate.SetClimaticType("date") - 'ucrReceiverDate.AddIncludedMetadataProperty("Climatic_Type", {"date"}) - ucrReceiverDate.bAutoFill = True - ucrReceiverDate.SetParameter(New RParameter("col_name")) - ucrReceiverDate.SetParameterIsString() - - ucrReceiverTmax.Selector = ucrSelectorClimdex - ucrReceiverTmax.SetClimaticType("temp_max") - ucrReceiverTmax.bAutoFill = True - ucrReceiverTmax.SetParameter(New RParameter("col_name")) - ucrReceiverTmax.SetParameterIsString() - - ucrReceiverTmin.Selector = ucrSelectorClimdex - ucrReceiverTmin.SetClimaticType("temp_min") - ucrReceiverTmin.bAutoFill = True - ucrReceiverTmin.SetParameter(New RParameter("col_name")) - ucrReceiverTmin.SetParameterIsString() - - ucrReceiverPrec.Selector = ucrSelectorClimdex - ucrReceiverPrec.SetClimaticType("rain") - ucrReceiverPrec.bAutoFill = True - ucrReceiverPrec.SetParameter(New RParameter("col_name")) - ucrReceiverPrec.SetParameterIsString() - - ucrChkSave.SetText("Save indices") - ucrChkSave.bChangeParameterValue = False + Private Sub SetRCodeForControls(bReset As Boolean) + ucrSelectorClimdex.SetRCode(clsRDate, bReset) + ucrSelectorClimdex.SetRCode(clsRTmax, bReset) + ucrSelectorClimdex.SetRCode(clsRTmin, bReset) + ucrSelectorClimdex.SetRCode(clsRPrec, bReset) + ucrSelectorClimdex.SetRCode(sdgClimdexIndices.clsRWriteDf, bReset) + ucrReceiverDate.SetRCode(clsRDate, bReset) + ucrReceiverTmax.SetRCode(clsRTmax, bReset) + ucrReceiverTmin.SetRCode(clsRTmin, bReset) + ucrReceiverPrec.SetRCode(clsRPrec, bReset) End Sub Private Sub TestOkEnabled() @@ -121,24 +144,22 @@ Public Class dlgClimdex End Sub - Public Sub SetRCodeForControls(bReset As Boolean) - ucrSelectorClimdex.SetRCode(clsRDate, bReset) - ucrSelectorClimdex.SetRCode(clsRTmax, bReset) - ucrSelectorClimdex.SetRCode(clsRTmin, bReset) - ucrSelectorClimdex.SetRCode(clsRPrec, bReset) - ucrSelectorClimdex.SetRCode(sdgClimdexIndices.clsRWriteDf, bReset) - ucrReceiverDate.SetRCode(clsRDate, bReset) - ucrReceiverTmax.SetRCode(clsRTmax, bReset) - ucrReceiverTmin.SetRCode(clsRTmin, bReset) - ucrReceiverPrec.SetRCode(clsRPrec, bReset) - End Sub - Private Sub ucrBaseClimdex_ClickReset(sender As Object, e As EventArgs) Handles ucrBaseClimdex.ClickReset SetDefaults() SetRCodeForControls(True) TestOkEnabled() End Sub + Private Sub cmdIndices_Click(sender As Object, e As EventArgs) Handles cmdIndices.Click + sdgClimdexIndices.SetRFunction(ucrBaseClimdex.clsRsyntax.clsBaseFunction, bResetSubdialog) + bResetSubdialog = False + sdgClimdexIndices.ShowDialog() + End Sub + + Private Sub ucrBaseClimdex_clickok(sender As Object, e As EventArgs) Handles ucrBaseClimdex.ClickOk + sdgClimdexIndices.IndicesOptions(bSaveIndex) + End Sub + Private Sub AddRemoveDates() If Not ucrReceiverTmax.IsEmpty Then ucrBaseClimdex.clsRsyntax.AddParameter("tmax", clsRFunctionParameter:=clsRTmax) @@ -163,25 +184,10 @@ Public Class dlgClimdex End If End Sub - Private Sub cmdIndices_Click(sender As Object, e As EventArgs) Handles cmdIndices.Click - sdgClimdexIndices.SetRFunction(ucrBaseClimdex.clsRsyntax.clsBaseFunction, bResetSubdialog) - bResetSubdialog = False - sdgClimdexIndices.ShowDialog() - End Sub - - Private Sub ucrBaseClimdex_clickok(sender As Object, e As EventArgs) Handles ucrBaseClimdex.ClickOk - sdgClimdexIndices.IndicesOptions(bSaveIndex) - End Sub - Private Sub AssignName() ucrBaseClimdex.clsRsyntax.SetAssignTo("climdex_input") End Sub - Private Sub Controls_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrSelectorClimdex.ControlContentsChanged, ucrReceiverDate.ControlContentsChanged, ucrReceiverPrec.ControlContentsChanged, ucrReceiverTmax.ControlContentsChanged, ucrReceiverTmin.ControlContentsChanged - TestOkEnabled() - sdgClimdexIndices.IndicesType() 'is this the right implementation? - End Sub - Private Sub ucrChkSave_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrChkSave.ControlContentsChanged If ucrChkSave.Checked Then bSaveIndex = True @@ -189,4 +195,9 @@ Public Class dlgClimdex bSaveIndex = False End If End Sub + + Private Sub Controls_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrSelectorClimdex.ControlContentsChanged, ucrReceiverDate.ControlContentsChanged, ucrReceiverPrec.ControlContentsChanged, ucrReceiverTmax.ControlContentsChanged, ucrReceiverTmin.ControlContentsChanged + TestOkEnabled() + sdgClimdexIndices.IndicesType() 'is this the right implementation? + End Sub End Class \ No newline at end of file From 934d5c33383948c310190f76bccd1501c8b92a6c Mon Sep 17 00:00:00 2001 From: Lily Date: Thu, 8 Jun 2017 16:05:41 +0100 Subject: [PATCH 135/154] edits --- instat/dlgClimdex.vb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/instat/dlgClimdex.vb b/instat/dlgClimdex.vb index fd236a00e47..82c95e4918a 100644 --- a/instat/dlgClimdex.vb +++ b/instat/dlgClimdex.vb @@ -91,6 +91,8 @@ Public Class dlgClimdex 'Define the default RFunction clsDefaultFunction.SetPackageName("climdex.pcic") clsDefaultFunction.SetRCommand("climdexInput.raw") + clsDefaultFunction.SetAssignTo("climdex_input") + clsRTmax.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$get_columns_from_data") clsRTmin.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$get_columns_from_data") clsRPrec.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$get_columns_from_data") @@ -103,10 +105,9 @@ Public Class dlgClimdex clsRChar.SetRCommand("as.character") clsRChar.AddParameter("x", clsRFunctionParameter:=clsRDate) clsRPCIct.AddParameter("x", clsRFunctionParameter:=clsRChar) - clsDefaultFunction.SetAssignTo("climdex_input") ' Set default RFunction as the base function - ucrBaseClimdex.clsRsyntax.SetBaseRFunction(clsDefaultFunction.Clone()) + ucrBaseClimdex.clsRsyntax.SetBaseRFunction(clsDefaultFunction) 'add rfunction as parameters of the main function here ucrBaseClimdex.clsRsyntax.AddParameter("tmax", clsRFunctionParameter:=clsRTmax) ucrBaseClimdex.clsRsyntax.AddParameter("tmax.dates", clsRFunctionParameter:=clsRPCIct) From 219c14095802524246aadd4df981da4e3d2ee62e Mon Sep 17 00:00:00 2001 From: shadrack kibet Date: Thu, 8 Jun 2017 18:17:57 +0300 Subject: [PATCH 136/154] minor edit --- instat/dlgInsertColumn.vb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/instat/dlgInsertColumn.vb b/instat/dlgInsertColumn.vb index 5a73c7e92f1..43efdcc96b7 100644 --- a/instat/dlgInsertColumn.vb +++ b/instat/dlgInsertColumn.vb @@ -124,8 +124,8 @@ Public Class dlgInsertColumn ucrInputBeforeAfter.Reset() ucrInputDefaultValue.Reset() ucrInputPrefixForNewColumn.Reset() - ucrInputPrefixForNewColumn.SetName("X") clsInsertColumnFunction.AddParameter("col_data", " NA") + clsInsertColumnFunction.AddParameter("col_name", "X") clsInsertColumnFunction.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$add_columns_to_data") clsInsertColumnFunction.AddParameter("use_col_name_as_prefix", "TRUE") From 6742f11e913fa947f3f548a266cfb27b3c4629ef Mon Sep 17 00:00:00 2001 From: Lily Date: Thu, 8 Jun 2017 16:19:19 +0100 Subject: [PATCH 137/154] package name, layout edits --- instat/dlgCombineforGraphics.Designer.vb | 8 ++++--- instat/dlgCombineforGraphics.vb | 29 ++++++++++++------------ 2 files changed, 20 insertions(+), 17 deletions(-) diff --git a/instat/dlgCombineforGraphics.Designer.vb b/instat/dlgCombineforGraphics.Designer.vb index c327ec9599e..447ae1b05e1 100644 --- a/instat/dlgCombineforGraphics.Designer.vb +++ b/instat/dlgCombineforGraphics.Designer.vb @@ -51,7 +51,7 @@ Partial Class dlgCombineforGraphics ' 'ucrSave ' - Me.ucrSave.Location = New System.Drawing.Point(10, 228) + Me.ucrSave.Location = New System.Drawing.Point(10, 231) Me.ucrSave.Name = "ucrSave" Me.ucrSave.Size = New System.Drawing.Size(276, 24) Me.ucrSave.TabIndex = 4 @@ -63,8 +63,10 @@ Partial Class dlgCombineforGraphics Me.ucrCombineGraphReceiver.Margin = New System.Windows.Forms.Padding(0) Me.ucrCombineGraphReceiver.Name = "ucrCombineGraphReceiver" Me.ucrCombineGraphReceiver.Selector = Nothing - Me.ucrCombineGraphReceiver.Size = New System.Drawing.Size(120, 130) + Me.ucrCombineGraphReceiver.Size = New System.Drawing.Size(120, 100) + Me.ucrCombineGraphReceiver.strNcFilePath = "" Me.ucrCombineGraphReceiver.TabIndex = 2 + Me.ucrCombineGraphReceiver.ucrSelector = Nothing ' 'ucrCombineGraphSelector ' @@ -87,7 +89,7 @@ Partial Class dlgCombineforGraphics ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(420, 312) + Me.ClientSize = New System.Drawing.Size(414, 314) Me.Controls.Add(Me.ucrSave) Me.Controls.Add(Me.cmdOptions) Me.Controls.Add(Me.lblGraphsToCombine) diff --git a/instat/dlgCombineforGraphics.vb b/instat/dlgCombineforGraphics.vb index e98610702a8..2f5decaa561 100644 --- a/instat/dlgCombineforGraphics.vb +++ b/instat/dlgCombineforGraphics.vb @@ -35,44 +35,43 @@ Public Class dlgCombineforGraphics TestOkEnabled() End Sub - Private Sub SetRCodeForControls(bReset As Boolean) - SetRCode(Me, ucrBase.clsRsyntax.clsBaseFunction, bReset) - End Sub - Private Sub InitialiseDialog() ucrBase.iHelpTopicID = 431 ucrBase.clsRsyntax.iCallType = 3 ucrBase.clsRsyntax.bExcludeAssignedFunctionOutput = False - + ucrCombineGraphReceiver.SetParameter(New RParameter("grobs", 0)) + ucrCombineGraphReceiver.SetParameterIsRFunction() ucrCombineGraphReceiver.Selector = ucrCombineGraphSelector ucrCombineGraphSelector.SetItemType("graph") ucrCombineGraphReceiver.strSelectorHeading = "Graphs" - ucrCombineGraphReceiver.SetParameter(New RParameter("grobs", 0)) - ucrCombineGraphReceiver.SetParameterIsRFunction() - - ucrSave.SetPrefix("Combined_Graph") + ucrSave.SetPrefix("combined_graph") ucrSave.SetDataFrameSelector(ucrCombineGraphSelector.ucrAvailableDataFrames) ucrSave.SetSaveTypeAsGraph() ucrSave.SetCheckBoxText("Save Graph") ucrSave.SetIsComboBox() ucrSave.SetAssignToIfUncheckedValue("last_graph") - End Sub Private Sub SetDefaults() + clsDefaultRFunction = New RFunction + ucrCombineGraphReceiver.SetMeAsReceiver() ucrCombineGraphSelector.Reset() ucrSave.Reset() - clsDefaultRFunction = New RFunction + clsDefaultRFunction.SetPackageName("gridExtra") clsDefaultRFunction.SetRCommand("grid.arrange") clsDefaultRFunction.SetAssignTo("last_graph", strTempDataframe:=ucrCombineGraphSelector.ucrAvailableDataFrames.cboAvailableDataFrames.Text, strTempGraph:="last_graph") ucrBase.clsRsyntax.SetBaseRFunction(clsDefaultRFunction) bResetSubDialog = True End Sub + Private Sub SetRCodeForControls(bReset As Boolean) + SetRCode(Me, ucrBase.clsRsyntax.clsBaseFunction, bReset) + End Sub + Private Sub TestOkEnabled() If ucrCombineGraphReceiver.lstSelectedVariables.Items.Count > 1 AndAlso ucrSave.IsComplete Then ucrBase.OKEnabled(True) @@ -80,19 +79,21 @@ Public Class dlgCombineforGraphics 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 AllControls_ControlContentsChanged() Handles ucrCombineGraphReceiver.ControlContentsChanged, ucrSave.ControlContentsChanged - TestOkEnabled() - End Sub Private Sub cmdLayout_Click(sender As Object, e As EventArgs) Handles cmdOptions.Click 'this SetRFunction is still empty in subdialog but will be fixed soon. sdgCombineGraphOptions.SetRFunction(ucrBase.clsRsyntax.clsBaseFunction, bResetSubDialog) bResetSubDialog = False sdgCombineGraphOptions.ShowDialog() End Sub + + Private Sub AllControls_ControlContentsChanged() Handles ucrCombineGraphReceiver.ControlContentsChanged, ucrSave.ControlContentsChanged + TestOkEnabled() + End Sub End Class \ No newline at end of file From 1458f8f5db1fa3c8f943f790a5a42b97973b9f46 Mon Sep 17 00:00:00 2001 From: shadrack kibet Date: Thu, 8 Jun 2017 18:20:57 +0300 Subject: [PATCH 138/154] tiny edit --- instat/dlgInsertColumn.vb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/instat/dlgInsertColumn.vb b/instat/dlgInsertColumn.vb index 43efdcc96b7..84bbb20335f 100644 --- a/instat/dlgInsertColumn.vb +++ b/instat/dlgInsertColumn.vb @@ -124,7 +124,7 @@ Public Class dlgInsertColumn ucrInputBeforeAfter.Reset() ucrInputDefaultValue.Reset() ucrInputPrefixForNewColumn.Reset() - clsInsertColumnFunction.AddParameter("col_data", " NA") + clsInsertColumnFunction.AddParameter("col_data", "NA") clsInsertColumnFunction.AddParameter("col_name", "X") clsInsertColumnFunction.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$add_columns_to_data") From 5b638dbdde1c5b991557d28d6b2fc43a94f1ce42 Mon Sep 17 00:00:00 2001 From: Steven Date: Thu, 8 Jun 2017 18:28:01 +0300 Subject: [PATCH 139/154] edits --- instat/clsGgplotDefaults.vb | 8 +- instat/sdgThemes.Designer.vb | 190 ++++++++++++++++------------------- instat/sdgThemes.vb | 16 +-- instat/ucrGridUnit.vb | 2 +- 4 files changed, 101 insertions(+), 115 deletions(-) diff --git a/instat/clsGgplotDefaults.vb b/instat/clsGgplotDefaults.vb index 2e0252d70a9..4373236cebe 100644 --- a/instat/clsGgplotDefaults.vb +++ b/instat/clsGgplotDefaults.vb @@ -139,12 +139,8 @@ dctTemp.Add("legend.text", clsElementText.Clone()) 'dctTemp.Add("legend.text.align", clsElementText.Clone()) dctTemp.Add("legend.title", clsElementText.Clone()) - ' dctTemp.Add("legend.title.align", clsElementText.Clone()) - 'dctTemp.Add("legend.position", clsElementText.Clone()) - 'dctTemp.Add("legend.direction", clsElementText.Clone()) - 'dctTemp.Add("legend.justification", clsElementText.Clone()) - 'dctTemp.Add(" legend.box", clsElementText.Clone()) - 'dctTemp.Add("legend.box.just", clsElementText.Clone()) + 'dctTemp.Add("legend.title.align", clsElementText.Clone()) + 'dctTemp.Add("legend.box.margin", clsElementText.Clone()) dctTemp.Add("legend.box.background", clsElementRect.Clone()) 'dctTemp.Add("legend.box.spacing", clsElementText.Clone()) diff --git a/instat/sdgThemes.Designer.vb b/instat/sdgThemes.Designer.vb index 0c16390509f..468c1ca3a56 100644 --- a/instat/sdgThemes.Designer.vb +++ b/instat/sdgThemes.Designer.vb @@ -69,8 +69,6 @@ Partial Class sdgThemes Me.ucrLegendBackground = New instat.ucrElementRectControl() Me.ucrLegendKey = New instat.ucrElementRectControl() Me.tbThemeYaxis = New System.Windows.Forms.TabPage() - Me.grpLineAlongYAxis = New System.Windows.Forms.GroupBox() - Me.ucrYAxisLines = New instat.ucrElementLineControl() Me.grpYAxisTitle = New System.Windows.Forms.GroupBox() Me.ucrThemeTitleYRightAxis = New instat.ucrELementTextControl() Me.ucrThemeTitleYAxis = New instat.ucrELementTextControl() @@ -108,18 +106,19 @@ Partial Class sdgThemes Me.ucrPlotTitle = New instat.ucrELementTextControl() Me.tbLegend = New System.Windows.Forms.TabControl() Me.tbThemeLegendMoreOptions = New System.Windows.Forms.TabPage() - Me.tbThemePanelMoreOptions = New System.Windows.Forms.TabPage() - Me.grpPanelGridMajorMinor = New System.Windows.Forms.GroupBox() - Me.ucrPanelGridMajorYAxis = New instat.ucrELementTextControl() - Me.ucrPanelGridMajorXAxis = New instat.ucrELementTextControl() - Me.ucrPanelGridMinorYAxis = New instat.ucrELementTextControl() - Me.ucrPanelGridMinorXAxis = New instat.ucrELementTextControl() + Me.grpLegendBoxSpacing = New System.Windows.Forms.GroupBox() + Me.ucrLegendBoxSpacing = New instat.ucrGridUnit() Me.grpLegendSpacing = New System.Windows.Forms.GroupBox() Me.ucrLegendSpacingYAxis = New instat.ucrGridUnit() Me.ucrLegendSpacingXAxis = New instat.ucrGridUnit() Me.ucrLegendSpacing = New instat.ucrGridUnit() - Me.GroupBox2 = New System.Windows.Forms.GroupBox() - Me.UcrGridUnit1 = New instat.ucrGridUnit() + Me.tbThemePanelMoreOptions = New System.Windows.Forms.TabPage() + Me.grpPanelGridMajorMinor = New System.Windows.Forms.GroupBox() + Me.ucrPanelGridMinorYAxis = New instat.ucrELementTextControl() + Me.ucrPanelGridMinorXAxis = New instat.ucrELementTextControl() + Me.ucrPanelGridMajorYAxis = New instat.ucrELementTextControl() + Me.ucrPanelGridMajorXAxis = New instat.ucrELementTextControl() + Me.ucrYAxisLines = New instat.ucrElementLineControl() Me.tbThemeFacets.SuspendLayout() Me.GroupBox1.SuspendLayout() Me.grpFacetBackground.SuspendLayout() @@ -134,7 +133,6 @@ Partial Class sdgThemes Me.grpLegendAdjustments.SuspendLayout() Me.grpLegendBackGroundAndKey.SuspendLayout() Me.tbThemeYaxis.SuspendLayout() - Me.grpLineAlongYAxis.SuspendLayout() Me.grpYAxisTitle.SuspendLayout() Me.grpTickMarkLabelsYAxis.SuspendLayout() Me.grpTickMarkers.SuspendLayout() @@ -151,10 +149,10 @@ Partial Class sdgThemes Me.grpPlotTitleAndCaption.SuspendLayout() Me.tbLegend.SuspendLayout() Me.tbThemeLegendMoreOptions.SuspendLayout() + Me.grpLegendBoxSpacing.SuspendLayout() + Me.grpLegendSpacing.SuspendLayout() Me.tbThemePanelMoreOptions.SuspendLayout() Me.grpPanelGridMajorMinor.SuspendLayout() - Me.grpLegendSpacing.SuspendLayout() - Me.GroupBox2.SuspendLayout() Me.SuspendLayout() ' 'ucrBaseSubdialogue @@ -171,7 +169,7 @@ Partial Class sdgThemes Me.tbThemeFacets.Controls.Add(Me.grpFacetLabels) Me.tbThemeFacets.Location = New System.Drawing.Point(4, 22) Me.tbThemeFacets.Name = "tbThemeFacets" - Me.tbThemeFacets.Size = New System.Drawing.Size(816, 583) + Me.tbThemeFacets.Size = New System.Drawing.Size(816, 564) Me.tbThemeFacets.TabIndex = 4 Me.tbThemeFacets.Text = "Facets" Me.tbThemeFacets.UseVisualStyleBackColor = True @@ -258,7 +256,7 @@ Partial Class sdgThemes Me.tbThemePanelAndBackground.Controls.Add(Me.grpPAnelGrid) Me.tbThemePanelAndBackground.Location = New System.Drawing.Point(4, 22) Me.tbThemePanelAndBackground.Name = "tbThemePanelAndBackground" - Me.tbThemePanelAndBackground.Size = New System.Drawing.Size(816, 583) + Me.tbThemePanelAndBackground.Size = New System.Drawing.Size(816, 564) Me.tbThemePanelAndBackground.TabIndex = 3 Me.tbThemePanelAndBackground.Text = "Panel and Background " Me.tbThemePanelAndBackground.UseVisualStyleBackColor = True @@ -570,35 +568,17 @@ Partial Class sdgThemes ' 'tbThemeYaxis ' - Me.tbThemeYaxis.Controls.Add(Me.grpLineAlongYAxis) Me.tbThemeYaxis.Controls.Add(Me.grpYAxisTitle) Me.tbThemeYaxis.Controls.Add(Me.grpTickMarkLabelsYAxis) Me.tbThemeYaxis.Controls.Add(Me.grpTickMarkers) Me.tbThemeYaxis.Location = New System.Drawing.Point(4, 22) Me.tbThemeYaxis.Name = "tbThemeYaxis" Me.tbThemeYaxis.Padding = New System.Windows.Forms.Padding(3) - Me.tbThemeYaxis.Size = New System.Drawing.Size(816, 583) + Me.tbThemeYaxis.Size = New System.Drawing.Size(816, 564) Me.tbThemeYaxis.TabIndex = 1 Me.tbThemeYaxis.Text = "Y-axis" Me.tbThemeYaxis.UseVisualStyleBackColor = True ' - 'grpLineAlongYAxis - ' - Me.grpLineAlongYAxis.Controls.Add(Me.ucrYAxisLines) - Me.grpLineAlongYAxis.Location = New System.Drawing.Point(544, 289) - Me.grpLineAlongYAxis.Name = "grpLineAlongYAxis" - Me.grpLineAlongYAxis.Size = New System.Drawing.Size(260, 136) - Me.grpLineAlongYAxis.TabIndex = 66 - Me.grpLineAlongYAxis.TabStop = False - Me.grpLineAlongYAxis.Text = "Line Along Y-Axis" - ' - 'ucrYAxisLines - ' - Me.ucrYAxisLines.Location = New System.Drawing.Point(4, 12) - Me.ucrYAxisLines.Name = "ucrYAxisLines" - Me.ucrYAxisLines.Size = New System.Drawing.Size(254, 124) - Me.ucrYAxisLines.TabIndex = 63 - ' 'grpYAxisTitle ' Me.grpYAxisTitle.Controls.Add(Me.ucrThemeTitleYRightAxis) @@ -651,10 +631,11 @@ Partial Class sdgThemes ' 'grpTickMarkers ' + Me.grpTickMarkers.Controls.Add(Me.ucrYAxisLines) Me.grpTickMarkers.Controls.Add(Me.ucrTickMarksYAxis) Me.grpTickMarkers.Location = New System.Drawing.Point(540, 24) Me.grpTickMarkers.Name = "grpTickMarkers" - Me.grpTickMarkers.Size = New System.Drawing.Size(264, 137) + Me.grpTickMarkers.Size = New System.Drawing.Size(264, 259) Me.grpTickMarkers.TabIndex = 65 Me.grpTickMarkers.TabStop = False Me.grpTickMarkers.Text = "TickMarkers" @@ -672,7 +653,7 @@ Partial Class sdgThemes Me.tbThemeXAxis.Location = New System.Drawing.Point(4, 22) Me.tbThemeXAxis.Name = "tbThemeXAxis" Me.tbThemeXAxis.Padding = New System.Windows.Forms.Padding(3) - Me.tbThemeXAxis.Size = New System.Drawing.Size(816, 583) + Me.tbThemeXAxis.Size = New System.Drawing.Size(816, 564) Me.tbThemeXAxis.TabIndex = 0 Me.tbThemeXAxis.Text = "X-axis" Me.tbThemeXAxis.UseVisualStyleBackColor = True @@ -922,7 +903,7 @@ Partial Class sdgThemes ' 'tbThemeLegendMoreOptions ' - Me.tbThemeLegendMoreOptions.Controls.Add(Me.GroupBox2) + Me.tbThemeLegendMoreOptions.Controls.Add(Me.grpLegendBoxSpacing) Me.tbThemeLegendMoreOptions.Controls.Add(Me.grpLegendSpacing) Me.tbThemeLegendMoreOptions.Location = New System.Drawing.Point(4, 22) Me.tbThemeLegendMoreOptions.Name = "tbThemeLegendMoreOptions" @@ -931,6 +912,56 @@ Partial Class sdgThemes Me.tbThemeLegendMoreOptions.Text = "Legend(More Options)" Me.tbThemeLegendMoreOptions.UseVisualStyleBackColor = True ' + 'grpLegendBoxSpacing + ' + Me.grpLegendBoxSpacing.Controls.Add(Me.ucrLegendBoxSpacing) + Me.grpLegendBoxSpacing.Location = New System.Drawing.Point(6, 172) + Me.grpLegendBoxSpacing.Name = "grpLegendBoxSpacing" + Me.grpLegendBoxSpacing.Size = New System.Drawing.Size(263, 137) + Me.grpLegendBoxSpacing.TabIndex = 107 + Me.grpLegendBoxSpacing.TabStop = False + Me.grpLegendBoxSpacing.Text = "Legend Box Spacing" + ' + 'ucrLegendBoxSpacing + ' + Me.ucrLegendBoxSpacing.Location = New System.Drawing.Point(1, 15) + Me.ucrLegendBoxSpacing.Name = "ucrLegendBoxSpacing" + Me.ucrLegendBoxSpacing.Size = New System.Drawing.Size(256, 114) + Me.ucrLegendBoxSpacing.TabIndex = 104 + ' + 'grpLegendSpacing + ' + Me.grpLegendSpacing.Controls.Add(Me.ucrLegendSpacingYAxis) + Me.grpLegendSpacing.Controls.Add(Me.ucrLegendSpacingXAxis) + Me.grpLegendSpacing.Controls.Add(Me.ucrLegendSpacing) + Me.grpLegendSpacing.Location = New System.Drawing.Point(4, 16) + Me.grpLegendSpacing.Name = "grpLegendSpacing" + Me.grpLegendSpacing.Size = New System.Drawing.Size(788, 150) + Me.grpLegendSpacing.TabIndex = 5 + Me.grpLegendSpacing.TabStop = False + Me.grpLegendSpacing.Text = "Legend Spacing" + ' + 'ucrLegendSpacingYAxis + ' + Me.ucrLegendSpacingYAxis.Location = New System.Drawing.Point(523, 25) + Me.ucrLegendSpacingYAxis.Name = "ucrLegendSpacingYAxis" + Me.ucrLegendSpacingYAxis.Size = New System.Drawing.Size(256, 119) + Me.ucrLegendSpacingYAxis.TabIndex = 107 + ' + 'ucrLegendSpacingXAxis + ' + Me.ucrLegendSpacingXAxis.Location = New System.Drawing.Point(271, 25) + Me.ucrLegendSpacingXAxis.Name = "ucrLegendSpacingXAxis" + Me.ucrLegendSpacingXAxis.Size = New System.Drawing.Size(255, 119) + Me.ucrLegendSpacingXAxis.TabIndex = 106 + ' + 'ucrLegendSpacing + ' + Me.ucrLegendSpacing.Location = New System.Drawing.Point(7, 19) + Me.ucrLegendSpacing.Name = "ucrLegendSpacing" + Me.ucrLegendSpacing.Size = New System.Drawing.Size(258, 119) + Me.ucrLegendSpacing.TabIndex = 105 + ' 'tbThemePanelMoreOptions ' Me.tbThemePanelMoreOptions.Controls.Add(Me.grpPanelGridMajorMinor) @@ -955,20 +986,6 @@ Partial Class sdgThemes Me.grpPanelGridMajorMinor.TabStop = False Me.grpPanelGridMajorMinor.Text = "Panel Grid" ' - 'ucrPanelGridMajorYAxis - ' - Me.ucrPanelGridMajorYAxis.Location = New System.Drawing.Point(263, 12) - Me.ucrPanelGridMajorYAxis.Name = "ucrPanelGridMajorYAxis" - Me.ucrPanelGridMajorYAxis.Size = New System.Drawing.Size(258, 224) - Me.ucrPanelGridMajorYAxis.TabIndex = 59 - ' - 'ucrPanelGridMajorXAxis - ' - Me.ucrPanelGridMajorXAxis.Location = New System.Drawing.Point(4, 12) - Me.ucrPanelGridMajorXAxis.Name = "ucrPanelGridMajorXAxis" - Me.ucrPanelGridMajorXAxis.Size = New System.Drawing.Size(259, 224) - Me.ucrPanelGridMajorXAxis.TabIndex = 58 - ' 'ucrPanelGridMinorYAxis ' Me.ucrPanelGridMinorYAxis.Location = New System.Drawing.Point(263, 242) @@ -983,55 +1000,26 @@ Partial Class sdgThemes Me.ucrPanelGridMinorXAxis.Size = New System.Drawing.Size(259, 224) Me.ucrPanelGridMinorXAxis.TabIndex = 60 ' - 'grpLegendSpacing - ' - Me.grpLegendSpacing.Controls.Add(Me.ucrLegendSpacingYAxis) - Me.grpLegendSpacing.Controls.Add(Me.ucrLegendSpacingXAxis) - Me.grpLegendSpacing.Controls.Add(Me.ucrLegendSpacing) - Me.grpLegendSpacing.Location = New System.Drawing.Point(4, 16) - Me.grpLegendSpacing.Name = "grpLegendSpacing" - Me.grpLegendSpacing.Size = New System.Drawing.Size(788, 150) - Me.grpLegendSpacing.TabIndex = 5 - Me.grpLegendSpacing.TabStop = False - Me.grpLegendSpacing.Text = "Legend Spacing" - ' - 'ucrLegendSpacingYAxis - ' - Me.ucrLegendSpacingYAxis.Location = New System.Drawing.Point(523, 25) - Me.ucrLegendSpacingYAxis.Name = "ucrLegendSpacingYAxis" - Me.ucrLegendSpacingYAxis.Size = New System.Drawing.Size(256, 119) - Me.ucrLegendSpacingYAxis.TabIndex = 107 - ' - 'ucrLegendSpacingXAxis - ' - Me.ucrLegendSpacingXAxis.Location = New System.Drawing.Point(271, 25) - Me.ucrLegendSpacingXAxis.Name = "ucrLegendSpacingXAxis" - Me.ucrLegendSpacingXAxis.Size = New System.Drawing.Size(255, 119) - Me.ucrLegendSpacingXAxis.TabIndex = 106 - ' - 'ucrLegendSpacing + 'ucrPanelGridMajorYAxis ' - Me.ucrLegendSpacing.Location = New System.Drawing.Point(7, 19) - Me.ucrLegendSpacing.Name = "ucrLegendSpacing" - Me.ucrLegendSpacing.Size = New System.Drawing.Size(258, 119) - Me.ucrLegendSpacing.TabIndex = 105 + Me.ucrPanelGridMajorYAxis.Location = New System.Drawing.Point(263, 12) + Me.ucrPanelGridMajorYAxis.Name = "ucrPanelGridMajorYAxis" + Me.ucrPanelGridMajorYAxis.Size = New System.Drawing.Size(258, 224) + Me.ucrPanelGridMajorYAxis.TabIndex = 59 ' - 'GroupBox2 + 'ucrPanelGridMajorXAxis ' - Me.GroupBox2.Controls.Add(Me.UcrGridUnit1) - Me.GroupBox2.Location = New System.Drawing.Point(6, 172) - Me.GroupBox2.Name = "GroupBox2" - Me.GroupBox2.Size = New System.Drawing.Size(263, 137) - Me.GroupBox2.TabIndex = 107 - Me.GroupBox2.TabStop = False - Me.GroupBox2.Text = "GroupBox2" + Me.ucrPanelGridMajorXAxis.Location = New System.Drawing.Point(4, 12) + Me.ucrPanelGridMajorXAxis.Name = "ucrPanelGridMajorXAxis" + Me.ucrPanelGridMajorXAxis.Size = New System.Drawing.Size(259, 224) + Me.ucrPanelGridMajorXAxis.TabIndex = 58 ' - 'UcrGridUnit1 + 'ucrYAxisLines ' - Me.UcrGridUnit1.Location = New System.Drawing.Point(1, 15) - Me.UcrGridUnit1.Name = "UcrGridUnit1" - Me.UcrGridUnit1.Size = New System.Drawing.Size(256, 114) - Me.UcrGridUnit1.TabIndex = 104 + Me.ucrYAxisLines.Location = New System.Drawing.Point(4, 129) + Me.ucrYAxisLines.Name = "ucrYAxisLines" + Me.ucrYAxisLines.Size = New System.Drawing.Size(254, 124) + Me.ucrYAxisLines.TabIndex = 63 ' 'sdgThemes ' @@ -1060,7 +1048,6 @@ Partial Class sdgThemes Me.grpLegendAdjustments.ResumeLayout(False) Me.grpLegendBackGroundAndKey.ResumeLayout(False) Me.tbThemeYaxis.ResumeLayout(False) - Me.grpLineAlongYAxis.ResumeLayout(False) Me.grpYAxisTitle.ResumeLayout(False) Me.grpTickMarkLabelsYAxis.ResumeLayout(False) Me.grpTickMarkers.ResumeLayout(False) @@ -1077,10 +1064,10 @@ Partial Class sdgThemes Me.grpPlotTitleAndCaption.ResumeLayout(False) Me.tbLegend.ResumeLayout(False) Me.tbThemeLegendMoreOptions.ResumeLayout(False) + Me.grpLegendBoxSpacing.ResumeLayout(False) + Me.grpLegendSpacing.ResumeLayout(False) Me.tbThemePanelMoreOptions.ResumeLayout(False) Me.grpPanelGridMajorMinor.ResumeLayout(False) - Me.grpLegendSpacing.ResumeLayout(False) - Me.GroupBox2.ResumeLayout(False) Me.ResumeLayout(False) End Sub @@ -1121,8 +1108,6 @@ Partial Class sdgThemes Friend WithEvents ucrLegendBackground As ucrElementRectControl Friend WithEvents ucrLegendKey As ucrElementRectControl Friend WithEvents tbThemeYaxis As TabPage - Friend WithEvents grpLineAlongYAxis As GroupBox - Friend WithEvents ucrYAxisLines As ucrElementLineControl Friend WithEvents grpYAxisTitle As GroupBox Friend WithEvents ucrThemeTitleYRightAxis As ucrELementTextControl Friend WithEvents ucrThemeTitleYAxis As ucrELementTextControl @@ -1181,6 +1166,7 @@ Partial Class sdgThemes Friend WithEvents ucrLegendSpacingYAxis As ucrGridUnit Friend WithEvents ucrLegendSpacingXAxis As ucrGridUnit Friend WithEvents ucrLegendSpacing As ucrGridUnit - Friend WithEvents GroupBox2 As GroupBox - Friend WithEvents UcrGridUnit1 As ucrGridUnit + Friend WithEvents grpLegendBoxSpacing As GroupBox + Friend WithEvents ucrLegendBoxSpacing As ucrGridUnit + Friend WithEvents ucrYAxisLines As ucrElementLineControl End Class diff --git a/instat/sdgThemes.vb b/instat/sdgThemes.vb index b2f7e0d3492..4ada0ca5b87 100644 --- a/instat/sdgThemes.vb +++ b/instat/sdgThemes.vb @@ -49,7 +49,7 @@ Public Class sdgThemes ucrXAxisLines.setlabel("Line along x axis") ucrTickMarksAxes.setlabel("Tick marks along axes") ucrThemeAxesTitle.setlabel("Label of axes") - ucrThemeAxesTickLabels.setlabel("Tick marks along axes") + ucrThemeAxesTickLabels.setlabel("Tick marks label along axes") ucrThemeAxesLines.setlabel("Lines along axes") ucrLegendTitle.setlabel("Title of legend") @@ -61,11 +61,12 @@ Public Class sdgThemes ucrLegendSpacing.setlabel("Spacing between legends") ucrLegendSpacingXAxis.setlabel("Horizontal spacing between legends") ucrLegendSpacingYAxis.setlabel("Horizontal spacing between legends") + ucrLegendBoxSpacing.setlabel("Space between plot area legend box") ucrPanelGridMajorXAxis.setlabel("vertical major grid lines ") ucrPanelGridMajorYAxis.setlabel("horizontal major grid lines ") ucrPanelGridMinorXAxis.setlabel("vertical minor grid lines") - ucrPanelGridMinorXAxis.setlabel("horizontal minor grid lines") + ucrPanelGridMinorYAxis.setlabel("horizontal minor grid lines") ucrPanelGrid.setlabel("Grid lines") ucrPanelGridMajor.setlabel("Major grid lines ") @@ -88,7 +89,7 @@ Public Class sdgThemes ucrLegendKeySize.setlabel("Size of legend keys") ucrLegendKeyHeight.setlabel("Key background height") - ucrLegendKeySize.setlabel("Key background width") + ucrLegendKeyWidth.setlabel("Key background width") ucrPanelSpacing.setlabel("Spacing between facet panels ") ucrPanelSpacingXAxis.setlabel("Horizontal spacing between facet panels") @@ -213,6 +214,7 @@ Public Class sdgThemes Dim clsUnitLegendSpacing As New RFunction Dim clsUnitLegendSpacingXAxis As New RFunction Dim clsUnitLegendSpacingYAxis As New RFunction + Dim clsUnitLegendBoxSpacing As New RFunction If Not bControlsInitialised Then InitialiseControls() @@ -279,6 +281,7 @@ Public Class sdgThemes dctThemeFunctions.TryGetValue("legend.spacing", clsUnitLegendSpacing) dctThemeFunctions.TryGetValue("legend.spacing.x", clsUnitLegendSpacingXAxis) dctThemeFunctions.TryGetValue("legend.spacing.y", clsUnitLegendSpacingYAxis) + dctThemeFunctions.TryGetValue("legend.box.spacing", clsUnitLegendBoxSpacing) dctThemeFunctions.TryGetValue("plot.background", clsElementPlotBackground) @@ -288,8 +291,8 @@ Public Class sdgThemes ucrTickMarksYAxis.SetRCodeForControl("axis.ticks.y", clsYElementLine, clsNewThemeFunction:=clsThemeFunction, clsNewBaseOperator:=clsBaseOperator, bReset:=bReset) ucrXAxisLines.SetRCodeForControl("axis.line.x", clsElementLineXAxis, clsNewThemeFunction:=clsThemeFunction, clsNewBaseOperator:=clsBaseOperator, bReset:=bReset) ucrYAxisLines.SetRCodeForControl("axis.line.y", clsElementLineYAxis, clsNewThemeFunction:=clsThemeFunction, clsNewBaseOperator:=clsBaseOperator, bReset:=bReset) - ucrThemeAxesTickLabels.SetRCodeForControl("axis.ticks", clsElementTickAxes, clsNewThemeFunction:=clsThemeFunction, clsNewBaseOperator:=clsBaseOperator, bReset:=bReset) - ucrTickMarksAxes.SetRCodeForControl("axis.text", clsElementTickText, clsNewThemeFunction:=clsThemeFunction, clsNewBaseOperator:=clsBaseOperator, bReset:=bReset) + ucrTickMarksAxes.SetRCodeForControl("axis.ticks", clsElementTickAxes, clsNewThemeFunction:=clsThemeFunction, clsNewBaseOperator:=clsBaseOperator, bReset:=bReset) + ucrThemeAxesTickLabels.SetRCodeForControl("axis.text", clsElementTickText, clsNewThemeFunction:=clsThemeFunction, clsNewBaseOperator:=clsBaseOperator, bReset:=bReset) ucrThemeAxesTitle.SetRCodeForControl("axis.title", clsXElementTitleText, clsNewThemeFunction:=clsThemeFunction, clsNewBaseOperator:=clsBaseOperator, bReset:=bReset) ucrThemeAxesLines.SetRCodeForControl("axis.line", clsElementLineAxes, clsNewThemeFunction:=clsThemeFunction, clsNewBaseOperator:=clsBaseOperator, bReset:=bReset) @@ -311,7 +314,8 @@ Public Class sdgThemes ucrLegendSpacing.SetRCodeForControl("legend.spacing", clsUnitLegendSpacing, clsNewThemeFunction:=clsThemeFunction, clsNewBaseOperator:=clsBaseOperator, bReset:=bReset) ucrLegendSpacingXAxis.SetRCodeForControl("legend.spacing.x", clsUnitLegendSpacingXAxis, clsNewThemeFunction:=clsThemeFunction, clsNewBaseOperator:=clsBaseOperator, bReset:=bReset) - ucrLegendSpacingXAxis.SetRCodeForControl("legend.spacing.y", clsUnitLegendSpacingYAxis, clsNewThemeFunction:=clsThemeFunction, clsNewBaseOperator:=clsBaseOperator, bReset:=bReset) + ucrLegendSpacingYAxis.SetRCodeForControl("legend.spacing.y", clsUnitLegendSpacingYAxis, clsNewThemeFunction:=clsThemeFunction, clsNewBaseOperator:=clsBaseOperator, bReset:=bReset) + ucrLegendBoxSpacing.SetRCodeForControl("legend.box.spacing", clsUnitLegendBoxSpacing, clsNewThemeFunction:=clsThemeFunction, clsNewBaseOperator:=clsBaseOperator, bReset:=bReset) ucrPanelGridMajorXAxis.SetRCodeForControl("panel.grid.major.x", clsElementPanelGridMajorXAxis, clsNewThemeFunction:=clsThemeFunction, clsNewBaseOperator:=clsBaseOperator, bReset:=bReset) ucrPanelGridMajorYAxis.SetRCodeForControl("panel.grid.major.y", clsElementPanelGridMajorYAxis, clsNewThemeFunction:=clsThemeFunction, clsNewBaseOperator:=clsBaseOperator, bReset:=bReset) diff --git a/instat/ucrGridUnit.vb b/instat/ucrGridUnit.vb index 0eb386a209c..6e5ae23be86 100644 --- a/instat/ucrGridUnit.vb +++ b/instat/ucrGridUnit.vb @@ -37,7 +37,7 @@ Public Class ucrGridUnit ucrInputVector.SetParameter(New RParameter("x")) ucrInputVector.AddQuotesIfUnrecognised = False ' ucrInputVector.SetValidationTypeAsNumeric() - ucrInputVector.SetRDefault("1") + ucrChkUnits.AddToLinkedControls(ucrInputUnits, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) ucrChkUnits.AddToLinkedControls(ucrInputData, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) From 01fc6044262093468ac8c607705d7595ac036c1b Mon Sep 17 00:00:00 2001 From: Lily Date: Thu, 8 Jun 2017 19:02:07 +0100 Subject: [PATCH 140/154] Adding line in --- instat/dlgAppend.vb | 1 + 1 file changed, 1 insertion(+) diff --git a/instat/dlgAppend.vb b/instat/dlgAppend.vb index cfdab8217c9..e265e194d51 100644 --- a/instat/dlgAppend.vb +++ b/instat/dlgAppend.vb @@ -50,6 +50,7 @@ Public Class dlgAppend ucrChkIncludeIDColumn.bChangeParameterValue = False ucrChkIncludeIDColumn.AddToLinkedControls(ucrLinked:=ucrInputIDColName, objValues:={True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) ucrInputIDColName.bAddRemoveParameter = False + ucrInputIDColName.SetLinkedDisplayControl(lblIDColName) ' ucrSave ucrSaveGraph.SetIsTextBox() From 8f8548785847cd8d560941b6af078dc88c3a2bfe Mon Sep 17 00:00:00 2001 From: Lily Date: Thu, 8 Jun 2017 20:36:27 +0100 Subject: [PATCH 141/154] Dummy variables changes - designer, package name added, code layouts --- instat/dlgDummyVariables.Designer.vb | 128 ++++++++++++++------------- instat/dlgDummyVariables.vb | 62 +++++++------ 2 files changed, 99 insertions(+), 91 deletions(-) diff --git a/instat/dlgDummyVariables.Designer.vb b/instat/dlgDummyVariables.Designer.vb index a820655e972..2b6a9182357 100644 --- a/instat/dlgDummyVariables.Designer.vb +++ b/instat/dlgDummyVariables.Designer.vb @@ -24,24 +24,24 @@ Partial Class dlgDummyVariables Private Sub InitializeComponent() Me.lblSelected = New System.Windows.Forms.Label() Me.lblVariate = New System.Windows.Forms.Label() - Me.ucrSelectorDummyVariable = New instat.ucrSelectorByDataFrameAddRemove() - Me.ucrVariateReceiver = New instat.ucrReceiverSingle() - Me.ucrReceiverFactor = New instat.ucrReceiverSingle() - Me.ucrBase = New instat.ucrButtons() Me.grpLevelOmitted = New System.Windows.Forms.GroupBox() Me.rdoLevelNumber = New System.Windows.Forms.RadioButton() Me.rdoLast = New System.Windows.Forms.RadioButton() Me.rdoFirst = New System.Windows.Forms.RadioButton() Me.rdoNone = New System.Windows.Forms.RadioButton() - Me.ucrPnlLevelOmitted = New instat.UcrPanel() Me.ucrChkWithXVariable = New instat.ucrCheck() + Me.ucrPnlLevelOmitted = New instat.UcrPanel() + Me.ucrSelectorDummyVariable = New instat.ucrSelectorByDataFrameAddRemove() + Me.ucrVariateReceiver = New instat.ucrReceiverSingle() + Me.ucrReceiverFactor = New instat.ucrReceiverSingle() + Me.ucrBase = New instat.ucrButtons() Me.grpLevelOmitted.SuspendLayout() Me.SuspendLayout() ' 'lblSelected ' Me.lblSelected.AutoSize = True - Me.lblSelected.Location = New System.Drawing.Point(258, 39) + Me.lblSelected.Location = New System.Drawing.Point(258, 45) Me.lblSelected.Name = "lblSelected" Me.lblSelected.Size = New System.Drawing.Size(90, 13) Me.lblSelected.TabIndex = 1 @@ -51,50 +51,13 @@ Partial Class dlgDummyVariables 'lblVariate ' Me.lblVariate.AutoSize = True - Me.lblVariate.Location = New System.Drawing.Point(252, 252) + Me.lblVariate.Location = New System.Drawing.Point(212, 211) Me.lblVariate.Name = "lblVariate" Me.lblVariate.Size = New System.Drawing.Size(43, 13) Me.lblVariate.TabIndex = 5 Me.lblVariate.Tag = "Variate" Me.lblVariate.Text = "Variate:" ' - 'ucrSelectorDummyVariable - ' - Me.ucrSelectorDummyVariable.bShowHiddenColumns = False - Me.ucrSelectorDummyVariable.bUseCurrentFilter = True - Me.ucrSelectorDummyVariable.Location = New System.Drawing.Point(10, 10) - Me.ucrSelectorDummyVariable.Margin = New System.Windows.Forms.Padding(0) - Me.ucrSelectorDummyVariable.Name = "ucrSelectorDummyVariable" - Me.ucrSelectorDummyVariable.Size = New System.Drawing.Size(210, 180) - Me.ucrSelectorDummyVariable.TabIndex = 0 - ' - 'ucrVariateReceiver - ' - Me.ucrVariateReceiver.frmParent = Me - Me.ucrVariateReceiver.Location = New System.Drawing.Point(298, 248) - Me.ucrVariateReceiver.Margin = New System.Windows.Forms.Padding(0) - Me.ucrVariateReceiver.Name = "ucrVariateReceiver" - Me.ucrVariateReceiver.Selector = Nothing - Me.ucrVariateReceiver.Size = New System.Drawing.Size(101, 20) - Me.ucrVariateReceiver.TabIndex = 6 - ' - 'ucrReceiverFactor - ' - Me.ucrReceiverFactor.frmParent = Me - Me.ucrReceiverFactor.Location = New System.Drawing.Point(258, 56) - Me.ucrReceiverFactor.Margin = New System.Windows.Forms.Padding(0) - Me.ucrReceiverFactor.Name = "ucrReceiverFactor" - Me.ucrReceiverFactor.Selector = Nothing - Me.ucrReceiverFactor.Size = New System.Drawing.Size(120, 20) - Me.ucrReceiverFactor.TabIndex = 2 - ' - 'ucrBase - ' - Me.ucrBase.Location = New System.Drawing.Point(10, 279) - Me.ucrBase.Name = "ucrBase" - Me.ucrBase.Size = New System.Drawing.Size(410, 52) - Me.ucrBase.TabIndex = 9 - ' 'grpLevelOmitted ' Me.grpLevelOmitted.Controls.Add(Me.rdoLevelNumber) @@ -104,8 +67,8 @@ Partial Class dlgDummyVariables Me.grpLevelOmitted.Controls.Add(Me.ucrPnlLevelOmitted) Me.grpLevelOmitted.Location = New System.Drawing.Point(258, 86) Me.grpLevelOmitted.Name = "grpLevelOmitted" - Me.grpLevelOmitted.Size = New System.Drawing.Size(102, 151) - Me.grpLevelOmitted.TabIndex = 14 + Me.grpLevelOmitted.Size = New System.Drawing.Size(120, 116) + Me.grpLevelOmitted.TabIndex = 3 Me.grpLevelOmitted.TabStop = False Me.grpLevelOmitted.Tag = "Level Omitted" Me.grpLevelOmitted.Text = "Level Omitted" @@ -113,10 +76,10 @@ Partial Class dlgDummyVariables 'rdoLevelNumber ' Me.rdoLevelNumber.AutoSize = True - Me.rdoLevelNumber.Location = New System.Drawing.Point(22, 114) + Me.rdoLevelNumber.Location = New System.Drawing.Point(11, 89) Me.rdoLevelNumber.Name = "rdoLevelNumber" Me.rdoLevelNumber.Size = New System.Drawing.Size(51, 17) - Me.rdoLevelNumber.TabIndex = 7 + Me.rdoLevelNumber.TabIndex = 4 Me.rdoLevelNumber.TabStop = True Me.rdoLevelNumber.Tag = "Level" Me.rdoLevelNumber.Text = "Level" @@ -125,10 +88,10 @@ Partial Class dlgDummyVariables 'rdoLast ' Me.rdoLast.AutoSize = True - Me.rdoLast.Location = New System.Drawing.Point(22, 85) + Me.rdoLast.Location = New System.Drawing.Point(11, 66) Me.rdoLast.Name = "rdoLast" Me.rdoLast.Size = New System.Drawing.Size(45, 17) - Me.rdoLast.TabIndex = 6 + Me.rdoLast.TabIndex = 3 Me.rdoLast.TabStop = True Me.rdoLast.Tag = "Last" Me.rdoLast.Text = "Last" @@ -137,10 +100,10 @@ Partial Class dlgDummyVariables 'rdoFirst ' Me.rdoFirst.AutoSize = True - Me.rdoFirst.Location = New System.Drawing.Point(22, 56) + Me.rdoFirst.Location = New System.Drawing.Point(11, 43) Me.rdoFirst.Name = "rdoFirst" Me.rdoFirst.Size = New System.Drawing.Size(44, 17) - Me.rdoFirst.TabIndex = 5 + Me.rdoFirst.TabIndex = 2 Me.rdoFirst.TabStop = True Me.rdoFirst.Tag = "First" Me.rdoFirst.Text = "First" @@ -149,35 +112,76 @@ Partial Class dlgDummyVariables 'rdoNone ' Me.rdoNone.AutoSize = True - Me.rdoNone.Location = New System.Drawing.Point(22, 27) + Me.rdoNone.Location = New System.Drawing.Point(11, 20) Me.rdoNone.Name = "rdoNone" Me.rdoNone.Size = New System.Drawing.Size(51, 17) - Me.rdoNone.TabIndex = 4 + Me.rdoNone.TabIndex = 1 Me.rdoNone.TabStop = True Me.rdoNone.Tag = "None" Me.rdoNone.Text = "None" Me.rdoNone.UseVisualStyleBackColor = True ' + 'ucrChkWithXVariable + ' + Me.ucrChkWithXVariable.Checked = False + Me.ucrChkWithXVariable.Location = New System.Drawing.Point(10, 211) + Me.ucrChkWithXVariable.Name = "ucrChkWithXVariable" + Me.ucrChkWithXVariable.Size = New System.Drawing.Size(128, 20) + Me.ucrChkWithXVariable.TabIndex = 4 + ' 'ucrPnlLevelOmitted ' Me.ucrPnlLevelOmitted.Location = New System.Drawing.Point(6, 16) Me.ucrPnlLevelOmitted.Name = "ucrPnlLevelOmitted" - Me.ucrPnlLevelOmitted.Size = New System.Drawing.Size(85, 129) + Me.ucrPnlLevelOmitted.Size = New System.Drawing.Size(108, 94) Me.ucrPnlLevelOmitted.TabIndex = 0 ' - 'ucrChkWithXVariable + 'ucrSelectorDummyVariable ' - Me.ucrChkWithXVariable.Checked = False - Me.ucrChkWithXVariable.Location = New System.Drawing.Point(12, 248) - Me.ucrChkWithXVariable.Name = "ucrChkWithXVariable" - Me.ucrChkWithXVariable.Size = New System.Drawing.Size(128, 20) - Me.ucrChkWithXVariable.TabIndex = 15 + Me.ucrSelectorDummyVariable.bShowHiddenColumns = False + Me.ucrSelectorDummyVariable.bUseCurrentFilter = True + Me.ucrSelectorDummyVariable.Location = New System.Drawing.Point(10, 10) + Me.ucrSelectorDummyVariable.Margin = New System.Windows.Forms.Padding(0) + Me.ucrSelectorDummyVariable.Name = "ucrSelectorDummyVariable" + Me.ucrSelectorDummyVariable.Size = New System.Drawing.Size(210, 180) + Me.ucrSelectorDummyVariable.TabIndex = 0 + ' + 'ucrVariateReceiver + ' + Me.ucrVariateReceiver.frmParent = Me + Me.ucrVariateReceiver.Location = New System.Drawing.Point(258, 208) + Me.ucrVariateReceiver.Margin = New System.Windows.Forms.Padding(0) + Me.ucrVariateReceiver.Name = "ucrVariateReceiver" + Me.ucrVariateReceiver.Selector = Nothing + Me.ucrVariateReceiver.Size = New System.Drawing.Size(120, 20) + Me.ucrVariateReceiver.strNcFilePath = "" + Me.ucrVariateReceiver.TabIndex = 6 + Me.ucrVariateReceiver.ucrSelector = Nothing + ' + 'ucrReceiverFactor + ' + Me.ucrReceiverFactor.frmParent = Me + Me.ucrReceiverFactor.Location = New System.Drawing.Point(258, 60) + Me.ucrReceiverFactor.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverFactor.Name = "ucrReceiverFactor" + Me.ucrReceiverFactor.Selector = Nothing + Me.ucrReceiverFactor.Size = New System.Drawing.Size(120, 20) + Me.ucrReceiverFactor.strNcFilePath = "" + Me.ucrReceiverFactor.TabIndex = 2 + Me.ucrReceiverFactor.ucrSelector = Nothing + ' + 'ucrBase + ' + Me.ucrBase.Location = New System.Drawing.Point(10, 237) + Me.ucrBase.Name = "ucrBase" + Me.ucrBase.Size = New System.Drawing.Size(410, 52) + Me.ucrBase.TabIndex = 7 ' 'dlgDummyVariables ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(415, 340) + Me.ClientSize = New System.Drawing.Size(419, 296) Me.Controls.Add(Me.ucrChkWithXVariable) Me.Controls.Add(Me.grpLevelOmitted) Me.Controls.Add(Me.ucrSelectorDummyVariable) diff --git a/instat/dlgDummyVariables.vb b/instat/dlgDummyVariables.vb index a5af98902d0..a7417e7bef1 100644 --- a/instat/dlgDummyVariables.vb +++ b/instat/dlgDummyVariables.vb @@ -19,7 +19,7 @@ Imports instat.Translations Public Class dlgDummyVariables Private bFirstLoad As Boolean = True Private bReset As Boolean = True - Private clsDummy As New RFunction + Private clsDummyFunction As New RFunction Private Sub dlgIndicatorVariable_Load(sender As Object, e As EventArgs) Handles MyBase.Load autoTranslate(Me) If bFirstLoad Then @@ -34,23 +34,18 @@ Public Class dlgDummyVariables TestOkEnabled() End Sub - Private Sub SetDefaults() - 'reset - ucrSelectorDummyVariable.Reset() - 'set default function - clsDummy.SetRCommand("dummy") - ucrBase.clsRsyntax.SetBaseRFunction(clsDummy) - ucrBase.clsRsyntax.SetAssignTo(strAssignToName:="dummy_vars", strTempDataframe:=ucrSelectorDummyVariable.ucrAvailableDataFrames.cboAvailableDataFrames.Text, bAssignToColumnWithoutNames:=True) - End Sub - - Public Sub InitialiseDialog() + Private Sub InitialiseDialog() ucrBase.iHelpTopicID = 41 + ucrChkWithXVariable.Enabled = False ' temporary + lblVariate.Enabled = False ' temporary + ucrVariateReceiver.Enabled = False ' temporary + grpLevelOmitted.Enabled = False ' temporary + 'Set Receiver + ucrReceiverFactor.SetParameter(New RParameter("x", 0)) ucrReceiverFactor.Selector = ucrSelectorDummyVariable - ucrVariateReceiver.Selector = ucrSelectorDummyVariable ucrReceiverFactor.SetMeAsReceiver() ucrReceiverFactor.SetIncludedDataTypes({"factor"}) - ucrReceiverFactor.SetParameter(New RParameter("x", 0)) ucrReceiverFactor.SetParameterIsRFunction() 'Set RadioBattons : Parameters yet to be set up @@ -61,23 +56,36 @@ Public Class dlgDummyVariables 'ucrPnlLevelOmitted.AddRadioButton(rdoLevelNumber, "") ucrPnlLevelOmitted.bAllowNonConditionValues = True 'currently disabled sice the functions and parameters are yet to be set - ucrChkWithXVariable.Enabled = False - lblVariate.Enabled = False - ucrVariateReceiver.Enabled = False - ucrChkWithXVariable.SetText("With X Variable") + ' ucrChkWithXVariable.SetParameter(New RParameter("")) - grpLevelOmitted.Enabled = False + ucrChkWithXVariable.SetText("With X Variable") - 'Note: This was not implemented (Additions of ucrInputColumns were added for appending new columns with prefix "dummy" ): Just added if incase it was to be added otherwise it can be deleted + 'ucrChkWithXVariable.AddToLinkedControls(ucrVariateReceiver, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedDisabledIfParameterMissing:=True) + 'ucrVariateReceiver.SetLinkedDisplayControl(lblVariate) + ucrVariateReceiver.Selector = ucrSelectorDummyVariable 'ucrSaveDummy.SetPrefix("dummy") 'ucrSaveDummy.SetSaveTypeAsColumn() 'ucrSaveDummy.SetDataFrameSelector(ucrSelectorDummyVariable.ucrAvailableDataFrames) 'ucrSaveDummy.SetCheckBoxText("Save Dummy:") 'ucrSaveDummy.SetIsComboBox() + End Sub - ' ucrChkWithXVariable.AddToLinkedControls(ucrVariateReceiver, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedDisabledIfParameterMissing:=True) - 'ucrVariateReceiver.SetLinkedDisplayControl(lblVariate) + Private Sub SetDefaults() + clsDummyFunction = New RFunction + + 'reset + ucrSelectorDummyVariable.Reset() + + 'set default function + clsDummyFunction.SetPackageName("dummies") + clsDummyFunction.SetRCommand("dummy") + ucrBase.clsRsyntax.SetBaseRFunction(clsDummyFunction) + ucrBase.clsRsyntax.SetAssignTo(strAssignToName:="dummy", strTempDataframe:=ucrSelectorDummyVariable.ucrAvailableDataFrames.cboAvailableDataFrames.Text, bAssignToColumnWithoutNames:=True) + End Sub + + Private Sub SetRCodeForControls(bReset As Boolean) + SetRCode(Me, ucrBase.clsRsyntax.clsBaseFunction, bReset) End Sub Private Sub TestOkEnabled() @@ -88,8 +96,10 @@ Public Class dlgDummyVariables End If End Sub - Private Sub SetRCodeForControls(bReset As Boolean) - SetRCode(Me, ucrBase.clsRsyntax.clsBaseFunction, bReset) + Private Sub ucrBase_ClickReset(sender As Object, e As EventArgs) Handles ucrBase.ClickReset + SetDefaults() + SetRCodeForControls(True) + TestOkEnabled() End Sub 'Private Sub SetMeAsReceiver() @@ -105,12 +115,6 @@ Public Class dlgDummyVariables ' SetReceiver() 'End Sub - Private Sub ucrBase_ClickReset(sender As Object, e As EventArgs) Handles ucrBase.ClickReset - SetDefaults() - SetRCodeForControls(True) - TestOkEnabled() - End Sub - Private Sub Controls_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrReceiverFactor.ControlContentsChanged, ucrChkWithXVariable.ControlContentsChanged, ucrVariateReceiver.ControlContentsChanged TestOkEnabled() End Sub From c8f63ac7a6dc1726e8abb1b070da857d9249f9dd Mon Sep 17 00:00:00 2001 From: Danny Parsons Date: Thu, 8 Jun 2017 21:21:03 +0100 Subject: [PATCH 142/154] themes working on boxplot dialog --- instat/dlgBoxPlot.vb | 8 +++++--- instat/dlgUseGraph.vb | 2 +- instat/sdgPlots.vb | 2 +- instat/sdgThemes.vb | 2 +- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/instat/dlgBoxPlot.vb b/instat/dlgBoxPlot.vb index e0d98710a0c..dd2eb7b74eb 100644 --- a/instat/dlgBoxPlot.vb +++ b/instat/dlgBoxPlot.vb @@ -29,6 +29,8 @@ Public Class dlgBoxplot Private clsYlabFunction As New RFunction Private clsXScalecontinuousFunction As New RFunction Private clsRFacetFunction As New RFunction + Private clsThemeFunction As New RFunction + Private dctThemeFunctions As Dictionary(Of String, RFunction) Private bResetSubdialog As Boolean = True Private Sub dlgBoxPlot_Load(sender As Object, e As EventArgs) Handles MyBase.Load @@ -144,8 +146,8 @@ Public Class dlgBoxplot clsXScalecontinuousFunction = GgplotDefaults.clsXScalecontinuousFunction.Clone() clsRFacetFunction = GgplotDefaults.clsFacetFunction.Clone() clsYlabFunction = GgplotDefaults.clsYlabTitleFunction.Clone - - + clsThemeFunction = GgplotDefaults.clsDefaultThemeFunction.Clone() + dctThemeFunctions = New Dictionary(Of String, RFunction)(GgplotDefaults.dctThemeFunctions) clsBaseOperator.SetAssignTo("last_graph", strTempDataframe:=ucrSelectorBoxPlot.ucrAvailableDataFrames.cboAvailableDataFrames.Text, strTempGraph:="last_graph") ucrBase.clsRsyntax.SetBaseROperator(clsBaseOperator) TempOptionsDisabledInMultipleVariablesCase() @@ -181,7 +183,7 @@ Public Class dlgBoxplot End Sub Private Sub cmdOptions_Click(sender As Object, e As EventArgs) Handles cmdOptions.Click - sdgPlots.SetRCode(clsBaseOperator, clsNewXScalecontinuousFunction:=clsXScalecontinuousFunction, clsNewXLabsTitleFunction:=clsXlabsFunction, clsNewYLabTitleFunction:=clsYlabFunction, clsNewLabsFunction:=clsLabsFunction, clsNewFacetFunction:=clsRFacetFunction, strNewDataFrame:=ucrSelectorBoxPlot.ucrAvailableDataFrames.cboAvailableDataFrames.Text, bReset:=bResetSubdialog) + sdgPlots.SetRCode(clsBaseOperator, clsNewXScalecontinuousFunction:=clsXScalecontinuousFunction, clsNewXLabsTitleFunction:=clsXlabsFunction, clsNewYLabTitleFunction:=clsYlabFunction, clsNewLabsFunction:=clsLabsFunction, clsNewFacetFunction:=clsRFacetFunction, clsNewThemeFunction:=clsThemeFunction, dctNewThemeFunctions:=dctThemeFunctions, strNewDataFrame:=ucrSelectorBoxPlot.ucrAvailableDataFrames.cboAvailableDataFrames.Text, bReset:=bResetSubdialog) sdgPlots.ShowDialog() bResetSubdialog = False End Sub diff --git a/instat/dlgUseGraph.vb b/instat/dlgUseGraph.vb index 492226b7beb..84e5e65f242 100644 --- a/instat/dlgUseGraph.vb +++ b/instat/dlgUseGraph.vb @@ -76,7 +76,7 @@ Public Class dlgUseGraph clsBaseOperator.SetOperation("+") clsBaseOperator.AddParameter("ggplot", clsRFunctionParameter:=clsUseGraphFunction, iPosition:=0) - clsBaseOperator.AddParameter(GgplotDefaults.clsDefaultTheme.Clone()) + clsBaseOperator.AddParameter(GgplotDefaults.clsDefaultThemeParameter.Clone()) clsXlabsFunction = GgplotDefaults.clsXlabTitleFunction.Clone() clsYlabsFunction = GgplotDefaults.clsYlabTitleFunction.Clone() clsLabsFunction = GgplotDefaults.clsDefaultLabs.Clone() diff --git a/instat/sdgPlots.vb b/instat/sdgPlots.vb index 43820cc0ff1..6c4a34687d6 100644 --- a/instat/sdgPlots.vb +++ b/instat/sdgPlots.vb @@ -212,7 +212,7 @@ Public Class sdgPlots clsXScalecontinuousFunction = clsNewXScalecontinuousFunction clsFacetFunction = clsNewFacetFunction clsThemeFunction = clsNewThemeFunction - dctThemeFunctions = GgplotDefaults.dctThemeFunctions + dctThemeFunctions = dctNewThemeFunctions If clsFacetFunction.ContainsParameter("facets") Then clsTempParam = clsFacetFunction.GetParameter("facets") diff --git a/instat/sdgThemes.vb b/instat/sdgThemes.vb index 4ada0ca5b87..1bb97fa1034 100644 --- a/instat/sdgThemes.vb +++ b/instat/sdgThemes.vb @@ -219,8 +219,8 @@ Public Class sdgThemes If Not bControlsInitialised Then InitialiseControls() End If - clsBaseOperator.AddParameter("theme", clsRFunctionParameter:=clsThemeFunction, iPosition:=15) clsThemeFunction = clsNewThemeFunction + clsBaseOperator.AddParameter("theme", clsRFunctionParameter:=clsThemeFunction, iPosition:=15) dctThemeFunctions = dctNewThemeFunctions dctThemeFunctions.TryGetValue("axis.text", clsElementTickText) From aff3c5299e8e218c70cd7a19df564b479f0b0ca1 Mon Sep 17 00:00:00 2001 From: shadrack kibet Date: Thu, 8 Jun 2017 23:37:22 +0300 Subject: [PATCH 143/154] package names addition --- instat/sdgPrincipalComponentAnalysis.vb | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/instat/sdgPrincipalComponentAnalysis.vb b/instat/sdgPrincipalComponentAnalysis.vb index aadd2ea9b35..423c961c326 100644 --- a/instat/sdgPrincipalComponentAnalysis.vb +++ b/instat/sdgPrincipalComponentAnalysis.vb @@ -95,13 +95,14 @@ Public Class sdgPrincipalComponentAnalysis 'Code for running Screeplot if it is selected in the "Graphics" tab Private Sub ScreePlot() clsRScreePlot.SetOperation("+") + clsRScreePlotFunction.SetPackageName("factoextra") clsRScreePlotFunction.SetRCommand("fviz_screeplot") clsRScreePlotFunction.AddParameter("X", clsRFunctionParameter:=dlgPrincipalComponentAnalysis.ucrBasePCA.clsRsyntax.clsBaseFunction) clsRScreePlotTheme.SetRCommand("theme_minimal") clsRScreePlot.SetOperatorParameter(True, clsRFunc:=clsRScreePlotFunction) clsRScreePlot.SetOperatorParameter(False, clsRFunc:=clsRScreePlotTheme) If chkPercentageScree.Checked Then - clsRScreePlotFunction.AddParameter("addlabels", "TRUE") + clsRScreePlotFunction.AddParameter("addlabels", "True") Else clsRScreePlotFunction.RemoveParameterByName("addlabels") End If @@ -111,20 +112,24 @@ Public Class sdgPrincipalComponentAnalysis 'Code for running Variables Plot if it is selected in the "Graphics" tab Private Sub VariablesPlot() clsRVariablesPlot.SetOperation("+") + clsRVariablesPlotFunction.SetPackageName("factoextra") clsRVariablesPlotFunction.SetRCommand("fviz_pca_var") clsRVariablesPlotFunction.AddParameter("X", clsRFunctionParameter:=dlgPrincipalComponentAnalysis.ucrBasePCA.clsRsyntax.clsBaseFunction) + clsRVariablesPlotTheme.SetPackageName("ggplot2") clsRVariablesPlotTheme.SetRCommand("theme_minimal") clsRVariablesPlot.SetOperatorParameter(True, clsRFunc:=clsRVariablesPlotFunction) clsRVariablesPlot.SetOperatorParameter(False, clsRFunc:=clsRVariablesPlotTheme) - clsRVariablesPlotFunction.AddParameter("axes", "c(" & nudDim1.Value & "," & nudDim2.Value & ")") + clsRVariablesPlotFunction.AddParameter("axes", "c(" & nudDim1.Value & ", " & nudDim2.Value & ")") frmMain.clsRLink.RunScript(clsRVariablesPlot.GetScript(), 3) End Sub 'Code for running Individuals Plot if it is selected in the "Graphics" tab Private Sub IndividualsPlot() clsRIndividualsPlot.SetOperation("+") + clsRIndividualsPlotFunction.SetPackageName("factoextra") clsRIndividualsPlotFunction.SetRCommand("fviz_pca_ind") clsRIndividualsPlotFunction.AddParameter("X", clsRFunctionParameter:=dlgPrincipalComponentAnalysis.ucrBasePCA.clsRsyntax.clsBaseFunction) + clsRIndividualsPlotTheme.SetPackageName("ggplot2") clsRIndividualsPlotTheme.SetRCommand("theme_minimal") clsRIndividualsPlot.SetOperatorParameter(True, clsRFunc:=clsRIndividualsPlotFunction) clsRIndividualsPlot.SetOperatorParameter(False, clsRFunc:=clsRIndividualsPlotTheme) @@ -135,8 +140,10 @@ Public Class sdgPrincipalComponentAnalysis 'Code for running Biplot if it is selected in the "Graphics" tab Private Sub Biplot() clsRBiplot.SetOperation("+") + clsRBiplotFunction.SetPackageName("factoextra") clsRBiplotFunction.SetRCommand("fviz_pca_biplot") clsRBiplotFunction.AddParameter("X", clsRFunctionParameter:=dlgPrincipalComponentAnalysis.ucrBasePCA.clsRsyntax.clsBaseFunction) + clsRBarPlotFunction.SetPackageName("ggplot") clsRBiplotTheme.SetRCommand("theme_minimal") clsRBiplot.SetOperatorParameter(True, clsRFunc:=clsRBiplotFunction) clsRBiplot.SetOperatorParameter(False, clsRFunc:=clsRBiplotTheme) @@ -153,15 +160,19 @@ Public Class sdgPrincipalComponentAnalysis clsRMelt.AddParameter("", clsRFunctionParameter:=clsREigenVectors) clsRFactor.AddParameter("factor_col", ucrReceiverFactor.GetVariableNames) clsRFactor.AddParameter("", clsRFunctionParameter:=clsRMelt) + clsRBarPlotFunction.SetPackageName("ggplot2") clsRBarPlotFunction.SetRCommand("ggplot") clsRBarPlotFunction.AddParameter("data", clsRFunctionParameter:=clsRFactor) + clsRBarPlotGeom.SetPackageName("ggplot2") clsRBarPlotGeom.SetRCommand("geom_bar") + clsRBarPlotAes.SetPackageName("ggplot2") clsRBarPlotAes.SetRCommand("aes") clsRBarPlotAes.AddParameter("x", "Var1") clsRBarPlotAes.AddParameter("y", "value") clsRBarPlotAes.AddParameter("fill", "factor_col") clsRBarPlotGeom.AddParameter("", clsRFunctionParameter:=clsRBarPlotAes) clsRBarPlotGeom.AddParameter("stat", Chr(34) & "identity" & Chr(34)) + clsRBarPlotFacet.SetPackageName("ggplot2") clsRBarPlotFacet.SetRCommand("facet_wrap") clsRBarPlotFacet.AddParameter("", "~Var2") clsRBarPlot0.AddParameter(iPosition:=0, clsRFunctionParameter:=clsRBarPlotFunction) From 85a3762d9953b5f56117c5e94a7667a02c1fd986 Mon Sep 17 00:00:00 2001 From: shadrack kibet Date: Fri, 9 Jun 2017 09:43:34 +0300 Subject: [PATCH 144/154] tiny edit --- instat/sdgPrincipalComponentAnalysis.vb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/instat/sdgPrincipalComponentAnalysis.vb b/instat/sdgPrincipalComponentAnalysis.vb index 423c961c326..0a2f7b67746 100644 --- a/instat/sdgPrincipalComponentAnalysis.vb +++ b/instat/sdgPrincipalComponentAnalysis.vb @@ -102,7 +102,7 @@ Public Class sdgPrincipalComponentAnalysis clsRScreePlot.SetOperatorParameter(True, clsRFunc:=clsRScreePlotFunction) clsRScreePlot.SetOperatorParameter(False, clsRFunc:=clsRScreePlotTheme) If chkPercentageScree.Checked Then - clsRScreePlotFunction.AddParameter("addlabels", "True") + clsRScreePlotFunction.AddParameter("addlabels", "TRUE") Else clsRScreePlotFunction.RemoveParameterByName("addlabels") End If From f0b2d83af763dc401ec8e1ecb741297e97a6fb81 Mon Sep 17 00:00:00 2001 From: Steven Date: Fri, 9 Jun 2017 11:41:34 +0300 Subject: [PATCH 145/154] Linking dlgBarAndPieChart --- instat/dlgBarAndPieChart.vb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/instat/dlgBarAndPieChart.vb b/instat/dlgBarAndPieChart.vb index 73afeabb589..56d4d39bbbf 100644 --- a/instat/dlgBarAndPieChart.vb +++ b/instat/dlgBarAndPieChart.vb @@ -165,7 +165,7 @@ Public Class dlgBarAndPieChart clsRFacetFunction = GgplotDefaults.clsFacetFunction.Clone() clsBaseOperator.AddParameter(GgplotDefaults.clsDefaultThemeParameter.Clone()) clsThemeFuction = GgplotDefaults.clsDefaultThemeFunction.Clone - dctThemeFunctions = GgplotDefaults.dctThemeFunctions + dctThemeFunctions = New Dictionary(Of String, RFunction)(GgplotDefaults.dctThemeFunctions) clsBaseOperator.SetAssignTo("last_graph", strTempDataframe:=ucrBarChartSelector.ucrAvailableDataFrames.cboAvailableDataFrames.Text, strTempGraph:="last_graph") ucrBase.clsRsyntax.SetBaseROperator(clsBaseOperator) End Sub @@ -199,7 +199,7 @@ Public Class dlgBarAndPieChart End Sub Private Sub cmdOptions_Click(sender As Object, e As EventArgs) Handles cmdOptions.Click - sdgPlots.SetRCode(clsNewOperator:=clsBaseOperator, clsNewThemeFunction:=clsThemeFuction, clsNewXScalecontinuousFunction:=clsXScalecontinuousFunction, clsNewXLabsTitleFunction:=clsXlabFunction, clsNewYLabTitleFunction:=clsYlabFunction, clsNewLabsFunction:=clsLabsFunction, clsNewFacetFunction:=clsRFacetFunction, strNewDataFrame:=ucrBarChartSelector.ucrAvailableDataFrames.cboAvailableDataFrames.Text, bReset:=bResetSubdialog) + sdgPlots.SetRCode(clsNewOperator:=clsBaseOperator, clsNewThemeFunction:=clsThemeFuction, dctNewThemeFunctions:=dctThemeFunctions, clsNewXScalecontinuousFunction:=clsXScalecontinuousFunction, clsNewXLabsTitleFunction:=clsXlabFunction, clsNewYLabTitleFunction:=clsYlabFunction, clsNewLabsFunction:=clsLabsFunction, clsNewFacetFunction:=clsRFacetFunction, strNewDataFrame:=ucrBarChartSelector.ucrAvailableDataFrames.cboAvailableDataFrames.Text, bReset:=bResetSubdialog) 'sdgPlots.SetDataFrame(strNewDataFrame:=ucrBarChartSelector.ucrAvailableDataFrames.cboAvailableDataFrames.Text) sdgPlots.ShowDialog() bResetSubdialog = False From cd735d2eda9541a1d7abd18cecad57e799b529d7 Mon Sep 17 00:00:00 2001 From: Steven Date: Fri, 9 Jun 2017 11:47:09 +0300 Subject: [PATCH 146/154] Linking LinePlot with SdgTheme --- instat/dlgLinePlot.vb | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/instat/dlgLinePlot.vb b/instat/dlgLinePlot.vb index eb7424759fd..19a0052f22a 100644 --- a/instat/dlgLinePlot.vb +++ b/instat/dlgLinePlot.vb @@ -27,7 +27,9 @@ Public Class dlgLinePlot Private clsXlabsFunction As New RFunction Private clsYlabFunction As New RFunction Private clsXScalecontinuousFunction As New RFunction - Private clsRFacetFunction As New RFunction + Private clsRFacetFunction As New RFunction + Private clsThemeFunction As New RFunction + Private dctThemeFunctions As New Dictionary(Of String, RFunction) Private bResetSubdialog As Boolean = True Private Sub dlgPlot_Load(sender As Object, e As EventArgs) Handles MyBase.Load @@ -126,6 +128,8 @@ Public Class dlgLinePlot clsLabsFunction = GgplotDefaults.clsDefaultLabs.Clone() clsXScalecontinuousFunction = GgplotDefaults.clsXScalecontinuousFunction.Clone() clsRFacetFunction = GgplotDefaults.clsFacetFunction.Clone() + dctThemeFunctions = New Dictionary(Of String, RFunction)(GgplotDefaults.dctThemeFunctions) + clsThemeFunction = GgplotDefaults.clsDefaultThemeFunction clsBaseOperator.RemoveParameterByName("geom_point") clsBaseOperator.SetAssignTo("last_graph", strTempDataframe:=ucrLinePlotSelector.ucrAvailableDataFrames.cboAvailableDataFrames.Text, strTempGraph:="last_graph") @@ -168,7 +172,7 @@ Public Class dlgLinePlot End Sub Private Sub cmdOptions_Click(sender As Object, e As EventArgs) Handles cmdOptions.Click - sdgPlots.SetRCode(clsBaseOperator, clsNewXScalecontinuousFunction:=clsXScalecontinuousFunction, clsNewXLabsTitleFunction:=clsXlabsFunction, clsNewYLabTitleFunction:=clsYlabFunction, clsNewLabsFunction:=clsLabsFunction, clsNewFacetFunction:=clsRFacetFunction, strNewDataFrame:=ucrLinePlotSelector.ucrAvailableDataFrames.cboAvailableDataFrames.Text, bReset:=bResetSubdialog) + sdgPlots.SetRCode(clsBaseOperator, clsNewXScalecontinuousFunction:=clsXScalecontinuousFunction, clsNewXLabsTitleFunction:=clsXlabsFunction, clsNewYLabTitleFunction:=clsYlabFunction, clsNewLabsFunction:=clsLabsFunction, clsNewFacetFunction:=clsRFacetFunction, clsNewThemeFunction:=clsThemeFunction, dctNewThemeFunctions:=dctThemeFunctions, strNewDataFrame:=ucrLinePlotSelector.ucrAvailableDataFrames.cboAvailableDataFrames.Text, bReset:=bResetSubdialog) ' sdgPlots.SetDataFrame(strNewDataFrame:=ucrLinePlotSelector.ucrAvailableDataFrames.cboAvailableDataFrames.Text) sdgPlots.ShowDialog() bResetSubdialog = False From 4391f9bbde24ae7e008a35e9575e29ef3102c16e Mon Sep 17 00:00:00 2001 From: Steven Date: Fri, 9 Jun 2017 11:53:20 +0300 Subject: [PATCH 147/154] Histogram --- instat/dlgHistogram.vb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/instat/dlgHistogram.vb b/instat/dlgHistogram.vb index 9b189874c35..266db3041ff 100644 --- a/instat/dlgHistogram.vb +++ b/instat/dlgHistogram.vb @@ -27,6 +27,8 @@ Public Class dlgHistogram Private clsYlabFunction As New RFunction Private clsXScalecontinuousFunction As New RFunction Private clsRFacetFunction As New RFunction + Private clsThemeFunction As New RFunction + Private dctThemeFunctions As New Dictionary(Of String, RFunction) Private bResetSubdialog As Boolean = True Private Sub dlgHistogram_Load(sender As Object, e As EventArgs) Handles MyBase.Load @@ -117,6 +119,8 @@ Public Class dlgHistogram clsLabsFunction = GgplotDefaults.clsDefaultLabs.Clone() clsXScalecontinuousFunction = GgplotDefaults.clsXScalecontinuousFunction.Clone() clsRFacetFunction = GgplotDefaults.clsFacetFunction.Clone() + dctThemeFunctions = New Dictionary(Of String, RFunction)(GgplotDefaults.dctThemeFunctions) + clsThemeFunction = GgplotDefaults.clsDefaultThemeFunction clsBaseOperator.SetAssignTo("last_graph", strTempDataframe:=ucrHistogramSelector.ucrAvailableDataFrames.cboAvailableDataFrames.Text, strTempGraph:="last_graph") ucrBase.clsRsyntax.SetBaseROperator(clsBaseOperator) @@ -160,7 +164,7 @@ Public Class dlgHistogram End Sub Private Sub cmdOptions_Click(sender As Object, e As EventArgs) Handles cmdOptions.Click - sdgPlots.SetRCode(clsBaseOperator, clsNewXScalecontinuousFunction:=clsXScalecontinuousFunction, clsNewXLabsTitleFunction:=clsXlabsFunction, clsNewYLabTitleFunction:=clsYlabFunction, clsNewLabsFunction:=clsLabsFunction, clsNewFacetFunction:=clsRFacetFunction, strNewDataFrame:=ucrHistogramSelector.ucrAvailableDataFrames.cboAvailableDataFrames.Text, bReset:=bResetSubdialog) + sdgPlots.SetRCode(clsBaseOperator, clsNewXScalecontinuousFunction:=clsXScalecontinuousFunction, clsNewXLabsTitleFunction:=clsXlabsFunction, clsNewYLabTitleFunction:=clsYlabFunction, clsNewLabsFunction:=clsLabsFunction, clsNewThemeFunction:=clsThemeFunction, dctNewThemeFunctions:=dctThemeFunctions, clsNewFacetFunction:=clsRFacetFunction, strNewDataFrame:=ucrHistogramSelector.ucrAvailableDataFrames.cboAvailableDataFrames.Text, bReset:=bResetSubdialog) sdgPlots.ShowDialog() bResetSubdialog = False End Sub From 69850a767dcc348b5167f3add202f2ef93f8baa3 Mon Sep 17 00:00:00 2001 From: Steven Date: Fri, 9 Jun 2017 12:16:09 +0300 Subject: [PATCH 148/154] Dot plot --- instat/dlgDotPlot.vb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/instat/dlgDotPlot.vb b/instat/dlgDotPlot.vb index f77e723fa4c..31bfd4bec2c 100644 --- a/instat/dlgDotPlot.vb +++ b/instat/dlgDotPlot.vb @@ -29,6 +29,8 @@ Public Class dlgDotPlot Private clsYlabFunction As New RFunction Private clsXScalecontinuousFunction As New RFunction Private clsRFacetFunction As New RFunction + Private clsThemeFunction As New RFunction + Private dctThemeFunctions As New Dictionary(Of String, RFunction) Private bResetSubdialog As Boolean = True 'strBinAxis stores the name of the axis along which the bins are made. Then strOtherAxis is the other axis (x or y) Private strBinAxis As String @@ -146,6 +148,8 @@ Public Class dlgDotPlot clsLabsFunction = GgplotDefaults.clsDefaultLabs.Clone() clsXScalecontinuousFunction = GgplotDefaults.clsXScalecontinuousFunction.Clone() clsRFacetFunction = GgplotDefaults.clsFacetFunction.Clone() + dctThemeFunctions = New Dictionary(Of String, RFunction)(GgplotDefaults.dctThemeFunctions) + clsThemeFunction = GgplotDefaults.clsDefaultThemeFunction clsBaseOperator.SetAssignTo("last_graph", strTempDataframe:=ucrDotPlotSelector.ucrAvailableDataFrames.cboAvailableDataFrames.Text, strTempGraph:="last_graph") ucrBase.clsRsyntax.SetBaseROperator(clsBaseOperator) @@ -192,7 +196,7 @@ Public Class dlgDotPlot End Sub Private Sub cmdOptions_Click(sender As Object, e As EventArgs) Handles cmdOptions.Click - sdgPlots.SetRCode(clsBaseOperator, clsNewXScalecontinuousFunction:=clsXScalecontinuousFunction, clsNewXLabsTitleFunction:=clsXlabsFunction, clsNewYLabTitleFunction:=clsYlabFunction, clsNewLabsFunction:=clsLabsFunction, clsNewFacetFunction:=clsRFacetFunction, strNewDataFrame:=ucrDotPlotSelector.ucrAvailableDataFrames.cboAvailableDataFrames.Text, bReset:=bResetSubdialog) + sdgPlots.SetRCode(clsBaseOperator, clsNewXScalecontinuousFunction:=clsXScalecontinuousFunction, clsNewXLabsTitleFunction:=clsXlabsFunction, clsNewYLabTitleFunction:=clsYlabFunction, clsNewLabsFunction:=clsLabsFunction, clsNewFacetFunction:=clsRFacetFunction, clsNewThemeFunction:=clsThemeFunction, dctNewThemeFunctions:=dctThemeFunctions, strNewDataFrame:=ucrDotPlotSelector.ucrAvailableDataFrames.cboAvailableDataFrames.Text, bReset:=bResetSubdialog) sdgPlots.ShowDialog() bResetSubdialog = False End Sub From 81bcae541d0c1c9a87072ac009d73db8a8f8ed95 Mon Sep 17 00:00:00 2001 From: Steven Date: Fri, 9 Jun 2017 12:18:52 +0300 Subject: [PATCH 149/154] Rugplot --- instat/dlgRugPlot.vb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/instat/dlgRugPlot.vb b/instat/dlgRugPlot.vb index 6622526ed6d..d2616b1d211 100644 --- a/instat/dlgRugPlot.vb +++ b/instat/dlgRugPlot.vb @@ -28,6 +28,8 @@ Public Class dlgRugPlot Private clsYlabFunction As New RFunction Private clsXScalecontinuousFunction As New RFunction Private clsRFacetFunction As New RFunction + Private clsThemeFunction As New RFunction + Private dctThemeFunctions As New Dictionary(Of String, RFunction) Private Sub dlgRugPlot_Load(sender As Object, e As EventArgs) Handles MyBase.Load If bFirstLoad Then @@ -110,6 +112,8 @@ Public Class dlgRugPlot clsXScalecontinuousFunction = GgplotDefaults.clsXScalecontinuousFunction.Clone() clsRFacetFunction = GgplotDefaults.clsFacetFunction.Clone() clsYlabFunction = GgplotDefaults.clsYlabTitleFunction.Clone + dctThemeFunctions = New Dictionary(Of String, RFunction)(GgplotDefaults.dctThemeFunctions) + clsThemeFunction = GgplotDefaults.clsDefaultThemeFunction clsBaseOperator.SetAssignTo("last_graph", strTempDataframe:=ucrRugPlotSelector.ucrAvailableDataFrames.cboAvailableDataFrames.Text, strTempGraph:="last_graph") ucrBase.clsRsyntax.SetBaseROperator(clsBaseOperator) @@ -145,7 +149,7 @@ Public Class dlgRugPlot End Sub Private Sub cmdOptions_Click(sender As Object, e As EventArgs) Handles cmdOptions.Click - sdgPlots.SetRCode(clsBaseOperator, clsNewXScalecontinuousFunction:=clsXScalecontinuousFunction, clsNewXLabsTitleFunction:=clsXlabsFunction, clsNewYLabTitleFunction:=clsYlabFunction, clsNewLabsFunction:=clsLabsFunction, clsNewFacetFunction:=clsRFacetFunction, strNewDataFrame:=ucrRugPlotSelector.ucrAvailableDataFrames.cboAvailableDataFrames.Text, bReset:=bResetSubdialog) + sdgPlots.SetRCode(clsBaseOperator, clsNewXScalecontinuousFunction:=clsXScalecontinuousFunction, clsNewXLabsTitleFunction:=clsXlabsFunction, clsNewYLabTitleFunction:=clsYlabFunction, clsNewLabsFunction:=clsLabsFunction, clsNewFacetFunction:=clsRFacetFunction, clsNewThemeFunction:=clsThemeFunction, dctNewThemeFunctions:=dctThemeFunctions, strNewDataFrame:=ucrRugPlotSelector.ucrAvailableDataFrames.cboAvailableDataFrames.Text, bReset:=bResetSubdialog) sdgPlots.ShowDialog() bResetSubdialog = False End Sub From dc98d044278ac91f4ae218d424c07829792df824 Mon Sep 17 00:00:00 2001 From: Danny Parsons Date: Fri, 9 Jun 2017 11:18:25 +0100 Subject: [PATCH 150/154] added checks for setting item in ucrColours --- instat/ucrColors.vb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/instat/ucrColors.vb b/instat/ucrColors.vb index 2521b5ac8b5..dc32c14d265 100644 --- a/instat/ucrColors.vb +++ b/instat/ucrColors.vb @@ -36,7 +36,9 @@ Public Class ucrColors dctColours.Add("Brown", Chr(34) & "brown" & Chr(34)) dctColours.Add("Pink", Chr(34) & "pink" & Chr(34)) End If - SetItems(dctColours) + If GetParameter() IsNot Nothing Then + SetItems(dctColours) + End If bAllowNonConditionValues = True End Sub From 13e193845ed4c021eca4cf47b7e9e5f4d25a824a Mon Sep 17 00:00:00 2001 From: Lily Date: Fri, 9 Jun 2017 11:30:21 +0100 Subject: [PATCH 151/154] Adding package utils --- instat/dlgFromLibrary.vb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/instat/dlgFromLibrary.vb b/instat/dlgFromLibrary.vb index de6ca7486d0..90ff0112bfc 100644 --- a/instat/dlgFromLibrary.vb +++ b/instat/dlgFromLibrary.vb @@ -45,6 +45,7 @@ Public Class dlgFromLibrary Private Sub InitialiseDialog() ucrBase.iHelpTopicID = 156 'fills the combo box + clsDataFunction.SetPackageName("utils") clsDataFunction.SetRCommand("data") FillPackagesCombo() End Sub @@ -167,6 +168,7 @@ Public Class dlgFromLibrary Private Sub cmdHelp_Click(sender As Object, e As EventArgs) Handles cmdHelp.Click Dim clsHelp As New RFunction + clsHelp.SetPackageName("utils") clsHelp.SetRCommand("help") clsHelp.AddParameter("topic", Chr(34) & lstCollection.SelectedItems(0).Text & Chr(34)) clsHelp.AddParameter("package", Chr(34) & cboPackages.SelectedItem & Chr(34)) From fffbaeac4b8d1ed1503586906ce057a52c897ee5 Mon Sep 17 00:00:00 2001 From: Lily Date: Fri, 9 Jun 2017 11:47:02 +0100 Subject: [PATCH 152/154] packages --- instat/dlgExportToCPT.vb | 3 ++- instat/dlgNewMarkovChains.vb | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/instat/dlgExportToCPT.vb b/instat/dlgExportToCPT.vb index 2400c951eb5..08fd2aabf16 100644 --- a/instat/dlgExportToCPT.vb +++ b/instat/dlgExportToCPT.vb @@ -42,7 +42,8 @@ Public Class dlgExportToCPT ucrLocationDataFrame.Reset() ucrReceiverYears.SetMeAsReceiver() ucrChkLong.Checked = True - clsDefaultFunction.SetRCommand("rio::export") + clsDefaultFunction.SetPackageName("rio") + clsDefaultFunction.SetRCommand("export") clsDefaultFunction.AddParameter("x", clsRFunctionParameter:=clsOutput) clsDefaultFunction.AddParameter("sep", Chr(34) & "\t" & Chr(34)) clsDefaultFunction.AddParameter("quote", "FALSE") diff --git a/instat/dlgNewMarkovChains.vb b/instat/dlgNewMarkovChains.vb index 799c363eac9..29c48113655 100644 --- a/instat/dlgNewMarkovChains.vb +++ b/instat/dlgNewMarkovChains.vb @@ -164,6 +164,7 @@ Public Class dlgNewMarkovChains Dim strHarmonic As String = "" 'Calculating RainDay + clsLagCombineFunction.SetPackageName("stringr") clsLagCombineFunction.SetRCommand("str_c") clsGreplFunction.SetRCommand("grepl") clsGreplFunction.AddParameter("pattern", Chr(39) & "NA" & Chr(39)) From 6bf211ef24606cb2dc81096bdb5687163e31dc32 Mon Sep 17 00:00:00 2001 From: Lily Date: Fri, 9 Jun 2017 12:52:20 +0100 Subject: [PATCH 153/154] packages --- instat/dlgPopulationPyramids.vb | 8 ++++++++ instat/dlgUnstack.vb | 1 + 2 files changed, 9 insertions(+) diff --git a/instat/dlgPopulationPyramids.vb b/instat/dlgPopulationPyramids.vb index ad067828c8f..95068df5016 100644 --- a/instat/dlgPopulationPyramids.vb +++ b/instat/dlgPopulationPyramids.vb @@ -37,18 +37,26 @@ Public Class dlgPopulationPyramids Private Sub InitialiseDialog() ucrBase.iHelpTopicID = 455 ucrBase.clsRsyntax.SetOperation("+") + + clsRggplotFunction.SetPackageName("ggplot") clsRggplotFunction.SetRCommand("ggplot") + + clsRaesFunction.SetPackageName("ggplot") clsRaesFunction.SetRCommand("aes") clsRggplotFunction.AddParameter("mapping", clsRFunctionParameter:=clsRaesFunction) ucrBase.clsRsyntax.SetOperatorParameter(True, clsRFunc:=clsRggplotFunction) + + clsRgeom_bar.SetPackageName("ggplot") clsRgeom_bar.SetRCommand("geom_bar") clsRgeom_bar.AddParameter("stat", Chr(34) & "identity" & Chr(34)) ucrBase.clsRsyntax.SetOperatorParameter(False, clsRFunc:=clsRgeom_bar) + clsRgeom_bar2.SetPackageName("ggplot") clsRgeom_bar2.SetRCommand("geom_bar") clsRgeom_bar2.AddParameter("stat", Chr(34) & "identity" & Chr(34)) ucrBase.clsRsyntax.AddOperatorParameter("geom_bar", clsRFunc:=clsRgeom_bar) + clsRgeom_CoordFlip.SetPackageName("ggplot") clsRgeom_CoordFlip.SetRCommand("coord_flip") ucrBase.clsRsyntax.AddOperatorParameter("coord_flip", "coord_flip") diff --git a/instat/dlgUnstack.vb b/instat/dlgUnstack.vb index db1d43094e8..6dcae2a4476 100644 --- a/instat/dlgUnstack.vb +++ b/instat/dlgUnstack.vb @@ -37,6 +37,7 @@ Public Class dlgUnstack Private Sub InitialiseDialog() ucrFactorToUnstackReceiver.Selector = ucrSelectorForunstack ucrColumnToUnstackReceiver.Selector = ucrSelectorForunstack + ucrBase.clsRsyntax.SetPackageName("reshape2") ucrBase.clsRsyntax.SetFunction("dcast") ucrFactorToUnstackReceiver.SetMeAsReceiver() ucrBase.iHelpTopicID = 58 From 75690cb50f2c27b6b66acbc86e0ffc24305735eb Mon Sep 17 00:00:00 2001 From: Danny Parsons Date: Fri, 9 Jun 2017 13:26:24 +0100 Subject: [PATCH 154/154] fixed bug in setting panel value --- instat/UcrPanel.vb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/instat/UcrPanel.vb b/instat/UcrPanel.vb index 79f47f56933..25ff7a4a3f5 100644 --- a/instat/UcrPanel.vb +++ b/instat/UcrPanel.vb @@ -77,6 +77,7 @@ Public Class UcrPanel Protected Overrides Sub SetToValue(objTemp As Object) Dim rdoTemp As RadioButton + If objTemp IsNot Nothing Then If TypeOf objTemp Is RadioButton Then rdoTemp = DirectCast(objTemp, RadioButton) @@ -86,7 +87,10 @@ Public Class UcrPanel End If Else 'If no value reset to a default value - dctRadioButtonValues.Keys(0).Checked = True + If pnlRadios.Controls.Count > 0 AndAlso TypeOf pnlRadios.Controls(0) Is RadioButton Then + rdoTemp = DirectCast(pnlRadios.Controls(0), RadioButton) + rdoTemp.Checked = True + End If End If End Sub