Merge branch 'master' of github.com:Sankore/Sankore-3.1

release.linux.sh

@@ -39,14 +39,18 @@ checkDirectory(){
 #                     path definition                                 #
 #######################################################################
 QT_PATH="/usr/local/Trolltech/Qt-4.7.3"
-PLUGINS_PATH="$QT_PATH/plugins"
+QT_PLUGINS_PATH="$QT_PATH/plugins"
 RELEASE_DIR=build/linux/release
 BUILD_DIR=$RELEASE_DIR/product
 GUI_TRANSLATIONS_DIRECTORY_PATH="../Qt-sankore3.1/translations"
 QT_LIBRARY_SOURCE_PATH="$QT_PATH/lib"
+SANKORE_SRC_PLUGINS_PATH="plugins"
+SANKORE_DST_PLUGINS_PATH=build/linux/release/product/plugins
+CFF_ADAPTOR_SRC_PLUGIN_PATH=$SANKORE_SRC_PLUGINS_PATH/cffadaptor/build/linux/release/lib
 
 QMAKE_PATH="$QT_PATH/bin/qmake"
-LRELEASE="/usr/local/Trolltech/Qt-4.7.3/bin/lrelease"
+LRELEASE="../Qt-sankore3.1/bin/lrelease"
+#LRELEASE="/usr/local/Trolltech/Qt-4.7.3/bin/lrelease"
 
 ARCHITECTURE=`uname -m`
 
@@ -57,13 +61,15 @@ checkExecutable $QMAKE_PATH
 checkExecutable $LRELEASE
 
 checkDirectory $GUI_TRANSLATIONS_DIRECTORY_PATH
-checkDirectory $PLUGINS_PATH
+checkDirectory $QT_PLUGINS_PATH
 checkDirectory $QT_LIBRARY_SOURCE_PATH
 
+checkDirectory $CFF_ADAPTOR_PLUGIN_PATH
+
 #######################################################################
 #                            cleaning                                 #
 #######################################################################
-rm -rf $RELEASE_DIR
+#rm -rf $RELEASE_DIR
 
 
 #######################################################################
@@ -126,21 +132,26 @@ cp -R resources/linux/qtlinux/* $BUILD_DIR
 
 cp -R resources/customizations $BUILD_DIR
 
+notify-send "Sankore" "Copying plugins..."
+mkdir "$SANKORE_DST_PLUGINS_PATH"
+mkdir "$SANKORE_DST_PLUGINS_PATH/cffadaptor"
+cp -R $CFF_ADAPTOR_SRC_PLUGIN_PATH/*.so* "$SANKORE_DST_PLUGINS_PATH/cffadaptor"
+
 notify-send "QT" "Coping plugins and library ..."
-cp -R $PLUGINS_PATH $BUILD_DIR
+cp -R $QT_PLUGINS_PATH $BUILD_DIR
 
 #copying custom qt library
 QT_LIBRARY_DEST_PATH="$BUILD_DIR/qtlib"
 mkdir $QT_LIBRARY_DEST_PATH
 
 copyQtLibrary(){
-    if [ ! -e "$QT_LIBRARY_SOURCE_PATH/$1.so.4.7.3" ]; then
+    if [ ! -e "$QT_LIBRARY_SOURCE_PATH/$1.so.4" ]; then
         notifyError "$1 library not found in path: $QT_LIBRARY_SOURCE_PATH"
     fi
-    cp "$QT_LIBRARY_SOURCE_PATH/$1.so.4" "$QT_LIBRARY_DEST_PATH/"
-    cp "$QT_LIBRARY_SOURCE_PATH/$1.so.4.7.3" "$QT_LIBRARY_DEST_PATH/"
+    cp $QT_LIBRARY_SOURCE_PATH/$1.so.4.* $QT_LIBRARY_DEST_PATH/
 }
 
+copyQtLibrary libphonon
 copyQtLibrary libQtWebKit
 copyQtLibrary libQtDBus
 copyQtLibrary libQtScript
@@ -150,14 +161,8 @@ copyQtLibrary libQtNetwork
 copyQtLibrary libQtXml
 copyQtLibrary libQtGui
 copyQtLibrary libQtCore
-
-if [ ! -e "$QT_LIBRARY_SOURCE_PATH/libphonon.so.4.4.0" ]; then
-    notifyError "phonon library not found in path: $QT_LIBRARY_SOURCE_PATH"
-else
-    cp "$QT_LIBRARY_SOURCE_PATH/libphonon.so.4" "$QT_LIBRARY_DEST_PATH/"
-    cp "$QT_LIBRARY_SOURCE_PATH/libphonon.so.4.4.0" "$QT_LIBRARY_DEST_PATH/"
-fi
-
+# uncomment for Qt 4.8
+#copyQtLibrary libQtOpenGL
 
 #######################################################################
 #                  Removing unwanted files                            #
@@ -279,7 +284,7 @@ echo "Priority: optional" >> "$CONTROL_FILE"
 echo "Architecture: $ARCHITECTURE" >> "$CONTROL_FILE"
 echo "Essential: no" >> "$CONTROL_FILE"
 echo "Installed-Size: `du -s $SANKORE_PACKAGE_DIRECTORY | awk '{ print $1 }'`" >> "$CONTROL_FILE"
-echo "Maintainer: Open-Sankoré Developers team <dev@open-sankore.org>" >> "$CONTROL_FILE"
+echo "Maintainer: Open-Sankore Developers team <dev@open-sankore.org>" >> "$CONTROL_FILE"
 echo "Homepage: http://dev.open-sankore.org" >> "$CONTROL_FILE"
 echo -n "Depends: " >> "$CONTROL_FILE"
 unset tab
@@ -318,7 +323,7 @@ echo "Version=$VERSION" >> $SANKORE_SHORTCUT
 echo "Encoding=UTF-8" >> $SANKORE_SHORTCUT
 echo "Name=Open-Sankore ($VERSION)" >> $SANKORE_SHORTCUT
 echo "GenericName=Open-Sankore" >> $SANKORE_SHORTCUT
-echo "Comment=Logiciel de création de présentations pour tableau numérique interactif (TNI)" >> $SANKORE_SHORTCUT 
+echo "Comment=Logiciel de creation de presentations pour tableau numerique interactif (TNI)" >> $SANKORE_SHORTCUT 
 echo "Exec=/usr/local/$SANKORE_DIRECTORY_NAME/run.sh" >> $SANKORE_SHORTCUT
 echo "Icon=/usr/local/$SANKORE_DIRECTORY_NAME/sankore.png" >> $SANKORE_SHORTCUT
 echo "StartupNotify=true" >> $SANKORE_SHORTCUT
@@ -353,4 +358,4 @@ cd $RELEASE_DIR
 rm ../../../install/linux/Open-Sankore.tar.gz
 
 tar cvzf ../../../install/linux/Open-Sankore.tar.gz Open-Sankore.$VERSION -C . 
-notify-send "Open-Sankore"  "tar.gz Build done"
+notify-send "Open-Sankore"  "tar.gz Build done"
\ No newline at end of file

src/board/UBDrawingController.cpp

@@ -45,7 +45,7 @@ UBDrawingController::UBDrawingController(QObject * parent)
     , mActiveRuler(NULL)
     , mStylusTool((UBStylusTool::Enum)-1)
     , mLatestDrawingTool((UBStylusTool::Enum)-1)
-    , mDrawingMode(DRAWING_MODE)
+    , mDrawingMode(/*DRAWING_MODE*/eDrawingMode_Vector)
 
 {
     connect(UBSettings::settings(), SIGNAL(colorContextChanged()), this, SIGNAL(colorPaletteChanged()));
@@ -114,7 +114,7 @@ void UBDrawingController::setStylusTool(int tool)
             UBApplication::mainWindow->actionPen->setChecked(true);
         else if (mStylusTool == UBStylusTool::Eraser){
             UBApplication::mainWindow->actionEraser->setChecked(true);
-            mDrawingMode = eDrawingMode_Artistic;
+            //mDrawingMode = eDrawingMode_Artistic;
         }
         else if (mStylusTool == UBStylusTool::Marker)
             UBApplication::mainWindow->actionMarker->setChecked(true);

src/board/UBDrawingController.h

@@ -27,7 +27,7 @@ typedef enum{
     eDrawingMode_Vector
 }eDrawingMode;
 
-#define DRAWING_MODE    eDrawingMode_Artistic
+#define DRAWING_MODE    eDrawingMode_Vector
 
 class UBDrawingController : public QObject
 {

src/domain/UBGraphicsDelegateFrame.cpp

@@ -583,9 +583,9 @@ void UBGraphicsDelegateFrame::positionHandles()
 {
     QRectF itemRect = delegated()->boundingRect();
     
-    if (mDelegate->getToolBarItem()->isVisibleOnBoard() 
-        && mDelegate->getToolBarItem()->isShifting())
-        itemRect.setHeight(itemRect.height() + mDelegate->getToolBarItem()->rect().height() * mDelegate->antiScaleRatio() * 1.1);
+//    if (mDelegate->getToolBarItem()->isVisibleOnBoard()
+//        && mDelegate->getToolBarItem()->isShifting())
+//        itemRect.setHeight(itemRect.height() + mDelegate->getToolBarItem()->rect().height() * mDelegate->antiScaleRatio() * 1.1);
 
     QTransform itemTransform = delegated()->sceneTransform();
     QPointF topLeft = itemTransform.map(itemRect.topLeft());

src/domain/UBGraphicsItemDelegate.cpp

@@ -117,7 +117,7 @@ UBGraphicsItemDelegate::UBGraphicsItemDelegate(QGraphicsItem* pDelegated, QObjec
 
 void UBGraphicsItemDelegate::init()
 {
-    mToolBarItem = new UBGraphicsToolBarItem(delegated());
+    //mToolBarItem = new UBGraphicsToolBarItem(delegated());
 
     mFrame = new UBGraphicsDelegateFrame(this, QRectF(0, 0, 0, 0), mFrameWidth, mRespectRatio);
     mFrame->hide();
@@ -167,7 +167,9 @@ UBGraphicsItemDelegate::~UBGraphicsItemDelegate()
 
 QVariant UBGraphicsItemDelegate::itemChange(QGraphicsItem::GraphicsItemChange change, const QVariant &value)
 {
-    if (change == QGraphicsItem::ItemSelectedHasChanged) {
+    if(change == QGraphicsItem::ItemChildAddedChange){
+
+    }else if (change == QGraphicsItem::ItemSelectedHasChanged) {
         bool ok;
         bool selected = value.toUInt(&ok);
         if (ok) {
@@ -321,17 +323,17 @@ void UBGraphicsItemDelegate::positionHandles()
 
         updateButtons(true);
 
-        if (mToolBarItem->isVisibleOnBoard())
-        {
-        updateToolBar();
-           mToolBarItem->show();
-        }
+//        if (mToolBarItem->isVisibleOnBoard())
+//        {
+//        updateToolBar();
+//           mToolBarItem->show();
+//        }
     } else {
         foreach(DelegateButton* button, mButtons)
             button->hide();
 
         mFrame->hide();
-        mToolBarItem->hide();
+//        mToolBarItem->hide();
     }
 }
 
@@ -371,7 +373,7 @@ void UBGraphicsItemDelegate::remove(bool canUndo)
 
         scene->removeItem(mFrame);
         scene->removeItem(mDelegated);
-        scene->removeItem(mToolBarItem);
+        //scene->removeItem(mToolBarItem);
 
         if (canUndo)
         {

src/domain/UBGraphicsScene.cpp

@@ -308,9 +308,11 @@ UBGraphicsScene::~UBGraphicsScene()
 
 void UBGraphicsScene::selectionChangedProcessing()
 {
-    if (selectedItems().count())
+    if (selectedItems().count()){
+        qDebug() << "Selected item bounding rect: " << selectedItems().first()->boundingRect();
         UBApplication::showMessage("ZValue is " + QString::number(selectedItems().first()->zValue(), 'f') + "own z value is "
                                                 + QString::number(selectedItems().first()->data(UBGraphicsItemData::ItemOwnZValue).toReal(), 'f'));
+    }
 }
 void UBGraphicsScene::enableGroupingButton()
 {
@@ -747,6 +749,8 @@ void UBGraphicsScene::drawLineTo(const QPointF &pEndPoint, const qreal &pWidth,
 
 void UBGraphicsScene::eraseLineTo(const QPointF &pEndPoint, const qreal &pWidth)
 {
+//    QList<QGraphicsItem*> itemList;
+
     const QLineF line(mPreviousPoint, pEndPoint);
 
     const QPolygonF eraserPolygon = UBGeometryUtils::lineToPolygon(line, pWidth);
@@ -793,24 +797,29 @@ void UBGraphicsScene::eraseLineTo(const QPointF &pEndPoint, const qreal &pWidth)
 
         if (mShouldUseOMP)
         {
-    #pragma omp parallel for
+//    #pragma omp parallel for
             for (int i = 0; i < collidItemsSize; i++)
             {
-                UBGraphicsPolygonItem *collidingPolygonItem = dynamic_cast<UBGraphicsPolygonItem*>(collidItems.at(i));
+                UBGraphicsPolygonItem *collidingPolygonItem = qgraphicsitem_cast<UBGraphicsPolygonItem*>(collidItems.at(i));
 
                 if (NULL != collidingPolygonItem)
                 {
+                    collidingPolygonItem->setColor(QColor(Qt::green));
+
                     UBGraphicsStrokesGroup* pGroup = collidingPolygonItem->strokesGroup();
 
                     if(eraserInnerRect.contains(collidingPolygonItem->boundingRect()))
                     {
-    #pragma omp critical
+//    #pragma omp critical
+                        qDebug() << "case 1";
                         // Put the entire polygon into the remove list
+                        collidingPolygonItem->setColor(QColor(Qt::blue));
                         toBeRemovedItems << collidingPolygonItem;
                     }
                     else
                     {
                         // Here we get the polygon of the colliding item
+
                         QPolygonF collidingPolygon = collidingPolygonItem->polygon();
                         QPainterPath collidingPath;
                         collidingPath.addPolygon(collidingPolygon);
@@ -819,32 +828,40 @@ void UBGraphicsScene::eraseLineTo(const QPointF &pEndPoint, const qreal &pWidth)
                         QPainterPath croppedPath = collidingPath.subtracted(eraserPath);
                         QPainterPath croppedPathSimplified = croppedPath.simplified();
 
-                        if (croppedPath == collidingPath)
+                        /*if (croppedPath == collidingPath)
                         {
                             // NOOP
+                            qDebug() << "case 2";
+                            toBeRemovedItems << collidingPolygonItem;
                         }
-                        else if (croppedPathSimplified.isEmpty())
+                        else */if (croppedPathSimplified.isEmpty())
                         {
-    #pragma omp critical
+//    #pragma omp critical
+                            qDebug() << "case 3";
                             // Put the entire polygon into the remove list if the eraser removes all its visible content
+                            collidingPolygonItem->setColor(QColor(Qt::blue));
                             toBeRemovedItems << collidingPolygonItem;
                         }
                         else
                         {
+                            //qDebug() << "case 4";
                             // Then we convert the remaining path to a list of polygons that will be converted in
                             // UBGraphicsPolygonItems and added to the scene
                             foreach(const QPolygonF &pol, croppedPathSimplified.toFillPolygons())
                             {
                                 UBGraphicsPolygonItem* croppedPolygonItem = collidingPolygonItem->deepCopy(pol);
-    #pragma omp critical
-                                // Add this new polygon to the 'added' list
-                                toBeAddedItems << croppedPolygonItem;
+                                croppedPolygonItem->setColor(QColor(Qt::black));
+//    #pragma omp critical
                                 if(NULL != pGroup){
                                     croppedPolygonItem->setStrokesGroup(pGroup);
+//                                    croppedPolygonItem->setTransform(pGroup->sceneTransform().inverted());
                                 }
+                                // Add this new polygon to the 'added' list
+                                toBeAddedItems << croppedPolygonItem;
                             }
-    #pragma omp critical
+//    #pragma omp critical
                             // Remove the original polygonitem because it has been replaced by many smaller polygons
+                            collidingPolygonItem->setColor(QColor(Qt::blue));
                             toBeRemovedItems << collidingPolygonItem;
                         }
                     }
@@ -855,11 +872,12 @@ void UBGraphicsScene::eraseLineTo(const QPointF &pEndPoint, const qreal &pWidth)
         {
             for (int i = 0; i < collidItemsSize; i++)
             {
-                UBGraphicsPolygonItem *collidingPolygonItem
-                    = qgraphicsitem_cast<UBGraphicsPolygonItem*> (collidItems.at(i));
+                UBGraphicsPolygonItem *collidingPolygonItem = dynamic_cast<UBGraphicsPolygonItem*> (collidItems.at(i));
 
                 if (collidingPolygonItem)
                 {
+                    UBGraphicsStrokesGroup* pGroup = collidingPolygonItem->strokesGroup();
+
                     if(eraserInnerRect.contains(collidingPolygonItem->boundingRect()))
                     {
                         toBeRemovedItems << collidingPolygonItem;
@@ -887,6 +905,9 @@ void UBGraphicsScene::eraseLineTo(const QPointF &pEndPoint, const qreal &pWidth)
                             {
                                 UBGraphicsPolygonItem* croppedPolygonItem = collidingPolygonItem->deepCopy(pol);
                                 toBeAddedItems << croppedPolygonItem;
+                                if(NULL != pGroup){
+                                    croppedPolygonItem->setStrokesGroup(pGroup);
+                                }
                             }
 
                             toBeRemovedItems << collidingPolygonItem;
@@ -896,28 +917,50 @@ void UBGraphicsScene::eraseLineTo(const QPointF &pEndPoint, const qreal &pWidth)
             }
         }
 
-        addItems(toBeAddedItems);
-        mAddedItems += toBeAddedItems;
-
         if(eDrawingMode_Vector == DRAWING_MODE){
-            foreach(QGraphicsItem* item, toBeAddedItems){
+            foreach(QGraphicsItem* item, toBeRemovedItems){
                 UBGraphicsPolygonItem* poly = dynamic_cast<UBGraphicsPolygonItem*>(item);
-                if(NULL != poly && NULL != poly->strokesGroup()){
-                    poly->strokesGroup()->addToGroup(poly);
+                if(NULL != poly){
+                    if(NULL != poly->strokesGroup()){
+                        poly->strokesGroup()->removeFromGroup(poly);
+                        removeItem(poly);
+                    }else{
+                        qDebug() << "No group present";
+                    }
                 }
             }
+        }else{
+            removeItems(toBeRemovedItems);
+            mRemovedItems += toBeRemovedItems;
         }
 
-        removeItems(toBeRemovedItems);
-        mRemovedItems += toBeRemovedItems;
-
+//        bool hack = false;
+//        UBGraphicsStrokesGroup* pG = new UBGraphicsStrokesGroup();
         if(eDrawingMode_Vector == DRAWING_MODE){
-            foreach(QGraphicsItem* item, toBeRemovedItems){
+            foreach(QGraphicsItem* item, toBeAddedItems){
                 UBGraphicsPolygonItem* poly = dynamic_cast<UBGraphicsPolygonItem*>(item);
                 if(NULL != poly && NULL != poly->strokesGroup()){
-                    poly->strokesGroup()->removeFromGroup(poly);
+//                    if(!hack){
+//                        itemList = poly->strokesGroup()->childItems();
+//                        removeItem(poly->strokesGroup());
+
+//                        foreach(QGraphicsItem* it, itemList){
+//                            pG->addToGroup(it);
+//                        }
+//                        hack = true;
+//                    }
+                    qreal dx =  -poly->strokesGroup()->sceneTransform().inverted().dx();
+                    qreal dy =  -poly->strokesGroup()->sceneTransform().inverted().dy();
+
+                    //poly->setTransform(QTransform().translate(20, 0));
+                    poly->setTransform(QTransform().translate(dx, dy));
+                    poly->strokesGroup()/*pG*/->addToGroup(poly);
                 }
             }
+            //addItem(pG);
+        }else{
+            addItems(toBeAddedItems);
+            mAddedItems += toBeAddedItems;
         }
     }