Skip to content

Commit 17a6293

Browse files
Include auto-built file modifications
1 parent 04ede43 commit 17a6293

File tree

17 files changed

+53
-36
lines changed

17 files changed

+53
-36
lines changed

src/components/al-angle-editor/readme.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424

2525
### Used by
2626

27-
- [al-graph-editor](..\al-graph-editor)
27+
- [al-graph-editor](../al-graph-editor)
2828

2929
### Depends on
3030

src/components/al-console/readme.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424

2525
### Used by
2626

27-
- [al-control-panel](..\al-control-panel)
27+
- [al-control-panel](../al-control-panel)
2828

2929
### Depends on
3030

src/components/al-control-panel/readme.md

+6-6
Original file line numberDiff line numberDiff line change
@@ -41,17 +41,17 @@
4141
### Depends on
4242

4343
- ion-app
44-
- [al-tabs](..\al-tabs)
44+
- [al-tabs](../al-tabs)
4545
- ion-tab-bar
4646
- ion-tab-button
4747
- ion-icon
4848
- ion-label
4949
- ion-tab
50-
- [al-view-controls](..\al-view-controls)
51-
- [al-url-picker](..\al-url-picker)
52-
- [al-settings](..\al-settings)
53-
- [al-graph-editor](..\al-graph-editor)
54-
- [al-console](..\al-console)
50+
- [al-view-controls](../al-view-controls)
51+
- [al-url-picker](../al-url-picker)
52+
- [al-settings](../al-settings)
53+
- [al-graph-editor](../al-graph-editor)
54+
- [al-console](../al-console)
5555

5656
### Graph
5757
```mermaid

src/components/al-edge-editor/readme.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424

2525
### Used by
2626

27-
- [al-graph-editor](..\al-graph-editor)
27+
- [al-graph-editor](../al-graph-editor)
2828

2929
### Depends on
3030

src/components/al-graph-editor/readme.md

+6-6
Original file line numberDiff line numberDiff line change
@@ -23,16 +23,16 @@
2323

2424
### Used by
2525

26-
- [al-control-panel](..\al-control-panel)
26+
- [al-control-panel](../al-control-panel)
2727

2828
### Depends on
2929

30-
- [al-graph-settings](..\al-graph-settings)
31-
- [al-node-list](..\al-node-list)
30+
- [al-graph-settings](../al-graph-settings)
31+
- [al-node-list](../al-node-list)
3232
- ion-item-divider
33-
- [al-node-editor](..\al-node-editor)
34-
- [al-edge-editor](..\al-edge-editor)
35-
- [al-angle-editor](..\al-angle-editor)
33+
- [al-node-editor](../al-node-editor)
34+
- [al-edge-editor](../al-edge-editor)
35+
- [al-angle-editor](../al-angle-editor)
3636

3737
### Graph
3838
```mermaid

src/components/al-graph-settings/readme.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242

4343
### Used by
4444

45-
- [al-graph-editor](..\al-graph-editor)
45+
- [al-graph-editor](../al-graph-editor)
4646

4747
### Depends on
4848

src/components/al-node-editor/readme.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424

2525
### Used by
2626

27-
- [al-graph-editor](..\al-graph-editor)
27+
- [al-graph-editor](../al-graph-editor)
2828

2929
### Depends on
3030

src/components/al-node-list/readme.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424

2525
### Used by
2626

27-
- [al-graph-editor](..\al-graph-editor)
27+
- [al-graph-editor](../al-graph-editor)
2828

2929
### Depends on
3030

src/components/al-settings/readme.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656

5757
### Used by
5858

59-
- [al-control-panel](..\al-control-panel)
59+
- [al-control-panel](../al-control-panel)
6060

6161
### Depends on
6262

src/components/al-tabs/readme.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ Type: `Promise<boolean>`
5959

6060
### Used by
6161

62-
- [al-control-panel](..\al-control-panel)
62+
- [al-control-panel](../al-control-panel)
6363

