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;