Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
monticore
EmbeddedMontiArc
generators
EMAM2Cpp
Commits
5b7f7f70
Commit
5b7f7f70
authored
Apr 22, 2020
by
Ahmed
Browse files
set includes in the right order
parent
dceac76f
Pipeline
#271346
passed with stage
in 11 minutes and 42 seconds
Changes
14
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
src/main/java/de/monticore/lang/monticar/generator/cpp/commands/CvtColorCommand.java
View file @
5b7f7f70
...
...
@@ -61,8 +61,8 @@ public class CvtColorCommand extends ArgumentNoReturnMathCommand{
newMatrixAccessSymbols
.
add
(
new
MathMatrixAccessSymbol
(
stringExpression
));
mathMatrixNameExpressionSymbol
.
getMathMatrixAccessOperatorSymbol
().
setMathMatrixAccessSymbols
(
newMatrixAccessSymbols
);
bluePrintCPP
.
addCVIncludeString
(
"ConvHelper"
);
bluePrintCPP
.
addCVIncludeString
(
"opencv2/imgproc/imgproc"
);
bluePrintCPP
.
addCVIncludeString
(
"ConvHelper"
);
bluePrint
.
addMethod
(
cvtColorHelperMethod
);
redefineArmaMat
(
bluePrintCPP
);
redefineInit
(
bluePrintCPP
);
...
...
src/main/java/de/monticore/lang/monticar/generator/cpp/commands/DilateCommand.java
View file @
5b7f7f70
...
...
@@ -61,8 +61,8 @@ public class DilateCommand extends ArgumentNoReturnMathCommand{
newMatrixAccessSymbols
.
add
(
new
MathMatrixAccessSymbol
(
stringExpression
));
mathMatrixNameExpressionSymbol
.
getMathMatrixAccessOperatorSymbol
().
setMathMatrixAccessSymbols
(
newMatrixAccessSymbols
);
bluePrintCPP
.
addCVIncludeString
(
"ConvHelper"
);
bluePrintCPP
.
addCVIncludeString
(
"opencv2/imgproc/imgproc"
);
bluePrintCPP
.
addCVIncludeString
(
"ConvHelper"
);
bluePrint
.
addMethod
(
dilateHelperMethod
);
redefineArmaMat
(
bluePrintCPP
);
redefineInit
(
bluePrintCPP
);
...
...
src/main/java/de/monticore/lang/monticar/generator/cpp/commands/ErodeCommand.java
View file @
5b7f7f70
...
...
@@ -63,8 +63,8 @@ public class ErodeCommand extends ArgumentNoReturnMathCommand{
mathMatrixNameExpressionSymbol
.
getMathMatrixAccessOperatorSymbol
().
setMathMatrixAccessSymbols
(
newMatrixAccessSymbols
);
bluePrintCPP
.
addCVIncludeString
(
"ConvHelper"
);
bluePrintCPP
.
addCVIncludeString
(
"opencv2/imgproc/imgproc"
);
bluePrintCPP
.
addCVIncludeString
(
"ConvHelper"
);
bluePrint
.
addMethod
(
erodeHelperMethod
);
redefineArmaMat
(
bluePrintCPP
);
redefineInit
(
bluePrintCPP
);
...
...
src/main/java/de/monticore/lang/monticar/generator/cpp/commands/FindContoursCommand.java
View file @
5b7f7f70
...
...
@@ -61,8 +61,8 @@ public class FindContoursCommand extends ArgumentNoReturnMathCommand{
newMatrixAccessSymbols
.
add
(
new
MathMatrixAccessSymbol
(
stringExpression
));
mathMatrixNameExpressionSymbol
.
getMathMatrixAccessOperatorSymbol
().
setMathMatrixAccessSymbols
(
newMatrixAccessSymbols
);
bluePrintCPP
.
addCVIncludeString
(
"ConvHelper"
);
bluePrintCPP
.
addCVIncludeString
(
"opencv2/imgproc/imgproc"
);
bluePrintCPP
.
addCVIncludeString
(
"ConvHelper"
);
bluePrintCPP
.
addCVIncludeString
(
"vector"
);
bluePrint
.
addMethod
(
findContoursHelperMethod
);
redefineArmaMat
(
bluePrintCPP
);
...
...
src/main/java/de/monticore/lang/monticar/generator/cpp/commands/GaussianBlurCommand.java
View file @
5b7f7f70
...
...
@@ -63,8 +63,8 @@ public class GaussianBlurCommand extends ArgumentNoReturnMathCommand{
newMatrixAccessSymbols
.
add
(
new
MathMatrixAccessSymbol
(
stringExpression
));
mathMatrixNameExpressionSymbol
.
getMathMatrixAccessOperatorSymbol
().
setMathMatrixAccessSymbols
(
newMatrixAccessSymbols
);
bluePrintCPP
.
addCVIncludeString
(
"ConvHelper"
);
bluePrintCPP
.
addCVIncludeString
(
"opencv2/imgproc/imgproc"
);
bluePrintCPP
.
addCVIncludeString
(
"ConvHelper"
);
bluePrint
.
addMethod
(
gaussianBlurHelperMethod
);
redefineArmaMat
(
bluePrintCPP
);
redefineInit
(
bluePrintCPP
);
...
...
src/main/java/de/monticore/lang/monticar/generator/cpp/commands/InRangeCommand.java
View file @
5b7f7f70
...
...
@@ -61,8 +61,8 @@ public class InRangeCommand extends ArgumentNoReturnMathCommand{
newMatrixAccessSymbols
.
add
(
new
MathMatrixAccessSymbol
(
stringExpression
));
mathMatrixNameExpressionSymbol
.
getMathMatrixAccessOperatorSymbol
().
setMathMatrixAccessSymbols
(
newMatrixAccessSymbols
);
bluePrintCPP
.
addCVIncludeString
(
"ConvHelper"
);
bluePrintCPP
.
addCVIncludeString
(
"opencv2/core/core"
);
bluePrintCPP
.
addCVIncludeString
(
"ConvHelper"
);
bluePrint
.
addMethod
(
inRangeHelperMethod
);
redefineArmaMat
(
bluePrintCPP
);
redefineInit
(
bluePrintCPP
);
...
...
src/main/java/de/monticore/lang/monticar/generator/cpp/commands/RectangleCommand.java
View file @
5b7f7f70
...
...
@@ -65,8 +65,8 @@ public class RectangleCommand extends MathCommand{
mathMatrixNameExpressionSymbol
.
getMathMatrixAccessOperatorSymbol
().
setMathMatrixAccessSymbols
(
newMatrixAccessSymbols
);
bluePrintCPP
.
addCVIncludeString
(
"ConvHelper"
);
bluePrintCPP
.
addCVIncludeString
(
"opencv2/imgproc/imgproc"
);
bluePrintCPP
.
addCVIncludeString
(
"ConvHelper"
);
bluePrint
.
addMethod
(
rectangleHelperMethod
);
redefineArmaMat
(
bluePrintCPP
);
redefineInit
(
bluePrintCPP
);
...
...
src/test/resources/results/armadillo/testMath/l0/test_math_cvtColorCommandTest.h
View file @
5b7f7f70
...
...
@@ -4,8 +4,8 @@
#define M_PI 3.14159265358979323846
#endif
#include
"armadillo"
#include
"ConvHelper.h"
#include
<opencv2/imgproc/imgproc.hpp>
#include
"ConvHelper.h"
using
namespace
arma
;
using
namespace
std
;
class
test_math_cvtColorCommandTest
{
...
...
src/test/resources/results/armadillo/testMath/l0/test_math_dilateCommandTest.h
View file @
5b7f7f70
...
...
@@ -4,8 +4,8 @@
#define M_PI 3.14159265358979323846
#endif
#include
"armadillo"
#include
"ConvHelper.h"
#include
<opencv2/imgproc/imgproc.hpp>
#include
"ConvHelper.h"
using
namespace
arma
;
using
namespace
std
;
class
test_math_dilateCommandTest
{
...
...
src/test/resources/results/armadillo/testMath/l0/test_math_erodeCommandTest.h
View file @
5b7f7f70
...
...
@@ -4,8 +4,8 @@
#define M_PI 3.14159265358979323846
#endif
#include
"armadillo"
#include
"ConvHelper.h"
#include
<opencv2/imgproc/imgproc.hpp>
#include
"ConvHelper.h"
using
namespace
arma
;
using
namespace
std
;
...
...
src/test/resources/results/armadillo/testMath/l0/test_math_findContoursCommandTest.h
View file @
5b7f7f70
...
...
@@ -4,8 +4,8 @@
#define M_PI 3.14159265358979323846
#endif
#include
"armadillo"
#include
"ConvHelper.h"
#include
<opencv2/imgproc/imgproc.hpp>
#include
"ConvHelper.h"
#include
<vector>
using
namespace
arma
;
using
namespace
std
;
...
...
src/test/resources/results/armadillo/testMath/l0/test_math_gaussianBlurCommandTest.h
View file @
5b7f7f70
...
...
@@ -4,8 +4,8 @@
#define M_PI 3.14159265358979323846
#endif
#include
"armadillo"
#include
"ConvHelper.h"
#include
<opencv2/imgproc/imgproc.hpp>
#include
"ConvHelper.h"
using
namespace
arma
;
using
namespace
std
;
class
test_math_gaussianBlurCommandTest
{
...
...
src/test/resources/results/armadillo/testMath/l0/test_math_inRangeCommandTest.h
View file @
5b7f7f70
...
...
@@ -4,8 +4,8 @@
#define M_PI 3.14159265358979323846
#endif
#include
"armadillo"
#include
"ConvHelper.h"
#include
<opencv2/core/core.hpp>
#include
"ConvHelper.h"
using
namespace
arma
;
using
namespace
std
;
class
test_math_inRangeCommandTest
{
...
...
src/test/resources/results/armadillo/testMath/l0/test_math_rectangleCommandTest.h
View file @
5b7f7f70
...
...
@@ -4,8 +4,8 @@
#define M_PI 3.14159265358979323846
#endif
#include
"armadillo"
#include
"ConvHelper.h"
#include
<opencv2/imgproc/imgproc.hpp>
#include
"ConvHelper.h"
using
namespace
arma
;
using
namespace
std
;
class
test_math_rectangleCommandTest
{
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment