diff --git a/instat/MultilingualResources/instat.fr-FR.xlf b/instat/MultilingualResources/instat.fr-FR.xlf index 30c5dcaff2c..97db1c44f13 100644 --- a/instat/MultilingualResources/instat.fr-FR.xlf +++ b/instat/MultilingualResources/instat.fr-FR.xlf @@ -1640,18 +1640,6 @@ Response Variable Response Variable - - 302, 56 - 302, 56 - - - 106, 26 - 106, 26 - - - 2 - 2 - 302, 24 302, 24 @@ -1762,6 +1750,51 @@ 1 1 + + 302, 56 + 302, 56 + + + 106, 26 + 106, 26 + + + 13 + 12 + Please verify the translation’s accuracy as the source string was updated after it was translated. + + + NoControl + NoControl + + + NoControl + NoControl + + + NoControl + NoControl + + + NoControl + NoControl + + + NoControl + NoControl + + + NoControl + NoControl + + + NoControl + NoControl + + + NoControl + NoControl + diff --git a/instat/MultilingualResources/instat.sw-KE.xlf b/instat/MultilingualResources/instat.sw-KE.xlf index 74e209122ba..cd216571a40 100644 --- a/instat/MultilingualResources/instat.sw-KE.xlf +++ b/instat/MultilingualResources/instat.sw-KE.xlf @@ -1641,18 +1641,6 @@ Response Variable Response Variable - - 302, 56 - 302, 56 - - - 106, 26 - 106, 26 - - - 2 - 2 - 302, 24 302, 24 @@ -1763,6 +1751,51 @@ 1 1 + + 302, 56 + 302, 56 + + + 106, 26 + 106, 26 + + + 13 + 12 + Please verify the translation’s accuracy as the source string was updated after it was translated. + + + NoControl + NoControl + + + NoControl + NoControl + + + NoControl + NoControl + + + NoControl + NoControl + + + NoControl + NoControl + + + NoControl + NoControl + + + NoControl + NoControl + + + NoControl + NoControl + diff --git a/instat/dlgRegressionSimple.Designer.vb b/instat/dlgRegressionSimple.Designer.vb index 97f8804d5e9..5106c4f876b 100644 --- a/instat/dlgRegressionSimple.Designer.vb +++ b/instat/dlgRegressionSimple.Designer.vb @@ -25,6 +25,7 @@ Partial Class dlgRegressionSimple Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(dlgRegressionSimple)) Me.tbctrlSimple = New System.Windows.Forms.TabControl() Me.tbRegress = New System.Windows.Forms.TabPage() + Me.ucrReceiverSingleB = New instat.ucrReceiverSingle() Me.grpLackFit = New System.Windows.Forms.GroupBox() Me.txtdf = New System.Windows.Forms.TextBox() Me.txtResidualMsg = New System.Windows.Forms.TextBox() @@ -38,7 +39,6 @@ Partial Class dlgRegressionSimple Me.lblConfidence = New System.Windows.Forms.Label() Me.lblExplanatoryVariable = New System.Windows.Forms.Label() Me.lblResponseVariable = New System.Windows.Forms.Label() - Me.ucrReceiverSingleB = New instat.ucrReceiverSingle() Me.ucrReceiverSingleA = New instat.ucrReceiverSingle() Me.ucrAddRemove = New instat.ucrSelectorAddRemove() Me.tbPlot = New System.Windows.Forms.TabPage() @@ -60,6 +60,7 @@ Partial Class dlgRegressionSimple ' 'tbRegress ' + Me.tbRegress.Controls.Add(Me.ucrReceiverSingleB) Me.tbRegress.Controls.Add(Me.grpLackFit) Me.tbRegress.Controls.Add(Me.chkLackFit) Me.tbRegress.Controls.Add(Me.chkAnovaTable) @@ -69,13 +70,17 @@ Partial Class dlgRegressionSimple Me.tbRegress.Controls.Add(Me.lblConfidence) Me.tbRegress.Controls.Add(Me.lblExplanatoryVariable) Me.tbRegress.Controls.Add(Me.lblResponseVariable) - Me.tbRegress.Controls.Add(Me.ucrReceiverSingleB) Me.tbRegress.Controls.Add(Me.ucrReceiverSingleA) Me.tbRegress.Controls.Add(Me.ucrAddRemove) resources.ApplyResources(Me.tbRegress, "tbRegress") Me.tbRegress.Name = "tbRegress" Me.tbRegress.UseVisualStyleBackColor = True ' + 'ucrReceiverSingleB + ' + resources.ApplyResources(Me.ucrReceiverSingleB, "ucrReceiverSingleB") + Me.ucrReceiverSingleB.Name = "ucrReceiverSingleB" + ' 'grpLackFit ' Me.grpLackFit.Controls.Add(Me.txtdf) @@ -160,11 +165,6 @@ Partial Class dlgRegressionSimple Me.lblResponseVariable.Name = "lblResponseVariable" Me.lblResponseVariable.Tag = "Response_Variable" ' - 'ucrReceiverSingleB - ' - resources.ApplyResources(Me.ucrReceiverSingleB, "ucrReceiverSingleB") - Me.ucrReceiverSingleB.Name = "ucrReceiverSingleB" - ' 'ucrReceiverSingleA ' resources.ApplyResources(Me.ucrReceiverSingleA, "ucrReceiverSingleA") @@ -228,10 +228,10 @@ Partial Class dlgRegressionSimple Friend WithEvents lblConfidence As Label Friend WithEvents lblExplanatoryVariable As Label Friend WithEvents lblResponseVariable As Label - Friend WithEvents ucrReceiverSingleB As ucrReceiverSingle Friend WithEvents ucrReceiverSingleA As ucrReceiverSingle Friend WithEvents ucrAddRemove As ucrSelectorAddRemove Friend WithEvents tbPlot As TabPage Friend WithEvents tbSave As TabPage Friend WithEvents ucrBase As ucrButtons + Friend WithEvents ucrReceiverSingleB As ucrReceiverSingle End Class diff --git a/instat/dlgRegressionSimple.fr-FR.resx b/instat/dlgRegressionSimple.fr-FR.resx index 9f3b5cf73f7..12cb63cc924 100644 --- a/instat/dlgRegressionSimple.fr-FR.resx +++ b/instat/dlgRegressionSimple.fr-FR.resx @@ -171,15 +171,6 @@ 3 - - 302, 56 - - - 106, 26 - - - 2 - 302, 24 @@ -252,4 +243,37 @@ 1 + + 302, 56 + + + 106, 26 + + + 12 + + + NoControl + + + NoControl + + + NoControl + + + NoControl + + + NoControl + + + NoControl + + + NoControl + + + NoControl + \ No newline at end of file diff --git a/instat/dlgRegressionSimple.resx b/instat/dlgRegressionSimple.resx index 81a9ce9480c..c7c09cdbbc3 100644 --- a/instat/dlgRegressionSimple.resx +++ b/instat/dlgRegressionSimple.resx @@ -118,13 +118,34 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 302, 56 + + + 106, 26 + + + + 13 + + + ucrReceiverSingleB + + + instat.ucrReceiverSingle, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + + tbRegress + + + 0 + 118, 43 58, 20 - 12 @@ -164,6 +185,10 @@ True + + + NoControl + 7, 43 @@ -191,6 +216,9 @@ True + + NoControl + 7, 11 @@ -234,11 +262,14 @@ tbRegress - 0 + 1 True + + NoControl + 9, 179 @@ -261,11 +292,14 @@ tbRegress - 1 + 2 True + + NoControl + 243, 141 @@ -288,11 +322,14 @@ tbRegress - 2 + 3 True + + NoControl + 144, 141 @@ -315,11 +352,14 @@ tbRegress - 3 + 4 True + + NoControl + 9, 141 @@ -342,7 +382,7 @@ tbRegress - 4 + 5 @@ -381,11 +421,14 @@ tbRegress - 5 + 6 True + + NoControl + 191, 111 @@ -408,12 +451,11 @@ tbRegress - 6 + 7 True - NoControl @@ -439,11 +481,14 @@ tbRegress - 7 + 8 True + + NoControl + 191, 37 @@ -466,27 +511,6 @@ tbRegress - 8 - - - 302, 56 - - - 106, 26 - - - 2 - - - ucrReceiverSingleB - - - instat.ucrReceiverSingle, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - - tbRegress - - 9 diff --git a/instat/dlgRegressionSimple.sw-KE.resx b/instat/dlgRegressionSimple.sw-KE.resx index 9f3b5cf73f7..12cb63cc924 100644 --- a/instat/dlgRegressionSimple.sw-KE.resx +++ b/instat/dlgRegressionSimple.sw-KE.resx @@ -171,15 +171,6 @@ 3 - - 302, 56 - - - 106, 26 - - - 2 - 302, 24 @@ -252,4 +243,37 @@ 1 + + 302, 56 + + + 106, 26 + + + 12 + + + NoControl + + + NoControl + + + NoControl + + + NoControl + + + NoControl + + + NoControl + + + NoControl + + + NoControl + \ No newline at end of file diff --git a/instat/dlgRegressionSimple.vb b/instat/dlgRegressionSimple.vb index 88025fa590f..388d5b1e113 100644 --- a/instat/dlgRegressionSimple.vb +++ b/instat/dlgRegressionSimple.vb @@ -20,6 +20,7 @@ Public Class dlgRegressionSimple Private Sub dlgRegressionSimple_Load(sender As Object, e As EventArgs) Handles Me.Load ucrBase.clsRsyntax.SetFunction("summary(lm") ucrBase.clsRsyntax.iCallType = 2 + ucrBase.clsRsyntax.iFunctionType = "Stats" ucrReceiverSingleA.Selector = ucrAddRemove ucrReceiverSingleA.SetMeAsReceiver() grpLackFit.Enabled = False @@ -34,22 +35,17 @@ Public Class dlgRegressionSimple End If End Sub - Private Sub ucrReceiverSingleA_MouseHover(sender As Object, e As EventArgs) Handles ucrReceiverSingleA.MouseHover - ucrReceiverSingleA.Selector = ucrAddRemove - ucrReceiverSingleA.SetMeAsReceiver() - End Sub - Private Sub ucrReceiverSingleB_Enter(sender As Object, e As EventArgs) Handles ucrReceiverSingleB.Enter ucrReceiverSingleB.Selector = ucrAddRemove ucrReceiverSingleB.SetMeAsReceiver() End Sub Private Sub ucrReceiverSingleA_Leave(sender As Object, e As EventArgs) Handles ucrReceiverSingleA.Leave - ucrBase.clsRsyntax.AddParameter("x", "data$" & ucrReceiverSingleA.txtReceiverSingle.Text & "") + ucrBase.clsRsyntax.AddParameter(ucrReceiverSingleA.txtReceiverSingle.Text, "") End Sub Private Sub ucrReceiverSingleB_Leave(sender As Object, e As EventArgs) Handles ucrReceiverSingleB.Leave - ucrBase.clsRsyntax.AddParameter("x", "data$" & ucrReceiverSingleB.txtReceiverSingle.Text & "") + ucrBase.clsRsyntax.AddParameter(ucrReceiverSingleB.txtReceiverSingle.Text, "") End Sub End Class \ No newline at end of file diff --git a/instat/instat.vbproj b/instat/instat.vbproj index d22fb2ccab4..27f1366d4dd 100644 --- a/instat/instat.vbproj +++ b/instat/instat.vbproj @@ -591,6 +591,12 @@ UserControl + + ucrReciverSingleB.vb + + + UserControl + ucrSelector.vb diff --git a/instat/rSyntax.vb b/instat/rSyntax.vb index b06e7ee5b23..7ac1f69aa95 100644 --- a/instat/rSyntax.vb +++ b/instat/rSyntax.vb @@ -17,6 +17,7 @@ Public Class RSyntax Dim strFunction As String + Public iFunctionType As String = "Statistics" Public iCallType As Integer = 0 Dim strParameter(1, 0) As String Public strScript As String @@ -65,13 +66,16 @@ Public Class RSyntax End Function Public Function writeScript() As String + strScript = strFunction & "(" For i = 0 To strParameter.GetUpperBound(1) - If i > 0 Then - strScript = strScript & "," + If i = 1 Then + strScript = strScript & "~" + ElseIf i > 2 + strScript = strScript & "+" End If - strScript = strScript & strParameter(0, 1) & "$" & strParameter(1, i) + strScript = strScript & strParameter(0, i) Next - strScript = strScript & ")" + strScript = strScript & ",data = data_temp))" Return strScript End Function diff --git a/instat/ucrButtons.vb b/instat/ucrButtons.vb index c4d26fccc9f..efe2759bdf7 100644 --- a/instat/ucrButtons.vb +++ b/instat/ucrButtons.vb @@ -14,7 +14,9 @@ Public Class ucrButtons Public Event ClickReset(sender As Object, e As EventArgs) Private Sub cmdOk_Click(sender As Object, e As EventArgs) Handles cmdOk.Click - If clsRsyntax.iCallType >= 0 Then + If clsRsyntax.iFunctionType <> "Statistics" Then + frmMain.clsRInterface.RunScript(clsRsyntax.writeScript(), clsRsyntax.iCallType) + Else frmMain.clsRInterface.RunScript(clsRsyntax.GetScript(), clsRsyntax.iCallType) End If RaiseEvent ClickOk(sender, e) diff --git a/instat/ucrReciverSingleB.Designer.vb b/instat/ucrReciverSingleB.Designer.vb new file mode 100644 index 00000000000..4175aac13a4 --- /dev/null +++ b/instat/ucrReciverSingleB.Designer.vb @@ -0,0 +1,25 @@ + _ +Partial Class ucrReciverSingleB + Inherits instat.ucrReceiverSingle + + 'Form overrides dispose to clean up the component list. + _ + Protected Overrides Sub Dispose(ByVal disposing As Boolean) + If disposing AndAlso components IsNot Nothing Then + components.Dispose() + End If + MyBase.Dispose(disposing) + 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 + End Sub + +End Class diff --git a/instat/ucrReciverSingleB.vb b/instat/ucrReciverSingleB.vb new file mode 100644 index 00000000000..a993b8ea9cd --- /dev/null +++ b/instat/ucrReciverSingleB.vb @@ -0,0 +1,3 @@ +Public Class ucrReciverSingleB + +End Class diff --git a/instat/ucrSelector.vb b/instat/ucrSelector.vb index 85cfff0b4bf..fdb19812c2b 100644 --- a/instat/ucrSelector.vb +++ b/instat/ucrSelector.vb @@ -4,18 +4,18 @@ Public Class ucrSelector Public CurrentReceiver As ucrReceiver Private Sub ucrdataselection_load(sender As Object, e As EventArgs) Handles MyBase.Load - 'Dim cvdataset As CharacterVector - 'Dim adataset As Array - 'Dim i As Integer + Dim cvdataset As CharacterVector + Dim adataset As Array + Dim i As Integer - 'translateEach(Controls) - 'cvdataset = frmMain.clsRInterface.GetVariables("colnames(data)") - 'adataset = cvdataset.ToArray - 'For i = 0 To adataset.GetLength(0) - 1 - ' If Not lstAvailableVariable.Items.Contains(adataset(i)) Then - ' lstAvailableVariable.Items.Add(adataset(i)) - ' End If - 'Next + translateEach(Controls) + cvdataset = frmMain.clsRInterface.GetVariables("colnames(data)") + adataset = cvdataset.ToArray + For i = 0 To adataset.GetLength(0) - 1 + If Not lstAvailableVariable.Items.Contains(adataset(i)) Then + lstAvailableVariable.Items.Add(adataset(i)) + End If + Next End Sub Public Sub SetCurrentReciever(conReceiver As ucrReceiver)