PuckLoadingDialog options
This commit is contained in:
@@ -25,7 +25,9 @@ import ch.psi.pshell.swing.SwingUtils;
|
||||
import ch.psi.pshell.utils.State.StateException;
|
||||
import java.awt.BorderLayout;
|
||||
import java.awt.Dimension;
|
||||
import java.awt.Frame;
|
||||
import java.awt.Point;
|
||||
import java.awt.Rectangle;
|
||||
import java.awt.event.WindowAdapter;
|
||||
import java.awt.event.WindowEvent;
|
||||
import java.io.File;
|
||||
@@ -844,6 +846,9 @@ public class Controller {
|
||||
laserPos = pos;
|
||||
getMainFrame().evalAsync("set_laser_pos(" + ((pos==null) ? "" : ("'" + pos + "'") ) + ")" ,true);
|
||||
getMainFrame().basePlatePanel.pointPuck((pos==null) ? null : basePlate.getPuckByName(pos));
|
||||
if ((dialogPuckLoading != null) && (dialogPuckLoading.isVisible()) && dialogPuckLoading.getBasePlatePanel()!=null) {
|
||||
dialogPuckLoading.getBasePlatePanel().pointPuck((pos==null) ? null : basePlate.getPuckByName(pos));
|
||||
}
|
||||
} catch (StateException ex) {
|
||||
Logger.getLogger(Controller.class.getName()).log(Level.SEVERE, null, ex);
|
||||
}
|
||||
@@ -1083,8 +1088,7 @@ public class Controller {
|
||||
if ((dialogPuckLoading != null) && (dialogPuckLoading.isVisible())) {
|
||||
return;
|
||||
}
|
||||
dialogPuckLoading = new PuckLoadingDialog(mainFrame.getTopLevel(), false);
|
||||
dialogPuckLoading.setLocationRelativeTo(mainFrame);
|
||||
dialogPuckLoading = new PuckLoadingDialog(mainFrame.getTopLevel(), false, false, true);
|
||||
dialogPuckLoading.setVisible(true);
|
||||
checkPuckDetectionEnabling();
|
||||
|
||||
|
||||
Reference in New Issue
Block a user