Skip to content
Permalink
Browse files

Removed Label class (not used anymore)

git-svn-id: http://svn.osgeo.org/qgis/branches/symbology-ng-branch@11208 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
wonder
wonder committed Jul 30, 2009
1 parent 5e2c1f8 commit 3da9fc4348f18564bd4af3b1561f9cbee285d72e
@@ -85,7 +85,6 @@ SET(QGIS_CORE_SRCS
pal/costcalculator.cpp
pal/feature.cpp
pal/geomfunction.cpp
pal/label.cpp
pal/labelposition.cpp
pal/layer.cpp
pal/pal.cpp
@@ -7,7 +7,6 @@

#include <pal/layer.h>
#include <pal/pal.h>
#include <pal/label.h>

#include "feature.h"
#include "geomfunction.h"

This file was deleted.

This file was deleted.

@@ -41,7 +41,6 @@

#include <pal/layer.h>
#include <pal/pal.h>
#include <pal/label.h>

#include "costcalculator.h"
#include "feature.h"
@@ -49,6 +49,7 @@
#include <pal/pal.h>
#include <pal/layer.h>
#include <pal/palexception.h>
#include <pal/palstat.h>

#include "linkedlist.hpp"
#include "rtree.hpp"
@@ -34,8 +34,6 @@
#ifndef _PAL_H
#define _PAL_H

#include <pal/label.h>
#include <pal/palstat.h>

#include <list>
#include <iostream>
@@ -62,6 +60,7 @@ namespace pal

class Layer;
class LabelPosition;
class PalStat;
class Problem;
class PointSet;
class SimpleMutex;
@@ -30,8 +30,7 @@
#ifndef _PAL_GEOMETRY_H
#define _PAL_GEOMETRY_H

#include <list>
#include <pal/label.h>
#include <cstdlib> // for size_t needed in geos_c.h
#include <geos_c.h>

namespace pal
@@ -43,13 +42,6 @@ namespace pal
class CORE_EXPORT PalGeometry
{
public:
/*
* \brief get the geometry in WKB hexa format
* This method is called by Pal each time it needs a geom's coordinates
*
* @return WKB Hex buffer
*/
//virtual char * getWkbHexBuffer() = 0;

/**
* \brief get the GEOSGeometry of the feature
@@ -67,20 +59,6 @@ namespace pal
virtual void releaseGeosGeometry( GEOSGeometry *the_geom ) = 0;


/*
* \brief Called by Pal when it doesn't need the coordinates anymore
* @param wkbBuffer is the WkbBuffer from PalGeometry::getWkbHexBuffer()
*/
//virtual void releaseWkbHexBuffer(char *wkbBuffer) = 0;

/*
* \brief Give back a label to display
* Pal call this method when label will no move anymore.
*
* @param label the label to disploy
*/
//virtual void addLabel(Label *label) = 0;

virtual ~PalGeometry() {}
};

@@ -48,7 +48,6 @@
#include <pal/pal.h>
#include <pal/palstat.h>
#include <pal/layer.h>
#include <pal/label.h>

#include "linkedlist.hpp"
#include "rtree.hpp"
@@ -109,7 +109,6 @@ void QgsPALObjectPositionManager::findObjectPositions( const QgsRenderContext& r
double bbox[4]; bbox[0] = viewExtent.xMinimum(); bbox[1] = viewExtent.yMinimum(); bbox[2] = viewExtent.xMaximum(); bbox[3] = viewExtent.yMaximum();


pal::PalStat* stat = 0;
//set map units
pal::Units mapUnits;
switch ( unitType )
@@ -132,8 +131,7 @@ void QgsPALObjectPositionManager::findObjectPositions( const QgsRenderContext& r
mPositionEngine.setMapUnit( mapUnits );
mPositionEngine.setDpi( renderContext.scaleFactor() * 25.4 );

std::list<pal::LabelPosition*>* resultLabelList = mPositionEngine.labeller( renderContext.rendererScale(), bbox, &stat, false );
delete stat;
std::list<pal::LabelPosition*>* resultLabelList = mPositionEngine.labeller( renderContext.rendererScale(), bbox, NULL, false );

//and read the positions back to the overlay objects
if ( !resultLabelList )

0 comments on commit 3da9fc4

Please sign in to comment.
You can’t perform that action at this time.