Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
P
ProjetModuleImage12311569_12301526
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
Container 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
DUPASQUIER YOANN p2301526
ProjetModuleImage12311569_12301526
Commits
0886e4fa
Commit
0886e4fa
authored
4 weeks ago
by
DUPASQUIER YOANN p2301526
Browse files
Options
Downloads
Patches
Plain Diff
2 fonctions débugguées
parent
e7e00a65
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Pipeline
#188897
canceled
4 weeks ago
Stage: test
Changes
4
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
src/Image.cpp
+11
-13
11 additions, 13 deletions
src/Image.cpp
src/Image.h
+2
-2
2 additions, 2 deletions
src/Image.h
src/ImageViewer.cpp
+81
-0
81 additions, 0 deletions
src/ImageViewer.cpp
src/ImageViewer.h
+21
-0
21 additions, 0 deletions
src/ImageViewer.h
with
115 additions
and
15 deletions
src/Image.cpp
+
11
−
13
View file @
0886e4fa
...
...
@@ -80,17 +80,17 @@ void Image::testRegression() {
cout
<<
int
((
i
.
getPix
(
1
,
2
)).
r
)
<<
"/"
<<
int
((
i
.
getPix
(
1
,
2
)).
g
)
<<
"/"
<<
int
((
i
.
getPix
(
1
,
2
)).
b
)
<<
endl
;
};
/*
void Image::sauver(const string &filename) const
void
Image
::
sauver
(
const
string
&
filename
)
const
{
ofstream
fichier
(
filename
.
c_str
());
assert
(
fichier
.
is_open
());
fichier
<<
"P3"
<<
endl
;
fichier
<<
dimx
<<
" "
<<
dimy
<<
endl
;
fichier
<<
"255"
<<
endl
;
for (unsigned int y = 0; y < dimy; ++y)
for (unsigned int x = 0; x < dimx; ++x)
for
(
unsigned
int
y
=
0
;
(
int
)
y
<
dimy
;
++
y
)
for
(
unsigned
int
x
=
0
;
(
int
)
x
<
dimx
;
++
x
)
{
Pixel &pix = getPix(x
++
, y);
const
Pixel
&
pix
=
getPix
(
x
,
y
);
fichier
<<
+
pix
.
r
<<
" "
<<
+
pix
.
g
<<
" "
<<
+
pix
.
b
<<
" "
;
}
cout
<<
"Sauvegarde de l'image "
<<
filename
<<
" ... OK
\n
"
;
...
...
@@ -101,27 +101,25 @@ void Image::ouvrir(const string &filename)
{
ifstream
fichier
(
filename
.
c_str
());
assert
(
fichier
.
is_open
());
char r, g, b;
unsigned
char
r
,
g
,
b
;
string
mot
;
dimx
=
dimy
=
0
;
fichier
>>
mot
>>
dimx
>>
dimy
>>
mot
;
assert
(
dimx
>
0
&&
dimy
>
0
);
if (tab != nullptr)
delete[] tab;
tab
=
new
Pixel
[
dimx
*
dimy
];
for (unsigned int y = 0; y < dimy; ++y)
for (unsigned int x = 0;
x < dimx; ++x)
for
(
unsigned
int
y
=
0
;
(
int
)
y
<
dimy
;
++
y
)
for
(
unsigned
int
x
=
0
;
(
int
)
x
<
dimx
;
++
x
)
{
fichier
>>
r
>>
b
>>
g
;
getPix(x, y).r
= r
;
getPix(x, y).g
= g
;
getPix(x, y).b
= b
;
r
=
getPix
(
x
,
y
).
r
;
g
=
getPix
(
x
,
y
).
g
;
b
=
getPix
(
x
,
y
).
b
;
}
fichier
.
close
();
cout
<<
"Lecture de l'image "
<<
filename
<<
" ... OK
\n
"
;
}
void Image::afficherConsole()
/*
void Image::afficherConsole()
{
cout << dimx << " " << dimy << endl;
for (unsigned int y = 0; y < dimy; ++y)
...
...
This diff is collapsed.
Click to expand it.
src/Image.h
+
2
−
2
View file @
0886e4fa
...
...
@@ -101,7 +101,7 @@ public:
* @param filename nom de l'image à sauvegarder
* @return pas de valeur de retour
*/
//
void
I
sauver(const string &filename) const;
void
sauver
(
const
string
&
filename
)
const
;
/**
* @brief ouvre l'image "filename" en plaçant ses pixels dans u tableau de pixels
...
...
@@ -109,7 +109,7 @@ public:
* @param filename nom de l'image à ouvrir
* @return Description de la valeur de retour.
*/
//
void ouvrir(const string &filename);
void
ouvrir
(
const
string
&
filename
);
/**
* @brief Affiche les valeurs rgb de l'image sur la console, de la même forme que l'image
...
...
This diff is collapsed.
Click to expand it.
src/ImageViewer.cpp
0 → 100644
+
81
−
0
View file @
0886e4fa
#include
<iostream>
#include
"Image.h"
#include
"ImageViewer.h"
#include
"SDL_surface.h"
using
namespace
std
;
ImageViewer
::
ImageViewer
()
{
// Initialiser SDL
if
(
SDL_Init
(
SDL_INIT_VIDEO
|
SDL_INIT_TIMER
)
!=
0
)
{
return
-
1
;
}
// Configurer SDL pour OpenGL 3.2 avec un profil de base
SDL_GL_SetAttribute
(
SDL_GL_CONTEXT_FLAGS
,
SDL_GL_CONTEXT_FORWARD_COMPATIBLE_FLAG
);
SDL_GL_SetAttribute
(
SDL_GL_CONTEXT_PROFILE_MASK
,
SDL_GL_CONTEXT_PROFILE_CORE
);
SDL_GL_SetAttribute
(
SDL_GL_CONTEXT_MAJOR_VERSION
,
3
);
SDL_GL_SetAttribute
(
SDL_GL_CONTEXT_MINOR_VERSION
,
2
);
// Créer une fenêtre avec OpenGL
SDL_Window
*
window
=
SDL_CreateWindow
(
"ImGui SDL2+OpenGL3 Example"
,
SDL_WINDOWPOS_CENTERED
,
SDL_WINDOWPOS_CENTERED
,
200
,
200
,
SDL_WINDOW_OPENGL
|
SDL_WINDOW_RESIZABLE
);
// Créer un contexte OpenGL
SDL_GLContext
gl_context
=
SDL_GL_CreateContext
(
window
);
// Charger les extensions OpenGL avec ImGui
IMGUI_CHECKVERSION
();
ImGui
::
CreateContext
();
ImGuiIO
&
io
=
ImGui
::
GetIO
();
(
void
)
io
;
// Configurer les backends pour SDL et OpenGL
ImGui_ImplSDL2_InitForOpenGL
(
window
,
gl_context
);
ImGui_ImplOpenGL3_Init
(
"#version 150"
);
}
ImageViewer
::~
ImageViewer
()
{
// Nettoyage
ImGui_ImplOpenGL3_Shutdown
();
ImGui_ImplSDL2_Shutdown
();
ImGui
::
DestroyContext
();
SDL_GL_DeleteContext
(
gl_context
);
SDL_DestroyWindow
(
window
);
SDL_Quit
();
}
ImageViewer
::
afficher
(
Image
im
)
{
// Boucle principale
bool
running
=
true
;
while
(
running
)
{
SDL_Event
event
;
while
(
SDL_PollEvent
(
&
event
))
{
ImGui_ImplSDL2_ProcessEvent
(
&
event
);
if
(
event
.
type
==
SDL_QUIT
)
{
running
=
false
;
}
}
// Début du cadre ImGui
ImGui_ImplOpenGL3_NewFrame
();
ImGui_ImplSDL2_NewFrame
(
window
);
ImGui
::
NewFrame
();
// Créez ici votre interface utilisateur ImGui
// Fin du cadre ImGui
ImGui
::
Render
();
glViewport
(
0
,
0
,
(
int
)
io
.
DisplaySize
.
x
,
(
int
)
io
.
DisplaySize
.
y
);
glClearColor
(
0.85
f
,
0.85
f
,
0.85
f
,
1.00
f
);
glClear
(
GL_COLOR_BUFFER_BIT
);
ImGui_ImplOpenGL3_RenderDrawData
(
ImGui
::
GetDrawData
());
SDL_GL_SwapWindow
(
window
);
}
This diff is collapsed.
Click to expand it.
src/ImageViewer.h
0 → 100644
+
21
−
0
View file @
0886e4fa
#ifndef _ImageViewer_H
#define _ImageViwer_H
#include
"Image.h"
class
ImageViewer
{
private:
SDL_Window
*
window
;
SDL_Renderer
*
renderer
;
public:
unsigned
char
r
,
g
,
b
;
ImageViewer
();
~
ImageViewer
();
void
afficher
(
Image
im
);
};
#endif
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