* Laying background to enable swipe on GraphicSlidingDownBts

* Moving touch out of the bt "cancels" the click :D
cpscotti · Mar 3, 2011 · e16ad14 · e16ad14
1 parent c17c1b6
commit e16ad14
Show file tree

Hide file tree

Showing 4 changed files with 83 additions and 5 deletions.
diff --git a/PushBurton2/graphicslidingdownbts.cpp b/PushBurton2/graphicslidingdownbts.cpp
@@ -37,13 +37,16 @@ GraphicSlidingDownBts::GraphicSlidingDownBts(QGraphicsItem* parent) : QGraphicsO
 
     rootState = new QState();
     chooserState = new QState(rootState);
+    connect(chooserState, SIGNAL(entered()), this, SLOT(entered_chooser()));
+    connect(chooserState, SIGNAL(exited()), this, SLOT(exited_chooser()));
 
 //    machine.setGlobalRestorePolicy(QStateMachine::RestoreProperties);
     machine.addState(rootState);
     machine.setInitialState(rootState);
     rootState->setInitialState(chooserState);
 
     initial_selection = -1;
+    isOnChooser = false;
 }
 
 void GraphicSlidingDownBts::setBtsRect(const QRectF& a_btsrect)
@@ -62,6 +65,8 @@ void GraphicSlidingDownBts::addBt(QString text, QString value)
     newBt->setBtRect(btsRect);
     newBt->setPos(0,0);
     newBt->setZValue(1.0);
+    connect(newBt, SIGNAL(v_swipe_hint(qreal)), this, SLOT(get_swipe_hints(qreal)));
+    connect(this, SIGNAL(do_swipe(qreal)), newBt, SLOT(v_swipe_action(qreal)));
     push_back(newBt, value);
 }
 
@@ -71,7 +76,7 @@ void GraphicSlidingDownBts::push_back(GraphicTextBt* newBt, QString val)
     selectedStates.push_back(newState);
     graphicBts.push_back(newBt);
 
-    newState->addTransition(newBt, SIGNAL(activated()), chooserState);
+    newState->addTransition(newBt, SIGNAL(released()), chooserState);
 //    newState->assignProperty(newBt, "y", 0);
 
     connect(newState, SIGNAL(entered()), selectedMapper, SLOT(map()));
@@ -100,7 +105,7 @@ void GraphicSlidingDownBts::construction_finished()
     for(int i=0;i < cnt;i++)
     {
         chooserState->assignProperty(graphicBts[i], "y", 60*i);//chooser position for all bts (unfolded down)
-        chooserState->addTransition(graphicBts[i], SIGNAL(activated()), selectedStates[i]);
+        chooserState->addTransition(graphicBts[i], SIGNAL(released()), selectedStates[i]);
     }
 
     if(cnt > 0)
@@ -136,4 +141,25 @@ void GraphicSlidingDownBts::paint(QPainter *painter, const QStyleOptionGraphicsI
 void GraphicSlidingDownBts::inn_selected(const QString& val)
 {
     qDebug() << "Inner selection is " << val;
+    lastInnSelection = val;
+}
+
+
+void GraphicSlidingDownBts::get_swipe_hints(qreal ydif)
+{
+//    if(isOnChooser) {
+//        emit do_swipe(ydif);
+//    }
+}
+
+void GraphicSlidingDownBts::entered_chooser()
+{
+    isOnChooser = true;
+    //start timer
+}
+
+void GraphicSlidingDownBts::exited_chooser()
+{
+    isOnChooser = false;
+    //stop timer
 }
diff --git a/PushBurton2/graphicslidingdownbts.h b/PushBurton2/graphicslidingdownbts.h
@@ -33,6 +33,7 @@
 #include <QVector>
 #include <QSignalMapper>
 #include <QStateMachine>
+
 #include <QPropertyAnimation>
 
 #include "graphictextbt.h"
@@ -68,6 +69,8 @@ private slots:
 
     int initial_selection;
 
+    bool isOnChooser;
+
     QRectF btsRect;
 
     QVector<GraphicTextBt*> graphicBts;
@@ -76,6 +79,17 @@ private slots:
     QState * chooserState;
     QStateMachine machine;
     QSignalMapper * selectedMapper;
+
+    QString lastInnSelection;
+
+signals:
+    void do_swipe(qreal ydif);
+
+public slots:
+    void get_swipe_hints(qreal ydif);
+    void entered_chooser();
+    void exited_chooser();
+
 };
 
 #endif // GRAPHICSLIDINGDOWNBTS_H
diff --git a/PushBurton2/graphictextbt.cpp b/PushBurton2/graphictextbt.cpp
@@ -77,20 +77,46 @@ void GraphicTextBt::paint(QPainter *painter, const QStyleOptionGraphicsItem *,QW
     painter->drawText(btRect, Qt::AlignCenter, text);
 }
 
-void GraphicTextBt::mousePressEvent(QGraphicsSceneMouseEvent *)
+void GraphicTextBt::mousePressEvent(QGraphicsSceneMouseEvent * event)
 {
+    firstTch = event->screenPos();
+    prevTch = event->screenPos();
+
     if(!toggled) {
         emit activated();
         toggled = true;
         this->update();
     }
 }
 
-void GraphicTextBt::mouseReleaseEvent(QGraphicsSceneMouseEvent *)
+void GraphicTextBt::mouseReleaseEvent(QGraphicsSceneMouseEvent * event)
 {
+    QPoint now = event->screenPos();
+    qreal entireFlight = sqrt(pow(now.x() - firstTch.x(),2.0) + pow(now.y() - firstTch.y(),2.0));
+
     if(toggled) {
-        emit released();
+//        qDebug() << "entireFlight = " << entireFlight;
+        if(fabs(entireFlight) < 30.0) {
+            emit released();
+        }
         toggled = false;
         this->update();
     }
 }
+
+void GraphicTextBt::mouseMoveEvent(QGraphicsSceneMouseEvent * event)
+{
+    QPoint now = event->screenPos();
+    qreal vertFlight = now.y() - prevTch.y();
+//    qDebug() << "entireFlight = " << entireFlight;
+//    qreal entireFlight = now.x() - prevTch.x();
+    emit v_swipe_hint(vertFlight);
+    prevTch = now;
+
+}
+
+void GraphicTextBt::v_swipe_action(qreal dif)
+{
+    QVariant oldY = this->property("y");
+    this->setProperty("y", oldY.toFloat()+dif);
+}
diff --git a/PushBurton2/graphictextbt.h b/PushBurton2/graphictextbt.h
@@ -29,12 +29,14 @@
 #define GRAPHICTEXTBT_H
 
 #include <QGraphicsObject>
+#include <QGraphicsSceneMouseEvent>
 #include <QPainter>
 #include <QString>
 #include <QFont>
 #include <QColor>
 
 #include <QDebug>
+#include <qmath.h>
 
 class GraphicTextBt : public QGraphicsObject
 {
@@ -53,15 +55,25 @@ class GraphicTextBt : public QGraphicsObject
     void activated();
     void released();
 
+public slots:
+    void v_swipe_action(qreal dif);
+signals:
+    void v_swipe_hint(qreal ydrag);
+
 protected:
     void mousePressEvent(QGraphicsSceneMouseEvent *event);
     void mouseReleaseEvent(QGraphicsSceneMouseEvent *event);
+    void mouseMoveEvent(QGraphicsSceneMouseEvent *event);
 
 private:
     bool toggled;
     QString text;
     QColor textColor;
     QRectF btRect;
+
+    QPoint firstTch;
+    QPoint prevTch;
+
 };
 
 #endif // GRAPHICTEXTBT_H