commit b33e49d7bc875d985a78bb041c7e8f17c7512c35 · cduck.me/drawsvg

+42 -18

drawSvg/widgets/drawing_javascript.py

···

       2
       2
        
       require.undef('drawingview');

     

       3
       3
        
       

     

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

     

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

     

       6
       6
       -
               render: function() {

     

       5
       5
       +
           class DrawingModel extends widgets.DOMWidgetModel {

     

       6
       6
       +
               defaults() {

     

       7
       7
       +
                   return {

     

       8
       8
       +
                       ...super.defaults(),

     

       9
       9
       +
                       _model_name: DrawingModel.model_name,

     

       10
       10
       +
                       _model_module: DrawingModel.model_module,

     

       11
       11
       +
                       _model_module_version: DrawingModel.model_module_version,

     

       12
       12
       +
                       _view_name: DrawingModel.view_name,

     

       13
       13
       +
                       _view_module: DrawingModel.view_module,

     

       14
       14
       +
                       _view_module_version: DrawingModel.view_module_version,

     

       15
       15
       +
                   };

     

       16
       16
       +
               }

     

       17
       17
       +
               static serializers = {

     

       18
       18
       +
                   ...widgets.DOMWidgetModel.serializers,

     

       19
       19
       +
               };

     

       20
       20
       +
               static model_name = 'DrawingModel';

     

       21
       21
       +
               static model_module = 'drawingview';

     

       22
       22
       +
               static model_module_version = '0.1.0';

     

       23
       23
       +
               static view_name = 'DrawingView';

     

       24
       24
       +
               static view_module = 'drawingview';

     

       25
       25
       +
               static view_module_version = '0.1.0';

     

       26
       26
       +
           }

     

       27
       27
       +
       

     

       28
       28
       +
           class DrawingView extends widgets.DOMWidgetView {

     

       29
       29
       +
               render() {

     

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

     

       8
       31
        
                   this.image_changed();

     

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

     
···

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

     

       19
       42
        
                                 this);

     

       20
       43
        
                   this.delay_changed();

     

       21
       21
       -
               },

     

       22
       22
       -
               image_changed: function() {

     

       44
       44
       +
               }

     

       45
       45
       +
               image_changed() {

     

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

     

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

     

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

     

       26
       49
        
                   this.register_events();

     

       27
       27
       -
               },

     

       28
       28
       -
               last_move: null,

     

       29
       29
       -
               last_mousemove_blocked: null,

     

       30
       30
       -
               last_timer: null,

     

       31
       31
       -
               block_changed: function() {

     

       50
       50
       +
               }

     

       51
       51
       +
               last_move = null;

     

       52
       52
       +
               last_mousemove_blocked = null;

     

       53
       53
       +
               last_timer = null;

     

       54
       54
       +
               block_changed() {

     

       32
       55
        
                   var widget = this;

     

       33
       56
        
                   window.setTimeout(function() {

     

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

     
···

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

     

       37
       60
        
                       }

     

       38
       61
        
                   }, 0);

     

       39
       39
       -
               },

     

       40
       40
       -
               send_mouse_event: function(name, e) {

     

       62
       62
       +
               }

     

       63
       63
       +
               send_mouse_event(name, e) {

     

       41
       64
        
                   this.last_move = null;

     

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

     

       43
       66
        
                       return;

     
···

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

     

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

     

       70
       93
        
                   });

     

       71
       71
       -
               },

     

       72
       72
       -
               delay_changed: function() {

     

       94
       94
       +
               }

     

       95
       95
       +
               delay_changed() {

     

       73
       96
        
                   var widget = this;

     

       74
       97
        
                   window.clearTimeout(widget.last_timer);

     

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

     
···

       81
       104
        
                           widget.send_timed_event('timed');

     

       82
       105
        
                       }, delay);

     

       83
       106
        
                   }

     

       84
       84
       -
               },

     

       85
       85
       -
               send_timed_event: function(name) {

     

       107
       107
       +
               }

     

       108
       108
       +
               send_timed_event(name) {

     

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

     

       87
       110
        
                       return;

     

       88
       111
        
                   }

     
···

       90
       113
        
                   this.send({

     

       91
       114
        
                       name: name,

     

       92
       115
        
                   });

     

       93
       93
       -
               },

     

       94
       94
       -
               register_events: function() {

     

       116
       116
       +
               }

     

       117
       117
       +
               register_events() {

     

       95
       118
        
                   var widget = this;

     

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

     

       97
       120
        
                       e.preventDefault();

     
···

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

     

       112
       135
        
                   });

     

       113
       136
        
               }

     

       114
       114
       -
           });

     

       137
       137
       +
           }

     

       115
       138
        
       

     

       116
       139
        
           return {

     

       140
       140
       +
               DrawingModel: DrawingModel,

     

       117
       141
        
               DrawingView: DrawingView

     

       118
       142
        
           };

     

       119
       143
        
       });

drawSvg/widgets/drawing_widget.py

···

       10
       10
        
       

     

       11
       11
        
       

     

       12
       12
        
       class DrawingWidget(widgets.DOMWidget):

     

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

     

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

     

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

     

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

     

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

     

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