jcarr
/
coriolis
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* ./knik: 

- Change: In GraphicKnikEngine, uses the new darken mechanism.
This commit is contained in:
Jean-Paul Chaput 2010-12-30 18:40:30 +00:00
parent beae7fb97e
commit 5b06b19fd6
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
knik/src/GraphicKnikEngine.cpp
View File

@ -78,7 +78,7 @@ namespace Knik {
QPainter& painter = widget->getPainter(); QPainter& painter = widget->getPainter();
if ( edge->getRealOccupancy() > edge->getCapacity() ) { if ( edge->getRealOccupancy() > edge->getCapacity() ) {
QColor color (Qt::cyan); 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.setBrush ( Graphics::getColorScale(ColorScale::Fire).getBrush(occupancy,widget->getDarkening()) );
painter.drawRect ( widget->dbuToDisplayRect(edge->getBoundingBox(), false) ); painter.drawRect ( widget->dbuToDisplayRect(edge->getBoundingBox(), false) );
@ -87,7 +87,7 @@ namespace Knik {
// affichage des infos de l'arete // affichage des infos de l'arete
if ( edge->hasInfo() ) { if ( edge->hasInfo() ) {
QColor color (Qt::blue); QColor color (Qt::blue);
painter.setPen (color.darker(widget->getDarkening())); painter.setPen (DisplayStyle::darken(color,widget->getDarkening()));
QFont font; QFont font;
font.setBold(true); font.setBold(true);
font.setPointSize(10); font.setPointSize(10);
@ -132,14 +132,14 @@ namespace Knik {
if ( vertex ) { if ( vertex ) {
QPainter& painter = widget->getPainter(); QPainter& painter = widget->getPainter();
QColor color = Qt::darkRed; QColor color = Qt::darkRed;
QPen pen (color.darker(widget->getDarkening())); QPen pen (DisplayStyle::darken(color,widget->getDarkening()));
pen.setWidth(2); pen.setWidth(2);
widget->setPen(pen); widget->setPen(pen);
painter.drawEllipse ( widget->dbuToDisplayRect ( vertex->getBoundingBox(), false ) ); painter.drawEllipse ( widget->dbuToDisplayRect ( vertex->getBoundingBox(), false ) );
if ( vertex->hasInfo() ) { if ( vertex->hasInfo() ) {
QColor color (Qt::blue); QColor color (Qt::blue);
painter.setPen (color.darker(widget->getDarkening())); painter.setPen (DisplayStyle::darken(color,widget->getDarkening()));
QFont font; QFont font;
font.setBold(true); font.setBold(true);
font.setPointSize(10); font.setPointSize(10);

2
knik/src/KnikEngine.cpp
View File

@ -208,7 +208,7 @@ void KnikEngine::initGlobalRouting()
if ( !_routingGraph ) { if ( !_routingGraph ) {
_timer.resetIncrease(); _timer.resetIncrease();
_timer.start(); _timer.start();
cmess2 << " o Create routing graph." << endl; cmess2 << " o CLOSE sessionCreate routing graph." << endl;
Cell* cell = getCell(); Cell* cell = getCell();
_routingGraph = Graph::create ( cell, _routingGrid, _benchMode, _useSegments ); _routingGraph = Graph::create ( cell, _routingGrid, _benchMode, _useSegments );
cmess2 << " - Graph size: " << _routingGraph->getXSize() cmess2 << " - Graph size: " << _routingGraph->getXSize()

4
knik/src/LoadSolution.cpp
View File

@ -425,8 +425,8 @@ namespace Knik {
SolutionParser parser ( this, loadFileName ); SolutionParser parser ( this, loadFileName );
parser.load (); parser.load ();
addMeasure<double> ( getCell(), "knikT", 0.0 ); addMeasure<double> ( getCell(), "knikT", 0.0, 8 );
addMeasure<size_t> ( getCell(), "knikS", 0 ); addMeasure<size_t> ( getCell(), "knikS", 0 , 8 );
computeSymbolicWireLength (); computeSymbolicWireLength ();
} }