Skip to content

Show empty required object-list fields with warning icon, remove unused IGdefaultRemoved slot #780

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jmarrec merged 1 commit into from
Jan 6, 2025
Merged

Show empty required object-list fields with warning icon, remove unused IGdefaultRemoved slot #780

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 5 additions & 9 deletions src/model_editor/InspectorGadget.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -789,9 +789,12 @@ void InspectorGadget::layoutComboBox(QVBoxLayout* layout, QWidget* parent, opens
int idx = combo->findText(curVal.c_str(), Qt::MatchFixedString);

if (-1 == idx) {

// field is currently set to an invalid value
idx = 0;
connect(combo, static_cast<void (QComboBox::*)(const QString&)>(&QComboBox::currentTextChanged), this, &InspectorGadget::IGdefaultRemoved);
Copy link
Collaborator Author

@macumber macumber Jan 3, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The IGdefaultRemoved slot was only connected in this case and it was being called directly from InspectorGadget::layoutComboBox at line 808 combo->setCurrentIndex(idx). This means that the slot was called before the user had a chance to do anything, so it was effectively useless.

//QString errormsg("We have a value:");
combo->insertItem(idx, QPixmap(":/images/alert_image.png"), curVal.c_str(), "Invalid");

//QString errormsg("We have a value:");
//errormsg += curVal.c_str();
//errormsg += " that does not match the allowable values in the idd.Name:";
//errormsg += name.c_str();
Expand Down Expand Up @@ -887,13 +890,6 @@ void InspectorGadget::checkRemoveBtn(QPushButton* btn) {
}

//SLOTS
void InspectorGadget::IGdefaultRemoved(const QString& /*unused*/) {
QObject* source = sender();
auto* w = dynamic_cast<QWidget*>(source);
w->setStyleSheet("color:black");
// using old style disconnect here
disconnect(source, nullptr, this, SLOT(IGdefaultRemoved(const QString&)));
}

void InspectorGadget::IGvalueChanged(const QString& value) {
OS_ASSERT(m_workspaceObj);
Expand Down
10 changes: 0 additions & 10 deletions src/model_editor/InspectorGadget.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,16 +160,6 @@ class MODELEDITOR_API InspectorGadget
*/
void clear(bool recursive);

/*! \brief changes the color of widgets
*
* When widget are built, if the Field is required but there is no value and no default value
*(which in a way, is bad idf) the IG will put 0 or 0.0 in there for you, but color it red
* to point out that you should address this. Once you set a value, this function is automatically
* called for you and sets the color back to black.
*
*/
void IGdefaultRemoved(const QString&);

void IGvalueChanged(const QString&);

void IGcommentChanged(const QString&);
Expand Down
30 changes: 24 additions & 6 deletions translations/OpenStudioApp_ar.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/model_editor/InspectorGadget.cpp" line="856"/>
<location filename="../src/model_editor/InspectorGadget.cpp" line="859"/>
<source>Add/Remove Extensible Groups</source>
<translation type="unfinished"></translation>
</message>
Expand Down Expand Up @@ -740,24 +740,24 @@ If you would like to see the OpenStudioApplication translated in your language o
<context>
<name>openstudio::MeasureManager</name>
<message>
<location filename="../src/shared_gui_components/MeasureManager.cpp" line="974"/>
<location filename="../src/shared_gui_components/MeasureManager.cpp" line="990"/>
<location filename="../src/shared_gui_components/MeasureManager.cpp" line="976"/>
<location filename="../src/shared_gui_components/MeasureManager.cpp" line="992"/>
<source>Measures Updated</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/shared_gui_components/MeasureManager.cpp" line="974"/>
<location filename="../src/shared_gui_components/MeasureManager.cpp" line="976"/>
<source>All measures are up-to-date.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/shared_gui_components/MeasureManager.cpp" line="977"/>
<location filename="../src/shared_gui_components/MeasureManager.cpp" line="979"/>
<source> measures have been updated on BCL compared to your local BCL directory.
</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/shared_gui_components/MeasureManager.cpp" line="978"/>
<location filename="../src/shared_gui_components/MeasureManager.cpp" line="980"/>
<source>Would you like update them?</source>
<translation type="unfinished"></translation>
</message>
Expand Down Expand Up @@ -1145,6 +1145,24 @@ Would you like to Restore library paths to default values or Open the library se
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>openstudio::PathInputView</name>
<message>
<location filename="../src/shared_gui_components/EditView.cpp" line="466"/>
<source>Open Directory</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/shared_gui_components/EditView.cpp" line="469"/>
<source>Open Read File</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/shared_gui_components/EditView.cpp" line="471"/>
<source>Select Save File</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>openstudio::PeopleDefinitionInspectorView</name>
<message>
Expand Down
30 changes: 24 additions & 6 deletions translations/OpenStudioApp_ca.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
<translation>Autocalcular</translation>
</message>
<message>
<location filename="../src/model_editor/InspectorGadget.cpp" line="856"/>
<location filename="../src/model_editor/InspectorGadget.cpp" line="859"/>
<source>Add/Remove Extensible Groups</source>
<translation>Afegir/Eliminat Grups Extensibles</translation>
</message>
Expand Down Expand Up @@ -832,24 +832,24 @@ Si voleu que OpeStudioApplication estigui a la vostra llengua, esperem la vostra
<context>
<name>openstudio::MeasureManager</name>
<message>
<location filename="../src/shared_gui_components/MeasureManager.cpp" line="974"/>
<location filename="../src/shared_gui_components/MeasureManager.cpp" line="990"/>
<location filename="../src/shared_gui_components/MeasureManager.cpp" line="976"/>
<location filename="../src/shared_gui_components/MeasureManager.cpp" line="992"/>
<source>Measures Updated</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/shared_gui_components/MeasureManager.cpp" line="974"/>
<location filename="../src/shared_gui_components/MeasureManager.cpp" line="976"/>
<source>All measures are up-to-date.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/shared_gui_components/MeasureManager.cpp" line="977"/>
<location filename="../src/shared_gui_components/MeasureManager.cpp" line="979"/>
<source> measures have been updated on BCL compared to your local BCL directory.
</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/shared_gui_components/MeasureManager.cpp" line="978"/>
<location filename="../src/shared_gui_components/MeasureManager.cpp" line="980"/>
<source>Would you like update them?</source>
<translation type="unfinished"></translation>
</message>
Expand Down Expand Up @@ -1275,6 +1275,24 @@ Would you like to Restore library paths to default values or Open the library se
Voldries Restaurar els valors per defecte dels camins de les llibrerires o Obrir-ne la configuració per canviar-ho manualment?</translation>
</message>
</context>
<context>
<name>openstudio::PathInputView</name>
<message>
<location filename="../src/shared_gui_components/EditView.cpp" line="466"/>
<source>Open Directory</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/shared_gui_components/EditView.cpp" line="469"/>
<source>Open Read File</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/shared_gui_components/EditView.cpp" line="471"/>
<source>Select Save File</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>openstudio::PeopleDefinitionInspectorView</name>
<message>
Expand Down
30 changes: 24 additions & 6 deletions translations/OpenStudioApp_de.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
<translation>Automatisch berechnet</translation>
</message>
<message>
<location filename="../src/model_editor/InspectorGadget.cpp" line="856"/>
<location filename="../src/model_editor/InspectorGadget.cpp" line="859"/>
<source>Add/Remove Extensible Groups</source>
<translation>Hinzufügen/Entfernen von erweiterbaren Gruppen</translation>
</message>
Expand Down Expand Up @@ -840,24 +840,24 @@ Wenn Sie möchten, dass die OpenStudio-Applikation in die Sprache Ihrer Wahl üb
<context>
<name>openstudio::MeasureManager</name>
<message>
<location filename="../src/shared_gui_components/MeasureManager.cpp" line="974"/>
<location filename="../src/shared_gui_components/MeasureManager.cpp" line="990"/>
<location filename="../src/shared_gui_components/MeasureManager.cpp" line="976"/>
<location filename="../src/shared_gui_components/MeasureManager.cpp" line="992"/>
<source>Measures Updated</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/shared_gui_components/MeasureManager.cpp" line="974"/>
<location filename="../src/shared_gui_components/MeasureManager.cpp" line="976"/>
<source>All measures are up-to-date.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/shared_gui_components/MeasureManager.cpp" line="977"/>
<location filename="../src/shared_gui_components/MeasureManager.cpp" line="979"/>
<source> measures have been updated on BCL compared to your local BCL directory.
</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/shared_gui_components/MeasureManager.cpp" line="978"/>
<location filename="../src/shared_gui_components/MeasureManager.cpp" line="980"/>
<source>Would you like update them?</source>
<translation type="unfinished"></translation>
</message>
Expand Down Expand Up @@ -1285,6 +1285,24 @@ Would you like to Restore library paths to default values or Open the library se
Möchten Sie die Bibliothekspfade auf die Standardwerte zurücksetzen oder öffnen Sie die Bibliothekseinstellungen, um die Einstellungen manuell zu ändern?</translation>
</message>
</context>
<context>
<name>openstudio::PathInputView</name>
<message>
<location filename="../src/shared_gui_components/EditView.cpp" line="466"/>
<source>Open Directory</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/shared_gui_components/EditView.cpp" line="469"/>
<source>Open Read File</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/shared_gui_components/EditView.cpp" line="471"/>
<source>Select Save File</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>openstudio::PeopleDefinitionInspectorView</name>
<message>
Expand Down
30 changes: 24 additions & 6 deletions translations/OpenStudioApp_el.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
<translation>Αυτόματος υπολογισμός</translation>
</message>
<message>
<location filename="../src/model_editor/InspectorGadget.cpp" line="856"/>
<location filename="../src/model_editor/InspectorGadget.cpp" line="859"/>
<source>Add/Remove Extensible Groups</source>
<translation>Προσθήκη/Κατάργηση επεκτάσιμων ομάδων</translation>
</message>
Expand Down Expand Up @@ -830,24 +830,24 @@ If you would like to see the OpenStudioApplication translated in your language o
<context>
<name>openstudio::MeasureManager</name>
<message>
<location filename="../src/shared_gui_components/MeasureManager.cpp" line="974"/>
<location filename="../src/shared_gui_components/MeasureManager.cpp" line="990"/>
<location filename="../src/shared_gui_components/MeasureManager.cpp" line="976"/>
<location filename="../src/shared_gui_components/MeasureManager.cpp" line="992"/>
<source>Measures Updated</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/shared_gui_components/MeasureManager.cpp" line="974"/>
<location filename="../src/shared_gui_components/MeasureManager.cpp" line="976"/>
<source>All measures are up-to-date.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/shared_gui_components/MeasureManager.cpp" line="977"/>
<location filename="../src/shared_gui_components/MeasureManager.cpp" line="979"/>
<source> measures have been updated on BCL compared to your local BCL directory.
</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/shared_gui_components/MeasureManager.cpp" line="978"/>
<location filename="../src/shared_gui_components/MeasureManager.cpp" line="980"/>
<source>Would you like update them?</source>
<translation type="unfinished"></translation>
</message>
Expand Down Expand Up @@ -1272,6 +1272,24 @@ Would you like to Restore library paths to default values or Open the library se
Θέλετε να επαναφέρετε διαδρομές βιβλιοθήκης σε προεπιλεγμένες τιμές ή να ανοίξετε τις ρυθμίσεις της βιβλιοθήκης για να τις αλλάξετε χειροκίνητα?</translation>
</message>
</context>
<context>
<name>openstudio::PathInputView</name>
<message>
<location filename="../src/shared_gui_components/EditView.cpp" line="466"/>
<source>Open Directory</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/shared_gui_components/EditView.cpp" line="469"/>
<source>Open Read File</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/shared_gui_components/EditView.cpp" line="471"/>
<source>Select Save File</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>openstudio::PeopleDefinitionInspectorView</name>
<message>
Expand Down
30 changes: 24 additions & 6 deletions translations/OpenStudioApp_es.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
<translation>Auto Calcular</translation>
</message>
<message>
<location filename="../src/model_editor/InspectorGadget.cpp" line="856"/>
<location filename="../src/model_editor/InspectorGadget.cpp" line="859"/>
<source>Add/Remove Extensible Groups</source>
<translation>Añadir/Remover Grupos Extendibles</translation>
</message>
Expand Down Expand Up @@ -831,24 +831,24 @@ Si le gustaría ver la AplicaciónOpenStudio traducido a algun otro lenguaje, le
<context>
<name>openstudio::MeasureManager</name>
<message>
<location filename="../src/shared_gui_components/MeasureManager.cpp" line="974"/>
<location filename="../src/shared_gui_components/MeasureManager.cpp" line="990"/>
<location filename="../src/shared_gui_components/MeasureManager.cpp" line="976"/>
<location filename="../src/shared_gui_components/MeasureManager.cpp" line="992"/>
<source>Measures Updated</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/shared_gui_components/MeasureManager.cpp" line="974"/>
<location filename="../src/shared_gui_components/MeasureManager.cpp" line="976"/>
<source>All measures are up-to-date.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/shared_gui_components/MeasureManager.cpp" line="977"/>
<location filename="../src/shared_gui_components/MeasureManager.cpp" line="979"/>
<source> measures have been updated on BCL compared to your local BCL directory.
</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/shared_gui_components/MeasureManager.cpp" line="978"/>
<location filename="../src/shared_gui_components/MeasureManager.cpp" line="980"/>
<source>Would you like update them?</source>
<translation type="unfinished"></translation>
</message>
Expand Down Expand Up @@ -1273,6 +1273,24 @@ Would you like to Restore library paths to default values or Open the library se
Desea Restaurar la ruta por defecto de las librerías o Abrir los ajustes de librería para cambiarlos manualmente?</translation>
</message>
</context>
<context>
<name>openstudio::PathInputView</name>
<message>
<location filename="../src/shared_gui_components/EditView.cpp" line="466"/>
<source>Open Directory</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/shared_gui_components/EditView.cpp" line="469"/>
<source>Open Read File</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/shared_gui_components/EditView.cpp" line="471"/>
<source>Select Save File</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>openstudio::PeopleDefinitionInspectorView</name>
<message>
Expand Down
Loading
Loading