From bb1406ff6800a76d6de68da6835fdc7b5fabd9c3 Mon Sep 17 00:00:00 2001 From: deaspo Date: Tue, 19 Jan 2016 21:32:41 +0300 Subject: [PATCH] Added the subset and data merge dialog. Their entrie in the form main and also moved log, script, variable and metadata to windows menu. --- instat/dlgMerge.Designer.vb | 29 ++++++++ instat/dlgMerge.vb | 3 + instat/dlgSubset.Designer.vb | 29 ++++++++ instat/dlgSubset.vb | 3 + instat/frmMain.Designer.vb | 133 +++++++++++++++++++---------------- instat/frmMain.vb | 102 ++++++++++----------------- instat/instat.vbproj | 12 ++++ 7 files changed, 187 insertions(+), 124 deletions(-) create mode 100644 instat/dlgMerge.Designer.vb create mode 100644 instat/dlgMerge.vb create mode 100644 instat/dlgSubset.Designer.vb create mode 100644 instat/dlgSubset.vb diff --git a/instat/dlgMerge.Designer.vb b/instat/dlgMerge.Designer.vb new file mode 100644 index 00000000000..5cca7d7f57d --- /dev/null +++ b/instat/dlgMerge.Designer.vb @@ -0,0 +1,29 @@ + _ +Partial Class dlgMerge + 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() + components = New System.ComponentModel.Container + Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.Text = "dlgMerge" + End Sub +End Class diff --git a/instat/dlgMerge.vb b/instat/dlgMerge.vb new file mode 100644 index 00000000000..c364b2ee991 --- /dev/null +++ b/instat/dlgMerge.vb @@ -0,0 +1,3 @@ +Public Class dlgMerge + +End Class \ No newline at end of file diff --git a/instat/dlgSubset.Designer.vb b/instat/dlgSubset.Designer.vb new file mode 100644 index 00000000000..bc587272a91 --- /dev/null +++ b/instat/dlgSubset.Designer.vb @@ -0,0 +1,29 @@ + _ +Partial Class dlgSubset + 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() + components = New System.ComponentModel.Container + Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.Text = "dlgSubset" + End Sub +End Class diff --git a/instat/dlgSubset.vb b/instat/dlgSubset.vb new file mode 100644 index 00000000000..6541439f53d --- /dev/null +++ b/instat/dlgSubset.vb @@ -0,0 +1,3 @@ +Public Class dlgSubset + +End Class \ No newline at end of file diff --git a/instat/frmMain.Designer.vb b/instat/frmMain.Designer.vb index 463c8308de1..02892f4da39 100644 --- a/instat/frmMain.Designer.vb +++ b/instat/frmMain.Designer.vb @@ -1,9 +1,9 @@ - _ + Partial Class frmMain Inherits System.Windows.Forms.Form 'Form overrides dispose to clean up the component list. - _ + Protected Overrides Sub Dispose(ByVal disposing As Boolean) Try If disposing AndAlso components IsNot Nothing Then @@ -20,7 +20,7 @@ Partial Class frmMain '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() Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmMain)) Me.ToolStripSeparator12 = New System.Windows.Forms.ToolStripSeparator() @@ -111,7 +111,10 @@ Partial Class frmMain Me.SpellLengthToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.TotalsToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.WindowToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() - Me.LogWindowMenu = New System.Windows.Forms.ToolStripMenuItem() + Me.mnuWindowVariable = New System.Windows.Forms.ToolStripMenuItem() + Me.mnuWindowDataFrame = New System.Windows.Forms.ToolStripMenuItem() + Me.LogToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.ScriptToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.HelpToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.OpenFile = New System.Windows.Forms.OpenFileDialog() Me.ToolStripSeparator16 = New System.Windows.Forms.ToolStripSeparator() @@ -134,7 +137,6 @@ Partial Class frmMain Me.StartOfTheRainsToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.ExtremesToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.mnuEndofRains = New System.Windows.Forms.ToolStripMenuItem() - Me.mnuManageWorksheetInformation = New System.Windows.Forms.ToolStripMenuItem() Me.LockUnlockToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.mnuFileIEODBC = New System.Windows.Forms.ToolStripMenuItem() Me.mnuFileIEOutput = New System.Windows.Forms.ToolStripMenuItem() @@ -235,6 +237,8 @@ Partial Class frmMain Me.DisplayToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.ClearRemoveToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.DeleteRowsToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.mnuManageSubset = New System.Windows.Forms.ToolStripMenuItem() + Me.mnuManageDataMerge = New System.Windows.Forms.ToolStripMenuItem() Me.FactorToolStripMenuItem1 = New System.Windows.Forms.ToolStripMenuItem() Me.ManipulateToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.TransformToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() @@ -244,20 +248,18 @@ Partial Class frmMain Me.InteractionsToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.IndicatorVariablesToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.PolynomialsToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() - Me.ReshapeToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.mnuManageReshapeSubset = New System.Windows.Forms.ToolStripMenuItem() Me.StacksToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.UnstackToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.SelectToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.SelectSndStackToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.ExpandToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.SubsetToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.ColumnPropertiesToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.FactorToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.NameToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.FormatCtrlDToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.AlignmentToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() - Me.mnuManageScriptWindow = New System.Windows.Forms.ToolStripMenuItem() - Me.mnuManageLogWindow = New System.Windows.Forms.ToolStripMenuItem() - Me.mnuManageWorksheetMetadata = New System.Windows.Forms.ToolStripMenuItem() Me.KiswahiliToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.KiswahiliToolStripMenuItem1 = New System.Windows.Forms.ToolStripMenuItem() Me.EnglishToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() @@ -480,7 +482,7 @@ Partial Class frmMain 'ResizeWorksheetToolStripMenuItem ' Me.ResizeWorksheetToolStripMenuItem.Name = "ResizeWorksheetToolStripMenuItem" - Me.ResizeWorksheetToolStripMenuItem.Size = New System.Drawing.Size(205, 22) + Me.ResizeWorksheetToolStripMenuItem.Size = New System.Drawing.Size(174, 22) Me.ResizeWorksheetToolStripMenuItem.Tag = "Resize_Worksheet" Me.ResizeWorksheetToolStripMenuItem.Text = "Resize Worksheet..." ' @@ -863,17 +865,35 @@ Partial Class frmMain ' 'WindowToolStripMenuItem ' - Me.WindowToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.LogWindowMenu}) + Me.WindowToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuWindowVariable, Me.mnuWindowDataFrame, Me.LogToolStripMenuItem, Me.ScriptToolStripMenuItem}) Me.WindowToolStripMenuItem.Name = "WindowToolStripMenuItem" Me.WindowToolStripMenuItem.Size = New System.Drawing.Size(63, 20) Me.WindowToolStripMenuItem.Tag = "Window" Me.WindowToolStripMenuItem.Text = "Window" ' - 'LogWindowMenu + 'mnuWindowVariable ' - Me.LogWindowMenu.Name = "LogWindowMenu" - Me.LogWindowMenu.Size = New System.Drawing.Size(152, 22) - Me.LogWindowMenu.Text = "Log Window" + Me.mnuWindowVariable.Name = "mnuWindowVariable" + Me.mnuWindowVariable.Size = New System.Drawing.Size(220, 22) + Me.mnuWindowVariable.Text = "Variable (column) Metadata" + ' + 'mnuWindowDataFrame + ' + Me.mnuWindowDataFrame.Name = "mnuWindowDataFrame" + Me.mnuWindowDataFrame.Size = New System.Drawing.Size(214, 22) + Me.mnuWindowDataFrame.Text = "Data frame Metadata" + ' + 'LogToolStripMenuItem + ' + Me.LogToolStripMenuItem.Name = "LogToolStripMenuItem" + Me.LogToolStripMenuItem.Size = New System.Drawing.Size(214, 22) + Me.LogToolStripMenuItem.Text = "Log" + ' + 'ScriptToolStripMenuItem + ' + Me.ScriptToolStripMenuItem.Name = "ScriptToolStripMenuItem" + Me.ScriptToolStripMenuItem.Size = New System.Drawing.Size(214, 22) + Me.ScriptToolStripMenuItem.Text = "Script" ' 'HelpToolStripMenuItem ' @@ -1001,13 +1021,6 @@ Partial Class frmMain Me.mnuEndofRains.Size = New System.Drawing.Size(172, 22) Me.mnuEndofRains.Text = "End of the Rains" ' - 'mnuManageWorksheetInformation - ' - Me.mnuManageWorksheetInformation.Name = "mnuManageWorksheetInformation" - Me.mnuManageWorksheetInformation.Size = New System.Drawing.Size(220, 22) - Me.mnuManageWorksheetInformation.Tag = "Worksheet_Information" - Me.mnuManageWorksheetInformation.Text = "Variable (coulmn) Metadata" - ' 'LockUnlockToolStripMenuItem ' Me.LockUnlockToolStripMenuItem.Name = "LockUnlockToolStripMenuItem" @@ -1704,7 +1717,7 @@ Partial Class frmMain ' 'ManageToolStripMenuItem ' - Me.ManageToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuCalculations, Me.DataToolStripMenuItem, Me.FactorToolStripMenuItem1, Me.ManipulateToolStripMenuItem, Me.ReshapeToolStripMenuItem, Me.ColumnPropertiesToolStripMenuItem, Me.mnuManageScriptWindow, Me.mnuManageLogWindow, Me.ResizeWorksheetToolStripMenuItem, Me.mnuManageWorksheetInformation, Me.mnuManageWorksheetMetadata}) + Me.ManageToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuCalculations, Me.DataToolStripMenuItem, Me.FactorToolStripMenuItem1, Me.ManipulateToolStripMenuItem, Me.mnuManageReshapeSubset, Me.ColumnPropertiesToolStripMenuItem, Me.ResizeWorksheetToolStripMenuItem}) Me.ManageToolStripMenuItem.Name = "ManageToolStripMenuItem" Me.ManageToolStripMenuItem.Size = New System.Drawing.Size(62, 20) Me.ManageToolStripMenuItem.Tag = "Manage" @@ -1713,15 +1726,15 @@ Partial Class frmMain 'mnuCalculations ' Me.mnuCalculations.Name = "mnuCalculations" - Me.mnuCalculations.Size = New System.Drawing.Size(205, 22) + Me.mnuCalculations.Size = New System.Drawing.Size(174, 22) Me.mnuCalculations.Tag = "Calculations" Me.mnuCalculations.Text = "Calculations..." ' 'DataToolStripMenuItem ' - Me.DataToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.RegularSequenceToolStripMenuItem, Me.EnterToolStripMenuItem, Me.DuplicatecopyColumnsToolStripMenuItem, Me.RandomSamplesToolStripMenuItem, Me.DisplayToolStripMenuItem, Me.ClearRemoveToolStripMenuItem, Me.DeleteRowsToolStripMenuItem}) + Me.DataToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.RegularSequenceToolStripMenuItem, Me.EnterToolStripMenuItem, Me.DuplicatecopyColumnsToolStripMenuItem, Me.RandomSamplesToolStripMenuItem, Me.DisplayToolStripMenuItem, Me.ClearRemoveToolStripMenuItem, Me.DeleteRowsToolStripMenuItem, Me.mnuManageSubset, Me.mnuManageDataMerge}) Me.DataToolStripMenuItem.Name = "DataToolStripMenuItem" - Me.DataToolStripMenuItem.Size = New System.Drawing.Size(205, 22) + Me.DataToolStripMenuItem.Size = New System.Drawing.Size(174, 22) Me.DataToolStripMenuItem.Tag = "Data" Me.DataToolStripMenuItem.Text = "Data" ' @@ -1773,17 +1786,29 @@ Partial Class frmMain Me.DeleteRowsToolStripMenuItem.Size = New System.Drawing.Size(219, 22) Me.DeleteRowsToolStripMenuItem.Text = "Delete rows" ' + 'mnuManageSubset + ' + Me.mnuManageSubset.Name = "mnuManageSubset" + Me.mnuManageSubset.Size = New System.Drawing.Size(219, 22) + Me.mnuManageSubset.Text = "Subset" + ' + 'mnuManageDataMerge + ' + Me.mnuManageDataMerge.Name = "mnuManageDataMerge" + Me.mnuManageDataMerge.Size = New System.Drawing.Size(219, 22) + Me.mnuManageDataMerge.Text = "Data Merge" + ' 'FactorToolStripMenuItem1 ' Me.FactorToolStripMenuItem1.Name = "FactorToolStripMenuItem1" - Me.FactorToolStripMenuItem1.Size = New System.Drawing.Size(205, 22) + Me.FactorToolStripMenuItem1.Size = New System.Drawing.Size(174, 22) Me.FactorToolStripMenuItem1.Text = "Factor" ' 'ManipulateToolStripMenuItem ' Me.ManipulateToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.TransformToolStripMenuItem, Me.RecodeToolStripMenuItem, Me.mnuManageDataSort, Me.mnuManageManipulateRowStat, Me.InteractionsToolStripMenuItem, Me.IndicatorVariablesToolStripMenuItem, Me.PolynomialsToolStripMenuItem}) Me.ManipulateToolStripMenuItem.Name = "ManipulateToolStripMenuItem" - Me.ManipulateToolStripMenuItem.Size = New System.Drawing.Size(205, 22) + Me.ManipulateToolStripMenuItem.Size = New System.Drawing.Size(174, 22) Me.ManipulateToolStripMenuItem.Tag = "Manipulate" Me.ManipulateToolStripMenuItem.Text = "Manipulate" ' @@ -1835,13 +1860,13 @@ Partial Class frmMain Me.PolynomialsToolStripMenuItem.Size = New System.Drawing.Size(179, 22) Me.PolynomialsToolStripMenuItem.Text = "Polynomials" ' - 'ReshapeToolStripMenuItem + 'mnuManageReshapeSubset ' - Me.ReshapeToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.StacksToolStripMenuItem, Me.UnstackToolStripMenuItem, Me.SelectToolStripMenuItem, Me.SelectSndStackToolStripMenuItem, Me.ExpandToolStripMenuItem}) - Me.ReshapeToolStripMenuItem.Name = "ReshapeToolStripMenuItem" - Me.ReshapeToolStripMenuItem.Size = New System.Drawing.Size(205, 22) - Me.ReshapeToolStripMenuItem.Tag = "Reshape" - Me.ReshapeToolStripMenuItem.Text = "Reshape" + Me.mnuManageReshapeSubset.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.StacksToolStripMenuItem, Me.UnstackToolStripMenuItem, Me.SelectToolStripMenuItem, Me.SelectSndStackToolStripMenuItem, Me.ExpandToolStripMenuItem, Me.SubsetToolStripMenuItem}) + Me.mnuManageReshapeSubset.Name = "mnuManageReshapeSubset" + Me.mnuManageReshapeSubset.Size = New System.Drawing.Size(174, 22) + Me.mnuManageReshapeSubset.Tag = "Reshape" + Me.mnuManageReshapeSubset.Text = "Reshape" ' 'StacksToolStripMenuItem ' @@ -1878,11 +1903,17 @@ Partial Class frmMain Me.ExpandToolStripMenuItem.Tag = "Expand" Me.ExpandToolStripMenuItem.Text = "Expand..." ' + 'SubsetToolStripMenuItem + ' + Me.SubsetToolStripMenuItem.Name = "SubsetToolStripMenuItem" + Me.SubsetToolStripMenuItem.Size = New System.Drawing.Size(167, 22) + Me.SubsetToolStripMenuItem.Text = "Subset" + ' 'ColumnPropertiesToolStripMenuItem ' Me.ColumnPropertiesToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.FactorToolStripMenuItem, Me.NameToolStripMenuItem, Me.FormatCtrlDToolStripMenuItem, Me.AlignmentToolStripMenuItem, Me.LockUnlockToolStripMenuItem}) Me.ColumnPropertiesToolStripMenuItem.Name = "ColumnPropertiesToolStripMenuItem" - Me.ColumnPropertiesToolStripMenuItem.Size = New System.Drawing.Size(205, 22) + Me.ColumnPropertiesToolStripMenuItem.Size = New System.Drawing.Size(174, 22) Me.ColumnPropertiesToolStripMenuItem.Tag = "Column_Properties" Me.ColumnPropertiesToolStripMenuItem.Text = "Column Properties" ' @@ -1910,24 +1941,6 @@ Partial Class frmMain Me.AlignmentToolStripMenuItem.Size = New System.Drawing.Size(168, 22) Me.AlignmentToolStripMenuItem.Text = "Alignment..." ' - 'mnuManageScriptWindow - ' - Me.mnuManageScriptWindow.Name = "mnuManageScriptWindow" - Me.mnuManageScriptWindow.Size = New System.Drawing.Size(205, 22) - Me.mnuManageScriptWindow.Text = "Script Window" - ' - 'mnuManageLogWindow - ' - Me.mnuManageLogWindow.Name = "mnuManageLogWindow" - Me.mnuManageLogWindow.Size = New System.Drawing.Size(205, 22) - Me.mnuManageLogWindow.Text = "Log Window" - ' - 'mnuManageWorksheetMetadata - ' - Me.mnuManageWorksheetMetadata.Name = "mnuManageWorksheetMetadata" - Me.mnuManageWorksheetMetadata.Size = New System.Drawing.Size(205, 22) - Me.mnuManageWorksheetMetadata.Text = "Data frame Metadata" - ' 'KiswahiliToolStripMenuItem ' Me.KiswahiliToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.KiswahiliToolStripMenuItem1, Me.EnglishToolStripMenuItem, Me.FrenchToolStripMenuItem}) @@ -2318,7 +2331,6 @@ Partial Class frmMain Friend WithEvents EventsToolStripMenuItem As ToolStripMenuItem Friend WithEvents StartOfTheRainsToolStripMenuItem As ToolStripMenuItem Friend WithEvents ExtremesToolStripMenuItem As ToolStripMenuItem - Friend WithEvents mnuManageWorksheetInformation As ToolStripMenuItem Friend WithEvents LockUnlockToolStripMenuItem As ToolStripMenuItem Friend WithEvents mnuFileIEODBC As ToolStripMenuItem Friend WithEvents mnuFileIEOutput As ToolStripMenuItem @@ -2417,7 +2429,7 @@ Partial Class frmMain Friend WithEvents RandomSamplesToolStripMenuItem As ToolStripMenuItem Friend WithEvents DisplayToolStripMenuItem As ToolStripMenuItem Friend WithEvents ClearRemoveToolStripMenuItem As ToolStripMenuItem - Friend WithEvents ReshapeToolStripMenuItem As ToolStripMenuItem + Friend WithEvents mnuManageReshapeSubset As ToolStripMenuItem Friend WithEvents StacksToolStripMenuItem As ToolStripMenuItem Friend WithEvents UnstackToolStripMenuItem As ToolStripMenuItem Friend WithEvents SelectToolStripMenuItem As ToolStripMenuItem @@ -2432,7 +2444,6 @@ Partial Class frmMain Friend WithEvents KiswahiliToolStripMenuItem1 As ToolStripMenuItem Friend WithEvents EnglishToolStripMenuItem As ToolStripMenuItem Friend WithEvents FrenchToolStripMenuItem As ToolStripMenuItem - Friend WithEvents LogWindowMenu As ToolStripMenuItem Friend WithEvents mnuEndofRains As ToolStripMenuItem Friend WithEvents mnuGraphicsInventory As ToolStripMenuItem Friend WithEvents mnuClimateMethods As ToolStripMenuItem @@ -2449,9 +2460,6 @@ Partial Class frmMain Friend WithEvents mnuClimateMethodsGraphicsTimeseries As ToolStripMenuItem Friend WithEvents mnuClimateMethodsGraphicsWindrose As ToolStripMenuItem Friend WithEvents mnuClimateMethodsGraphicsMultipleLines As ToolStripMenuItem - Friend WithEvents mnuManageScriptWindow As ToolStripMenuItem - Friend WithEvents mnuManageLogWindow As ToolStripMenuItem - Friend WithEvents mnuManageWorksheetMetadata As ToolStripMenuItem Friend WithEvents DataManipulationToolStripMenuItem As ToolStripMenuItem Friend WithEvents StartOfRainToolStripMenuItem As ToolStripMenuItem Friend WithEvents EndOfRainToolStripMenuItem As ToolStripMenuItem @@ -2489,4 +2497,11 @@ Partial Class frmMain Friend WithEvents PolynomialsToolStripMenuItem As ToolStripMenuItem Friend WithEvents ProbabilityDistributionsToolStripMenuItem As ToolStripMenuItem Friend WithEvents mnuFileOptions As ToolStripMenuItem + Friend WithEvents mnuManageSubset As ToolStripMenuItem + Friend WithEvents mnuManageDataMerge As ToolStripMenuItem + Friend WithEvents SubsetToolStripMenuItem As ToolStripMenuItem + Friend WithEvents mnuWindowVariable As ToolStripMenuItem + Friend WithEvents mnuWindowDataFrame As ToolStripMenuItem + Friend WithEvents LogToolStripMenuItem As ToolStripMenuItem + Friend WithEvents ScriptToolStripMenuItem As ToolStripMenuItem End Class diff --git a/instat/frmMain.vb b/instat/frmMain.vb index c17bd4f5454..56226207cb6 100644 --- a/instat/frmMain.vb +++ b/instat/frmMain.vb @@ -64,14 +64,6 @@ Public Class frmMain dlgDescriptiveStatistics.ShowDialog() End Sub - Private Sub SortToolStripMenuItem_Click(sender As Object, e As EventArgs) - dlgSort.ShowDialog() - End Sub - - Private Sub mnuSriptLog_Click(sender As Object, e As EventArgs) - frmLog.ShowDialog() - End Sub - Private Sub KiswahiliToolStripMenuItem1_Click(sender As Object, e As EventArgs) Handles KiswahiliToolStripMenuItem1.Click Thread.CurrentThread.CurrentCulture = New CultureInfo("sw-KE") Thread.CurrentThread.CurrentUICulture = New CultureInfo("sw-KE") @@ -98,14 +90,6 @@ Public Class frmMain dlgFileNew.ShowDialog() End Sub - Private Sub LogWindowMenu_Click(sender As Object, e As EventArgs) Handles LogWindowMenu.Click - If frmLog.Visible = True Then - frmLog.Visible = False - Else - frmLog.Visible = True - End If - End Sub - Private Sub StartOfTheRainsToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles StartOfTheRainsToolStripMenuItem.Click dlgStartofRains.ShowDialog() End Sub @@ -198,46 +182,6 @@ Public Class frmMain dlgYearRaincount.ShowDialog() End Sub - Private Sub mnuWindowMetadata_Click(sender As Object, e As EventArgs) - frmMetaData.Show() - End Sub - - Private Sub mnuWindowVariables_Click(sender As Object, e As EventArgs) - frmVariables.Show() - End Sub - - Private Sub mnuManageWorksheetInformation_Click(sender As Object, e As EventArgs) Handles mnuManageWorksheetInformation.Click - If frmVariables.Visible = True Then - frmVariables.Visible = False - Else - frmVariables.Visible = True - End If - End Sub - - Private Sub mnuManageLogWindow_Click(sender As Object, e As EventArgs) Handles mnuManageLogWindow.Click - If frmLog.Visible = True Then - frmLog.Visible = False - Else - frmLog.Visible = True - End If - End Sub - - Private Sub mnuManageScriptWindow_Click(sender As Object, e As EventArgs) Handles mnuManageScriptWindow.Click - If frmScript.Visible = True Then - frmScript.Visible = False - Else - frmScript.Visible = True - End If - End Sub - - Private Sub mnuManageWorksheetMetadata_Click(sender As Object, e As EventArgs) Handles mnuManageWorksheetMetadata.Click - If frmMetaData.Visible = True Then - frmMetaData.Visible = False - Else - frmMetaData.Visible = True - End If - End Sub - Private Sub mnuClmateMethodThreeSummaries_Click(sender As Object, e As EventArgs) Handles mnuClmateMethodThreeSummaries.Click dlgThreeSummaries.ShowDialog() End Sub @@ -323,10 +267,6 @@ Public Class frmMain 'dlgOneWayAnova.ShowDialog() End Sub - Private Sub mnuStatsNonParametricTwoWayAnova_Click(sender As Object, e As EventArgs) - dlgTwoWayAnova.ShowDialog() - End Sub - Private Sub mnuStatsSummaryColumnStat_Click(sender As Object, e As EventArgs) Handles mnuStatsSummaryColumnStat.Click dlgColumnStats.ShowDialog() End Sub @@ -709,10 +649,6 @@ Public Class frmMain Return New KeyValuePair(Of String, String)("", "") End Function - Private Sub mnuFileClose_Click(sender As Object, e As EventArgs) Handles mnuFileClose.Click - - End Sub - Private Sub mnuFileOpenFromLibrary_Click(sender As Object, e As EventArgs) Handles mnuFileOpenFromLibrary.Click 'TODO decide what Open From Library does and edit below 'Dim kvpFile As KeyValuePair(Of String, String) @@ -725,7 +661,7 @@ Public Class frmMain 'clsGrids.UpdateGrids() End Sub - Private Sub mnuManageDataSubset_Click(sender As Object, e As EventArgs) Handles mnuManageDataSubset.Click + Private Sub mnuManageDataSubset_Click(sender As Object, e As EventArgs) Handles mnuManageSubset.Click dlgSubset.ShowDialog() End Sub @@ -736,4 +672,40 @@ Public Class frmMain Private Sub mnuManageDataMerge_Click(sender As Object, e As EventArgs) Handles mnuManageDataMerge.Click dlgMerge.ShowDialog() End Sub + + Private Sub mnuWindowVariable_Click(sender As Object, e As EventArgs) Handles mnuWindowVariable.Click + If frmVariables.Visible = True Then + frmVariables.Visible = False + Else + frmVariables.Visible = True + End If + End Sub + + Private Sub mnuWindowDataFrame_Click(sender As Object, e As EventArgs) Handles mnuWindowDataFrame.Click + If frmMetaData.Visible = True Then + frmMetaData.Visible = False + Else + frmMetaData.Visible = True + End If + End Sub + + Private Sub LogToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles LogToolStripMenuItem.Click + If frmLog.Visible = True Then + frmLog.Visible = False + Else + frmLog.Visible = True + End If + End Sub + + Private Sub ScriptToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles ScriptToolStripMenuItem.Click + If frmScript.Visible = True Then + frmScript.Visible = False + Else + frmScript.Visible = True + End If + End Sub + + Private Sub SubsetToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles SubsetToolStripMenuItem.Click + dlgSubset.ShowDialog() + End Sub End Class \ No newline at end of file diff --git a/instat/instat.vbproj b/instat/instat.vbproj index 456b8c82a18..6923fff2a52 100644 --- a/instat/instat.vbproj +++ b/instat/instat.vbproj @@ -503,6 +503,12 @@ Form + + dlgMerge.vb + + + Form + dlgMissingData.vb @@ -779,6 +785,12 @@ Form + + dlgSubset.vb + + + Form + dlgSummary.vb