CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.8.7)
+cmake_minimum_required(VERSION 3.0.0)
 
 if(kst_clang)
     set(CMAKE_C_COMPILER    "clang")
@@ -33,7 +33,7 @@ set(kst_binary_name kst2)
 
 kst_option_init()
 kst_option(string ""  all version_string    "Version string")
-kst_option(bool   OFF all release           "Build release version: optimize for speed, don't embedded debug symbols")
+kst_option(bool   ON  all release           "Build release version: optimize for speed, don't embedded debug symbols")
 kst_option(bool   OFF gcc deploy            "Deploy into install dir")
 kst_option(bool   OFF all merge_files       "Merge files to speedup build about factor 5")
 kst_option(bool   OFF all merge_rebuild     "Rebuild generated files from merged files build")
@@ -55,8 +55,8 @@ kst_option(bool   OFF all python_depend     "Download and build NumPy/SciPy then
 kst_option(string ""  all python_prefix     "Path for installing python bindings")
 kst_option(string OFF all cross             "Cross-compile on Linux for Windows")
 kst_option(string ""  all qt4               "Use cross compiled Qt4 at given path")
-kst_option(string ""  all qt5               "Use Qt5")
-kst_option(bool   ON  all qt5base_only      "Only use Qt5 features available in qtbase")
+kst_option(string ON  all qt5               "Use Qt5")
+kst_option(bool   OFF  all qt5base_only      "Only use Qt5 features available in qtbase")
 kst_option(bool   OFF all clang             "Use Clang compiler")
 kst_option(bool   OFF all sanitize          "Use Clang's sanitizers")
 kst_option(bool   OFF all dbgsym            "Build with debug symbols enabled")

cmake/modules/FindHDF5.cmake

@@ -19,7 +19,7 @@ if(NOT HDF5_INCLUDEDIR OR HDF5_INCLUDEDIR STREQUAL "HDF5_INCLUDEDIR-NOTFOUND")
 
 if(NOT kst_cross)
 	include(FindPkgConfig)
-	pkg_check_modules(PKGHDF5 QUIET hdf5 hdf5-serial hdf5-cpp)
+        pkg_check_modules(PKGHDF5 QUIET hdf5 hdf5-cpp)
 endif()
 
 if(NOT PKGHDF5_LIBRARIES)

old_datasources/dmc/kstdata_dmc.desktop

@@ -11,8 +11,10 @@ Name[ca@valencia]=Connector DMC de PLANCK
 Name[de]=PLANCK-DMC-Modul
 Name[el]=PLANCK DMC Plugin
 Name[en_GB]=PLANCK DMC Plugin
+Name[eo]=PLANCK DMC Kromaĵo
 Name[es]=Complemento PLANCK DMC
 Name[et]=PLANCK DMC plugin
+Name[fi]=PLANK DMC -liitännäinen
 Name[fr]=Module « PLANCK DMC »
 Name[gl]=Complemento de PLANCK DMC
 Name[hu]=PLANCK DMC bővítmény
@@ -25,6 +27,7 @@ Name[pt_BR]=Plugin de DMC do PLANCK
 Name[sk]=Plugin PLANCK DMC
 Name[sl]=Vtičnik PLANCK DMC
 Name[sv]=PLANCK DMC-insticksprogram
+Name[tr]=PLANCK DMC Eklentisi
 Name[uk]=Додаток PLANCK DMC
 Name[x-test]=xxPLANCK DMC Pluginxx
 Comment=Plugin to read PLANCK DMC data.
@@ -34,8 +37,10 @@ Comment[ca@valencia]=Connector per a llegir les dades DMC de PLANCK.
 Comment[de]=Modul zum Lesen von PLANCK-DMC-Daten
 Comment[el]=Πρόσθετο για την ανάγνωση PLANCK DMC δεδομένων
 Comment[en_GB]=Plugin to read PLANCK DMC data.
+Comment[eo]=Kromaĵo por legi datumojn de PLANCK DMC.
 Comment[es]=Complemento para leer datos PLANCK DMC.
 Comment[et]=Plugin PLANCK DMS andmete lugemiseks.
+Comment[fi]=PLANC DMC -tietoa lukeva liitännäinen.
 Comment[fr]=Module pour lire les données « PLANCK DMC ».
 Comment[gl]=Complemento para ler datos de PLANCK DMC.
 Comment[hu]=Bővítmény a PLANCK DMC adatok olvasásához.
@@ -48,5 +53,6 @@ Comment[pt_BR]=Plugin para ler os dados DMC do PLANCK.
 Comment[sk]=Plugin na čítanie údajov PLANCK DMC.
 Comment[sl]=Vtičnik za branje podatkov PLANCK DMC.
 Comment[sv]=Insticksprogram för att läsa en PLANCK DMC-data.
+Comment[tr]=PLANCK DMC verisi okumak için eklenti.
 Comment[uk]=Додаток для читання даних PLANCK DMC.
 Comment[x-test]=xxPlugin to read PLANCK DMC data.xx

old_datasources/healpix/kstdata_healpix.desktop

@@ -11,9 +11,11 @@ Name[ca@valencia]=Lector de fitxers Healpix
 Name[de]=Healpix-Dateileser
 Name[el]=Healpix πρόγραμμα ανάγνωσης αρχείων
 Name[en_GB]=Healpix File Reader
+Name[eo]=Healpix Dosiera Leganto
 Name[es]=Lector de archivos de Healpix
 Name[et]=Healpixi faili lugeja
-Name[fr]=Lecteur de fichier Healpix
+Name[fi]=Healpix-tiedostolukija
+Name[fr]=Lecteur de fichier « Healpix »
 Name[gl]=Lector de ficheiros Healpix
 Name[hu]=Healpix fájlolvasó
 Name[it]=Lettore di file Healpix
@@ -25,6 +27,7 @@ Name[pt_BR]=Leitor de arquivos do Healpix
 Name[sk]=Čítač súborov Healpix
 Name[sl]=Bralnik datotek Healpix
 Name[sv]=Healpix-filläsare
+Name[tr]=Healpix Dosyası Okuyucusu
 Name[uk]=Засіб читання файлів Healpix
 Name[x-test]=xxHealpix File Readerxx
 Comment=Plugin to read Healpix FITS files.
@@ -34,9 +37,11 @@ Comment[ca@valencia]=Connector per a llegir els fitxers FITS de Healpix.
 Comment[de]=Modul zum Lesen von Healpix FITS-Bildern
 Comment[el]=Πρόσθετο για την ανάγνωση αρχείων FITS με το Healpix
 Comment[en_GB]=Plugin to read Healpix FITS files.
+Comment[eo]=Kromaĵo por legi Healpix FITS-dosierojn.
 Comment[es]=Complemento para leer archivos FITS de Healpix.
 Comment[et]=Plugin Healpixi FITS-failide lugemiseks.
-Comment[fr]=Module pour lire une des fichiers Healpix FITS.
+Comment[fi]=Healpixin FITS-tiedostoja lukeva liitännäinen.
+Comment[fr]=Module externe de lecture de fichiers « Healpix ».
 Comment[gl]=Complemento para ler ficheiros FITS Healpix.
 Comment[hu]=Bővítmény a Healpix FITS fájlok olvasásához.
 Comment[it]=Estensione per leggere i file FITS di Healpix.
@@ -48,5 +53,6 @@ Comment[pt_BR]=Plugin para ler arquivos do FITS no Healpix.
 Comment[sk]=Plugin na čítanie súborov Healpix FITS.
 Comment[sl]=Vtičnik za branje datotek Healpix FITS.
 Comment[sv]=Insticksprogram för att läsa Healpix FITS-filer.
+Comment[tr]=Healpix FITS dosyalarını okumak için eklenti.
 Comment[uk]=Додаток для читання файлів FITS Healpix.
 Comment[x-test]=xxPlugin to read Healpix FITS files.xx

old_datasources/lfiio/kstdata_lfiio.desktop

@@ -11,9 +11,11 @@ Name[ca@valencia]=Lector LFIIO
 Name[de]=LFIIO-Betrachter
 Name[el]=Πρόγραμμα ανάγνωσης LFIIO
 Name[en_GB]=LFIIO Reader
+Name[eo]=LFIIO Leganto
 Name[es]=Lector LFIIO
 Name[et]=LFIIO lugeja
-Name[fr]=Lecteur LFIIO
+Name[fi]=LFIIO-lukija
+Name[fr]=Lecteur « LFIIO »
 Name[gl]=Lector de LFIIO
 Name[hu]=LFIIO olvasó
 Name[it]=Lettore LFIIO
@@ -25,17 +27,20 @@ Name[pt_BR]=Leitor do LFIIO
 Name[sk]=LFIIO čítač
 Name[sl]=Bralnik LFIIO
 Name[sv]=LFIIO-läsare
+Name[tr]=LFIIO Okuyucusu
 Name[uk]=Засіб читання LFIIO
 Name[x-test]=xxLFIIO Readerxx
 Comment=Implements support for reading FITS files into Kst.
 Comment[bs]=Implementira podršku za čitanje FITS datoteka u Kst.
 Comment[ca]=Implementació que permet llegir fitxers FITS en el Kst.
-Comment[ca@valencia]=Implementació que permet llegir fitxers FITS en el Kst.
+Comment[ca@valencia]=Implementació que permet llegir fitxers FITS en Kst.
 Comment[de]=Unterstützung für das Einlesen von FITS-Dateien in Kst
 Comment[el]=Υλοποιεί την υποστήριξη ανάγνωσης αρχείων FITS σε Kst.
 Comment[en_GB]=Implements support for reading FITS files into Kst.
+Comment[eo]=Realigas subtenon por legi FITS-dosierojn en Kst.
 Comment[es]=Implementa la lectura de archivos FITS en Kst.
 Comment[et]=Kst FITS-failide lugemise toetus.
+Comment[fi]=Toteuttaa Kst:hen FITS-tiedostojen lukutuen.
 Comment[fr]=Implémente la prise en charge de la lecture de fichiers FITS dans Kst.
 Comment[gl]=Permite ler ficheiros FITS en Kst.
 Comment[hu]=Támogatást valósít meg a FITS fájlok olvasásához a Kst-be.
@@ -48,5 +53,6 @@ Comment[pt_BR]=Implementa o suporte para leitura de arquivos do FITS no Kst.
 Comment[sk]=Implementuje podporu pre čítanie súborov FITS do Kst.
 Comment[sl]=Izvaja podporo za branje datotek FITS v Kst.
 Comment[sv]=Implementerar stöd för att läsa FITS-filer i Kst.
+Comment[tr]=Kst içine FITS dosyalarını okumak için destek ekler.
 Comment[uk]=Реалізує підтримку читання файлів FITS у Kst.
 Comment[x-test]=xxImplements support for reading FITS files into Kst.xx

old_datasources/plankIDEF/kstdata_planckIDEF.desktop

@@ -11,9 +11,10 @@ Name[ca@valencia]=Lector de format d'intercanvi IDIS DMC de Planck
 Name[de]=Planck-IDIS-DMC-Austauschformatleser
 Name[el]=Planck IDIS DMC πρόγραμμα ανάγνωσης για ανταλλαγή συνεργαζόμενων αρχείων
 Name[en_GB]=Planck IDIS DMC Exchange Format Reader
+Name[eo]=Planck IDIS DMC Exchange Format Reader
 Name[es]=Lector del formato de intercambio IDIS DMC de Planck
 Name[et]=Planck IDIS DMC Exchange vormingu lugeja
-Name[fr]=Lecteur de format Planck IDIS DMC Exchange
+Name[fr]=Lecteur de format « Planck IDIS DMC Exchange »
 Name[gl]=Lector para o formato de intercambio Planck IDIS DMC
 Name[it]=Lettore del formato di scambio di Planck IDIS DMC
 Name[nb]=Leser for Planck IDIS DMC utvekslingsformat
@@ -23,6 +24,7 @@ Name[pt]=Leitor do Formato de Intercâmbio do IDIS DMC do Planck
 Name[pt_BR]=Leitor do formato de intercâmbio do IDIS DMC do Planck
 Name[sl]=Bralnik formatov izmenjave Planck IDIS DMC
 Name[sv]=Läsare av Planck IDIS DMC-utbytesformat
+Name[tr]=Planck IDIS DMC Exchange Biçimi Okuyucusu
 Name[uk]=Засіб читання даних у форматі обміну Planck IDIS DMC
 Name[x-test]=xxPlanck IDIS DMC Exchange Format Readerxx
 

src/datasources/ascii/asciidatareader.cpp

@@ -13,11 +13,11 @@
 #include "asciidatareader.h"
 #include "asciisourceconfig.h"
 
-#include "math_kst.h"
+//#include "math_kst.h"
 #include "kst_inf.h"
 
 #include "kst_atof.h"
-#include "measuretime.h"
+//#include "measuretime.h"
 
 #include <QFile>
 #include <QDebug>
@@ -258,6 +258,7 @@ qint64 AsciiDataReader::progressRows()
 //-------------------------------------------------------------------------------------------
 int AsciiDataReader::readField(const AsciiFileData& buf, int col, double *v, const QString& field, int s, int n)
 {
+  (void)field; // remove unused parameter warning.  This reads by column number (int col), not field name.
   if (_config._columnType == AsciiSourceConfig::Fixed) {
     //MeasureTime t("AsciiSource::readField: same width for all columns");
     const LexicalCast& lexc = LexicalCast::instance();

src/datasources/ascii/asciifilebuffer.cpp

@@ -49,6 +49,15 @@ bool AsciiFileBuffer::openFile(QFile &file)
   return file.open(QIODevice::ReadOnly);
 }
 
+//-------------------------------------------------------------------------------------------
+bool AsciiFileBuffer::reOpenFile(QFile &file)
+{
+  // Don't use 'QIODevice::Text'!
+  // Because CR LF line ending breaks row offset calculation
+  file.close();
+  return file.open(QIODevice::ReadOnly);
+}
+
 //-------------------------------------------------------------------------------------------
 void AsciiFileBuffer::clear()
 {

src/datasources/ascii/asciifilebuffer.h

@@ -41,6 +41,7 @@ class AsciiFileBuffer
   QVector<QVector<AsciiFileData> >& fileData() { return _fileData; }
 
   static bool openFile(QFile &file);
+  static bool reOpenFile(QFile &file);
 
 private:
   QFile* _file;

src/datasources/ascii/asciifiledata.cpp

@@ -116,7 +116,7 @@ char* AsciiFileData::data()
 }
 
 //-------------------------------------------------------------------------------------------
-const char* const AsciiFileData::constPointer() const
+const char* AsciiFileData::constPointer() const
 {
   return _array->data();
 }
@@ -210,8 +210,8 @@ void AsciiFileData::logData() const
   QString this_str;
   QString data_str;
 
-  this_str.sprintf("%p", this);
-  data_str.sprintf("%p", _array.data());
+  this_str.asprintf("%p", this);
+  data_str.asprintf("%p", _array.data());
   qDebug() << QString("AsciiFileData %1, array %2, byte %3 ... %4 (%8), row %5 ... %6 (%9), lazy: %7")
     .arg(this_str)
     .arg(data_str)

src/datasources/ascii/asciifiledata.h

@@ -54,7 +54,7 @@ class AsciiFileData
   qint64 read(QFile&, qint64 start, qint64 numberOfBytes, qint64 maximalBytes = -1);
 
   char* data();
-  const char* const constPointer() const;
+  const char* constPointer() const;
   const Array& constArray() const;
 
   bool resize(qint64 size);