Skip to content

Commit 93027ef

Browse files
committed
Add the source to the regeneratio event
1 parent 123cc33 commit 93027ef

File tree

2 files changed

+8
-7
lines changed

2 files changed

+8
-7
lines changed

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

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -341,7 +341,7 @@ public Thread regenerateFrom(CaDoodleOperation source) {
341341
com.neuronrobotics.sdk.common.Log.error(new Exception("Operation Running, bailing"));
342342
return null;
343343
}
344-
fireRegenerateStart();
344+
fireRegenerateStart(source);
345345
int endIndex = getCurrentIndex();
346346
double size = getOpperations().size();
347347
if (endIndex != size) {
@@ -424,7 +424,9 @@ public Thread regenerateCurrent() {
424424
t.start();
425425
return t;
426426
}
427-
fireRegenerateStart();
427+
CaDoodleOperation op = getCurrentOpperation();
428+
429+
fireRegenerateStart(op);
428430
Thread t = null;
429431
CaDoodleFile cf = this;
430432
t = new Thread() {
@@ -435,7 +437,6 @@ public void run() {
435437

436438
this.setName("regenerateCurrent Thread");
437439

438-
CaDoodleOperation op = getCurrentOpperation();
439440
TickToc.tic("Start regenerate");
440441
op.setCaDoodleFile(cf);
441442
List<CSG> process = op.process(getPreviouState());
@@ -512,7 +513,7 @@ public void run() {
512513
com.neuronrobotics.sdk.common.Log.debug("Adding Operation "+op);
513514
if (getCurrentIndex() != getOpperations().size()) {
514515
try {
515-
fireRegenerateStart();
516+
fireRegenerateStart(op);
516517
setResult(pruneForward(op));
517518
} catch (Exception e) {
518519
com.neuronrobotics.sdk.common.Log.error(e);
@@ -949,11 +950,11 @@ private void fireRegenerateDone() {
949950
}
950951
}
951952

952-
private void fireRegenerateStart() {
953+
private void fireRegenerateStart(CaDoodleOperation source) {
953954

954955
for (ICaDoodleStateUpdate l : listeners) {
955956
try {
956-
l.onRegenerateStart();
957+
l.onRegenerateStart(source);
957958
} catch (Throwable e) {
958959
com.neuronrobotics.sdk.common.Log.error(e);
959960
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ public interface ICaDoodleStateUpdate {
1212
public void onInitializationDone();
1313
public void onInitializationStart();
1414
public void onRegenerateDone();
15-
public void onRegenerateStart();
15+
public void onRegenerateStart(CaDoodleOperation source);
1616
public void onWorkplaneChange(TransformNR newWP);
1717
public void onTimelineUpdate(int numberOfNew);
1818
}

0 commit comments

Comments
 (0)