OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-10 15:36:09 -06:00
Code Issues Packages Projects Releases Wiki Activity

#3788 Annotations. Set texts and icons

Browse Source
This commit is contained in:
Bjørn Erik Jensen 2018-12-03 15:28:07 +01:00
parent 4026f21a00
commit e56090dc92
9 changed files with 34 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ApplicationCode/ModelVisualization/RivPolylineAnnotationPartMgr.cpp
View File

@ -189,6 +189,7 @@ void RivPolylineAnnotationPartMgr::appendDynamicGeometryPartsToModel(cvf::ModelB
const cvf::BoundingBox& boundingBox) const cvf::BoundingBox& boundingBox)
{ {
auto rimAnnotation = m_rimAnnotationInView->sourceAnnotation(); auto rimAnnotation = m_rimAnnotationInView->sourceAnnotation();
if (!rimAnnotation) return;
if (rimAnnotation->isEmpty()) return; if (rimAnnotation->isEmpty()) return;
if (!m_rimAnnotationInView->isVisible()) return; if (!m_rimAnnotationInView->isVisible()) return;

15
ApplicationCode/ProjectDataModel/Annotations/RimAnnotationCollection.cpp
View File

@ -53,9 +53,18 @@ RimAnnotationCollection::RimAnnotationCollection()
m_userDefinedPolylineAnnotations.uiCapability()->setUiHidden(true); m_userDefinedPolylineAnnotations.uiCapability()->setUiHidden(true);
m_polylineFromFileAnnotations.uiCapability()->setUiHidden(true); m_polylineFromFileAnnotations.uiCapability()->setUiHidden(true);
m_reachCircleAnnotations = new RimAnnotationGroupCollection("Reach Circle Annotations"); m_reachCircleAnnotations = new RimAnnotationGroupCollection();
m_userDefinedPolylineAnnotations = new RimAnnotationGroupCollection("User Defined Polyline Annotations"); m_userDefinedPolylineAnnotations = new RimAnnotationGroupCollection();
m_polylineFromFileAnnotations = new RimAnnotationGroupCollection("Polylines From File"); m_polylineFromFileAnnotations = new RimAnnotationGroupCollection();
m_reachCircleAnnotations->uiCapability()->setUiName("Reach Circle Annotations");
m_userDefinedPolylineAnnotations->uiCapability()->setUiName("User Defined Polyline Annotations");
m_polylineFromFileAnnotations->uiCapability()->setUiName("Polylines From File");
m_reachCircleAnnotations->uiCapability()->setUiIcon(QIcon(":/ReachCircle16x16.png"));
m_userDefinedPolylineAnnotations->uiCapability()->setUiIcon(QIcon(":/PolylinesFromFile16x16.png"));
m_polylineFromFileAnnotations->uiCapability()->setUiIcon(QIcon(":/PolylinesFromFile16x16.png"));
} }

4
ApplicationCode/ProjectDataModel/Annotations/RimAnnotationCollectionBase.cpp
View File

@ -47,7 +47,9 @@ RimAnnotationCollectionBase::RimAnnotationCollectionBase()
CAF_PDM_InitFieldNoDefault(&m_textAnnotations, "TextAnnotations", "Text Annotations", "", "", ""); CAF_PDM_InitFieldNoDefault(&m_textAnnotations, "TextAnnotations", "Text Annotations", "", "", "");
m_textAnnotations.uiCapability()->setUiHidden(true); m_textAnnotations.uiCapability()->setUiHidden(true);
m_textAnnotations = new RimAnnotationGroupCollection("Text Annotations"); m_textAnnotations = new RimAnnotationGroupCollection();
m_textAnnotations->uiCapability()->setUiName("Text Annotations");
m_textAnnotations->uiCapability()->setUiIcon(QIcon(":/TextAnnotation16x16.png"));
} }

28
ApplicationCode/ProjectDataModel/Annotations/RimAnnotationGroupCollection.cpp
View File

@ -42,23 +42,13 @@ RimAnnotationGroupCollection::RimAnnotationGroupCollection()
{ {
CAF_PDM_InitObject("Annotations", ":/WellCollection.png", "", ""); CAF_PDM_InitObject("Annotations", ":/WellCollection.png", "", "");
CAF_PDM_InitField(&m_title, "Title", QString("Annotations"), "Title", "", "", "");
CAF_PDM_InitField(&m_isActive, "IsActive", true, "Is Active", "", "", ""); CAF_PDM_InitField(&m_isActive, "IsActive", true, "Is Active", "", "", "");
CAF_PDM_InitFieldNoDefault(&m_annotations, "Annotations", "Annotations", "", "", ""); CAF_PDM_InitFieldNoDefault(&m_annotations, "Annotations", "Annotations", "", "", "");
m_isActive.uiCapability()->setUiHidden(true);
m_annotations.uiCapability()->setUiHidden(true); m_annotations.uiCapability()->setUiHidden(true);
} }
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimAnnotationGroupCollection::RimAnnotationGroupCollection(const QString& title)
: RimAnnotationGroupCollection()
{
m_title = title;
}
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
@ -66,14 +56,6 @@ RimAnnotationGroupCollection::~RimAnnotationGroupCollection()
{ {
} }
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimAnnotationGroupCollection::setTitle(const QString& title)
{
m_title = title;
}
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
@ -136,11 +118,3 @@ caf::PdmFieldHandle* RimAnnotationGroupCollection::objectToggleField()
{ {
return &m_isActive; return &m_isActive;
} }
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
caf::PdmFieldHandle* RimAnnotationGroupCollection::userDescriptionField()
{
return &m_title;
}

4
ApplicationCode/ProjectDataModel/Annotations/RimAnnotationGroupCollection.h
View File

