EgtGeomKernel 1.5c9 :

- migliorata gestione colori standard - aggiunta gestione attributi Mark - aggiunta gestione degli oggetti selezionati - modifiche ad esecutore per selezionati e variabile $SEL.
2014-03-23 12:33:48 +00:00
parent 13aadeb788
commit 155c722466
17 changed files with 949 additions and 353 deletions
@@ -19,24 +19,24 @@
 using namespace std ;

 //------------------------- Constants ----------------------------------------
-static const char* SZ_BLACK = "BLACK" ;
-static const char* SZ_GRAY = "GRAY" ;
-static const char* SZ_LGRAY = "LGRAY" ;
 static const char* SZ_WHITE = "WHITE" ;
+static const char* SZ_LGRAY = "LGRAY" ;
+static const char* SZ_GRAY = "GRAY" ;
+static const char* SZ_BLACK = "BLACK" ;
 static const char* SZ_RED = "RED" ;
-static const char* SZ_GREEN = "GREEN" ;
-static const char* SZ_BLUE = "BLUE" ;
-static const char* SZ_CYAN = "CYAN" ;
-static const char* SZ_MAGENTA = "MAGENTA" ;
+static const char* SZ_MAROON = "MAROON" ;
 static const char* SZ_YELLOW = "YELLOW" ;
-static const char* SZ_BROWN = "BROWN" ;
+static const char* SZ_OLIVE = "OLIVE" ;
+static const char* SZ_LIME = "LIME" ;
+static const char* SZ_GREEN = "GREEN" ;
+static const char* SZ_AQUA = "AQUA" ;
+static const char* SZ_TEAL = "TEAL" ;
+static const char* SZ_BLUE = "BLUE" ;
+static const char* SZ_NAVY = "NAVY" ;
+static const char* SZ_FUCHSIA = "FUCHSIA" ;
 static const char* SZ_PURPLE = "PURPLE" ;
 static const char* SZ_ORANGE = "ORANGE" ;
-static const char* SZ_LRED = "LRED" ;
-static const char* SZ_LGREEN = "LGREEN" ;
-static const char* SZ_LBLUE = "LBLUE" ;
-static const char* SZ_LCYAN = "LCYAN" ;
-static const char* SZ_LMAGENTA = "LMAGENTA" ;
+static const char* SZ_BROWN = "BROWN" ;

 //----------------------------------------------------------------------------
 bool
