Compare commits
3 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 4cf494982e | |||
| bba3ecf4c1 | |||
| 0d763f267c |
27
base.py
27
base.py
@@ -241,8 +241,8 @@ class BaseWindow(QMainWindow):
|
||||
|
||||
self.parent.from_hdf = from_hdf
|
||||
|
||||
print("t=========================>", ts_in_seconds, " // ", now_in_seconds)
|
||||
print("from hdf5=========================>", from_hdf)
|
||||
print("t", ts_in_seconds, now_in_seconds)
|
||||
print("from hdf5, dialog=====>", from_hdf, self.from_dialog)
|
||||
|
||||
if self.parent.hdf_filename is None or not self.from_dialog:
|
||||
self.parent.set_new_hdf_filename(ts_in_seconds,
|
||||
@@ -407,7 +407,6 @@ class BaseWindow(QMainWindow):
|
||||
self.appversion = appversion if appversion else _appversion
|
||||
self.source_file = None
|
||||
self.author = _author
|
||||
self.appversion = _appversion
|
||||
self.title = title
|
||||
self.facility = facility
|
||||
self.user_mode = user_mode
|
||||
@@ -439,6 +438,7 @@ class BaseWindow(QMainWindow):
|
||||
self.filename = None
|
||||
self.hdf_filename_loaded = "NONE" #For loading into hdf dockwidget
|
||||
self.hdf_filename = None #For saving
|
||||
self.hdf_user_dict = {}
|
||||
self.hdf_dialog = None
|
||||
self.from_hdf = False
|
||||
|
||||
@@ -1131,6 +1131,7 @@ class BaseWindow(QMainWindow):
|
||||
QApplication.processEvents()
|
||||
return False
|
||||
|
||||
|
||||
return True
|
||||
|
||||
|
||||
@@ -1222,11 +1223,16 @@ class BaseWindow(QMainWindow):
|
||||
def add_general_to_hdf(self, dataH5):
|
||||
isOK = True
|
||||
user_dict = {}
|
||||
|
||||
user_dict['Comment'] = self.hdf_dialog.user_dict[
|
||||
'Comment'] if self.hdf_dialog is not None else str(
|
||||
"HDF file generated via Save All button")
|
||||
|
||||
|
||||
#user_dict['Comment'] is prefilled in get_data in savehdf.py
|
||||
#user_dict['Comment'] = self.hdf_dialog.user_dict[
|
||||
# 'Comment'] if self.hdf_dialog is not None else str(
|
||||
# "HDF file generated via Save All button")
|
||||
#user_dict['Comment'] = self.hdf_dialog.comment.document().toPlainText()
|
||||
if self.hdf_user_dict:
|
||||
user_dict['Comment'] = self.hdf_user_dict['Comment']
|
||||
else:
|
||||
user_dict['Comment'] = "HDF file generated via Save All button"
|
||||
user_dict['Author'] = self.author
|
||||
user_dict['Application'] = self.pymodule
|
||||
user_dict['Version'] = self.appversion
|
||||
@@ -1270,7 +1276,7 @@ class BaseWindow(QMainWindow):
|
||||
""" This uses the widget interface to allow the user to enter
|
||||
additional meta-data
|
||||
"""
|
||||
|
||||
print("save_to_hdf_dialog==>", flush=True)
|
||||
if not self.verify_save_to_hdf():
|
||||
return False
|
||||
|
||||
@@ -1286,6 +1292,7 @@ class BaseWindow(QMainWindow):
|
||||
'Reanalysis time in seconds']
|
||||
self.set_new_hdf_filename(ts_in_seconds, now_in_seconds)
|
||||
|
||||
|
||||
input_options['Destination'] = self.hdf_filename
|
||||
input_options['Time in seconds'] = self.all_data['Ambient data'][
|
||||
'Time in seconds']
|
||||
@@ -1293,7 +1300,7 @@ class BaseWindow(QMainWindow):
|
||||
self.hdf_dialog = QSaveHDF(self, input_options=input_options,
|
||||
from_dialog=True)
|
||||
|
||||
|
||||
|
||||
def verify_send_to_elog(self):
|
||||
|
||||
if self.analysis_thread is not None:
|
||||
|
||||
@@ -38,7 +38,6 @@ class QSaveHDF(QDialog):
|
||||
self.user_dict = {}
|
||||
self.user_dict['Comment'] = None
|
||||
#self.file_name = None
|
||||
|
||||
#self.excluded_input = ['Year', 'Month', 'Date']
|
||||
|
||||
if 'Time in seconds' in input_options.keys():
|
||||
@@ -244,6 +243,7 @@ class QSaveHDF(QDialog):
|
||||
|
||||
def save(self):
|
||||
self.get_data()
|
||||
self.parent.hdf_user_dict = self.user_dict
|
||||
self.parent.hdf_filename = self.user_dict['Destination']
|
||||
self.parent.save_to_hdf(from_dialog=self.from_dialog)
|
||||
self.close()
|
||||
|
||||
Reference in New Issue
Block a user