Fixed local gui

Scott Klum
2 parents e5fb7e7e ae079eb7
Showing 2 changed files with 11 additions and 8 deletions
openbr/plugins/gui.cpp
openbr/plugins/stream.cpp
@@ -134,11 +134,15 @@ public:
         // Connect our signals to the proxy's slots
         connect(this, SIGNAL(needWindow()), gui, SLOT(createWindow()), Qt::BlockingQueuedConnection);
 <<<<<<< HEAD
+<<<<<<< HEAD
         connect(this, SIGNAL(updateImage(QPixmap)), gui,SLOT(showImage(QPixmap)));
         // connect gui newPoint to this setPoint
 =======
         connect(this, SIGNAL(updateImage(QPixmap)), gui,SLOT(showImage(QPixmap)), Qt::BlockingQueuedConnection);
 >>>>>>> 45e51f44421b925d4edab9671ceea12c88665793
+=======
+        connect(this, SIGNAL(updateImage(QPixmap)), gui,SLOT(showImage(QPixmap)));
+>>>>>>> ae079eb71b689932c5119c6176b2d272b5f3546b
     }
     ~Show2Transform()
@@ -193,14 +197,14 @@ public:
     void finalize(TemplateList & output)
     {
         (void) output;
-        if (gui && gui->window)
-            gui->window->hide();
+        emit hideWindow();
     }
     void init()
     {
         emit needWindow();
         connect(this, SIGNAL(changeTitle(QString)), gui->window, SLOT(setWindowTitle(QString)));
+        connect(this, SIGNAL(hideWindow()), gui->window, SLOT(hide()));
     }
 protected:
@@ -212,6 +216,7 @@ signals:
     void needWindow();
     void updateImage(const QPixmap & input);
     void changeTitle(const QString & input);
+    void hideWindow();
 };
 BR_REGISTER(Transform, Show2Transform)
@@ -271,12 +271,10 @@ public:
         next_idx = 0;
         basis = input;
         video.open(input.file.name.toStdString());
-        video_ok = video.isOpened();
-        return video_ok;
+        return video.isOpened();
     }
-    bool video_ok;
-    bool isOpen() { return video_ok; }
+    bool isOpen() { return video.isOpened(); }
     void close() {
         video.release();
@@ -298,8 +296,8 @@ private:
         output.data.last().last() = output.data.last().last().clone();
         if (!res) {
-            video_ok = false;
-            return video_ok;
+            close();
+            return false;
         }
         output.data.last().file.set("FrameNumber", output.sequenceNumber);
         return true;