diff --git a/instat/My Project/Resources.Designer.vb b/instat/My Project/Resources.Designer.vb index 7bb954a4656..a19149cca83 100644 --- a/instat/My Project/Resources.Designer.vb +++ b/instat/My Project/Resources.Designer.vb @@ -169,6 +169,15 @@ Namespace My.Resources End Get End Property + ''' + ''' Looks up a localized string similar to Axes. + ''' + Friend ReadOnly Property Axes() As String + Get + Return ResourceManager.GetString("Axes", resourceCulture) + End Get + End Property + ''' ''' Looks up a localized string similar to Bernouli. ''' @@ -196,6 +205,15 @@ Namespace My.Resources End Get End Property + ''' + ''' Looks up a localized string similar to Bottom. + ''' + Friend ReadOnly Property Bottom() As String + Get + Return ResourceManager.GetString("Bottom", resourceCulture) + End Get + End Property + ''' ''' Looks up a localized string similar to Boxplot. ''' @@ -395,6 +413,15 @@ Namespace My.Resources End Get End Property + ''' + ''' Looks up a localized string similar to Column summaries. + ''' + Friend ReadOnly Property Column_summaries() As String + Get + Return ResourceManager.GetString("Column_summaries", resourceCulture) + End Get + End Property + ''' ''' Looks up a localized string similar to Columns to be stack. ''' @@ -917,6 +944,15 @@ Namespace My.Resources End Get End Property + ''' + ''' Looks up a localized string similar to Facets. + ''' + Friend ReadOnly Property Facets() As String + Get + Return ResourceManager.GetString("Facets", resourceCulture) + End Get + End Property + ''' ''' Looks up a localized string similar to Factor. ''' @@ -1070,6 +1106,15 @@ Namespace My.Resources End Get End Property + ''' + ''' Looks up a localized string similar to Graphic options. + ''' + Friend ReadOnly Property Graphic_options() As String + Get + Return ResourceManager.GetString("Graphic_options", resourceCulture) + End Get + End Property + ''' ''' Looks up a localized string similar to Graphics. ''' @@ -1277,6 +1322,15 @@ Namespace My.Resources End Get End Property + ''' + ''' Looks up a localized string similar to Layers. + ''' + Friend ReadOnly Property Layers() As String + Get + Return ResourceManager.GetString("Layers", resourceCulture) + End Get + End Property + ''' ''' Looks up a localized string similar to Layout of data. ''' @@ -1829,6 +1883,15 @@ Namespace My.Resources End Get End Property + ''' + ''' Looks up a localized string similar to Permute rows. + ''' + Friend ReadOnly Property Permute_rows() As String + Get + Return ResourceManager.GetString("Permute_rows", resourceCulture) + End Get + End Property + ''' ''' Looks up a localized string similar to Plot. ''' @@ -1937,6 +2000,15 @@ Namespace My.Resources End Get End Property + ''' + ''' Looks up a localized string similar to Random subset. + ''' + Friend ReadOnly Property Random_subset() As String + Get + Return ResourceManager.GetString("Random_subset", resourceCulture) + End Get + End Property + ''' ''' Looks up a localized string similar to Range End. ''' @@ -1955,6 +2027,15 @@ Namespace My.Resources End Get End Property + ''' + ''' Looks up a localized string similar to Rank. + ''' + Friend ReadOnly Property Rank() As String + Get + Return ResourceManager.GetString("Rank", resourceCulture) + End Get + End Property + ''' ''' Looks up a localized string similar to Recall. ''' @@ -2009,6 +2090,24 @@ Namespace My.Resources End Get End Property + ''' + ''' Looks up a localized string similar to Rename sheets. + ''' + Friend ReadOnly Property Rename_sheets() As String + Get + Return ResourceManager.GetString("Rename_sheets", resourceCulture) + End Get + End Property + + ''' + ''' Looks up a localized string similar to Reorder. + ''' + Friend ReadOnly Property Reorder() As String + Get + Return ResourceManager.GetString("Reorder", resourceCulture) + End Get + End Property + ''' ''' Looks up a localized string similar to Reorder levels. ''' @@ -2018,6 +2117,15 @@ Namespace My.Resources End Get End Property + ''' + ''' Looks up a localized string similar to Reoder sheets. + ''' + Friend ReadOnly Property Reorder_sheets() As String + Get + Return ResourceManager.GetString("Reorder_sheets", resourceCulture) + End Get + End Property + ''' ''' Looks up a localized string similar to Replace. ''' @@ -2108,6 +2216,15 @@ Namespace My.Resources End Get End Property + ''' + ''' Looks up a localized string similar to Restrict(Filter). + ''' + Friend ReadOnly Property Restrict_filter() As String + Get + Return ResourceManager.GetString("Restrict_filter", resourceCulture) + End Get + End Property + ''' ''' Looks up a localized string similar to Row. ''' @@ -2144,6 +2261,15 @@ Namespace My.Resources End Get End Property + ''' + ''' Looks up a localized string similar to Row summary. + ''' + Friend ReadOnly Property Row_summary() As String + Get + Return ResourceManager.GetString("Row_summary", resourceCulture) + End Get + End Property + ''' ''' Looks up a localized string similar to Run Worksheet Editor F7. ''' @@ -2603,6 +2729,15 @@ Namespace My.Resources End Get End Property + ''' + ''' Looks up a localized string similar to Themes. + ''' + Friend ReadOnly Property Themes() As String + Get + Return ResourceManager.GetString("Themes", resourceCulture) + End Get + End Property + ''' ''' Looks up a localized string similar to Threashold. ''' @@ -2702,6 +2837,15 @@ Namespace My.Resources End Get End Property + ''' + ''' Looks up a localized string similar to Type. + ''' + Friend ReadOnly Property Type() As String + Get + Return ResourceManager.GetString("Type", resourceCulture) + End Get + End Property + ''' ''' Looks up a localized string similar to Undo. ''' @@ -2774,6 +2918,15 @@ Namespace My.Resources End Get End Property + ''' + ''' Looks up a localized string similar to View data. + ''' + Friend ReadOnly Property View_data() As String + Get + Return ResourceManager.GetString("View_data", resourceCulture) + End Get + End Property + ''' ''' Looks up a localized string similar to View/Edit Macro. ''' diff --git a/instat/My Project/Resources.resx b/instat/My Project/Resources.resx index f185e9e491b..4ad0e033ba0 100644 --- a/instat/My Project/Resources.resx +++ b/instat/My Project/Resources.resx @@ -1075,4 +1075,55 @@ View + + Axes + + + Bottom + + + Column summaries + + + Facets + + + Graphic options + + + Layers + + + Permute rows + + + Random subset + + + Rank + + + Rename sheets + + + Reorder + + + Reoder sheets + + + Restrict(Filter) + + + Row summary + + + Themes + + + Type + + + View data + \ No newline at end of file diff --git a/instat/dlgControlOptions.Designer.vb b/instat/dlgControlOptions.Designer.vb new file mode 100644 index 00000000000..9cc56669e02 --- /dev/null +++ b/instat/dlgControlOptions.Designer.vb @@ -0,0 +1,49 @@ + _ +Partial Class dlgControlOptions + Inherits System.Windows.Forms.Form + + 'Form overrides dispose to clean up the component list. + _ + Protected Overrides Sub Dispose(ByVal disposing As Boolean) + Try + If disposing AndAlso components IsNot Nothing Then + components.Dispose() + End If + Finally + MyBase.Dispose(disposing) + End Try + End Sub + + 'Required by the Windows Form Designer + Private components As System.ComponentModel.IContainer + + 'NOTE: The following procedure is required by the Windows Form Designer + 'It can be modified using the Windows Form Designer. + 'Do not modify it using the code editor. + _ + Private Sub InitializeComponent() + Me.ucrBase = New instat.ucrButtons() + Me.SuspendLayout() + ' + 'ucrBase + ' + Me.ucrBase.Location = New System.Drawing.Point(0, 207) + Me.ucrBase.Name = "ucrBase" + Me.ucrBase.Size = New System.Drawing.Size(410, 53) + Me.ucrBase.TabIndex = 0 + ' + 'dlgControlOptions + ' + Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) + Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.ClientSize = New System.Drawing.Size(409, 261) + Me.Controls.Add(Me.ucrBase) + Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow + Me.Name = "dlgControlOptions" + Me.Text = "Control Options" + Me.ResumeLayout(False) + + End Sub + + Friend WithEvents ucrBase As ucrButtons +End Class diff --git a/instat/dlgControlOptions.fr-FR.resx b/instat/dlgControlOptions.fr-FR.resx new file mode 100644 index 00000000000..9c9f69d752c --- /dev/null +++ b/instat/dlgControlOptions.fr-FR.resx @@ -0,0 +1,15 @@ + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/instat/dlgControlOptions.resx b/instat/dlgControlOptions.resx new file mode 100644 index 00000000000..29dcb1b3a35 --- /dev/null +++ b/instat/dlgControlOptions.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/instat/dlgControlOptions.sw-KE.resx b/instat/dlgControlOptions.sw-KE.resx new file mode 100644 index 00000000000..9c9f69d752c --- /dev/null +++ b/instat/dlgControlOptions.sw-KE.resx @@ -0,0 +1,15 @@ + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/instat/dlgControlOptions.vb b/instat/dlgControlOptions.vb new file mode 100644 index 00000000000..beb65ebf558 --- /dev/null +++ b/instat/dlgControlOptions.vb @@ -0,0 +1,3 @@ +Public Class dlgControlOptions + +End Class \ No newline at end of file diff --git a/instat/dlgCounts.Designer.vb b/instat/dlgCounts.Designer.vb new file mode 100644 index 00000000000..ff413c8c38d --- /dev/null +++ b/instat/dlgCounts.Designer.vb @@ -0,0 +1,50 @@ + _ +Partial Class dlgCounts + Inherits System.Windows.Forms.Form + + 'Form overrides dispose to clean up the component list. + _ + Protected Overrides Sub Dispose(ByVal disposing As Boolean) + Try + If disposing AndAlso components IsNot Nothing Then + components.Dispose() + End If + Finally + MyBase.Dispose(disposing) + End Try + End Sub + + 'Required by the Windows Form Designer + Private components As System.ComponentModel.IContainer + + 'NOTE: The following procedure is required by the Windows Form Designer + 'It can be modified using the Windows Form Designer. + 'Do not modify it using the code editor. + _ + Private Sub InitializeComponent() + Me.ucrBase = New instat.ucrButtons() + Me.SuspendLayout() + ' + 'ucrBase + ' + Me.ucrBase.Location = New System.Drawing.Point(1, 206) + Me.ucrBase.Name = "ucrBase" + Me.ucrBase.Size = New System.Drawing.Size(410, 53) + Me.ucrBase.TabIndex = 0 + ' + 'dlgCounts + ' + Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) + Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.ClientSize = New System.Drawing.Size(412, 261) + Me.Controls.Add(Me.ucrBase) + Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow + Me.Name = "dlgCounts" + Me.Tag = "Counts" + Me.Text = "Counts" + Me.ResumeLayout(False) + + End Sub + + Friend WithEvents ucrBase As ucrButtons +End Class diff --git a/instat/dlgCounts.fr-FR.resx b/instat/dlgCounts.fr-FR.resx new file mode 100644 index 00000000000..9c9f69d752c --- /dev/null +++ b/instat/dlgCounts.fr-FR.resx @@ -0,0 +1,15 @@ + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/instat/dlgCounts.resx b/instat/dlgCounts.resx new file mode 100644 index 00000000000..29dcb1b3a35 --- /dev/null +++ b/instat/dlgCounts.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/instat/dlgCounts.sw-KE.resx b/instat/dlgCounts.sw-KE.resx new file mode 100644 index 00000000000..9c9f69d752c --- /dev/null +++ b/instat/dlgCounts.sw-KE.resx @@ -0,0 +1,15 @@ + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/instat/dlgCounts.vb b/instat/dlgCounts.vb new file mode 100644 index 00000000000..f3e92483895 --- /dev/null +++ b/instat/dlgCounts.vb @@ -0,0 +1,3 @@ +Public Class dlgCounts + +End Class \ No newline at end of file diff --git a/instat/dlgLabels.Designer.vb b/instat/dlgLabels.Designer.vb new file mode 100644 index 00000000000..631b2b18074 --- /dev/null +++ b/instat/dlgLabels.Designer.vb @@ -0,0 +1,50 @@ + _ +Partial Class dlgLabels + Inherits System.Windows.Forms.Form + + 'Form overrides dispose to clean up the component list. + _ + Protected Overrides Sub Dispose(ByVal disposing As Boolean) + Try + If disposing AndAlso components IsNot Nothing Then + components.Dispose() + End If + Finally + MyBase.Dispose(disposing) + End Try + End Sub + + 'Required by the Windows Form Designer + Private components As System.ComponentModel.IContainer + + 'NOTE: The following procedure is required by the Windows Form Designer + 'It can be modified using the Windows Form Designer. + 'Do not modify it using the code editor. + _ + Private Sub InitializeComponent() + Me.ucrBase = New instat.ucrButtons() + Me.SuspendLayout() + ' + 'ucrBase + ' + Me.ucrBase.Location = New System.Drawing.Point(1, 205) + Me.ucrBase.Name = "ucrBase" + Me.ucrBase.Size = New System.Drawing.Size(410, 53) + Me.ucrBase.TabIndex = 0 + ' + 'dlgLabels + ' + Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) + Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.ClientSize = New System.Drawing.Size(410, 261) + Me.Controls.Add(Me.ucrBase) + Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow + Me.Name = "dlgLabels" + Me.Tag = "Labels" + Me.Text = "Labels" + Me.ResumeLayout(False) + + End Sub + + Friend WithEvents ucrBase As ucrButtons +End Class diff --git a/instat/dlgLabels.fr-FR.resx b/instat/dlgLabels.fr-FR.resx new file mode 100644 index 00000000000..9c9f69d752c --- /dev/null +++ b/instat/dlgLabels.fr-FR.resx @@ -0,0 +1,15 @@ + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/instat/dlgLabels.resx b/instat/dlgLabels.resx new file mode 100644 index 00000000000..29dcb1b3a35 --- /dev/null +++ b/instat/dlgLabels.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/instat/dlgLabels.sw-KE.resx b/instat/dlgLabels.sw-KE.resx new file mode 100644 index 00000000000..9c9f69d752c --- /dev/null +++ b/instat/dlgLabels.sw-KE.resx @@ -0,0 +1,15 @@ + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/instat/dlgLabels.vb b/instat/dlgLabels.vb new file mode 100644 index 00000000000..270f2e40cb8 --- /dev/null +++ b/instat/dlgLabels.vb @@ -0,0 +1,3 @@ +Public Class dlgLabels + +End Class \ No newline at end of file diff --git a/instat/dlgReorder.Designer.vb b/instat/dlgReorder.Designer.vb new file mode 100644 index 00000000000..2b46b9fea1b --- /dev/null +++ b/instat/dlgReorder.Designer.vb @@ -0,0 +1,50 @@ + _ +Partial Class dlgReorder + Inherits System.Windows.Forms.Form + + 'Form overrides dispose to clean up the component list. + _ + Protected Overrides Sub Dispose(ByVal disposing As Boolean) + Try + If disposing AndAlso components IsNot Nothing Then + components.Dispose() + End If + Finally + MyBase.Dispose(disposing) + End Try + End Sub + + 'Required by the Windows Form Designer + Private components As System.ComponentModel.IContainer + + 'NOTE: The following procedure is required by the Windows Form Designer + 'It can be modified using the Windows Form Designer. + 'Do not modify it using the code editor. + _ + Private Sub InitializeComponent() + Me.ucrBase = New instat.ucrButtons() + Me.SuspendLayout() + ' + 'ucrBase + ' + Me.ucrBase.Location = New System.Drawing.Point(7, 211) + Me.ucrBase.Name = "ucrBase" + Me.ucrBase.Size = New System.Drawing.Size(410, 53) + Me.ucrBase.TabIndex = 0 + ' + 'dlgReorder + ' + Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) + Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.ClientSize = New System.Drawing.Size(425, 261) + Me.Controls.Add(Me.ucrBase) + Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow + Me.Name = "dlgReorder" + Me.Tag = "Reorder" + Me.Text = "Reorder" + Me.ResumeLayout(False) + + End Sub + + Friend WithEvents ucrBase As ucrButtons +End Class diff --git a/instat/dlgReorder.fr-FR.resx b/instat/dlgReorder.fr-FR.resx new file mode 100644 index 00000000000..9c9f69d752c --- /dev/null +++ b/instat/dlgReorder.fr-FR.resx @@ -0,0 +1,15 @@ + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/instat/dlgReorder.resx b/instat/dlgReorder.resx new file mode 100644 index 00000000000..29dcb1b3a35 --- /dev/null +++ b/instat/dlgReorder.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/instat/dlgReorder.sw-KE.resx b/instat/dlgReorder.sw-KE.resx new file mode 100644 index 00000000000..9c9f69d752c --- /dev/null +++ b/instat/dlgReorder.sw-KE.resx @@ -0,0 +1,15 @@ + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/instat/dlgReorder.vb b/instat/dlgReorder.vb new file mode 100644 index 00000000000..8e4adee6d98 --- /dev/null +++ b/instat/dlgReorder.vb @@ -0,0 +1,3 @@ +Public Class dlgReorder + +End Class \ No newline at end of file diff --git a/instat/dlgView.Designer.vb b/instat/dlgView.Designer.vb index 6b0fcca5841..b87fb8018e2 100644 --- a/instat/dlgView.Designer.vb +++ b/instat/dlgView.Designer.vb @@ -22,33 +22,35 @@ Partial Class dlgView 'Do not modify it using the code editor. _ Private Sub InitializeComponent() - Me.ucrBase = New instat.ucrButtons() Me.ucrSelectorDataFrame = New instat.ucrSelectorByDataFrameAddRemove() + Me.ucrBase = New instat.ucrButtons() Me.ucrReceiverView = New instat.ucrReceiverMultiple() Me.lblSelected = New System.Windows.Forms.Label() - Me.grpSpecifiedRows = New System.Windows.Forms.GroupBox() - Me.rdoTop = New System.Windows.Forms.RadioButton() + Me.grpSelectedRows = New System.Windows.Forms.GroupBox() + Me.txtBottom = New System.Windows.Forms.TextBox() + Me.txtTop = New System.Windows.Forms.TextBox() Me.rdoBottom = New System.Windows.Forms.RadioButton() - Me.grpSpecifiedRows.SuspendLayout() + Me.rdoTop = New System.Windows.Forms.RadioButton() + Me.grpSelectedRows.SuspendLayout() Me.SuspendLayout() ' - 'ucrBase - ' - Me.ucrBase.Location = New System.Drawing.Point(12, 257) - Me.ucrBase.Name = "ucrBase" - Me.ucrBase.Size = New System.Drawing.Size(410, 53) - Me.ucrBase.TabIndex = 0 - ' 'ucrSelectorDataFrame ' - Me.ucrSelectorDataFrame.Location = New System.Drawing.Point(12, 12) + Me.ucrSelectorDataFrame.Location = New System.Drawing.Point(13, 13) Me.ucrSelectorDataFrame.Name = "ucrSelectorDataFrame" Me.ucrSelectorDataFrame.Size = New System.Drawing.Size(242, 179) - Me.ucrSelectorDataFrame.TabIndex = 1 + Me.ucrSelectorDataFrame.TabIndex = 0 + ' + 'ucrBase + ' + Me.ucrBase.Location = New System.Drawing.Point(13, 269) + Me.ucrBase.Name = "ucrBase" + Me.ucrBase.Size = New System.Drawing.Size(401, 53) + Me.ucrBase.TabIndex = 1 ' 'ucrReceiverView ' - Me.ucrReceiverView.Location = New System.Drawing.Point(293, 84) + Me.ucrReceiverView.Location = New System.Drawing.Point(261, 88) Me.ucrReceiverView.Name = "ucrReceiverView" Me.ucrReceiverView.Size = New System.Drawing.Size(121, 104) Me.ucrReceiverView.TabIndex = 2 @@ -56,41 +58,45 @@ Partial Class dlgView 'lblSelected ' Me.lblSelected.AutoSize = True - Me.lblSelected.Location = New System.Drawing.Point(290, 68) + Me.lblSelected.Location = New System.Drawing.Point(262, 69) Me.lblSelected.Name = "lblSelected" Me.lblSelected.Size = New System.Drawing.Size(49, 13) Me.lblSelected.TabIndex = 3 Me.lblSelected.Tag = "Selected" Me.lblSelected.Text = "Selected" ' - 'grpSpecifiedRows + 'grpSelectedRows ' - Me.grpSpecifiedRows.Controls.Add(Me.rdoBottom) - Me.grpSpecifiedRows.Controls.Add(Me.rdoTop) - Me.grpSpecifiedRows.Location = New System.Drawing.Point(12, 197) - Me.grpSpecifiedRows.Name = "grpSpecifiedRows" - Me.grpSpecifiedRows.Size = New System.Drawing.Size(402, 54) - Me.grpSpecifiedRows.TabIndex = 4 - Me.grpSpecifiedRows.TabStop = False - Me.grpSpecifiedRows.Tag = "Specified_rows" - Me.grpSpecifiedRows.Text = "Specified rows" + Me.grpSelectedRows.Controls.Add(Me.txtBottom) + Me.grpSelectedRows.Controls.Add(Me.txtTop) + Me.grpSelectedRows.Controls.Add(Me.rdoBottom) + Me.grpSelectedRows.Controls.Add(Me.rdoTop) + Me.grpSelectedRows.Location = New System.Drawing.Point(13, 199) + Me.grpSelectedRows.Name = "grpSelectedRows" + Me.grpSelectedRows.Size = New System.Drawing.Size(401, 52) + Me.grpSelectedRows.TabIndex = 4 + Me.grpSelectedRows.TabStop = False + Me.grpSelectedRows.Tag = "Display_specified_rows" + Me.grpSelectedRows.Text = "Display specified rows" ' - 'rdoTop + 'txtBottom ' - Me.rdoTop.AutoSize = True - Me.rdoTop.Location = New System.Drawing.Point(6, 19) - Me.rdoTop.Name = "rdoTop" - Me.rdoTop.Size = New System.Drawing.Size(44, 17) - Me.rdoTop.TabIndex = 0 - Me.rdoTop.TabStop = True - Me.rdoTop.Tag = "Top" - Me.rdoTop.Text = "Top" - Me.rdoTop.UseVisualStyleBackColor = True + Me.txtBottom.Location = New System.Drawing.Point(330, 20) + Me.txtBottom.Name = "txtBottom" + Me.txtBottom.Size = New System.Drawing.Size(40, 20) + Me.txtBottom.TabIndex = 3 + ' + 'txtTop + ' + Me.txtTop.Location = New System.Drawing.Point(121, 19) + Me.txtTop.Name = "txtTop" + Me.txtTop.Size = New System.Drawing.Size(40, 20) + Me.txtTop.TabIndex = 2 ' 'rdoBottom ' Me.rdoBottom.AutoSize = True - Me.rdoBottom.Location = New System.Drawing.Point(152, 19) + Me.rdoBottom.Location = New System.Drawing.Point(233, 19) Me.rdoBottom.Name = "rdoBottom" Me.rdoBottom.Size = New System.Drawing.Size(58, 17) Me.rdoBottom.TabIndex = 1 @@ -99,33 +105,47 @@ Partial Class dlgView Me.rdoBottom.Text = "Bottom" Me.rdoBottom.UseVisualStyleBackColor = True ' + 'rdoTop + ' + Me.rdoTop.AutoSize = True + Me.rdoTop.Location = New System.Drawing.Point(24, 20) + Me.rdoTop.Name = "rdoTop" + Me.rdoTop.Size = New System.Drawing.Size(44, 17) + Me.rdoTop.TabIndex = 0 + Me.rdoTop.TabStop = True + Me.rdoTop.Tag = "Top" + Me.rdoTop.Text = "Top" + Me.rdoTop.UseVisualStyleBackColor = True + ' 'dlgView ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(426, 320) - Me.Controls.Add(Me.grpSpecifiedRows) + Me.ClientSize = New System.Drawing.Size(468, 334) + Me.Controls.Add(Me.grpSelectedRows) Me.Controls.Add(Me.lblSelected) Me.Controls.Add(Me.ucrReceiverView) - Me.Controls.Add(Me.ucrSelectorDataFrame) Me.Controls.Add(Me.ucrBase) + Me.Controls.Add(Me.ucrSelectorDataFrame) Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow Me.Name = "dlgView" Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen Me.Tag = "View" Me.Text = "View" - Me.grpSpecifiedRows.ResumeLayout(False) - Me.grpSpecifiedRows.PerformLayout() + Me.grpSelectedRows.ResumeLayout(False) + Me.grpSelectedRows.PerformLayout() Me.ResumeLayout(False) Me.PerformLayout() End Sub - Friend WithEvents ucrBase As ucrButtons Friend WithEvents ucrSelectorDataFrame As ucrSelectorByDataFrameAddRemove + Friend WithEvents ucrBase As ucrButtons Friend WithEvents ucrReceiverView As ucrReceiverMultiple Friend WithEvents lblSelected As Label - Friend WithEvents grpSpecifiedRows As GroupBox + Friend WithEvents grpSelectedRows As GroupBox Friend WithEvents rdoBottom As RadioButton Friend WithEvents rdoTop As RadioButton + Friend WithEvents txtBottom As TextBox + Friend WithEvents txtTop As TextBox End Class diff --git a/instat/dlgView.fr-FR.resx b/instat/dlgView.fr-FR.resx new file mode 100644 index 00000000000..9c9f69d752c --- /dev/null +++ b/instat/dlgView.fr-FR.resx @@ -0,0 +1,15 @@ + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/instat/dlgView.resx b/instat/dlgView.resx new file mode 100644 index 00000000000..29dcb1b3a35 --- /dev/null +++ b/instat/dlgView.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/instat/dlgView.sw-KE.resx b/instat/dlgView.sw-KE.resx new file mode 100644 index 00000000000..9c9f69d752c --- /dev/null +++ b/instat/dlgView.sw-KE.resx @@ -0,0 +1,15 @@ + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/instat/dlgView.vb b/instat/dlgView.vb index 6ed2a777c18..8a248894c0c 100644 --- a/instat/dlgView.vb +++ b/instat/dlgView.vb @@ -17,12 +17,28 @@ Imports instat.Translations Public Class dlgView Private Sub dlgView_Load(sender As Object, e As EventArgs) Handles MyBase.Load autoTranslate(Me) - ucrBase.clsRsyntax.SetFunction("view") + ucrBase.clsRsyntax.iCallType = 2 ucrReceiverView.Selector = ucrSelectorDataFrame ucrReceiverView.SetMeAsReceiver() - End Sub Private Sub ucrReceiverView_Leave(sender As Object, e As EventArgs) Handles ucrReceiverView.Leave ucrBase.clsRsyntax.AddParameter("X", ucrReceiverView.GetVariableNames()) + + End Sub + + Private Sub txtTop_leave(sender As Object, e As EventArgs) Handles txtTop.Leave + ucrBase.clsRsyntax.AddParameter("n", txtTop.Text) + End Sub + + Private Sub txtBottom_leave(sender As Object, e As EventArgs) Handles txtBottom.Leave + ucrBase.clsRsyntax.AddParameter("n", txtBottom.Text) + End Sub + + Private Sub rdoTop_click(sender As Object, e As EventArgs) Handles rdoTop.Click + ucrBase.clsRsyntax.SetFunction("head") + End Sub + + Private Sub rdoBottom_click(sender As Object, e As EventArgs) Handles rdoBottom.Click + ucrBase.clsRsyntax.SetFunction("tail") End Sub End Class \ No newline at end of file diff --git a/instat/frmMain.Designer.vb b/instat/frmMain.Designer.vb index fe927764d3b..09c73adc1e4 100644 --- a/instat/frmMain.Designer.vb +++ b/instat/frmMain.Designer.vb @@ -51,18 +51,18 @@ Partial Class frmMain Me.mnuStatsNonParametricOneWayAnova = New System.Windows.Forms.ToolStripMenuItem() Me.mnuStatsNonParametricTwoWayAnova = New System.Windows.Forms.ToolStripMenuItem() Me.ToolStripSeparator8 = New System.Windows.Forms.ToolStripSeparator() - Me.GraphicsToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.mnuGraphics = New System.Windows.Forms.ToolStripMenuItem() Me.mnuGraphicsPlot = New System.Windows.Forms.ToolStripMenuItem() - Me.mnuBoxPlot = New System.Windows.Forms.ToolStripMenuItem() + Me.mnuGraphicsBoxPlot = New System.Windows.Forms.ToolStripMenuItem() Me.mnuGraphicsHistogram = New System.Windows.Forms.ToolStripMenuItem() Me.mnuGraphicsProbabilityPlot = New System.Windows.Forms.ToolStripMenuItem() Me.mnuGraphisDotPlot = New System.Windows.Forms.ToolStripMenuItem() - Me.WindroseToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() - Me.FrequencyChartToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() - Me.SummaryChartToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.mnuGraphicsWindrose = New System.Windows.Forms.ToolStripMenuItem() + Me.mnuGraphicsFrequencyChart = New System.Windows.Forms.ToolStripMenuItem() + Me.mnuGraphicsSummaryChart = New System.Windows.Forms.ToolStripMenuItem() Me.mnuGraphicsScatterplot = New System.Windows.Forms.ToolStripMenuItem() - Me.StemAndLeafToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() - Me.LoadGraphToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.mnuGraphicsStemAndLeaf = New System.Windows.Forms.ToolStripMenuItem() + Me.mnuGraphicsLoadGraph = New System.Windows.Forms.ToolStripMenuItem() Me.mnuGraphicsInventory = New System.Windows.Forms.ToolStripMenuItem() Me.StatisticsToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.SummaryToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() @@ -234,16 +234,32 @@ Partial Class frmMain Me.mnuManageDataView = New System.Windows.Forms.ToolStripMenuItem() Me.mnuManageDataName = New System.Windows.Forms.ToolStripMenuItem() Me.mnuManageFactor = New System.Windows.Forms.ToolStripMenuItem() - Me.mnuManageReshape = New System.Windows.Forms.ToolStripMenuItem() - Me.mnuManageRechapeStack = New System.Windows.Forms.ToolStripMenuItem() - Me.mnuManageRechapeUnstack = New System.Windows.Forms.ToolStripMenuItem() - Me.mnuManageRechapeSelect = New System.Windows.Forms.ToolStripMenuItem() - Me.mnuManageRechapeMerge = New System.Windows.Forms.ToolStripMenuItem() + Me.mnuManageFactorconvertTo = New System.Windows.Forms.ToolStripMenuItem() + Me.mnuMangeFactorLabel = New System.Windows.Forms.ToolStripMenuItem() + Me.mnuManageFactorReorderLevels = New System.Windows.Forms.ToolStripMenuItem() + Me.mnuManageFactorRecode = New System.Windows.Forms.ToolStripMenuItem() + Me.mnuManageFactorReferenceLevels = New System.Windows.Forms.ToolStripMenuItem() + Me.mnuManageFactorInteraction = New System.Windows.Forms.ToolStripMenuItem() + Me.mnuManageFactorUnusedLevels = New System.Windows.Forms.ToolStripMenuItem() + Me.mnuManageFactorIndicatorVariables = New System.Windows.Forms.ToolStripMenuItem() + Me.mnuManageManipulate = New System.Windows.Forms.ToolStripMenuItem() + Me.mnuTransform = New System.Windows.Forms.ToolStripMenuItem() + Me.mnuManageManipulateRecode = New System.Windows.Forms.ToolStripMenuItem() + Me.mnuManageManipulateSort = New System.Windows.Forms.ToolStripMenuItem() + Me.mnuManageManipulateRowStat = New System.Windows.Forms.ToolStripMenuItem() + Me.mnuManageManipulatePolynomials = New System.Windows.Forms.ToolStripMenuItem() Me.mnuManageDataFrame = New System.Windows.Forms.ToolStripMenuItem() Me.mnuManageDataFrameOrder = New System.Windows.Forms.ToolStripMenuItem() Me.mnuManageDataFrameInsert = New System.Windows.Forms.ToolStripMenuItem() Me.mnuManageDataFrameDelete = New System.Windows.Forms.ToolStripMenuItem() Me.mnuManageDataFrameDisplay = New System.Windows.Forms.ToolStripMenuItem() + Me.mnuManageDataFrameProtectLockUnlock = New System.Windows.Forms.ToolStripMenuItem() + Me.mnuManageDataFrameHideShow = New System.Windows.Forms.ToolStripMenuItem() + Me.mnuManageReshape = New System.Windows.Forms.ToolStripMenuItem() + Me.mnuManageRechapeStack = New System.Windows.Forms.ToolStripMenuItem() + Me.mnuManageRechapeUnstack = New System.Windows.Forms.ToolStripMenuItem() + Me.mnuManageRechapeSelect = New System.Windows.Forms.ToolStripMenuItem() + Me.mnuManageRechapeMerge = New System.Windows.Forms.ToolStripMenuItem() Me.mnuManageDataFile = New System.Windows.Forms.ToolStripMenuItem() Me.mnuManageDataFileDeleteSheet = New System.Windows.Forms.ToolStripMenuItem() Me.mnuManageDataFileRenameSheet = New System.Windows.Forms.ToolStripMenuItem() @@ -286,22 +302,11 @@ Partial Class frmMain Me.SeasonalSummaryToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.SeasonalSummaryRainToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.WaterBalanceToolStripMenuItem1 = New System.Windows.Forms.ToolStripMenuItem() - Me.mnuTransform = New System.Windows.Forms.ToolStripMenuItem() - Me.mnuManageManipulateRecode = New System.Windows.Forms.ToolStripMenuItem() - Me.mnuManageManipulateSort = New System.Windows.Forms.ToolStripMenuItem() - Me.mnuManageManipulateRowStat = New System.Windows.Forms.ToolStripMenuItem() - Me.mnuManageManipulatePolynomials = New System.Windows.Forms.ToolStripMenuItem() - Me.mnuManageManipulate = New System.Windows.Forms.ToolStripMenuItem() - Me.mnuManageFactorconvertTo = New System.Windows.Forms.ToolStripMenuItem() - Me.mnuMangeFactorLabel = New System.Windows.Forms.ToolStripMenuItem() - Me.mnuManageFactorReorderLevels = New System.Windows.Forms.ToolStripMenuItem() - Me.mnuManageFactorRecode = New System.Windows.Forms.ToolStripMenuItem() - Me.mnuManageFactorReferenceLevels = New System.Windows.Forms.ToolStripMenuItem() - Me.mnuManageFactorInteraction = New System.Windows.Forms.ToolStripMenuItem() - Me.mnuManageFactorUnusedLevels = New System.Windows.Forms.ToolStripMenuItem() - Me.mnuManageFactorIndicatorVariables = New System.Windows.Forms.ToolStripMenuItem() - Me.mnuManageDataFrameProtectLockUnlock = New System.Windows.Forms.ToolStripMenuItem() - Me.mnuManageDataFrameHideShow = New System.Windows.Forms.ToolStripMenuItem() + Me.mnuGraphicsGraphicsOptions = New System.Windows.Forms.ToolStripMenuItem() + Me.mnuGraphicsGraphicsOptionsLayers = New System.Windows.Forms.ToolStripMenuItem() + Me.mnuGraphicsGraphicsOptionsAxes = New System.Windows.Forms.ToolStripMenuItem() + Me.mnuGraphicsGraphicsOptionsThemes = New System.Windows.Forms.ToolStripMenuItem() + Me.mnuGraphicsGraphicsOptionsFacets = New System.Windows.Forms.ToolStripMenuItem() Me.stsStrip.SuspendLayout() Me.Tool_strip.SuspendLayout() Me.mnuBar.SuspendLayout() @@ -479,13 +484,13 @@ Partial Class frmMain Me.ToolStripSeparator8.Name = "ToolStripSeparator8" Me.ToolStripSeparator8.Size = New System.Drawing.Size(176, 6) ' - 'GraphicsToolStripMenuItem + 'mnuGraphics ' - Me.GraphicsToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuGraphicsPlot, Me.mnuBoxPlot, Me.mnuGraphicsHistogram, Me.mnuGraphicsProbabilityPlot, Me.mnuGraphisDotPlot, Me.WindroseToolStripMenuItem, Me.FrequencyChartToolStripMenuItem, Me.SummaryChartToolStripMenuItem, Me.mnuGraphicsScatterplot, Me.StemAndLeafToolStripMenuItem, Me.LoadGraphToolStripMenuItem, Me.mnuGraphicsInventory}) - Me.GraphicsToolStripMenuItem.Name = "GraphicsToolStripMenuItem" - Me.GraphicsToolStripMenuItem.Size = New System.Drawing.Size(65, 20) - Me.GraphicsToolStripMenuItem.Tag = "Graphics" - Me.GraphicsToolStripMenuItem.Text = "Graphics" + Me.mnuGraphics.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuGraphicsPlot, Me.mnuGraphicsBoxPlot, Me.mnuGraphicsHistogram, Me.mnuGraphicsProbabilityPlot, Me.mnuGraphisDotPlot, Me.mnuGraphicsWindrose, Me.mnuGraphicsFrequencyChart, Me.mnuGraphicsSummaryChart, Me.mnuGraphicsScatterplot, Me.mnuGraphicsStemAndLeaf, Me.mnuGraphicsLoadGraph, Me.mnuGraphicsInventory, Me.mnuGraphicsGraphicsOptions}) + Me.mnuGraphics.Name = "mnuGraphics" + Me.mnuGraphics.Size = New System.Drawing.Size(65, 20) + Me.mnuGraphics.Tag = "Graphics" + Me.mnuGraphics.Text = "Graphics" ' 'mnuGraphicsPlot ' @@ -494,12 +499,12 @@ Partial Class frmMain Me.mnuGraphicsPlot.Tag = "Plot" Me.mnuGraphicsPlot.Text = "Plot..." ' - 'mnuBoxPlot + 'mnuGraphicsBoxPlot ' - Me.mnuBoxPlot.Name = "mnuBoxPlot" - Me.mnuBoxPlot.Size = New System.Drawing.Size(170, 22) - Me.mnuBoxPlot.Tag = "Boxplot" - Me.mnuBoxPlot.Text = "Boxplot.." + Me.mnuGraphicsBoxPlot.Name = "mnuGraphicsBoxPlot" + Me.mnuGraphicsBoxPlot.Size = New System.Drawing.Size(170, 22) + Me.mnuGraphicsBoxPlot.Tag = "Boxplot" + Me.mnuGraphicsBoxPlot.Text = "Boxplot.." ' 'mnuGraphicsHistogram ' @@ -522,26 +527,26 @@ Partial Class frmMain Me.mnuGraphisDotPlot.Tag = "Dotplot" Me.mnuGraphisDotPlot.Text = "Dotplot..." ' - 'WindroseToolStripMenuItem + 'mnuGraphicsWindrose ' - Me.WindroseToolStripMenuItem.Name = "WindroseToolStripMenuItem" - Me.WindroseToolStripMenuItem.Size = New System.Drawing.Size(170, 22) - Me.WindroseToolStripMenuItem.Tag = "Windrose" - Me.WindroseToolStripMenuItem.Text = "Windrose..." + Me.mnuGraphicsWindrose.Name = "mnuGraphicsWindrose" + Me.mnuGraphicsWindrose.Size = New System.Drawing.Size(170, 22) + Me.mnuGraphicsWindrose.Tag = "Windrose" + Me.mnuGraphicsWindrose.Text = "Windrose..." ' - 'FrequencyChartToolStripMenuItem + 'mnuGraphicsFrequencyChart ' - Me.FrequencyChartToolStripMenuItem.Name = "FrequencyChartToolStripMenuItem" - Me.FrequencyChartToolStripMenuItem.Size = New System.Drawing.Size(170, 22) - Me.FrequencyChartToolStripMenuItem.Tag = "Frequency_Chart" - Me.FrequencyChartToolStripMenuItem.Text = "Frequency Chart..." + Me.mnuGraphicsFrequencyChart.Name = "mnuGraphicsFrequencyChart" + Me.mnuGraphicsFrequencyChart.Size = New System.Drawing.Size(170, 22) + Me.mnuGraphicsFrequencyChart.Tag = "Frequency_Chart" + Me.mnuGraphicsFrequencyChart.Text = "Frequency Chart..." ' - 'SummaryChartToolStripMenuItem + 'mnuGraphicsSummaryChart ' - Me.SummaryChartToolStripMenuItem.Name = "SummaryChartToolStripMenuItem" - Me.SummaryChartToolStripMenuItem.Size = New System.Drawing.Size(170, 22) - Me.SummaryChartToolStripMenuItem.Tag = "Summary_Chart" - Me.SummaryChartToolStripMenuItem.Text = "Summary Chart..." + Me.mnuGraphicsSummaryChart.Name = "mnuGraphicsSummaryChart" + Me.mnuGraphicsSummaryChart.Size = New System.Drawing.Size(170, 22) + Me.mnuGraphicsSummaryChart.Tag = "Summary_Chart" + Me.mnuGraphicsSummaryChart.Text = "Summary Chart..." ' 'mnuGraphicsScatterplot ' @@ -550,19 +555,19 @@ Partial Class frmMain Me.mnuGraphicsScatterplot.Tag = "Scatterplot" Me.mnuGraphicsScatterplot.Text = "Scatterplot..." ' - 'StemAndLeafToolStripMenuItem + 'mnuGraphicsStemAndLeaf ' - Me.StemAndLeafToolStripMenuItem.Name = "StemAndLeafToolStripMenuItem" - Me.StemAndLeafToolStripMenuItem.Size = New System.Drawing.Size(170, 22) - Me.StemAndLeafToolStripMenuItem.Tag = "Stem_and_Leaf" - Me.StemAndLeafToolStripMenuItem.Text = "Stem and Leaf..." + Me.mnuGraphicsStemAndLeaf.Name = "mnuGraphicsStemAndLeaf" + Me.mnuGraphicsStemAndLeaf.Size = New System.Drawing.Size(170, 22) + Me.mnuGraphicsStemAndLeaf.Tag = "Stem_and_Leaf" + Me.mnuGraphicsStemAndLeaf.Text = "Stem and Leaf..." ' - 'LoadGraphToolStripMenuItem + 'mnuGraphicsLoadGraph ' - Me.LoadGraphToolStripMenuItem.Name = "LoadGraphToolStripMenuItem" - Me.LoadGraphToolStripMenuItem.Size = New System.Drawing.Size(170, 22) - Me.LoadGraphToolStripMenuItem.Tag = "Load_Graph" - Me.LoadGraphToolStripMenuItem.Text = "Load Graph..." + Me.mnuGraphicsLoadGraph.Name = "mnuGraphicsLoadGraph" + Me.mnuGraphicsLoadGraph.Size = New System.Drawing.Size(170, 22) + Me.mnuGraphicsLoadGraph.Tag = "Load_Graph" + Me.mnuGraphicsLoadGraph.Text = "Load Graph..." ' 'mnuGraphicsInventory ' @@ -1585,7 +1590,7 @@ Partial Class frmMain 'mnuBar ' Me.mnuBar.AllowMerge = False - Me.mnuBar.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuFile, Me.mnuEdit, Me.SubmitToolStripMenuItem, Me.mnuManage, Me.GraphicsToolStripMenuItem, Me.StatisticsToolStripMenuItem, Me.ClimaticToolStripMenuItem, Me.WindowToolStripMenuItem, Me.HelpToolStripMenuItem, Me.mnuClimateMethods}) + Me.mnuBar.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuFile, Me.mnuEdit, Me.SubmitToolStripMenuItem, Me.mnuManage, Me.mnuGraphics, Me.StatisticsToolStripMenuItem, Me.ClimaticToolStripMenuItem, Me.WindowToolStripMenuItem, Me.HelpToolStripMenuItem, Me.mnuClimateMethods}) Me.mnuBar.LayoutStyle = System.Windows.Forms.ToolStripLayoutStyle.HorizontalStackWithOverflow Me.mnuBar.Location = New System.Drawing.Point(0, 0) Me.mnuBar.MdiWindowListItem = Me.WindowToolStripMenuItem @@ -1712,7 +1717,7 @@ Partial Class frmMain 'mnuCalculations ' Me.mnuCalculations.Name = "mnuCalculations" - Me.mnuCalculations.Size = New System.Drawing.Size(152, 22) + Me.mnuCalculations.Size = New System.Drawing.Size(148, 22) Me.mnuCalculations.Tag = "Calculations" Me.mnuCalculations.Text = "Calculations..." ' @@ -1720,7 +1725,7 @@ Partial Class frmMain ' Me.mnuManageData.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuManageDataRegularSequence, Me.mnuManageDataRandomSamples, Me.mnuManageDataView, Me.mnuManageDataName}) Me.mnuManageData.Name = "mnuManageData" - Me.mnuManageData.Size = New System.Drawing.Size(152, 22) + Me.mnuManageData.Size = New System.Drawing.Size(148, 22) Me.mnuManageData.Tag = "Data" Me.mnuManageData.Text = "Data" ' @@ -1756,51 +1761,114 @@ Partial Class frmMain ' Me.mnuManageFactor.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuManageFactorconvertTo, Me.mnuMangeFactorLabel, Me.mnuManageFactorReorderLevels, Me.mnuManageFactorRecode, Me.mnuManageFactorReferenceLevels, Me.mnuManageFactorInteraction, Me.mnuManageFactorUnusedLevels, Me.mnuManageFactorIndicatorVariables}) Me.mnuManageFactor.Name = "mnuManageFactor" - Me.mnuManageFactor.Size = New System.Drawing.Size(152, 22) + Me.mnuManageFactor.Size = New System.Drawing.Size(148, 22) Me.mnuManageFactor.Tag = "Factor" Me.mnuManageFactor.Text = "Factor" ' - 'mnuManageReshape + 'mnuManageFactorconvertTo ' - Me.mnuManageReshape.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuManageRechapeStack, Me.mnuManageRechapeUnstack, Me.mnuManageRechapeSelect, Me.mnuManageRechapeMerge}) - Me.mnuManageReshape.Name = "mnuManageReshape" - Me.mnuManageReshape.Size = New System.Drawing.Size(152, 22) - Me.mnuManageReshape.Tag = "Reshape" - Me.mnuManageReshape.Text = "Reshape" + Me.mnuManageFactorconvertTo.Name = "mnuManageFactorconvertTo" + Me.mnuManageFactorconvertTo.Size = New System.Drawing.Size(170, 22) + Me.mnuManageFactorconvertTo.Tag = "Convert_to" + Me.mnuManageFactorconvertTo.Text = "Convert to" ' - 'mnuManageRechapeStack + 'mnuMangeFactorLabel ' - Me.mnuManageRechapeStack.Name = "mnuManageRechapeStack" - Me.mnuManageRechapeStack.Size = New System.Drawing.Size(152, 22) - Me.mnuManageRechapeStack.Tag = "Stack_Melt" - Me.mnuManageRechapeStack.Text = "Stack(Melt)" + Me.mnuMangeFactorLabel.Name = "mnuMangeFactorLabel" + Me.mnuMangeFactorLabel.Size = New System.Drawing.Size(170, 22) + Me.mnuMangeFactorLabel.Tag = "Label" + Me.mnuMangeFactorLabel.Text = "Label" ' - 'mnuManageRechapeUnstack + 'mnuManageFactorReorderLevels ' - Me.mnuManageRechapeUnstack.Name = "mnuManageRechapeUnstack" - Me.mnuManageRechapeUnstack.Size = New System.Drawing.Size(152, 22) - Me.mnuManageRechapeUnstack.Tag = "Unstack_Dcast" - Me.mnuManageRechapeUnstack.Text = "unstack(Dcast)" + Me.mnuManageFactorReorderLevels.Name = "mnuManageFactorReorderLevels" + Me.mnuManageFactorReorderLevels.Size = New System.Drawing.Size(170, 22) + Me.mnuManageFactorReorderLevels.Tag = "Reorder_levels" + Me.mnuManageFactorReorderLevels.Text = "Reorder levels" ' - 'mnuManageRechapeSelect + 'mnuManageFactorRecode ' - Me.mnuManageRechapeSelect.Name = "mnuManageRechapeSelect" - Me.mnuManageRechapeSelect.Size = New System.Drawing.Size(152, 22) - Me.mnuManageRechapeSelect.Tag = "Select" - Me.mnuManageRechapeSelect.Text = "Select..." + Me.mnuManageFactorRecode.Name = "mnuManageFactorRecode" + Me.mnuManageFactorRecode.Size = New System.Drawing.Size(170, 22) + Me.mnuManageFactorRecode.Tag = "Recode" + Me.mnuManageFactorRecode.Text = "Recode" ' - 'mnuManageRechapeMerge + 'mnuManageFactorReferenceLevels ' - Me.mnuManageRechapeMerge.Name = "mnuManageRechapeMerge" - Me.mnuManageRechapeMerge.Size = New System.Drawing.Size(152, 22) - Me.mnuManageRechapeMerge.Tag = "Merge" - Me.mnuManageRechapeMerge.Text = "Merge" + Me.mnuManageFactorReferenceLevels.Name = "mnuManageFactorReferenceLevels" + Me.mnuManageFactorReferenceLevels.Size = New System.Drawing.Size(170, 22) + Me.mnuManageFactorReferenceLevels.Tag = "Reference_levels" + Me.mnuManageFactorReferenceLevels.Text = "Reference levels" + ' + 'mnuManageFactorInteraction + ' + Me.mnuManageFactorInteraction.Name = "mnuManageFactorInteraction" + Me.mnuManageFactorInteraction.Size = New System.Drawing.Size(170, 22) + Me.mnuManageFactorInteraction.Tag = "Interaction" + Me.mnuManageFactorInteraction.Text = "Interaction" + ' + 'mnuManageFactorUnusedLevels + ' + Me.mnuManageFactorUnusedLevels.Name = "mnuManageFactorUnusedLevels" + Me.mnuManageFactorUnusedLevels.Size = New System.Drawing.Size(170, 22) + Me.mnuManageFactorUnusedLevels.Tag = "Unused_levels" + Me.mnuManageFactorUnusedLevels.Text = "Unused levels" + ' + 'mnuManageFactorIndicatorVariables + ' + Me.mnuManageFactorIndicatorVariables.Name = "mnuManageFactorIndicatorVariables" + Me.mnuManageFactorIndicatorVariables.Size = New System.Drawing.Size(170, 22) + Me.mnuManageFactorIndicatorVariables.Tag = "Indicator_variables" + Me.mnuManageFactorIndicatorVariables.Text = "Indicator variables" + ' + 'mnuManageManipulate + ' + Me.mnuManageManipulate.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuTransform, Me.mnuManageManipulateRecode, Me.mnuManageManipulateSort, Me.mnuManageManipulateRowStat, Me.mnuManageManipulatePolynomials}) + Me.mnuManageManipulate.Name = "mnuManageManipulate" + Me.mnuManageManipulate.Size = New System.Drawing.Size(148, 22) + Me.mnuManageManipulate.Tag = "Manipulate" + Me.mnuManageManipulate.Text = "Manipulate" + ' + 'mnuTransform + ' + Me.mnuTransform.Name = "mnuTransform" + Me.mnuTransform.Size = New System.Drawing.Size(155, 22) + Me.mnuTransform.Tag = "Transform" + Me.mnuTransform.Text = "Transform..." + ' + 'mnuManageManipulateRecode + ' + Me.mnuManageManipulateRecode.Name = "mnuManageManipulateRecode" + Me.mnuManageManipulateRecode.Size = New System.Drawing.Size(155, 22) + Me.mnuManageManipulateRecode.Tag = "Recode" + Me.mnuManageManipulateRecode.Text = "Recode..." + ' + 'mnuManageManipulateSort + ' + Me.mnuManageManipulateSort.Name = "mnuManageManipulateSort" + Me.mnuManageManipulateSort.Size = New System.Drawing.Size(155, 22) + Me.mnuManageManipulateSort.Tag = "Sort" + Me.mnuManageManipulateSort.Text = "Sort" + ' + 'mnuManageManipulateRowStat + ' + Me.mnuManageManipulateRowStat.Name = "mnuManageManipulateRowStat" + Me.mnuManageManipulateRowStat.Size = New System.Drawing.Size(155, 22) + Me.mnuManageManipulateRowStat.Tag = "Row_Statistics" + Me.mnuManageManipulateRowStat.Text = "Row Statistics..." + ' + 'mnuManageManipulatePolynomials + ' + Me.mnuManageManipulatePolynomials.Name = "mnuManageManipulatePolynomials" + Me.mnuManageManipulatePolynomials.Size = New System.Drawing.Size(155, 22) + Me.mnuManageManipulatePolynomials.Tag = "Polynomials" + Me.mnuManageManipulatePolynomials.Text = "Polynomials" ' 'mnuManageDataFrame ' Me.mnuManageDataFrame.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuManageDataFrameOrder, Me.mnuManageDataFrameInsert, Me.mnuManageDataFrameDelete, Me.mnuManageDataFrameDisplay, Me.mnuManageDataFrameProtectLockUnlock, Me.mnuManageDataFrameHideShow}) Me.mnuManageDataFrame.Name = "mnuManageDataFrame" - Me.mnuManageDataFrame.Size = New System.Drawing.Size(152, 22) + Me.mnuManageDataFrame.Size = New System.Drawing.Size(148, 22) Me.mnuManageDataFrame.Tag = "Data_Frame" Me.mnuManageDataFrame.Text = "Data Frame" ' @@ -1832,11 +1900,61 @@ Partial Class frmMain Me.mnuManageDataFrameDisplay.Tag = "Display" Me.mnuManageDataFrameDisplay.Text = "Display" ' + 'mnuManageDataFrameProtectLockUnlock + ' + Me.mnuManageDataFrameProtectLockUnlock.Name = "mnuManageDataFrameProtectLockUnlock" + Me.mnuManageDataFrameProtectLockUnlock.Size = New System.Drawing.Size(183, 22) + Me.mnuManageDataFrameProtectLockUnlock.Tag = "Protect_Lock_Unlock" + Me.mnuManageDataFrameProtectLockUnlock.Text = "Protect(Lock/Unlock" + ' + 'mnuManageDataFrameHideShow + ' + Me.mnuManageDataFrameHideShow.Name = "mnuManageDataFrameHideShow" + Me.mnuManageDataFrameHideShow.Size = New System.Drawing.Size(183, 22) + Me.mnuManageDataFrameHideShow.Tag = "Hide_Show" + Me.mnuManageDataFrameHideShow.Text = "Hide/Show" + ' + 'mnuManageReshape + ' + Me.mnuManageReshape.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuManageRechapeStack, Me.mnuManageRechapeUnstack, Me.mnuManageRechapeSelect, Me.mnuManageRechapeMerge}) + Me.mnuManageReshape.Name = "mnuManageReshape" + Me.mnuManageReshape.Size = New System.Drawing.Size(148, 22) + Me.mnuManageReshape.Tag = "Reshape" + Me.mnuManageReshape.Text = "Reshape" + ' + 'mnuManageRechapeStack + ' + Me.mnuManageRechapeStack.Name = "mnuManageRechapeStack" + Me.mnuManageRechapeStack.Size = New System.Drawing.Size(152, 22) + Me.mnuManageRechapeStack.Tag = "Stack_Melt" + Me.mnuManageRechapeStack.Text = "Stack(Melt)" + ' + 'mnuManageRechapeUnstack + ' + Me.mnuManageRechapeUnstack.Name = "mnuManageRechapeUnstack" + Me.mnuManageRechapeUnstack.Size = New System.Drawing.Size(152, 22) + Me.mnuManageRechapeUnstack.Tag = "Unstack_Dcast" + Me.mnuManageRechapeUnstack.Text = "unstack(Dcast)" + ' + 'mnuManageRechapeSelect + ' + Me.mnuManageRechapeSelect.Name = "mnuManageRechapeSelect" + Me.mnuManageRechapeSelect.Size = New System.Drawing.Size(152, 22) + Me.mnuManageRechapeSelect.Tag = "Select" + Me.mnuManageRechapeSelect.Text = "Select..." + ' + 'mnuManageRechapeMerge + ' + Me.mnuManageRechapeMerge.Name = "mnuManageRechapeMerge" + Me.mnuManageRechapeMerge.Size = New System.Drawing.Size(152, 22) + Me.mnuManageRechapeMerge.Tag = "Merge" + Me.mnuManageRechapeMerge.Text = "Merge" + ' 'mnuManageDataFile ' Me.mnuManageDataFile.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuManageDataFileDeleteSheet, Me.mnuManageDataFileRenameSheet, Me.mnuManageDataFileReorderSheet}) Me.mnuManageDataFile.Name = "mnuManageDataFile" - Me.mnuManageDataFile.Size = New System.Drawing.Size(152, 22) + Me.mnuManageDataFile.Size = New System.Drawing.Size(148, 22) Me.mnuManageDataFile.Tag = "Data_file" Me.mnuManageDataFile.Text = "Data File" ' @@ -2093,118 +2211,41 @@ Partial Class frmMain Me.WaterBalanceToolStripMenuItem1.Size = New System.Drawing.Size(200, 22) Me.WaterBalanceToolStripMenuItem1.Text = "Water Balance" ' - 'mnuTransform + 'mnuGraphicsGraphicsOptions ' - Me.mnuTransform.Name = "mnuTransform" - Me.mnuTransform.Size = New System.Drawing.Size(155, 22) - Me.mnuTransform.Tag = "Transform" - Me.mnuTransform.Text = "Transform..." - ' - 'mnuManageManipulateRecode + Me.mnuGraphicsGraphicsOptions.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuGraphicsGraphicsOptionsLayers, Me.mnuGraphicsGraphicsOptionsAxes, Me.mnuGraphicsGraphicsOptionsThemes, Me.mnuGraphicsGraphicsOptionsFacets}) + Me.mnuGraphicsGraphicsOptions.Name = "mnuGraphicsGraphicsOptions" + Me.mnuGraphicsGraphicsOptions.Size = New System.Drawing.Size(170, 22) + Me.mnuGraphicsGraphicsOptions.Tag = "Graphics_options" + Me.mnuGraphicsGraphicsOptions.Text = "Graphics options" ' - Me.mnuManageManipulateRecode.Name = "mnuManageManipulateRecode" - Me.mnuManageManipulateRecode.Size = New System.Drawing.Size(155, 22) - Me.mnuManageManipulateRecode.Tag = "Recode" - Me.mnuManageManipulateRecode.Text = "Recode..." + 'mnuGraphicsGraphicsOptionsLayers ' - 'mnuManageManipulateSort + Me.mnuGraphicsGraphicsOptionsLayers.Name = "mnuGraphicsGraphicsOptionsLayers" + Me.mnuGraphicsGraphicsOptionsLayers.Size = New System.Drawing.Size(152, 22) + Me.mnuGraphicsGraphicsOptionsLayers.Tag = "Layers" + Me.mnuGraphicsGraphicsOptionsLayers.Text = "Layers" ' - Me.mnuManageManipulateSort.Name = "mnuManageManipulateSort" - Me.mnuManageManipulateSort.Size = New System.Drawing.Size(155, 22) - Me.mnuManageManipulateSort.Tag = "Sort" - Me.mnuManageManipulateSort.Text = "Sort" + 'mnuGraphicsGraphicsOptionsAxes ' - 'mnuManageManipulateRowStat + Me.mnuGraphicsGraphicsOptionsAxes.Name = "mnuGraphicsGraphicsOptionsAxes" + Me.mnuGraphicsGraphicsOptionsAxes.Size = New System.Drawing.Size(152, 22) + Me.mnuGraphicsGraphicsOptionsAxes.Tag = "Axes" + Me.mnuGraphicsGraphicsOptionsAxes.Text = "Axes" ' - Me.mnuManageManipulateRowStat.Name = "mnuManageManipulateRowStat" - Me.mnuManageManipulateRowStat.Size = New System.Drawing.Size(155, 22) - Me.mnuManageManipulateRowStat.Tag = "Row_Statistics" - Me.mnuManageManipulateRowStat.Text = "Row Statistics..." + 'mnuGraphicsGraphicsOptionsThemes ' - 'mnuManageManipulatePolynomials + Me.mnuGraphicsGraphicsOptionsThemes.Name = "mnuGraphicsGraphicsOptionsThemes" + Me.mnuGraphicsGraphicsOptionsThemes.Size = New System.Drawing.Size(152, 22) + Me.mnuGraphicsGraphicsOptionsThemes.Tag = "Themes" + Me.mnuGraphicsGraphicsOptionsThemes.Text = "Themes" ' - Me.mnuManageManipulatePolynomials.Name = "mnuManageManipulatePolynomials" - Me.mnuManageManipulatePolynomials.Size = New System.Drawing.Size(155, 22) - Me.mnuManageManipulatePolynomials.Tag = "Polynomials" - Me.mnuManageManipulatePolynomials.Text = "Polynomials" + 'mnuGraphicsGraphicsOptionsFacets ' - 'mnuManageManipulate - ' - Me.mnuManageManipulate.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuTransform, Me.mnuManageManipulateRecode, Me.mnuManageManipulateSort, Me.mnuManageManipulateRowStat, Me.mnuManageManipulatePolynomials}) - Me.mnuManageManipulate.Name = "mnuManageManipulate" - Me.mnuManageManipulate.Size = New System.Drawing.Size(152, 22) - Me.mnuManageManipulate.Tag = "Manipulate" - Me.mnuManageManipulate.Text = "Manipulate" - ' - 'mnuManageFactorconvertTo - ' - Me.mnuManageFactorconvertTo.Name = "mnuManageFactorconvertTo" - Me.mnuManageFactorconvertTo.Size = New System.Drawing.Size(170, 22) - Me.mnuManageFactorconvertTo.Tag = "Convert_to" - Me.mnuManageFactorconvertTo.Text = "Convert to" - ' - 'mnuMangeFactorLabel - ' - Me.mnuMangeFactorLabel.Name = "mnuMangeFactorLabel" - Me.mnuMangeFactorLabel.Size = New System.Drawing.Size(170, 22) - Me.mnuMangeFactorLabel.Tag = "Label" - Me.mnuMangeFactorLabel.Text = "Label" - ' - 'mnuManageFactorReorderLevels - ' - Me.mnuManageFactorReorderLevels.Name = "mnuManageFactorReorderLevels" - Me.mnuManageFactorReorderLevels.Size = New System.Drawing.Size(170, 22) - Me.mnuManageFactorReorderLevels.Tag = "Reorder_levels" - Me.mnuManageFactorReorderLevels.Text = "Reorder levels" - ' - 'mnuManageFactorRecode - ' - Me.mnuManageFactorRecode.Name = "mnuManageFactorRecode" - Me.mnuManageFactorRecode.Size = New System.Drawing.Size(170, 22) - Me.mnuManageFactorRecode.Tag = "Recode" - Me.mnuManageFactorRecode.Text = "Recode" - ' - 'mnuManageFactorReferenceLevels - ' - Me.mnuManageFactorReferenceLevels.Name = "mnuManageFactorReferenceLevels" - Me.mnuManageFactorReferenceLevels.Size = New System.Drawing.Size(170, 22) - Me.mnuManageFactorReferenceLevels.Tag = "Reference_levels" - Me.mnuManageFactorReferenceLevels.Text = "Reference levels" - ' - 'mnuManageFactorInteraction - ' - Me.mnuManageFactorInteraction.Name = "mnuManageFactorInteraction" - Me.mnuManageFactorInteraction.Size = New System.Drawing.Size(170, 22) - Me.mnuManageFactorInteraction.Tag = "Interaction" - Me.mnuManageFactorInteraction.Text = "Interaction" - ' - 'mnuManageFactorUnusedLevels - ' - Me.mnuManageFactorUnusedLevels.Name = "mnuManageFactorUnusedLevels" - Me.mnuManageFactorUnusedLevels.Size = New System.Drawing.Size(170, 22) - Me.mnuManageFactorUnusedLevels.Tag = "Unused_levels" - Me.mnuManageFactorUnusedLevels.Text = "Unused levels" - ' - 'mnuManageFactorIndicatorVariables - ' - Me.mnuManageFactorIndicatorVariables.Name = "mnuManageFactorIndicatorVariables" - Me.mnuManageFactorIndicatorVariables.Size = New System.Drawing.Size(170, 22) - Me.mnuManageFactorIndicatorVariables.Tag = "Indicator_variables" - Me.mnuManageFactorIndicatorVariables.Text = "Indicator variables" - ' - 'mnuManageDataFrameProtectLockUnlock - ' - Me.mnuManageDataFrameProtectLockUnlock.Name = "mnuManageDataFrameProtectLockUnlock" - Me.mnuManageDataFrameProtectLockUnlock.Size = New System.Drawing.Size(183, 22) - Me.mnuManageDataFrameProtectLockUnlock.Tag = "Protect_Lock_Unlock" - Me.mnuManageDataFrameProtectLockUnlock.Text = "Protect(Lock/Unlock" - ' - 'mnuManageDataFrameHideShow - ' - Me.mnuManageDataFrameHideShow.Name = "mnuManageDataFrameHideShow" - Me.mnuManageDataFrameHideShow.Size = New System.Drawing.Size(183, 22) - Me.mnuManageDataFrameHideShow.Tag = "Hide_Show" - Me.mnuManageDataFrameHideShow.Text = "Hide/Show" + Me.mnuGraphicsGraphicsOptionsFacets.Name = "mnuGraphicsGraphicsOptionsFacets" + Me.mnuGraphicsGraphicsOptionsFacets.Size = New System.Drawing.Size(152, 22) + Me.mnuGraphicsGraphicsOptionsFacets.Tag = "Facets" + Me.mnuGraphicsGraphicsOptionsFacets.Text = "Facets" ' 'frmMain ' @@ -2256,18 +2297,18 @@ Partial Class frmMain Friend WithEvents mnuStatsNonParametricOneWayAnova As ToolStripMenuItem Friend WithEvents mnuStatsNonParametricTwoWayAnova As ToolStripMenuItem Friend WithEvents ToolStripSeparator8 As ToolStripSeparator - Friend WithEvents GraphicsToolStripMenuItem As ToolStripMenuItem + Friend WithEvents mnuGraphics As ToolStripMenuItem Friend WithEvents mnuGraphicsPlot As ToolStripMenuItem - Friend WithEvents mnuBoxPlot As ToolStripMenuItem + Friend WithEvents mnuGraphicsBoxPlot As ToolStripMenuItem Friend WithEvents mnuGraphicsHistogram As ToolStripMenuItem Friend WithEvents mnuGraphicsProbabilityPlot As ToolStripMenuItem Friend WithEvents mnuGraphisDotPlot As ToolStripMenuItem - Friend WithEvents WindroseToolStripMenuItem As ToolStripMenuItem - Friend WithEvents FrequencyChartToolStripMenuItem As ToolStripMenuItem - Friend WithEvents SummaryChartToolStripMenuItem As ToolStripMenuItem + Friend WithEvents mnuGraphicsWindrose As ToolStripMenuItem + Friend WithEvents mnuGraphicsFrequencyChart As ToolStripMenuItem + Friend WithEvents mnuGraphicsSummaryChart As ToolStripMenuItem Friend WithEvents mnuGraphicsScatterplot As ToolStripMenuItem - Friend WithEvents StemAndLeafToolStripMenuItem As ToolStripMenuItem - Friend WithEvents LoadGraphToolStripMenuItem As ToolStripMenuItem + Friend WithEvents mnuGraphicsStemAndLeaf As ToolStripMenuItem + Friend WithEvents mnuGraphicsLoadGraph As ToolStripMenuItem Friend WithEvents StatisticsToolStripMenuItem As ToolStripMenuItem Friend WithEvents SummaryToolStripMenuItem As ToolStripMenuItem Friend WithEvents DescribeToolStripMenuItem As ToolStripMenuItem @@ -2509,4 +2550,9 @@ Partial Class frmMain Friend WithEvents mnuManageManipulatePolynomials As ToolStripMenuItem Friend WithEvents mnuManageDataFrameProtectLockUnlock As ToolStripMenuItem Friend WithEvents mnuManageDataFrameHideShow As ToolStripMenuItem + Friend WithEvents mnuGraphicsGraphicsOptions As ToolStripMenuItem + Friend WithEvents mnuGraphicsGraphicsOptionsLayers As ToolStripMenuItem + Friend WithEvents mnuGraphicsGraphicsOptionsAxes As ToolStripMenuItem + Friend WithEvents mnuGraphicsGraphicsOptionsThemes As ToolStripMenuItem + Friend WithEvents mnuGraphicsGraphicsOptionsFacets As ToolStripMenuItem End Class diff --git a/instat/frmMain.vb b/instat/frmMain.vb index d94fb408e74..e7131a525dd 100644 --- a/instat/frmMain.vb +++ b/instat/frmMain.vb @@ -92,7 +92,7 @@ Public Class frmMain dlgCalculator.ShowDialog() End Sub - Private Sub mnuBoxPlot_Click(sender As Object, e As EventArgs) Handles mnuBoxPlot.Click + Private Sub mnuGraphicsBoxPlot_Click(sender As Object, e As EventArgs) Handles mnuGraphicsBoxPlot.Click dlgBoxplot.ShowDialog() End Sub @@ -116,7 +116,7 @@ Public Class frmMain dlgHistogram.ShowDialog() End Sub - Private Sub StemAndLeafToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles StemAndLeafToolStripMenuItem.Click + Private Sub StemAndLeafToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles mnuGraphicsStemAndLeaf.Click dlgStemAndLeaf.ShowDialog() End Sub @@ -747,4 +747,36 @@ Public Class frmMain Private Sub mnuEditRedo_Click(sender As Object, e As EventArgs) Handles mnuEditRedo.Click frmEditor.grdData.Redo() End Sub + + Private Sub mnuFilePrint_Click(sender As Object, e As EventArgs) Handles mnuFilePrint.Click + Dim docToPrint As Printing.PrintDocument = Nothing + Try + docToPrint = frmEditor.grdData.CurrentWorksheet.CreatePrintSession().PrintDocument + + Catch ex As Exception + MessageBox.Show(Me, ex.Message, Me.ProductName, MessageBoxButtons.OK, MessageBoxIcon.Information) + Return + End Try + Using pd = New PrintDialog() + pd.Document = docToPrint + pd.UseEXDialog = True + If pd.ShowDialog() = DialogResult.OK Then + docToPrint.PrinterSettings = pd.PrinterSettings + docToPrint.Print() + End If + End Using + End Sub + + Private Sub mnuFilePrintPreview_Click(sender As Object, e As EventArgs) Handles mnuFilePrintPreview.Click + Dim sheetPreview = frmEditor.grdData.CurrentWorksheet + + Using session = sheetPreview.CreatePrintSession() + Using previewPrint As New PrintPreviewDialog() + previewPrint.Document = session.PrintDocument + previewPrint.SetBounds(200, 200, 1024, 768) + previewPrint.PrintPreviewControl.Zoom = 1.0 + previewPrint.ShowDialog(Me) + End Using + End Using + End Sub End Class \ No newline at end of file diff --git a/instat/instat.vbproj b/instat/instat.vbproj index 60b1fd15149..6956d6a0dad 100644 --- a/instat/instat.vbproj +++ b/instat/instat.vbproj @@ -233,12 +233,24 @@ Form + + dlgControlOptions.vb + + + Form + dlgCorrelation.vb Form + + dlgCounts.vb + + + Form + dlgCountsTotals.vb @@ -491,6 +503,12 @@ Form + + dlgLabels.vb + + + Form + dlgLines.vb @@ -689,6 +707,12 @@ Form + + dlgReorder.vb + + + Form + dlgReplace.vb @@ -869,6 +893,12 @@ Form + + dlgView.vb + + + Form + dlgWaterBalance.vb @@ -1200,6 +1230,15 @@ dlgColumnRows.vb + + dlgControlOptions.vb + + + dlgControlOptions.vb + + + dlgControlOptions.vb + dlgCorrelation.vb @@ -1209,6 +1248,15 @@ dlgCorrelation.vb + + dlgCounts.vb + + + dlgCounts.vb + + + dlgCounts.vb + dlgCountsTotals.vb @@ -1584,6 +1632,15 @@ dlgIsNAListvb.vb + + dlgLabels.vb + + + dlgLabels.vb + + + dlgLabels.vb + dlgLines.vb @@ -1872,6 +1929,15 @@ dlgRegularSequence.vb + + dlgReorder.vb + + + dlgReorder.vb + + + dlgReorder.vb + dlgReplace.vb @@ -2091,6 +2157,15 @@ dlgUnstackDailyData.vb + + dlgView.vb + + + dlgView.vb + + + dlgView.vb + dlgWaterBalance.vb diff --git a/instat/ucrSelector.vb b/instat/ucrSelector.vb index 648df41a861..a21c85e7d44 100644 --- a/instat/ucrSelector.vb +++ b/instat/ucrSelector.vb @@ -64,11 +64,9 @@ Public Class ucrSelector Next Add() End Sub - - Public Sub Remove() - CurrentReceiver.RemoveSelected() + Public Sub ShowOptionsDialog() + 'code for dislaying dialog goes here End Sub - Private Sub lstAvailableVariable_DoubleClick(sender As Object, e As EventArgs) Handles lstAvailableVariable.DoubleClick Add() End Sub diff --git a/instat/ucrSelectorAddRemove.designer.vb b/instat/ucrSelectorAddRemove.designer.vb index ec4f0b1a458..b0522d1f8d5 100644 --- a/instat/ucrSelectorAddRemove.designer.vb +++ b/instat/ucrSelectorAddRemove.designer.vb @@ -20,12 +20,9 @@ Partial Class ucrSelectorAddRemove _ Private Sub InitializeComponent() Me.btnAdd = New System.Windows.Forms.Button() - Me.btnRemove = New System.Windows.Forms.Button() + Me.cmdOptions = New System.Windows.Forms.Button() Me.SuspendLayout() ' - 'lstAvailableVariable - ' - ' 'btnAdd ' Me.btnAdd.Location = New System.Drawing.Point(124, 33) @@ -36,32 +33,32 @@ Partial Class ucrSelectorAddRemove Me.btnAdd.Text = "Add" Me.btnAdd.UseVisualStyleBackColor = True ' - 'btnRemove + 'cmdOptions ' - Me.btnRemove.Location = New System.Drawing.Point(123, 72) - Me.btnRemove.Name = "btnRemove" - Me.btnRemove.Size = New System.Drawing.Size(75, 23) - Me.btnRemove.TabIndex = 84 - Me.btnRemove.Tag = "Remove" - Me.btnRemove.Text = "Remove" - Me.btnRemove.UseVisualStyleBackColor = True + Me.cmdOptions.Location = New System.Drawing.Point(123, 72) + Me.cmdOptions.Name = "cmdOptions" + Me.cmdOptions.Size = New System.Drawing.Size(75, 23) + Me.cmdOptions.TabIndex = 84 + Me.cmdOptions.Tag = "Options" + Me.cmdOptions.Text = "Options" + Me.cmdOptions.UseVisualStyleBackColor = True ' 'ucrSelectorAddRemove ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) - Me.Controls.Add(Me.btnRemove) + Me.Controls.Add(Me.cmdOptions) Me.Controls.Add(Me.btnAdd) Me.Name = "ucrSelectorAddRemove" Me.Size = New System.Drawing.Size(203, 127) Me.Controls.SetChildIndex(Me.lblVariables, 0) Me.Controls.SetChildIndex(Me.lstAvailableVariable, 0) Me.Controls.SetChildIndex(Me.btnAdd, 0) - Me.Controls.SetChildIndex(Me.btnRemove, 0) + Me.Controls.SetChildIndex(Me.cmdOptions, 0) Me.ResumeLayout(False) Me.PerformLayout() End Sub Friend WithEvents btnAdd As Button - Friend WithEvents btnRemove As Button + Friend WithEvents cmdOptions As Button End Class diff --git a/instat/ucrSelectorAddRemove.vb b/instat/ucrSelectorAddRemove.vb index 71cb55fca0b..a250f79c564 100644 --- a/instat/ucrSelectorAddRemove.vb +++ b/instat/ucrSelectorAddRemove.vb @@ -1,10 +1,13 @@ -Public Class ucrSelectorAddRemove + + +Public Class ucrSelectorAddRemove Private Sub btnAdd_Click(sender As Object, e As EventArgs) Handles btnAdd.Click Add() End Sub - Private Sub btnRemove_Click(sender As Object, e As EventArgs) Handles btnRemove.Click - Remove() + Private Sub cmdOptions_Click(sender As Object, e As EventArgs) Handles cmdOptions.Click + 'call + ShowOptionsDialog() End Sub Private Sub ucrSelectorAddRemove_Load(sender As Object, e As EventArgs) Handles MyBase.Load diff --git a/instat/ucrSelectorByDataFrameAddRemove.vb b/instat/ucrSelectorByDataFrameAddRemove.vb index 7e897f9299d..a346636d8c5 100644 --- a/instat/ucrSelectorByDataFrameAddRemove.vb +++ b/instat/ucrSelectorByDataFrameAddRemove.vb @@ -2,8 +2,4 @@ Private Sub btnAdd_Click(sender As Object, e As EventArgs) Handles btnAdd.Click Add() End Sub - - Private Sub btnRemove_Click(sender As Object, e As EventArgs) Handles btnRemove.Click - Remove() - End Sub End Class