Skip to content
Snippets Groups Projects
Commit 13f29cb0 authored by passscod's avatar passscod
Browse files

new

parent aa56db51
No related branches found
No related tags found
No related merge requests found
Showing
with 58 additions and 256 deletions
...@@ -21,10 +21,8 @@ class NewLayerDock : public QObject ...@@ -21,10 +21,8 @@ class NewLayerDock : public QObject
public: public:
NewLayerDock(InteractionTool *interaction); NewLayerDock(InteractionTool *interaction);
~NewLayerDock(); ~NewLayerDock();
//QDockWidget *getDockWidget();
void setColorVect(QVector<QRgb> colorVect); void setColorVect(QVector<QRgb> colorVect);
QDockWidget *createNewLayerDock(); QDockWidget *createNewLayerDock();
//void setDrawColorIndex(int i);
signals: signals:
void updateHasLayer(bool b); void updateHasLayer(bool b);
...@@ -38,7 +36,6 @@ private slots: ...@@ -38,7 +36,6 @@ private slots:
void standartColorVect(); void standartColorVect();
void smallColorVect(); void smallColorVect();
void customColorVect(); void customColorVect();
//void newLayer();
void addNewLayer(); void addNewLayer();
void setNewColor(); void setNewColor();
void setNewLayerX(int w); void setNewLayerX(int w);
...@@ -46,8 +43,6 @@ private slots: ...@@ -46,8 +43,6 @@ private slots:
void setNewLayerColor(); void setNewLayerColor();
private: private:
toolParameters_t *param; toolParameters_t *param;
QDockWidget *dockWidget; QDockWidget *dockWidget;
int drawColorIndex=0; int drawColorIndex=0;
......
#ifndef TRANSLATIONDOCK_H #ifndef TRANSLATIONDOCK_H
#define TRANSLATIONDOCK_H #define TRANSLATIONDOCK_H
//#include "imageviewer.h"
#include "InteractionTool.h" #include "InteractionTool.h"
#include <QDockWidget> #include <QDockWidget>
#include <QCheckBox> #include <QCheckBox>
...@@ -18,9 +16,7 @@ class TranslationDock : public QObject ...@@ -18,9 +16,7 @@ class TranslationDock : public QObject
Q_OBJECT Q_OBJECT
public: public:
TranslationDock(InteractionTool *interaction); TranslationDock(InteractionTool *interaction);
//void init(ImageViewer *mainWindow);
~TranslationDock(); ~TranslationDock();
//QDockWidget *getDockWidget();
void doTranslationII(toolParameters_t *param); void doTranslationII(toolParameters_t *param);
QDockWidget *createTranslateDock(); QDockWidget *createTranslateDock();
...@@ -38,7 +34,6 @@ private: ...@@ -38,7 +34,6 @@ private:
toolParameters_t *param; toolParameters_t *param;
QDockWidget *dockWidget; QDockWidget *dockWidget;
//ImageViewer *mainWindow;
InteractionTool *interactionTool; InteractionTool *interactionTool;
QCheckBox *mirrorCheckbox; QCheckBox *mirrorCheckbox;
QLineEdit *zoomXInp; QLineEdit *zoomXInp;
......
...@@ -69,16 +69,16 @@ bool ImageViewer::loadFile(const QString &fileName){ ...@@ -69,16 +69,16 @@ bool ImageViewer::loadFile(const QString &fileName){
if (newImage==nullptr){ if (newImage==nullptr){
return false; return false;
} }
hasLayer=true;
return true; return true;
} }
void ImageViewer::setImage(QImage newImage){//remove Parameter void ImageViewer::setImage(QImage newImage){//remove Parameter
image = newImage; image = newImage;
imageLabel->setPixmap(QPixmap::fromImage(image)); imageLabel->setPixmap(QPixmap::fromImage(image));
fitToWindowAct->setEnabled(true); //fitToWindowAct->setEnabled(true);
updateActions(); updateActions();
if (!fitToWindowAct->isChecked()) //if (!fitToWindowAct->isChecked())
imageLabel->adjustSize(); imageLabel->adjustSize();
} }
...@@ -127,7 +127,7 @@ void ImageViewer::open(){ ...@@ -127,7 +127,7 @@ void ImageViewer::open(){
QFileDialog dialog(this, tr("Open File")); QFileDialog dialog(this, tr("Open File"));
initializeImageFileDialog(dialog, QFileDialog::AcceptOpen); initializeImageFileDialog(dialog, QFileDialog::AcceptOpen);
while (dialog.exec() == QDialog::Accepted && !loadFile(dialog.selectedFiles().first())) {} while (dialog.exec() == QDialog::Accepted && !loadFile(dialog.selectedFiles().first())) {}
hasLayer=true;
colorDock->updateColors(); colorDock->updateColors();
layerDock->updateLayerCount(); layerDock->updateLayerCount();
updateVisible(); updateVisible();
...@@ -169,6 +169,7 @@ void ImageViewer::createActions(){ ...@@ -169,6 +169,7 @@ void ImageViewer::createActions(){
QAction *openAct = fileMenu->addAction(tr("&Open..."), this, &ImageViewer::open); QAction *openAct = fileMenu->addAction(tr("&Open..."), this, &ImageViewer::open);
openAct->setShortcut(QKeySequence::Open); openAct->setShortcut(QKeySequence::Open);
saveAsAct = fileMenu->addAction(tr("&Save As..."), this, &ImageViewer::saveAs); saveAsAct = fileMenu->addAction(tr("&Save As..."), this, &ImageViewer::saveAs);
saveAsAct->setShortcut(QKeySequence::Save);
saveAsAct->setEnabled(false); saveAsAct->setEnabled(false);
fileMenu->addSeparator(); fileMenu->addSeparator();
QAction *exitAct = fileMenu->addAction(tr("E&xit"), this, &QWidget::close); QAction *exitAct = fileMenu->addAction(tr("E&xit"), this, &QWidget::close);
...@@ -181,18 +182,16 @@ void ImageViewer::createActions(){ ...@@ -181,18 +182,16 @@ void ImageViewer::createActions(){
zoomOutAct->setShortcut(QKeySequence::ZoomOut); zoomOutAct->setShortcut(QKeySequence::ZoomOut);
zoomOutAct->setEnabled(false); zoomOutAct->setEnabled(false);
normalSizeAct = viewMenu->addAction(tr("&Normal Size"), this, &ImageViewer::normalSize); normalSizeAct = viewMenu->addAction(tr("&Normal Size"), this, &ImageViewer::normalSize);
normalSizeAct->setShortcut(tr("Ctrl+S")); normalSizeAct->setShortcut(tr("Ctrl+0"));
normalSizeAct->setEnabled(false); normalSizeAct->setEnabled(false);
viewMenu->addSeparator();
//fitToWindowAct = viewMenu->addAction(tr("&Fit to Window"), this, &ImageViewer::fitToWindow);
//fitToWindowAct->setEnabled(false);
//fitToWindowAct->setCheckable(true);
//fitToWindowAct->setShortcut(tr("Ctrl+F"));
QMenu *toolMenu = menuBar()->addMenu(tr("&Tools")); QMenu *toolMenu = menuBar()->addMenu(tr("&Tools"));
drawToolAct = toolMenu->addAction(tr("&Draw"), this, &ImageViewer::draw); drawToolAct = toolMenu->addAction(tr("&Draw"), this, &ImageViewer::draw);
drawToolAct->setShortcut(tr("Ctrl+D"));
drawToolAct->setEnabled(false); drawToolAct->setEnabled(false);
newLayerAct = toolMenu->addAction(tr("&New Layer"), this, &ImageViewer::newLayer); newLayerAct = toolMenu->addAction(tr("&New Layer"), this, &ImageViewer::newLayer);
newLayerAct->setShortcut(tr("Ctrl+N"));
translateAct = toolMenu->addAction(tr("&Translate"), this, &ImageViewer::translate); translateAct = toolMenu->addAction(tr("&Translate"), this, &ImageViewer::translate);
translateAct->setShortcut(tr("Ctrl+T"));
translateAct->setEnabled(false); translateAct->setEnabled(false);
makeToShaped = toolMenu->addAction(tr("&Make Shaped"), this, &ImageViewer::makeShaped); makeToShaped = toolMenu->addAction(tr("&Make Shaped"), this, &ImageViewer::makeShaped);
makeToShaped->setEnabled(false); makeToShaped->setEnabled(false);
...@@ -203,9 +202,10 @@ void ImageViewer::createActions(){ ...@@ -203,9 +202,10 @@ void ImageViewer::createActions(){
} }
void ImageViewer::updateActions(){ void ImageViewer::updateActions(){
zoomInAct->setEnabled(!fitToWindowAct->isChecked()); saveAsAct->setEnabled(hasLayer);
zoomOutAct->setEnabled(!fitToWindowAct->isChecked()); zoomInAct->setEnabled(hasLayer);
normalSizeAct->setEnabled(!fitToWindowAct->isChecked()); zoomOutAct->setEnabled(hasLayer);
normalSizeAct->setEnabled(hasLayer);
drawToolAct->setEnabled(hasLayer); drawToolAct->setEnabled(hasLayer);
translateAct->setEnabled(hasLayer); translateAct->setEnabled(hasLayer);
makeToShaped->setEnabled(hasLayer); makeToShaped->setEnabled(hasLayer);
......
#include "InteractionTool.h" #include "InteractionTool.h"
#include "TranslationDock.h" #include "TranslationDock.h"
#include "NewLayerDock.h" #include "NewLayerDock.h"
...@@ -8,6 +9,8 @@ ...@@ -8,6 +9,8 @@
#ifndef IMAGEVIEWER_H #ifndef IMAGEVIEWER_H
#define IMAGEVIEWER_H #define IMAGEVIEWER_H
#include <QMainWindow> #include <QMainWindow>
#include <QImage> #include <QImage>
#include <vector> #include <vector>
...@@ -20,6 +23,18 @@ ...@@ -20,6 +23,18 @@
#include <QLabel> #include <QLabel>
#include <QCheckBox> #include <QCheckBox>
QT_BEGIN_NAMESPACE
class QAction;
class QLabel;
class QMenu;
class QScrollArea;
class QScrollBar;
QT_END_NAMESPACE
//typedef enum drawModus {pencil, lines, notFilledRect, filledRect} drawModus_e;
//! [0]
class ImageViewer : public QMainWindow class ImageViewer : public QMainWindow
{ {
Q_OBJECT Q_OBJECT
...@@ -28,8 +43,15 @@ public: ...@@ -28,8 +43,15 @@ public:
ImageViewer(QWidget *parent = nullptr); ImageViewer(QWidget *parent = nullptr);
bool loadFile(const QString &); bool loadFile(const QString &);
bool getHasLayer(); bool getHasLayer();
//void updateColors();
//void updateLayers();
//void updateLayerCount();
QVector<QRgb> getColorVect(); QVector<QRgb> getColorVect();
public slots:
//void updateVisible();
//void newLayer();
protected: protected:
void mousePressEvent(QMouseEvent *event) override; void mousePressEvent(QMouseEvent *event) override;
void mouseMoveEvent(QMouseEvent *event) override; void mouseMoveEvent(QMouseEvent *event) override;
...@@ -38,6 +60,9 @@ protected: ...@@ -38,6 +60,9 @@ protected:
private slots: private slots:
void open(); void open();
void saveAs(); void saveAs();
//void print();
//void copy();
//void paste();
void zoomIn(); void zoomIn();
void zoomOut(); void zoomOut();
void normalSize(); void normalSize();
...@@ -73,31 +98,46 @@ private: ...@@ -73,31 +98,46 @@ private:
QLabel *imageLabel; QLabel *imageLabel;
QScrollArea *scrollArea; QScrollArea *scrollArea;
QMenu *viewMenu; QMenu *viewMenu;
//QDockWidget *colorDock;
QDockWidget *layerDockW; QDockWidget *layerDockW;
QVector<QRgb> colorVect; QVector<QRgb> colorVect;
QVector<QRgb> newColorVect; QVector<QRgb> newColorVect;
QPixmap *pixmap; QPixmap *pixmap;
//QCheckBox *ignoreShaped;
//QRadioButton *newColormap[4];
QPoint move; QPoint move;
//QPolygon polyVis;
bool moveStart = false; bool moveStart = false;
//bool isNewLayerColor = false;
double scaleFactor = 1.0; double scaleFactor = 1.0;
bool hasLayer=false; bool hasLayer=false;
toolParameters_t *param = nullptr; toolParameters_t *param = nullptr;
InteractionTool *interactionTool; InteractionTool *interactionTool;
QAction *makeToShaped; QAction *makeToShaped;
QAction *drawToolAct; QAction *drawTool;
QAction *newLayerAct; QAction *newLayerAct;
QAction *translateAct; QAction *translateAct;
QAction *drawToolAct;
TranslationDock *transLationDock; TranslationDock *transLationDock;
NewLayerDock *newLayerDock; NewLayerDock *newLayerDock;
DrawDock *drawDock; DrawDock *drawDock;
LayerDock *layerDock; LayerDock *layerDock;
ColorDock *colorDock; ColorDock *colorDock;
/*#ifndef QT_NO_PRINTER
QPrinter printer;
#endif
*/
QAction *saveAsAct; QAction *saveAsAct;
//QAction *printAct;
//QAction *copyAct;
QAction *zoomInAct; QAction *zoomInAct;
QAction *zoomOutAct; QAction *zoomOutAct;
QAction *normalSizeAct; QAction *normalSizeAct;
QAction *fitToWindowAct; QAction *fitToWindowAct;
QAction *showColorsAct; QAction *showColorsAct;
}; };
//! [0]
#endif #endif
...@@ -12,7 +12,6 @@ HEADERS = imageviewer.h \ ...@@ -12,7 +12,6 @@ HEADERS = imageviewer.h \
Picture.h \ Picture.h \
Tool.h \ Tool.h \
TranslationDock.h \ TranslationDock.h \
main.h \
tools/drawTool.h \ tools/drawTool.h \
tools/floydSteinberg.h \ tools/floydSteinberg.h \
tools/merge.h \ tools/merge.h \
......
...@@ -56,16 +56,8 @@ ...@@ -56,16 +56,8 @@
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
QApplication app(argc, argv); QApplication app(argc, argv);
QGuiApplication::setApplicationDisplayName(ImageViewer::tr("Image Viewer")); QGuiApplication::setApplicationDisplayName(ImageViewer::tr("IntelliPhoto"));
QCommandLineParser commandLineParser;
commandLineParser.addHelpOption();
commandLineParser.addPositionalArgument(ImageViewer::tr("[file]"), ImageViewer::tr("Image file to open."));
commandLineParser.process(QCoreApplication::arguments());
ImageViewer imageViewer; ImageViewer imageViewer;
if (!commandLineParser.positionalArguments().isEmpty()
&& !imageViewer.loadFile(commandLineParser.positionalArguments().front())) {
return -1;
}
imageViewer.show(); imageViewer.show();
return app.exec(); return app.exec();
} }
#ifndef MAIN_H
#define MAIN_H
#endif /* !MAIN_H */
...@@ -13,16 +13,10 @@ bool DrawTool::initTool(toolParameters_t *param){ ...@@ -13,16 +13,10 @@ bool DrawTool::initTool(toolParameters_t *param){
} }
bool DrawTool::useTool(){ bool DrawTool::useTool(){
//QPainter painter(pic->getCurrentLayerAsQ());
QImage *tempImage = new QImage(pic->getCurrentLayerAsQ()->width(), pic->getCurrentLayerAsQ()->height(), QImage::Format_ARGB32); QImage *tempImage = new QImage(pic->getCurrentLayerAsQ()->width(), pic->getCurrentLayerAsQ()->height(), QImage::Format_ARGB32);
tempImage->fill(QColor(0,0,0,0)); tempImage->fill(QColor(0,0,0,0));
QPainter painter(tempImage); QPainter painter(tempImage);
QImage *qPic = pic->getCurrentLayer()->qImage; QImage *qPic = pic->getCurrentLayer()->qImage;
/*for(int i = -5; i <= 5; i++){
for(int j = -5; j <= 5; j++){
qPic->setPixel(point+QPoint(i,j),2);
}
}*/
QColor white(255,255,255,255); QColor white(255,255,255,255);
QPen pen(white); QPen pen(white);
pen.setWidth(w); pen.setWidth(w);
......
...@@ -50,8 +50,6 @@ bool MergeTool::useTool(){ ...@@ -50,8 +50,6 @@ bool MergeTool::useTool(){
QImage *p1 = pic->getLayerAsQ(layerIndex1); QImage *p1 = pic->getLayerAsQ(layerIndex1);
QImage *p2 = pic->getLayerAsQ(layerIndex2); QImage *p2 = pic->getLayerAsQ(layerIndex2);
QImage *newPic = new QImage(maxX,maxY,QImage::Format_ARGB32); QImage *newPic = new QImage(maxX,maxY,QImage::Format_ARGB32);
//newPic->fill(QColor(0,0,0,0));
//newPic->setColorTable(pic->getLayerAsQ(layerIndex1)->colorTable());
QPainter painter(newPic); QPainter painter(newPic);
painter.drawImage(p1xa,p1ya,*pic->getLayerAsQ(layerIndex1)); painter.drawImage(p1xa,p1ya,*pic->getLayerAsQ(layerIndex1));
painter.drawImage(p2xa,p2ya,*pic->getLayerAsQ(layerIndex2)); painter.drawImage(p2xa,p2ya,*pic->getLayerAsQ(layerIndex2));
...@@ -87,200 +85,6 @@ bool MergeTool::useTool(){ ...@@ -87,200 +85,6 @@ bool MergeTool::useTool(){
} }
} }
} }
/*int width1;
int height1;
int width2;
int height2;
int w0=0;
int h0=0;
int w2=0;
int h2=0;
int w1=0;
int h1=0;
bool shaped = false;
width1=pic->getLayerAsQ(layerIndex1)->width();
height1=pic->getLayerAsQ(layerIndex1)->height();
width2=pic->getLayerAsQ(layerIndex2)->width();
height2=pic->getLayerAsQ(layerIndex2)->height();
if (pic->xOffset(layerIndex1)>pic->xOffset(layerIndex2)){
w0=pic->xOffset(layerIndex2);
w2=pic->xOffset(layerIndex1);
} else {
w0=pic->xOffset(layerIndex1);
w2=pic->xOffset(layerIndex2);
}
if (pic->yOffset(layerIndex1)>pic->yOffset(layerIndex2)){
h0 = pic->yOffset(layerIndex2);
h2 = pic->yOffset(layerIndex1);
} else {
h0 = pic->yOffset(layerIndex1);
h2 = pic->yOffset(layerIndex2);
}
if (pic->isShaped(layerIndex1)){
shaped= true;
}
if (width1>width2){
w1=width1;
} else {
w1=width2;
}
if (height1>height2){
h1 = height1;
} else {
h1 = height2;
}
//QImage tempImage = QImage(pic->getCurrentLayerAsQ()->width(), pic->getCurrentLayerAsQ()->height(), QImage::Format_ARGB32);
//tempImage.fill(QColor(0,0,0,0));
//QPainter painter(&tempImage);
QImage *newPic = new QImage(w1+w2-w0,h1+h2-h0,QImage::Format_ARGB32);
newPic->fill(QColor(0,0,0,0));
//newPic->setColorTable(pic->getLayerAsQ(layerIndex1)->colorTable());
QPainter painter(newPic);
painter.drawImage(pic->xOffset(layerIndex2)-w0,pic->yOffset(layerIndex2)-h0,*pic->getLayerAsQ(layerIndex2));
painter.drawImage(pic->xOffset(layerIndex1)-w0,pic->yOffset(layerIndex1)-h0,*pic->getLayerAsQ(layerIndex1));
FloydSteiberg fs = FloydSteiberg();
painter.end();
QImage *newPic2 = fs.getIndexed(newPic,pic->getLayerAsQ(layerIndex1)->colorTable());
/*if(width1>width2&&height1<height2){
for (int i = width2; i < w1; i++){
for (int j = height1; j < h1; j++){
newPic2->setPixel(i,j,255);
}
}
shaped=true;
}
if(width1<width2&&height1>height2){
for (int i = width1; i < w1; i++){
for (int j = height2; j < h1; j++){
newPic2->setPixel(i,j,255);
}
}
shaped=true;
}*/
/*int p1xa = pic->xOffset(layerIndex1)-w0;
int p1xe = p1xa+width1;
int p1ya = pic->yOffset(layerIndex1)-h0;
int p1ye = p1ya+height1;
int p2xa = pic->xOffset(layerIndex2)-w0;
int p2xe = p2xa+width2;
int p2ya = pic->yOffset(layerIndex2)-h0;
int p2ye = p2ya+height2;
QImage *p1 = pic->getLayerAsQ(layerIndex1);
QImage *p2 = pic->getLayerAsQ(layerIndex2);
bool s1=pic->isShaped(layerIndex1);
bool s2=pic->isShaped(layerIndex2);
QColor trans(0,0,0,0);
for (int i = 0; i < w1+w2-w0; i++){
for (int j = 0; j < h1+h2-h0; j++){
/*if (newPic->pixelColor(i,j)==trans){
newPic2->setPixel(i,j,255);
shaped=true;
}
if(i<p1xa||i>=p1xe||j<p1ya||j>=p1ye){
if (i<p2xa||i>=p2xe||j<p2ya||j>=p2ye){
newPic2->setPixel(i,j,255);
shaped=true;
} else {
if(s2&&p2->pixelIndex(i-p2xa,j-p2ya)==255){
newPic2->setPixel(i,j,255);
shaped=true;
}
}
} else {
if(i<p2xa||i>=p2xe||j<p2ya||j>=p2ye){
if (s1&&p1->pixelIndex(i-p1xa,j-p1ya)==255){
newPic2->setPixel(i,j,255);
shaped=true;
}
} else {
if (s1&&p1->pixelIndex(i-p1xa,j-p1ya)==255&&s2&&p2->pixelIndex(i-p2xa,j-p2ya)==255){
newPic2->setPixel(i,j,255);
shaped=true;
}
}
}
}
}
//shaped=true;
/*if(width1>width2){
if(height1>height2){
//newPic = new QImage(*pic->getLayerAsQ(layerIndex1));
//newPic->setColorTable(colorVect);
newPic = new QImage(width1,height2,QImage::Format_Indexed8);
newPic->setColorTable(colorVect);
for (int i = 0; i < width1; i++){
for (int j = 0; j < height1; j++){
newPic->setPixel(i,j,pic->getLayerAsQ(layerIndex1)->pixelIndex(i,j));
if(pic->getLayerAsQ(layerIndex1)->pixelIndex(i,j)==255&&(i<=width2&&j<height2)){
newPic->setPixel(i,j,pic->getLayerAsQ(layerIndex2)->pixelIndex(i,j));
}
}
}
} else {
shaped=true;
newPic = new QImage(width1,height2,QImage::Format_Indexed8);
newPic->setColorTable(colorVect);
for (int i = 0; i < width1; i++){
for (int j = 0; j < height1; j++){
newPic->setPixel(i,j,pic->getLayerAsQ(layerIndex1)->pixelIndex(i,j));
if(pic->getLayerAsQ(layerIndex1)->pixelIndex(i,j)==255&&i<=width2){
newPic->setPixel(i,j,pic->getLayerAsQ(layerIndex2)->pixelIndex(i,j));
}
}
for (int j = height1; j < height2; j++){
newPic->setPixel(i,j,pic->getLayerAsQ(layerIndex2)->pixelIndex(i,j));
if (i>=width2){
newPic->setPixel(i,j,255);
}
}
}
}
} else {
if(height1>height2){
newPic = new QImage(width2,height1,QImage::Format_Indexed8);
newPic->setColorTable(colorVect);
shaped=true;
for (int j = 0; j < height1; j++){
for (int i = 0; i < width1; i++){
newPic->setPixel(i,j,pic->getLayerAsQ(layerIndex1)->pixelIndex(i,j));
if(pic->getLayerAsQ(layerIndex1)->pixelIndex(i,j)==255&&j<=height2){
newPic->setPixel(i,j,pic->getLayerAsQ(layerIndex2)->pixelIndex(i,j));
}
}
for (int i = width1; i < width2; i++){
newPic->setPixel(i,j,pic->getLayerAsQ(layerIndex2)->pixelIndex(i,j));
if (j>=height2){
newPic->setPixel(i,j,255);
}
}
}
} else {
newPic = new QImage(width2,height2,QImage::Format_Indexed8);
newPic->setColorTable(colorVect);
for (int i = 0; i < width2; i++){
for (int j = 0; j < height2; j++){
if(i >=width1||j>=height1){
newPic->setPixel(i,j,pic->getLayerAsQ(layerIndex2)->pixelIndex(i,j));
} else {
newPic->setPixel(i,j,pic->getLayerAsQ(layerIndex1)->pixelIndex(i,j));
if(pic->getLayerAsQ(layerIndex1)->pixelIndex(i,j)==255){
newPic->setPixel(i,j,pic->getLayerAsQ(layerIndex2)->pixelIndex(i,j));
}
}
}
}
}
}*/
//QImage *newPic2 = new QImage(newPic->convertToFormat(QImage::Format_Indexed8,colorVect));
pic->addCurrentLayer(newPic2); pic->addCurrentLayer(newPic2);
pic->setCurrentXOffset(xOffset); pic->setCurrentXOffset(xOffset);
pic->setCurrentYOffset(yOffset); pic->setCurrentYOffset(yOffset);
......
...@@ -12,10 +12,6 @@ bool NewLayer::initTool(toolParameters_t *param){ ...@@ -12,10 +12,6 @@ bool NewLayer::initTool(toolParameters_t *param){
} }
bool NewLayer::useTool(){ bool NewLayer::useTool(){
//qPic->convertTo(QImage::Format_Indexed8,Qt::OrderedAlphaDither);
//qPic->convertTo(QImage::Format_ARGB32,Qt::OrderedAlphaDither);
//*qPic = qPic->convertToFormat(QImage::Format_Indexed8, colorVect, Qt::PreferDither);
FloydSteiberg fs = FloydSteiberg(); FloydSteiberg fs = FloydSteiberg();
QImage *qPic2 = fs.getIndexed(qPic,colorVect); QImage *qPic2 = fs.getIndexed(qPic,colorVect);
delete qPic; delete qPic;
......
...@@ -12,16 +12,10 @@ bool PolygonTool::initTool(toolParameters_t *param){ ...@@ -12,16 +12,10 @@ bool PolygonTool::initTool(toolParameters_t *param){
} }
bool PolygonTool::useTool(){ bool PolygonTool::useTool(){
//QPainter painter(pic->getCurrentLayerAsQ());
QImage tempImage = QImage(pic->getCurrentLayerAsQ()->width(), pic->getCurrentLayerAsQ()->height(), QImage::Format_ARGB32); QImage tempImage = QImage(pic->getCurrentLayerAsQ()->width(), pic->getCurrentLayerAsQ()->height(), QImage::Format_ARGB32);
tempImage.fill(QColor(0,0,0,0)); tempImage.fill(QColor(0,0,0,0));
QPainter painter(&tempImage); QPainter painter(&tempImage);
QImage *qPic = pic->getCurrentLayer()->qImage; QImage *qPic = pic->getCurrentLayer()->qImage;
/*for(int i = -5; i <= 5; i++){
for(int j = -5; j <= 5; j++){
qPic->setPixel(point+QPoint(i,j),2);
}
}*/
QBrush pen(QColor(255,255,255,255)); QBrush pen(QColor(255,255,255,255));
painter.setBrush(pen); painter.setBrush(pen);
painter.drawPolygon(poly); painter.drawPolygon(poly);
......
...@@ -12,7 +12,6 @@ bool TranslationTool::initTool(toolParameters_t *param){ ...@@ -12,7 +12,6 @@ bool TranslationTool::initTool(toolParameters_t *param){
bool TranslationTool::useTool(){ bool TranslationTool::useTool(){
QImage *qPic = new QImage(pic->getCurrentLayerAsQ()->transformed(mat)); QImage *qPic = new QImage(pic->getCurrentLayerAsQ()->transformed(mat));
//qPic->setColorTable(colorVect);
bool shaped = pic->isShaped(); bool shaped = pic->isShaped();
int xOffset=pic->currentXOffset(); int xOffset=pic->currentXOffset();
int yOffset=pic->currentYOffset(); int yOffset=pic->currentYOffset();
...@@ -21,7 +20,6 @@ bool TranslationTool::useTool(){ ...@@ -21,7 +20,6 @@ bool TranslationTool::useTool(){
} }
QImage *qPic2 = new QImage(qPic->convertToFormat(QImage::Format_Indexed8,colorVect)); QImage *qPic2 = new QImage(qPic->convertToFormat(QImage::Format_Indexed8,colorVect));
//qPic2->setColorTable(colorVect);
if(isRot){ if(isRot){
QPolygon poly = mat.mapToPolygon(QRect(0,0,pic->getCurrentLayerAsQ()->width(),pic->getCurrentLayerAsQ()->height())); QPolygon poly = mat.mapToPolygon(QRect(0,0,pic->getCurrentLayerAsQ()->width(),pic->getCurrentLayerAsQ()->height()));
int x[4]={poly.point(0).x(),poly.point(1).x(),poly.point(2).x(),poly.point(3).x()}; int x[4]={poly.point(0).x(),poly.point(1).x(),poly.point(2).x(),poly.point(3).x()};
......
...@@ -233,7 +233,6 @@ DIST = /usr/lib/qt/mkspecs/features/spec_pre.prf \ ...@@ -233,7 +233,6 @@ DIST = /usr/lib/qt/mkspecs/features/spec_pre.prf \
../GUI/Picture.h \ ../GUI/Picture.h \
../GUI/Tool.h \ ../GUI/Tool.h \
../GUI/TranslationDock.h \ ../GUI/TranslationDock.h \
../GUI/main.h \
../GUI/tools/drawTool.h \ ../GUI/tools/drawTool.h \
../GUI/tools/floydSteinberg.h \ ../GUI/tools/floydSteinberg.h \
../GUI/tools/merge.h \ ../GUI/tools/merge.h \
...@@ -538,7 +537,7 @@ distdir: FORCE ...@@ -538,7 +537,7 @@ distdir: FORCE
@test -d $(DISTDIR) || mkdir -p $(DISTDIR) @test -d $(DISTDIR) || mkdir -p $(DISTDIR)
$(COPY_FILE) --parents $(DIST) $(DISTDIR)/ $(COPY_FILE) --parents $(DIST) $(DISTDIR)/
$(COPY_FILE) --parents /usr/lib/qt/mkspecs/features/data/dummy.cpp $(DISTDIR)/ $(COPY_FILE) --parents /usr/lib/qt/mkspecs/features/data/dummy.cpp $(DISTDIR)/
$(COPY_FILE) --parents ../GUI/imageviewer.h ../GUI/ColorDock.h ../GUI/DrawDock.h ../GUI/InteractionTool.h ../GUI/LayerDock.h ../GUI/ManipulationTool.h ../GUI/NewLayerDock.h ../GUI/Picture.h ../GUI/Tool.h ../GUI/TranslationDock.h ../GUI/main.h ../GUI/tools/drawTool.h ../GUI/tools/floydSteinberg.h ../GUI/tools/merge.h ../GUI/tools/movetool.h ../GUI/tools/newLayer.h ../GUI/tools/polygon.h ../GUI/tools/translationTool.h $(DISTDIR)/ $(COPY_FILE) --parents ../GUI/imageviewer.h ../GUI/ColorDock.h ../GUI/DrawDock.h ../GUI/InteractionTool.h ../GUI/LayerDock.h ../GUI/ManipulationTool.h ../GUI/NewLayerDock.h ../GUI/Picture.h ../GUI/Tool.h ../GUI/TranslationDock.h ../GUI/tools/drawTool.h ../GUI/tools/floydSteinberg.h ../GUI/tools/merge.h ../GUI/tools/movetool.h ../GUI/tools/newLayer.h ../GUI/tools/polygon.h ../GUI/tools/translationTool.h $(DISTDIR)/
$(COPY_FILE) --parents ../GUI/imageviewer.cpp ../GUI/ColorDock.cpp ../GUI/DrawDock.cpp ../GUI/InteractionTool.cpp ../GUI/LayerDock.cpp ../GUI/ManipulationTool.cpp ../GUI/NewLayerDock.cpp ../GUI/Picture.cpp ../GUI/TranslationDock.cpp ../GUI/main.cpp ../GUI/tools/drawTool.cpp ../GUI/tools/floydSteinberg.cpp ../GUI/tools/merge.cpp ../GUI/tools/movetool.cpp ../GUI/tools/newLayer.cpp ../GUI/tools/polygon.cpp ../GUI/tools/translationTool.cpp $(DISTDIR)/ $(COPY_FILE) --parents ../GUI/imageviewer.cpp ../GUI/ColorDock.cpp ../GUI/DrawDock.cpp ../GUI/InteractionTool.cpp ../GUI/LayerDock.cpp ../GUI/ManipulationTool.cpp ../GUI/NewLayerDock.cpp ../GUI/Picture.cpp ../GUI/TranslationDock.cpp ../GUI/main.cpp ../GUI/tools/drawTool.cpp ../GUI/tools/floydSteinberg.cpp ../GUI/tools/merge.cpp ../GUI/tools/movetool.cpp ../GUI/tools/newLayer.cpp ../GUI/tools/polygon.cpp ../GUI/tools/translationTool.cpp $(DISTDIR)/
......
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment