From 6d3a5e022ad6a03a0be7d1b297d8b4bee46333b0 Mon Sep 17 00:00:00 2001 From: Julian Berg Date: Wed, 19 Jun 2024 22:04:30 +0200 Subject: [PATCH] improved BubbleChart and added tests --- .../SWBubblePlot.class/methodProperties.json | 2 +- .../methodProperties.json | 2 +- .../SWChartElement.class/methodProperties.json | 2 +- .../SWDataPoint.class/instance/drawOn..st | 4 ++++ .../SWDataPoint.class/methodProperties.json | 1 + .../SWDiagram.class/instance/addLegend..st | 5 ----- .../SWDiagram.class/instance/highlightButton..st | 3 --- .../SWDiagram.class/instance/resetButtonColor.st | 3 --- .../SWDiagram.class/instance/toggleCenteredAxes.st | 5 ----- .../SWDiagram.class/methodProperties.json | 10 +++------- .../SWBubblePlotTest.class/instance/setUp.st | 3 +-- .../SWBubblePlotTest.class/methodProperties.json | 6 +++--- .../SWDataStub.class/methodProperties.json | 2 +- .../SWNormalizedTest.class/methodProperties.json | 4 ++-- .../SWPreprocessingTest.class/methodProperties.json | 12 ++++++------ .../SWScatterPlotTest.class/instance/setUp.st | 3 ++- .../SWScatterPlotTest.class/methodProperties.json | 2 +- .../SWStackedTest.class/methodProperties.json | 4 ++-- .../methodProperties.json | 2 +- .../methodProperties.json | 6 +++--- .../SWUITest.class/methodProperties.json | 2 +- 21 files changed, 34 insertions(+), 49 deletions(-) create mode 100644 packages/StatisticsWorkbench-Diagrams.package/SWDataPoint.class/instance/drawOn..st delete mode 100644 packages/StatisticsWorkbench-Diagrams.package/SWDiagram.class/instance/addLegend..st delete mode 100644 packages/StatisticsWorkbench-Diagrams.package/SWDiagram.class/instance/highlightButton..st delete mode 100644 packages/StatisticsWorkbench-Diagrams.package/SWDiagram.class/instance/resetButtonColor.st delete mode 100644 packages/StatisticsWorkbench-Diagrams.package/SWDiagram.class/instance/toggleCenteredAxes.st diff --git a/packages/StatisticsWorkbench-Diagrams.package/SWBubblePlot.class/methodProperties.json b/packages/StatisticsWorkbench-Diagrams.package/SWBubblePlot.class/methodProperties.json index 6bfbc0d5..ac03fc45 100644 --- a/packages/StatisticsWorkbench-Diagrams.package/SWBubblePlot.class/methodProperties.json +++ b/packages/StatisticsWorkbench-Diagrams.package/SWBubblePlot.class/methodProperties.json @@ -2,7 +2,7 @@ "class" : { "create" : "Nils Urban 6/13/2024 10:24" }, "instance" : { - "createDataPoint:" : "Nils Urban 6/13/2024 14:38", + "createDataPoint:" : "JB 6/19/2024 21:45", "dynamicMaxBubbleSize" : "Nils Urban 6/13/2024 14:45", "initialize" : "Nils Urban 6/13/2024 11:27", "receiveValue:" : "JB 6/19/2024 02:39", diff --git a/packages/StatisticsWorkbench-Diagrams.package/SWCartesianCoordinateSystem.class/methodProperties.json b/packages/StatisticsWorkbench-Diagrams.package/SWCartesianCoordinateSystem.class/methodProperties.json index 183049d1..be825380 100644 --- a/packages/StatisticsWorkbench-Diagrams.package/SWCartesianCoordinateSystem.class/methodProperties.json +++ b/packages/StatisticsWorkbench-Diagrams.package/SWCartesianCoordinateSystem.class/methodProperties.json @@ -8,7 +8,7 @@ "applyTheme:" : "ds 6/19/2020 19:54", "axisColor:" : "ds 6/19/2020 19:54", "axisNames" : "jk 8/4/2020 16:50", - "axisPadding" : " Nils Urban 6/19/2024 17:20", + "axisPadding" : "Nils Urban 6/19/2024 17:20", "boundsThreshold" : "ds 6/19/2020 19:55", "boundsThreshold:" : "ds 6/19/2020 19:56", "centeredAxes" : "FM 7/9/2021 10:18", diff --git a/packages/StatisticsWorkbench-Diagrams.package/SWChartElement.class/methodProperties.json b/packages/StatisticsWorkbench-Diagrams.package/SWChartElement.class/methodProperties.json index 8d0c3c26..743e9b98 100644 --- a/packages/StatisticsWorkbench-Diagrams.package/SWChartElement.class/methodProperties.json +++ b/packages/StatisticsWorkbench-Diagrams.package/SWChartElement.class/methodProperties.json @@ -6,7 +6,7 @@ "datapointIndex:" : "Nils Urban 6/13/2024 00:33", "doubleClick:" : "JB 6/19/2024 02:27", "handlesMouseDown:" : "ds 6/19/2020 19:12", - "mouseDown:" : " Nils Urban 6/19/2024 18:17", + "mouseDown:" : "Nils Urban 6/19/2024 18:17", "round:to:" : "JB 6/19/2024 02:28", "vector" : "ds 6/19/2020 19:12", "vector:" : "ds 6/19/2020 19:12" } } diff --git a/packages/StatisticsWorkbench-Diagrams.package/SWDataPoint.class/instance/drawOn..st b/packages/StatisticsWorkbench-Diagrams.package/SWDataPoint.class/instance/drawOn..st new file mode 100644 index 00000000..1a122a24 --- /dev/null +++ b/packages/StatisticsWorkbench-Diagrams.package/SWDataPoint.class/instance/drawOn..st @@ -0,0 +1,4 @@ +event handling +drawOn: aCanvas + + aCanvas fillOval: self bounds color: self color. \ No newline at end of file diff --git a/packages/StatisticsWorkbench-Diagrams.package/SWDataPoint.class/methodProperties.json b/packages/StatisticsWorkbench-Diagrams.package/SWDataPoint.class/methodProperties.json index 19f4c53b..0bcf1871 100644 --- a/packages/StatisticsWorkbench-Diagrams.package/SWDataPoint.class/methodProperties.json +++ b/packages/StatisticsWorkbench-Diagrams.package/SWDataPoint.class/methodProperties.json @@ -6,6 +6,7 @@ "defaultHeight" : "ds 6/19/2020 19:40", "defaultWidth" : "ds 6/19/2020 19:40" }, "instance" : { + "drawOn:" : "JB 6/19/2024 21:49", "handlesMouseOver:" : "FM 5/30/2021 10:58", "infoPopup" : "FM 5/30/2021 10:58", "infoPopup:" : "FM 5/30/2021 10:12", diff --git a/packages/StatisticsWorkbench-Diagrams.package/SWDiagram.class/instance/addLegend..st b/packages/StatisticsWorkbench-Diagrams.package/SWDiagram.class/instance/addLegend..st deleted file mode 100644 index 69eba340..00000000 --- a/packages/StatisticsWorkbench-Diagrams.package/SWDiagram.class/instance/addLegend..st +++ /dev/null @@ -1,5 +0,0 @@ -adding/removing -addLegend: aSWLegend - self legend: aSWLegend. - aSWLegend topLeft: self topRight. - self addMorph: aSWLegend diff --git a/packages/StatisticsWorkbench-Diagrams.package/SWDiagram.class/instance/highlightButton..st b/packages/StatisticsWorkbench-Diagrams.package/SWDiagram.class/instance/highlightButton..st deleted file mode 100644 index 5babb0d1..00000000 --- a/packages/StatisticsWorkbench-Diagrams.package/SWDiagram.class/instance/highlightButton..st +++ /dev/null @@ -1,3 +0,0 @@ -as yet unclassified -highlightButton: button - button color: Color lightGray \ No newline at end of file diff --git a/packages/StatisticsWorkbench-Diagrams.package/SWDiagram.class/instance/resetButtonColor.st b/packages/StatisticsWorkbench-Diagrams.package/SWDiagram.class/instance/resetButtonColor.st deleted file mode 100644 index 358d228c..00000000 --- a/packages/StatisticsWorkbench-Diagrams.package/SWDiagram.class/instance/resetButtonColor.st +++ /dev/null @@ -1,3 +0,0 @@ -as yet unclassified -resetButtonColor - button color: Color transparent \ No newline at end of file diff --git a/packages/StatisticsWorkbench-Diagrams.package/SWDiagram.class/instance/toggleCenteredAxes.st b/packages/StatisticsWorkbench-Diagrams.package/SWDiagram.class/instance/toggleCenteredAxes.st deleted file mode 100644 index da6b8313..00000000 --- a/packages/StatisticsWorkbench-Diagrams.package/SWDiagram.class/instance/toggleCenteredAxes.st +++ /dev/null @@ -1,5 +0,0 @@ -toggling -toggleCenteredAxes - - (self hasCoordinateSystem) - ifTrue: [self coordinateSystem toggleCenteredAxes] diff --git a/packages/StatisticsWorkbench-Diagrams.package/SWDiagram.class/methodProperties.json b/packages/StatisticsWorkbench-Diagrams.package/SWDiagram.class/methodProperties.json index 3e065c2e..769deaa6 100644 --- a/packages/StatisticsWorkbench-Diagrams.package/SWDiagram.class/methodProperties.json +++ b/packages/StatisticsWorkbench-Diagrams.package/SWDiagram.class/methodProperties.json @@ -5,8 +5,7 @@ "add:" : "PAR 7/6/2021 07:53", "addChart:" : "jk 6/25/2020 22:27", "addCoordinateSystem:" : "jk 6/24/2020 15:36", - "addLegend:" : "PAR 7/6/2021 07:54", - "addSlider" : " Nils Urban 6/19/2024 17:39", + "addSlider" : "Nils Urban 6/19/2024 17:39", "applyColorTheme:" : "JB 6/9/2024 23:22", "axisColor:" : "ds 6/19/2020 20:01", "buttonHighlighting:" : "JB 6/18/2024 20:11", @@ -39,7 +38,6 @@ "hasChart" : "jk 6/25/2020 22:26", "hasCoordinateSystem" : "ds 6/19/2020 20:03", "hasLegend" : "PAR 7/2/2021 12:23", - "highlightButton:" : "JB 6/8/2024 23:37", "initialize" : "Nils Urban 6/12/2024 16:48", "insertHPILogo" : "JB 6/9/2024 23:17", "legend" : "JB 6/9/2024 00:41", @@ -56,19 +54,17 @@ "redrawChangedData" : "Nils Urban 6/13/2024 02:18", "remove:" : "PAR 7/6/2021 07:49", "removeLegend" : "PAR 7/13/2021 12:17", - "resetButtonColor" : "JB 6/8/2024 23:30", "resizeCharts" : "JB 6/9/2024 22:55", "sendToCharts:" : "JB 6/19/2024 02:39", "seriesCount" : "JB 6/10/2024 22:10", "seriesCount:" : "JB 6/10/2024 22:11", "showMean" : "JB 6/19/2024 01:56", - "sliderMorph" : " Nils Urban 6/19/2024 17:40", - "sliderMorph:" : " Nils Urban 6/19/2024 17:40", + "sliderMorph" : "Nils Urban 6/19/2024 17:40", + "sliderMorph:" : "Nils Urban 6/19/2024 17:40", "sliderValueMorph" : "Nils Urban 6/13/2024 11:44", "sliderValueMorph:" : "Nils Urban 6/13/2024 11:45", "stacked" : "Nils Urban 6/12/2024 14:48", "stacked:" : "Nils Urban 6/12/2024 14:48", - "toggleCenteredAxes" : "jk 7/15/2020 15:56", "toggleRaster" : "ds 6/19/2020 20:04", "transformToSpiderData:" : "JB 6/10/2024 22:25", "uncenterAxes" : "jk 7/15/2020 15:58", diff --git a/packages/StatisticsWorkbench-Tests.package/SWBubblePlotTest.class/instance/setUp.st b/packages/StatisticsWorkbench-Tests.package/SWBubblePlotTest.class/instance/setUp.st index 67356ffa..93c1bfa9 100644 --- a/packages/StatisticsWorkbench-Tests.package/SWBubblePlotTest.class/instance/setUp.st +++ b/packages/StatisticsWorkbench-Tests.package/SWBubblePlotTest.class/instance/setUp.st @@ -9,5 +9,4 @@ setUp data: SWDataStub createSeededXYZ; diagram: (diagram visualizeAll: self data with: SWBubblePlot); bubblePlot: (self diagram charts) first. - - diagram addSlider. \ No newline at end of file + self diagram addSlider. \ No newline at end of file diff --git a/packages/StatisticsWorkbench-Tests.package/SWBubblePlotTest.class/methodProperties.json b/packages/StatisticsWorkbench-Tests.package/SWBubblePlotTest.class/methodProperties.json index bde8a0ba..243bb81f 100644 --- a/packages/StatisticsWorkbench-Tests.package/SWBubblePlotTest.class/methodProperties.json +++ b/packages/StatisticsWorkbench-Tests.package/SWBubblePlotTest.class/methodProperties.json @@ -8,6 +8,6 @@ "data:" : "ds 6/19/2020 20:33", "diagram" : "ds 6/19/2020 20:33", "diagram:" : "ds 6/19/2020 20:33", - "setUp" : " Nils Urban 6/19/2024 17:37", - "testBubblePlotVisualisation" : " Nils Urban 6/19/2024 17:35", - "testFiltering" : " Nils Urban 6/19/2024 17:33" } } + "setUp" : "JB 6/19/2024 21:53", + "testBubblePlotVisualisation" : "Nils Urban 6/19/2024 17:35", + "testFiltering" : "Nils Urban 6/19/2024 17:33" } } diff --git a/packages/StatisticsWorkbench-Tests.package/SWDataStub.class/methodProperties.json b/packages/StatisticsWorkbench-Tests.package/SWDataStub.class/methodProperties.json index 29a64f3e..882bdb0b 100644 --- a/packages/StatisticsWorkbench-Tests.package/SWDataStub.class/methodProperties.json +++ b/packages/StatisticsWorkbench-Tests.package/SWDataStub.class/methodProperties.json @@ -14,6 +14,6 @@ "createSeededNegative" : "jk 6/25/2020 15:15", "createSeededRandom" : "jk 6/24/2020 16:13", "createSeededWithTwoCategories" : "PAR 5/27/2021 20:51", - "createSeededXYZ" : " Nils Urban 6/19/2024 17:31" }, + "createSeededXYZ" : "Nils Urban 6/19/2024 17:31" }, "instance" : { } } diff --git a/packages/StatisticsWorkbench-Tests.package/SWNormalizedTest.class/methodProperties.json b/packages/StatisticsWorkbench-Tests.package/SWNormalizedTest.class/methodProperties.json index 0ded07dc..7ddc55f6 100644 --- a/packages/StatisticsWorkbench-Tests.package/SWNormalizedTest.class/methodProperties.json +++ b/packages/StatisticsWorkbench-Tests.package/SWNormalizedTest.class/methodProperties.json @@ -2,5 +2,5 @@ "class" : { }, "instance" : { - "configureDiagram" : " Nils Urban 6/19/2024 17:25", - "testNormalization" : " Nils Urban 6/19/2024 17:26" } } + "configureDiagram" : "Nils Urban 6/19/2024 17:25", + "testNormalization" : "Nils Urban 6/19/2024 17:26" } } diff --git a/packages/StatisticsWorkbench-Tests.package/SWPreprocessingTest.class/methodProperties.json b/packages/StatisticsWorkbench-Tests.package/SWPreprocessingTest.class/methodProperties.json index 94e1d9a5..e5dfdb74 100644 --- a/packages/StatisticsWorkbench-Tests.package/SWPreprocessingTest.class/methodProperties.json +++ b/packages/StatisticsWorkbench-Tests.package/SWPreprocessingTest.class/methodProperties.json @@ -2,9 +2,9 @@ "class" : { }, "instance" : { - "configureDiagram" : " Nils Urban 6/19/2024 17:23", - "dataCollection" : " Nils Urban 6/19/2024 17:27", - "dataCollection:" : " Nils Urban 6/19/2024 17:27", - "diagram" : " Nils Urban 6/19/2024 17:27", - "diagram:" : " Nils Urban 6/19/2024 17:27", - "setUp" : " Nils Urban 6/19/2024 17:24" } } + "configureDiagram" : "Nils Urban 6/19/2024 17:23", + "dataCollection" : "Nils Urban 6/19/2024 17:27", + "dataCollection:" : "Nils Urban 6/19/2024 17:27", + "diagram" : "Nils Urban 6/19/2024 17:27", + "diagram:" : "Nils Urban 6/19/2024 17:27", + "setUp" : "Nils Urban 6/19/2024 17:24" } } diff --git a/packages/StatisticsWorkbench-Tests.package/SWScatterPlotTest.class/instance/setUp.st b/packages/StatisticsWorkbench-Tests.package/SWScatterPlotTest.class/instance/setUp.st index 2b3c3b69..608c3d8d 100644 --- a/packages/StatisticsWorkbench-Tests.package/SWScatterPlotTest.class/instance/setUp.st +++ b/packages/StatisticsWorkbench-Tests.package/SWScatterPlotTest.class/instance/setUp.st @@ -6,4 +6,5 @@ setUp self data: SWDataStub createSeeded; diagram: (SWDiagram new visualize: self data with: SWScatterPlot); - scatterPlot: (self diagram charts) first \ No newline at end of file + scatterPlot: (self diagram charts) first. + self diagram applyColorTheme: SWHPITheme new. \ No newline at end of file diff --git a/packages/StatisticsWorkbench-Tests.package/SWScatterPlotTest.class/methodProperties.json b/packages/StatisticsWorkbench-Tests.package/SWScatterPlotTest.class/methodProperties.json index 08f2f867..2c4a22dd 100644 --- a/packages/StatisticsWorkbench-Tests.package/SWScatterPlotTest.class/methodProperties.json +++ b/packages/StatisticsWorkbench-Tests.package/SWScatterPlotTest.class/methodProperties.json @@ -8,7 +8,7 @@ "diagram:" : "ds 6/19/2020 20:33", "scatterPlot" : "ds 6/19/2020 20:33", "scatterPlot:" : "ds 6/19/2020 20:33", - "setUp" : "JB 6/8/2024 19:43", + "setUp" : "JB 6/19/2024 21:57", "testAdd" : "jk 6/25/2020 22:28", "testCollectionsGetInitialized" : "ds 6/19/2020 20:34", "testDifferentColors" : "JB 6/8/2024 19:43", diff --git a/packages/StatisticsWorkbench-Tests.package/SWStackedTest.class/methodProperties.json b/packages/StatisticsWorkbench-Tests.package/SWStackedTest.class/methodProperties.json index cd1a40e7..7f2f436e 100644 --- a/packages/StatisticsWorkbench-Tests.package/SWStackedTest.class/methodProperties.json +++ b/packages/StatisticsWorkbench-Tests.package/SWStackedTest.class/methodProperties.json @@ -2,5 +2,5 @@ "class" : { }, "instance" : { - "configureDiagram" : " Nils Urban 6/19/2024 17:25", - "testSum" : " Nils Urban 6/19/2024 17:25" } } + "configureDiagram" : "Nils Urban 6/19/2024 17:25", + "testSum" : "Nils Urban 6/19/2024 17:25" } } diff --git a/packages/StatisticsWorkbench-Tests.package/SWUIBarChartOnDiagram.class/methodProperties.json b/packages/StatisticsWorkbench-Tests.package/SWUIBarChartOnDiagram.class/methodProperties.json index 1a800ba5..b95c81cf 100644 --- a/packages/StatisticsWorkbench-Tests.package/SWUIBarChartOnDiagram.class/methodProperties.json +++ b/packages/StatisticsWorkbench-Tests.package/SWUIBarChartOnDiagram.class/methodProperties.json @@ -7,6 +7,6 @@ "setUp" : "JB 6/8/2024 19:45", "testRemoveBarOnUserInput" : "Nils Urban 5/27/2024 15:07", "testRemoveBarOnUserInputInWindow" : "PAR 8/6/2021 13:11", - "testRemoveOnlyOneBarOnUserInput" : " Nils Urban 6/19/2024 17:46", + "testRemoveOnlyOneBarOnUserInput" : "Nils Urban 6/19/2024 17:46", "testXYPopupCorrectLabel" : "FM 5/30/2021 10:34", "testXYPopupOnHover" : "FM 5/30/2021 11:19" } } diff --git a/packages/StatisticsWorkbench-Tests.package/SWUIPieChartOnDiagram.class/methodProperties.json b/packages/StatisticsWorkbench-Tests.package/SWUIPieChartOnDiagram.class/methodProperties.json index eae45385..c77ebad8 100644 --- a/packages/StatisticsWorkbench-Tests.package/SWUIPieChartOnDiagram.class/methodProperties.json +++ b/packages/StatisticsWorkbench-Tests.package/SWUIPieChartOnDiagram.class/methodProperties.json @@ -5,7 +5,7 @@ "pieChart" : "FM 6/27/2021 16:13", "pieChart:" : "FM 6/27/2021 16:12", "setUp" : "JB 6/8/2024 19:46", - "testRemoveOnUserInput" : " Nils Urban 6/19/2024 18:18", - "testRemoveOnUserInputInWindow" : " Nils Urban 6/19/2024 18:23", - "testRemoveOnlyOneOnUserInput" : " Nils Urban 6/19/2024 18:21", + "testRemoveOnUserInput" : "Nils Urban 6/19/2024 18:18", + "testRemoveOnUserInputInWindow" : "Nils Urban 6/19/2024 18:23", + "testRemoveOnlyOneOnUserInput" : "Nils Urban 6/19/2024 18:21", "testRemoveOnlyOneOnUserInputInWindow" : "Nils Urban 5/27/2024 15:07" } } diff --git a/packages/StatisticsWorkbench-Tests.package/SWUITest.class/methodProperties.json b/packages/StatisticsWorkbench-Tests.package/SWUITest.class/methodProperties.json index f204d551..d6e94791 100644 --- a/packages/StatisticsWorkbench-Tests.package/SWUITest.class/methodProperties.json +++ b/packages/StatisticsWorkbench-Tests.package/SWUITest.class/methodProperties.json @@ -2,7 +2,7 @@ "class" : { }, "instance" : { - "clickOffset" : " Nils Urban 6/19/2024 18:19", + "clickOffset" : "Nils Urban 6/19/2024 18:19", "data" : "FM 6/27/2021 16:03", "data:" : "FM 6/27/2021 16:04", "diagram" : "FM 6/27/2021 16:06",