Showing with 246 additions and 265 deletions.
  1. +14 −0 cmake/modules/FindCFITSIO.cmake
  2. +14 −0 cmake/modules/FindGetdata.cmake
  3. +14 −0 cmake/modules/FindGsl.cmake
  4. +14 −0 cmake/modules/FindMatio.cmake
  5. +14 −0 cmake/modules/FindNetcdf.cmake
  6. +14 −0 cmake/modules/KstCrossCompile.cmake
  7. +15 −0 cmake/modules/KstMacros.cmake
  8. +14 −0 cmake/modules/KstPchSupport.cmake
  9. +14 −0 cmake/modules/MergedFilesBuild.cmake
  10. +14 −0 cmake/modules/SubversionGenerator.cmake
  11. +14 −0 cmake/modules/SubversionHeader.cmake
  12. +0 −139 src/d2asc/d2asc.cpp
  13. +0 −28 src/d2asc/d2asc.pro
  14. +2 −3 src/libkst/datamatrix.cpp
  15. +1 −1 src/libkst/dataprimitive.cpp
  16. +2 −2 src/libkst/datascalar.cpp
  17. +2 −3 src/libkst/datasource.cpp
  18. +6 −6 src/libkst/datasourcepluginmanager.cpp
  19. +2 −2 src/libkst/datastring.cpp
  20. +2 −3 src/libkst/datavector.cpp
  21. +2 −2 src/libkst/editablematrix.cpp
  22. +2 −2 src/libkst/editablevector.cpp
  23. +2 −2 src/libkst/generatedmatrix.cpp
  24. +2 −2 src/libkst/generatedvector.cpp
  25. +1 −1 src/libkst/matrix.cpp
  26. +1 −1 src/libkst/object.cpp
  27. +1 −1 src/libkst/primitive.cpp
  28. +2 −2 src/libkst/scalar.cpp
  29. +2 −2 src/libkst/string_kst.cpp
  30. +2 −2 src/libkst/vector.cpp
  31. +2 −2 src/libkst/vscalar.cpp
  32. +1 −0 src/libkstapp/axistab.h
  33. +1 −0 src/libkstapp/cartesianrenderitem.cpp
  34. +1 −0 src/libkstapp/datamanager.cpp
  35. +0 −18 src/libkstapp/plotitem.cpp
  36. +1 −1 src/libkstapp/plotitem.h
  37. +1 −0 src/libkstapp/plotscriptinterface.cpp
  38. +1 −0 src/libkstapp/rangetab.h
  39. +1 −0 src/libkstapp/sharedaxisboxitem.h
  40. +1 −2 src/libkstapp/themedialog.h
  41. +1 −0 src/libkstapp/view.cpp
  42. +2 −2 src/libkstmath/basicplugin.cpp
  43. +2 −2 src/libkstmath/csd.cpp
  44. +2 −2 src/libkstmath/curve.cpp
  45. +2 −2 src/libkstmath/dataobject.cpp
  46. +1 −1 src/libkstmath/enodes.cpp
  47. +2 −2 src/libkstmath/equation.cpp
  48. +2 −2 src/libkstmath/eventmonitorentry.cpp
  49. +2 −2 src/libkstmath/histogram.cpp
  50. +2 −2 src/libkstmath/image.cpp
  51. +25 −16 src/libkstmath/plotdefines.h
  52. +2 −2 src/libkstmath/psd.cpp
  53. +1 −1 src/libkstmath/psdcalculator.cpp
  54. +1 −1 src/libkstmath/relation.cpp
  55. +0 −1 src/plugins/dataobject/lockin/iirfilter.h
14 changes: 14 additions & 0 deletions cmake/modules/FindCFITSIO.cmake
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,17 @@
# ***************************************************************************
# * *
# * Copyright : (C) 2010 The University of Toronto *
# * email : netterfield@astro.utoronto.ca *
# * *
# * Copyright : (C) 2010 Peter Kümmel *
# * email : syntheticpp@gmx.net *
# * *
# * This program is free software; you can redistribute it and/or modify *
# * it under the terms of the GNU General Public License as published by *
# * the Free Software Foundation; either version 2 of the License, or *
# * (at your option) any later version. *
# * *
# ***************************************************************************

if(NOT CFITSIO_INCLUDEDIR)

