OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

#3773 Annotations. Set default color for line based annotations

Browse Source
This commit is contained in:
Bjørn Erik Jensen
2018-11-28 15:00:10 +01:00
parent 0148fc2279
commit bbec88b5d1
6 changed files with 77 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -20,6 +20,7 @@
#include "RiaApplication.h"
#include "RimAnnotationColorFactory.h"
#include "RimTextAnnotation.h"
#include "RimReachCircleAnnotation.h"
#include "RimPolylinesFromFileAnnotation.h"
@@ -134,7 +135,6 @@ RimPolylinesFromFileAnnotation* RimAnnotationCollection::importOrUpdatePolylines
{
QStringList newFileNames;
std::vector<RimPolylinesFromFileAnnotation*> polyLinesObjsToReload;
size_t formationListBeforeImportCount = m_polylineFromFileAnnotations.size();
for(const QString& newFileName : fileNames)
{
@@ -160,7 +160,7 @@ RimPolylinesFromFileAnnotation* RimAnnotationCollection::importOrUpdatePolylines
{
RimPolylinesFromFileAnnotation* newPolyLinesAnnot = new RimPolylinesFromFileAnnotation;
auto newColor = RiaColorTables::categoryPaletteColors().cycledColor3f(formationListBeforeImportCount + newLinesIdx);
auto newColor = RimAnnotationColorFactory::getColor(lineBasedAnnotationsCount());
newPolyLinesAnnot->setFileName(newFileName);
newPolyLinesAnnot->setDescriptionFromFileName();
@@ -174,10 +174,9 @@ RimPolylinesFromFileAnnotation* RimAnnotationCollection::importOrUpdatePolylines
reloadPolylinesFromFile(polyLinesObjsToReload);
if (m_polylineFromFileAnnotations.size() > formationListBeforeImportCount)
if (!newFileNames.empty())
{
return m_polylineFromFileAnnotations[m_polylineFromFileAnnotations.size() - 1];
return m_polylineFromFileAnnotations.childObjects().back();
}
else
{