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

* ./crlcore: 

- Bug: In CMakeLists.txt, local include directories *first*.
    - New: In Utilities, Dots::asBool() & Dots::asLambda().
    - New: In display.xml, new <drawingstyle> for Mauka Containers.
This commit is contained in:
Jean-Paul Chaput 2010-06-08 12:02:31 +00:00
parent c293c57fb8
commit 85297540fc
9 changed files with 38 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
crlcore/etc/display.xml
View File

@ -25,22 +25,23 @@
11110111 11110111
--> -->
<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"/>
<drawingstyle name="foreground" color="255,255,255" border="1"/> <drawingstyle name="foreground" color="255,255,255" border="1"/>
<drawingstyle name="rubber" color="192,0,192" border="4" threshold="0.02"/> <drawingstyle name="rubber" color="192,0,192" border="4" threshold="0.02"/>
<drawingstyle name="phantom" color="139,134,130" border="1"/> <drawingstyle name="phantom" color="139,134,130" border="1"/>
<drawingstyle name="boundaries" color="208,199,192" border="1" pattern="0000000000000000" threshold="0"/> <drawingstyle name="boundaries" color="208,199,192" border="1" pattern="0000000000000000" threshold="0"/>
<drawingstyle name="marker" color="80,250,80" border="1"/> <drawingstyle name="marker" color="80,250,80" border="1"/>
<drawingstyle name="selectionDraw" color="255,255,255" border="1"/> <drawingstyle name="selectionDraw" color="255,255,255" border="1"/>
<drawingstyle name="selectionFill" color="255,255,255" border="1"/> <drawingstyle name="selectionFill" color="255,255,255" border="1"/>
<drawingstyle name="grid" color="255,255,255" border="1" threshold="2.0"/> <drawingstyle name="grid" color="255,255,255" border="1" threshold="2.0"/>
<drawingstyle name="spot" color="255,255,255" border="2" threshold="6.0"/> <drawingstyle name="spot" color="255,255,255" border="2" threshold="6.0"/>
<drawingstyle name="ghost" color="255,255,255" border="1"/> <drawingstyle name="ghost" color="255,255,255" border="1"/>
<drawingstyle name="text.ruler" color="255,255,255" border="1" threshold="0.0"/> <drawingstyle name="text.ruler" color="255,255,255" border="1" threshold="0.0"/>
<drawingstyle name="text.instance" color="0,0,0" border="1" threshold="4.0"/> <drawingstyle name="text.instance" color="0,0,0" border="1" threshold="4.0"/>
<drawingstyle name="text.reference" color="255,255,255" border="1" threshold="20.0"/> <drawingstyle name="text.reference" color="255,255,255" border="1" threshold="20.0"/>
<drawingstyle name="undef" color="238,130,238" border="0" pattern="2244118822441188"/> <drawingstyle name="undef" color="238,130,238" border="0" pattern="2244118822441188"/>
<drawingstyle name="mauka.container" color="139,0,139" border="4" pattern="0000000000000000"/>
</group> </group>
<group name="Active Layers"> <group name="Active Layers">
<drawingstyle name="nWell" color="210,180,140" pattern="55AA55AA55AA55AA" threshold="1.50"/> <drawingstyle name="nWell" color="210,180,140" pattern="55AA55AA55AA55AA" threshold="1.50"/>

4
crlcore/src/ccore/CMakeLists.txt
View File

@ -11,8 +11,6 @@
include ( ${QT_USE_FILE} ) include ( ${QT_USE_FILE} )
include_directories ( ${CIF_INCLUDE_DIR}
${HURRICANE_INCLUDE_DIR} )
include_directories ( ${CRLCORE_SOURCE_DIR}/src/fonts include_directories ( ${CRLCORE_SOURCE_DIR}/src/fonts
${CRLCORE_SOURCE_DIR}/src/ccore ${CRLCORE_SOURCE_DIR}/src/ccore
${CRLCORE_SOURCE_DIR}/src/ccore/properties ${CRLCORE_SOURCE_DIR}/src/ccore/properties
@ -26,6 +24,8 @@
${CRLCORE_SOURCE_DIR}/src/ccore/spice ${CRLCORE_SOURCE_DIR}/src/ccore/spice
${CRLCORE_SOURCE_DIR}/src/ccore/liberty ${CRLCORE_SOURCE_DIR}/src/ccore/liberty
${CRLCORE_SOURCE_DIR}/src/ccore/toolbox ${CRLCORE_SOURCE_DIR}/src/ccore/toolbox
${HURRICANE_INCLUDE_DIR}
${CIF_INCLUDE_DIR}
) )
add_definitions ( -DCORIOLIS_TOP="${CORIOLIS_TOP}" add_definitions ( -DCORIOLIS_TOP="${CORIOLIS_TOP}"

4
crlcore/src/ccore/CellGauge.cpp
View File

@ -3,7 +3,7 @@
// -*- C++ -*- // -*- C++ -*-
// //
// This file is part of the Coriolis Software. // This file is part of the Coriolis Software.
// Copyright (c) UPMC/LIP6 2008-2008, All Rights Reserved // Copyright (c) UPMC/LIP6 2008-2010, All Rights Reserved
// //
// =================================================================== // ===================================================================
// //
@ -17,7 +17,7 @@
// | Author : Jean-Paul CHAPUT | // | Author : Jean-Paul CHAPUT |
// | E-mail : Jean-Paul.Chaput@asim.lip6.fr | // | E-mail : Jean-Paul.Chaput@asim.lip6.fr |
// | =============================================================== | // | =============================================================== |
// | C++ Header : "./CellGauge.cpp" | // | C++ Header : "./CellGauge.cpp" |
// | *************************************************************** | // | *************************************************************** |
// | U p d a t e s | // | U p d a t e s |
// | | // | |

8
crlcore/src/ccore/Utilities.cpp
View File

@ -57,6 +57,10 @@ Dots Dots::asPercentage ( const std::string& left, float value )
} }
Dots Dots::asBool ( const std::string& left, bool value )
{ std::ostringstream right; right << std::boolalpha << value; return Dots(left,right.str()); }
Dots Dots::asUInt ( const std::string& left, unsigned int value ) Dots Dots::asUInt ( const std::string& left, unsigned int value )
{ std::ostringstream right; right << value; return Dots(left,right.str()); } { std::ostringstream right; right << value; return Dots(left,right.str()); }
@ -73,6 +77,10 @@ Dots Dots::asDouble ( const std::string& left, double value )
{ std::ostringstream right; right << value; return Dots(left,right.str()); } { std::ostringstream right; right << value; return Dots(left,right.str()); }
Dots Dots::asLambda ( const std::string& left, Hurricane::DbU::Unit value )
{ std::ostringstream right; right << Hurricane::DbU::getValueString(value); return Dots(left,right.str()); }
Dots Dots::asIdentifier ( const std::string& left, const std::string& value ) Dots Dots::asIdentifier ( const std::string& left, const std::string& value )
{ std::ostringstream right; right << "<" << value << ">"; return Dots(left,right.str()); } { std::ostringstream right; right << "<" << value << ">"; return Dots(left,right.str()); }

2
crlcore/src/ccore/crlcore/CellGauge.h
View File

@ -2,7 +2,7 @@
// -*- C++ -*- // -*- C++ -*-
// //
// This file is part of the Coriolis Software. // This file is part of the Coriolis Software.
// Copyright (c) UPMC/LIP6 2008-2008, All Rights Reserved // Copyright (c) UPMC/LIP6 2008-2010, All Rights Reserved
// //
// =================================================================== // ===================================================================
// //

2
crlcore/src/ccore/crlcore/ToolEngine.h
View File

@ -2,7 +2,7 @@
// -*- C++ -*- // -*- C++ -*-
// //
// This file is part of the Coriolis Software. // This file is part of the Coriolis Software.
// Copyright (c) UPMC/LIP6 2008-2008, All Rights Reserved // Copyright (c) UPMC/LIP6 2008-2010, All Rights Reserved
// //
// =================================================================== // ===================================================================
// //

3
crlcore/src/ccore/crlcore/Utilities.h
View File

@ -36,6 +36,7 @@
#include "hurricane/Commons.h" #include "hurricane/Commons.h"
#include "hurricane/Error.h" #include "hurricane/Error.h"
#include "hurricane/Slot.h" #include "hurricane/Slot.h"
#include "hurricane/DbU.h"
namespace CRL { namespace CRL {
@ -348,10 +349,12 @@ extern mstream cinfo;
class Dots { class Dots {
public: public:
static Dots asPercentage ( const std::string& left, float ); static Dots asPercentage ( const std::string& left, float );
static Dots asBool ( const std::string& left, bool );
static Dots asUInt ( const std::string& left, unsigned int ); static Dots asUInt ( const std::string& left, unsigned int );
static Dots asULong ( const std::string& left, unsigned long ); static Dots asULong ( const std::string& left, unsigned long );
static Dots asSizet ( const std::string& left, size_t ); static Dots asSizet ( const std::string& left, size_t );
static Dots asDouble ( const std::string& left, double ); static Dots asDouble ( const std::string& left, double );
static Dots asLambda ( const std::string& left, Hurricane::DbU::Unit );
static Dots asIdentifier ( const std::string& left, const std::string& ); static Dots asIdentifier ( const std::string& left, const std::string& );
static Dots asString ( const std::string& left, const std::string& ); static Dots asString ( const std::string& left, const std::string& );
private: private:

4
crlcore/src/cyclop/CMakeLists.txt
View File

@ -1,8 +1,8 @@
include ( ${QT_USE_FILE} ) include ( ${QT_USE_FILE} )
include_directories ( ${Boost_INCLUDE_DIRS} include_directories ( ${CRLCORE_SOURCE_DIR}/src/ccore
${HURRICANE_INCLUDE_DIR} ${HURRICANE_INCLUDE_DIR}
${CRLCORE_SOURCE_DIR}/src/ccore ${Boost_INCLUDE_DIRS}
) )
set ( mocincludes Cyclop.h set ( mocincludes Cyclop.h

4
crlcore/src/x2y/CMakeLists.txt
View File

@ -1,8 +1,8 @@
include ( ${QT_USE_FILE} ) include ( ${QT_USE_FILE} )
include_directories ( ${Boost_INCLUDE_DIRS} include_directories ( ${CRLCORE_SOURCE_DIR}/src/ccore
${HURRICANE_INCLUDE_DIR} ${HURRICANE_INCLUDE_DIR}
${CRLCORE_SOURCE_DIR}/src/ccore ${Boost_INCLUDE_DIRS}
) )
set ( cpps x2y.cpp set ( cpps x2y.cpp