mirror of
https://git.dev.opencascade.org/repos/occt.git
synced 2025-04-03 17:56:21 +03:00
0033317: Data Exchange, Step Export - Ignoring color attached to the reference shape label
Fixed problem with pure referencing. To export reference label to step we convert it to the assembly with one part. All attributes attached to the label should be moved to the new part. For working with it new map contains only pure reference labels, that converted to the part was implemented to the STEPCAFControl_Writer. Updated code style of the STEPCAFControl_Writer Improved ability to export labels from different documents Removed OCCT_Debug macros to print in Trace gravity
This commit is contained in:
dpasukhi
Vadim Glukhikh
parent
b0afa94d10
commit
47263fa6a3
File diff suppressed because it is too large
Load Diff
@ -31,6 +31,7 @@
|
||||
#include <StepVisual_DraughtingModel.hxx>
|
||||
#include <StepVisual_HArray1OfPresentationStyleAssignment.hxx>
|
||||
#include <TDF_LabelSequence.hxx>
|
||||
#include <TDF_LabelMap.hxx>
|
||||
#include <XCAFDimTolObjects_GeomToleranceObject.hxx>
|
||||
|
||||
class XSControl_WorkSession;
|
||||
@ -44,219 +45,234 @@ class TopoDS_Shape;
|
||||
//! colors and part names
|
||||
//!
|
||||
//! Also supports multifile writing
|
||||
class STEPCAFControl_Writer
|
||||
class STEPCAFControl_Writer
|
||||
{
|
||||
DEFINE_STANDARD_ALLOC
|
||||
public:
|
||||
|
||||
DEFINE_STANDARD_ALLOC
|
||||
|
||||
|
||||
//! Creates a writer with an empty
|
||||
//! STEP model and sets ColorMode, LayerMode, NameMode and
|
||||
//! PropsMode to Standard_True.
|
||||
Standard_EXPORT STEPCAFControl_Writer();
|
||||
|
||||
|
||||
//! Creates a reader tool and attaches it to an already existing Session
|
||||
//! Clears the session if it was not yet set for STEP
|
||||
//! Clears the internal data structures
|
||||
Standard_EXPORT STEPCAFControl_Writer(const Handle(XSControl_WorkSession)& WS, const Standard_Boolean scratch = Standard_True);
|
||||
|
||||
Standard_EXPORT STEPCAFControl_Writer(const Handle(XSControl_WorkSession)& theWS,
|
||||
const Standard_Boolean theScratch = Standard_True);
|
||||
|
||||
//! Clears the internal data structures and attaches to a new session
|
||||
//! Clears the session if it was not yet set for STEP
|
||||
Standard_EXPORT void Init (const Handle(XSControl_WorkSession)& WS, const Standard_Boolean scratch = Standard_True);
|
||||
|
||||
Standard_EXPORT void Init(const Handle(XSControl_WorkSession)& theWS,
|
||||
const Standard_Boolean theScratch = Standard_True);
|
||||
|
||||
//! Writes all the produced models into file
|
||||
//! In case of multimodel with extern references,
|
||||
//! filename will be a name of root file, all other files
|
||||
//! have names of corresponding parts
|
||||
//! Provided for use like single-file writer
|
||||
Standard_EXPORT IFSelect_ReturnStatus Write (const Standard_CString theFileName);
|
||||
Standard_EXPORT IFSelect_ReturnStatus Write(const Standard_CString theFileName);
|
||||
|
||||
//! Writes all the produced models into the stream.
|
||||
//! Provided for use like single-file writer
|
||||
Standard_EXPORT IFSelect_ReturnStatus WriteStream (std::ostream& theStream);
|
||||
|
||||
Standard_EXPORT IFSelect_ReturnStatus WriteStream(std::ostream& theStream);
|
||||
|
||||
//! Transfers a document (or single label) to a STEP model
|
||||
//! The mode of translation of shape is AsIs
|
||||
//! If multi is not null pointer, it switches to multifile
|
||||
//! mode (with external refs), and string pointed by <multi>
|
||||
//! gives prefix for names of extern files (can be empty string)
|
||||
//! Returns True if translation is OK
|
||||
Standard_EXPORT Standard_Boolean Transfer (const Handle(TDocStd_Document)& doc,
|
||||
const STEPControl_StepModelType mode = STEPControl_AsIs,
|
||||
const Standard_CString multi = 0,
|
||||
const Message_ProgressRange& theProgress = Message_ProgressRange());
|
||||
|
||||
Standard_EXPORT Standard_Boolean Transfer(const Handle(TDocStd_Document)& theDoc,
|
||||
const STEPControl_StepModelType theMode = STEPControl_AsIs,
|
||||
const Standard_CString theIsMulti = 0,
|
||||
const Message_ProgressRange& theProgress = Message_ProgressRange());
|
||||
|
||||
//! Method to transfer part of the document specified by label
|
||||
Standard_EXPORT Standard_Boolean Transfer (const TDF_Label& L,
|
||||
const STEPControl_StepModelType mode = STEPControl_AsIs,
|
||||
const Standard_CString multi = 0,
|
||||
const Message_ProgressRange& theProgress = Message_ProgressRange());
|
||||
Standard_EXPORT Standard_Boolean Transfer(const TDF_Label& theLabel,
|
||||
const STEPControl_StepModelType theMode = STEPControl_AsIs,
|
||||
const Standard_CString theIsMulti = 0,
|
||||
const Message_ProgressRange& theProgress = Message_ProgressRange());
|
||||
|
||||
//! Mehod to writing sequence of root assemblies or part of the file specified by use by one label
|
||||
Standard_EXPORT Standard_Boolean Transfer (const TDF_LabelSequence& L,
|
||||
const STEPControl_StepModelType mode = STEPControl_AsIs,
|
||||
const Standard_CString multi = 0,
|
||||
const Message_ProgressRange& theProgress = Message_ProgressRange());
|
||||
|
||||
Standard_EXPORT Standard_Boolean Perform (const Handle(TDocStd_Document)& doc,
|
||||
const TCollection_AsciiString& filename,
|
||||
Standard_EXPORT Standard_Boolean Transfer(const TDF_LabelSequence& theLabelSeq,
|
||||
const STEPControl_StepModelType theMode = STEPControl_AsIs,
|
||||
const Standard_CString theIsMulti = 0,
|
||||
const Message_ProgressRange& theProgress = Message_ProgressRange());
|
||||
|
||||
|
||||
Standard_EXPORT Standard_Boolean Perform(const Handle(TDocStd_Document)& theDoc,
|
||||
const TCollection_AsciiString& theFileName,
|
||||
const Message_ProgressRange& theProgress = Message_ProgressRange());
|
||||
|
||||
//! Transfers a document and writes it to a STEP file
|
||||
//! Returns True if translation is OK
|
||||
Standard_EXPORT Standard_Boolean Perform (const Handle(TDocStd_Document)& doc,
|
||||
const Standard_CString filename,
|
||||
const Message_ProgressRange& theProgress = Message_ProgressRange());
|
||||
|
||||
Standard_EXPORT Standard_Boolean Perform(const Handle(TDocStd_Document)& theDoc,
|
||||
const Standard_CString theFileName,
|
||||
const Message_ProgressRange& theProgress = Message_ProgressRange());
|
||||
|
||||
//! Returns data on external files
|
||||
//! Returns Null handle if no external files are read
|
||||
Standard_EXPORT const NCollection_DataMap<TCollection_AsciiString, Handle(STEPCAFControl_ExternFile)>& ExternFiles() const;
|
||||
|
||||
const NCollection_DataMap<TCollection_AsciiString, Handle(STEPCAFControl_ExternFile)>& ExternFiles() const { return myFiles; };
|
||||
|
||||
//! Returns data on external file by its original label
|
||||
//! Returns False if no external file with given name is read
|
||||
Standard_EXPORT Standard_Boolean ExternFile (const TDF_Label& L, Handle(STEPCAFControl_ExternFile)& ef) const;
|
||||
|
||||
Standard_EXPORT Standard_Boolean ExternFile(const TDF_Label& theLabel,
|
||||
Handle(STEPCAFControl_ExternFile)& theExtFile) const;
|
||||
|
||||
//! Returns data on external file by its name
|
||||
//! Returns False if no external file with given name is read
|
||||
Standard_EXPORT Standard_Boolean ExternFile (const Standard_CString name, Handle(STEPCAFControl_ExternFile)& ef) const;
|
||||
|
||||
Standard_EXPORT Standard_Boolean ExternFile(const Standard_CString theName,
|
||||
Handle(STEPCAFControl_ExternFile)& theExtFile) const;
|
||||
|
||||
//! Returns basic reader for root file
|
||||
Standard_EXPORT STEPControl_Writer& ChangeWriter();
|
||||
|
||||
STEPControl_Writer& ChangeWriter() { return myWriter; }
|
||||
|
||||
//! Returns basic reader as const
|
||||
Standard_EXPORT const STEPControl_Writer& Writer() const;
|
||||
|
||||
const STEPControl_Writer& Writer() const { return myWriter; }
|
||||
|
||||
//! Set ColorMode for indicate write Colors or not.
|
||||
Standard_EXPORT void SetColorMode (const Standard_Boolean colormode);
|
||||
|
||||
Standard_EXPORT Standard_Boolean GetColorMode() const;
|
||||
|
||||
void SetColorMode(const Standard_Boolean theColorMode) { myColorMode = theColorMode; }
|
||||
|
||||
Standard_Boolean GetColorMode() const { return myColorMode; }
|
||||
|
||||
//! Set NameMode for indicate write Name or not.
|
||||
Standard_EXPORT void SetNameMode (const Standard_Boolean namemode);
|
||||
|
||||
Standard_EXPORT Standard_Boolean GetNameMode() const;
|
||||
|
||||
void SetNameMode(const Standard_Boolean theNameMode) { myNameMode = theNameMode; }
|
||||
|
||||
Standard_Boolean GetNameMode() const { return myNameMode; }
|
||||
|
||||
//! Set LayerMode for indicate write Layers or not.
|
||||
Standard_EXPORT void SetLayerMode (const Standard_Boolean layermode);
|
||||
|
||||
Standard_EXPORT Standard_Boolean GetLayerMode() const;
|
||||
|
||||
void SetLayerMode(const Standard_Boolean theLayerMode) { myLayerMode = theLayerMode; }
|
||||
|
||||
Standard_Boolean GetLayerMode() const { return myLayerMode; }
|
||||
|
||||
//! PropsMode for indicate write Validation properties or not.
|
||||
Standard_EXPORT void SetPropsMode (const Standard_Boolean propsmode);
|
||||
|
||||
Standard_EXPORT Standard_Boolean GetPropsMode() const;
|
||||
|
||||
void SetPropsMode(const Standard_Boolean thePropsMode) { myPropsMode = thePropsMode; }
|
||||
|
||||
Standard_Boolean GetPropsMode() const { return myPropsMode; }
|
||||
|
||||
//! Set SHUO mode for indicate write SHUO or not.
|
||||
Standard_EXPORT void SetSHUOMode (const Standard_Boolean shuomode);
|
||||
|
||||
Standard_EXPORT Standard_Boolean GetSHUOMode() const;
|
||||
|
||||
void SetSHUOMode(const Standard_Boolean theSHUOMode) { mySHUOMode = theSHUOMode; }
|
||||
|
||||
Standard_Boolean GetSHUOMode() const { return mySHUOMode; }
|
||||
|
||||
//! Set dimtolmode for indicate write D>s or not.
|
||||
Standard_EXPORT void SetDimTolMode (const Standard_Boolean dimtolmode);
|
||||
|
||||
Standard_EXPORT Standard_Boolean GetDimTolMode() const;
|
||||
|
||||
void SetDimTolMode(const Standard_Boolean theDimTolMode) { myGDTMode = theDimTolMode; };
|
||||
|
||||
Standard_Boolean GetDimTolMode() const { return myGDTMode; }
|
||||
|
||||
//! Set dimtolmode for indicate write D>s or not.
|
||||
Standard_EXPORT void SetMaterialMode (const Standard_Boolean matmode);
|
||||
|
||||
Standard_EXPORT Standard_Boolean GetMaterialMode() const;
|
||||
void SetMaterialMode(const Standard_Boolean theMaterialMode) { myMatMode = theMaterialMode; }
|
||||
|
||||
Standard_Boolean GetMaterialMode() const { return myMatMode; }
|
||||
|
||||
protected:
|
||||
|
||||
|
||||
//! Transfers labels to a STEP model
|
||||
//! Returns True if translation is OK
|
||||
//! isExternFile setting from TransferExternFiles method
|
||||
Standard_EXPORT Standard_Boolean Transfer (STEPControl_Writer& wr,
|
||||
const TDF_LabelSequence& labels,
|
||||
const STEPControl_StepModelType mode = STEPControl_AsIs,
|
||||
const Standard_CString multi = 0,
|
||||
const Standard_Boolean isExternFile = Standard_False,
|
||||
const Message_ProgressRange& theProgress = Message_ProgressRange()) ;
|
||||
|
||||
//! isExternFile setting from transferExternFiles method
|
||||
Standard_Boolean transfer(STEPControl_Writer& theWriter,
|
||||
const TDF_LabelSequence& theLabels,
|
||||
const STEPControl_StepModelType theMode = STEPControl_AsIs,
|
||||
const Standard_CString theIsMulti = 0,
|
||||
const Standard_Boolean isExternFile = Standard_False,
|
||||
const Message_ProgressRange& theProgress = Message_ProgressRange());
|
||||
|
||||
//! Parses assembly structure of label L, writes all the simple
|
||||
//! shapes each to its own file named by name of its label plus
|
||||
//! prefix
|
||||
//! Returns shape representing that assembly structure
|
||||
//! in the form of nested empty compounds (and a sequence of
|
||||
//! labels which are newly written nodes of this assembly)
|
||||
Standard_EXPORT TopoDS_Shape TransferExternFiles (const TDF_Label& L,
|
||||
const STEPControl_StepModelType mode,
|
||||
TDF_LabelSequence& Lseq,
|
||||
const Standard_CString prefix = "",
|
||||
const Message_ProgressRange& theProgress = Message_ProgressRange());
|
||||
|
||||
TopoDS_Shape transferExternFiles(const TDF_Label& theLabel,
|
||||
const STEPControl_StepModelType theMode,
|
||||
TDF_LabelSequence& theLabelSeq,
|
||||
const Standard_CString thePrefix = "",
|
||||
const Message_ProgressRange& theProgress = Message_ProgressRange());
|
||||
|
||||
//! Write external references to STEP
|
||||
Standard_EXPORT Standard_Boolean WriteExternRefs (const Handle(XSControl_WorkSession)& WS, const TDF_LabelSequence& labels) const;
|
||||
|
||||
Standard_Boolean writeExternRefs(const Handle(XSControl_WorkSession)& theWS,
|
||||
const TDF_LabelSequence& theLabels) const;
|
||||
|
||||
//! Write colors assigned to specified labels, to STEP model
|
||||
Standard_EXPORT Standard_Boolean WriteColors (const Handle(XSControl_WorkSession)& WS, const TDF_LabelSequence& labels);
|
||||
|
||||
Standard_Boolean writeColors(const Handle(XSControl_WorkSession)& theWS,
|
||||
const TDF_LabelSequence& theLabels);
|
||||
|
||||
//! Write names assigned to specified labels, to STEP model
|
||||
Standard_EXPORT Standard_Boolean WriteNames (const Handle(XSControl_WorkSession)& WS, const TDF_LabelSequence& labels) const;
|
||||
|
||||
Standard_Boolean writeNames(const Handle(XSControl_WorkSession)& theWS,
|
||||
const TDF_LabelSequence& theLabels) const;
|
||||
|
||||
//! Write D>s assigned to specified labels, to STEP model
|
||||
Standard_EXPORT Standard_Boolean WriteDGTs (const Handle(XSControl_WorkSession)& WS, const TDF_LabelSequence& labels) const;
|
||||
|
||||
//! Write D>s assigned to specified labels, to STEP model, according AP242
|
||||
Standard_EXPORT Standard_Boolean WriteDGTsAP242 (const Handle(XSControl_WorkSession)& WS, const TDF_LabelSequence& labels);
|
||||
Standard_Boolean writeDGTs(const Handle(XSControl_WorkSession)& theWS,
|
||||
const TDF_LabelSequence& theLabels) const;
|
||||
|
||||
//! Write D>s assigned to specified labels, to STEP model, according AP242
|
||||
Standard_Boolean writeDGTsAP242(const Handle(XSControl_WorkSession)& theWS,
|
||||
const TDF_LabelSequence& theLabels);
|
||||
|
||||
//! Write materials assigned to specified labels, to STEP model
|
||||
Standard_EXPORT Standard_Boolean WriteMaterials (const Handle(XSControl_WorkSession)& WS, const TDF_LabelSequence& labels) const;
|
||||
|
||||
Standard_Boolean writeMaterials(const Handle(XSControl_WorkSession)& theWS,
|
||||
const TDF_LabelSequence& theLabels) const;
|
||||
|
||||
//! Write validation properties assigned to specified labels,
|
||||
//! to STEP model
|
||||
Standard_EXPORT Standard_Boolean WriteValProps (const Handle(XSControl_WorkSession)& WS, const TDF_LabelSequence& labels, const Standard_CString multi) const;
|
||||
|
||||
Standard_Boolean writeValProps(const Handle(XSControl_WorkSession)& theWS,
|
||||
const TDF_LabelSequence& theLabels,
|
||||
const Standard_CString theIsMulti) const;
|
||||
|
||||
//! Write layers assigned to specified labels, to STEP model
|
||||
Standard_EXPORT Standard_Boolean WriteLayers (const Handle(XSControl_WorkSession)& WS, const TDF_LabelSequence& labels) const;
|
||||
|
||||
Standard_Boolean writeLayers(const Handle(XSControl_WorkSession)& theWS,
|
||||
const TDF_LabelSequence& theLabels) const;
|
||||
|
||||
//! Write SHUO assigned to specified component, to STEP model
|
||||
Standard_EXPORT Standard_Boolean WriteSHUOs (const Handle(XSControl_WorkSession)& WS, const TDF_LabelSequence& labels);
|
||||
Standard_Boolean writeSHUOs(const Handle(XSControl_WorkSession)& theWS,
|
||||
const TDF_LabelSequence& theLabels);
|
||||
|
||||
//! Finds length units located in root of label
|
||||
//! If it exists, initializes local length unit from it
|
||||
//! Else initializes according to Cascade length unit
|
||||
Standard_EXPORT void prepareUnit(const TDF_Label& theLabel,
|
||||
const Handle(StepData_StepModel)& theModel);
|
||||
void prepareUnit(const TDF_Label& theLabel,
|
||||
const Handle(StepData_StepModel)& theModel);
|
||||
|
||||
Handle(StepRepr_ShapeAspect) writeShapeAspect(const Handle(XSControl_WorkSession)& theWS,
|
||||
const TDF_Label theLabel,
|
||||
const TopoDS_Shape theShape,
|
||||
Handle(StepRepr_RepresentationContext)& theRC,
|
||||
Handle(StepAP242_GeometricItemSpecificUsage)& theGISU);
|
||||
|
||||
void writePresentation(const Handle(XSControl_WorkSession)& theWS,
|
||||
const TopoDS_Shape& thePresentation,
|
||||
const Handle(TCollection_HAsciiString)& thePrsName,
|
||||
const Standard_Boolean theHasSemantic,
|
||||
const Standard_Boolean theHasPlane,
|
||||
const gp_Ax2& theAnnotationPlane,
|
||||
const gp_Pnt& theTextPosition,
|
||||
const Handle(Standard_Transient) theDimension);
|
||||
|
||||
Handle(StepDimTol_Datum) writeDatumAP242(const Handle(XSControl_WorkSession)& theWS,
|
||||
const TDF_LabelSequence& theShapeL,
|
||||
const TDF_Label& theDatumL,
|
||||
const Standard_Boolean isFirstDTarget,
|
||||
const Handle(StepDimTol_Datum) theWrittenDatum);
|
||||
|
||||
void writeToleranceZone(const Handle(XSControl_WorkSession)& theWS,
|
||||
const Handle(XCAFDimTolObjects_GeomToleranceObject)& theObject,
|
||||
const Handle(StepDimTol_GeometricTolerance)& theEntity,
|
||||
const Handle(StepRepr_RepresentationContext)& theRC);
|
||||
|
||||
void writeGeomTolerance(const Handle(XSControl_WorkSession)& theWS,
|
||||
const TDF_LabelSequence& theShapeSeqL,
|
||||
const TDF_Label& theGeomTolL,
|
||||
const Handle(StepDimTol_HArray1OfDatumSystemOrReference)& theDatumSystem,
|
||||
const Handle(StepRepr_RepresentationContext)& theRC);
|
||||
|
||||
private:
|
||||
|
||||
Standard_EXPORT Handle(StepRepr_ShapeAspect) WriteShapeAspect(const Handle(XSControl_WorkSession) &WS,
|
||||
const TDF_Label theLabel, const TopoDS_Shape theShape, Handle(StepRepr_RepresentationContext)& theRC,
|
||||
Handle(StepAP242_GeometricItemSpecificUsage)& theGISU);
|
||||
|
||||
Standard_EXPORT void WritePresentation(const Handle(XSControl_WorkSession)& WS,
|
||||
const TopoDS_Shape& thePresentation,
|
||||
const Handle(TCollection_HAsciiString)& thePrsName,
|
||||
const Standard_Boolean hasSemantic,
|
||||
const Standard_Boolean hasPlane,
|
||||
const gp_Ax2& theAnnotationPlane,
|
||||
const gp_Pnt& theTextPosition,
|
||||
const Handle(Standard_Transient) theDimension);
|
||||
|
||||
Standard_EXPORT Handle(StepDimTol_Datum) WriteDatumAP242(const Handle(XSControl_WorkSession)& WS,
|
||||
const TDF_LabelSequence& theShapeL,
|
||||
const TDF_Label& theDatumL,
|
||||
const Standard_Boolean isFirstDTarget,
|
||||
const Handle(StepDimTol_Datum) theWrittenDatum);
|
||||
|
||||
Standard_EXPORT void WriteToleranceZone(const Handle(XSControl_WorkSession) &WS, const Handle(XCAFDimTolObjects_GeomToleranceObject)& theObject,
|
||||
const Handle(StepDimTol_GeometricTolerance)& theEntity, const Handle(StepRepr_RepresentationContext)& theRC);
|
||||
|
||||
Standard_EXPORT void WriteGeomTolerance(const Handle(XSControl_WorkSession)& WS,
|
||||
const TDF_LabelSequence& theShapeSeqL,
|
||||
const TDF_Label& theGeomTolL,
|
||||
const Handle(StepDimTol_HArray1OfDatumSystemOrReference)& theDatumSystem,
|
||||
const Handle(StepRepr_RepresentationContext)& theRC);
|
||||
|
||||
private:
|
||||
|
||||
|
||||
STEPControl_Writer myWriter;
|
||||
NCollection_DataMap<TCollection_AsciiString, Handle(STEPCAFControl_ExternFile)> myFiles;
|
||||
TDF_LabelMap myRootLabels;
|
||||
STEPCAFControl_DataMapOfLabelShape myLabels;
|
||||
STEPCAFControl_DataMapOfLabelExternFile myLabEF;
|
||||
STEPCAFControl_DataMapOfLabelShape myPureRefLabels;
|
||||
Standard_Boolean myColorMode;
|
||||
Standard_Boolean myNameMode;
|
||||
Standard_Boolean myLayerMode;
|
||||
@ -272,7 +288,4 @@ private:
|
||||
|
||||
};
|
||||
|
||||
|
||||
|
||||
|
||||
#endif // _STEPCAFControl_Writer_HeaderFile
|
||||
|
||||
@ -89,7 +89,7 @@ Standard_Boolean XCAFDoc_ColorTool::IsColor (const TDF_Label& lab) const
|
||||
//=======================================================================
|
||||
|
||||
Standard_Boolean XCAFDoc_ColorTool::GetColor (const TDF_Label& lab,
|
||||
Quantity_Color& col) const
|
||||
Quantity_Color& col)
|
||||
{
|
||||
Quantity_ColorRGBA aCol;
|
||||
Standard_Boolean isDone = GetColor(lab, aCol);
|
||||
@ -104,10 +104,8 @@ Standard_Boolean XCAFDoc_ColorTool::GetColor (const TDF_Label& lab,
|
||||
//=======================================================================
|
||||
|
||||
Standard_Boolean XCAFDoc_ColorTool::GetColor(const TDF_Label& lab,
|
||||
Quantity_ColorRGBA& col) const
|
||||
Quantity_ColorRGBA& col)
|
||||
{
|
||||
if (lab.Father() != Label()) return Standard_False;
|
||||
|
||||
Handle(XCAFDoc_Color) ColorAttribute;
|
||||
if (!lab.FindAttribute(XCAFDoc_Color::GetID(), ColorAttribute))
|
||||
return Standard_False;
|
||||
@ -514,7 +512,7 @@ XCAFDoc_ColorTool::XCAFDoc_ColorTool()
|
||||
//purpose :
|
||||
//=======================================================================
|
||||
|
||||
Standard_Boolean XCAFDoc_ColorTool::IsVisible (const TDF_Label& L) const
|
||||
Standard_Boolean XCAFDoc_ColorTool::IsVisible (const TDF_Label& L)
|
||||
{
|
||||
Handle(TDataStd_UAttribute) aUAttr;
|
||||
return (!L.FindAttribute(XCAFDoc::InvisibleGUID(), aUAttr));
|
||||
|
||||
@ -72,12 +72,12 @@ public:
|
||||
//! Returns color defined by label lab
|
||||
//! Returns False if the label is not in colortable
|
||||
//! or does not define a color
|
||||
Standard_EXPORT Standard_Boolean GetColor (const TDF_Label& lab, Quantity_Color& col) const;
|
||||
Standard_EXPORT static Standard_Boolean GetColor (const TDF_Label& lab, Quantity_Color& col);
|
||||
|
||||
//! Returns color defined by label lab
|
||||
//! Returns False if the label is not in colortable
|
||||
//! or does not define a color
|
||||
Standard_EXPORT Standard_Boolean GetColor(const TDF_Label& lab, Quantity_ColorRGBA& col) const;
|
||||
Standard_EXPORT static Standard_Boolean GetColor(const TDF_Label& lab, Quantity_ColorRGBA& col);
|
||||
|
||||
//! Finds a color definition in a colortable and returns
|
||||
//! its label if found
|
||||
@ -150,11 +150,11 @@ public:
|
||||
|
||||
//! Returns color assigned to <L> as <type>
|
||||
//! Returns False if no such color is assigned
|
||||
Standard_EXPORT Standard_Boolean GetColor (const TDF_Label& L, const XCAFDoc_ColorType type, Quantity_Color& color);
|
||||
Standard_EXPORT static Standard_Boolean GetColor (const TDF_Label& L, const XCAFDoc_ColorType type, Quantity_Color& color);
|
||||
|
||||
//! Returns color assigned to <L> as <type>
|
||||
//! Returns False if no such color is assigned
|
||||
Standard_EXPORT Standard_Boolean GetColor(const TDF_Label& L, const XCAFDoc_ColorType type, Quantity_ColorRGBA& color);
|
||||
Standard_EXPORT static Standard_Boolean GetColor(const TDF_Label& L, const XCAFDoc_ColorType type, Quantity_ColorRGBA& color);
|
||||
|
||||
//! Sets a link with GUID defined by <type> (see
|
||||
//! XCAFDoc::ColorRefGUID()) from label <L> to color
|
||||
@ -198,7 +198,7 @@ public:
|
||||
Standard_EXPORT Standard_Boolean GetColor(const TopoDS_Shape& S, const XCAFDoc_ColorType type, Quantity_ColorRGBA& color);
|
||||
|
||||
//! Return TRUE if object on this label is visible, FALSE if invisible.
|
||||
Standard_EXPORT Standard_Boolean IsVisible (const TDF_Label& L) const;
|
||||
Standard_EXPORT static Standard_Boolean IsVisible (const TDF_Label& L);
|
||||
|
||||
//! Set the visibility of object on label. Do nothing if there no any object.
|
||||
//! Set UAttribute with corresponding GUID.
|
||||
|
||||
@ -503,7 +503,7 @@ TDF_Label XCAFDoc_DimTolTool::SetDimTol(const TDF_Label& L,
|
||||
|
||||
Standard_Boolean XCAFDoc_DimTolTool::GetRefShapeLabel(const TDF_Label& theL,
|
||||
TDF_LabelSequence& theShapeLFirst,
|
||||
TDF_LabelSequence& theShapeLSecond) const
|
||||
TDF_LabelSequence& theShapeLSecond)
|
||||
{
|
||||
theShapeLFirst.Clear();
|
||||
theShapeLSecond.Clear();
|
||||
@ -855,7 +855,7 @@ Standard_Boolean XCAFDoc_DimTolTool::GetDatum(const TDF_Label& theDatumL,
|
||||
//=======================================================================
|
||||
|
||||
Standard_Boolean XCAFDoc_DimTolTool::GetDatumOfTolerLabels(const TDF_Label& theDimTolL,
|
||||
TDF_LabelSequence& theDatums) const
|
||||
TDF_LabelSequence& theDatums)
|
||||
{
|
||||
Handle(XCAFDoc_GraphNode) aNode;
|
||||
if( !theDimTolL.FindAttribute(XCAFDoc::DatumTolRefGUID(),aNode) )
|
||||
@ -874,7 +874,7 @@ Standard_Boolean XCAFDoc_DimTolTool::GetDatumOfTolerLabels(const TDF_Label& theD
|
||||
//=======================================================================
|
||||
|
||||
Standard_Boolean XCAFDoc_DimTolTool::GetDatumWithObjectOfTolerLabels(const TDF_Label& theDimTolL,
|
||||
TDF_LabelSequence& theDatums) const
|
||||
TDF_LabelSequence& theDatums)
|
||||
{
|
||||
Handle(XCAFDoc_GraphNode) aNode;
|
||||
if( !theDimTolL.FindAttribute(XCAFDoc::DatumTolRefGUID(),aNode) )
|
||||
|
||||
@ -155,9 +155,9 @@ public:
|
||||
|
||||
//! Gets all shape labels referred by theL label of the GD&T table.
|
||||
//! Returns False if there are no shape labels added to the sequences.
|
||||
Standard_EXPORT Standard_Boolean GetRefShapeLabel (const TDF_Label& theL,
|
||||
TDF_LabelSequence& theShapeLFirst,
|
||||
TDF_LabelSequence& theShapeLSecond) const;
|
||||
Standard_EXPORT static Standard_Boolean GetRefShapeLabel (const TDF_Label& theL,
|
||||
TDF_LabelSequence& theShapeLFirst,
|
||||
TDF_LabelSequence& theShapeLSecond);
|
||||
|
||||
//! Returns dimension tolerance assigned to theDimTolL label.
|
||||
//! Returns False if no such dimension tolerance is assigned.
|
||||
@ -215,12 +215,12 @@ public:
|
||||
Handle(TCollection_HAsciiString)& theIdentification) const;
|
||||
|
||||
//! Returns all Datum labels defined for theDimTolL label.
|
||||
Standard_EXPORT Standard_Boolean GetDatumOfTolerLabels (const TDF_Label& theDimTolL,
|
||||
TDF_LabelSequence& theDatums) const;
|
||||
Standard_EXPORT static Standard_Boolean GetDatumOfTolerLabels (const TDF_Label& theDimTolL,
|
||||
TDF_LabelSequence& theDatums);
|
||||
|
||||
//! Returns all Datum labels with XCAFDimTolObjects_DatumObject defined for label theDimTolL.
|
||||
Standard_EXPORT Standard_Boolean GetDatumWithObjectOfTolerLabels (const TDF_Label& theDimTolL,
|
||||
TDF_LabelSequence& theDatums) const;
|
||||
Standard_EXPORT static Standard_Boolean GetDatumWithObjectOfTolerLabels (const TDF_Label& theDimTolL,
|
||||
TDF_LabelSequence& theDatums);
|
||||
|
||||
//! Returns all GeomToleranses labels defined for theDatumL label.
|
||||
Standard_EXPORT Standard_Boolean GetTolerOfDatumLabels (const TDF_Label& theDatumL,
|
||||
|
||||
@ -416,20 +416,20 @@ Handle(TColStd_HSequenceOfExtendedString) XCAFDoc_LayerTool::GetLayers(const TDF
|
||||
//function : GetShapesOfLayer
|
||||
//purpose :
|
||||
//=======================================================================
|
||||
|
||||
void XCAFDoc_LayerTool::GetShapesOfLayer(const TDF_Label& layerL,
|
||||
TDF_LabelSequence& ShLabels) const
|
||||
void XCAFDoc_LayerTool::GetShapesOfLayer(const TDF_Label& theLayerL,
|
||||
TDF_LabelSequence& theShLabels)
|
||||
{
|
||||
ShLabels.Clear();
|
||||
theShLabels.Clear();
|
||||
Handle(XCAFDoc_GraphNode) aGNode;
|
||||
if ( layerL.FindAttribute( XCAFDoc::LayerRefGUID(), aGNode) ) {
|
||||
for (Standard_Integer i = 1; i <= aGNode->NbChildren(); i++) {
|
||||
ShLabels.Append( aGNode->GetChild(i)->Label() );
|
||||
if (theLayerL.FindAttribute(XCAFDoc::LayerRefGUID(), aGNode))
|
||||
{
|
||||
for (Standard_Integer aChildInd = 1; aChildInd <= aGNode->NbChildren(); aChildInd++)
|
||||
{
|
||||
theShLabels.Append(aGNode->GetChild(aChildInd)->Label());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
//=======================================================================
|
||||
//function : IsVisible
|
||||
//purpose :
|
||||
|
||||
@ -135,7 +135,7 @@ public:
|
||||
Standard_EXPORT Handle(TColStd_HSequenceOfExtendedString) GetLayers (const TDF_Label& L);
|
||||
|
||||
//! Return sequanese of shape labels that assigned with layers to <ShLabels>.
|
||||
Standard_EXPORT void GetShapesOfLayer (const TDF_Label& layerL, TDF_LabelSequence& ShLabels) const;
|
||||
Standard_EXPORT static void GetShapesOfLayer (const TDF_Label& theLayerL, TDF_LabelSequence& theShLabels);
|
||||
|
||||
//! Return TRUE if layer is visible, FALSE if invisible.
|
||||
Standard_EXPORT Standard_Boolean IsVisible (const TDF_Label& layerL) const;
|
||||
|
||||
@ -184,7 +184,7 @@ Standard_Boolean XCAFDoc_MaterialTool::GetMaterial(const TDF_Label& MatL,
|
||||
Handle(TCollection_HAsciiString)& aDescription,
|
||||
Standard_Real& aDensity,
|
||||
Handle(TCollection_HAsciiString)& aDensName,
|
||||
Handle(TCollection_HAsciiString)& aDensValType) const
|
||||
Handle(TCollection_HAsciiString)& aDensValType)
|
||||
{
|
||||
Handle(XCAFDoc_Material) MatAttr;
|
||||
if(!MatL.FindAttribute(XCAFDoc_Material::GetID(),MatAttr)) {
|
||||
|
||||
@ -76,7 +76,7 @@ public:
|
||||
|
||||
//! Returns Material assigned to <MatL>
|
||||
//! Returns False if no such Material is assigned
|
||||
Standard_EXPORT Standard_Boolean GetMaterial (const TDF_Label& MatL, Handle(TCollection_HAsciiString)& aName, Handle(TCollection_HAsciiString)& aDescription, Standard_Real& aDensity, Handle(TCollection_HAsciiString)& aDensName, Handle(TCollection_HAsciiString)& aDensValType) const;
|
||||
Standard_EXPORT static Standard_Boolean GetMaterial (const TDF_Label& MatL, Handle(TCollection_HAsciiString)& aName, Handle(TCollection_HAsciiString)& aDescription, Standard_Real& aDensity, Handle(TCollection_HAsciiString)& aDensName, Handle(TCollection_HAsciiString)& aDensValType);
|
||||
|
||||
//! Find referred material and return density from it
|
||||
//! if no material --> return 0
|
||||
|
||||
@ -79,13 +79,10 @@ const Handle(XCAFDoc_ShapeTool)& XCAFDoc_VisMaterialTool::ShapeTool()
|
||||
//function : GetMaterial
|
||||
//purpose :
|
||||
//=======================================================================
|
||||
Handle(XCAFDoc_VisMaterial) XCAFDoc_VisMaterialTool::GetMaterial (const TDF_Label& theMatLabel) const
|
||||
Handle(XCAFDoc_VisMaterial) XCAFDoc_VisMaterialTool::GetMaterial(const TDF_Label& theMatLabel)
|
||||
{
|
||||
Handle(XCAFDoc_VisMaterial) aMatAttrib;
|
||||
if (theMatLabel.Father() == Label())
|
||||
{
|
||||
theMatLabel.FindAttribute (XCAFDoc_VisMaterial::GetID(), aMatAttrib);
|
||||
}
|
||||
theMatLabel.FindAttribute(XCAFDoc_VisMaterial::GetID(), aMatAttrib);
|
||||
return aMatAttrib;
|
||||
}
|
||||
|
||||
@ -214,8 +211,7 @@ Standard_Boolean XCAFDoc_VisMaterialTool::GetShapeMaterial (const TDF_Label& the
|
||||
Handle(XCAFDoc_VisMaterial) XCAFDoc_VisMaterialTool::GetShapeMaterial (const TDF_Label& theShapeLabel)
|
||||
{
|
||||
TDF_Label aMatLabel;
|
||||
return Label().HasChild() // do not waste time on shape attributes if materials map is empty
|
||||
&& GetShapeMaterial (theShapeLabel, aMatLabel)
|
||||
return GetShapeMaterial (theShapeLabel, aMatLabel)
|
||||
? GetMaterial (aMatLabel)
|
||||
: Handle(XCAFDoc_VisMaterial)();
|
||||
}
|
||||
|
||||
@ -56,7 +56,7 @@ public:
|
||||
Standard_Boolean IsMaterial (const TDF_Label& theLabel) const { return !GetMaterial (theLabel).IsNull(); }
|
||||
|
||||
//! Returns Material defined by specified Label, or NULL if the label is not in Material Table.
|
||||
Standard_EXPORT Handle(XCAFDoc_VisMaterial) GetMaterial (const TDF_Label& theMatLabel) const;
|
||||
Standard_EXPORT static Handle(XCAFDoc_VisMaterial) GetMaterial (const TDF_Label& theMatLabel);
|
||||
|
||||
//! Adds Material definition to a Material Table and returns its Label.
|
||||
Standard_EXPORT TDF_Label AddMaterial (const Handle(XCAFDoc_VisMaterial)& theMat,
|
||||
@ -88,7 +88,7 @@ public:
|
||||
Standard_EXPORT static Standard_Boolean GetShapeMaterial (const TDF_Label& theShapeLabel, TDF_Label& theMaterialLabel);
|
||||
|
||||
//! Returns material assigned to the shape label.
|
||||
Standard_EXPORT Handle(XCAFDoc_VisMaterial) GetShapeMaterial (const TDF_Label& theShapeLabel);
|
||||
Standard_EXPORT static Handle(XCAFDoc_VisMaterial) GetShapeMaterial (const TDF_Label& theShapeLabel);
|
||||
|
||||
//! Sets a link with GUID XCAFDoc::VisMaterialRefGUID() from shape label to material label.
|
||||
//! @param theShape [in] shape
|
||||
|
||||
32
tests/bugs/step/bug33317
Normal file
32
tests/bugs/step/bug33317
Normal file
@ -0,0 +1,32 @@
|
||||
puts "========================"
|
||||
puts "0033317: Data Exchange, Step Export - Ignoring color attached to the reference shape label"
|
||||
puts "========================"
|
||||
|
||||
pload OCAF
|
||||
|
||||
Close D -silent
|
||||
Close D1 -silent
|
||||
|
||||
set TempFilename ${imagedir}/${casename}_temp.stp
|
||||
|
||||
# Open document
|
||||
XOpen [locate_data_file bug33317_solids_7_7_0.xml] D
|
||||
|
||||
# Get colors
|
||||
set colors_old [XGetShapeColor D 0:1:1:1 generic]
|
||||
|
||||
# Write to STEP
|
||||
WriteStep D ${TempFilename}
|
||||
|
||||
# Read and check
|
||||
ReadStep D1 ${TempFilename}
|
||||
|
||||
set colors_new [XGetShapeColor D1 0:1:1:1:1 generic]
|
||||
if { [string equal ${colors_new} ${colors_old}] == -1 } {
|
||||
puts "ERROR: OCC33317 is reproduced while STEP export."
|
||||
}
|
||||
|
||||
# Clear temp file
|
||||
file delete -force $TempFilename
|
||||
Close D
|
||||
Close D1
|
||||
Loading…
x
Reference in New Issue
Block a user