diff --git a/instat/frmMain.vb b/instat/frmMain.vb index 78dfc6c399..05aa150b26 100644 --- a/instat/frmMain.vb +++ b/instat/frmMain.vb @@ -328,6 +328,8 @@ Public Class frmMain mnuDataViewWindow.Checked = True mnuOutputWindow.Checked = True mnuLogScript.Checked = False + UpdateSwapDataAndMetadata() + UpdateSwapDataAndScript() EnableDisbaleViewSwapMenu(True) UpdateSwapDataAndScript() @@ -850,6 +852,7 @@ Public Class frmMain Private Sub mnuPrepareSheetColumnMetadata_Click(sender As Object, e As EventArgs) Handles mnuViewColumnMetadata.Click mnuDataFrameMetadat.Checked = mnuViewDataFrameMetadata.Checked mnuViewColumnMetadata.Checked = Not mnuViewColumnMetadata.Checked + ucrColumnMeta.IsEnabled = mnuViewColumnMetadata.Checked UpdateLayout() End Sub @@ -2311,12 +2314,14 @@ Public Class frmMain Private Sub MnuMetadata_ButtonClick(sender As Object, e As EventArgs) Handles mnuMetadata.ButtonClick mnuViewColumnMetadata.Checked = Not mnuViewColumnMetadata.Checked mnuColumnMetadat.Checked = mnuViewColumnMetadata.Checked + ucrColumnMeta.IsEnabled = mnuViewColumnMetadata.Checked UpdateLayout() End Sub Private Sub MnuColumnMetadat_Click(sender As Object, e As EventArgs) Handles mnuColumnMetadat.Click mnuViewColumnMetadata.Checked = Not mnuViewColumnMetadata.Checked mnuColumnMetadat.Checked = mnuViewColumnMetadata.Checked + ucrColumnMeta.IsEnabled = mnuViewColumnMetadata.Checked UpdateLayout() End Sub @@ -2551,6 +2556,7 @@ Public Class frmMain Private Sub mnuViewSwapDataAndMetadata_Click(sender As Object, e As EventArgs) Handles mnuViewSwapDataAndMetadata.Click mnuViewSwapDataAndMetadata.Checked = Not mnuViewSwapDataAndMetadata.Checked + ucrColumnMeta.IsEnabled = mnuViewSwapDataAndMetadata.Checked mnuViewSwapDataAndDataframeMetadata.Enabled = Not mnuViewSwapDataAndMetadata.Checked mnuViewSwapDataAndScript.Enabled = Not mnuViewSwapDataAndMetadata.Checked UpdateSwapDataAndMetadata() @@ -2947,6 +2953,7 @@ Public Class frmMain Private Sub mnuSwapDataMetadata_Click(sender As Object, e As EventArgs) Handles mnuSwapDataMetadata.Click mnuViewSwapDataAndMetadata.Checked = Not mnuViewSwapDataAndMetadata.Checked + ucrColumnMeta.IsEnabled = mnuViewSwapDataAndMetadata.Checked UpdateSwapDataAndMetadata() UpdateLayout() End Sub diff --git a/instat/ucrColumnMetadata.vb b/instat/ucrColumnMetadata.vb index f7df8f6fc1..6b2797bca8 100644 --- a/instat/ucrColumnMetadata.vb +++ b/instat/ucrColumnMetadata.vb @@ -32,6 +32,7 @@ Public Class ucrColumnMetadata Private strLabelsLabel As String = "labels" Private strLabelsScientific As String = "Scientific" Private _Refreshed As Boolean = False + Private _isEnabled As Boolean Private bWideDataSetPromptResponse As DialogResult = DialogResult.None Public Sub New() @@ -150,14 +151,23 @@ Public Class ucrColumnMetadata _grid.UpdateAllWorksheetStyles() End Sub + Public Property IsEnabled() As Boolean + Get + Return _isEnabled + End Get + Set(ByVal value As Boolean) + _isEnabled = value + End Set + End Property + Public Sub RefreshGridData() 'todo. a temporary useful fix because of wide data sets 'only refresh the grid when the data book is initialised and the grid is visible 'displaying more than a 1000 rows takes a lot of time 'in the long term, this window should have 'paging' feature similar to the data viewer to display 11000 rows only. - If _clsDataBook IsNot Nothing And Visible Then - _grid.RemoveOldWorksheets() + If _clsDataBook IsNot Nothing AndAlso Visible AndAlso _isEnabled Then AddAndUpdateWorksheets() + _grid.RemoveOldWorksheets() _grid.bVisible = _clsDataBook.DataFrames.Count > 0 End If End Sub