diff --git a/torus.py b/torus.py index 918e1a4..b351146 100644 --- a/torus.py +++ b/torus.py @@ -288,6 +288,7 @@ class Image(): self.torus.update(rfrac) self.update_illumination() self.redraw_plot(self.lines['map_border'], self._mantle_map) + self.redraw_plot(self.lines['pos_map'], self._sunpos_map) self.redraw_plot(self.lines['circles_side'], self._crossection) self.redraw_plot(self.lines['path_side'], self._sunpath_side) self.redraw_plot(self.lines['circles_top'], self._top_section) @@ -326,28 +327,28 @@ class InteractiveImage(Image): ax1 = self.fig.add_axes([0.25, 0.1, 0.65, 0.03]) ax2 = self.fig.add_axes([0.1, 0.25, 0.0225, 0.63]) ax3 = self.fig.add_axes([0.8, 0.025, 0.1, 0.04]) - self.sliders = dict( - sun_phi=Slider( + self.interactions = dict( + slider_sun=Slider( ax=ax1, label='Angle of Sun', valmin=-np.pi, valmax=np.pi, valinit=sun_init, ), - rfrac=Slider( + slider_rfrac=Slider( ax=ax2, label="Fraction of Radii (r/R)", valmin=0, valmax=1, valinit=rfrac_init, orientation="vertical" - ) - + ), + button_reset=Button(ax3, 'Reset', hovercolor='0.975'), ) - self.sliders['sun_phi'].on_changed(self._slider_update_sun) - self.sliders['rfrac'].on_changed(self._slider_update_torus) - button = Button(ax3, 'Reset', hovercolor='0.975') - button.on_clicked(self._reset) + self.interactions['slider_sun'].on_changed(self._slider_update_sun) + self.interactions['slider_rfrac'].on_changed(self._slider_update_torus) + self.interactions['button_reset'].on_clicked(self._reset) + def _slider_update_torus(self, val): self.update_torus(val) @@ -356,8 +357,8 @@ class InteractiveImage(Image): self.update_sun(val, 0) def _reset(self, event): - self.sliders['sun_phi'].reset() - self.sliders['rfrac'].reset() + self.interactions['slider_sun'].reset() + self.interactions['slider_rfrac'].reset() class AnimatedImage(Image):