self.hdf_thread_started connected to signal
This commit is contained in:
22
base.py
22
base.py
@@ -207,13 +207,10 @@ class BaseWindow(QMainWindow):
|
||||
now_in_seconds = self.all_data['Processed data'][
|
||||
'Reanalysis time in seconds']
|
||||
|
||||
|
||||
|
||||
if self.parent.hdf_filename is None or not self.from_dialog:
|
||||
self.parent.set_new_hdf_filename(ts_in_seconds,
|
||||
now_in_seconds)
|
||||
|
||||
|
||||
#else:
|
||||
# self.parent.set_new_hdf_filename(ts_in_seconds,
|
||||
# now_in_seconds)
|
||||
@@ -1736,7 +1733,7 @@ class BaseWindow(QMainWindow):
|
||||
self.hdf_thread.trigger_thread_event.connect(
|
||||
self.receive_analysis_results)
|
||||
#procedure moved above
|
||||
#self.hdf_thread.started.connect(self.hdf_thread_started)
|
||||
self.hdf_thread.started.connect(self.hdf_thread_started)
|
||||
self.hdf_thread.finished.connect(self.hdf_thread_finished)
|
||||
|
||||
self.hdf_thread.start()
|
||||
@@ -1824,9 +1821,9 @@ class BaseWindow(QMainWindow):
|
||||
@Slot(dict)
|
||||
def receive_analysis_results(self, all_dict):
|
||||
self.all_data = all_dict
|
||||
|
||||
|
||||
self.gui_frame.canvas_update(all_dict['Figure data'])
|
||||
|
||||
|
||||
if self.gui_frame.results_output_wgt_dict:
|
||||
#all_dict['Processed data']['Results']={}
|
||||
#all_dict['Processed data']['Results']['mean'] = 123.23
|
||||
@@ -1836,14 +1833,13 @@ class BaseWindow(QMainWindow):
|
||||
self.gui_frame.send_to_results_output_wgt(results_data)
|
||||
except:
|
||||
pass
|
||||
|
||||
|
||||
#print("IDX+++", self.gui_frame.central_tab_widget.indexOf('Emittance'), flush=True)
|
||||
#print("IDX+++", self.gui_frame.level2_tab_wgt[0].indexOf('Plots'))
|
||||
#self.gui_frame.central_tab_widget.setCurrentIndex(1)
|
||||
|
||||
self.gui_frame.results_tab_wgt.setCurrentIndex(0)
|
||||
|
||||
|
||||
if "GUITree" in self.settings.data:
|
||||
|
||||
#for j in range(len(self.gui_frame.level1_tab_wgt)):
|
||||
@@ -1877,7 +1873,7 @@ class BaseWindow(QMainWindow):
|
||||
else:
|
||||
pass
|
||||
|
||||
print("receive_analysis_results=========================>", flush=True)
|
||||
#print("receive_analysis_results=========================>", flush=True)
|
||||
|
||||
@Slot()
|
||||
def receive_abort_analysis(self):
|
||||
@@ -2047,6 +2043,12 @@ class BaseWindow(QMainWindow):
|
||||
width = 860 + (len(appname)-10)*15
|
||||
height = 220
|
||||
self.splash_screen.resize(width, height)
|
||||
|
||||
#Maybe useful at some point
|
||||
#pSplashNotice = QCheckBox(self.splash_screen);
|
||||
#pSplashNotice.setChecked(Qt.Checked)
|
||||
|
||||
|
||||
self.splash_progressbar = QProgressBar(self.splash_screen)
|
||||
self.splash_timer = QTimer()
|
||||
self.splash_screen.show()
|
||||
@@ -2078,7 +2080,7 @@ class BaseWindow(QMainWindow):
|
||||
int_seconds_remaining = int(delay - (now-start1))
|
||||
seconds_remaining = '{:2d}'.format(int_seconds_remaining)
|
||||
self.splash_progressbar.setValue(val)
|
||||
#self.processEvents()
|
||||
self.processEvents()
|
||||
self.flush()
|
||||
sec_str = "s" if abs(int_seconds_remaining) != 1 else ""
|
||||
mess = """
|
||||
|
||||
@@ -1174,7 +1174,7 @@ class GUIFrame(QWidget):
|
||||
hline="NONE"):
|
||||
def on_change(state):
|
||||
self.input_parameters[key] = bool(state)
|
||||
|
||||
|
||||
|
||||
widget = QWidget()
|
||||
layout = QGridLayout()
|
||||
@@ -2308,7 +2308,7 @@ class GUIFrame(QWidget):
|
||||
def input_wgt_qcheckbox(self, key, value, label_text, irow, wgt_grid):
|
||||
def check_cb(new_value):
|
||||
self.parent.input_parameters[key] = bool(new_value)
|
||||
print("check_cbp", key, new_value, flush=True)
|
||||
#print("check_cbp", key, new_value, flush=True)
|
||||
if key == "HLAPipelineCtrl":
|
||||
if self.pipeline_group_box is not None:
|
||||
self.pipeline_group_box.setEnabled(bool(new_value))
|
||||
|
||||
Reference in New Issue
Block a user