femagtools 1.6.8__py3-none-any.whl → 1.7.0__py3-none-any.whl

femagtools/dxfsl/journal.py

@@ -26,9 +26,8 @@ def getJournal(name=None, aktiv=False):
     global journal
     if not journal:
         if not name:
-            journal = Journal(name='none', aktiv=False)
-        else:
-            journal = Journal(name=name, aktiv=True)
+            name = 'none'
+        journal = Journal(name=name, aktiv=aktiv)
     return journal
 
 
@@ -40,6 +39,7 @@ class Journal(object):
         self.aktiv = aktiv
         self.journal = {}
         self.data = {}
+        self.data_key = None
         self.filename = Path('{}.json'.format(self.name))
 
     def open_journal(self):
@@ -55,10 +55,18 @@ class Journal(object):
         if not self.journal:
             return
         self.set_benchmark()
+        self.sort_by_keys()
         with open(self.filename, 'w') as f:
             f.write(json.dumps(self.journal, indent=4))
             f.close()
 
+    def sort_by_keys(self):
+        myKeys = list(self.data.keys())
+        myKeys.sort()
+        sorted_dict = {i: self.data[i] for i in myKeys}
+        self.data = sorted_dict
+        self.journal[self.data_key] = sorted_dict
+
     def get_journal(self, name):
         if not self.aktiv:
             return None
@@ -69,31 +77,53 @@ class Journal(object):
         self.open_journal()
         self.data = self.journal.get(name, None)
         self.data = {'filename': ""}  # initialise
+        self.data_key = name
         self.journal[name] = self.data
         return self.data
 
+    def get_total(self, name):
+        val = self.data.get(name, None)
+        if val is None:
+            return 0
+        if isinstance(val, list):
+            if not val:
+                return 0
+            if isinstance(val[0], int) or isinstance(val[0], float):
+                val = sum(val)
+                return val
+            return len(val)
+        if isinstance(val, int) or isinstance(val, float):
+            return val
+        return 1  # entries
+
     def set_benchmark(self):
-        if self.data.get('area_errors', 0) > 0:
+        if self.get_total('area_errors') > 0:
             self.put_warning("Problem with areas")
-        if self.data.get('appendices_deleted', 0) > 0:
+        if self.get_total('appendices_deleted') > 0:
             self.put_warning("Problem with appendices")
 
     def put(self, name, val):
-        if self.data:
+        if not self.data:
+            return
+        data = self.data.get(name, None)
+        if data is None:
             self.data[name] = val
-
-    def add(self, name, val):
-        if self.data:
-            self.data[name] = val + self.data.get(name, 0)
+            return
+        if isinstance(data, list):
+            self.data[name].append(val)
+            return
+        data_list = [data]
+        data_list.append(val)
+        self.data[name] = data_list
 
     def put_filename(self, val):
         self.put('filename', val)
 
     def put_areas(self, val):
-        self.add('areas', val)
+        self.put('areas', val)
 
     def put_area_errors(self, val):
-        self.add('area_errors', val)
+        self.put('area_errors', val)
 
     def put_elements(self, val):
         self.put('elements', val)
@@ -102,27 +132,28 @@ class Journal(object):
         self.put('nodes', val)
 
     def put_concat_lines(self, val):
-        self.add('concat_lines', val)
+        self.put('concat_lines', val)
 
     def put_concat_arcs(self, val):
-        self.add('concat_arcs', val)
+        self.put('concat_arcs', val)
 
     def put_appendices(self, val):
-        self.add('appendices', val)
+        self.put('appendices', val)
 
     def put_appendices_connected(self, val):
-        self.add('appendices_connected', val)
+        self.put('appendices_connected', val)
 
     def put_appendices_remaining(self, val):
-        self.add('appendices_remaining', val)
+        self.put('appendices_remaining', val)
 
     def put_appendices_deleted(self, val):
-        self.add('appendices_deleted', val)
-       
+        self.put('appendices_deleted', val)
+
+    def put_nodes_connected(self, val):
+        self.put('nodes_connected', val)
+
     def put_exception(self, msg):
         self.put('exception', msg)
 
     def put_warning(self, msg):
-        lst = self.data.get('warning', [])
-        lst.append(msg)
-        self.put('warning', lst)
+        self.put('warning', msg)