diff --git a/crlcore/etc/display.xml b/crlcore/etc/display.xml
index 74a315f7..c3e47a3c 100644
--- a/crlcore/etc/display.xml
+++ b/crlcore/etc/display.xml
@@ -4,7 +4,7 @@
true
Alliance Coriolis Look - black background
- 3.0
+
+
@@ -109,7 +110,7 @@
Alliance Standard Look - black background
- 3.0
+
@@ -177,7 +178,7 @@
Alliance.Classic [black]
Alliance Standard Look - white background
- 3.0
+
@@ -196,7 +197,7 @@
Alliance.Coriolis [black]
Ispd Global Route Look - black background
- 3.0
+
@@ -210,7 +211,7 @@
Alliance.Coriolis [black]
Useful for debugging layout - black background
- 3.0
+
@@ -239,7 +240,7 @@
Layout Design
Useful for debugging layout - white background
- 3.0
+
@@ -253,7 +254,7 @@
Coriolis Look for Printers
- 3.0
+
diff --git a/crlcore/etc/tools.configuration.xml b/crlcore/etc/tools.configuration.xml
index 3f8937fc..5cbfb45b 100644
--- a/crlcore/etc/tools.configuration.xml
+++ b/crlcore/etc/tools.configuration.xml
@@ -75,13 +75,13 @@
-
-
-
-
-
-
-
+
+
+
+
+
+
+
diff --git a/crlcore/src/ccore/GraphicsParser.cpp b/crlcore/src/ccore/GraphicsParser.cpp
index 01289133..ec515de4 100644
--- a/crlcore/src/ccore/GraphicsParser.cpp
+++ b/crlcore/src/ccore/GraphicsParser.cpp
@@ -4,20 +4,14 @@
# include
# include
-
# include
-
# include "hurricane/viewer/DisplayStyle.h"
# include "hurricane/viewer/Graphics.h"
-
# include "crlcore/GraphicsParser.h"
-
-
namespace CRL {
-
using Hurricane::Graphics;
@@ -53,9 +47,26 @@ namespace CRL {
void GraphicsParser::parseDarkening ()
{
- int darkening = (int)( readTextAsDouble() * 100 );
+ QString attribute;
+ float hue = 1.0;
+ float saturation = 1.0;
+ float value = 1.0;
- _displayStyle->setDarkening ( darkening );
+ attribute = _reader->attributes().value("hue").toString();
+ if ( not attribute.isEmpty() )
+ hue = attribute.toFloat ();
+
+ attribute = _reader->attributes().value("saturation").toString();
+ if ( not attribute.isEmpty() )
+ saturation = attribute.toFloat ();
+
+ attribute = _reader->attributes().value("value").toString();
+ if ( not attribute.isEmpty() )
+ value = attribute.toFloat ();
+
+ _displayStyle->setDarkening ( DisplayStyle::HSVr(hue,saturation,value) );
+
+ parseNoChilds ();
}
diff --git a/crlcore/src/ccore/toolbox/RoutingPads.cpp b/crlcore/src/ccore/toolbox/RoutingPads.cpp
index 36411c63..4f307e07 100644
--- a/crlcore/src/ccore/toolbox/RoutingPads.cpp
+++ b/crlcore/src/ccore/toolbox/RoutingPads.cpp
@@ -209,7 +209,7 @@ void createPlacedRoutingPadsAndPinsRing ( Cell* top_cell )
for_each_occurrence ( plugOccurrence, HyperNet(netOccurrence).getLeafPlugOccurrences() )
{
ltrace(58) << "Creating Routing Pad " << plugOccurrence << endl;ltracein(58);
- cerr << createRoutingPad ( net, plugOccurrence ) << endl;
+ cerr << RoutingPad::create ( net, plugOccurrence, RoutingPad::BiggestArea ) << endl;
//ltraceout(58);
end_for;
}
@@ -219,7 +219,7 @@ void createPlacedRoutingPadsAndPinsRing ( Cell* top_cell )
end_for
}
for ( unsigned i = 0 ; i < pins.size() ; i++ ) {
- createRoutingPad ( pins[i] );
+ RoutingPad::create ( pins[i] );
}
Component* previousComponent=NULL;