[root] / trunk / graf3d / eve / src / TEveCaloLegoGL.cxx Repository:
ViewVC logotype

Log of /trunk/graf3d/eve/src/TEveCaloLegoGL.cxx

Parent Directory Parent Directory


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

Revision 47303 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Thu Nov 15 02:32:13 2012 UTC (2 years, 2 months ago) by matevz
File length: 47054 byte(s)
Diff to previous 43020
From Alja. Fix segv when auto-rebin is enabled and TEveCaloData axis has less
than four bins. Solves bug 98638.

Revision 43020 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Thu Feb 16 03:21:33 2012 UTC (2 years, 11 months ago) by matevz
File length: 47014 byte(s)
Diff to previous 43018
Fix typo ... apparently float_t exists on my compiler, somehow.

Revision 43018 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Thu Feb 16 03:13:21 2012 UTC (2 years, 11 months ago) by matevz
File length: 47014 byte(s)
Diff to previous 41891
Rewrite highlight rendering so that the stencil-control logic lives on the
TGLScene level, within new function TGLScene::RenderHighlight(). A set of new
functions called RenderXXXForHighligt() was introduced in TGLViewer/Scene.

This works around the problems with stencil buffer
coherency during multi-pass rendering with multiple clipping planes.

Some tweaking was necessary in TEve-GL classes that implement specialized
DrawHighlight() virtual from TGLLogicalShape.

Revision 41891 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Thu Nov 10 22:46:31 2011 UTC (3 years, 2 months ago) by pcanal
File length: 47186 byte(s)
Diff to previous 39083
Remove all assigned but unused variable discovered by g++ 4.6.1 (including one completely nop function)

Revision 39083 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Wed May 4 01:42:46 2011 UTC (3 years, 8 months ago) by matevz
File length: 47183 byte(s)
Diff to previous 38721
Bow to coverity's understanding of EVE and to implementation of THLimitsFinder::Optimize().

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: 47176 byte(s)
Diff to previous 37345
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 37345 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Mon Dec 6 16:53:39 2010 UTC (4 years, 1 month ago) by matevz
File length: 46174 byte(s)
Diff to previous 36384
Merge the following revisions from branches/dev/fireworks:
37297, 37299


37297
=====

Author: alja
Date: Sun Dec  5 17:30:59 2010
New Revision: 37297

URL: http://root.cern.ch/viewvc?rev=37297&root=root&view=rev
Log:
TEveCaloLego:
Fix bug in calclucate bounding box.

TEveCaloLego:
Draw Z axis to maximum value of TEveCaloData value or to maximum rebinned
value in case of auto-rebin.

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


37299
=====

Author: alja
Date: Sun Dec  5 18:17:22 2010
New Revision: 37299

URL: http://root.cern.ch/viewvc?rev=37299&root=root&view=rev
Log:
Remove debug print.

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

Revision 36384 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Wed Oct 20 14:26:41 2010 UTC (4 years, 3 months ago) by matevz
File length: 47647 byte(s)
Diff to previous 34868
Rewrite dynamic casts in sub-classes of TGLObject, SetModel() virtual,
so as to avoid complaints from coverity.

Revision 34868 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Thu Aug 19 17:09:30 2010 UTC (4 years, 5 months ago) by matevz
File length: 47732 byte(s)
Diff to previous 34066
Coverity fixes and silencers.

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: 47670 byte(s)
Diff to previous 34028
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 34028 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Mon Jun 21 18:57:28 2010 UTC (4 years, 7 months ago) by matevz
File length: 46959 byte(s)
Diff to previous 34006
Merge rev 34027 from fireworks branch -- fix for scaling when there is no data.

Revision 34006 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Mon Jun 21 10:36:05 2010 UTC (4 years, 7 months ago) by matevz
File length: 47027 byte(s)
Diff to previous 33955
Merge the following revisions from branches/dev/fireworks:
33974, 33980, 33983, 33984, 33994


33974
=====

Author: alja
Date: Thu Jun 17 22:12:00 2010
New Revision: 33974

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

TEveCaloLegoGL:
Fix picking of rebinned 3D towers.

TEveCalo3DGL:
Fix highlight rendering.

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


33980
=====

Author: matevz
Date: Fri Jun 18 18:30:34 2010
New Revision: 33980

URL: http://root.cern.ch/viewvc?rev=33980&root=root&view=rev
Log:
* TGLOverlayElement
  Add state enum member to allow:
  - hiding of overlay elements;
  - preventing overlay events to reach them.
  TGLViewerBase::RenderOverlay() not takes bitfield of states that
  should be drawn.

* TGLCameraGuide
  New overlay element showing axis orientation.

* TGLRnrCtx
  Introduce standard functions to setup projection matrix for 2D /
  screen based operations and properly applying the selection matrix
  when it is active, too:
    void ProjectionMatrixPushIdentity();
    void ProjectionMatrixPop();

* TGLUtil
  Cleanup usage of static float arrays in surroundings of TGLUtil.

Added:
    branches/dev/fireworks/graf3d/gl/inc/TGLCameraGuide.h   (with props)
    branches/dev/fireworks/graf3d/gl/src/TGLCameraGuide.cxx   (with props)
