OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

Rename PdmXmlFieldHandle::childClassKeyword to dataTypeName to reflect that it will contain names for built in types

Browse Source
This commit is contained in:
Gaute Lindkvist 2020-03-04 08:20:29 +01:00
parent 76019e7776
commit 508d8806e6
6 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ApplicationCode/GrpcInterface/RiaGrpcServiceInterface.cpp
View File

@ -212,7 +212,7 @@ caf::PdmObjectHandle* RiaGrpcServiceInterface::emplaceChildField( caf::PdmObject
//--------------------------------------------------------------------------------------------------
caf::PdmObjectHandle* RiaGrpcServiceInterface::emplaceChildField( caf::PdmChildFieldHandle* childField )
{
QString childClassKeyword = childField->xmlCapability()->childClassKeyword();
QString childClassKeyword = childField->xmlCapability()->dataTypeName();
auto pdmObjectHandle = caf::PdmDefaultObjectFactory::instance()->create( childClassKeyword );
CAF_ASSERT( pdmObjectHandle );
@ -225,7 +225,7 @@ caf::PdmObjectHandle* RiaGrpcServiceInterface::emplaceChildField( caf::PdmChildF
//--------------------------------------------------------------------------------------------------
caf::PdmObjectHandle* RiaGrpcServiceInterface::emplaceChildArrayField( caf::PdmChildArrayFieldHandle* childArrayField )
{
QString childClassKeyword = childArrayField->xmlCapability()->childClassKeyword();
QString childClassKeyword = childArrayField->xmlCapability()->dataTypeName();
auto pdmObjectHandle = caf::PdmDefaultObjectFactory::instance()->create( childClassKeyword );
CAF_ASSERT( pdmObjectHandle );

4
Fwk/AppFwk/cafCommandFeatures/AddAndDelete/cafCmdAddItemExec.cpp
View File

@ -63,7 +63,7 @@ QString CmdAddItemExec::name()
if (listField)
{
PdmXmlFieldHandle* xfh = listField->xmlCapability();
containedObjectType = xfh->childClassKeyword();
containedObjectType = xfh->dataTypeName();
}
return QString("Create new '%1'").arg(containedObjectType);
@ -79,7 +79,7 @@ void CmdAddItemExec::redo()
PdmChildArrayFieldHandle* listField = dynamic_cast<PdmChildArrayFieldHandle*>(field);
if (listField && field->xmlCapability())
{
QString classKeyword = field->xmlCapability()->childClassKeyword();
QString classKeyword = field->xmlCapability()->dataTypeName();
if (classKeyword.isEmpty()) return;

2
Fwk/AppFwk/cafPdmScripting/cafPdmPythonGenerator.cpp
View File

@ -313,7 +313,7 @@ QString PdmPythonGenerator::dataTypeString(const PdmFieldHandle* field, bool* is
{
auto xmlObj = field->capability<PdmXmlFieldHandle>();
QString dataType = xmlObj->childClassKeyword();
QString dataType = xmlObj->dataTypeName();
bool foundList = xmlObj->isVectorField();
std::map<QString, QString> builtins =

10
Fwk/AppFwk/cafProjectDataModel/cafPdmXml/cafInternalPdmXmlFieldCapability.h
View File

@ -15,7 +15,7 @@ public:
PdmFieldXmlCap(FieldType* field, bool giveOwnership) : PdmXmlFieldHandle(field, giveOwnership)
{
m_field = field;
m_childClassKeyword = QString("%1").arg(typeid(FieldType).name());
m_dataTypeName = QString("%1").arg(typeid(FieldType).name());
}
// Xml Serializing
@ -40,7 +40,7 @@ public:
PdmFieldXmlCap(FieldType* field, bool giveOwnership) : PdmXmlFieldHandle(field, giveOwnership)
{
m_field = field;
m_childClassKeyword = DataType::classKeywordStatic();
m_dataTypeName = DataType::classKeywordStatic();
m_isResolved = false;
m_referenceString = "";
}
@ -70,7 +70,7 @@ public:
PdmFieldXmlCap(FieldType* field, bool giveOwnership) : PdmXmlFieldHandle(field, giveOwnership)
{
m_field = field;
m_childClassKeyword = DataType::classKeywordStatic();
m_dataTypeName = DataType::classKeywordStatic();
m_isResolved = false;
m_referenceString = "";
}
@ -97,7 +97,7 @@ class PdmFieldXmlCap< PdmChildField<DataType*> > : public PdmXmlFieldHandle
{
typedef PdmChildField<DataType*> FieldType;
public:
PdmFieldXmlCap(FieldType* field, bool giveOwnership) : PdmXmlFieldHandle(field, giveOwnership) { m_field = field; m_childClassKeyword = DataType::classKeywordStatic(); }
PdmFieldXmlCap(FieldType* field, bool giveOwnership) : PdmXmlFieldHandle(field, giveOwnership) { m_field = field; m_dataTypeName = DataType::classKeywordStatic(); }
// Xml Serializing
public:
@ -117,7 +117,7 @@ class PdmFieldXmlCap< PdmChildArrayField<DataType*> > : public PdmXmlFieldHandle
{
typedef PdmChildArrayField<DataType*> FieldType;
public:
PdmFieldXmlCap(FieldType* field, bool giveOwnership) : PdmXmlFieldHandle(field, giveOwnership) { m_field = field; m_childClassKeyword = DataType::classKeywordStatic();}
PdmFieldXmlCap(FieldType* field, bool giveOwnership) : PdmXmlFieldHandle(field, giveOwnership) { m_field = field; m_dataTypeName = DataType::classKeywordStatic();}
// Xml Serializing
public:

4
Fwk/AppFwk/cafProjectDataModel/cafPdmXml/cafPdmXmlFieldHandle.cpp
View File

@ -56,9 +56,9 @@ void PdmXmlFieldHandle::disableIO()
/// to PdmObjectHandle derived objects.
/// Returns typeid(DataType).name() if the field is not containing some PdmObjectHandle type
//--------------------------------------------------------------------------------------------------
QString PdmXmlFieldHandle::childClassKeyword() const
QString PdmXmlFieldHandle::dataTypeName() const
{
return m_childClassKeyword;
return m_dataTypeName;
}
//--------------------------------------------------------------------------------------------------

4
Fwk/AppFwk/cafProjectDataModel/cafPdmXml/cafPdmXmlFieldHandle.h
View File

@ -45,7 +45,7 @@ public:
void setIOReadable(bool isReadable) { m_isIOReadable = isReadable; }
void setCopyable(bool isCopyable) { m_isCopyable = isCopyable; }
QString childClassKeyword() const;
QString dataTypeName() const;
virtual void readFieldData(QXmlStreamReader& xmlStream, PdmObjectFactory* objectFactory) = 0;
virtual void writeFieldData(QXmlStreamWriter& xmlStream) const = 0;
@ -56,7 +56,7 @@ public:
protected:
bool assertValid() const;
QString m_childClassKeyword; ///< Must be set in constructor of derived XmlFieldHandle
QString m_dataTypeName; ///< Must be set in constructor of derived XmlFieldHandle
private:
bool m_isIOReadable;