Merge pull request #3 from osschar/reve-7.5

No risk - no fun Rename TEve classes to REve.
alja · Oct 1, 2018 · 5df5848 · 5df5848
2 parents 3090615 + 329e6b7
commit 5df5848
Show file tree

Hide file tree

Showing 78 changed files with 3,335 additions and 3,397 deletions.
diff --git a/etc/eve7/EveManager.js b/etc/eve7/EveManager.js
@@ -124,10 +124,10 @@
    EveManager.prototype.ProcessData = function(arr) {
       if (!arr) return;
 
-      if (arr[0].content == "TEveScene::StreamElements")
+      if (arr[0].content == "REveScene::StreamElements")
          return this.Update(arr);
 
-      if (arr[0].content == "TEveManager::DestroyElementsOf")
+      if (arr[0].content == "REveManager::DestroyElementsOf")
          return this.DestroyElements(arr);
    }
 
@@ -312,7 +312,7 @@
 
       for (var k=0;k<chlds.length;++k) {
          if (!chlds[k].childs) continue;
-         if (chlds[k]._typename == "ROOT::Experimental::TEveViewerList") return chlds[k].childs;
+         if (chlds[k]._typename == "ROOT::Experimental::REveViewerList") return chlds[k].childs;
          var res = this.FindViewers(chlds[k].childs);
          if (res) return res;
       }
@@ -368,12 +368,12 @@
 
    EveManager.prototype.CanEdit = function(elem) {
       // AMT this should be decided by the Summary controller
-      if (elem._typename=="ROOT::Experimental::TEvePointSet") return true;
-      if (elem._typename=="ROOT::Experimental::TEveJetCone") return true;
-      if (elem._typename=="ROOT::Experimental::TEveTrack") return true;
-      if (elem._typename=="ROOT::Experimental::TEveDataCollection") return true;
-      if (elem._typename=="ROOT::Experimental::TEveDataItem") return true;
-      if (elem._typename=="ROOT::Experimental::TEveElementList") return true;
+      if (elem._typename=="ROOT::Experimental::REvePointSet") return true;
+      if (elem._typename=="ROOT::Experimental::REveJetCone") return true;
+      if (elem._typename=="ROOT::Experimental::REveTrack") return true;
+      if (elem._typename=="ROOT::Experimental::REveDataCollection") return true;
+      if (elem._typename=="ROOT::Experimental::REveDataItem") return true;
+      if (elem._typename=="ROOT::Experimental::REveElementList") return true;
       return false;
    }
 

diff --git a/etc/eve7/GL.controller.js b/etc/eve7/GL.controller.js
@@ -104,7 +104,7 @@ sap.ui.define([
       fShapeId: 256, fShapeBits: 1024, fDX: 200, fDY: 300, fDZ: 400, fOrigin: [0,0,0]
       };
 
-      var geom_obj = JSROOT.extend(JSROOT.Create("TEveGeoShapeExtract"),
+      var geom_obj = JSROOT.extend(JSROOT.Create("REveGeoShapeExtract"),
                       { fTrans: null, fShape: shape, fRGBA: [0, 1, 0, 0.2], fElements: null, fRnrSelf: true });
  */
          var options = "", geom_obj = null;

diff --git a/etc/eve7/Main.controller.js b/etc/eve7/Main.controller.js
@@ -35,13 +35,13 @@ sap.ui.define(['sap/ui/core/mvc/Controller',
 
          var resp = JSON.parse(msg);
 
-         if (resp && resp[0] && resp[0].content == "TEveManager::DestroyElementsOf") {
+         if (resp && resp[0] && resp[0].content == "REveManager::DestroyElementsOf") {
 
             this.mgr.DestroyElements(resp);
 
             this.getView().byId("Summary").getController().UpdateMgr(this.mgr);
 
-         } else if (resp && resp[0] && resp[0].content == "TEveScene::StreamElements") {
+         } else if (resp && resp[0] && resp[0].content == "REveScene::StreamElements") {
 
             this.mgr.Update(resp);
             // console.log('element',

diff --git a/etc/eve7/Summary.controller.js b/etc/eve7/Summary.controller.js
@@ -111,7 +111,7 @@ $.getScript("jsrootsys/openui5/ColorButton.js", function() {
          sap.ui.getCore().setModel(this.oModelGED, "ged");
 
          this.oGuiClassDef = {
-            "TEveElement" : [{
+            "REveElement" : [{
                name : "RnrSelf",
                _type   : "Bool"
             }, {
@@ -123,27 +123,27 @@ $.getScript("jsrootsys/openui5/ColorButton.js", function() {
                srv  : "SetMainColorRGB",
                _type   : "Color"
             }],
-            "TEveElementList" : [ {sub: ["TEveElement"]}],
-            "TEvePointSet" : [
+            "REveElementList" : [ {sub: ["REveElement"]}],
+            "REvePointSet" : [
             {
-                  sub: ["TEveElement"]
+                  sub: ["REveElement"]
             }, {
                name : "MarkerSize",
                _type   : "Number"
             }],
-            "TEveJetCone" : [{sub: ["TEveElement"]},{
+            "REveJetCone" : [{sub: ["REveElement"]},{
                name : "NDiv",
                _type   : "Number"
             }],
-            "TEveTrack" : [ {sub: ["TEveElement"]},{
+            "REveTrack" : [ {sub: ["REveElement"]},{
                name : "LineWidth",
                _type   : "Number"
             }],
-            "TEveDataCollection" : [{
+            "REveDataCollection" : [{
                name : "Filter",
                _type   : "String"
             }],
-            "TEveDataItem" : [{
+            "REveDataItem" : [{
                name : "Filtered",
                _type   : "Bool"
             }]

diff --git a/graf3d/eve7/CMakeLists.txt b/graf3d/eve7/CMakeLists.txt
@@ -7,4 +7,4 @@ ROOT_STANDARD_LIBRARY_PACKAGE(ROOTEve
 
 include_directories(${CMAKE_SOURCE_DIR}/io/io/res ${CMAKE_SOURCE_DIR}/graf3d/eve7)
 
-# set_source_files_properties(src/TEveGluTess.cxx PROPERTIES COMPILE_FLAGS -Wno-unused-parameter)
+# set_source_files_properties(src/REveGluTess.cxx PROPERTIES COMPILE_FLAGS -Wno-unused-parameter)
Original file line number	Diff line number	Diff line change
Expand Up		@@ -7,4 +7,4 @@ ROOT_STANDARD_LIBRARY_PACKAGE(ROOTEve

		include_directories(${CMAKE_SOURCE_DIR}/io/io/res ${CMAKE_SOURCE_DIR}/graf3d/eve7)

		# set_source_files_properties(src/TEveGluTess.cxx PROPERTIES COMPILE_FLAGS -Wno-unused-parameter)
		# set_source_files_properties(src/REveGluTess.cxx PROPERTIES COMPILE_FLAGS -Wno-unused-parameter)