cmake/travis.sh

@@ -262,18 +262,7 @@ fi
 # checkout translations
 #
 cd $startdir
-./l10n-fetch-po-files.py
-
-# only ship listed tranlations
-mkdir po_all
-mv po/* po_all
-for tr in ca ca@valencia de en_GB fr nl pl pt pt_BR sv uk
-do
-    file=kst_common_$tr.po
-    echo "using translation $tr"
-    cp po_all/$file po
-done
-
+./get-translations
 cd $builddir
 
 

get-translations

@@ -0,0 +1,14 @@
+#!/bin/bash
+
+./l10n-fetch-po-files.py
+
+# only ship listed tranlations
+mkdir po_all
+mv po/* po_all
+for tr in ca ca@valencia de en_GB fr nl pl pt pt_BR sv uk
+do
+    file=kst_common_$tr.po
+    echo "using translation $tr"
+    cp po_all/$file po
+done
+

src/datasources/ascii/asciisource.cpp

@@ -342,8 +342,10 @@ int AsciiSource::readField(double *v, const QString& field, int s, int n)
     _haveWarned = true;
     return read;
   } else if (read == 0) {
-    if (!_haveWarned)
-      QMessageBox::warning(0, "Error while reading ASCII file", msg.arg("The file could not be read"));
+    if (!_haveWarned) {
+      // TODO Why is nothing read? Only log once because of the danger of a dead-lock
+      Debug::warning("AsciiSource: 0 bytes read from file");
+    }
     _haveWarned = true;
   } else if (read == -3) {
     if (!_haveWarned)

src/libkstmath/curvepointsymbol.cpp

@@ -154,7 +154,7 @@ void draw(int Type, QPainter *p, double x, double y, double pointSize) {
       }
       break;
     case 12: // filled diamond
-      {    
+      {
         QPolygonF pts;
 
         pts << QPointF(x+s, y)
@@ -167,8 +167,15 @@ void draw(int Type, QPainter *p, double x, double y, double pointSize) {
         p->drawPolygon(pts);
       }
       break;
-  }
-
+    case 13: // single point
+      {
+        p->setBrush(Qt::SolidPattern);
+        p->setBrush(p->pen().color());
+        p->drawPoint(QPointF(x, y));
+      }
+      break;
+    }
+
   p->setBrush(Qt::NoBrush);
   p->restore();
 }

src/libkstmath/curvepointsymbol.h

@@ -21,7 +21,7 @@
 #include "kstmath_export.h"
 #include <qpainter.h>
 
-#define KSTPOINT_MAXTYPE 13
+#define KSTPOINT_MAXTYPE 14
 
 namespace Kst {