diff --git a/OpenRoadEd/Qt/SettingsWidgets/SettingsRoadSignal.cpp b/OpenRoadEd/Qt/SettingsWidgets/SettingsRoadSignal.cpp index 6d9bc594c6f55093bd2cf3fc1c6014970fbca777..a80f0037083787710abf02903244515a694704f4 100644 --- a/OpenRoadEd/Qt/SettingsWidgets/SettingsRoadSignal.cpp +++ b/OpenRoadEd/Qt/SettingsWidgets/SettingsRoadSignal.cpp @@ -67,7 +67,11 @@ SettingsRoadSignal::SettingsRoadSignal(OpenDrive *openDrive) mTypeMap["max vel"]="274"; mType->insertItem(14,tr("semaphore")); mTypeMap["semaphore"]="1000001"; - mType->insertItem(15,tr("unkown")); + mType->insertItem(15,tr("generic_loc")); + mTypeMap["generic_loc"]="1000"; + mType->insertItem(16,tr("global_loc")); + mTypeMap["global_loc"]="1001"; + mType->insertItem(17,tr("unkown")); mTypeMap["unknown"]="???"; mSubType = new QLineEdit; mValue = new QLineEdit; @@ -196,8 +200,12 @@ void SettingsRoadSignal::LoadData(Signal *signal) mType->setCurrentIndex(13); else if(signal->GetType()=="1000001") mType->setCurrentIndex(14); - else + else if(signal->GetType()=="1000") mType->setCurrentIndex(15); + else if(signal->GetType()=="1001") + mType->setCurrentIndex(16); + else + mType->setCurrentIndex(17); mSubType->setText(signal->GetSubType().c_str()); mValue->setText(QString("%1").arg(signal->GetValue())); diff --git a/Resources/Billboards/1000.jpg b/Resources/Billboards/1000.jpg new file mode 100644 index 0000000000000000000000000000000000000000..dd95afa2a297986b53d4d77b3712ec1a424039af Binary files /dev/null and b/Resources/Billboards/1000.jpg differ diff --git a/Resources/Billboards/1001.jpg b/Resources/Billboards/1001.jpg new file mode 100644 index 0000000000000000000000000000000000000000..9d6bd193867b7a210f86a6cd55e13a82945077df Binary files /dev/null and b/Resources/Billboards/1001.jpg differ diff --git a/Resources/resources.qrc b/Resources/resources.qrc index 7dd1c347c3feb480102ea179d4f818b9facde727..57cc6947e1467b9b3c0347dfdf494060520e750a 100644 --- a/Resources/resources.qrc +++ b/Resources/resources.qrc @@ -1,6 +1,8 @@ <!DOCTYPE RCC><RCC version="1.0"> <qresource> <file>Billboards/1000001.jpg</file> + <file>Billboards/1000.jpg</file> + <file>Billboards/1001.jpg</file> <file>Billboards/Signal.jpg</file> <file>Billboards/274.jpg</file> <file>Billboards/JunctionController.jpg</file>