Merge branch '106-extend-circle-tool' into sprint-2022-cw-20-22

hpi-swa-teaching · May 30, 2022 · 38fef3d · 38fef3d
2 parents 515dc5f + 2c6aef8
commit 38fef3d
Show file tree

Hide file tree

Showing 51 changed files with 187 additions and 84 deletions.
diff --git a/packages/SketchMorph2-Core.package/M2Canvas.class/instance/isShiftPressed..st b/packages/SketchMorph2-Core.package/M2Canvas.class/instance/isShiftPressed..st
@@ -0,0 +1,3 @@
+accessing
+isShiftPressed: aBoolean
+	isShiftPressed := aBoolean
diff --git a/packages/SketchMorph2-Core.package/M2Canvas.class/instance/isShiftPressed.st b/packages/SketchMorph2-Core.package/M2Canvas.class/instance/isShiftPressed.st
@@ -0,0 +1,3 @@
+accessing
+isShiftPressed
+	^ isShiftPressed ifNil: [isShiftPressed := false]
diff --git a/packages/SketchMorph2-Core.package/M2Canvas.class/instance/keyDown..st b/packages/SketchMorph2-Core.package/M2Canvas.class/instance/keyDown..st
@@ -1,3 +1,4 @@
 event handling
 keyDown: aKeyboardEvent
- 	(self isControlKeyEvent: aKeyboardEvent) ifTrue: [self isCtrlPressed: true]
+ 	(self isControlKeyEvent: aKeyboardEvent) ifTrue: [self isCtrlPressed: true].
+ 	(aKeyboardEvent shiftPressed) ifTrue: [self isShiftPressed: true]
diff --git a/packages/SketchMorph2-Core.package/M2Canvas.class/instance/keyUp..st b/packages/SketchMorph2-Core.package/M2Canvas.class/instance/keyUp..st
@@ -1,3 +1,4 @@
 event handling
 keyUp: aKeyboardEvent
-	(self isControlKeyEvent: aKeyboardEvent) ifTrue: [self isCtrlPressed: false]
+	(self isControlKeyEvent: aKeyboardEvent) ifTrue: [self isCtrlPressed: false].
+	self isShiftPressed: (aKeyboardEvent shiftPressed)
diff --git a/packages/SketchMorph2-Core.package/M2Canvas.class/methodProperties.json b/packages/SketchMorph2-Core.package/M2Canvas.class/methodProperties.json
@@ -19,8 +19,10 @@
 		"isCtrlPressed" : "6/28/2021 21:03:28",
 		"isCtrlPressed:" : "6/28/2021 21:03:28",
 		"isMouseDown:" : "NC 5/16/2020 13:16",
-		"keyDown:" : "6/28/2021 21:03:28",
-		"keyUp:" : "6/28/2021 21:03:28",
+		"isShiftPressed" : "ms 5/23/2022 22:34",
+		"isShiftPressed:" : "ms 5/23/2022 22:34",
+		"keyDown:" : "ms 5/27/2022 16:02",
+		"keyUp:" : "ms 5/27/2022 16:02",
 		"mouseDown:" : "mk 7/3/2020 18:38",
 		"mouseEnterDragging:" : "CS 8/5/2021 17:25",
 		"mouseLeave:" : "JP 6/26/2021 18:18",

