Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
I
ImageINSA_Tanguy
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
Show more breadcrumbs
Tanguy.Raufflet
ImageINSA_Tanguy
Commits
e9e32eba
Commit
e9e32eba
authored
12 years ago
by
Sacha Percot-Tétu
Browse files
Options
Downloads
Patches
Plain Diff
Corrected a bug in PointOp
parent
0bd3241d
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
app/Operations/PointOp.cpp
+12
-4
12 additions, 4 deletions
app/Operations/PointOp.cpp
with
12 additions
and
4 deletions
app/Operations/PointOp.cpp
+
12
−
4
View file @
e9e32eba
...
...
@@ -34,6 +34,7 @@
#include
"ImageListBox.h"
#include
"Widgets/ImageWidgets/StandardImageWindow.h"
#include
"Widgets/ImageWidgets/DoubleImageWindow.h"
#include
<Converter.h>
#include
"../Tools.h"
...
...
@@ -214,7 +215,7 @@ void PointOp::operator()(const ImageWindow* currentWnd, vector<ImageWindow*>& wn
if
(
dblResult
)
{
const
DoubleImageWindow
*
currentDblWnd
=
dynamic_cast
<
const
DoubleImageWindow
*>
(
currentWnd
);
const
Image_t
<
double
>*
image
=
currentDblWnd
?
currentDblWnd
->
getImage
()
:
NULL
;
const
Image_t
<
double
>*
image
=
currentDblWnd
?
Converter
<
Image_t
<
double
>
>::
convert
(
*
currentDblWnd
->
getImage
()
)
:
Converter
<
Image_t
<
double
>
>::
convert
(
*
currentWnd
->
getDisplayImage
())
;
unsigned
int
maxWidth
=
image
->
getWidth
();
unsigned
int
maxHeight
=
image
->
getHeight
();
...
...
@@ -318,7 +319,14 @@ void PointOp::operator()(const ImageWindow* currentWnd, vector<ImageWindow*>& wn
}
}
this
->
outDoubleImage
(
resImg
,
""
,
currentDblWnd
->
isNormalized
(),
currentDblWnd
->
isLogScaled
());
if
(
currentDblWnd
)
{
this
->
outDoubleImage
(
resImg
,
""
,
currentDblWnd
->
isNormalized
(),
currentDblWnd
->
isLogScaled
());
}
else
{
this
->
outDoubleImage
(
resImg
,
""
,
false
,
false
);
}
delete
image
;
}
else
{
const
Image
*
image
=
dynamic_cast
<
const
StandardImageWindow
*>
(
currentWnd
)
->
getImage
();
...
...
@@ -396,6 +404,6 @@ bool PointOp::needCurrentImg() const {
return
true
;
}
bool
PointOp
::
isValidImgWnd
(
const
genericinterface
::
ImageWindow
*
)
const
{
return
true
;
bool
PointOp
::
isValidImgWnd
(
const
genericinterface
::
ImageWindow
*
imgWnd
)
const
{
return
imgWnd
!=
NULL
;
}
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