Skip to content
Snippets Groups Projects
Commit 7e95d2f4 authored by Gwenaelle ABEILLE's avatar Gwenaelle ABEILLE
Browse files

write part of spectrum was never sent to DB

parent 6d42817d
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
src/main/java/TdbArchiver/Collector/spectrum/BooleanSpectrum.java
+ 38
− 34
View file @ 7e95d2f4
...@@ -19,8 +19,8 @@ import fr.soleil.hdbtdbArchivingApi.ArchivingTools.Tools.SpectrumEvent_RW; ...@@ -19,8 +19,8 @@ import fr.soleil.hdbtdbArchivingApi.ArchivingTools.Tools.SpectrumEvent_RW;
@SuppressWarnings("serial") @SuppressWarnings("serial")
public class BooleanSpectrum extends TdbCollector implements IBooleanSpectrumListener { public class BooleanSpectrum extends TdbCollector implements IBooleanSpectrumListener {
public BooleanSpectrum(final TdbModeHandler modeHandler, final String currentDsPath, public BooleanSpectrum(final TdbModeHandler modeHandler, final String currentDsPath, final String currentDbPath,
final String currentDbPath, final AttrWriteType writableType) { final AttrWriteType writableType) {
super(modeHandler, currentDsPath, currentDbPath, writableType); super(modeHandler, currentDsPath, currentDbPath, writableType);
} }
...@@ -43,47 +43,54 @@ public class BooleanSpectrum extends TdbCollector implements IBooleanSpectrumLis ...@@ -43,47 +43,54 @@ public class BooleanSpectrum extends TdbCollector implements IBooleanSpectrumLis
@Override @Override
public void errorChange(final ErrorEvent errorEvent) { public void errorChange(final ErrorEvent errorEvent) {
final int tryNumber = DEFAULT_TRY_NUMBER; final int tryNumber = DEFAULT_TRY_NUMBER;
Util.out3.println("BooleanSpectrum_RO.errorChange : " Util.out3.println("BooleanSpectrum_RO.errorChange : " + "Unable to read the attribute named "
+ "Unable to read the attribute named " + errorEvent.getSource().toString()); + errorEvent.getSource().toString());
final Boolean[] value = null; final Boolean[] value = null;
final SpectrumEvent_RO spectrumEvent_ro = new SpectrumEvent_RO(); final SpectrumEvent_RO spectrumEvent_ro = new SpectrumEvent_RO();
spectrumEvent_ro.setAttribute_complete_name(((IBooleanSpectrum) errorEvent.getSource()) spectrumEvent_ro.setAttribute_complete_name(((IBooleanSpectrum) errorEvent.getSource()).getName());
.getName());
spectrumEvent_ro.setTimeStamp(errorEvent.getTimeStamp()); spectrumEvent_ro.setTimeStamp(errorEvent.getTimeStamp());
spectrumEvent_ro.setValue(value); spectrumEvent_ro.setValue(value);
processEventSpectrum(spectrumEvent_ro, tryNumber); processEventSpectrum(spectrumEvent_ro, tryNumber);
} }
@Override
public void booleanSpectrumChange(final BooleanSpectrumEvent event) { public void booleanSpectrumChange(final BooleanSpectrumEvent event) {
final boolean[] spectrumvalue = event.getValue(); IBooleanSpectrum eventSrc = (IBooleanSpectrum) event.getSource();
Boolean[] value; final boolean[] spectrumvalueR = eventSrc.getValue();
if (spectrumvalue == null) { final boolean[] spectrumvalueW = eventSrc.getSetPoint();
value = null; Boolean[] value = null;
if (spectrumvalueR != null) {
int j = 0;
if (getWritableValue().equals(AttrWriteType.READ)) {
value = new Boolean[spectrumvalueR.length];
} else { } else {
value = new Boolean[spectrumvalue.length]; value = new Boolean[spectrumvalueR.length + spectrumvalueW.length];
for (int i = 0; i < spectrumvalue.length; i++) { }
value[i] = new Boolean(spectrumvalue[i]); for (int i = 0; i < spectrumvalueR.length; i++) {
value[j++] = new Boolean(spectrumvalueR[i]);
}
if (!getWritableValue().equals(AttrWriteType.READ)) {
for (int i = 0; i < spectrumvalueW.length; i++) {
value[j++] = new Boolean(spectrumvalueW[i]);
} }
} }
}
try { try {
if (getWritableValue().equals(AttrWriteType.READ)) { if (getWritableValue().equals(AttrWriteType.READ)) {
final SpectrumEvent_RO spectrumEvent_ro = new SpectrumEvent_RO(); final SpectrumEvent_RO spectrumEvent_ro = new SpectrumEvent_RO();
spectrumEvent_ro.setAttribute_complete_name(((IBooleanSpectrum) event.getSource()) spectrumEvent_ro.setAttribute_complete_name(((IBooleanSpectrum) event.getSource()).getName());
.getName());
spectrumEvent_ro.setDim_x(value.length); spectrumEvent_ro.setDim_x(value.length);
spectrumEvent_ro.setTimeStamp(event.getTimeStamp()); spectrumEvent_ro.setTimeStamp(event.getTimeStamp());
spectrumEvent_ro.setValue(value); spectrumEvent_ro.setValue(value);
spectrumEvent_ro.setData_type(((IBooleanSpectrum) event.getSource()).getAttribute() spectrumEvent_ro.setData_type(((IBooleanSpectrum) event.getSource()).getAttribute().getType());
.getType());
processEventSpectrum(spectrumEvent_ro, DEFAULT_TRY_NUMBER); processEventSpectrum(spectrumEvent_ro, DEFAULT_TRY_NUMBER);
} else { } else {
final SpectrumEvent_RW spectrumEvent_rw = new SpectrumEvent_RW(); final SpectrumEvent_RW spectrumEvent_rw = new SpectrumEvent_RW();
spectrumEvent_rw.setAttribute_complete_name(((IBooleanSpectrum) event.getSource()) spectrumEvent_rw.setAttribute_complete_name(((IBooleanSpectrum) event.getSource()).getName());
.getName()); spectrumEvent_rw.setData_type(((IBooleanSpectrum) event.getSource()).getAttribute().getType());
spectrumEvent_rw.setData_type(((IBooleanSpectrum) event.getSource()).getAttribute()
.getType());
spectrumEvent_rw.setTimeStamp(event.getTimeStamp()); spectrumEvent_rw.setTimeStamp(event.getTimeStamp());
spectrumEvent_rw.setValue(value); spectrumEvent_rw.setValue(value);
processEventSpectrum(spectrumEvent_rw, DEFAULT_TRY_NUMBER); processEventSpectrum(spectrumEvent_rw, DEFAULT_TRY_NUMBER);
...@@ -95,6 +102,7 @@ public class BooleanSpectrum extends TdbCollector implements IBooleanSpectrumLis ...@@ -95,6 +102,7 @@ public class BooleanSpectrum extends TdbCollector implements IBooleanSpectrumLis
} }
@Override
public void stateChange(final AttributeStateEvent event) { public void stateChange(final AttributeStateEvent event) {
} }
...@@ -107,14 +115,12 @@ public class BooleanSpectrum extends TdbCollector implements IBooleanSpectrumLis ...@@ -107,14 +115,12 @@ public class BooleanSpectrum extends TdbCollector implements IBooleanSpectrumLis
} }
try { try {
filesNames.get(spectrumEvent_ro.getAttribute_complete_name()).processEventSpectrum( filesNames.get(spectrumEvent_ro.getAttribute_complete_name()).processEventSpectrum(spectrumEvent_ro);
spectrumEvent_ro);
super.setLastTimestamp(spectrumEvent_ro); super.setLastTimestamp(spectrumEvent_ro);
} catch (final Exception e) { } catch (final Exception e) {
Util.out2.println("ERROR !! " + "\r\n" + "\t Origin : \t " Util.out2.println("ERROR !! " + "\r\n" + "\t Origin : \t " + "BooleanSpectrum_RO.processEventSpectrum"
+ "BooleanSpectrum_RO.processEventSpectrum" + "\r\n" + "\t Reason : \t " + "\r\n" + "\t Reason : \t " + e.getClass().getName() + "\r\n" + "\t Description : \t "
+ e.getClass().getName() + "\r\n" + "\t Description : \t " + e.getMessage() + e.getMessage() + "\r\n" + "\t Additional information : \t " + "" + "\r\n");
+ "\r\n" + "\t Additional information : \t " + "" + "\r\n");
e.printStackTrace(); e.printStackTrace();
} }
} }
...@@ -128,14 +134,12 @@ public class BooleanSpectrum extends TdbCollector implements IBooleanSpectrumLis ...@@ -128,14 +134,12 @@ public class BooleanSpectrum extends TdbCollector implements IBooleanSpectrumLis
} }
try { try {
filesNames.get(spectrumEvent_rw.getAttribute_complete_name()).processEventSpectrum( filesNames.get(spectrumEvent_rw.getAttribute_complete_name()).processEventSpectrum(spectrumEvent_rw);
spectrumEvent_rw);
super.setLastTimestamp(spectrumEvent_rw); super.setLastTimestamp(spectrumEvent_rw);
} catch (final Exception e) { } catch (final Exception e) {
Util.out2.println("ERROR !! " + "\r\n" + "\t Origin : \t " Util.out2.println("ERROR !! " + "\r\n" + "\t Origin : \t " + "BooleanSpectrum_RW.processEventSpectrum"
+ "BooleanSpectrum_RW.processEventSpectrum" + "\r\n" + "\t Reason : \t " + "\r\n" + "\t Reason : \t " + e.getClass().getName() + "\r\n" + "\t Description : \t "
+ e.getClass().getName() + "\r\n" + "\t Description : \t " + e.getMessage() + e.getMessage() + "\r\n" + "\t Additional information : \t " + "" + "\r\n");
+ "\r\n" + "\t Additional information : \t " + "" + "\r\n");
e.printStackTrace(); e.printStackTrace();
} }
} }
......
src/main/java/TdbArchiver/Collector/spectrum/NumberSpectrum.java
+ 48
− 34
View file @ 7e95d2f4
...@@ -132,8 +132,8 @@ import fr.soleil.hdbtdbArchivingApi.ArchivingTools.Tools.SpectrumEvent_RW; ...@@ -132,8 +132,8 @@ import fr.soleil.hdbtdbArchivingApi.ArchivingTools.Tools.SpectrumEvent_RW;
@SuppressWarnings("serial") @SuppressWarnings("serial")
public class NumberSpectrum extends TdbCollector implements ISpectrumListener { public class NumberSpectrum extends TdbCollector implements ISpectrumListener {
public NumberSpectrum(final TdbModeHandler modeHandler, final String currentDsPath, public NumberSpectrum(final TdbModeHandler modeHandler, final String currentDsPath, final String currentDbPath,
final String currentDbPath, final AttrWriteType writableType) { final AttrWriteType writableType) {
super(modeHandler, currentDsPath, currentDbPath, writableType); super(modeHandler, currentDsPath, currentDbPath, writableType);
} }
...@@ -156,36 +156,55 @@ public class NumberSpectrum extends TdbCollector implements ISpectrumListener { ...@@ -156,36 +156,55 @@ public class NumberSpectrum extends TdbCollector implements ISpectrumListener {
@Override @Override
public void errorChange(final ErrorEvent errorEvent) { public void errorChange(final ErrorEvent errorEvent) {
final int tryNumber = DEFAULT_TRY_NUMBER; final int tryNumber = DEFAULT_TRY_NUMBER;
Util.out3.println("NumberSpectrum_RO.errorChange : " Util.out3.println("NumberSpectrum_RO.errorChange : " + "Unable to read the attribute named "
+ "Unable to read the attribute named " + errorEvent.getSource().toString()); + errorEvent.getSource().toString());
final Double[] value = null; final Double[] value = null;
final SpectrumEvent_RO spectrumEvent_ro = new SpectrumEvent_RO(); final SpectrumEvent_RO spectrumEvent_ro = new SpectrumEvent_RO();
spectrumEvent_ro.setAttribute_complete_name(((INumberSpectrum) errorEvent.getSource()) spectrumEvent_ro.setAttribute_complete_name(((INumberSpectrum) errorEvent.getSource()).getName());
.getName());
spectrumEvent_ro.setTimeStamp(errorEvent.getTimeStamp()); spectrumEvent_ro.setTimeStamp(errorEvent.getTimeStamp());
spectrumEvent_ro.setValue(value); spectrumEvent_ro.setValue(value);
processEventSpectrum(spectrumEvent_ro, tryNumber); processEventSpectrum(spectrumEvent_ro, tryNumber);
} }
@Override
public void spectrumChange(final NumberSpectrumEvent event) { public void spectrumChange(final NumberSpectrumEvent event) {
final double[] spectrumvalue = event.getValue(); // final double[] spectrumvalue = event.getValue();
Double[] value; // Double[] value;
if (spectrumvalue == null) { // if (spectrumvalue == null) {
value = null; // value = null;
// } else {
// value = new Double[spectrumvalue.length];
// for (int i = 0; i < spectrumvalue.length; i++) {
// value[i] = new Double(spectrumvalue[i]);
// }
// }
INumberSpectrum eventSrc = (INumberSpectrum) event.getSource();
final double[] spectrumvalueR = eventSrc.getSpectrumDeviceValue();
final double[] spectrumvalueW = eventSrc.getSpectrumDeviceSetPoint();
Double[] value = null;
if (spectrumvalueR != null) {
int j = 0;
if (getWritableValue().equals(AttrWriteType.READ)) {
value = new Double[spectrumvalueR.length];
} else { } else {
value = new Double[spectrumvalue.length]; value = new Double[spectrumvalueR.length + spectrumvalueW.length];
for (int i = 0; i < spectrumvalue.length; i++) { }
value[i] = new Double(spectrumvalue[i]); for (int i = 0; i < spectrumvalueR.length; i++) {
value[j++] = new Double(spectrumvalueR[i]);
}
if (!getWritableValue().equals(AttrWriteType.READ)) {
for (int i = 0; i < spectrumvalueW.length; i++) {
value[j++] = new Double(spectrumvalueW[i]);
}
} }
} }
try { try {
if (getWritableValue().equals(AttrWriteType.READ)) { if (getWritableValue().equals(AttrWriteType.READ)) {
final SpectrumEvent_RO spectrumEvent_ro = new SpectrumEvent_RO(); final SpectrumEvent_RO spectrumEvent_ro = new SpectrumEvent_RO();
spectrumEvent_ro.setAttribute_complete_name(((INumberSpectrum) event.getSource()) spectrumEvent_ro.setAttribute_complete_name(((INumberSpectrum) event.getSource()).getName());
.getName()); spectrumEvent_ro.setData_type(((INumberSpectrum) event.getSource()).getAttribute().getType());
spectrumEvent_ro.setData_type(((INumberSpectrum) event.getSource()).getAttribute()
.getType());
spectrumEvent_ro.setDim_x(value.length); spectrumEvent_ro.setDim_x(value.length);
spectrumEvent_ro.setTimeStamp(event.getTimeStamp()); spectrumEvent_ro.setTimeStamp(event.getTimeStamp());
spectrumEvent_ro.setValue(value); spectrumEvent_ro.setValue(value);
...@@ -194,10 +213,8 @@ public class NumberSpectrum extends TdbCollector implements ISpectrumListener { ...@@ -194,10 +213,8 @@ public class NumberSpectrum extends TdbCollector implements ISpectrumListener {
} else { } else {
final SpectrumEvent_RW spectrumEvent_rw = new SpectrumEvent_RW(); final SpectrumEvent_RW spectrumEvent_rw = new SpectrumEvent_RW();
spectrumEvent_rw.setAttribute_complete_name(((INumberSpectrum) event.getSource()) spectrumEvent_rw.setAttribute_complete_name(((INumberSpectrum) event.getSource()).getName());
.getName()); spectrumEvent_rw.setData_type(((INumberSpectrum) event.getSource()).getAttribute().getType());
spectrumEvent_rw.setData_type(((INumberSpectrum) event.getSource()).getAttribute()
.getType());
spectrumEvent_rw.setDim_x(((INumberSpectrum) event.getSource()).getXDimension()); spectrumEvent_rw.setDim_x(((INumberSpectrum) event.getSource()).getXDimension());
spectrumEvent_rw.setTimeStamp(event.getTimeStamp()); spectrumEvent_rw.setTimeStamp(event.getTimeStamp());
spectrumEvent_rw.setValue(value); spectrumEvent_rw.setValue(value);
...@@ -210,6 +227,7 @@ public class NumberSpectrum extends TdbCollector implements ISpectrumListener { ...@@ -210,6 +227,7 @@ public class NumberSpectrum extends TdbCollector implements ISpectrumListener {
} }
@Override
public void stateChange(final AttributeStateEvent event) { public void stateChange(final AttributeStateEvent event) {
} }
...@@ -222,14 +240,12 @@ public class NumberSpectrum extends TdbCollector implements ISpectrumListener { ...@@ -222,14 +240,12 @@ public class NumberSpectrum extends TdbCollector implements ISpectrumListener {
} }
try { try {
filesNames.get(spectrumEvent_ro.getAttribute_complete_name()).processEventSpectrum( filesNames.get(spectrumEvent_ro.getAttribute_complete_name()).processEventSpectrum(spectrumEvent_ro);
spectrumEvent_ro);
super.setLastTimestamp(spectrumEvent_ro); super.setLastTimestamp(spectrumEvent_ro);
} catch (final Exception e) { } catch (final Exception e) {
Util.out2.println("ERROR !! " + "\r\n" + "\t Origin : \t " Util.out2.println("ERROR !! " + "\r\n" + "\t Origin : \t " + "NumberSpectrum_RO.processEventSpectrum"
+ "NumberSpectrum_RO.processEventSpectrum" + "\r\n" + "\t Reason : \t " + "\r\n" + "\t Reason : \t " + e.getClass().getName() + "\r\n" + "\t Description : \t "
+ e.getClass().getName() + "\r\n" + "\t Description : \t " + e.getMessage() + e.getMessage() + "\r\n" + "\t Additional information : \t " + "" + "\r\n");
+ "\r\n" + "\t Additional information : \t " + "" + "\r\n");
e.printStackTrace(); e.printStackTrace();
} }
} }
...@@ -243,14 +259,12 @@ public class NumberSpectrum extends TdbCollector implements ISpectrumListener { ...@@ -243,14 +259,12 @@ public class NumberSpectrum extends TdbCollector implements ISpectrumListener {
} }
try { try {
filesNames.get(spectrumEvent_rw.getAttribute_complete_name()).processEventSpectrum( filesNames.get(spectrumEvent_rw.getAttribute_complete_name()).processEventSpectrum(spectrumEvent_rw);
spectrumEvent_rw);
super.setLastTimestamp(spectrumEvent_rw); super.setLastTimestamp(spectrumEvent_rw);
} catch (final Exception e) { } catch (final Exception e) {
Util.out2.println("ERROR !! " + "\r\n" + "\t Origin : \t " Util.out2.println("ERROR !! " + "\r\n" + "\t Origin : \t " + "NumberSpectrum_RW.processEventSpectrum"
+ "NumberSpectrum_RW.processEventSpectrum" + "\r\n" + "\t Reason : \t " + "\r\n" + "\t Reason : \t " + e.getClass().getName() + "\r\n" + "\t Description : \t "
+ e.getClass().getName() + "\r\n" + "\t Description : \t " + e.getMessage() + e.getMessage() + "\r\n" + "\t Additional information : \t " + "" + "\r\n");
+ "\r\n" + "\t Additional information : \t " + "" + "\r\n");
e.printStackTrace(); e.printStackTrace();
} }
} }
......
src/main/java/TdbArchiver/Collector/spectrum/StringSpectrum.java
+ 28
− 30
View file @ 7e95d2f4
...@@ -117,6 +117,8 @@ ...@@ -117,6 +117,8 @@
package TdbArchiver.Collector.spectrum; package TdbArchiver.Collector.spectrum;
import org.apache.commons.lang.ArrayUtils;
import TdbArchiver.Collector.TdbCollector; import TdbArchiver.Collector.TdbCollector;
import TdbArchiver.Collector.TdbModeHandler; import TdbArchiver.Collector.TdbModeHandler;
import fr.esrf.Tango.AttrWriteType; import fr.esrf.Tango.AttrWriteType;
...@@ -136,8 +138,8 @@ import fr.soleil.hdbtdbArchivingApi.ArchivingTools.Tools.SpectrumEvent_RW; ...@@ -136,8 +138,8 @@ import fr.soleil.hdbtdbArchivingApi.ArchivingTools.Tools.SpectrumEvent_RW;
@SuppressWarnings("serial") @SuppressWarnings("serial")
public class StringSpectrum extends TdbCollector implements IStringSpectrumListener { public class StringSpectrum extends TdbCollector implements IStringSpectrumListener {
public StringSpectrum(final TdbModeHandler modeHandler, final String currentDsPath, public StringSpectrum(final TdbModeHandler modeHandler, final String currentDsPath, final String currentDbPath,
final String currentDbPath, final AttrWriteType writableType) { final AttrWriteType writableType) {
super(modeHandler, currentDsPath, currentDbPath, writableType); super(modeHandler, currentDsPath, currentDbPath, writableType);
} }
...@@ -160,40 +162,39 @@ public class StringSpectrum extends TdbCollector implements IStringSpectrumListe ...@@ -160,40 +162,39 @@ public class StringSpectrum extends TdbCollector implements IStringSpectrumListe
@Override @Override
public void errorChange(final ErrorEvent errorEvent) { public void errorChange(final ErrorEvent errorEvent) {
final int tryNumber = DEFAULT_TRY_NUMBER; final int tryNumber = DEFAULT_TRY_NUMBER;
Util.out3.println("StringSpectrum_RO.errorChange : " Util.out3.println("StringSpectrum_RO.errorChange : " + "Unable to read the attribute named "
+ "Unable to read the attribute named " + errorEvent.getSource().toString()); + errorEvent.getSource().toString());
final String[] value = null; final String[] value = null;
final SpectrumEvent_RO spectrumEvent_ro = new SpectrumEvent_RO(); final SpectrumEvent_RO spectrumEvent_ro = new SpectrumEvent_RO();
spectrumEvent_ro.setAttribute_complete_name(((IStringSpectrum) errorEvent.getSource()) spectrumEvent_ro.setAttribute_complete_name(((IStringSpectrum) errorEvent.getSource()).getName());
.getName());
spectrumEvent_ro.setTimeStamp(errorEvent.getTimeStamp()); spectrumEvent_ro.setTimeStamp(errorEvent.getTimeStamp());
spectrumEvent_ro.setValue(value); spectrumEvent_ro.setValue(value);
processEventSpectrum(spectrumEvent_ro, tryNumber); processEventSpectrum(spectrumEvent_ro, tryNumber);
} }
@Override
public void stringSpectrumChange(final StringSpectrumEvent event) { public void stringSpectrumChange(final StringSpectrumEvent event) {
final String[] value = event.getValue(); IStringSpectrum eventSrc = (IStringSpectrum) event.getSource();
final String[] spectrumvalueR = eventSrc.getStringSpectrumValue();
final String[] spectrumvalueW = eventSrc.getStringSpectrumSetPoint();
try { try {
if (getWritableValue().equals(AttrWriteType.READ)) { if (getWritableValue().equals(AttrWriteType.READ)) {
final SpectrumEvent_RO spectrumEvent_ro = new SpectrumEvent_RO(); final SpectrumEvent_RO spectrumEvent_ro = new SpectrumEvent_RO();
spectrumEvent_ro.setAttribute_complete_name(((IStringSpectrum) event.getSource()) spectrumEvent_ro.setAttribute_complete_name(((IStringSpectrum) event.getSource()).getName());
.getName()); spectrumEvent_ro.setData_type(((IStringSpectrum) event.getSource()).getAttribute().getType());
spectrumEvent_ro.setData_type(((IStringSpectrum) event.getSource()).getAttribute() spectrumEvent_ro.setDim_x(spectrumvalueR.length);
.getType());
spectrumEvent_ro.setDim_x(value.length);
spectrumEvent_ro.setTimeStamp(event.getTimeStamp()); spectrumEvent_ro.setTimeStamp(event.getTimeStamp());
spectrumEvent_ro.setValue(value); spectrumEvent_ro.setValue(spectrumvalueR);
processEventSpectrum(spectrumEvent_ro, DEFAULT_TRY_NUMBER); processEventSpectrum(spectrumEvent_ro, DEFAULT_TRY_NUMBER);
} else { } else {
final SpectrumEvent_RW spectrumEvent_rw = new SpectrumEvent_RW(); final SpectrumEvent_RW spectrumEvent_rw = new SpectrumEvent_RW();
spectrumEvent_rw.setAttribute_complete_name(((IStringSpectrum) event.getSource()) spectrumEvent_rw.setAttribute_complete_name(((IStringSpectrum) event.getSource()).getName());
.getName()); spectrumEvent_rw.setData_type(((IStringSpectrum) event.getSource()).getAttribute().getType());
spectrumEvent_rw.setData_type(((IStringSpectrum) event.getSource()).getAttribute()
.getType());
spectrumEvent_rw.setDim_x(((IStringSpectrum) event.getSource()).getXDimension()); spectrumEvent_rw.setDim_x(((IStringSpectrum) event.getSource()).getXDimension());
spectrumEvent_rw.setTimeStamp(event.getTimeStamp()); spectrumEvent_rw.setTimeStamp(event.getTimeStamp());
spectrumEvent_rw.setValue(value); spectrumEvent_rw.setValue(ArrayUtils.addAll(spectrumvalueR, spectrumvalueW));
processEventSpectrum(spectrumEvent_rw, DEFAULT_TRY_NUMBER); processEventSpectrum(spectrumEvent_rw, DEFAULT_TRY_NUMBER);
} }
...@@ -203,6 +204,7 @@ public class StringSpectrum extends TdbCollector implements IStringSpectrumListe ...@@ -203,6 +204,7 @@ public class StringSpectrum extends TdbCollector implements IStringSpectrumListe
} }
@Override
public void stateChange(final AttributeStateEvent event) { public void stateChange(final AttributeStateEvent event) {
} }
...@@ -215,14 +217,12 @@ public class StringSpectrum extends TdbCollector implements IStringSpectrumListe ...@@ -215,14 +217,12 @@ public class StringSpectrum extends TdbCollector implements IStringSpectrumListe
} }
try { try {
filesNames.get(spectrumEvent_ro.getAttribute_complete_name()).processEventSpectrum( filesNames.get(spectrumEvent_ro.getAttribute_complete_name()).processEventSpectrum(spectrumEvent_ro);
spectrumEvent_ro);
super.setLastTimestamp(spectrumEvent_ro); super.setLastTimestamp(spectrumEvent_ro);
} catch (final Exception e) { } catch (final Exception e) {
Util.out2.println("ERROR !! " + "\r\n" + "\t Origin : \t " Util.out2.println("ERROR !! " + "\r\n" + "\t Origin : \t " + "StringSpectrum_RO.processEventSpectrum"
+ "StringSpectrum_RO.processEventSpectrum" + "\r\n" + "\t Reason : \t " + "\r\n" + "\t Reason : \t " + e.getClass().getName() + "\r\n" + "\t Description : \t "
+ e.getClass().getName() + "\r\n" + "\t Description : \t " + e.getMessage() + e.getMessage() + "\r\n" + "\t Additional information : \t " + "" + "\r\n");
+ "\r\n" + "\t Additional information : \t " + "" + "\r\n");
e.printStackTrace(); e.printStackTrace();
} }
} }
...@@ -236,14 +236,12 @@ public class StringSpectrum extends TdbCollector implements IStringSpectrumListe ...@@ -236,14 +236,12 @@ public class StringSpectrum extends TdbCollector implements IStringSpectrumListe
} }
try { try {
filesNames.get(spectrumEvent_rw.getAttribute_complete_name()).processEventSpectrum( filesNames.get(spectrumEvent_rw.getAttribute_complete_name()).processEventSpectrum(spectrumEvent_rw);
spectrumEvent_rw);
super.setLastTimestamp(spectrumEvent_rw); super.setLastTimestamp(spectrumEvent_rw);
} catch (final Exception e) { } catch (final Exception e) {
Util.out2.println("ERROR !! " + "\r\n" + "\t Origin : \t " Util.out2.println("ERROR !! " + "\r\n" + "\t Origin : \t " + "StringSpectrum_RW.processEventSpectrum"
+ "StringSpectrum_RW.processEventSpectrum" + "\r\n" + "\t Reason : \t " + "\r\n" + "\t Reason : \t " + e.getClass().getName() + "\r\n" + "\t Description : \t "
+ e.getClass().getName() + "\r\n" + "\t Description : \t " + e.getMessage() + e.getMessage() + "\r\n" + "\t Additional information : \t " + "" + "\r\n");
+ "\r\n" + "\t Additional information : \t " + "" + "\r\n");
e.printStackTrace(); e.printStackTrace();
} }
} }
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment

The place to be for your source code