v2.1: several bugs fixed

Author: AbsurdePhoton

README.md

@@ -1,6 +1,6 @@
 # superpixels-segmentation-gui-opencv
 ## Superpixels segmentation algorithms with QT and OpenCV, with a nice GUI to manage labels and colorize the cells
-### v2.1 - 2018-10-13
+### v2.1 - 2019-05-12
 
 ![Screenshot - Global](screenshots/screenshot.jpg?raw=true)
 <br/>
@@ -120,7 +120,7 @@ Basic operations:
   * "CTRL" key + left mouse click to floodfill a closed area
   * "CTRL" key + right mouse click to floodfill to transparent a whole contiguous cells area previously colorized
   * "ALT" key + left mouse button to select a label directly in the viewport, this will select it in the list
-  * UNDO: use this button to cancel the last action
+  * UNDO: use this button to cancel the last action (only the last action can be cancelled)
   * click on the "Holes" button to view every cell that hasn't been colored yet. Click again on it to hide this feature
 
 * Change the view:
@@ -170,3 +170,4 @@ Basic operations:
 
 ### AbsurdePhoton
 My photographer website ''Photongénique'': www.absurdephoton.fr
+

main.cpp

@@ -4,7 +4,7 @@
 #
 #    by AbsurdePhoton - www.absurdephoton.fr
 #
-#                v2 - 2018/09/02
+#                v2.1 - 2019/05/12
 #
 #-------------------------------------------------*/
 

mainwindow.cpp

@@ -4,7 +4,7 @@
 #
 #    by AbsurdePhoton - www.absurdephoton.fr
 #
-#                v2 - 2018/09/02
+#                v2.1 - 2019/05/12
 #
 #-------------------------------------------------*/
 
@@ -52,7 +52,7 @@ MainWindow::MainWindow(QWidget *parent) :
 
     InitializeValues(); // init all indicators and zoom etc
 
-    basedir = "/media/DataI5/Photos/"; // base path and file
+    basedir = "/media/"; // base path and file
     basefile = "";
 }
 
@@ -574,7 +574,7 @@ void MainWindow::on_button_load_session_clicked() // load previous session
     //if (image.empty()) // image mandatory
     //        return;
 
-    QString filename = QFileDialog::getOpenFileName(this, "Load session from XML file...", QString::fromStdString(basedir + basefile + "-segmentation-data.xml"), "*.xml *.XML");
+    QString filename = QFileDialog::getOpenFileName(this, "Load session from XML file...", QString::fromStdString(basedir), "*.xml *.XML");
 
     if (filename.isNull() || filename.isEmpty()) // cancel ?
         return;
@@ -627,7 +627,7 @@ void MainWindow::on_button_load_session_clicked() // load previous session
         return;
     }
 
-    Mat labels_temp(image.rows, image.cols, CV_32SC1); // labels on 1 channel
+    Mat labels_temp(image.rows, image.cols, CV_32SC1);
     fs["Labels"] >> labels_temp; // load labels
     labels_temp.copyTo(labels);
     fs["LabelsMask"] >> labels_temp; // load labels mask
@@ -1590,7 +1590,6 @@ void MainWindow::DisplayThumbnail() // image thumnail with transparent viewport
         p2y *= double(ui->label_thumbnail->pixmap()->height());
     }
 
-    Mat thumbnail_temp;
     Mat thumbnail_temp = Mat::zeros(thumbnail.rows, thumbnail.cols, CV_8UC3);
     rectangle(thumbnail_temp, cv::Point(p1x, p1y), cv::Point(p2x-1, p2y-1), Scalar(92,92,92), -1); // draw filled rectangle representing the viewport position
     rectangle(thumbnail_temp, cv::Point(p1x, p1y), cv::Point(p2x-1, p2y-1), Scalar(255,255,255), 2); // draw rectangle with thick border
@@ -1846,7 +1845,7 @@ void MainWindow::on_button_compute_clicked() // compute segmentation
         seeds->getLabelContourMask(maskTemp, !ui->checkBox_thick->isChecked()); // contours
     }
 
