Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
O
opencv_contrib
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_contrib
Commits
ceaad7fa
Commit
ceaad7fa
authored
Mar 29, 2018
by
Maksim Shabunin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed several warnings produced by clang
parent
5d9fc41b
Hide whitespace changes
Inline
Side-by-side
Showing
17 changed files
with
41 additions
and
49 deletions
+41
-49
view_controller.cpp
modules/cvv/src/controller/view_controller.cpp
+3
-3
changed_pixels_widget.cpp
modules/cvv/src/qtutil/filter/changed_pixels_widget.cpp
+1
-1
keypointmanagement.cpp
modules/cvv/src/qtutil/matchview/keypointmanagement.cpp
+2
-2
matchmanagement.cpp
modules/cvv/src/qtutil/matchview/matchmanagement.cpp
+2
-2
matchscene.hpp
modules/cvv/src/qtutil/matchview/matchscene.hpp
+1
-1
util.cpp
modules/cvv/src/qtutil/util.cpp
+1
-1
zoomableimage.cpp
modules/cvv/src/qtutil/zoomableimage.cpp
+1
-1
defaultfilterview.cpp
modules/cvv/src/view/defaultfilterview.cpp
+2
-3
dual_filter_view.cpp
modules/cvv/src/view/dual_filter_view.cpp
+2
-3
image_view.cpp
modules/cvv/src/view/image_view.cpp
+2
-3
linematchview.cpp
modules/cvv/src/view/linematchview.cpp
+6
-9
linematchview.hpp
modules/cvv/src/view/linematchview.hpp
+3
-3
pointmatchview.cpp
modules/cvv/src/view/pointmatchview.cpp
+3
-3
pointmatchview.hpp
modules/cvv/src/view/pointmatchview.hpp
+1
-1
singlefilterview.cpp
modules/cvv/src/view/singlefilterview.cpp
+3
-5
translationsmatchview.cpp
modules/cvv/src/view/translationsmatchview.cpp
+5
-5
translationsmatchview.hpp
modules/cvv/src/view/translationsmatchview.hpp
+3
-3
No files found.
modules/cvv/src/controller/view_controller.cpp
View file @
ceaad7fa
...
...
@@ -64,21 +64,21 @@ void ViewController::addCallType(const QString typeName, TabFactory constr)
ViewController
::
callTabType
[
typeName
]
=
constr
;
}
std
::
unique_ptr
<
cvv
::
gui
::
FilterCallTab
>
st
atic
st
d
::
unique_ptr
<
cvv
::
gui
::
FilterCallTab
>
makeFilterCallTab
(
cvv
::
util
::
Reference
<
cvv
::
impl
::
Call
>
call
)
{
return
cvv
::
util
::
make_unique
<
cvv
::
gui
::
FilterCallTab
>
(
*
call
.
castTo
<
cvv
::
impl
::
FilterCall
>
());
}
std
::
unique_ptr
<
cvv
::
gui
::
MatchCallTab
>
st
atic
st
d
::
unique_ptr
<
cvv
::
gui
::
MatchCallTab
>
makeMatchCallTab
(
cvv
::
util
::
Reference
<
cvv
::
impl
::
Call
>
call
)
{
return
cvv
::
util
::
make_unique
<
cvv
::
gui
::
MatchCallTab
>
(
*
call
.
castTo
<
cvv
::
impl
::
MatchCall
>
());
}
std
::
unique_ptr
<
cvv
::
gui
::
ImageCallTab
>
st
atic
st
d
::
unique_ptr
<
cvv
::
gui
::
ImageCallTab
>
makeImageCallTab
(
cvv
::
util
::
Reference
<
cvv
::
impl
::
Call
>
call
)
{
return
cvv
::
util
::
make_unique
<
cvv
::
gui
::
ImageCallTab
>
(
...
...
modules/cvv/src/qtutil/filter/changed_pixels_widget.cpp
View file @
ceaad7fa
...
...
@@ -14,7 +14,7 @@ void changedPixelImage(const cv::Mat& mat0, const cv::Mat& mat1, cv::Mat& out);
template
<
int
Depth
,
int
Channels
>
void
changedPixelImage
(
const
cv
::
Mat
&
mat0
,
const
cv
::
Mat
&
mat1
,
cv
::
Mat
&
out
);
void
changedPixelImage
(
const
cv
::
Mat
&
mat0
,
const
cv
::
Mat
&
mat1
,
cv
::
Mat
&
out
)
static
void
changedPixelImage
(
const
cv
::
Mat
&
mat0
,
const
cv
::
Mat
&
mat1
,
cv
::
Mat
&
out
)
{
// need same size
if
(
mat0
.
size
()
!=
mat1
.
size
())
...
...
modules/cvv/src/qtutil/matchview/keypointmanagement.cpp
View file @
ceaad7fa
...
...
@@ -142,7 +142,7 @@ void KeyPointManagement::setSelection(
void
KeyPointManagement
::
addSetting
()
{
addSetting
(
std
::
move
(
util
::
make_unique
<
KeyPointSettingsSelector
>
(
univers_
)
));
addSetting
(
util
::
make_unique
<
KeyPointSettingsSelector
>
(
univers_
));
}
...
...
@@ -176,7 +176,7 @@ void KeyPointManagement::removeSetting(KeyPointSettingsSelector *setting)
void
KeyPointManagement
::
addSelection
()
{
addSelection
(
std
::
move
(
util
::
make_unique
<
KeyPointSelectionSelector
>
(
univers_
)
));
addSelection
(
util
::
make_unique
<
KeyPointSelectionSelector
>
(
univers_
));
}
void
KeyPointManagement
::
addSelection
(
std
::
unique_ptr
<
KeyPointSelectionSelector
>
selection
)
...
...
modules/cvv/src/qtutil/matchview/matchmanagement.cpp
View file @
ceaad7fa
...
...
@@ -137,7 +137,7 @@ void MatchManagement::setSelection(
void
MatchManagement
::
addSetting
()
{
addSetting
(
std
::
move
(
util
::
make_unique
<
MatchSettingsSelector
>
(
univers_
)
));
addSetting
(
util
::
make_unique
<
MatchSettingsSelector
>
(
univers_
));
}
...
...
@@ -172,7 +172,7 @@ void MatchManagement::removeSetting(MatchSettingsSelector *setting)
void
MatchManagement
::
addSelection
()
{
addSelection
(
std
::
move
(
util
::
make_unique
<
MatchSelectionSelector
>
(
univers_
)
));
addSelection
(
util
::
make_unique
<
MatchSelectionSelector
>
(
univers_
));
}
void
MatchManagement
::
addSelection
(
std
::
unique_ptr
<
MatchSelectionSelector
>
selection
)
...
...
modules/cvv/src/qtutil/matchview/matchscene.hpp
View file @
ceaad7fa
...
...
@@ -44,7 +44,7 @@ class MatchSceneGraphicsView : public QGraphicsView
emit
signalResized
();
}
virtual
void
contextMenuEvent
(
QContextMenuEvent
*
event
)
virtual
void
contextMenuEvent
(
QContextMenuEvent
*
event
)
CV_OVERRIDE
{
emit
signalContextMenu
(
event
->
globalPos
());
//event->ignore();
...
...
modules/cvv/src/qtutil/util.cpp
View file @
ceaad7fa
...
...
@@ -335,7 +335,7 @@ bool checkValueRange(const cv::Mat &mat, DepthType<depth> min,
* @param res The error code.
* @return The result.
*/
std
::
pair
<
ImageConversionResult
,
QImage
>
errorResult
(
ImageConversionResult
res
,
st
atic
st
d
::
pair
<
ImageConversionResult
,
QImage
>
errorResult
(
ImageConversionResult
res
,
const
cv
::
Mat
&
mat
)
{
switch
(
res
)
...
...
modules/cvv/src/qtutil/zoomableimage.cpp
View file @
ceaad7fa
...
...
@@ -137,7 +137,7 @@ template <int depth> std::string printPixel(const cv::Mat &mat, int i, int j)
* @return The channels of pixel mat,col from mat as a string. (or ">6
* channels")
*/
std
::
string
printPixel
(
const
cv
::
Mat
&
mat
,
int
i
,
int
j
)
st
atic
st
d
::
string
printPixel
(
const
cv
::
Mat
&
mat
,
int
i
,
int
j
)
{
if
(
i
>=
0
&&
j
>=
0
)
{
...
...
modules/cvv/src/view/defaultfilterview.cpp
View file @
ceaad7fa
...
...
@@ -41,8 +41,7 @@ DefaultFilterView::DefaultFilterView(const std::vector<cv::Mat> &images,
accor
->
insert
(
QString
(
"Image Information: "
)
+
QString
::
number
(
count
),
std
::
move
(
util
::
make_unique
<
qtutil
::
ZoomableOptPanel
>
(
*
zoomIm
)));
util
::
make_unique
<
qtutil
::
ZoomableOptPanel
>
(
*
zoomIm
));
zoomIm
->
setMat
(
image
);
...
...
@@ -51,7 +50,7 @@ DefaultFilterView::DefaultFilterView(const std::vector<cv::Mat> &images,
histogram
->
setVisible
(
false
);
connect
(
zoomIm
.
get
(),
SIGNAL
(
updateArea
(
QRectF
,
qreal
)),
histogram
.
get
(),
SLOT
(
setArea
(
QRectF
,
qreal
)));
accor
->
insert
(
QString
(
"Histogram: "
)
+
QString
::
number
(
count
),
std
::
move
(
util
::
make_unique
<
qtutil
::
HistogramOptPanel
>
(
*
histogram
)
));
accor
->
insert
(
QString
(
"Histogram: "
)
+
QString
::
number
(
count
),
util
::
make_unique
<
qtutil
::
HistogramOptPanel
>
(
*
histogram
));
imageLayout
->
addWidget
(
zoomIm
.
release
(),
0
,
count
);
imageLayout
->
addWidget
(
histogram
.
release
(),
1
,
count
);
...
...
modules/cvv/src/view/dual_filter_view.cpp
View file @
ceaad7fa
...
...
@@ -69,8 +69,7 @@ DualFilterView::DualFilterView(std::array<cv::Mat, 2> images, QWidget *parent)
accor
->
insert
(
QString
(
"Image Information: "
)
+
QString
::
number
(
count
),
std
::
move
(
util
::
make_unique
<
qtutil
::
ZoomableOptPanel
>
(
*
zoomIm
)));
util
::
make_unique
<
qtutil
::
ZoomableOptPanel
>
(
*
zoomIm
));
if
(
count
!=
1
)
{
...
...
@@ -99,7 +98,7 @@ DualFilterView::DualFilterView(std::array<cv::Mat, 2> images, QWidget *parent)
syncVec
.
push_back
(
lambda
(
rawImages_
.
at
(
1
),
2
));
accor
->
insert
(
"Zoom synchronization"
,
std
::
move
(
util
::
make_unique
<
qtutil
::
SyncZoomWidget
>
(
syncVec
)
),
true
,
1
);
util
::
make_unique
<
qtutil
::
SyncZoomWidget
>
(
syncVec
),
true
,
1
);
//ensure that all images have same width
imwid
->
setLayout
(
imageLayout
.
release
());
...
...
modules/cvv/src/view/image_view.cpp
View file @
ceaad7fa
...
...
@@ -32,8 +32,7 @@ ImageView::ImageView(const cv::Mat &image, QWidget *parent)
accor
->
setMaximumWidth
(
300
);
auto
zoomim
=
util
::
make_unique
<
qtutil
::
ZoomableImage
>
();
accor
->
insert
(
QString
(
"ImageInformation:"
),
std
::
move
(
util
::
make_unique
<
qtutil
::
ZoomableOptPanel
>
(
*
zoomim
,
false
)));
accor
->
insert
(
QString
(
"ImageInformation:"
),
util
::
make_unique
<
qtutil
::
ZoomableOptPanel
>
(
*
zoomim
,
false
));
zoomim
->
setMat
(
image
);
auto
histogram
=
util
::
make_unique
<
qtutil
::
Histogram
>
();
...
...
@@ -41,7 +40,7 @@ ImageView::ImageView(const cv::Mat &image, QWidget *parent)
histogram
->
setVisible
(
false
);
connect
(
zoomim
.
get
(),
SIGNAL
(
updateArea
(
QRectF
,
qreal
)),
histogram
.
get
(),
SLOT
(
setArea
(
QRectF
,
qreal
)));
accor
->
insert
(
QString
(
"Histogram:"
),
std
::
move
(
util
::
make_unique
<
qtutil
::
HistogramOptPanel
>
(
*
histogram
)
));
accor
->
insert
(
QString
(
"Histogram:"
),
util
::
make_unique
<
qtutil
::
HistogramOptPanel
>
(
*
histogram
));
this
->
image
=
(
*
zoomim
);
imageLayout
->
addWidget
(
zoomim
.
release
(),
0
,
0
);
...
...
modules/cvv/src/view/linematchview.cpp
View file @
ceaad7fa
...
...
@@ -66,18 +66,15 @@ LineMatchView::LineMatchView(std::vector<cv::KeyPoint> leftKeyPoints,
accor
->
insert
(
"Match Settings"
,
std
::
move
(
matchmnt
));
accor
->
insert
(
"KeyPoint Settings"
,
std
::
move
(
keyPointmnt
));
accor
->
insert
(
"Show selection in rawview window"
,
std
::
move
(
util
::
make_unique
<
qtutil
::
ShowInRawView
>
(
leftKeyPoints
,
util
::
make_unique
<
qtutil
::
ShowInRawView
>
(
leftKeyPoints
,
rightKeyPoints
,
matches
,
matchManagment_
,
keyManagment_
)));
accor
->
insert
(
"Sync Zoom "
,
std
::
move
(
matchscene_ptr
->
getSyncZoomWidget
()));
accor
->
insert
(
"Left Image "
,
std
::
move
(
matchscene_ptr
->
getLeftMatInfoWidget
()));
accor
->
insert
(
"Right Image "
,
std
::
move
(
matchscene_ptr
->
getRightMatInfoWidget
()));
keyManagment_
));
accor
->
insert
(
"Sync Zoom "
,
matchscene_ptr
->
getSyncZoomWidget
());
accor
->
insert
(
"Left Image "
,
matchscene_ptr
->
getLeftMatInfoWidget
());
accor
->
insert
(
"Right Image "
,
matchscene_ptr
->
getRightMatInfoWidget
());
layout
->
addWidget
(
accor
.
release
());
layout
->
addWidget
(
matchscene
.
release
());
...
...
modules/cvv/src/view/linematchview.hpp
View file @
ceaad7fa
...
...
@@ -56,19 +56,19 @@ class LineMatchView : public MatchView
return
matchManagment_
->
getCurrentSelection
();
}
virtual
std
::
vector
<
cv
::
KeyPoint
>
getKeyPointSelection
()
virtual
std
::
vector
<
cv
::
KeyPoint
>
getKeyPointSelection
()
CV_OVERRIDE
{
return
keyManagment_
->
getCurrentSelection
();
}
public
slots
:
virtual
void
setMatchSelection
(
std
::
vector
<
cv
::
DMatch
>
selection
)
virtual
void
setMatchSelection
(
std
::
vector
<
cv
::
DMatch
>
selection
)
CV_OVERRIDE
{
matchManagment_
->
setSelection
(
selection
);
}
virtual
void
setKeyPointSelection
(
std
::
vector
<
cv
::
KeyPoint
>
selection
)
virtual
void
setKeyPointSelection
(
std
::
vector
<
cv
::
KeyPoint
>
selection
)
CV_OVERRIDE
{
keyManagment_
->
setSelection
(
selection
);
}
...
...
modules/cvv/src/view/pointmatchview.cpp
View file @
ceaad7fa
...
...
@@ -46,11 +46,11 @@ PointMatchView::PointMatchView(std::vector<cv::KeyPoint> leftKeyPoints,
accor
->
insert
(
"Match Settings"
,
std
::
move
(
matchmnt
));
accor
->
insert
(
"Sync Zoom "
,
std
::
move
(
matchscene_ptr
->
getSyncZoomWidget
()
));
matchscene_ptr
->
getSyncZoomWidget
(
));
accor
->
insert
(
"Left Image "
,
std
::
move
(
matchscene_ptr
->
getLeftMatInfoWidget
()
));
matchscene_ptr
->
getLeftMatInfoWidget
(
));
accor
->
insert
(
"Right Image "
,
std
::
move
(
matchscene_ptr
->
getRightMatInfoWidget
()
));
matchscene_ptr
->
getRightMatInfoWidget
(
));
layout
->
addWidget
(
accor
.
release
());
layout
->
addWidget
(
matchscene
.
release
());
...
...
modules/cvv/src/view/pointmatchview.hpp
View file @
ceaad7fa
...
...
@@ -58,7 +58,7 @@ class PointMatchView : public MatchView
public
slots
:
virtual
void
setMatchSelection
(
std
::
vector
<
cv
::
DMatch
>
selection
)
virtual
void
setMatchSelection
(
std
::
vector
<
cv
::
DMatch
>
selection
)
CV_OVERRIDE
{
matchManagment_
->
setSelection
(
selection
);
}
...
...
modules/cvv/src/view/singlefilterview.cpp
View file @
ceaad7fa
...
...
@@ -44,8 +44,7 @@ SingleFilterView::SingleFilterView(const std::vector<cv::Mat> &images,
auto
originalZoomIm
=
util
::
make_unique
<
qtutil
::
ZoomableImage
>
(
image
);
accor
->
insert
(
QString
(
"Info original image "
)
+
QString
::
number
(
count
),
std
::
move
(
util
::
make_unique
<
qtutil
::
ZoomableOptPanel
>
(
*
originalZoomIm
)));
util
::
make_unique
<
qtutil
::
ZoomableOptPanel
>
(
*
originalZoomIm
));
syncVec
.
push_back
(
originalZoomIm
.
get
());
...
...
@@ -66,8 +65,7 @@ SingleFilterView::SingleFilterView(const std::vector<cv::Mat> &images,
accor
->
insert
(
QString
(
"Info filtered image "
)
+
QString
::
number
(
count
),
std
::
move
(
util
::
make_unique
<
qtutil
::
ZoomableOptPanel
>
(
*
filterZoomIm
)));
util
::
make_unique
<
qtutil
::
ZoomableOptPanel
>
(
*
filterZoomIm
));
syncVec
.
push_back
(
filterZoomIm
.
get
());
...
...
@@ -84,7 +82,7 @@ SingleFilterView::SingleFilterView(const std::vector<cv::Mat> &images,
imwid
->
setLayout
(
imageLayout
.
release
());
accor
->
insert
(
"Zoom synchronization"
,
std
::
move
(
util
::
make_unique
<
qtutil
::
SyncZoomWidget
>
(
syncVec
)
),
true
,
1
);
util
::
make_unique
<
qtutil
::
SyncZoomWidget
>
(
syncVec
),
true
,
1
);
layout
->
addWidget
(
accor
.
release
());
layout
->
addWidget
(
imwid
.
release
());
...
...
modules/cvv/src/view/translationsmatchview.cpp
View file @
ceaad7fa
...
...
@@ -57,17 +57,17 @@ TranslationMatchView::TranslationMatchView(
accor
->
insert
(
"Match Settings"
,
std
::
move
(
matchmnt
));
accor
->
insert
(
"KeyPoint Settings"
,
std
::
move
(
keyPointmnt
));
accor
->
insert
(
"Show selection in rawview window"
,
std
::
move
(
util
::
make_unique
<
qtutil
::
ShowInRawView
>
(
leftKeyPoints
,
util
::
make_unique
<
qtutil
::
ShowInRawView
>
(
leftKeyPoints
,
rightKeyPoints
,
matches
,
matchManagment_
,
keyManagment_
)
));
keyManagment_
));
accor
->
insert
(
"Sync Zoom "
,
std
::
move
(
matchscene_ptr
->
getSyncZoomWidget
()
));
matchscene_ptr
->
getSyncZoomWidget
(
));
accor
->
insert
(
"Left Image "
,
std
::
move
(
matchscene_ptr
->
getLeftMatInfoWidget
()
));
matchscene_ptr
->
getLeftMatInfoWidget
(
));
accor
->
insert
(
"Right Image "
,
std
::
move
(
matchscene_ptr
->
getRightMatInfoWidget
()
));
matchscene_ptr
->
getRightMatInfoWidget
(
));
layout
->
addWidget
(
accor
.
release
());
layout
->
addWidget
(
matchscene
.
release
());
...
...
modules/cvv/src/view/translationsmatchview.hpp
View file @
ceaad7fa
...
...
@@ -60,19 +60,19 @@ class TranslationMatchView : public MatchView
return
matchManagment_
->
getCurrentSelection
();
}
virtual
std
::
vector
<
cv
::
KeyPoint
>
getKeyPointSelection
()
virtual
std
::
vector
<
cv
::
KeyPoint
>
getKeyPointSelection
()
CV_OVERRIDE
{
return
keyManagment_
->
getCurrentSelection
();
}
public
slots
:
virtual
void
setMatchSelection
(
std
::
vector
<
cv
::
DMatch
>
selection
)
virtual
void
setMatchSelection
(
std
::
vector
<
cv
::
DMatch
>
selection
)
CV_OVERRIDE
{
matchManagment_
->
setSelection
(
selection
);
}
virtual
void
setKeyPointSelection
(
std
::
vector
<
cv
::
KeyPoint
>
selection
)
virtual
void
setKeyPointSelection
(
std
::
vector
<
cv
::
KeyPoint
>
selection
)
CV_OVERRIDE
{
keyManagment_
->
setSelection
(
selection
);
}
...
...
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