summaryrefslogtreecommitdiffstats
path: root/Project/ControlEditor.h
diff options
context:
space:
mode:
authorThales Lima Oliveira <thaleslima.ufu@gmail.com>2017-10-11 19:26:19 -0300
committerGitHub <noreply@github.com>2017-10-11 19:26:19 -0300
commit28760ff098cf5ef68cb95c869c2cd96ea5c324ec (patch)
tree9eea1f1d2622446b3bf64d8cf0864c9a9aafad34 /Project/ControlEditor.h
parenta32372968abb2f4b3bf0472f59c18f5028d20206 (diff)
parent7fb65c6ec6148a75830ad25b7f76500c17db0f3b (diff)
downloadPSP.git-28760ff098cf5ef68cb95c869c2cd96ea5c324ec.tar.gz
PSP.git-28760ff098cf5ef68cb95c869c2cd96ea5c324ec.tar.xz
PSP.git-28760ff098cf5ef68cb95c869c2cd96ea5c324ec.zip
Merge pull request #40 from Thales1330/wip-mimo-control-system
Wip mimo control system
Diffstat (limited to 'Project/ControlEditor.h')
-rw-r--r--Project/ControlEditor.h19
1 files changed, 15 insertions, 4 deletions
diff --git a/Project/ControlEditor.h b/Project/ControlEditor.h
index dfa76ab..5383e85 100644
--- a/Project/ControlEditor.h
+++ b/Project/ControlEditor.h
@@ -44,6 +44,8 @@ class RateLimiter;
class Exponential;
class Constant;
class Gain;
+class MathOperation;
+class Divider;
class ControlElementSolver;
class ControlElementContainer;
@@ -51,7 +53,18 @@ class ControlElementContainer;
class ChartView;
class ElementDataObject;
-enum ControlElementButtonID { ID_IO = 0, ID_TF, ID_SUM, ID_CONST, ID_LIMITER, ID_GAIN, ID_MULT, ID_EXP, ID_RATELIM };
+enum ControlElementButtonID {
+ ID_IO = 0,
+ ID_TF,
+ ID_SUM,
+ ID_CONST,
+ ID_LIMITER,
+ ID_GAIN,
+ ID_MULT,
+ ID_EXP,
+ ID_RATELIM,
+ ID_MATH_DIV
+};
/**
* @class ControlElementButton
@@ -140,7 +153,7 @@ class ControlEditor : public ControlEditorBase
void BuildControlElementPanel();
void SetViewport();
void ConsolidateTexts();
- void SetLastElementID();
+ int GetNextID();
std::vector<ConnectionLine*>::iterator DeleteLineFromList(std::vector<ConnectionLine*>::iterator& it);
@@ -160,8 +173,6 @@ class ControlEditor : public ControlEditorBase
bool m_firstDraw = true;
int m_ioFlags;
- int m_lastElementID = 0;
-
int m_inputType = 0;
double m_startTime = 1.0;
double m_slope = 1.0;