Merge pull request #23 from alja/del

Add event navigation for collections test
alja · Jan 31, 2019 · 7effb95 · 7effb95
2 parents e6f9bb4 + 38f511f
commit 7effb95
Show file tree

Hide file tree

Showing 7 changed files with 242 additions and 98 deletions.
diff --git a/etc/eve7/EveManager.js b/etc/eve7/EveManager.js
@@ -271,10 +271,28 @@
 
       // do we need this?
       this.callSceneReceivers(scene, "beginChanges");
+
+      for (var r = 0; r < removedIds.length; ++r) {
+         var id = removedIds[r];
+         this.callSceneReceivers(scene, "elementRemoved", id);
+         var element = this.GetElement(id);
+         this.DeleteChildsOf(element);
 
-      for (var r = 0; r < removedIds.length; ++r)
-         this.callSceneReceivers(scene, "elementRemoved", removedIds[r]);
+         // remove from mother
+         var mother = this.map[element.fMotherId];
+         var mc = mother.childs;
 
+         for (var i = 0; i < mc.length; ++i) {
+            console.log("comapre ", mc[i], id);
+            if (mc[i].fElementId === id) {
+               console.log("remove from mother ");
+               mc.splice(i, 1);
+            }
+         }
+         delete this.map[id];
+         element = null;
+      }
+
       // wait for binary if needed
       if (msg.header.fTotalBinarySize)
       {
@@ -350,13 +368,16 @@
             em.tag = "elementAdded";
             this.callSceneReceivers(scene, "sceneElementChange", em);
          }
-         this.InvokeReceivers("elem_update", null, 0, em.fElementId);
       }
 
 
       var treeRebuild = header.removedElements.length || (arr.length != nModified );
+      if (treeRebuild) this.InvokeReceivers("update", null, 0, this);
+
       this.callSceneReceivers(scene, "endChanges", treeRebuild);
    },
+//______________________________________________________________________________
+
 
    EveManager.prototype.DeleteChildsOf = function(elem) {
       if (!elem || !elem.childs) return;

diff --git a/etc/eve7/EveScene.js b/etc/eve7/EveScene.js
@@ -333,7 +333,6 @@
 
    /** Called when processing changes from server or from interactive handler */
    EveScene.prototype.setElementHighlighted = function(mstrid, col, indx, from_interactive) {
-
       // check if other element was highlighted at same time - redraw it
       if (this.highlight && (this.highlight.id != mstrid)) {
          delete this.highlight;
@@ -396,7 +395,18 @@
       this[msg.tag](el);
    }
 
+   EveScene.prototype.elementRemoved = function(elId) {
+      var el = this.mgr.GetElement(elId);
+      console.log("EveScene elementRemoved  ", el);
+      var obj3d = this.getObj3D(el.fElementId);
+
+      var container = this.viewer.getThreejsContainer("scene" + this.id);
+      container.remove(obj3d);
+
+      delete this.id2obj_map[el.fElementId];
 
+   }
+
    JSROOT.EVE.EveScene = EveScene;
 
    return JSROOT;

diff --git a/etc/eve7/EveTable.controller.js b/etc/eve7/EveTable.controller.js
@@ -45,6 +45,7 @@ sap.ui.define([
       },
 
       findTable: function(holder) {
+         console.log("find table in ", holder);
          if ( holder.fRnrSelf && holder._typename == "ROOT::Experimental::REveDataTable" )
             return holder;
 
@@ -318,6 +319,14 @@ sap.ui.define([
       endChanges : function() {
          console.log("table controller endchanges ",this.tableEveElement );
          this.setEveData();
+      },
+
+
+      elementRemoved: function(elId) {
+
+      var el = this.mgr.GetElement(elId);
+         console.log("EveTable element remobedf ", el);
+
       }
    });
 });
diff --git a/etc/eve7/Summary.controller.js b/etc/eve7/Summary.controller.js
@@ -703,6 +703,10 @@ sap.ui.define([
          }
 
          return tgt;
+      },
+
+      endChanges: function(rebuild) {
+         if (rebuild) updateManger(this.mgr);
       }
 
    });

diff --git a/graf3d/eve7/inc/ROOT/REveDataClasses.hxx b/graf3d/eve7/inc/ROOT/REveDataClasses.hxx
@@ -63,6 +63,7 @@ public:
 
    void ReserveItems(Int_t items_size) { fItems.reserve(items_size); }
    void AddItem(void *data_ptr, const std::string& n, const std::string& t);
+   void ClearItems() { fItems.clear(); }
 
    void SetFilterExpr(const TString &filter);
    void ApplyFilter();

diff --git a/graf3d/eve7/src/REveDataProxyBuilderBase.cxx b/graf3d/eve7/src/REveDataProxyBuilderBase.cxx
@@ -19,6 +19,7 @@ REveDataProxyBuilderBase::Product::Product(const REveViewContext* c) : m_viewCon
 REveDataProxyBuilderBase::REveDataProxyBuilderBase(std::string type):
    m_type(type),
    m_collection(0),
+   m_interactionList(0),
    m_haveWindow(false)
 {
 }
@@ -74,7 +75,7 @@ void REveDataProxyBuilderBase::Build()
          Clean();
          for (Product_it i = m_products.begin(); i != m_products.end(); ++i)
          {
-             //printf("build() %s \n", m_collection->name().c_str());
+            printf("build() %s \n", m_collection->GetCName());
             REveElement* elms = (*i)->m_elements;
             size_t oldSize = elms->NumChildren();
 
@@ -134,7 +135,7 @@ void REveDataProxyBuilderBase::Build()
                for (size_t cnt = 0; cnt < itemSize; ++cnt, ++elIt)
                {
                   if (cnt >= oldSize )
-                     m_interactionList->Added(*elIt, cnt);
+                       m_interactionList->Added(*elIt, cnt);
                }
             }
          }