SaveFigureThread update
This commit is contained in:
28
base.py
28
base.py
@@ -93,6 +93,7 @@ class BaseWindow(QMainWindow):
|
||||
self.time_in_seconds = time_in_seconds
|
||||
self.reanalysis_time = reanalysis_time
|
||||
self.all_data = self.parent.all_data
|
||||
self.all_data_2 = self.parent.all_data_2
|
||||
|
||||
def __del__(self):
|
||||
self.wait()
|
||||
@@ -110,23 +111,18 @@ class BaseWindow(QMainWindow):
|
||||
|
||||
print("date_str", date_str, flush=True)
|
||||
|
||||
def extract_and_attach(i, nfig, name, canvas_base="Canvas"):
|
||||
canvas = '{0} {1}'.format(canvas_base, i+1)
|
||||
def extract_and_attach(i, nfig, name, all_fig_data):
|
||||
canvas = 'Canvas {1}'.format(i+1)
|
||||
name_base = name.replace(' ', '_').lower()
|
||||
|
||||
print("Canvas", canvas, flush=True)
|
||||
|
||||
|
||||
if self.all_data['Figure data'][canvas] is not None:
|
||||
if all_fig_data[canvas] is not None:
|
||||
nfig_canvas = len(self.all_data['Figure data'][canvas])
|
||||
nfig_canvas = min(nfig_canvas, nfig)
|
||||
print("nfig_canvas-A", nfig_canvas, flush=True)
|
||||
else:
|
||||
nfig_canvas = nfig
|
||||
print("nfig_canvas-B", nfig_canvas, flush=True)
|
||||
|
||||
|
||||
for idx in range(0, nfig_canvas):
|
||||
if self.all_data['Figure data'][canvas] is not None:
|
||||
if all_fig_data[canvas] is not None:
|
||||
|
||||
name = name_base + "_{0}".format(
|
||||
idx) if idx > 0 else name_base
|
||||
@@ -135,12 +131,12 @@ class BaseWindow(QMainWindow):
|
||||
print("name==>", name)
|
||||
print("save destination==>", save_dest, flush=True)
|
||||
if not os.path.exists(save_dest):
|
||||
if self.all_data['Figure data'][canvas][
|
||||
if all_fig_data[canvas][
|
||||
idx] is not None:
|
||||
_dirname = os.path.dirname(save_dest)
|
||||
if os.access(_dirname, os.W_OK):
|
||||
self.all_data['Figure data'][canvas][
|
||||
idx].savefig(save_dest)
|
||||
self.all_fig_data[canvas][idx].savefig(
|
||||
save_dest)
|
||||
elif not write_message_fired:
|
||||
_mess = ("Do not have write permission " +
|
||||
"for directory {0} from this " +
|
||||
@@ -158,8 +154,9 @@ class BaseWindow(QMainWindow):
|
||||
try:
|
||||
resultsSeq = self.settings.data["GUI"]["resultsSeq"]
|
||||
titleSeq = self.settings.data["GUI"]["subResultsTabTitle"]
|
||||
fig_data = self.all_data['Figure data']
|
||||
for i, (nfig, name) in enumerate(zip(resultsSeq, titleSeq)):
|
||||
extract_and_attach(i, nfig, name)
|
||||
extract_and_attach(i, nfig, name, fig_data)
|
||||
except KeyError as ex:
|
||||
pass
|
||||
|
||||
@@ -167,8 +164,9 @@ class BaseWindow(QMainWindow):
|
||||
try:
|
||||
resultsSeq = self.settings.data["GUI2"]["resultsSeq"]
|
||||
titleSeq = self.settings.data["GUI2"]["subResultsTabTitle"]
|
||||
fig_data = self.all_data_2['Figure data']
|
||||
for i, (nfig, name) in enumerate(zip(resultsSeq, titleSeq)):
|
||||
extract_and_attach(i, nfig, name, "CanvasB")
|
||||
extract_and_attach(i, nfig, name, fig_data)
|
||||
except KeyError as ex:
|
||||
pass
|
||||
|
||||
|
||||
Reference in New Issue
Block a user