@@ -206,7 +206,6 @@ namespace pal
206
206
QLinkedList<Feats*>* fFeats ;
207
207
RTree<PointSet*, double , 2 , double > *obstacles;
208
208
RTree<LabelPosition*, double , 2 , double > *candidates;
209
- double priority;
210
209
double bbox_min[2 ];
211
210
double bbox_max[2 ];
212
211
} FeatCallBackCtx;
@@ -275,7 +274,7 @@ namespace pal
275
274
ft->shape = NULL ;
276
275
ft->nblp = nblp;
277
276
ft->lPos = lPos;
278
- ft->priority = context-> priority ;
277
+ ft->priority = ft_ptr-> getFeature ()-> calculatePriority () ;
279
278
context->fFeats ->append ( ft );
280
279
}
281
280
else
@@ -320,7 +319,7 @@ namespace pal
320
319
return true ;
321
320
}
322
321
323
- Problem* Pal::extract ( int nbLayers, const QStringList& layersName, double *layersFactor, double lambda_min, double phi_min, double lambda_max, double phi_max, double scale )
322
+ Problem* Pal::extract ( int nbLayers, const QStringList& layersName, double lambda_min, double phi_min, double lambda_max, double phi_max, double scale )
324
323
{
325
324
// to store obstacles
326
325
RTree<PointSet*, double , 2 , double > *obstacles = new RTree<PointSet*, double , 2 , double >();
@@ -399,7 +398,6 @@ namespace pal
399
398
400
399
401
400
context->layer = layer;
402
- context->priority = layersFactor[i];
403
401
// lookup for feature (and generates candidates list)
404
402
405
403
context->layer ->mMutex .lock ();
@@ -614,29 +612,26 @@ namespace pal
614
612
int nbLayers = layers->size ();
615
613
616
614
QStringList layersName;
617
- double *priorities = new double [nbLayers];
618
615
Layer *layer;
619
616
i = 0 ;
620
617
for ( QList<Layer*>::iterator it = layers->begin (); it != layers->end (); ++it )
621
618
{
622
619
layer = *it;
623
620
layersName << layer->name ;
624
- priorities[i] = layer->defaultPriority ;
625
621
i++;
626
622
}
627
623
mMutex .unlock ();
628
624
629
- std::list<LabelPosition*> * solution = labeller ( nbLayers, layersName, priorities, scale, bbox, stats, displayAll );
625
+ std::list<LabelPosition*> * solution = labeller ( nbLayers, layersName, scale, bbox, stats, displayAll );
630
626
631
- delete[] priorities;
632
627
return solution;
633
628
}
634
629
635
630
636
631
/*
637
632
* BIG MACHINE
638
633
*/
639
- std::list<LabelPosition*>* Pal::labeller ( int nbLayers, const QStringList& layersName, double *layersFactor, double scale, double bbox[4 ], PalStat **stats, bool displayAll )
634
+ std::list<LabelPosition*>* Pal::labeller ( int nbLayers, const QStringList& layersName, double scale, double bbox[4 ], PalStat **stats, bool displayAll )
640
635
{
641
636
#ifdef _DEBUG_
642
637
std::cout << " LABELLER (selection)" << std::endl;
@@ -662,7 +657,7 @@ namespace pal
662
657
663
658
// First, extract the problem
664
659
// TODO which is the minimum scale? (> 0, >= 0, >= 1, >1 )
665
- if ( scale < 1 || ( prob = extract ( nbLayers, layersName, layersFactor, bbox[0 ], bbox[1 ], bbox[2 ], bbox[3 ], scale ) ) == NULL )
660
+ if ( scale < 1 || ( prob = extract ( nbLayers, layersName, bbox[0 ], bbox[1 ], bbox[2 ], bbox[3 ], scale ) ) == NULL )
666
661
{
667
662
668
663
#ifdef _VERBOSE_
@@ -750,21 +745,17 @@ namespace pal
750
745
int nbLayers = layers->size ();
751
746
752
747
QStringList layersName;
753
- double *priorities = new double [nbLayers];
754
748
Layer *layer;
755
749
int i = 0 ;
756
750
for ( QList<Layer*>::iterator it = layers->begin (); it != layers->end (); ++it )
757
751
{
758
752
layer = *it;
759
753
layersName << layer->name ;
760
- priorities[i] = layer->defaultPriority ;
761
754
i++;
762
755
}
763
756
mMutex .unlock ();
764
757
765
- Problem* prob = extract ( nbLayers, layersName, priorities, bbox[0 ], bbox[1 ], bbox[2 ], bbox[3 ], scale );
766
-
767
- delete[] priorities;
758
+ Problem* prob = extract ( nbLayers, layersName, bbox[0 ], bbox[1 ], bbox[2 ], bbox[3 ], scale );
768
759
769
760
return prob;
770
761
}
0 commit comments