Modified:
    branches/dev/fireworks/graf3d/gl/inc/LinkDef.h
    branches/dev/fireworks/graf3d/gl/inc/TGLCamera.h
    branches/dev/fireworks/graf3d/gl/inc/TGLManip.h
    branches/dev/fireworks/graf3d/gl/inc/TGLOverlay.h
    branches/dev/fireworks/graf3d/gl/inc/TGLRnrCtx.h
    branches/dev/fireworks/graf3d/gl/inc/TGLUtil.h
    branches/dev/fireworks/graf3d/gl/inc/TGLViewerBase.h
    branches/dev/fireworks/graf3d/gl/src/TGLAnnotation.cxx
    branches/dev/fireworks/graf3d/gl/src/TGLLightSet.cxx
    branches/dev/fireworks/graf3d/gl/src/TGLManip.cxx
    branches/dev/fireworks/graf3d/gl/src/TGLRnrCtx.cxx
    branches/dev/fireworks/graf3d/gl/src/TGLRotateManip.cxx
    branches/dev/fireworks/graf3d/gl/src/TGLScaleManip.cxx
    branches/dev/fireworks/graf3d/gl/src/TGLTransManip.cxx
    branches/dev/fireworks/graf3d/gl/src/TGLUtil.cxx
    branches/dev/fireworks/graf3d/gl/src/TGLViewer.cxx
    branches/dev/fireworks/graf3d/gl/src/TGLViewerBase.cxx

Propchange: branches/dev/fireworks/graf3d/gl/inc/TGLCameraGuide.h
            ('svn:eol-style' added)

Propchange: branches/dev/fireworks/graf3d/gl/inc/TGLCameraGuide.h
            ('svn:keywords' added)

Propchange: branches/dev/fireworks/graf3d/gl/src/TGLCameraGuide.cxx
            ('svn:eol-style' added)

Propchange: branches/dev/fireworks/graf3d/gl/src/TGLCameraGuide.cxx
            ('svn:keywords' added)


33983
=====

Author: matevz
Date: Fri Jun 18 19:19:47 2010
New Revision: 33983

URL: http://root.cern.ch/viewvc?rev=33983&root=root&view=rev
Log:
Add on/off state setter void SetBinaryState(Bool_t).

Modified:
    branches/dev/fireworks/graf3d/gl/inc/TGLOverlay.h


33984
=====

Author: matevz
Date: Fri Jun 18 19:35:51 2010
New Revision: 33984

URL: http://root.cern.ch/viewvc?rev=33984&root=root&view=rev
Log:
Replace logical and with binary one.

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


33994
=====

Author: matevz
Date: Sat Jun 19 14:09:04 2010
New Revision: 33994

URL: http://root.cern.ch/viewvc?rev=33994&root=root&view=rev
Log:
Add 3 new data-members to control mouse/arrow key handling:
   Float_t           fArrowKeyFactor;
   Float_t           fMouseDragFactor;
   Float_t           fMouseWheelFactor;

These are take from rootrc, eg:
OpenGL.EventHandler.ViewerCentricControls:  1
OpenGL.EventHandler.ArrowKeyFactor:        -1.0
OpenGL.EventHandler.MouseDragFactor:       -1.0
OpenGL.EventHandler.MouseWheelFactor:      -1.0

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

Revision 33955 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Thu Jun 17 11:33:13 2010 UTC (4 years, 7 months ago) by matevz
File length: 47133 byte(s)
Diff to previous 33864
Merge the following revisions from the fireworks branch:
33909, 33913, 33914, 33916, 33922, 33924, 33925, 33932


33909
=====

Author: matevz
Date: Tue Jun 15 13:05:07 2010
New Revision: 33909

URL: http://root.cern.ch/viewvc?rev=33909&root=root&view=rev
Log:
Add option to switch from scene-centric to viewer-centric controls.
To switch from default, put this into ~/.rootrc:

OpenGL.EventHandler.ViewerCentricControls: 1

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


33913
=====

Author: matevz
Date: Tue Jun 15 15:41:44 2010
New Revision: 33913

URL: http://root.cern.ch/viewvc?rev=33913&root=root&view=rev
Log:
Add help about viewer-centric controls.

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


33914
=====

Author: matevz
Date: Tue Jun 15 15:44:08 2010
New Revision: 33914

URL: http://root.cern.ch/viewvc?rev=33914&root=root&view=rev
Log:
Fix help text line endings.

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


33916
=====

Author: matevz
Date: Tue Jun 15 16:24:37 2010
New Revision: 33916

URL: http://root.cern.ch/viewvc?rev=33916&root=root&view=rev
Log:
* TEveLineGL
  Do not disable blending if it was enabled form outside, only enforce
  it if smooth line-drawing is requested.

* TGLUtil
  Add helper class TGLCapabilityEnabler -- it makes sure certain
  capability is enabled if the required state is true.

Modified:
    branches/dev/fireworks/graf3d/eve/src/TEveLineGL.cxx
    branches/dev/fireworks/graf3d/gl/inc/TGLUtil.h
    branches/dev/fireworks/graf3d/gl/src/TGLUtil.cxx


33922
=====

Author: matevz
Date: Tue Jun 15 17:14:26 2010
New Revision: 33922

URL: http://root.cern.ch/viewvc?rev=33922&root=root&view=rev
Log:
In SetProjection() use CopyVizParams() to propagate visual parameters to projected replicas -- where it makes sense (everywhere but TEvePolgonSetProjected).

Modified:
    branches/dev/fireworks/graf3d/eve/src/TEveGeoShape.cxx
    branches/dev/fireworks/graf3d/eve/src/TEveLine.cxx
    branches/dev/fireworks/graf3d/eve/src/TEvePointSet.cxx
    branches/dev/fireworks/graf3d/eve/src/TEveStraightLineSet.cxx
    branches/dev/fireworks/graf3d/eve/src/TEveTrack.cxx
    branches/dev/fireworks/graf3d/eve/src/TEveTrackProjected.cxx


33924
=====

Author: matevz
Date: Tue Jun 15 17:27:52 2010
New Revision: 33924

URL: http://root.cern.ch/viewvc?rev=33924&root=root&view=rev
Log:
Remove unnecessary function in TGLCapabilityEnabler.

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


33925
=====

Author: matevz
Date: Tue Jun 15 17:28:28 2010
New Revision: 33925

URL: http://root.cern.ch/viewvc?rev=33925&root=root&view=rev
Log:
Fix overriding of smoothness (as in TEveLineGL before).

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


33932
=====

