- added utils.py

- renamed model.py as arraymodel.py
- splited view.py in arraywidget.py, editor.py and comparator.py

Author: alixdamman

larray_editor/api.py

@@ -1,14 +1,13 @@
 from __future__ import absolute_import, division, print_function
 
-import os
 import sys
 import traceback
 from collections import OrderedDict
 import numpy as np
 import larray as la
 
 from qtpy.QtWidgets import QApplication, QMainWindow
-from larray_editor.view import MappingEditor, ArrayEditor, SessionComparator, ArrayComparator, REOPEN_LAST_FILE
+from larray_editor.editor import REOPEN_LAST_FILE
 
 __all__ = ['view', 'edit', 'compare', 'REOPEN_LAST_FILE']
 
@@ -115,7 +114,13 @@ def edit(obj=None, title='', minvalue=None, maxvalue=None, readonly=False, depth
     if not title and obj is not REOPEN_LAST_FILE:
         title = get_title(obj, depth=depth + 1)
 
-    dlg = MappingEditor(parent) if obj is REOPEN_LAST_FILE or isinstance(obj, (str, la.Session)) else ArrayEditor(parent)
+    if obj is REOPEN_LAST_FILE or isinstance(obj, (str, la.Session)):
+        from larray_editor.editor import MappingEditor
+        dlg = MappingEditor(parent)
+    else:
+        from larray_editor.editor import ArrayEditor
+        dlg = ArrayEditor(parent)
+
     if dlg.setup_and_check(obj, title=title, minvalue=minvalue, maxvalue=maxvalue, readonly=readonly):
         if parent or isinstance(dlg, QMainWindow):
             dlg.show()
@@ -187,9 +192,11 @@ def compare(*args, **kwargs):
         parent = _app.activeWindow()
 
     if any(isinstance(a, la.Session) for a in args):
+        from larray_editor.comparator import SessionComparator
         dlg = SessionComparator(parent)
         default_name = 'session'
     else:
+        from larray_editor.comparator import ArrayComparator
         dlg = ArrayComparator(parent)
         default_name = 'array'
 
@@ -332,6 +339,10 @@ def restore_display_hook():
     # edit('fake_path')
     # edit(REOPEN_LAST_FILE)
 
+    # edit(arr2)
+    # compare(la.Session(arr2=arr2, arr3=arr3), la.Session(arr2=arr2 + 1.0, arr3=arr3 + 1.0))
+    # compare(arr2, arr2 + 1.0)
+
     # s = la.local_arrays()
     # view(s)
     # print('HDF')

larray_editor/model.py renamed to larray_editor/arraymodel.py

@@ -1,113 +1,14 @@
 from __future__ import absolute_import, division, print_function
 
-import sys
 import numpy as np
-import pandas as pd
 import larray as la
 
-from qtpy.QtCore import (Qt, QVariant, QModelIndex, QAbstractTableModel)
-from qtpy.QtGui import (QFont, QColor)
-from qtpy.QtWidgets import (QMessageBox)
-from qtpy import PYQT5
-
-PY2 = sys.version[0] == '2'
-
-
-def _get_font(family, size, bold=False, italic=False):
-    weight = QFont.Bold if bold else QFont.Normal
-    font = QFont(family, size, weight)
-    if italic:
-        font.setItalic(True)
-    return to_qvariant(font)
-
-def is_float(dtype):
-    """Return True if datatype dtype is a float kind"""
-    return ('float' in dtype.name) or dtype.name in ['single', 'double']
-
-def is_number(dtype):
-    """Return True is datatype dtype is a number kind"""
-    return is_float(dtype) or ('int' in dtype.name) or ('long' in dtype.name) or ('short' in dtype.name)
-
-# Spyder compat
-# -------------
-
-# Note: string and unicode data types will be formatted with '%s' (see below)
-SUPPORTED_FORMATS = {
-    'object': '%s',
-    'single': '%.2f',
-    'double': '%.2f',
-    'float_': '%.2f',
-    'longfloat': '%.2f',
-    'float32': '%.2f',
-    'float64': '%.2f',
-    'float96': '%.2f',
-    'float128': '%.2f',
-    'csingle': '%r',
-    'complex_': '%r',
-    'clongfloat': '%r',
-    'complex64': '%r',
-    'complex128': '%r',
-    'complex192': '%r',
-    'complex256': '%r',
-    'byte': '%d',
-    'short': '%d',
-    'intc': '%d',
-    'int_': '%d',
-    'longlong': '%d',
-    'intp': '%d',
-    'int8': '%d',
-    'int16': '%d',
-    'int32': '%d',
-    'int64': '%d',
-    'ubyte': '%d',
-    'ushort': '%d',
-    'uintc': '%d',
-    'uint': '%d',
-    'ulonglong': '%d',
-    'uintp': '%d',
-    'uint8': '%d',
-    'uint16': '%d',
-    'uint32': '%d',
-    'uint64': '%d',
-    'bool_': '%r',
-    'bool8': '%r',
-    'bool': '%r',
-}
-# =======================
-
-def get_font(section):
-    return _get_font('Calibri', 11)
-
-def to_qvariant(obj=None):
-    return obj
-
-def from_qvariant(qobj=None, pytype=None):
-    # FIXME: force API level 2 instead of handling this
-    if isinstance(qobj, QVariant):
-        assert pytype is str
-        return pytype(qobj.toString())
-    return qobj
-
-def _(text):
-    return text
-
-def to_text_string(obj, encoding=None):
-    """Convert `obj` to (unicode) text string"""
-    if PY2:
-        # Python 2
-        if encoding is None:
-            return unicode(obj)
-        else:
-            return unicode(obj, encoding)
-    else:
-        # Python 3
-        if encoding is None:
-            return str(obj)
-        elif isinstance(obj, str):
-            # In case this function is not used properly, this could happen
-            return obj
-        else:
-            return str(obj, encoding)
+from larray_editor.utils import (get_font, from_qvariant, to_qvariant, to_text_string,
+                                 is_float, is_number, SUPPORTED_FORMATS)
+
+from qtpy.QtCore import Qt, QModelIndex, QAbstractTableModel
+from qtpy.QtGui import QColor
+from qtpy.QtWidgets import QMessageBox
 
 
 LARGE_SIZE = 5e5