Commit fbd840a072aa226254ae7900d40d0813ed0e54ba
1 parent
819671f5
Remove check on FTE in Expanded, don't set FTE in FTETransform
This in anticipation of strict enforcement of the FTE flag at the composite transform level.
Showing
1 changed file
with
4 additions
and
7 deletions
openbr/plugins/meta.cpp
| @@ -39,7 +39,6 @@ static TemplateList Expanded(const TemplateList &templates) | @@ -39,7 +39,6 @@ static TemplateList Expanded(const TemplateList &templates) | ||
| 39 | continue; | 39 | continue; |
| 40 | } | 40 | } |
| 41 | 41 | ||
| 42 | - const bool fte = t.file.get<bool>("FTE"); | ||
| 43 | const QList<QPointF> points = t.file.points(); | 42 | const QList<QPointF> points = t.file.points(); |
| 44 | const QList<QRectF> rects = t.file.rects(); | 43 | const QList<QRectF> rects = t.file.rects(); |
| 45 | if (points.size() % t.size() != 0) qFatal("Uneven point count."); | 44 | if (points.size() % t.size() != 0) qFatal("Uneven point count."); |
| @@ -48,11 +47,9 @@ static TemplateList Expanded(const TemplateList &templates) | @@ -48,11 +47,9 @@ static TemplateList Expanded(const TemplateList &templates) | ||
| 48 | const int rectStep = rects.size() / t.size(); | 47 | const int rectStep = rects.size() / t.size(); |
| 49 | 48 | ||
| 50 | for (int i=0; i<t.size(); i++) { | 49 | for (int i=0; i<t.size(); i++) { |
| 51 | - if (!fte || !enrollAll) { | ||
| 52 | - expanded.append(Template(t.file, t[i])); | ||
| 53 | - expanded.last().file.setRects(rects.mid(i*rectStep, rectStep)); | ||
| 54 | - expanded.last().file.setPoints(points.mid(i*pointStep, pointStep)); | ||
| 55 | - } | 50 | + expanded.append(Template(t.file, t[i])); |
| 51 | + expanded.last().file.setRects(rects.mid(i*rectStep, rectStep)); | ||
| 52 | + expanded.last().file.setPoints(points.mid(i*pointStep, pointStep)); | ||
| 56 | } | 53 | } |
| 57 | } | 54 | } |
| 58 | return expanded; | 55 | return expanded; |
| @@ -639,7 +636,7 @@ class FTETransform : public Transform | @@ -639,7 +636,7 @@ class FTETransform : public Transform | ||
| 639 | 636 | ||
| 640 | dst = src; | 637 | dst = src; |
| 641 | dst.file.set(transform->objectName(), val); | 638 | dst.file.set(transform->objectName(), val); |
| 642 | - dst.file.set("FTE", (val < min) || (val > max)); | 639 | + dst.file.set("PossibleFTE", (val < min) || (val > max)); |
| 643 | } | 640 | } |
| 644 | }; | 641 | }; |
| 645 | 642 |