Peter M. Groen / openbr

Commit 54f3b72eeeadc326268085488c6ddcc4bd407bfd

Authored by Josh Klontz
2 parents ac280fc3 73ca1e58

Merge pull request #255 from biometrics/stasm_pineyes_fix 

Stasm pineyes fix
Inline Side-by-side
Showing 1 changed file with 11 additions and 7 deletions
openbr/plugins/stasm4.cpp
  View file @54f3b72
... ... @@ -64,8 +64,8 @@ class StasmTransform : public UntrainableTransform
64 64 BR_PROPERTY(bool, stasm3Format, false)
65 65 Q_PROPERTY(bool clearLandmarks READ get_clearLandmarks WRITE set_clearLandmarks RESET reset_clearLandmarks STORED false)
66 66 BR_PROPERTY(bool, clearLandmarks, false)
67   - Q_PROPERTY(QStringList pinEyes READ get_pinEyes WRITE set_pinEyes RESET reset_pinEyes STORED false)
68   - BR_PROPERTY(QStringList, pinEyes, QStringList())
  67 + Q_PROPERTY(QVariantList pinEyes READ get_pinEyes WRITE set_pinEyes RESET reset_pinEyes STORED false)
  68 + BR_PROPERTY(QVariantList, pinEyes, QVariantList())
69 69  
70 70 Resource<StasmCascadeClassifier> stasmCascadeResource;
71 71  
... ... @@ -102,15 +102,19 @@ class StasmTransform : public UntrainableTransform
102 102 QPointF leftEye;
103 103  
104 104 if (src.file.contains("Affine_0") && src.file.contains("Affine_1")) {
105   - rightEye = QtUtils::toPoint(pinEyes.at(0),&ok);
106   - leftEye = QtUtils::toPoint(pinEyes.at(1),&ok);
  105 + rightEye = pinEyes.at(0).toPointF();
  106 + leftEye = pinEyes.at(1).toPointF();
  107 + if (!rightEye.isNull() && !leftEye.isNull())
  108 + ok = true;
107 109 }
108 110  
109 111 if (!ok) {
110   - if (src.file.contains(pinEyes.at(0)) && src.file.contains(pinEyes.at(1)))
  112 + QString r = pinEyes.at(0).toString();
  113 + QString l = pinEyes.at(1).toString();
  114 + if (!r.isNull() && !l.isNull() && src.file.contains(r) && src.file.contains(l))
111 115 {
112   - rightEye = src.file.get<QPointF>(pinEyes.at(0), QPointF());
113   - leftEye = src.file.get<QPointF>(pinEyes.at(1), QPointF());
  116 + rightEye = src.file.get<QPointF>(r, QPointF());
  117 + leftEye = src.file.get<QPointF>(l, QPointF());
114 118 ok = true;
115 119 }
116 120 }
... ...