Skip to content
Snippets Groups Projects
Commit 2da936c7 authored by Arthur Coolen's avatar Arthur Coolen
Browse files

Bug1164:

SOrt order was wrong for stationlist due to numbers 1-9 10- iso 01,02 etc
parent c5e321ab
No related branches found
No related tags found
No related merge requests found
...@@ -85,9 +85,28 @@ void updatePositions(string dp1, float cOL, ...@@ -85,9 +85,28 @@ void updatePositions(string dp1, float cOL,
return; return;
} }
dyn_string OL=dpNames(sysName+txt+\"*.deltaX;\",\"Antenna\"); dyn_string unsortOL=dpNames(sysName+txt+\"*.deltaX;\",\"Antenna\");
dyn_string NB=dpNames(sysName+txt+\"*.deltaY;\",\"Antenna\"); dyn_string unsortNB=dpNames(sysName+txt+\"*.deltaY;\",\"Antenna\");
dyn_string H= dpNames(sysName+txt+\"*.deltaH;\",\"Antenna\"); dyn_string unsortH= dpNames(sysName+txt+\"*.deltaH;\",\"Antenna\");
dyn_string OL=unsortOL;
dyn_string NB=unsortNB;
dyn_string H=unsortH;
// since we have Antenna's with 1 digit and 2 digits we need to resort the dynstrings here, otherwise we get them as:
// HBA0 HBA1 HBA10 HBA11-HBA19 HBA 2 HBA 20 etc
//
for (int i=1; i<= dynlen(unsortOL);i++) {
string ant = strsplit(unsortOL[i],\":.\" )[2];
int idx = substr(ant,3);
OL[idx+1]=unsortOL[i];
NB[idx+1]=unsortNB[i];
H[idx+1]=unsortH[i];
}
LOG_DEBUG(\"OL: \"+ OL);
LOG_DEBUG(\"NB: \"+ NB);
LOG_DEBUG(\"H: \"+ H);
// found match, save found strings and redraw screen // found match, save found strings and redraw screen
...@@ -98,6 +117,10 @@ void updatePositions(string dp1, float cOL, ...@@ -98,6 +117,10 @@ void updatePositions(string dp1, float cOL,
dpGet(NB,antennaOffsetsNB); dpGet(NB,antennaOffsetsNB);
dpGet(H,antennaOffsetsH); dpGet(H,antennaOffsetsH);
LOG_DEBUG(\"offsetsOL: \" + antennaOffsetsOL);
LOG_DEBUG(\"offsetsNB: \" + antennaOffsetsNB);
LOG_DEBUG(\"offsetsH : \" + antennaOffsetsH);
redraw(txt); redraw(txt);
} }
" 0 " 0
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment