Skip to content
Permalink
Browse files
Finally applied all changes from Mapcanvas branch to trunk.
Bug hunting season begins!


git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@4949 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
wonder committed Mar 3, 2006
1 parent 99bf578 commit 7ddb5b218dcca090bd7ff707d36e4c687307bed9
Showing with 5,164 additions and 5,893 deletions.
  1. +2 −0 ChangeLog
  2. +8 −10 src/composer/qgscomposermap.cpp
  3. +1 −1 src/composer/qgscomposermap.h
  4. +1 −6 src/core/Makefile.am
  5. +36 −0 src/core/qgis.cpp
  6. +13 −45 src/core/qgis.h
  7. +0 −66 src/core/qgsacetatelines.cpp
  8. +0 −90 src/core/qgsacetatelines.h
  9. +0 −52 src/core/qgsacetateobject.cpp
  10. +0 −81 src/core/qgsacetateobject.h
  11. +0 −53 src/core/qgsacetaterectangle.cpp
  12. +0 −82 src/core/qgsacetaterectangle.h
  13. +9 −0 src/core/qgsrect.cpp
  14. +3 −0 src/core/qgsrect.h
  15. +0 −3 src/{ → gui}/.cvsignore
  16. +33 −2 src/gui/Makefile.am
  17. +148 −662 src/gui/qgisapp.cpp
  18. +3 −22 src/gui/qgisapp.h
  19. +1 −0 src/gui/qgsattributetabledisplay.cpp
  20. +133 −0 src/gui/qgscursors.cpp
  21. +9 −128 src/gui/qgscursors.h
  22. +1 −3 src/gui/qgslabel.cpp
  23. +1 −2 src/gui/qgslabel.h
  24. +576 −2,855 src/gui/qgsmapcanvas.cpp
  25. +118 −188 src/gui/qgsmapcanvas.h
  26. +120 −0 src/gui/qgsmapcanvasitem.cpp
  27. +91 −0 src/gui/qgsmapcanvasitem.h
  28. +55 −0 src/gui/qgsmapcanvasmap.cpp
  29. +71 −0 src/gui/qgsmapcanvasmap.h
  30. +0 −287 src/gui/qgsmapcanvasproperties.h
  31. +15 −5 src/gui/qgsmaplayer.cpp
  32. +9 −14 src/gui/qgsmaplayer.h
  33. +25 −13 src/gui/qgsmaplayerregistry.cpp
  34. +8 −2 src/gui/qgsmaplayerregistry.h
  35. +86 −0 src/gui/qgsmaplayerset.cpp
  36. +53 −0 src/gui/qgsmaplayerset.h
  37. +67 −74 src/gui/qgsmapoverviewcanvas.cpp
  38. +39 −21 src/gui/qgsmapoverviewcanvas.h
  39. +334 −0 src/gui/qgsmaprender.cpp
  40. +125 −0 src/gui/qgsmaprender.h
  41. +1 −0 src/gui/qgsmapserverexport.cpp
  42. +60 −0 src/gui/qgsmaptool.cpp
  43. +84 −0 src/gui/qgsmaptool.h
  44. +282 −0 src/gui/qgsmaptoolcapture.cpp
  45. +79 −0 src/gui/qgsmaptoolcapture.h
  46. +43 −0 src/gui/qgsmaptoolemitpoint.cpp
  47. +44 −0 src/gui/qgsmaptoolemitpoint.h
  48. +314 −0 src/gui/qgsmaptoolidentify.cpp
  49. +68 −0 src/gui/qgsmaptoolidentify.h
  50. +60 −0 src/gui/qgsmaptoolpan.cpp
  51. +49 −0 src/gui/qgsmaptoolpan.h
  52. +92 −0 src/gui/qgsmaptoolselect.cpp
  53. +57 −0 src/gui/qgsmaptoolselect.h
  54. +313 −0 src/gui/qgsmaptoolvertexedit.cpp
  55. +89 −0 src/gui/qgsmaptoolvertexedit.h
  56. +118 −0 src/gui/qgsmaptoolzoom.cpp
  57. +58 −0 src/gui/qgsmaptoolzoom.h
  58. +43 −19 src/gui/qgsmeasure.cpp
  59. +19 −2 src/gui/qgsmeasure.h
  60. +35 −23 src/gui/qgsproject.cpp
  61. +46 −21 src/gui/qgsrubberband.cpp
  62. +12 −8 src/gui/qgsrubberband.h
  63. +2 −1 src/gui/qgsvectorfilewriter.cpp
  64. +63 −259 src/gui/qgsvectorlayer.cpp
  65. +37 −28 src/gui/qgsvectorlayer.h
  66. +91 −0 src/gui/qgsvertexmarker.cpp
  67. +63 −0 src/gui/qgsvertexmarker.h
  68. +40 −27 src/legend/qgslegend.cpp
  69. +6 −0 src/legend/qgslegend.h
  70. +1 −0 src/plugins/Makefile.am
  71. +2 −1 src/plugins/copyright_label/plugin.cpp
  72. +2 −2 src/plugins/georeferencer/.cvsignore
  73. +31 −20 src/plugins/georeferencer/Makefile.am
  74. +0 −1 src/plugins/georeferencer/datapointacetate.cpp
  75. +0 −54 src/plugins/georeferencer/datapointacetate.h
  76. BIN src/plugins/georeferencer/georef.png
  77. +6 −0 src/plugins/georeferencer/georeferencer.qrc
  78. +0 −84 src/plugins/georeferencer/icon.h
  79. BIN src/plugins/georeferencer/icon.png
  80. +1 −1 src/plugins/georeferencer/mapcoordsdialog.cpp
  81. +1 −1 src/plugins/georeferencer/mapcoordsdialog.h
  82. +0 −28 src/plugins/georeferencer/pan.xpm
  83. +10 −36 src/plugins/georeferencer/plugin.cpp
  84. +0 −11 src/plugins/georeferencer/plugin.h
  85. +21 −40 src/plugins/georeferencer/plugingui.cpp
  86. +11 −10 src/plugins/georeferencer/plugingui.h
  87. +83 −73 src/plugins/georeferencer/pluginguibase.ui
  88. +48 −0 src/plugins/georeferencer/qgsgeorefdatapoint.cpp
  89. +29 −0 src/plugins/georeferencer/qgsgeorefdatapoint.h
  90. +259 −163 src/plugins/georeferencer/qgspointdialog.cpp
  91. +34 −25 src/plugins/georeferencer/qgspointdialog.h
  92. +52 −10 src/plugins/georeferencer/qgspointdialogbase.ui
  93. +0 −22 src/plugins/georeferencer/zoom_in.xpm
  94. +0 −23 src/plugins/georeferencer/zoom_out.xpm
  95. +84 −66 src/plugins/grass/qgsgrassedit.cpp
  96. +5 −10 src/plugins/grass/qgsgrassedit.h
  97. +1 −2 src/plugins/grass/qgsgrassmodule.cpp
  98. +1 −1 src/plugins/grass/qgsgrassnewmapset.cpp
  99. +2 −2 src/plugins/grass/qgsgrassregion.cpp
  100. +1 −1 src/plugins/spit/qgsconnectiondialog.h
  101. +1 −1 src/plugins/spit/qgseditreservedwordsdialog.cpp
  102. +2 −1 src/providers/ogr/qgsogrprovider.cpp
  103. +8 −42 src/raster/qgsrasterlayer.cpp
  104. +3 −7 src/raster/qgsrasterlayer.h
  105. +3 −0 src/ui/.cvsignore
