kotschak/qelectrotech-source-mirror
0
0
Fork 0
mirror of https://github.com/qelectrotech/qelectrotech-source-mirror.git synced 2026-10-03 17:34:12 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Honour --common-elements-dir and the other folder options in headless runs

Browse Source 
Reported on #1178. Two things kept --common-elements-dir from working for
--run and the command-line export:

- main() runs both before QETApp exists, and only QETApp::parseArguments()
  applied the folder options, so they were ignored. The application of
  those options is now QETApp::applyDirectoryArguments(), static, and the
  two headless branches call it too. They also drop the options from the
  arguments they pass on: the export reads its project and output by
  position, so "--export-pdf --common-elements-dir=X p.qet out.pdf" took
  the option for the project ("Project not found").
- commonElementsDir() read the saved collection path before the
  command-line one, so a user's own setting beat a folder given for this
  run. The command line now comes first, in the GUI too.

Tested with a --run script adding a symbol that exists only in a given
folder: master fails with or without a saved collection path; this
resolves it, before or after --run, and over a saved path to another
folder. Without the option it still fails, and a saved path to the
folder still works.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01ELKpbGxqJd7EFiTUypBtVe
This commit is contained in:
ispyisail
2026-10-03 09:33:24 +13:00
parent 25084a44da
commit 5ed5eb82ee
3 changed files with 73 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sources/qetapp.cpp
+46 -32
View File
@@ -658,6 +658,15 @@ QString QETApp::commonElementsDir()
{
m_common_element_dir_is_set = true;
#ifdef QET_ALLOW_OVERRIDE_CED_OPTION
//A folder given on the command line, for this run, comes
//before the one saved in the settings.
if (m_overrided_common_elements_dir != QString()) {
m_common_element_dir = m_overrided_common_elements_dir;
return(m_common_element_dir);
}
#endif
//Check if user define a custom path
//for the common collection
QSettings settings;
@@ -674,12 +683,6 @@ QString QETApp::commonElementsDir()
}
}
#ifdef QET_ALLOW_OVERRIDE_CED_OPTION
if (m_overrided_common_elements_dir != QString()) {
m_common_element_dir = m_overrided_common_elements_dir;
return(m_common_element_dir);
}
#endif
#ifndef QET_COMMON_COLLECTION_PATH
/* in the absence of a compilation option,
* we use the elements folder, located next to the executable binary
@@ -2389,6 +2392,42 @@ QList<QWidget *> QETApp::floatingToolbarsAndDocksForMainWindow(
}
/**
@brief QETApp::applyDirectoryArguments
Apply the folder options (--common-elements-dir=, --common-tbt-dir=,
--config-dir=, --data-dir=, --lang-dir=) of @p arguments. Static, so
the headless export and --run in main() can apply them too: they
return before a QETApp exists.
*/
void QETApp::applyDirectoryArguments(const QETArguments &arguments)
{
#ifdef QET_ALLOW_OVERRIDE_CED_OPTION
if (arguments.commonElementsDirSpecified()) {
overrideCommonElementsDir(arguments.commonElementsDir());
}
#endif
#ifdef QET_ALLOW_OVERRIDE_CTBTD_OPTION
if (arguments.commonTitleBlockTemplatesDirSpecified()) {
overrideCommonTitleBlockTemplatesDir(
arguments.commonTitleBlockTemplatesDir());
}
#endif
#ifdef QET_ALLOW_OVERRIDE_CD_OPTION
if (arguments.configDirSpecified()) {
overrideConfigDir(arguments.configDir());
}
#endif
#ifdef QET_ALLOW_OVERRIDE_DD_OPTION
if (arguments.dataDirSpecified()) {
overrideDataDir(arguments.dataDir());
}
#endif
if (arguments.langDirSpecified()) {
overrideLangDir(arguments.langDir());
}
}
/**
@brief QETApp::parseArguments
Parse the following arguments:
@@ -2430,32 +2469,7 @@ void QETApp::parseArguments()
// analyze the arguments
// analyse les arguments
qet_arguments_ = QETArguments(arguments_list);
#ifdef QET_ALLOW_OVERRIDE_CED_OPTION
if (qet_arguments_.commonElementsDirSpecified()) {
overrideCommonElementsDir(qet_arguments_.commonElementsDir());
}
#endif
#ifdef QET_ALLOW_OVERRIDE_CTBTD_OPTION
if (qet_arguments_.commonTitleBlockTemplatesDirSpecified()) {
overrideCommonTitleBlockTemplatesDir(
qet_arguments_.commonTitleBlockTemplatesDir());
}
#endif
#ifdef QET_ALLOW_OVERRIDE_CD_OPTION
if (qet_arguments_.configDirSpecified()) {
overrideConfigDir(qet_arguments_.configDir());
}
#endif
#ifdef QET_ALLOW_OVERRIDE_DD_OPTION
if (qet_arguments_.dataDirSpecified()) {
overrideDataDir(qet_arguments_.dataDir());
}
#endif
if (qet_arguments_.langDirSpecified()) {
overrideLangDir(qet_arguments_.langDir());
}
applyDirectoryArguments(qet_arguments_);
if (qet_arguments_.printLicenseRequested()) {
printLicense();