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

#1944 Use line style None, and force symbols on for observed data

Browse Source
This commit is contained in:
Jacob Støren 2017-10-02 08:53:29 +02:00
parent 240e9fd844
commit fd1b8c83ff
4 changed files with 40 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ApplicationCode/ProjectDataModel/RimPlotCurve.cpp
View File

@ -494,6 +494,14 @@ void RimPlotCurve::setSymbol(PointSymbolEnum symbolStyle)
m_pointSymbol = symbolStyle; m_pointSymbol = symbolStyle;
} }
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimPlotCurve::PointSymbolEnum RimPlotCurve::symbol()
{
return m_pointSymbol();
}
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------

2
ApplicationCode/ProjectDataModel/RimPlotCurve.h
View File

@ -79,9 +79,11 @@ public:
cvf::Color3f color() const { return m_curveColor; } cvf::Color3f color() const { return m_curveColor; }
void setLineStyle(LineStyleEnum lineStyle); void setLineStyle(LineStyleEnum lineStyle);
void setSymbol(PointSymbolEnum symbolStyle); void setSymbol(PointSymbolEnum symbolStyle);
PointSymbolEnum symbol();
void setSymbolSkipDinstance(float distance); void setSymbolSkipDinstance(float distance);
void setLineThickness(int thickness); void setLineThickness(int thickness);
void resetAppearance(); void resetAppearance();
bool isCurveVisible() const; bool isCurveVisible() const;
void setCurveVisiblity(bool visible); void setCurveVisiblity(bool visible);

10
ApplicationCode/ProjectDataModel/Summary/RimSummaryCurveAppearanceCalculator.cpp
View File

@ -338,6 +338,16 @@ void RimSummaryCurveAppearanceCalculator::setupCurveLook(RimSummaryCurve* curve)
} }
curve->setColor(gradeColor(m_currentCurveBaseColor, m_currentCurveGradient)); curve->setColor(gradeColor(m_currentCurveBaseColor, m_currentCurveGradient));
if ( curve->summaryCase()->isObservedData() )
{
curve->setLineStyle(RimPlotCurve::STYLE_NONE);
if ( curve->symbol() == RimPlotCurve::SYMBOL_NONE )
{
curve->setSymbol(RimPlotCurve::SYMBOL_XCROSS);
}
}
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------

38
ApplicationCode/ProjectDataModel/Summary/RimSummaryCurveAppearanceCalculator.h
View File

@ -31,7 +31,9 @@ class RifEclipseSummaryAddress;
class RimSummaryCurveAppearanceCalculator class RimSummaryCurveAppearanceCalculator
{ {
public: public:
explicit RimSummaryCurveAppearanceCalculator(const std::set<std::pair<RimSummaryCase*, RifEclipseSummaryAddress> >& curveDefinitions, const std::set<std::string> allSummaryCaseNames, const std::set<std::string> allSummaryWellNames); explicit RimSummaryCurveAppearanceCalculator(const std::set<std::pair<RimSummaryCase*, RifEclipseSummaryAddress> >& curveDefinitions,
const std::set<std::string> allSummaryCaseNames,
const std::set<std::string> allSummaryWellNames);
enum CurveAppearanceType enum CurveAppearanceType
{ {
NONE, NONE,
@ -42,25 +44,25 @@ public:
LINE_THICKNESS LINE_THICKNESS
}; };
void assignDimensions(CurveAppearanceType caseAppearance, void assignDimensions(CurveAppearanceType caseAppearance,
CurveAppearanceType variAppearance, CurveAppearanceType variAppearance,
CurveAppearanceType wellAppearance, CurveAppearanceType wellAppearance,
CurveAppearanceType gropAppearance, CurveAppearanceType gropAppearance,
CurveAppearanceType regiAppearance); CurveAppearanceType regiAppearance);
void getDimensions(CurveAppearanceType* caseAppearance, void getDimensions(CurveAppearanceType* caseAppearance,
CurveAppearanceType* variAppearance, CurveAppearanceType* variAppearance,
CurveAppearanceType* wellAppearance, CurveAppearanceType* wellAppearance,
CurveAppearanceType* gropAppearance, CurveAppearanceType* gropAppearance,
CurveAppearanceType* regiAppearance) const; CurveAppearanceType* regiAppearance) const;
void setupCurveLook(RimSummaryCurve* curve); void setupCurveLook(RimSummaryCurve* curve);
static cvf::Color3f cycledPaletteColor(int colorIndex); static cvf::Color3f cycledPaletteColor(int colorIndex);
static cvf::Color3f cycledNoneRGBBrColor(int colorIndex); static cvf::Color3f cycledNoneRGBBrColor(int colorIndex);
static cvf::Color3f cycledGreenColor(int colorIndex); static cvf::Color3f cycledGreenColor(int colorIndex);
static cvf::Color3f cycledBlueColor(int colorIndex); static cvf::Color3f cycledBlueColor(int colorIndex);
static cvf::Color3f cycledRedColor(int colorIndex); static cvf::Color3f cycledRedColor(int colorIndex);
static cvf::Color3f cycledBrownColor(int colorIndex); static cvf::Color3f cycledBrownColor(int colorIndex);
private: private:
void setOneCurveAppearance(CurveAppearanceType appeaType, size_t totalCount, int appeaIdx, RimSummaryCurve* curve); void setOneCurveAppearance(CurveAppearanceType appeaType, size_t totalCount, int appeaIdx, RimSummaryCurve* curve);