diff --git a/instat/clsRLink.vb b/instat/clsRLink.vb index 9fef06a2246..1ef407e5937 100644 --- a/instat/clsRLink.vb +++ b/instat/clsRLink.vb @@ -68,45 +68,57 @@ Public Class RLink bLog = True End Sub + Public Function GetDataFrameNames() As List(Of String) + Dim chrDataFrameNames As CharacterVector + Dim lstDataFrameNames As New List(Of String) + chrDataFrameNames = clsEngine.Evaluate(frmMain.clsRLink.strInstatDataObject & "$get_data_names()").AsCharacter + lstDataFrameNames.AddRange(chrDataFrameNames) + Return lstDataFrameNames + End Function + + Public Function GetColumnNames(strDataFrameName As String) As List(Of String) + Dim chrCurrColumns As CharacterVector + Dim lstCurrColumns As New List(Of String) + chrCurrColumns = clsEngine.Evaluate(strInstatDataObject & "$get_column_names(" & Chr(34) & strDataFrameName & Chr(34) & ")").AsCharacter + lstCurrColumns.AddRange(chrCurrColumns) + Return lstCurrColumns + End Function + Public Sub FillComboDataFrames(ByRef cboDataFrames As ComboBox, Optional bSetDefault As Boolean = True) - Dim lstAvailableDataFrames As GenericVector - Dim i As Integer If bInstatObjectExists Then - lstAvailableDataFrames = clsEngine.Evaluate(strInstatDataObject & "$get_data_names()").AsList - cboDataFrames.Items.Clear() - For i = 0 To lstAvailableDataFrames.Length - 1 - cboDataFrames.Items.Add(lstAvailableDataFrames.AsCharacter(i)) - Next + cboDataFrames.Items.Clear() + cboDataFrames.Items.AddRange(GetDataFrameNames().ToArray) End If + If bSetDefault Then - cboDataFrames.Text = frmEditor.grdData.CurrentWorksheet.Name + cboDataFrames.SelectedIndex = cboDataFrames.Items.IndexOf(frmEditor.grdData.CurrentWorksheet.Name) End If End Sub - Public Sub FillColumnNames(strDataFrame As String, Optional ByRef cboColumns As ComboBox = Nothing, Optional ByRef lstColumns As ListView = Nothing) - Dim lstCurrColumns As GenericVector - Dim i As Integer + Public Sub FillColumnNames(strDataFrame As String, ByRef cboColumns As ComboBox) + Dim lstCurrColumns As List(Of String) - If bInstatObjectExists Then - If clsEngine IsNot Nothing Then - lstCurrColumns = clsEngine.Evaluate(strInstatDataObject & "$get_column_names(" & Chr(34) & strDataFrame & Chr(34) & ")").AsList - If cboColumns IsNot Nothing Then - cboColumns.Items.Clear() - For i = 0 To lstCurrColumns.Length - 1 - cboColumns.Items.Add(lstCurrColumns.AsCharacter(i)) - Next - ElseIf lstColumns IsNot Nothing Then - lstColumns.Items.Clear() - If lstColumns.Columns.Count = 0 Then - lstColumns.Columns.Add("Available Data") - End If - For i = 0 To lstCurrColumns.Length - 1 - lstColumns.Items.Add(lstCurrColumns.AsCharacter(i)) - Next - lstColumns.Columns(0).Width = -2 - End If - End If + If bInstatObjectExists AndAlso clsEngine IsNot Nothing Then + lstCurrColumns = GetColumnNames(strDataFrame) + cboColumns.Items.Clear() + cboColumns.Items.AddRange(lstCurrColumns.ToArray) + End If + End Sub + + Public Sub FillColumnNames(strDataFrame As String, ByRef lstColumns As ListView) + Dim lstCurrColumns As List(Of String) + + If bInstatObjectExists AndAlso clsEngine IsNot Nothing Then + lstCurrColumns = GetColumnNames(strDataFrame) + lstColumns.Items.Clear() + If lstColumns.Columns.Count = 0 Then + lstColumns.Columns.Add("Available Data") + End If + For Each strTemp In lstCurrColumns + lstColumns.Items.Add(strTemp) + Next + lstColumns.Columns(0).Width = -2 End If End Sub @@ -310,4 +322,12 @@ Public Class RLink End If Return intLength End Function + + Public Function GetModelNames() As List(Of String) + Dim chrModelNames As CharacterVector + Dim lstModelNames As New List(Of String) + chrModelNames = clsEngine.Evaluate(frmMain.clsRLink.strInstatDataObject & "$get_model_names()").AsCharacter + lstModelNames.AddRange(chrModelNames) + Return lstModelNames + End Function End Class diff --git a/instat/dlgCheck.Designer.vb b/instat/dlgCheck.Designer.vb new file mode 100644 index 00000000000..49d9726f2ad --- /dev/null +++ b/instat/dlgCheck.Designer.vb @@ -0,0 +1,51 @@ + _ +Partial Class dlgCheck + Inherits System.Windows.Forms.Form + + 'Form overrides dispose to clean up the component list. + _ + Protected Overrides Sub Dispose(ByVal disposing As Boolean) + Try + If disposing AndAlso components IsNot Nothing Then + components.Dispose() + End If + Finally + MyBase.Dispose(disposing) + End Try + 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() + Me.ucrBase = New instat.ucrButtons() + Me.SuspendLayout() + ' + 'ucrBase + ' + Me.ucrBase.Location = New System.Drawing.Point(12, 196) + Me.ucrBase.Name = "ucrBase" + Me.ucrBase.Size = New System.Drawing.Size(410, 53) + Me.ucrBase.TabIndex = 0 + ' + 'dlgCheck + ' + Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) + Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.ClientSize = New System.Drawing.Size(428, 261) + Me.Controls.Add(Me.ucrBase) + Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow + Me.Name = "dlgCheck" + Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen + Me.Tag = "Check" + Me.Text = "Check" + Me.ResumeLayout(False) + + End Sub + + Friend WithEvents ucrBase As ucrButtons +End Class diff --git a/instat/dlgCheck.fr-FR.resx b/instat/dlgCheck.fr-FR.resx new file mode 100644 index 00000000000..9c9f69d752c --- /dev/null +++ b/instat/dlgCheck.fr-FR.resx @@ -0,0 +1,15 @@ + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/instat/dlgCheck.resx b/instat/dlgCheck.resx new file mode 100644 index 00000000000..29dcb1b3a35 --- /dev/null +++ b/instat/dlgCheck.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/instat/dlgCheck.sw-KE.resx b/instat/dlgCheck.sw-KE.resx new file mode 100644 index 00000000000..9c9f69d752c --- /dev/null +++ b/instat/dlgCheck.sw-KE.resx @@ -0,0 +1,15 @@ + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/instat/dlgCheck.vb b/instat/dlgCheck.vb new file mode 100644 index 00000000000..902cc4e33b3 --- /dev/null +++ b/instat/dlgCheck.vb @@ -0,0 +1,21 @@ +' 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 . +Imports instat.Translations +Public Class dlgCheck + Private Sub dlgCheck_Load(sender As Object, e As EventArgs) Handles MyBase.Load + autoTranslate(Me) + End Sub +End Class \ No newline at end of file diff --git a/instat/dlgColumnMetadata.Designer.vb b/instat/dlgColumnMetadata.Designer.vb new file mode 100644 index 00000000000..6bae59c33af --- /dev/null +++ b/instat/dlgColumnMetadata.Designer.vb @@ -0,0 +1,51 @@ + _ +Partial Class dlgColumnMetadata + Inherits System.Windows.Forms.Form + + 'Form overrides dispose to clean up the component list. + _ + Protected Overrides Sub Dispose(ByVal disposing As Boolean) + Try + If disposing AndAlso components IsNot Nothing Then + components.Dispose() + End If + Finally + MyBase.Dispose(disposing) + End Try + 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() + Me.ucrBase = New instat.ucrButtons() + Me.SuspendLayout() + ' + 'ucrBase + ' + Me.ucrBase.Location = New System.Drawing.Point(12, 196) + Me.ucrBase.Name = "ucrBase" + Me.ucrBase.Size = New System.Drawing.Size(410, 53) + Me.ucrBase.TabIndex = 0 + ' + 'dlgColumnMetadata + ' + Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) + Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.ClientSize = New System.Drawing.Size(420, 261) + Me.Controls.Add(Me.ucrBase) + Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow + Me.Name = "dlgColumnMetadata" + Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen + Me.Tag = "Column_Metadata" + Me.Text = "Column Metadata" + Me.ResumeLayout(False) + + End Sub + + Friend WithEvents ucrBase As ucrButtons +End Class diff --git a/instat/dlgColumnMetadata.fr-FR.resx b/instat/dlgColumnMetadata.fr-FR.resx new file mode 100644 index 00000000000..9c9f69d752c --- /dev/null +++ b/instat/dlgColumnMetadata.fr-FR.resx @@ -0,0 +1,15 @@ + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/instat/dlgColumnMetadata.resx b/instat/dlgColumnMetadata.resx new file mode 100644 index 00000000000..29dcb1b3a35 --- /dev/null +++ b/instat/dlgColumnMetadata.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/instat/dlgColumnMetadata.sw-KE.resx b/instat/dlgColumnMetadata.sw-KE.resx new file mode 100644 index 00000000000..9c9f69d752c --- /dev/null +++ b/instat/dlgColumnMetadata.sw-KE.resx @@ -0,0 +1,15 @@ + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/instat/dlgColumnMetadata.vb b/instat/dlgColumnMetadata.vb new file mode 100644 index 00000000000..ec44ef157da --- /dev/null +++ b/instat/dlgColumnMetadata.vb @@ -0,0 +1,21 @@ +' 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 . +Imports instat.Translations +Public Class dlgColumnMetadata + Private Sub dlgColumnMetadata_Load(sender As Object, e As EventArgs) Handles MyBase.Load + autoTranslate(Me) + End Sub +End Class \ No newline at end of file diff --git a/instat/dlgContrasts.Designer.vb b/instat/dlgContrasts.Designer.vb new file mode 100644 index 00000000000..1bc5f9764ee --- /dev/null +++ b/instat/dlgContrasts.Designer.vb @@ -0,0 +1,51 @@ + _ +Partial Class dlgContrasts + Inherits System.Windows.Forms.Form + + 'Form overrides dispose to clean up the component list. + _ + Protected Overrides Sub Dispose(ByVal disposing As Boolean) + Try + If disposing AndAlso components IsNot Nothing Then + components.Dispose() + End If + Finally + MyBase.Dispose(disposing) + End Try + 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() + Me.ucrBase = New instat.ucrButtons() + Me.SuspendLayout() + ' + 'ucrBase + ' + Me.ucrBase.Location = New System.Drawing.Point(12, 198) + Me.ucrBase.Name = "ucrBase" + Me.ucrBase.Size = New System.Drawing.Size(410, 60) + Me.ucrBase.TabIndex = 0 + ' + 'dlgContrasts + ' + Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) + Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.ClientSize = New System.Drawing.Size(422, 261) + Me.Controls.Add(Me.ucrBase) + Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow + Me.Name = "dlgContrasts" + Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen + Me.Tag = "Contrasts" + Me.Text = "Contrasts" + Me.ResumeLayout(False) + + End Sub + + Friend WithEvents ucrBase As ucrButtons +End Class diff --git a/instat/dlgContrasts.fr-FR.resx b/instat/dlgContrasts.fr-FR.resx new file mode 100644 index 00000000000..9c9f69d752c --- /dev/null +++ b/instat/dlgContrasts.fr-FR.resx @@ -0,0 +1,15 @@ + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/instat/dlgContrasts.resx b/instat/dlgContrasts.resx new file mode 100644 index 00000000000..29dcb1b3a35 --- /dev/null +++ b/instat/dlgContrasts.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/instat/dlgContrasts.sw-KE.resx b/instat/dlgContrasts.sw-KE.resx new file mode 100644 index 00000000000..9c9f69d752c --- /dev/null +++ b/instat/dlgContrasts.sw-KE.resx @@ -0,0 +1,15 @@ + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/instat/dlgContrasts.vb b/instat/dlgContrasts.vb new file mode 100644 index 00000000000..fbb1a99a7a5 --- /dev/null +++ b/instat/dlgContrasts.vb @@ -0,0 +1,21 @@ +' 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 . +Imports instat.Translations +Public Class dlgContrasts + Private Sub dlgContrasts_Load(sender As Object, e As EventArgs) Handles MyBase.Load + autoTranslate(Me) + End Sub +End Class \ No newline at end of file diff --git a/instat/dlgCorrelation.designer.vb b/instat/dlgCorrelation.designer.vb index 0a6f76ab5e2..97a7b5871b5 100644 --- a/instat/dlgCorrelation.designer.vb +++ b/instat/dlgCorrelation.designer.vb @@ -30,17 +30,17 @@ Partial Class dlgCorrelation Me.rdoSpearman = New System.Windows.Forms.RadioButton() Me.rdoKendall = New System.Windows.Forms.RadioButton() Me.rdoPearson = New System.Windows.Forms.RadioButton() - Me.cmdCorrplot = New System.Windows.Forms.Button() + Me.cmdPlot = New System.Windows.Forms.Button() Me.grpMissing = New System.Windows.Forms.GroupBox() Me.rdoPairwise = New System.Windows.Forms.RadioButton() Me.rdoCompleteRowsOnly = New System.Windows.Forms.RadioButton() Me.lblConfInterval = New System.Windows.Forms.Label() Me.txtConfidenceInterval = New System.Windows.Forms.TextBox() + Me.ucrReceiverMultipleColumns = New instat.ucrReceiverMultiple() Me.ucrReceiverSecondColumn = New instat.ucrReceiverSingle() Me.ucrReceiverFirstColumn = New instat.ucrReceiverSingle() Me.ucrSelectorDataFrameVarAddRemove = New instat.ucrSelectorByDataFrameAddRemove() Me.ucrBase = New instat.ucrButtons() - Me.ucrReceiverMultipleColumns = New instat.ucrReceiverMultiple() Me.grpMethod.SuspendLayout() Me.grpMissing.SuspendLayout() Me.SuspendLayout() @@ -51,7 +51,7 @@ Partial Class dlgCorrelation Me.rdoTwoColumns.Location = New System.Drawing.Point(3, 11) Me.rdoTwoColumns.Name = "rdoTwoColumns" Me.rdoTwoColumns.Size = New System.Drawing.Size(88, 17) - Me.rdoTwoColumns.TabIndex = 2 + Me.rdoTwoColumns.TabIndex = 0 Me.rdoTwoColumns.Tag = "Two_columns" Me.rdoTwoColumns.Text = "Two columns" Me.rdoTwoColumns.UseVisualStyleBackColor = True @@ -62,7 +62,7 @@ Partial Class dlgCorrelation Me.rdoMultipleColumns.Location = New System.Drawing.Point(278, 12) Me.rdoMultipleColumns.Name = "rdoMultipleColumns" Me.rdoMultipleColumns.Size = New System.Drawing.Size(103, 17) - Me.rdoMultipleColumns.TabIndex = 3 + Me.rdoMultipleColumns.TabIndex = 1 Me.rdoMultipleColumns.Tag = "Multiple_columns" Me.rdoMultipleColumns.Text = "Multiple columns" Me.rdoMultipleColumns.UseVisualStyleBackColor = True @@ -73,7 +73,7 @@ Partial Class dlgCorrelation Me.lblFirstColumn.Location = New System.Drawing.Point(307, 118) Me.lblFirstColumn.Name = "lblFirstColumn" Me.lblFirstColumn.Size = New System.Drawing.Size(63, 13) - Me.lblFirstColumn.TabIndex = 7 + Me.lblFirstColumn.TabIndex = 4 Me.lblFirstColumn.Tag = "First_column" Me.lblFirstColumn.Text = "First column" ' @@ -83,7 +83,7 @@ Partial Class dlgCorrelation Me.lblSecondColumn.Location = New System.Drawing.Point(308, 169) Me.lblSecondColumn.Name = "lblSecondColumn" Me.lblSecondColumn.Size = New System.Drawing.Size(81, 13) - Me.lblSecondColumn.TabIndex = 8 + Me.lblSecondColumn.TabIndex = 6 Me.lblSecondColumn.Tag = "Second_column" Me.lblSecondColumn.Text = "Second column" ' @@ -95,7 +95,7 @@ Partial Class dlgCorrelation Me.grpMethod.Location = New System.Drawing.Point(3, 233) Me.grpMethod.Name = "grpMethod" Me.grpMethod.Size = New System.Drawing.Size(423, 44) - Me.grpMethod.TabIndex = 9 + Me.grpMethod.TabIndex = 8 Me.grpMethod.TabStop = False Me.grpMethod.Tag = "Method" Me.grpMethod.Text = "Method" @@ -135,15 +135,15 @@ Partial Class dlgCorrelation Me.rdoPearson.Text = "Pearson" Me.rdoPearson.UseVisualStyleBackColor = True ' - 'cmdCorrplot + 'cmdPlot ' - Me.cmdCorrplot.Location = New System.Drawing.Point(332, 293) - Me.cmdCorrplot.Name = "cmdCorrplot" - Me.cmdCorrplot.Size = New System.Drawing.Size(75, 23) - Me.cmdCorrplot.TabIndex = 11 - Me.cmdCorrplot.Tag = "corrplot" - Me.cmdCorrplot.Text = "corrplot" - Me.cmdCorrplot.UseVisualStyleBackColor = True + Me.cmdPlot.Location = New System.Drawing.Point(332, 293) + Me.cmdPlot.Name = "cmdPlot" + Me.cmdPlot.Size = New System.Drawing.Size(75, 23) + Me.cmdPlot.TabIndex = 10 + Me.cmdPlot.Tag = "Plot" + Me.cmdPlot.Text = "Plot" + Me.cmdPlot.UseVisualStyleBackColor = True ' 'grpMissing ' @@ -152,7 +152,7 @@ Partial Class dlgCorrelation Me.grpMissing.Location = New System.Drawing.Point(3, 283) Me.grpMissing.Name = "grpMissing" Me.grpMissing.Size = New System.Drawing.Size(309, 40) - Me.grpMissing.TabIndex = 12 + Me.grpMissing.TabIndex = 9 Me.grpMissing.TabStop = False Me.grpMissing.Tag = "Missing" Me.grpMissing.Text = "Missing" @@ -187,7 +187,7 @@ Partial Class dlgCorrelation Me.lblConfInterval.Location = New System.Drawing.Point(12, 325) Me.lblConfInterval.Name = "lblConfInterval" Me.lblConfInterval.Size = New System.Drawing.Size(133, 13) - Me.lblConfInterval.TabIndex = 13 + Me.lblConfInterval.TabIndex = 11 Me.lblConfInterval.Text = "T Test Confidence Interval" ' 'txtConfidenceInterval @@ -195,7 +195,15 @@ Partial Class dlgCorrelation Me.txtConfidenceInterval.Location = New System.Drawing.Point(156, 322) Me.txtConfidenceInterval.Name = "txtConfidenceInterval" Me.txtConfidenceInterval.Size = New System.Drawing.Size(100, 20) - Me.txtConfidenceInterval.TabIndex = 14 + Me.txtConfidenceInterval.TabIndex = 12 + ' + 'ucrReceiverMultipleColumns + ' + Me.ucrReceiverMultipleColumns.Location = New System.Drawing.Point(278, 112) + Me.ucrReceiverMultipleColumns.Name = "ucrReceiverMultipleColumns" + Me.ucrReceiverMultipleColumns.Selector = Nothing + Me.ucrReceiverMultipleColumns.Size = New System.Drawing.Size(121, 104) + Me.ucrReceiverMultipleColumns.TabIndex = 3 ' 'ucrReceiverSecondColumn ' @@ -203,7 +211,7 @@ Partial Class dlgCorrelation Me.ucrReceiverSecondColumn.Name = "ucrReceiverSecondColumn" Me.ucrReceiverSecondColumn.Selector = Nothing Me.ucrReceiverSecondColumn.Size = New System.Drawing.Size(106, 26) - Me.ucrReceiverSecondColumn.TabIndex = 6 + Me.ucrReceiverSecondColumn.TabIndex = 7 ' 'ucrReceiverFirstColumn ' @@ -218,22 +226,14 @@ Partial Class dlgCorrelation Me.ucrSelectorDataFrameVarAddRemove.Location = New System.Drawing.Point(3, 37) Me.ucrSelectorDataFrameVarAddRemove.Name = "ucrSelectorDataFrameVarAddRemove" Me.ucrSelectorDataFrameVarAddRemove.Size = New System.Drawing.Size(242, 179) - Me.ucrSelectorDataFrameVarAddRemove.TabIndex = 4 + Me.ucrSelectorDataFrameVarAddRemove.TabIndex = 2 ' 'ucrBase ' Me.ucrBase.Location = New System.Drawing.Point(11, 358) Me.ucrBase.Name = "ucrBase" Me.ucrBase.Size = New System.Drawing.Size(409, 57) - Me.ucrBase.TabIndex = 1 - ' - 'ucrReceiverMultipleColumns - ' - Me.ucrReceiverMultipleColumns.Location = New System.Drawing.Point(278, 112) - Me.ucrReceiverMultipleColumns.Name = "ucrReceiverMultipleColumns" - Me.ucrReceiverMultipleColumns.Selector = Nothing - Me.ucrReceiverMultipleColumns.Size = New System.Drawing.Size(121, 104) - Me.ucrReceiverMultipleColumns.TabIndex = 15 + Me.ucrBase.TabIndex = 13 ' 'dlgCorrelation ' @@ -244,7 +244,7 @@ Partial Class dlgCorrelation Me.Controls.Add(Me.lblConfInterval) Me.Controls.Add(Me.txtConfidenceInterval) Me.Controls.Add(Me.grpMissing) - Me.Controls.Add(Me.cmdCorrplot) + Me.Controls.Add(Me.cmdPlot) Me.Controls.Add(Me.grpMethod) Me.Controls.Add(Me.lblSecondColumn) Me.Controls.Add(Me.lblFirstColumn) @@ -278,7 +278,7 @@ Partial Class dlgCorrelation Friend WithEvents rdoSpearman As RadioButton Friend WithEvents rdoKendall As RadioButton Friend WithEvents rdoPearson As RadioButton - Friend WithEvents cmdCorrplot As Button + Friend WithEvents cmdPlot As Button Friend WithEvents grpMissing As GroupBox Friend WithEvents rdoPairwise As RadioButton Friend WithEvents rdoCompleteRowsOnly As RadioButton diff --git a/instat/dlgCorrelation.resx b/instat/dlgCorrelation.resx index 1af7de150c9..29dcb1b3a35 100644 --- a/instat/dlgCorrelation.resx +++ b/instat/dlgCorrelation.resx @@ -1,120 +1,120 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + \ No newline at end of file diff --git a/instat/dlgCorrelation.vb b/instat/dlgCorrelation.vb index 5ca90630f2e..d858c1d7f1e 100644 --- a/instat/dlgCorrelation.vb +++ b/instat/dlgCorrelation.vb @@ -37,39 +37,32 @@ Public Class dlgCorrelation SetDefaults() bFirstLoad = False End If - - If bIsTwoColumnFunction Then - TestOKEnabledForTwoColumns() - Else - TestOKEnabledForMultipleColumns() - End If - + TestOKEnabled() End Sub Private Sub SetDefaults() ucrSelectorDataFrameVarAddRemove.Reset() ucrSelectorDataFrameVarAddRemove.Focus() + ' ucrReceiverFirstColumn.Focus() rdoPearson.Checked = True rdoTwoColumns.Checked = True - TestOKEnabledForTwoColumns() + sdgCorrPlot.SetDefaults() + TestOKEnabled() End Sub - - Private Sub ucrReceiverFirstColumn_SelectionChanged(sender As Object, e As EventArgs) Handles ucrReceiverFirstColumn.SelectionChanged ucrBase.clsRsyntax.AddParameter("x", clsRFunctionParameter:=ucrReceiverFirstColumn.GetVariables()) - TestOKEnabledForTwoColumns() + TestOKEnabled() End Sub Private Sub ucrReceiverSecondColumn_SelectionChanged(sender As Object, e As EventArgs) Handles ucrReceiverSecondColumn.SelectionChanged ucrBase.clsRsyntax.AddParameter("y", clsRFunctionParameter:=ucrReceiverSecondColumn.GetVariables()) - TestOKEnabledforTwoColumns() - + TestOKEnabled() End Sub - Private Sub ucrReceiverMultipleColumns_SelectionChanged() Handles ucrReceiverMultipleColumns.SelectionChanged + Public Sub ucrReceiverMultipleColumns_SelectionChanged() Handles ucrReceiverMultipleColumns.SelectionChanged ucrBase.clsRsyntax.AddParameter("x", clsRFunctionParameter:=ucrReceiverMultipleColumns.GetVariables()) - TestOKEnabledForMultipleColumns() + TestOKEnabled() End Sub 'put all rdo button checked changed in one sub to make it shorter @@ -86,10 +79,8 @@ Public Class dlgCorrelation ElseIf rdoSpearman.Checked Then ucrBase.clsRsyntax.AddParameter("method", Chr(34) & "spearman" & Chr(34)) - Else ucrBase.clsRsyntax.RemoveParameter("method") - 'the else case should never happen but is there just in case End If End Sub @@ -101,15 +92,10 @@ Public Class dlgCorrelation Private Sub SetUseParameter() If rdoCompleteRowsOnly.Checked Then ucrBase.clsRsyntax.AddParameter("use", Chr(34) & "pairwise.complete.obs" & Chr(34)) - - ElseIf rdoPairwise.Checked Then ucrBase.clsRsyntax.AddParameter("use", Chr(34) & "complete.obs" & Chr(34)) - - Else ucrBase.clsRsyntax.RemoveParameter("use") - End If End Sub @@ -120,7 +106,7 @@ Public Class dlgCorrelation ucrBase.clsRsyntax.SetFunction("cor.test") 'Set what should be visible/invisible grpMissing.Visible = False - cmdCorrplot.Visible = False + cmdPlot.Visible = False lblConfInterval.Visible = True txtConfidenceInterval.Visible = True ucrReceiverFirstColumn.Visible = True @@ -138,8 +124,7 @@ Public Class dlgCorrelation ucrBase.clsRsyntax.AddParameter("alternative", Chr(34) & "two.sided" & Chr(34)) ucrBase.clsRsyntax.AddParameter("exact", "NULL") bIsTwoColumnFunction = True - - + TestOKEnabled() End Sub Private Sub SetMultipleColumnAsFunction() @@ -148,7 +133,7 @@ Public Class dlgCorrelation ucrBase.clsRsyntax.SetFunction("cor") 'Set what should be visible/invisible grpMissing.Visible = True - cmdCorrplot.Visible = True + cmdPlot.Visible = True lblConfInterval.Visible = False txtConfidenceInterval.Visible = False ucrReceiverFirstColumn.Visible = False @@ -163,9 +148,9 @@ Public Class dlgCorrelation SetUseParameter() ucrBase.clsRsyntax.AddParameter("x", clsRFunctionParameter:=ucrReceiverMultipleColumns.GetVariables()) bIsTwoColumnFunction = False + TestOKEnabled() End Sub - Private Sub ColumnTypeChanged(sender As Object, e As EventArgs) Handles rdoTwoColumns.CheckedChanged, rdoMultipleColumns.CheckedChanged If rdoTwoColumns.Checked Then SetTwoColumnAsFunction() @@ -177,27 +162,36 @@ Public Class dlgCorrelation Private Sub txtConfidenceInterval_Leave(sender As Object, e As EventArgs) Handles txtConfidenceInterval.Leave ucrBase.clsRsyntax.AddParameter("conf.level", txtConfidenceInterval.Text) End Sub + Private Sub ucrBase_ClickReset(sender As Object, e As EventArgs) Handles ucrBase.ClickReset SetDefaults() End Sub - Private Sub cmdPlots_Click(sender As Object, e As EventArgs) Handles cmdCorrplot.Click + Private Sub cmdPlots_Click(sender As Object, e As EventArgs) Handles cmdPlot.Click sdgCorrPlot.ShowDialog() End Sub - Private Sub TestOKEnabledForTwoColumns() - If ucrReceiverFirstColumn.IsEmpty() = False And ucrReceiverSecondColumn.IsEmpty() = False And (rdoPearson.Checked = True Or rdoKendall.Checked = True Or rdoSpearman.Checked = True) Then - ucrBase.OKEnabled(True) + + Private Sub TestOKEnabled() + If (rdoTwoColumns.Checked = True) Then + If ucrReceiverFirstColumn.IsEmpty() = False And ucrReceiverSecondColumn.IsEmpty() = False And (rdoPearson.Checked = True Or rdoKendall.Checked = True Or rdoSpearman.Checked = True) Then + ucrBase.OKEnabled(True) + Else + ucrBase.OKEnabled(False) + End If + ElseIf (rdoMultipleColumns.Checked = True) Then + If ucrReceiverMultipleColumns.IsEmpty() = False And ucrReceiverMultipleColumns.lstSelectedVariables.Items.Count > 1 And (rdoCompleteRowsOnly.Checked = True Or rdoPairwise.Checked = True) AndAlso (rdoPearson.Checked = True Or rdoKendall.Checked = True Or rdoSpearman.Checked = True) Then + ucrBase.OKEnabled(True) + Else + ucrBase.OKEnabled(False) + End If Else ucrBase.OKEnabled(False) End If End Sub - Private Sub TestOKEnabledForMultipleColumns() - If ucrReceiverMultipleColumns.IsEmpty() = False And ucrReceiverMultipleColumns.lstSelectedVariables.Items.Count > 1 And (rdoCompleteRowsOnly.Checked = True Or rdoPairwise.Checked = True) AndAlso (rdoPearson.Checked = True Or rdoKendall.Checked = True Or rdoSpearman.Checked = True) Then - ucrBase.OKEnabled(True) - Else - ucrBase.OKEnabled(False) - End If - + Private Sub ucrBase_ClickOk(sender As Object, e As EventArgs) Handles ucrBase.ClickOk + If (rdoMultipleColumns.Checked) Then + sdgCorrPlot.RegOptions() + End If End Sub End Class \ No newline at end of file diff --git a/instat/dlgCumulativeDistribution.Designer.vb b/instat/dlgCumulativeDistribution.Designer.vb index c6413c8c04c..5f74cb9c4fd 100644 --- a/instat/dlgCumulativeDistribution.Designer.vb +++ b/instat/dlgCumulativeDistribution.Designer.vb @@ -23,20 +23,148 @@ Partial Class dlgCumulativeDistribution _ Private Sub InitializeComponent() Me.ucrBase = New instat.ucrButtons() + Me.ucrCumDistSelector = New instat.ucrSelectorByDataFrameAddRemove() + Me.ucrVariatesreceiver = New instat.ucrReceiverMultiple() + Me.lblvariates = New System.Windows.Forms.Label() + Me.ucrFactorReceiver = New instat.ucrReceiverMultiple() + Me.lblFactors = New System.Windows.Forms.Label() + Me.chkExeedancePlots = New System.Windows.Forms.CheckBox() + Me.chkCountsOnYAxis = New System.Windows.Forms.CheckBox() + Me.chkIncludePoints = New System.Windows.Forms.CheckBox() + Me.cmdLineOptions = New System.Windows.Forms.Button() + Me.cmdPlotOptions = New System.Windows.Forms.Button() + Me.cmdThemeOptions = New System.Windows.Forms.Button() Me.SuspendLayout() ' 'ucrBase ' - Me.ucrBase.Location = New System.Drawing.Point(12, 196) + Me.ucrBase.Location = New System.Drawing.Point(7, 331) Me.ucrBase.Name = "ucrBase" Me.ucrBase.Size = New System.Drawing.Size(410, 53) - Me.ucrBase.TabIndex = 0 + Me.ucrBase.TabIndex = 11 + ' + 'ucrCumDistSelector + ' + Me.ucrCumDistSelector.Location = New System.Drawing.Point(4, 4) + Me.ucrCumDistSelector.Name = "ucrCumDistSelector" + Me.ucrCumDistSelector.Size = New System.Drawing.Size(242, 179) + Me.ucrCumDistSelector.TabIndex = 0 + ' + 'ucrVariatesreceiver + ' + Me.ucrVariatesreceiver.Location = New System.Drawing.Point(270, 29) + Me.ucrVariatesreceiver.Name = "ucrVariatesreceiver" + Me.ucrVariatesreceiver.Selector = Nothing + Me.ucrVariatesreceiver.Size = New System.Drawing.Size(121, 104) + Me.ucrVariatesreceiver.TabIndex = 2 + ' + 'lblvariates + ' + Me.lblvariates.AutoSize = True + Me.lblvariates.Location = New System.Drawing.Point(270, 10) + Me.lblvariates.Name = "lblvariates" + Me.lblvariates.Size = New System.Drawing.Size(51, 13) + Me.lblvariates.TabIndex = 1 + Me.lblvariates.Tag = "Variates" + Me.lblvariates.Text = "Variate(s)" + ' + 'ucrFactorReceiver + ' + Me.ucrFactorReceiver.Location = New System.Drawing.Point(273, 167) + Me.ucrFactorReceiver.Name = "ucrFactorReceiver" + Me.ucrFactorReceiver.Selector = Nothing + Me.ucrFactorReceiver.Size = New System.Drawing.Size(121, 104) + Me.ucrFactorReceiver.TabIndex = 4 + ' + 'lblFactors + ' + Me.lblFactors.AutoSize = True + Me.lblFactors.Location = New System.Drawing.Point(273, 148) + Me.lblFactors.Name = "lblFactors" + Me.lblFactors.Size = New System.Drawing.Size(96, 13) + Me.lblFactors.TabIndex = 3 + Me.lblFactors.Tag = "Factors_Optional" + Me.lblFactors.Text = "Factor(s) (Optional)" + ' + 'chkExeedancePlots + ' + Me.chkExeedancePlots.AutoSize = True + Me.chkExeedancePlots.Location = New System.Drawing.Point(13, 181) + Me.chkExeedancePlots.Name = "chkExeedancePlots" + Me.chkExeedancePlots.Size = New System.Drawing.Size(106, 17) + Me.chkExeedancePlots.TabIndex = 5 + Me.chkExeedancePlots.Tag = "Exeedance_Plots" + Me.chkExeedancePlots.Text = "Exeedance Plots" + Me.chkExeedancePlots.UseVisualStyleBackColor = True + ' + 'chkCountsOnYAxis + ' + Me.chkCountsOnYAxis.AutoSize = True + Me.chkCountsOnYAxis.Location = New System.Drawing.Point(12, 217) + Me.chkCountsOnYAxis.Name = "chkCountsOnYAxis" + Me.chkCountsOnYAxis.Size = New System.Drawing.Size(108, 17) + Me.chkCountsOnYAxis.TabIndex = 6 + Me.chkCountsOnYAxis.Tag = "Counts_On_YAxis" + Me.chkCountsOnYAxis.Text = "Counts On Y-Axis" + Me.chkCountsOnYAxis.UseVisualStyleBackColor = True + ' + 'chkIncludePoints + ' + Me.chkIncludePoints.AutoSize = True + Me.chkIncludePoints.Location = New System.Drawing.Point(13, 254) + Me.chkIncludePoints.Name = "chkIncludePoints" + Me.chkIncludePoints.Size = New System.Drawing.Size(93, 17) + Me.chkIncludePoints.TabIndex = 7 + Me.chkIncludePoints.Tag = "Include Points" + Me.chkIncludePoints.Text = "Include Points" + Me.chkIncludePoints.UseVisualStyleBackColor = True + ' + 'cmdLineOptions + ' + Me.cmdLineOptions.Location = New System.Drawing.Point(13, 294) + Me.cmdLineOptions.Name = "cmdLineOptions" + Me.cmdLineOptions.Size = New System.Drawing.Size(75, 23) + Me.cmdLineOptions.TabIndex = 8 + Me.cmdLineOptions.Tag = "Line_Options" + Me.cmdLineOptions.Text = "Line Options" + Me.cmdLineOptions.UseVisualStyleBackColor = True + ' + 'cmdPlotOptions + ' + Me.cmdPlotOptions.Location = New System.Drawing.Point(146, 294) + Me.cmdPlotOptions.Name = "cmdPlotOptions" + Me.cmdPlotOptions.Size = New System.Drawing.Size(75, 23) + Me.cmdPlotOptions.TabIndex = 9 + Me.cmdPlotOptions.Tag = "Plot_Options" + Me.cmdPlotOptions.Text = "Plot Options" + Me.cmdPlotOptions.UseVisualStyleBackColor = True + ' + 'cmdThemeOptions + ' + Me.cmdThemeOptions.Location = New System.Drawing.Point(276, 294) + Me.cmdThemeOptions.Name = "cmdThemeOptions" + Me.cmdThemeOptions.Size = New System.Drawing.Size(75, 23) + Me.cmdThemeOptions.TabIndex = 10 + Me.cmdThemeOptions.Tag = "Theme_Options" + Me.cmdThemeOptions.Text = "Theme Options" + Me.cmdThemeOptions.UseVisualStyleBackColor = True ' 'dlgCumulativeDistribution ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(435, 261) + Me.ClientSize = New System.Drawing.Size(415, 390) + Me.Controls.Add(Me.cmdThemeOptions) + Me.Controls.Add(Me.cmdPlotOptions) + Me.Controls.Add(Me.cmdLineOptions) + Me.Controls.Add(Me.chkIncludePoints) + Me.Controls.Add(Me.chkCountsOnYAxis) + Me.Controls.Add(Me.chkExeedancePlots) + Me.Controls.Add(Me.lblFactors) + Me.Controls.Add(Me.lblvariates) + Me.Controls.Add(Me.ucrFactorReceiver) + Me.Controls.Add(Me.ucrVariatesreceiver) + Me.Controls.Add(Me.ucrCumDistSelector) Me.Controls.Add(Me.ucrBase) Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow Me.Name = "dlgCumulativeDistribution" @@ -44,8 +172,20 @@ Partial Class dlgCumulativeDistribution Me.Tag = "Cumulative_Distribution" Me.Text = "Cumulative Distribution" Me.ResumeLayout(False) + Me.PerformLayout() End Sub Friend WithEvents ucrBase As ucrButtons + Friend WithEvents ucrCumDistSelector As ucrSelectorByDataFrameAddRemove + Friend WithEvents ucrVariatesreceiver As ucrReceiverMultiple + Friend WithEvents lblvariates As Label + Friend WithEvents ucrFactorReceiver As ucrReceiverMultiple + Friend WithEvents lblFactors As Label + Friend WithEvents chkExeedancePlots As CheckBox + Friend WithEvents chkCountsOnYAxis As CheckBox + Friend WithEvents chkIncludePoints As CheckBox + Friend WithEvents cmdLineOptions As Button + Friend WithEvents cmdPlotOptions As Button + Friend WithEvents cmdThemeOptions As Button End Class diff --git a/instat/dlgCumulativeDistribution.vb b/instat/dlgCumulativeDistribution.vb index 97c9773831e..e17637b5592 100644 --- a/instat/dlgCumulativeDistribution.vb +++ b/instat/dlgCumulativeDistribution.vb @@ -16,7 +16,33 @@ Imports instat.Translations Public Class dlgCumulativeDistribution + Public bFirstLoad As Boolean = True Private Sub dlgCumulativeDistribution_Load(sender As Object, e As EventArgs) Handles MyBase.Load + ucrVariatesreceiver.Selector = ucrCumDistSelector + ucrFactorReceiver.Selector = ucrCumDistSelector + ucrFactorReceiver.SetDataType("factor") + ucrVariatesreceiver.SetMeAsReceiver() + + ucrBase.clsRsyntax.iCallType = 0 autoTranslate(Me) + + If bFirstLoad Then + SetDefaults() + bFirstLoad = False + End If + TestOkEnabled() + End Sub + + Private Sub SetDefaults() + 'set defaults here + + End Sub + + Private Sub TestOkEnabled() + 'TODO what enables ok + End Sub + + Private Sub ucrBase_ClickReset(sender As Object, e As EventArgs) Handles ucrBase.ClickReset + SetDefaults() End Sub End Class \ No newline at end of file diff --git a/instat/dlgDeleteDescriptive.Designer.vb b/instat/dlgDeleteDescriptive.Designer.vb new file mode 100644 index 00000000000..2362340c17b --- /dev/null +++ b/instat/dlgDeleteDescriptive.Designer.vb @@ -0,0 +1,51 @@ + _ +Partial Class dlgDeleteDescriptive + Inherits System.Windows.Forms.Form + + 'Form overrides dispose to clean up the component list. + _ + Protected Overrides Sub Dispose(ByVal disposing As Boolean) + Try + If disposing AndAlso components IsNot Nothing Then + components.Dispose() + End If + Finally + MyBase.Dispose(disposing) + End Try + 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() + Me.ucrBase = New instat.ucrButtons() + Me.SuspendLayout() + ' + 'ucrBase + ' + Me.ucrBase.Location = New System.Drawing.Point(13, 196) + Me.ucrBase.Name = "ucrBase" + Me.ucrBase.Size = New System.Drawing.Size(410, 53) + Me.ucrBase.TabIndex = 0 + ' + 'dlgDeleteDescriptive + ' + Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) + Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.ClientSize = New System.Drawing.Size(442, 261) + Me.Controls.Add(Me.ucrBase) + Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow + Me.Name = "dlgDeleteDescriptive" + Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen + Me.Tag = "Delete" + Me.Text = "Delete" + Me.ResumeLayout(False) + + End Sub + + Friend WithEvents ucrBase As ucrButtons +End Class diff --git a/instat/dlgDeleteDescriptive.fr-FR.resx b/instat/dlgDeleteDescriptive.fr-FR.resx new file mode 100644 index 00000000000..9c9f69d752c --- /dev/null +++ b/instat/dlgDeleteDescriptive.fr-FR.resx @@ -0,0 +1,15 @@ + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/instat/dlgDeleteDescriptive.resx b/instat/dlgDeleteDescriptive.resx new file mode 100644 index 00000000000..29dcb1b3a35 --- /dev/null +++ b/instat/dlgDeleteDescriptive.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/instat/dlgDeleteDescriptive.sw-KE.resx b/instat/dlgDeleteDescriptive.sw-KE.resx new file mode 100644 index 00000000000..9c9f69d752c --- /dev/null +++ b/instat/dlgDeleteDescriptive.sw-KE.resx @@ -0,0 +1,15 @@ + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/instat/dlgDeleteDescriptive.vb b/instat/dlgDeleteDescriptive.vb new file mode 100644 index 00000000000..9b8d2cff07f --- /dev/null +++ b/instat/dlgDeleteDescriptive.vb @@ -0,0 +1,21 @@ +' 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 . +Imports instat.Translations +Public Class dlgDeleteDescriptive + Private Sub dlgDeleteDescriptive_Load(sender As Object, e As EventArgs) Handles MyBase.Load + autoTranslate(Me) + End Sub +End Class \ No newline at end of file diff --git a/instat/dlgDeleteModels.Designer.vb b/instat/dlgDeleteModels.Designer.vb new file mode 100644 index 00000000000..59f2fd623bd --- /dev/null +++ b/instat/dlgDeleteModels.Designer.vb @@ -0,0 +1,51 @@ + _ +Partial Class dlgDeleteModels + Inherits System.Windows.Forms.Form + + 'Form overrides dispose to clean up the component list. + _ + Protected Overrides Sub Dispose(ByVal disposing As Boolean) + Try + If disposing AndAlso components IsNot Nothing Then + components.Dispose() + End If + Finally + MyBase.Dispose(disposing) + End Try + 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() + Me.ucrBase = New instat.ucrButtons() + Me.SuspendLayout() + ' + 'ucrBase + ' + Me.ucrBase.Location = New System.Drawing.Point(13, 196) + Me.ucrBase.Name = "ucrBase" + Me.ucrBase.Size = New System.Drawing.Size(410, 53) + Me.ucrBase.TabIndex = 0 + ' + 'dlgDeleteModels + ' + Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) + Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.ClientSize = New System.Drawing.Size(424, 261) + Me.Controls.Add(Me.ucrBase) + Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow + Me.Name = "dlgDeleteModels" + Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen + Me.Tag = "Delete" + Me.Text = "Delete" + Me.ResumeLayout(False) + + End Sub + + Friend WithEvents ucrBase As ucrButtons +End Class diff --git a/instat/dlgDeleteModels.fr-FR.resx b/instat/dlgDeleteModels.fr-FR.resx new file mode 100644 index 00000000000..9c9f69d752c --- /dev/null +++ b/instat/dlgDeleteModels.fr-FR.resx @@ -0,0 +1,15 @@ + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/instat/dlgDeleteModels.resx b/instat/dlgDeleteModels.resx new file mode 100644 index 00000000000..29dcb1b3a35 --- /dev/null +++ b/instat/dlgDeleteModels.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/instat/dlgDeleteModels.sw-KE.resx b/instat/dlgDeleteModels.sw-KE.resx new file mode 100644 index 00000000000..9c9f69d752c --- /dev/null +++ b/instat/dlgDeleteModels.sw-KE.resx @@ -0,0 +1,15 @@ + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/instat/dlgDeleteModels.vb b/instat/dlgDeleteModels.vb new file mode 100644 index 00000000000..d9e9a3f6371 --- /dev/null +++ b/instat/dlgDeleteModels.vb @@ -0,0 +1,21 @@ +' 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 . +Imports instat.Translations +Public Class dlgDeleteModels + Private Sub dlgDeleteModels_Load(sender As Object, e As EventArgs) Handles MyBase.Load + autoTranslate(Me) + End Sub +End Class \ No newline at end of file diff --git a/instat/dlgHideShowColumns.Designer.vb b/instat/dlgHideShowColumns.Designer.vb new file mode 100644 index 00000000000..6f4a5cdfe9a --- /dev/null +++ b/instat/dlgHideShowColumns.Designer.vb @@ -0,0 +1,51 @@ + _ +Partial Class dlgHideShowColumns + Inherits System.Windows.Forms.Form + + 'Form overrides dispose to clean up the component list. + _ + Protected Overrides Sub Dispose(ByVal disposing As Boolean) + Try + If disposing AndAlso components IsNot Nothing Then + components.Dispose() + End If + Finally + MyBase.Dispose(disposing) + End Try + 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() + Me.ucrBase = New instat.ucrButtons() + Me.SuspendLayout() + ' + 'ucrBase + ' + Me.ucrBase.Location = New System.Drawing.Point(13, 196) + Me.ucrBase.Name = "ucrBase" + Me.ucrBase.Size = New System.Drawing.Size(410, 53) + Me.ucrBase.TabIndex = 0 + ' + 'dlgHideShowColumns + ' + Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) + Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.ClientSize = New System.Drawing.Size(425, 261) + Me.Controls.Add(Me.ucrBase) + Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow + Me.Name = "dlgHideShowColumns" + Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen + Me.Tag = "Hide_Show_Columns" + Me.Text = "Hide/Show Column(s)" + Me.ResumeLayout(False) + + End Sub + + Friend WithEvents ucrBase As ucrButtons +End Class diff --git a/instat/dlgHideShowColumns.fr-FR.resx b/instat/dlgHideShowColumns.fr-FR.resx new file mode 100644 index 00000000000..9c9f69d752c --- /dev/null +++ b/instat/dlgHideShowColumns.fr-FR.resx @@ -0,0 +1,15 @@ + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/instat/dlgHideShowColumns.resx b/instat/dlgHideShowColumns.resx new file mode 100644 index 00000000000..29dcb1b3a35 --- /dev/null +++ b/instat/dlgHideShowColumns.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/instat/dlgHideShowColumns.sw-KE.resx b/instat/dlgHideShowColumns.sw-KE.resx new file mode 100644 index 00000000000..9c9f69d752c --- /dev/null +++ b/instat/dlgHideShowColumns.sw-KE.resx @@ -0,0 +1,15 @@ + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/instat/dlgHideShowColumns.vb b/instat/dlgHideShowColumns.vb new file mode 100644 index 00000000000..f43cfcabee5 --- /dev/null +++ b/instat/dlgHideShowColumns.vb @@ -0,0 +1,22 @@ +' 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 . + +Imports instat.Translations +Public Class dlgHideShowColumns + Private Sub dlgHideShowColumns_Load(sender As Object, e As EventArgs) Handles MyBase.Load + autoTranslate(Me) + End Sub +End Class \ No newline at end of file diff --git a/instat/dlgHistogram.designer.vb b/instat/dlgHistogram.designer.vb index fb48c997557..b6bcd9ff119 100644 --- a/instat/dlgHistogram.designer.vb +++ b/instat/dlgHistogram.designer.vb @@ -29,6 +29,8 @@ Partial Class dlgHistogram Me.rdoDensity = New System.Windows.Forms.RadioButton() Me.rdoFreequencyPolygon = New System.Windows.Forms.RadioButton() Me.lblfactor = New System.Windows.Forms.Label() + Me.cmdDensityOptions = New System.Windows.Forms.Button() + Me.cmdFrequencyOptions = New System.Windows.Forms.Button() Me.ucrFactorReceiver = New instat.ucrReceiverSingle() Me.ucrHistogramSelector = New instat.ucrSelectorByDataFrameAddRemove() Me.ucrBase = New instat.ucrButtons() @@ -47,7 +49,7 @@ Partial Class dlgHistogram ' 'cmdOptions ' - Me.cmdOptions.Location = New System.Drawing.Point(291, 227) + Me.cmdOptions.Location = New System.Drawing.Point(255, 215) Me.cmdOptions.Name = "cmdOptions" Me.cmdOptions.Size = New System.Drawing.Size(75, 23) Me.cmdOptions.TabIndex = 9 @@ -57,7 +59,7 @@ Partial Class dlgHistogram ' 'cmdHistogramOptions ' - Me.cmdHistogramOptions.Location = New System.Drawing.Point(10, 227) + Me.cmdHistogramOptions.Location = New System.Drawing.Point(254, 186) Me.cmdHistogramOptions.Name = "cmdHistogramOptions" Me.cmdHistogramOptions.Size = New System.Drawing.Size(103, 23) Me.cmdHistogramOptions.TabIndex = 8 @@ -94,11 +96,11 @@ Partial Class dlgHistogram Me.rdoFreequencyPolygon.AutoSize = True Me.rdoFreequencyPolygon.Location = New System.Drawing.Point(302, 13) Me.rdoFreequencyPolygon.Name = "rdoFreequencyPolygon" - Me.rdoFreequencyPolygon.Size = New System.Drawing.Size(122, 17) + Me.rdoFreequencyPolygon.Size = New System.Drawing.Size(116, 17) Me.rdoFreequencyPolygon.TabIndex = 2 Me.rdoFreequencyPolygon.TabStop = True - Me.rdoFreequencyPolygon.Tag = "Freequency_Polygon" - Me.rdoFreequencyPolygon.Text = "Freequency Polygon" + Me.rdoFreequencyPolygon.Tag = "Frequency_Polygon" + Me.rdoFreequencyPolygon.Text = "Frequency Polygon" Me.rdoFreequencyPolygon.UseVisualStyleBackColor = True ' 'lblfactor @@ -111,10 +113,31 @@ Partial Class dlgHistogram Me.lblfactor.Tag = "Factor" Me.lblfactor.Text = "Factor" ' + 'cmdDensityOptions + ' + Me.cmdDensityOptions.Location = New System.Drawing.Point(255, 186) + Me.cmdDensityOptions.Name = "cmdDensityOptions" + Me.cmdDensityOptions.Size = New System.Drawing.Size(103, 23) + Me.cmdDensityOptions.TabIndex = 8 + Me.cmdDensityOptions.Tag = "Density_Options" + Me.cmdDensityOptions.Text = "Density Options" + Me.cmdDensityOptions.UseVisualStyleBackColor = True + ' + 'cmdFrequencyOptions + ' + Me.cmdFrequencyOptions.Location = New System.Drawing.Point(255, 186) + Me.cmdFrequencyOptions.Name = "cmdFrequencyOptions" + Me.cmdFrequencyOptions.Size = New System.Drawing.Size(163, 23) + Me.cmdFrequencyOptions.TabIndex = 8 + Me.cmdFrequencyOptions.Tag = "Frequency_Polygon_Options" + Me.cmdFrequencyOptions.Text = "Frequency Polygon Options" + Me.cmdFrequencyOptions.UseVisualStyleBackColor = True + ' 'ucrFactorReceiver ' Me.ucrFactorReceiver.Location = New System.Drawing.Point(286, 142) Me.ucrFactorReceiver.Name = "ucrFactorReceiver" + Me.ucrFactorReceiver.Selector = Nothing Me.ucrFactorReceiver.Size = New System.Drawing.Size(106, 26) Me.ucrFactorReceiver.TabIndex = 7 ' @@ -127,7 +150,7 @@ Partial Class dlgHistogram ' 'ucrBase ' - Me.ucrBase.Location = New System.Drawing.Point(7, 269) + Me.ucrBase.Location = New System.Drawing.Point(7, 241) Me.ucrBase.Name = "ucrBase" Me.ucrBase.Size = New System.Drawing.Size(410, 58) Me.ucrBase.TabIndex = 10 @@ -136,6 +159,7 @@ Partial Class dlgHistogram ' Me.ucrXReceiver.Location = New System.Drawing.Point(286, 82) Me.ucrXReceiver.Name = "ucrXReceiver" + Me.ucrXReceiver.Selector = Nothing Me.ucrXReceiver.Size = New System.Drawing.Size(106, 26) Me.ucrXReceiver.TabIndex = 5 ' @@ -143,11 +167,13 @@ Partial Class dlgHistogram ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(422, 333) + Me.ClientSize = New System.Drawing.Size(422, 294) Me.Controls.Add(Me.ucrFactorReceiver) Me.Controls.Add(Me.rdoFreequencyPolygon) Me.Controls.Add(Me.rdoDensity) Me.Controls.Add(Me.rdoHistogram) + Me.Controls.Add(Me.cmdFrequencyOptions) + Me.Controls.Add(Me.cmdDensityOptions) Me.Controls.Add(Me.cmdHistogramOptions) Me.Controls.Add(Me.cmdOptions) Me.Controls.Add(Me.ucrHistogramSelector) @@ -175,4 +201,6 @@ Partial Class dlgHistogram Friend WithEvents rdoFreequencyPolygon As RadioButton Friend WithEvents ucrFactorReceiver As ucrReceiverSingle Friend WithEvents lblfactor As Label + Friend WithEvents cmdDensityOptions As Button + Friend WithEvents cmdFrequencyOptions As Button End Class diff --git a/instat/dlgHistogram.vb b/instat/dlgHistogram.vb index 27507035ead..b7b7aa745de 100644 --- a/instat/dlgHistogram.vb +++ b/instat/dlgHistogram.vb @@ -17,7 +17,6 @@ Imports instat.Translations Public Class dlgHistogram Public bFirstLoad As Boolean = True - Private clsRggplotFunction As New RFunction Private clsRgeom_histogramFunction As New RFunction Private clsRgeom_densityFunction As New RFunction @@ -42,6 +41,7 @@ Public Class dlgHistogram ucrBase.clsRsyntax.iCallType = 0 ucrBase.iHelpTopicID = 118 ucrXReceiver.SetMeAsReceiver() + ucrFactorReceiver.SetDataType("factor") TestOkEnabled() autoTranslate(Me) End Sub @@ -51,11 +51,10 @@ Public Class dlgHistogram End Sub Private Sub ucrXReceiver_SelectionChanged(sender As Object, e As EventArgs) Handles ucrXReceiver.SelectionChanged - If Not (ucrXReceiver.txtReceiverSingle.Text = "") Then + If Not ucrXReceiver.IsEmpty Then clsRaesFunction.AddParameter("x", ucrXReceiver.GetVariableNames(False)) - TestOkEnabled() Else - TestOkEnabled() + clsRaesFunction.RemoveParameterByName("x") End If TestOkEnabled() End Sub @@ -64,14 +63,21 @@ Public Class dlgHistogram sdgPlots.ShowDialog() End Sub - Private Sub ucrFactorReceiver_Leave(sender As Object, e As EventArgs) Handles ucrFactorReceiver.Leave - clsRaesFunction.AddParameter("fill", ucrFactorReceiver.GetVariableNames(False)) + Private Sub ucrFactorReceiver_SelectionChanged(sender As Object, e As EventArgs) Handles ucrFactorReceiver.SelectionChanged + If Not ucrFactorReceiver.IsEmpty Then + clsRaesFunction.AddParameter("fill", ucrFactorReceiver.GetVariableNames(False)) + Else + clsRaesFunction.RemoveParameterByName("fill") + End If End Sub Private Sub rdoHistogram_CheckedChanged(sender As Object, e As EventArgs) Handles rdoHistogram.CheckedChanged If rdoHistogram.Checked = True Then clsRgeom_histogramFunction.SetRCommand("geom_histogram") ucrBase.clsRsyntax.SetOperatorParameter(False, clsRFunc:=clsRgeom_histogramFunction) + cmdHistogramOptions.Visible = True + Else + cmdHistogramOptions.Visible = False End If End Sub @@ -79,7 +85,9 @@ Public Class dlgHistogram If rdoDensity.Checked = True Then clsRgeom_densityFunction.SetRCommand("geom_density") ucrBase.clsRsyntax.SetOperatorParameter(False, clsRFunc:=clsRgeom_densityFunction) - + cmdDensityOptions.Visible = True + Else + cmdDensityOptions.Visible = False End If End Sub @@ -87,15 +95,18 @@ Public Class dlgHistogram If rdoFreequencyPolygon.Checked = True Then clsRgeom_FPolygon.SetRCommand("geom_freqpoly") ucrBase.clsRsyntax.SetOperatorParameter(False, clsRFunc:=clsRgeom_FPolygon) + cmdFrequencyOptions.Visible = True + Else + cmdFrequencyOptions.Visible = False End If End Sub Private Sub TestOkEnabled() 'tests when ok can be enabled - If ucrXReceiver.GetVariableNames() <> "" Then - ucrBase.OKEnabled(True) - Else + If ucrXReceiver.IsEmpty Then ucrBase.OKEnabled(False) + Else + ucrBase.OKEnabled(True) End If End Sub @@ -107,6 +118,9 @@ Public Class dlgHistogram ucrXReceiver.SetMeAsReceiver() ucrHistogramSelector.Reset() rdoHistogram.Checked = True + cmdHistogramOptions.Visible = True + cmdDensityOptions.Visible = False + cmdFrequencyOptions.Visible = False TestOkEnabled() End Sub @@ -140,4 +154,12 @@ Public Class dlgHistogram Private Sub cmdHistogramOptions_Click(sender As Object, e As EventArgs) Handles cmdHistogramOptions.Click sdgHistogramOptions.ShowDialog() End Sub + + Private Sub cmdFrequencyOptions_Click(sender As Object, e As EventArgs) Handles cmdFrequencyOptions.Click + sdgFrequencyPolygonOptions.ShowDialog() + End Sub + + Private Sub cmdDensityOptions_Click(sender As Object, e As EventArgs) Handles cmdDensityOptions.Click + sdgDensityOptions.ShowDialog() + End Sub End Class \ No newline at end of file diff --git a/instat/dlgMakeSheets.Designer.vb b/instat/dlgMakeSheets.Designer.vb new file mode 100644 index 00000000000..649540a2e5c --- /dev/null +++ b/instat/dlgMakeSheets.Designer.vb @@ -0,0 +1,51 @@ + _ +Partial Class dlgMakeSheets + Inherits System.Windows.Forms.Form + + 'Form overrides dispose to clean up the component list. + _ + Protected Overrides Sub Dispose(ByVal disposing As Boolean) + Try + If disposing AndAlso components IsNot Nothing Then + components.Dispose() + End If + Finally + MyBase.Dispose(disposing) + End Try + 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() + Me.ucrBase = New instat.ucrButtons() + Me.SuspendLayout() + ' + 'ucrBase + ' + Me.ucrBase.Location = New System.Drawing.Point(13, 196) + Me.ucrBase.Name = "ucrBase" + Me.ucrBase.Size = New System.Drawing.Size(410, 53) + Me.ucrBase.TabIndex = 0 + ' + 'dlgMakeSheets + ' + Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) + Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.ClientSize = New System.Drawing.Size(435, 261) + Me.Controls.Add(Me.ucrBase) + Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow + Me.Name = "dlgMakeSheets" + Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen + Me.Tag = "Make_Sheets" + Me.Text = "Make Sheets" + Me.ResumeLayout(False) + + End Sub + + Friend WithEvents ucrBase As ucrButtons +End Class diff --git a/instat/dlgMakeSheets.fr-FR.resx b/instat/dlgMakeSheets.fr-FR.resx new file mode 100644 index 00000000000..9c9f69d752c --- /dev/null +++ b/instat/dlgMakeSheets.fr-FR.resx @@ -0,0 +1,15 @@ + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/instat/dlgMakeSheets.resx b/instat/dlgMakeSheets.resx new file mode 100644 index 00000000000..29dcb1b3a35 --- /dev/null +++ b/instat/dlgMakeSheets.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/instat/dlgMakeSheets.sw-KE.resx b/instat/dlgMakeSheets.sw-KE.resx new file mode 100644 index 00000000000..9c9f69d752c --- /dev/null +++ b/instat/dlgMakeSheets.sw-KE.resx @@ -0,0 +1,15 @@ + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/instat/dlgMakeSheets.vb b/instat/dlgMakeSheets.vb new file mode 100644 index 00000000000..b1a0b480a2d --- /dev/null +++ b/instat/dlgMakeSheets.vb @@ -0,0 +1,21 @@ +' 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 . +Imports instat.Translations +Public Class dlgMakeSheets + Private Sub dlgMakeSheets_Load(sender As Object, e As EventArgs) Handles MyBase.Load + autoTranslate(Me) + End Sub +End Class \ No newline at end of file diff --git a/instat/dlgNon-ParametricANOVA.Designer.vb b/instat/dlgNon-ParametricOneWayANOVA.Designer.vb similarity index 72% rename from instat/dlgNon-ParametricANOVA.Designer.vb rename to instat/dlgNon-ParametricOneWayANOVA.Designer.vb index cb5e31fdb15..ccdf3b08c95 100644 --- a/instat/dlgNon-ParametricANOVA.Designer.vb +++ b/instat/dlgNon-ParametricOneWayANOVA.Designer.vb @@ -1,5 +1,5 @@  _ -Partial Class dlgNon_ParametricANOVA +Partial Class dlgNon_ParametricOneWayANOVA Inherits System.Windows.Forms.Form 'Form overrides dispose to clean up the component list. @@ -27,23 +27,23 @@ Partial Class dlgNon_ParametricANOVA Me.ucrBase = New instat.ucrButtons() Me.ucrReceiverFactor = New instat.ucrReceiverSingle() Me.ucrReceiverYVariate = New instat.ucrReceiverSingle() - Me.ucrAddRemove = New instat.ucrSelectorAddRemove() + Me.ucrDataFrameAddRemove = New instat.ucrSelectorByDataFrameAddRemove() Me.SuspendLayout() ' 'lblYVariate ' Me.lblYVariate.AutoSize = True - Me.lblYVariate.Location = New System.Drawing.Point(267, 22) + Me.lblYVariate.Location = New System.Drawing.Point(274, 81) Me.lblYVariate.Name = "lblYVariate" Me.lblYVariate.Size = New System.Drawing.Size(49, 13) Me.lblYVariate.TabIndex = 4 Me.lblYVariate.Tag = "Y_Variate" - Me.lblYVariate.Text = "Y variate" + Me.lblYVariate.Text = "Y-variate" ' 'lblFactor ' Me.lblFactor.AutoSize = True - Me.lblFactor.Location = New System.Drawing.Point(267, 76) + Me.lblFactor.Location = New System.Drawing.Point(275, 138) Me.lblFactor.Name = "lblFactor" Me.lblFactor.Size = New System.Drawing.Size(37, 13) Me.lblFactor.TabIndex = 5 @@ -52,56 +52,57 @@ Partial Class dlgNon_ParametricANOVA ' 'ucrBase ' - Me.ucrBase.Location = New System.Drawing.Point(0, 172) + Me.ucrBase.Location = New System.Drawing.Point(0, 212) Me.ucrBase.Name = "ucrBase" - Me.ucrBase.Size = New System.Drawing.Size(410, 32) + Me.ucrBase.Size = New System.Drawing.Size(410, 55) Me.ucrBase.TabIndex = 3 ' 'ucrReceiverFactor ' - Me.ucrReceiverFactor.Location = New System.Drawing.Point(261, 88) + Me.ucrReceiverFactor.Location = New System.Drawing.Point(269, 150) Me.ucrReceiverFactor.Name = "ucrReceiverFactor" + Me.ucrReceiverFactor.Selector = Nothing Me.ucrReceiverFactor.Size = New System.Drawing.Size(106, 26) Me.ucrReceiverFactor.TabIndex = 2 ' 'ucrReceiverYVariate ' - Me.ucrReceiverYVariate.Location = New System.Drawing.Point(261, 35) + Me.ucrReceiverYVariate.Location = New System.Drawing.Point(268, 94) Me.ucrReceiverYVariate.Name = "ucrReceiverYVariate" + Me.ucrReceiverYVariate.Selector = Nothing Me.ucrReceiverYVariate.Size = New System.Drawing.Size(106, 26) Me.ucrReceiverYVariate.TabIndex = 1 ' - 'ucrAddRemove + 'ucrDataFrameAddRemove ' - Me.ucrAddRemove.Location = New System.Drawing.Point(16, 5) - Me.ucrAddRemove.Name = "ucrAddRemove" - Me.ucrAddRemove.Size = New System.Drawing.Size(203, 127) - Me.ucrAddRemove.TabIndex = 0 + Me.ucrDataFrameAddRemove.Location = New System.Drawing.Point(1, 7) + Me.ucrDataFrameAddRemove.Name = "ucrDataFrameAddRemove" + Me.ucrDataFrameAddRemove.Size = New System.Drawing.Size(242, 179) + Me.ucrDataFrameAddRemove.TabIndex = 6 ' - 'dlgNon_ParametricANOVA + 'dlgNon_ParametricOneWayANOVA ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(412, 204) + Me.ClientSize = New System.Drawing.Size(412, 268) + Me.Controls.Add(Me.ucrDataFrameAddRemove) Me.Controls.Add(Me.lblFactor) Me.Controls.Add(Me.lblYVariate) Me.Controls.Add(Me.ucrBase) Me.Controls.Add(Me.ucrReceiverFactor) Me.Controls.Add(Me.ucrReceiverYVariate) - Me.Controls.Add(Me.ucrAddRemove) Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow - Me.Name = "dlgNon_ParametricANOVA" + Me.Name = "dlgNon_ParametricOneWayANOVA" Me.Tag = "Non_Parametric_One_Way_ANOVA" - Me.Text = "dlgNon-ParametricANOVA" + Me.Text = "Non-Parametric One Way ANOVA" Me.ResumeLayout(False) Me.PerformLayout() End Sub - - Friend WithEvents ucrAddRemove As ucrSelectorAddRemove Friend WithEvents ucrReceiverYVariate As ucrReceiverSingle Friend WithEvents ucrReceiverFactor As ucrReceiverSingle Friend WithEvents ucrBase As ucrButtons Friend WithEvents lblYVariate As Label Friend WithEvents lblFactor As Label + Friend WithEvents ucrDataFrameAddRemove As ucrSelectorByDataFrameAddRemove End Class diff --git a/instat/dlgNon-ParametricOneWayANOVA.fr-FR.resx b/instat/dlgNon-ParametricOneWayANOVA.fr-FR.resx new file mode 100644 index 00000000000..9c9f69d752c --- /dev/null +++ b/instat/dlgNon-ParametricOneWayANOVA.fr-FR.resx @@ -0,0 +1,15 @@ + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/instat/dlgNon-ParametricOneWayANOVA.resx b/instat/dlgNon-ParametricOneWayANOVA.resx new file mode 100644 index 00000000000..29dcb1b3a35 --- /dev/null +++ b/instat/dlgNon-ParametricOneWayANOVA.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/instat/dlgNon-ParametricOneWayANOVA.sw-KE.resx b/instat/dlgNon-ParametricOneWayANOVA.sw-KE.resx new file mode 100644 index 00000000000..9c9f69d752c --- /dev/null +++ b/instat/dlgNon-ParametricOneWayANOVA.sw-KE.resx @@ -0,0 +1,15 @@ + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/instat/dlgNon-ParametricOneWayANOVA.vb b/instat/dlgNon-ParametricOneWayANOVA.vb new file mode 100644 index 00000000000..aaa1c7afac9 --- /dev/null +++ b/instat/dlgNon-ParametricOneWayANOVA.vb @@ -0,0 +1,83 @@ +'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 . + +Imports instat.Translations +Public Class dlgNon_ParametricOneWayANOVA + + Public bFirstLoad As Boolean = True + Public clsModel As New ROperator + + Private Sub dlgNon_ParametricOneWayANOVA_Load(sender As Object, e As EventArgs) Handles MyBase.Load + + If bFirstLoad Then + InitializeDialog() + DefaultSettings() + End If + + ucrBase.iHelpTopicID = (183) + + End Sub + Private Sub InitializeDialog() + ucrBase.clsRsyntax.SetFunction("kruskal.test") + ucrBase.clsRsyntax.iCallType = 2 + ucrReceiverYVariate.Selector = ucrDataFrameAddRemove + ucrReceiverFactor.Selector = ucrDataFrameAddRemove + ucrReceiverFactor.SetDataType("factor") + clsModel.SetOperation("~") + autoTranslate(Me) + TestOKEnabled() + End Sub + + Private Sub DefaultSettings() + ucrDataFrameAddRemove.Reset() + ucrDataFrameAddRemove.Focus() + ucrReceiverYVariate.SetMeAsReceiver() + TestOKEnabled() + End Sub + + Private Sub ucrReceiverYVariate_SelectionChanged(sender As Object, e As EventArgs) Handles ucrReceiverYVariate.SelectionChanged + clsModel.SetParameter(True, strValue:=ucrReceiverYVariate.GetVariableNames(bWithQuotes:=False)) + TestOKEnabled() + End Sub + + Private Sub ucrReceiverFactor_SelectionChanged(sender As Object, e As EventArgs) Handles ucrReceiverFactor.SelectionChanged + clsModel.SetParameter(False, strValue:=ucrReceiverFactor.GetVariableNames(bWithQuotes:=False)) + + TestOKEnabled() + End Sub + + + + Private Sub TestOKEnabled() + + If (Not ucrReceiverYVariate.IsEmpty()) And (Not ucrReceiverFactor.IsEmpty()) Then + ucrBase.clsRsyntax.AddParameter("formula", clsROperatorParameter:=clsModel) + ucrBase.OKEnabled(True) + Else + ucrBase.OKEnabled(False) + End If + + End Sub + + Private Sub ucrDataFrameAddRemove_DataFrameChanged() Handles ucrDataFrameAddRemove.DataFrameChanged + ucrBase.clsRsyntax.AddParameter("x", clsRFunctionParameter:=ucrDataFrameAddRemove.ucrAvailableDataFrames.clsCurrDataFrame) + End Sub + + Private Sub ucrBase_ClickReset(sender As Object, e As EventArgs) Handles ucrBase.ClickReset + DefaultSettings() + End Sub + +End Class \ No newline at end of file diff --git a/instat/dlgPrintPreviewOptions.Designer.vb b/instat/dlgPrintPreviewOptions.Designer.vb index fbc647c0c9c..911754b22c3 100644 --- a/instat/dlgPrintPreviewOptions.Designer.vb +++ b/instat/dlgPrintPreviewOptions.Designer.vb @@ -23,6 +23,7 @@ Partial Class dlgPrintPreviewOptions _ Private Sub InitializeComponent() Me.pnlEditor = New System.Windows.Forms.Panel() + Me.chkGridLines = New System.Windows.Forms.CheckBox() Me.cmdPrtSheet = New System.Windows.Forms.Button() Me.cmdPrevSheet = New System.Windows.Forms.Button() Me.pnlLog = New System.Windows.Forms.Panel() @@ -42,17 +43,28 @@ Partial Class dlgPrintPreviewOptions Me.pnlEditor.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _ Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.pnlEditor.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D + Me.pnlEditor.Controls.Add(Me.chkGridLines) Me.pnlEditor.Controls.Add(Me.cmdPrtSheet) Me.pnlEditor.Controls.Add(Me.cmdPrevSheet) Me.pnlEditor.Location = New System.Drawing.Point(2, 4) Me.pnlEditor.Name = "pnlEditor" - Me.pnlEditor.Size = New System.Drawing.Size(160, 92) + Me.pnlEditor.Size = New System.Drawing.Size(160, 128) Me.pnlEditor.TabIndex = 0 ' + 'chkGridLines + ' + Me.chkGridLines.AutoSize = True + Me.chkGridLines.Location = New System.Drawing.Point(8, 57) + Me.chkGridLines.Name = "chkGridLines" + Me.chkGridLines.Size = New System.Drawing.Size(97, 17) + Me.chkGridLines.TabIndex = 2 + Me.chkGridLines.Text = "Show grid lines" + Me.chkGridLines.UseVisualStyleBackColor = True + ' 'cmdPrtSheet ' Me.cmdPrtSheet.Dock = System.Windows.Forms.DockStyle.Bottom - Me.cmdPrtSheet.Location = New System.Drawing.Point(0, 44) + Me.cmdPrtSheet.Location = New System.Drawing.Point(0, 80) Me.cmdPrtSheet.Name = "cmdPrtSheet" Me.cmdPrtSheet.Size = New System.Drawing.Size(156, 44) Me.cmdPrtSheet.TabIndex = 1 @@ -159,6 +171,7 @@ Partial Class dlgPrintPreviewOptions Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent Me.Text = "Print and Preview Options" Me.pnlEditor.ResumeLayout(False) + Me.pnlEditor.PerformLayout() Me.pnlLog.ResumeLayout(False) Me.pnlOutput.ResumeLayout(False) Me.ResumeLayout(False) @@ -175,4 +188,5 @@ Partial Class dlgPrintPreviewOptions Friend WithEvents cmdPrtOutput As Button Friend WithEvents cmdPrevOutput As Button Friend WithEvents cmdExitPreview As Button + Friend WithEvents chkGridLines As CheckBox End Class diff --git a/instat/dlgPrintPreviewOptions.vb b/instat/dlgPrintPreviewOptions.vb index 302b1b61855..44e9564e285 100644 --- a/instat/dlgPrintPreviewOptions.vb +++ b/instat/dlgPrintPreviewOptions.vb @@ -1,45 +1,41 @@ Imports System.Drawing.Printing +Imports instat.Translations +Imports unvell.ReoGrid Public Class dlgPrintPreviewOptions Public WithEvents printDocument As New PrintDocument Dim previewPrint As New PrintPreviewDialog Dim pd As New PrintDialog Dim printTextCtrl As TextBoxBase - Private Sub cmdPrevSheet_Click(sender As Object, e As EventArgs) Handles cmdPrevSheet.Click - Dim sheetPreview = frmEditor.grdData.CurrentWorksheet - - Using session = sheetPreview.CreatePrintSession() - 'sets the the print to show gridlines - sheetPreview.SetRangeBorders(sheetPreview.PrintableRange, unvell.ReoGrid.BorderPositions.All, unvell.ReoGrid.RangeBorderStyle.BlackSolid) + Dim sheetPreview As Worksheet - previewPrint.Document = session.PrintDocument - previewPrint.SetBounds(200, 200, 1024, 768) - previewPrint.PrintPreviewControl.Zoom = 1.0 - previewPrint.ShowDialog(Me) + Dim bFirstLoad As Boolean = True + Private Sub cmdPrevSheet_Click(sender As Object, e As EventArgs) Handles cmdPrevSheet.Click + Dim session = sheetPreview.CreatePrintSession() + previewPrint.Document = sheetPreview.CreatePrintSession().PrintDocument + previewPrint.SetBounds(200, 200, 1024, 768) + previewPrint.PrintPreviewControl.Zoom = 1.0 + previewPrint.ShowDialog(Me) - session.Dispose() - End Using + session.Dispose() End Sub Private Sub cmdPrtSheet_Click(sender As Object, e As EventArgs) Handles cmdPrtSheet.Click Dim docToPrint As PrintDocument = Nothing Try - Dim sheetPreview = frmEditor.grdData.CurrentWorksheet - 'sets the the print to show gridlines - sheetPreview.SetRangeBorders(sheetPreview.PrintableRange, unvell.ReoGrid.BorderPositions.All, unvell.ReoGrid.RangeBorderStyle.BlackSolid) docToPrint = sheetPreview.CreatePrintSession().PrintDocument Catch ex As Exception MessageBox.Show(Me, ex.Message, Me.ProductName, MessageBoxButtons.OK, MessageBoxIcon.Information) Return End Try - Using pd - pd.Document = docToPrint - pd.UseEXDialog = True - If pd.ShowDialog() = DialogResult.OK Then - docToPrint.PrinterSettings = pd.PrinterSettings - docToPrint.Print() - End If - End Using + pd.Document = docToPrint + pd.UseEXDialog = True + If pd.ShowDialog() = DialogResult.OK Then + docToPrint.PrinterSettings = pd.PrinterSettings + docToPrint.Print() + End If + docToPrint.Dispose() + End Sub Private Sub cmdPrtLog_Click(sender As Object, e As EventArgs) Handles cmdPrtLog.Click @@ -137,7 +133,29 @@ Public Class dlgPrintPreviewOptions End Sub Private Sub cmdExitPreview_Click(sender As Object, e As EventArgs) Handles cmdExitPreview.Click + 'reverts to original + sheetPreview.SetRangeBorders(sheetPreview.PrintableRange, unvell.ReoGrid.BorderPositions.All, unvell.ReoGrid.RangeBorderStyle.Empty) Me.Close() End Sub + Private Sub chkGridLines_CheckStateChanged(sender As Object, e As EventArgs) Handles chkGridLines.CheckStateChanged + sheetPreview.CreatePrintSession() + If chkGridLines.Checked Then + 'shows the gridlines + sheetPreview.SetRangeBorders(sheetPreview.PrintableRange, unvell.ReoGrid.BorderPositions.All, unvell.ReoGrid.RangeBorderStyle.BlackSolid) + Else + 'hides the grid lines + sheetPreview.SetRangeBorders(sheetPreview.PrintableRange, unvell.ReoGrid.BorderPositions.All, unvell.ReoGrid.RangeBorderStyle.Empty) + End If + End Sub + + Private Sub dlgPrintPreviewOptions_Load(sender As Object, e As EventArgs) Handles Me.Load + sheetPreview = frmEditor.grdData.CurrentWorksheet + autoTranslate(Me) + setDefaults() + End Sub + + Private Sub setDefaults() + chkGridLines.Checked = True + End Sub End Class \ No newline at end of file diff --git a/instat/dlgProtect.Designer.vb b/instat/dlgProtect.Designer.vb new file mode 100644 index 00000000000..1dbb9c8b953 --- /dev/null +++ b/instat/dlgProtect.Designer.vb @@ -0,0 +1,51 @@ + _ +Partial Class dlgProtect + Inherits System.Windows.Forms.Form + + 'Form overrides dispose to clean up the component list. + _ + Protected Overrides Sub Dispose(ByVal disposing As Boolean) + Try + If disposing AndAlso components IsNot Nothing Then + components.Dispose() + End If + Finally + MyBase.Dispose(disposing) + End Try + 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() + Me.ucrBase = New instat.ucrButtons() + Me.SuspendLayout() + ' + 'ucrBase + ' + Me.ucrBase.Location = New System.Drawing.Point(12, 196) + Me.ucrBase.Name = "ucrBase" + Me.ucrBase.Size = New System.Drawing.Size(410, 53) + Me.ucrBase.TabIndex = 0 + ' + 'dlgProtect + ' + Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) + Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.ClientSize = New System.Drawing.Size(437, 261) + Me.Controls.Add(Me.ucrBase) + Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow + Me.Name = "dlgProtect" + Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen + Me.Tag = "Protect_Lock_Unlock" + Me.Text = "Protect (Lock/Unlock)" + Me.ResumeLayout(False) + + End Sub + + Friend WithEvents ucrBase As ucrButtons +End Class diff --git a/instat/dlgProtect.fr-FR.resx b/instat/dlgProtect.fr-FR.resx new file mode 100644 index 00000000000..9c9f69d752c --- /dev/null +++ b/instat/dlgProtect.fr-FR.resx @@ -0,0 +1,15 @@ + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/instat/dlgProtect.resx b/instat/dlgProtect.resx new file mode 100644 index 00000000000..29dcb1b3a35 --- /dev/null +++ b/instat/dlgProtect.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/instat/dlgProtect.sw-KE.resx b/instat/dlgProtect.sw-KE.resx new file mode 100644 index 00000000000..9c9f69d752c --- /dev/null +++ b/instat/dlgProtect.sw-KE.resx @@ -0,0 +1,15 @@ + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/instat/dlgProtect.vb b/instat/dlgProtect.vb new file mode 100644 index 00000000000..378cd2a8887 --- /dev/null +++ b/instat/dlgProtect.vb @@ -0,0 +1,22 @@ +' 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 . + +Imports instat.Translations +Public Class dlgProtect + Private Sub dlgProtect_Load(sender As Object, e As EventArgs) Handles MyBase.Load + autoTranslate(Me) + End Sub +End Class \ No newline at end of file diff --git a/instat/dlgRandomSubset.Designer.vb b/instat/dlgRandomSubset.Designer.vb new file mode 100644 index 00000000000..bcb65b7d90f --- /dev/null +++ b/instat/dlgRandomSubset.Designer.vb @@ -0,0 +1,51 @@ + _ +Partial Class dlgRandomSubset + Inherits System.Windows.Forms.Form + + 'Form overrides dispose to clean up the component list. + _ + Protected Overrides Sub Dispose(ByVal disposing As Boolean) + Try + If disposing AndAlso components IsNot Nothing Then + components.Dispose() + End If + Finally + MyBase.Dispose(disposing) + End Try + 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() + Me.ucrBase = New instat.ucrButtons() + Me.SuspendLayout() + ' + 'ucrBase + ' + Me.ucrBase.Location = New System.Drawing.Point(12, 196) + Me.ucrBase.Name = "ucrBase" + Me.ucrBase.Size = New System.Drawing.Size(410, 53) + Me.ucrBase.TabIndex = 0 + ' + 'dlgRandomSubset + ' + Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) + Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.ClientSize = New System.Drawing.Size(429, 261) + Me.Controls.Add(Me.ucrBase) + Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow + Me.Name = "dlgRandomSubset" + Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen + Me.Tag = "Random_Subset" + Me.Text = "Random Subset" + Me.ResumeLayout(False) + + End Sub + + Friend WithEvents ucrBase As ucrButtons +End Class diff --git a/instat/dlgRandomSubset.fr-FR.resx b/instat/dlgRandomSubset.fr-FR.resx new file mode 100644 index 00000000000..9c9f69d752c --- /dev/null +++ b/instat/dlgRandomSubset.fr-FR.resx @@ -0,0 +1,15 @@ + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/instat/dlgRandomSubset.resx b/instat/dlgRandomSubset.resx new file mode 100644 index 00000000000..29dcb1b3a35 --- /dev/null +++ b/instat/dlgRandomSubset.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/instat/dlgRandomSubset.sw-KE.resx b/instat/dlgRandomSubset.sw-KE.resx new file mode 100644 index 00000000000..9c9f69d752c --- /dev/null +++ b/instat/dlgRandomSubset.sw-KE.resx @@ -0,0 +1,15 @@ + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/instat/dlgRandomSubset.vb b/instat/dlgRandomSubset.vb new file mode 100644 index 00000000000..0a96bbb1be1 --- /dev/null +++ b/instat/dlgRandomSubset.vb @@ -0,0 +1,3 @@ +Public Class dlgRandomSubset + +End Class \ No newline at end of file diff --git a/instat/dlgRegressionSimple.resx b/instat/dlgRegressionSimple.resx index dbf206daa5c..dd32cd6b1c0 100644 --- a/instat/dlgRegressionSimple.resx +++ b/instat/dlgRegressionSimple.resx @@ -289,7 +289,7 @@ 104, 24 - 0 + 5 Save Model @@ -313,7 +313,7 @@ 149, 23 - 1 + 6 ucrModelName @@ -420,9 +420,6 @@ 424, 271 - - NoControl - CenterScreen diff --git a/instat/dlgRegressionSimple.vb b/instat/dlgRegressionSimple.vb index 30a71ff5ebb..33e5bd9518e 100644 --- a/instat/dlgRegressionSimple.vb +++ b/instat/dlgRegressionSimple.vb @@ -31,7 +31,6 @@ Public Class dlgRegressionSimple End If autoTranslate(Me) - End Sub Private Sub InitialiseDialog() diff --git a/instat/dlgRegularSequence.designer.vb b/instat/dlgRegularSequence.designer.vb index c399b86ffe3..b7f81c630bf 100644 --- a/instat/dlgRegularSequence.designer.vb +++ b/instat/dlgRegularSequence.designer.vb @@ -26,28 +26,33 @@ Partial Class dlgRegularSequence Me.rdoDates = New System.Windows.Forms.RadioButton() Me.rdoNumeric = New System.Windows.Forms.RadioButton() Me.grpSequenceDefinition = New System.Windows.Forms.GroupBox() + Me.nudTo = New System.Windows.Forms.NumericUpDown() + Me.nudFrom = New System.Windows.Forms.NumericUpDown() + Me.nudRepeatValues = New System.Windows.Forms.NumericUpDown() Me.dtpSelectorB = New System.Windows.Forms.DateTimePicker() + Me.nudInstepsOf = New System.Windows.Forms.NumericUpDown() Me.dtpSelectorA = New System.Windows.Forms.DateTimePicker() - Me.txtRepeatValues = New System.Windows.Forms.TextBox() - Me.cboInStepsOf = New System.Windows.Forms.ComboBox() Me.chkDefineAsFactor = New System.Windows.Forms.CheckBox() Me.lblTimes1 = New System.Windows.Forms.Label() Me.lblRepeatValues = New System.Windows.Forms.Label() Me.lblSteps = New System.Windows.Forms.Label() Me.lblTo = New System.Windows.Forms.Label() Me.lblFrom = New System.Windows.Forms.Label() - Me.txtFrom = New System.Windows.Forms.TextBox() - Me.txtTo = New System.Windows.Forms.TextBox() - Me.txtLength = New System.Windows.Forms.TextBox() Me.lblPreview = New System.Windows.Forms.Label() Me.lblLength = New System.Windows.Forms.Label() Me.cmdRefreshPreview = New System.Windows.Forms.Button() Me.txtGetPreview = New System.Windows.Forms.RichTextBox() - Me.ucrNewColumnNameSelector = New instat.ucrNewColumnName() - Me.ucrSelectDataFrame = New instat.ucrDataFrame() + Me.ucrSelectDataFrameRegularSequence = New instat.ucrDataFrame() Me.ucrBase = New instat.ucrButtons() + Me.UcrDataFrameLengthForRegularSequence = New instat.ucrDataFrameLength() + Me.UcrInputCboRegularSequence = New instat.ucrInputComboBox() + Me.lblNewColumnName = New System.Windows.Forms.Label() Me.grpSequenceType.SuspendLayout() Me.grpSequenceDefinition.SuspendLayout() + CType(Me.nudTo, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.nudFrom, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.nudRepeatValues, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.nudInstepsOf, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() ' 'grpSequenceType @@ -80,32 +85,30 @@ Partial Class dlgRegularSequence 'rdoNumeric ' Me.rdoNumeric.AutoSize = True - Me.rdoNumeric.Checked = True Me.rdoNumeric.FlatStyle = System.Windows.Forms.FlatStyle.System Me.rdoNumeric.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.rdoNumeric.Location = New System.Drawing.Point(6, 13) Me.rdoNumeric.Name = "rdoNumeric" Me.rdoNumeric.Size = New System.Drawing.Size(70, 18) Me.rdoNumeric.TabIndex = 0 - Me.rdoNumeric.TabStop = True Me.rdoNumeric.Tag = "Numeric" Me.rdoNumeric.Text = "Numeric" Me.rdoNumeric.UseVisualStyleBackColor = True ' 'grpSequenceDefinition ' + Me.grpSequenceDefinition.Controls.Add(Me.nudTo) + Me.grpSequenceDefinition.Controls.Add(Me.nudFrom) + Me.grpSequenceDefinition.Controls.Add(Me.nudRepeatValues) Me.grpSequenceDefinition.Controls.Add(Me.dtpSelectorB) + Me.grpSequenceDefinition.Controls.Add(Me.nudInstepsOf) Me.grpSequenceDefinition.Controls.Add(Me.dtpSelectorA) - Me.grpSequenceDefinition.Controls.Add(Me.txtRepeatValues) - Me.grpSequenceDefinition.Controls.Add(Me.cboInStepsOf) Me.grpSequenceDefinition.Controls.Add(Me.chkDefineAsFactor) Me.grpSequenceDefinition.Controls.Add(Me.lblTimes1) Me.grpSequenceDefinition.Controls.Add(Me.lblRepeatValues) Me.grpSequenceDefinition.Controls.Add(Me.lblSteps) Me.grpSequenceDefinition.Controls.Add(Me.lblTo) Me.grpSequenceDefinition.Controls.Add(Me.lblFrom) - Me.grpSequenceDefinition.Controls.Add(Me.txtFrom) - Me.grpSequenceDefinition.Controls.Add(Me.txtTo) Me.grpSequenceDefinition.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.grpSequenceDefinition.Location = New System.Drawing.Point(12, 100) Me.grpSequenceDefinition.Name = "grpSequenceDefinition" @@ -116,36 +119,50 @@ Partial Class dlgRegularSequence Me.grpSequenceDefinition.Text = "Sequence definition" Me.grpSequenceDefinition.UseCompatibleTextRendering = True ' + 'nudTo + ' + Me.nudTo.Location = New System.Drawing.Point(138, 48) + Me.nudTo.Maximum = New Decimal(New Integer() {1000, 0, 0, 0}) + Me.nudTo.Name = "nudTo" + Me.nudTo.Size = New System.Drawing.Size(51, 20) + Me.nudTo.TabIndex = 14 + ' + 'nudFrom + ' + Me.nudFrom.Location = New System.Drawing.Point(138, 20) + Me.nudFrom.Maximum = New Decimal(New Integer() {10000, 0, 0, 0}) + Me.nudFrom.Name = "nudFrom" + Me.nudFrom.Size = New System.Drawing.Size(51, 20) + Me.nudFrom.TabIndex = 13 + ' + 'nudRepeatValues + ' + Me.nudRepeatValues.Location = New System.Drawing.Point(98, 103) + Me.nudRepeatValues.Name = "nudRepeatValues" + Me.nudRepeatValues.Size = New System.Drawing.Size(44, 20) + Me.nudRepeatValues.TabIndex = 12 + ' 'dtpSelectorB ' - Me.dtpSelectorB.Location = New System.Drawing.Point(102, 49) + Me.dtpSelectorB.Location = New System.Drawing.Point(98, 48) Me.dtpSelectorB.Name = "dtpSelectorB" - Me.dtpSelectorB.Size = New System.Drawing.Size(95, 20) + Me.dtpSelectorB.Size = New System.Drawing.Size(87, 20) Me.dtpSelectorB.TabIndex = 5 ' + 'nudInstepsOf + ' + Me.nudInstepsOf.Location = New System.Drawing.Point(98, 74) + Me.nudInstepsOf.Name = "nudInstepsOf" + Me.nudInstepsOf.Size = New System.Drawing.Size(47, 20) + Me.nudInstepsOf.TabIndex = 10 + ' 'dtpSelectorA ' - Me.dtpSelectorA.Location = New System.Drawing.Point(101, 23) + Me.dtpSelectorA.Location = New System.Drawing.Point(98, 20) Me.dtpSelectorA.Name = "dtpSelectorA" - Me.dtpSelectorA.Size = New System.Drawing.Size(95, 20) + Me.dtpSelectorA.Size = New System.Drawing.Size(91, 20) Me.dtpSelectorA.TabIndex = 2 ' - 'txtRepeatValues - ' - Me.txtRepeatValues.Location = New System.Drawing.Point(100, 103) - Me.txtRepeatValues.Name = "txtRepeatValues" - Me.txtRepeatValues.Size = New System.Drawing.Size(38, 20) - Me.txtRepeatValues.TabIndex = 9 - Me.txtRepeatValues.Tag = "" - ' - 'cboInStepsOf - ' - Me.cboInStepsOf.FormattingEnabled = True - Me.cboInStepsOf.Location = New System.Drawing.Point(100, 76) - Me.cboInStepsOf.Name = "cboInStepsOf" - Me.cboInStepsOf.Size = New System.Drawing.Size(38, 21) - Me.cboInStepsOf.TabIndex = 7 - ' 'chkDefineAsFactor ' Me.chkDefineAsFactor.AutoSize = True @@ -213,39 +230,15 @@ Partial Class dlgRegularSequence Me.lblFrom.Tag = "From" Me.lblFrom.Text = "From" ' - 'txtFrom - ' - Me.txtFrom.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.txtFrom.Location = New System.Drawing.Point(100, 23) - Me.txtFrom.Name = "txtFrom" - Me.txtFrom.Size = New System.Drawing.Size(38, 20) - Me.txtFrom.TabIndex = 1 - ' - 'txtTo - ' - Me.txtTo.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.txtTo.Location = New System.Drawing.Point(100, 49) - Me.txtTo.Name = "txtTo" - Me.txtTo.Size = New System.Drawing.Size(38, 20) - Me.txtTo.TabIndex = 4 - ' - 'txtLength - ' - Me.txtLength.Enabled = False - Me.txtLength.Location = New System.Drawing.Point(147, 25) - Me.txtLength.Name = "txtLength" - Me.txtLength.Size = New System.Drawing.Size(58, 20) - Me.txtLength.TabIndex = 2 - ' 'lblPreview ' Me.lblPreview.AutoSize = True Me.lblPreview.Location = New System.Drawing.Point(235, 48) Me.lblPreview.Name = "lblPreview" - Me.lblPreview.Size = New System.Drawing.Size(64, 13) + Me.lblPreview.Size = New System.Drawing.Size(45, 13) Me.lblPreview.TabIndex = 7 - Me.lblPreview.Tag = "Get_preview" - Me.lblPreview.Text = "Get preview" + Me.lblPreview.Tag = "Preview" + Me.lblPreview.Text = "Preview" ' 'lblLength ' @@ -275,20 +268,12 @@ Partial Class dlgRegularSequence Me.txtGetPreview.TabIndex = 8 Me.txtGetPreview.Text = "" ' - 'ucrNewColumnNameSelector - ' - Me.ucrNewColumnNameSelector.Location = New System.Drawing.Point(12, 258) - Me.ucrNewColumnNameSelector.Name = "ucrNewColumnNameSelector" - Me.ucrNewColumnNameSelector.Size = New System.Drawing.Size(402, 35) - Me.ucrNewColumnNameSelector.TabIndex = 5 - Me.ucrNewColumnNameSelector.ucrDataFrameSelector = Nothing - ' - 'ucrSelectDataFrame + 'ucrSelectDataFrameRegularSequence ' - Me.ucrSelectDataFrame.Location = New System.Drawing.Point(12, 9) - Me.ucrSelectDataFrame.Name = "ucrSelectDataFrame" - Me.ucrSelectDataFrame.Size = New System.Drawing.Size(126, 39) - Me.ucrSelectDataFrame.TabIndex = 0 + Me.ucrSelectDataFrameRegularSequence.Location = New System.Drawing.Point(12, 9) + Me.ucrSelectDataFrameRegularSequence.Name = "ucrSelectDataFrameRegularSequence" + Me.ucrSelectDataFrameRegularSequence.Size = New System.Drawing.Size(126, 39) + Me.ucrSelectDataFrameRegularSequence.TabIndex = 0 ' 'ucrBase ' @@ -297,19 +282,45 @@ Partial Class dlgRegularSequence Me.ucrBase.Size = New System.Drawing.Size(402, 55) Me.ucrBase.TabIndex = 9 ' + 'UcrDataFrameLengthForRegularSequence + ' + Me.UcrDataFrameLengthForRegularSequence.clsDataFrameSelector = Nothing + Me.UcrDataFrameLengthForRegularSequence.Location = New System.Drawing.Point(154, 25) + Me.UcrDataFrameLengthForRegularSequence.Name = "UcrDataFrameLengthForRegularSequence" + Me.UcrDataFrameLengthForRegularSequence.Size = New System.Drawing.Size(53, 23) + Me.UcrDataFrameLengthForRegularSequence.TabIndex = 10 + ' + 'UcrInputCboRegularSequence + ' + Me.UcrInputCboRegularSequence.Location = New System.Drawing.Point(272, 252) + Me.UcrInputCboRegularSequence.Name = "UcrInputCboRegularSequence" + Me.UcrInputCboRegularSequence.Size = New System.Drawing.Size(137, 25) + Me.UcrInputCboRegularSequence.TabIndex = 11 + ' + 'lblNewColumnName + ' + Me.lblNewColumnName.AutoSize = True + Me.lblNewColumnName.Location = New System.Drawing.Point(18, 263) + Me.lblNewColumnName.Name = "lblNewColumnName" + Me.lblNewColumnName.Size = New System.Drawing.Size(98, 13) + Me.lblNewColumnName.TabIndex = 12 + Me.lblNewColumnName.Tag = "New_Column_Name" + Me.lblNewColumnName.Text = "New Column Name" + ' 'dlgRegularSequence ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.ClientSize = New System.Drawing.Size(421, 351) + Me.Controls.Add(Me.lblNewColumnName) + Me.Controls.Add(Me.UcrInputCboRegularSequence) + Me.Controls.Add(Me.UcrDataFrameLengthForRegularSequence) Me.Controls.Add(Me.txtGetPreview) Me.Controls.Add(Me.cmdRefreshPreview) Me.Controls.Add(Me.grpSequenceDefinition) Me.Controls.Add(Me.lblLength) Me.Controls.Add(Me.lblPreview) - Me.Controls.Add(Me.txtLength) - Me.Controls.Add(Me.ucrNewColumnNameSelector) - Me.Controls.Add(Me.ucrSelectDataFrame) + Me.Controls.Add(Me.ucrSelectDataFrameRegularSequence) Me.Controls.Add(Me.ucrBase) Me.Controls.Add(Me.grpSequenceType) Me.MaximizeBox = False @@ -323,6 +334,10 @@ Partial Class dlgRegularSequence Me.grpSequenceType.PerformLayout() Me.grpSequenceDefinition.ResumeLayout(False) Me.grpSequenceDefinition.PerformLayout() + CType(Me.nudTo, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.nudFrom, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.nudRepeatValues, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.nudInstepsOf, System.ComponentModel.ISupportInitialize).EndInit() Me.ResumeLayout(False) Me.PerformLayout() @@ -335,21 +350,22 @@ Partial Class dlgRegularSequence Friend WithEvents lblSteps As Label Friend WithEvents lblTo As Label Friend WithEvents lblFrom As Label - Friend WithEvents txtFrom As TextBox - Friend WithEvents txtTo As TextBox Friend WithEvents ucrBase As ucrButtons - Friend WithEvents ucrSelectDataFrame As ucrDataFrame - Friend WithEvents ucrNewColumnNameSelector As ucrNewColumnName - Friend WithEvents txtLength As TextBox + Friend WithEvents ucrSelectDataFrameRegularSequence As ucrDataFrame Friend WithEvents lblPreview As Label Friend WithEvents lblLength As Label Friend WithEvents cmdRefreshPreview As Button Friend WithEvents lblTimes1 As Label Friend WithEvents lblRepeatValues As Label - Friend WithEvents cboInStepsOf As ComboBox Friend WithEvents chkDefineAsFactor As CheckBox - Friend WithEvents txtRepeatValues As TextBox Friend WithEvents dtpSelectorA As DateTimePicker Friend WithEvents dtpSelectorB As DateTimePicker Friend WithEvents txtGetPreview As RichTextBox + Friend WithEvents nudTo As NumericUpDown + Friend WithEvents nudFrom As NumericUpDown + Friend WithEvents nudRepeatValues As NumericUpDown + Friend WithEvents nudInstepsOf As NumericUpDown + Friend WithEvents UcrDataFrameLengthForRegularSequence As ucrDataFrameLength + Friend WithEvents UcrInputCboRegularSequence As ucrInputComboBox + Friend WithEvents lblNewColumnName As Label End Class diff --git a/instat/dlgRegularSequence.vb b/instat/dlgRegularSequence.vb index 034bb155e7f..4dc89fe398e 100644 --- a/instat/dlgRegularSequence.vb +++ b/instat/dlgRegularSequence.vb @@ -16,104 +16,97 @@ Imports instat.Translations Public Class dlgRegularSequence Dim bIsExtended As Boolean = False - + Public bFirstLoad As Boolean = True Private Sub dlgRegularSequence_Load(sender As Object, e As EventArgs) Handles MyBase.Load ucrBase.clsRsyntax.SetFunction("seq") autoTranslate(Me) - frmMain.clsRLink.SetOutput(txtGetPreview) - dtpSelectorA.Visible = False - dtpSelectorB.Visible = False - 'ucrSelectDataFrame.SetColumnList(ucrColName) - ucrNewColumnNameSelector.SetDataFrameSelector(ucrSelectDataFrame) - ucrNewColumnNameSelector.SetPrefix("Sequence") - - ucrBase.clsRsyntax.SetAssignTo(strAssignToName:=ucrNewColumnNameSelector.cboColumnName.Text, strTempDataframe:=ucrSelectDataFrame.cboAvailableDataFrames.Text, strTempColumn:=ucrNewColumnNameSelector.cboColumnName.Text) - End Sub - Private Sub rdoDates_Click(sender As Object, e As EventArgs) Handles rdoDates.Click - chkDefineAsFactor.Visible = False - dtpSelectorA.Visible = True - dtpSelectorB.Visible = True - End Sub - - - Private Sub txtFrom_Leave(sender As Object, e As EventArgs) Handles txtFrom.Leave - - If IsNumeric(txtFrom.Text) = True Or txtFrom.Text = "" Then - ucrBase.clsRsyntax.AddParameter("from", txtFrom.Text) - - ElseIf IsNumeric(txtFrom.Text) = False Then - MsgBox("Enter numeric value", vbOKOnly) - txtFrom.Focus() - + ucrBase.iHelpTopicID = 30 + UcrDataFrameLengthForRegularSequence.SetDataFrameSelector(ucrSelectDataFrameRegularSequence) + UcrInputCboRegularSequence.SetPrefix("Regular") + UcrInputCboRegularSequence.SetItemsTypeAsColumns() + UcrInputCboRegularSequence.SetDefaultTypeAsColumn() + UcrInputCboRegularSequence.SetDataFrameSelector(ucrSelectDataFrameRegularSequence) + ucrBase.clsRsyntax.SetAssignTo(strAssignToName:=UcrInputCboRegularSequence.GetText, strTempDataframe:=ucrSelectDataFrameRegularSequence.cboAvailableDataFrames.Text, strTempColumn:=UcrInputCboRegularSequence.GetText) + + If bFirstLoad Then + SetDefaults() + bFirstLoad = False + Else + ReopenDialog() End If - - - + TestOKEnabled() End Sub - Private Sub txtRepeatValues_Leave(sender As Object, e As EventArgs) Handles txtRepeatValues.Leave - - If IsNumeric(txtRepeatValues.Text) = True Or txtRepeatValues.Text = "" Then - ucrBase.clsRsyntax.AddParameter("from", txtRepeatValues.Text) - - ElseIf IsNumeric(txtRepeatValues.Text) = False Then - MsgBox("Enter numeric value", vbOKOnly) - txtRepeatValues.Focus() - - End If - + Private Sub SetDefaults() + rdoNumeric.Checked = True + End Sub - End Sub - Private Sub txtTo_Leave(sender As Object, e As EventArgs) Handles txtTo.Leave - If IsNumeric(txtFrom.Text) = True Or txtTo.Text = "" Then - ucrBase.clsRsyntax.AddParameter("from", txtTo.Text) + Private Sub ReopenDialog() - ElseIf IsNumeric(txtTo.Text) = False Then - MsgBox("Enter numeric value", vbOKOnly) - txtTo.Focus() + End Sub + Private Sub TestOKEnabled() + If rdoNumeric.Checked = True Then + If nudFrom.Text <> "" And nudTo.Text <> "" Then + ucrBase.OKEnabled(True) + Else + ucrBase.OKEnabled(False) + End If + ElseIf rdoDates.Checked = True Then + + ucrBase.OKEnabled(True) + Else + ucrBase.OKEnabled(False) End If - End Sub - Private Sub rdoNumeric_CheckedChanged(sender As Object, e As EventArgs) Handles rdoNumeric.Click - If rdoNumeric.Checked = True Then + 'Private Sub cmdRefreshPreview_Click(sender As Object, e As EventArgs) Handles cmdRefreshPreview.Click + ' frmMain.clsRLink.RunScript(ucrBase.clsRsyntax.clsBaseFunction.ToScript(), 2) + ' txtGetPreview.Refresh() + 'End Sub + + Private Sub grpSequenceType_CheckedChanged(sender As Object, e As EventArgs) Handles rdoDates.CheckedChanged, rdoNumeric.CheckedChanged + If rdoNumeric.Checked Then + nudFrom.Visible = True + nudTo.Visible = True dtpSelectorA.Visible = False dtpSelectorB.Visible = False - chkDefineAsFactor.Visible = True - + nudRepeatValues.Enabled = False + Else + dtpSelectorA.Visible = True + dtpSelectorB.Visible = True + nudFrom.Visible = False + nudTo.Visible = False End If + TestOKEnabled() End Sub - - Private Sub dtpSelectorA_Leave(sender As Object, e As EventArgs) - ucrBase.clsRsyntax.AddParameter("from", "as.Date('" & Format(dtpSelectorA.Value, "yyyy/MM/dd") & "')") - End Sub - Private Sub dtpSelectorB_Leave(sender As Object, e As EventArgs) - ucrBase.clsRsyntax.AddParameter("to", "as.Date('" & Format(dtpSelectorB.Value, "yyyy/MM/dd") & "')") - End Sub - Private Sub cboInStepsOf_SelectedIndexChanged(sender As Object, e As EventArgs) - ucrBase.clsRsyntax.AddParameter("by", "'" & cboInStepsOf.SelectedItem.ToString() & "'") - End Sub - Private Sub txtRepeatValues_TextChanged(sender As Object, e As EventArgs) - ucrBase.clsRsyntax.AddParameter("length.out", txtRepeatValues.Text) - End Sub - Private Sub ucrSelectDataFrame_LostFocus(sender As Object, e As EventArgs) Handles ucrSelectDataFrame.LostFocus - ucrBase.clsRsyntax.SetAssignTo(strAssignToName:=ucrNewColumnNameSelector.cboColumnName.Text, strTempDataframe:=ucrSelectDataFrame.cboAvailableDataFrames.Text, strTempColumn:=ucrNewColumnNameSelector.cboColumnName.Text) + Private Sub nudInstepsOf_ValueChanged(sender As Object, e As EventArgs) Handles nudInstepsOf.ValueChanged + ucrBase.clsRsyntax.AddParameter("by", nudInstepsOf.Value) End Sub - Private Sub ucrColName_LostFocus(sender As Object, e As EventArgs) Handles ucrNewColumnNameSelector.LostFocus - ucrBase.clsRsyntax.SetAssignTo(strAssignToName:=ucrNewColumnNameSelector.cboColumnName.Text, strTempDataframe:=ucrSelectDataFrame.cboAvailableDataFrames.Text, strTempColumn:=ucrNewColumnNameSelector.cboColumnName.Text) + Private Sub nudRepeatValues_ValueChanged(sender As Object, e As EventArgs) Handles nudRepeatValues.ValueChanged + If rdoDates.Checked Then + ucrBase.clsRsyntax.AddParameter("length.out", "NULL") + Else + ucrBase.clsRsyntax.AddParameter("length.out", nudRepeatValues.Value) + End If + End Sub + Private Sub nudFrom_ValueChanged(sender As Object, e As EventArgs) Handles nudFrom.ValueChanged + ucrBase.clsRsyntax.AddParameter("from", nudFrom.Value) + End Sub - Private Sub cboInStepsOf_TextChanged(sender As Object, e As EventArgs) - ucrBase.clsRsyntax.AddParameter("by", cboInStepsOf.Text) + Private Sub nudTo_ValueChanged(sender As Object, e As EventArgs) Handles nudTo.ValueChanged + ucrBase.clsRsyntax.AddParameter("to", nudTo.Value) End Sub - Private Sub cmdRefreshPreview_Click(sender As Object, e As EventArgs) Handles cmdRefreshPreview.Click - frmMain.clsRLink.RunScript(ucrBase.clsRsyntax.GetScript(), ucrBase.clsRsyntax.iCallType) - txtGetPreview.Refresh() + Private Sub dtpSelectorA_ValueChanged(sender As Object, e As EventArgs) Handles dtpSelectorA.ValueChanged + ucrBase.clsRsyntax.AddParameter("from", "as.Date('" & Format(dtpSelectorA.Value, "yyyy/MM/dd") & "')") End Sub + Private Sub dtpSelectorB_ValueChanged(sender As Object, e As EventArgs) Handles dtpSelectorB.ValueChanged + ucrBase.clsRsyntax.AddParameter("to", "as.Date('" & Format(dtpSelectorB.Value, "yyyy/MM/dd") & "')") + End Sub End Class \ No newline at end of file diff --git a/instat/dlgRenameDescriptive.Designer.vb b/instat/dlgRenameDescriptive.Designer.vb new file mode 100644 index 00000000000..46f4d772a9a --- /dev/null +++ b/instat/dlgRenameDescriptive.Designer.vb @@ -0,0 +1,51 @@ + _ +Partial Class dlgRenameDescriptive + Inherits System.Windows.Forms.Form + + 'Form overrides dispose to clean up the component list. + _ + Protected Overrides Sub Dispose(ByVal disposing As Boolean) + Try + If disposing AndAlso components IsNot Nothing Then + components.Dispose() + End If + Finally + MyBase.Dispose(disposing) + End Try + 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() + Me.ucrBase = New instat.ucrButtons() + Me.SuspendLayout() + ' + 'ucrBase + ' + Me.ucrBase.Location = New System.Drawing.Point(12, 196) + Me.ucrBase.Name = "ucrBase" + Me.ucrBase.Size = New System.Drawing.Size(410, 53) + Me.ucrBase.TabIndex = 0 + ' + 'dlgRenameDescriptive + ' + Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) + Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.ClientSize = New System.Drawing.Size(425, 261) + Me.Controls.Add(Me.ucrBase) + Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow + Me.Name = "dlgRenameDescriptive" + Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen + Me.Tag = "Rename" + Me.Text = "Rename" + Me.ResumeLayout(False) + + End Sub + + Friend WithEvents ucrBase As ucrButtons +End Class diff --git a/instat/dlgRenameDescriptive.fr-FR.resx b/instat/dlgRenameDescriptive.fr-FR.resx new file mode 100644 index 00000000000..9c9f69d752c --- /dev/null +++ b/instat/dlgRenameDescriptive.fr-FR.resx @@ -0,0 +1,15 @@ + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/instat/dlgRenameDescriptive.resx b/instat/dlgRenameDescriptive.resx new file mode 100644 index 00000000000..29dcb1b3a35 --- /dev/null +++ b/instat/dlgRenameDescriptive.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/instat/dlgRenameDescriptive.sw-KE.resx b/instat/dlgRenameDescriptive.sw-KE.resx new file mode 100644 index 00000000000..9c9f69d752c --- /dev/null +++ b/instat/dlgRenameDescriptive.sw-KE.resx @@ -0,0 +1,15 @@ + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/instat/dlgRenameDescriptive.vb b/instat/dlgRenameDescriptive.vb new file mode 100644 index 00000000000..f0ecfc9ffd4 --- /dev/null +++ b/instat/dlgRenameDescriptive.vb @@ -0,0 +1,21 @@ +' 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 . +Imports instat.Translations +Public Class dlgRenameDescriptive + Private Sub dlgRenameDescriptive_Load(sender As Object, e As EventArgs) Handles MyBase.Load + autoTranslate(Me) + End Sub +End Class \ No newline at end of file diff --git a/instat/dlgRenameModels.Designer.vb b/instat/dlgRenameModels.Designer.vb new file mode 100644 index 00000000000..d97d8a98a2a --- /dev/null +++ b/instat/dlgRenameModels.Designer.vb @@ -0,0 +1,51 @@ + _ +Partial Class dlgRenameModels + Inherits System.Windows.Forms.Form + + 'Form overrides dispose to clean up the component list. + _ + Protected Overrides Sub Dispose(ByVal disposing As Boolean) + Try + If disposing AndAlso components IsNot Nothing Then + components.Dispose() + End If + Finally + MyBase.Dispose(disposing) + End Try + 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() + Me.ucrBase = New instat.ucrButtons() + Me.SuspendLayout() + ' + 'ucrBase + ' + Me.ucrBase.Location = New System.Drawing.Point(12, 196) + Me.ucrBase.Name = "ucrBase" + Me.ucrBase.Size = New System.Drawing.Size(410, 53) + Me.ucrBase.TabIndex = 0 + ' + 'dlgRenameModels + ' + Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) + Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.ClientSize = New System.Drawing.Size(428, 261) + Me.Controls.Add(Me.ucrBase) + Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow + Me.Name = "dlgRenameModels" + Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen + Me.Tag = "Rename" + Me.Text = "Rename" + Me.ResumeLayout(False) + + End Sub + + Friend WithEvents ucrBase As ucrButtons +End Class diff --git a/instat/dlgRenameModels.fr-FR.resx b/instat/dlgRenameModels.fr-FR.resx new file mode 100644 index 00000000000..9c9f69d752c --- /dev/null +++ b/instat/dlgRenameModels.fr-FR.resx @@ -0,0 +1,15 @@ + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/instat/dlgRenameModels.resx b/instat/dlgRenameModels.resx new file mode 100644 index 00000000000..29dcb1b3a35 --- /dev/null +++ b/instat/dlgRenameModels.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/instat/dlgRenameModels.sw-KE.resx b/instat/dlgRenameModels.sw-KE.resx new file mode 100644 index 00000000000..9c9f69d752c --- /dev/null +++ b/instat/dlgRenameModels.sw-KE.resx @@ -0,0 +1,15 @@ + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/instat/dlgRenameModels.vb b/instat/dlgRenameModels.vb new file mode 100644 index 00000000000..e3ec42b861a --- /dev/null +++ b/instat/dlgRenameModels.vb @@ -0,0 +1,21 @@ +' 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 . +Imports instat.Translations +Public Class dlgRenameModels + Private Sub dlgRenameModels_Load(sender As Object, e As EventArgs) Handles MyBase.Load + autoTranslate(Me) + End Sub +End Class \ No newline at end of file diff --git a/instat/dlgReoderDescriptives.Designer.vb b/instat/dlgReoderDescriptives.Designer.vb new file mode 100644 index 00000000000..db9a50d670f --- /dev/null +++ b/instat/dlgReoderDescriptives.Designer.vb @@ -0,0 +1,51 @@ + _ +Partial Class dlgReoderDescriptives + Inherits System.Windows.Forms.Form + + 'Form overrides dispose to clean up the component list. + _ + Protected Overrides Sub Dispose(ByVal disposing As Boolean) + Try + If disposing AndAlso components IsNot Nothing Then + components.Dispose() + End If + Finally + MyBase.Dispose(disposing) + End Try + 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() + Me.ucrBase = New instat.ucrButtons() + Me.SuspendLayout() + ' + 'ucrBase + ' + Me.ucrBase.Location = New System.Drawing.Point(12, 204) + Me.ucrBase.Name = "ucrBase" + Me.ucrBase.Size = New System.Drawing.Size(410, 53) + Me.ucrBase.TabIndex = 0 + ' + 'dlgReoderDescriptive + ' + Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) + Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.ClientSize = New System.Drawing.Size(428, 269) + Me.Controls.Add(Me.ucrBase) + Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow + Me.Name = "dlgReoderDescriptive" + Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen + Me.Tag = "Reoder" + Me.Text = "Reoder" + Me.ResumeLayout(False) + + End Sub + + Friend WithEvents ucrBase As ucrButtons +End Class diff --git a/instat/dlgReoderDescriptives.fr-FR.resx b/instat/dlgReoderDescriptives.fr-FR.resx new file mode 100644 index 00000000000..9c9f69d752c --- /dev/null +++ b/instat/dlgReoderDescriptives.fr-FR.resx @@ -0,0 +1,15 @@ + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/instat/dlgReoderDescriptives.resx b/instat/dlgReoderDescriptives.resx new file mode 100644 index 00000000000..29dcb1b3a35 --- /dev/null +++ b/instat/dlgReoderDescriptives.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/instat/dlgReoderDescriptives.sw-KE.resx b/instat/dlgReoderDescriptives.sw-KE.resx new file mode 100644 index 00000000000..9c9f69d752c --- /dev/null +++ b/instat/dlgReoderDescriptives.sw-KE.resx @@ -0,0 +1,15 @@ + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/instat/dlgReoderDescriptives.vb b/instat/dlgReoderDescriptives.vb new file mode 100644 index 00000000000..70cc0a25ff4 --- /dev/null +++ b/instat/dlgReoderDescriptives.vb @@ -0,0 +1,21 @@ +' 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 . +Imports instat.Translations +Public Class dlgReoderDescriptives + Private Sub dlgReoderDescriptives_Load(sender As Object, e As EventArgs) Handles MyBase.Load + autoTranslate(Me) + End Sub +End Class \ No newline at end of file diff --git a/instat/dlgReoderModels.Designer.vb b/instat/dlgReoderModels.Designer.vb new file mode 100644 index 00000000000..1a9502754eb --- /dev/null +++ b/instat/dlgReoderModels.Designer.vb @@ -0,0 +1,51 @@ + _ +Partial Class dlgReoderModels + Inherits System.Windows.Forms.Form + + 'Form overrides dispose to clean up the component list. + _ + Protected Overrides Sub Dispose(ByVal disposing As Boolean) + Try + If disposing AndAlso components IsNot Nothing Then + components.Dispose() + End If + Finally + MyBase.Dispose(disposing) + End Try + 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() + Me.ucrBase = New instat.ucrButtons() + Me.SuspendLayout() + ' + 'ucrBase + ' + Me.ucrBase.Location = New System.Drawing.Point(13, 196) + Me.ucrBase.Name = "ucrBase" + Me.ucrBase.Size = New System.Drawing.Size(410, 53) + Me.ucrBase.TabIndex = 0 + ' + 'dlgReoderModels + ' + Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) + Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.ClientSize = New System.Drawing.Size(441, 261) + Me.Controls.Add(Me.ucrBase) + Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow + Me.Name = "dlgReoderModels" + Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen + Me.Tag = "Reoder" + Me.Text = "Reoder" + Me.ResumeLayout(False) + + End Sub + + Friend WithEvents ucrBase As ucrButtons +End Class diff --git a/instat/dlgReoderModels.fr-FR.resx b/instat/dlgReoderModels.fr-FR.resx new file mode 100644 index 00000000000..9c9f69d752c --- /dev/null +++ b/instat/dlgReoderModels.fr-FR.resx @@ -0,0 +1,15 @@ + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/instat/dlgReoderModels.resx b/instat/dlgReoderModels.resx new file mode 100644 index 00000000000..29dcb1b3a35 --- /dev/null +++ b/instat/dlgReoderModels.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/instat/dlgReoderModels.sw-KE.resx b/instat/dlgReoderModels.sw-KE.resx new file mode 100644 index 00000000000..9c9f69d752c --- /dev/null +++ b/instat/dlgReoderModels.sw-KE.resx @@ -0,0 +1,15 @@ + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/instat/dlgReoderModels.vb b/instat/dlgReoderModels.vb new file mode 100644 index 00000000000..f08d8fd7489 --- /dev/null +++ b/instat/dlgReoderModels.vb @@ -0,0 +1,21 @@ +' 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 . +Imports instat.Translations +Public Class dlgReoderModels + Private Sub dlgReoderModels_Load(sender As Object, e As EventArgs) Handles MyBase.Load + autoTranslate(Me) + End Sub +End Class \ No newline at end of file diff --git a/instat/dlgRestrict.Designer.vb b/instat/dlgRestrict.Designer.vb new file mode 100644 index 00000000000..b9c7cd6b688 --- /dev/null +++ b/instat/dlgRestrict.Designer.vb @@ -0,0 +1,51 @@ + _ +Partial Class dlgRestrict + Inherits System.Windows.Forms.Form + + 'Form overrides dispose to clean up the component list. + _ + Protected Overrides Sub Dispose(ByVal disposing As Boolean) + Try + If disposing AndAlso components IsNot Nothing Then + components.Dispose() + End If + Finally + MyBase.Dispose(disposing) + End Try + 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() + Me.ucrBase = New instat.ucrButtons() + Me.SuspendLayout() + ' + 'ucrBase + ' + Me.ucrBase.Location = New System.Drawing.Point(13, 196) + Me.ucrBase.Name = "ucrBase" + Me.ucrBase.Size = New System.Drawing.Size(410, 53) + Me.ucrBase.TabIndex = 0 + ' + 'dlgRestrict + ' + Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) + Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.ClientSize = New System.Drawing.Size(446, 261) + Me.Controls.Add(Me.ucrBase) + Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow + Me.Name = "dlgRestrict" + Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen + Me.Tag = "Restrict_Filter" + Me.Text = "Restrict (Filter)" + Me.ResumeLayout(False) + + End Sub + + Friend WithEvents ucrBase As ucrButtons +End Class diff --git a/instat/dlgRestrict.fr-FR.resx b/instat/dlgRestrict.fr-FR.resx new file mode 100644 index 00000000000..9c9f69d752c --- /dev/null +++ b/instat/dlgRestrict.fr-FR.resx @@ -0,0 +1,15 @@ + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/instat/dlgRestrict.resx b/instat/dlgRestrict.resx new file mode 100644 index 00000000000..29dcb1b3a35 --- /dev/null +++ b/instat/dlgRestrict.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/instat/dlgRestrict.sw-KE.resx b/instat/dlgRestrict.sw-KE.resx new file mode 100644 index 00000000000..9c9f69d752c --- /dev/null +++ b/instat/dlgRestrict.sw-KE.resx @@ -0,0 +1,15 @@ + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/instat/dlgRestrict.vb b/instat/dlgRestrict.vb new file mode 100644 index 00000000000..1a72998d9a0 --- /dev/null +++ b/instat/dlgRestrict.vb @@ -0,0 +1,22 @@ +' 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 . + +Imports instat.Translations +Public Class dlgRestrict + Private Sub dlgRestrict_Load(sender As Object, e As EventArgs) Handles MyBase.Load + autoTranslate(Me) + End Sub +End Class \ No newline at end of file diff --git a/instat/dlgRowStats.Designer.vb b/instat/dlgRowStats.Designer.vb index 52da018821f..a9e7a60ca92 100644 --- a/instat/dlgRowStats.Designer.vb +++ b/instat/dlgRowStats.Designer.vb @@ -24,7 +24,7 @@ Partial Class dlgRowStats Private Sub InitializeComponent() Me.ucrBase = New instat.ucrButtons() Me.lblSelected = New System.Windows.Forms.Label() - Me.ucrNewColumnNameSelector = New instat.ucrNewColumnName() + Me.ucrNewColumnSelectorForRowStats = New instat.ucrNewColumnName() Me.grpStatistic = New System.Windows.Forms.GroupBox() Me.rdoMinimum = New System.Windows.Forms.RadioButton() Me.rdoMaximum = New System.Windows.Forms.RadioButton() @@ -32,8 +32,8 @@ Partial Class dlgRowStats Me.rdoMean = New System.Windows.Forms.RadioButton() Me.rdoStandardDeviation = New System.Windows.Forms.RadioButton() Me.rdoSum = New System.Windows.Forms.RadioButton() - Me.ucrReceiverRowStatistics = New instat.ucrReceiverMultiple() - Me.ucrSelectorByDataFrameAddRemove = New instat.ucrSelectorByDataFrameAddRemove() + Me.ucrReceiverForRowStatistics = New instat.ucrReceiverMultiple() + Me.ucrSelectorForRowStats = New instat.ucrSelectorByDataFrameAddRemove() Me.grpStatistic.SuspendLayout() Me.SuspendLayout() ' @@ -42,7 +42,7 @@ Partial Class dlgRowStats Me.ucrBase.Location = New System.Drawing.Point(12, 309) Me.ucrBase.Name = "ucrBase" Me.ucrBase.Size = New System.Drawing.Size(410, 60) - Me.ucrBase.TabIndex = 6 + Me.ucrBase.TabIndex = 5 ' 'lblSelected ' @@ -50,17 +50,17 @@ Partial Class dlgRowStats Me.lblSelected.Location = New System.Drawing.Point(269, 69) Me.lblSelected.Name = "lblSelected" Me.lblSelected.Size = New System.Drawing.Size(49, 13) - Me.lblSelected.TabIndex = 19 + Me.lblSelected.TabIndex = 1 Me.lblSelected.Tag = "Selected" Me.lblSelected.Text = "Selected" ' - 'ucrNewColumnNameSelector + 'ucrNewColumnSelectorForRowStats ' - Me.ucrNewColumnNameSelector.Location = New System.Drawing.Point(12, 268) - Me.ucrNewColumnNameSelector.Name = "ucrNewColumnNameSelector" - Me.ucrNewColumnNameSelector.Size = New System.Drawing.Size(367, 35) - Me.ucrNewColumnNameSelector.TabIndex = 20 - Me.ucrNewColumnNameSelector.ucrDataFrameSelector = Nothing + Me.ucrNewColumnSelectorForRowStats.Location = New System.Drawing.Point(12, 268) + Me.ucrNewColumnSelectorForRowStats.Name = "ucrNewColumnSelectorForRowStats" + Me.ucrNewColumnSelectorForRowStats.Size = New System.Drawing.Size(367, 35) + Me.ucrNewColumnSelectorForRowStats.TabIndex = 4 + Me.ucrNewColumnSelectorForRowStats.ucrDataFrameSelector = Nothing ' 'grpStatistic ' @@ -73,7 +73,7 @@ Partial Class dlgRowStats Me.grpStatistic.Location = New System.Drawing.Point(12, 197) Me.grpStatistic.Name = "grpStatistic" Me.grpStatistic.Size = New System.Drawing.Size(381, 65) - Me.grpStatistic.TabIndex = 21 + Me.grpStatistic.TabIndex = 3 Me.grpStatistic.TabStop = False Me.grpStatistic.Tag = "Statistic" Me.grpStatistic.Text = "Statistic" @@ -84,7 +84,7 @@ Partial Class dlgRowStats Me.rdoMinimum.Location = New System.Drawing.Point(154, 19) Me.rdoMinimum.Name = "rdoMinimum" Me.rdoMinimum.Size = New System.Drawing.Size(66, 17) - Me.rdoMinimum.TabIndex = 0 + Me.rdoMinimum.TabIndex = 1 Me.rdoMinimum.TabStop = True Me.rdoMinimum.Tag = "Minimum" Me.rdoMinimum.Text = "Minimum" @@ -96,7 +96,7 @@ Partial Class dlgRowStats Me.rdoMaximum.Location = New System.Drawing.Point(154, 42) Me.rdoMaximum.Name = "rdoMaximum" Me.rdoMaximum.Size = New System.Drawing.Size(69, 17) - Me.rdoMaximum.TabIndex = 0 + Me.rdoMaximum.TabIndex = 4 Me.rdoMaximum.TabStop = True Me.rdoMaximum.Tag = "Maximum" Me.rdoMaximum.Text = "Maximum" @@ -108,7 +108,7 @@ Partial Class dlgRowStats Me.rdoCount.Location = New System.Drawing.Point(260, 42) Me.rdoCount.Name = "rdoCount" Me.rdoCount.Size = New System.Drawing.Size(53, 17) - Me.rdoCount.TabIndex = 0 + Me.rdoCount.TabIndex = 5 Me.rdoCount.TabStop = True Me.rdoCount.Tag = "Count" Me.rdoCount.Text = "Count" @@ -132,7 +132,7 @@ Partial Class dlgRowStats Me.rdoStandardDeviation.Location = New System.Drawing.Point(6, 42) Me.rdoStandardDeviation.Name = "rdoStandardDeviation" Me.rdoStandardDeviation.Size = New System.Drawing.Size(114, 17) - Me.rdoStandardDeviation.TabIndex = 0 + Me.rdoStandardDeviation.TabIndex = 3 Me.rdoStandardDeviation.TabStop = True Me.rdoStandardDeviation.Tag = "Standard_deviation" Me.rdoStandardDeviation.Text = "Standard deviation" @@ -144,36 +144,37 @@ Partial Class dlgRowStats Me.rdoSum.Location = New System.Drawing.Point(260, 19) Me.rdoSum.Name = "rdoSum" Me.rdoSum.Size = New System.Drawing.Size(46, 17) - Me.rdoSum.TabIndex = 0 + Me.rdoSum.TabIndex = 2 Me.rdoSum.TabStop = True Me.rdoSum.Tag = "Sum" Me.rdoSum.Text = "Sum" Me.rdoSum.UseVisualStyleBackColor = True ' - 'ucrReceiverRowStatistics + 'ucrReceiverForRowStatistics ' - Me.ucrReceiverRowStatistics.Location = New System.Drawing.Point(272, 85) - Me.ucrReceiverRowStatistics.Name = "ucrReceiverRowStatistics" - Me.ucrReceiverRowStatistics.Size = New System.Drawing.Size(121, 106) - Me.ucrReceiverRowStatistics.TabIndex = 18 + Me.ucrReceiverForRowStatistics.Location = New System.Drawing.Point(272, 85) + Me.ucrReceiverForRowStatistics.Name = "ucrReceiverForRowStatistics" + Me.ucrReceiverForRowStatistics.Selector = Nothing + Me.ucrReceiverForRowStatistics.Size = New System.Drawing.Size(121, 106) + Me.ucrReceiverForRowStatistics.TabIndex = 2 ' - 'ucrSelectorByDataFrameAddRemove + 'ucrSelectorForRowStats ' - Me.ucrSelectorByDataFrameAddRemove.Location = New System.Drawing.Point(13, 13) - Me.ucrSelectorByDataFrameAddRemove.Name = "ucrSelectorByDataFrameAddRemove" - Me.ucrSelectorByDataFrameAddRemove.Size = New System.Drawing.Size(242, 179) - Me.ucrSelectorByDataFrameAddRemove.TabIndex = 22 + Me.ucrSelectorForRowStats.Location = New System.Drawing.Point(13, 13) + Me.ucrSelectorForRowStats.Name = "ucrSelectorForRowStats" + Me.ucrSelectorForRowStats.Size = New System.Drawing.Size(242, 179) + Me.ucrSelectorForRowStats.TabIndex = 0 ' 'dlgRowStats ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.ClientSize = New System.Drawing.Size(462, 377) - Me.Controls.Add(Me.ucrSelectorByDataFrameAddRemove) + Me.Controls.Add(Me.ucrSelectorForRowStats) Me.Controls.Add(Me.grpStatistic) - Me.Controls.Add(Me.ucrNewColumnNameSelector) + Me.Controls.Add(Me.ucrNewColumnSelectorForRowStats) Me.Controls.Add(Me.lblSelected) - Me.Controls.Add(Me.ucrReceiverRowStatistics) + Me.Controls.Add(Me.ucrReceiverForRowStatistics) Me.Controls.Add(Me.ucrBase) Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow Me.Name = "dlgRowStats" @@ -188,9 +189,9 @@ Partial Class dlgRowStats End Sub Friend WithEvents ucrBase As ucrButtons - Friend WithEvents ucrReceiverRowStatistics As ucrReceiverMultiple + Friend WithEvents ucrReceiverForRowStatistics As ucrReceiverMultiple Friend WithEvents lblSelected As Label - Friend WithEvents ucrNewColumnNameSelector As ucrNewColumnName + Friend WithEvents ucrNewColumnSelectorForRowStats As ucrNewColumnName Friend WithEvents grpStatistic As GroupBox Friend WithEvents rdoMinimum As RadioButton Friend WithEvents rdoMaximum As RadioButton @@ -198,5 +199,5 @@ Partial Class dlgRowStats Friend WithEvents rdoMean As RadioButton Friend WithEvents rdoStandardDeviation As RadioButton Friend WithEvents rdoSum As RadioButton - Friend WithEvents ucrSelectorByDataFrameAddRemove As ucrSelectorByDataFrameAddRemove + Friend WithEvents ucrSelectorForRowStats As ucrSelectorByDataFrameAddRemove End Class diff --git a/instat/dlgRowStats.vb b/instat/dlgRowStats.vb index 63531155f94..b39452ab983 100644 --- a/instat/dlgRowStats.vb +++ b/instat/dlgRowStats.vb @@ -16,21 +16,52 @@ ' along with this program. If not, see . Imports instat.Translations Public Class dlgRowStats + Public bFirstLoad As Boolean = False Private Sub dlgRowStats_Load(sender As Object, e As EventArgs) Handles MyBase.Load autoTranslate(Me) ucrBase.clsRsyntax.SetFunction("apply") - ucrBase.clsRsyntax.iCallType = 0 - ucrReceiverRowStatistics.Selector = ucrSelectorByDataFrameAddRemove - ucrReceiverRowStatistics.SetMeAsReceiver() + ucrReceiverForRowStatistics.Selector = ucrSelectorForRowStats + ucrReceiverForRowStatistics.SetMeAsReceiver() ucrBase.clsRsyntax.AddParameter("MARGIN", 1) - ucrNewColumnNameSelector.SetDataFrameSelector(ucrSelectorByDataFrameAddRemove.ucrAvailableDataFrames) - ucrNewColumnNameSelector.SetPrefix("Row_Summary") - ucrBase.clsRsyntax.SetAssignTo(strAssignToName:=ucrNewColumnNameSelector.cboColumnName.Text, strTempDataframe:=ucrSelectorByDataFrameAddRemove.ucrAvailableDataFrames.cboAvailableDataFrames.Text, strTempColumn:=ucrNewColumnNameSelector.cboColumnName.Text) + ucrNewColumnSelectorForRowStats.SetDataFrameSelector(ucrSelectorForRowStats.ucrAvailableDataFrames) + ucrNewColumnSelectorForRowStats.SetPrefix("Row_Summary") + ucrBase.clsRsyntax.SetAssignTo(strAssignToName:=ucrNewColumnSelectorForRowStats.cboColumnName.Text, strTempDataframe:=ucrSelectorForRowStats.ucrAvailableDataFrames.cboAvailableDataFrames.Text, strTempColumn:=ucrNewColumnSelectorForRowStats.cboColumnName.Text) + + If bFirstLoad Then + SetDefaults() + bFirstLoad = False + Else + ReopenDialog() + End If + 'Checks if Ok can be enabled. + TestOKEnabled() + + End Sub + + Private Sub SetDefaults() + ucrSelectorForRowStats.Reset() + End Sub + + Private Sub ReopenDialog() + + End Sub + + Private Sub TestOKEnabled() + If ucrReceiverForRowStatistics.IsEmpty() = False Then + ucrBase.OKEnabled(True) + Else + ucrBase.OKEnabled(False) + End If End Sub - Private Sub ucrReceiverRowStatistics_Leave(sender As Object, e As EventArgs) Handles ucrReceiverRowStatistics.Leave - ucrBase.clsRsyntax.AddParameter("X", clsRFunctionParameter:=ucrReceiverRowStatistics.GetVariables()) + Private Sub ucrReceiverForRowStatistics_SelectionChanged() Handles ucrReceiverForRowStatistics.SelectionChanged + If Not ucrReceiverForRowStatistics.IsEmpty Then + ucrBase.clsRsyntax.AddParameter("X", clsRFunctionParameter:=ucrReceiverForRowStatistics.GetVariables()) + Else + ucrBase.clsRsyntax.RemoveParameter("x") + End If + TestOKEnabled() End Sub @@ -40,21 +71,21 @@ Public Class dlgRowStats ucrBase.clsRsyntax.AddParameter("FUN", "mean") ElseIf rdoCount.Checked = True Then ucrBase.clsRsyntax.AddParameter("FUN", "function(z) sum(!is.na(z))") - ElseIf rdoMaximum.Checked = True Then - ucrBase.clsRsyntax.AddParameter("FUN", "max") - ElseIf rdoMinimum.Checked = True Then - ucrBase.clsRsyntax.AddParameter("FUN", "min") - ElseIf rdoSum.Checked = True Then - ucrBase.clsRsyntax.AddParameter("FUN", "sum") - ElseIf rdoStandardDeviation.Checked = True Then - ucrBase.clsRsyntax.AddParameter("FUN", "sd") - Else - ucrBase.clsRsyntax.RemoveParameter("FUN") + ElseIf rdoMaximum.Checked = True Then + ucrBase.clsRsyntax.AddParameter("FUN", "max") + ElseIf rdoMinimum.Checked = True Then + ucrBase.clsRsyntax.AddParameter("FUN", "min") + ElseIf rdoSum.Checked = True Then + ucrBase.clsRsyntax.AddParameter("FUN", "sum") + ElseIf rdoStandardDeviation.Checked = True Then + ucrBase.clsRsyntax.AddParameter("FUN", "sd") + Else + ucrBase.clsRsyntax.RemoveParameter("FUN") End If End Sub - Private Sub ucrNewColumnNameSelector_Leave(sender As Object, e As EventArgs) Handles ucrNewColumnNameSelector.Leave - ucrBase.clsRsyntax.SetAssignTo(strAssignToName:=ucrNewColumnNameSelector.cboColumnName.Text, strTempDataframe:=ucrSelectorByDataFrameAddRemove.ucrAvailableDataFrames.cboAvailableDataFrames.Text, strTempColumn:=ucrNewColumnNameSelector.cboColumnName.Text) + Private Sub ucrNewColumnNameSelector_Leave(sender As Object, e As EventArgs) Handles ucrNewColumnSelectorForRowStats.Leave + ucrBase.clsRsyntax.SetAssignTo(strAssignToName:=ucrNewColumnSelectorForRowStats.cboColumnName.Text, strTempDataframe:=ucrSelectorForRowStats.ucrAvailableDataFrames.cboAvailableDataFrames.Text, strTempColumn:=ucrNewColumnSelectorForRowStats.cboColumnName.Text) End Sub End Class \ No newline at end of file diff --git a/instat/dlgSaveAs.Designer.vb b/instat/dlgSaveAs.Designer.vb index e9f1d0e26ea..23699c39f4d 100644 --- a/instat/dlgSaveAs.Designer.vb +++ b/instat/dlgSaveAs.Designer.vb @@ -22,24 +22,31 @@ Partial Class dlgSaveAs 'Do not modify it using the code editor. _ Private Sub InitializeComponent() + Me.components = New System.ComponentModel.Container() Me.chkOutput = New System.Windows.Forms.CheckBox() Me.lblChoose = New System.Windows.Forms.Label() Me.grpOptions = New System.Windows.Forms.GroupBox() + Me.grpScript = New System.Windows.Forms.GroupBox() + Me.txtScriptSave = New System.Windows.Forms.TextBox() + Me.cmdScriptSave = New System.Windows.Forms.Button() + Me.chkScript = New System.Windows.Forms.CheckBox() + Me.grpOutput = New System.Windows.Forms.GroupBox() + Me.txtOutputSave = New System.Windows.Forms.TextBox() + Me.cmdOutputSave = New System.Windows.Forms.Button() Me.lblSavePath = New System.Windows.Forms.Label() + Me.grpLog = New System.Windows.Forms.GroupBox() + Me.txtLogSave = New System.Windows.Forms.TextBox() + Me.cmdLogSave = New System.Windows.Forms.Button() + Me.chkLog = New System.Windows.Forms.CheckBox() Me.ucrBase = New instat.ucrButtons() Me.txtEditorSave = New System.Windows.Forms.TextBox() Me.cmdEditorSave = New System.Windows.Forms.Button() Me.lblSaveDataGrid = New System.Windows.Forms.Label() - Me.grpLog = New System.Windows.Forms.GroupBox() - Me.chkLog = New System.Windows.Forms.CheckBox() - Me.txtLogSave = New System.Windows.Forms.TextBox() - Me.cmdLogSave = New System.Windows.Forms.Button() - Me.grpOutput = New System.Windows.Forms.GroupBox() - Me.txtOutputSave = New System.Windows.Forms.TextBox() - Me.cmdOutputSave = New System.Windows.Forms.Button() + Me.ttScript = New System.Windows.Forms.ToolTip(Me.components) Me.grpOptions.SuspendLayout() - Me.grpLog.SuspendLayout() + Me.grpScript.SuspendLayout() Me.grpOutput.SuspendLayout() + Me.grpLog.SuspendLayout() Me.SuspendLayout() ' 'chkOutput @@ -64,6 +71,8 @@ Partial Class dlgSaveAs ' 'grpOptions ' + Me.grpOptions.Controls.Add(Me.grpScript) + Me.grpOptions.Controls.Add(Me.chkScript) Me.grpOptions.Controls.Add(Me.grpOutput) Me.grpOptions.Controls.Add(Me.lblSavePath) Me.grpOptions.Controls.Add(Me.grpLog) @@ -71,11 +80,77 @@ Partial Class dlgSaveAs Me.grpOptions.Controls.Add(Me.chkLog) Me.grpOptions.Location = New System.Drawing.Point(8, 80) Me.grpOptions.Name = "grpOptions" - Me.grpOptions.Size = New System.Drawing.Size(533, 126) + Me.grpOptions.Size = New System.Drawing.Size(533, 182) Me.grpOptions.TabIndex = 14 Me.grpOptions.TabStop = False Me.grpOptions.Text = "Available Options" ' + 'grpScript + ' + Me.grpScript.Controls.Add(Me.txtScriptSave) + Me.grpScript.Controls.Add(Me.cmdScriptSave) + Me.grpScript.Location = New System.Drawing.Point(164, 123) + Me.grpScript.Name = "grpScript" + Me.grpScript.Size = New System.Drawing.Size(362, 40) + Me.grpScript.TabIndex = 21 + Me.grpScript.TabStop = False + ' + 'txtScriptSave + ' + Me.txtScriptSave.Location = New System.Drawing.Point(6, 13) + Me.txtScriptSave.Name = "txtScriptSave" + Me.txtScriptSave.ReadOnly = True + Me.txtScriptSave.Size = New System.Drawing.Size(311, 20) + Me.txtScriptSave.TabIndex = 8 + ' + 'cmdScriptSave + ' + Me.cmdScriptSave.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.cmdScriptSave.Location = New System.Drawing.Point(319, 13) + Me.cmdScriptSave.Name = "cmdScriptSave" + Me.cmdScriptSave.Size = New System.Drawing.Size(31, 20) + Me.cmdScriptSave.TabIndex = 9 + Me.cmdScriptSave.Text = "..." + Me.cmdScriptSave.UseVisualStyleBackColor = True + ' + 'chkScript + ' + Me.chkScript.AutoSize = True + Me.chkScript.Location = New System.Drawing.Point(7, 146) + Me.chkScript.Name = "chkScript" + Me.chkScript.Size = New System.Drawing.Size(141, 17) + Me.chkScript.TabIndex = 20 + Me.chkScript.Text = "Save the Script Window" + Me.chkScript.UseVisualStyleBackColor = True + ' + 'grpOutput + ' + Me.grpOutput.Controls.Add(Me.txtOutputSave) + Me.grpOutput.Controls.Add(Me.cmdOutputSave) + Me.grpOutput.Location = New System.Drawing.Point(163, 28) + Me.grpOutput.Name = "grpOutput" + Me.grpOutput.Size = New System.Drawing.Size(364, 41) + Me.grpOutput.TabIndex = 16 + Me.grpOutput.TabStop = False + ' + 'txtOutputSave + ' + Me.txtOutputSave.Location = New System.Drawing.Point(7, 14) + Me.txtOutputSave.Name = "txtOutputSave" + Me.txtOutputSave.ReadOnly = True + Me.txtOutputSave.Size = New System.Drawing.Size(311, 20) + Me.txtOutputSave.TabIndex = 9 + ' + 'cmdOutputSave + ' + Me.cmdOutputSave.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.cmdOutputSave.Location = New System.Drawing.Point(323, 14) + Me.cmdOutputSave.Name = "cmdOutputSave" + Me.cmdOutputSave.Size = New System.Drawing.Size(31, 20) + Me.cmdOutputSave.TabIndex = 10 + Me.cmdOutputSave.Text = "..." + Me.cmdOutputSave.UseVisualStyleBackColor = True + ' 'lblSavePath ' Me.lblSavePath.AutoSize = True @@ -85,10 +160,48 @@ Partial Class dlgSaveAs Me.lblSavePath.TabIndex = 15 Me.lblSavePath.Text = "Save Path" ' + 'grpLog + ' + Me.grpLog.Controls.Add(Me.txtLogSave) + Me.grpLog.Controls.Add(Me.cmdLogSave) + Me.grpLog.Location = New System.Drawing.Point(165, 76) + Me.grpLog.Name = "grpLog" + Me.grpLog.Size = New System.Drawing.Size(362, 40) + Me.grpLog.TabIndex = 19 + Me.grpLog.TabStop = False + ' + 'txtLogSave + ' + Me.txtLogSave.Location = New System.Drawing.Point(6, 13) + Me.txtLogSave.Name = "txtLogSave" + Me.txtLogSave.ReadOnly = True + Me.txtLogSave.Size = New System.Drawing.Size(311, 20) + Me.txtLogSave.TabIndex = 8 + ' + 'cmdLogSave + ' + Me.cmdLogSave.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.cmdLogSave.Location = New System.Drawing.Point(319, 13) + Me.cmdLogSave.Name = "cmdLogSave" + Me.cmdLogSave.Size = New System.Drawing.Size(31, 20) + Me.cmdLogSave.TabIndex = 9 + Me.cmdLogSave.Text = "..." + Me.cmdLogSave.UseVisualStyleBackColor = True + ' + 'chkLog + ' + Me.chkLog.AutoSize = True + Me.chkLog.Location = New System.Drawing.Point(8, 99) + Me.chkLog.Name = "chkLog" + Me.chkLog.Size = New System.Drawing.Size(132, 17) + Me.chkLog.TabIndex = 3 + Me.chkLog.Text = "Save the Log Window" + Me.chkLog.UseVisualStyleBackColor = True + ' 'ucrBase ' Me.ucrBase.Anchor = System.Windows.Forms.AnchorStyles.Bottom - Me.ucrBase.Location = New System.Drawing.Point(45, 215) + Me.ucrBase.Location = New System.Drawing.Point(45, 268) Me.ucrBase.Name = "ucrBase" Me.ucrBase.Size = New System.Drawing.Size(410, 53) Me.ucrBase.TabIndex = 0 @@ -120,77 +233,17 @@ Partial Class dlgSaveAs Me.lblSaveDataGrid.TabIndex = 18 Me.lblSaveDataGrid.Text = "Save the Data Grid" ' - 'grpLog - ' - Me.grpLog.Controls.Add(Me.txtLogSave) - Me.grpLog.Controls.Add(Me.cmdLogSave) - Me.grpLog.Location = New System.Drawing.Point(165, 76) - Me.grpLog.Name = "grpLog" - Me.grpLog.Size = New System.Drawing.Size(362, 40) - Me.grpLog.TabIndex = 19 - Me.grpLog.TabStop = False - ' - 'chkLog - ' - Me.chkLog.AutoSize = True - Me.chkLog.Location = New System.Drawing.Point(8, 99) - Me.chkLog.Name = "chkLog" - Me.chkLog.Size = New System.Drawing.Size(132, 17) - Me.chkLog.TabIndex = 3 - Me.chkLog.Text = "Save the Log Window" - Me.chkLog.UseVisualStyleBackColor = True - ' - 'txtLogSave - ' - Me.txtLogSave.Location = New System.Drawing.Point(6, 13) - Me.txtLogSave.Name = "txtLogSave" - Me.txtLogSave.ReadOnly = True - Me.txtLogSave.Size = New System.Drawing.Size(311, 20) - Me.txtLogSave.TabIndex = 8 + 'ttScript ' - 'cmdLogSave - ' - Me.cmdLogSave.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.cmdLogSave.Location = New System.Drawing.Point(319, 13) - Me.cmdLogSave.Name = "cmdLogSave" - Me.cmdLogSave.Size = New System.Drawing.Size(31, 20) - Me.cmdLogSave.TabIndex = 9 - Me.cmdLogSave.Text = "..." - Me.cmdLogSave.UseVisualStyleBackColor = True - ' - 'grpOutput - ' - Me.grpOutput.Controls.Add(Me.txtOutputSave) - Me.grpOutput.Controls.Add(Me.cmdOutputSave) - Me.grpOutput.Location = New System.Drawing.Point(163, 28) - Me.grpOutput.Name = "grpOutput" - Me.grpOutput.Size = New System.Drawing.Size(364, 41) - Me.grpOutput.TabIndex = 16 - Me.grpOutput.TabStop = False - ' - 'txtOutputSave - ' - Me.txtOutputSave.Location = New System.Drawing.Point(7, 14) - Me.txtOutputSave.Name = "txtOutputSave" - Me.txtOutputSave.ReadOnly = True - Me.txtOutputSave.Size = New System.Drawing.Size(311, 20) - Me.txtOutputSave.TabIndex = 9 - ' - 'cmdOutputSave - ' - Me.cmdOutputSave.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.cmdOutputSave.Location = New System.Drawing.Point(323, 14) - Me.cmdOutputSave.Name = "cmdOutputSave" - Me.cmdOutputSave.Size = New System.Drawing.Size(31, 20) - Me.cmdOutputSave.TabIndex = 10 - Me.cmdOutputSave.Text = "..." - Me.cmdOutputSave.UseVisualStyleBackColor = True + Me.ttScript.IsBalloon = True + Me.ttScript.ToolTipIcon = System.Windows.Forms.ToolTipIcon.Info + Me.ttScript.ToolTipTitle = "Saving the Script" ' 'dlgSaveAs ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(551, 280) + Me.ClientSize = New System.Drawing.Size(551, 333) Me.Controls.Add(Me.lblSaveDataGrid) Me.Controls.Add(Me.txtEditorSave) Me.Controls.Add(Me.cmdEditorSave) @@ -203,10 +256,12 @@ Partial Class dlgSaveAs Me.Text = "Save As" Me.grpOptions.ResumeLayout(False) Me.grpOptions.PerformLayout() - Me.grpLog.ResumeLayout(False) - Me.grpLog.PerformLayout() + Me.grpScript.ResumeLayout(False) + Me.grpScript.PerformLayout() Me.grpOutput.ResumeLayout(False) Me.grpOutput.PerformLayout() + Me.grpLog.ResumeLayout(False) + Me.grpLog.PerformLayout() Me.ResumeLayout(False) Me.PerformLayout() @@ -227,4 +282,9 @@ Partial Class dlgSaveAs Friend WithEvents txtLogSave As TextBox Friend WithEvents cmdOutputSave As Button Friend WithEvents txtOutputSave As TextBox + Friend WithEvents grpScript As GroupBox + Friend WithEvents txtScriptSave As TextBox + Friend WithEvents cmdScriptSave As Button + Friend WithEvents chkScript As CheckBox + Friend WithEvents ttScript As ToolTip End Class diff --git a/instat/dlgSaveAs.fr-FR.resx b/instat/dlgSaveAs.fr-FR.resx index 9c9f69d752c..79b271eb6e9 100644 --- a/instat/dlgSaveAs.fr-FR.resx +++ b/instat/dlgSaveAs.fr-FR.resx @@ -12,4 +12,7 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 17, 17 + \ No newline at end of file diff --git a/instat/dlgSaveAs.resx b/instat/dlgSaveAs.resx index 29dcb1b3a35..9306750710f 100644 --- a/instat/dlgSaveAs.resx +++ b/instat/dlgSaveAs.resx @@ -117,4 +117,7 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 17, 17 + \ No newline at end of file diff --git a/instat/dlgSaveAs.sw-KE.resx b/instat/dlgSaveAs.sw-KE.resx index 9c9f69d752c..79b271eb6e9 100644 --- a/instat/dlgSaveAs.sw-KE.resx +++ b/instat/dlgSaveAs.sw-KE.resx @@ -12,4 +12,7 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 17, 17 + \ No newline at end of file diff --git a/instat/dlgSaveAs.vb b/instat/dlgSaveAs.vb index ba9bd9ba0f8..254b978f821 100644 --- a/instat/dlgSaveAs.vb +++ b/instat/dlgSaveAs.vb @@ -2,6 +2,7 @@ Imports instat.Translations Public Class dlgSaveAs Dim dlgSave As New SaveFileDialog + Dim bFirstLoad As Boolean = True Private Sub chkLog_CheckedChanged(sender As Object, e As EventArgs) Handles chkLog.CheckedChanged If chkLog.Checked = True Then @@ -9,7 +10,6 @@ Public Class dlgSaveAs Else grpLog.Enabled = False End If - CheckOKEnable() End Sub Private Sub chkOutput_CheckedChanged(sender As Object, e As EventArgs) Handles chkOutput.CheckedChanged @@ -18,22 +18,16 @@ Public Class dlgSaveAs Else grpOutput.Enabled = False End If - CheckOKEnable() End Sub Private Sub dlgSaveAs_Load(sender As Object, e As EventArgs) Handles Me.Load + ttScript.SetToolTip(chkScript, "You cannot save an empty script.") autoTranslate(Me) - ucrBase.OKEnabled(False) - If chkOutput.Checked Then - grpLog.Enabled = True - Else - grpLog.Enabled = False - End If - If chkLog.Checked Then - grpOutput.Enabled = True - Else - grpOutput.Enabled = False + If bFirstLoad Then + setDefaults() + bFirstLoad = False End If + TestOKEnabled() End Sub Private Sub cmdLogSave_Click(sender As Object, e As EventArgs) Handles cmdLogSave.Click @@ -43,7 +37,6 @@ Public Class dlgSaveAs If dlgSave.ShowDialog() = DialogResult.OK Then txtLogSave.Text = dlgSave.FileName.Replace("\", "/") End If - CheckOKEnable() End Sub Private Sub cmdOutputSave_Click(sender As Object, e As EventArgs) Handles cmdOutputSave.Click @@ -53,32 +46,26 @@ Public Class dlgSaveAs If dlgSave.ShowDialog() = DialogResult.OK Then txtOutputSave.Text = dlgSave.FileName.Replace("\", "/") End If - CheckOKEnable() End Sub - Public Sub CheckOKEnable() - Dim bEnable = False + Private Sub TestOKEnabled() If txtEditorSave.Text <> "" Then - bEnable = True - If chkLog.Checked And txtLogSave.Text = "" Then - bEnable = False - End If - If chkOutput.Checked And txtOutputSave.Text = "" Then - bEnable = False - End If + ucrBase.OKEnabled(True) + Else + ucrBase.OKEnabled(False) End If - ucrBase.OKEnabled(bEnable) End Sub + Private Sub ucrBase_ClickOk(sender As Object, e As EventArgs) Handles ucrBase.ClickOk - If chkLog.Checked = True And txtLogSave.Text <> "" Then - Try - Dim sWriter As New StreamWriter(txtOutputSave.Text) - sWriter.Write(frmLog.txtLog.Text) - sWriter.Flush() - Catch ex As Exception - End Try + If chkLog.Checked And txtLogSave.Text <> "" Then + saveTextFiles(txtLogSave.Text, frmLog.txtLog.Text) End If - If chkOutput.Checked = True And txtOutputSave.Text <> "" Then + + If chkScript.Checked Then + saveTextFiles(txtScriptSave.Text, frmScript.txtScript.Text) + End If + + If chkOutput.Checked And txtOutputSave.Text <> "" Then Try frmCommand.txtCommand.SaveFile(txtOutputSave.Text, RichTextBoxStreamType.RichText) Catch ex As Exception @@ -100,6 +87,58 @@ Public Class dlgSaveAs 'Pass the file ucrBase.clsRsyntax.AddParameter("file", Chr(34) & txtEditorSave.Text & Chr(34)) - CheckOKEnable() + TestOKEnabled() + End Sub + + Private Sub txtEditorSave_TextChanged(sender As Object, e As EventArgs) Handles txtEditorSave.TextChanged + TestOKEnabled() + End Sub + + Private Sub chkScript_CheckStateChanged(sender As Object, e As EventArgs) Handles chkScript.CheckStateChanged + If frmScript.txtScript.Text <> "" Then + If chkScript.Checked Then + grpScript.Enabled = True + Else + grpScript.Enabled = False + End If + Else + chkScript.Checked = False + Exit Sub + End If + End Sub + + Private Sub cmdScriptSave_Click(sender As Object, e As EventArgs) Handles cmdScriptSave.Click + dlgSave.Reset() + dlgSave.Title = "Save Script File" + dlgSave.Filter = "Text file (*.txt)|*.txt" + If dlgSave.ShowDialog() = DialogResult.OK Then + txtScriptSave.Text = dlgSave.FileName.Replace("\", "/") + End If + End Sub + + Private Sub saveTextFiles(strPath As String, strFile As String) + Dim sWrite As New StreamWriter(strPath) + Try + sWrite.Write(strFile) + sWrite.Flush() + sWrite.Dispose() + Catch ex As Exception + + End Try + End Sub + + Private Sub ucrBase_ClickReset(sender As Object, e As EventArgs) Handles ucrBase.ClickReset + setDefaults() + End Sub + + Private Sub setDefaults() + txtEditorSave.Text = "" + txtLogSave.Text = "" + txtOutputSave.Text = "" + txtScriptSave.Text = "" + chkLog.Checked = False + chkOutput.Checked = False + chkScript.Checked = False + End Sub End Class diff --git a/instat/dlgSheetMetadata.Designer.vb b/instat/dlgSheetMetadata.Designer.vb new file mode 100644 index 00000000000..128e7b0ee22 --- /dev/null +++ b/instat/dlgSheetMetadata.Designer.vb @@ -0,0 +1,51 @@ + _ +Partial Class dlgSheetMetadata + Inherits System.Windows.Forms.Form + + 'Form overrides dispose to clean up the component list. + _ + Protected Overrides Sub Dispose(ByVal disposing As Boolean) + Try + If disposing AndAlso components IsNot Nothing Then + components.Dispose() + End If + Finally + MyBase.Dispose(disposing) + End Try + 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() + Me.ucrBase = New instat.ucrButtons() + Me.SuspendLayout() + ' + 'ucrBase + ' + Me.ucrBase.Location = New System.Drawing.Point(11, 196) + Me.ucrBase.Name = "ucrBase" + Me.ucrBase.Size = New System.Drawing.Size(410, 53) + Me.ucrBase.TabIndex = 0 + ' + 'dlgSheetMetadata + ' + Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) + Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.ClientSize = New System.Drawing.Size(433, 261) + Me.Controls.Add(Me.ucrBase) + Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow + Me.Name = "dlgSheetMetadata" + Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen + Me.Tag = "Sheet_Metadata" + Me.Text = "Sheet Metadata" + Me.ResumeLayout(False) + + End Sub + + Friend WithEvents ucrBase As ucrButtons +End Class diff --git a/instat/dlgSheetMetadata.fr-FR.resx b/instat/dlgSheetMetadata.fr-FR.resx new file mode 100644 index 00000000000..9c9f69d752c --- /dev/null +++ b/instat/dlgSheetMetadata.fr-FR.resx @@ -0,0 +1,15 @@ + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/instat/dlgSheetMetadata.resx b/instat/dlgSheetMetadata.resx new file mode 100644 index 00000000000..29dcb1b3a35 --- /dev/null +++ b/instat/dlgSheetMetadata.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/instat/dlgSheetMetadata.sw-KE.resx b/instat/dlgSheetMetadata.sw-KE.resx new file mode 100644 index 00000000000..9c9f69d752c --- /dev/null +++ b/instat/dlgSheetMetadata.sw-KE.resx @@ -0,0 +1,15 @@ + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/instat/dlgSheetMetadata.vb b/instat/dlgSheetMetadata.vb new file mode 100644 index 00000000000..b2f41355573 --- /dev/null +++ b/instat/dlgSheetMetadata.vb @@ -0,0 +1,21 @@ +' 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 . +Imports instat.Translations +Public Class dlgSheetMetadata + Private Sub dlgSheetMetadata_Load(sender As Object, e As EventArgs) Handles MyBase.Load + autoTranslate(Me) + End Sub +End Class \ No newline at end of file diff --git a/instat/dlgSimpleWithGroups.Designer.vb b/instat/dlgSimpleWithGroups.Designer.vb index 54cf8bcec36..d79426eaaff 100644 --- a/instat/dlgSimpleWithGroups.Designer.vb +++ b/instat/dlgSimpleWithGroups.Designer.vb @@ -1,50 +1,256 @@ - _ -Partial Class dlgSimpleWithGroups - Inherits System.Windows.Forms.Form - - 'Form overrides dispose to clean up the component list. - _ - Protected Overrides Sub Dispose(ByVal disposing As Boolean) - Try - If disposing AndAlso components IsNot Nothing Then - components.Dispose() - End If - Finally - MyBase.Dispose(disposing) - End Try - 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() - Me.ucrBase = New instat.ucrButtons() - Me.SuspendLayout() - ' - 'ucrBase - ' - Me.ucrBase.Location = New System.Drawing.Point(12, 222) - Me.ucrBase.Name = "ucrBase" - Me.ucrBase.Size = New System.Drawing.Size(410, 55) - Me.ucrBase.TabIndex = 0 - ' - 'dlgSimpleWithGroups - ' - Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) - Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(433, 279) - Me.Controls.Add(Me.ucrBase) - Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow - Me.Name = "dlgSimpleWithGroups" - Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen - Me.Text = "Simple with groups" - Me.ResumeLayout(False) - - End Sub - - Friend WithEvents ucrBase As ucrButtons -End Class + +Partial Class dlgSimpleWithGroups + Inherits System.Windows.Forms.Form + + 'Form overrides dispose to clean up the component list. + + Protected Overrides Sub Dispose(ByVal disposing As Boolean) + Try + If disposing AndAlso components IsNot Nothing Then + components.Dispose() + End If + Finally + MyBase.Dispose(disposing) + End Try + 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() + Me.chkSaveModel = New System.Windows.Forms.CheckBox() + Me.lblExplanatory = New System.Windows.Forms.Label() + Me.lblResponse = New System.Windows.Forms.Label() + Me.lblGroupingFactor = New System.Windows.Forms.Label() + Me.grpModelstofit = New System.Windows.Forms.GroupBox() + Me.chkCommonIntercept = New System.Windows.Forms.CheckBox() + Me.chkJointLines = New System.Windows.Forms.CheckBox() + Me.chkParallelLines = New System.Windows.Forms.CheckBox() + Me.chkSingle = New System.Windows.Forms.CheckBox() + Me.chkAll = New System.Windows.Forms.CheckBox() + Me.ucrGroupingFactor = New instat.ucrReceiverSingle() + Me.ucrModelName = New instat.ucrVariableName() + Me.ucrExplanatory = New instat.ucrReceiverSingle() + Me.ucrResponse = New instat.ucrReceiverSingle() + Me.ucrSelectorSimpleRegGroups = New instat.ucrSelectorByDataFrameAddRemove() + Me.ucrBaseRegWithGroups = New instat.ucrButtons() + Me.UcrInputComboBox1 = New instat.ucrInputComboBox() + Me.grpModelstofit.SuspendLayout() + Me.SuspendLayout() + ' + 'chkSaveModel + ' + Me.chkSaveModel.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.chkSaveModel.Location = New System.Drawing.Point(8, 249) + Me.chkSaveModel.Name = "chkSaveModel" + Me.chkSaveModel.Size = New System.Drawing.Size(104, 24) + Me.chkSaveModel.TabIndex = 8 + Me.chkSaveModel.Tag = "Save_Model" + Me.chkSaveModel.Text = "Save Model" + Me.chkSaveModel.UseVisualStyleBackColor = True + ' + 'lblExplanatory + ' + Me.lblExplanatory.AutoSize = True + Me.lblExplanatory.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.lblExplanatory.Location = New System.Drawing.Point(294, 67) + Me.lblExplanatory.Name = "lblExplanatory" + Me.lblExplanatory.Size = New System.Drawing.Size(103, 13) + Me.lblExplanatory.TabIndex = 13 + Me.lblExplanatory.Tag = "Explanatory_Variable" + Me.lblExplanatory.Text = "Explanatory Variable" + ' + 'lblResponse + ' + Me.lblResponse.AutoSize = True + Me.lblResponse.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.lblResponse.Location = New System.Drawing.Point(297, 15) + Me.lblResponse.Name = "lblResponse" + Me.lblResponse.Size = New System.Drawing.Size(96, 13) + Me.lblResponse.TabIndex = 11 + Me.lblResponse.Tag = "Response_Variable" + Me.lblResponse.Text = "Response Variable" + ' + 'lblGroupingFactor + ' + Me.lblGroupingFactor.AutoSize = True + Me.lblGroupingFactor.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.lblGroupingFactor.Location = New System.Drawing.Point(297, 121) + Me.lblGroupingFactor.Name = "lblGroupingFactor" + Me.lblGroupingFactor.Size = New System.Drawing.Size(83, 13) + Me.lblGroupingFactor.TabIndex = 16 + Me.lblGroupingFactor.Tag = "Grouping_Factor" + Me.lblGroupingFactor.Text = "Grouping Factor" + ' + 'grpModelstofit + ' + Me.grpModelstofit.Controls.Add(Me.chkCommonIntercept) + Me.grpModelstofit.Controls.Add(Me.chkJointLines) + Me.grpModelstofit.Controls.Add(Me.chkParallelLines) + Me.grpModelstofit.Controls.Add(Me.chkSingle) + Me.grpModelstofit.Controls.Add(Me.chkAll) + Me.grpModelstofit.Location = New System.Drawing.Point(9, 186) + Me.grpModelstofit.Name = "grpModelstofit" + Me.grpModelstofit.Size = New System.Drawing.Size(393, 55) + Me.grpModelstofit.TabIndex = 18 + Me.grpModelstofit.TabStop = False + Me.grpModelstofit.Tag = "Models_to_fit" + Me.grpModelstofit.Text = "Models to fit" + ' + 'chkCommonIntercept + ' + Me.chkCommonIntercept.AutoSize = True + Me.chkCommonIntercept.Location = New System.Drawing.Point(278, 14) + Me.chkCommonIntercept.Name = "chkCommonIntercept" + Me.chkCommonIntercept.Size = New System.Drawing.Size(112, 17) + Me.chkCommonIntercept.TabIndex = 4 + Me.chkCommonIntercept.Tag = "Common_Intercept" + Me.chkCommonIntercept.Text = "Common Intercept" + Me.chkCommonIntercept.UseVisualStyleBackColor = True + ' + 'chkJointLines + ' + Me.chkJointLines.AutoSize = True + Me.chkJointLines.Location = New System.Drawing.Point(160, 34) + Me.chkJointLines.Name = "chkJointLines" + Me.chkJointLines.Size = New System.Drawing.Size(76, 17) + Me.chkJointLines.TabIndex = 3 + Me.chkJointLines.Tag = "Joint_Lines" + Me.chkJointLines.Text = "Joint Lines" + Me.chkJointLines.UseVisualStyleBackColor = True + ' + 'chkParallelLines + ' + Me.chkParallelLines.AutoSize = True + Me.chkParallelLines.Location = New System.Drawing.Point(24, 34) + Me.chkParallelLines.Name = "chkParallelLines" + Me.chkParallelLines.Size = New System.Drawing.Size(88, 17) + Me.chkParallelLines.TabIndex = 2 + Me.chkParallelLines.Tag = "Parallel_Lines" + Me.chkParallelLines.Text = "Parallel Lines" + Me.chkParallelLines.UseVisualStyleBackColor = True + ' + 'chkSingle + ' + Me.chkSingle.AutoSize = True + Me.chkSingle.Location = New System.Drawing.Point(160, 14) + Me.chkSingle.Name = "chkSingle" + Me.chkSingle.Size = New System.Drawing.Size(55, 17) + Me.chkSingle.TabIndex = 1 + Me.chkSingle.Tag = "Single" + Me.chkSingle.Text = "Single" + Me.chkSingle.UseVisualStyleBackColor = True + ' + 'chkAll + ' + Me.chkAll.AutoSize = True + Me.chkAll.Location = New System.Drawing.Point(24, 15) + Me.chkAll.Name = "chkAll" + Me.chkAll.Size = New System.Drawing.Size(37, 17) + Me.chkAll.TabIndex = 0 + Me.chkAll.Tag = "All" + Me.chkAll.Text = "All" + Me.chkAll.UseVisualStyleBackColor = True + ' + 'ucrGroupingFactor + ' + Me.ucrGroupingFactor.Location = New System.Drawing.Point(295, 137) + Me.ucrGroupingFactor.Name = "ucrGroupingFactor" + Me.ucrGroupingFactor.Selector = Nothing + Me.ucrGroupingFactor.Size = New System.Drawing.Size(106, 26) + Me.ucrGroupingFactor.TabIndex = 17 + ' + 'ucrModelName + ' + Me.ucrModelName.Location = New System.Drawing.Point(116, 247) + Me.ucrModelName.Name = "ucrModelName" + Me.ucrModelName.Size = New System.Drawing.Size(149, 23) + Me.ucrModelName.TabIndex = 10 + ' + 'ucrExplanatory + ' + Me.ucrExplanatory.Location = New System.Drawing.Point(292, 83) + Me.ucrExplanatory.Name = "ucrExplanatory" + Me.ucrExplanatory.Selector = Nothing + Me.ucrExplanatory.Size = New System.Drawing.Size(106, 26) + Me.ucrExplanatory.TabIndex = 14 + ' + 'ucrResponse + ' + Me.ucrResponse.Location = New System.Drawing.Point(292, 31) + Me.ucrResponse.Name = "ucrResponse" + Me.ucrResponse.Selector = Nothing + Me.ucrResponse.Size = New System.Drawing.Size(106, 26) + Me.ucrResponse.TabIndex = 12 + ' + 'ucrSelectorSimpleRegGroups + ' + Me.ucrSelectorSimpleRegGroups.Location = New System.Drawing.Point(8, 6) + Me.ucrSelectorSimpleRegGroups.Name = "ucrSelectorSimpleRegGroups" + Me.ucrSelectorSimpleRegGroups.Size = New System.Drawing.Size(242, 179) + Me.ucrSelectorSimpleRegGroups.TabIndex = 9 + ' + 'ucrBaseRegWithGroups + ' + Me.ucrBaseRegWithGroups.Location = New System.Drawing.Point(3, 277) + Me.ucrBaseRegWithGroups.Name = "ucrBaseRegWithGroups" + Me.ucrBaseRegWithGroups.Size = New System.Drawing.Size(410, 55) + Me.ucrBaseRegWithGroups.TabIndex = 0 + ' + 'UcrInputComboBox1 + ' + Me.UcrInputComboBox1.Location = New System.Drawing.Point(149, 15) + Me.UcrInputComboBox1.Name = "UcrInputComboBox1" + Me.UcrInputComboBox1.Size = New System.Drawing.Size(137, 25) + Me.UcrInputComboBox1.TabIndex = 19 + ' + 'dlgSimpleWithGroups + ' + Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) + Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.ClientSize = New System.Drawing.Size(409, 329) + Me.Controls.Add(Me.UcrInputComboBox1) + Me.Controls.Add(Me.grpModelstofit) + Me.Controls.Add(Me.lblGroupingFactor) + Me.Controls.Add(Me.ucrGroupingFactor) + Me.Controls.Add(Me.chkSaveModel) + Me.Controls.Add(Me.ucrModelName) + Me.Controls.Add(Me.lblExplanatory) + Me.Controls.Add(Me.lblResponse) + Me.Controls.Add(Me.ucrExplanatory) + Me.Controls.Add(Me.ucrResponse) + Me.Controls.Add(Me.ucrSelectorSimpleRegGroups) + Me.Controls.Add(Me.ucrBaseRegWithGroups) + Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow + Me.Name = "dlgSimpleWithGroups" + Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen + Me.Text = "Simple with groups" + Me.grpModelstofit.ResumeLayout(False) + Me.grpModelstofit.PerformLayout() + Me.ResumeLayout(False) + Me.PerformLayout() + + End Sub + + Friend WithEvents ucrBaseRegWithGroups As ucrButtons + Friend WithEvents chkSaveModel As CheckBox + Friend WithEvents ucrModelName As ucrVariableName + Friend WithEvents lblExplanatory As Label + Friend WithEvents lblResponse As Label + Friend WithEvents ucrExplanatory As ucrReceiverSingle + Friend WithEvents ucrResponse As ucrReceiverSingle + Friend WithEvents ucrSelectorSimpleRegGroups As ucrSelectorByDataFrameAddRemove + Friend WithEvents lblGroupingFactor As Label + Friend WithEvents ucrGroupingFactor As ucrReceiverSingle + Friend WithEvents grpModelstofit As GroupBox + Friend WithEvents chkCommonIntercept As CheckBox + Friend WithEvents chkJointLines As CheckBox + Friend WithEvents chkParallelLines As CheckBox + Friend WithEvents chkSingle As CheckBox + Friend WithEvents chkAll As CheckBox + Friend WithEvents UcrInputComboBox1 As ucrInputComboBox +End Class diff --git a/instat/dlgSimpleWithGroups.resx b/instat/dlgSimpleWithGroups.resx index 1af7de150c9..29dcb1b3a35 100644 --- a/instat/dlgSimpleWithGroups.resx +++ b/instat/dlgSimpleWithGroups.resx @@ -1,120 +1,120 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + \ No newline at end of file diff --git a/instat/dlgSimpleWithGroups.vb b/instat/dlgSimpleWithGroups.vb index dd261a66618..0d41d0515d8 100644 --- a/instat/dlgSimpleWithGroups.vb +++ b/instat/dlgSimpleWithGroups.vb @@ -1,22 +1,184 @@ -' 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 . - -Imports instat.Translations -Public Class dlgSimpleWithGroups - Private Sub dlgSimpleWithGroups_Load(sender As Object, e As EventArgs) Handles MyBase.Load - autoTranslate(Me) - End Sub +' 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 . + +Imports instat.Translations +Public Class dlgSimpleWithGroups + Public bFirstLoad As Boolean = True + Public clsRSingleModelFunction As RFunction + Dim clsModel, clsModel1, clsModel2, clsModel3 As New ROperator + + Private Sub dlgSimpleWithGroups_Load(sender As Object, e As EventArgs) Handles MyBase.Load + UcrInputComboBox1.SetItemsTypeAsModels() + + If bFirstLoad Then + InitialiseDialog() + SetDefaults() + bFirstLoad = False + Else + ReopenDialog() + End If + autoTranslate(Me) + End Sub + + Private Sub InitialiseDialog() + ucrBaseRegWithGroups.clsRsyntax.SetFunction("lm") + ucrBaseRegWithGroups.clsRsyntax.iCallType = 2 + clsModel.SetOperation("~") + ucrResponse.Selector = ucrSelectorSimpleRegGroups + ucrExplanatory.Selector = ucrSelectorSimpleRegGroups + ucrGroupingFactor.Selector = ucrSelectorSimpleRegGroups + ucrBaseRegWithGroups.iHelpTopicID = 176 + End Sub + + Private Sub ReopenDialog() + + End Sub + + Private Sub SetDefaults() + ucrSelectorSimpleRegGroups.Reset() + ucrResponse.SetMeAsReceiver() + ucrSelectorSimpleRegGroups.Focus() + chkSaveModel.Checked = True + ucrModelName.SetName("reg_grp") + chkAll.Checked = True + TestOKEnabled(clsModel) + End Sub + + Public Sub TestOKEnabled(clsModelNew) + If (Not ucrResponse.IsEmpty()) And (Not ucrExplanatory.IsEmpty()) And (Not ucrGroupingFactor.IsEmpty()) Then + ucrBaseRegWithGroups.clsRsyntax.AddParameter("formula", clsROperatorParameter:=clsModelNew) + ucrBaseRegWithGroups.OKEnabled(True) + + Else + ucrBaseRegWithGroups.OKEnabled(False) + End If + End Sub + + Private Sub ucrSelectorSimpleReg_DataFrameChanged() Handles ucrSelectorSimpleRegGroups.DataFrameChanged + ucrBaseRegWithGroups.clsRsyntax.AddParameter("data", clsRFunctionParameter:=ucrSelectorSimpleRegGroups.ucrAvailableDataFrames.clsCurrDataFrame) + End Sub + + Private Sub ucrResponse_SelectionChanged() Handles ucrResponse.SelectionChanged + clsModel.SetParameter(True, strValue:=ucrResponse.GetVariableNames(bWithQuotes:=False)) + TestOKEnabled(clsModel) + End Sub + + Private Sub ucrExplanatory_SelectionChanged() Handles ucrExplanatory.SelectionChanged + clsModel.SetParameter(False, strValue:=ucrExplanatory.GetVariableNames(bWithQuotes:=False)) + TestOKEnabled(clsModel) + End Sub + + Private Sub ucrGroupingFactor_SelectionChanged() Handles ucrGroupingFactor.SelectionChanged + TestOKEnabled(clsModel) + End Sub + + Private Sub ucrBaseRegWithGroups_ClickReset(sender As Object, e As EventArgs) Handles ucrBaseRegWithGroups.ClickReset + SetDefaults() + End Sub + + Private Sub ucrModelName_NameChanged() Handles ucrModelName.NameChanged + AssignModelName() + End Sub + + Private Sub ucrBaseRegWithGroups_ClickOk(sender As Object, e As EventArgs) Handles ucrBaseRegWithGroups.ClickOk + RegOptions() + End Sub + + Private Sub chkModelName_CheckedChanged(sender As Object, e As EventArgs) Handles chkSaveModel.CheckedChanged + If chkSaveModel.Checked Then + ucrModelName.Visible = True + Else + ucrModelName.Visible = False + End If + AssignModelName() + End Sub + + Private Sub AssignModelName() + If chkSaveModel.Checked AndAlso ucrModelName.txtValidation.Text <> "" Then + ucrBaseRegWithGroups.clsRsyntax.SetAssignTo(ucrModelName.txtValidation.Text, strTempModel:=ucrModelName.txtValidation.Text) + ucrBaseRegWithGroups.clsRsyntax.bExcludeAssignedFunctionOutput = True + Else + ucrBaseRegWithGroups.clsRsyntax.SetAssignTo("last_model", strTempModel:="last_model") + ucrBaseRegWithGroups.clsRsyntax.bExcludeAssignedFunctionOutput = False + End If + End Sub + + Private Sub SingleModel() + ucrBaseRegWithGroups.clsRsyntax.AddParameter("formula", clsROperatorParameter:=clsModel) + TestOKEnabled(clsModel) + frmMain.clsRLink.RunScript(ucrBaseRegWithGroups.clsRsyntax.clsBaseFunction.ToScript(), 2) + End Sub + + Private Sub CommonIntercept() + clsModel1.SetOperation("/") + clsModel1.bBrackets = False + clsModel1.SetParameter(True, clsOp:=clsModel) + clsModel1.SetParameter(False, strValue:=ucrGroupingFactor.GetVariableNames(bWithQuotes:=False)) + ucrBaseRegWithGroups.clsRsyntax.AddParameter("formula", clsROperatorParameter:=clsModel1) + TestOKEnabled(clsModel1) + frmMain.clsRLink.RunScript(ucrBaseRegWithGroups.clsRsyntax.clsBaseFunction.ToScript(), 2) + End Sub + + + Private Sub chkAll_CheckedChanged(sender As Object, e As EventArgs) Handles chkAll.CheckedChanged + If (chkAll.Checked) Then + chkSingle.Checked = True + chkCommonIntercept.Checked = True + chkParallelLines.Checked = True + chkJointLines.Checked = True + Else + chkSingle.Checked = False + chkCommonIntercept.Checked = False + chkParallelLines.Checked = False + chkJointLines.Checked = False + End If + End Sub + + Private Sub ParallelLines() + clsModel2.SetOperation("+") + clsModel2.bBrackets = False + clsModel2.SetParameter(True, clsOp:=clsModel) + clsModel2.SetParameter(False, strValue:=ucrGroupingFactor.GetVariableNames(bWithQuotes:=False)) + ucrBaseRegWithGroups.clsRsyntax.AddParameter("formula", clsROperatorParameter:=clsModel2) + TestOKEnabled(clsModel2) + frmMain.clsRLink.RunScript(ucrBaseRegWithGroups.clsRsyntax.clsBaseFunction.ToScript(), 2) + End Sub + + Private Sub JointLines() + clsModel3.SetOperation("*") + clsModel3.bBrackets = False + clsModel3.SetParameter(True, clsOp:=clsModel) + clsModel3.SetParameter(False, strValue:=ucrGroupingFactor.GetVariableNames(bWithQuotes:=False)) + ucrBaseRegWithGroups.clsRsyntax.AddParameter("formula", clsROperatorParameter:=clsModel3) + TestOKEnabled(clsModel3) + frmMain.clsRLink.RunScript(ucrBaseRegWithGroups.clsRsyntax.clsBaseFunction.ToScript(), 2) + End Sub + + Public Sub RegOptions() + If (chkSingle.Checked) Then + SingleModel() + End If + If (chkCommonIntercept.Checked) Then + CommonIntercept() + End If + If (chkParallelLines.Checked) Then + ParallelLines() + End If + If (chkJointLines.Checked) Then + JointLines() + End If + End Sub End Class \ No newline at end of file diff --git a/instat/dlgSummaryBarOrPieChart.Designer.vb b/instat/dlgSummaryBarOrPieChart.Designer.vb index 657335af5db..09361fa96b9 100644 --- a/instat/dlgSummaryBarOrPieChart.Designer.vb +++ b/instat/dlgSummaryBarOrPieChart.Designer.vb @@ -30,11 +30,12 @@ Partial Class dlgSummaryBarOrPieChart Me.ucrFactorReceiver = New instat.ucrReceiverSingle() Me.lblYvariable = New System.Windows.Forms.Label() Me.lblFactor = New System.Windows.Forms.Label() - Me.cmdPieChartOptions = New System.Windows.Forms.Button() + Me.cmdBarChartOptions = New System.Windows.Forms.Button() Me.cmdOptions = New System.Windows.Forms.Button() Me.ucrSecondFactorReceiver = New instat.ucrReceiverSingle() Me.lblSecondFactor = New System.Windows.Forms.Label() Me.grpChartOptions = New System.Windows.Forms.GroupBox() + Me.cmdPieChartOptions = New System.Windows.Forms.Button() Me.grpChartOptions.SuspendLayout() Me.SuspendLayout() ' @@ -79,6 +80,7 @@ Partial Class dlgSummaryBarOrPieChart ' Me.ucrYReceiver.Location = New System.Drawing.Point(287, 69) Me.ucrYReceiver.Name = "ucrYReceiver" + Me.ucrYReceiver.Selector = Nothing Me.ucrYReceiver.Size = New System.Drawing.Size(106, 26) Me.ucrYReceiver.TabIndex = 3 ' @@ -86,6 +88,7 @@ Partial Class dlgSummaryBarOrPieChart ' Me.ucrFactorReceiver.Location = New System.Drawing.Point(287, 123) Me.ucrFactorReceiver.Name = "ucrFactorReceiver" + Me.ucrFactorReceiver.Selector = Nothing Me.ucrFactorReceiver.Size = New System.Drawing.Size(106, 26) Me.ucrFactorReceiver.TabIndex = 5 ' @@ -109,15 +112,15 @@ Partial Class dlgSummaryBarOrPieChart Me.lblFactor.Tag = "Factor" Me.lblFactor.Text = "Factor" ' - 'cmdPieChartOptions + 'cmdBarChartOptions ' - Me.cmdPieChartOptions.Location = New System.Drawing.Point(12, 222) - Me.cmdPieChartOptions.Name = "cmdPieChartOptions" - Me.cmdPieChartOptions.Size = New System.Drawing.Size(128, 23) - Me.cmdPieChartOptions.TabIndex = 8 - Me.cmdPieChartOptions.Tag = "Pie_Chart_Options" - Me.cmdPieChartOptions.Text = "Pie Chart Options" - Me.cmdPieChartOptions.UseVisualStyleBackColor = True + Me.cmdBarChartOptions.Location = New System.Drawing.Point(12, 222) + Me.cmdBarChartOptions.Name = "cmdBarChartOptions" + Me.cmdBarChartOptions.Size = New System.Drawing.Size(128, 23) + Me.cmdBarChartOptions.TabIndex = 8 + Me.cmdBarChartOptions.Tag = "Bar_Chart_Options" + Me.cmdBarChartOptions.Text = "Bar Chart Options" + Me.cmdBarChartOptions.UseVisualStyleBackColor = True ' 'cmdOptions ' @@ -133,6 +136,7 @@ Partial Class dlgSummaryBarOrPieChart ' Me.ucrSecondFactorReceiver.Location = New System.Drawing.Point(287, 180) Me.ucrSecondFactorReceiver.Name = "ucrSecondFactorReceiver" + Me.ucrSecondFactorReceiver.Selector = Nothing Me.ucrSecondFactorReceiver.Size = New System.Drawing.Size(106, 26) Me.ucrSecondFactorReceiver.TabIndex = 7 ' @@ -156,6 +160,16 @@ Partial Class dlgSummaryBarOrPieChart Me.grpChartOptions.TabIndex = 0 Me.grpChartOptions.TabStop = False ' + 'cmdPieChartOptions + ' + Me.cmdPieChartOptions.Location = New System.Drawing.Point(146, 222) + Me.cmdPieChartOptions.Name = "cmdPieChartOptions" + Me.cmdPieChartOptions.Size = New System.Drawing.Size(128, 23) + Me.cmdPieChartOptions.TabIndex = 8 + Me.cmdPieChartOptions.Tag = "Pie_Chart_Options" + Me.cmdPieChartOptions.Text = "Pie Chart Options" + Me.cmdPieChartOptions.UseVisualStyleBackColor = True + ' 'dlgSummaryBarOrPieChart ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -164,6 +178,7 @@ Partial Class dlgSummaryBarOrPieChart Me.Controls.Add(Me.grpChartOptions) Me.Controls.Add(Me.cmdOptions) Me.Controls.Add(Me.cmdPieChartOptions) + Me.Controls.Add(Me.cmdBarChartOptions) Me.Controls.Add(Me.lblSecondFactor) Me.Controls.Add(Me.lblFactor) Me.Controls.Add(Me.ucrSecondFactorReceiver) @@ -192,9 +207,10 @@ Partial Class dlgSummaryBarOrPieChart Friend WithEvents ucrFactorReceiver As ucrReceiverSingle Friend WithEvents lblYvariable As Label Friend WithEvents lblFactor As Label - Friend WithEvents cmdPieChartOptions As Button + Friend WithEvents cmdBarChartOptions As Button Friend WithEvents cmdOptions As Button Friend WithEvents ucrSecondFactorReceiver As ucrReceiverSingle Friend WithEvents lblSecondFactor As Label Friend WithEvents grpChartOptions As GroupBox + Friend WithEvents cmdPieChartOptions As Button End Class diff --git a/instat/dlgSummaryBarOrPieChart.vb b/instat/dlgSummaryBarOrPieChart.vb index fd0df2653f4..e9b646e3c2d 100644 --- a/instat/dlgSummaryBarOrPieChart.vb +++ b/instat/dlgSummaryBarOrPieChart.vb @@ -17,73 +17,141 @@ Imports instat.Translations Public Class dlgSummaryBarOrPieChart Private clsRggplotFunction As New RFunction Private clsRgeom_summarybar As New RFunction - Private clsRgeom_Piechart As New RFunction Private clsRaesFunction As New RFunction + Private bFirstLoad As Boolean = True + Private Sub cmdOptions_Load(sender As Object, e As EventArgs) Handles MyBase.Load ucrBase.clsRsyntax.SetOperation("+") clsRggplotFunction.SetRCommand("ggplot") clsRaesFunction.SetRCommand("aes") clsRggplotFunction.AddParameter("mapping", clsRFunctionParameter:=clsRaesFunction) ucrBase.clsRsyntax.SetOperatorParameter(True, clsRFunc:=clsRggplotFunction) + clsRgeom_summarybar.SetRCommand("geom_bar") + ucrBase.clsRsyntax.SetOperatorParameter(False, clsRFunc:=clsRgeom_summarybar) + ucrYReceiver.Selector = ucrSummarybarSelector ucrFactorReceiver.Selector = ucrSummarybarSelector + ucrFactorReceiver.SetDataType("factor") ucrSecondFactorReceiver.Selector = ucrSummarybarSelector + ucrSecondFactorReceiver.SetDataType("factor") ucrYReceiver.SetMeAsReceiver() autoTranslate(Me) ucrBase.clsRsyntax.iCallType = 0 + + If bFirstLoad Then + SetDefaults() + bFirstLoad = False + End If End Sub + Private Sub TestOkEnabled() + If Not ucrYReceiver.IsEmpty And Not ucrFactorReceiver.IsEmpty Then + ucrBase.OKEnabled(True) + Else + ucrBase.OKEnabled(False) + End If + End Sub + Private Sub SetDefaults() + ucrSummarybarSelector.Reset() + ucrSummarybarSelector.Focus() + cmdBarChartOptions.Visible = False + cmdPieChartOptions.Visible = False + TestOkEnabled() + End Sub Private Sub grpChartOptions_CheckedChanged(sender As Object, e As EventArgs) Handles rdoBarChart.CheckedChanged, rdoPieChart.CheckedChanged + + SummaryCheck() + Dim clsTempRFunc As New RFunction If rdoBarChart.Checked = True Then - lblFactor.Visible = True - ucrFactorReceiver.Visible = True - clsRgeom_summarybar.SetRCommand("geom_bar") + AddParameterSecondReceiver() + cmdBarChartOptions.Visible = True + cmdPieChartOptions.Visible = False + lblSecondFactor.Visible = True + ucrSecondFactorReceiver.Visible = True clsRgeom_summarybar.AddParameter("stat", Chr(34) & "identity" & Chr(34)) + ucrBase.clsRsyntax.RemoveOperatorParameter("polar") + clsRgeom_summarybar.RemoveParameterByName("width") ucrBase.clsRsyntax.SetOperatorParameter(False, clsRFunc:=clsRgeom_summarybar) - Else 'rdoPieChart.Checked = True - Dim clsTempOp As New ROperator - Dim clsTempRFunc As New RFunction - clsTempOp.SetOperation("+") - + ElseIf rdoPieChart.Checked = True + cmdPieChartOptions.Visible = True + cmdBarChartOptions.Visible = False clsRaesFunction.AddParameter("x", Chr(34) & Chr(34)) - lblFactor.Visible = False - ucrFactorReceiver.Visible = False - ucrYReceiver.SetMeAsReceiver() + lblSecondFactor.Visible = False + ucrSecondFactorReceiver.Visible = False + ucrSecondFactorReceiver.SetMeAsReceiver() - clsRgeom_Piechart.SetRCommand("geom_bar") - clsRgeom_Piechart.AddParameter("width", 1) - clsRgeom_Piechart.AddParameter("stat", Chr(34) & "identity" & Chr(34)) - ucrBase.clsRsyntax.SetOperatorParameter(False, clsRFunc:=clsRgeom_Piechart) + clsRgeom_summarybar.AddParameter("width", 1) + clsRgeom_summarybar.AddParameter("stat", Chr(34) & "identity" & Chr(34)) + ucrBase.clsRsyntax.SetOperatorParameter(False, clsRFunc:=clsRgeom_summarybar) - clsTempOp.SetParameter(True, clsRFunc:=clsRggplotFunction) - clsTempOp.SetParameter(False, clsRFunc:=clsRgeom_Piechart) clsTempRFunc.SetRCommand("coord_polar") clsTempRFunc.AddParameter("theta", Chr(34) & "y" & Chr(34)) - ucrBase.clsRsyntax.SetOperatorParameter(True, clsOp:=clsTempOp) - ucrBase.clsRsyntax.SetOperatorParameter(False, clsRFunc:=clsTempRFunc) - 'Else - ' ucrBase.clsRsyntax.SetOperatorParameter(False, clsRFunc:=Nothing) + ucrBase.clsRsyntax.AddOperatorParameter("polar", clsRFunc:=clsTempRFunc) + End If End Sub - Private Sub ucrYReceiver_Leave(sender As Object, e As EventArgs) Handles ucrYReceiver.Leave - clsRaesFunction.AddParameter("y", ucrYReceiver.GetVariableNames(False)) + Private Sub ucrYReceiver_SelectionChanged(sender As Object, e As EventArgs) Handles ucrYReceiver.SelectionChanged + If Not ucrYReceiver.IsEmpty Then + clsRaesFunction.AddParameter("y", ucrYReceiver.GetVariableNames(False)) + Else + clsRaesFunction.RemoveParameterByName("y") + End If + TestOkEnabled() End Sub - Private Sub ucrSecondFactorReceiver_Leave(sender As Object, e As EventArgs) Handles ucrSecondFactorReceiver.Leave - clsRaesFunction.AddParameter("fill", ucrSecondFactorReceiver.GetVariableNames(False)) + Private Sub AddParameterSecondReceiver() + If Not ucrSecondFactorReceiver.IsEmpty Then + clsRaesFunction.AddParameter("fill", ucrSecondFactorReceiver.GetVariableNames(False)) + Else + clsRaesFunction.RemoveParameterByName("fill") + End If + End Sub + Private Sub ucrSecondFactorReceiver_SelectionChanged(sender As Object, e As EventArgs) Handles ucrSecondFactorReceiver.SelectionChanged + AddParameterSecondReceiver() + TestOkEnabled() + End Sub + + Private Sub ucrFactorReceiver_SelectionChanged(sender As Object, e As EventArgs) Handles ucrFactorReceiver.SelectionChanged + SummaryCheck() + TestOkEnabled() End Sub - Private Sub ucrFactorReceiver_Leave(sender As Object, e As EventArgs) Handles ucrFactorReceiver.Leave - clsRaesFunction.AddParameter("x", ucrFactorReceiver.GetVariableNames(False)) + Private Sub SummaryCheck() + If rdoBarChart.Checked = True Then + If ucrFactorReceiver.IsEmpty Then + clsRaesFunction.RemoveParameterByName("x") + Else + clsRaesFunction.AddParameter("x", ucrFactorReceiver.GetVariableNames(False)) + End If + + ElseIf rdoPieChart.Checked = True Then + If ucrFactorReceiver.IsEmpty Then + clsRaesFunction.RemoveParameterByName("fill") + Else + clsRaesFunction.AddParameter("fill", ucrSecondFactorReceiver.GetVariableNames(False)) + End If + End If End Sub Private Sub ucrSummarybarSelector_DataFrameChanged() Handles ucrSummarybarSelector.DataFrameChanged clsRggplotFunction.AddParameter("data", clsRFunctionParameter:=ucrSummarybarSelector.ucrAvailableDataFrames.clsCurrDataFrame) End Sub - Private Sub ucrSummarybarSelector_Load(sender As Object, e As EventArgs) + Private Sub ucrBase_ClickReset(sender As Object, e As EventArgs) Handles ucrBase.ClickReset + SetDefaults() + End Sub + + Private Sub cmdOptions_Click(sender As Object, e As EventArgs) Handles cmdOptions.Click + sdgPlots.ShowDialog() + End Sub + + Private Sub cmdBarChartOptions_Click(sender As Object, e As EventArgs) Handles cmdBarChartOptions.Click + sdgBarChart.ShowDialog() + End Sub + Private Sub cmdPieChartOptions_Click(sender As Object, e As EventArgs) Handles cmdPieChartOptions.Click + sdgPieChartOptions.ShowDialog() End Sub End Class \ No newline at end of file diff --git a/instat/dlgTwoSampleNonparametricTest.Designer.vb b/instat/dlgTwoSampleNonparametricTest.Designer.vb new file mode 100644 index 00000000000..363e0dd7249 --- /dev/null +++ b/instat/dlgTwoSampleNonparametricTest.Designer.vb @@ -0,0 +1,262 @@ + _ +Partial Class dlgTwoSampleNonparametricTest + Inherits System.Windows.Forms.Form + + 'Form overrides dispose to clean up the component list. + _ + Protected Overrides Sub Dispose(ByVal disposing As Boolean) + Try + If disposing AndAlso components IsNot Nothing Then + components.Dispose() + End If + Finally + MyBase.Dispose(disposing) + End Try + 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() + Me.ucrBase = New instat.ucrButtons() + Me.ucrTwoSampleSelector = New instat.ucrSelectorByDataFrameAddRemove() + Me.grpLayoutOfData = New System.Windows.Forms.GroupBox() + Me.rdoDataColandFactorCol = New System.Windows.Forms.RadioButton() + Me.rdoTwoColinSeparateDataFrame = New System.Windows.Forms.RadioButton() + Me.rdotwoColinSamedataframe = New System.Windows.Forms.RadioButton() + Me.rdoSignTest = New System.Windows.Forms.RadioButton() + Me.rdoWilcoxon = New System.Windows.Forms.RadioButton() + Me.lblVariable = New System.Windows.Forms.Label() + Me.ucrReceiverVariable = New instat.ucrReceiverSingle() + Me.lblFactor = New System.Windows.Forms.Label() + Me.ucrReceiverFactor = New instat.ucrReceiverSingle() + Me.grpTypeOfTest = New System.Windows.Forms.GroupBox() + Me.rdoTwoSided = New System.Windows.Forms.RadioButton() + Me.rdoOnesidedy1 = New System.Windows.Forms.RadioButton() + Me.rdoOneSidedy2 = New System.Windows.Forms.RadioButton() + Me.grpLayoutOfData.SuspendLayout() + Me.grpTypeOfTest.SuspendLayout() + Me.SuspendLayout() + ' + 'ucrBase + ' + Me.ucrBase.Location = New System.Drawing.Point(12, 365) + Me.ucrBase.Name = "ucrBase" + Me.ucrBase.Size = New System.Drawing.Size(410, 53) + Me.ucrBase.TabIndex = 0 + ' + 'ucrTwoSampleSelector + ' + Me.ucrTwoSampleSelector.Location = New System.Drawing.Point(8, 107) + Me.ucrTwoSampleSelector.Name = "ucrTwoSampleSelector" + Me.ucrTwoSampleSelector.Size = New System.Drawing.Size(242, 179) + Me.ucrTwoSampleSelector.TabIndex = 1 + ' + 'grpLayoutOfData + ' + Me.grpLayoutOfData.Controls.Add(Me.rdotwoColinSamedataframe) + Me.grpLayoutOfData.Controls.Add(Me.rdoTwoColinSeparateDataFrame) + Me.grpLayoutOfData.Controls.Add(Me.rdoDataColandFactorCol) + Me.grpLayoutOfData.Location = New System.Drawing.Point(13, 5) + Me.grpLayoutOfData.Name = "grpLayoutOfData" + Me.grpLayoutOfData.Size = New System.Drawing.Size(428, 100) + Me.grpLayoutOfData.TabIndex = 2 + Me.grpLayoutOfData.TabStop = False + Me.grpLayoutOfData.Tag = "Layout_Of_Data" + Me.grpLayoutOfData.Text = "Layout Of Data" + ' + 'rdoDataColandFactorCol + ' + Me.rdoDataColandFactorCol.AutoSize = True + Me.rdoDataColandFactorCol.Location = New System.Drawing.Point(7, 20) + Me.rdoDataColandFactorCol.Name = "rdoDataColandFactorCol" + Me.rdoDataColandFactorCol.Size = New System.Drawing.Size(178, 17) + Me.rdoDataColandFactorCol.TabIndex = 0 + Me.rdoDataColandFactorCol.TabStop = True + Me.rdoDataColandFactorCol.Tag = "Data_Column_and_Factor_Column" + Me.rdoDataColandFactorCol.Text = "Data Column and Factor Column" + Me.rdoDataColandFactorCol.UseVisualStyleBackColor = True + ' + 'rdoTwoColinSeparateDataFrame + ' + Me.rdoTwoColinSeparateDataFrame.AutoSize = True + Me.rdoTwoColinSeparateDataFrame.Location = New System.Drawing.Point(7, 43) + Me.rdoTwoColinSeparateDataFrame.Name = "rdoTwoColinSeparateDataFrame" + Me.rdoTwoColinSeparateDataFrame.Size = New System.Drawing.Size(209, 17) + Me.rdoTwoColinSeparateDataFrame.TabIndex = 0 + Me.rdoTwoColinSeparateDataFrame.TabStop = True + Me.rdoTwoColinSeparateDataFrame.Tag = "Two_Columns_in_Separate_Data_Frames" + Me.rdoTwoColinSeparateDataFrame.Text = "Two Columns in Separate Data Frames" + Me.rdoTwoColinSeparateDataFrame.UseVisualStyleBackColor = True + ' + 'rdotwoColinSamedataframe + ' + Me.rdotwoColinSamedataframe.AutoSize = True + Me.rdotwoColinSamedataframe.Location = New System.Drawing.Point(7, 66) + Me.rdotwoColinSamedataframe.Name = "rdotwoColinSamedataframe" + Me.rdotwoColinSamedataframe.Size = New System.Drawing.Size(188, 17) + Me.rdotwoColinSamedataframe.TabIndex = 0 + Me.rdotwoColinSamedataframe.TabStop = True + Me.rdotwoColinSamedataframe.Tag = "Two_Columns_in_Same_Data_Frame" + Me.rdotwoColinSamedataframe.Text = "Two Columns in Same Data Frame" + Me.rdotwoColinSamedataframe.UseVisualStyleBackColor = True + ' + 'rdoSignTest + ' + Me.rdoSignTest.AutoSize = True + Me.rdoSignTest.Location = New System.Drawing.Point(235, 124) + Me.rdoSignTest.Name = "rdoSignTest" + Me.rdoSignTest.Size = New System.Drawing.Size(70, 17) + Me.rdoSignTest.TabIndex = 3 + Me.rdoSignTest.TabStop = True + Me.rdoSignTest.Tag = "Sign_Test" + Me.rdoSignTest.Text = "Sign Test" + Me.rdoSignTest.UseVisualStyleBackColor = True + ' + 'rdoWilcoxon + ' + Me.rdoWilcoxon.AutoSize = True + Me.rdoWilcoxon.Location = New System.Drawing.Point(347, 124) + Me.rdoWilcoxon.Name = "rdoWilcoxon" + Me.rdoWilcoxon.Size = New System.Drawing.Size(69, 17) + Me.rdoWilcoxon.TabIndex = 3 + Me.rdoWilcoxon.TabStop = True + Me.rdoWilcoxon.Tag = "Wilcoxon" + Me.rdoWilcoxon.Text = "Wilcoxon" + Me.rdoWilcoxon.UseVisualStyleBackColor = True + ' + 'lblVariable + ' + Me.lblVariable.AutoSize = True + Me.lblVariable.Location = New System.Drawing.Point(256, 156) + Me.lblVariable.Name = "lblVariable" + Me.lblVariable.Size = New System.Drawing.Size(45, 13) + Me.lblVariable.TabIndex = 4 + Me.lblVariable.Tag = "Variable" + Me.lblVariable.Text = "Variable" + ' + 'ucrReceiverVariable + ' + Me.ucrReceiverVariable.Location = New System.Drawing.Point(259, 173) + Me.ucrReceiverVariable.Name = "ucrReceiverVariable" + Me.ucrReceiverVariable.Selector = Nothing + Me.ucrReceiverVariable.Size = New System.Drawing.Size(106, 26) + Me.ucrReceiverVariable.TabIndex = 5 + ' + 'lblFactor + ' + Me.lblFactor.AutoSize = True + Me.lblFactor.Location = New System.Drawing.Point(256, 210) + Me.lblFactor.Name = "lblFactor" + Me.lblFactor.Size = New System.Drawing.Size(37, 13) + Me.lblFactor.TabIndex = 4 + Me.lblFactor.Tag = "Factor" + Me.lblFactor.Text = "Factor" + ' + 'ucrReceiverFactor + ' + Me.ucrReceiverFactor.Location = New System.Drawing.Point(259, 227) + Me.ucrReceiverFactor.Name = "ucrReceiverFactor" + Me.ucrReceiverFactor.Selector = Nothing + Me.ucrReceiverFactor.Size = New System.Drawing.Size(106, 26) + Me.ucrReceiverFactor.TabIndex = 5 + ' + 'grpTypeOfTest + ' + Me.grpTypeOfTest.Controls.Add(Me.rdoOneSidedy2) + Me.grpTypeOfTest.Controls.Add(Me.rdoOnesidedy1) + Me.grpTypeOfTest.Controls.Add(Me.rdoTwoSided) + Me.grpTypeOfTest.Location = New System.Drawing.Point(13, 293) + Me.grpTypeOfTest.Name = "grpTypeOfTest" + Me.grpTypeOfTest.Size = New System.Drawing.Size(428, 66) + Me.grpTypeOfTest.TabIndex = 6 + Me.grpTypeOfTest.TabStop = False + Me.grpTypeOfTest.Tag = "Type_of_Test" + Me.grpTypeOfTest.Text = "Type of Test" + ' + 'rdoTwoSided + ' + Me.rdoTwoSided.AutoSize = True + Me.rdoTwoSided.Location = New System.Drawing.Point(7, 20) + Me.rdoTwoSided.Name = "rdoTwoSided" + Me.rdoTwoSided.Size = New System.Drawing.Size(76, 17) + Me.rdoTwoSided.TabIndex = 0 + Me.rdoTwoSided.TabStop = True + Me.rdoTwoSided.Tag = "Two_Sided" + Me.rdoTwoSided.Text = "Two-Sided" + Me.rdoTwoSided.UseVisualStyleBackColor = True + ' + 'rdoOnesidedy1 + ' + Me.rdoOnesidedy1.AutoSize = True + Me.rdoOnesidedy1.Location = New System.Drawing.Point(89, 20) + Me.rdoOnesidedy1.Name = "rdoOnesidedy1" + Me.rdoOnesidedy1.Size = New System.Drawing.Size(112, 17) + Me.rdoOnesidedy1.TabIndex = 0 + Me.rdoOnesidedy1.TabStop = True + Me.rdoOnesidedy1.Tag = "One_Sided _y1_y2)" + Me.rdoOnesidedy1.Text = "One-Sided (y1. + +Imports instat.Translations +Public Class dlgTwoSampleNonparametricTest + Public bFirstLoad As Boolean = True + Private Sub dlgTwoSampleNonparametricTest_Load(sender As Object, e As EventArgs) Handles MyBase.Load + autoTranslate(Me) + ucrReceiverVariable.Selector = ucrTwoSampleSelector + ucrReceiverFactor.Selector = ucrTwoSampleSelector + ucrReceiverFactor.SetDataType("factor") + + If bFirstLoad Then + 'setDeafaults + End If + End Sub + Private Sub SetDefaults() + ucrTwoSampleSelector.Reset() + rdoDataColandFactorCol.Focus() + End Sub + Private Sub TestOkEnabled() + + End Sub + + Private Sub ucrBase_ClickReset(sender As Object, e As EventArgs) Handles ucrBase.ClickReset + SetDefaults() + End Sub +End Class \ No newline at end of file diff --git a/instat/dlgUnusedLevels.Designer.vb b/instat/dlgUnusedLevels.Designer.vb new file mode 100644 index 00000000000..c9db27cd9bf --- /dev/null +++ b/instat/dlgUnusedLevels.Designer.vb @@ -0,0 +1,51 @@ + _ +Partial Class dlgUnusedLevels + Inherits System.Windows.Forms.Form + + 'Form overrides dispose to clean up the component list. + _ + Protected Overrides Sub Dispose(ByVal disposing As Boolean) + Try + If disposing AndAlso components IsNot Nothing Then + components.Dispose() + End If + Finally + MyBase.Dispose(disposing) + End Try + 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() + Me.ucrBase = New instat.ucrButtons() + Me.SuspendLayout() + ' + 'ucrBase + ' + Me.ucrBase.Location = New System.Drawing.Point(13, 196) + Me.ucrBase.Name = "ucrBase" + Me.ucrBase.Size = New System.Drawing.Size(410, 53) + Me.ucrBase.TabIndex = 0 + ' + 'dlgUnusedLevels + ' + Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) + Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.ClientSize = New System.Drawing.Size(424, 261) + Me.Controls.Add(Me.ucrBase) + Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow + Me.Name = "dlgUnusedLevels" + Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen + Me.Tag = "Unused_Levels" + Me.Text = "Unused Levels" + Me.ResumeLayout(False) + + End Sub + + Friend WithEvents ucrBase As ucrButtons +End Class diff --git a/instat/dlgUnusedLevels.fr-FR.resx b/instat/dlgUnusedLevels.fr-FR.resx new file mode 100644 index 00000000000..9c9f69d752c --- /dev/null +++ b/instat/dlgUnusedLevels.fr-FR.resx @@ -0,0 +1,15 @@ + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/instat/dlgUnusedLevels.resx b/instat/dlgUnusedLevels.resx new file mode 100644 index 00000000000..29dcb1b3a35 --- /dev/null +++ b/instat/dlgUnusedLevels.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/instat/dlgUnusedLevels.sw-KE.resx b/instat/dlgUnusedLevels.sw-KE.resx new file mode 100644 index 00000000000..9c9f69d752c --- /dev/null +++ b/instat/dlgUnusedLevels.sw-KE.resx @@ -0,0 +1,15 @@ + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/instat/dlgUnusedLevels.vb b/instat/dlgUnusedLevels.vb new file mode 100644 index 00000000000..e45ee7e6f3a --- /dev/null +++ b/instat/dlgUnusedLevels.vb @@ -0,0 +1,22 @@ +' 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 . + +Imports instat.Translations +Public Class dlgUnusedLevels + Private Sub dlgUnusedLevels_Load(sender As Object, e As EventArgs) Handles MyBase.Load + autoTranslate(Me) + End Sub +End Class \ No newline at end of file diff --git a/instat/dlgView.Designer.vb b/instat/dlgView.Designer.vb index b87fb8018e2..e2b46f05366 100644 --- a/instat/dlgView.Designer.vb +++ b/instat/dlgView.Designer.vb @@ -1,9 +1,9 @@ - _ + Partial Class dlgView Inherits System.Windows.Forms.Form 'Form overrides dispose to clean up the component list. - _ + Protected Overrides Sub Dispose(ByVal disposing As Boolean) Try If disposing AndAlso components IsNot Nothing Then @@ -20,58 +20,26 @@ Partial Class dlgView '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() - Me.ucrSelectorDataFrame = New instat.ucrSelectorByDataFrameAddRemove() - Me.ucrBase = New instat.ucrButtons() - Me.ucrReceiverView = New instat.ucrReceiverMultiple() - Me.lblSelected = New System.Windows.Forms.Label() Me.grpSelectedRows = New System.Windows.Forms.GroupBox() - Me.txtBottom = New System.Windows.Forms.TextBox() - Me.txtTop = New System.Windows.Forms.TextBox() Me.rdoBottom = New System.Windows.Forms.RadioButton() Me.rdoTop = New System.Windows.Forms.RadioButton() + Me.nudNumberRows = New System.Windows.Forms.NumericUpDown() + Me.lblSelected = New System.Windows.Forms.Label() + Me.ucrReceiverView = New instat.ucrReceiverMultiple() + Me.ucrSelctorForView = New instat.ucrSelectorByDataFrameAddRemove() + Me.ucrBase = New instat.ucrButtons() + Me.lblNumberofRows = New System.Windows.Forms.Label() Me.grpSelectedRows.SuspendLayout() + CType(Me.nudNumberRows, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() ' - 'ucrSelectorDataFrame - ' - Me.ucrSelectorDataFrame.Location = New System.Drawing.Point(13, 13) - Me.ucrSelectorDataFrame.Name = "ucrSelectorDataFrame" - Me.ucrSelectorDataFrame.Size = New System.Drawing.Size(242, 179) - Me.ucrSelectorDataFrame.TabIndex = 0 - ' - 'ucrBase - ' - Me.ucrBase.Location = New System.Drawing.Point(13, 269) - Me.ucrBase.Name = "ucrBase" - Me.ucrBase.Size = New System.Drawing.Size(401, 53) - Me.ucrBase.TabIndex = 1 - ' - 'ucrReceiverView - ' - Me.ucrReceiverView.Location = New System.Drawing.Point(261, 88) - Me.ucrReceiverView.Name = "ucrReceiverView" - Me.ucrReceiverView.Size = New System.Drawing.Size(121, 104) - Me.ucrReceiverView.TabIndex = 2 - ' - 'lblSelected - ' - Me.lblSelected.AutoSize = True - Me.lblSelected.Location = New System.Drawing.Point(262, 69) - Me.lblSelected.Name = "lblSelected" - Me.lblSelected.Size = New System.Drawing.Size(49, 13) - Me.lblSelected.TabIndex = 3 - Me.lblSelected.Tag = "Selected" - Me.lblSelected.Text = "Selected" - ' 'grpSelectedRows ' - Me.grpSelectedRows.Controls.Add(Me.txtBottom) - Me.grpSelectedRows.Controls.Add(Me.txtTop) Me.grpSelectedRows.Controls.Add(Me.rdoBottom) Me.grpSelectedRows.Controls.Add(Me.rdoTop) - Me.grpSelectedRows.Location = New System.Drawing.Point(13, 199) + Me.grpSelectedRows.Location = New System.Drawing.Point(12, 195) Me.grpSelectedRows.Name = "grpSelectedRows" Me.grpSelectedRows.Size = New System.Drawing.Size(401, 52) Me.grpSelectedRows.TabIndex = 4 @@ -79,24 +47,10 @@ Partial Class dlgView Me.grpSelectedRows.Tag = "Display_specified_rows" Me.grpSelectedRows.Text = "Display specified rows" ' - 'txtBottom - ' - Me.txtBottom.Location = New System.Drawing.Point(330, 20) - Me.txtBottom.Name = "txtBottom" - Me.txtBottom.Size = New System.Drawing.Size(40, 20) - Me.txtBottom.TabIndex = 3 - ' - 'txtTop - ' - Me.txtTop.Location = New System.Drawing.Point(121, 19) - Me.txtTop.Name = "txtTop" - Me.txtTop.Size = New System.Drawing.Size(40, 20) - Me.txtTop.TabIndex = 2 - ' 'rdoBottom ' Me.rdoBottom.AutoSize = True - Me.rdoBottom.Location = New System.Drawing.Point(233, 19) + Me.rdoBottom.Location = New System.Drawing.Point(233, 22) Me.rdoBottom.Name = "rdoBottom" Me.rdoBottom.Size = New System.Drawing.Size(58, 17) Me.rdoBottom.TabIndex = 1 @@ -108,7 +62,7 @@ Partial Class dlgView 'rdoTop ' Me.rdoTop.AutoSize = True - Me.rdoTop.Location = New System.Drawing.Point(24, 20) + Me.rdoTop.Location = New System.Drawing.Point(25, 22) Me.rdoTop.Name = "rdoTop" Me.rdoTop.Size = New System.Drawing.Size(44, 17) Me.rdoTop.TabIndex = 0 @@ -117,16 +71,69 @@ Partial Class dlgView Me.rdoTop.Text = "Top" Me.rdoTop.UseVisualStyleBackColor = True ' + 'nudNumberRows + ' + Me.nudNumberRows.Location = New System.Drawing.Point(366, 169) + Me.nudNumberRows.Minimum = New Decimal(New Integer() {1, 0, 0, 0}) + Me.nudNumberRows.Name = "nudNumberRows" + Me.nudNumberRows.Size = New System.Drawing.Size(47, 20) + Me.nudNumberRows.TabIndex = 4 + Me.nudNumberRows.Value = New Decimal(New Integer() {1, 0, 0, 0}) + ' + 'lblSelected + ' + Me.lblSelected.AutoSize = True + Me.lblSelected.Location = New System.Drawing.Point(292, 43) + Me.lblSelected.Name = "lblSelected" + Me.lblSelected.Size = New System.Drawing.Size(49, 13) + Me.lblSelected.TabIndex = 7 + Me.lblSelected.Tag = "Selected" + Me.lblSelected.Text = "Selected" + ' + 'ucrReceiverView + ' + Me.ucrReceiverView.Location = New System.Drawing.Point(292, 62) + Me.ucrReceiverView.Name = "ucrReceiverView" + Me.ucrReceiverView.Selector = Nothing + Me.ucrReceiverView.Size = New System.Drawing.Size(121, 104) + Me.ucrReceiverView.TabIndex = 6 + ' + 'ucrSelctorForView + ' + Me.ucrSelctorForView.Location = New System.Drawing.Point(13, 13) + Me.ucrSelctorForView.Name = "ucrSelctorForView" + Me.ucrSelctorForView.Size = New System.Drawing.Size(242, 179) + Me.ucrSelctorForView.TabIndex = 5 + ' + 'ucrBase + ' + Me.ucrBase.Location = New System.Drawing.Point(12, 253) + Me.ucrBase.Name = "ucrBase" + Me.ucrBase.Size = New System.Drawing.Size(401, 53) + Me.ucrBase.TabIndex = 1 + ' + 'lblNumberofRows + ' + Me.lblNumberofRows.AutoSize = True + Me.lblNumberofRows.Location = New System.Drawing.Point(261, 176) + Me.lblNumberofRows.Name = "lblNumberofRows" + Me.lblNumberofRows.Size = New System.Drawing.Size(89, 13) + Me.lblNumberofRows.TabIndex = 8 + Me.lblNumberofRows.Tag = "Number_of_rows" + Me.lblNumberofRows.Text = "Number of Rows" + ' 'dlgView ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(468, 334) - Me.Controls.Add(Me.grpSelectedRows) + Me.ClientSize = New System.Drawing.Size(468, 318) + Me.Controls.Add(Me.lblNumberofRows) Me.Controls.Add(Me.lblSelected) + Me.Controls.Add(Me.nudNumberRows) Me.Controls.Add(Me.ucrReceiverView) + Me.Controls.Add(Me.ucrSelctorForView) + Me.Controls.Add(Me.grpSelectedRows) Me.Controls.Add(Me.ucrBase) - Me.Controls.Add(Me.ucrSelectorDataFrame) Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow Me.Name = "dlgView" Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen @@ -134,18 +141,18 @@ Partial Class dlgView Me.Text = "View" Me.grpSelectedRows.ResumeLayout(False) Me.grpSelectedRows.PerformLayout() + CType(Me.nudNumberRows, System.ComponentModel.ISupportInitialize).EndInit() Me.ResumeLayout(False) Me.PerformLayout() End Sub - - Friend WithEvents ucrSelectorDataFrame As ucrSelectorByDataFrameAddRemove Friend WithEvents ucrBase As ucrButtons - Friend WithEvents ucrReceiverView As ucrReceiverMultiple - Friend WithEvents lblSelected As Label Friend WithEvents grpSelectedRows As GroupBox Friend WithEvents rdoBottom As RadioButton Friend WithEvents rdoTop As RadioButton - Friend WithEvents txtBottom As TextBox - Friend WithEvents txtTop As TextBox + Friend WithEvents ucrSelctorForView As ucrSelectorByDataFrameAddRemove + Friend WithEvents ucrReceiverView As ucrReceiverMultiple + Friend WithEvents lblSelected As Label + Friend WithEvents nudNumberRows As NumericUpDown + Friend WithEvents lblNumberofRows As Label End Class diff --git a/instat/dlgView.vb b/instat/dlgView.vb index 8a248894c0c..64349dad360 100644 --- a/instat/dlgView.vb +++ b/instat/dlgView.vb @@ -15,30 +15,81 @@ ' along with this program. If not, see . Imports instat.Translations Public Class dlgView + Public bFirstLoad As Boolean = True + Private Sub dlgView_Load(sender As Object, e As EventArgs) Handles MyBase.Load autoTranslate(Me) + ucrBase.iHelpTopicID = 32 ucrBase.clsRsyntax.iCallType = 2 - ucrReceiverView.Selector = ucrSelectorDataFrame + + + ucrReceiverView.Selector = ucrSelctorForView ucrReceiverView.SetMeAsReceiver() + If bFirstLoad Then + SetDefaults() + bFirstLoad = False + Else + ReopenDialog() + End If + 'Checks if Ok can be enabled. + TestOKEnabled() End Sub - Private Sub ucrReceiverView_Leave(sender As Object, e As EventArgs) Handles ucrReceiverView.Leave - ucrBase.clsRsyntax.AddParameter("X", ucrReceiverView.GetVariableNames()) + Private Sub SetDefaults() + nudNumberRows.Value = 6 + ucrSelctorForView.Reset() + rdoTop.Checked = True End Sub - Private Sub txtTop_leave(sender As Object, e As EventArgs) Handles txtTop.Leave - ucrBase.clsRsyntax.AddParameter("n", txtTop.Text) + Private Sub ReopenDialog() + End Sub - Private Sub txtBottom_leave(sender As Object, e As EventArgs) Handles txtBottom.Leave - ucrBase.clsRsyntax.AddParameter("n", txtBottom.Text) + Private Sub TestOKEnabled() + If ucrReceiverView.IsEmpty() = False Then + ucrBase.OKEnabled(True) + Else + ucrBase.OKEnabled(False) + End If End Sub - Private Sub rdoTop_click(sender As Object, e As EventArgs) Handles rdoTop.Click - ucrBase.clsRsyntax.SetFunction("head") + + + Private Sub grpSelectedRows_CheckedChanged(sender As Object, e As EventArgs) Handles rdoBottom.CheckedChanged, rdoTop.CheckedChanged + + grpRowsToBeSelected() End Sub - Private Sub rdoBottom_click(sender As Object, e As EventArgs) Handles rdoBottom.Click - ucrBase.clsRsyntax.SetFunction("tail") + Private Sub grpRowsToBeSelected() + + If rdoTop.Checked Then + + ucrBase.clsRsyntax.SetFunction("head") + + + Else + ucrBase.clsRsyntax.SetFunction("tail") + + End If + + End Sub + + + Private Sub ucrReceiverView_SelctionChanged() Handles ucrReceiverView.SelectionChanged + If Not ucrReceiverView.IsEmpty Then + ucrBase.clsRsyntax.AddParameter("x", clsRFunctionParameter:=ucrReceiverView.GetVariables()) + + Else + ucrBase.clsRsyntax.RemoveParameter("x") + End If + TestOKEnabled() + + End Sub + + Private Sub nudNumberRows_ValueChanged(sender As Object, e As EventArgs) Handles nudNumberRows.ValueChanged + + ucrBase.clsRsyntax.AddParameter("n", nudNumberRows.Value) + + End Sub End Class \ No newline at end of file diff --git a/instat/dlgViewDescriptives.Designer.vb b/instat/dlgViewDescriptives.Designer.vb new file mode 100644 index 00000000000..abfbf3c37c5 --- /dev/null +++ b/instat/dlgViewDescriptives.Designer.vb @@ -0,0 +1,51 @@ + _ +Partial Class dlgViewDescriptives + Inherits System.Windows.Forms.Form + + 'Form overrides dispose to clean up the component list. + _ + Protected Overrides Sub Dispose(ByVal disposing As Boolean) + Try + If disposing AndAlso components IsNot Nothing Then + components.Dispose() + End If + Finally + MyBase.Dispose(disposing) + End Try + 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() + Me.ucrBase = New instat.ucrButtons() + Me.SuspendLayout() + ' + 'ucrBase + ' + Me.ucrBase.Location = New System.Drawing.Point(12, 196) + Me.ucrBase.Name = "ucrBase" + Me.ucrBase.Size = New System.Drawing.Size(410, 53) + Me.ucrBase.TabIndex = 0 + ' + 'dlgViewDescriptive + ' + Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) + Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.ClientSize = New System.Drawing.Size(427, 261) + Me.Controls.Add(Me.ucrBase) + Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow + Me.Name = "dlgViewDescriptive" + Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen + Me.Tag = "View" + Me.Text = "View" + Me.ResumeLayout(False) + + End Sub + + Friend WithEvents ucrBase As ucrButtons +End Class diff --git a/instat/dlgViewDescriptives.fr-FR.resx b/instat/dlgViewDescriptives.fr-FR.resx new file mode 100644 index 00000000000..9c9f69d752c --- /dev/null +++ b/instat/dlgViewDescriptives.fr-FR.resx @@ -0,0 +1,15 @@ + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/instat/dlgViewDescriptives.resx b/instat/dlgViewDescriptives.resx new file mode 100644 index 00000000000..29dcb1b3a35 --- /dev/null +++ b/instat/dlgViewDescriptives.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/instat/dlgViewDescriptives.sw-KE.resx b/instat/dlgViewDescriptives.sw-KE.resx new file mode 100644 index 00000000000..9c9f69d752c --- /dev/null +++ b/instat/dlgViewDescriptives.sw-KE.resx @@ -0,0 +1,15 @@ + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/instat/dlgViewDescriptives.vb b/instat/dlgViewDescriptives.vb new file mode 100644 index 00000000000..3e3cf7a8aa3 --- /dev/null +++ b/instat/dlgViewDescriptives.vb @@ -0,0 +1,21 @@ +' 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 . +Imports instat.Translations +Public Class dlgViewDescriptives + Private Sub dlgViewDescriptives_Load(sender As Object, e As EventArgs) Handles MyBase.Load + autoTranslate(Me) + End Sub +End Class \ No newline at end of file diff --git a/instat/dlgViewModels.Designer.vb b/instat/dlgViewModels.Designer.vb new file mode 100644 index 00000000000..225904ca847 --- /dev/null +++ b/instat/dlgViewModels.Designer.vb @@ -0,0 +1,51 @@ + _ +Partial Class dlgViewModels + Inherits System.Windows.Forms.Form + + 'Form overrides dispose to clean up the component list. + _ + Protected Overrides Sub Dispose(ByVal disposing As Boolean) + Try + If disposing AndAlso components IsNot Nothing Then + components.Dispose() + End If + Finally + MyBase.Dispose(disposing) + End Try + 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() + Me.ucrBase = New instat.ucrButtons() + Me.SuspendLayout() + ' + 'ucrBase + ' + Me.ucrBase.Location = New System.Drawing.Point(12, 225) + Me.ucrBase.Name = "ucrBase" + Me.ucrBase.Size = New System.Drawing.Size(410, 53) + Me.ucrBase.TabIndex = 0 + ' + 'dlgViewModels + ' + Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) + Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.ClientSize = New System.Drawing.Size(445, 290) + Me.Controls.Add(Me.ucrBase) + Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow + Me.Name = "dlgViewModels" + Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen + Me.Tag = "View" + Me.Text = "View" + Me.ResumeLayout(False) + + End Sub + + Friend WithEvents ucrBase As ucrButtons +End Class diff --git a/instat/dlgViewModels.fr-FR.resx b/instat/dlgViewModels.fr-FR.resx new file mode 100644 index 00000000000..9c9f69d752c --- /dev/null +++ b/instat/dlgViewModels.fr-FR.resx @@ -0,0 +1,15 @@ + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/instat/dlgViewModels.resx b/instat/dlgViewModels.resx new file mode 100644 index 00000000000..29dcb1b3a35 --- /dev/null +++ b/instat/dlgViewModels.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/instat/dlgViewModels.sw-KE.resx b/instat/dlgViewModels.sw-KE.resx new file mode 100644 index 00000000000..9c9f69d752c --- /dev/null +++ b/instat/dlgViewModels.sw-KE.resx @@ -0,0 +1,15 @@ + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/instat/dlgViewModels.vb b/instat/dlgViewModels.vb new file mode 100644 index 00000000000..4bf3e3f3f95 --- /dev/null +++ b/instat/dlgViewModels.vb @@ -0,0 +1,21 @@ +' 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 . +Imports instat.Translations +Public Class dlgViewModels + Private Sub dlgViewModels_Load(sender As Object, e As EventArgs) Handles MyBase.Load + autoTranslate(Me) + End Sub +End Class \ No newline at end of file diff --git a/instat/frmMain.Designer.vb b/instat/frmMain.Designer.vb index 0dcbc255c93..dc70e6d92d7 100644 --- a/instat/frmMain.Designer.vb +++ b/instat/frmMain.Designer.vb @@ -195,6 +195,9 @@ Partial Class frmMain Me.mnuTbDelete = New System.Windows.Forms.ToolStripButton() Me.toolStripSeparator1 = New System.Windows.Forms.ToolStripSeparator() Me.EditLastDialogueToolStrip = New System.Windows.Forms.ToolStripButton() + Me.mnuTbShowLast10 = New System.Windows.Forms.ToolStripDropDownButton() + Me.sepStart = New System.Windows.Forms.ToolStripSeparator() + Me.sepEnd = New System.Windows.Forms.ToolStripSeparator() Me.ToolStripSeparator2 = New System.Windows.Forms.ToolStripSeparator() Me.mnuTbHelp = New System.Windows.Forms.ToolStripButton() Me.mnuBar = New System.Windows.Forms.MenuStrip() @@ -301,9 +304,6 @@ Partial Class frmMain Me.mnuClimateMethodsAdditionalSeasonalSummaryRain = New System.Windows.Forms.ToolStripMenuItem() Me.mnuClimateMethodsAdditionalWaterBalance = New System.Windows.Forms.ToolStripMenuItem() Me.mnuClimateMethodsCreateClimateObject = New System.Windows.Forms.ToolStripMenuItem() - Me.mnuTbShowLast10 = New System.Windows.Forms.ToolStripDropDownButton() - Me.sepEnd = New System.Windows.Forms.ToolStripSeparator() - Me.sepStart = New System.Windows.Forms.ToolStripSeparator() Me.stsStrip.SuspendLayout() Me.Tool_strip.SuspendLayout() Me.mnuBar.SuspendLayout() @@ -312,26 +312,26 @@ Partial Class frmMain 'mnuStatisticsSimpleModelsTwoSamples ' Me.mnuStatisticsSimpleModelsTwoSamples.Name = "mnuStatisticsSimpleModelsTwoSamples" - Me.mnuStatisticsSimpleModelsTwoSamples.Size = New System.Drawing.Size(233, 22) + Me.mnuStatisticsSimpleModelsTwoSamples.Size = New System.Drawing.Size(234, 22) Me.mnuStatisticsSimpleModelsTwoSamples.Tag = "Two_samples" Me.mnuStatisticsSimpleModelsTwoSamples.Text = "Two samples..." ' 'ToolStripSeparator9 ' Me.ToolStripSeparator9.Name = "ToolStripSeparator9" - Me.ToolStripSeparator9.Size = New System.Drawing.Size(230, 6) + Me.ToolStripSeparator9.Size = New System.Drawing.Size(231, 6) ' 'mnuStatisticsSimpleModelsChisquareTest ' Me.mnuStatisticsSimpleModelsChisquareTest.Name = "mnuStatisticsSimpleModelsChisquareTest" - Me.mnuStatisticsSimpleModelsChisquareTest.Size = New System.Drawing.Size(233, 22) + Me.mnuStatisticsSimpleModelsChisquareTest.Size = New System.Drawing.Size(234, 22) Me.mnuStatisticsSimpleModelsChisquareTest.Tag = "Chi_square_Test" Me.mnuStatisticsSimpleModelsChisquareTest.Text = "Chi-square Test..." ' 'mnuStatisticsSimpleModelsGoodnessOfFit ' Me.mnuStatisticsSimpleModelsGoodnessOfFit.Name = "mnuStatisticsSimpleModelsGoodnessOfFit" - Me.mnuStatisticsSimpleModelsGoodnessOfFit.Size = New System.Drawing.Size(233, 22) + Me.mnuStatisticsSimpleModelsGoodnessOfFit.Size = New System.Drawing.Size(234, 22) Me.mnuStatisticsSimpleModelsGoodnessOfFit.Tag = "Goodness_of_fit" Me.mnuStatisticsSimpleModelsGoodnessOfFit.Text = "Goodness of Fit..." ' @@ -339,7 +339,7 @@ Partial Class frmMain ' Me.mnuStatisticsAnalysisOfVariance.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuStatisticsAnalysisOfVarianceOneWay, Me.mnuStatisticsAnalysisOfVarianceOrthogonal, Me.mnuStatisticsAnalysisOfVarianceGeneral}) Me.mnuStatisticsAnalysisOfVariance.Name = "mnuStatisticsAnalysisOfVariance" - Me.mnuStatisticsAnalysisOfVariance.Size = New System.Drawing.Size(178, 22) + Me.mnuStatisticsAnalysisOfVariance.Size = New System.Drawing.Size(179, 22) Me.mnuStatisticsAnalysisOfVariance.Tag = "Analysis_of_Variance" Me.mnuStatisticsAnalysisOfVariance.Text = "Analysis of Variance" ' @@ -368,7 +368,7 @@ Partial Class frmMain ' Me.mnuStatisticsRegression.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuStatisticsRegressionSimple, Me.mnuStatisticsRegressionSimpleWithGroups, Me.mnuStatisticsRegressionGeneral, Me.mnuStatisticsRegressionGeneralized, Me.mnuStatisticsRegressionLogistic, Me.mnuStatisticsRegressionLogLinear, Me.mnuStatisticsRegressionMultinomial}) Me.mnuStatisticsRegression.Name = "mnuStatisticsRegression" - Me.mnuStatisticsRegression.Size = New System.Drawing.Size(178, 22) + Me.mnuStatisticsRegression.Size = New System.Drawing.Size(179, 22) Me.mnuStatisticsRegression.Tag = "Regression" Me.mnuStatisticsRegression.Text = "Regression" ' @@ -425,40 +425,40 @@ Partial Class frmMain ' Me.mnuSimpleModels.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuStatisticsSimpleModelsOneSample, Me.mnuStatisticsSimpleModelsOneSampleSummaryData, Me.mnuStatisticsSimpleModelsTwoSamples, Me.mnuStatisticsSimpleModelsTwoSamplesSummaryData, Me.ToolStripSeparator9, Me.mnuStatisticsSimpleModelsChisquareTest, Me.mnuStatisticsSimpleModelsGoodnessOfFit, Me.ToolStripSeparator13, Me.mnuStatisticsSimpleModelsProbabilityDistributions}) Me.mnuSimpleModels.Name = "mnuSimpleModels" - Me.mnuSimpleModels.Size = New System.Drawing.Size(178, 22) + Me.mnuSimpleModels.Size = New System.Drawing.Size(179, 22) Me.mnuSimpleModels.Tag = "Simple_Models" Me.mnuSimpleModels.Text = "Simple Models" ' 'mnuStatisticsSimpleModelsOneSample ' Me.mnuStatisticsSimpleModelsOneSample.Name = "mnuStatisticsSimpleModelsOneSample" - Me.mnuStatisticsSimpleModelsOneSample.Size = New System.Drawing.Size(233, 22) + Me.mnuStatisticsSimpleModelsOneSample.Size = New System.Drawing.Size(234, 22) Me.mnuStatisticsSimpleModelsOneSample.Tag = "One_Sample" Me.mnuStatisticsSimpleModelsOneSample.Text = "One Sample..." ' 'mnuStatisticsSimpleModelsOneSampleSummaryData ' Me.mnuStatisticsSimpleModelsOneSampleSummaryData.Name = "mnuStatisticsSimpleModelsOneSampleSummaryData" - Me.mnuStatisticsSimpleModelsOneSampleSummaryData.Size = New System.Drawing.Size(233, 22) + Me.mnuStatisticsSimpleModelsOneSampleSummaryData.Size = New System.Drawing.Size(234, 22) Me.mnuStatisticsSimpleModelsOneSampleSummaryData.Tag = "One_Sample_Summary_Data" Me.mnuStatisticsSimpleModelsOneSampleSummaryData.Text = "One Sample Summary Data..." ' 'mnuStatisticsSimpleModelsTwoSamplesSummaryData ' Me.mnuStatisticsSimpleModelsTwoSamplesSummaryData.Name = "mnuStatisticsSimpleModelsTwoSamplesSummaryData" - Me.mnuStatisticsSimpleModelsTwoSamplesSummaryData.Size = New System.Drawing.Size(233, 22) + Me.mnuStatisticsSimpleModelsTwoSamplesSummaryData.Size = New System.Drawing.Size(234, 22) Me.mnuStatisticsSimpleModelsTwoSamplesSummaryData.Tag = "Two_Samples_Summary_Data" Me.mnuStatisticsSimpleModelsTwoSamplesSummaryData.Text = "Two Samples Summary Data..." ' 'ToolStripSeparator13 ' Me.ToolStripSeparator13.Name = "ToolStripSeparator13" - Me.ToolStripSeparator13.Size = New System.Drawing.Size(230, 6) + Me.ToolStripSeparator13.Size = New System.Drawing.Size(231, 6) ' 'mnuStatisticsSimpleModelsProbabilityDistributions ' Me.mnuStatisticsSimpleModelsProbabilityDistributions.Name = "mnuStatisticsSimpleModelsProbabilityDistributions" - Me.mnuStatisticsSimpleModelsProbabilityDistributions.Size = New System.Drawing.Size(233, 22) + Me.mnuStatisticsSimpleModelsProbabilityDistributions.Size = New System.Drawing.Size(234, 22) Me.mnuStatisticsSimpleModelsProbabilityDistributions.Tag = "Probability_Distributions" Me.mnuStatisticsSimpleModelsProbabilityDistributions.Text = "Probability Distributions..." ' @@ -466,35 +466,35 @@ Partial Class frmMain ' Me.mnuStatisticsNonParametric.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuStatisticsNonParametricOneSample, Me.mnuStatisticsNonParametricTwoSamples, Me.mnuStatisticsNonParametricOneWayAnova, Me.mnuStatisticsNonParametricTwoWayAnova}) Me.mnuStatisticsNonParametric.Name = "mnuStatisticsNonParametric" - Me.mnuStatisticsNonParametric.Size = New System.Drawing.Size(178, 22) + Me.mnuStatisticsNonParametric.Size = New System.Drawing.Size(179, 22) Me.mnuStatisticsNonParametric.Tag = "Non_Parametric" Me.mnuStatisticsNonParametric.Text = "Non-Parametric" ' 'mnuStatisticsNonParametricOneSample ' Me.mnuStatisticsNonParametricOneSample.Name = "mnuStatisticsNonParametricOneSample" - Me.mnuStatisticsNonParametricOneSample.Size = New System.Drawing.Size(176, 22) + Me.mnuStatisticsNonParametricOneSample.Size = New System.Drawing.Size(178, 22) Me.mnuStatisticsNonParametricOneSample.Tag = "One_Sample" Me.mnuStatisticsNonParametricOneSample.Text = "One Sample..." ' 'mnuStatisticsNonParametricTwoSamples ' Me.mnuStatisticsNonParametricTwoSamples.Name = "mnuStatisticsNonParametricTwoSamples" - Me.mnuStatisticsNonParametricTwoSamples.Size = New System.Drawing.Size(176, 22) + Me.mnuStatisticsNonParametricTwoSamples.Size = New System.Drawing.Size(178, 22) Me.mnuStatisticsNonParametricTwoSamples.Tag = "Two_Samples" Me.mnuStatisticsNonParametricTwoSamples.Text = "Two Samples..." ' 'mnuStatisticsNonParametricOneWayAnova ' Me.mnuStatisticsNonParametricOneWayAnova.Name = "mnuStatisticsNonParametricOneWayAnova" - Me.mnuStatisticsNonParametricOneWayAnova.Size = New System.Drawing.Size(176, 22) + Me.mnuStatisticsNonParametricOneWayAnova.Size = New System.Drawing.Size(178, 22) Me.mnuStatisticsNonParametricOneWayAnova.Tag = "one_way_anova" Me.mnuStatisticsNonParametricOneWayAnova.Text = "One-Way ANOVA..." ' 'mnuStatisticsNonParametricTwoWayAnova ' Me.mnuStatisticsNonParametricTwoWayAnova.Name = "mnuStatisticsNonParametricTwoWayAnova" - Me.mnuStatisticsNonParametricTwoWayAnova.Size = New System.Drawing.Size(176, 22) + Me.mnuStatisticsNonParametricTwoWayAnova.Size = New System.Drawing.Size(178, 22) Me.mnuStatisticsNonParametricTwoWayAnova.Tag = "Two_way_Anova" Me.mnuStatisticsNonParametricTwoWayAnova.Text = "Two-Way ANOVA..." ' @@ -509,16 +509,16 @@ Partial Class frmMain 'mnuGraphicsScatterPlot ' Me.mnuGraphicsScatterPlot.Name = "mnuGraphicsScatterPlot" - Me.mnuGraphicsScatterPlot.Size = New System.Drawing.Size(213, 22) + Me.mnuGraphicsScatterPlot.Size = New System.Drawing.Size(222, 22) Me.mnuGraphicsScatterPlot.Tag = "Scatter_Plot" - Me.mnuGraphicsScatterPlot.Text = "Scatter Plot" + Me.mnuGraphicsScatterPlot.Text = "Scatter Plot..." ' 'mnuGraphicsLinePlot ' Me.mnuGraphicsLinePlot.Name = "mnuGraphicsLinePlot" - Me.mnuGraphicsLinePlot.Size = New System.Drawing.Size(213, 22) + Me.mnuGraphicsLinePlot.Size = New System.Drawing.Size(222, 22) Me.mnuGraphicsLinePlot.Tag = "Line_Plot" - Me.mnuGraphicsLinePlot.Text = "Line Plot" + Me.mnuGraphicsLinePlot.Text = "Line Plot..." ' 'mnuGraphicsHistogram ' @@ -551,16 +551,16 @@ Partial Class frmMain 'mnuGraphicsBarPie ' Me.mnuGraphicsBarPie.Name = "mnuGraphicsBarPie" - Me.mnuGraphicsBarPie.Size = New System.Drawing.Size(213, 22) + Me.mnuGraphicsBarPie.Size = New System.Drawing.Size(222, 22) Me.mnuGraphicsBarPie.Tag = "Bar_Pie_Chart" - Me.mnuGraphicsBarPie.Text = "Bar Charts" + Me.mnuGraphicsBarPie.Text = "Bar Charts..." ' 'mnuGraphicsBarPieChart ' Me.mnuGraphicsBarPieChart.Name = "mnuGraphicsBarPieChart" - Me.mnuGraphicsBarPieChart.Size = New System.Drawing.Size(213, 22) + Me.mnuGraphicsBarPieChart.Size = New System.Drawing.Size(222, 22) Me.mnuGraphicsBarPieChart.Tag = "Bar_Pie_Chart" - Me.mnuGraphicsBarPieChart.Text = "Bar Charts From Summary" + Me.mnuGraphicsBarPieChart.Text = "Bar Charts From Summary..." ' 'ToolStripSeparator4 ' @@ -570,9 +570,9 @@ Partial Class frmMain 'mnuGraphicsCummulativeDistribution ' Me.mnuGraphicsCummulativeDistribution.Name = "mnuGraphicsCummulativeDistribution" - Me.mnuGraphicsCummulativeDistribution.Size = New System.Drawing.Size(213, 22) + Me.mnuGraphicsCummulativeDistribution.Size = New System.Drawing.Size(222, 22) Me.mnuGraphicsCummulativeDistribution.Tag = "Cummulative_Distribution" - Me.mnuGraphicsCummulativeDistribution.Text = "Cummulative Distribution" + Me.mnuGraphicsCummulativeDistribution.Text = "Cummulative Distribution..." ' 'ToolStripSeparator5 ' @@ -605,7 +605,7 @@ Partial Class frmMain ' Me.mnuStatisticsSummary.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuStatisticsSummaryDescribe, Me.mnuStatisticsSummaryColumnStat, Me.mnuStatisticsSummaryCircularStatistics}) Me.mnuStatisticsSummary.Name = "mnuStatisticsSummary" - Me.mnuStatisticsSummary.Size = New System.Drawing.Size(178, 22) + Me.mnuStatisticsSummary.Size = New System.Drawing.Size(179, 22) Me.mnuStatisticsSummary.Tag = "Summary" Me.mnuStatisticsSummary.Text = "Summary" ' @@ -634,7 +634,7 @@ Partial Class frmMain ' Me.mnuStatisticsTables.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuStatisticsTablesGroup, Me.mnuStatisticsTablesFrequency, Me.mnuStatisticsTablesSummary, Me.mnuStatisticsTablesGeneral, Me.mnuStatisticsTablesMultipleResponse}) Me.mnuStatisticsTables.Name = "mnuStatisticsTables" - Me.mnuStatisticsTables.Size = New System.Drawing.Size(178, 22) + Me.mnuStatisticsTables.Size = New System.Drawing.Size(179, 22) Me.mnuStatisticsTables.Tag = "Tables" Me.mnuStatisticsTables.Text = "Tables" ' @@ -677,7 +677,7 @@ Partial Class frmMain ' Me.mnuStatistcsMultivariate.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuStatistcsMultivariateCorrelation, Me.mnuStatistcsMultivariatePrincipalComponents, Me.mnuStatistcsMultivariateCanonicalCorrelations}) Me.mnuStatistcsMultivariate.Name = "mnuStatistcsMultivariate" - Me.mnuStatistcsMultivariate.Size = New System.Drawing.Size(178, 22) + Me.mnuStatistcsMultivariate.Size = New System.Drawing.Size(179, 22) Me.mnuStatistcsMultivariate.Tag = "Multivariate" Me.mnuStatistcsMultivariate.Text = "Multivariate" ' @@ -852,38 +852,38 @@ Partial Class frmMain 'mnuWindowVariable ' Me.mnuWindowVariable.Name = "mnuWindowVariable" - Me.mnuWindowVariable.Size = New System.Drawing.Size(220, 22) + Me.mnuWindowVariable.Size = New System.Drawing.Size(221, 22) Me.mnuWindowVariable.Text = "Variable (column) Metadata" ' 'mnuWindowDataFrame ' Me.mnuWindowDataFrame.Name = "mnuWindowDataFrame" - Me.mnuWindowDataFrame.Size = New System.Drawing.Size(220, 22) + Me.mnuWindowDataFrame.Size = New System.Drawing.Size(221, 22) Me.mnuWindowDataFrame.Text = "Data frame Metadata" ' 'LogToolStripMenuItem ' Me.LogToolStripMenuItem.Name = "LogToolStripMenuItem" - Me.LogToolStripMenuItem.Size = New System.Drawing.Size(220, 22) + Me.LogToolStripMenuItem.Size = New System.Drawing.Size(221, 22) Me.LogToolStripMenuItem.Text = "Log" ' 'ScriptToolStripMenuItem ' Me.ScriptToolStripMenuItem.Name = "ScriptToolStripMenuItem" - Me.ScriptToolStripMenuItem.Size = New System.Drawing.Size(220, 22) + Me.ScriptToolStripMenuItem.Size = New System.Drawing.Size(221, 22) Me.ScriptToolStripMenuItem.Text = "Script" ' 'mnuWindowsEditor ' Me.mnuWindowsEditor.Name = "mnuWindowsEditor" - Me.mnuWindowsEditor.Size = New System.Drawing.Size(220, 22) + Me.mnuWindowsEditor.Size = New System.Drawing.Size(221, 22) Me.mnuWindowsEditor.Text = "Editor" ' 'WindowsLayoutToolStripMenuItem ' Me.WindowsLayoutToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuWindowsCascading, Me.mnuWindowsStacked, Me.mnuWindowsSideBySide, Me.mnuWindowsArrangedIcons}) Me.WindowsLayoutToolStripMenuItem.Name = "WindowsLayoutToolStripMenuItem" - Me.WindowsLayoutToolStripMenuItem.Size = New System.Drawing.Size(220, 22) + Me.WindowsLayoutToolStripMenuItem.Size = New System.Drawing.Size(221, 22) Me.WindowsLayoutToolStripMenuItem.Text = "Windows Layout" ' 'mnuWindowsCascading @@ -1544,6 +1544,28 @@ Partial Class frmMain Me.EditLastDialogueToolStrip.Size = New System.Drawing.Size(23, 22) Me.EditLastDialogueToolStrip.Text = "&Edit last dialogue" ' + 'mnuTbShowLast10 + ' + Me.mnuTbShowLast10.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image + Me.mnuTbShowLast10.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.sepStart, Me.sepEnd}) + Me.mnuTbShowLast10.Image = Global.instat.My.Resources.Resources.Oxygen_Icons_org_Oxygen_Actions_window_duplicate + Me.mnuTbShowLast10.ImageTransparentColor = System.Drawing.Color.Magenta + Me.mnuTbShowLast10.Name = "mnuTbShowLast10" + Me.mnuTbShowLast10.Size = New System.Drawing.Size(29, 22) + Me.mnuTbShowLast10.Text = "&Show last 10 dialogues" + ' + 'sepStart + ' + Me.sepStart.Name = "sepStart" + Me.sepStart.Size = New System.Drawing.Size(57, 6) + Me.sepStart.Visible = False + ' + 'sepEnd + ' + Me.sepEnd.Name = "sepEnd" + Me.sepEnd.Size = New System.Drawing.Size(57, 6) + Me.sepEnd.Visible = False + ' 'ToolStripSeparator2 ' Me.ToolStripSeparator2.Name = "ToolStripSeparator2" @@ -1701,7 +1723,7 @@ Partial Class frmMain 'mnuCalculations ' Me.mnuCalculations.Name = "mnuCalculations" - Me.mnuCalculations.Size = New System.Drawing.Size(148, 22) + Me.mnuCalculations.Size = New System.Drawing.Size(152, 22) Me.mnuCalculations.Tag = "Calculations" Me.mnuCalculations.Text = "Calculations..." ' @@ -1709,7 +1731,7 @@ Partial Class frmMain ' Me.mnuManageData.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuManageDataRegularSequence, Me.mnuManageDataRandomSamples, Me.mnuManageDataView, Me.mnuManageDataRename, Me.mnuManageDataConvertTo}) Me.mnuManageData.Name = "mnuManageData" - Me.mnuManageData.Size = New System.Drawing.Size(148, 22) + Me.mnuManageData.Size = New System.Drawing.Size(152, 22) Me.mnuManageData.Tag = "Data" Me.mnuManageData.Text = "Data" ' @@ -1752,63 +1774,63 @@ Partial Class frmMain ' Me.mnuManageFactor.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuManageFactorconvertToFactor, Me.mnuMangeFactorLabel, Me.mnuManageFactorReorderLevels, Me.mnuManageFactorRecode, Me.mnuManageFactorReferenceLevels, Me.mnuManageFactorInteraction, Me.mnuManageFactorUnusedLevels, Me.mnuManageFactorIndicatorVariables}) Me.mnuManageFactor.Name = "mnuManageFactor" - Me.mnuManageFactor.Size = New System.Drawing.Size(148, 22) + Me.mnuManageFactor.Size = New System.Drawing.Size(152, 22) Me.mnuManageFactor.Tag = "Factor" Me.mnuManageFactor.Text = "Factor" ' 'mnuManageFactorconvertToFactor ' Me.mnuManageFactorconvertToFactor.Name = "mnuManageFactorconvertToFactor" - Me.mnuManageFactorconvertToFactor.Size = New System.Drawing.Size(179, 22) + Me.mnuManageFactorconvertToFactor.Size = New System.Drawing.Size(180, 22) Me.mnuManageFactorconvertToFactor.Tag = "Convert_to_Factor" Me.mnuManageFactorconvertToFactor.Text = "Convert to Factor..." ' 'mnuMangeFactorLabel ' Me.mnuMangeFactorLabel.Name = "mnuMangeFactorLabel" - Me.mnuMangeFactorLabel.Size = New System.Drawing.Size(179, 22) + Me.mnuMangeFactorLabel.Size = New System.Drawing.Size(180, 22) Me.mnuMangeFactorLabel.Tag = "Label" Me.mnuMangeFactorLabel.Text = "Label..." ' 'mnuManageFactorReorderLevels ' Me.mnuManageFactorReorderLevels.Name = "mnuManageFactorReorderLevels" - Me.mnuManageFactorReorderLevels.Size = New System.Drawing.Size(179, 22) + Me.mnuManageFactorReorderLevels.Size = New System.Drawing.Size(180, 22) Me.mnuManageFactorReorderLevels.Tag = "Reorder_levels" Me.mnuManageFactorReorderLevels.Text = "Reorder Levels..." ' 'mnuManageFactorRecode ' Me.mnuManageFactorRecode.Name = "mnuManageFactorRecode" - Me.mnuManageFactorRecode.Size = New System.Drawing.Size(179, 22) + Me.mnuManageFactorRecode.Size = New System.Drawing.Size(180, 22) Me.mnuManageFactorRecode.Tag = "Recode" Me.mnuManageFactorRecode.Text = "Recode..." ' 'mnuManageFactorReferenceLevels ' Me.mnuManageFactorReferenceLevels.Name = "mnuManageFactorReferenceLevels" - Me.mnuManageFactorReferenceLevels.Size = New System.Drawing.Size(179, 22) + Me.mnuManageFactorReferenceLevels.Size = New System.Drawing.Size(180, 22) Me.mnuManageFactorReferenceLevels.Tag = "Reference_levels" Me.mnuManageFactorReferenceLevels.Text = "Reference Levels..." ' 'mnuManageFactorInteraction ' Me.mnuManageFactorInteraction.Name = "mnuManageFactorInteraction" - Me.mnuManageFactorInteraction.Size = New System.Drawing.Size(179, 22) + Me.mnuManageFactorInteraction.Size = New System.Drawing.Size(180, 22) Me.mnuManageFactorInteraction.Tag = "Interaction" Me.mnuManageFactorInteraction.Text = "Interaction..." ' 'mnuManageFactorUnusedLevels ' Me.mnuManageFactorUnusedLevels.Name = "mnuManageFactorUnusedLevels" - Me.mnuManageFactorUnusedLevels.Size = New System.Drawing.Size(179, 22) + Me.mnuManageFactorUnusedLevels.Size = New System.Drawing.Size(180, 22) Me.mnuManageFactorUnusedLevels.Tag = "Unused_levels" Me.mnuManageFactorUnusedLevels.Text = "Unused Levels..." ' 'mnuManageFactorIndicatorVariables ' Me.mnuManageFactorIndicatorVariables.Name = "mnuManageFactorIndicatorVariables" - Me.mnuManageFactorIndicatorVariables.Size = New System.Drawing.Size(179, 22) + Me.mnuManageFactorIndicatorVariables.Size = New System.Drawing.Size(180, 22) Me.mnuManageFactorIndicatorVariables.Tag = "Indicator_variables" Me.mnuManageFactorIndicatorVariables.Text = "Indicator Variables..." ' @@ -1816,7 +1838,7 @@ Partial Class frmMain ' Me.mnuManageManipulate.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuTransform, Me.mnuManageManipulateRecode, Me.mnuManageManipulateSort, Me.mnuManageManipulateRank, Me.mnuManageManipulateRowSummary, Me.mnuManagePermuteRows, Me.mnuManageManipulatePolynomials}) Me.mnuManageManipulate.Name = "mnuManageManipulate" - Me.mnuManageManipulate.Size = New System.Drawing.Size(148, 22) + Me.mnuManageManipulate.Size = New System.Drawing.Size(152, 22) Me.mnuManageManipulate.Tag = "Manipulate" Me.mnuManageManipulate.Text = "Manipulate" ' @@ -1873,7 +1895,7 @@ Partial Class frmMain ' Me.mnuManageSheet.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuManageSheetColumnMetadata, Me.mnuManageSheetRestrict, Me.mnuManageSheetReorder, Me.mnuManageSheetInsertColumnsRows, Me.mnuManageSheetDeleteColumnsRows, Me.mnuManageSheetProtect, Me.mnuManageSheetHideShowColumns}) Me.mnuManageSheet.Name = "mnuManageSheet" - Me.mnuManageSheet.Size = New System.Drawing.Size(148, 22) + Me.mnuManageSheet.Size = New System.Drawing.Size(152, 22) Me.mnuManageSheet.Tag = "Sheet" Me.mnuManageSheet.Text = "Sheet" ' @@ -1930,7 +1952,7 @@ Partial Class frmMain ' Me.mnuManageReshape.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuManageRechapeColumnSummaries, Me.mnuManageReshapeStack, Me.mnuManageReshapeUnstack, Me.mnuManageReshapeRandomSubst, Me.mnuManageRechapeSelect, Me.mnuManageRechapeMerge, Me.RemoveUnusedLabelsToolStripMenuItem}) Me.mnuManageReshape.Name = "mnuManageReshape" - Me.mnuManageReshape.Size = New System.Drawing.Size(148, 22) + Me.mnuManageReshape.Size = New System.Drawing.Size(152, 22) Me.mnuManageReshape.Tag = "Reshape" Me.mnuManageReshape.Text = "Reshape" ' @@ -1986,7 +2008,7 @@ Partial Class frmMain ' Me.mnuManageDataFile.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuManageDataFileViewDataMetadata, Me.mnuManageDataFileRenameSheet, Me.mnuManageDataFileReorderSheets, Me.mnuManageDataFileCopySheet, Me.mnuManageDataFileDeleteSheets}) Me.mnuManageDataFile.Name = "mnuManageDataFile" - Me.mnuManageDataFile.Size = New System.Drawing.Size(148, 22) + Me.mnuManageDataFile.Size = New System.Drawing.Size(152, 22) Me.mnuManageDataFile.Tag = "Data_file" Me.mnuManageDataFile.Text = "Data File" ' @@ -2302,28 +2324,6 @@ Partial Class frmMain Me.mnuClimateMethodsCreateClimateObject.Tag = "Create_Climate_Object" Me.mnuClimateMethodsCreateClimateObject.Text = "Create Climate Object..." ' - 'mnuTbShowLast10 - ' - Me.mnuTbShowLast10.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image - Me.mnuTbShowLast10.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.sepStart, Me.sepEnd}) - Me.mnuTbShowLast10.Image = Global.instat.My.Resources.Resources.Oxygen_Icons_org_Oxygen_Actions_window_duplicate - Me.mnuTbShowLast10.ImageTransparentColor = System.Drawing.Color.Magenta - Me.mnuTbShowLast10.Name = "mnuTbShowLast10" - Me.mnuTbShowLast10.Size = New System.Drawing.Size(29, 22) - Me.mnuTbShowLast10.Text = "&Show last 10 dialogues" - ' - 'sepEnd - ' - Me.sepEnd.Name = "sepEnd" - Me.sepEnd.Size = New System.Drawing.Size(149, 6) - Me.sepEnd.Visible = False - ' - 'sepStart - ' - Me.sepStart.Name = "sepStart" - Me.sepStart.Size = New System.Drawing.Size(149, 6) - Me.sepStart.Visible = False - ' 'frmMain ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) diff --git a/instat/frmMain.vb b/instat/frmMain.vb index e4d3d6c05e6..1a4c5ebf025 100644 --- a/instat/frmMain.vb +++ b/instat/frmMain.vb @@ -80,8 +80,8 @@ Public Class frmMain autoTranslate(Me) End Sub - Private Sub ProbabilityPlotToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles mnuGraphicsCummulativeDistribution.Click - dlgProbabilityPlot.ShowDialog() + Private Sub mnuGraphicsCummulativeDistribution_Click(sender As Object, e As EventArgs) Handles mnuGraphicsCummulativeDistribution.Click + dlgCumulativeDistribution.ShowDialog() End Sub Private Sub FrenchToolStripMenuItem_Click(sender As Object, e As EventArgs) @@ -274,7 +274,7 @@ Public Class frmMain End Sub Private Sub mnuStatsNonParametricOneWayAnova_Click(sender As Object, e As EventArgs) Handles mnuStatisticsNonParametricOneWayAnova.Click - 'dlgOneWayAnova.ShowDialog() + dlgNon_ParametricOneWayANOVA.ShowDialog() End Sub Private Sub mnuStatsSummaryColumnStat_Click(sender As Object, e As EventArgs) Handles mnuStatisticsSummaryColumnStat.Click @@ -857,4 +857,28 @@ Public Class frmMain Private Sub mnuManageFactorconvertToFactor_Click(sender As Object, e As EventArgs) Handles mnuManageFactorconvertToFactor.Click dlgConvertColumnsToFactors.ShowDialog() End Sub + + Private Sub mnuManageFactorReorderLevels_Click(sender As Object, e As EventArgs) Handles mnuManageFactorReorderLevels.Click + dlgReorderLevels.ShowDialog() + End Sub + + Private Sub mnuManageFactorUnusedLevels_Click(sender As Object, e As EventArgs) Handles mnuManageFactorUnusedLevels.Click + dlgUnusedLevels.ShowDialog() + End Sub + + Private Sub mnuManageSheetRestrict_Click(sender As Object, e As EventArgs) Handles mnuManageSheetRestrict.Click + dlgRestrict.ShowDialog() + End Sub + + Private Sub mnuManageSheetProtect_Click(sender As Object, e As EventArgs) Handles mnuManageSheetProtect.Click + dlgProtect.ShowDialog() + End Sub + + Private Sub mnuManageSheetHideShowColumns_Click(sender As Object, e As EventArgs) Handles mnuManageSheetHideShowColumns.Click + dlgHideShowColumns.ShowDialog() + End Sub + + Private Sub mnuManageReshapeRandomSubst_Click(sender As Object, e As EventArgs) Handles mnuManageReshapeRandomSubst.Click + dlgRandomSubset.ShowDialog() + End Sub End Class diff --git a/instat/instat.vbproj b/instat/instat.vbproj index 5ece843a184..517c1c52aa1 100644 --- a/instat/instat.vbproj +++ b/instat/instat.vbproj @@ -208,6 +208,12 @@ Form + + dlgCheck.vb + + + Form + dlgChiSquareTest.vb @@ -226,12 +232,24 @@ Form + + dlgColumnMetadata.vb + + + Form + dlgColumnStats.vb Form + + dlgContrasts.vb + + + Form + dlgCopySheet.vb @@ -250,6 +268,18 @@ Form + + dlgDeleteDescriptive.vb + + + Form + + + dlgDeleteModels.vb + + + Form + dlgDeleteSheet.vb @@ -262,12 +292,24 @@ Form + + dlgHideShowColumns.vb + + + Form + dlgInsertColumn.vb Form + + dlgMakeSheets.vb + + + Form + dlgOneWayANOVA.vb @@ -292,18 +334,54 @@ Form + + dlgProtect.vb + + + Form + + + dlgRandomSubset.vb + + + Form + dlgReferenceLevels.vb Form + + dlgRenameDescriptive.vb + + + Form + + + dlgRenameModels.vb + + + Form + dlgRenameSheet.vb Form + + dlgReoderDescriptives.vb + + + Form + + + dlgReoderModels.vb + + + Form + dlgReorderLevels.vb @@ -316,30 +394,102 @@ Form + + dlgRestrict.vb + + + Form + dlgScatterPlot.vb Form + + dlgSheetMetadata.vb + + + Form + dlgSummaryBarOrPieChart.vb Form + + dlgTwoSampleNonparametricTest.vb + + + Form + + + dlgUnusedLevels.vb + + + Form + + + dlgViewDescriptives.vb + + + Form + + + dlgViewModels.vb + + + Form + sdgCanonicalCorrelation.vb Form + + sdgCumDistLineOptions.vb + + + Form + + + sdgCumDistPlotOptions.vb + + + Form + + + sdgDensityOptions.vb + + + Form + + + sdgFrequencyPolygonOptions.vb + + + Form + + + sdgPieChartOptions.vb + + + Form + sdgPrincipalComponentAnalysis.vb Form + + sdgThemeOptions.vb + + + Form + ucrInputComboBox.vb @@ -754,10 +904,10 @@ Form - - dlgNon-ParametricANOVA.vb + + dlgNon-ParametricOneWayANOVA.vb - + Form @@ -1266,6 +1416,18 @@ UserControl + + ucrSaveGraph.vb + + + UserControl + + + ucrSaveModel.vb + + + UserControl + ucrSelector.vb @@ -1412,6 +1574,15 @@ dlgChangeType.vb + + dlgCheck.vb + + + dlgCheck.vb + + + dlgCheck.vb + dlgChiSquareTest.vb @@ -1439,6 +1610,24 @@ dlgCliPlot.vb + + dlgColumnMetadata.vb + + + dlgColumnMetadata.vb + + + dlgColumnMetadata.vb + + + dlgContrasts.vb + + + dlgContrasts.vb + + + dlgContrasts.vb + dlgCopySheet.vb @@ -1466,6 +1655,24 @@ dlgDeleteColumn.vb + + dlgDeleteDescriptive.vb + + + dlgDeleteDescriptive.vb + + + dlgDeleteDescriptive.vb + + + dlgDeleteModels.vb + + + dlgDeleteModels.vb + + + dlgDeleteModels.vb + dlgDeleteSheet.vb @@ -1484,6 +1691,15 @@ dlgFromLibrary.vb + + dlgHideShowColumns.vb + + + dlgHideShowColumns.vb + + + dlgHideShowColumns.vb + dlgInsertColumn.vb @@ -1493,6 +1709,15 @@ dlgInsertColumn.vb + + dlgMakeSheets.vb + + + dlgMakeSheets.vb + + + dlgMakeSheets.vb + dlgOneWayANOVA.vb @@ -1529,6 +1754,24 @@ dlgPrintPreviewOptions.vb + + dlgProtect.vb + + + dlgProtect.vb + + + dlgProtect.vb + + + dlgRandomSubset.vb + + + dlgRandomSubset.vb + + + dlgRandomSubset.vb + dlgReferenceLevels.vb @@ -1538,6 +1781,24 @@ dlgReferenceLevels.vb + + dlgRenameDescriptive.vb + + + dlgRenameDescriptive.vb + + + dlgRenameDescriptive.vb + + + dlgRenameModels.vb + + + dlgRenameModels.vb + + + dlgRenameModels.vb + dlgRenameSheet.vb @@ -1547,6 +1808,24 @@ dlgRenameSheet.vb + + dlgReoderDescriptives.vb + + + dlgReoderDescriptives.vb + + + dlgReoderDescriptives.vb + + + dlgReoderModels.vb + + + dlgReoderModels.vb + + + dlgReoderModels.vb + dlgReorderLevels.vb @@ -1565,6 +1844,15 @@ dlgReorderSheet.vb + + dlgRestrict.vb + + + dlgRestrict.vb + + + dlgRestrict.vb + dlgScatterPlot.vb @@ -1574,6 +1862,15 @@ dlgScatterPlot.vb + + dlgSheetMetadata.vb + + + dlgSheetMetadata.vb + + + dlgSheetMetadata.vb + dlgSummaryBarOrPieChart.vb @@ -1583,6 +1880,42 @@ dlgSummaryBarOrPieChart.vb + + dlgTwoSampleNonparametricTest.vb + + + dlgTwoSampleNonparametricTest.vb + + + dlgTwoSampleNonparametricTest.vb + + + dlgUnusedLevels.vb + + + dlgUnusedLevels.vb + + + dlgUnusedLevels.vb + + + dlgViewDescriptives.vb + + + dlgViewDescriptives.vb + + + dlgViewDescriptives.vb + + + dlgViewModels.vb + + + dlgViewModels.vb + + + dlgViewModels.vb + sdgBarChart.vb @@ -1619,6 +1952,33 @@ sdgCorrPlot.vb + + sdgCumDistLineOptions.vb + + + sdgCumDistLineOptions.vb + + + sdgCumDistLineOptions.vb + + + sdgCumDistPlotOptions.vb + + + sdgCumDistPlotOptions.vb + + + sdgCumDistPlotOptions.vb + + + sdgDensityOptions.vb + + + sdgDensityOptions.vb + + + sdgDensityOptions.vb + sdgDotPlot.vb @@ -1628,6 +1988,15 @@ sdgDotPlot.vb + + sdgFrequencyPolygonOptions.vb + + + sdgFrequencyPolygonOptions.vb + + + sdgFrequencyPolygonOptions.vb + sdgHistogramOptions.vb @@ -1647,6 +2016,15 @@ sdgANOVAOptions.vb Designer + + sdgPieChartOptions.vb + + + sdgPieChartOptions.vb + + + sdgPieChartOptions.vb + sdgPrincipalComponentAnalysis.vb @@ -2205,14 +2583,15 @@ dlgNewWorksheet.vb - - dlgNon-ParametricANOVA.vb + + dlgNon-ParametricOneWayANOVA.vb - - dlgNon-ParametricANOVA.vb + + dlgNon-ParametricOneWayANOVA.vb - - dlgNon-ParametricANOVA.vb + + dlgNon-ParametricOneWayANOVA.vb + Designer dlgNon-ParemetricOneandTwoSampleTests.vb @@ -2769,6 +3148,15 @@ sdgSimpleRegOptions.vb + + sdgThemeOptions.vb + + + sdgThemeOptions.vb + + + sdgThemeOptions.vb + ucrButtons.vb @@ -2913,6 +3301,24 @@ ucrReceiverSingle.vb + + ucrSaveGraph.vb + + + ucrSaveGraph.vb + + + ucrSaveGraph.vb + + + ucrSaveModel.vb + + + ucrSaveModel.vb + + + ucrSaveModel.vb + ucrSelector.vb @@ -3302,11 +3708,11 @@ - \ No newline at end of file diff --git a/instat/sdgANOVAOptions.Designer.vb b/instat/sdgANOVAOptions.Designer.vb index e81f5b8cbc4..eaeae711393 100644 --- a/instat/sdgANOVAOptions.Designer.vb +++ b/instat/sdgANOVAOptions.Designer.vb @@ -24,16 +24,26 @@ Partial Class sdgANOVAOptions Private Sub InitializeComponent() Me.tbcOptions = New System.Windows.Forms.TabControl() Me.tbpDisplay = New System.Windows.Forms.TabPage() - Me.chkTableOfMeans = New System.Windows.Forms.CheckBox() + Me.chkContrasts = New System.Windows.Forms.CheckBox() + Me.chkStandardErrors = New System.Windows.Forms.CheckBox() + Me.chkMeansAndCounts = New System.Windows.Forms.CheckBox() Me.chkEstimateValues = New System.Windows.Forms.CheckBox() Me.chkANOVATable = New System.Windows.Forms.CheckBox() Me.tbpGraphics = New System.Windows.Forms.TabPage() + Me.grpMeans = New System.Windows.Forms.GroupBox() + Me.nudConfidenceLevel = New System.Windows.Forms.NumericUpDown() + Me.lblConfidenceLevel = New System.Windows.Forms.Label() + Me.chkConfidenceLimits = New System.Windows.Forms.CheckBox() Me.chkMeans = New System.Windows.Forms.CheckBox() + Me.grpResiduals = New System.Windows.Forms.GroupBox() Me.chkResiduals = New System.Windows.Forms.CheckBox() Me.ucrBaseSdg = New instat.ucrButtonsSubdialogue() Me.tbcOptions.SuspendLayout() Me.tbpDisplay.SuspendLayout() Me.tbpGraphics.SuspendLayout() + Me.grpMeans.SuspendLayout() + CType(Me.nudConfidenceLevel, System.ComponentModel.ISupportInitialize).BeginInit() + Me.grpResiduals.SuspendLayout() Me.SuspendLayout() ' 'tbcOptions @@ -43,38 +53,62 @@ Partial Class sdgANOVAOptions Me.tbcOptions.Location = New System.Drawing.Point(-1, -1) Me.tbcOptions.Name = "tbcOptions" Me.tbcOptions.SelectedIndex = 0 - Me.tbcOptions.Size = New System.Drawing.Size(292, 165) + Me.tbcOptions.Size = New System.Drawing.Size(345, 208) Me.tbcOptions.TabIndex = 1 ' 'tbpDisplay ' - Me.tbpDisplay.Controls.Add(Me.chkTableOfMeans) + Me.tbpDisplay.Controls.Add(Me.chkContrasts) + Me.tbpDisplay.Controls.Add(Me.chkStandardErrors) + Me.tbpDisplay.Controls.Add(Me.chkMeansAndCounts) Me.tbpDisplay.Controls.Add(Me.chkEstimateValues) Me.tbpDisplay.Controls.Add(Me.chkANOVATable) Me.tbpDisplay.Location = New System.Drawing.Point(4, 22) Me.tbpDisplay.Name = "tbpDisplay" Me.tbpDisplay.Padding = New System.Windows.Forms.Padding(3) - Me.tbpDisplay.Size = New System.Drawing.Size(284, 139) + Me.tbpDisplay.Size = New System.Drawing.Size(337, 182) Me.tbpDisplay.TabIndex = 0 Me.tbpDisplay.Tag = "Display" Me.tbpDisplay.Text = "Display" Me.tbpDisplay.UseVisualStyleBackColor = True ' - 'chkTableOfMeans + 'chkContrasts ' - Me.chkTableOfMeans.AutoSize = True - Me.chkTableOfMeans.Location = New System.Drawing.Point(9, 105) - Me.chkTableOfMeans.Name = "chkTableOfMeans" - Me.chkTableOfMeans.Size = New System.Drawing.Size(99, 17) - Me.chkTableOfMeans.TabIndex = 5 - Me.chkTableOfMeans.Tag = "Table_of_means" - Me.chkTableOfMeans.Text = "Table of means" - Me.chkTableOfMeans.UseVisualStyleBackColor = True + Me.chkContrasts.AutoSize = True + Me.chkContrasts.Location = New System.Drawing.Point(10, 131) + Me.chkContrasts.Name = "chkContrasts" + Me.chkContrasts.Size = New System.Drawing.Size(70, 17) + Me.chkContrasts.TabIndex = 7 + Me.chkContrasts.Tag = "Contrasts" + Me.chkContrasts.Text = "Contrasts" + Me.chkContrasts.UseVisualStyleBackColor = True + ' + 'chkStandardErrors + ' + Me.chkStandardErrors.AutoSize = True + Me.chkStandardErrors.Location = New System.Drawing.Point(130, 98) + Me.chkStandardErrors.Name = "chkStandardErrors" + Me.chkStandardErrors.Size = New System.Drawing.Size(98, 17) + Me.chkStandardErrors.TabIndex = 6 + Me.chkStandardErrors.Tag = "Standard_errors" + Me.chkStandardErrors.Text = "Standard errors" + Me.chkStandardErrors.UseVisualStyleBackColor = True + ' + 'chkMeansAndCounts + ' + Me.chkMeansAndCounts.AutoSize = True + Me.chkMeansAndCounts.Location = New System.Drawing.Point(10, 98) + Me.chkMeansAndCounts.Name = "chkMeansAndCounts" + Me.chkMeansAndCounts.Size = New System.Drawing.Size(114, 17) + Me.chkMeansAndCounts.TabIndex = 5 + Me.chkMeansAndCounts.Tag = "Means_and_counts" + Me.chkMeansAndCounts.Text = "Means and counts" + Me.chkMeansAndCounts.UseVisualStyleBackColor = True ' 'chkEstimateValues ' Me.chkEstimateValues.AutoSize = True - Me.chkEstimateValues.Location = New System.Drawing.Point(10, 62) + Me.chkEstimateValues.Location = New System.Drawing.Point(10, 59) Me.chkEstimateValues.Name = "chkEstimateValues" Me.chkEstimateValues.Size = New System.Drawing.Size(67, 17) Me.chkEstimateValues.TabIndex = 4 @@ -95,21 +129,64 @@ Partial Class sdgANOVAOptions ' 'tbpGraphics ' - Me.tbpGraphics.Controls.Add(Me.chkMeans) - Me.tbpGraphics.Controls.Add(Me.chkResiduals) + Me.tbpGraphics.Controls.Add(Me.grpMeans) + Me.tbpGraphics.Controls.Add(Me.grpResiduals) Me.tbpGraphics.Location = New System.Drawing.Point(4, 22) Me.tbpGraphics.Name = "tbpGraphics" Me.tbpGraphics.Padding = New System.Windows.Forms.Padding(3) - Me.tbpGraphics.Size = New System.Drawing.Size(175, 155) + Me.tbpGraphics.Size = New System.Drawing.Size(337, 182) Me.tbpGraphics.TabIndex = 1 Me.tbpGraphics.Tag = "Graphics" Me.tbpGraphics.Text = "Graphics" Me.tbpGraphics.UseVisualStyleBackColor = True ' + 'grpMeans + ' + Me.grpMeans.Controls.Add(Me.nudConfidenceLevel) + Me.grpMeans.Controls.Add(Me.lblConfidenceLevel) + Me.grpMeans.Controls.Add(Me.chkConfidenceLimits) + Me.grpMeans.Controls.Add(Me.chkMeans) + Me.grpMeans.Location = New System.Drawing.Point(9, 78) + Me.grpMeans.Name = "grpMeans" + Me.grpMeans.Size = New System.Drawing.Size(288, 87) + Me.grpMeans.TabIndex = 3 + Me.grpMeans.TabStop = False + Me.grpMeans.Tag = "Means" + Me.grpMeans.Text = "Means" + ' + 'nudConfidenceLevel + ' + Me.nudConfidenceLevel.Location = New System.Drawing.Point(149, 61) + Me.nudConfidenceLevel.Name = "nudConfidenceLevel" + Me.nudConfidenceLevel.Size = New System.Drawing.Size(46, 20) + Me.nudConfidenceLevel.TabIndex = 4 + Me.nudConfidenceLevel.Value = New Decimal(New Integer() {95, 0, 0, 0}) + ' + 'lblConfidenceLevel + ' + Me.lblConfidenceLevel.AutoSize = True + Me.lblConfidenceLevel.Location = New System.Drawing.Point(50, 68) + Me.lblConfidenceLevel.Name = "lblConfidenceLevel" + Me.lblConfidenceLevel.Size = New System.Drawing.Size(86, 13) + Me.lblConfidenceLevel.TabIndex = 3 + Me.lblConfidenceLevel.Tag = "Confidence_level" + Me.lblConfidenceLevel.Text = "Confidence level" + ' + 'chkConfidenceLimits + ' + Me.chkConfidenceLimits.AutoSize = True + Me.chkConfidenceLimits.Location = New System.Drawing.Point(6, 42) + Me.chkConfidenceLimits.Name = "chkConfidenceLimits" + Me.chkConfidenceLimits.Size = New System.Drawing.Size(105, 17) + Me.chkConfidenceLimits.TabIndex = 2 + Me.chkConfidenceLimits.Tag = "Confidence_limits" + Me.chkConfidenceLimits.Text = "Confidence limits" + Me.chkConfidenceLimits.UseVisualStyleBackColor = True + ' 'chkMeans ' Me.chkMeans.AutoSize = True - Me.chkMeans.Location = New System.Drawing.Point(18, 71) + Me.chkMeans.Location = New System.Drawing.Point(5, 19) Me.chkMeans.Name = "chkMeans" Me.chkMeans.Size = New System.Drawing.Size(58, 17) Me.chkMeans.TabIndex = 1 @@ -117,20 +194,31 @@ Partial Class sdgANOVAOptions Me.chkMeans.Text = "Means" Me.chkMeans.UseVisualStyleBackColor = True ' + 'grpResiduals + ' + Me.grpResiduals.Controls.Add(Me.chkResiduals) + Me.grpResiduals.Location = New System.Drawing.Point(9, 6) + Me.grpResiduals.Name = "grpResiduals" + Me.grpResiduals.Size = New System.Drawing.Size(288, 66) + Me.grpResiduals.TabIndex = 2 + Me.grpResiduals.TabStop = False + Me.grpResiduals.Tag = "Residuals" + Me.grpResiduals.Text = "Residuals" + ' 'chkResiduals ' Me.chkResiduals.AutoSize = True - Me.chkResiduals.Location = New System.Drawing.Point(18, 24) + Me.chkResiduals.Location = New System.Drawing.Point(6, 19) Me.chkResiduals.Name = "chkResiduals" - Me.chkResiduals.Size = New System.Drawing.Size(72, 17) + Me.chkResiduals.Size = New System.Drawing.Size(76, 17) Me.chkResiduals.TabIndex = 0 - Me.chkResiduals.Tag = "Residuals" - Me.chkResiduals.Text = "Residuals" + Me.chkResiduals.Tag = "Four_in_one" + Me.chkResiduals.Text = "four in one" Me.chkResiduals.UseVisualStyleBackColor = True ' 'ucrBaseSdg ' - Me.ucrBaseSdg.Location = New System.Drawing.Point(48, 170) + Me.ucrBaseSdg.Location = New System.Drawing.Point(65, 213) Me.ucrBaseSdg.Name = "ucrBaseSdg" Me.ucrBaseSdg.Size = New System.Drawing.Size(142, 30) Me.ucrBaseSdg.TabIndex = 2 @@ -139,7 +227,7 @@ Partial Class sdgANOVAOptions ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(290, 208) + Me.ClientSize = New System.Drawing.Size(342, 268) Me.Controls.Add(Me.ucrBaseSdg) Me.Controls.Add(Me.tbcOptions) Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow @@ -150,7 +238,11 @@ Partial Class sdgANOVAOptions Me.tbpDisplay.ResumeLayout(False) Me.tbpDisplay.PerformLayout() Me.tbpGraphics.ResumeLayout(False) - Me.tbpGraphics.PerformLayout() + Me.grpMeans.ResumeLayout(False) + Me.grpMeans.PerformLayout() + CType(Me.nudConfidenceLevel, System.ComponentModel.ISupportInitialize).EndInit() + Me.grpResiduals.ResumeLayout(False) + Me.grpResiduals.PerformLayout() Me.ResumeLayout(False) End Sub @@ -158,11 +250,18 @@ Partial Class sdgANOVAOptions Friend WithEvents ucrBaseSubdialog As ucrButtonsSubdialogue Friend WithEvents tbcOptions As TabControl Friend WithEvents tbpDisplay As TabPage - Friend WithEvents chkTableOfMeans As CheckBox + Friend WithEvents chkMeansAndCounts As CheckBox Friend WithEvents chkEstimateValues As CheckBox Friend WithEvents chkANOVATable As CheckBox Friend WithEvents tbpGraphics As TabPage Friend WithEvents chkMeans As CheckBox Friend WithEvents chkResiduals As CheckBox Friend WithEvents ucrBaseSdg As ucrButtonsSubdialogue + Friend WithEvents chkContrasts As CheckBox + Friend WithEvents chkStandardErrors As CheckBox + Friend WithEvents grpMeans As GroupBox + Friend WithEvents grpResiduals As GroupBox + Friend WithEvents nudConfidenceLevel As NumericUpDown + Friend WithEvents lblConfidenceLevel As Label + Friend WithEvents chkConfidenceLimits As CheckBox End Class diff --git a/instat/sdgCorrPlot.Designer.vb b/instat/sdgCorrPlot.Designer.vb index 02ff6c54c37..583c0e6c2ec 100644 --- a/instat/sdgCorrPlot.Designer.vb +++ b/instat/sdgCorrPlot.Designer.vb @@ -22,30 +22,89 @@ Partial Class sdgCorrPlot 'Do not modify it using the code editor. _ Private Sub InitializeComponent() - Me.ucrBase = New instat.ucrButtons() + Me.ucrBaseSdgCorrPlot = New instat.ucrButtonsSubdialogue() + Me.tbGraphics = New System.Windows.Forms.TabPage() + Me.chkGGcorr = New System.Windows.Forms.CheckBox() + Me.chkGGPairs = New System.Windows.Forms.CheckBox() + Me.tbSdgCorrelation = New System.Windows.Forms.TabControl() + Me.tbGraphics.SuspendLayout() + Me.tbSdgCorrelation.SuspendLayout() Me.SuspendLayout() ' - 'ucrBase + 'ucrBaseSdgCorrPlot ' - Me.ucrBase.Location = New System.Drawing.Point(12, 196) - Me.ucrBase.Name = "ucrBase" - Me.ucrBase.Size = New System.Drawing.Size(410, 53) - Me.ucrBase.TabIndex = 0 + Me.ucrBaseSdgCorrPlot.Location = New System.Drawing.Point(44, 228) + Me.ucrBaseSdgCorrPlot.Name = "ucrBaseSdgCorrPlot" + Me.ucrBaseSdgCorrPlot.Size = New System.Drawing.Size(142, 30) + Me.ucrBaseSdgCorrPlot.TabIndex = 0 + ' + 'tbGraphics + ' + Me.tbGraphics.Controls.Add(Me.chkGGcorr) + Me.tbGraphics.Controls.Add(Me.chkGGPairs) + Me.tbGraphics.Location = New System.Drawing.Point(4, 22) + Me.tbGraphics.Name = "tbGraphics" + Me.tbGraphics.Padding = New System.Windows.Forms.Padding(3) + Me.tbGraphics.Size = New System.Drawing.Size(204, 184) + Me.tbGraphics.TabIndex = 0 + Me.tbGraphics.Tag = "Graphics" + Me.tbGraphics.Text = "Graphics" + Me.tbGraphics.UseVisualStyleBackColor = True + ' + 'chkGGcorr + ' + Me.chkGGcorr.AutoSize = True + Me.chkGGcorr.Location = New System.Drawing.Point(28, 54) + Me.chkGGcorr.Name = "chkGGcorr" + Me.chkGGcorr.Size = New System.Drawing.Size(63, 17) + Me.chkGGcorr.TabIndex = 1 + Me.chkGGcorr.Tag = "GG_corr" + Me.chkGGcorr.Text = "GG corr" + Me.chkGGcorr.UseVisualStyleBackColor = True + ' + 'chkGGPairs + ' + Me.chkGGPairs.AutoSize = True + Me.chkGGPairs.Location = New System.Drawing.Point(28, 31) + Me.chkGGPairs.Name = "chkGGPairs" + Me.chkGGPairs.Size = New System.Drawing.Size(68, 17) + Me.chkGGPairs.TabIndex = 0 + Me.chkGGPairs.Tag = "GG_Pairs" + Me.chkGGPairs.Text = "GG Pairs" + Me.chkGGPairs.UseVisualStyleBackColor = True + ' + 'tbSdgCorrelation + ' + Me.tbSdgCorrelation.Controls.Add(Me.tbGraphics) + Me.tbSdgCorrelation.Location = New System.Drawing.Point(12, 12) + Me.tbSdgCorrelation.Name = "tbSdgCorrelation" + Me.tbSdgCorrelation.SelectedIndex = 0 + Me.tbSdgCorrelation.Size = New System.Drawing.Size(212, 210) + Me.tbSdgCorrelation.TabIndex = 1 + Me.tbSdgCorrelation.Tag = "" ' 'sdgCorrPlot ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(426, 261) - Me.Controls.Add(Me.ucrBase) + Me.ClientSize = New System.Drawing.Size(227, 261) + Me.Controls.Add(Me.tbSdgCorrelation) + Me.Controls.Add(Me.ucrBaseSdgCorrPlot) Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow Me.Name = "sdgCorrPlot" Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen Me.Tag = "corrplot" Me.Text = "corrplot" + Me.tbGraphics.ResumeLayout(False) + Me.tbGraphics.PerformLayout() + Me.tbSdgCorrelation.ResumeLayout(False) Me.ResumeLayout(False) End Sub - Friend WithEvents ucrBase As ucrButtons + Friend WithEvents ucrBaseSdgCorrPlot As ucrButtonsSubdialogue + Friend WithEvents tbGraphics As TabPage + Friend WithEvents chkGGPairs As CheckBox + Friend WithEvents tbSdgCorrelation As TabControl + Friend WithEvents chkGGcorr As CheckBox End Class diff --git a/instat/sdgCorrPlot.vb b/instat/sdgCorrPlot.vb index ef63d5f8bd2..89fb9c2d9c3 100644 --- a/instat/sdgCorrPlot.vb +++ b/instat/sdgCorrPlot.vb @@ -1,3 +1,74 @@ -Public Class sdgCorrPlot +' 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 . +Imports instat.Translations +Public Class sdgCorrPlot + Public clsRGGPairsFunction As New RFunction + Public bFirstLoad As Boolean = True + Private Sub sdgCorrPlot_Load(sender As Object, e As EventArgs) Handles MyBase.Load + autoTranslate(Me) + + If bFirstLoad Then + SetDefaults() + bFirstLoad = False + End If + End Sub + + Private Sub GGPairs() + Dim clsRGraphics As New RSyntax + clsRGraphics.SetFunction("ggpairs") + clsRGraphics.AddParameter("data", clsRFunctionParameter:=dlgCorrelation.ucrSelectorDataFrameVarAddRemove.ucrAvailableDataFrames.clsCurrDataFrame) + clsRGraphics.AddParameter("columns", dlgCorrelation.ucrReceiverMultipleColumns.GetVariableNames()) + + 'clsRGraphics.SetOperatorParameter(True, clsRFunc:=clsRGGPairsFunction) + 'clsRGraphics.SetOperation("") + 'clsRGGPairsFunction.SetRCommand("ggpairs") + 'clsRGGPairsFunction.AddParameter("data", clsRFunctionParameter:=dlgCorrelation.ucrSelectorDataFrameVarAddRemove.ucrAvailableDataFrames.clsCurrDataFrame) + 'clsRGGPairsFunction.AddParameter("columns", dlgCorrelation.ucrReceiverMultipleColumns.GetVariableNames()) + 'clsRGraphics.SetOperatorParameter(True, clsRFunc:=clsRGGPairsFunction) + + 'Calltype is not the right one but it works + frmMain.clsRLink.RunScript(clsRGraphics.GetScript(), 2) + End Sub + + Private Sub GGcorr() + Dim clsRGGcorrGraphics As New RSyntax + 'We may have to save the correlation matrix then use it here. + 'We still need to add more arguments to the ggcorr function + clsRGGcorrGraphics.SetFunction("ggcorr") + clsRGGcorrGraphics.AddParameter("data", "NULL") + clsRGGcorrGraphics.AddParameter("cor_matrix", dlgCorrelation.ucrBase.clsRsyntax.GetScript()) + + + 'Calltype is not the right one but it works + frmMain.clsRLink.RunScript(clsRGGcorrGraphics.GetScript(), 2) + End Sub + + + Public Sub SetDefaults() + chkGGPairs.Checked = False + chkGGcorr.Checked = False + End Sub + + Public Sub RegOptions() + If (chkGGPairs.Checked = True) Then + GGPairs() + End If + If (chkGGcorr.Checked = True) Then + GGcorr() + End If + End Sub End Class \ No newline at end of file diff --git a/instat/sdgCumDistLineOptions.Designer.vb b/instat/sdgCumDistLineOptions.Designer.vb new file mode 100644 index 00000000000..28df2815617 --- /dev/null +++ b/instat/sdgCumDistLineOptions.Designer.vb @@ -0,0 +1,39 @@ + _ +Partial Class sdgCumDistLineOptions + Inherits System.Windows.Forms.Form + + 'Form overrides dispose to clean up the component list. + _ + Protected Overrides Sub Dispose(ByVal disposing As Boolean) + Try + If disposing AndAlso components IsNot Nothing Then + components.Dispose() + End If + Finally + MyBase.Dispose(disposing) + End Try + 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() + Me.SuspendLayout() + ' + 'sdgCumDistLineOptions + ' + Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) + Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.ClientSize = New System.Drawing.Size(284, 261) + Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow + Me.Name = "sdgCumDistLineOptions" + Me.Tag = "Line_Options" + Me.Text = "Line Options" + Me.ResumeLayout(False) + + End Sub +End Class diff --git a/instat/sdgCumDistLineOptions.fr-FR.resx b/instat/sdgCumDistLineOptions.fr-FR.resx new file mode 100644 index 00000000000..a3df4f013d3 --- /dev/null +++ b/instat/sdgCumDistLineOptions.fr-FR.resx @@ -0,0 +1,15 @@ + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/instat/sdgCumDistLineOptions.resx b/instat/sdgCumDistLineOptions.resx new file mode 100644 index 00000000000..1af7de150c9 --- /dev/null +++ b/instat/sdgCumDistLineOptions.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/instat/sdgCumDistLineOptions.sw-KE.resx b/instat/sdgCumDistLineOptions.sw-KE.resx new file mode 100644 index 00000000000..a3df4f013d3 --- /dev/null +++ b/instat/sdgCumDistLineOptions.sw-KE.resx @@ -0,0 +1,15 @@ + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/instat/sdgCumDistLineOptions.vb b/instat/sdgCumDistLineOptions.vb new file mode 100644 index 00000000000..45baba314ad --- /dev/null +++ b/instat/sdgCumDistLineOptions.vb @@ -0,0 +1,22 @@ +' 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 . +Imports instat.Translations + +Public Class sdgCumDistLineOptions + Private Sub sdgCumDistLineOptions_Load(sender As Object, e As EventArgs) Handles MyBase.Load + autoTranslate(Me) + End Sub +End Class \ No newline at end of file diff --git a/instat/sdgCumDistPlotOptions.Designer.vb b/instat/sdgCumDistPlotOptions.Designer.vb new file mode 100644 index 00000000000..26522a55f13 --- /dev/null +++ b/instat/sdgCumDistPlotOptions.Designer.vb @@ -0,0 +1,50 @@ + _ +Partial Class sdgCumDistPlotOptions + Inherits System.Windows.Forms.Form + + 'Form overrides dispose to clean up the component list. + _ + Protected Overrides Sub Dispose(ByVal disposing As Boolean) + Try + If disposing AndAlso components IsNot Nothing Then + components.Dispose() + End If + Finally + MyBase.Dispose(disposing) + End Try + 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() + Me.ucrBaseSdgPlotoptions = New instat.ucrButtonsSubdialogue() + Me.SuspendLayout() + ' + 'ucrBaseSdgPlotoptions + ' + Me.ucrBaseSdgPlotoptions.Location = New System.Drawing.Point(53, 219) + Me.ucrBaseSdgPlotoptions.Name = "ucrBaseSdgPlotoptions" + Me.ucrBaseSdgPlotoptions.Size = New System.Drawing.Size(142, 30) + Me.ucrBaseSdgPlotoptions.TabIndex = 0 + ' + 'sdgCumDistPlotOptions + ' + Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) + Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.ClientSize = New System.Drawing.Size(284, 261) + Me.Controls.Add(Me.ucrBaseSdgPlotoptions) + Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow + Me.Name = "sdgCumDistPlotOptions" + Me.Tag = "Plot_Options" + Me.Text = "Plot Options" + Me.ResumeLayout(False) + + End Sub + + Friend WithEvents ucrBaseSdgPlotoptions As ucrButtonsSubdialogue +End Class diff --git a/instat/sdgCumDistPlotOptions.fr-FR.resx b/instat/sdgCumDistPlotOptions.fr-FR.resx new file mode 100644 index 00000000000..a3df4f013d3 --- /dev/null +++ b/instat/sdgCumDistPlotOptions.fr-FR.resx @@ -0,0 +1,15 @@ + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/instat/sdgCumDistPlotOptions.resx b/instat/sdgCumDistPlotOptions.resx new file mode 100644 index 00000000000..1af7de150c9 --- /dev/null +++ b/instat/sdgCumDistPlotOptions.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/instat/sdgCumDistPlotOptions.sw-KE.resx b/instat/sdgCumDistPlotOptions.sw-KE.resx new file mode 100644 index 00000000000..a3df4f013d3 --- /dev/null +++ b/instat/sdgCumDistPlotOptions.sw-KE.resx @@ -0,0 +1,15 @@ + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/instat/sdgCumDistPlotOptions.vb b/instat/sdgCumDistPlotOptions.vb new file mode 100644 index 00000000000..6b62891052f --- /dev/null +++ b/instat/sdgCumDistPlotOptions.vb @@ -0,0 +1,22 @@ +' 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 . +Imports instat.Translations + +Public Class sdgCumDistPlotOptions + Private Sub sdgCumDistPlotOptions_Load(sender As Object, e As EventArgs) Handles MyBase.Load + autoTranslate(Me) + End Sub +End Class \ No newline at end of file diff --git a/instat/sdgDensityOptions.Designer.vb b/instat/sdgDensityOptions.Designer.vb new file mode 100644 index 00000000000..db31542d4bb --- /dev/null +++ b/instat/sdgDensityOptions.Designer.vb @@ -0,0 +1,51 @@ + _ +Partial Class sdgDensityOptions + Inherits System.Windows.Forms.Form + + 'Form overrides dispose to clean up the component list. + _ + Protected Overrides Sub Dispose(ByVal disposing As Boolean) + Try + If disposing AndAlso components IsNot Nothing Then + components.Dispose() + End If + Finally + MyBase.Dispose(disposing) + End Try + 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() + Me.ucrBaseDensityOptions = New instat.ucrButtonsSubdialogue() + Me.SuspendLayout() + ' + 'ucrBaseDensityOptions + ' + Me.ucrBaseDensityOptions.Location = New System.Drawing.Point(60, 224) + Me.ucrBaseDensityOptions.Name = "ucrBaseDensityOptions" + Me.ucrBaseDensityOptions.Size = New System.Drawing.Size(142, 30) + Me.ucrBaseDensityOptions.TabIndex = 0 + ' + 'sdgDensityOptions + ' + Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) + Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.ClientSize = New System.Drawing.Size(284, 261) + Me.Controls.Add(Me.ucrBaseDensityOptions) + Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow + Me.Name = "sdgDensityOptions" + Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent + Me.Tag = "Density_Options" + Me.Text = "Density Options" + Me.ResumeLayout(False) + + End Sub + + Friend WithEvents ucrBaseDensityOptions As ucrButtonsSubdialogue +End Class diff --git a/instat/sdgDensityOptions.fr-FR.resx b/instat/sdgDensityOptions.fr-FR.resx new file mode 100644 index 00000000000..a3df4f013d3 --- /dev/null +++ b/instat/sdgDensityOptions.fr-FR.resx @@ -0,0 +1,15 @@ + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/instat/sdgDensityOptions.resx b/instat/sdgDensityOptions.resx new file mode 100644 index 00000000000..1af7de150c9 --- /dev/null +++ b/instat/sdgDensityOptions.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/instat/sdgDensityOptions.sw-KE.resx b/instat/sdgDensityOptions.sw-KE.resx new file mode 100644 index 00000000000..a3df4f013d3 --- /dev/null +++ b/instat/sdgDensityOptions.sw-KE.resx @@ -0,0 +1,15 @@ + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/instat/sdgDensityOptions.vb b/instat/sdgDensityOptions.vb new file mode 100644 index 00000000000..0c007deb098 --- /dev/null +++ b/instat/sdgDensityOptions.vb @@ -0,0 +1,21 @@ +' 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 . +Imports instat.Translations +Public Class sdgDensityOptions + Private Sub sdgDensityOptions_Load(sender As Object, e As EventArgs) Handles MyBase.Load + autoTranslate(Me) + End Sub +End Class \ No newline at end of file diff --git a/instat/sdgFrequencyPolygonOptions.Designer.vb b/instat/sdgFrequencyPolygonOptions.Designer.vb new file mode 100644 index 00000000000..9b45c5c3039 --- /dev/null +++ b/instat/sdgFrequencyPolygonOptions.Designer.vb @@ -0,0 +1,51 @@ + _ +Partial Class sdgFrequencyPolygonOptions + Inherits System.Windows.Forms.Form + + 'Form overrides dispose to clean up the component list. + _ + Protected Overrides Sub Dispose(ByVal disposing As Boolean) + Try + If disposing AndAlso components IsNot Nothing Then + components.Dispose() + End If + Finally + MyBase.Dispose(disposing) + End Try + 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() + Me.ucrBaseFrequencyOptions = New instat.ucrButtonsSubdialogue() + Me.SuspendLayout() + ' + 'ucrBaseFrequencyOptions + ' + Me.ucrBaseFrequencyOptions.Location = New System.Drawing.Point(67, 219) + Me.ucrBaseFrequencyOptions.Name = "ucrBaseFrequencyOptions" + Me.ucrBaseFrequencyOptions.Size = New System.Drawing.Size(142, 30) + Me.ucrBaseFrequencyOptions.TabIndex = 0 + ' + 'sdgFrequencyPolygonOptions + ' + Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) + Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.ClientSize = New System.Drawing.Size(284, 261) + Me.Controls.Add(Me.ucrBaseFrequencyOptions) + Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow + Me.Name = "sdgFrequencyPolygonOptions" + Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent + Me.Tag = "Frequency_Polygon_Options" + Me.Text = "Frequency Polygon Options" + Me.ResumeLayout(False) + + End Sub + + Friend WithEvents ucrBaseFrequencyOptions As ucrButtonsSubdialogue +End Class diff --git a/instat/sdgFrequencyPolygonOptions.fr-FR.resx b/instat/sdgFrequencyPolygonOptions.fr-FR.resx new file mode 100644 index 00000000000..a3df4f013d3 --- /dev/null +++ b/instat/sdgFrequencyPolygonOptions.fr-FR.resx @@ -0,0 +1,15 @@ + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/instat/sdgFrequencyPolygonOptions.resx b/instat/sdgFrequencyPolygonOptions.resx new file mode 100644 index 00000000000..1af7de150c9 --- /dev/null +++ b/instat/sdgFrequencyPolygonOptions.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/instat/sdgFrequencyPolygonOptions.sw-KE.resx b/instat/sdgFrequencyPolygonOptions.sw-KE.resx new file mode 100644 index 00000000000..a3df4f013d3 --- /dev/null +++ b/instat/sdgFrequencyPolygonOptions.sw-KE.resx @@ -0,0 +1,15 @@ + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/instat/sdgFrequencyPolygonOptions.vb b/instat/sdgFrequencyPolygonOptions.vb new file mode 100644 index 00000000000..ffa15b4a733 --- /dev/null +++ b/instat/sdgFrequencyPolygonOptions.vb @@ -0,0 +1,21 @@ +' 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 . +Imports instat.Translations +Public Class sdgFrequencyPolygonOptions + Private Sub sdgFrequencyPolygonOptions_Load(sender As Object, e As EventArgs) Handles MyBase.Load + autoTranslate(Me) + End Sub +End Class \ No newline at end of file diff --git a/instat/sdgPieChartOptions.Designer.vb b/instat/sdgPieChartOptions.Designer.vb new file mode 100644 index 00000000000..69350a0dca2 --- /dev/null +++ b/instat/sdgPieChartOptions.Designer.vb @@ -0,0 +1,51 @@ + _ +Partial Class sdgPieChartOptions + Inherits System.Windows.Forms.Form + + 'Form overrides dispose to clean up the component list. + _ + Protected Overrides Sub Dispose(ByVal disposing As Boolean) + Try + If disposing AndAlso components IsNot Nothing Then + components.Dispose() + End If + Finally + MyBase.Dispose(disposing) + End Try + 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() + Me.ucrBaseSdgPieChart = New instat.ucrButtonsSubdialogue() + Me.SuspendLayout() + ' + 'ucrBaseSdgPieChart + ' + Me.ucrBaseSdgPieChart.Location = New System.Drawing.Point(49, 219) + Me.ucrBaseSdgPieChart.Name = "ucrBaseSdgPieChart" + Me.ucrBaseSdgPieChart.Size = New System.Drawing.Size(142, 30) + Me.ucrBaseSdgPieChart.TabIndex = 0 + ' + 'sdgPieChartOptions + ' + Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) + Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.ClientSize = New System.Drawing.Size(284, 261) + Me.Controls.Add(Me.ucrBaseSdgPieChart) + Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow + Me.Name = "sdgPieChartOptions" + Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen + Me.Tag = "Pie_Chart_Options" + Me.Text = "Pie Chart Options" + Me.ResumeLayout(False) + + End Sub + + Friend WithEvents ucrBaseSdgPieChart As ucrButtonsSubdialogue +End Class diff --git a/instat/sdgPieChartOptions.fr-FR.resx b/instat/sdgPieChartOptions.fr-FR.resx new file mode 100644 index 00000000000..a3df4f013d3 --- /dev/null +++ b/instat/sdgPieChartOptions.fr-FR.resx @@ -0,0 +1,15 @@ + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/instat/sdgPieChartOptions.resx b/instat/sdgPieChartOptions.resx new file mode 100644 index 00000000000..1af7de150c9 --- /dev/null +++ b/instat/sdgPieChartOptions.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/instat/sdgPieChartOptions.sw-KE.resx b/instat/sdgPieChartOptions.sw-KE.resx new file mode 100644 index 00000000000..a3df4f013d3 --- /dev/null +++ b/instat/sdgPieChartOptions.sw-KE.resx @@ -0,0 +1,15 @@ + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/instat/sdgPieChartOptions.vb b/instat/sdgPieChartOptions.vb new file mode 100644 index 00000000000..d60837259a8 --- /dev/null +++ b/instat/sdgPieChartOptions.vb @@ -0,0 +1,21 @@ +' 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 . +Imports instat.Translations +Public Class sdgPieChartOptions + Private Sub sdgPieChartOptions_Load(sender As Object, e As EventArgs) Handles MyBase.Load + + End Sub +End Class \ No newline at end of file diff --git a/instat/sdgSimpleRegOptions.Designer.vb b/instat/sdgSimpleRegOptions.Designer.vb index 47df95ff437..7332dfd4a27 100644 --- a/instat/sdgSimpleRegOptions.Designer.vb +++ b/instat/sdgSimpleRegOptions.Designer.vb @@ -24,31 +24,29 @@ Partial Class sdgSimpleRegOptions Private Sub InitializeComponent() Me.tbRegOptions = New System.Windows.Forms.TabControl() Me.tbDisplay = New System.Windows.Forms.TabPage() - Me.nudConfidenceInteval = New System.Windows.Forms.NumericUpDown() - Me.lblConfidenceInterval = New System.Windows.Forms.Label() - Me.chkEstimatesPvalues = New System.Windows.Forms.CheckBox() + Me.chkDisplayCLimits = New System.Windows.Forms.CheckBox() + Me.nudDisplayCLevel = New System.Windows.Forms.NumericUpDown() + Me.lblDisplayCLevel = New System.Windows.Forms.Label() Me.chkEstimates = New System.Windows.Forms.CheckBox() - Me.chkAnovaPvalues = New System.Windows.Forms.CheckBox() - Me.chkAnovaTable = New System.Windows.Forms.CheckBox() + Me.chkPvalues = New System.Windows.Forms.CheckBox() + Me.chkANOVA = New System.Windows.Forms.CheckBox() Me.chkModel = New System.Windows.Forms.CheckBox() Me.tbGraphics = New System.Windows.Forms.TabPage() Me.grpModel = New System.Windows.Forms.GroupBox() Me.chkFittedModel = New System.Windows.Forms.CheckBox() Me.chkPredictionInterval = New System.Windows.Forms.CheckBox() - Me.nudConvidenceLevel = New System.Windows.Forms.NumericUpDown() - Me.lblConfidenceLevel = New System.Windows.Forms.Label() - Me.chkConfidenceInterval = New System.Windows.Forms.CheckBox() + Me.nudGraphicsCLevel = New System.Windows.Forms.NumericUpDown() + Me.lblGraphicsCLevel = New System.Windows.Forms.Label() + Me.chkGraphicsCLimits = New System.Windows.Forms.CheckBox() Me.grpResiduals = New System.Windows.Forms.GroupBox() Me.chkFourinOne = New System.Windows.Forms.CheckBox() - Me.chkAdditionalVariable = New System.Windows.Forms.CheckBox() Me.ucrSdgButtons = New instat.ucrButtonsSubdialogue() - Me.chkStandardError = New System.Windows.Forms.CheckBox() Me.tbRegOptions.SuspendLayout() Me.tbDisplay.SuspendLayout() - CType(Me.nudConfidenceInteval, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.nudDisplayCLevel, System.ComponentModel.ISupportInitialize).BeginInit() Me.tbGraphics.SuspendLayout() Me.grpModel.SuspendLayout() - CType(Me.nudConvidenceLevel, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.nudGraphicsCLevel, System.ComponentModel.ISupportInitialize).BeginInit() Me.grpResiduals.SuspendLayout() Me.SuspendLayout() ' @@ -59,64 +57,63 @@ Partial Class sdgSimpleRegOptions Me.tbRegOptions.Location = New System.Drawing.Point(2, 3) Me.tbRegOptions.Name = "tbRegOptions" Me.tbRegOptions.SelectedIndex = 0 - Me.tbRegOptions.Size = New System.Drawing.Size(252, 233) + Me.tbRegOptions.Size = New System.Drawing.Size(254, 193) Me.tbRegOptions.TabIndex = 0 ' 'tbDisplay ' - Me.tbDisplay.Controls.Add(Me.nudConfidenceInteval) - Me.tbDisplay.Controls.Add(Me.lblConfidenceInterval) - Me.tbDisplay.Controls.Add(Me.chkEstimatesPvalues) + Me.tbDisplay.Controls.Add(Me.chkDisplayCLimits) + Me.tbDisplay.Controls.Add(Me.nudDisplayCLevel) + Me.tbDisplay.Controls.Add(Me.lblDisplayCLevel) Me.tbDisplay.Controls.Add(Me.chkEstimates) - Me.tbDisplay.Controls.Add(Me.chkAnovaPvalues) - Me.tbDisplay.Controls.Add(Me.chkAnovaTable) + Me.tbDisplay.Controls.Add(Me.chkPvalues) + Me.tbDisplay.Controls.Add(Me.chkANOVA) Me.tbDisplay.Controls.Add(Me.chkModel) Me.tbDisplay.Location = New System.Drawing.Point(4, 22) Me.tbDisplay.Name = "tbDisplay" Me.tbDisplay.Padding = New System.Windows.Forms.Padding(3) - Me.tbDisplay.Size = New System.Drawing.Size(244, 207) + Me.tbDisplay.Size = New System.Drawing.Size(246, 167) Me.tbDisplay.TabIndex = 0 Me.tbDisplay.Tag = "Display" Me.tbDisplay.Text = "Display" Me.tbDisplay.UseVisualStyleBackColor = True ' - 'nudConfidenceInteval - ' - Me.nudConfidenceInteval.DecimalPlaces = 2 - Me.nudConfidenceInteval.Increment = New Decimal(New Integer() {1, 0, 0, 131072}) - Me.nudConfidenceInteval.Location = New System.Drawing.Point(118, 106) - Me.nudConfidenceInteval.Maximum = New Decimal(New Integer() {1, 0, 0, 0}) - Me.nudConfidenceInteval.Name = "nudConfidenceInteval" - Me.nudConfidenceInteval.Size = New System.Drawing.Size(45, 20) - Me.nudConfidenceInteval.TabIndex = 6 - Me.nudConfidenceInteval.Value = New Decimal(New Integer() {95, 0, 0, 131072}) - ' - 'lblConfidenceInterval - ' - Me.lblConfidenceInterval.AutoSize = True - Me.lblConfidenceInterval.Location = New System.Drawing.Point(3, 108) - Me.lblConfidenceInterval.Name = "lblConfidenceInterval" - Me.lblConfidenceInterval.Size = New System.Drawing.Size(99, 13) - Me.lblConfidenceInterval.TabIndex = 5 - Me.lblConfidenceInterval.Tag = "Confidence_Interval" - Me.lblConfidenceInterval.Text = "Confidence Interval" - ' - 'chkEstimatesPvalues - ' - Me.chkEstimatesPvalues.AutoSize = True - Me.chkEstimatesPvalues.Location = New System.Drawing.Point(118, 49) - Me.chkEstimatesPvalues.Name = "chkEstimatesPvalues" - Me.chkEstimatesPvalues.Size = New System.Drawing.Size(115, 17) - Me.chkEstimatesPvalues.TabIndex = 4 - Me.chkEstimatesPvalues.Tag = "Estimates_P_values" - Me.chkEstimatesPvalues.Text = "Estimates P-values" - Me.chkEstimatesPvalues.ThreeState = True - Me.chkEstimatesPvalues.UseVisualStyleBackColor = True + 'chkDisplayCLimits + ' + Me.chkDisplayCLimits.AutoSize = True + Me.chkDisplayCLimits.Location = New System.Drawing.Point(7, 102) + Me.chkDisplayCLimits.Name = "chkDisplayCLimits" + Me.chkDisplayCLimits.Size = New System.Drawing.Size(109, 17) + Me.chkDisplayCLimits.TabIndex = 4 + Me.chkDisplayCLimits.Tag = "Confidence_Limits" + Me.chkDisplayCLimits.Text = "Confidence Limits" + Me.chkDisplayCLimits.UseVisualStyleBackColor = True + ' + 'nudDisplayCLevel + ' + Me.nudDisplayCLevel.DecimalPlaces = 2 + Me.nudDisplayCLevel.Increment = New Decimal(New Integer() {1, 0, 0, 131072}) + Me.nudDisplayCLevel.Location = New System.Drawing.Point(149, 124) + Me.nudDisplayCLevel.Maximum = New Decimal(New Integer() {1, 0, 0, 0}) + Me.nudDisplayCLevel.Name = "nudDisplayCLevel" + Me.nudDisplayCLevel.Size = New System.Drawing.Size(45, 20) + Me.nudDisplayCLevel.TabIndex = 6 + Me.nudDisplayCLevel.Value = New Decimal(New Integer() {95, 0, 0, 131072}) + ' + 'lblDisplayCLevel + ' + Me.lblDisplayCLevel.AutoSize = True + Me.lblDisplayCLevel.Location = New System.Drawing.Point(34, 126) + Me.lblDisplayCLevel.Name = "lblDisplayCLevel" + Me.lblDisplayCLevel.Size = New System.Drawing.Size(90, 13) + Me.lblDisplayCLevel.TabIndex = 5 + Me.lblDisplayCLevel.Tag = "Confidence_Level" + Me.lblDisplayCLevel.Text = "Confidence Level" ' 'chkEstimates ' Me.chkEstimates.AutoSize = True - Me.chkEstimates.Location = New System.Drawing.Point(7, 49) + Me.chkEstimates.Location = New System.Drawing.Point(6, 73) Me.chkEstimates.Name = "chkEstimates" Me.chkEstimates.Size = New System.Drawing.Size(71, 17) Me.chkEstimates.TabIndex = 3 @@ -124,32 +121,32 @@ Partial Class sdgSimpleRegOptions Me.chkEstimates.Text = "Estimates" Me.chkEstimates.UseVisualStyleBackColor = True ' - 'chkAnovaPvalues + 'chkPvalues ' - Me.chkAnovaPvalues.AutoSize = True - Me.chkAnovaPvalues.Location = New System.Drawing.Point(118, 21) - Me.chkAnovaPvalues.Name = "chkAnovaPvalues" - Me.chkAnovaPvalues.Size = New System.Drawing.Size(101, 17) - Me.chkAnovaPvalues.TabIndex = 2 - Me.chkAnovaPvalues.Tag = "Anova_P_values" - Me.chkAnovaPvalues.Text = "Anova P-values" - Me.chkAnovaPvalues.UseVisualStyleBackColor = True + Me.chkPvalues.AutoSize = True + Me.chkPvalues.Location = New System.Drawing.Point(118, 46) + Me.chkPvalues.Name = "chkPvalues" + Me.chkPvalues.Size = New System.Drawing.Size(67, 17) + Me.chkPvalues.TabIndex = 2 + Me.chkPvalues.Tag = "P_values" + Me.chkPvalues.Text = "P-values" + Me.chkPvalues.UseVisualStyleBackColor = True ' - 'chkAnovaTable + 'chkANOVA ' - Me.chkAnovaTable.AutoSize = True - Me.chkAnovaTable.Location = New System.Drawing.Point(8, 21) - Me.chkAnovaTable.Name = "chkAnovaTable" - Me.chkAnovaTable.Size = New System.Drawing.Size(87, 17) - Me.chkAnovaTable.TabIndex = 1 - Me.chkAnovaTable.Tag = "Anova_Table" - Me.chkAnovaTable.Text = "Anova Table" - Me.chkAnovaTable.UseVisualStyleBackColor = True + Me.chkANOVA.AutoSize = True + Me.chkANOVA.Location = New System.Drawing.Point(6, 44) + Me.chkANOVA.Name = "chkANOVA" + Me.chkANOVA.Size = New System.Drawing.Size(63, 17) + Me.chkANOVA.TabIndex = 1 + Me.chkANOVA.Tag = "ANOVA" + Me.chkANOVA.Text = "ANOVA" + Me.chkANOVA.UseVisualStyleBackColor = True ' 'chkModel ' Me.chkModel.AutoSize = True - Me.chkModel.Location = New System.Drawing.Point(7, 74) + Me.chkModel.Location = New System.Drawing.Point(6, 15) Me.chkModel.Name = "chkModel" Me.chkModel.Size = New System.Drawing.Size(55, 17) Me.chkModel.TabIndex = 0 @@ -164,7 +161,7 @@ Partial Class sdgSimpleRegOptions Me.tbGraphics.Location = New System.Drawing.Point(4, 22) Me.tbGraphics.Name = "tbGraphics" Me.tbGraphics.Padding = New System.Windows.Forms.Padding(3) - Me.tbGraphics.Size = New System.Drawing.Size(244, 207) + Me.tbGraphics.Size = New System.Drawing.Size(246, 167) Me.tbGraphics.TabIndex = 1 Me.tbGraphics.Tag = "Graphics" Me.tbGraphics.Text = "Graphics" @@ -172,15 +169,14 @@ Partial Class sdgSimpleRegOptions ' 'grpModel ' - Me.grpModel.Controls.Add(Me.chkStandardError) Me.grpModel.Controls.Add(Me.chkFittedModel) Me.grpModel.Controls.Add(Me.chkPredictionInterval) - Me.grpModel.Controls.Add(Me.nudConvidenceLevel) - Me.grpModel.Controls.Add(Me.lblConfidenceLevel) - Me.grpModel.Controls.Add(Me.chkConfidenceInterval) - Me.grpModel.Location = New System.Drawing.Point(16, 80) + Me.grpModel.Controls.Add(Me.nudGraphicsCLevel) + Me.grpModel.Controls.Add(Me.lblGraphicsCLevel) + Me.grpModel.Controls.Add(Me.chkGraphicsCLimits) + Me.grpModel.Location = New System.Drawing.Point(16, 56) Me.grpModel.Name = "grpModel" - Me.grpModel.Size = New System.Drawing.Size(219, 121) + Me.grpModel.Size = New System.Drawing.Size(219, 102) Me.grpModel.TabIndex = 1 Me.grpModel.TabStop = False Me.grpModel.Tag = "Model" @@ -200,53 +196,52 @@ Partial Class sdgSimpleRegOptions 'chkPredictionInterval ' Me.chkPredictionInterval.AutoSize = True - Me.chkPredictionInterval.Location = New System.Drawing.Point(50, 98) + Me.chkPredictionInterval.Location = New System.Drawing.Point(50, 81) Me.chkPredictionInterval.Name = "chkPredictionInterval" Me.chkPredictionInterval.Size = New System.Drawing.Size(111, 17) - Me.chkPredictionInterval.TabIndex = 3 + Me.chkPredictionInterval.TabIndex = 4 Me.chkPredictionInterval.Tag = "Prediction_Interval" Me.chkPredictionInterval.Text = "Prediction Interval" Me.chkPredictionInterval.UseVisualStyleBackColor = True ' - 'nudConvidenceLevel - ' - Me.nudConvidenceLevel.DecimalPlaces = 2 - Me.nudConvidenceLevel.Increment = New Decimal(New Integer() {1, 0, 0, 131072}) - Me.nudConvidenceLevel.Location = New System.Drawing.Point(167, 56) - Me.nudConvidenceLevel.Maximum = New Decimal(New Integer() {1, 0, 0, 0}) - Me.nudConvidenceLevel.Name = "nudConvidenceLevel" - Me.nudConvidenceLevel.Size = New System.Drawing.Size(46, 20) - Me.nudConvidenceLevel.TabIndex = 4 - Me.nudConvidenceLevel.Value = New Decimal(New Integer() {95, 0, 0, 131072}) - ' - 'lblConfidenceLevel - ' - Me.lblConfidenceLevel.AutoSize = True - Me.lblConfidenceLevel.Location = New System.Drawing.Point(71, 58) - Me.lblConfidenceLevel.Name = "lblConfidenceLevel" - Me.lblConfidenceLevel.Size = New System.Drawing.Size(90, 13) - Me.lblConfidenceLevel.TabIndex = 2 - Me.lblConfidenceLevel.Tag = "Confidence_Level" - Me.lblConfidenceLevel.Text = "Confidence Level" - ' - 'chkConfidenceInterval - ' - Me.chkConfidenceInterval.AutoSize = True - Me.chkConfidenceInterval.Location = New System.Drawing.Point(49, 36) - Me.chkConfidenceInterval.Name = "chkConfidenceInterval" - Me.chkConfidenceInterval.Size = New System.Drawing.Size(118, 17) - Me.chkConfidenceInterval.TabIndex = 1 - Me.chkConfidenceInterval.Tag = "Confidence_Interval" - Me.chkConfidenceInterval.Text = "Confidence Interval" - Me.chkConfidenceInterval.UseVisualStyleBackColor = True + 'nudGraphicsCLevel + ' + Me.nudGraphicsCLevel.DecimalPlaces = 2 + Me.nudGraphicsCLevel.Increment = New Decimal(New Integer() {1, 0, 0, 131072}) + Me.nudGraphicsCLevel.Location = New System.Drawing.Point(167, 56) + Me.nudGraphicsCLevel.Maximum = New Decimal(New Integer() {1, 0, 0, 0}) + Me.nudGraphicsCLevel.Name = "nudGraphicsCLevel" + Me.nudGraphicsCLevel.Size = New System.Drawing.Size(46, 20) + Me.nudGraphicsCLevel.TabIndex = 3 + Me.nudGraphicsCLevel.Value = New Decimal(New Integer() {95, 0, 0, 131072}) + ' + 'lblGraphicsCLevel + ' + Me.lblGraphicsCLevel.AutoSize = True + Me.lblGraphicsCLevel.Location = New System.Drawing.Point(71, 58) + Me.lblGraphicsCLevel.Name = "lblGraphicsCLevel" + Me.lblGraphicsCLevel.Size = New System.Drawing.Size(90, 13) + Me.lblGraphicsCLevel.TabIndex = 2 + Me.lblGraphicsCLevel.Tag = "Confidence_Level" + Me.lblGraphicsCLevel.Text = "Confidence Level" + ' + 'chkGraphicsCLimits + ' + Me.chkGraphicsCLimits.AutoSize = True + Me.chkGraphicsCLimits.Location = New System.Drawing.Point(49, 36) + Me.chkGraphicsCLimits.Name = "chkGraphicsCLimits" + Me.chkGraphicsCLimits.Size = New System.Drawing.Size(109, 17) + Me.chkGraphicsCLimits.TabIndex = 1 + Me.chkGraphicsCLimits.Tag = "Confidence_Limits" + Me.chkGraphicsCLimits.Text = "Confidence Limits" + Me.chkGraphicsCLimits.UseVisualStyleBackColor = True ' 'grpResiduals ' Me.grpResiduals.Controls.Add(Me.chkFourinOne) - Me.grpResiduals.Controls.Add(Me.chkAdditionalVariable) Me.grpResiduals.Location = New System.Drawing.Point(16, 6) Me.grpResiduals.Name = "grpResiduals" - Me.grpResiduals.Size = New System.Drawing.Size(219, 68) + Me.grpResiduals.Size = New System.Drawing.Size(219, 46) Me.grpResiduals.TabIndex = 0 Me.grpResiduals.TabStop = False Me.grpResiduals.Tag = "Residuals" @@ -263,40 +258,18 @@ Partial Class sdgSimpleRegOptions Me.chkFourinOne.Text = "Four in One" Me.chkFourinOne.UseVisualStyleBackColor = True ' - 'chkAdditionalVariable - ' - Me.chkAdditionalVariable.AutoSize = True - Me.chkAdditionalVariable.Location = New System.Drawing.Point(19, 42) - Me.chkAdditionalVariable.Name = "chkAdditionalVariable" - Me.chkAdditionalVariable.Size = New System.Drawing.Size(127, 17) - Me.chkAdditionalVariable.TabIndex = 1 - Me.chkAdditionalVariable.Tag = "vs_Additional_Variable" - Me.chkAdditionalVariable.Text = "vs Additional Variable" - Me.chkAdditionalVariable.UseVisualStyleBackColor = True - ' 'ucrSdgButtons ' - Me.ucrSdgButtons.Location = New System.Drawing.Point(41, 242) + Me.ucrSdgButtons.Location = New System.Drawing.Point(41, 201) Me.ucrSdgButtons.Name = "ucrSdgButtons" Me.ucrSdgButtons.Size = New System.Drawing.Size(142, 30) Me.ucrSdgButtons.TabIndex = 0 ' - 'chkStandardError - ' - Me.chkStandardError.AutoSize = True - Me.chkStandardError.Location = New System.Drawing.Point(74, 77) - Me.chkStandardError.Name = "chkStandardError" - Me.chkStandardError.Size = New System.Drawing.Size(94, 17) - Me.chkStandardError.TabIndex = 5 - Me.chkStandardError.Tag = "Standard_Error" - Me.chkStandardError.Text = "Standard Error" - Me.chkStandardError.UseVisualStyleBackColor = True - ' 'sdgSimpleRegOptions ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(266, 271) + Me.ClientSize = New System.Drawing.Size(255, 233) Me.Controls.Add(Me.tbRegOptions) Me.Controls.Add(Me.ucrSdgButtons) Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow @@ -306,11 +279,11 @@ Partial Class sdgSimpleRegOptions Me.tbRegOptions.ResumeLayout(False) Me.tbDisplay.ResumeLayout(False) Me.tbDisplay.PerformLayout() - CType(Me.nudConfidenceInteval, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.nudDisplayCLevel, System.ComponentModel.ISupportInitialize).EndInit() Me.tbGraphics.ResumeLayout(False) Me.grpModel.ResumeLayout(False) Me.grpModel.PerformLayout() - CType(Me.nudConvidenceLevel, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.nudGraphicsCLevel, System.ComponentModel.ISupportInitialize).EndInit() Me.grpResiduals.ResumeLayout(False) Me.grpResiduals.PerformLayout() Me.ResumeLayout(False) @@ -320,22 +293,20 @@ Partial Class sdgSimpleRegOptions Friend WithEvents ucrSdgButtons As ucrButtonsSubdialogue Friend WithEvents tbRegOptions As TabControl Friend WithEvents tbDisplay As TabPage - Friend WithEvents nudConfidenceInteval As NumericUpDown - Friend WithEvents lblConfidenceInterval As Label - Friend WithEvents chkEstimatesPvalues As CheckBox + Friend WithEvents nudDisplayCLevel As NumericUpDown + Friend WithEvents lblDisplayCLevel As Label Friend WithEvents chkEstimates As CheckBox - Friend WithEvents chkAnovaPvalues As CheckBox - Friend WithEvents chkAnovaTable As CheckBox + Friend WithEvents chkPvalues As CheckBox + Friend WithEvents chkANOVA As CheckBox Friend WithEvents tbGraphics As TabPage Friend WithEvents grpModel As GroupBox Friend WithEvents grpResiduals As GroupBox Friend WithEvents chkFittedModel As CheckBox Friend WithEvents chkPredictionInterval As CheckBox - Friend WithEvents nudConvidenceLevel As NumericUpDown - Friend WithEvents lblConfidenceLevel As Label - Friend WithEvents chkConfidenceInterval As CheckBox + Friend WithEvents nudGraphicsCLevel As NumericUpDown + Friend WithEvents lblGraphicsCLevel As Label + Friend WithEvents chkGraphicsCLimits As CheckBox Friend WithEvents chkFourinOne As CheckBox - Friend WithEvents chkAdditionalVariable As CheckBox Friend WithEvents chkModel As CheckBox - Friend WithEvents chkStandardError As CheckBox + Friend WithEvents chkDisplayCLimits As CheckBox End Class diff --git a/instat/sdgSimpleRegOptions.vb b/instat/sdgSimpleRegOptions.vb index 44ae839d9d2..2b45bac3403 100644 --- a/instat/sdgSimpleRegOptions.vb +++ b/instat/sdgSimpleRegOptions.vb @@ -13,22 +13,21 @@ ' ' You should have received a copy of the GNU General Public License k ' along with this program. If not, see . -Imports instat.Translations +Imports instat.Translations Public Class sdgSimpleRegOptions - Public clsRModelFunction As RFunction - Public clsRGraphics, clsRFittedModelGraphics, clsRFittedModelGraphics2 As New RSyntax + Public clsRModelFunction As RFunction + Public clsRGraphics, clsRFittedModelGraphics, clsRFittedModelGraphics2 As New RSyntax Public clsRaovFunction, clsRaovpvalFunction, clsRestpvalFunction, clsRFourPlotsFunction, clsRgeom_point As New RFunction - Public clsRggplotFunction, clsRaesFunction, clsRStat_smooth As New RFunction - Public bFirstLoad As Boolean = True - 'Public clsRStat_smooth As New RFunction - + Public clsRggplotFunction, clsRaesFunction, clsRStat_smooth, clsRModelsFunction, clsRCIFunction As New RFunction + Public bFirstLoad As Boolean = True + Private Sub sdgSimpleRegOptions_Load(sender As Object, e As EventArgs) Handles MyBase.Load autoTranslate(Me) - If bFirstLoad Then - SetDefaults() - bFirstLoad = False - End If + If bFirstLoad Then + SetDefaults() + bFirstLoad = False + End If End Sub Public Sub SetRModelFunction(clsRModelFunc As RFunction) @@ -36,29 +35,20 @@ Public Class sdgSimpleRegOptions End Sub Private Sub AnovaTable() - clsRaovFunction.SetRCommand("aov") - clsRaovFunction.AddParameter("", clsRFunctionParameter:=clsRModelFunction) + 'p-values should be false here + clsRaovFunction.SetRCommand("anova") + clsRaovFunction.AddParameter("", clsRFunctionParameter:=dlgRegressionSimple.ucrBase.clsRsyntax.clsBaseFunction) frmMain.clsRLink.RunScript(clsRaovFunction.ToScript(), 2) End Sub Private Sub AnovaTablePvalues() - clsRaovpvalFunction.SetRCommand("summary") - clsRaovpvalFunction.AddParameter("", clsRFunctionParameter:=clsRaovFunction) + clsRaovpvalFunction.SetRCommand("anova") + clsRaovpvalFunction.AddParameter("", clsRFunctionParameter:=dlgRegressionSimple.ucrBase.clsRsyntax.clsBaseFunction) frmMain.clsRLink.RunScript(clsRaovpvalFunction.ToScript(), 2) End Sub - 'Private Sub AnovaTablePvalues() - ' clsRaovpvalFunction.SetRCommand("summary") - ' clsRaovpvalFunction.AddParameter("", clsRFunctionParameter:=clsRaovFunction) - - ' clsRaovpval2Function.SetRCommand("HTML") - ' clsRaovpval2Function.AddParameter("x", clsRFunctionParameter:=clsRaovpvalFunction) - ' clsRaovpval2Function.AddParameter("nsmall", "c(3,1)") - ' clsRaovpval2Function.AddParameter("file", Chr(34) & Chr(34)) - ' frmMain.clsRLink.RunScript(clsRaovpval2Function.ToScript(), 1) - 'End Sub - Private Sub Estimates() + 'p-values should be false here frmMain.clsRLink.RunScript(dlgRegressionSimple.ucrBase.clsRsyntax.clsBaseFunction.ToScript(), 2) End Sub @@ -69,10 +59,9 @@ Public Class sdgSimpleRegOptions End Sub Private Sub Model() - 'I am not sure what should be output when model is checked. - 'There is an option lm$model which outputs the input variables which I think is not correct - 'For now it has the lm just like Estimates() - frmMain.clsRLink.RunScript(dlgRegressionSimple.ucrBase.clsRsyntax.clsBaseFunction.ToScript(), 2) + clsRModelsFunction.SetRCommand("formula") + clsRModelsFunction.AddParameter("", clsRFunctionParameter:=dlgRegressionSimple.ucrBase.clsRsyntax.clsBaseFunction) + frmMain.clsRLink.RunScript(clsRModelsFunction.ToScript(), 2) End Sub Private Sub FourPlots() @@ -82,8 +71,8 @@ Public Class sdgSimpleRegOptions clsRFourPlotsFunction.AddParameter("ncol", 2) 'these should be an option by the user as either 2 by 2, 4 by 1 or 1 by 4 clsRgeom_point.SetRCommand("geom_point") clsRGraphics.SetOperatorParameter(True, clsRFunc:=clsRFourPlotsFunction) - clsRGraphics.SetOperatorParameter(False, clsRFunc:=clsRgeom_point) - + clsRGraphics.SetOperatorParameter(False, clsRFunc:=clsRgeom_point) + frmMain.clsRLink.RunScript(clsRGraphics.GetScript, 0) End Sub @@ -93,19 +82,15 @@ Public Class sdgSimpleRegOptions clsRggplotFunction.AddParameter("", clsRFunctionParameter:=dlgRegressionSimple.ucrBase.clsRsyntax.clsBaseFunction) clsRaesFunction.SetRCommand("aes") 'this is not the right way of adding the aesthetics x and y since we are using the lm object - clsRaesFunction.AddParameter("y", dlgRegressionSimple.ucrResponse.GetVariableNames(bWithQuotes:=False)) - clsRaesFunction.AddParameter("x", dlgRegressionSimple.ucrExplanatory.GetVariableNames(bWithQuotes:=False)) + clsRaesFunction.AddParameter("y", dlgRegressionSimple.ucrResponse.GetVariableNames(bWithQuotes:=False)) + clsRaesFunction.AddParameter("x", dlgRegressionSimple.ucrExplanatory.GetVariableNames(bWithQuotes:=False)) clsRggplotFunction.AddParameter("mapping", clsRFunctionParameter:=clsRaesFunction) clsRgeom_point.SetRCommand("geom_point") clsRFittedModelGraphics.SetOperatorParameter(True, clsRFunc:=clsRggplotFunction) clsRFittedModelGraphics.SetOperatorParameter(False, clsRFunc:=clsRgeom_point) - - 'Public clsRStat_smooth As New RFunction - clsRStat_smooth.SetRCommand("stat_smooth") - clsRStat_smooth.AddParameter("method", "lm") - StandardError() - clsRStat_smooth.AddParameter("level", nudConvidenceLevel.Value) + clsRStat_smooth.AddParameter("method", Chr(34) & "lm" & Chr(34)) + GraphicsConfidenceSE() clsRFittedModelGraphics.AddOperatorParameter("", clsRFunc:=clsRStat_smooth) 'need to factor in prediction interval @@ -113,131 +98,139 @@ Public Class sdgSimpleRegOptions End Sub + Private Sub ConfidenceInterval() + clsRCIFunction.SetRCommand("confint") + clsRCIFunction.AddParameter("object", clsRFunctionParameter:=dlgRegressionSimple.ucrBase.clsRsyntax.clsBaseFunction) + DisplayConfidence() + frmMain.clsRLink.RunScript(clsRCIFunction.ToScript(), 2) + End Sub + Public Sub SetDefaults() - chkAnovaTable.Checked = False - chkAnovaPvalues.Checked = False - chkAnovaPvalues.Enabled = False - chkEstimatesPvalues.Checked = False - chkEstimatesPvalues.Enabled = False + chkANOVA.Checked = True + chkModel.Checked = True + chkEstimates.Checked = True + chkPvalues.Enabled = True + chkPvalues.Checked = True chkPredictionInterval.Enabled = False - chkConfidenceInterval.Checked = False - chkStandardError.Checked = False - chkStandardError.Enabled = False - chkConfidenceInterval.Enabled = False - lblConfidenceLevel.Enabled = False - nudConvidenceLevel.Enabled = False + chkGraphicsCLimits.Checked = False + chkGraphicsCLimits.Enabled = False + lblGraphicsCLevel.Enabled = False + nudGraphicsCLevel.Enabled = False chkPredictionInterval.Enabled = False chkPredictionInterval.Checked = False chkFittedModel.Checked = False chkFourinOne.Checked = False - chkAdditionalVariable.Checked = False - End Sub - - Private Sub chkAnovaTable_CheckedChanged(sender As Object, e As EventArgs) Handles chkAnovaTable.CheckedChanged - If (chkAnovaTable.Checked) Then - chkAnovaPvalues.Enabled = True - chkEstimates.Checked = False 'should we run one command at a time? - chkModel.Checked = False - Else - chkAnovaPvalues.Enabled = False - End If + chkDisplayCLimits.Checked = True + lblDisplayCLevel.Enabled = True + nudDisplayCLevel.Enabled = True End Sub - Private Sub StandardError() - If (chkStandardError.Checked = True) Then - clsRStat_smooth.AddParameter("se", "TRUE") - ElseIf (chkStandardError.Checked = False) Then - clsRStat_smooth.AddParameter("se", "FALSE") + Private Sub pvalues() + If (chkANOVA.Checked Or chkEstimates.Checked) Then + chkPvalues.Enabled = True Else - clsRStat_smooth.RemoveParameterByName("se") + 'chkPvalues.Checked = False + chkPvalues.Enabled = False End If End Sub - Private Sub chkEstimates_CheckedChanged(sender As Object, e As EventArgs) Handles chkEstimates.CheckedChanged - If (chkEstimates.Checked) Then - chkEstimatesPvalues.Enabled = True - chkAnovaTable.Checked = False - chkModel.Checked = False - Else - chkEstimatesPvalues.Enabled = False - End If + Private Sub chkanovatable_checkedchanged(sender As Object, e As EventArgs) Handles chkANOVA.CheckedChanged + pvalues() End Sub - Private Sub chkModel_CheckedChanged(sender As Object, e As EventArgs) Handles chkModel.CheckedChanged - If (chkModel.Checked) Then - chkAnovaTable.Checked = False - chkEstimates.Checked = False - End If + Private Sub chkestimates_checkedchanged(sender As Object, e As EventArgs) Handles chkEstimates.CheckedChanged + pvalues() End Sub Private Sub chkFittedModel_CheckedChanged(sender As Object, e As EventArgs) Handles chkFittedModel.CheckedChanged - 'chkConfidenceInterval.Checked = True If (chkFittedModel.Checked) Then chkPredictionInterval.Enabled = True - chkConfidenceInterval.Enabled = True - chkConfidenceInterval.Checked = True + chkGraphicsCLimits.Enabled = True + chkGraphicsCLimits.Checked = True Else chkPredictionInterval.Enabled = False - chkConfidenceInterval.Checked = False - chkConfidenceInterval.Enabled = False + chkGraphicsCLimits.Checked = False + chkGraphicsCLimits.Enabled = False End If End Sub - Private Sub chkAdditionalVariable_CheckedChanged(sender As Object, e As EventArgs) Handles chkAdditionalVariable.CheckedChanged - chkFourinOne.Checked = False + Private Sub chkGraphicsCLimits_CheckedChanged(sender As Object, e As EventArgs) Handles chkGraphicsCLimits.CheckedChanged + If (chkGraphicsCLimits.Checked) Then + lblGraphicsCLevel.Enabled = True + nudGraphicsCLevel.Enabled = True + chkPredictionInterval.Checked = False + Else + lblGraphicsCLevel.Enabled = False + nudGraphicsCLevel.Enabled = False + End If End Sub - Private Sub chkConfidenceInterval_CheckedChanged(sender As Object, e As EventArgs) Handles chkConfidenceInterval.CheckedChanged - If (chkConfidenceInterval.Checked) Then - lblConfidenceLevel.Enabled = True - nudConvidenceLevel.Enabled = True - chkPredictionInterval.Checked = False - chkStandardError.Enabled = True - chkStandardError.Checked = True + Private Sub GraphicsConfidenceSE() + If (chkGraphicsCLimits.Checked = True) Then + clsRStat_smooth.AddParameter("se", "TRUE") + clsRStat_smooth.AddParameter("level", nudGraphicsCLevel.Value) + ElseIf (chkGraphicsCLimits.Checked = False) Then + clsRStat_smooth.AddParameter("se", "FALSE") + clsRStat_smooth.RemoveParameterByName("level") + Else + clsRStat_smooth.RemoveParameterByName("se") + clsRStat_smooth.RemoveParameterByName("level") + End If + End Sub + Private Sub chkDisplayCLimits_CheckedChanged(sender As Object, e As EventArgs) Handles chkDisplayCLimits.CheckedChanged + If (chkDisplayCLimits.Checked) Then + lblDisplayCLevel.Enabled = True + nudDisplayCLevel.Enabled = True Else - lblConfidenceLevel.Enabled = False - nudConvidenceLevel.Enabled = False - chkStandardError.Checked = False - chkStandardError.Enabled = False + lblDisplayCLevel.Enabled = False + nudDisplayCLevel.Enabled = False End If End Sub - Private Sub chkPredictionInterval_CheckedChanged(sender As Object, e As EventArgs) Handles chkPredictionInterval.CheckedChanged - If (chkPredictionInterval.Checked) Then - chkConfidenceInterval.Checked = False + Private Sub DisplayConfidence() + If (chkDisplayCLimits.Checked = True) Then + clsRCIFunction.AddParameter("level", nudDisplayCLevel.Value) + ElseIf (chkDisplayCLimits.Checked = False) Then + clsRCIFunction.AddParameter("level", "") + Else + clsRCIFunction.RemoveParameterByName("level") End If End Sub - Private Sub chkFourinOne_CheckedChanged(sender As Object, e As EventArgs) Handles chkFourinOne.CheckedChanged - chkAdditionalVariable.Checked = False + Private Sub chkPredictionInterval_CheckedChanged(sender As Object, e As EventArgs) Handles chkPredictionInterval.CheckedChanged + If (chkPredictionInterval.Checked) Then + chkGraphicsCLimits.Checked = False + End If End Sub Public Sub RegOptions() - If (chkAnovaTable.Checked) Then - If (chkAnovaPvalues.Checked) Then + If (chkANOVA.Checked) Then + If (chkPvalues.Checked) Then AnovaTablePvalues() Else AnovaTable() End If - ElseIf (chkEstimates.Checked) Then - - If (chkEstimatesPvalues.Checked) Then + End If + If (chkEstimates.Checked) Then + If (chkPvalues.Checked) Then EstimatesPvalues() Else Estimates() End If - ElseIf (chkModel.Checked) + End If + If (chkModel.Checked) Then Model() - ElseIf (chkFourinOne.Checked) Then + End If + If (chkDisplayCLimits.Checked) Then + ConfidenceInterval() + End If + If (chkFourinOne.Checked) Then FourPlots() - ElseIf (chkAdditionalVariable.Checked) Then - - ElseIf (chkFittedModel.Checked) Then + End If + If (chkFittedModel.Checked) Then FittedModel() - Else - End If End Sub End Class \ No newline at end of file diff --git a/instat/sdgThemeOptions.Designer.vb b/instat/sdgThemeOptions.Designer.vb new file mode 100644 index 00000000000..955b4f1f747 --- /dev/null +++ b/instat/sdgThemeOptions.Designer.vb @@ -0,0 +1,50 @@ + _ +Partial Class sdgThemeOptions + Inherits System.Windows.Forms.Form + + 'Form overrides dispose to clean up the component list. + _ + Protected Overrides Sub Dispose(ByVal disposing As Boolean) + Try + If disposing AndAlso components IsNot Nothing Then + components.Dispose() + End If + Finally + MyBase.Dispose(disposing) + End Try + 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() + Me.ucrBaseSdgThemeOptions = New instat.ucrButtonsSubdialogue() + Me.SuspendLayout() + ' + 'ucrBaseSdgThemeOptions + ' + Me.ucrBaseSdgThemeOptions.Location = New System.Drawing.Point(59, 213) + Me.ucrBaseSdgThemeOptions.Name = "ucrBaseSdgThemeOptions" + Me.ucrBaseSdgThemeOptions.Size = New System.Drawing.Size(142, 30) + Me.ucrBaseSdgThemeOptions.TabIndex = 0 + ' + 'sdgThemeOptions + ' + Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) + Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.ClientSize = New System.Drawing.Size(307, 267) + Me.Controls.Add(Me.ucrBaseSdgThemeOptions) + Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow + Me.Name = "sdgThemeOptions" + Me.Tag = "Theme_Options" + Me.Text = "Theme Options" + Me.ResumeLayout(False) + + End Sub + + Friend WithEvents ucrBaseSdgThemeOptions As ucrButtonsSubdialogue +End Class diff --git a/instat/sdgThemeOptions.fr-FR.resx b/instat/sdgThemeOptions.fr-FR.resx new file mode 100644 index 00000000000..a3df4f013d3 --- /dev/null +++ b/instat/sdgThemeOptions.fr-FR.resx @@ -0,0 +1,15 @@ + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/instat/sdgThemeOptions.resx b/instat/sdgThemeOptions.resx new file mode 100644 index 00000000000..1af7de150c9 --- /dev/null +++ b/instat/sdgThemeOptions.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/instat/sdgThemeOptions.sw-KE.resx b/instat/sdgThemeOptions.sw-KE.resx new file mode 100644 index 00000000000..a3df4f013d3 --- /dev/null +++ b/instat/sdgThemeOptions.sw-KE.resx @@ -0,0 +1,15 @@ + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/instat/sdgThemeOptions.vb b/instat/sdgThemeOptions.vb new file mode 100644 index 00000000000..7799e87e87f --- /dev/null +++ b/instat/sdgThemeOptions.vb @@ -0,0 +1,3 @@ +Public Class sdgThemeOptions + +End Class \ No newline at end of file diff --git a/instat/static/InstatObject/R/Rsetup.R b/instat/static/InstatObject/R/Rsetup.R index a498b14977d..7e474ada7c4 100644 --- a/instat/static/InstatObject/R/Rsetup.R +++ b/instat/static/InstatObject/R/Rsetup.R @@ -7,4 +7,6 @@ library(ggplot2) library(extRemes) # TODO do we need reshape? It causes conflicts with reshape2 but this can be avoided if reshape is really needed #library(reshape) -library(ggfortify) \ No newline at end of file +library(ggfortify) +library(GGally) +library(CCA) \ No newline at end of file diff --git a/instat/static/InstatObject/R/instat_object.R b/instat/static/InstatObject/R/instat_object.R index ec287c1726f..595cd757198 100644 --- a/instat/static/InstatObject/R/instat_object.R +++ b/instat/static/InstatObject/R/instat_object.R @@ -268,13 +268,18 @@ instat_obj$methods(add_model = function(model, model_name = paste("model",length ) instat_obj$methods(get_model = function(model_name) { - if(missing(model_name)) stop("model_name is required") + if(missing(model_name)) stop("model_name must be given.") if(!is.character(model_name)) stop("name must be a character") if(!model_name %in% names(models)) stop(model_name, "not found in models") models[[model_name]] } ) +instat_obj$methods(get_model_names = function() { + return(names(models)) +} +) + instat_obj$methods(replace_value_in_data = function(data_name, col_name, index, new_value) { if(!is.character(data_name)) stop("data_name must be of type character") if(!data_name %in% names(data_objects)) stop(paste("dataframe: ", data_name, " not found")) diff --git a/instat/ucrDataFrame.vb b/instat/ucrDataFrame.vb index 3eac83693bd..9a32dc6b129 100644 --- a/instat/ucrDataFrame.vb +++ b/instat/ucrDataFrame.vb @@ -22,11 +22,9 @@ Public Class ucrDataFrame Public strCurrDataFrame As String = "" Private Sub ucrDataFrame_Load(sender As Object, e As EventArgs) Handles MyBase.Load + frmMain.clsRLink.FillComboDataFrames(cboAvailableDataFrames, bFirstLoad) If bFirstLoad Then - frmMain.clsRLink.FillComboDataFrames(cboAvailableDataFrames, True) bFirstLoad = False - Else - frmMain.clsRLink.FillComboDataFrames(cboAvailableDataFrames, False) End If SetDataFrameProperties() End Sub diff --git a/instat/ucrInput.vb b/instat/ucrInput.vb index e6a0d4be74a..af0819580af 100644 --- a/instat/ucrInput.vb +++ b/instat/ucrInput.vb @@ -1,4 +1,20 @@ -Public Class ucrInput +' 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 . + +Public Class ucrInput Protected bUserTyped As Boolean = False Public Event NameChanged() Protected strValidationType As String = "None" @@ -14,6 +30,10 @@ Public Overridable Sub SetName(strName As String) End Sub + Public Overridable Function GetText() As String + Return "" + End Function + Public Overridable Sub Reset() bUserTyped = False End Sub @@ -34,6 +54,10 @@ strDefaultType = "Data Frame" End Sub + Public Sub SetDefaultTypeAsGraph() + strDefaultType = "Graph" + End Sub + Public Sub SetValidationTypeAsRVariable() strValidationType = "RVariable" End Sub @@ -51,15 +75,17 @@ End Sub Public Sub SetDefaultName() - If strDefaultType = "Column" AndAlso (ucrDataFrameSelector IsNot Nothing) Then - SetName(frmMain.clsRLink.GetDefaultColumnNames(strDefaultPrefix, ucrDataFrameSelector.cboAvailableDataFrames.Text)) - ElseIf strDefaultType = "Model" Then - ElseIf strDefaultType = "Data Frame" Then + If strDefaultPrefix <> "" Then + If strDefaultType = "Column" AndAlso (ucrDataFrameSelector IsNot Nothing) Then + SetName(frmMain.clsRLink.GetDefaultColumnNames(strDefaultPrefix, ucrDataFrameSelector.cboAvailableDataFrames.Text)) + ElseIf strDefaultType = "Model" Then + ElseIf strDefaultType = "Data Frame" Then + ElseIf strDefaultType = "Graph" Then + End If End If End Sub - Public Sub SetValidationTypeAsNumeric(Optional dcmMin As Decimal = Decimal.MinValue, Optional bIncludeMin As Boolean = True, Optional dcmMax As Decimal = Decimal.MaxValue, Optional bIncludeMax As Boolean = True) strValidationType = "Numeric" If dcmMin <> Decimal.MinValue Then @@ -93,7 +119,7 @@ End If End If End If - Return strRange + Return strRange End Function Public Sub SetValidationTypeAsList() @@ -125,12 +151,10 @@ Return iType End Function - Public Sub ValidateText(strText As String, Optional ctrInputControl As Control = Nothing) + Public Function ValidateText(strText As String) As Boolean Dim iValidationCode As Integer - Dim bControlGiven As Boolean iValidationCode = GetValidationCode(strText) - bControlGiven = (ctrInputControl IsNot Nothing) Select Case iValidationCode Case 0 @@ -171,10 +195,8 @@ MsgBox("This name contains an invalid character", vbOKOnly) End Select End Select - If iValidationCode > 0 AndAlso bControlGiven Then - ctrInputControl.Focus() - End If - End Sub + Return (iValidationCode = 0) + End Function 'Returns integer as code for validation ' 0 : string is valid diff --git a/instat/ucrInputComboBox.vb b/instat/ucrInputComboBox.vb index 7891b5db789..6b43f3bf365 100644 --- a/instat/ucrInputComboBox.vb +++ b/instat/ucrInputComboBox.vb @@ -1,7 +1,25 @@ -Public Class ucrInputComboBox +' 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 . +Imports System.ComponentModel + +Public Class ucrInputComboBox Dim strItemsType As String = "" - Private Sub cboInput_Leave(sender As Object, e As EventArgs) Handles cboInput.Leave - ValidateText(cboInput.Text, cboInput) + + Private Sub cboInput_Validating(sender As Object, e As CancelEventArgs) Handles cboInput.Validating + e.Cancel = Not ValidateText(cboInput.Text) End Sub Public Sub SetItemsTypeAsColumns() @@ -19,6 +37,11 @@ FillItemTypes() End Sub + Public Sub SetItemsTypeAsGraphs() + strItemsType = "Graphs" + FillItemTypes() + End Sub + Private Sub FillItemTypes() Select Case strItemsType Case "Columns" @@ -27,6 +50,8 @@ End If Case "Data Frames" Case "Models" + cboInput.Items.Add(frmMain.clsRLink.GetModelNames().ToArray) + Case "Graphs" End Select End Sub @@ -35,14 +60,16 @@ End Sub Public Overrides Sub SetName(strName As String) - If IsValid(strName) Then + If ValidateText(strName) Then cboInput.Text = strName OnNameChanged() - Else - MsgBox(strName & "is not a valid for this combobox", vbOKOnly) End If End Sub + Public Overrides Function GetText() As String + Return cboInput.Text + End Function + Public Sub AddItems(strItems As String()) cboInput.Items.AddRange(strItems) End Sub diff --git a/instat/ucrInputConfidenceLimit.vb b/instat/ucrInputConfidenceLimit.vb index db0d787832b..4d40e3e91e1 100644 --- a/instat/ucrInputConfidenceLimit.vb +++ b/instat/ucrInputConfidenceLimit.vb @@ -1,4 +1,19 @@ -Public Class ucrInputConfidenceLimit +' 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 . +Public Class ucrInputConfidenceLimit Public Event NameChanged() Private Sub ucrConfidenceLimit_NameChanged() Handles ucrConfidenceLimit.NameChanged RaiseEvent NameChanged() diff --git a/instat/ucrInputTextBox.vb b/instat/ucrInputTextBox.vb index dacd9d05ae3..7237a3f562d 100644 --- a/instat/ucrInputTextBox.vb +++ b/instat/ucrInputTextBox.vb @@ -1,10 +1,25 @@ -Public Class ucrInputTextBox +' 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 . +Imports System.ComponentModel + +Public Class ucrInputTextBox Public Overrides Sub SetName(strName As String) - If IsValid(strName) Then + If ValidateText(strName) Then txtInput.Text = strName OnNameChanged() - Else - MsgBox(strName & "is not a valid for this textbox", vbOKOnly) End If End Sub @@ -12,9 +27,11 @@ bUserTyped = True End Sub - Private Sub txtInput_Leave(sender As Object, e As EventArgs) Handles txtInput.Leave - ValidateText(txtInput.Text, txtInput) + Private Sub txtInput_Validating(sender As Object, e As CancelEventArgs) Handles txtInput.Validating + e.Cancel = Not ValidateText(txtInput.Text) End Sub - + Public Overrides Function GetText() As String + Return txtInput.Text + End Function End Class diff --git a/instat/ucrSaveGraph.Designer.vb b/instat/ucrSaveGraph.Designer.vb new file mode 100644 index 00000000000..0f0d3e87baa --- /dev/null +++ b/instat/ucrSaveGraph.Designer.vb @@ -0,0 +1,62 @@ + _ +Partial Class ucrSaveGraph + Inherits System.Windows.Forms.UserControl + + 'UserControl overrides dispose to clean up the component list. + _ + Protected Overrides Sub Dispose(ByVal disposing As Boolean) + Try + If disposing AndAlso components IsNot Nothing Then + components.Dispose() + End If + Finally + MyBase.Dispose(disposing) + End Try + 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() + Me.ucrInputGraphName = New instat.ucrInputComboBox() + Me.chkSaveGraph = New System.Windows.Forms.CheckBox() + Me.SuspendLayout() + ' + 'ucrInputGraphName + ' + Me.ucrInputGraphName.Location = New System.Drawing.Point(86, 3) + Me.ucrInputGraphName.Name = "ucrInputGraphName" + Me.ucrInputGraphName.Size = New System.Drawing.Size(176, 25) + Me.ucrInputGraphName.TabIndex = 0 + ' + 'chkSaveGraph + ' + Me.chkSaveGraph.AutoSize = True + Me.chkSaveGraph.Location = New System.Drawing.Point(3, 5) + Me.chkSaveGraph.Name = "chkSaveGraph" + Me.chkSaveGraph.Size = New System.Drawing.Size(83, 17) + Me.chkSaveGraph.TabIndex = 1 + Me.chkSaveGraph.Tag = "Save_Graph" + Me.chkSaveGraph.Text = "Save Graph" + Me.chkSaveGraph.UseVisualStyleBackColor = True + ' + 'ucrSaveGraph + ' + Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) + Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.Controls.Add(Me.chkSaveGraph) + Me.Controls.Add(Me.ucrInputGraphName) + Me.Name = "ucrSaveGraph" + Me.Size = New System.Drawing.Size(265, 27) + Me.ResumeLayout(False) + Me.PerformLayout() + + End Sub + + Friend WithEvents ucrInputGraphName As ucrInputComboBox + Friend WithEvents chkSaveGraph As CheckBox +End Class diff --git a/instat/ucrSaveGraph.fr-FR.resx b/instat/ucrSaveGraph.fr-FR.resx new file mode 100644 index 00000000000..a3df4f013d3 --- /dev/null +++ b/instat/ucrSaveGraph.fr-FR.resx @@ -0,0 +1,15 @@ + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/instat/ucrSaveGraph.resx b/instat/ucrSaveGraph.resx new file mode 100644 index 00000000000..1af7de150c9 --- /dev/null +++ b/instat/ucrSaveGraph.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/instat/ucrSaveGraph.sw-KE.resx b/instat/ucrSaveGraph.sw-KE.resx new file mode 100644 index 00000000000..a3df4f013d3 --- /dev/null +++ b/instat/ucrSaveGraph.sw-KE.resx @@ -0,0 +1,15 @@ + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/instat/ucrSaveGraph.vb b/instat/ucrSaveGraph.vb new file mode 100644 index 00000000000..4efebda40c5 --- /dev/null +++ b/instat/ucrSaveGraph.vb @@ -0,0 +1,16 @@ +Public Class ucrSaveGraph + Public Event CheckedChanged(bChecked As Boolean) + Private Sub ucrSaveGraph_Load(sender As Object, e As EventArgs) Handles MyBase.Load + ucrInputGraphName.SetDefaultTypeAsGraph() + ucrInputGraphName.SetItemsTypeAsGraphs() + End Sub + + Private Sub chkSaveGraph_CheckedChanged(sender As Object, e As EventArgs) Handles chkSaveGraph.CheckedChanged + If chkSaveGraph.Checked Then + ucrInputGraphName.Visible = True + Else + ucrInputGraphName.Visible = False + End If + RaiseEvent CheckedChanged(chkSaveGraph.Checked) + End Sub +End Class diff --git a/instat/ucrSaveModel.Designer.vb b/instat/ucrSaveModel.Designer.vb new file mode 100644 index 00000000000..ef7c1874d3e --- /dev/null +++ b/instat/ucrSaveModel.Designer.vb @@ -0,0 +1,63 @@ + _ +Partial Class ucrSaveModel + Inherits System.Windows.Forms.UserControl + + 'UserControl overrides dispose to clean up the component list. + _ + Protected Overrides Sub Dispose(ByVal disposing As Boolean) + Try + If disposing AndAlso components IsNot Nothing Then + components.Dispose() + End If + Finally + MyBase.Dispose(disposing) + End Try + 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() + Me.chkSaveModel = New System.Windows.Forms.CheckBox() + Me.ucrInputModelName = New instat.ucrInputComboBox() + Me.SuspendLayout() + ' + 'chkSaveModel + ' + Me.chkSaveModel.AutoSize = True + Me.chkSaveModel.Location = New System.Drawing.Point(3, 5) + Me.chkSaveModel.Name = "chkSaveModel" + Me.chkSaveModel.Size = New System.Drawing.Size(83, 17) + Me.chkSaveModel.TabIndex = 1 + Me.chkSaveModel.Tag = "Save_Model" + Me.chkSaveModel.Text = "Save Model" + Me.chkSaveModel.UseVisualStyleBackColor = True + ' + 'ucrInputModelName + ' + Me.ucrInputModelName.Location = New System.Drawing.Point(86, 3) + Me.ucrInputModelName.Margin = New System.Windows.Forms.Padding(0) + Me.ucrInputModelName.Name = "ucrInputModelName" + Me.ucrInputModelName.Size = New System.Drawing.Size(176, 25) + Me.ucrInputModelName.TabIndex = 0 + ' + 'ucrSaveModel + ' + Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) + Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.Controls.Add(Me.chkSaveModel) + Me.Controls.Add(Me.ucrInputModelName) + Me.Name = "ucrSaveModel" + Me.Size = New System.Drawing.Size(265, 27) + Me.ResumeLayout(False) + Me.PerformLayout() + + End Sub + + Friend WithEvents chkSaveModel As CheckBox + Friend WithEvents ucrInputModelName As ucrInputComboBox +End Class diff --git a/instat/ucrSaveModel.fr-FR.resx b/instat/ucrSaveModel.fr-FR.resx new file mode 100644 index 00000000000..a3df4f013d3 --- /dev/null +++ b/instat/ucrSaveModel.fr-FR.resx @@ -0,0 +1,15 @@ + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/instat/ucrSaveModel.resx b/instat/ucrSaveModel.resx new file mode 100644 index 00000000000..1af7de150c9 --- /dev/null +++ b/instat/ucrSaveModel.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/instat/ucrSaveModel.sw-KE.resx b/instat/ucrSaveModel.sw-KE.resx new file mode 100644 index 00000000000..a3df4f013d3 --- /dev/null +++ b/instat/ucrSaveModel.sw-KE.resx @@ -0,0 +1,15 @@ + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/instat/ucrSaveModel.vb b/instat/ucrSaveModel.vb new file mode 100644 index 00000000000..cd35c58288f --- /dev/null +++ b/instat/ucrSaveModel.vb @@ -0,0 +1,16 @@ +Public Class ucrSaveModel + Public Event CheckedChanged(bChecked As Boolean) + Private Sub chkSaveModel_CheckedChanged(sender As Object, e As EventArgs) Handles chkSaveModel.CheckedChanged + If chkSaveModel.Checked Then + ucrInputModelName.Visible = True + Else + ucrInputModelName.Visible = False + End If + RaiseEvent CheckedChanged(chkSaveModel.Checked) + End Sub + + Private Sub ucrSaveModel_Load(sender As Object, e As EventArgs) Handles MyBase.Load + ucrInputModelName.SetDefaultTypeAsModel() + ucrInputModelName.SetItemsTypeAsModels() + End Sub +End Class