Commit a3f0fe85 authored by Jean-Luc Pons's avatar Jean-Luc Pons
Browse files

Removed automtic disable of BPM in SVD

parent 9948e8c5
......@@ -1686,6 +1686,7 @@ is divided into following sections:
</target>
<target depends="init,compile-test-single,-init-test-run-module-properties,-debug-start-debugger-test,-debug-start-debuggee-test" name="debug-test"/>
<target depends="init,compile-test-single,-init-test-run-module-properties,-debug-start-debugger-test,-debug-start-debuggee-test-method" name="debug-test-method"/>
<target depends="debug-test-method" name="debug-single-method"/>
<target depends="init,-pre-debug-fix,compile-test-single" if="netbeans.home" name="-do-debug-fix-test">
<j2seproject1:nbjpdareload dir="${build.test.classes.dir}"/>
</target>
......
......@@ -4,5 +4,5 @@ build.xml.stylesheet.CRC32=f85dc8f2@1.94.0.48
# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
nbproject/build-impl.xml.data.CRC32=06dc0623
nbproject/build-impl.xml.script.CRC32=0c189305
nbproject/build-impl.xml.stylesheet.CRC32=f89f7d21@1.94.0.48
nbproject/build-impl.xml.script.CRC32=9db2f7b3
nbproject/build-impl.xml.stylesheet.CRC32=d549e5cc@1.97.0.48
......@@ -6,4 +6,4 @@ do.jlink=false
javac.debug=true
javadoc.preview=true
jlink.strip=false
user.properties.file=/users/pons/.netbeans/12.0/build.properties
user.properties.file=/home/esrf/pons/.netbeans/12.4/build.properties
......@@ -2,6 +2,8 @@
<project-private xmlns="http://www.netbeans.org/ns/project-private/1">
<editor-bookmarks xmlns="http://www.netbeans.org/ns/editor-bookmarks/2" lastBookmarkId="0"/>
<open-files xmlns="http://www.netbeans.org/ns/projectui-open-files/2">
<group/>
<group>
<file>file:/mnt/multipath-shares/segfs/tango/jclient/JSRBpmManager/src/SRBpmManager/BPMStateViewer.java</file>
</group>
</open-files>
</project-private>
......@@ -33,12 +33,12 @@ dist.jar=${dist.dir}/JSRBpmManager.jar
dist.javadoc.dir=${dist.dir}/javadoc
endorsed.classpath=
excludes=
file.reference.atkpanel.jar=../../../../../segfs/tango/release/java/appli/atkpanel.jar
file.reference.atkpanel.jar=/segfs/tango/release/java/appli/atkpanel.jar
includes=**
jar.compress=false
javac.classpath=\
${file.reference.atkpanel.jar}:\
${libs.Tango.classpath}
${libs.Tango.classpath}:\
${file.reference.atkpanel.jar}
# Space-separated list of extra javac options
javac.compilerargs=
javac.deprecation=false
......
......@@ -256,6 +256,7 @@ public class BPMStateViewer extends JPanel implements IDevStateSpectrumListener
ErrorPane.showErrorMessage(null,mp.BPMALL_DISABLE[disa], e2);
}
/*
// Disable on orbit correction
try {
......@@ -286,6 +287,8 @@ public class BPMStateViewer extends JPanel implements IDevStateSpectrumListener
} catch(ConnectionException e2) {
ErrorPane.showErrorMessage(null,"sr/beam-orbitcor", e2);
}
*/
}
public void launchPanel(String devName) {
......
......@@ -38,7 +38,7 @@ import javax.swing.JPanel;
*/
public class MainPanel extends javax.swing.JFrame {
private final static String APP_RELEASE = "3.9";
private final static String APP_RELEASE = "3.10";
final static int NBCELL = 32;
final static String CLOCK_DEVNAME = "srdiag/bpm/aclock";
final static String CLOCKSRC_DEVNAME = "sy/d-treff/switch";
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment