Removed redundant code in DisplayGUI

Scott Klum
1 parent 5b3c7a8e
Showing 2 changed files with 17 additions and 23 deletions
openbr/plugins/format.cpp
openbr/plugins/gui.cpp
@@ -706,8 +706,21 @@ class xmlFormat : public Format
  
     void write(const Template &t) const
     {
-        (void) t;
-        qFatal("Not supported.");
+        QStringList lines;
+        lines.append("<?xml version=\"1.0\" standalone=\"yes\"?>");
+        lines.append("<openbr-xml-format>");
+        lines.append("\t<xml-data>");
+        foreach (const QString &key, t.file.localKeys()) {
+            if ((key == "Index") || (key == "Label")) continue;
+            lines.append("\t\t<"+key+">"+QtUtils::toString(t.file.value(key))+"</"+key+">");
+        }
+        std::vector<uchar> data;
+        imencode(".jpg",t.m(),data);
+        QByteArray byteArray = QByteArray::fromRawData((const char*)data.data(), data.size());
+        lines.append("\t\t<FORMAL_IMG>"+byteArray.toBase64()+"</FORMAL_IMG>");
+        lines.append("\t</xml-data>");
+        lines.append("</openbr-xml-format>");
+        QtUtils::writeFile(file, lines);
     }
 };
  
@@ -523,33 +523,26 @@ BR_REGISTER(Transform, ManualTransform)
  * \brief Elicits metadata for templates in a pretty GUI
  * \author Scott Klum \cite sklum
  */
-class ElicitTransform : public TimeVaryingTransform
+class ElicitTransform : public ShowTransform
 {
     Q_PROPERTY(QStringList keys READ get_keys WRITE set_keys RESET reset_keys STORED false)
     BR_PROPERTY(QStringList, keys, QStringList())
  
     Q_OBJECT
  
-    MainThreadCreator creator;
     DisplayGUI *gui;
-    QImage qImageBuffer;
-    QPixmap *displayBuffer;
  
 public:
-    ElicitTransform() : TimeVaryingTransform(false, false)
+    ElicitTransform() : ShowTransform()
     {
-        displayBuffer = NULL;
         gui = NULL;
     }
  
     ~ElicitTransform()
     {
-        delete displayBuffer;
         delete gui;
     }
  
-    void train(const TemplateList &data) { (void) data; }
-
     void project(const TemplateList &src, TemplateList &dst) const
     {
         Transform * non_const = (ElicitTransform *) this;
@@ -575,12 +568,6 @@ public:
         }
     }
  
-    void finalize(TemplateList & output)
-    {
-        (void) output;
-        emit hideWindow();
-    }
-
     void init()
     {
         initActual<DisplayGUI>();
@@ -608,12 +595,6 @@ public:
         connect(this, SIGNAL(updateImage(QPixmap)), gui,SLOT(showImage(QPixmap)));
         connect(this, SIGNAL(hideWindow()), gui, SLOT(hide()));
     }
-
-signals:
-
-    void updateImage(const QPixmap & input);
-    void hideWindow();
-
 };
 BR_REGISTER(Transform, ElicitTransform)