From 8d37f7be10643da6f5e796fe8b34623ba16353c7 Mon Sep 17 00:00:00 2001
From: Nikolaus Vahrenkamp <vahrenkamp@kit.edu>
Date: Fri, 22 Jul 2016 16:20:51 +0200
Subject: [PATCH] version 2.3.38 some minor updates
---
.../examples/BulletDebugViewer/CMakeLists.txt | 2 +-
.../examples/SimDynamicsViewer/CMakeLists.txt | 2 +-
.../SimDynamicsViewer/simDynamicsViewer.ui | 20 +++++++++----------
.../reachability/reachabilityWindow.cpp | 8 ++++++++
config.cmake | 2 +-
5 files changed, 21 insertions(+), 13 deletions(-)
diff --git a/SimDynamics/examples/BulletDebugViewer/CMakeLists.txt b/SimDynamics/examples/BulletDebugViewer/CMakeLists.txt
index d54057288..a806617b6 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 22ababf35..2f2f42232 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 f71f302aa..dafb26eb2 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 fbcf81ce9..f0d445841 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 67d73d63f..ba2013799 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})
--
GitLab