From 10778195b436514e133c753f5a977ba608852c73 Mon Sep 17 00:00:00 2001 From: FrancoisJRenaud Date: Wed, 23 Nov 2016 11:41:38 +0300 Subject: [PATCH 1/8] solving some bugs in the partially mandatory aes filling method and adding stat = identity method --- instat/sdgLayerOptions.vb | 56 ++++++++++++++++++++++++++------------- 1 file changed, 38 insertions(+), 18 deletions(-) diff --git a/instat/sdgLayerOptions.vb b/instat/sdgLayerOptions.vb index 9f688562c88..2f79675ad7c 100644 --- a/instat/sdgLayerOptions.vb +++ b/instat/sdgLayerOptions.vb @@ -76,7 +76,25 @@ Public Class sdgLayerOptions 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). + If clsGeomFunction.strRCommand = "geom_boxplot" OrElse clsGeomFunction.strRCommand = "geom_dotplot" Then + If clsAesFunction.clsParameters.FindIndex(Function(x) x.strArgumentName = "x") = -1 AndAlso ucrGeomWithAes.clsGeomAesFunction.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 AndAlso ucrGeomWithAes.clsGeomAesFunction.clsParameters.FindIndex(Function(x) x.strArgumentName = "x") = -1 Then + clsRelevantAesFunction.AddParameter("x", Chr(34) & Chr(34)) + ElseIf clsAesFunction.clsParameters.FindIndex(Function(x) x.strArgumentName = "y") = -1 AndAlso ucrGeomWithAes.clsGeomAesFunction.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.clsGeomAesFunction.clsParameters @@ -93,7 +111,7 @@ Public Class sdgLayerOptions '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 dggLayerOptions 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. + 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()) Else @@ -105,28 +123,30 @@ Public Class sdgLayerOptions clsGeomFunction.RemoveParameterByName("data") End If End If + + 'Partially mandatory aes filling method + If ucrGeomWithAes.chkApplyOnAllLayers.Checked Then + PartiallyMandatoryAesFillingMethod(clsAesFunction) + ElseIf clsGeomFunction.clsParameters.FindIndex(Function(x) x.strArgumentName = "mapping") <> -1 Then + PartiallyMandatoryAesFillingMethod(clsGeomFunction.clsParameters.Find(Function(x) x.strArgumentName = "mapping").clsArgumentFunction) + 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.clsGeomAesFunction.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)) - End If - If clsGeomFunction.clsParameters.FindIndex(Function(x) x.strArgumentName = "stat") <> -1 Then - If ucrGeomWithAes.clsGeomAesFunction.clsParameters.FindIndex(Function(x) x.strArgumentName = "y") Then - ucrGeomWithAes.clsGeomAesFunction.RemoveParameterByName("stat") - ElseIf clsAesFunction.clsParameters.FindIndex(Function(x) x.strArgumentName = "y") = -1 Then - clsAesFunction.RemoveParameterByName("stat") - End If - End If - ElseIf clsGeomFunction.strRCommand = "geom_boxplot" OrElse clsGeomFunction.strRCommand = "geom_dotplot" Then - If clsAesFunction.clsParameters.FindIndex(Function(x) x.strArgumentName = "x") = -1 AndAlso ucrGeomWithAes.clsGeomAesFunction.clsParameters.FindIndex(Function(x) x.strArgumentName = "x") = -1 Then - clsAesFunction.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 AndAlso ucrGeomWithAes.clsGeomAesFunction.clsParameters.FindIndex(Function(x) x.strArgumentName = "x") = -1 Then - clsAesFunction.AddParameter("x", Chr(34) & Chr(34)) - ElseIf clsAesFunction.clsParameters.FindIndex(Function(x) x.strArgumentName = "y") = -1 AndAlso ucrGeomWithAes.clsGeomAesFunction.clsParameters.FindIndex(Function(x) x.strArgumentName = "y") = -1 Then - clsAesFunction.AddParameter("y", Chr(34) & Chr(34)) + 'In case the "y" mapping has been removed after editing the layer, the added "stat" parameter should be removed, unless it has ben set using the settings on sdgLayerParameters. + ElseIf ucrLayerParameter.lstLayerParameterControl.FindIndex(Function(x) x.ucrReceiverMetadataProperty.clsLayerParam.strLayerParameterName = "stat") <> -1 AndAlso Not ucrLayerParameter.lstLayerParameterControl.Find(Function(x) x.ucrReceiverMetadataProperty.clsLayerParam.strLayerParameterName = "stat").chkParamName.Checked Then + clsGeomFunction.RemoveParameterByName("stat") End If End If + End Sub End Class \ No newline at end of file From da5587c98dec5937e00af551b55baad30f55d17b Mon Sep 17 00:00:00 2001 From: FrancoisJRenaud Date: Wed, 23 Nov 2016 11:54:38 +0300 Subject: [PATCH 2/8] edit to include ignore global aes case --- instat/sdgLayerOptions.vb | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/instat/sdgLayerOptions.vb b/instat/sdgLayerOptions.vb index 2f79675ad7c..f3b1bb972a0 100644 --- a/instat/sdgLayerOptions.vb +++ b/instat/sdgLayerOptions.vb @@ -78,14 +78,16 @@ Public Class sdgLayerOptions 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 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.clsGeomAesFunction.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 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.clsGeomAesFunction.clsParameters.FindIndex(Function(x) x.strArgumentName = "x") = -1 Then clsRelevantAesFunction.AddParameter("x", Chr(34) & Chr(34)) - ElseIf clsAesFunction.clsParameters.FindIndex(Function(x) x.strArgumentName = "y") = -1 AndAlso ucrGeomWithAes.clsGeomAesFunction.clsParameters.FindIndex(Function(x) x.strArgumentName = "y") = -1 Then + ElseIf (clsAesFunction.clsParameters.FindIndex(Function(x) x.strArgumentName = "y") = -1 OrElse bTempIgnoreGlobalAes) AndAlso ucrGeomWithAes.clsGeomAesFunction.clsParameters.FindIndex(Function(x) x.strArgumentName = "y") = -1 Then clsRelevantAesFunction.AddParameter("y", Chr(34) & Chr(34)) End If End If From c1f9cd8131ac67f6aa0cbc01534ecb5f825af348 Mon Sep 17 00:00:00 2001 From: FrancoisJRenaud Date: Wed, 23 Nov 2016 12:11:30 +0300 Subject: [PATCH 3/8] edits and comments after testing --- instat/sdgLayerOptions.vb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/instat/sdgLayerOptions.vb b/instat/sdgLayerOptions.vb index f3b1bb972a0..d9fd26936b0 100644 --- a/instat/sdgLayerOptions.vb +++ b/instat/sdgLayerOptions.vb @@ -87,7 +87,8 @@ Public Class sdgLayerOptions 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 clsRelevantAesFunction.AddParameter("x", Chr(34) & Chr(34)) - ElseIf (clsAesFunction.clsParameters.FindIndex(Function(x) x.strArgumentName = "y") = -1 OrElse bTempIgnoreGlobalAes) AndAlso ucrGeomWithAes.clsGeomAesFunction.clsParameters.FindIndex(Function(x) x.strArgumentName = "y") = -1 Then + 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 clsRelevantAesFunction.AddParameter("y", Chr(34) & Chr(34)) End If End If @@ -129,6 +130,8 @@ Public Class sdgLayerOptions '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. ElseIf clsGeomFunction.clsParameters.FindIndex(Function(x) x.strArgumentName = "mapping") <> -1 Then PartiallyMandatoryAesFillingMethod(clsGeomFunction.clsParameters.Find(Function(x) x.strArgumentName = "mapping").clsArgumentFunction) Else From 3b41bbbdee8e44474fd3628d9f1c085c3e634b0f Mon Sep 17 00:00:00 2001 From: FrancoisJRenaud Date: Wed, 23 Nov 2016 12:27:05 +0300 Subject: [PATCH 4/8] added comment on stat = identity method to add message for user... --- instat/sdgLayerOptions.vb | 1 + 1 file changed, 1 insertion(+) diff --git a/instat/sdgLayerOptions.vb b/instat/sdgLayerOptions.vb index d9fd26936b0..d3f3a169bcc 100644 --- a/instat/sdgLayerOptions.vb +++ b/instat/sdgLayerOptions.vb @@ -147,6 +147,7 @@ Public Class sdgLayerOptions '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 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 be removed, unless it has ben set using the settings on sdgLayerParameters. ElseIf ucrLayerParameter.lstLayerParameterControl.FindIndex(Function(x) x.ucrReceiverMetadataProperty.clsLayerParam.strLayerParameterName = "stat") <> -1 AndAlso Not ucrLayerParameter.lstLayerParameterControl.Find(Function(x) x.ucrReceiverMetadataProperty.clsLayerParam.strLayerParameterName = "stat").chkParamName.Checked Then clsGeomFunction.RemoveParameterByName("stat") From c0211a92a88af88597693da167a07b7eafe2a106 Mon Sep 17 00:00:00 2001 From: FrancoisJRenaud Date: Wed, 23 Nov 2016 12:33:06 +0300 Subject: [PATCH 5/8] deleted obsolete comment --- instat/sdgLayerOptions.vb | 2 -- 1 file changed, 2 deletions(-) diff --git a/instat/sdgLayerOptions.vb b/instat/sdgLayerOptions.vb index d3f3a169bcc..a000cb51adc 100644 --- a/instat/sdgLayerOptions.vb +++ b/instat/sdgLayerOptions.vb @@ -68,8 +68,6 @@ Public Class sdgLayerOptions 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... - 'Warning: when coming back to a layer where the geom was not fixed, the geom is now fixed... - 'Task: should be written as an issue End Sub Public Function TestForOKEnabled() As Boolean From d17398bd11a7a6b8a5d2a10ad0e990fb10293d12 Mon Sep 17 00:00:00 2001 From: FrancoisJRenaud Date: Wed, 23 Nov 2016 12:36:17 +0300 Subject: [PATCH 6/8] added warning for the specific plots case: linking issue again --- instat/sdgLayerOptions.vb | 1 + 1 file changed, 1 insertion(+) diff --git a/instat/sdgLayerOptions.vb b/instat/sdgLayerOptions.vb index a000cb51adc..68ea018c82f 100644 --- a/instat/sdgLayerOptions.vb +++ b/instat/sdgLayerOptions.vb @@ -130,6 +130,7 @@ Public Class sdgLayerOptions 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").clsArgumentFunction) Else From bb7f5a4467057a53ebfcb710a3f769a778c0af43 Mon Sep 17 00:00:00 2001 From: FrancoisJRenaud Date: Fri, 25 Nov 2016 14:22:05 +0300 Subject: [PATCH 7/8] Don't need the remove stat=identity in the "adding stat=identity" method. + insist on need to warn the user of these kind of procedures... --- instat/sdgLayerOptions.vb | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/instat/sdgLayerOptions.vb b/instat/sdgLayerOptions.vb index 68ea018c82f..578703a43bd 100644 --- a/instat/sdgLayerOptions.vb +++ b/instat/sdgLayerOptions.vb @@ -147,9 +147,7 @@ Public Class sdgLayerOptions 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 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 be removed, unless it has ben set using the settings on sdgLayerParameters. - ElseIf ucrLayerParameter.lstLayerParameterControl.FindIndex(Function(x) x.ucrReceiverMetadataProperty.clsLayerParam.strLayerParameterName = "stat") <> -1 AndAlso Not ucrLayerParameter.lstLayerParameterControl.Find(Function(x) x.ucrReceiverMetadataProperty.clsLayerParam.strLayerParameterName = "stat").chkParamName.Checked Then - clsGeomFunction.RemoveParameterByName("stat") + '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 From f261b4338696487d795760537572d1957a87f752 Mon Sep 17 00:00:00 2001 From: Danny Parsons Date: Tue, 29 Nov 2016 12:23:08 +0000 Subject: [PATCH 8/8] added new controls for dialog linking and modified some controls to inherit from ucrCore --- instat/instat.vbproj | 24 +++++++ instat/ucrCheck.Designer.vb | 50 ++++++++++++++ instat/ucrCheck.resx | 120 +++++++++++++++++++++++++++++++++ instat/ucrCheck.vb | 3 + instat/ucrCore.Designer.vb | 29 ++++++++ instat/ucrCore.vb | 3 + instat/ucrInput.Designer.vb | 2 +- instat/ucrRadio.Designer.vb | 51 ++++++++++++++ instat/ucrRadio.resx | 120 +++++++++++++++++++++++++++++++++ instat/ucrRadio.vb | 3 + instat/ucrReceiver.Designer.vb | 2 +- 11 files changed, 405 insertions(+), 2 deletions(-) create mode 100644 instat/ucrCheck.Designer.vb create mode 100644 instat/ucrCheck.resx create mode 100644 instat/ucrCheck.vb create mode 100644 instat/ucrCore.Designer.vb create mode 100644 instat/ucrCore.vb create mode 100644 instat/ucrRadio.Designer.vb create mode 100644 instat/ucrRadio.resx create mode 100644 instat/ucrRadio.vb diff --git a/instat/instat.vbproj b/instat/instat.vbproj index a2413d1611f..b4ae0a66665 100644 --- a/instat/instat.vbproj +++ b/instat/instat.vbproj @@ -926,12 +926,24 @@ UserControl + + ucrCheck.vb + + + UserControl + ucrColors.vb UserControl + + ucrCore.vb + + + UserControl + ucrDialogDisabled.vb @@ -1828,6 +1840,12 @@ UserControl + + ucrRadio.vb + + + UserControl + ucrReceiver.vb @@ -4063,6 +4081,9 @@ ucrButtonsSubdialogue.vb + + ucrCheck.vb + ucrColors.vb @@ -4234,6 +4255,9 @@ ucrNewColumnName.vb + + ucrRadio.vb + ucrReceiverExpression.vb diff --git a/instat/ucrCheck.Designer.vb b/instat/ucrCheck.Designer.vb new file mode 100644 index 00000000000..2e8a2d3e0bc --- /dev/null +++ b/instat/ucrCheck.Designer.vb @@ -0,0 +1,50 @@ + _ +Partial Class ucrCheck + 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.chkCheck = New System.Windows.Forms.CheckBox() + Me.SuspendLayout() + ' + 'chkCheck + ' + Me.chkCheck.Dock = System.Windows.Forms.DockStyle.Fill + Me.chkCheck.Location = New System.Drawing.Point(0, 0) + Me.chkCheck.Name = "chkCheck" + Me.chkCheck.Size = New System.Drawing.Size(100, 20) + Me.chkCheck.TabIndex = 0 + Me.chkCheck.Text = "CheckBox1" + Me.chkCheck.UseVisualStyleBackColor = True + ' + 'ucrCheck + ' + Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) + Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.Controls.Add(Me.chkCheck) + Me.Name = "ucrCheck" + Me.Size = New System.Drawing.Size(100, 20) + Me.ResumeLayout(False) + + End Sub + + Friend WithEvents chkCheck As CheckBox +End Class diff --git a/instat/ucrCheck.resx b/instat/ucrCheck.resx new file mode 100644 index 00000000000..1af7de150c9 --- /dev/null +++ b/instat/ucrCheck.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/ucrCheck.vb b/instat/ucrCheck.vb new file mode 100644 index 00000000000..de576996385 --- /dev/null +++ b/instat/ucrCheck.vb @@ -0,0 +1,3 @@ +Public Class ucrCheck + +End Class diff --git a/instat/ucrCore.Designer.vb b/instat/ucrCore.Designer.vb new file mode 100644 index 00000000000..0a72d30bc88 --- /dev/null +++ b/instat/ucrCore.Designer.vb @@ -0,0 +1,29 @@ + _ +Partial Class ucrCore + 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() + components = New System.ComponentModel.Container() + Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + End Sub + +End Class diff --git a/instat/ucrCore.vb b/instat/ucrCore.vb new file mode 100644 index 00000000000..90f491c4287 --- /dev/null +++ b/instat/ucrCore.vb @@ -0,0 +1,3 @@ +Public Class ucrCore + +End Class diff --git a/instat/ucrInput.Designer.vb b/instat/ucrInput.Designer.vb index 5b56ddd0c75..2b7c33e3b05 100644 --- a/instat/ucrInput.Designer.vb +++ b/instat/ucrInput.Designer.vb @@ -1,6 +1,6 @@  _ Partial Class ucrInput - Inherits System.Windows.Forms.UserControl + Inherits instat.ucrCore 'UserControl overrides dispose to clean up the component list. _ diff --git a/instat/ucrRadio.Designer.vb b/instat/ucrRadio.Designer.vb new file mode 100644 index 00000000000..5c572e30df2 --- /dev/null +++ b/instat/ucrRadio.Designer.vb @@ -0,0 +1,51 @@ + _ +Partial Class ucrRadio + 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.rdoRadio = New System.Windows.Forms.RadioButton() + Me.SuspendLayout() + ' + 'rdoRadio + ' + Me.rdoRadio.Dock = System.Windows.Forms.DockStyle.Fill + Me.rdoRadio.Location = New System.Drawing.Point(0, 0) + Me.rdoRadio.Name = "rdoRadio" + Me.rdoRadio.Size = New System.Drawing.Size(100, 20) + Me.rdoRadio.TabIndex = 0 + Me.rdoRadio.TabStop = True + Me.rdoRadio.Text = "RadioButton1" + Me.rdoRadio.UseVisualStyleBackColor = True + ' + 'ucrRadio + ' + Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) + Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.Controls.Add(Me.rdoRadio) + Me.Name = "ucrRadio" + Me.Size = New System.Drawing.Size(100, 20) + Me.ResumeLayout(False) + + End Sub + + Friend WithEvents rdoRadio As RadioButton +End Class diff --git a/instat/ucrRadio.resx b/instat/ucrRadio.resx new file mode 100644 index 00000000000..1af7de150c9 --- /dev/null +++ b/instat/ucrRadio.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/ucrRadio.vb b/instat/ucrRadio.vb new file mode 100644 index 00000000000..5649334bac7 --- /dev/null +++ b/instat/ucrRadio.vb @@ -0,0 +1,3 @@ +Public Class ucrRadio + +End Class diff --git a/instat/ucrReceiver.Designer.vb b/instat/ucrReceiver.Designer.vb index a2c24b913d4..cf1b4b93962 100644 --- a/instat/ucrReceiver.Designer.vb +++ b/instat/ucrReceiver.Designer.vb @@ -1,6 +1,6 @@  _ Partial Class ucrReceiver - Inherits System.Windows.Forms.UserControl + Inherits instat.ucrCore 'UserControl overrides dispose to clean up the component list. _