diff --git a/hurricane/src/hurricane/QuadTree.cpp b/hurricane/src/hurricane/QuadTree.cpp index d88fea7b..6c71f513 100644 --- a/hurricane/src/hurricane/QuadTree.cpp +++ b/hurricane/src/hurricane/QuadTree.cpp @@ -865,9 +865,13 @@ void QuadTree_GosUnder::Locator::progress() // if (isValid()) { // if (( (getElement()->getBoundingBox().getWidth () < _threshold) // and (getElement()->getBoundingBox().getHeight() < _threshold)) ) - // cerr << " goUnders: pruning " << getElement() << endl; + // cerr << " goUnders: pruning " << DbU::getValueString(_threshold) + // << " " << getElement() << endl; // else - // cerr << " goUnders: display " << getElement() << endl; + // cerr << " goUnders: display " << DbU::getValueString(_threshold) + // << " w:" << DbU::getValueString(getElement()->getBoundingBox().getWidth ()) + // << " h:" << DbU::getValueString(getElement()->getBoundingBox().getHeight()) + // << " " << getElement() << endl; // } } while ( isValid() and ( not getElement()->getBoundingBox().intersect(_area) diff --git a/hurricane/src/viewer/CellPrinter.cpp b/hurricane/src/viewer/CellPrinter.cpp index 31ebe9e7..082eae62 100644 --- a/hurricane/src/viewer/CellPrinter.cpp +++ b/hurricane/src/viewer/CellPrinter.cpp @@ -82,6 +82,7 @@ namespace Hurricane { setCentralWidget( _cellWidget ); _palette->readGraphics (); + _cellWidget->setPixelThreshold( 1 ); _cellWidget->setPrinter( true ); _cellWidget->bindToPalette( _palette ); _cellWidget->refresh(); diff --git a/hurricane/src/viewer/CellWidget.cpp b/hurricane/src/viewer/CellWidget.cpp index 998a67af..3a02cee2 100644 --- a/hurricane/src/viewer/CellWidget.cpp +++ b/hurricane/src/viewer/CellWidget.cpp @@ -676,7 +676,7 @@ namespace Hurricane { rectangle = _cellWidget->dbuToScreenRect( bb ); if (component->isNonRectangle()) { - if ( (rectangle.width() > 4) and (rectangle.height() > 4) ) { + if ( (rectangle.width() > 4) or (rectangle.height() > 4) ) { QPolygon contour; for ( Point point : component->getContour() ) contour << _cellWidget->dbuToScreenPoint( transformation.getPoint(point) ); diff --git a/hurricane/src/viewer/hurricane/viewer/CellWidget.h b/hurricane/src/viewer/hurricane/viewer/CellWidget.h index bc975ac3..cfb203ea 100644 --- a/hurricane/src/viewer/hurricane/viewer/CellWidget.h +++ b/hurricane/src/viewer/hurricane/viewer/CellWidget.h @@ -151,6 +151,7 @@ namespace Hurricane { inline bool showBoundaries () const; inline bool showSelection () const; inline bool cumulativeSelection () const; + inline void setPixelThreshold ( int ); inline void setDbuMode ( int ); inline void setUnitPower ( DbU::UnitPower ); inline void setRubberShape ( RubberShape ); @@ -1114,9 +1115,14 @@ namespace Hurricane { { return _scaleHistory[_ihistory]._scale; } + inline void CellWidget::setPixelThreshold ( int pixelThreshold ) + { _pixelThreshold = pixelThreshold; } + + inline int CellWidget::getPixelThreshold () const { return _pixelThreshold; } + inline CellWidget::FindStateName::FindStateName ( const Name& cellHierName ) : unary_function< const shared_ptr&, bool >() , _cellHierName(cellHierName)