Merge pull request #2166 from NREL/constructionInheritance2

Correctly display construction inheritance in the gridview, and apply…
NREL · Mar 22, 2016 · 689a394 · 689a394 · nrel-bot-2 · Mar 22, 2016
2 parents 8296251 + 5b3b3c4
commit 689a394
Show file tree

Hide file tree

Showing 2 changed files with 368 additions and 422 deletions.
diff --git a/openstudiocore/src/openstudio_lib/OSDropZone.cpp b/openstudiocore/src/openstudio_lib/OSDropZone.cpp
@@ -703,7 +703,8 @@ void OSDropZone2::dropEvent(QDropEvent *event)
         refresh();
       }
     }
-
+    // A dropped object cannot be inherited
+    this->setIsDefaulted(false);
   }
 }
 
@@ -795,14 +796,6 @@ void OSDropZone2::makeItem()
 
 void OSDropZone2::setIsDefaulted(bool defaulted)
 {
-  if (!m_item) {
-    makeItem();
-  }
-
-  if (m_item) {
-    m_item->setIsDefaulted(defaulted);
-  }
-
   if (defaulted) {
     m_label->setStyleSheet("QLabel { color:green }"); // color: #006837
   } else {