Merge pull request #21 from divital-coder/multi_image_support

Final Google Summer of Code 2024, Pull Request

Author: jakubMitura14

Project.toml

@@ -15,10 +15,13 @@ FreeTypeAbstraction = "663a7486-cb36-511b-a19d-713bb74d65c9"
 GLFW = "f7f18e0c-5ee9-5ccd-a5bf-e8befd85ed98"
 GeometryTypes = "4d00f742-c7ba-57c2-abde-4428a4b178cb"
 HDF5 = "f67ccb44-e63f-5c2f-98bd-6dc0ccc4ba2f"
+KernelAbstractions = "63c18a36-062a-441e-b654-da1e3ab1ce7c"
+LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
 Logging = "56ddb016-857b-54e1-b83d-db4d58db5568"
 MedEval3D = "07fe485e-7252-451c-a484-d20a4cdbbf79"
 MedImages = "fbff095b-7891-4fc4-b5e5-3cd99b9dd225"
 ModernGL = "66fc600b-dfda-50eb-8b99-91cfa97b1301"
+NIfTI ="a3a9e032-41b5-5fc4-967a-a6b7a19844d3"
 Observables = "510215fc-4207-5dde-b226-833fc4488ee2"
 Parameters = "d96e819e-fc66-5662-9728-84c9c7592b0a"
 Setfield = "efcf1570-3423-57d1-acb7-fd33fddbac46"

src/MedEye3d.jl

@@ -16,6 +16,7 @@ export SegmentationDisplay
 export OpenGLDisplayUtils
 # export  DisplayWords.textLinesFromStrings
 export StructsManag
+export ShadersAndVerticiesForSuperVoxels
 # export  DisplayWords.textLinesFromStrings
 # export  StructsManag.getThreeDims
 
@@ -35,10 +36,10 @@ include(joinpath("display", "GLFW", "DispUtils", "OpenGLDisplayUtils.jl"))
 include(joinpath("display", "GLFW", "shadersEtc", "ShadersAndVerticies.jl"))
 include(joinpath("display", "GLFW", "shadersEtc", "ShadersAndVerticiesForText.jl"))
 include(joinpath("display", "GLFW", "shadersEtc", "Uniforms.jl"))
-
 include(joinpath("display", "GLFW", "textRender", "DisplayWords.jl"))
-
 include(joinpath("display", "GLFW", "DispUtils", "TextureManag.jl"))
+include(joinpath("display", "GLFW", "shadersEtc", "ShadersAndVerticiesForLine.jl"))
+include(joinpath("display", "GLFW", "shadersEtc", "ShadersAndVerticiesForSupervoxels.jl"))
 include(joinpath("display", "GLFW", "startModules", "PrepareWindow.jl"))
 
 

src/display/GLFW/DispUtils/OpenGLDisplayUtils.jl

@@ -1,22 +1,23 @@
 
 module OpenGLDisplayUtils
-export  basicRender
+export basicRender
 using ModernGL
-using GLFW,Base.Threads
-
-
-
-
+using GLFW, Base.Threads
+# using ..ShadersAndVerticiesForLine
 
 """
 As most functions will deal with just addind the quad to the screen
 and swapping buffers
+
+Incorporating rendering for crosshair
 """
+# function basicRender(window)
+#     glDrawElements(GL_TRIANGLES, 6, GL_UNSIGNED_INT, C_NULL)
+# end
+
 function basicRender(window)
-		glDrawElements(GL_TRIANGLES, 6, GL_UNSIGNED_INT, C_NULL)
-		# Swap front and back buffers
-		GLFW.SwapBuffers(window)
+    glDrawElements(GL_TRIANGLES, 6, GL_UNSIGNED_INT, C_NULL)
+    # Swap front and back buffers
+    GLFW.SwapBuffers(window)
 end
-
-
 end #..OpenGLDisplayUtils

src/display/GLFW/DispUtils/StructsManag.jl

@@ -3,11 +3,14 @@ stores functions needed to create bind and update OpenGl textues
 """
 module TextureManag
 using Base: Float16
+using GLFW
 using ModernGL, Base.Threads, Logging, Setfield
 using ..OpenGLDisplayUtils, ..ForDisplayStructs, ..Uniforms, ..CustomFragShad, ..DataStructs, ..DisplayWords
 export activateTextures, addTextToTexture, initializeTextures, createTexture, getProperGL_TEXTURE, updateImagesDisplayed, updateTexture, assignUniformsAndTypesToMasks
 
 
+
+
 """
 uploading data to given texture; of given types associated - specified in TextureSpec
 if we want to update only part of the texture we need to specify  offset and size of texture we use
@@ -138,45 +141,112 @@ function getProperGL_TEXTURE(index::Int)::UInt32
     return eval(Meta.parse("GL_TEXTURE$(index)"))
 end#getProperGL_TEXTURE
 
+"""
+Defines the switching of vao buffers for the rendering of
+dynamic crosshair
+"""
+# function crosshairDisplay(crosshair::GlShaderAndBufferFields, mainRect::GlShaderAndBufferFields, forDisplayConstants::forDisplayObjects)
+#     #render onto the screen
+#     glDrawElements(GL_TRIANGLES, 6, GL_UNSIGNED_INT, C_NULL) #taken out from the basicRender
+#     ############################################
+#     # glBindVertexArray(0) #unbinding the vao for main rect
+#     # glUseProgram(crosshair.shaderProgram)
+#     glBindVertexArray(crosshair.vao[]) #binding the vao for crosshair
+#     glDrawElements(GL_LINES, 4, GL_UNSIGNED_INT, C_NULL)
+
+#     glBindVertexArray(0)
+#     # glUseProgram(mainRect.shaderProgram) #unbinding the vao for crosshair
+#     glBindVertexArray(mainRect.vao[])
+#     ############################################
+
+#     GLFW.SwapBuffers(forDisplayConstants.window) #from basic render function
+
+# end
+function crosshairDisplay(crosshair::GlShaderAndBufferFields, mainRect::GlShaderAndBufferFields, forDisplayConstants::forDisplayObjects)
+    # Render main image
+    glDrawElements(GL_TRIANGLES, 6, GL_UNSIGNED_INT, C_NULL)
+
+    # Switch to crosshair shader and render crosshair
+    glUseProgram(crosshair.shaderProgram)
+    glBindVertexArray(crosshair.vao[])
+    glDrawElements(GL_LINES, 4, GL_UNSIGNED_INT, C_NULL)
+
+    # Switch back to main shader program
+    # using the shader program from the mainRect causes the image render to disappear, so better use the one from forDisplayConstants !!
+    glUseProgram(forDisplayConstants.shader_program)
+    glBindVertexArray(mainRect.vao[])
+
+    GLFW.SwapBuffers(forDisplayConstants.window)
+end
 """
 coordinating updating all of the images, masks...
 singleSliceDat - holds data we want to use for update
 forDisplayObjects - stores all needed constants that holds reference to GLFW and OpenGL
 """
-function updateImagesDisplayed(singleSliceDat::SingleSliceDat, forDisplayConstants::forDisplayObjects, wordsDispObj::ForWordsDispStruct, calcDimStruct::CalcDimsStruct, valueForMaskToSett::valueForMasToSetStruct)
+function updateImagesDisplayed(
+    singleSliceDat::SingleSliceDat,
+    forDisplayConstants::forDisplayObjects,
+    wordsDispObj::ForWordsDispStruct,
+    calcDimStruct::CalcDimsStruct,
+    valueForMaskToSett::valueForMasToSetStruct,
+    crosshair::GlShaderAndBufferFields,
+    mainRect::GlShaderAndBufferFields,
+    displayMode::DisplayMode)
+
+
+    updateImagesDisplayed_inner(
+        singleSliceDat,
+        forDisplayConstants,
+        wordsDispObj,
+        calcDimStruct,
+        valueForMaskToSett,
+        crosshair,
+        mainRect,
+        displayMode)
+end
+
+function updateImagesDisplayed_inner(
+    singleSliceDat::SingleSliceDat,
+    forDisplayConstants::forDisplayObjects,
+    wordsDispObj::ForWordsDispStruct,
+    calcDimStruct::CalcDimsStruct,
+    valueForMaskToSett::valueForMasToSetStruct,
+    crosshair::GlShaderAndBufferFields,
+    mainRect::GlShaderAndBufferFields,
+    displayMode::DisplayMode)
 
 
-    updateImagesDisplayed_inner(singleSliceDat, forDisplayConstants, wordsDispObj, calcDimStruct, valueForMaskToSett)
-end
 
