Merge pull request #48 from berendkleinhaneveld/master

Several small fixes and improvements, Thank to @berendkleinhaneveld

Author: abreheret

Diff for: .travis.yml

@@ -9,7 +9,7 @@ os:
 
 env:
     - CONFIG=Release
-  
+
 branches:
   only:
     - master
@@ -21,11 +21,10 @@ before_install:
         brew install opencv;
         brew install curl;
       else
-        QT_VERSION_MM=59;
-        QT_VERSION_FULL=591-trusty;
-        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-get install libopencv-dev;
-        sudo apt-get install curl;
+        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-get install libopencv-dev curl libgl1-mesa-dev;
       fi
 before_script:
    - mkdir build
@@ -38,4 +37,4 @@ before_script:
 
 script:
    - cmake --build . --config $CONFIG
-   - cmake --build . --config $CONFIG --target upload_file
+   - cmake --build . --config $CONFIG --target upload_file

Diff for: appveyor.yml

@@ -3,16 +3,19 @@ environment:
     matrix:
         - CMAKE_BUILD_TYPE: Release
 
+# Do not build feature branch with open Pull Requests
+skip_branch_with_pr: true
+
 install:
     - cmd: set QT5_DIR=C:\Qt\5.10.1\msvc2015_64\lib\cmake
     - cmd: choco install OpenCV
-    - cmd: choco install curl
+    - cmd: choco install curl --version=7.66.0.20190926
     - cmd: set OPENCV_DIR=C:\tools\opencv\build
     - cmd: cd C:\projects\PixelAnnotationTool
-        
+
 build_script:
     - cmd: mkdir build
     - cmd: cd build
     - cmd: cmake .. -DQT5_DIR=%QT5_DIR% -DOpenCV_DIR=%OPENCV_DIR% -G"Visual Studio 14 Win64"
     - cmd: cmake --build . --config Release
-    - cmd: cmake --build . --config Release --target upload_file    
+    - cmd: cmake --build . --config Release --target upload_file

Diff for: src/label_widget.cpp

@@ -4,20 +4,19 @@
 #include <QDebug>
 #include <QPainter>
 
-LabelWidget::LabelWidget(const LabelInfo &label, QWidget *parent , Qt::WindowFlags f ) :
-	QLabel(parent, f) {
+LabelWidget::LabelWidget(const LabelInfo &label, QWidget *parent, Qt::WindowFlags f)
+	: QLabel(parent, f) {
 	setNewLabel(label);
 	_is_selected = false;
 }
 
 
 void LabelWidget::setNewLabel(const LabelInfo &label) {
 	_label = label;
-	QString text = (label.shortcut) ?
-			label.name + " (" + label.shortcut->key().toString() + ")" :
-			label.name;
-
-	setText(text);
+	// Only set the text, when it is not set already
+	if (this->text() == "") {
+		setText(_label.name);
+	}
 	setAlignment(Qt::AlignHCenter);
 	setStyleSheet("QLabel { background-color : " + label.color.name() + "; color : " + readableColor(_label.color).name() + ";  font:  14px; }");
 }
@@ -42,6 +41,6 @@ void LabelWidget::paintEvent(QPaintEvent *event) {
 	}
 }
 
-QString LabelWidget::getName(){
+QString LabelWidget::getName() {
 	return this->_label.name;
-}
+}

Diff for: src/labels.cpp

@@ -15,7 +15,6 @@ LabelInfo::LabelInfo() {
 	this->id_categorie = 0;
 	this->color = QColor(0, 0, 0);
 	item = NULL;
-	shortcut = nullptr;
 }
 
 LabelInfo::LabelInfo(QString name, QString categorie, int id, int id_categorie, QColor color) {
@@ -25,7 +24,6 @@ LabelInfo::LabelInfo(QString name, QString categorie, int id, int id_categorie,
 	this->id_categorie = id_categorie;
 	this->color = color;
 	item = NULL;
-	shortcut = nullptr;
 }
 
 void LabelInfo::read(const QJsonObject &json) {
@@ -52,7 +50,6 @@ void LabelInfo::write(QJsonObject &json) const {
 	json["color"] = jarray;
 }
 
-
 void Name2Labels::read(const QJsonObject &json) {
 	QJsonObject array = json["labels"].toObject();
 	for (QJsonObject::iterator it = array.begin(); it != array.end(); it++) {
@@ -62,6 +59,7 @@ void Name2Labels::read(const QJsonObject &json) {
 		(*this)[label.name] = label;
 	}
 }
+
 void Name2Labels::write(QJsonObject &json) const {
 	QMapIterator<QString, LabelInfo> it(*this);
 	QJsonObject object;
@@ -86,7 +84,7 @@ Id2Labels getId2Label(const Name2Labels& labels) {
 	return id_labels;
 }
 
-Name2Labels defaulfLabels() {
+Name2Labels defaultLabels() {
 	Name2Labels labels;
 	// inspired by https://raw.githubusercontent.com/mcordts/cityscapesScripts/master/cityscapesscripts/helpers/labels.py
 	labels["unlabeled"           ] = LabelInfo("unlabeled"           , "void"         ,  00, 0, QColor(  0,  0,  0));
@@ -137,7 +135,7 @@ Name2Labels defaulfLabels() {
 	//	labels[it.key()].color = cmap[i++];
 	//}
 	//labels["unlabeled"].color = QColor(0, 0, 0);
-	
+
 	return labels;
 
-}
+}

Diff for: src/labels.h

@@ -3,7 +3,6 @@
 
 #include <QListWidgetItem>
 #include <QJsonObject>
-#include <QtWidgets/QShortcut>
 
 class LabelInfo  {
 public:
@@ -13,7 +12,6 @@ class LabelInfo  {
 	int     id_categorie ;
 	QColor  color        ;
 	QListWidgetItem *item;
-	QShortcut *shortcut  ;
 	LabelInfo();
 	LabelInfo(QString name, QString categorie, int id, int id_categorie, QColor color);
 	void read(const QJsonObject &json);
@@ -29,6 +27,6 @@ class Name2Labels : public QMap<QString, LabelInfo> {
 class Id2Labels : public QMap<int,const LabelInfo*> { };
 
 Id2Labels getId2Label(const Name2Labels& labels);
-Name2Labels defaulfLabels();
+Name2Labels defaultLabels();
 
-#endif
+#endif