Merge pull request #23 from divital-coder/master

Fixed precompilation

Author: jakubMitura14

src/MedEye3d.jl

@@ -54,7 +54,7 @@ include(joinpath( "display","reactingToMouseKeyboard","reactToKeyboard","Keyboar
 include(joinpath( "display","reactingToMouseKeyboard","reactToKeyboard","OtherKeyboardActions.jl") )
 include(joinpath( "display","reactingToMouseKeyboard","reactToKeyboard","WindowControll.jl") )
 include(joinpath( "display","reactingToMouseKeyboard","reactToKeyboard","ChangePlane.jl") )
-include(joinpath( "display","reactingToMouseKeyboard","reactToKeyboard","reactToKeyboard.jl") )
+include(joinpath( "display","reactingToMouseKeyboard","reactToKeyboard","ReactToKeyboard.jl") )
 
 include(joinpath("display", "reactingToMouseKeyboard", "ReactingToInput.jl"))
 include(joinpath("higherAbstractions", "DisplayDataManag.jl"))

src/display/GLFW/SegmentationDisplay.jl

@@ -845,4 +845,6 @@ With Crosshair rendering added, the keymaps for setting visiblity does not work
 With Crosshair rendering added, the keymaps for changing windowing does not work
 Allow People to load and visualize custom annotations masks [manual modifications]
 In shader and vertices for supervoxels, during the calculation of vertices for supervoxels, make sure to use Float32 for calculation.
- """
+Add a sample nifti file in the supervoxel directory, since the function seem to be modifying the original nifti input image
+Fix text rendering in single Image display , which is sprouting from reactToScroll.jl file with rendering for supervoxels.
+"""

test_script_simplified.jl

@@ -1,5 +1,4 @@
 using MedEye3d
-using HDF5, NIfTI
 #Data downloaded from the following google drive links :
 
 # https://drive.google.com/file/d/1Segr6BC_ma9bKNmM8lzUBaJLQChkAWKA/view?usp=drive_link
@@ -19,37 +18,42 @@ h5NiftiImage = "D:/mingw_installation/home/hurtbadly/Downloads/hdf5.nii.gz"
 NOTE : only one type of modality at a time in multi-image is supported.
 """
 
+#For single image display
+medEyeStruct = MedEye3d.SegmentationDisplay.displayImage([ctNiftiImage]) #singleImageDisplay
+#or we can also just passa the path itself
+# medEyeStruct = MedEye3d.SegmentationDisplay.displayImage(petNiftiImage) #singleImageDisplay
 
 
+#For multi image display
 # medEyeStruct = MedEye3d.SegmentationDisplay.displayImage([[ctNiftiImage], [ctNiftiImage]]) #multi image displays
+
 # medEyeStruct = MedEye3d.SegmentationDisplay.displayImage([ctNiftiImage]) #singleImageDisplay
-# imm, res, line_indices = MedEye3d.ShaderAndVerticiesForSuperVoxels.get_example_sv_to_render()
-# @info "Slice : 41 , Axis : 3 , Plane : Transversal"
-# @info imm
-# @info res
-# @info line_indices
 
 
-supervoxelDict = MedEye3d.ShadersAndVerticiesForSupervoxels.get_example_sv_to_render(h5File, "tetr_dat")
+#Supervoxels
+#For conversion of h5 to nifti
+# MedEye3d.ShadersAndVerticiesForSupervoxels.populateNiftiWithH5(ctNiftiImage, h5File, h5NiftiImage)
+
+#for visualization
 
-# @info typeof(supervoxel_vertices) #Vector{FLoat32}
-# @info typeof(supervoxel_indices) #Vector{UInt32}
+# supervoxelDict = MedEye3d.ShadersAndVerticiesForSupervoxels.get_example_sv_to_render(h5File, "tetr_dat")
+# medEyeStruct = MedEye3d.SegmentationDisplay.displayImage(h5NiftiImage, svVertAndInd=supervoxelDict)
+
+#This is for when we have a ctNiftiImage and we were testing modifying the display data from hdf5 so we sill image and supervoxels
+# displayData[1][1:128, 1:128, 1:128] = fb["im"][:, :, :]
 
-medEyeStruct = MedEye3d.SegmentationDisplay.displayImage(h5NiftiImage, svVertAndInd=supervoxelDict)
-# #for SIngle you are strictly only supposed to pass it like : [image_ct, imagep]
 
-# displayData = MedEye3d.DisplayDataManag.getDisplayedData(medEyeStruct, [Int32(1)]) #passing the active texture number
 
+#For modification of display data
+
+displayData = MedEye3d.DisplayDataManag.getDisplayedData(medEyeStruct, [Int32(1), Int32(2)]) #passing the active texture number
 
 # #we need to check if the return type of the displayData is a single Array{Float32,3} or a vector{Array{Float32,3}}
 # # now in this case we are setting random noise over the manualModif Texture voxel layer, and the manualModif texture defaults to 2 for active number
-# fb = h5open(h5File, "r")
-
-# displayData[1][1:128, 1:128, 1:128] = fb["im"][:, :, :]
-# # displayData[2][:, :, :] = randn(Float32, size(displayData[2]))
 
+displayData[2][:, :, :] = randn(Float32, size(displayData[2]))
 
 # # @info "look here" typeof(displayData)
-# MedEye3d.DisplayDataManag.setDisplayedData(medEyeStruct, displayData)
+MedEye3d.DisplayDataManag.setDisplayedData(medEyeStruct, displayData)