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

Merge changes I4d47331e,Iabe1f5cd

Browse Source 
* changes:
  [apps/sequence][app/graph] Repare checksum
  [apps/shared] Fix bug
This commit is contained in:
Émilie Feral
2017-05-22 14:55:44 +02:00
committed by Gerrit
parent f904112aee 197e296474
commit 0047e71a22
3 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
apps/graph/cartesian_function_store.cpp
View File

@@ -18,9 +18,13 @@ CartesianFunctionStore::CartesianFunctionStore() :
}
uint32_t CartesianFunctionStore::storeChecksum() {
size_t dataLengthInBytes = m_numberOfFunctions*sizeof(CartesianFunction);
size_t dataLengthInBytes = k_maxNumberOfFunctions*TextField::maxBufferSize()*sizeof(char);
assert((dataLengthInBytes & 0x3) == 0); // Assert that dataLengthInBytes is a multiple of 4
return Ion::crc32((uint32_t *)m_functions, dataLengthInBytes>>2);
char data[k_maxNumberOfFunctions*TextField::maxBufferSize()] = {};
for (int i = 0; i < k_maxNumberOfFunctions; i++) {
strlcpy(data+i*TextField::maxBufferSize(), m_functions[i].text(), TextField::maxBufferSize());
}
return Ion::crc32((uint32_t *)data, dataLengthInBytes>>2);
}
CartesianFunction * CartesianFunctionStore::functionAtIndex(int i) {

10
apps/sequence/sequence_store.cpp
View File

@@ -11,9 +11,15 @@ constexpr KDColor SequenceStore::k_defaultColors[k_maxNumberOfSequences];
constexpr const char * SequenceStore::k_sequenceNames[k_maxNumberOfSequences];
uint32_t SequenceStore::storeChecksum() {
size_t dataLengthInBytes = m_numberOfFunctions*sizeof(Sequence);
size_t dataLengthInBytes = k_maxNumberOfSequences*3*TextField::maxBufferSize()*sizeof(char);
assert((dataLengthInBytes & 0x3) == 0); // Assert that dataLengthInBytes is a multiple of 4
return Ion::crc32((uint32_t *)m_sequences, dataLengthInBytes>>2);
char data[3*k_maxNumberOfSequences*TextField::maxBufferSize()] = {};
for (int i = 0; i < k_maxNumberOfSequences; i++) {
strlcpy(data+i*3*TextField::maxBufferSize(), m_sequences[i].text(), TextField::maxBufferSize());
strlcpy(data+i*3*TextField::maxBufferSize()+TextField::maxBufferSize(), m_sequences[i].firstInitialConditionText(), TextField::maxBufferSize());
strlcpy(data+i*3*TextField::maxBufferSize()+2*TextField::maxBufferSize(), m_sequences[i].secondInitialConditionText(), TextField::maxBufferSize());
}
return Ion::crc32((uint32_t *)data, dataLengthInBytes>>2);
}
Sequence * SequenceStore::functionAtIndex(int i) {

2
apps/shared/interactive_curve_view_controller.cpp
View File

@@ -150,8 +150,8 @@ void InteractiveCurveViewController::viewWillAppear() {
curveView()->selectMainView(true);
header()->setSelectedButton(-1);
reloadBannerView();
curveView()->reload();
curveView()->setOkView(&m_okView);
curveView()->reload();
}
void InteractiveCurveViewController::didEnterResponderChain(Responder * previousFirstResponder) {