Skip to content

Commit

Permalink
Update old shakingLiver/Sofia ref to new animation doingCircle
Browse files Browse the repository at this point in the history
  • Loading branch information
VannesteFelix committed Apr 18, 2024
1 parent 6980b23 commit 8c0536c
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 14 deletions.
6 changes: 3 additions & 3 deletions doc/sphinx/source/usage/examples/Sofia/sofia.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,11 @@ Here we only reduce the leg of our robot not its core.
To make a reduced model of one leg of this robot, we had to create a new special function to explore its workspace.
To create the rotation mouvement we see on the different previous videos we rotate a point that will be followed by the model creating the rotation.

:meth:`mor.animation.defaultShaking` how it was implemented
:meth:`mor.animation.doingCircle` how it was implemented

We have only one actuator here, so our *listObjToAnimate* contains only one object:

ObjToAnimate("actuator","shakingSofia",'MechanicalObject',incr=0.05,incrPeriod=3,rangeOfAction=6.4,dataToWorkOn="position",angle=0,rodRadius=0.7)
ObjToAnimate("actuator","doingCircle",'MechanicalObject',incr=0.05,incrPeriod=3,rangeOfAction=6.4,dataToWorkOn="position",angle=0,rodRadius=0.7)

With these different parameters we will after perform the reduction like explained {doc}`here </usage/tutorial/modelOrderReduction>`

Expand Down Expand Up @@ -69,4 +69,4 @@ With these different parameters we will after perform the reduction like explain
- reduced
* - 3.8
- 190
```
```
10 changes: 1 addition & 9 deletions python/mor/gui/settings/existingAnimation.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
'incrPeriod':10.,
'rangeOfAction':40.}

existingAnimation['shakingSofia'] = { 'incr':0.05,
existingAnimation['doingCircle'] = { 'incr':0.05,
'incrPeriod':3,
'rangeOfAction':6.4,
'dataToWorkOn':'position',
Expand All @@ -36,14 +36,6 @@
'incrPeriod':10.,
'rangeOfAction':40.}


existingAnimation['shakingLiver'] = { 'incr':0.4,
'incrPeriod':2.5,
'rangeOfAction':6.2,
'dataToWorkOn':'position',
'angle':0,
'rodRadius':0.4}

existingAnimation['doingNothing'] = {'incr':5.,
'incrPeriod':10.,
'rangeOfAction':40.}
2 changes: 1 addition & 1 deletion tools/gui/cfg/cfg_liver.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ grpBox_AnimationParam:
tab_animation:
0:
0: 'True'
1: shakingLiver
1: doingCircle
2:
angle: '0'
dataToWorkOn: position
Expand Down
2 changes: 1 addition & 1 deletion tools/gui/cfg/cfg_sofia.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ grpBox_AnimationParam:
tab_animation:
0:
0: 'True'
1: shakingSofia
1: doingCircle
2:
angle: '0'
dataToWorkOn: position
Expand Down

0 comments on commit 8c0536c

Please sign in to comment.