Skip to content

Redesign TASImage::Paint() #23246

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

Open
linev wants to merge 13 commits into
base: master
Choose a base branch
from
+429 −181
Open

Redesign TASImage::Paint() #23246

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
946a8f2
Introduce DrawImage in TVirtualPS and TVirtualPadPainter
linev Sep 3, 2026
0d66960
[imagedump] implement DrawImage method
linev Sep 3, 2026
ac5e9d8
[svg] implement DrawImage
linev Sep 3, 2026
7380244
[asimage] add new methods
linev Sep 3, 2026
49e833c
[pdf] implement draw image
linev Sep 3, 2026
2c361a8
[ps] implement DrawImage
linev Sep 3, 2026
ec2093a
[padpainterps] Implement DrawImage
linev Sep 3, 2026
b16b1ff
[padpainter] implement DrawImage
linev Sep 3, 2026
17574e6
[glpadpainter] implement DrawImage
linev Sep 3, 2026
4cb84a3
[asimage] change Paint() implementation
linev Sep 3, 2026
9a68eb7
Adjust stressGraphics ref file
linev Sep 3, 2026
a064676
[asimage] fix text align in DrawTextTTF
linev Sep 3, 2026
77bd512
[histpainter] use pad painter for image drawing
linev Sep 3, 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
5 changes: 5 additions & 0 deletions core/base/inc/TVirtualPS.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@
#include "TAttText.h"
#include "TAttMarker.h"

class TImage;

class TVirtualPS : public TNamed, public TAttLine, public TAttFill, public TAttMarker, public TAttText {

private:
Expand Down Expand Up @@ -54,6 +56,9 @@ class TVirtualPS : public TNamed, public TAttLine, public TAttFill, public TAttM
virtual void CellArrayFill(Int_t r, Int_t g, Int_t b) = 0;
virtual void CellArrayPng(char * /* buffer */, int /* size */) {}
virtual void CellArrayEnd() = 0;

virtual void DrawImage(TImage * /* img */, Int_t /* x */, Int_t /* y */ , Int_t /* flags */ = 0) {}

virtual void Close(Option_t *opt="") = 0;
virtual void DrawBox(Double_t x1, Double_t y1,Double_t x2, Double_t y2) = 0;
virtual void DrawFrame(Double_t xl, Double_t yl, Double_t xt, Double_t yt,
Expand Down
3 changes: 3 additions & 0 deletions core/base/inc/TVirtualPadPainter.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@

class TVirtualPad;
class TVirtualPS;
class TImage;
class TAttFill;
class TAttLine;
class TAttMarker;
Expand Down Expand Up @@ -151,6 +152,8 @@ class TVirtualPadPainter {

virtual void DrawTextUrl(Double_t x, Double_t y, const char *text, const char *url);

virtual void DrawImage(TImage *img, Int_t x, Int_t y, Int_t flags = 0);

//gif, jpg, png, bmp output.
virtual void SaveImage(TVirtualPad *pad, const char *fileName, Int_t type) const = 0;

Expand Down
7 changes: 7 additions & 0 deletions core/base/src/TVirtualPadPainter.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,3 +212,10 @@ void TVirtualPadPainter::SetCursor(Int_t device, ECursor cursor)
gVirtualX->SetCursor(device, cursor);
}


////////////////////////////////////////////////////////////////////////////////
/// Draw image, need to be implemented in correspondent

void TVirtualPadPainter::DrawImage(TImage *, Int_t, Int_t, Int_t)
{
}
3 changes: 3 additions & 0 deletions graf2d/asimage/inc/TASImage.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,6 +206,9 @@ class TASImage : public TImage {
void SetPaletteEnabled(Bool_t on = kTRUE) override; // *TOGGLE*
void SavePrimitive(std::ostream &out, Option_t *option = "") override;

std::vector<unsigned char> GetMaskBits(UInt_t &w, UInt_t &h) override;
void DrawX11(Drawable_t wid, void *gc, Int_t x, Int_t y) override;

static const ASVisual *GetVisual();
static UInt_t AlphaBlend(UInt_t bot, UInt_t top);
static void Image2Drawable(ASImage *im, Drawable_t wid, Int_t x, Int_t y, Int_t xsrc = 0, Int_t ysrc = 0, UInt_t wsrc = 0, UInt_t hsrc = 0, Option_t *opt = "");
Expand Down
Loading
Loading