Skip to content

Commit

Permalink
Fixed #12395
Browse files Browse the repository at this point in the history
  • Loading branch information
@palvarezlopez
palvarezlopez committed Nov 13, 2023
1 parent 56501d5 commit c969f67
Show file tree
Hide file tree
Showing 2 changed files with 63 additions and 48 deletions.
108 changes: 60 additions & 48 deletions src/netedit/GNEApplicationWindow.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4812,19 +4812,22 @@ GNEApplicationWindow::loadAdditionalElements() {
myUndoList->begin(Supermode::NETWORK, GUIIcon::SUPERMODENETWORK, TL("loading additional elements from '") + toString(additionalFiles) + "'");
// iterate over every additional file
for (const auto& file : additionalFiles) {
WRITE_MESSAGE(TL("loading additionals from '") + file + "'");
// declare general handler
GNEGeneralHandler handler(myNet, file, true, false);
// disable validation for additionals
XMLSubSys::setValidation("never", "auto", "auto");
// Run parser
if (!handler.parse()) {
WRITE_ERRORF(TL("Loading of % failed."), file);
// check if ignore missing imputs
if (FileHelpers::isReadable(file) || !neteditOptions.getBool("ignore-missing-inputs")) {
WRITE_MESSAGE(TL("loading additionals from '") + file + "'");
// declare general handler
GNEGeneralHandler handler(myNet, file, true, false);
// disable validation for additionals
XMLSubSys::setValidation("never", "auto", "auto");
// Run parser
if (!handler.parse()) {
WRITE_ERRORF(TL("Loading of % failed."), file);
}
// set additionals in SumoConfig
setInputInSumoOptions(false, false);
// disable validation for additionals
XMLSubSys::setValidation("auto", "auto", "auto");
}
// set additionals in SumoConfig
setInputInSumoOptions(false, false);
// disable validation for additionals
XMLSubSys::setValidation("auto", "auto", "auto");
}
// end undo list
myUndoList->end();
Expand Down Expand Up @@ -4853,19 +4856,22 @@ GNEApplicationWindow::loadDemandElements() {
myUndoList->begin(Supermode::DEMAND, GUIIcon::SUPERMODEDEMAND, TL("loading demand elements from '") + toString(demandFiles) + "'");
// iterate over every additional file
for (const auto& file : demandFiles) {
WRITE_MESSAGE(TL("loading demand elements from '") + file + "'");
// declare general handler
GNEGeneralHandler handler(myNet, file, true, false);
// disable validation for additionals
XMLSubSys::setValidation("never", "auto", "auto");
// Run parser
if (!handler.parse()) {
WRITE_ERRORF(TL("Loading of % failed."), file);
// check if ignore missing imputs
if (FileHelpers::isReadable(file) || !neteditOptions.getBool("ignore-missing-inputs")) {
WRITE_MESSAGE(TL("loading demand elements from '") + file + "'");
// declare general handler
GNEGeneralHandler handler(myNet, file, true, false);
// disable validation for additionals
XMLSubSys::setValidation("never", "auto", "auto");
// Run parser
if (!handler.parse()) {
WRITE_ERRORF(TL("Loading of % failed."), file);
}
// set additionals in SumoConfig
setInputInSumoOptions(false, false);
// disable validation for additionals
XMLSubSys::setValidation("auto", "auto", "auto");
}
// set additionals in SumoConfig
setInputInSumoOptions(false, false);
// disable validation for additionals
XMLSubSys::setValidation("auto", "auto", "auto");
}
// end undo list
myUndoList->end();
Expand All @@ -4888,19 +4894,22 @@ GNEApplicationWindow::loadMeanDataElements() {
myUndoList->begin(Supermode::DATA, GUIIcon::MODEMEANDATA, TL("loading meanDatas from '") + toString(meanDataFiles) + "'");
// iterate over every additional file
for (const auto& file : meanDataFiles) {
WRITE_MESSAGE(TL("loading meandatas from '") + file + "'");
// declare general handler
GNEGeneralHandler handler(myNet, file, true, false);
// disable validation for additionals
XMLSubSys::setValidation("never", "auto", "auto");
// Run parser
if (!handler.parse()) {
WRITE_ERRORF(TL("Loading of % failed."), file);
// check if ignore missing imputs
if (FileHelpers::isReadable(file) || !neteditOptions.getBool("ignore-missing-inputs")) {
WRITE_MESSAGE(TL("loading meandatas from '") + file + "'");
// declare general handler
GNEGeneralHandler handler(myNet, file, true, false);
// disable validation for additionals
XMLSubSys::setValidation("never", "auto", "auto");
// Run parser
if (!handler.parse()) {
WRITE_ERRORF(TL("Loading of % failed."), file);
}
// set additionals in sumo options
setInputInSumoOptions(false, false);
// disable validation for additionals
XMLSubSys::setValidation("auto", "auto", "auto");
}
// set additionals in sumo options
setInputInSumoOptions(false, false);
// disable validation for additionals
XMLSubSys::setValidation("auto", "auto", "auto");
}
// end undo list
myUndoList->end();
Expand All @@ -4921,19 +4930,22 @@ GNEApplicationWindow::loadDataElements() {
// begin undolist
myUndoList->begin(Supermode::DATA, GUIIcon::SUPERMODEDATA, TL("loading data elements from '") + toString(dataFiles) + "'");
// iterate over every data file
for (const auto& dataFile : dataFiles) {
WRITE_MESSAGE(TL("Loading data elements from '") + dataFile + "'");
GNEDataHandler dataHandler(myNet, dataFile, true, false);
// disable validation for data elements
XMLSubSys::setValidation("never", "auto", "auto");
if (!dataHandler.parse()) {
WRITE_ERRORF(TL("Loading of % failed."), dataFile);
for (const auto& file : dataFiles) {
// check if ignore missing imputs
if (FileHelpers::isReadable(file) || !neteditOptions.getBool("ignore-missing-inputs")) {
WRITE_MESSAGE(TL("Loading data elements from '") + file + "'");
GNEDataHandler dataHandler(myNet, file, true, false);
// disable validation for data elements
XMLSubSys::setValidation("never", "auto", "auto");
if (!dataHandler.parse()) {
WRITE_ERRORF(TL("Loading of % failed."), file);
}
// set first dataElementsFiles as default file
neteditOptions.resetWritable();
neteditOptions.set("data-files", file);
// disable validation for data elements
XMLSubSys::setValidation("auto", "auto", "auto");
}
// set first dataElementsFiles as default file
neteditOptions.resetWritable();
neteditOptions.set("data-files", dataFile);
// disable validation for data elements
XMLSubSys::setValidation("auto", "auto", "auto");
}
// end undolist
myUndoList->end();
Expand Down
3 changes: 3 additions & 0 deletions src/netedit/GNELoadThread.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -300,6 +300,9 @@ GNELoadThread::fillOptions(OptionsCont& neteditOptions) {
neteditOptions.addSynonyme("meandata-files", "meandata");
neteditOptions.addDescription("meandata-files", "Input", TL("Load meanData descriptions from FILE(s)"));

neteditOptions.doRegister("ignore-missing-inputs", new Option_Bool(false));
neteditOptions.addDescription("ignore-missing-inputs", "Input", TL("Reset path values (additional, route, data...) after loading netedit config"));

// TOPIC: Output

neteditOptions.doRegister("tls-file", new Option_String());
Expand Down

0 comments on commit c969f67

Please sign in to comment.