From a5d92ecc295b20929872873ec05021c0a8a7de2c Mon Sep 17 00:00:00 2001 From: Jean-Paul Chaput Date: Wed, 26 Jan 2022 19:31:01 +0100 Subject: [PATCH] Beautification, display "boundaries" below everything else. * Change: In CellWidget::_redraw(), the boundaries, that is, instances abutment boxes where drawn *after* everything else, so they where hiding more interesting informations (especially at low zoom level) like routing wires. Now draw them *first* so they are *below*. --- hurricane/src/viewer/CellWidget.cpp | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/hurricane/src/viewer/CellWidget.cpp b/hurricane/src/viewer/CellWidget.cpp index 3a02cee2..d1d5e79c 100644 --- a/hurricane/src/viewer/CellWidget.cpp +++ b/hurricane/src/viewer/CellWidget.cpp @@ -1368,6 +1368,20 @@ namespace Hurricane { _drawingQuery.setTransformation ( Transformation() ); _drawingQuery.setThreshold ( screenToDbuLength(_pixelThreshold) ); + if ( /*not timeout("redraw [boundaries]",timer,10.0,timedout) and*/ (not _redrawManager.interrupted()) ) { + if (isDrawable("boundaries")) { + _drawingPlanes.setPen ( Graphics::getPen ("boundaries",getDarkening()) ); + _drawingPlanes.setBrush( Graphics::getBrush("boundaries",getDarkening()) ); + + _drawingQuery.setBasicLayer( NULL ); + _drawingQuery.setFilter ( getQueryFilter().unset(Query::DoComponents + |Query::DoRubbers + |Query::DoMarkers + |Query::DoExtensionGos) ); + _drawingQuery.doQuery (); + } + } + for ( BasicLayer* layer : _technology->getBasicLayers() ) { _drawingPlanes.setPen ( Graphics::getPen (layer->getName(),getDarkening()) ); _drawingPlanes.setBrush( Graphics::getBrush(layer->getName(),getDarkening()) ); @@ -1388,20 +1402,6 @@ namespace Hurricane { //if ( timeout("redraw [layer]",timer,10.0,timedout) ) break; } - if ( /*not timeout("redraw [boundaries]",timer,10.0,timedout) and*/ (not _redrawManager.interrupted()) ) { - if (isDrawable("boundaries")) { - _drawingPlanes.setPen ( Graphics::getPen ("boundaries",getDarkening()) ); - _drawingPlanes.setBrush( Graphics::getBrush("boundaries",getDarkening()) ); - - _drawingQuery.setBasicLayer( NULL ); - _drawingQuery.setFilter ( getQueryFilter().unset(Query::DoComponents - |Query::DoRubbers - |Query::DoMarkers - |Query::DoExtensionGos) ); - _drawingQuery.doQuery (); - } - } - _drawingQuery.setStopLevel( _state->getStartLevel() + 1 ); if ( /*not timeout("redraw [markers]",timer,10.0,timedout) and*/ (not _redrawManager.interrupted()) ) { if ( isDrawable("text.reference") ) {