From f35eac2bb9d5a0231202cd3cc335444c8a8e6392 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Th=C3=A9au?= <theau.baton@etu.univ-amu.fr>
Date: Fri, 2 Feb 2024 19:12:56 +0100
Subject: [PATCH] =?UTF-8?q?R=C3=A9solution=20de=20bug=20sur=20Average?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
IHM_Retouche_Photo/mainwindow.cpp | 2 +-
IHM_Retouche_Photo/ressource.qrc | 4 ----
.../image/oxygen/icons/16x16/arrow-down.png | Bin 525 -> 0 bytes
.../image/oxygen/icons/16x16/arrow-left.png | Bin 512 -> 0 bytes
.../image/oxygen/icons/16x16/arrow-right.png | Bin 527 -> 0 bytes
.../image/oxygen/icons/16x16/arrow-up.png | Bin 484 -> 0 bytes
IHM_Retouche_Photo/tools/selectionable/color.h | 2 +-
.../ui/view/repercussion/average.cpp | 2 +-
8 files changed, 3 insertions(+), 7 deletions(-)
delete mode 100644 IHM_Retouche_Photo/ressource/image/oxygen/icons/16x16/arrow-down.png
delete mode 100644 IHM_Retouche_Photo/ressource/image/oxygen/icons/16x16/arrow-left.png
delete mode 100644 IHM_Retouche_Photo/ressource/image/oxygen/icons/16x16/arrow-right.png
delete mode 100644 IHM_Retouche_Photo/ressource/image/oxygen/icons/16x16/arrow-up.png
diff --git a/IHM_Retouche_Photo/mainwindow.cpp b/IHM_Retouche_Photo/mainwindow.cpp
index 6b61a5b..e85b5b7 100644
--- a/IHM_Retouche_Photo/mainwindow.cpp
+++ b/IHM_Retouche_Photo/mainwindow.cpp
@@ -110,7 +110,7 @@ MainWindow::MainWindow(QWidget * parent)
this->_menubarManager.insert(this->_menuFile, QSharedPointer<ui::MenuLambda>(new ui::FilemenuLambda(this->_fileselectorManager, this->_viewManager)));
this->_menubarManager.insert(this->_menuAffichage, QSharedPointer<ui::MenuLambda>(new ui::DisplayMenuLambda(this->_viewManager)));
- this->_menubarManager.insert(this->_menuImage, QSharedPointer<ui::MenuLambda>(new ui::imagemenulambda(this->_rescaleDialog, this->_resizeDialog, this->_viewManager)));
+ this->_menubarManager.insert(this->_menuImage, QSharedPointer<ui::MenuLambda>(new ui::ImageMenuLambda(this->_rescaleDialog, this->_resizeDialog, this->_viewManager)));
this->_menubarManager.insert(this->_menuSelection, QSharedPointer<ui::MenuLambda>(new ui::SelectionMenuLambda(this->_viewManager)));
this->_menubarManager.update();
diff --git a/IHM_Retouche_Photo/ressource.qrc b/IHM_Retouche_Photo/ressource.qrc
index 963f8f0..63c51be 100644
--- a/IHM_Retouche_Photo/ressource.qrc
+++ b/IHM_Retouche_Photo/ressource.qrc
@@ -88,10 +88,6 @@
<file>ressource/image/oxygen/icons/16x16/archive-insert.png</file>
<file>ressource/image/oxygen/icons/16x16/archive-insert-directory.png</file>
<file>ressource/image/oxygen/icons/16x16/archive-remove.png</file>
- <file>ressource/image/oxygen/icons/16x16/arrow-down.png</file>
- <file>ressource/image/oxygen/icons/16x16/arrow-left.png</file>
- <file>ressource/image/oxygen/icons/16x16/arrow-right.png</file>
- <file>ressource/image/oxygen/icons/16x16/arrow-up.png</file>
<file>ressource/image/oxygen/icons/16x16/bookmark-new.png</file>
<file>ressource/image/oxygen/icons/16x16/bookmark-new-list.png</file>
<file>ressource/image/oxygen/icons/16x16/bookmarks-organize.png</file>
diff --git a/IHM_Retouche_Photo/ressource/image/oxygen/icons/16x16/arrow-down.png b/IHM_Retouche_Photo/ressource/image/oxygen/icons/16x16/arrow-down.png
deleted file mode 100644
index 03f201428ade2247beda4510d7d026239ce76e95..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 525
zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7Sc;uILpV4%IBGajIv5xj
zI14-?iy0UgcY`pa)tkqU7#J8NOI#yLg7ec#$`gxH8OqDc^)mCai<1)zQuXqS(r3T3
zkz!zA?DBMR45_$vce0^(jH5{F`90=`^8&(;rX01Ocq+_8*omdLJM>?}3;PKQ8Htk*
z9g4bWmO4pI%<ZVs(=26<?inJxHot%RRx3X}eD3#e7B&}7X-snZusddlL4m~_>+lIj
z{y*4R7sbfgUXZ|4Y16iT#{y;H0}^8H?e6xGiHR{s>v$gT_LREf!XUy>(s?F-qU)Eq
zZwrlrA{h;)avn(V{D1ZG(x8>`^Roj@Lo-$jRw-t!VO-C!C*|4ph02e%rx#2;cR%gG
z{58}0Pv>th+qPyB*QwwMPEMsF1*{96?s{j%z?OB?griv~J#z0!g=YH*G5I4U<@w*e
z5?4G}9dgjWw!)WRHax>xxy*pK@35ubjkDI<59G((zi~IB_jRF`Fz5QWj`O?~n5q^z
zUHX%}Z#nn$`R`*F*XE{gtIvJE@n}e_#s<G9=ZZYl9|g`ndy@S><MWe0RO+^uZ@51}
z*VAo@SJ5$(N9HB@{9Jchq}UGr7Ou@I)|zi3y|z#<_%YwRy{sPteIB*0-!ZM`pnV0~
c@e<w%Du-|9mT+EVU|?YIboFyt=akR{0E3|1N&o-=
diff --git a/IHM_Retouche_Photo/ressource/image/oxygen/icons/16x16/arrow-left.png b/IHM_Retouche_Photo/ressource/image/oxygen/icons/16x16/arrow-left.png
deleted file mode 100644
index b56cfee03dfefe9ff8f2c5e7e2a8a0bb0b15ba6e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 512
zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7Sc;uILpV4%IBGajIv5xj
zI14-?iy0UgcY`pa)tkqU7#J8NOI#yLg7ec#$`gxH8OqDc^)mCai<1)zQuXqS(r3T3
zkz!zAto3wp45_%aG<d(aQ=o|5@#_1RgDyYkuaZ(_6XfOEx%CQjW`<GrD$N)Cg0WFf
z9n+RASh+CG@fUN~wPo8hoSV;l(e$sqUcURqBY|IwJ{L~wFW&c=_rBvf%RkFy%GeEi
z8P7c6?2>xEa_v)DpQV#lTAMCm^Xdz73~0+`fAlJ_O1XCa-LqP1vz*UOV?Lv7HGht{
zq;9cHeCOn-&1|xa(M&sf8Rx&!&YrdHU7*d9TdSHh7X;VtVtAMA727vu^2e4-NA)tx
zZzTi?&uDIR>^;d;(NVpz;EmO*Zm-hCeLNBodECF4e3C9qt`3&*XsIcc+Vd%hQ9FgP
zO+aTq>w+G&^b>EM$b8T)TkL&oS@qf51(mU9CLP@*&9KKnM6o!fYQm4y{~KHHuQt)K
z|Gk%s*>l3Wi5wpTsy&~${#!XYZ4vvk+#_2J9QvAA7EHNyp7A{I{3i`hmbSZAzWn06
zUNA}U&u4v}qGvZ>-~Ju8!R|iaH|PB^kM4vyGag!^F`t>C@ALn<=kimT7QTp`Y>~yl
Pz`)??>gTe~DWM4f;;Pwb
diff --git a/IHM_Retouche_Photo/ressource/image/oxygen/icons/16x16/arrow-right.png b/IHM_Retouche_Photo/ressource/image/oxygen/icons/16x16/arrow-right.png
deleted file mode 100644
index 0acee70bcdd2d9b0a95b2971713bd34ce923bc3e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 527
zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7Sc;uILpV4%IBGajIv5xj
zI14-?iy0UgcY`pa)tkqU7#J8NOI#yLg7ec#$`gxH8OqDc^)mCai<1)zQuXqS(r3T3
zkz!zA?D2GQ45_%abh5qo>_CzB`se>DC&yf#BDGdSZ<eA3OV+|x2U*sWO9U5&s2gu7
zURwN8jq%`7SMisZ0{@8d{blNn5OfrtJWJ!4%l+#6iz9VAFWM9=W9FZ8-?Dv%<X(jj
z46~N{q}XlxlEWzBt=+9{pDdpo{iXTE$tJP10|9x8+ihwr{>)ys@_%L%N5CGPL#=a9
zoJ+f}GO5#k%0kaAjt>=U9X7_XthgGY^jA^VT>p&R*^BA-9=>&FJ>(I&NtMO%f{;VB
z@8ZXc=kdMNeLs2nx5@v+|DC%NCm^=TN%Y4PXKUW4+9%pt`ZA_Uc|YYk{yV?(h3);z
zVF3%6auOQZ9K=}yg$q*Ii<2!37)yBqtD-s_8ILgTVX-(>px7Sn{P)_i=J>M{pIJZi
zQ?76-^e$jMz_e@K&GhHtv$w9_^Uh3;ccRJ3-%K1GO0N#_7Kdhrq*uHxTff@WYpu%s
zs6FfWBdbMZLj2AxvpD~B9lxiB;_-i~1%JPnecux`??I^EV&?y~i%+#bb1=!+Z)$##
e)pq}9*?RA(#@-7b9c5r(VDNPHb6Mw<&;$Uz#M%D<
diff --git a/IHM_Retouche_Photo/ressource/image/oxygen/icons/16x16/arrow-up.png b/IHM_Retouche_Photo/ressource/image/oxygen/icons/16x16/arrow-up.png
deleted file mode 100644
index 5e423213fbd735f153563b7655bda918cafc868a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 484
zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7Sc;uILpV4%IBGajIv5xj
zI14-?iy0UgcY`pa)tkqU7#J8NOI#yLg7ec#$`gxH8OqDc^)mCai<1)zQuXqS(r3T3
zkz!zAO!Rbd45_$vce1^{bE3$x`Oo*gcfDI({WZVq#ihnT>E;<*tTrh4xN&YinBZ#l
zgY8JUK$74_58?O&?gk#O&M$JD{eAEEU8+7IN0sXQ&y`Gy_wzfKD8TZAm#x8G=Yf#;
z=h?~H8HcA^KVUlE_UI<Jf5jfYtfvX_q1N*nf_s)Hy_|gTNJC|D=;Up8tIwFGSqT+%
zml&PPtgA3traa4M;;WUJk?V@@y{gqV&_8?kQH7y@x6@Y*15cC1zL_4+l(z8S;<7mY
z^kwHuQT2BmxmiE9@xRSdV7;=K|B_$S=A_NlkAoT0BQ(Uis&_t|bKy!r(81T=9(@1l
zz~mscqcr<a`CcyVw4cr&_H8-j@o<evq|wy%7rM-xI#)8VJFHQy&^FHQC{e0CA^T0)
zWl?MES05wc^>HB|C6?*E&N#s~Z}&Vw!My_hOot{+2y$X++PEV7zWKXtjBEDYV{|s?
km;2MAY|=EL{)3PH0^wYvEDnq53=9kmp00i_>zopr0QpzRiU0rr
diff --git a/IHM_Retouche_Photo/tools/selectionable/color.h b/IHM_Retouche_Photo/tools/selectionable/color.h
index a74ea85..658a75a 100644
--- a/IHM_Retouche_Photo/tools/selectionable/color.h
+++ b/IHM_Retouche_Photo/tools/selectionable/color.h
@@ -21,6 +21,6 @@ namespace tool {
virtual void onKeyPress(ui::ImageArea &, ui::Selection &, const QPoint &, const QImage &, const QKeyEvent &, const ColorPickerWidget &);
virtual void onKeyReleased(ui::ImageArea &, ui::Selection &, const QPoint &, const QImage &, const QKeyEvent &, const ColorPickerWidget &);
- void select(ui::Selection &, const QPoint &, const QImage &)
+ void select(ui::Selection &, const QPoint &, const QImage &);
};
}
diff --git a/IHM_Retouche_Photo/ui/view/repercussion/average.cpp b/IHM_Retouche_Photo/ui/view/repercussion/average.cpp
index 2094e18..06e8ddc 100644
--- a/IHM_Retouche_Photo/ui/view/repercussion/average.cpp
+++ b/IHM_Retouche_Photo/ui/view/repercussion/average.cpp
@@ -2,7 +2,7 @@
namespace ui {
void Average::apply(const QPoint & point, const QColor & color, const QImage * origin, QImage * image) {
- QPoint newPoint(point.x() * image->width() / origin->height(), point.y() * image->height() / origin->height());
+ QPoint newPoint(point.x() * image->width() / origin->width(), point.y() * image->height() / origin->height());
image->setPixelColor(newPoint, color);
}
}
--
GitLab