diff --git a/instat/frmMain.Designer.vb b/instat/frmMain.Designer.vb index e2e8af70ebc..a63167df3fd 100644 --- a/instat/frmMain.Designer.vb +++ b/instat/frmMain.Designer.vb @@ -48,18 +48,13 @@ Partial Class frmMain Me.ToolStripSeparator33 = New System.Windows.Forms.ToolStripSeparator() Me.mnuDescribeOneVariableFrequencies = New System.Windows.Forms.ToolStripMenuItem() Me.mnuDescribeOneVariableRatingData = New System.Windows.Forms.ToolStripMenuItem() - Me.mnuDescribeTwoVariables = New System.Windows.Forms.ToolStripMenuItem() + Me.mnuDescribeTwoThreeVariables = New System.Windows.Forms.ToolStripMenuItem() Me.mnuDescribeTwoVariablesSummarise = New System.Windows.Forms.ToolStripMenuItem() Me.mnuDescribeTwoVariablesGraph = New System.Windows.Forms.ToolStripMenuItem() Me.ToolStripSeparator34 = New System.Windows.Forms.ToolStripSeparator() + Me.mnuDescribeTwoThreeVariablesCorrelations = New System.Windows.Forms.ToolStripMenuItem() Me.mnuDescribeTwoVariablesFrequencies = New System.Windows.Forms.ToolStripMenuItem() Me.mnuDescribeTwoVariablesPivotTable = New System.Windows.Forms.ToolStripMenuItem() - Me.mnuDescribeThreeVariable = New System.Windows.Forms.ToolStripMenuItem() - Me.mnuDescribeThreeVariableSummarise = New System.Windows.Forms.ToolStripMenuItem() - Me.mnuDescribeThreeVariableGraph = New System.Windows.Forms.ToolStripMenuItem() - Me.ToolStripSeparator36 = New System.Windows.Forms.ToolStripSeparator() - Me.mnuDescribeThreeVariableFrequencies = New System.Windows.Forms.ToolStripMenuItem() - Me.mnuDescribeThreeVariablePivotTable = New System.Windows.Forms.ToolStripMenuItem() Me.mnuDescribeSpecificTablesGraphs = New System.Windows.Forms.ToolStripMenuItem() Me.mnuDescribeSpecificFrequency = New System.Windows.Forms.ToolStripMenuItem() Me.mnuDescribeSpecificSummary = New System.Windows.Forms.ToolStripMenuItem() @@ -208,7 +203,7 @@ Partial Class frmMain Me.mnuClimaticTidyandExamineTidyDailyData = New System.Windows.Forms.ToolStripMenuItem() Me.mnuClimaticTidyandExamineNonNumericCases = New System.Windows.Forms.ToolStripMenuItem() Me.mnuClimaticTidyandExamineReplaceValues = New System.Windows.Forms.ToolStripMenuItem() - Me.mnuClimaticTidyandExamineDuplicates = New System.Windows.Forms.ToolStripMenuItem() + Me.mnuClimaticTidyandExamineDuplicateRows = New System.Windows.Forms.ToolStripMenuItem() Me.ToolStripSeparator54 = New System.Windows.Forms.ToolStripSeparator() Me.mnuClimaticTidyandExamineStack = New System.Windows.Forms.ToolStripMenuItem() Me.mnuClimaticTidyandExamineUnstack = New System.Windows.Forms.ToolStripMenuItem() @@ -439,7 +434,7 @@ Partial Class frmMain Me.mnuPrepareDataFrameRowNumbersNames = New System.Windows.Forms.ToolStripMenuItem() Me.ToolStripSeparator1 = New System.Windows.Forms.ToolStripSeparator() Me.mnuPrepareDataFrameSort = New System.Windows.Forms.ToolStripMenuItem() - Me.mnuPrepareDataFrameFilter = New System.Windows.Forms.ToolStripMenuItem() + Me.mnuPrepareDataFrameFilterRows = New System.Windows.Forms.ToolStripMenuItem() Me.mnuPrepareDataFrameSelectColumns = New System.Windows.Forms.ToolStripMenuItem() Me.mnuPrepareDataFrameReplaceValues = New System.Windows.Forms.ToolStripMenuItem() Me.mnuPrepareDataFrameConvertColumns = New System.Windows.Forms.ToolStripMenuItem() @@ -628,7 +623,7 @@ Partial Class frmMain Me.mnuProcurementUseCRISummariseCRIbyCountry = New System.Windows.Forms.ToolStripMenuItem() Me.mnuOptionsByContext = New System.Windows.Forms.ToolStripMenuItem() Me.mnuOptionsByContextCheckData = New System.Windows.Forms.ToolStripMenuItem() - Me.mnuOptionsByContextCheckDataDuplicates = New System.Windows.Forms.ToolStripMenuItem() + Me.mnuOptionsByContextCheckDataDuplicateRows = New System.Windows.Forms.ToolStripMenuItem() Me.mnuOptionsByContextCheckDataCompareColumns = New System.Windows.Forms.ToolStripMenuItem() Me.ToolStripSeparator47 = New System.Windows.Forms.ToolStripSeparator() Me.mnuOptionsByContextCheckDataOneVariableSummarise = New System.Windows.Forms.ToolStripMenuItem() @@ -705,7 +700,7 @@ Partial Class frmMain ' 'mnuDescribe ' - Me.mnuDescribe.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuDescribeOneVariable, Me.mnuDescribeTwoVariables, Me.mnuDescribeThreeVariable, Me.mnuDescribeSpecificTablesGraphs, Me.mnuDescribeGeneral, Me.ToolStripSeparator9, Me.mnuDescribeMultivariate, Me.ToolStripSeparator13, Me.mnuDescribeUseGraph, Me.mnuDescribeCombineGraph, Me.mnuDescribeThemes, Me.mnuDescribeViewGraph}) + Me.mnuDescribe.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuDescribeOneVariable, Me.mnuDescribeTwoThreeVariables, Me.mnuDescribeSpecificTablesGraphs, Me.mnuDescribeGeneral, Me.ToolStripSeparator9, Me.mnuDescribeMultivariate, Me.ToolStripSeparator13, Me.mnuDescribeUseGraph, Me.mnuDescribeCombineGraph, Me.mnuDescribeThemes, Me.mnuDescribeViewGraph}) Me.mnuDescribe.Name = "mnuDescribe" Me.mnuDescribe.Size = New System.Drawing.Size(64, 20) Me.mnuDescribe.Tag = "Describe" @@ -761,85 +756,53 @@ Partial Class frmMain Me.mnuDescribeOneVariableRatingData.Size = New System.Drawing.Size(155, 22) Me.mnuDescribeOneVariableRatingData.Text = "Rating Data..." ' - 'mnuDescribeTwoVariables + 'mnuDescribeTwoThreeVariables ' - Me.mnuDescribeTwoVariables.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuDescribeTwoVariablesSummarise, Me.mnuDescribeTwoVariablesGraph, Me.ToolStripSeparator34, Me.mnuDescribeTwoVariablesFrequencies, Me.mnuDescribeTwoVariablesPivotTable}) - Me.mnuDescribeTwoVariables.Name = "mnuDescribeTwoVariables" - Me.mnuDescribeTwoVariables.Size = New System.Drawing.Size(192, 22) - Me.mnuDescribeTwoVariables.Tag = "Two_Variables" - Me.mnuDescribeTwoVariables.Text = "Two Variables" + Me.mnuDescribeTwoThreeVariables.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuDescribeTwoVariablesSummarise, Me.mnuDescribeTwoVariablesGraph, Me.ToolStripSeparator34, Me.mnuDescribeTwoThreeVariablesCorrelations, Me.mnuDescribeTwoVariablesFrequencies, Me.mnuDescribeTwoVariablesPivotTable}) + Me.mnuDescribeTwoThreeVariables.Name = "mnuDescribeTwoThreeVariables" + Me.mnuDescribeTwoThreeVariables.Size = New System.Drawing.Size(192, 22) + Me.mnuDescribeTwoThreeVariables.Tag = "Two_Variables" + Me.mnuDescribeTwoThreeVariables.Text = "Two/Three Variables" ' 'mnuDescribeTwoVariablesSummarise ' Me.mnuDescribeTwoVariablesSummarise.DoubleClickEnabled = True Me.mnuDescribeTwoVariablesSummarise.Name = "mnuDescribeTwoVariablesSummarise" - Me.mnuDescribeTwoVariablesSummarise.Size = New System.Drawing.Size(146, 22) + Me.mnuDescribeTwoVariablesSummarise.Size = New System.Drawing.Size(180, 22) Me.mnuDescribeTwoVariablesSummarise.Tag = "Summarise..." Me.mnuDescribeTwoVariablesSummarise.Text = "Summarise..." ' 'mnuDescribeTwoVariablesGraph ' Me.mnuDescribeTwoVariablesGraph.Name = "mnuDescribeTwoVariablesGraph" - Me.mnuDescribeTwoVariablesGraph.Size = New System.Drawing.Size(146, 22) + Me.mnuDescribeTwoVariablesGraph.Size = New System.Drawing.Size(180, 22) Me.mnuDescribeTwoVariablesGraph.Tag = "Graph..." Me.mnuDescribeTwoVariablesGraph.Text = "Graph..." ' 'ToolStripSeparator34 ' Me.ToolStripSeparator34.Name = "ToolStripSeparator34" - Me.ToolStripSeparator34.Size = New System.Drawing.Size(143, 6) + Me.ToolStripSeparator34.Size = New System.Drawing.Size(177, 6) + ' + 'mnuDescribeTwoThreeVariablesCorrelations + ' + Me.mnuDescribeTwoThreeVariablesCorrelations.Name = "mnuDescribeTwoThreeVariablesCorrelations" + Me.mnuDescribeTwoThreeVariablesCorrelations.Size = New System.Drawing.Size(180, 22) + Me.mnuDescribeTwoThreeVariablesCorrelations.Text = "Correlations..." ' 'mnuDescribeTwoVariablesFrequencies ' Me.mnuDescribeTwoVariablesFrequencies.DoubleClickEnabled = True Me.mnuDescribeTwoVariablesFrequencies.Name = "mnuDescribeTwoVariablesFrequencies" - Me.mnuDescribeTwoVariablesFrequencies.Size = New System.Drawing.Size(146, 22) + Me.mnuDescribeTwoVariablesFrequencies.Size = New System.Drawing.Size(180, 22) Me.mnuDescribeTwoVariablesFrequencies.Text = "Frequencies..." ' 'mnuDescribeTwoVariablesPivotTable ' Me.mnuDescribeTwoVariablesPivotTable.Name = "mnuDescribeTwoVariablesPivotTable" - Me.mnuDescribeTwoVariablesPivotTable.Size = New System.Drawing.Size(146, 22) + Me.mnuDescribeTwoVariablesPivotTable.Size = New System.Drawing.Size(180, 22) Me.mnuDescribeTwoVariablesPivotTable.Text = "Pivot Table..." ' - 'mnuDescribeThreeVariable - ' - Me.mnuDescribeThreeVariable.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuDescribeThreeVariableSummarise, Me.mnuDescribeThreeVariableGraph, Me.ToolStripSeparator36, Me.mnuDescribeThreeVariableFrequencies, Me.mnuDescribeThreeVariablePivotTable}) - Me.mnuDescribeThreeVariable.Name = "mnuDescribeThreeVariable" - Me.mnuDescribeThreeVariable.Size = New System.Drawing.Size(192, 22) - Me.mnuDescribeThreeVariable.Text = "Three Variables" - ' - 'mnuDescribeThreeVariableSummarise - ' - Me.mnuDescribeThreeVariableSummarise.Enabled = False - Me.mnuDescribeThreeVariableSummarise.Name = "mnuDescribeThreeVariableSummarise" - Me.mnuDescribeThreeVariableSummarise.Size = New System.Drawing.Size(146, 22) - Me.mnuDescribeThreeVariableSummarise.Text = "Summarise..." - ' - 'mnuDescribeThreeVariableGraph - ' - Me.mnuDescribeThreeVariableGraph.Enabled = False - Me.mnuDescribeThreeVariableGraph.Name = "mnuDescribeThreeVariableGraph" - Me.mnuDescribeThreeVariableGraph.Size = New System.Drawing.Size(146, 22) - Me.mnuDescribeThreeVariableGraph.Text = "Graph..." - ' - 'ToolStripSeparator36 - ' - Me.ToolStripSeparator36.Name = "ToolStripSeparator36" - Me.ToolStripSeparator36.Size = New System.Drawing.Size(143, 6) - ' - 'mnuDescribeThreeVariableFrequencies - ' - Me.mnuDescribeThreeVariableFrequencies.Name = "mnuDescribeThreeVariableFrequencies" - Me.mnuDescribeThreeVariableFrequencies.Size = New System.Drawing.Size(146, 22) - Me.mnuDescribeThreeVariableFrequencies.Text = "Frequencies..." - ' - 'mnuDescribeThreeVariablePivotTable - ' - Me.mnuDescribeThreeVariablePivotTable.Name = "mnuDescribeThreeVariablePivotTable" - Me.mnuDescribeThreeVariablePivotTable.Size = New System.Drawing.Size(146, 22) - Me.mnuDescribeThreeVariablePivotTable.Text = "Pivot Table..." - ' 'mnuDescribeSpecificTablesGraphs ' Me.mnuDescribeSpecificTablesGraphs.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuDescribeSpecificFrequency, Me.mnuDescribeSpecificSummary, Me.mnuDescribeSpecificMultipleResponse, Me.ToolStripSeparator26, Me.mnuDescribeSpecificBarPieChart, Me.mnuDescribeSpecificBoxplotJitterViolinPlot, Me.mnuDescribeSpecificHistogramDensityFrequencyPlot, Me.mnuDescribeSpecificPointPlot, Me.mnuDescribeSpecificLineSmoothPlot, Me.mnuDescribeSpecificMapPlot, Me.mnuDescribeSpecificDotPlot, Me.ToolStripSeparator27, Me.mnuDescribeSpecificMosaic, Me.mnuDescribeSpecificCummulativeDistribution, Me.mnuDescribeSpecificParallelCoordinatePlot}) @@ -1792,7 +1755,7 @@ Partial Class frmMain ' 'mnuClimaticTidyandExamine ' - Me.mnuClimaticTidyandExamine.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticTidyandExamineVisualiseData, Me.mnuClimaticTidyandExamineTidyDailyData, Me.mnuClimaticTidyandExamineNonNumericCases, Me.mnuClimaticTidyandExamineReplaceValues, Me.mnuClimaticTidyandExamineDuplicates, Me.ToolStripSeparator54, Me.mnuClimaticTidyandExamineStack, Me.mnuClimaticTidyandExamineUnstack, Me.mnuClimaticTidyandExamineMerge, Me.mnuClimaticTidyandExamineAppend, Me.ToolStripSeparator69, Me.mnuSetupForDataEntry, Me.mnuTidyandExamineClimaticDataEntry, Me.mnuClimaticTidyandExamineCompareColumns, Me.ToolStripSeparator50, Me.mnuClimaticTidyandExamineOneVariableSummarize, Me.mnuClimaticTidyandExamineOneVariableGraph, Me.mnuClimaticTidyandExamineOneVariableFrequencies}) + Me.mnuClimaticTidyandExamine.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticTidyandExamineVisualiseData, Me.mnuClimaticTidyandExamineTidyDailyData, Me.mnuClimaticTidyandExamineNonNumericCases, Me.mnuClimaticTidyandExamineReplaceValues, Me.mnuClimaticTidyandExamineDuplicateRows, Me.ToolStripSeparator54, Me.mnuClimaticTidyandExamineStack, Me.mnuClimaticTidyandExamineUnstack, Me.mnuClimaticTidyandExamineMerge, Me.mnuClimaticTidyandExamineAppend, Me.ToolStripSeparator69, Me.mnuSetupForDataEntry, Me.mnuTidyandExamineClimaticDataEntry, Me.mnuClimaticTidyandExamineCompareColumns, Me.ToolStripSeparator50, Me.mnuClimaticTidyandExamineOneVariableSummarize, Me.mnuClimaticTidyandExamineOneVariableGraph, Me.mnuClimaticTidyandExamineOneVariableFrequencies}) Me.mnuClimaticTidyandExamine.Name = "mnuClimaticTidyandExamine" Me.mnuClimaticTidyandExamine.Size = New System.Drawing.Size(212, 22) Me.mnuClimaticTidyandExamine.Text = "Tidy and Examine" @@ -1821,11 +1784,11 @@ Partial Class frmMain Me.mnuClimaticTidyandExamineReplaceValues.Size = New System.Drawing.Size(215, 22) Me.mnuClimaticTidyandExamineReplaceValues.Text = "Replace Values..." ' - 'mnuClimaticTidyandExamineDuplicates + 'mnuClimaticTidyandExamineDuplicateRows ' - Me.mnuClimaticTidyandExamineDuplicates.Name = "mnuClimaticTidyandExamineDuplicates" - Me.mnuClimaticTidyandExamineDuplicates.Size = New System.Drawing.Size(215, 22) - Me.mnuClimaticTidyandExamineDuplicates.Text = "Duplicates..." + Me.mnuClimaticTidyandExamineDuplicateRows.Name = "mnuClimaticTidyandExamineDuplicateRows" + Me.mnuClimaticTidyandExamineDuplicateRows.Size = New System.Drawing.Size(215, 22) + Me.mnuClimaticTidyandExamineDuplicateRows.Text = "Duplicate Rows..." ' 'ToolStripSeparator54 ' @@ -3407,7 +3370,7 @@ Partial Class frmMain ' 'mnuPrepareDataFrame ' - Me.mnuPrepareDataFrame.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuPrepareDataFrameViewData, Me.mnuPrepareDataFrameRenameColumn, Me.mnuPrepareDataFrameDuplicateColumn, Me.mnuPrepareDataFrameRowNumbersNames, Me.ToolStripSeparator1, Me.mnuPrepareDataFrameSort, Me.mnuPrepareDataFrameFilter, Me.mnuPrepareDataFrameSelectColumns, Me.mnuPrepareDataFrameReplaceValues, Me.mnuPrepareDataFrameConvertColumns, Me.ToolStripSeparator2, Me.mnuPrepareDataFrameReorderColumns, Me.mnuPrepareDataFrameInsertColumnsRows, Me.mnuPrepareDataFrameDeleteColumnsRows, Me.mnuPrepareDataFrameProtectColumn, Me.mnuPrepareDataFrameHideColumns, Me.mnuPrepareDataFrameFreezeColumns, Me.mnuPrepareDataframeColourByProperty}) + Me.mnuPrepareDataFrame.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuPrepareDataFrameViewData, Me.mnuPrepareDataFrameRenameColumn, Me.mnuPrepareDataFrameDuplicateColumn, Me.mnuPrepareDataFrameRowNumbersNames, Me.ToolStripSeparator1, Me.mnuPrepareDataFrameSort, Me.mnuPrepareDataFrameFilterRows, Me.mnuPrepareDataFrameSelectColumns, Me.mnuPrepareDataFrameReplaceValues, Me.mnuPrepareDataFrameConvertColumns, Me.ToolStripSeparator2, Me.mnuPrepareDataFrameReorderColumns, Me.mnuPrepareDataFrameInsertColumnsRows, Me.mnuPrepareDataFrameDeleteColumnsRows, Me.mnuPrepareDataFrameProtectColumn, Me.mnuPrepareDataFrameHideColumns, Me.mnuPrepareDataFrameFreezeColumns, Me.mnuPrepareDataframeColourByProperty}) Me.mnuPrepareDataFrame.Name = "mnuPrepareDataFrame" Me.mnuPrepareDataFrame.Size = New System.Drawing.Size(186, 22) Me.mnuPrepareDataFrame.Tag = "Data_Frame" @@ -3452,18 +3415,18 @@ Partial Class frmMain Me.mnuPrepareDataFrameSort.Tag = "Sort..." Me.mnuPrepareDataFrameSort.Text = "Sort..." ' - 'mnuPrepareDataFrameFilter + 'mnuPrepareDataFrameFilterRows ' - Me.mnuPrepareDataFrameFilter.Name = "mnuPrepareDataFrameFilter" - Me.mnuPrepareDataFrameFilter.Size = New System.Drawing.Size(200, 22) - Me.mnuPrepareDataFrameFilter.Tag = "Filter..." - Me.mnuPrepareDataFrameFilter.Text = "Filter..." + Me.mnuPrepareDataFrameFilterRows.Name = "mnuPrepareDataFrameFilterRows" + Me.mnuPrepareDataFrameFilterRows.Size = New System.Drawing.Size(200, 22) + Me.mnuPrepareDataFrameFilterRows.Tag = "Filter..." + Me.mnuPrepareDataFrameFilterRows.Text = "Filter Rows..." ' 'mnuPrepareDataFrameSelectColumns ' Me.mnuPrepareDataFrameSelectColumns.Name = "mnuPrepareDataFrameSelectColumns" Me.mnuPrepareDataFrameSelectColumns.Size = New System.Drawing.Size(200, 22) - Me.mnuPrepareDataFrameSelectColumns.Text = "Column Selection..." + Me.mnuPrepareDataFrameSelectColumns.Text = "Select Columns..." ' 'mnuPrepareDataFrameReplaceValues ' @@ -3554,7 +3517,7 @@ Partial Class frmMain ' Me.mnuPrepareCheckDataDuplicates.Name = "mnuPrepareCheckDataDuplicates" Me.mnuPrepareCheckDataDuplicates.Size = New System.Drawing.Size(245, 22) - Me.mnuPrepareCheckDataDuplicates.Text = "Duplicates..." + Me.mnuPrepareCheckDataDuplicates.Text = "Duplicate Rows..." ' 'mnuPrepareCheckDataCompareColumns ' @@ -3613,6 +3576,7 @@ Partial Class frmMain Me.mnuPrepareCheckDataImportOpenRefine.Name = "mnuPrepareCheckDataImportOpenRefine" Me.mnuPrepareCheckDataImportOpenRefine.Size = New System.Drawing.Size(245, 22) Me.mnuPrepareCheckDataImportOpenRefine.Text = "Import From OpenRefine..." + Me.mnuPrepareCheckDataImportOpenRefine.Visible = False ' 'ToolStripSeparator40 ' @@ -4662,16 +4626,16 @@ Partial Class frmMain ' 'mnuOptionsByContextCheckData ' - Me.mnuOptionsByContextCheckData.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuOptionsByContextCheckDataDuplicates, Me.mnuOptionsByContextCheckDataCompareColumns, Me.ToolStripSeparator47, Me.mnuOptionsByContextCheckDataOneVariableSummarise, Me.mnuOptionsByContextCheckDataOneVariableGraph, Me.mnuOptionsByContextCheckDataOneVariableFrequencies}) + Me.mnuOptionsByContextCheckData.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuOptionsByContextCheckDataDuplicateRows, Me.mnuOptionsByContextCheckDataCompareColumns, Me.ToolStripSeparator47, Me.mnuOptionsByContextCheckDataOneVariableSummarise, Me.mnuOptionsByContextCheckDataOneVariableGraph, Me.mnuOptionsByContextCheckDataOneVariableFrequencies}) Me.mnuOptionsByContextCheckData.Name = "mnuOptionsByContextCheckData" Me.mnuOptionsByContextCheckData.Size = New System.Drawing.Size(134, 22) Me.mnuOptionsByContextCheckData.Text = "Check Data" ' - 'mnuOptionsByContextCheckDataDuplicates + 'mnuOptionsByContextCheckDataDuplicateRows ' - Me.mnuOptionsByContextCheckDataDuplicates.Name = "mnuOptionsByContextCheckDataDuplicates" - Me.mnuOptionsByContextCheckDataDuplicates.Size = New System.Drawing.Size(215, 22) - Me.mnuOptionsByContextCheckDataDuplicates.Text = "Duplicates..." + Me.mnuOptionsByContextCheckDataDuplicateRows.Name = "mnuOptionsByContextCheckDataDuplicateRows" + Me.mnuOptionsByContextCheckDataDuplicateRows.Size = New System.Drawing.Size(215, 22) + Me.mnuOptionsByContextCheckDataDuplicateRows.Text = "Duplicate Rows..." ' 'mnuOptionsByContextCheckDataCompareColumns ' @@ -5252,7 +5216,7 @@ Partial Class frmMain Friend WithEvents mnuPrepareColumnTextMatch As ToolStripMenuItem Friend WithEvents mnuPrepareColumnTextDistance As ToolStripMenuItem Friend WithEvents ToolStripSeparator7 As ToolStripSeparator - Friend WithEvents mnuPrepareDataFrameFilter As ToolStripMenuItem + Friend WithEvents mnuPrepareDataFrameFilterRows As ToolStripMenuItem Friend WithEvents ToolStripSeparator10 As ToolStripSeparator Friend WithEvents ToolStripSeparator11 As ToolStripSeparator Friend WithEvents mnuPrepareColumnReshapeTranspose As ToolStripMenuItem @@ -5287,7 +5251,7 @@ Partial Class frmMain Friend WithEvents mnuDescribeOneVariable As ToolStripMenuItem Friend WithEvents mnuDescribeOneVariableSummarise As ToolStripMenuItem Friend WithEvents mnuDescribeOneVariableGraph As ToolStripMenuItem - Friend WithEvents mnuDescribeTwoVariables As ToolStripMenuItem + Friend WithEvents mnuDescribeTwoThreeVariables As ToolStripMenuItem Friend WithEvents mnuDescribeTwoVariablesSummarise As ToolStripMenuItem Friend WithEvents mnuDescribeTwoVariablesTabulate As ToolStripMenuItem Friend WithEvents mnuDescribeTwoVariablesGraph As ToolStripMenuItem @@ -5498,11 +5462,6 @@ Partial Class frmMain Friend WithEvents mnuFileImportFromDatabases As ToolStripMenuItem Friend WithEvents mnuClimaticFileImportandTidyNetCDF As ToolStripMenuItem Friend WithEvents mnuProcurementPrepareRecodeNumericIntoQuantiles As ToolStripMenuItem - Friend WithEvents mnuDescribeThreeVariable As ToolStripMenuItem - Friend WithEvents mnuDescribeThreeVariableSummarise As ToolStripMenuItem - Friend WithEvents mnuDescribeThreeVariableGraph As ToolStripMenuItem - Friend WithEvents ToolStripSeparator36 As ToolStripSeparator - Friend WithEvents mnuDescribeThreeVariableFrequencies As ToolStripMenuItem Friend WithEvents ToolStripSeparator35 As ToolStripSeparator Friend WithEvents splOverall As SplitContainer Friend WithEvents splDataOutput As SplitContainer @@ -5587,7 +5546,7 @@ Partial Class frmMain Friend WithEvents mnuOptionsByContextDescribe As ToolStripMenuItem Friend WithEvents mnuOptionsByContextDescribeCompareTwoTreatments As ToolStripMenuItem Friend WithEvents mnuOptionsByContextDescribeCompareMultipleTreatments As ToolStripMenuItem - Friend WithEvents mnuOptionsByContextCheckDataDuplicates As ToolStripMenuItem + Friend WithEvents mnuOptionsByContextCheckDataDuplicateRows As ToolStripMenuItem Friend WithEvents mnuOptionsByContextCheckDataCompareColumns As ToolStripMenuItem Friend WithEvents mnuOptionsByContextModel As ToolStripMenuItem Friend WithEvents mnuOptionsByContextModelFitModel As ToolStripMenuItem @@ -5639,7 +5598,7 @@ Partial Class frmMain Friend WithEvents mnuClimaticMapping As ToolStripMenuItem Friend WithEvents mnuHelpWindows As ToolStripMenuItem Friend WithEvents mnuHelpDataViewSpreadsheet As ToolStripMenuItem - Friend WithEvents mnuClimaticTidyandExamineDuplicates As ToolStripMenuItem + Friend WithEvents mnuClimaticTidyandExamineDuplicateRows As ToolStripMenuItem Friend WithEvents mnuClimaticTidyandExamineOneVariableGraph As ToolStripMenuItem Friend WithEvents mnuClimaticTidyandExamineOneVariableFrequencies As ToolStripMenuItem Friend WithEvents mnuModelUseModel As ToolStripMenuItem @@ -5779,7 +5738,6 @@ Partial Class frmMain Friend WithEvents ToolStripSeparator71 As ToolStripSeparator Friend WithEvents mnuEditScript As ToolStripMenuItem Friend WithEvents mnuPrepareDataFrameSelectColumns As ToolStripMenuItem - Friend WithEvents mnuDescribeThreeVariablePivotTable As ToolStripMenuItem Friend WithEvents mnuClimaticFileExportToClimsoft As ToolStripMenuItem Friend WithEvents mnuClimaticTidyandExamineCompareColumns As ToolStripMenuItem Friend WithEvents mnuPrepareDataFrameDuplicateColumn As ToolStripMenuItem @@ -5791,4 +5749,5 @@ Partial Class frmMain Friend WithEvents mnuOptionsByContextDefine As ToolStripMenuItem Friend WithEvents mnuOptionsByContextDefineOnStation As ToolStripMenuItem Friend WithEvents mnuOptionsByContextDefineOnFarm As ToolStripMenuItem + Friend WithEvents mnuDescribeTwoThreeVariablesCorrelations As ToolStripMenuItem End Class diff --git a/instat/frmMain.vb b/instat/frmMain.vb index bc81ce1a85f..35dc43b8870 100644 --- a/instat/frmMain.vb +++ b/instat/frmMain.vb @@ -702,7 +702,7 @@ Public Class frmMain dlgCombineText.ShowDialog() End Sub - Private Sub mnuPrepareDataFilter_Click(sender As Object, e As EventArgs) Handles mnuPrepareDataFrameFilter.Click + Private Sub mnuPrepareDataFilter_Click(sender As Object, e As EventArgs) Handles mnuPrepareDataFrameFilterRows.Click dlgRestrict.bIsSubsetDialog = False dlgRestrict.strDefaultDataframe = "" dlgRestrict.ShowDialog() @@ -1456,10 +1456,6 @@ Public Class frmMain dlgStringDistance.ShowDialog() End Sub - Private Sub mnuDescribeThreeVariableFrequencies_Click(sender As Object, e As EventArgs) Handles mnuDescribeThreeVariableFrequencies.Click - dlgThreeVariableFrequencies.ShowDialog() - End Sub - Private Sub mnuDescribeViewGraph_Click(sender As Object, e As EventArgs) Handles mnuDescribeViewGraph.Click dlgViewGraph.ShowDialog() End Sub @@ -1838,7 +1834,7 @@ Public Class frmMain dlgMergeAdditionalData.ShowDialog() End Sub - Private Sub mnuOptionsByContextsCheckDataDuplicates_Click(sender As Object, e As EventArgs) Handles mnuOptionsByContextCheckDataDuplicates.Click + Private Sub mnuOptionsByContextsCheckDataDuplicates_Click(sender As Object, e As EventArgs) Handles mnuOptionsByContextCheckDataDuplicateRows.Click dlgDuplicates.ShowDialog() End Sub @@ -2001,7 +1997,7 @@ Public Class frmMain dlgOneWayFrequencies.ShowDialog() End Sub - Private Sub mnuClimaticTidyandExamineDuplicates_Click(sender As Object, e As EventArgs) Handles mnuClimaticTidyandExamineDuplicates.Click + Private Sub mnuClimaticTidyandExamineDuplicates_Click(sender As Object, e As EventArgs) Handles mnuClimaticTidyandExamineDuplicateRows.Click dlgDuplicates.ShowDialog() End Sub @@ -2396,10 +2392,6 @@ Public Class frmMain dlgSelect.ShowDialog() End Sub - Private Sub mnuDescribeThreeVariablePivotTable_Click(sender As Object, e As EventArgs) Handles mnuDescribeThreeVariablePivotTable.Click - dlgThreeVariablePivotTable.ShowDialog() - End Sub - Private Sub mnuClimaticFileExportToClimsoft_Click(sender As Object, e As EventArgs) Handles mnuClimaticFileExportToClimsoft.Click dlgExportToClimsoft.ShowDialog() End Sub @@ -2431,4 +2423,8 @@ Public Class frmMain Private Sub mnuOptionsByContextDefineOnFarm_Click(sender As Object, e As EventArgs) Handles mnuOptionsByContextDefineOnFarm.Click dlgDefineOptionsByContext.ShowDialog() End Sub + + Private Sub mnuDescribeTwoThreeVariablesCorrelations_Click(sender As Object, e As EventArgs) Handles mnuDescribeTwoThreeVariablesCorrelations.Click + dlgCorrelation.ShowDialog() + End Sub End Class diff --git a/instat/translations/rInstatTranslations.db b/instat/translations/rInstatTranslations.db index 2cd5580aa49..238be12f453 100644 Binary files a/instat/translations/rInstatTranslations.db and b/instat/translations/rInstatTranslations.db differ diff --git a/instat/ucrColumnMetadata.Designer.vb b/instat/ucrColumnMetadata.Designer.vb index dd778445553..7ff00d14517 100644 --- a/instat/ucrColumnMetadata.Designer.vb +++ b/instat/ucrColumnMetadata.Designer.vb @@ -50,10 +50,14 @@ Partial Class ucrColumnMetadata Me.copySheet = New System.Windows.Forms.ToolStripMenuItem() Me.reorderSheet = New System.Windows.Forms.ToolStripMenuItem() Me.viewSheet = New System.Windows.Forms.ToolStripMenuItem() + Me.ToolStripSeparator4 = New System.Windows.Forms.ToolStripSeparator() + Me.mnuHelp2 = New System.Windows.Forms.ToolStripMenuItem() Me.propertiesContextMenuStrip = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.mnuDeleteLabels = New System.Windows.Forms.ToolStripMenuItem() Me.lblHeaderColumnMetadata = New System.Windows.Forms.Label() Me.tlpTableContainer = New System.Windows.Forms.TableLayoutPanel() + Me.ucrLinuxGrid = New instat.ucrColumnMetadataLinuxGrid() + Me.ucrReoGrid = New instat.ucrColumnMetadataReoGrid() Me.mnuColumnRename = New System.Windows.Forms.ToolStripMenuItem() Me.mnuDuplicateColumn = New System.Windows.Forms.ToolStripMenuItem() Me.mnuReorderColumns = New System.Windows.Forms.ToolStripMenuItem() @@ -71,17 +75,13 @@ Partial Class ucrColumnMetadata Me.ToolStripSeparator1 = New System.Windows.Forms.ToolStripSeparator() Me.mnuSort = New System.Windows.Forms.ToolStripMenuItem() Me.mnuAddComment = New System.Windows.Forms.ToolStripMenuItem() - Me.mnuColumnFilter = New System.Windows.Forms.ToolStripMenuItem() - Me.mnuColumnContextColumnSelection = New System.Windows.Forms.ToolStripMenuItem() + Me.mnuColumnFilterRows = New System.Windows.Forms.ToolStripMenuItem() + Me.mnuColumnContextSelectColumns = New System.Windows.Forms.ToolStripMenuItem() Me.mnuColumnContextRemoveCurrentColumnSelection = New System.Windows.Forms.ToolStripMenuItem() Me.mnuClearColumnFilter = New System.Windows.Forms.ToolStripMenuItem() Me.columnContextMenuStrip = New System.Windows.Forms.ContextMenuStrip(Me.components) - Me.ucrLinuxGrid = New instat.ucrColumnMetadataLinuxGrid() - Me.ucrReoGrid = New instat.ucrColumnMetadataReoGrid() Me.ToolStripSeparator3 = New System.Windows.Forms.ToolStripSeparator() Me.mnuHelp1 = New System.Windows.Forms.ToolStripMenuItem() - Me.ToolStripSeparator4 = New System.Windows.Forms.ToolStripSeparator() - Me.mnuHelp2 = New System.Windows.Forms.ToolStripMenuItem() Me.cellContextMenuStrip.SuspendLayout() Me.statusColumnMenu.SuspendLayout() Me.propertiesContextMenuStrip.SuspendLayout() @@ -107,57 +107,68 @@ Partial Class ucrColumnMetadata Me.statusColumnMenu.ImageScalingSize = New System.Drawing.Size(20, 20) Me.statusColumnMenu.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.deleteDataFrame, Me.renameSheet, Me.mnuBottomAddComment, Me.hideSheet, Me.unhideSheet, Me.copySheet, Me.reorderSheet, Me.viewSheet, Me.ToolStripSeparator4, Me.mnuHelp2}) Me.statusColumnMenu.Name = "statusColumnMenu" - Me.statusColumnMenu.Size = New System.Drawing.Size(181, 230) + Me.statusColumnMenu.Size = New System.Drawing.Size(163, 208) ' 'deleteDataFrame ' Me.deleteDataFrame.Name = "deleteDataFrame" - Me.deleteDataFrame.Size = New System.Drawing.Size(180, 22) + Me.deleteDataFrame.Size = New System.Drawing.Size(162, 22) Me.deleteDataFrame.Text = "Delete..." ' 'renameSheet ' Me.renameSheet.Name = "renameSheet" - Me.renameSheet.Size = New System.Drawing.Size(180, 22) + Me.renameSheet.Size = New System.Drawing.Size(162, 22) Me.renameSheet.Text = "Rename..." ' 'mnuBottomAddComment ' Me.mnuBottomAddComment.Name = "mnuBottomAddComment" - Me.mnuBottomAddComment.Size = New System.Drawing.Size(180, 22) + Me.mnuBottomAddComment.Size = New System.Drawing.Size(162, 22) Me.mnuBottomAddComment.Text = "Add Comment..." ' 'hideSheet ' Me.hideSheet.Name = "hideSheet" - Me.hideSheet.Size = New System.Drawing.Size(180, 22) + Me.hideSheet.Size = New System.Drawing.Size(162, 22) Me.hideSheet.Text = "Hide" ' 'unhideSheet ' Me.unhideSheet.Name = "unhideSheet" - Me.unhideSheet.Size = New System.Drawing.Size(180, 22) + Me.unhideSheet.Size = New System.Drawing.Size(162, 22) Me.unhideSheet.Text = "Unhide..." ' 'copySheet ' Me.copySheet.Name = "copySheet" - Me.copySheet.Size = New System.Drawing.Size(180, 22) + Me.copySheet.Size = New System.Drawing.Size(162, 22) Me.copySheet.Text = "Copy..." ' 'reorderSheet ' Me.reorderSheet.Enabled = False Me.reorderSheet.Name = "reorderSheet" - Me.reorderSheet.Size = New System.Drawing.Size(180, 22) + Me.reorderSheet.Size = New System.Drawing.Size(162, 22) Me.reorderSheet.Text = "Reorder..." ' 'viewSheet ' Me.viewSheet.Name = "viewSheet" - Me.viewSheet.Size = New System.Drawing.Size(180, 22) + Me.viewSheet.Size = New System.Drawing.Size(162, 22) Me.viewSheet.Text = "View Data Frame" ' + 'ToolStripSeparator4 + ' + Me.ToolStripSeparator4.Name = "ToolStripSeparator4" + Me.ToolStripSeparator4.Size = New System.Drawing.Size(159, 6) + ' + 'mnuHelp2 + ' + Me.mnuHelp2.Name = "mnuHelp2" + Me.mnuHelp2.Size = New System.Drawing.Size(162, 22) + Me.mnuHelp2.Text = "Help" + ' 'propertiesContextMenuStrip ' Me.propertiesContextMenuStrip.ImageScalingSize = New System.Drawing.Size(24, 24) @@ -203,6 +214,24 @@ Partial Class ucrColumnMetadata Me.tlpTableContainer.Size = New System.Drawing.Size(568, 405) Me.tlpTableContainer.TabIndex = 7 ' + 'ucrLinuxGrid + ' + Me.ucrLinuxGrid.Dock = System.Windows.Forms.DockStyle.Fill + Me.ucrLinuxGrid.Location = New System.Drawing.Point(2, 22) + Me.ucrLinuxGrid.Margin = New System.Windows.Forms.Padding(2) + Me.ucrLinuxGrid.Name = "ucrLinuxGrid" + Me.ucrLinuxGrid.Size = New System.Drawing.Size(280, 381) + Me.ucrLinuxGrid.TabIndex = 7 + ' + 'ucrReoGrid + ' + Me.ucrReoGrid.Dock = System.Windows.Forms.DockStyle.Fill + Me.ucrReoGrid.Location = New System.Drawing.Point(286, 22) + Me.ucrReoGrid.Margin = New System.Windows.Forms.Padding(2) + Me.ucrReoGrid.Name = "ucrReoGrid" + Me.ucrReoGrid.Size = New System.Drawing.Size(280, 381) + Me.ucrReoGrid.TabIndex = 8 + ' 'mnuColumnRename ' Me.mnuColumnRename.Name = "mnuColumnRename" @@ -303,17 +332,17 @@ Partial Class ucrColumnMetadata Me.mnuAddComment.Size = New System.Drawing.Size(214, 22) Me.mnuAddComment.Text = "Add Comment..." ' - 'mnuColumnFilter + 'mnuColumnFilterRows ' - Me.mnuColumnFilter.Name = "mnuColumnFilter" - Me.mnuColumnFilter.Size = New System.Drawing.Size(214, 22) - Me.mnuColumnFilter.Text = "Filter..." + Me.mnuColumnFilterRows.Name = "mnuColumnFilterRows" + Me.mnuColumnFilterRows.Size = New System.Drawing.Size(214, 22) + Me.mnuColumnFilterRows.Text = "Filter Rows..." ' - 'mnuColumnContextColumnSelection + 'mnuColumnContextSelectColumns ' - Me.mnuColumnContextColumnSelection.Name = "mnuColumnContextColumnSelection" - Me.mnuColumnContextColumnSelection.Size = New System.Drawing.Size(214, 22) - Me.mnuColumnContextColumnSelection.Text = "Column Selection..." + Me.mnuColumnContextSelectColumns.Name = "mnuColumnContextSelectColumns" + Me.mnuColumnContextSelectColumns.Size = New System.Drawing.Size(214, 22) + Me.mnuColumnContextSelectColumns.Text = "Select Columns..." ' 'mnuColumnContextRemoveCurrentColumnSelection ' @@ -330,27 +359,9 @@ Partial Class ucrColumnMetadata 'columnContextMenuStrip ' Me.columnContextMenuStrip.ImageScalingSize = New System.Drawing.Size(24, 24) - Me.columnContextMenuStrip.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuColumnRename, Me.mnuDuplicateColumn, Me.mnuReorderColumns, Me.mnuInsertColsBefore, Me.mnuInsertColsAfter, Me.mnuDeleteCol, Me.toolStripMenuItem2, Me.mnuConvertToFactor, Me.mnuCovertToOrderedFactors, Me.mnuConvertText, Me.mnuConvertToLogical, Me.mnuConvertVariate, Me.ToolStripSeparator2, Me.mnuLevelsLabels, Me.ToolStripSeparator1, Me.mnuSort, Me.mnuAddComment, Me.mnuColumnFilter, Me.mnuColumnContextColumnSelection, Me.mnuColumnContextRemoveCurrentColumnSelection, Me.mnuClearColumnFilter, Me.ToolStripSeparator3, Me.mnuHelp1}) + Me.columnContextMenuStrip.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuColumnRename, Me.mnuDuplicateColumn, Me.mnuReorderColumns, Me.mnuInsertColsBefore, Me.mnuInsertColsAfter, Me.mnuDeleteCol, Me.toolStripMenuItem2, Me.mnuConvertToFactor, Me.mnuCovertToOrderedFactors, Me.mnuConvertText, Me.mnuConvertToLogical, Me.mnuConvertVariate, Me.ToolStripSeparator2, Me.mnuLevelsLabels, Me.ToolStripSeparator1, Me.mnuSort, Me.mnuAddComment, Me.mnuColumnFilterRows, Me.mnuColumnContextSelectColumns, Me.mnuColumnContextRemoveCurrentColumnSelection, Me.mnuClearColumnFilter, Me.ToolStripSeparator3, Me.mnuHelp1}) Me.columnContextMenuStrip.Name = "columnContextMenuStrip" - Me.columnContextMenuStrip.Size = New System.Drawing.Size(215, 446) - ' - 'ucrLinuxGrid - ' - Me.ucrLinuxGrid.Dock = System.Windows.Forms.DockStyle.Fill - Me.ucrLinuxGrid.Location = New System.Drawing.Point(2, 22) - Me.ucrLinuxGrid.Margin = New System.Windows.Forms.Padding(2) - Me.ucrLinuxGrid.Name = "ucrLinuxGrid" - Me.ucrLinuxGrid.Size = New System.Drawing.Size(280, 381) - Me.ucrLinuxGrid.TabIndex = 7 - ' - 'ucrReoGrid - ' - Me.ucrReoGrid.Dock = System.Windows.Forms.DockStyle.Fill - Me.ucrReoGrid.Location = New System.Drawing.Point(286, 22) - Me.ucrReoGrid.Margin = New System.Windows.Forms.Padding(2) - Me.ucrReoGrid.Name = "ucrReoGrid" - Me.ucrReoGrid.Size = New System.Drawing.Size(280, 381) - Me.ucrReoGrid.TabIndex = 8 + Me.columnContextMenuStrip.Size = New System.Drawing.Size(215, 468) ' 'ToolStripSeparator3 ' @@ -363,17 +374,6 @@ Partial Class ucrColumnMetadata Me.mnuHelp1.Size = New System.Drawing.Size(214, 22) Me.mnuHelp1.Text = "Help" ' - 'ToolStripSeparator4 - ' - Me.ToolStripSeparator4.Name = "ToolStripSeparator4" - Me.ToolStripSeparator4.Size = New System.Drawing.Size(177, 6) - ' - 'mnuHelp2 - ' - Me.mnuHelp2.Name = "mnuHelp2" - Me.mnuHelp2.Size = New System.Drawing.Size(180, 22) - Me.mnuHelp2.Text = "Help" - ' 'ucrColumnMetadata ' Me.AutoScaleDimensions = New System.Drawing.SizeF(96.0!, 96.0!) @@ -425,8 +425,8 @@ Partial Class ucrColumnMetadata Friend WithEvents ToolStripSeparator1 As ToolStripSeparator Friend WithEvents mnuSort As ToolStripMenuItem Friend WithEvents mnuAddComment As ToolStripMenuItem - Private WithEvents mnuColumnFilter As ToolStripMenuItem - Friend WithEvents mnuColumnContextColumnSelection As ToolStripMenuItem + Private WithEvents mnuColumnFilterRows As ToolStripMenuItem + Friend WithEvents mnuColumnContextSelectColumns As ToolStripMenuItem Friend WithEvents mnuColumnContextRemoveCurrentColumnSelection As ToolStripMenuItem Private WithEvents mnuClearColumnFilter As ToolStripMenuItem Friend WithEvents columnContextMenuStrip As ContextMenuStrip diff --git a/instat/ucrColumnMetadata.vb b/instat/ucrColumnMetadata.vb index d8212e1fd79..c7514f40ea5 100644 --- a/instat/ucrColumnMetadata.vb +++ b/instat/ucrColumnMetadata.vb @@ -320,7 +320,7 @@ Public Class ucrColumnMetadata dlgDuplicateColumns.ShowDialog() End Sub - Private Sub mnuColumnFilter_Click(sender As Object, e As EventArgs) Handles mnuColumnFilter.Click + Private Sub mnuColumnFilter_Click(sender As Object, e As EventArgs) Handles mnuColumnFilterRows.Click dlgRestrict.bIsSubsetDialog = False dlgRestrict.strDefaultDataframe = _grid.CurrentWorksheet.Name dlgRestrict.ShowDialog() @@ -447,7 +447,7 @@ Public Class ucrColumnMetadata dlgAddComment.ShowDialog() End Sub - Private Sub mnuColumnContextColumnSelection_Click(sender As Object, e As EventArgs) Handles mnuColumnContextColumnSelection.Click + Private Sub mnuColumnContextColumnSelection_Click(sender As Object, e As EventArgs) Handles mnuColumnContextSelectColumns.Click dlgSelect.SetDefaultDataFrame(_grid.CurrentWorksheet.Name) dlgSelect.ShowDialog() End Sub diff --git a/instat/ucrDataView.Designer.vb b/instat/ucrDataView.Designer.vb index 8902cefb358..07d8153dead 100644 --- a/instat/ucrDataView.Designer.vb +++ b/instat/ucrDataView.Designer.vb @@ -58,16 +58,18 @@ Partial Class ucrDataView Me.toolStripMenuItem21 = New System.Windows.Forms.ToolStripSeparator() Me.mnuSort = New System.Windows.Forms.ToolStripMenuItem() Me.mnuColumnAddComment = New System.Windows.Forms.ToolStripMenuItem() - Me.mnuColumnFilter = New System.Windows.Forms.ToolStripMenuItem() + Me.mnuColumnFilterRows = New System.Windows.Forms.ToolStripMenuItem() Me.mnuColumnContextColumnSelection = New System.Windows.Forms.ToolStripMenuItem() Me.mnuColumnContextRemoveCurrentColumnSelection = New System.Windows.Forms.ToolStripMenuItem() Me.mnuClearColumnFilter = New System.Windows.Forms.ToolStripMenuItem() + Me.ToolStripSeparator8 = New System.Windows.Forms.ToolStripSeparator() + Me.mnuHelp = New System.Windows.Forms.ToolStripMenuItem() Me.cellContextMenuStrip = New System.Windows.Forms.ContextMenuStrip(Me.components) + Me.mnuDeleteCells = New System.Windows.Forms.ToolStripMenuItem() Me.ToolStripSeparator3 = New System.Windows.Forms.ToolStripSeparator() Me.mnuRenameColumn = New System.Windows.Forms.ToolStripMenuItem() Me.mnuDuplColumn = New System.Windows.Forms.ToolStripMenuItem() Me.mnuReorderColumn = New System.Windows.Forms.ToolStripMenuItem() - Me.mnuDeleteCells = New System.Windows.Forms.ToolStripMenuItem() Me.mnuCellPasteRange = New System.Windows.Forms.ToolStripMenuItem() Me.ToolStripSeparator5 = New System.Windows.Forms.ToolStripSeparator() Me.mnuConvertToFact = New System.Windows.Forms.ToolStripMenuItem() @@ -80,10 +82,12 @@ Partial Class ucrDataView Me.ToolStripSeparator7 = New System.Windows.Forms.ToolStripSeparator() Me.mnuSorts = New System.Windows.Forms.ToolStripMenuItem() Me.mnuComment = New System.Windows.Forms.ToolStripMenuItem() - Me.mnuFilters = New System.Windows.Forms.ToolStripMenuItem() - Me.mnuRemoveCurrentFilters = New System.Windows.Forms.ToolStripMenuItem() + Me.mnuFilterRows = New System.Windows.Forms.ToolStripMenuItem() Me.mnuCellContextColumnSelection = New System.Windows.Forms.ToolStripMenuItem() Me.mnuCellContextRemoveCurrentColumnSelection = New System.Windows.Forms.ToolStripMenuItem() + Me.mnuRemoveCurrentFilters = New System.Windows.Forms.ToolStripMenuItem() + Me.ToolStripSeparator9 = New System.Windows.Forms.ToolStripSeparator() + Me.mnuHelp1 = New System.Windows.Forms.ToolStripMenuItem() Me.rowContextMenuStrip = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.mnuInsertRowsBefore = New System.Windows.Forms.ToolStripMenuItem() Me.mnuInsertRowsAfter = New System.Windows.Forms.ToolStripMenuItem() @@ -95,6 +99,8 @@ Partial Class ucrDataView Me.mnuRowContextColumnSelection = New System.Windows.Forms.ToolStripMenuItem() Me.mnuRowContextRemoveCurrentColumnSelection = New System.Windows.Forms.ToolStripMenuItem() Me.mnuRemoveCurrentFilter = New System.Windows.Forms.ToolStripMenuItem() + Me.ToolStripSeparator10 = New System.Windows.Forms.ToolStripSeparator() + Me.mnuHelp2 = New System.Windows.Forms.ToolStripMenuItem() Me.statusColumnMenu = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.deleteDataFrame = New System.Windows.Forms.ToolStripMenuItem() Me.renameSheet = New System.Windows.Forms.ToolStripMenuItem() @@ -104,6 +110,8 @@ Partial Class ucrDataView Me.CopySheet = New System.Windows.Forms.ToolStripMenuItem() Me.reorderSheet = New System.Windows.Forms.ToolStripMenuItem() Me.ViewSheet = New System.Windows.Forms.ToolStripMenuItem() + Me.ToolStripSeparator11 = New System.Windows.Forms.ToolStripSeparator() + Me.mnuHelp3 = New System.Windows.Forms.ToolStripMenuItem() Me.lblHeaderDataView = New System.Windows.Forms.Label() Me.tlpTableContainer = New System.Windows.Forms.TableLayoutPanel() Me.panelSectionsAll = New System.Windows.Forms.Panel() @@ -132,16 +140,8 @@ Partial Class ucrDataView Me.lblRowNext = New System.Windows.Forms.Label() Me.lblColLast = New System.Windows.Forms.Label() Me.lblRowBack = New System.Windows.Forms.Label() - Me.ToolStripSeparator8 = New System.Windows.Forms.ToolStripSeparator() - Me.mnuHelp = New System.Windows.Forms.ToolStripMenuItem() Me.ucrReoGrid = New instat.ucrDataViewReoGrid() Me.ucrLinuxGrid = New instat.ucrDataViewLinuxGrid() - Me.ToolStripSeparator9 = New System.Windows.Forms.ToolStripSeparator() - Me.mnuHelp1 = New System.Windows.Forms.ToolStripMenuItem() - Me.ToolStripSeparator10 = New System.Windows.Forms.ToolStripSeparator() - Me.mnuHelp2 = New System.Windows.Forms.ToolStripMenuItem() - Me.ToolStripSeparator11 = New System.Windows.Forms.ToolStripSeparator() - Me.mnuHelp3 = New System.Windows.Forms.ToolStripMenuItem() Me.columnContextMenuStrip.SuspendLayout() Me.cellContextMenuStrip.SuspendLayout() Me.rowContextMenuStrip.SuspendLayout() @@ -157,7 +157,7 @@ Partial Class ucrDataView 'columnContextMenuStrip ' Me.columnContextMenuStrip.ImageScalingSize = New System.Drawing.Size(20, 20) - Me.columnContextMenuStrip.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuColumnRename, Me.mnuDuplicateColumn, Me.mnuReorderColumns, Me.mnuInsertColsBefore, Me.mnuInsertColsAfter, Me.mnuDeleteCol, Me.mnuPaste, Me.toolStripMenuItem2, Me.mnuConvertToFactor, Me.mnuCovertToOrderedFactors, Me.mnuConvertText, Me.mnuConvertToLogical, Me.mnuConvertVariate, Me.ToolStripSeparator1, Me.mnuLevelsLabels, Me.toolStripMenuItem21, Me.mnuSort, Me.mnuColumnAddComment, Me.mnuColumnFilter, Me.mnuColumnContextColumnSelection, Me.mnuColumnContextRemoveCurrentColumnSelection, Me.mnuClearColumnFilter, Me.ToolStripSeparator8, Me.mnuHelp}) + Me.columnContextMenuStrip.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuColumnRename, Me.mnuDuplicateColumn, Me.mnuReorderColumns, Me.mnuInsertColsBefore, Me.mnuInsertColsAfter, Me.mnuDeleteCol, Me.mnuPaste, Me.toolStripMenuItem2, Me.mnuConvertToFactor, Me.mnuCovertToOrderedFactors, Me.mnuConvertText, Me.mnuConvertToLogical, Me.mnuConvertVariate, Me.ToolStripSeparator1, Me.mnuLevelsLabels, Me.toolStripMenuItem21, Me.mnuSort, Me.mnuColumnAddComment, Me.mnuColumnFilterRows, Me.mnuColumnContextColumnSelection, Me.mnuColumnContextRemoveCurrentColumnSelection, Me.mnuClearColumnFilter, Me.ToolStripSeparator8, Me.mnuHelp}) Me.columnContextMenuStrip.Name = "columnContextMenuStrip" Me.columnContextMenuStrip.Size = New System.Drawing.Size(215, 468) ' @@ -266,17 +266,17 @@ Partial Class ucrDataView Me.mnuColumnAddComment.Size = New System.Drawing.Size(214, 22) Me.mnuColumnAddComment.Text = "Add Comment..." ' - 'mnuColumnFilter + 'mnuColumnFilterRows ' - Me.mnuColumnFilter.Name = "mnuColumnFilter" - Me.mnuColumnFilter.Size = New System.Drawing.Size(214, 22) - Me.mnuColumnFilter.Text = "Filter..." + Me.mnuColumnFilterRows.Name = "mnuColumnFilterRows" + Me.mnuColumnFilterRows.Size = New System.Drawing.Size(214, 22) + Me.mnuColumnFilterRows.Text = "Filter Rows..." ' 'mnuColumnContextColumnSelection ' Me.mnuColumnContextColumnSelection.Name = "mnuColumnContextColumnSelection" Me.mnuColumnContextColumnSelection.Size = New System.Drawing.Size(214, 22) - Me.mnuColumnContextColumnSelection.Text = "Column Selection..." + Me.mnuColumnContextColumnSelection.Text = "Select Columns..." ' 'mnuColumnContextRemoveCurrentColumnSelection ' @@ -290,13 +290,30 @@ Partial Class ucrDataView Me.mnuClearColumnFilter.Size = New System.Drawing.Size(214, 22) Me.mnuClearColumnFilter.Text = "Remove Current Filter" ' + 'ToolStripSeparator8 + ' + Me.ToolStripSeparator8.Name = "ToolStripSeparator8" + Me.ToolStripSeparator8.Size = New System.Drawing.Size(211, 6) + ' + 'mnuHelp + ' + Me.mnuHelp.Name = "mnuHelp" + Me.mnuHelp.Size = New System.Drawing.Size(214, 22) + Me.mnuHelp.Text = "Help" + ' 'cellContextMenuStrip ' Me.cellContextMenuStrip.ImageScalingSize = New System.Drawing.Size(20, 20) - Me.cellContextMenuStrip.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuDeleteCells, Me.ToolStripSeparator3, Me.mnuRenameColumn, Me.mnuDuplColumn, Me.mnuReorderColumn, Me.mnuCellPasteRange, Me.ToolStripSeparator5, Me.mnuConvertToFact, Me.mnuConvertToOrderedFactor, Me.mnuConvertToCharacter, Me.mnuConvertToLogic, Me.mnuConvertToNumeric, Me.ToolStripSeparator6, Me.mnuLabelsLevel, Me.ToolStripSeparator7, Me.mnuSorts, Me.mnuComment, Me.mnuFilters, Me.mnuCellContextColumnSelection, Me.mnuCellContextRemoveCurrentColumnSelection, Me.mnuRemoveCurrentFilters, Me.ToolStripSeparator9, Me.mnuHelp1}) + Me.cellContextMenuStrip.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuDeleteCells, Me.ToolStripSeparator3, Me.mnuRenameColumn, Me.mnuDuplColumn, Me.mnuReorderColumn, Me.mnuCellPasteRange, Me.ToolStripSeparator5, Me.mnuConvertToFact, Me.mnuConvertToOrderedFactor, Me.mnuConvertToCharacter, Me.mnuConvertToLogic, Me.mnuConvertToNumeric, Me.ToolStripSeparator6, Me.mnuLabelsLevel, Me.ToolStripSeparator7, Me.mnuSorts, Me.mnuComment, Me.mnuFilterRows, Me.mnuCellContextColumnSelection, Me.mnuCellContextRemoveCurrentColumnSelection, Me.mnuRemoveCurrentFilters, Me.ToolStripSeparator9, Me.mnuHelp1}) Me.cellContextMenuStrip.Name = "cellContextMenuStrip" Me.cellContextMenuStrip.Size = New System.Drawing.Size(215, 430) ' + 'mnuDeleteCells + ' + Me.mnuDeleteCells.Name = "mnuDeleteCells" + Me.mnuDeleteCells.Size = New System.Drawing.Size(214, 22) + Me.mnuDeleteCells.Text = "Delete Cell(s)" + ' 'ToolStripSeparator3 ' Me.ToolStripSeparator3.Name = "ToolStripSeparator3" @@ -320,12 +337,6 @@ Partial Class ucrDataView Me.mnuReorderColumn.Size = New System.Drawing.Size(214, 22) Me.mnuReorderColumn.Text = "Reorder Column(s)..." ' - 'mnuDeleteCells - ' - Me.mnuDeleteCells.Name = "mnuDeleteCells" - Me.mnuDeleteCells.Size = New System.Drawing.Size(214, 22) - Me.mnuDeleteCells.Text = "Delete Cell(s)" - ' 'mnuCellPasteRange ' Me.mnuCellPasteRange.Name = "mnuCellPasteRange" @@ -395,23 +406,17 @@ Partial Class ucrDataView Me.mnuComment.Size = New System.Drawing.Size(214, 22) Me.mnuComment.Text = "Add Comment..." ' - 'mnuFilters - ' - Me.mnuFilters.Name = "mnuFilters" - Me.mnuFilters.Size = New System.Drawing.Size(214, 22) - Me.mnuFilters.Text = "Filter..." + 'mnuFilterRows ' - 'mnuRemoveCurrentFilters - ' - Me.mnuRemoveCurrentFilters.Name = "mnuRemoveCurrentFilters" - Me.mnuRemoveCurrentFilters.Size = New System.Drawing.Size(214, 22) - Me.mnuRemoveCurrentFilters.Text = "Remove Current Filter" + Me.mnuFilterRows.Name = "mnuFilterRows" + Me.mnuFilterRows.Size = New System.Drawing.Size(214, 22) + Me.mnuFilterRows.Text = "Filter Rows..." ' 'mnuCellContextColumnSelection ' Me.mnuCellContextColumnSelection.Name = "mnuCellContextColumnSelection" Me.mnuCellContextColumnSelection.Size = New System.Drawing.Size(214, 22) - Me.mnuCellContextColumnSelection.Text = "Column Selection..." + Me.mnuCellContextColumnSelection.Text = "Select Columns..." ' 'mnuCellContextRemoveCurrentColumnSelection ' @@ -419,12 +424,29 @@ Partial Class ucrDataView Me.mnuCellContextRemoveCurrentColumnSelection.Size = New System.Drawing.Size(214, 22) Me.mnuCellContextRemoveCurrentColumnSelection.Text = "Remove Column Selection" ' + 'mnuRemoveCurrentFilters + ' + Me.mnuRemoveCurrentFilters.Name = "mnuRemoveCurrentFilters" + Me.mnuRemoveCurrentFilters.Size = New System.Drawing.Size(214, 22) + Me.mnuRemoveCurrentFilters.Text = "Remove Current Filter" + ' + 'ToolStripSeparator9 + ' + Me.ToolStripSeparator9.Name = "ToolStripSeparator9" + Me.ToolStripSeparator9.Size = New System.Drawing.Size(211, 6) + ' + 'mnuHelp1 + ' + Me.mnuHelp1.Name = "mnuHelp1" + Me.mnuHelp1.Size = New System.Drawing.Size(214, 22) + Me.mnuHelp1.Text = "Help" + ' 'rowContextMenuStrip ' Me.rowContextMenuStrip.ImageScalingSize = New System.Drawing.Size(20, 20) Me.rowContextMenuStrip.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuInsertRowsBefore, Me.mnuInsertRowsAfter, Me.mnuDeleteRows, Me.ToolStripSeparator2, Me.mnuAddComment, Me.ToolStripSeparator4, Me.mnuFilter, Me.mnuRowContextColumnSelection, Me.mnuRowContextRemoveCurrentColumnSelection, Me.mnuRemoveCurrentFilter, Me.ToolStripSeparator10, Me.mnuHelp2}) Me.rowContextMenuStrip.Name = "columnContextMenuStrip" - Me.rowContextMenuStrip.Size = New System.Drawing.Size(215, 220) + Me.rowContextMenuStrip.Size = New System.Drawing.Size(215, 242) ' 'mnuInsertRowsBefore ' @@ -465,13 +487,13 @@ Partial Class ucrDataView Me.mnuFilter.Name = "mnuFilter" Me.mnuFilter.Size = New System.Drawing.Size(214, 22) Me.mnuFilter.Tag = "Filter..." - Me.mnuFilter.Text = "Filter..." + Me.mnuFilter.Text = "Filter Rows..." ' 'mnuRowContextColumnSelection ' Me.mnuRowContextColumnSelection.Name = "mnuRowContextColumnSelection" Me.mnuRowContextColumnSelection.Size = New System.Drawing.Size(214, 22) - Me.mnuRowContextColumnSelection.Text = "Column Selection..." + Me.mnuRowContextColumnSelection.Text = "Select Columns..." ' 'mnuRowContextRemoveCurrentColumnSelection ' @@ -486,62 +508,84 @@ Partial Class ucrDataView Me.mnuRemoveCurrentFilter.Tag = "Remove_Current_Filter" Me.mnuRemoveCurrentFilter.Text = "Remove Current Filter" ' + 'ToolStripSeparator10 + ' + Me.ToolStripSeparator10.Name = "ToolStripSeparator10" + Me.ToolStripSeparator10.Size = New System.Drawing.Size(211, 6) + ' + 'mnuHelp2 + ' + Me.mnuHelp2.Name = "mnuHelp2" + Me.mnuHelp2.Size = New System.Drawing.Size(214, 22) + Me.mnuHelp2.Text = "Help" + ' 'statusColumnMenu ' Me.statusColumnMenu.ImageScalingSize = New System.Drawing.Size(20, 20) Me.statusColumnMenu.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.deleteDataFrame, Me.renameSheet, Me.mnuBottomAddComment, Me.HideSheet, Me.unhideSheet, Me.CopySheet, Me.reorderSheet, Me.ViewSheet, Me.ToolStripSeparator11, Me.mnuHelp3}) Me.statusColumnMenu.Name = "statusColumnMenu" - Me.statusColumnMenu.Size = New System.Drawing.Size(181, 230) + Me.statusColumnMenu.Size = New System.Drawing.Size(163, 208) ' 'deleteDataFrame ' Me.deleteDataFrame.Name = "deleteDataFrame" - Me.deleteDataFrame.Size = New System.Drawing.Size(180, 22) + Me.deleteDataFrame.Size = New System.Drawing.Size(162, 22) Me.deleteDataFrame.Text = "Delete..." ' 'renameSheet ' Me.renameSheet.Name = "renameSheet" - Me.renameSheet.Size = New System.Drawing.Size(180, 22) + Me.renameSheet.Size = New System.Drawing.Size(162, 22) Me.renameSheet.Text = "Rename..." ' 'mnuBottomAddComment ' Me.mnuBottomAddComment.Name = "mnuBottomAddComment" - Me.mnuBottomAddComment.Size = New System.Drawing.Size(180, 22) + Me.mnuBottomAddComment.Size = New System.Drawing.Size(162, 22) Me.mnuBottomAddComment.Text = "Add Comment..." ' 'HideSheet ' Me.HideSheet.Name = "HideSheet" - Me.HideSheet.Size = New System.Drawing.Size(180, 22) + Me.HideSheet.Size = New System.Drawing.Size(162, 22) Me.HideSheet.Text = "Hide" ' 'unhideSheet ' Me.unhideSheet.Name = "unhideSheet" - Me.unhideSheet.Size = New System.Drawing.Size(180, 22) + Me.unhideSheet.Size = New System.Drawing.Size(162, 22) Me.unhideSheet.Text = "Unhide..." ' 'CopySheet ' Me.CopySheet.Name = "CopySheet" - Me.CopySheet.Size = New System.Drawing.Size(180, 22) + Me.CopySheet.Size = New System.Drawing.Size(162, 22) Me.CopySheet.Text = "Copy..." ' 'reorderSheet ' Me.reorderSheet.Enabled = False Me.reorderSheet.Name = "reorderSheet" - Me.reorderSheet.Size = New System.Drawing.Size(180, 22) + Me.reorderSheet.Size = New System.Drawing.Size(162, 22) Me.reorderSheet.Text = "Reorder..." ' 'ViewSheet ' Me.ViewSheet.Name = "ViewSheet" - Me.ViewSheet.Size = New System.Drawing.Size(180, 22) + Me.ViewSheet.Size = New System.Drawing.Size(162, 22) Me.ViewSheet.Text = "View Data Frame" ' + 'ToolStripSeparator11 + ' + Me.ToolStripSeparator11.Name = "ToolStripSeparator11" + Me.ToolStripSeparator11.Size = New System.Drawing.Size(159, 6) + ' + 'mnuHelp3 + ' + Me.mnuHelp3.Name = "mnuHelp3" + Me.mnuHelp3.Size = New System.Drawing.Size(162, 22) + Me.mnuHelp3.Text = "Help" + ' 'lblHeaderDataView ' Me.lblHeaderDataView.BackColor = System.Drawing.Color.FromArgb(CType(CType(35, Byte), Integer), CType(CType(105, Byte), Integer), CType(CType(190, Byte), Integer)) @@ -908,17 +952,6 @@ Partial Class ucrDataView Me.lblRowBack.Text = "<" Me.lblRowBack.TextAlign = System.Drawing.ContentAlignment.MiddleCenter ' - 'ToolStripSeparator8 - ' - Me.ToolStripSeparator8.Name = "ToolStripSeparator8" - Me.ToolStripSeparator8.Size = New System.Drawing.Size(211, 6) - ' - 'mnuHelp - ' - Me.mnuHelp.Name = "mnuHelp" - Me.mnuHelp.Size = New System.Drawing.Size(214, 22) - Me.mnuHelp.Text = "Help" - ' 'ucrReoGrid ' Me.ucrReoGrid.Dock = System.Windows.Forms.DockStyle.Fill @@ -937,39 +970,6 @@ Partial Class ucrDataView Me.ucrLinuxGrid.Size = New System.Drawing.Size(245, 437) Me.ucrLinuxGrid.TabIndex = 13 ' - 'ToolStripSeparator9 - ' - Me.ToolStripSeparator9.Name = "ToolStripSeparator9" - Me.ToolStripSeparator9.Size = New System.Drawing.Size(211, 6) - ' - 'mnuHelp1 - ' - Me.mnuHelp1.Name = "mnuHelp1" - Me.mnuHelp1.Size = New System.Drawing.Size(214, 22) - Me.mnuHelp1.Text = "Help" - ' - 'ToolStripSeparator10 - ' - Me.ToolStripSeparator10.Name = "ToolStripSeparator10" - Me.ToolStripSeparator10.Size = New System.Drawing.Size(211, 6) - ' - 'mnuHelp2 - ' - Me.mnuHelp2.Name = "mnuHelp2" - Me.mnuHelp2.Size = New System.Drawing.Size(214, 22) - Me.mnuHelp2.Text = "Help" - ' - 'ToolStripSeparator11 - ' - Me.ToolStripSeparator11.Name = "ToolStripSeparator11" - Me.ToolStripSeparator11.Size = New System.Drawing.Size(177, 6) - ' - 'mnuHelp3 - ' - Me.mnuHelp3.Name = "mnuHelp3" - Me.mnuHelp3.Size = New System.Drawing.Size(180, 22) - Me.mnuHelp3.Text = "Help" - ' 'ucrDataView ' Me.AutoScaleDimensions = New System.Drawing.SizeF(96.0!, 96.0!) @@ -1002,7 +1002,7 @@ Partial Class ucrDataView Private WithEvents mnuDeleteCol As ToolStripMenuItem Private WithEvents toolStripMenuItem2 As ToolStripSeparator Private WithEvents toolStripMenuItem21 As ToolStripSeparator - Private WithEvents mnuColumnFilter As ToolStripMenuItem + Private WithEvents mnuColumnFilterRows As ToolStripMenuItem Private WithEvents mnuClearColumnFilter As ToolStripMenuItem Private WithEvents cellContextMenuStrip As ContextMenuStrip Private WithEvents rowContextMenuStrip As ContextMenuStrip @@ -1050,7 +1050,7 @@ Partial Class ucrDataView Friend WithEvents mnuLabelsLevel As ToolStripMenuItem Friend WithEvents ToolStripSeparator7 As ToolStripSeparator Friend WithEvents mnuSorts As ToolStripMenuItem - Private WithEvents mnuFilters As ToolStripMenuItem + Private WithEvents mnuFilterRows As ToolStripMenuItem Private WithEvents mnuRemoveCurrentFilters As ToolStripMenuItem Friend WithEvents mnuComment As ToolStripMenuItem Friend WithEvents mnuColumnAddComment As ToolStripMenuItem diff --git a/instat/ucrDataView.vb b/instat/ucrDataView.vb index bde072eda75..682be4453b8 100644 --- a/instat/ucrDataView.vb +++ b/instat/ucrDataView.vb @@ -423,7 +423,7 @@ Public Class ucrDataView EndWait() End Sub - Private Sub mnuColumnFilter_Click(sender As Object, e As EventArgs) Handles mnuColumnFilter.Click + Private Sub mnuColumnFilter_Click(sender As Object, e As EventArgs) Handles mnuColumnFilterRows.Click dlgRestrict.bIsSubsetDialog = False dlgRestrict.strDefaultDataframe = _grid.CurrentWorksheet.Name dlgRestrict.ShowDialog() @@ -612,7 +612,7 @@ Public Class ucrDataView dlgSort.ShowDialog() End Sub - Private Sub mnuFilters_Click(sender As Object, e As EventArgs) Handles mnuFilters.Click + Private Sub mnuFilters_Click(sender As Object, e As EventArgs) Handles mnuFilterRows.Click dlgRestrict.bIsSubsetDialog = False dlgRestrict.strDefaultDataframe = _grid.CurrentWorksheet.Name dlgRestrict.ShowDialog()