.travis.yml

@@ -3,18 +3,19 @@
 # Travis-CI Build for kst2
 # see travis-ci.org for details
 
+sudo: false
 language: cpp
 
 
 install:
- - sudo apt-get update
- - sudo apt-get remove cmake mingw32-binutils mingw32-runtime mingw32 mingw-w64 g++-mingw-w64 gcc-mingw-w64
- - sudo apt-get install m4 bison flex nsis-common nsis qt4-dev-tools subversion
- - sudo apt-get install libc6:i386 libgcc1:i386 gcc-4.6-base:i386 libstdc++5:i386 libstdc++6:i386 # cmake is 32bit
+ #- sudo apt-get update
+ #- sudo apt-get remove cmake mingw32-binutils mingw32-runtime mingw32 mingw-w64 g++-mingw-w64 gcc-mingw-w64
+ #- sudo apt-get install m4 bison flex nsis-common nsis qt4-dev-tools subversion
+ #- sudo apt-get install libc6:i386 libgcc1:i386 gcc-4.6-base:i386 libstdc++5:i386 libstdc++6:i386 # cmake is 32bit
 
 script:
- - ./cmake/travis.sh qt4
-# - ./cmake/travis.sh qt5
+ #- ./cmake/travis.sh qt4
+ - ./cmake/travis.sh qt5
  - ./cmake/travis.sh qt5 x64
 
 branches:

CMakeLists.txt

@@ -172,7 +172,13 @@ message(STATUS)
 
 # Find 3rd party libraries
 if (kst_qt5)
-    # http://doc-snapshot.qt-project.org/5.0/cmake-manual.html
+    # http://doc-snapshot.qt-project.org/5.0/cmake-manual.htm
+    if(kst_cross)
+        # Cross-compiled Qt, branch 4.8.4 from https://gitorious.org/~syntheticpp/qt/qt4
+        set(QT_MINGW_DIR ${kst_qt5} CACHE PATH "Qt for Mingw" FORCE)
+        set(CMAKE_FIND_ROOT_PATH /usr/${TOOLNAME} ${QT_MINGW_DIR} CACHE PATH "Mingw find root path" FORCE)
+        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --std=c++11")
+    endif()
     macro(use_qt5lib qt5lib)
         find_package(${qt5lib} REQUIRED)
         include_directories(${${qt5lib}_INCLUDE_DIRS})

cmake/travis.sh

@@ -25,20 +25,23 @@ fi
 #    versionname=$versionname-Qt5
 #fi
 
+dep=$HOME/dep
+mkdir -p $dep
+
 
 echo ---------------------------------------------------------
 echo ---------- Building $versionname
 echo ---------------------------------------------------------
 
 
-if [ -f "/usr/local/bin/ninja" ]; then
+if [ -f "/usr/bin/ninja" ] || [ -f "/usr/local/bin/ninja" ]; then
     generator=-GNinja
     buildcmd=ninja
     buildcmd_parallel=ninja
     export NINJA_STATUS="[%f/%t %o/s, %es] "
 else
     buildcmd=make
-    buildcmd_parallel="make -j1"
+    buildcmd_parallel="make -j2"
 fi
 
 # ---------------------------------------------------------
@@ -55,10 +58,6 @@ echo number of processors: $processors
 dpkg --get-selections | grep mingw
 iam=`whoami`
 travis=travis
-if [ "$iam" = "$travis" ]; then
-    sudo rm -rf /usr/lib/jvm
-    df -h
-fi
 echo ---------------------------------------------------------
 echo
 
@@ -145,21 +144,21 @@ cd $builddir
 #
 # get actual cmake
 #
-cmakever=cmake-2.8.12.2-Linux-i386
+cmakever=cmake-3.3.1-Linux-x86_64
 
 if [ "$iam" = "$travis" ]; then
-    if [ ! -d /opt/$cmakever ]; then
+    if [ ! -d $dep/$cmakever ]; then
           cmakebin=x
-          if [ ! -d /opt/$cmakever ]; then
-              wget http://www.cmake.org/files/v2.8/$cmakever.tar.gz
+          if [ ! -d $dep/$cmakever ]; then
+              wget http://www.cmake.org/files/v3.3/$cmakever.tar.gz
               checkExitCode
-              cd /opt
-              sudo tar xf $builddir/$cmakever.tar.gz
+              cd $dep
+              tar xf $builddir/$cmakever.tar.gz
               checkExitCode
               cd $builddir
           fi
     fi
-    cmakebin=/opt/$cmakever/bin/cmake
+    cmakebin=$dep/$cmakever/bin/cmake
 else
     cmakebin=cmake
 fi
