(do not merge) Try 3rdparty zip with getdata 0.10.0

.travis.yml

@@ -14,6 +14,7 @@ matrix:
 
 
       install:
+       - sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 762E3157
        - sudo apt-get -y update
        - sudo apt-get -y install cmake g++-mingw-w64-i686 g++-mingw-w64-x86-64
        #- sudo apt-get update

cmake/travis.sh

@@ -61,7 +61,7 @@ travis=travis
 echo ---------------------------------------------------------
 echo
 
-if [ "$iam" = "$travis" ]; then
+if [ "$iam" = "$travis" -a "$(git rev-parse --abbrev-ref HEAD)" = "master" ]; then
     deploybinary=1
 else
     deploybinary=0
@@ -138,31 +138,7 @@ mkdir $build
 builddir=$PWD/$build
 cd $builddir
 
-
-
-# ---------------------------------------------------------
-#
-# get actual cmake
-#
-cmakever=cmake-3.4.1-Linux-x86_64
-
-if [ "$iam" = "$travis" ]; then
-    if [ ! -d $dep/$cmakever ]; then
-          cmakebin=x
-          if [ ! -d $dep/$cmakever ]; then
-              wget --no-check-certificate http://www.cmake.org/files/v3.4/$cmakever.tar.gz
-              checkExitCode
-              cd $dep
-              tar xf $builddir/$cmakever.tar.gz
-              checkExitCode
-              cd $builddir
-          fi
-    fi
-    cmakebin=$dep/$cmakever/bin/cmake
-else
-    cmakebin=cmake
-fi
-$cmakebin --version
+/usr/bin/cmake --version
 checkExitCode
 
 server=http://sourceforge.net/projects/kst/files/3rdparty
@@ -255,8 +231,9 @@ checkExitCode
 #
 # download 3rdparty
 #
+altserver=http://toolshed.sourceforge.net/kst
 if [ ! -d $dep/$extlib ]; then
-    wget $server/$extlib.zip
+    wget $altserver/$extlib.zip
     checkExitCode
     cd $dep
     unzip -q $builddir/$extlib.zip
@@ -289,14 +266,14 @@ else
     noinstaller=-Dkst_noinstaller=1
 fi
 
-#$cmakebin ../kst \
+#/usr/bin/cmake ../kst \
 #    -Dkst_release=1  \
 #    -Dkst_version_string=$versionname \
 #    -Dkst_install_prefix=./$versionname \
 #    -Dkst_cross=$dep/$mingwdir/bin/$mingw \
 #    $rev $qtopt $useext $console $noinstaller $generator
 
-$cmakebin ../kst \
+/usr/bin/cmake ../kst \
     -Dkst_release=1  \
     -Dkst_merge_files=1 \
     -Dkst_version_string=$versionname \

src/libkstapp/commandlineparser.cpp

