removed unused signal

preferencesAboutTextFull
Claudio Valerio 12 years ago
parent feb346f644
commit b2c05d49e4
  1. 39
      src/board/UBBoardView.cpp
  2. 199
      src/board/UBBoardView.h
  3. 3
      src/tools/UBAbstractDrawRuler.h
  4. 2
      src/tools/UBGraphicsCompass.cpp
  5. 4
      src/tools/UBGraphicsCompass.h
  6. 1
      src/tools/UBGraphicsProtractor.cpp
  7. 1
      src/tools/UBGraphicsRuler.cpp
  8. 1
      src/tools/UBGraphicsTriangle.cpp

@ -176,17 +176,6 @@ UBGraphicsScene* UBBoardView::scene ()
return qobject_cast<UBGraphicsScene*> (QGraphicsView::scene ()); return qobject_cast<UBGraphicsScene*> (QGraphicsView::scene ());
} }
void UBBoardView::hideEvent (QHideEvent * event)
{
Q_UNUSED (event);
emit hidden ();
}
void UBBoardView::showEvent (QShowEvent * event)
{
Q_UNUSED (event);
emit shown ();
}
void UBBoardView::keyPressEvent (QKeyEvent *event) void UBBoardView::keyPressEvent (QKeyEvent *event)
{ {
@ -860,19 +849,19 @@ bool UBBoardView::directTabletEvent(QEvent *event)
{ {
QTabletEvent *tEvent = static_cast<QTabletEvent *>(event); QTabletEvent *tEvent = static_cast<QTabletEvent *>(event);
tEvent = new QTabletEvent(tEvent->type() tEvent = new QTabletEvent(tEvent->type()
, mapFromGlobal(tEvent->pos()) , mapFromGlobal(tEvent->pos())
, tEvent->globalPos() , tEvent->globalPos()
, tEvent->hiResGlobalPos() , tEvent->hiResGlobalPos()
, tEvent->device() , tEvent->device()
, tEvent->pointerType() , tEvent->pointerType()
, tEvent->pressure() , tEvent->pressure()
, tEvent->xTilt() , tEvent->xTilt()
, tEvent->yTilt() , tEvent->yTilt()
, tEvent->tangentialPressure() , tEvent->tangentialPressure()
, tEvent->rotation() , tEvent->rotation()
, tEvent->z() , tEvent->z()
, tEvent->modifiers() , tEvent->modifiers()
, tEvent->uniqueId()); , tEvent->uniqueId());
if (geometry().contains(tEvent->pos())) if (geometry().contains(tEvent->pos()))
{ {
@ -928,7 +917,7 @@ void UBBoardView::longPressEvent()
UBDrawingController *drawingController = UBDrawingController::drawingController(); UBDrawingController *drawingController = UBDrawingController::drawingController();
UBStylusTool::Enum currentTool = (UBStylusTool::Enum)UBDrawingController::drawingController ()->stylusTool (); UBStylusTool::Enum currentTool = (UBStylusTool::Enum)UBDrawingController::drawingController ()->stylusTool ();
disconnect(&mLongPressTimer, SIGNAL(timeout()), this, SLOT(longPressEvent())); disconnect(&mLongPressTimer, SIGNAL(timeout()), this, SLOT(longPressEvent()));
if (UBStylusTool::Selector == currentTool) if (UBStylusTool::Selector == currentTool)
{ {

@ -36,149 +36,144 @@ class UBBoardView : public QGraphicsView
{ {
Q_OBJECT Q_OBJECT
public: public:
UBBoardView(UBBoardController* pController, QWidget* pParent = 0, bool isControl = false, bool isDesktop = false); UBBoardView(UBBoardController* pController, QWidget* pParent = 0, bool isControl = false, bool isDesktop = false);
UBBoardView(UBBoardController* pController, int pStartLayer, int pEndLayer, QWidget* pParent = 0, bool isControl = false, bool isDesktop = false); UBBoardView(UBBoardController* pController, int pStartLayer, int pEndLayer, QWidget* pParent = 0, bool isControl = false, bool isDesktop = false);
virtual ~UBBoardView(); virtual ~UBBoardView();
UBGraphicsScene* scene(); UBGraphicsScene* scene();
void forcedTabletRelease(); void forcedTabletRelease();
void setToolCursor(int tool); void setToolCursor(int tool);
void rubberItems(); void rubberItems();
void moveRubberedItems(QPointF movingVector); void moveRubberedItems(QPointF movingVector);
void setMultiselection(bool enable); void setMultiselection(bool enable);
bool isMultipleSelectionEnabled() { return mMultipleSelectionIsEnabled; } bool isMultipleSelectionEnabled() { return mMultipleSelectionIsEnabled; }
// work around for handling tablet events on MAC OS with Qt 4.8.0 and above // work around for handling tablet events on MAC OS with Qt 4.8.0 and above
#if defined(Q_WS_MACX) #if defined(Q_WS_MACX)
bool directTabletEvent(QEvent *event); bool directTabletEvent(QEvent *event);
QWidget *widgetForTabletEvent(QWidget *w, const QPoint &pos); QWidget *widgetForTabletEvent(QWidget *w, const QPoint &pos);
#endif #endif
signals: signals:
void resized(QResizeEvent* event); void resized(QResizeEvent* event);
void hidden(); void shown();
void shown(); void clickOnBoard();
void clickOnBoard();
protected: protected:
bool itemIsLocked(QGraphicsItem *item); bool itemIsLocked(QGraphicsItem *item);
bool isUBItem(QGraphicsItem *item); // we should to determine items who is not UB and use general scene behavior for them. bool isUBItem(QGraphicsItem *item); // we should to determine items who is not UB and use general scene behavior for them.
bool isCppTool(QGraphicsItem *item); bool isCppTool(QGraphicsItem *item);
void handleItemsSelection(QGraphicsItem *item); void handleItemsSelection(QGraphicsItem *item);
bool itemShouldReceiveMousePressEvent(QGraphicsItem *item); bool itemShouldReceiveMousePressEvent(QGraphicsItem *item);
bool itemShouldReceiveSuspendedMousePressEvent(QGraphicsItem *item); bool itemShouldReceiveSuspendedMousePressEvent(QGraphicsItem *item);
bool itemHaveParentWithType(QGraphicsItem *item, int type); bool itemHaveParentWithType(QGraphicsItem *item, int type);
bool itemShouldBeMoved(QGraphicsItem *item); bool itemShouldBeMoved(QGraphicsItem *item);
QGraphicsItem* determineItemToPress(QGraphicsItem *item); QGraphicsItem* determineItemToPress(QGraphicsItem *item);
QGraphicsItem* determineItemToMove(QGraphicsItem *item); QGraphicsItem* determineItemToMove(QGraphicsItem *item);
void handleItemMousePress(QMouseEvent *event); void handleItemMousePress(QMouseEvent *event);
void handleItemMouseMove(QMouseEvent *event); void handleItemMouseMove(QMouseEvent *event);
virtual bool event (QEvent * e); virtual bool event (QEvent * e);
virtual void keyPressEvent(QKeyEvent *event); virtual void keyPressEvent(QKeyEvent *event);
virtual void keyReleaseEvent(QKeyEvent *event); virtual void keyReleaseEvent(QKeyEvent *event);
virtual void tabletEvent(QTabletEvent * event); virtual void tabletEvent(QTabletEvent * event);
virtual void mouseDoubleClickEvent(QMouseEvent *event); virtual void mouseDoubleClickEvent(QMouseEvent *event);
virtual void mousePressEvent(QMouseEvent *event); virtual void mousePressEvent(QMouseEvent *event);
virtual void mouseMoveEvent(QMouseEvent *event); virtual void mouseMoveEvent(QMouseEvent *event);
virtual void mouseReleaseEvent(QMouseEvent *event); virtual void mouseReleaseEvent(QMouseEvent *event);
virtual void wheelEvent(QWheelEvent *event); virtual void wheelEvent(QWheelEvent *event);
virtual void leaveEvent ( QEvent * event); virtual void leaveEvent ( QEvent * event);
virtual void focusOutEvent ( QFocusEvent * event ); virtual void focusOutEvent ( QFocusEvent * event );
virtual void drawItems(QPainter *painter, int numItems, virtual void drawItems(QPainter *painter, int numItems,
QGraphicsItem *items[], QGraphicsItem *items[],
const QStyleOptionGraphicsItem options[]); const QStyleOptionGraphicsItem options[]);
// virtual void dragEnterEvent(QDragEnterEvent * event); virtual void dropEvent(QDropEvent *event);
virtual void dropEvent(QDropEvent *event); virtual void dragMoveEvent(QDragMoveEvent *event);
virtual void dragMoveEvent(QDragMoveEvent *event);
virtual void resizeEvent(QResizeEvent * event); virtual void resizeEvent(QResizeEvent * event);
virtual void drawBackground(QPainter *painter, const QRectF &rect); virtual void drawBackground(QPainter *painter, const QRectF &rect);
virtual void showEvent(QShowEvent * event); private:
virtual void hideEvent(QHideEvent * event);
private: void init();
void init(); inline bool shouldDisplayItem(QGraphicsItem *item)
{
bool ok;
int itemLayerType = item->data(UBGraphicsItemData::ItemLayerType).toInt(&ok);
return (ok && (itemLayerType >= mStartLayer && itemLayerType <= mEndLayer));
}
inline bool shouldDisplayItem(QGraphicsItem *item) QList<QUrl> processMimeData(const QMimeData* pMimeData);
{
bool ok;
int itemLayerType = item->data(UBGraphicsItemData::ItemLayerType).toInt(&ok);
return (ok && (itemLayerType >= mStartLayer && itemLayerType <= mEndLayer));
}
QList<QUrl> processMimeData(const QMimeData* pMimeData); UBBoardController* mController;
UBBoardController* mController; int mStartLayer, mEndLayer;
bool mFilterZIndex;
int mStartLayer, mEndLayer; bool mTabletStylusIsPressed;
bool mFilterZIndex; bool mUsingTabletEraser;
bool mTabletStylusIsPressed; bool mPendingStylusReleaseEvent;
bool mUsingTabletEraser;
bool mPendingStylusReleaseEvent; bool mMouseButtonIsPressed;
QPointF mPreviousPoint;
QPoint mMouseDownPos;
bool mMouseButtonIsPressed; bool mPenPressureSensitive;
QPointF mPreviousPoint; bool mMarkerPressureSensitive;
QPoint mMouseDownPos; bool mUseHighResTabletEvent;
bool mPenPressureSensitive; QRubberBand *mRubberBand;
bool mMarkerPressureSensitive; bool mIsCreatingTextZone;
bool mUseHighResTabletEvent; bool mIsCreatingSceneGrabZone;
QRubberBand *mRubberBand; bool isAbsurdPoint(QPoint point);
bool mIsCreatingTextZone;
bool mIsCreatingSceneGrabZone;
bool isAbsurdPoint(QPoint point); bool mVirtualKeyboardActive;
bool mOkOnWidget;
bool mVirtualKeyboardActive; bool mWidgetMoved;
bool mOkOnWidget; QPointF mLastPressedMousePos;
QGraphicsItem *movingItem;
QMouseEvent *suspendedMousePressEvent;
bool mWidgetMoved; bool moveRubberBand;
QPointF mLastPressedMousePos; UBRubberBand *mUBRubberBand;
QGraphicsItem *movingItem;
QMouseEvent *suspendedMousePressEvent;
bool moveRubberBand; QList<QGraphicsItem *> mRubberedItems;
UBRubberBand *mUBRubberBand; QSet<QGraphicsItem*> mJustSelectedItems;
QList<QGraphicsItem *> mRubberedItems; int mLongPressInterval;
QSet<QGraphicsItem*> mJustSelectedItems; QTimer mLongPressTimer;
int mLongPressInterval; bool mIsDragInProgress;
QTimer mLongPressTimer; bool mMultipleSelectionIsEnabled;
bool bIsControl;
bool bIsDesktop;
bool mRubberBandInPlayMode;
bool mIsDragInProgress; static bool hasSelectedParents(QGraphicsItem * item);
bool mMultipleSelectionIsEnabled;
bool bIsControl;
bool bIsDesktop;
bool mRubberBandInPlayMode;
static bool hasSelectedParents(QGraphicsItem * item); private slots:
private slots: void settingChanged(QVariant newValue);
void settingChanged(QVariant newValue); public slots:
public slots: void virtualKeyboardActivated(bool b);
void longPressEvent();
void virtualKeyboardActivated(bool b);
void longPressEvent();
}; };

@ -44,9 +44,6 @@ public:
virtual void DrawLine(const QPointF& position, qreal width); virtual void DrawLine(const QPointF& position, qreal width);
virtual void EndLine(); virtual void EndLine();
signals:
void hidden();
protected: protected:
void paint(); void paint();

@ -299,8 +299,6 @@ void UBGraphicsCompass::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
else if (closeButtonRect().contains(event->pos())) else if (closeButtonRect().contains(event->pos()))
{ {
hide(); hide();
emit hidden();
event->accept(); event->accept();
} }
else else

@ -51,10 +51,6 @@ class UBGraphicsCompass: public QObject, public QGraphicsRectItem, public UBItem
virtual void copyItemParameters(UBItem *copy) const; virtual void copyItemParameters(UBItem *copy) const;
signals:
void hidden();
protected: protected:
virtual void paint(QPainter *painter, const QStyleOptionGraphicsItem *styleOption, QWidget *widget); virtual void paint(QPainter *painter, const QStyleOptionGraphicsItem *styleOption, QWidget *widget);
virtual QVariant itemChange(GraphicsItemChange change, const QVariant &value); virtual QVariant itemChange(GraphicsItemChange change, const QVariant &value);

@ -240,7 +240,6 @@ void UBGraphicsProtractor::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
case Close : case Close :
hide(); hide();
emit hidden();
break; break;
case MoveMarker : case MoveMarker :

@ -371,7 +371,6 @@ void UBGraphicsRuler::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
else if (closeButtonRect().contains(event->pos())) else if (closeButtonRect().contains(event->pos()))
{ {
hide(); hide();
emit hidden();
event->accept(); event->accept();
} }
else else

@ -716,7 +716,6 @@ void UBGraphicsTriangle::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
else if (closeButtonRect().contains(event->pos())) else if (closeButtonRect().contains(event->pos()))
{ {
hide(); hide();
emit hidden();
event->accept(); event->accept();
} }
else if (hFlipRect().contains(event->pos())) else if (hFlipRect().contains(event->pos()))

Loading…
Cancel
Save