[root] / trunk / graf3d / eve / inc / TEveCalo.h Repository:
ViewVC logotype

Log of /trunk/graf3d/eve/inc/TEveCalo.h

Parent Directory Parent Directory


Links to HEAD: (view) (download) (as text) (annotate)
Sticky Revision:

Revision 45880 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Wed Sep 5 22:53:24 2012 UTC (2 years, 4 months ago) by matevz
File length: 12846 byte(s)
Diff to previous 38721
From Christian Pulvermacher: Extend TEveCalo classes to support asymmetric
calorimeters (endcaps at different z positions).

Revision 38721 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Mon Apr 4 13:37:12 2011 UTC (3 years, 9 months ago) by matevz
File length: 12201 byte(s)
Diff to previous 35074
Merge the following revisions from branches/dev/fireworks:
37780, 37831, 38257, 38388, 38390, 38400, 38406, 38407, 38412, 38415,
38416, 38420, 38481


37780
=====

Author: alja
Date: Thu Jan 13 20:37:48 2011
New Revision: 37780

URL: http://root.cern.ch/viewvc?rev=37780&root=root&view=rev
Log:

Use double precision for track propagation.

TEveTrack, TEveTrackPropagator:
Change memebers for track propagation to use double types.

TEvePathMark:
Add copy constructor.

TEveVSDStructs:
Template TEveRecTrack for double and float types.

track.C:
Use TEveRecTrackD and TEvePathMarkD to avoid unnecessary float to double conversion.
Replace virtual TEveMagField::GetFieldD() with TEveMagField::GetField() to avoid float to
double conversion.

Modified:
    branches/dev/fireworks/graf3d/eve/inc/LinkDef1.h
    branches/dev/fireworks/graf3d/eve/inc/TEvePathMark.h
    branches/dev/fireworks/graf3d/eve/inc/TEveTrack.h
    branches/dev/fireworks/graf3d/eve/inc/TEveTrackPropagator.h
    branches/dev/fireworks/graf3d/eve/inc/TEveVSDStructs.h
    branches/dev/fireworks/graf3d/eve/src/TEveTrack.cxx
    branches/dev/fireworks/graf3d/eve/src/TEveTrackGL.cxx
    branches/dev/fireworks/graf3d/eve/src/TEveTrackProjected.cxx
    branches/dev/fireworks/graf3d/eve/src/TEveTrackPropagator.cxx
    branches/dev/fireworks/graf3d/eve/src/TEveVSDStructs.cxx
    branches/dev/fireworks/tutorials/eve/track.C


37831
=====

Author: alja
Date: Fri Jan 21 14:52:01 2011
New Revision: 37831

URL: http://root.cern.ch/viewvc?rev=37831&root=root&view=rev
Log:

Fix 3D-axis font size when TEveCaloData is empty.
Read axis divisions from x,y axis.

Modified:
    branches/dev/fireworks/graf3d/eve/src/TEveCaloLegoGL.cxx


38257
=====

Author: alja
Date: Tue Mar  1 15:34:36 2011
New Revision: 38257

URL: http://root.cern.ch/viewvc?rev=38257&root=root&view=rev
Log:
Fix pick camera-center when depth test is disabled.

Modified:
    branches/dev/fireworks/graf3d/eve/src/TEveStraightLineSetGL.cxx


38388
=====

Author: alja
Date: Fri Mar 11 17:45:41 2011
New Revision: 38388

URL: http://root.cern.ch/viewvc?rev=38388&root=root&view=rev
Log:

Add option fDisplaceCenter to dismiss empty gap in RhoZ projection when projection center is not in
origin:
In ProjectPoint(), if fDisplaceCenter falg is set, move input vertex before projecting its coordinates.

Modified:
    branches/dev/fireworks/graf3d/eve/inc/TEveProjections.h
    branches/dev/fireworks/graf3d/eve/src/TEveProjections.cxx


38390
=====

Author: alja
Date: Fri Mar 11 17:58:55 2011
New Revision: 38390

URL: http://root.cern.ch/viewvc?rev=38390&root=root&view=rev
Log:

Set label size from TAttAxis.
Catch TEveException in DirectDraw().

Modified:
    branches/dev/fireworks/graf3d/eve/src/TEveProjectionAxesGL.cxx


38400
=====

Author: alja
Date: Mon Mar 14 18:36:02 2011
New Revision: 38400

URL: http://root.cern.ch/viewvc?rev=38400&root=root&view=rev
Log:

TEveProjectionAxesGL:
Set axis range by comparing frustum size and projection manager bounding box.

TEveProjections:
Set function  GetLimit(), previously used by TEveProjectionAxesGL, obsolete.

Modified:
    branches/dev/fireworks/graf3d/eve/inc/TEveProjections.h
    branches/dev/fireworks/graf3d/eve/src/TEveProjectionAxesGL.cxx
    branches/dev/fireworks/graf3d/eve/src/TEveProjections.cxx


38406
=====

Author: alja
Date: Mon Mar 14 22:09:04 2011
New Revision: 38406

URL: http://root.cern.ch/viewvc?rev=38406&root=root&view=rev
Log:
Update projected center in SetCenter() function.

Modified:
    branches/dev/fireworks/graf3d/eve/inc/TEveProjections.h
    branches/dev/fireworks/graf3d/eve/src/TEveProjections.cxx


38407
=====

Author: alja
Date: Mon Mar 14 22:17:34 2011
New Revision: 38407

URL: http://root.cern.ch/viewvc?rev=38407&root=root&view=rev
Log:
Rename memeber fDisplaceCenter to fDisplaceOrigin.

Modified:
    branches/dev/fireworks/graf3d/eve/inc/TEveProjections.h
    branches/dev/fireworks/graf3d/eve/src/TEveProjections.cxx


38412
=====

Author: alja
Date: Tue Mar 15 15:48:55 2011
New Revision: 38412

URL: http://root.cern.ch/viewvc?rev=38412&root=root&view=rev
Log:

Fix GetValForScreenPos(), used by TEveProjectionAxis, to return non-displaced/oroginal value
in displace-origin mode.x

Modified:
    branches/dev/fireworks/graf3d/eve/inc/TEveProjections.h
    branches/dev/fireworks/graf3d/eve/src/TEveProjections.cxx


38415
=====

Author: alja
Date: Tue Mar 15 15:54:02 2011
New Revision: 38415

URL: http://root.cern.ch/viewvc?rev=38415&root=root&view=rev
Log:

Cache values in SplitIntervalByPos() for optimization.

Modified:
    branches/dev/fireworks/graf3d/eve/src/TEveProjectionAxesGL.cxx


38416
=====

Author: alja
Date: Tue Mar 15 16:03:28 2011
New Revision: 38416

URL: http://root.cern.ch/viewvc?rev=38416&root=root&view=rev
Log:

Add define TEVEPROJECTIONS_DISPLACE_ORIGIN_MODE as temporary workaround till root
patches are integrated to CMSSW.

Modified:
    branches/dev/fireworks/graf3d/eve/inc/TEveProjections.h


38420
=====

Author: alja
Date: Tue Mar 15 20:27:41 2011
New Revision: 38420

URL: http://root.cern.ch/viewvc?rev=38420&root=root&view=rev
Log:
Changes in GetValForScreenPos() used by TEveProjectionAxes:
return shifted value in case origin is displaced.

Modified:
    branches/dev/fireworks/graf3d/eve/src/TEveProjections.cxx


38481
=====

Author: alja
Date: Thu Mar 17 13:11:34 2011
New Revision: 38481

URL: http://root.cern.ch/viewvc?rev=38481&root=root&view=rev
Log:
In TEvecalo2D add getter for sorted cell lists.

Modified:
    branches/dev/fireworks/graf3d/eve/inc/TEveCalo.h

Revision 35074 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Mon Aug 30 15:18:02 2010 UTC (4 years, 4 months ago) by matevz
File length: 12115 byte(s)
Diff to previous 34066
Merge the following revisions from branches/dev/fireworks:
34608, 34786, 34787, 34788, 34804, 34808, 34835, 34841, 34956, 35031, 35071


34608
=====

Author: matevz
Date: Tue Jul 27 13:04:00 2010
New Revision: 34608

URL: http://root.cern.ch/viewvc?rev=34608&root=root&view=rev
Log:
Add data-member 'Int_t fNumChildren' caching the number of children.
std::list<>::size() can become really expensive for large collections.
Observed when running on heavy-ion data.

Modified:
    branches/dev/fireworks/graf3d/eve/inc/TEveElement.h
    branches/dev/fireworks/graf3d/eve/src/TEveElement.cxx
    branches/dev/fireworks/graf3d/eve/src/TEveGeoNode.cxx


34786
=====

Author: alja
Date: Thu Aug 12 20:05:46 2010
New Revision: 34786

URL: http://root.cern.ch/viewvc?rev=34786&root=root&view=rev
Log:
CPU performance improvements:
Add virtual GetProjectedAsElement() in TEveProjected and its derived classes to avoid dynamic casts.

Modified:
    branches/dev/fireworks/graf3d/eve/inc/TEveBox.h
    branches/dev/fireworks/graf3d/eve/inc/TEveCompound.h
    branches/dev/fireworks/graf3d/eve/inc/TEveElement.h
    branches/dev/fireworks/graf3d/eve/inc/TEveGeoShape.h
    branches/dev/fireworks/graf3d/eve/inc/TEveLine.h
    branches/dev/fireworks/graf3d/eve/inc/TEvePointSet.h
    branches/dev/fireworks/graf3d/eve/inc/TEvePolygonSetProjected.h
    branches/dev/fireworks/graf3d/eve/inc/TEveProjectionBases.h
    branches/dev/fireworks/graf3d/eve/inc/TEveStraightLineSet.h
    branches/dev/fireworks/graf3d/eve/inc/TEveTrackProjected.h
    branches/dev/fireworks/graf3d/eve/src/TEveProjectionBases.cxx


34787
=====

Author: alja
Date: Thu Aug 12 20:36:52 2010
New Revision: 34787

URL: http://root.cern.ch/viewvc?rev=34787&root=root&view=rev
Log:

Bugfix:
In TEveCaloDataVec add missing check for periodic TwoPi flag (TEveCaloData::fWrapTwoPi).

Modified:
    branches/dev/fireworks/graf3d/eve/src/TEveCaloData.cxx


34788
=====

Author: matevz
Date: Thu Aug 12 20:38:50 2010
New Revision: 34788

URL: http://root.cern.ch/viewvc?rev=34788&root=root&view=rev
Log:
Protect Runge-Kutta propagator against division by zero when the field
object returns 0 as the maximum magnetic field.

Modified:
    branches/dev/fireworks/graf3d/eve/src/TEveTrackPropagator.cxx


34804
=====

Author: matevz
Date: Fri Aug 13 13:42:28 2010
New Revision: 34804

URL: http://root.cern.ch/viewvc?rev=34804&root=root&view=rev
Log:
* TEveManager
  Use TExMap instead of std::set to store changed elements.
  Set insertion becomes expensive for large collections all being
  changed at the same time.

* TEveSceneList
  In ProcessChanges() take TExMap* as argument. Here map of changed
  objects / elements still needs to be built as we iterate in parallel
  over logical shape maps of all scenes.

* Other classes
  Implement virtual TEveElement::GetObject() for frequently used
  classes to avoid unnecessary dynamic casts.

Modified:
    branches/dev/fireworks/graf3d/eve/inc/TEveArrow.h
    branches/dev/fireworks/graf3d/eve/inc/TEveDigitSet.h
    branches/dev/fireworks/graf3d/eve/inc/TEveElement.h
    branches/dev/fireworks/graf3d/eve/inc/TEveGeoNode.h
    branches/dev/fireworks/graf3d/eve/inc/TEveGeoShape.h
    branches/dev/fireworks/graf3d/eve/inc/TEveManager.h
    branches/dev/fireworks/graf3d/eve/inc/TEvePointSet.h
    branches/dev/fireworks/graf3d/eve/inc/TEveScene.h
    branches/dev/fireworks/graf3d/eve/src/TEveElement.cxx
    branches/dev/fireworks/graf3d/eve/src/TEveManager.cxx
    branches/dev/fireworks/graf3d/eve/src/TEveScene.cxx


34808
=====

Author: matevz
Date: Fri Aug 13 14:45:18 2010
New Revision: 34808

URL: http://root.cern.ch/viewvc?rev=34808&root=root&view=rev
Log:
White-space.

Modified:
    branches/dev/fireworks/graf3d/eve/inc/TEveProjectionBases.h


34835
=====

Author: matevz
Date: Tue Aug 17 18:21:43 2010
New Revision: 34835

URL: http://root.cern.ch/viewvc?rev=34835&root=root&view=rev
Log:
In CreateWindow(), also check if Display* is non-null.

Modified:
    branches/dev/fireworks/graf3d/gl/src/TGLWidget.cxx


34841
=====

Author: alja
Date: Wed Aug 18 15:20:26 2010
New Revision: 34841

URL: http://root.cern.ch/viewvc?rev=34841&root=root&view=rev
Log:
Use TEveProjected::GetProjectedAsElement() instead of dynamic_cast of TEveProjected to TEveElement.

Modified:
    branches/dev/fireworks/graf3d/eve/src/TEveElement.cxx


34956
=====

Author: alja
Date: Mon Aug 23 19:38:40 2010
New Revision: 34956

URL: http://root.cern.ch/viewvc?rev=34956&root=root&view=rev
Log:

In TEveCalo2DGL::DrawRPhi() fix offset-by-one  error (last bin in RPhi was not rendered).

Modified:
    branches/dev/fireworks/graf3d/eve/src/TEveCalo2DGL.cxx


35031
=====

Author: alja
Date: Thu Aug 26 18:25:31 2010
New Revision: 35031

URL: http://root.cern.ch/viewvc?rev=35031&root=root&view=rev
Log:

Fix rendering of endcap cellc in stack at negative eta.

Modified:
    branches/dev/fireworks/graf3d/eve/inc/TEveCalo3DGL.h
    branches/dev/fireworks/graf3d/eve/src/TEveCalo3DGL.cxx


35071
=====

Author: matevz
Date: Mon Aug 30 15:53:24 2010
New Revision: 35071

URL: http://root.cern.ch/viewvc?rev=35071&root=root&view=rev
Log:
* TEveCalo3D
  Add calo-grid line-width control.
  Add individual getters / setters for drawing of endcap / barrel
  grid.

* TEveCalo3DGL
  Honour settings for grid line-width and visibility.

* TEveElement
  Mark some data-members as transient.

Modified:
    branches/dev/fireworks/graf3d/eve/inc/TEveCalo.h
    branches/dev/fireworks/graf3d/eve/inc/TEveElement.h
    branches/dev/fireworks/graf3d/eve/src/TEveCalo3DGL.cxx

Revision 34066 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Tue Jun 22 17:48:40 2010 UTC (4 years, 7 months ago) by matevz
File length: 11721 byte(s)
Diff to previous 33864
Merge the following revisions from branches/dev/fireworks:
34053, 34057, 34063, 34065


34053
=====

Author: alja
Date: Tue Jun 22 13:43:49 2010
New Revision: 34053

URL: http://root.cern.ch/viewvc?rev=34053&root=root&view=rev
Log:
Add a possibility to draw cells in 2D mode at fixed height.

Modified:
    branches/dev/fireworks/graf3d/eve/inc/TEveCalo.h
    branches/dev/fireworks/graf3d/eve/src/TEveCalo.cxx
    branches/dev/fireworks/graf3d/eve/src/TEveCaloLegoGL.cxx


34057
=====

Author: alja
Date: Tue Jun 22 14:51:00 2010
New Revision: 34057

URL: http://root.cern.ch/viewvc?rev=34057&root=root&view=rev
Log:

Cange realted to previous commit. Fix points height which mark 2D cells with small value.

Modified:
    branches/dev/fireworks/graf3d/eve/src/TEveCaloLegoGL.cxx


34063
=====

Author: alja
Date: Tue Jun 22 16:07:11 2010
New Revision: 34063

URL: http://root.cern.ch/viewvc?rev=34063&root=root&view=rev
Log:
Fix z-scale in case of auto-rebin.

Modified:
    branches/dev/fireworks/graf3d/eve/src/TEveCaloLegoGL.cxx


