An epoche is now a tab view

hpi-swa · Feb 19, 2024 · 2ee71e6 · 2ee71e6
1 parent 4e5c0d8
commit 2ee71e6
Show file tree

Hide file tree

Showing 11 changed files with 57 additions and 78 deletions.
diff --git a/packages/Sandblocks-Babylonian/SBDiffTabView.class.st b/packages/Sandblocks-Babylonian/SBDiffTabView.class.st
@@ -103,6 +103,7 @@ SBDiffTabView >> initialize [
 	super initialize.
 
 	isShowingDiff := false.
+	self hResizing: #spaceFill.
 ]
 
 { #category : #accessing }

diff --git a/packages/Sandblocks-Babylonian/SBExampleGridsView.class.st b/packages/Sandblocks-Babylonian/SBExampleGridsView.class.st
@@ -36,12 +36,6 @@ SBExampleGridsView >> currentClusterClass [
 		ifFalse: [SBExampleCluster]
 ]
 
-{ #category : #updating }
-SBExampleGridsView >> gridSize [
-
-	^ self multiverse activeExamples size
-]
-
 { #category : #initialization }
 SBExampleGridsView >> initialize [ 
 

diff --git a/packages/Sandblocks-Babylonian/SBExploriantsView.class.st b/packages/Sandblocks-Babylonian/SBExploriantsView.class.st
@@ -118,8 +118,7 @@ SBExploriantsView >> resolveButton [
 { #category : #copying }
 SBExploriantsView >> snapshot [
 
-	"Return a collection of morphs which capture the current state of this view"
-	^ self subclassResponsibility 
+	^ ImageMorph new newForm: self block imageForm
 ]
 
 { #category : #building }
@@ -139,3 +138,10 @@ SBExploriantsView >> visualize [
 
 	self buildButtonRow
 ]
+
+{ #category : #copying }
+SBExploriantsView >> wantsHistory [
+
+	"If returning true, will be automatically collected for an epoche in the history view"
+	^ true
+]
diff --git a/packages/Sandblocks-Babylonian/SBGridResultsView.class.st b/packages/Sandblocks-Babylonian/SBGridResultsView.class.st
@@ -23,41 +23,9 @@ SBGridResultsView >> concludeContainerWidth [
 	widthTillWrap := self multiverse sandblockEditor width * 0.9.
 	gridContainer fullBounds width < widthTillWrap ifTrue: [^ self]. 
 
-	self descentToScreenRatioMaxWidth: widthTillWrap.
-
-	gridContainer hResizing: #shrinkWrap.
-]
-
-{ #category : #updating }
-SBGridResultsView >> descentToScreenRatioMaxWidth: maxWidth [
-
-	| editorRatio submorphIndex |
 	gridContainer hResizing: #rigid; wrapDirection: #topToBottom.
-	editorRatio := DisplayScreen boundingBox width /  DisplayScreen boundingBox height.
-	submorphIndex := gridContainer submorphs size.
-
-	[gridContainer fullBounds width / gridContainer height > editorRatio 
-		and: [submorphIndex > 1]]
-		whileTrue: [ | isBelowMax |
-			isBelowMax := gridContainer width < maxWidth.
-			gridContainer width: gridContainer width 
-								- (gridContainer submorphs atWrap:  submorphIndex) width.
-
-			(editorRatio > 1 
-			and: [gridContainer fullBounds height >= gridContainer width]
-			and: [isBelowMax])
-				ifTrue: [ gridContainer width: gridContainer width 
-											+(gridContainer submorphs atWrap:  submorphIndex) width.
-						submorphIndex := -1]
-				ifFalse: [submorphIndex := submorphIndex - 1]].
-
-	gridContainer width > maxWidth ifTrue: [gridContainer width: maxWidth]
-]
-
-{ #category : #updating }
-SBGridResultsView >> gridSize [
-
-	self subclassResponsibility 
+	gridContainer width: widthTillWrap.
+	gridContainer hResizing: #shrinkWrap.
 ]
 
 { #category : #initialization }

diff --git a/packages/Sandblocks-Babylonian/SBHistoryView.class.st b/packages/Sandblocks-Babylonian/SBHistoryView.class.st
@@ -20,19 +20,35 @@ SBHistoryView >> buildEpoche [
 	^ row
 		cellGap: 0@10; 
 		listDirection: #topToBottom;
-		addMorphBack: (self containerRow
-							cellGap: 5@0;
-							addMorphBack: (self deleteEpocheButton: row); 
-							addMorphBack: TimeStamp current asMorph);
-		addMorphBack: (self containerRow
-							layoutInset: 0;
-							cellGap: 0;
-							cellInset: 0; 
-							addAllMorphsBack:  self collectSnapshots)
+		addAllMorphsBack: {self buildMetaUsageIn: row. self buildSnapshotTabView}
 
 
 ]
 
+{ #category : #building }
+SBHistoryView >> buildMetaUsageIn: aRow [
+
+	^ self containerRow
+		cellGap: 5@0;
+		addAllMorphsBack: {self deleteEpocheButton: aRow. 
+								TextMorph new contents: (Text fromString: TimeStamp current asStringOrText) allBold}
+
+
+]
+
+{ #category : #building }
+SBHistoryView >> buildSnapshotTabView [
+
+	^ SBTabView 
+		namedBlocks: (SBExploriants uniqueInstance namedBlocks 
+							select: #wantsHistory 
+							thenCollect: [:aTab | SBNamedBlock block: aTab snapshot named: aTab name]) 
+		activeIndex: (SBExploriants uniqueInstance active wantsHistory
+							ifTrue: [SBExploriants uniqueInstance activeIndex] 
+							 ifFalse: [1])
+
+]
+
 { #category : #building }
 SBHistoryView >> buttons [
 
@@ -83,14 +99,14 @@ SBHistoryView >> maxEpoches [
 	^ 100
 ]
 
-{ #category : #copying }
-SBHistoryView >> snapshot [ 
-
-	^ {}
-]
-
 { #category : #actions }
 SBHistoryView >> visualize [ 
 
 	self addEpoche
 ]
+
+{ #category : #copying }
+SBHistoryView >> wantsHistory [
+
+	^ false
+]
diff --git a/packages/Sandblocks-Babylonian/SBLiveView.class.st b/packages/Sandblocks-Babylonian/SBLiveView.class.st
@@ -87,12 +87,6 @@ SBLiveView >> evaluateSetUp [
 	^ return
 ]
 
-{ #category : #updating }
-SBLiveView >> gridSize [
-
-	^ self multiverse universes size + 1
-]
-
 { #category : #initialization }
 SBLiveView >> initialize [ 
 
@@ -205,8 +199,12 @@ SBLiveView >> setUpMorph [
 
 { #category : #copying }
 SBLiveView >> snapshot [
-
-	^ {ImageMorph new newForm: gridContainer imageForm}
+
+	^ self containerRow 
+				listDirection: #topToBottom;
+				addAllMorphsBack: {
+					ImageMorph new newForm: (self block submorphNamed: 'setup') imageForm.
+					ImageMorph new newForm: gridContainer imageForm}
 ]
 
 { #category : #building }

diff --git a/packages/Sandblocks-Babylonian/SBPermutationGridsView.class.st b/packages/Sandblocks-Babylonian/SBPermutationGridsView.class.st
@@ -32,12 +32,6 @@ SBPermutationGridsView >> currentClusterClass [
 		ifFalse: [SBPermutationCluster]
 ]
 
-{ #category : #updating }
-SBPermutationGridsView >> gridSize [
-
-	^ self multiverse universes size
-]
-
 { #category : #initialization }
 SBPermutationGridsView >> initialize [ 
 

diff --git a/packages/Sandblocks-Babylonian/SBPlainResultsView.class.st b/packages/Sandblocks-Babylonian/SBPlainResultsView.class.st
@@ -29,7 +29,7 @@ SBPlainResultsView >> initialize [
 ]
 
 { #category : #copying }
-SBPlainResultsView >> snapshot [
-
-	^ {}
+SBPlainResultsView >> wantsHistory [
+	
+	^ false
 ]
diff --git a/packages/Sandblocks-Babylonian/SBSwitchableResultsView.class.st b/packages/Sandblocks-Babylonian/SBSwitchableResultsView.class.st
@@ -62,7 +62,7 @@ SBSwitchableResultsView >> selectedResizer [
 { #category : #'as yet unclassified' }
 SBSwitchableResultsView >> snapshot [
 
-	^ {ImageMorph new newForm: gridContainer imageForm}
+	^ ImageMorph new newForm: gridContainer imageForm
 
 ]
 

diff --git a/packages/Sandblocks-Babylonian/SBVariantsView.class.st b/packages/Sandblocks-Babylonian/SBVariantsView.class.st
@@ -44,7 +44,7 @@ SBVariantsView >> initialize [
 { #category : #copying }
 SBVariantsView >> snapshot [
 
-	^ {ImageMorph new newForm: contents imageForm}
+	^ ImageMorph new newForm: contents imageForm
 ]
 
 { #category : #actions }

diff --git a/packages/Sandblocks-Core/SBTabView.class.st b/packages/Sandblocks-Core/SBTabView.class.st
@@ -230,7 +230,7 @@ SBTabView >> initialize [
 	self
 		changeTableLayout;
 		listDirection: #topToBottom;
-		hResizing: #spaceFill;
+		hResizing: #shrinkWrap;
 		vResizing: #shrinkWrap.
 ]
 
@@ -395,7 +395,9 @@ SBTabView >> removeCurrentTab [
 { #category : #tabs }
 SBTabView >> setActive: aNamedBlock [
 
-	(self containingArtefact hasUnsavedChanges and: [self containingArtefact isMethod])
+	self containingArtefact isMethod ifFalse: [self basicSetActive: aNamedBlock. ^ self].
+
+	self containingArtefact hasUnsavedChanges
 		ifTrue: [self basicSetActive: aNamedBlock] 
 		ifFalse: ["changing tabs is latest change"
 			self basicSetActive: aNamedBlock.