Merge pull request #14 from nodedge/feature/dats

Feature/dats

.isort.cfg

@@ -6,5 +6,5 @@ include_trailing_comma = True
 force_grid_wrap=0
 use_parentheses=True
 
-known_third_party = PIL,PyQt5,PySide2,PySide6,black,coloredlogs,graphene,numpy,pandas,pylab,pyqtconsole,pyqtgraph,pytest,pytestqt,recommonmark,scipy,setuptools,yaml
+known_third_party = PIL,PySide6,black,coloredlogs,graphene,numpy,pandas,pylab,pyqtconsole,pyqtgraph,pytest,pytestqt,recommonmark,scipy,setuptools,yaml
 

demos/demo_pqtgraph.py

@@ -1,5 +1,5 @@
 import pyqtgraph as pg
-from PySide2 import QtWidgets
+from PySide6 import QtWidgets
 
 
 class WdgPlot(QtWidgets.QWidget):

demos/demo_qtcharts.py

@@ -2,17 +2,17 @@
 import sys
 
 import pandas as pd
-from PySide2.QtCharts import QtCharts
-from PySide2.QtCore import (
+from PySide6.QtCharts import QtCharts
+from PySide6.QtCore import (
     QAbstractTableModel,
     QDateTime,
     QModelIndex,
     Qt,
     QTimeZone,
     Slot,
 )
-from PySide2.QtGui import QColor, QPainter
-from PySide2.QtWidgets import (
+from PySide6.QtGui import QColor, QPainter
+from PySide6.QtWidgets import (
     QAction,
     QApplication,
     QHBoxLayout,

examples/calculator/main_code_generation.py

@@ -1,8 +1,8 @@
 import os
 import sys
 
-from PySide2.QtGui import QColor, QPalette
-from PySide2.QtWidgets import QApplication
+from PySide6.QtGui import QColor, QPalette
+from PySide6.QtWidgets import QApplication
 
 from nodedge.mdi_window import MdiWindow
 from nodedge.scene_coder import SceneCoder
@@ -34,9 +34,7 @@
     orderedNodeList, currentSceneCode = coder.generateCode()
     print(currentSceneCode)
 
-    generatedFileString = coder.addImports(
-        orderedNodeList, currentSceneCode
-    )
+    generatedFileString = coder.addImports(orderedNodeList, currentSceneCode)
 
     try:
         sys.exit(app.exec_())

mypy.ini

@@ -22,9 +22,6 @@ ignore_missing_imports = True
 
 [mypy-coloredlogs.*]
 ignore_missing_imports = True
-;
-;[mypy-PySide2.*]
-;ignore_missing_imports = True
 
 [mypy-numpy.*]
 ignore_missing_imports = True

nodedge/__main__.py

@@ -9,7 +9,7 @@
 from nodedge.utils import dumpException
 
 sys.path.insert(0, os.path.join(os.path.dirname(__file__), "..", ".."))  # noqa: E402
-os.environ["QT_API"] = "pyside"
+os.environ["QT_API"] = "pyside6"
 
 
 def main():

nodedge/dats/config.json

@@ -0,0 +1,8 @@
+{
+  "Workbook1": {
+    "Worksheet1": [
+      {},
+      {}
+    ]
+  }
+}

nodedge/dats/logs_list_widget.py

@@ -0,0 +1,59 @@
+import logging
+from typing import Optional
+
+import pandas as pd
+from asammdf import MDF
+from PySide6.QtCore import Signal
+from PySide6.QtWidgets import QListWidget, QListWidgetItem, QMessageBox
+
+
+class LogsListWidget(QListWidget):
+    logSelected = Signal(object)
+
+    def __init__(self, parent=None):
+        super().__init__(parent)
+
+        self.logs = {}
+
+        self.itemClicked.connect(self.onItemClicked)  # type: ignore
+
+    def addLog(self, filename) -> Optional[MDF]:
+        shortname = filename.split("/")[-1]
+        extension = shortname.split(".")[-1]
+        shortname = shortname.split(".")[0]
+
+        log: MDF
+        if extension.lower() == "mf4":
+            log = MDF(filename)
+        elif extension.lower() == "csv":
+            df = pd.read_csv(filename)
+
+            log = MDF()
+
+            log.append(df)
+        else:
+            logging.warning("Cannot open this extension")
+            return None
+
+        startTimeStr = log.start_time.strftime("%Y/%m/%D, %H:%M:%S")
+        shortname = f"[{startTimeStr}] {shortname}"
+
+        if shortname in list(self.logs.keys()):
+            msgBox = QMessageBox()
+            msgBox.setText("The log has already been loaded.")
+            msgBox.setIcon(QMessageBox.Warning)  # type: ignore
+            msgBox.exec()
+            return log
+
+        self.logs.update({shortname: log})
+        item = QListWidgetItem(shortname)
+        item.setToolTip(startTimeStr)
+        self.addItem(item)
+
+        self.logSelected.emit(log)  # type: ignore
+        self.setCurrentItem(item)
+
+        return log
+
+    def onItemClicked(self, item):
+        self.logSelected.emit(self.logs[item.text()])  # type: ignore

nodedge/dats/logs_widget.py

@@ -0,0 +1,18 @@
+from PySide6.QtWidgets import QPushButton, QVBoxLayout, QWidget
+
+from nodedge.dats.logs_list_widget import LogsListWidget
+
+
+class LogsWidget(QWidget):
+    def __init__(self, parent=None):
+        super().__init__(parent)
+
+        self.layout = QVBoxLayout()
+        self.layout.setContentsMargins(1, 1, 1, 1)
+        self.layout.setSpacing(1)
+        self.logsListWidget = LogsListWidget()
+        self.layout.addWidget(self.logsListWidget)
+        self.openButton = QPushButton("Open")
+        self.layout.addWidget(self.openButton)
+
+        self.setLayout(self.layout)

nodedge/dats/n_plot_data_item.py

@@ -0,0 +1,13 @@
+from pyqtgraph import PlotDataItem
+from PySide6.QtGui import QMouseEvent
+
+
+class NPlotDataItem(PlotDataItem):
+    def __init__(self, *args, **kargs):
+        super().__init__(*args, **kargs)
+
+    def mouseClickEvent(self, ev: QMouseEvent):
+        super().mouseClickEvent(ev)
+
+    def setData(self, *args, **kargs):
+        super().setData(*args, **kargs)