interactive integration; new user-defined fit functions reloads model list; fixed requirements.txt

src/gui_qt/graphs/drawings.py

@@ -1,18 +1,31 @@
-from pyqtgraph import InfiniteLine
-
-from ..Qt import QtWidgets, QtCore, QtGui
+from ..Qt import QtWidgets, QtCore
 from .._py.guidelinewidget import Ui_Form
-from ..lib.pg_objects import LogInfiniteLine
 
 
-class LineWidget(QtWidgets.QWidget, Ui_Form):
-    line_created = QtCore.pyqtSignal(object, str)
-    line_deleted = QtCore.pyqtSignal(object, str)
+class DrawingsWidget(QtWidgets.QWidget, Ui_Form):
 
     def __init__(self, parent=None):
         super().__init__(parent=parent)
+
+        self.connected_figure=None
+
         self.setupUi(self)
 
+    def __call__(self, graphs):
+        for gid, name in graphs:
+            self.graph_comboBox.addItem(name, userData=gid)
+
+    def clear(self):
+        self.graph_comboBox.clear()
+
+    @QtCore.pyqtSlot(int, name='on_mode_comboBox_currentIndexChanged')
+    def change_draw_type(self, idx: int):
+        self.stackedWidget.setCurrentIndex(idx)
+
+
+
+"""
+
         self.lines = {}
         self.comments = {}
 
@@ -145,3 +158,4 @@ class LineWidget(QtWidgets.QWidget, Ui_Form):
         pos = line.value()
         text_item = self.tableWidget.item(i, 0)
         text_item.setText(text_item.text()[:4]+f'{pos:.4g}')
+"""

src/gui_qt/graphs/graphwindow.py

@@ -605,7 +605,11 @@ class QGraphWindow(QtWidgets.QGraphicsView, Ui_GraphWindow):
                 dic['items'].append(item_dic)
 
         for item in self._external_items:
-            dic['items'].append(item.get_data_opts())
+            try:
+                dic['items'].append(item.get_data_opts())
+            except AttributeError:
+                print(f'{item} is missing "get_data_opts()"')
+                continue
             in_legend.append(False)
 
         dic['in_legend'] = in_legend