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

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

Parent Directory Parent Directory


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

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: 10398 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: 10100 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: 9715 byte(s)
Diff to previous 32797
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 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: 9547 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: 9455 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: 9412 byte(s)
Diff to previous 30929
From Alja.

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

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

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

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

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

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: 9480 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: 9522 byte(s)
Diff to previous 30819
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 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: 9476 byte(s)
Diff to previous 29302
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 29302 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Thu Jul 2 08:37:01 2009 UTC (5 years, 6 months ago) by matevz
File length: 9264 byte(s)
Diff to previous 28888
Document data-members of struct TEveCaloData::SliceInfo_t.

Revision 28888 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Wed Jun 10 18:47:24 2009 UTC (5 years, 7 months ago) by matevz
File length: 9081 byte(s)
Diff to previous 26561
From Alja.

Add a possibility to disable TwoPi periodic behavior.

Revision 26561 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Mon Dec 1 17:35:55 2008 UTC (6 years, 1 month ago) by matevz
File length: 8936 byte(s)
Diff to previous 25245
Merge the following releases from the fireworks branch:

26432
 - Added TGLSAViewer::DeleteMenuBar().

26444
 - TGLSAViewer - use a steering flag for menu-bar destruction.

26468
 - TEveCaloDataVec - option to define XY axis from cells themselves.

26481
 - TEveCaloDataVec - bugfix;
 - show the new feature in cms_calo*.C tutorials.

26523
 - TEveWindow - new classes for management of EVE vindows;

26524
 - missing include.

26557
 - TEveWindow:
   - support hiding of title-bar directly from frame; render decollapse box
     when hidden;
   - bind context menu to Action/IconBox button;
   - consistent usage of simple frame-style.

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: 8860 byte(s)
Diff to previous 24291
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 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: 6045 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: 5859 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: 5846 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: 5751 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: 5127 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: 5103 byte(s)
Diff to previous 24052
- 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 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: 4972 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: 4517 byte(s)
Diff to previous 23786
From Alja.

TEveCalo2DGL, EveCalo3DGL - fix quad normals.

TEveCalo, TEveCaloLegoGL - use THLimitFider for XY axis. 

TEveCaloData - simplify CellData_t handling.

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

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

TEveCalo3DGL:
Structural improvements.

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: 4365 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/TEveCaloData.h
File length: 4365 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/TEveCaloData.h
File length: 4035 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/TEveCaloData.h
File length: 3937 byte(s)
Copied from: branches/dev/fireworks/eve/inc/TEveCaloData.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/TEveCaloData.h
File length: 3937 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/TEveCaloData.h
File length: 3903 byte(s)
Diff to previous 22326
Support of secondary select in TEveCalo2D and TEveCalo3D.

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/TEveCaloData.h
File length: 3862 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