Skip to content

[graf2d] Change TCanvas arguments to canvas size #21156

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

Closed
rlalik wants to merge 1 commit into from
Closed

[graf2d] Change TCanvas arguments to canvas size #21156

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 7 additions & 7 deletions graf2d/gpad/inc/TCanvas.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,18 +99,18 @@ friend class TInterpreter;

TCanvas(Bool_t build=kTRUE);
TCanvas(const char *name, const char *title="", Int_t form=1);
TCanvas(const char *name, const char *title, Int_t ww, Int_t wh);
TCanvas(const char *name, const char *title, Int_t cw, Int_t ch);
TCanvas(const char *name, const char *title, Int_t wtopx, Int_t wtopy,
Int_t ww, Int_t wh);
TCanvas(const char *name, Int_t ww, Int_t wh, Int_t winid);
Int_t cw, Int_t ch);
TCanvas(const char *name, Int_t cw, Int_t ch, Int_t winid);
~TCanvas() override;

//-- used by friend TThread class
void Constructor();
void Constructor(const char *name, const char *title, Int_t form);
void Constructor(const char *name, const char *title, Int_t ww, Int_t wh);
void Constructor(const char *name, const char *title, Int_t cw, Int_t ch);
void Constructor(const char *name, const char *title,
Int_t wtopx, Int_t wtopy, Int_t ww, Int_t wh);
Int_t wtopx, Int_t wtopy, Int_t cw, Int_t ch);
void Destructor();

TVirtualPad *cd(Int_t subpadnumber=0) override;
Expand All @@ -123,7 +123,7 @@ friend class TInterpreter;
TObject *DrawClone(Option_t *option="") const override; // *MENU*
virtual TObject *DrawClonePad(); // *MENU*
virtual void EditorBar();
void EmbedInto(Int_t winid, Int_t ww, Int_t wh);
void EmbedInto(Int_t winid, Int_t cw, Int_t ch);
void EnterLeave(TPad *prevSelPad, TObject *prevSelObj);
void FeedbackMode(Bool_t set);
void Flush();
Expand Down Expand Up @@ -203,7 +203,7 @@ friend class TInterpreter;
void SetWindowPosition(Int_t x, Int_t y);
void SetWindowSize(UInt_t ww, UInt_t wh);
void SetCanvasImp(TCanvasImp *i);
void SetCanvasSize(UInt_t ww, UInt_t wh) override; // *MENU*
void SetCanvasSize(UInt_t cw, UInt_t ch) override; // *MENU*
void SetHighLightColor(Color_t col) { fHighLightColor = col; }
void SetSelected(TObject *obj) override;
void SetClickSelected(TObject *obj) { fClickSelected = obj; }
Expand Down
164 changes: 83 additions & 81 deletions graf2d/gpad/src/TCanvas.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,32 +110,41 @@ of the canvas. It gives a short explanation about the canvas' menus.

A canvas may be automatically divided into pads via `TPad::Divide`.

\since **ROOT version 6.40/00:**
The constructor defines the size of the canvas, not the size of the canvas window.

