Skip to content

Show active config path in window title #120

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.

Sign up for GitHub

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

Open
ispielma wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Show active config path in window title #120

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 4 additions & 2 deletions blacs/__main__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@
#Draggable Tab Widget Code
from labscript_utils.qtwidgets.dragdroptab import DragDropTabWidget
# Lab config code
from labscript_utils.labconfig import LabConfig
from labscript_utils.labconfig import LabConfig, LabscriptApplication
from labscript_profile import hostname
# Analysis Submission code
from blacs.analysis_submission import AnalysisSubmission
Expand Down Expand Up @@ -220,7 +220,7 @@ def run_measure_ball(self):
inmain(self.setEnabled, True)


class BLACS(object):
class BLACS(LabscriptApplication):

tab_widget_ids = 7

Expand All @@ -239,10 +239,12 @@ def __init__(self,application):
#loader.registerCustomPromotion('BLACS',BLACSWindow)
self.ui = loader.load(os.path.join(BLACS_DIR, 'main.ui'), BLACSWindow())
logger.info('BLACS ui loaded')
self.init_config_window_title()
self.ui.blacs=self
self.tab_widgets = {}
self.exp_config = exp_config # Global variable
self.settings_path = settings_path # Global variable
self.set_config_window_title(self.settings_path)
self.connection_table = connection_table # Global variable
self.connection_table_h5file = self.exp_config.get('paths','connection_table_h5')
self.connection_table_labscript = self.exp_config.get('paths','connection_table_py')
Expand Down
4 changes: 2 additions & 2 deletions blacs/experiment_queue.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,9 @@
from binascii import hexlify

from qtutils.qt.QtCore import Qt, QItemSelectionModel
from qtutils.qt.QtGui import QIcon, QAction, QStandardItemModel, QStandardItem
from qtutils.qt.QtGui import QIcon, QStandardItemModel, QStandardItem
from qtutils.qt.QtWidgets import (
QAction,
QTreeView,
QMenu,
QFileDialog,
Expand Down Expand Up @@ -997,4 +998,3 @@ def restart_function(device_name):

self.set_status("Idle")
logger.info('Stopping')