34065
=====

Author: alja
Date: Tue Jun 22 18:25:28 2010
New Revision: 34065

URL: http://root.cern.ch/viewvc?rev=34065&root=root&view=rev
Log:
Fix tick mark offset in case calo data is empty.

Modified:
    branches/dev/fireworks/graf3d/eve/src/TEveCaloLegoGL.cxx

Revision 33864 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Mon Jun 14 09:47:19 2010 UTC (4 years, 7 months ago) by matevz
File length: 11254 byte(s)
Diff to previous 33627
Merge the following revisions from the fireworks branch:
33631, 33666, 33668, 33690, 33700, 33701, 33702, 33704, 33751, 33753,
33767, 33770, 33774, 33787, 33789, 33790, 33791, 33792, 33796, 33798,
33804, 33817, 33823, 33825

gl/:
----
- extensions for transparency handling in TGLUtil;
- allow disabling of internal viewer selection;
- allow fixing of default camera center;
- fix global light placement -- it was only correct for XoZ floor or
  when scene center was at the origin.

eve/:
-----
- propagation of main transparency to projected replicas and to
  compound members;
- when projecting TEveStraightLineSet in RhoZ, break lines crossing
  the separating plane (required change of internal representation);
- anti-flickering support for TEveBoxSet;
- proper multiple-selection handling in TEveCalo classes;
- small new features, bug fixes in TEveCalo classes.


33631
=====

Author: alja
Date: Fri May 28 12:50:27 2010
New Revision: 33631

URL: http://root.cern.ch/viewvc?rev=33631&root=root&view=rev
Log:
Fix bug in tool tip.

Modified:
    branches/dev/fireworks/graf3d/eve/src/TEveCaloData.cxx


33666
=====

Author: matevz
Date: Mon May 31 13:41:54 2010
New Revision: 33666

URL: http://root.cern.ch/viewvc?rev=33666&root=root&view=rev
Log:
Propagate main transparency the same way as main color is propagated:

- from projectables to projecteds;

- in CopyVizParams();

- in TEveCompound to children depending on the following CSC bit settings:
   kCSCBApplyMainTransparencyToAllChildren
   kCSCBApplyMainTransparencyToMatchingChildren


In TEveElementList add member 'Bool_t fDoTransparency' (analoguous to
fDoColor).

Modified:
    branches/dev/fireworks/graf3d/eve/inc/TEveCompound.h
    branches/dev/fireworks/graf3d/eve/inc/TEveElement.h
    branches/dev/fireworks/graf3d/eve/inc/TEveProjectionBases.h
    branches/dev/fireworks/graf3d/eve/src/TEveCompound.cxx
    branches/dev/fireworks/graf3d/eve/src/TEveElement.cxx
    branches/dev/fireworks/graf3d/eve/src/TEveProjectionBases.cxx


33668
=====

Author: matevz
Date: Mon May 31 15:44:20 2010
New Revision: 33668

URL: http://root.cern.ch/viewvc?rev=33668&root=root&view=rev
Log:
In TEveelement introduce Bool_t members fCanEditMainColor and
fCanEditMainTransparency. The corresponding base-class functions now
return the value of these data members.

In most sub-classes that require editng of main color and transparency
it was now enough to set these data-members to kTRUE in constructors.

Further, this allows per object setting of color / transparency
editability via:
   void SetEditMainColor(Bool_t);
   void SetEditMainTransparency(Bool_t);

Modified:
    branches/dev/fireworks/graf3d/eve/inc/TEveArrow.h
    branches/dev/fireworks/graf3d/eve/inc/TEveCalo.h
    branches/dev/fireworks/graf3d/eve/inc/TEveDigitSet.h
    branches/dev/fireworks/graf3d/eve/inc/TEveElement.h
    branches/dev/fireworks/graf3d/eve/inc/TEveGeoShape.h
    branches/dev/fireworks/graf3d/eve/inc/TEveShape.h
    branches/dev/fireworks/graf3d/eve/inc/TEveText.h
    branches/dev/fireworks/graf3d/eve/src/TEveArrow.cxx
    branches/dev/fireworks/graf3d/eve/src/TEveCalo.cxx
    branches/dev/fireworks/graf3d/eve/src/TEveDigitSet.cxx
    branches/dev/fireworks/graf3d/eve/src/TEveElement.cxx
    branches/dev/fireworks/graf3d/eve/src/TEveGeoShape.cxx
    branches/dev/fireworks/graf3d/eve/src/TEveShape.cxx
    branches/dev/fireworks/graf3d/eve/src/TEveText.cxx


33690
=====

Author: matevz
Date: Tue Jun  1 13:07:46 2010
New Revision: 33690

URL: http://root.cern.ch/viewvc?rev=33690&root=root&view=rev
Log:
Add transparency argument to TGLUtil:
   RenderPolyMarkers(...)
   RenderPolyLine(...)

In eve/ use Char_t for transparency (as it is in gl/).
Until now UChar_t was used in eve/.

Modified:
    branches/dev/fireworks/graf3d/eve/inc/TEveCalo.h
    branches/dev/fireworks/graf3d/eve/inc/TEveCaloLegoOverlay.h
    branches/dev/fireworks/graf3d/eve/inc/TEveCompound.h
    branches/dev/fireworks/graf3d/eve/inc/TEveDigitSet.h
    branches/dev/fireworks/graf3d/eve/inc/TEveElement.h
    branches/dev/fireworks/graf3d/eve/inc/TEveGeoNode.h
    branches/dev/fireworks/graf3d/eve/inc/TEveProjectionBases.h
    branches/dev/fireworks/graf3d/eve/inc/TEveTriangleSet.h
    branches/dev/fireworks/graf3d/eve/inc/TEveUtil.h
    branches/dev/fireworks/graf3d/eve/src/TEveCaloLegoEditor.cxx
    branches/dev/fireworks/graf3d/eve/src/TEveCaloLegoOverlay.cxx
    branches/dev/fireworks/graf3d/eve/src/TEveCaloVizEditor.cxx
    branches/dev/fireworks/graf3d/eve/src/TEveCompound.cxx
    branches/dev/fireworks/graf3d/eve/src/TEveDigitSet.cxx
    branches/dev/fireworks/graf3d/eve/src/TEveElement.cxx
    branches/dev/fireworks/graf3d/eve/src/TEveElementEditor.cxx
    branches/dev/fireworks/graf3d/eve/src/TEveGeoNode.cxx
    branches/dev/fireworks/graf3d/eve/src/TEveLineGL.cxx
    branches/dev/fireworks/graf3d/eve/src/TEveProjectionBases.cxx
    branches/dev/fireworks/graf3d/eve/src/TEveRGBAPalette.cxx
    branches/dev/fireworks/graf3d/eve/src/TEveStraightLineSetGL.cxx
    branches/dev/fireworks/graf3d/eve/src/TEveTrackGL.cxx
    branches/dev/fireworks/graf3d/eve/src/TEveTrackProjectedGL.cxx
    branches/dev/fireworks/graf3d/eve/src/TEveUtil.cxx
    branches/dev/fireworks/graf3d/gl/inc/TGLUtil.h
    branches/dev/fireworks/graf3d/gl/src/TGLUtil.cxx
    branches/dev/fireworks/graf3d/gl/src/TPointSet3DGL.cxx


33700
=====

Author: matevz
Date: Tue Jun  1 18:55:06 2010
New Revision: 33700

URL: http://root.cern.ch/viewvc?rev=33700&root=root&view=rev
Log:
Do not overload TGLUtil::Color() for setting alpha and transparency --
name the functions ColorAlpha() and ColorTransparency().

In TEveStraightLineSetGL pass main-transparency also as transparency
of the marker.

Modified:
    branches/dev/fireworks/graf3d/eve/src/TEveStraightLineSetGL.cxx
    branches/dev/fireworks/graf3d/gl/inc/TGLUtil.h
    branches/dev/fireworks/graf3d/gl/src/TGLPhysicalShape.cxx
    branches/dev/fireworks/graf3d/gl/src/TGLUtil.cxx
    branches/dev/fireworks/graf3d/gl/src/TGLViewer.cxx


33701
=====

Author: matevz
Date: Tue Jun  1 20:36:47 2010
New Revision: 33701

