Changeset 610 for cpp/frams/model/model.cpp

Timestamp:

09/05/16 03:39:14 (8 years ago)

Author:

Maciej Komosinski

Message:

• Introduced levels of checking the validity of a Model
• If a Joint is too long, print how much it exceeds the maximum allowed length

File:

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

cpp/frams/model/model.cpp

@@ -511 +511 @@
 }
 
-int Model::close()
+int Model::close(bool building_live_model)
 {
         if (buildstatus != building)
                 logPrintf("Model", "close", LOG_WARN, "Unexpected close() - no open()");
-        if (internalcheck(1) > 0)
+        if (internalcheck(building_live_model ? LIVE_CHECK : FINAL_CHECK) > 0)
         {
                 buildstatus = valid;
@@ -543 +543 @@
 int Model::validate()
 {
-        return internalcheck(0);
+        return internalcheck(EDITING_CHECK);
 }
 
@@ -899 +899 @@
 }
 
-int Model::internalcheck(int final)
+int Model::internalcheck(CheckType check)
 {
         Part *p;
@@ -997 +997 @@
                                 else
                                 { // abs.positioning -> calc. delta
-                                        if (final)
+                                        if (check!=EDITING_CHECK)
                                         {
                                                 // calc orient delta
@@ -1012 +1012 @@
                                         }
                                 }
-                                if (final)
+                                if (check!=LIVE_CHECK)
                                 {
                                         if (j->shape != Joint::SHAPE_FIXED)
@@ -1019 +1019 @@
                                                 {
                                                         ret = 0;
-                                                        logPrintf("Model", "internalCheck", LOG_ERROR, "Joint #%d too long%s", i, nameForErrors().c_str());
+                                                        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());
                                                 }
                                         }