update

doc/src/sketcher/sketcher.do.txt

@@ -223,7 +223,7 @@ fig['vehicle']['wheels'].set_linewidth(6)
 fig['vehicle']['wheels'].set_linecolor('black')
 fig['vehicle']['body']['under'].set_filled_curves('red')
 fig['vehicle']['body']['over'].set_filled_curves(pattern='/')
-fig['vehicle']['body']['over'].set_linewidth(10)
+fig['vehicle']['body']['over'].set_linewidth(14)
 !ec
 
 FIGURE: [figs-sketcher/vehicle0b.png, width=400] Changed properties of parts of the figure. label{sketcher:fig:vehicle0:v2}
@@ -273,8 +273,8 @@ can through the provided `action` function modify desired parts
 of the figure. Here the `action` function will move the `vehicle`:
 !bc pycod
 def move_vehicle(t, fig):
-    displacement = dt*v(t)
-    fig['vehicle'].translate(displacement)
+    x_displacement = dt*v(t)
+    fig['vehicle'].translate((x_displacement, 0))
 !ec
 Defining a set of time points for the frames in the animation
 and performing the animation is done by
@@ -338,7 +338,7 @@ The rotation angle follows from the fact that the arc length
 of a rolling wheel equals the displacement of the center of
 the wheel, leading to a rotation angle
 !bc pycod
-angle = - displacement[0]/R
+angle = - x_displacement/R
 !ec
 With `w_1` tracking the $x$ coordinate of the center
 of the front wheel, we can rotate that wheel by
@@ -361,14 +361,14 @@ The complete `move_vehicle` function then becomes
 w_1 = w_1 + L   # start position
 
 def move_vehicle(t, fig):
-    displacement = dt*v(t)
-    fig['vehicle'].translate(displacement)
+    x_displacement = dt*v(t)
+    fig['vehicle'].translate((x_displacement, 0))
 
     # Rotate wheels
     global w_1
-    w_1 += displacement[0]
+    w_1 += x_displacement
     # R*angle = -x_displacement
-    angle = - displacement[0]/R
+    angle = - x_displacement/R
     w1 = fig['vehicle']['wheels']['wheel1']
     w1.rotate(degrees(angle), center=(w_1, R))
     w2 = fig['vehicle']['wheels']['wheel2']

doc/src/sketcher/src-sketcher/animation_vehicle0/anim.html

@@ -5,7 +5,7 @@
 
 <script language="Javascript">
 <!---
-var num_images_anim = 35;
+var num_images_anim = 25;
 var img_width = 800;
 var img_height = 600;
 var interval = 40;    
@@ -17,143 +17,103 @@ function preload_images_anim()
 
    t.innerHTML = "Preloading image ";
    images_anim[0] = new Image(img_width, img_height);
-   images_anim[0].src = "tmp_frame_0000.png";
+   images_anim[0].src = "frame_0000.png";
         
    t.innerHTML = "Preloading image ";
    images_anim[1] = new Image(img_width, img_height);
-   images_anim[1].src = "tmp_frame_0001.png";
+   images_anim[1].src = "frame_0001.png";
         
    t.innerHTML = "Preloading image ";
    images_anim[2] = new Image(img_width, img_height);
-   images_anim[2].src = "tmp_frame_0002.png";
+   images_anim[2].src = "frame_0002.png";
         
    t.innerHTML = "Preloading image ";
    images_anim[3] = new Image(img_width, img_height);
-   images_anim[3].src = "tmp_frame_0003.png";
+   images_anim[3].src = "frame_0003.png";
         
    t.innerHTML = "Preloading image ";
    images_anim[4] = new Image(img_width, img_height);
-   images_anim[4].src = "tmp_frame_0004.png";
+   images_anim[4].src = "frame_0004.png";
         
    t.innerHTML = "Preloading image ";
    images_anim[5] = new Image(img_width, img_height);
