Skip to content

Commit

Permalink
Use rerun as graphical interface.
Browse files Browse the repository at this point in the history
  • Loading branch information
florent-lamiraux committed Dec 17, 2024
1 parent cbe5569 commit 8888ef4
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ compute_project_args(PROJECT_ARGS LANGUAGES CXX)
project(${PROJECT_NAME} ${PROJECT_ARGS})

add_project_dependency("hpp-corbaserver" REQUIRED)
add_project_dependency("gepetto-viewer")
add_project_dependency("gepetto-viewer-rerun")

if(NOT FINDPYTHON_ALREADY_CALLED)
findpython()
Expand Down
2 changes: 1 addition & 1 deletion src/hpp/gepetto/gui/path_graph.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
from PythonQt import Qt, QtCore, QtGui

from gepetto.color import Color
from gepetto.corbaserver import Client as GuiClient
from gepetto_viewer_rerun import Client as GuiClient
from gepetto.corbaserver.tools import Linear, Vector6
from hpp.corbaserver import Client

Expand Down
10 changes: 5 additions & 5 deletions src/hpp/gepetto/viewer.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
import omniORB.any

from gepetto.color import Color
from gepetto.corbaserver.client import _GhostGraphicalInterface
from gepetto_viewer_rerun.client import _GhostGraphicalInterface
from hpp.quaternion import Quaternion


Expand Down Expand Up @@ -94,7 +94,7 @@ class Viewer:
This class implements clients to both
\\li hppcorbaserver through hpp.corbaserver.problem_solver.ProblemSolver
python class,
\\li gepetto-viewer-server through gepetto.corbaserver.Client python class.
\\li gepetto-viewer-server through gepetto_viewer_rerun.Client python class.
Operation that need to be synchronized between hppcorbaserver internal
model and graphical user interface should be implemented by this class.
Expand Down Expand Up @@ -135,7 +135,7 @@ def __init__(
The robot loaded in hppcorbaserver is loaded into gepetto-viewer-server.
"""

from gepetto.corbaserver import Client as GuiClient
from gepetto_viewer_rerun import Client as GuiClient

self.problemSolver = problemSolver
self.robot = problemSolver.robot
Expand Down Expand Up @@ -225,7 +225,7 @@ def _initDisplay(self):
urdfFilename, srdfFilename = self.robot.urdfSrdfFilenames()
self.client.gui.addURDF(self.displayName, urdfFilename)
# Remove lighting from meshes
self._removeLightSources(self.client.gui.getGroupNodeList(self.displayName))
# self._removeLightSources(self.client.gui.getGroupNodeList(self.displayName))
if self.collisionURDF:
self.toggleVisual(False)
self.client.gui.addToGroup(self.displayName, self.sceneName)
Expand All @@ -235,7 +235,7 @@ def createWindowAndScene(self, viewerClient, name):

self.windowName = "scene_" + name
try:
self.windowId = viewerClient.gui.getWindowID(self.windowName)
self.windowId = self.windowName
except GepettoError:
self.windowId = viewerClient.gui.createWindow(self.windowName)
self.sceneName = self.windowName
Expand Down
2 changes: 1 addition & 1 deletion src/hpp/gepetto/viewer_factory.py
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ def createViewer(
The arguments of Viewer.__init__ can be passed through kwargs
"""
if host is not None and viewerClient is None:
from gepetto.corbaserver import Client as GuiClient
from gepetto_viewer_rerun import Client as GuiClient

try:
viewerClient = GuiClient(host=host)
Expand Down

0 comments on commit 8888ef4

Please sign in to comment.