Peter M. Groen / openbr

Commit 459e5b888750939850a2f12624954f7a6dc27707

Authored by Scott Klum
1 parent 05721739

File::init improvement, FilterDistance bug fix

Inline Side-by-side
Showing 2 changed files with 5 additions and 3 deletions
sdk/openbr_plugin.cpp
  View file @459e5b8
... ... @@ -256,11 +256,13 @@ void File::init(const QString &file)
256 256 if (words[1][0] == '(') {
257 257 QStringList values = words[1].split(',');
258 258 if (values.size() == 2) /* QPointF */ {
259   - QPointF point(values[0].remove('(').toFloat(), values[1].remove(')').toFloat());
  259 + values[1].chop(1);
  260 + QPointF point(values[0].mid(1).toFloat(), values[1].remove(')').toFloat());
260 261 set(words[0], point);
261 262 }
262 263 else /* QRectF */ {
263   - QRectF rect(values[0].remove('(').toFloat(), values[1].toFloat(), values[2].toFloat(), values[3].remove(')').toFloat());
  264 + values[3].chop(1);
  265 + QRectF rect(values[0].mid(1).toFloat(), values[1].toFloat(), values[2].toFloat(), values[3].remove(')').toFloat());
264 266 set(words[0], rect);
265 267 }
266 268 }
... ...
sdk/plugins/validate.cpp
  View file @459e5b8
... ... @@ -105,7 +105,7 @@ class FilterDistance : public Distance
105 105 foreach (const QString &key, Globals->filters.keys()) {
106 106 bool keep = false;
107 107 const QString metadata = a.file.get<QString>(key, "");
108   - if (metadata.isEmpty()) continue;
  108 + if (metadata.isEmpty() || Globals->filters[key].isEmpty()) continue;
109 109 foreach (const QString &value, Globals->filters[key]) {
110 110 if (metadata == value) {
111 111 keep = true;
... ...