Skip to content

Commit

Permalink
Merge pull request #5 from africanmathsinitiative/master
Browse files Browse the repository at this point in the history
Pulling changes from the main
  • Loading branch information
deaspo committed Nov 11, 2015
2 parents 23016c7 + 74c3d9e commit e3c64a8
Show file tree
Hide file tree
Showing 7 changed files with 385 additions and 264 deletions.
76 changes: 39 additions & 37 deletions instat/dlgDotPlot.designer.vb

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

36 changes: 29 additions & 7 deletions instat/dlgDotPlot.vb
Original file line number Diff line number Diff line change
@@ -1,14 +1,36 @@

' Instat-R
' Copyright (C) 2015
'
' This program is free software: you can redistribute it and/or modify
' it under the terms of the GNU General Public License as published by
' the Free Software Foundation, either version 3 of the License, or
' (at your option) any later version.
'
' This program is distributed in the hope that it will be useful,
' but WITHOUT ANY WARRANTY; without even the implied warranty of
' MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
' GNU General Public License for more details.
'
' You should have received a copy of the GNU General Public License k
' along with this program. If not, see <http://www.gnu.org/licenses/>.

Imports instat.Translations

Public Class dlgDotPlot
Private Sub dlgDotPlot_Load(sender As Object, e As EventArgs) Handles MyBase.Load
ucrBase.clsRsyntax.SetFunction("dotchart")
UcrReceiverSingle1.Selector = ucrAddRemove
UcrReceiverSingle1.SetMeAsReceiver()
ucrBase.clsRsyntax.iCallType = 0
autoTranslate(Me)
ucrReceiverSingle.Selector = ucrAddRemove
ucrReceiverSingle.SetMeAsReceiver()
End Sub

Private Sub ucrBase_ClickOk(sender As Object, e As EventArgs) Handles ucrBase.ClickOk
ucrBase.clsRsyntax.AddParameter("x", "data$" & UcrReceiverSingle1.txtReceiverSingle.Text & "")
ucrBase.clsRsyntax.AddParameter("main", Chr(34) & txtTittle.Text & Chr(34))
frmMain.clsRInterface.RunScript(ucrBase.clsRsyntax.GetScript(), 0)
Private Sub txtTitle_Leave(sender As Object, e As EventArgs) Handles txtTitle.Leave
ucrBase.clsRsyntax.AddParameter("main", Chr(34) & txtTitle.Text & Chr(34))
End Sub

Private Sub UcrReceiverSingle1_Leave(sender As Object, e As EventArgs) Handles ucrReceiverSingle.LeftText
ucrBase.clsRsyntax.AddParameter("x", "data$" & ucrReceiverSingle.txtReceiverSingle.Text & "")
End Sub

End Class

0 comments on commit e3c64a8

Please sign in to comment.