0021941: [CEA 699] Use for Auto Color method on mesh group the same

algorithm that this one in GEOM which define colors (note 15888)

In AutoColor(), pass a generated color to a group

diff --git a/src/SMESHGUI/SMESHGUI.cxx b/src/SMESHGUI/SMESHGUI.cxx
index 120e2c8038c0ad379b2489e4f8bd271107eaec2e..ee7675db7a088e19a7b2496feef8d6eb4166c03d 100644 (file)
--- a/src/SMESHGUI/SMESHGUI.cxx
+++ b/src/SMESHGUI/SMESHGUI.cxx
@@ -923,7 +923,8 @@
     }
   }
 
     }
   }
 

-  void AutoColor(){
+  void AutoColor()
+  {

     SALOME_ListIO selected;
     SalomeApp_Application* app = dynamic_cast< SalomeApp_Application* >( SUIT_Session::session()->activeApplication() );
     if( !app )
     SALOME_ListIO selected;
     SalomeApp_Application* app = dynamic_cast< SalomeApp_Application* >( SUIT_Session::session()->activeApplication() );
     if( !app )


@@ -946,6 +947,8 @@
     if( aMainObject->_is_nil() )
       return;
 
     if( aMainObject->_is_nil() )
       return;
 

+    SUIT_OverrideCursor wc;
+

     aMainObject->SetAutoColor( true ); // mesh groups are re-colored here
 
     QList<SALOMEDS::Color> aReservedColors;
     aMainObject->SetAutoColor( true ); // mesh groups are re-colored here
 
     QList<SALOMEDS::Color> aReservedColors;


@@ -962,6 +965,7 @@
       SALOMEDS::Color aColor = SMESHGUI::getUniqueColor( aReservedColors );
       aReservedColors.append( aColor );
 #endif                    // SIMPLE_AUTOCOLOR
       SALOMEDS::Color aColor = SMESHGUI::getUniqueColor( aReservedColors );
       aReservedColors.append( aColor );
 #endif                    // SIMPLE_AUTOCOLOR

+      aGroupObject->SetColor( aColor );

 
       _PTR(SObject) aGroupSObject = SMESH::FindSObject(aGroupObject);
       if (aGroupSObject) {
 
       _PTR(SObject) aGroupSObject = SMESH::FindSObject(aGroupObject);
       if (aGroupSObject) {