knob without def ctors.

This commit is contained in:
Johannes Lorenz
2014-04-09 12:31:53 +02:00
parent 3d0ce057d6
commit d08857bba8
4 changed files with 107 additions and 35 deletions

View File

@@ -38,7 +38,7 @@ class EXPORT TempoSyncKnob : public knob
{
Q_OBJECT
public:
TempoSyncKnob( int knobNum, QWidget* parent = NULL, const QString& name = QString() );
TempoSyncKnob( knobTypes knobNum, QWidget* parent = NULL, const QString& name = QString() );
virtual ~TempoSyncKnob();
const QString & syncDescription();

View File

@@ -46,6 +46,8 @@ enum knobTypes
class EXPORT knob : public QWidget, public FloatModelView
{
Q_OBJECT
Q_ENUMS( knobTypes )
Q_PROPERTY(float innerRadius READ innerRadius WRITE setInnerRadius)
Q_PROPERTY(float outerRadius READ outerRadius WRITE setOuterRadius)
@@ -57,11 +59,18 @@ class EXPORT knob : public QWidget, public FloatModelView
// Unfortunately, the gradient syntax doesn't create our gradient
// correctly so we need to do this:
Q_PROPERTY(QColor outerColor READ outerColor WRITE setOuterColor)
Q_PROPERTY(QColor lineColor READ lineColor WRITE setlineColor)
Q_PROPERTY(QColor arcColor READ arcColor WRITE setarcColor)
mapPropertyFromModel(bool,isVolumeKnob,setVolumeKnob,m_volumeKnob);
mapPropertyFromModel(float,volumeRatio,setVolumeRatio,m_volumeRatio);
Q_PROPERTY(knobTypes knobNum READ knobNum WRITE setknobNum)
void init( const QString & _name ); //!< to be called by ctors
public:
knob( int _knob_num, QWidget * _parent = NULL, const QString & _name = QString() );
knob( knobTypes _knob_num, QWidget * _parent = NULL, const QString & _name = QString() );
knob( QWidget * _parent = NULL, const QString & _name = QString() ); //!< default ctor
virtual ~knob();
// TODO: remove
@@ -82,6 +91,9 @@ public:
float outerRadius() const;
void setOuterRadius( float _r );
knobTypes knobNum() const;
void setknobNum( knobTypes _k );
QPointF centerPoint() const;
float centerPointX() const;
void setCenterPointX( float _c );
@@ -93,6 +105,10 @@ public:
QColor outerColor() const;
void setOuterColor( const QColor & _c );
QColor lineColor() const;
void setlineColor( const QColor & _c );
QColor arcColor() const;
void setarcColor( const QColor & _c );
signals:
@@ -146,7 +162,6 @@ private:
static textFloat * s_textFloat;
int m_knobNum;
QString m_label;
QPixmap * m_knobPixmap;
@@ -167,7 +182,11 @@ private:
float m_innerRadius;
float m_outerRadius;
float m_lineWidth;
QColor * m_outerColor;
QColor m_outerColor;
QColor m_lineColor; //!< unused yet
QColor m_arcColor; //!< unused yet
knobTypes m_knobNum;
} ;