Merge pull request #147 from AdaptiveParticles/tmp_install_windows_joel

Tmp install windows joel

Author: joeljonsson

CMakeLists.txt

@@ -123,7 +123,7 @@ else()
 endif()
 
 # Add submodule GLM (include files only)
-include_directories("external/glm")
+include_directories(external/glm)
 
 #message(STATUS "---------------------- VARS BEG ---------------------")
 #get_cmake_property(_variableNames VARIABLES)
@@ -198,8 +198,9 @@ set(LIBRARY_NAME APR)
 include_directories(src)
 
 set(SOURCE_FILES src/io/blosc_filter.c src/io/hdf5functions_blosc.cpp)
+set(SOURCE_FILES_RAYCAST src/vis/Camera.cpp src/vis/Object.cpp src/vis/RaytracedObject.cpp src/vis/RaycastUtils.cpp)
 
-add_library(aprObjLib OBJECT ${SOURCE_FILES})
+add_library(aprObjLib OBJECT ${SOURCE_FILES} ${SOURCE_FILES_RAYCAST})
 
 if(APR_USE_CUDA)
     message(STATUS "APR: Building CUDA for APR")
@@ -262,7 +263,7 @@ if(APR_BUILD_SHARED_LIB)
     set_property(TARGET ${SHARED_TARGET_NAME} PROPERTY VERSION ${APR_VERSION_STRING})
     set_property(TARGET ${SHARED_TARGET_NAME} PROPERTY SOVERSION ${APR_VERSION_MAJOR})
 
-    target_link_libraries(${SHARED_TARGET_NAME} PRIVATE ${HDF5_LIBRARIES} ${TIFF_LIBRARIES}  ${CUDA_CUDART_LIBRARY} ${ZLIB_LIBRARIES})
+    target_link_libraries(${SHARED_TARGET_NAME} PRIVATE ${HDF5_LIBRARIES} ${TIFF_LIBRARIES} ${CUDA_CUDART_LIBRARY} ${ZLIB_LIBRARIES})
     if(BLOSC_FOUND)
         target_link_libraries(${SHARED_TARGET_NAME} PRIVATE ${BLOSC_LIBRARIES} ${ZLIB_LIBRARIES})
     else()
@@ -302,7 +303,7 @@ if(APR_INSTALL)
     install(FILES ${PROJECT_BINARY_DIR}/ConfigAPR.h COMPONENT DEV DESTINATION ${INSTALL_INCLUDE_PROJECT_DIR}/io)
     install(FILES ${PROJECT_BINARY_DIR}/ConfigAPR.h COMPONENT DEV DESTINATION ${INSTALL_INCLUDE_PROJECT_DIR})
 
-    set(APR_TARGETS LibAprTargets)
+    set(APR_TARGETS LibAPRTargets)
     install(TARGETS ${SHARED_TARGET_NAME} ${STATIC_TARGET_NAME}
             EXPORT ${APR_TARGETS}
             LIBRARY DESTINATION ${INSTALL_LIB_DIR}
@@ -313,18 +314,18 @@ if(APR_INSTALL)
     configure_file("${CMAKE_CURRENT_SOURCE_DIR}/cmake/apr.pc.in" "${CMAKE_CURRENT_BINARY_DIR}/apr.pc" @ONLY)
     install(FILES "${CMAKE_CURRENT_BINARY_DIR}/apr.pc" DESTINATION lib/pkgconfig COMPONENT DEV)
 
-    # AprTargets
+    # APRTargets
     set(APR_NAMESPACE ${LIBRARY_NAME}::)
-    export( EXPORT ${APR_TARGETS} FILE "${CMAKE_CURRENT_BINARY_DIR}/AprTargets.cmake" NAMESPACE ${APR_NAMESPACE})
-    install(EXPORT ${APR_TARGETS} FILE AprTargets.cmake NAMESPACE ${APR_NAMESPACE} DESTINATION ${INSTALL_CMAKE_DIR})
+    export( EXPORT ${APR_TARGETS} FILE "${CMAKE_CURRENT_BINARY_DIR}/APRTargets.cmake" NAMESPACE ${APR_NAMESPACE})
+    install(EXPORT ${APR_TARGETS} FILE APRTargets.cmake NAMESPACE ${APR_NAMESPACE} DESTINATION ${INSTALL_CMAKE_DIR})
 
-    # AprConfig
-    configure_file(cmake/AprConfig.cmake "${CMAKE_CURRENT_BINARY_DIR}/AprConfig.cmake" @ONLY)
-    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/AprConfig.cmake ${CMAKE_CURRENT_BINARY_DIR}/AprConfigVersion.cmake DESTINATION ${INSTALL_CMAKE_DIR} COMPONENT DEV)
+    # APRConfig
+    configure_file(cmake/AprConfig.cmake "${CMAKE_CURRENT_BINARY_DIR}/APRConfig.cmake" @ONLY)
+    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/APRConfig.cmake ${CMAKE_CURRENT_BINARY_DIR}/APRConfigVersion.cmake DESTINATION ${INSTALL_CMAKE_DIR} COMPONENT DEV)
 
-    # AprConfigVersion
+    # APRConfigVersion
     include(CMakePackageConfigHelpers)
