First pass at moving to QPainter based view.

glabels/LabelModel.cpp

@@ -93,6 +93,42 @@ namespace glabels
 	}
 
 
+	///
+	/// Delete Object
+	///
+	void LabelModel::deleteObject( LabelModelObject* object )
+	{
+		object->unselect();
+		mObjectList.removeOne( object );
+
+		disconnect( object, 0, this, 0 );
+
+		mModified = true;
+
+		emit changed();
+		emit modifiedChanged();
+
+		delete object;
+	}
+
+
+	///
+	/// Delete Object
+	///
+	LabelModelObject* LabelModel::objectAt( double x, double y )
+	{
+		foreach( LabelModelObject* object, mObjectList )
+		{
+			if ( object->isLocatedAt( x, y ) )
+			{
+				return object;
+			}
+		}
+
+		return 0;
+	}
+
+
 	///
 	/// Object Changed Slot
 	///
@@ -117,25 +153,6 @@ namespace glabels
 	}
 
 
-	///
-	/// Delete Object
-	///
-	void LabelModel::deleteObject( LabelModelObject* object )
-	{
-		object->unselect();
-		mObjectList.removeOne( object );
-
-		disconnect( object, 0, this, 0 );
-
-		mModified = true;
-
-		emit changed();
-		emit modifiedChanged();
-
-		delete object;
-	}
-
-
 	///
 	/// Select Object
 	///

glabels/LabelModel.h

@@ -98,6 +98,8 @@ namespace glabels
 		void addObject( LabelModelObject* object );
 		void deleteObject( LabelModelObject* object );
 
+		LabelModelObject* objectAt( double x, double y );
+
 
 		/////////////////////////////////
 		// Manipulate selection

glabels/LabelModelObject.cpp

@@ -893,6 +893,15 @@ namespace glabels
 	}
 
 
+	///
+	/// Default isLocatedAt method
+	///
+	bool LabelModelObject::isLocatedAt( double x, double y )
+	{
+		return false;
+	}
+
+
 	///
 	/// Update Representative Graphics Item with Object's Transformation Matrix
 	///

glabels/LabelModelObject.h

@@ -384,6 +384,7 @@ namespace glabels
 		void rotate( double thetaDegs );
 		void flipHoriz();
 		void flipVert();
+		virtual bool isLocatedAt( double x, double y );
 
 
 		///////////////////////////////////////////////////////////////

glabels/View.cpp

@@ -20,14 +20,10 @@
 
 #include "View.h"
 
-#include <QGraphicsScene>
-#include <QGraphicsItemGroup>
-#include <QMouseEvent>
-#include <QGraphicsLineItem>
-#include <QGraphicsDropShadowEffect>
 #include <algorithm>
 #include <cmath>
-#include <iostream>
+#include <QMouseEvent>
+#include <QtDebug>
 
 #include "LabelModel.h"
 #include "LabelModelObject.h"
@@ -49,7 +45,7 @@ namespace
 
 	const double ZOOM_TO_FIT_PAD = 16.0;
 
-        const QColor  shadowColor( 64, 64, 64 );
+        const QColor  shadowColor( 64, 64, 64, 128 );
 	const double  shadowOffsetPixels = 3;
 	const double  shadowRadiusPixels = 12;
 
@@ -70,82 +66,100 @@ namespace
 }
 
 
