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

@@ -42,7 +42,7 @@ public:
virtual void updatePlotData();
protected:
void updateCurveTitle();
virtual QString createCurveName();
virtual void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue);
virtual void defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering);