From a40e398227e3a32f0a683b5116323443d02ff36a Mon Sep 17 00:00:00 2001
From: WandererFan <wandererfan@gmail.com>
Date: Wed, 27 Jan 2016 13:30:46 -0500
Subject: [PATCH] fix range_check error during Dimension creation

---
 src/Mod/TechDraw/App/DrawViewDimension.cpp | 27 +++++++++++++---------
 src/Mod/TechDraw/Gui/QGIViewDimension.cpp  | 11 +++++----
 2 files changed, 23 insertions(+), 15 deletions(-)

diff --git a/src/Mod/TechDraw/App/DrawViewDimension.cpp b/src/Mod/TechDraw/App/DrawViewDimension.cpp
index 676bdf4f17..b42116e69f 100644
--- a/src/Mod/TechDraw/App/DrawViewDimension.cpp
+++ b/src/Mod/TechDraw/App/DrawViewDimension.cpp
@@ -188,6 +188,10 @@ short DrawViewDimension::mustExecute() const
 
 App::DocumentObjectExecReturn *DrawViewDimension::execute(void)
 {
+    if (!hasReferences()) {                                            //too soon
+        return App::DocumentObject::StdReturn;
+    }
+
     //Clear the previous measurement made
     measurement->clear();
 
@@ -220,6 +224,7 @@ App::DocumentObjectExecReturn *DrawViewDimension::execute(void)
 
 std::string  DrawViewDimension::getFormatedValue() const
 {
+
     QString str = QString::fromUtf8(FormatSpec.getStrValue().c_str());
 
     QRegExp rx(QString::fromAscii("%(\\w+)%"));                        //any word bracketed by %
@@ -246,17 +251,22 @@ std::string  DrawViewDimension::getFormatedValue() const
 double DrawViewDimension::getDimValue() const
 {
     double result = 0.0;
-    if (!getViewPart()->hasGeometry()) {                               //happens when loading saved document
+    if (!hasReferences()) {                                            //happens during Dimension creation
+        Base::Console().Message("INFO - DVD::getDimValue - Dimension has no References\n");
         return result;
     }
+
+    if (!getViewPart()->hasGeometry()) {                              //happens when loading saved document
+        Base::Console().Message("INFO - DVD::getDimValue ViewPart has no Geometry yet\n");
+        return result;
+    }
+
     if (ProjectionType.isValue("True")) {
         // True Values
         if (!measurement->hasReferences()) {
             return result;
         }
         if(Type.isValue("Distance")) {
-            //TODO: measurement->length() is the sum of the lengths of the edges in the References. is this what we want here?
-            //return measurement->length();
             result = measurement->delta().Length();
         } else if(Type.isValue("DistanceX")){
             Base::Vector3d delta = measurement->delta();
@@ -422,6 +432,8 @@ double DrawViewDimension::getDimValue() const
 
 DrawViewPart* DrawViewDimension::getViewPart() const
 {
+    //TODO: range_check here if no References.  valid situation during Dimension creation.  what happens if return NULL??
+    //need checks everywhere?
     return dynamic_cast<TechDraw::DrawViewPart * >(References.getValues().at(0));
 }
 
@@ -503,14 +515,7 @@ double DrawViewDimension::dist2Segs(Base::Vector2D s1,
 
 bool DrawViewDimension::hasReferences(void) const
 {
-    bool result = false;
-    const std::vector<App::DocumentObject*> &refs = References.getValues();
-    if (refs.empty()) {
-        result = false;
-    } else {
-        result = true;
-    }
-    return result;
+    return (References.getSize() > 0);
 }
 
 PyObject *DrawViewDimension::getPyObject(void)
diff --git a/src/Mod/TechDraw/Gui/QGIViewDimension.cpp b/src/Mod/TechDraw/Gui/QGIViewDimension.cpp
index 533b691165..f36defb4fe 100644
--- a/src/Mod/TechDraw/Gui/QGIViewDimension.cpp
+++ b/src/Mod/TechDraw/Gui/QGIViewDimension.cpp
@@ -324,13 +324,16 @@ void QGIViewDimension::datumLabelDragFinished()
 
 void QGIViewDimension::draw()
 {
-    if(getViewObject() == 0 || !getViewObject()->isDerivedFrom(TechDraw::DrawViewDimension::getClassTypeId()))
-        return;
-
     TechDraw::DrawViewDimension *dim = dynamic_cast<TechDraw::DrawViewDimension *>(getViewObject());
+    if((!dim) ||                                                       //nothing to draw, don't try
+       (!dim->isDerivedFrom(TechDraw::DrawViewDimension::getClassTypeId())) ||
+       (!dim->hasReferences()) ) {
+        return;
+    }
+
     QGIDatumLabel *lbl = dynamic_cast<QGIDatumLabel *>(datumLabel);
     const TechDraw::DrawViewPart *refObj = dim->getViewPart();
-    if(!refObj->hasGeometry()) {                                       //nothing to draw yet
+    if(!refObj->hasGeometry()) {                                       //nothing to draw yet (restoring)
         return;
     }
     pen.setStyle(Qt::SolidLine);