[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [krita/langkamp/remotecontrol] plugins/extensions/remotecontrol: Add opacity and flow controls for r
From:       Sven Langkamp <sven.langkamp () gmail ! com>
Date:       2016-07-21 20:22:40
Message-ID: E1bQKUS-00067Q-LB () code ! kde ! org
[Download RAW message or body]

Git commit b534b5e4205e37ff0d4e835ad102960489cf31f8 by Sven Langkamp.
Committed on 21/07/2016 at 20:22.
Pushed by langkamp into branch 'langkamp/remotecontrol'.

Add opacity and flow controls for remote control

M  +0    -3    plugins/extensions/remotecontrol/kis_opcua_server.cpp
M  +39   -0    plugins/extensions/remotecontrol/kis_paintop_control_object.cpp
M  +9    -1    plugins/extensions/remotecontrol/kis_paintop_control_object.h

http://commits.kde.org/krita/b534b5e4205e37ff0d4e835ad102960489cf31f8

diff --git a/plugins/extensions/remotecontrol/kis_opcua_server.cpp \
b/plugins/extensions/remotecontrol/kis_opcua_server.cpp index 8a56324..a7d3564 100644
--- a/plugins/extensions/remotecontrol/kis_opcua_server.cpp
+++ b/plugins/extensions/remotecontrol/kis_opcua_server.cpp
@@ -84,7 +84,6 @@ static UA_StatusCode writeVariable(void *handle, const UA_NodeId \
nodeid,  return UA_STATUSCODE_BADUNEXPECTEDERROR;
     }
     QPair<QObject*, int> property = m_variableMap[id];
-    qDebug() << property.second;
 
     QObject* object = property.first;
     QMetaProperty prop = object->metaObject()->property(property.second);
@@ -164,8 +163,6 @@ void KisOpcUaServer::run()
                                                                       \
                UA_NODEID_NUMERIC(1, objectIndex),
                                                                       \
                UA_NODEID_NUMERIC(0, UA_NS0ID_ORGANIZES),
                                                                       \
                variableNodeName, UA_NODEID_NULL, attr, dataSource, NULL);
-
-            qDebug() << QString("%1").arg(retval, 0, 16);;
         }
         objectIndex++;
     }
diff --git a/plugins/extensions/remotecontrol/kis_paintop_control_object.cpp \
b/plugins/extensions/remotecontrol/kis_paintop_control_object.cpp index \
                3197ede..c6e3651c 100644
--- a/plugins/extensions/remotecontrol/kis_paintop_control_object.cpp
+++ b/plugins/extensions/remotecontrol/kis_paintop_control_object.cpp
@@ -48,3 +48,42 @@ double KisPaintopControlObject::brushSize()
   
     return m_view->resourceProvider()->currentPreset()->settings()->paintOpSize().width();
  }
+
+double KisPaintopControlObject::flow()
+{
+    if(!m_view || !m_view->resourceProvider()) {
+        return 0.0;
+    }
+
+    return m_view->resourceProvider()->currentPreset()->settings()->paintOpFlow();
+}
+
+void KisPaintopControlObject::setFlow(double flow)
+{
+    if(!m_view || !m_view->resourceProvider()) {
+        return;
+    }
+
+    m_view->resourceProvider()->currentPreset()->settings()->setPaintOpFlow(flow);
+}
+
+double KisPaintopControlObject::opacity()
+{
+    if(!m_view || !m_view->resourceProvider()) {
+        return 0.0;
+    }
+
+    return m_view->resourceProvider()->currentPreset()->settings()->paintOpOpacity();
 +}
+
+void KisPaintopControlObject::setOpacity(double opacity)
+{
+    if(!m_view || !m_view->resourceProvider()) {
+        return;
+    }
+
+    m_view->resourceProvider()->currentPreset()->settings()->setPaintOpOpacity(opacity);
 +}
+
+
+
diff --git a/plugins/extensions/remotecontrol/kis_paintop_control_object.h \
b/plugins/extensions/remotecontrol/kis_paintop_control_object.h index \
                9ca59e1..cd622bf 100644
--- a/plugins/extensions/remotecontrol/kis_paintop_control_object.h
+++ b/plugins/extensions/remotecontrol/kis_paintop_control_object.h
@@ -31,10 +31,18 @@ public:
     explicit KisPaintopControlObject(KisViewManager* view, QObject *parent = 0);
 
     Q_PROPERTY(double brushSize READ brushSize WRITE setBrushSize)
+    Q_PROPERTY(double opacity READ opacity WRITE setOpacity)
+    Q_PROPERTY(double flow READ flow WRITE setFlow)
 
-    void setBrushSize(double flow);
+    void setBrushSize(double size);
     double brushSize();
 
+    void setOpacity(double opacity);
+    double opacity();
+
+    void setFlow(double flow);
+    double flow();
+
 private:
     KisViewManager* m_view;
 };


[prev in list] [next in list] [prev in thread] [next in thread]