From 03847198b785d005a255c06bbc56b387e84be451 Mon Sep 17 00:00:00 2001 From: Magne Sjaastad Date: Mon, 7 Apr 2025 10:26:19 +0200 Subject: [PATCH] Use correct annotation color --- .../ProjectDataModel/Annotations/RimPlotAxisAnnotation.cpp | 2 +- .../ProjectDataModel/Annotations/RimTimeAxisAnnotation.h | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/ApplicationLibCode/ProjectDataModel/Annotations/RimPlotAxisAnnotation.cpp b/ApplicationLibCode/ProjectDataModel/Annotations/RimPlotAxisAnnotation.cpp index 66d40b985d..24c8982a44 100644 --- a/ApplicationLibCode/ProjectDataModel/Annotations/RimPlotAxisAnnotation.cpp +++ b/ApplicationLibCode/ProjectDataModel/Annotations/RimPlotAxisAnnotation.cpp @@ -122,7 +122,7 @@ double RimPlotAxisAnnotation::rangeEnd() const //-------------------------------------------------------------------------------------------------- QColor RimPlotAxisAnnotation::color() const { - return QColor( 0, 0, 100 ); + return RiaColorTools::toQColor( m_color ); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/ProjectDataModel/Annotations/RimTimeAxisAnnotation.h b/ApplicationLibCode/ProjectDataModel/Annotations/RimTimeAxisAnnotation.h index e8f001e912..7073dac5dc 100644 --- a/ApplicationLibCode/ProjectDataModel/Annotations/RimTimeAxisAnnotation.h +++ b/ApplicationLibCode/ProjectDataModel/Annotations/RimTimeAxisAnnotation.h @@ -42,7 +42,6 @@ public: void setTimeRange( time_t startTime, time_t endTime ); void setDefaultColor(); - void setDateTimeFormatString( const QString& formatString ); protected: void defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering ) override;