-namespace glabels
-{
 
 ///
 /// Constructor
 ///
-	View::View( QWidget *parent ) : QGraphicsView(parent)
+glabels::View::View( QWidget *parent ) : QWidget(parent)
 {
 	mState = IdleState;
 
 	setZoomReal( 1, false );
+
 	mModel              = 0;
+	mMarkupVisible      = true;
+	mGridVisible        = true;
+	mGridSpacing        = 18;
+	mInObjectCreateMode = false;
 
 	setMouseTracking( true );
+}
 
-		setAttribute( Qt::WA_TranslucentBackground );
-		viewport()->setAutoFillBackground( false );
 
-		mScene = new QGraphicsScene();
+///
-		setScene( mScene );
+/// Zoom property
+///
+double
+glabels::View::zoom() const
+{
+	return mZoom;
+}
 
-		mScene->addItem( mLabelLayer        = new QGraphicsItemGroup() );
-		mScene->addItem( mGridLayer         = new QGraphicsItemGroup() );
-		mScene->addItem( mMarkupLayer       = new QGraphicsItemGroup() );
-		mScene->addItem( mObjectLayer       = new QGraphicsItemGroup() );
-		mScene->addItem( mForegroundLayer   = new QGraphicsItemGroup() );
-		mScene->addItem( mSelectRegionLayer = new QGraphicsItemGroup() );
 
-		initSelectRegionLayer();
+///
+/// Markup visible? property
+///
+bool
+glabels::View::markupVisible() const
+{
+	return mMarkupVisible;
+}
+
+
+///
+/// Grid visible? property
+///
+bool
+glabels::View::qridVisible() const
+{
+	return mGridVisible;
 }
 
 
 ///
 /// Model Parameter Setter
 ///
-	void View::setModel( LabelModel* model )
+void
+glabels::View::setModel( LabelModel* model )
 {
 	mModel = model;
 
-		mScene->setSceneRect( 0, 0, model->w(), model->h() );
+	if ( model )
-
-		initLabelLayer();
-		initGridLayer();
-		initMarkupLayer();
-
-		foreach (LabelModelObject* object, model->objectList() )
 	{
-			addObjectToObjectLayer( object );
+		connect( model, SIGNAL(changed()), this, SLOT(onModelChanged()) );
+		connect( model, SIGNAL(selectionChanged()), this, SLOT(onModelSelectionChanged()) );
+		connect( model, SIGNAL(sizeChanged()), this, SLOT(onModelSizeChanged()) );
 	}
-
-		initForegroundLayer();
 }
 
 
 ///
 /// Grid Visibility Parameter Setter
 ///
-	void View::setGridVisible( bool visibleFlag )
+void
+glabels::View::setGridVisible( bool visibleFlag )
 {
-		mGridLayer->setVisible( visibleFlag );
+	mGridVisible = visibleFlag;
+	update();
 }
 
 
 ///
 /// Markup Visibility Parameter Setter
 ///
-	void View::setMarkupVisible( bool visibleFlag )
+void
+glabels::View::setMarkupVisible( bool visibleFlag )
 {
-		mMarkupLayer->setVisible( visibleFlag );
+	mMarkupVisible = visibleFlag;
+	update();
 }
 
 
 ///
 /// Zoom In "One Notch"
 ///
-	void View::zoomIn()
+void
+glabels::View::zoomIn()
 {
 	// Find closest standard zoom level to our current zoom
 	// Start with 2nd largest scale
@@ -170,7 +184,8 @@ namespace glabels
 ///
 /// Zoom Out "One Notch"
 ///
-	void View::zoomOut()
+void
+glabels::View::zoomOut()
 {
 	// Find closest standard zoom level to our current zoom
 	// Start with largest scale, end on 2nd smallest
@@ -195,7 +210,8 @@ namespace glabels
 ///
 /// Zoom To 1:1 Scale
 ///
-	void View::zoom1To1()
+void
+glabels::View::zoom1To1()
 {
 	setZoomReal( 1.0, false );
 }
@@ -204,7 +220,8 @@ namespace glabels
 ///
 /// Zoom To Fit
 ///
-	void View::zoomToFit()
+void
+glabels::View::zoomToFit()
 {
 	using std::min;
 	using std::max;
@@ -224,7 +241,8 @@ namespace glabels
 ///
 /// Is Zoom at Maximum?
 ///
-	bool View::isZoomMax() const
+bool
+glabels::View::isZoomMax() const
 {
 	return ( mZoom >= zoomLevels[0] );
 }
@@ -233,7 +251,8 @@ namespace glabels
 ///
 /// Is Zoom at Minimum?
 ///
-	bool View::isZoomMin() const
+bool
+glabels::View::isZoomMin() const
 {
 	return ( mZoom <= zoomLevels[nZoomLevels-1] );
 }
@@ -242,22 +261,42 @@ namespace glabels
 ///
 /// Set Zoom to Value
 ///
-	void View::setZoomReal( double zoom, bool zoomToFitFlag )
+void
+glabels::View::setZoomReal( double zoom, bool zoomToFitFlag )
 {
 	mZoom          = zoom;
 	mZoomToFitFlag = zoomToFitFlag;
 
-		resetTransform();
+	update();
-		scale( mZoom*physicalDpiX()/72.0, mZoom*physicalDpiY()/72.0 );
 
 	emit zoomChanged();
 }
 
 
+///
+/// Paint Event Handler
+///
+void
+glabels::View::paintEvent( QPaintEvent* event )
+{
+	if ( mModel )
+	{
+		QPainter painter( this );
+
+		painter.scale( mZoom, mZoom );
+
+		drawBgLayer( &painter );
+		drawGridLayer( &painter );
+		drawMarkupLayer( &painter );
+	}
+}
+
+
 ///
 /// Resize Event Handler
 ///
-	void View::resizeEvent( QResizeEvent *event )
+void
+glabels::View::resizeEvent( QResizeEvent *event )
 {
 	if ( mZoomToFitFlag )
 	{
@@ -265,9 +304,7 @@ namespace glabels
 	}
 	else
 	{
-			// Refresh to keep view location relative to window
+		update();
-			resetTransform();
-			scale( mZoom*physicalDpiX()/72.0, mZoom*physicalDpiY()/72.0 );
 	}
 }
 
@@ -275,47 +312,119 @@ namespace glabels
 ///
 /// Mouse Movement Event Handler
 ///
-	void View::mouseMoveEvent( QMouseEvent* event )
+void
+glabels::View::mouseMoveEvent( QMouseEvent* event )
 {
-		QPointF pointer = mapToScene( event->x(), event->y() );
+	/*
-		emit pointerMoved( pointer.x(), pointer.y() );
+	 * Translate to label coordinates
+	 */
+	QTransform transform;
 
+	transform.scale( mZoom, mZoom );
+
+	qreal xWorld, yWorld;
+	transform.inverted().map( event->x(), event->y(), &xWorld, &yWorld );
+
+	/*
+	 * Emit signal regardless of mode
+	 */
+	emit pointerMoved( xWorld, yWorld );
+
+
+	/*
+	 * Handle event as appropriate for mode
+	 */
+	if ( mInObjectCreateMode )
+	{
 		switch (mState)
 		{
 
 		case IdleState:
+			/* @TODO handle handles. */
+			if ( mModel->objectAt( xWorld, yWorld ) )
+			{
+				setCursor( Qt::SizeAllCursor );
+			}
+			else
+			{
+				setCursor( Qt::ArrowCursor );
+			}
 			break;
 
-		case ArrowSelectRegionState:
+		case ArrowSelectRegion:
-			mSelectRegion.setX2( pointer.x() );
+			mSelectRegion.setX2( xWorld );
-			mSelectRegion.setY2( pointer.y() );
+			mSelectRegion.setY2( yWorld );
+			update();
+			break;
 
-			mSelectRegionItem->setRect( mSelectRegion.rect() );
+		case ArrowMove:
+			mModel->moveSelection( (xWorld - mMoveLastX),
+					       (yWorld - mMoveLastY) );
+			mMoveLastX = xWorld;
+			mMoveLastY = yWorld;
+			break;
+
+		case ArrowResize:
+			/* @TODO handle resize motion */
 			break;
 
 		default:
 			// Should not happen!
+			qWarning() << "Invalid arrow state.";
 			break;
 
 		}
 	}
-
+	else
-
-	///
-	/// Leave Event Handler
-	///
-	void View::leaveEvent( QEvent* event )
 	{
-		emit pointerExited();
+		if ( mState != IdleState )
+		{
+			switch (mCreateObjectType)
+			{
+			case Box:
+				// @TODO
+				break;
+			case Ellipse:
+				// @TODO
+				break;
+			case Line:
+				// @TODO
+				break;
+			case Image:
+				// @TODO
+				break;
+			case Text:
+				// @TODO
+				break;
+			case Barcode:
+				// @TODO
+				break;
+			default:
+				// Should not happen!
+				qWarning() << "Invalid create type.";
+				break;
+			}
+		}
+	}
 }
 
 
 ///
 /// Mouse Button Press Event Handler
 ///
-	void View::mousePressEvent( QMouseEvent* event )
+void
+glabels::View::mousePressEvent( QMouseEvent* event )
 {
-		QPointF pointer = mapToScene( event->x(), event->y() );
+	/*
+	 * Translate to label coordinates
+	 */
+	QTransform transform;
+
+	transform.scale( mZoom, mZoom );
+
+	qreal xWorld, yWorld;
+	transform.inverted().map( event->x(), event->y(), &xWorld, &yWorld );
+
 
 	if ( event->button() & Qt::LeftButton )
 	{
@@ -325,15 +434,13 @@ namespace glabels
 			mModel->unselectAll();
 		}
 
-			mSelectRegion.setX1( pointer.x() );
+		mSelectRegionVisible = true;
-			mSelectRegion.setY1( pointer.y() );
+		mSelectRegion.setX1( xWorld );
-			mSelectRegion.setX2( pointer.x() );
+		mSelectRegion.setY1( yWorld );
-			mSelectRegion.setY2( pointer.y() );
+		mSelectRegion.setX2( xWorld );
+		mSelectRegion.setY2( yWorld );
 
-			mSelectRegionItem->setRect( mSelectRegion.rect() );
+		mState = ArrowSelectRegion;
-			mSelectRegionLayer->setVisible( true );
-
-			mState = ArrowSelectRegionState;
 	}
 	else
 	{
@@ -344,9 +451,19 @@ namespace glabels
 ///
 /// Mouse Button Release Event Handler
 ///
-	void View::mouseReleaseEvent( QMouseEvent* event )
+void
+glabels::View::mouseReleaseEvent( QMouseEvent* event )
 {
-		QPointF pointer = mapToScene( event->x(), event->y() );
+	/*
+	 * Translate to label coordinates
+	 */
+	QTransform transform;
+
+	transform.scale( mZoom, mZoom );
+
+	qreal xWorld, yWorld;
+	transform.inverted().map( event->x(), event->y(), &xWorld, &yWorld );
+
 
 	if ( event->button() & Qt::LeftButton )
 	{
@@ -356,12 +473,9 @@ namespace glabels
 		case IdleState:
 			break;
 
-			case ArrowSelectRegionState:
+		case ArrowSelectRegion:
-				mSelectRegion.setX2( pointer.x() );
+			mSelectRegion.setX2( xWorld );
-				mSelectRegion.setY2( pointer.y() );
+			mSelectRegion.setY2( yWorld );
-
-				mSelectRegionItem->setRect( 0, 0, 0, 0 );
-				mSelectRegionLayer->setVisible( false );
 
 			mModel->selectRegion( mSelectRegion );
 
@@ -381,57 +495,51 @@ namespace glabels
 
 
 ///
-	/// Clear Layer (Item Group) of All Child Items
+/// Leave Event Handler
 ///
-	void View::clearLayer( QGraphicsItemGroup* layer )
+void
+glabels::View::leaveEvent( QEvent* event )
 {
-		foreach( QGraphicsItem* item, layer->childItems() )
+	emit pointerExited();
-		{
-			layer->removeFromGroup( item );
-		}
 }
 
 
 ///
-	/// Initialize Label Layer
+/// Draw Background Layer
 ///
-	void View::initLabelLayer()
+void
+glabels::View::drawBgLayer( QPainter* painter )
 {
-		clearLayer( mLabelLayer );
+	painter->save();
 
-                QGraphicsPathItem *labelItem  = new QGraphicsPathItem( mModel->frame()->path() );
+	QBrush brush( shadowColor );
+	painter->setBrush( QBrush( shadowColor ) );
+	painter->translate( shadowOffsetPixels/mZoom, shadowOffsetPixels/mZoom );
+	painter->drawPath( mModel->frame()->path() );
 
-                QBrush brush( labelColor );
+	painter->restore();
-                labelItem->setBrush( brush );
 	
-                QGraphicsDropShadowEffect *shadowEffect = new QGraphicsDropShadowEffect();
+	painter->save();
-                shadowEffect->setColor( shadowColor );
-                shadowEffect->setOffset( shadowOffsetPixels );
-                shadowEffect->setBlurRadius( shadowRadiusPixels );
-		labelItem->setGraphicsEffect( shadowEffect );
 
-                mLabelLayer->addToGroup( labelItem );
+	painter->setBrush( QBrush( labelColor ) );
+	painter->drawPath( mModel->frame()->path() );
+
+	painter->restore();
 }
 
 
 ///
-	/// Initialize Grid Layer
+/// Draw Grid Layer
 ///
-	void View::initGridLayer()
+void
+glabels::View::drawGridLayer( QPainter* painter )
+{
+	if ( mGridVisible )
 	{
-		clearLayer( mGridLayer );
-
-                QGraphicsPathItem *clipItem  = new QGraphicsPathItem( mModel->frame()->path() );
-		clipItem->setFlag( QGraphicsItem::ItemClipsChildrenToShape );
-
-                QPen pen( gridLineColor );
-		pen.setCosmetic( true );
-                pen.setWidthF( gridLineWidthPixels );
-
 		double w = mModel->w();
 		double h = mModel->h();
-		double x0;
+
-		double y0;
+		double x0, y0;
 		if ( dynamic_cast<const libglabels::FrameRect*>( mModel->frame() ) )
 		{
 			x0 = gridSpacing;
@@ -439,97 +547,38 @@ namespace glabels
 		}
 		else
 		{
-			/* round labels, align grid with center of label. */
+			/* round labels, adjust grid to line up with center of label. */
 			x0 = fmod( w/2, gridSpacing );
 			y0 = fmod( h/2, gridSpacing );
 		}
 
+		painter->save();
+
+		painter->setClipPath( mModel->frame()->path() );
+
+		painter->setPen( QPen( gridLineColor, gridLineWidthPixels/mZoom ) );
+
 		for ( double x = x0; x < w; x += gridSpacing )
 		{
-			QGraphicsLineItem* lineItem = new QGraphicsLineItem( x, 0, x, h, clipItem );
+			painter->drawLine( x, 0, x, h );
-			lineItem->setPen( pen );
 		}
 
 		for ( double y = y0; y < h; y += gridSpacing )
 		{
-			QGraphicsLineItem* lineItem = new QGraphicsLineItem( 0, y, w, y, clipItem );
+			painter->drawLine( 0, y, w, y );
-			lineItem->setPen( pen );
 		}
 
-                mGridLayer->addToGroup( clipItem );
+		painter->restore();
+	}
 }
 
 
 ///
-	/// Initialize Markup Layer
+/// Draw Markup Layer
 ///
-	void View::initMarkupLayer()
+void
+glabels::View::drawMarkupLayer( QPainter* painter )
 {
-		clearLayer( mMarkupLayer );
-
-                QPen pen( markupLineColor );
-		pen.setCosmetic( true );
-                pen.setWidthF( markupLineWidthPixels );
-
-		const libglabels::Frame* frame = mModel->frame();
-
-		foreach (libglabels::Markup* markup, frame->markups() )
-		{
-			QGraphicsItem* markupItem = markup->createGraphicsItem( frame, pen );
-
-			mMarkupLayer->addToGroup( markupItem );
-		}
 }
 
 
-	///
-	/// Add Object to Object Layer
-	///
-	void View::addObjectToObjectLayer( LabelModelObject* object )
-	{
-		QGraphicsItem* item = object->createGraphicsItem();
-		mObjectLayer->addToGroup( item );
-	}
-
-
-	///
-	/// Initialize Foreground Layer
-	///
-	void View::initForegroundLayer()
-	{
-		clearLayer( mForegroundLayer );
-
-                QGraphicsPathItem *outlineItem  = new QGraphicsPathItem( mModel->frame()->path() );
-
-                QPen pen( labelOutlineColor );
-		pen.setJoinStyle( Qt::MiterJoin );
-		pen.setCosmetic( true );
-                pen.setWidthF( labelOutlineWidthPixels );
-                outlineItem->setPen( pen );
-
-                mForegroundLayer->addToGroup( outlineItem );
-	}
-
-
-	///
-	/// Initialize Select Region Layer
-	///
-	void View::initSelectRegionLayer()
-	{
-		clearLayer( mSelectRegionLayer );
-
-		mSelectRegionItem = new QGraphicsRectItem();
-
-                QBrush brush( selectRegionFillColor );
-                mSelectRegionItem->setBrush( brush );
-
-                QPen pen( selectRegionOutlineColor );
-		pen.setJoinStyle( Qt::MiterJoin );
-		pen.setCosmetic( true );
-                pen.setWidthF( selectRegionOutlineWidthPixels );
-                mSelectRegionItem->setPen( pen );
-
-                mSelectRegionLayer->addToGroup( mSelectRegionItem );
-	}
-
-}

glabels/View.h

@@ -21,13 +21,11 @@
 #ifndef glabels_View_h
 #define glabels_View_h
 
-#include <QGraphicsView>
+#include <QWidget>
+#include <QPainter>
 
 #include "LabelRegion.h"
 
-class QGraphicsScene;
-class QGraphicsItemGroup;
-
 
 namespace glabels
 {
@@ -39,7 +37,7 @@ namespace glabels
 	///
 	/// View Widget
 	///
-	class View : public QGraphicsView
+	class View : public QWidget
 	{
 		Q_OBJECT
 
@@ -54,16 +52,20 @@ namespace glabels
 		// Signals
 		/////////////////////////////////////
 	signals:
+		void contextMenuActivate();
 		void zoomChanged();
 		void pointerMoved( double x, double y );
 		void pointerExited();
+		void modeChanged();
 
 
 		/////////////////////////////////////
 		// Parameters
 		/////////////////////////////////////
 	public:
-		inline double zoom() const;
+		double zoom() const;
+		bool markupVisible() const;
+		bool qridVisible() const;
 
 
 		/////////////////////////////////////
@@ -95,10 +97,24 @@ namespace glabels
 		void setZoomReal( double zoom, bool zoomToFitFlag );
 
 
+		/////////////////////////////////////
+		// Mode operations
+		/////////////////////////////////////
+	public:
+		void arrowMode();
+		void createBoxMode();
+		void createEllipseMode();
+		void createLineMode();
+		void createImageMode();
+		void createTextMode();
+		void createBarcodeMode();
+
+
 		/////////////////////////////////////
 		// Event handlers
 		/////////////////////////////////////
 	protected:
+		void paintEvent( QPaintEvent* event );
 		void resizeEvent( QResizeEvent* event );
 		void mouseMoveEvent( QMouseEvent* event );
 		void mousePressEvent( QMouseEvent* event );
@@ -110,13 +126,25 @@ namespace glabels
 		// Private methods
 		/////////////////////////////////////
 	private:
-		void clearLayer( QGraphicsItemGroup* layer );
+		void drawBgLayer( QPainter* painter );
-		void initLabelLayer();
+		void drawGridLayer( QPainter* painter );
-		void initGridLayer();
+		void drawMarkupLayer( QPainter* painter );
-		void initMarkupLayer();
+		void drawObjectsLayer( QPainter* painter );
-		void addObjectToObjectLayer( LabelModelObject* object );
+		void drawFgLayer( QPainter* painter );
-		void initForegroundLayer();
+		void drawHighlightLayer( QPainter* painter );
-		void initSelectRegionLayer();
+		void drawSelectRegionLayer( QPainter* painter );
+
+		void handleResizeMotion( QPainter* painter,
+		                         double    xPixels,
+		                         double    yPixels );
+
+
+		/////////////////////////////////////
+		// Private slots
+		/////////////////////////////////////
+	private:
+		void onLabelChanged();
+		void onLabelSizeChanged();
 
 
 		/////////////////////////////////////
@@ -125,40 +153,55 @@ namespace glabels
 	private:
 		enum State {
 			IdleState,
-			ArrowSelectRegionState
+			ArrowSelectRegion,
+			ArrowMove,
+			ArrowResize,
+			CreateDrag
 		};
 
-		State               mState;
+		enum CreateType {
-
+			Box,
-		QGraphicsScene*     mScene;
+			Ellipse,
-
+			Line,
-		QGraphicsItemGroup* mLabelLayer;
+			Image,
-		QGraphicsItemGroup* mGridLayer;
+			Text,
-		QGraphicsItemGroup* mMarkupLayer;
+			Barcode
-		QGraphicsItemGroup* mObjectLayer;
+		};
-		QGraphicsItemGroup* mForegroundLayer;
-		QGraphicsItemGroup* mSelectRegionLayer;
-
-		QGraphicsRectItem*  mSelectRegionItem;
-		LabelRegion         mSelectRegion;
 
 		double              mZoom;
 		bool                mZoomToFitFlag;
 
+		bool                mMarkupVisible;
+		bool                mGridVisible;
+
+		double              mGridSpacing;
+
 		LabelModel*         mModel;
 
+		State               mState;
+
+		/* ArrowSelectRegion state */
+		bool                mSelectRegionVisible;
+		LabelRegion         mSelectRegion;
+
+		/* ArrowMove state */
+		double              mMoveLastX;
+		double              mMoveLastY;
+
+		/* ArrowResize state */
+		/* @TODO */
+
+		/* CreateDrag state */
+		bool                mInObjectCreateMode;
+		CreateType          mCreateObjectType;
+		LabelModelObject*   mCreateObject;
+		double              mCreateX0;
+		double              mCreateY0;
+
+
 	};
 
 
-	/////////////////////////////////
-	// INLINE METHODS
-	/////////////////////////////////
-
-	inline double View::zoom() const
-	{
-		return mZoom;
-	}
-
 }