Skip to content

Commit e5b7ace

Browse files
committed
Parameter Fitter: Fix minor glitches and annotations
1 parent 73c01a8 commit e5b7ace

File tree

1 file changed

+9
-7
lines changed

1 file changed

+9
-7
lines changed

Orange/widgets/evaluate/owparameterfitter.py

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
from typing import Optional, Callable, Collection, Sequence, Any
1+
from typing import Optional, Callable, Collection, Sequence
22

33
import numpy as np
44
from AnyQt.QtCore import QPointF, Qt, QSize
@@ -55,8 +55,8 @@ def _search(
5555
data: Table,
5656
learner: Learner,
5757
fitted_parameter_props: Learner.FittedParameter,
58-
initial_parameters: dict[str, Any],
59-
steps: Collection[Any],
58+
initial_parameters: dict[str, int],
59+
steps: Collection[int],
6060
progress_callback: Callable = dummy_callback
6161
) -> FitterResults:
6262
progress_callback(0, "Calculating...")
@@ -76,8 +76,8 @@ def run(
7676
data: Table,
7777
learner: Learner,
7878
fitted_parameter_props: Learner.FittedParameter,
79-
initial_parameters: dict[str, Any],
80-
steps: Collection[Any],
79+
initial_parameters: dict[str, int],
80+
steps: Collection[int],
8181
state: TaskState
8282
) -> FitterResults:
8383
def callback(i: float, status: str = ""):
@@ -285,7 +285,9 @@ def paintEvent(self, event):
285285
rect.adjust(style.pixelMetric(style.PM_IndicatorWidth)
286286
+ style.pixelMetric(style.PM_CheckBoxLabelSpacing), 0, 0, 0)
287287

288-
last_text = f", {self.__steps[-1]}"
288+
last_text = f"{self.__steps[-1]}"
289+
if len(self.__steps) > 1:
290+
last_text = ", " + last_text
289291
last_width = metrics.horizontalAdvance(last_text)
290292

291293
elided_text = metrics.elidedText(
@@ -576,10 +578,10 @@ def clear(self):
576578

577579
@gui.deferred
578580
def commit(self):
581+
self.graph.clear_all()
579582
if self._data is None or self._learner is None or \
580583
not self.fitted_parameters or not self.steps:
581584
return
582-
self.graph.clear_all()
583585
self.start(run, self._data, self._learner,
584586
self.fitted_parameters[self.parameter_index],
585587
self.initial_parameters, self.steps)

0 commit comments

Comments
 (0)