Merge pull request #141 from hpi-swa/feature/results-history

History Tab in Exploriants, Tab Renaming, Space compression

packages/Sandblocks-Babylonian/SBCluster.class.st

@@ -11,9 +11,7 @@ Class {
 SBCluster >> compressedMorphsForDisplay: aSBWatchView [
 
 	| displayedMorphs |
-	displayedMorphs := aSBWatchView watchValues collect: [:aWatchValue | 
-			aWatchValue morphResizer: self morphResizer. 
-			aWatchValue asValueMorph].
+	displayedMorphs  := self gatherMorphsToCompressFrom: aSBWatchView.
 	^ (displayedMorphs size = 1) 
 		ifTrue: [displayedMorphs first]
 		ifFalse: [self newCellMorph 
@@ -24,6 +22,16 @@ SBCluster >> compressedMorphsForDisplay: aSBWatchView [
 					addAllMorphsBack: displayedMorphs]
 ]
 
+{ #category : #visualisation }
+SBCluster >> gatherMorphsToCompressFrom: aSBWatchView [
+
+	^ aSBWatchView isDisplayingWatchValues 
+		ifTrue: [aSBWatchView watchValues collect: [:aWatchValue | 
+					aWatchValue morphResizer: self morphResizer. 
+					aWatchValue asValueMorph]]
+		ifFalse: [{self morphResizer applyOn: aSBWatchView selectedDisplay sbSnapshot }]
+]
+
 { #category : #initialization }
 SBCluster >> initialize [ 
 
@@ -177,7 +185,7 @@ SBCluster >> wrapInCell: aMorph flexVertically: aVBoolean flexHorizontally: aHBo
 
 	self flag: #todo. "Another way besides turning into an image to keep interactions.-jb"
 	cell addMorph: (ImageMorph new 
-		newForm: (aMorph iconOrThumbnailOfSize: targetExtent);
+		newForm: (aMorph imageForm scaledIntoFormOfSize: targetExtent);
 		when: #clicked send: #triggerEvent: to: aMorph with: #clicked).
 	cell on: #click send: #value to: [cell submorphs first triggerEvent: #clicked].
 	^ cell

packages/Sandblocks-Babylonian/SBDiffTabView.class.st

@@ -103,6 +103,7 @@ SBDiffTabView >> initialize [
 	super initialize.
 
 	isShowingDiff := false.
+	self hResizing: #spaceFill.
 ]
 
 { #category : #accessing }

packages/Sandblocks-Babylonian/SBExampleCluster.class.st

@@ -55,8 +55,8 @@ SBExampleCluster >> displayedIndex: aNumber [
 { #category : #visualisation }
 SBExampleCluster >> extractRowsFrom: aUniverse [
 
-	^ aUniverse watches collect: [:anExample | | display | 
-		display := (anExample exampleToDisplay associations at: self displayedIndex) value display.
+	^ aUniverse watches collect: [:aWatch | | display | 
+		display := (aWatch exampleToDisplay associations at: self displayedIndex) value display.
 		self compressedMorphsForDisplay: display]
 ]
 

packages/Sandblocks-Babylonian/SBExampleGridsView.class.st

@@ -8,7 +8,8 @@ Class {
 SBExampleGridsView >> buildAllPossibleResults [
 
 	self multiverse activeExamples 
-		ifEmpty: [gridContainer addMorph: (SBOwnTextMorph new contents: 'No examples active')].
+		ifEmpty: [gridContainer addMorph: (TextMorph new contents: 'No examples active').
+				  gridContainer width: gridContainer firstSubmorph width + 5 "a bit of margin"].
 
 	self multiverse activeExamples withIndexDo: [:anExample :anIndex | self buildExampleFor: anIndex]
 ]
@@ -24,10 +25,7 @@ SBExampleGridsView >> buildExampleFor: aNumber [
 					self currentClusterClass
 						newForSize: self selectedResizer
 						multiverse: self multiverse 
-						displaying: aNumber}.
-		LineMorph from: 0@0 to: 0@50 color: Color black width: 2}).
-
-	self updateContainerWidth.
+						displaying: aNumber}})
 ]
 
 { #category : #accessing }
@@ -38,16 +36,10 @@ SBExampleGridsView >> currentClusterClass [
 		ifFalse: [SBExampleCluster]
 ]
 
-{ #category : #updating }
-SBExampleGridsView >> gridSize [
-
-	^ self multiverse activeExamples size
-]
-
 { #category : #initialization }
 SBExampleGridsView >> initialize [ 
 
 	super initialize.
 
-	self name: 'Example Grid View'.
+	self name: 'Example Focused'.
 ]

packages/Sandblocks-Babylonian/SBExampleValueDisplay.class.st

@@ -30,6 +30,7 @@ SBExampleValueDisplay >> display [
 { #category : #accessing }
 SBExampleValueDisplay >> displayedWatchValueBlocks [
 
+	display isDisplayingWatchValues ifFalse: [^ {}].
 	^ display displayedMorphs
 ]
 
@@ -82,7 +83,7 @@ SBExampleValueDisplay >> initialize [
 							statusLabel := SBStringMorph new contents: ''.
 							self newChangeVizButton};
 							yourself);
-		addMorphBack: (display := SBExampleWatch watchViewClass saving: -1)
+		addMorphBack: (display := SBExampleWatch watchViewClass new)
 ]
 
 { #category : #accessing }

packages/Sandblocks-Babylonian/SBExampleWatch.class.st

@@ -131,15 +131,34 @@ SBExampleWatch >> asInactiveCopy [
 				modifyExpression: self modifyExpression veryDeepCopy;
 				dimensionOptions: self dimensionOptions veryDeepCopy. 
 
-	exampleToValues keys do: [:anExample |	copy exampleStarting: anExample;
-													   reportValues: (self valuesForExample: anExample) for: anExample;
-													   exampleFinished: anExample ].
+	exampleToValues keys do: [:anExample |	
+			copy exampleStarting: anExample;
+			reportValues: (self valuesForExample: anExample) for: anExample].
+
+	"Keep switched views consistent"
+	exampleToDisplay keys do: [:anExample | 
+		(copy exampleToDisplay at: anExample) display 
+			selectedDisplayIndex: (exampleToDisplay at: anExample) display selectedDisplayIndex].		
+
+	exampleToValues keys do: [:anExample |	copy exampleFinished: anExample].							
+
 
 	^ copy 
 		saveObjectsActivePermutations;
 		yourself
 ]
 
+{ #category : #initialization }
+SBExampleWatch >> buildDefaultDisplayFor: anExample [
+
+	| valueDisplay |
+	valueDisplay := SBExampleValueDisplay new.
+	valueDisplay display fallbackResizer: self selectedMorphResizer.
+	self addMorph: (exampleToDisplay at: anExample put: valueDisplay) atIndex: 2.
+	anExample when: #outOfWorld send: #exampleStopped: to: self with: anExample.
+	^ valueDisplay
+]
+
 { #category : #accessing }
 SBExampleWatch >> cleanedExpression [
 
@@ -169,6 +188,14 @@ SBExampleWatch >> color [
 	^ self parentSandblock color
 ]
 
+{ #category : #copying }
+SBExampleWatch >> copySelectedDisplayIndicesFrom: other [
+
+	other exampleToDisplay associationsDo: [:exampleToDisplayAss | 
+		(exampleToDisplay at: exampleToDisplayAss key ifAbsentPut: [self buildDefaultDisplayFor: exampleToDisplayAss key])
+			display selectedDisplayIndex: exampleToDisplayAss value display selectedDisplayIndex]
+]
+
 { #category : #'insert/delete' }
 SBExampleWatch >> deleteCommandFor: aBlock [
 
@@ -220,12 +247,7 @@ SBExampleWatch >> exampleStarting: anExample [
 
 	exampleToValues at: anExample put: OrderedCollection new.
 
-	(exampleToDisplay at: anExample ifAbsentPut: [ | valueDisplay |
-		valueDisplay := SBExampleValueDisplay new.
-		valueDisplay display fallbackResizer: self selectedMorphResizer.
-		self addMorph: (exampleToDisplay at: anExample put: valueDisplay) atIndex: 2.
-		anExample when: #outOfWorld send: #exampleStopped: to: self with: anExample.
-		valueDisplay])
+	(exampleToDisplay at: anExample ifAbsentPut: [self buildDefaultDisplayFor: anExample])
 		exampleStarting: anExample;
 		name: anExample label
 ]
@@ -250,6 +272,12 @@ SBExampleWatch >> exampleToDisplay: anExampleToDisplayDict [
 	exampleToDisplay := anExampleToDisplayDict
 ]
 
+{ #category : #accessing }
+SBExampleWatch >> exampleToValues [
+
+	^ exampleToValues
+]
+
 { #category : #accessing }
 SBExampleWatch >> exampleToValues: anExampleToCollectionOfWatchValuesDict [
 

packages/Sandblocks-Babylonian/SBExploriantsView.class.st

@@ -17,7 +17,7 @@ SBExploriantsView class >> block: aSBBlock named: aString [
 { #category : #'instance creation' }
 SBExploriantsView class >> getTabsInMultiverse: aSBMultiverse [
 
-	^ {SBPermutationGridsView. SBExampleGridsView. SBPlainResultsView. SBLiveView. SBVariantsView}
+	^ {SBPermutationGridsView. SBExampleGridsView. SBLiveView. SBPlainResultsView. SBVariantsView. SBHistoryView}
 		collect: [:mySubclass | mySubclass newMultiverse: aSBMultiverse]
 ]
 
@@ -60,9 +60,9 @@ SBExploriantsView >> containerRow [
 		cellPositioning: #topLeft;
 		changeTableLayout;
 		listDirection: #leftToRight;
-		layoutInset: 8;
-		cellGap: 3;
-		cellInset: 3;
+		layoutInset: 2;
+		cellGap: 1;
+		cellInset: 2;
 		borderWidth: 0
 ]
 
@@ -115,6 +115,12 @@ SBExploriantsView >> resolveButton [
 		cornerStyle: #squared
 ]
 
+{ #category : #copying }
+SBExploriantsView >> snapshot [
+
+	^ ImageMorph new newForm: self block imageForm
+]
+
 { #category : #building }
 SBExploriantsView >> updateButton [
 
@@ -132,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
+]

packages/Sandblocks-Babylonian/SBGrid.class.st

@@ -10,7 +10,7 @@ Class {
 { #category : #constants }
 SBGrid class >> cellInsetValue [
 
-	^ 2
+	^ 0
 ]
 
 { #category : #'initialize-release' }

packages/Sandblocks-Babylonian/SBGridResultsView.class.st

@@ -17,9 +17,15 @@ SBGridResultsView >> clean [
 ]
 
 { #category : #updating }
-SBGridResultsView >> gridSize [
-
-	self subclassResponsibility 
+SBGridResultsView >> concludeContainerWidth [
+
+	| widthTillWrap |
+	widthTillWrap := self multiverse sandblockEditor width * 0.95.
+	gridContainer fullBounds width < widthTillWrap ifTrue: [^ self]. 
+
+	gridContainer hResizing: #rigid; wrapDirection: #topToBottom.
+	gridContainer width: widthTillWrap.
+	gridContainer hResizing: #shrinkWrap.
 ]
 
 { #category : #initialization }
@@ -37,22 +43,16 @@ SBGridResultsView >> newGridContainer [
 		changeTableLayout;
 		color: Color white;
 		listDirection: #leftToRight;
-		wrapDirection: #topToBottom;
 		wrapCentering: #topLeft;
-		hResizing: #rigid;
-		width: 50;
 		cellInset: 0;
 		vResizing: #shrinkWrap;
+		hResizing: #shrinkWrap;
 		yourself
 ]
 
-{ #category : #updating }
-SBGridResultsView >> updateContainerWidth [
-
-	gridContainer width: 
-		(self gridSize safeSquareRoot ceiling + 1)
-			* (gridContainer lastSubmorph fullBounds width 
-				+ (2 * gridContainer cellInset) 
-				+ (2 * gridContainer cellGap) 
-				+ 10)
+{ #category : #actions }
+SBGridResultsView >> visualize [ 
+
+	super visualize.
+	self concludeContainerWidth
 ]