* ./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.

crlcore/etc/display.xml

@@ -41,6 +41,7 @@
         <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="undef"           color="238,130,238" border="0" pattern="2244118822441188"/>
+        <drawingstyle name="mauka.container" color="139,0,139"   border="4" pattern="0000000000000000"/>
       </group>
       <group name="Active Layers">
         <drawingstyle name="nWell"    color="210,180,140" pattern="55AA55AA55AA55AA" threshold="1.50"/>

crlcore/src/ccore/CMakeLists.txt

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

crlcore/src/ccore/CellGauge.cpp

@@ -3,7 +3,7 @@
 // -*- C++ -*-
 //
 // 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
 //
 // ===================================================================
 //

crlcore/src/ccore/Utilities.cpp

@@ -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 )
 { 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()); }
 
 
+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 )
 { std::ostringstream right; right << "<" << value << ">"; return Dots(left,right.str()); }
 

crlcore/src/ccore/crlcore/CellGauge.h

@@ -2,7 +2,7 @@
 // -*- C++ -*-
 //
 // 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
 //
 // ===================================================================
 //

crlcore/src/ccore/crlcore/ToolEngine.h

@@ -2,7 +2,7 @@
 // -*- C++ -*-
 //
 // 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
 //
 // ===================================================================
 //

crlcore/src/ccore/crlcore/Utilities.h

@@ -36,6 +36,7 @@
 #include  "hurricane/Commons.h"
 #include  "hurricane/Error.h"
 #include  "hurricane/Slot.h"
+#include  "hurricane/DbU.h"
 
 
 namespace CRL {
@@ -348,10 +349,12 @@ extern mstream  cinfo;
 class  Dots {
   public:
     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          asULong      ( const std::string& left, unsigned long );
     static Dots          asSizet      ( const std::string& left, size_t );
     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          asString     ( const std::string& left, const std::string& );
   private:

crlcore/src/cyclop/CMakeLists.txt

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

crlcore/src/x2y/CMakeLists.txt

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