Skip to content

Commit 46417d0

Browse files
authored
Merge pull request #1592 from LCA-ActivityBrowser/copilot/fix-cutoff-aggregation-bug
Fix cutoff/aggregation bug by setting default values when switching cutoff types
2 parents 2fdc2ac + bd9d812 commit 46417d0

1 file changed

Lines changed: 19 additions & 1 deletion

File tree

activity_browser/ui/widgets/cutoff_menu.py

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,12 @@ def cutoff_type_check(self) -> None:
198198
self.labels.min.setText("100%")
199199
self.labels.max.setText("0.001%")
200200
self.cutoff_slider_line.setValidator(self.validators.percent)
201-
if self.limit_type == "cum_percent":
201+
202+
# Set default value: 5%
203+
self.cutoff_value = 0.05
204+
self.sliders.percent.log_value = 5.0
205+
self.cutoff_slider_line.setText("5.0")
206+
elif self.limit_type == "cum_percent":
202207
self.sliders.percent.setVisible(False)
203208
self.sliders.cum_percent.setVisible(True)
204209
self.sliders.number.setVisible(False)
@@ -207,6 +212,11 @@ def cutoff_type_check(self) -> None:
207212
self.labels.min.setText("1%")
208213
self.labels.max.setText("100%")
209214
self.cutoff_slider_line.setValidator(self.validators.cum_percent)
215+
216+
# Set default value: 50%
217+
self.cutoff_value = 0.50
218+
self.sliders.cum_percent.setValue(50)
219+
self.cutoff_slider_line.setText("50")
210220
elif self.limit_type == "number":
211221
self.sliders.percent.setVisible(False)
212222
self.sliders.cum_percent.setVisible(False)
@@ -216,12 +226,20 @@ def cutoff_type_check(self) -> None:
216226
self.labels.min.setText(str(self.sliders.number.minimum()))
217227
self.labels.max.setText(str(self.sliders.number.maximum()))
218228
self.cutoff_slider_line.setValidator(self.validators.number)
229+
230+
# Set default value: 5
231+
self.cutoff_value = 5
232+
self.sliders.number.setValue(5)
233+
self.cutoff_slider_line.setText("5")
219234

220235
# unblock signals
221236
self.sliders.percent.blockSignals(False)
222237
self.sliders.cum_percent.blockSignals(False)
223238
self.sliders.number.blockSignals(False)
224239
self.cutoff_slider_line.blockSignals(False)
240+
241+
# Emit signal to update the tab with new cutoff value
242+
self.slider_change.emit()
225243

226244
@Slot(str, name="sliderPercentCheck")
227245
def cutoff_slider_percent_check(self, editor: str):

0 commit comments

Comments
 (0)