UpsilonNumworks/Upsilon
1
0
Fork 0
mirror of https://github.com/UpsilonNumworks/Upsilon.git synced 2026-01-19 16:57:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

[apps] GlobalCtxt::SetExpForFunctionRecord used in StorageCartesianFunction

Browse Source
This commit is contained in:
Léa Saviot
2018-10-10 10:49:00 +02:00
committed by Émilie Feral
parent 1cd5145d3f
commit 5a9c0b1b84
5 changed files with 25 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
apps/shared/storage_cartesian_function.cpp
View File

@@ -32,12 +32,14 @@ void StorageCartesianFunction::DefaultName(char buffer[], size_t bufferSize) {
strlcpy(&buffer[dotCharIndex+1], GlobalContext::funcExtension, bufferSize - (dotCharIndex+1));
}
StorageCartesianFunction StorageCartesianFunction::NewModel() {
StorageCartesianFunction StorageCartesianFunction::NewModel(Ion::Storage::Record::ErrorStatus & error) {
char nameBuffer[100];
DefaultName(nameBuffer, 100);
CartesianFunctionRecordData data;
Ion::Storage::Record::ErrorStatus r = Ion::Storage::sharedStorage()->createRecordWithFullName(nameBuffer, &data, sizeof(data));
assert(r == Ion::Storage::Record::ErrorStatus::None); // TODO not a valid assertion!
*error = Ion::Storage::sharedStorage()->createRecordWithFullName(nameBuffer, &data, sizeof(data));
if (*error != Ion::Storage::Record::ErrorStatus::None()) {
return StorageCartesianFunction();
}
return StorageCartesianFunction(Ion::Storage::sharedStorage()->recordNamed(nameBuffer));
}
@@ -82,23 +84,10 @@ Expression::Coordinate2D StorageCartesianFunction::nextIntersectionFrom(double s
Expression reducedExp = reducedExpression(context);
return reducedExp.nextIntersection(symbol(), start, step, max, *context, Preferences::sharedPreferences()->angleUnit(), reducedExp);
}
void StorageCartesianFunction::setContent(const char * c) {
// Compute the expression to store
Expression expressionToStore = StorageExpressionModel::expressionToStoreFromString(c);
// Prepare the new data to store
Ion::Storage::Record::Data newData = record().value();
size_t expressionToStoreSize = expressionToStore.isUninitialized() ? 0 : expressionToStore.size();
newData.size = sizeof(CartesianFunctionRecordData) + expressionToStoreSize;
// Set the data
Ion::Storage::Record::ErrorStatus error = record().setValue(newData);
assert(error == Ion::Storage::Record::ErrorStatus::None); //TODO remove assertion and handle case
// Copy the expression if needed
if (!expressionToStore.isUninitialized()) {
memcpy(expressionAddress(),expressionToStore.addressInPool(), expressionToStore.size());
}
Ion::Storage::Record::ErrorStatus error = GlobalContext::SetExpressionForFunctionRecord(expressionToStore, record());
StorageExpressionModel::didSetContentData();
}