diff --git a/packages/SketchMorph2-Core.package/M2Canvas.class/properties.json b/packages/SketchMorph2-Core.package/M2Canvas.class/properties.json
@@ -8,6 +8,7 @@
 	"instvars" : [
 		"gripMorph",
 		"isCtrlPressed",
+		"isShiftPressed",
 		"viewPort" ],
 	"name" : "M2Canvas",
 	"pools" : [

diff --git a/packages/SketchMorph2-Core.package/M2DrawingComponent.class/instance/drawGeometricCircle.st b/packages/SketchMorph2-Core.package/M2DrawingComponent.class/instance/drawGeometricCircle.st
diff --git a/packages/SketchMorph2-Core.package/M2DrawingComponent.class/instance/drawGeometricEllipse.st b/packages/SketchMorph2-Core.package/M2DrawingComponent.class/instance/drawGeometricEllipse.st
@@ -0,0 +1,8 @@
+tool selection
+drawGeometricEllipse
+	self context
+		isErasing: false;
+		mode: #geometric;
+		currentGeometricPreviewShape: #ellipse;
+		currentTool: #drawGeometricEllipse.
+	self switchMode
diff --git a/packages/SketchMorph2-Core.package/M2DrawingComponent.class/methodProperties.json b/packages/SketchMorph2-Core.package/M2DrawingComponent.class/methodProperties.json
@@ -20,7 +20,7 @@
 		"defaultStartPoint" : "CS 8/5/2021 18:18",
 		"drawCircle" : "md 5/26/2022 21:33",
 		"drawEraser" : "md 5/26/2022 21:33",
-		"drawGeometricCircle" : "ms 7/8/2021 16:31",
+		"drawGeometricEllipse" : "ms 5/25/2022 00:36",
 		"drawGeometricRectangle" : "ms 7/8/2021 16:31",
 		"drawGeometricTriangle" : "SW 5/16/2022 20:05",
 		"drawPencil" : "md 5/26/2022 21:29",

diff --git a/packages/SketchMorph2-Core.package/M2GeometricCircle.class/README.md b/packages/SketchMorph2-Core.package/M2GeometricCircle.class/README.md
diff --git a/packages/SketchMorph2-Core.package/M2GeometricCircle.class/class/label.st b/packages/SketchMorph2-Core.package/M2GeometricCircle.class/class/label.st
diff --git a/packages/SketchMorph2-Core.package/M2GeometricCircle.class/methodProperties.json b/packages/SketchMorph2-Core.package/M2GeometricCircle.class/methodProperties.json
diff --git a/packages/SketchMorph2-Core.package/M2GeometricEllipse.class/README.md b/packages/SketchMorph2-Core.package/M2GeometricEllipse.class/README.md
diff --git a/...etricCircle.class/class/actionSelector.st → ...tricEllipse.class/class/actionSelector.st b/...etricCircle.class/class/actionSelector.st → ...tricEllipse.class/class/actionSelector.st
@@ -1,3 +1,3 @@
 accessing
 actionSelector
-	^ #drawGeometricCircle
+	^ #drawGeometricEllipse
diff --git a/...age/M2GeometricCircle.class/class/icon.st → ...ge/M2GeometricEllipse.class/class/icon.st b/...age/M2GeometricCircle.class/class/icon.st → ...ge/M2GeometricEllipse.class/class/icon.st
diff --git a/...metricCircle.class/class/isActivatable.st → ...etricEllipse.class/class/isActivatable.st b/...metricCircle.class/class/isActivatable.st → ...etricEllipse.class/class/isActivatable.st
diff --git a/packages/SketchMorph2-Core.package/M2GeometricEllipse.class/class/label.st b/packages/SketchMorph2-Core.package/M2GeometricEllipse.class/class/label.st
@@ -0,0 +1,3 @@
+accessing
+label
+	^ 'Ellipse Tool'
diff --git a/packages/SketchMorph2-Core.package/M2GeometricEllipse.class/methodProperties.json b/packages/SketchMorph2-Core.package/M2GeometricEllipse.class/methodProperties.json
@@ -0,0 +1,8 @@
+{
+	"class" : {
+		"actionSelector" : "ms 5/25/2022 00:33",
+		"icon" : "ms 5/25/2022 00:34",
+		"isActivatable" : "ms 5/25/2022 00:33",
+		"label" : "ms 5/25/2022 00:33" },
+	"instance" : {
+		 } }
diff --git a/...e/M2GeometricCircle.class/properties.json → .../M2GeometricEllipse.class/properties.json b/...e/M2GeometricCircle.class/properties.json → .../M2GeometricEllipse.class/properties.json
@@ -4,10 +4,10 @@
 		 ],
 	"classvars" : [
 		 ],
-	"commentStamp" : "wr 8/4/2020 13:06",
+	"commentStamp" : "",
 	"instvars" : [
 		 ],
-	"name" : "M2GeometricCircle",
+	"name" : "M2GeometricEllipse",
 	"pools" : [
 		 ],
 	"super" : "M2IconMenuItem",