URL: http://root.cern.ch/viewvc?rev=33701&root=root&view=rev
Log:
TEveProjections:
- Add virtual function
    BisectBreakPoint(TEveVector& vL, TEveVector& vR, Float_t eps_sqr=1e-10f);
  that find both edges of a segment that is split over two
  non-contiguous space-regions.

TEveStraightLineSet:
- Handle breaking of each line segment in a projection and create two
  separate parts.

Modified:
    branches/dev/fireworks/graf3d/eve/inc/TEveProjections.h
    branches/dev/fireworks/graf3d/eve/inc/TEveStraightLineSet.h
    branches/dev/fireworks/graf3d/eve/src/TEveProjections.cxx
    branches/dev/fireworks/graf3d/eve/src/TEveStraightLineSet.cxx
    branches/dev/fireworks/graf3d/eve/src/TEveStraightLineSetGL.cxx


33702
=====

Author: matevz
Date: Tue Jun  1 21:18:54 2010
New Revision: 33702

URL: http://root.cern.ch/viewvc?rev=33702&root=root&view=rev
Log:
Simplify internal representation of marker in a line-set.

Modified:
    branches/dev/fireworks/graf3d/eve/inc/TEveStraightLineSet.h
    branches/dev/fireworks/graf3d/eve/src/TEveStraightLineSet.cxx
    branches/dev/fireworks/graf3d/eve/src/TEveStraightLineSetGL.cxx


33704
=====

Author: matevz
Date: Tue Jun  1 21:28:27 2010
New Revision: 33704

URL: http://root.cern.ch/viewvc?rev=33704&root=root&view=rev
Log:
Remove unused variable.

Modified:
    branches/dev/fireworks/graf3d/eve/src/TEveStraightLineSetGL.cxx


33751
=====

Author: matevz
Date: Fri Jun  4 16:14:12 2010
New Revision: 33751

URL: http://root.cern.ch/viewvc?rev=33751&root=root&view=rev
Log:
Small fixes for track rendering.

TEveTrack
- Implement virtual ComputeBBox() to include path-mark positions in
  the bounding box calculation.

TEveTrackGL
- Number of visible path-marks was computed wrongly.

TEvePointSet
- Remove virtual ComputeBBox() -- it was just calling the base-class
  version.

TPointSet3D
- Simplify ComputeBBox().

Modified:
    branches/dev/fireworks/graf3d/eve/inc/TEvePointSet.h
    branches/dev/fireworks/graf3d/eve/inc/TEveTrack.h
    branches/dev/fireworks/graf3d/eve/src/TEvePointSet.cxx
    branches/dev/fireworks/graf3d/eve/src/TEveTrack.cxx
    branches/dev/fireworks/graf3d/eve/src/TEveTrackGL.cxx
    branches/dev/fireworks/graf3d/g3d/src/TPointSet3D.cxx


33753
=====

Author: matevz
Date: Fri Jun  4 16:45:38 2010
New Revision: 33753

URL: http://root.cern.ch/viewvc?rev=33753&root=root&view=rev
Log:
Move anti-flickering flag from TEveQuadSet to TEveDigitSet.
Implement it in TEveBoxSet-GL rendering, too.

Modified:
    branches/dev/fireworks/graf3d/eve/inc/TEveDigitSet.h
    branches/dev/fireworks/graf3d/eve/inc/TEveQuadSet.h
    branches/dev/fireworks/graf3d/eve/src/TEveBoxSetGL.cxx
    branches/dev/fireworks/graf3d/eve/src/TEveDigitSet.cxx
    branches/dev/fireworks/graf3d/eve/src/TEveQuadSet.cxx


33767
=====

Author: alja
Date: Mon Jun  7 19:49:03 2010
New Revision: 33767

URL: http://root.cern.ch/viewvc?rev=33767&root=root&view=rev
Log:
In TEveCaloDataVec add interface to add new slice and getters to read slice values and cell geometry.

Modified:
    branches/dev/fireworks/graf3d/eve/inc/TEveCaloData.h
    branches/dev/fireworks/graf3d/eve/src/TEveCaloData.cxx


33770
=====

Author: matevz
Date: Tue Jun  8 11:54:09 2010
New Revision: 33770

URL: http://root.cern.ch/viewvc?rev=33770&root=root&view=rev
Log:
Take the right fP for point-array when calculating bounding-box.

Modified:
    branches/dev/fireworks/graf3d/eve/src/TEveTrack.cxx


33774
=====

Author: alja
Date: Tue Jun  8 13:09:52 2010
New Revision: 33774

URL: http://root.cern.ch/viewvc?rev=33774&root=root&view=rev
Log:
TEveCaloLegoGL:
Fix picking in  kValSizeOutline mode.

TEveCaloLegoEditor:
Fix last enum in 2D mode entry.

Modified:
    branches/dev/fireworks/graf3d/eve/src/TEveCaloLegoEditor.cxx
    branches/dev/fireworks/graf3d/eve/src/TEveCaloLegoGL.cxx


33787
=====

Author: matevz
Date: Tue Jun  8 18:24:27 2010
New Revision: 33787

URL: http://root.cern.ch/viewvc?rev=33787&root=root&view=rev
Log:
Fix invalid iterator access reported by valgrind.

Modified:
    branches/dev/fireworks/graf3d/eve/src/TEveCaloLegoGL.cxx


33789
=====

Author: matevz
Date: Tue Jun  8 19:08:23 2010
New Revision: 33789

URL: http://root.cern.ch/viewvc?rev=33789&root=root&view=rev
Log:
Fix another invalid iterator access reported by valgrind.

Modified:
    branches/dev/fireworks/graf3d/eve/src/TEveCaloLegoGL.cxx


33790
=====

Author: alja
Date: Tue Jun  8 19:51:15 2010
New Revision: 33790

URL: http://root.cern.ch/viewvc?rev=33790&root=root&view=rev
Log:
Bugfix:: In TEveCaloDataVec::AddSlice initalise vector of tower values.

Modified:
    branches/dev/fireworks/graf3d/eve/src/TEveCaloData.cxx


33791
=====

Author: matevz
Date: Tue Jun  8 22:31:00 2010
New Revision: 33791

URL: http://root.cern.ch/viewvc?rev=33791&root=root&view=rev
Log:
Add flag allowing to disable internal GL-viewer selection.
To disable it call:
  handler->SetDoInternalSelection(kFALSE);

Modified:
    branches/dev/fireworks/graf3d/gl/inc/TGLEventHandler.h
    branches/dev/fireworks/graf3d/gl/src/TGLEventHandler.cxx


33792
=====

Author: matevz
Date: Tue Jun  8 23:08:09 2010
New Revision: 33792

URL: http://root.cern.ch/viewvc?rev=33792&root=root&view=rev
Log:
Add option to fix the default camera center.
To activate, call:
  camera->SetFixDefCenterVec(x, y, z);
  camera->SetFixDefCenter(kTRUE);
This will take effect on next camera reset.
External center still overrides the setting.

Modified:
    branches/dev/fireworks/graf3d/gl/inc/TGLCamera.h
    branches/dev/fireworks/graf3d/gl/src/TGLCamera.cxx
    branches/dev/fireworks/graf3d/gl/src/TGLOrthoCamera.cxx
    branches/dev/fireworks/graf3d/gl/src/TGLPerspectiveCamera.cxx


33796
=====

Author: alja
Date: Wed Jun  9 12:51:06 2010
New Revision: 33796

URL: http://root.cern.ch/viewvc?rev=33796&root=root&view=rev
Log:
Fix bug in redering of selected cells in case cells are highlighted the same time.

Modified:
    branches/dev/fireworks/graf3d/eve/src/TEveCaloLegoGL.cxx


33798
=====

Author: matevz
Date: Wed Jun  9 15:28:30 2010
New Revision: 33798

URL: http://root.cern.ch/viewvc?rev=33798&root=root&view=rev
Log:
White space.

Modified:
    branches/dev/fireworks/graf3d/eve/src/TEveCaloLegoGL.cxx


33804
=====

Author: matevz
Date: Wed Jun  9 20:49:33 2010
New Revision: 33804

