Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

75x Fireworks: open 3D region from context menu #10488

Merged
merged 2 commits into from Jul 31, 2015
Merged

75x Fireworks: open 3D region from context menu #10488

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d00f718
Add interface to set clipping in 3D view from the model context menu.
alja Jul 15, 2015
139f90d
Draw default geomtery in the clipped region.
alja Jul 30, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
17 changes: 15 additions & 2 deletions Fireworks/Core/interface/FW3DViewBase.h
View file
Open in desktop
Expand Up @@ -23,6 +23,7 @@
// user include files
#include "Rtypes.h"
#include "Fireworks/Core/interface/FWEveView.h"
#include "Fireworks/Core/interface/fwLog.h"
#include "Fireworks/Core/interface/FWLongParameter.h"
#include "Fireworks/Core/interface/FWBoolParameter.h"
// forward declarations
Expand Down Expand Up @@ -63,6 +64,9 @@ class FW3DViewBase : public FWEveView
void setCurrentDMTVertex(double x, double y, double z);

void showEcalBarrel(bool);

void setClip(float eta, float phi);

private:
FW3DViewBase(const FW3DViewBase&); // stop default

Expand All @@ -84,16 +88,25 @@ class FW3DViewBase : public FWEveView
FWBoolParameter m_showEcalBarrel;

FWEnumParameter m_rnrStyle;
FWBoolParameter m_clipParam;
FWBoolParameter m_selectable;

FWEnumParameter m_cameraType;

FWBoolParameter m_clipEnable;
FWDoubleParameter m_clipEta;
FWDoubleParameter m_clipPhi;
FWDoubleParameter m_clipDelta1;
FWDoubleParameter m_clipDelta2;


FW3DViewDistanceMeasureTool* m_DMT;
TEveLine* m_DMTline;

void selectable( bool );
void sceneClip( bool );

void enableSceneClip( bool );
void updateClipPlanes();

void rnrStyle(long);
void showMuonBarrel( long );
void setCameraType(long);
Expand Down
1 change: 1 addition & 0 deletions Fireworks/Core/interface/FWGUIManager.h
View file
Open in desktop
Expand Up @@ -126,6 +126,7 @@ class FWGUIManager : public FWConfigurable
///Allowed values are -1 or ones from FWDataCategories enum
void showEDIFrame(int iInfoToShow=-1);

void open3DRegion();
void showCommonPopup();

void createModelPopup();
Expand Down
167 changes: 124 additions & 43 deletions Fireworks/Core/src/FW3DViewBase.cc
View file
Open in desktop
Expand Up @@ -25,6 +25,8 @@
#include "TEveScene.h"
#include "TGLLogicalShape.h"
#include "TEveCalo.h"
#include "TEveCaloData.h"
#include "TEveStraightLineSet.h"

#include "Fireworks/Core/interface/FW3DViewBase.h"
#include "Fireworks/Core/interface/FW3DViewGeometry.h"
Expand Down Expand Up @@ -56,48 +58,30 @@ class Clipsi : public TGLClip
Clipsi(const Clipsi&); // Not implemented
Clipsi& operator=(const Clipsi&); // Not implemented

TGLVertex3 vtx[4];

public:
Clipsi(TGLRnrCtx* ctx):TGLClip(* new TGLClipsiLogical, TGLMatrix(), fgColor), m_rnrCtx(ctx){}
virtual ~Clipsi() {}
using TGLClip::Setup;
virtual void Setup(const TGLBoundingBox & bbox) override {}

void SetPlaneInfo(TEveVector* vec)
{
for (int i = 0; i < 4; ++i) {
// vec[i].Dump();
vtx[i].Set(vec[i].fX, vec[i].fY, vec[i].fZ);
}
}

