Color Number (Color Group) parameter is returned for compatibility

diff --git a/src/DriverMED/DriverMED_Family.cxx b/src/DriverMED/DriverMED_Family.cxx
index 46ae6549104403da0ac27c0c0ede12a86dc6ba3e..25646c67c45a768ae471f0ae52ead8a38a70ef78 100644 (file)
--- a/src/DriverMED/DriverMED_Family.cxx
+++ b/src/DriverMED/DriverMED_Family.cxx
@@ -217,7 +217,11 @@ DriverMED_Family
   ColorMap aColorMap;
   for (aGroupsIter = theGroups.begin(); aGroupsIter != theGroups.end(); aGroupsIter++)
   {
   ColorMap aColorMap;
   for (aGroupsIter = theGroups.begin(); aGroupsIter != theGroups.end(); aGroupsIter++)
   {

-    SALOMEDS::Color aColor = (*aGroupsIter)->GetColor();
+    Quantity_Color aQColor = (*aGroupsIter)->GetColor();
+    SALOMEDS::Color aColor;
+    aColor.R = aQColor.Red();
+    aColor.G = aQColor.Green();
+    aColor.B = aQColor.Blue();

 
     bool isFound = false;
     for (ColorMap::iterator aColorIter = aColorMap.begin(); aColorIter != aColorMap.end(); aColorIter++)
 
     bool isFound = false;
     for (ColorMap::iterator aColorIter = aColorMap.begin(); aColorIter != aColorMap.end(); aColorIter++)


@@ -418,8 +422,14 @@ void DriverMED_Family::Init (SMESHDS_GroupBase* theGroup, const ColorMap& theCol
   ColorMap::const_iterator aColorIter = theColorMap.begin();
   for (; aColorIter != theColorMap.end(); aColorIter++)
   {
   ColorMap::const_iterator aColorIter = theColorMap.begin();
   for (; aColorIter != theColorMap.end(); aColorIter++)
   {

+    Quantity_Color aGroupQColor = theGroup->GetColor();
+    SALOMEDS::Color aGroupColor;
+    aGroupColor.R = aGroupQColor.Red();
+    aGroupColor.G = aGroupQColor.Green();
+    aGroupColor.B = aGroupQColor.Blue();
+

     SALOMEDS::Color aColor = aColorIter->second;
     SALOMEDS::Color aColor = aColorIter->second;

-    if( CompareColors( theGroup->GetColor(), aColor ) )
+    if( CompareColors( aGroupColor, aColor ) )

     {
       myGroupAttributVal = aColorIter->first;
       break;
     {
       myGroupAttributVal = aColorIter->first;
       break;

diff --git a/src/DriverMED/DriverMED_Family.h b/src/DriverMED/DriverMED_Family.h
index 1925a34718c419d7d30649f1775e94213dd9cc21..34ada3db0323b99a77aebbf565f00f8c6671825c 100644 (file)
--- a/src/DriverMED/DriverMED_Family.h
+++ b/src/DriverMED/DriverMED_Family.h
@@ -38,6 +38,10 @@
 #include <boost/shared_ptr.hpp>
 #include <set>
 
 #include <boost/shared_ptr.hpp>
 #include <set>
 

+#include "SALOMEconfig.h"
+#include CORBA_SERVER_HEADER(SALOMEDS)
+#include CORBA_SERVER_HEADER(SALOMEDS_Attributes)
+

 #define REST_NODES_FAMILY 1
 #define REST_EDGES_FAMILY -1
 #define REST_FACES_FAMILY -2
 #define REST_NODES_FAMILY 1
 #define REST_EDGES_FAMILY -1
 #define REST_FACES_FAMILY -2

diff --git a/src/SMESH/Makefile.am b/src/SMESH/Makefile.am
index ec70356069996efa49e754d9db134b372d80eb49..8ea7e5734b8854f647ba120abbd2bac3dcd7b4d0 100644 (file)
--- a/src/SMESH/Makefile.am
+++ b/src/SMESH/Makefile.am
@@ -87,8 +87,6 @@ libSMESHimpl_la_CPPFLAGS = \
        $(GEOM_CXX_FLAGS) \
        $(BOOST_CPPFLAGS) \
        $(CAS_CPPFLAGS) \
        $(GEOM_CXX_FLAGS) \
        $(BOOST_CPPFLAGS) \
        $(CAS_CPPFLAGS) \

-       $(CORBA_CXXFLAGS) \
-        $(CORBA_INCLUDES) \

        @HDF5_INCLUDES@ \
        -I$(srcdir)/../Controls \
        -I$(srcdir)/../Driver \
        @HDF5_INCLUDES@ \
        -I$(srcdir)/../Controls \
        -I$(srcdir)/../Driver \

diff --git a/src/SMESH/SMESH_Group.hxx b/src/SMESH/SMESH_Group.hxx
index b90a798dd8727e95d37f1fab390240ee42c31bba..76f9cc0798159ef7301dd8bb072e7c65358d33ae 100644 (file)
--- a/src/SMESH/SMESH_Group.hxx
+++ b/src/SMESH/SMESH_Group.hxx
@@ -35,10 +35,6 @@
 #include <string>
 #include <TopoDS_Shape.hxx>
 
 #include <string>
 #include <TopoDS_Shape.hxx>
 

-#include "SALOMEconfig.h"
-#include CORBA_SERVER_HEADER(SALOMEDS)
-#include CORBA_SERVER_HEADER(SALOMEDS_Attributes)
-

 class SMESHDS_GroupBase;
 class SMESH_Mesh;
 
 class SMESHDS_GroupBase;
 class SMESH_Mesh;
 


@@ -59,9 +55,6 @@ class SMESH_EXPORT  SMESH_Group
 
   SMESHDS_GroupBase * GetGroupDS () { return myGroupDS; }
 
 
   SMESHDS_GroupBase * GetGroupDS () { return myGroupDS; }
 

-  void SetColor (const SALOMEDS::Color& theColor) { myColor = theColor; }
-  SALOMEDS::Color GetColor() const { return myColor; }
-

  private:
   SMESH_Group (const SMESH_Group& theOther);
   // prohibited copy constructor
  private:
   SMESH_Group (const SMESH_Group& theOther);
   // prohibited copy constructor


@@ -70,8 +63,6 @@ class SMESH_EXPORT  SMESH_Group
 
   SMESHDS_GroupBase * myGroupDS;
   std::string         myName;
 
   SMESHDS_GroupBase * myGroupDS;
   std::string         myName;

-  int                 myColorNumber;
-  SALOMEDS::Color     myColor;

 };
 
 #endif
 };
 
 #endif

diff --git a/src/SMESHDS/Makefile.am b/src/SMESHDS/Makefile.am
index 4e8c2247e000e30dde2f038eff7e77ec4e014229..23da89e2ea174da8f7494b92ac6d35061dd485d0 100644 (file)
--- a/src/SMESHDS/Makefile.am
+++ b/src/SMESHDS/Makefile.am
@@ -61,8 +61,6 @@ dist_libSMESHDS_la_SOURCES = \
 libSMESHDS_la_CPPFLAGS = \
        $(KERNEL_CXXFLAGS) \
        $(CAS_CPPFLAGS) \
 libSMESHDS_la_CPPFLAGS = \
        $(KERNEL_CXXFLAGS) \
        $(CAS_CPPFLAGS) \

-       $(CORBA_CXXFLAGS) \
-        $(CORBA_INCLUDES) \

        $(BOOST_CPPFLAGS) \
        -I$(srcdir)/../SMDS
 
        $(BOOST_CPPFLAGS) \
        -I$(srcdir)/../SMDS
 

diff --git a/src/SMESHDS/SMESHDS_GroupBase.cxx b/src/SMESHDS/SMESHDS_GroupBase.cxx
index da7b0da13f2200da883385a8651e4e73dd9c543b..5221743a9a6e3087c2ce4c3cd49af071ac2dff53 100644 (file)
--- a/src/SMESHDS/SMESHDS_GroupBase.cxx
+++ b/src/SMESHDS/SMESHDS_GroupBase.cxx
@@ -43,9 +43,7 @@ SMESHDS_GroupBase::SMESHDS_GroupBase (const int                 theID,
        myID(theID), myMesh(theMesh), myType(theType), myStoreName(""),
        myCurIndex(0), myCurID(-1)
 {
        myID(theID), myMesh(theMesh), myType(theType), myStoreName(""),
        myCurIndex(0), myCurID(-1)
 {

-  myColor.R = 0.f;
-  myColor.G = 0.f;
-  myColor.B = 0.f;
+  myColor = Quantity_Color( 0.0, 0.0, 0.0, Quantity_TOC_RGB );

 }
 
 //=============================================================================
 }
 
 //=============================================================================


@@ -151,3 +149,35 @@ void SMESHDS_GroupBase::SetType(SMDSAbs_ElementType theType)
 {
   myType = theType;
 }
 {
   myType = theType;
 }

+
+//=======================================================================
+//function : SetType
+//purpose  : 
+//=======================================================================
+
+void SMESHDS_GroupBase::SetColorGroup(int theColorGroup)
+{
+  if( theColorGroup < 0 || theColorGroup > 360 )
+  {
+    MESSAGE("SMESHDS_GroupBase::SetColorGroup : Value must be in range [0,360]");
+    return;
+  }
+
+  Quantity_Color aColor( (double)theColorGroup, 1.0, 1.0, Quantity_TOC_HLS );
+  SetColor( aColor );
+}
+  
+//=======================================================================
+//function : SetType
+//purpose  : 
+//=======================================================================
+
+int SMESHDS_GroupBase::GetColorGroup() const
+{
+  Quantity_Color aColor = GetColor();
+  double aHue = aColor.Hue();
+  if( aHue < 0 )
+    return 0;
+  return (int)( aHue );
+}
+  

diff --git a/src/SMESHDS/SMESHDS_GroupBase.hxx b/src/SMESHDS/SMESHDS_GroupBase.hxx
index 48fd791205554a7fe0307f1b5173c79a453a5276..7e2d521e0dec5b54cd6ae8b2ff06b2c121ab45f3 100644 (file)
--- a/src/SMESHDS/SMESHDS_GroupBase.hxx
+++ b/src/SMESHDS/SMESHDS_GroupBase.hxx
@@ -32,11 +32,9 @@
 #include <string>
 #include "SMDSAbs_ElementType.hxx"
 #include "SMDS_MeshElement.hxx"
 #include <string>
 #include "SMDSAbs_ElementType.hxx"
 #include "SMDS_MeshElement.hxx"

-  
-#include "SALOMEconfig.h"
-#include CORBA_SERVER_HEADER(SALOMEDS)
-#include CORBA_SERVER_HEADER(SALOMEDS_Attributes)

 
 

+#include <Quantity_Color.hxx>
+  

 class SMESHDS_Mesh;
 
 class SMESHDS_EXPORT SMESHDS_GroupBase
 class SMESHDS_Mesh;
 
 class SMESHDS_EXPORT SMESHDS_GroupBase


@@ -72,11 +70,15 @@ class SMESHDS_EXPORT SMESHDS_GroupBase
 
   virtual ~SMESHDS_GroupBase() {}
 
 
   virtual ~SMESHDS_GroupBase() {}
 

-  void SetColor (const SALOMEDS::Color& theColor)
+  void SetColor (const Quantity_Color& theColor)

   { myColor = theColor;}
   
   { myColor = theColor;}
   

-  SALOMEDS::Color GetColor() const
+  Quantity_Color GetColor() const

   { return myColor;}
   { return myColor;}

+
+  void SetColorGroup (int theColorGroup);
+
+  int GetColorGroup() const;

   
  protected:
   const SMDS_MeshElement* findInMesh (const int theID) const;
   
  protected:
   const SMDS_MeshElement* findInMesh (const int theID) const;


@@ -96,7 +98,7 @@ class SMESHDS_EXPORT SMESHDS_GroupBase
   int                  myCurIndex;
   int                  myCurID;
   SMDS_ElemIteratorPtr myIterator;
   int                  myCurIndex;
   int                  myCurID;
   SMDS_ElemIteratorPtr myIterator;

-  SALOMEDS::Color      myColor;
+  Quantity_Color       myColor;

 };
 
 #endif
 };
 
 #endif

diff --git a/src/SMESH_I/SMESH_Gen_i.cxx b/src/SMESH_I/SMESH_Gen_i.cxx
index 7e04c6408009acf8f636aeffbf665c497612e942..7d57ff91627cee4cfd92c22b0a7a1f9d54ce3a66 100644 (file)
--- a/src/SMESH_I/SMESH_Gen_i.cxx
+++ b/src/SMESH_I/SMESH_Gen_i.cxx
@@ -3502,10 +3502,7 @@ bool SMESH_Gen_i::Load( SALOMEDS::SComponent_ptr theComponent,
                double* anRGB = new double[ size ];
                aDataset->ReadFromDisk( anRGB );
                aDataset->CloseOnDisk();
                double* anRGB = new double[ size ];
                aDataset->ReadFromDisk( anRGB );
                aDataset->CloseOnDisk();

-               SALOMEDS::Color aColor;
-               aColor.R = anRGB[0];
-               aColor.G = anRGB[1];
-               aColor.B = anRGB[2];
+               Quantity_Color aColor( anRGB[0], anRGB[1], anRGB[2], Quantity_TOC_RGB );

                aGroupBaseDS->SetColor( aColor );
              }
 
                aGroupBaseDS->SetColor( aColor );
              }
 

diff --git a/src/SMESH_I/SMESH_Group_i.cxx b/src/SMESH_I/SMESH_Group_i.cxx
index 72fb270451e5db3d18933948a16b8c908be3c33c..9f4c705f3aadbe423ed1258ec8420e4b540d51ad 100644 (file)
--- a/src/SMESH_I/SMESH_Group_i.cxx
+++ b/src/SMESH_I/SMESH_Group_i.cxx
@@ -428,7 +428,15 @@ SALOMEDS::Color SMESH_GroupBase_i::GetColor()
 {
   SMESHDS_GroupBase* aGroupDS = GetGroupDS();
   if (aGroupDS)
 {
   SMESHDS_GroupBase* aGroupDS = GetGroupDS();
   if (aGroupDS)

-    return aGroupDS->GetColor();
+  {
+    Quantity_Color aQColor = aGroupDS->GetColor();
+    SALOMEDS::Color aColor;
+    aColor.R = aQColor.Red();
+    aColor.G = aQColor.Green();
+    aColor.B = aQColor.Blue();
+
+    return aColor;
+  }

   MESSAGE("get color of a group");
   return SALOMEDS::Color();
 }
   MESSAGE("get color of a group");
   return SALOMEDS::Color();
 }


@@ -442,7 +450,38 @@ void SMESH_GroupBase_i::SetColor(const SALOMEDS::Color& color)
 {
   SMESHDS_GroupBase* aGroupDS = GetGroupDS();
   if (aGroupDS)
 {
   SMESHDS_GroupBase* aGroupDS = GetGroupDS();
   if (aGroupDS)

-    return aGroupDS->SetColor(color);
+  {
+    Quantity_Color aQColor( color.R, color.G, color.B, Quantity_TOC_RGB );
+    return aGroupDS->SetColor(aQColor);
+  }

   MESSAGE("set color of a group");
   return ;
 }
   MESSAGE("set color of a group");
   return ;
 }

+
+//=============================================================================
+/*!
+ *
+ */
+//=============================================================================
+CORBA::Long SMESH_GroupBase_i::GetColorNumber()
+{
+  SMESHDS_GroupBase* aGroupDS = GetGroupDS();
+  if (aGroupDS)
+    return aGroupDS->GetColorGroup();
+  MESSAGE("get color number of a group");
+  return 0;
+}
+
+//=============================================================================
+/*!
+ *
+ */
+//=============================================================================
+void SMESH_GroupBase_i::SetColorNumber(CORBA::Long color)
+{
+  SMESHDS_GroupBase* aGroupDS = GetGroupDS();
+  if (aGroupDS)
+    return aGroupDS->SetColorGroup(color);
+  MESSAGE("set color number of a group");
+  return ;
+}

diff --git a/src/SMESH_I/SMESH_Group_i.hxx b/src/SMESH_I/SMESH_Group_i.hxx
index ea94e970379ab6f0ff51ba1318d9cba5f6c9062b..2ed372adb13d1a151131acd9937598e457ea7e81 100644 (file)
--- a/src/SMESH_I/SMESH_Group_i.hxx
+++ b/src/SMESH_I/SMESH_Group_i.hxx
@@ -78,6 +78,9 @@ class SMESH_I_EXPORT SMESH_GroupBase_i:
   void SetColor(const SALOMEDS::Color& color);
   SALOMEDS::Color GetColor();
 
   void SetColor(const SALOMEDS::Color& color);
   SALOMEDS::Color GetColor();
 

+  void SetColorNumber(CORBA::Long color);
+  CORBA::Long GetColorNumber();
+

 private:
   SMESH_Mesh_i* myMeshServant;
   int myLocalID;
 private:
   SMESH_Mesh_i* myMeshServant;
   int myLocalID;