Skip to content

Change element names and svgs #229

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
Protocythr wants to merge 5 commits into
base: main
Choose a base branch
from
+410 −1,469
Open

Change element names and svgs #229

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
fe8215b
removed element from namespace but will have to figure out the bug wi…
Protocythr Oct 12, 2025
712f3c2
Removed Pulley
Protocythr Nov 3, 2025
583b762
removed svg and remaining comments
Protocythr Nov 4, 2025
4bd90f0
Renamed Rotational Spring to Torsion Spring and change svg for it as …
Protocythr Nov 12, 2025
11e0c61
Replaced most all requested svgs and added bearing commented while wo…
Protocythr Jan 16, 2026
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
1 change: 0 additions & 1 deletion .idea/.idea.BoGLWeb/.idea/.name
View file
Open in desktop

This file was deleted.

61 changes: 43 additions & 18 deletions .idea/.idea.BoGLWeb/.idea/workspace.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

74 changes: 37 additions & 37 deletions BoGLWeb/SystemDiagram.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
using Newtonsoft.Json.Linq;

namespace BoGLWeb {
public class SystemDiagram {
public class SystemDiagram {
private static readonly ImmutableDictionary<string, int> modifierIDDict;
private static readonly ImmutableDictionary<int, string> modifierIDDictReverse;
private static readonly ImmutableDictionary<int, string> modifierIDDictReverseGraph;
Expand Down Expand Up @@ -69,24 +69,24 @@ static SystemDiagram() {
typeBuilder.Add("System_MR_Torque_Input", 10);
typeBuilder.Add("System_MR_Velocity_Input", 11);
typeBuilder.Add("System_MR_Lever", 12);
typeBuilder.Add("System_MR_Pulley", 13);
typeBuilder.Add("System_MR_Pulley_Grounded", 30);
typeBuilder.Add("System_MR_Belt", 14);
typeBuilder.Add("System_MR_Shaft", 15);
typeBuilder.Add("System_MR_Gear", 16);
typeBuilder.Add("System_MR_Gear_Pair", 17);
typeBuilder.Add("System_MR_Rack", 18);
typeBuilder.Add("System_MR_Rack_Pinion", 19);
typeBuilder.Add("System_E_Inductor", 20);
typeBuilder.Add("System_E_Capacitor", 21);
typeBuilder.Add("System_E_Resistor", 22);
typeBuilder.Add("System_E_Transformer", 23);
typeBuilder.Add("System_E_Junction", 24);
typeBuilder.Add("System_E_Ground", 25);
typeBuilder.Add("System_E_Current_Input", 26);
typeBuilder.Add("System_E_Voltage_Input", 27);
typeBuilder.Add("System_O_PM_Motor", 28);
typeBuilder.Add("System_O_VC_Transducer", 29);
typeBuilder.Add("System_MR_Belt", 13);
typeBuilder.Add("System_MR_Shaft", 14);
typeBuilder.Add("System_MR_Gear", 15);
typeBuilder.Add("System_MR_Gear_Pair", 16);
typeBuilder.Add("System_MR_Rack", 17);
typeBuilder.Add("System_MR_Rack_Pinion", 18);
typeBuilder.Add("System_E_Inductor", 19);
typeBuilder.Add("System_E_Capacitor", 20);
typeBuilder.Add("System_E_Resistor", 21);
typeBuilder.Add("System_E_Transformer", 22);
typeBuilder.Add("System_E_Junction", 23);
typeBuilder.Add("System_E_Ground", 24);
typeBuilder.Add("System_E_Current_Input", 25);
typeBuilder.Add("System_E_Voltage_Input", 26);
typeBuilder.Add("System_O_PM_Motor", 27);
typeBuilder.Add("System_O_VC_Transducer", 28);
typeBuilder.Add("System_MR_Pulley_Grounded", 29);
//typeBuilder.Add("System_MR_Bearing", 30);

typeIDDict = typeBuilder.ToImmutable();

Expand All @@ -105,24 +105,24 @@ static SystemDiagram() {
typeBuilderReverse.Add(10, "System_MR_Torque_Input");
typeBuilderReverse.Add(11, "System_MR_Velocity_Input");
typeBuilderReverse.Add(12, "System_MR_Lever");
typeBuilderReverse.Add(13, "System_MR_Pulley");
typeBuilderReverse.Add(30, "System_MR_Pulley_Grounded");
typeBuilderReverse.Add(14, "System_MR_Belt");
typeBuilderReverse.Add(15, "System_MR_Shaft");
typeBuilderReverse.Add(16, "System_MR_Gear");
typeBuilderReverse.Add(17, "System_MR_Gear_Pair");
typeBuilderReverse.Add(18, "System_MR_Rack");
typeBuilderReverse.Add(19, "System_MR_Rack_Pinion");
typeBuilderReverse.Add(20, "System_E_Inductor");
typeBuilderReverse.Add(21, "System_E_Capacitor");
typeBuilderReverse.Add(22, "System_E_Resistor");
typeBuilderReverse.Add(23, "System_E_Transformer");
typeBuilderReverse.Add(24, "System_E_Junction");
typeBuilderReverse.Add(25, "System_E_Ground");
typeBuilderReverse.Add(26, "System_E_Current_Input");
typeBuilderReverse.Add(27, "System_E_Voltage_Input");
typeBuilderReverse.Add(28, "System_O_PM_Motor");
typeBuilderReverse.Add(29, "System_O_VC_Transducer");
typeBuilderReverse.Add(13, "System_MR_Belt");
typeBuilderReverse.Add(14, "System_MR_Shaft");
typeBuilderReverse.Add(15, "System_MR_Gear");
typeBuilderReverse.Add(16, "System_MR_Gear_Pair");
typeBuilderReverse.Add(17, "System_MR_Rack");
typeBuilderReverse.Add(18, "System_MR_Rack_Pinion");
typeBuilderReverse.Add(19, "System_E_Inductor");
typeBuilderReverse.Add(20, "System_E_Capacitor");
typeBuilderReverse.Add(21, "System_E_Resistor");
typeBuilderReverse.Add(22, "System_E_Transformer");
typeBuilderReverse.Add(23, "System_E_Junction");
typeBuilderReverse.Add(24, "System_E_Ground");
typeBuilderReverse.Add(25, "System_E_Current_Input");
typeBuilderReverse.Add(26, "System_E_Voltage_Input");
typeBuilderReverse.Add(27, "System_O_PM_Motor");
typeBuilderReverse.Add(28, "System_O_VC_Transducer");
typeBuilderReverse.Add(29, "System_MR_Pulley_Grounded");
//typeBuilderReverse.Add(30, "System_MR_Bearing");

typeIDDictReverse = typeBuilderReverse.ToImmutable();
}
Expand Down
28 changes: 2 additions & 26 deletions BoGLWeb/wwwroot/backendManager.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,10 +87,6 @@ export namespace backendManager {
let n1: number = elementLocations[i][0];
let n2: number = elementLocations[i][1];
let arr: number[] = [n1, n2];
/*console.log('arr:', arr);
console.log('elementSize:', elementSize);
console.log('screenSizeX:', screenSizeX);
console.log('screenSizeY:', screenSizeY);*/
let x = Math.abs((arr[0] - minX) / elementSize);
let y = Math.abs((arr[1] - minY) / elementSize);
let roundedDownX: number = Math.floor(x);
Expand All @@ -101,18 +97,9 @@ export namespace backendManager {
roundedUpX = Math.min(roundedUpX, generalElementLocations.length - 1);
roundedDownY = Math.min(roundedDownY, generalElementLocations[0].length - 1);
roundedUpY = Math.min(roundedUpY, generalElementLocations[0].length - 1);
/*console.log('x = (', arr[0], ' - ', minX, ') / ', elementSize);
console.log('y = (', arr[1], ' - ', minY, ') / ', elementSize);
console.log('X: ', x);
console.log('Y: ', y);
console.log(`generalElementLocations length: ${generalElementLocations.length}`);
console.log('generalElementLocations:', generalElementLocations);
console.log('generalElementLocations X:', generalElementLocations.length);
console.log('generalElementLocations Y:', generalElementLocations[0].length);*/
if(roundedUpX != roundedDownX && roundedUpY != roundedUpY){
if(roundedUpX != roundedDownX && roundedUpY != roundedDownY){
generalElementLocations[roundedUpX][roundedUpY].push(i);
}
//console.log('elementSize:', elementSize);
generalElementLocations[roundedDownX][roundedDownY].push(i);
}

Expand Down Expand Up @@ -159,17 +146,6 @@ export namespace backendManager {
// getting the absolute value of the difference between the x and y axis of the two points
let firstElement: number[] = elementLocations[offendingElements[i][0]];
let secondElement: number[] = elementLocations[offendingElements[i][1]];
//TODO: fix
/*console.log('elementLocations', elementLocations);
console.log('f1: ',firstElement);
console.log('f2: ',secondElement);
console.log('i: ', i);
console.log('FE: ', elementLocations[offendingElements[i][0]]);
console.log('SE: ', elementLocations[offendingElements[i][1]]);
console.log('absX', Math.abs(firstElement[0] - secondElement[0]));
console.log('absY', Math.abs(firstElement[1] - secondElement[1]));*/
//let absX: number = Math.abs(firstElement[0] - secondElement[0]);
//let absY: number = Math.abs(firstElement[1] - secondElement[1]);
let newLocations: number[][] = [];
// checking if the first element is further away from 0
newLocations = this.adjustTwoPoints(firstElement, secondElement, elementSize);
Expand Down Expand Up @@ -200,7 +176,7 @@ export namespace backendManager {
elementLocations[offendingElements[i][1]] = newLocations[1];
}
}

console.log("Completed Successfully");
return elementLocations; // returns all of the locations for every element adjusted
}

Expand Down
88 changes: 88 additions & 0 deletions BoGLWeb/wwwroot/images/elements/Bearing.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading