diplotocus 0.5.0__tar.gz → 0.5.1__tar.gz

{diplotocus-0.5.0 → diplotocus-0.5.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: diplotocus
-Version: 0.5.0
+Version: 0.5.1
 Summary: A python package to generate animations of matplotlib objects.
 Author-email: Tristan Boin <tristan.boin@obspm.fr>
 License-Expression: MIT

{diplotocus-0.5.0 → diplotocus-0.5.1}/docs/source/index.rst

@@ -45,7 +45,7 @@ Here's a quick example of the syntax of diplotocus:
    tl.animate(p)
 
    #We render our video
-   tl.save_video(path='../_static/demo.mp4')
+   tl.save_video(path='demo.mp4')
 
 .. raw:: html
 

{diplotocus-0.5.0 → diplotocus-0.5.1}/docs/source/notebooks/GUI.ipynb

@@ -11,6 +11,11 @@
     "\n",
     "![](../_static/Web_GUI.png)\n",
     "\n",
+    "```{warning}\n",
+    "\n",
+    "The GUI might not be as stable as the python interface. Feel free to report any issues you encounters.\n",
+    "```\n",
+    "\n",
     "When running diplotocus through this mode, you will make edit your animation through a local web page in your browser. This page communicates with a python server, which links the GUI and diplotocus objects in the background. Hence, everything you can do through python, you can do through the GUI, and vice versa.\n",
     "\n",
     "```{note}\n",

{diplotocus-0.5.0 → diplotocus-0.5.1}/docs/source/notebooks/animations.ipynb

@@ -817,6 +817,82 @@
     "tl.save_video('../_static/animations/axis_limits.mp4')"
    ]
   },
