Skip to content

Ready for Swift 6 Chart fixes for extended data #3792

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

Merged
merged 8 commits into from
May 8, 2025
Merged

Ready for Swift 6 Chart fixes for extended data #3792

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
663ef88
Make the X axis scale dynamic rather than fixed.
daveverwer May 8, 2025
6039f48
Beter to do this with actual dates rather than rely on the strings.
daveverwer May 8, 2025
fe240b1
Use Vega’s built in support for `date` scales.
daveverwer May 8, 2025
ddecb8f
removed month grid lines.
daveverwer May 8, 2025
ac4a674
Reduced opacity of the event marks.
daveverwer May 8, 2025
8ebf480
Corrected the final event label.
daveverwer May 8, 2025
567b9f3
Added Swift version to all event labels.
daveverwer May 8, 2025
8ba83db
Removed incomplete line of code.
daveverwer May 8, 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
6 changes: 2 additions & 4 deletions FrontEnd/scripts/controllers/vega_chart_controller.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,6 @@ export class VegaChartController extends Controller {

const labelTextElement = document.createTextNode(dataSet.name)
labelElement.appendChild(labelTextElement)
labelElement.replaceChild
})
return formElement
}
Expand Down Expand Up @@ -239,7 +238,7 @@ class ReadyForSwift6Chart {
{
name: 'xscale',
type: 'time',
domain: [{ signal: 'datetime("2024-05-01")' }, { signal: 'datetime("2024-12-31")' }],
domain: { fields: data.map((d) => ({ data: d.id, field: 'date' })) },
range: 'width',
},
{
Expand All @@ -257,7 +256,6 @@ class ReadyForSwift6Chart {
{
orient: 'bottom',
scale: 'xscale',
grid: true,
labelAngle: { value: -45 },
labelAlign: { value: 'right' },
},
Expand Down Expand Up @@ -321,7 +319,7 @@ class ReadyForSwift6Chart {
y: { scale: 'yscale', signal: 'minYScale' },
y2: { scale: 'yscale', signal: 'maxYScale' },
fill: { value: '#000000' },
opacity: { value: 0.3 },
opacity: { value: 0.1 },
tooltip: {
signal: 'datum.value',
},
Expand Down
20 changes: 10 additions & 10 deletions Resources/ChartData/rfs6-events.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,46 +1,46 @@
[
{
"date": "2024-06-10",
"value": "Xcode 16 beta 1 released at WWDC '24"
"value": "Xcode 16 beta 1 released at WWDC '24 (Swift 6.0)"
},
{
"date": "2024-06-25",
"value": "Xcode 16 beta 2 released"
"value": "Xcode 16 beta 2 released (Swift 6.0)"
},
{
"date": "2024-07-08",
"value": "Xcode 16 beta 3 released"
"value": "Xcode 16 beta 3 released (Swift 6.0)"
},
{
"date": "2024-07-23",
"value": "Xcode 16 beta 4 released"
"value": "Xcode 16 beta 4 released (Swift 6.0)"
},
{
"date": "2024-08-06",
"value": "Xcode 16 beta 5 released"
"value": "Xcode 16 beta 5 released (Swift 6.0)"
},
{
"date": "2024-08-20",
"value": "Xcode 16 beta 6 released"
"value": "Xcode 16 beta 6 released (Swift 6.0)"
},
{
"date": "2024-09-09",
"value": "Xcode 16 RC released"
"value": "Xcode 16 RC released (Swift 6.0)"
},
{
"date": "2024-09-16",
"value": "Xcode 16 released"
"value": "Xcode 16 released (Swift 6.0)"
},
{
"date": "2024-10-28",
"value": "Xcode 16.1 released"
"value": "Xcode 16.1 released (Swift 6.0)"
},
{
"date": "2024-11-22",
"value": "Added more Swift build flags"
},
{
"date": "2025-03-31",
"value": "Xcode"
"value": "Xcode 16.3 released (Swift 6.1)"
}
]
Loading