Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
S
SOHViewer
Manage
Activity
Members
Labels
Plan
Issues
14
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
5
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
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
Software Public
PASSOFT
SOHViewer
Commits
6f4a18a4
Commit
6f4a18a4
authored
1 year ago
by
Kien Le
Browse files
Options
Downloads
Patches
Plain Diff
Save log reading configs
parent
c2c8c624
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
sohstationviewer/conf/config_processor.py
+16
-2
16 additions, 2 deletions
sohstationviewer/conf/config_processor.py
sohstationviewer/view/main_window.py
+4
-0
4 additions, 0 deletions
sohstationviewer/view/main_window.py
with
20 additions
and
2 deletions
sohstationviewer/conf/config_processor.py
+
16
−
2
View file @
6f4a18a4
...
@@ -13,6 +13,7 @@ default_config = f'''
...
@@ -13,6 +13,7 @@ default_config = f'''
from_data_card = False
from_data_card = False
data = False
data = False
sdata = False
sdata = False
log = False
[ColorMode]
[ColorMode]
black = True
black = True
...
@@ -48,6 +49,7 @@ to_date = {QtCore.QDate.currentDate().toString("yyyy-MM-dd")}
...
@@ -48,6 +49,7 @@ to_date = {QtCore.QDate.currentDate().toString("yyyy-MM-dd")}
mp_color_mode = regular
mp_color_mode = regular
tps_color_mode = High
tps_color_mode = High
date_mode = YYYY-MM-DD
date_mode = YYYY-MM-DD
add_mass_pos_to_soh = False
'''
'''
...
@@ -62,7 +64,7 @@ class ConfigProcessor:
...
@@ -62,7 +64,7 @@ class ConfigProcessor:
def
__init__
(
self
):
def
__init__
(
self
):
self
.
config
=
configparser
.
ConfigParser
()
self
.
config
=
configparser
.
ConfigParser
()
self
.
expected_keys
=
{
self
.
expected_keys
=
{
'
from_data_card
'
,
'
data
'
,
'
sdata
'
,
'
from_data_card
'
,
'
data
'
,
'
sdata
'
,
'
log
'
,
'
black
'
,
'
white
'
,
'
black
'
,
'
white
'
,
'
min_gap_length
'
,
'
min_gap_length
'
,
'
mp123zne
'
,
'
mp456uvw
'
,
'
mp123zne
'
,
'
mp456uvw
'
,
...
@@ -71,7 +73,8 @@ class ConfigProcessor:
...
@@ -71,7 +73,8 @@ class ConfigProcessor:
'
plot_tps
'
,
'
plot_raw
'
,
'
plot_tps
'
,
'
plot_raw
'
,
'
all_soh
'
,
'
all_soh
'
,
'
from_date
'
,
'
to_date
'
,
'
from_date
'
,
'
to_date
'
,
'
mp_color_mode
'
,
'
tps_color_mode
'
,
'
date_mode
'
'
mp_color_mode
'
,
'
tps_color_mode
'
,
'
date_mode
'
,
'
add_mass_pos_to_soh
'
}
}
def
load_config
(
self
):
def
load_config
(
self
):
...
@@ -109,10 +112,16 @@ class ConfigProcessor:
...
@@ -109,10 +112,16 @@ class ConfigProcessor:
f
'
missing keys are:
{
"
,
"
.
join
(
missing_keys
)
}
'
f
'
missing keys are:
{
"
,
"
.
join
(
missing_keys
)
}
'
)
)
from_data_card_checked
=
self
.
config
.
getboolean
(
'
FileRead
'
,
'
from_data_card
'
)
data_checked
=
self
.
config
.
getboolean
(
'
FileRead
'
,
'
data
'
)
data_checked
=
self
.
config
.
getboolean
(
'
FileRead
'
,
'
data
'
)
sdata_checked
=
self
.
config
.
getboolean
(
'
FileRead
'
,
'
sdata
'
)
sdata_checked
=
self
.
config
.
getboolean
(
'
FileRead
'
,
'
sdata
'
)
log_checked
=
self
.
config
.
getboolean
(
'
FileRead
'
,
'
log
'
)
if
data_checked
and
sdata_checked
:
if
data_checked
and
sdata_checked
:
raise
BadConfigError
(
'
data and sdata cannot both be chosen.
'
)
raise
BadConfigError
(
'
data and sdata cannot both be chosen.
'
)
if
from_data_card_checked
and
log_checked
:
raise
BadConfigError
(
'
Cannot read from data card and log file at
'
'
the same time.
'
)
black_color_mode
=
self
.
config
.
getboolean
(
'
ColorMode
'
,
'
black
'
)
black_color_mode
=
self
.
config
.
getboolean
(
'
ColorMode
'
,
'
black
'
)
white_color_mode
=
self
.
config
.
getboolean
(
'
ColorMode
'
,
'
white
'
)
white_color_mode
=
self
.
config
.
getboolean
(
'
ColorMode
'
,
'
white
'
)
...
@@ -187,6 +196,7 @@ class ConfigProcessor:
...
@@ -187,6 +196,7 @@ class ConfigProcessor:
)
)
window
.
data_radio_button
.
setChecked
(
get_bool
(
'
FileRead
'
,
'
data
'
))
window
.
data_radio_button
.
setChecked
(
get_bool
(
'
FileRead
'
,
'
data
'
))
window
.
sdata_radio_button
.
setChecked
(
get_bool
(
'
FileRead
'
,
'
sdata
'
))
window
.
sdata_radio_button
.
setChecked
(
get_bool
(
'
FileRead
'
,
'
sdata
'
))
window
.
log_checkbox
.
setChecked
(
get_bool
(
'
FileRead
'
,
'
log
'
))
window
.
background_black_radio_button
.
setChecked
(
window
.
background_black_radio_button
.
setChecked
(
get_bool
(
'
ColorMode
'
,
'
black
'
)
get_bool
(
'
ColorMode
'
,
'
black
'
)
...
@@ -253,6 +263,10 @@ class ConfigProcessor:
...
@@ -253,6 +263,10 @@ class ConfigProcessor:
elif
date_mode
==
'
YYYY:DOY
'
:
elif
date_mode
==
'
YYYY:DOY
'
:
window
.
yyyy_doy_action
.
trigger
()
window
.
yyyy_doy_action
.
trigger
()
window
.
add_masspos_to_rt130_soh
.
setChecked
(
get_bool
(
'
MiscOptions
'
,
'
add_mass_pos_to_soh
'
)
)
def
reset
(
self
):
def
reset
(
self
):
self
.
config
=
configparser
.
ConfigParser
()
self
.
config
=
configparser
.
ConfigParser
()
self
.
config
.
read_string
(
default_config
)
self
.
config
.
read_string
(
default_config
)
...
...
This diff is collapsed.
Click to expand it.
sohstationviewer/view/main_window.py
+
4
−
0
View file @
6f4a18a4
...
@@ -1112,6 +1112,8 @@ class MainWindow(QtWidgets.QMainWindow, UIMainWindow):
...
@@ -1112,6 +1112,8 @@ class MainWindow(QtWidgets.QMainWindow, UIMainWindow):
str
(
self
.
data_radio_button
.
isChecked
()))
str
(
self
.
data_radio_button
.
isChecked
()))
self
.
config
.
set
(
'
FileRead
'
,
'
sdata
'
,
self
.
config
.
set
(
'
FileRead
'
,
'
sdata
'
,
str
(
self
.
sdata_radio_button
.
isChecked
()))
str
(
self
.
sdata_radio_button
.
isChecked
()))
self
.
config
.
set
(
'
FileRead
'
,
'
log
'
,
str
(
self
.
log_checkbox
.
isChecked
()))
self
.
config
.
set
(
'
ColorMode
'
,
'
black
'
,
self
.
config
.
set
(
'
ColorMode
'
,
'
black
'
,
str
(
self
.
background_black_radio_button
.
isChecked
()))
str
(
self
.
background_black_radio_button
.
isChecked
()))
self
.
config
.
set
(
'
ColorMode
'
,
'
white
'
,
self
.
config
.
set
(
'
ColorMode
'
,
'
white
'
,
...
@@ -1163,6 +1165,8 @@ class MainWindow(QtWidgets.QMainWindow, UIMainWindow):
...
@@ -1163,6 +1165,8 @@ class MainWindow(QtWidgets.QMainWindow, UIMainWindow):
raise
Exception
(
'
Something is very wrong. No date mode is chosen.
'
raise
Exception
(
'
Something is very wrong. No date mode is chosen.
'
'
Please contact the software group.
'
)
'
Please contact the software group.
'
)
self
.
config
.
set
(
'
MiscOptions
'
,
'
date_mode
'
,
date_mode
)
self
.
config
.
set
(
'
MiscOptions
'
,
'
date_mode
'
,
date_mode
)
self
.
config
.
set
(
'
MiscOptions
'
,
'
add_mass_pos_to_soh
'
,
str
(
self
.
add_masspos_to_rt130_soh
.
isChecked
()))
with
open
(
'
sohstationviewer/conf/read_settings.ini
'
,
'
w
'
)
as
file
:
with
open
(
'
sohstationviewer/conf/read_settings.ini
'
,
'
w
'
)
as
file
:
self
.
config
.
write
(
file
)
self
.
config
.
write
(
file
)
...
...
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