Author: alja
Date: Tue Jun 15 20:17:06 2010
New Revision: 33932

URL: http://root.cern.ch/viewvc?rev=33932&root=root&view=rev
Log:
Add transparency parameter to slice info.

Modified:
    branches/dev/fireworks/graf3d/eve/inc/TEveCaloData.h
    branches/dev/fireworks/graf3d/eve/inc/TEveCaloVizEditor.h
    branches/dev/fireworks/graf3d/eve/src/TEveCalo.cxx
    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
    branches/dev/fireworks/graf3d/eve/src/TEveCaloVizEditor.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: 46726 byte(s)
Diff to previous 33198
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 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: 46364 byte(s)
Diff to previous 33124
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 33124 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Wed Apr 21 20:04:42 2010 UTC (4 years, 9 months ago) by matevz
File length: 46000 byte(s)
Diff to previous 32868
Implement central infractructure to allow eve-elements to support
internal multiple selection and highlightning of their sub-parts.

Use this in TEveDigitSet and its sub-classes TEveQuadSet and
TEveBoxSet.

Extend GL rendering and event-handling to support these operations.


eve/
====

* TEveElement - Add 3 new functions:
    virtual TString  GetHighlightTooltip();
    virtual void     UnSelected();
    virtual void     UnHighlighted();

* TEveSecondarySelectable - New secondary base-class for elements
  supporting internal multiple selection / highlight.

* TEveDigitSet, TEveQuadSet, TEveBoxSet
  - Sub-class TEveDigitSet from TEveSecondarySelectable.
  - Implement functions needed for internal selection.
  - Add common base-class TEveDigitSetGL for quad and box-set GL rendering.

* TEveChunkManager - Add support for restricted iteration.
  TEveChunkManager::iterator accepts set<Int_t> for that purpose.

* TEveViewer - Add functions to handle additional mouse-hover signals
  from TGLViewer.

* Other classes (all GL renderers) - Changes for additional argument
  to TGLLogicalShape::DrawHighlight().


gl/
===

* TGLObject - Take AlwaysSecondarySelect() into account when deciding
  whether to use DL caching for given draw-pass.

* TGLLogicalShape - Add a new (optional) argument to DrawHighlight()
  specifying kind of outline to use (selected or highlighted). This
  allows classes with internal selection to properly render outlines
  when sub-parts of an object are both selected and highlighted.


* TGLEventHandler - Proparly handle objects with internal selection /
  highlight.

* TGLSelectRecord - Add flag to separate GL-selection for selection
  and for highlight. This is really used by record handlers.

* TGLViewer - Add two new signal-emitting functions to properly notify
  clients about changes in internal object selection:
    virtual void ReMouseOver(TObject *obj, UInt_t state); // *SIGNAL*
    virtual void UnMouseOver(TObject *obj, UInt_t state); // *SIGNAL*


tutorials/eve
=============

Add instructions for activation of internal selection in
TEveQuad/BoxSet.

Revision 32868 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Thu Apr 1 17:08:41 2010 UTC (4 years, 9 months ago) by matevz
File length: 45895 byte(s)
Diff to previous 32811
Move member 'Int_t fBinStep' from TEveCaloLego to TEveCaloLegoGL.

Change access to it from TEveCaloLegoOverlay.

Revision 32811 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Mon Mar 29 13:14:49 2010 UTC (4 years, 9 months ago) by matevz
File length: 45950 byte(s)
Diff to previous 32797
graf3d/gl/inc/TGLCameraOverlay.h:
graf3d/gl/src/TGLCameraOverlay.cxx:
Move fFrustum calculation from Render() to separate SetFrustum() function.

graf3d/eve/src/TEveCaloLegoOverlay.cxx:
Fix condition to render camera-overlay: compare xy histogram limits with frustum.

graf3d/eve/src/TEveCaloLegoGL.cxx:
Set upper limit of font size and tick-mark size relative to view-port size.

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: 45458 byte(s)
Diff to previous 31855
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 31855 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Fri Dec 11 12:33:45 2009 UTC (5 years, 1 month ago) by matevz
File length: 45502 byte(s)
Diff to previous 31692
* Add two screenshots to the release notes.

* TGLFormat - initialize fStereo member in both constructors.

* TEveCaloLegoGL - do not draw the coordinate grid in outline-line
  render pass in 3D mode.

Revision 31692 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Tue Dec 8 17:56:21 2009 UTC (5 years, 1 month ago) by matevz
File length: 45464 byte(s)
Diff to previous 31083
Fix coverity warnings.

Revision 31083 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Wed Nov 11 11:51:59 2009 UTC (5 years, 2 months ago) by matevz
File length: 45369 byte(s)
Diff to previous 31075
Fix 3 occurences of ';;'.

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: 45370 byte(s)
Diff to previous 30940
From Alja.

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

Revision 30940 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Mon Nov 2 11:37:03 2009 UTC (5 years, 2 months ago) by matevz
File length: 45095 byte(s)
Diff to previous 30937
From Alja.

TEveCaloData:
Remove unnecessary and confusing fHist member in TEveCaloData::SliceInfo_t.

TEveCaloLegoGL:
IN 3D view fix algorithm which defines rebin step.

Revision 30937 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Sat Oct 31 08:43:05 2009 UTC (5 years, 2 months ago) by matevz
File length: 44978 byte(s)
Diff to previous 30931
Merge 30936 from fworks branch -- fix for pixmpaf fonts on mac.

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: 44910 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: 43788 byte(s)
Diff to previous 30886
From Alja.

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

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

Revision 30886 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Tue Oct 27 13:37:11 2009 UTC (5 years, 2 months ago) by matevz
File length: 41180 byte(s)
Diff to previous 30880
From Alja.

geaf3d/gl:
In TGLSelectRecord add new member and type to define a result of TGLLogicalShape::ProcessSelection().
Handle this result in TGLEventHandler::HandleButton(). In TGLViewer emit "ReClick" signal 
if selection has changed only internally or emit "UnClicked" signal if secondary selection became empty. 

