Improved coloring of elements

OpenPonk · Nov 7, 2024 · aafa5a0 · aafa5a0
1 parent 905d94a
commit aafa5a0
Show file tree

Hide file tree

Showing 62 changed files with 414 additions and 267 deletions.
diff --git a/repository/OpenPonk-Core/OPBoundary.class.st b/repository/OpenPonk-Core/OPBoundary.class.st
@@ -1,6 +1,8 @@
 Class {
 	#name : 'OPBoundary',
 	#superclass : 'OPDiagramOnlyShapeWithText',
+	#traits : 'OPTColoredAsFillAndBorderColoredAsStroke',
+	#classTraits : 'OPTColoredAsFillAndBorderColoredAsStroke classTrait',
 	#instVars : [
 		'name'
 	],
@@ -24,11 +26,23 @@ OPBoundary >> addSelectionDraggableInteraction [
 	@ OPRSSelectionDraggableBorder thatAlsoDragsContainedShapes
 ]
 
+{ #category : 'accessing' }
+OPBoundary >> defaultFillColor [
+
+	^ Color transparent
+]
+
 { #category : 'accessing' }
 OPBoundary >> defaultHeight [
 	^ 400
 ]
 
+{ #category : 'accessing' }
+OPBoundary >> defaultStrokeColor [
+
+	^ Color gray slightlyDarker
+]
+
 { #category : 'accessing' }
 OPBoundary >> defaultWidth [
 	^ 500
@@ -64,21 +78,17 @@ OPBoundary >> printOn: aStream [
 		nextPutAll: ''')'
 ]
 
-{ #category : 'creating - subelements' }
+{ #category : 'rendering' }
 OPBoundary >> renderBasicShape [
 
 	^ RSBox new
-		  color: Color transparent;
 		  width: self defaultWidth;
 		  height: self defaultHeight;
-		  borderDo: [ :border | 
-			  border
-				  color: Color gray;
-				  dashArray: #( 4 ) ];
+		  borderDo: [ :border | border dashArray: #( 4 ) ];
 		  yourself
 ]
 
-{ #category : 'creating - subelements' }
+{ #category : 'interactions' }
 OPBoundary >> selectableInteraction [
 
 	^ OPRSSelectable

diff --git a/repository/OpenPonk-Core/OPCommonElementController.class.st b/repository/OpenPonk-Core/OPCommonElementController.class.st
@@ -45,6 +45,12 @@ OPCommonElementController >> isCommon [
 	^ true
 ]
 
+{ #category : 'testing' }
+OPCommonElementController >> isHideable [
+
+	^ false
+]
+
 { #category : 'accessing' }
 OPCommonElementController >> model [
 

diff --git a/repository/OpenPonk-Core/OPController.class.st b/repository/OpenPonk-Core/OPController.class.st
@@ -163,6 +163,7 @@ OPController >> internalUnsubscribeFrom: aModel [
 
 { #category : 'testing' }
 OPController >> isHideable [
+
 	^ false
 ]
 

diff --git a/repository/OpenPonk-Core/OPDiagramController.class.st b/repository/OpenPonk-Core/OPDiagramController.class.st
@@ -767,7 +767,7 @@ OPDiagramController >> typeOfModel: aModel [
 	^ OPModelObjectType
 		named:
 			((aModel className withoutPrefix: self commonModelClassPrefix)
-				splitOnCapitals joinUsing: ' ')
+				splitCamelCase joinUsing: ' ')
 ]
 
 { #category : 'undo/redo' }

diff --git a/repository/OpenPonk-Core/OPDiagramElement.class.st b/repository/OpenPonk-Core/OPDiagramElement.class.st
@@ -426,6 +426,13 @@ OPDiagramElement >> removeRender [
 	roassalShape := nil
 ]
 
+{ #category : 'accessing' }
+OPDiagramElement >> removeStylePropertyNamed: aName [
+
+	self localStyle ifNotNil: [ :style |
+		style removeKey: aName ifAbsent: [  ] ]
+]
+
 { #category : 'rendering' }
 OPDiagramElement >> renderBasicShape [
 

diff --git a/repository/OpenPonk-Core/OPDiagramOnlyShape.class.st b/repository/OpenPonk-Core/OPDiagramOnlyShape.class.st
@@ -1,8 +1,6 @@
 Class {
 	#name : 'OPDiagramOnlyShape',
 	#superclass : 'OPBoundNode',
-	#traits : 'OPTBorderColoredAsStroke - {#updateRenderFromStyles}',
-	#classTraits : 'OPTBorderColoredAsStroke classTrait',
 	#instVars : [
 		'uuid',
 		'announcer'
@@ -67,12 +65,6 @@ OPDiagramOnlyShape >> modelElements: aCollection [
 	self shouldNotImplement
 ]
 
-{ #category : 'accessing' }
-OPDiagramOnlyShape >> strokeColor: aColor [
-
-	"ignore for now"
-]
-
 { #category : 'rendering' }
 OPDiagramOnlyShape >> updateRenderFromModel [
 

diff --git a/repository/OpenPonk-Core/OPEditElementTextCommand.class.st b/repository/OpenPonk-Core/OPEditElementTextCommand.class.st
@@ -30,7 +30,7 @@ OPEditElementTextCommand class >> executeAccessor: anAccessor on: anObject [
 OPEditElementTextCommand >> accessor: anAccessor [
 	self getSelector: anAccessor.
 	self setSelector: anAccessor , ':'.
-	self name: (anAccessor capitalized splitOnCapitals joinUsing: ' ')
+	self name: (anAccessor capitalized splitCamelCase joinUsing: ' ')
 ]
 
 { #category : 'execute' }

diff --git a/repository/OpenPonk-Core/OPElementController.class.st b/repository/OpenPonk-Core/OPElementController.class.st
@@ -131,6 +131,12 @@ OPElementController >> isCommon [
 	^ false
 ]
 
+{ #category : 'testing' }
+OPElementController >> isHideable [
+
+	^ true
+]
+
 { #category : 'deprecated' }
 OPElementController >> loadModel [
 	self deprecated: 'Method will be removed without replacement.'

diff --git a/repository/OpenPonk-Core/OPNoModelAdapter.class.st b/repository/OpenPonk-Core/OPNoModelAdapter.class.st
@@ -0,0 +1,29 @@
+Class {
+	#name : 'OPNoModelAdapter',
+	#superclass : 'Object',
+	#classInstVars : [
+		'instance'
+	],
+	#category : 'OpenPonk-Core-Adapters',
+	#package : 'OpenPonk-Core',
+	#tag : 'Adapters'
+}
+
+{ #category : 'accessing' }
+OPNoModelAdapter class >> instance [
+
+	^ instance ifNil: [ instance := self basicNew ]
+]
+
+{ #category : 'instance creation' }
+OPNoModelAdapter class >> new [
+
+	^ self instance
+]
+
+{ #category : 'initialization' }
+OPNoModelAdapter class >> reset [
+
+	<script>
+	instance := nil
+]
diff --git a/repository/OpenPonk-Core/OPNoShape.class.st b/repository/OpenPonk-Core/OPNoShape.class.st
@@ -1,11 +1,33 @@
 Class {
 	#name : 'OPNoShape',
 	#superclass : 'Object',
+	#classInstVars : [
+		'instance'
+	],
 	#category : 'OpenPonk-Core-DiagramElements',
 	#package : 'OpenPonk-Core',
 	#tag : 'DiagramElements'
 }
 
+{ #category : 'accessing' }
+OPNoShape class >> instance [
+
+	^ instance ifNil: [ instance := self basicNew ]
+]
+
+{ #category : 'instance creation' }
+OPNoShape class >> new [
+
+	^ self instance
+]
+
+{ #category : 'initialization' }
+OPNoShape class >> reset [
+
+	<script>
+	instance := nil
+]
+
 { #category : 'testing' }
 OPNoShape >> doesNotExist [
 

diff --git a/repository/OpenPonk-Core/OPNote.class.st b/repository/OpenPonk-Core/OPNote.class.st
@@ -1,6 +1,8 @@
 Class {
 	#name : 'OPNote',
 	#superclass : 'OPDiagramOnlyShapeWithText',
+	#traits : 'OPTColoredAsFillAndBorderColoredAsStroke',
+	#classTraits : 'OPTColoredAsFillAndBorderColoredAsStroke classTrait',
 	#instVars : [
 		'text',
 		'topLeftBox',
@@ -29,9 +31,9 @@ OPNote class >> stonAllInstVarNames [
 ]
 
 { #category : 'accessing' }
-OPNote >> attachedShapes [
+OPNote >> attachedElementShapes [
 
-	^ super attachedShapes , {
+	^ {
 		  topLeftBox.
 		  upperTopRightBox.
 		  lowerTopRightBox.
@@ -41,19 +43,23 @@ OPNote >> attachedShapes [
 		  middleBottomBox.
 		  leftFillBox.
 		  bottomFillBox.
-		  triangle } , lines
+		  triangle }
+]
+
+{ #category : 'accessing' }
+OPNote >> attachedShapes [
+
+	^ super attachedShapes , self attachedElementShapes , lines
 ]
 
 { #category : 'creating - subelements' }
 OPNote >> createOwnedBorderLines [
 
 	| lineShape innerLineShape |
 	lineShape := RSLine new
-		             color: Color darkGray;
 		             width: 1;
 		             yourself.
 	innerLineShape := RSLine new
-		                  color: Color gray;
 		                  width: 1;
 		                  yourself.
 	lines := {
@@ -72,16 +78,14 @@ OPNote >> createOwnedBorderLines [
 		         (lineShape copy
 			          from: topLeftBox;
 			          to: upperTopRightBox) } asGroup.
-	roassalShape canvas addAll: lines.
+	roassalShape canvas addAll: lines
 ]
 
 { #category : 'creating - subelements' }
 OPNote >> createOwnedCornerTriangle [
 
 	triangle := RSSVGPath new
 		            svgPath: 'M0,0L20,0L0,-20Z';
-		            color: Color lightYellow darker;
-		            borderColor: Color lightGray;
 		            model: self;
 		            yourself.
 	self canvas add: triangle
@@ -92,7 +96,6 @@ OPNote >> createOwnedFillBoxes [
 
 	| fillBoxShape |
 	fillBoxShape := RSBox new
-		                color: Color lightYellow;
 		                borderColor: Color transparent;
 		                yourself.
 	leftFillBox := fillBoxShape model: #left.
@@ -107,7 +110,6 @@ OPNote >> createOwnedInvisibleBoxes [
 
 	| invisibleBoxShape invisibleBoxes |
 	invisibleBoxShape := RSBox new
-		                     color: Color transparent;
 		                     borderColor: Color transparent;
 		                     width: 1;
 		                     height: 1;
@@ -130,6 +132,12 @@ OPNote >> createOwnedInvisibleBoxes [
 	self canvas addAll: invisibleBoxes
 ]
 
+{ #category : 'accessing' }
+OPNote >> defaultFillColor [
+
+	^ OPDiagramFigureYellowFillColorCommand new color
+]
+
 { #category : 'initialization' }
 OPNote >> initialize [
 
@@ -259,3 +267,18 @@ OPNote >> updateOwnedElements [
 		extent: roassalShape extent + (0 @ -20);
 		translateTo: roassalShape position + (0 @ 10)
 ]
+
+{ #category : 'initialization' }
+OPNote >> updateRoassalShapeBorderColorFromStyles [
+
+	lines do: [ :each | each color: self borderColor ].
+	triangle borderColor:
+		(self borderColor alphaMixed: 0.35 with: Color white)
+]
+
+{ #category : 'initialization' }
+OPNote >> updateRoassalShapeColorFromStyles [
+
+	self attachedElementShapes do: [ :each | each color: self color ].
+	triangle color: self color slightlyDarker
+]
diff --git a/repository/OpenPonk-Core/OPShapeStyle.class.st b/repository/OpenPonk-Core/OPShapeStyle.class.st
@@ -78,6 +78,15 @@ OPShapeStyle >> removeKey: aSymbol [
 	^ result
 ]
 
+{ #category : 'removing' }
+OPShapeStyle >> removeKey: aSymbol ifAbsent: aBlock [
+
+	| result |
+	result := properties removeKey: aSymbol ifAbsent: [ ^ aBlock value ].
+	self styledElements do: #styleChanged.
+	^ result
+]
+
 { #category : 'accessing' }
 OPShapeStyle >> removedFromStyledElement: aDiagramElement [
 

diff --git a/repository/OpenPonk-Core/OPTBorderColoredAsStroke.trait.st b/repository/OpenPonk-Core/OPTBorderColoredAsStroke.trait.st
@@ -11,10 +11,18 @@ OPTBorderColoredAsStroke >> borderColor [
 	^ self strokeColor
 ]
 
+{ #category : 'accessing' }
+OPTBorderColoredAsStroke >> defaultStrokeColor [
+
+	^ Color black
+]
+
 { #category : 'accessing' }
 OPTBorderColoredAsStroke >> strokeColor [
 
-	^ self stylePropertyNamed: #strokeColor ifAbsent: [ Color black ]
+	^ self
+		  stylePropertyNamed: #strokeColor
+		  ifAbsent: [ self defaultStrokeColor ]
 ]
 
 { #category : 'accessing' }
@@ -36,7 +44,7 @@ OPTBorderColoredAsStroke >> updateBorderColorFromStyles [
 				ifPresent: [ :previousBorder |
 					previousBorder do: [ :each | each color: self borderColor ].
 					^ self ] ].
-	self roassalShape borderColor: self borderColor
+	self updateRoassalShapeBorderColorFromStyles
 ]
 
 { #category : 'accessing' }
@@ -47,3 +55,9 @@ OPTBorderColoredAsStroke >> updateRenderFromStyles [
 	super updateRenderFromStyles.
 	self roassalShape signalUpdate
 ]
+
+{ #category : 'initialization' }
+OPTBorderColoredAsStroke >> updateRoassalShapeBorderColorFromStyles [
+
+	self roassalShape borderColor: self borderColor
+]
diff --git a/repository/OpenPonk-Core/OPTColored.trait.st b/repository/OpenPonk-Core/OPTColored.trait.st
@@ -24,7 +24,7 @@ OPTColored >> updateColorFromStyles [
 					at: key
 					put: (OrderedCollection with: self color).
 				^ self ] ].
-	self roassalShape color: self color
+	self updateRoassalShapeColorFromStyles
 ]
 
 { #category : 'initialization' }
@@ -35,3 +35,9 @@ OPTColored >> updateRenderFromStyles [
 	super updateRenderFromStyles.
 	self roassalShape signalUpdate
 ]
+
+{ #category : 'initialization' }
+OPTColored >> updateRoassalShapeColorFromStyles [
+
+	self roassalShape color: self color
+]
-Original file line number
+Diff line change
@@ Expand Up / @@ -163,6 +163,7 @@ OPController >> internalUnsubscribeFrom: aModel [ @@
     { #category : 'testing' }
     OPController >> isHideable [
     	^ false
     ]
@@ Expand Down @@