From c4f03896bab75cca98d9edcd189d5edb67d5681a Mon Sep 17 00:00:00 2001 From: mtadel Date: Thu, 16 Nov 2006 20:34:17 +0000 Subject: [PATCH] Main color now set from frame-box (instead of default palette color). --- EVE/Reve/QuadSet.cxx | 15 +++++---------- EVE/Reve/QuadSet.h | 3 ++- 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/EVE/Reve/QuadSet.cxx b/EVE/Reve/QuadSet.cxx index 8cd1e98b5a7..11131e3185d 100644 --- a/EVE/Reve/QuadSet.cxx +++ b/EVE/Reve/QuadSet.cxx @@ -125,10 +125,10 @@ void OldQuadSet::Paint(Option_t* ) for (Int_t q = 0; q < (Int_t)fQuads.size(); ++q) { buffer.fPols[6*q] = fQuads[q].color; buffer.fPols[6*q +1] = 4; - buffer.fPols[6*q +2] = 4*q +0; - buffer.fPols[6*q +3] = 4*q +1; - buffer.fPols[6*q +4] = 4*q +2; - buffer.fPols[6*q +5] = 4*q +3; + buffer.fPols[6*q +2] = 4*q + 0; + buffer.fPols[6*q +3] = 4*q + 1; + buffer.fPols[6*q +4] = 4*q + 2; + buffer.fPols[6*q +5] = 4*q + 3; } buffer.SetSectionsValid(TBuffer3D::kRaw); @@ -299,12 +299,7 @@ void QuadSet::SetPalette(RGBAPalette* p) if (fPalette == p) return; if (fPalette) fPalette->DecRefCount(); fPalette = p; - if (fPalette) { - fPalette->IncRefCount(); - SetMainColorPtr(fPalette->PtrDefaultColor()); - } else { - SetMainColorPtr(0); - } + if (fPalette) fPalette->IncRefCount(); } /**************************************************************************/ diff --git a/EVE/Reve/QuadSet.h b/EVE/Reve/QuadSet.h index f84cf929fce..029d5cc0006 100644 --- a/EVE/Reve/QuadSet.h +++ b/EVE/Reve/QuadSet.h @@ -71,7 +71,7 @@ public: }; /**************************************************************************/ -// To become new implementation of QuadSet ... not finished yet. +// To become new implementation of QuadSet ... somewhat finished. /**************************************************************************/ class QuadSet : public RenderElement, @@ -79,6 +79,7 @@ class QuadSet : public RenderElement, public TAtt3D, public TAttBBox { + friend class QuadSetEditor; friend class QuadSetGL; QuadSet(const QuadSet&); // Not implemented -- 2.39.3