UpsilonNumworks/Upsilon
1
0
Fork 0
mirror of https://github.com/UpsilonNumworks/Upsilon.git synced 2026-01-20 09:17:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

[apps] Fix Function creation from Calculation

Browse Source
This commit is contained in:
Léa Saviot
2018-10-12 10:06:35 +02:00
committed by Émilie Feral
parent 41c9e90cce
commit 393bc6c233
4 changed files with 23 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
apps/shared/storage_cartesian_function.cpp
View File

@@ -35,15 +35,28 @@ void StorageCartesianFunction::DefaultName(char buffer[], size_t bufferSize) {
strlcpy(&buffer[dotCharIndex+1], GlobalContext::funcExtension, bufferSize - (dotCharIndex+1));
}
StorageCartesianFunction StorageCartesianFunction::NewModel(Ion::Storage::Record::ErrorStatus * error) {
StorageCartesianFunction StorageCartesianFunction::NewModel(Ion::Storage::Record::ErrorStatus * error, const char * baseName) {
// Create the record
char nameBuffer[SymbolAbstract::k_maxNameSize];
DefaultName(nameBuffer, SymbolAbstract::k_maxNameSize);
CartesianFunctionRecordData data;
*error = Ion::Storage::sharedStorage()->createRecordWithFullName(nameBuffer, &data, sizeof(data));
if (baseName == nullptr) {
DefaultName(nameBuffer, SymbolAbstract::k_maxNameSize);
*error = Ion::Storage::sharedStorage()->createRecordWithFullName(nameBuffer, &data, sizeof(data));
} else {
*error = Ion::Storage::sharedStorage()->createRecordWithExtension(baseName, GlobalContext::funcExtension, &data, sizeof(data));
}
// Return if error
if (*error != Ion::Storage::Record::ErrorStatus::None) {
return StorageCartesianFunction();
}
return StorageCartesianFunction(Ion::Storage::sharedStorage()->recordNamed(nameBuffer));
// Return the StorageCartesianFunction withthe new record
if (baseName == nullptr) {
return StorageCartesianFunction(Ion::Storage::sharedStorage()->recordNamed(nameBuffer));
} else {
return StorageCartesianFunction(Ion::Storage::sharedStorage()->recordBaseNamedWithExtension(baseName, GlobalContext::funcExtension));
}
}
int StorageCartesianFunction::derivativeNameWithArgument(char * buffer, size_t bufferSize, char arg) {