Skip to content

Commit

Permalink
Merge pull request #82 from nim65s/devel
Browse files Browse the repository at this point in the history
 using graphics::dynamic_pointer_cast instead of boost::
  • Loading branch information
Guilhem Saurel authored Oct 18, 2018
2 parents 69d744c + e7e203e commit 928b53c
Show file tree
Hide file tree
Showing 3 changed files with 63 additions and 6 deletions.
55 changes: 55 additions & 0 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
# Please don't edit this file, and use the version generated at
# http://rainboard.laas.fr/project/gepetto-viewer-corba/.gitlab-ci.yml

variables:
GIT_SUBMODULE_STRATEGY: "recursive"
CCACHE_BASEDIR: "${CI_PROJECT_DIR}"
CCACHE_DIR: "${CI_PROJECT_DIR}/ccache"

cache:
paths:
- ccache

.robotpkg-gepetto-viewer-corba: &robotpkg-gepetto-viewer-corba
except:
- gh-pages
script:
- mkdir -p ccache
- cd /root/robotpkg/graphics
- git pull
- cd gepetto-viewer-corba
- make checkout MASTER_REPOSITORY="dir ${CI_PROJECT_DIR}"
- make install
- cd work.$(hostname)/$(make show-var VARNAME=DISTNAME)/build
- make test

robotpkg-gepetto-viewer-corba-14.04-release:
<<: *robotpkg-gepetto-viewer-corba
image: eur0c.laas.fr:5000/humanoid-path-planner/gepetto-viewer-corba/gepetto-viewer-corba:14.04

robotpkg-gepetto-viewer-corba-16.04-release:
<<: *robotpkg-gepetto-viewer-corba
image: eur0c.laas.fr:5000/humanoid-path-planner/gepetto-viewer-corba/gepetto-viewer-corba:16.04

robotpkg-gepetto-viewer-corba-18.04-release:
<<: *robotpkg-gepetto-viewer-corba
image: eur0c.laas.fr:5000/humanoid-path-planner/gepetto-viewer-corba/gepetto-viewer-corba:18.04

doc-coverage:
<<: *robotpkg-gepetto-viewer-corba
image: eur0c.laas.fr:5000/humanoid-path-planner/gepetto-viewer-corba/gepetto-viewer-corba:16.04
before_script:
- echo -e 'CXXFLAGS+= --coverage\nLDFLAGS+= --coverage\nPKG_DEFAULT_OPTIONS= debug' >> /opt/openrobots/etc/robotpkg.conf
after_script:
- cd /root/robotpkg/graphics/gepetto-viewer-corba
- cd work.$(hostname)/$(make show-var VARNAME=DISTNAME)/build
- make doc
- mv doc/doxygen-html ${CI_PROJECT_DIR}
- mkdir -p ${CI_PROJECT_DIR}/coverage/
- gcovr -r .
- gcovr -r . --html --html-details -o ${CI_PROJECT_DIR}/coverage/index.html
artifacts:
expire_in: 1 day
paths:
- doxygen-html/
- coverage/
12 changes: 7 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
CORBA server/client for the Graphical Interface of Pinocchio and HPP
====================================================================
# CORBA server/client for the Graphical Interface of Pinocchio and HPP

[![Building Status](https://travis-ci.org/gepetto/gepetto-viewer-corba.svg?branch=master)](https://travis-ci.org/gepetto/gepetto-viewer-corba)
[![Pipeline status](https://gepgitlab.laas.fr/gepetto/gepetto-viewer-corba/badges/master/pipeline.svg)](https://gepgitlab.laas.fr/gepetto/gepetto-viewer-corba/commits/master)
[![Coverage report](https://gepgitlab.laas.fr/gepetto/gepetto-viewer-corba/badges/master/coverage.svg?job=doc-coverage)](http://projects.laas.fr/gepetto/doc/gepetto/gepetto-viewer-corba/master/coverage/)

## Summary
* [gepetto-viewer-corba](#gepetto-viewer-corba)
Expand All @@ -19,7 +22,6 @@ CORBA server/client for the Graphical Interface of Pinocchio and HPP

## gepetto-viewer-corba
### Setup
-----

To compile this package, it is recommended to create a separate build
directory:
Expand Down Expand Up @@ -59,15 +61,15 @@ have to be available on your machine.
- CMake (>=2.6)
- pkg-config
- usual compilation tools (GCC/G++, make, etc.)

### Install standalone urdfdom

In order to read urdf files (see http://wiki.ros.org/urdf for the description), one haves to install the urdfdom package which can come either along ROS library or be installed as a standalone library. Next section describes the second procedure.

urdfdom depends on both console_bridge and urdfdom_headers. The installation of both dependencies can be done with the following command lines in a terminal :
- `git clone git://github.com/ros/console_bridge.git && cd console_bridge && mkdir build && cd build && cmake .. && make && sudo make install`
- `git clone git://github.com/ros/urdfdom_headers && cd urdfdom_headers && mkdir build && cd build && cmake .. && make && sudo make install`

Finally, you just need to apply the following command line to install urdfdom library :
- `git clone git://github.com/ros/urdfdom && cd urdfdom && mkdir build && cd build && cmake .. && make && sudo make install`

Expand Down
2 changes: 1 addition & 1 deletion src/gui/tree-item.cc
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ namespace gepetto {

QWidget* enumPropertyEditor (BodyTreeItem* bti, const graphics::PropertyPtr_t prop)
{
const graphics::EnumProperty::Ptr_t enumProp = boost::dynamic_pointer_cast<graphics::EnumProperty> (prop);
const graphics::EnumProperty::Ptr_t enumProp = graphics::dynamic_pointer_cast<graphics::EnumProperty> (prop);
const graphics::MetaEnum* enumMeta = enumProp->metaEnum();

QComboBox* cb = new QComboBox;
Expand Down

0 comments on commit 928b53c

Please sign in to comment.