Skip to content

Commit

Permalink
Merge pull request #953 from janezd/report-position
Browse files Browse the repository at this point in the history
Classification and regression widgets: Put Report button at better position
  • Loading branch information
BlazZupan committed Dec 27, 2015
2 parents 6db2072 + 414c6c4 commit 4a2a85c
Show file tree
Hide file tree
Showing 6 changed files with 11 additions and 4 deletions.
1 change: 1 addition & 0 deletions Orange/widgets/classify/owknn.py
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ def __init__(self):

gui.button(self.controlArea, self, "Apply",
callback=self.apply, default=True)
self.controlArea.layout().addWidget(self.report_button)

self.apply()

Expand Down
6 changes: 4 additions & 2 deletions Orange/widgets/classify/owlogisticregression.py
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,10 @@ def __init__(self):
box2 = gui.widgetBox(box, orientation="horizontal")
box2.layout().setAlignment(Qt.AlignCenter)
self.c_label = gui.widgetLabel(box2)
gui.button(self.controlArea, self, "&Apply",
callback=self.apply, default=True)
box = gui.widgetBox(self.controlArea, orientation="horizontal",
margin=0)
box.layout().addWidget(self.report_button)
gui.button(box, self, "&Apply", callback=self.apply, default=True)
self.set_c()
self.apply()

Expand Down
1 change: 1 addition & 0 deletions Orange/widgets/classify/owmajority.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ def __init__(self):
)
gui.button(self.controlArea, self, "Apply", callback=self.apply,
default=True)
self.controlArea.layout().addWidget(self.report_button)

self.apply()

Expand Down
1 change: 1 addition & 0 deletions Orange/widgets/classify/ownaivebayes.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ def __init__(self):

gui.button(self.controlArea, self, self.tr("&Apply"),
callback=self.apply)
self.controlArea.layout().addWidget(self.report_button)

self.data = None
self.preprocessors = None
Expand Down
1 change: 1 addition & 0 deletions Orange/widgets/regression/owknnregression.py
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ def __init__(self):

gui.button(self.controlArea, self, "Apply",
callback=self.apply, default=True)
self.controlArea.layout().addWidget(self.report_button)

layout = self.layout()
self.layout().setSizeConstraint(layout.SetFixedSize)
Expand Down
5 changes: 3 additions & 2 deletions Orange/widgets/regression/owmean.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,9 @@ def __init__(self):

box = gui.widgetBox(self.controlArea, "Learner Name")
gui.lineEdit(box, self, "learner_name")
gui.button(self.controlArea, self, "Apply", callback=self.apply,
default=True)
gui.button(self.controlArea, self, "Apply",
callback=self.apply, default=True)
self.controlArea.layout().addWidget(self.report_button)
self.apply()

def set_data(self, data):
Expand Down

0 comments on commit 4a2a85c

Please sign in to comment.