@ -41,10 +41,8 @@ class RimAnnotationGroupCollection : public caf::PdmObject
CAF_PDM_HEADER_INIT; CAF_PDM_HEADER_INIT;
public: public:
RimAnnotationGroupCollection(); RimAnnotationGroupCollection();
RimAnnotationGroupCollection(const QString& title);
~RimAnnotationGroupCollection() override; ~RimAnnotationGroupCollection() override;
void setTitle(const QString& title);
bool isActive() const; bool isActive() const;
bool isVisible() const; bool isVisible() const;
@ -54,10 +52,8 @@ public:
protected: protected:
void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue) override; void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue) override;
caf::PdmFieldHandle* objectToggleField() override; caf::PdmFieldHandle* objectToggleField() override;
caf::PdmFieldHandle* userDescriptionField() override;
protected: protected:
caf::PdmField<QString> m_title;
caf::PdmField<bool> m_isActive; caf::PdmField<bool> m_isActive;
caf::PdmChildArrayField<caf::PdmObject*> m_annotations; caf::PdmChildArrayField<caf::PdmObject*> m_annotations;
}; };

18
ApplicationCode/ProjectDataModel/Annotations/RimAnnotationInViewCollection.cpp
View File

@ -96,10 +96,20 @@ RimAnnotationInViewCollection::RimAnnotationInViewCollection()
m_globalUserDefinedPolylineAnnotations.uiCapability()->setUiHidden(true); m_globalUserDefinedPolylineAnnotations.uiCapability()->setUiHidden(true);
m_globalPolylineFromFileAnnotations.uiCapability()->setUiHidden(true); m_globalPolylineFromFileAnnotations.uiCapability()->setUiHidden(true);
m_globalTextAnnotations = new RimAnnotationGroupCollection("Global Text Annotations"); m_globalTextAnnotations = new RimAnnotationGroupCollection();
m_globalReachCircleAnnotations = new RimAnnotationGroupCollection("Global Reach Circle Annotations"); m_globalReachCircleAnnotations = new RimAnnotationGroupCollection();
m_globalUserDefinedPolylineAnnotations = new RimAnnotationGroupCollection("Global User Defined Polylines Annotations"); m_globalUserDefinedPolylineAnnotations = new RimAnnotationGroupCollection();
m_globalPolylineFromFileAnnotations = new RimAnnotationGroupCollection("Global Polylines From File Annotations"); m_globalPolylineFromFileAnnotations = new RimAnnotationGroupCollection();
m_globalTextAnnotations->uiCapability()->setUiName("Global Text Annotations");
m_globalReachCircleAnnotations->uiCapability()->setUiName("Global Reach Circle Annotations");
m_globalUserDefinedPolylineAnnotations->uiCapability()->setUiName("Global User Defined Polylines Annotations");
m_globalPolylineFromFileAnnotations->uiCapability()->setUiName("Global Polylines From File Annotations");
m_globalTextAnnotations->uiCapability()->setUiIcon(QIcon(":/TextAnnotation16x16.png"));
m_globalReachCircleAnnotations->uiCapability()->setUiIcon(QIcon(":/ReachCircle16x16.png"));
m_globalUserDefinedPolylineAnnotations->uiCapability()->setUiIcon(QIcon(":/PolylinesFromFile16x16.png"));
m_globalPolylineFromFileAnnotations->uiCapability()->setUiIcon(QIcon(":/PolylinesFromFile16x16.png"));
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------

1
ApplicationCode/ProjectDataModel/Annotations/RimPolylinesAnnotationInView.cpp
View File

@ -36,6 +36,7 @@ RimPolylinesAnnotationInView::RimPolylinesAnnotationInView()
CAF_PDM_InitFieldNoDefault(&m_sourceAnnotation, "SourceAnnotation", "Source Annotation", "", "", ""); CAF_PDM_InitFieldNoDefault(&m_sourceAnnotation, "SourceAnnotation", "Source Annotation", "", "", "");
m_isActive.uiCapability()->setUiHidden(true); m_isActive.uiCapability()->setUiHidden(true);
m_sourceAnnotation.uiCapability()->setUiHidden(true);
m_sourceAnnotation = nullptr; m_sourceAnnotation = nullptr;
} }

1
ApplicationCode/ProjectDataModel/Annotations/RimReachCircleAnnotationInView.cpp
View File

@ -36,6 +36,7 @@ RimReachCircleAnnotationInView::RimReachCircleAnnotationInView()
CAF_PDM_InitFieldNoDefault(&m_sourceAnnotation, "SourceAnnotation", "Source Annotation", "", "", ""); CAF_PDM_InitFieldNoDefault(&m_sourceAnnotation, "SourceAnnotation", "Source Annotation", "", "", "");
m_isActive.uiCapability()->setUiHidden(true); m_isActive.uiCapability()->setUiHidden(true);
m_sourceAnnotation.uiCapability()->setUiHidden(true);
m_sourceAnnotation = nullptr; m_sourceAnnotation = nullptr;
} }

1
ApplicationCode/ProjectDataModel/Annotations/RimTextAnnotationInView.cpp
View File

@ -36,6 +36,7 @@ RimTextAnnotationInView::RimTextAnnotationInView()
CAF_PDM_InitFieldNoDefault(&m_sourceAnnotation, "SourceAnnotation", "Source Annotation", "", "", ""); CAF_PDM_InitFieldNoDefault(&m_sourceAnnotation, "SourceAnnotation", "Source Annotation", "", "", "");
m_isActive.uiCapability()->setUiHidden(true); m_isActive.uiCapability()->setUiHidden(true);
m_sourceAnnotation.uiCapability()->setUiHidden(true);
m_sourceAnnotation = nullptr; m_sourceAnnotation = nullptr;
} }