From 210914d5626dec2fa4c717702d873d7b9447473a Mon Sep 17 00:00:00 2001 From: mkrylova Date: Wed, 8 Jul 2020 12:46:33 +0300 Subject: [PATCH] 0030277: Coding Rules - avoid extremely long class names in STEP packages Has changed the names of classes that are too long and fixed names in files where these classes are used --- src/RWStepAP214/RWStepAP214_GeneralModule.cxx | 20 +++++----- .../RWStepAP214_ReadWriteModule.cxx | 24 ++++++------ src/RWStepVisual/FILES | 8 ++-- ...otationCurveOccurrenceAndGeomReprItem.cxx} | 22 +++++------ ...otationCurveOccurrenceAndGeomReprItem.hxx} | 20 +++++----- ...bjAndRepresentationAndDraughtingModel.cxx} | 22 +++++------ ...bjAndRepresentationAndDraughtingModel.hxx} | 18 ++++----- src/StepAP214/StepAP214_Protocol.cxx | 8 ++-- src/StepVisual/FILES | 8 ++-- ...otationCurveOccurrenceAndGeomReprItem.cxx} | 8 ++-- ...otationCurveOccurrenceAndGeomReprItem.hxx} | 16 ++++---- ...bjAndRepresentationAndDraughtingModel.cxx} | 8 ++-- ...ObjAndRepresentationAndDraughtingModel.hxx | 38 +++++++++++++++++++ ...ionAndDraughtingModelAndRepresentation.hxx | 38 ------------------- 14 files changed, 129 insertions(+), 129 deletions(-) rename src/RWStepVisual/{RWStepVisual_RWAnnotationCurveOccurrenceAndAnnotationOccurrenceAndGeomReprItemAndReprItemAndStyledItem.cxx => RWStepVisual_RWAnnotationCurveOccurrenceAndGeomReprItem.cxx} (73%) rename src/RWStepVisual/{RWStepVisual_RWAnnotationCurveOccurrenceAndAnnotationOccurrenceAndGeomReprItemAndReprItemAndStyledItem.hxx => RWStepVisual_RWAnnotationCurveOccurrenceAndGeomReprItem.hxx} (50%) rename src/RWStepVisual/{RWStepVisual_RWCharacterizedObjectAndCharacterizedRepresentationAndDraughtingModelAndRepresentation.cxx => RWStepVisual_RWCharacterizedObjAndRepresentationAndDraughtingModel.cxx} (74%) rename src/RWStepVisual/{RWStepVisual_RWCharacterizedObjectAndCharacterizedRepresentationAndDraughtingModelAndRepresentation.hxx => RWStepVisual_RWCharacterizedObjAndRepresentationAndDraughtingModel.hxx} (62%) rename src/StepVisual/{StepVisual_AnnotationCurveOccurrenceAndAnnotationOccurrenceAndGeomReprItemAndReprItemAndStyledItem.cxx => StepVisual_AnnotationCurveOccurrenceAndGeomReprItem.cxx} (63%) rename src/StepVisual/{StepVisual_AnnotationCurveOccurrenceAndAnnotationOccurrenceAndGeomReprItemAndReprItemAndStyledItem.hxx => StepVisual_AnnotationCurveOccurrenceAndGeomReprItem.hxx} (51%) rename src/StepVisual/{StepVisual_CharacterizedObjectAndCharacterizedRepresentationAndDraughtingModelAndRepresentation.cxx => StepVisual_CharacterizedObjAndRepresentationAndDraughtingModel.cxx} (59%) create mode 100644 src/StepVisual/StepVisual_CharacterizedObjAndRepresentationAndDraughtingModel.hxx delete mode 100644 src/StepVisual/StepVisual_CharacterizedObjectAndCharacterizedRepresentationAndDraughtingModelAndRepresentation.hxx diff --git a/src/RWStepAP214/RWStepAP214_GeneralModule.cxx b/src/RWStepAP214/RWStepAP214_GeneralModule.cxx index 70db37a12a..55ea79fee6 100644 --- a/src/RWStepAP214/RWStepAP214_GeneralModule.cxx +++ b/src/RWStepAP214/RWStepAP214_GeneralModule.cxx @@ -1351,8 +1351,8 @@ IMPLEMENT_STANDARD_RTTIEXT(RWStepAP214_GeneralModule,StepData_GeneralModule) #include #include #include -#include -#include +#include +#include #include #include #include @@ -1363,8 +1363,8 @@ IMPLEMENT_STANDARD_RTTIEXT(RWStepAP214_GeneralModule,StepData_GeneralModule) #include #include #include -#include -#include +#include +#include static Standard_Integer catsh,catdr,catstr,catdsc,cataux; @@ -5132,8 +5132,8 @@ void RWStepAP214_GeneralModule::FillSharedCase(const Standard_Integer CN, break; case 715: { - DeclareAndCast(StepVisual_CharacterizedObjectAndCharacterizedRepresentationAndDraughtingModelAndRepresentation, anent, ent); - RWStepVisual_RWCharacterizedObjectAndCharacterizedRepresentationAndDraughtingModelAndRepresentation tool; + DeclareAndCast(StepVisual_CharacterizedObjAndRepresentationAndDraughtingModel, anent, ent); + RWStepVisual_RWCharacterizedObjAndRepresentationAndDraughtingModel tool; tool.Share(anent, iter); } break; @@ -5160,8 +5160,8 @@ void RWStepAP214_GeneralModule::FillSharedCase(const Standard_Integer CN, break; case 719: { - DeclareAndCast(StepVisual_AnnotationCurveOccurrenceAndAnnotationOccurrenceAndGeomReprItemAndReprItemAndStyledItem, anent, ent); - RWStepVisual_RWAnnotationCurveOccurrenceAndAnnotationOccurrenceAndGeomReprItemAndReprItemAndStyledItem tool; + DeclareAndCast(StepVisual_AnnotationCurveOccurrenceAndGeomReprItem, anent, ent); + RWStepVisual_RWAnnotationCurveOccurrenceAndGeomReprItem tool; tool.Share(anent, iter); } break; @@ -7191,7 +7191,7 @@ Standard_Boolean RWStepAP214_GeneralModule::NewVoid ent = new StepRepr_CharacterizedRepresentation; break; case 715: - ent = new StepVisual_CharacterizedObjectAndCharacterizedRepresentationAndDraughtingModelAndRepresentation; + ent = new StepVisual_CharacterizedObjAndRepresentationAndDraughtingModel; break; case 716: ent = new StepVisual_CameraModelD3MultiClipping; @@ -7203,7 +7203,7 @@ Standard_Boolean RWStepAP214_GeneralModule::NewVoid ent = new StepVisual_CameraModelD3MultiClippingUnion; break; case 719: - ent = new StepVisual_AnnotationCurveOccurrenceAndAnnotationOccurrenceAndGeomReprItemAndReprItemAndStyledItem; + ent = new StepVisual_AnnotationCurveOccurrenceAndGeomReprItem; break; case 720: ent = new StepVisual_SurfaceStyleTransparent; diff --git a/src/RWStepAP214/RWStepAP214_ReadWriteModule.cxx b/src/RWStepAP214/RWStepAP214_ReadWriteModule.cxx index 5e4749acea..2e7bcb36d8 100644 --- a/src/RWStepAP214/RWStepAP214_ReadWriteModule.cxx +++ b/src/RWStepAP214/RWStepAP214_ReadWriteModule.cxx @@ -1394,8 +1394,8 @@ IMPLEMENT_STANDARD_RTTIEXT(RWStepAP214_ReadWriteModule,StepData_ReadWriteModule) #include #include #include -#include -#include +#include +#include #include #include #include @@ -1406,8 +1406,8 @@ IMPLEMENT_STANDARD_RTTIEXT(RWStepAP214_ReadWriteModule,StepData_ReadWriteModule) #include #include #include -#include -#include +#include +#include #include #include @@ -9447,8 +9447,8 @@ void RWStepAP214_ReadWriteModule::ReadStep(const Standard_Integer CN, break; case 715: { - DeclareAndCast(StepVisual_CharacterizedObjectAndCharacterizedRepresentationAndDraughtingModelAndRepresentation, anent, ent); - RWStepVisual_RWCharacterizedObjectAndCharacterizedRepresentationAndDraughtingModelAndRepresentation tool; + DeclareAndCast(StepVisual_CharacterizedObjAndRepresentationAndDraughtingModel, anent, ent); + RWStepVisual_RWCharacterizedObjAndRepresentationAndDraughtingModel tool; tool.ReadStep(data, num, ach, anent); } break; @@ -9475,8 +9475,8 @@ void RWStepAP214_ReadWriteModule::ReadStep(const Standard_Integer CN, break; case 719: { - DeclareAndCast(StepVisual_AnnotationCurveOccurrenceAndAnnotationOccurrenceAndGeomReprItemAndReprItemAndStyledItem, anent, ent); - RWStepVisual_RWAnnotationCurveOccurrenceAndAnnotationOccurrenceAndGeomReprItemAndReprItemAndStyledItem tool; + DeclareAndCast(StepVisual_AnnotationCurveOccurrenceAndGeomReprItem, anent, ent); + RWStepVisual_RWAnnotationCurveOccurrenceAndGeomReprItem tool; tool.ReadStep(data, num, ach, anent); } break; @@ -14331,8 +14331,8 @@ void RWStepAP214_ReadWriteModule::WriteStep(const Standard_Integer CN, break; case 715: { - DeclareAndCast(StepVisual_CharacterizedObjectAndCharacterizedRepresentationAndDraughtingModelAndRepresentation, anent, ent); - RWStepVisual_RWCharacterizedObjectAndCharacterizedRepresentationAndDraughtingModelAndRepresentation tool; + DeclareAndCast(StepVisual_CharacterizedObjAndRepresentationAndDraughtingModel, anent, ent); + RWStepVisual_RWCharacterizedObjAndRepresentationAndDraughtingModel tool; tool.WriteStep(SW, anent); } break; @@ -14359,8 +14359,8 @@ void RWStepAP214_ReadWriteModule::WriteStep(const Standard_Integer CN, break; case 719: { - DeclareAndCast(StepVisual_AnnotationCurveOccurrenceAndAnnotationOccurrenceAndGeomReprItemAndReprItemAndStyledItem, anent, ent); - RWStepVisual_RWAnnotationCurveOccurrenceAndAnnotationOccurrenceAndGeomReprItemAndReprItemAndStyledItem tool; + DeclareAndCast(StepVisual_AnnotationCurveOccurrenceAndGeomReprItem, anent, ent); + RWStepVisual_RWAnnotationCurveOccurrenceAndGeomReprItem tool; tool.WriteStep(SW, anent); } break; diff --git a/src/RWStepVisual/FILES b/src/RWStepVisual/FILES index 33aa198544..739e8d7c9e 100644 --- a/src/RWStepVisual/FILES +++ b/src/RWStepVisual/FILES @@ -1,7 +1,7 @@ RWStepVisual_RWAnnotationCurveOccurrence.cxx RWStepVisual_RWAnnotationCurveOccurrence.hxx -RWStepVisual_RWAnnotationCurveOccurrenceAndAnnotationOccurrenceAndGeomReprItemAndReprItemAndStyledItem.cxx -RWStepVisual_RWAnnotationCurveOccurrenceAndAnnotationOccurrenceAndGeomReprItemAndReprItemAndStyledItem.hxx +RWStepVisual_RWAnnotationCurveOccurrenceAndGeomReprItem.cxx +RWStepVisual_RWAnnotationCurveOccurrenceAndGeomReprItem.hxx RWStepVisual_RWAnnotationFillArea.cxx RWStepVisual_RWAnnotationFillArea.hxx RWStepVisual_RWAnnotationFillAreaOccurrence.cxx @@ -30,8 +30,8 @@ RWStepVisual_RWCameraModelD3MultiClippingUnion.cxx RWStepVisual_RWCameraModelD3MultiClippingUnion.hxx RWStepVisual_RWCameraUsage.cxx RWStepVisual_RWCameraUsage.hxx -RWStepVisual_RWCharacterizedObjectAndCharacterizedRepresentationAndDraughtingModelAndRepresentation.cxx -RWStepVisual_RWCharacterizedObjectAndCharacterizedRepresentationAndDraughtingModelAndRepresentation.hxx +RWStepVisual_RWCharacterizedObjAndRepresentationAndDraughtingModel.cxx +RWStepVisual_RWCharacterizedObjAndRepresentationAndDraughtingModel.hxx RWStepVisual_RWColour.cxx RWStepVisual_RWColour.hxx RWStepVisual_RWColourRgb.cxx diff --git a/src/RWStepVisual/RWStepVisual_RWAnnotationCurveOccurrenceAndAnnotationOccurrenceAndGeomReprItemAndReprItemAndStyledItem.cxx b/src/RWStepVisual/RWStepVisual_RWAnnotationCurveOccurrenceAndGeomReprItem.cxx similarity index 73% rename from src/RWStepVisual/RWStepVisual_RWAnnotationCurveOccurrenceAndAnnotationOccurrenceAndGeomReprItemAndReprItemAndStyledItem.cxx rename to src/RWStepVisual/RWStepVisual_RWAnnotationCurveOccurrenceAndGeomReprItem.cxx index 0ca80c1bd4..2ad4042012 100644 --- a/src/RWStepVisual/RWStepVisual_RWAnnotationCurveOccurrenceAndAnnotationOccurrenceAndGeomReprItemAndReprItemAndStyledItem.cxx +++ b/src/RWStepVisual/RWStepVisual_RWAnnotationCurveOccurrenceAndGeomReprItem.cxx @@ -15,30 +15,30 @@ #include #include -#include +#include #include #include #include #include #include -#include +#include //======================================================================= -//function : RWStepVisual_RWAnnotationCurveOccurrenceAndAnnotationOccurrenceAndGeomReprItemAndReprItemAndStyledItem +//function : RWStepVisual_RWAnnotationCurveOccurrenceAndGeomReprItem //purpose : //======================================================================= -RWStepVisual_RWAnnotationCurveOccurrenceAndAnnotationOccurrenceAndGeomReprItemAndReprItemAndStyledItem:: - RWStepVisual_RWAnnotationCurveOccurrenceAndAnnotationOccurrenceAndGeomReprItemAndReprItemAndStyledItem () {} +RWStepVisual_RWAnnotationCurveOccurrenceAndGeomReprItem:: + RWStepVisual_RWAnnotationCurveOccurrenceAndGeomReprItem() {} //======================================================================= //function : ReadStep //purpose : //======================================================================= -void RWStepVisual_RWAnnotationCurveOccurrenceAndAnnotationOccurrenceAndGeomReprItemAndReprItemAndStyledItem::ReadStep +void RWStepVisual_RWAnnotationCurveOccurrenceAndGeomReprItem::ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num0, Handle(Interface_Check)& ach, -const Handle(StepVisual_AnnotationCurveOccurrenceAndAnnotationOccurrenceAndGeomReprItemAndReprItemAndStyledItem)& ent) const +const Handle(StepVisual_AnnotationCurveOccurrenceAndGeomReprItem)& ent) const { Standard_Integer num = 0; data->NamedForComplex("REPRESENTATION_ITEM", "RPRITM", num0, num, ach); @@ -73,9 +73,9 @@ const Handle(StepVisual_AnnotationCurveOccurrenceAndAnnotationOccurrenceAndGeomR //function : WriteStep //purpose : //======================================================================= -void RWStepVisual_RWAnnotationCurveOccurrenceAndAnnotationOccurrenceAndGeomReprItemAndReprItemAndStyledItem::WriteStep +void RWStepVisual_RWAnnotationCurveOccurrenceAndGeomReprItem::WriteStep (StepData_StepWriter& SW, -const Handle(StepVisual_AnnotationCurveOccurrenceAndAnnotationOccurrenceAndGeomReprItemAndReprItemAndStyledItem)& ent) const +const Handle(StepVisual_AnnotationCurveOccurrenceAndGeomReprItem)& ent) const { SW.StartEntity("ANNOTATION_CURVE_OCCURRENCE"); SW.StartEntity("ANNOTATION_OCCURRENCE"); @@ -100,8 +100,8 @@ const Handle(StepVisual_AnnotationCurveOccurrenceAndAnnotationOccurrenceAndGeomR //function : Share //purpose : //======================================================================= -void RWStepVisual_RWAnnotationCurveOccurrenceAndAnnotationOccurrenceAndGeomReprItemAndReprItemAndStyledItem::Share( - const Handle(StepVisual_AnnotationCurveOccurrenceAndAnnotationOccurrenceAndGeomReprItemAndReprItemAndStyledItem)& ent, +void RWStepVisual_RWAnnotationCurveOccurrenceAndGeomReprItem::Share( + const Handle(StepVisual_AnnotationCurveOccurrenceAndGeomReprItem)& ent, Interface_EntityIterator& iter) const { diff --git a/src/RWStepVisual/RWStepVisual_RWAnnotationCurveOccurrenceAndAnnotationOccurrenceAndGeomReprItemAndReprItemAndStyledItem.hxx b/src/RWStepVisual/RWStepVisual_RWAnnotationCurveOccurrenceAndGeomReprItem.hxx similarity index 50% rename from src/RWStepVisual/RWStepVisual_RWAnnotationCurveOccurrenceAndAnnotationOccurrenceAndGeomReprItemAndReprItemAndStyledItem.hxx rename to src/RWStepVisual/RWStepVisual_RWAnnotationCurveOccurrenceAndGeomReprItem.hxx index 8e54b28f9b..581d89e6e6 100644 --- a/src/RWStepVisual/RWStepVisual_RWAnnotationCurveOccurrenceAndAnnotationOccurrenceAndGeomReprItemAndReprItemAndStyledItem.hxx +++ b/src/RWStepVisual/RWStepVisual_RWAnnotationCurveOccurrenceAndGeomReprItem.hxx @@ -13,8 +13,8 @@ // Alternatively, this file may be used under the terms of Open CASCADE // commercial license or contractual agreement. -#ifndef _RWStepVisual_RWAnnotationCurveOccurrenceAndAnnotationOccurrenceAndGeomReprItemAndReprItemAndStyledItem_HeaderFile -#define _RWStepVisual_RWAnnotationCurveOccurrenceAndAnnotationOccurrenceAndGeomReprItemAndReprItemAndStyledItem_HeaderFile +#ifndef _RWStepVisual_RWAnnotationCurveOccurrenceAndGeomReprItem_HeaderFile +#define _RWStepVisual_RWAnnotationCurveOccurrenceAndGeomReprItem_HeaderFile #include #include @@ -23,23 +23,23 @@ #include class StepData_StepReaderData; class Interface_Check; -class StepVisual_AnnotationCurveOccurrenceAndAnnotationOccurrenceAndGeomReprItemAndReprItemAndStyledItem; +class StepVisual_AnnotationCurveOccurrenceAndGeomReprItem; class StepData_StepWriter; class Interface_EntityIterator; -//! Read & Write Module for AnnotationCurveOccurrenceAndAnnotationOccurrenceAndGeomReprItemAndReprItemAndStyledItem -class RWStepVisual_RWAnnotationCurveOccurrenceAndAnnotationOccurrenceAndGeomReprItemAndReprItemAndStyledItem +//! Read & Write Module for StepVisual_AnnotationCurveOccurrenceAndGeomReprItem +class RWStepVisual_RWAnnotationCurveOccurrenceAndGeomReprItem { public: DEFINE_STANDARD_ALLOC - Standard_EXPORT RWStepVisual_RWAnnotationCurveOccurrenceAndAnnotationOccurrenceAndGeomReprItemAndReprItemAndStyledItem(); + Standard_EXPORT RWStepVisual_RWAnnotationCurveOccurrenceAndGeomReprItem(); - Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepVisual_AnnotationCurveOccurrenceAndAnnotationOccurrenceAndGeomReprItemAndReprItemAndStyledItem)& ent) const; + Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepVisual_AnnotationCurveOccurrenceAndGeomReprItem)& ent) const; - Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepVisual_AnnotationCurveOccurrenceAndAnnotationOccurrenceAndGeomReprItemAndReprItemAndStyledItem)& ent) const; + Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepVisual_AnnotationCurveOccurrenceAndGeomReprItem)& ent) const; - Standard_EXPORT void Share (const Handle(StepVisual_AnnotationCurveOccurrenceAndAnnotationOccurrenceAndGeomReprItemAndReprItemAndStyledItem)& ent, Interface_EntityIterator& iter) const; + Standard_EXPORT void Share (const Handle(StepVisual_AnnotationCurveOccurrenceAndGeomReprItem)& ent, Interface_EntityIterator& iter) const; }; -#endif // _RWStepVisual_RWAnnotationCurveOccurrenceAndAnnotationOccurrenceAndGeomReprItemAndReprItemAndStyledItem_HeaderFile +#endif // _RWStepVisual_RWAnnotationCurveOccurrenceAndGeomReprItem_HeaderFile diff --git a/src/RWStepVisual/RWStepVisual_RWCharacterizedObjectAndCharacterizedRepresentationAndDraughtingModelAndRepresentation.cxx b/src/RWStepVisual/RWStepVisual_RWCharacterizedObjAndRepresentationAndDraughtingModel.cxx similarity index 74% rename from src/RWStepVisual/RWStepVisual_RWCharacterizedObjectAndCharacterizedRepresentationAndDraughtingModelAndRepresentation.cxx rename to src/RWStepVisual/RWStepVisual_RWCharacterizedObjAndRepresentationAndDraughtingModel.cxx index 797356839a..c0b99640be 100644 --- a/src/RWStepVisual/RWStepVisual_RWCharacterizedObjectAndCharacterizedRepresentationAndDraughtingModelAndRepresentation.cxx +++ b/src/RWStepVisual/RWStepVisual_RWCharacterizedObjAndRepresentationAndDraughtingModel.cxx @@ -16,18 +16,18 @@ #include #include -#include +#include #include #include #include -#include +#include //======================================================================= -//function : RWStepVisual_RWChObjAndChReprAndDModelAndRepr +//function : RWStepVisual_RWCharacterizedObjAndRepresentationAndDraughtingModel //purpose : //======================================================================= -RWStepVisual_RWCharacterizedObjectAndCharacterizedRepresentationAndDraughtingModelAndRepresentation:: - RWStepVisual_RWCharacterizedObjectAndCharacterizedRepresentationAndDraughtingModelAndRepresentation() +RWStepVisual_RWCharacterizedObjAndRepresentationAndDraughtingModel:: +RWStepVisual_RWCharacterizedObjAndRepresentationAndDraughtingModel() { } @@ -37,10 +37,10 @@ RWStepVisual_RWCharacterizedObjectAndCharacterizedRepresentationAndDraughtingMod //purpose : //======================================================================= -void RWStepVisual_RWCharacterizedObjectAndCharacterizedRepresentationAndDraughtingModelAndRepresentation::ReadStep +void RWStepVisual_RWCharacterizedObjAndRepresentationAndDraughtingModel::ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num0, Handle(Interface_Check)& ach, - const Handle(StepVisual_CharacterizedObjectAndCharacterizedRepresentationAndDraughtingModelAndRepresentation)& ent) const + const Handle(StepVisual_CharacterizedObjAndRepresentationAndDraughtingModel)& ent) const { Standard_Integer num = 0; data->NamedForComplex("REPRESENTATION","RPRSNT", num0, num, ach); @@ -78,9 +78,9 @@ void RWStepVisual_RWCharacterizedObjectAndCharacterizedRepresentationAndDraughti //purpose : //======================================================================= -void RWStepVisual_RWCharacterizedObjectAndCharacterizedRepresentationAndDraughtingModelAndRepresentation::WriteStep +void RWStepVisual_RWCharacterizedObjAndRepresentationAndDraughtingModel::WriteStep (StepData_StepWriter& SW, - const Handle(StepVisual_CharacterizedObjectAndCharacterizedRepresentationAndDraughtingModelAndRepresentation)& ent) const + const Handle(StepVisual_CharacterizedObjAndRepresentationAndDraughtingModel)& ent) const { SW.StartEntity("CHARACTERIZED_OBJECT"); SW.SendDerived(); @@ -103,8 +103,8 @@ void RWStepVisual_RWCharacterizedObjectAndCharacterizedRepresentationAndDraughti //purpose : //======================================================================= -void RWStepVisual_RWCharacterizedObjectAndCharacterizedRepresentationAndDraughtingModelAndRepresentation::Share -(const Handle(StepVisual_CharacterizedObjectAndCharacterizedRepresentationAndDraughtingModelAndRepresentation)& ent, +void RWStepVisual_RWCharacterizedObjAndRepresentationAndDraughtingModel::Share +(const Handle(StepVisual_CharacterizedObjAndRepresentationAndDraughtingModel)& ent, Interface_EntityIterator& iter) const { Standard_Integer nbElem = ent->NbItems(); diff --git a/src/RWStepVisual/RWStepVisual_RWCharacterizedObjectAndCharacterizedRepresentationAndDraughtingModelAndRepresentation.hxx b/src/RWStepVisual/RWStepVisual_RWCharacterizedObjAndRepresentationAndDraughtingModel.hxx similarity index 62% rename from src/RWStepVisual/RWStepVisual_RWCharacterizedObjectAndCharacterizedRepresentationAndDraughtingModelAndRepresentation.hxx rename to src/RWStepVisual/RWStepVisual_RWCharacterizedObjAndRepresentationAndDraughtingModel.hxx index 65264c928e..8b654d88df 100644 --- a/src/RWStepVisual/RWStepVisual_RWCharacterizedObjectAndCharacterizedRepresentationAndDraughtingModelAndRepresentation.hxx +++ b/src/RWStepVisual/RWStepVisual_RWCharacterizedObjAndRepresentationAndDraughtingModel.hxx @@ -13,8 +13,8 @@ // Alternatively, this file may be used under the terms of Open CASCADE // commercial license or contractual agreement. -#ifndef _RWStepVisual_RWCharacterizedObjectAndCharacterizedRepresentationAndDraughtingModelAndRepresentation_HeaderFile -#define _RWStepVisual_RWCharacterizedObjectAndCharacterizedRepresentationAndDraughtingModelAndRepresentation_HeaderFile +#ifndef _RWStepVisual_RWCharacterizedObjAndRepresentationAndDraughtingModel_HeaderFile +#define _RWStepVisual_RWCharacterizedObjAndRepresentationAndDraughtingModel_HeaderFile #include #include @@ -23,29 +23,29 @@ #include class StepData_StepReaderData; class Interface_Check; -class StepVisual_CharacterizedObjectAndCharacterizedRepresentationAndDraughtingModelAndRepresentation; +class StepVisual_CharacterizedObjAndRepresentationAndDraughtingModel; class StepData_StepWriter; class Interface_EntityIterator; //! Read & Write Module for complex STEP entity Characterized_Object & Characterized_Representation & Draughting_Model & Representation -class RWStepVisual_RWCharacterizedObjectAndCharacterizedRepresentationAndDraughtingModelAndRepresentation +class RWStepVisual_RWCharacterizedObjAndRepresentationAndDraughtingModel { public: DEFINE_STANDARD_ALLOC - Standard_EXPORT RWStepVisual_RWCharacterizedObjectAndCharacterizedRepresentationAndDraughtingModelAndRepresentation(); + Standard_EXPORT RWStepVisual_RWCharacterizedObjAndRepresentationAndDraughtingModel(); Standard_EXPORT void ReadStep(const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, - const Handle(StepVisual_CharacterizedObjectAndCharacterizedRepresentationAndDraughtingModelAndRepresentation)& ent) const; + const Handle(StepVisual_CharacterizedObjAndRepresentationAndDraughtingModel)& ent) const; Standard_EXPORT void WriteStep(StepData_StepWriter& SW, - const Handle(StepVisual_CharacterizedObjectAndCharacterizedRepresentationAndDraughtingModelAndRepresentation)& ent) const; + const Handle(StepVisual_CharacterizedObjAndRepresentationAndDraughtingModel)& ent) const; - Standard_EXPORT void Share(const Handle(StepVisual_CharacterizedObjectAndCharacterizedRepresentationAndDraughtingModelAndRepresentation)& ent, + Standard_EXPORT void Share(const Handle(StepVisual_CharacterizedObjAndRepresentationAndDraughtingModel)& ent, Interface_EntityIterator& iter) const; }; -#endif // _RRWStepVisual_RWCharacterizedObjectAndCharacterizedRepresentationAndDraughtingModelAndRepresentation_HeaderFile +#endif // _RWStepVisual_RWCharacterizedObjAndRepresentationAndDraughtingModel_HeaderFile diff --git a/src/StepAP214/StepAP214_Protocol.cxx b/src/StepAP214/StepAP214_Protocol.cxx index e638995c6c..00da5908ca 100644 --- a/src/StepAP214/StepAP214_Protocol.cxx +++ b/src/StepAP214/StepAP214_Protocol.cxx @@ -742,13 +742,13 @@ static Standard_CString schemaAP242DIS = "AP242_MANAGED_MODEL_BASED_3D_ENGINEERI #include #include #include -#include +#include #include #include #include #include #include -#include +#include #include #include @@ -1459,11 +1459,11 @@ StepAP214_Protocol::StepAP214_Protocol () types.Bind (STANDARD_TYPE(StepRepr_ConstructiveGeometryRepresentation), 712); types.Bind (STANDARD_TYPE(StepRepr_ConstructiveGeometryRepresentationRelationship), 713); types.Bind (STANDARD_TYPE(StepRepr_CharacterizedRepresentation), 714); - types.Bind (STANDARD_TYPE(StepVisual_CharacterizedObjectAndCharacterizedRepresentationAndDraughtingModelAndRepresentation), 715); + types.Bind (STANDARD_TYPE(StepVisual_CharacterizedObjAndRepresentationAndDraughtingModel), 715); types.Bind (STANDARD_TYPE(StepVisual_CameraModelD3MultiClipping), 716); types.Bind (STANDARD_TYPE(StepVisual_CameraModelD3MultiClippingIntersection), 717); types.Bind (STANDARD_TYPE(StepVisual_CameraModelD3MultiClippingUnion), 718); - types.Bind (STANDARD_TYPE(StepVisual_AnnotationCurveOccurrenceAndAnnotationOccurrenceAndGeomReprItemAndReprItemAndStyledItem), 719); + types.Bind (STANDARD_TYPE(StepVisual_AnnotationCurveOccurrenceAndGeomReprItem), 719); types.Bind (STANDARD_TYPE(StepVisual_SurfaceStyleTransparent), 720); types.Bind (STANDARD_TYPE(StepVisual_SurfaceStyleReflectanceAmbient), 721); types.Bind (STANDARD_TYPE(StepVisual_SurfaceStyleRendering), 722); diff --git a/src/StepVisual/FILES b/src/StepVisual/FILES index b6e6a0c1a0..b86995588f 100644 --- a/src/StepVisual/FILES +++ b/src/StepVisual/FILES @@ -1,7 +1,7 @@ StepVisual_AnnotationCurveOccurrence.cxx StepVisual_AnnotationCurveOccurrence.hxx -StepVisual_AnnotationCurveOccurrenceAndAnnotationOccurrenceAndGeomReprItemAndReprItemAndStyledItem.cxx -StepVisual_AnnotationCurveOccurrenceAndAnnotationOccurrenceAndGeomReprItemAndReprItemAndStyledItem.hxx +StepVisual_AnnotationCurveOccurrenceAndGeomReprItem.cxx +StepVisual_AnnotationCurveOccurrenceAndGeomReprItem.hxx StepVisual_AnnotationFillArea.cxx StepVisual_AnnotationFillArea.hxx StepVisual_AnnotationFillAreaOccurrence.cxx @@ -65,8 +65,8 @@ StepVisual_CameraModelD3MultiClippingUnionSelect.hxx StepVisual_CameraUsage.cxx StepVisual_CameraUsage.hxx StepVisual_CentralOrParallel.hxx -StepVisual_CharacterizedObjectAndCharacterizedRepresentationAndDraughtingModelAndRepresentation.cxx -StepVisual_CharacterizedObjectAndCharacterizedRepresentationAndDraughtingModelAndRepresentation.hxx +StepVisual_CharacterizedObjAndRepresentationAndDraughtingModel.cxx +StepVisual_CharacterizedObjAndRepresentationAndDraughtingModel.hxx StepVisual_Colour.cxx StepVisual_Colour.hxx StepVisual_ColourRgb.cxx diff --git a/src/StepVisual/StepVisual_AnnotationCurveOccurrenceAndAnnotationOccurrenceAndGeomReprItemAndReprItemAndStyledItem.cxx b/src/StepVisual/StepVisual_AnnotationCurveOccurrenceAndGeomReprItem.cxx similarity index 63% rename from src/StepVisual/StepVisual_AnnotationCurveOccurrenceAndAnnotationOccurrenceAndGeomReprItemAndReprItemAndStyledItem.cxx rename to src/StepVisual/StepVisual_AnnotationCurveOccurrenceAndGeomReprItem.cxx index 5c79b74dfc..7a0be61141 100644 --- a/src/StepVisual/StepVisual_AnnotationCurveOccurrenceAndAnnotationOccurrenceAndGeomReprItemAndReprItemAndStyledItem.cxx +++ b/src/StepVisual/StepVisual_AnnotationCurveOccurrenceAndGeomReprItem.cxx @@ -13,12 +13,12 @@ // Alternatively, this file may be used under the terms of Open CASCADE // commercial license or contractual agreement. -#include +#include -IMPLEMENT_STANDARD_RTTIEXT(StepVisual_AnnotationCurveOccurrenceAndAnnotationOccurrenceAndGeomReprItemAndReprItemAndStyledItem, StepVisual_AnnotationCurveOccurrence) +IMPLEMENT_STANDARD_RTTIEXT(StepVisual_AnnotationCurveOccurrenceAndGeomReprItem, StepVisual_AnnotationCurveOccurrence) //======================================================================= -//function : StepVisual_AnnotationCurveOccurrenceAndAnnotationOccurrenceAndGeomReprItemAndReprItemAndStyledItem +//function : StepVisual_AnnotationCurveOccurrenceAndGeomReprItem //purpose : //======================================================================= -StepVisual_AnnotationCurveOccurrenceAndAnnotationOccurrenceAndGeomReprItemAndReprItemAndStyledItem::StepVisual_AnnotationCurveOccurrenceAndAnnotationOccurrenceAndGeomReprItemAndReprItemAndStyledItem() { } +StepVisual_AnnotationCurveOccurrenceAndGeomReprItem::StepVisual_AnnotationCurveOccurrenceAndGeomReprItem() { } diff --git a/src/StepVisual/StepVisual_AnnotationCurveOccurrenceAndAnnotationOccurrenceAndGeomReprItemAndReprItemAndStyledItem.hxx b/src/StepVisual/StepVisual_AnnotationCurveOccurrenceAndGeomReprItem.hxx similarity index 51% rename from src/StepVisual/StepVisual_AnnotationCurveOccurrenceAndAnnotationOccurrenceAndGeomReprItemAndReprItemAndStyledItem.hxx rename to src/StepVisual/StepVisual_AnnotationCurveOccurrenceAndGeomReprItem.hxx index 1a09ab176c..1bcd06edd0 100644 --- a/src/StepVisual/StepVisual_AnnotationCurveOccurrenceAndAnnotationOccurrenceAndGeomReprItemAndReprItemAndStyledItem.hxx +++ b/src/StepVisual/StepVisual_AnnotationCurveOccurrenceAndGeomReprItem.hxx @@ -13,26 +13,26 @@ // Alternatively, this file may be used under the terms of Open CASCADE // commercial license or contractual agreement. -#ifndef _StepVisual_AnnotationCurveOccurrenceAndAnnotationOccurrenceAndGeomReprItemAndReprItemAndStyledItem_HeaderFile -#define _StepVisual_AnnotationCurveOccurrenceAndAnnotationOccurrenceAndGeomReprItemAndReprItemAndStyledItem_HeaderFile +#ifndef _StepVisual_AnnotationCurveOccurrenceAndGeomReprItem_HeaderFile +#define _StepVisual_AnnotationCurveOccurrenceAndGeomReprItem_HeaderFile #include #include #include -class StepVisual_AnnotationCurveOccurrenceAndAnnotationOccurrenceAndGeomReprItemAndReprItemAndStyledItem; -DEFINE_STANDARD_HANDLE(StepVisual_AnnotationCurveOccurrenceAndAnnotationOccurrenceAndGeomReprItemAndReprItemAndStyledItem, StepVisual_AnnotationCurveOccurrence) +class StepVisual_AnnotationCurveOccurrenceAndGeomReprItem; +DEFINE_STANDARD_HANDLE(StepVisual_AnnotationCurveOccurrenceAndGeomReprItem, StepVisual_AnnotationCurveOccurrence) //! Added for Dimensional Tolerances //! Complex STEP entity AnnotationCurveOccurrence & AnnotationOccurrence & GeometricRepresentationItem & RepresentationItem & StyledItem -class StepVisual_AnnotationCurveOccurrenceAndAnnotationOccurrenceAndGeomReprItemAndReprItemAndStyledItem : public StepVisual_AnnotationCurveOccurrence +class StepVisual_AnnotationCurveOccurrenceAndGeomReprItem : public StepVisual_AnnotationCurveOccurrence { public: - Standard_EXPORT StepVisual_AnnotationCurveOccurrenceAndAnnotationOccurrenceAndGeomReprItemAndReprItemAndStyledItem(); + Standard_EXPORT StepVisual_AnnotationCurveOccurrenceAndGeomReprItem(); - DEFINE_STANDARD_RTTIEXT(StepVisual_AnnotationCurveOccurrenceAndAnnotationOccurrenceAndGeomReprItemAndReprItemAndStyledItem, StepVisual_AnnotationCurveOccurrence) + DEFINE_STANDARD_RTTIEXT(StepVisual_AnnotationCurveOccurrenceAndGeomReprItem, StepVisual_AnnotationCurveOccurrence) }; -#endif // _StepVisual_AnnotationCurveOccurrenceAndAnnotationOccurrenceAndGeomReprItemAndReprItemAndStyledItem_HeaderFile +#endif // _StepVisual_AnnotationCurveOccurrenceAndGeomReprItem_HeaderFile diff --git a/src/StepVisual/StepVisual_CharacterizedObjectAndCharacterizedRepresentationAndDraughtingModelAndRepresentation.cxx b/src/StepVisual/StepVisual_CharacterizedObjAndRepresentationAndDraughtingModel.cxx similarity index 59% rename from src/StepVisual/StepVisual_CharacterizedObjectAndCharacterizedRepresentationAndDraughtingModelAndRepresentation.cxx rename to src/StepVisual/StepVisual_CharacterizedObjAndRepresentationAndDraughtingModel.cxx index 210f7bfbbe..27da8cfffd 100644 --- a/src/StepVisual/StepVisual_CharacterizedObjectAndCharacterizedRepresentationAndDraughtingModelAndRepresentation.cxx +++ b/src/StepVisual/StepVisual_CharacterizedObjAndRepresentationAndDraughtingModel.cxx @@ -13,12 +13,12 @@ // Alternatively, this file may be used under the terms of Open CASCADE // commercial license or contractual agreement. -#include +#include -IMPLEMENT_STANDARD_RTTIEXT(StepVisual_CharacterizedObjectAndCharacterizedRepresentationAndDraughtingModelAndRepresentation, StepVisual_DraughtingModel) +IMPLEMENT_STANDARD_RTTIEXT(StepVisual_CharacterizedObjAndRepresentationAndDraughtingModel, StepVisual_DraughtingModel) //======================================================================= -//function : StepVisual_CharacterizedObjectAndCharacterizedRepresentationAndDraughtingModelAndRepresentation +//function : StepVisual_CharacterizedObjAndRepresentationAndDraughtingModel //purpose : //======================================================================= -StepVisual_CharacterizedObjectAndCharacterizedRepresentationAndDraughtingModelAndRepresentation::StepVisual_CharacterizedObjectAndCharacterizedRepresentationAndDraughtingModelAndRepresentation() { } +StepVisual_CharacterizedObjAndRepresentationAndDraughtingModel::StepVisual_CharacterizedObjAndRepresentationAndDraughtingModel() { } diff --git a/src/StepVisual/StepVisual_CharacterizedObjAndRepresentationAndDraughtingModel.hxx b/src/StepVisual/StepVisual_CharacterizedObjAndRepresentationAndDraughtingModel.hxx new file mode 100644 index 0000000000..8ad010ab8f --- /dev/null +++ b/src/StepVisual/StepVisual_CharacterizedObjAndRepresentationAndDraughtingModel.hxx @@ -0,0 +1,38 @@ +// Created on: 2016-08-25 +// Created by: Irina KRYLOVA +// Copyright (c) 2016 OPEN CASCADE SAS +// +// This file is part of Open CASCADE Technology software library. +// +// This library is free software; you can redistribute it and/or modify it under +// the terms of the GNU Lesser General Public License version 2.1 as published +// by the Free Software Foundation, with special exception defined in the file +// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT +// distribution for complete text of the license and disclaimer of any warranty. +// +// Alternatively, this file may be used under the terms of Open CASCADE +// commercial license or contractual agreement. + +#ifndef _StepVisual_StepVisual_CharacterizedObjAndRepresentationAndDraughtingModel_HeaderFile +#define _StepVisual_StepVisual_CharacterizedObjAndRepresentationAndDraughtingModel_HeaderFile + +#include +#include + +#include + +class StepVisual_CharacterizedObjAndRepresentationAndDraughtingModel; +DEFINE_STANDARD_HANDLE(StepVisual_CharacterizedObjAndRepresentationAndDraughtingModel, StepVisual_DraughtingModel) +//! Added for Dimensional Tolerances +//! Complex STEP entity Characterized_Object & Characterized_Representation & Draughting_Model & Representation +class StepVisual_CharacterizedObjAndRepresentationAndDraughtingModel : public StepVisual_DraughtingModel +{ + +public: + + Standard_EXPORT StepVisual_CharacterizedObjAndRepresentationAndDraughtingModel(); + + DEFINE_STANDARD_RTTIEXT(StepVisual_CharacterizedObjAndRepresentationAndDraughtingModel, StepVisual_DraughtingModel) + +}; +#endif // _StepVisual_CharacterizedObjAndRepresentationAndDraughtingModel_HeaderFile diff --git a/src/StepVisual/StepVisual_CharacterizedObjectAndCharacterizedRepresentationAndDraughtingModelAndRepresentation.hxx b/src/StepVisual/StepVisual_CharacterizedObjectAndCharacterizedRepresentationAndDraughtingModelAndRepresentation.hxx deleted file mode 100644 index 4a49329a94..0000000000 --- a/src/StepVisual/StepVisual_CharacterizedObjectAndCharacterizedRepresentationAndDraughtingModelAndRepresentation.hxx +++ /dev/null @@ -1,38 +0,0 @@ -// Created on: 2016-08-25 -// Created by: Irina KRYLOVA -// Copyright (c) 2016 OPEN CASCADE SAS -// -// This file is part of Open CASCADE Technology software library. -// -// This library is free software; you can redistribute it and/or modify it under -// the terms of the GNU Lesser General Public License version 2.1 as published -// by the Free Software Foundation, with special exception defined in the file -// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT -// distribution for complete text of the license and disclaimer of any warranty. -// -// Alternatively, this file may be used under the terms of Open CASCADE -// commercial license or contractual agreement. - -#ifndef _StepVisual_CharacterizedObjectAndCharacterizedRepresentationAndDraughtingModelAndRepresentation_HeaderFile -#define _StepVisual_CharacterizedObjectAndCharacterizedRepresentationAndDraughtingModelAndRepresentation_HeaderFile - -#include -#include - -#include - -class StepVisual_CharacterizedObjectAndCharacterizedRepresentationAndDraughtingModelAndRepresentation; -DEFINE_STANDARD_HANDLE(StepVisual_CharacterizedObjectAndCharacterizedRepresentationAndDraughtingModelAndRepresentation, StepVisual_DraughtingModel) -//! Added for Dimensional Tolerances -//! Complex STEP entity Characterized_Object & Characterized_Representation & Draughting_Model & Representation -class StepVisual_CharacterizedObjectAndCharacterizedRepresentationAndDraughtingModelAndRepresentation : public StepVisual_DraughtingModel -{ - -public: - - Standard_EXPORT StepVisual_CharacterizedObjectAndCharacterizedRepresentationAndDraughtingModelAndRepresentation(); - - DEFINE_STANDARD_RTTIEXT(StepVisual_CharacterizedObjectAndCharacterizedRepresentationAndDraughtingModelAndRepresentation, StepVisual_DraughtingModel) - -}; -#endif // _StepVisual_CharacterizedObjectAndCharacterizedRepresentationAndDraughtingModelAndRepresentation_HeaderFile