foo

plottings.jl

@@ -357,7 +357,7 @@ function panneau_information!(px, subplot_current, time_current, i_current,
     yy = 0.3
     plot!(px,
         inset = (1, bbox(xx, yy, 0.2, 0.15, :bottom, :left)),
-        subplot = subplot_current, 
+        subplot=subplot_current, 
         bg_inside = nothing, legend=:false,
         framestyle=:none
     ) 
@@ -367,27 +367,32 @@ function panneau_information!(px, subplot_current, time_current, i_current,
     Δtxt = 0.3
 
     txt = @sprintf("Temps depuis départ [h]  = %3.2f", time_current)
-    annotate!(px, subplot = subplot_current, a, b+2*Δtxt, txt, 
+    plot!(px, subplot = subplot_current, 
+        annotation=((a, b+2*Δtxt, txt)), 
         annotationcolor=:white, annotationfontsize=14,
         annotationhalign=:left)
 
     txt = @sprintf("Vitesse satellite [km/h]    = %5.2f", sqrt(v1[i_current]^2+v2[i_current]^2))
-    annotate!(px, subplot = subplot_current, a, b+Δtxt, txt, 
+    plot!(px, subplot = subplot_current, 
+        annotation=((a, b+Δtxt, txt)), 
         annotationcolor=:white, annotationfontsize=14,
         annotationhalign=:left)
 
     txt = @sprintf("Distance à la Terre [km]   = %5.2f", sqrt(x1[i_current]^2+x2[i_current]^2)-rayon_Terre)
-    annotate!(px, subplot = subplot_current, a, b, txt, 
+    plot!(px, subplot = subplot_current, 
+        annotation=((a, b, txt)), 
         annotationcolor=:white, annotationfontsize=14,
         annotationhalign=:left)
 
     txt = @sprintf("Poussée maximale [N]     = %5.2f", F_max)
-    annotate!(px, subplot = subplot_current, a, b-2*Δtxt, txt, 
+    plot!(px, subplot = subplot_current, 
+        annotation=((a, b-2*Δtxt, txt)), 
         annotationcolor=:white, annotationfontsize=14,
         annotationhalign=:left)
 
     txt = @sprintf("Durée du transfert [h]     = %5.2f", tf_transfert)
-    annotate!(px, subplot = subplot_current, a, b-3*Δtxt, txt, 
+    plot!(px, subplot = subplot_current, 
+        annotation=((a, b-3*Δtxt, txt)), 
         annotationcolor=:white, annotationfontsize=14,
         annotationhalign=:left)
 
@@ -400,14 +405,6 @@ function panneau_information!(px, subplot_current, time_current, i_current,
         framestyle=:none
     ) 
 
-    s1 = "Transfert orbital du satellite        autour de la Terre\n"
-    s2 = "de l'orbite elliptique       vers l'orbite circulaire\n"
-    s3 = "en temps minimal"
-    txt = s1 * s2 * s3
-    annotate!(px, subplot = subplot_current, 0, 0, txt, 
-        annotationcolor=:white, annotationfontsize=18,
-        annotationhalign=:center)
-
     rmax = 3*maximum(sqrt.(X1_orb_init.^2+X2_orb_init.^2))
     plot!(px, subplot = subplot_current, 
         0.04.+X1_orb_init./rmax, X2_orb_init./rmax.-0.03, 
@@ -429,6 +426,16 @@ function panneau_information!(px, subplot_current, time_current, i_current,
     yT = 0.28 .+ rT .* sin.(θ)
     plot!(px, subplot=subplot_current, xT, yT, color = :dodgerblue1, seriestype=:shape, linewidth=0) 
     
+    s1 = "Transfert orbital du satellite        autour de la Terre\n"
+    s2 = "de l'orbite elliptique       vers l'orbite circulaire\n"
+    s3 = "en temps minimal"
+    txt = s1 * s2 * s3
+    plot!(px, subplot = subplot_current, 
+        annotation=((0, 0, txt)), 
+        annotationcolor=:white, annotationfontsize=18,
+        annotationhalign=:center)
+    
+    # Realisation
     subplot_current = subplot_current+1
     xx = 0.0
     yy = 0.02
@@ -437,11 +444,12 @@ function panneau_information!(px, subplot_current, time_current, i_current,
         subplot = subplot_current, 
         bg_inside = nothing, legend=:false,
         framestyle=:none
-    )  
-    
+    ) 
+
     s1 = "Réalisation : Olivier Cots (2022)"
     txt = s1
-    annotate!(px, subplot = subplot_current, 0, 0, txt, 
+    plot!(px, subplot = subplot_current, 
+        annotation=((0, 0, txt)), 
         annotationcolor=:gray, annotationfontsize=8, annotationhalign=:left)
     
     return subplot_current+1