Skip to content
Snippets Groups Projects
Commit 933c8504 authored by Gregory Viguier's avatar Gregory Viguier
Browse files

TAG 6.0.5

parent 5aa9c8d7
No related branches found
No related tags found
No related merge requests found
......@@ -16,7 +16,6 @@
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
<attributes>
<attribute name="maven.pomderived" value="true"/>
......
eclipse.preferences.version=1
encoding//src/main/java=windows-1252
encoding//src/main/resources=windows-1252
encoding//src/test/java=windows-1252
encoding/<project>=windows-1252
#Thu Oct 13 13:23:52 CEST 2011
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
org.eclipse.jdt.core.compiler.compliance=1.6
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
org.eclipse.jdt.core.compiler.source=1.6
......@@ -10,7 +10,7 @@
</parent>
<groupId>fr.soleil.gui</groupId>
<artifactId>capoeira</artifactId>
<version>6.0.4-SNAPSHOT</version>
<version>6.0.5</version>
<name>Capoeira</name>
<description>Application to control a diffractometer</description>
<developers>
......
......@@ -23,6 +23,10 @@ import org.slf4j.LoggerFactory;
import fr.soleil.bean.motor.UserMotorBean;
import fr.soleil.comete.box.AbstractTangoBox;
import fr.soleil.comete.swing.Label;
import fr.soleil.comete.tango.data.service.TangoKey;
import fr.soleil.comete.tango.data.service.TangoKeyTool;
import fr.soleil.data.mediator.Mediator;
import fr.soleil.data.target.scalar.IBooleanTarget;
import fr.soleil.gui.capoeira.model.CapoeiraModel;
/**
......@@ -213,6 +217,7 @@ public class ControlBean extends AbstractTangoBox {
if (this.motorPanel != null) {
return this.motorPanel;
}
// this.kappaPanel.setBackground(Color.blue);
return this.kappaPanel;
}
......@@ -328,14 +333,57 @@ public class ControlBean extends AbstractTangoBox {
return this.twothetaMotorBean;
}
private IBooleanTarget generateVirtualBooleanTarget() {
IBooleanTarget result = new IBooleanTarget() {
@Override
public void addMediator(Mediator<?> arg0) {
}
@Override
public void removeMediator(Mediator<?> arg0) {
}
@Override
public boolean isSelected() {
return false;
}
@Override
public void setSelected(boolean arg0) {
if (arg0) {
pseudoPanel.setBorder(BorderFactory.createTitledBorder(BorderFactory.createLineBorder(Color.red, 5),
"PSEUDO AXIS FROZEN", TitledBorder.CENTER, TitledBorder.DEFAULT_POSITION,
new Font("Dialog", Font.BOLD, 15), new Color(255, 0, 0)));
} else {
pseudoPanel.setBorder(BorderFactory.createTitledBorder(
BorderFactory.createLineBorder(Color.gray, 5), "PSEUDO AXIS", TitledBorder.CENTER,
TitledBorder.DEFAULT_POSITION, new Font("Dialog", Font.BOLD, 12), new Color(51, 51, 51)));
}
}
};
return result;
}
@Override
protected void refreshGUI() {
String deviceName = model.getDiffractometer();
TangoKey freezeKey = new TangoKey();
TangoKeyTool.registerAttribute(freezeKey, deviceName, "freeze");
IBooleanTarget virtualTarget = generateVirtualBooleanTarget();
booleanBox.connectWidget(virtualTarget, freezeKey);
if (this.motorPanel != null) {
this.motorPanel.removeAll();
this.remove(this.motorPanel);
this.motorPanel = null;
}
if (this.kappaPanel != null) {
this.kappaAxisPanel.removeAll();
this.kappaPanel.removeAll();
this.kappaPanel.validate();
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment