From 7923b7f5d1e56eddb924de0b01e2d5071e521374 Mon Sep 17 00:00:00 2001 From: maxwell fundi Date: Mon, 7 Oct 2019 09:41:01 +0300 Subject: [PATCH 01/14] Additions to Scatter plot. --- instat/dlgScatterPlot.vb | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/instat/dlgScatterPlot.vb b/instat/dlgScatterPlot.vb index dda9ac7b4a0..38dc34f432e 100644 --- a/instat/dlgScatterPlot.vb +++ b/instat/dlgScatterPlot.vb @@ -13,8 +13,6 @@ ' ' You should have received a copy of the GNU General Public License ' along with this program. If not, see . - -Imports instat Imports instat.Translations Public Class dlgScatterPlot @@ -38,9 +36,14 @@ Public Class dlgScatterPlot Dim strReceiverXVarType As String = "" Dim strReceiverYSingleVarType As String = "" Dim strReceiverYMultipleVarType As String = "" - Private clsGeomSmoothFunc As New RFunction Private clsGeomSmoothParameter As New RParameter + Private clsCoordPolarFunction As New RFunction + Private clsCoordPolarStartOperator As New ROperator + 'Parameter names for geoms + Private strFirstParameterName As String = "geomfunc" + Private strGeomSmoothParameterName As String = "geom_smooth" + Private strGeomParameterNames() As String = {strFirstParameterName, strGeomSmoothParameterName} Private Sub dlgScatterPlot_Load(sender As Object, e As EventArgs) Handles MyBase.Load autoTranslate(Me) @@ -100,7 +103,7 @@ Public Class dlgScatterPlot clsGeomSmoothFunc.SetRCommand("geom_smooth") clsGeomSmoothFunc.AddParameter("method", Chr(34) & "lm" & Chr(34), iPosition:=0) clsGeomSmoothFunc.AddParameter("se", "FALSE", iPosition:=1) - clsGeomSmoothParameter.SetArgumentName("geom_smooth") + clsGeomSmoothParameter.SetArgumentName(strGeomSmoothParameterName) clsGeomSmoothParameter.SetArgument(clsGeomSmoothFunc) ucrChkLineofBestFit.SetText("Add Line of Best Fit") ucrChkLineofBestFit.AddToLinkedControls(ucrChkWithSE, {True}, bNewLinkedHideIfParameterMissing:=True) @@ -135,7 +138,7 @@ Public Class dlgScatterPlot clsBaseOperator.SetOperation("+") clsBaseOperator.AddParameter("ggplot", clsRFunctionParameter:=clsRggplotFunction, iPosition:=0) - clsBaseOperator.AddParameter("scatter", clsRFunctionParameter:=clsRScatterGeomFunction, iPosition:=2) + clsBaseOperator.AddParameter(strFirstParameterName, clsRFunctionParameter:=clsRScatterGeomFunction, iPosition:=2) clsRggplotFunction.SetPackageName("ggplot2") clsRggplotFunction.SetRCommand("ggplot") @@ -159,6 +162,8 @@ Public Class dlgScatterPlot clsYScalecontinuousFunction = GgplotDefaults.clsYScalecontinuousFunction.Clone() clsFacetsFunction = GgplotDefaults.clsFacetFunction.Clone() dctThemeFunctions = New Dictionary(Of String, RFunction)(GgplotDefaults.dctThemeFunctions) + clsCoordPolarStartOperator = GgplotDefaults.clsCoordPolarStartOperator.Clone() + clsCoordPolarFunction = GgplotDefaults.clsCoordPolarFunction.Clone() clsThemeFunction = GgplotDefaults.clsDefaultThemeFunction clsLocalRaesFunction = GgplotDefaults.clsAesFunction.Clone() clsGeomSmoothFunc.AddParameter("se", "FALSE", iPosition:=1) @@ -195,7 +200,7 @@ Public Class dlgScatterPlot End Sub Private Sub cmdOptions_Click(sender As Object, e As EventArgs) Handles cmdOptions.Click - sdgPlots.SetRCode(clsNewOperator:=ucrBase.clsRsyntax.clsBaseOperator, clsNewGlobalAesFunction:=clsRaesFunction, clsNewYScalecontinuousFunction:=clsYScalecontinuousFunction, clsNewXScalecontinuousFunction:=clsXScalecontinuousFunction, clsNewLabsFunction:=clsLabsFunction, clsNewXLabsTitleFunction:=clsXlabsFunction, clsNewYLabTitleFunction:=clsYlabsFunction, clsNewFacetFunction:=clsFacetsFunction, clsNewThemeFunction:=clsThemeFunction, dctNewThemeFunctions:=dctThemeFunctions, ucrNewBaseSelector:=ucrSelectorForScatter, bReset:=bResetSubdialog) + sdgPlots.SetRCode(clsNewOperator:=ucrBase.clsRsyntax.clsBaseOperator, clsNewGlobalAesFunction:=clsRaesFunction, clsNewYScalecontinuousFunction:=clsYScalecontinuousFunction, clsNewXScalecontinuousFunction:=clsXScalecontinuousFunction, clsNewLabsFunction:=clsLabsFunction, clsNewXLabsTitleFunction:=clsXlabsFunction, clsNewYLabTitleFunction:=clsYlabsFunction, clsNewFacetFunction:=clsFacetsFunction, clsNewCoordPolarFunction:=clsCoordPolarFunction, clsNewCoordPolarStartOperator:=clsCoordPolarStartOperator, clsNewThemeFunction:=clsThemeFunction, dctNewThemeFunctions:=dctThemeFunctions, ucrNewBaseSelector:=ucrSelectorForScatter, strMainDialogGeomParameterNames:=strGeomParameterNames, bReset:=bResetSubdialog) sdgPlots.ShowDialog() bResetSubdialog = False End Sub From 6dd96742719c1a9d991f3740f30800f4e9da95b4 Mon Sep 17 00:00:00 2001 From: maxwell fundi Date: Mon, 7 Oct 2019 09:47:04 +0300 Subject: [PATCH 02/14] Additions to RugPlot --- instat/dlgRugPlot.vb | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/instat/dlgRugPlot.vb b/instat/dlgRugPlot.vb index 9763c53eef6..9ef17218fe3 100644 --- a/instat/dlgRugPlot.vb +++ b/instat/dlgRugPlot.vb @@ -33,12 +33,11 @@ Public Class dlgRugPlot Private dctThemeFunctions As New Dictionary(Of String, RFunction) Private clsLocalRaesFunction As New RFunction Private bResetRugLayerSubdialog As Boolean = True - + Private clsCoordPolarFunction As New RFunction + Private clsCoordPolarStartOperator As New ROperator 'Parameter names for geoms Private strFirstParameterName As String = "geomrug" Private strGeomParameterNames() As String = {strFirstParameterName} - - Private Sub dlgRugPlot_Load(sender As Object, e As EventArgs) Handles MyBase.Load If bFirstLoad Then InitialiseDialog() @@ -124,6 +123,8 @@ Public Class dlgRugPlot clsYScalecontinuousFunction = GgplotDefaults.clsYScalecontinuousFunction.Clone() clsRFacetFunction = GgplotDefaults.clsFacetFunction.Clone() clsYlabFunction = GgplotDefaults.clsYlabTitleFunction.Clone + clsCoordPolarStartOperator = GgplotDefaults.clsCoordPolarStartOperator.Clone() + clsCoordPolarFunction = GgplotDefaults.clsCoordPolarFunction.Clone() dctThemeFunctions = New Dictionary(Of String, RFunction)(GgplotDefaults.dctThemeFunctions) clsThemeFunction = GgplotDefaults.clsDefaultThemeFunction clsLocalRaesFunction = GgplotDefaults.clsAesFunction.Clone() @@ -162,7 +163,7 @@ Public Class dlgRugPlot End Sub Private Sub cmdOptions_Click(sender As Object, e As EventArgs) Handles cmdOptions.Click - sdgPlots.SetRCode(clsBaseOperator, clsNewYScalecontinuousFunction:=clsYScalecontinuousFunction, clsNewXScalecontinuousFunction:=clsXScalecontinuousFunction, clsNewGlobalAesFunction:=clsRaesFunction, clsNewXLabsTitleFunction:=clsXlabsFunction, clsNewYLabTitleFunction:=clsYlabFunction, clsNewLabsFunction:=clsLabsFunction, clsNewFacetFunction:=clsRFacetFunction, clsNewThemeFunction:=clsThemeFunction, dctNewThemeFunctions:=dctThemeFunctions, ucrNewBaseSelector:=ucrRugPlotSelector, strMainDialogGeomParameterNames:=strGeomParameterNames, bReset:=bResetSubdialog) + sdgPlots.SetRCode(clsBaseOperator, clsNewYScalecontinuousFunction:=clsYScalecontinuousFunction, clsNewXScalecontinuousFunction:=clsXScalecontinuousFunction, clsNewGlobalAesFunction:=clsRaesFunction, clsNewXLabsTitleFunction:=clsXlabsFunction, clsNewYLabTitleFunction:=clsYlabFunction, clsNewLabsFunction:=clsLabsFunction, clsNewFacetFunction:=clsRFacetFunction, clsNewThemeFunction:=clsThemeFunction, dctNewThemeFunctions:=dctThemeFunctions, ucrNewBaseSelector:=ucrRugPlotSelector, strMainDialogGeomParameterNames:=strGeomParameterNames, clsNewCoordPolarFunction:=clsCoordPolarFunction, clsNewCoordPolarStartOperator:=clsCoordPolarStartOperator, bReset:=bResetSubdialog) sdgPlots.ShowDialog() bResetSubdialog = False End Sub From 3e479cbcdf13a4bdca099e7b3ce05d54e0fe7519 Mon Sep 17 00:00:00 2001 From: maxwell fundi Date: Mon, 7 Oct 2019 09:57:55 +0300 Subject: [PATCH 03/14] Additions to Lineplot --- instat/dlgLinePlot.vb | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/instat/dlgLinePlot.vb b/instat/dlgLinePlot.vb index b0ca5c5c651..b5789afe805 100644 --- a/instat/dlgLinePlot.vb +++ b/instat/dlgLinePlot.vb @@ -38,6 +38,15 @@ Public Class dlgLinePlot Private clsGeomSmoothParameter As New RParameter Private clsPeaksFunction As New RFunction Private clsValleysFunction As New RFunction + Private clsCoordPolarFunction As New RFunction + Private clsCoordPolarStartOperator As New ROperator + + 'Parameter names for geoms + Private strFirstParameterName As String = "geomfunc" + Private strgeomSmoothParameterName As String = "geom_smooth" + Private strPeaksPointsParameterName As String = "stat_peaks" + Private strValleysPointsParameterName As String = "stat_valleys" + Private strGeomParameterNames() As String = {strFirstParameterName, strgeomSmoothParameterName, strPeaksPointsParameterName, strValleysPointsParameterName} Private Sub dlgPlot_Load(sender As Object, e As EventArgs) Handles MyBase.Load If bFirstLoad Then @@ -107,7 +116,7 @@ Public Class dlgLinePlot clsGeomSmoothFunc.SetRCommand("geom_smooth") clsGeomSmoothFunc.AddParameter("method", Chr(34) & "lm" & Chr(34), iPosition:=0) clsGeomSmoothFunc.AddParameter("se", "FALSE", iPosition:=1) - clsGeomSmoothParameter.SetArgumentName("geom_smooth") + clsGeomSmoothParameter.SetArgumentName(strgeomSmoothParameterName) clsGeomSmoothParameter.SetArgument(clsGeomSmoothFunc) ucrChkLineofBestFit.SetText("Add Line of Best Fit") ucrChkLineofBestFit.AddToLinkedControls(ucrChkWithSE, {True}, bNewLinkedHideIfParameterMissing:=True) @@ -115,7 +124,7 @@ Public Class dlgLinePlot clsPeaksFunction.SetPackageName("ggpmisc") clsPeaksFunction.SetRCommand("stat_peaks") - clsPeaksParam.SetArgumentName("stat_peaks") + clsPeaksParam.SetArgumentName(strPeaksPointsParameterName) clsPeaksParam.SetArgument(clsPeaksFunction) clsPeaksFunction.AddParameter("geom", Chr(34) & "text" & Chr(34)) clsPeaksFunction.AddParameter("colour", Chr(34) & "red" & Chr(34)) @@ -124,7 +133,7 @@ Public Class dlgLinePlot clsValleysFunction.SetPackageName("ggpmisc") clsValleysFunction.SetRCommand("stat_valleys") - clsValleysParam.SetArgumentName("stat_valleys") + clsValleysParam.SetArgumentName(strValleysPointsParameterName) clsValleysParam.SetArgument(clsValleysFunction) clsValleysFunction.AddParameter("geom", Chr(34) & "text" & Chr(34)) clsValleysFunction.AddParameter("colour", Chr(34) & "blue" & Chr(34)) @@ -160,7 +169,7 @@ Public Class dlgLinePlot clsBaseOperator.SetOperation("+") clsBaseOperator.AddParameter("ggplot", clsRFunctionParameter:=clsRggplotFunction, iPosition:=0) - clsBaseOperator.AddParameter("lineplot", clsRFunctionParameter:=clsRgeomlineplotFunction, iPosition:=2) + clsBaseOperator.AddParameter(strFirstParameterName, clsRFunctionParameter:=clsRgeomlineplotFunction, iPosition:=2) clsRggplotFunction.SetPackageName("ggplot2") clsRggplotFunction.SetRCommand("ggplot") @@ -181,6 +190,8 @@ Public Class dlgLinePlot clsXScalecontinuousFunction = GgplotDefaults.clsXScalecontinuousFunction.Clone() clsYScalecontinuousFunction = GgplotDefaults.clsYScalecontinuousFunction.Clone() clsRFacetFunction = GgplotDefaults.clsFacetFunction.Clone() + clsCoordPolarStartOperator = GgplotDefaults.clsCoordPolarStartOperator.Clone() + clsCoordPolarFunction = GgplotDefaults.clsCoordPolarFunction.Clone() dctThemeFunctions = New Dictionary(Of String, RFunction)(GgplotDefaults.dctThemeFunctions) clsThemeFunction = GgplotDefaults.clsDefaultThemeFunction clsLocalRaesFunction = GgplotDefaults.clsAesFunction.Clone() @@ -232,7 +243,7 @@ Public Class dlgLinePlot End Sub Private Sub cmdOptions_Click(sender As Object, e As EventArgs) Handles cmdOptions.Click - sdgPlots.SetRCode(clsNewOperator:=ucrBase.clsRsyntax.clsBaseOperator, clsNewYScalecontinuousFunction:=clsYScalecontinuousFunction, clsNewXScalecontinuousFunction:=clsXScalecontinuousFunction, clsNewXLabsTitleFunction:=clsXlabsFunction, clsNewYLabTitleFunction:=clsYlabFunction, clsNewLabsFunction:=clsLabsFunction, clsNewFacetFunction:=clsRFacetFunction, clsNewThemeFunction:=clsThemeFunction, dctNewThemeFunctions:=dctThemeFunctions, clsNewGlobalAesFunction:=clsRaesFunction, ucrNewBaseSelector:=ucrLinePlotSelector, bReset:=bResetSubdialog) + sdgPlots.SetRCode(clsNewOperator:=ucrBase.clsRsyntax.clsBaseOperator, clsNewYScalecontinuousFunction:=clsYScalecontinuousFunction, clsNewXScalecontinuousFunction:=clsXScalecontinuousFunction, clsNewXLabsTitleFunction:=clsXlabsFunction, clsNewYLabTitleFunction:=clsYlabFunction, clsNewLabsFunction:=clsLabsFunction, clsNewFacetFunction:=clsRFacetFunction, clsNewThemeFunction:=clsThemeFunction, dctNewThemeFunctions:=dctThemeFunctions, clsNewGlobalAesFunction:=clsRaesFunction, ucrNewBaseSelector:=ucrLinePlotSelector, clsNewCoordPolarFunction:=clsCoordPolarFunction, clsNewCoordPolarStartOperator:=clsCoordPolarStartOperator, strMainDialogGeomParameterNames:=strGeomParameterNames, bReset:=bResetSubdialog) sdgPlots.ShowDialog() bResetSubdialog = False End Sub From 1c89ceaeceaf471fa67389e9d7f1bcf5d851e105 Mon Sep 17 00:00:00 2001 From: maxwell fundi Date: Mon, 7 Oct 2019 10:05:21 +0300 Subject: [PATCH 04/14] Additions to histogram --- instat/dlgHistogram.vb | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/instat/dlgHistogram.vb b/instat/dlgHistogram.vb index 977cebe5eb4..26fca8f6913 100644 --- a/instat/dlgHistogram.vb +++ b/instat/dlgHistogram.vb @@ -35,6 +35,13 @@ Public Class dlgHistogram Private clsLocalRaesFunction As New RFunction Private bResetHistLayerSubdialog As Boolean = True Private clsPercentage As New RFunction + Private clsCoordPolarFunction As New RFunction + Private clsCoordPolarStartOperator As New ROperator + + 'Parameter names for geoms + Private strFirstParameterName As String = "geomfunc" + Private strGeomParameterNames() As String = {strFirstParameterName} + Private Sub dlgHistogram_Load(sender As Object, e As EventArgs) Handles MyBase.Load If bFirstLoad Then @@ -126,7 +133,7 @@ Public Class dlgHistogram clsBaseOperator.SetOperation("+") clsBaseOperator.AddParameter("ggplot", clsRFunctionParameter:=clsRggplotFunction, iPosition:=0) - clsBaseOperator.AddParameter("histogram", clsRFunctionParameter:=clsRgeomPlotFunction, iPosition:=2) + clsBaseOperator.AddParameter(strFirstParameterName, clsRFunctionParameter:=clsRgeomPlotFunction, iPosition:=2) clsRggplotFunction.SetPackageName("ggplot2") clsRggplotFunction.SetRCommand("ggplot") clsRggplotFunction.AddParameter("mapping", clsRFunctionParameter:=clsRaesFunction, iPosition:=1) @@ -154,6 +161,8 @@ Public Class dlgHistogram clsYScalecontinuousFunction = GgplotDefaults.clsYScalecontinuousFunction.Clone() clsRFacetFunction = GgplotDefaults.clsFacetFunction.Clone() dctThemeFunctions = New Dictionary(Of String, RFunction)(GgplotDefaults.dctThemeFunctions) + clsCoordPolarStartOperator = GgplotDefaults.clsCoordPolarStartOperator.Clone() + clsCoordPolarFunction = GgplotDefaults.clsCoordPolarFunction.Clone() clsThemeFunction = GgplotDefaults.clsDefaultThemeFunction clsLocalRaesFunction = GgplotDefaults.clsAesFunction.Clone() @@ -203,7 +212,8 @@ Public Class dlgHistogram End Sub Private Sub cmdOptions_Click(sender As Object, e As EventArgs) Handles cmdOptions.Click - sdgPlots.SetRCode(clsBaseOperator, clsNewYScalecontinuousFunction:=clsYScalecontinuousFunction, clsNewXScalecontinuousFunction:=clsXScalecontinuousFunction, clsNewXLabsTitleFunction:=clsXlabsFunction, clsNewYLabTitleFunction:=clsYlabFunction, clsNewLabsFunction:=clsLabsFunction, clsNewThemeFunction:=clsThemeFunction, dctNewThemeFunctions:=dctThemeFunctions, clsNewFacetFunction:=clsRFacetFunction, ucrNewBaseSelector:=ucrHistogramSelector, clsNewGlobalAesFunction:=clsRaesFunction, bReset:=bResetSubdialog) + sdgPlots.SetRCode(clsBaseOperator, clsNewYScalecontinuousFunction:=clsYScalecontinuousFunction, clsNewXScalecontinuousFunction:=clsXScalecontinuousFunction, clsNewXLabsTitleFunction:=clsXlabsFunction, clsNewYLabTitleFunction:=clsYlabFunction, clsNewLabsFunction:=clsLabsFunction, clsNewThemeFunction:=clsThemeFunction, dctNewThemeFunctions:=dctThemeFunctions, clsNewFacetFunction:=clsRFacetFunction, ucrNewBaseSelector:=ucrHistogramSelector, clsNewGlobalAesFunction:=clsRaesFunction, clsNewCoordPolarFunction:=clsCoordPolarFunction, clsNewCoordPolarStartOperator:=clsCoordPolarStartOperator, + strMainDialogGeomParameterNames:=strGeomParameterNames, bReset:=bResetSubdialog) sdgPlots.ShowDialog() bResetSubdialog = False End Sub From f804d1767c72e0504e1ad576404ff63216a349db Mon Sep 17 00:00:00 2001 From: maxwell fundi Date: Mon, 7 Oct 2019 10:53:30 +0300 Subject: [PATCH 05/14] Adtions to barchart --- instat/dlgBarAndPieChart.vb | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/instat/dlgBarAndPieChart.vb b/instat/dlgBarAndPieChart.vb index db0e32a7162..d277d4a304e 100644 --- a/instat/dlgBarAndPieChart.vb +++ b/instat/dlgBarAndPieChart.vb @@ -36,6 +36,9 @@ Public Class dlgBarAndPieChart Private bFirstLoad As Boolean = True Private bResetSubdialog As Boolean = True Private bResetBarLayerSubdialog As Boolean = True + Private clsCoordPolarFunction As New RFunction + Private clsCoordPolarStartOperator As New ROperator + Private Sub cmdOptions_Load(sender As Object, e As EventArgs) Handles MyBase.Load If bFirstLoad Then @@ -161,10 +164,11 @@ Public Class dlgBarAndPieChart clsYScalecontinuousFunction = GgplotDefaults.clsYScalecontinuousFunction.Clone clsRFacetFunction = GgplotDefaults.clsFacetFunction.Clone() clsBaseOperator.AddParameter(GgplotDefaults.clsDefaultThemeParameter.Clone()) + clsCoordPolarStartOperator = GgplotDefaults.clsCoordPolarStartOperator.Clone() + clsCoordPolarFunction = GgplotDefaults.clsCoordPolarFunction.Clone() clsThemeFuction = GgplotDefaults.clsDefaultThemeFunction.Clone dctThemeFunctions = New Dictionary(Of String, RFunction)(GgplotDefaults.dctThemeFunctions) clsLocalRaesFunction = GgplotDefaults.clsAesFunction.Clone() - clsBaseOperator.SetAssignTo("last_graph", strTempDataframe:=ucrBarChartSelector.ucrAvailableDataFrames.cboAvailableDataFrames.Text, strTempGraph:="last_graph") ucrBase.clsRsyntax.SetBaseROperator(clsBaseOperator) End Sub @@ -198,9 +202,9 @@ Public Class dlgBarAndPieChart Private Sub cmdOptions_Click(sender As Object, e As EventArgs) Handles cmdOptions.Click If rdoBarChart.Checked Then - sdgPlots.SetRCode(clsNewOperator:=clsBaseOperator, clsNewGlobalAesFunction:=clsBarAesFunction, clsNewYScalecontinuousFunction:=clsYScalecontinuousFunction, clsNewThemeFunction:=clsThemeFuction, dctNewThemeFunctions:=dctThemeFunctions, clsNewXScalecontinuousFunction:=clsXScalecontinuousFunction, clsNewXLabsTitleFunction:=clsXlabFunction, clsNewYLabTitleFunction:=clsYlabFunction, clsNewLabsFunction:=clsLabsFunction, clsNewFacetFunction:=clsRFacetFunction, ucrNewBaseSelector:=ucrBarChartSelector, bReset:=bResetSubdialog) + sdgPlots.SetRCode(clsNewOperator:=clsBaseOperator, clsNewGlobalAesFunction:=clsBarAesFunction, clsNewYScalecontinuousFunction:=clsYScalecontinuousFunction, clsNewThemeFunction:=clsThemeFuction, dctNewThemeFunctions:=dctThemeFunctions, clsNewXScalecontinuousFunction:=clsXScalecontinuousFunction, clsNewXLabsTitleFunction:=clsXlabFunction, clsNewYLabTitleFunction:=clsYlabFunction, clsNewLabsFunction:=clsLabsFunction, clsNewFacetFunction:=clsRFacetFunction, ucrNewBaseSelector:=ucrBarChartSelector, clsNewCoordPolarFunction:=clsCoordPolarFunction, clsNewCoordPolarStartOperator:=clsCoordPolarStartOperator, bReset:=bResetSubdialog) Else - sdgPlots.SetRCode(clsNewOperator:=clsBaseOperator, clsNewGlobalAesFunction:=clsPieAesFunction, clsNewYScalecontinuousFunction:=clsYScalecontinuousFunction, clsNewThemeFunction:=clsThemeFuction, dctNewThemeFunctions:=dctThemeFunctions, clsNewXScalecontinuousFunction:=clsXScalecontinuousFunction, clsNewXLabsTitleFunction:=clsXlabFunction, clsNewYLabTitleFunction:=clsYlabFunction, clsNewLabsFunction:=clsLabsFunction, clsNewFacetFunction:=clsRFacetFunction, ucrNewBaseSelector:=ucrBarChartSelector, bReset:=bResetSubdialog) + sdgPlots.SetRCode(clsNewOperator:=clsBaseOperator, clsNewGlobalAesFunction:=clsPieAesFunction, clsNewYScalecontinuousFunction:=clsYScalecontinuousFunction, clsNewThemeFunction:=clsThemeFuction, dctNewThemeFunctions:=dctThemeFunctions, clsNewXScalecontinuousFunction:=clsXScalecontinuousFunction, clsNewXLabsTitleFunction:=clsXlabFunction, clsNewYLabTitleFunction:=clsYlabFunction, clsNewLabsFunction:=clsLabsFunction, clsNewFacetFunction:=clsRFacetFunction, ucrNewBaseSelector:=ucrBarChartSelector, clsNewCoordPolarFunction:=clsCoordPolarFunction, clsNewCoordPolarStartOperator:=clsCoordPolarStartOperator, bReset:=bResetSubdialog) End If sdgPlots.ShowDialog() bResetSubdialog = False From d852bdbac57119e6fa8e1215e20c99b52ce71c2b Mon Sep 17 00:00:00 2001 From: maxwell fundi Date: Mon, 7 Oct 2019 11:18:16 +0300 Subject: [PATCH 06/14] Additions to Cum Dist --- instat/dlgCumulativeDistribution.vb | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/instat/dlgCumulativeDistribution.vb b/instat/dlgCumulativeDistribution.vb index 45ba2e12199..82f43055920 100644 --- a/instat/dlgCumulativeDistribution.vb +++ b/instat/dlgCumulativeDistribution.vb @@ -22,6 +22,7 @@ Public Class dlgCumulativeDistribution Private clsBaseOperator As New ROperator Private bFirstLoad As Boolean = True Private clsLabsFunction As New RFunction + Private clsThemeFunction As New RFunction Private clsXlabsFunction As New RFunction Private clsYlabFunction As New RFunction Private clsXScalecontinuousFunction As New RFunction @@ -30,7 +31,12 @@ Public Class dlgCumulativeDistribution Private bResetSubdialog As Boolean = True Private dctThemeFunctions As New Dictionary(Of String, RFunction) Private bReset As Boolean = True - + Private clsCoordPolarFunction As New RFunction + Private clsCoordPolarStartOperator As New ROperator + 'Parameter names for geoms + Private strFirstParameterName As String = "geomfunc" + Private strPointsParameterName As String = "geom_point" + Private strGeomParameterNames() As String = {strFirstParameterName, strPointsParameterName} Private Sub dlgCumulativeDistribution_Load(sender As Object, e As EventArgs) Handles MyBase.Load If bFirstLoad Then InitaliseDialog() @@ -89,7 +95,7 @@ Public Class dlgCumulativeDistribution clsGeomPointFunc.SetPackageName("ggplot2") clsGeomPointFunc.SetRCommand("geom_point") clsGeomPointFunc.AddParameter("stat", Chr(34) & "ecdf" & Chr(34)) - clsGeomPointParam.SetArgumentName("geom_point") + clsGeomPointParam.SetArgumentName(strPointsParameterName) clsGeomPointParam.SetArgument(clsGeomPointFunc) ucrChkIncludePoints.SetText("Include Points") ucrChkIncludePoints.SetParameter(clsGeomPointParam, bNewChangeParameterValue:=False, bNewAddRemoveParameter:=True) @@ -118,7 +124,7 @@ Public Class dlgCumulativeDistribution clsBaseOperator.SetOperation("+") clsBaseOperator.AddParameter("ggplot", clsRFunctionParameter:=clsRggplotFunction, iPosition:=0) - clsBaseOperator.AddParameter("stat_ecdf", clsRFunctionParameter:=clsRgeomCumDistFunction, iPosition:=2) + clsBaseOperator.AddParameter(strFirstParameterName, clsRFunctionParameter:=clsRgeomCumDistFunction, iPosition:=2) clsRggplotFunction.SetPackageName("ggplot2") clsRggplotFunction.SetRCommand("ggplot") @@ -137,8 +143,10 @@ Public Class dlgCumulativeDistribution clsYScalecontinuousFunction = GgplotDefaults.clsYScalecontinuousFunction.Clone clsRFacetFunction = GgplotDefaults.clsFacetFunction.Clone() clsYlabFunction = GgplotDefaults.clsYlabTitleFunction.Clone + clsCoordPolarStartOperator = GgplotDefaults.clsCoordPolarStartOperator.Clone() + clsCoordPolarFunction = GgplotDefaults.clsCoordPolarFunction.Clone() + clsThemeFunction = GgplotDefaults.clsDefaultThemeFunction.Clone() dctThemeFunctions = New Dictionary(Of String, RFunction)(GgplotDefaults.dctThemeFunctions) - clsBaseOperator.SetAssignTo("last_graph", strTempDataframe:=ucrCumDistSelector.ucrAvailableDataFrames.cboAvailableDataFrames.Text, strTempGraph:="last_graph") ucrBase.clsRsyntax.SetBaseROperator(clsBaseOperator) End Sub @@ -167,7 +175,7 @@ Public Class dlgCumulativeDistribution End Sub Private Sub cmdPlotOptions_Click(sender As Object, e As EventArgs) Handles cmdPlotOptions.Click - sdgPlots.SetRCode(clsBaseOperator, dctNewThemeFunctions:=dctThemeFunctions, clsNewGlobalAesFunction:=clsRaesFunction, clsNewYScalecontinuousFunction:=clsYScalecontinuousFunction, clsNewXScalecontinuousFunction:=clsXScalecontinuousFunction, clsNewXLabsTitleFunction:=clsXlabsFunction, clsNewYLabTitleFunction:=clsYlabFunction, clsNewLabsFunction:=clsLabsFunction, clsNewFacetFunction:=clsRFacetFunction, ucrNewBaseSelector:=ucrCumDistSelector, bReset:=bResetSubdialog) + sdgPlots.SetRCode(clsBaseOperator, clsNewThemeFunction:=clsThemeFunction, dctNewThemeFunctions:=dctThemeFunctions, clsNewGlobalAesFunction:=clsRaesFunction, clsNewYScalecontinuousFunction:=clsYScalecontinuousFunction, clsNewXScalecontinuousFunction:=clsXScalecontinuousFunction, clsNewXLabsTitleFunction:=clsXlabsFunction, clsNewYLabTitleFunction:=clsYlabFunction, clsNewLabsFunction:=clsLabsFunction, clsNewFacetFunction:=clsRFacetFunction, ucrNewBaseSelector:=ucrCumDistSelector, clsNewCoordPolarFunction:=clsCoordPolarFunction, clsNewCoordPolarStartOperator:=clsCoordPolarStartOperator, strMainDialogGeomParameterNames:=strGeomParameterNames, bReset:=bResetSubdialog) sdgPlots.ShowDialog() bResetSubdialog = False End Sub From 432a666e54c17ccace51af6bd7775b84078980bf Mon Sep 17 00:00:00 2001 From: maxwell fundi Date: Mon, 7 Oct 2019 11:29:45 +0300 Subject: [PATCH 07/14] Additions to parallel Coordinate plot --- instat/dlgParallelCoordinatePlot.vb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/instat/dlgParallelCoordinatePlot.vb b/instat/dlgParallelCoordinatePlot.vb index bd9bae57297..5f2b8203856 100644 --- a/instat/dlgParallelCoordinatePlot.vb +++ b/instat/dlgParallelCoordinatePlot.vb @@ -29,6 +29,8 @@ Public Class dlgParallelCoordinatePlot Private clsRFacetFunction As New RFunction Private clsThemeFunction As New RFunction Private dctThemeFunctions As Dictionary(Of String, RFunction) + Private clsCoordPolarFunction As New RFunction + Private clsCoordPolarStartOperator As New ROperator Private Sub dlgParallelCoordinatePlot_Load(sender As Object, e As EventArgs) Handles MyBase.Load autoTranslate(Me) @@ -128,6 +130,8 @@ Public Class dlgParallelCoordinatePlot clsYScaleContinuousFunction = GgplotDefaults.clsYScalecontinuousFunction.Clone() clsRFacetFunction = GgplotDefaults.clsFacetFunction.Clone() clsYLabsFunction = GgplotDefaults.clsYlabTitleFunction.Clone + clsCoordPolarStartOperator = GgplotDefaults.clsCoordPolarStartOperator.Clone() + clsCoordPolarFunction = GgplotDefaults.clsCoordPolarFunction.Clone() clsThemeFunction = GgplotDefaults.clsDefaultThemeFunction.Clone() dctThemeFunctions = New Dictionary(Of String, RFunction)(GgplotDefaults.dctThemeFunctions) @@ -168,7 +172,7 @@ Public Class dlgParallelCoordinatePlot End Sub Private Sub cmdPlotOptions_Click(sender As Object, e As EventArgs) Handles cmdPlotOptions.Click - sdgPlots.SetRCode(clsBaseOperator, clsNewThemeFunction:=clsThemeFunction, dctNewThemeFunctions:=dctThemeFunctions, clsNewXScalecontinuousFunction:=clsXScaleContinuousFunction, clsNewYScalecontinuousFunction:=clsYScaleContinuousFunction, clsNewXLabsTitleFunction:=clsXLabsFunction, clsNewYLabTitleFunction:=clsYLabsFunction, clsNewLabsFunction:=clsLabsFunction, clsNewFacetFunction:=clsRFacetFunction, ucrNewBaseSelector:=ucrSelectorParallelCoordinatePlot, bReset:=bResetSubdialog) + sdgPlots.SetRCode(clsBaseOperator, clsNewThemeFunction:=clsThemeFunction, dctNewThemeFunctions:=dctThemeFunctions, clsNewXScalecontinuousFunction:=clsXScaleContinuousFunction, clsNewYScalecontinuousFunction:=clsYScaleContinuousFunction, clsNewXLabsTitleFunction:=clsXLabsFunction, clsNewYLabTitleFunction:=clsYLabsFunction, clsNewLabsFunction:=clsLabsFunction, clsNewFacetFunction:=clsRFacetFunction, ucrNewBaseSelector:=ucrSelectorParallelCoordinatePlot, clsNewCoordPolarFunction:=clsCoordPolarFunction, clsNewCoordPolarStartOperator:=clsCoordPolarStartOperator, bReset:=bResetSubdialog) sdgPlots.ShowDialog() bResetSubdialog = False End Sub From 14b0745ee95f6ef8c4f421c367ce2f3fc15c127f Mon Sep 17 00:00:00 2001 From: maxwell fundi Date: Mon, 7 Oct 2019 11:53:53 +0300 Subject: [PATCH 08/14] Edits to the Mossaic plots --- instat/dlgMosaicPlot.vb | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/instat/dlgMosaicPlot.vb b/instat/dlgMosaicPlot.vb index 1dac1ae27cc..ec098212c99 100644 --- a/instat/dlgMosaicPlot.vb +++ b/instat/dlgMosaicPlot.vb @@ -34,7 +34,8 @@ Public Class dlgMosaicPlot Private dctThemeFunctions As Dictionary(Of String, RFunction) Private bResetSubdialog As Boolean = True Private bResetBoxLayerSubdialog As Boolean = True - + Private clsCoordPolarFunction As New RFunction + Private clsCoordPolarStartOperator As New ROperator Private bFirstLoad As Boolean = True Private bReset As Boolean = True Private bRCodeSet As Boolean = True @@ -172,6 +173,8 @@ Public Class dlgMosaicPlot clsYScaleContinuousFunction = GgplotDefaults.clsYScalecontinuousFunction.Clone() clsRFacetFunction = GgplotDefaults.clsFacetFunction.Clone() clsYlabFunction = GgplotDefaults.clsYlabTitleFunction.Clone + clsCoordPolarStartOperator = GgplotDefaults.clsCoordPolarStartOperator.Clone() + clsCoordPolarFunction = GgplotDefaults.clsCoordPolarFunction.Clone() clsThemeFunction = GgplotDefaults.clsDefaultThemeFunction.Clone() dctThemeFunctions = New Dictionary(Of String, RFunction)(GgplotDefaults.dctThemeFunctions) @@ -218,7 +221,7 @@ Public Class dlgMosaicPlot End Sub Private Sub cmdOptions_Click(sender As Object, e As EventArgs) Handles cmdOptions.Click - sdgPlots.SetRCode(clsBaseOperator, clsNewThemeFunction:=clsThemeFunction, dctNewThemeFunctions:=dctThemeFunctions, clsNewGlobalAesFunction:=clsAesFunction, clsNewXScalecontinuousFunction:=clsXScaleContinuousFunction, clsNewYScalecontinuousFunction:=clsYScaleContinuousFunction, clsNewXLabsTitleFunction:=clsXlabsFunction, clsNewYLabTitleFunction:=clsYlabFunction, clsNewLabsFunction:=clsLabsFunction, clsNewFacetFunction:=clsRFacetFunction, ucrNewBaseSelector:=ucrSelectorMosaicPlot, bReset:=bResetSubdialog) + sdgPlots.SetRCode(clsBaseOperator, clsNewThemeFunction:=clsThemeFunction, dctNewThemeFunctions:=dctThemeFunctions, clsNewGlobalAesFunction:=clsAesFunction, clsNewXScalecontinuousFunction:=clsXScaleContinuousFunction, clsNewYScalecontinuousFunction:=clsYScaleContinuousFunction, clsNewXLabsTitleFunction:=clsXlabsFunction, clsNewYLabTitleFunction:=clsYlabFunction, clsNewLabsFunction:=clsLabsFunction, clsNewFacetFunction:=clsRFacetFunction, ucrNewBaseSelector:=ucrSelectorMosaicPlot, clsNewCoordPolarFunction:=clsCoordPolarFunction, clsNewCoordPolarStartOperator:=clsCoordPolarStartOperator, bReset:=bResetSubdialog) sdgPlots.ShowDialog() bResetSubdialog = False SetRCodeForControls(False) From 22b73fdc7527b69b66a94d4b2d4698bfe04f23fb Mon Sep 17 00:00:00 2001 From: maxwell fundi Date: Mon, 7 Oct 2019 12:01:21 +0300 Subject: [PATCH 09/14] Additions to general grpahics dialog --- instat/dlgGeneralForGraphics.vb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/instat/dlgGeneralForGraphics.vb b/instat/dlgGeneralForGraphics.vb index d79758e1e83..6ee2e38f0d3 100644 --- a/instat/dlgGeneralForGraphics.vb +++ b/instat/dlgGeneralForGraphics.vb @@ -39,6 +39,8 @@ Public Class dlgGeneralForGraphics Private clsFacetsFunction As New RFunction Private clsThemeFunction As New RFunction Private dctThemeFunctions As New Dictionary(Of String, RFunction) + Private clsCoordPolarFunction As New RFunction + Private clsCoordPolarStartOperator As New ROperator Private Sub dlgGeneralForGraphics_Load(sender As Object, e As EventArgs) Handles MyBase.Load If bFirstLoad Then @@ -92,6 +94,8 @@ Public Class dlgGeneralForGraphics clsXScalecontinuousFunction = GgplotDefaults.clsXScalecontinuousFunction.Clone() clsYScalecontinuousFunction = GgplotDefaults.clsYScalecontinuousFunction.Clone() clsFacetsFunction = GgplotDefaults.clsFacetFunction.Clone() + clsCoordPolarStartOperator = GgplotDefaults.clsCoordPolarStartOperator.Clone() + clsCoordPolarFunction = GgplotDefaults.clsCoordPolarFunction.Clone() dctThemeFunctions = New Dictionary(Of String, RFunction)(GgplotDefaults.dctThemeFunctions) clsThemeFunction = GgplotDefaults.clsDefaultThemeFunction @@ -123,7 +127,7 @@ Public Class dlgGeneralForGraphics Private Sub cmdOptions_Click(sender As Object, e As EventArgs) Handles cmdOptions.Click sdgPlots.DisableLayersTab() - sdgPlots.SetRCode(clsNewOperator:=ucrBase.clsRsyntax.clsBaseOperator, clsNewThemeFunction:=clsThemeFunction, dctNewThemeFunctions:=dctThemeFunctions, clsNewYScalecontinuousFunction:=clsYScalecontinuousFunction, clsNewXScalecontinuousFunction:=clsXScalecontinuousFunction, clsNewLabsFunction:=clsLabsFunction, clsNewXLabsTitleFunction:=clsXlabsFunction, clsNewYLabTitleFunction:=clsYlabsFunction, clsNewFacetFunction:=clsFacetsFunction, ucrNewBaseSelector:=sdgLayerOptions.ucrGeomWithAes.ucrGeomWithAesSelector, bReset:=bResetSubdialog) + sdgPlots.SetRCode(clsNewOperator:=ucrBase.clsRsyntax.clsBaseOperator, clsNewThemeFunction:=clsThemeFunction, dctNewThemeFunctions:=dctThemeFunctions, clsNewYScalecontinuousFunction:=clsYScalecontinuousFunction, clsNewXScalecontinuousFunction:=clsXScalecontinuousFunction, clsNewLabsFunction:=clsLabsFunction, clsNewXLabsTitleFunction:=clsXlabsFunction, clsNewYLabTitleFunction:=clsYlabsFunction, clsNewFacetFunction:=clsFacetsFunction, ucrNewBaseSelector:=sdgLayerOptions.ucrGeomWithAes.ucrGeomWithAesSelector, clsNewCoordPolarFunction:=clsCoordPolarFunction, clsNewCoordPolarStartOperator:=clsCoordPolarStartOperator, bReset:=bResetSubdialog) sdgPlots.ShowDialog() bResetOptionsSubdialog = False sdgPlots.EnableLayersTab() From 0d3583fb5031434840929f55e39014f98db51048 Mon Sep 17 00:00:00 2001 From: maxwell fundi Date: Mon, 7 Oct 2019 12:02:52 +0300 Subject: [PATCH 10/14] Additons to use graph --- instat/dlgUseGraph.vb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/instat/dlgUseGraph.vb b/instat/dlgUseGraph.vb index 5b192917122..49289cfe742 100644 --- a/instat/dlgUseGraph.vb +++ b/instat/dlgUseGraph.vb @@ -28,6 +28,8 @@ Public Class dlgUseGraph Private clsXScalecontinuousFunction As New RFunction Private clsYScalecontinuousFunction As New RFunction Private clsFacetsFunction As New RFunction + Private clsCoordPolarFunction As New RFunction + Private clsCoordPolarStartOperator As New ROperator Private dctThemeFunctions As New Dictionary(Of String, RFunction) Private Sub dlgUseGraph_Load(sender As Object, e As EventArgs) Handles MyBase.Load @@ -84,6 +86,8 @@ Public Class dlgUseGraph clsXScalecontinuousFunction = GgplotDefaults.clsXScalecontinuousFunction.Clone() clsYScalecontinuousFunction = GgplotDefaults.clsYScalecontinuousFunction.Clone() clsFacetsFunction = GgplotDefaults.clsFacetFunction.Clone() + clsCoordPolarStartOperator = GgplotDefaults.clsCoordPolarStartOperator.Clone() + clsCoordPolarFunction = GgplotDefaults.clsCoordPolarFunction.Clone() dctThemeFunctions = New Dictionary(Of String, RFunction)(GgplotDefaults.dctThemeFunctions) clsThemeFunction = GgplotDefaults.clsDefaultThemeFunction clsUseGraphFunction.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$get_graphs") @@ -114,7 +118,7 @@ Public Class dlgUseGraph End Sub Private Sub cmdPlotOptions_Click(sender As Object, e As EventArgs) Handles cmdPlotOptions.Click - sdgPlots.SetRCode(clsNewOperator:=ucrBase.clsRsyntax.clsBaseOperator, clsNewThemeFunction:=clsThemeFunction, dctNewThemeFunctions:=dctThemeFunctions, clsNewYScalecontinuousFunction:=clsYScalecontinuousFunction, clsNewXScalecontinuousFunction:=clsXScalecontinuousFunction, clsNewLabsFunction:=clsLabsFunction, clsNewXLabsTitleFunction:=clsXlabsFunction, clsNewYLabTitleFunction:=clsYlabsFunction, clsNewFacetFunction:=clsFacetsFunction, ucrNewBaseSelector:=ucrGraphsSelector, bReset:=bResetSubdialog) + sdgPlots.SetRCode(clsNewOperator:=ucrBase.clsRsyntax.clsBaseOperator, clsNewThemeFunction:=clsThemeFunction, dctNewThemeFunctions:=dctThemeFunctions, clsNewYScalecontinuousFunction:=clsYScalecontinuousFunction, clsNewXScalecontinuousFunction:=clsXScalecontinuousFunction, clsNewLabsFunction:=clsLabsFunction, clsNewXLabsTitleFunction:=clsXlabsFunction, clsNewYLabTitleFunction:=clsYlabsFunction, clsNewFacetFunction:=clsFacetsFunction, ucrNewBaseSelector:=ucrGraphsSelector, clsNewCoordPolarFunction:=clsCoordPolarFunction, clsNewCoordPolarStartOperator:=clsCoordPolarStartOperator, bReset:=bResetSubdialog) sdgPlots.ShowDialog() End Sub From 90265924ec71b7780e06aa8bfa093217b0d791e4 Mon Sep 17 00:00:00 2001 From: maxwell fundi Date: Mon, 7 Oct 2019 12:16:51 +0300 Subject: [PATCH 11/14] Edits to Summary bar or piechart --- instat/dlgSummaryBarOrPieChart.vb | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/instat/dlgSummaryBarOrPieChart.vb b/instat/dlgSummaryBarOrPieChart.vb index ffea0e3c2e9..f2128929197 100644 --- a/instat/dlgSummaryBarOrPieChart.vb +++ b/instat/dlgSummaryBarOrPieChart.vb @@ -32,6 +32,8 @@ Public Class dlgSummaryBarOrPieChart Private clsThemeFunction As New RFunction Private dctThemeFunctions As New Dictionary(Of String, RFunction) Private bResetSubdialog As Boolean = True + Private clsCoordPolarFunction As New RFunction + Private clsCoordPolarStartOperator As New ROperator Private clsLocalRaesFunction As New RFunction Private bResetSummaryBarLayerSubdialog As Boolean = True @@ -137,7 +139,8 @@ Public Class dlgSummaryBarOrPieChart clsXScalecontinuousFunction = GgplotDefaults.clsXScalecontinuousFunction.Clone() clsYScalecontinuousFunction = GgplotDefaults.clsYScalecontinuousFunction.Clone clsRFacetFunction = GgplotDefaults.clsFacetFunction.Clone() - + clsCoordPolarStartOperator = GgplotDefaults.clsCoordPolarStartOperator.Clone() + clsCoordPolarFunction = GgplotDefaults.clsCoordPolarFunction.Clone() dctThemeFunctions = New Dictionary(Of String, RFunction)(GgplotDefaults.dctThemeFunctions) clsThemeFunction = GgplotDefaults.clsDefaultThemeFunction clsLocalRaesFunction = GgplotDefaults.clsAesFunction.Clone() @@ -172,7 +175,7 @@ Public Class dlgSummaryBarOrPieChart End Sub Private Sub cmdOptions_Click(sender As Object, e As EventArgs) Handles cmdOptions.Click - sdgPlots.SetRCode(clsBaseOperator, clsNewGlobalAesFunction:=clsRaesFunction, clsNewYScalecontinuousFunction:=clsYScalecontinuousFunction, clsNewXScalecontinuousFunction:=clsXScalecontinuousFunction, clsNewXLabsTitleFunction:=clsXlabsFunction, clsNewYLabTitleFunction:=clsYlabFunction, clsNewLabsFunction:=clsLabsFunction, clsNewFacetFunction:=clsRFacetFunction, clsNewThemeFunction:=clsThemeFunction, dctNewThemeFunctions:=dctThemeFunctions, ucrNewBaseSelector:=ucrSummaryBarSelector, bReset:=bResetSubdialog) + sdgPlots.SetRCode(clsBaseOperator, clsNewGlobalAesFunction:=clsRaesFunction, clsNewYScalecontinuousFunction:=clsYScalecontinuousFunction, clsNewXScalecontinuousFunction:=clsXScalecontinuousFunction, clsNewXLabsTitleFunction:=clsXlabsFunction, clsNewYLabTitleFunction:=clsYlabFunction, clsNewLabsFunction:=clsLabsFunction, clsNewFacetFunction:=clsRFacetFunction, clsNewThemeFunction:=clsThemeFunction, dctNewThemeFunctions:=dctThemeFunctions, ucrNewBaseSelector:=ucrSummaryBarSelector, clsNewCoordPolarFunction:=clsCoordPolarFunction, clsNewCoordPolarStartOperator:=clsCoordPolarStartOperator, bReset:=bResetSubdialog) sdgPlots.ShowDialog() bResetSubdialog = False End Sub From 1b0fb455dc696dc2ba9ee900c7dabfc471ac5565 Mon Sep 17 00:00:00 2001 From: maxwell fundi Date: Tue, 8 Oct 2019 09:46:57 +0300 Subject: [PATCH 12/14] Climatic boxplot + making coordpolar func mandatory --- instat/dlgClimaticBoxPlot.vb | 10 ++++++++-- instat/sdgPlots.vb | 3 ++- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/instat/dlgClimaticBoxPlot.vb b/instat/dlgClimaticBoxPlot.vb index dff98c4a78f..5247e2a243d 100644 --- a/instat/dlgClimaticBoxPlot.vb +++ b/instat/dlgClimaticBoxPlot.vb @@ -56,6 +56,9 @@ Public Class dlgClimaticBoxPlot Private bUpdatingParameters As Boolean = False Private dctComboReceiver As New Dictionary(Of ucrInputComboBox, ucrReceiverSingle) + Private clsCoordPolarFunction As New RFunction + Private clsCoordPolarStartOperator As New ROperator + Private Sub dlgClimaticBoxPlot_Load(sender As Object, e As EventArgs) Handles MyBase.Load If bFirstLoad Then InitialiseDialog() @@ -266,7 +269,9 @@ Public Class dlgClimaticBoxPlot clsLabsFunction = GgplotDefaults.clsDefaultLabs.Clone() clsXScaleContinuousFunction = GgplotDefaults.clsXScalecontinuousFunction.Clone() clsYScaleContinuousFunction = GgplotDefaults.clsYScalecontinuousFunction.Clone() - clsYlabFunction = GgplotDefaults.clsYlabTitleFunction.Clone + clsYlabFunction = GgplotDefaults.clsYlabTitleFunction.Clone() + clsCoordPolarStartOperator = GgplotDefaults.clsCoordPolarStartOperator.Clone() + clsCoordPolarFunction = GgplotDefaults.clsCoordPolarFunction.Clone() clsThemeFunction = GgplotDefaults.clsDefaultThemeFunction.Clone() dctThemeFunctions = New Dictionary(Of String, RFunction)(GgplotDefaults.dctThemeFunctions) clsLocalRaesFunction = GgplotDefaults.clsAesFunction.Clone() @@ -315,7 +320,8 @@ Public Class dlgClimaticBoxPlot End Sub Private Sub cmdOptions_Click(sender As Object, e As EventArgs) Handles cmdOptions.Click - sdgPlots.SetRCode(clsBaseOperator, clsNewThemeFunction:=clsThemeFunction, dctNewThemeFunctions:=dctThemeFunctions, clsNewGlobalAesFunction:=clsRaesFunction, clsNewXScalecontinuousFunction:=clsXScaleContinuousFunction, clsNewYScalecontinuousFunction:=clsYScaleContinuousFunction, clsNewXLabsTitleFunction:=clsXlabsFunction, clsNewYLabTitleFunction:=clsYlabFunction, clsNewLabsFunction:=clsLabsFunction, clsNewFacetFunction:=clsFacetFunction, ucrNewBaseSelector:=ucrSelectorClimaticBoxPlot, bReset:=bResetSubdialog) + sdgPlots.SetRCode(clsBaseOperator, clsNewCoordPolarFunction:=clsCoordPolarFunction, clsNewCoordPolarStartOperator:=clsCoordPolarStartOperator, + clsNewThemeFunction:=clsThemeFunction, dctNewThemeFunctions:=dctThemeFunctions, clsNewGlobalAesFunction:=clsRaesFunction, clsNewXScalecontinuousFunction:=clsXScaleContinuousFunction, clsNewYScalecontinuousFunction:=clsYScaleContinuousFunction, clsNewXLabsTitleFunction:=clsXlabsFunction, clsNewYLabTitleFunction:=clsYlabFunction, clsNewLabsFunction:=clsLabsFunction, clsNewFacetFunction:=clsFacetFunction, ucrNewBaseSelector:=ucrSelectorClimaticBoxPlot, bReset:=bResetSubdialog) 'this is a temporary fix because we have facets done on the main dialog sdgPlots.tbpFacet.Enabled = False sdgPlots.ShowDialog() diff --git a/instat/sdgPlots.vb b/instat/sdgPlots.vb index 9fdb097129f..2a42a51bf27 100644 --- a/instat/sdgPlots.vb +++ b/instat/sdgPlots.vb @@ -325,7 +325,7 @@ Public Class sdgPlots ucrChkYaxisTickMarkLabelSize.AddParameterPresentCondition(False, "size", False) End Sub - Public Sub SetRCode(clsNewOperator As ROperator, Optional clsNewGlobalAesFunction As RFunction = Nothing, 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 clsNewThemeFunction As RFunction = Nothing, Optional clsNewCoordPolarFunction As RFunction = Nothing, Optional clsNewCoordPolarStartOperator As ROperator = Nothing, Optional dctNewThemeFunctions As Dictionary(Of String, RFunction) = Nothing, Optional ucrNewBaseSelector As ucrSelector = Nothing, Optional strMainDialogGeomParameterNames() As String = Nothing, Optional bReset As Boolean = False) + Public Sub SetRCode(clsNewOperator As ROperator, clsNewCoordPolarFunction As RFunction, clsNewCoordPolarStartOperator As ROperator, Optional clsNewGlobalAesFunction As RFunction = Nothing, 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 clsNewThemeFunction As RFunction = Nothing, Optional dctNewThemeFunctions As Dictionary(Of String, RFunction) = Nothing, Optional ucrNewBaseSelector As ucrSelector = Nothing, Optional strMainDialogGeomParameterNames() As String = Nothing, Optional bReset As Boolean = False) Dim clsTempParam As RParameter bRCodeSet = False @@ -771,4 +771,5 @@ Public Class sdgPlots clsBaseOperator.RemoveParameterByName("coord_polar") End If End Sub + End Class \ No newline at end of file From 36fc5f13682245ba5218eb1dd5aaf31c0f1b91de Mon Sep 17 00:00:00 2001 From: maxwell fundi Date: Tue, 8 Oct 2019 10:04:19 +0300 Subject: [PATCH 13/14] Additional bug correction on other dialogs. --- instat/dlgClimaticStationMaps.vb | 7 ++++++- instat/dlgCountryColouredMap.vb | 6 +++++- instat/dlgDotPlot.vb | 6 +++++- instat/dlgOptionsByContextBoxplot.vb | 7 ++++++- instat/dlgPICSARainfall.vb | 9 +++++++-- 5 files changed, 29 insertions(+), 6 deletions(-) diff --git a/instat/dlgClimaticStationMaps.vb b/instat/dlgClimaticStationMaps.vb index a0ced9eca9e..2e2c0e65e9c 100644 --- a/instat/dlgClimaticStationMaps.vb +++ b/instat/dlgClimaticStationMaps.vb @@ -17,6 +17,8 @@ Imports instat.Translations Public Class dlgClimaticStationMaps Private bFirstLoad As Boolean = True + Private clsCoordPolarFunction As New RFunction + Private clsCoordPolarStartOperator As New ROperator Private bReset As Boolean = True Private clsGgplotFunction, clsGeomSfFunction, clsGeomPointFunction, clsSfAesFunction, clsGeomPointAesFunction, clsFacetFunction, clsScaleShapeFunction, clsLabelRepelFunction As RFunction Private clsGGplotOperator, clsFacetOp As New ROperator @@ -182,6 +184,8 @@ Public Class dlgClimaticStationMaps clsRFacetFunction = GgplotDefaults.clsFacetFunction.Clone() clsYlabFunction = GgplotDefaults.clsYlabTitleFunction.Clone clsThemeFunction = GgplotDefaults.clsDefaultThemeFunction.Clone() + clsCoordPolarStartOperator = GgplotDefaults.clsCoordPolarStartOperator.Clone() + clsCoordPolarFunction = GgplotDefaults.clsCoordPolarFunction.Clone() dctThemeFunctions = New Dictionary(Of String, RFunction)(GgplotDefaults.dctThemeFunctions) clsLocalRaesFunction = GgplotDefaults.clsAesFunction.Clone() @@ -193,7 +197,8 @@ Public Class dlgClimaticStationMaps End Sub Private Sub cmdPlotOptions_Click(sender As Object, e As EventArgs) Handles cmdPlotOptions.Click - sdgPlots.SetRCode(clsGGplotOperator, clsNewThemeFunction:=clsThemeFunction, dctNewThemeFunctions:=dctThemeFunctions, clsNewGlobalAesFunction:=clsSfAesFunction, clsNewXScalecontinuousFunction:=clsXScaleContinuousFunction, clsNewYScalecontinuousFunction:=clsYScaleContinuousFunction, clsNewXLabsTitleFunction:=clsXlabsFunction, clsNewYLabTitleFunction:=clsYlabFunction, clsNewLabsFunction:=clsLabsFunction, clsNewFacetFunction:=clsRFacetFunction, ucrNewBaseSelector:=ucrSelectorStation, bReset:=bResetSubdialog) + sdgPlots.SetRCode(clsGGplotOperator, + clsNewCoordPolarFunction:=clsCoordPolarFunction, clsNewCoordPolarStartOperator:=clsCoordPolarStartOperator, clsNewThemeFunction:=clsThemeFunction, dctNewThemeFunctions:=dctThemeFunctions, clsNewGlobalAesFunction:=clsSfAesFunction, clsNewXScalecontinuousFunction:=clsXScaleContinuousFunction, clsNewYScalecontinuousFunction:=clsYScaleContinuousFunction, clsNewXLabsTitleFunction:=clsXlabsFunction, clsNewYLabTitleFunction:=clsYlabFunction, clsNewLabsFunction:=clsLabsFunction, clsNewFacetFunction:=clsRFacetFunction, ucrNewBaseSelector:=ucrSelectorStation, bReset:=bResetSubdialog) sdgPlots.ShowDialog() bResetSubdialog = False End Sub diff --git a/instat/dlgCountryColouredMap.vb b/instat/dlgCountryColouredMap.vb index e053ec576df..79f307ce0b3 100644 --- a/instat/dlgCountryColouredMap.vb +++ b/instat/dlgCountryColouredMap.vb @@ -49,6 +49,8 @@ Public Class dlgCountryColouredMap Private bResetLayerSubdialog As Boolean = True Private bResetMapOptions As Boolean = True + Private clsCoordPolarFunction As New RFunction + Private clsCoordPolarStartOperator As New ROperator Private Sub dlgCountryColouredMap_Load(sender As Object, e As EventArgs) Handles MyBase.Load If bFirstLoad Then @@ -177,6 +179,8 @@ Public Class dlgCountryColouredMap clsYScaleContinuousFunction = GgplotDefaults.clsYScalecontinuousFunction.Clone() clsRFacetFunction = GgplotDefaults.clsFacetFunction.Clone() clsYlabFunction = GgplotDefaults.clsYlabTitleFunction.Clone + clsCoordPolarStartOperator = GgplotDefaults.clsCoordPolarStartOperator.Clone() + clsCoordPolarFunction = GgplotDefaults.clsCoordPolarFunction.Clone() clsThemeFunction = GgplotDefaults.clsDefaultThemeFunction.Clone() dctThemeFunctions = New Dictionary(Of String, RFunction)(GgplotDefaults.dctThemeFunctions) clsLocalRaesFunction = GgplotDefaults.clsAesFunction.Clone() @@ -209,7 +213,7 @@ Public Class dlgCountryColouredMap TestOKEnabled() End Sub Private Sub cmdOptions_Click(sender As Object, e As EventArgs) Handles cmdPlotOptions.Click - sdgPlots.SetRCode(clsBaseOperator, clsNewThemeFunction:=clsThemeFunction, dctNewThemeFunctions:=dctThemeFunctions, clsNewGlobalAesFunction:=clsRaesFunc, clsNewXScalecontinuousFunction:=clsXScaleContinuousFunction, clsNewYScalecontinuousFunction:=clsYScaleContinuousFunction, clsNewXLabsTitleFunction:=clsXlabsFunction, clsNewYLabTitleFunction:=clsYlabFunction, clsNewLabsFunction:=clsLabsFunction, clsNewFacetFunction:=clsRFacetFunction, ucrNewBaseSelector:=ucrSelectorCountryColouredMap, bReset:=bResetSubDialog) + sdgPlots.SetRCode(clsBaseOperator, clsNewCoordPolarFunction:=clsCoordPolarFunction, clsNewCoordPolarStartOperator:=clsCoordPolarStartOperator, clsNewThemeFunction:=clsThemeFunction, dctNewThemeFunctions:=dctThemeFunctions, clsNewGlobalAesFunction:=clsRaesFunc, clsNewXScalecontinuousFunction:=clsXScaleContinuousFunction, clsNewYScalecontinuousFunction:=clsYScaleContinuousFunction, clsNewXLabsTitleFunction:=clsXlabsFunction, clsNewYLabTitleFunction:=clsYlabFunction, clsNewLabsFunction:=clsLabsFunction, clsNewFacetFunction:=clsRFacetFunction, ucrNewBaseSelector:=ucrSelectorCountryColouredMap, bReset:=bResetSubDialog) bResetSubDialog = False sdgPlots.ShowDialog() End Sub diff --git a/instat/dlgDotPlot.vb b/instat/dlgDotPlot.vb index f526fb2f1d5..0d6ba38a6ab 100644 --- a/instat/dlgDotPlot.vb +++ b/instat/dlgDotPlot.vb @@ -40,6 +40,8 @@ Public Class dlgDotPlot Private bEditAesFunction As Boolean Private clsLocalRaesFunction As New RFunction Private bResetDotLayerSubdialog As Boolean = True + Private clsCoordPolarFunction As New RFunction + Private clsCoordPolarStartOperator As New ROperator Private Sub dlgDotPlot_Load(sender As Object, e As EventArgs) Handles MyBase.Load If bFirstLoad Then @@ -155,6 +157,8 @@ Public Class dlgDotPlot clsXScalecontinuousFunction = GgplotDefaults.clsXScalecontinuousFunction.Clone() clsYScalecontinuousFunction = GgplotDefaults.clsYScalecontinuousFunction.Clone clsRFacetFunction = GgplotDefaults.clsFacetFunction.Clone() + clsCoordPolarStartOperator = GgplotDefaults.clsCoordPolarStartOperator.Clone() + clsCoordPolarFunction = GgplotDefaults.clsCoordPolarFunction.Clone() dctThemeFunctions = New Dictionary(Of String, RFunction)(GgplotDefaults.dctThemeFunctions) clsThemeFunction = GgplotDefaults.clsDefaultThemeFunction clsLocalRaesFunction = GgplotDefaults.clsAesFunction.Clone() @@ -206,7 +210,7 @@ Public Class dlgDotPlot End Sub Private Sub cmdOptions_Click(sender As Object, e As EventArgs) Handles cmdOptions.Click - sdgPlots.SetRCode(clsBaseOperator, clsNewYScalecontinuousFunction:=clsYScalecontinuousFunction, clsNewGlobalAesFunction:=clsRaesFunction, clsNewXScalecontinuousFunction:=clsXScalecontinuousFunction, clsNewXLabsTitleFunction:=clsXlabsFunction, clsNewYLabTitleFunction:=clsYlabFunction, clsNewLabsFunction:=clsLabsFunction, clsNewFacetFunction:=clsRFacetFunction, clsNewThemeFunction:=clsThemeFunction, dctNewThemeFunctions:=dctThemeFunctions, ucrNewBaseSelector:=ucrDotPlotSelector, bReset:=bResetSubdialog) + sdgPlots.SetRCode(clsBaseOperator, clsNewCoordPolarFunction:=clsCoordPolarFunction, clsNewCoordPolarStartOperator:=clsCoordPolarStartOperator, clsNewYScalecontinuousFunction:=clsYScalecontinuousFunction, clsNewGlobalAesFunction:=clsRaesFunction, clsNewXScalecontinuousFunction:=clsXScalecontinuousFunction, clsNewXLabsTitleFunction:=clsXlabsFunction, clsNewYLabTitleFunction:=clsYlabFunction, clsNewLabsFunction:=clsLabsFunction, clsNewFacetFunction:=clsRFacetFunction, clsNewThemeFunction:=clsThemeFunction, dctNewThemeFunctions:=dctThemeFunctions, ucrNewBaseSelector:=ucrDotPlotSelector, bReset:=bResetSubdialog) sdgPlots.ShowDialog() bResetSubdialog = False End Sub diff --git a/instat/dlgOptionsByContextBoxplot.vb b/instat/dlgOptionsByContextBoxplot.vb index d969e8824ee..fa368caf8fe 100644 --- a/instat/dlgOptionsByContextBoxplot.vb +++ b/instat/dlgOptionsByContextBoxplot.vb @@ -56,6 +56,9 @@ Public Class dlgOptionsByContextBoxplot Private strColour As String = "Colour" Private strNone As String = "None" + Private clsCoordPolarFunction As New RFunction + Private clsCoordPolarStartOperator As New ROperator + Private Sub dlgOptionsByContextBoxplot_Load(sender As Object, e As EventArgs) Handles MyBase.Load If bFirstLoad Then InitialiseDialog() @@ -259,6 +262,8 @@ Public Class dlgOptionsByContextBoxplot clsXScaleContinuousFunction = GgplotDefaults.clsXScalecontinuousFunction.Clone() clsYScaleContinuousFunction = GgplotDefaults.clsYScalecontinuousFunction.Clone() clsYLabFunction = GgplotDefaults.clsYlabTitleFunction.Clone + clsCoordPolarStartOperator = GgplotDefaults.clsCoordPolarStartOperator.Clone() + clsCoordPolarFunction = GgplotDefaults.clsCoordPolarFunction.Clone() clsThemeFunction = GgplotDefaults.clsDefaultThemeFunction.Clone() dctThemeFunctions = New Dictionary(Of String, RFunction)(GgplotDefaults.dctThemeFunctions) @@ -317,7 +322,7 @@ Public Class dlgOptionsByContextBoxplot End Sub Private Sub cmdOptions_Click(sender As Object, e As EventArgs) Handles cmdOptions.Click - sdgPlots.SetRCode(clsBaseOperator, clsNewThemeFunction:=clsThemeFunction, dctNewThemeFunctions:=dctThemeFunctions, clsNewGlobalAesFunction:=clsRaesGlobalFunction, clsNewXScalecontinuousFunction:=clsXScaleContinuousFunction, clsNewYScalecontinuousFunction:=clsYScaleContinuousFunction, clsNewXLabsTitleFunction:=clsXLabsFunction, clsNewYLabTitleFunction:=clsYLabFunction, clsNewLabsFunction:=clsLabsFunction, clsNewFacetFunction:=clsFacetFunction, ucrNewBaseSelector:=ucrSelectorPlot, bReset:=bResetSubdialog) + sdgPlots.SetRCode(clsBaseOperator, clsNewCoordPolarFunction:=clsCoordPolarFunction, clsNewCoordPolarStartOperator:=clsCoordPolarStartOperator, clsNewThemeFunction:=clsThemeFunction, dctNewThemeFunctions:=dctThemeFunctions, clsNewGlobalAesFunction:=clsRaesGlobalFunction, clsNewXScalecontinuousFunction:=clsXScaleContinuousFunction, clsNewYScalecontinuousFunction:=clsYScaleContinuousFunction, clsNewXLabsTitleFunction:=clsXLabsFunction, clsNewYLabTitleFunction:=clsYLabFunction, clsNewLabsFunction:=clsLabsFunction, clsNewFacetFunction:=clsFacetFunction, ucrNewBaseSelector:=ucrSelectorPlot, bReset:=bResetSubdialog) 'this is a temporary fix because we have facets done on the main dialog sdgPlots.tbpFacet.Enabled = False sdgPlots.ShowDialog() diff --git a/instat/dlgPICSARainfall.vb b/instat/dlgPICSARainfall.vb index 318b1e6bfd1..63fb3e5543c 100644 --- a/instat/dlgPICSARainfall.vb +++ b/instat/dlgPICSARainfall.vb @@ -94,6 +94,9 @@ Public Class dlgPICSARainfall Private clsAsDate As New RFunction Private clsAsNumeric As New RFunction + Private clsCoordPolarFunction As New RFunction + Private clsCoordPolarStartOperator As New ROperator + Private Sub dlgPCSARainfall_Load(sender As Object, e As EventArgs) Handles MyBase.Load If bFirstLoad Then @@ -559,7 +562,8 @@ Public Class dlgPICSARainfall clsAsNumeric.SetRCommand("as.numeric") clsRaesFunction.AddParameter("y", clsRFunctionParameter:=clsAsNumeric, iPosition:=1) - + clsCoordPolarStartOperator = GgplotDefaults.clsCoordPolarStartOperator.Clone() + clsCoordPolarFunction = GgplotDefaults.clsCoordPolarFunction.Clone() clsBaseOperator.AddParameter("theme", clsRFunctionParameter:=clsThemeFunction, iPosition:=100) clsBaseOperator.SetAssignTo("last_graph", strTempDataframe:=ucrSelectorPICSARainfall.ucrAvailableDataFrames.cboAvailableDataFrames.Text, strTempGraph:="last_graph") ucrBase.clsRsyntax.SetBaseROperator(clsBaseOperator) @@ -623,7 +627,8 @@ Public Class dlgPICSARainfall End Sub Private Sub cmdOptions_Click(sender As Object, e As EventArgs) Handles cmdOptions.Click - sdgPlots.SetRCode(clsNewOperator:=ucrBase.clsRsyntax.clsBaseOperator, clsNewYScalecontinuousFunction:=clsYScalecontinuousFunction, clsNewXScalecontinuousFunction:=clsXScalecontinuousFunction, clsNewXLabsTitleFunction:=clsXLabsFunction, clsNewYLabTitleFunction:=clsYLabsFunction, clsNewLabsFunction:=clsLabsFunction, clsNewFacetFunction:=clsFacetFunction, clsNewThemeFunction:=clsThemeFunction, dctNewThemeFunctions:=dctThemeFunctions, clsNewGlobalAesFunction:=clsRaesFunction, ucrNewBaseSelector:=ucrSelectorPICSARainfall, bReset:=bResetSubdialog) + sdgPlots.SetRCode(clsNewOperator:=ucrBase.clsRsyntax.clsBaseOperator, clsNewCoordPolarFunction:=clsCoordPolarFunction, clsNewCoordPolarStartOperator:=clsCoordPolarStartOperator, + clsNewYScalecontinuousFunction:=clsYScalecontinuousFunction, clsNewXScalecontinuousFunction:=clsXScalecontinuousFunction, clsNewXLabsTitleFunction:=clsXLabsFunction, clsNewYLabTitleFunction:=clsYLabsFunction, clsNewLabsFunction:=clsLabsFunction, clsNewFacetFunction:=clsFacetFunction, clsNewThemeFunction:=clsThemeFunction, dctNewThemeFunctions:=dctThemeFunctions, clsNewGlobalAesFunction:=clsRaesFunction, ucrNewBaseSelector:=ucrSelectorPICSARainfall, bReset:=bResetSubdialog) sdgPlots.ShowDialog() bResetSubdialog = False 'AddRemoveGroupByAndHlines() From b633a94146cae9b2339d9aab457749cc95f52616 Mon Sep 17 00:00:00 2001 From: maxwell fundi Date: Tue, 8 Oct 2019 14:09:33 +0300 Subject: [PATCH 14/14] making parameters mandatory for the sdgPlots SetRRCode. --- instat/sdgPlots.vb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/instat/sdgPlots.vb b/instat/sdgPlots.vb index 2a42a51bf27..e2583868309 100644 --- a/instat/sdgPlots.vb +++ b/instat/sdgPlots.vb @@ -325,7 +325,7 @@ Public Class sdgPlots ucrChkYaxisTickMarkLabelSize.AddParameterPresentCondition(False, "size", False) End Sub - Public Sub SetRCode(clsNewOperator As ROperator, clsNewCoordPolarFunction As RFunction, clsNewCoordPolarStartOperator As ROperator, Optional clsNewGlobalAesFunction As RFunction = Nothing, 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 clsNewThemeFunction As RFunction = Nothing, Optional dctNewThemeFunctions As Dictionary(Of String, RFunction) = Nothing, Optional ucrNewBaseSelector As ucrSelector = Nothing, Optional strMainDialogGeomParameterNames() As String = Nothing, Optional bReset As Boolean = False) + Public Sub SetRCode(clsNewOperator As ROperator, clsNewCoordPolarFunction As RFunction, clsNewCoordPolarStartOperator As ROperator, clsNewYScalecontinuousFunction As RFunction, clsNewXScalecontinuousFunction As RFunction, clsNewLabsFunction As RFunction, clsNewXLabsTitleFunction As RFunction, clsNewYLabTitleFunction As RFunction, clsNewFacetFunction As RFunction, clsNewThemeFunction As RFunction, dctNewThemeFunctions As Dictionary(Of String, RFunction), ucrNewBaseSelector As ucrSelector, bReset As Boolean, Optional clsNewGlobalAesFunction As RFunction = Nothing, Optional strMainDialogGeomParameterNames() As String = Nothing) Dim clsTempParam As RParameter bRCodeSet = False