Skip to content
Snippets Groups Projects
Commit ee04bebb authored by ariotte's avatar ariotte
Browse files

Merge branch 'dev2018' of https://github.com/eiimage/eiimage into dev2018

parents cc1af1bc 5cfb7c3b
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
app/Operations/DoubleEntropyOp.cpp
+ 1
− 0
View file @ ee04bebb
......@@ -40,6 +40,7 @@ void DoubleEntropyOp::operator()(const Image_t<double>* image, const std::map<co
double entropy = image->getEntropy();
outText(qApp->translate("Operations", "Entropy of the image (sum of channels entropy) = %1\n").arg(entropy).toStdString());
// outText(qApp->translate("Pas d'échantillonnage choisi : 1\n"));
outText(qApp->translate("Operations", "Pas d'échantillonnage choisi : 1\n").toStdString());
}
......
app/Operations/FlipOp.cpp
+ 0
− 1
View file @ ee04bebb
......@@ -63,4 +63,3 @@ void FlipOp::operator()(const imagein::Image* image, const std::map<const imagei
this->outImage(resImg, name.toStdString());
}
core/Operation.h
+ 1
− 1
View file @ ee04bebb
......@@ -96,7 +96,6 @@ virtual bool needCurrentImg() const = 0;
virtual bool isValidImgWnd(const genericinterface::ImageWindow* imgWnd) const = 0;
protected:
......@@ -136,6 +135,7 @@ void outText(std::string);
std::string _name; /**< The name of the operation */
genericinterface::WindowService* _ws; /**< A pointer to the window service, only valid inside the function call operator */
genericinterface::ImageWindow* _curImgWnd; /**< A pointer to the current image window, only valid inside the function call operator */
private:
/**
* @brief Private method used to output an ImageWindow, this method is called inside outImage and outDoubleImage.
......
detiq-t @ e9d359dd
Compare 0de899d1...e9d359dd
Subproject commit 0de899d155da81ee01b8a5d79da656f616c07d3e
Subproject commit e9d359ddede0e5355bb86db7b870d1580774a260
test/res/test_scaling_result_toinou_x2_y1_bilinear.bmp
+ 0
− 0
View replaced file @ cc1af1bc View file @ ee04bebb
test/res/test_scaling_result_toinou_x2_y1_bilinear.bmp

5.27 MiB | W: | H:

test/res/test_scaling_result_toinou_x2_y1_bilinear.bmp

58 B | W: | H:

test/res/test_scaling_result_toinou_x2_y1_bilinear.bmp
test/res/test_scaling_result_toinou_x2_y1_bilinear.bmp
test/res/test_scaling_result_toinou_x2_y1_bilinear.bmp
test/res/test_scaling_result_toinou_x2_y1_bilinear.bmp
  • 2-up
  • Swipe
  • Onion skin
test/test
+ 0
− 0
View file @ ee04bebb
No preview for this file type
test/test.jpg deleted 100644 → 0
+ 0
− 0
View file @ cc1af1bc
test/test.jpg

13.7 KiB

test/testgui.cpp
+ 726
− 31
View file @ ee04bebb
This diff is collapsed.
test/testgui.moc
+ 157
− 20
View file @ ee04bebb
......@@ -18,8 +18,8 @@
QT_BEGIN_MOC_NAMESPACE
struct qt_meta_stringdata_TestGui_t {
QByteArrayData data[7];
char stringdata0[112];
QByteArrayData data[36];
char stringdata0[803];
};
#define QT_MOC_LITERAL(idx, ofs, len) \
Q_STATIC_BYTE_ARRAY_DATA_HEADER_INITIALIZER_WITH_OFFSET(len, \
......@@ -32,14 +32,64 @@ QT_MOC_LITERAL(0, 0, 7), // "TestGui"
QT_MOC_LITERAL(1, 8, 25), // "testGenericInterfaceSetup"
QT_MOC_LITERAL(2, 34, 0), // ""
QT_MOC_LITERAL(3, 35, 24), // "testWindowServiceAddFile"
QT_MOC_LITERAL(4, 60, 19), // "testFileServiceSave"
QT_MOC_LITERAL(5, 80, 15), // "testRemoveImage"
QT_MOC_LITERAL(6, 96, 15) // "testThresholdOp"
QT_MOC_LITERAL(4, 60, 15), // "testMenuActions"
QT_MOC_LITERAL(5, 76, 19), // "testFileServiceSave"
QT_MOC_LITERAL(6, 96, 15), // "testRemoveImage"
QT_MOC_LITERAL(7, 112, 19), // "testThresholdOpOtsu"
QT_MOC_LITERAL(8, 132, 18), // "testThresholdOp127"
QT_MOC_LITERAL(9, 151, 21), // "testThresholdOpDouble"
QT_MOC_LITERAL(10, 173, 28), // "testQuantifOpLinearCentered2"
QT_MOC_LITERAL(11, 202, 28), // "testQuantifOpLinearCentered3"
QT_MOC_LITERAL(12, 231, 28), // "testQuantifOpLinearCentered5"
QT_MOC_LITERAL(13, 260, 29), // "testQuantifOpLinearCentered16"
QT_MOC_LITERAL(14, 290, 22), // "testQuantifOpLloydMax2"
QT_MOC_LITERAL(15, 313, 22), // "testQuantifOpLloydMax3"
QT_MOC_LITERAL(16, 336, 22), // "testQuantifOpLloydMax5"
QT_MOC_LITERAL(17, 359, 23), // "testQuantifOpLloydMax16"
QT_MOC_LITERAL(18, 383, 31), // "testQuantifOpNonLinearCentered2"
QT_MOC_LITERAL(19, 415, 31), // "testQuantifOpNonLinearCentered3"
QT_MOC_LITERAL(20, 447, 31), // "testQuantifOpNonLinearCentered5"
QT_MOC_LITERAL(21, 479, 32), // "testQuantifOpNonLinearCentered16"
QT_MOC_LITERAL(22, 512, 27), // "testQuantifOpNonLinearMean2"
QT_MOC_LITERAL(23, 540, 27), // "testQuantifOpNonLinearMean3"
QT_MOC_LITERAL(24, 568, 27), // "testQuantifOpNonLinearMean5"
QT_MOC_LITERAL(25, 596, 28), // "testQuantifOpNonLinearMean16"
QT_MOC_LITERAL(26, 625, 18), // "testTranslateOpPos"
QT_MOC_LITERAL(27, 644, 18), // "testTranslateOpNeg"
QT_MOC_LITERAL(28, 663, 17), // "testRotateOpCwise"
QT_MOC_LITERAL(29, 681, 18), // "testRotateOpACwise"
QT_MOC_LITERAL(30, 700, 13), // "testFlipOpHor"
QT_MOC_LITERAL(31, 714, 13), // "testFlipOpVer"
QT_MOC_LITERAL(32, 728, 21), // "testScalingOpBilinear"
QT_MOC_LITERAL(33, 750, 20), // "testScalingOpNearest"
QT_MOC_LITERAL(34, 771, 13), // "testCompQuant"
QT_MOC_LITERAL(35, 785, 17) // "testCompThreshold"
},
"TestGui\0testGenericInterfaceSetup\0\0"
"testWindowServiceAddFile\0testFileServiceSave\0"
"testRemoveImage\0testThresholdOp"
"testWindowServiceAddFile\0testMenuActions\0"
"testFileServiceSave\0testRemoveImage\0"
"testThresholdOpOtsu\0testThresholdOp127\0"
"testThresholdOpDouble\0"
"testQuantifOpLinearCentered2\0"
"testQuantifOpLinearCentered3\0"
"testQuantifOpLinearCentered5\0"
"testQuantifOpLinearCentered16\0"
"testQuantifOpLloydMax2\0testQuantifOpLloydMax3\0"
"testQuantifOpLloydMax5\0testQuantifOpLloydMax16\0"
"testQuantifOpNonLinearCentered2\0"
"testQuantifOpNonLinearCentered3\0"
"testQuantifOpNonLinearCentered5\0"
"testQuantifOpNonLinearCentered16\0"
"testQuantifOpNonLinearMean2\0"
"testQuantifOpNonLinearMean3\0"
"testQuantifOpNonLinearMean5\0"
"testQuantifOpNonLinearMean16\0"
"testTranslateOpPos\0testTranslateOpNeg\0"
"testRotateOpCwise\0testRotateOpACwise\0"
"testFlipOpHor\0testFlipOpVer\0"
"testScalingOpBilinear\0testScalingOpNearest\0"
"testCompQuant\0testCompThreshold"
};
#undef QT_MOC_LITERAL
......@@ -49,7 +99,7 @@ static const uint qt_meta_data_TestGui[] = {
7, // revision
0, // classname
0, 0, // classinfo
5, 14, // methods
34, 14, // methods
0, 0, // properties
0, 0, // enums/sets
0, 0, // constructors
......@@ -57,13 +107,71 @@ static const uint qt_meta_data_TestGui[] = {
0, // signalCount
// slots: name, argc, parameters, tag, flags
1, 0, 39, 2, 0x08 /* Private */,
3, 0, 40, 2, 0x08 /* Private */,
4, 0, 41, 2, 0x08 /* Private */,
5, 0, 42, 2, 0x08 /* Private */,
6, 0, 43, 2, 0x08 /* Private */,
1, 0, 184, 2, 0x08 /* Private */,
3, 0, 185, 2, 0x08 /* Private */,
4, 0, 186, 2, 0x08 /* Private */,
5, 0, 187, 2, 0x08 /* Private */,
6, 0, 188, 2, 0x08 /* Private */,
7, 0, 189, 2, 0x08 /* Private */,
8, 0, 190, 2, 0x08 /* Private */,
9, 0, 191, 2, 0x08 /* Private */,
10, 0, 192, 2, 0x08 /* Private */,
11, 0, 193, 2, 0x08 /* Private */,
12, 0, 194, 2, 0x08 /* Private */,
13, 0, 195, 2, 0x08 /* Private */,
14, 0, 196, 2, 0x08 /* Private */,
15, 0, 197, 2, 0x08 /* Private */,
16, 0, 198, 2, 0x08 /* Private */,
17, 0, 199, 2, 0x08 /* Private */,
18, 0, 200, 2, 0x08 /* Private */,
19, 0, 201, 2, 0x08 /* Private */,
20, 0, 202, 2, 0x08 /* Private */,
21, 0, 203, 2, 0x08 /* Private */,
22, 0, 204, 2, 0x08 /* Private */,
23, 0, 205, 2, 0x08 /* Private */,
24, 0, 206, 2, 0x08 /* Private */,
25, 0, 207, 2, 0x08 /* Private */,
26, 0, 208, 2, 0x08 /* Private */,
27, 0, 209, 2, 0x08 /* Private */,
28, 0, 210, 2, 0x08 /* Private */,
29, 0, 211, 2, 0x08 /* Private */,
30, 0, 212, 2, 0x08 /* Private */,
31, 0, 213, 2, 0x08 /* Private */,
32, 0, 214, 2, 0x08 /* Private */,
33, 0, 215, 2, 0x08 /* Private */,
34, 0, 216, 2, 0x08 /* Private */,
35, 0, 217, 2, 0x08 /* Private */,
// slots: parameters
QMetaType::Void,
QMetaType::Void,
QMetaType::Void,
QMetaType::Void,
QMetaType::Void,
QMetaType::Void,
QMetaType::Void,
QMetaType::Void,
QMetaType::Void,
QMetaType::Void,
QMetaType::Void,
QMetaType::Void,
QMetaType::Void,
QMetaType::Void,
QMetaType::Void,
QMetaType::Void,
QMetaType::Void,
QMetaType::Void,
QMetaType::Void,
QMetaType::Void,
QMetaType::Void,
QMetaType::Void,
QMetaType::Void,
QMetaType::Void,
QMetaType::Void,
QMetaType::Void,
QMetaType::Void,
QMetaType::Void,
QMetaType::Void,
QMetaType::Void,
QMetaType::Void,
QMetaType::Void,
......@@ -81,9 +189,38 @@ void TestGui::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, voi
switch (_id) {
case 0: _t->testGenericInterfaceSetup(); break;
case 1: _t->testWindowServiceAddFile(); break;
case 2: _t->testFileServiceSave(); break;
case 3: _t->testRemoveImage(); break;
case 4: _t->testThresholdOp(); break;
case 2: _t->testMenuActions(); break;
case 3: _t->testFileServiceSave(); break;
case 4: _t->testRemoveImage(); break;
case 5: _t->testThresholdOpOtsu(); break;
case 6: _t->testThresholdOp127(); break;
case 7: _t->testThresholdOpDouble(); break;
case 8: _t->testQuantifOpLinearCentered2(); break;
case 9: _t->testQuantifOpLinearCentered3(); break;
case 10: _t->testQuantifOpLinearCentered5(); break;
case 11: _t->testQuantifOpLinearCentered16(); break;
case 12: _t->testQuantifOpLloydMax2(); break;
case 13: _t->testQuantifOpLloydMax3(); break;
case 14: _t->testQuantifOpLloydMax5(); break;
case 15: _t->testQuantifOpLloydMax16(); break;
case 16: _t->testQuantifOpNonLinearCentered2(); break;
case 17: _t->testQuantifOpNonLinearCentered3(); break;
case 18: _t->testQuantifOpNonLinearCentered5(); break;
case 19: _t->testQuantifOpNonLinearCentered16(); break;
case 20: _t->testQuantifOpNonLinearMean2(); break;
case 21: _t->testQuantifOpNonLinearMean3(); break;
case 22: _t->testQuantifOpNonLinearMean5(); break;
case 23: _t->testQuantifOpNonLinearMean16(); break;
case 24: _t->testTranslateOpPos(); break;
case 25: _t->testTranslateOpNeg(); break;
case 26: _t->testRotateOpCwise(); break;
case 27: _t->testRotateOpACwise(); break;
case 28: _t->testFlipOpHor(); break;
case 29: _t->testFlipOpVer(); break;
case 30: _t->testScalingOpBilinear(); break;
case 31: _t->testScalingOpNearest(); break;
case 32: _t->testCompQuant(); break;
case 33: _t->testCompThreshold(); break;
default: ;
}
}
......@@ -115,13 +252,13 @@ int TestGui::qt_metacall(QMetaObject::Call _c, int _id, void **_a)
if (_id < 0)
return _id;
if (_c == QMetaObject::InvokeMetaMethod) {
if (_id < 5)
if (_id < 34)
qt_static_metacall(this, _c, _id, _a);
_id -= 5;
_id -= 34;
} else if (_c == QMetaObject::RegisterMethodArgumentMetaType) {
if (_id < 5)
if (_id < 34)
*reinterpret_cast<int*>(_a[0]) = -1;
_id -= 5;
_id -= 34;
}
return _id;
}
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment