summaryrefslogtreecommitdiffstats
path: root/src/widget
diff options
context:
space:
mode:
authorDaniel Schürmann <daschuer@mixxx.org>2014-02-16 01:10:05 +0100
committerDaniel Schürmann <daschuer@mixxx.org>2014-02-16 01:10:05 +0100
commit3e8b4ac1313524c0d9fe01db2987c03e1f1e0f65 (patch)
tree019a9da8e45607e08be7d539fd7c04c4419eceee /src/widget
parent9e24efe09e7a7309efcf0e92ed1ecbd2776d2ca1 (diff)
Fixed Initalisation value of Display connection
Diffstat (limited to 'src/widget')
-rw-r--r--src/widget/controlwidgetconnection.cpp5
-rw-r--r--src/widget/controlwidgetconnection.h2
-rw-r--r--src/widget/wbasewidget.cpp6
-rw-r--r--src/widget/wbasewidget.h2
-rw-r--r--src/widget/wslidercomposed.cpp2
5 files changed, 15 insertions, 2 deletions
diff --git a/src/widget/controlwidgetconnection.cpp b/src/widget/controlwidgetconnection.cpp
index 78772cf883..26705f61ef 100644
--- a/src/widget/controlwidgetconnection.cpp
+++ b/src/widget/controlwidgetconnection.cpp
@@ -52,12 +52,15 @@ ControlParameterWidgetConnection::ControlParameterWidgetConnection(WBaseWidget*
: ControlWidgetConnection(pBaseWidget, pControl, pTransformer),
m_directionOption(directionOption),
m_emitOption(emitOption) {
- slotControlValueChanged(m_pControl->get());
}
ControlParameterWidgetConnection::~ControlParameterWidgetConnection() {
}
+void ControlParameterWidgetConnection::Init() {
+ slotControlValueChanged(m_pControl->get());
+}
+
QString ControlParameterWidgetConnection::toDebugString() const {
const ConfigKey& key = getKey();
return QString("%1,%2 Parameter: %3 Direction: %4 Emit: %5")
diff --git a/src/widget/controlwidgetconnection.h b/src/widget/controlwidgetconnection.h
index b5a8b03b89..2998b5d250 100644
--- a/src/widget/controlwidgetconnection.h
+++ b/src/widget/controlwidgetconnection.h
@@ -97,6 +97,8 @@ class ControlParameterWidgetConnection : public ControlWidgetConnection {
EmitOption emitOption);
virtual ~ControlParameterWidgetConnection();
+ void Init();
+
QString toDebugString() const;
int getDirectionOption() const { return m_directionOption; };
diff --git a/src/widget/wbasewidget.cpp b/src/widget/wbasewidget.cpp
index 9c3640147d..6b0972286d 100644
--- a/src/widget/wbasewidget.cpp
+++ b/src/widget/wbasewidget.cpp
@@ -27,6 +27,12 @@ WBaseWidget::~WBaseWidget() {
}
}
+void WBaseWidget::Init() {
+ if (m_pDisplayConnection) {
+ m_pDisplayConnection->Init();
+ }
+}
+
void WBaseWidget::setDisplayConnection(ControlParameterWidgetConnection* pConnection) {
//qDebug() << "WBaseWidget::setDisplayConnection()" << pConnection->toDebugString();
m_pDisplayConnection = pConnection;
diff --git a/src/widget/wbasewidget.h b/src/widget/wbasewidget.h
index 29be7b6526..051b23a88a 100644
--- a/src/widget/wbasewidget.h
+++ b/src/widget/wbasewidget.h
@@ -13,6 +13,8 @@ class WBaseWidget {
WBaseWidget(QWidget* pWidget);
virtual ~WBaseWidget();
+ void Init();
+
QWidget* toQWidget() {
return m_pWidget;
}
diff --git a/src/widget/wslidercomposed.cpp b/src/widget/wslidercomposed.cpp
index 3bee90b2e9..4672c9f3d6 100644
--- a/src/widget/wslidercomposed.cpp
+++ b/src/widget/wslidercomposed.cpp
@@ -27,7 +27,7 @@
WSliderComposed::WSliderComposed(QWidget * parent)
: WWidget(parent),
- m_dOldValue(0.0),
+ m_dOldValue(-1.0), // virgin
m_bRightButtonPressed(false),
m_iPos(0),
m_iStartHandlePos(0),