Skip to content

Provide utility to create shape for provided marker #22977

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
linev wants to merge 4 commits into
base: master
Choose a base branch
from
+535 −594
Draft

Provide utility to create shape for provided marker #22977

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8101e9e
Use existing marker types in TAttMarker sources
linev Jul 31, 2026
9fd07b4
Implement TAttMarker::GetMarkerShape()
linev Jul 31, 2026
be7b1ba
[roottest] adjust MemberComments.ref file
linev Aug 3, 2026
aac7933
[tgx11] use GetMarkerShape in X11
linev Jul 31, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
86 changes: 56 additions & 30 deletions core/base/inc/TAttMarker.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// Author: Rene Brun 12/05/95

/*************************************************************************
* Copyright (C) 1995-2000, Rene Brun and Fons Rademakers. *
* Copyright (C) 1995-2026, Rene Brun and Fons Rademakers. *
* All rights reserved. *
* *
* For the licensing terms see $ROOTSYS/LICENSE. *
Expand All @@ -12,11 +12,12 @@
#ifndef ROOT_TAttMarker
#define ROOT_TAttMarker


#include "Rtypes.h"
#include <vector>

class TColorNumber;
class TVirtualPad;
class TPoint;

class TAttMarker {

Expand All @@ -30,45 +31,70 @@ class TAttMarker {
TAttMarker(Color_t color, Style_t style, Size_t msize);
virtual ~TAttMarker();
void Copy(TAttMarker &attmarker) const;
virtual Color_t GetMarkerColor() const {return fMarkerColor;} ///< Return the marker color
virtual Style_t GetMarkerStyle() const {return fMarkerStyle;} ///< Return the marker style
virtual Size_t GetMarkerSize() const {return fMarkerSize;} ///< Return the marker size
virtual Color_t GetMarkerColor() const { return fMarkerColor; } ///< Return the marker color
virtual Style_t GetMarkerStyle() const { return fMarkerStyle; } ///< Return the marker style
virtual Size_t GetMarkerSize() const { return fMarkerSize; } ///< Return the marker size
virtual void Modify();
virtual void ModifyOn(TVirtualPad &pad);
virtual void ResetAttMarker(Option_t *toption="");
virtual void SaveMarkerAttributes(std::ostream &out, const char *name, Int_t coldef=1, Int_t stydef=1, Int_t sizdef=1);
virtual void SaveMarkerAttributes(std::ostream &out, const char *name, Int_t coldef = 1, Int_t stydef = 1, Int_t sizdef = 1);
virtual void SetMarkerAttributes(); // *MENU*
virtual void SetMarkerColor(Color_t mcolor=1) { fMarkerColor = mcolor;} ///< Set the marker color
virtual void SetMarkerColor(Color_t mcolor = 1);
void SetMarkerColor(TColorNumber lcolor);
virtual void SetMarkerColorAlpha(Color_t mcolor, Float_t malpha);
virtual void SetMarkerStyle(Style_t mstyle=1) { fMarkerStyle = mstyle;} ///< Set the marker style
/// Set the marker size.
/// Note that the marker styles number 1 6 and 7 (the dots), cannot be scaled.
/// They are meant to be very fast to draw and are always drawn with the same number of pixels;
/// therefore this method does not apply on them.
virtual void SetMarkerSize(Size_t msize=1) { fMarkerSize = msize;}
virtual void SetMarkerStyle(Style_t mstyle = 1);
virtual void SetMarkerSize(Size_t msize = 1);

enum EMarkerShape { kShapeDot, kShapeCircle, kShapeFilledCircle, kShapePolyLine, kShapeFilledArea, kShapeSegments };

static Style_t GetMarkerStyleBase(Style_t style);
static Width_t GetMarkerLineWidth(Style_t style);
EMarkerShape GetMarkerShape(Int_t &sz, std::vector<TPoint> &points) const;

void SetMarkerColor(TColorNumber lcolor);
static Style_t GetMarkerStyleBase(Style_t style);
static Width_t GetMarkerLineWidth(Style_t style);

ClassDef(TAttMarker,3); //Marker attributes
};

enum EMarkerStyle {kDot=1, kPlus, kStar, kCircle=4, kMultiply=5,
kFullDotSmall=6, kFullDotMedium=7, kFullDotLarge=8,
kFullCircle=20, kFullSquare=21, kFullTriangleUp=22,
kFullTriangleDown=23, kOpenCircle=24, kOpenSquare=25,
kOpenTriangleUp=26, kOpenDiamond=27, kOpenCross=28,
kFullStar=29, kOpenStar=30, kOpenTriangleDown=32,
kFullDiamond=33, kFullCross=34, kOpenDiamondCross=35,
kOpenSquareDiagonal=36, kOpenThreeTriangles=37,
kOctagonCross=38, kFullThreeTriangles=39,
kOpenFourTrianglesX=40, kFullFourTrianglesX=41,
kOpenDoubleDiamond=42, kFullDoubleDiamond=43,
kOpenFourTrianglesPlus=44, kFullFourTrianglesPlus=45,
kOpenCrossX=46, kFullCrossX=47, kFourSquaresX=48,
kFourSquaresPlus=49 };
enum EMarkerStyle {
kDot = 1,
kPlus = 2,
kStar = 3,
kCircle = 4,
kMultiply = 5,
kFullDotSmall = 6,
kFullDotMedium = 7,
kFullDotLarge = 8,
kFullCircle = 20,
kFullSquare = 21,
kFullTriangleUp = 22,
kFullTriangleDown = 23,
kOpenCircle = 24,
kOpenSquare = 25,
kOpenTriangleUp = 26,
kOpenDiamond = 27,
kOpenCross = 28,
kFullStar = 29,
kOpenStar = 30,
kStar2 = 31,
kOpenTriangleDown = 32,
kFullDiamond = 33,
kFullCross = 34,
kOpenDiamondCross = 35,
kOpenSquareDiagonal = 36,
kOpenThreeTriangles = 37,
kOctagonCross = 38,
kFullThreeTriangles = 39,
kOpenFourTrianglesX = 40,
kFullFourTrianglesX = 41,
kOpenDoubleDiamond = 42,
kFullDoubleDiamond = 43,
kOpenFourTrianglesPlus = 44,
kFullFourTrianglesPlus = 45,
kOpenCrossX = 46,
kFullCrossX = 47,
kFourSquaresX = 48,
kFourSquaresPlus = 49
};

#endif

Loading
Loading