[root] Log of /trunk/graf3d/eve/inc/TEveCaloLegoOverlay.h

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: 3416 byte(s)
Diff to previous 31081

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 31081 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Wed Nov 11 10:51:54 2009 UTC (5 years, 2 months ago) by matevz
File length: 3419 byte(s)
Diff to previous 30602

From Alja.

Make sure scales do not go offscreen.

Revision 30602 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Wed Oct 7 12:22:38 2009 UTC (5 years, 3 months ago) by brun
File length: 3365 byte(s)
Diff to previous 30384

Fix compilation warning

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: 3366 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: 3307 byte(s)
Diff to previous 27643

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 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: 2652 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: 2621 byte(s)
Copied from: trunk/graf3d/eve/inc/TEveLegoOverlay.h revision 27341
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
Original Path: trunk/graf3d/eve/inc/TEveLegoOverlay.h
File length: 2581 byte(s)
Diff to previous 26367

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 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
Original Path: trunk/graf3d/eve/inc/TEveLegoOverlay.h
File length: 2606 byte(s)
Diff to previous 26274

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 26274 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Tue Nov 18 20:32:48 2008 UTC (6 years, 2 months ago) by matevz
Original Path: trunk/graf3d/eve/inc/TEveLegoOverlay.h
File length: 2609 byte(s)
Diff to previous 25881

Merge from the fireworks branch the following revisions:

26053
=====
TEveCalo, TGLFontManager - Fix memory leaks.

26167
=====
TEveLegoOverlay - Add possiblity to draw a header text in top right corner of window.

26254
=====
TGLSAViewer - Properly clean up the TGMenuBar.
TEveManager - Add static method Terminate() to shutdown the manager.

26267
=====
TGLScene - In FindLogicalSmartRefresh() delete the shape if the classes don't
match. This was a (rare) memory leak.
TEveBoxSetGL - Consistent punctuation.

26273
=====
TEveManager - Add method 'void CloseEveWindow()' and connect it to the
'CloseWindow()' signal of the main browser.

Revision 25881 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Mon Oct 20 11:29:52 2008 UTC (6 years, 3 months ago) by matevz
Original Path: trunk/graf3d/eve/inc/TEveLegoOverlay.h
File length: 2361 byte(s)
Diff to previous 25642

Merge rev 25880 from the fireworks branch.

TEveUtil.cxx:
Bug fix in GetFraction().

TGLFontManager.cxx, TEveProjectionAxesGL.cxx:
Fix left and right text alignement.

TEveLegoOverlay.cxx, TEveLegoOverlay.h:
Use TEveElement main color to color axis labels and lines.

TGLCameraOverlay.h, TGLCameraOverlay.cxx:
Fix random one pixel offset when rendering axis on the viewport
edges. Structural improvements.

tutorials/eve/cms_calo.C:
Show reference plane in TEveLegoOverlay object.

Revision 25642 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Wed Oct 1 11:04:06 2008 UTC (6 years, 3 months ago) by matevz
Original Path: trunk/graf3d/eve/inc/TEveLegoOverlay.h
File length: 2329 byte(s)
Diff to previous 25431

Merge revs 25435:25641 from the fireworks branch.

Many improvements in text and axis rendering for orthographic views,
for axes in non-linear projections and for the dedicated lego view.

TGLSceneBase
------------
Add data-member 'Bool_t fSelectable' with get/set methods.
If this is set to false, the scene is not rendered during selection
thus preventing any of its elements to be selected.

TGLViewerBase
-------------
In PreRender() honour the selectable state of a scene when selecting
which scenes to include in rendering.

TGLSAViewer
-----------
Remove extra border introduced by usage of kSunkenFrame.

TGLEmbeddedViewer
-----------------
Add optional argument 'Int_t border' to the constructor.

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
Original Path: trunk/graf3d/eve/inc/TEveLegoOverlay.h
File length: 2404 byte(s)
Diff to previous 24445

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 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
Original Path: trunk/graf3d/eve/inc/TEveLegoOverlay.h
File length: 1977 byte(s)
Diff to previous 23893

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 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
Original Path: trunk/graf3d/eve/inc/TEveLegoOverlay.h
File length: 2011 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
Original Path: trunk/graf3d/eve/inc/TEveLegoOverlay.h
File length: 2043 byte(s)
Diff to previous 23868

Remove trailing whitespace.

Revision 23868 - (view) (download) (as text) (annotate) - [select for diffs]
Added Thu May 15 19:32:43 2008 UTC (6 years, 8 months ago) by matevz
Original Path: trunk/graf3d/eve/inc/TEveLegoOverlay.h
File length: 2047 byte(s)

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.

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

	Diffs between and
	Type of Diff should be a