UpsilonNumworks/Upsilon
1
0
Fork 0
mirror of https://github.com/UpsilonNumworks/Upsilon.git synced 2026-03-29 19:49:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

[apps/shared] Move function store class to shared/ to be used by

Browse Source 
sequence

Change-Id: I89380d59e3450e9c5af4bf05f520ed1a5205ba29
This commit is contained in:
Émilie Feral
2017-02-06 16:07:51 +01:00
parent 59553e69e0
commit 3164939c9d
5 changed files with 118 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
apps/graph/function_store.cpp
View File

@@ -1,8 +1,8 @@
#include "function_store.h"
extern "C" {
#include <assert.h>
}
#include <stddef.h>
}
#include <ion.h>
namespace Graph {
@@ -12,7 +12,7 @@ constexpr KDColor FunctionStore::k_defaultColors[k_numberOfDefaultColors];
constexpr const char * FunctionStore::k_functionNames[k_maxNumberOfFunctions];
FunctionStore::FunctionStore() :
m_numberOfFunctions(0)
Shared::FunctionStore()
{
addEmptyFunction();
}
@@ -29,35 +29,14 @@ Function * FunctionStore::functionAtIndex(int i) {
}
Function * FunctionStore::activeFunctionAtIndex(int i) {
assert(i>=0 && i<m_numberOfFunctions);
int index = 0;
for (int k = 0; k < m_numberOfFunctions; k++) {
if (m_functions[k].isActive() && m_functions[k].layout() != nullptr) {
if (i == index) {
return &m_functions[k];
}
index++;
}
}
assert(false);
return nullptr;
return (Function *)Shared::FunctionStore::activeFunctionAtIndex(i);
}
Function * FunctionStore::definedFunctionAtIndex(int i) {
assert(i>=0 && i<m_numberOfFunctions);
int index = 0;
for (int k = 0; k < m_numberOfFunctions; k++) {
if (m_functions[k].layout() != nullptr) {
if (i == index) {
return &m_functions[k];
}
index++;
}
}
assert(false);
return nullptr;
return (Function *)Shared::FunctionStore::definedFunctionAtIndex(i);
}
Function * FunctionStore::addEmptyFunction() {
assert(m_numberOfFunctions < k_maxNumberOfFunctions);
const char * name = firstAvailableName();
@@ -69,7 +48,7 @@ Function * FunctionStore::addEmptyFunction() {
return result;
}
void FunctionStore::removeFunction(Function * f) {
void FunctionStore::removeFunction(Shared::Function * f) {
int i = 0;
while (&m_functions[i] != f && i < m_numberOfFunctions) {
i++;
@@ -81,30 +60,6 @@ void FunctionStore::removeFunction(Function * f) {
}
}
int FunctionStore::numberOfFunctions() {
return m_numberOfFunctions;
}
int FunctionStore::numberOfActiveFunctions() {
int result = 0;
for (int i = 0; i < m_numberOfFunctions; i++) {
if (m_functions[i].layout() != nullptr && m_functions[i].isActive()) {
result++;
}
}
return result;
}
int FunctionStore::numberOfDefinedFunctions() {
int result = 0;
for (int i = 0; i < m_numberOfFunctions; i++) {
if (m_functions[i].layout() != nullptr) {
result++;
}
}
return result;
}
const char * FunctionStore::firstAvailableName() {
for (int k = 0; k < k_maxNumberOfFunctions; k++) {
int j = 0;