[EDA-1876] Fixed missing ports in pin planner (#1231)

* Fixed missing ports in pin planner * Incremented patch version --------- Co-authored-by: KochynVolodymyr <[email protected]>
os-fpga · Aug 21, 2023 · 5ed82e6 · 5ed82e6
1 parent 836f2d1
commit 5ed82e6
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 4 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -39,7 +39,7 @@ set(VERSION_MINOR 0)
 # Add the spdlog directory to the include path
 include_directories(${CMAKE_CURRENT_SOURCE_DIR}/third_party/spdlog/include ${CMAKE_CURRENT_SOURCE_DIR}/third_party/exprtk) 
 
-set(VERSION_PATCH 226)
+set(VERSION_PATCH 227)
 option(
   WITH_LIBCXX
   "Building with clang++ and libc++(in Linux). To enable with: -DWITH_LIBCXX=On"

diff --git a/src/MainWindow/main_window.cpp b/src/MainWindow/main_window.cpp
@@ -1519,7 +1519,8 @@ void MainWindow::pinAssignmentActionTriggered() {
     data.context = GlobalSession->Context();
     data.pinMapFile =
         QString::fromStdString(m_compiler->PinmapCSVFile().string());
-    data.projectPath = m_projectManager->getProjectPath();
+    data.portsFilePath = QString::fromStdString(
+        m_compiler->FilePath(Compiler::Action::Analyze).string());
     data.target = QString::fromStdString(m_projectManager->getTargetDevice());
     data.pinFile = QString::fromStdString(m_projectManager->getConstrPinFile());
     QFile file{data.pinFile};

diff --git a/src/PinAssignment/PinAssignmentCreator.cpp b/src/PinAssignment/PinAssignmentCreator.cpp
@@ -21,6 +21,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "PinAssignmentCreator.h"
 
 #include <QBoxLayout>
+#include <QDebug>
 #include <QDir>
 #include <filesystem>
 
@@ -49,7 +50,8 @@ PinAssignmentCreator::PinAssignmentCreator(const PinAssignmentData &data,
   packagePinModel->setBaseModel(m_baseModel);
 
   PortsLoader *portsLoader{FindPortsLoader(data.target)};
-  portsLoader->load(searchPortsFile(data.projectPath));
+  auto [ok, message] = portsLoader->load(searchPortsFile(data.portsFilePath));
+  if (!ok) qWarning() << message;
 
   PackagePinsLoader *loader{FindPackagePinLoader(data.target)};
   loader->loadHeader(packagePinHeaderFile(data.context));

diff --git a/src/PinAssignment/PinAssignmentCreator.h b/src/PinAssignment/PinAssignmentCreator.h
@@ -35,7 +35,7 @@ struct PinAssignmentData {
   QString pinMapFile{};
   QString target{};
   QStringList commands{};
-  QString projectPath{};
+  QString portsFilePath{};
   QString pinFile{};
   bool useBallId{false};
 };