Skip to content

Commit 2fe66c7

Browse files
committed
Merge branch 'decoder-cmd' into 'develop'
implement decoder command-line argument See merge request psyplot/psyplot-gui!36
2 parents 790850a + 50ddbf4 commit 2fe66c7

File tree

3 files changed

+23
-4
lines changed

3 files changed

+23
-4
lines changed

psyplot_gui/__init__.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,7 @@ def start_app(
123123
preset=None,
124124
opengl_implementation=None,
125125
webengineview=True,
126+
decoder=None,
126127
):
127128
"""
128129
Eventually start the QApplication or only make a plot
@@ -232,6 +233,7 @@ def start_app(
232233
concat_dim=concat_dim,
233234
chname=chname,
234235
preset=preset,
236+
decoder=decoder,
235237
)
236238
if use_all:
237239
name = "all"
@@ -309,6 +311,7 @@ def start_app(
309311
concat_dim,
310312
chname,
311313
preset,
314+
decoder,
312315
)
313316
return
314317
elif new_instance:
@@ -343,6 +346,7 @@ def start_app(
343346
concat_dim,
344347
chname,
345348
preset,
349+
decoder,
346350
)
347351
if script is not None:
348352
mainwindow.console.run_script_in_shell(script)

psyplot_gui/main.py

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1025,6 +1025,7 @@ def _change_cwd(self, args):
10251025
"concat_dim",
10261026
"chname",
10271027
"preset",
1028+
"decoder",
10281029
)
10291030

10301031
def open_files(self, fnames):
@@ -1059,13 +1060,14 @@ def open_external_files(
10591060
concat_dim=get_default_value(xr.open_mfdataset, "concat_dim"),
10601061
chname={},
10611062
preset=None,
1063+
decoder=None,
10621064
):
10631065
"""
10641066
Open external files
10651067
10661068
Parameters
10671069
----------
1068-
%(make_plot.parameters.fnames|project|engine|plot_method|name|dims|encoding|enable_post|seaborn_style|concat_dim|chname|preset)s
1070+
%(make_plot.parameters.fnames|project|engine|plot_method|name|dims|encoding|enable_post|seaborn_style|concat_dim|chname|preset|decoder)s
10691071
"""
10701072
if seaborn_style is not None:
10711073
import seaborn as sns
@@ -1127,6 +1129,8 @@ def open_external_files(
11271129
self.plot_creator.pm_combo.setCurrentIndex(
11281130
self.plot_creator.pm_combo.findText(plot_method)
11291131
)
1132+
if decoder:
1133+
self.plot_creator.set_decoder(decoder)
11301134
self.plot_creator.exec_()
11311135
return True
11321136

@@ -1150,6 +1154,7 @@ def run(
11501154
concat_dim=get_default_value(xr.open_mfdataset, "concat_dim"),
11511155
chname={},
11521156
preset=None,
1157+
decoder=None,
11531158
show=True,
11541159
):
11551160
"""
@@ -1189,6 +1194,7 @@ def run(
11891194
concat_dim,
11901195
chname,
11911196
preset,
1197+
decoder,
11921198
)
11931199
psyplot.with_gui = True
11941200
return mainwindow

psyplot_gui/plot_creator.py

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1832,6 +1832,8 @@ class PlotCreator(QDialog):
18321832

18331833
_preset = None
18341834

1835+
_decoder = None
1836+
18351837
def __init__(self, *args, **kwargs):
18361838
self.help_explorer = kwargs.pop("help_explorer", None)
18371839
super(PlotCreator, self).__init__(*args, **kwargs)
@@ -1972,9 +1974,11 @@ def __init__(self, *args, **kwargs):
19721974

19731975
# ------------------- plot method connections -------------------------
19741976
self.pm_combo.currentIndexChanged[str].connect(
1975-
lambda s: self.pm_combo.setToolTip(getattr(psy.plot, s)._summary)
1976-
if s
1977-
else self.NO_PM_TT
1977+
lambda s: (
1978+
self.pm_combo.setToolTip(getattr(psy.plot, s)._summary)
1979+
if s
1980+
else self.NO_PM_TT
1981+
)
19781982
)
19791983
self.pm_info.clicked.connect(self.show_pm_info)
19801984
self.pm_combo.currentIndexChanged[str].connect(self.array_table.set_pm)
@@ -2229,6 +2233,7 @@ def create_plots(self):
22292233
self.ds,
22302234
arr_names=names,
22312235
load=self.cbox_load.isChecked(),
2236+
decoder=self._decoder,
22322237
**kwargs,
22332238
)
22342239
except Exception:
@@ -2300,6 +2305,10 @@ def set_preset(self, preset):
23002305
if self.fmt_tree_widget.isVisible():
23012306
self.fill_fmt_tree(self.pm_combo.currentText())
23022307

2308+
def set_decoder(self, decoder):
2309+
"""Set the decoder for the new plots."""
2310+
self._decoder = decoder
2311+
23032312
def add_new_ds(self, oname, ds, fname=None):
23042313
d = {"ds": ds}
23052314
if fname:

0 commit comments

Comments
 (0)