From b7dd4efd3d081c1d6e6b42a3f5d244d4d106c396 Mon Sep 17 00:00:00 2001 From: ruanzongcai Date: Wed, 18 Nov 2020 04:57:15 +0800 Subject: [PATCH] The code can be successfully built by QT 5.12.7 on WSL Ubuntu 18.04 GCC 7.4.0 (build.wsl, ~/qmake), and also by QT 4.8.6 on Windows 10 vs 2013 (build_ msvc.bat , qmake.bat) --- build.wsl | 2 +- build_msvc.bat | 14 ++++--- v3d_main/3drenderer/GLee2glew.h | 42 +++++++++---------- v3d_main/3drenderer/nstroke_tracing.cpp | 9 ++-- v3d_main/3drenderer/v3dr_common.h | 2 +- v3d_main/{build.wsl => build_qt5.wsl} | 9 ++-- .../m_terafly/src/control/m_CAnnotations.cpp | 3 ++ .../m_terafly/src/control/m_CConverter.cpp | 1 + .../mozak/m_terafly/src/control/m_CImport.cpp | 2 + .../mozak/m_terafly/src/control/m_CPlugin.cpp | 1 + .../src/presentation/m_PAnoToolBar.cpp | 3 ++ .../src/presentation/m_PConverter.cpp | 1 + .../src/presentation/m_PDialogImport.cpp | 1 + .../presentation/m_PDialogProofreading.cpp | 3 ++ .../src/presentation/m_PDialogProofreading.h | 2 + .../m_terafly/src/presentation/m_PMain.cpp | 1 + .../m_terafly/src/presentation/m_PMain.h | 2 + .../terafly/src/control/CAnnotations.cpp | 1 + v3d_main/mozak/terafly/src/control/CViewer.h | 4 +- .../data_model/GalleryMipImages.cpp | 4 +- .../neuron_annotator/gui/NaZStackWidget.cpp | 3 ++ v3d_main/terafly/src/control/CAnnotations.cpp | 6 ++- v3d_main/terafly/src/control/CPlugin.cpp | 3 +- v3d_main/terafly/src/control/CViewer.cpp | 8 ++-- v3d_main/terafly/src/control/CViewer.h | 1 + v3d_main/terafly/src/control/CVolume.cpp | 1 + .../terafly/src/control/QUndoMarkerCreate.cpp | 3 ++ .../terafly/src/control/QUndoMarkerDelete.cpp | 3 ++ .../src/control/QUndoMarkerDeleteROI.cpp | 3 ++ v3d_main/terafly/src/control/V3Dsubclasses.h | 6 ++- .../terafly/src/presentation/PAnoToolBar.cpp | 3 ++ .../terafly/src/presentation/PConverter.cpp | 1 + .../src/presentation/PDialogImport.cpp | 1 + .../src/presentation/PDialogProofreading.cpp | 3 ++ .../src/presentation/PDialogProofreading.h | 1 + .../presentation/PDialogVirtualPyramid.cpp | 2 + v3d_main/terafly/src/presentation/PMain.h | 2 +- .../src/presentation/PTabVolumeInfo.cpp | 3 ++ .../terafly/src/presentation/QGLRefSys.cpp | 12 +++--- v3d_main/terafly/src/presentation/QGLRefSys.h | 2 +- 40 files changed, 120 insertions(+), 54 deletions(-) rename v3d_main/{build.wsl => build_qt5.wsl} (84%) diff --git a/build.wsl b/build.wsl index ace4dcd119..e69ab8e99b 100644 --- a/build.wsl +++ b/build.wsl @@ -10,7 +10,7 @@ cd v3d_main -sh ./build.wsl $* +sh ./build_qt5.wsl $* cd ../ diff --git a/build_msvc.bat b/build_msvc.bat index 59f419dbb9..161177961c 100644 --- a/build_msvc.bat +++ b/build_msvc.bat @@ -7,11 +7,12 @@ :: echo %# :: if %# gtr 1 ( if "%1" == "clean" ( - echo clean moc_* ui_* qrc_* *.o - del .\v3d\moc_* - del .\v3d\ui_* - del .\v3d\qrc_* - del .\v3d\*.o + echo clean moc_* ui_* qrc_* *.obj + del v3d_main\v3d\moc_* + del v3d_main\v3d\ui_* + del v3d_main\v3d\qrc_* + del v3d_main\v3d\*.obj + goto end ) :: ) @echo on @@ -55,4 +56,5 @@ copy ..\v3d_main\v3d\release\vaa3d_msvc.exe .\ /y dir vaa3d_msvc.exe :: vaa3d_msvc.exe -cd ..\ \ No newline at end of file +cd ..\ +:end diff --git a/v3d_main/3drenderer/GLee2glew.h b/v3d_main/3drenderer/GLee2glew.h index 863f984032..25e2eadbde 100644 --- a/v3d_main/3drenderer/GLee2glew.h +++ b/v3d_main/3drenderer/GLee2glew.h @@ -61,27 +61,27 @@ Since the actual OpenGL code makes no references to Qt, then it doesn't have to //@2020-10-31 RZC: fixed crash by USING (glewExperimental=true) BEFORE glewInit() AT LINUX #if 0// ! defined( USE_Qt5 ) - -#include ////for error: #error qdatastream.h must be included before any header file that defines Status -#define GLEW_STATIC ////STATIC link by including glew.c into GLee2glew.c -#include ////STATIC link by including GLee_r.c into GLee2glew.c -//#undef GL_ARB_vertex_buffer_object -//#include "GLee_r.h" -#include ////for error: gluErrorString was not declared in this scope - -#if ! (defined(_WIN32) || defined(_WIN64))// old EXT only for WINDOWS -#define glBlendEquationEXT glBlendEquation -#define glBlendColorEXT glBlendColor -#define glTexImage3DEXT glTexImage3D -#define glTexSubImage3DEXT glTexSubImage3D -//#define glGenBuffersARB glGenBuffers -//#define glBindBufferARB glBindBuffer -//#define glDeleteBuffersARB glDeleteBuffers -//#define glMapBufferARB glMapBuffer -//#define glUnmapBufferARB glUnmapBuffer -//#define glBufferDataARB glBufferData -#endif - +// +//#include ////for error: #error qdatastream.h must be included before any header file that defines Status +//#define GLEW_STATIC ////STATIC link by including glew.c into GLee2glew.c +//#include ////STATIC link by including GLee_r.c into GLee2glew.c +////#undef GL_ARB_vertex_buffer_object +////#include "GLee_r.h" +//#include ////for error: gluErrorString was not declared in this scope +// +//#if ! (defined(_WIN32) || defined(_WIN64))// old EXT only for WINDOWS +//#define glBlendEquationEXT glBlendEquation +//#define glBlendColorEXT glBlendColor +//#define glTexImage3DEXT glTexImage3D +//#define glTexSubImage3DEXT glTexSubImage3D +////#define glGenBuffersARB glGenBuffers +////#define glBindBufferARB glBindBuffer +////#define glDeleteBuffersARB glDeleteBuffers +////#define glMapBufferARB glMapBuffer +////#define glUnmapBufferARB glUnmapBuffer +////#define glBufferDataARB glBufferData +//#endif +// #else #define GLEW_STATIC ////STATIC link by including glew.c into GLee2glew.c diff --git a/v3d_main/3drenderer/nstroke_tracing.cpp b/v3d_main/3drenderer/nstroke_tracing.cpp index ac0176d11f..749e440b40 100644 --- a/v3d_main/3drenderer/nstroke_tracing.cpp +++ b/v3d_main/3drenderer/nstroke_tracing.cpp @@ -15,9 +15,9 @@ 2. You agree to appropriately cite this work in your related studies and publications. - Peng, H., Ruan, Z., Long, F., Simpson, J.H., and Myers, E.W. (2010) “V3D enables real-time 3D visualization and quantitative analysis of large-scale biological image data sets,” Nature Biotechnology, Vol. 28, No. 4, pp. 348-353, DOI: 10.1038/nbt.1612. ( http://penglab.janelia.org/papersall/docpdf/2010_NBT_V3D.pdf ) + Peng, H., Ruan, Z., Long, F., Simpson, J.H., and Myers, E.W. (2010) V3D enables real-time 3D visualization and quantitative analysis of large-scale biological image data sets,鈥� Nature Biotechnology, Vol. 28, No. 4, pp. 348-353, DOI: 10.1038/nbt.1612. ( http://penglab.janelia.org/papersall/docpdf/2010_NBT_V3D.pdf ) - Peng, H, Ruan, Z., Atasoy, D., and Sternson, S. (2010) “Automatic reconstruction of 3D neuron structures using a graph-augmented deformable model,” Bioinformatics, Vol. 26, pp. i38-i46, 2010. ( http://penglab.janelia.org/papersall/docpdf/2010_Bioinfo_GD_ISMB2010.pdf ) + Peng, H, Ruan, Z., Atasoy, D., and Sternson, S. (2010) Automatic reconstruction of 3D neuron structures using a graph-augmented deformable model, Bioinformatics, Vol. 26, pp. i38-i46, 2010. ( http://penglab.janelia.org/papersall/docpdf/2010_Bioinfo_GD_ISMB2010.pdf ) 3. This software is provided by the copyright holders (Hanchuan Peng), Howard Hughes Medical Institute, Janelia Farm Research Campus, and contributors "as is" and any express or implied warranties, including, but not limited to, any implied warranties of merchantability, non-infringement, or fitness for a particular purpose are disclaimed. In no event shall the copyright owner, Howard Hughes Medical Institute, Janelia Farm Research Campus, or contributors be liable for any direct, indirect, incidental, special, exemplary, or consequential damages (including, but not limited to, procurement of substitute goods or services; loss of use, data, or profits; reasonable royalties; or business interruption) however caused and on any theory of liability, whether in contract, strict liability, or tort (including negligence or otherwise) arising in any way out of the use of this software, even if advised of the possibility of such damage. @@ -54,7 +54,8 @@ * */ -#include "renderer_gl1.h" +//#include "renderer_gl1.h" +#include "renderer_gl2.h" #include "v3dr_glwidget.h" #include "barFigureDialog.h" #include "v3d_application.h" @@ -1290,7 +1291,7 @@ void Renderer_gl1::adaptiveCurveResamplingRamerDouglasPeucker(vector &loc_ void Renderer_gl1::recursiveRamerDouglasPeucker(vector &loc_vec, vector &loc_vec_resampled, int start_i, int end_i, float epsilon) { - // Recursive Ramer–Douglas–Peucker algorithm + // Recursive Ramer鈥揇ouglas鈥揚eucker algorithm loc_vec_resampled.clear(); XYZ & loc_start = loc_vec.at(start_i); XYZ & loc_final = loc_vec.at(end_i); diff --git a/v3d_main/3drenderer/v3dr_common.h b/v3d_main/3drenderer/v3dr_common.h index 2e5c2cd2cb..f882997516 100644 --- a/v3d_main/3drenderer/v3dr_common.h +++ b/v3d_main/3drenderer/v3dr_common.h @@ -56,6 +56,7 @@ Peng, H, Ruan, Z., Atasoy, D., and Sternson, S. (2010) ?�Automatic reconstruct //#endif //#include "GLee_r.h" //must before any other OpengGL header file// minor modified glee.h for win32 compatible, by RZC 2008-09-12 //#include "GLee2glew.h" //// change place to head of every *.cpp using GL extensions +#include "GLee2glew.h" //@ADD 2020-2-14 RZC // #include // #include @@ -63,7 +64,6 @@ Peng, H, Ruan, Z., Atasoy, D., and Sternson, S. (2010) ?�Automatic reconstruct #include #include #else - #include "GLee2glew.h" //@ADD 2020-2-14 RZC #include #endif diff --git a/v3d_main/build.wsl b/v3d_main/build_qt5.wsl similarity index 84% rename from v3d_main/build.wsl rename to v3d_main/build_qt5.wsl index 29210fa2fb..a9e94274f5 100644 --- a/v3d_main/build.wsl +++ b/v3d_main/build_qt5.wsl @@ -8,14 +8,16 @@ #echo on ARGS=$* -QARGS='DEFINES+=USE_Qt5' #'QMAKE_LFLAGS+=-no-pie' +QARGS='DEFINES+=USE_Qt5 QMAKE_LFLAGS+=-no-pie' if [ $# -ge 1 ]; then if [ "$1" = "clean" ]; then - echo clean moc_* ui_* qrc_* + echo clean moc_* ui_* qrc_* *.o rm ./v3d/moc_* rm ./v3d/ui_* rm ./v3d/qrc_* + rm ./v3d/*.o + exit fi fi @@ -27,11 +29,12 @@ echo ========================================================== touch v3d_version_info.cpp make $ARGS -if [ !-e "../../bin"]; then +if [ ! -d ../../bin ]; then mkdir ../../bin fi cd ../../bin cp ../v3d_main/v3d/vaa3d ./ echo =========================================================== +pwd ls -l vaa3d diff --git a/v3d_main/mozak/m_terafly/src/control/m_CAnnotations.cpp b/v3d_main/mozak/m_terafly/src/control/m_CAnnotations.cpp index 75f2bc9abb..fd38904d91 100644 --- a/v3d_main/mozak/m_terafly/src/control/m_CAnnotations.cpp +++ b/v3d_main/mozak/m_terafly/src/control/m_CAnnotations.cpp @@ -1,3 +1,6 @@ + +#include "renderer_gl1.h" + #include #include #include diff --git a/v3d_main/mozak/m_terafly/src/control/m_CConverter.cpp b/v3d_main/mozak/m_terafly/src/control/m_CConverter.cpp index d8aab97026..97e4f79acb 100644 --- a/v3d_main/mozak/m_terafly/src/control/m_CConverter.cpp +++ b/v3d_main/mozak/m_terafly/src/control/m_CConverter.cpp @@ -25,6 +25,7 @@ * 4. Neither the name of University Campus Bio-Medico of Rome, nor Alessandro Bria and Giulio Iannello, may be used to endorse or promote products derived from this software without * specific prior written permission. ********************************************************************************************************************************************************************************************/ +#include "renderer_gl1.h" #include "m_CConverter.h" #include "m_CPlugin.h" diff --git a/v3d_main/mozak/m_terafly/src/control/m_CImport.cpp b/v3d_main/mozak/m_terafly/src/control/m_CImport.cpp index 44f5edc16d..6c3882d2c1 100644 --- a/v3d_main/mozak/m_terafly/src/control/m_CImport.cpp +++ b/v3d_main/mozak/m_terafly/src/control/m_CImport.cpp @@ -25,6 +25,8 @@ * 4. Neither the name of University Campus Bio-Medico of Rome, nor Alessandro Bria and Giulio Iannello, may be used to endorse or promote products derived from this software without * specific prior written permission. ********************************************************************************************************************************************************************************************/ +#include "renderer_gl1.h" + #include "m_PDialogImport.h" #include "m_PMain.h" diff --git a/v3d_main/mozak/m_terafly/src/control/m_CPlugin.cpp b/v3d_main/mozak/m_terafly/src/control/m_CPlugin.cpp index 61155d987b..a032fa23a3 100644 --- a/v3d_main/mozak/m_terafly/src/control/m_CPlugin.cpp +++ b/v3d_main/mozak/m_terafly/src/control/m_CPlugin.cpp @@ -25,6 +25,7 @@ * 4. Neither the name of University Campus Bio-Medico of Rome, nor Alessandro Bria and Giulio Iannello, may be used to endorse or promote products derived from this software without * specific prior written permission. ********************************************************************************************************************************************************************************************/ +#include "renderer_gl1.h" #include #include "v3d_interface.h" diff --git a/v3d_main/mozak/m_terafly/src/presentation/m_PAnoToolBar.cpp b/v3d_main/mozak/m_terafly/src/presentation/m_PAnoToolBar.cpp index f179dd8c6e..7d81dd11aa 100644 --- a/v3d_main/mozak/m_terafly/src/presentation/m_PAnoToolBar.cpp +++ b/v3d_main/mozak/m_terafly/src/presentation/m_PAnoToolBar.cpp @@ -1,3 +1,6 @@ + +#include "renderer_gl1.h" + #include "m_PAnoToolBar.h" #include "m_PMain.h" #include "m_CViewer.h" diff --git a/v3d_main/mozak/m_terafly/src/presentation/m_PConverter.cpp b/v3d_main/mozak/m_terafly/src/presentation/m_PConverter.cpp index 33803fce71..690d2cfe4c 100644 --- a/v3d_main/mozak/m_terafly/src/presentation/m_PConverter.cpp +++ b/v3d_main/mozak/m_terafly/src/presentation/m_PConverter.cpp @@ -25,6 +25,7 @@ * 4. Neither the name of University Campus Bio-Medico of Rome, nor Alessandro Bria and Giulio Iannello, may be used to endorse or promote products derived from this software without * specific prior written permission. ********************************************************************************************************************************************************************************************/ +#include "renderer_gl1.h" #include "m_PConverter.h" #include "m_PMain.h" diff --git a/v3d_main/mozak/m_terafly/src/presentation/m_PDialogImport.cpp b/v3d_main/mozak/m_terafly/src/presentation/m_PDialogImport.cpp index f11d7f3d1f..b5a814d436 100644 --- a/v3d_main/mozak/m_terafly/src/presentation/m_PDialogImport.cpp +++ b/v3d_main/mozak/m_terafly/src/presentation/m_PDialogImport.cpp @@ -25,6 +25,7 @@ * 4. Neither the name of University Campus Bio-Medico of Rome, nor Alessandro Bria and Giulio Iannello, may be used to endorse or promote products derived from this software without * specific prior written permission. ********************************************************************************************************************************************************************************************/ +#include "renderer_gl1.h" #include "m_PDialogImport.h" #include "m_PMain.h" diff --git a/v3d_main/mozak/m_terafly/src/presentation/m_PDialogProofreading.cpp b/v3d_main/mozak/m_terafly/src/presentation/m_PDialogProofreading.cpp index c45872e3b1..7ba222433d 100644 --- a/v3d_main/mozak/m_terafly/src/presentation/m_PDialogProofreading.cpp +++ b/v3d_main/mozak/m_terafly/src/presentation/m_PDialogProofreading.cpp @@ -1,3 +1,6 @@ + +#include "renderer_gl1.h" + #include "m_PDialogProofreading.h" #include "m_PMain.h" #include "m_CVolume.h" diff --git a/v3d_main/mozak/m_terafly/src/presentation/m_PDialogProofreading.h b/v3d_main/mozak/m_terafly/src/presentation/m_PDialogProofreading.h index e5bbc06a4d..a26add5c66 100644 --- a/v3d_main/mozak/m_terafly/src/presentation/m_PDialogProofreading.h +++ b/v3d_main/mozak/m_terafly/src/presentation/m_PDialogProofreading.h @@ -1,6 +1,8 @@ #ifndef PDIALOGPROOFREADING_H #define PDIALOGPROOFREADING_H +#include "v3dr_common.h" + #include #include #include "m_CPlugin.h" diff --git a/v3d_main/mozak/m_terafly/src/presentation/m_PMain.cpp b/v3d_main/mozak/m_terafly/src/presentation/m_PMain.cpp index e8995b8aed..8975db7705 100644 --- a/v3d_main/mozak/m_terafly/src/presentation/m_PMain.cpp +++ b/v3d_main/mozak/m_terafly/src/presentation/m_PMain.cpp @@ -25,6 +25,7 @@ * 4. Neither the name of University Campus Bio-Medico of Rome, nor Alessandro Bria and Giulio Iannello, may be used to endorse or promote products derived from this software without * specific prior written permission. ********************************************************************************************************************************************************************************************/ +#include "renderer_gl1.h" #include "m_PMain.h" #include "m_PDialogImport.h" diff --git a/v3d_main/mozak/m_terafly/src/presentation/m_PMain.h b/v3d_main/mozak/m_terafly/src/presentation/m_PMain.h index f4d5bbe215..042e3748b4 100644 --- a/v3d_main/mozak/m_terafly/src/presentation/m_PMain.h +++ b/v3d_main/mozak/m_terafly/src/presentation/m_PMain.h @@ -29,6 +29,8 @@ #ifndef PMAIN_GUI_H #define PMAIN_GUI_H +#include "v3dr_common.h" + #include #include #include "v3dr_glwidget.h" diff --git a/v3d_main/mozak/terafly/src/control/CAnnotations.cpp b/v3d_main/mozak/terafly/src/control/CAnnotations.cpp index 01f9babb05..3359016ac3 100644 --- a/v3d_main/mozak/terafly/src/control/CAnnotations.cpp +++ b/v3d_main/mozak/terafly/src/control/CAnnotations.cpp @@ -1,3 +1,4 @@ + #include #include #include diff --git a/v3d_main/mozak/terafly/src/control/CViewer.h b/v3d_main/mozak/terafly/src/control/CViewer.h index cb48a9e181..12a2085e1d 100644 --- a/v3d_main/mozak/terafly/src/control/CViewer.h +++ b/v3d_main/mozak/terafly/src/control/CViewer.h @@ -35,9 +35,11 @@ #ifndef CEXPLORERWINDOW_H #define CEXPLORERWINDOW_H +#include "renderer_gl2.h" + #include "CPlugin.h" #include "v3dr_mainwindow.h" -#include "renderer_gl2.h" +//#include "renderer_gl2.h" #include "CImport.h" #include "v3d_imaging_para.h" diff --git a/v3d_main/neuron_annotator/data_model/GalleryMipImages.cpp b/v3d_main/neuron_annotator/data_model/GalleryMipImages.cpp index 922d5b5bda..d4b67d1388 100644 --- a/v3d_main/neuron_annotator/data_model/GalleryMipImages.cpp +++ b/v3d_main/neuron_annotator/data_model/GalleryMipImages.cpp @@ -1,6 +1,6 @@ -//#include "../../3drenderer/GLee_r.h" -//#include "../../3drenderer/GLee2glew.h" + +#include "v3dr_common.h" #include "GalleryMipImages.h" #include "../gui/GalleryButton.h" diff --git a/v3d_main/neuron_annotator/gui/NaZStackWidget.cpp b/v3d_main/neuron_annotator/gui/NaZStackWidget.cpp index 2fde6812bd..a2f5792821 100644 --- a/v3d_main/neuron_annotator/gui/NaZStackWidget.cpp +++ b/v3d_main/neuron_annotator/gui/NaZStackWidget.cpp @@ -1,3 +1,6 @@ + +#include "v3dr_common.h" + #include "NaZStackWidget.h" #include #include diff --git a/v3d_main/terafly/src/control/CAnnotations.cpp b/v3d_main/terafly/src/control/CAnnotations.cpp index 2a999a1ebc..e108ce8116 100644 --- a/v3d_main/terafly/src/control/CAnnotations.cpp +++ b/v3d_main/terafly/src/control/CAnnotations.cpp @@ -1,3 +1,5 @@ +#include "renderer_gl1.h" +//#include "renderer.h" #include #include #include @@ -14,8 +16,8 @@ #include "COperation.h" #include "CImageUtils.h" #include "../presentation/PLog.h" -#include "renderer_gl1.h" -#include "renderer.h" +//#include "renderer_gl1.h" +//#include "renderer.h" #include "../../../../3drenderer/v3dr_surfaceDialog.h" double SOMA_X = -1.1; diff --git a/v3d_main/terafly/src/control/CPlugin.cpp b/v3d_main/terafly/src/control/CPlugin.cpp index 98e0edca7e..aeed1ccd56 100644 --- a/v3d_main/terafly/src/control/CPlugin.cpp +++ b/v3d_main/terafly/src/control/CPlugin.cpp @@ -25,6 +25,7 @@ * 4. Neither the name of University Campus Bio-Medico of Rome, nor Alessandro Bria and Giulio Iannello, may be used to endorse or promote products derived from this software without * specific prior written permission. ********************************************************************************************************************************************************************************************/ +#include "renderer_gl1.h" #include #include "v3d_interface.h" @@ -554,4 +555,4 @@ INeuronAssembler* tf::PluginInterface::getTeraflyCViewer() return interfacePtr; } #endif -// -------------------------------------------------------------------------------------------------------- // \ No newline at end of file +// -------------------------------------------------------------------------------------------------------- // diff --git a/v3d_main/terafly/src/control/CViewer.cpp b/v3d_main/terafly/src/control/CViewer.cpp index b76e32f824..040bc7fa68 100644 --- a/v3d_main/terafly/src/control/CViewer.cpp +++ b/v3d_main/terafly/src/control/CViewer.cpp @@ -35,6 +35,8 @@ * 2014-11-17. Alessandro. @ADDED 'anoV0', ..., 'anoD1' VOI annotation (global) coordinates as object members in order to fix "duplicated annotations" bug */ +#include "renderer_gl1.h" +//#include "renderer.h" #include "CViewer.h" #include "v3dr_mainwindow.h" #include "CVolume.h" @@ -45,8 +47,8 @@ #include "../presentation/PLog.h" #include "../presentation/PAnoToolBar.h" #include "../presentation/PDialogProofreading.h" -#include "renderer.h" -#include "renderer_gl1.h" +//#include "renderer.h" +//#include "renderer_gl1.h" #include "v3dr_colormapDialog.h" #include "V3Dsubclasses.h" #include "QUndoMarkerCreate.h" @@ -3568,4 +3570,4 @@ void CViewer::getParamsFromFragTraceUI(const string& keyName, const float& value thisRenderer->fragTraceParams.insert(pair(keyName, value)); } #endif -/* ======= END of [CViewer's implementation of the virtuals inherited from INeuronAssembler] =======*/ \ No newline at end of file +/* ======= END of [CViewer's implementation of the virtuals inherited from INeuronAssembler] =======*/ diff --git a/v3d_main/terafly/src/control/CViewer.h b/v3d_main/terafly/src/control/CViewer.h index fa8f292351..2da0fd1cf6 100644 --- a/v3d_main/terafly/src/control/CViewer.h +++ b/v3d_main/terafly/src/control/CViewer.h @@ -35,6 +35,7 @@ #ifndef CEXPLORERWINDOW_H #define CEXPLORERWINDOW_H +#include "v3dr_common.h" #include "CPlugin.h" #include "v3dr_mainwindow.h" diff --git a/v3d_main/terafly/src/control/CVolume.cpp b/v3d_main/terafly/src/control/CVolume.cpp index 10b8ec822a..c7b1e3441a 100644 --- a/v3d_main/terafly/src/control/CVolume.cpp +++ b/v3d_main/terafly/src/control/CVolume.cpp @@ -25,6 +25,7 @@ * 4. Neither the name of University Campus Bio-Medico of Rome, nor Alessandro Bria and Giulio Iannello, may be used to endorse or promote products derived from this software without * specific prior written permission. ********************************************************************************************************************************************************************************************/ +#include "renderer_gl1.h" #include #include "CVolume.h" diff --git a/v3d_main/terafly/src/control/QUndoMarkerCreate.cpp b/v3d_main/terafly/src/control/QUndoMarkerCreate.cpp index 0d59152fb6..a47918a347 100644 --- a/v3d_main/terafly/src/control/QUndoMarkerCreate.cpp +++ b/v3d_main/terafly/src/control/QUndoMarkerCreate.cpp @@ -1,3 +1,6 @@ + +#include "renderer_gl1.h" + #include "QUndoMarkerCreate.h" #include "../control/CViewer.h" #include "v3dr_glwidget.h" diff --git a/v3d_main/terafly/src/control/QUndoMarkerDelete.cpp b/v3d_main/terafly/src/control/QUndoMarkerDelete.cpp index 44a563408c..25e347988f 100644 --- a/v3d_main/terafly/src/control/QUndoMarkerDelete.cpp +++ b/v3d_main/terafly/src/control/QUndoMarkerDelete.cpp @@ -1,3 +1,6 @@ + +#include "renderer_gl1.h" + #include "QUndoMarkerDelete.h" #include "../control/CViewer.h" #include "v3dr_glwidget.h" diff --git a/v3d_main/terafly/src/control/QUndoMarkerDeleteROI.cpp b/v3d_main/terafly/src/control/QUndoMarkerDeleteROI.cpp index a013bea398..ef110c7ac4 100644 --- a/v3d_main/terafly/src/control/QUndoMarkerDeleteROI.cpp +++ b/v3d_main/terafly/src/control/QUndoMarkerDeleteROI.cpp @@ -1,3 +1,6 @@ + +#include "renderer_gl1.h" + #include "QUndoMarkerDeleteROI.h" #include "../control/CViewer.h" #include "v3dr_glwidget.h" diff --git a/v3d_main/terafly/src/control/V3Dsubclasses.h b/v3d_main/terafly/src/control/V3Dsubclasses.h index 2a56c5f826..c6bf6522f3 100644 --- a/v3d_main/terafly/src/control/V3Dsubclasses.h +++ b/v3d_main/terafly/src/control/V3Dsubclasses.h @@ -1,13 +1,15 @@ #ifndef V3DSUBCLASSES_H #define V3DSUBCLASSES_H -#include "CPlugin.h" -#include "renderer_gl1.h" + +//#include "renderer_gl1.h" #include "renderer_gl2.h" #include "v3dr_glwidget.h" #include "v3dr_mainwindow.h" #include "v3d_imaging_para.h" +#include "CPlugin.h" + /********************************************************************************** * Vaa3D subclasses needed to access/override protected members/methods ***********************************************************************************/ diff --git a/v3d_main/terafly/src/presentation/PAnoToolBar.cpp b/v3d_main/terafly/src/presentation/PAnoToolBar.cpp index 4db33fc8bf..280910b9c2 100644 --- a/v3d_main/terafly/src/presentation/PAnoToolBar.cpp +++ b/v3d_main/terafly/src/presentation/PAnoToolBar.cpp @@ -1,3 +1,6 @@ + +#include "renderer_gl1.h" + #include "PAnoToolBar.h" #include "PMain.h" #include "../control/CViewer.h" diff --git a/v3d_main/terafly/src/presentation/PConverter.cpp b/v3d_main/terafly/src/presentation/PConverter.cpp index 10b67ebf4d..5d09f93bd2 100644 --- a/v3d_main/terafly/src/presentation/PConverter.cpp +++ b/v3d_main/terafly/src/presentation/PConverter.cpp @@ -25,6 +25,7 @@ * 4. Neither the name of University Campus Bio-Medico of Rome, nor Alessandro Bria and Giulio Iannello, may be used to endorse or promote products derived from this software without * specific prior written permission. ********************************************************************************************************************************************************************************************/ +#include "renderer_gl1.h" #include "PConverter.h" #include "PMain.h" diff --git a/v3d_main/terafly/src/presentation/PDialogImport.cpp b/v3d_main/terafly/src/presentation/PDialogImport.cpp index 37afddb80c..bd202b994a 100644 --- a/v3d_main/terafly/src/presentation/PDialogImport.cpp +++ b/v3d_main/terafly/src/presentation/PDialogImport.cpp @@ -25,6 +25,7 @@ * 4. Neither the name of University Campus Bio-Medico of Rome, nor Alessandro Bria and Giulio Iannello, may be used to endorse or promote products derived from this software without * specific prior written permission. ********************************************************************************************************************************************************************************************/ +#include "renderer_gl1.h" #include "PDialogImport.h" #include "PMain.h" diff --git a/v3d_main/terafly/src/presentation/PDialogProofreading.cpp b/v3d_main/terafly/src/presentation/PDialogProofreading.cpp index 0a3542eebd..258ab5fb41 100644 --- a/v3d_main/terafly/src/presentation/PDialogProofreading.cpp +++ b/v3d_main/terafly/src/presentation/PDialogProofreading.cpp @@ -1,3 +1,6 @@ + +#include "renderer_gl1.h" + #include "PDialogProofreading.h" #include "PMain.h" #include "../control/CVolume.h" diff --git a/v3d_main/terafly/src/presentation/PDialogProofreading.h b/v3d_main/terafly/src/presentation/PDialogProofreading.h index ed2b8eec82..fcb4302dca 100644 --- a/v3d_main/terafly/src/presentation/PDialogProofreading.h +++ b/v3d_main/terafly/src/presentation/PDialogProofreading.h @@ -1,6 +1,7 @@ #ifndef PDIALOGPROOFREADING_H #define PDIALOGPROOFREADING_H +#include "v3dr_common.h" #include #include diff --git a/v3d_main/terafly/src/presentation/PDialogVirtualPyramid.cpp b/v3d_main/terafly/src/presentation/PDialogVirtualPyramid.cpp index 6f720310df..01ecf0a8dc 100644 --- a/v3d_main/terafly/src/presentation/PDialogVirtualPyramid.cpp +++ b/v3d_main/terafly/src/presentation/PDialogVirtualPyramid.cpp @@ -3,6 +3,8 @@ // All rights reserved. //------------------------------------------------------------------------------------------------ +#include "renderer_gl1.h" + #include "PDialogVirtualPyramid.h" #include "PMain.h" #include "../control/CImport.h" diff --git a/v3d_main/terafly/src/presentation/PMain.h b/v3d_main/terafly/src/presentation/PMain.h index 47b8e0be6c..6f5ce98845 100644 --- a/v3d_main/terafly/src/presentation/PMain.h +++ b/v3d_main/terafly/src/presentation/PMain.h @@ -30,7 +30,7 @@ #define PMAIN_GUI_H -//#include "../control/CVolume.h" +#include "renderer_gl2.h" #include #include diff --git a/v3d_main/terafly/src/presentation/PTabVolumeInfo.cpp b/v3d_main/terafly/src/presentation/PTabVolumeInfo.cpp index 652ed0b6e1..c1ddbfeadc 100644 --- a/v3d_main/terafly/src/presentation/PTabVolumeInfo.cpp +++ b/v3d_main/terafly/src/presentation/PTabVolumeInfo.cpp @@ -1,3 +1,6 @@ + +#include "renderer_gl1.h" + #include "PTabVolumeInfo.h" #include "CImport.h" #include "VirtualVolume.h" diff --git a/v3d_main/terafly/src/presentation/QGLRefSys.cpp b/v3d_main/terafly/src/presentation/QGLRefSys.cpp index 2d43436663..22b6da529a 100644 --- a/v3d_main/terafly/src/presentation/QGLRefSys.cpp +++ b/v3d_main/terafly/src/presentation/QGLRefSys.cpp @@ -1,9 +1,11 @@ -#if defined(USE_Qt5) -#include -#include -#endif + +#include "renderer_gl1.h" + +//#if defined(USE_Qt5) +//#include +//#include +//#endif #include "QGLRefSys.h" -//#include "renderer_gl1.h" #ifndef GL_MULTISAMPLE #define GL_MULTISAMPLE 0x809D diff --git a/v3d_main/terafly/src/presentation/QGLRefSys.h b/v3d_main/terafly/src/presentation/QGLRefSys.h index 458a0e4810..2aab3fa262 100644 --- a/v3d_main/terafly/src/presentation/QGLRefSys.h +++ b/v3d_main/terafly/src/presentation/QGLRefSys.h @@ -1,7 +1,7 @@ #ifndef QGLREFSYS_H #define QGLREFSYS_H -#include "renderer_gl1.h" +//#include "renderer_gl1.h" #include #include "../control/CPlugin.h"