WIP resolved conflicts

This commit is contained in:
Magne Sjaastad
2015-09-18 13:02:33 +02:00
parent 6be5be4746
commit 842363eebd
9 changed files with 145 additions and 81 deletions

View File

@@ -40,13 +40,18 @@ class RimWellLogFileCurve : public RimWellLogPlotCurve
public:
RimWellLogFileCurve();
virtual ~RimWellLogFileCurve();
virtual void updatePlotData();
void setWellPath(RimWellPath* wellPath);
void setWellLogChannelName(const QString& name);
// Overrides from RimWellLogPlotCurve
virtual void updatePlotData();
protected:
// Overrides from RimWellLogPlotCurve
virtual QString createCurveName();
// Pdm overrrides
virtual void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue);
virtual void defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering);
virtual void defineUiTreeOrdering(caf::PdmUiTreeOrdering& uiTreeOrdering, QString uiConfigName = "");