QTabWidget to grid
This commit is contained in:
15
base.py
15
base.py
@@ -102,15 +102,10 @@ class BaseWindow(QMainWindow):
|
||||
attach_files = []
|
||||
folder_name = self.folder_name
|
||||
|
||||
print("Running SaveFigureThread, folder_name=", folder_name,
|
||||
flush=True)
|
||||
|
||||
date_str = self.parent.add_date_to_path(
|
||||
time_in_seconds=self.time_in_seconds,
|
||||
reanalysis_time_in_seconds=self.reanalysis_time)
|
||||
|
||||
print("date_str", date_str, flush=True)
|
||||
|
||||
def extract_and_attach(i, nfig, name, all_fig_data):
|
||||
canvas = 'Canvas {0}'.format(i+1)
|
||||
name_base = name.replace(' ', '_').lower()
|
||||
@@ -128,8 +123,7 @@ class BaseWindow(QMainWindow):
|
||||
idx) if idx > 0 else name_base
|
||||
save_dest = (folder_name + date_str + '_' + name +
|
||||
'.png')
|
||||
print("name==>", name)
|
||||
print("save destination==>", save_dest, flush=True)
|
||||
|
||||
if not os.path.exists(save_dest):
|
||||
if all_fig_data[canvas][idx] is not None:
|
||||
_dirname = os.path.dirname(save_dest)
|
||||
@@ -1762,10 +1756,13 @@ class BaseWindow(QMainWindow):
|
||||
self.analysis_thread.started.connect(self.analysis_thread_started)
|
||||
self.analysis_thread.finished.connect(self.analysis_thread_finished)
|
||||
|
||||
|
||||
self.analysis_thread.start()
|
||||
if self.verify_analysis_thread():
|
||||
self.analysis_thread.start()
|
||||
QApplication.processEvents()
|
||||
|
||||
|
||||
|
||||
|
||||
@Slot()
|
||||
def analysis_thread_started(self):
|
||||
""" Change state of widgets when measuring
|
||||
|
||||
19
guiframe.py
19
guiframe.py
@@ -1728,7 +1728,7 @@ class GUIFrame(QWidget):
|
||||
value = param["data"]["value"]
|
||||
elif "link" in param["data"]:
|
||||
link_list = param["data"]["link"]
|
||||
print("ll", link_list, flush=True)
|
||||
|
||||
if len(link_list) == 1:
|
||||
value = self.settings.data[link_list[0]]
|
||||
print("values", value, flush=True)
|
||||
@@ -2364,11 +2364,9 @@ class GUIFrame(QWidget):
|
||||
#line.textEdited.connect(line_cb)
|
||||
line.textChanged.emit(str(value))
|
||||
|
||||
|
||||
line.setAlignment(Qt.AlignRight | Qt.AlignBottom)
|
||||
line.setStyleSheet("QLabel{text-align: right}")
|
||||
|
||||
|
||||
try:
|
||||
w =self.settings.data["Parameters"][key]["data"]["width"]
|
||||
line.setFixedWidth(w)
|
||||
@@ -2719,7 +2717,19 @@ class GUIFrame(QWidget):
|
||||
elif buddy == "QTabWidget".upper():
|
||||
#print("buddy/label", buddy, label, key, value, flush=True)
|
||||
line = self.qtab_wgt(key, irow, wgt_grid)
|
||||
wgt_grid.addWidget(line, irow, 0, 1, 4,
|
||||
|
||||
if self.grid_loc:
|
||||
a = self.grid_loc[0]
|
||||
b = self.grid_loc[1]
|
||||
c = self.grid_loc[2]
|
||||
d = self.grid_loc[3]
|
||||
else:
|
||||
a = irow
|
||||
b = 0
|
||||
c = 1
|
||||
d = 4
|
||||
|
||||
wgt_grid.addWidget(line, a, b, c, d,
|
||||
Qt.AlignLeft | Qt.AlignVCenter)
|
||||
else:
|
||||
wgt_list = ["QCheckBox", "QComboBox", "QDoubleSpinBox", "QFrame",
|
||||
@@ -2938,7 +2948,6 @@ class GUIFrame(QWidget):
|
||||
#self.setLayout(layout)
|
||||
|
||||
target_list = options
|
||||
|
||||
color_list = ["#894961", "teal", "darkblue"]
|
||||
|
||||
self.radiobutton = [None] * len(options)
|
||||
|
||||
Reference in New Issue
Block a user