@@ -44,42 +44,42 @@ GetStdColor( const string& sName, Color& cCol)
 {
   string sCol = sName ;
   ToUpper( sCol) ;
-   if ( sCol == SZ_BLACK)
-      cCol = BLACK ;
-   else if ( sCol == SZ_GRAY)
-      cCol = GRAY ;
+   if ( sCol == SZ_WHITE)
+      cCol = WHITE ;
   else if ( sCol == SZ_LGRAY)
      cCol = LGRAY ;
-   else if ( sCol == SZ_WHITE)
-      cCol = WHITE ;
+   else if ( sCol == SZ_GRAY)
+      cCol = GRAY ;
+   else if ( sCol == SZ_BLACK)
+      cCol = BLACK ;
   else if ( sCol == SZ_RED)
      cCol = RED ;
-   else if ( sCol == SZ_GREEN)
-      cCol = GREEN ;
-   else if ( sCol == SZ_BLUE)
-      cCol = BLUE ;
-   else if ( sCol == SZ_CYAN)
-      cCol = CYAN ;
-   else if ( sCol == SZ_MAGENTA)
-      cCol = MAGENTA ;
+   else if ( sCol == SZ_MAROON)
+      cCol = MAROON ;
   else if ( sCol == SZ_YELLOW)
      cCol = YELLOW ;
-   else if ( sCol == SZ_BROWN)
-      cCol = BROWN ;
+   else if ( sCol == SZ_OLIVE)
+      cCol = OLIVE ;
+   else if ( sCol == SZ_LIME)
+      cCol = LIME ;
+   else if ( sCol == SZ_GREEN)
+      cCol = GREEN ;
+   else if ( sCol == SZ_AQUA)
+      cCol = AQUA ;
+   else if ( sCol == SZ_TEAL)
+      cCol = TEAL ;
+   else if ( sCol == SZ_BLUE)
+      cCol = BLUE ;
+   else if ( sCol == SZ_NAVY)
+      cCol = NAVY ;
+   else if ( sCol == SZ_FUCHSIA)
+      cCol = FUCHSIA ;
   else if ( sCol == SZ_PURPLE)
      cCol = PURPLE ;
   else if ( sCol == SZ_ORANGE)
      cCol = ORANGE ;
-   else if ( sCol == SZ_LRED)
-      cCol = LRED ;
-   else if ( sCol == SZ_LGREEN)
-      cCol = LGREEN ;
-   else if ( sCol == SZ_LBLUE)
-      cCol = LBLUE ;
-   else if ( sCol == SZ_LCYAN)
-      cCol = LCYAN ;
-   else if ( sCol == SZ_LMAGENTA)
-      cCol = LMAGENTA ;
+   else if ( sCol == SZ_BROWN)
+      cCol = BROWN ;
   else
      return false ;

@@ -88,46 +88,56 @@ GetStdColor( const string& sName, Color& cCol)

 //----------------------------------------------------------------------------
 bool
-GetNameOfStdColor( const Color& cCol, string& sName)
+GetNameOfStdColor( Color cCol, string& sName)
 {
-   if ( cCol == BLACK)
-      sName = SZ_BLACK ;
-   else if ( cCol == GRAY)
-      sName = SZ_GRAY ;
+   if ( cCol == WHITE)
+      sName = SZ_WHITE ;
   else if ( cCol == LGRAY)
      sName = SZ_LGRAY ;
-   else if ( cCol == WHITE)
-      sName = SZ_WHITE ;
+   else if ( cCol == GRAY)
+      sName = SZ_GRAY ;
+   else if ( cCol == BLACK)
+      sName = SZ_BLACK ;
   else if ( cCol == RED)
      sName = SZ_RED ;
-   else if ( cCol == GREEN)
-      sName = SZ_GREEN ;
-   else if ( cCol == BLUE)
-      sName = SZ_BLUE ;
-   else if ( cCol == CYAN)
-      sName = SZ_CYAN ;
-   else if ( cCol == MAGENTA)
-      sName = SZ_MAGENTA ;
+   else if ( cCol == MAROON)
+      sName = SZ_MAROON ;
   else if ( cCol == YELLOW)
      sName = SZ_YELLOW ;
-   else if ( cCol == BROWN)
-      sName = SZ_BROWN ;
+   else if ( cCol == OLIVE)
+      sName = SZ_OLIVE ;
+   else if ( cCol == LIME)
+      sName = SZ_LIME ;
+   else if ( cCol == GREEN)
+      sName = SZ_GREEN ;
+   else if ( cCol == AQUA)
+      sName = SZ_AQUA ;
+   else if ( cCol == TEAL)
+      sName = SZ_TEAL ;
+   else if ( cCol == BLUE)
+      sName = SZ_BLUE ;
+   else if ( cCol == NAVY)
+      sName = SZ_NAVY ;
+   else if ( cCol == FUCHSIA)
+      sName = SZ_FUCHSIA ;
   else if ( cCol == PURPLE)
      sName = SZ_PURPLE ;
   else if ( cCol == ORANGE)
      sName = SZ_ORANGE ;
-   else if ( cCol == LRED)
-      sName = SZ_LRED ;
-   else if ( cCol == LGREEN)
-      sName = SZ_LGREEN ;
-   else if ( cCol == LBLUE)
-      sName = SZ_LBLUE ;
-   else if ( cCol == LCYAN)
-      sName = SZ_LCYAN ;
-   else if ( cCol == LMAGENTA)
-      sName = SZ_LMAGENTA ;
+   else if ( cCol == BROWN)
+      sName = SZ_BROWN ;
   else
      return false ;

   return true ;
 }
+
+//----------------------------------------------------------------------------
+Color
+GetOppositeColor( Color cCol)
+{
+   return Color( MAX_RGB - cCol.GetIntRed(),
+                 MAX_RGB - cCol.GetIntGreen(),
+                 MAX_RGB - cCol.GetIntBlue(),
+                 cCol.GetIntAlpha()) ;
+}