From ec526c1d10eb99cdbb89fdeedb5e37bb92a50ec8 Mon Sep 17 00:00:00 2001
From: Matevz Tadel <matevz.tadel@cern.ch>
Date: Fri, 11 Dec 2009 12:33:45 +0000
Subject: [PATCH] * 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.


git-svn-id: http://root.cern.ch/svn/root/trunk@31855 27541ba8-7e3a-0410-8455-c3a389f83636
---
 graf3d/doc/v526/index.html        | 34 ++++++++++++++++++++++++++++---
 graf3d/eve/src/TEveCaloLegoGL.cxx |  9 ++++----
 graf3d/gl/src/TGLFormat.cxx       |  2 ++
 3 files changed, 38 insertions(+), 7 deletions(-)

diff --git a/graf3d/doc/v526/index.html b/graf3d/doc/v526/index.html
index faa563aed0a..72607691d56 100644
--- a/graf3d/doc/v526/index.html
+++ b/graf3d/doc/v526/index.html
@@ -15,6 +15,9 @@ elements and are supposed to follow their movements / rotations.
 
 <li> Several significant improvements in TEveCaloLego classes.
 <ul>
+<li> <tt>Calo</tt> classes now support individal tower selection. The
+  selection is properly maintained across all views (3D / RPhi / RhoZ
+  / Lego). See screenshot below.
 <li> In top view draw cell values, if their screen size is above given limit.
 <li> New energy-scales drawn as overlay (in color and size mode). The
 legend can be moved around the screen with the mouse.
@@ -103,6 +106,31 @@ how to read Visualization Summary Data files (VSD).
 
 </ul>
 
+<p>
+
+<div class="image">
+<a href="http://mtadel.home.cern.ch/mtadel/root/graf3d_eve_calorimeters.png">
+<img alt="Eve window showing CMS calorimeters with 3D / RPhi /
+ and Lego views. Selectrion across several views isdemonstrated."
+src="http://mtadel.home.cern.ch/mtadel/root/graf3d_eve_calorimeters_800.png">
+</a>
+<div>Screenshot of <tt>calorimeters.C</tt> tutorial. Note the
+  individual tower selection propagated accross all the views.</div>
+</div>
+
+<p>
+
+<div class="image">
+<a href="http://mtadel.home.cern.ch/mtadel/root/graf3d_eve_alice_vsd.png">
+<img alt="Eve window showing ALICE VSD example with 3D / RPhi and
+	     RhoZ views of clusters and reconstructed tracks." 
+src="http://mtadel.home.cern.ch/mtadel/root/graf3d_eve_alice_vsd_800.png">
+</a>
+<div>Screenshot of <tt>alice_vsd.C</tt> tutorial also showing the
+  functionality of  the <tt>MultiView</tt> class. New title is also
+  visible in the GUI editor.</div>
+</div>
+
 <h4>Minor changes</h4>
 
 <ul>
@@ -182,9 +210,9 @@ previous implementation caused problems with 2D and 1D objects.
 
 <li> Several improvements in camera configuration and handling.
 
-<li> Improve mouse-button handling - now, after a button goes down,
-other buttons do not interfere with user interaction until the first
-button is released.
+<li> Improve mouse-button handling. After a button goes down, other
+buttons do not interfere with user interaction until the first button
+is released.
 
 <li> When initializing TGLClipPlane for the first time, place it in
 the center of the scene's bounding-box. Before that, plane was always
diff --git a/graf3d/eve/src/TEveCaloLegoGL.cxx b/graf3d/eve/src/TEveCaloLegoGL.cxx
index 51a0388201f..f5ec7cc796d 100644
--- a/graf3d/eve/src/TEveCaloLegoGL.cxx
+++ b/graf3d/eve/src/TEveCaloLegoGL.cxx
@@ -1316,8 +1316,9 @@ void TEveCaloLegoGL::DirectDraw(TGLRnrCtx & rnrCtx) const
    glPopAttrib();
 
    // draw histogram base
-   glPushAttrib(GL_ENABLE_BIT | GL_LINE_BIT | GL_POLYGON_BIT);
-   if (rnrCtx.Selection() == kFALSE) {
+   if (rnrCtx.Selection() == kFALSE && rnrCtx.IsDrawPassFilled())
+   {
+      glPushAttrib(GL_ENABLE_BIT | GL_LINE_BIT | GL_POLYGON_BIT);
       glDisable(GL_LIGHTING);
       DrawHistBase(rnrCtx);
       if (fM->fDrawHPlane) {
@@ -1333,10 +1334,10 @@ void TEveCaloLegoGL::DirectDraw(TGLRnrCtx & rnrCtx) const
          glVertex3f(fM->fEtaMin, fM->GetPhiMax(), zhp);
          glEnd();
       }
+      glPopAttrib();
    }
-   glPopAttrib();
-   glPopMatrix();
 
+   glPopMatrix();
 }
 
 //______________________________________________________________________________
diff --git a/graf3d/gl/src/TGLFormat.cxx b/graf3d/gl/src/TGLFormat.cxx
index 8d98d822602..62b0c02c444 100644
--- a/graf3d/gl/src/TGLFormat.cxx
+++ b/graf3d/gl/src/TGLFormat.cxx
@@ -22,6 +22,7 @@ ClassImp(TGLFormat)
 //______________________________________________________________________________
 TGLFormat::TGLFormat() :
    fDoubleBuffered(kTRUE),
+   fStereo(kFALSE),
 #ifdef WIN32
    fDepthSize(32),
 #else
@@ -39,6 +40,7 @@ TGLFormat::TGLFormat() :
 //______________________________________________________________________________
 TGLFormat::TGLFormat(EFormatOptions opt) :
    fDoubleBuffered(opt & kDoubleBuffer),
+   fStereo(kFALSE),
 #ifdef WIN32
    fDepthSize(opt & kDepth ? 32 : 0),
 #else
-- 
GitLab