diff --git a/instat/clsGridLink.vb b/instat/clsGridLink.vb index fdf871df960..543f64c6ac2 100644 --- a/instat/clsGridLink.vb +++ b/instat/clsGridLink.vb @@ -51,7 +51,7 @@ Public Class clsGridLink For i = 0 To lstDataNames.Length - 1 strDataName = lstDataNames.AsCharacter(i) If (bGrdDataExists And frmMain.clsRLink.clsEngine.Evaluate(frmMain.clsRLink.strInstatDataObject & "$get_data_changed(data_name = " & Chr(34) & strDataName & Chr(34) & ")").AsLogical(0)) Then - dfTemp = frmMain.clsRLink.clsEngine.Evaluate(frmMain.clsRLink.strInstatDataObject & "$get_data(" & Chr(34) & strDataName & Chr(34) & ")").AsDataFrame + dfTemp = frmMain.clsRLink.clsEngine.Evaluate(frmMain.clsRLink.strInstatDataObject & "$get_data_frame(" & Chr(34) & strDataName & Chr(34) & ")").AsDataFrame FillSheet(dfTemp, strDataName, grdData) frmMain.clsRLink.clsEngine.Evaluate(frmMain.clsRLink.strInstatDataObject & "$set_data_frames_changed(" & Chr(34) & strDataName & Chr(34) & ", FALSE)") End If diff --git a/instat/clsRFunction.vb b/instat/clsRFunction.vb index db27cf71227..254ea589eb7 100644 --- a/instat/clsRFunction.vb +++ b/instat/clsRFunction.vb @@ -69,7 +69,7 @@ Public Class RFunction bToBeAssigned = False Else strScript = strScript & frmMain.clsRLink.strInstatDataObject & "$import_data(data_tables = list(" & strAssignToDataFrame & "=" & strAssignTo & "))" & vbCrLf - strAssignTo = frmMain.clsRLink.strInstatDataObject & "$get_data(data_name = " & Chr(34) & strAssignToDataFrame & Chr(34) & ")" + strAssignTo = frmMain.clsRLink.strInstatDataObject & "$get_data_frame(data_name = " & Chr(34) & strAssignToDataFrame & Chr(34) & ")" bIsAssigned = True bToBeAssigned = False End If diff --git a/instat/clsRLink.vb b/instat/clsRLink.vb index 5d475c9cf4d..5fbe10433da 100644 --- a/instat/clsRLink.vb +++ b/instat/clsRLink.vb @@ -63,26 +63,29 @@ Public Class RLink Dim i As Integer If bInstatObjectExists 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") + 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 - For i = 0 To lstCurrColumns.Length - 1 - lstColumns.Items.Add(lstCurrColumns.AsCharacter(i)) - Next - lstColumns.Columns(0).Width = -2 End If End If + End Sub - Public Function GetDefaultNames(strPrefix As String) + Public Function GetDefaultColumnNames(strPrefix As String) Dim lstNextDefaults As GenericVector = Nothing If bInstatObjectExists Then @@ -216,4 +219,11 @@ Public Class RLink End If End Sub + Public Function GetDataFrameLength(strDataFrameName As String) As Integer + Dim intLength As Integer + If clsEngine IsNot Nothing Then + intLength = clsEngine.Evaluate(frmMain.clsRLink.strInstatDataObject & "$length_of_data(" & Chr(34) & strDataFrameName & Chr(34) & ")").AsInteger(0) + End If + Return intLength + End Function End Class diff --git a/instat/clsRSyntax.vb b/instat/clsRSyntax.vb index d43c4e59f7e..47d98f8beef 100644 --- a/instat/clsRSyntax.vb +++ b/instat/clsRSyntax.vb @@ -43,7 +43,7 @@ Public Class RSyntax clsRFunction = clsBaseFunction End If clsParam.SetArgumentName(strParameterName) - If Not strParameterName = "" Then + If Not strParameterValue = "" Then clsParam.SetArgumentValue(strParameterValue) End If If Not clsRFunctionParameter Is Nothing Then diff --git a/instat/dlgBoxPlot.vb b/instat/dlgBoxPlot.vb index 66ce25da2c0..e4406d24a3f 100644 --- a/instat/dlgBoxPlot.vb +++ b/instat/dlgBoxPlot.vb @@ -30,11 +30,12 @@ Public Class dlgBoxplot Private Sub ucrReceiveBoxplotVariable_ValueChanged(sender As Object, e As EventArgs) - If Not (ucrReceiverDataToPlot.lstSelectedVariables.SelectedItem = "") Then - ucrBase.clsRsyntax.AddParameter("x", clsRFunctionParameter:=ucrReceiverDataToPlot.GetVariables()) - ucrBase.OKEnabled(True) - Else - ucrBase.OKEnabled(False) - End If + 'TODO fix this + 'If Not (ucrReceiverDataToPlot.lstSelectedVariables.SelectedItem = "") Then + ' ucrBase.clsRsyntax.AddParameter("x", clsRFunctionParameter:=ucrReceiverDataToPlot.GetVariables()) + ' ucrBase.OKEnabled(True) + 'Else + ' ucrBase.OKEnabled(False) + 'End If End Sub End Class \ No newline at end of file diff --git a/instat/dlgColumnStats.vb b/instat/dlgColumnStats.vb index d504652da7c..785d40e2caa 100644 --- a/instat/dlgColumnStats.vb +++ b/instat/dlgColumnStats.vb @@ -27,7 +27,9 @@ Public Class dlgColumnStats Private Sub ucrReceiverMultiple_Leave(sender As Object, e As EventArgs) Handles ucrReceiverMultiple.Leave Dim objItem As Object - Dim temp_obj As ListBox.ObjectCollection = ucrReceiverMultiple.lstSelectedVariables.Items + 'TODO fix this + Dim temp_obj As New Object + 'Dim temp_obj As ListBox.ObjectCollection = ucrReceiverMultiple.lstSelectedVariables.Items If ucrReceiverMultiple.lstSelectedVariables.Items.Count > 0 Then For Each objItem In temp_obj ucrBase.clsRsyntax.AddParameter("data_temp$" & objItem & "", "x") diff --git a/instat/dlgCorrelation.vb b/instat/dlgCorrelation.vb index b1cfbe5eb53..6c63b7b7381 100644 --- a/instat/dlgCorrelation.vb +++ b/instat/dlgCorrelation.vb @@ -27,8 +27,9 @@ Public Class dlgCorrelation Private Sub ucrReceiverMultiple_Leave(sender As Object, e As EventArgs) Handles ucrReceiverMultiple.Leave If ucrReceiverMultiple.lstSelectedVariables.Items.Count = 2 Then - ucrBase.clsRsyntax.AddParameter("x", "data$" & ucrReceiverMultiple.lstSelectedVariables.Items.Item(0) & "") - ucrBase.clsRsyntax.AddParameter("y", "data$" & ucrReceiverMultiple.lstSelectedVariables.Items.Item(1) & "") + 'TODO fix this + 'ucrBase.clsRsyntax.AddParameter("x", "data$" & ucrReceiverMultiple.lstSelectedVariables.Items.Item(0) & "") + 'ucrBase.clsRsyntax.AddParameter("y", "data$" & ucrReceiverMultiple.lstSelectedVariables.Items.Item(1) & "") End If End Sub diff --git a/instat/dlgFreqTables.vb b/instat/dlgFreqTables.vb index 2ccc8d61a1c..65a3a7117c5 100644 --- a/instat/dlgFreqTables.vb +++ b/instat/dlgFreqTables.vb @@ -43,6 +43,7 @@ Public Class dlgFreqTables End Sub Private Sub ucrReceiverMultiple_Leave(sender As Object, e As EventArgs) Handles ucrReceiverMultiple.Leave - ucrBase.clsRsyntax.AddParameter("x", "data$" & ucrReceiverMultiple.lstSelectedVariables.SelectedItem & "") + 'TODO fix this + 'ucrBase.clsRsyntax.AddParameter("x", "data$" & ucrReceiverMultiple.lstSelectedVariables.SelectedItem & "") End Sub End Class \ No newline at end of file diff --git a/instat/dlgRandomSample.vb b/instat/dlgRandomSample.vb index 7785dc3a2d8..b2ceb85f71f 100644 --- a/instat/dlgRandomSample.vb +++ b/instat/dlgRandomSample.vb @@ -24,11 +24,11 @@ Public Class dlgRandomSample ' Setting distribution type and base function as distribution function ucrDistWithParameters.SetRDistributions() ucrBase.clsRsyntax.clsBaseFunction = ucrDistWithParameters.clsCurrRFunction - ucrDistWithParameters.AddParameter("n", ucrDataFrameSelector.strDataFrameLength) + ucrDistWithParameters.AddParameter("n", ucrDataFrameSelector.iDataFrameLength) ' Setting link between DataFrameSelector and NewColumnNameSelector ' TODO tidy these links up - ucrDataFrameSelector.SetColumnList(ucrNewColumnNameSelector) + 'ucrDataFrameSelector.SetColumnList(ucrNewColumnNameSelector) ucrNewColumnNameSelector.SetDataFrameSelector(ucrDataFrameSelector) ucrNewColumnNameSelector.SetPrefix("Rand") @@ -38,7 +38,7 @@ Public Class dlgRandomSample End Sub Private Sub ucrDataFrameSelector_Leave(sender As Object, e As EventArgs) Handles ucrDataFrameSelector.Leave - ucrDistWithParameters.AddParameter("n", ucrDataFrameSelector.strDataFrameLength) + ucrDistWithParameters.AddParameter("n", ucrDataFrameSelector.iDataFrameLength) End Sub Private Sub ucrNewColumnNameSelector_Leave(sender As Object, e As EventArgs) Handles ucrNewColumnNameSelector.Leave diff --git a/instat/dlgRegularSequence.vb b/instat/dlgRegularSequence.vb index 62f681034bc..054cfc7f235 100644 --- a/instat/dlgRegularSequence.vb +++ b/instat/dlgRegularSequence.vb @@ -23,7 +23,7 @@ Public Class dlgRegularSequence frmMain.clsRLink.SetOutput(txtGetPreview) dtpSelectorA.Visible = False dtpSelectorB.Visible = False - ucrSelectDataFrame.SetColumnList(ucrColName) + 'ucrSelectDataFrame.SetColumnList(ucrColName) ucrBase.clsRsyntax.SetAssignTo(strAssignToName:=ucrColName.cboColumnName.Text, strTempDataframe:=ucrSelectDataFrame.cboAvailableDataFrames.Text, strTempColumn:=ucrColName.cboColumnName.Text) End Sub diff --git a/instat/dlgSite.Designer.vb b/instat/dlgSite.Designer.vb index 85897542421..555f48561ac 100644 --- a/instat/dlgSite.Designer.vb +++ b/instat/dlgSite.Designer.vb @@ -22,30 +22,30 @@ Partial Class dlgSite 'Do not modify it using the code editor. _ Private Sub InitializeComponent() - Me.UcrButtons1 = New instat.ucrButtons() - Me.SuspendLayout() - ' - 'UcrButtons1 - ' - Me.UcrButtons1.Location = New System.Drawing.Point(12, 334) - Me.UcrButtons1.Name = "UcrButtons1" - Me.UcrButtons1.Size = New System.Drawing.Size(410, 32) - Me.UcrButtons1.TabIndex = 0 - ' - 'dlgSite - ' - Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) - Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(429, 368) - Me.Controls.Add(Me.UcrButtons1) - Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow - Me.Name = "dlgSite" - Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen - Me.Tag = "Site" - Me.Text = "Site" - Me.ResumeLayout(False) - + Me.ucrBase = New instat.ucrButtons() + Me.SuspendLayout() + ' + 'ucrBase + ' + Me.ucrBase.Location = New System.Drawing.Point(12, 305) + Me.ucrBase.Name = "ucrBase" + Me.ucrBase.Size = New System.Drawing.Size(410, 61) + Me.ucrBase.TabIndex = 0 + ' + 'dlgSite + ' + Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) + Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.ClientSize = New System.Drawing.Size(429, 368) + Me.Controls.Add(Me.ucrBase) + Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow + Me.Name = "dlgSite" + Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen + Me.Tag = "Site" + Me.Text = "Site" + Me.ResumeLayout(False) + End Sub - Friend WithEvents UcrButtons1 As ucrButtons + Friend WithEvents ucrBase As ucrButtons End Class diff --git a/instat/dlgSort.Designer.vb b/instat/dlgSort.Designer.vb index 0b21f0d528f..d058d723a90 100644 --- a/instat/dlgSort.Designer.vb +++ b/instat/dlgSort.Designer.vb @@ -22,116 +22,116 @@ Partial Class dlgSort 'Do not modify it using the code editor. Private Sub InitializeComponent() - Me.ucrBase = New instat.ucrButtons() - Me.grpOrderType = New System.Windows.Forms.GroupBox() - Me.rdoDescending = New System.Windows.Forms.RadioButton() - Me.rdoAscending = New System.Windows.Forms.RadioButton() - Me.ucrAddRemove = New instat.ucrSelectorAddRemove() - Me.ucrMultiple = New instat.ucrReceiverMultiple() - Me.lblColumnsToSort = New System.Windows.Forms.Label() - Me.chkWriteBack = New System.Windows.Forms.CheckBox() - Me.grpOrderType.SuspendLayout() - Me.SuspendLayout() - ' - 'ucrBase - ' - Me.ucrBase.Location = New System.Drawing.Point(12, 155) - Me.ucrBase.Name = "ucrBase" - Me.ucrBase.Size = New System.Drawing.Size(402, 56) - Me.ucrBase.TabIndex = 0 - ' - 'grpOrderType - ' - Me.grpOrderType.Controls.Add(Me.rdoDescending) - Me.grpOrderType.Controls.Add(Me.rdoAscending) - Me.grpOrderType.Location = New System.Drawing.Point(284, 12) - Me.grpOrderType.Name = "grpOrderType" - Me.grpOrderType.Size = New System.Drawing.Size(102, 116) - Me.grpOrderType.TabIndex = 2 - Me.grpOrderType.TabStop = False - Me.grpOrderType.Text = "Order Type" - ' - 'rdoDescending - ' - Me.rdoDescending.AutoSize = True - Me.rdoDescending.Location = New System.Drawing.Point(6, 61) - Me.rdoDescending.Name = "rdoDescending" - Me.rdoDescending.Size = New System.Drawing.Size(82, 17) - Me.rdoDescending.TabIndex = 0 - Me.rdoDescending.TabStop = True - Me.rdoDescending.Tag = "Descending" - Me.rdoDescending.Text = "Descending" - Me.rdoDescending.UseVisualStyleBackColor = True - ' - 'rdoAscending - ' - Me.rdoAscending.AutoSize = True - Me.rdoAscending.Location = New System.Drawing.Point(7, 20) - Me.rdoAscending.Name = "rdoAscending" - Me.rdoAscending.Size = New System.Drawing.Size(75, 17) - Me.rdoAscending.TabIndex = 0 - Me.rdoAscending.TabStop = True - Me.rdoAscending.Tag = "Ascending" - Me.rdoAscending.Text = "Ascending" - Me.rdoAscending.UseVisualStyleBackColor = True - ' - 'ucrAddRemove - ' - Me.ucrAddRemove.Location = New System.Drawing.Point(1, 7) - Me.ucrAddRemove.Name = "ucrAddRemove" - Me.ucrAddRemove.Size = New System.Drawing.Size(180, 118) - Me.ucrAddRemove.TabIndex = 3 - ' - 'ucrMultiple - ' - Me.ucrMultiple.Location = New System.Drawing.Point(187, 22) - Me.ucrMultiple.Name = "ucrMultiple" - Me.ucrMultiple.Size = New System.Drawing.Size(91, 101) - Me.ucrMultiple.TabIndex = 4 - ' - 'lblColumnsToSort - ' - Me.lblColumnsToSort.AutoSize = True - Me.lblColumnsToSort.Location = New System.Drawing.Point(187, 7) - Me.lblColumnsToSort.Name = "lblColumnsToSort" - Me.lblColumnsToSort.Size = New System.Drawing.Size(85, 13) - Me.lblColumnsToSort.TabIndex = 5 - Me.lblColumnsToSort.Tag = "Columns_To_Sort" - Me.lblColumnsToSort.Text = "Columns To Sort" - ' - 'chkWriteBack - ' - Me.chkWriteBack.AutoSize = True - Me.chkWriteBack.Location = New System.Drawing.Point(13, 132) - Me.chkWriteBack.Name = "chkWriteBack" - Me.chkWriteBack.Size = New System.Drawing.Size(134, 17) - Me.chkWriteBack.TabIndex = 6 - Me.chkWriteBack.Text = "Write back to the Data" - Me.chkWriteBack.UseVisualStyleBackColor = True - ' - 'dlgSort - ' - Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) - Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(427, 211) - Me.Controls.Add(Me.chkWriteBack) - Me.Controls.Add(Me.lblColumnsToSort) - Me.Controls.Add(Me.ucrMultiple) - Me.Controls.Add(Me.ucrAddRemove) - Me.Controls.Add(Me.grpOrderType) - Me.Controls.Add(Me.ucrBase) - Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog - Me.MaximizeBox = False - Me.MinimizeBox = False - Me.Name = "dlgSort" - Me.ShowIcon = False - Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen - Me.Text = "Sort" - Me.grpOrderType.ResumeLayout(False) - Me.grpOrderType.PerformLayout() - Me.ResumeLayout(False) - Me.PerformLayout() - + Me.ucrBase = New instat.ucrButtons() + Me.grpOrderType = New System.Windows.Forms.GroupBox() + Me.rdoDescending = New System.Windows.Forms.RadioButton() + Me.rdoAscending = New System.Windows.Forms.RadioButton() + Me.ucrAddRemove = New instat.ucrSelectorAddRemove() + Me.ucrMultiple = New instat.ucrReceiverMultiple() + Me.lblColumnsToSort = New System.Windows.Forms.Label() + Me.chkWriteBack = New System.Windows.Forms.CheckBox() + Me.grpOrderType.SuspendLayout() + Me.SuspendLayout() + ' + 'ucrBase + ' + Me.ucrBase.Location = New System.Drawing.Point(21, 174) + Me.ucrBase.Name = "ucrBase" + Me.ucrBase.Size = New System.Drawing.Size(402, 56) + Me.ucrBase.TabIndex = 0 + ' + 'grpOrderType + ' + Me.grpOrderType.Controls.Add(Me.rdoDescending) + Me.grpOrderType.Controls.Add(Me.rdoAscending) + Me.grpOrderType.Location = New System.Drawing.Point(342, 12) + Me.grpOrderType.Name = "grpOrderType" + Me.grpOrderType.Size = New System.Drawing.Size(102, 116) + Me.grpOrderType.TabIndex = 2 + Me.grpOrderType.TabStop = False + Me.grpOrderType.Text = "Order Type" + ' + 'rdoDescending + ' + Me.rdoDescending.AutoSize = True + Me.rdoDescending.Location = New System.Drawing.Point(6, 61) + Me.rdoDescending.Name = "rdoDescending" + Me.rdoDescending.Size = New System.Drawing.Size(82, 17) + Me.rdoDescending.TabIndex = 0 + Me.rdoDescending.TabStop = True + Me.rdoDescending.Tag = "Descending" + Me.rdoDescending.Text = "Descending" + Me.rdoDescending.UseVisualStyleBackColor = True + ' + 'rdoAscending + ' + Me.rdoAscending.AutoSize = True + Me.rdoAscending.Location = New System.Drawing.Point(7, 20) + Me.rdoAscending.Name = "rdoAscending" + Me.rdoAscending.Size = New System.Drawing.Size(75, 17) + Me.rdoAscending.TabIndex = 0 + Me.rdoAscending.TabStop = True + Me.rdoAscending.Tag = "Ascending" + Me.rdoAscending.Text = "Ascending" + Me.rdoAscending.UseVisualStyleBackColor = True + ' + 'ucrAddRemove + ' + Me.ucrAddRemove.Location = New System.Drawing.Point(1, 7) + Me.ucrAddRemove.Name = "ucrAddRemove" + Me.ucrAddRemove.Size = New System.Drawing.Size(204, 132) + Me.ucrAddRemove.TabIndex = 3 + ' + 'ucrMultiple + ' + Me.ucrMultiple.Location = New System.Drawing.Point(211, 22) + Me.ucrMultiple.Name = "ucrMultiple" + Me.ucrMultiple.Size = New System.Drawing.Size(125, 103) + Me.ucrMultiple.TabIndex = 4 + ' + 'lblColumnsToSort + ' + Me.lblColumnsToSort.AutoSize = True + Me.lblColumnsToSort.Location = New System.Drawing.Point(224, 7) + Me.lblColumnsToSort.Name = "lblColumnsToSort" + Me.lblColumnsToSort.Size = New System.Drawing.Size(85, 13) + Me.lblColumnsToSort.TabIndex = 5 + Me.lblColumnsToSort.Tag = "Columns_To_Sort" + Me.lblColumnsToSort.Text = "Columns To Sort" + ' + 'chkWriteBack + ' + Me.chkWriteBack.AutoSize = True + Me.chkWriteBack.Location = New System.Drawing.Point(13, 145) + Me.chkWriteBack.Name = "chkWriteBack" + Me.chkWriteBack.Size = New System.Drawing.Size(134, 17) + Me.chkWriteBack.TabIndex = 6 + Me.chkWriteBack.Text = "Write back to the Data" + Me.chkWriteBack.UseVisualStyleBackColor = True + ' + 'dlgSort + ' + Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) + Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.ClientSize = New System.Drawing.Size(468, 230) + Me.Controls.Add(Me.chkWriteBack) + Me.Controls.Add(Me.lblColumnsToSort) + Me.Controls.Add(Me.ucrMultiple) + Me.Controls.Add(Me.ucrAddRemove) + Me.Controls.Add(Me.grpOrderType) + Me.Controls.Add(Me.ucrBase) + Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog + Me.MaximizeBox = False + Me.MinimizeBox = False + Me.Name = "dlgSort" + Me.ShowIcon = False + Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen + Me.Text = "Sort" + Me.grpOrderType.ResumeLayout(False) + Me.grpOrderType.PerformLayout() + Me.ResumeLayout(False) + Me.PerformLayout() + End Sub Friend WithEvents ucrBase As ucrButtons diff --git a/instat/dlgSpells.Designer.vb b/instat/dlgSpells.Designer.vb index 321d4e77a2b..551be97d5b7 100644 --- a/instat/dlgSpells.Designer.vb +++ b/instat/dlgSpells.Designer.vb @@ -20,10 +20,29 @@ Partial Class dlgSpells 'NOTE: The following procedure is required by the Windows Form Designer 'It can be modified using the Windows Form Designer. 'Do not modify it using the code editor. - _ + Private Sub InitializeComponent() - components = New System.ComponentModel.Container - Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.Text = "dlgSpells" - End Sub + Me.ucrBase = New instat.ucrButtons() + Me.SuspendLayout() + ' + 'ucrBase + ' + Me.ucrBase.Location = New System.Drawing.Point(13, 204) + Me.ucrBase.Name = "ucrBase" + Me.ucrBase.Size = New System.Drawing.Size(410, 53) + Me.ucrBase.TabIndex = 0 + ' + 'dlgSpells + ' + 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.Name = "dlgSpells" + Me.Text = "dlgSpells" + Me.ResumeLayout(False) + + End Sub + + Friend WithEvents ucrBase As ucrButtons End Class diff --git a/instat/dlgStack.Designer.vb b/instat/dlgStack.Designer.vb index 86a0d986043..36e7d7177f4 100644 --- a/instat/dlgStack.Designer.vb +++ b/instat/dlgStack.Designer.vb @@ -1,9 +1,9 @@ - _ + Partial Class dlgStack 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,7 +20,7 @@ Partial Class dlgStack '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.lblColumnsToBestack = New System.Windows.Forms.Label() Me.txtStackDataInto = New System.Windows.Forms.TextBox() @@ -28,7 +28,8 @@ Partial Class dlgStack Me.lblFactorInto = New System.Windows.Forms.Label() Me.txtFactorInto = New System.Windows.Forms.TextBox() Me.chkIDVariables = New System.Windows.Forms.CheckBox() - Me.ucrNewColumnName = New instat.ucrNewColumnName() + Me.lblNewDataFrameName = New System.Windows.Forms.Label() + Me.ucrNewDataFrameName = New instat.ucrVariableName() Me.ucrIDVariablesReceiver = New instat.ucrReceiverMultiple() Me.ucrDataFrameAddRemove = New instat.ucrSelectorByDataFrameAddRemove() Me.ucrBase = New instat.ucrButtons() @@ -91,12 +92,22 @@ Partial Class dlgStack Me.chkIDVariables.Text = "ID Variables" Me.chkIDVariables.UseVisualStyleBackColor = True ' - 'ucrNewColumnName + 'lblNewDataFrameName ' - Me.ucrNewColumnName.Location = New System.Drawing.Point(17, 322) - Me.ucrNewColumnName.Name = "ucrNewColumnName" - Me.ucrNewColumnName.Size = New System.Drawing.Size(367, 35) - Me.ucrNewColumnName.TabIndex = 15 + Me.lblNewDataFrameName.AutoSize = True + Me.lblNewDataFrameName.Location = New System.Drawing.Point(25, 335) + Me.lblNewDataFrameName.Name = "lblNewDataFrameName" + Me.lblNewDataFrameName.Size = New System.Drawing.Size(121, 13) + Me.lblNewDataFrameName.TabIndex = 16 + Me.lblNewDataFrameName.Tag = "New_Data_Frame_Name:" + Me.lblNewDataFrameName.Text = "New Data Frame Name:" + ' + 'ucrNewDataFrameName + ' + Me.ucrNewDataFrameName.Location = New System.Drawing.Point(147, 329) + Me.ucrNewDataFrameName.Name = "ucrNewDataFrameName" + Me.ucrNewDataFrameName.Size = New System.Drawing.Size(149, 23) + Me.ucrNewDataFrameName.TabIndex = 15 ' 'ucrIDVariablesReceiver ' @@ -131,7 +142,8 @@ Partial Class dlgStack Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.ClientSize = New System.Drawing.Size(421, 429) - Me.Controls.Add(Me.ucrNewColumnName) + Me.Controls.Add(Me.lblNewDataFrameName) + Me.Controls.Add(Me.ucrNewDataFrameName) Me.Controls.Add(Me.ucrIDVariablesReceiver) Me.Controls.Add(Me.chkIDVariables) Me.Controls.Add(Me.ucrDataFrameAddRemove) @@ -161,5 +173,6 @@ Partial Class dlgStack Friend WithEvents ucrDataFrameAddRemove As ucrSelectorByDataFrameAddRemove Friend WithEvents chkIDVariables As CheckBox Friend WithEvents ucrIDVariablesReceiver As ucrReceiverMultiple - Friend WithEvents ucrNewColumnName As ucrNewColumnName + Friend WithEvents ucrNewDataFrameName As ucrVariableName + Friend WithEvents lblNewDataFrameName As Label End Class diff --git a/instat/dlgStack.vb b/instat/dlgStack.vb index e647e99fffc..6443b3e16e5 100644 --- a/instat/dlgStack.vb +++ b/instat/dlgStack.vb @@ -16,38 +16,64 @@ Imports instat.Translations Public Class dlgStack Private Sub dlgStack_Load(sender As Object, e As EventArgs) Handles MyBase.Load - ucrBase.clsRsyntax.SetFunction("melt") + 'Set receiver/selector options ucrIDVariablesReceiver.Visible = False - ucrBase.clsRsyntax.iCallType = 1 ucrReceiverColumnsToBeStack.Selector = ucrDataFrameAddRemove ucrReceiverColumnsToBeStack.SetMeAsReceiver() ucrIDVariablesReceiver.Selector = ucrDataFrameAddRemove + + 'Set function parameters/settings + ucrBase.clsRsyntax.SetFunction("melt") + txtFactorInto.Text = "Variable" + ucrBase.clsRsyntax.AddParameter("variable.name", Chr(34) & txtFactorInto.Text & Chr(34)) + txtStackDataInto.Text = "Value" + ucrBase.clsRsyntax.AddParameter("value.name", Chr(34) & txtStackDataInto.Text & Chr(34)) + + ucrBase.clsRsyntax.AddParameter("data", clsRFunctionParameter:=ucrDataFrameAddRemove.ucrAvailableDataFrames.clsCurrDataFrame) + + ucrNewDataFrameName.txtValidation.Text = ucrDataFrameAddRemove.ucrAvailableDataFrames.cboAvailableDataFrames.Text & "_stacked" + ucrBase.clsRsyntax.SetAssignTo(ucrNewDataFrameName.txtValidation.Text, strTempDataframe:=ucrNewDataFrameName.txtValidation.Text) + autoTranslate(Me) End Sub Private Sub chkIDVariables_CheckedChanged(sender As Object, e As EventArgs) Handles chkIDVariables.CheckedChanged If chkIDVariables.Checked = True Then ucrIDVariablesReceiver.Visible = True + ucrIDVariablesReceiver.Focus() Else ucrIDVariablesReceiver.Visible = False End If End Sub - Private Sub ucrIDVariablesReceiver_Enter(sender As Object, e As EventArgs) Handles ucrIDVariablesReceiver.Enter ucrIDVariablesReceiver.SetMeAsReceiver() End Sub Private Sub ucrReceiverColumnsToBeStack_Leave(sender As Object, e As EventArgs) Handles ucrReceiverColumnsToBeStack.Leave - ucrBase.clsRsyntax.AddParameter("id.var", ucrReceiverColumnsToBeStack.GetVariableNames()) + ucrBase.clsRsyntax.AddParameter("measure.vars", ucrReceiverColumnsToBeStack.GetVariableNames()) End Sub Private Sub ucrIDVariablesReceiver_Leave(sender As Object, e As EventArgs) Handles ucrIDVariablesReceiver.Leave - ucrBase.clsRsyntax.AddParameter("", ucrIDVariablesReceiver.GetVariableNames()) + ucrBase.clsRsyntax.AddParameter("id.vars", ucrIDVariablesReceiver.GetVariableNames()) + End Sub + + Private Sub txtFactorInto_Leave(sender As Object, e As EventArgs) Handles txtFactorInto.Leave + ucrBase.clsRsyntax.AddParameter("variable.name", Chr(34) & txtFactorInto.Text & Chr(34)) End Sub - Private Sub ucrReceiverColumnsToBeStack_Load(sender As Object, e As EventArgs) + Private Sub txtStackDataInto_Leave(sender As Object, e As EventArgs) Handles txtStackDataInto.Leave + ucrBase.clsRsyntax.AddParameter("value.name", Chr(34) & txtStackDataInto.Text & Chr(34)) + End Sub + Private Sub ucrNewDataFrameName_Leave(sender As Object, e As EventArgs) Handles ucrNewDataFrameName.Leave + ucrBase.clsRsyntax.SetAssignTo(ucrNewDataFrameName.txtValidation.Text, strTempDataframe:=ucrNewDataFrameName.txtValidation.Text) + End Sub + + Private Sub ucrDataFrameAddRemove_DataFrameChanged(sender As Object, e As EventArgs) Handles ucrDataFrameAddRemove.DataFrameChanged + If Not ucrNewDataFrameName.bUserTyped Then + ucrNewDataFrameName.txtValidation.Text = ucrDataFrameAddRemove.ucrAvailableDataFrames.cboAvailableDataFrames.Text & "_stacked" + End If End Sub End Class \ No newline at end of file diff --git a/instat/dlgStackDailyData.Designer.vb b/instat/dlgStackDailyData.Designer.vb index b0baca425d2..b582a6879ce 100644 --- a/instat/dlgStackDailyData.Designer.vb +++ b/instat/dlgStackDailyData.Designer.vb @@ -22,29 +22,29 @@ Partial Class dlgStackDailyData '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(-2, 307) - Me.ucrBase.Name = "ucrBase" - Me.ucrBase.Size = New System.Drawing.Size(410, 32) - Me.ucrBase.TabIndex = 0 - ' - 'dlgStackDailyData - ' - Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) - Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(420, 351) - Me.Controls.Add(Me.ucrBase) - Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow - Me.Name = "dlgStackDailyData" - Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen - Me.Tag = "Stack_Daily_Data" - Me.Text = "Stack Daily Data" - Me.ResumeLayout(False) - + Me.ucrBase = New instat.ucrButtons() + Me.SuspendLayout() + ' + 'ucrBase + ' + Me.ucrBase.Location = New System.Drawing.Point(4, 296) + Me.ucrBase.Name = "ucrBase" + Me.ucrBase.Size = New System.Drawing.Size(410, 57) + Me.ucrBase.TabIndex = 0 + ' + 'dlgStackDailyData + ' + Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) + Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.ClientSize = New System.Drawing.Size(420, 351) + Me.Controls.Add(Me.ucrBase) + Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow + Me.Name = "dlgStackDailyData" + Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen + Me.Tag = "Stack_Daily_Data" + Me.Text = "Stack Daily Data" + Me.ResumeLayout(False) + End Sub Friend WithEvents ucrBase As ucrButtons diff --git a/instat/dlgStartofRains.Designer.vb b/instat/dlgStartofRains.Designer.vb index 90884c5c4fe..851ba2f11f6 100644 --- a/instat/dlgStartofRains.Designer.vb +++ b/instat/dlgStartofRains.Designer.vb @@ -22,239 +22,239 @@ Partial Class dlgStartofRains 'Do not modify it using the code editor. _ Private Sub InitializeComponent() - Me.lblDataList = New System.Windows.Forms.Label() - Me.lblEarliest = New System.Windows.Forms.Label() - Me.nudNumberofRainDays = New System.Windows.Forms.NumericUpDown() - Me.lblThreashold = New System.Windows.Forms.Label() - Me.lblNumberRainDays = New System.Windows.Forms.Label() - Me.lblTotalRain = New System.Windows.Forms.Label() - Me.nudTotalRain = New System.Windows.Forms.NumericUpDown() - Me.chkDrySpell = New System.Windows.Forms.CheckBox() - Me.nudWithin = New System.Windows.Forms.NumericUpDown() - Me.lblWithin = New System.Windows.Forms.Label() - Me.lblDryLength = New System.Windows.Forms.Label() - Me.nudDryLength = New System.Windows.Forms.NumericUpDown() - Me.lblDays = New System.Windows.Forms.Label() - Me.lblColumnName = New System.Windows.Forms.Label() - Me.txtColumnName = New System.Windows.Forms.TextBox() - Me.nudEarliest = New System.Windows.Forms.NumericUpDown() - Me.nudThreshold = New System.Windows.Forms.NumericUpDown() - Me.ucrBase = New instat.ucrButtons() - CType(Me.nudNumberofRainDays, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.nudTotalRain, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.nudWithin, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.nudDryLength, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.nudEarliest, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.nudThreshold, System.ComponentModel.ISupportInitialize).BeginInit() - Me.SuspendLayout() - ' - 'lblDataList - ' - Me.lblDataList.AutoSize = True - Me.lblDataList.Location = New System.Drawing.Point(36, 35) - Me.lblDataList.Name = "lblDataList" - Me.lblDataList.Size = New System.Drawing.Size(106, 13) - Me.lblDataList.TabIndex = 1 - Me.lblDataList.Tag = "Not_Yet_Implemented" - Me.lblDataList.Text = "Not Yet Implemented" - ' - 'lblEarliest - ' - Me.lblEarliest.AutoSize = True - Me.lblEarliest.Location = New System.Drawing.Point(39, 75) - Me.lblEarliest.Name = "lblEarliest" - Me.lblEarliest.Size = New System.Drawing.Size(61, 13) - Me.lblEarliest.TabIndex = 2 - Me.lblEarliest.Tag = "Earliest_day" - Me.lblEarliest.Text = "Earliest day" - ' - 'nudNumberofRainDays - ' - Me.nudNumberofRainDays.Location = New System.Drawing.Point(192, 110) - Me.nudNumberofRainDays.Name = "nudNumberofRainDays" - Me.nudNumberofRainDays.Size = New System.Drawing.Size(35, 20) - Me.nudNumberofRainDays.TabIndex = 4 - Me.nudNumberofRainDays.Value = New Decimal(New Integer() {2, 0, 0, 0}) - ' - 'lblThreashold - ' - Me.lblThreashold.AutoSize = True - Me.lblThreashold.Location = New System.Drawing.Point(39, 95) - Me.lblThreashold.Name = "lblThreashold" - Me.lblThreashold.Size = New System.Drawing.Size(39, 13) - Me.lblThreashold.TabIndex = 5 - Me.lblThreashold.Tag = "Threashold" - Me.lblThreashold.Text = "Label1" - ' - 'lblNumberRainDays - ' - Me.lblNumberRainDays.AutoSize = True - Me.lblNumberRainDays.Location = New System.Drawing.Point(39, 115) - Me.lblNumberRainDays.Name = "lblNumberRainDays" - Me.lblNumberRainDays.Size = New System.Drawing.Size(39, 13) - Me.lblNumberRainDays.TabIndex = 7 - Me.lblNumberRainDays.Tag = "Number_of_Rain_Days" - Me.lblNumberRainDays.Text = "Label1" - ' - 'lblTotalRain - ' - Me.lblTotalRain.AutoSize = True - Me.lblTotalRain.Location = New System.Drawing.Point(39, 135) - Me.lblTotalRain.Name = "lblTotalRain" - Me.lblTotalRain.Size = New System.Drawing.Size(39, 13) - Me.lblTotalRain.TabIndex = 8 - Me.lblTotalRain.Tag = "Total_Rain" - Me.lblTotalRain.Text = "Label1" - ' - 'nudTotalRain - ' - Me.nudTotalRain.Location = New System.Drawing.Point(192, 131) - Me.nudTotalRain.Maximum = New Decimal(New Integer() {200, 0, 0, 0}) - Me.nudTotalRain.Name = "nudTotalRain" - Me.nudTotalRain.Size = New System.Drawing.Size(35, 20) - Me.nudTotalRain.TabIndex = 9 - Me.nudTotalRain.Value = New Decimal(New Integer() {20, 0, 0, 0}) - ' - 'chkDrySpell - ' - Me.chkDrySpell.AutoSize = True - Me.chkDrySpell.Location = New System.Drawing.Point(12, 163) - Me.chkDrySpell.Name = "chkDrySpell" - Me.chkDrySpell.Size = New System.Drawing.Size(81, 17) - Me.chkDrySpell.TabIndex = 10 - Me.chkDrySpell.Tag = "Dry_Spell" - Me.chkDrySpell.Text = "CheckBox1" - Me.chkDrySpell.UseVisualStyleBackColor = True - ' - 'nudWithin - ' - Me.nudWithin.Location = New System.Drawing.Point(288, 189) - Me.nudWithin.Maximum = New Decimal(New Integer() {200, 0, 0, 0}) - Me.nudWithin.Name = "nudWithin" - Me.nudWithin.Size = New System.Drawing.Size(35, 20) - Me.nudWithin.TabIndex = 14 - Me.nudWithin.Value = New Decimal(New Integer() {30, 0, 0, 0}) - ' - 'lblWithin - ' - Me.lblWithin.AutoSize = True - Me.lblWithin.Location = New System.Drawing.Point(233, 193) - Me.lblWithin.Name = "lblWithin" - Me.lblWithin.Size = New System.Drawing.Size(39, 13) - Me.lblWithin.TabIndex = 13 - Me.lblWithin.Tag = "Within" - Me.lblWithin.Text = "Label1" - ' - 'lblDryLength - ' - Me.lblDryLength.AutoSize = True - Me.lblDryLength.Location = New System.Drawing.Point(39, 193) - Me.lblDryLength.Name = "lblDryLength" - Me.lblDryLength.Size = New System.Drawing.Size(39, 13) - Me.lblDryLength.TabIndex = 12 - Me.lblDryLength.Tag = "Length_of_Dry_Spell" - Me.lblDryLength.Text = "Label1" - ' - 'nudDryLength - ' - Me.nudDryLength.Location = New System.Drawing.Point(192, 189) - Me.nudDryLength.Name = "nudDryLength" - Me.nudDryLength.Size = New System.Drawing.Size(35, 20) - Me.nudDryLength.TabIndex = 11 - Me.nudDryLength.Value = New Decimal(New Integer() {10, 0, 0, 0}) - ' - 'lblDays - ' - Me.lblDays.AutoSize = True - Me.lblDays.Location = New System.Drawing.Point(329, 193) - Me.lblDays.Name = "lblDays" - Me.lblDays.Size = New System.Drawing.Size(13, 13) - Me.lblDays.TabIndex = 15 - Me.lblDays.Tag = "Days" - Me.lblDays.Text = "2" - ' - 'lblColumnName - ' - Me.lblColumnName.AutoSize = True - Me.lblColumnName.Location = New System.Drawing.Point(39, 230) - Me.lblColumnName.Name = "lblColumnName" - Me.lblColumnName.Size = New System.Drawing.Size(39, 13) - Me.lblColumnName.TabIndex = 16 - Me.lblColumnName.Tag = "Column_Name" - Me.lblColumnName.Text = "Label1" - ' - 'txtColumnName - ' - Me.txtColumnName.Location = New System.Drawing.Point(192, 222) - Me.txtColumnName.Name = "txtColumnName" - Me.txtColumnName.Size = New System.Drawing.Size(100, 20) - Me.txtColumnName.TabIndex = 17 - Me.txtColumnName.Tag = "Start_of_Rain" - ' - 'nudEarliest - ' - Me.nudEarliest.Location = New System.Drawing.Point(192, 68) - Me.nudEarliest.Maximum = New Decimal(New Integer() {366, 0, 0, 0}) - Me.nudEarliest.Minimum = New Decimal(New Integer() {1, 0, 0, 0}) - Me.nudEarliest.Name = "nudEarliest" - Me.nudEarliest.Size = New System.Drawing.Size(53, 20) - Me.nudEarliest.TabIndex = 18 - Me.nudEarliest.Value = New Decimal(New Integer() {92, 0, 0, 0}) - ' - 'nudThreshold - ' - Me.nudThreshold.DecimalPlaces = 2 - Me.nudThreshold.Increment = New Decimal(New Integer() {1, 0, 0, 65536}) - Me.nudThreshold.Location = New System.Drawing.Point(192, 89) - Me.nudThreshold.Name = "nudThreshold" - Me.nudThreshold.Size = New System.Drawing.Size(53, 20) - Me.nudThreshold.TabIndex = 19 - Me.nudThreshold.Value = New Decimal(New Integer() {85, 0, 0, 131072}) - ' - 'ucrBase - ' - Me.ucrBase.Location = New System.Drawing.Point(3, 263) - Me.ucrBase.Name = "ucrBase" - Me.ucrBase.Size = New System.Drawing.Size(425, 32) - Me.ucrBase.TabIndex = 0 - ' - 'dlgStartofRains - ' - Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) - Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(440, 294) - Me.Controls.Add(Me.nudThreshold) - Me.Controls.Add(Me.nudEarliest) - Me.Controls.Add(Me.txtColumnName) - Me.Controls.Add(Me.lblColumnName) - Me.Controls.Add(Me.lblDays) - Me.Controls.Add(Me.nudWithin) - Me.Controls.Add(Me.lblWithin) - Me.Controls.Add(Me.lblDryLength) - Me.Controls.Add(Me.nudDryLength) - Me.Controls.Add(Me.chkDrySpell) - Me.Controls.Add(Me.nudTotalRain) - Me.Controls.Add(Me.lblTotalRain) - Me.Controls.Add(Me.lblNumberRainDays) - Me.Controls.Add(Me.lblThreashold) - Me.Controls.Add(Me.nudNumberofRainDays) - Me.Controls.Add(Me.lblEarliest) - Me.Controls.Add(Me.lblDataList) - Me.Controls.Add(Me.ucrBase) - Me.MaximizeBox = False - Me.MinimizeBox = False - Me.Name = "dlgStartofRains" - Me.ShowIcon = False - Me.Text = "Start of Rains" - CType(Me.nudNumberofRainDays, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.nudTotalRain, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.nudWithin, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.nudDryLength, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.nudEarliest, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.nudThreshold, System.ComponentModel.ISupportInitialize).EndInit() - Me.ResumeLayout(False) - Me.PerformLayout() - + Me.lblDataList = New System.Windows.Forms.Label() + Me.lblEarliest = New System.Windows.Forms.Label() + Me.nudNumberofRainDays = New System.Windows.Forms.NumericUpDown() + Me.lblThreashold = New System.Windows.Forms.Label() + Me.lblNumberRainDays = New System.Windows.Forms.Label() + Me.lblTotalRain = New System.Windows.Forms.Label() + Me.nudTotalRain = New System.Windows.Forms.NumericUpDown() + Me.chkDrySpell = New System.Windows.Forms.CheckBox() + Me.nudWithin = New System.Windows.Forms.NumericUpDown() + Me.lblWithin = New System.Windows.Forms.Label() + Me.lblDryLength = New System.Windows.Forms.Label() + Me.nudDryLength = New System.Windows.Forms.NumericUpDown() + Me.lblDays = New System.Windows.Forms.Label() + Me.lblColumnName = New System.Windows.Forms.Label() + Me.txtColumnName = New System.Windows.Forms.TextBox() + Me.nudEarliest = New System.Windows.Forms.NumericUpDown() + Me.nudThreshold = New System.Windows.Forms.NumericUpDown() + Me.ucrBase = New instat.ucrButtons() + CType(Me.nudNumberofRainDays, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.nudTotalRain, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.nudWithin, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.nudDryLength, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.nudEarliest, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.nudThreshold, System.ComponentModel.ISupportInitialize).BeginInit() + Me.SuspendLayout() + ' + 'lblDataList + ' + Me.lblDataList.AutoSize = True + Me.lblDataList.Location = New System.Drawing.Point(36, 35) + Me.lblDataList.Name = "lblDataList" + Me.lblDataList.Size = New System.Drawing.Size(106, 13) + Me.lblDataList.TabIndex = 1 + Me.lblDataList.Tag = "Not_Yet_Implemented" + Me.lblDataList.Text = "Not Yet Implemented" + ' + 'lblEarliest + ' + Me.lblEarliest.AutoSize = True + Me.lblEarliest.Location = New System.Drawing.Point(39, 75) + Me.lblEarliest.Name = "lblEarliest" + Me.lblEarliest.Size = New System.Drawing.Size(61, 13) + Me.lblEarliest.TabIndex = 2 + Me.lblEarliest.Tag = "Earliest_day" + Me.lblEarliest.Text = "Earliest day" + ' + 'nudNumberofRainDays + ' + Me.nudNumberofRainDays.Location = New System.Drawing.Point(192, 110) + Me.nudNumberofRainDays.Name = "nudNumberofRainDays" + Me.nudNumberofRainDays.Size = New System.Drawing.Size(35, 20) + Me.nudNumberofRainDays.TabIndex = 4 + Me.nudNumberofRainDays.Value = New Decimal(New Integer() {2, 0, 0, 0}) + ' + 'lblThreashold + ' + Me.lblThreashold.AutoSize = True + Me.lblThreashold.Location = New System.Drawing.Point(39, 95) + Me.lblThreashold.Name = "lblThreashold" + Me.lblThreashold.Size = New System.Drawing.Size(39, 13) + Me.lblThreashold.TabIndex = 5 + Me.lblThreashold.Tag = "Threashold" + Me.lblThreashold.Text = "Label1" + ' + 'lblNumberRainDays + ' + Me.lblNumberRainDays.AutoSize = True + Me.lblNumberRainDays.Location = New System.Drawing.Point(39, 115) + Me.lblNumberRainDays.Name = "lblNumberRainDays" + Me.lblNumberRainDays.Size = New System.Drawing.Size(39, 13) + Me.lblNumberRainDays.TabIndex = 7 + Me.lblNumberRainDays.Tag = "Number_of_Rain_Days" + Me.lblNumberRainDays.Text = "Label1" + ' + 'lblTotalRain + ' + Me.lblTotalRain.AutoSize = True + Me.lblTotalRain.Location = New System.Drawing.Point(39, 135) + Me.lblTotalRain.Name = "lblTotalRain" + Me.lblTotalRain.Size = New System.Drawing.Size(39, 13) + Me.lblTotalRain.TabIndex = 8 + Me.lblTotalRain.Tag = "Total_Rain" + Me.lblTotalRain.Text = "Label1" + ' + 'nudTotalRain + ' + Me.nudTotalRain.Location = New System.Drawing.Point(192, 131) + Me.nudTotalRain.Maximum = New Decimal(New Integer() {200, 0, 0, 0}) + Me.nudTotalRain.Name = "nudTotalRain" + Me.nudTotalRain.Size = New System.Drawing.Size(35, 20) + Me.nudTotalRain.TabIndex = 9 + Me.nudTotalRain.Value = New Decimal(New Integer() {20, 0, 0, 0}) + ' + 'chkDrySpell + ' + Me.chkDrySpell.AutoSize = True + Me.chkDrySpell.Location = New System.Drawing.Point(12, 163) + Me.chkDrySpell.Name = "chkDrySpell" + Me.chkDrySpell.Size = New System.Drawing.Size(81, 17) + Me.chkDrySpell.TabIndex = 10 + Me.chkDrySpell.Tag = "Dry_Spell" + Me.chkDrySpell.Text = "CheckBox1" + Me.chkDrySpell.UseVisualStyleBackColor = True + ' + 'nudWithin + ' + Me.nudWithin.Location = New System.Drawing.Point(288, 189) + Me.nudWithin.Maximum = New Decimal(New Integer() {200, 0, 0, 0}) + Me.nudWithin.Name = "nudWithin" + Me.nudWithin.Size = New System.Drawing.Size(35, 20) + Me.nudWithin.TabIndex = 14 + Me.nudWithin.Value = New Decimal(New Integer() {30, 0, 0, 0}) + ' + 'lblWithin + ' + Me.lblWithin.AutoSize = True + Me.lblWithin.Location = New System.Drawing.Point(233, 193) + Me.lblWithin.Name = "lblWithin" + Me.lblWithin.Size = New System.Drawing.Size(39, 13) + Me.lblWithin.TabIndex = 13 + Me.lblWithin.Tag = "Within" + Me.lblWithin.Text = "Label1" + ' + 'lblDryLength + ' + Me.lblDryLength.AutoSize = True + Me.lblDryLength.Location = New System.Drawing.Point(39, 193) + Me.lblDryLength.Name = "lblDryLength" + Me.lblDryLength.Size = New System.Drawing.Size(39, 13) + Me.lblDryLength.TabIndex = 12 + Me.lblDryLength.Tag = "Length_of_Dry_Spell" + Me.lblDryLength.Text = "Label1" + ' + 'nudDryLength + ' + Me.nudDryLength.Location = New System.Drawing.Point(192, 189) + Me.nudDryLength.Name = "nudDryLength" + Me.nudDryLength.Size = New System.Drawing.Size(35, 20) + Me.nudDryLength.TabIndex = 11 + Me.nudDryLength.Value = New Decimal(New Integer() {10, 0, 0, 0}) + ' + 'lblDays + ' + Me.lblDays.AutoSize = True + Me.lblDays.Location = New System.Drawing.Point(329, 193) + Me.lblDays.Name = "lblDays" + Me.lblDays.Size = New System.Drawing.Size(13, 13) + Me.lblDays.TabIndex = 15 + Me.lblDays.Tag = "Days" + Me.lblDays.Text = "2" + ' + 'lblColumnName + ' + Me.lblColumnName.AutoSize = True + Me.lblColumnName.Location = New System.Drawing.Point(39, 230) + Me.lblColumnName.Name = "lblColumnName" + Me.lblColumnName.Size = New System.Drawing.Size(39, 13) + Me.lblColumnName.TabIndex = 16 + Me.lblColumnName.Tag = "Column_Name" + Me.lblColumnName.Text = "Label1" + ' + 'txtColumnName + ' + Me.txtColumnName.Location = New System.Drawing.Point(192, 222) + Me.txtColumnName.Name = "txtColumnName" + Me.txtColumnName.Size = New System.Drawing.Size(100, 20) + Me.txtColumnName.TabIndex = 17 + Me.txtColumnName.Tag = "Start_of_Rain" + ' + 'nudEarliest + ' + Me.nudEarliest.Location = New System.Drawing.Point(192, 68) + Me.nudEarliest.Maximum = New Decimal(New Integer() {366, 0, 0, 0}) + Me.nudEarliest.Minimum = New Decimal(New Integer() {1, 0, 0, 0}) + Me.nudEarliest.Name = "nudEarliest" + Me.nudEarliest.Size = New System.Drawing.Size(53, 20) + Me.nudEarliest.TabIndex = 18 + Me.nudEarliest.Value = New Decimal(New Integer() {92, 0, 0, 0}) + ' + 'nudThreshold + ' + Me.nudThreshold.DecimalPlaces = 2 + Me.nudThreshold.Increment = New Decimal(New Integer() {1, 0, 0, 65536}) + Me.nudThreshold.Location = New System.Drawing.Point(192, 89) + Me.nudThreshold.Name = "nudThreshold" + Me.nudThreshold.Size = New System.Drawing.Size(53, 20) + Me.nudThreshold.TabIndex = 19 + Me.nudThreshold.Value = New Decimal(New Integer() {85, 0, 0, 131072}) + ' + 'ucrBase + ' + Me.ucrBase.Location = New System.Drawing.Point(14, 275) + Me.ucrBase.Name = "ucrBase" + Me.ucrBase.Size = New System.Drawing.Size(409, 52) + Me.ucrBase.TabIndex = 0 + ' + 'dlgStartofRains + ' + Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) + Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.ClientSize = New System.Drawing.Size(449, 328) + Me.Controls.Add(Me.nudThreshold) + Me.Controls.Add(Me.nudEarliest) + Me.Controls.Add(Me.txtColumnName) + Me.Controls.Add(Me.lblColumnName) + Me.Controls.Add(Me.lblDays) + Me.Controls.Add(Me.nudWithin) + Me.Controls.Add(Me.lblWithin) + Me.Controls.Add(Me.lblDryLength) + Me.Controls.Add(Me.nudDryLength) + Me.Controls.Add(Me.chkDrySpell) + Me.Controls.Add(Me.nudTotalRain) + Me.Controls.Add(Me.lblTotalRain) + Me.Controls.Add(Me.lblNumberRainDays) + Me.Controls.Add(Me.lblThreashold) + Me.Controls.Add(Me.nudNumberofRainDays) + Me.Controls.Add(Me.lblEarliest) + Me.Controls.Add(Me.lblDataList) + Me.Controls.Add(Me.ucrBase) + Me.MaximizeBox = False + Me.MinimizeBox = False + Me.Name = "dlgStartofRains" + Me.ShowIcon = False + Me.Text = "Start of Rains" + CType(Me.nudNumberofRainDays, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.nudTotalRain, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.nudWithin, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.nudDryLength, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.nudEarliest, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.nudThreshold, System.ComponentModel.ISupportInitialize).EndInit() + Me.ResumeLayout(False) + Me.PerformLayout() + End Sub Friend WithEvents ucrBase As ucrButtons diff --git a/instat/dlgStemAndLeaf.Designer.vb b/instat/dlgStemAndLeaf.Designer.vb index 946b71a6df7..10a898d2768 100644 --- a/instat/dlgStemAndLeaf.Designer.vb +++ b/instat/dlgStemAndLeaf.Designer.vb @@ -22,21 +22,22 @@ Partial Class dlgStemAndLeaf 'Do not modify it using the code editor. _ Private Sub InitializeComponent() - Me.UcrAddRemove = New instat.ucrSelectorAddRemove() + Me.ucrAddRemove = New instat.ucrSelectorAddRemove() Me.ucrReceiverStemAndLeaf = New instat.ucrReceiverSingle() Me.ucrBase = New instat.ucrButtons() + Me.lblSelectedVariable = New System.Windows.Forms.Label() Me.SuspendLayout() ' - 'UcrAddRemove + 'ucrAddRemove ' - Me.UcrAddRemove.Location = New System.Drawing.Point(2, 12) - Me.UcrAddRemove.Name = "UcrAddRemove" - Me.UcrAddRemove.Size = New System.Drawing.Size(186, 129) - Me.UcrAddRemove.TabIndex = 0 + Me.ucrAddRemove.Location = New System.Drawing.Point(2, 12) + Me.ucrAddRemove.Name = "ucrAddRemove" + Me.ucrAddRemove.Size = New System.Drawing.Size(213, 129) + Me.ucrAddRemove.TabIndex = 0 ' 'ucrReceiverStemAndLeaf ' - Me.ucrReceiverStemAndLeaf.Location = New System.Drawing.Point(245, 40) + Me.ucrReceiverStemAndLeaf.Location = New System.Drawing.Point(245, 49) Me.ucrReceiverStemAndLeaf.Name = "ucrReceiverStemAndLeaf" Me.ucrReceiverStemAndLeaf.Size = New System.Drawing.Size(106, 26) Me.ucrReceiverStemAndLeaf.TabIndex = 1 @@ -48,25 +49,38 @@ Partial Class dlgStemAndLeaf Me.ucrBase.Size = New System.Drawing.Size(410, 52) Me.ucrBase.TabIndex = 2 ' + 'lblSelectedVariable + ' + Me.lblSelectedVariable.AutoSize = True + Me.lblSelectedVariable.Location = New System.Drawing.Point(252, 34) + Me.lblSelectedVariable.Name = "lblSelectedVariable" + Me.lblSelectedVariable.Size = New System.Drawing.Size(90, 13) + Me.lblSelectedVariable.TabIndex = 3 + Me.lblSelectedVariable.Tag = "Selected_Variable" + Me.lblSelectedVariable.Text = "Selected Variable" + ' 'dlgStemAndLeaf ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.ClientSize = New System.Drawing.Size(443, 280) + Me.Controls.Add(Me.lblSelectedVariable) Me.Controls.Add(Me.ucrBase) Me.Controls.Add(Me.ucrReceiverStemAndLeaf) - Me.Controls.Add(Me.UcrAddRemove) - Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog + Me.Controls.Add(Me.ucrAddRemove) + Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow Me.MaximizeBox = False Me.MinimizeBox = False Me.Name = "dlgStemAndLeaf" - Me.Tag = "StemandLeaf" + Me.Tag = "Stem_and_Leaf" Me.Text = "Stem and Leaf" Me.ResumeLayout(False) + Me.PerformLayout() End Sub - Friend WithEvents UcrAddRemove As ucrSelectorAddRemove + Friend WithEvents ucrAddRemove As ucrSelectorAddRemove Friend WithEvents ucrReceiverStemAndLeaf As ucrReceiverSingle Friend WithEvents ucrBase As ucrButtons + Friend WithEvents lblSelectedVariable As Label End Class diff --git a/instat/dlgStemAndLeaf.vb b/instat/dlgStemAndLeaf.vb index 5f15287bdec..ca3e79329ef 100644 --- a/instat/dlgStemAndLeaf.vb +++ b/instat/dlgStemAndLeaf.vb @@ -19,7 +19,7 @@ Public Class dlgStemAndLeaf Private Sub dlgStemAndLeaf_Load(sender As Object, e As EventArgs) Handles MyBase.Load ucrBase.clsRsyntax.SetFunction("stem") ucrBase.clsRsyntax.iCallType = 2 - ucrReceiverStemAndLeaf.Selector = UcrAddRemove + ucrReceiverStemAndLeaf.Selector = ucrAddRemove ucrReceiverStemAndLeaf.SetMeAsReceiver() autoTranslate(Me) End Sub diff --git a/instat/dlgSummary.Designer.vb b/instat/dlgSummary.Designer.vb index 6eee607f670..46ba1644f27 100644 --- a/instat/dlgSummary.Designer.vb +++ b/instat/dlgSummary.Designer.vb @@ -20,18 +20,30 @@ Partial Class dlgSummary '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() - ' - 'dlgSummary - ' - 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.Name = "dlgSummary" - Me.Text = "dlgSummary" - Me.ResumeLayout(False) - - End Sub + Me.ucrBase = New instat.ucrButtons() + Me.SuspendLayout() + ' + 'ucrBase + ' + Me.ucrBase.Location = New System.Drawing.Point(12, 234) + Me.ucrBase.Name = "ucrBase" + Me.ucrBase.Size = New System.Drawing.Size(410, 53) + Me.ucrBase.TabIndex = 0 + ' + 'dlgSummary + ' + Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) + Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.ClientSize = New System.Drawing.Size(438, 289) + Me.Controls.Add(Me.ucrBase) + Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow + Me.Name = "dlgSummary" + Me.Text = "dlgSummary" + Me.ResumeLayout(False) + + End Sub + + Friend WithEvents ucrBase As ucrButtons End Class diff --git a/instat/dlgSummaryTables.designer.vb b/instat/dlgSummaryTables.designer.vb index bba6cfeb754..6bc346ce1e8 100644 --- a/instat/dlgSummaryTables.designer.vb +++ b/instat/dlgSummaryTables.designer.vb @@ -22,243 +22,243 @@ Partial Class dlgSummaryTables 'Do not modify it using the code editor. _ Private Sub InitializeComponent() - Me.ucrBase = New instat.ucrButtons() - Me.ucrAddRemove = New instat.ucrSelectorAddRemove() - Me.ucrReceiverFactor = New instat.ucrReceiverMultiple() - Me.ucrReceiverVariate = New instat.ucrReceiverMultiple() - Me.lblFactors = New System.Windows.Forms.Label() - Me.lblVariates = New System.Windows.Forms.Label() - Me.grpTwoways = New System.Windows.Forms.GroupBox() - Me.lblDecimals = New System.Windows.Forms.Label() - Me.nudDecimals = New System.Windows.Forms.NumericUpDown() - Me.lblColumnFactors = New System.Windows.Forms.Label() - Me.TextBox1 = New System.Windows.Forms.TextBox() - Me.chkDisplayMargins = New System.Windows.Forms.CheckBox() - Me.grpSummaryStat = New System.Windows.Forms.GroupBox() - Me.cmdMore = New System.Windows.Forms.Button() - Me.chkMeans = New System.Windows.Forms.CheckBox() - Me.chkTotals = New System.Windows.Forms.CheckBox() - Me.cboWeights = New System.Windows.Forms.ComboBox() - Me.chkWeights = New System.Windows.Forms.CheckBox() - Me.chkTobeImplementedLater = New System.Windows.Forms.CheckBox() - Me.grpTwoways.SuspendLayout() - CType(Me.nudDecimals, System.ComponentModel.ISupportInitialize).BeginInit() - Me.grpSummaryStat.SuspendLayout() - Me.SuspendLayout() - ' - 'ucrBase - ' - Me.ucrBase.Location = New System.Drawing.Point(2, 295) - Me.ucrBase.Name = "ucrBase" - Me.ucrBase.Size = New System.Drawing.Size(407, 55) - Me.ucrBase.TabIndex = 0 - ' - 'ucrAddRemove - ' - Me.ucrAddRemove.Location = New System.Drawing.Point(2, 3) - Me.ucrAddRemove.Name = "ucrAddRemove" - Me.ucrAddRemove.Size = New System.Drawing.Size(207, 127) - Me.ucrAddRemove.TabIndex = 1 - ' - 'ucrReceiverFactor - ' - Me.ucrReceiverFactor.Location = New System.Drawing.Point(205, 19) - Me.ucrReceiverFactor.Name = "ucrReceiverFactor" - Me.ucrReceiverFactor.Size = New System.Drawing.Size(91, 101) - Me.ucrReceiverFactor.TabIndex = 2 - ' - 'ucrReceiverVariate - ' - Me.ucrReceiverVariate.Location = New System.Drawing.Point(305, 19) - Me.ucrReceiverVariate.Name = "ucrReceiverVariate" - Me.ucrReceiverVariate.Size = New System.Drawing.Size(91, 101) - Me.ucrReceiverVariate.TabIndex = 3 - ' - 'lblFactors - ' - Me.lblFactors.AutoSize = True - Me.lblFactors.Location = New System.Drawing.Point(202, 3) - Me.lblFactors.Name = "lblFactors" - Me.lblFactors.Size = New System.Drawing.Size(42, 13) - Me.lblFactors.TabIndex = 4 - Me.lblFactors.Tag = "Factors" - Me.lblFactors.Text = "Factors" - ' - 'lblVariates - ' - Me.lblVariates.AutoSize = True - Me.lblVariates.Location = New System.Drawing.Point(302, 3) - Me.lblVariates.Name = "lblVariates" - Me.lblVariates.Size = New System.Drawing.Size(45, 13) - Me.lblVariates.TabIndex = 5 - Me.lblVariates.Tag = "Variates" - Me.lblVariates.Text = "Variates" - ' - 'grpTwoways - ' - Me.grpTwoways.Controls.Add(Me.lblDecimals) - Me.grpTwoways.Controls.Add(Me.nudDecimals) - Me.grpTwoways.Controls.Add(Me.lblColumnFactors) - Me.grpTwoways.Controls.Add(Me.TextBox1) - Me.grpTwoways.Controls.Add(Me.chkDisplayMargins) - Me.grpTwoways.Location = New System.Drawing.Point(12, 166) - Me.grpTwoways.Name = "grpTwoways" - Me.grpTwoways.Size = New System.Drawing.Size(207, 100) - Me.grpTwoways.TabIndex = 6 - Me.grpTwoways.TabStop = False - Me.grpTwoways.Tag = "Two_ways_table(s)" - Me.grpTwoways.Text = "Two way table(s)" - ' - 'lblDecimals - ' - Me.lblDecimals.AutoSize = True - Me.lblDecimals.Location = New System.Drawing.Point(6, 77) - Me.lblDecimals.Name = "lblDecimals" - Me.lblDecimals.Size = New System.Drawing.Size(50, 13) - Me.lblDecimals.TabIndex = 4 - Me.lblDecimals.Tag = "Decimals" - Me.lblDecimals.Text = "Decimals" - ' - 'nudDecimals - ' - Me.nudDecimals.AllowDrop = True - Me.nudDecimals.Location = New System.Drawing.Point(95, 75) - Me.nudDecimals.Maximum = New Decimal(New Integer() {5, 0, 0, 0}) - Me.nudDecimals.Name = "nudDecimals" - Me.nudDecimals.Size = New System.Drawing.Size(44, 20) - Me.nudDecimals.TabIndex = 3 - ' - 'lblColumnFactors - ' - Me.lblColumnFactors.AutoSize = True - Me.lblColumnFactors.Location = New System.Drawing.Point(6, 46) - Me.lblColumnFactors.Name = "lblColumnFactors" - Me.lblColumnFactors.Size = New System.Drawing.Size(77, 13) - Me.lblColumnFactors.TabIndex = 2 - Me.lblColumnFactors.Tag = "Column_factors" - Me.lblColumnFactors.Text = "Column factors" - ' - 'TextBox1 - ' - Me.TextBox1.Location = New System.Drawing.Point(95, 42) - Me.TextBox1.Name = "TextBox1" - Me.TextBox1.Size = New System.Drawing.Size(29, 20) - Me.TextBox1.TabIndex = 1 - ' - 'chkDisplayMargins - ' - Me.chkDisplayMargins.AutoSize = True - Me.chkDisplayMargins.Location = New System.Drawing.Point(23, 19) - Me.chkDisplayMargins.Name = "chkDisplayMargins" - Me.chkDisplayMargins.Size = New System.Drawing.Size(99, 17) - Me.chkDisplayMargins.TabIndex = 0 - Me.chkDisplayMargins.Tag = "Display_margins" - Me.chkDisplayMargins.Text = "Display margins" - Me.chkDisplayMargins.UseVisualStyleBackColor = True - ' - 'grpSummaryStat - ' - Me.grpSummaryStat.Controls.Add(Me.cmdMore) - Me.grpSummaryStat.Controls.Add(Me.chkMeans) - Me.grpSummaryStat.Controls.Add(Me.chkTotals) - Me.grpSummaryStat.Location = New System.Drawing.Point(234, 166) - Me.grpSummaryStat.Name = "grpSummaryStat" - Me.grpSummaryStat.Size = New System.Drawing.Size(151, 100) - Me.grpSummaryStat.TabIndex = 7 - Me.grpSummaryStat.TabStop = False - Me.grpSummaryStat.Tag = "Summary_statistics" - Me.grpSummaryStat.Text = "Summary statistics" - ' - 'cmdMore - ' - Me.cmdMore.Location = New System.Drawing.Point(36, 65) - Me.cmdMore.Name = "cmdMore" - Me.cmdMore.Size = New System.Drawing.Size(75, 23) - Me.cmdMore.TabIndex = 2 - Me.cmdMore.Tag = "More" - Me.cmdMore.Text = "More" - Me.cmdMore.UseVisualStyleBackColor = True - ' - 'chkMeans - ' - Me.chkMeans.AutoSize = True - Me.chkMeans.Location = New System.Drawing.Point(7, 42) - Me.chkMeans.Name = "chkMeans" - Me.chkMeans.Size = New System.Drawing.Size(58, 17) - Me.chkMeans.TabIndex = 1 - Me.chkMeans.Tag = "Means" - Me.chkMeans.Text = "Means" - Me.chkMeans.UseVisualStyleBackColor = True - ' - 'chkTotals - ' - Me.chkTotals.AutoSize = True - Me.chkTotals.Location = New System.Drawing.Point(7, 19) - Me.chkTotals.Name = "chkTotals" - Me.chkTotals.Size = New System.Drawing.Size(55, 17) - Me.chkTotals.TabIndex = 0 - Me.chkTotals.Tag = "Totals" - Me.chkTotals.Text = "Totals" - Me.chkTotals.UseVisualStyleBackColor = True - ' - 'cboWeights - ' - Me.cboWeights.FormattingEnabled = True - Me.cboWeights.Location = New System.Drawing.Point(205, 134) - Me.cboWeights.Name = "cboWeights" - Me.cboWeights.Size = New System.Drawing.Size(83, 21) - Me.cboWeights.TabIndex = 9 - ' - 'chkWeights - ' - Me.chkWeights.AutoSize = True - Me.chkWeights.Location = New System.Drawing.Point(118, 136) - Me.chkWeights.Name = "chkWeights" - Me.chkWeights.Size = New System.Drawing.Size(65, 17) - Me.chkWeights.TabIndex = 8 - Me.chkWeights.Tag = "Weights" - Me.chkWeights.Text = "Weights" - Me.chkWeights.UseVisualStyleBackColor = True - ' - 'chkTobeImplementedLater - ' - Me.chkTobeImplementedLater.AutoSize = True - Me.chkTobeImplementedLater.Location = New System.Drawing.Point(12, 272) - Me.chkTobeImplementedLater.Name = "chkTobeImplementedLater" - Me.chkTobeImplementedLater.Size = New System.Drawing.Size(139, 17) - Me.chkTobeImplementedLater.TabIndex = 10 - Me.chkTobeImplementedLater.Text = "To be implemented later" - Me.chkTobeImplementedLater.UseVisualStyleBackColor = True - ' - 'dlgSummaryTables - ' - Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) - Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(408, 350) - Me.Controls.Add(Me.chkTobeImplementedLater) - Me.Controls.Add(Me.cboWeights) - Me.Controls.Add(Me.chkWeights) - Me.Controls.Add(Me.grpSummaryStat) - Me.Controls.Add(Me.grpTwoways) - Me.Controls.Add(Me.lblVariates) - Me.Controls.Add(Me.lblFactors) - Me.Controls.Add(Me.ucrReceiverVariate) - Me.Controls.Add(Me.ucrReceiverFactor) - Me.Controls.Add(Me.ucrAddRemove) - Me.Controls.Add(Me.ucrBase) - Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow - Me.Name = "dlgSummaryTables" - Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen - Me.Tag = "Summary_Tables" - Me.Text = "Summary Tables" - Me.grpTwoways.ResumeLayout(False) - Me.grpTwoways.PerformLayout() - CType(Me.nudDecimals, System.ComponentModel.ISupportInitialize).EndInit() - Me.grpSummaryStat.ResumeLayout(False) - Me.grpSummaryStat.PerformLayout() - Me.ResumeLayout(False) - Me.PerformLayout() - + Me.ucrBase = New instat.ucrButtons() + Me.ucrAddRemove = New instat.ucrSelectorAddRemove() + Me.ucrReceiverFactor = New instat.ucrReceiverMultiple() + Me.ucrReceiverVariate = New instat.ucrReceiverMultiple() + Me.lblFactors = New System.Windows.Forms.Label() + Me.lblVariates = New System.Windows.Forms.Label() + Me.grpTwoways = New System.Windows.Forms.GroupBox() + Me.lblDecimals = New System.Windows.Forms.Label() + Me.nudDecimals = New System.Windows.Forms.NumericUpDown() + Me.lblColumnFactors = New System.Windows.Forms.Label() + Me.txtColumnFactors = New System.Windows.Forms.TextBox() + Me.chkDisplayMargins = New System.Windows.Forms.CheckBox() + Me.grpSummaryStat = New System.Windows.Forms.GroupBox() + Me.cmdMore = New System.Windows.Forms.Button() + Me.chkMeans = New System.Windows.Forms.CheckBox() + Me.chkTotals = New System.Windows.Forms.CheckBox() + Me.cboWeights = New System.Windows.Forms.ComboBox() + Me.chkWeights = New System.Windows.Forms.CheckBox() + Me.chkTobeImplementedLater = New System.Windows.Forms.CheckBox() + Me.grpTwoways.SuspendLayout() + CType(Me.nudDecimals, System.ComponentModel.ISupportInitialize).BeginInit() + Me.grpSummaryStat.SuspendLayout() + Me.SuspendLayout() + ' + 'ucrBase + ' + Me.ucrBase.Location = New System.Drawing.Point(2, 295) + Me.ucrBase.Name = "ucrBase" + Me.ucrBase.Size = New System.Drawing.Size(407, 55) + Me.ucrBase.TabIndex = 0 + ' + 'ucrAddRemove + ' + Me.ucrAddRemove.Location = New System.Drawing.Point(2, 3) + Me.ucrAddRemove.Name = "ucrAddRemove" + Me.ucrAddRemove.Size = New System.Drawing.Size(207, 127) + Me.ucrAddRemove.TabIndex = 1 + ' + 'ucrReceiverFactor + ' + Me.ucrReceiverFactor.Location = New System.Drawing.Point(205, 19) + Me.ucrReceiverFactor.Name = "ucrReceiverFactor" + Me.ucrReceiverFactor.Size = New System.Drawing.Size(91, 101) + Me.ucrReceiverFactor.TabIndex = 2 + ' + 'ucrReceiverVariate + ' + Me.ucrReceiverVariate.Location = New System.Drawing.Point(305, 19) + Me.ucrReceiverVariate.Name = "ucrReceiverVariate" + Me.ucrReceiverVariate.Size = New System.Drawing.Size(91, 101) + Me.ucrReceiverVariate.TabIndex = 3 + ' + 'lblFactors + ' + Me.lblFactors.AutoSize = True + Me.lblFactors.Location = New System.Drawing.Point(202, 3) + Me.lblFactors.Name = "lblFactors" + Me.lblFactors.Size = New System.Drawing.Size(42, 13) + Me.lblFactors.TabIndex = 4 + Me.lblFactors.Tag = "Factors" + Me.lblFactors.Text = "Factors" + ' + 'lblVariates + ' + Me.lblVariates.AutoSize = True + Me.lblVariates.Location = New System.Drawing.Point(302, 3) + Me.lblVariates.Name = "lblVariates" + Me.lblVariates.Size = New System.Drawing.Size(45, 13) + Me.lblVariates.TabIndex = 5 + Me.lblVariates.Tag = "Variates" + Me.lblVariates.Text = "Variates" + ' + 'grpTwoways + ' + Me.grpTwoways.Controls.Add(Me.lblDecimals) + Me.grpTwoways.Controls.Add(Me.nudDecimals) + Me.grpTwoways.Controls.Add(Me.lblColumnFactors) + Me.grpTwoways.Controls.Add(Me.txtColumnFactors) + Me.grpTwoways.Controls.Add(Me.chkDisplayMargins) + Me.grpTwoways.Location = New System.Drawing.Point(12, 166) + Me.grpTwoways.Name = "grpTwoways" + Me.grpTwoways.Size = New System.Drawing.Size(207, 100) + Me.grpTwoways.TabIndex = 6 + Me.grpTwoways.TabStop = False + Me.grpTwoways.Tag = "Two_ways_table(s)" + Me.grpTwoways.Text = "Two way table(s)" + ' + 'lblDecimals + ' + Me.lblDecimals.AutoSize = True + Me.lblDecimals.Location = New System.Drawing.Point(6, 77) + Me.lblDecimals.Name = "lblDecimals" + Me.lblDecimals.Size = New System.Drawing.Size(50, 13) + Me.lblDecimals.TabIndex = 4 + Me.lblDecimals.Tag = "Decimals" + Me.lblDecimals.Text = "Decimals" + ' + 'nudDecimals + ' + Me.nudDecimals.AllowDrop = True + Me.nudDecimals.Location = New System.Drawing.Point(95, 75) + Me.nudDecimals.Maximum = New Decimal(New Integer() {5, 0, 0, 0}) + Me.nudDecimals.Name = "nudDecimals" + Me.nudDecimals.Size = New System.Drawing.Size(44, 20) + Me.nudDecimals.TabIndex = 3 + ' + 'lblColumnFactors + ' + Me.lblColumnFactors.AutoSize = True + Me.lblColumnFactors.Location = New System.Drawing.Point(6, 46) + Me.lblColumnFactors.Name = "lblColumnFactors" + Me.lblColumnFactors.Size = New System.Drawing.Size(77, 13) + Me.lblColumnFactors.TabIndex = 2 + Me.lblColumnFactors.Tag = "Column_factors" + Me.lblColumnFactors.Text = "Column factors" + ' + 'txtColumnFactors + ' + Me.txtColumnFactors.Location = New System.Drawing.Point(95, 42) + Me.txtColumnFactors.Name = "txtColumnFactors" + Me.txtColumnFactors.Size = New System.Drawing.Size(29, 20) + Me.txtColumnFactors.TabIndex = 1 + ' + 'chkDisplayMargins + ' + Me.chkDisplayMargins.AutoSize = True + Me.chkDisplayMargins.Location = New System.Drawing.Point(23, 19) + Me.chkDisplayMargins.Name = "chkDisplayMargins" + Me.chkDisplayMargins.Size = New System.Drawing.Size(99, 17) + Me.chkDisplayMargins.TabIndex = 0 + Me.chkDisplayMargins.Tag = "Display_margins" + Me.chkDisplayMargins.Text = "Display margins" + Me.chkDisplayMargins.UseVisualStyleBackColor = True + ' + 'grpSummaryStat + ' + Me.grpSummaryStat.Controls.Add(Me.cmdMore) + Me.grpSummaryStat.Controls.Add(Me.chkMeans) + Me.grpSummaryStat.Controls.Add(Me.chkTotals) + Me.grpSummaryStat.Location = New System.Drawing.Point(234, 166) + Me.grpSummaryStat.Name = "grpSummaryStat" + Me.grpSummaryStat.Size = New System.Drawing.Size(151, 100) + Me.grpSummaryStat.TabIndex = 7 + Me.grpSummaryStat.TabStop = False + Me.grpSummaryStat.Tag = "Summary_statistics" + Me.grpSummaryStat.Text = "Summary statistics" + ' + 'cmdMore + ' + Me.cmdMore.Location = New System.Drawing.Point(36, 65) + Me.cmdMore.Name = "cmdMore" + Me.cmdMore.Size = New System.Drawing.Size(75, 23) + Me.cmdMore.TabIndex = 2 + Me.cmdMore.Tag = "More" + Me.cmdMore.Text = "More" + Me.cmdMore.UseVisualStyleBackColor = True + ' + 'chkMeans + ' + Me.chkMeans.AutoSize = True + Me.chkMeans.Location = New System.Drawing.Point(7, 42) + Me.chkMeans.Name = "chkMeans" + Me.chkMeans.Size = New System.Drawing.Size(58, 17) + Me.chkMeans.TabIndex = 1 + Me.chkMeans.Tag = "Means" + Me.chkMeans.Text = "Means" + Me.chkMeans.UseVisualStyleBackColor = True + ' + 'chkTotals + ' + Me.chkTotals.AutoSize = True + Me.chkTotals.Location = New System.Drawing.Point(7, 19) + Me.chkTotals.Name = "chkTotals" + Me.chkTotals.Size = New System.Drawing.Size(55, 17) + Me.chkTotals.TabIndex = 0 + Me.chkTotals.Tag = "Totals" + Me.chkTotals.Text = "Totals" + Me.chkTotals.UseVisualStyleBackColor = True + ' + 'cboWeights + ' + Me.cboWeights.FormattingEnabled = True + Me.cboWeights.Location = New System.Drawing.Point(205, 134) + Me.cboWeights.Name = "cboWeights" + Me.cboWeights.Size = New System.Drawing.Size(83, 21) + Me.cboWeights.TabIndex = 9 + ' + 'chkWeights + ' + Me.chkWeights.AutoSize = True + Me.chkWeights.Location = New System.Drawing.Point(118, 136) + Me.chkWeights.Name = "chkWeights" + Me.chkWeights.Size = New System.Drawing.Size(65, 17) + Me.chkWeights.TabIndex = 8 + Me.chkWeights.Tag = "Weights" + Me.chkWeights.Text = "Weights" + Me.chkWeights.UseVisualStyleBackColor = True + ' + 'chkTobeImplementedLater + ' + Me.chkTobeImplementedLater.AutoSize = True + Me.chkTobeImplementedLater.Location = New System.Drawing.Point(12, 272) + Me.chkTobeImplementedLater.Name = "chkTobeImplementedLater" + Me.chkTobeImplementedLater.Size = New System.Drawing.Size(139, 17) + Me.chkTobeImplementedLater.TabIndex = 10 + Me.chkTobeImplementedLater.Text = "To be implemented later" + Me.chkTobeImplementedLater.UseVisualStyleBackColor = True + ' + 'dlgSummaryTables + ' + Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) + Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.ClientSize = New System.Drawing.Size(408, 350) + Me.Controls.Add(Me.chkTobeImplementedLater) + Me.Controls.Add(Me.cboWeights) + Me.Controls.Add(Me.chkWeights) + Me.Controls.Add(Me.grpSummaryStat) + Me.Controls.Add(Me.grpTwoways) + Me.Controls.Add(Me.lblVariates) + Me.Controls.Add(Me.lblFactors) + Me.Controls.Add(Me.ucrReceiverVariate) + Me.Controls.Add(Me.ucrReceiverFactor) + Me.Controls.Add(Me.ucrAddRemove) + Me.Controls.Add(Me.ucrBase) + Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow + Me.Name = "dlgSummaryTables" + Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen + Me.Tag = "Summary_Tables" + Me.Text = "Summary Tables" + Me.grpTwoways.ResumeLayout(False) + Me.grpTwoways.PerformLayout() + CType(Me.nudDecimals, System.ComponentModel.ISupportInitialize).EndInit() + Me.grpSummaryStat.ResumeLayout(False) + Me.grpSummaryStat.PerformLayout() + Me.ResumeLayout(False) + Me.PerformLayout() + End Sub Friend WithEvents ucrBase As ucrButtons @@ -278,6 +278,6 @@ Partial Class dlgSummaryTables Friend WithEvents lblDecimals As Label Friend WithEvents nudDecimals As NumericUpDown Friend WithEvents lblColumnFactors As Label - Friend WithEvents TextBox1 As TextBox + Friend WithEvents txtColumnFactors As TextBox Friend WithEvents chkDisplayMargins As CheckBox End Class diff --git a/instat/dlgThreeSummaries.Designer.vb b/instat/dlgThreeSummaries.Designer.vb index eba0ec35a41..779c5fe2646 100644 --- a/instat/dlgThreeSummaries.Designer.vb +++ b/instat/dlgThreeSummaries.Designer.vb @@ -22,30 +22,30 @@ Partial Class dlgThreeSummaries '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, 292) - Me.ucrBase.Name = "ucrBase" - Me.ucrBase.Size = New System.Drawing.Size(410, 32) - Me.ucrBase.TabIndex = 0 - ' - 'dlgThreeSummaries - ' - Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) - Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(428, 330) - Me.Controls.Add(Me.ucrBase) - Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog - Me.MaximizeBox = False - Me.MinimizeBox = False - Me.Name = "dlgThreeSummaries" - Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen - Me.Text = "ThreeSummaries" - Me.ResumeLayout(False) - + Me.ucrBase = New instat.ucrButtons() + Me.SuspendLayout() + ' + 'ucrBase + ' + Me.ucrBase.Location = New System.Drawing.Point(12, 269) + Me.ucrBase.Name = "ucrBase" + Me.ucrBase.Size = New System.Drawing.Size(410, 55) + Me.ucrBase.TabIndex = 0 + ' + 'dlgThreeSummaries + ' + Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) + Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.ClientSize = New System.Drawing.Size(428, 330) + Me.Controls.Add(Me.ucrBase) + Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog + Me.MaximizeBox = False + Me.MinimizeBox = False + Me.Name = "dlgThreeSummaries" + Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen + Me.Text = "ThreeSummaries" + Me.ResumeLayout(False) + End Sub Friend WithEvents ucrBase As ucrButtons diff --git a/instat/dlgTimeseriesPlot.designer.vb b/instat/dlgTimeseriesPlot.designer.vb index e68c67b0ecf..5613358ec55 100644 --- a/instat/dlgTimeseriesPlot.designer.vb +++ b/instat/dlgTimeseriesPlot.designer.vb @@ -22,42 +22,42 @@ Partial Class dlgTimeseriesPlot 'Do not modify it using the code editor. _ Private Sub InitializeComponent() - Me.ucrBase = New instat.ucrButtons() - Me.Label1 = New System.Windows.Forms.Label() - Me.SuspendLayout() - ' - 'ucrBase - ' - Me.ucrBase.Location = New System.Drawing.Point(12, 228) - Me.ucrBase.Name = "ucrBase" - Me.ucrBase.Size = New System.Drawing.Size(410, 32) - Me.ucrBase.TabIndex = 0 - ' - 'Label1 - ' - Me.Label1.AutoSize = True - Me.Label1.Location = New System.Drawing.Point(107, 34) - Me.Label1.Name = "Label1" - Me.Label1.Size = New System.Drawing.Size(125, 13) - Me.Label1.TabIndex = 1 - Me.Label1.Text = "Data list not implemented" - ' - 'dlgTimeseriesPlot - ' - Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) - Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(439, 272) - Me.Controls.Add(Me.Label1) - Me.Controls.Add(Me.ucrBase) - Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog - Me.MaximizeBox = False - Me.MinimizeBox = False - Me.Name = "dlgTimeseriesPlot" - Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen - Me.Text = "Timeseries Plot" - Me.ResumeLayout(False) - Me.PerformLayout() - + Me.ucrBase = New instat.ucrButtons() + Me.Label1 = New System.Windows.Forms.Label() + Me.SuspendLayout() + ' + 'ucrBase + ' + Me.ucrBase.Location = New System.Drawing.Point(12, 205) + Me.ucrBase.Name = "ucrBase" + Me.ucrBase.Size = New System.Drawing.Size(410, 55) + Me.ucrBase.TabIndex = 0 + ' + 'Label1 + ' + Me.Label1.AutoSize = True + Me.Label1.Location = New System.Drawing.Point(107, 34) + Me.Label1.Name = "Label1" + Me.Label1.Size = New System.Drawing.Size(125, 13) + Me.Label1.TabIndex = 1 + Me.Label1.Text = "Data list not implemented" + ' + 'dlgTimeseriesPlot + ' + Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) + Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.ClientSize = New System.Drawing.Size(439, 272) + Me.Controls.Add(Me.Label1) + Me.Controls.Add(Me.ucrBase) + Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog + Me.MaximizeBox = False + Me.MinimizeBox = False + Me.Name = "dlgTimeseriesPlot" + Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen + Me.Text = "Timeseries Plot" + Me.ResumeLayout(False) + Me.PerformLayout() + End Sub Friend WithEvents ucrBase As ucrButtons diff --git a/instat/dlgTotals.Designer.vb b/instat/dlgTotals.Designer.vb index 78b10f35387..bb51ba0cc8c 100644 --- a/instat/dlgTotals.Designer.vb +++ b/instat/dlgTotals.Designer.vb @@ -22,30 +22,30 @@ Partial Class dlgTotals 'Do not modify it using the code editor. _ Private Sub InitializeComponent() - Me.UcrButtons1 = New instat.ucrButtons() - Me.SuspendLayout() - ' - 'UcrButtons1 - ' - Me.UcrButtons1.Location = New System.Drawing.Point(1, 236) - Me.UcrButtons1.Name = "UcrButtons1" - Me.UcrButtons1.Size = New System.Drawing.Size(410, 32) - Me.UcrButtons1.TabIndex = 0 - ' - 'dlgTotals - ' - Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) - Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(409, 269) - Me.Controls.Add(Me.UcrButtons1) - Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow - Me.Name = "dlgTotals" - Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen - Me.Tag = "Totals" - Me.Text = "Totals" - Me.ResumeLayout(False) - + Me.ucrBase = New instat.ucrButtons() + Me.SuspendLayout() + ' + 'ucrBase + ' + Me.ucrBase.Location = New System.Drawing.Point(1, 206) + Me.ucrBase.Name = "ucrBase" + Me.ucrBase.Size = New System.Drawing.Size(410, 62) + Me.ucrBase.TabIndex = 0 + ' + 'dlgTotals + ' + Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) + Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.ClientSize = New System.Drawing.Size(409, 269) + Me.Controls.Add(Me.ucrBase) + Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow + Me.Name = "dlgTotals" + Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen + Me.Tag = "Totals" + Me.Text = "Totals" + Me.ResumeLayout(False) + End Sub - Friend WithEvents UcrButtons1 As ucrButtons + Friend WithEvents ucrBase As ucrButtons End Class diff --git a/instat/dlgTransform.Designer.vb b/instat/dlgTransform.Designer.vb index 81e8ac186ce..9fd5c79e62b 100644 --- a/instat/dlgTransform.Designer.vb +++ b/instat/dlgTransform.Designer.vb @@ -59,12 +59,12 @@ Partial Class dlgTransform Me.lblFrom = New System.Windows.Forms.Label() Me.lblInto = New System.Windows.Forms.Label() Me.txtInto = New System.Windows.Forms.TextBox() - Me.btnPreview = New System.Windows.Forms.Button() - Me.cmbPreview = New System.Windows.Forms.ComboBox() + Me.cmdPreview = New System.Windows.Forms.Button() + Me.cboPreview = New System.Windows.Forms.ComboBox() Me.grpOtherTransformations = New System.Windows.Forms.GroupBox() Me.grpLag = New System.Windows.Forms.GroupBox() Me.lblRows = New System.Windows.Forms.Label() - Me.NumericUpDown1 = New System.Windows.Forms.NumericUpDown() + Me.nudLag = New System.Windows.Forms.NumericUpDown() Me.grpTransformationsOther = New System.Windows.Forms.GroupBox() Me.rdoDifference = New System.Windows.Forms.RadioButton() Me.rdoLag = New System.Windows.Forms.RadioButton() @@ -72,8 +72,8 @@ Partial Class dlgTransform Me.rdoNormalScore = New System.Windows.Forms.RadioButton() Me.rdoSort = New System.Windows.Forms.RadioButton() Me.rdoRank = New System.Windows.Forms.RadioButton() - Me.UcrSelectorAddRemove1 = New instat.ucrSelectorAddRemove() - Me.UcrReceiverSingle1 = New instat.ucrReceiverSingle() + Me.ucrAddRemove = New instat.ucrSelectorAddRemove() + Me.ucrReceiverFrom = New instat.ucrReceiverSingle() Me.ucrBase = New instat.ucrButtons() Me.grpCalculatedTransformations.SuspendLayout() Me.grpPercentageTransformations.SuspendLayout() @@ -83,7 +83,7 @@ Partial Class dlgTransform Me.grpTransformationType.SuspendLayout() Me.grpOtherTransformations.SuspendLayout() Me.grpLag.SuspendLayout() - CType(Me.NumericUpDown1, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.nudLag, System.ComponentModel.ISupportInitialize).BeginInit() Me.grpTransformationsOther.SuspendLayout() Me.SuspendLayout() ' @@ -500,23 +500,23 @@ Partial Class dlgTransform Me.txtInto.Size = New System.Drawing.Size(105, 20) Me.txtInto.TabIndex = 7 ' - 'btnPreview + 'cmdPreview ' - Me.btnPreview.Location = New System.Drawing.Point(15, 342) - Me.btnPreview.Name = "btnPreview" - Me.btnPreview.Size = New System.Drawing.Size(75, 23) - Me.btnPreview.TabIndex = 8 - Me.btnPreview.Tag = "Preview" - Me.btnPreview.Text = "Preview" - Me.btnPreview.UseVisualStyleBackColor = True + Me.cmdPreview.Location = New System.Drawing.Point(15, 342) + Me.cmdPreview.Name = "cmdPreview" + Me.cmdPreview.Size = New System.Drawing.Size(75, 23) + Me.cmdPreview.TabIndex = 8 + Me.cmdPreview.Tag = "Preview" + Me.cmdPreview.Text = "Preview" + Me.cmdPreview.UseVisualStyleBackColor = True ' - 'cmbPreview + 'cboPreview ' - Me.cmbPreview.FormattingEnabled = True - Me.cmbPreview.Location = New System.Drawing.Point(108, 342) - Me.cmbPreview.Name = "cmbPreview" - Me.cmbPreview.Size = New System.Drawing.Size(280, 21) - Me.cmbPreview.TabIndex = 9 + Me.cboPreview.FormattingEnabled = True + Me.cboPreview.Location = New System.Drawing.Point(108, 342) + Me.cboPreview.Name = "cboPreview" + Me.cboPreview.Size = New System.Drawing.Size(280, 21) + Me.cboPreview.TabIndex = 9 ' 'grpOtherTransformations ' @@ -533,7 +533,7 @@ Partial Class dlgTransform 'grpLag ' Me.grpLag.Controls.Add(Me.lblRows) - Me.grpLag.Controls.Add(Me.NumericUpDown1) + Me.grpLag.Controls.Add(Me.nudLag) Me.grpLag.Location = New System.Drawing.Point(135, 97) Me.grpLag.Name = "grpLag" Me.grpLag.Size = New System.Drawing.Size(104, 41) @@ -552,14 +552,14 @@ Partial Class dlgTransform Me.lblRows.Tag = "rows" Me.lblRows.Text = "row(s)" ' - 'NumericUpDown1 + 'nudLag ' - Me.NumericUpDown1.AllowDrop = True - Me.NumericUpDown1.Location = New System.Drawing.Point(29, 17) - Me.NumericUpDown1.Name = "NumericUpDown1" - Me.NumericUpDown1.Size = New System.Drawing.Size(31, 20) - Me.NumericUpDown1.TabIndex = 0 - Me.NumericUpDown1.Value = New Decimal(New Integer() {1, 0, 0, 0}) + Me.nudLag.AllowDrop = True + Me.nudLag.Location = New System.Drawing.Point(29, 17) + Me.nudLag.Name = "nudLag" + Me.nudLag.Size = New System.Drawing.Size(31, 20) + Me.nudLag.TabIndex = 0 + Me.nudLag.Value = New Decimal(New Integer() {1, 0, 0, 0}) ' 'grpTransformationsOther ' @@ -647,19 +647,19 @@ Partial Class dlgTransform Me.rdoRank.Text = "Rank" Me.rdoRank.UseVisualStyleBackColor = True ' - 'UcrSelectorAddRemove1 + 'ucrAddRemove ' - Me.UcrSelectorAddRemove1.Location = New System.Drawing.Point(12, 19) - Me.UcrSelectorAddRemove1.Name = "UcrSelectorAddRemove1" - Me.UcrSelectorAddRemove1.Size = New System.Drawing.Size(203, 127) - Me.UcrSelectorAddRemove1.TabIndex = 2 + Me.ucrAddRemove.Location = New System.Drawing.Point(12, 19) + Me.ucrAddRemove.Name = "ucrAddRemove" + Me.ucrAddRemove.Size = New System.Drawing.Size(203, 127) + Me.ucrAddRemove.TabIndex = 2 ' - 'UcrReceiverSingle1 + 'ucrReceiverFrom ' - Me.UcrReceiverSingle1.Location = New System.Drawing.Point(287, 29) - Me.UcrReceiverSingle1.Name = "UcrReceiverSingle1" - Me.UcrReceiverSingle1.Size = New System.Drawing.Size(106, 26) - Me.UcrReceiverSingle1.TabIndex = 1 + Me.ucrReceiverFrom.Location = New System.Drawing.Point(287, 29) + Me.ucrReceiverFrom.Name = "ucrReceiverFrom" + Me.ucrReceiverFrom.Size = New System.Drawing.Size(106, 26) + Me.ucrReceiverFrom.TabIndex = 1 ' 'ucrBase ' @@ -674,15 +674,15 @@ Partial Class dlgTransform Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.ClientSize = New System.Drawing.Size(430, 428) Me.Controls.Add(Me.grpOtherTransformations) - Me.Controls.Add(Me.cmbPreview) - Me.Controls.Add(Me.btnPreview) + Me.Controls.Add(Me.cboPreview) + Me.Controls.Add(Me.cmdPreview) Me.Controls.Add(Me.txtInto) Me.Controls.Add(Me.lblInto) Me.Controls.Add(Me.lblFrom) Me.Controls.Add(Me.grpTransformationType) Me.Controls.Add(Me.grpCalculatedTransformations) - Me.Controls.Add(Me.UcrSelectorAddRemove1) - Me.Controls.Add(Me.UcrReceiverSingle1) + Me.Controls.Add(Me.ucrAddRemove) + Me.Controls.Add(Me.ucrReceiverFrom) Me.Controls.Add(Me.ucrBase) Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow Me.Name = "dlgTransform" @@ -704,7 +704,7 @@ Partial Class dlgTransform Me.grpOtherTransformations.ResumeLayout(False) Me.grpLag.ResumeLayout(False) Me.grpLag.PerformLayout() - CType(Me.NumericUpDown1, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.nudLag, System.ComponentModel.ISupportInitialize).EndInit() Me.grpTransformationsOther.ResumeLayout(False) Me.grpTransformationsOther.PerformLayout() Me.ResumeLayout(False) @@ -713,8 +713,8 @@ Partial Class dlgTransform End Sub Friend WithEvents ucrBase As ucrButtons - Friend WithEvents UcrReceiverSingle1 As ucrReceiverSingle - Friend WithEvents UcrSelectorAddRemove1 As ucrSelectorAddRemove + Friend WithEvents ucrReceiverFrom As ucrReceiverSingle + Friend WithEvents ucrAddRemove As ucrSelectorAddRemove Friend WithEvents grpCalculatedTransformations As GroupBox Friend WithEvents grpNonNegativeTransformations As GroupBox Friend WithEvents rdoPower As RadioButton @@ -737,8 +737,8 @@ Partial Class dlgTransform Friend WithEvents txtInto As TextBox Friend WithEvents lblPowerValue As Label Friend WithEvents txtPowerValue As TextBox - Friend WithEvents btnPreview As Button - Friend WithEvents cmbPreview As ComboBox + Friend WithEvents cmdPreview As Button + Friend WithEvents cboPreview As ComboBox Friend WithEvents grpOtherTransformations As GroupBox Friend WithEvents grpTransformationsOther As GroupBox Friend WithEvents rdoStandardise As RadioButton @@ -749,7 +749,7 @@ Partial Class dlgTransform Friend WithEvents rdoLag As RadioButton Friend WithEvents grpLag As GroupBox Friend WithEvents lblRows As Label - Friend WithEvents NumericUpDown1 As NumericUpDown + Friend WithEvents nudLag As NumericUpDown Friend WithEvents lblConstant As Label Friend WithEvents grpCircularTransformations As GroupBox Friend WithEvents cmbCycleLength As ComboBox diff --git a/instat/dlgUnstack.Designer.vb b/instat/dlgUnstack.Designer.vb index c96d42a668a..784cded7a82 100644 --- a/instat/dlgUnstack.Designer.vb +++ b/instat/dlgUnstack.Designer.vb @@ -25,11 +25,11 @@ Partial Class dlgUnstack Me.ucrBase = New instat.ucrButtons() Me.ucrDataFrame = New instat.ucrDataFrame() Me.ucrSelectorByDataFrameAddRemove = New instat.ucrSelectorByDataFrameAddRemove() - Me.lblFactorstoUnstackBy = New System.Windows.Forms.Label() - Me.lblColumnstoUnstack = New System.Windows.Forms.Label() + Me.lblFactorToUnstackBy = New System.Windows.Forms.Label() + Me.lblColumnToUnstack = New System.Windows.Forms.Label() Me.chkUseFactoLabels = New System.Windows.Forms.CheckBox() - Me.ucrfactortoUnstackReceiver = New instat.ucrReceiverSingle() - Me.ucrColumntoUnstackReceiver = New instat.ucrReceiverSingle() + Me.ucrFactorToUnstackReceiver = New instat.ucrReceiverSingle() + Me.ucrColumnToUnstackReceiver = New instat.ucrReceiverSingle() Me.chkIDColumn = New System.Windows.Forms.CheckBox() Me.ucrIDColumnReceiver = New instat.ucrReceiverMultiple() Me.SuspendLayout() @@ -55,30 +55,30 @@ Partial Class dlgUnstack Me.ucrSelectorByDataFrameAddRemove.Size = New System.Drawing.Size(242, 179) Me.ucrSelectorByDataFrameAddRemove.TabIndex = 7 ' - 'lblFactorstoUnstackBy + 'lblFactorToUnstackBy ' - Me.lblFactorstoUnstackBy.AutoSize = True - Me.lblFactorstoUnstackBy.Location = New System.Drawing.Point(258, 16) - Me.lblFactorstoUnstackBy.Name = "lblFactorstoUnstackBy" - Me.lblFactorstoUnstackBy.Size = New System.Drawing.Size(118, 13) - Me.lblFactorstoUnstackBy.TabIndex = 9 - Me.lblFactorstoUnstackBy.Tag = "Factors_to_Unstack_By" - Me.lblFactorstoUnstackBy.Text = "Factor(s) to Unstack By" + Me.lblFactorToUnstackBy.AutoSize = True + Me.lblFactorToUnstackBy.Location = New System.Drawing.Point(258, 16) + Me.lblFactorToUnstackBy.Name = "lblFactorToUnstackBy" + Me.lblFactorToUnstackBy.Size = New System.Drawing.Size(118, 13) + Me.lblFactorToUnstackBy.TabIndex = 9 + Me.lblFactorToUnstackBy.Tag = "Factors_to_Unstack_By" + Me.lblFactorToUnstackBy.Text = "Factor(s) to Unstack By" ' - 'lblColumnstoUnstack + 'lblColumnToUnstack ' - Me.lblColumnstoUnstack.AutoSize = True - Me.lblColumnstoUnstack.Location = New System.Drawing.Point(255, 69) - Me.lblColumnstoUnstack.Name = "lblColumnstoUnstack" - Me.lblColumnstoUnstack.Size = New System.Drawing.Size(97, 13) - Me.lblColumnstoUnstack.TabIndex = 9 - Me.lblColumnstoUnstack.Tag = "Column_to_Unstack" - Me.lblColumnstoUnstack.Text = "Column to Unstack" + Me.lblColumnToUnstack.AutoSize = True + Me.lblColumnToUnstack.Location = New System.Drawing.Point(255, 69) + Me.lblColumnToUnstack.Name = "lblColumnToUnstack" + Me.lblColumnToUnstack.Size = New System.Drawing.Size(97, 13) + Me.lblColumnToUnstack.TabIndex = 9 + Me.lblColumnToUnstack.Tag = "Column_to_Unstack" + Me.lblColumnToUnstack.Text = "Column to Unstack" ' 'chkUseFactoLabels ' Me.chkUseFactoLabels.AutoSize = True - Me.chkUseFactoLabels.Location = New System.Drawing.Point(13, 225) + Me.chkUseFactoLabels.Location = New System.Drawing.Point(13, 242) Me.chkUseFactoLabels.Name = "chkUseFactoLabels" Me.chkUseFactoLabels.Size = New System.Drawing.Size(193, 17) Me.chkUseFactoLabels.TabIndex = 10 @@ -86,19 +86,19 @@ Partial Class dlgUnstack Me.chkUseFactoLabels.Text = "Use Factor labels in Column Names" Me.chkUseFactoLabels.UseVisualStyleBackColor = True ' - 'ucrfactortoUnstackReceiver + 'ucrFactorToUnstackReceiver ' - Me.ucrfactortoUnstackReceiver.Location = New System.Drawing.Point(256, 40) - Me.ucrfactortoUnstackReceiver.Name = "ucrfactortoUnstackReceiver" - Me.ucrfactortoUnstackReceiver.Size = New System.Drawing.Size(106, 26) - Me.ucrfactortoUnstackReceiver.TabIndex = 12 + Me.ucrFactorToUnstackReceiver.Location = New System.Drawing.Point(256, 40) + Me.ucrFactorToUnstackReceiver.Name = "ucrFactorToUnstackReceiver" + Me.ucrFactorToUnstackReceiver.Size = New System.Drawing.Size(106, 26) + Me.ucrFactorToUnstackReceiver.TabIndex = 12 ' - 'ucrColumntoUnstackReceiver + 'ucrColumnToUnstackReceiver ' - Me.ucrColumntoUnstackReceiver.Location = New System.Drawing.Point(258, 95) - Me.ucrColumntoUnstackReceiver.Name = "ucrColumntoUnstackReceiver" - Me.ucrColumntoUnstackReceiver.Size = New System.Drawing.Size(106, 26) - Me.ucrColumntoUnstackReceiver.TabIndex = 12 + Me.ucrColumnToUnstackReceiver.Location = New System.Drawing.Point(258, 95) + Me.ucrColumnToUnstackReceiver.Name = "ucrColumnToUnstackReceiver" + Me.ucrColumnToUnstackReceiver.Size = New System.Drawing.Size(106, 26) + Me.ucrColumnToUnstackReceiver.TabIndex = 12 ' 'chkIDColumn ' @@ -125,11 +125,11 @@ Partial Class dlgUnstack Me.ClientSize = New System.Drawing.Size(420, 331) Me.Controls.Add(Me.ucrIDColumnReceiver) Me.Controls.Add(Me.chkIDColumn) - Me.Controls.Add(Me.ucrColumntoUnstackReceiver) - Me.Controls.Add(Me.ucrfactortoUnstackReceiver) + Me.Controls.Add(Me.ucrColumnToUnstackReceiver) + Me.Controls.Add(Me.ucrFactorToUnstackReceiver) Me.Controls.Add(Me.chkUseFactoLabels) - Me.Controls.Add(Me.lblColumnstoUnstack) - Me.Controls.Add(Me.lblFactorstoUnstackBy) + Me.Controls.Add(Me.lblColumnToUnstack) + Me.Controls.Add(Me.lblFactorToUnstackBy) Me.Controls.Add(Me.ucrSelectorByDataFrameAddRemove) Me.Controls.Add(Me.ucrDataFrame) Me.Controls.Add(Me.ucrBase) @@ -145,11 +145,11 @@ Partial Class dlgUnstack Friend WithEvents ucrBase As ucrButtons Friend WithEvents ucrDataFrame As ucrDataFrame Friend WithEvents ucrSelectorByDataFrameAddRemove As ucrSelectorByDataFrameAddRemove - Friend WithEvents lblFactorstoUnstackBy As Label - Friend WithEvents lblColumnstoUnstack As Label + Friend WithEvents lblFactorToUnstackBy As Label + Friend WithEvents lblColumnToUnstack As Label Friend WithEvents chkUseFactoLabels As CheckBox - Friend WithEvents ucrfactortoUnstackReceiver As ucrReceiverSingle - Friend WithEvents ucrColumntoUnstackReceiver As ucrReceiverSingle + Friend WithEvents ucrFactorToUnstackReceiver As ucrReceiverSingle + Friend WithEvents ucrColumnToUnstackReceiver As ucrReceiverSingle Friend WithEvents chkIDColumn As CheckBox Friend WithEvents ucrIDColumnReceiver As ucrReceiverMultiple End Class diff --git a/instat/dlgUnstack.vb b/instat/dlgUnstack.vb index 05aecd1f470..a1f0eef95f6 100644 --- a/instat/dlgUnstack.vb +++ b/instat/dlgUnstack.vb @@ -18,9 +18,9 @@ Public Class dlgUnstack Private Sub dlgUnstack_Load(sender As Object, e As EventArgs) Handles MyBase.Load ucrBase.clsRsyntax.SetFunction("unstack") ucrBase.clsRsyntax.iCallType = 1 - ucrfactortoUnstackReceiver.SetMeAsReceiver() + ucrFactorToUnstackReceiver.SetMeAsReceiver() ucrIDColumnReceiver.Selector = ucrSelectorByDataFrameAddRemove - ucrfactortoUnstackReceiver.Selector = ucrSelectorByDataFrameAddRemove + ucrFactorToUnstackReceiver.Selector = ucrSelectorByDataFrameAddRemove ucrIDColumnReceiver.SetMeAsReceiver() autoTranslate(Me) @@ -40,11 +40,11 @@ Public Class dlgUnstack End If End Sub - Private Sub ucrfactortoUnstackReceiver_Leave(sender As Object, e As EventArgs) Handles ucrfactortoUnstackReceiver.Leave - ucrBase.clsRsyntax.AddParameter("", ucrfactortoUnstackReceiver.GetVariableNames()) + Private Sub ucrfactortoUnstackReceiver_Leave(sender As Object, e As EventArgs) Handles ucrFactorToUnstackReceiver.Leave + ucrBase.clsRsyntax.AddParameter("", ucrFactorToUnstackReceiver.GetVariableNames()) End Sub - Private Sub ucrColumntoUnstackReceiver_Leave(sender As Object, e As EventArgs) Handles ucrColumntoUnstackReceiver.Leave - ucrBase.clsRsyntax.AddParameter("", ucrColumntoUnstackReceiver.GetVariableNames()) + Private Sub ucrColumntoUnstackReceiver_Leave(sender As Object, e As EventArgs) Handles ucrColumnToUnstackReceiver.Leave + ucrBase.clsRsyntax.AddParameter("", ucrColumnToUnstackReceiver.GetVariableNames()) End Sub End Class \ No newline at end of file diff --git a/instat/dlgUnstackDailyData.Designer.vb b/instat/dlgUnstackDailyData.Designer.vb index 506e2f36f5e..e1db9deb578 100644 --- a/instat/dlgUnstackDailyData.Designer.vb +++ b/instat/dlgUnstackDailyData.Designer.vb @@ -22,29 +22,29 @@ Partial Class dlgUnstackDailyData '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(2, 229) - Me.ucrBase.Name = "ucrBase" - Me.ucrBase.Size = New System.Drawing.Size(410, 32) - Me.ucrBase.TabIndex = 0 - ' - 'dlgUnstackDailyData - ' - Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) - Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(406, 263) - Me.Controls.Add(Me.ucrBase) - Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow - Me.Name = "dlgUnstackDailyData" - Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen - Me.Tag = "Unstack_Daily_Data" - Me.Text = "Unstack Daily Data" - Me.ResumeLayout(False) - + Me.ucrBase = New instat.ucrButtons() + Me.SuspendLayout() + ' + 'ucrBase + ' + Me.ucrBase.Location = New System.Drawing.Point(8, 202) + Me.ucrBase.Name = "ucrBase" + Me.ucrBase.Size = New System.Drawing.Size(410, 59) + Me.ucrBase.TabIndex = 0 + ' + 'dlgUnstackDailyData + ' + Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) + Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.ClientSize = New System.Drawing.Size(426, 262) + Me.Controls.Add(Me.ucrBase) + Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow + Me.Name = "dlgUnstackDailyData" + Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen + Me.Tag = "Unstack_Daily_Data" + Me.Text = "Unstack Daily Data" + Me.ResumeLayout(False) + End Sub Friend WithEvents ucrBase As ucrButtons diff --git a/instat/dlgWaterBalance.Designer.vb b/instat/dlgWaterBalance.Designer.vb index 7b64641fccf..59100478163 100644 --- a/instat/dlgWaterBalance.Designer.vb +++ b/instat/dlgWaterBalance.Designer.vb @@ -22,161 +22,161 @@ Partial Class dlgWaterBalance 'Do not modify it using the code editor. _ Private Sub InitializeComponent() - Me.UcrButtons1 = New instat.ucrButtons() - Me.nudEvaporation = New System.Windows.Forms.NumericUpDown() - Me.nudMaximumCapacity = New System.Windows.Forms.NumericUpDown() - Me.nudDecimalPlace = New System.Windows.Forms.NumericUpDown() - Me.txtDisplayDayName = New System.Windows.Forms.TextBox() - Me.txtColumnName = New System.Windows.Forms.TextBox() - Me.lblDisplayDayName = New System.Windows.Forms.Label() - Me.lblDecimalPlace = New System.Windows.Forms.Label() - Me.lblEvaporation = New System.Windows.Forms.Label() - Me.lblMaximumCapacity = New System.Windows.Forms.Label() - Me.lblColumnName = New System.Windows.Forms.Label() - Me.chkPrintTable = New System.Windows.Forms.CheckBox() - CType(Me.nudEvaporation, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.nudMaximumCapacity, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.nudDecimalPlace, System.ComponentModel.ISupportInitialize).BeginInit() - Me.SuspendLayout() - ' - 'UcrButtons1 - ' - Me.UcrButtons1.Location = New System.Drawing.Point(55, 245) - Me.UcrButtons1.Name = "UcrButtons1" - Me.UcrButtons1.Size = New System.Drawing.Size(410, 32) - Me.UcrButtons1.TabIndex = 0 - ' - 'nudEvaporation - ' - Me.nudEvaporation.Location = New System.Drawing.Point(171, 104) - Me.nudEvaporation.Name = "nudEvaporation" - Me.nudEvaporation.Size = New System.Drawing.Size(60, 20) - Me.nudEvaporation.TabIndex = 1 - Me.nudEvaporation.Tag = "Evaporation" - ' - 'nudMaximumCapacity - ' - Me.nudMaximumCapacity.Location = New System.Drawing.Point(171, 78) - Me.nudMaximumCapacity.Name = "nudMaximumCapacity" - Me.nudMaximumCapacity.Size = New System.Drawing.Size(60, 20) - Me.nudMaximumCapacity.TabIndex = 2 - Me.nudMaximumCapacity.Tag = "Maximum_Capacity" - ' - 'nudDecimalPlace - ' - Me.nudDecimalPlace.Location = New System.Drawing.Point(171, 130) - Me.nudDecimalPlace.Maximum = New Decimal(New Integer() {3, 0, 0, 0}) - Me.nudDecimalPlace.Name = "nudDecimalPlace" - Me.nudDecimalPlace.Size = New System.Drawing.Size(60, 20) - Me.nudDecimalPlace.TabIndex = 3 - ' - 'txtDisplayDayName - ' - Me.txtDisplayDayName.Location = New System.Drawing.Point(113, 48) - Me.txtDisplayDayName.Name = "txtDisplayDayName" - Me.txtDisplayDayName.Size = New System.Drawing.Size(118, 20) - Me.txtDisplayDayName.TabIndex = 4 - Me.txtDisplayDayName.Tag = "Display_Day_Name" - ' - 'txtColumnName - ' - Me.txtColumnName.Location = New System.Drawing.Point(113, 12) - Me.txtColumnName.Name = "txtColumnName" - Me.txtColumnName.Size = New System.Drawing.Size(232, 20) - Me.txtColumnName.TabIndex = 5 - Me.txtColumnName.Tag = "Column_Name" - ' - 'lblDisplayDayName - ' - Me.lblDisplayDayName.AutoSize = True - Me.lblDisplayDayName.Location = New System.Drawing.Point(52, 55) - Me.lblDisplayDayName.Name = "lblDisplayDayName" - Me.lblDisplayDayName.Size = New System.Drawing.Size(39, 13) - Me.lblDisplayDayName.TabIndex = 7 - Me.lblDisplayDayName.Tag = "Display_Day_Name" - Me.lblDisplayDayName.Text = "Label1" - ' - 'lblDecimalPlace - ' - Me.lblDecimalPlace.AutoSize = True - Me.lblDecimalPlace.Location = New System.Drawing.Point(101, 137) - Me.lblDecimalPlace.Name = "lblDecimalPlace" - Me.lblDecimalPlace.Size = New System.Drawing.Size(39, 13) - Me.lblDecimalPlace.TabIndex = 10 - Me.lblDecimalPlace.Tag = "Decimal_Place" - Me.lblDecimalPlace.Text = "Label4" - ' - 'lblEvaporation - ' - Me.lblEvaporation.AutoSize = True - Me.lblEvaporation.Location = New System.Drawing.Point(101, 112) - Me.lblEvaporation.Name = "lblEvaporation" - Me.lblEvaporation.Size = New System.Drawing.Size(39, 13) - Me.lblEvaporation.TabIndex = 11 - Me.lblEvaporation.Tag = "Evaporation" - Me.lblEvaporation.Text = "Label5" - ' - 'lblMaximumCapacity - ' - Me.lblMaximumCapacity.AutoSize = True - Me.lblMaximumCapacity.Location = New System.Drawing.Point(101, 86) - Me.lblMaximumCapacity.Name = "lblMaximumCapacity" - Me.lblMaximumCapacity.Size = New System.Drawing.Size(39, 13) - Me.lblMaximumCapacity.TabIndex = 12 - Me.lblMaximumCapacity.Tag = "Maximum_Capacity" - Me.lblMaximumCapacity.Text = "Label6" - ' - 'lblColumnName - ' - Me.lblColumnName.AutoSize = True - Me.lblColumnName.Location = New System.Drawing.Point(52, 15) - Me.lblColumnName.Name = "lblColumnName" - Me.lblColumnName.Size = New System.Drawing.Size(39, 13) - Me.lblColumnName.TabIndex = 13 - Me.lblColumnName.Tag = "Column_Name" - Me.lblColumnName.Text = "Label7" - ' - 'chkPrintTable - ' - Me.chkPrintTable.AutoSize = True - Me.chkPrintTable.Location = New System.Drawing.Point(324, 194) - Me.chkPrintTable.Name = "chkPrintTable" - Me.chkPrintTable.Size = New System.Drawing.Size(81, 17) - Me.chkPrintTable.TabIndex = 14 - Me.chkPrintTable.Tag = "Print_Table" - Me.chkPrintTable.Text = "CheckBox1" - Me.chkPrintTable.UseVisualStyleBackColor = True - ' - 'dlgWaterBalance - ' - Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) - Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(464, 277) - Me.Controls.Add(Me.chkPrintTable) - Me.Controls.Add(Me.lblColumnName) - Me.Controls.Add(Me.lblMaximumCapacity) - Me.Controls.Add(Me.lblEvaporation) - Me.Controls.Add(Me.lblDecimalPlace) - Me.Controls.Add(Me.lblDisplayDayName) - Me.Controls.Add(Me.txtColumnName) - Me.Controls.Add(Me.txtDisplayDayName) - Me.Controls.Add(Me.nudDecimalPlace) - Me.Controls.Add(Me.nudMaximumCapacity) - Me.Controls.Add(Me.nudEvaporation) - Me.Controls.Add(Me.UcrButtons1) - Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog - Me.Name = "dlgWaterBalance" - Me.Tag = "Water_Balance" - Me.Text = "dlgWaterBalance" - CType(Me.nudEvaporation, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.nudMaximumCapacity, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.nudDecimalPlace, System.ComponentModel.ISupportInitialize).EndInit() - Me.ResumeLayout(False) - Me.PerformLayout() - + Me.ucrBase = New instat.ucrButtons() + Me.nudEvaporation = New System.Windows.Forms.NumericUpDown() + Me.nudMaximumCapacity = New System.Windows.Forms.NumericUpDown() + Me.nudDecimalPlace = New System.Windows.Forms.NumericUpDown() + Me.txtDisplayDayName = New System.Windows.Forms.TextBox() + Me.txtColumnName = New System.Windows.Forms.TextBox() + Me.lblDisplayDayName = New System.Windows.Forms.Label() + Me.lblDecimalPlace = New System.Windows.Forms.Label() + Me.lblEvaporation = New System.Windows.Forms.Label() + Me.lblMaximumCapacity = New System.Windows.Forms.Label() + Me.lblColumnName = New System.Windows.Forms.Label() + Me.chkPrintTable = New System.Windows.Forms.CheckBox() + CType(Me.nudEvaporation, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.nudMaximumCapacity, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.nudDecimalPlace, System.ComponentModel.ISupportInitialize).BeginInit() + Me.SuspendLayout() + ' + 'ucrBase + ' + Me.ucrBase.Location = New System.Drawing.Point(33, 217) + Me.ucrBase.Name = "ucrBase" + Me.ucrBase.Size = New System.Drawing.Size(410, 60) + Me.ucrBase.TabIndex = 0 + ' + 'nudEvaporation + ' + Me.nudEvaporation.Location = New System.Drawing.Point(171, 104) + Me.nudEvaporation.Name = "nudEvaporation" + Me.nudEvaporation.Size = New System.Drawing.Size(60, 20) + Me.nudEvaporation.TabIndex = 1 + Me.nudEvaporation.Tag = "Evaporation" + ' + 'nudMaximumCapacity + ' + Me.nudMaximumCapacity.Location = New System.Drawing.Point(171, 78) + Me.nudMaximumCapacity.Name = "nudMaximumCapacity" + Me.nudMaximumCapacity.Size = New System.Drawing.Size(60, 20) + Me.nudMaximumCapacity.TabIndex = 2 + Me.nudMaximumCapacity.Tag = "Maximum_Capacity" + ' + 'nudDecimalPlace + ' + Me.nudDecimalPlace.Location = New System.Drawing.Point(171, 130) + Me.nudDecimalPlace.Maximum = New Decimal(New Integer() {3, 0, 0, 0}) + Me.nudDecimalPlace.Name = "nudDecimalPlace" + Me.nudDecimalPlace.Size = New System.Drawing.Size(60, 20) + Me.nudDecimalPlace.TabIndex = 3 + ' + 'txtDisplayDayName + ' + Me.txtDisplayDayName.Location = New System.Drawing.Point(113, 48) + Me.txtDisplayDayName.Name = "txtDisplayDayName" + Me.txtDisplayDayName.Size = New System.Drawing.Size(118, 20) + Me.txtDisplayDayName.TabIndex = 4 + Me.txtDisplayDayName.Tag = "Display_Day_Name" + ' + 'txtColumnName + ' + Me.txtColumnName.Location = New System.Drawing.Point(113, 12) + Me.txtColumnName.Name = "txtColumnName" + Me.txtColumnName.Size = New System.Drawing.Size(232, 20) + Me.txtColumnName.TabIndex = 5 + Me.txtColumnName.Tag = "Column_Name" + ' + 'lblDisplayDayName + ' + Me.lblDisplayDayName.AutoSize = True + Me.lblDisplayDayName.Location = New System.Drawing.Point(52, 55) + Me.lblDisplayDayName.Name = "lblDisplayDayName" + Me.lblDisplayDayName.Size = New System.Drawing.Size(39, 13) + Me.lblDisplayDayName.TabIndex = 7 + Me.lblDisplayDayName.Tag = "Display_Day_Name" + Me.lblDisplayDayName.Text = "Label1" + ' + 'lblDecimalPlace + ' + Me.lblDecimalPlace.AutoSize = True + Me.lblDecimalPlace.Location = New System.Drawing.Point(101, 137) + Me.lblDecimalPlace.Name = "lblDecimalPlace" + Me.lblDecimalPlace.Size = New System.Drawing.Size(39, 13) + Me.lblDecimalPlace.TabIndex = 10 + Me.lblDecimalPlace.Tag = "Decimal_Place" + Me.lblDecimalPlace.Text = "Label4" + ' + 'lblEvaporation + ' + Me.lblEvaporation.AutoSize = True + Me.lblEvaporation.Location = New System.Drawing.Point(101, 112) + Me.lblEvaporation.Name = "lblEvaporation" + Me.lblEvaporation.Size = New System.Drawing.Size(39, 13) + Me.lblEvaporation.TabIndex = 11 + Me.lblEvaporation.Tag = "Evaporation" + Me.lblEvaporation.Text = "Label5" + ' + 'lblMaximumCapacity + ' + Me.lblMaximumCapacity.AutoSize = True + Me.lblMaximumCapacity.Location = New System.Drawing.Point(101, 86) + Me.lblMaximumCapacity.Name = "lblMaximumCapacity" + Me.lblMaximumCapacity.Size = New System.Drawing.Size(39, 13) + Me.lblMaximumCapacity.TabIndex = 12 + Me.lblMaximumCapacity.Tag = "Maximum_Capacity" + Me.lblMaximumCapacity.Text = "Label6" + ' + 'lblColumnName + ' + Me.lblColumnName.AutoSize = True + Me.lblColumnName.Location = New System.Drawing.Point(52, 15) + Me.lblColumnName.Name = "lblColumnName" + Me.lblColumnName.Size = New System.Drawing.Size(39, 13) + Me.lblColumnName.TabIndex = 13 + Me.lblColumnName.Tag = "Column_Name" + Me.lblColumnName.Text = "Label7" + ' + 'chkPrintTable + ' + Me.chkPrintTable.AutoSize = True + Me.chkPrintTable.Location = New System.Drawing.Point(324, 194) + Me.chkPrintTable.Name = "chkPrintTable" + Me.chkPrintTable.Size = New System.Drawing.Size(81, 17) + Me.chkPrintTable.TabIndex = 14 + Me.chkPrintTable.Tag = "Print_Table" + Me.chkPrintTable.Text = "CheckBox1" + Me.chkPrintTable.UseVisualStyleBackColor = True + ' + 'dlgWaterBalance + ' + Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) + Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.ClientSize = New System.Drawing.Size(464, 277) + Me.Controls.Add(Me.chkPrintTable) + Me.Controls.Add(Me.lblColumnName) + Me.Controls.Add(Me.lblMaximumCapacity) + Me.Controls.Add(Me.lblEvaporation) + Me.Controls.Add(Me.lblDecimalPlace) + Me.Controls.Add(Me.lblDisplayDayName) + Me.Controls.Add(Me.txtColumnName) + Me.Controls.Add(Me.txtDisplayDayName) + Me.Controls.Add(Me.nudDecimalPlace) + Me.Controls.Add(Me.nudMaximumCapacity) + Me.Controls.Add(Me.nudEvaporation) + Me.Controls.Add(Me.ucrBase) + Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog + Me.Name = "dlgWaterBalance" + Me.Tag = "Water_Balance" + Me.Text = "dlgWaterBalance" + CType(Me.nudEvaporation, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.nudMaximumCapacity, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.nudDecimalPlace, System.ComponentModel.ISupportInitialize).EndInit() + Me.ResumeLayout(False) + Me.PerformLayout() + End Sub - Friend WithEvents UcrButtons1 As ucrButtons + Friend WithEvents ucrBase As ucrButtons Friend WithEvents nudEvaporation As NumericUpDown Friend WithEvents nudMaximumCapacity As NumericUpDown Friend WithEvents nudDecimalPlace As NumericUpDown diff --git a/instat/dlgWaterBalance.vb b/instat/dlgWaterBalance.vb index b589a15fb34..56e6151b594 100644 --- a/instat/dlgWaterBalance.vb +++ b/instat/dlgWaterBalance.vb @@ -1,6 +1,6 @@ Imports instat.Translations Public Class dlgWaterBalance - Private Sub ucrButtons_clickOk(sender As Object, e As EventArgs) Handles UcrButtons1.ClickOk + Private Sub ucrButtons_clickOk(sender As Object, e As EventArgs) Handles ucrBase.ClickOk Dim strScript As String strScript = "climate_obj$display_water_balance(data_list=list()" strScript = strScript & ", capacity_max=" & nudMaximumCapacity.ToString() diff --git a/instat/dlgWaterSatisfactionIndex.Designer.vb b/instat/dlgWaterSatisfactionIndex.Designer.vb index 58d1d263eb4..32e78a3865a 100644 --- a/instat/dlgWaterSatisfactionIndex.Designer.vb +++ b/instat/dlgWaterSatisfactionIndex.Designer.vb @@ -22,29 +22,29 @@ Partial Class dlgWaterSatisfactionIndex '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, 249) - Me.ucrBase.Name = "ucrBase" - Me.ucrBase.Size = New System.Drawing.Size(410, 32) - Me.ucrBase.TabIndex = 0 - ' - 'dlgWaterSatisfactionIndex - ' - Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) - Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(417, 288) - Me.Controls.Add(Me.ucrBase) - Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow - Me.Name = "dlgWaterSatisfactionIndex" - Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen - Me.Tag = "Water_Satisfaction_Index" - Me.Text = "Water Satisfaction Index" - Me.ResumeLayout(False) - + Me.ucrBase = New instat.ucrButtons() + Me.SuspendLayout() + ' + 'ucrBase + ' + Me.ucrBase.Location = New System.Drawing.Point(-1, 228) + Me.ucrBase.Name = "ucrBase" + Me.ucrBase.Size = New System.Drawing.Size(410, 59) + Me.ucrBase.TabIndex = 0 + ' + 'dlgWaterSatisfactionIndex + ' + Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) + Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.ClientSize = New System.Drawing.Size(417, 288) + Me.Controls.Add(Me.ucrBase) + Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow + Me.Name = "dlgWaterSatisfactionIndex" + Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen + Me.Tag = "Water_Satisfaction_Index" + Me.Text = "Water Satisfaction Index" + Me.ResumeLayout(False) + End Sub Friend WithEvents ucrBase As ucrButtons diff --git a/instat/dlgWindrosePlot.designer.vb b/instat/dlgWindrosePlot.designer.vb index 1b94d6523dd..4bba2f6bfb6 100644 --- a/instat/dlgWindrosePlot.designer.vb +++ b/instat/dlgWindrosePlot.designer.vb @@ -20,32 +20,32 @@ Partial Class dlgWindrosePlot '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(24, 218) - Me.ucrBase.Name = "ucrBase" - Me.ucrBase.Size = New System.Drawing.Size(410, 32) - Me.ucrBase.TabIndex = 0 - ' - 'dlgWindrosePlot - ' - Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) - Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(458, 262) - Me.Controls.Add(Me.ucrBase) - Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog - Me.MaximizeBox = False - Me.MinimizeBox = False - Me.Name = "dlgWindrosePlot" - Me.Text = "dlgWindrosePlot" - Me.ResumeLayout(False) - - End Sub - - Friend WithEvents ucrBase As ucrButtons + Me.ucrBase = New instat.ucrButtons() + Me.SuspendLayout() + ' + 'ucrBase + ' + Me.ucrBase.Location = New System.Drawing.Point(12, 206) + Me.ucrBase.Name = "ucrBase" + Me.ucrBase.Size = New System.Drawing.Size(410, 53) + Me.ucrBase.TabIndex = 0 + ' + 'dlgWindrosePlot + ' + Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) + Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.ClientSize = New System.Drawing.Size(433, 262) + Me.Controls.Add(Me.ucrBase) + Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog + Me.MaximizeBox = False + Me.MinimizeBox = False + Me.Name = "dlgWindrosePlot" + Me.Text = "dlgWindrosePlot" + Me.ResumeLayout(False) + + End Sub + + Friend WithEvents ucrBase As ucrButtons End Class diff --git a/instat/dlgYearRaincount.designer.vb b/instat/dlgYearRaincount.designer.vb index 4c4c47e2649..ebae5a4c464 100644 --- a/instat/dlgYearRaincount.designer.vb +++ b/instat/dlgYearRaincount.designer.vb @@ -22,29 +22,29 @@ Partial Class dlgYearRaincount '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(29, 218) - Me.ucrBase.Name = "ucrBase" - Me.ucrBase.Size = New System.Drawing.Size(410, 32) - Me.ucrBase.TabIndex = 0 - ' - 'dlgYearRaincount - ' - Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) - Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(464, 262) - Me.Controls.Add(Me.ucrBase) - Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog - Me.MaximizeBox = False - Me.MinimizeBox = False - Me.Name = "dlgYearRaincount" - Me.Text = "dlgYearRaincount" - Me.ResumeLayout(False) - + Me.ucrBase = New instat.ucrButtons() + Me.SuspendLayout() + ' + 'ucrBase + ' + Me.ucrBase.Location = New System.Drawing.Point(29, 207) + Me.ucrBase.Name = "ucrBase" + Me.ucrBase.Size = New System.Drawing.Size(410, 57) + Me.ucrBase.TabIndex = 0 + ' + 'dlgYearRaincount + ' + Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) + Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.ClientSize = New System.Drawing.Size(464, 262) + Me.Controls.Add(Me.ucrBase) + Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog + Me.MaximizeBox = False + Me.MinimizeBox = False + Me.Name = "dlgYearRaincount" + Me.Text = "dlgYearRaincount" + Me.ResumeLayout(False) + End Sub Friend WithEvents ucrBase As ucrButtons diff --git a/instat/instat.vbproj b/instat/instat.vbproj index 5bf7cbd1b9e..c82d8eacaa4 100644 --- a/instat/instat.vbproj +++ b/instat/instat.vbproj @@ -707,6 +707,12 @@ Form + + dlgSaveAs.vb + + + Form + dlgScatterPlot.vb @@ -1051,6 +1057,12 @@ UserControl + + ucrVariablename.vb + + + UserControl + @@ -1884,6 +1896,15 @@ dlgReplace.vb + + dlgSaveAs.vb + + + dlgSaveAs.vb + + + dlgSaveAs.vb + dlgSeasonalSummary.vb @@ -2319,6 +2340,15 @@ ucrSelectorByDataFrameAddRemove.vb + + ucrVariablename.vb + + + ucrVariablename.vb + + + ucrVariablename.vb + diff --git a/instat/sdgBoxplot.Designer.vb b/instat/sdgBoxplot.Designer.vb index 2780bf484f1..3a0c6b5d86c 100644 --- a/instat/sdgBoxplot.Designer.vb +++ b/instat/sdgBoxplot.Designer.vb @@ -22,29 +22,30 @@ Partial Class sdgBoxplot 'Do not modify it using the code editor. _ Private Sub InitializeComponent() - Me.UcrButtonsSubdialogue1 = New instat.ucrButtonsSubdialogue() - Me.SuspendLayout() - ' - 'UcrButtonsSubdialogue1 - ' - Me.UcrButtonsSubdialogue1.Location = New System.Drawing.Point(13, 218) - Me.UcrButtonsSubdialogue1.Name = "UcrButtonsSubdialogue1" - Me.UcrButtonsSubdialogue1.Size = New System.Drawing.Size(253, 44) - Me.UcrButtonsSubdialogue1.TabIndex = 0 - ' - 'sdgBoxplot - ' - 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.UcrButtonsSubdialogue1) - Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow - Me.Name = "sdgBoxplot" - Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen - Me.Text = "Boxplot" - Me.ResumeLayout(False) - + Me.ucrButtonsSubdialog = New instat.ucrButtonsSubdialogue() + Me.SuspendLayout() + ' + 'ucrButtonsSubdialog + ' + Me.ucrButtonsSubdialog.Location = New System.Drawing.Point(13, 218) + Me.ucrButtonsSubdialog.Name = "ucrButtonsSubdialog" + Me.ucrButtonsSubdialog.Size = New System.Drawing.Size(253, 44) + Me.ucrButtonsSubdialog.TabIndex = 0 + ' + 'sdgBoxplot + ' + 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.ucrButtonsSubdialog) + Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow + Me.Name = "sdgBoxplot" + Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen + Me.Tag = "Boxplot" + Me.Text = "Boxplot" + Me.ResumeLayout(False) + End Sub - Friend WithEvents UcrButtonsSubdialogue1 As ucrButtonsSubdialogue + Friend WithEvents ucrButtonsSubdialog As ucrButtonsSubdialogue End Class diff --git a/instat/static/InstatObject/R/Rsetup.R b/instat/static/InstatObject/R/Rsetup.R index fc610dfa2dc..b3ccb07f83c 100644 --- a/instat/static/InstatObject/R/Rsetup.R +++ b/instat/static/InstatObject/R/Rsetup.R @@ -4,4 +4,5 @@ library(lubridate) library(plyr) library(rtf) library(ggplot2) -library(reshape) +# TODO do we need reshape? It causes conflicts with reshape2 but this can be avoided if reshape is really needed +#library(reshape) diff --git a/instat/static/InstatObject/R/data_object.R b/instat/static/InstatObject/R/data_object.R index 27247667e6c..921368a19c2 100644 --- a/instat/static/InstatObject/R/data_object.R +++ b/instat/static/InstatObject/R/data_object.R @@ -137,7 +137,7 @@ data_obj$methods(update_variables_metadata = function() { } ) -data_obj$methods(get_data = function() { +data_obj$methods(get_data_frame = function() { return(data) } ) @@ -385,7 +385,8 @@ data_obj$methods(insert_column_in_data = function(col_data =c(), start_pos = len data <<- cbind(data[1:(start_pos -1)],data[(ncol(data)-number_cols+1):ncol(data)], data[(start_pos+number_cols):ncol(data)-number_cols]) } .self$append_to_changes(list(Inserted_col, start_pos)) - .self$data_changed = TRUE + .self$set_data_changed(TRUE) + .self$set_variables_metadata_changed(TRUE) } ) diff --git a/instat/static/InstatObject/R/instat_object.R b/instat/static/InstatObject/R/instat_object.R index 547d3e193ed..a9ea6e3eff9 100644 --- a/instat/static/InstatObject/R/instat_object.R +++ b/instat/static/InstatObject/R/instat_object.R @@ -122,7 +122,7 @@ instat_obj$methods(append_data_objects = function(name, obj) { } ) -instat_obj$methods(get_data = function(data_name) { +instat_obj$methods(get_data_frame = function(data_name) { if(missing(data_name)) { retlist <- list() for ( i in (1:length(data_objects)) ) { @@ -130,7 +130,7 @@ instat_obj$methods(get_data = function(data_name) { } return(retlist) } - else return(data_objects[[data_name]]$get_data()) + else return(data_objects[[data_name]]$get_data_frame()) } ) @@ -268,11 +268,11 @@ instat_obj$methods(get_model = function(model_name) { } ) -instat_obj$methods(replace_value_in_data = function(data_name, column_name, row_number, new_val) { +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")) - data_objects[[data_name]]$replace_value_in_data(column_name, row_number, new_val) + data_objects[[data_name]]$replace_value_in_data(col_name, index, new_value) } ) diff --git a/instat/ucrDataFrame.vb b/instat/ucrDataFrame.vb index 4dd81941618..ab5309b0919 100644 --- a/instat/ucrDataFrame.vb +++ b/instat/ucrDataFrame.vb @@ -14,33 +14,31 @@ ' You should have received a copy of the GNU General Public License k ' along with this program. If not, see . Imports instat.Translations -Imports RDotNet Public Class ucrDataFrame - Public CurrentColumnList As ucrNewColumnName - Public strDataFrameLength As String + Public iDataFrameLength As Integer + Public clsCurrDataFrame As New RFunction Private Sub ucrDataFrame_Load(sender As Object, e As EventArgs) Handles MyBase.Load frmMain.clsRLink.FillComboDataFrames(cboAvailableDataFrames) - End Sub - - Public Sub SetColumnList(ColumnList As ucrNewColumnName) - CurrentColumnList = ColumnList - UpdateColumnList() + SetDataFrameProperties() End Sub Public Event DataFrameChanged(sender As Object, e As EventArgs) Private Sub cboAvailableDataFrames_SelectedIndexChanged(sender As Object, e As EventArgs) Handles cboAvailableDataFrames.SelectedIndexChanged - UpdateColumnList() + SetDataFrameProperties() RaiseEvent DataFrameChanged(sender, e) - strDataFrameLength = frmMain.clsRLink.clsEngine.Evaluate(frmMain.clsRLink.strInstatDataObject & "$length_of_data(" & Chr(34) & cboAvailableDataFrames.Text & Chr(34) & ")").AsCharacter(0).ToString End Sub - Public Sub UpdateColumnList() - If CurrentColumnList IsNot Nothing Then - frmMain.clsRLink.FillColumnNames(cboAvailableDataFrames.SelectedItem, cboColumns:=CurrentColumnList.cboColumnName) - CurrentColumnList.SetDefaultName(cboAvailableDataFrames.Text) - End If + Public Sub SetDataFrameProperties() + Dim clsParam As New RParameter + iDataFrameLength = frmMain.clsRLink.GetDataFrameLength(cboAvailableDataFrames.Text) + clsCurrDataFrame.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$get_data_frame") + clsParam.SetArgumentName("data_name") + clsParam.SetArgumentValue(Chr(34) & cboAvailableDataFrames.SelectedItem & Chr(34)) + clsCurrDataFrame.AddParameter(clsParam) + clsCurrDataFrame.SetAssignTo(cboAvailableDataFrames.SelectedItem & "_temp") End Sub + End Class diff --git a/instat/ucrNewColumnName.vb b/instat/ucrNewColumnName.vb index 1d553e850d1..b5b105e61d4 100644 --- a/instat/ucrNewColumnName.vb +++ b/instat/ucrNewColumnName.vb @@ -21,33 +21,58 @@ Public Class ucrNewColumnName Public lstNextDefaultNames As GenericVector Public strCurrDataFrame As String Public strPrefix As String = "Val" - Public ucrDataFrameSelector As ucrDataFrame + Public bDataFrameSelectorSet = False + Public WithEvents ucrDataFrameSelector As ucrDataFrame + Public bUseDefault As Boolean = True + Public strCurrNewColumnText As String Private Sub ucrNewColumnName_Load(sender As Object, e As EventArgs) Handles MyBase.Load + bUseDefault = True GetNextDefaults() + If ucrDataFrameSelector IsNot Nothing Then + frmMain.clsRLink.FillColumnNames(ucrDataFrameSelector.cboAvailableDataFrames.Text, cboColumns:=cboColumnName) + SetDefaultName() + End If End Sub - Public Sub SetDataFrameSelector(ucrNewSelector) + Public Sub SetDataFrameSelector(ucrNewSelector As ucrDataFrame) ucrDataFrameSelector = ucrNewSelector + bDataFrameSelectorSet = True + GetNextDefaults() + SetDefaultName() + frmMain.clsRLink.FillColumnNames(ucrDataFrameSelector.cboAvailableDataFrames.Text, cboColumns:=cboColumnName) End Sub Public Sub SetPrefix(strNewPrefix As String) strPrefix = strNewPrefix GetNextDefaults() - SetDefaultName(ucrDataFrameSelector.cboAvailableDataFrames.Text) + SetDefaultName() End Sub Public Sub GetNextDefaults() - lstNextDefaultNames = frmMain.clsRLink.GetDefaultNames(strPrefix) + lstNextDefaultNames = frmMain.clsRLink.GetDefaultColumnNames(strPrefix) End Sub - Public Sub SetDefaultName(strDataFrame As String) + Public Sub SetDefaultName() Dim i As Integer - - For i = 0 To lstNextDefaultNames.Length - 1 - If lstNextDefaultNames.Names(i) = strDataFrame Then - cboColumnName.Text = lstNextDefaultNames.AsCharacter(i) + If bUseDefault Then + If bDataFrameSelectorSet Then + For i = 0 To lstNextDefaultNames.Length - 1 + If lstNextDefaultNames.Names(i) = ucrDataFrameSelector.cboAvailableDataFrames.Text Then + cboColumnName.Text = lstNextDefaultNames.AsCharacter(i) + End If + Next End If - Next + End If + End Sub + + Private Sub ucrDataFrameSelector_DataFrameChanged(sender As Object, e As EventArgs) Handles ucrDataFrameSelector.DataFrameChanged + frmMain.clsRLink.FillColumnNames(ucrDataFrameSelector.cboAvailableDataFrames.Text, cboColumns:=cboColumnName) + SetDefaultName() + End Sub + + 'NOTE: This could be a bug if the user edits the text without a key press e.g. paste using mouse + Private Sub cboColumnName_KeyPress(sender As Object, e As KeyPressEventArgs) Handles cboColumnName.KeyPress + bUseDefault = False End Sub End Class \ No newline at end of file diff --git a/instat/ucrReceiverMultiple.designer.vb b/instat/ucrReceiverMultiple.designer.vb index 5316619c92c..ce95eea3c64 100644 --- a/instat/ucrReceiverMultiple.designer.vb +++ b/instat/ucrReceiverMultiple.designer.vb @@ -19,18 +19,19 @@ Partial Class ucrReceiverMultiple 'Do not modify it using the code editor. Private Sub InitializeComponent() - Me.lstSelectedVariables = New System.Windows.Forms.ListBox() + Me.lstSelectedVariables = New System.Windows.Forms.ListView() Me.SuspendLayout() ' 'lstSelectedVariables ' - Me.lstSelectedVariables.FormattingEnabled = True + Me.lstSelectedVariables.Activation = System.Windows.Forms.ItemActivation.TwoClick + Me.lstSelectedVariables.GridLines = True Me.lstSelectedVariables.Location = New System.Drawing.Point(3, 5) - Me.lstSelectedVariables.MultiColumn = True Me.lstSelectedVariables.Name = "lstSelectedVariables" Me.lstSelectedVariables.Size = New System.Drawing.Size(113, 95) - Me.lstSelectedVariables.Sorted = True - Me.lstSelectedVariables.TabIndex = 0 + Me.lstSelectedVariables.TabIndex = 1 + Me.lstSelectedVariables.UseCompatibleStateImageBehavior = False + Me.lstSelectedVariables.View = System.Windows.Forms.View.List ' 'ucrReceiverMultiple ' @@ -41,6 +42,5 @@ Partial Class ucrReceiverMultiple Me.ResumeLayout(False) End Sub - - Friend WithEvents lstSelectedVariables As ListBox + Friend WithEvents lstSelectedVariables As ListView End Class diff --git a/instat/ucrReceiverMultiple.vb b/instat/ucrReceiverMultiple.vb index 60243b7fda3..b50ec818369 100644 --- a/instat/ucrReceiverMultiple.vb +++ b/instat/ucrReceiverMultiple.vb @@ -31,14 +31,18 @@ Public Class ucrReceiverMultiple End Sub Public Overrides Sub RemoveSelected() - Dim objItem As Object + Dim objItem As ListViewItem Dim tempObjects(lstSelectedVariables.SelectedItems.Count - 1) As Object + Dim i As Integer If lstSelectedVariables.SelectedItems.Count > 0 Then lstSelectedVariables.SelectedItems.CopyTo(tempObjects, 0) For Each objItem In tempObjects lstSelectedVariables.Items.Remove(objItem) - 'to do objSelected.Remove() + i = objSelected.FindIndex(Function(x) x.Text.Equals(objItem.Text)) + If i <> -1 Then + objSelected.RemoveAt(i) + End If Next End If End Sub @@ -66,7 +70,7 @@ Public Class ucrReceiverMultiple Dim strTemp As String = "" Dim i As Integer If objSelected.Count = 1 Then - strTemp = objSelected(0).Text + strTemp = Chr(34) & objSelected(0).Text & Chr(34) ElseIf objSelected.Count > 1 Then strTemp = "c" & "(" For i = 0 To objSelected.Count - 1 diff --git a/instat/ucrSelectorByDataFrame.Designer.vb b/instat/ucrSelectorByDataFrame.Designer.vb index c1350ec526b..f9b6eb39e34 100644 --- a/instat/ucrSelectorByDataFrame.Designer.vb +++ b/instat/ucrSelectorByDataFrame.Designer.vb @@ -25,7 +25,7 @@ Partial Class ucrSelectorByDataFrame Me.ucrAvailableDataFrames = New instat.ucrDataFrame() Me.SuspendLayout() ' - 'lblAvailableVariables + 'lblVariables ' Me.lblVariables.Location = New System.Drawing.Point(3, 52) ' @@ -55,5 +55,5 @@ Partial Class ucrSelectorByDataFrame End Sub - Friend WithEvents ucrAvailableDataFrames As ucrDataFrame + Public WithEvents ucrAvailableDataFrames As ucrDataFrame End Class diff --git a/instat/ucrSelectorByDataFrame.vb b/instat/ucrSelectorByDataFrame.vb index 1d6dc38d394..5e08c8d89cf 100644 --- a/instat/ucrSelectorByDataFrame.vb +++ b/instat/ucrSelectorByDataFrame.vb @@ -1,11 +1,31 @@ -Public Class ucrSelectorByDataFrame +' 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 ucrSelectorByDataFrame Private Sub ucrSelectorByDataFrame_Load(sender As Object, e As EventArgs) Handles MyBase.Load + LoadList() + End Sub + Public Event DataFrameChanged(sender As Object, e As EventArgs) + Private Sub ucrAvailableDataFrames_Load(sender As Object, e As EventArgs) Handles ucrAvailableDataFrames.DataFrameChanged + LoadList() + RaiseEvent DataFrameChanged(sender, e) End Sub + Public Overrides Sub LoadList(Optional strDataType As String = "all") frmMain.clsRLink.FillColumnNames(ucrAvailableDataFrames.cboAvailableDataFrames.Text, lstColumns:=lstAvailableVariable) End Sub - Private Sub ucrAvailableDataFrames_Load(sender As Object, e As EventArgs) Handles ucrAvailableDataFrames.DataFrameChanged - LoadList() - End Sub End Class diff --git a/instat/ucrVariablename.designer.vb b/instat/ucrVariablename.designer.vb new file mode 100644 index 00000000000..6ba9360d1ac --- /dev/null +++ b/instat/ucrVariablename.designer.vb @@ -0,0 +1,48 @@ + +Partial Class ucrVariableName + 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.txtValidation = New System.Windows.Forms.TextBox() + Me.SuspendLayout() + ' + 'txtValidation + ' + Me.txtValidation.Location = New System.Drawing.Point(3, 3) + Me.txtValidation.Name = "txtValidation" + Me.txtValidation.Size = New System.Drawing.Size(141, 20) + Me.txtValidation.TabIndex = 0 + ' + 'ucrVariableName + ' + Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) + Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.Controls.Add(Me.txtValidation) + Me.Name = "ucrVariableName" + Me.Size = New System.Drawing.Size(149, 23) + Me.ResumeLayout(False) + Me.PerformLayout() + + End Sub + + Friend WithEvents txtValidation As TextBox +End Class diff --git a/instat/ucrVariablename.fr-FR.resx b/instat/ucrVariablename.fr-FR.resx new file mode 100644 index 00000000000..a3df4f013d3 --- /dev/null +++ b/instat/ucrVariablename.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/ucrVariablename.resx b/instat/ucrVariablename.resx new file mode 100644 index 00000000000..1af7de150c9 --- /dev/null +++ b/instat/ucrVariablename.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/ucrVariablename.sw-KE.resx b/instat/ucrVariablename.sw-KE.resx new file mode 100644 index 00000000000..a3df4f013d3 --- /dev/null +++ b/instat/ucrVariablename.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/ucrVariablename.vb b/instat/ucrVariablename.vb new file mode 100644 index 00000000000..58a2c9b5fea --- /dev/null +++ b/instat/ucrVariablename.vb @@ -0,0 +1,78 @@ +' 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 ucrVariableName + Dim firstChar As Char + Dim CurrChar As Char + Dim bAcceptableString As Boolean + Public bUserTyped As Boolean + Dim strReservedWords() As String = ({"if", "else", "repeat", "while", "function", "for", "in", "next", "break", "TRUE", "FALSE", "NULL", "Inf", "NaN", "NA", "NA_integer_", "NA_real_", "NA_complex_", "NA_character_"}) + + Private Sub ucrVariableName_Load(sender As Object, e As EventArgs) Handles Me.Load + bUserTyped = False + End Sub + + 'TODO this has a bug if using for setting default values in textbox if user does not use keyboard + Private Sub txtValidation_KeyPress(sender As Object, e As KeyPressEventArgs) Handles txtValidation.KeyPress + bUserTyped = True + End Sub + + Private Sub txtValidation_Leave(sender As Object, e As EventArgs) Handles txtValidation.Leave + bAcceptableString = True + If txtValidation.Text = "" Then + Exit Sub + End If + + If strReservedWords.Contains(txtValidation.Text) Then + MsgBox(Chr(34) & txtValidation.Text & Chr(34) & " is a reserved word in R and cannot be used.", vbOKOnly) + txtValidation.Focus() + End If + firstChar = txtValidation.Text(0) + If Not Char.IsLetter(firstChar) Then + If firstChar <> "." Then + MsgBox("This name cannot start with " & firstChar, vbOKOnly) + txtValidation.Focus() + Exit Sub + Else + If txtValidation.Text.Length > 1 Then + If Char.IsNumber(txtValidation.Text(1)) Then + MsgBox("This name cannot start with a dot followed by a number", vbOKOnly) + txtValidation.Focus() + Exit Sub + End If + Else + MsgBox("This name cannot equal .", vbOKOnly) + txtValidation.Focus() + Exit Sub + End If + End If + End If + + For Each CurrChar In txtValidation.Text + bAcceptableString = Char.IsLetterOrDigit(CurrChar) Or CurrChar = "." Or CurrChar = "_" + If Not bAcceptableString Then + If CurrChar = " " Then + MsgBox("This name cannot contain a space", vbOKOnly) + txtValidation.Focus() + Else + MsgBox("This name cannot contain " & CurrChar, vbOKOnly) + txtValidation.Focus() + End If + Exit For + End If + Next + End Sub +End Class