Merge 7b64a43 into d2d0817

opencor · Aug 17, 2020 · 1939eb1 · 1939eb1
2 parents d2d0817 + 7b64a43
commit 1939eb1
Showing 1 changed file with 18 additions and 1 deletion.
diff --git a/src/plugins/test/ZincWindow/src/zincwindowwindow.cpp b/src/plugins/test/ZincWindow/src/zincwindowwindow.cpp
@@ -41,6 +41,7 @@ along with this program. If not, see <https://gnu.org/licenses>.
 //==============================================================================
 
 #include "zincbegin.h"
+    #include "opencmiss/zinc/fieldfiniteelement.hpp"
     #include "opencmiss/zinc/fieldmodule.hpp"
     #include "opencmiss/zinc/fieldvectoroperators.hpp"
 #include "zincend.h"
@@ -152,7 +153,23 @@ void ZincWindowWindow::createAndSetZincContext()
     OpenCMISS::Zinc::Fieldmodule fieldModule = region.getFieldmodule();
 
     fieldModule.beginChange();
-        OpenCMISS::Zinc::Field coordinates = fieldModule.findFieldByName("coordinates");
+        OpenCMISS::Zinc::Fielditerator fieldIterator = fieldModule.createFielditerator();
+        OpenCMISS::Zinc::Field field = fieldIterator.next();
+        OpenCMISS::Zinc::Field coordinates;
+
+        while (field.isValid()) {
+            if (    field.isTypeCoordinate()
+                && (field.getValueType() == OpenCMISS::Zinc::Field::VALUE_TYPE_REAL)
+                && (field.getNumberOfComponents() <= 3)
+                &&  field.castFiniteElement().isValid()) {
+                coordinates = field.castFiniteElement();
+
+                break;
+            }
+
+            field = fieldIterator.next();
+        }
+
         OpenCMISS::Zinc::FieldMagnitude magnitude = fieldModule.createFieldMagnitude(coordinates);
 
         magnitude.setManaged(true);