equal
deleted
inserted
replaced
1375 str << dec << i; |
1375 str << dec << i; |
1376 slaveInfo.pos = str.str(); |
1376 slaveInfo.pos = str.str(); |
1377 str.clear(); |
1377 str.clear(); |
1378 str.str(""); |
1378 str.str(""); |
1379 |
1379 |
1380 if (lastAlias) { |
1380 str << lastAlias; |
1381 str << "#" << hex << lastAlias; |
1381 slaveInfo.alias = str.str(); |
1382 slaveInfo.alias = str.str(); |
1382 str.str(""); |
1383 str.str(""); |
1383 |
1384 str << ":" << dec << aliasIndex; |
1384 str << aliasIndex; |
1385 slaveInfo.relPos = str.str(); |
1385 slaveInfo.relPos = str.str(); |
1386 str.str(""); |
1386 str.str(""); |
1387 } else { |
|
1388 slaveInfo.alias = ""; |
|
1389 slaveInfo.relPos = ""; |
|
1390 } |
|
1391 |
1387 |
1392 slaveInfo.state = slaveState(slave.state); |
1388 slaveInfo.state = slaveState(slave.state); |
1393 slaveInfo.flag = (slave.error_flag ? 'E' : '+'); |
1389 slaveInfo.flag = (slave.error_flag ? 'E' : '+'); |
1394 |
1390 |
1395 if (strlen(slave.name)) { |
1391 if (strlen(slave.name)) { |
1413 maxRelPosWidth = slaveInfo.relPos.length(); |
1409 maxRelPosWidth = slaveInfo.relPos.length(); |
1414 if (slaveInfo.state.length() > maxStateWidth) |
1410 if (slaveInfo.state.length() > maxStateWidth) |
1415 maxStateWidth = slaveInfo.state.length(); |
1411 maxStateWidth = slaveInfo.state.length(); |
1416 } |
1412 } |
1417 |
1413 |
1418 if (lastAlias) |
1414 aliasIndex++; |
1419 aliasIndex++; |
|
1420 } |
1415 } |
1421 |
1416 |
1422 for (iter = slaveInfoList.begin(); iter != slaveInfoList.end(); iter++) { |
1417 for (iter = slaveInfoList.begin(); iter != slaveInfoList.end(); iter++) { |
1423 cout << setfill(' ') << right |
1418 cout << setfill(' ') << right |
1424 << setw(maxPosWidth) << iter->pos << " " |
1419 << setw(maxPosWidth) << iter->pos << " " |
1425 << setw(maxAliasWidth) << iter->alias |
1420 << setw(maxAliasWidth) << iter->alias |
1426 << left |
1421 << ":" << left |
1427 << setw(maxRelPosWidth) << iter->relPos << " " |
1422 << setw(maxRelPosWidth) << iter->relPos << " " |
1428 << setw(maxStateWidth) << iter->state << " " |
1423 << setw(maxStateWidth) << iter->state << " " |
1429 << iter->flag << " " |
1424 << iter->flag << " " |
1430 << iter->name << endl; |
1425 << iter->name << endl; |
1431 } |
1426 } |