using TGLClip::PlaneSet;
virtual void PlaneSet(TGLPlaneSet_t & planeSet) const override
{
TGLCamera& cam = m_rnrCtx->RefCamera();

TGLVertex3 f[4];

f[0] = Intersection(cam.FrustumPlane(TGLCamera::kFar),
cam.FrustumPlane(TGLCamera::kBottom),
cam.FrustumPlane(TGLCamera::kLeft)).second;

f[1] = Intersection(cam.FrustumPlane(TGLCamera::kFar),
cam.FrustumPlane(TGLCamera::kBottom),
cam.FrustumPlane(TGLCamera::kRight)).second;

f[2] = Intersection(cam.FrustumPlane(TGLCamera::kFar),
cam.FrustumPlane(TGLCamera::kTop),
cam.FrustumPlane(TGLCamera::kRight)).second;

f[3] = Intersection(cam.FrustumPlane(TGLCamera::kFar),
cam.FrustumPlane(TGLCamera::kTop),
cam.FrustumPlane(TGLCamera::kLeft)).second;

TGLVector3 dd = cam.FrustumPlane(TGLCamera::kNear).Norm();
dd *= (cam.GetFarClip() -cam.GetNearClip() );

f[0] -= dd;
f[1] -= dd;
f[2] -= dd;
f[3] -= dd;

TGLVertex3 c;//(cam.GetCenterVec());
planeSet.push_back(TGLPlane(c, f[0], f[1]));
planeSet.push_back(TGLPlane(c, f[1], f[2]));
planeSet.push_back(TGLPlane(c, f[2], f[3]));
planeSet.push_back(TGLPlane(c, f[3], f[0]));
TGLVertex3 o;
planeSet.push_back(TGLPlane(o, vtx[0], vtx[1]));
planeSet.push_back(TGLPlane(o, vtx[1], vtx[2]));
planeSet.push_back(TGLPlane(o, vtx[2], vtx[3]));
planeSet.push_back(TGLPlane(o, vtx[3], vtx[0]));
}
};
}
Expand All @@ -123,9 +107,13 @@ FW3DViewBase::FW3DViewBase(TEveWindowSlot* iParent, FWViewType::EType typeId, un
m_ecalBarrel(0),
m_showEcalBarrel(this, "Show Ecal Barrel", typeId == FWViewType::kISpy ? true : false),
m_rnrStyle(this, "Render Style", 0l, 0l, 2l),
m_clipParam(this, "View dependent Clip", false),
m_selectable(this, "Enable Tooltips", false),
m_cameraType(this, "Camera Type", 0l, 0l, 5l),
m_clipEnable(this, "Enable Clip", false),
m_clipEta(this, "Clip Eta", 0.0, -5.0, 5.0),
m_clipPhi(this, "Clip Phi", 0.0, -2.0, 2.0),
m_clipDelta1(this, "Clip Delta1", 0.2, 0.01, 2),
m_clipDelta2(this, "Clip Delta2", 0.2, 0.01, 2),
m_DMT(0),
m_DMTline(0)
{
Expand All @@ -141,7 +129,6 @@ FW3DViewBase::FW3DViewBase(TEveWindowSlot* iParent, FWViewType::EType typeId, un
m_rnrStyle.addEntry(TGLRnrCtx::kOutline, "Outline");
m_rnrStyle.addEntry(TGLRnrCtx::kWireFrame, "WireFrame");
m_rnrStyle.changed_.connect(boost::bind(&FW3DViewBase::rnrStyle,this, _1));
m_clipParam.changed_.connect(boost::bind(&FW3DViewBase::sceneClip,this, _1));

m_selectable.changed_.connect(boost::bind(&FW3DViewBase::selectable,this, _1));

Expand All @@ -155,6 +142,12 @@ FW3DViewBase::FW3DViewBase(TEveWindowSlot* iParent, FWViewType::EType typeId, un
m_cameraType.addEntry(TGLViewer::kCameraOrthoZnOY,"OrthoZnOY" );
m_cameraType.changed_.connect(boost::bind(&FW3DViewBase::setCameraType,this, _1));

m_clipEnable.changed_.connect(boost::bind(&FW3DViewBase::enableSceneClip,this, _1));
m_clipEta.changed_.connect(boost::bind(&FW3DViewBase::updateClipPlanes,this));
m_clipPhi.changed_.connect(boost::bind(&FW3DViewBase::updateClipPlanes,this));
m_clipDelta1.changed_.connect(boost::bind(&FW3DViewBase::updateClipPlanes,this));
m_clipDelta2.changed_.connect(boost::bind(&FW3DViewBase::updateClipPlanes,this));


m_ecalBarrel = new TEveBoxSet("ecalBarrel");
m_ecalBarrel->UseSingleColor();
Expand Down Expand Up @@ -230,10 +223,12 @@ FW3DViewBase::selectable( bool x)
geoScene()->GetGLScene()->SetSelectable(x);
}
void
FW3DViewBase::sceneClip( bool x)
FW3DViewBase::enableSceneClip( bool x)
{
if (m_glClip == 0) {
m_glClip = new Clipsi(viewerGL()->GetRnrCtx());

m_glClip->SetMode(TGLClip::kOutside);
}

geoScene()->GetGLScene()->SetClip(x ? m_glClip : 0);
Expand All @@ -242,9 +237,95 @@ FW3DViewBase::sceneClip( bool x)
if (strncmp((*it)->GetElementName(), "TopGeoNodeScene", 15) == 0)
((TEveScene*)(*it))->GetGLScene()->SetClip(x ? m_glClip : 0);
}
eventScene()->GetGLScene()->SetClip(x ? m_glClip : 0);
updateClipPlanes();
viewerGL()->RequestDraw();
}

void
FW3DViewBase::setClip(float eta, float phi)
{
// called from popup menu via FWGUIManager
/*
m_showMuonBarrel.set(1);
m_showMuonEndcap.set(true);
m_showPixelBarrel.set(true);
m_showPixelEndcap.set(true);
m_showTrackerBarrel.set(true);
*/
m_clipEta.set(eta);
m_clipPhi.set(phi);
m_clipEnable.set(true);
}

void
FW3DViewBase::updateClipPlanes()
{
// TEveScene* gs = (TEveScene*)gEve->GetScenes()->FindChild(TString("TopGeoNodeScene"));
//printf("node scene %p\n", gs);
if (m_clipEnable.value())
{
float eta = m_clipEta.value();
float phi = m_clipPhi.value();
using namespace TMath;
TEveVector in(Sin(eta)*Cos(phi), Sin(eta)*Sin(phi), Cos(eta));

// one side of cross section plane is paralel to XY plane
TEveVector normXY(0., 1., 0);
TEveVector b0 = in.Cross(normXY);
TEveVector b1 = in.Cross(b0);

float delta1 = m_clipDelta1.value();
float delta2 = m_clipDelta2.value();
b0.Normalize();
b0 *= Sin(delta1);
b1.Normalize();
b1 *= Sin(delta2);

TEveVector c[4];
c[0] += b0; c[0] += b1;
c[1] -= b0; c[1] += b1;
c[2] -= b0; c[2] -= b1;
c[3] += b0; c[3] -= b1;
for (int i = 0; i < 4; ++i)
c[i] += in;

((Clipsi*)m_glClip)->SetPlaneInfo(&c[0]);


TEveStraightLineSet* ls = (TEveStraightLineSet*)eventScene()->FindChild(TString("Frust"));
if (!ls) {
ls = new TEveStraightLineSet("Frust");
eventScene()->AddElement(ls);
ls->SetMainColor(kWhite);
}

in *= 500;
ls->AddLine(0, 0, 0, in.fX, in.fY, in.fZ);



TEvePointSet* psi = (TEvePointSet*)eventScene()->FindChild(TString("marker"));
TEvePointSet* marker = (TEvePointSet*)(psi);
if (!marker) {
marker = new TEvePointSet(8);
marker->Reset(4);
marker->SetName("marker");
marker->SetMarkerColor(kOrange);
marker->SetMarkerStyle(3);
marker->SetMarkerSize(0.2);
}
for (int i = 0; i < 4; ++i)
marker->SetPoint(i, c[i].fX, c[i].fY, c[i].fZ);
eventScene()->AddElement(marker);
}
/*
else {
fwLog(fwlog::kError) << "Clipping is not enabled!\n";
}
*/
}

//______________________________________________________________________________
void
FW3DViewBase::addTo(FWConfiguration& iTo) const
Expand Down Expand Up @@ -309,10 +390,14 @@ FW3DViewBase::populateController(ViewerParameterGUI& gui) const
addParam(&m_showPixelBarrel).
addParam(&m_showPixelEndcap).
addParam(&m_showEcalBarrel).
separator().
addParam(&m_rnrStyle).
addParam(&m_clipParam).
addParam(&m_selectable);
addParam(&m_selectable).
separator().
addParam(&m_clipEnable).
addParam(&m_clipEta).
addParam(&m_clipPhi).
addParam(&m_clipDelta1).
addParam(&m_clipDelta2);


gui.requestTab("Style").separator();
Expand All @@ -321,12 +406,8 @@ FW3DViewBase::populateController(ViewerParameterGUI& gui) const

gui.requestTab("Tools").addParam(&m_cameraType).separator();
gui.getTabContainer()->AddFrame(m_DMT->buildGUI( gui.getTabContainer()), new TGLayoutHints(kLHintsExpandX, 2, 2, 2, 2));

}




void FW3DViewBase::showEcalBarrel(bool x) {
if (x && m_ecalBarrel->GetPlex()->Size() == 0) {
const FWGeometry* geom = context().getGeom();
Expand Down
43 changes: 37 additions & 6 deletions Fireworks/Core/src/FWGUIManager.cc
View file
Open in desktop
Expand Up @@ -8,10 +8,6 @@
//
// Original Author: Chris Jones
// Created: Mon Feb 11 11:06:40 EST 2008




// system include files
#include <boost/bind.hpp>
#include <stdexcept>
Expand Down Expand Up @@ -81,8 +77,15 @@
#include "Fireworks/Core/src/FWModelContextMenuHandler.h"

#include "Fireworks/Core/interface/fwLog.h"

#include "Fireworks/Core/interface/FWEventItem.h"
#include "Fireworks/Core/interface/FW3DViewBase.h"

#include "FWCore/Common/interface/EventBase.h"

#include "CommonTools/Utils/src/Grammar.h"
#include "CommonTools/Utils/interface/Exception.h"



// constants, enums and typedefs
Expand Down Expand Up @@ -642,6 +645,36 @@ FWGUIManager::showEDIFrame(int iToShow)
m_ediFrame->MapRaised();
}


void
FWGUIManager::open3DRegion()
{
FWModelId id = *(m_context->selectionManager()->selected().begin());
float eta =0, phi = 0;
{
edm::TypeWithDict type = edm::TypeWithDict((TClass*)id.item()->modelType());
using namespace boost::spirit::classic;
reco::parser::ExpressionPtr tmpPtr;
reco::parser::Grammar grammar(tmpPtr,type);
edm::ObjectWithDict o(type, (void*)id.item()->modelData(id.index()));
try {
parse("theta()", grammar.use_parser<1>() >> end_p, space_p).full;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does it really work?
According to the Clang 664 and 666 line expressions are not used:

Fireworks/Core/src/FWGUIManager.cc:664:70: error: expression result unused [-Werror,-Wunused-value]
Fireworks/Core/src/FWGUIManager.cc:666:68: error: expression result unused [-Werror,-Wunused-value]

This is crashing CLANG IBs.

I guess you need if-statement around parse() to at least calm down the Clang, e.g.

111    if(m_type != edm::TypeWithDict() && iExpression.size())
112    {
113       using namespace fireworks::expression;
114
115       //Backwards compatibility with old format
116       std::string temp = oldToNewFormat(iExpression);
117
118       //now setup the parser
119       try
120       {
121          if(parse(temp.c_str(), grammar.use_parser<1>() >> end_p, space_p).full)
122          {
123             m_entries.push_back(Entry(tmpPtr, iExpression, iUnit, iTitle.empty() ? iExpression :iTitle , iPrec));
124             m_titleWidth = TMath::Max(m_titleWidth, (int) m_entries.back().m_title.size());
125             return true;
126          }
127       }
128       catch(const reco::parser::BaseException& e)
129       {
130          // std::cout <<"failed to parse "<<iExpression<<" because "<<reco::parser::baseExceptionWhat(e)<<std::endl;
131       }
132    }
133    return false;

eta = tmpPtr->value(o);
parse("phi()", grammar.use_parser<1>() >> end_p, space_p).full;
phi = tmpPtr->value(o);

ViewMap_i it = createView( "3D Tower", m_viewSecPack->NewSlot());
FW3DViewBase* v = static_cast<FW3DViewBase*>(it->second);
v->setClip(eta, phi);
it->first->UndockWindow();
}
catch(const reco::parser::BaseException& e)
{
std::cout <<" FWModelFilter failed to base "<< e.what() << std::endl;
}
}
}

void
FWGUIManager::showCommonPopup()
{
Expand Down Expand Up @@ -1362,8 +1395,6 @@ FWGUIManager::setFrom(const FWConfiguration& iFrom) {

// disable first docked view
checkSubviewAreaIconState(0);


}

void
Expand Down