From c92cee4112cedbd8b065e1e9f510623ef17ed3cf Mon Sep 17 00:00:00 2001 From: srn Date: Mon, 4 Apr 2005 11:40:58 +0000 Subject: [PATCH] Added common inclusion file, added structure TextColor --- src/SALOMEDSClient/Makefile.in | 6 ++- src/SALOMEDSClient/SALOMEDSClient.hxx | 44 +++++++++++++++++++ .../SALOMEDSClient_AttributeTextColor.hxx | 5 ++- ...MEDSClient_AttributeTextHighlightColor.hxx | 5 ++- .../SALOMEDSClient_definitions.hxx | 11 +++++ 5 files changed, 65 insertions(+), 6 deletions(-) create mode 100644 src/SALOMEDSClient/SALOMEDSClient.hxx create mode 100644 src/SALOMEDSClient/SALOMEDSClient_definitions.hxx diff --git a/src/SALOMEDSClient/Makefile.in b/src/SALOMEDSClient/Makefile.in index c016bdbfa..c3c92b5e2 100644 --- a/src/SALOMEDSClient/Makefile.in +++ b/src/SALOMEDSClient/Makefile.in @@ -10,7 +10,8 @@ VPATH=.:@srcdir@:@top_srcdir@/idl:$(top_srcdir)/idl @COMMENCE@ -EXPORT_HEADERS= SALOMEDSClient_AttributeComment.hxx \ +EXPORT_HEADERS= SALOMEDSClient_definitions.hxx \ + SALOMEDSClient_AttributeComment.hxx \ SALOMEDSClient_AttributeDrawable.hxx \ SALOMEDSClient_AttributeExpandable.hxx \ SALOMEDSClient_AttributeExternalFileDef.hxx \ @@ -47,7 +48,8 @@ EXPORT_HEADERS= SALOMEDSClient_AttributeComment.hxx \ SALOMEDSClient_StudyBuilder.hxx \ SALOMEDSClient_StudyManager.hxx \ SALOMEDSClient_UseCaseBuilder.hxx \ - SALOMEDSClient_UseCaseIterator.hxx + SALOMEDSClient_UseCaseIterator.hxx \ + SALOMEDSClient.hxx @CONCLUDE@ diff --git a/src/SALOMEDSClient/SALOMEDSClient.hxx b/src/SALOMEDSClient/SALOMEDSClient.hxx new file mode 100644 index 000000000..9a0bad065 --- /dev/null +++ b/src/SALOMEDSClient/SALOMEDSClient.hxx @@ -0,0 +1,44 @@ +#ifndef SALOMEDSCLIENT_HXX +#define SALOMEDSCLIENT_HXX + +#include "SALOMEDSClient_definitions.hxx" +#include "SALOMEDSClient_AttributeComment.hxx" +#include "SALOMEDSClient_AttributeDrawable.hxx" +#include "SALOMEDSClient_AttributeExpandable.hxx" +#include "SALOMEDSClient_AttributeExternalFileDef.hxx" +#include "SALOMEDSClient_AttributeFileType.hxx" +#include "SALOMEDSClient_AttributeFlags.hxx" +#include "SALOMEDSClient_AttributeGraphic.hxx" +#include "SALOMEDSClient_AttributeIOR.hxx" +#include "SALOMEDSClient_AttributeInteger.hxx" +#include "SALOMEDSClient_AttributeLocalID.hxx" +#include "SALOMEDSClient_AttributeName.hxx" +#include "SALOMEDSClient_AttributeOpened.hxx" +#include "SALOMEDSClient_AttributePersistentRef.hxx" +#include "SALOMEDSClient_AttributePixMap.hxx" +#include "SALOMEDSClient_AttributePythonObject.hxx" +#include "SALOMEDSClient_AttributeReal.hxx" +#include "SALOMEDSClient_AttributeSelectable.hxx" +#include "SALOMEDSClient_AttributeSequenceOfInteger.hxx" +#include "SALOMEDSClient_AttributeSequenceOfReal.hxx" +#include "SALOMEDSClient_AttributeStudyProperties.hxx" +#include "SALOMEDSClient_AttributeTableOfInteger.hxx" +#include "SALOMEDSClient_AttributeTableOfReal.hxx" +#include "SALOMEDSClient_AttributeTableOfString.hxx" +#include "SALOMEDSClient_AttributeTarget.hxx" +#include "SALOMEDSClient_AttributeTextColor.hxx" +#include "SALOMEDSClient_AttributeTextHighlightColor.hxx" +#include "SALOMEDSClient_AttributeTreeNode.hxx" +#include "SALOMEDSClient_AttributeUserID.hxx" +#include "SALOMEDSClient_ChildIterator.hxx" +#include "SALOMEDSClient_GenericAttribute.hxx" +#include "SALOMEDSClient_SComponent.hxx" +#include "SALOMEDSClient_SComponentIterator.hxx" +#include "SALOMEDSClient_SObject.hxx" +#include "SALOMEDSClient_Study.hxx" +#include "SALOMEDSClient_StudyBuilder.hxx" +#include "SALOMEDSClient_StudyManager.hxx" +#include "SALOMEDSClient_UseCaseBuilder.hxx" +#include "SALOMEDSClient_UseCaseIterator.hxx" + +#endif \ No newline at end of file diff --git a/src/SALOMEDSClient/SALOMEDSClient_AttributeTextColor.hxx b/src/SALOMEDSClient/SALOMEDSClient_AttributeTextColor.hxx index eccbd17c6..fb5f65dcb 100644 --- a/src/SALOMEDSClient/SALOMEDSClient_AttributeTextColor.hxx +++ b/src/SALOMEDSClient/SALOMEDSClient_AttributeTextColor.hxx @@ -7,13 +7,14 @@ #include #include "SALOMEDSClient_GenericAttribute.hxx" +#include "SALOMEDSClient_definitions.hxx" class SALOMEDSClient_AttributeTextColor: public virtual SALOMEDSClient_GenericAttribute { public: - virtual std::vector TextColor() = 0; - virtual void SetTextColor(const std::vector& value) = 0; + virtual STextColor TextColor() = 0; + virtual void SetTextColor(STextColor value) = 0; }; diff --git a/src/SALOMEDSClient/SALOMEDSClient_AttributeTextHighlightColor.hxx b/src/SALOMEDSClient/SALOMEDSClient_AttributeTextHighlightColor.hxx index b728393a1..1102ea355 100644 --- a/src/SALOMEDSClient/SALOMEDSClient_AttributeTextHighlightColor.hxx +++ b/src/SALOMEDSClient/SALOMEDSClient_AttributeTextHighlightColor.hxx @@ -7,12 +7,13 @@ #include #include "SALOMEDSClient_GenericAttribute.hxx" +#include "SALOMEDSClient_definitions.hxx" class SALOMEDSClient_AttributeTextHighlightColor: public virtual SALOMEDSClient_GenericAttribute { public: - virtual std::vector TextHighlightColor() = 0; - virtual void SetTextHighlightColor(const std::vector& value) = 0; + virtual STextColor TextHighlightColor() = 0; + virtual void SetTextHighlightColor(STextColor value) = 0; }; diff --git a/src/SALOMEDSClient/SALOMEDSClient_definitions.hxx b/src/SALOMEDSClient/SALOMEDSClient_definitions.hxx new file mode 100644 index 000000000..dd6f8992a --- /dev/null +++ b/src/SALOMEDSClient/SALOMEDSClient_definitions.hxx @@ -0,0 +1,11 @@ +#ifndef SALOMEDSCLIENT_DEF_HXX +#define SALOMEDSCLIENT_DEF_HXX + +struct STextColor +{ + double R; + double G; + double B; +}; + +#endif -- 2.39.2