Expand Down
14 changes: 14 additions & 0 deletions cmake/modules/FindGetdata.cmake
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,17 @@
# ***************************************************************************
# * *
# * Copyright : (C) 2010 The University of Toronto *
# * email : netterfield@astro.utoronto.ca *
# * *
# * Copyright : (C) 2010 Peter Kümmel *
# * email : syntheticpp@gmx.net *
# * *
# * This program is free software; you can redistribute it and/or modify *
# * it under the terms of the GNU General Public License as published by *
# * the Free Software Foundation; either version 2 of the License, or *
# * (at your option) any later version. *
# * *
# ***************************************************************************

if(NOT GETDATA_INCLUDEDIR)

Expand Down
14 changes: 14 additions & 0 deletions cmake/modules/FindGsl.cmake
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,17 @@
# ***************************************************************************
# * *
# * Copyright : (C) 2010 The University of Toronto *
# * email : netterfield@astro.utoronto.ca *
# * *
# * Copyright : (C) 2010 Peter Kümmel *
# * email : syntheticpp@gmx.net *
# * *
# * This program is free software; you can redistribute it and/or modify *
# * it under the terms of the GNU General Public License as published by *
# * the Free Software Foundation; either version 2 of the License, or *
# * (at your option) any later version. *
# * *
# ***************************************************************************

# use pkg to find the library name and pathes,
# but use this iformation in find_* only
Expand Down
14 changes: 14 additions & 0 deletions cmake/modules/FindMatio.cmake
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,17 @@
# ***************************************************************************
# * *
# * Copyright : (C) 2010 The University of Toronto *
# * email : netterfield@astro.utoronto.ca *
# * *
# * Copyright : (C) 2010 Peter Kümmel *
# * email : syntheticpp@gmx.net *
# * *
# * This program is free software; you can redistribute it and/or modify *
# * it under the terms of the GNU General Public License as published by *
# * the Free Software Foundation; either version 2 of the License, or *
# * (at your option) any later version. *
# * *
# ***************************************************************************

# copied from FindGsl.cmake

Expand Down
14 changes: 14 additions & 0 deletions cmake/modules/FindNetcdf.cmake
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,17 @@
# ***************************************************************************
# * *
# * Copyright : (C) 2010 The University of Toronto *
# * email : netterfield@astro.utoronto.ca *
# * *
# * Copyright : (C) 2010 Peter Kümmel *
# * email : syntheticpp@gmx.net *
# * *
# * This program is free software; you can redistribute it and/or modify *
# * it under the terms of the GNU General Public License as published by *
# * the Free Software Foundation; either version 2 of the License, or *
# * (at your option) any later version. *
# * *
# ***************************************************************************

if(NOT NETCDF_INCLUDEDIR)

Expand Down
14 changes: 14 additions & 0 deletions cmake/modules/KstCrossCompile.cmake
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,17 @@
# ***************************************************************************
# * *
# * Copyright : (C) 2010 The University of Toronto *
# * email : netterfield@astro.utoronto.ca *
# * *
# * Copyright : (C) 2010 Peter Kümmel *
# * email : syntheticpp@gmx.net *
# * *
# * This program is free software; you can redistribute it and/or modify *
# * it under the terms of the GNU General Public License as published by *
# * the Free Software Foundation; either version 2 of the License, or *
# * (at your option) any later version. *
# * *
# ***************************************************************************

set(CMAKE_SYSTEM_NAME Windows)

Expand Down
15 changes: 15 additions & 0 deletions cmake/modules/KstMacros.cmake
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,18 @@
# ***************************************************************************
# * *
# * Copyright : (C) 2010 The University of Toronto *
# * email : netterfield@astro.utoronto.ca *
# * *
# * Copyright : (C) 2010 Peter Kümmel *
# * email : syntheticpp@gmx.net *
# * *
# * This program is free software; you can redistribute it and/or modify *
# * it under the terms of the GNU General Public License as published by *
# * the Free Software Foundation; either version 2 of the License, or *
# * (at your option) any later version. *
# * *
# ***************************************************************************

include(MergedFilesBuild)
include(KstPchSupport)

