From c824b088be87b9fdd4b4af8bc438672a03e33fb4 Mon Sep 17 00:00:00 2001
From: Jean-Paul Chaput <Jean-Paul.Chaput@lip6.fr>
Date: Tue, 22 Jun 2010 20:38:00 +0000
Subject: [PATCH]   * ./crlcore:     - Change: In PaletteWidget, uses
 "goMatched" to hide DrawingStyle that are         not associated to a Go to
 hide/show. That is, are only pure color useds         by ExtensionGo.

---
 crlcore/etc/display.xml              |  2 +-
 crlcore/src/ccore/GraphicsParser.cpp | 22 ++++++++++++++--------
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/crlcore/etc/display.xml b/crlcore/etc/display.xml
index 2bcc8580..2d77c1bb 100644
--- a/crlcore/etc/display.xml
+++ b/crlcore/etc/display.xml
@@ -41,7 +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"/>
+        <drawingstyle name="mauka.container" color="139,0,139"   border="4" pattern="0000000000000000" goMatched="false"/>
       </group>
       <group name="Active Layers">
         <drawingstyle name="nWell"    color="210,180,140" pattern="55AA55AA55AA55AA" threshold="1.50"/>
diff --git a/crlcore/src/ccore/GraphicsParser.cpp b/crlcore/src/ccore/GraphicsParser.cpp
index b238a395..01289133 100644
--- a/crlcore/src/ccore/GraphicsParser.cpp
+++ b/crlcore/src/ccore/GraphicsParser.cpp
@@ -68,6 +68,7 @@ namespace CRL {
     int     border           = 0;
     float   threshold        = 1.0;
     Name    drawingStyleName = "unnamed";
+    bool    goMatched        = true;
     QString value;
 
     value = _reader->attributes().value("name").toString();
@@ -100,15 +101,20 @@ namespace CRL {
     if ( !value.isEmpty() )
       threshold = value.toFloat ();
 
+    value = _reader->attributes().value("goMatched").toString().toLower();
+    if      ( value == "true"  ) goMatched = true;
+    else if ( value == "false" ) goMatched = false;
+
     _displayStyle->addDrawingStyle ( _drawingGroupName
-                                    , drawingStyleName
-                                    , pattern
-                                    , red
-                                    , green
-                                    , blue
-                                    , border
-                                    , threshold
-                                    );
+                                   , drawingStyleName
+                                   , pattern
+                                   , red
+                                   , green
+                                   , blue
+                                   , border
+                                   , threshold
+                                   , goMatched
+                                   );
 
     parseNoChilds ();
   }