From 5b3b3c431c63c9f7b53a40399bbc46f946556fce Mon Sep 17 00:00:00 2001 From: Evan Weaver Date: Mon, 21 Mar 2016 20:24:29 -0600 Subject: [PATCH] Correctly display construction inheritance in the gridview, and apply new policies to resource objects to allow viewing (but not editing) in Inspector Gadget. --- .../src/openstudio_lib/OSDropZone.cpp | 11 +- .../library/OpenStudioPolicy.xml | 779 ++++++++---------- 2 files changed, 368 insertions(+), 422 deletions(-) diff --git a/openstudiocore/src/openstudio_lib/OSDropZone.cpp b/openstudiocore/src/openstudio_lib/OSDropZone.cpp index 13c63747594..018649c3e00 100644 --- 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 { diff --git a/openstudiocore/src/openstudio_lib/library/OpenStudioPolicy.xml b/openstudiocore/src/openstudio_lib/library/OpenStudioPolicy.xml index f94e615098d..1a93f22e794 100644 --- a/openstudiocore/src/openstudio_lib/library/OpenStudioPolicy.xml +++ b/openstudiocore/src/openstudio_lib/library/OpenStudioPolicy.xml @@ -999,11 +999,6 @@ - - - - - @@ -1113,495 +1108,453 @@ - - - - - - - - + + + + + + + - - - - - - - - - - - + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + - - - - - - - - - - + + + + + + + + + - - - - - + + + + - - - - - - - - + + + + + + + - - - - - - - - - - + + + + + + + + + - - - + + - - + - - + - - - - - - - + + + + + + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - - + + + - - - - - - - - - - - - + + + + + + + + + + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - - - + + + + - - - - - - - - - - - + + + + + + + + + + - - - - + + + - - - - - + + + + - - - - - - + + + + + - - - - - - - - + + + + + + + - - - - + + + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - - - - - + + + + + + - - - - - - - - - - - - + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + - - - - - - - - - - + + + + + + + + + - - - - - - - - - + + + + + + + + - - - - - - - - - - + + + + + + + + + - - - - - - - - - + + + + + + + + - - - - - - - - - + + + + + + + + - - - - - - - - - + + + + + + + + - - - - - - - + + + + + + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + - - - - - - + + + + + - - - - - - + + + + +