Merge pull request #8662 from alja/fwdict6-74

Migrate Fireworks dictionary generation to ROOT6
cms-sw · May 3, 2015 · 014ad1c · 014ad1c
2 parents e598187 + 2303f4a
commit 014ad1c
Show file tree

Hide file tree

Showing 22 changed files with 110 additions and 134 deletions.
diff --git a/Fireworks/Core/BuildFile.xml b/Fireworks/Core/BuildFile.xml
@@ -32,6 +32,7 @@
 <lib name="GX11"/>
 <lib name="RGL"/>
 <lib name="GLEW"/>
+<lib name="Gui"/>
 <export>
   <lib name="1"/>
 </export>
diff --git a/Fireworks/Core/interface/FWEveViewManager.h b/Fireworks/Core/interface/FWEveViewManager.h
@@ -77,7 +77,7 @@ class FWEveViewManager : public FWViewManagerBase
 
    FWTypeToRepresentations supportedTypesAndRepresentations() const;
 
-   static void syncAllViews() { s_syncAllViews = false; }
+   static void syncAllViews() { s_syncAllViews = true; }
 protected:
    virtual void modelChangesComing();
    virtual void modelChangesDone();

diff --git a/Fireworks/Core/src/FireworksCoreLinkDef.h b/Fireworks/Core/src/FireworksCoreLinkDef.h
diff --git a/Fireworks/Core/src/classes.h b/Fireworks/Core/src/classes.h
@@ -31,6 +31,42 @@
 #include "Fireworks/Core/interface/FWTSelectorToEventList.h"
 #include "Fireworks/Core/src/FWEveDigitSetScalableMarker.h"
 #include "Fireworks/Core/src/FW3DViewDistanceMeasureTool.h"
