Skip to content
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

Add a sine wave tool to the graphtool. #1157

Open
wants to merge 8 commits into
base: develop
Choose a base branch
from
Open

Add a sine wave tool to the graphtool. #1157

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
c888d56
Add a sine wave tool to the graphtool.
drgrice1 Dec 4, 2024
57caa21
Also make the axis tick labels be shown according to the `coordinateH…
drgrice1 Dec 6, 2024
be1e17e
Update JSXGraph to the latest version.
drgrice1 Dec 6, 2024
2bdbfd5
Add a way for a graph object to add to the help.
drgrice1 Dec 6, 2024
4a4da10
Fix a couple of issues seen in review.
drgrice1 Dec 12, 2024
e4eb446
Enlarge the provided bounding box by JXG.Math.eps in each direction so
drgrice1 Dec 12, 2024
b18d3b8
Make changes for existing graph tools that were made with the sine wa…
drgrice1 Dec 12, 2024
88d2ff9
Update the board after MathJax finishes typesetting to fix label posi…
drgrice1 Dec 13, 2024
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
82 changes: 44 additions & 38 deletions htdocs/js/GraphTool/cubictool.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,25 +179,30 @@
}
);
point.setAttribute({ snapToGrid: true });
if (typeof grouped_points !== 'undefined' && grouped_points.length) {
point.grouped_points = [];
grouped_points.forEach((paired_point) => {
point.grouped_points.push(paired_point);
if (!paired_point.grouped_points) {
paired_point.grouped_points = [];
paired_point.on('drag', gt.graphObjectTypes.cubic.groupedPointDrag);
}
paired_point.grouped_points.push(point);
if (
!paired_point.eventHandlers.drag ||
paired_point.eventHandlers.drag.every(
(dragHandler) => dragHandler.handler !== gt.graphObjectTypes.cubic.groupedPointDrag

if (!gt.isStatic) {
if (typeof grouped_points !== 'undefined' && grouped_points.length) {
point.grouped_points = [];
grouped_points.forEach((paired_point) => {
point.grouped_points.push(paired_point);
if (!paired_point.grouped_points) {
paired_point.grouped_points = [];
paired_point.on('drag', gt.graphObjectTypes.cubic.groupedPointDrag);
}
paired_point.grouped_points.push(point);
if (
!paired_point.eventHandlers.drag ||
paired_point.eventHandlers.drag.every(
(dragHandler) =>
dragHandler.handler !== gt.graphObjectTypes.cubic.groupedPointDrag
)
)
)
paired_point.on('drag', gt.graphObjectTypes.cubic.groupedPointDrag);
});
point.on('drag', gt.graphObjectTypes.cubic.groupedPointDrag, point);
paired_point.on('drag', gt.graphObjectTypes.cubic.groupedPointDrag);
});
point.on('drag', gt.graphObjectTypes.cubic.groupedPointDrag, point);
}
}

return point;
}
}
Expand Down Expand Up @@ -235,13 +240,12 @@
};

this.phase2 = (coords) => {
// Don't allow the second point to be created on the same
// vertical line as the first point or off the board.
if (
this.point1.X() == gt.snapRound(coords[1], gt.snapSizeX) ||
!gt.boardHasPoint(coords[1], coords[2])
)
return;
if (!gt.boardHasPoint(coords[1], coords[2])) return;

// If the current coordinates are on the same vertical line as the first point,
// then use the highlight point coordinates instead.
if (Math.abs(this.point1.X() - gt.snapRound(coords[1], gt.snapSizeX)) < JXG.Math.eps)
coords = this.hlObjs.hl_point.coords.usrCoords;

gt.board.off('up');

Expand All @@ -267,14 +271,15 @@
};

this.phase3 = (coords) => {
// Don't allow the third point to be created on the same vertical line as the
// first point, on the same vertical line as the second point, or off the board.
if (!gt.boardHasPoint(coords[1], coords[2])) return;

// If the current coordinates are on the same vertical line as the first point, or on the same
// vertical line as the second point, then use the highlight point coordinates instead.
if (
this.point1.X() == gt.snapRound(coords[1], gt.snapSizeX) ||
this.point2.X() == gt.snapRound(coords[1], gt.snapSizeX) ||
!gt.boardHasPoint(coords[1], coords[2])
Math.abs(this.point1.X() - gt.snapRound(coords[1], gt.snapSizeX)) < JXG.Math.eps ||
Math.abs(this.point2.X() - gt.snapRound(coords[1], gt.snapSizeX)) < JXG.Math.eps
)
return;
coords = this.hlObjs.hl_point.coords.usrCoords;

gt.board.off('up');
this.point3 = gt.graphObjectTypes.cubic.createPoint(coords[1], coords[2], [
Expand Down Expand Up @@ -306,16 +311,17 @@
};

this.phase4 = (coords) => {
// Don't allow the fourth point to be created on the same vertical line as the first
// point, on the same vertical line as the second point, on the same vertical line as
// the third point, or off the board.
if (!gt.boardHasPoint(coords[1], coords[2])) return;

// If the current coordinates are on the same vertical line as the first point, on the same vertical
// line as the second point, or on the same vertical line as the third point, then use the highlight
// point coordinates instead.
if (
this.point1.X() == gt.snapRound(coords[1], gt.snapSizeX) ||
this.point2.X() == gt.snapRound(coords[1], gt.snapSizeX) ||
this.point3.X() == gt.snapRound(coords[1], gt.snapSizeX) ||
!gt.boardHasPoint(coords[1], coords[2])
Math.abs(this.point1.X() - gt.snapRound(coords[1], gt.snapSizeX)) < JXG.Math.eps ||
Math.abs(this.point2.X() - gt.snapRound(coords[1], gt.snapSizeX)) < JXG.Math.eps ||
Math.abs(this.point3.X() - gt.snapRound(coords[1], gt.snapSizeX)) < JXG.Math.eps
)
return;
coords = this.hlObjs.hl_point.coords.usrCoords;

gt.board.off('up');

Expand Down
Loading