Remove original Show transform, rename Show2 to Show

Also, change the default waitKey value to be consistent with original Show

Remove original Show transform, rename Show2 to Show
Also, change the default waitKey value to be consistent with original Show
Charles Otto
1 parent 30d1f4d5
Showing 2 changed files with 7 additions and 48 deletions
openbr/plugins/gui.cpp
openbr/plugins/misc.cpp
@@ -111,20 +111,19 @@ public slots:
  * \ingroup transforms
  * \brief Displays templates in a GUI pop-up window using QT.
  * \author Charles Otto \cite caotto
- * Unlike ShowTransform, this can be used with parallelism enabled, although it
- * is considered TimeVarying.
+ * Can be used with parallelism enabled, although it is considered TimeVarying.
  */
-class Show2Transform : public TimeVaryingTransform
+class ShowTransform : public TimeVaryingTransform
 {
     Q_OBJECT
 public:
     Q_PROPERTY(bool waitInput READ get_waitInput WRITE set_waitInput RESET reset_waitInput STORED false)
-    BR_PROPERTY(bool, waitInput, false)
+    BR_PROPERTY(bool, waitInput, true)
     Q_PROPERTY(QStringList keys READ get_keys WRITE set_keys RESET reset_keys STORED false)
     BR_PROPERTY(QStringList, keys, QStringList("FrameNumber"))
-    Show2Transform() : TimeVaryingTransform(false, false)
+    ShowTransform() : TimeVaryingTransform(false, false)
     {
         // Create our GUI proxy
         gui = new GUIProxy();
@@ -136,7 +135,7 @@ public:
         connect(this, SIGNAL(updateImage(QPixmap)), gui,SLOT(showImage(QPixmap)));
     }
-    ~Show2Transform()
+    ~ShowTransform()
     {
         delete gui;
     }
@@ -145,7 +144,7 @@ public:
     void project(const TemplateList &src, TemplateList &dst) const
     {
-        Transform * non_const = (Show2Transform *) this;
+        Transform * non_const = (ShowTransform *) this;
         non_const->projectUpdate(src,dst);
     }
@@ -210,7 +209,7 @@ signals:
     void hideWindow();
 };
-BR_REGISTER(Transform, Show2Transform)
+BR_REGISTER(Transform, ShowTransform)
 class FPSSynch : public TimeVaryingTransform
 {
@@ -51,46 +51,6 @@ BR_REGISTER(Transform, OpenTransform)
 /*!
  * \ingroup transforms
- * \brief Displays templates in a GUI pop-up window.
- * \author Josh Klontz \cite jklontz
- */
-class ShowTransform : public UntrainableMetaTransform
-{
-    Q_OBJECT
-    Q_PROPERTY(bool waitKey READ get_waitKey WRITE set_waitKey RESET reset_waitKey STORED false)
-    BR_PROPERTY(bool, waitKey, true)
-
-    static int counter;
-    int uid;
-
-    void init()
-    {
-        uid = counter++;
-        Globals->setProperty("parallelism", "0"); // Can only work in single threaded mode
-    }
-
-    void project(const Template &src, Template &dst) const
-    {
-        dst = src;
-
-        if (Globals->parallelism) {
-            qWarning("Show::project() only works in single threaded mode.");
-            return;
-        }
-
-        for (int i=0; i<src.size(); i++)
-            OpenCVUtils::showImage(src[i], "Show" + (counter*src.size() > 1 ? "-" + QString::number(uid*src.size()+i) : QString()), false);
-
-        if (waitKey && !src.isEmpty()) cv::waitKey(-1);
-    }
-};
-
-int ShowTransform::counter = 0;
-
-BR_REGISTER(Transform, ShowTransform)
-
-/*!
- * \ingroup transforms
  * \brief Prints the template's file to stdout or stderr.
  * \author Josh Klontz \cite jklontz
  */