-   images_anim[5].src = "tmp_frame_0005.png";
+   images_anim[5].src = "frame_0005.png";
         
    t.innerHTML = "Preloading image ";
    images_anim[6] = new Image(img_width, img_height);
-   images_anim[6].src = "tmp_frame_0006.png";
+   images_anim[6].src = "frame_0006.png";
         
    t.innerHTML = "Preloading image ";
    images_anim[7] = new Image(img_width, img_height);
-   images_anim[7].src = "tmp_frame_0007.png";
+   images_anim[7].src = "frame_0007.png";
         
    t.innerHTML = "Preloading image ";
    images_anim[8] = new Image(img_width, img_height);
-   images_anim[8].src = "tmp_frame_0008.png";
+   images_anim[8].src = "frame_0008.png";
         
    t.innerHTML = "Preloading image ";
    images_anim[9] = new Image(img_width, img_height);
-   images_anim[9].src = "tmp_frame_0009.png";
+   images_anim[9].src = "frame_0009.png";
         
    t.innerHTML = "Preloading image ";
    images_anim[10] = new Image(img_width, img_height);
-   images_anim[10].src = "tmp_frame_0010.png";
+   images_anim[10].src = "frame_0010.png";
         
    t.innerHTML = "Preloading image ";
    images_anim[11] = new Image(img_width, img_height);
-   images_anim[11].src = "tmp_frame_0011.png";
+   images_anim[11].src = "frame_0011.png";
         
    t.innerHTML = "Preloading image ";
    images_anim[12] = new Image(img_width, img_height);
-   images_anim[12].src = "tmp_frame_0012.png";
+   images_anim[12].src = "frame_0012.png";
         
    t.innerHTML = "Preloading image ";
    images_anim[13] = new Image(img_width, img_height);
-   images_anim[13].src = "tmp_frame_0013.png";
+   images_anim[13].src = "frame_0013.png";
         
    t.innerHTML = "Preloading image ";
    images_anim[14] = new Image(img_width, img_height);
-   images_anim[14].src = "tmp_frame_0014.png";
+   images_anim[14].src = "frame_0014.png";
         
    t.innerHTML = "Preloading image ";
    images_anim[15] = new Image(img_width, img_height);
-   images_anim[15].src = "tmp_frame_0015.png";
+   images_anim[15].src = "frame_0015.png";
         
    t.innerHTML = "Preloading image ";
    images_anim[16] = new Image(img_width, img_height);
-   images_anim[16].src = "tmp_frame_0016.png";
+   images_anim[16].src = "frame_0016.png";
         
    t.innerHTML = "Preloading image ";
    images_anim[17] = new Image(img_width, img_height);
-   images_anim[17].src = "tmp_frame_0017.png";
+   images_anim[17].src = "frame_0017.png";
         
    t.innerHTML = "Preloading image ";
    images_anim[18] = new Image(img_width, img_height);
-   images_anim[18].src = "tmp_frame_0018.png";
+   images_anim[18].src = "frame_0018.png";
         
    t.innerHTML = "Preloading image ";
    images_anim[19] = new Image(img_width, img_height);
-   images_anim[19].src = "tmp_frame_0019.png";
+   images_anim[19].src = "frame_0019.png";
         
    t.innerHTML = "Preloading image ";
    images_anim[20] = new Image(img_width, img_height);
-   images_anim[20].src = "tmp_frame_0020.png";
+   images_anim[20].src = "frame_0020.png";
         
    t.innerHTML = "Preloading image ";
    images_anim[21] = new Image(img_width, img_height);
-   images_anim[21].src = "tmp_frame_0021.png";
+   images_anim[21].src = "frame_0021.png";
         
    t.innerHTML = "Preloading image ";
    images_anim[22] = new Image(img_width, img_height);
-   images_anim[22].src = "tmp_frame_0022.png";
+   images_anim[22].src = "frame_0022.png";
         
    t.innerHTML = "Preloading image ";
    images_anim[23] = new Image(img_width, img_height);
