Skip to content

Commit 068adb8

Browse files
committed
Fix typo: Allign --> Align
Fix typo: Allign --> Align
1 parent 0db6885 commit 068adb8

File tree

4 files changed

+16
-16
lines changed

4 files changed

+16
-16
lines changed

src/main/java/com/neuronrobotics/bowlerstudio/scripting/cadoodle/Allign.java renamed to src/main/java/com/neuronrobotics/bowlerstudio/scripting/cadoodle/Align.java

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,15 @@
1616
import eu.mihosoft.vrl.v3d.Vector3d;
1717
import javafx.scene.transform.Affine;
1818

19-
public class Allign extends CaDoodleOperation{
19+
public class Align extends CaDoodleOperation{
2020
@Expose (serialize = true, deserialize = true)
2121
private List<String> names = new ArrayList<String>();
2222
@Expose (serialize = true, deserialize = true)
23-
public Allignment z=null;
23+
public Alignment z=null;
2424
@Expose (serialize = true, deserialize = true)
25-
public Allignment y=null;
25+
public Alignment y=null;
2626
@Expose (serialize = true, deserialize = true)
27-
public Allignment x=null;
27+
public Alignment x=null;
2828
@Expose (serialize = true, deserialize = true)
2929
private TransformNR workplane=null;
3030
@Deprecated
@@ -48,7 +48,7 @@ public void setName(String name) {
4848
}
4949
@Override
5050
public String getType() {
51-
return "Allign";
51+
return "Align";
5252
}
5353

5454
@Override
@@ -173,11 +173,11 @@ public List<String> getNamesAddedInThisOperation() {
173173
return names;
174174
}
175175

176-
public Allign setNames(List<String> names) {
176+
public Align setNames(List<String> names) {
177177
this.names = names;
178178
return this;
179179
}
180-
public Allign setAllignParams(Allignment X, Allignment Y,Allignment Z) {
180+
public Align setAlignParams(Alignment X, Alignment Y,Alignment Z) {
181181
x=X;
182182
y=Y;
183183
z=Z;
@@ -192,21 +192,21 @@ public TransformNR getWorkplane(CSG c) {
192192
return afNR.times(workplane);
193193
}
194194

195-
public Allign setWorkplane(TransformNR workplane) {
195+
public Align setWorkplane(TransformNR workplane) {
196196
this.workplane = workplane;
197197
return this;
198198
}
199199

200200
public Bounds getBounds(List<CSG> incoming) {
201201
if(bounds!=null) {
202-
Log.error("Depricated Bounds in the allign step!");
202+
Log.error("Depricated Bounds in the align step!");
203203
return bounds.getBounds();
204204
}if(boundNames!=null) {
205205
List<CSG> selectedCSG = getSelectedCSG(boundNames,incoming);
206-
return Allign.getBounds(selectedCSG, workplane, new HashMap<CSG, Bounds>());
206+
return Align.getBounds(selectedCSG, workplane, new HashMap<CSG, Bounds>());
207207
}
208208
else {
209-
throw new RuntimeException("Allign can not be initialized without bounds!");
209+
throw new RuntimeException("Align can not be initialized without bounds!");
210210
}
211211

212212
}
@@ -227,7 +227,7 @@ private CSG getSelectedCSG(String string,List<CSG> incoming) {
227227
}
228228
return null;
229229
}
230-
public Allign setBounds(List<String> boundNames) {
230+
public Align setBounds(List<String> boundNames) {
231231
this.boundNames=boundNames;
232232
bounds=null;
233233
return this;

src/main/java/com/neuronrobotics/bowlerstudio/scripting/cadoodle/Allignment.java renamed to src/main/java/com/neuronrobotics/bowlerstudio/scripting/cadoodle/Alignment.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.neuronrobotics.bowlerstudio.scripting.cadoodle;
22

3-
public enum Allignment {
3+
public enum Alignment {
44
positive,
55
negative,
66
middle,

src/main/java/com/neuronrobotics/bowlerstudio/scripting/cadoodle/CaDoodleJsonOperationAdapterFactory.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ public CaDoodleJsonOperationAdapterFactory() {
2222
registerType("AddFromScript", AddFromScript.class);
2323
registerType("AddRobotController", AddRobotController.class);
2424
registerType("AddRobotLimb", AddRobotLimb.class);
25-
registerType("Allign", Allign.class);
25+
registerType("Align", Align.class);
2626
registerType("Delete", Delete.class);
2727
registerType("Group", Group.class);
2828
registerType("Hide", Hide.class);

src/main/java/com/neuronrobotics/bowlerstudio/scripting/cadoodle/Sweep.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,12 +90,12 @@ public CSG sweep(Polygon p, String name, Bounds b) {
9090
if (angle < 0)
9191
angle = -angle;
9292
double sprl = spiralStep(name).getMM();
93-
Transform centerandAllignedPolygon = new Transform().movex(-b.getMinX()).movey(-b.getMinY());
93+
Transform centerandAlignedPolygon = new Transform().movex(-b.getMinX()).movey(-b.getMinY());
9494
Transform increment = new Transform().rotY(-angle).movey(z);
9595
Transform radiusT = new Transform().movex(radius);
9696
Polygon transformedP;
9797
try {
98-
transformedP = p.transformed(centerandAllignedPolygon);
98+
transformedP = p.transformed(centerandAlignedPolygon);
9999

100100
ITransformProvider pr = (unit, domain) -> {
101101
return new Transform().movex(sprl * unit * d);

0 commit comments

Comments
 (0)