[Kst] branches/work/kst/portto4/kst

Eli Fidler eli at staikos.net
Tue Oct 30 20:43:09 CET 2007


SVN commit 731128 by fidler:

merged objectstore branch


 M  +10 -1     build-kst  
 M  +1 -1      kst.pro  
 M  +11 -8     src/d2asc/d2asc.cpp  
 M  +4 -4      src/datasources/ascii/ascii.cpp  
 M  +11 -8     src/datasources/ascii/ascii.h  
 M  +5 -4      src/datasources/dirfile/dirfile.cpp  
 M  +5 -2      src/datasources/dirfile/dirfile.h  
 M  +4 -4      src/libkst/builtinprimitives.cpp  
 M  +2 -0      src/libkst/builtinprimitives.h  
 A             src/libkst/coredocument.cpp   branches/work/kst/portto4-objectstore/kst/src/libkst/coredocument.cpp#731127 [License: GPL (v2+)]
 A             src/libkst/coredocument.h   branches/work/kst/portto4-objectstore/kst/src/libkst/coredocument.h#731127 [License: GPL (v2+)]
 M  +10 -127   src/libkst/datacollection.cpp  
 M  +10 -30    src/libkst/datacollection.h  
 M  +39 -24    src/libkst/datamatrix.cpp  
 M  +41 -36    src/libkst/datamatrix.h  
 M  +18 -9     src/libkst/dataplugin.h  
 M  +66 -57    src/libkst/datasource.cpp  
 M  +34 -15    src/libkst/datasource.h  
 M  +2 -2      src/libkst/datasourcefactory.cpp  
 M  +4 -2      src/libkst/datasourcefactory.h  
 M  +40 -32    src/libkst/datavector.cpp  
 M  +111 -104  src/libkst/datavector.h  
 D             src/libkst/defaultprimitivenames.cpp  
 D             src/libkst/defaultprimitivenames.h  
 M  +14 -7     src/libkst/editablematrix.cpp  
 M  +11 -3     src/libkst/editablematrix.h  
 M  +13 -5     src/libkst/editablevector.cpp  
 M  +16 -7     src/libkst/editablevector.h  
 M  +34 -25    src/libkst/generatedmatrix.cpp  
 M  +16 -8     src/libkst/generatedmatrix.h  
 M  +21 -11    src/libkst/generatedvector.cpp  
 M  +17 -9     src/libkst/generatedvector.h  
 M  +6 -7      src/libkst/libkst.pro  
 M  +152 -113  src/libkst/matrix.cpp  
 M  +34 -29    src/libkst/matrix.h  
 M  +42 -32    src/libkst/matrixdefaults.cpp  
 M  +17 -7     src/libkst/matrixdefaults.h  
 M  +50 -18    src/libkst/object.cpp  
 M  +42 -16    src/libkst/object.h  
 M  +12 -8     src/libkst/objectlist.h  
 M  +8 -3      src/libkst/objectmap.h  
 A             src/libkst/objectstore.cpp   branches/work/kst/portto4-objectstore/kst/src/libkst/objectstore.cpp#731127 [License: GPL (v2+)]
 A             src/libkst/objectstore.h   branches/work/kst/portto4-objectstore/kst/src/libkst/objectstore.h#731127 [License: GPL (v2+)]
 M  +52 -26    src/libkst/objecttag.cpp  
 M  +15 -8     src/libkst/objecttag.h  
 M  +27 -7     src/libkst/primitive.cpp  
 M  +25 -10    src/libkst/primitive.h  
 M  +2 -2      src/libkst/primitivefactory.cpp  
 M  +2 -2      src/libkst/primitivefactory.h  
 M  +17 -42    src/libkst/scalar.cpp  
 M  +13 -11    src/libkst/scalar.h  
 M  +14 -1     src/libkst/sharedptr.h  
 M  +13 -5     src/libkst/stdinsource.cpp  
 M  +6 -1      src/libkst/stdinsource.h  
 M  +20 -36    src/libkst/string_kst.cpp  
 M  +24 -16    src/libkst/string_kst.h  
 M  +60 -103   src/libkst/vector.cpp  
 M  +26 -30    src/libkst/vector.h  
 M  +18 -7     src/libkst/vectordefaults.cpp  
 M  +14 -6     src/libkst/vectordefaults.h  
 M  +28 -34    src/libkst/vectorfactory.cpp  
 M  +13 -13    src/libkst/vectorfactory.h  
 M  +2 -2      src/libkstapp/basicplugindialog.cpp  
 M  +1 -1      src/libkstapp/basicplugindialog.h  
 M  +3 -2      src/libkstapp/changedatasampledialog.cpp  
 M  +4 -3      src/libkstapp/changefiledialog.cpp  
 M  +1 -1      src/libkstapp/choosecolordialog.cpp  
 M  +23 -19    src/libkstapp/csddialog.cpp  
 M  +1 -1      src/libkstapp/csddialog.h  
 M  +34 -11    src/libkstapp/curvedialog.cpp  
 M  +3 -1      src/libkstapp/curvedialog.h  
 M  +30 -16    src/libkstapp/datadialog.cpp  
 M  +8 -6      src/libkstapp/datadialog.h  
 M  +2 -0      src/libkstapp/datamanager.cpp  
 M  +1 -1      src/libkstapp/datamanager.ui  
 M  +4 -0      src/libkstapp/datatab.cpp  
 M  +3 -0      src/libkstapp/datatab.h  
 M  +20 -15    src/libkstapp/document.cpp  
 M  +3 -1      src/libkstapp/document.h  
 M  +23 -12    src/libkstapp/equationdialog.cpp  
 M  +3 -1      src/libkstapp/equationdialog.h  
 M  +16 -11    src/libkstapp/eventmonitordialog.cpp  
 M  +1 -1      src/libkstapp/eventmonitordialog.h  
 M  +43 -32    src/libkstapp/eventmonitorentry.cpp  
 M  +11 -8     src/libkstapp/eventmonitorentry.h  
 M  +20 -9     src/libkstapp/histogramdialog.cpp  
 M  +1 -1      src/libkstapp/histogramdialog.h  
 M  +24 -23    src/libkstapp/imagedialog.cpp  
 M  +1 -1      src/libkstapp/imagedialog.h  
 M  +17 -17    src/libkstapp/labelrenderer.cpp  
 M  +21 -26    src/libkstapp/mainwindow.cpp  
 M  +27 -11    src/libkstapp/matrixdialog.cpp  
 M  +4 -1      src/libkstapp/matrixdialog.h  
 M  +3 -5      src/libkstapp/plotrenderitemdialog.cpp  
 M  +26 -20    src/libkstapp/powerspectrumdialog.cpp  
 M  +1 -1      src/libkstapp/powerspectrumdialog.h  
 M  +11 -8     src/libkstapp/scalardialog.cpp  
 M  +1 -1      src/libkstapp/scalardialog.h  
 M  +4 -4      src/libkstapp/scalareditordialog.cpp  
 M  +2 -2      src/libkstapp/scalarmodel.cpp  
 M  +31 -30    src/libkstapp/sessionmodel.cpp  
 M  +5 -1      src/libkstapp/sessionmodel.h  
 M  +2 -3      src/libkstapp/stringeditordialog.cpp  
 M  +2 -2      src/libkstapp/stringmodel.cpp  
 M  +39 -20    src/libkstapp/vectordialog.cpp  
 M  +6 -2      src/libkstapp/vectordialog.h  
 M  +5 -3      src/libkstapp/vectoreditordialog.cpp  
 M  +1 -1      src/libkstapp/vectoreditordialog.ui  
 M  +3 -1      src/libkstapp/vectormodel.cpp  
 M  +8 -15     src/libkstapp/viewitem.cpp  
 M  +40 -26    src/libkstmath/basicplugin.cpp  
 M  +11 -4     src/libkstmath/basicplugin.h  
 M  +2 -2      src/libkstmath/colorsequence.cpp  
 M  +99 -53    src/libkstmath/csd.cpp  
 M  +40 -25    src/libkstmath/csd.h  
 M  +17 -10    src/libkstmath/curve.cpp  
 M  +35 -25    src/libkstmath/curve.h  
 M  +2 -0      src/libkstmath/curvehint.cpp  
 M  +3 -1      src/libkstmath/curvehint.h  
 M  +58 -46    src/libkstmath/dataobject.cpp  
 M  +12 -12    src/libkstmath/dataobject.h  
 M  +2 -0      src/libkstmath/dataobjectcollection.cpp  
 M  +2 -0      src/libkstmath/dataobjectcollection.h  
 M  +29 -27    src/libkstmath/defaultnames.cpp  
 M  +8 -8      src/libkstmath/defaultnames.h  
 M  +4 -4      src/libkstmath/enodefactory.cpp  
 M  +8 -5      src/libkstmath/enodefactory.h  
 M  +32 -26    src/libkstmath/enodes.cpp  
 M  +8 -6      src/libkstmath/enodes.h  
 M  +15 -15    src/libkstmath/eparse-eh.cpp  
 M  +10 -3     src/libkstmath/eparse-eh.h  
 D             src/libkstmath/eparse.c  
 A             src/libkstmath/eparse.cpp   branches/work/kst/portto4-objectstore/kst/src/libkstmath/eparse.cpp#731127 [License: GPL]
 M  +32 -21    src/libkstmath/eparse.h  
 M  +39 -34    src/libkstmath/eparse.y  
 M  +104 -100  src/libkstmath/equation.cpp  
 M  +23 -14    src/libkstmath/equation.h  
 M  +5 -4      src/libkstmath/equationfactory.cpp  
 M  +1 -1      src/libkstmath/equationfactory.h  
 D             src/libkstmath/escan.c  
 A             src/libkstmath/escan.cpp   branches/work/kst/portto4-objectstore/kst/src/libkstmath/escan.cpp#731127 [License: no copyright GENERATED FILE]
 M  +6 -4      src/libkstmath/escan.l  
 M  +55 -40    src/libkstmath/histogram.cpp  
 M  +73 -61    src/libkstmath/histogram.h  
 M  +59 -49    src/libkstmath/image.cpp  
 M  +38 -27    src/libkstmath/image.h  
 M  +5 -2      src/libkstmath/libkstmath.pro  
 M  +7 -4      src/libkstmath/objectdefaults.cpp  
 M  +9 -5      src/libkstmath/objectdefaults.h  
 M  +2 -2      src/libkstmath/objectfactory.cpp  
 M  +4 -2      src/libkstmath/objectfactory.h  
 M  +59 -41    src/libkstmath/psd.cpp  
 M  +31 -19    src/libkstmath/psd.h  
 M  +11 -8     src/libkstmath/relation.cpp  
 M  +21 -15    src/libkstmath/relation.h  
 M  +2 -2      src/libkstmath/relationfactory.cpp  
 M  +4 -2      src/libkstmath/relationfactory.h  
 M  +14 -5     src/widgets/matrixselector.cpp  
 M  +7 -1      src/widgets/matrixselector.h  
 M  +14 -5     src/widgets/scalarselector.cpp  
 M  +6 -2      src/widgets/scalarselector.h  
 M  +9 -2      src/widgets/stringselector.cpp  
 M  +8 -1      src/widgets/stringselector.h  
 M  +17 -5     src/widgets/vectorselector.cpp  
 M  +7 -1      src/widgets/vectorselector.h  
 M  +3 -0      tests/main.cpp  
 M  +29 -12    tests/testcsd.cpp  
 M  +27 -24    tests/testdatasource.cpp  
 M  +22 -19    tests/testeditablematrix.cpp  
 M  +100 -34   tests/testeqparser.cpp  
 M  +17 -11    tests/testhistogram.cpp  
 M  +3 -3      tests/testlabelparser.cpp  
 M  +15 -11    tests/testmatrix.cpp  
 A             tests/testobjectstore.cpp   branches/work/kst/portto4-objectstore/kst/tests/testobjectstore.cpp#731127 [License: GPL (v2+)]
 A             tests/testobjectstore.h   branches/work/kst/portto4-objectstore/kst/tests/testobjectstore.h#731127 [License: GPL (v2+)]
 M  +15 -9     tests/testpsd.cpp  
 M  +2 -0      tests/tests.pro  
 M  +18 -14    tests/testscalar.cpp  
 M  +15 -9     tests/testvector.cpp  




More information about the Kst mailing list