Skip to content

Commit

Permalink
Merge pull request #324 : Hide the Status column
Browse files Browse the repository at this point in the history
Hide the Status column
  • Loading branch information
tmichela authored Sep 11, 2024
2 parents 1beceb7 + 8242c80 commit cc55704
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 10 deletions.
8 changes: 2 additions & 6 deletions damnit/gui/main_window.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,11 @@
from datetime import datetime
from enum import Enum
from pathlib import Path
from socket import gethostname

import h5py
import numpy as np
import pandas as pd
import xarray as xr
from kafka.errors import NoBrokersAvailable
from pandas.api.types import infer_dtype
from plotly.graph_objects import Figure as PlotlyFigure
from PyQt5 import QtCore, QtGui, QtSvg, QtWidgets
from PyQt5.Qsci import QsciLexerPython, QsciScintilla
from PyQt5.QtCore import Qt
Expand All @@ -24,7 +20,7 @@

from ..api import DataType, RunVariables
from ..backend import backend_is_running, initialize_and_start_backend
from ..backend.db import BlobTypes, DamnitDB, MsgKind, ReducedData, db_path
from ..backend.db import DamnitDB, MsgKind, ReducedData, db_path
from ..backend.extraction_control import process_log_path, ExtractionSubmitter
from ..backend.user_variables import UserEditableVariable
from ..definitions import UPDATE_BROKERS
Expand Down Expand Up @@ -273,7 +269,7 @@ def launch_update_computed_vars(self):

def add_variable(self, name, title, variable_type, description="", before=None):
n_static_cols = self.table_view.get_static_columns_count()
before_pos = n_static_cols + 1
before_pos = n_static_cols
if before == None:
before_pos += self.table_view.get_movable_columns_count()
else:
Expand Down
9 changes: 5 additions & 4 deletions damnit/gui/table.py
Original file line number Diff line number Diff line change
Expand Up @@ -134,8 +134,8 @@ def set_column_visibility(self, name, visible, for_restore=False):
self.settings_changed.emit()

def item_moved(self, parent, start, end, destination, row):
# Take account of the static columns, and the Status column
col_offset = self._static_columns_widget.count() + 1
# Take account of the static columns
col_offset = self._static_columns_widget.count()

col_from = start + col_offset
col_to = self._columns_widget.currentIndex().row() + col_offset
Expand Down Expand Up @@ -174,8 +174,9 @@ def add_new_columns(self, columns, statuses, positions = None):
if positions is None:
rows_count = self._columns_widget.count()
positions = [ii + rows_count for ii in range(len(columns))]

for column, status, position in zip(columns, statuses, positions):
if column in ["Status", "comment_id"]:
if column == "comment_id":
continue

item = QtWidgets.QListWidgetItem(column)
Expand Down Expand Up @@ -203,7 +204,7 @@ def set_columns(self, columns, statuses):
self._columns_widget.clear()
self._static_columns_widget.clear()

static_columns = ["Proposal", "Run", "Timestamp", "Comment"]
static_columns = ["Status", "Proposal", "Run", "Timestamp", "Comment"]
for column, status in zip(columns, statuses):
if column in static_columns:
item = QtWidgets.QListWidgetItem(column)
Expand Down

0 comments on commit cc55704

Please sign in to comment.