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
f480eca6
Commit
f480eca6
authored
Jul 12, 2013
by
Anatoly Baksheev
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
removed Affine3f from coordinate frame constructor
parent
328f0e32
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
18 deletions
+4
-18
widgets.hpp
modules/viz/include/opencv2/viz/widgets.hpp
+2
-2
simple_widgets.cpp
modules/viz/src/simple_widgets.cpp
+1
-15
viz_main.cpp
modules/viz/src/viz_main.cpp
+1
-1
No files found.
modules/viz/include/opencv2/viz/widgets.hpp
View file @
f480eca6
...
...
@@ -103,13 +103,13 @@ namespace temp_viz
class
CV_EXPORTS
CoordinateSystemWidget
:
public
Widget3D
{
public
:
CoordinateSystemWidget
(
double
scale
,
const
Affine3f
&
affine
);
CoordinateSystemWidget
(
double
scale
=
1.0
);
};
class
CV_EXPORTS
PolyLineWidget
:
public
Widget3D
{
public
:
PolyLineWidget
(
InputArray
_
points
,
const
Color
&
color
=
Color
::
white
());
PolyLineWidget
(
InputArray
points
,
const
Color
&
color
=
Color
::
white
());
private
:
struct
CopyImpl
;
...
...
modules/viz/src/simple_widgets.cpp
View file @
f480eca6
...
...
@@ -283,7 +283,7 @@ template<> temp_viz::CubeWidget temp_viz::Widget::cast<temp_viz::CubeWidget>()
///////////////////////////////////////////////////////////////////////////////////////////////
/// coordinate system widget implementation
temp_viz
::
CoordinateSystemWidget
::
CoordinateSystemWidget
(
double
scale
,
const
Affine3f
&
affine
)
temp_viz
::
CoordinateSystemWidget
::
CoordinateSystemWidget
(
double
scale
)
{
vtkSmartPointer
<
vtkAxes
>
axes
=
vtkSmartPointer
<
vtkAxes
>::
New
();
axes
->
SetOrigin
(
0
,
0
,
0
);
...
...
@@ -313,20 +313,6 @@ temp_viz::CoordinateSystemWidget::CoordinateSystemWidget(double scale, const Aff
vtkSmartPointer
<
vtkLODActor
>
actor
=
vtkSmartPointer
<
vtkLODActor
>::
New
();
actor
->
SetMapper
(
mapper
);
cv
::
Vec3d
t
=
affine
.
translation
();
actor
->
SetPosition
(
t
[
0
],
t
[
1
],
t
[
2
]);
cv
::
Matx33f
m
=
affine
.
rotation
();
cv
::
Vec3f
rvec
;
cv
::
Rodrigues
(
m
,
rvec
);
float
r_angle
=
cv
::
norm
(
rvec
);
rvec
*=
1.
f
/
r_angle
;
actor
->
SetOrientation
(
0
,
0
,
0
);
actor
->
RotateWXYZ
(
r_angle
*
180
/
CV_PI
,
rvec
[
0
],
rvec
[
1
],
rvec
[
2
]);
WidgetAccessor
::
setProp
(
*
this
,
actor
);
}
...
...
modules/viz/src/viz_main.cpp
View file @
f480eca6
...
...
@@ -7,7 +7,7 @@
#ifndef __APPLE__
vtkRenderWindowInteractor
*
vtkRenderWindowInteractorFixNew
()
{
return
(
vtkRenderWindowInteractor
::
New
()
);
return
vtkRenderWindowInteractor
::
New
(
);
}
#endif
...
...
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