-function updateImagesDisplayed_inner(singleSliceDat::SingleSliceDat, forDisplayConstants::forDisplayObjects, wordsDispObj::ForWordsDispStruct, calcDimStruct::CalcDimsStruct, valueForMaskToSett::valueForMasToSetStruct)
-    # @info "top of updateimaegsDisplayed_inner"
     modulelistOfTextSpecs = forDisplayConstants.listOfTextSpecifications
 
     for updateDat in singleSliceDat.listOfDataAndImageNames
         findList = findall((texSpec) -> texSpec.name == updateDat.name, modulelistOfTextSpecs)
-        texSpec = !isempty(findList) ? modulelistOfTextSpecs[findList[1]] : throw(DomainError(findList, "no such name specified in start configuration - $( updateDat[1])"))
-        updateTexture(updateDat.type, updateDat.dat, texSpec, 0, 0, calcDimStruct.imageTextureWidth, calcDimStruct.imageTextureHeight)
+        # texSpec = !isempty(findList) ? modulelistOfTextSpecs[findList[1]] : throw(DomainError(findList, "no such name specified in start configuration - $( updateDat[1])"))
+        texSpec = Nothing
+        if !isempty(findList)
+            texSpec = modulelistOfTextSpecs[findList[1]]
+            updateTexture(updateDat.type, updateDat.dat, texSpec, 0, 0, calcDimStruct.imageTextureWidth, calcDimStruct.imageTextureHeight)
+        end
     end #for
     #render text associated with this slice
 
-    # @info "above activate for text display"
     activateForTextDisp(
         wordsDispObj.shader_program_words, wordsDispObj.vbo_words, calcDimStruct)
 
-
-    # @info "below activate for text display"
     matr = addTextToTexture(wordsDispObj, [singleSliceDat.textToDisp..., valueForMaskToSett.text], calcDimStruct)
 
     glDrawElements(GL_TRIANGLES, 6, GL_UNSIGNED_INT, C_NULL)
 
-    # @info "inside updateImagesDisplayed_inner"
-
     reactivateMainObj(forDisplayConstants.shader_program, forDisplayConstants.vbo, calcDimStruct)
 
 
-    #render onto the screen
+    #only display crosshair in multi-image display mode
+    # if displayMode == SingleImage
     OpenGLDisplayUtils.basicRender(forDisplayConstants.window)
+    # elseif displayMode == MultiImage
+    # crosshairDisplay(crosshair, mainRect, forDisplayConstants) #[source of issue in multi image and images do no apeear]
+    # end
+
     glFinish()
 end
 
@@ -189,7 +259,7 @@ It would also assign proper openGl types to given julia data type, and pass data
 textSpecs - list of texture specificaton that we want to enrich by adding information about ..Uniforms
 return list of texture specifications enriched by information about ..Uniforms
 """
-function assignUniformsAndTypesToMasks(textSpecs::Vector{TextureSpec}, shader_program::UInt32, windowControlStruct::WindowControlStruct)
+function assignUniformsAndTypesToMasks(textSpecs::Vector{TextureSpec{Float32}}, shader_program::UInt32)
 
 
     mapped = map(x -> setuniforms(x, shader_program), textSpecs)
@@ -375,3 +445,4 @@ end #addTextToTexture
 
 
 end #..TextureManag
+