Rename in caf::PdmUiVec3dEditor

This commit is contained in:
Gaute Lindkvist committed 2019-02-06 09:39:47 +01:00
1 parent e4fa4b9994
commit 4ec8869743
4 files changed
+5 -5

No files matched your search

@@ -167,7 +167,7 @@ void RimReachCircleAnnotation::defineEditorAttribute(const caf::PdmFieldHandle*
attr->pickEventHandler = m_centerPointEventHandler; attr->pickEventHandler = m_centerPointEventHandler;
if (m_centerPointXyd().isZero()) if (m_centerPointXyd().isZero())
{ {
attr->startPicking = true; attr->startInPickingMode = true;
} }
} }
} }
@@ -233,7 +233,7 @@ void RimTextAnnotation::defineEditorAttribute(const caf::PdmFieldHandle* field,
attr->pickEventHandler = m_anchorPointPickEventHandler; attr->pickEventHandler = m_anchorPointPickEventHandler;
if (m_anchorPointXyd().isZero()) if (m_anchorPointXyd().isZero())
{ {
attr->startPicking = true; attr->startInPickingMode = true;
} }
} }
else if (attr && field == &m_labelPointXyd) else if (attr && field == &m_labelPointXyd)
+1 -1
View File
@@ -123,7 +123,7 @@ void caf::PdmUiVec3dEditor::configureAndUpdateUi(const QString& uiConfigName)
{ {
m_lineEdit->setStyleSheet(""); m_lineEdit->setStyleSheet("");
} }
pickButtonToggled(m_attribute.startPicking); pickButtonToggled(m_attribute.startInPickingMode);
m_lineEdit->setToolTip(uiField()->uiToolTip(uiConfigName)); m_lineEdit->setToolTip(uiField()->uiToolTip(uiConfigName));
} }
+2 -2
View File
@@ -56,10 +56,10 @@ class PickEventHandler;
class PdmUiVec3dEditorAttribute : public PdmUiEditorAttribute class PdmUiVec3dEditorAttribute : public PdmUiEditorAttribute
{ {
public: public:
PdmUiVec3dEditorAttribute() : startPicking(false) {} PdmUiVec3dEditorAttribute() : startInPickingMode(false) {}
public: public:
bool startPicking; bool startInPickingMode;
std::shared_ptr<PickEventHandler> pickEventHandler; std::shared_ptr<PickEventHandler> pickEventHandler;
}; };