Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
R
Root
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Admin message
为了安全,强烈建议开启2FA双因子认证:User Settings -> Account -> Enable two-factor authentication!!!
Show more breadcrumbs
cxwx
Root
Commits
7e26c9b5
Commit
7e26c9b5
authored
6 years ago
by
Sergey Linev
Committed by
Axel Naumann
6 years ago
Browse files
Options
Downloads
Patches
Plain Diff
v7canv: provide canvas title to client
parent
54987345
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
graf2d/gpadv7/v7/inc/ROOT/RPadDisplayItem.hxx
+7
-3
7 additions, 3 deletions
graf2d/gpadv7/v7/inc/ROOT/RPadDisplayItem.hxx
gui/canvaspainter/v7/src/TCanvasPainter.cxx
+1
-0
1 addition, 0 deletions
gui/canvaspainter/v7/src/TCanvasPainter.cxx
with
8 additions
and
3 deletions
graf2d/gpadv7/v7/inc/ROOT/RPadDisplayItem.hxx
+
7
−
3
View file @
7e26c9b5
...
@@ -15,6 +15,7 @@
...
@@ -15,6 +15,7 @@
#ifndef ROOT7_RPadDisplayItem
#ifndef ROOT7_RPadDisplayItem
#define ROOT7_RPadDisplayItem
#define ROOT7_RPadDisplayItem
#include
<ROOT/RDisplayItem.hxx>
#include
<ROOT/RDisplayItem.hxx>
#include
<ROOT/RFrame.hxx>
#include
<ROOT/RFrame.hxx>
#include
<ROOT/RPad.hxx>
#include
<ROOT/RPad.hxx>
...
@@ -33,16 +34,18 @@ public:
...
@@ -33,16 +34,18 @@ public:
protected:
protected:
const
RFrame
*
fFrame
{
nullptr
};
///< temporary pointer on frame object
const
RFrame
*
fFrame
{
nullptr
};
///< temporary pointer on frame object
const
RPadDrawingOpts
*
fDrawOpts
{
nullptr
};
///< temporary pointer on pad drawing options
const
RPadDrawingOpts
*
fDrawOpts
{
nullptr
};
///< temporary pointer on pad drawing options
const
RPadExtent
*
fSize
{
nullptr
};
///< temporary pointer on pad size attributes
const
RPadExtent
*
fSize
{
nullptr
};
///< temporary pointer on pad size attributes
PadPrimitives_t
fPrimitives
;
///< display items for all primitives in the pad
std
::
string
fTitle
;
///< title of the pad
PadPrimitives_t
fPrimitives
;
///< display items for all primitives in the pad
public
:
public
:
RPadDisplayItem
()
=
default
;
RPadDisplayItem
()
=
default
;
virtual
~
RPadDisplayItem
()
{}
virtual
~
RPadDisplayItem
()
{}
void
SetFrame
(
const
RFrame
*
f
)
{
fFrame
=
f
;
}
void
SetFrame
(
const
RFrame
*
f
)
{
fFrame
=
f
;
}
void
SetDrawOpts
(
const
RPadDrawingOpts
*
opts
)
{
fDrawOpts
=
opts
;
}
void
SetDrawOpts
(
const
RPadDrawingOpts
*
opts
)
{
fDrawOpts
=
opts
;
}
void
SetSize
(
const
RPadExtent
*
sz
)
{
fSize
=
sz
;
}
void
SetSize
(
const
RPadExtent
*
sz
)
{
fSize
=
sz
;
}
void
SetTitle
(
const
std
::
string
&
title
)
{
fTitle
=
title
;
}
PadPrimitives_t
&
GetPrimitives
()
{
return
fPrimitives
;
}
PadPrimitives_t
&
GetPrimitives
()
{
return
fPrimitives
;
}
void
Add
(
std
::
unique_ptr
<
RDisplayItem
>
&&
item
)
{
fPrimitives
.
push_back
(
std
::
move
(
item
));
}
void
Add
(
std
::
unique_ptr
<
RDisplayItem
>
&&
item
)
{
fPrimitives
.
push_back
(
std
::
move
(
item
));
}
void
Clear
()
void
Clear
()
...
@@ -51,6 +54,7 @@ public:
...
@@ -51,6 +54,7 @@ public:
fFrame
=
nullptr
;
fFrame
=
nullptr
;
fDrawOpts
=
nullptr
;
fDrawOpts
=
nullptr
;
fSize
=
nullptr
;
fSize
=
nullptr
;
fTitle
.
clear
();
}
}
};
};
...
...
This diff is collapsed.
Click to expand it.
gui/canvaspainter/v7/src/TCanvasPainter.cxx
+
1
−
0
View file @
7e26c9b5
...
@@ -617,6 +617,7 @@ std::string ROOT::Experimental::TCanvasPainter::CreateSnapshot(const ROOT::Exper
...
@@ -617,6 +617,7 @@ std::string ROOT::Experimental::TCanvasPainter::CreateSnapshot(const ROOT::Exper
PaintDrawables
(
can
);
PaintDrawables
(
can
);
fPadDisplayItem
->
SetObjectID
(
"canvas"
);
// for canvas itself use special id
fPadDisplayItem
->
SetObjectID
(
"canvas"
);
// for canvas itself use special id
fPadDisplayItem
->
SetTitle
(
can
.
GetTitle
());
TString
res
=
TBufferJSON
::
ToJSON
(
fPadDisplayItem
.
get
(),
23
);
TString
res
=
TBufferJSON
::
ToJSON
(
fPadDisplayItem
.
get
(),
23
);
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment