Fix livewire with salience map

Author: tayllatheodoro

segmentation/gradient/saliency/saliency.cpp

@@ -9,6 +9,7 @@ Saliency::Saliency(QWidget *parent) :
 {
     ui->setupUi(this);
     saliencyImage = nullptr;
+    weightedSaliencyImage = nullptr;
     _name = "Salience map";
     connect(ui->pbLoad, SIGNAL(clicked()), this, SLOT(loadSaliency()));
     connect(ui->lePath, SIGNAL(textChanged(QString)), this, SLOT(updateArcWeightParams()));
@@ -20,6 +21,7 @@ Saliency::Saliency(QWidget *parent) :
 Saliency::~Saliency()
 {
     iftDestroyImage(&saliencyImage);
+    iftDestroyImage(&weightedSaliencyImage);
     delete ui;
 }
 
@@ -45,6 +47,24 @@ const iftImage *Saliency::getSaliencyImage()
     return saliencyImage;
 }
 
+const iftImage *Saliency::getWeightedSaliencyImage()
+{
+    float factor = ui->sbSaliencyFactor->value();
+
+    if (!weightedSaliencyImage) {
+        const iftImage *saliency = getSaliencyImage();
+        const iftImage *img = view->getImage();
+        weightedSaliencyImage = iftCreateImageFromImage(saliency);
+
+
+        for (int p = 0; p < weightedSaliencyImage->n; p++) {
+            weightedSaliencyImage->val[p] = factor * saliency->val[p] + (1 - factor) * img->val[p];
+        }
+    }
+
+    return weightedSaliencyImage;
+}
+
 void Saliency::generate()
 {
     float adjRelRadius = ui->sbAdjRel->value();
@@ -105,6 +125,13 @@ void Saliency::loadSaliency()
 void Saliency::updateSaliencyPath()
 {
     iftDestroyImage(&saliencyImage);
+    iftDestroyImage(&weightedSaliencyImage);
+}
+
+void Saliency::updateArcWeightParams()
+{
+    iftDestroyImage(&weightedSaliencyImage);
+    ArcWeightFunction::updateArcWeightParams();
 }
 
 void Saliency::preprocess()

segmentation/gradient/saliency/saliency.h

@@ -18,18 +18,21 @@ class Saliency : public ArcWeightFunction
     ~Saliency();
 
     const iftImage *getSaliencyImage();
+    const iftImage *getWeightedSaliencyImage();
 public slots:
     void generate() override;
 
 
 private slots:
     void loadSaliency();
     void updateSaliencyPath();
+    void updateArcWeightParams() override;
 
 private:
     Ui::Saliency *ui;
 
     iftImage *saliencyImage;
+    iftImage *weightedSaliencyImage;
 
     void preprocess() override;
 

segmentation/livewire/livewire.cpp

@@ -32,6 +32,8 @@ LiveWire::LiveWire(MainWindow *parent, View *view) :
     connect(ui->rbNoOrientaion, SIGNAL(toggled(bool)), this, SLOT(changeOrientationMethod()));
     connect(ui->rbForce, SIGNAL(toggled(bool)), this, SLOT(changeOrientationMethod()));
     connect(ui->rbSalience, SIGNAL(toggled(bool)), this, SLOT(changeOrientationMethod()));
+    connect(ui->rbSalience, SIGNAL(toggled(bool)), this, SLOT(selectSalienceMethod(bool)));
+
 
     QAction *foo = new QAction(this);
     foo->setShortcut(Qt::CTRL | Qt::Key_Z);
@@ -269,11 +271,7 @@ QList<iftImage*> LiveWire::generateLabel()
 
 void LiveWire::notifyGradientUpdate(ArcWeightFunction *function)
 {
-    saliency = dynamic_cast<Saliency*>(function);
-    ui->rbSalience->setEnabled(saliency != nullptr);
-    if (!saliency) {
-        ui->rbNoOrientaion->setChecked(true);
-    }
+    this->currentArcWeightFunction = function;
 }
 
 void LiveWire::renderGraphics(iftImage *orig, iftImage *image, QGraphicsPixmapItem *imagePixmap, int sliceType)
@@ -359,7 +357,7 @@ void LiveWire::start()
 {
     if (saliency && ui->rbSalience->isChecked()) {
         try {
-            imageTmp = saliency->getSaliencyImage();
+            imageTmp = saliency->getWeightedSaliencyImage();
         } catch (QString error) {
             QMessageBox::warning((QWidget*) parent,
                                  tr("Warning"),
@@ -474,6 +472,20 @@ void LiveWire::changeOrientationMethod()
     ui->gbOrientation->setEnabled(orientationDirectionEnabled);
 }
 
+void LiveWire::selectSalienceMethod(bool selected)
+{
+    if (selected) {
+        saliency = dynamic_cast<Saliency*>(currentArcWeightFunction);
+        //ui->rbSalience->setEnabled(saliency != nullptr);
+        if (!saliency) {
+            QMessageBox::warning((QWidget*) parent,
+                                 tr("Warning"),
+                                 "You need to choose the salience arc-weight function.");
+            ui->rbNoOrientaion->setChecked(true);
+        }
+    }
+}
+
 void LiveWire::paintPath(int *path)
 {
     if (path) {

segmentation/livewire/livewire.h

@@ -35,6 +35,7 @@ private slots:
     void undo();
     void done();
     void changeOrientationMethod();
+    void selectSalienceMethod(bool selected);
 
 private:
     Ui::LiveWire *ui;
@@ -59,6 +60,8 @@ private slots:
     iftImage *origImage[4];
     iftImage *tmpRenderImage[4];
 
+    ArcWeightFunction *currentArcWeightFunction = nullptr;
+
     int *path;
     QVector<int*> segments;
     int kpoints;

segmentation/livewire/livewire.ui

@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>427</width>
-    <height>305</height>
+    <height>157</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -85,7 +85,7 @@
         <item>
          <widget class="QRadioButton" name="rbSalience">
           <property name="enabled">
-           <bool>false</bool>
+           <bool>true</bool>
           </property>
           <property name="text">
            <string>Salience Image</string>
@@ -158,34 +158,6 @@
      </layout>
     </widget>
    </item>
-   <item>
-    <widget class="QGroupBox" name="gbSalienceMap">
-     <property name="title">
-      <string>Salience Map</string>
-     </property>
-     <layout class="QVBoxLayout" name="verticalLayout_3">
-      <property name="leftMargin">
-       <number>0</number>
-      </property>
-      <property name="topMargin">
-       <number>0</number>
-      </property>
-      <property name="rightMargin">
-       <number>0</number>
-      </property>
-      <property name="bottomMargin">
-       <number>0</number>
-      </property>
-      <item>
-       <widget class="QCheckBox" name="cbSalience">
-        <property name="text">
-         <string>CheckBox</string>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
   </layout>
  </widget>
  <resources>