Skip to content

Extract a common interface for scatter and line chart #11

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jeffsantos wants to merge 4 commits into
base: main
Choose a base branch
from
Open

Extract a common interface for scatter and line chart #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9f0e8fe
Extract a common interface for scatter and line chart to allow compos…
jeffsantos Feb 19, 2025
a72a68c
Merge branch 'feenkcom:main' into main
jeffsantos Mar 7, 2025
65860de
Merge branch 'feenkcom:main' into main
jeffsantos Mar 25, 2025
23d6125
Merge branch 'feenkcom:main' into main
jeffsantos Jul 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
220 changes: 1 addition & 219 deletions src/GToolkit-Plotter/GtPlotterLineChart.class.st
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,29 +10,7 @@ I draw line charts.
"
Class {
#name : #GtPlotterLineChart,
#superclass : #GtPlotterBuilder,
#instVars : [
'data',
'valueX',
'scaleX',
'scaleY',
'valueY',
'minX',
'maxX',
'minY',
'maxY',
'titleX',
'titleY',
'ticksX',
'ticksY',
'projectionXLabelElement',
'projectionXValues',
'projectionXLabelStyle',
'projectionXLineStyle',
'labelFormatX',
'labelFormatY',
'isAlreadyInitialized'
],
#superclass : #GtPlotterXYChart,
#category : #'GToolkit-Plotter-Builder - Line Chart'
}

Expand All @@ -59,15 +37,6 @@ GtPlotterLineChart >> axisYStencil [
scale: self scaleY
]

{ #category : #'api - instantiation' }
GtPlotterLineChart >> contentStencil [
^ [ | anElement |
self initializeScales.
anElement := self newContentElement.
self styleChartElement: anElement.
anElement ] asStencil
]

{ #category : #'api - instantiation' }
GtPlotterLineChart >> create [
<return: #BlElement>
Expand Down Expand Up @@ -108,11 +77,6 @@ GtPlotterLineChart >> create [
^ aContainer
]

{ #category : #'api - data' }
GtPlotterLineChart >> data [
^ data
]

{ #category : #initialization }
GtPlotterLineChart >> initialize [
super initialize.
Expand Down Expand Up @@ -179,60 +143,6 @@ GtPlotterLineChart >> initializeScales [

]

{ #category : #'api - axes' }
GtPlotterLineChart >> labelFormatX: aBlock [
"Create a {{gtClass:BlText}}.
Block has one argument [ :aValue | ... ]"
labelFormatX := aBlock
]

{ #category : #'api - axes' }
GtPlotterLineChart >> labelFormatY: aBlock [
"Create a {{gtClass:BlText}}.
Block has one argument [ :aValue | ... ]"
labelFormatY := aBlock
]

{ #category : #accessing }
GtPlotterLineChart >> maxX [
^ maxX
]

{ #category : #accessing }
GtPlotterLineChart >> maxX: anObject [
maxX := anObject
]

{ #category : #accessing }
GtPlotterLineChart >> maxY [
^ maxY
]

{ #category : #accessing }
GtPlotterLineChart >> maxY: anObject [
maxY := anObject
]

{ #category : #accessing }
GtPlotterLineChart >> minX [
^ minX
]

{ #category : #accessing }
GtPlotterLineChart >> minX: anObject [
minX := anObject
]

{ #category : #accessing }
GtPlotterLineChart >> minY [
^ minY
]

{ #category : #accessing }
GtPlotterLineChart >> minY: anObject [
minY := anObject
]

{ #category : #'instance creation' }
GtPlotterLineChart >> newAxisXElement [
| aContainer |
Expand Down Expand Up @@ -426,134 +336,6 @@ GtPlotterLineChart >> newNoDataElement [
c grid vertical alignCenter ]
]

{ #category : #'instance creation' }
GtPlotterLineChart >> newProjectionXLabelsElement [
| anElement |
anElement := GtPlotterHorizontalValueProjectionsElement new
scale: self scaleX;
scaleData: valueX;
clipChildren: false;
constraintsDo: [ :c | c vertical fitContent ];
hideOverlapping;
values: (projectionXValues cull: self data).

projectionXLabelElement ifNotNil: [
anElement valueElement: projectionXLabelElement ].

projectionXLabelStyle ifNotNil: [
anElement valueStyle: projectionXLabelStyle ].

^ anElement
]

{ #category : #'instance creation' }
GtPlotterLineChart >> newProjectionXLinesElement [
^ GtPlotterHorizontalValueProjectionsElement new
scale: self scaleX;
scaleData: valueX;
valueStyle: projectionXLineStyle;
values: (projectionXValues cull: self data)
]

{ #category : #'api - instantiation' }
GtPlotterLineChart >> projectionLabelXStencil [
(self data size isZero or: [ projectionXValues isNil ])
ifTrue: [ ^ nil ].
self initializeScales.
^ BrValuableStencil new
valuable: [ self newProjectionXLabelsElement ]
]

{ #category : #'api - projections' }
GtPlotterLineChart >> projectionXLabelElement: aBlock [
"Return projection label element.
Block has one argument: [ :aGtPlotterSingleScaleContext | ... ]"
projectionXLabelElement := aBlock
]

{ #category : #'api - projections' }
GtPlotterLineChart >> projectionXLabelStyle: aBlock [
"Style a label element.
Block has one argument: [ :anElement | ... ]"
projectionXLabelStyle := aBlock
]

{ #category : #'api - projections' }
GtPlotterLineChart >> projectionXLineStyle: aBlock [
"Style a label element.
Block has one argument: [ :anElement :aGtPlotterScaleContext | ... ]"
projectionXLineStyle := aBlock
]

{ #category : #'api - projections' }
GtPlotterLineChart >> projectionXValues: aBlock [
"Return projection values.
Block has one argument: [ :aData | ... ]"
projectionXValues := aBlock
]

{ #category : #accessing }
GtPlotterLineChart >> scaleX [
^ scaleX
]

{ #category : #accessing }
GtPlotterLineChart >> scaleX: anObject [
scaleX := anObject
]

{ #category : #accessing }
GtPlotterLineChart >> scaleY [
^ scaleY
]

{ #category : #accessing }
GtPlotterLineChart >> scaleY: anObject [
scaleY := anObject
]

{ #category : #'api - axes' }
GtPlotterLineChart >> ticksX: aNumber [
"Define number of axis ticks"
ticksX := aNumber
]

{ #category : #'api - axes' }
GtPlotterLineChart >> ticksY: aNumber [
"Define number of axis ticks"
ticksY := aNumber
]

{ #category : #'api - axes' }
GtPlotterLineChart >> titleX: aString [
titleX := aString
]

{ #category : #'api - axes' }
GtPlotterLineChart >> titleY: aString [
titleY := aString
]

{ #category : #accessing }
GtPlotterLineChart >> valueX [
^ valueX
]

{ #category : #accessing }
GtPlotterLineChart >> valueX: anObject [
valueX := anObject
]

{ #category : #accessing }
GtPlotterLineChart >> valueY [
^ valueY
]

{ #category : #accessing }
GtPlotterLineChart >> valueY: anObject [
valueY := anObject
]

{ #category : #'api - data' }
GtPlotterLineChart >> with: aGtPlotterDataGroup [
data := aGtPlotterDataGroup
Expand Down
Loading