@@ -65,49 +65,49 @@ namespace Kst {
 "      --Letter                 Print to Letter sized paper.\n"
 "      --A4                     Print to A4 sized paper.\n"
 "      --png <filename>         Render to a png image, and exit.\n"
-"      --pngHeight <height>     Height of png image (pixels)\n"
-"      --pngWidth <width>       Width of png image (pixels)\n"
+"      --pngHeight <height>     Height of png image (pixels).\n"
+"      --pngWidth <width>       Width of png image (pixels).\n"
 "File Options:\n"
-"      -f <startframe>          default: 'end' counts from end.\n"
+"      -f <startframe>          default: 'end' counts from end\n"
 "      -n <numframes>           default: 'end' reads to end of file\n"
 "      -s <frames per sample>   default: 0 (read every sample)\n"
-"      -a                       apply averaging filter: requires -s\n\n"
-"Ascii File Options - for ascii files only: these are all stick\n"
+"      -a                       Apply averaging filter (requires -s).\n\n"
+"Ascii File Options - for ascii files only: These are all sticky\n"
 "      --asciiDataStart <Line>  Data starts here. Files start at line 1.\n"
 "      --asciiFieldNames <Line> Field names are in this row.\n"
-"      --asciiNoFieldNames      Fields are named for their data column\n"
-"      --asciiReadUnits <Line>  Read units from line <Line>\n"
-"      --asciiNoUnits       Do not read units\n"
-"      --asciiSpaceDelim        Columns are Space/tab delimited\n"
-"      --asciiDelim <char>      Columns are dlimited with <char>\n"
-"      --asciiFixedWidth <w>    Columns have width <w>\n"
-"      --asciiNoFixedWidth      Columns are delimited, not fixed width\n"
-"      --asciiDecimalDot        Use a . as a decimal separator (ie, 10.1)\n"
-"      --asciiDecimalComma      Use a , as a decimal separator (ie, 10,1)\n"
+"      --asciiNoFieldNames      Fields are named for their data column.\n"
+"      --asciiReadUnits <Line>  Read units from line <Line>.\n"
+"      --asciiNoUnits       Do not read units.\n"
+"      --asciiSpaceDelim        Columns are Space/Tab delimited.\n"
+"      --asciiDelim <char>      Columns are delimited with <char>.\n"
+"      --asciiFixedWidth <w>    Columns have width <w>.\n"
+"      --asciiNoFixedWidth      Columns are delimited, not fixed width.\n"
+"      --asciiDecimalDot        Use a . as a decimal separator (e.g. 10.1).\n"
+"      --asciiDecimalComma      Use a , as a decimal separator (e.g. 10,1).\n"
 "Position:\n"
 "      -P <plot name>:          Place curves in one plot.\n"
 "      -A                       Place future curves in individual plots.\n"
-"      -m <columns>             Layout plots in columns\n"
+"      -m <columns>             Layout plots in columns.\n"
 "      -T <tab name>            Place future curves a new tab.\n"
 "Appearance\n"
-"      -d:                      use points for the next curve\n"
-"      -l:                      use lines for the next curve\n"
-"      -b:                      use bargraph for the next curve\n"
+"      -d:                      Use points for the next curve.\n"
+"      -l:                      Use lines for the next curve.\n"
+"      -b:                      Use bargraph for the next curve.\n"
 "      --xlabel <X Label>       Set X label of all future plots.\n"
 "      --ylabel <Y Label>       Set Y label of all future plots.\n"
 "      --xlabelauto             AutoSet X label of all future plots.\n"
 "      --ylabelauto             AutoSet Y label of all future plots.\n"
 "Data Object Modifiers\n"
 "      -x <field>:              Create vector and use as X vector for curves.\n"
 "      -e <field>:              Create vector and use as Y-error vector for next -y.\n"
-"      -r <rate>:               sample rate (spectra & spectograms).\n"
+"      -r <rate>:               sample rate (spectra & spectrograms)\n"
 "Data Objects:\n"
-"      -y <field>               plot an XY curve of field.\n"
-"      -p <field>               plot the spectrum of field.\n"
-"      -h <field>               plot a histogram of field.\n"
-"      -z <field>               plot an image of matrix field.\n"
+"      -y <field>               Plot an XY curve of field.\n"
+"      -p <field>               Plot the spectrum of field.\n"
+"      -h <field>               Plot a histogram of field.\n"
+"      -z <field>               Plot an image of matrix field.\n"
 "Misc:\n"
-"      --serverName=<server name> Set the server name for pyKst scrips connecting with this session.\n"
+"      --serverName=<server name> Set the server name for pyKst scripts connecting with this session.\n"
 "\n"
 "****************\n"
 "*** Examples ***\n"
@@ -141,18 +141,17 @@ namespace Kst {
 
 static void printText(const QString& text, const QString& detailText = QString(), const QString& t = QString())
 {
+  QString displayText = QString(text) + QString(detailText) + t;
+
+  fprintf(stderr,"%s\n", qPrintable(displayText));
+  //qWarning("%s", qPrintable(displayText));
 #ifdef Q_OS_WIN
-  // No console on Windows.
+  // Not always console on Windows.
   QMessageBox box(QMessageBox::Information, "Kst", text + t);
   if (!detailText.isEmpty()) {
     box.setDetailedText(detailText);
   }
   box.exec();
-#else
-  QString displayText = QString(text) + QString(detailText) + t;
-
-  fprintf(stderr,"%s\n", qPrintable(displayText));
-  //qWarning("%s", qPrintable(displayText));
 #endif
 }