diff --git a/...ort.class/instance/drawGeometricCircle.st → ...rt.class/instance/drawGeometricEllipse.st b/...ort.class/instance/drawGeometricCircle.st → ...rt.class/instance/drawGeometricEllipse.st
@@ -1,4 +1,4 @@
 tool selection
-drawGeometricCircle
-	super drawGeometricCircle.
+drawGeometricEllipse
+	super drawGeometricEllipse.
 	self currentCursor: Cursor crossHair
diff --git a/packages/SketchMorph2-Core.package/M2ViewPort.class/instance/geometricMorph.st b/packages/SketchMorph2-Core.package/M2ViewPort.class/instance/geometricMorph.st
@@ -2,7 +2,7 @@ drawing
 geometricMorph
 	| constructors constructor |
 	constructors := {
-		#circle -> [CircleMorph new].
+		#ellipse -> [EllipseMorph new].
 		#rectangle -> [RectangleMorph new].
 		#triangle -> [M2TriangleMorph new].
 		#selectionRectangle -> [RectangleMorph new].

diff --git a/...s/SketchMorph2-Core.package/M2ViewPort.class/instance/resizeTemporaryGeometricMorphAt..st b/...s/SketchMorph2-Core.package/M2ViewPort.class/instance/resizeTemporaryGeometricMorphAt..st
@@ -1,16 +1,18 @@
 drawing
 resizeTemporaryGeometricMorphAt: aPoint
-	| extent movementVector minimalSquare position |
+	| extent movementVector rect offset |
 	(aPoint > 0 asPoint) ifFalse: [^ self].
 
 	movementVector := aPoint - self startPoint.
+
+
 	extent := movementVector abs.
-	minimalSquare := (extent x min: extent y) asPoint * (movementVector sign).
 
-	position := (self context currentGeometricPreviewShape = #circle)
-		ifTrue: [self getCircleOrigin: minimalSquare]
-		ifFalse: [aPoint min: self startPoint].
+	self canvas isShiftPressed ifTrue: [extent := self shiftResizeExtent: extent].
+
+	rect := Rectangle origin: (aPoint min: self startPoint) extent: extent.
+	offset := self startPoint - (rect pointNearestTo: self startPoint).
 
 	self temporaryGeometricMorph
-		position: self canvas position + position;
-		extent: (extent max: 1 asPoint)
+		position: self canvas position + rect origin + offset;
+		extent: (extent)
diff --git a/packages/SketchMorph2-Core.package/M2ViewPort.class/instance/shiftResizeExtent..st b/packages/SketchMorph2-Core.package/M2ViewPort.class/instance/shiftResizeExtent..st
@@ -0,0 +1,10 @@
+drawing
+shiftResizeExtent: extent
+	| switch minExtent maxSide |
+	minExtent := extent min: (extent transposed).
+	maxSide := (extent max: (extent transposed) )x.
+	switch := Dictionary new.                                  
+	switch at: #ellipse put: [minExtent].
+	switch at: #rectangle put: [minExtent].
+	switch at: #triangle put: [maxSide@((3 sqrt)/2*maxSide)].
+	^ (switch at: self context currentGeometricPreviewShape ifAbsent: [extent]) value
diff --git a/packages/SketchMorph2-Core.package/M2ViewPort.class/methodProperties.json b/packages/SketchMorph2-Core.package/M2ViewPort.class/methodProperties.json
@@ -25,7 +25,7 @@
 		"defaultScalar" : "mFr 6/25/2021 15:18",
 		"drawCircle" : "CS 6/28/2021 21:21",
 		"drawEraser" : "CS 6/28/2021 21:23",
-		"drawGeometricCircle" : "CS 6/28/2021 21:27",
+		"drawGeometricEllipse" : "ms 5/25/2022 00:39",
 		"drawGeometricRectangle" : "CS 6/28/2021 21:28",
 		"drawGeometricTriangle" : "SW 5/16/2022 20:06",
 		"drawPencil" : "CS 6/28/2021 21:23",
@@ -37,7 +37,7 @@
 		"finishGeometricForm" : "md 5/19/2022 14:15",
 		"finishSelection" : "md 5/27/2022 22:52",
 		"formExtent" : "JP 6/26/2021 17:26",
-		"geometricMorph" : "kbr 5/29/2022 08:01",
+		"geometricMorph" : "kbr 5/30/2022 20:20",
 		"geometricMorphColor" : "md 5/27/2022 20:09",
 		"getBackendPointFor:" : "CS 8/5/2021 20:22",
 		"getBackendPointFor:ifAbsent:" : "CS 8/5/2021 20:26",
@@ -59,7 +59,7 @@
 		"projectText:styled:colored:at:" : "CS 8/6/2021 15:50",
 		"rectangleCursor" : "CS 8/4/2021 19:33",
 		"refresh" : "mFr 6/24/2021 16:30",
-		"resizeTemporaryGeometricMorphAt:" : "ms 7/8/2021 16:31",
+		"resizeTemporaryGeometricMorphAt:" : "ms 5/27/2022 17:49",
 		"scalar" : "mFr 6/25/2021 15:19",
 		"scalar:" : "mFr 6/9/2021 16:46",
 		"scaleFormTo:" : "ms 6/28/2021 18:20",
@@ -68,6 +68,7 @@
 		"setTemporaryGeometricMorphBorder" : "md 5/27/2022 20:25",
 		"setTemporaryGeometricMorphDashedBorder" : "md 5/27/2022 20:40",
 		"setToolPreviewCursorFor:" : "CS 8/4/2021 18:49",
+		"shiftResizeExtent:" : "ms 5/25/2022 00:41",
 		"startDrawingAt:" : "md 5/19/2022 14:35",
 		"startEditingTextAt:" : "CS 8/5/2021 20:10",
 		"startLassoSelection" : "md 5/27/2022 20:49",

diff --git a/packages/SketchMorph2-Core.package/MorphicMonet.class/instance/handleShiftKeystroke..st b/packages/SketchMorph2-Core.package/MorphicMonet.class/instance/handleShiftKeystroke..st
@@ -7,7 +7,7 @@ handleShiftKeystroke: aKeyboardEvent
 				} otherwise: [^ aKeyboardEvent "no hit"]]
 			ifFalse: [
 				aKeyboardEvent keyCharacter caseOf: {
-					[$C] -> [self clickMenuItemWith: M2GeometricCircle label].
+					[$E] -> [self clickMenuItemWith: M2GeometricEllipse label].
 					[$R] -> [self clickMenuItemWith: M2GeometricRectangle label].
 					[$F] -> [self backend toggleFillGeometricForm]
 				} otherwise: [^ aKeyboardEvent "no hit"]].

