OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-04-04 18:06:22 +03:00
Code Packages Releases Activity

0031324: Data Exchange - Cannot read BinOcaf document with colour

Browse Source 
BinMDataXtd_PresentationDriver and XmlMDataXtd_PresentationDriver have been corrected
to convert old (OCCT 7.4.0) Quantity_NameOfColor enumeration values to new ones.
This commit is contained in:
kgv 2020-01-29 13:18:01 +03:00 committed by bugmaster
parent 12e6d49993
commit 4254e74196
4 changed files with 119 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/BinMDataXtd/BinMDataXtd_PresentationDriver.cxx
View File

@ -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())

89
src/TDataXtd/TDataXtd_Presentation.cxx
View File

@ -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.

8
src/TDataXtd/TDataXtd_Presentation.hxx
View File

@ -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;

8
src/XmlMDataXtd/XmlMDataXtd_PresentationDriver.cxx
View File

@ -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);
}