Switch input triggers.

GIBIS-UNIFESP · Mar 1, 2016 · d428f69 · d428f69
1 parent 6bf92ae
commit d428f69
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 12 deletions.
diff --git a/app/editor.cpp b/app/editor.cpp
@@ -703,7 +703,12 @@ bool Editor::eventFilter( QObject *obj, QEvent *evt ) {
             if( elm->hasTrigger( ) && !elm->getTrigger( ).isEmpty( ) ) {
               Input *in = dynamic_cast< Input* >( elm );
               if( in && elm->getTrigger( ).matches( keyEvt->key( ) ) ) {
-                in->setOn( true );
+                if( elm->elementType( ) == ElementType::SWITCH ) {
+                  in->setOn( !in->getOn( ) );
+                }
+                else {
+                  in->setOn( true );
+                }
               }
             }
           }
@@ -718,8 +723,10 @@ bool Editor::eventFilter( QObject *obj, QEvent *evt ) {
           for( GraphicElement *elm : scene->getElements( ) ) {
             if( elm->hasTrigger( ) && !elm->getTrigger( ).isEmpty( ) ) {
               Input *in = dynamic_cast< Input* >( elm );
-              if( in && elm->getTrigger( ).matches( keyEvt->key( ) ) == QKeySequence::ExactMatch ) {
-                in->setOn( false );
+              if( in && ( elm->getTrigger( ).matches( keyEvt->key( ) ) == QKeySequence::ExactMatch ) ) {
+                if( elm->elementType( ) != ElementType::SWITCH ) {
+                  in->setOn( false );
+                }
               }
             }
           }

diff --git a/app/element/inputswitch.cpp b/app/element/inputswitch.cpp
@@ -22,19 +22,18 @@ bool InputSwitch::getOn( ) const {
 
 void InputSwitch::setOn( bool value ) {
   on = value;
-  updateLogic();
+  updateLogic( );
+  if( on ) {
+    setPixmap( QPixmap( ":/input/switchOn.png" ) );
+  }
+  else {
+    setPixmap( QPixmap( ":/input/switchOff.png" ) );
+  }
 }
 
 void InputSwitch::mousePressEvent( QGraphicsSceneMouseEvent *event ) {
   if( event->button( ) == Qt::LeftButton ) {
-    if( on ) {
-      on = false;
-      setPixmap( QPixmap( ":/input/switchOff.png" ) );
-    }
-    else {
-      on = true;
-      setPixmap( QPixmap( ":/input/switchOn.png" ) );
-    }
+    setOn( !on );
     setChanged( true );
     event->accept( );
   }