Skip to content

Commit

Permalink
improved BubbleChart and added tests
Browse files Browse the repository at this point in the history
  • Loading branch information
@Schaaaf
Schaaaf committed Jun 19, 2024
1 parent 561a469 commit 6d3a5e0
Show file tree
Hide file tree
Showing 21 changed files with 34 additions and 49 deletions.
2 changes: 1 addition & 1 deletion packages/StatisticsWorkbench-Diagrams.package/SWBubblePlot.class/methodProperties.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion ...tisticsWorkbench-Diagrams.package/SWCartesianCoordinateSystem.class/methodProperties.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion packages/StatisticsWorkbench-Diagrams.package/SWChartElement.class/methodProperties.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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" } }
4 changes: 4 additions & 0 deletions packages/StatisticsWorkbench-Diagrams.package/SWDataPoint.class/instance/drawOn..st
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
event handling
drawOn: aCanvas

aCanvas fillOval: self bounds color: self color.
1 change: 1 addition & 0 deletions packages/StatisticsWorkbench-Diagrams.package/SWDataPoint.class/methodProperties.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
5 changes: 0 additions & 5 deletions packages/StatisticsWorkbench-Diagrams.package/SWDiagram.class/instance/addLegend..st
View file

This file was deleted.

3 changes: 0 additions & 3 deletions packages/StatisticsWorkbench-Diagrams.package/SWDiagram.class/instance/highlightButton..st
View file

This file was deleted.

3 changes: 0 additions & 3 deletions packages/StatisticsWorkbench-Diagrams.package/SWDiagram.class/instance/resetButtonColor.st
View file

This file was deleted.

5 changes: 0 additions & 5 deletions packages/StatisticsWorkbench-Diagrams.package/SWDiagram.class/instance/toggleCenteredAxes.st
View file

This file was deleted.

10 changes: 3 additions & 7 deletions packages/StatisticsWorkbench-Diagrams.package/SWDiagram.class/methodProperties.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand All @@ -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",
Expand Down
3 changes: 1 addition & 2 deletions packages/StatisticsWorkbench-Tests.package/SWBubblePlotTest.class/instance/setUp.st
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,4 @@ setUp
data: SWDataStub createSeededXYZ;
diagram: (diagram visualizeAll: self data with: SWBubblePlot);
bubblePlot: (self diagram charts) first.

diagram addSlider.
self diagram addSlider.
6 changes: 3 additions & 3 deletions packages/StatisticsWorkbench-Tests.package/SWBubblePlotTest.class/methodProperties.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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" } }
2 changes: 1 addition & 1 deletion packages/StatisticsWorkbench-Tests.package/SWDataStub.class/methodProperties.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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" : {
} }
4 changes: 2 additions & 2 deletions packages/StatisticsWorkbench-Tests.package/SWNormalizedTest.class/methodProperties.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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" } }
12 changes: 6 additions & 6 deletions packages/StatisticsWorkbench-Tests.package/SWPreprocessingTest.class/methodProperties.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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" } }
3 changes: 2 additions & 1 deletion packages/StatisticsWorkbench-Tests.package/SWScatterPlotTest.class/instance/setUp.st
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,5 @@ setUp
self
data: SWDataStub createSeeded;
diagram: (SWDiagram new visualize: self data with: SWScatterPlot);
scatterPlot: (self diagram charts) first
scatterPlot: (self diagram charts) first.
self diagram applyColorTheme: SWHPITheme new.
2 changes: 1 addition & 1 deletion packages/StatisticsWorkbench-Tests.package/SWScatterPlotTest.class/methodProperties.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
4 changes: 2 additions & 2 deletions packages/StatisticsWorkbench-Tests.package/SWStackedTest.class/methodProperties.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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" } }
2 changes: 1 addition & 1 deletion packages/StatisticsWorkbench-Tests.package/SWUIBarChartOnDiagram.class/methodProperties.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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" } }
6 changes: 3 additions & 3 deletions packages/StatisticsWorkbench-Tests.package/SWUIPieChartOnDiagram.class/methodProperties.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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" } }
2 changes: 1 addition & 1 deletion packages/StatisticsWorkbench-Tests.package/SWUITest.class/methodProperties.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down

0 comments on commit 6d3a5e0

Please sign in to comment.