started integrating diagrams code

OpenPonk · Jan 26, 2020 · 80840f7 · 80840f7
1 parent 4468ac9
commit 80840f7
Show file tree

Hide file tree

Showing 48 changed files with 2,218 additions and 814 deletions.
diff --git a/repository/OpenPonk-Core/OPAbstractSerializer.class.st b/repository/OpenPonk-Core/OPAbstractSerializer.class.st
@@ -23,14 +23,21 @@ OPAbstractSerializer >> loadDiagramFrom: aFolder [
 OPAbstractSerializer >> loadMementoFrom: aFolder [
 	^ OPPersistenceMemento
 		model: (self loadModelFrom: aFolder)
-		diagram: (self loadDiagramFrom: aFolder)
+		diagrams: (self loadViewsFrom: aFolder)
 ]
 
 { #category : #loading }
 OPAbstractSerializer >> loadModelFrom: aFolder [
 	^ self materializeModelFrom: (aFolder / 'model' , self modelExtension) contents
 ]
 
+{ #category : #loading }
+OPAbstractSerializer >> loadViewsFrom: aFolder [
+	(aFolder / 'views') exists
+		ifFalse: [ ^ nil ].
+	^ self loadViewsFrom: aFolder / 'views'
+]
+
 { #category : #'serialize/materialize' }
 OPAbstractSerializer >> materializeDiagramFrom: aString [
 	"materialize aString into a diagram memento that will be consumed by your controller"
@@ -45,7 +52,7 @@ OPAbstractSerializer >> materializeMementoFrom: aString [
 		on: aString readStream) next.
 	^ OPPersistenceMemento
 		model: (self materializeModelFrom: (unwrapped at: #model))
-		diagram: (self materializeDiagramFrom: (unwrapped at: #diagram))
+		diagrams: (self materializeViewsFrom: (unwrapped at: #diagrams))
 ]
 
 { #category : #'serialize/materialize' }
@@ -54,6 +61,11 @@ OPAbstractSerializer >> materializeModelFrom: aString [
 	^ self subclassResponsibility
 ]
 
+{ #category : #'serialize/materialize' }
+OPAbstractSerializer >> materializeViewFrom: aString [
+	^ self subclassResponsibility
+]
+
 { #category : #accessing }
 OPAbstractSerializer >> modelExtension [
 	^ self subclassResponsibility
@@ -72,7 +84,7 @@ OPAbstractSerializer >> saveDiagram: aMemento to: aFolder [
 { #category : #saving }
 OPAbstractSerializer >> saveMemento: aMemento to: aFolder [
 	self saveModel: aMemento to: aFolder.
-	self saveDiagram: aMemento to: aFolder
+	self saveViewsOf: aMemento to: aFolder
 ]
 
 { #category : #saving }
@@ -102,3 +114,8 @@ OPAbstractSerializer >> serializeModel: aModel [
 	"serialize your model into a string"
 	^ self subclassResponsibility
 ]
+
+{ #category : #'serialize/materialize' }
+OPAbstractSerializer >> serializeView: aDiagramView [
+	^ self subclassResponsibility
+]
diff --git a/repository/OpenPonk-Core/OPAbstractSerializerTest.class.st b/repository/OpenPonk-Core/OPAbstractSerializerTest.class.st
@@ -19,7 +19,7 @@ OPAbstractSerializerTest class >> isAbstract [
 OPAbstractSerializerTest >> newMementoWithModel: aModel [
 	^ OPPersistenceMemento
 		model: aModel
-		diagram: {('1' -> '2')} asDictionary
+		diagrams: {(OPDiagram defaultDiagramFor: aModel)}
 ]
 
 { #category : #'instance creation' }

diff --git a/repository/OpenPonk-Core/OPController.class.st b/repository/OpenPonk-Core/OPController.class.st
@@ -40,6 +40,11 @@ OPController >> addAsTargetFor: aController [
 		andShowInDiagram: self diagramController
 ]
 
+{ #category : #accessing }
+OPController >> allElementsInModel [
+	^ {self model} asSet , self allOwnedElementsInModel
+]
+
 { #category : #accessing }
 OPController >> allOwnedElementsInModel [
 	^ #()
@@ -122,6 +127,11 @@ OPController >> internalUnsubscribeFrom: aModel [
 	aModel announcer unsubscribe: self
 ]
 
+{ #category : #testing }
+OPController >> isHideable [
+	^ false
+]
+
 { #category : #accessing }
 OPController >> layout [
 	^ nil

diff --git a/repository/OpenPonk-Core/OPDiagram.class.st b/repository/OpenPonk-Core/OPDiagram.class.st
@@ -0,0 +1,289 @@
+"
+I represent a view of a model. The content of the model can be filtered, explicitly shown, or explicitly hidden.
+Further I contain the layout of the entities in the view, and layout/configuration of the view itself.
+"
+Class {
+	#name : #OPDiagram,
+	#superclass : #Object,
+	#instVars : [
+		'project',
+		'name',
+		'isOpen',
+		'filters',
+		'layout',
+		'notes',
+		'modelName',
+		'modelType',
+		'order',
+		'modelVersion',
+		'isSelected',
+		'camera',
+		'version',
+		'visibleElements',
+		'model',
+		'options'
+	],
+	#category : #'OpenPonk-Core-Diagrams'
+}
+
+{ #category : #'instance creation' }
+OPDiagram class >> defaultDiagramFor: aModel [
+	^ self new
+		name: 'default';
+		model: aModel;
+		isOpen: false;
+		isSelected: false
+]
+
+{ #category : #'instance creation' }
+OPDiagram class >> fromJson: aString [
+	^ (NeoJSONReader on: aString readStream)
+		mapInstVarsFor: self;
+		for: self
+			do: [ :mapping | 
+			(mapping mapInstVar: #camera) valueSchema: OPDiagramCamera.
+			(mapping mapInstVar: #layout) valueSchema: #MapOfPoints".
+			(mapping mapInstVar: #filters) valueSchema: #ListOfFilters" ];
+		mapInstVarsFor: OPDiagramCamera;
+		for: OPDiagramCamera
+			do: [ :mapping | (mapping mapInstVar: #offset) valueSchema: Point ];
+		mapInstVarsFor: Point;
+		for: #MapOfPoints customDo: [ :mapping | mapping mapWithValueSchema: Point ];
+		for: #ListOfFilters
+			customDo: [ :mapping | mapping listOfType: OrderedCollection andElementSchema: #Filter ];
+"		for: #Filter
+			customDo: [ :mapping | mapping decoder: [ :data | NSPDiagramViewFilter decodeFrom: data ] ];"
+		nextAs: self
+]
+
+{ #category : #converting }
+OPDiagram >> asInfo [
+	^ OPDiagramInfo new
+		modelType: self modelType;
+		modelName: self modelName;
+		modelVersion: self modelVersion;
+		diagramName: self name;
+		isOpen: self isOpen;
+		isSelected: self isSelected;
+		order: self order;
+		yourself
+]
+
+{ #category : #serializing }
+OPDiagram >> asJson [
+	^ String
+		<< [ :stream | 
+			(OPJsonWriter on: stream)
+				for: OPDiagram
+					do: [ :mapping | 
+					mapping
+						mapInstVars:
+							mapping identifier instVarNames
+								\ #(project model modelName modelType modelVersion).
+					#(modelName modelVersion modelType) do: [ :each | mapping mapAccessor: each ] ];
+				mapInstVarsFor: OPDiagramCamera;
+				mapInstVarsFor: Point;
+				nextPut: self ]
+]
+
+{ #category : #accessing }
+OPDiagram >> camera [
+	^ camera
+]
+
+{ #category : #accessing }
+OPDiagram >> camera: aCameraSettings [
+	camera := aCameraSettings
+]
+
+{ #category : #initialization }
+OPDiagram >> initialize [
+	super initialize.
+	filters := OrderedCollection new.
+	visibleElements := OrderedCollection new.
+	options := Dictionary new
+]
+
+{ #category : #testing }
+OPDiagram >> isDefault [
+	^ self name = 'default'
+]
+
+{ #category : #accessing }
+OPDiagram >> isOpen [
+	^ isOpen
+]
+
+{ #category : #accessing }
+OPDiagram >> isOpen: aBoolean [
+	isOpen := aBoolean
+]
+
+{ #category : #accessing }
+OPDiagram >> isSelected [
+	^ isSelected
+]
+
+{ #category : #accessing }
+OPDiagram >> isSelected: aBoolean [
+	isSelected := aBoolean
+]
+
+{ #category : #accessing }
+OPDiagram >> layout [
+	^ layout ifNil: [ #() asDictionary ]
+]
+
+{ #category : #accessing }
+OPDiagram >> layout: aCollection [
+	layout := aCollection
+]
+
+{ #category : #accessing }
+OPDiagram >> model [
+	self
+		assert: [ self project isNotNil ]
+		description: 'Cannot retrieve model of a detached view.'.
+	model ifNotNil: [ ^ model ].
+	^ self project models
+		detect:
+			[ :each | each class name = self modelType and: [ each name = self modelName ] ]
+]
+
+{ #category : #accessing }
+OPDiagram >> model: aModel [
+	model := aModel
+]
+
+{ #category : #accessing }
+OPDiagram >> modelName [
+	^ model ifNil: [ modelName ] ifNotNil: #name
+]
+
+{ #category : #accessing }
+OPDiagram >> modelName: aString [
+	modelName := aString
+]
+
+{ #category : #accessing }
+OPDiagram >> modelType [
+	^ model
+		ifNil: [ modelType ]
+		ifNotNil: [ "NSP compat"
+			(model respondsTo: #typeName)
+				ifTrue: [ model typeName ]
+				ifFalse: [ model class name ] ]
+]
+
+{ #category : #accessing }
+OPDiagram >> modelType: aString [
+	modelType := aString
+]
+
+{ #category : #accessing }
+OPDiagram >> modelVersion [
+	^ model
+		ifNil: [ modelVersion ]
+		ifNotNil: [ "NSM compat"
+			(model respondsTo: #version)
+				ifTrue: [ model version ]
+				ifFalse: [ nil ] ]
+]
+
+{ #category : #accessing }
+OPDiagram >> modelVersion: aModelVersion [
+	modelVersion := aModelVersion
+]
+
+{ #category : #accessing }
+OPDiagram >> name [
+	^ name
+]
+
+{ #category : #accessing }
+OPDiagram >> name: aName [
+	name := aName
+]
+
+{ #category : #copying }
+OPDiagram >> newCopy [
+	| newView |
+	newView := self class fromJson: self asJson.
+	newView name: 'copy of ' , self name.
+	newView model: model.
+	newView project: project.
+	^ newView
+]
+
+{ #category : #accessing }
+OPDiagram >> notes [
+	^ notes
+]
+
+{ #category : #accessing }
+OPDiagram >> notes: aCollection [
+	notes := aCollection
+]
+
+{ #category : #accessing }
+OPDiagram >> options [
+	^ options
+]
+
+{ #category : #accessing }
+OPDiagram >> options: aDictionary [
+	options := aDictionary
+]
+
+{ #category : #accessing }
+OPDiagram >> order [
+	^ order ifNil: [ 0 ]
+]
+
+{ #category : #accessing }
+OPDiagram >> order: anOrder [
+	order := anOrder
+]
+
+{ #category : #printing }
+OPDiagram >> printOn: aStream [
+	super printOn: aStream.
+	aStream << '(' << self name printString << '@' << self modelName printString << '-'
+		<< self modelVersion printString << ')'
+]
+
+{ #category : #accessing }
+OPDiagram >> project [
+	^ project
+]
+
+{ #category : #accessing }
+OPDiagram >> project: aProject [
+	project := aProject
+]
+
+{ #category : #converting }
+OPDiagram >> updateFromInfo: anInfo [
+	self isOpen: anInfo isOpen.
+	self isSelected: anInfo isSelected.
+	self order: anInfo order
+]
+
+{ #category : #accessing }
+OPDiagram >> updateFromRoassalView: aView [
+	self
+		camera:
+			(OPDiagramCamera new
+				offset: aView canvas camera position;
+				zoom: aView canvas camera scale)
+]
+
+{ #category : #accessing }
+OPDiagram >> visibleElements [
+	^ visibleElements
+]
+
+{ #category : #accessing }
+OPDiagram >> visibleElements: aCollection [
+	visibleElements := aCollection
+]