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
d5611d29
Commit
d5611d29
authored
12 years ago
by
Sacha Percot-Tétu
Browse files
Options
Downloads
Patches
Plain Diff
Minor corrections
parent
45e0d3a5
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
app/Operations/ImageListBox.cpp
+0
-20
0 additions, 20 deletions
app/Operations/ImageListBox.cpp
app/Operations/ImageListBox.h
+24
-9
24 additions, 9 deletions
app/Operations/ImageListBox.h
app/main.cpp
+1
-0
1 addition, 0 deletions
app/main.cpp
core/Operation.h
+2
-1
2 additions, 1 deletion
core/Operation.h
with
27 additions
and
30 deletions
app/Operations/ImageListBox.cpp
+
0
−
20
View file @
d5611d29
...
...
@@ -22,23 +22,3 @@
using
namespace
std
;
using
namespace
imagein
;
ImageListBox
::
ImageListBox
(
QWidget
*
parent
,
const
Image
*
img
,
const
map
<
const
Image
*
,
string
>&
imgList
)
:
QComboBox
(
parent
)
{
int
i
=
0
,
index
=
0
;
for
(
map
<
const
Image
*
,
string
>::
const_iterator
it
=
imgList
.
begin
();
it
!=
imgList
.
end
();
++
it
)
{
_images
.
insert
(
pair
<
string
,
const
Image
*>
(
it
->
second
,
it
->
first
));
this
->
insertItem
(
i
,
QString
(
it
->
second
.
c_str
()));
if
(
it
->
first
==
img
)
index
=
i
;
}
this
->
setCurrentIndex
(
index
);
}
const
Image
*
ImageListBox
::
currentImage
()
{
string
name
=
this
->
currentText
().
toStdString
();
map
<
string
,
const
Image
*>::
iterator
it
=
_images
.
find
(
name
);
if
(
it
!=
_images
.
end
())
{
return
_images
[
name
];
}
return
NULL
;
}
This diff is collapsed.
Click to expand it.
app/Operations/ImageListBox.h
+
24
−
9
View file @
d5611d29
...
...
@@ -26,19 +26,34 @@
#include
<Image.h>
class
ImageListBox
:
public
QComboBox
template
<
typename
D
>
class
ImageListBox_t
:
public
QComboBox
{
Q_OBJECT
public:
explicit
ImageListBox
(
QWidget
*
parent
,
const
imagein
::
Image
*
,
const
std
::
map
<
const
imagein
::
Image
*
,
std
::
string
>&
);
const
imagein
::
Image
*
currentImage
();
signals:
public
slots
:
explicit
ImageListBox_t
(
QWidget
*
parent
,
const
imagein
::
Image_t
<
D
>*
img
,
const
std
::
map
<
const
imagein
::
Image_t
<
D
>*
,
std
::
string
>&
imgList
)
:
QComboBox
(
parent
)
{
int
i
=
0
,
index
=
0
;
for
(
typename
std
::
map
<
const
imagein
::
Image_t
<
D
>*
,
std
::
string
>::
const_iterator
it
=
imgList
.
begin
();
it
!=
imgList
.
end
();
++
it
)
{
_images
.
insert
(
std
::
pair
<
std
::
string
,
const
imagein
::
Image_t
<
D
>*>
(
it
->
second
,
it
->
first
));
this
->
insertItem
(
i
,
QString
(
it
->
second
.
c_str
()));
if
(
it
->
first
==
img
)
index
=
i
;
}
this
->
setCurrentIndex
(
index
);
}
const
imagein
::
Image_t
<
D
>*
currentImage
()
{
std
::
string
name
=
this
->
currentText
().
toStdString
();
typename
std
::
map
<
std
::
string
,
const
imagein
::
Image_t
<
D
>*>::
iterator
it
=
_images
.
find
(
name
);
if
(
it
!=
_images
.
end
())
{
return
_images
[
name
];
}
return
NULL
;
}
protected
:
std
::
map
<
std
::
string
,
const
imagein
::
Image
*>
_images
;
std
::
map
<
std
::
string
,
const
imagein
::
Image
_t
<
D
>
*>
_images
;
};
typedef
ImageListBox_t
<
imagein
::
Image
::
depth_t
>
ImageListBox
;
#endif // IMAGELISTBOX_H
This diff is collapsed.
Click to expand it.
app/main.cpp
+
1
−
0
View file @
d5611d29
...
...
@@ -41,6 +41,7 @@
#include
"Operations/SignalToNoiseOp.h"
#include
"Operations/MeanSquaredErrorOp.h"
#include
"Operations/FFTOp.h"
#include
"Operations/IFFTOp.h"
using
namespace
genericinterface
;
using
namespace
std
;
...
...
This diff is collapsed.
Click to expand it.
core/Operation.h
+
2
−
1
View file @
d5611d29
...
...
@@ -34,7 +34,7 @@ namespace genericinterface {
class
GenericOperation
{
public:
GenericOperation
(
std
::
string
name
)
:
_name
(
name
),
_ws
(
NULL
)
{}
GenericOperation
(
std
::
string
name
)
:
_name
(
name
),
_ws
(
NULL
)
,
_curImgWnd
(
NULL
)
{}
inline
std
::
string
getName
()
{
return
_name
;
}
...
...
@@ -52,6 +52,7 @@ class GenericOperation {
void
outText
(
std
::
string
);
std
::
string
_name
;
EIImageService
*
_ws
;
genericinterface
::
ImageWindow
*
_curImgWnd
;
private
:
void
outImgWnd
(
genericinterface
::
ImageWindow
*
imgWnd
,
std
::
string
title
);
};
...
...
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