1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
|
From eb3aad2452ea6a69c22e25182fdaf5b98549758f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Muhammet=20=C5=9E=C3=BCkr=C3=BC=20Demir?=
<[email protected]>
Date: Sat, 7 Dec 2024 20:08:02 +0300
Subject: [PATCH] fix ngspice and qucsator_rf path search.
---
qucs/main.cpp | 8 +++---
qucs/qucs.cpp | 75 ++++++++++++++++++++++++++++++++-------------------
2 files changed, 52 insertions(+), 31 deletions(-)
diff --git a/qucs/main.cpp b/qucs/main.cpp
index 287cd5b83..a015a7687 100644
--- a/qucs/main.cpp
+++ b/qucs/main.cpp
@@ -106,12 +106,12 @@ bool loadSettings()
QFileInfo inf(QucsSettings.Qucsator);
QucsSettings.QucsatorDir = inf.canonicalPath() + QDir::separator();
if (QucsSettings.Qucsconv.isEmpty())
- QucsSettings.Qucsconv = QucsSettings.QucsatorDir + QDir::separator() + "qucsconv_rf" + executableSuffix;
+ QucsSettings.Qucsconv = QStandardPaths::findExecutable("qucsconv_rf",{QucsSettings.QucsatorDir});
} else {
- QucsSettings.Qucsator = QucsSettings.BinDir + "qucsator_rf" + executableSuffix;
+ QucsSettings.Qucsator = QStandardPaths::findExecutable("qucsator_rf",{QucsSettings.BinDir});
QucsSettings.QucsatorDir = QucsSettings.BinDir;
if (QucsSettings.Qucsconv.isEmpty())
- QucsSettings.Qucsconv = QucsSettings.BinDir + "qucsconv_rf" + executableSuffix;
+ QucsSettings.Qucsconv = QStandardPaths::findExecutable("qucsconv_rf",{QucsSettings.BinDir});
}
QucsSettings.AdmsXmlBinDir.setPath(_settings::Get().item<QString>("AdmsXmlBinDir"));
@@ -798,7 +798,7 @@ int main(int argc, char *argv[])
QucsDir.cdUp();
#endif
- QucsSettings.BinDir = QucsDir.absolutePath() + "/bin/";
+ QucsSettings.BinDir = QucsApplicationPath.contains("bin") ? QucsApplicationPath : QucsDir.absoluteFilePath("bin");
QucsSettings.LangDir = QucsDir.canonicalPath() + "/share/" QUCS_NAME "/lang/";
QucsSettings.LibDir = QucsDir.canonicalPath() + "/share/" QUCS_NAME "/library/";
diff --git a/qucs/qucs.cpp b/qucs/qucs.cpp
index 07d0eb4f4..e78479b53 100644
--- a/qucs/qucs.cpp
+++ b/qucs/qucs.cpp
@@ -156,8 +156,8 @@ QucsApp::QucsApp()
select->setChecked(true); // switch on the 'select' action
switchSchematicDoc(true); // "untitled" document is schematic
-
- lastExportFilename = QDir::homePath() + QDir::separator() + "export.png";
+ QDir homeDir = QDir::homePath();
+ lastExportFilename = homeDir.absoluteFilePath("export.png");
// load documents given as command line arguments
for(int z=1; z<qApp->arguments().size(); z++) {
@@ -172,42 +172,54 @@ QucsApp::QucsApp()
}
}
+ QDir QucsBinDir(QucsSettings.BinDir);
if (QucsSettings.firstRun) { // try to find Ngspice
+ QString ngspice_exe_name = "ngspice";
#ifdef Q_OS_WIN
- QString ngspice_exe1 = QucsSettings.BinDir + QDir::separator() + "ngspice_con.exe";
- QString ngspice_exe2 = "C:\\Spice64\\bin\\ngspice_con.exe";
- QString qucsator_exe = QucsSettings.BinDir + QDir::separator() + "qucsator_rf.exe";
-#else
- QString ngspice_exe1 = QucsSettings.BinDir + QDir::separator() + "ngspice";
- QString qucsator_exe = QucsSettings.BinDir + QDir::separator() + "qucsator_rf";
+ ngspice_exe_name+="_con";
#endif
+ /* search own path */
+ QString ngspice_exe1 = QStandardPaths::findExecutable(ngspice_exe_name,{QucsBinDir.absolutePath()});
+ /* search system path */
+ QString ngspice_exe2 = QStandardPaths::findExecutable(ngspice_exe_name);
+
+ /* search own path */
+ QString qucsator_exe1 = QStandardPaths::findExecutable("qucsator_rf",{QucsBinDir.absolutePath()});
+ /* search system path */
+ QString qucsator_exe2 = QStandardPaths::findExecutable("qucsator_rf");
+
QString ngspice_exe;
bool ngspice_found = false;
- if (QFile::exists(ngspice_exe1)) {
+ if(!ngspice_exe1.isEmpty()){
ngspice_found = true;
ngspice_exe = ngspice_exe1;
+ }else if(!ngspice_exe2.isEmpty()){
+ ngspice_found = true;
+ ngspice_exe = ngspice_exe2;
}
+
+ QString qucsator_exe;
bool qucsator_found = false;
- if (QFile::exists(qucsator_exe)) {
+ if(!qucsator_exe1.isEmpty()){
qucsator_found = true;
- QucsSettings.Qucsator = qucsator_exe;
- }
-#ifdef Q_OS_WIN
- if (!ngspice_found && QFile::exists(ngspice_exe2)) {
- ngspice_found = true;
- ngspice_exe = ngspice_exe2;
+ qucsator_exe = qucsator_exe1;
+ }else if(!qucsator_exe2.isEmpty()){
+ qucsator_found = true;
+ qucsator_exe = qucsator_exe2;
}
-#endif
- ngspice_exe = QDir::toNativeSeparators(ngspice_exe);
+
QString info_string;
if (ngspice_found) {
- QucsSettings.DefaultSimulator = spicecompat::simNgspice;
+ QucsSettings.DefaultSimulator = spicecompat::simNgspice;
QucsSettings.NgspiceExecutable = ngspice_exe;
info_string += tr("Ngspice found at: ") + ngspice_exe + "\n";
}
- if (qucsator_found) {
+
+ if(qucsator_found){
+ QucsSettings.Qucsator = qucsator_exe;
info_string += tr("QucsatorRF found at: ") + qucsator_exe + "\n";
}
+
info_string += tr("\nYou can specify another location later"
" using Simulation->Simulators Setings\n");
if (!ngspice_found && qucsator_found) {
@@ -220,18 +232,27 @@ QucsApp::QucsApp()
QMessageBox::information(nullptr,tr("Set simulator"), info_string);
fillSimulatorsComboBox();
} else {
+#ifdef Q_OS_WIN
+ QucsSettings.NgspiceExecutable = "ngspice_con.exe";
+ QucsSettings.Qucsator = "qucsator_rf.exe";
+#else
+ QucsSettings.NgspiceExecutable = "ngspice";
+ QucsSettings.Qucsator = "qucsator_rf";
+#endif
QMessageBox::information(this,tr("Qucs"),tr("No simulators found automatically. Please specify simulators"
" in the next dialog window."));
slotSimSettings();
}
QucsSettings.firstRun = false;
- } else if (!QFile::exists(QucsSettings.Qucsator)) {
- QucsSettings.Qucsator = QucsSettings.BinDir + QDir::separator() + "qucsator_rf";
-#ifdef Q_OS_WIN
- QucsSettings.Qucsator += ".exe";
-#endif
- QMessageBox::information(this, "Qucs",
- tr("QucsatorRF found at: ") + QucsSettings.Qucsator + "\n");
+ } else {
+ if (!QucsSettings.Qucsator.contains("qucsator_rf")) {
+ QucsSettings.Qucsator = QStandardPaths::findExecutable("qucsator_rf",{QucsBinDir.absolutePath()});
+
+ if(!QucsSettings.Qucsator.isEmpty()){
+ QMessageBox::information(this, "Qucs",
+ tr("QucsatorRF found at: ") + QucsSettings.Qucsator + "\n");
+ }
+ }
}
// fillLibrariesTreeView();
|