-    labels_mask = Mat::zeros(labels.rows, labels.cols, CV_8UC3); // new labels mask
+    labels_mask = Mat::zeros(labels.rows, labels.cols, CV_32SC1); // new labels mask
 
     // contours for displaying : grid & mask initialization
     cv::cvtColor(maskTemp, mask, CV_GRAY2RGB); // at first the mask contains the grid, need to convert labels from gray to RGB

mainwindow.h

@@ -4,7 +4,7 @@
 #
 #    by AbsurdePhoton - www.absurdephoton.fr
 #
-#                v2 - 2018/09/02
+#                v2.1 - 2019/05/12
 #
 #-------------------------------------------------*/
 

mainwindow.ui

@@ -3823,7 +3823,7 @@ QToolTip {
        </rect>
       </property>
       <property name="toolTip">
-       <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Current label and used color to colorize the segmentation cells.&lt;/p&gt;&lt;p&gt;Click on the image:&lt;/p&gt;&lt;p&gt;    * Left button: set the cell color&lt;/p&gt;&lt;p&gt;    * Right button: delete (set to transparent)&lt;/p&gt;&lt;p&gt;    * Drag the mouse while holding the mouse buttons to colorize several cells&lt;/p&gt;&lt;p&gt;    * use &amp;lt;CTRL&amp;gt; key + left click to fill a closed area. Be careful, one pixel missing and you have to use the Undo function!&lt;/p&gt;&lt;p&gt;* hold the middle button of the mouse to navigate in the image&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+       <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Current label and used color to colorize the segmentation cells.&lt;/p&gt;&lt;p&gt;Click on the image:&lt;/p&gt;&lt;p&gt;* Left mouse button: set the cell color&lt;/p&gt;&lt;p&gt;* Right mouse button: delete (set to transparent)&lt;/p&gt;&lt;p&gt;* Drag the mouse while holding the mouse buttons to colorize several cells&lt;/p&gt;&lt;p&gt;* use &amp;lt;CTRL&amp;gt; key + mouse click (left = color, right= delete) to fill a closed area. Be careful, one pixel missing and you have to use the Undo function!&lt;/p&gt;&lt;p&gt;* use &amp;lt;ALT&amp;gt; key + left mouse button to select a label&lt;/p&gt;&lt;p&gt;* hold the middle button of the mouse to navigate in the image&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
       </property>
       <property name="styleSheet">
        <string notr="true">background-color:rgb(255,0,0);border: 3px solid black;</string>
@@ -3930,14 +3930,14 @@ QToolTip {
     <widget class="QLabel" name="label_18">
      <property name="geometry">
       <rect>
-       <x>9</x>
+       <x>3</x>
        <y>29</y>
-       <width>25</width>
-       <height>16</height>
+       <width>31</width>
+       <height>20</height>
       </rect>
      </property>
      <property name="toolTip">
-      <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;* v0: launch&lt;/p&gt;&lt;p&gt;* v1: added contours + several improvements&lt;/p&gt;&lt;p&gt;* v2: tabbed workflow + labels management + PSD and TIFF export + create cells&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+      <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;* v0: launch&lt;/p&gt;&lt;p&gt;* v1: added contours + several improvements&lt;/p&gt;&lt;p&gt;* v2: tabbed workflow + labels management + PSD and TIFF export + create cells&lt;/p&gt;&lt;p&gt;* v2.1: several bugs fixed&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
      </property>
      <property name="frameShape">
       <enum>QFrame::Box</enum>
@@ -3946,7 +3946,7 @@ QToolTip {
       <enum>QFrame::Sunken</enum>
      </property>
      <property name="text">
-      <string>v2</string>
+      <string>v2.1</string>
      </property>
      <property name="scaledContents">
       <bool>false</bool>

superpixels-segmentation-gui-opencv.pro

@@ -4,7 +4,7 @@
 #
 #    by AbsurdePhoton - www.absurdephoton.fr
 #
-#                v2 - 2018/09/02
+#                v2.1 - 2019/05/12
 #
 #-------------------------------------------------