X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FModel%2FModel_ResultPart.cpp;h=bb12b10756fffa3c95096e4eda37a3d8ca10f63d;hb=283433d9c2f39fbd332d6eba691b6a0cd875e29d;hp=5216e6107e6ad8639f2d9ac374ff60407d0e1211;hpb=298e667eb49d3d1441664d76c1ab4f5fdc80645e;p=modules%2Fshaper.git

diff --git a/src/Model/Model_ResultPart.cpp b/src/Model/Model_ResultPart.cpp
index 5216e6107..bb12b1075 100644
--- a/src/Model/Model_ResultPart.cpp
+++ b/src/Model/Model_ResultPart.cpp
@@ -6,11 +6,17 @@
 
 #include <Model_ResultPart.h>
 #include <ModelAPI_Data.h>
+#include <Model_Data.h>
 #include <ModelAPI_AttributeDocRef.h>
 #include <ModelAPI_Session.h>
 #include <ModelAPI_Feature.h>
 #include <ModelAPI_ResultBody.h>
+#include <ModelAPI_AttributeIntArray.h>
+#include <ModelAPI_AttributeSelectionList.h>
+#include <ModelAPI_AttributeReference.h>
 #include <Model_Document.h>
+#include <Events_Loop.h>
+#include <ModelAPI_Events.h>
 
 #include <TNaming_Tool.hxx>
 #include <TNaming_NamedShape.hxx>
@@ -18,38 +24,50 @@
 #include <TDataStd_Name.hxx>
 #include <TopoDS_Compound.hxx>
 #include <BRep_Builder.hxx>
+#include <TopExp_Explorer.hxx>
 
-std::shared_ptr<ModelAPI_Document> Model_ResultPart::partDoc()
+#define baseRef() std::dynamic_pointer_cast<Model_ResultPart>(data()->reference(BASE_REF_ID())->value())
+
+void Model_ResultPart::initAttributes()
 {
-  return data()->document("PartDocument")->value();
+  // append the color attribute. It is empty, the attribute will be filled by a request
+  data()->addAttribute(DOC_REF(), ModelAPI_AttributeDocRef::typeId());
+  data()->addAttribute(COLOR_ID(), ModelAPI_AttributeIntArray::typeId());
+  data()->addAttribute(BASE_REF_ID(), ModelAPI_AttributeReference::typeId());
 }
 
-std::shared_ptr<ModelAPI_Feature> Model_ResultPart::owner()
+std::shared_ptr<ModelAPI_Document> Model_ResultPart::partDoc()
 {
-  return std::shared_ptr<ModelAPI_Feature>();  // return empty pointer
+  if (myTrsf.get()) {
+    return baseRef()->partDoc();
+  }
+  DocumentPtr aRes = data()->document(DOC_REF())->value();
+  if (!aRes.get() && myIsInLoad) { // trying to get this document from the session
+    aRes = document()->subDocument(data()->name());
+  }
+  return aRes;
 }
 
 Model_ResultPart::Model_ResultPart()
 {
-  myIsDisabled = true; // by default it is not initialized and false to be after created
-  setIsConcealed(false);
+  myIsInLoad = false;
 }
 
-void Model_ResultPart::setData(std::shared_ptr<ModelAPI_Data> theData)
+void Model_ResultPart::activate()
 {
-  ModelAPI_Result::setData(theData);
-  if (theData) {
-    data()->addAttribute(DOC_REF(), ModelAPI_AttributeDocRef::typeId());
+  if (myTrsf.get()) {
+    baseRef()->activate();
+    return;
   }
-}
 
-void Model_ResultPart::activate()
-{
   std::shared_ptr<ModelAPI_AttributeDocRef> aDocRef = data()->document(DOC_REF());
   
   if (!aDocRef->value().get()) {  // create (or open) a document if it is not yet created
+    myIsInLoad = true;
     std::shared_ptr<ModelAPI_Document> aDoc = document()->subDocument(data()->name());
+    myIsInLoad = false;
     if (aDoc) {
+      aDoc->synchronizeTransactions();
       aDocRef->setValue(aDoc);
     }
   }
@@ -67,27 +85,41 @@ void Model_ResultPart::activate()
   }
 }
 
