Merge pull request #22 from OpenSmock/21-Separatation-between-Molecul…

…e-and-GeoView-core Better separation between Core and Molecule
OpenSmock · Aug 30, 2024 · daf443b · daf443b
2 parents 2b807ae + f22fa30
commit daf443b
Show file tree

Hide file tree

Showing 82 changed files with 1,798 additions and 1,284 deletions.
diff --git a/BaselineOfGeoView/BaselineOfGeoView.class.st b/BaselineOfGeoView/BaselineOfGeoView.class.st
@@ -44,20 +44,35 @@ BaselineOfGeoView >> coreDependencies: spec [
 { #category : #packages }
 BaselineOfGeoView >> corePackages: spec [
 
+	"Core and graphical backend packages"
 	spec
 		package: 'GeoView' with:[ spec requires: #('OpenSmock' 'GeoTools') ];
 		package: 'GeoView-GeoObjects' with:[ spec requires: #('GeoView') ];
 		package: 'GeoView-Bloc' with:[ spec requires: #('GeoView') ];
 		package: 'GeoView-Bloc-Alexandrie' with:[ spec requires: #('GeoView-Bloc') ].
 
+	"Molecule integration packages"
+	spec
+		package: 'GeoView-Molecule' with:[ spec requires: #('GeoView' 'GeoView-GeoObjects') ];
+		package: 'GeoView-Bloc-Alexandrie-Molecule' with:[ spec requires: #('GeoView-Bloc-Alexandrie') ].
+
 	"examples packages"
 	spec
-		package: 'GeoView-Examples' with:[ spec requires: #('GeoView' 'GeoView-GeoObjects') ];
-		package: 'GeoView-Examples-Bloc' with:[ spec requires: #('GeoView-Examples') ].
+		package: 'GeoView-Examples-Bloc' with:[ spec requires: #('GeoView-Bloc' 'GeoView-GeoObjects') ].
+
+	"examples with Molecule packages"
+	spec
+		package: 'GeoView-Examples-Bloc-Molecule' with:[ spec requires: #('GeoView-Molecule' 'GeoView-Bloc-Alexandrie-Molecule') ].
 
 	"Tests packages"
 	spec
-		package: 'GeoView-Tests' with: [ spec requires: #('GeoView' 'GeoView-GeoObjects') ].
+		package: 'GeoView-Tests' with: [ spec requires: #('GeoView' 'GeoView-GeoObjects') ];
+		package: 'GeoView-Bloc-Tests' with: [ spec requires: #('GeoView-Bloc') ].
+
+	"Tests with Molecule packages"
+	spec
+		package: 'GeoView-Molecule-Tests' with: [ spec requires: #('GeoView-Molecule') ].
+
 ]
 
 { #category : #baselines }

diff --git a/GeoView-Bloc-Alexandrie-Molecule/GeoViewManagerBlocAeImpl.class.st b/GeoView-Bloc-Alexandrie-Molecule/GeoViewManagerBlocAeImpl.class.st
@@ -0,0 +1,38 @@
+Class {
+	#name : #GeoViewManagerBlocAeImpl,
+	#superclass : #GeoViewManagerImpl,
+	#category : #'GeoView-Bloc-Alexandrie-Molecule'
+}
+
+{ #category : #'layer creation' }
+GeoViewManagerBlocAeImpl >> createGeoObjectsLayer: aName [
+
+	| layer |
+	layer := GeoViewGeoObjectsLayer new.
+	layer name: aName.
+	layer displayModel indexAccessor: self getObjectIndexAccessor.
+
+	^ layer
+]
+
+{ #category : #initialization }
+GeoViewManagerBlocAeImpl >> createView [
+
+	| element |
+	element := BlGeoViewAeElement new.
+	self installEventHandlers: element.
+
+	self view: element.
+]
+
+{ #category : #initialization }
+GeoViewManagerBlocAeImpl >> installEventHandlers: aBlElement [
+
+	aBlElement addEventHandlerOn: GeoViewLayerProcessDataChanged do: [ :e | self layerHasBeenUpdated: e layerName ]
+]
+
+{ #category : #'services - drawing' }
+GeoViewManagerBlocAeImpl >> requestViewUpdate [
+
+	self view requestRepaint
+]
diff --git a/GeoView-Bloc-Alexandrie-Molecule/package.st b/GeoView-Bloc-Alexandrie-Molecule/package.st
@@ -0,0 +1 @@
+Package { #name : #'GeoView-Bloc-Alexandrie-Molecule' }
diff --git a/GeoView-Bloc-Alexandrie/BlElementAeGeoView.class.st b/GeoView-Bloc-Alexandrie/BlElementAeGeoView.class.st
diff --git a/GeoView-Bloc-Alexandrie/BlGeoViewAeElement.class.st b/GeoView-Bloc-Alexandrie/BlGeoViewAeElement.class.st
@@ -0,0 +1,64 @@
+"
+I am a BlElement which display a GeoViewWidget using Alexandrie backend drawing.
+"
+Class {
+	#name : #BlGeoViewAeElement,
+	#superclass : #BlAbstractGeoViewElement,
+	#instVars : [
+		'inputContext'
+	],
+	#category : #'GeoView-Bloc-Alexandrie-Core'
+}
+
+{ #category : #drawing }
+BlGeoViewAeElement >> aeDrawOn: aeCanvas [
+	"drawing native bloc elements"
+
+	| sort |
+	super aeDrawOn: aeCanvas.
+
+	sort := self isMarkedForSortDatas.
+	self layers do: [ :l |
+		sort ifTrue: [ l sortDatas ].
+		l aeDrawOn: aeCanvas ].
+
+	isMarkedForSortDatas := false
+]
+
+{ #category : #'API -- picking' }
+BlGeoViewAeElement >> pickAt: aGlobalPoint radius: aRadiusInPixels [
+	"prepare the picking result"
+
+	| pickingResult distanceBlock radius |
+	pickingResult := (super pickAt: aGlobalPoint radius: aRadiusInPixels) ifNil:[ ^ nil ].
+
+	"labordep: prepare to be setup with others blocks"
+	distanceBlock := [ :gShape :point | gShape distanceTo: point ].
+	radius := aRadiusInPixels ifNil:[ 0 ].
+
+	"Collect all picked elements"
+	self getLayers do:[ :l | 
+		l graphicModel datas keysAndValuesDo:[ :key :gShape | | distanceInPixels pickingElement |
+
+			"Way to detect if the gShape is picked"
+			distanceInPixels := distanceBlock value: gShape value: pickingResult localPoint.
+			distanceInPixels <= radius ifTrue:[
+
+				"Store the element into the result"				
+				pickingElement := GeoViewPickingElement new.
+				pickingElement layerName: l name.
+				pickingElement layerLevel: nil. self flag:'labordep: put the level of the layer'.
+				pickingElement distanceInPixels: distanceInPixels.
+				pickingElement objectKey: key.
+				pickingElement dShape: (l displayModel getData: key).
+				pickingElement gShape: gShape.
+
+				pickingResult addPickingElement: pickingElement.
+
+			].			
+		].
+	].
+
+	pickingResult applyOrder: [ :a :b | a distanceInPixels < b distanceInPixels ].
+	^ pickingResult
+]
diff --git a/...wUserToDisplayToGraphicLayer.extension.st → ...ndrie/GeoViewGeoObjectsLayer.extension.st b/...wUserToDisplayToGraphicLayer.extension.st → ...ndrie/GeoViewGeoObjectsLayer.extension.st
@@ -1,7 +1,7 @@
-Extension { #name : #GeoViewUserToDisplayToGraphicLayer }
+Extension { #name : #GeoViewGeoObjectsLayer }
 
 { #category : #'*GeoView-Bloc-Alexandrie' }
-GeoViewUserToDisplayToGraphicLayer >> aeDrawOn: aeCanvas [
+GeoViewGeoObjectsLayer >> aeDrawOn: aeCanvas [
 
 	self isVisible ifFalse: [ ^ self ].
 	sortedDatas ifNil: [ ^ self ].