diff options
-rw-r--r-- | examples/barchart/barchart.pro (renamed from examples/datavis3d/barchart/barchart.pro) | 0 | ||||
-rw-r--r-- | examples/barchart/main.cpp (renamed from examples/datavis3d/barchart/main.cpp) | 0 | ||||
-rw-r--r-- | examples/datavis3d/datavis3d.pro | 6 | ||||
-rw-r--r-- | examples/datavis3d/spectrum/3rdparty/fftreal/bwins/fftrealu.def | 5 | ||||
-rw-r--r-- | examples/datavis3d/spectrum/3rdparty/fftreal/eabi/fftrealu.def | 7 | ||||
-rw-r--r-- | examples/datavis3d/spectrum/3rdparty/fftreal/stopwatch/ClockCycleCounter.cpp | 285 | ||||
-rw-r--r-- | examples/datavis3d/spectrum/3rdparty/fftreal/stopwatch/ClockCycleCounter.h | 124 | ||||
-rw-r--r-- | examples/datavis3d/spectrum/3rdparty/fftreal/stopwatch/ClockCycleCounter.hpp | 150 | ||||
-rw-r--r-- | examples/datavis3d/spectrum/3rdparty/fftreal/stopwatch/Int64.h | 71 | ||||
-rw-r--r-- | examples/datavis3d/spectrum/3rdparty/fftreal/stopwatch/StopWatch.cpp | 101 | ||||
-rw-r--r-- | examples/datavis3d/spectrum/3rdparty/fftreal/stopwatch/StopWatch.h | 110 | ||||
-rw-r--r-- | examples/datavis3d/spectrum/3rdparty/fftreal/stopwatch/StopWatch.hpp | 83 | ||||
-rw-r--r-- | examples/datavis3d/spectrum/3rdparty/fftreal/stopwatch/def.h | 65 | ||||
-rw-r--r-- | examples/datavis3d/spectrum/3rdparty/fftreal/stopwatch/fnc.h | 67 | ||||
-rw-r--r-- | examples/datavis3d/spectrum/3rdparty/fftreal/stopwatch/fnc.hpp | 85 | ||||
-rw-r--r-- | examples/examples.pro | 6 | ||||
-rw-r--r-- | examples/mapdata/main.cpp (renamed from examples/datavis3d/mapdata/main.cpp) | 0 | ||||
-rw-r--r-- | examples/mapdata/mapdata.cpp (renamed from examples/datavis3d/mapdata/mapdata.cpp) | 0 | ||||
-rw-r--r-- | examples/mapdata/mapdata.h (renamed from examples/datavis3d/mapdata/mapdata.h) | 0 | ||||
-rw-r--r-- | examples/mapdata/mapdata.pro (renamed from examples/datavis3d/mapdata/mapdata.pro) | 0 | ||||
-rw-r--r-- | examples/mapdata/mapdata.qrc (renamed from examples/datavis3d/mapdata/mapdata.qrc) | 0 | ||||
-rw-r--r-- | examples/mapdata/suomi.jpg (renamed from examples/datavis3d/mapdata/suomi.jpg) | bin | 157067 -> 157067 bytes | |||
-rw-r--r-- | examples/mapdata/suomi2.jpg (renamed from examples/datavis3d/mapdata/suomi2.jpg) | bin | 287172 -> 287172 bytes | |||
-rw-r--r-- | examples/mapdata/weirdthing.obj (renamed from examples/datavis3d/mapdata/weirdthing.obj) | 0 | ||||
-rw-r--r-- | examples/rainfall/main.cpp (renamed from examples/datavis3d/rainfall/main.cpp) | 0 | ||||
-rw-r--r-- | examples/rainfall/rainfall.pro (renamed from examples/datavis3d/rainfall/rainfall.pro) | 0 | ||||
-rw-r--r-- | examples/spectrum/3rdparty/fftreal/Array.h (renamed from examples/datavis3d/spectrum/3rdparty/fftreal/Array.h) | 0 | ||||
-rw-r--r-- | examples/spectrum/3rdparty/fftreal/Array.hpp (renamed from examples/datavis3d/spectrum/3rdparty/fftreal/Array.hpp) | 0 | ||||
-rw-r--r-- | examples/spectrum/3rdparty/fftreal/DynArray.h (renamed from examples/datavis3d/spectrum/3rdparty/fftreal/DynArray.h) | 0 | ||||
-rw-r--r-- | examples/spectrum/3rdparty/fftreal/DynArray.hpp (renamed from examples/datavis3d/spectrum/3rdparty/fftreal/DynArray.hpp) | 0 | ||||
-rw-r--r-- | examples/spectrum/3rdparty/fftreal/FFTReal.dsp (renamed from examples/datavis3d/spectrum/3rdparty/fftreal/FFTReal.dsp) | 0 | ||||
-rw-r--r-- | examples/spectrum/3rdparty/fftreal/FFTReal.dsw (renamed from examples/datavis3d/spectrum/3rdparty/fftreal/FFTReal.dsw) | 0 | ||||
-rw-r--r-- | examples/spectrum/3rdparty/fftreal/FFTReal.h (renamed from examples/datavis3d/spectrum/3rdparty/fftreal/FFTReal.h) | 0 | ||||
-rw-r--r-- | examples/spectrum/3rdparty/fftreal/FFTReal.hpp (renamed from examples/datavis3d/spectrum/3rdparty/fftreal/FFTReal.hpp) | 0 | ||||
-rw-r--r-- | examples/spectrum/3rdparty/fftreal/FFTRealFixLen.h (renamed from examples/datavis3d/spectrum/3rdparty/fftreal/FFTRealFixLen.h) | 0 | ||||
-rw-r--r-- | examples/spectrum/3rdparty/fftreal/FFTRealFixLen.hpp (renamed from examples/datavis3d/spectrum/3rdparty/fftreal/FFTRealFixLen.hpp) | 0 | ||||
-rw-r--r-- | examples/spectrum/3rdparty/fftreal/FFTRealFixLenParam.h (renamed from examples/datavis3d/spectrum/3rdparty/fftreal/FFTRealFixLenParam.h) | 0 | ||||
-rw-r--r-- | examples/spectrum/3rdparty/fftreal/FFTRealPassDirect.h (renamed from examples/datavis3d/spectrum/3rdparty/fftreal/FFTRealPassDirect.h) | 0 | ||||
-rw-r--r-- | examples/spectrum/3rdparty/fftreal/FFTRealPassDirect.hpp (renamed from examples/datavis3d/spectrum/3rdparty/fftreal/FFTRealPassDirect.hpp) | 0 | ||||
-rw-r--r-- | examples/spectrum/3rdparty/fftreal/FFTRealPassInverse.h (renamed from examples/datavis3d/spectrum/3rdparty/fftreal/FFTRealPassInverse.h) | 0 | ||||
-rw-r--r-- | examples/spectrum/3rdparty/fftreal/FFTRealPassInverse.hpp (renamed from examples/datavis3d/spectrum/3rdparty/fftreal/FFTRealPassInverse.hpp) | 0 | ||||
-rw-r--r-- | examples/spectrum/3rdparty/fftreal/FFTRealSelect.h (renamed from examples/datavis3d/spectrum/3rdparty/fftreal/FFTRealSelect.h) | 0 | ||||
-rw-r--r-- | examples/spectrum/3rdparty/fftreal/FFTRealSelect.hpp (renamed from examples/datavis3d/spectrum/3rdparty/fftreal/FFTRealSelect.hpp) | 0 | ||||
-rw-r--r-- | examples/spectrum/3rdparty/fftreal/FFTRealUseTrigo.h (renamed from examples/datavis3d/spectrum/3rdparty/fftreal/FFTRealUseTrigo.h) | 0 | ||||
-rw-r--r-- | examples/spectrum/3rdparty/fftreal/FFTRealUseTrigo.hpp (renamed from examples/datavis3d/spectrum/3rdparty/fftreal/FFTRealUseTrigo.hpp) | 0 | ||||
-rw-r--r-- | examples/spectrum/3rdparty/fftreal/OscSinCos.h (renamed from examples/datavis3d/spectrum/3rdparty/fftreal/OscSinCos.h) | 0 | ||||
-rw-r--r-- | examples/spectrum/3rdparty/fftreal/OscSinCos.hpp (renamed from examples/datavis3d/spectrum/3rdparty/fftreal/OscSinCos.hpp) | 0 | ||||
-rw-r--r-- | examples/spectrum/3rdparty/fftreal/TestAccuracy.h (renamed from examples/datavis3d/spectrum/3rdparty/fftreal/TestAccuracy.h) | 0 | ||||
-rw-r--r-- | examples/spectrum/3rdparty/fftreal/TestAccuracy.hpp (renamed from examples/datavis3d/spectrum/3rdparty/fftreal/TestAccuracy.hpp) | 0 | ||||
-rw-r--r-- | examples/spectrum/3rdparty/fftreal/TestHelperFixLen.h (renamed from examples/datavis3d/spectrum/3rdparty/fftreal/TestHelperFixLen.h) | 0 | ||||
-rw-r--r-- | examples/spectrum/3rdparty/fftreal/TestHelperFixLen.hpp (renamed from examples/datavis3d/spectrum/3rdparty/fftreal/TestHelperFixLen.hpp) | 0 | ||||
-rw-r--r-- | examples/spectrum/3rdparty/fftreal/TestHelperNormal.h (renamed from examples/datavis3d/spectrum/3rdparty/fftreal/TestHelperNormal.h) | 0 | ||||
-rw-r--r-- | examples/spectrum/3rdparty/fftreal/TestHelperNormal.hpp (renamed from examples/datavis3d/spectrum/3rdparty/fftreal/TestHelperNormal.hpp) | 0 | ||||
-rw-r--r-- | examples/spectrum/3rdparty/fftreal/TestSpeed.h (renamed from examples/datavis3d/spectrum/3rdparty/fftreal/TestSpeed.h) | 0 | ||||
-rw-r--r-- | examples/spectrum/3rdparty/fftreal/TestSpeed.hpp (renamed from examples/datavis3d/spectrum/3rdparty/fftreal/TestSpeed.hpp) | 0 | ||||
-rw-r--r-- | examples/spectrum/3rdparty/fftreal/TestWhiteNoiseGen.h (renamed from examples/datavis3d/spectrum/3rdparty/fftreal/TestWhiteNoiseGen.h) | 0 | ||||
-rw-r--r-- | examples/spectrum/3rdparty/fftreal/TestWhiteNoiseGen.hpp (renamed from examples/datavis3d/spectrum/3rdparty/fftreal/TestWhiteNoiseGen.hpp) | 0 | ||||
-rw-r--r-- | examples/spectrum/3rdparty/fftreal/def.h (renamed from examples/datavis3d/spectrum/3rdparty/fftreal/def.h) | 0 | ||||
-rw-r--r-- | examples/spectrum/3rdparty/fftreal/fftreal.pas (renamed from examples/datavis3d/spectrum/3rdparty/fftreal/fftreal.pas) | 0 | ||||
-rw-r--r-- | examples/spectrum/3rdparty/fftreal/fftreal.pro (renamed from examples/datavis3d/spectrum/3rdparty/fftreal/fftreal.pro) | 0 | ||||
-rw-r--r-- | examples/spectrum/3rdparty/fftreal/fftreal_wrapper.cpp (renamed from examples/datavis3d/spectrum/3rdparty/fftreal/fftreal_wrapper.cpp) | 0 | ||||
-rw-r--r-- | examples/spectrum/3rdparty/fftreal/fftreal_wrapper.h (renamed from examples/datavis3d/spectrum/3rdparty/fftreal/fftreal_wrapper.h) | 0 | ||||
-rw-r--r-- | examples/spectrum/3rdparty/fftreal/license.txt (renamed from examples/datavis3d/spectrum/3rdparty/fftreal/license.txt) | 0 | ||||
-rw-r--r-- | examples/spectrum/3rdparty/fftreal/readme.txt (renamed from examples/datavis3d/spectrum/3rdparty/fftreal/readme.txt) | 0 | ||||
-rw-r--r-- | examples/spectrum/3rdparty/fftreal/test.cpp (renamed from examples/datavis3d/spectrum/3rdparty/fftreal/test.cpp) | 0 | ||||
-rw-r--r-- | examples/spectrum/3rdparty/fftreal/test_fnc.h (renamed from examples/datavis3d/spectrum/3rdparty/fftreal/test_fnc.h) | 0 | ||||
-rw-r--r-- | examples/spectrum/3rdparty/fftreal/test_fnc.hpp (renamed from examples/datavis3d/spectrum/3rdparty/fftreal/test_fnc.hpp) | 0 | ||||
-rw-r--r-- | examples/spectrum/3rdparty/fftreal/test_settings.h (renamed from examples/datavis3d/spectrum/3rdparty/fftreal/test_settings.h) | 0 | ||||
-rw-r--r-- | examples/spectrum/3rdparty/fftreal/testapp.dpr (renamed from examples/datavis3d/spectrum/3rdparty/fftreal/testapp.dpr) | 0 | ||||
-rw-r--r-- | examples/spectrum/README.txt (renamed from examples/datavis3d/spectrum/README.txt) | 0 | ||||
-rw-r--r-- | examples/spectrum/spectrum.pri (renamed from examples/datavis3d/spectrum/spectrum.pri) | 0 | ||||
-rw-r--r-- | examples/spectrum/spectrum.pro (renamed from examples/datavis3d/spectrum/spectrum.pro) | 0 | ||||
-rw-r--r-- | examples/spectrum/spectrumapp/engine.cpp (renamed from examples/datavis3d/spectrum/spectrumapp/engine.cpp) | 0 | ||||
-rw-r--r-- | examples/spectrum/spectrumapp/engine.h (renamed from examples/datavis3d/spectrum/spectrumapp/engine.h) | 0 | ||||
-rw-r--r-- | examples/spectrum/spectrumapp/frequencyspectrum.cpp (renamed from examples/datavis3d/spectrum/spectrumapp/frequencyspectrum.cpp) | 0 | ||||
-rw-r--r-- | examples/spectrum/spectrumapp/frequencyspectrum.h (renamed from examples/datavis3d/spectrum/spectrumapp/frequencyspectrum.h) | 0 | ||||
-rw-r--r-- | examples/spectrum/spectrumapp/main.cpp (renamed from examples/datavis3d/spectrum/spectrumapp/main.cpp) | 0 | ||||
-rw-r--r-- | examples/spectrum/spectrumapp/soundFiles/Rockhop.wav (renamed from examples/datavis3d/spectrum/spectrumapp/soundFiles/Rockhop.wav) | bin | 1059308 -> 1059308 bytes | |||
-rw-r--r-- | examples/spectrum/spectrumapp/soundFiles/futurebells_beat.wav (renamed from examples/datavis3d/spectrum/spectrumapp/soundFiles/futurebells_beat.wav) | bin | 352084 -> 352084 bytes | |||
-rw-r--r-- | examples/spectrum/spectrumapp/soundFiles/onclassical_demo_fiati-di-parma_thuille_terzo-tempo_sestetto_small-version.wav (renamed from examples/datavis3d/spectrum/spectrumapp/soundFiles/onclassical_demo_fiati-di-parma_thuille_terzo-tempo_sestetto_small-version.wav) | bin | 1055502 -> 1055502 bytes | |||
-rw-r--r-- | examples/spectrum/spectrumapp/spectrum.h (renamed from examples/datavis3d/spectrum/spectrumapp/spectrum.h) | 0 | ||||
-rw-r--r-- | examples/spectrum/spectrumapp/spectrum.qrc (renamed from examples/datavis3d/spectrum/spectrumapp/spectrum.qrc) | 0 | ||||
-rw-r--r-- | examples/spectrum/spectrumapp/spectrumanalyser.cpp (renamed from examples/datavis3d/spectrum/spectrumapp/spectrumanalyser.cpp) | 0 | ||||
-rw-r--r-- | examples/spectrum/spectrumapp/spectrumanalyser.h (renamed from examples/datavis3d/spectrum/spectrumapp/spectrumanalyser.h) | 0 | ||||
-rw-r--r-- | examples/spectrum/spectrumapp/spectrumapp.pro (renamed from examples/datavis3d/spectrum/spectrumapp/spectrumapp.pro) | 0 | ||||
-rw-r--r-- | examples/spectrum/spectrumapp/utils.cpp (renamed from examples/datavis3d/spectrum/spectrumapp/utils.cpp) | 0 | ||||
-rw-r--r-- | examples/spectrum/spectrumapp/utils.h (renamed from examples/datavis3d/spectrum/spectrumapp/utils.h) | 0 | ||||
-rw-r--r-- | examples/spectrum/spectrumapp/wavfile.cpp (renamed from examples/datavis3d/spectrum/spectrumapp/wavfile.cpp) | 0 | ||||
-rw-r--r-- | examples/spectrum/spectrumapp/wavfile.h (renamed from examples/datavis3d/spectrum/spectrumapp/wavfile.h) | 0 | ||||
-rw-r--r-- | examples/widget/chart.cpp (renamed from examples/datavis3d/widget/chart.cpp) | 0 | ||||
-rw-r--r-- | examples/widget/chart.h (renamed from examples/datavis3d/widget/chart.h) | 0 | ||||
-rw-r--r-- | examples/widget/main.cpp (renamed from examples/datavis3d/widget/main.cpp) | 0 | ||||
-rw-r--r-- | examples/widget/widget.pro (renamed from examples/datavis3d/widget/widget.pro) | 0 | ||||
-rw-r--r-- | src/Doxyfile (renamed from src/datavis3d/Doxyfile) | 0 | ||||
-rw-r--r-- | src/Mainpage.dox (renamed from src/datavis3d/Mainpage.dox) | 0 | ||||
-rw-r--r-- | src/common.pri (renamed from src/datavis3d/common.pri) | 0 | ||||
-rw-r--r-- | src/datavis3d/datavis3d.pro | 22 | ||||
-rw-r--r-- | src/doc/qtdatavis3d.qdocconf (renamed from src/datavis3d/doc/qtdatavis3d.qdocconf) | 0 | ||||
-rw-r--r-- | src/documentationGroups.dox (renamed from src/datavis3d/documentationGroups.dox) | 0 | ||||
-rw-r--r-- | src/engine/drawer.cpp (renamed from src/datavis3d/engine/drawer.cpp) | 0 | ||||
-rw-r--r-- | src/engine/drawer_p.h (renamed from src/datavis3d/engine/drawer_p.h) | 0 | ||||
-rw-r--r-- | src/engine/engine.pri (renamed from src/datavis3d/engine/engine.pri) | 0 | ||||
-rw-r--r-- | src/engine/engine.qrc (renamed from src/datavis3d/engine/engine.qrc) | 0 | ||||
-rw-r--r-- | src/engine/labelitem.cpp (renamed from src/datavis3d/engine/labelitem.cpp) | 0 | ||||
-rw-r--r-- | src/engine/labelitem_p.h (renamed from src/datavis3d/engine/labelitem_p.h) | 0 | ||||
-rw-r--r-- | src/engine/meshes/backgroudFlat.obj (renamed from src/datavis3d/engine/meshes/backgroudFlat.obj) | 0 | ||||
-rw-r--r-- | src/engine/meshes/backgroudSmooth.obj (renamed from src/datavis3d/engine/meshes/backgroudSmooth.obj) | 0 | ||||
-rw-r--r-- | src/engine/meshes/coneFlat.obj (renamed from src/datavis3d/engine/meshes/coneFlat.obj) | 0 | ||||
-rw-r--r-- | src/engine/meshes/coneSmooth.obj (renamed from src/datavis3d/engine/meshes/coneSmooth.obj) | 0 | ||||
-rw-r--r-- | src/engine/meshes/cubeFlat.obj (renamed from src/datavis3d/engine/meshes/cubeFlat.obj) | 0 | ||||
-rw-r--r-- | src/engine/meshes/cubeSmooth.obj (renamed from src/datavis3d/engine/meshes/cubeSmooth.obj) | 0 | ||||
-rw-r--r-- | src/engine/meshes/cylinderFlat.obj (renamed from src/datavis3d/engine/meshes/cylinderFlat.obj) | 0 | ||||
-rw-r--r-- | src/engine/meshes/cylinderSmooth.obj (renamed from src/datavis3d/engine/meshes/cylinderSmooth.obj) | 0 | ||||
-rw-r--r-- | src/engine/meshes/plane.obj (renamed from src/datavis3d/engine/meshes/plane.obj) | 0 | ||||
-rw-r--r-- | src/engine/meshes/pyramidFlat.obj (renamed from src/datavis3d/engine/meshes/pyramidFlat.obj) | 0 | ||||
-rw-r--r-- | src/engine/meshes/pyramidSmooth.obj (renamed from src/datavis3d/engine/meshes/pyramidSmooth.obj) | 0 | ||||
-rw-r--r-- | src/engine/meshes/sphere.obj (renamed from src/datavis3d/engine/meshes/sphere.obj) | 0 | ||||
-rw-r--r-- | src/engine/meshes/sphereSmooth.obj (renamed from src/datavis3d/engine/meshes/sphereSmooth.obj) | 0 | ||||
-rw-r--r-- | src/engine/q3dbars.cpp (renamed from src/datavis3d/engine/q3dbars.cpp) | 0 | ||||
-rw-r--r-- | src/engine/q3dbars.h (renamed from src/datavis3d/engine/q3dbars.h) | 0 | ||||
-rw-r--r-- | src/engine/q3dbars_p.h (renamed from src/datavis3d/engine/q3dbars_p.h) | 0 | ||||
-rw-r--r-- | src/engine/q3dmaps.cpp (renamed from src/datavis3d/engine/q3dmaps.cpp) | 0 | ||||
-rw-r--r-- | src/engine/q3dmaps.h (renamed from src/datavis3d/engine/q3dmaps.h) | 0 | ||||
-rw-r--r-- | src/engine/q3dmaps_p.h (renamed from src/datavis3d/engine/q3dmaps_p.h) | 0 | ||||
-rw-r--r-- | src/engine/q3dwindow.cpp (renamed from src/datavis3d/engine/q3dwindow.cpp) | 0 | ||||
-rw-r--r-- | src/engine/q3dwindow.h (renamed from src/datavis3d/engine/q3dwindow.h) | 0 | ||||
-rw-r--r-- | src/engine/q3dwindow_p.h (renamed from src/datavis3d/engine/q3dwindow_p.h) | 0 | ||||
-rw-r--r-- | src/engine/qdataitem.cpp (renamed from src/datavis3d/engine/qdataitem.cpp) | 0 | ||||
-rw-r--r-- | src/engine/qdataitem.h (renamed from src/datavis3d/engine/qdataitem.h) | 0 | ||||
-rw-r--r-- | src/engine/qdataitem_p.h (renamed from src/datavis3d/engine/qdataitem_p.h) | 0 | ||||
-rw-r--r-- | src/engine/qdatarow.cpp (renamed from src/datavis3d/engine/qdatarow.cpp) | 0 | ||||
-rw-r--r-- | src/engine/qdatarow.h (renamed from src/datavis3d/engine/qdatarow.h) | 0 | ||||
-rw-r--r-- | src/engine/qdatarow_p.h (renamed from src/datavis3d/engine/qdatarow_p.h) | 0 | ||||
-rw-r--r-- | src/engine/qdataset.cpp (renamed from src/datavis3d/engine/qdataset.cpp) | 0 | ||||
-rw-r--r-- | src/engine/qdataset.h (renamed from src/datavis3d/engine/qdataset.h) | 0 | ||||
-rw-r--r-- | src/engine/qdataset_p.h (renamed from src/datavis3d/engine/qdataset_p.h) | 0 | ||||
-rw-r--r-- | src/engine/shaders/fragmentDepthTest (renamed from src/datavis3d/engine/shaders/fragmentDepthTest) | 0 | ||||
-rw-r--r-- | src/engine/shaders/fragmentShader (renamed from src/datavis3d/engine/shaders/fragmentShader) | 0 | ||||
-rw-r--r-- | src/engine/shaders/fragmentShaderAmbient (renamed from src/datavis3d/engine/shaders/fragmentShaderAmbient) | 0 | ||||
-rw-r--r-- | src/engine/shaders/fragmentShaderColorOnY (renamed from src/datavis3d/engine/shaders/fragmentShaderColorOnY) | 0 | ||||
-rw-r--r-- | src/engine/shaders/fragmentShaderDepth (renamed from src/datavis3d/engine/shaders/fragmentShaderDepth) | 0 | ||||
-rw-r--r-- | src/engine/shaders/fragmentShaderLabel (renamed from src/datavis3d/engine/shaders/fragmentShaderLabel) | 0 | ||||
-rw-r--r-- | src/engine/shaders/fragmentShaderSelection (renamed from src/datavis3d/engine/shaders/fragmentShaderSelection) | 0 | ||||
-rw-r--r-- | src/engine/shaders/fragmentShaderTexture (renamed from src/datavis3d/engine/shaders/fragmentShaderTexture) | 0 | ||||
-rw-r--r-- | src/engine/shaders/fragmentShadow (renamed from src/datavis3d/engine/shaders/fragmentShadow) | 0 | ||||
-rw-r--r-- | src/engine/shaders/vertexDepthTest (renamed from src/datavis3d/engine/shaders/vertexDepthTest) | 0 | ||||
-rw-r--r-- | src/engine/shaders/vertexShader (renamed from src/datavis3d/engine/shaders/vertexShader) | 0 | ||||
-rw-r--r-- | src/engine/shaders/vertexShaderDepth (renamed from src/datavis3d/engine/shaders/vertexShaderDepth) | 0 | ||||
-rw-r--r-- | src/engine/shaders/vertexShaderLabel (renamed from src/datavis3d/engine/shaders/vertexShaderLabel) | 0 | ||||
-rw-r--r-- | src/engine/shaders/vertexShaderSelection (renamed from src/datavis3d/engine/shaders/vertexShaderSelection) | 0 | ||||
-rw-r--r-- | src/engine/shaders/vertexShaderTexture (renamed from src/datavis3d/engine/shaders/vertexShaderTexture) | 0 | ||||
-rw-r--r-- | src/engine/shaders/vertexShadow (renamed from src/datavis3d/engine/shaders/vertexShadow) | 0 | ||||
-rw-r--r-- | src/engine/theme.cpp (renamed from src/datavis3d/engine/theme.cpp) | 0 | ||||
-rw-r--r-- | src/engine/theme_p.h (renamed from src/datavis3d/engine/theme_p.h) | 0 | ||||
-rw-r--r-- | src/global/global.pri (renamed from src/datavis3d/global/global.pri) | 0 | ||||
-rw-r--r-- | src/global/qdatavis3dglobal.h (renamed from src/datavis3d/global/qdatavis3dglobal.h) | 0 | ||||
-rw-r--r-- | src/global/qdatavis3namespace.h (renamed from src/datavis3d/global/qdatavis3namespace.h) | 0 | ||||
-rw-r--r-- | src/src.pro | 24 | ||||
-rw-r--r-- | src/utils/camerahelper.cpp (renamed from src/datavis3d/utils/camerahelper.cpp) | 0 | ||||
-rw-r--r-- | src/utils/camerahelper_p.h (renamed from src/datavis3d/utils/camerahelper_p.h) | 0 | ||||
-rw-r--r-- | src/utils/meshloader.cpp (renamed from src/datavis3d/utils/meshloader.cpp) | 0 | ||||
-rw-r--r-- | src/utils/meshloader_p.h (renamed from src/datavis3d/utils/meshloader_p.h) | 0 | ||||
-rw-r--r-- | src/utils/objecthelper.cpp (renamed from src/datavis3d/utils/objecthelper.cpp) | 0 | ||||
-rw-r--r-- | src/utils/objecthelper_p.h (renamed from src/datavis3d/utils/objecthelper_p.h) | 0 | ||||
-rw-r--r-- | src/utils/shaderhelper.cpp (renamed from src/datavis3d/utils/shaderhelper.cpp) | 0 | ||||
-rw-r--r-- | src/utils/shaderhelper_p.h (renamed from src/datavis3d/utils/shaderhelper_p.h) | 0 | ||||
-rw-r--r-- | src/utils/texturehelper.cpp (renamed from src/datavis3d/utils/texturehelper.cpp) | 0 | ||||
-rw-r--r-- | src/utils/texturehelper_p.h (renamed from src/datavis3d/utils/texturehelper_p.h) | 0 | ||||
-rw-r--r-- | src/utils/utils.cpp (renamed from src/datavis3d/utils/utils.cpp) | 0 | ||||
-rw-r--r-- | src/utils/utils.pri (renamed from src/datavis3d/utils/utils.pri) | 0 | ||||
-rw-r--r-- | src/utils/utils_p.h (renamed from src/datavis3d/utils/utils_p.h) | 0 | ||||
-rw-r--r-- | src/utils/vertexindexer.cpp (renamed from src/datavis3d/utils/vertexindexer.cpp) | 0 | ||||
-rw-r--r-- | src/utils/vertexindexer_p.h (renamed from src/datavis3d/utils/vertexindexer_p.h) | 0 | ||||
-rw-r--r-- | sync.profile | 2 |
174 files changed, 28 insertions, 1185 deletions
diff --git a/examples/datavis3d/barchart/barchart.pro b/examples/barchart/barchart.pro index f61adac0..f61adac0 100644 --- a/examples/datavis3d/barchart/barchart.pro +++ b/examples/barchart/barchart.pro diff --git a/examples/datavis3d/barchart/main.cpp b/examples/barchart/main.cpp index 0f04d8d4..0f04d8d4 100644 --- a/examples/datavis3d/barchart/main.cpp +++ b/examples/barchart/main.cpp diff --git a/examples/datavis3d/datavis3d.pro b/examples/datavis3d/datavis3d.pro deleted file mode 100644 index 912a5132..00000000 --- a/examples/datavis3d/datavis3d.pro +++ /dev/null @@ -1,6 +0,0 @@ -TEMPLATE = subdirs -SUBDIRS += barchart \ - rainfall \ - spectrum \ - widget \ - mapdata diff --git a/examples/datavis3d/spectrum/3rdparty/fftreal/bwins/fftrealu.def b/examples/datavis3d/spectrum/3rdparty/fftreal/bwins/fftrealu.def deleted file mode 100644 index 7a793977..00000000 --- a/examples/datavis3d/spectrum/3rdparty/fftreal/bwins/fftrealu.def +++ /dev/null @@ -1,5 +0,0 @@ -EXPORTS - ??0FFTRealWrapper@@QAE@XZ @ 1 NONAME ; FFTRealWrapper::FFTRealWrapper(void) - ??1FFTRealWrapper@@QAE@XZ @ 2 NONAME ; FFTRealWrapper::~FFTRealWrapper(void) - ?calculateFFT@FFTRealWrapper@@QAEXQAMQBM@Z @ 3 NONAME ; void FFTRealWrapper::calculateFFT(float * const, float const * const) - diff --git a/examples/datavis3d/spectrum/3rdparty/fftreal/eabi/fftrealu.def b/examples/datavis3d/spectrum/3rdparty/fftreal/eabi/fftrealu.def deleted file mode 100644 index f95a4414..00000000 --- a/examples/datavis3d/spectrum/3rdparty/fftreal/eabi/fftrealu.def +++ /dev/null @@ -1,7 +0,0 @@ -EXPORTS - _ZN14FFTRealWrapper12calculateFFTEPfPKf @ 1 NONAME - _ZN14FFTRealWrapperC1Ev @ 2 NONAME - _ZN14FFTRealWrapperC2Ev @ 3 NONAME - _ZN14FFTRealWrapperD1Ev @ 4 NONAME - _ZN14FFTRealWrapperD2Ev @ 5 NONAME - diff --git a/examples/datavis3d/spectrum/3rdparty/fftreal/stopwatch/ClockCycleCounter.cpp b/examples/datavis3d/spectrum/3rdparty/fftreal/stopwatch/ClockCycleCounter.cpp deleted file mode 100644 index fe1d4245..00000000 --- a/examples/datavis3d/spectrum/3rdparty/fftreal/stopwatch/ClockCycleCounter.cpp +++ /dev/null @@ -1,285 +0,0 @@ -/***************************************************************************** - - ClockCycleCounter.cpp - Copyright (c) 2003 Laurent de Soras - ---- Legal stuff --- - -This library is free software; you can redistribute it and/or -modify it under the terms of the GNU Lesser General Public -License as published by the Free Software Foundation; either -version 2.1 of the License, or (at your option) any later version. - -This library is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -Lesser General Public License for more details. - -You should have received a copy of the GNU Lesser General Public -License along with this library; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - -*Tab=3***********************************************************************/ - - - -#if defined (_MSC_VER) - #pragma warning (1 : 4130) // "'operator' : logical operation on address of string constant" - #pragma warning (1 : 4223) // "nonstandard extension used : non-lvalue array converted to pointer" - #pragma warning (1 : 4705) // "statement has no effect" - #pragma warning (1 : 4706) // "assignment within conditional expression" - #pragma warning (4 : 4786) // "identifier was truncated to '255' characters in the debug information" - #pragma warning (4 : 4800) // "forcing value to bool 'true' or 'false' (performance warning)" - #pragma warning (4 : 4355) // "'this' : used in base member initializer list" -#endif - - - -/*\\\ INCLUDE FILES \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\*/ - -#include "ClockCycleCounter.h" - -#include <cassert> - - - -namespace stopwatch -{ - - - -/*\\\ PUBLIC \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\*/ - - - -/* -============================================================================== -Name: ctor -Description: - The first object constructed initialise global data. This first - construction may be a bit slow. -Throws: Nothing -============================================================================== -*/ - -ClockCycleCounter::ClockCycleCounter () -: _start_time (0) -, _state (0) -, _best_score (-1) -{ - if (! _init_flag) - { - // Should be executed in this order - compute_clk_mul (); - compute_measure_time_total (); - compute_measure_time_lap (); - - // Restores object state - _start_time = 0; - _state = 0; - _best_score = -1; - - _init_flag = true; - } -} - - - -/* -============================================================================== -Name: get_time_total -Description: - Gives the time elapsed between the latest stop_lap() and start() calls. -Returns: - The duration, in clock cycles. -Throws: Nothing -============================================================================== -*/ - -Int64 ClockCycleCounter::get_time_total () const -{ - const Int64 duration = _state - _start_time; - assert (duration >= 0); - - const Int64 t = max ( - duration - _measure_time_total, - static_cast <Int64> (0) - ); - - return (t * _clk_mul); -} - - - -/* -============================================================================== -Name: get_time_best_lap -Description: - Gives the smallest time between two consecutive stop_lap() or between - the stop_lap() and start(). The value is reset by a call to start(). - Call this function only after a stop_lap(). - The time is amputed from the duration of the stop_lap() call itself. -Returns: - The smallest duration, in clock cycles. -Throws: Nothing -============================================================================== -*/ - -Int64 ClockCycleCounter::get_time_best_lap () const -{ - assert (_best_score >= 0); - - const Int64 t1 = max ( - _best_score - _measure_time_lap, - static_cast <Int64> (0) - ); - const Int64 t = min (t1, get_time_total ()); - - return (t * _clk_mul); -} - - - -/*\\\ PROTECTED \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\*/ - - - -/*\\\ PRIVATE \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\*/ - - - -#if defined (__MACOS__) - -static inline double stopwatch_ClockCycleCounter_get_time_s () -{ - const Nanoseconds ns = AbsoluteToNanoseconds (UpTime ()); - - return (ns.hi * 4294967296e-9 + ns.lo * 1e-9); -} - -#endif // __MACOS__ - - - -/* -============================================================================== -Name: compute_clk_mul -Description: - This function, only for PowerPC/MacOS computers, computes the multiplier - required to deduce clock cycles from the internal counter. -Throws: Nothing -============================================================================== -*/ - -void ClockCycleCounter::compute_clk_mul () -{ - assert (! _init_flag); - -#if defined (__MACOS__) - - long clk_speed_mhz = CurrentProcessorSpeed (); - const Int64 clk_speed = - static_cast <Int64> (clk_speed_mhz) * (1000L*1000L); - - const double start_time_s = stopwatch_ClockCycleCounter_get_time_s (); - start (); - - const double duration = 0.01; // Seconds - while (stopwatch_ClockCycleCounter_get_time_s () - start_time_s < duration) - { - continue; - } - - const double stop_time_s = stopwatch_ClockCycleCounter_get_time_s (); - stop (); - - const double diff_time_s = stop_time_s - start_time_s; - const double nbr_cycles = diff_time_s * static_cast <double> (clk_speed); - - const Int64 diff_time_c = _state - _start_time; - const double clk_mul = nbr_cycles / static_cast <double> (diff_time_c); - - _clk_mul = round_int (clk_mul); - -#endif // __MACOS__ -} - - - -void ClockCycleCounter::compute_measure_time_total () -{ - start (); - spend_time (); - - Int64 best_result = 0x7FFFFFFFL; // Should be enough - long nbr_tests = 100; - for (long cnt = 0; cnt < nbr_tests; ++cnt) - { - start (); - stop_lap (); - const Int64 duration = _state - _start_time; - best_result = min (best_result, duration); - } - - _measure_time_total = best_result; -} - - - -/* -============================================================================== -Name: compute_measure_time_lap -Description: - Computes the duration of one stop_lap() call and store it. It will be used - later to get the real duration of the measured operation (by substracting - the measurement duration). -Throws: Nothing -============================================================================== -*/ - -void ClockCycleCounter::compute_measure_time_lap () -{ - start (); - spend_time (); - - long nbr_tests = 10; - for (long cnt = 0; cnt < nbr_tests; ++cnt) - { - stop_lap (); - stop_lap (); - stop_lap (); - stop_lap (); - } - - _measure_time_lap = _best_score; -} - - - -void ClockCycleCounter::spend_time () -{ - const Int64 nbr_clocks = 500; // Number of clock cycles to spend - - const Int64 start = read_clock_counter (); - Int64 current; - - do - { - current = read_clock_counter (); - } - while ((current - start) * _clk_mul < nbr_clocks); -} - - - -Int64 ClockCycleCounter::_measure_time_total = 0; -Int64 ClockCycleCounter::_measure_time_lap = 0; -int ClockCycleCounter::_clk_mul = 1; -bool ClockCycleCounter::_init_flag = false; - - -} // namespace stopwatch - - - -/*\\\ EOF \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\*/ diff --git a/examples/datavis3d/spectrum/3rdparty/fftreal/stopwatch/ClockCycleCounter.h b/examples/datavis3d/spectrum/3rdparty/fftreal/stopwatch/ClockCycleCounter.h deleted file mode 100644 index ba7a99a4..00000000 --- a/examples/datavis3d/spectrum/3rdparty/fftreal/stopwatch/ClockCycleCounter.h +++ /dev/null @@ -1,124 +0,0 @@ -/***************************************************************************** - - ClockCycleCounter.h - Copyright (c) 2003 Laurent de Soras - -Instrumentation class, for accurate time interval measurement. You may have -to modify the implementation to adapt it to your system and/or compiler. - ---- Legal stuff --- - -This library is free software; you can redistribute it and/or -modify it under the terms of the GNU Lesser General Public -License as published by the Free Software Foundation; either -version 2.1 of the License, or (at your option) any later version. - -This library is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -Lesser General Public License for more details. - -You should have received a copy of the GNU Lesser General Public -License along with this library; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - -*Tab=3***********************************************************************/ - - - -#if ! defined (stopwatch_ClockCycleCounter_HEADER_INCLUDED) -#define stopwatch_ClockCycleCounter_HEADER_INCLUDED - -#if defined (_MSC_VER) - #pragma once - #pragma warning (4 : 4250) // "Inherits via dominance." -#endif - - - -/*\\\ INCLUDE FILES \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\*/ - -#include "def.h" -#include "Int64.h" - - - -namespace stopwatch -{ - - - -class ClockCycleCounter -{ - -/*\\\ PUBLIC \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\*/ - -public: - - ClockCycleCounter (); - - stopwatch_FORCEINLINE void - start (); - stopwatch_FORCEINLINE void - stop_lap (); - Int64 get_time_total () const; - Int64 get_time_best_lap () const; - - - -/*\\\ PROTECTED \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\*/ - -protected: - - - -/*\\\ PRIVATE \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\*/ - -private: - - void compute_clk_mul (); - void compute_measure_time_total (); - void compute_measure_time_lap (); - - static void spend_time (); - static stopwatch_FORCEINLINE Int64 - read_clock_counter (); - - Int64 _start_time; - Int64 _state; - Int64 _best_score; - - static Int64 _measure_time_total; - static Int64 _measure_time_lap; - static int _clk_mul; - static bool _init_flag; - - - -/*\\\ FORBIDDEN MEMBER FUNCTIONS \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\*/ - -private: - - ClockCycleCounter (const ClockCycleCounter &other); - ClockCycleCounter & - operator = (const ClockCycleCounter &other); - bool operator == (const ClockCycleCounter &other); - bool operator != (const ClockCycleCounter &other); - -}; // class ClockCycleCounter - - - -} // namespace stopwatch - - - -#include "ClockCycleCounter.hpp" - - - -#endif // stopwatch_ClockCycleCounter_HEADER_INCLUDED - - - -/*\\\ EOF \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\*/ diff --git a/examples/datavis3d/spectrum/3rdparty/fftreal/stopwatch/ClockCycleCounter.hpp b/examples/datavis3d/spectrum/3rdparty/fftreal/stopwatch/ClockCycleCounter.hpp deleted file mode 100644 index fbd511e2..00000000 --- a/examples/datavis3d/spectrum/3rdparty/fftreal/stopwatch/ClockCycleCounter.hpp +++ /dev/null @@ -1,150 +0,0 @@ -/***************************************************************************** - - ClockCycleCounter.hpp - Copyright (c) 2003 Laurent de Soras - -Please complete the definitions according to your compiler/architecture. -It's not a big deal if it's not possible to get the clock count... - ---- Legal stuff --- - -This library is free software; you can redistribute it and/or -modify it under the terms of the GNU Lesser General Public -License as published by the Free Software Foundation; either -version 2.1 of the License, or (at your option) any later version. - -This library is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -Lesser General Public License for more details. - -You should have received a copy of the GNU Lesser General Public -License along with this library; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - -*Tab=3***********************************************************************/ - - - -#if defined (stopwatch_ClockCycleCounter_CURRENT_CODEHEADER) - #error Recursive inclusion of ClockCycleCounter code header. -#endif -#define stopwatch_ClockCycleCounter_CURRENT_CODEHEADER - -#if ! defined (stopwatch_ClockCycleCounter_CODEHEADER_INCLUDED) -#define stopwatch_ClockCycleCounter_CODEHEADER_INCLUDED - - - -/*\\\ INCLUDE FILES \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\*/ - -#include "fnc.h" - -#include <climits> - - - -namespace stopwatch -{ - - - -/*\\\ PUBLIC \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\*/ - - - -/* -============================================================================== -Name: start -Description: - Starts the counter. -Throws: Nothing -============================================================================== -*/ - -void ClockCycleCounter::start () -{ - _best_score = (static_cast <Int64> (1) << (sizeof (Int64) * CHAR_BIT - 2)); - const Int64 start_clock = read_clock_counter (); - _start_time = start_clock; - _state = start_clock - _best_score; -} - - - -/* -============================================================================== -Name: stop_lap -Description: - Captures the current time and updates the smallest duration between two - consecutive calls to stop_lap() or the latest start(). - start() must have been called at least once before calling this function. -Throws: Nothing -============================================================================== -*/ - -void ClockCycleCounter::stop_lap () -{ - const Int64 end_clock = read_clock_counter (); - _best_score = min (end_clock - _state, _best_score); - _state = end_clock; -} - - - -/*\\\ PROTECTED \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\*/ - - - -/*\\\ PRIVATE \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\*/ - - - -Int64 ClockCycleCounter::read_clock_counter () -{ - register Int64 clock_cnt; - -#if defined (_MSC_VER) - - __asm - { - lea edi, clock_cnt - rdtsc - mov [edi ], eax - mov [edi + 4], edx - } - -#elif defined (__GNUC__) && defined (__i386__) - - __asm__ __volatile__ ("rdtsc" : "=A" (clock_cnt)); - -#elif (__MWERKS__) && defined (__POWERPC__) - - asm - { - loop: - mftbu clock_cnt@hiword - mftb clock_cnt@loword - mftbu r5 - cmpw clock_cnt@hiword,r5 - bne loop - } - -#endif - - return (clock_cnt); -} - - - -} // namespace stopwatch - - - -#endif // stopwatch_ClockCycleCounter_CODEHEADER_INCLUDED - -#undef stopwatch_ClockCycleCounter_CURRENT_CODEHEADER - - - -/*\\\ EOF \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\*/ diff --git a/examples/datavis3d/spectrum/3rdparty/fftreal/stopwatch/Int64.h b/examples/datavis3d/spectrum/3rdparty/fftreal/stopwatch/Int64.h deleted file mode 100644 index 1e786e25..00000000 --- a/examples/datavis3d/spectrum/3rdparty/fftreal/stopwatch/Int64.h +++ /dev/null @@ -1,71 +0,0 @@ -/***************************************************************************** - - Int64.h - Copyright (c) 2003 Laurent de Soras - ---- Legal stuff --- - -This library is free software; you can redistribute it and/or -modify it under the terms of the GNU Lesser General Public -License as published by the Free Software Foundation; either -version 2.1 of the License, or (at your option) any later version. - -This library is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -Lesser General Public License for more details. - -You should have received a copy of the GNU Lesser General Public -License along with this library; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - -*Tab=3***********************************************************************/ - - - -#if ! defined (stopwatch_Int64_HEADER_INCLUDED) -#define stopwatch_Int64_HEADER_INCLUDED - -#if defined (_MSC_VER) - #pragma once - #pragma warning (4 : 4250) // "Inherits via dominance." -#endif - - - -/*\\\ INCLUDE FILES \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\*/ - - - -namespace stopwatch -{ - - -#if defined (_MSC_VER) - - typedef __int64 Int64; - -#elif defined (__MWERKS__) || defined (__GNUC__) - - typedef long long Int64; - -#elif defined (__BEOS__) - - typedef int64 Int64; - -#else - - #error No 64-bit integer type defined for this compiler ! - -#endif - - -} // namespace stopwatch - - - -#endif // stopwatch_Int64_HEADER_INCLUDED - - - -/*\\\ EOF \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\*/ diff --git a/examples/datavis3d/spectrum/3rdparty/fftreal/stopwatch/StopWatch.cpp b/examples/datavis3d/spectrum/3rdparty/fftreal/stopwatch/StopWatch.cpp deleted file mode 100644 index 7795d86d..00000000 --- a/examples/datavis3d/spectrum/3rdparty/fftreal/stopwatch/StopWatch.cpp +++ /dev/null @@ -1,101 +0,0 @@ -/***************************************************************************** - - StopWatch.cpp - Copyright (c) 2005 Laurent de Soras - ---- Legal stuff --- - -This library is free software; you can redistribute it and/or -modify it under the terms of the GNU Lesser General Public -License as published by the Free Software Foundation; either -version 2.1 of the License, or (at your option) any later version. - -This library is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -Lesser General Public License for more details. - -You should have received a copy of the GNU Lesser General Public -License along with this library; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - -*Tab=3***********************************************************************/ - - - -#if defined (_MSC_VER) - #pragma warning (1 : 4130) // "'operator' : logical operation on address of string constant" - #pragma warning (1 : 4223) // "nonstandard extension used : non-lvalue array converted to pointer" - #pragma warning (1 : 4705) // "statement has no effect" - #pragma warning (1 : 4706) // "assignment within conditional expression" - #pragma warning (4 : 4786) // "identifier was truncated to '255' characters in the debug information" - #pragma warning (4 : 4800) // "forcing value to bool 'true' or 'false' (performance warning)" - #pragma warning (4 : 4355) // "'this' : used in base member initializer list" -#endif - - - -/*\\\ INCLUDE FILES \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\*/ - -#include "StopWatch.h" - -#include <cassert> - - - -namespace stopwatch -{ - - - -/*\\\ PUBLIC \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\*/ - - - -StopWatch::StopWatch () -: _ccc () -, _nbr_laps (0) -{ - // Nothing -} - - - -double StopWatch::get_time_total (Int64 nbr_op) const -{ - assert (_nbr_laps > 0); - assert (nbr_op > 0); - - return ( - static_cast <double> (_ccc.get_time_total ()) - / (static_cast <double> (nbr_op) * static_cast <double> (_nbr_laps)) - ); -} - - - -double StopWatch::get_time_best_lap (Int64 nbr_op) const -{ - assert (nbr_op > 0); - - return ( - static_cast <double> (_ccc.get_time_best_lap ()) - / static_cast <double> (nbr_op) - ); -} - - - -/*\\\ PROTECTED \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\*/ - - - -/*\\\ PRIVATE \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\*/ - - - -} // namespace stopwatch - - - -/*\\\ EOF \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\*/ diff --git a/examples/datavis3d/spectrum/3rdparty/fftreal/stopwatch/StopWatch.h b/examples/datavis3d/spectrum/3rdparty/fftreal/stopwatch/StopWatch.h deleted file mode 100644 index 9cc47e5f..00000000 --- a/examples/datavis3d/spectrum/3rdparty/fftreal/stopwatch/StopWatch.h +++ /dev/null @@ -1,110 +0,0 @@ -/***************************************************************************** - - StopWatch.h - Copyright (c) 2005 Laurent de Soras - -Utility class based on ClockCycleCounter to measure the unit time of a -repeated operation. - ---- Legal stuff --- - -This library is free software; you can redistribute it and/or -modify it under the terms of the GNU Lesser General Public -License as published by the Free Software Foundation; either -version 2.1 of the License, or (at your option) any later version. - -This library is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -Lesser General Public License for more details. - -You should have received a copy of the GNU Lesser General Public -License along with this library; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - -*Tab=3***********************************************************************/ - - - -#if ! defined (stopwatch_StopWatch_HEADER_INCLUDED) -#define stopwatch_StopWatch_HEADER_INCLUDED - -#if defined (_MSC_VER) - #pragma once - #pragma warning (4 : 4250) // "Inherits via dominance." -#endif - - - -/*\\\ INCLUDE FILES \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\*/ - -#include "ClockCycleCounter.h" - - - -namespace stopwatch -{ - - - -class StopWatch -{ - -/*\\\ PUBLIC \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\*/ - -public: - - StopWatch (); - - stopwatch_FORCEINLINE void - start (); - stopwatch_FORCEINLINE void - stop_lap (); - - double get_time_total (Int64 nbr_op) const; - double get_time_best_lap (Int64 nbr_op) const; - - - -/*\\\ PROTECTED \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\*/ - -protected: - - - -/*\\\ PRIVATE \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\*/ - -private: - - ClockCycleCounter - _ccc; - Int64 _nbr_laps; - - - -/*\\\ FORBIDDEN MEMBER FUNCTIONS \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\*/ - -private: - - StopWatch (const StopWatch &other); - StopWatch & operator = (const StopWatch &other); - bool operator == (const StopWatch &other); - bool operator != (const StopWatch &other); - -}; // class StopWatch - - - -} // namespace stopwatch - - - -#include "StopWatch.hpp" - - - -#endif // stopwatch_StopWatch_HEADER_INCLUDED - - - -/*\\\ EOF \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\*/ diff --git a/examples/datavis3d/spectrum/3rdparty/fftreal/stopwatch/StopWatch.hpp b/examples/datavis3d/spectrum/3rdparty/fftreal/stopwatch/StopWatch.hpp deleted file mode 100644 index 74482a7a..00000000 --- a/examples/datavis3d/spectrum/3rdparty/fftreal/stopwatch/StopWatch.hpp +++ /dev/null @@ -1,83 +0,0 @@ -/***************************************************************************** - - StopWatch.hpp - Copyright (c) 2005 Laurent de Soras - ---- Legal stuff --- - -This library is free software; you can redistribute it and/or -modify it under the terms of the GNU Lesser General Public -License as published by the Free Software Foundation; either -version 2.1 of the License, or (at your option) any later version. - -This library is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -Lesser General Public License for more details. - -You should have received a copy of the GNU Lesser General Public -License along with this library; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - -*Tab=3***********************************************************************/ - - - -#if defined (stopwatch_StopWatch_CURRENT_CODEHEADER) - #error Recursive inclusion of StopWatch code header. -#endif -#define stopwatch_StopWatch_CURRENT_CODEHEADER - -#if ! defined (stopwatch_StopWatch_CODEHEADER_INCLUDED) -#define stopwatch_StopWatch_CODEHEADER_INCLUDED - - - -/*\\\ INCLUDE FILES \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\*/ - - - -namespace stopwatch -{ - - - -/*\\\ PUBLIC \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\*/ - - - -void StopWatch::start () -{ - _nbr_laps = 0; - _ccc.start (); -} - - - -void StopWatch::stop_lap () -{ - _ccc.stop_lap (); - ++ _nbr_laps; -} - - - -/*\\\ PROTECTED \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\*/ - - - -/*\\\ PRIVATE \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\*/ - - - -} // namespace stopwatch - - - -#endif // stopwatch_StopWatch_CODEHEADER_INCLUDED - -#undef stopwatch_StopWatch_CURRENT_CODEHEADER - - - -/*\\\ EOF \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\*/ diff --git a/examples/datavis3d/spectrum/3rdparty/fftreal/stopwatch/def.h b/examples/datavis3d/spectrum/3rdparty/fftreal/stopwatch/def.h deleted file mode 100644 index 81ee6aaa..00000000 --- a/examples/datavis3d/spectrum/3rdparty/fftreal/stopwatch/def.h +++ /dev/null @@ -1,65 +0,0 @@ -/***************************************************************************** - - def.h - Copyright (c) 2003 Laurent de Soras - ---- Legal stuff --- - -This library is free software; you can redistribute it and/or -modify it under the terms of the GNU Lesser General Public -License as published by the Free Software Foundation; either -version 2.1 of the License, or (at your option) any later version. - -This library is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -Lesser General Public License for more details. - -You should have received a copy of the GNU Lesser General Public -License along with this library; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - -*Tab=3***********************************************************************/ - - - -#if ! defined (stopwatch_def_HEADER_INCLUDED) -#define stopwatch_def_HEADER_INCLUDED - -#if defined (_MSC_VER) - #pragma once - #pragma warning (4 : 4250) // "Inherits via dominance." -#endif - - - -/*\\\ INCLUDE FILES \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\*/ - - - -namespace stopwatch -{ - - - -#if defined (_MSC_VER) - - #define stopwatch_FORCEINLINE __forceinline - -#else - - #define stopwatch_FORCEINLINE inline - -#endif - - - -} // namespace stopwatch - - - -#endif // stopwatch_def_HEADER_INCLUDED - - - -/*\\\ EOF \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\*/ diff --git a/examples/datavis3d/spectrum/3rdparty/fftreal/stopwatch/fnc.h b/examples/datavis3d/spectrum/3rdparty/fftreal/stopwatch/fnc.h deleted file mode 100644 index 05545354..00000000 --- a/examples/datavis3d/spectrum/3rdparty/fftreal/stopwatch/fnc.h +++ /dev/null @@ -1,67 +0,0 @@ -/***************************************************************************** - - fnc.h - Copyright (c) 2003 Laurent de Soras - ---- Legal stuff --- - -This library is free software; you can redistribute it and/or -modify it under the terms of the GNU Lesser General Public -License as published by the Free Software Foundation; either -version 2.1 of the License, or (at your option) any later version. - -This library is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -Lesser General Public License for more details. - -You should have received a copy of the GNU Lesser General Public -License along with this library; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - -*Tab=3***********************************************************************/ - - - -#if ! defined (stopwatch_fnc_HEADER_INCLUDED) -#define stopwatch_fnc_HEADER_INCLUDED - -#if defined (_MSC_VER) - #pragma once - #pragma warning (4 : 4250) // "Inherits via dominance." -#endif - - - -/*\\\ INCLUDE FILES \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\*/ - - - -namespace stopwatch -{ - - - -template <typename T> -inline T min (T a, T b); - -template <typename T> -inline T max (T a, T b); - -inline int round_int (double x); - - - -} // namespace rsp - - - -#include "fnc.hpp" - - - -#endif // stopwatch_fnc_HEADER_INCLUDED - - - -/*\\\ EOF \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\*/ diff --git a/examples/datavis3d/spectrum/3rdparty/fftreal/stopwatch/fnc.hpp b/examples/datavis3d/spectrum/3rdparty/fftreal/stopwatch/fnc.hpp deleted file mode 100644 index 0ab5949e..00000000 --- a/examples/datavis3d/spectrum/3rdparty/fftreal/stopwatch/fnc.hpp +++ /dev/null @@ -1,85 +0,0 @@ -/***************************************************************************** - - fnc.hpp - Copyright (c) 2003 Laurent de Soras - ---- Legal stuff --- - -This library is free software; you can redistribute it and/or -modify it under the terms of the GNU Lesser General Public -License as published by the Free Software Foundation; either -version 2.1 of the License, or (at your option) any later version. - -This library is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -Lesser General Public License for more details. - -You should have received a copy of the GNU Lesser General Public -License along with this library; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - -*Tab=3***********************************************************************/ - - - -#if defined (stopwatch_fnc_CURRENT_CODEHEADER) - #error Recursive inclusion of fnc code header. -#endif -#define stopwatch_fnc_CURRENT_CODEHEADER - -#if ! defined (stopwatch_fnc_CODEHEADER_INCLUDED) -#define stopwatch_fnc_CODEHEADER_INCLUDED - - - -/*\\\ INCLUDE FILES \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\*/ - -#include <cassert> -#include <cmath> - -namespace std {} - - - -namespace stopwatch -{ - - - -template <typename T> -inline T min (T a, T b) -{ - return ((a < b) ? a : b); -} - - - -template <typename T> -inline T max (T a, T b) -{ - return ((b < a) ? a : b); -} - - - -int round_int (double x) -{ - using namespace std; - - return (static_cast <int> (floor (x + 0.5))); -} - - - -} // namespace stopwatch - - - -#endif // stopwatch_fnc_CODEHEADER_INCLUDED - -#undef stopwatch_fnc_CURRENT_CODEHEADER - - - -/*\\\ EOF \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\*/ diff --git a/examples/examples.pro b/examples/examples.pro index b9b7be46..1590d127 100644 --- a/examples/examples.pro +++ b/examples/examples.pro @@ -1,2 +1,6 @@ TEMPLATE = subdirs -SUBDIRS += datavis3d +SUBDIRS += barchart \ + rainfall \ + spectrum \ + widget \ + mapdata
\ No newline at end of file diff --git a/examples/datavis3d/mapdata/main.cpp b/examples/mapdata/main.cpp index 34d9bec6..34d9bec6 100644 --- a/examples/datavis3d/mapdata/main.cpp +++ b/examples/mapdata/main.cpp diff --git a/examples/datavis3d/mapdata/mapdata.cpp b/examples/mapdata/mapdata.cpp index fe1ffdcf..fe1ffdcf 100644 --- a/examples/datavis3d/mapdata/mapdata.cpp +++ b/examples/mapdata/mapdata.cpp diff --git a/examples/datavis3d/mapdata/mapdata.h b/examples/mapdata/mapdata.h index 00ba8e68..00ba8e68 100644 --- a/examples/datavis3d/mapdata/mapdata.h +++ b/examples/mapdata/mapdata.h diff --git a/examples/datavis3d/mapdata/mapdata.pro b/examples/mapdata/mapdata.pro index 848b2fb5..848b2fb5 100644 --- a/examples/datavis3d/mapdata/mapdata.pro +++ b/examples/mapdata/mapdata.pro diff --git a/examples/datavis3d/mapdata/mapdata.qrc b/examples/mapdata/mapdata.qrc index 9ae43a92..9ae43a92 100644 --- a/examples/datavis3d/mapdata/mapdata.qrc +++ b/examples/mapdata/mapdata.qrc diff --git a/examples/datavis3d/mapdata/suomi.jpg b/examples/mapdata/suomi.jpg Binary files differindex 8d63914f..8d63914f 100644 --- a/examples/datavis3d/mapdata/suomi.jpg +++ b/examples/mapdata/suomi.jpg diff --git a/examples/datavis3d/mapdata/suomi2.jpg b/examples/mapdata/suomi2.jpg Binary files differindex b6c48e76..b6c48e76 100644 --- a/examples/datavis3d/mapdata/suomi2.jpg +++ b/examples/mapdata/suomi2.jpg diff --git a/examples/datavis3d/mapdata/weirdthing.obj b/examples/mapdata/weirdthing.obj index 46c9e789..46c9e789 100644 --- a/examples/datavis3d/mapdata/weirdthing.obj +++ b/examples/mapdata/weirdthing.obj diff --git a/examples/datavis3d/rainfall/main.cpp b/examples/rainfall/main.cpp index 44d9d172..44d9d172 100644 --- a/examples/datavis3d/rainfall/main.cpp +++ b/examples/rainfall/main.cpp diff --git a/examples/datavis3d/rainfall/rainfall.pro b/examples/rainfall/rainfall.pro index b48c1b7c..b48c1b7c 100644 --- a/examples/datavis3d/rainfall/rainfall.pro +++ b/examples/rainfall/rainfall.pro diff --git a/examples/datavis3d/spectrum/3rdparty/fftreal/Array.h b/examples/spectrum/3rdparty/fftreal/Array.h index a08e3cf2..a08e3cf2 100644 --- a/examples/datavis3d/spectrum/3rdparty/fftreal/Array.h +++ b/examples/spectrum/3rdparty/fftreal/Array.h diff --git a/examples/datavis3d/spectrum/3rdparty/fftreal/Array.hpp b/examples/spectrum/3rdparty/fftreal/Array.hpp index 8300077e..8300077e 100644 --- a/examples/datavis3d/spectrum/3rdparty/fftreal/Array.hpp +++ b/examples/spectrum/3rdparty/fftreal/Array.hpp diff --git a/examples/datavis3d/spectrum/3rdparty/fftreal/DynArray.h b/examples/spectrum/3rdparty/fftreal/DynArray.h index 8041a0c1..8041a0c1 100644 --- a/examples/datavis3d/spectrum/3rdparty/fftreal/DynArray.h +++ b/examples/spectrum/3rdparty/fftreal/DynArray.h diff --git a/examples/datavis3d/spectrum/3rdparty/fftreal/DynArray.hpp b/examples/spectrum/3rdparty/fftreal/DynArray.hpp index e62b10f8..e62b10f8 100644 --- a/examples/datavis3d/spectrum/3rdparty/fftreal/DynArray.hpp +++ b/examples/spectrum/3rdparty/fftreal/DynArray.hpp diff --git a/examples/datavis3d/spectrum/3rdparty/fftreal/FFTReal.dsp b/examples/spectrum/3rdparty/fftreal/FFTReal.dsp index fe970db0..fe970db0 100644 --- a/examples/datavis3d/spectrum/3rdparty/fftreal/FFTReal.dsp +++ b/examples/spectrum/3rdparty/fftreal/FFTReal.dsp diff --git a/examples/datavis3d/spectrum/3rdparty/fftreal/FFTReal.dsw b/examples/spectrum/3rdparty/fftreal/FFTReal.dsw index 076b0aeb..076b0aeb 100644 --- a/examples/datavis3d/spectrum/3rdparty/fftreal/FFTReal.dsw +++ b/examples/spectrum/3rdparty/fftreal/FFTReal.dsw diff --git a/examples/datavis3d/spectrum/3rdparty/fftreal/FFTReal.h b/examples/spectrum/3rdparty/fftreal/FFTReal.h index 9fb27250..9fb27250 100644 --- a/examples/datavis3d/spectrum/3rdparty/fftreal/FFTReal.h +++ b/examples/spectrum/3rdparty/fftreal/FFTReal.h diff --git a/examples/datavis3d/spectrum/3rdparty/fftreal/FFTReal.hpp b/examples/spectrum/3rdparty/fftreal/FFTReal.hpp index 335d771d..335d771d 100644 --- a/examples/datavis3d/spectrum/3rdparty/fftreal/FFTReal.hpp +++ b/examples/spectrum/3rdparty/fftreal/FFTReal.hpp diff --git a/examples/datavis3d/spectrum/3rdparty/fftreal/FFTRealFixLen.h b/examples/spectrum/3rdparty/fftreal/FFTRealFixLen.h index 0b802668..0b802668 100644 --- a/examples/datavis3d/spectrum/3rdparty/fftreal/FFTRealFixLen.h +++ b/examples/spectrum/3rdparty/fftreal/FFTRealFixLen.h diff --git a/examples/datavis3d/spectrum/3rdparty/fftreal/FFTRealFixLen.hpp b/examples/spectrum/3rdparty/fftreal/FFTRealFixLen.hpp index 6defb009..6defb009 100644 --- a/examples/datavis3d/spectrum/3rdparty/fftreal/FFTRealFixLen.hpp +++ b/examples/spectrum/3rdparty/fftreal/FFTRealFixLen.hpp diff --git a/examples/datavis3d/spectrum/3rdparty/fftreal/FFTRealFixLenParam.h b/examples/spectrum/3rdparty/fftreal/FFTRealFixLenParam.h index 163c0832..163c0832 100644 --- a/examples/datavis3d/spectrum/3rdparty/fftreal/FFTRealFixLenParam.h +++ b/examples/spectrum/3rdparty/fftreal/FFTRealFixLenParam.h diff --git a/examples/datavis3d/spectrum/3rdparty/fftreal/FFTRealPassDirect.h b/examples/spectrum/3rdparty/fftreal/FFTRealPassDirect.h index 7d19c02e..7d19c02e 100644 --- a/examples/datavis3d/spectrum/3rdparty/fftreal/FFTRealPassDirect.h +++ b/examples/spectrum/3rdparty/fftreal/FFTRealPassDirect.h diff --git a/examples/datavis3d/spectrum/3rdparty/fftreal/FFTRealPassDirect.hpp b/examples/spectrum/3rdparty/fftreal/FFTRealPassDirect.hpp index db9d568e..db9d568e 100644 --- a/examples/datavis3d/spectrum/3rdparty/fftreal/FFTRealPassDirect.hpp +++ b/examples/spectrum/3rdparty/fftreal/FFTRealPassDirect.hpp diff --git a/examples/datavis3d/spectrum/3rdparty/fftreal/FFTRealPassInverse.h b/examples/spectrum/3rdparty/fftreal/FFTRealPassInverse.h index 2de89527..2de89527 100644 --- a/examples/datavis3d/spectrum/3rdparty/fftreal/FFTRealPassInverse.h +++ b/examples/spectrum/3rdparty/fftreal/FFTRealPassInverse.h diff --git a/examples/datavis3d/spectrum/3rdparty/fftreal/FFTRealPassInverse.hpp b/examples/spectrum/3rdparty/fftreal/FFTRealPassInverse.hpp index 57375469..57375469 100644 --- a/examples/datavis3d/spectrum/3rdparty/fftreal/FFTRealPassInverse.hpp +++ b/examples/spectrum/3rdparty/fftreal/FFTRealPassInverse.hpp diff --git a/examples/datavis3d/spectrum/3rdparty/fftreal/FFTRealSelect.h b/examples/spectrum/3rdparty/fftreal/FFTRealSelect.h index bd722d4d..bd722d4d 100644 --- a/examples/datavis3d/spectrum/3rdparty/fftreal/FFTRealSelect.h +++ b/examples/spectrum/3rdparty/fftreal/FFTRealSelect.h diff --git a/examples/datavis3d/spectrum/3rdparty/fftreal/FFTRealSelect.hpp b/examples/spectrum/3rdparty/fftreal/FFTRealSelect.hpp index 9ddf5864..9ddf5864 100644 --- a/examples/datavis3d/spectrum/3rdparty/fftreal/FFTRealSelect.hpp +++ b/examples/spectrum/3rdparty/fftreal/FFTRealSelect.hpp diff --git a/examples/datavis3d/spectrum/3rdparty/fftreal/FFTRealUseTrigo.h b/examples/spectrum/3rdparty/fftreal/FFTRealUseTrigo.h index c4368ee0..c4368ee0 100644 --- a/examples/datavis3d/spectrum/3rdparty/fftreal/FFTRealUseTrigo.h +++ b/examples/spectrum/3rdparty/fftreal/FFTRealUseTrigo.h diff --git a/examples/datavis3d/spectrum/3rdparty/fftreal/FFTRealUseTrigo.hpp b/examples/spectrum/3rdparty/fftreal/FFTRealUseTrigo.hpp index aa968b81..aa968b81 100644 --- a/examples/datavis3d/spectrum/3rdparty/fftreal/FFTRealUseTrigo.hpp +++ b/examples/spectrum/3rdparty/fftreal/FFTRealUseTrigo.hpp diff --git a/examples/datavis3d/spectrum/3rdparty/fftreal/OscSinCos.h b/examples/spectrum/3rdparty/fftreal/OscSinCos.h index 775fc14f..775fc14f 100644 --- a/examples/datavis3d/spectrum/3rdparty/fftreal/OscSinCos.h +++ b/examples/spectrum/3rdparty/fftreal/OscSinCos.h diff --git a/examples/datavis3d/spectrum/3rdparty/fftreal/OscSinCos.hpp b/examples/spectrum/3rdparty/fftreal/OscSinCos.hpp index 749aef04..749aef04 100644 --- a/examples/datavis3d/spectrum/3rdparty/fftreal/OscSinCos.hpp +++ b/examples/spectrum/3rdparty/fftreal/OscSinCos.hpp diff --git a/examples/datavis3d/spectrum/3rdparty/fftreal/TestAccuracy.h b/examples/spectrum/3rdparty/fftreal/TestAccuracy.h index 4b07a6b6..4b07a6b6 100644 --- a/examples/datavis3d/spectrum/3rdparty/fftreal/TestAccuracy.h +++ b/examples/spectrum/3rdparty/fftreal/TestAccuracy.h diff --git a/examples/datavis3d/spectrum/3rdparty/fftreal/TestAccuracy.hpp b/examples/spectrum/3rdparty/fftreal/TestAccuracy.hpp index 5c794f74..5c794f74 100644 --- a/examples/datavis3d/spectrum/3rdparty/fftreal/TestAccuracy.hpp +++ b/examples/spectrum/3rdparty/fftreal/TestAccuracy.hpp diff --git a/examples/datavis3d/spectrum/3rdparty/fftreal/TestHelperFixLen.h b/examples/spectrum/3rdparty/fftreal/TestHelperFixLen.h index ecff96d3..ecff96d3 100644 --- a/examples/datavis3d/spectrum/3rdparty/fftreal/TestHelperFixLen.h +++ b/examples/spectrum/3rdparty/fftreal/TestHelperFixLen.h diff --git a/examples/datavis3d/spectrum/3rdparty/fftreal/TestHelperFixLen.hpp b/examples/spectrum/3rdparty/fftreal/TestHelperFixLen.hpp index 25048b91..25048b91 100644 --- a/examples/datavis3d/spectrum/3rdparty/fftreal/TestHelperFixLen.hpp +++ b/examples/spectrum/3rdparty/fftreal/TestHelperFixLen.hpp diff --git a/examples/datavis3d/spectrum/3rdparty/fftreal/TestHelperNormal.h b/examples/spectrum/3rdparty/fftreal/TestHelperNormal.h index a7bff5c2..a7bff5c2 100644 --- a/examples/datavis3d/spectrum/3rdparty/fftreal/TestHelperNormal.h +++ b/examples/spectrum/3rdparty/fftreal/TestHelperNormal.h diff --git a/examples/datavis3d/spectrum/3rdparty/fftreal/TestHelperNormal.hpp b/examples/spectrum/3rdparty/fftreal/TestHelperNormal.hpp index e037696a..e037696a 100644 --- a/examples/datavis3d/spectrum/3rdparty/fftreal/TestHelperNormal.hpp +++ b/examples/spectrum/3rdparty/fftreal/TestHelperNormal.hpp diff --git a/examples/datavis3d/spectrum/3rdparty/fftreal/TestSpeed.h b/examples/spectrum/3rdparty/fftreal/TestSpeed.h index 22957818..22957818 100644 --- a/examples/datavis3d/spectrum/3rdparty/fftreal/TestSpeed.h +++ b/examples/spectrum/3rdparty/fftreal/TestSpeed.h diff --git a/examples/datavis3d/spectrum/3rdparty/fftreal/TestSpeed.hpp b/examples/spectrum/3rdparty/fftreal/TestSpeed.hpp index e716b2a7..e716b2a7 100644 --- a/examples/datavis3d/spectrum/3rdparty/fftreal/TestSpeed.hpp +++ b/examples/spectrum/3rdparty/fftreal/TestSpeed.hpp diff --git a/examples/datavis3d/spectrum/3rdparty/fftreal/TestWhiteNoiseGen.h b/examples/spectrum/3rdparty/fftreal/TestWhiteNoiseGen.h index d815f8e3..d815f8e3 100644 --- a/examples/datavis3d/spectrum/3rdparty/fftreal/TestWhiteNoiseGen.h +++ b/examples/spectrum/3rdparty/fftreal/TestWhiteNoiseGen.h diff --git a/examples/datavis3d/spectrum/3rdparty/fftreal/TestWhiteNoiseGen.hpp b/examples/spectrum/3rdparty/fftreal/TestWhiteNoiseGen.hpp index 13b7eb3e..13b7eb3e 100644 --- a/examples/datavis3d/spectrum/3rdparty/fftreal/TestWhiteNoiseGen.hpp +++ b/examples/spectrum/3rdparty/fftreal/TestWhiteNoiseGen.hpp diff --git a/examples/datavis3d/spectrum/3rdparty/fftreal/def.h b/examples/spectrum/3rdparty/fftreal/def.h index 99c545f5..99c545f5 100644 --- a/examples/datavis3d/spectrum/3rdparty/fftreal/def.h +++ b/examples/spectrum/3rdparty/fftreal/def.h diff --git a/examples/datavis3d/spectrum/3rdparty/fftreal/fftreal.pas b/examples/spectrum/3rdparty/fftreal/fftreal.pas index ea637545..ea637545 100644 --- a/examples/datavis3d/spectrum/3rdparty/fftreal/fftreal.pas +++ b/examples/spectrum/3rdparty/fftreal/fftreal.pas diff --git a/examples/datavis3d/spectrum/3rdparty/fftreal/fftreal.pro b/examples/spectrum/3rdparty/fftreal/fftreal.pro index f6abeeb1..f6abeeb1 100644 --- a/examples/datavis3d/spectrum/3rdparty/fftreal/fftreal.pro +++ b/examples/spectrum/3rdparty/fftreal/fftreal.pro diff --git a/examples/datavis3d/spectrum/3rdparty/fftreal/fftreal_wrapper.cpp b/examples/spectrum/3rdparty/fftreal/fftreal_wrapper.cpp index 45aee653..45aee653 100644 --- a/examples/datavis3d/spectrum/3rdparty/fftreal/fftreal_wrapper.cpp +++ b/examples/spectrum/3rdparty/fftreal/fftreal_wrapper.cpp diff --git a/examples/datavis3d/spectrum/3rdparty/fftreal/fftreal_wrapper.h b/examples/spectrum/3rdparty/fftreal/fftreal_wrapper.h index 2fb602de..2fb602de 100644 --- a/examples/datavis3d/spectrum/3rdparty/fftreal/fftreal_wrapper.h +++ b/examples/spectrum/3rdparty/fftreal/fftreal_wrapper.h diff --git a/examples/datavis3d/spectrum/3rdparty/fftreal/license.txt b/examples/spectrum/3rdparty/fftreal/license.txt index 918fe68e..918fe68e 100644 --- a/examples/datavis3d/spectrum/3rdparty/fftreal/license.txt +++ b/examples/spectrum/3rdparty/fftreal/license.txt diff --git a/examples/datavis3d/spectrum/3rdparty/fftreal/readme.txt b/examples/spectrum/3rdparty/fftreal/readme.txt index 0c5ce162..0c5ce162 100644 --- a/examples/datavis3d/spectrum/3rdparty/fftreal/readme.txt +++ b/examples/spectrum/3rdparty/fftreal/readme.txt diff --git a/examples/datavis3d/spectrum/3rdparty/fftreal/test.cpp b/examples/spectrum/3rdparty/fftreal/test.cpp index 7b6ed2ca..7b6ed2ca 100644 --- a/examples/datavis3d/spectrum/3rdparty/fftreal/test.cpp +++ b/examples/spectrum/3rdparty/fftreal/test.cpp diff --git a/examples/datavis3d/spectrum/3rdparty/fftreal/test_fnc.h b/examples/spectrum/3rdparty/fftreal/test_fnc.h index 26221566..26221566 100644 --- a/examples/datavis3d/spectrum/3rdparty/fftreal/test_fnc.h +++ b/examples/spectrum/3rdparty/fftreal/test_fnc.h diff --git a/examples/datavis3d/spectrum/3rdparty/fftreal/test_fnc.hpp b/examples/spectrum/3rdparty/fftreal/test_fnc.hpp index 4b5f9f59..4b5f9f59 100644 --- a/examples/datavis3d/spectrum/3rdparty/fftreal/test_fnc.hpp +++ b/examples/spectrum/3rdparty/fftreal/test_fnc.hpp diff --git a/examples/datavis3d/spectrum/3rdparty/fftreal/test_settings.h b/examples/spectrum/3rdparty/fftreal/test_settings.h index b893afc8..b893afc8 100644 --- a/examples/datavis3d/spectrum/3rdparty/fftreal/test_settings.h +++ b/examples/spectrum/3rdparty/fftreal/test_settings.h diff --git a/examples/datavis3d/spectrum/3rdparty/fftreal/testapp.dpr b/examples/spectrum/3rdparty/fftreal/testapp.dpr index 54f2eb99..54f2eb99 100644 --- a/examples/datavis3d/spectrum/3rdparty/fftreal/testapp.dpr +++ b/examples/spectrum/3rdparty/fftreal/testapp.dpr diff --git a/examples/datavis3d/spectrum/README.txt b/examples/spectrum/README.txt index c39d4a70..c39d4a70 100644 --- a/examples/datavis3d/spectrum/README.txt +++ b/examples/spectrum/README.txt diff --git a/examples/datavis3d/spectrum/spectrum.pri b/examples/spectrum/spectrum.pri index 31a3767c..31a3767c 100644 --- a/examples/datavis3d/spectrum/spectrum.pri +++ b/examples/spectrum/spectrum.pri diff --git a/examples/datavis3d/spectrum/spectrum.pro b/examples/spectrum/spectrum.pro index 9a8d45ae..9a8d45ae 100644 --- a/examples/datavis3d/spectrum/spectrum.pro +++ b/examples/spectrum/spectrum.pro diff --git a/examples/datavis3d/spectrum/spectrumapp/engine.cpp b/examples/spectrum/spectrumapp/engine.cpp index 7016af4a..7016af4a 100644 --- a/examples/datavis3d/spectrum/spectrumapp/engine.cpp +++ b/examples/spectrum/spectrumapp/engine.cpp diff --git a/examples/datavis3d/spectrum/spectrumapp/engine.h b/examples/spectrum/spectrumapp/engine.h index 3d04e13b..3d04e13b 100644 --- a/examples/datavis3d/spectrum/spectrumapp/engine.h +++ b/examples/spectrum/spectrumapp/engine.h diff --git a/examples/datavis3d/spectrum/spectrumapp/frequencyspectrum.cpp b/examples/spectrum/spectrumapp/frequencyspectrum.cpp index f4a4167b..f4a4167b 100644 --- a/examples/datavis3d/spectrum/spectrumapp/frequencyspectrum.cpp +++ b/examples/spectrum/spectrumapp/frequencyspectrum.cpp diff --git a/examples/datavis3d/spectrum/spectrumapp/frequencyspectrum.h b/examples/spectrum/spectrumapp/frequencyspectrum.h index e7ea2e53..e7ea2e53 100644 --- a/examples/datavis3d/spectrum/spectrumapp/frequencyspectrum.h +++ b/examples/spectrum/spectrumapp/frequencyspectrum.h diff --git a/examples/datavis3d/spectrum/spectrumapp/main.cpp b/examples/spectrum/spectrumapp/main.cpp index 75d4997d..75d4997d 100644 --- a/examples/datavis3d/spectrum/spectrumapp/main.cpp +++ b/examples/spectrum/spectrumapp/main.cpp diff --git a/examples/datavis3d/spectrum/spectrumapp/soundFiles/Rockhop.wav b/examples/spectrum/spectrumapp/soundFiles/Rockhop.wav Binary files differindex e56e1c0f..e56e1c0f 100644 --- a/examples/datavis3d/spectrum/spectrumapp/soundFiles/Rockhop.wav +++ b/examples/spectrum/spectrumapp/soundFiles/Rockhop.wav diff --git a/examples/datavis3d/spectrum/spectrumapp/soundFiles/futurebells_beat.wav b/examples/spectrum/spectrumapp/soundFiles/futurebells_beat.wav Binary files differindex c45cbc71..c45cbc71 100644 --- a/examples/datavis3d/spectrum/spectrumapp/soundFiles/futurebells_beat.wav +++ b/examples/spectrum/spectrumapp/soundFiles/futurebells_beat.wav diff --git a/examples/datavis3d/spectrum/spectrumapp/soundFiles/onclassical_demo_fiati-di-parma_thuille_terzo-tempo_sestetto_small-version.wav b/examples/spectrum/spectrumapp/soundFiles/onclassical_demo_fiati-di-parma_thuille_terzo-tempo_sestetto_small-version.wav Binary files differindex 78b8dbda..78b8dbda 100644 --- a/examples/datavis3d/spectrum/spectrumapp/soundFiles/onclassical_demo_fiati-di-parma_thuille_terzo-tempo_sestetto_small-version.wav +++ b/examples/spectrum/spectrumapp/soundFiles/onclassical_demo_fiati-di-parma_thuille_terzo-tempo_sestetto_small-version.wav diff --git a/examples/datavis3d/spectrum/spectrumapp/spectrum.h b/examples/spectrum/spectrumapp/spectrum.h index 244a5892..244a5892 100644 --- a/examples/datavis3d/spectrum/spectrumapp/spectrum.h +++ b/examples/spectrum/spectrumapp/spectrum.h diff --git a/examples/datavis3d/spectrum/spectrumapp/spectrum.qrc b/examples/spectrum/spectrumapp/spectrum.qrc index 9368abc7..9368abc7 100644 --- a/examples/datavis3d/spectrum/spectrumapp/spectrum.qrc +++ b/examples/spectrum/spectrumapp/spectrum.qrc diff --git a/examples/datavis3d/spectrum/spectrumapp/spectrumanalyser.cpp b/examples/spectrum/spectrumapp/spectrumanalyser.cpp index 518bb6da..518bb6da 100644 --- a/examples/datavis3d/spectrum/spectrumapp/spectrumanalyser.cpp +++ b/examples/spectrum/spectrumapp/spectrumanalyser.cpp diff --git a/examples/datavis3d/spectrum/spectrumapp/spectrumanalyser.h b/examples/spectrum/spectrumapp/spectrumanalyser.h index 50d4fb66..50d4fb66 100644 --- a/examples/datavis3d/spectrum/spectrumapp/spectrumanalyser.h +++ b/examples/spectrum/spectrumapp/spectrumanalyser.h diff --git a/examples/datavis3d/spectrum/spectrumapp/spectrumapp.pro b/examples/spectrum/spectrumapp/spectrumapp.pro index 7240c060..7240c060 100644 --- a/examples/datavis3d/spectrum/spectrumapp/spectrumapp.pro +++ b/examples/spectrum/spectrumapp/spectrumapp.pro diff --git a/examples/datavis3d/spectrum/spectrumapp/utils.cpp b/examples/spectrum/spectrumapp/utils.cpp index 723dd6f6..723dd6f6 100644 --- a/examples/datavis3d/spectrum/spectrumapp/utils.cpp +++ b/examples/spectrum/spectrumapp/utils.cpp diff --git a/examples/datavis3d/spectrum/spectrumapp/utils.h b/examples/spectrum/spectrumapp/utils.h index 62215db5..62215db5 100644 --- a/examples/datavis3d/spectrum/spectrumapp/utils.h +++ b/examples/spectrum/spectrumapp/utils.h diff --git a/examples/datavis3d/spectrum/spectrumapp/wavfile.cpp b/examples/spectrum/spectrumapp/wavfile.cpp index 0fe8833d..0fe8833d 100644 --- a/examples/datavis3d/spectrum/spectrumapp/wavfile.cpp +++ b/examples/spectrum/spectrumapp/wavfile.cpp diff --git a/examples/datavis3d/spectrum/spectrumapp/wavfile.h b/examples/spectrum/spectrumapp/wavfile.h index a9bca7e1..a9bca7e1 100644 --- a/examples/datavis3d/spectrum/spectrumapp/wavfile.h +++ b/examples/spectrum/spectrumapp/wavfile.h diff --git a/examples/datavis3d/widget/chart.cpp b/examples/widget/chart.cpp index 012e287d..012e287d 100644 --- a/examples/datavis3d/widget/chart.cpp +++ b/examples/widget/chart.cpp diff --git a/examples/datavis3d/widget/chart.h b/examples/widget/chart.h index 87ee93ac..87ee93ac 100644 --- a/examples/datavis3d/widget/chart.h +++ b/examples/widget/chart.h diff --git a/examples/datavis3d/widget/main.cpp b/examples/widget/main.cpp index 286a2d33..286a2d33 100644 --- a/examples/datavis3d/widget/main.cpp +++ b/examples/widget/main.cpp diff --git a/examples/datavis3d/widget/widget.pro b/examples/widget/widget.pro index ceff6f17..ceff6f17 100644 --- a/examples/datavis3d/widget/widget.pro +++ b/examples/widget/widget.pro diff --git a/src/datavis3d/Doxyfile b/src/Doxyfile index e5d78895..e5d78895 100644 --- a/src/datavis3d/Doxyfile +++ b/src/Doxyfile diff --git a/src/datavis3d/Mainpage.dox b/src/Mainpage.dox index 973bc46f..973bc46f 100644 --- a/src/datavis3d/Mainpage.dox +++ b/src/Mainpage.dox diff --git a/src/datavis3d/common.pri b/src/common.pri index 8532fc77..8532fc77 100644 --- a/src/datavis3d/common.pri +++ b/src/common.pri diff --git a/src/datavis3d/datavis3d.pro b/src/datavis3d/datavis3d.pro deleted file mode 100644 index b4169c4e..00000000 --- a/src/datavis3d/datavis3d.pro +++ /dev/null @@ -1,22 +0,0 @@ -TARGET = QtDataVis3D -QT = core gui opengl #qml - -DEFINES += QTCOMMERCIALDATAVIS3D_LIBRARY - -QMAKE_DOCS = $$PWD/doc/qtdatavis3d.qdocconf - -load(qt_module) - -include($$PWD/common.pri) -include($$PWD/engine/engine.pri) -include($$PWD/global/global.pri) -include($$PWD/utils/utils.pri) - -wince* { - # The Microsoft MIPS compiler crashes if /Og is specified. - # -O2/1 expands to /Og plus additional arguments. - contains(DEFINES, MIPS) { - QMAKE_CXXFLAGS_RELEASE ~= s/-O2/-Oi -Ot -Oy -Ob2/ - QMAKE_CXXFLAGS_RELEASE ~= s/-O1/-Os -Oy -Ob2/ - } -} diff --git a/src/datavis3d/doc/qtdatavis3d.qdocconf b/src/doc/qtdatavis3d.qdocconf index c2c084b3..c2c084b3 100644 --- a/src/datavis3d/doc/qtdatavis3d.qdocconf +++ b/src/doc/qtdatavis3d.qdocconf diff --git a/src/datavis3d/documentationGroups.dox b/src/documentationGroups.dox index ed9c3f1c..ed9c3f1c 100644 --- a/src/datavis3d/documentationGroups.dox +++ b/src/documentationGroups.dox diff --git a/src/datavis3d/engine/drawer.cpp b/src/engine/drawer.cpp index 722a54b8..722a54b8 100644 --- a/src/datavis3d/engine/drawer.cpp +++ b/src/engine/drawer.cpp diff --git a/src/datavis3d/engine/drawer_p.h b/src/engine/drawer_p.h index 3b6a2c49..3b6a2c49 100644 --- a/src/datavis3d/engine/drawer_p.h +++ b/src/engine/drawer_p.h diff --git a/src/datavis3d/engine/engine.pri b/src/engine/engine.pri index ba063186..ba063186 100644 --- a/src/datavis3d/engine/engine.pri +++ b/src/engine/engine.pri diff --git a/src/datavis3d/engine/engine.qrc b/src/engine/engine.qrc index ca260915..ca260915 100644 --- a/src/datavis3d/engine/engine.qrc +++ b/src/engine/engine.qrc diff --git a/src/datavis3d/engine/labelitem.cpp b/src/engine/labelitem.cpp index 6ce0663c..6ce0663c 100644 --- a/src/datavis3d/engine/labelitem.cpp +++ b/src/engine/labelitem.cpp diff --git a/src/datavis3d/engine/labelitem_p.h b/src/engine/labelitem_p.h index 49693631..49693631 100644 --- a/src/datavis3d/engine/labelitem_p.h +++ b/src/engine/labelitem_p.h diff --git a/src/datavis3d/engine/meshes/backgroudFlat.obj b/src/engine/meshes/backgroudFlat.obj index cf4d10a5..cf4d10a5 100644 --- a/src/datavis3d/engine/meshes/backgroudFlat.obj +++ b/src/engine/meshes/backgroudFlat.obj diff --git a/src/datavis3d/engine/meshes/backgroudSmooth.obj b/src/engine/meshes/backgroudSmooth.obj index ad16d904..ad16d904 100644 --- a/src/datavis3d/engine/meshes/backgroudSmooth.obj +++ b/src/engine/meshes/backgroudSmooth.obj diff --git a/src/datavis3d/engine/meshes/coneFlat.obj b/src/engine/meshes/coneFlat.obj index 51c3821e..51c3821e 100644 --- a/src/datavis3d/engine/meshes/coneFlat.obj +++ b/src/engine/meshes/coneFlat.obj diff --git a/src/datavis3d/engine/meshes/coneSmooth.obj b/src/engine/meshes/coneSmooth.obj index 48c48ba8..48c48ba8 100644 --- a/src/datavis3d/engine/meshes/coneSmooth.obj +++ b/src/engine/meshes/coneSmooth.obj diff --git a/src/datavis3d/engine/meshes/cubeFlat.obj b/src/engine/meshes/cubeFlat.obj index 3c8d6d0a..3c8d6d0a 100644 --- a/src/datavis3d/engine/meshes/cubeFlat.obj +++ b/src/engine/meshes/cubeFlat.obj diff --git a/src/datavis3d/engine/meshes/cubeSmooth.obj b/src/engine/meshes/cubeSmooth.obj index 9d147bfd..9d147bfd 100644 --- a/src/datavis3d/engine/meshes/cubeSmooth.obj +++ b/src/engine/meshes/cubeSmooth.obj diff --git a/src/datavis3d/engine/meshes/cylinderFlat.obj b/src/engine/meshes/cylinderFlat.obj index 2b7e3e5e..2b7e3e5e 100644 --- a/src/datavis3d/engine/meshes/cylinderFlat.obj +++ b/src/engine/meshes/cylinderFlat.obj diff --git a/src/datavis3d/engine/meshes/cylinderSmooth.obj b/src/engine/meshes/cylinderSmooth.obj index 6ccbb286..6ccbb286 100644 --- a/src/datavis3d/engine/meshes/cylinderSmooth.obj +++ b/src/engine/meshes/cylinderSmooth.obj diff --git a/src/datavis3d/engine/meshes/plane.obj b/src/engine/meshes/plane.obj index 96ac0dd7..96ac0dd7 100644 --- a/src/datavis3d/engine/meshes/plane.obj +++ b/src/engine/meshes/plane.obj diff --git a/src/datavis3d/engine/meshes/pyramidFlat.obj b/src/engine/meshes/pyramidFlat.obj index 35edb477..35edb477 100644 --- a/src/datavis3d/engine/meshes/pyramidFlat.obj +++ b/src/engine/meshes/pyramidFlat.obj diff --git a/src/datavis3d/engine/meshes/pyramidSmooth.obj b/src/engine/meshes/pyramidSmooth.obj index b11c8750..b11c8750 100644 --- a/src/datavis3d/engine/meshes/pyramidSmooth.obj +++ b/src/engine/meshes/pyramidSmooth.obj diff --git a/src/datavis3d/engine/meshes/sphere.obj b/src/engine/meshes/sphere.obj index 671a7bcc..671a7bcc 100644 --- a/src/datavis3d/engine/meshes/sphere.obj +++ b/src/engine/meshes/sphere.obj diff --git a/src/datavis3d/engine/meshes/sphereSmooth.obj b/src/engine/meshes/sphereSmooth.obj index 3c5b1299..3c5b1299 100644 --- a/src/datavis3d/engine/meshes/sphereSmooth.obj +++ b/src/engine/meshes/sphereSmooth.obj diff --git a/src/datavis3d/engine/q3dbars.cpp b/src/engine/q3dbars.cpp index dc20a8c6..dc20a8c6 100644 --- a/src/datavis3d/engine/q3dbars.cpp +++ b/src/engine/q3dbars.cpp diff --git a/src/datavis3d/engine/q3dbars.h b/src/engine/q3dbars.h index 5a97f111..5a97f111 100644 --- a/src/datavis3d/engine/q3dbars.h +++ b/src/engine/q3dbars.h diff --git a/src/datavis3d/engine/q3dbars_p.h b/src/engine/q3dbars_p.h index 472fe8d6..472fe8d6 100644 --- a/src/datavis3d/engine/q3dbars_p.h +++ b/src/engine/q3dbars_p.h diff --git a/src/datavis3d/engine/q3dmaps.cpp b/src/engine/q3dmaps.cpp index 78789bcd..78789bcd 100644 --- a/src/datavis3d/engine/q3dmaps.cpp +++ b/src/engine/q3dmaps.cpp diff --git a/src/datavis3d/engine/q3dmaps.h b/src/engine/q3dmaps.h index ed9f75d7..ed9f75d7 100644 --- a/src/datavis3d/engine/q3dmaps.h +++ b/src/engine/q3dmaps.h diff --git a/src/datavis3d/engine/q3dmaps_p.h b/src/engine/q3dmaps_p.h index 3896bb39..3896bb39 100644 --- a/src/datavis3d/engine/q3dmaps_p.h +++ b/src/engine/q3dmaps_p.h diff --git a/src/datavis3d/engine/q3dwindow.cpp b/src/engine/q3dwindow.cpp index a172e7b6..a172e7b6 100644 --- a/src/datavis3d/engine/q3dwindow.cpp +++ b/src/engine/q3dwindow.cpp diff --git a/src/datavis3d/engine/q3dwindow.h b/src/engine/q3dwindow.h index 9958f7d9..9958f7d9 100644 --- a/src/datavis3d/engine/q3dwindow.h +++ b/src/engine/q3dwindow.h diff --git a/src/datavis3d/engine/q3dwindow_p.h b/src/engine/q3dwindow_p.h index ef786fb3..ef786fb3 100644 --- a/src/datavis3d/engine/q3dwindow_p.h +++ b/src/engine/q3dwindow_p.h diff --git a/src/datavis3d/engine/qdataitem.cpp b/src/engine/qdataitem.cpp index 14d6c85f..14d6c85f 100644 --- a/src/datavis3d/engine/qdataitem.cpp +++ b/src/engine/qdataitem.cpp diff --git a/src/datavis3d/engine/qdataitem.h b/src/engine/qdataitem.h index 88d54faf..88d54faf 100644 --- a/src/datavis3d/engine/qdataitem.h +++ b/src/engine/qdataitem.h diff --git a/src/datavis3d/engine/qdataitem_p.h b/src/engine/qdataitem_p.h index f14fe175..f14fe175 100644 --- a/src/datavis3d/engine/qdataitem_p.h +++ b/src/engine/qdataitem_p.h diff --git a/src/datavis3d/engine/qdatarow.cpp b/src/engine/qdatarow.cpp index f4a9e984..f4a9e984 100644 --- a/src/datavis3d/engine/qdatarow.cpp +++ b/src/engine/qdatarow.cpp diff --git a/src/datavis3d/engine/qdatarow.h b/src/engine/qdatarow.h index 766ae541..766ae541 100644 --- a/src/datavis3d/engine/qdatarow.h +++ b/src/engine/qdatarow.h diff --git a/src/datavis3d/engine/qdatarow_p.h b/src/engine/qdatarow_p.h index 3a1adeee..3a1adeee 100644 --- a/src/datavis3d/engine/qdatarow_p.h +++ b/src/engine/qdatarow_p.h diff --git a/src/datavis3d/engine/qdataset.cpp b/src/engine/qdataset.cpp index 5af920d2..5af920d2 100644 --- a/src/datavis3d/engine/qdataset.cpp +++ b/src/engine/qdataset.cpp diff --git a/src/datavis3d/engine/qdataset.h b/src/engine/qdataset.h index 118d3df9..118d3df9 100644 --- a/src/datavis3d/engine/qdataset.h +++ b/src/engine/qdataset.h diff --git a/src/datavis3d/engine/qdataset_p.h b/src/engine/qdataset_p.h index 90dc5329..90dc5329 100644 --- a/src/datavis3d/engine/qdataset_p.h +++ b/src/engine/qdataset_p.h diff --git a/src/datavis3d/engine/shaders/fragmentDepthTest b/src/engine/shaders/fragmentDepthTest index d6c502e1..d6c502e1 100644 --- a/src/datavis3d/engine/shaders/fragmentDepthTest +++ b/src/engine/shaders/fragmentDepthTest diff --git a/src/datavis3d/engine/shaders/fragmentShader b/src/engine/shaders/fragmentShader index 45d8642f..45d8642f 100644 --- a/src/datavis3d/engine/shaders/fragmentShader +++ b/src/engine/shaders/fragmentShader diff --git a/src/datavis3d/engine/shaders/fragmentShaderAmbient b/src/engine/shaders/fragmentShaderAmbient index ccaa07e4..ccaa07e4 100644 --- a/src/datavis3d/engine/shaders/fragmentShaderAmbient +++ b/src/engine/shaders/fragmentShaderAmbient diff --git a/src/datavis3d/engine/shaders/fragmentShaderColorOnY b/src/engine/shaders/fragmentShaderColorOnY index a7a30155..a7a30155 100644 --- a/src/datavis3d/engine/shaders/fragmentShaderColorOnY +++ b/src/engine/shaders/fragmentShaderColorOnY diff --git a/src/datavis3d/engine/shaders/fragmentShaderDepth b/src/engine/shaders/fragmentShaderDepth index 5cfd4b10..5cfd4b10 100644 --- a/src/datavis3d/engine/shaders/fragmentShaderDepth +++ b/src/engine/shaders/fragmentShaderDepth diff --git a/src/datavis3d/engine/shaders/fragmentShaderLabel b/src/engine/shaders/fragmentShaderLabel index ed3f91b1..ed3f91b1 100644 --- a/src/datavis3d/engine/shaders/fragmentShaderLabel +++ b/src/engine/shaders/fragmentShaderLabel diff --git a/src/datavis3d/engine/shaders/fragmentShaderSelection b/src/engine/shaders/fragmentShaderSelection index 66370224..66370224 100644 --- a/src/datavis3d/engine/shaders/fragmentShaderSelection +++ b/src/engine/shaders/fragmentShaderSelection diff --git a/src/datavis3d/engine/shaders/fragmentShaderTexture b/src/engine/shaders/fragmentShaderTexture index 95c4f1a1..95c4f1a1 100644 --- a/src/datavis3d/engine/shaders/fragmentShaderTexture +++ b/src/engine/shaders/fragmentShaderTexture diff --git a/src/datavis3d/engine/shaders/fragmentShadow b/src/engine/shaders/fragmentShadow index 2c3c2ded..2c3c2ded 100644 --- a/src/datavis3d/engine/shaders/fragmentShadow +++ b/src/engine/shaders/fragmentShadow diff --git a/src/datavis3d/engine/shaders/vertexDepthTest b/src/engine/shaders/vertexDepthTest index d62f1aa7..d62f1aa7 100644 --- a/src/datavis3d/engine/shaders/vertexDepthTest +++ b/src/engine/shaders/vertexDepthTest diff --git a/src/datavis3d/engine/shaders/vertexShader b/src/engine/shaders/vertexShader index de03714b..de03714b 100644 --- a/src/datavis3d/engine/shaders/vertexShader +++ b/src/engine/shaders/vertexShader diff --git a/src/datavis3d/engine/shaders/vertexShaderDepth b/src/engine/shaders/vertexShaderDepth index 69521267..69521267 100644 --- a/src/datavis3d/engine/shaders/vertexShaderDepth +++ b/src/engine/shaders/vertexShaderDepth diff --git a/src/datavis3d/engine/shaders/vertexShaderLabel b/src/engine/shaders/vertexShaderLabel index 5959b47b..5959b47b 100644 --- a/src/datavis3d/engine/shaders/vertexShaderLabel +++ b/src/engine/shaders/vertexShaderLabel diff --git a/src/datavis3d/engine/shaders/vertexShaderSelection b/src/engine/shaders/vertexShaderSelection index 70082663..70082663 100644 --- a/src/datavis3d/engine/shaders/vertexShaderSelection +++ b/src/engine/shaders/vertexShaderSelection diff --git a/src/datavis3d/engine/shaders/vertexShaderTexture b/src/engine/shaders/vertexShaderTexture index fb23b252..fb23b252 100644 --- a/src/datavis3d/engine/shaders/vertexShaderTexture +++ b/src/engine/shaders/vertexShaderTexture diff --git a/src/datavis3d/engine/shaders/vertexShadow b/src/engine/shaders/vertexShadow index 24184376..24184376 100644 --- a/src/datavis3d/engine/shaders/vertexShadow +++ b/src/engine/shaders/vertexShadow diff --git a/src/datavis3d/engine/theme.cpp b/src/engine/theme.cpp index 5e3d0540..5e3d0540 100644 --- a/src/datavis3d/engine/theme.cpp +++ b/src/engine/theme.cpp diff --git a/src/datavis3d/engine/theme_p.h b/src/engine/theme_p.h index 614c79d5..614c79d5 100644 --- a/src/datavis3d/engine/theme_p.h +++ b/src/engine/theme_p.h diff --git a/src/datavis3d/global/global.pri b/src/global/global.pri index 56cb9f8f..56cb9f8f 100644 --- a/src/datavis3d/global/global.pri +++ b/src/global/global.pri diff --git a/src/datavis3d/global/qdatavis3dglobal.h b/src/global/qdatavis3dglobal.h index 528180b3..528180b3 100644 --- a/src/datavis3d/global/qdatavis3dglobal.h +++ b/src/global/qdatavis3dglobal.h diff --git a/src/datavis3d/global/qdatavis3namespace.h b/src/global/qdatavis3namespace.h index a4ca7c42..a4ca7c42 100644 --- a/src/datavis3d/global/qdatavis3namespace.h +++ b/src/global/qdatavis3namespace.h diff --git a/src/src.pro b/src/src.pro index b9b7be46..b4169c4e 100644 --- a/src/src.pro +++ b/src/src.pro @@ -1,2 +1,22 @@ -TEMPLATE = subdirs -SUBDIRS += datavis3d +TARGET = QtDataVis3D +QT = core gui opengl #qml + +DEFINES += QTCOMMERCIALDATAVIS3D_LIBRARY + +QMAKE_DOCS = $$PWD/doc/qtdatavis3d.qdocconf + +load(qt_module) + +include($$PWD/common.pri) +include($$PWD/engine/engine.pri) +include($$PWD/global/global.pri) +include($$PWD/utils/utils.pri) + +wince* { + # The Microsoft MIPS compiler crashes if /Og is specified. + # -O2/1 expands to /Og plus additional arguments. + contains(DEFINES, MIPS) { + QMAKE_CXXFLAGS_RELEASE ~= s/-O2/-Oi -Ot -Oy -Ob2/ + QMAKE_CXXFLAGS_RELEASE ~= s/-O1/-Os -Oy -Ob2/ + } +} diff --git a/src/datavis3d/utils/camerahelper.cpp b/src/utils/camerahelper.cpp index 2e868cac..2e868cac 100644 --- a/src/datavis3d/utils/camerahelper.cpp +++ b/src/utils/camerahelper.cpp diff --git a/src/datavis3d/utils/camerahelper_p.h b/src/utils/camerahelper_p.h index 68e7e5a2..68e7e5a2 100644 --- a/src/datavis3d/utils/camerahelper_p.h +++ b/src/utils/camerahelper_p.h diff --git a/src/datavis3d/utils/meshloader.cpp b/src/utils/meshloader.cpp index 0e818a92..0e818a92 100644 --- a/src/datavis3d/utils/meshloader.cpp +++ b/src/utils/meshloader.cpp diff --git a/src/datavis3d/utils/meshloader_p.h b/src/utils/meshloader_p.h index 514ae5c6..514ae5c6 100644 --- a/src/datavis3d/utils/meshloader_p.h +++ b/src/utils/meshloader_p.h diff --git a/src/datavis3d/utils/objecthelper.cpp b/src/utils/objecthelper.cpp index 6659a187..6659a187 100644 --- a/src/datavis3d/utils/objecthelper.cpp +++ b/src/utils/objecthelper.cpp diff --git a/src/datavis3d/utils/objecthelper_p.h b/src/utils/objecthelper_p.h index f3e342ba..f3e342ba 100644 --- a/src/datavis3d/utils/objecthelper_p.h +++ b/src/utils/objecthelper_p.h diff --git a/src/datavis3d/utils/shaderhelper.cpp b/src/utils/shaderhelper.cpp index f08daff0..f08daff0 100644 --- a/src/datavis3d/utils/shaderhelper.cpp +++ b/src/utils/shaderhelper.cpp diff --git a/src/datavis3d/utils/shaderhelper_p.h b/src/utils/shaderhelper_p.h index d1c72ba5..d1c72ba5 100644 --- a/src/datavis3d/utils/shaderhelper_p.h +++ b/src/utils/shaderhelper_p.h diff --git a/src/datavis3d/utils/texturehelper.cpp b/src/utils/texturehelper.cpp index 808ac309..808ac309 100644 --- a/src/datavis3d/utils/texturehelper.cpp +++ b/src/utils/texturehelper.cpp diff --git a/src/datavis3d/utils/texturehelper_p.h b/src/utils/texturehelper_p.h index ea9ef03b..ea9ef03b 100644 --- a/src/datavis3d/utils/texturehelper_p.h +++ b/src/utils/texturehelper_p.h diff --git a/src/datavis3d/utils/utils.cpp b/src/utils/utils.cpp index 7b4cb6f6..7b4cb6f6 100644 --- a/src/datavis3d/utils/utils.cpp +++ b/src/utils/utils.cpp diff --git a/src/datavis3d/utils/utils.pri b/src/utils/utils.pri index 566af55f..566af55f 100644 --- a/src/datavis3d/utils/utils.pri +++ b/src/utils/utils.pri diff --git a/src/datavis3d/utils/utils_p.h b/src/utils/utils_p.h index 1668ac40..1668ac40 100644 --- a/src/datavis3d/utils/utils_p.h +++ b/src/utils/utils_p.h diff --git a/src/datavis3d/utils/vertexindexer.cpp b/src/utils/vertexindexer.cpp index 7e5a863f..7e5a863f 100644 --- a/src/datavis3d/utils/vertexindexer.cpp +++ b/src/utils/vertexindexer.cpp diff --git a/src/datavis3d/utils/vertexindexer_p.h b/src/utils/vertexindexer_p.h index 3ee908af..3ee908af 100644 --- a/src/datavis3d/utils/vertexindexer_p.h +++ b/src/utils/vertexindexer_p.h diff --git a/sync.profile b/sync.profile index 0f8f0093..8ff8133a 100644 --- a/sync.profile +++ b/sync.profile @@ -1,5 +1,5 @@ %modules = ( # path to module name map - "QtDataVis3D" => "$basedir/src/datavis3d", + "QtDataVis3D" => "$basedir/src", ); %moduleheaders = ( # restrict the module headers to those found in relative path ); |