commit b33e49d7bc875d985a78bb041c7e8f17c7512c35 · cduck.me/drawsvg

+42 -18

drawSvg/widgets/drawing_javascript.py

···

       2
        
       require.undef('drawingview');

     

       3
        
       

     

       4
        
       define('drawingview', ['@jupyter-widgets/base'], function(widgets) {

     

       5
       -
           var DrawingView = widgets.DOMWidgetView.extend({

     

       6
       -
               render: function() {

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       7
        
                   this.container = document.createElement('a');

     

       8
        
                   this.image_changed();

     

       9
        
                   this.container.appendChild(this.svg_view);

     
···

       18
        
                   this.model.on('change:disable', this.delay_changed,

     

       19
        
                                 this);

     

       20
        
                   this.delay_changed();

     

       21
       -
               },

     

       22
       -
               image_changed: function() {

     

       23
        
                   this.container.innerHTML = this.model.get('_image');

     

       24
        
                   this.svg_view = this.container.getElementsByTagName('svg')[0];

     

       25
        
                   this.cursor_point = this.svg_view.createSVGPoint();

     

       26
        
                   this.register_events();

     

       27
       -
               },

     

       28
       -
               last_move: null,

     

       29
       -
               last_mousemove_blocked: null,

     

       30
       -
               last_timer: null,

     

       31
       -
               block_changed: function() {

     

       32
        
                   var widget = this;

     

       33
        
                   window.setTimeout(function() {

     

       34
        
                       if (widget.model.get('_mousemove_blocked')

     
···

       36
        
                           widget.send_mouse_event('mousemove', widget.last_move);

     

       37
        
                       }

     

       38
        
                   }, 0);

     

       39
       -
               },

     

       40
       -
               send_mouse_event: function(name, e) {

     

       41
        
                   this.last_move = null;

     

       42
        
                   if (this.model.get('disable')) {

     

       43
        
                       return;

     
···

       68
        
                       currentTargetId: e.currentTarget ? e.currentTarget.id : null,

     

       69
        
                       relatedTargetId: e.relatedTarget ? e.relatedTarget.id : null,

     

       70
        
                   });

     

       71
       -
               },

     

       72
       -
               delay_changed: function() {

     

       73
        
                   var widget = this;

     

       74
        
                   window.clearTimeout(widget.last_timer);

     

       75
        
                   if (widget.model.get('disable')) {

     
···

       81
        
                           widget.send_timed_event('timed');

     

       82
        
                       }, delay);

     

       83
        
                   }

     

       84
       -
               },

     

       85
       -
               send_timed_event: function(name) {

     

       86
        
                   if (this.model.get('disable')) {

     

       87
        
                       return;

     

       88
        
                   }

     
···

       90
        
                   this.send({

     

       91
        
                       name: name,

     

       92
        
                   });

     

       93
       -
               },

     

       94
       -
               register_events: function() {

     

       95
        
                   var widget = this;

     

       96
        
                   this.svg_view.addEventListener('mousedown', function(e) {

     

       97
        
                       e.preventDefault();

     
···

       111
        
                       widget.send_mouse_event('mouseup', e);

     

       112
        
                   });

     

       113
        
               }

     

       114
       -
           });

     

       115
        
       

     

       116
        
           return {

     

       0
        
       
     

       117
        
               DrawingView: DrawingView

     

       118
        
           };

     

       119
        
       });