graf3d/eve:
Separate case when secondary selection has changed from case when primary selection has changed.
Add a new function TEveSelection::SelectionRepeated(), called when selection has changed only internally and
add TEveSelection::UserRePickedElement(), called when secondary selection was cleared.

Revision 30880 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Tue Oct 27 09:09:11 2009 UTC (5 years, 2 months ago) by matevz
File length: 40808 byte(s)
Diff to previous 30855
From Alja.

Fix cell rendering in orthographic top view in case using palette (f2DMode=kValCol).

Revision 30855 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Fri Oct 23 16:45:07 2009 UTC (5 years, 3 months ago) by matevz
File length: 40808 byte(s)
Diff to previous 30841
graf3d/gl/src/TGLEventHandler.cxx:
graf3d/gl/src/TGLSelectRecord.cxx:
graf3d/gl/inc/TGLSelectRecord.h:
Add support for multiple second level selection.

graf3d/eve/src/TEveCalo.cxx:
Fix possible crash at exit: in destructor check array initialization.

graf3d/eve/src/TEveCalo3DGL.cxx
graf3d/eve/src/TEveCalo2DGL.cxx
graf3d/eve/src/TEveCaloLegoGL.cxx
graf3d/eve/inc/TEveCaloData.h
graf3d/eve/src/TEveCaloData.cxx
Enable succeding tower selection. Disable rendering of towers if calorimeter
object is highlighted.

Revision 30841 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Fri Oct 23 09:23:34 2009 UTC (5 years, 3 months ago) by matevz
File length: 40591 byte(s)
Diff to previous 30827
From Alja.

graf3d/eve/src/TEveCaloLegoGL.cxx:
Fix lighting.

graf3d/eve/src/TEveCaloData.cxx:
graf3d/eve/src/TEveCalo.cxx:
graf3d/eve/src/TEveCalo2DGL.cxx:
Cache selected cell ids in TEveCalo2D.

Revision 30827 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Thu Oct 22 10:08:22 2009 UTC (5 years, 3 months ago) by matevz
File length: 40653 byte(s)
Diff to previous 30819
From Alja.

graf3d/eve/src/TEveCalo.cxx:
Fix infinite loop at destruction: do not remove itself from parent.
Move printouts IncImpliedSelected to debug mode.

graf3d/eve/src/TEveCalo3DGL.cxx:
graf3d/eve/src/TEveCaloLegoGL.cxx:
graf3d/eve/src/TEveCalo2DGL.cxx:
Addo only towers with selected slice in the selection list.

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: 40792 byte(s)
Diff to previous 30545
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 30545 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Fri Oct 2 16:24:12 2009 UTC (5 years, 3 months ago) by matevz
File length: 38608 byte(s)
Diff to previous 30482
From Alja.

calorimeters.C:
Set light color-set.

TEveCaloLegoGL.cxx:
Bugfix: check rebin step not to exceed nuber of bins.

TEveProjectionAxes:
Use Pixmap font as a defult, since it look better at small sizes.
For example case window is docked.

TGLAnnotation:
Add option to use color-set values. Add setters and getters.

Revision 30482 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Sat Sep 26 08:41:44 2009 UTC (5 years, 3 months ago) by matevz
File length: 38449 byte(s)
Diff to previous 30480
Fix a compilation warning.

Revision 30480 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Fri Sep 25 21:47:44 2009 UTC (5 years, 3 months ago) by matevz
File length: 38447 byte(s)
Diff to previous 30438
From Alja.

Simplify and improve view dependent rebinning.

Revision 30438 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Fri Sep 25 10:15:00 2009 UTC (5 years, 3 months ago) by matevz
File length: 38539 byte(s)
Diff to previous 30429
From Alja.

TGLCameraOverlay:
Change color contrasts.

TEveCaloLegoGL:
Make consistent name stack - first item in selection is tower id.
Add missing update on change of eta/phi range.

TEveCaloEditor:
Add interface to set draw text (tower value) threshold.

Revision 30429 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Thu Sep 24 21:01:55 2009 UTC (5 years, 4 months ago) by matevz
File length: 38222 byte(s)
Diff to previous 30425
Remove superficial lines, whitespace.

Revision 30425 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Thu Sep 24 19:45:11 2009 UTC (5 years, 4 months ago) by matevz
File length: 38227 byte(s)
Diff to previous 30418
In all classes using FTGL fonts:
Consistently use integer for FTGL font size.

TGLEventHandler, TEveLegoEventHandler, TGLSAViewer,TGLEmbeddedViewer:
Change construnctor of TGLEventHandler and TEveLegoEventHandler.

Revision 30418 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Thu Sep 24 17:10:11 2009 UTC (5 years, 4 months ago) by matevz
File length: 38175 byte(s)
Diff to previous 30384
From Alja.

GLRnrCtx:
Add possibility for automatic font scaling.

TGLFontManager:
In RegisterFont() check if font state has changed and check valid font size. Before,
this checks were done in the renders.

render classes:
Use optionally scaled or non-scaled fonts. Remove checks for FTGL fonts,
since they are now done in  TGLFontManager:RegisterFont().

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: 38526 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: 37966 byte(s)
Diff to previous 29676
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 29676 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Tue Aug 4 16:18:07 2009 UTC (5 years, 5 months ago) by matevz
File length: 37447 byte(s)
Diff to previous 28623
Add support for control over viewer-global point-size and line-width
scaling. Additionally, allow wireforame and outline line widths to be
specified separately (on viewer / scene / scene-info level).

This will allow for scaling of pixel-based objects (lines and points) when
saving of screenshots with very high resolution is
implemented.

Basic support is impemented across TGLViewer, TGLScene, TGLRnrCtx and
TGLUtil.

