Merge pull request #338 from africanmathsinitiative/master

merge from main
IDEMSInternational · Sep 28, 2016 · 688f59a · 688f59a
2 parents 5cc62fc + 0cf3a68
commit 688f59a
Show file tree

Hide file tree

Showing 5 changed files with 258 additions and 181 deletions.
diff --git a/instat/dlgOneVariableGraph.Designer.vb b/instat/dlgOneVariableGraph.Designer.vb
diff --git a/instat/dlgOneVariableGraph.vb b/instat/dlgOneVariableGraph.vb
@@ -51,7 +51,7 @@ Public Class dlgOneVariableGraph
         ucrOneVarGraphSave.strPrefix = "OneVariableGraph"
         ucrOneVarGraphSave.SetDataFrameSelector(ucrSelectorOneVarGraph.ucrAvailableDataFrames)
         ucrBase.clsRsyntax.bExcludeAssignedFunctionOutput = False
-        cmdGraphOptions.Enabled = False
+
         clsBaseOperatorOneColumn.SetOperation("+")
         clsRggplotFunction.SetRCommand("ggplot")
         clsRaesFunction.SetRCommand("aes")
@@ -62,9 +62,11 @@ Public Class dlgOneVariableGraph
         clsRggplotFunction.AddParameter("mapping", clsRFunctionParameter:=clsRaesFunction)
 
         clsBaseFunctionMultipleVariables.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$graph_one_variable")
+        sdgOneVarGraph.SetRSyntax(ucrBase.clsRsyntax)
     End Sub
 
     Private Sub ReopenDialog()
+
     End Sub
 
     Private Sub TestOkEnabled()