Skip to content

Commit

Permalink
Merge tag 'v5.8.1'
Browse files Browse the repository at this point in the history
Release of version 5.8.1.
  • Loading branch information
nim65s committed Oct 9, 2024
2 parents cf46c34 + 4292586 commit a06dc65
Show file tree
Hide file tree
Showing 11 changed files with 311 additions and 229 deletions.
19 changes: 19 additions & 0 deletions .github/workflows/nix.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
name: "CI - Nix"

on:
push:

jobs:
nix:
runs-on: "${{ matrix.os }}-latest"
strategy:
matrix:
os: [ubuntu, macos]
steps:
- uses: actions/checkout@v4
- uses: cachix/install-nix-action@v27
- uses: cachix/cachix-action@v15
with:
name: gepetto
authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'
- run: nix build -L
2 changes: 1 addition & 1 deletion .gitlab-ci.yml
Original file line number Diff line number Diff line change
@@ -1 +1 @@
include: http://rainboard.laas.fr/project/gepetto-viewer-corba/.gitlab-ci.yml
include: https://rainboard.laas.fr/project/gepetto-viewer-corba/.gitlab-ci.yml
12 changes: 12 additions & 0 deletions .mergify.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
pull_request_rules:
- name: merge automatically when CI passes and PR is approved
conditions:
- check-success = "gitlab-ci"
- check-success = "nix (macos)"
- check-success = "nix (ubuntu)"
- check-success = "pre-commit.ci - pr"
- or:
- author = pre-commit-ci[bot]
- author = dependabot[bot]
actions:
merge:
6 changes: 3 additions & 3 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ ci:
autoupdate_branch: devel
repos:
- repo: https://github.com/astral-sh/ruff-pre-commit
rev: v0.3.4
rev: v0.6.9
hooks:
- id: ruff
args:
Expand All @@ -19,13 +19,13 @@ repos:
- id: toml-sort-fix
exclude: poetry.lock
- repo: https://github.com/pre-commit/mirrors-clang-format
rev: v18.1.2
rev: v19.1.1
hooks:
- id: clang-format
args:
- --style=Google
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.5.0
rev: v5.0.0
hooks:
- id: check-added-large-files
- id: check-ast
Expand Down
219 changes: 96 additions & 123 deletions examples/notebooks/a-basics.ipynb
Original file line number Diff line number Diff line change
@@ -1,133 +1,106 @@
{
"cells": [
{
"cell_type": "markdown",
"metadata": {},
"source": [
"# Launch the gui and create a window."
]
},
{
"cell_type": "code",
"execution_count": 6,
"metadata": {},
"outputs": [],
"source": [
"from gepetto.corbaserver import gui_client, start_server, Color\n",
"\n",
"start_server(args=[])\n",
"gui = gui_client(window_name=\"tuto\")"
]
},
{
"cell_type": "markdown",
"metadata": {},
"source": [
"# Add some visual entities\n",
"\n",
"They are called nodes and are organised as a tree.\n",
"\n",
"When you create a window, a group node (called *group* from now on) is created with the same name. Adding nodes to this group displays them in the window."
]
},
{
"cell_type": "code",
"execution_count": 20,
"metadata": {},
"outputs": [
"cells" : [
{
"data": {
"text/plain": [
"True"
"cell_type" : "markdown",
"metadata" : {},
"source" : ["# Launch the gui and create a window."]
},
{
"cell_type" : "code",
"execution_count" : 6,
"metadata" : {},
"outputs" : [],
"source" : [
"from gepetto.corbaserver import Color, gui_client, start_server\n",
"\n", "start_server(args=[])\n",
"gui = gui_client(window_name=\"tuto\")"
]
},
"execution_count": 20,
"metadata": {},
"output_type": "execute_result"
}
],
"source": [
"gui.addBox(\"box\", 0.1, 0.1, 0.1, Color.green)\n",
"gui.addToGroup(\"box\", \"tuto\")\n",
"gui.setCameraToBestFit(\"tuto\")"
]
},
{
"cell_type": "markdown",
"metadata": {},
"source": [
"Add another node, directly in group *tuto*."
]
},
{
"cell_type": "code",
"execution_count": 15,
"metadata": {},
"outputs": [
},
{
"data": {
"text/plain": [
"True"
"cell_type" : "markdown",
"metadata" : {},
"source" : [
"# Add some visual entities\n", "\n",
"They are called nodes and are organised as a tree.\n", "\n",
"When you create a window, a group node (called *group* from now on) ",
"is created with the same name. Adding nodes to this group displays ",
"them in the window."
]
},
"execution_count": 15,
"metadata": {},
"output_type": "execute_result"
}
],
"source": [
"gui.addCylinder(\"tuto/cyl\", 0.01, 0.1, Color.red)"
]
},
{
"cell_type": "markdown",
"metadata": {},
"source": [
"To move one node, you must use `applyConfiguration` and then `refresh`. All calls to `applyConfiguration` are applied at the next `refresh`."
]
},
{
"cell_type": "code",
"execution_count": 19,
"metadata": {},
"outputs": [
},
{
"cell_type" : "code",
"execution_count" : 20,
"metadata" : {},
"outputs" : [ {
"data" : {"text/plain" : ["True"]},
"execution_count" : 20,
"metadata" : {},
"output_type" : "execute_result"
} ],
"source" : [
"gui.addBox(\"box\", 0.1, 0.1, 0.1, Color.green)\n",
"gui.addToGroup(\"box\", \"tuto\")\n",
"gui.setCameraToBestFit(\"tuto\")"
]
},
{
"cell_type" : "markdown",
"metadata" : {},
"source" : ["Add another node, directly in group *tuto*."]
},
{
"data": {
"text/plain": [
"True"
"cell_type" : "code",
"execution_count" : 15,
"metadata" : {},
"outputs" : [ {
"data" : {"text/plain" : ["True"]},
"execution_count" : 15,
"metadata" : {},
"output_type" : "execute_result"
} ],
"source" : ["gui.addCylinder(\"tuto/cyl\", 0.01, 0.1, Color.red)"]
},
{
"cell_type" : "markdown",
"metadata" : {},
"source" : [
"To move one node, you must use `applyConfiguration` and ",
"then `refresh`. All calls to `applyConfiguration` are ",
"applied at the next `refresh`."
]
},
{
"cell_type" : "code",
"execution_count" : 19,
"metadata" : {},
"outputs" : [ {
"data" : {"text/plain" : ["True"]},
"execution_count" : 19,
"metadata" : {},
"output_type" : "execute_result"
} ],
"source" : [
"gui.applyConfiguration(\"tuto/cyl\", [0, 0, 0.1, 0, 0, 0, 1])\n",
"gui.refresh()\n", "gui.setCameraToBestFit(\"tuto\")"
]
},
"execution_count": 19,
"metadata": {},
"output_type": "execute_result"
}
],
"source": [
"gui.applyConfiguration(\"tuto/cyl\", [0, 0, 0.1, 0, 0, 0, 1])\n",
"gui.refresh()\n",
"gui.setCameraToBestFit(\"tuto\")"
]
}
],
"metadata": {
"kernelspec": {
"display_name": "Python 3",
"language": "python",
"name": "python3"
],
"metadata" : {
"kernelspec" : {
"display_name" : "Python 3",
"language" : "python",
"name" : "python3"
},
"language_info" : {
"codemirror_mode" : {"name" : "ipython", "version" : 3},
"file_extension" : ".py",
"mimetype" : "text/x-python",
"name" : "python",
"nbconvert_exporter" : "python",
"pygments_lexer" : "ipython3",
"version" : "3.6.9"
}
},
"language_info": {
"codemirror_mode": {
"name": "ipython",
"version": 3
},
"file_extension": ".py",
"mimetype": "text/x-python",
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
"version": "3.6.9"
}
},
"nbformat": 4,
"nbformat_minor": 2
"nbformat" : 4,
"nbformat_minor" : 2
}
Loading

0 comments on commit a06dc65

Please sign in to comment.