Classes that used glPointSize and glLineWidth were modified to call
corresponding static function in TGLUtil class.

Controls were added to TGLViewerEditor (under Style tab).

Revision 28623 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Thu May 14 09:55:03 2009 UTC (5 years, 8 months ago) by matevz
File length: 37412 byte(s)
Diff to previous 28197
Move an include directive from .h to .cxx.

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: 37387 byte(s)
Diff to previous 27643
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 27643 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Fri Feb 27 16:13:24 2009 UTC (5 years, 10 months ago) by matevz
File length: 36657 byte(s)
Diff to previous 27370
From Alja.

graf3d/gl/src/TGLAxisPainter.cxx,
graf3d/gl/inc/TGLAxisPainter.h:
Add possibility to render axis with any FTGL font mode. Before only pixmap and bitmap fonts were supported.

graf3d/gl/src/TGLFontManager.cxx:
Check if static table is initialised in TGLFontManager::GetFontNameFromId().

graf3d/gl/src/TGLCameraOverlay.cxx,
graf3d/gl/inc/TGLCameraOverlay.h:
Use FTGL font directly in kBar and kPlaneIntersect overlay mode.

graf3d/eve/src/TEveProjectionAxes.cxx:
Set axis attributes.
 
graf3d/eve/src/TEveProjectionAxesGL.cxx,
graf3d/eve/src/TEveCaloLegoOverlay.cxx,
graf3d/eve/inc/TEveCaloLegoOverlay.h,
Render axis with texture font.

Revision 27370 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Fri Feb 6 18:58:23 2009 UTC (5 years, 11 months ago) by matevz
File length: 35636 byte(s)
Diff to previous 27341
graf3d/gl/src/TGLAxisPainter.cxx:
Fix last tick-mark position.

graf3d/gl/src/TGLCameraOverlay.cxx,
graf3d/gl/inc/TGLCameraOverlay.h:
Set font size and tick length relative to size of viewport diagonal.

graf3d/eve/src/TEveCaloLegoOverlay.cxx:
graf3d/eve/src/TEveLegoOverlay.cxx:
graf3d/eve/inc/TEveLegoOverlay.h:
graf3d/eve/inc/TEveCaloLegoOverlay.h:
graf3d/eve/inc/LinkDef2.h:
graf3d/eve/Module.mk:
Rename class TEveLegoOverlay to TEveCaloLegoOverlay, since this is overlay rendering calorimeter parameters.

graf3d/eve/inc/TEveCaloLegoGL.h:
graf3d/eve/src/TEveCaloLegoGL.cxx:
Small bug fix in z-axis tick marks offset. Render axes in 2D
differently than in 3D.

graf3d/eve/src/TEveProjectionAxesGL.cxx:
graf3d/eve/src/TEveProjectionAxes.cxx:
Set axis range relative to viewport size not relative to bounding box
of projection manager as before. Use viewport diagonal as a main reference to set tick length and font size.

graf3d/eve/src/TEveProjectionAxes.cxx:
Change default tick length.

tutorials/eve/cms_calo.C:
tutorials/eve/cms_calo_detail.C:
Adopt to changes in the source code.

Revision 27341 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Tue Feb 3 19:47:35 2009 UTC (5 years, 11 months ago) by matevz
File length: 33415 byte(s)
Diff to previous 26772
From Alja.

graf3d/gl/src/TGLAxisPainter.cxx,
graf3d/gl/inc/TGLAxisPainter.h:
Reimplement GL rendering of axis. Calculation of labels val-positions
and tick-marks is separated from the rendering code. The painter has
now possibility to render TAxis directly or render given list of label position-value pairs.

graf3d/gl/inc/LinkDef.h:
Remove obsolete class TGLAttAxis, which have been used by TGLAxisPainter.

graf3d/gl/src/TGLFontManager.cxx:
Use same indexing of font names as in graf2d rendering of axis.

graf3d/gl/inc/TGLCameraOverlay.h,
graf3d/gl/src/TGLCameraOverlay.cxx,
graf3d/eve/src/TEveProjectionAxes.cxx,
graf3d/eve/inc/TEveProjectionAxes.h,
graf3d/eve/inc/TEveProjectionAxesGL.h,
graf3d/eve/src/TEveProjectionAxesGL.cxx,
graf3d/eve/inc/TEveLegoOverlay.h,
graf3d/eve/src/TEveLegoOverlay.cxx,
graf3d/eve/inc/TEveCaloLegoGL.h
graf3d/eve/src/TEveCaloLegoGL.cxx,
Use new implementation of TGLAxisPainter.

graf3d/eve/inc/TEveProjectionAxesEditor.h,
graf3d/eve/src/TEveProjectionAxesEditor.cxx:
Remove obsolete widgets since TEveProjectionAxes inherit from TAttAxis.

graf3d/eve/src/TEveCalo.cxx:
Bugfix. Check if RGBAPalette is created when switching E/Et.

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: 35520 byte(s)
Diff to previous 26367
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 26367 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Fri Nov 21 18:08:30 2008 UTC (6 years, 2 months ago) by matevz
File length: 35285 byte(s)
Diff to previous 26250
Merge revisions 26280:26327 from the fireworks branch.

26281
=====
- TGLScenePad: replace static variable with a data-member. Fix comments.

26304
=====
- TEveProjectionAxesGL: fix index out of bounds error reported by valgrind.

26306
=====
- TGLScene, TGLScenePad: better comments, consistent whitespace.
- TEveElement: add method DestroyOrWarn(): original Destroy() method is exception throwing.
- TEveScene: delete GL-scene and pad in destructor; add ownership information to class-docs.
- TEveSceneList: add method DestroyScenes().
- TEveViewer: add ownership information to class-docs.
- TEveManager: delete scenes, scene-list, viewers and viewer-list in destructor.

