Scene objects no more indexed

preferencesAboutTextFull
-f 11 years ago
parent d4d5d38cd8
commit 817b69fd4f
  1. 1
      src/adaptors/UBSvgSubsetAdaptor.h
  2. 7
      src/domain/UBGraphicsScene.cpp
  3. 3
      src/domain/UBGraphicsScene.h

@ -86,7 +86,6 @@ class UBSvgSubsetAdaptor
static const QString sFontWeightPrefix; static const QString sFontWeightPrefix;
static const QString sFontStylePrefix; static const QString sFontStylePrefix;
static QString readTeacherGuideNode(int sceneIndex);
private: private:
static UBGraphicsScene* loadScene(UBDocumentProxy* proxy, const QByteArray& pArray); static UBGraphicsScene* loadScene(UBDocumentProxy* proxy, const QByteArray& pArray);

@ -307,7 +307,6 @@ UBGraphicsScene::UBGraphicsScene(UBDocumentProxy* parent, bool enableUndoRedoSta
, mArcPolygonItem(0) , mArcPolygonItem(0)
, mRenderingContext(Screen) , mRenderingContext(Screen)
, mCurrentStroke(0) , mCurrentStroke(0)
, mShouldUseOMP(true)
, mItemCount(0) , mItemCount(0)
, mUndoRedoStackEnabled(enableUndoRedoStack) , mUndoRedoStackEnabled(enableUndoRedoStack)
, magniferControlViewWidget(0) , magniferControlViewWidget(0)
@ -318,11 +317,7 @@ UBGraphicsScene::UBGraphicsScene(UBDocumentProxy* parent, bool enableUndoRedoSta
, mSelectionFrame(0) , mSelectionFrame(0)
{ {
UBCoreGraphicsScene::setObjectName("BoardScene"); UBCoreGraphicsScene::setObjectName("BoardScene");
#ifdef __ppc__ setItemIndexMethod(NoIndex);
mShouldUseOMP = false;
#elif defined(Q_WS_MAC)
mShouldUseOMP = QSysInfo::MacintoshVersion >= QSysInfo::MV_10_5;
#endif
setUuid(QUuid::createUuid()); setUuid(QUuid::createUuid());
setDocument(parent); setDocument(parent);

@ -413,13 +413,10 @@ public slots:
UBGraphicsStroke* mCurrentStroke; UBGraphicsStroke* mCurrentStroke;
bool mShouldUseOMP;
int mItemCount; int mItemCount;
QList<QGraphicsItem*> mFastAccessItems; // a local copy as QGraphicsScene::items() is very slow in Qt 4.6 QList<QGraphicsItem*> mFastAccessItems; // a local copy as QGraphicsScene::items() is very slow in Qt 4.6
//int mMesure1Ms, mMesure2Ms;
bool mHasCache; bool mHasCache;
// tmp stub for divide addings scene objects from undo mechanism implementation // tmp stub for divide addings scene objects from undo mechanism implementation

Loading…
Cancel
Save