@@ -182,11 +181,11 @@ else
     mingwdir=mingw32$exc
     branch=Kst-32bit-3rdparty-plugins-Qt5
     extlib=kst-3rdparty-win32-gcc$exc-4.7.2
-    useext="-Dkst_3rdparty=1 -Dkst_3rdparty_dir=/opt/"$extlib
+    useext="-Dkst_3rdparty=1 -Dkst_3rdparty_dir=$dep/"$extlib
 fi
 
 if [ "$1" = "qt5" ]; then
-    qtver=5.0.1
+    qtver=5.5.0
     tarver=
 else
     qtver=4.8.4
@@ -203,20 +202,20 @@ server=http://sourceforge.net/projects/kst/files/3rdparty
 #
 # download and install mingw
 #
-if [ ! -d /opt/$mingwdir ]; then
+if [ ! -d $dep/$mingwdir ]; then
     mingwtar=$mingwver-Ubuntu64-12.04.tar
     wget $server/$mingwtar.xz
     checkExitCode
     xz -d $mingwtar.xz
-    cd /opt
-    sudo tar xf $builddir/$mingwtar
+    cd $dep
+    tar xf $builddir/$mingwtar
     checkExitCode
     cd $builddir
 fi
 # when cross-compiler is in path cmake assumes it is a native compiler and passes "-rdynamic" which mingw doesn't support
-#export PATH=/opt/mingw32/bin:$PATH
+#export PATH=$dep/mingw32/bin:$PATH
 echo Checking mingw installation ...
-/opt/$mingwdir/bin/$mingw-gcc -dumpversion
+$dep/$mingwdir/bin/$mingw-gcc -dumpversion
 checkExitCode
 
 
@@ -225,17 +224,18 @@ checkExitCode
 #
 # download and install Qt
 #
-if [ ! -d /opt/$qtver ]; then
+if [ ! -d $dep/$qtver ]; then
     qttar=$qtver-Ubuntu64-12.04$tarver.tar
     wget $server/$qttar.xz
     checkExitCode
     xz -d $qttar.xz
-    cd /opt
-    sudo tar xf $builddir/$qttar
+    cd $dep
+    tar xf $builddir/$qttar
     checkExitCode
+    echo -e "[Paths]\nPrefix = $dep/$qtver" > $dep/$qtver/bin/qt.conf
     cd $builddir
 fi
-export PATH=/opt/$qtver/bin:$PATH
+export PATH=$dep/$qtver/bin:$PATH
 echo Checking Qt installation ...
 which qmake
 checkExitCode
@@ -246,14 +246,14 @@ checkExitCode
 #
 # download 3rdparty
 #
-if [ ! -d /opt/$extlib ]; then
+if [ ! -d $dep/$extlib ]; then
     wget $server/$extlib.zip
     checkExitCode
-    cd /opt
-    sudo unzip -q $builddir/$extlib.zip
+    cd $dep
+    unzip -q $builddir/$extlib.zip
     checkExitCode
     cd $builddir
-    sudo cp /opt/$extlib/include/matio_pubConf.h /opt/$extlib/include/matio_pubconf.h
+    cp $dep/$extlib/include/matio_pubConf.h $dep/$extlib/include/matio_pubconf.h
 fi
 
 
@@ -274,7 +274,7 @@ cd $builddir
 if [ "$1" = "qt5" ]; then
     qtopt="-Dkst_qt5=1"
 else
-    qtopt="-Dkst_qt4=/opt/$qtver"
+    qtopt="-Dkst_qt4=$dep/$qtver"
 fi
 
 
@@ -289,7 +289,7 @@ $cmakebin ../kst \
     -Dkst_release=1  \
     -Dkst_version_string=$versionname \
     -Dkst_install_prefix=./$versionname \
-    -Dkst_cross=/opt/$mingwdir/bin/$mingw \
+    -Dkst_cross=$dep/$mingwdir/bin/$mingw \
     $rev $qtopt $useext $console $noinstaller $generator
 
 checkExitCode

src/libkst/math_kst.h

@@ -57,6 +57,10 @@ static double nan__()
 #define NAN (Kst::nan__())
 #endif
 
