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

* ./crlcore: 

- New: In GraphicsParser, read the new darkening scheme (HSV ratio).
        "display.xml" configuaration file modificated accordingly. May be some
        tuning needed for white background styles.
This commit is contained in:
Jean-Paul Chaput 2010-12-30 18:39:26 +00:00
parent f7721dd754
commit beae7fb97e
4 changed files with 37 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
crlcore/etc/display.xml
View File

@ -4,7 +4,7 @@
<displaystyle name="Alliance.Coriolis [black]"> <displaystyle name="Alliance.Coriolis [black]">
<default>true</default> <default>true</default>
<description>Alliance Coriolis Look - black background</description> <description>Alliance Coriolis Look - black background</description>
<darkening>3.0</darkening> <darkening hue="1.0" saturation="3.0" value="2.5"/>
<!-- Patterns: <!-- Patterns:
Poids 01010101 aa55aa55aa55aa55 nImplant Poids 01010101 aa55aa55aa55aa55 nImplant
10101010 pImplant 10101010 pImplant
@ -92,7 +92,8 @@
<displaystyle name="Alliance.Coriolis [white]"> <displaystyle name="Alliance.Coriolis [white]">
<inherit>Alliance.Coriolis [black]</inherit> <inherit>Alliance.Coriolis [black]</inherit>
<description>Alliance Coriolis Look - white background</description> <description>Alliance Coriolis Look - white background</description>
<darkening>0.8</darkening> <!-- <darkening>0.8</darkening> -->
<darkening hue="1.0" saturation="3.0" value="2.5"/>
<group name="Viewer"> <group name="Viewer">
<drawingstyle name="fallback" color="0,0,0" border="1" pattern="55AA55AA55AA55AA"/> <drawingstyle name="fallback" color="0,0,0" border="1" pattern="55AA55AA55AA55AA"/>
<drawingstyle name="background" color="255,255,255" border="1"/> <drawingstyle name="background" color="255,255,255" border="1"/>
@ -109,7 +110,7 @@
</displaystyle> </displaystyle>
<displaystyle name="Alliance.Classic [black]"> <displaystyle name="Alliance.Classic [black]">
<description>Alliance Standard Look - black background</description> <description>Alliance Standard Look - black background</description>
<darkening>3.0</darkening> <darkening hue="1.0" saturation="3.0" value="2.5"/>
<group name="Viewer"> <group name="Viewer">
<drawingstyle name="fallback" color="238,238,238" border="1" pattern="55AA55AA55AA55AA"/> <drawingstyle name="fallback" color="238,238,238" border="1" pattern="55AA55AA55AA55AA"/>
<drawingstyle name="background" color="50,50,50" border="1"/> <drawingstyle name="background" color="50,50,50" border="1"/>
@ -177,7 +178,7 @@
<displaystyle name="Alliance.Classic [white]"> <displaystyle name="Alliance.Classic [white]">
<inherit>Alliance.Classic [black]</inherit> <inherit>Alliance.Classic [black]</inherit>
<description>Alliance Standard Look - white background</description> <description>Alliance Standard Look - white background</description>
<darkening>3.0</darkening> <darkening hue="1.0" saturation="3.0" value="2.5"/>
<group name="Viewer"> <group name="Viewer">
<drawingstyle name="fallback" color="0,0,0" border="1" pattern="55AA55AA55AA55AA"/> <drawingstyle name="fallback" color="0,0,0" border="1" pattern="55AA55AA55AA55AA"/>
<drawingstyle name="background" color="255,255,255" border="1"/> <drawingstyle name="background" color="255,255,255" border="1"/>
@ -196,7 +197,7 @@
<displaystyle name="Ispd Global Route"> <displaystyle name="Ispd Global Route">
<inherit>Alliance.Coriolis [black]</inherit> <inherit>Alliance.Coriolis [black]</inherit>
<description>Ispd Global Route Look - black background</description> <description>Ispd Global Route Look - black background</description>
<darkening>3.0</darkening> <darkening hue="1.0" saturation="3.0" value="2.5"/>
<group name="Viewer"> <group name="Viewer">
<drawingstyle name="background" color="0,0,0" border="1"/> <drawingstyle name="background" color="0,0,0" border="1"/>
<drawingstyle name="rubber" color="192,0,192" border="1" threshold="0"/> <drawingstyle name="rubber" color="192,0,192" border="1" threshold="0"/>
@ -210,7 +211,7 @@
<displaystyle name="Layout Design"> <displaystyle name="Layout Design">
<inherit>Alliance.Coriolis [black]</inherit> <inherit>Alliance.Coriolis [black]</inherit>
<description>Useful for debugging layout - black background</description> <description>Useful for debugging layout - black background</description>
<darkening>3.0</darkening> <darkening hue="1.0" saturation="3.0" value="2.5"/>
<group name="Active Layers"> <group name="Active Layers">
<drawingstyle name="nWell" color="210,180,140" pattern="0000000000000000" threshold="1.50" border="2"/> <drawingstyle name="nWell" color="210,180,140" pattern="0000000000000000" threshold="1.50" border="2"/>
<drawingstyle name="pWell" color="255,255,224" pattern="0000000000000000" threshold="1.50" border="2"/> <drawingstyle name="pWell" color="255,255,224" pattern="0000000000000000" threshold="1.50" border="2"/>
@ -239,7 +240,7 @@
<displaystyle name="Layout Design White"> <displaystyle name="Layout Design White">
<inherit>Layout Design</inherit> <inherit>Layout Design</inherit>
<description>Useful for debugging layout - white background</description> <description>Useful for debugging layout - white background</description>
<darkening>3.0</darkening> <darkening hue="1.0" saturation="3.0" value="2.5"/>
<group name="Viewer"> <group name="Viewer">
<drawingstyle name="background" color="255,255,255" border="1"/> <drawingstyle name="background" color="255,255,255" border="1"/>
<drawingstyle name="grid" color="0,0,0" border="1" threshold="2.0"/> <drawingstyle name="grid" color="0,0,0" border="1" threshold="2.0"/>
@ -253,7 +254,7 @@
</displaystyle> </displaystyle>
<displaystyle name="Printer.Coriolis"> <displaystyle name="Printer.Coriolis">
<description>Coriolis Look for Printers</description> <description>Coriolis Look for Printers</description>
<darkening>3.0</darkening> <darkening hue="1.0" saturation="3.0" value="2.5"/>
<group name="Viewer"> <group name="Viewer">
<drawingstyle name="fallback" color="238,238,238" border="1" pattern="55AA55AA55AA55AA"/> <drawingstyle name="fallback" color="238,238,238" border="1" pattern="55AA55AA55AA55AA"/>
<drawingstyle name="background" color="255,255,255" border="1"/> <drawingstyle name="background" color="255,255,255" border="1"/>

