Commit f7f0dac1b6d2810b8ed6a777bfc38f75acb616bd
1 parent
6a1be000
Simmat/mask error output fix
Showing
2 changed files
with
2 additions
and
2 deletions
openbr/core/plot.cpp
| ... | ... | @@ -122,7 +122,7 @@ float Evaluate(const QString &simmat, const QString &mask, const QString &csv) |
| 122 | 122 | maskFile.set("rows", scores.rows); |
| 123 | 123 | maskFile.set("columns", scores.cols); |
| 124 | 124 | const Mat masks = BEE::readMask(maskFile); |
| 125 | - if (scores.size() != masks.size()) qFatal("Simmat/Mask size mismatch."); | |
| 125 | + if (scores.size() != masks.size()) qFatal("Simmat (%i,%i) / Mask (%i,%i) size mismatch.", scores.rows, scores.cols, masks.rows, masks.cols); | |
| 126 | 126 | |
| 127 | 127 | // Make comparisons |
| 128 | 128 | QList<Comparison> comparisons; comparisons.reserve(scores.rows*scores.cols); | ... | ... |
openbr/plugins/stasm.cpp
| ... | ... | @@ -22,7 +22,7 @@ class StasmInitializer : public Initializer |
| 22 | 22 | Globals->abbreviations.insert("RectFromStasmJaw","RectFromPoints([0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14],10)"); |
| 23 | 23 | Globals->abbreviations.insert("RectFromStasmBrow","RectFromPoints([15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26],0.25,6.5)+Resize(44,230)"); |
| 24 | 24 | Globals->abbreviations.insert("RectFromStasmNose","RectFromPoints([38, 39, 40, 41, 42, 43, 44, 67],0.1,1.5)+Resize(44,44)"); |
| 25 | - Globals->abbreviations.insert("RectFromStasmMouth","RectFromPoints([48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66],0.3,3.0)+Resize(44,110)"); | |
| 25 | + Globals->abbreviations.insert("RectFromStasmMouth","RectFromPoints([48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66],0.3,3.0)+Resize(26,68)"); | |
| 26 | 26 | } |
| 27 | 27 | }; |
| 28 | 28 | ... | ... |