diff --git a/.gitignore b/.gitignore index c1f6aa34dc6..f0aeb4be5bd 100644 --- a/.gitignore +++ b/.gitignore @@ -211,3 +211,21 @@ FakesAssemblies/ GeneratedArtifacts/ _Pvt_Extensions/ ModelManifest.xml +/packages/unvell.ReoGrid.dll.1.2.3.0/tools/install.ps1 +/packages/unvell.ReoGrid.dll.1.2.3.0/tools +/packages/unvell.ReoGrid.dll.1.2.3.0/lib/20/unvell.ReoGrid.XML +/packages/unvell.ReoGrid.dll.1.2.3.0/lib/20/unvell.ReoGrid.dll +/packages/unvell.ReoGrid.dll.1.2.3.0/lib/20 +/packages/unvell.ReoGrid.dll.1.2.3.0 +/packages/R.NET.Community.1.6.5/lib/net40/RDotNet.XML +/packages/R.NET.Community.1.6.5/lib/net40/RDotNet.NativeLibrary.XML +/packages/R.NET.Community.1.6.5/lib/net40/RDotNet.NativeLibrary.dll +/packages/R.NET.Community.1.6.5/lib/net40/RDotNet.dll +/packages/R.NET.Community.1.6.5/lib/net40 +/packages/R.NET.1.5.5/lib/net40/RDotNet.XML +/packages/R.NET.1.5.5/lib/net40/RDotNet.NativeLibrary.XML +/packages/R.NET.1.5.5/lib/net40/RDotNet.NativeLibrary.dll +/packages/R.NET.1.5.5/lib/net40/RDotNet.dll +/packages/R.NET.1.5.5/lib/net40 +/packages/DynamicInterop.0.7.4/lib/net40/DynamicInterop.xml +/packages/DynamicInterop.0.7.4/lib/net40/DynamicInterop.dll diff --git a/instat/dlgAppend.Designer.vb b/instat/dlgAppend.Designer.vb index ae93df33428..2f663f04a9a 100644 --- a/instat/dlgAppend.Designer.vb +++ b/instat/dlgAppend.Designer.vb @@ -22,43 +22,18 @@ Partial Class dlgAppend 'Do not modify it using the code editor. _ Private Sub InitializeComponent() - Me.ucrBase = New instat.ucrButtons() - Me.ucrSelectorDataframes = New instat.ucrSelectorAddRemove() - Me.ucrReceiverAppendDataframe = New instat.ucrReceiverMultiple() Me.lblAppendToDataframe = New System.Windows.Forms.Label() Me.lblDataframes = New System.Windows.Forms.Label() Me.lblIDColNAme = New System.Windows.Forms.Label() Me.chkIncludeIDColumn = New System.Windows.Forms.CheckBox() - Me.ucrInputIDColName = New instat.ucrInputTextBox() Me.lblNewDataframeName = New System.Windows.Forms.Label() Me.ucrInputNewDataframeName = New instat.ucrInputTextBox() + Me.ucrInputIDColName = New instat.ucrInputTextBox() + Me.ucrReceiverAppendDataframe = New instat.ucrReceiverMultiple() + Me.ucrSelectorDataframes = New instat.ucrSelectorAddRemove() + Me.ucrBase = New instat.ucrButtons() Me.SuspendLayout() ' - 'ucrBase - ' - Me.ucrBase.Location = New System.Drawing.Point(9, 292) - Me.ucrBase.Name = "ucrBase" - Me.ucrBase.Size = New System.Drawing.Size(400, 52) - Me.ucrBase.TabIndex = 0 - ' - 'ucrSelectorDataframes - ' - Me.ucrSelectorDataframes.bShowHiddenColumns = False - Me.ucrSelectorDataframes.Location = New System.Drawing.Point(9, 31) - Me.ucrSelectorDataframes.Margin = New System.Windows.Forms.Padding(0) - Me.ucrSelectorDataframes.Name = "ucrSelectorDataframes" - Me.ucrSelectorDataframes.Size = New System.Drawing.Size(195, 193) - Me.ucrSelectorDataframes.TabIndex = 1 - ' - 'ucrReceiverAppendDataframe - ' - Me.ucrReceiverAppendDataframe.Location = New System.Drawing.Point(246, 31) - Me.ucrReceiverAppendDataframe.Margin = New System.Windows.Forms.Padding(0) - Me.ucrReceiverAppendDataframe.Name = "ucrReceiverAppendDataframe" - Me.ucrReceiverAppendDataframe.Selector = Nothing - Me.ucrReceiverAppendDataframe.Size = New System.Drawing.Size(120, 100) - Me.ucrReceiverAppendDataframe.TabIndex = 2 - ' 'lblAppendToDataframe ' Me.lblAppendToDataframe.AutoSize = True @@ -66,21 +41,21 @@ Partial Class dlgAppend Me.lblAppendToDataframe.Name = "lblAppendToDataframe" Me.lblAppendToDataframe.Size = New System.Drawing.Size(112, 13) Me.lblAppendToDataframe.TabIndex = 3 - Me.lblAppendToDataframe.Text = "Selected Data frames" + Me.lblAppendToDataframe.Text = "Selected Data Frames" ' 'lblDataframes ' Me.lblDataframes.AutoSize = True - Me.lblDataframes.Location = New System.Drawing.Point(9, 9) + Me.lblDataframes.Location = New System.Drawing.Point(10, 9) Me.lblDataframes.Name = "lblDataframes" - Me.lblDataframes.Size = New System.Drawing.Size(64, 13) + Me.lblDataframes.Size = New System.Drawing.Size(67, 13) Me.lblDataframes.TabIndex = 4 - Me.lblDataframes.Text = "Data frames" + Me.lblDataframes.Text = "Data Frames" ' 'lblIDColNAme ' Me.lblIDColNAme.AutoSize = True - Me.lblIDColNAme.Location = New System.Drawing.Point(128, 262) + Me.lblIDColNAme.Location = New System.Drawing.Point(128, 266) Me.lblIDColNAme.Name = "lblIDColNAme" Me.lblIDColNAme.Size = New System.Drawing.Size(87, 13) Me.lblIDColNAme.TabIndex = 3 @@ -89,43 +64,68 @@ Partial Class dlgAppend 'chkIncludeIDColumn ' Me.chkIncludeIDColumn.AutoSize = True - Me.chkIncludeIDColumn.Location = New System.Drawing.Point(9, 262) + Me.chkIncludeIDColumn.Location = New System.Drawing.Point(10, 265) Me.chkIncludeIDColumn.Name = "chkIncludeIDColumn" Me.chkIncludeIDColumn.Size = New System.Drawing.Size(113, 17) Me.chkIncludeIDColumn.TabIndex = 5 Me.chkIncludeIDColumn.Text = "Include ID Column" Me.chkIncludeIDColumn.UseVisualStyleBackColor = True ' - 'ucrInputIDColName - ' - Me.ucrInputIDColName.IsReadOnly = False - Me.ucrInputIDColName.Location = New System.Drawing.Point(221, 258) - Me.ucrInputIDColName.Name = "ucrInputIDColName" - Me.ucrInputIDColName.Size = New System.Drawing.Size(143, 21) - Me.ucrInputIDColName.TabIndex = 6 - ' 'lblNewDataframeName ' Me.lblNewDataframeName.AutoSize = True - Me.lblNewDataframeName.Location = New System.Drawing.Point(12, 239) + Me.lblNewDataframeName.Location = New System.Drawing.Point(10, 239) Me.lblNewDataframeName.Name = "lblNewDataframeName" - Me.lblNewDataframeName.Size = New System.Drawing.Size(115, 13) + Me.lblNewDataframeName.Size = New System.Drawing.Size(118, 13) Me.lblNewDataframeName.TabIndex = 7 - Me.lblNewDataframeName.Text = "New Data frame Name" + Me.lblNewDataframeName.Text = "New Data Frame Name" ' 'ucrInputNewDataframeName ' Me.ucrInputNewDataframeName.IsReadOnly = False - Me.ucrInputNewDataframeName.Location = New System.Drawing.Point(131, 231) + Me.ucrInputNewDataframeName.Location = New System.Drawing.Point(131, 236) Me.ucrInputNewDataframeName.Name = "ucrInputNewDataframeName" Me.ucrInputNewDataframeName.Size = New System.Drawing.Size(235, 21) Me.ucrInputNewDataframeName.TabIndex = 8 ' + 'ucrInputIDColName + ' + Me.ucrInputIDColName.IsReadOnly = False + Me.ucrInputIDColName.Location = New System.Drawing.Point(219, 263) + Me.ucrInputIDColName.Name = "ucrInputIDColName" + Me.ucrInputIDColName.Size = New System.Drawing.Size(147, 21) + Me.ucrInputIDColName.TabIndex = 6 + ' + 'ucrReceiverAppendDataframe + ' + Me.ucrReceiverAppendDataframe.Location = New System.Drawing.Point(246, 31) + Me.ucrReceiverAppendDataframe.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverAppendDataframe.Name = "ucrReceiverAppendDataframe" + Me.ucrReceiverAppendDataframe.Selector = Nothing + Me.ucrReceiverAppendDataframe.Size = New System.Drawing.Size(120, 100) + Me.ucrReceiverAppendDataframe.TabIndex = 2 + ' + 'ucrSelectorDataframes + ' + Me.ucrSelectorDataframes.bShowHiddenColumns = False + Me.ucrSelectorDataframes.Location = New System.Drawing.Point(10, 31) + Me.ucrSelectorDataframes.Margin = New System.Windows.Forms.Padding(0) + Me.ucrSelectorDataframes.Name = "ucrSelectorDataframes" + Me.ucrSelectorDataframes.Size = New System.Drawing.Size(195, 197) + Me.ucrSelectorDataframes.TabIndex = 1 + ' + 'ucrBase + ' + Me.ucrBase.Location = New System.Drawing.Point(10, 290) + Me.ucrBase.Name = "ucrBase" + Me.ucrBase.Size = New System.Drawing.Size(400, 52) + Me.ucrBase.TabIndex = 0 + ' 'dlgAppend ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(413, 356) + Me.ClientSize = New System.Drawing.Size(413, 346) Me.Controls.Add(Me.ucrInputNewDataframeName) Me.Controls.Add(Me.lblNewDataframeName) Me.Controls.Add(Me.ucrInputIDColName) @@ -137,6 +137,8 @@ Partial Class dlgAppend Me.Controls.Add(Me.ucrSelectorDataframes) Me.Controls.Add(Me.ucrBase) Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow + Me.MaximizeBox = False + Me.MinimizeBox = False Me.Name = "dlgAppend" Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen Me.Tag = "Append_to_Dataframe" diff --git a/instat/dlgAppend.vb b/instat/dlgAppend.vb index d95043e5966..1c4363c5ec5 100644 --- a/instat/dlgAppend.vb +++ b/instat/dlgAppend.vb @@ -16,6 +16,7 @@ Imports instat.Translations Public Class dlgAppend Public bFirstLoad As Boolean = True + Private Sub dlgAppend_Load(sender As Object, e As EventArgs) Handles MyBase.Load autoTranslate(Me) @@ -34,12 +35,16 @@ Public Class dlgAppend ucrBase.clsRsyntax.SetFunction("bind_rows") ucrReceiverAppendDataframe.SetItemType("dataframe") ucrInputIDColName.SetValidationTypeAsRVariable() - + ucrInputNewDataframeName.SetValidationTypeAsRVariable() End Sub Private Sub TestOKEnabled() - If ucrReceiverAppendDataframe.IsEmpty = False Then - ucrBase.OKEnabled(True) + If Not ucrReceiverAppendDataframe.IsEmpty AndAlso Not ucrInputNewDataframeName.IsEmpty Then + If chkIncludeIDColumn.Checked AndAlso ucrInputIDColName.IsEmpty Then + ucrBase.OKEnabled(False) + Else + ucrBase.OKEnabled(True) + End If Else ucrBase.OKEnabled(False) End If @@ -47,24 +52,23 @@ Public Class dlgAppend Private Sub SetDefaults() ucrSelectorDataframes.Reset() - ucrInputIDColName.SetName("ID_Col") - ucrInputNewDataframeName.ResetText() - ucrInputIDColName.ResetText() + ucrInputIDColName.SetName("id") + ucrInputNewDataframeName.SetName("Append") chkIncludeIDColumn.Checked = False + TestOKEnabled() End Sub - Private Sub ReopenDialog() + Private Sub ReopenDialog() End Sub Private Sub ucrBase_ClickReset(sender As Object, e As EventArgs) Handles ucrBase.ClickReset SetDefaults() - TestOKEnabled() End Sub Private Sub ucrReceiverAppendDataframe_SelectionChanged(sender As Object, e As EventArgs) Handles ucrReceiverAppendDataframe.SelectionChanged If ucrReceiverAppendDataframe.IsEmpty = False Then - ucrBase.clsRsyntax.AddParameter("x", clsRFunctionParameter:=ucrReceiverAppendDataframe.GetVariables) + ucrBase.clsRsyntax.AddParameter("x", clsRFunctionParameter:=ucrReceiverAppendDataframe.GetVariables, bIncludeArgumentName:=False) Else ucrBase.clsRsyntax.RemoveParameter("x") End If @@ -72,22 +76,29 @@ Public Class dlgAppend End Sub Private Sub chkIncludeIDColumn_CheckedChanged(sender As Object, e As EventArgs) Handles chkIncludeIDColumn.CheckedChanged - includeIDColumn() + IncludeIDColumn() End Sub Private Sub ucrInputIDColName_NameChanged() Handles ucrInputIDColName.NameChanged - includeIDColumn() + IncludeIDColumn() End Sub - Private Sub includeIDColumn() + Private Sub IncludeIDColumn() If chkIncludeIDColumn.Checked Then ucrBase.clsRsyntax.AddParameter(".id", Chr(34) & ucrInputIDColName.GetText & Chr(34)) + ucrInputIDColName.Visible = True + lblIDColNAme.Visible = True Else ucrBase.clsRsyntax.RemoveParameter(".id") + ucrInputIDColName.Visible = False + lblIDColNAme.Visible = False End If + TestOKEnabled() End Sub Private Sub ucrInputNewDataframeName_NameChanged() Handles ucrInputNewDataframeName.NameChanged ucrBase.clsRsyntax.SetAssignTo(ucrInputNewDataframeName.GetText(), strTempDataframe:=ucrInputNewDataframeName.GetText()) + TestOKEnabled() End Sub + End Class \ No newline at end of file diff --git a/instat/dlgColourbyProperty.Designer.vb b/instat/dlgColourbyProperty.Designer.vb index 6671cadb75f..69e581ee45f 100644 --- a/instat/dlgColourbyProperty.Designer.vb +++ b/instat/dlgColourbyProperty.Designer.vb @@ -85,6 +85,8 @@ Partial Class dlgColourbyProperty Me.Controls.Add(Me.ucrSelectorColourByMetadata) Me.Controls.Add(Me.ucrBase) Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow + Me.MaximizeBox = False + Me.MinimizeBox = False Me.Name = "dlgColourbyProperty" Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen Me.Tag = "Colour_by_Property" diff --git a/instat/dlgColumnMetadata.Designer.vb b/instat/dlgColumnMetadata.Designer.vb index 6bae59c33af..ff60dc0b4a3 100644 --- a/instat/dlgColumnMetadata.Designer.vb +++ b/instat/dlgColumnMetadata.Designer.vb @@ -39,6 +39,8 @@ Partial Class dlgColumnMetadata Me.ClientSize = New System.Drawing.Size(420, 261) Me.Controls.Add(Me.ucrBase) Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow + Me.MaximizeBox = False + Me.MinimizeBox = False Me.Name = "dlgColumnMetadata" Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen Me.Tag = "Column_Metadata" diff --git a/instat/dlgColumnStructures.Designer.vb b/instat/dlgColumnStructures.Designer.vb index 8ef5f12c63f..667b156ee22 100644 --- a/instat/dlgColumnStructures.Designer.vb +++ b/instat/dlgColumnStructures.Designer.vb @@ -100,6 +100,7 @@ Partial Class dlgColumnStructure 'ucrSelectorColumnStructure ' Me.ucrSelectorColumnStructure.bShowHiddenColumns = False + Me.ucrSelectorColumnStructure.bUseCurrentFilter = False Me.ucrSelectorColumnStructure.Location = New System.Drawing.Point(12, 9) Me.ucrSelectorColumnStructure.Margin = New System.Windows.Forms.Padding(0) Me.ucrSelectorColumnStructure.Name = "ucrSelectorColumnStructure" @@ -128,6 +129,8 @@ Partial Class dlgColumnStructure Me.Controls.Add(Me.ucrSelectorColumnStructure) Me.Controls.Add(Me.ucrBase) Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow + Me.MaximizeBox = False + Me.MinimizeBox = False Me.Name = "dlgColumnStructure" Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen Me.Tag = "Column_Structure" diff --git a/instat/dlgCombine.Designer.vb b/instat/dlgCombine.Designer.vb index a38f7263ad6..91032a4a795 100644 --- a/instat/dlgCombine.Designer.vb +++ b/instat/dlgCombine.Designer.vb @@ -33,6 +33,8 @@ Partial Class dlgCombine ' 'ucrSelectorCombineFactors ' + Me.ucrSelectorCombineFactors.bShowHiddenColumns = False + Me.ucrSelectorCombineFactors.bUseCurrentFilter = False Me.ucrSelectorCombineFactors.Location = New System.Drawing.Point(10, 10) Me.ucrSelectorCombineFactors.Margin = New System.Windows.Forms.Padding(0) Me.ucrSelectorCombineFactors.Name = "ucrSelectorCombineFactors" @@ -71,6 +73,7 @@ Partial Class dlgCombine ' 'ucrInputColName ' + Me.ucrInputColName.IsReadOnly = False Me.ucrInputColName.Location = New System.Drawing.Point(117, 202) Me.ucrInputColName.Name = "ucrInputColName" Me.ucrInputColName.Size = New System.Drawing.Size(145, 21) @@ -106,6 +109,8 @@ Partial Class dlgCombine Me.Controls.Add(Me.ucrFactorsReceiver) Me.Controls.Add(Me.ucrSelectorCombineFactors) Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow + Me.MaximizeBox = False + Me.MinimizeBox = False Me.Name = "dlgCombine" Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen Me.Tag = "Combine_Factors" diff --git a/instat/dlgContrasts.Designer.vb b/instat/dlgContrasts.Designer.vb index 1bc5f9764ee..d36189f2a35 100644 --- a/instat/dlgContrasts.Designer.vb +++ b/instat/dlgContrasts.Designer.vb @@ -39,6 +39,8 @@ Partial Class dlgContrasts Me.ClientSize = New System.Drawing.Size(422, 261) Me.Controls.Add(Me.ucrBase) Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow + Me.MaximizeBox = False + Me.MinimizeBox = False Me.Name = "dlgContrasts" Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen Me.Tag = "Contrasts" diff --git a/instat/dlgConvertColumns.Designer.vb b/instat/dlgConvertColumns.Designer.vb index dbe3c0639d8..24d9f1f956c 100644 --- a/instat/dlgConvertColumns.Designer.vb +++ b/instat/dlgConvertColumns.Designer.vb @@ -148,6 +148,8 @@ Partial Class dlgConvertColumns ' 'ucrSelectorDataFrameColumns ' + Me.ucrSelectorDataFrameColumns.bShowHiddenColumns = False + Me.ucrSelectorDataFrameColumns.bUseCurrentFilter = False Me.ucrSelectorDataFrameColumns.Location = New System.Drawing.Point(10, 10) Me.ucrSelectorDataFrameColumns.Margin = New System.Windows.Forms.Padding(0) Me.ucrSelectorDataFrameColumns.Name = "ucrSelectorDataFrameColumns" @@ -182,6 +184,8 @@ Partial Class dlgConvertColumns Me.Controls.Add(Me.ucrReceiverColumnsToConvert) Me.Controls.Add(Me.ucrBase) Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow + Me.MaximizeBox = False + Me.MinimizeBox = False Me.Name = "dlgConvertColumns" Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen Me.Tag = "Convert_columns" diff --git a/instat/dlgDeleteRowsOrColums.Designer.vb b/instat/dlgDeleteRowsOrColums.Designer.vb index a8cf7a23cb7..d614c3554ca 100644 --- a/instat/dlgDeleteRowsOrColums.Designer.vb +++ b/instat/dlgDeleteRowsOrColums.Designer.vb @@ -147,6 +147,7 @@ Partial Class dlgDeleteRowsOrColums 'ucrSelectorForDeleteColumns ' Me.ucrSelectorForDeleteColumns.bShowHiddenColumns = False + Me.ucrSelectorForDeleteColumns.bUseCurrentFilter = False Me.ucrSelectorForDeleteColumns.Location = New System.Drawing.Point(10, 38) Me.ucrSelectorForDeleteColumns.Margin = New System.Windows.Forms.Padding(0) Me.ucrSelectorForDeleteColumns.Name = "ucrSelectorForDeleteColumns" @@ -163,6 +164,7 @@ Partial Class dlgDeleteRowsOrColums ' 'ucrSelectorForDeleteRows ' + Me.ucrSelectorForDeleteRows.bUseCurrentFilter = False Me.ucrSelectorForDeleteRows.Location = New System.Drawing.Point(10, 38) Me.ucrSelectorForDeleteRows.Margin = New System.Windows.Forms.Padding(0) Me.ucrSelectorForDeleteRows.Name = "ucrSelectorForDeleteRows" @@ -180,7 +182,7 @@ Partial Class dlgDeleteRowsOrColums ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(541, 295) + Me.ClientSize = New System.Drawing.Size(423, 295) Me.Controls.Add(Me.lblColumnsToDelete) Me.Controls.Add(Me.grpRowsToDelete) Me.Controls.Add(Me.ucrReceiverForColumnsToDelete) @@ -192,6 +194,8 @@ Partial Class dlgDeleteRowsOrColums Me.Controls.Add(Me.lblNumberofRows) Me.Controls.Add(Me.ucrBase) Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow + Me.MaximizeBox = False + Me.MinimizeBox = False Me.Name = "dlgDeleteRowsOrColums" Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen Me.Tag = "Delete_Rows_Columns" diff --git a/instat/dlgDeleteRowsOrColums.vb b/instat/dlgDeleteRowsOrColums.vb index 5313d49324b..107d03a701c 100644 --- a/instat/dlgDeleteRowsOrColums.vb +++ b/instat/dlgDeleteRowsOrColums.vb @@ -145,4 +145,8 @@ Public Class dlgDeleteRowsOrColums ucrBase.clsRsyntax.RemoveParameter("num_rows") End If End Sub + + Private Sub ucrReceiveForColumnsToDelete_SelectionChanged(sender As Object, e As EventArgs) Handles ucrReceiverForColumnsToDelete.SelectionChanged + + End Sub End Class \ No newline at end of file diff --git a/instat/dlgDummyVariables.Designer.vb b/instat/dlgDummyVariables.Designer.vb index 1b6fb69042b..ec090229c8e 100644 --- a/instat/dlgDummyVariables.Designer.vb +++ b/instat/dlgDummyVariables.Designer.vb @@ -133,6 +133,7 @@ Partial Class dlgDummyVariables 'ucrSelectorDummyVariable ' Me.ucrSelectorDummyVariable.bShowHiddenColumns = False + Me.ucrSelectorDummyVariable.bUseCurrentFilter = False Me.ucrSelectorDummyVariable.Location = New System.Drawing.Point(10, 10) Me.ucrSelectorDummyVariable.Margin = New System.Windows.Forms.Padding(0) Me.ucrSelectorDummyVariable.Name = "ucrSelectorDummyVariable" @@ -178,6 +179,8 @@ Partial Class dlgDummyVariables Me.Controls.Add(Me.grpLevelOmitted) Me.Controls.Add(Me.ucrBase) Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow + Me.MaximizeBox = False + Me.MinimizeBox = False Me.Name = "dlgDummyVariables" Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen Me.Tag = "Dummy_Variables" diff --git a/instat/dlgFactorDataFrame.Designer.vb b/instat/dlgFactorDataFrame.Designer.vb index d68591b840b..b7b458ed7a8 100644 --- a/instat/dlgFactorDataFrame.Designer.vb +++ b/instat/dlgFactorDataFrame.Designer.vb @@ -32,13 +32,15 @@ Partial Class dlgFactorDataFrame Me.ucrBase.Size = New System.Drawing.Size(410, 53) Me.ucrBase.TabIndex = 0 ' - 'dlgMakeSheets + 'dlgFactorDataFrame ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.ClientSize = New System.Drawing.Size(435, 261) Me.Controls.Add(Me.ucrBase) Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow + Me.MaximizeBox = False + Me.MinimizeBox = False Me.Name = "dlgFactorDataFrame" Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen Me.Tag = "Factor_Data_Frame" diff --git a/instat/dlgFind.Designer.vb b/instat/dlgFind.Designer.vb index ab37b00a7df..e07a1f4cead 100644 --- a/instat/dlgFind.Designer.vb +++ b/instat/dlgFind.Designer.vb @@ -153,6 +153,8 @@ Partial Class dlgFind Me.Controls.Add(Me.cmdReplace) Me.Controls.Add(Me.cmdFindNext) Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow + Me.MaximizeBox = False + Me.MinimizeBox = False Me.Name = "dlgFind" Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen Me.Tag = "Find" diff --git a/instat/dlgFreezeColumns.Designer.vb b/instat/dlgFreezeColumns.Designer.vb index 507e3d41e1a..edc1439735b 100644 --- a/instat/dlgFreezeColumns.Designer.vb +++ b/instat/dlgFreezeColumns.Designer.vb @@ -30,6 +30,8 @@ Partial Class dlgFreezeColumns ' 'ucrSelectorByDataFrameAddRemoveforFreezeColumns ' + Me.ucrSelectorByDataFrameAddRemoveforFreezeColumns.bShowHiddenColumns = False + Me.ucrSelectorByDataFrameAddRemoveforFreezeColumns.bUseCurrentFilter = False Me.ucrSelectorByDataFrameAddRemoveforFreezeColumns.Location = New System.Drawing.Point(12, 0) Me.ucrSelectorByDataFrameAddRemoveforFreezeColumns.Margin = New System.Windows.Forms.Padding(0) Me.ucrSelectorByDataFrameAddRemoveforFreezeColumns.Name = "ucrSelectorByDataFrameAddRemoveforFreezeColumns" @@ -38,7 +40,7 @@ Partial Class dlgFreezeColumns ' 'ucrReceiverMultipleforFreezeColumns ' - Me.ucrReceiverMultipleforFreezeColumns.Location = New System.Drawing.Point(259, 80) + Me.ucrReceiverMultipleforFreezeColumns.Location = New System.Drawing.Point(240, 28) Me.ucrReceiverMultipleforFreezeColumns.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverMultipleforFreezeColumns.Name = "ucrReceiverMultipleforFreezeColumns" Me.ucrReceiverMultipleforFreezeColumns.Selector = Nothing @@ -55,7 +57,7 @@ Partial Class dlgFreezeColumns 'lblFreezeColumns ' Me.lblFreezeColumns.AutoSize = True - Me.lblFreezeColumns.Location = New System.Drawing.Point(259, 55) + Me.lblFreezeColumns.Location = New System.Drawing.Point(237, 9) Me.lblFreezeColumns.Name = "lblFreezeColumns" Me.lblFreezeColumns.Size = New System.Drawing.Size(82, 13) Me.lblFreezeColumns.TabIndex = 3 @@ -71,6 +73,8 @@ Partial Class dlgFreezeColumns Me.Controls.Add(Me.ucrReceiverMultipleforFreezeColumns) Me.Controls.Add(Me.ucrSelectorByDataFrameAddRemoveforFreezeColumns) Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog + Me.MaximizeBox = False + Me.MinimizeBox = False Me.Name = "dlgFreezeColumns" Me.Text = "Freeze Columns" Me.ResumeLayout(False) diff --git a/instat/dlgHideShowColumns.Designer.vb b/instat/dlgHideShowColumns.Designer.vb index 0efa697797e..856cafd1547 100644 --- a/instat/dlgHideShowColumns.Designer.vb +++ b/instat/dlgHideShowColumns.Designer.vb @@ -37,6 +37,8 @@ Partial Class dlgHideShowColumns ' 'ucrSelectorForHiddenColumns ' + Me.ucrSelectorForHiddenColumns.bShowHiddenColumns = False + Me.ucrSelectorForHiddenColumns.bUseCurrentFilter = False Me.ucrSelectorForHiddenColumns.Location = New System.Drawing.Point(13, 13) Me.ucrSelectorForHiddenColumns.Margin = New System.Windows.Forms.Padding(0) Me.ucrSelectorForHiddenColumns.Name = "ucrSelectorForHiddenColumns" @@ -71,6 +73,8 @@ Partial Class dlgHideShowColumns Me.Controls.Add(Me.ucrSelectorForHiddenColumns) Me.Controls.Add(Me.ucrBase) Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow + Me.MaximizeBox = False + Me.MinimizeBox = False Me.Name = "dlgHideShowColumns" Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen Me.Tag = "Hidden_Columns" diff --git a/instat/dlgInsertColumn.Designer.vb b/instat/dlgInsertColumn.Designer.vb index 9718244f57d..b3663540c81 100644 --- a/instat/dlgInsertColumn.Designer.vb +++ b/instat/dlgInsertColumn.Designer.vb @@ -44,8 +44,8 @@ Partial Class dlgInsertColumn Me.ucrBase = New instat.ucrButtons() Me.ucrDataFramesList = New instat.ucrDataFrame() Me.grpOPtions = New System.Windows.Forms.GroupBox() - Me.rdoBefore = New System.Windows.Forms.RadioButton() Me.rdoAfter = New System.Windows.Forms.RadioButton() + Me.rdoBefore = New System.Windows.Forms.RadioButton() CType(Me.nudPos, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.nudNumCols, System.ComponentModel.ISupportInitialize).BeginInit() Me.grpInsert.SuspendLayout() @@ -126,6 +126,7 @@ Partial Class dlgInsertColumn ' 'ucrInputBeforeAfter ' + Me.ucrInputBeforeAfter.IsReadOnly = False Me.ucrInputBeforeAfter.Location = New System.Drawing.Point(26, 65) Me.ucrInputBeforeAfter.Name = "ucrInputBeforeAfter" Me.ucrInputBeforeAfter.Size = New System.Drawing.Size(93, 21) @@ -199,6 +200,7 @@ Partial Class dlgInsertColumn ' 'ucrInputPrefixForInsertedColumns ' + Me.ucrInputPrefixForInsertedColumns.IsReadOnly = False Me.ucrInputPrefixForInsertedColumns.Location = New System.Drawing.Point(166, 265) Me.ucrInputPrefixForInsertedColumns.Name = "ucrInputPrefixForInsertedColumns" Me.ucrInputPrefixForInsertedColumns.Size = New System.Drawing.Size(256, 21) @@ -206,6 +208,7 @@ Partial Class dlgInsertColumn ' 'ucrInputDefaultValue ' + Me.ucrInputDefaultValue.IsReadOnly = False Me.ucrInputDefaultValue.Location = New System.Drawing.Point(408, 182) Me.ucrInputDefaultValue.Name = "ucrInputDefaultValue" Me.ucrInputDefaultValue.Size = New System.Drawing.Size(45, 21) @@ -222,6 +225,7 @@ Partial Class dlgInsertColumn ' 'ucrSelectorInseertColumns ' + Me.ucrSelectorInseertColumns.bShowHiddenColumns = False Me.ucrSelectorInseertColumns.Location = New System.Drawing.Point(9, 75) Me.ucrSelectorInseertColumns.Margin = New System.Windows.Forms.Padding(0) Me.ucrSelectorInseertColumns.Name = "ucrSelectorInseertColumns" @@ -237,6 +241,7 @@ Partial Class dlgInsertColumn ' 'ucrDataFramesList ' + Me.ucrDataFramesList.bUseCurrentFilter = False Me.ucrDataFramesList.Location = New System.Drawing.Point(12, 32) Me.ucrDataFramesList.Margin = New System.Windows.Forms.Padding(0) Me.ucrDataFramesList.Name = "ucrDataFramesList" @@ -254,17 +259,6 @@ Partial Class dlgInsertColumn Me.grpOPtions.TabStop = False Me.grpOPtions.Text = "OPtions" ' - 'rdoBefore - ' - Me.rdoBefore.AutoSize = True - Me.rdoBefore.Location = New System.Drawing.Point(7, 20) - Me.rdoBefore.Name = "rdoBefore" - Me.rdoBefore.Size = New System.Drawing.Size(56, 17) - Me.rdoBefore.TabIndex = 0 - Me.rdoBefore.TabStop = True - Me.rdoBefore.Text = "Before" - Me.rdoBefore.UseVisualStyleBackColor = True - ' 'rdoAfter ' Me.rdoAfter.AutoSize = True @@ -276,6 +270,17 @@ Partial Class dlgInsertColumn Me.rdoAfter.Text = "After" Me.rdoAfter.UseVisualStyleBackColor = True ' + 'rdoBefore + ' + Me.rdoBefore.AutoSize = True + Me.rdoBefore.Location = New System.Drawing.Point(7, 20) + Me.rdoBefore.Name = "rdoBefore" + Me.rdoBefore.Size = New System.Drawing.Size(56, 17) + Me.rdoBefore.TabIndex = 0 + Me.rdoBefore.TabStop = True + Me.rdoBefore.Text = "Before" + Me.rdoBefore.UseVisualStyleBackColor = True + ' 'dlgInsertColumn ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -300,6 +305,8 @@ Partial Class dlgInsertColumn Me.Controls.Add(Me.ucrBase) Me.Controls.Add(Me.ucrDataFramesList) Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow + Me.MaximizeBox = False + Me.MinimizeBox = False Me.Name = "dlgInsertColumn" Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen Me.Text = "Insert Columns/Rows" diff --git a/instat/dlgJitter.Designer.vb b/instat/dlgJitter.Designer.vb index fc0f9ad7acd..06610cb5af2 100644 --- a/instat/dlgJitter.Designer.vb +++ b/instat/dlgJitter.Designer.vb @@ -46,6 +46,8 @@ Partial Class dlgJitter ' 'ucrSelectorForJitter ' + Me.ucrSelectorForJitter.bShowHiddenColumns = False + Me.ucrSelectorForJitter.bUseCurrentFilter = False Me.ucrSelectorForJitter.Location = New System.Drawing.Point(13, 13) Me.ucrSelectorForJitter.Margin = New System.Windows.Forms.Padding(0) Me.ucrSelectorForJitter.Name = "ucrSelectorForJitter" @@ -159,6 +161,8 @@ Partial Class dlgJitter Me.Controls.Add(Me.ucrSelectorForJitter) Me.Controls.Add(Me.ucrBase) Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow + Me.MaximizeBox = False + Me.MinimizeBox = False Me.Name = "dlgJitter" Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen Me.Tag = "Jitter" diff --git a/instat/dlgLabels.Designer.vb b/instat/dlgLabels.Designer.vb index d2efbdbf716..a0e5a33a6d8 100644 --- a/instat/dlgLabels.Designer.vb +++ b/instat/dlgLabels.Designer.vb @@ -63,6 +63,7 @@ Partial Class dlgLabels 'ucrSelectorForLabels ' Me.ucrSelectorForLabels.bShowHiddenColumns = False + Me.ucrSelectorForLabels.bUseCurrentFilter = False Me.ucrSelectorForLabels.Location = New System.Drawing.Point(12, 12) Me.ucrSelectorForLabels.Margin = New System.Windows.Forms.Padding(0) Me.ucrSelectorForLabels.Name = "ucrSelectorForLabels" @@ -97,6 +98,8 @@ Partial Class dlgLabels Me.Controls.Add(Me.ucrSelectorForLabels) Me.Controls.Add(Me.ucrBase) Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow + Me.MaximizeBox = False + Me.MinimizeBox = False Me.Name = "dlgLabels" Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen Me.Tag = "Labels" diff --git a/instat/dlgMerge.Designer.vb b/instat/dlgMerge.Designer.vb index 795cfc0e839..07ae46c9235 100644 --- a/instat/dlgMerge.Designer.vb +++ b/instat/dlgMerge.Designer.vb @@ -254,6 +254,7 @@ Partial Class dlgMerge 'ucrSelectorSecondDataFrame ' Me.ucrSelectorSecondDataFrame.bShowHiddenColumns = False + Me.ucrSelectorSecondDataFrame.bUseCurrentFilter = False Me.ucrSelectorSecondDataFrame.Location = New System.Drawing.Point(230, 26) Me.ucrSelectorSecondDataFrame.Margin = New System.Windows.Forms.Padding(0) Me.ucrSelectorSecondDataFrame.Name = "ucrSelectorSecondDataFrame" @@ -263,6 +264,7 @@ Partial Class dlgMerge 'ucrSelectorFirstDataFrame ' Me.ucrSelectorFirstDataFrame.bShowHiddenColumns = False + Me.ucrSelectorFirstDataFrame.bUseCurrentFilter = False Me.ucrSelectorFirstDataFrame.Location = New System.Drawing.Point(10, 24) Me.ucrSelectorFirstDataFrame.Margin = New System.Windows.Forms.Padding(0) Me.ucrSelectorFirstDataFrame.Name = "ucrSelectorFirstDataFrame" @@ -294,6 +296,8 @@ Partial Class dlgMerge Me.Controls.Add(Me.ucrSelectorFirstDataFrame) Me.Controls.Add(Me.ucrBase) Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow + Me.MaximizeBox = False + Me.MinimizeBox = False Me.Name = "dlgMerge" Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen Me.Tag = "Merge" diff --git a/instat/dlgPermuteColumn.Designer.vb b/instat/dlgPermuteColumn.Designer.vb index 6d69f950023..ff2c54da64a 100644 --- a/instat/dlgPermuteColumn.Designer.vb +++ b/instat/dlgPermuteColumn.Designer.vb @@ -39,7 +39,7 @@ Partial Class dlgPermuteColumn 'lblSelected ' Me.lblSelected.AutoSize = True - Me.lblSelected.Location = New System.Drawing.Point(255, 25) + Me.lblSelected.Location = New System.Drawing.Point(255, 13) Me.lblSelected.Name = "lblSelected" Me.lblSelected.Size = New System.Drawing.Size(49, 13) Me.lblSelected.TabIndex = 1 @@ -95,6 +95,7 @@ Partial Class dlgPermuteColumn ' 'ucrInputPermuteRows ' + Me.ucrInputPermuteRows.IsReadOnly = False Me.ucrInputPermuteRows.Location = New System.Drawing.Point(114, 205) Me.ucrInputPermuteRows.Name = "ucrInputPermuteRows" Me.ucrInputPermuteRows.Size = New System.Drawing.Size(145, 21) @@ -102,7 +103,7 @@ Partial Class dlgPermuteColumn ' 'ucrReceiverPermuteRows ' - Me.ucrReceiverPermuteRows.Location = New System.Drawing.Point(255, 42) + Me.ucrReceiverPermuteRows.Location = New System.Drawing.Point(255, 30) Me.ucrReceiverPermuteRows.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverPermuteRows.Name = "ucrReceiverPermuteRows" Me.ucrReceiverPermuteRows.Selector = Nothing @@ -111,6 +112,8 @@ Partial Class dlgPermuteColumn ' 'ucrPermuteRowsSelector ' + Me.ucrPermuteRowsSelector.bShowHiddenColumns = False + Me.ucrPermuteRowsSelector.bUseCurrentFilter = False Me.ucrPermuteRowsSelector.Location = New System.Drawing.Point(10, 10) Me.ucrPermuteRowsSelector.Margin = New System.Windows.Forms.Padding(0) Me.ucrPermuteRowsSelector.Name = "ucrPermuteRowsSelector" @@ -140,6 +143,8 @@ Partial Class dlgPermuteColumn Me.Controls.Add(Me.ucrPermuteRowsSelector) Me.Controls.Add(Me.ucrBase) Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow + Me.MaximizeBox = False + Me.MinimizeBox = False Me.Name = "dlgPermuteColumn" Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen Me.Tag = "Permute_Column" diff --git a/instat/dlgPolynomials.Designer.vb b/instat/dlgPolynomials.Designer.vb index 815d9bf63f2..84164c4b4d1 100644 --- a/instat/dlgPolynomials.Designer.vb +++ b/instat/dlgPolynomials.Designer.vb @@ -134,6 +134,7 @@ Partial Class dlgPolynomials ' 'ucrInputPolynomial ' + Me.ucrInputPolynomial.IsReadOnly = False Me.ucrInputPolynomial.Location = New System.Drawing.Point(116, 207) Me.ucrInputPolynomial.Name = "ucrInputPolynomial" Me.ucrInputPolynomial.Size = New System.Drawing.Size(145, 21) @@ -141,6 +142,8 @@ Partial Class dlgPolynomials ' 'ucrSelectorForPolynomial ' + Me.ucrSelectorForPolynomial.bShowHiddenColumns = False + Me.ucrSelectorForPolynomial.bUseCurrentFilter = False Me.ucrSelectorForPolynomial.Location = New System.Drawing.Point(10, 10) Me.ucrSelectorForPolynomial.Margin = New System.Windows.Forms.Padding(0) Me.ucrSelectorForPolynomial.Name = "ucrSelectorForPolynomial" @@ -178,6 +181,8 @@ Partial Class dlgPolynomials Me.Controls.Add(Me.grpType) Me.Controls.Add(Me.lblDegree) Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow + Me.MaximizeBox = False + Me.MinimizeBox = False Me.Name = "dlgPolynomials" Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen Me.Tag = "Polynomial" diff --git a/instat/dlgProtect.Designer.vb b/instat/dlgProtect.Designer.vb index 1dbb9c8b953..e0aeaefebc5 100644 --- a/instat/dlgProtect.Designer.vb +++ b/instat/dlgProtect.Designer.vb @@ -36,9 +36,11 @@ Partial Class dlgProtect ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(437, 261) + Me.ClientSize = New System.Drawing.Size(440, 261) Me.Controls.Add(Me.ucrBase) Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow + Me.MaximizeBox = False + Me.MinimizeBox = False Me.Name = "dlgProtect" Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen Me.Tag = "Protect_Lock_Unlock" diff --git a/instat/dlgRank.Designer.vb b/instat/dlgRank.Designer.vb index 54e2c3a20bb..74d8badb05f 100644 --- a/instat/dlgRank.Designer.vb +++ b/instat/dlgRank.Designer.vb @@ -45,7 +45,7 @@ Partial Class dlgRank 'lblSelectedVariable ' Me.lblSelectedVariable.AutoSize = True - Me.lblSelectedVariable.Location = New System.Drawing.Point(255, 25) + Me.lblSelectedVariable.Location = New System.Drawing.Point(255, 13) Me.lblSelectedVariable.Name = "lblSelectedVariable" Me.lblSelectedVariable.Size = New System.Drawing.Size(90, 13) Me.lblSelectedVariable.TabIndex = 1 @@ -197,6 +197,7 @@ Partial Class dlgRank 'ucrSelectorForRank ' Me.ucrSelectorForRank.bShowHiddenColumns = False + Me.ucrSelectorForRank.bUseCurrentFilter = False Me.ucrSelectorForRank.Location = New System.Drawing.Point(10, 10) Me.ucrSelectorForRank.Margin = New System.Windows.Forms.Padding(0) Me.ucrSelectorForRank.Name = "ucrSelectorForRank" @@ -205,7 +206,7 @@ Partial Class dlgRank ' 'ucrReceiverRank ' - Me.ucrReceiverRank.Location = New System.Drawing.Point(255, 41) + Me.ucrReceiverRank.Location = New System.Drawing.Point(257, 30) Me.ucrReceiverRank.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverRank.Name = "ucrReceiverRank" Me.ucrReceiverRank.Selector = Nothing @@ -233,6 +234,8 @@ Partial Class dlgRank Me.Controls.Add(Me.ucrReceiverRank) Me.Controls.Add(Me.ucrBase) Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow + Me.MaximizeBox = False + Me.MinimizeBox = False Me.Name = "dlgRank" Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen Me.Tag = "Rank" diff --git a/instat/dlgRecodeFactor.Designer.vb b/instat/dlgRecodeFactor.Designer.vb index 1896c041d98..5b60cb27d16 100644 --- a/instat/dlgRecodeFactor.Designer.vb +++ b/instat/dlgRecodeFactor.Designer.vb @@ -41,6 +41,7 @@ Partial Class dlgRecodeFactor 'ucrSelectorForRecode ' Me.ucrSelectorForRecode.bShowHiddenColumns = False + Me.ucrSelectorForRecode.bUseCurrentFilter = False Me.ucrSelectorForRecode.Location = New System.Drawing.Point(10, 10) Me.ucrSelectorForRecode.Margin = New System.Windows.Forms.Padding(0) Me.ucrSelectorForRecode.Name = "ucrSelectorForRecode" @@ -106,6 +107,8 @@ Partial Class dlgRecodeFactor Me.Controls.Add(Me.ucrSelectorForRecode) Me.Controls.Add(Me.ucrBase) Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow + Me.MaximizeBox = False + Me.MinimizeBox = False Me.Name = "dlgRecodeFactor" Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen Me.Text = "Recode Factor" diff --git a/instat/dlgRecodeNumeric.Designer.vb b/instat/dlgRecodeNumeric.Designer.vb index ba9de580cf3..3c3927efa62 100644 --- a/instat/dlgRecodeNumeric.Designer.vb +++ b/instat/dlgRecodeNumeric.Designer.vb @@ -115,6 +115,7 @@ Partial Class dlgRecodeNumeric ' 'ucrInputRecode ' + Me.ucrInputRecode.IsReadOnly = False Me.ucrInputRecode.Location = New System.Drawing.Point(114, 234) Me.ucrInputRecode.Name = "ucrInputRecode" Me.ucrInputRecode.Size = New System.Drawing.Size(145, 21) @@ -145,6 +146,8 @@ Partial Class dlgRecodeNumeric ' 'ucrSelectorForRecode ' + Me.ucrSelectorForRecode.bShowHiddenColumns = False + Me.ucrSelectorForRecode.bUseCurrentFilter = False Me.ucrSelectorForRecode.Location = New System.Drawing.Point(10, 10) Me.ucrSelectorForRecode.Margin = New System.Windows.Forms.Padding(0) Me.ucrSelectorForRecode.Name = "ucrSelectorForRecode" @@ -175,6 +178,8 @@ Partial Class dlgRecodeNumeric Me.Controls.Add(Me.chkAddLabels) Me.Controls.Add(Me.ucrBase) Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow + Me.MaximizeBox = False + Me.MinimizeBox = False Me.Name = "dlgRecodeNumeric" Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen Me.Tag = "Recode" diff --git a/instat/dlgReferenceLevel.Designer.vb b/instat/dlgReferenceLevel.Designer.vb index 643c7dc1f65..ac9b4fd4284 100644 --- a/instat/dlgReferenceLevel.Designer.vb +++ b/instat/dlgReferenceLevel.Designer.vb @@ -49,6 +49,7 @@ Partial Class dlgReferenceLevel 'ucrSelectorForReferenceLevels ' Me.ucrSelectorForReferenceLevels.bShowHiddenColumns = False + Me.ucrSelectorForReferenceLevels.bUseCurrentFilter = False Me.ucrSelectorForReferenceLevels.Location = New System.Drawing.Point(13, 13) Me.ucrSelectorForReferenceLevels.Margin = New System.Windows.Forms.Padding(0) Me.ucrSelectorForReferenceLevels.Name = "ucrSelectorForReferenceLevels" @@ -86,6 +87,8 @@ Partial Class dlgReferenceLevel Me.Controls.Add(Me.lblFactorSelected) Me.Controls.Add(Me.ucrBase) Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow + Me.MaximizeBox = False + Me.MinimizeBox = False Me.Name = "dlgReferenceLevel" Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen Me.Tag = "Reference_Level" diff --git a/instat/dlgRegularSequence.designer.vb b/instat/dlgRegularSequence.designer.vb index 21363a9a614..7e21a78ba72 100644 --- a/instat/dlgRegularSequence.designer.vb +++ b/instat/dlgRegularSequence.designer.vb @@ -327,6 +327,7 @@ Partial Class dlgRegularSequence ' 'ucrSelectDataFrameRegularSequence ' + Me.ucrSelectDataFrameRegularSequence.bUseCurrentFilter = False Me.ucrSelectDataFrameRegularSequence.Location = New System.Drawing.Point(10, 10) Me.ucrSelectDataFrameRegularSequence.Margin = New System.Windows.Forms.Padding(0) Me.ucrSelectDataFrameRegularSequence.Name = "ucrSelectDataFrameRegularSequence" diff --git a/instat/dlgReorderColumns.Designer.vb b/instat/dlgReorderColumns.Designer.vb index 61e41b437b8..677d504cc58 100644 --- a/instat/dlgReorderColumns.Designer.vb +++ b/instat/dlgReorderColumns.Designer.vb @@ -57,6 +57,7 @@ Partial Class dlgReorderColumns ' 'ucrDataFrameSelect ' + Me.ucrDataFrameSelect.bUseCurrentFilter = False Me.ucrDataFrameSelect.Location = New System.Drawing.Point(10, 10) Me.ucrDataFrameSelect.Margin = New System.Windows.Forms.Padding(0) Me.ucrDataFrameSelect.Name = "ucrDataFrameSelect" @@ -73,6 +74,8 @@ Partial Class dlgReorderColumns Me.Controls.Add(Me.lblColumns) Me.Controls.Add(Me.ucrBase) Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow + Me.MaximizeBox = False + Me.MinimizeBox = False Me.Name = "dlgReorderColumns" Me.ShowIcon = False Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent diff --git a/instat/dlgReorderLevels.Designer.vb b/instat/dlgReorderLevels.Designer.vb index d1632f902bc..37d1bf2b84f 100644 --- a/instat/dlgReorderLevels.Designer.vb +++ b/instat/dlgReorderLevels.Designer.vb @@ -51,6 +51,7 @@ Partial Class dlgReorderLevels 'ucrReceiverFactor ' Me.ucrReceiverFactor.Location = New System.Drawing.Point(249, 32) + Me.ucrReceiverFactor.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverFactor.Name = "ucrReceiverFactor" Me.ucrReceiverFactor.Selector = Nothing Me.ucrReceiverFactor.Size = New System.Drawing.Size(106, 26) @@ -58,7 +59,10 @@ Partial Class dlgReorderLevels ' 'ucrSelectorFactorLevelsToReorder ' + Me.ucrSelectorFactorLevelsToReorder.bShowHiddenColumns = False + Me.ucrSelectorFactorLevelsToReorder.bUseCurrentFilter = False Me.ucrSelectorFactorLevelsToReorder.Location = New System.Drawing.Point(5, 6) + Me.ucrSelectorFactorLevelsToReorder.Margin = New System.Windows.Forms.Padding(0) Me.ucrSelectorFactorLevelsToReorder.Name = "ucrSelectorFactorLevelsToReorder" Me.ucrSelectorFactorLevelsToReorder.Size = New System.Drawing.Size(242, 179) Me.ucrSelectorFactorLevelsToReorder.TabIndex = 1 @@ -81,6 +85,8 @@ Partial Class dlgReorderLevels Me.Controls.Add(Me.ucrSelectorFactorLevelsToReorder) Me.Controls.Add(Me.ucrBase) Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow + Me.MaximizeBox = False + Me.MinimizeBox = False Me.Name = "dlgReorderLevels" Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen Me.Tag = "Reorder_Levels" diff --git a/instat/dlgReplace.Designer.vb b/instat/dlgReplace.Designer.vb index 8b1e2863a57..d558640170e 100644 --- a/instat/dlgReplace.Designer.vb +++ b/instat/dlgReplace.Designer.vb @@ -27,18 +27,18 @@ Partial Class dlgReplace Me.lblMaximum = New System.Windows.Forms.Label() Me.lblRangeMin = New System.Windows.Forms.Label() Me.chkIncludeMinimum = New System.Windows.Forms.CheckBox() + Me.ucrInputRangeTo = New instat.ucrInputTextBox() + Me.ucrInputRangeFrom = New instat.ucrInputTextBox() + Me.ucrInputOldValue = New instat.ucrInputTextBox() Me.rdoRange = New System.Windows.Forms.RadioButton() Me.rdoOldMissing = New System.Windows.Forms.RadioButton() Me.rdoOldValue = New System.Windows.Forms.RadioButton() Me.grpNew = New System.Windows.Forms.GroupBox() + Me.ucrInputNewValue = New instat.ucrInputTextBox() Me.rdoNewMissing = New System.Windows.Forms.RadioButton() Me.rdoNewValue = New System.Windows.Forms.RadioButton() Me.rdoFromAbove = New System.Windows.Forms.RadioButton() Me.lblSelectedColumns = New System.Windows.Forms.Label() - Me.ucrInputNewValue = New instat.ucrInputTextBox() - Me.ucrInputRangeTo = New instat.ucrInputTextBox() - Me.ucrInputRangeFrom = New instat.ucrInputTextBox() - Me.ucrInputOldValue = New instat.ucrInputTextBox() Me.ucrReceiverReplace = New instat.ucrReceiverMultiple() Me.ucrSelectorReplace = New instat.ucrSelectorByDataFrameAddRemove() Me.ucrBaseReplace = New instat.ucrButtons() @@ -108,6 +108,30 @@ Partial Class dlgReplace Me.chkIncludeMinimum.Text = "Including" Me.chkIncludeMinimum.UseVisualStyleBackColor = True ' + 'ucrInputRangeTo + ' + Me.ucrInputRangeTo.IsReadOnly = False + Me.ucrInputRangeTo.Location = New System.Drawing.Point(79, 106) + Me.ucrInputRangeTo.Name = "ucrInputRangeTo" + Me.ucrInputRangeTo.Size = New System.Drawing.Size(69, 21) + Me.ucrInputRangeTo.TabIndex = 5 + ' + 'ucrInputRangeFrom + ' + Me.ucrInputRangeFrom.IsReadOnly = False + Me.ucrInputRangeFrom.Location = New System.Drawing.Point(79, 76) + Me.ucrInputRangeFrom.Name = "ucrInputRangeFrom" + Me.ucrInputRangeFrom.Size = New System.Drawing.Size(69, 21) + Me.ucrInputRangeFrom.TabIndex = 4 + ' + 'ucrInputOldValue + ' + Me.ucrInputOldValue.IsReadOnly = False + Me.ucrInputOldValue.Location = New System.Drawing.Point(58, 19) + Me.ucrInputOldValue.Name = "ucrInputOldValue" + Me.ucrInputOldValue.Size = New System.Drawing.Size(95, 21) + Me.ucrInputOldValue.TabIndex = 3 + ' 'rdoRange ' Me.rdoRange.AutoSize = True @@ -158,6 +182,14 @@ Partial Class dlgReplace Me.grpNew.Tag = "New" Me.grpNew.Text = "New" ' + 'ucrInputNewValue + ' + Me.ucrInputNewValue.IsReadOnly = False + Me.ucrInputNewValue.Location = New System.Drawing.Point(63, 19) + Me.ucrInputNewValue.Name = "ucrInputNewValue" + Me.ucrInputNewValue.Size = New System.Drawing.Size(97, 21) + Me.ucrInputNewValue.TabIndex = 6 + ' 'rdoNewMissing ' Me.rdoNewMissing.AutoSize = True @@ -204,38 +236,6 @@ Partial Class dlgReplace Me.lblSelectedColumns.Tag = "Selected_Column(s)" Me.lblSelectedColumns.Text = "Selected Column(s)" ' - 'ucrInputNewValue - ' - Me.ucrInputNewValue.IsReadOnly = False - Me.ucrInputNewValue.Location = New System.Drawing.Point(63, 19) - Me.ucrInputNewValue.Name = "ucrInputNewValue" - Me.ucrInputNewValue.Size = New System.Drawing.Size(97, 21) - Me.ucrInputNewValue.TabIndex = 6 - ' - 'ucrInputRangeTo - ' - Me.ucrInputRangeTo.IsReadOnly = False - Me.ucrInputRangeTo.Location = New System.Drawing.Point(79, 106) - Me.ucrInputRangeTo.Name = "ucrInputRangeTo" - Me.ucrInputRangeTo.Size = New System.Drawing.Size(69, 21) - Me.ucrInputRangeTo.TabIndex = 5 - ' - 'ucrInputRangeFrom - ' - Me.ucrInputRangeFrom.IsReadOnly = False - Me.ucrInputRangeFrom.Location = New System.Drawing.Point(79, 76) - Me.ucrInputRangeFrom.Name = "ucrInputRangeFrom" - Me.ucrInputRangeFrom.Size = New System.Drawing.Size(69, 21) - Me.ucrInputRangeFrom.TabIndex = 4 - ' - 'ucrInputOldValue - ' - Me.ucrInputOldValue.IsReadOnly = False - Me.ucrInputOldValue.Location = New System.Drawing.Point(58, 19) - Me.ucrInputOldValue.Name = "ucrInputOldValue" - Me.ucrInputOldValue.Size = New System.Drawing.Size(95, 21) - Me.ucrInputOldValue.TabIndex = 3 - ' 'ucrReceiverReplace ' Me.ucrReceiverReplace.Location = New System.Drawing.Point(276, 52) @@ -248,6 +248,7 @@ Partial Class dlgReplace 'ucrSelectorReplace ' Me.ucrSelectorReplace.bShowHiddenColumns = False + Me.ucrSelectorReplace.bUseCurrentFilter = False Me.ucrSelectorReplace.Location = New System.Drawing.Point(10, 10) Me.ucrSelectorReplace.Margin = New System.Windows.Forms.Padding(0) Me.ucrSelectorReplace.Name = "ucrSelectorReplace" @@ -273,6 +274,8 @@ Partial Class dlgReplace Me.Controls.Add(Me.ucrSelectorReplace) Me.Controls.Add(Me.ucrBaseReplace) Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow + Me.MaximizeBox = False + Me.MinimizeBox = False Me.Name = "dlgReplace" Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen Me.Tag = "Replace" diff --git a/instat/dlgRowStats.Designer.vb b/instat/dlgRowStats.Designer.vb index 2bd17181ab0..84aefe4b037 100644 --- a/instat/dlgRowStats.Designer.vb +++ b/instat/dlgRowStats.Designer.vb @@ -187,6 +187,7 @@ Partial Class dlgRowStats ' 'ucrInputcboRowSummary ' + Me.ucrInputcboRowSummary.IsReadOnly = False Me.ucrInputcboRowSummary.Location = New System.Drawing.Point(114, 271) Me.ucrInputcboRowSummary.Name = "ucrInputcboRowSummary" Me.ucrInputcboRowSummary.Size = New System.Drawing.Size(141, 25) @@ -194,6 +195,8 @@ Partial Class dlgRowStats ' 'ucrSelectorForRowStats ' + Me.ucrSelectorForRowStats.bShowHiddenColumns = False + Me.ucrSelectorForRowStats.bUseCurrentFilter = False Me.ucrSelectorForRowStats.Location = New System.Drawing.Point(10, 10) Me.ucrSelectorForRowStats.Margin = New System.Windows.Forms.Padding(0) Me.ucrSelectorForRowStats.Name = "ucrSelectorForRowStats" @@ -230,6 +233,8 @@ Partial Class dlgRowStats Me.Controls.Add(Me.ucrReceiverForRowStatistics) Me.Controls.Add(Me.ucrBase) Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow + Me.MaximizeBox = False + Me.MinimizeBox = False Me.Name = "dlgRowStats" Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen Me.Tag = "Row_statistics" diff --git a/instat/dlgRownamesOrNumbers.Designer.vb b/instat/dlgRownamesOrNumbers.Designer.vb index 281b3baeab4..845a4845d6f 100644 --- a/instat/dlgRownamesOrNumbers.Designer.vb +++ b/instat/dlgRownamesOrNumbers.Designer.vb @@ -23,6 +23,7 @@ Partial Class dlgRowNamesOrNumbers Private Sub InitializeComponent() Me.grpboxOptionsforRowNamesorNumbercols = New System.Windows.Forms.GroupBox() + Me.ucrNewColumnName = New instat.ucrInputTextBox() Me.lblColumnName = New System.Windows.Forms.Label() Me.grpSortOptions = New System.Windows.Forms.GroupBox() Me.rdoSortDescending = New System.Windows.Forms.RadioButton() @@ -35,7 +36,6 @@ Partial Class dlgRowNamesOrNumbers Me.ucrReceiverSingleRownamesOrNumbers = New instat.ucrReceiverSingle() Me.ucrSelectorByDataFrameAddRemoveforRownamesOrNumbers = New instat.ucrSelectorByDataFrameAddRemove() Me.ucrBase = New instat.ucrButtons() - Me.ucrNewColumnName = New instat.ucrInputTextBox() Me.grpboxOptionsforRowNamesorNumbercols.SuspendLayout() Me.grpSortOptions.SuspendLayout() Me.SuspendLayout() @@ -57,6 +57,14 @@ Partial Class dlgRowNamesOrNumbers Me.grpboxOptionsforRowNamesorNumbercols.TabStop = False Me.grpboxOptionsforRowNamesorNumbercols.Text = "Options" ' + 'ucrNewColumnName + ' + Me.ucrNewColumnName.IsReadOnly = False + Me.ucrNewColumnName.Location = New System.Drawing.Point(87, 44) + Me.ucrNewColumnName.Name = "ucrNewColumnName" + Me.ucrNewColumnName.Size = New System.Drawing.Size(137, 21) + Me.ucrNewColumnName.TabIndex = 14 + ' 'lblColumnName ' Me.lblColumnName.AutoSize = True @@ -166,6 +174,7 @@ Partial Class dlgRowNamesOrNumbers 'ucrSelectorByDataFrameAddRemoveforRownamesOrNumbers ' Me.ucrSelectorByDataFrameAddRemoveforRownamesOrNumbers.bShowHiddenColumns = False + Me.ucrSelectorByDataFrameAddRemoveforRownamesOrNumbers.bUseCurrentFilter = False Me.ucrSelectorByDataFrameAddRemoveforRownamesOrNumbers.Location = New System.Drawing.Point(10, 10) Me.ucrSelectorByDataFrameAddRemoveforRownamesOrNumbers.Margin = New System.Windows.Forms.Padding(0) Me.ucrSelectorByDataFrameAddRemoveforRownamesOrNumbers.Name = "ucrSelectorByDataFrameAddRemoveforRownamesOrNumbers" @@ -179,14 +188,6 @@ Partial Class dlgRowNamesOrNumbers Me.ucrBase.Size = New System.Drawing.Size(410, 52) Me.ucrBase.TabIndex = 0 ' - 'ucrNewColumnName - ' - Me.ucrNewColumnName.IsReadOnly = False - Me.ucrNewColumnName.Location = New System.Drawing.Point(87, 44) - Me.ucrNewColumnName.Name = "ucrNewColumnName" - Me.ucrNewColumnName.Size = New System.Drawing.Size(137, 21) - Me.ucrNewColumnName.TabIndex = 14 - ' 'dlgRowNamesOrNumbers ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -196,6 +197,8 @@ Partial Class dlgRowNamesOrNumbers Me.Controls.Add(Me.grpboxOptionsforRowNamesorNumbercols) Me.Controls.Add(Me.ucrBase) Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow + Me.MaximizeBox = False + Me.MinimizeBox = False Me.Name = "dlgRowNamesOrNumbers" Me.Text = "Row Names Or Numbers" Me.grpboxOptionsforRowNamesorNumbercols.ResumeLayout(False) diff --git a/instat/dlgSubset.Designer.vb b/instat/dlgSubset.Designer.vb index ab6f60d6e16..1849433517a 100644 --- a/instat/dlgSubset.Designer.vb +++ b/instat/dlgSubset.Designer.vb @@ -22,6 +22,7 @@ Partial Class dlgSubset 'Do not modify it using the code editor. Private Sub InitializeComponent() + Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(dlgSubset)) Me.ucrBase = New instat.ucrButtons() Me.ucrDataFrameAddRemove = New instat.ucrSelectorByDataFrameAddRemove() Me.ucrReceiverSubset = New instat.ucrReceiverMultiple() @@ -32,58 +33,44 @@ Partial Class dlgSubset ' 'ucrBase ' - Me.ucrBase.Location = New System.Drawing.Point(12, 263) + resources.ApplyResources(Me.ucrBase, "ucrBase") Me.ucrBase.Name = "ucrBase" - Me.ucrBase.Size = New System.Drawing.Size(410, 53) - Me.ucrBase.TabIndex = 0 ' 'ucrDataFrameAddRemove ' - Me.ucrDataFrameAddRemove.Location = New System.Drawing.Point(12, 12) + Me.ucrDataFrameAddRemove.bShowHiddenColumns = False + Me.ucrDataFrameAddRemove.bUseCurrentFilter = False + resources.ApplyResources(Me.ucrDataFrameAddRemove, "ucrDataFrameAddRemove") Me.ucrDataFrameAddRemove.Name = "ucrDataFrameAddRemove" - Me.ucrDataFrameAddRemove.Size = New System.Drawing.Size(242, 179) - Me.ucrDataFrameAddRemove.TabIndex = 1 ' 'ucrReceiverSubset ' - Me.ucrReceiverSubset.Location = New System.Drawing.Point(260, 43) + resources.ApplyResources(Me.ucrReceiverSubset, "ucrReceiverSubset") Me.ucrReceiverSubset.Name = "ucrReceiverSubset" - Me.ucrReceiverSubset.Size = New System.Drawing.Size(121, 128) - Me.ucrReceiverSubset.TabIndex = 2 + Me.ucrReceiverSubset.Selector = Nothing ' 'lblSelectedVariables ' - Me.lblSelectedVariables.AutoSize = True - Me.lblSelectedVariables.Location = New System.Drawing.Point(260, 27) + resources.ApplyResources(Me.lblSelectedVariables, "lblSelectedVariables") Me.lblSelectedVariables.Name = "lblSelectedVariables" - Me.lblSelectedVariables.Size = New System.Drawing.Size(100, 13) - Me.lblSelectedVariables.TabIndex = 3 Me.lblSelectedVariables.Tag = "Selected_variables" - Me.lblSelectedVariables.Text = "Selected variable(s)" ' 'lblDrop ' - Me.lblDrop.AutoSize = True - Me.lblDrop.Location = New System.Drawing.Point(257, 178) + resources.ApplyResources(Me.lblDrop, "lblDrop") Me.lblDrop.Name = "lblDrop" - Me.lblDrop.Size = New System.Drawing.Size(30, 13) - Me.lblDrop.TabIndex = 3 Me.lblDrop.Tag = "Drop" - Me.lblDrop.Text = "Drop" ' 'cboDrop ' Me.cboDrop.FormattingEnabled = True - Me.cboDrop.Location = New System.Drawing.Point(260, 197) + resources.ApplyResources(Me.cboDrop, "cboDrop") Me.cboDrop.Name = "cboDrop" - Me.cboDrop.Size = New System.Drawing.Size(121, 21) - Me.cboDrop.TabIndex = 4 ' 'dlgSubset ' - Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) + resources.ApplyResources(Me, "$this") Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(445, 328) Me.Controls.Add(Me.cboDrop) Me.Controls.Add(Me.lblDrop) Me.Controls.Add(Me.lblSelectedVariables) @@ -91,9 +78,10 @@ Partial Class dlgSubset Me.Controls.Add(Me.ucrDataFrameAddRemove) Me.Controls.Add(Me.ucrBase) Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow + Me.MaximizeBox = False + Me.MinimizeBox = False Me.Name = "dlgSubset" Me.Tag = "Subset" - Me.Text = "Subset" Me.ResumeLayout(False) Me.PerformLayout() diff --git a/instat/dlgTransform.Designer.vb b/instat/dlgTransform.Designer.vb index bf45f81c94e..1e312c80cb2 100644 --- a/instat/dlgTransform.Designer.vb +++ b/instat/dlgTransform.Designer.vb @@ -649,6 +649,7 @@ Partial Class dlgTransform ' 'ucrAddRemove ' + Me.ucrAddRemove.bShowHiddenColumns = False Me.ucrAddRemove.Location = New System.Drawing.Point(10, 48) Me.ucrAddRemove.Margin = New System.Windows.Forms.Padding(0) Me.ucrAddRemove.Name = "ucrAddRemove" @@ -688,6 +689,8 @@ Partial Class dlgTransform Me.Controls.Add(Me.ucrReceiverFrom) Me.Controls.Add(Me.ucrBase) Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow + Me.MaximizeBox = False + Me.MinimizeBox = False Me.Name = "dlgTransform" Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen Me.Tag = "Transform" diff --git a/instat/dlgUnusedLevels.Designer.vb b/instat/dlgUnusedLevels.Designer.vb index 2ceeea7c88b..540878b2005 100644 --- a/instat/dlgUnusedLevels.Designer.vb +++ b/instat/dlgUnusedLevels.Designer.vb @@ -61,6 +61,8 @@ Partial Class dlgUnusedLevels ' 'ucrSelectorFactorColumn ' + Me.ucrSelectorFactorColumn.bShowHiddenColumns = False + Me.ucrSelectorFactorColumn.bUseCurrentFilter = False Me.ucrSelectorFactorColumn.Location = New System.Drawing.Point(5, 2) Me.ucrSelectorFactorColumn.Margin = New System.Windows.Forms.Padding(0) Me.ucrSelectorFactorColumn.Name = "ucrSelectorFactorColumn" @@ -85,6 +87,8 @@ Partial Class dlgUnusedLevels Me.Controls.Add(Me.ucrSelectorFactorColumn) Me.Controls.Add(Me.ucrBase) Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow + Me.MaximizeBox = False + Me.MinimizeBox = False Me.Name = "dlgUnusedLevels" Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen Me.Tag = "Remove_Unused_Factor_Levels" diff --git a/instat/dlgView.Designer.vb b/instat/dlgView.Designer.vb index d36b0eece08..4f1ba407b6b 100644 --- a/instat/dlgView.Designer.vb +++ b/instat/dlgView.Designer.vb @@ -110,6 +110,8 @@ Partial Class dlgView ' 'ucrSelctorForView ' + Me.ucrSelctorForView.bShowHiddenColumns = False + Me.ucrSelctorForView.bUseCurrentFilter = False Me.ucrSelctorForView.Location = New System.Drawing.Point(10, 10) Me.ucrSelctorForView.Margin = New System.Windows.Forms.Padding(0) Me.ucrSelctorForView.Name = "ucrSelctorForView" @@ -136,6 +138,8 @@ Partial Class dlgView Me.Controls.Add(Me.grpDisplayFrom) Me.Controls.Add(Me.ucrBase) Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow + Me.MaximizeBox = False + Me.MinimizeBox = False Me.Name = "dlgView" Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen Me.Tag = "View Data" diff --git a/instat/instat.vbproj b/instat/instat.vbproj index 6293c3c6c9f..e3358b62961 100644 --- a/instat/instat.vbproj +++ b/instat/instat.vbproj @@ -735,12 +735,6 @@ Form - - sdgFrequencyPolygonOptions.vb - - - Form - sdgLayerOptions.vb @@ -765,12 +759,6 @@ Form - - sdgThemeOptions.vb - - - Form - sdgVariableTransformations.vb @@ -2650,15 +2638,6 @@ sdgDescribeDisplay.vb - - sdgFrequencyPolygonOptions.vb - - - sdgFrequencyPolygonOptions.vb - - - sdgFrequencyPolygonOptions.vb - sdgLayerOptions.vb @@ -3785,15 +3764,6 @@ sdgSimpleRegOptions.vb - - sdgThemeOptions.vb - - - sdgThemeOptions.vb - - - sdgThemeOptions.vb - sdgVariableTransformations.vb diff --git a/instat/sdgANOVAOptions.Designer.vb b/instat/sdgANOVAOptions.Designer.vb index eaeae711393..833e9d03d1a 100644 --- a/instat/sdgANOVAOptions.Designer.vb +++ b/instat/sdgANOVAOptions.Designer.vb @@ -22,6 +22,7 @@ Partial Class sdgANOVAOptions 'Do not modify it using the code editor. _ Private Sub InitializeComponent() + Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(sdgANOVAOptions)) Me.tbcOptions = New System.Windows.Forms.TabControl() Me.tbpDisplay = New System.Windows.Forms.TabPage() Me.chkContrasts = New System.Windows.Forms.CheckBox() @@ -50,11 +51,9 @@ Partial Class sdgANOVAOptions ' Me.tbcOptions.Controls.Add(Me.tbpDisplay) Me.tbcOptions.Controls.Add(Me.tbpGraphics) - Me.tbcOptions.Location = New System.Drawing.Point(-1, -1) + resources.ApplyResources(Me.tbcOptions, "tbcOptions") Me.tbcOptions.Name = "tbcOptions" Me.tbcOptions.SelectedIndex = 0 - Me.tbcOptions.Size = New System.Drawing.Size(345, 208) - Me.tbcOptions.TabIndex = 1 ' 'tbpDisplay ' @@ -63,81 +62,53 @@ Partial Class sdgANOVAOptions Me.tbpDisplay.Controls.Add(Me.chkMeansAndCounts) Me.tbpDisplay.Controls.Add(Me.chkEstimateValues) Me.tbpDisplay.Controls.Add(Me.chkANOVATable) - Me.tbpDisplay.Location = New System.Drawing.Point(4, 22) + resources.ApplyResources(Me.tbpDisplay, "tbpDisplay") Me.tbpDisplay.Name = "tbpDisplay" - Me.tbpDisplay.Padding = New System.Windows.Forms.Padding(3) - Me.tbpDisplay.Size = New System.Drawing.Size(337, 182) - Me.tbpDisplay.TabIndex = 0 Me.tbpDisplay.Tag = "Display" - Me.tbpDisplay.Text = "Display" Me.tbpDisplay.UseVisualStyleBackColor = True ' 'chkContrasts ' - Me.chkContrasts.AutoSize = True - Me.chkContrasts.Location = New System.Drawing.Point(10, 131) + resources.ApplyResources(Me.chkContrasts, "chkContrasts") Me.chkContrasts.Name = "chkContrasts" - Me.chkContrasts.Size = New System.Drawing.Size(70, 17) - Me.chkContrasts.TabIndex = 7 Me.chkContrasts.Tag = "Contrasts" - Me.chkContrasts.Text = "Contrasts" Me.chkContrasts.UseVisualStyleBackColor = True ' 'chkStandardErrors ' - Me.chkStandardErrors.AutoSize = True - Me.chkStandardErrors.Location = New System.Drawing.Point(130, 98) + resources.ApplyResources(Me.chkStandardErrors, "chkStandardErrors") Me.chkStandardErrors.Name = "chkStandardErrors" - Me.chkStandardErrors.Size = New System.Drawing.Size(98, 17) - Me.chkStandardErrors.TabIndex = 6 Me.chkStandardErrors.Tag = "Standard_errors" - Me.chkStandardErrors.Text = "Standard errors" Me.chkStandardErrors.UseVisualStyleBackColor = True ' 'chkMeansAndCounts ' - Me.chkMeansAndCounts.AutoSize = True - Me.chkMeansAndCounts.Location = New System.Drawing.Point(10, 98) + resources.ApplyResources(Me.chkMeansAndCounts, "chkMeansAndCounts") Me.chkMeansAndCounts.Name = "chkMeansAndCounts" - Me.chkMeansAndCounts.Size = New System.Drawing.Size(114, 17) - Me.chkMeansAndCounts.TabIndex = 5 Me.chkMeansAndCounts.Tag = "Means_and_counts" - Me.chkMeansAndCounts.Text = "Means and counts" Me.chkMeansAndCounts.UseVisualStyleBackColor = True ' 'chkEstimateValues ' - Me.chkEstimateValues.AutoSize = True - Me.chkEstimateValues.Location = New System.Drawing.Point(10, 59) + resources.ApplyResources(Me.chkEstimateValues, "chkEstimateValues") Me.chkEstimateValues.Name = "chkEstimateValues" - Me.chkEstimateValues.Size = New System.Drawing.Size(67, 17) - Me.chkEstimateValues.TabIndex = 4 Me.chkEstimateValues.Tag = "P_values" - Me.chkEstimateValues.Text = "P values" Me.chkEstimateValues.UseVisualStyleBackColor = True ' 'chkANOVATable ' - Me.chkANOVATable.AutoSize = True - Me.chkANOVATable.Location = New System.Drawing.Point(10, 20) + resources.ApplyResources(Me.chkANOVATable, "chkANOVATable") Me.chkANOVATable.Name = "chkANOVATable" - Me.chkANOVATable.Size = New System.Drawing.Size(93, 17) - Me.chkANOVATable.TabIndex = 1 Me.chkANOVATable.Tag = "ANOVA Table" - Me.chkANOVATable.Text = "ANOVA Table" Me.chkANOVATable.UseVisualStyleBackColor = True ' 'tbpGraphics ' Me.tbpGraphics.Controls.Add(Me.grpMeans) Me.tbpGraphics.Controls.Add(Me.grpResiduals) - Me.tbpGraphics.Location = New System.Drawing.Point(4, 22) + resources.ApplyResources(Me.tbpGraphics, "tbpGraphics") Me.tbpGraphics.Name = "tbpGraphics" - Me.tbpGraphics.Padding = New System.Windows.Forms.Padding(3) - Me.tbpGraphics.Size = New System.Drawing.Size(337, 182) - Me.tbpGraphics.TabIndex = 1 Me.tbpGraphics.Tag = "Graphics" - Me.tbpGraphics.Text = "Graphics" Me.tbpGraphics.UseVisualStyleBackColor = True ' 'grpMeans @@ -146,94 +117,68 @@ Partial Class sdgANOVAOptions Me.grpMeans.Controls.Add(Me.lblConfidenceLevel) Me.grpMeans.Controls.Add(Me.chkConfidenceLimits) Me.grpMeans.Controls.Add(Me.chkMeans) - Me.grpMeans.Location = New System.Drawing.Point(9, 78) + resources.ApplyResources(Me.grpMeans, "grpMeans") Me.grpMeans.Name = "grpMeans" - Me.grpMeans.Size = New System.Drawing.Size(288, 87) - Me.grpMeans.TabIndex = 3 Me.grpMeans.TabStop = False Me.grpMeans.Tag = "Means" - Me.grpMeans.Text = "Means" ' 'nudConfidenceLevel ' - Me.nudConfidenceLevel.Location = New System.Drawing.Point(149, 61) + resources.ApplyResources(Me.nudConfidenceLevel, "nudConfidenceLevel") Me.nudConfidenceLevel.Name = "nudConfidenceLevel" - Me.nudConfidenceLevel.Size = New System.Drawing.Size(46, 20) - Me.nudConfidenceLevel.TabIndex = 4 Me.nudConfidenceLevel.Value = New Decimal(New Integer() {95, 0, 0, 0}) ' 'lblConfidenceLevel ' - Me.lblConfidenceLevel.AutoSize = True - Me.lblConfidenceLevel.Location = New System.Drawing.Point(50, 68) + resources.ApplyResources(Me.lblConfidenceLevel, "lblConfidenceLevel") Me.lblConfidenceLevel.Name = "lblConfidenceLevel" - Me.lblConfidenceLevel.Size = New System.Drawing.Size(86, 13) - Me.lblConfidenceLevel.TabIndex = 3 Me.lblConfidenceLevel.Tag = "Confidence_level" - Me.lblConfidenceLevel.Text = "Confidence level" ' 'chkConfidenceLimits ' - Me.chkConfidenceLimits.AutoSize = True - Me.chkConfidenceLimits.Location = New System.Drawing.Point(6, 42) + resources.ApplyResources(Me.chkConfidenceLimits, "chkConfidenceLimits") Me.chkConfidenceLimits.Name = "chkConfidenceLimits" - Me.chkConfidenceLimits.Size = New System.Drawing.Size(105, 17) - Me.chkConfidenceLimits.TabIndex = 2 Me.chkConfidenceLimits.Tag = "Confidence_limits" - Me.chkConfidenceLimits.Text = "Confidence limits" Me.chkConfidenceLimits.UseVisualStyleBackColor = True ' 'chkMeans ' - Me.chkMeans.AutoSize = True - Me.chkMeans.Location = New System.Drawing.Point(5, 19) + resources.ApplyResources(Me.chkMeans, "chkMeans") 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 ' 'grpResiduals ' Me.grpResiduals.Controls.Add(Me.chkResiduals) - Me.grpResiduals.Location = New System.Drawing.Point(9, 6) + resources.ApplyResources(Me.grpResiduals, "grpResiduals") Me.grpResiduals.Name = "grpResiduals" - Me.grpResiduals.Size = New System.Drawing.Size(288, 66) - Me.grpResiduals.TabIndex = 2 Me.grpResiduals.TabStop = False Me.grpResiduals.Tag = "Residuals" - Me.grpResiduals.Text = "Residuals" ' 'chkResiduals ' - Me.chkResiduals.AutoSize = True - Me.chkResiduals.Location = New System.Drawing.Point(6, 19) + resources.ApplyResources(Me.chkResiduals, "chkResiduals") Me.chkResiduals.Name = "chkResiduals" - Me.chkResiduals.Size = New System.Drawing.Size(76, 17) - Me.chkResiduals.TabIndex = 0 Me.chkResiduals.Tag = "Four_in_one" - Me.chkResiduals.Text = "four in one" Me.chkResiduals.UseVisualStyleBackColor = True ' 'ucrBaseSdg ' - Me.ucrBaseSdg.Location = New System.Drawing.Point(65, 213) + resources.ApplyResources(Me.ucrBaseSdg, "ucrBaseSdg") Me.ucrBaseSdg.Name = "ucrBaseSdg" - Me.ucrBaseSdg.Size = New System.Drawing.Size(142, 30) - Me.ucrBaseSdg.TabIndex = 2 ' 'sdgANOVAOptions ' - Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) + resources.ApplyResources(Me, "$this") Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(342, 268) Me.Controls.Add(Me.ucrBaseSdg) Me.Controls.Add(Me.tbcOptions) Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow + Me.MaximizeBox = False + Me.MinimizeBox = False Me.Name = "sdgANOVAOptions" Me.Tag = "ANOVA_options" - Me.Text = "ANOVA options" Me.tbcOptions.ResumeLayout(False) Me.tbpDisplay.ResumeLayout(False) Me.tbpDisplay.PerformLayout() diff --git a/instat/sdgCanonicalCorrelation.Designer.vb b/instat/sdgCanonicalCorrelation.Designer.vb index 6c72d1dee3d..edba0b11655 100644 --- a/instat/sdgCanonicalCorrelation.Designer.vb +++ b/instat/sdgCanonicalCorrelation.Designer.vb @@ -145,6 +145,8 @@ Partial Class sdgCanonicalCorrelation Me.Controls.Add(Me.tbRegOptions) Me.Controls.Add(Me.ucrSdgButtons) Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow + Me.MaximizeBox = False + Me.MinimizeBox = False Me.Name = "sdgCanonicalCorrelation" Me.Tag = "PCA_Options" Me.Text = "PCA Options" diff --git a/instat/sdgCombineGraphOptions.Designer.vb b/instat/sdgCombineGraphOptions.Designer.vb index 0048002f60f..494ba639f9a 100644 --- a/instat/sdgCombineGraphOptions.Designer.vb +++ b/instat/sdgCombineGraphOptions.Designer.vb @@ -24,6 +24,7 @@ Partial Class sdgCombineGraphOptions Private Sub InitializeComponent() Me.tbcLayout = New System.Windows.Forms.TabControl() Me.tbpLayout = New System.Windows.Forms.TabPage() + Me.txtLayoutMessage = New System.Windows.Forms.TextBox() Me.chkSpecifyOrder = New System.Windows.Forms.CheckBox() Me.grdLayout = New unvell.ReoGrid.ReoGridControl() Me.lblSelectedgrpahs = New System.Windows.Forms.Label() @@ -42,7 +43,6 @@ Partial Class sdgCombineGraphOptions Me.lblBottom = New System.Windows.Forms.Label() Me.lblTop = New System.Windows.Forms.Label() Me.ucrsdgLayoutBase = New instat.ucrButtonsSubdialogue() - Me.txtLayoutMessage = New System.Windows.Forms.TextBox() Me.tbcLayout.SuspendLayout() Me.tbpLayout.SuspendLayout() CType(Me.nudColumns, System.ComponentModel.ISupportInitialize).BeginInit() @@ -79,6 +79,14 @@ Partial Class sdgCombineGraphOptions Me.tbpLayout.Text = "Layout" Me.tbpLayout.UseVisualStyleBackColor = True ' + 'txtLayoutMessage + ' + Me.txtLayoutMessage.Location = New System.Drawing.Point(11, 367) + Me.txtLayoutMessage.Name = "txtLayoutMessage" + Me.txtLayoutMessage.ReadOnly = True + Me.txtLayoutMessage.Size = New System.Drawing.Size(342, 20) + Me.txtLayoutMessage.TabIndex = 7 + ' 'chkSpecifyOrder ' Me.chkSpecifyOrder.AutoSize = True @@ -170,7 +178,7 @@ Partial Class sdgCombineGraphOptions Me.tbpLabels.Location = New System.Drawing.Point(4, 22) Me.tbpLabels.Name = "tbpLabels" Me.tbpLabels.Padding = New System.Windows.Forms.Padding(3) - Me.tbpLabels.Size = New System.Drawing.Size(371, 372) + Me.tbpLabels.Size = New System.Drawing.Size(371, 393) Me.tbpLabels.TabIndex = 1 Me.tbpLabels.Text = "Labels" Me.tbpLabels.UseVisualStyleBackColor = True @@ -250,14 +258,6 @@ Partial Class sdgCombineGraphOptions Me.ucrsdgLayoutBase.Size = New System.Drawing.Size(142, 30) Me.ucrsdgLayoutBase.TabIndex = 3 ' - 'txtLayoutMessage - ' - Me.txtLayoutMessage.Location = New System.Drawing.Point(11, 367) - Me.txtLayoutMessage.Name = "txtLayoutMessage" - Me.txtLayoutMessage.ReadOnly = True - Me.txtLayoutMessage.Size = New System.Drawing.Size(342, 20) - Me.txtLayoutMessage.TabIndex = 7 - ' 'sdgCombineGraphOptions ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -266,6 +266,8 @@ Partial Class sdgCombineGraphOptions Me.Controls.Add(Me.ucrsdgLayoutBase) Me.Controls.Add(Me.tbcLayout) Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow + Me.MaximizeBox = False + Me.MinimizeBox = False Me.Name = "sdgCombineGraphOptions" Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen Me.Text = "Options" diff --git a/instat/sdgCorrPlot.Designer.vb b/instat/sdgCorrPlot.Designer.vb index 752da8c04e5..534dfe88291 100644 --- a/instat/sdgCorrPlot.Designer.vb +++ b/instat/sdgCorrPlot.Designer.vb @@ -359,6 +359,8 @@ Partial Class sdgCorrPlot Me.Controls.Add(Me.tbSdgCorrelation) Me.Controls.Add(Me.ucrBaseSdgCorrPlot) Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow + Me.MaximizeBox = False + Me.MinimizeBox = False Me.Name = "sdgCorrPlot" Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen Me.Tag = "corrplot" diff --git a/instat/sdgCreateFilter.Designer.vb b/instat/sdgCreateFilter.Designer.vb index 905e89668a0..a0b5ed9a4e7 100644 --- a/instat/sdgCreateFilter.Designer.vb +++ b/instat/sdgCreateFilter.Designer.vb @@ -48,6 +48,8 @@ Partial Class sdgCreateFilter Me.Controls.Add(Me.ucrCreateFilter) Me.Controls.Add(Me.ucrBase) Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow + Me.MaximizeBox = False + Me.MinimizeBox = False Me.Name = "sdgCreateFilter" Me.Text = "Define New Filter" Me.TopMost = True diff --git a/instat/sdgDataOptions.Designer.vb b/instat/sdgDataOptions.Designer.vb index 7ab95bd8113..bc0cfce93cd 100644 --- a/instat/sdgDataOptions.Designer.vb +++ b/instat/sdgDataOptions.Designer.vb @@ -24,17 +24,17 @@ Partial Class sdgDataOptions Private Sub InitializeComponent() Me.tbcDataOptions = New System.Windows.Forms.TabControl() Me.tbRows = New System.Windows.Forms.TabPage() + Me.ucrInputFilterPreview = New instat.ucrInputTextBox() Me.lblFilterPreview = New System.Windows.Forms.Label() Me.grpApplyOptions = New System.Windows.Forms.GroupBox() Me.rdoForDialog = New System.Windows.Forms.RadioButton() Me.rdoAllDialogs = New System.Windows.Forms.RadioButton() Me.cmdDefineNewFilter = New System.Windows.Forms.Button() Me.lblFilter = New System.Windows.Forms.Label() - Me.tbColumns = New System.Windows.Forms.TabPage() - Me.chkShowHiddenColumns = New System.Windows.Forms.CheckBox() - Me.ucrInputFilterPreview = New instat.ucrInputTextBox() Me.ucrReceiverFilter = New instat.ucrReceiverSingle() Me.ucrSelectorFilters = New instat.ucrSelectorByDataFrame() + Me.tbColumns = New System.Windows.Forms.TabPage() + Me.chkShowHiddenColumns = New System.Windows.Forms.CheckBox() Me.ucrSubDialogueBase = New instat.ucrButtonsSubdialogue() Me.tbcDataOptions.SuspendLayout() Me.tbRows.SuspendLayout() @@ -70,6 +70,14 @@ Partial Class sdgDataOptions Me.tbRows.Text = "Rows" Me.tbRows.UseVisualStyleBackColor = True ' + 'ucrInputFilterPreview + ' + Me.ucrInputFilterPreview.IsReadOnly = False + Me.ucrInputFilterPreview.Location = New System.Drawing.Point(128, 209) + Me.ucrInputFilterPreview.Name = "ucrInputFilterPreview" + Me.ucrInputFilterPreview.Size = New System.Drawing.Size(167, 21) + Me.ucrInputFilterPreview.TabIndex = 6 + ' 'lblFilterPreview ' Me.lblFilterPreview.AutoSize = True @@ -134,6 +142,25 @@ Partial Class sdgDataOptions Me.lblFilter.Tag = "Filter" Me.lblFilter.Text = "Filter" ' + 'ucrReceiverFilter + ' + Me.ucrReceiverFilter.Location = New System.Drawing.Point(175, 34) + Me.ucrReceiverFilter.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverFilter.Name = "ucrReceiverFilter" + Me.ucrReceiverFilter.Selector = Nothing + Me.ucrReceiverFilter.Size = New System.Drawing.Size(120, 20) + Me.ucrReceiverFilter.TabIndex = 2 + ' + 'ucrSelectorFilters + ' + Me.ucrSelectorFilters.bShowHiddenColumns = False + Me.ucrSelectorFilters.bUseCurrentFilter = False + Me.ucrSelectorFilters.Location = New System.Drawing.Point(8, 8) + Me.ucrSelectorFilters.Margin = New System.Windows.Forms.Padding(0) + Me.ucrSelectorFilters.Name = "ucrSelectorFilters" + Me.ucrSelectorFilters.Size = New System.Drawing.Size(120, 180) + Me.ucrSelectorFilters.TabIndex = 0 + ' 'tbColumns ' Me.tbColumns.Controls.Add(Me.chkShowHiddenColumns) @@ -157,30 +184,6 @@ Partial Class sdgDataOptions Me.chkShowHiddenColumns.Text = "Show Hidden Columns in Selector" Me.chkShowHiddenColumns.UseVisualStyleBackColor = True ' - 'ucrInputFilterPreview - ' - Me.ucrInputFilterPreview.Location = New System.Drawing.Point(128, 209) - Me.ucrInputFilterPreview.Name = "ucrInputFilterPreview" - Me.ucrInputFilterPreview.Size = New System.Drawing.Size(167, 21) - Me.ucrInputFilterPreview.TabIndex = 6 - ' - 'ucrReceiverFilter - ' - Me.ucrReceiverFilter.Location = New System.Drawing.Point(175, 34) - Me.ucrReceiverFilter.Margin = New System.Windows.Forms.Padding(0) - Me.ucrReceiverFilter.Name = "ucrReceiverFilter" - Me.ucrReceiverFilter.Selector = Nothing - Me.ucrReceiverFilter.Size = New System.Drawing.Size(120, 20) - Me.ucrReceiverFilter.TabIndex = 2 - ' - 'ucrSelectorFilters - ' - Me.ucrSelectorFilters.Location = New System.Drawing.Point(8, 8) - Me.ucrSelectorFilters.Margin = New System.Windows.Forms.Padding(0) - Me.ucrSelectorFilters.Name = "ucrSelectorFilters" - Me.ucrSelectorFilters.Size = New System.Drawing.Size(120, 180) - Me.ucrSelectorFilters.TabIndex = 0 - ' 'ucrSubDialogueBase ' Me.ucrSubDialogueBase.Location = New System.Drawing.Point(88, 323) @@ -196,6 +199,8 @@ Partial Class sdgDataOptions Me.Controls.Add(Me.tbcDataOptions) Me.Controls.Add(Me.ucrSubDialogueBase) Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow + Me.MaximizeBox = False + Me.MinimizeBox = False Me.Name = "sdgDataOptions" Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen Me.Tag = "Data_Options" diff --git a/instat/sdgDescribeDisplay.Designer.vb b/instat/sdgDescribeDisplay.Designer.vb index ac5f2f4c0c0..551f67854a5 100644 --- a/instat/sdgDescribeDisplay.Designer.vb +++ b/instat/sdgDescribeDisplay.Designer.vb @@ -142,7 +142,7 @@ Partial Class sdgDescribeDisplay Me.Controls.Add(Me.grpFrequenciesOptions) Me.Controls.Add(Me.grpAnovaOptions) Me.Controls.Add(Me.ucrButtonsDescribeDisplay) - Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog + Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow Me.MaximizeBox = False Me.MinimizeBox = False Me.Name = "sdgDescribeDisplay" diff --git a/instat/sdgDescribeTwoVarGraph.Designer.vb b/instat/sdgDescribeTwoVarGraph.Designer.vb index f55edefbcec..389f4fbbec2 100644 --- a/instat/sdgDescribeTwoVarGraph.Designer.vb +++ b/instat/sdgDescribeTwoVarGraph.Designer.vb @@ -174,7 +174,7 @@ Partial Class sdgDescribeTwoVarGraph Me.Controls.Add(Me.grpVariateByVariate) Me.Controls.Add(Me.grpVariateByFactor) Me.Controls.Add(Me.UcrButtonsSubdialogue1) - Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog + Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow Me.MaximizeBox = False Me.MinimizeBox = False Me.Name = "sdgDescribeTwoVarGraph" diff --git a/instat/sdgFrequencyPolygonOptions.Designer.vb b/instat/sdgFrequencyPolygonOptions.Designer.vb deleted file mode 100644 index 9b45c5c3039..00000000000 --- a/instat/sdgFrequencyPolygonOptions.Designer.vb +++ /dev/null @@ -1,51 +0,0 @@ - _ -Partial Class sdgFrequencyPolygonOptions - Inherits System.Windows.Forms.Form - - 'Form overrides dispose to clean up the component list. - _ - Protected Overrides Sub Dispose(ByVal disposing As Boolean) - Try - If disposing AndAlso components IsNot Nothing Then - components.Dispose() - End If - Finally - MyBase.Dispose(disposing) - End Try - End Sub - - 'Required by the Windows Form Designer - Private components As System.ComponentModel.IContainer - - 'NOTE: The following procedure is required by the Windows Form Designer - 'It can be modified using the Windows Form Designer. - 'Do not modify it using the code editor. - _ - Private Sub InitializeComponent() - Me.ucrBaseFrequencyOptions = New instat.ucrButtonsSubdialogue() - Me.SuspendLayout() - ' - 'ucrBaseFrequencyOptions - ' - Me.ucrBaseFrequencyOptions.Location = New System.Drawing.Point(67, 219) - Me.ucrBaseFrequencyOptions.Name = "ucrBaseFrequencyOptions" - Me.ucrBaseFrequencyOptions.Size = New System.Drawing.Size(142, 30) - Me.ucrBaseFrequencyOptions.TabIndex = 0 - ' - 'sdgFrequencyPolygonOptions - ' - Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) - Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(284, 261) - Me.Controls.Add(Me.ucrBaseFrequencyOptions) - Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow - Me.Name = "sdgFrequencyPolygonOptions" - Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent - Me.Tag = "Frequency_Polygon_Options" - Me.Text = "Frequency Polygon Options" - Me.ResumeLayout(False) - - End Sub - - Friend WithEvents ucrBaseFrequencyOptions As ucrButtonsSubdialogue -End Class diff --git a/instat/sdgFrequencyPolygonOptions.fr-FR.resx b/instat/sdgFrequencyPolygonOptions.fr-FR.resx deleted file mode 100644 index a3df4f013d3..00000000000 --- a/instat/sdgFrequencyPolygonOptions.fr-FR.resx +++ /dev/null @@ -1,15 +0,0 @@ - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - \ No newline at end of file diff --git a/instat/sdgFrequencyPolygonOptions.resx b/instat/sdgFrequencyPolygonOptions.resx deleted file mode 100644 index 1af7de150c9..00000000000 --- a/instat/sdgFrequencyPolygonOptions.resx +++ /dev/null @@ -1,120 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - \ No newline at end of file diff --git a/instat/sdgFrequencyPolygonOptions.sw-KE.resx b/instat/sdgFrequencyPolygonOptions.sw-KE.resx deleted file mode 100644 index a3df4f013d3..00000000000 --- a/instat/sdgFrequencyPolygonOptions.sw-KE.resx +++ /dev/null @@ -1,15 +0,0 @@ - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - \ No newline at end of file diff --git a/instat/sdgFrequencyPolygonOptions.vb b/instat/sdgFrequencyPolygonOptions.vb deleted file mode 100644 index ffa15b4a733..00000000000 --- a/instat/sdgFrequencyPolygonOptions.vb +++ /dev/null @@ -1,21 +0,0 @@ -' Instat-R -' Copyright (C) 2015 -' -' This program is free software: you can redistribute it and/or modify -' it under the terms of the GNU General Public License as published by -' the Free Software Foundation, either version 3 of the License, or -' (at your option) any later version. -' -' This program is distributed in the hope that it will be useful, -' but WITHOUT ANY WARRANTY; without even the implied warranty of -' MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -' GNU General Public License for more details. -' -' You should have received a copy of the GNU General Public License k -' along with this program. If not, see . -Imports instat.Translations -Public Class sdgFrequencyPolygonOptions - Private Sub sdgFrequencyPolygonOptions_Load(sender As Object, e As EventArgs) Handles MyBase.Load - autoTranslate(Me) - End Sub -End Class \ No newline at end of file diff --git a/instat/sdgModelOptions.Designer.vb b/instat/sdgModelOptions.Designer.vb index 78c962aacdd..a71bf161b1d 100644 --- a/instat/sdgModelOptions.Designer.vb +++ b/instat/sdgModelOptions.Designer.vb @@ -204,7 +204,7 @@ Partial Class sdgModelOptions Me.Controls.Add(Me.ucrFamily) Me.Controls.Add(Me.grpLinkFunctions) Me.Controls.Add(Me.ucrButtonsSDGModelOptions) - Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog + Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow Me.MaximizeBox = False Me.MinimizeBox = False Me.Name = "sdgModelOptions" diff --git a/instat/sdgOneVarGraph.Designer.vb b/instat/sdgOneVarGraph.Designer.vb index 3fad35e683f..65b57e80e41 100644 --- a/instat/sdgOneVarGraph.Designer.vb +++ b/instat/sdgOneVarGraph.Designer.vb @@ -194,6 +194,9 @@ Partial Class sdgOneVarGraph Me.ClientSize = New System.Drawing.Size(237, 169) Me.Controls.Add(Me.UcrButtonsOneVarGraph) Me.Controls.Add(Me.tbcOneVarGraph) + Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow + Me.MaximizeBox = False + Me.MinimizeBox = False Me.Name = "sdgOneVarGraph" Me.Text = "sdgOneVarGraph" Me.tbcOneVarGraph.ResumeLayout(False) diff --git a/instat/sdgPrincipalComponentAnalysis.Designer.vb b/instat/sdgPrincipalComponentAnalysis.Designer.vb index 02141d290c9..0c0a857fc51 100644 --- a/instat/sdgPrincipalComponentAnalysis.Designer.vb +++ b/instat/sdgPrincipalComponentAnalysis.Designer.vb @@ -47,11 +47,11 @@ Partial Class sdgPrincipalComponentAnalysis Me.tbIndividuals = New System.Windows.Forms.TabPage() Me.tbBiplot = New System.Windows.Forms.TabPage() Me.tbBarPlot = New System.Windows.Forms.TabPage() + Me.ucrReceiverFactor = New instat.ucrReceiverMultiple() Me.ucrSelectorFactor = New instat.ucrSelectorByDataFrameAddRemove() Me.lblFactorVariable = New System.Windows.Forms.Label() Me.tbSave = New System.Windows.Forms.TabPage() Me.ucrSdgButtons = New instat.ucrButtonsSubdialogue() - Me.ucrReceiverFactor = New instat.ucrReceiverMultiple() Me.tbRegOptions.SuspendLayout() Me.tbDisplay.SuspendLayout() Me.tbGraphics.SuspendLayout() @@ -347,6 +347,15 @@ Partial Class sdgPrincipalComponentAnalysis Me.tbBarPlot.Text = "Bar Plot" Me.tbBarPlot.UseVisualStyleBackColor = True ' + 'ucrReceiverFactor + ' + Me.ucrReceiverFactor.Location = New System.Drawing.Point(253, 43) + Me.ucrReceiverFactor.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverFactor.Name = "ucrReceiverFactor" + Me.ucrReceiverFactor.Selector = Nothing + Me.ucrReceiverFactor.Size = New System.Drawing.Size(120, 100) + Me.ucrReceiverFactor.TabIndex = 4 + ' 'ucrSelectorFactor ' Me.ucrSelectorFactor.bShowHiddenColumns = False @@ -385,15 +394,6 @@ Partial Class sdgPrincipalComponentAnalysis Me.ucrSdgButtons.Size = New System.Drawing.Size(142, 30) Me.ucrSdgButtons.TabIndex = 0 ' - 'ucrReceiverFactor - ' - Me.ucrReceiverFactor.Location = New System.Drawing.Point(253, 43) - Me.ucrReceiverFactor.Margin = New System.Windows.Forms.Padding(0) - Me.ucrReceiverFactor.Name = "ucrReceiverFactor" - Me.ucrReceiverFactor.Selector = Nothing - Me.ucrReceiverFactor.Size = New System.Drawing.Size(120, 100) - Me.ucrReceiverFactor.TabIndex = 4 - ' 'sdgPrincipalComponentAnalysis ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -402,6 +402,8 @@ Partial Class sdgPrincipalComponentAnalysis Me.Controls.Add(Me.tbRegOptions) Me.Controls.Add(Me.ucrSdgButtons) Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow + Me.MaximizeBox = False + Me.MinimizeBox = False Me.Name = "sdgPrincipalComponentAnalysis" Me.Tag = "PCA_Options" Me.Text = "PCA Options" diff --git a/instat/sdgRestrict.Designer.vb b/instat/sdgRestrict.Designer.vb index cd820627e14..0124e932b72 100644 --- a/instat/sdgRestrict.Designer.vb +++ b/instat/sdgRestrict.Designer.vb @@ -26,17 +26,17 @@ Partial Class sdgRestrict Me.tbcOptions = New System.Windows.Forms.TabControl() Me.tbpFactor_Level = New System.Windows.Forms.TabPage() Me.tbpCondition = New System.Windows.Forms.TabPage() + Me.rdoExclude = New System.Windows.Forms.RadioButton() + Me.rdoInclude = New System.Windows.Forms.RadioButton() + Me.lblSelectedColumn = New System.Windows.Forms.Label() + Me.ucrReceiver = New instat.ucrReceiverSingle() + Me.ucrSelector = New instat.ucrSelectorAddRemove() + Me.txtGreaterThan = New System.Windows.Forms.TextBox() + Me.txtEqualTo = New System.Windows.Forms.TextBox() + Me.txtLessThan = New System.Windows.Forms.TextBox() Me.rdoGreaterThan = New System.Windows.Forms.RadioButton() Me.rdoEqualTo = New System.Windows.Forms.RadioButton() Me.rdoLessThan = New System.Windows.Forms.RadioButton() - Me.txtLessThan = New System.Windows.Forms.TextBox() - Me.txtEqualTo = New System.Windows.Forms.TextBox() - Me.txtGreaterThan = New System.Windows.Forms.TextBox() - Me.ucrSelector = New instat.ucrSelectorAddRemove() - Me.ucrReceiver = New instat.ucrReceiverSingle() - Me.lblSelectedColumn = New System.Windows.Forms.Label() - Me.rdoInclude = New System.Windows.Forms.RadioButton() - Me.rdoExclude = New System.Windows.Forms.RadioButton() Me.tbcOptions.SuspendLayout() Me.tbpCondition.SuspendLayout() Me.SuspendLayout() @@ -92,6 +92,80 @@ Partial Class sdgRestrict Me.tbpCondition.Text = "Condition" Me.tbpCondition.UseVisualStyleBackColor = True ' + 'rdoExclude + ' + Me.rdoExclude.AutoSize = True + Me.rdoExclude.Location = New System.Drawing.Point(279, 75) + Me.rdoExclude.Name = "rdoExclude" + Me.rdoExclude.Size = New System.Drawing.Size(63, 17) + Me.rdoExclude.TabIndex = 6 + Me.rdoExclude.TabStop = True + Me.rdoExclude.Tag = "Exclude" + Me.rdoExclude.Text = "Exclude" + Me.rdoExclude.TextAlign = System.Drawing.ContentAlignment.MiddleCenter + Me.rdoExclude.UseVisualStyleBackColor = True + ' + 'rdoInclude + ' + Me.rdoInclude.AutoSize = True + Me.rdoInclude.Location = New System.Drawing.Point(222, 75) + Me.rdoInclude.Name = "rdoInclude" + Me.rdoInclude.Size = New System.Drawing.Size(60, 17) + Me.rdoInclude.TabIndex = 6 + Me.rdoInclude.TabStop = True + Me.rdoInclude.Tag = "Include" + Me.rdoInclude.Text = "Include" + Me.rdoInclude.UseVisualStyleBackColor = True + ' + 'lblSelectedColumn + ' + Me.lblSelectedColumn.AutoSize = True + Me.lblSelectedColumn.Location = New System.Drawing.Point(233, 12) + Me.lblSelectedColumn.Name = "lblSelectedColumn" + Me.lblSelectedColumn.Size = New System.Drawing.Size(87, 13) + Me.lblSelectedColumn.TabIndex = 5 + Me.lblSelectedColumn.Tag = "Selected_Column" + Me.lblSelectedColumn.Text = "Selected Column" + ' + 'ucrReceiver + ' + Me.ucrReceiver.Location = New System.Drawing.Point(233, 31) + Me.ucrReceiver.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiver.Name = "ucrReceiver" + Me.ucrReceiver.Selector = Nothing + Me.ucrReceiver.Size = New System.Drawing.Size(112, 26) + Me.ucrReceiver.TabIndex = 4 + ' + 'ucrSelector + ' + Me.ucrSelector.bShowHiddenColumns = False + Me.ucrSelector.Location = New System.Drawing.Point(7, 5) + Me.ucrSelector.Margin = New System.Windows.Forms.Padding(0) + Me.ucrSelector.Name = "ucrSelector" + Me.ucrSelector.Size = New System.Drawing.Size(199, 127) + Me.ucrSelector.TabIndex = 3 + ' + 'txtGreaterThan + ' + Me.txtGreaterThan.Location = New System.Drawing.Point(290, 183) + Me.txtGreaterThan.Name = "txtGreaterThan" + Me.txtGreaterThan.Size = New System.Drawing.Size(49, 20) + Me.txtGreaterThan.TabIndex = 2 + ' + 'txtEqualTo + ' + Me.txtEqualTo.Location = New System.Drawing.Point(290, 159) + Me.txtEqualTo.Name = "txtEqualTo" + Me.txtEqualTo.Size = New System.Drawing.Size(49, 20) + Me.txtEqualTo.TabIndex = 2 + ' + 'txtLessThan + ' + Me.txtLessThan.Location = New System.Drawing.Point(290, 136) + Me.txtLessThan.Name = "txtLessThan" + Me.txtLessThan.Size = New System.Drawing.Size(49, 20) + Me.txtLessThan.TabIndex = 2 + ' 'rdoGreaterThan ' Me.rdoGreaterThan.AutoSize = True @@ -128,76 +202,6 @@ Partial Class sdgRestrict Me.rdoLessThan.Text = "Less Than" Me.rdoLessThan.UseVisualStyleBackColor = True ' - 'txtLessThan - ' - Me.txtLessThan.Location = New System.Drawing.Point(290, 136) - Me.txtLessThan.Name = "txtLessThan" - Me.txtLessThan.Size = New System.Drawing.Size(49, 20) - Me.txtLessThan.TabIndex = 2 - ' - 'txtEqualTo - ' - Me.txtEqualTo.Location = New System.Drawing.Point(290, 159) - Me.txtEqualTo.Name = "txtEqualTo" - Me.txtEqualTo.Size = New System.Drawing.Size(49, 20) - Me.txtEqualTo.TabIndex = 2 - ' - 'txtGreaterThan - ' - Me.txtGreaterThan.Location = New System.Drawing.Point(290, 183) - Me.txtGreaterThan.Name = "txtGreaterThan" - Me.txtGreaterThan.Size = New System.Drawing.Size(49, 20) - Me.txtGreaterThan.TabIndex = 2 - ' - 'ucrSelector - ' - Me.ucrSelector.Location = New System.Drawing.Point(7, 5) - Me.ucrSelector.Name = "ucrSelector" - Me.ucrSelector.Size = New System.Drawing.Size(199, 127) - Me.ucrSelector.TabIndex = 3 - ' - 'ucrReceiver - ' - Me.ucrReceiver.Location = New System.Drawing.Point(233, 31) - Me.ucrReceiver.Name = "ucrReceiver" - Me.ucrReceiver.Size = New System.Drawing.Size(112, 26) - Me.ucrReceiver.TabIndex = 4 - ' - 'lblSelectedColumn - ' - Me.lblSelectedColumn.AutoSize = True - Me.lblSelectedColumn.Location = New System.Drawing.Point(233, 12) - Me.lblSelectedColumn.Name = "lblSelectedColumn" - Me.lblSelectedColumn.Size = New System.Drawing.Size(87, 13) - Me.lblSelectedColumn.TabIndex = 5 - Me.lblSelectedColumn.Tag = "Selected_Column" - Me.lblSelectedColumn.Text = "Selected Column" - ' - 'rdoInclude - ' - Me.rdoInclude.AutoSize = True - Me.rdoInclude.Location = New System.Drawing.Point(222, 75) - Me.rdoInclude.Name = "rdoInclude" - Me.rdoInclude.Size = New System.Drawing.Size(60, 17) - Me.rdoInclude.TabIndex = 6 - Me.rdoInclude.TabStop = True - Me.rdoInclude.Tag = "Include" - Me.rdoInclude.Text = "Include" - Me.rdoInclude.UseVisualStyleBackColor = True - ' - 'rdoExclude - ' - Me.rdoExclude.AutoSize = True - Me.rdoExclude.Location = New System.Drawing.Point(279, 75) - Me.rdoExclude.Name = "rdoExclude" - Me.rdoExclude.Size = New System.Drawing.Size(63, 17) - Me.rdoExclude.TabIndex = 6 - Me.rdoExclude.TabStop = True - Me.rdoExclude.Tag = "Exclude" - Me.rdoExclude.Text = "Exclude" - Me.rdoExclude.TextAlign = System.Drawing.ContentAlignment.MiddleCenter - Me.rdoExclude.UseVisualStyleBackColor = True - ' 'sdgRestrict ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -206,6 +210,8 @@ Partial Class sdgRestrict Me.Controls.Add(Me.tbcOptions) Me.Controls.Add(Me.ucrSubDialogBase) Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow + Me.MaximizeBox = False + Me.MinimizeBox = False Me.Name = "sdgRestrict" Me.Text = "Control Options" Me.tbcOptions.ResumeLayout(False) diff --git a/instat/sdgSimpleRegOptions.Designer.vb b/instat/sdgSimpleRegOptions.Designer.vb index 9b68f126cb0..b0440c578b4 100644 --- a/instat/sdgSimpleRegOptions.Designer.vb +++ b/instat/sdgSimpleRegOptions.Designer.vb @@ -24,27 +24,27 @@ Partial Class sdgSimpleRegOptions Private Sub InitializeComponent() Me.ucrSdgButtons = New instat.ucrButtonsSubdialogue() Me.tbGraphics = New System.Windows.Forms.TabPage() - Me.grpResiduals = New System.Windows.Forms.GroupBox() - Me.chkFourinOne = New System.Windows.Forms.CheckBox() Me.grpModel = New System.Windows.Forms.GroupBox() - Me.chkGraphicsCLimits = New System.Windows.Forms.CheckBox() - Me.lblGraphicsCLevel = New System.Windows.Forms.Label() - Me.nudGraphicsCLevel = New System.Windows.Forms.NumericUpDown() - Me.chkPredictionInterval = New System.Windows.Forms.CheckBox() Me.chkFittedModel = New System.Windows.Forms.CheckBox() + Me.chkPredictionInterval = New System.Windows.Forms.CheckBox() + Me.nudGraphicsCLevel = New System.Windows.Forms.NumericUpDown() + Me.lblGraphicsCLevel = New System.Windows.Forms.Label() + Me.chkGraphicsCLimits = New System.Windows.Forms.CheckBox() + Me.grpResiduals = New System.Windows.Forms.GroupBox() + Me.chkFourinOne = New System.Windows.Forms.CheckBox() Me.tbDisplay = New System.Windows.Forms.TabPage() - Me.chkModel = New System.Windows.Forms.CheckBox() - Me.chkANOVA = New System.Windows.Forms.CheckBox() - Me.chkPvalues = New System.Windows.Forms.CheckBox() - Me.chkEstimates = New System.Windows.Forms.CheckBox() - Me.lblDisplayCLevel = New System.Windows.Forms.Label() - Me.nudDisplayCLevel = New System.Windows.Forms.NumericUpDown() Me.chkDisplayCLimits = New System.Windows.Forms.CheckBox() + Me.nudDisplayCLevel = New System.Windows.Forms.NumericUpDown() + Me.lblDisplayCLevel = New System.Windows.Forms.Label() + Me.chkEstimates = New System.Windows.Forms.CheckBox() + Me.chkPvalues = New System.Windows.Forms.CheckBox() + Me.chkANOVA = New System.Windows.Forms.CheckBox() + Me.chkModel = New System.Windows.Forms.CheckBox() Me.tbRegOptions = New System.Windows.Forms.TabControl() Me.tbGraphics.SuspendLayout() - Me.grpResiduals.SuspendLayout() Me.grpModel.SuspendLayout() CType(Me.nudGraphicsCLevel, System.ComponentModel.ISupportInitialize).BeginInit() + Me.grpResiduals.SuspendLayout() Me.tbDisplay.SuspendLayout() CType(Me.nudDisplayCLevel, System.ComponentModel.ISupportInitialize).BeginInit() Me.tbRegOptions.SuspendLayout() @@ -70,28 +70,6 @@ Partial Class sdgSimpleRegOptions Me.tbGraphics.Text = "Graphics" Me.tbGraphics.UseVisualStyleBackColor = True ' - 'grpResiduals - ' - Me.grpResiduals.Controls.Add(Me.chkFourinOne) - Me.grpResiduals.Location = New System.Drawing.Point(16, 6) - Me.grpResiduals.Name = "grpResiduals" - Me.grpResiduals.Size = New System.Drawing.Size(219, 46) - Me.grpResiduals.TabIndex = 0 - Me.grpResiduals.TabStop = False - Me.grpResiduals.Tag = "Residuals" - Me.grpResiduals.Text = "Residuals" - ' - 'chkFourinOne - ' - Me.chkFourinOne.AutoSize = True - Me.chkFourinOne.Location = New System.Drawing.Point(19, 19) - Me.chkFourinOne.Name = "chkFourinOne" - Me.chkFourinOne.Size = New System.Drawing.Size(81, 17) - Me.chkFourinOne.TabIndex = 0 - Me.chkFourinOne.Tag = "Four_in_One" - Me.chkFourinOne.Text = "Four in One" - Me.chkFourinOne.UseVisualStyleBackColor = True - ' 'grpModel ' Me.grpModel.Controls.Add(Me.chkFittedModel) @@ -107,26 +85,27 @@ Partial Class sdgSimpleRegOptions Me.grpModel.Tag = "Model" Me.grpModel.Text = "Model" ' - 'chkGraphicsCLimits + 'chkFittedModel ' - Me.chkGraphicsCLimits.AutoSize = True - Me.chkGraphicsCLimits.Location = New System.Drawing.Point(49, 36) - Me.chkGraphicsCLimits.Name = "chkGraphicsCLimits" - Me.chkGraphicsCLimits.Size = New System.Drawing.Size(109, 17) - Me.chkGraphicsCLimits.TabIndex = 1 - Me.chkGraphicsCLimits.Tag = "Confidence_Limits" - Me.chkGraphicsCLimits.Text = "Confidence Limits" - Me.chkGraphicsCLimits.UseVisualStyleBackColor = True + Me.chkFittedModel.AutoSize = True + Me.chkFittedModel.Location = New System.Drawing.Point(19, 19) + Me.chkFittedModel.Name = "chkFittedModel" + Me.chkFittedModel.Size = New System.Drawing.Size(84, 17) + Me.chkFittedModel.TabIndex = 0 + Me.chkFittedModel.Tag = "Fitted_Model" + Me.chkFittedModel.Text = "Fitted Model" + Me.chkFittedModel.UseVisualStyleBackColor = True ' - 'lblGraphicsCLevel + 'chkPredictionInterval ' - Me.lblGraphicsCLevel.AutoSize = True - Me.lblGraphicsCLevel.Location = New System.Drawing.Point(71, 58) - Me.lblGraphicsCLevel.Name = "lblGraphicsCLevel" - Me.lblGraphicsCLevel.Size = New System.Drawing.Size(90, 13) - Me.lblGraphicsCLevel.TabIndex = 2 - Me.lblGraphicsCLevel.Tag = "Confidence_Level" - Me.lblGraphicsCLevel.Text = "Confidence Level" + Me.chkPredictionInterval.AutoSize = True + Me.chkPredictionInterval.Location = New System.Drawing.Point(50, 81) + Me.chkPredictionInterval.Name = "chkPredictionInterval" + Me.chkPredictionInterval.Size = New System.Drawing.Size(111, 17) + Me.chkPredictionInterval.TabIndex = 4 + Me.chkPredictionInterval.Tag = "Prediction_Interval" + Me.chkPredictionInterval.Text = "Prediction Interval" + Me.chkPredictionInterval.UseVisualStyleBackColor = True ' 'nudGraphicsCLevel ' @@ -139,27 +118,48 @@ Partial Class sdgSimpleRegOptions Me.nudGraphicsCLevel.TabIndex = 3 Me.nudGraphicsCLevel.Value = New Decimal(New Integer() {95, 0, 0, 131072}) ' - 'chkPredictionInterval + 'lblGraphicsCLevel ' - Me.chkPredictionInterval.AutoSize = True - Me.chkPredictionInterval.Location = New System.Drawing.Point(50, 81) - Me.chkPredictionInterval.Name = "chkPredictionInterval" - Me.chkPredictionInterval.Size = New System.Drawing.Size(111, 17) - Me.chkPredictionInterval.TabIndex = 4 - Me.chkPredictionInterval.Tag = "Prediction_Interval" - Me.chkPredictionInterval.Text = "Prediction Interval" - Me.chkPredictionInterval.UseVisualStyleBackColor = True + Me.lblGraphicsCLevel.AutoSize = True + Me.lblGraphicsCLevel.Location = New System.Drawing.Point(71, 58) + Me.lblGraphicsCLevel.Name = "lblGraphicsCLevel" + Me.lblGraphicsCLevel.Size = New System.Drawing.Size(90, 13) + Me.lblGraphicsCLevel.TabIndex = 2 + Me.lblGraphicsCLevel.Tag = "Confidence_Level" + Me.lblGraphicsCLevel.Text = "Confidence Level" ' - 'chkFittedModel + 'chkGraphicsCLimits ' - Me.chkFittedModel.AutoSize = True - Me.chkFittedModel.Location = New System.Drawing.Point(19, 19) - Me.chkFittedModel.Name = "chkFittedModel" - Me.chkFittedModel.Size = New System.Drawing.Size(84, 17) - Me.chkFittedModel.TabIndex = 0 - Me.chkFittedModel.Tag = "Fitted_Model" - Me.chkFittedModel.Text = "Fitted Model" - Me.chkFittedModel.UseVisualStyleBackColor = True + Me.chkGraphicsCLimits.AutoSize = True + Me.chkGraphicsCLimits.Location = New System.Drawing.Point(49, 36) + Me.chkGraphicsCLimits.Name = "chkGraphicsCLimits" + Me.chkGraphicsCLimits.Size = New System.Drawing.Size(109, 17) + Me.chkGraphicsCLimits.TabIndex = 1 + Me.chkGraphicsCLimits.Tag = "Confidence_Limits" + Me.chkGraphicsCLimits.Text = "Confidence Limits" + Me.chkGraphicsCLimits.UseVisualStyleBackColor = True + ' + 'grpResiduals + ' + Me.grpResiduals.Controls.Add(Me.chkFourinOne) + Me.grpResiduals.Location = New System.Drawing.Point(16, 6) + Me.grpResiduals.Name = "grpResiduals" + Me.grpResiduals.Size = New System.Drawing.Size(219, 46) + Me.grpResiduals.TabIndex = 0 + Me.grpResiduals.TabStop = False + Me.grpResiduals.Tag = "Residuals" + Me.grpResiduals.Text = "Residuals" + ' + 'chkFourinOne + ' + Me.chkFourinOne.AutoSize = True + Me.chkFourinOne.Location = New System.Drawing.Point(19, 19) + Me.chkFourinOne.Name = "chkFourinOne" + Me.chkFourinOne.Size = New System.Drawing.Size(81, 17) + Me.chkFourinOne.TabIndex = 0 + Me.chkFourinOne.Tag = "Four_in_One" + Me.chkFourinOne.Text = "Four in One" + Me.chkFourinOne.UseVisualStyleBackColor = True ' 'tbDisplay ' @@ -179,38 +179,37 @@ Partial Class sdgSimpleRegOptions Me.tbDisplay.Text = "Display" Me.tbDisplay.UseVisualStyleBackColor = True ' - 'chkModel + 'chkDisplayCLimits ' - Me.chkModel.AutoSize = True - Me.chkModel.Location = New System.Drawing.Point(6, 15) - Me.chkModel.Name = "chkModel" - Me.chkModel.Size = New System.Drawing.Size(55, 17) - Me.chkModel.TabIndex = 0 - Me.chkModel.Tag = "Model" - Me.chkModel.Text = "Model" - Me.chkModel.UseVisualStyleBackColor = True + Me.chkDisplayCLimits.AutoSize = True + Me.chkDisplayCLimits.Location = New System.Drawing.Point(7, 102) + Me.chkDisplayCLimits.Name = "chkDisplayCLimits" + Me.chkDisplayCLimits.Size = New System.Drawing.Size(109, 17) + Me.chkDisplayCLimits.TabIndex = 4 + Me.chkDisplayCLimits.Tag = "Confidence_Limits" + Me.chkDisplayCLimits.Text = "Confidence Limits" + Me.chkDisplayCLimits.UseVisualStyleBackColor = True ' - 'chkANOVA + 'nudDisplayCLevel ' - Me.chkANOVA.AutoSize = True - Me.chkANOVA.Location = New System.Drawing.Point(6, 44) - Me.chkANOVA.Name = "chkANOVA" - Me.chkANOVA.Size = New System.Drawing.Size(63, 17) - Me.chkANOVA.TabIndex = 1 - Me.chkANOVA.Tag = "ANOVA" - Me.chkANOVA.Text = "ANOVA" - Me.chkANOVA.UseVisualStyleBackColor = True + Me.nudDisplayCLevel.DecimalPlaces = 2 + Me.nudDisplayCLevel.Increment = New Decimal(New Integer() {1, 0, 0, 131072}) + Me.nudDisplayCLevel.Location = New System.Drawing.Point(149, 124) + Me.nudDisplayCLevel.Maximum = New Decimal(New Integer() {1, 0, 0, 0}) + Me.nudDisplayCLevel.Name = "nudDisplayCLevel" + Me.nudDisplayCLevel.Size = New System.Drawing.Size(45, 20) + Me.nudDisplayCLevel.TabIndex = 6 + Me.nudDisplayCLevel.Value = New Decimal(New Integer() {95, 0, 0, 131072}) ' - 'chkPvalues + 'lblDisplayCLevel ' - Me.chkPvalues.AutoSize = True - Me.chkPvalues.Location = New System.Drawing.Point(118, 46) - Me.chkPvalues.Name = "chkPvalues" - Me.chkPvalues.Size = New System.Drawing.Size(67, 17) - Me.chkPvalues.TabIndex = 2 - Me.chkPvalues.Tag = "P_values" - Me.chkPvalues.Text = "P-values" - Me.chkPvalues.UseVisualStyleBackColor = True + Me.lblDisplayCLevel.AutoSize = True + Me.lblDisplayCLevel.Location = New System.Drawing.Point(34, 126) + Me.lblDisplayCLevel.Name = "lblDisplayCLevel" + Me.lblDisplayCLevel.Size = New System.Drawing.Size(90, 13) + Me.lblDisplayCLevel.TabIndex = 5 + Me.lblDisplayCLevel.Tag = "Confidence_Level" + Me.lblDisplayCLevel.Text = "Confidence Level" ' 'chkEstimates ' @@ -223,37 +222,38 @@ Partial Class sdgSimpleRegOptions Me.chkEstimates.Text = "Estimates" Me.chkEstimates.UseVisualStyleBackColor = True ' - 'lblDisplayCLevel + 'chkPvalues ' - Me.lblDisplayCLevel.AutoSize = True - Me.lblDisplayCLevel.Location = New System.Drawing.Point(34, 126) - Me.lblDisplayCLevel.Name = "lblDisplayCLevel" - Me.lblDisplayCLevel.Size = New System.Drawing.Size(90, 13) - Me.lblDisplayCLevel.TabIndex = 5 - Me.lblDisplayCLevel.Tag = "Confidence_Level" - Me.lblDisplayCLevel.Text = "Confidence Level" + Me.chkPvalues.AutoSize = True + Me.chkPvalues.Location = New System.Drawing.Point(118, 46) + Me.chkPvalues.Name = "chkPvalues" + Me.chkPvalues.Size = New System.Drawing.Size(67, 17) + Me.chkPvalues.TabIndex = 2 + Me.chkPvalues.Tag = "P_values" + Me.chkPvalues.Text = "P-values" + Me.chkPvalues.UseVisualStyleBackColor = True ' - 'nudDisplayCLevel + 'chkANOVA ' - Me.nudDisplayCLevel.DecimalPlaces = 2 - Me.nudDisplayCLevel.Increment = New Decimal(New Integer() {1, 0, 0, 131072}) - Me.nudDisplayCLevel.Location = New System.Drawing.Point(149, 124) - Me.nudDisplayCLevel.Maximum = New Decimal(New Integer() {1, 0, 0, 0}) - Me.nudDisplayCLevel.Name = "nudDisplayCLevel" - Me.nudDisplayCLevel.Size = New System.Drawing.Size(45, 20) - Me.nudDisplayCLevel.TabIndex = 6 - Me.nudDisplayCLevel.Value = New Decimal(New Integer() {95, 0, 0, 131072}) + Me.chkANOVA.AutoSize = True + Me.chkANOVA.Location = New System.Drawing.Point(6, 44) + Me.chkANOVA.Name = "chkANOVA" + Me.chkANOVA.Size = New System.Drawing.Size(63, 17) + Me.chkANOVA.TabIndex = 1 + Me.chkANOVA.Tag = "ANOVA" + Me.chkANOVA.Text = "ANOVA" + Me.chkANOVA.UseVisualStyleBackColor = True ' - 'chkDisplayCLimits + 'chkModel ' - Me.chkDisplayCLimits.AutoSize = True - Me.chkDisplayCLimits.Location = New System.Drawing.Point(7, 102) - Me.chkDisplayCLimits.Name = "chkDisplayCLimits" - Me.chkDisplayCLimits.Size = New System.Drawing.Size(109, 17) - Me.chkDisplayCLimits.TabIndex = 4 - Me.chkDisplayCLimits.Tag = "Confidence_Limits" - Me.chkDisplayCLimits.Text = "Confidence Limits" - Me.chkDisplayCLimits.UseVisualStyleBackColor = True + Me.chkModel.AutoSize = True + Me.chkModel.Location = New System.Drawing.Point(6, 15) + Me.chkModel.Name = "chkModel" + Me.chkModel.Size = New System.Drawing.Size(55, 17) + Me.chkModel.TabIndex = 0 + Me.chkModel.Tag = "Model" + Me.chkModel.Text = "Model" + Me.chkModel.UseVisualStyleBackColor = True ' 'tbRegOptions ' @@ -273,15 +273,17 @@ Partial Class sdgSimpleRegOptions Me.Controls.Add(Me.tbRegOptions) Me.Controls.Add(Me.ucrSdgButtons) Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow + Me.MaximizeBox = False + Me.MinimizeBox = False Me.Name = "sdgSimpleRegOptions" Me.Tag = "Graph_Display_Options" Me.Text = "Graph Display Options" Me.tbGraphics.ResumeLayout(False) - Me.grpResiduals.ResumeLayout(False) - Me.grpResiduals.PerformLayout() Me.grpModel.ResumeLayout(False) Me.grpModel.PerformLayout() CType(Me.nudGraphicsCLevel, System.ComponentModel.ISupportInitialize).EndInit() + Me.grpResiduals.ResumeLayout(False) + Me.grpResiduals.PerformLayout() Me.tbDisplay.ResumeLayout(False) Me.tbDisplay.PerformLayout() CType(Me.nudDisplayCLevel, System.ComponentModel.ISupportInitialize).EndInit() diff --git a/instat/sdgSummaries.Designer.vb b/instat/sdgSummaries.Designer.vb index 8a3003b67fe..514a4df3da4 100644 --- a/instat/sdgSummaries.Designer.vb +++ b/instat/sdgSummaries.Designer.vb @@ -29,6 +29,9 @@ Partial Class sdgSummaries Me.grpCommon = New System.Windows.Forms.GroupBox() Me.tbDescribe = New System.Windows.Forms.TabControl() Me.tbAll = New System.Windows.Forms.TabPage() + Me.grpNotOrderedFactor = New System.Windows.Forms.GroupBox() + Me.chkMinimum = New System.Windows.Forms.CheckBox() + Me.chkMaximum = New System.Windows.Forms.CheckBox() Me.tbNumeric = New System.Windows.Forms.TabPage() Me.grpNumeric = New System.Windows.Forms.GroupBox() Me.chkSum = New System.Windows.Forms.CheckBox() @@ -39,15 +42,12 @@ Partial Class sdgSummaries Me.chkQuartiles = New System.Windows.Forms.CheckBox() Me.chkMedian = New System.Windows.Forms.CheckBox() Me.UcrButtonsSubdialogue1 = New instat.ucrButtonsSubdialogue() - Me.grpNotOrderedFactor = New System.Windows.Forms.GroupBox() - Me.chkMinimum = New System.Windows.Forms.CheckBox() - Me.chkMaximum = New System.Windows.Forms.CheckBox() Me.grpCommon.SuspendLayout() Me.tbDescribe.SuspendLayout() Me.tbAll.SuspendLayout() + Me.grpNotOrderedFactor.SuspendLayout() Me.tbNumeric.SuspendLayout() Me.grpNumeric.SuspendLayout() - Me.grpNotOrderedFactor.SuspendLayout() Me.SuspendLayout() ' 'chkNonMissing @@ -131,6 +131,40 @@ Partial Class sdgSummaries Me.tbAll.Text = "All" Me.tbAll.UseVisualStyleBackColor = True ' + 'grpNotOrderedFactor + ' + Me.grpNotOrderedFactor.Controls.Add(Me.chkMinimum) + Me.grpNotOrderedFactor.Controls.Add(Me.chkMaximum) + Me.grpNotOrderedFactor.Location = New System.Drawing.Point(8, 71) + Me.grpNotOrderedFactor.Name = "grpNotOrderedFactor" + Me.grpNotOrderedFactor.Size = New System.Drawing.Size(243, 46) + Me.grpNotOrderedFactor.TabIndex = 20 + Me.grpNotOrderedFactor.TabStop = False + Me.grpNotOrderedFactor.Tag = "All_but_unrdered_factor" + Me.grpNotOrderedFactor.Text = "All but (Unordered) factor" + ' + 'chkMinimum + ' + Me.chkMinimum.AutoSize = True + Me.chkMinimum.Location = New System.Drawing.Point(15, 19) + Me.chkMinimum.Name = "chkMinimum" + Me.chkMinimum.Size = New System.Drawing.Size(67, 17) + Me.chkMinimum.TabIndex = 4 + Me.chkMinimum.Tag = "Minimum" + Me.chkMinimum.Text = "Minimum" + Me.chkMinimum.UseVisualStyleBackColor = True + ' + 'chkMaximum + ' + Me.chkMaximum.AutoSize = True + Me.chkMaximum.Location = New System.Drawing.Point(133, 19) + Me.chkMaximum.Name = "chkMaximum" + Me.chkMaximum.Size = New System.Drawing.Size(70, 17) + Me.chkMaximum.TabIndex = 5 + Me.chkMaximum.Tag = "Maximum" + Me.chkMaximum.Text = "Maximum" + Me.chkMaximum.UseVisualStyleBackColor = True + ' 'tbNumeric ' Me.tbNumeric.Controls.Add(Me.grpNumeric) @@ -244,40 +278,6 @@ Partial Class sdgSummaries Me.UcrButtonsSubdialogue1.Size = New System.Drawing.Size(142, 30) Me.UcrButtonsSubdialogue1.TabIndex = 0 ' - 'grpNotOrderedFactor - ' - Me.grpNotOrderedFactor.Controls.Add(Me.chkMinimum) - Me.grpNotOrderedFactor.Controls.Add(Me.chkMaximum) - Me.grpNotOrderedFactor.Location = New System.Drawing.Point(8, 71) - Me.grpNotOrderedFactor.Name = "grpNotOrderedFactor" - Me.grpNotOrderedFactor.Size = New System.Drawing.Size(243, 46) - Me.grpNotOrderedFactor.TabIndex = 20 - Me.grpNotOrderedFactor.TabStop = False - Me.grpNotOrderedFactor.Tag = "All_but_unrdered_factor" - Me.grpNotOrderedFactor.Text = "All but (Unordered) factor" - ' - 'chkMinimum - ' - Me.chkMinimum.AutoSize = True - Me.chkMinimum.Location = New System.Drawing.Point(15, 19) - Me.chkMinimum.Name = "chkMinimum" - Me.chkMinimum.Size = New System.Drawing.Size(67, 17) - Me.chkMinimum.TabIndex = 4 - Me.chkMinimum.Tag = "Minimum" - Me.chkMinimum.Text = "Minimum" - Me.chkMinimum.UseVisualStyleBackColor = True - ' - 'chkMaximum - ' - Me.chkMaximum.AutoSize = True - Me.chkMaximum.Location = New System.Drawing.Point(133, 19) - Me.chkMaximum.Name = "chkMaximum" - Me.chkMaximum.Size = New System.Drawing.Size(70, 17) - Me.chkMaximum.TabIndex = 5 - Me.chkMaximum.Tag = "Maximum" - Me.chkMaximum.Text = "Maximum" - Me.chkMaximum.UseVisualStyleBackColor = True - ' 'sdgSummaries ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -285,6 +285,7 @@ Partial Class sdgSummaries Me.ClientSize = New System.Drawing.Size(302, 205) Me.Controls.Add(Me.tbDescribe) Me.Controls.Add(Me.UcrButtonsSubdialogue1) + Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow Me.MaximizeBox = False Me.MinimizeBox = False Me.Name = "sdgSummaries" @@ -294,11 +295,11 @@ Partial Class sdgSummaries Me.grpCommon.PerformLayout() Me.tbDescribe.ResumeLayout(False) Me.tbAll.ResumeLayout(False) + Me.grpNotOrderedFactor.ResumeLayout(False) + Me.grpNotOrderedFactor.PerformLayout() Me.tbNumeric.ResumeLayout(False) Me.grpNumeric.ResumeLayout(False) Me.grpNumeric.PerformLayout() - Me.grpNotOrderedFactor.ResumeLayout(False) - Me.grpNotOrderedFactor.PerformLayout() Me.ResumeLayout(False) End Sub diff --git a/instat/sdgThemeOptions.Designer.vb b/instat/sdgThemeOptions.Designer.vb deleted file mode 100644 index 955b4f1f747..00000000000 --- a/instat/sdgThemeOptions.Designer.vb +++ /dev/null @@ -1,50 +0,0 @@ - _ -Partial Class sdgThemeOptions - Inherits System.Windows.Forms.Form - - 'Form overrides dispose to clean up the component list. - _ - Protected Overrides Sub Dispose(ByVal disposing As Boolean) - Try - If disposing AndAlso components IsNot Nothing Then - components.Dispose() - End If - Finally - MyBase.Dispose(disposing) - End Try - End Sub - - 'Required by the Windows Form Designer - Private components As System.ComponentModel.IContainer - - 'NOTE: The following procedure is required by the Windows Form Designer - 'It can be modified using the Windows Form Designer. - 'Do not modify it using the code editor. - _ - Private Sub InitializeComponent() - Me.ucrBaseSdgThemeOptions = New instat.ucrButtonsSubdialogue() - Me.SuspendLayout() - ' - 'ucrBaseSdgThemeOptions - ' - Me.ucrBaseSdgThemeOptions.Location = New System.Drawing.Point(59, 213) - Me.ucrBaseSdgThemeOptions.Name = "ucrBaseSdgThemeOptions" - Me.ucrBaseSdgThemeOptions.Size = New System.Drawing.Size(142, 30) - Me.ucrBaseSdgThemeOptions.TabIndex = 0 - ' - 'sdgThemeOptions - ' - Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) - Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(307, 267) - Me.Controls.Add(Me.ucrBaseSdgThemeOptions) - Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow - Me.Name = "sdgThemeOptions" - Me.Tag = "Theme_Options" - Me.Text = "Theme Options" - Me.ResumeLayout(False) - - End Sub - - Friend WithEvents ucrBaseSdgThemeOptions As ucrButtonsSubdialogue -End Class diff --git a/instat/sdgThemeOptions.fr-FR.resx b/instat/sdgThemeOptions.fr-FR.resx deleted file mode 100644 index a3df4f013d3..00000000000 --- a/instat/sdgThemeOptions.fr-FR.resx +++ /dev/null @@ -1,15 +0,0 @@ - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - \ No newline at end of file diff --git a/instat/sdgThemeOptions.resx b/instat/sdgThemeOptions.resx deleted file mode 100644 index 1af7de150c9..00000000000 --- a/instat/sdgThemeOptions.resx +++ /dev/null @@ -1,120 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - \ No newline at end of file diff --git a/instat/sdgThemeOptions.sw-KE.resx b/instat/sdgThemeOptions.sw-KE.resx deleted file mode 100644 index a3df4f013d3..00000000000 --- a/instat/sdgThemeOptions.sw-KE.resx +++ /dev/null @@ -1,15 +0,0 @@ - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - \ No newline at end of file diff --git a/instat/sdgThemeOptions.vb b/instat/sdgThemeOptions.vb deleted file mode 100644 index 7799e87e87f..00000000000 --- a/instat/sdgThemeOptions.vb +++ /dev/null @@ -1,3 +0,0 @@ -Public Class sdgThemeOptions - -End Class \ No newline at end of file diff --git a/instat/sdgVariableTransformations.Designer.vb b/instat/sdgVariableTransformations.Designer.vb index 07ac14a2fe6..b976ed4dd5a 100644 --- a/instat/sdgVariableTransformations.Designer.vb +++ b/instat/sdgVariableTransformations.Designer.vb @@ -23,13 +23,13 @@ Partial Class sdgVariableTransformations _ Private Sub InitializeComponent() Me.grpGeneralFunctions = New System.Windows.Forms.GroupBox() + Me.rdoIdentity = New System.Windows.Forms.RadioButton() Me.rdoNaturallog = New System.Windows.Forms.RadioButton() Me.nudPower = New System.Windows.Forms.NumericUpDown() Me.rdoPower = New System.Windows.Forms.RadioButton() Me.rdoSquareroot = New System.Windows.Forms.RadioButton() Me.rdoLogBase10 = New System.Windows.Forms.RadioButton() Me.ucrButtonsSDGVarTransform = New instat.ucrButtonsSubdialogue() - Me.rdoIdentity = New System.Windows.Forms.RadioButton() Me.grpGeneralFunctions.SuspendLayout() CType(Me.nudPower, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() @@ -50,6 +50,18 @@ Partial Class sdgVariableTransformations Me.grpGeneralFunctions.Tag = "General_Functions" Me.grpGeneralFunctions.Text = "General Functions" ' + 'rdoIdentity + ' + Me.rdoIdentity.AutoSize = True + Me.rdoIdentity.Location = New System.Drawing.Point(9, 19) + Me.rdoIdentity.Name = "rdoIdentity" + Me.rdoIdentity.Size = New System.Drawing.Size(59, 17) + Me.rdoIdentity.TabIndex = 5 + Me.rdoIdentity.TabStop = True + Me.rdoIdentity.Tag = "Identity" + Me.rdoIdentity.Text = "Identity" + Me.rdoIdentity.UseVisualStyleBackColor = True + ' 'rdoNaturallog ' Me.rdoNaturallog.AutoSize = True @@ -114,18 +126,6 @@ Partial Class sdgVariableTransformations Me.ucrButtonsSDGVarTransform.Size = New System.Drawing.Size(142, 30) Me.ucrButtonsSDGVarTransform.TabIndex = 2 ' - 'rdoIdentity - ' - Me.rdoIdentity.AutoSize = True - Me.rdoIdentity.Location = New System.Drawing.Point(9, 19) - Me.rdoIdentity.Name = "rdoIdentity" - Me.rdoIdentity.Size = New System.Drawing.Size(59, 17) - Me.rdoIdentity.TabIndex = 5 - Me.rdoIdentity.TabStop = True - Me.rdoIdentity.Tag = "Identity" - Me.rdoIdentity.Text = "Identity" - Me.rdoIdentity.UseVisualStyleBackColor = True - ' 'sdgVariableTransformations ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -133,7 +133,7 @@ Partial Class sdgVariableTransformations Me.ClientSize = New System.Drawing.Size(186, 186) Me.Controls.Add(Me.ucrButtonsSDGVarTransform) Me.Controls.Add(Me.grpGeneralFunctions) - Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog + Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow Me.MaximizeBox = False Me.MinimizeBox = False Me.Name = "sdgVariableTransformations" diff --git a/instat/static/InstatObject/R/data_object_R6.R b/instat/static/InstatObject/R/data_object_R6.R index 946e77fb46a..08dc4342d40 100644 --- a/instat/static/InstatObject/R/data_object_R6.R +++ b/instat/static/InstatObject/R/data_object_R6.R @@ -33,6 +33,10 @@ data_object <- R6Class("data_object", # If no name for the data.frame has been given in the list we create a default one. # Decide how to choose default name index if ( !(is.null(data_name) || data_name == "" || missing(data_name))) { + if(data_name != make.names(data_name)) { + message("data_name is invalid. It will be made valid automatically.") + data_name <- make.names(data_name) + } self$append_to_metadata(data_name_label, data_name) } else if (!self$is_metadata(data_name_label)) { diff --git a/instat/static/InstatObject/R/instat_object_R6.R b/instat/static/InstatObject/R/instat_object_R6.R index 9e0a9507c3a..7b57defcc7e 100644 --- a/instat/static/InstatObject/R/instat_object_R6.R +++ b/instat/static/InstatObject/R/instat_object_R6.R @@ -166,6 +166,14 @@ instat_object$set("public", "import_RDS", function(data_RDS, keep_existing = TRU } ) +instat_object$set("public", "import_from_ODK", function(username, password, form_name, platform) { + out <- import_from_ODK(username, password, form_name, platform) + data_list <- list(out) + names(data_list) <- form_name + self$import_data(data_tables = data_list) +} +) + # Now appending/merging not setting so maybe should be renamed instat_object$set("public", "set_meta", function(new_meta) { if(!is.list(new_meta)) stop("new_meta must be of type: list") diff --git a/instat/static/InstatObject/R/stand_alone_functions.R b/instat/static/InstatObject/R/stand_alone_functions.R index 983c697bc6a..03afb35cc23 100644 --- a/instat/static/InstatObject/R/stand_alone_functions.R +++ b/instat/static/InstatObject/R/stand_alone_functions.R @@ -58,4 +58,65 @@ next_default_item = function(prefix, existing_names = c(), include_index = TRUE, start_index = start_index + 1 } return(out) +} + +import_from_ODK = function(username, password, form_name, platform) { + if(platform == "kobo") { + url <- "https://kc.kobotoolbox.org/api/v1/data" + } + else if(platform == "ona") { + url <- "https://api.ona.io/api/v1/data" + } + else stop("Unrecognised platform.") + + if(!missing(username) && !missing(password)) { + has_authentication <- TRUE + user <- authenticate(username, password) + odk_data <- GET(url, user) + } + else { + has_authentication <- FALSE + odk_data <- GET(url) + } + + forms <- content(odk_data, "parse") + form_names <- sapply(forms, function(x) x$title) + + if(!form_name %in% form_names) stop(form_name, " not found in available forms:", paste(form_names, collapse = ", ")) + form_num <- which(form_names == form_name) + form_id <- forms[[form_num]]$id + + if(has_authentication) curr_form <- GET(paste0(url,"/", form_id), user) + else curr_form <- GET(paste0(url,"/", form_id)) + + form_data <- content(curr_form, "text") + #TODO Look at how to convert columns that are lists + # maybe use tidyr::unnest + out <- fromJSON(form_data, flatten = TRUE) + return(out) +} + +get_odk_form_names = function(username, password, platform) { + #TODO This should not be repeated + if(platform == "kobo") { + url <- "https://kc.kobotoolbox.org/api/v1/data" + } + else if(platform == "ona") { + url <- "https://api.ona.io/api/v1/data" + } + else stop("Unrecognised platform.") + + if(!missing(username) && !missing(password)) { + has_authentication <- TRUE + user <- authenticate(username, password) + odk_data <- GET(url, user) + } + else { + has_authentication <- FALSE + odk_data <- GET(url) + } + + forms <- content(odk_data, "parse") + form_names <- sapply(forms, function(x) x$title) + return(form_names) } \ No newline at end of file