From 8242c800057ae6ab2f835d71190c438a8930f433 Mon Sep 17 00:00:00 2001 From: tmichela Date: Fri, 30 Aug 2024 14:31:38 +0200 Subject: [PATCH] allow hiding the Status column hiding status column --- damnit/gui/main_window.py | 8 ++------ damnit/gui/table.py | 9 +++++---- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/damnit/gui/main_window.py b/damnit/gui/main_window.py index fce8c085..cf496134 100644 --- a/damnit/gui/main_window.py +++ b/damnit/gui/main_window.py @@ -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 @@ -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 @@ -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: diff --git a/damnit/gui/table.py b/damnit/gui/table.py index cb71130a..f3571361 100644 --- a/damnit/gui/table.py +++ b/damnit/gui/table.py @@ -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 @@ -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) @@ -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)