Changeset 1286 for cpp/frams

Timestamp:

12/06/23 03:29:15 (13 months ago)

Author:

Maciej Komosinski

Message:

Improved Model-building error messages; for some cases changed ERROR to WARNING because the Model is still considered invalid (and Simulator.creatwarnfail will still be effective), but ERROR messages would by default stop the simulation

File:

• cpp/frams/model/model.cpp (modified) (9 diffs)

cpp/frams/model/model.cpp

@@ -1 +1 @@
 // This file is a part of Framsticks SDK.  http://www.framsticks.com/
-// Copyright (C) 1999-2020  Maciej Komosinski and Szymon Ulatowski.
+// Copyright (C) 1999-2023  Maciej Komosinski and Szymon Ulatowski.
 // See LICENSE.txt for details.
 
@@ -969 +969 @@
                                         {
                                                 ret = 0;
-                                                logPrintf("Model", "internalCheck", LOG_ERROR,
-                                                        "Delta joint cycle detected at Joint #%d%s",
-                                                        i, nameForErrors().c_str());
+                                                logPrintf("Model", "internalCheck", LOG_WARN, "A cycle of \"delta Joints\" found at Joint #%d%s", i, nameForErrors().c_str());
                                         }
                                         j->resetDeltaMarkers();
@@ -1006 +1004 @@
                                                 {
                                                         ret = 0;
-                                                        logPrintf("Model", "internalCheck", LOG_ERROR, "Joint #%d too long (its length %g exceeds allowed %g)%s", i, j->d(), getMaxJoint().d.x, nameForErrors().c_str());
+                                                        logPrintf("Model", "internalCheck", LOG_WARN, "Joint #%d too long (its length %g exceeds allowed %g)%s", i, j->d(), getMaxJoint().d.x, nameForErrors().c_str());
                                                 }
                                                 else if (j->d() < getMinJoint().d.x)
                                                 {
                                                         ret = 0;
-                                                        logPrintf("Model", "internalCheck", LOG_ERROR, "Joint #%d too short (its length %g is below allowed %g)%s", i, j->d(), getMinJoint().d.x, nameForErrors().c_str());
+                                                        logPrintf("Model", "internalCheck", LOG_WARN, "Joint #%d too short (its length %g is below allowed %g)%s", i, j->d(), getMinJoint().d.x, nameForErrors().c_str());
                                                 }
                                         }
@@ -1018 +1016 @@
                         else
                         {
-                                logPrintf("Model", "internalCheck", LOG_ERROR, "Illegal part references in Joint #%d%s", i, nameForErrors().c_str());
                                 ret = 0;
+                                logPrintf("Model", "internalCheck", LOG_WARN, "Illegal Part references in Joint #%d%s", i, nameForErrors().c_str());
                         }
                         if (shapetype != SHAPETYPE_ILLEGAL)
@@ -1026 +1024 @@
                                 {
                                         shapetype = SHAPETYPE_ILLEGAL;
-                                        logPrintf("Model", "internalCheck", LOG_WARN, "Inconsistent joint shapes (mixed old and new shapes)%s", nameForErrors().c_str());
+                                        logPrintf("Model", "internalCheck", LOG_WARN, "Inconsistent Joint shapes (mixed ball-and-stick and solids shape types)%s", nameForErrors().c_str());
                                 }
                         }
@@ -1083 +1081 @@
                                 if (!(p->flags & LINKFLAG))
                                 {
-                                        logPrintf("Model", "internalCheck", LOG_ERROR, "Not all parts connected (eg. Part #0 and Part #%d)%s", i, nameForErrors().c_str());
                                         ret = 0;
+                                        logPrintf("Model", "internalCheck", LOG_WARN, "Not all Parts connected (e.g., Part #0 and Part #%d)%s", i, nameForErrors().c_str());
                                         break;
                                 }
@@ -1095 +1093 @@
                         if (j->p1_refno == j->p2_refno)
                         {
-                                logPrintf("Model", "internalCheck", LOG_ERROR, "Illegal self connection, Joint #%d%s", i, nameForErrors().c_str());
                                 ret = 0;
+                                logPrintf("Model", "internalCheck", LOG_WARN, "Part #%d connected to itself using Joint #%d%s", j->p1_refno, i, nameForErrors().c_str());
                                 break;
                         }
@@ -1105 +1103 @@
                                         || ((j->p1_refno == j2->p2_refno) && (j->p2_refno == j2->p1_refno)))
                                 {
-                                        logPrintf("Model", "internalCheck", LOG_ERROR, "Illegal duplicate Joint #%d and Joint #%d%s", i, k, nameForErrors().c_str());
                                         ret = 0;
+                                        logPrintf("Model", "internalCheck", LOG_WARN, "Two parallel Joints connect the same Parts: Joint #%d and Joint #%d%s", i, k, nameForErrors().c_str());
                                         break;
                                 }
@@ -1117 +1115 @@
         else if ((declared_shapetype != SHAPETYPE_UNKNOWN) && (declared_shapetype != shapetype))
         {
-                logPrintf("Model", "internalCheck", LOG_ERROR, "Model shape type '%s' does not match the declared type '%s'", getShapeTypeName(shapetype), getShapeTypeName(declared_shapetype));
                 ret = 0;
+                logPrintf("Model", "internalCheck", LOG_WARN, "Model shape type '%s' does not match the declared type '%s'", getShapeTypeName(shapetype), getShapeTypeName(declared_shapetype));
         }