Merge branch 'release-candidate' of github.com:Sankore/Sankore-3.1 into release-candidate

preferencesAboutTextFull
Claudio Valerio 12 years ago
commit 4dc6465f51
  1. 10
      src/board/UBBoardView.cpp
  2. 12
      src/domain/UBGraphicsItemUndoCommand.cpp
  3. 41
      src/domain/UBGraphicsScene.cpp

@ -733,7 +733,13 @@ void UBBoardView::handleItemMousePress(QMouseEvent *event)
else
{
if (movingItem)
{
UBGraphicsItem *graphicsItem = dynamic_cast<UBGraphicsItem*>(movingItem);
if (graphicsItem)
graphicsItem->Delegate()->startUndoStep();
movingItem->clearFocus();
}
if (suspendedMousePressEvent)
{
@ -1115,6 +1121,10 @@ UBBoardView::mouseReleaseEvent (QMouseEvent *event)
return;
}
UBGraphicsItem *graphicsItem = dynamic_cast<UBGraphicsItem*>(movingItem);
if (graphicsItem)
graphicsItem->Delegate()->commitUndoStep();
bool bReleaseIsNeed = true;
if (movingItem != determineItemToPress(scene()->itemAt(this->mapToScene(event->posF().toPoint()))))
{

@ -25,6 +25,7 @@
#include "core/memcheck.h"
#include "domain/UBGraphicsGroupContainerItem.h"
#include "domain/UBGraphicsPolygonItem.h"
UBGraphicsItemUndoCommand::UBGraphicsItemUndoCommand(UBGraphicsScene* pScene, const QSet<QGraphicsItem*>& pRemovedItems,
const QSet<QGraphicsItem*>& pAddedItems, const GroupDataTable &groupsMap)
@ -107,6 +108,13 @@ void UBGraphicsItemUndoCommand::undo()
else
mScene->addItem(item);
if (UBGraphicsPolygonItem::Type == item->type())
{
UBGraphicsPolygonItem *polygonItem = qgraphicsitem_cast<UBGraphicsPolygonItem*>(item);
if (polygonItem)
polygonItem->strokesGroup()->addToGroup(polygonItem);
}
UBApplication::boardController->freezeW3CWidget(item, false);
}
}
@ -206,6 +214,10 @@ void UBGraphicsItemUndoCommand::redo()
mScene->setAsBackgroundObject(item);
else
mScene->addItem(item);
UBGraphicsPolygonItem *polygonItem = qgraphicsitem_cast<UBGraphicsPolygonItem*>(item);
if (polygonItem)
polygonItem->strokesGroup()->addToGroup(polygonItem);
}
}

@ -629,9 +629,9 @@ bool UBGraphicsScene::inputDeviceRelease()
if (mCurrentStroke && mCurrentStroke->polygons().empty()){
delete mCurrentStroke;
mCurrentStroke = NULL;
}
mCurrentStroke = NULL;
return accepted;
}
@ -794,7 +794,7 @@ void UBGraphicsScene::eraseLineTo(const QPointF &pEndPoint, const qreal &pWidth)
{
#pragma omp critical
{
// Compele remove item
// Compete remove item
intersectedItems << pi;
intersectedPolygons << QList<QPolygonF>();
}
@ -813,30 +813,29 @@ void UBGraphicsScene::eraseLineTo(const QPointF &pEndPoint, const qreal &pWidth)
for(int i=0; i<intersectedItems.size(); i++)
{
if (intersectedPolygons[i].empty())
{
removeItem(intersectedItems[i]);
}
else
{
UBGraphicsPolygonItem *pi = intersectedItems[i];
// item who intersects with eraser
UBGraphicsPolygonItem *intersectedPolygonItem = intersectedItems[i];
if (!intersectedPolygons[i].empty())
{
// intersected polygons generated as QList<QPolygon> QPainterPath::toFillPolygons(),
// so each intersectedPolygonItem has one or couple of QPolygons who should be removed from it.
for(int j = 0; j < intersectedPolygons[i].size(); j++)
{
QPolygonF p = intersectedPolygons[i][j];
if (j==0)
pi->setPolygon(intersectedPolygons[i][j]);
else
{
UBGraphicsPolygonItem* polygonItem = new UBGraphicsPolygonItem(intersectedPolygons[i][j], pi->parentItem());
pi->copyItemParameters(polygonItem);
polygonItem->setStroke(pi->stroke());
polygonItem->setStrokesGroup(pi->strokesGroup());
pi->strokesGroup()->addToGroup(polygonItem);
}
// create small polygon from couple of polygons to replace particular erased polygon
UBGraphicsPolygonItem* polygonItem = new UBGraphicsPolygonItem(intersectedPolygons[i][j], intersectedPolygonItem->parentItem());
intersectedPolygonItem->copyItemParameters(polygonItem);
polygonItem->setStroke(intersectedPolygonItem->stroke());
polygonItem->setStrokesGroup(intersectedPolygonItem->strokesGroup());
intersectedPolygonItem->strokesGroup()->addToGroup(polygonItem);
mAddedItems << polygonItem;
}
}
//remove full polygon item for replace it by couple of polygons who creates the same stroke without a part which intersects with eraser
mRemovedItems << intersectedPolygonItem;
removeItem(intersectedPolygonItem);
}
if (!intersectedItems.empty())

Loading…
Cancel
Save