Updated subjectviewer to show number of images per subject

Scott Klum
1 parent 3dee491d
Showing 5 changed files with 50 additions and 10 deletions
openbr/gui/subjectviewer.cpp
openbr/gui/subjectviewer.h
openbr/gui/subjectviewergrid.cpp
openbr/gui/subjectviewergrid.h
openbr/gui/templateviewer.cpp
@@ -3,10 +3,24 @@
 using namespace br;
 SubjectViewer::SubjectViewer(QWidget *parent)
-    : TemplateViewer(parent)
+    : QWidget(parent)
 {
     files = FileList();
     currentIndex = 0;
+
+    info.setText("-");
+    info.setAlignment(Qt::AlignCenter);
+    info.setSizePolicy(QSizePolicy::Ignored, QSizePolicy::Maximum);
+
+    layout.addWidget(&viewer);
+    layout.addWidget(&info);
+
+    setLayout(&layout);
+
+    connect(&viewer, SIGNAL(newInput(br::File)), this, SIGNAL(newInput(br::File)));
+    connect(&viewer, SIGNAL(newInput(QImage)), this, SIGNAL(newInput(QImage)));
+    connect(&viewer, SIGNAL(newMousePoint(QPointF)), this, SIGNAL(newMousePoint(QPointF)));
+    connect(&viewer, SIGNAL(selectedInput(br::File)), this, SIGNAL(selectedInput(br::File)));
 }
 void SubjectViewer::setFiles(const FileList &files)
@@ -15,17 +29,22 @@ void SubjectViewer::setFiles(const FileList &amp;files)
     currentIndex = 0;
     this->files = files;
-    TemplateViewer::setFile(this->files[currentIndex]);
+
+    info.setText(QString::number(currentIndex+1) + "/" + QString::number(files.size()));
+    viewer.setFile(this->files[currentIndex]);
 }
 void SubjectViewer::wheelEvent(QWheelEvent *event)
 {
     QPoint numDegrees = event->angleDelta();
-    if (numDegrees.y() < 0 && currentIndex > 0)
-        TemplateViewer::setFile(this->files[--currentIndex]);
-     else if (numDegrees.y() > 0 && currentIndex < files.size()-1)
-        TemplateViewer::setFile(this->files[++currentIndex]);
+    if (numDegrees.y() < 0 && currentIndex > 0) {
+        viewer.setFile(this->files[--currentIndex]);
+        info.setText(QString::number(currentIndex+1) + "/" + QString::number(files.size()));
+    } else if (numDegrees.y() > 0 && currentIndex < files.size()-1) {
+        viewer.setFile(this->files[++currentIndex]);
+        info.setText(QString::number(currentIndex+1) + "/" + QString::number(files.size()));
+    }
     event->accept();
 }
 #ifndef SUBJECTVIEWER_H
 #define SUBJECTVIEWER_H
+#include <QObject>
+#include <QSharedPointer>
 #include <QList>
+#include <QVBoxLayout>
 #include <openbr/openbr_plugin.h>
 #include <openbr/gui/templateviewer.h>
@@ -9,19 +12,31 @@
 namespace br
 {
-class BR_EXPORT SubjectViewer : public TemplateViewer
+class BR_EXPORT SubjectViewer : public QWidget
 {
+    Q_OBJECT
+
+    QVBoxLayout layout;
+    QLabel info;
     FileList files;
     int currentIndex;
 public:
     explicit SubjectViewer(QWidget *parent = 0);
+    TemplateViewer viewer;
+
 public slots:
     void setFiles(const FileList &files);
 protected slots:
     void wheelEvent(QWheelEvent *);
+
+signals:
+    void newInput(br::File);
+    void newInput(QImage);
+    void newMousePoint(QPointF);
+    void selectedInput(br::File);
 };
 }
@@ -6,6 +6,7 @@ SubjectViewerGrid::SubjectViewerGrid(QWidget *parent) :
     QWidget(parent)
 {
     setLayout(&gridLayout);
+    setFiles(QList<FileList>());
 }
 void SubjectViewerGrid::setFiles(const QList<FileList> &files)
@@ -34,10 +35,10 @@ void SubjectViewerGrid::setFiles(const QList&lt;FileList&gt; &amp;files)
         if (i < files.size()) {
             subjectViewers[i]->setFiles(files[i]);
         } else {
-            subjectViewers[i]->setDefaultText("<b>"+ (size > 1 ? QString() : QString("Drag Photo or Folder Here")) +"</b>");
+            subjectViewers[i]->viewer.setDefaultText("<b>"+ (size > 1 ? QString() : QString("Drag Photo or Folder Here")) +"</b>");
             subjectViewers[i]->setFiles(FileList());
         }
-        subjectViewers[i]->setEditable(files.size() == 1);
+        subjectViewers[i]->viewer.setEditable(files.size() == 1);
     }
 }
@@ -25,6 +25,11 @@ public:
 public slots:
     void setFiles(const QList<br::FileList> &file);
+signals:
+    void newInput(br::File);
+    void newInput(QImage);
+    void newMousePoint(QPointF);
+    void selectedInput(br::File);
 };
 }
@@ -45,7 +45,7 @@ void TemplateViewer::setFile(const File &amp;file_)
         landmarks.append(QPointF());
     nearestLandmark = -1;
-    QtConcurrent::run(this, &TemplateViewer::refreshImage);
+    TemplateViewer::refreshImage();
 }
 void TemplateViewer::setEditable(bool enabled)