diff --git a/IHM_Retouche_Photo/mainwindow.cpp b/IHM_Retouche_Photo/mainwindow.cpp index 6b61a5b0304c2a31e6532c40c63e01a5743ab40a..e85b5b7acffffbae34d752e9ffb600b516defd2e 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 963f8f0f382c0ffa46d5e45b29d90a45b8ad19d8..63c51be12d6b08e176e9eac8dbc8963aa70c3efe 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 Binary files a/IHM_Retouche_Photo/ressource/image/oxygen/icons/16x16/arrow-down.png and /dev/null differ 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 Binary files a/IHM_Retouche_Photo/ressource/image/oxygen/icons/16x16/arrow-left.png and /dev/null differ 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 Binary files a/IHM_Retouche_Photo/ressource/image/oxygen/icons/16x16/arrow-right.png and /dev/null differ 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 Binary files a/IHM_Retouche_Photo/ressource/image/oxygen/icons/16x16/arrow-up.png and /dev/null differ diff --git a/IHM_Retouche_Photo/tools/selectionable/color.h b/IHM_Retouche_Photo/tools/selectionable/color.h index a74ea8537e532bacdd709c140e8576a9c92c46ff..658a75a8149274e2381a9ea6bb44f18de92b01d1 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 2094e18449e26e51ebbada25d238adc2e11b8cbb..06e8ddcad02a2983330c9550ac94fb7b616fad66 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); } }