This commit is contained in:
2019-04-25 13:30:09 +02:00
parent 3ab500f818
commit d23d647875
2 changed files with 5 additions and 1 deletions
+1 -1
View File
@@ -1,4 +1,4 @@
#Tue Apr 09 17:34:49 CEST 2019 #Thu Apr 18 16:34:09 CEST 2019
colormap=Temperature colormap=Temperature
colormapAutomatic=true colormapAutomatic=true
colormapLogarithmic=false colormapLogarithmic=false
+4
View File
@@ -3985,6 +3985,7 @@ public class ScreenPanel4 extends Panel {
private void buttonGrabBackgroundActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_buttonGrabBackgroundActionPerformed private void buttonGrabBackgroundActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_buttonGrabBackgroundActionPerformed
try { try {
if (camera != null) { if (camera != null) {
/*
boolean laserOn = getLaserState(); boolean laserOn = getLaserState();
OptionResult ret = null; OptionResult ret = null;
if (laserOn) { if (laserOn) {
@@ -4003,6 +4004,7 @@ public class ScreenPanel4 extends Panel {
if (laserOn) { if (laserOn) {
setLaserState(false); setLaserState(false);
} }
*/
try { try {
System.out.println("Grabbing background for: " + cameraName); System.out.println("Grabbing background for: " + cameraName);
if (server != null) { if (server != null) {
@@ -4011,9 +4013,11 @@ public class ScreenPanel4 extends Panel {
camera.captureBackground(5, 0); camera.captureBackground(5, 0);
} }
} finally { } finally {
/*
if (laserOn) { if (laserOn) {
setLaserState(true); setLaserState(true);
} }
*/
} }
SwingUtils.showMessage(getTopLevel(), "Success", "Success capturing background", 5000); SwingUtils.showMessage(getTopLevel(), "Success", "Success capturing background", 5000);
} }