@@ -5,6 +5,8 @@ Version 0.8 'Joesephine' .... development version
** Dropped use of qpicture and resampling for point markers in favour of
qt4.1 qsvgrenderer new goodies
2006-01-09 [timlinux] 0.7.9.8
** Started Mapcanvas branch for Martin
2006-01-09 [timlinux] 0.7.9.8
** Moved plugins into src/plugins
2006-01-08 [timlinux] 0.7.9.8
** moved all sources for gui lib into src/gui
@@ -94,17 +94,15 @@ void QgsComposerMap::init ()
Q3CanvasRectangle::setZ(20);
setActive(true);

connect ( mMapCanvas, SIGNAL(addedLayer(QgsMapLayer *)), this, SLOT(mapCanvasChanged()) );
connect ( mMapCanvas, SIGNAL(removedLayer(QString)), this, SLOT(mapCanvasChanged()) );
connect ( mMapCanvas, SIGNAL(removedAll()), this, SLOT(mapCanvasChanged()) );
connect ( mMapCanvas, SIGNAL(layersChanged()), this, SLOT(mapCanvasChanged()) );
}

QgsComposerMap::~QgsComposerMap()
{
std::cerr << "QgsComposerMap::~QgsComposerMap" << std::endl;
}

void QgsComposerMap::draw ( QPainter *painter, QgsRect *extent, QgsMapToPixel *transform, QPaintDevice *device )
void QgsComposerMap::draw ( QPainter *painter, QgsRect *extent, QgsMapToPixel *transform)
{
mMapCanvas->freeze(true); // necessary ?
int nlayers = mMapCanvas->layerCount();
@@ -122,7 +120,7 @@ void QgsComposerMap::draw ( QPainter *painter, QgsRect *extent, QgsMapToPixel *t
widthScale *= mComposition->viewScale();
}
double symbolScale = mSymbolScale * mComposition->scale();
vector->draw( painter, extent, transform, device, widthScale, symbolScale);
vector->draw( painter, extent, transform, widthScale, symbolScale);

} else {
// raster
@@ -139,13 +137,13 @@ void QgsComposerMap::draw ( QPainter *painter, QgsRect *extent, QgsMapToPixel *t
painter->save();
painter->scale( 1./multip, 1./multip);

layer->draw( painter, extent, &trans, device );
layer->draw( painter, extent, &trans);

painter->restore();
}
else
{
layer->draw( painter, extent, transform, device );
layer->draw( painter, extent, transform);
}
}
}
@@ -164,7 +162,7 @@ void QgsComposerMap::draw ( QPainter *painter, QgsRect *extent, QgsMapToPixel *t
if ( plotStyle() == QgsComposition::Postscript ) {
fontScale = QgsComposition::psFontScaleFactor() * 72.0 / mComposition->resolution();
}
vector->drawLabels ( painter, extent, transform, device, fontScale );
vector->drawLabels ( painter, extent, transform, fontScale );
}

}
@@ -214,7 +212,7 @@ void QgsComposerMap::cache ( void )

QPainter p(&mCachePixmap);

draw( &p, &mCacheExtent, &transform, &mCachePixmap );
draw( &p, &mCacheExtent, &transform);
p.end();

mNumCachedLayers = mMapCanvas->layerCount();
@@ -271,7 +269,7 @@ void QgsComposerMap::draw ( QPainter & painter )
painter.setClipRect ( 0, 0, Q3CanvasRectangle::width(), Q3CanvasRectangle::height() );
#endif

draw( &painter, &mExtent, &transform, painter.device() );
draw( &painter, &mExtent, &transform);
painter.restore();
}

@@ -72,7 +72,7 @@ class QgsComposerMap : public QWidget, private Ui::QgsComposerMapBase, public Q3
bool readXML( QDomNode & node );

/** \brief Draw to paint device */
void draw(QPainter *painter, QgsRect *extent, QgsMapToPixel *transform, QPaintDevice *device);
void draw(QPainter *painter, QgsRect *extent, QgsMapToPixel *transform);

/** \brief Reimplementation of QCanvasItem::draw - draw on canvas */
void draw ( QPainter & painter );
@@ -43,9 +43,6 @@ lib_LTLIBRARIES = libqgis_core.la

libqgis_coreHEADERS = \
qgis.h \
qgsacetatelines.h \
qgsacetateobject.h \
qgsacetaterectangle.h \
qgsapplication.h \
qgsbookmarkitem.h \
qgsclipper.h \
@@ -102,9 +99,7 @@ libqgis_core_la_MOC = \
qgsrasterdataprovider.moc.cpp

libqgis_core_la_SOURCES =\
qgsacetatelines.cpp \
qgsacetateobject.cpp \
qgsacetaterectangle.cpp \
qgis.cpp \
qgsapplication.cpp \
qgsbookmarkitem.cpp \
qgsclipper.cpp \
@@ -0,0 +1,36 @@

#include "qgis.h"

// Version constants
//

// Version string
const char* QGis::qgisVersion = VERSION;

// Version number used for comparing versions using the "Check QGIS Version" function
const int QGis::qgisVersionInt =703;

// Release name
const char* QGis::qgisReleaseName = "Seamus";

const char* QGis::qgisVectorGeometryType[] =
{
"Point",
"Line",
"Polygon"
};

// description strings for feature types
const char* QGis::qgisFeatureTypes[] =
{
"Null",
"WKBPoint",
"WKBLineString",
"WKBPolygon",
"WKBMultiPoint",
"WKBMultiLineString",
"WKBMultiPolygon"
};

const int QGis::DEFAULT_IDENTIFY_RADIUS=5;

@@ -31,42 +31,23 @@

#include <qevent.h>

namespace QGis
class QGis
{
public:
// Version constants
//
// Version string
static const char *qgisVersion = VERSION;
static const char* qgisVersion;
// Version number used for comparing versions using the "Check QGIS Version" function
static const int qgisVersionInt =703;
static const int qgisVersionInt;
// Release name
static const char *qgisReleaseName = "Seamus";
static const char* qgisReleaseName;

// Enumerations
//
// Maptool enumeration
enum MapTools
{
NoTool,
ZoomIn,
ZoomOut,
Pan,
Distance,
Identify,
Table,
Select,
CapturePoint,
CaptureLine,
CapturePolygon,
EmitPoint,
MeasureDist,
MeasureArea,
AddVertex,
MoveVertex,
DeleteVertex
};

//! Used for symbology operations
// Featuure types
// Feature types
enum WKBTYPE
{
WKBPoint = 1,
@@ -83,23 +64,10 @@ namespace QGis
Line,
Polygon
};
static const char *qgisVectorGeometryType[] =
{
"Point",
"Line",
"Polygon"
};
//! description strings for feature types
static const char *qgisFeatureTypes[] =
{
"Null",
"WKBPoint",
"WKBLineString",
"WKBPolygon",
"WKBMultiPoint",
"WKBMultiLineString",
"WKBMultiPolygon"
};
static const char *qgisVectorGeometryType[];

//! description strings for feature types
static const char *qgisFeatureTypes[];

//! map units that qgis supports
typedef enum
@@ -122,8 +90,8 @@ namespace QGis
ProviderCountCalcEvent
};

const int DEFAULT_IDENTIFY_RADIUS=5;
}
static const int DEFAULT_IDENTIFY_RADIUS;
};
/** WKT string that represents a geographic coord sys */
const QString GEOWKT =
"GEOGCS[\"WGS 84\", "

This file was deleted.

This file was deleted.

0 comments on commit 7ddb5b2

Please sign in to comment.