From 17cac43ba00b3af764d500dcb2bf12ab28ee09e4 Mon Sep 17 00:00:00 2001 From: Joana Be Date: Fri, 6 Oct 2023 11:25:33 +0200 Subject: [PATCH] Display trace values of linked probes as instance variable's trace --- .../instance/addProbe..st | 1 + .../instance/removeProbe..st | 4 +++- .../methodProperties.json | 4 ++-- .../instance/newValuesMorphTracing..st | 4 ---- .../instance/valuesMorphClass.st | 4 ++++ .../methodProperties.json | 4 ++-- .../instance/valuesMorphClass.st | 4 ++++ .../methodProperties.json | 3 ++- .../instance/linkedProbes.st | 4 ++++ .../instance/removeButtonClicked.st | 2 +- .../instance/step.st | 17 ----------------- .../updateExpressionMorphIfNecessary.st | 4 ++++ .../instance/valuesMorphClass.st | 4 ++++ .../methodProperties.json | 4 +++- .../README.md | 1 + .../instance/basicValuesFor..st | 5 +++++ .../methodProperties.json | 5 +++++ .../properties.json | 14 ++++++++++++++ .../instance/newValuesMorphTracing..st | 3 +-- .../instance/valuesMorphClass.st | 4 ++++ .../BPProbeMorph.class/methodProperties.json | 3 ++- .../instance/newValuesMorphTracing..st | 5 ----- .../instance/valuesMorphClass.st | 4 ++++ .../methodProperties.json | 4 ++-- .../instance/valuesMorphClass.st | 4 ++++ .../methodProperties.json | 3 ++- .../instance/newValuesMorphTracing..st | 5 ----- .../instance/valuesMorphClass.st | 4 ++++ .../methodProperties.json | 4 ++-- 29 files changed, 84 insertions(+), 47 deletions(-) delete mode 100644 packages/Babylonian-UI.package/BPAssertionMorph.class/instance/newValuesMorphTracing..st create mode 100644 packages/Babylonian-UI.package/BPAssertionMorph.class/instance/valuesMorphClass.st create mode 100644 packages/Babylonian-UI.package/BPAssignmentProbeMorph.class/instance/valuesMorphClass.st create mode 100644 packages/Babylonian-UI.package/BPInstanceVariableProbeMorph.class/instance/linkedProbes.st delete mode 100644 packages/Babylonian-UI.package/BPInstanceVariableProbeMorph.class/instance/step.st create mode 100644 packages/Babylonian-UI.package/BPInstanceVariableProbeMorph.class/instance/updateExpressionMorphIfNecessary.st create mode 100644 packages/Babylonian-UI.package/BPInstanceVariableProbeMorph.class/instance/valuesMorphClass.st create mode 100644 packages/Babylonian-UI.package/BPInstanceVariableValuesMorph.class/README.md create mode 100644 packages/Babylonian-UI.package/BPInstanceVariableValuesMorph.class/instance/basicValuesFor..st create mode 100644 packages/Babylonian-UI.package/BPInstanceVariableValuesMorph.class/methodProperties.json create mode 100644 packages/Babylonian-UI.package/BPInstanceVariableValuesMorph.class/properties.json create mode 100644 packages/Babylonian-UI.package/BPProbeMorph.class/instance/valuesMorphClass.st delete mode 100644 packages/Babylonian-UI.package/BPProfilingProbeMorph.class/instance/newValuesMorphTracing..st create mode 100644 packages/Babylonian-UI.package/BPProfilingProbeMorph.class/instance/valuesMorphClass.st create mode 100644 packages/Babylonian-UI.package/BPTraceBasedMorph.class/instance/valuesMorphClass.st delete mode 100644 packages/Babylonian-UI.package/BPTypeProbeMorph.class/instance/newValuesMorphTracing..st create mode 100644 packages/Babylonian-UI.package/BPTypeProbeMorph.class/instance/valuesMorphClass.st diff --git a/packages/Babylonian-Core.package/BPClassNameToInstanceProbes.class/instance/addProbe..st b/packages/Babylonian-Core.package/BPClassNameToInstanceProbes.class/instance/addProbe..st index 0d68c602..82b0fe5a 100644 --- a/packages/Babylonian-Core.package/BPClassNameToInstanceProbes.class/instance/addProbe..st +++ b/packages/Babylonian-Core.package/BPClassNameToInstanceProbes.class/instance/addProbe..st @@ -5,5 +5,6 @@ addProbe: aProbe ifPresent: [:registeredProbes | registeredProbes add: aProbe] ifAbsent: [ | k | k := KeyedSet keyBlock: [ :each | each variableName ]. + k add: aProbe. nameToProbesDict at: aProbe assignedClassName put: k] \ No newline at end of file diff --git a/packages/Babylonian-Core.package/BPClassNameToInstanceProbes.class/instance/removeProbe..st b/packages/Babylonian-Core.package/BPClassNameToInstanceProbes.class/instance/removeProbe..st index 9eca447e..405c92a9 100644 --- a/packages/Babylonian-Core.package/BPClassNameToInstanceProbes.class/instance/removeProbe..st +++ b/packages/Babylonian-Core.package/BPClassNameToInstanceProbes.class/instance/removeProbe..st @@ -2,5 +2,7 @@ as yet unclassified removeProbe: aProbe nameToProbesDict at: aProbe assignedClassName - ifPresent: [:registeredProbes | registeredProbes remove: aProbe] + ifPresent: [:registeredProbes | registeredProbes remove: aProbe. + registeredProbes ifEmpty: + [nameToProbesDict removeKey: aProbe assignedClassName]] \ No newline at end of file diff --git a/packages/Babylonian-Core.package/BPClassNameToInstanceProbes.class/methodProperties.json b/packages/Babylonian-Core.package/BPClassNameToInstanceProbes.class/methodProperties.json index dd4bd954..ed306ec6 100644 --- a/packages/Babylonian-Core.package/BPClassNameToInstanceProbes.class/methodProperties.json +++ b/packages/Babylonian-Core.package/BPClassNameToInstanceProbes.class/methodProperties.json @@ -3,8 +3,8 @@ "clear" : "joabe 9/28/2023 12:59", "default" : "joabe 9/28/2023 12:57" }, "instance" : { - "addProbe:" : "joabe 9/28/2023 15:50", + "addProbe:" : "joabe 10/5/2023 18:01", "at:" : "joabe 9/28/2023 15:08", "initialize" : "joabe 9/27/2023 16:33", "nameToProbesDict" : "joabe 9/28/2023 12:59", - "removeProbe:" : "joabe 9/28/2023 15:47" } } + "removeProbe:" : "joabe 10/5/2023 17:47" } } diff --git a/packages/Babylonian-UI.package/BPAssertionMorph.class/instance/newValuesMorphTracing..st b/packages/Babylonian-UI.package/BPAssertionMorph.class/instance/newValuesMorphTracing..st deleted file mode 100644 index b3f74990..00000000 --- a/packages/Babylonian-UI.package/BPAssertionMorph.class/instance/newValuesMorphTracing..st +++ /dev/null @@ -1,4 +0,0 @@ -private - ui -newValuesMorphTracing: aTrace - - ^ BPAssertionValuesMorph newIn: self tracing: aTrace \ No newline at end of file diff --git a/packages/Babylonian-UI.package/BPAssertionMorph.class/instance/valuesMorphClass.st b/packages/Babylonian-UI.package/BPAssertionMorph.class/instance/valuesMorphClass.st new file mode 100644 index 00000000..e2dcaddd --- /dev/null +++ b/packages/Babylonian-UI.package/BPAssertionMorph.class/instance/valuesMorphClass.st @@ -0,0 +1,4 @@ +private - ui +valuesMorphClass + + ^ BPAssertionValuesMorph \ No newline at end of file diff --git a/packages/Babylonian-UI.package/BPAssertionMorph.class/methodProperties.json b/packages/Babylonian-UI.package/BPAssertionMorph.class/methodProperties.json index 54cfe3f9..c0f4099e 100644 --- a/packages/Babylonian-UI.package/BPAssertionMorph.class/methodProperties.json +++ b/packages/Babylonian-UI.package/BPAssertionMorph.class/methodProperties.json @@ -7,7 +7,7 @@ "initialize" : "jb 12/7/2020 19:01", "isAssertion" : "pre 11/18/2019 11:50", "isProbe" : "pre 11/18/2019 12:31", - "newValuesMorphTracing:" : "joabe 7/1/2023 17:03", "relevantTracesOf:do:" : "pre 5/3/2021 10:46", "updateAssertionFieldsMorph" : "pre 2/22/2021 12:24", - "updateFrom:" : "joabe 7/1/2023 17:05" } } + "updateFrom:" : "joabe 7/1/2023 17:05", + "valuesMorphClass" : "joabe 10/6/2023 11:21" } } diff --git a/packages/Babylonian-UI.package/BPAssignmentProbeMorph.class/instance/valuesMorphClass.st b/packages/Babylonian-UI.package/BPAssignmentProbeMorph.class/instance/valuesMorphClass.st new file mode 100644 index 00000000..9e59f861 --- /dev/null +++ b/packages/Babylonian-UI.package/BPAssignmentProbeMorph.class/instance/valuesMorphClass.st @@ -0,0 +1,4 @@ +private - ui +valuesMorphClass + + ^ BPAssignmentValuesMorph \ No newline at end of file diff --git a/packages/Babylonian-UI.package/BPAssignmentProbeMorph.class/methodProperties.json b/packages/Babylonian-UI.package/BPAssignmentProbeMorph.class/methodProperties.json index f71c1686..80ef954f 100644 --- a/packages/Babylonian-UI.package/BPAssignmentProbeMorph.class/methodProperties.json +++ b/packages/Babylonian-UI.package/BPAssignmentProbeMorph.class/methodProperties.json @@ -2,4 +2,5 @@ "class" : { }, "instance" : { - "updateExpressionMorphIfNecessary" : "pre 6/7/2021 16:37" } } + "updateExpressionMorphIfNecessary" : "pre 6/7/2021 16:37", + "valuesMorphClass" : "joabe 10/6/2023 11:21" } } diff --git a/packages/Babylonian-UI.package/BPInstanceVariableProbeMorph.class/instance/linkedProbes.st b/packages/Babylonian-UI.package/BPInstanceVariableProbeMorph.class/instance/linkedProbes.st new file mode 100644 index 00000000..a12608a7 --- /dev/null +++ b/packages/Babylonian-UI.package/BPInstanceVariableProbeMorph.class/instance/linkedProbes.st @@ -0,0 +1,4 @@ +accessing +linkedProbes + + ^ self annotation linkedProbes \ No newline at end of file diff --git a/packages/Babylonian-UI.package/BPInstanceVariableProbeMorph.class/instance/removeButtonClicked.st b/packages/Babylonian-UI.package/BPInstanceVariableProbeMorph.class/instance/removeButtonClicked.st index f1a92ae9..7321b409 100644 --- a/packages/Babylonian-UI.package/BPInstanceVariableProbeMorph.class/instance/removeButtonClicked.st +++ b/packages/Babylonian-UI.package/BPInstanceVariableProbeMorph.class/instance/removeButtonClicked.st @@ -1,4 +1,4 @@ -as yet unclassified +actions removeButtonClicked self annotation deleteLinkedProbes. diff --git a/packages/Babylonian-UI.package/BPInstanceVariableProbeMorph.class/instance/step.st b/packages/Babylonian-UI.package/BPInstanceVariableProbeMorph.class/instance/step.st deleted file mode 100644 index e7a3bab8..00000000 --- a/packages/Babylonian-UI.package/BPInstanceVariableProbeMorph.class/instance/step.st +++ /dev/null @@ -1,17 +0,0 @@ -as yet unclassified -step - - | newTraces tracesChanged | - "self resetHeight." - - "newTraces := self getTraces asIdentitySet. - tracesChanged := newTraces ~= displayedTraces. - - (allTracesCompleted not or: [tracesChanged]) ifTrue: [ - allTracesCompleted := newTraces - ifEmpty: [true] - ifNotEmpty: [:ts | ts allSatisfy: [:t | t hasTraceCompleted]]. - self updateFrom: (newTraces ifEmpty: [self emptyTraces]). - displayedTraces := newTraces]." - - "tracesChanged ifTrue: [self refreshTextComposition]." \ No newline at end of file diff --git a/packages/Babylonian-UI.package/BPInstanceVariableProbeMorph.class/instance/updateExpressionMorphIfNecessary.st b/packages/Babylonian-UI.package/BPInstanceVariableProbeMorph.class/instance/updateExpressionMorphIfNecessary.st new file mode 100644 index 00000000..497eeb4d --- /dev/null +++ b/packages/Babylonian-UI.package/BPInstanceVariableProbeMorph.class/instance/updateExpressionMorphIfNecessary.st @@ -0,0 +1,4 @@ +private - ui +updateExpressionMorphIfNecessary + + "Expressions can not be put on instance variable probes currently --jb, pre" \ No newline at end of file diff --git a/packages/Babylonian-UI.package/BPInstanceVariableProbeMorph.class/instance/valuesMorphClass.st b/packages/Babylonian-UI.package/BPInstanceVariableProbeMorph.class/instance/valuesMorphClass.st new file mode 100644 index 00000000..20f8e652 --- /dev/null +++ b/packages/Babylonian-UI.package/BPInstanceVariableProbeMorph.class/instance/valuesMorphClass.st @@ -0,0 +1,4 @@ +private - ui +valuesMorphClass + + ^ BPInstanceVariableValuesMorph \ No newline at end of file diff --git a/packages/Babylonian-UI.package/BPInstanceVariableProbeMorph.class/methodProperties.json b/packages/Babylonian-UI.package/BPInstanceVariableProbeMorph.class/methodProperties.json index be26d723..51640f17 100644 --- a/packages/Babylonian-UI.package/BPInstanceVariableProbeMorph.class/methodProperties.json +++ b/packages/Babylonian-UI.package/BPInstanceVariableProbeMorph.class/methodProperties.json @@ -2,5 +2,7 @@ "class" : { }, "instance" : { + "linkedProbes" : "joabe 10/6/2023 11:13", "removeButtonClicked" : "joabe 10/4/2023 16:22", - "step" : "joabe 10/4/2023 11:52" } } + "updateExpressionMorphIfNecessary" : "joabe 10/6/2023 10:34", + "valuesMorphClass" : "joabe 10/6/2023 11:21" } } diff --git a/packages/Babylonian-UI.package/BPInstanceVariableValuesMorph.class/README.md b/packages/Babylonian-UI.package/BPInstanceVariableValuesMorph.class/README.md new file mode 100644 index 00000000..0e10ccce --- /dev/null +++ b/packages/Babylonian-UI.package/BPInstanceVariableValuesMorph.class/README.md @@ -0,0 +1 @@ +Collect traces values not for the given probe id, but the linked probe ids in chronological order \ No newline at end of file diff --git a/packages/Babylonian-UI.package/BPInstanceVariableValuesMorph.class/instance/basicValuesFor..st b/packages/Babylonian-UI.package/BPInstanceVariableValuesMorph.class/instance/basicValuesFor..st new file mode 100644 index 00000000..87bf8d4e --- /dev/null +++ b/packages/Babylonian-UI.package/BPInstanceVariableValuesMorph.class/instance/basicValuesFor..st @@ -0,0 +1,5 @@ +accessing +basicValuesFor: aTrace + + ^ ((self probeMorph linkedProbes collect: [:aLinkedProbe | aTrace valuesForProbeId: aLinkedProbe id]) flatten) + sorted: [:aTraceValue | aTraceValue chronologicalPosition] ascending \ No newline at end of file diff --git a/packages/Babylonian-UI.package/BPInstanceVariableValuesMorph.class/methodProperties.json b/packages/Babylonian-UI.package/BPInstanceVariableValuesMorph.class/methodProperties.json new file mode 100644 index 00000000..ca1a1c38 --- /dev/null +++ b/packages/Babylonian-UI.package/BPInstanceVariableValuesMorph.class/methodProperties.json @@ -0,0 +1,5 @@ +{ + "class" : { + }, + "instance" : { + "basicValuesFor:" : "joabe 10/6/2023 11:23" } } diff --git a/packages/Babylonian-UI.package/BPInstanceVariableValuesMorph.class/properties.json b/packages/Babylonian-UI.package/BPInstanceVariableValuesMorph.class/properties.json new file mode 100644 index 00000000..1c6c80a1 --- /dev/null +++ b/packages/Babylonian-UI.package/BPInstanceVariableValuesMorph.class/properties.json @@ -0,0 +1,14 @@ +{ + "category" : "Babylonian-UI-Morphs", + "classinstvars" : [ + ], + "classvars" : [ + ], + "commentStamp" : "joabe 10/6/2023 11:11", + "instvars" : [ + ], + "name" : "BPInstanceVariableValuesMorph", + "pools" : [ + ], + "super" : "BPValuesMorph", + "type" : "normal" } diff --git a/packages/Babylonian-UI.package/BPProbeMorph.class/instance/newValuesMorphTracing..st b/packages/Babylonian-UI.package/BPProbeMorph.class/instance/newValuesMorphTracing..st index 0a548403..8fb4369e 100644 --- a/packages/Babylonian-UI.package/BPProbeMorph.class/instance/newValuesMorphTracing..st +++ b/packages/Babylonian-UI.package/BPProbeMorph.class/instance/newValuesMorphTracing..st @@ -1,5 +1,4 @@ private - ui newValuesMorphTracing: aTrace - - ^ BPValuesMorph newIn: self tracing: aTrace \ No newline at end of file + ^ self valuesMorphClass newIn: self tracing: aTrace \ No newline at end of file diff --git a/packages/Babylonian-UI.package/BPProbeMorph.class/instance/valuesMorphClass.st b/packages/Babylonian-UI.package/BPProbeMorph.class/instance/valuesMorphClass.st new file mode 100644 index 00000000..9b2ecec8 --- /dev/null +++ b/packages/Babylonian-UI.package/BPProbeMorph.class/instance/valuesMorphClass.st @@ -0,0 +1,4 @@ +private - ui +valuesMorphClass + + ^ BPValuesMorph \ No newline at end of file diff --git a/packages/Babylonian-UI.package/BPProbeMorph.class/methodProperties.json b/packages/Babylonian-UI.package/BPProbeMorph.class/methodProperties.json index d872c408..5d06b57c 100644 --- a/packages/Babylonian-UI.package/BPProbeMorph.class/methodProperties.json +++ b/packages/Babylonian-UI.package/BPProbeMorph.class/methodProperties.json @@ -22,7 +22,7 @@ "newLabelMorph" : "joabe 5/9/2023 17:35", "newLineMorphFor:" : "joabe 7/2/2023 16:33", "newScrollPane" : "pre 1/6/2021 10:50", - "newValuesMorphTracing:" : "joabe 7/1/2023 17:02", + "newValuesMorphTracing:" : "joabe 10/6/2023 11:20", "newVisualizeButtonFor:" : "jb 10/28/2021 18:57", "noValuesTextFor:" : "joabe 5/31/2023 19:34", "relevantTracesOf:do:" : "pre 5/3/2021 10:46", @@ -34,4 +34,5 @@ "updateLabelMorphIfNecessary" : "jb 10/28/2021 18:25", "updateResultsFrom:" : "joabe 7/1/2023 17:10", "updateVisualizationMorphInside:over:for:" : "pre 5/26/2021 20:43", + "valuesMorphClass" : "joabe 10/6/2023 11:19", "visualizeButtonClickedFor:" : "pre 5/27/2021 12:06" } } diff --git a/packages/Babylonian-UI.package/BPProfilingProbeMorph.class/instance/newValuesMorphTracing..st b/packages/Babylonian-UI.package/BPProfilingProbeMorph.class/instance/newValuesMorphTracing..st deleted file mode 100644 index 78c9befe..00000000 --- a/packages/Babylonian-UI.package/BPProfilingProbeMorph.class/instance/newValuesMorphTracing..st +++ /dev/null @@ -1,5 +0,0 @@ -private - ui -newValuesMorphTracing: aTrace - - - ^ BPProfilingValuesMorph newIn: self tracing: aTrace \ No newline at end of file diff --git a/packages/Babylonian-UI.package/BPProfilingProbeMorph.class/instance/valuesMorphClass.st b/packages/Babylonian-UI.package/BPProfilingProbeMorph.class/instance/valuesMorphClass.st new file mode 100644 index 00000000..395c1b20 --- /dev/null +++ b/packages/Babylonian-UI.package/BPProfilingProbeMorph.class/instance/valuesMorphClass.st @@ -0,0 +1,4 @@ +private - ui +valuesMorphClass + + ^ BPProfilingValuesMorph \ No newline at end of file diff --git a/packages/Babylonian-UI.package/BPProfilingProbeMorph.class/methodProperties.json b/packages/Babylonian-UI.package/BPProfilingProbeMorph.class/methodProperties.json index b5dc3f21..128f6e46 100644 --- a/packages/Babylonian-UI.package/BPProfilingProbeMorph.class/methodProperties.json +++ b/packages/Babylonian-UI.package/BPProfilingProbeMorph.class/methodProperties.json @@ -4,6 +4,6 @@ "instance" : { "annotationLabel" : "pre 11/29/2022 16:35", "isProfilingProbe" : "pre 11/29/2022 16:34", - "newValuesMorphTracing:" : "joabe 7/1/2023 17:03", "standardDeviation:" : "pre 11/30/2022 10:12", - "updateFrom:" : "joabe 7/1/2023 17:05" } } + "updateFrom:" : "joabe 7/1/2023 17:05", + "valuesMorphClass" : "joabe 10/6/2023 11:22" } } diff --git a/packages/Babylonian-UI.package/BPTraceBasedMorph.class/instance/valuesMorphClass.st b/packages/Babylonian-UI.package/BPTraceBasedMorph.class/instance/valuesMorphClass.st new file mode 100644 index 00000000..1557d156 --- /dev/null +++ b/packages/Babylonian-UI.package/BPTraceBasedMorph.class/instance/valuesMorphClass.st @@ -0,0 +1,4 @@ +private - ui +valuesMorphClass + + self subclassResponsibility \ No newline at end of file diff --git a/packages/Babylonian-UI.package/BPTraceBasedMorph.class/methodProperties.json b/packages/Babylonian-UI.package/BPTraceBasedMorph.class/methodProperties.json index eec4bbe2..ee660648 100644 --- a/packages/Babylonian-UI.package/BPTraceBasedMorph.class/methodProperties.json +++ b/packages/Babylonian-UI.package/BPTraceBasedMorph.class/methodProperties.json @@ -14,4 +14,5 @@ "step" : "pre 1/11/2021 13:59", "stepTime" : "pre 8/20/2020 17:35", "update:" : "jb 12/7/2020 19:00", - "updateFrom:" : "jb 12/7/2020 19:00" } } + "updateFrom:" : "jb 12/7/2020 19:00", + "valuesMorphClass" : "joabe 10/6/2023 11:20" } } diff --git a/packages/Babylonian-UI.package/BPTypeProbeMorph.class/instance/newValuesMorphTracing..st b/packages/Babylonian-UI.package/BPTypeProbeMorph.class/instance/newValuesMorphTracing..st deleted file mode 100644 index 5af76578..00000000 --- a/packages/Babylonian-UI.package/BPTypeProbeMorph.class/instance/newValuesMorphTracing..st +++ /dev/null @@ -1,5 +0,0 @@ -private - ui -newValuesMorphTracing: aTrace - - - ^ BPTypeValuesMorph newIn: self tracing: aTrace \ No newline at end of file diff --git a/packages/Babylonian-UI.package/BPTypeProbeMorph.class/instance/valuesMorphClass.st b/packages/Babylonian-UI.package/BPTypeProbeMorph.class/instance/valuesMorphClass.st new file mode 100644 index 00000000..81851d0a --- /dev/null +++ b/packages/Babylonian-UI.package/BPTypeProbeMorph.class/instance/valuesMorphClass.st @@ -0,0 +1,4 @@ +private - ui +valuesMorphClass + + ^ BPTypeValuesMorph \ No newline at end of file diff --git a/packages/Babylonian-UI.package/BPTypeProbeMorph.class/methodProperties.json b/packages/Babylonian-UI.package/BPTypeProbeMorph.class/methodProperties.json index ae69f83f..3f085622 100644 --- a/packages/Babylonian-UI.package/BPTypeProbeMorph.class/methodProperties.json +++ b/packages/Babylonian-UI.package/BPTypeProbeMorph.class/methodProperties.json @@ -4,5 +4,5 @@ "instance" : { "annotationLabel" : "pre 11/30/2022 09:34", "isTypeProbe" : "pre 11/30/2022 09:36", - "newValuesMorphTracing:" : "joabe 7/1/2023 17:04", - "updateFrom:" : "joabe 7/1/2023 17:05" } } + "updateFrom:" : "joabe 7/1/2023 17:05", + "valuesMorphClass" : "joabe 10/6/2023 11:22" } }