Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix bug: Additional Empty Sheet Issue in Column Metadata #9396

Merged
merged 4 commits into from
Feb 19, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions instat/frmMain.vb
Original file line number Diff line number Diff line change
Expand Up @@ -328,6 +328,8 @@ Public Class frmMain
mnuDataViewWindow.Checked = True
mnuOutputWindow.Checked = True
mnuLogScript.Checked = False
UpdateSwapDataAndMetadata()
UpdateSwapDataAndScript()

EnableDisbaleViewSwapMenu(True)
UpdateSwapDataAndScript()
Expand Down Expand Up @@ -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

Expand Down Expand Up @@ -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

Expand Down Expand Up @@ -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()
Expand Down Expand Up @@ -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
Expand Down
14 changes: 12 additions & 2 deletions instat/ucrColumnMetadata.vb
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down Expand Up @@ -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
Expand Down
Loading