-    write_basic_package_version_file("${CMAKE_CURRENT_BINARY_DIR}/AprConfigVersion.cmake" VERSION ${APR_VERSION_STRING} COMPATIBILITY AnyNewerVersion)
+    write_basic_package_version_file("${CMAKE_CURRENT_BINARY_DIR}/APRConfigVersion.cmake" VERSION ${APR_VERSION_STRING} COMPATIBILITY AnyNewerVersion)
 
     # uninstall
     configure_file("${CMAKE_CURRENT_SOURCE_DIR}/cmake/cmake-uninstall.cmake.in"

benchmarks/BenchPipeline.cpp

@@ -66,7 +66,7 @@ inline void bench_apr_pipeline(APR& apr,ParticleData<partsType>& parts,int num_r
 
     PixelData<partsType> pipelineImage;
 
-    APRReconstruction::interp_img(apr,pipelineImage,parts);
+    APRReconstruction::reconstruct_constant(apr,pipelineImage,parts);
 
     APRConverter<partsType> aprConverter;
 

cmake/AprConfig.cmake

@@ -1 +1 @@
-include("${CMAKE_CURRENT_LIST_DIR}/AprTargets.cmake")
+include("${CMAKE_CURRENT_LIST_DIR}/APRTargets.cmake")

examples/Example_apr_deconvolution.cpp

@@ -85,7 +85,7 @@ int main(int argc, char **argv) {
         // reconstruct pixel image from gradient
         timer.start_timer("reconstruct pixel image");
         PixelData<float> output_image;
-        APRReconstruction::interp_img(apr, output_image, output);
+        APRReconstruction::reconstruct_constant(apr, output_image, output);
         timer.stop_timer();
 
         timer.start_timer("write pixel image to file");

examples/Example_apr_filter.cpp

@@ -85,7 +85,7 @@ int main(int argc, char **argv) {
         // reconstruct pixel image from gradient
         timer.start_timer("reconstruct pixel image");
         PixelData<float> output_image;
-        APRReconstruction::interp_img(apr, output_image, output);
+        APRReconstruction::reconstruct_constant(apr, output_image, output);
         timer.stop_timer();
 
         timer.start_timer("write pixel image to file");

examples/Example_compress_apr.cpp

@@ -125,7 +125,7 @@ int main(int argc, char **argv) {
     //writes the piece-wise constant reconstruction of the APR to file for comparison
     if(options.output_tiff) {
         PixelData<uint16_t> img;
-        APRReconstruction::interp_img(apr,img, parts);
+        APRReconstruction::reconstruct_constant(apr,img, parts);
         std::string output = options.directory + name + "_compressed.tif";
         TiffUtils::saveMeshAsTiff(output, img);
     }

examples/Example_compute_gradient.cpp

@@ -70,7 +70,7 @@ int main(int argc, char **argv) {
         // reconstruct pixel image from gradient
         timer.start_timer("reconstruct pixel image");
         PixelData<float> gradient_magnitude_image;
-        APRReconstruction::interp_img(apr, gradient_magnitude_image, output);
+        APRReconstruction::reconstruct_constant(apr, gradient_magnitude_image, output);
         timer.stop_timer();
 
         timer.start_timer("write pixel image to file");

examples/Example_denoise.hpp

@@ -70,7 +70,7 @@ bool denoise_example(cmdLineOptionsDenoise& options){
     // reconstruct noisy input image by piecewise constant interpolation
     timer.start_timer("pc interp");
     PixelData<uint16_t> recon_pc;
-    APRReconstruction::interp_img(apr,recon_pc, parts);
+    APRReconstruction::reconstruct_constant(apr,recon_pc, parts);
     timer.stop_timer();
 
     // save reconstructed input as TIFF
@@ -100,7 +100,7 @@ bool denoise_example(cmdLineOptionsDenoise& options){
 
     // reconstruct image from denoised particles by piecewise constant interpolation
     timer.start_timer("pc interp");
-    APRReconstruction::interp_img(apr,recon_pc, parts_denoised);
+    APRReconstruction::reconstruct_constant(apr,recon_pc, parts_denoised);
     timer.stop_timer();
 
     // save denosied image as TIFF

examples/Example_get_apr.cpp

@@ -122,7 +122,7 @@ int runAPR(cmdLineOptions options) {
         if(aprConverter.par.output_steps){
             particle_intensities.fill_with_levels(apr);
             PixelData<uint16_t> level_img;
-            APRReconstruction::interp_img(apr,level_img,particle_intensities);
+            APRReconstruction::reconstruct_constant(apr,level_img,particle_intensities);
             TiffUtils::saveMeshAsTiff(options.output_dir + "level_image.tif",level_img);
         }
 

examples/Example_ray_cast.cpp

@@ -93,16 +93,7 @@ int main(int argc, char **argv) {
     ///
     /////////////
 
-    //apr_raycaster.perform_raycast(apr,apr.particles_intensities,views,[] (const uint16_t& a,const uint16_t& b) {return std::max(a,b);});
-
-    ReconPatch rp;
-    rp.level_delta = -1;
-    apr_raycaster.scale_down = pow(2,rp.level_delta);
-
-//    apr_raycaster.perform_raycast_patch(apr,parts,treeData,views1,rp,[] (const uint16_t& a,const uint16_t& b) {return std::max(a,b);});
-
-
-    apr_raycaster.perform_raycast_patch(apr,parts,treeData,views,rp,[] (const uint16_t& a,const uint16_t& b) {return std::max(a,b);});
+    apr_raycaster.perform_raycast(apr,parts,views,[] (const uint16_t& a,const uint16_t& b) {return std::max(a,b);});
 
     //////////////
     ///