diff --git a/packages/SketchMorph2-Core.package/MorphicMonet.class/instance/menuGeometricCollection.st b/packages/SketchMorph2-Core.package/MorphicMonet.class/instance/menuGeometricCollection.st
@@ -5,7 +5,7 @@ menuGeometricCollection
 			add: (M2SelectLasso getMenuItemForTarget: self viewPort);
 			add: (M2InsertSelection getMenuItemForTarget: self viewPort);
 			add: (M2FillArea getMenuItemForTarget: self viewPort);
-			add: (M2GeometricCircle getMenuItemForTarget: self viewPort);
+			add: (M2GeometricEllipse getMenuItemForTarget: self viewPort);
 			add: (M2GeometricRectangle getMenuItemForTarget: self viewPort);
 			add: (M2GeometricTriangle getMenuItemForTarget: self viewPort);
 			add: (M2FillGeometricForm getMenuItemForTarget: self backend context);

diff --git a/packages/SketchMorph2-Core.package/MorphicMonet.class/instance/pasteClipboard.st b/packages/SketchMorph2-Core.package/MorphicMonet.class/instance/pasteClipboard.st
@@ -1,3 +1,10 @@
 tooling
 pasteClipboard
-	self importImage: Clipboard clipboardText asString
+
+	(self backend context isInTextMode
+	or: [(self findMenuItemWith: M2InsertSelection label) isEnabled not]) 
+	ifTrue: [
+		self importImage: Clipboard clipboardText asString.
+	] ifFalse: [
+		self clickMenuItemWith: M2InsertSelection label.
+	]
diff --git a/packages/SketchMorph2-Core.package/MorphicMonet.class/methodProperties.json b/packages/SketchMorph2-Core.package/MorphicMonet.class/methodProperties.json
@@ -38,7 +38,7 @@
 		"handleCommandKeystroke:" : "K.P. 7/8/2021 13:44",
 		"handleKeystroke:" : "K.P. 8/1/2021 19:47",
 		"handleNoModifierKeystroke:" : "K.P. 8/1/2021 19:49",
-		"handleShiftKeystroke:" : "CS 8/5/2021 22:27",
+		"handleShiftKeystroke:" : "ms 5/27/2022 17:10",
 		"importImage" : "mFr 6/3/2021 21:17",
 		"importImage:" : "CS 8/5/2021 22:41",
 		"initialize" : "CS 8/6/2021 18:58",
@@ -60,7 +60,7 @@
 		"menuPanel:" : "mFr 5/19/2021 10:57",
 		"minimumExtent" : "mFr 5/26/2021 12:05",
 		"paneColor" : "6/28/2021 21:03:28",
-		"pasteClipboard" : "CS 8/5/2021 22:42",
+		"pasteClipboard" : "ms 5/27/2022 18:09",
 		"setColor:" : "CS 8/5/2021 18:17",
 		"submenuDict" : "CS 8/5/2021 22:19",
 		"submenuDict:" : "mFr 5/19/2021 12:23",

diff --git a/packages/SketchMorph2-Tests.package/M2DrawingComponentTests.class/class/notFilledEllipse.st b/packages/SketchMorph2-Tests.package/M2DrawingComponentTests.class/class/notFilledEllipse.st
diff --git a/...hMorph2-Tests.package/M2DrawingComponentTests.class/class/notFilledEquilateralTriangle.st b/...hMorph2-Tests.package/M2DrawingComponentTests.class/class/notFilledEquilateralTriangle.st
diff --git a/packages/SketchMorph2-Tests.package/M2DrawingComponentTests.class/class/notFilledTriangle.st b/packages/SketchMorph2-Tests.package/M2DrawingComponentTests.class/class/notFilledTriangle.st
diff --git a/packages/SketchMorph2-Tests.package/M2DrawingComponentTests.class/instance/holdShift.st b/packages/SketchMorph2-Tests.package/M2DrawingComponentTests.class/instance/holdShift.st
@@ -0,0 +1,4 @@
+support
+holdShift
+
+	self viewPort canvas isShiftPressed: true.
diff --git a/packages/SketchMorph2-Tests.package/M2DrawingComponentTests.class/instance/releaseShift.st b/packages/SketchMorph2-Tests.package/M2DrawingComponentTests.class/instance/releaseShift.st
@@ -0,0 +1,4 @@
+support
+releaseShift
+
+	self viewPort canvas isShiftPressed: false.
diff --git a/...-Tests.package/M2DrawingComponentTests.class/instance/testCompareGeometricCircleFilled.st b/...-Tests.package/M2DrawingComponentTests.class/instance/testCompareGeometricCircleFilled.st
@@ -1,6 +1,8 @@
 testing
 testCompareGeometricCircleFilled
 	self
-		contextFillGeometricModeWithForm: #circle;
+		contextFillGeometricModeWithForm: #ellipse;
+		holdShift;
 		drawFrom: (40 @ 10) to: (80 @ 90);
-		compareBackendFormWith: #filledCircle
+		compareBackendFormWith: #filledCircle;
+		releaseShift
diff --git a/....package/M2DrawingComponentTests.class/instance/testCompareGeometricCircleFilledNarrow.st b/....package/M2DrawingComponentTests.class/instance/testCompareGeometricCircleFilledNarrow.st
@@ -1,6 +1,8 @@
 testing
 testCompareGeometricCircleFilledNarrow
 	self
-		contextFillGeometricModeWithForm: #circle;
+		contextFillGeometricModeWithForm: #ellipse;
+		holdShift;
 		drawFrom: (10 @ 80) to: (80 @ 90);
-		compareBackendFormWith: #filledCircleNarrow
+		compareBackendFormWith: #filledCircleNarrow;
+		releaseShift
diff --git a/...sts.package/M2DrawingComponentTests.class/instance/testCompareGeometricCircleNotFilled.st b/...sts.package/M2DrawingComponentTests.class/instance/testCompareGeometricCircleNotFilled.st
@@ -1,6 +1,8 @@
 testing
 testCompareGeometricCircleNotFilled
 	self