26325
=====
TEveTrackPropagator: implement the following overrides of virtual functions:
 - TEveElement::CheckReferenceCount() - take into account references from TEveRefBackPtr;
 - TEveRefBackPtr::OnZeroRefCount()   - call CheckReferenceCount().

26327
=====
Remove trailing whitespace in eve/ and gl/.

Revision 26250 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Mon Nov 17 20:56:44 2008 UTC (6 years, 2 months ago) by matevz
File length: 35307 byte(s)
Diff to previous 26005
TGLContext, TGLWidget
---------------------
Add method ClearCurrent() to set current GL context to 0.

TGLLogicalShape
---------------
Change how number of required display-lists per object is handled:
before it was a virtual function, now it is a data member.
Fixes a severe memory leak due wrong number of released display-lists
when called from the destructor, which was calling a virtual function
to determine their number.

Fix accordingly the following classes: TGLSphere, TGLCylinder,
TEveCaloLegoGL and TEveBoxSetGL.

Revision 26005 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Tue Oct 28 19:52:48 2008 UTC (6 years, 2 months ago) by matevz
File length: 35398 byte(s)
Diff to previous 25431
graf3d/eve/src/TEveCalo.cxx:
Fix bounding box of projected calorimeter.

graf3d/eve/src/TEveCaloLegoGL.cxx
Set axis flabel and title color.

tutorials/eve/cms_calo.C:
Add projection axes in projected scene. Fix root indent,

tutorials/eve/projection_test_prescale.C
Remove obsolete function calls.

Revision 25431 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Wed Sep 17 08:35:34 2008 UTC (6 years, 4 months ago) by matevz
File length: 35134 byte(s)
Diff to previous 25261
Merge Alja's development since the release from the fireworks branch.

25284
-----
TEveCaloLegoGL, TGLAxisPainter, TGLCameraOverlay:
Fix tick-mark and font offsets.

25291
-----
TGLViewerEditor, TGLViewer, TGLCamera, TGLOrthoCamera,
TGLCameraOverlay, LinkDef.h:
Remove TGLCameraMarkupStyle. Functionality is moved to TGLCameraOverlay.

TGLFontManager:
Add utility function TGLFont::RenderBitmap() to draw pixmap
and bitmap fonts on given location.

TEveProjectionAxesGL:
Use TGLFont::RenderBitmap() function.

cms_calo.C, projection_test_prescale.C, projection_test.C, test_compound.C:
Camera markup is not drawn by default in orthographic projection.

25319
-----
TGLCameraOverlay.cxx:
Fix gl pick matrix.

TEveLegoOverlay:
Move inheritance from TGLOverlayElement to TGLCameraOverlay.

25395
-----
TGLFontManager, TGLAxisPainter, TGLCameraOverlay,TEveLegoOverlay, TEveCaloLegoGL:
Modify utility function TGLFont::RenderBitmap() to render text with given alignment.

TEveProjectionAxes:
Render axis on the edges of viewport instead of on edges of bounding box.

25405
-----
TEveProjectionAxesGL:
Draw axis from start to end of frustum corners if frustum inside projection limits,
else draw axis from low to high projection limit.
Set tick-mark size relative to viewport size.

Revision 25261 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Tue Aug 26 15:10:58 2008 UTC (6 years, 4 months ago) by matevz
File length: 35146 byte(s)
Diff to previous 25245
Fix shadowed variables.

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: 35170 byte(s)
Diff to previous 24557
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 24557 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Thu Jun 26 02:07:00 2008 UTC (6 years, 6 months ago) by matevz
File length: 29755 byte(s)
Diff to previous 24445
Set line-width for grid rendering.

In 2D box-mode plot extra GL-points at tower centers to avoid flickering.

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: 29418 byte(s)
Diff to previous 24271
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 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: 34815 byte(s)
Diff to previous 24270
From Alja.

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

Revision 24270 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Fri Jun 13 16:57:25 2008 UTC (6 years, 7 months ago) by matevz
File length: 35028 byte(s)
Diff to previous 24257
From Alja: Fix  font rendering bug on mac os.

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: 34969 byte(s)
Diff to previous 24214
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 24214 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Wed Jun 11 14:48:35 2008 UTC (6 years, 7 months ago) by matevz
File length: 35014 byte(s)
Diff to previous 24193
TGLObject and subclasses
-----------------------------------------

Introduce new member 'Bool_t TGLObject::fMultiColor' that specifies
whether the class uses multiple colors for its rendering. This
information is important when drawing highlight or outlines around
objects as display-lists can not be used if color-state changes are
stored in them.

With this modification most of the logick for
  virtual Bool_t TGLLogicalShape::ShouldDLCache(...)
can be implemented in TGLObject version.

Most of the GL-rendering classes have been fixed to properly set the
fMultiColor state and rely on the TGLObject::ShouldDLCache().


TGLPhysicalShape
----------------

Use TGLLogicalShape::Draw() instead of DirectDraw() when drawing
highlights to allow usage of display-lists for classes that do not use
multiple colors.


TGLUtil
-------

Decrease the default draw-quality for DrawLine/Cylinder/Sphere/Disk to
10. With software rendering the previous value of 60 caused very low
refresh rates.

Introduce two inner classes TDrawQualityModifier and
TDrawQualityScaler allowing easy/safe modification of draw-quality for
the above functions.

Introduce inner class TColorLocker allowing easy/safe modification of
color-lock state.

Revision 24193 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Mon Jun 9 17:46:24 2008 UTC (6 years, 7 months ago) by matevz
File length: 35343 byte(s)
Diff to previous 24173
From Alja:

TEveCaloLegoGL:
Fix a crash when going from 3D to 2D lego view.

SmallFixes:

- CaloLegoGL, CaloLego
Change offset of XY axis titles.
Check gap between projected bin lines around average eta and phi values.

