Skip to content
Snippets Groups Projects
Commit c5122494 authored by Raphael GIRARDOT's avatar Raphael GIRARDOT
Browse files

- data extraction bug correction

- removed dead code
parent b97e9510
No related branches found
No related tags found
No related merge requests found
......@@ -97,7 +97,9 @@ public abstract class AbstractViewSpectrumPanel extends AbstractViewCleanablePan
@Override
public void applyDataOutsideOfEDT(String attributeName, DbData... recoveredSplitData) {
if (ObjectUtils.sameObject(attributeName, getFullName())) {
String fullName = getFullName();
if (((attributeName == null) && (fullName == null))
|| ((attributeName != null) && (fullName != null) && attributeName.equalsIgnoreCase(fullName))) {
final IExtractingManager extractingManager = ExtractingManagerFactory.getCurrentImpl();
try {
splitData = recoveredSplitData;
......
/*
* Synchrotron Soleil File : ViewSpectrumPanel.java Project : Mambo_CVS
* Description : Author : SOLEIL Original : 24 janv. 2006 Revision: Author:
* Date: State: Log: ViewSpectrumPanel.java,v
*/
package fr.soleil.mambo.containers.view;
import java.awt.Color;
......@@ -295,68 +290,6 @@ public class ViewSpectrumPanel extends AbstractViewSpectrumPanel implements Tabl
return model;
}
/*
* public ViewSpectrumAdapter getFilteredSpectrumDAO() { if (splitedData ==
* null) { return null; } else { int dataType = TangoConst.Tango_DEV_VOID;
* int readBooleanColumn = -1; int readNameColumn = -1; int
* writeBooleanColumn = -1; int writeNameColumn = -1; if (splitedData[0] ==
* null) { dataType = splitedData[1].getData_type(); writeBooleanColumn = 0;
* writeNameColumn = 1; } else { dataType = splitedData[0].getData_type();
* readBooleanColumn = 0; readNameColumn = 1; writeBooleanColumn = 3;
* writeNameColumn = 2; } switch (dataType) { case
* TangoConst.Tango_DEV_SHORT: case TangoConst.Tango_DEV_USHORT: case
* TangoConst.Tango_DEV_LONG: case TangoConst.Tango_DEV_ULONG: case
* TangoConst.Tango_DEV_FLOAT: case TangoConst.Tango_DEV_DOUBLE: final
* Collection<DataArray2> dataArrayList = new ArrayList<DataArray2>(); for
* (int row = 0; row < model.getRowCount(); row++) { final
* IExtractingManager extractingManager =
* ExtractingManagerFactory.getCurrentImpl(); if (extractingManager != null)
* { if (extractingManager.isShowRead()) { final DataArray2 readDataArray =
* extractDataArray(row, readNameColumn, readBooleanColumn,
* getViewSpectrumType(), splitedData[0]); if (readDataArray != null) {
* dataArrayList.add(readDataArray); } }
*
* if (extractingManager.isShowWrite()) { final DataArray2 writeDataArray =
* extractDataArray(row, writeNameColumn, writeBooleanColumn,
* getViewSpectrumType(), splitedData[1]); if (writeDataArray != null) {
* dataArrayList.add(writeDataArray); } } } } final ViewSpectrumAdapter dao
* = new ViewSpectrumAdapter(dataArrayList); return dao; default: return
* null; } } }
*
*
* private DataArray2 extractDataArray(final int row, final int nameColumn,
* final int booleanColumn, final int viewType, final DbData data) {
* DataArray2 dataArray = null; if (data != null && data.getTimedData() !=
* null && row > -1 && row < model.getRowCount() && nameColumn > -1 &&
* nameColumn < model.getColumnCount() && booleanColumn > -1 &&
* booleanColumn < model.getColumnCount()) { Boolean selected = null; if
* (model.getValueAt(row, booleanColumn) instanceof Boolean) { selected =
* (Boolean) model.getValueAt(row, booleanColumn); } if (selected == null) {
* selected = Boolean.FALSE; } if (selected.booleanValue()) { switch
* (viewType) { case
* ViewConfigurationAttributePlotProperties.SPECTRUM_VIEW_TYPE_INDEX: //
* Index spectrum : each DataArray is the history of an // index in the //
* spectrum dataArray = new DataArray2();
* dataArray.setId(String.valueOf(model.getValueAt(row, nameColumn))); for
* (int timeIndex = 0; timeIndex < data.getTimedData().length; timeIndex++)
* { if (data.getTimedData()[timeIndex].value != null && row <
* data.getTimedData()[timeIndex].value.length) {
* dataArray.add(data.getTimedData()[timeIndex].time.doubleValue(),
* ((Number) data.getTimedData()[timeIndex].value[row]).doubleValue()); } }
* break; case
* ViewConfigurationAttributePlotProperties.SPECTRUM_VIEW_TYPE_TIME: case
* ViewConfigurationAttributePlotProperties.SPECTRUM_VIEW_TYPE_TIME_STACK:
* // Time spectrum : each DataArray is a full spectrum at a // particular
* time dataArray = new DataArray2();
* dataArray.setId(String.valueOf(model.getValueAt(row, nameColumn))); if
* (row < data.getTimedData().length) { for (int index = 0; index <
* data.getMax_x(); index++) { double y; if (data.getTimedData()[row].value
* != null && index < data.getTimedData()[row].value.length &&
* data.getTimedData()[row].value[index] != null) { y = ((Number)
* data.getTimedData()[row].value[index]).doubleValue(); } else { y =
* Double.NaN; } dataArray.add(index, y); } } break; default: // Invalid
* view type break; } } } return dataArray; }
*/
@Override
public int getViewSpectrumType() {
return spectrum.getProperties().getPlotProperties().getSpectrumViewType();
......@@ -446,8 +379,7 @@ public class ViewSpectrumPanel extends AbstractViewSpectrumPanel implements Tabl
@Override
public void tableChanged(TableModelEvent e) {
// enable compare button if only 2 read spectrums or 2 write spectrums
// are selected
// enable compare button if only 2 read spectrums or 2 write spectrums are selected
int selectedReadRowCount = model.getSelectedReadRowCount();
int selectedWriteRowCount = model.getSelectedWriteRowCount();
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment