Skip to content

Commit fb17e51

Browse files
bjpeters2027bjpeters2027
authored
Merge pull request #227 from BoGLWeb/remove-element-from-namespace
Remove element from namespace
2 parents 0d4102c + 583b762 commit fb17e51

6 files changed

Lines changed: 95 additions & 840 deletions

File tree

‎.idea/.idea.BoGLWeb/.idea/.name‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎.idea/.idea.BoGLWeb/.idea/workspace.xml‎

Lines changed: 37 additions & 16 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎BoGLWeb/SystemDiagram.cs‎

Lines changed: 35 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
using Newtonsoft.Json.Linq;
1414

1515
namespace BoGLWeb {
16-
public class SystemDiagram {
16+
public class SystemDiagram {
1717
private static readonly ImmutableDictionary<string, int> modifierIDDict;
1818
private static readonly ImmutableDictionary<int, string> modifierIDDictReverse;
1919
private static readonly ImmutableDictionary<int, string> modifierIDDictReverseGraph;
@@ -69,24 +69,23 @@ static SystemDiagram() {
6969
typeBuilder.Add("System_MR_Torque_Input", 10);
7070
typeBuilder.Add("System_MR_Velocity_Input", 11);
7171
typeBuilder.Add("System_MR_Lever", 12);
72-
typeBuilder.Add("System_MR_Pulley", 13);
73-
typeBuilder.Add("System_MR_Pulley_Grounded", 30);
74-
typeBuilder.Add("System_MR_Belt", 14);
75-
typeBuilder.Add("System_MR_Shaft", 15);
76-
typeBuilder.Add("System_MR_Gear", 16);
77-
typeBuilder.Add("System_MR_Gear_Pair", 17);
78-
typeBuilder.Add("System_MR_Rack", 18);
79-
typeBuilder.Add("System_MR_Rack_Pinion", 19);
80-
typeBuilder.Add("System_E_Inductor", 20);
81-
typeBuilder.Add("System_E_Capacitor", 21);
82-
typeBuilder.Add("System_E_Resistor", 22);
83-
typeBuilder.Add("System_E_Transformer", 23);
84-
typeBuilder.Add("System_E_Junction", 24);
85-
typeBuilder.Add("System_E_Ground", 25);
86-
typeBuilder.Add("System_E_Current_Input", 26);
87-
typeBuilder.Add("System_E_Voltage_Input", 27);
88-
typeBuilder.Add("System_O_PM_Motor", 28);
89-
typeBuilder.Add("System_O_VC_Transducer", 29);
72+
typeBuilder.Add("System_MR_Belt", 13);
73+
typeBuilder.Add("System_MR_Shaft", 14);
74+
typeBuilder.Add("System_MR_Gear", 15);
75+
typeBuilder.Add("System_MR_Gear_Pair", 16);
76+
typeBuilder.Add("System_MR_Rack", 17);
77+
typeBuilder.Add("System_MR_Rack_Pinion", 18);
78+
typeBuilder.Add("System_E_Inductor", 19);
79+
typeBuilder.Add("System_E_Capacitor", 20);
80+
typeBuilder.Add("System_E_Resistor", 21);
81+
typeBuilder.Add("System_E_Transformer", 22);
82+
typeBuilder.Add("System_E_Junction", 23);
83+
typeBuilder.Add("System_E_Ground", 24);
84+
typeBuilder.Add("System_E_Current_Input", 25);
85+
typeBuilder.Add("System_E_Voltage_Input", 26);
86+
typeBuilder.Add("System_O_PM_Motor", 27);
87+
typeBuilder.Add("System_O_VC_Transducer", 28);
88+
typeBuilder.Add("System_MR_Pulley_Grounded", 29);
9089

9190
typeIDDict = typeBuilder.ToImmutable();
9291

@@ -105,24 +104,23 @@ static SystemDiagram() {
105104
typeBuilderReverse.Add(10, "System_MR_Torque_Input");
106105
typeBuilderReverse.Add(11, "System_MR_Velocity_Input");
107106
typeBuilderReverse.Add(12, "System_MR_Lever");
108-
typeBuilderReverse.Add(13, "System_MR_Pulley");
109-
typeBuilderReverse.Add(30, "System_MR_Pulley_Grounded");
110-
typeBuilderReverse.Add(14, "System_MR_Belt");
111-
typeBuilderReverse.Add(15, "System_MR_Shaft");
112-
typeBuilderReverse.Add(16, "System_MR_Gear");
113-
typeBuilderReverse.Add(17, "System_MR_Gear_Pair");
114-
typeBuilderReverse.Add(18, "System_MR_Rack");
115-
typeBuilderReverse.Add(19, "System_MR_Rack_Pinion");
116-
typeBuilderReverse.Add(20, "System_E_Inductor");
117-
typeBuilderReverse.Add(21, "System_E_Capacitor");
118-
typeBuilderReverse.Add(22, "System_E_Resistor");
119-
typeBuilderReverse.Add(23, "System_E_Transformer");
120-
typeBuilderReverse.Add(24, "System_E_Junction");
121-
typeBuilderReverse.Add(25, "System_E_Ground");
122-
typeBuilderReverse.Add(26, "System_E_Current_Input");
123-
typeBuilderReverse.Add(27, "System_E_Voltage_Input");
124-
typeBuilderReverse.Add(28, "System_O_PM_Motor");
125-
typeBuilderReverse.Add(29, "System_O_VC_Transducer");
107+
typeBuilderReverse.Add(13, "System_MR_Belt");
108+
typeBuilderReverse.Add(14, "System_MR_Shaft");
109+
typeBuilderReverse.Add(15, "System_MR_Gear");
110+
typeBuilderReverse.Add(16, "System_MR_Gear_Pair");
111+
typeBuilderReverse.Add(17, "System_MR_Rack");
112+
typeBuilderReverse.Add(18, "System_MR_Rack_Pinion");
113+
typeBuilderReverse.Add(19, "System_E_Inductor");
114+
typeBuilderReverse.Add(20, "System_E_Capacitor");
115+
typeBuilderReverse.Add(21, "System_E_Resistor");
116+
typeBuilderReverse.Add(22, "System_E_Transformer");
117+
typeBuilderReverse.Add(23, "System_E_Junction");
118+
typeBuilderReverse.Add(24, "System_E_Ground");
119+
typeBuilderReverse.Add(25, "System_E_Current_Input");
120+
typeBuilderReverse.Add(26, "System_E_Voltage_Input");
121+
typeBuilderReverse.Add(27, "System_O_PM_Motor");
122+
typeBuilderReverse.Add(28, "System_O_VC_Transducer");
123+
typeBuilderReverse.Add(29, "System_MR_Pulley_Grounded");
126124

127125
typeIDDictReverse = typeBuilderReverse.ToImmutable();
128126
}

‎BoGLWeb/wwwroot/backendManager.ts‎

Lines changed: 2 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -87,10 +87,6 @@ export namespace backendManager {
8787
let n1: number = elementLocations[i][0];
8888
let n2: number = elementLocations[i][1];
8989
let arr: number[] = [n1, n2];
90-
/*console.log('arr:', arr);
91-
console.log('elementSize:', elementSize);
92-
console.log('screenSizeX:', screenSizeX);
93-
console.log('screenSizeY:', screenSizeY);*/
9490
let x = Math.abs((arr[0] - minX) / elementSize);
9591
let y = Math.abs((arr[1] - minY) / elementSize);
9692
let roundedDownX: number = Math.floor(x);
@@ -101,18 +97,9 @@ export namespace backendManager {
10197
roundedUpX = Math.min(roundedUpX, generalElementLocations.length - 1);
10298
roundedDownY = Math.min(roundedDownY, generalElementLocations[0].length - 1);
10399
roundedUpY = Math.min(roundedUpY, generalElementLocations[0].length - 1);
104-
/*console.log('x = (', arr[0], ' - ', minX, ') / ', elementSize);
105-
console.log('y = (', arr[1], ' - ', minY, ') / ', elementSize);
106-
console.log('X: ', x);
107-
console.log('Y: ', y);
108-
console.log(`generalElementLocations length: ${generalElementLocations.length}`);
109-
console.log('generalElementLocations:', generalElementLocations);
110-
console.log('generalElementLocations X:', generalElementLocations.length);
111-
console.log('generalElementLocations Y:', generalElementLocations[0].length);*/
112-
if(roundedUpX != roundedDownX && roundedUpY != roundedUpY){
100+
if(roundedUpX != roundedDownX && roundedUpY != roundedDownY){
113101
generalElementLocations[roundedUpX][roundedUpY].push(i);
114102
}
115-
//console.log('elementSize:', elementSize);
116103
generalElementLocations[roundedDownX][roundedDownY].push(i);
117104
}
118105

@@ -159,17 +146,6 @@ export namespace backendManager {
159146
// getting the absolute value of the difference between the x and y axis of the two points
160147
let firstElement: number[] = elementLocations[offendingElements[i][0]];
161148
let secondElement: number[] = elementLocations[offendingElements[i][1]];
162-
//TODO: fix
163-
/*console.log('elementLocations', elementLocations);
164-
console.log('f1: ',firstElement);
165-
console.log('f2: ',secondElement);
166-
console.log('i: ', i);
167-
console.log('FE: ', elementLocations[offendingElements[i][0]]);
168-
console.log('SE: ', elementLocations[offendingElements[i][1]]);
169-
console.log('absX', Math.abs(firstElement[0] - secondElement[0]));
170-
console.log('absY', Math.abs(firstElement[1] - secondElement[1]));*/
171-
//let absX: number = Math.abs(firstElement[0] - secondElement[0]);
172-
//let absY: number = Math.abs(firstElement[1] - secondElement[1]);
173149
let newLocations: number[][] = [];
174150
// checking if the first element is further away from 0
175151
newLocations = this.adjustTwoPoints(firstElement, secondElement, elementSize);
@@ -200,7 +176,7 @@ export namespace backendManager {
200176
elementLocations[offendingElements[i][1]] = newLocations[1];
201177
}
202178
}
203-
179+
console.log("Completed Successfully");
204180
return elementLocations; // returns all of the locations for every element adjusted
205181
}
206182

0 commit comments

Comments
 (0)