- cms_calo.C
Change color of towers to make towers more visible in 2D view.

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: 34510 byte(s)
Diff to previous 24158
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 24158 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Thu Jun 5 17:16:56 2008 UTC (6 years, 7 months ago) by matevz
File length: 34629 byte(s)
Diff to previous 24146
From Alja.

TEveCaloData:
Change GetCellData() to const.

TEveCalo:
Set threshold in SetData().

TEveCaloLegoGL:
Fix tick-marks and change rendering order of cells and plane.

TGLCamera:

Coordinate-system conversion functions ViewportDeltaToWorld(),
ViewportToWorld() and WorldToViewport now take an optional argument
specifying model-view matrix to be used in calculation.

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: 34518 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: 34536 byte(s)
Diff to previous 24071
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 24071 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Fri May 30 09:19:49 2008 UTC (6 years, 7 months ago) by matevz
File length: 34306 byte(s)
Diff to previous 24052
Fix compilation warning and some whitespace.

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: 34296 byte(s)
Diff to previous 23958
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 23958 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Wed May 21 18:16:34 2008 UTC (6 years, 8 months ago) by matevz
File length: 33257 byte(s)
Diff to previous 23914
From Alja.

TEveCalo2DGL, EveCalo3DGL - fix quad normals.

TEveCalo, TEveCaloLegoGL - use THLimitFider for XY axis. 

TEveCaloData - simplify CellData_t handling.

Revision 23914 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Mon May 19 18:23:08 2008 UTC (6 years, 8 months ago) by matevz
File length: 31427 byte(s)
Diff to previous 23893
TEveTrackEditor - add a protection.


From Alja: TEveCaloLegoGL - Set z-coordinate of 2D cells to the same
value as in 3d case to allow for thresholding with a transparent plane.

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: 31385 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: 32751 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: 32794 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: 31516 byte(s)
Diff to previous 23771
From Alja:

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

TEveCalo3DGL:
Structural improvements.

Revision 23771 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Thu May 8 19:43:50 2008 UTC (6 years, 8 months ago) by matevz
File length: 31434 byte(s)
Diff to previous 23732
From Alja:

In lego-view, draw an additional Z-axis next to the tower that is
double-clicked.

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: 29842 byte(s)
Diff to previous 23667
From Alja:
Add possibility to draw box/guide-lines around the lego.

Revision 23667 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Tue May 6 17:30:36 2008 UTC (6 years, 8 months ago) by matevz
File length: 27697 byte(s)
Diff to previous 23408
From Alja:

TEveLegoEventHandler - New class for camera event handling.

TEveCaloLegoGL - Remove code which changed GL model-view matrix.

TGLViewer, TGLViewerBase - New getters.

TGLCamera - Add function GetTheta().

tutorials/eve/cms_calo.C - Structural improvements. Demonstrate
TEveLegoEventHandler.

Revision 23408 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Wed Apr 23 07:37:21 2008 UTC (6 years, 9 months ago) by brun
File length: 28208 byte(s)
Diff to previous 23382
Fix compilation warnings with gcc4.3

Revision 23382 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Tue Apr 22 08:02:22 2008 UTC (6 years, 9 months ago) by brun
File length: 28200 byte(s)
Diff to previous 23374
Fix a compilation warning

Revision 23374 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Mon Apr 21 19:38:20 2008 UTC (6 years, 9 months ago) by matevz
File length: 28196 byte(s)
Diff to previous 23323
From Alja: structural improvements.

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: 28135 byte(s)
Diff to previous 23305
From Alja:

In 2D lego mode set cell color logarithmically.

Add new controls in several editors.

Revision 23305 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Thu Apr 17 18:38:35 2008 UTC (6 years, 9 months ago) by matevz
File length: 27706 byte(s)
Diff to previous 23304
Fix compilation warning.

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: 27695 byte(s)
Diff to previous 23264
From Alja: Fix palette in 2D view.

Revision 23264 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Wed Apr 16 19:03:06 2008 UTC (6 years, 9 months ago) by matevz
File length: 27351 byte(s)
Diff to previous 23189
From Alja: Rebin histogram in 2D if projection is small.

Revision 23189 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Sun Apr 13 16:15:16 2008 UTC (6 years, 9 months ago) by matevz
File length: 24129 byte(s)
Diff to previous 23140
Fix coding-convention violations.

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: 23283 byte(s)
Diff to previous 23105
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 23105 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Thu Apr 10 09:48:39 2008 UTC (6 years, 9 months ago) by matevz
Original Path: trunk/eve/src/TEveCaloLegoGL.cxx
File length: 23283 byte(s)
Diff to previous 23087
Fix compiler warnings and coding convention violations.

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/src/TEveCaloLegoGL.cxx
File length: 23180 byte(s)
Copied from: branches/dev/fireworks/eve/src/TEveCaloLegoGL.cxx revision 23083
Diff to previous 22988
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 22988 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Fri Apr 4 19:03:54 2008 UTC (6 years, 9 months ago) by alja
Original Path: branches/dev/fireworks/eve/src/TEveCaloLegoGL.cxx
File length: 23180 byte(s)
Diff to previous 22925
TEveCaloLego:

Draw simplified histogram in bird's eye view.
This mode is enabled when absolute value of theta is less than 8 degrees.

Required small changes in:
TGLRnrCtx, TGLCamera - add some getters;
TGLUtil    - new functions in TGLMatrix;
cms_calo.C - make eta axis horizontal.

Revision 22925 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Tue Apr 1 14:04:51 2008 UTC (6 years, 9 months ago) by matevz
Original Path: branches/dev/fireworks/eve/src/TEveCaloLegoGL.cxx
File length: 18035 byte(s)
Diff to previous 22921
Move function TEveProjectionAxesGL::GetText(Float_t value), used to
format a real value for display on the axis, to static function in
TEveUtil::FormAxisValue(Float_t).

Use this function also in TEveCaloLegoGL. This fixes problem on
windows with 8 trailing zeroes printed for '%.0f' format.

Revision 22921 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Tue Apr 1 10:13:08 2008 UTC (6 years, 9 months ago) by matevz
Original Path: branches/dev/fireworks/eve/src/TEveCaloLegoGL.cxx
File length: 18013 byte(s)
Diff to previous 22897
TEveCaloLegoGL:
 - use lower case phi for y-axis label;
 - move axis numbers away from the central grid;
 - add tick-marks in horizontal direction as well.

cms_calo.C:
 Use a more lively color for grid.

Revision 22897 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Sun Mar 30 09:58:55 2008 UTC (6 years, 9 months ago) by bellenot
Original Path: branches/dev/fireworks/eve/src/TEveCaloLegoGL.cxx
File length: 17778 byte(s)
Diff to previous 22895
- Replace 'not' by '|' to allow compilation on Windows.

Revision 22895 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Sat Mar 29 23:52:18 2008 UTC (6 years, 9 months ago) by alja
Original Path: branches/dev/fireworks/eve/src/TEveCaloLegoGL.cxx
File length: 17784 byte(s)
Diff to previous 22890
Do not render grid and axes in highlight mode.
Automatically set font size.

Revision 22890 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Fri Mar 28 18:57:26 2008 UTC (6 years, 9 months ago) by alja
Original Path: branches/dev/fireworks/eve/src/TEveCaloLegoGL.cxx
File length: 16425 byte(s)
Diff to previous 22888
Align text on Z axis.

Revision 22888 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Fri Mar 28 16:27:19 2008 UTC (6 years, 9 months ago) by alja
Original Path: branches/dev/fireworks/eve/src/TEveCaloLegoGL.cxx
File length: 18758 byte(s)
Diff to previous 22856
Add Et scale in lego view.

Revision 22856 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Wed Mar 26 19:26:06 2008 UTC (6 years, 9 months ago) by alja
Original Path: branches/dev/fireworks/eve/src/TEveCaloLegoGL.cxx
File length: 16361 byte(s)
Diff to previous 22821
TEveCaloLego:
Use display lists to make faster rendering.

Revision 22821 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Mon Mar 24 19:53:04 2008 UTC (6 years, 10 months ago) by alja
Original Path: branches/dev/fireworks/eve/src/TEveCaloLegoGL.cxx
File length: 13823 byte(s)
Diff to previous 22820
From Dima:
Do not paint if TEveCaloData is not initialized.

Revision 22820 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Mon Mar 24 19:27:08 2008 UTC (6 years, 10 months ago) by alja
Original Path: branches/dev/fireworks/eve/src/TEveCaloLegoGL.cxx
File length: 13855 byte(s)
Diff to previous 22799
New TEveCaloLegoEditor class with font and grid color widgets.
Fix secondary selection (title text took first place in the name stack).

Revision 22799 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Thu Mar 20 20:56:39 2008 UTC (6 years, 10 months ago) by alja
Original Path: branches/dev/fireworks/eve/src/TEveCaloLegoGL.cxx
File length: 13762 byte(s)
Diff to previous 22797
Lego:
- fix secondary selection for lego (use Alt-Mouse-1);
- use MainColor for drawing the grid lines.

GLFont::PreRender:
- properly restore GL state after text rendering.

Revision 22797 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Thu Mar 20 16:54:04 2008 UTC (6 years, 10 months ago) by matevz
Original Path: branches/dev/fireworks/eve/src/TEveCaloLegoGL.cxx
File length: 12272 byte(s)
Diff to previous 22770
Disable lightning while rendering grid lines.

Revision 22770 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Thu Mar 20 11:30:31 2008 UTC (6 years, 10 months ago) by alja
Original Path: branches/dev/fireworks/eve/src/TEveCaloLegoGL.cxx
File length: 12114 byte(s)
Diff to previous 22758
Add interface to register FreeType font with file name.

Revision 22758 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Wed Mar 19 20:01:30 2008 UTC (6 years, 10 months ago) by alja
Original Path: branches/dev/fireworks/eve/src/TEveCaloLegoGL.cxx
File length: 12177 byte(s)
Diff to previous 22631
Add axis title.

Revision 22631 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Wed Mar 12 18:38:24 2008 UTC (6 years, 10 months ago) by matevz
Original Path: branches/dev/fireworks/eve/src/TEveCaloLegoGL.cxx
File length: 11936 byte(s)
Diff to previous 22629
TEveCaloXYZ - invalidate cache validity in setters, not in editor slot
functions.

TEveBrowser - remove superfluous comma in EEveMenu enum.

Revision 22629 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Wed Mar 12 17:31:21 2008 UTC (6 years, 10 months ago) by alja
Original Path: branches/dev/fireworks/eve/src/TEveCaloLegoGL.cxx
File length: 12000 byte(s)
Diff to previous 22608
Draw dick-marks symmetrically in TEveCaloLego.

Revision 22608 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Tue Mar 11 20:17:07 2008 UTC (6 years, 10 months ago) by alja
Original Path: branches/dev/fireworks/eve/src/TEveCaloLegoGL.cxx
File length: 11837 byte(s)
Diff to previous 22578
Unregister TGLFont from manager in destructor.

Revision 22578 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Mon Mar 10 18:44:31 2008 UTC (6 years, 10 months ago) by alja
Original Path: branches/dev/fireworks/eve/src/TEveCaloLegoGL.cxx
File length: 11908 byte(s)
Diff to previous 22577
Minor fixes in the calorimeter classes.

Revision 22577 - (view) (download) (as text) (annotate) - [select for diffs]
Added Mon Mar 10 18:01:34 2008 UTC (6 years, 10 months ago) by alja
Original Path: branches/dev/fireworks/eve/src/TEveCaloLegoGL.cxx
File length: 11902 byte(s)
Add new visualization class for rendering of calorimeter data in standard eta-phi plane.

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