From ca8735f0f50488af67fbd6c5e0e9879ecad390e9 Mon Sep 17 00:00:00 2001 From: Maximilian Franz Date: Thu, 20 May 2021 22:36:00 +0200 Subject: [PATCH 1/3] Add M2ColorSensor to handle color selection of pipette tool --- .../M2ColorSensor.class/README.md | 0 .../M2ColorSensor.class/class/newWith..st | 5 +++++ .../M2ColorSensor.class/instance/initialize.st | 7 +++++++ .../M2ColorSensor.class/instance/mouseUp..st | 7 +++++++ .../M2ColorSensor.class/instance/target..st | 3 +++ .../M2ColorSensor.class/instance/target.st | 3 +++ .../M2ColorSensor.class/methodProperties.json | 8 ++++++++ .../M2ColorSensor.class/properties.json | 14 ++++++++++++++ .../M2Pipette.class/class/actionSelector.st | 2 +- .../M2Pipette.class/methodProperties.json | 2 +- .../MorphicMonet.class/instance/chooseColor.st | 8 -------- .../instance/invokeColorSensor.st | 3 +++ .../MorphicMonet.class/methodProperties.json | 6 +++--- 13 files changed, 55 insertions(+), 13 deletions(-) create mode 100644 packages/SketchMorph2-Core.package/M2ColorSensor.class/README.md create mode 100644 packages/SketchMorph2-Core.package/M2ColorSensor.class/class/newWith..st create mode 100644 packages/SketchMorph2-Core.package/M2ColorSensor.class/instance/initialize.st create mode 100644 packages/SketchMorph2-Core.package/M2ColorSensor.class/instance/mouseUp..st create mode 100644 packages/SketchMorph2-Core.package/M2ColorSensor.class/instance/target..st create mode 100644 packages/SketchMorph2-Core.package/M2ColorSensor.class/instance/target.st create mode 100644 packages/SketchMorph2-Core.package/M2ColorSensor.class/methodProperties.json create mode 100644 packages/SketchMorph2-Core.package/M2ColorSensor.class/properties.json create mode 100644 packages/SketchMorph2-Core.package/MorphicMonet.class/instance/invokeColorSensor.st diff --git a/packages/SketchMorph2-Core.package/M2ColorSensor.class/README.md b/packages/SketchMorph2-Core.package/M2ColorSensor.class/README.md new file mode 100644 index 00000000..e69de29b diff --git a/packages/SketchMorph2-Core.package/M2ColorSensor.class/class/newWith..st b/packages/SketchMorph2-Core.package/M2ColorSensor.class/class/newWith..st new file mode 100644 index 00000000..d330e1e0 --- /dev/null +++ b/packages/SketchMorph2-Core.package/M2ColorSensor.class/class/newWith..st @@ -0,0 +1,5 @@ +instance creation +newWith: aTarget + ^ (self basicNew + target: aTarget; + initialize) diff --git a/packages/SketchMorph2-Core.package/M2ColorSensor.class/instance/initialize.st b/packages/SketchMorph2-Core.package/M2ColorSensor.class/instance/initialize.st new file mode 100644 index 00000000..69e2d5ff --- /dev/null +++ b/packages/SketchMorph2-Core.package/M2ColorSensor.class/instance/initialize.st @@ -0,0 +1,7 @@ +initialization +initialize + super initialize. + self + extent: 0 asPoint; + openInWorld. + self activeHand addMouseListener: self diff --git a/packages/SketchMorph2-Core.package/M2ColorSensor.class/instance/mouseUp..st b/packages/SketchMorph2-Core.package/M2ColorSensor.class/instance/mouseUp..st new file mode 100644 index 00000000..229d101b --- /dev/null +++ b/packages/SketchMorph2-Core.package/M2ColorSensor.class/instance/mouseUp..st @@ -0,0 +1,7 @@ +event handling +mouseUp: evt + self target + setColor: (Display colorAt: evt cursorPoint); + activateDefaultItem. + self activeHand removeMouseListener: self. + self delete diff --git a/packages/SketchMorph2-Core.package/M2ColorSensor.class/instance/target..st b/packages/SketchMorph2-Core.package/M2ColorSensor.class/instance/target..st new file mode 100644 index 00000000..34ad0158 --- /dev/null +++ b/packages/SketchMorph2-Core.package/M2ColorSensor.class/instance/target..st @@ -0,0 +1,3 @@ +accessing +target: aMorphicMonet + target := aMorphicMonet diff --git a/packages/SketchMorph2-Core.package/M2ColorSensor.class/instance/target.st b/packages/SketchMorph2-Core.package/M2ColorSensor.class/instance/target.st new file mode 100644 index 00000000..32311ac8 --- /dev/null +++ b/packages/SketchMorph2-Core.package/M2ColorSensor.class/instance/target.st @@ -0,0 +1,3 @@ +accessing +target + ^ target diff --git a/packages/SketchMorph2-Core.package/M2ColorSensor.class/methodProperties.json b/packages/SketchMorph2-Core.package/M2ColorSensor.class/methodProperties.json new file mode 100644 index 00000000..a1bdfa14 --- /dev/null +++ b/packages/SketchMorph2-Core.package/M2ColorSensor.class/methodProperties.json @@ -0,0 +1,8 @@ +{ + "class" : { + "newWith:" : "mFr 5/20/2021 22:30" }, + "instance" : { + "initialize" : "mFr 5/20/2021 22:31", + "mouseUp:" : "mFr 5/20/2021 22:29", + "target" : "mFr 5/20/2021 22:27", + "target:" : "mFr 5/20/2021 22:27" } } diff --git a/packages/SketchMorph2-Core.package/M2ColorSensor.class/properties.json b/packages/SketchMorph2-Core.package/M2ColorSensor.class/properties.json new file mode 100644 index 00000000..4a053565 --- /dev/null +++ b/packages/SketchMorph2-Core.package/M2ColorSensor.class/properties.json @@ -0,0 +1,14 @@ +{ + "category" : "SketchMorph2-Core", + "classinstvars" : [ + ], + "classvars" : [ + ], + "commentStamp" : "", + "instvars" : [ + "target" ], + "name" : "M2ColorSensor", + "pools" : [ + ], + "super" : "Morph", + "type" : "normal" } diff --git a/packages/SketchMorph2-Core.package/M2Pipette.class/class/actionSelector.st b/packages/SketchMorph2-Core.package/M2Pipette.class/class/actionSelector.st index af5fff14..d88872a3 100644 --- a/packages/SketchMorph2-Core.package/M2Pipette.class/class/actionSelector.st +++ b/packages/SketchMorph2-Core.package/M2Pipette.class/class/actionSelector.st @@ -1,3 +1,3 @@ accessing actionSelector - ^ #chooseColor + ^ #invokeColorSensor diff --git a/packages/SketchMorph2-Core.package/M2Pipette.class/methodProperties.json b/packages/SketchMorph2-Core.package/M2Pipette.class/methodProperties.json index a8a72d4c..70c9dc04 100644 --- a/packages/SketchMorph2-Core.package/M2Pipette.class/methodProperties.json +++ b/packages/SketchMorph2-Core.package/M2Pipette.class/methodProperties.json @@ -1,6 +1,6 @@ { "class" : { - "actionSelector" : "mFr 5/19/2021 12:33", + "actionSelector" : "mFr 5/20/2021 22:34", "icon" : "mFr 5/19/2021 10:51", "isActivatable" : "mFr 5/19/2021 12:33", "label" : "mFr 5/19/2021 12:33" }, diff --git a/packages/SketchMorph2-Core.package/MorphicMonet.class/instance/chooseColor.st b/packages/SketchMorph2-Core.package/MorphicMonet.class/instance/chooseColor.st index eb866fc0..e69de29b 100644 --- a/packages/SketchMorph2-Core.package/MorphicMonet.class/instance/chooseColor.st +++ b/packages/SketchMorph2-Core.package/MorphicMonet.class/instance/chooseColor.st @@ -1,8 +0,0 @@ -tooling -chooseColor - self backend switchMode. - self world activeHand showTemporaryCursor: - (CursorWithAlpha fromIcon: MorphicMonetIcons pipetteIcon). - [Sensor redButtonPressed] whileFalse: []. - self setColor: (Display colorAt: Sensor cursorPoint). - self activateDefaultItem diff --git a/packages/SketchMorph2-Core.package/MorphicMonet.class/instance/invokeColorSensor.st b/packages/SketchMorph2-Core.package/MorphicMonet.class/instance/invokeColorSensor.st new file mode 100644 index 00000000..05df9f41 --- /dev/null +++ b/packages/SketchMorph2-Core.package/MorphicMonet.class/instance/invokeColorSensor.st @@ -0,0 +1,3 @@ +tooling +invokeColorSensor + M2ColorSensor newWith: self diff --git a/packages/SketchMorph2-Core.package/MorphicMonet.class/methodProperties.json b/packages/SketchMorph2-Core.package/MorphicMonet.class/methodProperties.json index e5a87163..5875bfe7 100644 --- a/packages/SketchMorph2-Core.package/MorphicMonet.class/methodProperties.json +++ b/packages/SketchMorph2-Core.package/MorphicMonet.class/methodProperties.json @@ -16,7 +16,6 @@ "canvas" : "mFr 5/19/2021 10:58", "canvasPanel" : "mFr 5/19/2021 10:59", "canvasPanel:" : "mFr 5/19/2021 10:59", - "chooseColor" : "CS 6/1/2021 19:10", "clearCanvas" : "mFr 5/19/2021 10:59", "colorPalette" : "mFr 5/19/2021 10:59", "colorPanel" : "mFr 5/19/2021 10:59", @@ -36,8 +35,9 @@ "initializeColorPanel" : "mFr 5/19/2021 11:01", "initializeMenuPanel" : "mFr 5/26/2021 12:21", "initializePanels" : "mk 7/27/2020 20:16", - "initializeTopPanel" : "mFr 5/26/2021 12:22", - "loadCanvas" : "mFr 5/26/2021 12:00", + "initializeTopPanel" : "mFr 5/19/2021 11:01", + "invokeColorSensor" : "mFr 5/20/2021 22:34", + "loadCanvas" : "mFr 5/19/2021 11:01", "loadMenu" : "mFr 5/19/2021 12:45", "menuBrushCollection" : "CS 5/30/2021 18:05", "menuBrushCollection:" : "mFr 5/19/2021 12:17", From 52c4c3ac539e5e1c106798a00507a4155b8c3a72 Mon Sep 17 00:00:00 2001 From: Maximilian Franz Date: Wed, 2 Jun 2021 22:15:56 +0200 Subject: [PATCH 2/3] Delete chooseColor.st --- .../MorphicMonet.class/instance/chooseColor.st | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 packages/SketchMorph2-Core.package/MorphicMonet.class/instance/chooseColor.st diff --git a/packages/SketchMorph2-Core.package/MorphicMonet.class/instance/chooseColor.st b/packages/SketchMorph2-Core.package/MorphicMonet.class/instance/chooseColor.st deleted file mode 100644 index e69de29b..00000000 From 9ba8960de994ab44e67858c0df996a1806713666 Mon Sep 17 00:00:00 2001 From: Maximilian Franz Date: Wed, 2 Jun 2021 22:21:25 +0200 Subject: [PATCH 3/3] Tell backend to switch mode when invoking pipette tool --- .../MorphicMonet.class/instance/invokeColorSensor.st | 3 ++- .../MorphicMonet.class/methodProperties.json | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/SketchMorph2-Core.package/MorphicMonet.class/instance/invokeColorSensor.st b/packages/SketchMorph2-Core.package/MorphicMonet.class/instance/invokeColorSensor.st index 05df9f41..717bbf3e 100644 --- a/packages/SketchMorph2-Core.package/MorphicMonet.class/instance/invokeColorSensor.st +++ b/packages/SketchMorph2-Core.package/MorphicMonet.class/instance/invokeColorSensor.st @@ -1,3 +1,4 @@ tooling invokeColorSensor - M2ColorSensor newWith: self + M2ColorSensor newWith: self. + self backend switchMode diff --git a/packages/SketchMorph2-Core.package/MorphicMonet.class/methodProperties.json b/packages/SketchMorph2-Core.package/MorphicMonet.class/methodProperties.json index 5875bfe7..73d1e995 100644 --- a/packages/SketchMorph2-Core.package/MorphicMonet.class/methodProperties.json +++ b/packages/SketchMorph2-Core.package/MorphicMonet.class/methodProperties.json @@ -36,7 +36,7 @@ "initializeMenuPanel" : "mFr 5/26/2021 12:21", "initializePanels" : "mk 7/27/2020 20:16", "initializeTopPanel" : "mFr 5/19/2021 11:01", - "invokeColorSensor" : "mFr 5/20/2021 22:34", + "invokeColorSensor" : "mFr 6/2/2021 22:19", "loadCanvas" : "mFr 5/19/2021 11:01", "loadMenu" : "mFr 5/19/2021 12:45", "menuBrushCollection" : "CS 5/30/2021 18:05",