Skip to content

Commit 5bf28cc

Browse files
RyanR712RyanR712
authored
Merge pull request #346 from RAIRLab/345-mosue-takes-Poughkeepsie
Left mouse interactions only!
2 parents e8c5618 + 9239e67 commit 5bf28cc

File tree

2 files changed

+145
-141
lines changed

2 files changed

+145
-141
lines changed

Diff for: ‎src/DrawTools/CutTool.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ export function cutMouseMove(event: MouseEvent): void {
8181
* @param event Incoming MouseEvent.
8282
*/
8383
export function cutMouseUp(event: MouseEvent): void {
84-
changeCursorStyle("cursor: default");
84+
changeCursorStyle("cursor: crosshair");
8585
const currentPoint: Point = new Point(event.clientX - offset.x, event.clientY - offset.y);
8686
const newCut: CutNode = new CutNode(createEllipse(startingPoint, currentPoint));
8787
if (

Diff for: ‎src/index.ts

+144-140
Original file line numberDiff line numberDiff line change
@@ -353,77 +353,79 @@ function mouseEnterHandler(): void {
353353
* @param event Incoming MouseEvent.
354354
*/
355355
function mouseDownHandler(event: MouseEvent): void {
356-
switch (TreeContext.toolState) {
357-
case Tool.cutTool:
358-
CutTool.cutMouseDown(event);
359-
break;
360-
case Tool.atomTool:
361-
AtomTool.atomMouseDown(event);
362-
break;
363-
case Tool.dragTool:
364-
DragTool.dragMouseDown(event);
365-
break;
366-
case Tool.moveSingleTool:
367-
MoveSingleTool.moveSingleMouseDown(event);
368-
break;
369-
case Tool.moveMultiTool:
370-
MoveMultiTool.moveMultiMouseDown(event);
371-
break;
372-
case Tool.copySingleTool:
373-
CopySingleTool.copySingleMouseDown(event);
374-
break;
375-
case Tool.copyMultiTool:
376-
CopyMultiTool.copyMultiMouseDown(event);
377-
break;
378-
case Tool.deleteSingleTool:
379-
DeleteSingleTool.deleteSingleMouseDown(event);
380-
break;
381-
case Tool.deleteMultiTool:
382-
DeleteMultiTool.deleteMultiMouseDown(event);
383-
break;
384-
case Tool.resizeTool:
385-
DrawResizeTool.drawResizeMouseDown(event);
386-
break;
387-
case Tool.copyFromDrawTool:
388-
CopyFromDraw.copyFromDrawMouseDown(event);
389-
break;
390-
case Tool.pasteInProofTool:
391-
PasteInProof.pasteInProofMouseDown();
392-
break;
393-
case Tool.doubleCutInsertionTool:
394-
DoubleCutInsertionTool.doubleCutInsertionMouseDown(event);
395-
break;
396-
case Tool.doubleCutDeletionTool:
397-
DoubleCutDeletionTool.doubleCutDeletionMouseDown(event);
398-
break;
399-
case Tool.insertionTool:
400-
InsertionTool.insertionMouseDown(event);
401-
break;
402-
case Tool.erasureTool:
403-
ErasureTool.erasureMouseDown(event);
404-
break;
405-
case Tool.proofMoveSingleTool:
406-
ProofMoveSingleTool.proofMoveSingleMouseDown(event);
407-
break;
408-
case Tool.proofMoveMultiTool:
409-
ProofMoveMultiTool.proofMoveMultiMouseDown(event);
410-
break;
411-
case Tool.proofResizeTool:
412-
ProofResizeTool.proofResizeMouseDown(event);
413-
break;
414-
case Tool.iterationTool:
415-
IterationTool.iterationMouseDown(event);
416-
break;
417-
case Tool.deiterationTool:
418-
DeiterationTool.deiterationMouseDown(event);
419-
break;
420-
case Tool.clearProofTool:
421-
ClearProofTool.clearProofMouseDown();
422-
break;
423-
default:
424-
break;
356+
if (event.button === 0) {
357+
switch (TreeContext.toolState) {
358+
case Tool.cutTool:
359+
CutTool.cutMouseDown(event);
360+
break;
361+
case Tool.atomTool:
362+
AtomTool.atomMouseDown(event);
363+
break;
364+
case Tool.dragTool:
365+
DragTool.dragMouseDown(event);
366+
break;
367+
case Tool.moveSingleTool:
368+
MoveSingleTool.moveSingleMouseDown(event);
369+
break;
370+
case Tool.moveMultiTool:
371+
MoveMultiTool.moveMultiMouseDown(event);
372+
break;
373+
case Tool.copySingleTool:
374+
CopySingleTool.copySingleMouseDown(event);
375+
break;
376+
case Tool.copyMultiTool:
377+
CopyMultiTool.copyMultiMouseDown(event);
378+
break;
379+
case Tool.deleteSingleTool:
380+
DeleteSingleTool.deleteSingleMouseDown(event);
381+
break;
382+
case Tool.deleteMultiTool:
383+
DeleteMultiTool.deleteMultiMouseDown(event);
384+
break;
385+
case Tool.resizeTool:
386+
DrawResizeTool.drawResizeMouseDown(event);
387+
break;
388+
case Tool.copyFromDrawTool:
389+
CopyFromDraw.copyFromDrawMouseDown(event);
390+
break;
391+
case Tool.pasteInProofTool:
392+
PasteInProof.pasteInProofMouseDown();
393+
break;
394+
case Tool.doubleCutInsertionTool:
395+
DoubleCutInsertionTool.doubleCutInsertionMouseDown(event);
396+
break;
397+
case Tool.doubleCutDeletionTool:
398+
DoubleCutDeletionTool.doubleCutDeletionMouseDown(event);
399+
break;
400+
case Tool.insertionTool:
401+
InsertionTool.insertionMouseDown(event);
402+
break;
403+
case Tool.erasureTool:
404+
ErasureTool.erasureMouseDown(event);
405+
break;
406+
case Tool.proofMoveSingleTool:
407+
ProofMoveSingleTool.proofMoveSingleMouseDown(event);
408+
break;
409+
case Tool.proofMoveMultiTool:
410+
ProofMoveMultiTool.proofMoveMultiMouseDown(event);
411+
break;
412+
case Tool.proofResizeTool:
413+
ProofResizeTool.proofResizeMouseDown(event);
414+
break;
415+
case Tool.iterationTool:
416+
IterationTool.iterationMouseDown(event);
417+
break;
418+
case Tool.deiterationTool:
419+
DeiterationTool.deiterationMouseDown(event);
420+
break;
421+
case Tool.clearProofTool:
422+
ClearProofTool.clearProofMouseDown();
423+
break;
424+
default:
425+
break;
426+
}
427+
hasMouseDown = true;
425428
}
426-
hasMouseDown = true;
427429
}
428430

429431
/**
@@ -511,77 +513,79 @@ function mouseMoveHandler(event: MouseEvent): void {
511513
* @param event Incoming MouseEvent.
512514
*/
513515
function mouseUpHandler(event: MouseEvent): void {
514-
switch (TreeContext.toolState) {
515-
case Tool.cutTool:
516-
CutTool.cutMouseUp(event);
517-
break;
518-
case Tool.atomTool:
519-
AtomTool.atomMouseUp(event);
520-
break;
521-
case Tool.dragTool:
522-
DragTool.dragMouseUp();
523-
break;
524-
case Tool.moveSingleTool:
525-
MoveSingleTool.moveSingleMouseUp(event);
526-
break;
527-
case Tool.moveMultiTool:
528-
MoveMultiTool.moveMultiMouseUp(event);
529-
break;
530-
case Tool.copySingleTool:
531-
CopySingleTool.copySingleMouseUp(event);
532-
break;
533-
case Tool.copyMultiTool:
534-
CopyMultiTool.copyMultiMouseUp(event);
535-
break;
536-
case Tool.deleteSingleTool:
537-
DeleteSingleTool.deleteSingleMouseUp(event);
538-
break;
539-
case Tool.deleteMultiTool:
540-
DeleteMultiTool.deleteMultiMouseUp(event);
541-
break;
542-
case Tool.resizeTool:
543-
DrawResizeTool.drawResizeMouseUp(event);
544-
break;
545-
case Tool.copyFromDrawTool:
546-
CopyFromDraw.copyFromDrawMouseUp();
547-
break;
548-
case Tool.pasteInProofTool:
549-
PasteInProof.pasteInProofMouseUp();
550-
break;
551-
case Tool.doubleCutInsertionTool:
552-
DoubleCutInsertionTool.doubleCutInsertionMouseUp(event);
553-
break;
554-
case Tool.doubleCutDeletionTool:
555-
DoubleCutDeletionTool.doubleCutDeletionMouseUp(event);
556-
break;
557-
case Tool.insertionTool:
558-
InsertionTool.insertionMouseUp(event);
559-
break;
560-
case Tool.erasureTool:
561-
ErasureTool.erasureMouseUp(event);
562-
break;
563-
case Tool.proofMoveSingleTool:
564-
ProofMoveSingleTool.proofMoveSingleMouseUp(event);
565-
break;
566-
case Tool.proofMoveMultiTool:
567-
ProofMoveMultiTool.proofMoveMultiMouseUp(event);
568-
break;
569-
case Tool.proofResizeTool:
570-
ProofResizeTool.proofResizeMouseUp(event);
571-
break;
572-
case Tool.iterationTool:
573-
IterationTool.iterationMouseUp(event);
574-
break;
575-
case Tool.deiterationTool:
576-
DeiterationTool.deiterationMouseUp(event);
577-
break;
578-
case Tool.clearProofTool:
579-
ClearProofTool.clearProofMouseUp();
580-
break;
581-
default:
582-
break;
516+
if (event.button === 0) {
517+
switch (TreeContext.toolState) {
518+
case Tool.cutTool:
519+
CutTool.cutMouseUp(event);
520+
break;
521+
case Tool.atomTool:
522+
AtomTool.atomMouseUp(event);
523+
break;
524+
case Tool.dragTool:
525+
DragTool.dragMouseUp();
526+
break;
527+
case Tool.moveSingleTool:
528+
MoveSingleTool.moveSingleMouseUp(event);
529+
break;
530+
case Tool.moveMultiTool:
531+
MoveMultiTool.moveMultiMouseUp(event);
532+
break;
533+
case Tool.copySingleTool:
534+
CopySingleTool.copySingleMouseUp(event);
535+
break;
536+
case Tool.copyMultiTool:
537+
CopyMultiTool.copyMultiMouseUp(event);
538+
break;
539+
case Tool.deleteSingleTool:
540+
DeleteSingleTool.deleteSingleMouseUp(event);
541+
break;
542+
case Tool.deleteMultiTool:
543+
DeleteMultiTool.deleteMultiMouseUp(event);
544+
break;
545+
case Tool.resizeTool:
546+
DrawResizeTool.drawResizeMouseUp(event);
547+
break;
548+
case Tool.copyFromDrawTool:
549+
CopyFromDraw.copyFromDrawMouseUp();
550+
break;
551+
case Tool.pasteInProofTool:
552+
PasteInProof.pasteInProofMouseUp();
553+
break;
554+
case Tool.doubleCutInsertionTool:
555+
DoubleCutInsertionTool.doubleCutInsertionMouseUp(event);
556+
break;
557+
case Tool.doubleCutDeletionTool:
558+
DoubleCutDeletionTool.doubleCutDeletionMouseUp(event);
559+
break;
560+
case Tool.insertionTool:
561+
InsertionTool.insertionMouseUp(event);
562+
break;
563+
case Tool.erasureTool:
564+
ErasureTool.erasureMouseUp(event);
565+
break;
566+
case Tool.proofMoveSingleTool:
567+
ProofMoveSingleTool.proofMoveSingleMouseUp(event);
568+
break;
569+
case Tool.proofMoveMultiTool:
570+
ProofMoveMultiTool.proofMoveMultiMouseUp(event);
571+
break;
572+
case Tool.proofResizeTool:
573+
ProofResizeTool.proofResizeMouseUp(event);
574+
break;
575+
case Tool.iterationTool:
576+
IterationTool.iterationMouseUp(event);
577+
break;
578+
case Tool.deiterationTool:
579+
DeiterationTool.deiterationMouseUp(event);
580+
break;
581+
case Tool.clearProofTool:
582+
ClearProofTool.clearProofMouseUp();
583+
break;
584+
default:
585+
break;
586+
}
587+
hasMouseDown = false;
583588
}
584-
hasMouseDown = false;
585589
}
586590

587591
/**

0 commit comments

Comments
 (0)