Commit changes with breaking behavior

Author: Manuel-Lourenco-Carvalho

CMakeLists.txt

@@ -45,18 +45,18 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
 #Find all required third parties (this should be moved elsewhere)
 find_package(asio CONFIG REQUIRED)
 find_package(Eigen3 CONFIG REQUIRED)
-#find_package(Ceres CONFIG REQUIRED)
-#find_package(unofficial-skia CONFIG REQUIRED)
+find_package(Ceres CONFIG REQUIRED)
+find_package(unofficial-skia CONFIG REQUIRED)
 find_package(nlohmann_json REQUIRED)
-#find_package(Vulkan REQUIRED)
-#find_package(glfw3 3.3 REQUIRED)
-#find_package(Boost COMPONENTS filesystem)
+find_package(Vulkan REQUIRED)
+find_package(glfw3 3.3 REQUIRED)
+find_package(Boost COMPONENTS filesystem)
 find_package(vsg CONFIG REQUIRED)
 find_package(vsgXchange CONFIG REQUIRED)
 find_package(vsgImGui CONFIG REQUIRED)
 find_package(RBDL CONFIG REQUIRED)
-#find_package(gflags REQUIRED)
-#find_package(glog REQUIRED)
+find_package(gflags REQUIRED)
+find_package(glog REQUIRED)
 
 
 #Externally provided targets
@@ -96,7 +96,7 @@ add_custom_target(
 add_subdirectory(libraries)
 
 # Add medical applications
-#add_subdirectory(applications)
+add_subdirectory(applications)
 
 # Most of the time there is no need to compile the tests and the tutorials
 # folder so you can comment out these subfolders from the build directory

CMakePresets.json

@@ -8,7 +8,7 @@
             "binaryDir": "build/debug",
             "cacheVariables": {
                 "CMAKE_BUILD_TYPE": "Debug",
-                "CURAN_PLUS_EXECUTABLE_PATH": "C:/Users/joaom/PlusApp-2.8.0.20191105-Win32/bin/PlusServer.exe"
+                "CURAN_PLUS_EXECUTABLE_PATH": "C:/Users/SURGROB7/PlusApp-2.8.0.20191105-Win64/bin/PlusServer.exe"
             }
         },
         {
@@ -18,7 +18,7 @@
             "binaryDir": "build/release",
             "cacheVariables": {
                 "CMAKE_BUILD_TYPE": "Release",
-                "CURAN_PLUS_EXECUTABLE_PATH": "C:/Users/joaom/PlusApp-2.8.0.20191105-Win32/bin/PlusServer.exe"
+                "CURAN_PLUS_EXECUTABLE_PATH": "C:/Users/SURGROB7/PlusApp-2.8.0.20191105-Win64/bin/PlusServer.exe"
             }
         }
     ],

libraries/CMakeLists.txt

@@ -1,9 +1,9 @@
 add_subdirectory(utils)
 add_subdirectory(communication)
-#add_subdirectory(userinterface)
+add_subdirectory(userinterface)
 add_subdirectory(rendering)
-#add_subdirectory(imageprocessing)
-#add_subdirectory(optimization)
-#add_subdirectory(geometry)
-#add_subdirectory(gaussianmixtures)
+add_subdirectory(imageprocessing)
+add_subdirectory(optimization)
+add_subdirectory(geometry)
+add_subdirectory(gaussianmixtures)
 add_subdirectory(robotutils)

libraries/userinterface/src/SliderPanel.cpp

@@ -542,7 +542,7 @@ namespace curan
 					}
 				}
 
-				if (zoom_in && get_hightlight_color() == SkColorSetARGB(255, 125, 0, 0))
+				if (zoom_in && get_hightlight_color() == SkColorSetARGB(255, 125, 0, 0) && interpreter.check(INSIDE_ALLOCATED_AREA))
 					zoom_in.draw(canvas);
 
 				slider_paint.setColor(slider_color);
@@ -591,7 +591,6 @@ namespace curan
 					for (auto &pending : volumetric_mask->callbacks_pressedhighlighted)
 						pending(volumetric_mask, config, highlighted_stroke);
 
-
 				pending_strokes_to_process.clear();
 
 				auto check_inside_fixed_area = [this](double x, double y)
@@ -607,6 +606,7 @@ namespace curan
 				interpreter.process(check_inside_allocated_area, check_inside_fixed_area, sig);
 
 				if (interpreter.check(KEYBOARD_EVENT)){
+					
 					set_current_state(SliderStates::WAITING);
 					auto arg = std::get<curan::ui::Key>(sig);
 					if (arg.key == GLFW_KEY_A && arg.action == GLFW_PRESS)
@@ -615,7 +615,7 @@ namespace curan
 							zoom_in.deactivate();
 						else
 							zoom_in.activate();
-						return true;
+						
 					}
 
 					if (arg.key == GLFW_KEY_S && arg.action == GLFW_PRESS)
@@ -626,13 +626,10 @@ namespace curan
 							insert_in_map(current_stroke);
 							current_stroke.clear();
 						}
-						return true;
 					}
 					return false;
 				}
 
-				is_pressed = false;
-
 				if (interpreter.check(OUTSIDE_ALLOCATED_AREA))
 				{
 					set_current_state(SliderStates::WAITING);
@@ -711,6 +708,13 @@ namespace curan
 					return true;
 				}
 
+				if(interpreter.status() & ~MOUSE_CLICKED_LEFT_WAS_INSIDE_FIXED && interpreter.check(INSIDE_ALLOCATED_AREA | MOUSE_CLICKED_LEFT_EVENT) ){
+					set_current_state(SliderStates::PRESSED);
+					if (!is_highlighting)
+						current_stroke.add_point(homogenenous_transformation, SkPoint::Make((float)xpos, (float)ypos));
+					return true;
+				}
+
 				if (interpreter.check(INSIDE_FIXED_AREA))
 				{
 					set_current_state(SliderStates::HOVER);

vcpkg copy.json

@@ -1,6 +1,7 @@
 {
   "dependencies": [
     "eigen3",
+    "itk",
     "ceres",
     "asio",
     "glfw3",