-		contextGeometricModeWithForm: #circle;
+		contextGeometricModeWithForm: #ellipse;
+		holdShift;
 		drawFrom: (40 @ 10) to: (80 @ 90);
-		compareBackendFormWith: #notFilledCircle
+		compareBackendFormWith: #notFilledCircle;
+		releaseShift
diff --git a/...s.package/M2DrawingComponentTests.class/instance/testCompareGeometricCircleOverlapping.st b/...s.package/M2DrawingComponentTests.class/instance/testCompareGeometricCircleOverlapping.st
@@ -1,9 +1,11 @@
 testing
 testCompareGeometricCircleOverlapping
 	self
-		contextGeometricModeWithForm: #circle;
+		contextGeometricModeWithForm: #ellipse;
+		holdShift;
 		drawFrom: 10 asPoint to: 40 asPoint.
 	self context isFillingGeometricForm: true.
 	self
 		drawFrom: 20 asPoint to: 80 asPoint;
-		compareBackendFormWith: #overlappingCircles
+		compareBackendFormWith: #overlappingCircles;
+		releaseShift
diff --git a/...ts.package/M2DrawingComponentTests.class/instance/testCompareGeometricEllipseNotFilled.st b/...ts.package/M2DrawingComponentTests.class/instance/testCompareGeometricEllipseNotFilled.st
@@ -0,0 +1,6 @@
+testing
+testCompareGeometricEllipseNotFilled
+	self
+		contextFillGeometricModeWithForm: #ellipse;
+		drawFrom: (40 @ 10) to: (80 @ 90);
+		compareBackendFormWith: #notFilledEllipse
diff --git a/...2DrawingComponentTests.class/instance/testCompareGeometricEquilateralTriangleNotFilled.st b/...2DrawingComponentTests.class/instance/testCompareGeometricEquilateralTriangleNotFilled.st
@@ -0,0 +1,8 @@
+testing
+testCompareGeometricEquilateralTriangleNotFilled
+	self
+		contextFillGeometricModeWithForm: #triangle;
+		holdShift;
+		drawFrom: (40 @ 10) to: (80 @ 90);
+		compareBackendFormWith: #notFilledEquilateralTriangle;
+		releaseShift
diff --git a/...s.package/M2DrawingComponentTests.class/instance/testCompareGeometricTriangleNotFilled.st b/...s.package/M2DrawingComponentTests.class/instance/testCompareGeometricTriangleNotFilled.st
@@ -0,0 +1,6 @@
+testing
+testCompareGeometricTriangleNotFilled
+	self
+		contextFillGeometricModeWithForm: #triangle;
+		drawFrom: (40 @ 10) to: (80 @ 90);
+		compareBackendFormWith: #notFilledTriangle
diff --git a/...SketchMorph2-Tests.package/M2DrawingComponentTests.class/instance/testSingleUndoAction.st b/...SketchMorph2-Tests.package/M2DrawingComponentTests.class/instance/testSingleUndoAction.st
@@ -1,8 +1,10 @@
 testing
 testSingleUndoAction
 	self
-		contextFillGeometricModeWithForm: #circle;
+		contextFillGeometricModeWithForm: #ellipse;
+		holdShift;
 		drawFrom: (40 @ 10) to: (80 @ 90);
-		drawFrom: (80 @ 10) to: (80 @ 200).
+		drawFrom: (80 @ 10) to: (80 @ 200);
+		releaseShift.
 	self backend undo.
 	self compareBackendFormWith: #filledCircle
diff --git a/...h2-Tests.package/M2DrawingComponentTests.class/instance/testUncommittedTemporaryCircle.st b/...h2-Tests.package/M2DrawingComponentTests.class/instance/testUncommittedTemporaryCircle.st
@@ -1,8 +1,10 @@
 testing
 testUncommittedTemporaryCircle
 	self
-		contextFillGeometricModeWithForm: #circle;
+		contextFillGeometricModeWithForm: #ellipse;
+		holdShift;
 		dragFrom: 40 @ 10 to: 80 @ 90;
 		compareBackendFormWith: #whiteBackground;
+		releaseShift;
 		finishDrawingIfNecessary;
 		compareBackendFormWith: #filledCircle