adding prefix and seting dataframe selector for plots

IDEMSInternational · Jun 16, 2016 · d6e7036 · d6e7036
1 parent 112d7c0
commit d6e7036
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 4 deletions.
diff --git a/instat/dlgBarAndPieChart.vb b/instat/dlgBarAndPieChart.vb
@@ -57,13 +57,15 @@ Public Class dlgBarAndPieChart
         ucrSecondReceiver.Selector = ucrBarChartSelector
         ucrSecondReceiver.SetIncludedDataTypes({"factor"})
 
-        'sdgBarChart.SetBarChartFunction(clsRgeom_barchart)
-        sdgPieChartOptions.SetPieChartFunction(clsTempRFunc)
+
         sdgPlots.SetRSyntax(ucrBase.clsRsyntax)
         ucrBase.clsRsyntax.iCallType = 0
         ucrBase.iHelpTopicID = 327
 
 
+        ucrSaveBar.SetDataFrameSelector(ucrBarChartSelector.ucrAvailableDataFrames)
+        ucrSaveBar.strPrefix = "Graph"
+
     End Sub
 
     Private Sub ReopenDialog()

diff --git a/instat/dlgCumulativeDistribution.vb b/instat/dlgCumulativeDistribution.vb
@@ -51,6 +51,10 @@ Public Class dlgCumulativeDistribution
         ucrVariablesAsFactorforCumDist.SetSelector(ucrCumDistSelector)
         ucrVariablesAsFactorforCumDist.SetIncludedDataType({"numeric"})
 
+
+        ucrSaveCumDist.SetDataFrameSelector(ucrCumDistSelector.ucrAvailableDataFrames)
+        ucrSaveCumDist.strPrefix = "Graph"
+
     End Sub
 
     Private Sub SetDefaults()

diff --git a/instat/dlgDotPlot.vb b/instat/dlgDotPlot.vb
@@ -54,8 +54,7 @@ Public Class dlgDotPlot
         ucrBase.iHelpTopicID = 134
 
         ucrSaveDotPlot.SetDataFrameSelector(ucrDotPlotSelector.ucrAvailableDataFrames)
-        ucrSaveDotPlot.ucrInputGraphName.SetPrefix("Graph")
-
+        ucrSaveDotPlot.strPrefix = "Graph"
     End Sub
 
     Private Sub TestOkEnabled()

diff --git a/instat/dlgPlot.vb b/instat/dlgPlot.vb
@@ -69,6 +69,8 @@ Public Class dlgPlot
         ucrVariablesAsFactorForLinePlot.SetSelector(ucrLinePlotSelector)
         ucrVariablesAsFactorForLinePlot.SetIncludedDataType({"numeric"})
 
+        ucrSaveLinePlot.SetDataFrameSelector(ucrLinePlotSelector.ucrAvailableDataFrames)
+        ucrSaveLinePlot.strPrefix = "Graph"
     End Sub
     Private Sub TeskOkEnabled()
         If ucrReceiverX.IsEmpty() = True Or ucrVariablesAsFactorForLinePlot.IsEmpty() Then

diff --git a/instat/dlgScatterPlot.vb b/instat/dlgScatterPlot.vb
@@ -84,6 +84,10 @@ Public Class dlgScatterPlot
         ucrVariablesAsFactorForScatter.SetExcludedDataTypes({"numeric"})
         sdgPlots.SetRSyntax(ucrBase.clsRsyntax)
         ucrBase.iHelpTopicID = 16
+
+
+        ucrSaveScatterPlot.SetDataFrameSelector(ucrSelectorForScatter.ucrAvailableDataFrames)
+        ucrSaveScatterPlot.strPrefix = "Graph"
     End Sub
     Private Sub SetDefaults()
         'setDefaults

diff --git a/instat/dlgSummaryBarOrPieChart.vb b/instat/dlgSummaryBarOrPieChart.vb
@@ -56,6 +56,9 @@ Public Class dlgSummaryBarOrPieChart
         ucrYReceiver.SetMeAsReceiver()
         ucrBase.clsRsyntax.iCallType = 0
         sdgPlots.SetRSyntax(ucrBase.clsRsyntax)
+
+        ucrSaveSummaryBar.SetDataFrameSelector(ucrSummarybarSelector.ucrAvailableDataFrames)
+        ucrSaveSummaryBar.strPrefix = "Graph"
     End Sub
     Private Sub SetDefaults()
         ucrSummarybarSelector.Reset()