diff --git a/repository/BaselineOfOpenPonk/BaselineOfOpenPonk.class.st b/repository/BaselineOfOpenPonk/BaselineOfOpenPonk.class.st index a5add2ab0..f0be1c728 100644 --- a/repository/BaselineOfOpenPonk/BaselineOfOpenPonk.class.st +++ b/repository/BaselineOfOpenPonk/BaselineOfOpenPonk.class.st @@ -16,17 +16,15 @@ BaselineOfOpenPonk >> baseline: spec [ self externalProjectsBaseline: spec. self internalProjectsBaseline: spec. spec - package: 'OpenPonk-Roassal3' - with: [ spec preLoadDoIt: #loadRoassal3 ]; + package: 'OpenPonk-Roassal' + with: [ spec requires: #( 'Roassal' 'RoassalExporters' ) ]; package: 'OpenPonk-Core' with: [ spec requires: - #( 'Magritte' 'Mocketry' 'XMLParser' 'XPath' 'NeoJSON' 'OpenPonk-Roassal3' ) ]; + #( 'Magritte' 'Mocketry' 'XMLParser' 'XPath' 'NeoJSON' 'OpenPonk-Roassal' ) ]; package: 'OpenPonk-Morphic'; package: 'OpenPonk-Spec' with: [ - spec - requires: - #( 'NewTools' 'Magritte' 'SynchronizedLinks' 'OpenPonk-Morphic' ); - preLoadDoIt: #loadPetitParserAndRoassal3 ]. + spec requires: + #( 'NewTools' 'Magritte' 'SynchronizedLinks' 'OpenPonk-Morphic' ) ]. spec group: 'default' with: #( 'OpenPonk-Core' 'OpenPonk-Morphic' 'OpenPonk-Spec' ) ] @@ -56,7 +54,18 @@ BaselineOfOpenPonk >> externalProjectsBaseline: spec [ spec baseline: 'NeoJSON' - with: [ spec repository: 'github://svenvc/NeoJSON:b05162a' ] + with: [ spec repository: 'github://svenvc/NeoJSON:b05162a' ]. + + spec baseline: 'Roassal' with: [ + spec + repository: 'github://pharo-graphics/Roassal:b508334'; + loads: #Full; + preLoadDoIt: #removeOldRoassal3 ]. + + spec + baseline: 'RoassalExporters' + with: [ + spec repository: 'github://pharo-graphics/RoassalExporters:v1.01' ] ] { #category : #baselines } @@ -87,35 +96,62 @@ BaselineOfOpenPonk >> loadPetitParser [ ] { #category : #baselines } -BaselineOfOpenPonk >> loadPetitParserAndRoassal3 [ +BaselineOfOpenPonk >> loadPetitParserAndRoassal [ "PetitParser is not needed by core OP. It is needed by BormEditor, but due to Pharo bug https://github.com/pharo-project/pharo/issues/9913 it must be always loaded before Roassal in Pharo 10" self loadPetitParser; - loadRoassal3 + loadRoassal ] { #category : #baselines } -BaselineOfOpenPonk >> loadRoassal3 [ +BaselineOfOpenPonk >> loadRoassal [ "Roassal3 needs to be loaded this way because different version of it is already included in Pharo 10+" - | exporters | - Smalltalk at: #BaselineOfRoassal3Exporters ifPresent: [ ^ self ]. + | exporters layouts | + + Smalltalk at: #BaselineOfRoassalExporters ifPresent: [ ^ self ]. + + layouts := Metacello new. + layouts + baseline: 'RoassalLayouts'; + repository: 'github://pharo-graphics/RoassalLayouts:136a902'; + lock; + onConflictUseLoaded. exporters := Metacello new. exporters - baseline: 'Roassal3Exporters'; - repository: 'github://ObjectProfile/Roassal3Exporters:6c61b1f'; + baseline: 'RoassalExporters'; + repository: 'github://pharo-graphics/RoassalExporters:v1.01'; lock; onConflictUseLoaded. + [ Metacello new - baseline: 'Roassal3'; - repository: 'github://ObjectProfile/Roassal3:v1.03'; + baseline: 'Roassal'; + repository: 'github://pharo-graphics/Roassal:b508334'; lock; load: #Full ] on: MCMergeOrLoadWarning do: [ :warning | warning load ]. + + layouts load. exporters load ] + +{ #category : #baselines } +BaselineOfOpenPonk >> removeOldRoassal3 [ + + #( Roassal3 Numeric ) do: [ :eachName | self removePackage: eachName ] +] + +{ #category : #baselines } +BaselineOfOpenPonk >> removePackage: aPackageName [ + + | regExp packages | + regExp := '*' , aPackageName , '*'. + packages := RPackageOrganizer default packages select: [ :each | + regExp match: each name ]. + packages do: [ :each | each removeFromSystem ] +] diff --git a/repository/OpenPonk-Roassal3/Announcer.extension.st b/repository/OpenPonk-Roassal/Announcer.extension.st similarity index 91% rename from repository/OpenPonk-Roassal3/Announcer.extension.st rename to repository/OpenPonk-Roassal/Announcer.extension.st index 9a186f35e..8264216ee 100644 --- a/repository/OpenPonk-Roassal3/Announcer.extension.st +++ b/repository/OpenPonk-Roassal/Announcer.extension.st @@ -1,6 +1,6 @@ Extension { #name : #Announcer } -{ #category : #'*OpenPonk-Roassal3' } +{ #category : #'*OpenPonk-Roassal' } Announcer >> suspendAllOf: anObject while: aBlock [ | originalSubscriptions result | diff --git a/repository/OpenPonk-Roassal3/Color.extension.st b/repository/OpenPonk-Roassal/Color.extension.st similarity index 84% rename from repository/OpenPonk-Roassal3/Color.extension.st rename to repository/OpenPonk-Roassal/Color.extension.st index 1f3450a59..d4f63930b 100644 --- a/repository/OpenPonk-Roassal3/Color.extension.st +++ b/repository/OpenPonk-Roassal/Color.extension.st @@ -1,6 +1,6 @@ Extension { #name : #Color } -{ #category : #'*OpenPonk-Roassal3' } +{ #category : #'*OpenPonk-Roassal' } Color >> withTransparencyAsWhite [ ^ self class diff --git a/repository/OpenPonk-Roassal3/Float.extension.st b/repository/OpenPonk-Roassal/Float.extension.st similarity index 91% rename from repository/OpenPonk-Roassal3/Float.extension.st rename to repository/OpenPonk-Roassal/Float.extension.st index 526f72994..5fbfbede2 100644 --- a/repository/OpenPonk-Roassal3/Float.extension.st +++ b/repository/OpenPonk-Roassal/Float.extension.st @@ -1,6 +1,6 @@ Extension { #name : #Float } -{ #category : #'*OpenPonk-Roassal3' } +{ #category : #'*OpenPonk-Roassal' } Float >> closeTo: num absolutePrecision: aPrecision [ "Tell whether the receiver and arguments are close from each other given a absolute precision" diff --git a/repository/OpenPonk-Roassal3/GEllipse.extension.st b/repository/OpenPonk-Roassal/GEllipse.extension.st similarity index 68% rename from repository/OpenPonk-Roassal3/GEllipse.extension.st rename to repository/OpenPonk-Roassal/GEllipse.extension.st index 46b83cba0..4b4c68acc 100644 --- a/repository/OpenPonk-Roassal3/GEllipse.extension.st +++ b/repository/OpenPonk-Roassal/GEllipse.extension.st @@ -1,24 +1,24 @@ Extension { #name : #GEllipse } -{ #category : #'*OpenPonk-Roassal3' } +{ #category : #'*OpenPonk-Roassal' } GEllipse >> bottom [ ^ coVertex y max: center y + center y - coVertex y ] -{ #category : #'*OpenPonk-Roassal3' } +{ #category : #'*OpenPonk-Roassal' } GEllipse >> left [ ^ vertex x min: center x + center x - vertex x ] -{ #category : #'*OpenPonk-Roassal3' } +{ #category : #'*OpenPonk-Roassal' } GEllipse >> right [ ^ vertex x max: center x + center x - vertex x ] -{ #category : #'*OpenPonk-Roassal3' } +{ #category : #'*OpenPonk-Roassal' } GEllipse >> top [ ^ coVertex y min: center y + center y - coVertex y diff --git a/repository/OpenPonk-Roassal3/GPoint.extension.st b/repository/OpenPonk-Roassal/GPoint.extension.st similarity index 50% rename from repository/OpenPonk-Roassal3/GPoint.extension.st rename to repository/OpenPonk-Roassal/GPoint.extension.st index 5f3016eac..659dbeb0c 100644 --- a/repository/OpenPonk-Roassal3/GPoint.extension.st +++ b/repository/OpenPonk-Roassal/GPoint.extension.st @@ -1,24 +1,24 @@ Extension { #name : #GPoint } -{ #category : #'*OpenPonk-Roassal3' } +{ #category : #'*OpenPonk-Roassal' } GPoint >> bottom [ ^ self y ] -{ #category : #'*OpenPonk-Roassal3' } +{ #category : #'*OpenPonk-Roassal' } GPoint >> left [ ^ self x ] -{ #category : #'*OpenPonk-Roassal3' } +{ #category : #'*OpenPonk-Roassal' } GPoint >> right [ ^ self x ] -{ #category : #'*OpenPonk-Roassal3' } +{ #category : #'*OpenPonk-Roassal' } GPoint >> top [ ^ self y diff --git a/repository/OpenPonk-Roassal3/GPolygon.extension.st b/repository/OpenPonk-Roassal/GPolygon.extension.st similarity index 63% rename from repository/OpenPonk-Roassal3/GPolygon.extension.st rename to repository/OpenPonk-Roassal/GPolygon.extension.st index 93dfa7d96..96b6b1096 100644 --- a/repository/OpenPonk-Roassal3/GPolygon.extension.st +++ b/repository/OpenPonk-Roassal/GPolygon.extension.st @@ -1,24 +1,24 @@ Extension { #name : #GPolygon } -{ #category : #'*OpenPonk-Roassal3' } +{ #category : #'*OpenPonk-Roassal' } GPolygon >> bottom [ ^ self encompassingRectangle bottom ] -{ #category : #'*OpenPonk-Roassal3' } +{ #category : #'*OpenPonk-Roassal' } GPolygon >> left [ ^ self encompassingRectangle left ] -{ #category : #'*OpenPonk-Roassal3' } +{ #category : #'*OpenPonk-Roassal' } GPolygon >> right [ ^ self encompassingRectangle right ] -{ #category : #'*OpenPonk-Roassal3' } +{ #category : #'*OpenPonk-Roassal' } GPolygon >> top [ ^ self encompassingRectangle top diff --git a/repository/OpenPonk-Roassal3/GRectangle.extension.st b/repository/OpenPonk-Roassal/GRectangle.extension.st similarity index 61% rename from repository/OpenPonk-Roassal3/GRectangle.extension.st rename to repository/OpenPonk-Roassal/GRectangle.extension.st index 0660e53cd..d90d6ad49 100644 --- a/repository/OpenPonk-Roassal3/GRectangle.extension.st +++ b/repository/OpenPonk-Roassal/GRectangle.extension.st @@ -1,24 +1,24 @@ Extension { #name : #GRectangle } -{ #category : #'*OpenPonk-Roassal3' } +{ #category : #'*OpenPonk-Roassal' } GRectangle >> bottom [ ^ (self vertices at: 3) y ] -{ #category : #'*OpenPonk-Roassal3' } +{ #category : #'*OpenPonk-Roassal' } GRectangle >> left [ ^ (self vertices at: 1) x ] -{ #category : #'*OpenPonk-Roassal3' } +{ #category : #'*OpenPonk-Roassal' } GRectangle >> right [ ^ (self vertices at: 3) x ] -{ #category : #'*OpenPonk-Roassal3' } +{ #category : #'*OpenPonk-Roassal' } GRectangle >> top [ ^ (self vertices at: 1) y diff --git a/repository/OpenPonk-Roassal3/GSegment.extension.st b/repository/OpenPonk-Roassal/GSegment.extension.st similarity index 56% rename from repository/OpenPonk-Roassal3/GSegment.extension.st rename to repository/OpenPonk-Roassal/GSegment.extension.st index 13156259f..b41745079 100644 --- a/repository/OpenPonk-Roassal3/GSegment.extension.st +++ b/repository/OpenPonk-Roassal/GSegment.extension.st @@ -1,24 +1,24 @@ Extension { #name : #GSegment } -{ #category : #'*OpenPonk-Roassal3' } +{ #category : #'*OpenPonk-Roassal' } GSegment >> bottom [ ^ v1 y max: v2 y ] -{ #category : #'*OpenPonk-Roassal3' } +{ #category : #'*OpenPonk-Roassal' } GSegment >> left [ ^ v1 x min: v2 x ] -{ #category : #'*OpenPonk-Roassal3' } +{ #category : #'*OpenPonk-Roassal' } GSegment >> right [ ^ v1 x max: v2 x ] -{ #category : #'*OpenPonk-Roassal3' } +{ #category : #'*OpenPonk-Roassal' } GSegment >> top [ ^ v1 y min: v2 y diff --git a/repository/OpenPonk-Roassal3/Number.extension.st b/repository/OpenPonk-Roassal/Number.extension.st similarity index 88% rename from repository/OpenPonk-Roassal3/Number.extension.st rename to repository/OpenPonk-Roassal/Number.extension.st index ff9509d50..ed3e22b2e 100644 --- a/repository/OpenPonk-Roassal3/Number.extension.st +++ b/repository/OpenPonk-Roassal/Number.extension.st @@ -1,6 +1,6 @@ Extension { #name : #Number } -{ #category : #'*OpenPonk-Roassal3' } +{ #category : #'*OpenPonk-Roassal' } Number >> closeTo: num absolutePrecision: aPrecision [ "are these two numbers close?" diff --git a/repository/OpenPonk-Roassal3/OPRSAbstractDraggableControlPointHandle.class.st b/repository/OpenPonk-Roassal/OPRSAbstractDraggableControlPointHandle.class.st similarity index 96% rename from repository/OpenPonk-Roassal3/OPRSAbstractDraggableControlPointHandle.class.st rename to repository/OpenPonk-Roassal/OPRSAbstractDraggableControlPointHandle.class.st index 6e083d276..3d36b4f95 100644 --- a/repository/OpenPonk-Roassal3/OPRSAbstractDraggableControlPointHandle.class.st +++ b/repository/OpenPonk-Roassal/OPRSAbstractDraggableControlPointHandle.class.st @@ -6,7 +6,7 @@ Class { 'line', 'shape' ], - #category : #'OpenPonk-Roassal3-Polyline' + #category : #'OpenPonk-Roassal-Polyline' } { #category : #accessing } diff --git a/repository/OpenPonk-Roassal3/OPRSAcceptDenyFeedbackBuilder.class.st b/repository/OpenPonk-Roassal/OPRSAcceptDenyFeedbackBuilder.class.st similarity index 96% rename from repository/OpenPonk-Roassal3/OPRSAcceptDenyFeedbackBuilder.class.st rename to repository/OpenPonk-Roassal/OPRSAcceptDenyFeedbackBuilder.class.st index 795215090..cc73ac3c6 100644 --- a/repository/OpenPonk-Roassal3/OPRSAcceptDenyFeedbackBuilder.class.st +++ b/repository/OpenPonk-Roassal/OPRSAcceptDenyFeedbackBuilder.class.st @@ -4,7 +4,7 @@ Class { #instVars : [ 'feedback' ], - #category : #'OpenPonk-Roassal3-CreationFeedback' + #category : #'OpenPonk-Roassal-CreationFeedback' } { #category : #'as yet unclassified' } diff --git a/repository/OpenPonk-Roassal3/OPRSAdornment.class.st b/repository/OpenPonk-Roassal/OPRSAdornment.class.st similarity index 98% rename from repository/OpenPonk-Roassal3/OPRSAdornment.class.st rename to repository/OpenPonk-Roassal/OPRSAdornment.class.st index 3c5b8b15f..eeffd457f 100644 --- a/repository/OpenPonk-Roassal3/OPRSAdornment.class.st +++ b/repository/OpenPonk-Roassal/OPRSAdornment.class.st @@ -7,7 +7,7 @@ Class { 'shape', 'padding' ], - #category : #'OpenPonk-Roassal3-Interactions' + #category : #'OpenPonk-Roassal-Interactions' } { #category : #'instance creation' } diff --git a/repository/OpenPonk-Roassal3/OPRSAdornmentBuilder.class.st b/repository/OpenPonk-Roassal/OPRSAdornmentBuilder.class.st similarity index 97% rename from repository/OpenPonk-Roassal3/OPRSAdornmentBuilder.class.st rename to repository/OpenPonk-Roassal/OPRSAdornmentBuilder.class.st index a8bb96511..9d2a9b60f 100644 --- a/repository/OpenPonk-Roassal3/OPRSAdornmentBuilder.class.st +++ b/repository/OpenPonk-Roassal/OPRSAdornmentBuilder.class.st @@ -8,7 +8,7 @@ Class { 'verticalLocation', 'horizontalLocation' ], - #category : #'OpenPonk-Roassal3-Interactions' + #category : #'OpenPonk-Roassal-Interactions' } { #category : #adding } diff --git a/repository/OpenPonk-Roassal3/OPRSAnchorConstraint.class.st b/repository/OpenPonk-Roassal/OPRSAnchorConstraint.class.st similarity index 99% rename from repository/OpenPonk-Roassal3/OPRSAnchorConstraint.class.st rename to repository/OpenPonk-Roassal/OPRSAnchorConstraint.class.st index 021024706..4a87a4052 100644 --- a/repository/OpenPonk-Roassal3/OPRSAnchorConstraint.class.st +++ b/repository/OpenPonk-Roassal/OPRSAnchorConstraint.class.st @@ -11,7 +11,7 @@ Class { 'positionReference', 'alwaysShowGuideLine' ], - #category : #'OpenPonk-Roassal3-AnchorConstraint' + #category : #'OpenPonk-Roassal-AnchorConstraint' } { #category : #building } diff --git a/repository/OpenPonk-Roassal3/OPRSAnchorConstraintBalanceReference.class.st b/repository/OpenPonk-Roassal/OPRSAnchorConstraintBalanceReference.class.st similarity index 96% rename from repository/OpenPonk-Roassal3/OPRSAnchorConstraintBalanceReference.class.st rename to repository/OpenPonk-Roassal/OPRSAnchorConstraintBalanceReference.class.st index 1d174f9cf..705eb1062 100644 --- a/repository/OpenPonk-Roassal3/OPRSAnchorConstraintBalanceReference.class.st +++ b/repository/OpenPonk-Roassal/OPRSAnchorConstraintBalanceReference.class.st @@ -4,7 +4,7 @@ Class { #instVars : [ 'balance' ], - #category : #'OpenPonk-Roassal3-AnchorConstraint' + #category : #'OpenPonk-Roassal-AnchorConstraint' } { #category : #'instance creation' } diff --git a/repository/OpenPonk-Roassal3/OPRSAnchorConstraintEndDistanceReference.class.st b/repository/OpenPonk-Roassal/OPRSAnchorConstraintEndDistanceReference.class.st similarity index 94% rename from repository/OpenPonk-Roassal3/OPRSAnchorConstraintEndDistanceReference.class.st rename to repository/OpenPonk-Roassal/OPRSAnchorConstraintEndDistanceReference.class.st index fcb4db73e..124c4f976 100644 --- a/repository/OpenPonk-Roassal3/OPRSAnchorConstraintEndDistanceReference.class.st +++ b/repository/OpenPonk-Roassal/OPRSAnchorConstraintEndDistanceReference.class.st @@ -1,7 +1,7 @@ Class { #name : #OPRSAnchorConstraintEndDistanceReference, #superclass : #OPRSAnchorConstraintFixedDistanceReference, - #category : #'OpenPonk-Roassal3-AnchorConstraint' + #category : #'OpenPonk-Roassal-AnchorConstraint' } { #category : #'as yet unclassified' } diff --git a/repository/OpenPonk-Roassal3/OPRSAnchorConstraintFixedDistanceReference.class.st b/repository/OpenPonk-Roassal/OPRSAnchorConstraintFixedDistanceReference.class.st similarity index 97% rename from repository/OpenPonk-Roassal3/OPRSAnchorConstraintFixedDistanceReference.class.st rename to repository/OpenPonk-Roassal/OPRSAnchorConstraintFixedDistanceReference.class.st index 7e741e653..993837192 100644 --- a/repository/OpenPonk-Roassal3/OPRSAnchorConstraintFixedDistanceReference.class.st +++ b/repository/OpenPonk-Roassal/OPRSAnchorConstraintFixedDistanceReference.class.st @@ -4,7 +4,7 @@ Class { #instVars : [ 'distance' ], - #category : #'OpenPonk-Roassal3-AnchorConstraint' + #category : #'OpenPonk-Roassal-AnchorConstraint' } { #category : #accessing } diff --git a/repository/OpenPonk-Roassal3/OPRSAnchorConstraintNearestPoint.class.st b/repository/OpenPonk-Roassal/OPRSAnchorConstraintNearestPoint.class.st similarity index 97% rename from repository/OpenPonk-Roassal3/OPRSAnchorConstraintNearestPoint.class.st rename to repository/OpenPonk-Roassal/OPRSAnchorConstraintNearestPoint.class.st index 14e1af9d0..c71704fca 100644 --- a/repository/OpenPonk-Roassal3/OPRSAnchorConstraintNearestPoint.class.st +++ b/repository/OpenPonk-Roassal/OPRSAnchorConstraintNearestPoint.class.st @@ -7,7 +7,7 @@ Class { 'previousSegmentsLength', 'lineLength' ], - #category : #'OpenPonk-Roassal3-AnchorConstraint' + #category : #'OpenPonk-Roassal-AnchorConstraint' } { #category : #calculated } diff --git a/repository/OpenPonk-Roassal3/OPRSAnchorConstraintReference.class.st b/repository/OpenPonk-Roassal/OPRSAnchorConstraintReference.class.st similarity index 93% rename from repository/OpenPonk-Roassal3/OPRSAnchorConstraintReference.class.st rename to repository/OpenPonk-Roassal/OPRSAnchorConstraintReference.class.st index 3c7169a89..3777fb00c 100644 --- a/repository/OpenPonk-Roassal3/OPRSAnchorConstraintReference.class.st +++ b/repository/OpenPonk-Roassal/OPRSAnchorConstraintReference.class.st @@ -1,7 +1,7 @@ Class { #name : #OPRSAnchorConstraintReference, #superclass : #RSObject, - #category : #'OpenPonk-Roassal3-AnchorConstraint' + #category : #'OpenPonk-Roassal-AnchorConstraint' } { #category : #'as yet unclassified' } diff --git a/repository/OpenPonk-Roassal3/OPRSAnchorConstraintSegment.class.st b/repository/OpenPonk-Roassal/OPRSAnchorConstraintSegment.class.st similarity index 98% rename from repository/OpenPonk-Roassal3/OPRSAnchorConstraintSegment.class.st rename to repository/OpenPonk-Roassal/OPRSAnchorConstraintSegment.class.st index 3650c1ed6..7ef9a3744 100644 Binary files a/repository/OpenPonk-Roassal3/OPRSAnchorConstraintSegment.class.st and b/repository/OpenPonk-Roassal/OPRSAnchorConstraintSegment.class.st differ diff --git a/repository/OpenPonk-Roassal3/OPRSAnchorConstraintStartDistanceReference.class.st b/repository/OpenPonk-Roassal/OPRSAnchorConstraintStartDistanceReference.class.st similarity index 94% rename from repository/OpenPonk-Roassal3/OPRSAnchorConstraintStartDistanceReference.class.st rename to repository/OpenPonk-Roassal/OPRSAnchorConstraintStartDistanceReference.class.st index cf1a9b615..f68e16bea 100644 --- a/repository/OpenPonk-Roassal3/OPRSAnchorConstraintStartDistanceReference.class.st +++ b/repository/OpenPonk-Roassal/OPRSAnchorConstraintStartDistanceReference.class.st @@ -1,7 +1,7 @@ Class { #name : #OPRSAnchorConstraintStartDistanceReference, #superclass : #OPRSAnchorConstraintFixedDistanceReference, - #category : #'OpenPonk-Roassal3-AnchorConstraint' + #category : #'OpenPonk-Roassal-AnchorConstraint' } { #category : #'as yet unclassified' } diff --git a/repository/OpenPonk-Roassal3/OPRSAnchorConstraintUpdater.class.st b/repository/OpenPonk-Roassal/OPRSAnchorConstraintUpdater.class.st similarity index 99% rename from repository/OpenPonk-Roassal3/OPRSAnchorConstraintUpdater.class.st rename to repository/OpenPonk-Roassal/OPRSAnchorConstraintUpdater.class.st index 0b2ca10da..74abeaaec 100644 --- a/repository/OpenPonk-Roassal3/OPRSAnchorConstraintUpdater.class.st +++ b/repository/OpenPonk-Roassal/OPRSAnchorConstraintUpdater.class.st @@ -14,7 +14,7 @@ Class { 'extraDistance', 'positionReference' ], - #category : #'OpenPonk-Roassal3-AnchorConstraint' + #category : #'OpenPonk-Roassal-AnchorConstraint' } { #category : #building } diff --git a/repository/OpenPonk-Roassal3/OPRSBezier.class.st b/repository/OpenPonk-Roassal/OPRSBezier.class.st similarity index 87% rename from repository/OpenPonk-Roassal3/OPRSBezier.class.st rename to repository/OpenPonk-Roassal/OPRSBezier.class.st index 57ec90e79..bbe78d2cd 100644 --- a/repository/OpenPonk-Roassal3/OPRSBezier.class.st +++ b/repository/OpenPonk-Roassal/OPRSBezier.class.st @@ -1,7 +1,7 @@ Class { #name : #OPRSBezier, #superclass : #RSBezier, - #category : #'OpenPonk-Roassal3-Polyline' + #category : #'OpenPonk-Roassal-Polyline' } { #category : #accessing } @@ -10,7 +10,7 @@ OPRSBezier >> includedRadius [ ^ super includedRadius + 3 ] -{ #category : #'*OpenPonk-Roassal3' } +{ #category : #private } OPRSBezier >> lines [ | c b a via1 via2 start end cp | diff --git a/repository/OpenPonk-Roassal3/OPRSCanvasADFeedback.class.st b/repository/OpenPonk-Roassal/OPRSCanvasADFeedback.class.st similarity index 84% rename from repository/OpenPonk-Roassal3/OPRSCanvasADFeedback.class.st rename to repository/OpenPonk-Roassal/OPRSCanvasADFeedback.class.st index f2a23ce0f..e09378332 100644 --- a/repository/OpenPonk-Roassal3/OPRSCanvasADFeedback.class.st +++ b/repository/OpenPonk-Roassal/OPRSCanvasADFeedback.class.st @@ -1,7 +1,7 @@ Class { #name : #OPRSCanvasADFeedback, #superclass : #OPRSAcceptDenyFeedbackBuilder, - #category : #'OpenPonk-Roassal3-CreationFeedback' + #category : #'OpenPonk-Roassal-CreationFeedback' } { #category : #private } diff --git a/repository/OpenPonk-Roassal3/OPRSConditionallyDraggable.class.st b/repository/OpenPonk-Roassal/OPRSConditionallyDraggable.class.st similarity index 93% rename from repository/OpenPonk-Roassal3/OPRSConditionallyDraggable.class.st rename to repository/OpenPonk-Roassal/OPRSConditionallyDraggable.class.st index 3a8f39cef..259964f01 100644 --- a/repository/OpenPonk-Roassal3/OPRSConditionallyDraggable.class.st +++ b/repository/OpenPonk-Roassal/OPRSConditionallyDraggable.class.st @@ -4,7 +4,7 @@ Class { #instVars : [ 'conditionBlock' ], - #category : #'OpenPonk-Roassal3-Interactions' + #category : #'OpenPonk-Roassal-Interactions' } { #category : #initialization } diff --git a/repository/OpenPonk-Roassal3/OPRSControlConfiguration.class.st b/repository/OpenPonk-Roassal/OPRSControlConfiguration.class.st similarity index 98% rename from repository/OpenPonk-Roassal3/OPRSControlConfiguration.class.st rename to repository/OpenPonk-Roassal/OPRSControlConfiguration.class.st index eb4874d11..3c205cda8 100644 --- a/repository/OpenPonk-Roassal3/OPRSControlConfiguration.class.st +++ b/repository/OpenPonk-Roassal/OPRSControlConfiguration.class.st @@ -12,7 +12,7 @@ Class { 'dragAttachmentMargin', 'dragSnapComparisonsAmount' ], - #category : #'OpenPonk-Roassal3-Interactions' + #category : #'OpenPonk-Roassal-Interactions' } { #category : #accessing } diff --git a/repository/OpenPonk-Roassal3/OPRSControlPointCreatorHandle.class.st b/repository/OpenPonk-Roassal/OPRSControlPointCreatorHandle.class.st similarity index 98% rename from repository/OpenPonk-Roassal3/OPRSControlPointCreatorHandle.class.st rename to repository/OpenPonk-Roassal/OPRSControlPointCreatorHandle.class.st index b48a42bf8..a1756deef 100644 --- a/repository/OpenPonk-Roassal3/OPRSControlPointCreatorHandle.class.st +++ b/repository/OpenPonk-Roassal/OPRSControlPointCreatorHandle.class.st @@ -7,7 +7,7 @@ Class { 'nearStart', 'nearEnd' ], - #category : #'OpenPonk-Roassal3-Polyline' + #category : #'OpenPonk-Roassal-Polyline' } { #category : #'as yet unclassified' } diff --git a/repository/OpenPonk-Roassal3/OPRSCustomScaleCamSetter.class.st b/repository/OpenPonk-Roassal/OPRSCustomScaleCamSetter.class.st similarity index 96% rename from repository/OpenPonk-Roassal3/OPRSCustomScaleCamSetter.class.st rename to repository/OpenPonk-Roassal/OPRSCustomScaleCamSetter.class.st index 65a1b0e20..e0a5befbd 100644 --- a/repository/OpenPonk-Roassal3/OPRSCustomScaleCamSetter.class.st +++ b/repository/OpenPonk-Roassal/OPRSCustomScaleCamSetter.class.st @@ -5,7 +5,7 @@ Class { 'scale', 'padding' ], - #category : #'OpenPonk-Roassal3-Exports' + #category : #'OpenPonk-Roassal-Exports' } { #category : #accessing } diff --git a/repository/OpenPonk-Roassal3/OPRSDragFromSelectionEnd.class.st b/repository/OpenPonk-Roassal/OPRSDragFromSelectionEnd.class.st similarity index 64% rename from repository/OpenPonk-Roassal3/OPRSDragFromSelectionEnd.class.st rename to repository/OpenPonk-Roassal/OPRSDragFromSelectionEnd.class.st index 16d324381..14833100c 100644 --- a/repository/OpenPonk-Roassal3/OPRSDragFromSelectionEnd.class.st +++ b/repository/OpenPonk-Roassal/OPRSDragFromSelectionEnd.class.st @@ -1,5 +1,5 @@ Class { #name : #OPRSDragFromSelectionEnd, #superclass : #RSAbstractMouseEvent, - #category : #'OpenPonk-Roassal3-Interactions' + #category : #'OpenPonk-Roassal-Interactions' } diff --git a/repository/OpenPonk-Roassal3/OPRSDragFromSelectionStart.class.st b/repository/OpenPonk-Roassal/OPRSDragFromSelectionStart.class.st similarity index 64% rename from repository/OpenPonk-Roassal3/OPRSDragFromSelectionStart.class.st rename to repository/OpenPonk-Roassal/OPRSDragFromSelectionStart.class.st index 12c405315..75ef526d6 100644 --- a/repository/OpenPonk-Roassal3/OPRSDragFromSelectionStart.class.st +++ b/repository/OpenPonk-Roassal/OPRSDragFromSelectionStart.class.st @@ -1,5 +1,5 @@ Class { #name : #OPRSDragFromSelectionStart, #superclass : #RSAbstractMouseEvent, - #category : #'OpenPonk-Roassal3-Interactions' + #category : #'OpenPonk-Roassal-Interactions' } diff --git a/repository/OpenPonk-Roassal3/OPRSDraggableCPController.class.st b/repository/OpenPonk-Roassal/OPRSDraggableCPController.class.st similarity index 98% rename from repository/OpenPonk-Roassal3/OPRSDraggableCPController.class.st rename to repository/OpenPonk-Roassal/OPRSDraggableCPController.class.st index 6a71038f3..be85bfcb0 100644 --- a/repository/OpenPonk-Roassal3/OPRSDraggableCPController.class.st +++ b/repository/OpenPonk-Roassal/OPRSDraggableCPController.class.st @@ -4,7 +4,7 @@ Class { #instVars : [ 'selfLineDistance' ], - #category : #'OpenPonk-Roassal3-Polyline' + #category : #'OpenPonk-Roassal-Polyline' } { #category : #'instance creation' } diff --git a/repository/OpenPonk-Roassal3/OPRSDraggableControlPointHandle.class.st b/repository/OpenPonk-Roassal/OPRSDraggableControlPointHandle.class.st similarity index 98% rename from repository/OpenPonk-Roassal3/OPRSDraggableControlPointHandle.class.st rename to repository/OpenPonk-Roassal/OPRSDraggableControlPointHandle.class.st index 867b986d9..4588938d7 100644 --- a/repository/OpenPonk-Roassal3/OPRSDraggableControlPointHandle.class.st +++ b/repository/OpenPonk-Roassal/OPRSDraggableControlPointHandle.class.st @@ -4,7 +4,7 @@ Class { #instVars : [ 'indexOfControlPoint' ], - #category : #'OpenPonk-Roassal3-Polyline' + #category : #'OpenPonk-Roassal-Polyline' } { #category : #accessing } diff --git a/repository/OpenPonk-Roassal3/OPRSDraggableControlPoints.class.st b/repository/OpenPonk-Roassal/OPRSDraggableControlPoints.class.st similarity index 98% rename from repository/OpenPonk-Roassal3/OPRSDraggableControlPoints.class.st rename to repository/OpenPonk-Roassal/OPRSDraggableControlPoints.class.st index b828bdfaa..3f6283ee3 100644 --- a/repository/OpenPonk-Roassal3/OPRSDraggableControlPoints.class.st +++ b/repository/OpenPonk-Roassal/OPRSDraggableControlPoints.class.st @@ -8,7 +8,7 @@ Class { 'line', 'canvas' ], - #category : #'OpenPonk-Roassal3-Polyline' + #category : #'OpenPonk-Roassal-Polyline' } { #category : #private } diff --git a/repository/OpenPonk-Roassal3/OPRSDraggedControlPointsEvent.class.st b/repository/OpenPonk-Roassal/OPRSDraggedControlPointsEvent.class.st similarity index 67% rename from repository/OpenPonk-Roassal3/OPRSDraggedControlPointsEvent.class.st rename to repository/OpenPonk-Roassal/OPRSDraggedControlPointsEvent.class.st index 225171a25..743b7d251 100644 --- a/repository/OpenPonk-Roassal3/OPRSDraggedControlPointsEvent.class.st +++ b/repository/OpenPonk-Roassal/OPRSDraggedControlPointsEvent.class.st @@ -1,5 +1,5 @@ Class { #name : #OPRSDraggedControlPointsEvent, #superclass : #RSPositionChangedEvent, - #category : #'OpenPonk-Roassal3-Polyline' + #category : #'OpenPonk-Roassal-Polyline' } diff --git a/repository/OpenPonk-Roassal3/OPRSEmptyMarker.class.st b/repository/OpenPonk-Roassal/OPRSEmptyMarker.class.st similarity index 85% rename from repository/OpenPonk-Roassal3/OPRSEmptyMarker.class.st rename to repository/OpenPonk-Roassal/OPRSEmptyMarker.class.st index dcc932f1a..af5d96839 100644 --- a/repository/OpenPonk-Roassal3/OPRSEmptyMarker.class.st +++ b/repository/OpenPonk-Roassal/OPRSEmptyMarker.class.st @@ -1,7 +1,7 @@ Class { #name : #OPRSEmptyMarker, #superclass : #RSMarker, - #category : #'OpenPonk-Roassal3-Markers' + #category : #'OpenPonk-Roassal-Markers' } { #category : #converting } diff --git a/repository/OpenPonk-Roassal3/OPRSEmptyMarkerBuilder.class.st b/repository/OpenPonk-Roassal/OPRSEmptyMarkerBuilder.class.st similarity index 87% rename from repository/OpenPonk-Roassal3/OPRSEmptyMarkerBuilder.class.st rename to repository/OpenPonk-Roassal/OPRSEmptyMarkerBuilder.class.st index 6aed7471f..1faf50032 100644 --- a/repository/OpenPonk-Roassal3/OPRSEmptyMarkerBuilder.class.st +++ b/repository/OpenPonk-Roassal/OPRSEmptyMarkerBuilder.class.st @@ -1,7 +1,7 @@ Class { #name : #OPRSEmptyMarkerBuilder, #superclass : #OPRSMarkerBuilder, - #category : #'OpenPonk-Roassal3-Markers' + #category : #'OpenPonk-Roassal-Markers' } { #category : #examples } diff --git a/repository/OpenPonk-Roassal3/OPRSEmptyShapeProxy.class.st b/repository/OpenPonk-Roassal/OPRSEmptyShapeProxy.class.st similarity index 93% rename from repository/OpenPonk-Roassal3/OPRSEmptyShapeProxy.class.st rename to repository/OpenPonk-Roassal/OPRSEmptyShapeProxy.class.st index 16715976c..a8031dfcb 100644 --- a/repository/OpenPonk-Roassal3/OPRSEmptyShapeProxy.class.st +++ b/repository/OpenPonk-Roassal/OPRSEmptyShapeProxy.class.st @@ -4,7 +4,7 @@ Class { #instVars : [ 'shape' ], - #category : #'OpenPonk-Roassal3-Markers' + #category : #'OpenPonk-Roassal-Markers' } { #category : #accessing } diff --git a/repository/OpenPonk-Roassal3/OPRSKeyNavigationCanvasInteraction.class.st b/repository/OpenPonk-Roassal/OPRSKeyNavigationCanvasInteraction.class.st similarity index 91% rename from repository/OpenPonk-Roassal3/OPRSKeyNavigationCanvasInteraction.class.st rename to repository/OpenPonk-Roassal/OPRSKeyNavigationCanvasInteraction.class.st index ac846322f..e50481821 100644 --- a/repository/OpenPonk-Roassal3/OPRSKeyNavigationCanvasInteraction.class.st +++ b/repository/OpenPonk-Roassal/OPRSKeyNavigationCanvasInteraction.class.st @@ -1,7 +1,7 @@ Class { #name : #OPRSKeyNavigationCanvasInteraction, #superclass : #RSKeyNavigationCanvasInteraction, - #category : #'OpenPonk-Roassal3-Interactions' + #category : #'OpenPonk-Roassal-Interactions' } { #category : #events } diff --git a/repository/OpenPonk-Roassal3/OPRSLabeled.class.st b/repository/OpenPonk-Roassal/OPRSLabeled.class.st similarity index 96% rename from repository/OpenPonk-Roassal3/OPRSLabeled.class.st rename to repository/OpenPonk-Roassal/OPRSLabeled.class.st index e5d259ff9..2f09e480a 100644 --- a/repository/OpenPonk-Roassal3/OPRSLabeled.class.st +++ b/repository/OpenPonk-Roassal/OPRSLabeled.class.st @@ -5,7 +5,7 @@ Class { 'shape', 'labelShape' ], - #category : #'OpenPonk-Roassal3-Interactions' + #category : #'OpenPonk-Roassal-Interactions' } { #category : #accessing } diff --git a/repository/OpenPonk-Roassal3/OPRSLineADFeedback.class.st b/repository/OpenPonk-Roassal/OPRSLineADFeedback.class.st similarity index 94% rename from repository/OpenPonk-Roassal3/OPRSLineADFeedback.class.st rename to repository/OpenPonk-Roassal/OPRSLineADFeedback.class.st index ce11d21e6..ced0243cf 100644 --- a/repository/OpenPonk-Roassal3/OPRSLineADFeedback.class.st +++ b/repository/OpenPonk-Roassal/OPRSLineADFeedback.class.st @@ -1,7 +1,7 @@ Class { #name : #OPRSLineADFeedback, #superclass : #OPRSAcceptDenyFeedbackBuilder, - #category : #'OpenPonk-Roassal3-CreationFeedback' + #category : #'OpenPonk-Roassal-CreationFeedback' } { #category : #private } diff --git a/repository/OpenPonk-Roassal3/OPRSMarkerBuilder.class.st b/repository/OpenPonk-Roassal/OPRSMarkerBuilder.class.st similarity index 98% rename from repository/OpenPonk-Roassal3/OPRSMarkerBuilder.class.st rename to repository/OpenPonk-Roassal/OPRSMarkerBuilder.class.st index a6a9445e0..72995788c 100644 --- a/repository/OpenPonk-Roassal3/OPRSMarkerBuilder.class.st +++ b/repository/OpenPonk-Roassal/OPRSMarkerBuilder.class.st @@ -1,7 +1,7 @@ Class { #name : #OPRSMarkerBuilder, #superclass : #Object, - #category : #'OpenPonk-Roassal3-Markers' + #category : #'OpenPonk-Roassal-Markers' } { #category : #shapes } diff --git a/repository/OpenPonk-Roassal3/OPRSNoInteraction.class.st b/repository/OpenPonk-Roassal/OPRSNoInteraction.class.st similarity index 76% rename from repository/OpenPonk-Roassal3/OPRSNoInteraction.class.st rename to repository/OpenPonk-Roassal/OPRSNoInteraction.class.st index f405c5e64..1e2a221bb 100644 --- a/repository/OpenPonk-Roassal3/OPRSNoInteraction.class.st +++ b/repository/OpenPonk-Roassal/OPRSNoInteraction.class.st @@ -1,7 +1,7 @@ Class { #name : #OPRSNoInteraction, #superclass : #RSInteraction, - #category : #'OpenPonk-Roassal3-Interactions' + #category : #'OpenPonk-Roassal-Interactions' } { #category : #hooks } diff --git a/repository/OpenPonk-Roassal3/OPRSNodeADFeedback.class.st b/repository/OpenPonk-Roassal/OPRSNodeADFeedback.class.st similarity index 94% rename from repository/OpenPonk-Roassal3/OPRSNodeADFeedback.class.st rename to repository/OpenPonk-Roassal/OPRSNodeADFeedback.class.st index 0032981f3..f3dd45caa 100644 --- a/repository/OpenPonk-Roassal3/OPRSNodeADFeedback.class.st +++ b/repository/OpenPonk-Roassal/OPRSNodeADFeedback.class.st @@ -1,7 +1,7 @@ Class { #name : #OPRSNodeADFeedback, #superclass : #OPRSAcceptDenyFeedbackBuilder, - #category : #'OpenPonk-Roassal3-CreationFeedback' + #category : #'OpenPonk-Roassal-CreationFeedback' } { #category : #private } diff --git a/repository/OpenPonk-Roassal3/OPRSOrthogonalBorderAttachPoint.class.st b/repository/OpenPonk-Roassal/OPRSOrthogonalBorderAttachPoint.class.st similarity index 98% rename from repository/OpenPonk-Roassal3/OPRSOrthogonalBorderAttachPoint.class.st rename to repository/OpenPonk-Roassal/OPRSOrthogonalBorderAttachPoint.class.st index bf5ae95eb..08ee26abe 100644 --- a/repository/OpenPonk-Roassal3/OPRSOrthogonalBorderAttachPoint.class.st +++ b/repository/OpenPonk-Roassal/OPRSOrthogonalBorderAttachPoint.class.st @@ -1,7 +1,7 @@ Class { #name : #OPRSOrthogonalBorderAttachPoint, #superclass : #RSBorderAttachPoint, - #category : #'OpenPonk-Roassal3-AttachPoints' + #category : #'OpenPonk-Roassal-AttachPoints' } { #category : #'public - hooks' } diff --git a/repository/OpenPonk-Roassal3/OPRSPolyline.class.st b/repository/OpenPonk-Roassal/OPRSPolyline.class.st similarity index 79% rename from repository/OpenPonk-Roassal3/OPRSPolyline.class.st rename to repository/OpenPonk-Roassal/OPRSPolyline.class.st index 88c06f991..71949aefd 100644 --- a/repository/OpenPonk-Roassal3/OPRSPolyline.class.st +++ b/repository/OpenPonk-Roassal/OPRSPolyline.class.st @@ -1,7 +1,7 @@ Class { #name : #OPRSPolyline, #superclass : #RSPolyline, - #category : #'OpenPonk-Roassal3-Polyline' + #category : #'OpenPonk-Roassal-Polyline' } { #category : #'as yet unclassified' } diff --git a/repository/OpenPonk-Roassal3/OPRSRemoveable.class.st b/repository/OpenPonk-Roassal/OPRSRemoveable.class.st similarity index 96% rename from repository/OpenPonk-Roassal3/OPRSRemoveable.class.st rename to repository/OpenPonk-Roassal/OPRSRemoveable.class.st index 5aa7fac61..5b53ce06e 100644 --- a/repository/OpenPonk-Roassal3/OPRSRemoveable.class.st +++ b/repository/OpenPonk-Roassal/OPRSRemoveable.class.st @@ -1,7 +1,7 @@ Class { #name : #OPRSRemoveable, #superclass : #RSAbstractControlCanvasInteraction, - #category : #'OpenPonk-Roassal3-Interactions' + #category : #'OpenPonk-Roassal-Interactions' } { #category : #testing } diff --git a/repository/OpenPonk-Roassal3/OPRSResizable.class.st b/repository/OpenPonk-Roassal/OPRSResizable.class.st similarity index 98% rename from repository/OpenPonk-Roassal3/OPRSResizable.class.st rename to repository/OpenPonk-Roassal/OPRSResizable.class.st index 0f5acb742..ca72a3e61 100644 --- a/repository/OpenPonk-Roassal3/OPRSResizable.class.st +++ b/repository/OpenPonk-Roassal/OPRSResizable.class.st @@ -5,7 +5,7 @@ Class { 'shape', 'handles' ], - #category : #'OpenPonk-Roassal3-Interactions' + #category : #'OpenPonk-Roassal-Interactions' } { #category : #accessing } diff --git a/repository/OpenPonk-Roassal3/OPRSResize.class.st b/repository/OpenPonk-Roassal/OPRSResize.class.st similarity index 93% rename from repository/OpenPonk-Roassal3/OPRSResize.class.st rename to repository/OpenPonk-Roassal/OPRSResize.class.st index a951ba895..11ff29b51 100644 --- a/repository/OpenPonk-Roassal3/OPRSResize.class.st +++ b/repository/OpenPonk-Roassal/OPRSResize.class.st @@ -4,7 +4,7 @@ Class { #instVars : [ 'oversize' ], - #category : #'OpenPonk-Roassal3-Interactions' + #category : #'OpenPonk-Roassal-Interactions' } { #category : #accessing } diff --git a/repository/OpenPonk-Roassal3/OPRSSelectable.class.st b/repository/OpenPonk-Roassal/OPRSSelectable.class.st similarity index 98% rename from repository/OpenPonk-Roassal3/OPRSSelectable.class.st rename to repository/OpenPonk-Roassal/OPRSSelectable.class.st index 1fca6f3b6..6f2456e36 100644 --- a/repository/OpenPonk-Roassal3/OPRSSelectable.class.st +++ b/repository/OpenPonk-Roassal/OPRSSelectable.class.st @@ -1,7 +1,7 @@ Class { #name : #OPRSSelectable, #superclass : #RSHighlightable, - #category : #'OpenPonk-Roassal3-Interactions' + #category : #'OpenPonk-Roassal-Interactions' } { #category : #accessing } diff --git a/repository/OpenPonk-Roassal3/OPRSSelectableCanvas.class.st b/repository/OpenPonk-Roassal/OPRSSelectableCanvas.class.st similarity index 98% rename from repository/OpenPonk-Roassal3/OPRSSelectableCanvas.class.st rename to repository/OpenPonk-Roassal/OPRSSelectableCanvas.class.st index 10f8fc708..8ea78b686 100644 --- a/repository/OpenPonk-Roassal3/OPRSSelectableCanvas.class.st +++ b/repository/OpenPonk-Roassal/OPRSSelectableCanvas.class.st @@ -4,7 +4,7 @@ Class { #instVars : [ 'multiselectEnabled' ], - #category : #'OpenPonk-Roassal3-Interactions' + #category : #'OpenPonk-Roassal-Interactions' } { #category : #'event processing' } diff --git a/repository/OpenPonk-Roassal3/OPRSSelectionDraggable.class.st b/repository/OpenPonk-Roassal/OPRSSelectionDraggable.class.st similarity index 99% rename from repository/OpenPonk-Roassal3/OPRSSelectionDraggable.class.st rename to repository/OpenPonk-Roassal/OPRSSelectionDraggable.class.st index 33e858123..9e57cb006 100644 --- a/repository/OpenPonk-Roassal3/OPRSSelectionDraggable.class.st +++ b/repository/OpenPonk-Roassal/OPRSSelectionDraggable.class.st @@ -8,7 +8,7 @@ Class { 'movedLinesWithControlPoints', 'alignmentLineShapes' ], - #category : #'OpenPonk-Roassal3-Interactions' + #category : #'OpenPonk-Roassal-Interactions' } { #category : #'instance creation' } diff --git a/repository/OpenPonk-Roassal3/OPRSSelectionDraggableBorder.class.st b/repository/OpenPonk-Roassal/OPRSSelectionDraggableBorder.class.st similarity index 99% rename from repository/OpenPonk-Roassal3/OPRSSelectionDraggableBorder.class.st rename to repository/OpenPonk-Roassal/OPRSSelectionDraggableBorder.class.st index 4dad084e8..87ef2a412 100644 --- a/repository/OpenPonk-Roassal3/OPRSSelectionDraggableBorder.class.st +++ b/repository/OpenPonk-Roassal/OPRSSelectionDraggableBorder.class.st @@ -8,7 +8,7 @@ Class { 'positionOfMainRelativeToDragBoxes', 'dragBoxWidth' ], - #category : #'OpenPonk-Roassal3-Interactions' + #category : #'OpenPonk-Roassal-Interactions' } { #category : #hooks } diff --git a/repository/OpenPonk-Roassal3/OPRSSelectionDraggableContainedShapesProvider.class.st b/repository/OpenPonk-Roassal/OPRSSelectionDraggableContainedShapesProvider.class.st similarity index 92% rename from repository/OpenPonk-Roassal3/OPRSSelectionDraggableContainedShapesProvider.class.st rename to repository/OpenPonk-Roassal/OPRSSelectionDraggableContainedShapesProvider.class.st index 2ef0d3692..8c608014e 100644 --- a/repository/OpenPonk-Roassal3/OPRSSelectionDraggableContainedShapesProvider.class.st +++ b/repository/OpenPonk-Roassal/OPRSSelectionDraggableContainedShapesProvider.class.st @@ -1,7 +1,7 @@ Class { #name : #OPRSSelectionDraggableContainedShapesProvider, #superclass : #OPRSSelectionDraggableInnerShapesProvider, - #category : #'OpenPonk-Roassal3-Interactions' + #category : #'OpenPonk-Roassal-Interactions' } { #category : #asserting } diff --git a/repository/OpenPonk-Roassal3/OPRSSelectionDraggableCustomShapesProvider.class.st b/repository/OpenPonk-Roassal/OPRSSelectionDraggableCustomShapesProvider.class.st similarity index 94% rename from repository/OpenPonk-Roassal3/OPRSSelectionDraggableCustomShapesProvider.class.st rename to repository/OpenPonk-Roassal/OPRSSelectionDraggableCustomShapesProvider.class.st index a5834954c..b226b74e8 100644 --- a/repository/OpenPonk-Roassal3/OPRSSelectionDraggableCustomShapesProvider.class.st +++ b/repository/OpenPonk-Roassal/OPRSSelectionDraggableCustomShapesProvider.class.st @@ -4,7 +4,7 @@ Class { #instVars : [ 'block' ], - #category : #'OpenPonk-Roassal3-Interactions' + #category : #'OpenPonk-Roassal-Interactions' } { #category : #'instance creation' } diff --git a/repository/OpenPonk-Roassal3/OPRSSelectionDraggableInnerShapesProvider.class.st b/repository/OpenPonk-Roassal/OPRSSelectionDraggableInnerShapesProvider.class.st similarity index 82% rename from repository/OpenPonk-Roassal3/OPRSSelectionDraggableInnerShapesProvider.class.st rename to repository/OpenPonk-Roassal/OPRSSelectionDraggableInnerShapesProvider.class.st index d2ee4126d..8ad4b5d96 100644 --- a/repository/OpenPonk-Roassal3/OPRSSelectionDraggableInnerShapesProvider.class.st +++ b/repository/OpenPonk-Roassal/OPRSSelectionDraggableInnerShapesProvider.class.st @@ -1,7 +1,7 @@ Class { #name : #OPRSSelectionDraggableInnerShapesProvider, #superclass : #Object, - #category : #'OpenPonk-Roassal3-Interactions' + #category : #'OpenPonk-Roassal-Interactions' } { #category : #asserting } diff --git a/repository/OpenPonk-Roassal3/OPRSSelectionDraggableNoInnerShapesProvider.class.st b/repository/OpenPonk-Roassal/OPRSSelectionDraggableNoInnerShapesProvider.class.st similarity index 84% rename from repository/OpenPonk-Roassal3/OPRSSelectionDraggableNoInnerShapesProvider.class.st rename to repository/OpenPonk-Roassal/OPRSSelectionDraggableNoInnerShapesProvider.class.st index 5dddf00c2..7dff5bc4e 100644 --- a/repository/OpenPonk-Roassal3/OPRSSelectionDraggableNoInnerShapesProvider.class.st +++ b/repository/OpenPonk-Roassal/OPRSSelectionDraggableNoInnerShapesProvider.class.st @@ -1,7 +1,7 @@ Class { #name : #OPRSSelectionDraggableNoInnerShapesProvider, #superclass : #OPRSSelectionDraggableInnerShapesProvider, - #category : #'OpenPonk-Roassal3-Interactions' + #category : #'OpenPonk-Roassal-Interactions' } { #category : #asserting } diff --git a/repository/OpenPonk-Roassal3/OPRSSelectionDraggableSmallerOverlappingShapesProvider.class.st b/repository/OpenPonk-Roassal/OPRSSelectionDraggableSmallerOverlappingShapesProvider.class.st similarity index 93% rename from repository/OpenPonk-Roassal3/OPRSSelectionDraggableSmallerOverlappingShapesProvider.class.st rename to repository/OpenPonk-Roassal/OPRSSelectionDraggableSmallerOverlappingShapesProvider.class.st index c35bdc138..367a1638c 100644 --- a/repository/OpenPonk-Roassal3/OPRSSelectionDraggableSmallerOverlappingShapesProvider.class.st +++ b/repository/OpenPonk-Roassal/OPRSSelectionDraggableSmallerOverlappingShapesProvider.class.st @@ -1,7 +1,7 @@ Class { #name : #OPRSSelectionDraggableSmallerOverlappingShapesProvider, #superclass : #OPRSSelectionDraggableInnerShapesProvider, - #category : #'OpenPonk-Roassal3-Interactions' + #category : #'OpenPonk-Roassal-Interactions' } { #category : #asserting } diff --git a/repository/OpenPonk-Roassal3/OPRSSelectionEndEvent.class.st b/repository/OpenPonk-Roassal/OPRSSelectionEndEvent.class.st similarity index 87% rename from repository/OpenPonk-Roassal3/OPRSSelectionEndEvent.class.st rename to repository/OpenPonk-Roassal/OPRSSelectionEndEvent.class.st index de3cf53bc..8d79d3353 100644 --- a/repository/OpenPonk-Roassal3/OPRSSelectionEndEvent.class.st +++ b/repository/OpenPonk-Roassal/OPRSSelectionEndEvent.class.st @@ -4,7 +4,7 @@ Class { #instVars : [ 'originalEvent' ], - #category : #'OpenPonk-Roassal3-Interactions' + #category : #'OpenPonk-Roassal-Interactions' } { #category : #accessing } diff --git a/repository/OpenPonk-Roassal3/OPRSZoomableCanvasInteraction.class.st b/repository/OpenPonk-Roassal/OPRSZoomableCanvasInteraction.class.st similarity index 95% rename from repository/OpenPonk-Roassal3/OPRSZoomableCanvasInteraction.class.st rename to repository/OpenPonk-Roassal/OPRSZoomableCanvasInteraction.class.st index b562194b6..7c26111f0 100644 --- a/repository/OpenPonk-Roassal3/OPRSZoomableCanvasInteraction.class.st +++ b/repository/OpenPonk-Roassal/OPRSZoomableCanvasInteraction.class.st @@ -1,7 +1,7 @@ Class { #name : #OPRSZoomableCanvasInteraction, #superclass : #RSZoomableCanvasInteraction, - #category : #'OpenPonk-Roassal3-Interactions' + #category : #'OpenPonk-Roassal-Interactions' } { #category : #events } diff --git a/repository/OpenPonk-Roassal3/OPRectangleDragAlignmentHorizontalLine.class.st b/repository/OpenPonk-Roassal/OPRectangleDragAlignmentHorizontalLine.class.st similarity index 90% rename from repository/OpenPonk-Roassal3/OPRectangleDragAlignmentHorizontalLine.class.st rename to repository/OpenPonk-Roassal/OPRectangleDragAlignmentHorizontalLine.class.st index 911b855bd..64e1502cf 100644 --- a/repository/OpenPonk-Roassal3/OPRectangleDragAlignmentHorizontalLine.class.st +++ b/repository/OpenPonk-Roassal/OPRectangleDragAlignmentHorizontalLine.class.st @@ -1,7 +1,7 @@ Class { #name : #OPRectangleDragAlignmentHorizontalLine, #superclass : #OPRectangleDragAlignmentLine, - #category : #'OpenPonk-Roassal3-Interactions' + #category : #'OpenPonk-Roassal-Interactions' } { #category : #accessing } diff --git a/repository/OpenPonk-Roassal3/OPRectangleDragAlignmentLine.class.st b/repository/OpenPonk-Roassal/OPRectangleDragAlignmentLine.class.st similarity index 97% rename from repository/OpenPonk-Roassal3/OPRectangleDragAlignmentLine.class.st rename to repository/OpenPonk-Roassal/OPRectangleDragAlignmentLine.class.st index 61b279697..7b89db756 100644 --- a/repository/OpenPonk-Roassal3/OPRectangleDragAlignmentLine.class.st +++ b/repository/OpenPonk-Roassal/OPRectangleDragAlignmentLine.class.st @@ -5,7 +5,7 @@ Class { 'dragged', 'compared' ], - #category : #'OpenPonk-Roassal3-Interactions' + #category : #'OpenPonk-Roassal-Interactions' } { #category : #'as yet unclassified' } diff --git a/repository/OpenPonk-Roassal3/OPRectangleDragAlignmentVerticalLine.class.st b/repository/OpenPonk-Roassal/OPRectangleDragAlignmentVerticalLine.class.st similarity index 91% rename from repository/OpenPonk-Roassal3/OPRectangleDragAlignmentVerticalLine.class.st rename to repository/OpenPonk-Roassal/OPRectangleDragAlignmentVerticalLine.class.st index df4d672e0..a4a58968d 100644 --- a/repository/OpenPonk-Roassal3/OPRectangleDragAlignmentVerticalLine.class.st +++ b/repository/OpenPonk-Roassal/OPRectangleDragAlignmentVerticalLine.class.st @@ -1,7 +1,7 @@ Class { #name : #OPRectangleDragAlignmentVerticalLine, #superclass : #OPRectangleDragAlignmentLine, - #category : #'OpenPonk-Roassal3-Interactions' + #category : #'OpenPonk-Roassal-Interactions' } { #category : #'as yet unclassified' } diff --git a/repository/OpenPonk-Roassal3/Point.extension.st b/repository/OpenPonk-Roassal/Point.extension.st similarity index 84% rename from repository/OpenPonk-Roassal3/Point.extension.st rename to repository/OpenPonk-Roassal/Point.extension.st index bdfe01efb..b618e9fb4 100644 --- a/repository/OpenPonk-Roassal3/Point.extension.st +++ b/repository/OpenPonk-Roassal/Point.extension.st @@ -1,6 +1,6 @@ Extension { #name : #Point } -{ #category : #'*OpenPonk-Roassal3' } +{ #category : #'*OpenPonk-Roassal' } Point >> closeTo: aPoint absolutePrecision: aPrecision [ ^ (x closeTo: aPoint x absolutePrecision: aPrecision) and: [ diff --git a/repository/OpenPonk-Roassal3/RSAbstractControlCanvasInteraction.extension.st b/repository/OpenPonk-Roassal/RSAbstractControlCanvasInteraction.extension.st similarity index 95% rename from repository/OpenPonk-Roassal3/RSAbstractControlCanvasInteraction.extension.st rename to repository/OpenPonk-Roassal/RSAbstractControlCanvasInteraction.extension.st index 341302de8..544f73eff 100644 --- a/repository/OpenPonk-Roassal3/RSAbstractControlCanvasInteraction.extension.st +++ b/repository/OpenPonk-Roassal/RSAbstractControlCanvasInteraction.extension.st @@ -1,6 +1,6 @@ Extension { #name : #RSAbstractControlCanvasInteraction } -{ #category : #'*OpenPonk-Roassal3' } +{ #category : #'*OpenPonk-Roassal' } RSAbstractControlCanvasInteraction >> correctRectangle: rectangle camera: camera [ | visibleRectangle correctX correctY | diff --git a/repository/OpenPonk-Roassal3/RSAbstractControlPointsLine.extension.st b/repository/OpenPonk-Roassal/RSAbstractControlPointsLine.extension.st similarity index 85% rename from repository/OpenPonk-Roassal3/RSAbstractControlPointsLine.extension.st rename to repository/OpenPonk-Roassal/RSAbstractControlPointsLine.extension.st index 6bc9cd839..2106b3bc3 100644 --- a/repository/OpenPonk-Roassal3/RSAbstractControlPointsLine.extension.st +++ b/repository/OpenPonk-Roassal/RSAbstractControlPointsLine.extension.st @@ -1,6 +1,6 @@ Extension { #name : #RSAbstractControlPointsLine } -{ #category : #'*OpenPonk-Roassal3' } +{ #category : #'*OpenPonk-Roassal' } RSAbstractControlPointsLine >> innerControlPoints: aCollection [ self controlPoints: { self controlPoints first } , aCollection diff --git a/repository/OpenPonk-Roassal3/RSAbstractLine.extension.st b/repository/OpenPonk-Roassal/RSAbstractLine.extension.st similarity index 75% rename from repository/OpenPonk-Roassal3/RSAbstractLine.extension.st rename to repository/OpenPonk-Roassal/RSAbstractLine.extension.st index 4ba702317..7c9f37df1 100644 --- a/repository/OpenPonk-Roassal3/RSAbstractLine.extension.st +++ b/repository/OpenPonk-Roassal/RSAbstractLine.extension.st @@ -1,12 +1,12 @@ Extension { #name : #RSAbstractLine } -{ #category : #'*OpenPonk-Roassal3' } +{ #category : #'*OpenPonk-Roassal' } RSAbstractLine >> innerControlPoints [ ^ self controlPoints copyFrom: 2 to: self controlPoints size - 1 ] -{ #category : #'*OpenPonk-Roassal3' } +{ #category : #'*OpenPonk-Roassal' } RSAbstractLine >> labels [ ^ self propertyAt: #OPLabels ifAbsentPut: [ Dictionary new ] diff --git a/repository/OpenPonk-Roassal3/RSAthensMorph.extension.st b/repository/OpenPonk-Roassal/RSAthensMorph.extension.st similarity index 82% rename from repository/OpenPonk-Roassal3/RSAthensMorph.extension.st rename to repository/OpenPonk-Roassal/RSAthensMorph.extension.st index 5e07770f7..ef16564ff 100644 --- a/repository/OpenPonk-Roassal3/RSAthensMorph.extension.st +++ b/repository/OpenPonk-Roassal/RSAthensMorph.extension.st @@ -1,6 +1,6 @@ Extension { #name : #RSAthensMorph } -{ #category : #'*OpenPonk-Roassal3' } +{ #category : #'*OpenPonk-Roassal' } RSAthensMorph >> resetShapeBeingDragged [ eventBeginingDragging ifNil: [ ^ self ]. diff --git a/repository/OpenPonk-Roassal3/RSBorderColoringComposite.class.st b/repository/OpenPonk-Roassal/RSBorderColoringComposite.class.st similarity index 98% rename from repository/OpenPonk-Roassal3/RSBorderColoringComposite.class.st rename to repository/OpenPonk-Roassal/RSBorderColoringComposite.class.st index dcf347d2d..03fc267fd 100644 --- a/repository/OpenPonk-Roassal3/RSBorderColoringComposite.class.st +++ b/repository/OpenPonk-Roassal/RSBorderColoringComposite.class.st @@ -5,7 +5,7 @@ Class { 'shapesToUseBorderColor', 'borderColoredShapesColorBlock' ], - #category : #'OpenPonk-Roassal3-Markers' + #category : #'OpenPonk-Roassal-Markers' } { #category : #accessing } diff --git a/repository/OpenPonk-Roassal3/RSBoundingShape.extension.st b/repository/OpenPonk-Roassal/RSBoundingShape.extension.st similarity index 84% rename from repository/OpenPonk-Roassal3/RSBoundingShape.extension.st rename to repository/OpenPonk-Roassal/RSBoundingShape.extension.st index b5447d37a..65e2c456f 100644 --- a/repository/OpenPonk-Roassal3/RSBoundingShape.extension.st +++ b/repository/OpenPonk-Roassal/RSBoundingShape.extension.st @@ -1,6 +1,6 @@ Extension { #name : #RSBoundingShape } -{ #category : #'*OpenPonk-Roassal3' } +{ #category : #'*OpenPonk-Roassal' } RSBoundingShape >> element [ self @@ -9,7 +9,7 @@ RSBoundingShape >> element [ ^ self ] -{ #category : #'*OpenPonk-Roassal3' } +{ #category : #'*OpenPonk-Roassal' } RSBoundingShape >> elementOn: aModel [ self diff --git a/repository/OpenPonk-Roassal3/RSCanvas.extension.st b/repository/OpenPonk-Roassal/RSCanvas.extension.st similarity index 82% rename from repository/OpenPonk-Roassal3/RSCanvas.extension.st rename to repository/OpenPonk-Roassal/RSCanvas.extension.st index 9a52deb7a..cd30234f3 100644 --- a/repository/OpenPonk-Roassal3/RSCanvas.extension.st +++ b/repository/OpenPonk-Roassal/RSCanvas.extension.st @@ -1,6 +1,6 @@ Extension { #name : #RSCanvas } -{ #category : #'*OpenPonk-Roassal3' } +{ #category : #'*OpenPonk-Roassal' } RSCanvas >> elements [ self @@ -9,13 +9,13 @@ RSCanvas >> elements [ ^ self nodes ] -{ #category : #'*OpenPonk-Roassal3' } +{ #category : #'*OpenPonk-Roassal' } RSCanvas >> isSelectable [ ^ false ] -{ #category : #'*OpenPonk-Roassal3' } +{ #category : #'*OpenPonk-Roassal' } RSCanvas >> shapesWithActionForPosition: aPositionInSpace [ | result | diff --git a/repository/OpenPonk-Roassal3/RSComposite.extension.st b/repository/OpenPonk-Roassal/RSComposite.extension.st similarity index 83% rename from repository/OpenPonk-Roassal3/RSComposite.extension.st rename to repository/OpenPonk-Roassal/RSComposite.extension.st index 4f5c24b18..97e5dc7e7 100644 --- a/repository/OpenPonk-Roassal3/RSComposite.extension.st +++ b/repository/OpenPonk-Roassal/RSComposite.extension.st @@ -1,6 +1,6 @@ Extension { #name : #RSComposite } -{ #category : #'*OpenPonk-Roassal3' } +{ #category : #'*OpenPonk-Roassal' } RSComposite >> isOrComposesOf: aShape [ ^ (super isOrComposesOf: aShape) or: [ diff --git a/repository/OpenPonk-Roassal3/RSControlConfiguration.extension.st b/repository/OpenPonk-Roassal/RSControlConfiguration.extension.st similarity index 68% rename from repository/OpenPonk-Roassal3/RSControlConfiguration.extension.st rename to repository/OpenPonk-Roassal/RSControlConfiguration.extension.st index f258aabd9..476827d03 100644 --- a/repository/OpenPonk-Roassal3/RSControlConfiguration.extension.st +++ b/repository/OpenPonk-Roassal/RSControlConfiguration.extension.st @@ -1,12 +1,12 @@ Extension { #name : #RSControlConfiguration } -{ #category : #'*OpenPonk-Roassal3' } +{ #category : #'*OpenPonk-Roassal' } RSControlConfiguration >> hasZoomableAnimation [ ^ true ] -{ #category : #'*OpenPonk-Roassal3' } +{ #category : #'*OpenPonk-Roassal' } RSControlConfiguration >> keepCameraOnContent [ ^ true diff --git a/repository/OpenPonk-Roassal3/RSEvent.extension.st b/repository/OpenPonk-Roassal/RSEvent.extension.st similarity index 80% rename from repository/OpenPonk-Roassal3/RSEvent.extension.st rename to repository/OpenPonk-Roassal/RSEvent.extension.st index 16f2393b2..e1ade0923 100644 --- a/repository/OpenPonk-Roassal3/RSEvent.extension.st +++ b/repository/OpenPonk-Roassal/RSEvent.extension.st @@ -1,6 +1,6 @@ Extension { #name : #RSEvent } -{ #category : #'*OpenPonk-Roassal3' } +{ #category : #'*OpenPonk-Roassal' } RSEvent >> element [ self @@ -9,7 +9,7 @@ RSEvent >> element [ ^ self shape ] -{ #category : #'*OpenPonk-Roassal3' } +{ #category : #'*OpenPonk-Roassal' } RSEvent >> view [ self diff --git a/repository/OpenPonk-Roassal3/RSMarker.extension.st b/repository/OpenPonk-Roassal/RSMarker.extension.st similarity index 84% rename from repository/OpenPonk-Roassal3/RSMarker.extension.st rename to repository/OpenPonk-Roassal/RSMarker.extension.st index c4d508418..fe526901d 100644 --- a/repository/OpenPonk-Roassal3/RSMarker.extension.st +++ b/repository/OpenPonk-Roassal/RSMarker.extension.st @@ -1,6 +1,6 @@ Extension { #name : #RSMarker } -{ #category : #'*OpenPonk-Roassal3' } +{ #category : #'*OpenPonk-Roassal' } RSMarker >> asEmptyMarker [ self shape color: Color white. diff --git a/repository/OpenPonk-Roassal3/RSObjectWithProperty.extension.st b/repository/OpenPonk-Roassal/RSObjectWithProperty.extension.st similarity index 73% rename from repository/OpenPonk-Roassal3/RSObjectWithProperty.extension.st rename to repository/OpenPonk-Roassal/RSObjectWithProperty.extension.st index 309f6ce45..c6ee3f944 100644 --- a/repository/OpenPonk-Roassal3/RSObjectWithProperty.extension.st +++ b/repository/OpenPonk-Roassal/RSObjectWithProperty.extension.st @@ -1,12 +1,12 @@ Extension { #name : #RSObjectWithProperty } -{ #category : #'*OpenPonk-Roassal3' } +{ #category : #'*OpenPonk-Roassal' } RSObjectWithProperty >> isOrComposesOf: aShape [ ^ self = aShape ] -{ #category : #'*OpenPonk-Roassal3' } +{ #category : #'*OpenPonk-Roassal' } RSObjectWithProperty >> isSelectionDraggable [ ^ self hasProperty: OPRSSelectionDraggable diff --git a/repository/OpenPonk-Roassal3/RSShape.extension.st b/repository/OpenPonk-Roassal/RSShape.extension.st similarity index 79% rename from repository/OpenPonk-Roassal3/RSShape.extension.st rename to repository/OpenPonk-Roassal/RSShape.extension.st index 88c6423c9..c8f9123ad 100644 --- a/repository/OpenPonk-Roassal3/RSShape.extension.st +++ b/repository/OpenPonk-Roassal/RSShape.extension.st @@ -1,12 +1,12 @@ Extension { #name : #RSShape } -{ #category : #'*OpenPonk-Roassal3' } +{ #category : #'*OpenPonk-Roassal' } RSShape >> asEmptyMarker [ ^ self asMarker asEmptyMarker ] -{ #category : #'*OpenPonk-Roassal3' } +{ #category : #'*OpenPonk-Roassal' } RSShape >> isElement [ self @@ -15,13 +15,13 @@ RSShape >> isElement [ ^ self isNode ] -{ #category : #'*OpenPonk-Roassal3' } +{ #category : #'*OpenPonk-Roassal' } RSShape >> isSelectable [ ^ self hasProperty: OPRSSelectable ] -{ #category : #'*OpenPonk-Roassal3' } +{ #category : #'*OpenPonk-Roassal' } RSShape >> isSelected [ ^ self canvas @@ -30,7 +30,7 @@ RSShape >> isSelected [ currentCanvas selectedShapes includes: self ] ] -{ #category : #'*OpenPonk-Roassal3' } +{ #category : #'*OpenPonk-Roassal' } RSShape >> shapeWithActionForPosition: position [ self canvas @@ -42,7 +42,7 @@ RSShape >> shapeWithActionForPosition: position [ ifFalse: [ nil ] ] -{ #category : #'*OpenPonk-Roassal3' } +{ #category : #'*OpenPonk-Roassal' } RSShape >> view [ self diff --git a/repository/OpenPonk-Roassal3/Rectangle.extension.st b/repository/OpenPonk-Roassal/Rectangle.extension.st similarity index 91% rename from repository/OpenPonk-Roassal3/Rectangle.extension.st rename to repository/OpenPonk-Roassal/Rectangle.extension.st index a462a7af2..8604cf23a 100644 --- a/repository/OpenPonk-Roassal3/Rectangle.extension.st +++ b/repository/OpenPonk-Roassal/Rectangle.extension.st @@ -1,18 +1,18 @@ Extension { #name : #Rectangle } -{ #category : #'*OpenPonk-Roassal3' } +{ #category : #'*OpenPonk-Roassal' } Rectangle >> floatCenterX [ ^ origin x + corner x / 2.0 ] -{ #category : #'*OpenPonk-Roassal3' } +{ #category : #'*OpenPonk-Roassal' } Rectangle >> floatCenterY [ ^ origin y + corner y / 2.0 ] -{ #category : #'*OpenPonk-Roassal3' } +{ #category : #'*OpenPonk-Roassal' } Rectangle >> horizontalAlignmentLinesTo: otherRectangle margin: margin [ ^ self @@ -21,7 +21,7 @@ Rectangle >> horizontalAlignmentLinesTo: otherRectangle margin: margin [ in: margin ] -{ #category : #'*OpenPonk-Roassal3' } +{ #category : #'*OpenPonk-Roassal' } Rectangle >> possibleHorizontalAlignmentLinesTo: otherRectangle [ ^ Array @@ -44,7 +44,7 @@ Rectangle >> possibleHorizontalAlignmentLinesTo: otherRectangle [ comparedSecond: otherRectangle bottomRight) ] -{ #category : #'*OpenPonk-Roassal3' } +{ #category : #'*OpenPonk-Roassal' } Rectangle >> possibleVerticalAlignmentLinesTo: otherRectangle [ ^ Array @@ -66,7 +66,7 @@ Rectangle >> possibleVerticalAlignmentLinesTo: otherRectangle [ comparedSecond: otherRectangle bottomRight) ] -{ #category : #'*OpenPonk-Roassal3' } +{ #category : #'*OpenPonk-Roassal' } Rectangle >> selectAlignmentLinesFrom: alignmentLines in: margin [ | best | @@ -85,7 +85,7 @@ Rectangle >> selectAlignmentLinesFrom: alignmentLines in: margin [ ^ best ] -{ #category : #'*OpenPonk-Roassal3' } +{ #category : #'*OpenPonk-Roassal' } Rectangle >> verticalAlignmentLinesTo: otherRectangle margin: margin [ ^ self diff --git a/repository/OpenPonk-Roassal/package.st b/repository/OpenPonk-Roassal/package.st new file mode 100644 index 000000000..5155cf640 --- /dev/null +++ b/repository/OpenPonk-Roassal/package.st @@ -0,0 +1 @@ +Package { #name : #'OpenPonk-Roassal' } diff --git a/repository/OpenPonk-Roassal2/AthensCairoCanvas.extension.st b/repository/OpenPonk-Roassal2/AthensCairoCanvas.extension.st deleted file mode 100644 index 8408f14b1..000000000 --- a/repository/OpenPonk-Roassal2/AthensCairoCanvas.extension.st +++ /dev/null @@ -1,13 +0,0 @@ -Extension { #name : #AthensCairoCanvas } - -{ #category : #'*OpenPonk-Roassal2' } -AthensCairoCanvas >> fillPreserve [ - ^ self ffiCall: #(#void #cairo_fill_preserve #(#self)) -] - -{ #category : #'*OpenPonk-Roassal2' } -AthensCairoCanvas >> textPath: anUTF8EncodedString [ - "A drawing operator that generates the shape from a string of UTF-8 characters, rendered according to the current font_face, font_size (font_matrix), and font_options. " - - ^ self ffiCall: #(void cairo_text_path (self, void* anUTF8EncodedString )) -] diff --git a/repository/OpenPonk-Roassal2/OPAcceptDenyFeedbackBuilder.class.st b/repository/OpenPonk-Roassal2/OPAcceptDenyFeedbackBuilder.class.st deleted file mode 100644 index 730d89246..000000000 --- a/repository/OpenPonk-Roassal2/OPAcceptDenyFeedbackBuilder.class.st +++ /dev/null @@ -1,53 +0,0 @@ -Class { - #name : #OPAcceptDenyFeedbackBuilder, - #superclass : #RTBuilder, - #instVars : [ - 'feedback' - ], - #category : 'OpenPonk-Roassal2-Builders' -} - -{ #category : #'as yet unclassified' } -OPAcceptDenyFeedbackBuilder class >> acceptFeedbackFor: anObject [ - ^ self new acceptFeedbackFor: anObject -] - -{ #category : #'as yet unclassified' } -OPAcceptDenyFeedbackBuilder class >> denyFeedbackFor: anObject [ - ^ self new denyFeedbackFor: anObject -] - -{ #category : #accessing } -OPAcceptDenyFeedbackBuilder >> acceptColor [ - ^ Color green -] - -{ #category : #protocol } -OPAcceptDenyFeedbackBuilder >> acceptFeedbackFor: anObject [ - ^ self feedbackFor: anObject color: self acceptColor -] - -{ #category : #accessing } -OPAcceptDenyFeedbackBuilder >> denyColor [ - ^ Color red -] - -{ #category : #protocol } -OPAcceptDenyFeedbackBuilder >> denyFeedbackFor: anObject [ - ^ self feedbackFor: anObject color: self denyColor -] - -{ #category : #private } -OPAcceptDenyFeedbackBuilder >> feedbackFor: anObject color: aColor [ - (anObject isKindOf: RTElement) - ifTrue: [ ^ OPElementADFeedback new feedbackFor: anObject color: aColor ]. - (anObject isKindOf: RTEdge) - ifTrue: [ ^ OPEdgeADFeedback new feedbackFor: anObject color: aColor ]. - (anObject isKindOf: RTView) - ifTrue: [ ^ OPViewADFeedback new feedbackFor: anObject color: aColor ] -] - -{ #category : #protocol } -OPAcceptDenyFeedbackBuilder >> remove [ - ^ self subclassResponsibility -] diff --git a/repository/OpenPonk-Roassal2/OPEdgeADFeedback.class.st b/repository/OpenPonk-Roassal2/OPEdgeADFeedback.class.st deleted file mode 100644 index 0af364818..000000000 --- a/repository/OpenPonk-Roassal2/OPEdgeADFeedback.class.st +++ /dev/null @@ -1,31 +0,0 @@ -Class { - #name : #OPEdgeADFeedback, - #superclass : #OPAcceptDenyFeedbackBuilder, - #category : 'OpenPonk-Roassal2-Builders' -} - -{ #category : #private } -OPEdgeADFeedback >> feedbackFor: anEdge color: aColor [ - feedback := anEdge. - (anEdge attributes includesKey: self originalColorSymbol) - ifTrue: [ ^ self ]. - anEdge attributes at: self originalColorSymbol put: anEdge shape color. - anEdge shape color: aColor. - anEdge update. - anEdge view signalUpdate -] - -{ #category : #accessing } -OPEdgeADFeedback >> originalColorSymbol [ - ^ #adFeedbackOriginalColor -] - -{ #category : #protocol } -OPEdgeADFeedback >> remove [ - (feedback attributes includesKey: self originalColorSymbol) - ifFalse: [ ^ self ]. - feedback shape color: (feedback attributes at: self originalColorSymbol). - feedback attributes removeKey: self originalColorSymbol. - feedback update. - feedback view signalUpdate -] diff --git a/repository/OpenPonk-Roassal2/OPElementADFeedback.class.st b/repository/OpenPonk-Roassal2/OPElementADFeedback.class.st deleted file mode 100644 index 2b3ac956f..000000000 --- a/repository/OpenPonk-Roassal2/OPElementADFeedback.class.st +++ /dev/null @@ -1,54 +0,0 @@ -Class { - #name : #OPElementADFeedback, - #superclass : #OPAcceptDenyFeedbackBuilder, - #instVars : [ - 'noBorder' - ], - #category : 'OpenPonk-Roassal2-Builders' -} - -{ #category : #private } -OPElementADFeedback >> feedbackFor: anElement color: aColor [ - | shape | - (anElement isKindOf: RTElement) - ifFalse: [ ^ self ]. - shape := RTBox new. - anElement shape class = RTRoundedBox - ifTrue: - [ (shape := RTRoundedBox new) borderRadius: (anElement shape borderRadiusFor: anElement) ]. - anElement shape class = RTEllipse - ifTrue: [ shape := RTEllipse new ]. - feedback := shape - color: (aColor alpha: 0.2); - borderColor: (aColor alpha: 0.2); - element. - noBorder - ifTrue: [ feedback trachelShape strokeWidth: 0. - feedback trachelShape strokePaint: Color red ]. - OPRTElementsConstraint keepExtentOf: feedback like: anElement plus: 3 @ 3. - TRConstraint stick: feedback onTheCenterOf: anElement. - anElement view add: feedback. - anElement view signalUpdate -] - -{ #category : #initialization } -OPElementADFeedback >> initialize [ - super initialize. - noBorder := false -] - -{ #category : #'as yet unclassified' } -OPElementADFeedback >> noBorder [ - noBorder := true -] - -{ #category : #protocol } -OPElementADFeedback >> remove [ - feedback - ifNotNil: [ - | aView | - aView := feedback view. - feedback remove. - aView signalUpdate. - feedback := nil ] -] diff --git a/repository/OpenPonk-Roassal2/OPInteractiveLine.class.st b/repository/OpenPonk-Roassal2/OPInteractiveLine.class.st deleted file mode 100644 index f804a8588..000000000 --- a/repository/OpenPonk-Roassal2/OPInteractiveLine.class.st +++ /dev/null @@ -1,74 +0,0 @@ -" -I am a smart line that adds a temporary line to the view with one end attached to an element and second following the mouse cursor. - -Useful for providing live feedback when creating edges. -" -Class { - #name : #OPInteractiveLine, - #superclass : #Object, - #instVars : [ - 'source', - 'view', - 'mouseBox', - 'line', - 'running', - 'lineBuilder', - 'moveSubscription' - ], - #category : #'OpenPonk-Roassal2-Interactivity' -} - -{ #category : #accessing } -OPInteractiveLine >> from: anElement [ - source := anElement -] - -{ #category : #initialization } -OPInteractiveLine >> initialize [ - super initialize. - running := false -] - -{ #category : #accessing } -OPInteractiveLine >> lineBuilder: aBlock [ - lineBuilder := aBlock -] - -{ #category : #accessing } -OPInteractiveLine >> remove [ - - running ifFalse: [ ^ self ]. - running := false. - view announcer unsubscribe: moveSubscription. - mouseBox remove. - view signalUpdate -] - -{ #category : #hooks } -OPInteractiveLine >> renderIn: aView [ - - view := aView. - - mouseBox := RTBox new - size: 2; - color: Color transparent; - element. - - line := lineBuilder value: source value: mouseBox. - " line shape color: Color veryLightGray." - - mouseBox translateTo: source position. - aView add: mouseBox. - - aView add: line. - line update. - aView signalUpdate. - - moveSubscription := aView announcer - when: TRMouseMove - do: [ :event | - mouseBox translateTo: event position. - aView signalUpdate ]. - - running := true -] diff --git a/repository/OpenPonk-Roassal2/OPRTAbstractConstraint.class.st b/repository/OpenPonk-Roassal2/OPRTAbstractConstraint.class.st deleted file mode 100644 index 5db198562..000000000 --- a/repository/OpenPonk-Roassal2/OPRTAbstractConstraint.class.st +++ /dev/null @@ -1,8 +0,0 @@ -" -A DCRTConstraint are utility classes that contain methods to position elements against others or change them accordingly -" -Class { - #name : #OPRTAbstractConstraint, - #superclass : #Object, - #category : 'OpenPonk-Roassal2-Constraints' -} diff --git a/repository/OpenPonk-Roassal2/OPRTAbstractDoubleArrow.class.st b/repository/OpenPonk-Roassal2/OPRTAbstractDoubleArrow.class.st deleted file mode 100644 index 80d28aa51..000000000 --- a/repository/OpenPonk-Roassal2/OPRTAbstractDoubleArrow.class.st +++ /dev/null @@ -1,5 +0,0 @@ -Class { - #name : #OPRTAbstractDoubleArrow, - #superclass : #RTLineDecorationShape, - #category : #'OpenPonk-Roassal2-Shapes' -} diff --git a/repository/OpenPonk-Roassal2/OPRTAdornments.class.st b/repository/OpenPonk-Roassal2/OPRTAdornments.class.st deleted file mode 100644 index aa89e5cbf..000000000 --- a/repository/OpenPonk-Roassal2/OPRTAdornments.class.st +++ /dev/null @@ -1,99 +0,0 @@ -" -I add icons to the side of a roassal element that have actions associated with them. - -See OPRTExamples>>exampleAdornments -" -Class { - #name : #OPRTAdornments, - #superclass : #RTInteraction, - #instVars : [ - 'adornments', - 'shapesCache' - ], - #category : #'OpenPonk-Roassal2-Interactivity' -} - -{ #category : #accessing } -OPRTAdornments >> adornments [ - ^ adornments value -] - -{ #category : #accessing } -OPRTAdornments >> adornments: aListOrBlock [ - adornments := aListOrBlock -] - -{ #category : #adornments } -OPRTAdornments >> createAdornmentFrom: anAssociation position: aPosition on: anElement [ - - | box icon size | - size := 20. - box := RTBox new - size: size; - color: Color transparent; - borderColor: Color black; - element. - icon := RTBitmap new - form: anAssociation key; - element. - box addCallback: (TRAddedCallback block: [ - box view add: icon. - (RTConstraint on: box background: anElement) - top; - right; - outer; - verticalPadding: (size * aPosition) negated; - stick. - (RTConstraint on: icon background: box) stick ]). - box addCallback: (TRRemoveCallback block: [ icon remove ]). - ^ box -] - -{ #category : #adornments } -OPRTAdornments >> hideAdornmentsOn: anElement [ - (anElement hasAttribute: self className) - ifFalse: [ ^ self ]. - (anElement attributeAt: self className) - do: [ :each | - each announcer unsubscribe: each view. - each announcer unsubscribe: self. - each remove ]. - anElement removeAttributeAt: self className. - anElement view signalUpdate -] - -{ #category : #initialization } -OPRTAdornments >> initialize [ - super initialize. - shapesCache := Dictionary new -] - -{ #category : #initialization } -OPRTAdornments >> initializeElement: anElement [ - anElement when: OPTRFocused do: [ :e | self showAdornmentsOn: anElement ]. - anElement when: OPTRUnfocused do: [ :e | self hideAdornmentsOn: anElement ] -] - -{ #category : #adornments } -OPRTAdornments >> shapesCache [ - ^ shapesCache -] - -{ #category : #adornments } -OPRTAdornments >> showAdornmentsOn: anElement [ - - | boxes | - boxes := self adornments withIndexCollect: [ :each :i | - | box | - box := self shapesCache - at: each - ifAbsentPut: [ - self - createAdornmentFrom: each - position: i - on: anElement ]. - box when: TRMouseLeftClick do: [ :evt | each value value ] ]. - anElement attributeAt: self className put: boxes. - anElement view addAll: boxes. - anElement view signalUpdate -] diff --git a/repository/OpenPonk-Roassal2/OPRTAnchorConstraint.class.st b/repository/OpenPonk-Roassal2/OPRTAnchorConstraint.class.st deleted file mode 100644 index 601fa19bf..000000000 --- a/repository/OpenPonk-Roassal2/OPRTAnchorConstraint.class.st +++ /dev/null @@ -1,197 +0,0 @@ -" -I attach a RTElement to a RTEdge (works for both line and connection shapes). When the edge or it's extremities are moved, so is the anchor. - -Furthermore I will try to move the Element in such a way that it doesn't overlap neither the edge, nor it's extremities, nor their other lines. I will not however prevent overlapping of another elements (e.g. another element or edge nearby). - -!! API - -==#balance: aNumber== -Specify where the anchor should be positioned. x \in [0, 1] for relative positions (so 0.5 will be exactly middle, 1 at the end, etc.). -x > 1 or x < 0 for absolute positioning. E.g.: 10 - position the anchor 10 pixels from the beginning; -20 - 20 pixels from the end - -==#minDistance: aNumber== -A minimum distance (in pixels) that should be maintained between the edge and the element - - - -" -Class { - #name : #OPRTAnchorConstraint, - #superclass : #RTAnchorConstraint, - #category : #'OpenPonk-Roassal2-Constraints' -} - -{ #category : #example } -OPRTAnchorConstraint class >> example [ - | v es e rep anchor | - v := RTView new. - v @ RTDraggableView. - v @ RTGridView. - v @ RTZoomableView. - - es := RTBox new - color: Color green; - size: 20; - elementsOn: #(1 2). - e := OPRTStyledConnection new - attachPoint: OPRTNewRectangleAttachPoint new; - color: Color black; - edgeFrom: es first to: es second. - e @ OPRTConnectionHandles. - - rep := RTBox new - color: Color purple; - size: 20; - element. - v add: rep. - rep translateBy: 30 @ 50. - rep @ (OPRTDraggableSnapToGrid new gridSize: 20). - - v addAll: es. - v add: e. - - anchor := OPRTAnchorConstraint new. - anchor anchorShape size: 10. - anchor - element: rep; - edge: e; - balance: 0.5; - minDistance: 10; - build. - - es @ (OPRTDraggableSnapToGrid new gridSize: 20). - - es first translateTo: 70 negated @ 90 negated. - es second translateTo: 70 @ 110. - - v open -] - -{ #category : #example } -OPRTAnchorConstraint class >> example2 [ - | v es e rep anchor | - v := RTView new. - v @ RTDraggableView. - v @ (RTGridView new gridSize: 20). - v @ RTZoomableView. - - es := RTBox new - color: Color green; - size: 150; - elementsOn: #(1 2). - e := OPRTStyledConnection new - attachPoint: OPRTNewRectangleAttachPoint new; - color: Color black; - edgeFrom: es first to: es second. - e @ OPRTConnectionHandles. - - rep := RTBox new - color: (Color purple alpha: 0.5); - borderColor: Color purple; - size: 50; - width: 300; - element. - rep translateBy: 30 @ 50. - rep @ RTDraggable. - - v addAll: es. - v add: e. - v add: rep. - - anchor := OPRTAnchorConstraint new. - anchor anchorShape size: 10. - anchor - element: rep; - edge: e; - balance: -10; - minDistance: 10; - build. - - es @ (OPRTDraggableSnapToGrid new gridSize: 20). - - es first translateTo: 70 negated @ 100 negated. - es second translateTo: 70 @ 110. - - v open -] - -{ #category : #example } -OPRTAnchorConstraint class >> exampleSelfEdge [ -| v e box start end createAnchor| -v := RTView new. -v @ RTDraggableView. -v @ RTGridView. -v @ RTZoomableView. - -box := RTBox new - color: Color green; - width: 100; - height: 50; - element. -e := OPRTStyledConnection new - attachPoint: OPRTNewRectangleAttachPoint new; - color: Color black; - edgeFrom: box to: box. -e shape decorations arrowHead. -e @ OPRTConnectionHandles. - -start := RTLabel new - color: Color black; - elementsOn: #(sTop sBottom). - -end := RTLabel new - color: Color black; - elementsOn: #(eTop eBottom). - - -v add: box. -v add: e. -v - addAll: start; - addAll: end. - - -createAnchor := [ :el :bal :side | - OPRTAnchorConstraint new - element: el; - edge: e; - balance: bal; - minDistance: side * 5; - build. -]. - -createAnchor value: start first value: 10 value: 1. -createAnchor value: start second value: 10 value: -1. - -createAnchor value: end first value: -10 value: 1. -createAnchor value: end second value: -10 value: -1. - -start @ OPRTRoundedDraggable. -end @ OPRTRoundedDraggable. - -box @ (OPRTDraggableSnapToGrid new gridSize: 20). - -box translateBy: 0@0. - -v open -] - -{ #category : #building } -OPRTAnchorConstraint >> build [ - - super build. - (edge shape className asSymbol = #OPRTConnection or: [ - edge shape className asSymbol = #OPRTStyledConnection ]) ifFalse: [ - ^ self ]. - edge - when: (self class environment at: #OPRTHandleMoved) - do: [ self update ] -] - -{ #category : #accessing } -OPRTAnchorConstraint >> segments [ - - (edge shape isKindOf: OPRTConnection) ifTrue: [ - ^ OPRTPolyLineSegment withAll: (self connectionSegmentsFor: edge) ]. - ^ super segments -] diff --git a/repository/OpenPonk-Roassal2/OPRTAnchorConstraintTest.class.st b/repository/OpenPonk-Roassal2/OPRTAnchorConstraintTest.class.st deleted file mode 100644 index 6d7e452fe..000000000 --- a/repository/OpenPonk-Roassal2/OPRTAnchorConstraintTest.class.st +++ /dev/null @@ -1,108 +0,0 @@ -Class { - #name : #OPRTAnchorConstraintTest, - #superclass : #TestCase, - #instVars : [ - 'source', - 'target', - 'edge', - 'edgeElement', - 'edgeAnchor', - 'connection', - 'connectionElement', - 'connectionAnchor', - 'canvas', - 'segment', - 'expected' - ], - #category : #'OpenPonk-Roassal2-Tests' -} - -{ #category : #'instance creation' } -OPRTAnchorConstraintTest >> createConnectionAnchor [ - connection := OPRTStyledConnection new - attachPoint: OPRTNewRectangleAttachPoint new; - edgeFrom: source to: target. - connection shape addPoint: 0 @ 50. - connection shape addPoint: 50 @ 100. - connectionElement := RTBox new - width: 50; - height: 20; - element. - view add: connection. - view add: connectionElement. - connectionAnchor := OPRTAnchorConstraint new. - connectionAnchor - element: connectionElement; - edge: connection; - balance: 0; - minDistance: 0; - build -] - -{ #category : #'instance creation' } -OPRTAnchorConstraintTest >> createEdgeAnchor [ - edge := RTLine new - attachPoint: RTBorderAttachPoint new; - edgeFrom: source to: target. - edgeElement := RTBox new - width: 50; - height: 20; - element. - view add: edge. - view add: edgeElement. - edgeAnchor := OPRTAnchorConstraint new. - edgeAnchor - element: edgeElement; - edge: edge; - balance: 0; - minDistance: 0; - build -] - -{ #category : #running } -OPRTAnchorConstraintTest >> setUp [ - view := RTView new. - source := RTBox new - size: 30; - element. - target := RTBox new - size: 30; - element. - view add: source. - view add: target. - source translateTo: 0 @ 0. - target translateTo: 100 @ 100. - self createEdgeAnchor. - self createConnectionAnchor -] - -{ #category : #tests } -OPRTAnchorConstraintTest >> testConnectionPath [ - self - assert: (connection shape pathFor: connection) - equals: - {(0 @ (source height / 2)). - (0 @ 50). - (50 @ 100). - ((100 - (target width / 2)) @ 100)} -] - -{ #category : #tests } -OPRTAnchorConstraintTest >> testConnectionSegmentsFor [ - | segments | - expected := {(RTLineSegment from: 0 @ (source height / 2) to: 0 @ 50). - (RTLineSegment from: 0 @ 50 to: 50 @ 100). - (RTLineSegment from: 50 @ 100 to: (100 - (target width / 2)) @ 100)}. - segments := connectionAnchor connectionSegmentsFor: connection. - self assert: segments equals: expected. - self assert: connectionAnchor segments segments equals: expected -] - -{ #category : #tests } -OPRTAnchorConstraintTest >> testLineSegmentFor [ - true - ifTrue: [ ^ self skip: 'Not sure what the problem is here' ]. - segment := edgeAnchor lineSegmentFor: edge. - self assert: segment from equals: source position. - self assert: segment to equals: target position -] diff --git a/repository/OpenPonk-Roassal2/OPRTBendHandle.class.st b/repository/OpenPonk-Roassal2/OPRTBendHandle.class.st deleted file mode 100644 index 03dd8006b..000000000 --- a/repository/OpenPonk-Roassal2/OPRTBendHandle.class.st +++ /dev/null @@ -1,93 +0,0 @@ -Class { - #name : #OPRTBendHandle, - #superclass : #OPRTHandle, - #instVars : [ - 'index', - 'pointLink' - ], - #category : #'OpenPonk-Roassal2-Connection' -} - -{ #category : #'as yet unclassified' } -OPRTBendHandle >> on: anEdge at: aPointLink [ - edge := anEdge. - pointLink := aPointLink -] - -{ #category : #'as yet unclassified' } -OPRTBendHandle >> onDragEnd [ - - | previous next current | - "remove the point if the angle between the two adjacent lines is near Pi" - current := pointLink value. - previous := pointLink hasPredecessor - ifTrue: [ pointLink previousLink value ] - ifFalse: [ edge from position ]. - next := pointLink hasSuccessor - ifTrue: [ pointLink nextLink value ] - ifFalse: [ edge to position ]. - (current onLineFrom: previous to: next within: 10) ifTrue: [ - ^ self removePoint ]. - element pushFront -] - -{ #category : #'as yet unclassified' } -OPRTBendHandle >> pointLink [ - ^ pointLink -] - -{ #category : #'as yet unclassified' } -OPRTBendHandle >> remove [ - - self removeConnectedEdges. - super remove. - pointLink := nil -] - -{ #category : #'as yet unclassified' } -OPRTBendHandle >> removeConnectedEdges [ - "remove connected edges without triggering removal cascade" - element connectedEdges removeAll -] - -{ #category : #'as yet unclassified' } -OPRTBendHandle >> removePoint [ - "destroy the handle and the underlying point" - - edge shape router removePointLink: pointLink for: edge -] - -{ #category : #accessing } -OPRTBendHandle >> renderIn: aView [ - - element := self shape elementOn: edge. - clickBox := self clickBoxShape elementOn: edge. - aView - add: element; - add: clickBox. - clickBox translateTo: pointLink value. - (RTConstraint on: element background: clickBox) stick. - clickBox @ OPRTDraggableSnapToGrid center. - element addConnectedEdge: edge. - element @ (RTMenuActivable new - item: 'Remove' action: [ :e | self removePoint ]; - item: 'Straighten' action: [ :e | self straightenConnection ]). - element trachelShape addCallback: - (TRTranslationCallback block: [ :shape :step | - pointLink value: pointLink value + step. - edge announcer announce: OPRTHandleMoved new ]). - clickBox when: TRMouseDragEnd do: [ self onDragEnd ] -] - -{ #category : #accessing } -OPRTBendHandle >> size [ - - ^ 9 -] - -{ #category : #'as yet unclassified' } -OPRTBendHandle >> straightenConnection [ - "Remove all the handles of the connection" - - edge shape router removeAll -] diff --git a/repository/OpenPonk-Roassal2/OPRTBorderDraggable.class.st b/repository/OpenPonk-Roassal2/OPRTBorderDraggable.class.st deleted file mode 100644 index ecc188caa..000000000 --- a/repository/OpenPonk-Roassal2/OPRTBorderDraggable.class.st +++ /dev/null @@ -1,40 +0,0 @@ -" -I constraint an element to be dragged only on the border of a provided ==background== element. - -The border is defined by ==background=='s ==encompassingRectangle==. -" -Class { - #name : #OPRTBorderDraggable, - #superclass : #RTAbstractDraggable, - #instVars : [ - 'background' - ], - #category : 'OpenPonk-Roassal2-Interactivity' -} - -{ #category : #'instance creation' } -OPRTBorderDraggable class >> background: anElement [ - ^ self new - background: anElement; - yourself -] - -{ #category : #accessing } -OPRTBorderDraggable >> background: anElement [ - background := anElement -] - -{ #category : #hooks } -OPRTBorderDraggable >> initializeElement: anElement [ - self - assert: [ background isNotNil ] - description: 'BorderDraggable requires background element to operate.'. - super initializeElement: anElement. -] - -{ #category : #hooks } -OPRTBorderDraggable >> transformDistance: distanceAsPoint forElement: anElement [ - | targetPosition | - targetPosition := anElement position + distanceAsPoint. - ^ (background encompassingRectangle pointNearestTo: targetPosition) - anElement position -] diff --git a/repository/OpenPonk-Roassal2/OPRTCameraLinearMove.class.st b/repository/OpenPonk-Roassal2/OPRTCameraLinearMove.class.st deleted file mode 100644 index c16efe7e4..000000000 --- a/repository/OpenPonk-Roassal2/OPRTCameraLinearMove.class.st +++ /dev/null @@ -1,23 +0,0 @@ -Class { - #name : #OPRTCameraLinearMove, - #superclass : #RTLinearMove, - #category : #'OpenPonk-Roassal2-Animation' -} - -{ #category : #refreshing } -OPRTCameraLinearMove >> refresh [ - element translateTo: animatedValue value. -] - -{ #category : #public } -OPRTCameraLinearMove >> to: anEndPoint during: seconds on: anElement [ - | position | - element := anElement. - - position := anElement position. - animatedValue := TRVIAnimatedValue new - evaluator: [ :t | position interpolateTo: anEndPoint at: (t sqrt) ]; - timer: (TRVITimer new cycleLength: seconds); - yourself. - -] diff --git a/repository/OpenPonk-Roassal2/OPRTCenteredRadialLayout.class.st b/repository/OpenPonk-Roassal2/OPRTCenteredRadialLayout.class.st deleted file mode 100644 index dcee5f07c..000000000 --- a/repository/OpenPonk-Roassal2/OPRTCenteredRadialLayout.class.st +++ /dev/null @@ -1,95 +0,0 @@ -" -I am a simple layout that arranges elements around the focused one in a radial layout based on BFS traversal of neighbors. -" -Class { - #name : #OPRTCenteredRadialLayout, - #superclass : #Object, - #instVars : [ - 'radius', - 'focus', - 'nodes', - 'edges', - 'duration' - ], - #category : 'OpenPonk-Roassal2-Layouts' -} - -{ #category : #initialization } -OPRTCenteredRadialLayout >> apply [ - | center segmentSize closed opened translator | - center := focus position. - opened := OrderedCollection new. - opened add: focus. - translator := duration asSeconds = 0 - ifTrue: [ RTDirectLayoutTranslator new ] - ifFalse: [ RTSmoothLayoutTranslator new nbCycles: self duration asSeconds ]. - focus attributeAt: #layer put: 0. - focus attributeAt: #parent put: nil. - closed := OrderedCollection new. - [ opened isNotEmpty ] - whileTrue: [ | top | - top := opened removeFirst. - (closed includes: top) - ifFalse: [ | neighbors | - neighbors := (self neighborsOf: top) reject: [ :each | each hasAttribute: #parent ]. - neighbors - do: [ :each | - each attributeAt: #parent put: top. - each attributeAt: #layer put: (top attributeAt: #layer) + 1 ]. - top attributeAt: #children put: neighbors. - opened addAll: neighbors ]. - closed add: top ]. - (closed collect: [ :each | each attributeAt: #layer ]) asSet sorted - do: [ :i | - | layer | - layer := closed select: [ :each | (each attributeAt: #layer) = i ]. - segmentSize := Float twoPi / layer size. - layer - withIndexDo: [ :each :j | - | angle | - angle := segmentSize * j. - translator translate: each to: center + (radius * i * (angle cos @ angle sin)) ] ]. - nodes - do: [ :each | - each removeAttributeAt: #parent ifAbsent: [ ]. - each removeAttributeAt: #children ifAbsent: [ ]. - each removeAttributeAt: #layer ifAbsent: [ ] ]. - focus translateTo: center. - focus view signalUpdate -] - -{ #category : #initialization } -OPRTCenteredRadialLayout >> duration [ - ^ duration ifNil: [ 1 second ] -] - -{ #category : #initialization } -OPRTCenteredRadialLayout >> duration: aDuration [ - duration := aDuration -] - -{ #category : #initialization } -OPRTCenteredRadialLayout >> neighborsOf: anElement [ - ^ (anElement connectedEdges - collect: [ :each | - each to = anElement - ifTrue: [ each from ] - ifFalse: [ each to ] ]) removeDuplicates -] - -{ #category : #accessing } -OPRTCenteredRadialLayout >> radius [ - ^ radius -] - -{ #category : #accessing } -OPRTCenteredRadialLayout >> radius: anObject [ - radius := anObject -] - -{ #category : #initialization } -OPRTCenteredRadialLayout >> setFocus: aFocusedNode nodes: aNodesCollection edges: anEdgesCollection [ - focus := aFocusedNode. - nodes := aNodesCollection. - edges := anEdgesCollection -] diff --git a/repository/OpenPonk-Roassal2/OPRTCircleSelfAttachPoint.class.st b/repository/OpenPonk-Roassal2/OPRTCircleSelfAttachPoint.class.st deleted file mode 100644 index 30f69786b..000000000 --- a/repository/OpenPonk-Roassal2/OPRTCircleSelfAttachPoint.class.st +++ /dev/null @@ -1,49 +0,0 @@ -" -!! Responsibility - -Describe positions for attach points for lines with same start end end. - -!! Collaborators - -DCRTArcLine - -!! Assumptions - -Connected element is expected to be a circle. -" -Class { - #name : #OPRTCircleSelfAttachPoint, - #superclass : #OPRTToSelfAttachPoint, - #instVars : [ - 'offset' - ], - #category : 'OpenPonk-Roassal2-Core' -} - -{ #category : #private } -OPRTCircleSelfAttachPoint >> cornerFor: anEdge [ - | c r | - c := anEdge from position. - r := anEdge from width / 2. "assuming circle" - ^ c + ((self legFor: r) @ (self legFor: r)) + (self n @ self n) -] - -{ #category : #'public - hooks' } -OPRTCircleSelfAttachPoint >> endingPointOf: anEdge [ - ^ (self cornerFor: anEdge) - (distance @ 0) -] - -{ #category : #private } -OPRTCircleSelfAttachPoint >> legFor: aRadius [ - ^ aRadius / 2 sqrt -] - -{ #category : #private } -OPRTCircleSelfAttachPoint >> n [ - ^ (self legFor: distance / 2) -] - -{ #category : #'public - hooks' } -OPRTCircleSelfAttachPoint >> startingPointOf: anEdge [ - ^ (self cornerFor: anEdge) - (0 @ distance) -] diff --git a/repository/OpenPonk-Roassal2/OPRTConditionallyDraggable.class.st b/repository/OpenPonk-Roassal2/OPRTConditionallyDraggable.class.st deleted file mode 100644 index 40b841022..000000000 --- a/repository/OpenPonk-Roassal2/OPRTConditionallyDraggable.class.st +++ /dev/null @@ -1,56 +0,0 @@ -Class { - #name : #OPRTConditionallyDraggable, - #superclass : #RTAbstractDraggable, - #instVars : [ - 'conditionBlock' - ], - #category : #'OpenPonk-Roassal2-Interactivity' -} - -{ #category : #initialization } -OPRTConditionallyDraggable class >> initializeElement: element onCondition: aBlock [ - - ^ self new - conditionBlock: aBlock; - initializeElement: element; - yourself -] - -{ #category : #initialization } -OPRTConditionallyDraggable class >> onCondition: aBlock [ - - ^ self new - conditionBlock: aBlock; - yourself -] - -{ #category : #initialization } -OPRTConditionallyDraggable >> conditionBlock: aBlock [ - - conditionBlock := aBlock -] - -{ #category : #initialization } -OPRTConditionallyDraggable >> initialize [ - - super initialize. - conditionBlock := [ true ] -] - -{ #category : #initialization } -OPRTConditionallyDraggable >> initializeElement: element onCondition: aBlock [ - - self - conditionBlock: aBlock; - initializeElement: element -] - -{ #category : #hooks } -OPRTConditionallyDraggable >> transformDistance: distanceAsPoint forElement: anElement [ - - "Nothing to be transformed since there is no restriction here" - - conditionBlock value - ifTrue: [ ^ distanceAsPoint ] - ifFalse: [ ^ 0 @ 0 ] -] diff --git a/repository/OpenPonk-Roassal2/OPRTConnection.class.st b/repository/OpenPonk-Roassal2/OPRTConnection.class.st deleted file mode 100644 index 397bb9a7a..000000000 --- a/repository/OpenPonk-Roassal2/OPRTConnection.class.st +++ /dev/null @@ -1,133 +0,0 @@ -" -I am a connection between two points. This connection can be straight line or a sequence of line segments. -" -Class { - #name : #OPRTConnection, - #superclass : #RTAbstractLine, - #instVars : [ - 'router' - ], - #category : #'OpenPonk-Roassal2-Connection' -} - -{ #category : #examples } -OPRTConnection class >> example [ -|v es e| -v := RTView new. -es := (RTEllipse new color: Color black; size: 20; elementsOn: #(1 2)). -e := OPRTConnection new color: Color red; edgeFrom: es first to: es second. -e shape addPoint: 30 @ 80. -v addAll: es; add: e. -es @ RTDraggable. -RTHorizontalLineLayout new horizontalGap: 50; on: es. -e @ OPRTConnectionHandles. - -v open - -] - -{ #category : #rendering } -OPRTConnection >> addOrRemoveLinesFor: anEdge trachelShape: trachelShape [ - | segmentsCount pointsCount shape canvas | - canvas := trachelShape canvas. - segmentsCount := (trachelShape shapes select: [ :each | each isKindOf: TRAbstractLineShape ]) size - 1. "-1 base segment" - pointsCount := self points size. - pointsCount - segmentsCount - timesRepeat: [ - "add segments" - shape := self lineSegmentFor: anEdge from: 0 @ 0 to: 0 @ 0. - - trachelShape addShapeFirst: shape. - shape element: trachelShape element. - shape announcer: trachelShape element announcer. - shape addedIn: canvas ]. - - segmentsCount - pointsCount - timesRepeat: [ - "remove segments" - trachelShape removeFirst remove ] -] - -{ #category : #adding } -OPRTConnection >> addPoint: aPoint [ - router addPoint: aPoint -] - -{ #category : #initialization } -OPRTConnection >> initialize [ - super initialize. - router := OPRTInteractiveRouter new -] - -{ #category : #rendering } -OPRTConnection >> lineSegmentFor: anEdge from: aSource to: aTarget [ - ^ TRLineShape new - width: (self widthFor: anEdge); - from: aSource to: aTarget; - color: (self colorFor: anEdge); - yourself -] - -{ #category : #rendering } -OPRTConnection >> pathFor: anEdge [ - | fromPoint toPoint | - fromPoint := attachPoint startingPointOf: anEdge. - toPoint := attachPoint endingPointOf: anEdge. - ^ {fromPoint} , self points , {toPoint} -] - -{ #category : #accessing } -OPRTConnection >> points [ - ^ router points -] - -{ #category : #accessing } -OPRTConnection >> router [ - ^ router -] - -{ #category : #accessing } -OPRTConnection >> router: aRouter [ - router := aRouter -] - -{ #category : #hooks } -OPRTConnection >> trachelShapeClass [ - - ^ TRCompositeShape -] - -{ #category : #rendering } -OPRTConnection >> trachelShapeFor: anEdge [ - - | shape multiShape path | - path := self pathFor: anEdge. - multiShape := self trachelShapeClass new. - path overlappingPairsDo: [ :a :b | - shape := self lineSegmentFor: anEdge from: a to: b. - multiShape addShape: shape ]. - ^ multiShape -] - -{ #category : #updating } -OPRTConnection >> translateBy: aPoint for: anEdge [ - router translateAllBy: aPoint. - anEdge update. - anEdge signalUpdate -] - -{ #category : #rendering } -OPRTConnection >> updateFor: anEdge trachelShape: trachelShape [ - | shape col path | - col := self colorFor: anEdge. - path := self pathFor: anEdge. - - self addOrRemoveLinesFor: anEdge trachelShape: trachelShape. - - 2 to: path size do: [ :i | - shape := trachelShape shapes at: i - 1. - shape width: (self widthFor: anEdge). - shape from: (path at: i - 1) to: (path at: i). - shape color: col ]. - ^ trachelShape -] diff --git a/repository/OpenPonk-Roassal2/OPRTConnectionHandles.class.st b/repository/OpenPonk-Roassal2/OPRTConnectionHandles.class.st deleted file mode 100644 index 13335c103..000000000 --- a/repository/OpenPonk-Roassal2/OPRTConnectionHandles.class.st +++ /dev/null @@ -1,120 +0,0 @@ -" -I add handles (interaction) to a DCRTConnection. -" -Class { - #name : #OPRTConnectionHandles, - #superclass : #RTInteraction, - #instVars : [ - 'edge', - 'handles', - 'midpointHandles', - 'isActive' - ], - #category : #'OpenPonk-Roassal2-Connection' -} - -{ #category : #private } -OPRTConnectionHandles >> connectWithView: aView [ - (aView hasAttribute: self className) - ifFalse: [ self setupView: aView ]. - aView canvas eventOverseer - when: TRMouseLeftClick - do: - [ :event | - (event element = edge) not & isActive - ifTrue: [ self removeHandles ] ] -] - -{ #category : #initialization } -OPRTConnectionHandles >> initialize [ - super initialize. - handles := OrderedCollection new. - midpointHandles := OrderedCollection new. - isActive := false -] - -{ #category : #initialization } -OPRTConnectionHandles >> initializeElement: anEdge [ - anEdge - when: TRMouseLeftClick - do: - [ - anEdge announcer unsubscribe: self. - self lazyInitializeElement: anEdge. - self showHandles ] -] - -{ #category : #initialization } -OPRTConnectionHandles >> lazyInitializeElement: anEdge [ - edge := anEdge. - edge shape router handler: self. - edge when: TRMouseLeftClick do: [ self showHandles ]. - edge trachelShape addCallback: (TRRemoveCallback block: [ self removeHandles ]). - self connectWithView: edge view -] - -{ #category : #'as yet unclassified' } -OPRTConnectionHandles >> promoteFor: anEdge handle: aMidpointHandle [ - | newPoint | - "1. Add point at midpoint's place. - 2. Remove midpoint handle. - 3. Do full reload." - newPoint := DoubleLink value: aMidpointHandle element position. - anEdge from = aMidpointHandle from - ifTrue: [ self router pointLinks addFirst: newPoint ] - ifFalse: [ self router pointLinks add: newPoint afterLink: (handles detect: [ :each | each element = aMidpointHandle from ]) pointLink ]. - self rebuild. - anEdge view canvas morph resetShapeBeingPointed -] - -{ #category : #private } -OPRTConnectionHandles >> rebuild [ - isActive - ifTrue: [ self removeHandles. - self showHandles ]. - edge update. - edge signalUpdate -] - -{ #category : #private } -OPRTConnectionHandles >> removeHandles [ - isActive - ifFalse: [ ^ self ]. - handles do: #remove. - handles := OrderedCollection new. - midpointHandles do: #remove. - midpointHandles := OrderedCollection new. - edge signalUpdate. - isActive := false -] - -{ #category : #'as yet unclassified' } -OPRTConnectionHandles >> router [ - ^ edge shape router -] - -{ #category : #private } -OPRTConnectionHandles >> setupView: aView [ - aView canvas eventOverseer ifNil: [ aView canvas eventOverseer: TRAnnouncingOverseer new ]. - aView attributeAt: self className put: true -] - -{ #category : #'as yet unclassified' } -OPRTConnectionHandles >> showHandles [ - isActive - ifTrue: [ ^ self ]. - edge shape router linksDo: [ :each | handles add: (OPRTBendHandle new on: edge at: each) ]. - handles do: [ :each | each renderIn: edge view ]. - self showMidpointHandlesFor: edge. - edge signalUpdate. - isActive := true -] - -{ #category : #'as yet unclassified' } -OPRTConnectionHandles >> showMidpointHandlesFor: anEdge [ - midpointHandles := {anEdge from} , (handles collect: [ :each | each element ]) , {anEdge to} - overlappingPairsCollect: [ :from :to | OPRTMidpointHandle new on: anEdge between: from and: to ]. - midpointHandles first beNearStart. - midpointHandles last beNearEnd. - midpointHandles do: [ :each | each renderIn: anEdge view ] -] diff --git a/repository/OpenPonk-Roassal2/OPRTDraggableSnapToGrid.class.st b/repository/OpenPonk-Roassal2/OPRTDraggableSnapToGrid.class.st deleted file mode 100644 index 4bbba12e9..000000000 --- a/repository/OpenPonk-Roassal2/OPRTDraggableSnapToGrid.class.st +++ /dev/null @@ -1,67 +0,0 @@ -Class { - #name : #OPRTDraggableSnapToGrid, - #superclass : #RTDraggableSnapToGrid, - #category : #'OpenPonk-Roassal2-Interactivity' -} - -{ #category : #hooks } -OPRTDraggableSnapToGrid >> initializeElementForCenter: element [ - | totalD spacing | - totalD := 0 @ 0. - element when: TRMouseDragStart do: [ :event | totalD := 0 @ 0 ]. - spacing := self gridSizeFor: element. - element - when: TRMouseDragging - do: [ :event | - | d t horizontalSpacing verticalSpacing | - horizontalSpacing := (element width rounded % (spacing * 2)) isZero - ifTrue: [ spacing / 2 ] - ifFalse: [ spacing ]. - verticalSpacing := (element height rounded % (spacing * 2)) isZero - ifTrue: [ spacing / 2 ] - ifFalse: [ spacing ]. - t := RTGroup withAll: groupToDrag. - (t includes: element) - ifFalse: [ t add: element ]. - d := element encompassingRectangle center. - d := d - + (element view canvas camera distanceFromPixelToSpace: event step). - totalD := totalD + d. - d := (horizontalSpacing * (totalD x / horizontalSpacing) rounded) - @ (verticalSpacing * (totalD y / verticalSpacing) rounded). - totalD := totalD - d. - d := d - element encompassingRectangle center. - t translateBy: d. - event signalUpdate ] -] - -{ #category : #hooks } -OPRTDraggableSnapToGrid >> initializeElementForTopLeft: element [ - | totalD spacing | - totalD := 0 @ 0. - element when: TRMouseDragStart do: [ :event | totalD := 0 @ 0 ]. - spacing := self gridSizeFor: element. - element - when: TRMouseDragging - do: [ :event | - | d t horizontalSpacing verticalSpacing | - horizontalSpacing := (element width rounded % (spacing * 2)) isZero - ifTrue: [ spacing / 2 ] - ifFalse: [ spacing ]. - verticalSpacing := (element height rounded % (spacing * 2)) isZero - ifTrue: [ spacing / 2 ] - ifFalse: [ spacing ]. - t := RTGroup withAll: groupToDrag. - (t includes: element) - ifFalse: [ t add: element ]. - d := element encompassingRectangle topLeft. - d := d - + (element view canvas camera distanceFromPixelToSpace: event step). - totalD := totalD + d. - d := (horizontalSpacing * (totalD x / horizontalSpacing) rounded) - @ (verticalSpacing * (totalD y / verticalSpacing) rounded). - totalD := totalD - d. - d := d - element encompassingRectangle topLeft. - t translateBy: d. - event signalUpdate ] -] diff --git a/repository/OpenPonk-Roassal2/OPRTEdgeAbstractConstraint.class.st b/repository/OpenPonk-Roassal2/OPRTEdgeAbstractConstraint.class.st deleted file mode 100644 index 573d21869..000000000 --- a/repository/OpenPonk-Roassal2/OPRTEdgeAbstractConstraint.class.st +++ /dev/null @@ -1,109 +0,0 @@ -" -A DCRTEdgeConstraint are utility classes that contain methods to position elements against edges -" -Class { - #name : #OPRTEdgeAbstractConstraint, - #superclass : #OPRTAbstractConstraint, - #instVars : [ - 'callbacks', - 'edge', - 'shape', - 'subscription', - 'offset' - ], - #category : 'OpenPonk-Roassal2-Constraints' -} - -{ #category : #accessing } -OPRTEdgeAbstractConstraint >> edge [ - ^ edge -] - -{ #category : #accessing } -OPRTEdgeAbstractConstraint >> edge: anEdge [ - edge := anEdge -] - -{ #category : #running } -OPRTEdgeAbstractConstraint >> fix [ - "reverse process of move: gets settings according to shape and edge positions" - - ^ self subclassResponsibility -] - -{ #category : #initialization } -OPRTEdgeAbstractConstraint >> initialize [ - super initialize. - callbacks := Bag new. - subscription := AnnouncementSubscription new - announcementClass: TRMouseDragEnd; - yourself. - offset := 0 -] - -{ #category : #running } -OPRTEdgeAbstractConstraint >> move [ - "moves shape according to edge positions and settings" - - ^ self subclassResponsibility -] - -{ #category : #accessing } -OPRTEdgeAbstractConstraint >> offset: anOffset [ - offset := anOffset -] - -{ #category : #private } -OPRTEdgeAbstractConstraint >> removeCallbacksOfEdge [ - callbacks - do: [ :each | - edge from trachelShape removeCallback: each ifAbsent: [ self error ]. - edge to trachelShape removeCallback: each ifAbsent: [ self error ] ]. - callbacks := Bag new -] - -{ #category : #private } -OPRTEdgeAbstractConstraint >> setCallbacksOfEdge [ - self removeCallbacksOfEdge. - callbacks ifEmpty: [ callbacks := Set with: TRTranslationCallback new with: TRExtentCallback new ]. - callbacks - do: [ :each | - each block: [ self move ]. - edge from addCallback: each. - edge to addCallback: each ] -] - -{ #category : #accessing } -OPRTEdgeAbstractConstraint >> shape [ - ^ shape -] - -{ #category : #accessing } -OPRTEdgeAbstractConstraint >> shape: aShape [ - shape := aShape -] - -{ #category : #running } -OPRTEdgeAbstractConstraint >> stick [ - "Moves shape according to edge positions and settings whenever edge is moved. - When shape is dragged, change settings via fix method" - - self - move; - setCallbacksOfEdge; - subscribeShapeDrag -] - -{ #category : #private } -OPRTEdgeAbstractConstraint >> subscribeShapeDrag [ - self unSubscribeShapeDrag. - subscription - announcer: shape announcer; - valuable: [ self fix ]. - shape announcer basicSubscribe: subscription -] - -{ #category : #private } -OPRTEdgeAbstractConstraint >> unSubscribeShapeDrag [ - shape announcer removeSubscription: subscription -] diff --git a/repository/OpenPonk-Roassal2/OPRTEdgeAlongConstraint.class.st b/repository/OpenPonk-Roassal2/OPRTEdgeAlongConstraint.class.st deleted file mode 100644 index 220cce98b..000000000 --- a/repository/OpenPonk-Roassal2/OPRTEdgeAlongConstraint.class.st +++ /dev/null @@ -1,130 +0,0 @@ -" -A DCRTEdgeEndConstraint is a utility class that contains methods to position elements against any point on edge -" -Class { - #name : #OPRTEdgeAlongConstraint, - #superclass : #OPRTEdgeAbstractConstraint, - #instVars : [ - 'balance' - ], - #category : #'OpenPonk-Roassal2-Constraints' -} - -{ #category : #'public - sticking' } -OPRTEdgeAlongConstraint class >> fix: aShape alongEdge: anEdge [ - "keeps current position of aShape against anEdge. Uses orthogonal distance from line and proportional distance from middle of line along it" - - ^ self new - shape: aShape; - edge: anEdge; - fix; - yourself -] - -{ #category : #'public - moving' } -OPRTEdgeAlongConstraint class >> move: aShape alongEdge: anEdge balance: aFloat offset: aNumber [ - "changes position of aShape against anEdge, with orthogonal offset distance from it. - balance = 0.5 => in the middle of line - balance = 0 => on the starting point of line - balance = 1 => on the ending point of line" - - ^ self new - shape: aShape; - edge: anEdge; - balance: aFloat; - offset: aNumber; - move; - yourself -] - -{ #category : #'public - moving' } -OPRTEdgeAlongConstraint class >> move: aShape alongEdge: anEdge offset: aNumber [ - "changes position of aShape against anEdge, in the middle of edge, with orthogonal offset distance from it" - - ^ self new - shape: aShape; - edge: anEdge; - offset: aNumber; - move; - yourself -] - -{ #category : #'public - sticking' } -OPRTEdgeAlongConstraint class >> stick: aShape alongEdge: anEdge balance: aFloat offset: aNumber [ - "keeps position of aShape against anEdge, with orthogonal offset distance from it. - balance = 0.5 => in the middle of line - balance = 0 => on the starting point of line - balance = 1 => on the ending point of line" - - ^ self new - shape: aShape; - edge: anEdge; - balance: aFloat; - offset: aNumber; - stick; - yourself -] - -{ #category : #'public - sticking' } -OPRTEdgeAlongConstraint class >> stick: aShape alongEdge: anEdge offset: aNumber [ - "keeps position of aShape against anEdge, in the middle of edge, with orthogonal offset distance from it" - - ^ self new - shape: aShape; - edge: anEdge; - offset: aNumber; - stick; - yourself -] - -{ #category : #accessing } -OPRTEdgeAlongConstraint >> balance: aBalance [ - balance := aBalance -] - -{ #category : #running } -OPRTEdgeAlongConstraint >> fix [ - - "a little math... reverse process of move: gets settings according to shape and edge positions" - - | startPoint endPoint nearestPoint edgeVector nearestPointVector positionVector edgeVectorR | - startPoint := edge shape startingPointOf: edge. - endPoint := edge shape endingPointOf: edge. - edgeVector := endPoint - startPoint. - nearestPoint := shape position - nearestPointAlongLineFrom: startPoint - to: endPoint. - positionVector := shape position - nearestPoint. - edgeVectorR := edgeVector r. - offset := shape position distanceTo: nearestPoint. - (edgeVector + positionVector rightRotated) r > edgeVectorR ifTrue: [ - offset := offset negated ]. - edgeVectorR < 5 - ifTrue: [ balance := 0.5 ] - ifFalse: [ - nearestPointVector := nearestPoint - startPoint. - edgeVector x = 0 - ifTrue: [ balance := nearestPointVector y / edgeVector y ] - ifFalse: [ - balance := edgeVector y = 0 - ifTrue: [ nearestPointVector x / edgeVector x ] - ifFalse: [ nearestPointVector / edgeVector ] ] ]. - self stick -] - -{ #category : #initialization } -OPRTEdgeAlongConstraint >> initialize [ - super initialize. - balance := 0.5 -] - -{ #category : #running } -OPRTEdgeAlongConstraint >> move [ - "moves shape according to edge positions and settings" - - | vector startPoint endPoint | - startPoint := edge shape startingPointOf: edge. - endPoint := edge shape endingPointOf: edge. - vector := endPoint - startPoint. - ^ shape translateTo: startPoint + (vector * balance) + (vector normal * offset) -] diff --git a/repository/OpenPonk-Roassal2/OPRTEdgeEndConstraint.class.st b/repository/OpenPonk-Roassal2/OPRTEdgeEndConstraint.class.st deleted file mode 100644 index 96062a357..000000000 --- a/repository/OpenPonk-Roassal2/OPRTEdgeEndConstraint.class.st +++ /dev/null @@ -1,156 +0,0 @@ -" -A DCRTEdgeEndConstraint is a utility class that contains methods to position elements against the start or the end of edges -" -Class { - #name : #OPRTEdgeEndConstraint, - #superclass : #OPRTEdgeAbstractConstraint, - #instVars : [ - 'distance', - 'origin' - ], - #category : #'OpenPonk-Roassal2-Constraints' -} - -{ #category : #'public - sticking' } -OPRTEdgeEndConstraint class >> fix: aShape nearEndOfEdge: anEdge [ - "keeps current position of aShape against anEdge. Uses orthogonal distance from line and distance from end of the line along it" - - ^ self new - shape: aShape; - edge: anEdge; - nearEnd; - fix; - yourself -] - -{ #category : #'public - sticking' } -OPRTEdgeEndConstraint class >> fix: aShape nearStartOfEdge: anEdge [ - "keeps current position of aShape against anEdge. Uses orthogonal distance from line and distance from start of the line along it" - - ^ self new - shape: aShape; - edge: anEdge; - nearStart; - fix; - yourself -] - -{ #category : #'public - moving' } -OPRTEdgeEndConstraint class >> move: aShape nearEndOfEdge: anEdge distance: aNumber offset: anotherNumber [ - "changes position of aShape against anEdge, with orthogonal offset distance from it and aNumber distance from end of the line" - - ^ self new - shape: aShape; - edge: anEdge; - nearEnd; - distance: aNumber; - offset: anotherNumber; - move; - yourself -] - -{ #category : #'public - moving' } -OPRTEdgeEndConstraint class >> move: aShape nearStartOfEdge: anEdge distance: aNumber offset: anotherNumber [ - "changes position of aShape against anEdge, with orthogonal offset distance from it and aNumber distance from start of the line" - - ^ self new - shape: aShape; - edge: anEdge; - nearStart; - distance: aNumber; - offset: anotherNumber; - move; - yourself -] - -{ #category : #'public - sticking' } -OPRTEdgeEndConstraint class >> stick: aShape nearEndOfEdge: anEdge distance: aNumber offset: anotherNumber [ - "keeps position of aShape against anEdge, with orthogonal offset distance from it and aNumber distance from end of the line" - - ^ self new - shape: aShape; - edge: anEdge; - nearEnd; - distance: aNumber; - offset: anotherNumber; - stick; - yourself -] - -{ #category : #'public - sticking' } -OPRTEdgeEndConstraint class >> stick: aShape nearStartOfEdge: anEdge distance: aNumber offset: anotherNumber [ - "keeps position of aShape against anEdge, with orthogonal offset distance from it and aNumber distance from start of the line" - - ^ self new - shape: aShape; - edge: anEdge; - nearStart; - distance: aNumber; - offset: anotherNumber; - stick; - yourself -] - -{ #category : #accessing } -OPRTEdgeEndConstraint >> distance: aDistance [ - distance := aDistance -] - -{ #category : #running } -OPRTEdgeEndConstraint >> fix [ - "a little math... reverse process of move: gets settings according to shape and edge positions" - - | startPoint endPoint originPoint nearestPoint edgeVector positionVector | - startPoint := edge shape startingPointOf: edge. - endPoint := edge shape endingPointOf: edge. - originPoint := origin = #start - ifTrue: [ startPoint ] - ifFalse: [ endPoint ]. - nearestPoint := shape position nearestPointAlongLineFrom: startPoint to: endPoint. - edgeVector := endPoint - startPoint. - positionVector := shape position - nearestPoint. - offset := shape position dist: nearestPoint. - (edgeVector + positionVector rightRotated) r > edgeVector r - ifTrue: [ offset := offset negated ]. - distance := nearestPoint dist: originPoint. - (shape position nearestPointOnLineFrom: startPoint to: endPoint) = originPoint - ifTrue: [ distance := distance negated ]. - self stick -] - -{ #category : #initialization } -OPRTEdgeEndConstraint >> initialize [ - super initialize. - distance := 0. - origin := #end -] - -{ #category : #running } -OPRTEdgeEndConstraint >> move [ - - | startPoint endPoint vector distVector | - startPoint := edge shape startingPointOf: edge. - endPoint := edge shape endingPointOf: edge. - shape translateTo: (origin = #start - ifTrue: [ startPoint ] - ifFalse: [ endPoint ]). - (vector := endPoint - startPoint) isZero ifTrue: [ ^ self ]. - distVector := distance * vector normalized. - origin = #end ifTrue: [ distVector := distVector negated ]. - shape translateBy: vector normal * offset + distVector -] - -{ #category : #accessing } -OPRTEdgeEndConstraint >> near [ - ^ origin -] - -{ #category : #accessing } -OPRTEdgeEndConstraint >> nearEnd [ - origin := #end -] - -{ #category : #accessing } -OPRTEdgeEndConstraint >> nearStart [ - origin := #start -] diff --git a/repository/OpenPonk-Roassal2/OPRTEdgeHighlighter.class.st b/repository/OpenPonk-Roassal2/OPRTEdgeHighlighter.class.st deleted file mode 100644 index 87b38b555..000000000 --- a/repository/OpenPonk-Roassal2/OPRTEdgeHighlighter.class.st +++ /dev/null @@ -1,45 +0,0 @@ -Class { - #name : #OPRTEdgeHighlighter, - #superclass : #OPRTHighlighter, - #category : #'OpenPonk-Roassal2-Builders' -} - -{ #category : #'instance creation' } -OPRTEdgeHighlighter class >> highlight: anElement color: aColor [ - ^ self new highlight: anElement color: aColor -] - -{ #category : #testing } -OPRTEdgeHighlighter class >> isDeprecated [ - ^ true -] - -{ #category : #testing } -OPRTEdgeHighlighter class >> isFor: anElement [ - ^ anElement isEdge - and: [ self environment - at: #OPUmlEdge - ifPresent: [ :cls | (anElement model isKindOf: cls) not ] - ifAbsent: [ true ] ] -] - -{ #category : #private } -OPRTEdgeHighlighter >> highlight: anEdge color: aColor [ - self hasStore - ifTrue: [ ^ self ]. - model := anEdge. - self store: (model shape colorFor: model). - model shape color: aColor. - model update. - model view signalUpdate -] - -{ #category : #protocol } -OPRTEdgeHighlighter >> remove [ - self hasStore - ifFalse: [ ^ self ]. - model shape color: self load. - self clearStore. - model update. - model view signalUpdate -] diff --git a/repository/OpenPonk-Roassal2/OPRTEdgeHighlighterTest.class.st b/repository/OpenPonk-Roassal2/OPRTEdgeHighlighterTest.class.st deleted file mode 100644 index d2da013df..000000000 --- a/repository/OpenPonk-Roassal2/OPRTEdgeHighlighterTest.class.st +++ /dev/null @@ -1,42 +0,0 @@ -Class { - #name : #OPRTEdgeHighlighterTest, - #superclass : #OPRTHighlighterTest, - #category : 'OpenPonk-Roassal2-Tests' -} - -{ #category : #running } -OPRTEdgeHighlighterTest >> setUp [ - super setUp. - highlighter := OPRTEdgeHighlighter new -] - -{ #category : #running } -OPRTEdgeHighlighterTest >> setUpModel [ - | endPoint | - endPoint := RTBox new element. - view add: endPoint. - model := RTLine new - color: Color blue; - edgeFrom: endPoint to: endPoint. - view add: model -] - -{ #category : #tests } -OPRTEdgeHighlighterTest >> testHighlight [ - self assert: (model shape colorFor: model) equals: Color blue. - highlighter highlight: model color: Color red. - self assert: (model shape colorFor: model) equals: Color red. - highlighter remove. - self assert: (model shape colorFor: model) equals: Color blue -] - -{ #category : #tests } -OPRTEdgeHighlighterTest >> testReentrant [ - self assert: (model shape colorFor: model) equals: Color blue. - highlighter highlight: model color: Color red. - self assert: (model shape colorFor: model) equals: Color red. - highlighter highlight: model color: Color yellow. - self assert: (model shape colorFor: model) equals: Color red. - highlighter remove. - self assert: (model shape colorFor: model) equals: Color blue -] diff --git a/repository/OpenPonk-Roassal2/OPRTEditableLabel.class.st b/repository/OpenPonk-Roassal2/OPRTEditableLabel.class.st deleted file mode 100644 index dd7e26881..000000000 --- a/repository/OpenPonk-Roassal2/OPRTEditableLabel.class.st +++ /dev/null @@ -1,28 +0,0 @@ -" -DCRTEditableLabel is a modification of Roassal's RTEditableLabel with the added support for raw Rubric events. (Namely rawKeystroke). -" -Class { - #name : #OPRTEditableLabel, - #superclass : #RTEditableLabel, - #instVars : [ - 'rawEvents' - ], - #category : 'OpenPonk-Roassal2-Shapes' -} - -{ #category : #initialization } -OPRTEditableLabel >> initialize [ - super initialize. - rawEvents := OrderedCollection new -] - -{ #category : #events } -OPRTEditableLabel >> onRawKeystroke: aBlock [ - rawEvents add: RubKeystroke -> aBlock -] - -{ #category : #rendering } -OPRTEditableLabel >> showTextMorphFor: anElement [ - super showTextMorphFor: anElement. - rawEvents do: [ :pair | fieldArea announcer subscribe: pair key send: #value: to: pair value ] -] diff --git a/repository/OpenPonk-Roassal2/OPRTElementHighlighter.class.st b/repository/OpenPonk-Roassal2/OPRTElementHighlighter.class.st deleted file mode 100644 index 843a41db3..000000000 --- a/repository/OpenPonk-Roassal2/OPRTElementHighlighter.class.st +++ /dev/null @@ -1,74 +0,0 @@ -Class { - #name : #OPRTElementHighlighter, - #superclass : #OPRTHighlighter, - #instVars : [ - 'noBorder' - ], - #category : #'OpenPonk-Roassal2-Builders' -} - -{ #category : #'instance creation' } -OPRTElementHighlighter class >> highlight: anElement color: aColor [ - ^ self new highlight: anElement color: aColor -] - -{ #category : #testing } -OPRTElementHighlighter class >> isDeprecated [ - ^ true -] - -{ #category : #testing } -OPRTElementHighlighter class >> isFor: anElement [ - ^ anElement isElement -] - -{ #category : #private } -OPRTElementHighlighter >> highlight: anElement color: aColor [ - | shape overlay originalCallbacks newCallbacks | - self hasStore - ifTrue: [ ^ self ]. - model := anElement. - shape := RTBox new. - model shape class = RTRoundedBox - ifTrue: [ (shape := RTRoundedBox new) borderRadius: (model shape borderRadiusFor: model) ]. - model shape class = RTEllipse - ifTrue: [ shape := RTEllipse new ]. - overlay := shape - color: (aColor alpha: 0.2); - borderColor: (aColor alpha: 0.2); - element. - noBorder - ifTrue: [ overlay trachelShape strokeWidth: 0. - overlay trachelShape strokePaint: Color blue ]. - originalCallbacks := model trachelShape callbacks copy. - OPRTElementsConstraint keepExtentOf: overlay like: model plus: 3 @ 3. - TRConstraint stick: overlay onTheCenterOf: model. - newCallbacks := model trachelShape callbacks \ originalCallbacks. - self store: (Array with: overlay with: newCallbacks). - model view add: overlay. - model view signalUpdate -] - -{ #category : #initialization } -OPRTElementHighlighter >> initialize [ - super initialize. - noBorder := false -] - -{ #category : #'as yet unclassified' } -OPRTElementHighlighter >> noBorder [ - noBorder := true -] - -{ #category : #protocol } -OPRTElementHighlighter >> remove [ - | overlayAndCallbacks | - self hasStore - ifFalse: [ ^ self ]. - overlayAndCallbacks := self load. - overlayAndCallbacks second - do: [ :each | model trachelShape removeCallback: each ifAbsent: [ ] ]. - self clearStore. - overlayAndCallbacks first remove. - model view signalUpdate -] diff --git a/repository/OpenPonk-Roassal2/OPRTElementHighlighterTest.class.st b/repository/OpenPonk-Roassal2/OPRTElementHighlighterTest.class.st deleted file mode 100644 index 36be97152..000000000 --- a/repository/OpenPonk-Roassal2/OPRTElementHighlighterTest.class.st +++ /dev/null @@ -1,45 +0,0 @@ -Class { - #name : #OPRTElementHighlighterTest, - #superclass : #OPRTHighlighterTest, - #category : 'OpenPonk-Roassal2-Tests' -} - -{ #category : #running } -OPRTElementHighlighterTest >> setUp [ - super setUp. - highlighter := OPRTElementHighlighter new -] - -{ #category : #running } -OPRTElementHighlighterTest >> setUpModel [ - model := RTBox new element. - view add: model -] - -{ #category : #running } -OPRTElementHighlighterTest >> testHighlight [ - | overlay | - self assert: model trachelShape callbacks isEmpty. - highlighter highlight: model color: Color red. - self assert: model trachelShape callbacks isNotEmpty. - overlay := (model attributes at: highlighter attributeKey) first. - highlighter highlight: model color: Color red. - self assert: (overlay shape colorFor: model) equals: (Color red alpha: 0.2). - self assert: overlay view equals: view. - highlighter remove. - self assert: model trachelShape callbacks isEmpty. - self assert: overlay view equals: nil -] - -{ #category : #running } -OPRTElementHighlighterTest >> testReentrant [ - | overlay | - highlighter highlight: model color: Color red. - overlay := highlighter load first. - self assert: (overlay shape colorFor: model) equals: (Color red alpha: 0.2). - highlighter highlight: model color: Color yellow. - self assert: highlighter load first equals: overlay. - self assert: (overlay shape colorFor: model) equals: (Color red alpha: 0.2). - highlighter remove. - self assert: overlay view equals: nil -] diff --git a/repository/OpenPonk-Roassal2/OPRTElementsConstraint.class.st b/repository/OpenPonk-Roassal2/OPRTElementsConstraint.class.st deleted file mode 100644 index 75ea7d4dc..000000000 --- a/repository/OpenPonk-Roassal2/OPRTElementsConstraint.class.st +++ /dev/null @@ -1,49 +0,0 @@ -" -A DCRTElementsConstraint is a utility class that contains methods to change element according other -" -Class { - #name : #OPRTElementsConstraint, - #superclass : #OPRTAbstractConstraint, - #category : #'OpenPonk-Roassal2-Constraints' -} - -{ #category : #'as yet unclassified' } -OPRTElementsConstraint class >> changeExtentOf: conformingShape like: originShape plus: aPoint [ - ^ conformingShape extent: originShape encompassingRectangle extent + aPoint -] - -{ #category : #'public - resizing' } -OPRTElementsConstraint class >> keepExtentOf: conformingShape like: originShape plus: aPoint [ - | b | - self changeExtentOf: conformingShape like: originShape plus: aPoint. - b := [ :shape :step | self changeExtentOf: conformingShape like: originShape plus: aPoint ]. - originShape - addCallback: (TRExtentCallback block: b); - addCallback: (TRTranslationCallback block: b) -] - -{ #category : #'public - visualization' } -OPRTElementsConstraint class >> whenDragging: anElement drawLineToPoint: aBlock [ - - | lineTargetBox dynamicLine | - anElement - when: TRMouseDragStart do: [ - (lineTargetBox := RTBox new - size: 0; - color: Color transparent; - element) translateTo: aBlock value. - anElement view - add: lineTargetBox; - add: (dynamicLine := (RTLine new color: Color veryLightGray) - edgeFrom: lineTargetBox - to: anElement); - signalUpdate ]; - when: TRMouseDragging - do: [ - lineTargetBox ifNotNil: [ lineTargetBox translateTo: aBlock value ] ]; - when: TRMouseDragEnd do: [ - dynamicLine ifNotNil: [ dynamicLine remove ]. - lineTargetBox ifNotNil: [ lineTargetBox remove ]. - dynamicLine := lineTargetBox := nil. - anElement view signalUpdate ] -] diff --git a/repository/OpenPonk-Roassal2/OPRTElementsConstraintTest.class.st b/repository/OpenPonk-Roassal2/OPRTElementsConstraintTest.class.st deleted file mode 100644 index daa6604f5..000000000 --- a/repository/OpenPonk-Roassal2/OPRTElementsConstraintTest.class.st +++ /dev/null @@ -1,45 +0,0 @@ -" -A DCTRConstraintTest is a test class for testing the behavior of DCTRConstraint -" -Class { - #name : #OPRTElementsConstraintTest, - #superclass : #TestCase, - #instVars : [ - 'conformingShape', - 'originShape' - ], - #category : 'OpenPonk-Roassal2-Tests' -} - -{ #category : #running } -OPRTElementsConstraintTest >> setUp [ - (originShape := TRBoxShape new) extent: 10 @ 10. - (conformingShape := TRBoxShape new) extent: 20 @ 20 -] - -{ #category : #tests } -OPRTElementsConstraintTest >> testChangingExtent [ - - OPRTElementsConstraint changeExtentOf: conformingShape like: originShape plus: 5 @ -5. - self assert: conformingShape extent = (15 @ 5). - self assert: originShape extent = (10 @ 10). - - originShape extent: 0 @ 0. - self assert: conformingShape extent = (15 @ 5). - - OPRTElementsConstraint changeExtentOf: conformingShape like: originShape plus: 0 @ 0. - self assert: conformingShape extent = (0 @ 0) -] - -{ #category : #tests } -OPRTElementsConstraintTest >> testKeepingExtent [ - originShape extent: 10 @ 10. - conformingShape extent: 20 @ 20. - OPRTElementsConstraint keepExtentOf: conformingShape like: originShape plus: 5 @ -5. - - self assert: conformingShape extent = (15 @ 5). - self assert: originShape extent = (10 @ 10). - - originShape extent: 0 @ 5. - self assert: conformingShape extent = (5 @ 0) -] diff --git a/repository/OpenPonk-Roassal2/OPRTEmptyDoubleArrow.class.st b/repository/OpenPonk-Roassal2/OPRTEmptyDoubleArrow.class.st deleted file mode 100644 index 5f78970fe..000000000 --- a/repository/OpenPonk-Roassal2/OPRTEmptyDoubleArrow.class.st +++ /dev/null @@ -1,10 +0,0 @@ -Class { - #name : #OPRTEmptyDoubleArrow, - #superclass : #OPRTAbstractDoubleArrow, - #category : #'OpenPonk-Roassal2-Shapes' -} - -{ #category : #hooks } -OPRTEmptyDoubleArrow class >> trachelShapeClass [ - ^ OPTREmptyDoubleArrowHeadShape -] diff --git a/repository/OpenPonk-Roassal2/OPRTExamples.class.st b/repository/OpenPonk-Roassal2/OPRTExamples.class.st deleted file mode 100644 index 61b6fbf3d..000000000 --- a/repository/OpenPonk-Roassal2/OPRTExamples.class.st +++ /dev/null @@ -1,83 +0,0 @@ -" -I contain some examples for shapes and utilities available in this package. -" -Class { - #name : #OPRTExamples, - #superclass : #RTAbstractExample, - #category : #'OpenPonk-Roassal2-Examples' -} - -{ #category : #'as yet unclassified' } -OPRTExamples class >> editExample [ -