[QGIS Commit] r8570 -
branches/advanced_printing_branch/src/app/composer
svn_qgis at osgeo.org
svn_qgis at osgeo.org
Sun Jun 1 04:48:48 EDT 2008
Author: mhugent
Date: 2008-06-01 04:48:48 -0400 (Sun, 01 Jun 2008)
New Revision: 8570
Modified:
branches/advanced_printing_branch/src/app/composer/qgscomposeritem.cpp
branches/advanced_printing_branch/src/app/composer/qgscomposeritem.h
branches/advanced_printing_branch/src/app/composer/qgscomposermap.cpp
branches/advanced_printing_branch/src/app/composer/qgscomposermap.h
branches/advanced_printing_branch/src/app/composer/qgscomposermapwidget.cpp
branches/advanced_printing_branch/src/app/composer/qgscomposermapwidget.h
Log:
Enable/disable drawing of frame for composer map again
Modified: branches/advanced_printing_branch/src/app/composer/qgscomposeritem.cpp
===================================================================
--- branches/advanced_printing_branch/src/app/composer/qgscomposeritem.cpp 2008-06-01 08:09:37 UTC (rev 8569)
+++ branches/advanced_printing_branch/src/app/composer/qgscomposeritem.cpp 2008-06-01 08:48:48 UTC (rev 8570)
@@ -26,14 +26,14 @@
#include <iostream>
#include "qgsrect.h" //just for debugging
-QgsComposerItem::QgsComposerItem(QGraphicsItem* parent): QGraphicsRectItem(0), mBoundingResizeRectangle(0)
+QgsComposerItem::QgsComposerItem(QGraphicsItem* parent): QGraphicsRectItem(0), mBoundingResizeRectangle(0), mFrame(true)
{
mPlotStyle = QgsComposition::Preview;
setAcceptsHoverEvents(true);
setFlag(QGraphicsItem::ItemIsSelectable, true);
}
-QgsComposerItem::QgsComposerItem(qreal x, qreal y, qreal width, qreal height, QGraphicsItem* parent): QGraphicsRectItem(0, 0, width, height, parent), mBoundingResizeRectangle(0)
+QgsComposerItem::QgsComposerItem(qreal x, qreal y, qreal width, qreal height, QGraphicsItem* parent): QGraphicsRectItem(0, 0, width, height, parent), mBoundingResizeRectangle(0), mFrame(true)
{
mPlotStyle = QgsComposition::Preview;
setAcceptsHoverEvents(true);
@@ -309,9 +309,12 @@
void QgsComposerItem::drawFrame(QPainter* p)
{
- p->setPen(pen());
- p->setRenderHint(QPainter::Antialiasing, true);
- p->drawRect (QRectF( 0, 0, rect().width(), rect().height()));
+ if(mFrame)
+ {
+ p->setPen(pen());
+ p->setRenderHint(QPainter::Antialiasing, true);
+ p->drawRect (QRectF( 0, 0, rect().width(), rect().height()));
+ }
}
void QgsComposerItem::setSceneRect(const QRectF& rectangle)
Modified: branches/advanced_printing_branch/src/app/composer/qgscomposeritem.h
===================================================================
--- branches/advanced_printing_branch/src/app/composer/qgscomposeritem.h 2008-06-01 08:09:37 UTC (rev 8569)
+++ branches/advanced_printing_branch/src/app/composer/qgscomposeritem.h 2008-06-01 08:48:48 UTC (rev 8570)
@@ -91,6 +91,9 @@
*/
virtual bool readXML( QDomNode & node );
+ bool frame() const {return mFrame;}
+ void setFrame(bool drawFrame){mFrame = drawFrame;}
+
protected:
QgsComposition::PlotStyle mPlotStyle;
int mId;
@@ -103,6 +106,9 @@
/**Rectangle used during move and resize actions*/
QGraphicsRectItem* mBoundingResizeRectangle;
+
+ /**True if item fram needs to be painted*/
+ bool mFrame;
//event handlers
virtual void mouseMoveEvent ( QGraphicsSceneMouseEvent * event );
Modified: branches/advanced_printing_branch/src/app/composer/qgscomposermap.cpp
===================================================================
--- branches/advanced_printing_branch/src/app/composer/qgscomposermap.cpp 2008-06-01 08:09:37 UTC (rev 8569)
+++ branches/advanced_printing_branch/src/app/composer/qgscomposermap.cpp 2008-06-01 08:48:48 UTC (rev 8570)
@@ -247,12 +247,6 @@
return calculator.calculate(mExtent, rect().width());
}
-QWidget *QgsComposerMap::options ( void )
-{
- //setOptions ();
- return ( dynamic_cast <QWidget *> (this) );
-}
-
QString QgsComposerMap::name ( void )
{
return mName;
Modified: branches/advanced_printing_branch/src/app/composer/qgscomposermap.h
===================================================================
--- branches/advanced_printing_branch/src/app/composer/qgscomposermap.h 2008-06-01 08:09:37 UTC (rev 8569)
+++ branches/advanced_printing_branch/src/app/composer/qgscomposermap.h 2008-06-01 08:48:48 UTC (rev 8570)
@@ -63,7 +63,6 @@
void init ( void );
// Reimplement QgsComposerItem:
- QWidget *options ( void );
bool writeSettings ( void );
bool readSettings ( void );
bool removeSettings ( void );
@@ -78,9 +77,6 @@
/** \brief Reimplementation of QCanvasItem::paint - draw on canvas */
void paint (QPainter* painter, const QStyleOptionGraphicsItem* itemStyle, QWidget* pWidget);
-
- /** \brief Set extent requested by user */
- void setUserExtent ( QgsRect const & rect);
/** \brief Recalculate rectangle/extent/scale according to current rule */
void recalculate ( void );
@@ -94,15 +90,6 @@
/** \brief Map name, used in legend combobox etc. */
QString name ( void );
- /** \brief Width scale */
- double widthScale(void);
-
- /** \brief Symbol scale */
- double symbolScale ( void );
-
- /** \brief Font size scale */
- double fontScale ( void );
-
/** resizes an item in x- and y direction (canvas coordinates)*/
void resize(double dx, double dy);
@@ -145,15 +132,6 @@
// so that full rectangle in paper is used.
QgsRect mExtent;
- // Cache extent (it can be bigger for example than mExtent)
- QgsRect mCacheExtent;
-
- // Number of paper units in map per paper unit on paper, this is the xxx part of 1:xxx
- double mUserScale;
-
- // Scale from map (in map units) to paper (in canvas points), i.e. size_on_paper/size_in_map
- double mScale;
-
// Cache used in composer preview
// NOTE: QCanvasView is slow with bigger images but the spped does not decrease with image size.
// It is very slow, with zoom in in QCanvasView, it seems, that QCanvas is stored as a big image
@@ -172,10 +150,7 @@
/** \brief Number of layers when cache was created */
int mNumCachedLayers;
- /** \brief Draw frame */
- bool mFrame;
-
- /** \brief set to true if in state of drawing, other requests are to draw are returned */
+ /** \brief set to true if in state of drawing. Concurrent requests to draw method are returned if set to true */
bool mDrawing;
/**Store last scale factor to avoid unnecessary repaints in case preview mode is 'Render'*/
Modified: branches/advanced_printing_branch/src/app/composer/qgscomposermapwidget.cpp
===================================================================
--- branches/advanced_printing_branch/src/app/composer/qgscomposermapwidget.cpp 2008-06-01 08:09:37 UTC (rev 8569)
+++ branches/advanced_printing_branch/src/app/composer/qgscomposermapwidget.cpp 2008-06-01 08:48:48 UTC (rev 8570)
@@ -32,6 +32,8 @@
mPreviewModeComboBox->insertItem(1, tr("Render"));
mPreviewModeComboBox->insertItem(2, tr("Rectangle"));
+ mFrameCheckBox->setCheckState(Qt::Checked);
+
if(composerMap)
{
connect(composerMap, SIGNAL(extentChanged()), this, SLOT(updateSettingsNoSignals()));
@@ -123,6 +125,32 @@
}
}
+void QgsComposerMapWidget::on_mFrameCheckBox_stateChanged(int state)
+{
+ if(!mComposerMap)
+ {
+ return;
+ }
+
+ if(state == Qt::Checked)
+ {
+ if(mComposerMap->frame())
+ {
+ return;
+ }
+ mComposerMap->setFrame(true);
+ }
+ else
+ {
+ if(!mComposerMap->frame())
+ {
+ return;
+ }
+ mComposerMap->setFrame(false);
+ }
+ mComposerMap->update();
+}
+
void QgsComposerMapWidget::updateSettingsNoSignals()
{
mHeightLineEdit->blockSignals(true);
Modified: branches/advanced_printing_branch/src/app/composer/qgscomposermapwidget.h
===================================================================
--- branches/advanced_printing_branch/src/app/composer/qgscomposermapwidget.h 2008-06-01 08:09:37 UTC (rev 8569)
+++ branches/advanced_printing_branch/src/app/composer/qgscomposermapwidget.h 2008-06-01 08:48:48 UTC (rev 8570)
@@ -37,6 +37,7 @@
void on_mHeightLineEdit_editingFinished();
void on_mPreviewModeComboBox_activated(int i);
void on_mCalculateComboBox_activated(int i);
+ void on_mFrameCheckBox_stateChanged(int state);
/**Updates width and height without notify the composer map (to avoid infinite recursion)*/
void updateSettingsNoSignals();
More information about the QGIS-commit
mailing list