At creation time, no matter if in interactive or batch mode, the constructor
defines the size of the canvas window (including the size of the window
manager's decoration). To define precisely the graphics area size of a canvas in
the interactive mode, the following four lines of code should be used:
~~~ {.cpp}
{
Double_t w = 600;
Double_t h = 600;
auto c = new TCanvas("c", "c", w, h);
c->SetWindowSize(w + (w - c->GetWw()), h + (h - c->GetWh()));
}
~~~
and in the batch mode simply do:
defines the size of the canvas (window size is calculated including the size of the
window manager's decoration).

To resize the canvas in both interactive and batch mode, use:
~~~ {.cpp}
c->SetCanvasSize(w,h);
c->SetCanvasSize(w,h);
~~~

If the canvas size exceeds the window size, scroll bars will be added to the canvas
This allows to display very large canvases (even bigger than the screen size). The
Following example shows how to proceed.
~~~ {.cpp}
{
auto c = new TCanvas("c","c");
c->SetCanvasSize(1500, 1500);
c->SetWindowSize(500, 500);
}
{
auto c = new TCanvas("c","c");
c->SetCanvasSize(1500, 1500);
c->SetWindowSize(500, 500);
}
~~~

To resize the window together with the canvas in the interactive mode, the following
lines of code could be used:
~~~ {.cpp}
{
Double_t w = 600;
Double_t h = 600;
auto c = new TCanvas("c", "c", w, h);

Double_t new_w = 800;
Double_t new_h = 800;
c->SetWindowSize(new_w + (c->GetWindowWidth() - c->GetWw()), new_h + (c->GetWindowHeight() - c->GetWh()));
}
~~~
*/

Expand Down Expand Up @@ -218,7 +227,7 @@ void TCanvas::Constructor()
///
/// If "name" starts with "gl" the canvas is ready to receive GL output.

TCanvas::TCanvas(const char *name, Int_t ww, Int_t wh, Int_t winid) : TPad(), fDoubleBuffer(0)
TCanvas::TCanvas(const char *name, Int_t cw, Int_t ch, Int_t winid) : TPad(), fDoubleBuffer(0)
{
fCanvasImp = nullptr;
fPainter = nullptr;
Expand All @@ -227,10 +236,10 @@ TCanvas::TCanvas(const char *name, Int_t ww, Int_t wh, Int_t winid) : TPad(), fD
fCanvasID = winid;
fWindowTopX = 0;
fWindowTopY = 0;
fWindowWidth = ww;
fWindowHeight = wh;
fCw = ww + 4;
fCh = wh +28;
fWindowWidth = cw + 4;
fWindowHeight = ch +28;
fCw = cw;
fCh = ch;
fBatch = kFALSE;
fUpdating = kFALSE;

Expand Down Expand Up @@ -361,49 +370,49 @@ void TCanvas::Constructor(const char *name, const char *title, Int_t form)
///
/// \param[in] name canvas name
/// \param[in] title canvas title
/// \param[in] ww is the window size in pixels along X
/// \param[in] cw is the canvas size in pixels along X
/// (if ww < 0 the menubar is not shown)
/// \param[in] wh is the window size in pixels along Y
/// \param[in] ch is the canvas size in pixels along Y
///
/// If "name" starts with "gl" the canvas is ready to receive GL output.

TCanvas::TCanvas(const char *name, const char *title, Int_t ww, Int_t wh) : TPad(), fDoubleBuffer(0)
TCanvas::TCanvas(const char *name, const char *title, Int_t cw, Int_t ch) : TPad(), fDoubleBuffer(0)
{
fPainter = nullptr;
fUseGL = gStyle->GetCanvasPreferGL();

Constructor(name, title, ww, wh);
Constructor(name, title, cw, ch);
}

////////////////////////////////////////////////////////////////////////////////
/// Create a new canvas at a random position.
///
/// \param[in] name canvas name
/// \param[in] title canvas title
/// \param[in] ww is the window size in pixels along X
/// \param[in] cw is the canvas size in pixels along X
/// (if ww < 0 the menubar is not shown)
/// \param[in] wh is the window size in pixels along Y
/// \param[in] ch is the canvas size in pixels along Y

void TCanvas::Constructor(const char *name, const char *title, Int_t ww, Int_t wh)
void TCanvas::Constructor(const char *name, const char *title, Int_t cw, Int_t ch)
{
if (gThreadXAR) {
void *arr[6];
arr[1] = this; arr[2] = (void*)name; arr[3] = (void*)title; arr[4] =&ww; arr[5] = &wh;
arr[1] = this; arr[2] = (void*)name; arr[3] = (void*)title; arr[4] =&cw; arr[5] = &ch;
if ((*gThreadXAR)("CANV", 6, arr, nullptr)) return;
}

Init();
SetBit(kMenuBar,true);
if (ww < 0) {
ww = -ww;
if (cw < 0) {
cw = -cw;
SetBit(kMenuBar,false);
}
if (wh <= 0) {
Error("Constructor", "Invalid canvas height: %d",wh);
if (ch <= 0) {
Error("Constructor", "Invalid canvas height: %d",ch);
return;
}
fCw = ww;
fCh = wh;
fCw = cw;
fCh = ch;
fCanvasID = -1;
TCanvas *old = (TCanvas*)gROOT->GetListOfCanvases()->FindObject(name);
if (old && old->IsOnHeap()) {
Expand All @@ -412,17 +421,18 @@ void TCanvas::Constructor(const char *name, const char *title, Int_t ww, Int_t w
}
if (gROOT->IsBatch()) { //We are in Batch mode
fWindowTopX = fWindowTopY = 0;
fWindowWidth = ww;
fWindowHeight = wh;
fCw = ww;
fCh = wh;
fWindowWidth = cw;
fWindowHeight = ch;
fCw = cw;
fCh = ch;
fCanvasImp = gBatchGuiFactory->CreateCanvasImp(this, name, fCw, fCh);
if (!fCanvasImp) return;
fBatch = kTRUE;
} else {
Float_t cx = gStyle->GetScreenFactor();
auto factory = gROOT->IsWebDisplay() ? gBatchGuiFactory : gGuiFactory;
fCanvasImp = factory->CreateCanvasImp(this, name, UInt_t(cx*ww), UInt_t(cx*wh));
// 2,2+27 is the extra frame (1px each side) + top menu (27 px high)
fCanvasImp = factory->CreateCanvasImp(this, name, UInt_t(cx*(cw+2)), UInt_t(cx*(ch+2+27)));
if (!fCanvasImp) return;

if (!gROOT->IsBatch() && fCanvasID == -1)
Expand All @@ -449,18 +459,18 @@ void TCanvas::Constructor(const char *name, const char *title, Int_t ww, Int_t w
/// \param[in] title canvas title
/// \param[in] wtopx,wtopy are the pixel coordinates of the top left corner of
/// the canvas (if wtopx < 0) the menubar is not shown)
/// \param[in] ww is the window size in pixels along X
/// \param[in] wh is the window size in pixels along Y
/// \param[in] cw is the canvas size in pixels along X
/// \param[in] ch is the canvas size in pixels along Y
///
/// If "name" starts with "gl" the canvas is ready to receive GL output.

TCanvas::TCanvas(const char *name, const char *title, Int_t wtopx, Int_t wtopy, Int_t ww, Int_t wh)
TCanvas::TCanvas(const char *name, const char *title, Int_t wtopx, Int_t wtopy, Int_t cw, Int_t ch)
: TPad(), fDoubleBuffer(0)
{
fPainter = nullptr;
fUseGL = gStyle->GetCanvasPreferGL();

Constructor(name, title, wtopx, wtopy, ww, wh);
Constructor(name, title, wtopx, wtopy, cw, ch);
}

////////////////////////////////////////////////////////////////////////////////
Expand All @@ -470,16 +480,16 @@ TCanvas::TCanvas(const char *name, const char *title, Int_t wtopx, Int_t wtopy,
/// \param[in] title canvas title
/// \param[in] wtopx,wtopy are the pixel coordinates of the top left corner of
/// the canvas (if wtopx < 0) the menubar is not shown)
/// \param[in] ww is the window size in pixels along X
/// \param[in] wh is the window size in pixels along Y
/// \param[in] cw is the canvas size in pixels along X
/// \param[in] ch is the canvas size in pixels along Y

void TCanvas::Constructor(const char *name, const char *title, Int_t wtopx,
Int_t wtopy, Int_t ww, Int_t wh)
Int_t wtopy, Int_t cw, Int_t ch)
{
if (gThreadXAR) {
void *arr[8];
arr[1] = this; arr[2] = (void*)name; arr[3] = (void*)title;
arr[4] = &wtopx; arr[5] = &wtopy; arr[6] = &ww; arr[7] = &wh;
arr[4] = &wtopx; arr[5] = &wtopy; arr[6] = &cw; arr[7] = &ch;
if ((*gThreadXAR)("CANV", 8, arr, nullptr)) return;
}

Expand All @@ -489,8 +499,8 @@ void TCanvas::Constructor(const char *name, const char *title, Int_t wtopx,
wtopx = -wtopx;
SetBit(kMenuBar,false);
}
fCw = ww;
fCh = wh;
fCw = cw;
fCh = ch;
fCanvasID = -1;
TCanvas *old = (TCanvas*)gROOT->GetListOfCanvases()->FindObject(name);
if (old && old->IsOnHeap()) {
Expand All @@ -499,17 +509,18 @@ void TCanvas::Constructor(const char *name, const char *title, Int_t wtopx,
}
if (gROOT->IsBatch()) { //We are in Batch mode
fWindowTopX = fWindowTopY = 0;
fWindowWidth = ww;
fWindowHeight = wh;
fCw = ww;
fCh = wh;
fWindowWidth = cw;
fWindowHeight = ch;
fCw = cw;
fCh = ch;
fCanvasImp = gBatchGuiFactory->CreateCanvasImp(this, name, fCw, fCh);
if (!fCanvasImp) return;
fBatch = kTRUE;
} else { //normal mode with a screen window
Float_t cx = gStyle->GetScreenFactor();
auto factory = gROOT->IsWebDisplay() ? gBatchGuiFactory : gGuiFactory;
fCanvasImp = factory->CreateCanvasImp(this, name, Int_t(cx*wtopx), Int_t(cx*wtopy), UInt_t(cx*ww), UInt_t(cx*wh));
// 2,2+27 is the extra frame (1px each side) + top menu (27 px high)
fCanvasImp = factory->CreateCanvasImp(this, name, Int_t(cx*wtopx), Int_t(cx*wtopy), UInt_t(cx*(cw+2)), UInt_t(cx*(ch+2+27)));
if (!fCanvasImp) return;

if (!gROOT->IsBatch() && fCanvasID == -1)
Expand Down Expand Up @@ -601,8 +612,6 @@ void TCanvas::Build()

if (IsBatch()) {
// Make sure that batch interactive canvas sizes are the same
fCw -= 4;
fCh -= 28;
} else if (IsWeb()) {
// mark canvas as batch - avoid gVirtualX in many places
SetBatch(kTRUE);
Expand Down Expand Up @@ -1043,18 +1052,18 @@ void TCanvas::EditorBar()
/// Embedded a canvas into a TRootEmbeddedCanvas. This method is only called
/// via TRootEmbeddedCanvas::AdoptCanvas.

void TCanvas::EmbedInto(Int_t winid, Int_t ww, Int_t wh)
void TCanvas::EmbedInto(Int_t winid, Int_t cw, Int_t ch)
{
// If fCanvasImp already exists, no need to go further.
if(fCanvasImp) return;

fCanvasID = winid;
fWindowTopX = 0;
fWindowTopY = 0;
fWindowWidth = ww;
fWindowHeight = wh;
fCw = ww;
fCh = wh;
fWindowWidth = cw;
fWindowHeight = ch;
fCw = cw;
fCh = ch;
fBatch = kFALSE;
fUpdating = kFALSE;

Expand Down Expand Up @@ -1851,16 +1860,11 @@ void TCanvas::SaveSource(const char *filename, Option_t * /*option*/)
return;
}
UInt_t editorWidth = fCanvasImp->GetWindowGeometry(topx,topy,w,h);
w = UInt_t((fWindowWidth - editorWidth)/cx);
h = UInt_t((fWindowHeight)/cx);
w = GetWw();
h = GetWh();
topx = GetWindowTopX();
topy = GetWindowTopY();

if (w == 0) {
w = GetWw()+4; h = GetWh()+4;
topx = 1; topy = 1;
}

TString mname = fname;
out << R"CODE(#ifdef __CLING__
#pragma cling optimize(0)
Expand Down Expand Up @@ -1939,21 +1943,19 @@ void TCanvas::SetBatch(Bool_t batch)
}

////////////////////////////////////////////////////////////////////////////////
/// Set Width and Height of canvas to ww and wh respectively. If ww and/or wh
/// Set Width and Height of canvas to cw and ch respectively. If cw and/or ch
/// are greater than the current canvas window a scroll bar is automatically
/// generated. Use this function to zoom in a canvas and navigate via
/// the scroll bars. The Width and Height in this method are different from those
/// given in the TCanvas constructors where these two dimension include the size
/// of the window decoration whereas they do not in this method.
/// When both ww==0 and wh==0, auto resize mode will be enabled again and
/// the scroll bars.
/// When both cw==0 and ch==0, auto resize mode will be enabled again and
/// canvas drawing area will automatically fit available window size

void TCanvas::SetCanvasSize(UInt_t ww, UInt_t wh)
void TCanvas::SetCanvasSize(UInt_t cw, UInt_t ch)
{
if (fCanvasImp) {
fCw = ww;
fCh = wh;
fCanvasImp->SetCanvasSize(ww, wh);
fCw = cw;
fCh = ch;
fCanvasImp->SetCanvasSize(cw, ch);
TContext ctxt(this, kTRUE);
ResizePad();
}
Expand Down Expand Up @@ -2149,7 +2151,7 @@ void TCanvas::SetWindowPosition(Int_t x, Int_t y)
void TCanvas::SetWindowSize(UInt_t ww, UInt_t wh)
{
if (fBatch && !IsWeb())
SetCanvasSize((ww + fCw) / 2, (wh + fCh) / 2);
SetCanvasSize(ww, wh);
else if (fCanvasImp)
fCanvasImp->SetWindowSize(ww, wh);
}
Expand Down