Skip to content

Commit 9917e10

Browse files
jmarrecjmarrec
authored
Merge pull request #780 from openstudiocoalition/fix_778
Show empty required object-list fields with warning icon, remove unused IGdefaultRemoved slot
2 parents 4bfb712 + 60af7ea commit 9917e10

16 files changed

+341
-103
lines changed

‎src/model_editor/InspectorGadget.cpp

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -789,9 +789,12 @@ void InspectorGadget::layoutComboBox(QVBoxLayout* layout, QWidget* parent, opens
789789
int idx = combo->findText(curVal.c_str(), Qt::MatchFixedString);
790790

791791
if (-1 == idx) {
792+
793+
// field is currently set to an invalid value
792794
idx = 0;
793-
connect(combo, static_cast<void (QComboBox::*)(const QString&)>(&QComboBox::currentTextChanged), this, &InspectorGadget::IGdefaultRemoved);
794-
//QString errormsg("We have a value:");
795+
combo->insertItem(idx, QPixmap(":/images/alert_image.png"), curVal.c_str(), "Invalid");
796+
797+
//QString errormsg("We have a value:");
795798
//errormsg += curVal.c_str();
796799
//errormsg += " that does not match the allowable values in the idd.Name:";
797800
//errormsg += name.c_str();
@@ -887,13 +890,6 @@ void InspectorGadget::checkRemoveBtn(QPushButton* btn) {
887890
}
888891

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

898894
void InspectorGadget::IGvalueChanged(const QString& value) {
899895
OS_ASSERT(m_workspaceObj);

‎src/model_editor/InspectorGadget.hpp

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -160,16 +160,6 @@ class MODELEDITOR_API InspectorGadget
160160
*/
161161
void clear(bool recursive);
162162

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

175165
void IGcommentChanged(const QString&);

‎translations/OpenStudioApp_ar.ts

Lines changed: 24 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
<translation type="unfinished"></translation>
5050
</message>
5151
<message>
52-
<location filename="../src/model_editor/InspectorGadget.cpp" line="856"/>
52+
<location filename="../src/model_editor/InspectorGadget.cpp" line="859"/>
5353
<source>Add/Remove Extensible Groups</source>
5454
<translation type="unfinished"></translation>
5555
</message>
@@ -740,24 +740,24 @@ If you would like to see the OpenStudioApplication translated in your language o
740740
<context>
741741
<name>openstudio::MeasureManager</name>
742742
<message>
743-
<location filename="../src/shared_gui_components/MeasureManager.cpp" line="974"/>
744-
<location filename="../src/shared_gui_components/MeasureManager.cpp" line="990"/>
743+
<location filename="../src/shared_gui_components/MeasureManager.cpp" line="976"/>
744+
<location filename="../src/shared_gui_components/MeasureManager.cpp" line="992"/>
745745
<source>Measures Updated</source>
746746
<translation type="unfinished"></translation>
747747
</message>
748748
<message>
749-
<location filename="../src/shared_gui_components/MeasureManager.cpp" line="974"/>
749+
<location filename="../src/shared_gui_components/MeasureManager.cpp" line="976"/>
750750
<source>All measures are up-to-date.</source>
751751
<translation type="unfinished"></translation>
752752
</message>
753753
<message>
754-
<location filename="../src/shared_gui_components/MeasureManager.cpp" line="977"/>
754+
<location filename="../src/shared_gui_components/MeasureManager.cpp" line="979"/>
755755
<source> measures have been updated on BCL compared to your local BCL directory.
756756
</source>
757757
<translation type="unfinished"></translation>
758758
</message>
759759
<message>
760-
<location filename="../src/shared_gui_components/MeasureManager.cpp" line="978"/>
760+
<location filename="../src/shared_gui_components/MeasureManager.cpp" line="980"/>
761761
<source>Would you like update them?</source>
762762
<translation type="unfinished"></translation>
763763
</message>
@@ -1145,6 +1145,24 @@ Would you like to Restore library paths to default values or Open the library se
11451145
<translation type="unfinished"></translation>
11461146
</message>
11471147
</context>
1148+
<context>
1149+
<name>openstudio::PathInputView</name>
1150+
<message>
1151+
<location filename="../src/shared_gui_components/EditView.cpp" line="466"/>
1152+
<source>Open Directory</source>
1153+
<translation type="unfinished"></translation>
1154+
</message>
1155+
<message>
1156+
<location filename="../src/shared_gui_components/EditView.cpp" line="469"/>
1157+
<source>Open Read File</source>
1158+
<translation type="unfinished"></translation>
1159+
</message>
1160+
<message>
1161+
<location filename="../src/shared_gui_components/EditView.cpp" line="471"/>
1162+
<source>Select Save File</source>
1163+
<translation type="unfinished"></translation>
1164+
</message>
1165+
</context>
11481166
<context>
11491167
<name>openstudio::PeopleDefinitionInspectorView</name>
11501168
<message>

‎translations/OpenStudioApp_ca.ts

Lines changed: 24 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
<translation>Autocalcular</translation>
5151
</message>
5252
<message>
53-
<location filename="../src/model_editor/InspectorGadget.cpp" line="856"/>
53+
<location filename="../src/model_editor/InspectorGadget.cpp" line="859"/>
5454
<source>Add/Remove Extensible Groups</source>
5555
<translation>Afegir/Eliminat Grups Extensibles</translation>
5656
</message>
@@ -832,24 +832,24 @@ Si voleu que OpeStudioApplication estigui a la vostra llengua, esperem la vostra
832832
<context>
833833
<name>openstudio::MeasureManager</name>
834834
<message>
835-
<location filename="../src/shared_gui_components/MeasureManager.cpp" line="974"/>
836-
<location filename="../src/shared_gui_components/MeasureManager.cpp" line="990"/>
835+
<location filename="../src/shared_gui_components/MeasureManager.cpp" line="976"/>
836+
<location filename="../src/shared_gui_components/MeasureManager.cpp" line="992"/>
837837
<source>Measures Updated</source>
838838
<translation type="unfinished"></translation>
839839
</message>
840840
<message>
841-
<location filename="../src/shared_gui_components/MeasureManager.cpp" line="974"/>
841+
<location filename="../src/shared_gui_components/MeasureManager.cpp" line="976"/>
842842
<source>All measures are up-to-date.</source>
843843
<translation type="unfinished"></translation>
844844
</message>
845845
<message>
846-
<location filename="../src/shared_gui_components/MeasureManager.cpp" line="977"/>
846+
<location filename="../src/shared_gui_components/MeasureManager.cpp" line="979"/>
847847
<source> measures have been updated on BCL compared to your local BCL directory.
848848
</source>
849849
<translation type="unfinished"></translation>
850850
</message>
851851
<message>
852-
<location filename="../src/shared_gui_components/MeasureManager.cpp" line="978"/>
852+
<location filename="../src/shared_gui_components/MeasureManager.cpp" line="980"/>
853853
<source>Would you like update them?</source>
854854
<translation type="unfinished"></translation>
855855
</message>
@@ -1275,6 +1275,24 @@ Would you like to Restore library paths to default values or Open the library se
12751275
Voldries Restaurar els valors per defecte dels camins de les llibrerires o Obrir-ne la configuració per canviar-ho manualment?</translation>
12761276
</message>
12771277
</context>
1278+
<context>
1279+
<name>openstudio::PathInputView</name>
1280+
<message>
1281+
<location filename="../src/shared_gui_components/EditView.cpp" line="466"/>
1282+
<source>Open Directory</source>
1283+
<translation type="unfinished"></translation>
1284+
</message>
1285+
<message>
1286+
<location filename="../src/shared_gui_components/EditView.cpp" line="469"/>
1287+
<source>Open Read File</source>
1288+
<translation type="unfinished"></translation>
1289+
</message>
1290+
<message>
1291+
<location filename="../src/shared_gui_components/EditView.cpp" line="471"/>
1292+
<source>Select Save File</source>
1293+
<translation type="unfinished"></translation>
1294+
</message>
1295+
</context>
12781296
<context>
12791297
<name>openstudio::PeopleDefinitionInspectorView</name>
12801298
<message>

‎translations/OpenStudioApp_de.ts

Lines changed: 24 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
<translation>Automatisch berechnet</translation>
5050
</message>
5151
<message>
52-
<location filename="../src/model_editor/InspectorGadget.cpp" line="856"/>
52+
<location filename="../src/model_editor/InspectorGadget.cpp" line="859"/>
5353
<source>Add/Remove Extensible Groups</source>
5454
<translation>Hinzufügen/Entfernen von erweiterbaren Gruppen</translation>
5555
</message>
@@ -840,24 +840,24 @@ Wenn Sie möchten, dass die OpenStudio-Applikation in die Sprache Ihrer Wahl üb
840840
<context>
841841
<name>openstudio::MeasureManager</name>
842842
<message>
843-
<location filename="../src/shared_gui_components/MeasureManager.cpp" line="974"/>
844-
<location filename="../src/shared_gui_components/MeasureManager.cpp" line="990"/>
843+
<location filename="../src/shared_gui_components/MeasureManager.cpp" line="976"/>
844+
<location filename="../src/shared_gui_components/MeasureManager.cpp" line="992"/>
845845
<source>Measures Updated</source>
846846
<translation type="unfinished"></translation>
847847
</message>
848848
<message>
849-
<location filename="../src/shared_gui_components/MeasureManager.cpp" line="974"/>
849+
<location filename="../src/shared_gui_components/MeasureManager.cpp" line="976"/>
850850
<source>All measures are up-to-date.</source>
851851
<translation type="unfinished"></translation>
852852
</message>
853853
<message>
854-
<location filename="../src/shared_gui_components/MeasureManager.cpp" line="977"/>
854+
<location filename="../src/shared_gui_components/MeasureManager.cpp" line="979"/>
855855
<source> measures have been updated on BCL compared to your local BCL directory.
856856
</source>
857857
<translation type="unfinished"></translation>
858858
</message>
859859
<message>
860-
<location filename="../src/shared_gui_components/MeasureManager.cpp" line="978"/>
860+
<location filename="../src/shared_gui_components/MeasureManager.cpp" line="980"/>
861861
<source>Would you like update them?</source>
862862
<translation type="unfinished"></translation>
863863
</message>
@@ -1285,6 +1285,24 @@ Would you like to Restore library paths to default values or Open the library se
12851285
Möchten Sie die Bibliothekspfade auf die Standardwerte zurücksetzen oder öffnen Sie die Bibliothekseinstellungen, um die Einstellungen manuell zu ändern?</translation>
12861286
</message>
12871287
</context>
1288+
<context>
1289+
<name>openstudio::PathInputView</name>
1290+
<message>
1291+
<location filename="../src/shared_gui_components/EditView.cpp" line="466"/>
1292+
<source>Open Directory</source>
1293+
<translation type="unfinished"></translation>
1294+
</message>
1295+
<message>
1296+
<location filename="../src/shared_gui_components/EditView.cpp" line="469"/>
1297+
<source>Open Read File</source>
1298+
<translation type="unfinished"></translation>
1299+
</message>
1300+
<message>
1301+
<location filename="../src/shared_gui_components/EditView.cpp" line="471"/>
1302+
<source>Select Save File</source>
1303+
<translation type="unfinished"></translation>
1304+
</message>
1305+
</context>
12881306
<context>
12891307
<name>openstudio::PeopleDefinitionInspectorView</name>
12901308
<message>

‎translations/OpenStudioApp_el.ts

Lines changed: 24 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
<translation>Αυτόματος υπολογισμός</translation>
5050
</message>
5151
<message>
52-
<location filename="../src/model_editor/InspectorGadget.cpp" line="856"/>
52+
<location filename="../src/model_editor/InspectorGadget.cpp" line="859"/>
5353
<source>Add/Remove Extensible Groups</source>
5454
<translation>Προσθήκη/Κατάργηση επεκτάσιμων ομάδων</translation>
5555
</message>
@@ -830,24 +830,24 @@ If you would like to see the OpenStudioApplication translated in your language o
830830
<context>
831831
<name>openstudio::MeasureManager</name>
832832
<message>
833-
<location filename="../src/shared_gui_components/MeasureManager.cpp" line="974"/>
834-
<location filename="../src/shared_gui_components/MeasureManager.cpp" line="990"/>
833+
<location filename="../src/shared_gui_components/MeasureManager.cpp" line="976"/>
834+
<location filename="../src/shared_gui_components/MeasureManager.cpp" line="992"/>
835835
<source>Measures Updated</source>
836836
<translation type="unfinished"></translation>
837837
</message>
838838
<message>
839-
<location filename="../src/shared_gui_components/MeasureManager.cpp" line="974"/>
839+
<location filename="../src/shared_gui_components/MeasureManager.cpp" line="976"/>
840840
<source>All measures are up-to-date.</source>
841841
<translation type="unfinished"></translation>
842842
</message>
843843
<message>
844-
<location filename="../src/shared_gui_components/MeasureManager.cpp" line="977"/>
844+
<location filename="../src/shared_gui_components/MeasureManager.cpp" line="979"/>
845845
<source> measures have been updated on BCL compared to your local BCL directory.
846846
</source>
847847
<translation type="unfinished"></translation>
848848
</message>
849849
<message>
850-
<location filename="../src/shared_gui_components/MeasureManager.cpp" line="978"/>
850+
<location filename="../src/shared_gui_components/MeasureManager.cpp" line="980"/>
851851
<source>Would you like update them?</source>
852852
<translation type="unfinished"></translation>
853853
</message>
@@ -1272,6 +1272,24 @@ Would you like to Restore library paths to default values or Open the library se
12721272
Θέλετε να επαναφέρετε διαδρομές βιβλιοθήκης σε προεπιλεγμένες τιμές ή να ανοίξετε τις ρυθμίσεις της βιβλιοθήκης για να τις αλλάξετε χειροκίνητα?</translation>
12731273
</message>
12741274
</context>
1275+
<context>
1276+
<name>openstudio::PathInputView</name>
1277+
<message>
1278+
<location filename="../src/shared_gui_components/EditView.cpp" line="466"/>
1279+
<source>Open Directory</source>
1280+
<translation type="unfinished"></translation>
1281+
</message>
1282+
<message>
1283+
<location filename="../src/shared_gui_components/EditView.cpp" line="469"/>
1284+
<source>Open Read File</source>
1285+
<translation type="unfinished"></translation>
1286+
</message>
1287+
<message>
1288+
<location filename="../src/shared_gui_components/EditView.cpp" line="471"/>
1289+
<source>Select Save File</source>
1290+
<translation type="unfinished"></translation>
1291+
</message>
1292+
</context>
12751293
<context>
12761294
<name>openstudio::PeopleDefinitionInspectorView</name>
12771295
<message>

‎translations/OpenStudioApp_es.ts

Lines changed: 24 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
<translation>Auto Calcular</translation>
5151
</message>
5252
<message>
53-
<location filename="../src/model_editor/InspectorGadget.cpp" line="856"/>
53+
<location filename="../src/model_editor/InspectorGadget.cpp" line="859"/>
5454
<source>Add/Remove Extensible Groups</source>
5555
<translation>Añadir/Remover Grupos Extendibles</translation>
5656
</message>
@@ -831,24 +831,24 @@ Si le gustaría ver la AplicaciónOpenStudio traducido a algun otro lenguaje, le
831831
<context>
832832
<name>openstudio::MeasureManager</name>
833833
<message>
834-
<location filename="../src/shared_gui_components/MeasureManager.cpp" line="974"/>
835-
<location filename="../src/shared_gui_components/MeasureManager.cpp" line="990"/>
834+
<location filename="../src/shared_gui_components/MeasureManager.cpp" line="976"/>
835+
<location filename="../src/shared_gui_components/MeasureManager.cpp" line="992"/>
836836
<source>Measures Updated</source>
837837
<translation type="unfinished"></translation>
838838
</message>
839839
<message>
840-
<location filename="../src/shared_gui_components/MeasureManager.cpp" line="974"/>
840+
<location filename="../src/shared_gui_components/MeasureManager.cpp" line="976"/>
841841
<source>All measures are up-to-date.</source>
842842
<translation type="unfinished"></translation>
843843
</message>
844844
<message>
845-
<location filename="../src/shared_gui_components/MeasureManager.cpp" line="977"/>
845+
<location filename="../src/shared_gui_components/MeasureManager.cpp" line="979"/>
846846
<source> measures have been updated on BCL compared to your local BCL directory.
847847
</source>
848848
<translation type="unfinished"></translation>
849849
</message>
850850
<message>
851-
<location filename="../src/shared_gui_components/MeasureManager.cpp" line="978"/>
851+
<location filename="../src/shared_gui_components/MeasureManager.cpp" line="980"/>
852852
<source>Would you like update them?</source>
853853
<translation type="unfinished"></translation>
854854
</message>
@@ -1273,6 +1273,24 @@ Would you like to Restore library paths to default values or Open the library se
12731273
Desea Restaurar la ruta por defecto de las librerías o Abrir los ajustes de librería para cambiarlos manualmente?</translation>
12741274
</message>
12751275
</context>
1276+
<context>
1277+
<name>openstudio::PathInputView</name>
1278+
<message>
1279+
<location filename="../src/shared_gui_components/EditView.cpp" line="466"/>
1280+
<source>Open Directory</source>
1281+
<translation type="unfinished"></translation>
1282+
</message>
1283+
<message>
1284+
<location filename="../src/shared_gui_components/EditView.cpp" line="469"/>
1285+
<source>Open Read File</source>
1286+
<translation type="unfinished"></translation>
1287+
</message>
1288+
<message>
1289+
<location filename="../src/shared_gui_components/EditView.cpp" line="471"/>
1290+
<source>Select Save File</source>
1291+
<translation type="unfinished"></translation>
1292+
</message>
1293+
</context>
12761294
<context>
12771295
<name>openstudio::PeopleDefinitionInspectorView</name>
12781296
<message>

0 commit comments

Comments
 (0)