Skip to content
Snippets Groups Projects
Commit 06e6f61e authored by Michael DM Dryden's avatar Michael DM Dryden
Browse files

Fixed saving with separate experiments and gtk3.

parent c36aec51
Branches
Tags
1 merge request!10Move to gtk3 and new command protocol
Hide whitespace changes
Inline Side-by-side
dstat_interface/experiments/experiment_template.py
+ 8
− 0
View file @ 06e6f61e
...@@ -290,6 +290,14 @@ class Experiment(object): ...@@ -290,6 +290,14 @@ class Experiment(object):
buf += '#{}\n'.format(line) buf += '#{}\n'.format(line)
return buf return buf
def get_save_strings(self):
"""Return dict of strings with experiment parameters and data."""
buf = {}
buf['params'] = self.get_info_text()
buf.update({exp : df.to_string() for exp, df in self.df.items()})
return buf
class PlotBox(object): class PlotBox(object):
"""Contains data plot and associated methods.""" """Contains data plot and associated methods."""
......
dstat_interface/interface/save.py
+ 35
− 75
View file @ 06e6f61e
...@@ -37,12 +37,12 @@ from errors import InputError, VarError ...@@ -37,12 +37,12 @@ from errors import InputError, VarError
from params import save_params, load_params from params import save_params, load_params
def manSave(current_exp): def manSave(current_exp):
fcd = Gtk.FileChooserDialog("Save...", None, Gtk.FILE_CHOOSER_ACTION_SAVE, fcd = Gtk.FileChooserDialog("Save…", None, Gtk.FileChooserAction.SAVE,
(Gtk.STOCK_CANCEL, Gtk.RESPONSE_CANCEL, (Gtk.STOCK_CANCEL, Gtk.ResponseType.CANCEL,
Gtk.STOCK_SAVE, Gtk.RESPONSE_OK)) Gtk.STOCK_SAVE, Gtk.ResponseType.OK))
filters = [Gtk.FileFilter()] filters = [Gtk.FileFilter()]
filters[0].set_name("Space separated text (.txt)") filters[0].set_name("Text (.txt)")
filters[0].add_pattern("*.txt") filters[0].add_pattern("*.txt")
fcd.set_do_overwrite_confirmation(True) fcd.set_do_overwrite_confirmation(True)
...@@ -51,7 +51,7 @@ def manSave(current_exp): ...@@ -51,7 +51,7 @@ def manSave(current_exp):
response = fcd.run() response = fcd.run()
if response == Gtk.RESPONSE_OK: if response == Gtk.ResponseType.OK:
path = fcd.get_filename() path = fcd.get_filename()
logger.info("Selected filepath: %s", path) logger.info("Selected filepath: %s", path)
filter_selection = fcd.get_filter().get_name() filter_selection = fcd.get_filter().get_name()
...@@ -61,14 +61,14 @@ def manSave(current_exp): ...@@ -61,14 +61,14 @@ def manSave(current_exp):
fcd.destroy() fcd.destroy()
elif response == Gtk.RESPONSE_CANCEL: elif response == Gtk.ResponseType.CANCEL:
fcd.destroy() fcd.destroy()
def plot_save_dialog(plots): def plot_save_dialog(plots):
fcd = Gtk.FileChooserDialog("Save Plot…", None, fcd = Gtk.FileChooserDialog("Save Plot…", None,
Gtk.FILE_CHOOSER_ACTION_SAVE, Gtk.FileChooserAction.SAVE,
(Gtk.STOCK_CANCEL, Gtk.RESPONSE_CANCEL, (Gtk.STOCK_CANCEL, Gtk.ResponseType.CANCEL,
Gtk.STOCK_SAVE, Gtk.RESPONSE_OK)) Gtk.STOCK_SAVE, Gtk.ResponseType.OK))
filters = [Gtk.FileFilter()] filters = [Gtk.FileFilter()]
filters[0].set_name("Portable Document Format (.pdf)") filters[0].set_name("Portable Document Format (.pdf)")
...@@ -83,7 +83,7 @@ def plot_save_dialog(plots): ...@@ -83,7 +83,7 @@ def plot_save_dialog(plots):
response = fcd.run() response = fcd.run()
if response == Gtk.RESPONSE_OK: if response == Gtk.ResponseType.OK:
path = fcd.get_filename() path = fcd.get_filename()
logger.info("Selected filepath: %s", path) logger.info("Selected filepath: %s", path)
filter_selection = fcd.get_filter().get_name() filter_selection = fcd.get_filter().get_name()
...@@ -100,17 +100,16 @@ def plot_save_dialog(plots): ...@@ -100,17 +100,16 @@ def plot_save_dialog(plots):
fcd.destroy() fcd.destroy()
elif response == Gtk.RESPONSE_CANCEL: elif response == Gtk.ResponseType.CANCEL:
fcd.destroy() fcd.destroy()
def man_param_save(window): def man_param_save(window):
fcd = Gtk.FileChooserDialog("Save Parameters…", fcd = Gtk.FileChooserDialog("Save Parameters…",
None, None,
Gtk.FILE_CHOOSER_ACTION_SAVE, Gtk.FileChooserAction.SAVE,
(Gtk.STOCK_CANCEL, Gtk.RESPONSE_CANCEL, (Gtk.STOCK_CANCEL, Gtk.ResponseType.CANCEL,
Gtk.STOCK_SAVE, Gtk.RESPONSE_OK) Gtk.STOCK_SAVE, Gtk.ResponseType.OK))
)
filters = [Gtk.FileFilter()] filters = [Gtk.FileFilter()]
filters[0].set_name("Parameter File (.yml)") filters[0].set_name("Parameter File (.yml)")
...@@ -122,7 +121,7 @@ def man_param_save(window): ...@@ -122,7 +121,7 @@ def man_param_save(window):
response = fcd.run() response = fcd.run()
if response == Gtk.RESPONSE_OK: if response == Gtk.ResponseType.OK:
path = fcd.get_filename() path = fcd.get_filename()
logger.info("Selected filepath: %s", path) logger.info("Selected filepath: %s", path)
...@@ -133,16 +132,15 @@ def man_param_save(window): ...@@ -133,16 +132,15 @@ def man_param_save(window):
fcd.destroy() fcd.destroy()
elif response == Gtk.RESPONSE_CANCEL: elif response == Gtk.ResponseType.CANCEL:
fcd.destroy() fcd.destroy()
def man_param_load(window): def man_param_load(window):
fcd = Gtk.FileChooserDialog("Load Parameters…", fcd = Gtk.FileChooserDialog("Load Parameters…",
None, None,
Gtk.FILE_CHOOSER_ACTION_OPEN, Gtk.FileChooserAction.OPEN,
(Gtk.STOCK_CANCEL, Gtk.RESPONSE_CANCEL, (Gtk.STOCK_CANCEL, Gtk.ResponseType.CANCEL,
Gtk.STOCK_OPEN, Gtk.RESPONSE_OK) Gtk.STOCK_OPEN, Gtk.ResponseType.OK))
)
filters = [Gtk.FileFilter()] filters = [Gtk.FileFilter()]
filters[0].set_name("Parameter File (.yml)") filters[0].set_name("Parameter File (.yml)")
...@@ -153,7 +151,7 @@ def man_param_load(window): ...@@ -153,7 +151,7 @@ def man_param_load(window):
response = fcd.run() response = fcd.run()
if response == Gtk.RESPONSE_OK: if response == Gtk.ResponseType.OK:
path = fcd.get_filename() path = fcd.get_filename()
logger.info("Selected filepath: %s", path) logger.info("Selected filepath: %s", path)
...@@ -161,7 +159,7 @@ def man_param_load(window): ...@@ -161,7 +159,7 @@ def man_param_load(window):
fcd.destroy() fcd.destroy()
elif response == Gtk.RESPONSE_CANCEL: elif response == Gtk.ResponseType.CANCEL:
fcd.destroy() fcd.destroy()
def autoSave(exp, path, name): def autoSave(exp, path, name):
...@@ -186,62 +184,22 @@ def autoPlot(exp, path, name): ...@@ -186,62 +184,22 @@ def autoPlot(exp, path, name):
save_plot(exp, path) save_plot(exp, path)
def save_text(exp, path): def save_text(exp, path):
name, _sep, ext = path.rpartition('.') # ('','',string) if no match savestrings = exp.get_save_strings()
if _sep == '': path = path.rstrip('.txt')
name = ext
ext = 'txt'
num = '' num = ''
j = 0 j = 0
for dname in exp.data: # Test for any existing files for key, text in savestrings.items(): # Test for existing files of any kind
while os.path.exists("%s%s-%s.%s" % (name, num, dname, ext)): while os.path.exists("{}{}-{}.txt".format(path, num, key)):
j += 1 j += 1
num = j num = j
for dname in exp.data: # save data
file = open("%s%s-%s.%s" % (name, num, dname, ext), 'w')
time = exp.time
header = "".join(['# TIME ', time.isoformat(), "\n"])
header += "# DSTAT COMMANDS\n# "
for i in exp.commands:
header += i
file.write("".join([header, '\n']))
analysis_buffer = []
if exp.analysis != {}:
analysis_buffer.append("# ANALYSIS")
for key, value in exp.analysis.iteritems():
analysis_buffer.append("# %s:" % key)
for scan in value:
number, result = scan
analysis_buffer.append(
"# Scan %s -- %s" % (number, result)
)
for i in analysis_buffer:
file.write("%s\n" % i)
# Write out actual data
line_buffer = []
for scan in zip(*exp.data[dname]):
for dimension in scan:
for i in range(len(dimension)):
try:
line_buffer[i] += "%s " % dimension[i]
except IndexError:
line_buffer.append("")
line_buffer[i] += "%s " % dimension[i]
for i in line_buffer: save_path = "{}{}".format(path, num)
file.write("%s\n" % i)
for key, text in savestrings.items():
file.close() with open('{}-{}.txt'.format(save_path, key), 'w') as f:
f.write(text)
def save_plot(exp, path): def save_plot(exp, path):
"""Saves everything in exp.plots to path. Appends a number for duplicates. """Saves everything in exp.plots to path. Appends a number for duplicates.
...@@ -256,9 +214,11 @@ def save_plot(exp, path): ...@@ -256,9 +214,11 @@ def save_plot(exp, path):
j = 0 j = 0
for i in exp.plots: # Test for any existing files for i in exp.plots: # Test for any existing files
while os.path.exists("%s%s-%s.%s" % (name, num, i, ext)): plot_type = '_'.join(i.name.lower().split())
while os.path.exists("%s%s-%s.%s" % (name, num, plot_type, ext)):
j += 1 j += 1
num = j num = j
for i in exp.plots: # save data for i in exp.plots: # save data
exp.plots[i].figure.savefig("%s%s-%s.%s" % (name, num, i, ext)) plot_type = '_'.join(i.name.lower().split())
\ No newline at end of file i.figure.savefig("%s%s-%s.%s" % (name, num, plot_type, ext))
\ No newline at end of file
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment