Peter M. Groen / openbr

Commit a6f1411646b247c377865d319d572c2a71db4eca

Authored by Scott Klum
1 parent 259e98d4

Removed some old flip logic

Inline Side-by-side
Showing 2 changed files with 2 additions and 9 deletions
openbr/plugins/algorithms.cpp
  View file @a6f1411
@@ -80,9 +80,9 @@ class AlgorithmsInitializer : public Initializer @@ -80,9 +80,9 @@ class AlgorithmsInitializer : public Initializer
80 Globals->abbreviations.insert("ContrastEnhanced", "Open+Affine(256,256,0.37,0.45)+Cvt(Gray)+Blur(1.1)+Gamma(0.2)+DoG(1,2)+ContrastEq(0.1,10)"); 80 Globals->abbreviations.insert("ContrastEnhanced", "Open+Affine(256,256,0.37,0.45)+Cvt(Gray)+Blur(1.1)+Gamma(0.2)+DoG(1,2)+ContrastEq(0.1,10)");
81 Globals->abbreviations.insert("ColoredLBP", "Open+Affine(128,128,0.37,0.45)+Cvt(Gray)+Blur(1.1)+Gamma(0.2)+DoG(1,2)+ContrastEq(0.1,10)+LBP(1,2)+ColoredU2"); 81 Globals->abbreviations.insert("ColoredLBP", "Open+Affine(128,128,0.37,0.45)+Cvt(Gray)+Blur(1.1)+Gamma(0.2)+DoG(1,2)+ContrastEq(0.1,10)+LBP(1,2)+ColoredU2");
82 Globals->abbreviations.insert("FlipiBug","Flip+ReorderPoints([ 0, 1, 2, 3, 4, 5, 6, 7, 17,18,19,20,21,31,32,36,37,38,39,40,41,48,49,50,55,56,60,61,65], \ 82 Globals->abbreviations.insert("FlipiBug","Flip+ReorderPoints([ 0, 1, 2, 3, 4, 5, 6, 7, 17,18,19,20,21,31,32,36,37,38,39,40,41,48,49,50,55,56,60,61,65], \
83 - [16,15,14,13,12,11,10, 9, 26,25,24,23,22,35,34,45,44,43,42,47,46,54,53,52,59,58,64,63,67],true)"); 83 + [16,15,14,13,12,11,10, 9, 26,25,24,23,22,35,34,45,44,43,42,47,46,54,53,52,59,58,64,63,67])");
84 Globals->abbreviations.insert("FlipiBugNoJaw","Flip+ReorderPoints([0,1,2,3,4,14,15,19,20,21,22,23,24,31,32,33,38,39,43,44,48], \ 84 Globals->abbreviations.insert("FlipiBugNoJaw","Flip+ReorderPoints([0,1,2,3,4,14,15,19,20,21,22,23,24,31,32,33,38,39,43,44,48], \
85 - [9,8,7,6,5,18,17,28,27,26,25,30,29,37,36,35,42,41,47,46,50],true)"); 85 + [9,8,7,6,5,18,17,28,27,26,25,30,29,37,36,35,42,41,47,46,50])");
86 86
87 // Transforms 87 // Transforms
88 Globals->abbreviations.insert("FaceDetection", "Open+Cvt(Gray)+Cascade(FrontalFace)"); 88 Globals->abbreviations.insert("FaceDetection", "Open+Cvt(Gray)+Cascade(FrontalFace)");
openbr/plugins/template.cpp
  View file @a6f1411
@@ -222,18 +222,11 @@ class ReorderPointsTransform : public UntrainableMetadataTransform @@ -222,18 +222,11 @@ class ReorderPointsTransform : public UntrainableMetadataTransform
222 222
223 Q_PROPERTY(QList<int> from READ get_from WRITE set_from RESET reset_from STORED false) 223 Q_PROPERTY(QList<int> from READ get_from WRITE set_from RESET reset_from STORED false)
224 Q_PROPERTY(QList<int> to READ get_to WRITE set_to RESET reset_to STORED false) 224 Q_PROPERTY(QList<int> to READ get_to WRITE set_to RESET reset_to STORED false)
225 - Q_PROPERTY(bool flippedOnly READ get_flippedOnly WRITE set_flippedOnly RESET reset_flippedOnly STORED false)  
226 BR_PROPERTY(QList<int>, from, QList<int>()) 225 BR_PROPERTY(QList<int>, from, QList<int>())
227 BR_PROPERTY(QList<int>, to, QList<int>()) 226 BR_PROPERTY(QList<int>, to, QList<int>())
228 - BR_PROPERTY(bool, flippedOnly, false)  
229 227
230 void projectMetadata(const File &src, File &dst) const 228 void projectMetadata(const File &src, File &dst) const
231 { 229 {
232 - if (flippedOnly && !src.contains("Flipped")) {  
233 - dst = src;  
234 - return;  
235 - }  
236 -  
237 if (from.size() == to.size()) { 230 if (from.size() == to.size()) {
238 QList<QPointF> points = src.points(); 231 QList<QPointF> points = src.points();
239 for (int i=0; i<from.size(); i++) 232 for (int i=0; i<from.size(); i++)