Skip to content
This repository was archived by the owner on Jun 15, 2022. It is now read-only.

Add support for fetching only selected indexes. #9

Open
dlacoste-esrf wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add support for fetching only selected indexes. #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions src/main/java/HDBViewer/AttributeInfo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@
import java.util.HashMap;
import java.util.Map;
import java.util.Set;
import java.util.SortedSet;
import java.util.TreeSet;
import org.tango.jhdb.HdbSigInfo;
import org.tango.jhdb.HdbSigParam;
import org.tango.jhdb.SignalInfo;
Expand Down Expand Up @@ -217,6 +219,18 @@ public void removeAggregate(HdbData.Aggregate agg) {
aggInfos.remove(agg);
}

public SortedSet<Integer> getArrayIndexes()
{
TreeSet<Integer> ret = new TreeSet<>();
if( !isArray() || arrAttInfos==null )
return ret;
for(ArrayAttributeInfo ai : arrAttInfos)
{
ret.add(ai.idx);
}
return ret;
}

public JLDataView getDataView()
{
return chartData[DATA_IDX];
Expand Down
47 changes: 31 additions & 16 deletions src/main/java/HDBViewer/MainPanel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -657,11 +657,11 @@ private void createDataviewExpanded(AttributeInfo ai,int item) {
try {

// Read
double r = (aai.idx>d.size())?Double.NaN:d.getValueAsDoubleArray()[aai.idx];
double r = (item>d.size())?Double.NaN:d.getValueAsDoubleArray()[item];
addToDv(aai.chartData,chartTime,r,lastValue,aai.step);

if( isRW ) {
double s = (aai.idx>d.sizeW())?Double.NaN:d.getWriteValueAsDoubleArray()[aai.idx];
double s = (item>d.sizeW())?Double.NaN:d.getWriteValueAsDoubleArray()[item];
addToDv(aai.wchartData,chartTime,s,lastWriteValue,aai.step);
}

Expand Down Expand Up @@ -871,6 +871,7 @@ public void run() {
input.endDate = stopDate;
input.info.interval = att.interval; //this will only be used for aggregate.
input.info.aggregates = att.getAggregates();
input.info.indexes = att.getArrayIndexes();
sigIn.add(input);
}

Expand Down Expand Up @@ -1298,11 +1299,13 @@ else if (attInfo.isState()) {
try {
int[] hdbV = ((HdbStateArray) d).getValue();
int[] hdbVWrite = ((HdbStateArray) d).getWriteValue();
int idx = 0;
for (ArrayAttributeInfo aai : attInfo.arrAttInfos) {
if(aai.table) {
tablePanel.table.add("/State" + HdbState.getStateString(hdbV[aai.idx]), d.getQualityFactor(), d.getDataTime(), aai.tableIdx);
tablePanel.table.add("/State" + HdbState.getStateString(hdbV[idx]), d.getQualityFactor(), d.getDataTime(), aai.tableIdx);
if (isRW)
tablePanel.table.add("/State" + HdbState.getStateString(hdbVWrite[aai.idx]), d.getQualityFactor(), d.getDataTime(), aai.wtableIdx);
tablePanel.table.add("/State" + HdbState.getStateString(hdbVWrite[idx]), d.getQualityFactor(), d.getDataTime(), aai.wtableIdx);
idx++;
}
}
} catch(HdbFailed e) {}
Expand Down Expand Up @@ -1330,61 +1333,73 @@ else if (attInfo.isState()) {
if (d instanceof HdbFloatArray) {
float[] hdbV = ((HdbFloatArray) d).getValue();
float[] hdbVWrite = ((HdbFloatArray) d).getWriteValue();
int idx = 0;
for(ArrayAttributeInfo aai : attInfo.arrAttInfos) {
if(aai.table) {
tablePanel.table.add(Float.toString(hdbV[aai.idx]), d.getQualityFactor(), d.getDataTime(), aai.tableIdx);
tablePanel.table.add(Float.toString(hdbV[idx]), d.getQualityFactor(), d.getDataTime(), aai.tableIdx);
if(isRW)
tablePanel.table.add(Float.toString(hdbVWrite[aai.idx]), d.getQualityFactor(), d.getDataTime(), aai.wtableIdx);
tablePanel.table.add(Float.toString(hdbVWrite[idx]), d.getQualityFactor(), d.getDataTime(), aai.wtableIdx);
idx++;
}
}
} else if (d instanceof HdbLongArray) {
int[] hdbV = ((HdbLongArray) d).getValue();
int[] hdbVWrite = ((HdbLongArray) d).getWriteValue();
int idx = 0;
for(ArrayAttributeInfo aai : attInfo.arrAttInfos) {
if(aai.table) {
tablePanel.table.add(Integer.toString(hdbV[aai.idx]), d.getQualityFactor(), d.getDataTime(), aai.tableIdx);
tablePanel.table.add(Integer.toString(hdbV[idx]), d.getQualityFactor(), d.getDataTime(), aai.tableIdx);
if(isRW)
tablePanel.table.add(Integer.toString(hdbVWrite[aai.idx]), d.getQualityFactor(), d.getDataTime(), aai.wtableIdx);
tablePanel.table.add(Integer.toString(hdbVWrite[idx]), d.getQualityFactor(), d.getDataTime(), aai.wtableIdx);
idx++;
}
}
} else if (d instanceof HdbLong64Array) {
long[] hdbV = ((HdbLong64Array) d).getValue();
long[] hdbVWrite = ((HdbLong64Array) d).getWriteValue();
int idx = 0;
for(ArrayAttributeInfo aai : attInfo.arrAttInfos) {
if(aai.table) {
tablePanel.table.add(Long.toString(hdbV[aai.idx]), d.getQualityFactor(), d.getDataTime(), aai.tableIdx);
tablePanel.table.add(Long.toString(hdbV[idx]), d.getQualityFactor(), d.getDataTime(), aai.tableIdx);
if(isRW)
tablePanel.table.add(Long.toString(hdbVWrite[aai.idx]), d.getQualityFactor(), d.getDataTime(), aai.wtableIdx);
tablePanel.table.add(Long.toString(hdbVWrite[idx]), d.getQualityFactor(), d.getDataTime(), aai.wtableIdx);
idx++;
}
}
} else if (d instanceof HdbShortArray) {
short[] hdbV = ((HdbShortArray) d).getValue();
short[] hdbVWrite = ((HdbShortArray) d).getWriteValue();
int idx = 0;
for(ArrayAttributeInfo aai : attInfo.arrAttInfos) {
if(aai.table) {
tablePanel.table.add(Short.toString(hdbV[aai.idx]), d.getQualityFactor(), d.getDataTime(), aai.tableIdx);
tablePanel.table.add(Short.toString(hdbV[idx]), d.getQualityFactor(), d.getDataTime(), aai.tableIdx);
if(isRW)
tablePanel.table.add(Short.toString(hdbVWrite[aai.idx]), d.getQualityFactor(), d.getDataTime(), aai.wtableIdx);
tablePanel.table.add(Short.toString(hdbVWrite[idx]), d.getQualityFactor(), d.getDataTime(), aai.wtableIdx);
idx++;
}
}
} else if (d instanceof HdbStringArray) {
String[] hdbV = ((HdbStringArray) d).getValue();
String[] hdbVWrite = ((HdbStringArray) d).getValue();
int idx = 0;
for(ArrayAttributeInfo aai : attInfo.arrAttInfos) {
if(aai.table) {
tablePanel.table.add(hdbV[aai.idx], d.getQualityFactor(), d.getDataTime(), aai.tableIdx);
tablePanel.table.add(hdbV[idx], d.getQualityFactor(), d.getDataTime(), aai.tableIdx);
if(isRW)
tablePanel.table.add(hdbVWrite[aai.idx], d.getQualityFactor(), d.getDataTime(), aai.wtableIdx);
tablePanel.table.add(hdbVWrite[idx], d.getQualityFactor(), d.getDataTime(), aai.wtableIdx);
idx++;
}
}
} else {
double[] hdbV = d.getValueAsDoubleArray();
double[] hdbVWrite = d.getValueAsDoubleArray();
int idx = 0;
for(ArrayAttributeInfo aai : attInfo.arrAttInfos) {
if(aai.table) {
tablePanel.table.add(Double.toString(hdbV[aai.idx]), d.getQualityFactor(), d.getDataTime(), aai.tableIdx);
tablePanel.table.add(Double.toString(hdbV[idx]), d.getQualityFactor(), d.getDataTime(), aai.tableIdx);
if(isRW)
tablePanel.table.add(Double.toString(hdbVWrite[aai.idx]), d.getQualityFactor(), d.getDataTime(), aai.wtableIdx);
tablePanel.table.add(Double.toString(hdbVWrite[idx]), d.getQualityFactor(), d.getDataTime(), aai.wtableIdx);
idx++;
}
}
}
Expand Down
18 changes: 18 additions & 0 deletions src/main/java/HDBViewer/SelectionPanel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -572,6 +572,24 @@ void updateSelectionList() {
rowToIdx[j] = new SelRowItem(i, false, -1, agg);
j++;

if (ai.isExpanded()) {
int k = 0;
for (ArrayAttributeInfo aai : ai.arrAttInfos) {
objs[j][HOST_IDX] = ai.host;
objs[j][ATTRIBUTE_IDX] = ai.getName() + "[" + aai.idx + "]";
objs[j][TYPE_IDX] = "Item #" + aai.idx;
objs[j][INTERVAL_IDX] = ai.interval;
objs[j][RECORDS_IDX] = Integer.toString(ai.dataSize) + " (Err=" + Integer.toString(ai.errorSize) + ")";
objs[j][TABLE_IDX] = aai.table;
objs[j][STEP_IDX] = aai.step;
objs[j][Y1_IDX] = (aai.selection == AttributeInfo.SEL_Y1);
objs[j][Y2_IDX] = (aai.selection == AttributeInfo.SEL_Y2);
objs[j][IMG_IDX] = (aai.selection == AttributeInfo.SEL_IMAGE);
rowToIdx[j] = new SelRowItem(i, false, k);
j++;
k++;
}
}
}

} else {
Expand Down