mirror of
https://github.com/OPM/ResInsight.git
synced 2025-02-25 18:55:39 -06:00
WIP resolved conflicts
This commit is contained in:
@@ -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 = "");
|
||||
|
||||
Reference in New Issue
Block a user