Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
O
opencv
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
opencv
Commits
2d63f60d
Commit
2d63f60d
authored
Nov 30, 2013
by
Anatoly Baksheev
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
minor changes, opencv cross-branch code
parent
15fd3faa
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
19 additions
and
43 deletions
+19
-43
viz3d.hpp
modules/viz/include/opencv2/viz/viz3d.hpp
+1
-0
widgets.hpp
modules/viz/include/opencv2/viz/widgets.hpp
+1
-1
cloud_widgets.cpp
modules/viz/src/cloud_widgets.cpp
+6
-6
interactor_style.cpp
modules/viz/src/interactor_style.cpp
+11
-36
No files found.
modules/viz/include/opencv2/viz/viz3d.hpp
View file @
2d63f60d
...
...
@@ -64,6 +64,7 @@ namespace cv
class
CV_EXPORTS
Viz3d
{
public
:
typedef
cv
::
viz
::
Color
Color
;
typedef
void
(
*
KeyboardCallback
)(
const
KeyboardEvent
&
,
void
*
);
typedef
void
(
*
MouseCallback
)(
const
MouseEvent
&
,
void
*
);
...
...
modules/viz/include/opencv2/viz/widgets.hpp
View file @
2d63f60d
...
...
@@ -219,7 +219,7 @@ namespace cv
class
CV_EXPORTS
WText
:
public
Widget2D
{
public
:
WText
(
const
String
&
text
,
const
Point2i
&
pos
,
int
font_size
=
1
0
,
const
Color
&
color
=
Color
::
white
());
WText
(
const
String
&
text
,
const
Point2i
&
pos
,
int
font_size
=
2
0
,
const
Color
&
color
=
Color
::
white
());
void
setText
(
const
String
&
text
);
String
getText
()
const
;
...
...
modules/viz/src/cloud_widgets.cpp
View file @
2d63f60d
...
...
@@ -124,7 +124,7 @@ struct cv::viz::WCloud::CreateCloudWidget
cells
->
SetNumberOfTuples
(
nr_points
);
vtkIdType
*
cell
=
cells
->
GetPointer
(
0
);
// Fill it with 1s
std
::
fill
_n
(
cell
,
nr_points
*
2
,
1
);
std
::
fill
(
cell
,
cell
+
nr_points
*
2
,
1
);
cell
++
;
for
(
vtkIdType
i
=
0
;
i
<
nr_points
;
++
i
,
cell
+=
2
)
*
cell
=
i
;
...
...
@@ -155,8 +155,8 @@ cv::viz::WCloud::WCloud(InputArray _cloud, InputArray _colors)
if
(
cloud
.
isContinuous
()
&&
colors
.
isContinuous
())
{
cloud
.
reshape
(
cloud
.
channels
(),
1
);
colors
.
reshape
(
colors
.
channels
(),
1
);
cloud
=
cloud
.
reshape
(
cloud
.
channels
(),
1
);
colors
=
colors
.
reshape
(
colors
.
channels
(),
1
);
}
vtkIdType
nr_points
;
...
...
@@ -307,7 +307,7 @@ struct cv::viz::WCloudCollection::CreateCloudWidget
cells
->
SetNumberOfTuples
(
nr_points
);
vtkIdType
*
cell
=
cells
->
GetPointer
(
0
);
// Fill it with 1s
std
::
fill
_n
(
cell
,
nr_points
*
2
,
1
);
std
::
fill
(
cell
,
cell
+
nr_points
*
2
,
1
);
cell
++
;
for
(
vtkIdType
i
=
0
;
i
<
nr_points
;
++
i
,
cell
+=
2
)
*
cell
=
i
;
...
...
@@ -392,8 +392,8 @@ void cv::viz::WCloudCollection::addCloud(InputArray _cloud, InputArray _colors,
if
(
cloud
.
isContinuous
()
&&
colors
.
isContinuous
())
{
cloud
.
reshape
(
cloud
.
channels
(),
1
);
colors
.
reshape
(
colors
.
channels
(),
1
);
cloud
=
cloud
.
reshape
(
cloud
.
channels
(),
1
);
colors
=
colors
.
reshape
(
colors
.
channels
(),
1
);
}
vtkIdType
nr_points
;
...
...
modules/viz/src/interactor_style.cpp
View file @
2d63f60d
...
...
@@ -236,7 +236,7 @@ cv::viz::InteractorStyle::OnKeyDown()
"
\n
"
" j, J : take a .PNG snapshot of the current window view
\n
"
" c, C : display current camera/window parameters
\n
"
" f, F : fly to point mode
\n
"
" f, F : fly to point mode
, hold the key and move mouse where to fly
\n
"
"
\n
"
" e, E : exit the interactor
\n
"
" q, Q : stop and call VTK's TerminateApp
\n
"
...
...
@@ -271,28 +271,8 @@ cv::viz::InteractorStyle::OnKeyDown()
{
unsigned
int
t
=
static_cast
<
unsigned
int
>
(
time
(
0
));
String
png_file
=
cv
::
format
(
"screenshot-%d.png"
,
t
);
String
cam_file
=
cv
::
format
(
"screenshot-%d.cam"
,
t
);
vtkSmartPointer
<
vtkCamera
>
cam
=
Interactor
->
GetRenderWindow
()
->
GetRenderers
()
->
GetFirstRenderer
()
->
GetActiveCamera
();
Vec2d
clip
;
Vec3d
focal
,
pos
,
view
;
cam
->
GetClippingRange
(
clip
.
val
);
cam
->
GetFocalPoint
(
focal
.
val
);
cam
->
GetPosition
(
pos
.
val
);
cam
->
GetViewUp
(
view
.
val
);
Vec2i
win_pos
(
Interactor
->
GetRenderWindow
()
->
GetPosition
());
Vec2i
win_size
(
Interactor
->
GetRenderWindow
()
->
GetSize
());
double
angle
=
cam
->
GetViewAngle
()
/
180.0
*
CV_PI
;
String
data
=
cv
::
format
(
"%f,%f/%f,%f,%f/%f,%f,%f/%f,%f,%f/%f/%d,%d/%d,%d"
,
clip
[
0
],
clip
[
1
],
focal
[
0
],
focal
[
1
],
focal
[
2
],
pos
[
0
],
pos
[
1
],
pos
[
2
],
view
[
0
],
view
[
1
],
view
[
2
],
angle
,
win_size
[
0
],
win_size
[
1
],
win_pos
[
0
],
win_pos
[
1
]);
saveScreenshot
(
png_file
);
ofstream
ofs_cam
(
cam_file
.
c_str
());
ofs_cam
<<
data
.
c_str
()
<<
endl
;
ofs_cam
.
close
();
cout
<<
"Screenshot ("
<<
png_file
.
c_str
()
<<
") and camera information ("
<<
cam_file
.
c_str
()
<<
") successfully captured."
<<
endl
;
cout
<<
"Screenshot ("
<<
png_file
.
c_str
()
<<
") successfully captured."
<<
endl
;
break
;
}
// display current camera settings/parameters
...
...
@@ -301,26 +281,21 @@ cv::viz::InteractorStyle::OnKeyDown()
vtkSmartPointer
<
vtkCamera
>
cam
=
Interactor
->
GetRenderWindow
()
->
GetRenderers
()
->
GetFirstRenderer
()
->
GetActiveCamera
();
Vec2d
clip
;
Vec3d
focal
,
pos
e
,
view
;
Vec3d
focal
,
pos
,
view
;
cam
->
GetClippingRange
(
clip
.
val
);
cam
->
GetFocalPoint
(
focal
.
val
);
cam
->
GetPosition
(
pos
e
.
val
);
cam
->
GetPosition
(
pos
.
val
);
cam
->
GetViewUp
(
view
.
val
);
Vec2i
win_pos
(
Interactor
->
GetRenderWindow
()
->
GetPosition
());
Vec2i
win_size
(
Interactor
->
GetRenderWindow
()
->
GetSize
());
double
angle
=
cam
->
GetViewAngle
()
/
180.0
*
CV_PI
;
String
data
=
cv
::
format
(
"clip(%f,%f) focal(%f,%f,%f) pos(%f,%f,%f) view(%f,%f,%f) angle(%f) winsz(%d,%d) winpos(%d,%d)"
,
clip
[
0
],
clip
[
1
],
focal
[
0
],
focal
[
1
],
focal
[
2
],
pos
[
0
],
pos
[
1
],
pos
[
2
],
view
[
0
],
view
[
1
],
view
[
2
],
angle
,
win_size
[
0
],
win_size
[
1
],
win_pos
[
0
],
win_pos
[
1
]);
std
::
cout
<<
data
.
c_str
()
<<
std
::
endl
;
cv
::
print
(
Mat
(
clip
,
false
).
reshape
(
1
,
1
));
std
::
cout
<<
"/"
;
cv
::
print
(
Mat
(
focal
,
false
).
reshape
(
1
,
1
));
std
::
cout
<<
"/"
;
cv
::
print
(
Mat
(
pose
,
false
).
reshape
(
1
,
1
));
std
::
cout
<<
"/"
;
cv
::
print
(
Mat
(
view
,
false
).
reshape
(
1
,
1
));
std
::
cout
<<
"/"
<<
cam
->
GetViewAngle
()
/
180.0
*
CV_PI
;
cv
::
print
(
Mat
(
win_size
,
false
).
reshape
(
1
,
1
));
std
::
cout
<<
"/"
;
cv
::
print
(
Mat
(
win_pos
,
false
).
reshape
(
1
,
1
));
std
::
cout
<<
std
::
endl
;
break
;
}
case
'='
:
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment