From e225948b222b4caa6f717248c7928f842cfd6485 Mon Sep 17 00:00:00 2001
From: imcovangent <I.vanGent@tudelft.nl>
Date: Wed, 11 Apr 2018 10:47:08 +0200
Subject: [PATCH] Fixed issue with order of reading out existing temp files.
Former-commit-id: 9706061b4df70097a9bf6ce2f6581577b253f25b
---
kadmos/graph/mixin_vistoms.py | 2 +-
kadmos/vistoms/vistoms.py | 2 ++
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/kadmos/graph/mixin_vistoms.py b/kadmos/graph/mixin_vistoms.py
index f5b0c54e8..126fb758a 100644
--- a/kadmos/graph/mixin_vistoms.py
+++ b/kadmos/graph/mixin_vistoms.py
@@ -953,7 +953,7 @@ def vistoms_start(graphs, file_dir=None):
# Save the graphs in the folder
for i, graph in enumerate(graphs):
- i_str = format(len(graphs)-i, '02d')
+ i_str = format(i+1, '02d')
if isinstance(graph, (list, tuple)):
graph[0].save('tmp_{}.kdms'.format(i_str), destination_folder=vistoms_dir, mpg=graph[1])
else:
diff --git a/kadmos/vistoms/vistoms.py b/kadmos/vistoms/vistoms.py
index 501974dd5..09bfd0655 100644
--- a/kadmos/vistoms/vistoms.py
+++ b/kadmos/vistoms/vistoms.py
@@ -362,6 +362,8 @@ def kadmosFindTempGraphs():
tmpDir = UPLOAD_FOLDER
newVIstomsDataArray = []
file_list = os.listdir(tmpDir)
+ if file_list:
+ file_list.sort()
for file in file_list:
if file.endswith(".kdms"):
fileName = file.split('.')[0].split('_')
--
GitLab