14
crlcore/etc/tools.configuration.xml
View File

@ -75,13 +75,13 @@
<!-- Kite --> <!-- Kite -->
<parameter id="kite.edgeCapacity" type="percentage" value="65" min="0" max="100"/> <parameter id="kite.edgeCapacity" type="percentage" value="65" min="0" max="100"/>
<parameter id="kite.expandStep" type="percentage" value="100" min="0" max="100"/> <parameter id="kite.expandStep" type="percentage" value="100" min="0" max="100"/>
<parameter id="kite.metal1MinBreak" type="int" value="100"/> <parameter id="kite.metal1MinBreak" type="double" value="100"/>
<parameter id="kite.metal2MinBreak" type="int" value="100"/> <parameter id="kite.metal2MinBreak" type="double" value="100"/>
<parameter id="kite.metal3MinBreak" type="int" value="100"/> <parameter id="kite.metal3MinBreak" type="double" value="100"/>
<parameter id="kite.metal4MinBreak" type="int" value="1450"/> <parameter id="kite.metal4MinBreak" type="double" value="500"/>
<parameter id="kite.metal5MinBreak" type="int" value="1450"/> <parameter id="kite.metal5MinBreak" type="double" value="1450"/>
<parameter id="kite.metal6MinBreak" type="int" value="1450"/> <parameter id="kite.metal6MinBreak" type="double" value="1450"/>
<parameter id="kite.metal7MinBreak" type="int" value="1450"/> <parameter id="kite.metal7MinBreak" type="double" value="1450"/>
<parameter id="kite.ripupCost" type="int" value="3" min="0"/> <parameter id="kite.ripupCost" type="int" value="3" min="0"/>
<parameter id="kite.borderRipupLimit" type="int" value="26" min="1"/> <parameter id="kite.borderRipupLimit" type="int" value="26" min="1"/>
<parameter id="kite.strapRipupLimit" type="int" value="16" min="1"/> <parameter id="kite.strapRipupLimit" type="int" value="16" min="1"/>

27
crlcore/src/ccore/GraphicsParser.cpp
View File

@ -4,20 +4,14 @@
# include <cassert> # include <cassert>
# include <string> # include <string>
# include <QXmlStreamReader> # include <QXmlStreamReader>
# include "hurricane/viewer/DisplayStyle.h" # include "hurricane/viewer/DisplayStyle.h"
# include "hurricane/viewer/Graphics.h" # include "hurricane/viewer/Graphics.h"
# include "crlcore/GraphicsParser.h" # include "crlcore/GraphicsParser.h"
namespace CRL { namespace CRL {
using Hurricane::Graphics; using Hurricane::Graphics;
@ -53,9 +47,26 @@ namespace CRL {
void GraphicsParser::parseDarkening () 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 ();
} }

4
crlcore/src/ccore/toolbox/RoutingPads.cpp
View File

@ -209,7 +209,7 @@ void createPlacedRoutingPadsAndPinsRing ( Cell* top_cell )
for_each_occurrence ( plugOccurrence, HyperNet(netOccurrence).getLeafPlugOccurrences() ) for_each_occurrence ( plugOccurrence, HyperNet(netOccurrence).getLeafPlugOccurrences() )
{ {
ltrace(58) << "Creating Routing Pad " << plugOccurrence << endl;ltracein(58); ltrace(58) << "Creating Routing Pad " << plugOccurrence << endl;ltracein(58);
cerr << createRoutingPad ( net, plugOccurrence ) << endl; cerr << RoutingPad::create ( net, plugOccurrence, RoutingPad::BiggestArea ) << endl;
//ltraceout(58); //ltraceout(58);
end_for; end_for;
} }
@ -219,7 +219,7 @@ void createPlacedRoutingPadsAndPinsRing ( Cell* top_cell )
end_for end_for
} }
for ( unsigned i = 0 ; i < pins.size() ; i++ ) { for ( unsigned i = 0 ; i < pins.size() ; i++ ) {
createRoutingPad ( pins[i] ); RoutingPad::create ( pins[i] );
} }
Component* previousComponent=NULL; Component* previousComponent=NULL;