+#ifndef M_PI
+#define M_PI 3.14159265358979323846
+#endif
+
 /*
 ** Both Solaris and FreeBSD-current do weird things with the
 ** isnan() defined in math.h - in particular on FreeBSD it

src/libkst/matrix.cpp

@@ -33,6 +33,8 @@
 // used for resizing; set to 1 for loop zeroing, 2 to use memset
 #define ZERO_MEMORY 2
 
+using namespace std;
+
 namespace Kst {
 
 const QString Matrix::staticTypeString = "Matrix";

src/libkst/vector.cpp

@@ -35,6 +35,8 @@
 #include "updatemanager.h"
 #include "vectorscriptinterface.h"
 
+using namespace std;
+
 namespace Kst {
 
 #define INITSIZE 1

src/libkstapp/histogramdialog.cpp

@@ -31,6 +31,8 @@
 #include "dialogdefaults.h"
 #include "updatemanager.h"
 
+using namespace std;
+
 namespace Kst {
 
 HistogramTab::HistogramTab(QWidget *parent)

src/libkstapp/plotaxis.cpp

@@ -19,6 +19,8 @@
 
 #define MAJOR_TICK_DEBUG 0
 
+using namespace std;
+
 static int FULL_PRECISION = 15;
 static qreal JD1900 = 2415020.5;
 static qreal JD1899_12_30 = 2415018.5;

src/libkstmath/curve.cpp

@@ -56,6 +56,8 @@
 // for painting
 #define MAX_NUM_POLYLINES       3
 
+using namespace std;
+
 namespace Kst {
 
 const QString Curve::staticTypeString = "Curve";

src/libkstmath/enodefactory.cpp

@@ -19,7 +19,7 @@
 #include "enodes.h"
 
 using namespace Equations;
-
+using namespace std;
 
 //extern "C" {
 

src/libkstmath/image.cpp

@@ -30,6 +30,8 @@
 
 //#define BENCHMARK
 
+using namespace std;
+
 namespace Kst {
 
 const QString Image::staticTypeString = "Image";

src/libkstmath/psd.cpp

@@ -37,6 +37,8 @@
 
 #include "dataobjectscriptinterface.h"
 
+using namespace std;
+
 extern "C" void rdft(int n, int isgn, double *a);
 
 namespace Kst {

src/plugins/dataobject/lockin/iirfilter.h

@@ -15,6 +15,8 @@
 #include <vector>
 #include <complex>
 
+#include "math_kst.h"
+
 #ifndef IIRFILTER_H
 #define IIRFILTER_H
 

src/plugins/dataobject/periodogram/kstplugin_periodogram.desktop

@@ -10,6 +10,7 @@ Name[ca]=Connector d'objecte de dades de periodograma
 Name[ca@valencia]=Connector d'objecte de dades de periodograma
 Name[de]=Wellenschaubild-Datenobjekt-Modul
 Name[en_GB]=Periodogram Data Object Plugin
+Name[es]=Complemento de objeto de datos de periodograma
 Name[fr]=Module DataObject de périodogramme
 Name[it]=Estensione oggetto dati di periodogramma
 Name[nl]=Periodogram Data Object Plugin
@@ -25,6 +26,7 @@ Comment[ca]=Implementa un connector d'objecte de dades de periodograma pel Kst.
 Comment[ca@valencia]=Implementa un connector d'objecte de dades de periodograma pel Kst.
 Comment[de]=Implementiert ein Wellenschaubild-Datenobjekt-Modul für Kst.
 Comment[en_GB]=Implements a Periodogram Data Object Plugin for Kst.
+Comment[es]=Implementa un complemento de objeto de datos de periodograma para Kst.
 Comment[fr]=Implémente un module DataObject de périodogramme pour Kst.
 Comment[it]=Implementa un'estensione oggetto dati di periodogramma per Kst.
 Comment[nl]=Implementeert een plugin voor een gegevensobject in Kst voor periodogram.

src/plugins/dataobject/shift/kstplugin_shift.desktop

@@ -10,6 +10,7 @@ Name[ca]=Connector d'objecte de dades de decalatge
 Name[ca@valencia]=Connector d'objecte de dades de decalatge
 Name[de]=Verschiebungs-Datenobjekt-Modul
 Name[en_GB]=Shift Data Object Plugin
+Name[es]=Complemento de objeto de datos de desplazamiento
 Name[fr]=Module DataObject de modulation
 Name[it]=Estensione oggetto dati di spostamento
 Name[nl]=Shift Data Object Plugin
@@ -25,6 +26,7 @@ Comment[ca]=Implementa un connector d'objecte de dades de decalatge pel Kst.
 Comment[ca@valencia]=Implementa un connector d'objecte de dades de decalatge pel Kst.
 Comment[de]=Implementiert ein Verschiebungs-Datenobjekt-Modul für Kst.
 Comment[en_GB]=Implements a Shift Data Object Plugin for Kst.
+Comment[es]=Implementa un complemento de objeto de datos de desplazamiento para Kst.
 Comment[fr]=Implémente un module DataObject de modulation pour Kst.
 Comment[it]=Implementa un'estensione oggetto dati di spostamento per Kst.
 Comment[nl]=Implementeert een plugin voor een gegevensobject in Kst voor shift (verschuiven)