kindred/create
1
1
Fork 0
Code Issues 37 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

+ fix inconsistencies in using DynamicProperty class

Browse Source
This commit is contained in:
wmayer
2015-11-17 12:22:07 +01:00
parent b7a80c910c
commit dec2a2f6cd
3 changed files with 66 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/Mod/Spreadsheet/App/Sheet.cpp
View File

@@ -509,8 +509,7 @@ Property * Sheet::setFloatProperty(CellAddress key, double value)
props.removeDynamicProperty(key.toString().c_str());
propAddress.erase(prop);
}
floatProp = freecad_dynamic_cast<PropertyFloat>(props.addDynamicProperty("App::PropertyFloat", key.toString().c_str(), 0, 0, Prop_ReadOnly | Prop_Hidden | Prop_Transient, true, true));
floatProp->StatusBits.set(3);
floatProp = freecad_dynamic_cast<PropertyFloat>(props.addDynamicProperty("App::PropertyFloat", key.toString().c_str(), 0, 0, Prop_ReadOnly | Prop_Hidden | Prop_Transient));
}
else
floatProp = static_cast<PropertyFloat*>(prop);
@@ -541,9 +540,8 @@ Property * Sheet::setQuantityProperty(CellAddress key, double value, const Base:
props.removeDynamicProperty(key.toString().c_str());
propAddress.erase(prop);
}
Property * p = props.addDynamicProperty("Spreadsheet::PropertySpreadsheetQuantity", key.toString().c_str(), 0, 0, Prop_ReadOnly | Prop_Hidden | Prop_Transient, true, true);
Property * p = props.addDynamicProperty("Spreadsheet::PropertySpreadsheetQuantity", key.toString().c_str(), 0, 0, Prop_ReadOnly | Prop_Hidden | Prop_Transient);
quantityProp = freecad_dynamic_cast<PropertySpreadsheetQuantity>(p);
quantityProp->StatusBits.set(3);
}
else
quantityProp = static_cast<PropertySpreadsheetQuantity*>(prop);
@@ -576,8 +574,7 @@ Property * Sheet::setStringProperty(CellAddress key, const std::string & value)
props.removeDynamicProperty(key.toString().c_str());
propAddress.erase(prop);
}
stringProp = freecad_dynamic_cast<PropertyString>(props.addDynamicProperty("App::PropertyString", key.toString().c_str(), 0, 0, Prop_ReadOnly | Prop_Hidden | Prop_Transient, true, true));
stringProp->StatusBits.set(3);
stringProp = freecad_dynamic_cast<PropertyString>(props.addDynamicProperty("App::PropertyString", key.toString().c_str(), 0, 0, Prop_ReadOnly | Prop_Hidden | Prop_Transient));
}
propAddress[stringProp] = key;
@@ -614,7 +611,7 @@ void Sheet::updateAlias(CellAddress key)
}
if (!aliasProp)
aliasProp = props.addDynamicProperty(prop->getTypeId().getName(), alias.c_str(), 0, 0, Prop_ReadOnly | Prop_Transient, true, true);
aliasProp = props.addDynamicProperty(prop->getTypeId().getName(), alias.c_str(), 0, 0, Prop_ReadOnly | Prop_Transient);
aliasProp->Paste(*prop);
}