Merge branch 'master' into spg_update

Author: gerring

org.eclipse.scanning.api/src/org/eclipse/scanning/api/IValidator.java

@@ -47,4 +47,20 @@ default void validate(T model) throws ValidationException, InstantiationExceptio
 	default void setService(IValidatorService vservice) {
 
 	}
+	
+	/**
+	 * Same as Validation method above but returns any results sent back by validation.
+	 * 
+	 * @param model
+	 * @return
+	 * @throws ValidationException
+	 */
+	default Object validateWithReturn(T model) throws ValidationException {
+		try {
+			validate(model);
+		} catch (InstantiationException | IllegalAccessException e) {
+			throw new ValidationException(e);
+		}
+		return null; // They should implement a validation which throws an exception
+	}
 }

org.eclipse.scanning.api/src/org/eclipse/scanning/api/device/DeviceResponse.java

@@ -178,6 +178,8 @@ private static void processRunnables(DeviceRequest request, IRunnableDeviceServi
 					tdevice.terminate(action.to());
 				} else if (action==DeviceAction.VALIDATE) {
 					device.validate(request.getDeviceModel());
+				} else if (action==DeviceAction.VALIDATEWITHRETURN) {
+					request.setDeviceValue(device.validateWithReturn(request.getDeviceModel()));
 				} else if (action==DeviceAction.CONFIGURE) {
 					device.configure(request.getDeviceModel());
 				} else if (action==DeviceAction.RUN) {

org.eclipse.scanning.api/src/org/eclipse/scanning/api/event/scan/DeviceAction.java

@@ -47,7 +47,12 @@ public enum DeviceAction {
 	/**
 	 * Disable device, stopping all activity.
 	 */
-	DISABLE;
+	DISABLE,
+	
+	/**
+	 * Validate, with an expectation that the result will be returned
+	 */
+	VALIDATEWITHRETURN;
 
 	public static DeviceAction as(TerminationPreference pref) {
 		switch(pref) {

org.eclipse.scanning.api/src/org/eclipse/scanning/api/malcolm/IMalcolmDevice.java

@@ -17,6 +17,7 @@
 import org.eclipse.scanning.api.device.IAttributableDevice;
 import org.eclipse.scanning.api.device.IRunnableEventDevice;
 import org.eclipse.scanning.api.points.IPointGenerator;
+import org.eclipse.scanning.api.scan.ScanningException;
 
 
 /**
@@ -67,17 +68,12 @@ public interface IMalcolmDevice<T> extends IRunnableEventDevice<T>, IMalcolmEven
 	 */
 	public boolean isLocked() throws MalcolmDeviceException ;
 
-	/**
-	 * Gets the value of an attribute on the device
-	 */
-	public <A> A getAttributeValue(String attribute) throws MalcolmDeviceException;
-	
 	/**
 	 * Returns the axes that this malcolm device can move.
 	 * @return
-	 * @throws MalcolmDeviceException
+	 * @throws ScanningException
 	 */
-	public Set<String> getAxesToMove() throws MalcolmDeviceException;
+	public Set<String> getAxesToMove() throws ScanningException;
 
 	/**
 	 * Set the point generator for the malcolm device.

org.eclipse.scanning.api/src/org/eclipse/scanning/api/malcolm/message/MalcolmMessage.java

@@ -36,6 +36,7 @@ public class MalcolmMessage {
 	private String message;
 	private Object arguments;
 	private Object value;
+	private Object rawValue;
 
 	public Type getType() {
 		return type;
@@ -69,6 +70,7 @@ public int hashCode() {
 		result = prime * result + ((param == null) ? 0 : param.hashCode());
 		result = prime * result + ((type == null) ? 0 : type.hashCode());
 		result = prime * result + ((value == null) ? 0 : value.hashCode());
+		result = prime * result + ((rawValue == null) ? 0 : rawValue.hashCode());
 		return result;
 	}
 
@@ -115,6 +117,11 @@ public boolean equals(Object obj) {
 				return false;
 		} else if (!value.equals(other.value))
 			return false;
+		if (rawValue == null) {
+			if (other.rawValue != null)
+				return false;
+		} else if (!rawValue.equals(other.rawValue))
+			return false;
 		return true;
 	}
 	public Object getArguments() {
@@ -162,4 +169,10 @@ public String getEndpoint() {
 	public void setEndpoint(String endPoint) {
 		this.endpoint = endPoint;
 	}
+	public Object getRawValue() {
+		return rawValue;
+	}
+	public void setRawValue(Object rawValue) {
+		this.rawValue = rawValue;
+	}
 }

org.eclipse.scanning.api/src/org/eclipse/scanning/api/scan/ScanEstimator.java

@@ -53,7 +53,7 @@ public class ScanEstimator {
 	/**
 	 * Estimated time of scan
 	 */
-	private final long  scanTime;
+	private final long  estimatedScanTime;
 
 	/**
 	 * 
@@ -112,7 +112,7 @@ public ScanEstimator(IPointGenerator<?> gen, Map<String, Object> detectors, long
 		this.size          = getEstimatedSize(gen);
 		this.rank          = gen.iterator().next().getScanRank(); // The rank of the scan is constant
 		this.timePerPoint  = timePerPoint;
-		this.scanTime      = size*timePerPoint;
+		this.estimatedScanTime      = size*timePerPoint;
 	}
 
 	private int getEstimatedSize(IPointGenerator<?> gen) throws GeneratorException {
@@ -140,8 +140,8 @@ public void setTimePerPoint(long timePerPoint) {
 		this.timePerPoint = timePerPoint;
 	}
 
-	public long getScanTime() {
-		return scanTime;
+	public long getEstimatedScanTime() {
+		return estimatedScanTime;
 	}
 
 	public int getRank() {

org.eclipse.scanning.api/src/org/eclipse/scanning/api/scan/ScanInformation.java

@@ -34,6 +34,7 @@ public class ScanInformation {
 	private transient ScanEstimator  estimator;
 	private int[] shape;
 	private ScanMode scanMode;
+	private long estimatedScanTime;
 
 	public ScanInformation() {
 
@@ -127,6 +128,12 @@ public int[] getShape() {
 		shape = estimator!=null ? estimator.getShape() : null;
 		return shape;
 	}
+	
+	public long getEstimatedScanTime() {
+		if (estimatedScanTime > 0) return estimatedScanTime;
+		estimatedScanTime = estimator != null ? estimator.getEstimatedScanTime() : 0;
+		return estimatedScanTime;
+	}
 
 	public void setShape(int[] shape) {
 		this.shape = shape;

org.eclipse.scanning.api/src/org/eclipse/scanning/api/scan/models/ScanModel.java

@@ -22,6 +22,7 @@
 import org.eclipse.scanning.api.device.IRunnableDevice;
 import org.eclipse.scanning.api.event.scan.ScanBean;
 import org.eclipse.scanning.api.points.IPosition;
+import org.eclipse.scanning.api.scan.ScanInformation;
 
 /**
  * A Model describing a scan to be performed.
@@ -80,6 +81,8 @@ public class ScanModel {
 	 */
 	private List<?> annotationParticipants;
 
+	private ScanInformation scanInformation;
+	
 	public ScanModel() {
 		this(null);
 	}
@@ -240,4 +243,12 @@ public void setAnnotationParticipants(List<?> annotationParticipants) {
 		this.annotationParticipants = annotationParticipants;
 	}
 
+	public ScanInformation getScanInformation() {
+		return scanInformation;
+	}
+
+	public void setScanInformation(ScanInformation scanInformation) {
+		this.scanInformation = scanInformation;
+	}
+	
 }

org.eclipse.scanning.connector.epics/src/org/eclipse/scanning/connector/epics/EpicsV4MessageMapper.java

@@ -163,6 +163,7 @@ public MalcolmMessage convertCallPVStructureToMalcolmMessage(PVStructure structu
 		result.setType(Type.RETURN);
 		result.setEndpoint(message.getEndpoint());
 		result.setId(message.getId());
+		result.setRawValue(structure.toString());
 
 		if (structure.getStructure().getID().startsWith(ERROR_TYPE)) {
 			result.setType(Type.ERROR);
@@ -182,6 +183,7 @@ public MalcolmMessage convertSubscribeUpdatePVStructureToMalcolmMessage(PVStruct
 		result.setType(Type.UPDATE);
 		result.setEndpoint(message.getEndpoint());
 		result.setId(message.getId());
+		result.setRawValue(structure.toString());
 
 		Object returnedObject = getEndpointObjectFromPVStructure(structure, message.getEndpoint());
 
@@ -196,6 +198,7 @@ public MalcolmMessage convertGetPVStructureToMalcolmMessage(PVStructure structur
 		result.setType(Type.RETURN);
 		result.setEndpoint(message.getEndpoint());
 		result.setId(message.getId());
+		result.setRawValue(structure.toString());
 
 		if (structure.getStructure().getID().startsWith(ERROR_TYPE)) {
 			result.setType(Type.ERROR);

org.eclipse.scanning.device.ui/META-INF/MANIFEST.MF

@@ -16,7 +16,8 @@ Require-Bundle: org.eclipse.ui;bundle-version="3.107.0",
  org.eclipse.dawnsci.analysis.dataset;bundle-version="1.0.0",
  org.eclipse.richbeans.widgets.file;bundle-version="1.0.0",
  org.eclipse.scanning.api;bundle-version="1.0.0",
- org.eclipse.richbeans.annot;bundle-version="1.0.0"
+ org.eclipse.richbeans.annot;bundle-version="1.0.0",
+ org.eclipse.scanning.event.ui;bundle-version="1.0.0"
 Import-Package: org.osgi.framework;version="1.8.0",
  org.osgi.service.event;version="1.3.1",
  org.slf4j;version="1.7.2"