URL: http://root.cern.ch/viewvc?rev=33804&root=root&view=rev
Log:
Use central function TEveCaloData::ProcessSelection(...) to process
(multiple secondary) selection from all GL renderers (3D, 2D and
Lego).

Fix rendering of non-rebinned lego for multiple selection.

Modified:
    branches/dev/fireworks/graf3d/eve/inc/TEveCaloData.h
    branches/dev/fireworks/graf3d/eve/src/TEveCalo2DGL.cxx
    branches/dev/fireworks/graf3d/eve/src/TEveCalo3DGL.cxx
    branches/dev/fireworks/graf3d/eve/src/TEveCaloData.cxx
    branches/dev/fireworks/graf3d/eve/src/TEveCaloLegoGL.cxx


33817
=====

Author: matevz
Date: Thu Jun 10 15:31:17 2010
New Revision: 33817

URL: http://root.cern.ch/viewvc?rev=33817&root=root&view=rev
Log:
Do not redraw if the widget is not mapped.

Add option to block redraw in UpdateScene().

Modified:
    branches/dev/fireworks/graf3d/gl/inc/TGLViewer.h
    branches/dev/fireworks/graf3d/gl/src/TGLViewer.cxx


33823
=====

Author: matevz
Date: Thu Jun 10 16:25:59 2010
New Revision: 33823

URL: http://root.cern.ch/viewvc?rev=33823&root=root&view=rev
Log:
Fix placement of global lights.

Modified:
    branches/dev/fireworks/graf3d/gl/src/TGLLightSet.cxx


33825
=====

Author: matevz
Date: Thu Jun 10 16:47:54 2010
New Revision: 33825

URL: http://root.cern.ch/viewvc?rev=33825&root=root&view=rev
Log:
Hide tooltip on key event.

Modified:
    branches/dev/fireworks/graf3d/gl/src/TGLEventHandler.cxx

Revision 33627 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Thu May 27 19:19:58 2010 UTC (4 years, 7 months ago) by matevz
File length: 11395 byte(s)
Diff to previous 33198
Merge the following revisions from the fireworks branch:
33294, 33296, 33339, 33424, 33428, 33431, 33432, 33448, 33478


33294
=====

Author: alja
Date: Thu Apr 29 16:03:27 2010
New Revision: 33294

URL: http://root.cern.ch/viewvc?rev=33294&root=root&view=rev
Log:
In SetMagFieldObj() add additional argument to set ownership of magnetic field object.
For the backward compatibility, propagator by default owns given filed object.

Modified:
    branches/dev/fireworks/graf3d/eve/inc/TEveTrackPropagator.h
    branches/dev/fireworks/graf3d/eve/src/TEveTrackPropagator.cxx


33296
=====

Author: matevz
Date: Thu Apr 29 16:18:32 2010
New Revision: 33296

URL: http://root.cern.ch/viewvc?rev=33296&root=root&view=rev
Log:
Initialize field ownership flag. When settin gnew field, check the old flag.

Modified:
    branches/dev/fireworks/graf3d/eve/inc/TEveTrackPropagator.h
    branches/dev/fireworks/graf3d/eve/src/TEveTrackPropagator.cxx


33339
=====

Author: alja
Date: Mon May  3 10:47:09 2010
New Revision: 33339

URL: http://root.cern.ch/viewvc?rev=33339&root=root&view=rev
Log:
In TEveCalo2D update cellID cache when automatic scale is enabled.

Modified:
    branches/dev/fireworks/graf3d/eve/inc/TEveCalo.h
    branches/dev/fireworks/graf3d/eve/src/TEveCalo.cxx


33424
=====

Author: matevz
Date: Fri May  7 17:38:31 2010
New Revision: 33424

URL: http://root.cern.ch/viewvc?rev=33424&root=root&view=rev
Log:
Render frame in outline mode.

Modified:
    branches/dev/fireworks/graf3d/eve/src/TEveBoxGL.cxx


33428
=====

Author: matevz
Date: Fri May  7 20:26:32 2010
New Revision: 33428

URL: http://root.cern.ch/viewvc?rev=33428&root=root&view=rev
Log:
Preliminary commit -- towards generaliziation of handling of projected
tracks in topologically non-trivial projections.

Make variables in TEveTrack deprecated.

Introduce new variables in TEveTrackPropagator, extend GUI editor.

Modified:
    branches/dev/fireworks/graf3d/eve/inc/TEveTrack.h
    branches/dev/fireworks/graf3d/eve/inc/TEveTrackPropagator.h
    branches/dev/fireworks/graf3d/eve/inc/TEveTrackPropagatorEditor.h
    branches/dev/fireworks/graf3d/eve/src/TEveTrack.cxx
    branches/dev/fireworks/graf3d/eve/src/TEveTrackPropagator.cxx
    branches/dev/fireworks/graf3d/eve/src/TEveTrackPropagatorEditor.cxx


33431
=====

Author: matevz
Date: Sat May  8 17:45:42 2010
New Revision: 33431

URL: http://root.cern.ch/viewvc?rev=33431&root=root&view=rev
Log:
Add full support for handling of projected tracks in topologically non-trivial
projections. Use the following setters in TEveTrackPropagator:
   void   SetProjTrackBreaking(UChar_t x);
   void   SetRnrPTBMarkers(Bool_t x);
   TMarker& RefPTBAtt() { return fPTBAtt; }
to tune the behaviour. The following modes are supported:
   enum EProjTrackBreaking_e {
     kPTB_Break,            // break tracks
     kPTB_UseFirstPointPos, // use first track-point half-space
     kPTB_UseLastPointPos   // use last track-point half-space
   };

SetRnrPTBMarkers(Bool_t x) allows to enable drawing of a marker with
attributes RefPTBAtt() at break-points.

Modified:
    branches/dev/fireworks/graf3d/eve/inc/TEveProjections.h
    branches/dev/fireworks/graf3d/eve/inc/TEveTrack.h
    branches/dev/fireworks/graf3d/eve/inc/TEveTrackPropagator.h
    branches/dev/fireworks/graf3d/eve/src/TEveTrackGL.cxx
    branches/dev/fireworks/graf3d/eve/src/TEveTrackProjected.cxx
    branches/dev/fireworks/graf3d/eve/src/TEveTrackProjectedGL.cxx
    branches/dev/fireworks/graf3d/eve/src/TEveTrackPropagator.cxx
    branches/dev/fireworks/graf3d/eve/src/TEveTrackPropagatorEditor.cxx


33432
=====

Author: matevz
Date: Sat May  8 19:41:52 2010
New Revision: 33432

URL: http://root.cern.ch/viewvc?rev=33432&root=root&view=rev
Log:
Increase precision of break-point determination.

Modified:
    branches/dev/fireworks/graf3d/eve/src/TEveTrackProjected.cxx


33448
=====

Author: matevz
Date: Mon May 10 17:48:34 2010
New Revision: 33448

URL: http://root.cern.ch/viewvc?rev=33448&root=root&view=rev
Log:
Use bounding-box of non-selectable scenes for frustum size determination also when in selection mode. This assures that near and far clipping planes stay the same and depth-buffer results can be interpreted with current camera parameters.

Modified:
    branches/dev/fireworks/graf3d/gl/src/TGLViewerBase.cxx


33478
=====

Author: matevz
Date: Wed May 12 13:24:42 2010
New Revision: 33478

URL: http://root.cern.ch/viewvc?rev=33478&root=root&view=rev
Log:
From Alja: mark clip-set as viewer-owned overlay element.

Modified:
    branches/dev/fireworks/graf3d/gl/src/TGLClip.cxx

Revision 33198 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Mon Apr 26 08:40:04 2010 UTC (4 years, 8 months ago) by matevz
File length: 11336 byte(s)
Diff to previous 32923
Merge 33149 from the fireworks branch.


33149
=====

Author: alja
Date: Thu Apr 22 23:41:30 2010
New Revision: 33149

URL: http://root.cern.ch/viewvc?rev=33149&root=root&view=rev
Log:
TEveCaloData:
Add support for rendering of highlighted cells.
Add function GetHighlightTooltip() to set tool tip for highlighted cells.

TEveCaloLegoGL, TEveCalo3DGL, TEveCalo2DGL:
Add support for rendering of highlighted cells.

TEveCalo2D:
Cache selected and highlighted cells in eta and phi bins for RhoPhi and RhoZ projections.

Revision 32923 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Fri Apr 9 11:41:17 2010 UTC (4 years, 9 months ago) by matevz
File length: 11256 byte(s)
Diff to previous 32797
Change that should have been committed in rev 32868.

Revision 32797 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Sun Mar 28 21:13:21 2010 UTC (4 years, 9 months ago) by matevz
File length: 11294 byte(s)
Diff to previous 31075
From Alja.

TEveCaloLego:
Disable normalize rebin by default.
Bogfix: include fMaxTowerH when compute bounding box.

TEveCaloData:
Change rebin tower value to hold sum of aggreagated towers and not their average.

TEveCaloLegoGL:
Change presentation of rebined towers: before rebined tower value presented average 
and now it presents sum of aggregated towers.

Revision 31075 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Tue Nov 10 20:03:38 2009 UTC (5 years, 2 months ago) by matevz
File length: 11293 byte(s)
Diff to previous 30996
From Alja.

Do not drop  cell id cache on secondary select.
Call virtual method CellSelectionChanged() to updated necessary information
on tower select.

Revision 30996 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Thu Nov 5 18:15:41 2009 UTC (5 years, 2 months ago) by matevz
File length: 11190 byte(s)
Diff to previous 30990
From Alja.

Add new function TEveCaloViz::AssertCellIdCache().

Revision 30990 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Thu Nov 5 17:03:30 2009 UTC (5 years, 2 months ago) by matevz
File length: 11151 byte(s)
Diff to previous 30931
From Alja.

TEveCalo2D:
Auto rescale relative to sum of energy per axis bins.

TEveCalo2DGL.cxx:
Bugfix in setting number of bins in RhoZ projection.

Revision 30931 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Fri Oct 30 18:32:20 2009 UTC (5 years, 2 months ago) by matevz
File length: 10986 byte(s)
Diff to previous 30929
TEveCaloLego:
Add new 2DMode kValSizeOutline. Change default mode to kValSize.

tutorials/eve/calorimeters.C
Remove unnecessary line.

tutorials/eve/calo_detail.C
Use kValSizeOutline mode for irregular data. Add example of TGLAnnotation.

Revision 30929 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Fri Oct 30 15:18:51 2009 UTC (5 years, 2 months ago) by matevz
File length: 10969 byte(s)
Diff to previous 30891
From Alja.

TEveCaloData:
Clear list of selected cells when element is not selected.

TEveCalo2D in TEveCaloLego classes:
Render selected cells with slice offset.

Revision 30891 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Tue Oct 27 19:28:36 2009 UTC (5 years, 2 months ago) by matevz
File length: 11008 byte(s)
Diff to previous 30849
TEveElement
- add virtual TEveElement* ForwardEdit();
- make virtual ForwardSelection() non-const.

TEveSelection & TEveViewerList
- make Clicked / ReClicked / UnClicked functions and corresponding
  signals symmetric.

TEveCalo
 - implement ForwardEdit() to keep editor on concrete calo-viz object.

Revision 30849 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Fri Oct 23 13:45:23 2009 UTC (5 years, 3 months ago) by matevz
File length: 10975 byte(s)
Diff to previous 30840
Implement abstract SetDepthLocal for TEveCompound and TEveCalo2D.

Revision 30840 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Fri Oct 23 09:03:14 2009 UTC (5 years, 3 months ago) by matevz
File length: 10966 byte(s)
Diff to previous 30819
Add support for 3D -> 3D projections. This also allows for
scaling (compression/extension) of certain space region as required by
NA62 to show the 200m long detector in a meaningful way.

Several generalizations of the projection infrastructure were
required:

1. TEveProjectable::ProjectedClass() takes an argument:
     virtual TClass* ProjectedClass(const TEveProjection* p) const = 0;
   thus allowing different projected classes for different projections.

2. All TEveProjection::ProjectPoint/Vector(...) functions have an
   additional "depth" argument thus allowing the projected classes to
   skip explicit setting of depth after the point has been projected
   -- this could damage the 3rd component.

   Pre-scaling now supports 3 dimensions.

3. Abstract TEveProjected::SetDepth() has been split into two parts:
   a) It has been implemented in the base class where it checks for
      the projection type (2d) before calling the local function;
   b) Abstract SetDepthLocal() has been added to provide the same
      functionality.
   This allows for the 2d/3d check to be done in place only.

4. New projection class has been introduced: TEve3DProjection.
   It performs pre-scaling and offsets the center.

5. To simplify the projection of lists TEveElementList has been made
   projectable and corresponding TEveElementListProjected class
   introduced. This also fixed the problem with render-state not being
   propagated to projected classes.
   The check whether to project a sub-tree of elements is still performed.

6. TEveGeoShapeProjected has been introduced to represent the 3D
   projection of a TEveGeoShape (2D projection is handled by
   TEvePolygonSetProjected).

   Points, lines and tracks use the same projected class for both 2D
   and 3D projections.

An example showing this functionality has been added as a new tab in
tutorials/eve/projection_prescale.C.

Revision 30819 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Tue Oct 20 20:01:16 2009 UTC (5 years, 3 months ago) by matevz
File length: 10943 byte(s)
Diff to previous 30384
From Alja.

graf3d/gl/inc/TGLViewer:
Change enum ESecSelType: remove obsolete member kNone and redefine kAlways to kOnRequest.

graf3d/gl/src/TGLEventHandler:
Set default secondary selection mode to kOnRequest: Buy default secondary
selection is now activated also on mouse click if this is defined by TGLLogicalShape.

graf3d/eve/inc/TEveElement.h:
graf3d/eve/src/TEveElement.cxx:
Add virtual function ForwardSelection() to allow TEveElement objects to forward its selection
state. This is required in case if some other objects is managing its selection and highlight state.

graf3d/eve/src/TEveSelection.cxx:
In MapPickedToSelect() first check if element is forwarding a selection.

graf3d/eve/inc/TEveCaloData.h
graf3d/eve/src/TEveCaloData.cxx
Add a member to hold a list of secondary selected cells (i.e. towers). Add a functionality to
manage selection state of calorimeter objects. In order to fit in TEveSelection procedure
TEveCaloData now inherits from TEveElement and manages selection state of child elements in FillImpliedSelected().

graf3d/eve/inc/TEveCalo.h:
graf3d/eve/src/TEveCalo.cxx:
Forward selection to TEveCaloData. Override IncImpliedSelected() to printout selected tower info.

tutorials/eve/calo_detail.C
Call  IncDenyDestroy() on calo data, since it is TEveElement, but not added anywhere.

tutorials/eve/calorimeters.C
In second tab create four different calorimeter views to demonstrate secondary selection.

Revision 30384 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Wed Sep 23 17:54:23 2009 UTC (5 years, 4 months ago) by matevz
File length: 10748 byte(s)
Diff to previous 30366
Merge from fworks branch the following revisions:

30297
=====

tutorials/eve/cms_calo.C:
Change elements names.

TGLViewer:
Add getter to see if use bright or dark colorset.

TGLCameraOverlay, TEveCaloLego, TEveProjectionAxes,TEveCaloLegoOverlay:
By default use markup colors from color set. This way color will be correct
in bright and dark background without any settings. 


30340
=====

TEveViewer:
Protect against misleading warnings (happened on mac only).


30376
=====

TGLFont:
Remove TGLFont::RenderBitmap() function and replace it with TGLFont::Render(),
which can be used more genericaly: for all font types and alignments.

TGLAxisPainter, TGLCameraOverlay, TGLAnnotation, TEveProjectionAxesGL:
Use TGLFont::Render() function to draw labels and titles.

TEveCaloLego, TEveCaloLegoEditor:
Remove obsolete members fTopViewUseMaxColor and fTopViewTowerColor.

TEveCaloLegoGL:
Draw tower vlues in all 2DModes.

TEveCaloLegoOverlay:
Draw palette scales in case TEveCaloLego is using palette (f2DMode = TEveCaloLego::kValColor).

TEveCalo3DGL:
Keep grid color same in outline and wirewrame render mode.

Revision 30366 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Wed Sep 23 09:23:32 2009 UTC (5 years, 4 months ago) by matevz
File length: 11136 byte(s)
Diff to previous 28197
Merge revisions 30010-30222 from the fireworks branch.

- Many new features and some fixes in calorimeter visualization classes.

- New function TGLCamera::SetCenterWarp for positioning of camera.

Revision 28197 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Tue Apr 14 13:59:27 2009 UTC (5 years, 9 months ago) by matevz
File length: 10675 byte(s)
Diff to previous 27669
Merge the following revisions from the fireworks branch:
  -r 27692:27867
  -c 27876
  -r 28012:28187

================================================================================
27693

TEveCalo:
Set bounding box when calo data empty.

TEveCaloLegoGL:
TGLAxisPainter:
Draw axis title in TGLAxisPainter::PaintAxis().

--------------------------------------------------------------------------------
27694

Forget to check-in this file in revision 27693.

--------------------------------------------------------------------------------
27695

Don't draw frame and call TGLAxisPainter::Paint() if calo data empty.

--------------------------------------------------------------------------------
27699

Fix issues reported by valgrind.

--------------------------------------------------------------------------------
27758

Return viewer in TEveViewer::SpawnGLViewer and TEveViewer::SpawnGLEmbeddedViewer().

--------------------------------------------------------------------------------
27767

Unset event handler when destroying TGLWidget. This is important in case destruction of TGLWidget is called with timeout.

--------------------------------------------------------------------------------
27840

Add possibility to create different icon boxes in
TEveCompositeFrame. Use static function pointer fgIconBarCreator to change default behavior.

Remove oboslete function TEveCompositeFrame::ReplaceIconBox().

--------------------------------------------------------------------------------
7856

Bug fix: Get font size calculating projected axis length at the Z-title position.

--------------------------------------------------------------------------------
27857

Move to real world coordinates. Add line-set for test.

--------------------------------------------------------------------------------
27867

TGLViewer:
  Add function:
    void ResetInitGL()
  This is needed if GL-context is destroyed from outside.

  Call it from derived classes when creating and destroying GL-widget.

--------------------------------------------------------------------------------
27876

In line set add possibility to disable depth test, i.e. draw lines/markers in front.

--------------------------------------------------------------------------------
28013

Fix memory leak in TEveCalo2D.


--------------------------------------------------------------------------------
28048

In HandleCrossing() ignore grab and ungrab events. Several window managers produce them nowadays (fvwm2, x-on-mac, sawfish).

--------------------------------------------------------------------------------
28050

Simplify macro.

--------------------------------------------------------------------------------
28106

URL: http://root.cern.ch/viewcvs?rev=28106&root=root&view=rev
Log:
Add data-members and accessors for controlling brightness of front,
side and speulcar lights.

--------------------------------------------------------------------------------
28114

TGLPShapeObjEditor
==================
Remove obsolete data-members and enum entries.

TGLUtil
=======
New class TGLColor - using this will simplify color management in
TGLViewer and TGLRnrCtx.

TEveUtil
========
Simplify implementation of TEveUtil::ColorFromIdx() functions.

--------------------------------------------------------------------------------
28144

Add dtor for TGLColor.

--------------------------------------------------------------------------------
28161

URL: http://root.cern.ch/viewcvs?rev=28161&root=root&view=rev
Log:
Extend window management demo.

--------------------------------------------------------------------------------
28162

Add support several GL color-sets - each defines colors for background,
foreground, outline, markup and for outlines of selected and
highlighted objects.


GL/
===

TGLUtil   - add new class TGLColorSet.

TGLRnrCtx - add color-set stack.

TGLViewer - create two color-sets by default - for light and dark
background. These can be switched with the 'e' key now.

TGLScene  - decrease polgon-offset for outline-mode fill-pass from (1,
1) to (0.5, 0.5) which is sufficient.

Use/support color-set functionality in other modified classes.


EVE/
====

TEvePolygonSetProjectedGL - skip outline pass.

TEveProjectionAxesGL - skip outline pass and slightly widen the depth
range so that the text is visible in outline mode, where
polygon-offset is applied during the fill-pass.

--------------------------------------------------------------------------------
28168

Add support for a global GL color-set shared among several (all)
viewers.

TGLViewer - add static data-members and functions to handle global
color-set. Add methods that allow switching between global/private
color-sets for a given viewer.

TGLViewerEditor - Disable backgound-color widget when the viewer uses
global color-set.

TGLCameraOverlay - use foreground color for some markup rendering.

In two tutorials use the new API for setting of the background color.

--------------------------------------------------------------------------------
28187

Put back the old method for setting background color and mark it as deprecated.

Revision 27669 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Mon Mar 2 20:13:53 2009 UTC (5 years, 10 months ago) by matevz
File length: 10676 byte(s)
Diff to previous 27157
Merge the following releases from the fireworks branch:

27023 - Separate frame / tower transparency.

27026 - New TEveCalo3DEditor class. Add interface to Calo3D frame
transparency.

27027 - Better widget label.

Revision 27157 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Thu Jan 15 14:05:12 2009 UTC (6 years ago) by brun
File length: 10522 byte(s)
Diff to previous 26772
From Axel:
Replace all references to Text_t by char, still keeping the definition in Rtypes.h

Revision 26772 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Tue Dec 9 19:57:49 2008 UTC (6 years, 1 month ago) by matevz
File length: 10538 byte(s)
Diff to previous 25245
Merge revs between 26664 and 26771 from the fireworks branch.

26664
=====
TEveCalo3DGL - Check if data empty in draw function.


26681
=====
TEveCalo.cxx:
Check if Data is empty if use relative scaling.

TEveCalo3DGL.cxx:
Remove unnecessary if statement.


26683
=====
TGLFontManager:
Add maping from TTF ID to font name.

TEveCaloLegoGL:
Remove hard coded axis title, read from TAxis.

cms_calo.C, cms_calo_detail.C:
Set axis title.


26685
=====
Draw frame from eta, pgi axis in TEveCalo3D.


26687
=====
TEveCalo3DGL - Do not use DLcache in case of highlight and selection.


26688
=====
TEveCalo3DGL - Draw phi bins exactly from front endcap to back endcap.


26756
=====
TEveCalo3DGL - Draw frame within eta, phi limits.


26771
=====
TEveCaloX - Fix compilation warnings.

Revision 25245 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Mon Aug 25 21:44:09 2008 UTC (6 years, 4 months ago) by matevz
File length: 10119 byte(s)
Diff to previous 24445
Merge changes from the eve-dev branch (-r 25202:HEAD). This makes trunk up to date with all developments in eve/ and gl/. eve-dev branch is now obsolete and will be removed.

Revision 24445 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Fri Jun 20 18:55:43 2008 UTC (6 years, 7 months ago) by matevz
File length: 9106 byte(s)
Diff to previous 24291
From Alja.

TGLAxisPainter.h, TGLAxisPainter.cxx:
Introduce new utilty class to paint axis with GL.

TEveCaloLegoGL,TEveLegoOverlay:
Use TGLAxisPainter functionality.

TEveCaloViz:
Add new Function GetMaxVal().

Revision 24291 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Mon Jun 16 17:35:56 2008 UTC (6 years, 7 months ago) by matevz
File length: 9075 byte(s)
Diff to previous 24271
From Alja.

TEveCalo2DGL, TEveCalo3DGL:
Assert palette in DirectDraw().

TEveCaloData:
Add DataChanged() to notify all referenced calo-viz objects to refresh
cell id cache, update eta, phi limits and palette.

TEveCaloVizEditor:
Set eta, phi limits for TEveGValuators in SetModel().

Revision 24271 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Fri Jun 13 17:08:58 2008 UTC (6 years, 7 months ago) by matevz
File length: 9043 byte(s)
Diff to previous 24257
From Alja.

Move build of TEveCaloData::CellId_t cache from render classes to the base
classes. Rename fCache to fCellIdCache.

Revision 24257 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Thu Jun 12 19:13:42 2008 UTC (6 years, 7 months ago) by matevz
File length: 8907 byte(s)
Diff to previous 24173
From Alja.

TEveCaloData:
Inherit from TEveRefBackPtr. Add function InvalidateUsersCache() to
make correct update on all calo references when changing threshold and

CaloClasses:
Rename ResetCache() to DeleteCache(). Add get/set methods for
slice-color and slice-threshold.

Revision 24173 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Fri Jun 6 19:33:15 2008 UTC (6 years, 7 months ago) by matevz
File length: 8687 byte(s)
Diff to previous 24146
From Alja.

TEveGValuators:
Sub-class from TGWidget and add optional widget-id argument in
constructors.

TEveCalo-classes, cms_calo.C:
Add nested structure SliceInfo_t to hold data for each slice in
histogram stack: name, threshold and color.

Revision 24146 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Wed Jun 4 19:32:56 2008 UTC (6 years, 7 months ago) by matevz
File length: 8582 byte(s)
Diff to previous 24076
- TEveCalo-classes:
  Add possibility to plot E/Et values and enable absolute/relative
  scaling.

- TEveUtil:
  Add utility functions to check if a phi interval lies within or
  overlaps with another interval taking into account the U(1)
  wrap-around.

Revision 24076 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Fri May 30 16:43:01 2008 UTC (6 years, 7 months ago) by matevz
File length: 8577 byte(s)
Diff to previous 24052
From Alja:

- TEveCalo, TEveCaloLegoGL, TEveCalo2DGL, TEveCaloVizEditor:
  Add possibility to auto scale calorimeters.
  In class TEveCaloViz rename member fPhiRng to fPhiOffset.

- cms_calo.C:
  Demonstrate auto scale and eta/phi range.

Revision 24052 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Thu May 29 17:03:48 2008 UTC (6 years, 7 months ago) by matevz
File length: 8228 byte(s)
Diff to previous 23893
From Alja:

- TEveCaloVizEditor:
  Read eta limits from data.

- TEveCaloData, TEveCalo, TEveCalo3DGL, TEveCaloLegoGL, TEveCalo2DGL:
  Enable variable eta and phi range.

- TEveLegoOverlay:
  Draw axis using THLimits finder.

Revision 23893 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Fri May 16 18:46:51 2008 UTC (6 years, 8 months ago) by matevz
File length: 8097 byte(s)
Diff to previous 23869
From Alja.

TEveCalo,TEveCaloLegoEditor:
Add interface for horizontal plane color and transparency.

TEveCaloLegoGL:
Structural improvements.

Revision 23869 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Thu May 15 19:48:00 2008 UTC (6 years, 8 months ago) by matevz
File length: 7745 byte(s)
Diff to previous 23868
Remove trailing whitespace.

Revision 23868 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Thu May 15 19:32:43 2008 UTC (6 years, 8 months ago) by matevz
File length: 7749 byte(s)
Diff to previous 23786
From Alja.

TGLFontManager:
Add utility function GetFontSize().

TEveCaloData:
Fix wrong usage of THStack.

TEveCalo, TEveCaloLegoEditor:
Remove obsolete memeber.

TEveLegoOverlay, LinkDef:
New class.

TEveCaloLegoGL:
Draw a semi-transparent plane parallel to the grid and have an
interactive marker on the scale which a user can drag to cause the
plane to move.

cms_calo.C:
Add overlay to the GL scene.

Revision 23786 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Fri May 9 15:49:54 2008 UTC (6 years, 8 months ago) by matevz
File length: 7548 byte(s)
Diff to previous 23732
From Alja:

TEveCaloData, TEveCalo, TEveCalo3DGL, TEveCalo2DGL, TEveCaloLegoGL:
Fix handling of min and max value cut.

TEveCalo3DGL:
Structural improvements.

Revision 23732 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Wed May 7 18:37:18 2008 UTC (6 years, 8 months ago) by matevz
File length: 7602 byte(s)
Diff to previous 23323
From Alja:
Add possibility to draw box/guide-lines around the lego.

Revision 23323 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Fri Apr 18 18:27:41 2008 UTC (6 years, 9 months ago) by matevz
File length: 7407 byte(s)
Diff to previous 23304
From Alja:

In 2D lego mode set cell color logarithmically.

Add new controls in several editors.

Revision 23304 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Thu Apr 17 18:29:11 2008 UTC (6 years, 9 months ago) by matevz
File length: 7206 byte(s)
Diff to previous 23140
From Alja: Fix palette in 2D view.

Revision 23140 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Fri Apr 11 11:01:39 2008 UTC (6 years, 9 months ago) by rdm
File length: 6792 byte(s)
Diff to previous 23087
move the following directories to "graf2d":

asimage, freetype, gpad, graf, postscript, qt, win32gdk, x11, x11ttf

move the following directories to "graf3d":

eve, ftgl, g3d, gl, x3d

Revision 23087 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Wed Apr 9 14:10:56 2008 UTC (6 years, 9 months ago) by rdm
Original Path: trunk/eve/inc/TEveCalo.h
File length: 6792 byte(s)
Diff to previous 22548
From Alja, Bertrand and Matevz - merged branches/dev/fireworks 22550:23082.


Major changes imported by this merge are:

gl/
====
- reorganization of scene rendering in TGLViewer - render opaque
  objects from all scenes first, then all transparent ones;

- improve saving of images from the GL-viewer so that the dialog boxes
  and other windows do not result in black areas on the saved image;

- improved management of FTGL fonts accross GL contexts.

eve/
====
- new classes for visualization of calorimeter data in lego mode;

- allow fixed scale beyond given radius for fish-eye projections.

Revision 22548 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Sun Mar 9 11:54:01 2008 UTC (6 years, 10 months ago) by rdm
Original Path: trunk/eve/inc/TEveCalo.h
File length: 4952 byte(s)
Diff to previous 22539
Fix coding convention violations.

Remove trailing white-space for all files in eve/ and gl/.

Revision 22539 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Sat Mar 8 14:36:37 2008 UTC (6 years, 10 months ago) by rdm
Original Path: trunk/eve/inc/TEveCalo.h
File length: 4712 byte(s)
Copied from: branches/dev/fireworks/eve/inc/TEveCalo.h revision 22525
Diff to previous 22416
From Alja, Bertrand & Matevz: merged branches/dev/fireworks 21757:22514.

This includes:

- development for event-displays of ALICE and CMS since 5.18 in eve/,
  gl/ and gui/;

- many new tutorials and demos for eve/;

- fix in TQObject to support class-signals from all base-classes.

Revision 22416 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Sat Mar 1 21:56:28 2008 UTC (6 years, 10 months ago) by alja
Original Path: branches/dev/fireworks/eve/inc/TEveCalo.h
File length: 4712 byte(s)
Diff to previous 22398
Structural improvements.

Revision 22398 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Thu Feb 28 21:30:15 2008 UTC (6 years, 10 months ago) by alja
Original Path: branches/dev/fireworks/eve/inc/TEveCalo.h
File length: 4595 byte(s)
Diff to previous 22382
Support of secondary select in TEveCalo2D and TEveCalo3D.

Revision 22382 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Wed Feb 27 21:03:50 2008 UTC (6 years, 10 months ago) by alja
Original Path: branches/dev/fireworks/eve/inc/TEveCalo.h
File length: 4502 byte(s)
Diff to previous 22370
Add members for secondary select.

Revision 22370 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Wed Feb 27 14:53:09 2008 UTC (6 years, 10 months ago) by alja
Original Path: branches/dev/fireworks/eve/inc/TEveCalo.h
File length: 4254 byte(s)
Diff to previous 22357
Bug fixes for bounding box and palette. Structural improvements.

Revision 22357 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Tue Feb 26 20:32:48 2008 UTC (6 years, 10 months ago) by alja
Original Path: branches/dev/fireworks/eve/inc/TEveCalo.h
File length: 4174 byte(s)
Diff to previous 22326
Use TEveRGBAPalette for calorimeters.

Revision 22326 - (view) (download) (as text) (annotate) - [select for diffs]
Added Mon Feb 25 21:22:54 2008 UTC (6 years, 10 months ago) by alja
Original Path: branches/dev/fireworks/eve/inc/TEveCalo.h
File length: 4120 byte(s)
New classes for visualization of calorimeters.

This form allows you to request diffs between any two revisions of this file. For each of the two "sides" of the diff, enter a numeric revision.

  Diffs between and
  Type of Diff should be a

Sort log by:

Subversion Admin
ViewVC Help
Powered by ViewVC 1.0.9