+std::shared_ptr<ModelAPI_ResultPart> Model_ResultPart::original()
+{
+  if (myTrsf.get()) {
+    return baseRef()->original();
+  }
+  return std::dynamic_pointer_cast<ModelAPI_ResultPart>(data()->owner());
+}
+
 bool Model_ResultPart::isActivated() 
 {
+  if (myTrsf.get()) {
+    return baseRef()->isActivated();
+  }
+
   std::shared_ptr<ModelAPI_AttributeDocRef> aDocRef = data()->document(DOC_REF());
-  return aDocRef->value().get();
+  return aDocRef->value().get() != NULL;
 }
 
 bool Model_ResultPart::setDisabled(std::shared_ptr<ModelAPI_Result> theThis,
     const bool theFlag)
 {
   if (ModelAPI_ResultPart::setDisabled(theThis, theFlag)) {
-    DocumentPtr aDoc = Model_ResultPart::partDoc();
-    if (aDoc.get()) {
-      // make the current feature the last in any case: to update shapes defore deactivation too
-      FeaturePtr aLastFeature = std::dynamic_pointer_cast<ModelAPI_Feature>(aDoc->object(
-        ModelAPI_Feature::group(), aDoc->size(ModelAPI_Feature::group()) - 1));
-      aDoc->setCurrentFeature(aLastFeature, false);
-      if (theFlag) { // disable, so make all features disabled too
-        // update the shape just before the deactivation: it will be used outside of part
-        myShape.Nullify();
-        shape();
-        aDoc->setCurrentFeature(FeaturePtr(), false);
+    if (!myTrsf.get()) { // disable of base result part
+      DocumentPtr aDoc = Model_ResultPart::partDoc();
+      if (aDoc.get() && aDoc->isOpened()) {
+        std::shared_ptr<Model_Document> anIntDoc = std::dynamic_pointer_cast<Model_Document>(aDoc);
+        // make the current feature the last in any case: to update shapes defore deactivation too
+        FeaturePtr aLastFeature = anIntDoc->lastFeature();
+        aDoc->setCurrentFeature(aLastFeature, false);
+        if (theFlag) { // disable, so make all features disabled too
+          // update the shape just before the deactivation: it will be used outside of part
+          updateShape();
+          shape();
+          aDoc->setCurrentFeature(FeaturePtr(), false);
+        }
       }
     }
     return true;
@@ -97,9 +129,22 @@ bool Model_ResultPart::setDisabled(std::shared_ptr<ModelAPI_Result> theThis,
 
 std::shared_ptr<GeomAPI_Shape> Model_ResultPart::shape()
 {
-  if (myShape.IsNull()) {
+  std::shared_ptr<GeomAPI_Shape> aResult(new GeomAPI_Shape);
+  if (myTrsf.get()) { // get shape of the base result and apply the transformation
+    ResultPtr anOrigResult = baseRef();
+    std::shared_ptr<GeomAPI_Shape> anOrigShape = anOrigResult->shape();
+    if (anOrigShape.get()) {
+      TopoDS_Shape aShape = anOrigShape->impl<TopoDS_Shape>();
+      if (!aShape.IsNull()) {
+        aShape.Move(*(myTrsf.get()));
+        aResult->setImpl(new TopoDS_Shape(aShape));
+      }
+    }
+    return aResult;
+  }
+  if (myShape.IsNull()) { // shape is not produced yet, create it
     DocumentPtr aDoc = Model_ResultPart::partDoc();
-    if (aDoc.get()) {
+    if (aDoc.get() && aDoc->isOpened()) {
       const std::string& aBodyGroup = ModelAPI_ResultBody::group();
       TopoDS_Compound aResultComp;
       BRep_Builder aBuilder;
@@ -107,7 +152,8 @@ std::shared_ptr<GeomAPI_Shape> Model_ResultPart::shape()
       int aNumSubs = 0;
       for(int a = aDoc->size(aBodyGroup) - 1; a >= 0; a--) {
         ResultPtr aBody = std::dynamic_pointer_cast<ModelAPI_Result>(aDoc->object(aBodyGroup, a));
-        if (aBody.get() && aBody->shape().get() && !aBody->isDisabled()) {
+        // "object" method filters out disabled and concealed anyway, so don't check
+        if (aBody.get() && aBody->shape().get()) {
           TopoDS_Shape aShape = *(aBody->shape()->implPtr<TopoDS_Shape>());
           if (!aShape.IsNull()) {
             aBuilder.Add(aResultComp, aShape);
@@ -120,16 +166,56 @@ std::shared_ptr<GeomAPI_Shape> Model_ResultPart::shape()
       }
     }
   }
-  if (myShape.IsNull())
-    return std::shared_ptr<GeomAPI_Shape>();
-  std::shared_ptr<GeomAPI_Shape> aResult(new GeomAPI_Shape);
-  aResult->setImpl(new TopoDS_Shape(myShape));
+  if (!myShape.IsNull())
+    aResult->setImpl(new TopoDS_Shape(myShape));
   return aResult;
 }
 
-std::string Model_ResultPart::nameInPart(const std::shared_ptr<GeomAPI_Shape>& theShape)
+// Returns true is transformation matrices are equal
+static bool IsEqualTrsf(gp_Trsf& theT1, gp_Trsf theT2) {
+  for(int aRow = 1; aRow < 4; aRow++) {
+    for(int aCol = 1; aCol < 5; aCol++) {
+      double aDiff = theT1.Value(aRow, aCol) - theT2.Value(aRow, aCol);
+      if (Abs(aDiff) > 1.e-9)
+        return false;
+    }
+  }
+  return true;
+}
+
+std::string Model_ResultPart::nameInPart(const std::shared_ptr<GeomAPI_Shape>& theShape,
+  int& theIndex)
 {
+  theIndex = 0; // not initialized
+
+  if (myTrsf.get()) { // if this is moved copy of part => return the name of original shape
+    ResultPartPtr anOrigResult = baseRef();
+    // searching in the origin the shape equal to the given but with myTrsf
+    TopoDS_Shape aSelection = theShape->impl<TopoDS_Shape>();
+    gp_Trsf aSelTrsf = aSelection.Location().Transformation();
+    TopoDS_Shape anOrigMain = anOrigResult->shape()->impl<TopoDS_Shape>();
+    if (!aSelection.IsNull() && !anOrigMain.IsNull()) {
+      TopExp_Explorer anExp(anOrigMain, aSelection.ShapeType());
+      for(; anExp.More(); anExp.Next()) {
+        if (anExp.Current().IsPartner(aSelection)) {
+          TopoDS_Shape anOrigMoved = anExp.Current().Moved(*(myTrsf.get()));
+          //if (anOrigMoved.IsSame(aSelection)) {
+          if (IsEqualTrsf(aSelTrsf, anOrigMoved.Location().Transformation())) {
+            std::shared_ptr<GeomAPI_Shape> anOrigSel(new GeomAPI_Shape);
+            anOrigSel->setImpl(new TopoDS_Shape(anExp.Current()));
+            return anOrigResult->nameInPart(anOrigSel, theIndex);
+          }
+        }
+      }
+    }
+    // something is not right
+    return "";
+  }
+
   TopoDS_Shape aShape = theShape->impl<TopoDS_Shape>();
+  if (aShape.IsNull())
+    return "";
+
   // getting an access to the document of part
   std::shared_ptr<Model_Document> aDoc = std::dynamic_pointer_cast<Model_Document>(partDoc());
   if (!aDoc.get()) // the part document is not presented for the moment
@@ -158,9 +244,47 @@ std::string Model_ResultPart::nameInPart(const std::shared_ptr<GeomAPI_Shape>& t
       }	
     }
   }
+  if (aName.empty()) { // not found, so use the selection mechanism
+    // for this the context result is needed
+    ResultPtr aContext;
+    const std::string& aBodyGroup = ModelAPI_ResultBody::group();
+    for(int a = aDoc->size(aBodyGroup) - 1; a >= 0; a--) {
+      ResultPtr aBody = std::dynamic_pointer_cast<ModelAPI_Result>(aDoc->object(aBodyGroup, a));
+      if (aBody.get() && aBody->shape().get() && !aBody->isDisabled()) {
+        TopoDS_Shape aBodyShape = *(aBody->shape()->implPtr<TopoDS_Shape>());
+        // check is body contain the selected sub-shape
+        for(TopExp_Explorer anExp(aBodyShape, aShape.ShapeType()); anExp.More(); anExp.Next()) {
+          if (aShape.IsEqual(anExp.Current())) {
+            aContext = aBody;
+            break;
+          }
+        }
+      }
+    }
+    if (aContext.get()) {
+      AttributeSelectionListPtr aSelAttr = aDoc->selectionInPartFeature();
+      aSelAttr->append(aContext, theShape);
+      theIndex = aSelAttr->size();
+      AttributeSelectionPtr aNewAttr = aSelAttr->value(theIndex - 1);
+      return aNewAttr->namingName();
+    }
+  }
   return aName;
 }
 
+bool Model_ResultPart::updateInPart(const int theIndex)
+{
+  std::shared_ptr<Model_Document> aDoc = std::dynamic_pointer_cast<Model_Document>(partDoc());
+  if (aDoc.get()) {
+    AttributeSelectionListPtr aSelAttr = aDoc->selectionInPartFeature();
+    AttributeSelectionPtr aThisAttr = aSelAttr->value(theIndex - 1);
+    if (aThisAttr.get()) {
+      return aThisAttr->update();
+    }
+  }
+  return false; // something is wrong
+}
+
 std::shared_ptr<GeomAPI_Shape> Model_ResultPart::shapeInPart(const std::string& theName)
 {
   /// TODO: not implemented yet
@@ -179,4 +303,18 @@ void Model_ResultPart::colorConfigInfo(std::string& theSection, std::string& the
 void Model_ResultPart::updateShape()
 {
   myShape.Nullify();
+  myTrsf.reset();
+}
+
+void Model_ResultPart::setTrsf(std::shared_ptr<ModelAPI_Result> theThis, 
+    const std::shared_ptr<GeomAPI_Trsf>& theTransformation)
+{
+  updateShape();
+  if (theTransformation.get()) {
+    myTrsf = std::shared_ptr<gp_Trsf>(new gp_Trsf(theTransformation->impl<gp_Trsf>()));
+  }
+  // the result must be explicitly updated
+  static Events_Loop* aLoop = Events_Loop::loop();
+  static Events_ID EVENT_DISP = aLoop->eventByName(EVENT_OBJECT_TO_REDISPLAY);
+  ModelAPI_EventCreator::get()->sendUpdated(theThis, EVENT_DISP); // flush is in preview-update
 }