Merge remote-tracking branch 'origin/master'

Author: smistad

.github/workflows/CI-mac-arm64.yml

@@ -29,7 +29,7 @@ jobs:
         MACOSX_DEPLOYMENT_TARGET: 11.0
         PYTHON_CONFIGURE_OPTS: "--enable-framework"
         CFLAGS: "-Wno-implicit-function-declaration"
-        LDFLAGS: "-L/usr/local/opt/zlib/lib"
+        LDFLAGS: "-L/usr/local/opt/zlib/lib -framework Foundation"
         CPPFLAGS: "-I/usr/local/opt/zlib/include"
         PKG_CONFIG_PATH: "/usr/local/opt/zlib/lib/pkgconfig"
       uses: "gabrielfalcao/pyenv-action@v18"
@@ -39,7 +39,7 @@ jobs:
     - name: Install pip dependencies
       run: |
         pip3 install --upgrade pip
-        pip3 install twine wheel==0.37.1
+        pip3 install twine wheel
 
     - name: Debug
       run: |

source/FAST/DeviceManager.cpp

@@ -263,7 +263,10 @@ bool DeviceManager::deviceSatisfiesCriteria(OpenCLDevice::pointer device,
 
 
 bool DeviceManager::deviceHasOpenGLInteropCapability(const cl::Device &device, const cl::Platform &platform) {
-#ifndef _WIN32
+#ifdef WIN32
+    reportInfo() << "Windows detected, disabling OpenGL interop due to random crashes when rendering image and segmentation at the same time." << reportEnd();
+    return false;
+#else
     if(platform.getInfo<CL_PLATFORM_VENDOR>().find("NVIDIA") != std::string::npos) {
         reportInfo() << "NVIDIA platform was detected on linux, disabling OpenGL interop due to error Xlib extension NV-GLX missing" << reportEnd();
         return false;

source/FAST/Visualization/CMakeLists.txt

@@ -4,7 +4,7 @@ fast_add_sources(
 )
 if(FAST_MODULE_Visualization)
 fast_add_python_interfaces(Renderer.hpp View.hpp Window.hpp SimpleWindow.hpp DualViewWindow.hpp MultiViewWindow.hpp SlicerWindow.hpp LabelColorRenderer.hpp ComputationThread.hpp)
-fast_add_python_shared_pointers(Window SimpleWindow SimpleWindow2D SimpleWindow3D DualViewWindow DualViewWindow2D DualViewWindow3D MultiViewWindow SlicerWindow Renderer View LabelColorRenderer ComputationThread)
+fast_add_python_shared_pointers(Window SimpleWindow SimpleWindow2D SimpleWindow3D DualViewWindow DualViewWindow2D DualViewWindow3D MultiViewWindow SlicerWindow Renderer ImageRendererBase View LabelColorRenderer ComputationThread)
 fast_add_process_object(ImageRenderer ImageRenderer/ImageRenderer.hpp)
 fast_add_sources(
     Window.cpp

source/FAST/Visualization/ImageRenderer/ImageRenderer.cpp

@@ -36,7 +36,7 @@ ImageRenderer::~ImageRenderer() {
     deleteAllTextures();
 }
 
-void ImageRenderer::deleteAllTextures() {
+void ImageRendererBase::deleteAllTextures() {
     // GL cleanup
     for(auto vao : mVAO) {
         glDeleteVertexArrays(1, &vao.second);
@@ -138,7 +138,7 @@ void ImageRenderer::draw(Matrix4f perspectiveMatrix, Matrix4f viewingMatrix, flo
     }
 }
 
-void ImageRenderer::drawTextures(std::unordered_map<uint, std::shared_ptr<SpatialDataObject>> copy, Matrix4f &perspectiveMatrix, Matrix4f &viewingMatrix, bool mode2D, bool useInterpolation, bool useWindowLevel) {
+void ImageRendererBase::drawTextures(std::unordered_map<uint, std::shared_ptr<SpatialDataObject>> copy, Matrix4f &perspectiveMatrix, Matrix4f &viewingMatrix, bool mode2D, bool useInterpolation, bool useWindowLevel) {
     GLuint filterMethod = useInterpolation ? GL_LINEAR : GL_NEAREST;
     for(auto it : copy) {
         auto input = std::static_pointer_cast<Image>(it.second);

source/FAST/Visualization/ImageRenderer/ImageRenderer.hpp

@@ -5,12 +5,41 @@
 
 namespace fast {
 
+/**
+ * @brief Abstract base class use by ImageRenderer and SegmentationRenderer
+ * @ingroup renderers
+ */
+class ImageRendererBase : public virtual Renderer {
+    protected:
+        ImageRendererBase() {};
+        virtual void deleteAllTextures();
+        std::unordered_map<uint, uint> mTexturesToRender;
+        std::unordered_map<uint, Image::pointer> mImageUsed;
+        /**
+         * Timestamp used to generate texture
+         */
+        std::unordered_map<uint, uint64_t> mDataTimestamp;
+        std::unordered_map<uint, uint> mVAO;
+        std::unordered_map<uint, uint> mVBO;
+        std::unordered_map<uint, uint> mEBO;
+
+        cl::Kernel mKernel;
+
+        // Level and window intensities
+        float mWindow = -1;
+        float mLevel = -1;
+        float m_opacity = -1;
+        bool m_applyTransformationsIn2D = false;
+
+        void drawTextures(std::unordered_map<uint, std::shared_ptr<SpatialDataObject>> copy, Matrix4f &perspectiveMatrix, Matrix4f &viewingMatrix, bool mode2D, bool useInterpolation = false, bool useWindowLevel = true);
+};
+
 /**
  * @brief Renders 2D Image data objects, both in 2D and 3D.
  *
  * @ingroup renderers
  */
-class FAST_EXPORT  ImageRenderer : public virtual Renderer {
+class FAST_EXPORT  ImageRenderer : public ImageRendererBase {
     FAST_PROCESS_OBJECT(ImageRenderer)
     public:
         /**
@@ -39,28 +68,7 @@ class FAST_EXPORT  ImageRenderer : public virtual Renderer {
         void
         draw(Matrix4f perspectiveMatrix, Matrix4f viewingMatrix, float zNear, float zFar, bool mode2D, int viewWidth,
              int viewHeight);
-        virtual void deleteAllTextures();
 
-
-        std::unordered_map<uint, uint> mTexturesToRender;
-        std::unordered_map<uint, Image::pointer> mImageUsed;
-        /**
-         * Timestamp used to generate texture
-         */
-        std::unordered_map<uint, uint64_t> mDataTimestamp;
-        std::unordered_map<uint, uint> mVAO;
-        std::unordered_map<uint, uint> mVBO;
-        std::unordered_map<uint, uint> mEBO;
-
-        cl::Kernel mKernel;
-
-        // Level and window intensities
-        float mWindow = -1;
-        float mLevel = -1;
-        float m_opacity = -1;
-        bool m_applyTransformationsIn2D = false;
-
-        void drawTextures(std::unordered_map<uint, std::shared_ptr<SpatialDataObject>> copy, Matrix4f &perspectiveMatrix, Matrix4f &viewingMatrix, bool mode2D, bool useInterpolation = false, bool useWindowLevel = true);
 };
 
 }

source/FAST/Visualization/SegmentationRenderer/SegmentationRenderer.cpp

@@ -52,6 +52,7 @@ SegmentationRenderer::SegmentationRenderer(std::map<uint, Color> labelColors, fl
     mIsModified = false;
 }
 
+
 void
 SegmentationRenderer::draw(Matrix4f perspectiveMatrix, Matrix4f viewingMatrix, float zNear, float zFar, bool mode2D,
                            int viewWidth,
@@ -506,7 +507,7 @@ void SegmentationRenderer::setOpacity(float opacity, float borderOpacity) {
 }
 
 void SegmentationRenderer::deleteAllTextures() {
-    ImageRenderer::deleteAllTextures();
+    ImageRendererBase::deleteAllTextures();
 
     // Clear buffer. Useful when processing a new image
     // Delete all GL data

source/FAST/Visualization/SegmentationRenderer/SegmentationRenderer.hpp

@@ -21,7 +21,7 @@ class ImagePyramid;
  *
  * @ingroup renderers
  */
-class FAST_EXPORT  SegmentationRenderer : public ImageRenderer, public LabelColorRenderer {
+class FAST_EXPORT SegmentationRenderer : public ImageRendererBase, public LabelColorRenderer {
     FAST_PROCESS_OBJECT(SegmentationRenderer)
     public:
         FAST_CONSTRUCTOR(SegmentationRenderer,