+  {
+   "cell_type": "markdown",
+   "id": "463d3df9",
+   "metadata": {},
+   "source": [
+    "### Axis pos and size\n",
+    "\n",
+    "```{eval-rst}\n",
+    ".. automethod:: diplotocus.animations.axis_pos_and_size\n",
+    "    :noindex:\n",
+    "```"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": 4,
+   "id": "c01a5513",
+   "metadata": {},
+   "outputs": [
+    {
+     "data": {
+      "application/vnd.jupyter.widget-view+json": {
+       "model_id": "0c53fc7065614884aba3cfb420806912",
+       "version_major": 2,
+       "version_minor": 0
+      },
+      "text/plain": [
+       "  0%|          | 0/60 [00:00<?, ?it/s]"
+      ]
+     },
+     "metadata": {},
+     "output_type": "display_data"
+    },
+    {
+     "data": {
+      "text/markdown": [
+       "Saved video ../_static/animations/axis_pos_and_size.mp4"
+      ],
+      "text/plain": [
+       "<IPython.core.display.Markdown object>"
+      ]
+     },
+     "metadata": {},
+     "output_type": "display_data"
+    },
+    {
+     "data": {
+      "text/html": [
+       "\n",
+       "                <video width=\"640\" height=\"360\" autoplay loop muted playsinline>\n",
+       "                <source src=\"../_static/animations/axis_pos_and_size.mp4?randId=4292\" type=\"video/mp4\">\n",
+       "                </video>\n",
+       "            "
+      ],
+      "text/plain": [
+       "<IPython.core.display.HTML object>"
+      ]
+     },
+     "metadata": {},
+     "output_type": "display_data"
+    }
+   ],
+   "source": [
+    "import diplotocus as dpl\n",
+    "import matplotlib.pyplot as plt\n",
+    "\n",
+    "fig,ax = plt.subplots(1,2)\n",
+    "\n",
+    "tl = dpl.Timeline(fig=fig)\n",
+    "\n",
+    "a = dpl.axis_pos_and_size(start_width=0.0,end_width=0.4,duration=60,axis=ax[1])\n",
+    "\n",
+    "tl.animate(a)\n",
+    "tl.save_video('../_static/animations/axis_pos_and_size.mp4')"
+   ]
+  },
   {
    "cell_type": "markdown",
    "id": "bc66aa88",

diplotocus-0.5.1/src/diplotocus/_version.py

@@ -0,0 +1 @@
+__version__ = "0.5.1"

{diplotocus-0.5.0 → diplotocus-0.5.1}/src/diplotocus/animations.py

@@ -789,7 +789,8 @@ class plotObject:
                 self.x = anim['new_x']
                 self.y = anim['new_y']
 
-        if x >= self.x_min-1 and x < self.x_max-1 and self.obj is not None:
+        #if x >= self.x_min-1 and x < self.x_max-1 and self.obj is not None:
+        if self.obj is not None:
             if isinstance(self.obj,list):
                 for obj in self.obj:
                     try:
@@ -1005,6 +1006,95 @@ class axis_limits(plotObject):
             ylim_top    = anim['start_ylim'][1] + (anim['ylim'][1] - anim['start_ylim'][1])*t
             self.axis.set_ylim(ylim_bottom,ylim_top)
 
+class axis_pos_and_size(plotObject):
+    """
+    Resize the axis to a given position and size.
+
+    Parameters
+    ----------
+    end_left : float
+        Target left position
+    end_bottom : float
+        Target bottom position
+    end_width : float
+        Target width
+    end_height : float
+        Target height
+    start_left = float
+        Initial left position
+    start_bottom : float
+        Initial bottom position
+    start_width : float
+        Initial width
+    start_height : float
+        Initial height
+    pos : array-like
+        Target left and bottom position
+    size : array-like
+        Target width and height
+    duration : float
+        Duration of the animation
+    delay : float, default=0
+        Delay before starting
+    easing : callable, optional
+        Easing function
+    axis : matplotlib.axes.Axes, optional
+        Axis to plot on
+    """
+    def __init__(self,duration,
+                 end_left=None,end_bottom=None,end_width=None,end_height=None,
+                 start_left=None,start_bottom=None,start_width=None,start_height=None,
+                 delay=0,easing=None,axis=None,*args,**kwargs):
+        super().__init__(axis=axis,*args, **kwargs)
+        self.anims = [{
+            'name':'axis_move',
+            'duration':duration,
+            'delay':delay,
+            'easing':easing,
+            'persistent':True,
+            'start':[start_left,start_bottom,start_width,start_height],
+            'end':[end_left,end_bottom,end_width,end_height],
+            'played':False
+        }]
+        self.compute_timings()
+
+    def init(self):
+        left_i = self.axis.get_position().x0
+        bottom_i = self.axis.get_position().y0
+        width_i = self.axis.get_position().width
+        height_i = self.axis.get_position().height
+        if self.anims[0]['start'][0] is None:
+            self.anims[0]['start'][0] = left_i
+        if self.anims[0]['start'][1] is None:
+            self.anims[0]['start'][1] = bottom_i
+        if self.anims[0]['start'][2] is None:
+            self.anims[0]['start'][2] = width_i
+        if self.anims[0]['start'][3] is None:
+            self.anims[0]['start'][3] = height_i
+        if self.anims[0]['end'][0] is None:
+            self.anims[0]['end'][0] = left_i
+        if self.anims[0]['end'][1] is None:
+            self.anims[0]['end'][1] = bottom_i
+        if self.anims[0]['end'][2] is None:
+            self.anims[0]['end'][2] = width_i
+        if self.anims[0]['end'][3] is None:
+            self.anims[0]['end'][3] = height_i
+
+    def function(self,data_x,data_y,x,kwargs):
+        anim = self.anims[0]
+        if x < anim['delay']:
+            return
+        _x = min(x,anim['duration'] + anim['delay']-1)
+        t = self.get_t_from_x(anim,x)
+        width  = self.axis.get_xlim()[1]-self.axis.get_xlim()[0]
+        height = self.axis.get_ylim()[1]-self.axis.get_ylim()[0]
+        pos_x = anim['start'][0] + (anim['end'][0] - anim['start'][0])*t
+        pos_y = anim['start'][1] + (anim['end'][1] - anim['start'][1])*t
+        width = anim['start'][2] + (anim['end'][2] - anim['start'][2])*t
+        height = anim['start'][3] + (anim['end'][3] - anim['start'][3])*t
+        self.axis.set_position((pos_x,pos_y,width,height))
+
+
 class axis_move(plotObject):
     """
     Move the center of the axis to a given position.
@@ -2113,6 +2203,7 @@ class fill_between(plotObject):
         self.mpl_plot_type = plt.fill_between
         y1 = to_np_array(y1).reshape(-1)
         y2 = to_np_array(y2).reshape(-1)
+        x = to_np_array(x)
         if y1.size != x.size:
             y1 = np.ones_like(x)*y1[0]
         if y2.size != x.size:
@@ -2308,6 +2399,7 @@ class fill_betweenx(plotObject):
         self.mpl_plot_type = plt.fill_betweenx
         x1 = to_np_array(x1).reshape(-1)
         x2 = to_np_array(x2).reshape(-1)
+        y = to_np_array(y)
         if x1.size != y.size:
             x1 = np.ones_like(y)*x1[0]
         if x2.size != y.size:

{diplotocus-0.5.0 → diplotocus-0.5.1}/src/diplotocus.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: diplotocus
-Version: 0.5.0
+Version: 0.5.1
 Summary: A python package to generate animations of matplotlib objects.
 Author-email: Tristan Boin <tristan.boin@obspm.fr>
 License-Expression: MIT

diplotocus-0.5.0/src/diplotocus/_version.py

@@ -1 +0,0 @@
-__version__ = "0.5.0"