Revert "Move read methods to ReadMethods, remove some legacy access to Arch"

This reverts commit 3352ff4abbcac563e08d78ed8aa77728d00284a8.

1 files changed, 12 insertions, 14 deletions

diff --git a/gui/designwidget.cc b/gui/designwidget.cc
index e839f006..110cf1b7 100644
--- a/gui/designwidget.cc
+++ b/gui/designwidget.cc
@@ -335,12 +335,10 @@ void DesignWidget::onItemClicked(QTreeWidgetItem *clickItem, int pos)
         return;

     }

 

-    auto &&proxy = ctx->rproxy();

-

     clearProperties();

     if (type == ElementType::BEL) {

         IdString c = static_cast<IdStringTreeItem *>(clickItem)->getData();

-        BelId bel = proxy.getBelByName(c);

+        BelId bel = ctx->getBelByName(c);

 

         QtProperty *topItem = groupManager->addProperty("Bel");

         addProperty(topItem, "Bel");

@@ -354,20 +352,20 @@ void DesignWidget::onItemClicked(QTreeWidgetItem *clickItem, int pos)
         topItem->addSubProperty(typeItem);

 

         QtVariantProperty *availItem = readOnlyManager->addProperty(QVariant::Bool, "Available");

-        availItem->setValue(proxy.checkBelAvail(bel));

+        availItem->setValue(ctx->checkBelAvail(bel));

         topItem->addSubProperty(availItem);

 

         QtVariantProperty *cellItem = readOnlyManager->addProperty(QVariant::String, "Bound Cell");

-        cellItem->setValue(proxy.getBoundBelCell(bel).c_str(ctx));

+        cellItem->setValue(ctx->getBoundBelCell(bel).c_str(ctx));

         topItem->addSubProperty(cellItem);

 

         QtVariantProperty *conflictItem = readOnlyManager->addProperty(QVariant::String, "Conflicting Cell");

-        conflictItem->setValue(proxy.getConflictingBelCell(bel).c_str(ctx));

+        conflictItem->setValue(ctx->getConflictingBelCell(bel).c_str(ctx));

         topItem->addSubProperty(conflictItem);

 

     } else if (type == ElementType::WIRE) {

         IdString c = static_cast<IdStringTreeItem *>(clickItem)->getData();

-        WireId wire = proxy.getWireByName(c);

+        WireId wire = ctx->getWireByName(c);

 

         QtProperty *topItem = groupManager->addProperty("Wire");

         addProperty(topItem, "Wire");

@@ -377,15 +375,15 @@ void DesignWidget::onItemClicked(QTreeWidgetItem *clickItem, int pos)
         topItem->addSubProperty(nameItem);

 

         QtVariantProperty *availItem = readOnlyManager->addProperty(QVariant::Bool, "Available");

-        availItem->setValue(proxy.checkWireAvail(wire));

+        availItem->setValue(ctx->checkWireAvail(wire));

         topItem->addSubProperty(availItem);

 

         QtVariantProperty *cellItem = readOnlyManager->addProperty(QVariant::String, "Bound Net");

-        cellItem->setValue(proxy.getBoundWireNet(wire).c_str(ctx));

+        cellItem->setValue(ctx->getBoundWireNet(wire).c_str(ctx));

         topItem->addSubProperty(cellItem);

 

         QtVariantProperty *conflictItem = readOnlyManager->addProperty(QVariant::String, "Conflicting Net");

-        conflictItem->setValue(proxy.getConflictingWireNet(wire).c_str(ctx));

+        conflictItem->setValue(ctx->getConflictingWireNet(wire).c_str(ctx));

         topItem->addSubProperty(conflictItem);

 

         BelPin uphill = ctx->getBelPinUphill(wire);

@@ -441,7 +439,7 @@ void DesignWidget::onItemClicked(QTreeWidgetItem *clickItem, int pos)
 

     } else if (type == ElementType::PIP) {

         IdString c = static_cast<IdStringTreeItem *>(clickItem)->getData();

-        PipId pip = proxy.getPipByName(c);

+        PipId pip = ctx->getPipByName(c);

 

         QtProperty *topItem = groupManager->addProperty("Pip");

         addProperty(topItem, "Pip");

@@ -451,15 +449,15 @@ void DesignWidget::onItemClicked(QTreeWidgetItem *clickItem, int pos)
         topItem->addSubProperty(nameItem);

 

         QtVariantProperty *availItem = readOnlyManager->addProperty(QVariant::Bool, "Available");

-        availItem->setValue(proxy.checkPipAvail(pip));

+        availItem->setValue(ctx->checkPipAvail(pip));

         topItem->addSubProperty(availItem);

 

         QtVariantProperty *cellItem = readOnlyManager->addProperty(QVariant::String, "Bound Net");

-        cellItem->setValue(proxy.getBoundPipNet(pip).c_str(ctx));

+        cellItem->setValue(ctx->getBoundPipNet(pip).c_str(ctx));

         topItem->addSubProperty(cellItem);

 

         QtVariantProperty *conflictItem = readOnlyManager->addProperty(QVariant::String, "Conflicting Net");

-        conflictItem->setValue(proxy.getConflictingPipNet(pip).c_str(ctx));

+        conflictItem->setValue(ctx->getConflictingPipNet(pip).c_str(ctx));

         topItem->addSubProperty(conflictItem);

 

         QtVariantProperty *srcWireItem = readOnlyManager->addProperty(QVariant::String, "Src Wire");