Skip to content

Commit aaa15bf

Browse files
committed
Fix OSSimpleProgressBar, will remove the ruby bindings entirely next
1 parent 3bdc7d9 commit aaa15bf

File tree

3 files changed

+34
-14
lines changed

3 files changed

+34
-14
lines changed

src/model_editor/ModelEditor.i

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
#endif
2222

2323
%{
24-
#include <model_editor/OSProgressBar.hpp>
24+
#include <model_editor/OSSimpleProgressBar.hpp>
2525
#include <model_editor/Utilities.hpp>
2626

2727
#include <openstudio/model/Model.hpp>
@@ -43,7 +43,7 @@
4343
}
4444
%}
4545

46-
%feature("director") OSProgressBar;
47-
%include <model_editor/OSProgressBar.hpp>
46+
%feature("director") OSSimpleProgressBar;
47+
%include <model_editor/OSSimpleProgressBar.hpp>
4848

4949
#endif //MODELEDITOR_LIB_I

src/model_editor/OSSimpleProgressBar.cpp

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,3 +65,17 @@ void OSSimpleProgressBar::setVisible(bool visible) {
6565

6666
/// virtual method called every time progressUpdated fires
6767
void OSSimpleProgressBar::onPercentageUpdated(double percentage) {}
68+
69+
/// set range
70+
void OSSimpleProgressBar::setRange(int min, int max) {
71+
setMinimum(min);
72+
setMaximum(max);
73+
updatePercentage();
74+
}
75+
76+
/// set value
77+
void OSSimpleProgressBar::setValue(int value)
78+
{
79+
m_value = value;
80+
updatePercentage();
81+
}

src/model_editor/OSSimpleProgressBar.hpp

Lines changed: 17 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -25,37 +25,43 @@ class OSSimpleProgressBar : public openstudio::ProgressBar
2525
virtual ~OSSimpleProgressBar();
2626

2727
/// get min
28-
virtual int minimum() const;
28+
int minimum() const override;
2929

3030
/// set min
31-
virtual void setMinimum(int min);
31+
void setMinimum(int min) override;
3232

3333
/// get max
34-
virtual int maximum() const;
34+
int maximum() const override;
3535

3636
/// set max
37-
virtual void setMaximum(int max);
37+
void setMaximum(int max) override;
3838

3939
/// get value
40-
virtual int value() const;
40+
int value() const override;
4141

4242
/// get the window title
43-
virtual std::string windowTitle() const;
43+
std::string windowTitle() const override;
4444

4545
/// set the window title
46-
virtual void setWindowTitle(const std::string& title);
46+
void setWindowTitle(const std::string& title) override;
4747

4848
/// get the text
49-
virtual std::string text() const;
49+
std::string text() const override;
5050

5151
/// get if visible
52-
virtual bool isVisible() const;
52+
bool isVisible() const override;
5353

5454
/// set if visible
55-
virtual void setVisible(bool visible);
55+
void setVisible(bool visible) override;
5656

5757
/// virtual method called every time percentageUpdated fires
58-
virtual void onPercentageUpdated(double percentage);
58+
void onPercentageUpdated(double percentage) override;
59+
60+
/// set range
61+
void setRange(int min, int max) override;
62+
63+
/// set value
64+
void setValue(int value) override;
5965

6066
private:
6167
int m_minimum{0};

0 commit comments

Comments
 (0)