-   images_anim[23].src = "tmp_frame_0023.png";
+   images_anim[23].src = "frame_0023.png";
         
    t.innerHTML = "Preloading image ";
    images_anim[24] = new Image(img_width, img_height);
-   images_anim[24].src = "tmp_frame_0024.png";
-        
-   t.innerHTML = "Preloading image ";
-   images_anim[25] = new Image(img_width, img_height);
-   images_anim[25].src = "tmp_frame_0025.png";
-        
-   t.innerHTML = "Preloading image ";
-   images_anim[26] = new Image(img_width, img_height);
-   images_anim[26].src = "tmp_frame_0026.png";
-        
-   t.innerHTML = "Preloading image ";
-   images_anim[27] = new Image(img_width, img_height);
-   images_anim[27].src = "tmp_frame_0027.png";
-        
-   t.innerHTML = "Preloading image ";
-   images_anim[28] = new Image(img_width, img_height);
-   images_anim[28].src = "tmp_frame_0028.png";
-        
-   t.innerHTML = "Preloading image ";
-   images_anim[29] = new Image(img_width, img_height);
-   images_anim[29].src = "tmp_frame_0029.png";
-        
-   t.innerHTML = "Preloading image ";
-   images_anim[30] = new Image(img_width, img_height);
-   images_anim[30].src = "tmp_frame_0030.png";
-        
-   t.innerHTML = "Preloading image ";
-   images_anim[31] = new Image(img_width, img_height);
-   images_anim[31].src = "tmp_frame_0031.png";
-        
-   t.innerHTML = "Preloading image ";
-   images_anim[32] = new Image(img_width, img_height);
-   images_anim[32].src = "tmp_frame_0032.png";
-        
-   t.innerHTML = "Preloading image ";
-   images_anim[33] = new Image(img_width, img_height);
-   images_anim[33].src = "tmp_frame_0033.png";
-        
-   t.innerHTML = "Preloading image ";
-   images_anim[34] = new Image(img_width, img_height);
-   images_anim[34].src = "tmp_frame_0034.png";
+   images_anim[24].src = "frame_0024.png";
         
    t.innerHTML = "";
 }
@@ -201,7 +161,7 @@ function faster()
 </form>
 
 <p><div ID="progress"></div></p>
-<img src="tmp_frame_0000.png" name="movie" border=2/>
+<img src="frame_0000.png" name="movie" border=2/>
 
 </body>
 </html>

doc/src/sketcher/src-sketcher/animation_vehicle1/anim.html

@@ -5,7 +5,7 @@
 
 <script language="Javascript">
 <!---
-var num_images_anim = 35;
+var num_images_anim = 25;
 var img_width = 800;
 var img_height = 600;
 var interval = 40;    
@@ -17,143 +17,103 @@ function preload_images_anim()
 
    t.innerHTML = "Preloading image ";
    images_anim[0] = new Image(img_width, img_height);
-   images_anim[0].src = "tmp_frame_0000.png";
+   images_anim[0].src = "frame_0000.png";
         
    t.innerHTML = "Preloading image ";
    images_anim[1] = new Image(img_width, img_height);
-   images_anim[1].src = "tmp_frame_0001.png";
+   images_anim[1].src = "frame_0001.png";
         
    t.innerHTML = "Preloading image ";
    images_anim[2] = new Image(img_width, img_height);
-   images_anim[2].src = "tmp_frame_0002.png";
+   images_anim[2].src = "frame_0002.png";
         
    t.innerHTML = "Preloading image ";
    images_anim[3] = new Image(img_width, img_height);
-   images_anim[3].src = "tmp_frame_0003.png";
+   images_anim[3].src = "frame_0003.png";
         
    t.innerHTML = "Preloading image ";
    images_anim[4] = new Image(img_width, img_height);
-   images_anim[4].src = "tmp_frame_0004.png";
+   images_anim[4].src = "frame_0004.png";
         
    t.innerHTML = "Preloading image ";
    images_anim[5] = new Image(img_width, img_height);