···

       2
        
       require.undef('drawingview');

     

       3
        
       

     

       4
        
       define('drawingview', ['@jupyter-widgets/base'], function(widgets) {

     

       5
       +
           class DrawingModel extends widgets.DOMWidgetModel {

     

       6
       +
               defaults() {

     

       7
       +
                   return {

     

       8
       +
                       ...super.defaults(),

     

       9
       +
                       _model_name: DrawingModel.model_name,

     

       10
       +
                       _model_module: DrawingModel.model_module,

     

       11
       +
                       _model_module_version: DrawingModel.model_module_version,

     

       12
       +
                       _view_name: DrawingModel.view_name,

     

       13
       +
                       _view_module: DrawingModel.view_module,

     

       14
       +
                       _view_module_version: DrawingModel.view_module_version,

     

       15
       +
                   };

     

       16
       +
               }

     

       17
       +
               static serializers = {

     

       18
       +
                   ...widgets.DOMWidgetModel.serializers,

     

       19
       +
               };

     

       20
       +
               static model_name = 'DrawingModel';

     

       21
       +
               static model_module = 'drawingview';

     

       22
       +
               static model_module_version = '0.1.0';

     

       23
       +
               static view_name = 'DrawingView';

     

       24
       +
               static view_module = 'drawingview';

     

       25
       +
               static view_module_version = '0.1.0';

     

       26
       +
           }

     

       27
       +
       

     

       28
       +
           class DrawingView extends widgets.DOMWidgetView {

     

       29
       +
               render() {

     

       30
        
                   this.container = document.createElement('a');

     

       31
        
                   this.image_changed();

     

       32
        
                   this.container.appendChild(this.svg_view);

     
···

       41
        
                   this.model.on('change:disable', this.delay_changed,

     

       42
        
                                 this);

     

       43
        
                   this.delay_changed();

     

       44
       +
               }

     

       45
       +
               image_changed() {

     

       46
        
                   this.container.innerHTML = this.model.get('_image');

     

       47
        
                   this.svg_view = this.container.getElementsByTagName('svg')[0];

     

       48
        
                   this.cursor_point = this.svg_view.createSVGPoint();

     

       49
        
                   this.register_events();

     

       50
       +
               }

     

       51
       +
               last_move = null;

     

       52
       +
               last_mousemove_blocked = null;

     

       53
       +
               last_timer = null;

     

       54
       +
               block_changed() {

     

       55
        
                   var widget = this;

     

       56
        
                   window.setTimeout(function() {

     

       57
        
                       if (widget.model.get('_mousemove_blocked')

     
···

       59
        
                           widget.send_mouse_event('mousemove', widget.last_move);

     

       60
        
                       }

     

       61
        
                   }, 0);

     

       62
       +
               }

     

       63
       +
               send_mouse_event(name, e) {

     

       64
        
                   this.last_move = null;

     

       65
        
                   if (this.model.get('disable')) {

     

       66
        
                       return;

     
···

       91
        
                       currentTargetId: e.currentTarget ? e.currentTarget.id : null,

     

       92
        
                       relatedTargetId: e.relatedTarget ? e.relatedTarget.id : null,

     

       93
        
                   });

     

       94
       +
               }

     

       95
       +
               delay_changed() {

     

       96
        
                   var widget = this;

     

       97
        
                   window.clearTimeout(widget.last_timer);

     

       98
        
                   if (widget.model.get('disable')) {

     
···

       104
        
                           widget.send_timed_event('timed');

     

       105
        
                       }, delay);

     

       106
        
                   }

     

       107
       +
               }

     

       108
       +
               send_timed_event(name) {

     

       109
        
                   if (this.model.get('disable')) {

     

       110
        
                       return;

     

       111
        
                   }

     
···

       113
        
                   this.send({

     

       114
        
                       name: name,

     

       115
        
                   });

     

       116
       +
               }

     

       117
       +
               register_events() {

     

       118
        
                   var widget = this;

     

       119
        
                   this.svg_view.addEventListener('mousedown', function(e) {

     

       120
        
                       e.preventDefault();

     
···

       134
        
                       widget.send_mouse_event('mouseup', e);

     

       135
        
                   });

     

       136
        
               }

     

       137
       +
           }

     

       138
        
       

     

       139
        
           return {

     

       140
       +
               DrawingModel: DrawingModel,

     

       141
        
               DrawingView: DrawingView

     

       142
        
           };

     

       143
        
       });

drawSvg/widgets/drawing_widget.py

···

       10
        
       

     

       11
        
       

     

       12
        
       class DrawingWidget(widgets.DOMWidget):

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       13
        
           _view_name = Unicode('DrawingView').tag(sync=True)

     

       14
        
           _view_module = Unicode('drawingview').tag(sync=True)

     

       15
        
           _view_module_version = Unicode('0.1.0').tag(sync=True)

···

       10
        
       

     

       11
        
       

     

       12
        
       class DrawingWidget(widgets.DOMWidget):

     

       13
       +
           _model_name = Unicode('DrawingModel').tag(sync=True)

     

       14
       +
           _model_module = Unicode('drawingview').tag(sync=True)

     

       15
       +
           _model_module_version = Unicode('0.1.0').tag(sync=True)

     

       16
        
           _view_name = Unicode('DrawingView').tag(sync=True)

     

       17
        
           _view_module = Unicode('drawingview').tag(sync=True)

     

       18
        
           _view_module_version = Unicode('0.1.0').tag(sync=True)