diff options
| author | Robert Jonsson <spamatica@gmail.com> | 2011-02-14 21:16:56 +0000 |
|---|---|---|
| committer | Robert Jonsson <spamatica@gmail.com> | 2011-02-14 21:16:56 +0000 |
| commit | 1371ee8ba22423680d84623997f07b368a342164 (patch) | |
| tree | ac3c5ea55dc813b67478b305b602d14b4475c700 /muse2/muse/ctrl.cpp | |
| parent | 7fa70010daf92f90bf47933e846c0ded239a98f7 (diff) | |
more graphical automation fixes
Diffstat (limited to 'muse2/muse/ctrl.cpp')
| -rw-r--r-- | muse2/muse/ctrl.cpp | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/muse2/muse/ctrl.cpp b/muse2/muse/ctrl.cpp index e5da5f2b..bb77e0c5 100644 --- a/muse2/muse/ctrl.cpp +++ b/muse2/muse/ctrl.cpp @@ -20,13 +20,13 @@ void CtrlList::initColor(int i) { - QColor collist[] = { Qt::red, Qt::yellow, Qt::blue , Qt::green, Qt::white, Qt::black }; + QColor collist[] = { Qt::red, Qt::yellow, Qt::blue , Qt::black, Qt::white, Qt::green }; - if (i < 5) - _displayColor = collist[i%6]; + if (i < 6) + _displayColor = collist[i%6]; else - _displayColor = Qt::gray; - _visible = false; + _displayColor = Qt::green; + _visible = false; } @@ -47,7 +47,7 @@ CtrlList::CtrlList(int id) //--------------------------------------------------------- // CtrlList //--------------------------------------------------------- -CtrlList::CtrlList(int id, QString name, double min, double max, bool dontShow) +CtrlList::CtrlList(int id, QString name, double min, double max, CtrlValueType v, bool dontShow) { _id = id; _default = 0.0; @@ -56,6 +56,7 @@ CtrlList::CtrlList(int id, QString name, double min, double max, bool dontShow) _name = name; _min = min; _max = max; + _valueType = v; _dontShow = dontShow; initColor(id); } @@ -70,7 +71,7 @@ CtrlList::CtrlList() _curVal = 0.0; _mode = INTERPOLATE; _dontShow = false; - initColor(-1); + initColor(0); } //--------------------------------------------------------- |