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

#4207 Make grid cross plot symbols smaller and enable concave symbols.

Browse Source
This commit is contained in:
Gaute Lindkvist 2019-03-20 13:38:45 +01:00
parent f33b739de2
commit 8c06d06e54
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ApplicationCode/ProjectDataModel/GridCrossPlots/RimGridCrossPlotCurve.cpp
View File

@ -53,7 +53,7 @@ RimGridCrossPlotCurve::RimGridCrossPlotCurve()
setLineStyle(RiuQwtPlotCurve::STYLE_NONE);
setSymbol(RiuQwtSymbol::SYMBOL_NONE);
setSymbolSize(6);
setSymbolSize(4);
}
//--------------------------------------------------------------------------------------------------
@ -97,7 +97,7 @@ int RimGridCrossPlotCurve::groupIndex() const
//--------------------------------------------------------------------------------------------------
void RimGridCrossPlotCurve::determineSymbol()
{
RiuQwtSymbol::PointSymbolEnum symbol = RiuQwtSymbol::cycledFilledSymbolStyle(m_curveSetIndex);
RiuQwtSymbol::PointSymbolEnum symbol = RiuQwtSymbol::cycledSymbolStyle(m_curveSetIndex);
setSymbol(symbol);
}

6
ApplicationCode/UserInterface/RiuQwtSymbol.cpp
View File

@ -180,12 +180,12 @@ RiuQwtSymbol::PointSymbolEnum RiuQwtSymbol::cycledSymbolStyle(int indexLevel1, i
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RiuQwtSymbol::PointSymbolEnum RiuQwtSymbol::cycledFilledSymbolStyle(int indexLevel)
RiuQwtSymbol::PointSymbolEnum RiuQwtSymbol::cycledSymbolStyle(int indexLevel)
{
std::vector<PointSymbolEnum> contrastingSymbols =
{
SYMBOL_ELLIPSE, SYMBOL_RECT, SYMBOL_DIAMOND, SYMBOL_DOWN_TRIANGLE, SYMBOL_UP_TRIANGLE,
SYMBOL_LEFT_TRIANGLE, SYMBOL_RIGHT_TRIANGLE, SYMBOL_STAR2
SYMBOL_ELLIPSE, SYMBOL_CROSS, SYMBOL_RECT, SYMBOL_DOWN_TRIANGLE, SYMBOL_UP_TRIANGLE,
SYMBOL_LEFT_TRIANGLE, SYMBOL_RIGHT_TRIANGLE, SYMBOL_STAR2, SYMBOL_DIAMOND, SYMBOL_STAR1
};
return contrastingSymbols[indexLevel % (int)contrastingSymbols.size()];

2
ApplicationCode/UserInterface/RiuQwtSymbol.h
View File

@ -66,7 +66,7 @@ public:
void setLabelPosition(LabelPosition labelPosition);
static PointSymbolEnum cycledSymbolStyle(int indexLevel1, int indexLevel2);
static PointSymbolEnum cycledFilledSymbolStyle(int indexLevel);
static PointSymbolEnum cycledSymbolStyle(int indexLevel);
private:
QRect labelBoundingRect(const QPainter* painter, const QRect& symbolRect) const;