Merge pull request #75 from abreheret/dev

Dev

Author: abreheret

.travis.yml

@@ -3,9 +3,18 @@ branches:
   only:
     - master
     - dev
-os:
-    - linux
-    - osx
+jobs:
+  include:
+    - os: linux
+      dist: xenial
+      env: QT5=510 PPA=beineri/opt-qt-5.10.1-xenial
+    - os: linux
+      dist: bionic
+      env: QT5=511 PPA=beineri/opt-qt-5.11.3-bionic
+    #- os: osx
+    #  osx_image: xcode10.2
+    #- os: osx
+    #  osx_image: xcode11.3
 
 env:
     - CONFIG=Release
@@ -21,9 +30,7 @@ before_install:
         brew install opencv;
         brew install curl;
       else
-        QT_VERSION_MM=510;
-        QT_VERSION_FULL=5.10.1-xenial;
-        sudo apt-add-repository --yes ppa:beineri/opt-qt-$QT_VERSION_FULL && sudo apt-get update -qq && sudo apt-get install -qq qt${QT_VERSION_MM}base qt${QT_VERSION_MM}script qt${QT_VERSION_MM}tools && export CMAKE_PREFIX_PATH=/opt/qt${QT_VERSION_MM};
+        sudo apt-add-repository --yes ppa:$PPA && sudo apt-get update -qq && sudo apt-get install -qy qt${QT5}base qt${QT5}script qt${QT5}multimedia && export CMAKE_PREFIX_PATH=/opt/qt${QT5};
         sudo apt-get install libopencv-dev curl libgl1-mesa-dev;
       fi
 before_script:

src/image_canvas.cpp

@@ -54,8 +54,8 @@ void ImageCanvas::loadImage(const QString &filename) {
 
 	_image = mat2QImage(cv::imread(_img_file.toStdString()));
 
-	_mask_file = file.dir().absolutePath()+ "/" + file.baseName() + "_mask.png";
-	_watershed_file = file.dir().absolutePath()+ "/" + file.baseName() + "_watershed_mask.png";
+	_mask_file = file.dir().absolutePath()+ "/" + file.completeBaseName() + "_mask.png";
+	_watershed_file = file.dir().absolutePath()+ "/" + file.completeBaseName() + "_watershed_mask.png";
 
 	_watershed = ImageMask(_image.size());
 	_undo_list.clear();
@@ -88,7 +88,7 @@ void ImageCanvas::saveMask() {
 //         }
 		watershed.save(_watershed_file);
 		QFileInfo file(_img_file);
-		QString color_file = file.dir().absolutePath() + "/" + file.baseName() + "_color_mask.png";
+		QString color_file = file.dir().absolutePath() + "/" + file.completeBaseName() + "_color_mask.png";
 		idToColor(watershed, _ui->id_labels).save(color_file);
 	}
     _undo_list.clear();

src/main_window.ui

@@ -186,13 +186,13 @@
          <item>
           <widget class="QDoubleSpinBox" name="spinbox_scale">
            <property name="minimum">
-            <double>0.500000000000000</double>
+            <double>0.050000000000000</double>
            </property>
            <property name="maximum">
             <double>8.000000000000000</double>
            </property>
            <property name="singleStep">
-            <double>0.500000000000000</double>
+            <double>0.050000000000000</double>
            </property>
            <property name="value">
             <double>1.000000000000000</double>