From 3c7b4a6eacdc1097006f0d6781a9ff753fb1784a Mon Sep 17 00:00:00 2001 From: Fabio Roberto Vitello Date: Wed, 27 May 2020 14:45:37 +0200 Subject: [PATCH] Removed VisIVOServer dependencies --- Code/VisIVODesktop-vtk6_qt5.pro | 20 +- Code/VisIVODesktop-vtk6_qt5.pro.user | 286 +-------- Code/VisIVODesktop-vtk6_qt5.pro.user.496e800 | 593 +++++++++++++++++++ Code/src/contour.cpp | 4 +- Code/src/mainwindow.cpp | 13 +- Code/src/sedvisualizerplot.cpp | 1 - Code/src/visivofilterdesktop.cpp | 133 ----- Code/src/visivoimporterdesktop.cpp | 29 +- Code/src/vstabledesktop.cpp | 81 +-- Code/src/vstabledesktop.h | 7 +- Code/src/vtkwindow_new.cpp | 23 +- Code/ui/vtkwindow_new.ui | 8 +- 12 files changed, 653 insertions(+), 545 deletions(-) create mode 100644 Code/VisIVODesktop-vtk6_qt5.pro.user.496e800 delete mode 100644 Code/src/visivofilterdesktop.cpp diff --git a/Code/VisIVODesktop-vtk6_qt5.pro b/Code/VisIVODesktop-vtk6_qt5.pro index 0fad4f10..588acc59 100644 --- a/Code/VisIVODesktop-vtk6_qt5.pro +++ b/Code/VisIVODesktop-vtk6_qt5.pro @@ -21,25 +21,26 @@ ICON = logo.icns #INCLUDEPATH += /opt/vtk6.20/include/vtk-6.2/ -INCLUDEPATH += /usr/local/Cellar/vtk/8.2.0_10/include/vtk-8.2/ -#INCLUDEPATH += /opt/cfitsio3_1_0/include/ \ -INCLUDEPATH += /usr/local/Cellar/cfitsio/3.480/include/ \ +INCLUDEPATH += /opt/vtk-9.0.0/include/vtk-9.0/ +INCLUDEPATH += /opt/cfitsio3_1_0/include/ \ /opt/local/include \ - /usr/local/Cellar/boost/1.72.0_2/include/ + /opt/boost_1_63_0/include/ #INCLUDEPATH += /Users/fxbio6600/OACT/VisIVOServer_svn_locale/branches/2.3/ INCLUDEPATH += /Users/eva/Projects/NEANIAS/Code/VisIVOServer INCLUDEPATH +=/opt/hdf5-1.10.0-patch1/include -LIBS += /usr/local/Cellar/cfitsio/3.480/lib/libcfitsio.a +LIBS += /opt/cfitsio3_1_0/lib/libcfitsio.a -LIBS += -L/usr/local/Cellar/vtk/8.2.0_10/lib -LIBS += -lvtkChartsCore-8.2 -lvtkCommonColor-8.2 -lvtkCommonComputationalGeometry-8.2 -lvtkCommonCore-8.2 -lvtkCommonDataModel-8.2 -lvtkCommonExecutionModel-8.2 -lvtkCommonMath-8.2 -lvtkCommonMisc-8.2 -lvtkCommonSystem-8.2 -lvtkCommonTransforms-8.2 -lvtkDICOMParser-8.2 -lvtkDomainsChemistry-8.2 -lvtkFiltersAMR-8.2 -lvtkFiltersCore-8.2 -lvtkFiltersExtraction-8.2 -lvtkFiltersFlowPaths-8.2 -lvtkFiltersGeneral-8.2 -lvtkFiltersGeneric-8.2 -lvtkFiltersGeometry-8.2 -lvtkFiltersHybrid-8.2 -lvtkFiltersHyperTree-8.2 -lvtkFiltersImaging-8.2 -lvtkFiltersModeling-8.2 -lvtkFiltersParallel-8.2 -lvtkFiltersParallelImaging-8.2 -lvtkFiltersProgrammable-8.2 -lvtkFiltersSMP-8.2 -lvtkFiltersSelection-8.2 -lvtkFiltersSources-8.2 -lvtkFiltersStatistics-8.2 -lvtkFiltersTexture-8.2 -lvtkFiltersVerdict-8.2 -lvtkGUISupportQt-8.2 -lvtkGUISupportQtSQL-8.2 -lvtkGeovisCore-8.2 -lvtkIOAMR-8.2 -lvtkIOCore-8.2 -lvtkIOEnSight-8.2 -lvtkIOExodus-8.2 -lvtkIOExport-8.2 -lvtkIOGeometry-8.2 -lvtkIOImage-8.2 -lvtkIOImport-8.2 -lvtkIOInfovis-8.2 -lvtkIOLSDyna-8.2 -lvtkIOLegacy-8.2 -lvtkIOMINC-8.2 -lvtkIOMovie-8.2 -lvtkIOPLY-8.2 -lvtkIOParallel-8.2 -lvtkIOParallelXML-8.2 -lvtkIOSQL-8.2 -lvtkIOVideo-8.2 -lvtkIOXML-8.2 -lvtkIOXMLParser-8.2 -lvtkImagingColor-8.2 -lvtkImagingCore-8.2 -lvtkImagingFourier-8.2 -lvtkImagingGeneral-8.2 -lvtkImagingHybrid-8.2 -lvtkImagingMath-8.2 -lvtkImagingMorphological-8.2 -lvtkImagingSources-8.2 -lvtkImagingStatistics-8.2 -lvtkImagingStencil-8.2 -lvtkInfovisCore-8.2 -lvtkInfovisLayout-8.2 -lvtkInteractionImage-8.2 -lvtkInteractionStyle-8.2 -lvtkInteractionWidgets-8.2 -lvtkParallelCore-8.2 -lvtkRenderingAnnotation-8.2 -lvtkRenderingContext2D-8.2 -lvtkRenderingContextOpenGL2-8.2 -lvtkRenderingCore-8.2 -lvtkRenderingFreeType-8.2 -lvtkRenderingFreeType-8.2 -lvtkRenderingGL2PSOpenGL2-8.2 -lvtkRenderingImage-8.2 -lvtkRenderingLOD-8.2 -lvtkRenderingLabel-8.2 -lvtkRenderingOpenGL2-8.2 -lvtkRenderingQt-8.2 -lvtkRenderingVolume-8.2 -lvtkRenderingVolumeOpenGL2-8.2 -lvtkViewsContext2D-8.2 -lvtkViewsCore-8.2 -lvtkViewsInfovis-8.2 -lvtkViewsQt-8.2 -lvtkexodusII-8.2 -lvtkfreetype-8.2 -lvtkgl2ps-8.2 -lvtkjsoncpp-8.2 -lvtkmetaio-8.2 -lvtkogg-8.2 -lvtkproj-8.2 -lvtksqlite-8.2 -lvtksys-8.2 -lvtkverdict-8.2 +LIBS += -L/opt/vtk-9.0.0/lib +LIBS += -lvtkChartsCore-9.0 -lvtkCommonColor-9.0 -lvtkCommonComputationalGeometry-9.0 -lvtkCommonCore-9.0 -lvtkCommonDataModel-9.0 -lvtkCommonExecutionModel-9.0 -lvtkCommonMath-9.0 -lvtkCommonMisc-9.0 -lvtkCommonSystem-9.0 -lvtkCommonTransforms-9.0 -lvtkDICOMParser-9.0 -lvtkDomainsChemistry-9.0 -lvtkFiltersAMR-9.0 -lvtkFiltersCore-9.0 -lvtkFiltersExtraction-9.0 -lvtkFiltersFlowPaths-9.0 -lvtkFiltersGeneral-9.0 -lvtkFiltersGeneric-9.0 -lvtkFiltersGeometry-9.0 -lvtkFiltersHybrid-9.0 -lvtkFiltersHyperTree-9.0 -lvtkFiltersImaging-9.0 -lvtkFiltersModeling-9.0 -lvtkFiltersParallel-9.0 -lvtkFiltersParallelImaging-9.0 -lvtkFiltersProgrammable-9.0 -lvtkFiltersSMP-9.0 -lvtkFiltersSelection-9.0 -lvtkFiltersSources-9.0 -lvtkFiltersStatistics-9.0 -lvtkFiltersTexture-9.0 -lvtkFiltersVerdict-9.0 -lvtkGUISupportQt-9.0 -lvtkGUISupportQtSQL-9.0 -lvtkGeovisCore-9.0 -lvtkIOAMR-9.0 -lvtkIOCore-9.0 -lvtkIOEnSight-9.0 -lvtkIOExodus-9.0 -lvtkIOExport-9.0 -lvtkIOGeometry-9.0 -lvtkIOImage-9.0 -lvtkIOImport-9.0 -lvtkIOInfovis-9.0 -lvtkIOLSDyna-9.0 -lvtkIOLegacy-9.0 -lvtkIOMINC-9.0 -lvtkIOMovie-9.0 -lvtkIOPLY-9.0 -lvtkIOParallel-9.0 -lvtkIOParallelXML-9.0 -lvtkIOSQL-9.0 -lvtkIOVideo-9.0 -lvtkIOXML-9.0 -lvtkIOXMLParser-9.0 -lvtkImagingColor-9.0 -lvtkImagingCore-9.0 -lvtkImagingFourier-9.0 -lvtkImagingGeneral-9.0 -lvtkImagingHybrid-9.0 -lvtkImagingMath-9.0 -lvtkImagingMorphological-9.0 -lvtkImagingSources-9.0 -lvtkImagingStatistics-9.0 -lvtkImagingStencil-9.0 -lvtkInfovisCore-9.0 -lvtkInfovisLayout-9.0 -lvtkInteractionImage-9.0 -lvtkInteractionStyle-9.0 -lvtkInteractionWidgets-9.0 -lvtkParallelCore-9.0 -lvtkRenderingAnnotation-9.0 -lvtkRenderingContext2D-9.0 -lvtkRenderingCore-9.0 -lvtkRenderingFreeType-9.0 -lvtkRenderingFreeType-9.0 -lvtkRenderingGL2PSOpenGL2-9.0 -lvtkRenderingImage-9.0 -lvtkRenderingLOD-9.0 -lvtkRenderingLabel-9.0 -lvtkRenderingOpenGL2-9.0 -lvtkRenderingQt-9.0 -lvtkRenderingVolume-9.0 -lvtkRenderingVolumeOpenGL2-9.0 -lvtkViewsContext2D-9.0 -lvtkViewsCore-9.0 -lvtkViewsInfovis-9.0 -lvtkViewsQt-9.0 -lvtkexodusII-9.0 -lvtkfreetype-9.0 -lvtkgl2ps-9.0 -lvtkjsoncpp-9.0 -lvtkmetaio-9.0 -lvtkogg-9.0 -lvtksqlite-9.0 -lvtksys-9.0 -lvtkverdict-9.0 +#LIBS REMOVED +#-lvtkRenderingContextOpenGL2-9.0 -lvtkproj-9.0 + #LIBS += -lvtkChartsCore-6.2 -lvtkCommonColor-6.2 -lvtkCommonComputationalGeometry-6.2 -lvtkCommonCore-6.2 -lvtkCommonDataModel-6.2 -lvtkCommonExecutionModel-6.2 -lvtkCommonMath-6.2 -lvtkCommonMisc-6.2 -lvtkCommonSystem-6.2 -lvtkCommonTransforms-6.2 -lvtkDICOMParser-6.2 -lvtkDomainsChemistry-6.2 -lvtkFiltersAMR-6.2 -lvtkFiltersCore-6.2 -lvtkFiltersExtraction-6.2 -lvtkFiltersFlowPaths-6.2 -lvtkFiltersGeneral-6.2 -lvtkFiltersGeneric-6.2 -lvtkFiltersGeometry-6.2 -lvtkFiltersHybrid-6.2 -lvtkFiltersHyperTree-6.2 -lvtkFiltersImaging-6.2 -lvtkFiltersModeling-6.2 -lvtkFiltersParallel-6.2 -lvtkFiltersParallelImaging-6.2 -lvtkFiltersProgrammable-6.2 -lvtkFiltersSMP-6.2 -lvtkFiltersSelection-6.2 -lvtkFiltersSources-6.2 -lvtkFiltersStatistics-6.2 -lvtkFiltersTexture-6.2 -lvtkFiltersVerdict-6.2 -lvtkGUISupportQt-6.2 -lvtkGUISupportQtOpenGL-6.2 -lvtkGUISupportQtSQL-6.2 -lvtkGUISupportQtWebkit-6.2 -lvtkGeovisCore-6.2 -lvtkIOAMR-6.2 -lvtkIOCore-6.2 -lvtkIOEnSight-6.2 -lvtkIOExodus-6.2 -lvtkIOExport-6.2 -lvtkIOGeometry-6.2 -lvtkIOImage-6.2 -lvtkIOImport-6.2 -lvtkIOInfovis-6.2 -lvtkIOLSDyna-6.2 -lvtkIOLegacy-6.2 -lvtkIOMINC-6.2 -lvtkIOMovie-6.2 -lvtkIONetCDF-6.2 -lvtkIOPLY-6.2 -lvtkIOParallel-6.2 -lvtkIOParallelXML-6.2 -lvtkIOSQL-6.2 -lvtkIOVideo-6.2 -lvtkIOXML-6.2 -lvtkIOXMLParser-6.2 -lvtkImagingColor-6.2 -lvtkImagingCore-6.2 -lvtkImagingFourier-6.2 -lvtkImagingGeneral-6.2 -lvtkImagingHybrid-6.2 -lvtkImagingMath-6.2 -lvtkImagingMorphological-6.2 -lvtkImagingSources-6.2 -lvtkImagingStatistics-6.2 -lvtkImagingStencil-6.2 -lvtkInfovisCore-6.2 -lvtkInfovisLayout-6.2 -lvtkInteractionImage-6.2 -lvtkInteractionStyle-6.2 -lvtkInteractionWidgets-6.2 -lvtkNetCDF-6.2 -lvtkNetCDF_cxx-6.2 -lvtkParallelCore-6.2 -lvtkRenderingAnnotation-6.2 -lvtkRenderingContext2D-6.2 -lvtkRenderingContextOpenGL-6.2 -lvtkRenderingCore-6.2 -lvtkRenderingFreeType-6.2 -lvtkRenderingFreeTypeFontConfig-6.2 -lvtkRenderingFreeTypeOpenGL-6.2 -lvtkRenderingGL2PS-6.2 -lvtkRenderingImage-6.2 -lvtkRenderingLIC-6.2 -lvtkRenderingLOD-6.2 -lvtkRenderingLabel-6.2 -lvtkRenderingOpenGL-6.2 -lvtkRenderingQt-6.2 -lvtkRenderingVolume-6.2 -lvtkRenderingVolumeOpenGL-6.2 -lvtkViewsContext2D-6.2 -lvtkViewsCore-6.2 -lvtkViewsInfovis-6.2 -lvtkViewsQt-6.2 -lvtkalglib-6.2 -lvtkexoIIc-6.2 -lvtkexpat-6.2 -lvtkfreetype-6.2 -lvtkftgl-6.2 -lvtkgl2ps-6.2 -lvtkhdf5-6.2 -lvtkhdf5_hl-6.2 -lvtkjpeg-6.2 -lvtkjsoncpp-6.2 -lvtklibxml2-6.2 -lvtkmetaio-6.2 -lvtkoggtheora-6.2 -lvtkpng-6.2 -lvtkproj4-6.2 -lvtksqlite-6.2 -lvtksys-6.2 -lvtktiff-6.2 -lvtkverdict-6.2 -lvtkzlib-6.2 #LIBS += -L/Users/fxbio6600/OACT/develop/VisIVODesktop6/trunk/lib/ -lsamp -lVOApps -lVO -lVOTable -lVOClient LIBS += -lm -lc -lpthread -lcurl -LIBS += /Users/eva/Projects/NEANIAS/Code/VisIVOServer/API_LIGHT/libVisIVOApi.a -LIBS += -L/usr/local/Cellar/hdf5/1.12.0/lib -lhdf5 +LIBS += -L/opt/hdf5-1.10.0-patch1/lib -lhdf5 LIBS += /usr/lib/libc++.dylib macx:LIBS += -framework \ @@ -143,7 +144,6 @@ SOURCES += src/main.cpp\ src/vstabledesktop.cpp \ src/visivoutilsdesktop.cpp \ src/vsobjectdesktop.cpp \ - src/visivofilterdesktop.cpp \ src/filtercustomize.cpp \ src/vialacteastringdictwidget.cpp diff --git a/Code/VisIVODesktop-vtk6_qt5.pro.user b/Code/VisIVODesktop-vtk6_qt5.pro.user index 27b82b71..19f86403 100644 --- a/Code/VisIVODesktop-vtk6_qt5.pro.user +++ b/Code/VisIVODesktop-vtk6_qt5.pro.user @@ -1,10 +1,10 @@ - + EnvironmentId - {496e800c-e1c2-4abb-a942-89e93c6268b6} + {d7bdcdd1-3e2c-4559-a568-85e4bf761de3} ProjectExplorer.Project.ActiveTarget @@ -61,7 +61,7 @@ true Builtin.DefaultTidyAndClazy - 4 + 2 @@ -72,17 +72,17 @@ ProjectExplorer.Project.Target.0 - QT Brew version - QT Brew version - {782a63bf-f52f-4302-bfb1-f19c3ad8a016} + Unnamed + Unnamed + {baafab6e-f767-4949-b10e-060d352a8ad6} 0 0 0 true 0 - /Users/eva/Projects/NEANIAS/Code/ViaLacteaVisualAnalytics/build-VisIVODesktop-vtk6_qt5-QT_Brew_version-Debug - /Users/eva/Projects/NEANIAS/Code/ViaLacteaVisualAnalytics/build-VisIVODesktop-vtk6_qt5-QT_Brew_version-Debug + /Users/fxbio6600/OACT/Github/ViaLacteaVisualAnalytics/build-VisIVODesktop-vtk6_qt5-Unnamed-Debug + /Users/fxbio6600/OACT/Github/ViaLacteaVisualAnalytics/build-VisIVODesktop-vtk6_qt5-Unnamed-Debug true @@ -132,8 +132,8 @@ true 2 - /Users/eva/Projects/NEANIAS/Code/ViaLacteaVisualAnalytics/build-VisIVODesktop-vtk6_qt5-QT_Brew_version-Release - /Users/eva/Projects/NEANIAS/Code/ViaLacteaVisualAnalytics/build-VisIVODesktop-vtk6_qt5-QT_Brew_version-Release + /Users/fxbio6600/OACT/Github/ViaLacteaVisualAnalytics/build-VisIVODesktop-vtk6_qt5-Unnamed-Release + /Users/fxbio6600/OACT/Github/ViaLacteaVisualAnalytics/build-VisIVODesktop-vtk6_qt5-Unnamed-Release true @@ -183,8 +183,8 @@ true 0 - /Users/eva/Projects/NEANIAS/Code/ViaLacteaVisualAnalytics/build-VisIVODesktop-vtk6_qt5-QT_Brew_version-Profile - /Users/eva/Projects/NEANIAS/Code/ViaLacteaVisualAnalytics/build-VisIVODesktop-vtk6_qt5-QT_Brew_version-Profile + /Users/fxbio6600/OACT/Github/ViaLacteaVisualAnalytics/build-VisIVODesktop-vtk6_qt5-Unnamed-Profile + /Users/fxbio6600/OACT/Github/ViaLacteaVisualAnalytics/build-VisIVODesktop-vtk6_qt5-Unnamed-Profile true @@ -306,8 +306,8 @@ 2 - Qt4ProjectManager.Qt4RunConfiguration:/Users/eva/Projects/NEANIAS/Code/ViaLacteaVisualAnalytics/Code/VisIVODesktop-vtk6_qt5.pro - /Users/eva/Projects/NEANIAS/Code/ViaLacteaVisualAnalytics/Code/VisIVODesktop-vtk6_qt5.pro + Qt4ProjectManager.Qt4RunConfiguration:/Users/fxbio6600/OACT/Github/ViaLacteaVisualAnalytics/Code/VisIVODesktop-vtk6_qt5.pro + /Users/fxbio6600/OACT/Github/ViaLacteaVisualAnalytics/Code/VisIVODesktop-vtk6_qt5.pro false @@ -319,268 +319,14 @@ false true - /Users/eva/Projects/NEANIAS/Code/ViaLacteaVisualAnalytics/build-VisIVODesktop-vtk6_qt5-QT_Brew_version-Debug - - 1 - - - - ProjectExplorer.Project.Target.1 - - QTWebKit - QTWebKit - {74d70b32-6445-4a37-ba6e-9f4e54c6bf45} - 0 - 0 - 0 - - true - 0 - /Users/eva/Projects/NEANIAS/Code/ViaLacteaVisualAnalytics/build-VisIVODesktop-vtk6_qt5-QTWebKit-Debug - /Users/eva/Projects/NEANIAS/Code/ViaLacteaVisualAnalytics/build-VisIVODesktop-vtk6_qt5-QTWebKit-Debug - - - true - QtProjectManager.QMakeBuildStep - - false - - - - true - Qt4ProjectManager.MakeStep - - false - - - false - - 2 - Build - Build - ProjectExplorer.BuildSteps.Build - - - - true - Qt4ProjectManager.MakeStep - - true - clean - - false - - 1 - Clean - Clean - ProjectExplorer.BuildSteps.Clean - - 2 - false - - Debug - Qt4ProjectManager.Qt4BuildConfiguration - 2 - 2 - 2 - - - true - 2 - /Users/eva/Projects/NEANIAS/Code/ViaLacteaVisualAnalytics/build-VisIVODesktop-vtk6_qt5-QTWebKit-Release - /Users/eva/Projects/NEANIAS/Code/ViaLacteaVisualAnalytics/build-VisIVODesktop-vtk6_qt5-QTWebKit-Release - - - true - QtProjectManager.QMakeBuildStep - - false - - - - true - Qt4ProjectManager.MakeStep - - false - - - false - - 2 - Build - Build - ProjectExplorer.BuildSteps.Build - - - - true - Qt4ProjectManager.MakeStep - - true - clean - - false - - 1 - Clean - Clean - ProjectExplorer.BuildSteps.Clean - - 2 - false - - Release - Qt4ProjectManager.Qt4BuildConfiguration - 0 - 0 - 2 - - - true - 0 - /Users/eva/Projects/NEANIAS/Code/ViaLacteaVisualAnalytics/build-VisIVODesktop-vtk6_qt5-QTWebKit-Profile - /Users/eva/Projects/NEANIAS/Code/ViaLacteaVisualAnalytics/build-VisIVODesktop-vtk6_qt5-QTWebKit-Profile - - - true - QtProjectManager.QMakeBuildStep - - false - - - - true - Qt4ProjectManager.MakeStep - - false - - - false - - 2 - Build - Build - ProjectExplorer.BuildSteps.Build - - - - true - Qt4ProjectManager.MakeStep - - true - clean - - false - - 1 - Clean - Clean - ProjectExplorer.BuildSteps.Clean - - 2 - false - - Profile - Qt4ProjectManager.Qt4BuildConfiguration - 0 - 0 - 0 - - 3 - - - 0 - Deploy - Deploy - ProjectExplorer.BuildSteps.Deploy - - 1 - - false - ProjectExplorer.DefaultDeployConfiguration - - 1 - - - dwarf - - cpu-cycles - - - 250 - - -e - cpu-cycles - --call-graph - dwarf,4096 - -F - 250 - - -F - true - 4096 - false - false - 1000 - - true - - false - false - false - false - true - 0.01 - 10 - true - kcachegrind - 1 - 25 - - 1 - true - false - true - valgrind - - 0 - 1 - 2 - 3 - 4 - 5 - 6 - 7 - 8 - 9 - 10 - 11 - 12 - 13 - 14 - - 2 - - - ProjectExplorer.CustomExecutableRunConfiguration - - - false - - false - true - false - false - true - - + /Users/fxbio6600/OACT/Github/ViaLacteaVisualAnalytics/build-VisIVODesktop-vtk6_qt5-Unnamed-Debug 1 ProjectExplorer.Project.TargetCount - 2 + 1 ProjectExplorer.Project.Updater.FileVersion diff --git a/Code/VisIVODesktop-vtk6_qt5.pro.user.496e800 b/Code/VisIVODesktop-vtk6_qt5.pro.user.496e800 new file mode 100644 index 00000000..27b82b71 --- /dev/null +++ b/Code/VisIVODesktop-vtk6_qt5.pro.user.496e800 @@ -0,0 +1,593 @@ + + + + + + EnvironmentId + {496e800c-e1c2-4abb-a942-89e93c6268b6} + + + ProjectExplorer.Project.ActiveTarget + 0 + + + ProjectExplorer.Project.EditorSettings + + true + false + true + + Cpp + + CppGlobal + + + + QmlJS + + QmlJSGlobal + + + 2 + UTF-8 + false + 4 + false + 80 + true + true + 1 + true + false + 0 + true + true + 0 + 8 + true + 1 + true + true + true + false + + + + ProjectExplorer.Project.PluginSettings + + + true + Builtin.Questionable + + true + Builtin.DefaultTidyAndClazy + 4 + + + + true + + + + + ProjectExplorer.Project.Target.0 + + QT Brew version + QT Brew version + {782a63bf-f52f-4302-bfb1-f19c3ad8a016} + 0 + 0 + 0 + + true + 0 + /Users/eva/Projects/NEANIAS/Code/ViaLacteaVisualAnalytics/build-VisIVODesktop-vtk6_qt5-QT_Brew_version-Debug + /Users/eva/Projects/NEANIAS/Code/ViaLacteaVisualAnalytics/build-VisIVODesktop-vtk6_qt5-QT_Brew_version-Debug + + + true + QtProjectManager.QMakeBuildStep + + false + + + + true + Qt4ProjectManager.MakeStep + + false + + + false + + 2 + Build + Build + ProjectExplorer.BuildSteps.Build + + + + true + Qt4ProjectManager.MakeStep + + true + clean + + false + + 1 + Clean + Clean + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Debug + Qt4ProjectManager.Qt4BuildConfiguration + 2 + 2 + 2 + + + true + 2 + /Users/eva/Projects/NEANIAS/Code/ViaLacteaVisualAnalytics/build-VisIVODesktop-vtk6_qt5-QT_Brew_version-Release + /Users/eva/Projects/NEANIAS/Code/ViaLacteaVisualAnalytics/build-VisIVODesktop-vtk6_qt5-QT_Brew_version-Release + + + true + QtProjectManager.QMakeBuildStep + + false + + + + true + Qt4ProjectManager.MakeStep + + false + + + false + + 2 + Build + Build + ProjectExplorer.BuildSteps.Build + + + + true + Qt4ProjectManager.MakeStep + + true + clean + + false + + 1 + Clean + Clean + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Release + Qt4ProjectManager.Qt4BuildConfiguration + 0 + 0 + 2 + + + true + 0 + /Users/eva/Projects/NEANIAS/Code/ViaLacteaVisualAnalytics/build-VisIVODesktop-vtk6_qt5-QT_Brew_version-Profile + /Users/eva/Projects/NEANIAS/Code/ViaLacteaVisualAnalytics/build-VisIVODesktop-vtk6_qt5-QT_Brew_version-Profile + + + true + QtProjectManager.QMakeBuildStep + + false + + + + true + Qt4ProjectManager.MakeStep + + false + + + false + + 2 + Build + Build + ProjectExplorer.BuildSteps.Build + + + + true + Qt4ProjectManager.MakeStep + + true + clean + + false + + 1 + Clean + Clean + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Profile + Qt4ProjectManager.Qt4BuildConfiguration + 0 + 0 + 0 + + 3 + + + 0 + Deploy + Deploy + ProjectExplorer.BuildSteps.Deploy + + 1 + + false + ProjectExplorer.DefaultDeployConfiguration + + 1 + + + dwarf + + cpu-cycles + + + 250 + + -e + cpu-cycles + --call-graph + dwarf,4096 + -F + 250 + + -F + true + 4096 + false + false + 1000 + + true + + false + false + false + false + true + 0.01 + 10 + true + kcachegrind + 1 + 25 + + 1 + true + false + true + valgrind + + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + + 2 + + Qt4ProjectManager.Qt4RunConfiguration:/Users/eva/Projects/NEANIAS/Code/ViaLacteaVisualAnalytics/Code/VisIVODesktop-vtk6_qt5.pro + /Users/eva/Projects/NEANIAS/Code/ViaLacteaVisualAnalytics/Code/VisIVODesktop-vtk6_qt5.pro + + false + + false + true + false + true + false + false + true + + /Users/eva/Projects/NEANIAS/Code/ViaLacteaVisualAnalytics/build-VisIVODesktop-vtk6_qt5-QT_Brew_version-Debug + + 1 + + + + ProjectExplorer.Project.Target.1 + + QTWebKit + QTWebKit + {74d70b32-6445-4a37-ba6e-9f4e54c6bf45} + 0 + 0 + 0 + + true + 0 + /Users/eva/Projects/NEANIAS/Code/ViaLacteaVisualAnalytics/build-VisIVODesktop-vtk6_qt5-QTWebKit-Debug + /Users/eva/Projects/NEANIAS/Code/ViaLacteaVisualAnalytics/build-VisIVODesktop-vtk6_qt5-QTWebKit-Debug + + + true + QtProjectManager.QMakeBuildStep + + false + + + + true + Qt4ProjectManager.MakeStep + + false + + + false + + 2 + Build + Build + ProjectExplorer.BuildSteps.Build + + + + true + Qt4ProjectManager.MakeStep + + true + clean + + false + + 1 + Clean + Clean + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Debug + Qt4ProjectManager.Qt4BuildConfiguration + 2 + 2 + 2 + + + true + 2 + /Users/eva/Projects/NEANIAS/Code/ViaLacteaVisualAnalytics/build-VisIVODesktop-vtk6_qt5-QTWebKit-Release + /Users/eva/Projects/NEANIAS/Code/ViaLacteaVisualAnalytics/build-VisIVODesktop-vtk6_qt5-QTWebKit-Release + + + true + QtProjectManager.QMakeBuildStep + + false + + + + true + Qt4ProjectManager.MakeStep + + false + + + false + + 2 + Build + Build + ProjectExplorer.BuildSteps.Build + + + + true + Qt4ProjectManager.MakeStep + + true + clean + + false + + 1 + Clean + Clean + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Release + Qt4ProjectManager.Qt4BuildConfiguration + 0 + 0 + 2 + + + true + 0 + /Users/eva/Projects/NEANIAS/Code/ViaLacteaVisualAnalytics/build-VisIVODesktop-vtk6_qt5-QTWebKit-Profile + /Users/eva/Projects/NEANIAS/Code/ViaLacteaVisualAnalytics/build-VisIVODesktop-vtk6_qt5-QTWebKit-Profile + + + true + QtProjectManager.QMakeBuildStep + + false + + + + true + Qt4ProjectManager.MakeStep + + false + + + false + + 2 + Build + Build + ProjectExplorer.BuildSteps.Build + + + + true + Qt4ProjectManager.MakeStep + + true + clean + + false + + 1 + Clean + Clean + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Profile + Qt4ProjectManager.Qt4BuildConfiguration + 0 + 0 + 0 + + 3 + + + 0 + Deploy + Deploy + ProjectExplorer.BuildSteps.Deploy + + 1 + + false + ProjectExplorer.DefaultDeployConfiguration + + 1 + + + dwarf + + cpu-cycles + + + 250 + + -e + cpu-cycles + --call-graph + dwarf,4096 + -F + 250 + + -F + true + 4096 + false + false + 1000 + + true + + false + false + false + false + true + 0.01 + 10 + true + kcachegrind + 1 + 25 + + 1 + true + false + true + valgrind + + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + + 2 + + + ProjectExplorer.CustomExecutableRunConfiguration + + + false + + false + true + false + false + true + + + + 1 + + + + ProjectExplorer.Project.TargetCount + 2 + + + ProjectExplorer.Project.Updater.FileVersion + 22 + + + Version + 22 + + diff --git a/Code/src/contour.cpp b/Code/src/contour.cpp index f63a67fe..470b48a3 100644 --- a/Code/src/contour.cpp +++ b/Code/src/contour.cpp @@ -263,7 +263,7 @@ void contour::createContour() labelScalars->SetNumberOfComponents(1); labelScalars->SetName("Isovalues"); - vtkIdType *indices; + const vtkIdType *indices; vtkIdType numberOfPoints; unsigned int lineCount = 0; for (cells->InitTraversal(); @@ -726,7 +726,7 @@ void contour::addContours() labelScalars->SetNumberOfComponents(1); labelScalars->SetName("Isovalues"); - vtkIdType *indices; + const vtkIdType *indices; vtkIdType numberOfPoints; unsigned int lineCount = 0; for (cells->InitTraversal(); diff --git a/Code/src/mainwindow.cpp b/Code/src/mainwindow.cpp index eda269d8..90179617 100644 --- a/Code/src/mainwindow.cpp +++ b/Code/src/mainwindow.cpp @@ -38,15 +38,15 @@ #include "vialactea.h" #include "sed.h" //#include "vosamp.h" -#include "visivofilterdesktop.h" +//#include "visivofilterdesktop.h" #include "customprocess.h" - +/* extern "C" { #include "visivo.h" } - +*/ #include "vtkwindow_new.h" /* @@ -917,6 +917,8 @@ void MainWindow::on_volumeRadioButton_toggled(bool checked) void MainWindow::on_importPushButton_clicked() { + //Removed VisIVO Integrations + /* qDebug()<<"filename: "<importerGroupBox->hide(); ui->filterGroupBox->show(); ui->addIdentifierParameterGroupBox->show(); @@ -1096,5 +1099,5 @@ void MainWindow::hideAllFilterParameter() void MainWindow::on_runFilterPushButton_clicked() { - VisIVOFilterDesktop::runFilter(ui->selectFilterComboBox->currentIndex()); + //VisIVOFilterDesktop::runFilter(ui->selectFilterComboBox->currentIndex()); } diff --git a/Code/src/sedvisualizerplot.cpp b/Code/src/sedvisualizerplot.cpp index bab2b108..f9d7d1ec 100644 --- a/Code/src/sedvisualizerplot.cpp +++ b/Code/src/sedvisualizerplot.cpp @@ -3,7 +3,6 @@ #include #include "sedplotpointcustom.h" #include "loadingwidget.h" -#include "visivoimporterdesktop.h" #include "vlkbquery.h" #include #include "sedfitgrid_thin.h" diff --git a/Code/src/visivofilterdesktop.cpp b/Code/src/visivofilterdesktop.cpp deleted file mode 100644 index 14967ea9..00000000 --- a/Code/src/visivofilterdesktop.cpp +++ /dev/null @@ -1,133 +0,0 @@ -#include "visivofilterdesktop.h" -#include -#include "singleton.h" -#include "mainwindow.h" -extern "C" { -#include "visivo.h" -} - -VisIVOFilterDesktop::VisIVOFilterDesktop() -{ -} - -void VisIVOFilterDesktop::runFilter(int index) -{ - - switch (index) { - //add identifier - case 0: - addIdentifier(); - break; - //Append - case 1: - break; - //Cartesian 2 Polar - case 2: - break; - //cut - case 3: - break; - //Decimator - case 4: - break; - //Extract List - case 5: - break; - //Extraction - case 6: - break; - //Grid 2 Point - case 7: - break; - //Include - case 8: - break; - //Math Operation - case 9: - break; - //Merge - case 10: - break; - //Module - case 11: - break; - //Multi Resolution - case 12: - break; - //Point distribute - case 13: - break; - //Point Property - case 14: - break; - //Randomizer - case 15: - break; - //Scalar distribution - case 16: - break; - //Select Columns - case 17: - break; - //Select Rows - case 18: - break; - //Sigma Contours - case 19: - break; - //Split tables - case 20: - break; - //Write VO Table - case 21: - break; - default: - break; - } - - -} - -VisIVOFilterDesktop::~VisIVOFilterDesktop() -{ - -} - - - - - - -void VisIVOFilterDesktop::addIdentifier() -{ - MainWindow *w = &Singleton::Instance(); - - QModelIndex selectedItemIndex = w->ui->treeView->selectionModel()->selectedIndexes()[0]; - - - char *filepath = new char[w->selectedFile.toStdString().length() + 1]; - std::strcpy(filepath,w->selectedFile.toStdString().c_str()); - - char *colname = new char[w->ui->addIdNewColName->text().toStdString().length() + 1]; - std::strcpy(colname,w->ui->addIdNewColName->text().toStdString().c_str()); - - char *startnumber = new char[w->ui->addIdStartNumber->text().toStdString().length() + 1]; - std::strcpy(startnumber,w->ui->addIdStartNumber->text().toStdString().c_str()); - - VisIVOFilter env; - int init= VF_Init(&env); - VF_SetAtt(&env, VF_SET_OPERATION,"addId"); - VF_SetAtt(&env, VF_SET_ADDIDSTART,startnumber); - VF_SetAtt(&env, VF_SET_OUTCOL,colname); - VF_SetAtt(&env, VF_SET_FILEVBT,filepath); - VF_Filter(&env); - - - w->m_VisIVOTreeModel->getTable(selectedItemIndex)->readHeader(); - w->m_VisIVOTreeModel->getTable(selectedItemIndex)->readStatistics(); - - w->itemSelected(); - w->ui->tabWidget->setCurrentWidget(w->ui->tabObjectTree); - - -} diff --git a/Code/src/visivoimporterdesktop.cpp b/Code/src/visivoimporterdesktop.cpp index 39c6deae..6045cff4 100644 --- a/Code/src/visivoimporterdesktop.cpp +++ b/Code/src/visivoimporterdesktop.cpp @@ -56,11 +56,13 @@ #include - +/* extern "C" { #include "visivo.h" } +*/ + VisIVOImporterDesktop::VisIVOImporterDesktop(QString f, TreeModel * m, bool isBandMergedCatalogue, vtkwindow_new *v, QString wavelen) { @@ -365,7 +367,6 @@ VisIVOImporterDesktop::VisIVOImporterDesktop(QString f, TreeModel * m, bool isBa tmp=QString::fromStdString( m_VisIVOTable->getTableData()[m_VisIVOTable->getColId("designation160")][i]); //qDebug()<<"tmp 160: "<getTableData()[m_VisIVOTable->getColId("designation70")][i]); //qDebug()<<"tmp 70: "<getTableData()[m_VisIVOTable->getColId("designation24")][i]); //qDebug()<<"tmp 24: "<getTableData()[m_VisIVOTable->getColId("flux22")][i].c_str()); - //flux= flux22Multiplier*atof(m_VisIVOTable->getTableData()[m_VisIVOTable->getColId("flux34")][i].c_str()); - //e_flux= atof(m_VisIVOTable->getTableData()[m_VisIVOTable->getColId("err_flux34")][i].c_str()); e_flux= atof(m_VisIVOTable->getTableData()[m_VisIVOTable->getColId("err_flux22")][i].c_str()); glon=atof(m_VisIVOTable->getTableData()[m_VisIVOTable->getColId("glon22")][i].c_str()); glat=atof(m_VisIVOTable->getTableData()[m_VisIVOTable->getColId("glat22")][i].c_str()); @@ -567,7 +564,6 @@ VisIVOImporterDesktop::VisIVOImporterDesktop(QString f, TreeModel * m, bool isBa tmp=QString::fromStdString( m_VisIVOTable->getTableData()[m_VisIVOTable->getColId("designation21")][i]); //qDebug()<<"tmp 21um: "<getTableData()[m_VisIVOTable->getColId("flux12")][i].c_str()); - // flux= flux22Multiplier*atof(m_VisIVOTable->getTableData()[m_VisIVOTable->getColId("flux46")][i].c_str()); e_flux= atof(m_VisIVOTable->getTableData()[m_VisIVOTable->getColId("err_flux12")][i].c_str()); - // e_flux= atof(m_VisIVOTable->getTableData()[m_VisIVOTable->getColId("err_flux46")][i].c_str()); glon=atof(m_VisIVOTable->getTableData()[m_VisIVOTable->getColId("glon22")][i].c_str()); glat=atof(m_VisIVOTable->getTableData()[m_VisIVOTable->getColId("glat22")][i].c_str()); AstroUtils().sky2xy(vtkwin->filenameWithPath,glon,glat,coord); @@ -1069,13 +1063,8 @@ VisIVOImporterDesktop::VisIVOImporterDesktop(QString f, TreeModel * m, bool isBa else firstSEDNode=false; - - - if(!sed->hasRoot()) sed->setRootNode(node); - - ////qDebug()<<"1.25_ flux:"<workingPath).append(QDir::separator()).append("profile.ascii"); - - QDateTime dt = QDateTime::currentDateTime (); - uint posixDT = dt.toMSecsSinceEpoch (); - - histogramFilePath.append(QString::number(posixDT)); - - - QString locatorQtString = QString(this->m_locator.c_str()); - QString qtColName = QString(this->getColName(i).c_str()); - arguments<< "--op"; - arguments.append("statistic"); - arguments.append("--histogram"); - arguments.append(QString::number(getbinNumber())); - arguments.append("--list"); - arguments.append(qtColName); - arguments.append("--out"); - arguments.append(histogramFilePath); - arguments.append(locatorQtString); - - // qDebug()<setStandardErrorFile(QDir::homePath().append(QDir::separator()).append("VisIVODesktopTemp").append(QDir::separator()).append("log_error.txt"), QIODevice::Append); - myProcess->setStandardOutputFile(QDir::homePath().append(QDir::separator()).append("VisIVODesktopTemp").append(QDir::separator()).append("log_output.txt"), QIODevice::Append); - - myProcess->start(w->filter,arguments); - myProcess->waitForFinished(); - impStatus = myProcess->exitStatus(); -/* - - /* impStatus: - 1 : an error occurred - 0 : OK - */ - /* - if (impStatus) return false; - std::string line,subFirst,subSecond; - ifstream myfile (histogramFilePath.toLatin1()); - if (myfile.is_open()) - { - while (! myfile.eof() ) - { - // the file is an histogram, it has n lines containing 2 strings - // in the form of X(float) N(int) - getline (myfile,line); - std::istringstream iss(line); - iss>>subFirst; - iss>>subSecond; - value=atof(subFirst.c_str()); - if (valuemax) max=value; - if (atoi(subSecond.c_str())>hist_max) hist_max=atoi(subSecond.c_str()); - this->m_histogramValueArray[i][j] =value; - this->m_histogramArray[i][j] = atoi(subSecond.c_str()); - j++; - } - myfile.close(); - QFile::remove(histogramFilePath.toLatin1()); - } - this->m_rangeArray[i][0]=min; - this->m_rangeArray[i][1]=max; - this->m_rangeArray[i][2]=hist_max; - - } - */ return true; } diff --git a/Code/src/vstabledesktop.h b/Code/src/vstabledesktop.h index 78b77345..b8e92dc6 100644 --- a/Code/src/vstabledesktop.h +++ b/Code/src/vstabledesktop.h @@ -33,10 +33,11 @@ #include #include #include - +/* extern "C" { #include "visivo.h" } +*/ class VSTableDesktop : public VSObjectDesktop, QWidget { @@ -76,9 +77,9 @@ private: QHash n160; QHash n70; int m_vialactea_wavelen; - +/* VBT myVBT; - +*/ public: VSTableDesktop(); VSTableDesktop(std::string locator, std::string name = "", std::string description = "", bool statistic=true); diff --git a/Code/src/vtkwindow_new.cpp b/Code/src/vtkwindow_new.cpp index b4826698..2f5f7c3d 100644 --- a/Code/src/vtkwindow_new.cpp +++ b/Code/src/vtkwindow_new.cpp @@ -92,6 +92,7 @@ + VTK_MODULE_INIT(vtkRenderingOpenGL2) VTK_MODULE_INIT(vtkInteractionStyle) VTK_MODULE_INIT(vtkRenderingFreeType) @@ -100,9 +101,7 @@ VTK_MODULE_INIT(vtkRenderingVolumeOpenGL2) #define VTK_NEW(type, instance) vtkSmartPointer instance = vtkSmartPointer::New(); -#ifdef Q_OS_OSX -#include "osxHelper.h" -#endif + class InteractorStyleFreeHandOn3DVisualization : public vtkInteractorStyleDrawPolygon { @@ -1015,10 +1014,6 @@ vtkwindow_new::vtkwindow_new(QWidget *parent, VisPoint * vis) : QMainWindow(pare { ui->setupUi(this); -#ifdef Q_OS_OSX - disableGLHiDPI(ui->qVTK1->winId()); -#endif - stringDictWidget = &Singleton::Instance(); @@ -1060,7 +1055,7 @@ vtkwindow_new::vtkwindow_new(QWidget *parent, VisPoint * vis) : QMainWindow(pare renwin = vtkRenderWindow::New(); renwin->AddRenderer(m_Ren1); renwin->SetInteractor(ui->qVTK1->GetInteractor()); - ui->qVTK1->SetRenderWindow(renwin); + ui->qVTK1->setRenderWindow(renwin); m_Ren1->GlobalWarningDisplayOff(); loadObservedObject(vis); @@ -1172,14 +1167,10 @@ vtkwindow_new::vtkwindow_new(QWidget *parent, vtkSmartPointer vis -#ifdef Q_OS_OSX - disableGLHiDPI(ui->qVTK1->winId()); -#endif - m_Ren1 = vtkRenderer::New(); renwin = vtkRenderWindow::New(); renwin->AddRenderer(m_Ren1); - ui->qVTK1->SetRenderWindow(renwin); + ui->qVTK1->setRenderWindow(renwin); m_Ren1->GlobalWarningDisplayOff(); m_Ren1->SetBackground(0.21,0.23,0.25); @@ -1295,15 +1286,11 @@ vtkwindow_new::vtkwindow_new(QWidget *parent, vtkSmartPointer vis isDatacube=true; ui->setupUi(this); -#ifdef Q_OS_OSX - disableGLHiDPI(ui->qVTK1->winId()); - disableGLHiDPI(ui->isocontourVtkWin->winId()); -#endif m_Ren1 = vtkRenderer::New(); renwin = vtkRenderWindow::New(); renwin->AddRenderer(m_Ren1); - ui->qVTK1->SetRenderWindow(renwin); + ui->qVTK1->setRenderWindow(renwin); m_Ren2 = vtkRenderer::New(); renwin2 = vtkRenderWindow::New(); diff --git a/Code/ui/vtkwindow_new.ui b/Code/ui/vtkwindow_new.ui index cf7709a8..05642edb 100644 --- a/Code/ui/vtkwindow_new.ui +++ b/Code/ui/vtkwindow_new.ui @@ -1386,7 +1386,7 @@ - + 0 @@ -1396,7 +1396,7 @@ - + 0 @@ -1529,9 +1529,9 @@ - QVTKWidget + QVTKOpenGLStereoWidget QWidget -
QVTKWidget.h
+
QVTKOpenGLStereoWidget.h
1 -- GitLab