diff --git a/knik/src/GraphicKnikEngine.cpp b/knik/src/GraphicKnikEngine.cpp index 05d5e342..2ca18930 100644 --- a/knik/src/GraphicKnikEngine.cpp +++ b/knik/src/GraphicKnikEngine.cpp @@ -78,7 +78,7 @@ namespace Knik { QPainter& painter = widget->getPainter(); if ( edge->getRealOccupancy() > edge->getCapacity() ) { QColor color (Qt::cyan); - painter.setPen (color.darker(widget->getDarkening())); + painter.setPen (DisplayStyle::darken(color,widget->getDarkening())); } painter.setBrush ( Graphics::getColorScale(ColorScale::Fire).getBrush(occupancy,widget->getDarkening()) ); painter.drawRect ( widget->dbuToDisplayRect(edge->getBoundingBox(), false) ); @@ -87,7 +87,7 @@ namespace Knik { // affichage des infos de l'arete if ( edge->hasInfo() ) { QColor color (Qt::blue); - painter.setPen (color.darker(widget->getDarkening())); + painter.setPen (DisplayStyle::darken(color,widget->getDarkening())); QFont font; font.setBold(true); font.setPointSize(10); @@ -132,14 +132,14 @@ namespace Knik { if ( vertex ) { QPainter& painter = widget->getPainter(); QColor color = Qt::darkRed; - QPen pen (color.darker(widget->getDarkening())); + QPen pen (DisplayStyle::darken(color,widget->getDarkening())); pen.setWidth(2); widget->setPen(pen); painter.drawEllipse ( widget->dbuToDisplayRect ( vertex->getBoundingBox(), false ) ); if ( vertex->hasInfo() ) { QColor color (Qt::blue); - painter.setPen (color.darker(widget->getDarkening())); + painter.setPen (DisplayStyle::darken(color,widget->getDarkening())); QFont font; font.setBold(true); font.setPointSize(10); diff --git a/knik/src/KnikEngine.cpp b/knik/src/KnikEngine.cpp index 8284bec4..976f022b 100644 --- a/knik/src/KnikEngine.cpp +++ b/knik/src/KnikEngine.cpp @@ -208,7 +208,7 @@ void KnikEngine::initGlobalRouting() if ( !_routingGraph ) { _timer.resetIncrease(); _timer.start(); - cmess2 << " o Create routing graph." << endl; + cmess2 << " o CLOSE sessionCreate routing graph." << endl; Cell* cell = getCell(); _routingGraph = Graph::create ( cell, _routingGrid, _benchMode, _useSegments ); cmess2 << " - Graph size: " << _routingGraph->getXSize() diff --git a/knik/src/LoadSolution.cpp b/knik/src/LoadSolution.cpp index 4bdb30f4..a503961f 100644 --- a/knik/src/LoadSolution.cpp +++ b/knik/src/LoadSolution.cpp @@ -425,8 +425,8 @@ namespace Knik { SolutionParser parser ( this, loadFileName ); parser.load (); - addMeasure ( getCell(), "knikT", 0.0 ); - addMeasure ( getCell(), "knikS", 0 ); + addMeasure ( getCell(), "knikT", 0.0, 8 ); + addMeasure ( getCell(), "knikS", 0 , 8 ); computeSymbolicWireLength (); }