diff --git a/ewoksorange/bindings/owwidgets.py b/ewoksorange/bindings/owwidgets.py index 840653b518381fdfce6a0be3b5e87fdc57a57713..a7e64fb528aed8e272743862ad41efe0ce7d5775 100644 --- a/ewoksorange/bindings/owwidgets.py +++ b/ewoksorange/bindings/owwidgets.py @@ -236,7 +236,7 @@ class OWEwoksWidgetNoThread(OWEwoksBaseWidget, **ow_build_opts): """Widget which will executeEwoksTask the ewokscore.Task directly""" def __init__(self, *args, **kwargs): - super().__init__(self, *args, **kwargs) + super().__init__(*args, **kwargs) self.__taskExecutor = TaskExecutor(self.ewokstaskclass) def executeEwoksTask(self): @@ -258,7 +258,7 @@ class OWEwoksWidgetNoThread(OWEwoksBaseWidget, **ow_build_opts): class _OWEwoksThreadedBaseWidget(OWEwoksBaseWidget, **ow_build_opts): def __init__(self, *args, **kwargs): - super().__init__(self, *args, **kwargs) + super().__init__(*args, **kwargs) self.__taskProgress = QProgress() self.__taskProgress.sigProgressChanged.connect(self.progressBarSet) @@ -306,7 +306,7 @@ class OWEwoksWidgetOneThread(_OWEwoksThreadedBaseWidget, **ow_build_opts): """ def __init__(self, *args, **kwargs): - super().__init__(self, *args, **kwargs) + super().__init__(*args, **kwargs) self.__taskExecutor = ThreadedTaskExecutor(ewokstaskclass=self.ewokstaskclass) self.__taskExecutor.finished.connect(self._ewoksTaskFinishedCallback) diff --git a/ewoksorange/canvas/__main__.py b/ewoksorange/canvas/__main__.py index e5dc8e385062edcf6ef9bc49ed4043c07c407305..fa626807b4e4a14e52e9ace888219bb95e2a93d8 100644 --- a/ewoksorange/canvas/__main__.py +++ b/ewoksorange/canvas/__main__.py @@ -18,35 +18,46 @@ from ..orange_version import ORANGE_VERSION if ORANGE_VERSION == ORANGE_VERSION.henri_fork: import argparse - arg_parser = argparse.ArgumentParser() - arg_parser.add_argument( - "--no-discovery", - action="store_true", - help="Don't run widget discovery (use full cache instead)", - ) - arg_parser.add_argument( - "--force-discovery", - action="store_true", - help="Force full widget discovery (invalidate cache)", - ) - arg_parser.add_argument( - "--no-welcome", action="store_true", help="Don't show welcome dialog." - ) - arg_parser.add_argument( - "--no-splash", action="store_true", help="Don't show splash screen." - ) - arg_parser.add_argument( - "--stylesheet", - help="Application level CSS style sheet to use", - type=str, - default=None, - ) - arg_parser.add_argument( - "--config", - help="Configuration namespace", - type=str, - default=None, - ) + def arg_parser(): + parser = argparse.ArgumentParser() + parser.add_argument( + "--no-discovery", + action="store_true", + help="Don't run widget discovery (use full cache instead)", + ) + parser.add_argument( + "--force-discovery", + action="store_true", + help="Force full widget discovery (invalidate cache)", + ) + parser.add_argument( + "--no-welcome", action="store_true", help="Don't show welcome dialog." + ) + parser.add_argument( + "--no-splash", action="store_true", help="Don't show splash screen." + ) + parser.add_argument( + "--stylesheet", + help="Application level CSS style sheet to use", + type=str, + default=None, + ) + parser.add_argument( + "--config", + help="Configuration namespace", + type=str, + default=None, + ) + parser.add_argument( + "-l", + "--log-level", + help="Logging level (0, 1, 2, 3, 4)", + type=int, + default=1, + ) + return parser + + else: from orangecanvas.main import arg_parser diff --git a/ewoksorange/ewoks_addon/orangecontrib/ewoks_defaults/__init__.py b/ewoksorange/ewoks_addon/orangecontrib/ewoks_defaults/__init__.py index ee85c0ddc1bb00502ce7c416d4a856b63a3f88b7..6c8cc5333794cb232bbd9b5c48e417ef8fa446ec 100644 --- a/ewoksorange/ewoks_addon/orangecontrib/ewoks_defaults/__init__.py +++ b/ewoksorange/ewoks_addon/orangecontrib/ewoks_defaults/__init__.py @@ -39,8 +39,8 @@ def default_owwidget_class(task_class: Task) -> Tuple[OWEwoksBaseWidget, str]: description = f"Orange widget is missing for Ewoks task {task_class.__name__}" want_main_area = False - def __init__(self): - super().__init__() + def __init__(self, *args, **kw): + super().__init__(*args, **kw) self.handleNewSignals() widget_class = DefaultOwWidget