Skip to content

Home Information - Your home, your data, organized.

Python

Have new pointer Javascript events basics working now.

Anthony Cassandra88e34bdbef9c
diff --git a/src/hi/static/js/svg-event-listeners.js b/src/hi/static/js/svg-event-listeners.js
index 3d46e309..1973b367 100644
--- a/src/hi/static/js/svg-event-listeners.js
+++ b/src/hi/static/js/svg-event-listeners.js
@@ -18,27 +18,53 @@
const activePointers = new Map();
const gLastMoveEventTimes = new Map();
- let gCurrentEventData = null;
+ let gCurrentSingleEvent = null;
+ let gCurrentDoubleEvent = null;
- class PointerEventData {
- constructor( startEvent, startDistance = 0, startAngle = 0 ) {
+ class SinglePointerEvent {
+ constructor( startEvent ) {
this.start = {
event: startEvent,
x: startEvent.clientX,
y: startEvent.clientY,
- distance: startDistance,
- angle: startAngle,
};
this.previous = { ...this.start };
this.last = { ...this.start };
}
- get deltaX() {
+ get deltaXStart() {
return this.last.x - this.start.x;
}
- get deltaY() {
+ get deltaXPrevious() {
+ return this.last.x - this.previous.x;
+ }
+ get deltaYStart() {
return this.last.y - this.start.y;
}
+ get deltaYPrevious() {
+ return this.last.y - this.previous.y;
+ }
+ update( newEvent ) {
+ this.previous = { ...this.last };
+ this.last.event = newEvent;
+ this.last.x = newEvent.clientX;
+ this.last.y = newEvent.clientY;
+ }
+ }
+
+ class DoublePointerEvent {
+ constructor( startEvent, pointersMap ) {
+ const points = this.sortedPointsFromPointersMap( pointersMap );
+ this.start = {
+ event: startEvent,
+ points: points,
+ distance: this.getDistance( points[1], points[0] ),
+ angle: this.getAngle( points[1], points[0] )
+ };
+
+ this.previous = { ...this.start };
+ this.last = { ...this.start };
+ }
get deltaDistanceStart() {
return this.last.distance - this.start.distance;
}
@@ -51,75 +77,62 @@
get deltaAnglePrevious() {
return this.last.angle - this.previous.angle;
}
- update( lastEvent, distance = null, angle = null ) {
-
+ sortedPointsFromPointersMap( pointersMap ) {
+ return Array.from( pointersMap.entries() )
+ .sort( ([idA], [idB]) => idA - idB)
+ .map( ([, value]) => value);
+ }
+ getDistance( p1, p2 ) {
+ let dx = p1.x - p2.x;
+ let dy = p1.y - p2.y;
+ return Math.sqrt( dx * dx + dy * dy );
+ }
+ getAngle( p1, p2 ) {
+ return Math.atan2( p2.y - p1.y, p2.x - p1.x ) * ( 180 / Math.PI );
+ }
+ update( newEvent, pointersMap ) {
+ const points = this.sortedPointsFromPointersMap( pointersMap );
this.previous = { ...this.last };
- this.last.event = lastEvent;
- this.last.x = lastEvent.clientX;
- this.last.y = lastEvent.clientY;
-
- if ( distance !== null ) this.last.distance = distance;
- if ( angle !== null ) this.last.angle = angle;
+ this.last.event = newEvent;
+ this.last.points = points;
+ this.last.distance = this.getDistance( points[1], points[0] );
+ this.last.angle = this.getAngle( points[1], points[0] );
}
}
- function getDistance( p1, p2 ) {
- let dx = p1.x - p2.x;
- let dy = p1.y - p2.y;
- return Math.sqrt( dx * dx + dy * dy );
- }
- function getAngle( p1, p2 ) {
- return Math.atan2( p2.y - p1.y, p2.x - p1.x ) * ( 180 / Math.PI );
- }
-
- function addPointerListener( eventType, selector, handler, passive = true ) {
- // N.B.
- // - "passive = false" ensures preventDefault() works for pointer events.
- // - jQuery doesn't support this option, so cannot use its event registrations for these
-
- $(document).each( function() {
- this.addEventListener( eventType, function( event ) {
- if ( event.target.closest( selector )) {
- handler( event );
- }
- }, { passive: passive });
- });
- }
-
function handlePointerDownEvent( event ) {
+ const initialActivePointersSize = activePointers.size;
activePointers.set( event.pointerId, { x: event.clientX, y: event.clientY } );
+ const currentActivePointersSize = activePointers.size;
- let handled = false;
- if ( activePointers.size === 1 ) {
- gCurrentEventData = new PointerEventData( event );
- handled = Hi.edit.icon.handlePointerDown( gCurrentEventData );
- if ( ! handled) {
- handled = Hi.location.handlePointerDown( gCurrentEventData );
- }
+ if (( initialActivePointersSize === 0 ) && ( currentActivePointersSize === 1 )) {
+ gCurrentSingleEvent = new SinglePointerEvent( event );
+ dispatchSinglePointerEventStart( event, gCurrentSingleEvent );
- } else if ( activePointers.size === 2 ) {
- let points = Array.from( activePointers.values() );
- const distance = getDistance( points[0], points[1] );
- const angle = getAngle( points[0], points[1] );
- gCurrentEventData = new PointerEventData( event, distance, angle );
+ } else if (( initialActivePointersSize === 1 ) && ( currentActivePointersSize === 2 )) {
+ dispatchSinglePointerEventEnd( null, gCurrentSingleEvent );
+ gCurrentSingleEvent = null;
- handled = Hi.edit.icon.scaleAndRotateFromPointerEvents( gCurrentEventData );
- if ( ! handled) {
- handled = Hi.location.scaleAndRotateFromPointerEvents( gCurrentEventData );
- }
+ gCurrentDoubleEvent = new DoublePointerEvent( event, activePointers );
+ dispatchDoublePointerEventStart( event, gCurrentDoubleEvent );
+
+ } else if (( initialActivePointersSize == 2 ) && ( currentActivePointersSize === 3 )) {
+ // Only one and two pointer events supported.
+ } else {
+ // Only one and two pointer events supported.
}
-
- if ( handled ) {
- event.preventDefault();
- event.stopImmediatePropagation();
- }
+
event.target.setPointerCapture( event.pointerId );
}
function handlePointerMoveEvent( event ) {
- if ( ! gCurrentEventData ) { return; }
+ let lastPointer = activePointers.get( event.pointerId );
+ if ( ! lastPointer ) {
+ return;
+ }
+
// Guarding against event floods and performance issues.
let now = Date.now();
if ( gLastMoveEventTimes.has( event.pointerId )) {
@@ -127,106 +140,153 @@
if ( deltaTimeMs < LAST_MOVE_THROTTLE_THRESHOLD_MS ) {
return;
}
- gLastMoveEventTimes.set( event.pointerId, now );
}
+ gLastMoveEventTimes.set( event.pointerId, now );
- let lastPointer = activePointers.get( event.pointerId );
- if ( lastPointer ) {
-
- let last_pointer_delta_x = event.clientX - lastPointer.x;
- let last_pointer_delta_y = event.clientY - lastPointer.y;
-
- // Ignore micro-movements to avoid re-render floods and performance issues.
- if (( Math.abs( last_pointer_delta_x ) < POINTER_MOVE_THRESHOLD_PIXELS )
- && ( Math.abs( last_pointer_delta_y ) < POINTER_MOVE_THRESHOLD_PIXELS )) {
- return;
- }
+ let last_pointer_delta_x = event.clientX - lastPointer.x;
+ let last_pointer_delta_y = event.clientY - lastPointer.y;
- activePointers.set( event.pointerId, { x: event.clientX, y: event.clientY } );
+ // Ignore micro-movements to avoid re-render floods and performance issues.
+ if (( Math.abs( last_pointer_delta_x ) < POINTER_MOVE_THRESHOLD_PIXELS )
+ && ( Math.abs( last_pointer_delta_y ) < POINTER_MOVE_THRESHOLD_PIXELS )) {
+ return;
+ }
- let handled = false;
- if ( activePointers.size === 1 ) {
- gCurrentEventData.update( event );
-
- handled = Hi.edit.icon.handlePointerMove( gCurrentEventData );
- if ( ! handled) {
- handled = Hi.location.handlePointerMove( gCurrentEventData );
- }
-
- } else if ( activePointers.size === 2 ) {
-
- let points = Array.from( activePointers.values() );
- const distance = getDistance( points[0], points[1] );
- const angle = getAngle( points[0], points[1] );
+ activePointers.set( event.pointerId, { x: event.clientX, y: event.clientY } );
- gCurrentEventData.update( event, distance, angle );
+ if ( activePointers.size === 1 ) {
+ gCurrentSingleEvent.update( event );
+ dispatchSinglePointerEventMove( event, gCurrentSingleEvent );
+
+ } else if ( activePointers.size === 2 ) {
+ gCurrentDoubleEvent.update( event, activePointers );
+ dispatchDoublePointerEventMove( event, gCurrentDoubleEvent );
- handled = Hi.edit.icon.scaleAndRotateFromPointerEvents( gCurrentEventData );
- if ( ! handled) {
- handled = Hi.location.scaleAndRotateFromPointerEvents( gCurrentEventData );
- }
- }
- if ( handled ) {
- event.preventDefault();
- event.stopImmediatePropagation();
- }
+ } else {
+ // Only one and two pointer events supported.
}
}
function handlePointerUpEvent( event ) {
- if ( ! gCurrentEventData ) { return; }
- const initialActivePointers = activePointers.size;
+ const initialActivePointersSize = activePointers.size;
let lastPointer = activePointers.get( event.pointerId );
- if ( lastPointer ) {
- activePointers.delete( event.pointerId );
+ if ( ! lastPointer ) {
+ return;
+ }
+ activePointers.delete( event.pointerId );
+ const currentActivePointersSize = activePointers.size;
- gCurrentEventData.update( event );
- let handled = false;
- if ( initialActivePointers == 2 ) {
- handled = Hi.edit.icon.scaleAndRotateFromPointerEvents( gCurrentEventData );
- if ( ! handled) {
- handled = Hi.location.scaleAndRotateFromPointerEvents( gCurrentEventData );
- }
- } else {
- handled = Hi.edit.icon.handlePointerUp( gCurrentEventData );
- if ( ! handled) {
- handled = Hi.location.handlePointerUp( gCurrentEventData );
- }
- }
+ if (( initialActivePointersSize === 1 ) && ( currentActivePointersSize === 0 )) {
+ gCurrentSingleEvent.update( event );
+ dispatchSinglePointerEventEnd( event, gCurrentSingleEvent );
+
+ } else if (( initialActivePointersSize === 2 ) && ( currentActivePointersSize === 1 )) {
+ dispatchDoublePointerEventEnd( null, gCurrentDoubleEvent );
+ gCurrentDoubleEvent = null;
+
+ gCurrentSingleEvent = new SinglePointerEvent( event );
+ dispatchSinglePointerEventStart( event, gCurrentSingleEvent );
- if ( handled ) {
- event.stopImmediatePropagation();
- }
- if (activePointers.size < 1 ) {
- gCurrentEventData = null;
- }
+ } else if (( initialActivePointersSize === 3 ) && ( currentActivePointersSize === 2 )) {
+ dispatchDoublePointerEventEnd( null, gCurrentDoubleEvent );
+
+ gCurrentDoubleEvent = new DoublePointerEvent( event, activePointers );
+ dispatchDoublePointerEventStart( event, gCurrentDoubleEvent );
+
+ } else {
+ // Only one and two pointer events supported.
}
+
event.target.releasePointerCapture( event.pointerId );
}
function handlePointerCancelEvent( event ) {
- activePointers.clear();
- gCurrentEventData.update( event );
+ // Treat the same ad an "up" event for now.
+ handlePointerUpEvent();
+ }
- let handled = Hi.edit.icon.handlePointerUp( gCurrentEventData );
+ function dispatchSinglePointerEventStart( currentEvent, singlePointerEvent ) {
+ let handled = Hi.edit.icon.handleSinglePointerEventStart( singlePointerEvent );
if ( ! handled) {
- handled = Hi.location.handlePointerUp( gCurrentEventData );
+ handled = Hi.location.handleSinglePointerEventStart( singlePointerEvent );
}
- if ( handled ) {
- event.stopImmediatePropagation();
+ if ( handled && currentEvent ) {
+ currentEvent.stopImmediatePropagation();
}
- gCurrentEventData = null;
+ }
- event.target.releasePointerCapture( event.pointerId );
+ function dispatchSinglePointerEventMove( currentEvent, singlePointerEvent ) {
+ let handled = Hi.edit.icon.handleSinglePointerEventMove( singlePointerEvent );
+ if ( ! handled) {
+ handled = Hi.location.handleSinglePointerEventMove( singlePointerEvent );
+ }
+ if ( handled && currentEvent ) {
+ currentEvent.stopImmediatePropagation();
+ }
+ }
+
+ function dispatchSinglePointerEventEnd( currentEvent, singlePointerEvent ) {
+ let handled = Hi.edit.icon.handleSinglePointerEventEnd( singlePointerEvent );
+ if ( ! handled) {
+ handled = Hi.location.handleSinglePointerEventEnd( singlePointerEvent );
+ }
+ if ( handled && currentEvent ) {
+ currentEvent.preventDefault();
+ currentEvent.stopImmediatePropagation();
+ }
}
+ function dispatchDoublePointerEventStart( currentEvent, doublePointerEvent ) {
+ let handled = Hi.edit.icon.handleDoublePointerEventStart( doublePointerEvent );
+ if ( ! handled) {
+ handled = Hi.location.handleDoublePointerEventStart( doublePointerEvent );
+ }
+ if ( handled && currentEvent ) {
+ currentEvent.stopImmediatePropagation();
+ }
+ }
+
+ function dispatchDoublePointerEventMove( currentEvent, doublePointerEvent ) {
+ let handled = Hi.edit.icon.handleDoublePointerEventMove( doublePointerEvent );
+ if ( ! handled) {
+ handled = Hi.location.handleDoublePointerEventMove( doublePointerEvent );
+ }
+ if ( handled && currentEvent ) {
+ currentEvent.stopImmediatePropagation();
+ }
+ }
+
+ function dispatchDoublePointerEventEnd( currentEvent, doublePointerEvent ) {
+ let handled = Hi.edit.icon.handleDoublePointerEventEnd( doublePointerEvent );
+ if ( ! handled) {
+ handled = Hi.location.handleDoublePointerEventEnd( doublePointerEvent );
+ }
+ if ( handled && currentEvent ) {
+ currentEvent.stopImmediatePropagation();
+ }
+ }
+
+ function addPointerListener( eventType, selector, handler, passive = true ) {
+ // N.B.
+ // - "passive = false" ensures preventDefault() works for pointer events.
+ // - jQuery doesn't support this option, so cannot use its event registrations for these
+
+ $(document).each( function() {
+ this.addEventListener( eventType, function( event ) {
+ if ( event.target.closest( selector )) {
+ handler( event );
+ }
+ }, { passive: passive });
+ });
+ }
+
$(document).ready(function() {
addPointerListener( 'pointerdown', Hi.LOCATION_VIEW_AREA_SELECTOR, handlePointerDownEvent, false );
addPointerListener( 'pointermove', Hi.LOCATION_VIEW_AREA_SELECTOR, handlePointerMoveEvent, false );
- addPointerListener( 'pointerup', Hi.LOCATION_VIEW_AREA_SELECTOR, handlePointerUpEvent );
+ addPointerListener( 'pointerup', Hi.LOCATION_VIEW_AREA_SELECTOR, handlePointerUpEvent, false );
addPointerListener( 'pointercancel', Hi.LOCATION_VIEW_AREA_SELECTOR, handlePointerCancelEvent );
$(document).on('wheel', Hi.LOCATION_VIEW_AREA_SELECTOR, function( event ) {
diff --git a/src/hi/static/js/svg-icon.js b/src/hi/static/js/svg-icon.js
index 5f15f9ba..26ef34ac 100644
--- a/src/hi/static/js/svg-icon.js
+++ b/src/hi/static/js/svg-icon.js
@@ -12,17 +12,23 @@
Hi.edit.eventBus.subscribe( Hi.edit.SELECTION_MADE_EVENT_NAME,
this.clearSelection.bind(this) );
},
- handlePointerDown: function( pointerEventData ) {
- return _handlePointerDown( pointerEventData );
+ handleSinglePointerEventStart: function( singlePointerEvent ) {
+ return _handleSinglePointerEventStart( singlePointerEvent );
},
- handlePointerMove: function( pointerEventData ) {
- return _handlePointerMove( pointerEventData );
+ handleSinglePointerEventMove: function( singlePointerEvent ) {
+ return _handleSinglePointerEventMove( singlePointerEvent );
},
- handlePointerUp: function( pointerEventData ) {
- return _handlePointerUp( pointerEventData );
+ handleSinglePointerEventEnd: function( singlePointerEvent ) {
+ return _handleSinglePointerEventEnd( singlePointerEvent );
},
- scaleAndRotateFromPointerEvents: function( pointerEventData ) {
- return _scaleAndRotateFromPointerEvents( pointerEventData );
+ handleDoublePointerEventStart: function( doublePointerEvent ) {
+ return _handleDoublePointerEventStart( doublePointerEvent );
+ },
+ handleDoublePointerEventMove: function( doublePointerEvent ) {
+ return _handleDoublePointerEventMove( doublePointerEvent );
+ },
+ handleDoublePointerEventEnd: function( doublePointerEvent ) {
+ return _handleDoublePointerEventEnd( doublePointerEvent );
},
handleMouseWheel: function( event ) {
return _handleMouseWheel( event );
@@ -61,6 +67,8 @@
const ICON_ACTION_ZOOM_OUT_KEY = '-';
const CURSOR_MOVEMENT_THRESHOLD_PIXELS = 3; // Differentiate between move events and sloppy clicks
+ const POINTER_EVENTS_SCALE_FACTOR = 250.0;
+ const POINTER_EVENTS_ROTATE_FACTOR = 0.1;
const KEYPRESS_ZOOM_SCALE_FACTOR_PERCENT = 10.0;
const MOUSE_WHEEL_ZOOM_SCALE_FACTOR_PERCENT = 10.0;
const MOUSE_MOVE_ZOOM_SCALE_FACTOR = 175.0; // Number of pixels moved to double or halve size
@@ -88,19 +96,17 @@
let positionApiCallDebounceTimer = null;
let lastPositionApiCallTime = 0;
- function _handlePointerDown( pointerEventData ) {
+ function _handleSinglePointerEventStart( singlePointerEvent ) {
if ( ! Hi.isEditMode ) { return false; }
- const event = pointerEventData.start.event;
-
// Need to track start time to differentiate drag/scale/rotate actions from regular clicks.
gClickStart = {
- x: event.clientX,
- y: event.clientY,
+ x: singlePointerEvent.start.x,
+ y: singlePointerEvent.start.y,
};
if ( gSvgIconActionEditData ) {
- if ( Hi.DEBUG ) { console.log( `Pointer down event [${MODULE_NAME}]`, event ); }
+ if ( Hi.DEBUG ) { console.log( `Pointer down [${MODULE_NAME}]`, singlePointerEvent ); }
if ( gSvgIconActionState == SvgActionStateType.SCALE ) {
gSvgIconActionEditData.isScaling = true;
} else if ( gSvgIconActionState == SvgActionStateType.ROTATE ) {
@@ -108,18 +114,18 @@
}
return true;
} else {
- const enclosingSvgGroup = $(event.target).closest('g');
+ const enclosingSvgGroup = $(singlePointerEvent.start.event.target).closest('g');
if ( enclosingSvgGroup.length > 0 ) {
const svgDataType = $(enclosingSvgGroup).attr( Hi.DATA_TYPE_ATTR );
if ( svgDataType == Hi.DATA_TYPE_ICON_VALUE ) {
if ( $(enclosingSvgGroup).attr('id') != $(gSelectedIconSvgGroup).attr('id')) {
clearSelectedIconSvgGroup();
- gSelectedIconSvgGroup = enclosingSvgGroup;
+ gSelectedIconSvgGroup = enclosingSvgGroup[0];
}
- if ( Hi.DEBUG ) { console.log( `Pointer down event [${MODULE_NAME}]`, event ); }
- createIconDragData( event, enclosingSvgGroup );
+ if ( Hi.DEBUG ) { console.log( `Pointer down [${MODULE_NAME}]`, singlePointerEvent ); }
+ startDrag( singlePointerEvent, enclosingSvgGroup );
return true;
}
}
@@ -128,24 +134,22 @@
return false;
}
- function _handlePointerMove( pointerEventData ) {
+ function _handleSinglePointerEventMove( singlePointerEvent ) {
if ( ! Hi.isEditMode ) { return false; }
-
- const event = pointerEventData.last.event;
const currentMousePosition = {
- x: event.clientX,
- y: event.clientY
+ x: singlePointerEvent.last.x,
+ y: singlePointerEvent.last.y
};
let handled = false;
if ( gSvgIconActionEditData ) {
if ( gSvgIconActionEditData.isScaling ) {
- iconActionScaleFromMouseMove( currentMousePosition );
+ updateScaleFromMouseMove( currentMousePosition );
handled = true;
} else if ( gSvgIconActionEditData.isRotating ) {
- iconActionRotateUpdateFromMouseMove( currentMousePosition );
+ updateRotateFromMouseMove( currentMousePosition );
handled = true;
}
}
@@ -159,7 +163,7 @@
|| ( distanceY > CURSOR_MOVEMENT_THRESHOLD_PIXELS )) {
gSvgIconDragData.isDragging = true;
$(Hi.BASE_SVG_SELECTOR).attr( Hi.SVG_ACTION_STATE_ATTR_NAME, SvgActionStateType.MOVE);
- updateDrag(event);
+ updateDrag( singlePointerEvent );
handled = true;
}
}
@@ -169,19 +173,27 @@
return handled;
}
- function _handlePointerUp( pointerEventData ) {
+ function _handleSinglePointerEventEnd( singlePointerEvent ) {
if ( ! Hi.isEditMode ) { return false; }
- const event = pointerEventData.last.event;
+ let handled = endSinglePointerEvent();
+ if ( handled ) {
+ if ( Hi.DEBUG ) { console.log( `Pointer end [${MODULE_NAME}]`, singlePointerEvent ); }
+ } else {
+ if ( Hi.DEBUG ) { console.log( `Pointer end skipped [${MODULE_NAME}]` ); }
+ }
+ return handled;
+ }
+
+ function endSinglePointerEvent() {
if ( gSvgIconActionEditData ) {
- if ( Hi.DEBUG ) { console.log( `Pointer up event [${MODULE_NAME}]`, event ); }
if ( gSvgIconActionState == SvgActionStateType.SCALE ) {
gSvgIconActionEditData.isScaling = false;
- iconActionScaleApply();
+ endScale();
} else if ( gSvgIconActionState == SvgActionStateType.ROTATE ) {
gSvgIconActionEditData.isRotating = false;
- iconActionRotateApply();
+ endRotate();
}
gSvgIconActionState = SvgActionStateType.MOVE;
$(Hi.BASE_SVG_SELECTOR).attr( Hi.SVG_ACTION_STATE_ATTR_NAME, '');
@@ -191,9 +203,8 @@
}
if ( gSvgIconDragData ) {
- if ( Hi.DEBUG ) { console.log( `Pointer up event [${MODULE_NAME}]`, event ); }
if ( gSvgIconDragData.isDragging ) {
- applyDrag( event );
+ endDrag();
$(Hi.BASE_SVG_SELECTOR).attr( Hi.SVG_ACTION_STATE_ATTR_NAME, '');
}
$(Hi.BASE_SVG_SELECTOR).attr( Hi.SVG_ACTION_STATE_ATTR_NAME, '' );
@@ -201,10 +212,49 @@
return true;
}
- if ( Hi.DEBUG ) { console.log( `Pointer up skipped [${MODULE_NAME}]` ); }
+ if ( Hi.DEBUG ) { console.log( `Pointer end skipped [${MODULE_NAME}]` ); }
return false;
}
+
+ function _handleDoublePointerEventStart( doublePointerEvent ) {
+ if ( ! Hi.isEditMode ) { return false; }
+ if ( ! gSelectedIconSvgGroup ) { return false; }
+ endSinglePointerEvent();
+ return true;
+ }
+
+
+ function _handleDoublePointerEventMove( doublePointerEvent ) {
+ if ( ! Hi.isEditMode ) { return false; }
+ if ( ! gSelectedIconSvgGroup ) { return false; }
+
+ let scaleMultiplier = ( 1.0 + ( doublePointerEvent.deltaDistancePrevious
+ / POINTER_EVENTS_SCALE_FACTOR ));
+ let deltaAngle = doublePointerEvent.deltaAngleStart * POINTER_EVENTS_ROTATE_FACTOR;
+
+ updateScale( gSelectedIconSvgGroup, scaleMultiplier );
+ updateRotate( gSelectedIconSvgGroup, deltaAngle );
+ return true;
+ }
+
+ function _handleDoublePointerEventEnd( doublePointerEvent ) {
+ let handled = endDoublePointerEvent();
+ if ( handled ) {
+ if ( Hi.DEBUG ) { console.log( `Touch-2 end: [${MODULE_NAME}]`, event ); }
+ } else {
+ if ( Hi.DEBUG ) { console.log( `Touch-2 end skipped: [${MODULE_NAME}]`, event ); }
+ }
+ return handled;
+ }
+
+ function endDoublePointerEvent() {
+ if ( ! Hi.isEditMode ) { return false; }
+ if ( ! gSelectedIconSvgGroup ) { return false; }
+ saveIconSvgPositionDebouncer( gSelectedIconSvgGroup );
+ return true;
+ }
+
function _handleMouseWheel( event ) {
if ( ! Hi.isEditMode ) { return false; }
@@ -214,12 +264,12 @@
if ( gSvgIconActionEditData ) {
if ( gSvgIconActionState == SvgActionStateType.SCALE ) {
- iconActionScaleFromMouseWheel( event );
+ updateScaleFromMouseWheel( event );
event.preventDefault();
event.stopImmediatePropagation();
return true;
} else if ( gSvgIconActionState == SvgActionStateType.ROTATE ) {
- iconActionRotateFromMouseWheel( event );
+ updateRotateFromMouseWheel( event );
event.preventDefault();
event.stopImmediatePropagation();
return true;
@@ -279,30 +329,30 @@
if ( Hi.DEBUG ) { console.log( `Key Down [${MODULE_NAME}]`, event ); }
if ( event.key == ICON_ACTION_SCALE_KEY ) {
- iconActionRotateAbort();
- iconActionScaleStart();
+ rotateAbort();
+ startScale();
} else if ( event.key == ICON_ACTION_ROTATE_KEY ) {
- iconActionScaleAbort();
- iconActionRotateStart();
+ scaleAbort();
+ startRotate();
} else if ( event.key == ICON_ACTION_ZOOM_IN_KEY ) {
if ( gSvgIconActionState == SvgActionStateType.SCALE ) {
- iconActionScaleUpFromKeypress();
+ scaleUpFromKeypress();
} else if ( gSvgIconActionState == SvgActionStateType.ROTATE ) {
- iconActionRotateRightFromKeypress();
+ rotateRightFromKeypress();
}
} else if ( event.key == ICON_ACTION_ZOOM_OUT_KEY ) {
if ( gSvgIconActionState == SvgActionStateType.SCALE ) {
- iconActionScaleDownFromKeypress();
+ scaleDownFromKeypress();
} else if ( gSvgIconActionState == SvgActionStateType.ROTATE ) {
- iconActionRotateLeftFromKeypress();
+ rotateLeftFromKeypress();
}
} else if ( event.key == 'Escape' ) {
- iconActionScaleAbort();
- iconActionRotateAbort();
+ scaleAbort();
+ rotateAbort();
gSvgIconActionState = SvgActionStateType.MOVE;
$(Hi.BASE_SVG_SELECTOR).attr( Hi.SVG_ACTION_STATE_ATTR_NAME, '');
clearSelectedIconSvgGroup();
@@ -321,7 +371,7 @@
if ( Hi.isEditMode ) {
clearSelectedIconSvgGroup();
- gSelectedIconSvgGroup = enclosingSvgGroup;
+ gSelectedIconSvgGroup = $(enclosingSvgGroup)[0];
$(enclosingSvgGroup).addClass( Hi.HIGHLIGHTED_CLASS );
gSvgIconActionState = SvgActionStateType.MOVE;
let data = {
@@ -343,7 +393,7 @@
}
}
- function createIconDragData( event, enclosingSvgGroup ) {
+ function startDrag( singlePointerEvent, enclosingSvgGroup ) {
const dragElement = enclosingSvgGroup;
Hi.displayElementInfo( 'Drag Element', dragElement );
@@ -351,9 +401,11 @@
const baseSvgElement = $(Hi.BASE_SVG_SELECTOR);
Hi.displayElementInfo( 'Base SVG', baseSvgElement );
- let transform = dragElement.attr('transform') || '';
+ let transform = $(dragElement).attr('transform') || '';
let { scale, translate, rotate } = Hi.svgUtils.getSvgTransformValues( transform );
- let cursorSvgPoint = Hi.svgUtils.toSvgPoint( baseSvgElement, event.clientX, event.clientY );
+ let cursorSvgPoint = Hi.svgUtils.toSvgPoint( baseSvgElement,
+ singlePointerEvent.last.x,
+ singlePointerEvent.last.y );
const cursorSvgOffset = {
x : (cursorSvgPoint.x / scale.x) - translate.x,
@@ -364,7 +416,6 @@
element: dragElement,
baseSvgElement: baseSvgElement,
cursorSvgOffset: cursorSvgOffset,
- elementSvgCenterPoint: Hi.svgUtils.getSvgCenterPoint( dragElement, baseSvgElement ),
originalSvgScale: scale,
originalSvgRotate: rotate,
isDragging: false
@@ -373,73 +424,45 @@
if ( Hi.DEBUG ) {
console.log( `Drag Start:
SVG Cursor Point: ( ${cursorSvgPoint.x}, ${cursorSvgPoint.y} ),
- SVG Cursor Offset: ( ${gSvgIconDragData.cursorSvgOffset.x}, ${gSvgIconDragData.cursorSvgOffset.y} ),
- SVG Center Point: ( ${gSvgIconDragData.elementSvgCenterPoint.x}, ${gSvgIconDragData.elementSvgCenterPoint.y} )`);
+ SVG Cursor Offset: ( ${gSvgIconDragData.cursorSvgOffset.x}, ${gSvgIconDragData.cursorSvgOffset.y} )`);
}
}
- function updateDrag( event ) {
+ function updateDrag( singlePointerEvent ) {
if ( gSvgIconDragData == null ) {
return;
}
- Hi.displayEventInfo( 'Update Drag', event );
+ Hi.displayEventInfo( 'Update Drag', singlePointerEvent );
Hi.displayElementInfo( 'Drag Element', gSvgIconDragData.element );
let cursorSvgPoint = Hi.svgUtils.toSvgPoint( gSvgIconDragData.baseSvgElement,
- event.clientX,
- event.clientY );
+ singlePointerEvent.last.x,
+ singlePointerEvent.last.y );
let scale = gSvgIconDragData.originalSvgScale;
let rotate = gSvgIconDragData.originalSvgRotate;
-
- let newX = (cursorSvgPoint.x / scale.x) - gSvgIconDragData.cursorSvgOffset.x;
- let newY = (cursorSvgPoint.y / scale.y) - gSvgIconDragData.cursorSvgOffset.y;
-
- let transform = gSvgIconDragData.element.attr('transform') || '';
-
- let newTransform = `scale(${scale.x} ${scale.y}) translate(${newX}, ${newY}) rotate(${rotate.angle}, ${rotate.cx}, ${rotate.cy})`;
-
- gSvgIconDragData.element.attr('transform', newTransform);
+ let translate = {
+ x: (cursorSvgPoint.x / scale.x) - gSvgIconDragData.cursorSvgOffset.x,
+ y: (cursorSvgPoint.y / scale.y) - gSvgIconDragData.cursorSvgOffset.y
+ };
- gSvgIconDragData.elementSvgCenterPoint = Hi.svgUtils.getSvgCenterPoint(
- gSvgIconDragData.element,
- gSvgIconDragData.baseSvgElement );
-
- if ( Hi.DEBUG ) {
- console.log( `Drag Update:
- SVG Cursor Point: ( ${cursorSvgPoint.x}, ${cursorSvgPoint.y} ),
- TRANSFORM Result: ${newTransform},
- SVG Center Point: ( ${gSvgIconDragData.elementSvgCenterPoint.x}, ${gSvgIconDragData.elementSvgCenterPoint.y} )`);
- }
+ setSvgTransformAttr( gSvgIconDragData.element, scale, translate, rotate );
}
- function applyDrag( event ) {
+ function endDrag() {
if ( gSvgIconDragData == null ) {
return;
}
- Hi.displayEventInfo( 'End Drag', event );
- Hi.displayElementInfo( 'Drag Element', gSvgIconDragData.element );
- updateDrag( event );
-
- let svgItemId = gSvgIconDragData.element.attr('id');
- let data = {
- svg_x: gSvgIconDragData.elementSvgCenterPoint.x,
- svg_y: gSvgIconDragData.elementSvgCenterPoint.y,
- svg_scale: gSvgIconDragData.originalSvgScale.x,
- svg_rotate: gSvgIconDragData.originalSvgRotate.angle
- };
-
- if ( Hi.DEBUG ) { console.log( 'Applying Drag:', data ); }
- AN.post( `${API_EDIT_LOCATION_ITEM_POSITION_URL}/${svgItemId}`, data );
-
+ Hi.displayElementInfo( 'End Drag Element', gSvgIconDragData.element );
+ saveIconSvgPositionDebouncer( gSvgIconDragData.element );
gSvgIconDragData = null;
}
- function createIconActionEditData( actionState ) {
+ function startIconAction( actionState ) {
if ( gSelectedIconSvgGroup ) {
- let transform = gSelectedIconSvgGroup.attr('transform');
+ let transform = $(gSelectedIconSvgGroup).attr('transform');
let { scale, translate, rotate } = Hi.svgUtils.getSvgTransformValues( transform );
gSvgIconActionEditData = {
@@ -456,56 +479,44 @@
}
}
- function abortIconAction( element ) {
+ function endIconAction( element ) {
if ( gSvgIconActionEditData ) {
gSvgIconActionEditData = null;
}
}
- function iconActionScaleStart() {
- createIconActionEditData( SvgActionStateType.SCALE );
- }
-
- function iconActionScaleApply() {
- if ( Hi.DEBUG ) { console.log( 'Scale Apply' ); }
- saveIconSvgPosition( gSvgIconActionEditData.element );
- }
-
- function iconActionScaleAbort() {
- if ( gSvgIconActionState != SvgActionStateType.SCALE ) {
- return;
- }
- abortIconAction();
+ function startScale() {
+ startIconAction( SvgActionStateType.SCALE );
}
- function iconActionScaleFromMouseWheel( event ) {
+ function updateScaleFromMouseWheel( event ) {
const e = event.originalEvent;
let scaleMultiplier = 1.0 + ( MOUSE_WHEEL_ZOOM_SCALE_FACTOR_PERCENT / 100.0 );
if ( e.deltaY > 0 ) {
scaleMultiplier = 1.0 - ( MOUSE_WHEEL_ZOOM_SCALE_FACTOR_PERCENT / 100.0 );
}
console.log( `Scale multiplier = ${scaleMultiplier} [${gSvgIconActionEditData.isScaling}]` );
- adjustIconScale( gSvgIconActionEditData.element, scaleMultiplier );
+ updateScale( gSvgIconActionEditData.element, scaleMultiplier );
saveIconSvgPositionDebouncer( gSelectedIconSvgGroup );
}
- function iconActionScaleUpFromKeypress() {
+ function scaleUpFromKeypress() {
if ( gSelectedIconSvgGroup ) {
let scaleMultiplier = 1.0 + ( KEYPRESS_ZOOM_SCALE_FACTOR_PERCENT / 100.0 );
- adjustIconScale( gSelectedIconSvgGroup, scaleMultiplier );
+ updateScale( gSelectedIconSvgGroup, scaleMultiplier );
saveIconSvgPositionDebouncer( gSelectedIconSvgGroup );
}
}
- function iconActionScaleDownFromKeypress() {
+ function scaleDownFromKeypress() {
if ( gSelectedIconSvgGroup ) {
let scaleMultiplier = 1.0 - ( KEYPRESS_ZOOM_SCALE_FACTOR_PERCENT / 100.0 );
- adjustIconScale( gSelectedIconSvgGroup, scaleMultiplier );
+ updateScale( gSelectedIconSvgGroup, scaleMultiplier );
saveIconSvgPositionDebouncer( gSelectedIconSvgGroup );
}
}
- function iconActionScaleFromMouseMove( currentMousePosition ) {
+ function updateScaleFromMouseMove( currentMousePosition ) {
if ( Hi.DEBUG ) { console.log( `updateScale [${MODULE_NAME}]` ); }
let center = Hi.getScreenCenterPoint( gSvgIconActionEditData.element );
@@ -527,12 +538,12 @@
if ( Hi.DEBUG ) {
console.log( `Scale: moveDistance=${moveDistance}, multiplier=${scaleMultiplier}` );
}
- adjustIconScale( gSvgIconActionEditData.element, scaleMultiplier );
+ updateScale( gSvgIconActionEditData.element, scaleMultiplier );
return;
}
- function adjustIconScale( svgIconElement, scaleMultiplier ) {
- let transformStr = svgIconElement.attr('transform');
+ function updateScale( svgIconElement, scaleMultiplier ) {
+ let transformStr = $(svgIconElement).attr('transform');
const oldTransform = Hi.svgUtils.getSvgTransformValues( transformStr );
const newScale = {
x: oldTransform.scale.x * scaleMultiplier,
@@ -554,11 +565,23 @@ Original (str): ${transformStr}
setSvgTransformAttr( svgIconElement, newScale, newTranslate, oldTransform.rotate );
}
- function iconActionRotateStart() {
- createIconActionEditData( SvgActionStateType.ROTATE );
+ function endScale() {
+ if ( Hi.DEBUG ) { console.log( 'Scale End' ); }
+ saveIconSvgPosition( gSvgIconActionEditData.element );
+ }
+
+ function scaleAbort() {
+ if ( gSvgIconActionState != SvgActionStateType.SCALE ) {
+ return;
+ }
+ endIconAction();
}
- function iconActionRotateUpdateFromMouseMove( currentMousePosition ) {
+ function startRotate() {
+ startIconAction( SvgActionStateType.ROTATE );
+ }
+
+ function updateRotateFromMouseMove( currentMousePosition ) {
if ( Hi.DEBUG ) { console.log( `updateRotation [${MODULE_NAME}]` ); }
let center = Hi.getScreenCenterPoint( gSvgIconActionEditData.element );
@@ -567,7 +590,7 @@ Original (str): ${transformStr}
gLastMousePosition.x, gLastMousePosition.y,
currentMousePosition.x, currentMousePosition.y );
- let transformStr = gSvgIconActionEditData.element.attr('transform');
+ let transformStr = $(gSvgIconActionEditData.element).attr('transform');
const oldTransform = Hi.svgUtils.getSvgTransformValues( transformStr );
const newRotate = { ...oldTransform.rotate }; // Create a copy of old values
@@ -578,30 +601,30 @@ Original (str): ${transformStr}
oldTransform.scale, oldTransform.translate, newRotate );
}
- function iconActionRotateFromMouseWheel( event ) {
+ function updateRotateFromMouseWheel( event ) {
const e = event.originalEvent;
let deltaAngle = MOUSE_WHEEL_ROTATE_DEGREES;
if ( e.deltaY > 0 ) {
deltaAngle = -1.0 * MOUSE_WHEEL_ROTATE_DEGREES;
}
- adjustIconRotate( gSvgIconActionEditData.element, deltaAngle );
+ updateRotate( gSvgIconActionEditData.element, deltaAngle );
saveIconSvgPositionDebouncer( gSelectedIconSvgGroup );
}
- function iconActionRotateRightFromKeypress() {
+ function rotateRightFromKeypress() {
let deltaAngle = KEYPRESS_ROTATE_DEGREES;
- adjustIconRotate( gSelectedIconSvgGroup, deltaAngle );
+ updateRotate( gSelectedIconSvgGroup, deltaAngle );
saveIconSvgPositionDebouncer( gSelectedIconSvgGroup );
}
- function iconActionRotateLeftFromKeypress() {
+ function rotateLeftFromKeypress() {
let deltaAngle = -1.0 * KEYPRESS_ROTATE_DEGREES;
- adjustIconRotate( gSelectedIconSvgGroup, deltaAngle );
+ updateRotate( gSelectedIconSvgGroup, deltaAngle );
saveIconSvgPositionDebouncer( gSelectedIconSvgGroup );
}
- function adjustIconRotate( svgIconElement, deltaAngle ) {
- let transformStr = svgIconElement.attr('transform');
+ function updateRotate( svgIconElement, deltaAngle ) {
+ let transformStr = $(svgIconElement).attr('transform');
const oldTransform = Hi.svgUtils.getSvgTransformValues( transformStr );
const newRotate = { ...oldTransform.rotate }; // Create a copy of old values
@@ -620,35 +643,20 @@ Original (str): ${transformStr}
oldTransform.scale, oldTransform.translate, newRotate );
}
- function iconActionRotateApply() {
+ function endRotate() {
saveIconSvgPosition( gSvgIconActionEditData.element );
}
- function iconActionRotateAbort() {
+ function rotateAbort() {
if ( gSvgIconActionState != SvgActionStateType.ROTATE ) {
return;
}
- abortIconAction();
- }
-
- function _scaleAndRotateFromPointerEvents( pointerEventData ) {
- if ( gSvgIconActionEditData ) {
-
-
-
-
-
-
-
-
- }
- return false;
+ endIconAction();
}
-
function setSvgTransformAttr( element, scale, translate, rotate ) {
let newTransform = `scale(${scale.x} ${scale.y}) translate(${translate.x}, ${translate.y}) rotate(${rotate.angle}, ${rotate.cx}, ${rotate.cy})`;
- element.attr('transform', newTransform);
+ $(element).attr('transform', newTransform);
}
function saveIconSvgPositionDebouncer( element ) {
@@ -664,13 +672,13 @@ Original (str): ${transformStr}
function saveIconSvgPosition( element ) {
- let transform = element.attr('transform');
+ let transform = $(element).attr('transform');
let { scale, translate, rotate } = Hi.svgUtils.getSvgTransformValues( transform );
const baseSvgElement = $(Hi.BASE_SVG_SELECTOR);
const center = Hi.svgUtils.getSvgCenterPoint( element, baseSvgElement );
- let svgItemId = element.attr('id');
+ let svgItemId = $(element).attr('id');
let data = {
svg_x: center.x,
svg_y: center.y,
diff --git a/src/hi/static/js/svg-location.js b/src/hi/static/js/svg-location.js
index e4ed2645..0c9bb77b 100644
--- a/src/hi/static/js/svg-location.js
+++ b/src/hi/static/js/svg-location.js
@@ -12,17 +12,23 @@
Hi.edit.eventBus.subscribe( Hi.edit.SELECTION_MADE_EVENT_NAME,
this.clearSelection.bind(this) );
},
- handlePointerDown: function( pointerEventData ) {
- return _handlePointerDown( pointerEventData );
+ handleSinglePointerEventStart: function( singlePointerEvent ) {
+ return _handleSinglePointerEventStart( singlePointerEvent );
},
- handlePointerMove: function( pointerEventData ) {
- return _handlePointerMove( pointerEventData );
+ handleSinglePointerEventMove: function( singlePointerEvent ) {
+ return _handleSinglePointerEventMove( singlePointerEvent );
},
- handlePointerUp: function( pointerEventData ) {
- return _handlePointerUp( pointerEventData );
+ handleSinglePointerEventEnd: function( singlePointerEvent ) {
+ return _handleSinglePointerEventEnd( singlePointerEvent );
},
- scaleAndRotateFromPointerEvents: function( pointerEventData ) {
- return _scaleAndRotateFromPointerEvents( pointerEventData );
+ handleDoublePointerEventStart: function( doublePointerEvent ) {
+ return _handleDoublePointerEventStart( doublePointerEvent );
+ },
+ handleDoublePointerEventMove: function( doublePointerEvent ) {
+ return _handleDoublePointerEventMove( doublePointerEvent );
+ },
+ handleDoublePointerEventEnd: function( doublePointerEvent ) {
+ return _handleDoublePointerEventEnd( doublePointerEvent );
},
handleMouseWheel: function( event ) {
return _handleMouseWheel( event );
@@ -82,8 +88,8 @@
let zoomApiCallDebounceTimer = null;
let lastZoomApiCallTime = 0;
- function _handlePointerDown( pointerEventData ) {
- const event = pointerEventData.start.event;
+ function _handleSinglePointerEventStart( singlePointerEvent ) {
+ const event = singlePointerEvent.start.event;
if ( gSelectedLocationViewSvg ) {
if ( Hi.DEBUG ) { console.log( `Pointer down event [${MODULE_NAME}]`, event ); }
@@ -102,8 +108,8 @@
return false;
}
- function _handlePointerMove( pointerEventData ) {
- const event = pointerEventData.last.event;
+ function _handleSinglePointerEventMove( singlePointerEvent ) {
+ const event = singlePointerEvent.last.event;
const currentMousePosition = {
x: event.clientX,
@@ -126,8 +132,6 @@
updateDrag(event);
}
gSvgTransformData.lastMousePosition = currentMousePosition;
- event.preventDefault();
- event.stopImmediatePropagation();
return true;
}
}
@@ -135,22 +139,22 @@
return false;
}
- function _handlePointerUp( pointerEventData ) {
+ function _handleSinglePointerEventEnd( singlePointerEvent ) {
- const event = pointerEventData.last.event;
+ const event = singlePointerEvent.last.event;
let eventWasHandled = false;
if ( gSvgTransformData ) {
if ( gSvgTransformType == SvgTransformType.SCALE ) {
- applyScale( event );
+ endScale();
eventWasHandled = true;
} else if( gSvgTransformType == SvgTransformType.ROTATE ) {
- applyRotation( event );
+ endRotation();
eventWasHandled = true;
} else if (( gSvgTransformType == SvgTransformType.MOVE ) && gSvgTransformData.isDragging ) {
- applyDrag( event );
+ endDrag( event );
eventWasHandled = true;
}
}
@@ -166,6 +170,39 @@
}
return eventWasHandled;
}
+
+ function _handleDoublePointerEventStart( doublePointerEvent ) {
+ const event = doublePointerEvent.start.event;
+ const closest = $(event.target).closest( Hi.LOCATION_VIEW_SVG_SELECTOR );
+ if ( closest.length > 0 ) {
+ gSelectedLocationViewSvg = closest[0];
+ createTransformData( event, gSelectedLocationViewSvg );
+ return true;
+ }
+ return false;
+ }
+
+ function _handleDoublePointerEventMove( doublePointerEvent ) {
+ if ( ! gSvgTransformData ) {
+ return false;
+ }
+ let scaleFactor = ( 1.0 - ( doublePointerEvent.deltaDistancePrevious
+ / POINTER_EVENTS_SCALE_FACTOR ));
+ let deltaAngle = doublePointerEvent.deltaAngleStart * POINTER_EVENTS_ROTATE_FACTOR;
+ zoom( scaleFactor );
+ rotate( deltaAngle );
+ return true;
+ }
+
+ function _handleDoublePointerEventEnd( doublePointerEvent ) {
+ if ( ! gSvgTransformData ) {
+ return false;
+ }
+ saveSvgGeometryDebouncer();
+ abortScale();
+ abortRotation();
+ return true;
+ }
function _handleMouseWheel( event ) {
if ( gSelectedLocationViewSvg && isEventInLocationArea( event )) {
@@ -189,15 +226,18 @@
}
if ( $(event.target).closest( Hi.LOCATION_VIEW_BASE_SELECTOR ).length > 0 ) {
- gSelectedLocationViewSvg = $(event.target).closest( Hi.LOCATION_VIEW_SVG_SELECTOR );
- clearTransformData();
- let data = {
- moduleName: MODULE_NAME,
- };
- Hi.edit.eventBus.emit( Hi.edit.SELECTION_MADE_EVENT_NAME, data );
- event.preventDefault();
- event.stopImmediatePropagation();
- return true;
+ const closest = $(event.target).closest( Hi.LOCATION_VIEW_SVG_SELECTOR );
+ if ( closest.length > 0 ) {
+ gSelectedLocationViewSvg = closest[0];
+ clearTransformData();
+ let data = {
+ moduleName: MODULE_NAME,
+ };
+ Hi.edit.eventBus.emit( Hi.edit.SELECTION_MADE_EVENT_NAME, data );
+ event.preventDefault();
+ event.stopImmediatePropagation();
+ return true;
+ }
}
if ( Hi.DEBUG ) { console.log( `Click skipped [${MODULE_NAME}]` ); }
return false;
@@ -339,8 +379,8 @@
return;
}
- function applyDrag( event ) {
- if ( Hi.DEBUG ) { console.log( `applyDrag [${MODULE_NAME}]` ); }
+ function endDrag( event ) {
+ if ( Hi.DEBUG ) { console.log( `endDrag [${MODULE_NAME}]` ); }
if ( gSvgTransformData && gSvgTransformData.isDragging ) {
saveSvgGeometryIfNeeded();
}
@@ -412,14 +452,14 @@
scaleSvgViewBox( gSvgTransformData.initialSvgViewBox, scaleFactor );
}
- function applyScale( event ) {
- if ( Hi.DEBUG ) { console.log( `applyScale [${MODULE_NAME}]` ); }
+ function endScale() {
+ if ( Hi.DEBUG ) { console.log( `endScale [${MODULE_NAME}]` ); }
gSvgTransformType = SvgTransformType.MOVE;
$(gSelectedLocationViewSvg).attr( Hi.SVG_ACTION_STATE_ATTR_NAME, '' );
saveSvgGeometryIfNeeded();
}
- function abortScale( event ) {
+ function abortScale() {
if ( Hi.DEBUG ) { console.log( `abortScale [${MODULE_NAME}]` ); }
clearTransformData();
$(gSelectedLocationViewSvg).attr( Hi.SVG_ACTION_STATE_ATTR_NAME, '' );
@@ -458,41 +498,19 @@
let newTransform = `rotate(${rotate.angle}, ${rotate.cx}, ${rotate.cy})`;
$(gSelectedLocationViewSvg).attr( 'transform', newTransform );
}
-
- function applyRotation( event ) {
- if ( Hi.DEBUG ) { console.log( `applyRotation [${MODULE_NAME}]` ); }
+
+ function endRotation( ) {
+ if ( Hi.DEBUG ) { console.log( `endRotation [${MODULE_NAME}]` ); }
gSvgTransformType = SvgTransformType.MOVE;
$(gSelectedLocationViewSvg).attr( Hi.SVG_ACTION_STATE_ATTR_NAME, '' );
saveSvgGeometryIfNeeded();
}
- function abortRotation( event ) {
+ function abortRotation( ) {
if ( Hi.DEBUG ) { console.log( `abortRotation [${MODULE_NAME}]` ); }
clearTransformData();
$(gSelectedLocationViewSvg).attr( Hi.SVG_ACTION_STATE_ATTR_NAME, '' );
}
-
- function _scaleAndRotateFromPointerEvents( pointerEventData ) {
- const event = pointerEventData.last.event;
- if ( event.type == 'pointerdown' ) {
- gSelectedLocationViewSvg = $(event.target).closest( Hi.LOCATION_VIEW_SVG_SELECTOR );
- createTransformData( event, gSelectedLocationViewSvg );
- } else if ( ! gSvgTransformData ) {
- return false;
- } else if ( event.type == 'pointermove' ) {
- let scaleFactor = ( 1.0 - ( pointerEventData.deltaDistancePrevious
- / POINTER_EVENTS_SCALE_FACTOR ));
- let deltaAngle = pointerEventData.deltaAngleStart * POINTER_EVENTS_ROTATE_FACTOR;
- zoom( scaleFactor );
- rotate( deltaAngle );
- saveSvgGeometryDebouncer();
-
- } else {
- abortScale();
- abortRotation();
- }
- return true;
- }
function adjustSvgViewBox( initialSvgViewBox, newWidth, newHeight, newX = null, newY = null ) {