Skip to content
Snippets Groups Projects
Commit 2ca28d32 authored by JOSSOUD Olivier's avatar JOSSOUD Olivier
Browse files

Bug correction

parent 16b1668d
Branches master
No related tags found
No related merge requests found
...@@ -2,6 +2,7 @@ import numpy as np ...@@ -2,6 +2,7 @@ import numpy as np
import pandas as pd import pandas as pd
import matplotlib import matplotlib
import os import os
import traceback
from scipy import interpolate from scipy import interpolate
from PyQt5.QtCore import QObject, pyqtSignal from PyQt5.QtCore import QObject, pyqtSignal
...@@ -244,7 +245,7 @@ class AnalyseController(QObject): ...@@ -244,7 +245,7 @@ class AnalyseController(QObject):
self.pic_conduct_calibrated_filepath = os.path.join( self.pic_conduct_calibrated_filepath = os.path.join(
calibrated_dir, dataset.dataset_name + "_pic_conduct_calibrated_" + calib_name + ".csv" calibrated_dir, dataset.dataset_name + "_pic_conduct_calibrated_" + calib_name + ".csv"
) )
calib_pic_conduc_height_df.to_csv(self.pic_conduct_calibrated_filepath, float_format="%.3f") calib_pic_conduc_height_df.to_csv(self.pic_conduct_calibrated_filepath, float_format="%.4f")
self.sig_action_step_finished.emit( self.sig_action_step_finished.emit(
"Calibrated Picarro & Conducti saved as CSV in [" + self.pic_conduct_calibrated_filepath + "]", "Calibrated Picarro & Conducti saved as CSV in [" + self.pic_conduct_calibrated_filepath + "]",
"Open", "Open",
...@@ -322,5 +323,10 @@ class Worker(QObject): ...@@ -322,5 +323,10 @@ class Worker(QObject):
try: try:
self.ctrl.analyse() self.ctrl.analyse()
except Exception as e: except Exception as e:
print("-------------------------------------------------------")
print("ERROR while doing the analysis:")
print(e) print(e)
traceback.print_exc()
print("-------------------------------------------------------")
self.finished.emit() self.finished.emit()
...@@ -430,7 +430,7 @@ class IcbktransitionUim(QObject): ...@@ -430,7 +430,7 @@ class IcbktransitionUim(QObject):
def __update_timeedit_cursor__(self, timestamp_sec: int): def __update_timeedit_cursor__(self, timestamp_sec: int):
pos_x = QDateTime() pos_x = QDateTime()
pos_x.setMSecsSinceEpoch(timestamp_sec * 1000) pos_x.setMSecsSinceEpoch(int(timestamp_sec * 1000))
pos_x = pos_x.toUTC() pos_x = pos_x.toUTC()
self.sig_cursor_moved.emit(pos_x.time()) self.sig_cursor_moved.emit(pos_x.time())
self.icbktransition_ui.timeedit_cursor.setDateTime(pos_x) self.icbktransition_ui.timeedit_cursor.setDateTime(pos_x)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment