From e43d60c4164a9771676a800be625b4b7244e0267 Mon Sep 17 00:00:00 2001
From: Jan Grewe <jan.grewe@g-node.org>
Date: Sat, 16 Jan 2021 18:21:15 +0100
Subject: [PATCH] [file_hanlder] move to util, fix imports
---
nixview/data_models/tree_model.py | 3 ++-
nixview/ui/filescreen.py | 3 ++-
nixview/ui/mainwindow.py | 2 +-
nixview/ui/plotscreen.py | 13 ++++++++-----
nixview/{ => util}/file_handler.py | 0
5 files changed, 13 insertions(+), 8 deletions(-)
rename nixview/{ => util}/file_handler.py (100%)
diff --git a/nixview/data_models/tree_model.py b/nixview/data_models/tree_model.py
index 540e351..25abca0 100644
--- a/nixview/data_models/tree_model.py
+++ b/nixview/data_models/tree_model.py
@@ -5,7 +5,8 @@ from PyQt5.QtGui import QIcon
from PyQt5.QtWidgets import QTreeView, QTreeWidgetItem, QAbstractItemView, QHeaderView
from enum import Enum
-from nixview.file_handler import ItemDescriptor, NodeType
+from nixview.util.file_handler import NodeType
+from nixview.util.descriptors import ItemDescriptor
column_names = ['Name', 'Type', 'Value', 'Description', 'ID',]
diff --git a/nixview/ui/filescreen.py b/nixview/ui/filescreen.py
index 440c616..8ea6c98 100644
--- a/nixview/ui/filescreen.py
+++ b/nixview/ui/filescreen.py
@@ -1,7 +1,8 @@
from PyQt5.QtWidgets import QComboBox, QFrame, QGroupBox, QHBoxLayout, QLabel, QSplitter, QTextEdit, QVBoxLayout, QWidget
from PyQt5.QtCore import QItemSelectionModel, Qt
-from nixview.file_handler import FileHandler, ItemDescriptor
+from nixview.util.file_handler import FileHandler
+from nixview.util.descriptors import ItemDescriptor
import nixview.communicator as comm
import nixview.constants as cnst
from nixview.data_models.tree_model import NixTreeView, TreeModel, TreeType
diff --git a/nixview/ui/mainwindow.py b/nixview/ui/mainwindow.py
index 5a29d40..cab9e94 100644
--- a/nixview/ui/mainwindow.py
+++ b/nixview/ui/mainwindow.py
@@ -4,7 +4,7 @@ from PyQt5.QtWidgets import QWidget, QFileDialog, QMainWindow, QMenuBar, QToolBa
from PyQt5.QtGui import QIcon, QKeySequence
from PyQt5.QtCore import QSize, QSettings, Qt
-from nixview.file_handler import FileHandler, NodeType
+from nixview.util.file_handler import FileHandler, NodeType
import nixview.constants as cnst
import nixview.communicator as comm
from nixview.ui.centralwidget import CentralWidget
diff --git a/nixview/ui/plotscreen.py b/nixview/ui/plotscreen.py
index 5d9a5ce..212c961 100644
--- a/nixview/ui/plotscreen.py
+++ b/nixview/ui/plotscreen.py
@@ -9,9 +9,8 @@ import numpy as np
import matplotlib.pyplot as plt
from matplotlib.widgets import Slider
-from nixview.file_handler import FileHandler, DataView
-
-
+from nixview.util.file_handler import FileHandler
+from nixview.util.dataview import DataView
def create_label(entity):
@@ -345,8 +344,12 @@ class PlotScreen(QWidget):
def plot(self, item):
print("plot!", item)
print(item.entity_type, item.shape)
- self._data_view = DataView(item, self._file_handler)
- self._data_view.request_more()
+ try:
+ self._data_view = DataView(item, self._file_handler)
+ except ValueError as e:
+ print(e)
+ return
+ self._data_view.request_more() # TODO this is just a test, needs to be removed
print(self._data_view)
\ No newline at end of file
diff --git a/nixview/file_handler.py b/nixview/util/file_handler.py
similarity index 100%
rename from nixview/file_handler.py
rename to nixview/util/file_handler.py