Commit 7e7cab85 authored by Joseph Mirabel's avatar Joseph Mirabel

Update dynamicbuild plugin

parent e83bc99c
...@@ -7,6 +7,7 @@ from PythonQt.QtGui import QDockWidget, QWidget, QLabel, QPushButton, QVBoxLayou ...@@ -7,6 +7,7 @@ from PythonQt.QtGui import QDockWidget, QWidget, QLabel, QPushButton, QVBoxLayou
from PythonQt.Qt import Qt as QNamespace, QAction, QKeySequence from PythonQt.Qt import Qt as QNamespace, QAction, QKeySequence
from hpp.corbaserver import Client as BasicClient from hpp.corbaserver import Client as BasicClient
from hpp.corbaserver.manipulation import Client as ManipClient, ConstraintGraph, Rule from hpp.corbaserver.manipulation import Client as ManipClient, ConstraintGraph, Rule
import omniORB
from gepetto.corbaserver import Client as ViewerClient from gepetto.corbaserver import Client as ViewerClient
import re import re
...@@ -213,6 +214,11 @@ class _GraspMode(QWidget): ...@@ -213,6 +214,11 @@ class _GraspMode(QWidget):
self.parentInstance.plugin.client.basic.problem.resetConstraints() self.parentInstance.plugin.client.basic.problem.resetConstraints()
for j in self.locked: for j in self.locked:
self.parentInstance.plugin.client.basic.problem.lockJoint(j, self.parentInstance.plugin.client.basic.robot.getJointConfig(j)) self.parentInstance.plugin.client.basic.problem.lockJoint(j, self.parentInstance.plugin.client.basic.robot.getJointConfig(j))
try:
self.parentInstance.plugin.client.manipulation.problem.getSelected("constraintgraph")
except omniORB.CORBA.UserException:
self.parentInstance.plugin.client.manipulation.graph.createGraph("dummy")
self.parentInstance.plugin.client.manipulation.graph.createSubGraph("dummy")
name = self.grippers[self.currentGripper] + " grasps " + self.handles[self.currentHandle] name = self.grippers[self.currentGripper] + " grasps " + self.handles[self.currentHandle]
self.parentInstance.plugin.client.manipulation.problem.createGrasp(name, self.grippers[self.currentGripper], self.handles[self.currentHandle]) self.parentInstance.plugin.client.manipulation.problem.createGrasp(name, self.grippers[self.currentGripper], self.handles[self.currentHandle])
self.parentInstance.plugin.client.basic.problem.addNumericalConstraints("constraints", [name,], [0,]) self.parentInstance.plugin.client.basic.problem.addNumericalConstraints("constraints", [name,], [0,])
...@@ -370,6 +376,7 @@ class Plugin(QDockWidget): ...@@ -370,6 +376,7 @@ class Plugin(QDockWidget):
super(Plugin, self).__init__("Dynamic Builder", flags) super(Plugin, self).__init__("Dynamic Builder", flags)
else: else:
super(Plugin, self).__init__("Dynamic Builder") super(Plugin, self).__init__("Dynamic Builder")
self.setObjectName ("hpp.gui.dynamicbuild")
self.osg = None self.osg = None
self.mainWindow = mainWindow self.mainWindow = mainWindow
self.resetConnection() self.resetConnection()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment