diff --git a/SimDynamics/examples/BulletDebugViewer/CMakeLists.txt b/SimDynamics/examples/BulletDebugViewer/CMakeLists.txt index d540572884e0341140a17c5a1078750b10b3d510..a806617b639ac53cd32bfdd618df7f1c8eb2aac4 100644 --- a/SimDynamics/examples/BulletDebugViewer/CMakeLists.txt +++ b/SimDynamics/examples/BulletDebugViewer/CMakeLists.txt @@ -7,7 +7,7 @@ IF (SimDynamics_USE_BULLET_USE_GLUT) message("GLUT_INCLUDE_DIR:${GLUT_INCLUDE_DIR}") # create the executable SimoxApplication(${PROJECT_NAME} "BulletDebugViewerGlut.cpp" "") - TARGET_LINK_LIBRARIES(${PROJECT_NAME} SimDynamics BulletOpenGLSupport) + TARGET_LINK_LIBRARIES(${PROJECT_NAME} SimDynamics BulletOpenGLSupport ${Simox_EXTERNAL_LIBRARIES}) ELSE(SimDynamics_USE_BULLET_USE_GLUT) IF(WIN32) diff --git a/SimDynamics/examples/SimDynamicsViewer/CMakeLists.txt b/SimDynamics/examples/SimDynamicsViewer/CMakeLists.txt index 22ababf35d24c9bfb6b8c84aa4b5e14ff1b5f581..2f2f422327cb25b66c429d77006b50056fa8689c 100644 --- a/SimDynamics/examples/SimDynamicsViewer/CMakeLists.txt +++ b/SimDynamics/examples/SimDynamicsViewer/CMakeLists.txt @@ -16,7 +16,7 @@ IF(Simox_USE_COIN_VISUALIZATION) ) SimoxQtApplication("${PROJECT_NAME}" "${demo_SRCS}" "${demo_INCS}" "${GUI_MOC_HDRS}" "${GUI_UIS}") - TARGET_LINK_LIBRARIES(${PROJECT_NAME} SimDynamics) + TARGET_LINK_LIBRARIES(${PROJECT_NAME} SimDynamics ${Simox_EXTERNAL_LIBRARIES}) SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES FOLDER "Examples") SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${Simox_BIN_DIR}) diff --git a/SimDynamics/examples/SimDynamicsViewer/simDynamicsViewer.ui b/SimDynamics/examples/SimDynamicsViewer/simDynamicsViewer.ui index f71f302aa859aefdb028c619b2055cae5975a34a..dafb26eb217da0ff6ae2618317e8841cab0d9c42 100644 --- a/SimDynamics/examples/SimDynamicsViewer/simDynamicsViewer.ui +++ b/SimDynamics/examples/SimDynamicsViewer/simDynamicsViewer.ui @@ -290,7 +290,7 @@ <rect> <x>14</x> <y>20</y> - <width>91</width> + <width>101</width> <height>31</height> </rect> </property> @@ -304,7 +304,7 @@ </property> <property name="geometry"> <rect> - <x>120</x> + <x>130</x> <y>20</y> <width>91</width> <height>31</height> @@ -479,7 +479,7 @@ <rect> <x>20</x> <y>50</y> - <width>361</width> + <width>371</width> <height>111</height> </rect> </property> @@ -505,8 +505,8 @@ <widget class="QComboBox" name="comboBoxRobotNode"> <property name="geometry"> <rect> - <x>120</x> - <y>30</y> + <x>160</x> + <y>40</y> <width>211</width> <height>22</height> </rect> @@ -515,8 +515,8 @@ <widget class="QLabel" name="label_7"> <property name="geometry"> <rect> - <x>120</x> - <y>10</y> + <x>170</x> + <y>20</y> <width>131</width> <height>16</height> </rect> @@ -595,8 +595,8 @@ <rect> <x>270</x> <y>10</y> - <width>75</width> - <height>23</height> + <width>101</width> + <height>31</height> </rect> </property> <property name="text"> @@ -623,7 +623,7 @@ <x>0</x> <y>0</y> <width>913</width> - <height>21</height> + <height>25</height> </rect> </property> </widget> diff --git a/VirtualRobot/examples/reachability/reachabilityWindow.cpp b/VirtualRobot/examples/reachability/reachabilityWindow.cpp index fbcf81ce995dcc7947747302132a38fb32fb2b3b..f0d445841972c740d9632201629eb7d2610ce742 100644 --- a/VirtualRobot/examples/reachability/reachabilityWindow.cpp +++ b/VirtualRobot/examples/reachability/reachabilityWindow.cpp @@ -554,6 +554,14 @@ void reachabilityWindow::createReach() ManipulabilityPtr man = boost::dynamic_pointer_cast<Manipulability>(reachSpace); PoseQualityExtendedManipulabilityPtr manMeasure(new PoseQualityExtendedManipulability(currentRobotNodeSet)); man->setManipulabilityMeasure(manMeasure); + if (UICreate.checkBoxColDetecion->isChecked()) + { + std::string staticM = std::string(UICreate.comboBoxColModelStatic->currentText().toLatin1()); + std::string dynM = std::string(UICreate.comboBoxColModelDynamic->currentText().toLatin1()); + RobotNodeSetPtr m1 = robot->getRobotNodeSet(staticM); + RobotNodeSetPtr m2 = robot->getRobotNodeSet(dynM); + man->initSelfDistanceCheck(m1, m2); + } } reachSpace->print(); diff --git a/config.cmake b/config.cmake index 67d73d63f4b8307c75a3f124f86627fbaf077d03..ba2013799e40dcd2de4d1c1ba627b5c6a0e251ae 100644 --- a/config.cmake +++ b/config.cmake @@ -50,7 +50,7 @@ IF (NOT Simox_CONFIGURED) ############################# VERSION ################################# set(Simox_MAJOR_VERSION 2) set(Simox_MINOR_VERSION 3) - set(Simox_PATCH_VERSION 37) + set(Simox_PATCH_VERSION 38) set(Simox_VERSION ${Simox_MAJOR_VERSION}.${Simox_MINOR_VERSION}.${Simox_PATCH_VERSION})