Expand Down
14 changes: 14 additions & 0 deletions cmake/modules/KstPchSupport.cmake
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,17 @@
# ***************************************************************************
# * *
# * Copyright : (C) 2010 The University of Toronto *
# * email : netterfield@astro.utoronto.ca *
# * *
# * Copyright : (C) 2010 Peter Kümmel *
# * email : syntheticpp@gmx.net *
# * *
# * This program is free software; you can redistribute it and/or modify *
# * it under the terms of the GNU General Public License as published by *
# * the Free Software Foundation; either version 2 of the License, or *
# * (at your option) any later version. *
# * *
# ***************************************************************************


# Not supported officially my cmake
Expand Down
14 changes: 14 additions & 0 deletions cmake/modules/MergedFilesBuild.cmake
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,17 @@
# ***************************************************************************
# * *
# * Copyright : (C) 2010 The University of Toronto *
# * email : netterfield@astro.utoronto.ca *
# * *
# * Copyright : (C) 2010 Peter Kümmel *
# * email : syntheticpp@gmx.net *
# * *
# * This program is free software; you can redistribute it and/or modify *
# * it under the terms of the GNU General Public License as published by *
# * the Free Software Foundation; either version 2 of the License, or *
# * (at your option) any later version. *
# * *
# ***************************************************************************


macro(merged_files_build _allinone_name _list)
Expand Down
14 changes: 14 additions & 0 deletions cmake/modules/SubversionGenerator.cmake
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,17 @@
# ***************************************************************************
# * *
# * Copyright : (C) 2010 The University of Toronto *
# * email : netterfield@astro.utoronto.ca *
# * *
# * Copyright : (C) 2010 Peter Kümmel *
# * email : syntheticpp@gmx.net *
# * *
# * This program is free software; you can redistribute it and/or modify *
# * it under the terms of the GNU General Public License as published by *
# * the Free Software Foundation; either version 2 of the License, or *
# * (at your option) any later version. *
# * *
# ***************************************************************************

find_package(Subversion)

Expand Down
14 changes: 14 additions & 0 deletions cmake/modules/SubversionHeader.cmake
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,17 @@
# ***************************************************************************
# * *
# * Copyright : (C) 2010 The University of Toronto *
# * email : netterfield@astro.utoronto.ca *
# * *
# * Copyright : (C) 2010 Peter Kümmel *
# * email : syntheticpp@gmx.net *
# * *
# * This program is free software; you can redistribute it and/or modify *
# * it under the terms of the GNU General Public License as published by *
# * the Free Software Foundation; either version 2 of the License, or *
# * (at your option) any later version. *
# * *
# ***************************************************************************

macro(SubversionHeader source_dir target_name header_file modified_str)
# a custom target that is always built
Expand Down
139 changes: 0 additions & 139 deletions src/d2asc/d2asc.cpp
View file

This file was deleted.

28 changes: 0 additions & 28 deletions src/d2asc/d2asc.pro
View file

This file was deleted.

5 changes: 2 additions & 3 deletions src/libkst/datamatrix.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,8 @@

namespace Kst {

const QString DataMatrix::staticTypeString = QT_TR_NOOP("Data Matrix");
const QString DataMatrix::staticTypeTag = QT_TR_NOOP("datamatrix");

const QString DataMatrix::staticTypeString = "Data Matrix";
const QString DataMatrix::staticTypeTag = "datamatrix";


DataMatrix::DataInfo::DataInfo() :
Expand Down
2 changes: 1 addition & 1 deletion src/libkst/dataprimitive.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ void DataPrimitive::changeFile(DataSourcePtr in_file) {
Q_ASSERT(d._primitive->myLockStatus() == KstRWLock::WRITELOCKED);

if (!in_file) {
Debug::self()->log(d._primitive->tr("Data file for vector %1 was not opened.").arg(d._primitive->Name()), Debug::Warning);
Debug::self()->log(Primitive::tr("Data file for vector %1 was not opened.").arg(d._primitive->Name()), Debug::Warning);
}
d._file = in_file;
if (d._file) {
Expand Down
4 changes: 2 additions & 2 deletions src/libkst/datascalar.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@

namespace Kst {

const QString DataScalar::staticTypeString = QT_TR_NOOP("Data Scalar");
const QString DataScalar::staticTypeTag = QT_TR_NOOP("datascalar");
const QString DataScalar::staticTypeString = "Data Scalar";
const QString DataScalar::staticTypeTag = "datascalar";

/** Create a DataVector: raw data from a file */
DataScalar::DataScalar(ObjectStore *store)
Expand Down
Loading