SIM/qucs_s
1
0
Fork 0
mirror of https://github.com/ra3xdh/qucs_s synced 2025-03-28 21:13:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #640 from ivandi69/relative-file-path

Browse Source 
Add support for relative file paths
This commit is contained in:
Vadim Kuznetsov 2024-04-07 12:55:52 +02:00 committed by GitHub
commit 632627224a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
19 changed files with 149 additions and 282 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
qucs/components/componentdialog.cpp
View File

@ -1111,28 +1111,18 @@ void ComponentDialog::slotBrowseFile()
if (!currFileName.isEmpty()) { // a file name is already defined
if (currFileInfo.isRelative()) { // but has no absolute path
if (!schematicFileName.isEmpty()) { // if schematic has a filename
// build the an absolute file name using the schematic path
currDir = schematicFileInfo.absolutePath() +
QDir::separator() +
currFileInfo.fileName();
} else { // no absolute paths around
// use the WorkDir path
currDir = QucsSettings.QucsWorkDir.path() +
QDir::separator() +
currFileInfo.fileName();
}
} else { // current file name is absolute
// use it
currDir = currFileName;
if (!schematicFileName.isEmpty()) // if schematic has a filename
currDir = schematicFileInfo.absolutePath();
else // use the WorkDir path
currDir = lastDir.isEmpty() ? QucsSettings.QucsWorkDir.absolutePath() : lastDir;
} else { // current file name is absolute
currDir = currFileInfo.exists() ? currFileInfo.absolutePath() : QucsSettings.QucsWorkDir.absolutePath();
}
} else { // a file name is not defined
} else { // a file name is not defined
if (!schematicFileName.isEmpty()) { // if schematic has a filename
// use the schematic absolute path
currDir = schematicFileInfo.absolutePath();
} else { // no absolute paths around
// use the WorkDir path
currDir = QucsSettings.QucsWorkDir.path();
} else { // use the WorkDir path
currDir = lastDir.isEmpty() ? QucsSettings.QucsWorkDir.absolutePath() : lastDir;
}
}
@ -1150,8 +1140,14 @@ void ComponentDialog::slotBrowseFile()
if(!s.isEmpty()) {
// snip path if file in current directory
QFileInfo file(s);
if(QucsSettings.QucsWorkDir.exists(file.fileName()) &&
QucsSettings.QucsWorkDir.absolutePath() == file.absolutePath()) s = file.fileName();
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();
}
edit->setText(s);
}
/* FIX
@ -1161,7 +1157,7 @@ void ComponentDialog::slotBrowseFile()
// -------------------------------------------------------------------------
void ComponentDialog::slotEditFile()
{
Doc->App->editFile(QucsSettings.QucsWorkDir.filePath(edit->text()));
Doc->App->editFile(misc::properAbsFileName(edit->text(), Doc));
}
/*!

7
qucs/components/libcomp.cpp
View File

@ -89,7 +89,7 @@ int LibComp::loadSection(const QString& Name, QString& Section,
QStringList *Includes, QStringList *Attach)
{
QDir Directory(QucsSettings.LibDir);
QFile file(Directory.absoluteFilePath(Props.first()->Value + ".lib"));
QFile file(misc::properAbsFileName(Directory.absoluteFilePath(Props.first()->Value + ".lib"), containingSchematic));
if(!file.open(QIODevice::ReadOnly))
return -1;
@ -247,8 +247,9 @@ int LibComp::loadSymbol()
QString LibComp::getSubcircuitFile()
{
QDir Directory(QucsSettings.LibDir);
QString FileName = Directory.absoluteFilePath(Props.first()->Value);
return misc::properAbsFileName(FileName);
QString FileName = misc::properAbsFileName(Directory.absoluteFilePath(Props.first()->Value) + ".lib");
FileName.chop(4);
return FileName;
}
// -------------------------------------------------------

2
qucs/components/sparamfile.cpp
View File

@ -103,6 +103,8 @@ Element* SParamFile::info2(QString& Name, char* &BitmapFile, bool getNewOne)
// -------------------------------------------------------
QString SParamFile::getSubcircuitFile()
{
return misc::properAbsFileName(Props.getFirst()->Value, containingSchematic);
// construct full filename
QString FileName = Props.getFirst()->Value;
return misc::properAbsFileName(FileName);

70
qucs/components/spicedialog.cpp
View File

@ -15,6 +15,7 @@
* *
***************************************************************************/
#include "spicedialog.h"
#include "misc.h"
#include "spicefile.h"
#include "main.h"
#include "qucs.h"
@ -278,28 +279,54 @@ void SpiceDialog::slotButtApply()
// -------------------------------------------------------------------------
void SpiceDialog::slotButtBrowse()
{
QString s = QFileDialog::getOpenFileName(this,
tr("Select a file"),
lastDir.isEmpty() ? QString(".") : lastDir,
tr("SPICE netlist") + QString(" (") + QucsSettings.spiceExtensions.join(" ") + QString(");;")
+ tr("All Files") + " (*.*)");
// current file name from the component properties
QString currFileName = FileEdit->text();
QFileInfo currFileInfo(currFileName);
// name of the schematic where component is instantiated (may be empty)
QFileInfo schematicFileInfo = Comp->getSchematic()->getFileInfo();
QString schematicFileName = schematicFileInfo.fileName();
// directory to use for the file open dialog
QString currDir;
if(s.isEmpty()) {
return;
if (!currFileName.isEmpty()) { // a file name is already defined
if (currFileInfo.isRelative()) { // but has no absolute path
if (!schematicFileName.isEmpty()) // if schematic has a filename
currDir = schematicFileInfo.absolutePath();
else // use the WorkDir path
currDir = lastDir.isEmpty() ? QucsSettings.QucsWorkDir.absolutePath() : lastDir;
} else { // current file name is absolute
currDir = currFileInfo.exists() ? currFileInfo.absolutePath() : QucsSettings.QucsWorkDir.absolutePath();
}
} else { // a file name is not defined
if (!schematicFileName.isEmpty()) { // if schematic has a filename
currDir = schematicFileInfo.absolutePath();
} else { // use the WorkDir path
currDir = lastDir.isEmpty() ? QucsSettings.QucsWorkDir.absolutePath() : lastDir;
}
}
QFileInfo Info(s);
lastDir = Info.absolutePath(); // remember last directory
QString s = QFileDialog::getOpenFileName (
this,
tr("Select a file"),
currDir,
tr("SPICE netlist") + QString(" (") + QucsSettings.spiceExtensions.join(" ") + QString(");;")
+ tr("All Files") + " (*.*)");
// snip path if file in current directory
if(QucsSettings.QucsWorkDir.exists(Info.fileName()) &&
QucsSettings.QucsWorkDir.absolutePath() == Info.absolutePath()) {
s = Info.fileName();
if(!s.isEmpty()) {
// 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();
}
FileEdit->setText(s);
Comp->Props.at(1)->Value = "";
loadSpiceNetList(s);
}
FileEdit->setText(s);
Comp->Props.at(1)->Value = "";
loadSpiceNetList(s);
}
// -------------------------------------------------------------------------
@ -318,7 +345,8 @@ bool SpiceDialog::loadSpiceNetList(const QString& s)
{
Comp->withSim = false;
if(s.isEmpty()) return false;
QFileInfo FileInfo(QucsSettings.QucsWorkDir, s);
QString absFileName = misc::properAbsFileName(s, Doc);
QFileInfo FileInfo(QucsSettings.QucsWorkDir, absFileName);
NodesList->clear();
PortsList->clear();
@ -358,7 +386,7 @@ bool SpiceDialog::loadSpiceNetList(const QString& s)
spiceArgs.append(FileInfo.filePath());
QFile PrepFile;
QFileInfo PrepInfo(QucsSettings.QucsWorkDir, s + ".pre");
QFileInfo PrepInfo(QucsSettings.QucsWorkDir, absFileName + ".pre");
QString PrepName = PrepInfo.filePath();
if (!piping)
@ -420,7 +448,7 @@ bool SpiceDialog::loadSpiceNetList(const QString& s)
QMessageBox::critical(this, tr("SPICE Preprocessor Error"), Error);
return false;
}
FileInfo = QFileInfo(QucsSettings.QucsWorkDir, s + ".pre");
FileInfo = QFileInfo(QucsSettings.QucsWorkDir, absFileName + ".pre");
}
if (QucsSettings.DefaultSimulator == spicecompat::simQucsator) {
@ -606,7 +634,7 @@ void SpiceDialog::slotGetNetlist()
// -------------------------------------------------------------------------
void SpiceDialog::slotButtEdit()
{
Doc->App->editFile(QucsSettings.QucsWorkDir.filePath(FileEdit->text()));
Doc->App->editFile(misc::properAbsFileName(FileEdit->text(), Doc));
}
// -------------------------------------------------------------------------

103
qucs/components/spicefile.cpp
View File

@ -168,108 +168,7 @@ QString SpiceFile::netlist()
// -------------------------------------------------------
QString SpiceFile::getSubcircuitFile()
{
// construct full filename
QString FileName = Props.getFirst()->Value;
if (FileName.isEmpty())
{
return misc::properAbsFileName(FileName);
}
QFileInfo FileInfo(FileName);
if (FileInfo.exists())
{
// the file must be an absolute path to a schematic file
return FileInfo.absoluteFilePath();
}
else
{
// get the complete base name (everything except the last '.'
// and whatever follows
QString baseName = FileInfo.completeBaseName();
// if only a file name is supplied, first check if it is in the
// same directory as the schematic file it is a part of
if (FileInfo.fileName () == FileName)
{
// the file has no path information, just the file name
if (containingSchematic)
{
// check if a file of the same name is in the same directory
// as the schematic file, if we have a pointer to it, in
// which case we use this one
QFileInfo schematicFileInfo = containingSchematic->getFileInfo ();
QString native_ext = FileInfo.suffix();
if (!native_ext.isEmpty()) {
QFileInfo localFileInfo (schematicFileInfo.canonicalPath ()
+ "/" + baseName + "." + native_ext);
if (localFileInfo.exists()) {
return localFileInfo.absoluteFilePath();
}
}
// if no extension given guess default extension
for (int i = 0; i < QucsSettings.spiceExtensions.count (); i++)
{
QString extension = QucsSettings.spiceExtensions[i];
extension.remove(0, 1); // take leading '*' out, issue with exits()
QFileInfo localFileInfo (schematicFileInfo.canonicalPath ()
+ "/" + baseName + extension);
if (localFileInfo.exists ())
{
// return the subcircuit saved in the same directory
// as the schematic file
return localFileInfo.absoluteFilePath();
}
else
{
/// \todo improve GUI/CLI error/warning
qCritical() << "Spice file not found:" << localFileInfo.absoluteFilePath();
}
}
}
}
// look up the hash table for the schematic file as
// it does not seem to be an absolute path, this will also
// search the home directory which is always hashed
QMutex mutex;
mutex.lock();
QString hashsearchresult = "";
// if GUI is running and has something in the hash
if ( (QucsMain != 0) && !QucsMain->spiceNameHash.isEmpty() )
hashsearchresult = QucsMain->spiceNameHash.value(baseName);
mutex.unlock();
if (hashsearchresult.isEmpty())
{
// the schematic was not found in the hash table, return
// what would always have been returned in this case
return misc::properAbsFileName(FileName);
}
else
{
// we found an entry in the hash table, check it actually still exists
FileInfo.setFile(hashsearchresult);
if (FileInfo.exists())
{
// it does exist so return the absolute file path
return FileInfo.absoluteFilePath();
}
else
{
// the schematic file does not actually exist, return
// what would always have been returned in this case
return misc::properAbsFileName(FileName);
}
}
}
return misc::properAbsFileName(Props.getFirst()->Value, containingSchematic);
}
// -------------------------------------------------------------------------

80
qucs/components/subcircuit.cpp
View File

@ -305,83 +305,5 @@ QString Subcircuit::verilogCode(int)
// -------------------------------------------------------
QString Subcircuit::getSubcircuitFile()
{
// construct full filename
QString FileName = Props.getFirst()->Value;
if (FileName.isEmpty())
{
return misc::properAbsFileName(FileName);
}
QFileInfo FileInfo(FileName);
if (FileInfo.exists())
{
// the file must be an absolute path to a schematic file
return FileInfo.absoluteFilePath();
}
else
{
// get the complete base name (everything except the last '.'
// and whatever follows
QString baseName = FileInfo.completeBaseName();
// if only a file name is supplied, first check if it is in the
// same directory as the schematic file it is a part of
if (FileInfo.fileName () == FileName)
{
// the file has no path information, just the file name
if (containingSchematic)
{
// check if a file of the same name is in the same directory
// as the schematic file, if we have a pointer to it, in
// which case we use this one
QFileInfo schematicFileInfo = containingSchematic->getFileInfo ();
QFileInfo localFIleInfo (schematicFileInfo.canonicalPath () + "/" + baseName + ".sch");
if (localFIleInfo.exists ())
{
// return the subcircuit saved in the same directory
// as the schematic file
return localFIleInfo.absoluteFilePath();
}
}
}
// look up the hash table for the schematic file as
// it does not seem to be an absolute path, this will also
// search the home directory which is always hashed
QMutex mutex;
mutex.lock();
QString hashsearchresult = "";
// check if GUI is running and there is something in the search path lookup
if ( (QucsMain != 0) && !QucsMain->schNameHash.isEmpty() )
hashsearchresult = QucsMain->schNameHash.value(baseName);
mutex.unlock();
if (hashsearchresult.isEmpty())
{
// the schematic was not found in the hash table, return
// what would always have been returned in this case
return misc::properAbsFileName(FileName);
}
else
{
// we found an entry in the hash table, check it actually still exists
FileInfo.setFile(hashsearchresult);
if (FileInfo.exists())
{
// it does exist so return the absolute file path
return FileInfo.absoluteFilePath();
}
else
{
// the schematic file does not actually exist, return
// what would always have been returned in this case
return misc::properAbsFileName(FileName);
}
}
}
return misc::properAbsFileName(Props.getFirst()->Value, containingSchematic);
}

4
qucs/dialogs/qucssettingsdialog.cpp
View File

@ -728,8 +728,8 @@ void QucsSettingsDialog::slotApply()
// update the schenatic filelist hash
QucsMain->updatePathList(currentPaths);
QucsMain->updateSchNameHash();
QucsMain->updateSpiceNameHash();
//QucsMain->updateSchNameHash();
//QucsMain->updateSpiceNameHash();
}

5
qucs/extsimkernels/spicecompat.cpp
View File

@ -255,6 +255,7 @@ QString spicecompat::normalize_node_name(QString nod) {
return (nod == "gnd") ? QString("0") : nod;
}
/*
QString spicecompat::convert_relative_filename(QString filename)
{
QFileInfo inf(filename);
@ -264,13 +265,13 @@ QString spicecompat::convert_relative_filename(QString filename)
inf.setFile(s);
return inf.exists() ? s : filename;
}
*/
int spicecompat::getPins(const QString &file, const QString &compname, QStringList &pin_names)
{
int r = 0;
QString content;
QString LibName = spicecompat::convert_relative_filename(file);
QFile f(LibName);
QFile f(file);
if (f.open(QIODevice::ReadOnly)) {
QTextStream ts(&f);
content = ts.readAll();

2
qucs/extsimkernels/spicecompat.h
View File

@ -21,7 +21,7 @@ namespace spicecompat {
bool containNodes(QStringList &tokens, QStringList &vars);
void convertNodeNames(QStringList &tokens, QString &sim);
QString normalize_node_name(QString nod);
QString convert_relative_filename(QString filename);
//QString convert_relative_filename(QString filename);
int getPins(const QString &file, const QString &compname, QStringList &pin_names);
QString getSubcktName(const QString& subfilename);
QString convert_sweep_type(const QString& sweep);

9
qucs/extsimkernels/xspice_cmbuilder.cpp
View File

@ -18,6 +18,7 @@
#include "xspice_cmbuilder.h"
#include "components/subcircuit.h"
#include "components/libcomp.h"
#include "misc.h"
#include "spicecomponents/xsp_cmlib.h"
#include "main.h"
@ -218,8 +219,8 @@ void XSPICE_CMbuilder::ExtractModIfsFiles(QStringList &objects, QStringList &lst
mod_lst.append(libpc->getAttachedMOD());
ifs_lst.append(libpc->getAttachedIFS());
} else {
mod_lst.append(spicecompat::convert_relative_filename(pc->Props.at(0)->Value));
ifs_lst.append(spicecompat::convert_relative_filename(pc->Props.at(1)->Value));
mod_lst.append(misc::properAbsFileName(pc->Props.at(0)->Value, Sch));
ifs_lst.append(misc::properAbsFileName(pc->Props.at(1)->Value, Sch));
}
QStringList::iterator mod = mod_lst.begin();
QStringList::iterator ifs = ifs_lst.begin();
@ -287,8 +288,8 @@ void XSPICE_CMbuilder::getModIfsFileList(QStringList &files)
{
for(Component *pc = Sch->DocComps.first(); pc != 0; pc = Sch->DocComps.next()) {
if (pc->Model=="XSP_CMod") {
files.append(spicecompat::convert_relative_filename(pc->Props.at(0)->Value));
files.append(spicecompat::convert_relative_filename(pc->Props.at(1)->Value));
files.append(misc::properAbsFileName(pc->Props.at(0)->Value, Sch));
files.append(misc::properAbsFileName(pc->Props.at(1)->Value, Sch));
}
if (pc->Model=="Lib") {
LibComp *libpc = (LibComp *)pc;

38
qucs/misc.cpp
View File

@ -26,6 +26,8 @@
#include <cmath>
#include "misc.h"
#include "main.h"
#include "qucs.h"
#include "schematic.h"
#include <cstdio>
#include <QString>
@ -355,21 +357,33 @@ void misc::convert2ASCII(QString& Text)
}
// #########################################################################
// Converts a path to an absolute path and resolves paths relative to the
// Qucs home directory
QString misc::properAbsFileName(const QString& Name)
// Converts a path to an absolute path
QString misc::properAbsFileName(const QString& filename, Schematic* sch)
{
QString s = Name;
QFileInfo Info(s);
QString fName = filename;
QFileInfo fileInfo(fName);
if(Info.isRelative())
{
// if it's a relative file, look for it relative to the
// working directory (the qucs home directory)
s = QucsSettings.QucsWorkDir.filePath(s);
if ( fileInfo.isAbsolute() ) {
if ( fileInfo.exists() ) return fileInfo.canonicalFilePath();
fName = fileInfo.fileName();
}
// return the clean path
return QDir::cleanPath(s);
if ( sch != nullptr ) {
fileInfo.setFile(sch->getFileInfo().dir().filePath(fName));
if ( fileInfo.exists() ) return fileInfo.canonicalFilePath();
}
fName = fileInfo.fileName();
fileInfo.setFile(QucsSettings.QucsWorkDir.filePath(fName));
if ( fileInfo.exists() ) return fileInfo.canonicalFilePath();
for (const QString& path : qucsPathList) {
fileInfo.setFile(QDir(path).filePath(fName));
if ( fileInfo.exists() ) return fileInfo.canonicalFilePath();
}
return filename;
}
// #########################################################################

4
qucs/misc.h
View File

@ -44,6 +44,8 @@ namespace qucs {
}
class Schematic;
namespace misc {
QString complexRect(double, double, int Precision=3);
QString complexDeg (double, double, int Precision=3);
@ -56,7 +58,7 @@ namespace misc {
void convert2Unicode(QString&);
void convert2ASCII(QString&);
QString properName(const QString&);
QString properAbsFileName(const QString&);
QString properAbsFileName(const QString&, Schematic* sch = nullptr);
QString properFileName(const QString&);
bool VHDL_Time(QString&, const QString&);
bool VHDL_Delay(QString&, const QString&);

25
qucs/qucs.cpp
View File

@ -15,8 +15,6 @@
* *
***************************************************************************/
#include "qlabel.h"
#include "qtabbar.h"
#ifdef HAVE_CONFIG_H
# include <config.h>
#endif
@ -57,8 +55,6 @@
#include "module.h"
#include "projectView.h"
#include "components/components.h"
#include "paintings/paintings.h"
#include "diagrams/diagrams.h"
#include "dialogs/savedialog.h"
#include "dialogs/newprojdialog.h"
#include "dialogs/settingsdialog.h"
@ -117,8 +113,8 @@ QucsApp::QucsApp()
tr("Spice Files") + QString(" (") + QucsSettings.spiceExtensions.join(" ") + QString(");;") +
tr("Any File")+" (*)";
updateSchNameHash();
updateSpiceNameHash();
//updateSchNameHash();
//updateSpiceNameHash();
move (QucsSettings.x, QucsSettings.y);
resize(QucsSettings.dx, QucsSettings.dy);
@ -1270,8 +1266,8 @@ void QucsApp::slotCMenuCopy()
//TODO: maybe require disable edit here
// refresh the schematic file path
this->updateSchNameHash();
this->updateSpiceNameHash();
//this->updateSchNameHash();
//this->updateSpiceNameHash();
slotUpdateTreeview();
}
@ -2102,8 +2098,8 @@ void QucsApp::slotApplSettings()
// --------------------------------------------------------------
void QucsApp::slotRefreshSchPath()
{
this->updateSchNameHash();
this->updateSpiceNameHash();
//this->updateSchNameHash();
//this->updateSpiceNameHash();
statusBar()->showMessage(tr("The schematic search path has been refreshed."), 2000);
}
@ -3248,7 +3244,7 @@ void QucsApp::slotUpdateTreeview()
{
Content->refresh();
}
/*
// -----------------------------------------------------------
// Searches the qucs path list for all schematic files and creates
// a hash for lookup later
@ -3277,7 +3273,6 @@ void QucsApp::updateSchNameHash(void)
// put each one in the hash table with the unique key the base name of
// the file, note this will overwrite the value if the key already exists
for (const QFileInfo& schfile : schfilesList) {
QString bn = schfile.completeBaseName();
schNameHash[schfile.completeBaseName()] = schfile.absoluteFilePath();
}
}
@ -3291,7 +3286,8 @@ void QucsApp::updateSchNameHash(void)
schNameHash[schfile.completeBaseName()] = schfile.absoluteFilePath();
}
}
*/
/*
// -----------------------------------------------------------
// Searches the qucs path list for all spice files and creates
// a hash for lookup later
@ -3318,7 +3314,6 @@ void QucsApp::updateSpiceNameHash()
// put each one in the hash table with the unique key the base name of
// the file, note this will overwrite the value if the key already exists
for (const QFileInfo& spicefile : spicefilesList) {
QString bn = spicefile.completeBaseName();
schNameHash[spicefile.completeBaseName()] = spicefile.absoluteFilePath();
}
}
@ -3332,7 +3327,7 @@ void QucsApp::updateSpiceNameHash()
spiceNameHash[spicefile.completeBaseName()] = spicefile.absoluteFilePath();
}
}
*/
// -----------------------------------------------------------
// update the list of paths, pruning non-existing paths
void QucsApp::updatePathList()

8
qucs/qucs.h
View File

@ -98,8 +98,8 @@ public:
static bool isTextDocument(QWidget *);
QString ProjName; // name of the project, that is open
QHash<QString,QString> schNameHash; // QHash for the schematic files lookup
QHash<QString,QString> spiceNameHash; // QHash for the spice files lookup
//QHash<QString,QString> schNameHash; // QHash for the schematic files lookup
//QHash<QString,QString> spiceNameHash; // QHash for the spice files lookup
QLineEdit *editText; // for edit component properties on schematic
SearchDialog *SearchDia; // global in order to keep values
@ -284,8 +284,8 @@ public:
void readProjects();
void updatePathList(void); // update the list of paths, pruning non-existing paths
void updatePathList(QStringList);
void updateSchNameHash(void); // maps all schematic files in the path list
void updateSpiceNameHash(void); // maps all spice files in the path list
//void updateSchNameHash(void); // maps all schematic files in the path list
//void updateSpiceNameHash(void); // maps all spice files in the path list
/* **************************************************
***** The following methods are located in *****

6
qucs/schematic.cpp
View File

@ -1690,8 +1690,8 @@ int Schematic::save()
undoSymbol.at(undoSymbolIdx)->replace(1, 1, 'i');
}
// update the subcircuit file lookup hashes
QucsMain->updateSchNameHash();
QucsMain->updateSpiceNameHash();
//QucsMain->updateSchNameHash();
//QucsMain->updateSpiceNameHash();
return result;
}
@ -2610,4 +2610,4 @@ bool Schematic::checkDplAndDatNames()
return false;
}
return false;
}
}

3
qucs/spicecomponents/sp_include.cpp
View File

@ -16,6 +16,7 @@
***************************************************************************/
#include "sp_include.h"
#include "main.h"
#include "misc.h"
#include <QFontMetrics>
@ -82,7 +83,7 @@ QString S4Q_Include::getSpiceModel()
for (Property *pp : Props) {
QString val = pp->Value;
if (!val.isEmpty()) {
val = spicecompat::convert_relative_filename(val);
val = misc::properAbsFileName(val, containingSchematic);
switch (QucsSettings.DefaultSimulator) {
case spicecompat::simSpiceOpus: // Spice Opus doesn't support quotes
s += QString("%1 %2\n").arg(SpiceModel).arg(val);

15
qucs/spicecomponents/sp_lib.cpp
View File

@ -16,7 +16,7 @@
***************************************************************************/
#include "sp_lib.h"
#include "main.h"
#include "misc.h"
#include <QFontMetrics>
S4Q_Lib::S4Q_Lib()
@ -72,14 +72,17 @@ Element* S4Q_Lib::info(QString& Name, char* &BitmapFile, bool getNewOne)
QString S4Q_Lib::getSpiceModel()
{
if (isActive != COMP_IS_ACTIVE) return QString("");
QString s;
s.clear();
if (isActive != COMP_IS_ACTIVE) return QString("");
QString s;
s.clear();
QString file = getProperty("File")->Value;
QString file = getProperty("File")->Value;
if ( !file.isEmpty() ){
file = misc::properAbsFileName(file, containingSchematic);
QString sec = getProperty("Section")->Value;
s += QString("%1 \"%2\" %3\n").arg(SpiceModel).arg(file).arg(sec);
}
return s;
return s;
}

7
qucs/spicecomponents/spicelibcomp.cpp
View File

@ -90,7 +90,7 @@ void SpiceLibComp::createSymbol()
FileName += QString("/../share/" QUCS_NAME "/symbols/%1.sym").arg(Props.at(2)->Value);
// Default symbol: LM358 in opamps.lib ---> opamps/LM358.sym
QString LibName = spicecompat::convert_relative_filename(Props.at(0)->Value);
QString LibName = misc::properAbsFileName(Props.at(0)->Value, containingSchematic);
QString DefSym = LibName;
QFileInfo inf(LibName); // Remove extension
int l = inf.suffix().size();
@ -108,7 +108,7 @@ void SpiceLibComp::createSymbol()
removeUnusedPorts();
} else {
QStringList pins;
No = spicecompat::getPins(Props.at(0)->Value,Props.at(1)->Value,pins);
No = spicecompat::getPins(LibName,Props.at(1)->Value,pins);
Ports.clear();
remakeSymbol(No,pins); // no symbol was found -> create standard symbol
}
@ -225,7 +225,8 @@ QString SpiceLibComp::spice_netlist(bool)
QString SpiceLibComp::getSpiceModel()
{
QString f = spicecompat::convert_relative_filename(Props.at(0)->Value);
if (isActive != COMP_IS_ACTIVE) return QString("");
QString f = misc::properAbsFileName(Props.at(0)->Value, containingSchematic);
QString s = QString(".INCLUDE \"%1\"\n").arg(f);
return s;
}

3
qucs/spicecomponents/xsp_cmlib.cpp
View File

@ -16,6 +16,7 @@
***************************************************************************/
#include "xsp_cmlib.h"
#include "main.h"
#include "misc.h"
#include <QFontMetrics>
@ -78,7 +79,7 @@ QString XSP_CMlib::getSpiceInit()
s.clear();
for (Property *pp : Props) {
if (!pp->Value.isEmpty()) {
QString f = spicecompat::convert_relative_filename(pp->Value);
QString f = misc::properAbsFileName(pp->Value, containingSchematic);
s += "codemodel " + f + "\n";
}
}