-   images_anim[5].src = "tmp_frame_0005.png";
+   images_anim[5].src = "frame_0005.png";
         
    t.innerHTML = "Preloading image ";
    images_anim[6] = new Image(img_width, img_height);
-   images_anim[6].src = "tmp_frame_0006.png";
+   images_anim[6].src = "frame_0006.png";
         
    t.innerHTML = "Preloading image ";
    images_anim[7] = new Image(img_width, img_height);
-   images_anim[7].src = "tmp_frame_0007.png";
+   images_anim[7].src = "frame_0007.png";
         
    t.innerHTML = "Preloading image ";
    images_anim[8] = new Image(img_width, img_height);
-   images_anim[8].src = "tmp_frame_0008.png";
+   images_anim[8].src = "frame_0008.png";
         
    t.innerHTML = "Preloading image ";
    images_anim[9] = new Image(img_width, img_height);
-   images_anim[9].src = "tmp_frame_0009.png";
+   images_anim[9].src = "frame_0009.png";
         
    t.innerHTML = "Preloading image ";
    images_anim[10] = new Image(img_width, img_height);
-   images_anim[10].src = "tmp_frame_0010.png";
+   images_anim[10].src = "frame_0010.png";
         
    t.innerHTML = "Preloading image ";
    images_anim[11] = new Image(img_width, img_height);
-   images_anim[11].src = "tmp_frame_0011.png";
+   images_anim[11].src = "frame_0011.png";
         
    t.innerHTML = "Preloading image ";
    images_anim[12] = new Image(img_width, img_height);
-   images_anim[12].src = "tmp_frame_0012.png";
+   images_anim[12].src = "frame_0012.png";
         
    t.innerHTML = "Preloading image ";
    images_anim[13] = new Image(img_width, img_height);
-   images_anim[13].src = "tmp_frame_0013.png";
+   images_anim[13].src = "frame_0013.png";
         
    t.innerHTML = "Preloading image ";
    images_anim[14] = new Image(img_width, img_height);
-   images_anim[14].src = "tmp_frame_0014.png";
+   images_anim[14].src = "frame_0014.png";
         
    t.innerHTML = "Preloading image ";
    images_anim[15] = new Image(img_width, img_height);
-   images_anim[15].src = "tmp_frame_0015.png";
+   images_anim[15].src = "frame_0015.png";
         
    t.innerHTML = "Preloading image ";
    images_anim[16] = new Image(img_width, img_height);
-   images_anim[16].src = "tmp_frame_0016.png";
+   images_anim[16].src = "frame_0016.png";
         
    t.innerHTML = "Preloading image ";
    images_anim[17] = new Image(img_width, img_height);
-   images_anim[17].src = "tmp_frame_0017.png";
+   images_anim[17].src = "frame_0017.png";
         
    t.innerHTML = "Preloading image ";
    images_anim[18] = new Image(img_width, img_height);
-   images_anim[18].src = "tmp_frame_0018.png";
+   images_anim[18].src = "frame_0018.png";
         
    t.innerHTML = "Preloading image ";
    images_anim[19] = new Image(img_width, img_height);
-   images_anim[19].src = "tmp_frame_0019.png";
+   images_anim[19].src = "frame_0019.png";
         
    t.innerHTML = "Preloading image ";
    images_anim[20] = new Image(img_width, img_height);
-   images_anim[20].src = "tmp_frame_0020.png";
+   images_anim[20].src = "frame_0020.png";
         
    t.innerHTML = "Preloading image ";
    images_anim[21] = new Image(img_width, img_height);
-   images_anim[21].src = "tmp_frame_0021.png";
+   images_anim[21].src = "frame_0021.png";
         
    t.innerHTML = "Preloading image ";
    images_anim[22] = new Image(img_width, img_height);
-   images_anim[22].src = "tmp_frame_0022.png";
+   images_anim[22].src = "frame_0022.png";
         
    t.innerHTML = "Preloading image ";
    images_anim[23] = new Image(img_width, img_height);