+
+
+#include "Fireworks/Core/src/CSGConnector.h"
+#include "Fireworks/Core/interface/FWIntValueListenerBase.h"
+#include "Fireworks/Core/interface/FWSummaryManager.h"
+#include "Fireworks/Core/src/FWGUIEventDataAdder.h"
+#include "Fireworks/Core/src/FWColorSelect.h"
+#include "Fireworks/Core/src/FWNumberEntry.h"
+#include "Fireworks/Core/src/FWCollectionSummaryWidget.h"
+#include "Fireworks/Core/src/FWCompactVerticalLayout.h"
+#include "Fireworks/Core/src/FWModelContextMenuHandler.h"
+
+#include "Fireworks/Core/interface/CmsShowEDI.h"
+#include "Fireworks/Core/interface/FWViewEnergyScaleEditor.h"
+#include "Fireworks/Core/interface/CmsShowSearchFiles.h"
+
+#include "Fireworks/Core/interface/FWGUISubviewArea.h"
+#include "Fireworks/Core/interface/CmsShowMainFrame.h"
+#include "Fireworks/Core/src/FWGUIValidatingTextEntry.h"
+
+#include "Fireworks/Core/interface/CmsShowModelPopup.h"
+#include "Fireworks/Core/interface/FWGUIEventFilter.h"
+#include "Fireworks/Core/interface/CmsShowCommonPopup.h"
+#include "Fireworks/Core/interface/CmsShowViewPopup.h"
+#include "Fireworks/Core/interface/FWInvMassDialog.h"
+
+#include "Fireworks/Core/interface/FWGeometryTableViewBase.h"
+#include "Fireworks/Core/src/FWGeometryTableView.h"
+#include "Fireworks/Core/src/FWOverlapTableView.h"
+#include "Fireworks/Core/interface/FWTextProjected.h"
+
+#include "Fireworks/Core/interface/FWGeoTopNode.h"
+#include "Fireworks/Core/src/FWEveOverlap.h"
+#include "Fireworks/Core/src/FWEveDetectorGeo.h"
+#include "Fireworks/Core/src/FWGeoTopNodeGL.h"
+
 namespace Fireworks_Core {
    struct Fireworks_Core {
       //add 'dummy' Wrapper variable for each class type you put into the Event

diff --git a/Fireworks/Core/src/classes_def.xml b/Fireworks/Core/src/classes_def.xml
@@ -36,4 +36,40 @@
   <class name="FWEveDigitSetScalableMarker"/>
   <class name="FWEveDigitSetScalableMarkerGL"/>
   <class name="FW3DViewDistanceMeasureTool"/>
+
+  <class name="FWGUIEventDataAdder"/>
+  <class name="CSGConnector"/>
+  <class name="FWIntValueListenerBase"/>
+  <class name="FWColorFrame"/>
+  <class name="FWColorPopup"/>
+  <class name="FWColorRow"/>
+  <class name="FWColorSelect"/>
+  <class name="FWNumberEntryField"/>
+  <class name="FWCollectionSummaryWidget"/>
+  <class name="FWSummaryManager"/>
+  <class name="FWCompactVerticalLayout"/>
+  <class name="FWModelContextMenuHandler"/>
+  <class name="CmsShowEDI"/>
+  <class name="FWViewEnergyScaleEditor"/>
+  <class name="CmsShowSearchFiles"/>
+  <class name="FWGUISubviewArea"/>
+  <class name="CmsShowMainFrame"/>
+  <class name="FWGUIValidatingTextEntry"/>
+  <class name="CmsShowModelPopup"/>
+  <class name="FWGUIEventFilter"/>
+  <class name="CmsShowCommonPopup"/>
+  <class name="CmsShowViewPopup"/>
+  <class name="FWInvMassDialog"/>
+  <class name="FWEveText"/>
+  <class name="FWEveTextProjected"/>
+  <class name="FWEveTextGL"/>
+  <class name="FWInvMassDialog"/>
+  <class name="FWGeometryTableViewBase"/>
+  <class name="FWGeometryTableView"/>
+  <class name="FWOverlapTableView"/>
+  <class name="FWGeoTopNode"/>
+  <class name="FWEveOverlap"/>
+  <class name="FWEveDetectorGeo"/>
+  <class name="FWGeoTopNodeGL"/>
+
 </lcgdict>
diff --git a/Fireworks/Eve/BuildFile.xml b/Fireworks/Eve/BuildFile.xml
@@ -5,6 +5,7 @@
 <use name="rootcore"/>
 <use name="rootinteractive"/>
 <lib name="Geom"/>
+<lib name="Gui"/>
 <lib name="Eve"/>
 <export>
 <lib name="1"/>

diff --git a/Fireworks/Eve/python/testEve_cfg.py b/Fireworks/Eve/python/testEve_cfg.py
@@ -7,7 +7,7 @@
 ### Expects test.root in current directory.
 process.source = cms.Source(
     "PoolSource",
-    fileNames=cms.untracked.vstring('file:test.root')
+    fileNames=cms.untracked.vstring('file:/home/alja/cms-dev/7.3/RelValZEE-reco.root')
 )
 
 # process.maxEvents = cms.untracked.PSet(

diff --git a/Fireworks/Eve/src/FireworksEveLinkDef.h b/Fireworks/Eve/src/FireworksEveLinkDef.h
diff --git a/Fireworks/Eve/src/classes.h b/Fireworks/Eve/src/classes.h
@@ -0,0 +1,2 @@
+#include "Fireworks/Eve/interface/EveService.h"
+
diff --git a/Fireworks/Eve/src/classes_def.xml b/Fireworks/Eve/src/classes_def.xml
@@ -0,0 +1,3 @@
+<lcgdict>
+  <class name="EveService"/>
+</lcgdict>
diff --git a/Fireworks/FWInterface/BuildFile.xml b/Fireworks/FWInterface/BuildFile.xml
@@ -13,6 +13,8 @@
 <lib name="Geom"/>
 <lib name="Eve"/>
 <lib name="RGL"/>
+<lib name="GuiHtml"/>
+<lib name="GX11"/>
 <export>
 <lib name="1"/>
 </export>
diff --git a/Fireworks/FWInterface/src/FireworksFWInterfaceLinkDef.h b/Fireworks/FWInterface/src/FireworksFWInterfaceLinkDef.h
diff --git a/Fireworks/FWInterface/src/classes.h b/Fireworks/FWInterface/src/classes.h
@@ -0,0 +1,2 @@
+#include "Fireworks/FWInterface/src/FWPathsPopup.h"
+
diff --git a/Fireworks/FWInterface/src/classes_def.xml b/Fireworks/FWInterface/src/classes_def.xml
@@ -0,0 +1,3 @@
+<lcgdict>
+  <class name="FWPathsPopup"/>
+</lcgdict>
diff --git a/Fireworks/TableWidget/src/FireworksTableWidgetLinkDef.h b/Fireworks/TableWidget/src/FireworksTableWidgetLinkDef.h
diff --git a/Fireworks/TableWidget/src/classes.h b/Fireworks/TableWidget/src/classes.h
@@ -0,0 +1,4 @@
+#include "Fireworks/TableWidget/interface/FWTableWidget.h"
+#include "Fireworks/TableWidget/interface/FWTableManagerBase.h"
+#include "Fireworks/TableWidget/interface/FWCheckedTextTableCellRenderer.h"
+#include "Fireworks/TableWidget/src/FWTabularWidget.h"
diff --git a/Fireworks/TableWidget/src/classes_def.xml b/Fireworks/TableWidget/src/classes_def.xml
@@ -0,0 +1,6 @@
+<lcgdict>
+  <class name="FWTabularWidget"/>
+  <class name="FWTableWidget"/>
+  <class name="FWTableManagerBase"/>
+  <class name="FWCheckedTextTableCellRenderer"/>
+</lcgdict>
diff --git a/Fireworks/Vertices/BuildFile.xml b/Fireworks/Vertices/BuildFile.xml
@@ -6,6 +6,7 @@
 <lib name="Geom"/>
 <lib name="Physics"/>
 <lib name="RGL"/>
+<lib name="Core"/>
 <export>
   <lib name="1"/>
 </export>
diff --git a/Fireworks/Vertices/plugins/BuildFile.xml b/Fireworks/Vertices/plugins/BuildFile.xml
@@ -7,5 +7,6 @@
  <use name="roothistmatrix"/>
  <lib name="Eve"/>
  <lib name="Geom"/>
+ <lib name="Core"/>
  <flags EDM_PLUGIN="1"/>
 </library>
diff --git a/Fireworks/Vertices/src/FireworksVerticesLinkDef.h b/Fireworks/Vertices/src/FireworksVerticesLinkDef.h
diff --git a/Fireworks/Vertices/src/classes.h b/Fireworks/Vertices/src/classes.h
@@ -0,0 +1,4 @@
+#include "Fireworks/Vertices/interface/TEveEllipsoid.h"
+#include "Fireworks/Vertices/interface/TEveEllipsoidGL.h"
+
+
diff --git a/Fireworks/Vertices/src/classes_def.xml b/Fireworks/Vertices/src/classes_def.xml
@@ -0,0 +1,6 @@
+<lcgdict>
+  <class name="TEveEllipsoid"/>
+  <class name="TEveEllipsoidGL"/>
+  <class name="TEveEllipsoidProjected"/>
+  <class name="TEveEllipsoidProjectedGL"/>
+</lcgdict>