diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/client/documents/Documents.ts | 2 | ||||
-rw-r--r-- | src/client/views/nodes/PhysicsBox/PhysicsSimulationBox.tsx | 26 | ||||
-rw-r--r-- | src/client/views/nodes/PhysicsBox/PhysicsSimulationWeight.tsx | 3 |
3 files changed, 18 insertions, 13 deletions
diff --git a/src/client/documents/Documents.ts b/src/client/documents/Documents.ts index 0f3d5867e..13d0f41a9 100644 --- a/src/client/documents/Documents.ts +++ b/src/client/documents/Documents.ts @@ -661,7 +661,7 @@ export namespace Docs { DocumentType.SIMULATION, { layout: { view: PhysicsSimulationBox, dataField: defaultDataKey }, - options: { _height: 500 } + options: { _height: 100 } } ] ]); diff --git a/src/client/views/nodes/PhysicsBox/PhysicsSimulationBox.tsx b/src/client/views/nodes/PhysicsBox/PhysicsSimulationBox.tsx index 21cef297a..691f1145c 100644 --- a/src/client/views/nodes/PhysicsBox/PhysicsSimulationBox.tsx +++ b/src/client/views/nodes/PhysicsBox/PhysicsSimulationBox.tsx @@ -113,9 +113,11 @@ export default class PhysicsSimulationBox extends ViewBoxAnnotatableComponent<Fi this.wallPositions.push({ length: 80, xPos: 69.5, yPos: 0, angleInDegrees: 90 }); // Used throughout sims - this.xMax = this.layoutDoc._width*0.08 ?? 500; - this.yMax = this.layoutDoc._height*0.08 ?? 500; - this.radius = 0.1*this.layoutDoc._height ?? 50; + this.layoutDoc._width = 1000; + this.layoutDoc._height = 1000; + this.xMax = this.layoutDoc._width*0.8 ?? 800; + this.yMax = this.layoutDoc._height*0.8 ?? 800; + this.radius = 50; this.dataDoc.reviewCoefficient = this.dataDoc.reviewCoefficient ?? 0; this.dataDoc.questionVariables = this.dataDoc.questionVariables ?? []; this.dataDoc.accelerationXDisplay = this.dataDoc.accelerationXDisplay ?? 0; @@ -363,12 +365,18 @@ export default class PhysicsSimulationBox extends ViewBoxAnnotatableComponent<Fi // } this.dataDoc.simulationReset = (!this.dataDoc.simulationReset); } + + + console.log("width: ", this.xMax) + console.log("height: ", this.yMax) } componentDidUpdate() { - this.xMax = this.layoutDoc._width*0.08 ?? 500; - this.yMax = this.layoutDoc._height*0.08 ?? 500; - this.radius = 0.1*this.layoutDoc._height ?? 50; + this.xMax = this.layoutDoc._width*0.8 ?? 800; + this.yMax = this.layoutDoc._height*0.8 ?? 800; + this.radius = 0.05*this.layoutDoc._height ?? 50; + console.log("width: ", this.xMax) + console.log("height: ", this.yMax) } // Helper function to go between display and real values @@ -2453,7 +2461,7 @@ export default class PhysicsSimulationBox extends ViewBoxAnnotatableComponent<Fi <div style={{ position: "fixed", - top: this.layoutDoc._height ?? 500 - 120 + 20 + "px", + top: this.yMax - 120 + 20 + "px", left: this.xMin + 90 - 80 + "px", zIndex: -10000, }} @@ -2494,7 +2502,7 @@ export default class PhysicsSimulationBox extends ViewBoxAnnotatableComponent<Fi <p style={{ position: "fixed", - top: this.layoutDoc._height?? 500 - 120 + 40 + "px", + top: this.yMax - 120 + 40 + "px", left: this.xMin + 90 - 80 + "px", }} > @@ -2503,7 +2511,7 @@ export default class PhysicsSimulationBox extends ViewBoxAnnotatableComponent<Fi <p style={{ position: "fixed", - top: this.layoutDoc._height ?? 500- 120 + 80 + "px", + top: this.yMax - 120 + 80 + "px", left: this.xMin + 90 - 40 + "px", }} > diff --git a/src/client/views/nodes/PhysicsBox/PhysicsSimulationWeight.tsx b/src/client/views/nodes/PhysicsBox/PhysicsSimulationWeight.tsx index 013b1bb5b..ab7ae8450 100644 --- a/src/client/views/nodes/PhysicsBox/PhysicsSimulationWeight.tsx +++ b/src/client/views/nodes/PhysicsBox/PhysicsSimulationWeight.tsx @@ -895,7 +895,6 @@ export default class Weight extends React.Component<IWeightProps, IState> { className="weightContainer" onPointerDown={(e) => { if (this.draggable) { - e.preventDefault(); this.props.dataDoc['paused'] = true; this.setState({dragging: true}); this.setState({clickPositionX: e.clientX}); @@ -903,7 +902,6 @@ export default class Weight extends React.Component<IWeightProps, IState> { } }} onPointerMove={(e) => { - e.preventDefault(); if (this.state.dragging) { let newY = this.state.yPosition + e.clientY - this.state.clickPositionY; if (newY > this.props.yMax - 2 * this.props.radius - 10) { @@ -946,7 +944,6 @@ export default class Weight extends React.Component<IWeightProps, IState> { }} onPointerUp={(e) => { if (this.state.dragging) { - e.preventDefault(); if ( this.props.dataDoc['simulationType'] != "Pendulum" && this.props.dataDoc['simulationType'] != "Suspension" |