0031324: Data Exchange - Cannot read BinOcaf document with colour

BinMDataXtd_PresentationDriver and XmlMDataXtd_PresentationDriver have been corrected
to convert old (OCCT 7.4.0) Quantity_NameOfColor enumeration values to new ones.

diff --git a/src/BinMDataXtd/BinMDataXtd_PresentationDriver.cxx b/src/BinMDataXtd/BinMDataXtd_PresentationDriver.cxx
index 3e30f775f199f60de2ee07a0c5190ab59a959657..732625a1ed3143d6d02204ce4fcc38caae5755d0 100644 (file)
--- a/src/BinMDataXtd/BinMDataXtd_PresentationDriver.cxx
+++ b/src/BinMDataXtd/BinMDataXtd_PresentationDriver.cxx
@@ -18,6 +18,7 @@
 #include <TDataXtd_Presentation.hxx>
 #include <BinObjMgt_Persistent.hxx>
 #include <Message_Messenger.hxx>
+#include <Quantity_Color.hxx>
 
 IMPLEMENT_STANDARD_RTTIEXT(BinMDataXtd_PresentationDriver,BinMDF_ADriver)
 
@@ -70,9 +71,17 @@ Standard_Boolean BinMDataXtd_PresentationDriver::Paste
   ok = theSource >> aValue;
   if (!ok) return ok;
   if ( aValue != -1 )
-    anAttribute->SetColor((Quantity_NameOfColor)aValue);
+  {
+    Quantity_NameOfColor aNameOfColor = TDataXtd_Presentation::getColorNameFromOldEnum (aValue);
+    if (aNameOfColor <= Quantity_NOC_WHITE)
+    {
+      anAttribute->SetColor (aNameOfColor);
+    }
+  }
   else
+  {
     anAttribute->UnsetColor();
+  }
 
   // Material
   ok = theSource >> aValue;
@@ -107,7 +116,7 @@ Standard_Boolean BinMDataXtd_PresentationDriver::Paste
   else
     anAttribute->UnsetMode();
 
-  return ok;
+  return true;
 }
 
 //=======================================================================
@@ -129,9 +138,14 @@ void BinMDataXtd_PresentationDriver::Paste(const Handle(TDF_Attribute)& theSourc
 
   // Color
   if (anAttribute->HasOwnColor())
-    theTarget.PutInteger(anAttribute->Color());
+  {
+    const Standard_Integer anOldEnum = TDataXtd_Presentation::getOldColorNameFromNewEnum (anAttribute->Color());
+    theTarget.PutInteger (anOldEnum);
+  }
   else
+  {
     theTarget.PutInteger(-1);
+  }
 
   // Material
   if (anAttribute->HasOwnMaterial())

diff --git a/src/TDataXtd/TDataXtd_Presentation.cxx b/src/TDataXtd/TDataXtd_Presentation.cxx
index 8525767e338f7a77f122b0d7ab132951d59c2c90..5656ae13cb2a5477a41e9bd91d4e1328b1468b2f 100644 (file)
--- a/src/TDataXtd/TDataXtd_Presentation.cxx
+++ b/src/TDataXtd/TDataXtd_Presentation.cxx
@@ -24,6 +24,95 @@
 
 IMPLEMENT_STANDARD_RTTIEXT(TDataXtd_Presentation,TDF_Attribute)
 
+//=======================================================================
+//function : getColorNameFromOldEnum
+//purpose  :
+//=======================================================================
+Quantity_NameOfColor TDataXtd_Presentation::getColorNameFromOldEnum (Standard_Integer theOld)
+{
+  Standard_Integer aNew = theOld;
+  if (theOld >= 43)  { --aNew; }  // Quantity_NOC_CHARTREUSE1 merged to Quantity_NOC_CHARTREUSE1
+  if (theOld >= 124) { --aNew; }  // Quantity_NOC_GOLD1 merged to Quantity_NOC_GOLD
+  if (theOld >= 136 && theOld < 223)
+  {
+    if (theOld == 146) { return Quantity_NOC_GRAY2; }
+    if (theOld == 157) { return Quantity_NOC_GRAY3; }
+    if (theOld == 168) { return Quantity_NOC_GRAY4; }
+    if (theOld == 179) { return Quantity_NOC_GRAY5; }
+    if (theOld == 190) { return Quantity_NOC_GRAY6; }
+    if (theOld == 201) { return Quantity_NOC_GRAY7; }
+    if (theOld == 212) { return Quantity_NOC_GRAY8; }
+    if (theOld == 222) { return Quantity_NOC_GRAY9; }
+
+    if      (theOld >  212) { aNew += 1; } // old Quantity_NOC_GRAY8
+    else if (theOld >  201) { aNew += 2; } // old Quantity_NOC_GRAY7
+    else if (theOld >  190) { aNew += 3; } // old Quantity_NOC_GRAY6
+    else if (theOld >  179) { aNew += 4; } // old Quantity_NOC_GRAY5
+    else if (theOld >  168) { aNew += 5; } // old Quantity_NOC_GRAY4
+    else if (theOld >  157) { aNew += 6; } // old Quantity_NOC_GRAY3
+    else if (theOld >  146) { aNew += 7; } // old Quantity_NOC_GRAY2
+    else                    { aNew += 8; }
+  }
+
+  if (theOld >  228) { aNew+=3; } // moved Quantity_NOC_GRAY96, 97, 98
+  if (theOld >= 230) { --aNew; }  // Quantity_NOC_GREEN1 merged to Quantity_NOC_GREEN
+  if (theOld == 235) { return Quantity_NOC_GRAY97; }
+  if (theOld == 236) { return Quantity_NOC_GRAY98; }
+  if (theOld == 237) { return Quantity_NOC_GRAY99; }
+  if (theOld >= 238) { aNew-=3; } // moved Quantity_NOC_GRAY96, 97, 98
+  if (theOld >= 360) { --aNew; }  // Quantity_NOC_ORANGE1 merged to Quantity_NOC_ORANGE
+  if (theOld >= 365) { --aNew; }  // Quantity_NOC_ORANGERED1 merged to Quantity_NOC_ORANGERED
+  if (theOld >= 413) { --aNew; }  // Quantity_NOC_RED1 merged to Quantity_NOC_RED
+  if (theOld >= 489) { --aNew; }  // Quantity_NOC_TOMATO1 merged to Quantity_NOC_TOMATO
+  if (theOld >= 511) { --aNew; }  // Quantity_NOC_YELLOW1 merged to Quantity_NOC_YELLOW
+  if (aNew > Quantity_NOC_WHITE) { return Quantity_NOC_WHITE; }
+  return (Quantity_NameOfColor )aNew;
+}
+
+//=======================================================================
+//function : getOldColorNameFromNewEnum
+//purpose  :
+//=======================================================================
+Standard_Integer TDataXtd_Presentation::getOldColorNameFromNewEnum (Quantity_NameOfColor theNew)
+{
+  Standard_Integer anOld = theNew;
+  if (theNew >= Quantity_NOC_CHARTREUSE2)  { ++anOld; }  // Quantity_NOC_CHARTREUSE1 merged to Quantity_NOC_CHARTREUSE1
+  if (theNew >= Quantity_NOC_GOLD2)        { ++anOld; }  // Quantity_NOC_GOLD1 merged to Quantity_NOC_GOLD
+  if (theNew >= Quantity_NOC_GRAY2 && theNew <= Quantity_NOC_GRAY89)
+  {
+    if (theNew == Quantity_NOC_GRAY2) { return 146; }
+    if (theNew == Quantity_NOC_GRAY3) { return 157; }
+    if (theNew == Quantity_NOC_GRAY4) { return 168; }
+    if (theNew == Quantity_NOC_GRAY5) { return 179; }
+    if (theNew == Quantity_NOC_GRAY6) { return 190; }
+    if (theNew == Quantity_NOC_GRAY7) { return 201; }
+    if (theNew == Quantity_NOC_GRAY8) { return 212; }
+    if (theNew == Quantity_NOC_GRAY9) { return 222; }
+
+    if      (theNew >= Quantity_NOC_GRAY80) { anOld -= 1; }
+    else if (theNew >= Quantity_NOC_GRAY70) { anOld -= 2; }
+    else if (theNew >= Quantity_NOC_GRAY60) { anOld -= 3; }
+    else if (theNew >= Quantity_NOC_GRAY50) { anOld -= 4; }
+    else if (theNew >= Quantity_NOC_GRAY40) { anOld -= 5; }
+    else if (theNew >= Quantity_NOC_GRAY30) { anOld -= 6; }
+    else if (theNew >= Quantity_NOC_GRAY20) { anOld -= 7; }
+    else                                    { anOld -= 8; }
+  }
+  if (theNew == Quantity_NOC_GRAY97) { return 235; }
+  if (theNew == Quantity_NOC_GRAY98) { return 236; }
+  if (theNew == Quantity_NOC_GRAY99) { return 237; }
+
+  if (theNew >= Quantity_NOC_GREEN)      { anOld -= 3; } // moved Quantity_NOC_GRAY96, 97, 98
+  if (theNew >= Quantity_NOC_GREEN2)     { ++anOld; }    // Quantity_NOC_GREEN1 merged to Quantity_NOC_GREEN
+  if (theNew >= Quantity_NOC_HONEYDEW)   { anOld += 3; } // moved Quantity_NOC_GRAY96, 97, 98
+  if (theNew >= Quantity_NOC_ORANGE2)    { ++anOld; }    // Quantity_NOC_ORANGE1 merged to Quantity_NOC_ORANGE
+  if (theNew >= Quantity_NOC_ORANGERED2) { ++anOld; }    // Quantity_NOC_ORANGERED1 merged to Quantity_NOC_ORANGERED
+  if (theNew >= Quantity_NOC_RED2)       { ++anOld; }    // Quantity_NOC_RED1 merged to Quantity_NOC_RED
+  if (theNew >= Quantity_NOC_TOMATO2)    { ++anOld; }    // Quantity_NOC_TOMATO1 merged to Quantity_NOC_TOMATO
+  if (theNew >= Quantity_NOC_YELLOW2)    { ++anOld; }    // Quantity_NOC_YELLOW1 merged to Quantity_NOC_YELLOW
+  return anOld;
+}
+
 //=======================================================================
 //function : TDataXtd_Presentation
 //purpose  : Default constructor.

diff --git a/src/TDataXtd/TDataXtd_Presentation.hxx b/src/TDataXtd/TDataXtd_Presentation.hxx
index 2354e058b6325355b03d2d765fed542c27a0d71c..1423ce6d433dedda319e7f9115334336b6f122cb 100644 (file)
--- a/src/TDataXtd/TDataXtd_Presentation.hxx
+++ b/src/TDataXtd/TDataXtd_Presentation.hxx
@@ -151,6 +151,14 @@ public:
 
   Standard_EXPORT void UnsetSelectionMode();
 
+public:
+  //! Convert values of old Quantity_NameOfColor to new enumeration for reading old documents
+  //! after #0030969 (Coding Rules - refactor Quantity_Color.cxx color table definition).
+  Standard_EXPORT static Quantity_NameOfColor getColorNameFromOldEnum (Standard_Integer theOld);
+
+  //! Convert Quantity_NameOfColor to old enumeration value for writing documents in compatible format.
+  Standard_EXPORT static Standard_Integer getOldColorNameFromNewEnum (Quantity_NameOfColor theNew);
+
 private:
   Standard_GUID  myDriverGUID;
   Quantity_NameOfColor myColor;

diff --git a/src/XmlMDataXtd/XmlMDataXtd_PresentationDriver.cxx b/src/XmlMDataXtd/XmlMDataXtd_PresentationDriver.cxx
index 1dd928da0d43579bcf45f9a5ce8a97b81a690317..08bbc850b34452492035ca00a0f97034b00b6bfc 100644 (file)
--- a/src/XmlMDataXtd/XmlMDataXtd_PresentationDriver.cxx
+++ b/src/XmlMDataXtd/XmlMDataXtd_PresentationDriver.cxx
@@ -20,8 +20,8 @@
 #include <TDF_Attribute.hxx>
 #include <XmlObjMgt.hxx>
 #include <XmlObjMgt_Persistent.hxx>
-
 #include <TDataXtd_Presentation.hxx>
+#include <Quantity_Color.hxx>
 
 IMPLEMENT_STANDARD_RTTIEXT(XmlMDataXtd_PresentationDriver,XmlMDF_ADriver)
 
@@ -96,7 +96,9 @@ Standard_Boolean XmlMDataXtd_PresentationDriver::Paste
       myMessageDriver->Send (aMessageString, Message_Fail);
       return Standard_False;
     }
-    aTPrs->SetColor((Quantity_NameOfColor)anIValue);
+
+    const Quantity_NameOfColor aNameOfColor = TDataXtd_Presentation::getColorNameFromOldEnum (anIValue);
+    aTPrs->SetColor(aNameOfColor);
   }
   else
   {
@@ -209,7 +211,7 @@ void XmlMDataXtd_PresentationDriver::Paste
   // color
   if (aTPrs->HasOwnColor())
   {
-    aNb = aTPrs->Color();
+    aNb = TDataXtd_Presentation::getOldColorNameFromNewEnum (aTPrs->Color());
     theTarget.Element().setAttribute(::ColorString(), aNb);
   }