#4128 Show Qwt symbol and color as icon in project tree

This commit is contained in:
Gaute Lindkvist
2019-02-22 11:08:21 +01:00
parent 7866122b31
commit 39a0c3f4d0
6 changed files with 22 additions and 15 deletions

View File

@@ -225,7 +225,6 @@ void RimGridCrossPlot::onLoadDataAndUpdate()
updateAllRequiredEditors();
updatePlot();
}
//--------------------------------------------------------------------------------------------------

View File

@@ -20,6 +20,7 @@
#include "RiaColorTables.h"
#include "RigCaseCellResultCalculator.h"
#include "RiuQwtSymbol.h"
#include "RimCase.h"
#include "RimEclipseCase.h"
@@ -35,6 +36,7 @@
#include "qwt_plot.h"
#include "qwt_plot_curve.h"
#include "qwt_graphic.h"
#include <random>
@@ -77,7 +79,6 @@ RimGridCrossPlotCurve::RimGridCrossPlotCurve()
CAF_PDM_InitObject("Cross Plot Points", ":/WellLogCurve16x16.png", "", "");
setLineStyle(RiuQwtPlotCurve::STYLE_NONE);
setLineThickness(0);
setSymbol(RiuQwtSymbol::SYMBOL_NONE);
setSymbolSize(6);
}
@@ -137,13 +138,3 @@ void RimGridCrossPlotCurve::defineUiOrdering(QString uiConfigName, caf::PdmUiOrd
caf::PdmUiGroup* appearanceGroup = uiOrdering.addNewGroup("Appearance");
RimPlotCurve::appearanceUiOrdering(*appearanceGroup);
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
QList<caf::PdmOptionItemInfo> RimGridCrossPlotCurve::calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions,
bool* useOptionsOnly)
{
QList<caf::PdmOptionItemInfo> options;
return options;
}

View File

@@ -49,6 +49,5 @@ protected:
QString createCurveAutoName() override;
void onLoadDataAndUpdate(bool updateParentPlot) override;
void defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) override;
QList<caf::PdmOptionItemInfo> calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions, bool* useOptionsOnly) override;
};

View File

@@ -288,6 +288,8 @@ void RimGridCrossPlotCurveSet::onLoadDataAndUpdate(bool updateParentPlot)
curve->setSamples(sampleCategory.second);
curve->updateCurveAppearance();
curve->updateCurveNameAndUpdatePlotLegendAndTitle();
curve->updateUiIconFromPlotSymbol();
m_crossPlotCurves.push_back(curve);
}