6464
### Graph
6565
```mermaid

src/components/al-url-picker/readme.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424

2525
### Used by
2626

27-
- [al-control-panel](..\al-control-panel)
27+
- [al-control-panel](../al-control-panel)
2828

2929
### Depends on
3030

src/components/al-view-controls/readme.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242

4343
### Used by
4444

45-
- [al-control-panel](..\al-control-panel)
45+
- [al-control-panel](../al-control-panel)
4646

4747
### Depends on
4848

src/components/al-viewer/al-viewer.tsx

+1-4
Original file line numberDiff line numberDiff line change
@@ -1065,10 +1065,7 @@ export class Aleph {
10651065
Constants.zoomFactor,
10661066
Constants.fov
10671067
);
1068-
cameraState = Utils.getCameraStateFromMesh(
1069-
mesh,
1070-
sceneDistance
1071-
);
1068+
cameraState = Utils.getCameraStateFromMesh(mesh, sceneDistance);
10721069
}
10731070

10741071
if (sceneDistance) {

src/functional-components/aframe/Angles.tsx

+8-4
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,10 @@ export const Angles: FunctionalComponent<AnglesProps> = (
6868
node1 = nodes.get(edge1.node1Id);
6969
node2 = nodes.get(edge2.node1Id);
7070
}
71-
const radius = ( (boundingSphereRadius * edgeSize) > edgeMinSize ) ? (boundingSphereRadius * edgeSize) : edgeMinSize;
71+
const radius =
72+
boundingSphereRadius * edgeSize > edgeMinSize
73+
? boundingSphereRadius * edgeSize
74+
: edgeMinSize;
7275
const node1Pos = ThreeUtils.stringToVector3(node1.position);
7376
const node2Pos = ThreeUtils.stringToVector3(node2.position);
7477
const centralPos = ThreeUtils.stringToVector3(centralNode.position);
@@ -116,10 +119,11 @@ export const Angles: FunctionalComponent<AnglesProps> = (
116119
const scale = (node1.scale + node2.scale + centralNode.scale) / 3;
117120
textOffset.multiplyScalar(scale);
118121

119-
const degreeNum = THREE.Math.radToDeg(angl).toFixed(Constants.textUnitsDecimalPlaces);
122+
const degreeNum = THREE.Math.radToDeg(angl).toFixed(
123+
Constants.textUnitsDecimalPlaces
124+
);
120125
const textV =
121-
degreeNum + " " +
122-
( ( parseInt(degreeNum) == 1.0 ) ? "degree" : "degrees"); // todo: use i18n
126+
degreeNum + " " + (parseInt(degreeNum) == 1.0 ? "degree" : "degrees"); // todo: use i18n
123127

124128
const frustrumDistance = ThreeUtils.getFrustrumSpaceDistance(
125129
camera,

src/functional-components/aframe/Edges.tsx

+14-4
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,9 @@ const convertUnits = (
3232
}
3333
case Units.MILLIMETERS: {
3434
// convert m to mm
35-
return (dist / 0.001).toFixed(Constants.textUnitsDecimalPlaces) + " " + units;
35+
return (
36+
(dist / 0.001).toFixed(Constants.textUnitsDecimalPlaces) + " " + units
37+
);
3638
}
3739
default: {
3840
break;
@@ -43,7 +45,11 @@ const convertUnits = (
4345
switch (units) {
4446
case Units.METERS: {
4547
// convert mm to m
46-
return (dist / 1000.0).toFixed(Constants.textUnitsDecimalPlaces) + " " + units;
48+
return (
49+
(dist / 1000.0).toFixed(Constants.textUnitsDecimalPlaces) +
50+
" " +
51+
units
52+
);
4753
}
4854
case Units.MILLIMETERS: {
4955
return dist.toFixed(Constants.textUnitsDecimalPlaces) + " " + units;
@@ -89,7 +95,10 @@ export const Edges: FunctionalComponent<EdgesProps> = (
8995

9096
const textOffset: THREE.Vector3 = new THREE.Vector3(0, 2.5, 0);
9197
const scale = (node1.scale + node2.scale) / 2;
92-
const radius = ( (boundingSphereRadius * edgeSize) > edgeMinSize ) ? (boundingSphereRadius * edgeSize) : edgeMinSize;
98+
const radius =
99+
boundingSphereRadius * edgeSize > edgeMinSize
100+
? boundingSphereRadius * edgeSize
101+
: edgeMinSize;
93102
textOffset.multiplyScalar(scale);
94103

95104
const textV = convertUnits(dist, displayMode, units);
@@ -107,7 +116,8 @@ export const Edges: FunctionalComponent<EdgesProps> = (
107116
// New method: nodes are consistent (using scale determined by Constants edgeSize)
108117
const entityScale = 1;
109118

110-
const textEntityScale = (frustrumDistance / boundingSphereRadius) *
119+
const textEntityScale =
120+
(frustrumDistance / boundingSphereRadius) *
111121
Constants.frustrumScaleFactor;
112122

113123
return (

src/functional-components/aframe/Nodes.tsx

+2-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,8 @@ export const Nodes: FunctionalComponent<NodesProps> = (
4444
// New method: nodes are consistent (using scale determined by Constants nodeSize)
4545
const entityScale = 1;
4646

47-
const textEntityScale = (frustrumDistance / boundingSphereRadius) *
47+
const textEntityScale =
48+
(frustrumDistance / boundingSphereRadius) *
4849
Constants.frustrumScaleFactor;
4950

5051
const textOffset: THREE.Vector3 = new THREE.Vector3(

src/utils/GraphUtils.ts

+6-1
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,11 @@ export class GraphUtils {
3131
type: AlGraphEntryType,
3232
entries: Map<string, AlGraphEntry>
3333
): string {
34-
return type.charAt(0).toUpperCase() + type.slice(1) + " " + Number(this.getEntryWithHighestId(entries) + 1);
34+
return (
35+
type.charAt(0).toUpperCase() +
36+
type.slice(1) +
37+
" " +
38+
Number(this.getEntryWithHighestId(entries) + 1)
39+
);
3540
}
3641
}

0 commit comments

Comments
 (0)