diff --git a/Classes/LoadMeasurements.py b/Classes/LoadMeasurements.py
index 5c3f14ea7949f854dc8fc1b28fea2f9f4d0afd0a..c54ce7ec914640a262274cb4437f773e65c52435 100644
--- a/Classes/LoadMeasurements.py
+++ b/Classes/LoadMeasurements.py
@@ -321,7 +321,6 @@ class LoadMeasurements(QThread):
'tr_oursin_u_cov': oursin.u['u_cov'][ind_transect],
'tr_oursin_u_total': oursin.u['total_95'][ind_transect],
'meas_comments': meas_comment,
- 'meas_label_user': meas.user_label,
# 'QRev_95': meas.uncertainty.total_95,
# 'tr_qrev_u_cov': meas.uncertainty.cov_95 / 2,
@@ -332,6 +331,7 @@ class LoadMeasurements(QThread):
# 'tr_qrev_u_moving_bed': meas.uncertainty.moving_bed_95 /2
}
tr_dict |= {k: v for k, v in zip(split_label, name_split[i])}
+ tr_dict |= {'meas_label_user': meas.user_label}
transects_data.append(tr_dict)
i += 1
diff --git a/UI/Columns2Use.py b/UI/Columns2Use.py
index c33150fb501e811b34f2b8cc2fa8129c515e79db..32ed5224df6fc9fc20d08a127b4647510a93da26 100644
--- a/UI/Columns2Use.py
+++ b/UI/Columns2Use.py
@@ -106,8 +106,6 @@ class Columns2Use(QtWidgets.QDialog, wColumns2Use.Ui_Columns2Use):
row += 1
- tbl.resizeColumnsToContents()
- tbl.resizeRowsToContents()
def keyPressEvent(self, event):
print('Pressed : ', event.key())
diff --git a/UI/FigTimeDischarge.py b/UI/FigTimeDischarge.py
index 68329faec8b57d83cd246f7697c7ccc431808cdc..43f0ee9f1ec82407521132381f9bf346b846b270 100644
--- a/UI/FigTimeDischarge.py
+++ b/UI/FigTimeDischarge.py
@@ -73,17 +73,19 @@ class FigTimeDischarge(object):
df = mean_selected_meas
if df['end_time'].max() - df['start_time'].min() < 1210000:
- start_datetime = [datetime.utcfromtimestamp(i) for i in df.start_time]
- end_datetime = [datetime.utcfromtimestamp(i) for i in df.end_time]
- self.fig.ax.hlines(df.tr_q_total * self.units['Q'], start_datetime, end_datetime,
- color='k', linewidth=1, zorder=0)
if selected_meas:
df_selected_meas = df[df['meas_name'] == selected_meas]
+ df = df[df['meas_name'] != selected_meas]
start_datetime = [datetime.utcfromtimestamp(i) for i in df_selected_meas.start_time]
end_datetime = [datetime.utcfromtimestamp(i) for i in df_selected_meas.end_time]
self.fig.ax.hlines(df_selected_meas.tr_q_total * self.units['Q'], start_datetime, end_datetime,
color='darkorange', linewidth=2, zorder=1)
+ start_datetime = [datetime.utcfromtimestamp(i) for i in df.start_time]
+ end_datetime = [datetime.utcfromtimestamp(i) for i in df.end_time]
+ self.fig.ax.hlines(df.tr_q_total * self.units['Q'], start_datetime, end_datetime,
+ color='k', linewidth=1, zorder=0)
+
self.fig.ax.xaxis.set_major_formatter(mdates.DateFormatter('%d %b %H:%M'))
else:
df = df.groupby('meas_name').agg({'start_time': 'min', 'end_time': 'max', 'meas_mean_q': 'mean'})
@@ -98,7 +100,6 @@ class FigTimeDischarge(object):
color='r', zorder=1)
self.fig.ax.xaxis.set_major_formatter(mdates.DateFormatter('%d %b %y'))
-
self.fig.ax.tick_params(which="major", axis="x", pad=14, size=2)
self.fig.autofmt_xdate()
diff --git a/UI/main.py b/UI/main.py
index 4af75f17f325b791b1215fe480e08d8deb1ae5c2..5e0e855df125f060799760ed99e7f121491c4fd8 100644
--- a/UI/main.py
+++ b/UI/main.py
@@ -198,67 +198,17 @@ class ApplicationWindow(QMainWindow, Ui_MainWindow):
self.column_effect_team_idx = 0
self.columns_effects = [None]
- if 'intercomparison_process' in self.sticky_settings.settings:
- self.intercomparison_process = self.sticky_settings.get('intercomparison_process')
- else:
- self.intercomparison_process = False
- self.sticky_settings.new('intercomparison_process', False)
-
- if 'discharge_deviation' in self.sticky_settings.settings:
- self.discharge_deviation = self.sticky_settings.get('discharge_deviation')
- else:
- self.discharge_deviation = 5
- self.sticky_settings.new('discharge_deviation', 5)
-
- if 'empirical_n_transects' in self.sticky_settings.settings:
- self.empirical_n_transects = self.sticky_settings.get('empirical_n_transects')
- else:
- self.empirical_n_transects = 1
- self.sticky_settings.new('empirical_n_transects', 1)
-
- if 'empirical_n_sections' in self.sticky_settings.settings:
- self.empirical_n_sections = self.sticky_settings.get('empirical_n_sections')
- else:
- self.empirical_n_sections = 1
- self.sticky_settings.new('empirical_n_sections', 1)
-
- if 'empirical_n_teams' in self.sticky_settings.settings:
- self.empirical_n_teams = self.sticky_settings.get('empirical_n_teams')
- else:
- self.empirical_n_teams = 1
- self.sticky_settings.new('empirical_n_teams', 1)
-
+ self.intercomparison_process = False
+ self.discharge_deviation = 5
+ self.empirical_n_transects = 1
+ self.empirical_n_sections = 1
+ self.empirical_n_teams = 1
self.discharge_mean = None
-
- if 'auto_discharge_reference' in self.sticky_settings.settings:
- self.auto_discharge_reference = self.sticky_settings.get('auto_discharge_reference')
- else:
- self.auto_discharge_reference = True
- self.sticky_settings.new('auto_discharge_reference', True)
-
- if 'uncertainty_reference' in self.sticky_settings.settings:
- self.uncertainty_reference = self.sticky_settings.get('uncertainty_reference')
- else:
- self.uncertainty_reference = 0
- self.sticky_settings.new('uncertainty_reference', 0)
-
- if 'discharge_reference' in self.sticky_settings.settings:
- self.discharge_reference = self.sticky_settings.get('discharge_reference')
- else:
- self.discharge_reference = ''
- self.sticky_settings.new('discharge_reference', '')
-
- if 'auto_u_bias' in self.sticky_settings.settings:
- self.auto_u_bias = self.sticky_settings.get('auto_u_bias')
- else:
- self.auto_u_bias = True
- self.sticky_settings.new('auto_u_bias', True)
-
- if 'u_bias' in self.sticky_settings.settings:
- self.u_bias = self.sticky_settings.get('u_bias')
- else:
- self.u_bias = 0
- self.sticky_settings.new('u_bias', 0)
+ self.auto_discharge_reference = True
+ self.uncertainty_reference = 0
+ self.discharge_reference = ''
+ self.auto_u_bias = True
+ self.u_bias = 0
self.select_folder = None # Save folder paths
self.meas_checked = None # Selected measurements name, can be updated
@@ -1432,7 +1382,6 @@ class ApplicationWindow(QMainWindow, Ui_MainWindow):
i += 1
tbl.setItem(i, 0, QtWidgets.QTableWidgetItem(col_label[i]))
tbl.item(i, 0).setFont(font)
- # tbl.item(i, 0).setBackground(QtGui.QColor('lightgray'))
tbl.item(i, 0).setFlags(QtCore.Qt.ItemIsEnabled)
tbl.setItem(i, 1,
QtWidgets.QTableWidgetItem('{}%'.format(scientific_notation(
@@ -1443,7 +1392,6 @@ class ApplicationWindow(QMainWindow, Ui_MainWindow):
i += 1
tbl.setItem(i, 0, QtWidgets.QTableWidgetItem(col_label[i]))
tbl.item(i, 0).setFont(font)
- # tbl.item(i, 0).setBackground(QtGui.QColor('lightgray'))
tbl.item(i, 0).setFlags(QtCore.Qt.ItemIsEnabled)
tbl.setItem(i, 1,
QtWidgets.QTableWidgetItem('{}%'.format(scientific_notation(
@@ -1453,33 +1401,12 @@ class ApplicationWindow(QMainWindow, Ui_MainWindow):
i += 1
tbl.setItem(i, 0, QtWidgets.QTableWidgetItem(col_label[i]))
tbl.item(i, 0).setFont(font)
- # tbl.item(i, 0).setBackground(QtGui.QColor('lightgray'))
tbl.item(i, 0).setFlags(QtCore.Qt.ItemIsEnabled)
tbl.setItem(i, 1,
QtWidgets.QTableWidgetItem('{}%'.format(scientific_notation(
np.nanmean(self.transects_df['s_R_prct']), 3))))
tbl.item(i, 1).setFlags(QtCore.Qt.ItemIsEnabled)
- # i += 1
- # tbl.setItem(i, 0, QtWidgets.QTableWidgetItem(col_label[i]))
- # tbl.item(i, 0).setFont(font)
- # tbl.item(i, 0).setBackground(QtGui.QColor('lightgray'))
- # tbl.item(i, 0).setFlags(QtCore.Qt.ItemIsEnabled)
- # tbl.setItem(i, 1,
- # QtWidgets.QTableWidgetItem('{}%'.format(scientific_notation(
- # np.nanmin(self.transects_df['A_r']), 3))))
- # tbl.item(i, 1).setFlags(QtCore.Qt.ItemIsEnabled)
- #
- # i += 1
- # tbl.setItem(i, 0, QtWidgets.QTableWidgetItem(col_label[i]))
- # tbl.item(i, 0).setFont(font)
- # tbl.item(i, 0).setBackground(QtGui.QColor('lightgray'))
- # tbl.item(i, 0).setFlags(QtCore.Qt.ItemIsEnabled)
- # tbl.setItem(i, 1,
- # QtWidgets.QTableWidgetItem('{}%'.format(scientific_notation(
- # np.nanmin(self.transects_df['A_R']), 3))))
- # tbl.item(i, 1).setFlags(QtCore.Qt.ItemIsEnabled)
-
else:
col_label.extend([self._translate("Main", 'Min. Q'),
'Q25',
@@ -1828,16 +1755,9 @@ class ApplicationWindow(QMainWindow, Ui_MainWindow):
'tr_q_middle': [self._translate("Main", 'Mid Q'), self.units['label_Q'], self.units['Q'], None],
'tr_q_left': [self._translate("Main", 'Left Q'), self.units['label_Q'], self.units['Q'], None],
'tr_q_right': [self._translate("Main", 'Right Q'), self.units['label_Q'], self.units['Q'], None],
- 'meas_comments': [self._translate("Main", 'Comments'), None, 1, None],
}
- col_names = list(self.mean_meas.columns)
- labels = [x for x in col_names if 'meas_label' in x]
- col_labels = [x[5:] for x in labels]
-
- for i in range(len(col_labels)-1):
- self.columns |= {labels[i]: [col_labels[i], None, 1, None]}
- self.columns |= {'meas_label_user': [self._translate("Main", 'User Label'), None, 1, 'str']}
+ # Add empirical columns
if self.intercomparison_process:
if self.columns_effects[self.column_effect_section_idx] and \
self.columns_effects[self.column_effect_team_idx]:
@@ -1865,6 +1785,16 @@ class ApplicationWindow(QMainWindow, Ui_MainWindow):
'A_R': [self._translate("Main", 'AR'), '%', 1, None]
}
+ # Add label columns
+ col_names = list(self.mean_meas.columns)
+ labels = [x for x in col_names if 'meas_label' in x]
+ col_labels = [x[5:] for x in labels]
+
+ for i in range(len(col_labels) - 1):
+ self.columns |= {labels[i]: [col_labels[i], None, 1, None]}
+ self.columns |= {'meas_label_user': [self._translate("Main", 'User Label'), None, 1, 'str']}
+ self.columns |= {'meas_comments': [self._translate("Main", 'Comments'), None, 1, None]}
+
if not self.init_tables:
tbl.horizontalHeader().sortIndicatorChanged.disconnect()