Skip to content

Commit

Permalink
Add composer rulers to composer graphics view
Browse files Browse the repository at this point in the history
  • Loading branch information
mhugent committed Jan 28, 2013
1 parent 7c2c73b commit 6ef3c2a
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 1 deletion.
2 changes: 1 addition & 1 deletion src/gui/qgscomposerruler.cpp
Expand Up @@ -3,7 +3,7 @@

const int RULER_MIN_SIZE = 20;

QgsComposerRuler::QgsComposerRuler( QgsComposerRuler::Direction d ): mDirection( d )
QgsComposerRuler::QgsComposerRuler( QgsComposerRuler::Direction d ): QWidget( 0 ), mDirection( d )
{
}

Expand Down
17 changes: 17 additions & 0 deletions src/gui/qgscomposerview.cpp
Expand Up @@ -21,6 +21,7 @@
#include <QKeyEvent>
#include <QClipboard>
#include <QMimeData>
#include <QGridLayout>

#include "qgscomposerview.h"
#include "qgscomposerarrow.h"
Expand All @@ -31,6 +32,7 @@
#include "qgscomposermap.h"
#include "qgscomposeritemgroup.h"
#include "qgscomposerpicture.h"
#include "qgscomposerruler.h"
#include "qgscomposerscalebar.h"
#include "qgscomposershape.h"
#include "qgscomposerattributetable.h"
Expand All @@ -48,6 +50,21 @@ QgsComposerView::QgsComposerView( QWidget* parent, const char* name, Qt::WFlags
Q_UNUSED( f );
Q_UNUSED( name );


QGridLayout* gridLayout = new QGridLayout();
gridLayout->setSpacing( 0 );
gridLayout->setMargin( 0 );
mHorizontalRuler = new QgsComposerRuler( QgsComposerRuler::Horizontal );
mVerticalRuler = new QgsComposerRuler( QgsComposerRuler::Vertical );
QWidget* fake = new QWidget();
fake->setBackgroundRole( QPalette::Window );
fake->setFixedSize( 20, 20 );
gridLayout->addWidget( fake, 0, 0 );
gridLayout->addWidget( mHorizontalRuler, 0, 1 );
gridLayout->addWidget( mVerticalRuler, 1, 0 );
gridLayout->addWidget( this->viewport(), 1, 1 );
this->setLayout( gridLayout );

setResizeAnchor( QGraphicsView::AnchorViewCenter );
setMouseTracking( true );
viewport()->setMouseTracking( true );
Expand Down
4 changes: 4 additions & 0 deletions src/gui/qgscomposerview.h
Expand Up @@ -32,6 +32,7 @@ class QgsComposerLabel;
class QgsComposerLegend;
class QgsComposerMap;
class QgsComposerPicture;
class QgsComposerRuler;
class QgsComposerScaleBar;
class QgsComposerShape;
class QgsComposerAttributeTable;
Expand Down Expand Up @@ -123,6 +124,9 @@ class GUI_EXPORT QgsComposerView: public QGraphicsView

bool mPaintingEnabled;

QgsComposerRuler* mHorizontalRuler;
QgsComposerRuler* mVerticalRuler;

/** Draw a shape on the canvas */
void addShape( Tool currentTool );

Expand Down

0 comments on commit 6ef3c2a

Please sign in to comment.