More work

Scott Klum
1 parent ddbf56c6
Showing 3 changed files with 46 additions and 62 deletions
openbr/core/qtutils.cpp
openbr/openbr_plugin.cpp
openbr/plugins/gallery/csv.cpp
@@ -245,10 +245,10 @@ QStringList parse(QString args, char split, bool *ok)
     QStack<QChar> subexpressions;
     for (int i=0; i<args.size(); i++) {
         if (inQuote) {
-            if (args[i] == '\'')
+            if (args[i] == '\'' || args[i] == '\"')
                 inQuote = false;
         } else {
-            if (args[i] == '\'') {
+            if (args[i] == '\'' || args[i] == '\"') {
                 inQuote = true;
             } else if ((args[i] == '(') || (args[i] == '[') || (args[i] == '<') || (args[i] == '{')) {
                 subexpressions.push(args[i]);
@@ -277,7 +277,10 @@ QStringList parse(QString args, char split, bool *ok)
                     return words;
                 }
             } else if (subexpressions.isEmpty() && (args[i] == split)) {
-                words.append(args.mid(start, i-start).trimmed());
+                QString word = args.mid(start, i-start).trimmed();
+                if (word.contains('\'') || word.contains('\"'))
+                    word = word.mid(1, word.size()-2);
+                words.append(word);
                 start = i+1;
             }
         }
@@ -512,6 +515,13 @@ QVariantMap fromJsonObject(const QJsonObject &amp;object)
  
 QVariant fromString(const QString &value)
 {
+    if (value.startsWith('[') && value.endsWith(']')) {
+        QVariantList variants;
+        foreach (const QString &value, QtUtils::parse(value.mid(1, value.size()-2)))
+            variants.append(fromString(value));
+        return variants;
+    }
+
     bool ok = false;
     const QPointF point = QtUtils::toPoint(value, &ok);
     if (ok) return point;
@@ -156,30 +156,12 @@ QVariant File::value(const QString &amp;key) const
  
 QVariant File::parse(const QString &value)
 {
-    bool ok = false;
-    const QPointF point = QtUtils::toPoint(value, &ok);
-    if (ok) return point;
-    const QRectF rect = QtUtils::toRect(value, &ok);
-    if (ok) return rect;
-    const cv::RotatedRect rotatedRect = OpenCVUtils::rotateRectFromString(value, &ok);
-    if (ok) return QVariant::fromValue(rotatedRect);
-    const int i = value.toInt(&ok);
-    if (ok) return i;
-    const float f = value.toFloat(&ok);
-    if (ok) return f;
-    return value;
+    return QtUtils::fromString(value);
 }
  
 void File::set(const QString &key, const QString &value)
 {
-    if (value.startsWith('[') && value.endsWith(']')) {
-        QVariantList variants;
-        foreach (const QString &value, QtUtils::parse(value.mid(1, value.size()-2)))
-            variants.append(parse(value));
-        set(key, variants);
-    } else {
-        set(key, QVariant(parse(value)));
-    }
+    set(key, QtUtils::fromString(value));
 }
  
 bool File::getBool(const QString &key, bool defaultValue) const
@@ -157,21 +157,31 @@ class csvGallery : public FileGallery
         QtUtils::writeFile(file, lines);
     }
  
-  void setValuesFromHeaders(File &f, const CSVHeaderList &headers, const QVariantList &values)
-  {
-    foreach (const CSVHeader &header, headers) {
-      if (header.indices.size() == 1)
-	f.set(header.key, values[header.indices.first()]);
-      else if (header.indices.size() == 2) // QPointF
-	f.appendPoint(QPointF(values[header.indices[header.subKeys.indexOf("X")]].toFloat(),
-			      values[header.indices[header.subKeys.indexOf("Y")]].toFloat()));
-      else if (header.indices.size() == 4) // QRectF
-	f.appendRect(QRectF(values[header.indices[header.subKeys.indexOf("X")]].toFloat(),
-			    values[header.indices[header.subKeys.indexOf("Y")]].toFloat(),
-			    values[header.indices[header.subKeys.indexOf("Width")]].toFloat(),
-			    values[header.indices[header.subKeys.indexOf("Height")]].toFloat()));
+    void setValuesFromHeaders(File &f, const CSVHeaderList &headers, const QVariantList &values)
+    {
+        foreach (const CSVHeader &header, headers) {
+            if (header.indices.size() == 1) {
+                if (header.key == "Rects")
+                    foreach(const QVariant &rect, values[header.indices.first()].toList())
+                        f.appendRect(rect.toRectF());
+                else if (header.key == "Points")
+                    foreach(const QVariant &point, values[header.indices.first()].toList())
+                        f.appendPoint(point.toPointF());
+                else {
+                    const QVariant value = values[header.indices.first()];
+                    if (!value.canConvert<QString>() || !value.toString().isEmpty())
+                        f.set(header.key, values[header.indices.first()]);
+                }
+            } else if (header.indices.size() == 2) // QPointF
+                f.appendPoint(QPointF(values[header.indices[header.subKeys.indexOf("X")]].toFloat(),
+                                      values[header.indices[header.subKeys.indexOf("Y")]].toFloat()));
+            else if (header.indices.size() == 4) // QRectF
+                f.appendRect(QRectF(values[header.indices[header.subKeys.indexOf("X")]].toFloat(),
+                                    values[header.indices[header.subKeys.indexOf("Y")]].toFloat(),
+                                    values[header.indices[header.subKeys.indexOf("Width")]].toFloat(),
+                                    values[header.indices[header.subKeys.indexOf("Height")]].toFloat()));
+        }
     }
-  }
  
     TemplateList readBlock(bool *done)
     {
@@ -196,7 +206,10 @@ class csvGallery : public FileGallery
  	    QMap<QString, File> combinedFiles;
  
   	    while (!f.atEnd()) {
-               const QVariantList values = parseLine(f.readLine());
+                QVariantList values;
+                foreach (const QString &value, QtUtils::parse(f.readLine(), ','))
+                    values.append(QtUtils::fromString(value));
+
 	       const QString name = values.first().toString();
 	       File &in = combinedFiles[name];
 	       in.name = name;
@@ -207,7 +220,9 @@ class csvGallery : public FileGallery
 	      templates.append(in);
 	} else {
   	    for (qint64 i = 0; i < this->readBlockSize && !f.atEnd(); i++) {
-               const QVariantList values = parseLine(f.readLine());
+                QVariantList values;
+                foreach (const QString &value, QtUtils::parse(f.readLine(), ','))
+                    values.append(QtUtils::fromString(value));
  
                File in;
 	       in.name = values.first().toString();
@@ -250,29 +265,6 @@ class csvGallery : public FileGallery
         }
         return words.join(",");
     }
-
-    static QVariantList parseLine(const QByteArray bytes)
-    {
-        bool inQuote(false);
-        QVariantList values;
-        QString value = QString();
-        const QString line = QString::fromLocal8Bit(bytes).trimmed();
-        for (int i=0; i<line.size(); i++) {
-            const QChar c = line[i];
-            if (c == '"') {
-                inQuote = !inQuote;
-                continue;
-            } else if (c == ',' && !inQuote) {
-                values.append(QVariant(value));
-                value = QString();
-            } else
-                value.append(c);
-        }
-        if (!value.isEmpty())
-            values.append(QVariant(value));
-
-        return values;
-    }
 };
  
 BR_REGISTER(Gallery, csvGallery)