Improvement of visual representation of the table representing catalog search results

bluesky_widgets/examples/utils/add_search_mixin.py

@@ -2,7 +2,7 @@
 
 headings = (
  "Unique ID",
- "Transient Scan ID",
+ "Scan ID",
  "Plan Name",
  "Start Time",
  "Duration",

bluesky_widgets/qt/_search_results.py

@@ -183,10 +183,13 @@ def __init__(self, model, *args, **kwargs):
  self.setEditTriggers(QAbstractItemView.NoEditTriggers)
  self.setSortingEnabled(False)
  self.setSelectionBehavior(QTableView.SelectRows)
- self.setShowGrid(False)
+ self.setShowGrid(True)
+ self.setAlternatingRowColors(True)
  self.verticalHeader().setVisible(False)
- self.horizontalHeader().setDefaultAlignment(Qt.AlignHCenter)
+ # Left alignment prevents column name to move to the right when the last section is stretched
+ self.horizontalHeader().setDefaultAlignment(Qt.AlignLeft)
  self.horizontalHeader().setSectionResizeMode(QHeaderView.ResizeToContents)
+ self.horizontalHeader().setStretchLastSection(True)
  # self.setAlternatingRowColors(True)
  self._abstract_table_model = _SearchResultsModel(model)
  self.setModel(self._abstract_table_model)

bluesky_widgets/qt/_searches.py

@@ -54,6 +54,8 @@ def __init__(self, model, *args, **kwargs):
  self._selector_widgets = [] # QComboBoxes
  self._run_search_widgets = [] # The SearchInput and SearchOutput widgets
 
+ self._vspacer = QSpacerItem(0, 0, QSizePolicy.Minimum, QSizePolicy.Minimum)
+
  run_search = model.run_search
  if run_search:
  # The root catalog contains Runs, so immediately display Run Search
@@ -91,9 +93,8 @@ def on_selection(index):
 
  selector.activated.connect(on_selection)
  self.layout().addWidget(selector)
- self.layout().addItem(
- QSpacerItem(0, 0, QSizePolicy.Minimum, QSizePolicy.Minimum)
- )
+ self._vspacer.changeSize(0, 0, QSizePolicy.Expanding, QSizePolicy.Expanding)
+ self.layout().addItem(self._vspacer)
 
  def on_go_back(self, event):
  "Move up the tree of subcatalogs by one step."
@@ -102,6 +103,8 @@ def on_go_back(self, event):
  widget = self._selector_widgets.pop()
  widget.close()
  self._selector_widgets[-1].setEnabled(True)
+ self._selector_widgets[-1].setCurrentIndex(-1)
+
  if not breadcrumbs:
  # This is the last widget. Disable back button.
  self._back_button.setEnabled(False)
@@ -119,12 +122,14 @@ def _initialize_run_search(self, search_input, search_results):
  )
  for w in self._run_search_widgets:
  self.layout().addWidget(w)
+ self._vspacer.changeSize(0, 0, QSizePolicy.Minimum, QSizePolicy.Minimum)
 
  def on_run_search_cleared(self, event):
  "Clear search input and output."
  for w in self._run_search_widgets:
  w.setParent(None)
  self._run_search_widgets.clear()
+ self._vspacer.changeSize(0, 0, QSizePolicy.Expanding, QSizePolicy.Expanding)
 
 
 class QtSearches(QTabWidget):

requirements.txt

@@ -1,2 +1,3 @@
 bluesky-live >=0.0.7
 numpy
+suitcase-utils <=0.5.3