Merge pull request #9424 from cms-sw/revert-9423-revert-9080-p5-addons

Revert "Revert "74x: Additional features needed for P5 visualization""

Fireworks/Calo/plugins/FWCaloRecHitDigitSetProxyBuilder.cc

@@ -11,20 +11,24 @@
 #include "Fireworks/Core/interface/FWProxyBuilderConfiguration.h"
 
 FWCaloRecHitDigitSetProxyBuilder::FWCaloRecHitDigitSetProxyBuilder()
-   : m_invertBox(false), m_ignoreGeoShapeSize(false) 
+   : m_invertBox(false), m_ignoreGeoShapeSize(false), m_enlarge(1.0)
 {} 
 
 //______________________________________________________________________________
 
 void FWCaloRecHitDigitSetProxyBuilder::setItem(const FWEventItem* iItem)
 {
    FWProxyBuilderBase::setItem(iItem);
-   // if (iItem) iItem->getConfig()->assertParam( "IgnoreShapeSize", false);
+   if (iItem) {
+      iItem->getConfig()->assertParam( "Enlarge", 1.0, 1.0, 5.0);
+      // iItem->getConfig()->assertParam( "IgnoreShapeSize", false);
+   }
 }
 //______________________________________________________________________________
 
 void FWCaloRecHitDigitSetProxyBuilder::viewContextBoxScale( const float* corners, float scale, bool plotEt, std::vector<float>& scaledCorners, const CaloRecHit*)
 {
+   scale *= m_enlarge;
    if ( m_ignoreGeoShapeSize)
    {
       // Same functionality as fireworks::energyTower3DCorners()
@@ -141,6 +145,7 @@ FWCaloRecHitDigitSetProxyBuilder::build( const FWEventItem* iItem, TEveElementLi
    if (!size) return;
 
    // m_ignoreGeoShapeSize = item()->getConfig()->value<bool>("IgnoreShapeSize");
+   m_enlarge = item()->getConfig()->value<double>("Enlarge");
 
    std::vector<float> scaledCorners(24);
 

Fireworks/Calo/plugins/FWCaloRecHitDigitSetProxyBuilder.h

@@ -29,6 +29,7 @@ class FWCaloRecHitDigitSetProxyBuilder : public FWDigitSetProxyBuilder
 
    bool m_invertBox;
    bool m_ignoreGeoShapeSize;
+   double m_enlarge;
    TEveVector m_vector; // internal memeber, to avoid constant recreation
 };
 #endif

Fireworks/Core/doc/Core.doc

@@ -90,7 +90,6 @@
 - FWHFView
 - FWHLTTriggerTableView
 - FWHLTValidator
-- FWHandle
 - FWISpyView
 - FWIntValueListener
 - FWIntValueListenerBase

Fireworks/Core/interface/ActionsList.h

@@ -11,6 +11,11 @@ namespace cmsshow {
    extern const std::string sLoadConfig;
    extern const std::string sSaveConfig;
    extern const std::string sSaveConfigAs;
+
+   extern const std::string sLoadPartialConfig;
+   extern const std::string sSavePartialConfig;
+   extern const std::string sSavePartialConfigAs;
+
    extern const std::string sExportImage;
    extern const std::string sExportAllImages;
 

Fireworks/Core/interface/CmsShowMainBase.h

@@ -80,7 +80,10 @@ class CmsShowMainBase
 
    void writeToConfigFile(const std::string &config);
    void writeToCurrentConfigFile();
+   void writePartialToConfigFile();
    void reloadConfiguration(const std::string &config);
+   void partialWriteToConfigFile(const std::string &config);
+   void partialLoadConfiguration(const std::string &config);
    void setupConfiguration();
 
    void registerPhysicsObject(const FWPhysicsObjectDesc&iItem);
@@ -114,8 +117,9 @@ class CmsShowMainBase
    void playForward();
    void playBackward();
    bool isPlaying() const { return m_isPlaying; }
-   void setIsPlaying(bool value) { m_isPlaying = value; }
-   virtual void stopPlaying() = 0;
+
+   virtual void checkKeyBindingsOnPLayEventsStateChanged() {}
+   virtual void stopPlaying();
    virtual void autoLoadNewEvent() = 0;
 
    void setPlayLoop();

Fireworks/Core/interface/FW3DView.h

@@ -1,4 +1,4 @@
-#ifndef Fireworks_Core_FW3DEnergyView_h
+#ifndef Fireworks_Core_FW3DView_h
 #define Fireworks_Core_FW3DView_h
 // -*- C++ -*-
 //

Fireworks/Core/interface/FW3DViewBase.h

@@ -34,6 +34,7 @@ class FW3DViewGeometry;
 class FWColorManager;
 class TGLClip;
 class TEveLine;
+class TEveBoxSet;
 
 class FW3DViewDistanceMeasureTool;
 
@@ -61,6 +62,7 @@ class FW3DViewBase : public FWEveView
    virtual bool requestGLHandlerPick() const;
    void setCurrentDMTVertex(double x, double y, double z);
 
+   void showEcalBarrel(bool);
 private:
    FW3DViewBase(const FW3DViewBase&);    // stop default
 
@@ -78,6 +80,9 @@ class FW3DViewBase : public FWEveView
    FWBoolParameter m_showTrackerBarrel;
    FWBoolParameter m_showTrackerEndcap;
 
+   TEveBoxSet* m_ecalBarrel;
+   FWBoolParameter m_showEcalBarrel;
+
    FWEnumParameter m_rnrStyle;
    FWBoolParameter m_clipParam;
    FWBoolParameter m_selectable;

Fireworks/Core/interface/FWConfiguration.h

@@ -70,6 +70,7 @@ class FWConfiguration
    FWConfiguration& addValue(const std::string&);
    void swap(FWConfiguration& );
 
+   static void streamTo(std::ostream& oTo, const FWConfiguration& iConfig, const std::string &name);
 
 private:
 

Fireworks/Core/interface/FWConfigurationManager.h

@@ -42,14 +42,14 @@ class FWConfigurationManager
 
    void writeToFile(const std::string&) const;
    void readFromFile(const std::string&) const;
-   void guessAndReadFromFile(FWJobMetadataManager*) const;
+   std::string guessAndReadFromFile(FWJobMetadataManager*) const;
    // ---------- static member functions --------------------
 
    // ---------- member functions ---------------------------
    ///does not take ownership
    void add(const std::string& iName, FWConfigurable*);
 
-   void setIgnore() { m_ignore = false; }
+   void setIgnore() { m_ignore = true; }
    bool getIgnore() const { return m_ignore; }
 
 private:

Fireworks/Core/interface/FWFileEntry.h

@@ -1,6 +1,6 @@
 // -*- C++ -*-
 #ifndef Fireworks_Core_FWFileEntry_h
-#define Fireworks_Core_FWFileEntryr_h
+#define Fireworks_Core_FWFileEntry_h
 //
 // Package:     Core
 // Class  :     FWFileEntry

Fireworks/Core/interface/FWGUIEventFilter.h

@@ -1,3 +1,7 @@
+
+#ifndef Fireworks_Core_GUIEventFilter_h
+#define Fireworks_Core_GUIEventFilter_h
+
 #include <list>
 
 #include "TGFrame.h"
@@ -79,3 +83,4 @@ class FWGUIEventFilter: public TGMainFrame
    CmsShowNavigator*    m_navigator;
 };
 
+#endif

Fireworks/Core/interface/FWGUIManager.h

@@ -205,7 +205,9 @@ class FWGUIManager : public FWConfigurable
    sigc::signal<void> filterButtonClicked_;
    sigc::signal<void, const TGWindow*> showEventFilterGUI_;
    sigc::signal<void, const std::string&> writeToConfigurationFile_;
+   sigc::signal<void, const std::string&> writePartialToConfigurationFile_;
    sigc::signal<void, const std::string&> loadFromConfigurationFile_;
+   sigc::signal<void, const std::string&> loadPartialFromConfigurationFile_;
    sigc::signal<void, edm::RunNumber_t, edm::LuminosityBlockNumber_t, edm::EventNumber_t> changedEventId_;
    sigc::signal<void> goingToQuit_;
    sigc::signal<void> writeToPresentConfigurationFile_;
@@ -224,7 +226,10 @@ class FWGUIManager : public FWConfigurable
 
    bool promptForConfigurationFile(std::string &result, enum EFileDialogMode mode);
    void promptForSaveConfigurationFile();
+   void promptForPartialSaveConfigurationFile();
    void promptForLoadConfigurationFile();
+   void promptForPartialLoadConfigurationFile();
+   void savePartialToConfigurationFile();
 
    void delaySliderChanged(Int_t);
 

Fireworks/Core/interface/FWISpyView.h

@@ -24,7 +24,6 @@
 #include "Fireworks/Core/interface/FW3DViewBase.h"
 
 // forward declarations
-class TEveBoxSet;
 
 class FWISpyView : public FW3DViewBase
 {
@@ -34,7 +33,6 @@ class FWISpyView : public FW3DViewBase
    virtual void setContext(const fireworks::Context& x);
 
    virtual void populateController(ViewerParameterGUI&) const;
-   void showEcalBarrel(bool);
    // ---------- const member functions ---------------------
 
    // ---------- static member functions --------------------
@@ -46,10 +44,7 @@ class FWISpyView : public FW3DViewBase
 
    const FWISpyView& operator=(const FWISpyView&); // stop default
 
-   // ---------- member data --------------------------------
-   TEveBoxSet* m_ecalBarrel;
-   FWBoolParameter m_showEcalBarrel;
+   // ---------- member data --------------------------------};
 };
 
-
 #endif

Fireworks/Core/interface/FWPartialConfig.h

@@ -0,0 +1,61 @@
+#ifndef Fireworks_Core_FWPartialConfig
+#define Fireworks_Core_FWPartialConfig
+#include <TGFrame.h>
+#include <vector>
+#include "Fireworks/Core/interface/FWConfiguration.h"
+
+class TGCheckButton;
+class FWConfigurationManager;
+class FWEventItemsManager;
+
+class FWPartialConfigGUI : public TGTransientFrame
+{
+ public:
+  FWPartialConfigGUI(const char* path,  FWConfigurationManager*);
+  ~FWPartialConfigGUI() {}
+  void Cancel();
+
+ protected:
+  std::vector <TGCheckButton*> m_entries;
+  FWConfiguration m_origConfig;
+  FWConfigurationManager* m_cfgMng;
+
+  ClassDef(FWPartialConfigGUI, 0);
+};
+
+//---------------------------------------------------------------------
+
+class FWPartialConfigLoadGUI : public FWPartialConfigGUI
+{
+ public:
+  FWPartialConfigLoadGUI( const char* path,  FWConfigurationManager* ,FWEventItemsManager*);
+  ~FWPartialConfigLoadGUI();
+
+  void Load();
+
+ private:
+  FWEventItemsManager* m_eiMng;
+  const char* m_oldConfigName;
+  ClassDef(FWPartialConfigLoadGUI, 0);
+};
+
+
+//---------------------------------------------------------------------
+
+class FWPartialConfigSaveGUI : public FWPartialConfigGUI
+{
+ public:
+   FWPartialConfigSaveGUI( const char* path_out,const char* path_in, FWConfigurationManager* );
+  ~FWPartialConfigSaveGUI() {}
+
+  void Write();
+
+ private:
+  std::string m_outFileName;
+  std::string m_currFileName;
+
+  ClassDef(FWPartialConfigSaveGUI, 0);
+};
+
+
+#endif