-   images_anim[23].src = "tmp_frame_0023.png";
+   images_anim[23].src = "frame_0023.png";
         
    t.innerHTML = "Preloading image ";
    images_anim[24] = new Image(img_width, img_height);
-   images_anim[24].src = "tmp_frame_0024.png";
-        
-   t.innerHTML = "Preloading image ";
-   images_anim[25] = new Image(img_width, img_height);
-   images_anim[25].src = "tmp_frame_0025.png";
-        
-   t.innerHTML = "Preloading image ";
-   images_anim[26] = new Image(img_width, img_height);
-   images_anim[26].src = "tmp_frame_0026.png";
-        
-   t.innerHTML = "Preloading image ";
-   images_anim[27] = new Image(img_width, img_height);
-   images_anim[27].src = "tmp_frame_0027.png";
-        
-   t.innerHTML = "Preloading image ";
-   images_anim[28] = new Image(img_width, img_height);
-   images_anim[28].src = "tmp_frame_0028.png";
-        
-   t.innerHTML = "Preloading image ";
-   images_anim[29] = new Image(img_width, img_height);
-   images_anim[29].src = "tmp_frame_0029.png";
-        
-   t.innerHTML = "Preloading image ";
-   images_anim[30] = new Image(img_width, img_height);
-   images_anim[30].src = "tmp_frame_0030.png";
-        
-   t.innerHTML = "Preloading image ";
-   images_anim[31] = new Image(img_width, img_height);
-   images_anim[31].src = "tmp_frame_0031.png";
-        
-   t.innerHTML = "Preloading image ";
-   images_anim[32] = new Image(img_width, img_height);
-   images_anim[32].src = "tmp_frame_0032.png";
-        
-   t.innerHTML = "Preloading image ";
-   images_anim[33] = new Image(img_width, img_height);
-   images_anim[33].src = "tmp_frame_0033.png";
-        
-   t.innerHTML = "Preloading image ";
-   images_anim[34] = new Image(img_width, img_height);
-   images_anim[34].src = "tmp_frame_0034.png";
+   images_anim[24].src = "frame_0024.png";
         
    t.innerHTML = "";
 }
@@ -201,7 +161,7 @@ function faster()
 </form>
 
 <p><div ID="progress"></div></p>
-<img src="tmp_frame_0000.png" name="movie" border=2/>
+<img src="frame_0000.png" name="movie" border=2/>
 
 </body>
 </html>

doc/src/sketcher/src-sketcher/vehicle0.py

@@ -7,7 +7,7 @@ w_1 = 5  # position of front wheel
 
 drawing_tool.set_coordinate_system(xmin=0, xmax=w_1 + 2*L + 3*R,
                                    ymin=-1, ymax=2*R + 3*H,
-                                   axis=True)
+                                   axis=False)
 
 wheel1 = Circle(center=(w_1, R), radius=R)
 wheel2 = wheel1.copy()
@@ -36,7 +36,7 @@ fig['vehicle']['wheels'].set_linewidth(6)
 fig['vehicle']['wheels'].set_linecolor('black')
 fig['vehicle']['body']['under'].set_filled_curves('red')
 fig['vehicle']['body']['over'].set_filled_curves(pattern='/')
-fig['vehicle']['body']['over'].set_linewidth(10)
+fig['vehicle']['body']['over'].set_linewidth(14)
 
 drawing_tool.erase()  # avoid drawing old and new fig on top of each other
 fig.draw()
@@ -59,8 +59,8 @@ tp = numpy.linspace(0, 2*R, 25)
 dt = tp[1] - tp[0]  # time step
 
 def move_vehicle(t, fig):
-    displacement = dt*v(t)
-    fig['vehicle'].translate((displacement, 0))
+    x_displacement = dt*v(t)
+    fig['vehicle'].translate((x_displacement, 0))
 
 files = animate(fig, tp, move_vehicle, moviefiles=True,
                 pause_per_frame=0)