Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
C
CFA Analysis
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
JOSSOUD Olivier
CFA Analysis
Commits
2ca28d32
Commit
2ca28d32
authored
8 months ago
by
JOSSOUD Olivier
Browse files
Options
Downloads
Patches
Plain Diff
Bug correction
parent
16b1668d
Branches
master
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/controller/analysecontroller.py
+7
-1
7 additions, 1 deletion
src/controller/analysecontroller.py
src/uim/icbktransitionuim.py
+1
-1
1 addition, 1 deletion
src/uim/icbktransitionuim.py
with
8 additions
and
2 deletions
src/controller/analysecontroller.py
+
7
−
1
View file @
2ca28d32
...
@@ -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
=
"
%.
3
f
"
)
calib_pic_conduc_height_df
.
to_csv
(
self
.
pic_conduct_calibrated_filepath
,
float_format
=
"
%.
4
f
"
)
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
()
This diff is collapsed.
Click to expand it.
src/uim/icbktransitionuim.py
+
1
−
1
View file @
2ca28d32
...
@@ -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
)
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment