Auto stash before merge of "master" and "origin/master"

Author: UmSenhorQualquer

pythonvideoannotator_models_gui/dialogs/datasets/datasets_selector.py

@@ -19,6 +19,8 @@ def __init__(self, parent_win=None):
         self._objects.changed_event  = self.__update_datasets
         self._datasets.changed_event = self.__datasets_changed_event
 
+        self.load_order = ['_videos', '_objects', '_datasets']
+
         #for video in conf.PROJECT.videos: self += video
 
     #####################################################################
@@ -51,21 +53,8 @@ def save_form(self, data={}, path=None):
                 data[name] = {}
                 param.save_form(data[name])
         return data
-
-    def load_form(self, data, path=None):
-        allparams = self.controls
-
-        if hasattr(self, 'load_order'):
-            for name in self.load_order:
-                param = allparams[name]
-                if name in data:
-                    param.load_form(data[name])
-        else:
-            for name, param in allparams.items():
-                if name in data:
-                    param.load_form(data[name])
     """
-
+  
     # used to update automaticly the name of the videos, objects and paths
     def refresh(self):
         ObjectsDialog.refresh(self)

pythonvideoannotator_models_gui/models/video/objects/geometry/geometry_gui.py

@@ -1,4 +1,4 @@
-import csv, cv2, os, numpy as np
+import csv, cv2, os, numpy as np, AnyQt
 from pysettings import conf
 from pyforms import BaseWidget
 from pyforms.Controls import ControlButton
@@ -11,7 +11,8 @@
 from pythonvideoannotator_models_gui.models.video.objects.object2d.datasets.path import Path
 from geometry_designer.modules.geometry_manual_designer.GeometryManualDesigner import GeometryManualDesigner
 
-from PyQt5.QtWidgets import QInputDialog
+if conf.PYFORMS_MODE=='GUI':
+	from AnyQt.QtWidgets import QInputDialog
 
 class GeometryGUI(IModelGUI, Geometry, BaseWidget):