This commit is contained in:
2023-12-01 12:42:03 +03:00
parent 98ee670127
commit 18be60e597

View File

@@ -89,7 +89,7 @@ QList<SHServerDataGenerator::TracedBlock> SHServerDataGenerator::getNeighbourBlo
QList<BlockItemPin * > SHServerDataGenerator::getFarBlocks(BlockItem * block) { QList<BlockItemPin * > SHServerDataGenerator::getFarBlocks(BlockItem * block) {
QList<BlockItemPin * > ret; QList<BlockItemPin * > ret;
if (!blockFlags(block).testFlag(SHS::Gateway)) return ret; if (!blockFlags(block).testFlag(SHS::Gateway)) return ret;
qDebug() << "getFarBlocks start" << block->propertyValueByName("name").toString(); //qDebug() << "getFarBlocks start" << block->propertyValueByName("name").toString();
QVector<BlockItemPin*> pins = block->pins(); QVector<BlockItemPin*> pins = block->pins();
QSet<void*> gathered; QSet<void*> gathered;
for (BlockItemPin * bp: pins) { for (BlockItemPin * bp: pins) {
@@ -126,7 +126,7 @@ QList<SHServerDataGenerator::TracedBlock> SHServerDataGenerator::gatherBlocks(Bl
ret = getNeighbourBlocks(block, input); ret = getNeighbourBlocks(block, input);
for (const TracedBlock & nb: ret) { for (const TracedBlock & nb: ret) {
QList<BlockItemPin * > far_pins = getFarBlocks(nb.block); QList<BlockItemPin * > far_pins = getFarBlocks(nb.block);
qDebug() << "NB block" << nb.block->propertyByName("name").toString() << nb.pin->text() << far_pins.size(); //qDebug() << "NB block" << nb.block->propertyByName("name").toString() << nb.pin->text() << far_pins.size();
/// gateways /// gateways
while (!far_pins.isEmpty()) { while (!far_pins.isEmpty()) {
QList<BlockItem*> gwl({nb.block}); QList<BlockItem*> gwl({nb.block});