[QGIS Commit] r11020 - branches/symbology-ng-branch/src/core/pal

[svn_qgis at osgeo.org]

Author: wonder
Date: 2009-07-04 16:06:42 -0400 (Sat, 04 Jul 2009)
New Revision: 11020

Modified:
   branches/symbology-ng-branch/src/core/pal/feature.cpp
   branches/symbology-ng-branch/src/core/pal/feature.h
   branches/symbology-ng-branch/src/core/pal/layer.cpp
   branches/symbology-ng-branch/src/core/pal/layer.h
Log:
pal: don't convert distance from feature, leave it up to caller to specify exact distance


Modified: branches/symbology-ng-branch/src/core/pal/feature.cpp
===================================================================
--- branches/symbology-ng-branch/src/core/pal/feature.cpp	2009-07-04 13:35:36 UTC (rev 11019)
+++ branches/symbology-ng-branch/src/core/pal/feature.cpp	2009-07-04 20:06:42 UTC (rev 11020)
@@ -189,10 +189,10 @@
     //if (nbp==2)
     //   beta = M_PI/2;
 
-    double distlabel = unit_convert( this->distlabel,
+    /*double distlabel =  unit_convert( this->distlabel,
                                      pal::PIXEL,
                                      layer->pal->map_unit,
-                                     dpi, scale, delta_width );
+                                     dpi, scale, delta_width );*/
 
     double lx, ly; /* label pos */
 
@@ -335,10 +335,10 @@
                         dpi, scale, delta_width );
 
 
-    double distlabel = unit_convert( this->distlabel,
+    /*double distlabel = unit_convert( this->distlabel,
                                      pal::PIXEL,
                                      layer->pal->map_unit,
-                                     dpi, scale, delta_width );
+                                     dpi, scale, delta_width );*/
 
 
     double *d; // segments lengths distance bw pt[i] && pt[i+1]

Modified: branches/symbology-ng-branch/src/core/pal/feature.h
===================================================================
--- branches/symbology-ng-branch/src/core/pal/feature.h	2009-07-04 13:35:36 UTC (rev 11019)
+++ branches/symbology-ng-branch/src/core/pal/feature.h	2009-07-04 20:06:42 UTC (rev 11020)
@@ -84,7 +84,7 @@
       char *uid;
       Layer *layer;
 
-      int distlabel;
+      double distlabel;
 
       GEOSGeometry *the_geom;
       int currentAccess;

Modified: branches/symbology-ng-branch/src/core/pal/layer.cpp
===================================================================
--- branches/symbology-ng-branch/src/core/pal/layer.cpp	2009-07-04 13:35:36 UTC (rev 11019)
+++ branches/symbology-ng-branch/src/core/pal/layer.cpp	2009-07-04 20:06:42 UTC (rev 11020)
@@ -422,7 +422,7 @@
     return NULL;
 }
 
-void Layer::setFeatureDistlabel( const char * geom_id, int distlabel )
+void Layer::setFeatureDistlabel( const char * geom_id, double distlabel )
 {
   int i;
 
@@ -459,7 +459,7 @@
 }
 
 
-int Layer::getFeatureDistlabel( const char *geom_id )
+double Layer::getFeatureDistlabel( const char *geom_id )
 {
   modMutex->lock();
   Cell<Feature*>* it = getFeatureIt( geom_id );

Modified: branches/symbology-ng-branch/src/core/pal/layer.h
===================================================================
--- branches/symbology-ng-branch/src/core/pal/layer.h	2009-07-04 13:35:36 UTC (rev 11019)
+++ branches/symbology-ng-branch/src/core/pal/layer.h	2009-07-04 20:06:42 UTC (rev 11020)
@@ -326,7 +326,7 @@
        * @throws PalException::UnknownFeature
        * @throws PalException::ValueNotInRange
        */
-      void setFeatureDistlabel( const char *geom_id, int distlabel );
+      void setFeatureDistlabel( const char *geom_id, double distlabel );
 
       /**
        * \brief get the symbol size (pixel) for a specific feature
@@ -336,7 +336,7 @@
        *
        * @throws PalException::UnknownFeature
        */
-      int getFeatureDistlabel( const char *geom_id );
+      double getFeatureDistlabel( const char *geom_id );
 
   };