Merge remote-tracking branch 'origin/develop' into claudio-dev

resources/library/interactivities/Separe phrase.wgt/scripts/app.js

@@ -18,6 +18,15 @@ function createElements( phrase )
     return s;
 }
 
+function createChain( phrase )
+{
+    var arr = phrase.split(" ");
+    var result = "";
+    for( var i = 0; i < arr.length; i++ )    	
+        result += '<div class="letterCont">' + createElements(arr[i]) + '</div>';    
+    return result;
+}
+
 
 $(document).ready(function()
 {    
@@ -135,9 +144,8 @@ $(document).ready(function()
 		
         // store the text
         w.setData( "phrase", phrase );
-		
         // remove all dots (they are to be set during the exercise)
-        phrase = phrase.replace( / /g, '' );
+        //phrase = phrase.replace( / /g, '' );
 		
         // create the html
         if(window.sankore && sankore.preference("ordSplPhrasesState", "") == "1" && flag){
@@ -147,7 +155,7 @@ $(document).ready(function()
             flag = false;
         } 
         else
-            w.setViewContent( createElements( phrase ) );
+            w.setViewContent( createChain( phrase ) );
 		
 		
         // the behaviour
@@ -241,7 +249,7 @@ $(document).ready(function()
             if( this.className.indexOf( "fixed" ) != -1 ){
                 phrase += ' ';
             }
-            else if( this.className.indexOf( "dash" ) != -1 ){
+            else if( (this.className.indexOf( "dash" ) != -1) || (this.className.indexOf( "letterCont" ) != -1) ){
                 return;
             }
             else{
@@ -249,7 +257,6 @@ $(document).ready(function()
                 phrase += ch;
             }
         });
-        //alert(phrase + " | " + this.getData( "phrase" ))	
         if( phrase == this.getData( "phrase" ) ){
             this.elements.containerView.addClass( "answerRight" );
         }

src/domain/UBGraphicsDelegateFrame.cpp

@@ -49,6 +49,8 @@ UBGraphicsDelegateFrame::UBGraphicsDelegateFrame(UBGraphicsItemDelegate* pDelega
     , mTotalTranslateX(0)
     , mTotalTranslateY(0)
     , mOperationMode(Scaling)
+    , mFlippedX(false)
+    , mFlippedY(false)
     , mMirrorX(false)
     , mMirrorY(false)
 {
@@ -379,6 +381,12 @@ QSizeF UBGraphicsDelegateFrame::resizeDelegate(qreal moveX, qreal moveY)
     return incVector;
 }
 
+
+void UBGraphicsDelegateFrame::scaleByPos(qreal scaleX, qreal scaleY)
+{
+
+}
+
 void UBGraphicsDelegateFrame::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
 {
     if (None == mCurrentTool)
@@ -451,6 +459,7 @@ void UBGraphicsDelegateFrame::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
                                     scaleX = -2*mFrameWidth/width;
                             }else{
                                 scaleX = -1;
+                                mFlippedX = !mFlippedX;
                             }
                         }
                         mScaleX = scaleX;
@@ -480,6 +489,7 @@ void UBGraphicsDelegateFrame::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
                                     scaleY = -2*mFrameWidth/width;
                             }else{
                                 scaleY = -1;
+                                mFlippedY = !mFlippedY;
                             }
                         }
                         mScaleY = scaleY;
@@ -543,11 +553,34 @@ void UBGraphicsDelegateFrame::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
             QPointF ref;
 
             // we just detects coordinates of corner before and after scaling and then moves object at diff between them.
-            if (resizingBottomRight() && mMirrorX)
+            if (resizingBottomRight() && (mMirrorX || mMirrorY))
+            {
+                if (mFlippedX && !mMirrorX && mFlippedY)// && !mMirrorY)
+                {
+                    mTranslateX += mInitialTransform.map(delegated()->boundingRect().bottomLeft()).x() - tr.map(delegated()->boundingRect().bottomLeft()).x();
+                    mTranslateY += mInitialTransform.map(delegated()->boundingRect().bottomLeft()).y() - tr.map(delegated()->boundingRect().bottomLeft()).y();
+                }
+                else if ((mFlippedX || mMirrorX) && (mFlippedY || mMirrorY))
+                {
+                    mTranslateX += mInitialTransform.map(delegated()->boundingRect().bottomRight()).x() - tr.map(delegated()->boundingRect().bottomRight()).x();
+                    mTranslateY += mInitialTransform.map(delegated()->boundingRect().bottomRight()).y() - tr.map(delegated()->boundingRect().bottomRight()).y();
+                }
+                else if (mFlippedX || mMirrorX)
+                {
+                    mTranslateX += mInitialTransform.map(delegated()->boundingRect().topRight()).x() - tr.map(delegated()->boundingRect().topRight()).x();
+                    mTranslateY += mInitialTransform.map(delegated()->boundingRect().topRight()).y() - tr.map(delegated()->boundingRect().topRight()).y();
+                }
+                else if (mFlippedY || mMirrorY)
+                {
+                    mTranslateX += mInitialTransform.map(delegated()->boundingRect().bottomLeft()).x() - tr.map(delegated()->boundingRect().bottomLeft()).x();
+                    mTranslateY += mInitialTransform.map(delegated()->boundingRect().bottomLeft()).y() - tr.map(delegated()->boundingRect().bottomLeft()).y();
+                }
+                else
                 {
                     mTranslateX += mInitialTransform.map(delegated()->boundingRect().bottomRight()).x() - tr.map(delegated()->boundingRect().bottomRight()).x();
                     mTranslateY += mInitialTransform.map(delegated()->boundingRect().bottomRight()).y() - tr.map(delegated()->boundingRect().bottomRight()).y();
                 }
+            }
             else
             {
                     mTranslateX += mInitialTransform.map(delegated()->boundingRect().topLeft()).x() - tr.map(delegated()->boundingRect().topLeft()).x();

src/domain/UBGraphicsDelegateFrame.h

@@ -40,6 +40,7 @@ class UBGraphicsDelegateFrame: public QGraphicsRectItem, public QObject
         QPointF getFixedPointFromPos();
         QSizeF getResizeVector(qreal moveX, qreal moveY);
         QSizeF resizeDelegate(qreal moveX, qreal moveY);
+        void scaleByPos(qreal scaleX, qreal scaleY);
         virtual void mouseMoveEvent(QGraphicsSceneMouseEvent *event);
         virtual void mouseReleaseEvent(QGraphicsSceneMouseEvent *event);
 
@@ -124,6 +125,8 @@ class UBGraphicsDelegateFrame: public QGraphicsRectItem, public QObject
         OperationMode mOperationMode;
 
         QGraphicsItem* delegated();
+        bool mFlippedX;
+        bool mFlippedY;
         bool mMirrorX;
         bool mMirrorY;
         bool mResizing;

src/domain/UBGraphicsStrokesGroup.cpp

@@ -124,8 +124,13 @@ UBItem* UBGraphicsStrokesGroup::deepCopy() const
 		UBGraphicsPolygonItem *polygon = dynamic_cast<UBGraphicsPolygonItem*>(child);
 
 		if (polygon){
-			QGraphicsItem* pItem = dynamic_cast<QGraphicsItem*>(polygon->deepCopy());
+            UBGraphicsPolygonItem *polygonCopy = dynamic_cast<UBGraphicsPolygonItem*>(polygon->deepCopy());
+            if (polygonCopy)
+            {
+                QGraphicsItem* pItem = dynamic_cast<QGraphicsItem*>(polygonCopy);
                 copy->addToGroup(pItem);
+                polygonCopy->setStrokesGroup(copy);
+            }
 		}
 
 	}