Merge pull request #1018 from ra3xdh/951_fix

Apply path conversion only for saved schematic or schematic in projects
ra3xdh · Oct 24, 2024 · 12d5cfe · 12d5cfe
2 parents 8fc712e + 0ff0ed0
commit 12d5cfe
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 12 deletions.
diff --git a/qucs/components/componentdialog.cpp b/qucs/components/componentdialog.cpp
@@ -1088,12 +1088,20 @@ void ComponentDialog::slotBrowseFile()
     // snip path if file in current directory
     QFileInfo file(s);
     lastDir = file.absolutePath();
-    currDir = schematicFileInfo.canonicalPath();
-    if ( file.canonicalFilePath().startsWith(currDir) ) {
-      s = QDir(currDir).relativeFilePath(s);
-    } else if(QucsSettings.QucsWorkDir.exists(file.fileName()) &&
-        QucsSettings.QucsWorkDir.absolutePath() == file.absolutePath()) {
-      s = file.fileName();
+    if (!schematicFileName.isEmpty()) {
+      currDir = schematicFileInfo.canonicalPath();
+    }
+
+    if (!(schematicFileName.isEmpty() &&
+          QucsMain->ProjName.isEmpty())) {
+      // unsaved schematic outside project; only absolute file name
+      // the schematic could be saved elsewhere and working directory may be changed
+      if ( file.canonicalFilePath().startsWith(currDir) ) {
+        s = QDir(currDir).relativeFilePath(s);
+      } else if(QucsSettings.QucsWorkDir.exists(file.fileName()) &&
+                 QucsSettings.QucsWorkDir.absolutePath() == file.absolutePath()) {
+        s = file.fileName();
+      }
     }
     edit->setText(s);
     int row = prop->currentRow();

diff --git a/qucs/components/spicedialog.cpp b/qucs/components/spicedialog.cpp
@@ -316,13 +316,23 @@ void SpiceDialog::slotButtBrowse()
     // snip path if file in current directory
     QFileInfo file(s);
     lastDir = file.absolutePath();
-    currDir = schematicFileInfo.canonicalPath();
-    if ( file.canonicalFilePath().startsWith(currDir) ) {
-      s = QDir(currDir).relativeFilePath(s);
-    } else if(QucsSettings.QucsWorkDir.exists(file.fileName()) &&
-        QucsSettings.QucsWorkDir.absolutePath() == file.absolutePath()) {
-      s = file.fileName();
+
+    if (!schematicFileName.isEmpty()) {
+      currDir = schematicFileInfo.canonicalPath();
     }
+
+    if (!(schematicFileName.isEmpty() &&
+          QucsMain->ProjName.isEmpty())) {
+      // unsaved schematic outside project; only absolute file name
+      // the schematic could be saved elsewhere and working directory may be changed
+      if ( file.canonicalFilePath().startsWith(currDir) ) {
+        s = QDir(currDir).relativeFilePath(s);
+      } else if(QucsSettings.QucsWorkDir.exists(file.fileName()) &&
+                 QucsSettings.QucsWorkDir.absolutePath() == file.absolutePath()) {
+        s = file.fileName();
+      }
+    }
+
     FileEdit->setText(s);
     Comp->Props.at(1)->Value = "";
     loadSpiceNetList(s);