From c9fef8510a07e245f7ed20301e19c5b6e3cb1cbe Mon Sep 17 00:00:00 2001 From: Alexey_Kor Date: Thu, 6 Dec 2012 22:38:33 +0400 Subject: [PATCH 1/9] added mainWindow class. Working recognized stage --- DiagramRecognizer/DiagramRecognizer.pro | 9 +- DiagramRecognizer/diagramrecognizer.cpp | 14 +- DiagramRecognizer/main.cpp | 11 +- DiagramRecognizer/mainWindow.cpp | 104 +++++++++++++++ DiagramRecognizer/mainWindow.h | 40 ++++++ DiagramRecognizer/mainWindow.ui | 167 ++++++++++++++++++++++++ DiagramRecognizer/output.cpp | 6 +- 7 files changed, 334 insertions(+), 17 deletions(-) create mode 100644 DiagramRecognizer/mainWindow.cpp create mode 100644 DiagramRecognizer/mainWindow.h create mode 100644 DiagramRecognizer/mainWindow.ui diff --git a/DiagramRecognizer/DiagramRecognizer.pro b/DiagramRecognizer/DiagramRecognizer.pro index b75983b..e1cd791 100644 --- a/DiagramRecognizer/DiagramRecognizer.pro +++ b/DiagramRecognizer/DiagramRecognizer.pro @@ -19,7 +19,8 @@ SOURCES += main.cpp\ simpleFormsInitializer.cpp \ recognizers/mixedGesturesManager.cpp \ recognizers/nearestPosGridGesturesManager.cpp \ - recognizers/rectangleGesturesManager.cpp + recognizers/rectangleGesturesManager.cpp \ + mainWindow.cpp HEADERS += \ geometricForms.h \ @@ -35,9 +36,11 @@ HEADERS += \ simpleFormsInitializer.h \ recognizers/mixedGesturesManager.h \ recognizers/nearestPosGridGesturesmanager.h \ - recognizers/rectangleGesturesManager.h + recognizers/rectangleGesturesManager.h \ + mainWindow.h -FORMS += +FORMS += \ + mainWindow.ui OTHER_FILES += \ readme.txt \ diff --git a/DiagramRecognizer/diagramrecognizer.cpp b/DiagramRecognizer/diagramrecognizer.cpp index 5d625c8..811ae99 100644 --- a/DiagramRecognizer/diagramrecognizer.cpp +++ b/DiagramRecognizer/diagramrecognizer.cpp @@ -31,13 +31,13 @@ DiagramRecognizer::DiagramRecognizer(QWidget *parent) : connect(this, SIGNAL(print(PathVector, Bitmap *, FormSegmentator *)), PrintedDiagram, SLOT(draw(PathVector, Bitmap *, FormSegmentator *))); - QGridLayout *gridLayout = new QGridLayout; - gridLayout->addWidget(clearButton, 0, 0); - gridLayout->addWidget(recognizeButton, 1, 0); - gridLayout->addWidget(recognizeImageButton, 2, 0); - gridLayout->addWidget(PrintedDiagram, 1, 1, 3, 1); - gridLayout->setColumnStretch(1, 10); - setLayout(gridLayout); +// QGridLayout *gridLayout = new QGridLayout; +// gridLayout->addWidget(clearButton, 0, 0); +// gridLayout->addWidget(recognizeButton, 1, 0); +// gridLayout->addWidget(recognizeImageButton, 2, 0); +// gridLayout->addWidget(PrintedDiagram, 1, 1, 3, 1); +// gridLayout->setColumnStretch(1, 10); +// setLayout(gridLayout); mRecognized = false; mComponentPoint.setX(-1000); diff --git a/DiagramRecognizer/main.cpp b/DiagramRecognizer/main.cpp index f2203a0..9dd4228 100644 --- a/DiagramRecognizer/main.cpp +++ b/DiagramRecognizer/main.cpp @@ -1,12 +1,11 @@ #include -#include "diagramrecognizer.h" +#include "mainWindow.h" int main(int argc, char *argv[]) { - QApplication a(argc, argv); - DiagramRecognizer widget; - widget.setGeometry(100, 100, 500, 355); - widget.show(); + QApplication a(argc, argv); + mainWindow w; + w.show(); - return a.exec(); + return a.exec(); } diff --git a/DiagramRecognizer/mainWindow.cpp b/DiagramRecognizer/mainWindow.cpp new file mode 100644 index 0000000..664939e --- /dev/null +++ b/DiagramRecognizer/mainWindow.cpp @@ -0,0 +1,104 @@ +#include "mainWindow.h" +#include "ui_mainWindow.h" + +#include "bitmap.h" +#include "formSegmentator.h" +#include "simpleFormsInitializer.h" +#include "recognizers/mixedGesturesManager.h" +#include "output.h" + +#include +#include +#include +#include +#include +#include +#include + +mainWindow::mainWindow(QWidget *parent) : + QMainWindow(parent), + ui(new Ui::mainWindow) +{ + ui->setupUi(this); + + printedDiagram = new Output; + scene = new QGraphicsScene; + scene->addWidget(printedDiagram); + ui->outputView->setScene(scene); + ui->outputView->setFrameStyle(0); + ui->outputView->setAlignment(Qt::AlignLeft | Qt::AlignTop); + ui->outputView->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff); + ui->outputView->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff); + ui->stages->setCurrentIndex(4); + + connect(ui->exitButton, SIGNAL(clicked()), this, SLOT(close())); + connect(ui->clearButton, SIGNAL(clicked()), this, SLOT(clear())); + connect(ui->recButton, SIGNAL(clicked()), this, SLOT(recognize())); + connect(ui->recImButton, SIGNAL(clicked()), this, SLOT(recognizeImage())); + connect(ui->stages, SIGNAL(activated(0)), this, SLOT(showInput())); + + connect(this, SIGNAL(print(PathVector, Bitmap *, FormSegmentator *)), printedDiagram, SLOT(draw(PathVector, Bitmap *, FormSegmentator *))); + + mRecognized = false; + mComponentPoint.setX(-1000); + mComponentPoint.setY(-1000); + mGesturesManager = new MixedGesturesManager(); + mAbstractRecognizer = new AbstractRecognizer(mGesturesManager, + SimpleFormsInitializer::initialForms()); + + this->showFullScreen(); +} + +void mainWindow::clear() +{ + mDiagram.clear(); + mRecognized = false; + mComponentPoint.setX(-10000); + mComponentPoint.setY(-10000); + emit print(mDiagram, mBitmap, mFormSegmentator); +} + +void mainWindow::recognizeImage() +{ + QString fileName = QFileDialog::QFileDialog::getOpenFileName(this, + tr("Recognize image"), ".", + tr("Png files (*.png)")); + mBitmap = new Bitmap(QImage(fileName)); + recognizeDiagram(); + +} + +void mainWindow::recognize() +{ + mBitmap = new Bitmap(mDiagram); + recognizeDiagram(); +} + +void mainWindow::recognizeDiagram() +{ + //mRecognized = true; + mFormSegmentator = new FormSegmentator(mBitmap); + mFormSegmentator->uniteComponents(); + QList objects = mFormSegmentator->getObjects(); + mDiagram.clear(); + foreach (Component const &object, objects) { + PathVector recognizedObject = mAbstractRecognizer->recognizeObject( + object.figure(mBitmap->xLeft(), mBitmap->yUpper())); + mDiagram.append(recognizedObject); + } + foreach (Component const &edge, mFormSegmentator->getEdges()) { + mDiagram.append(edge.figure(mBitmap->xLeft(), mBitmap->yUpper())); + } + emit print(mDiagram, mBitmap, mFormSegmentator); +} + + +void mainWindow::showInput() +{ + ui-> +} + +mainWindow::~mainWindow() +{ + delete ui; +} diff --git a/DiagramRecognizer/mainWindow.h b/DiagramRecognizer/mainWindow.h new file mode 100644 index 0000000..d2339fe --- /dev/null +++ b/DiagramRecognizer/mainWindow.h @@ -0,0 +1,40 @@ +#pragma once + +#include +#include "bitmap.h" +#include "formsegmentator.h" +#include "abstractRecognizer.h" +#include "output.h" + +namespace Ui { +class mainWindow; +} + +class mainWindow : public QMainWindow +{ + Q_OBJECT + +public: + explicit mainWindow(QWidget *parent = 0); + ~mainWindow(); + +public slots: + void clear(); + void recognize(); + void recognizeImage(); + void showInput(); +signals: + void print(PathVector mDiagram, Bitmap * mBitmap, FormSegmentator *mFormSegmentator); + +private: + Output *printedDiagram; + Ui::mainWindow *ui; + void recognizeDiagram(); + PathVector mDiagram; + Bitmap * mBitmap; + FormSegmentator *mFormSegmentator; + bool mRecognized; + QPoint mComponentPoint; + GesturesManager *mGesturesManager; + AbstractRecognizer *mAbstractRecognizer; +}; diff --git a/DiagramRecognizer/mainWindow.ui b/DiagramRecognizer/mainWindow.ui new file mode 100644 index 0000000..7f083ce --- /dev/null +++ b/DiagramRecognizer/mainWindow.ui @@ -0,0 +1,167 @@ + + + mainWindow + + + + 0 + 0 + 800 + 600 + + + + MainWindow + + + + + + + + + + + Clear + + + + + + + Recognize + + + + + + + Recognize image + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + + Input + + + + + Vectorization + + + + + Dividing + + + + + Uniting + + + + + Recognizing + + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + Exit + + + + + + + + + + + + + + + + 0 + 0 + 800 + 21 + + + + + + + + diff --git a/DiagramRecognizer/output.cpp b/DiagramRecognizer/output.cpp index 4223b82..0d9992c 100644 --- a/DiagramRecognizer/output.cpp +++ b/DiagramRecognizer/output.cpp @@ -1,4 +1,3 @@ - #include #include "output.h" @@ -13,6 +12,11 @@ Output::Output(QWidget *parent) mRecognized = false; } +//void Output::showBitmap() +//{ +// addItem(*mBitmap); +//} + void Output::draw(PathVector RecognizedDiagram, Bitmap *newBitmap, FormSegmentator *newFormSegmentator) { mBitmap = newBitmap; From 51131d9173df81321beee67da414fa5204638195 Mon Sep 17 00:00:00 2001 From: Alexey_Kor Date: Sat, 16 Feb 2013 18:17:38 +0400 Subject: [PATCH 2/9] working input and rec stage --- DiagramRecognizer/mainWindow.cpp | 71 ++++++++++++++++++++++++++++++-- DiagramRecognizer/mainWindow.h | 12 +++++- 2 files changed, 78 insertions(+), 5 deletions(-) diff --git a/DiagramRecognizer/mainWindow.cpp b/DiagramRecognizer/mainWindow.cpp index 664939e..cb93e91 100644 --- a/DiagramRecognizer/mainWindow.cpp +++ b/DiagramRecognizer/mainWindow.cpp @@ -23,7 +23,6 @@ mainWindow::mainWindow(QWidget *parent) : printedDiagram = new Output; scene = new QGraphicsScene; - scene->addWidget(printedDiagram); ui->outputView->setScene(scene); ui->outputView->setFrameStyle(0); ui->outputView->setAlignment(Qt::AlignLeft | Qt::AlignTop); @@ -35,7 +34,7 @@ mainWindow::mainWindow(QWidget *parent) : connect(ui->clearButton, SIGNAL(clicked()), this, SLOT(clear())); connect(ui->recButton, SIGNAL(clicked()), this, SLOT(recognize())); connect(ui->recImButton, SIGNAL(clicked()), this, SLOT(recognizeImage())); - connect(ui->stages, SIGNAL(activated(0)), this, SLOT(showInput())); + connect(ui->stages, SIGNAL(activated(int)), this, SLOT(showStage(int))); connect(this, SIGNAL(print(PathVector, Bitmap *, FormSegmentator *)), printedDiagram, SLOT(draw(PathVector, Bitmap *, FormSegmentator *))); @@ -63,7 +62,9 @@ void mainWindow::recognizeImage() QString fileName = QFileDialog::QFileDialog::getOpenFileName(this, tr("Recognize image"), ".", tr("Png files (*.png)")); + inputImage = new QGraphicsPixmapItem(QPixmap::fromImage(QImage(fileName))); mBitmap = new Bitmap(QImage(fileName)); + mBitmap2 = new Bitmap(QImage(fileName)); recognizeDiagram(); } @@ -71,6 +72,7 @@ void mainWindow::recognizeImage() void mainWindow::recognize() { mBitmap = new Bitmap(mDiagram); + mBitmap2 = new Bitmap(mDiagram); recognizeDiagram(); } @@ -90,12 +92,75 @@ void mainWindow::recognizeDiagram() mDiagram.append(edge.figure(mBitmap->xLeft(), mBitmap->yUpper())); } emit print(mDiagram, mBitmap, mFormSegmentator); + + scene->addItem(inputImage); + scene->addWidget(printedDiagram); + clearScene(); + showInput(); } +void mainWindow::showStage(int index) +{ + switch(index) + { + case 0: + showInput(); + break; + case 1: + showBitmap(); + break; +// case 2: +// b=10; +// break; +// case 3: +// b=11; +// break; + case 4: + showRecStage(); + break; + } + +} void mainWindow::showInput() { - ui-> + clearScene(); + inputImage->setVisible(true); + emit print(mDiagram, mBitmap, mFormSegmentator); +} + +void mainWindow::showRecStage() +{ + clearScene(); + printedDiagram->setVisible(true); +} + +void mainWindow::showBitmap() +{/* + scene->clear(); + //scene->addWidget(printedDiagram); + //emit clear(); + QPainter painter(ui->outputView); + painter.begin(ui->outputView); + painter.isActive() + QPen pen(QColor(100,100,100)); + pen.setWidth(1); + painter.setPen(QColor(100,100,100)); + painter.setBrush(QColor(100,100,100)); + for(int i = 0; i<10; i++) + for(int j = 0; j<5; j++) + { + painter.drawPoint(i,j); + }*/ + +} + +void mainWindow::clearScene() +{ + if(inputImage->isVisible()) + inputImage->setVisible(false); + if(printedDiagram->isVisible()) + printedDiagram->setVisible(false); } mainWindow::~mainWindow() diff --git a/DiagramRecognizer/mainWindow.h b/DiagramRecognizer/mainWindow.h index d2339fe..135ef28 100644 --- a/DiagramRecognizer/mainWindow.h +++ b/DiagramRecognizer/mainWindow.h @@ -5,6 +5,8 @@ #include "formsegmentator.h" #include "abstractRecognizer.h" #include "output.h" +#include +#include namespace Ui { class mainWindow; @@ -22,19 +24,25 @@ public slots: void clear(); void recognize(); void recognizeImage(); - void showInput(); + void showStage(int); signals: void print(PathVector mDiagram, Bitmap * mBitmap, FormSegmentator *mFormSegmentator); private: + void showInput(); + void showRecStage(); + void showBitmap(); + void clearScene(); Output *printedDiagram; Ui::mainWindow *ui; void recognizeDiagram(); PathVector mDiagram; - Bitmap * mBitmap; + Bitmap * mBitmap, * mBitmap2; FormSegmentator *mFormSegmentator; bool mRecognized; QPoint mComponentPoint; GesturesManager *mGesturesManager; AbstractRecognizer *mAbstractRecognizer; + QGraphicsScene *scene; + QGraphicsPixmapItem *inputImage; }; From d33e0c5208fcf627164828c5e24d9825e2619f6f Mon Sep 17 00:00:00 2001 From: Alexey_Kor Date: Sun, 17 Feb 2013 19:27:35 +0400 Subject: [PATCH 3/9] beta graphic output --- DiagramRecognizer/bitmap.h | 2 +- DiagramRecognizer/mainWindow.cpp | 51 +++++++++++++------------------- DiagramRecognizer/mainWindow.h | 9 +++--- DiagramRecognizer/mainWindow.ui | 5 ---- DiagramRecognizer/output.cpp | 29 ++++++++++++++---- DiagramRecognizer/output.h | 5 +++- 6 files changed, 54 insertions(+), 47 deletions(-) diff --git a/DiagramRecognizer/bitmap.h b/DiagramRecognizer/bitmap.h index 7d19f5a..4fd0ac3 100644 --- a/DiagramRecognizer/bitmap.h +++ b/DiagramRecognizer/bitmap.h @@ -16,7 +16,7 @@ class Bitmap : public QList > int yLower() const; Component rasterizedDiagram() const; -private: +public: void rasterizeDiagram(); void rasterizeSegment(int x1, int y1, int x2, int y2); void setLower(); diff --git a/DiagramRecognizer/mainWindow.cpp b/DiagramRecognizer/mainWindow.cpp index cb93e91..97f9875 100644 --- a/DiagramRecognizer/mainWindow.cpp +++ b/DiagramRecognizer/mainWindow.cpp @@ -36,7 +36,7 @@ mainWindow::mainWindow(QWidget *parent) : connect(ui->recImButton, SIGNAL(clicked()), this, SLOT(recognizeImage())); connect(ui->stages, SIGNAL(activated(int)), this, SLOT(showStage(int))); - connect(this, SIGNAL(print(PathVector, Bitmap *, FormSegmentator *)), printedDiagram, SLOT(draw(PathVector, Bitmap *, FormSegmentator *))); + connect(this, SIGNAL(print(PathVector, Bitmap *, FormSegmentator *, int)), printedDiagram, SLOT(draw(PathVector, Bitmap *, FormSegmentator *, int))); mRecognized = false; mComponentPoint.setX(-1000); @@ -50,11 +50,11 @@ mainWindow::mainWindow(QWidget *parent) : void mainWindow::clear() { - mDiagram.clear(); + clearScene(); mRecognized = false; mComponentPoint.setX(-10000); mComponentPoint.setY(-10000); - emit print(mDiagram, mBitmap, mFormSegmentator); + emit print(mDiagram, mBitmap, mFormSegmentator, 4); } void mainWindow::recognizeImage() @@ -91,7 +91,7 @@ void mainWindow::recognizeDiagram() foreach (Component const &edge, mFormSegmentator->getEdges()) { mDiagram.append(edge.figure(mBitmap->xLeft(), mBitmap->yUpper())); } - emit print(mDiagram, mBitmap, mFormSegmentator); + emit print(mDiagram, mBitmap, mFormSegmentator, 4); scene->addItem(inputImage); scene->addWidget(printedDiagram); @@ -109,14 +109,11 @@ void mainWindow::showStage(int index) case 1: showBitmap(); break; -// case 2: -// b=10; -// break; -// case 3: -// b=11; -// break; - case 4: - showRecStage(); + case 2: + showComponents(); + break; + case 3: + showUniStage(); break; } @@ -126,33 +123,27 @@ void mainWindow::showInput() { clearScene(); inputImage->setVisible(true); - emit print(mDiagram, mBitmap, mFormSegmentator); } -void mainWindow::showRecStage() +void mainWindow::showUniStage() { clearScene(); + emit print(mDiagram, mBitmap, mFormSegmentator, 4); printedDiagram->setVisible(true); } void mainWindow::showBitmap() -{/* - scene->clear(); - //scene->addWidget(printedDiagram); - //emit clear(); - QPainter painter(ui->outputView); - painter.begin(ui->outputView); - painter.isActive() - QPen pen(QColor(100,100,100)); - pen.setWidth(1); - painter.setPen(QColor(100,100,100)); - painter.setBrush(QColor(100,100,100)); - for(int i = 0; i<10; i++) - for(int j = 0; j<5; j++) - { - painter.drawPoint(i,j); - }*/ +{ + clearScene(); + emit print(mDiagram, mBitmap, mFormSegmentator, 2); + printedDiagram->setVisible(true); +} +void mainWindow::showComponents() +{ + clearScene(); + emit print(mDiagram, mBitmap, mFormSegmentator, 3); + printedDiagram->setVisible(true); } void mainWindow::clearScene() diff --git a/DiagramRecognizer/mainWindow.h b/DiagramRecognizer/mainWindow.h index 135ef28..22444b9 100644 --- a/DiagramRecognizer/mainWindow.h +++ b/DiagramRecognizer/mainWindow.h @@ -26,14 +26,16 @@ public slots: void recognizeImage(); void showStage(int); signals: - void print(PathVector mDiagram, Bitmap * mBitmap, FormSegmentator *mFormSegmentator); + void print(PathVector mDiagram, Bitmap * mBitmap, FormSegmentator *mFormSegmentator, int stageNum); private: void showInput(); - void showRecStage(); + void showUniStage(); void showBitmap(); + void showComponents(); void clearScene(); - Output *printedDiagram; + QGraphicsPixmapItem *inputImage; + Output *printedDiagram, ; Ui::mainWindow *ui; void recognizeDiagram(); PathVector mDiagram; @@ -44,5 +46,4 @@ public slots: GesturesManager *mGesturesManager; AbstractRecognizer *mAbstractRecognizer; QGraphicsScene *scene; - QGraphicsPixmapItem *inputImage; }; diff --git a/DiagramRecognizer/mainWindow.ui b/DiagramRecognizer/mainWindow.ui index 7f083ce..6004381 100644 --- a/DiagramRecognizer/mainWindow.ui +++ b/DiagramRecognizer/mainWindow.ui @@ -75,11 +75,6 @@ Uniting - - - Recognizing - - diff --git a/DiagramRecognizer/output.cpp b/DiagramRecognizer/output.cpp index 0d9992c..40c6642 100644 --- a/DiagramRecognizer/output.cpp +++ b/DiagramRecognizer/output.cpp @@ -17,11 +17,12 @@ Output::Output(QWidget *parent) // addItem(*mBitmap); //} -void Output::draw(PathVector RecognizedDiagram, Bitmap *newBitmap, FormSegmentator *newFormSegmentator) +void Output::draw(PathVector RecognizedDiagram, Bitmap *newBitmap, FormSegmentator *newFormSegmentator, int stageNum) { mBitmap = newBitmap; mDiagram = RecognizedDiagram; mFormSegmentator = newFormSegmentator; + stage = stageNum; this->update(); } @@ -59,9 +60,15 @@ void Output::mouseReleaseEvent(QMouseEvent * event) void Output::paintEvent(QPaintEvent *paintEvent) { QPainter painter(this); + QTime time = QTime::currentTime(); + qsrand((uint)time.msec()); //for showing components foreach(PointVector const &scetch, mDiagram) { for (int i = 1; i < scetch.size(); i ++) { QPen pen(Qt::black); + if(stage == 2 || stage == 4) + pen.setColor(Qt::black); + else if(stage == 3) + pen.setColor(QColor::fromRgb(randInt(0,255), randInt(0,255), randInt(0,255))); pen.setWidth(3); if ((scetch.at(0) - scetch.back()).manhattanLength() <= 4) { painter.setPen(pen); @@ -69,13 +76,18 @@ void Output::paintEvent(QPaintEvent *paintEvent) } else { - pen.setColor(Qt::red); + if(stage == 2) + pen.setColor(Qt::black); + else if(stage == 3) + pen.setColor(QColor::fromRgb(randInt(0,255), randInt(0,255), randInt(0,255))); + else if(stage == 4) + pen.setColor(Qt::red); painter.setPen(pen); painter.drawLine(scetch.at(0), scetch.back()); } } } - if (!mRecognized) { + /*if (!mRecognized) { return; } int xLeft = mBitmap->xLeft(); @@ -101,12 +113,12 @@ void Output::paintEvent(QPaintEvent *paintEvent) for (int j = 1 ; j < width / wStep; j++) { painter.drawLine(xLeft + j * wStep, yUpper, xLeft + j * wStep, yUpper + height); - } + }*/ } void Output::drawDiagram(const Component &component, const QColor &color, QPainter *painter) { - int xLeft = mBitmap->xLeft(); + /*int xLeft = mBitmap->xLeft(); int yUpper = mBitmap->yUpper(); QPen pen(color); pen.setWidth(4); @@ -117,5 +129,10 @@ void Output::drawDiagram(const Component &component, const QColor &color, QPaint yUpper + pos.second * hStep, wStep, hStep); painter->drawRect(rect); - } + }*/ +} + +int Output::randInt(int low, int high) +{ + return qrand() % ((high + 1) - low) + low; } diff --git a/DiagramRecognizer/output.h b/DiagramRecognizer/output.h index e467329..d726827 100644 --- a/DiagramRecognizer/output.h +++ b/DiagramRecognizer/output.h @@ -5,6 +5,7 @@ #include "bitmap.h" #include "formsegmentator.h" #include +#include class Output : public QWidget { @@ -14,7 +15,7 @@ class Output : public QWidget explicit Output(QWidget *parent = 0); public slots: - void draw(PathVector RecognizedDiagram, Bitmap * newBitmap, FormSegmentator *newFormSegmentator); + void draw(PathVector RecognizedDiagram, Bitmap * newBitmap, FormSegmentator *newFormSegmentator, int stageNum); protected: void mousePressEvent(QMouseEvent *); @@ -26,8 +27,10 @@ public slots: void drawDiagram(Component const &diagram, QColor const &color, QPainter *painter); + int randInt(int low, int high); PathVector mDiagram; Bitmap * mBitmap; + int stage; bool mLeftButtonPressed; bool mRecognized; FormSegmentator *mFormSegmentator; From 36c9cebf9c66019a7f26ecaa0f1d6c7590a36c59 Mon Sep 17 00:00:00 2001 From: Alexey_Kor Date: Mon, 18 Feb 2013 01:05:24 +0400 Subject: [PATCH 4/9] remove some lines --- DiagramRecognizer/mainWindow.cpp | 2 -- DiagramRecognizer/mainWindow.h | 4 ++-- DiagramRecognizer/output.cpp | 15 +++++---------- 3 files changed, 7 insertions(+), 14 deletions(-) diff --git a/DiagramRecognizer/mainWindow.cpp b/DiagramRecognizer/mainWindow.cpp index 97f9875..4bf758a 100644 --- a/DiagramRecognizer/mainWindow.cpp +++ b/DiagramRecognizer/mainWindow.cpp @@ -64,7 +64,6 @@ void mainWindow::recognizeImage() tr("Png files (*.png)")); inputImage = new QGraphicsPixmapItem(QPixmap::fromImage(QImage(fileName))); mBitmap = new Bitmap(QImage(fileName)); - mBitmap2 = new Bitmap(QImage(fileName)); recognizeDiagram(); } @@ -72,7 +71,6 @@ void mainWindow::recognizeImage() void mainWindow::recognize() { mBitmap = new Bitmap(mDiagram); - mBitmap2 = new Bitmap(mDiagram); recognizeDiagram(); } diff --git a/DiagramRecognizer/mainWindow.h b/DiagramRecognizer/mainWindow.h index 22444b9..92e4db5 100644 --- a/DiagramRecognizer/mainWindow.h +++ b/DiagramRecognizer/mainWindow.h @@ -35,11 +35,11 @@ public slots: void showComponents(); void clearScene(); QGraphicsPixmapItem *inputImage; - Output *printedDiagram, ; + Output *printedDiagram; Ui::mainWindow *ui; void recognizeDiagram(); PathVector mDiagram; - Bitmap * mBitmap, * mBitmap2; + Bitmap * mBitmap; FormSegmentator *mFormSegmentator; bool mRecognized; QPoint mComponentPoint; diff --git a/DiagramRecognizer/output.cpp b/DiagramRecognizer/output.cpp index 40c6642..adab0bd 100644 --- a/DiagramRecognizer/output.cpp +++ b/DiagramRecognizer/output.cpp @@ -12,11 +12,6 @@ Output::Output(QWidget *parent) mRecognized = false; } -//void Output::showBitmap() -//{ -// addItem(*mBitmap); -//} - void Output::draw(PathVector RecognizedDiagram, Bitmap *newBitmap, FormSegmentator *newFormSegmentator, int stageNum) { mBitmap = newBitmap; @@ -61,7 +56,7 @@ void Output::paintEvent(QPaintEvent *paintEvent) { QPainter painter(this); QTime time = QTime::currentTime(); - qsrand((uint)time.msec()); //for showing components + qsrand((uint)time.msec()); //for random colours generation foreach(PointVector const &scetch, mDiagram) { for (int i = 1; i < scetch.size(); i ++) { QPen pen(Qt::black); @@ -87,7 +82,7 @@ void Output::paintEvent(QPaintEvent *paintEvent) } } } - /*if (!mRecognized) { + if (!mRecognized) { return; } int xLeft = mBitmap->xLeft(); @@ -113,12 +108,12 @@ void Output::paintEvent(QPaintEvent *paintEvent) for (int j = 1 ; j < width / wStep; j++) { painter.drawLine(xLeft + j * wStep, yUpper, xLeft + j * wStep, yUpper + height); - }*/ + } } void Output::drawDiagram(const Component &component, const QColor &color, QPainter *painter) { - /*int xLeft = mBitmap->xLeft(); + int xLeft = mBitmap->xLeft(); int yUpper = mBitmap->yUpper(); QPen pen(color); pen.setWidth(4); @@ -129,7 +124,7 @@ void Output::drawDiagram(const Component &component, const QColor &color, QPaint yUpper + pos.second * hStep, wStep, hStep); painter->drawRect(rect); - }*/ + } } int Output::randInt(int low, int high) From a4f29957cb10715f0346c45bf77bee86e9211695 Mon Sep 17 00:00:00 2001 From: Alexey_Kor Date: Mon, 18 Feb 2013 01:14:24 +0400 Subject: [PATCH 5/9] deleted diagramRecognizer.cpp/.h (replaced them with mainWindow.cpp/.h) --- DiagramRecognizer/DiagramRecognizer.pro | 2 - DiagramRecognizer/diagramrecognizer.cpp | 92 ------------------------- DiagramRecognizer/diagramrecognizer.h | 31 --------- 3 files changed, 125 deletions(-) delete mode 100644 DiagramRecognizer/diagramrecognizer.cpp delete mode 100644 DiagramRecognizer/diagramrecognizer.h diff --git a/DiagramRecognizer/DiagramRecognizer.pro b/DiagramRecognizer/DiagramRecognizer.pro index e1cd791..907144c 100644 --- a/DiagramRecognizer/DiagramRecognizer.pro +++ b/DiagramRecognizer/DiagramRecognizer.pro @@ -14,7 +14,6 @@ SOURCES += main.cpp\ bitmap.cpp \ output.cpp \ component.cpp \ - diagramRecognizer.cpp \ formSegmentator.cpp \ simpleFormsInitializer.cpp \ recognizers/mixedGesturesManager.cpp \ @@ -31,7 +30,6 @@ HEADERS += \ component.h \ figure.h \ edge.h \ - diagramRecognizer.h \ formSegmentator.h \ simpleFormsInitializer.h \ recognizers/mixedGesturesManager.h \ diff --git a/DiagramRecognizer/diagramrecognizer.cpp b/DiagramRecognizer/diagramrecognizer.cpp deleted file mode 100644 index 811ae99..0000000 --- a/DiagramRecognizer/diagramrecognizer.cpp +++ /dev/null @@ -1,92 +0,0 @@ -#include "diagramRecognizer.h" -#include "bitmap.h" -#include "formSegmentator.h" -#include "simpleFormsInitializer.h" -#include "recognizers/mixedGesturesManager.h" -#include "output.h" - -#include -#include -#include -#include -#include -#include -#include - -DiagramRecognizer::DiagramRecognizer(QWidget *parent) : - QWidget(parent) -{ - QPushButton *clearButton = new QPushButton(tr("Clear")); - clearButton->setFont(QFont("Times", 18, QFont::Bold)); - QPushButton *recognizeButton = new QPushButton(tr("Recognize")); - recognizeButton->setFont(QFont("Times", 18, QFont::Bold)); - QPushButton *recognizeImageButton = new QPushButton(tr("Recognize Image")); - recognizeImageButton->setFont(QFont("Times", 18, QFont::Bold)); - - Output *PrintedDiagram = new Output; - - connect(clearButton, SIGNAL(clicked()), this, SLOT(clear())); - connect(recognizeButton, SIGNAL(clicked()), this, SLOT(recognize())); - connect(recognizeImageButton, SIGNAL(clicked()), this, SLOT(recognizeImage())); - - connect(this, SIGNAL(print(PathVector, Bitmap *, FormSegmentator *)), PrintedDiagram, SLOT(draw(PathVector, Bitmap *, FormSegmentator *))); - -// QGridLayout *gridLayout = new QGridLayout; -// gridLayout->addWidget(clearButton, 0, 0); -// gridLayout->addWidget(recognizeButton, 1, 0); -// gridLayout->addWidget(recognizeImageButton, 2, 0); -// gridLayout->addWidget(PrintedDiagram, 1, 1, 3, 1); -// gridLayout->setColumnStretch(1, 10); -// setLayout(gridLayout); - - mRecognized = false; - mComponentPoint.setX(-1000); - mComponentPoint.setY(-1000); - mGesturesManager = new MixedGesturesManager(); - mAbstractRecognizer = new AbstractRecognizer(mGesturesManager, - SimpleFormsInitializer::initialForms()); -} - -void DiagramRecognizer::clear()//чистит все -{ - mDiagram.clear(); - mRecognized = false; - mComponentPoint.setX(-10000); - mComponentPoint.setY(-10000); - emit print(mDiagram, mBitmap, mFormSegmentator); -} - -void DiagramRecognizer::recognizeImage() -{ - QString fileName = QFileDialog::QFileDialog::getOpenFileName(this, - tr("Recognize image"), ".", - tr("Png files (*.png)")); - mBitmap = new Bitmap(QImage(fileName)); - recognizeDiagram(); - -} - -void DiagramRecognizer::recognize() -{ - mBitmap = new Bitmap(mDiagram); - recognizeDiagram(); -} - -void DiagramRecognizer::recognizeDiagram() -{ - //mRecognized = true; - mFormSegmentator = new FormSegmentator(mBitmap); - mFormSegmentator->uniteComponents(); - QList objects = mFormSegmentator->getObjects(); - mDiagram.clear(); - foreach (Component const &object, objects) { - PathVector recognizedObject = mAbstractRecognizer->recognizeObject( - object.figure(mBitmap->xLeft(), mBitmap->yUpper())); - mDiagram.append(recognizedObject); - } - foreach (Component const &edge, mFormSegmentator->getEdges()) { - mDiagram.append(edge.figure(mBitmap->xLeft(), mBitmap->yUpper())); - } - emit print(mDiagram, mBitmap, mFormSegmentator); -} - diff --git a/DiagramRecognizer/diagramrecognizer.h b/DiagramRecognizer/diagramrecognizer.h deleted file mode 100644 index 4940a1e..0000000 --- a/DiagramRecognizer/diagramrecognizer.h +++ /dev/null @@ -1,31 +0,0 @@ -#pragma once -#include "bitmap.h" -#include "formsegmentator.h" -#include "abstractRecognizer.h" -#include - - -class DiagramRecognizer : public QWidget -{ - Q_OBJECT - -public: - explicit DiagramRecognizer(QWidget *parent = 0); - -public slots: - void clear(); - void recognize(); - void recognizeImage(); -signals: - void print(PathVector mDiagram, Bitmap * mBitmap, FormSegmentator *mFormSegmentator); - -private: - void recognizeDiagram(); - PathVector mDiagram; - Bitmap * mBitmap; - FormSegmentator *mFormSegmentator; - bool mRecognized; - QPoint mComponentPoint; - GesturesManager *mGesturesManager; - AbstractRecognizer *mAbstractRecognizer; -}; From c34cad417e0de5aef712d18235ec19033a2b0632 Mon Sep 17 00:00:00 2001 From: Alexey Date: Tue, 5 Mar 2013 22:17:43 +0400 Subject: [PATCH 6/9] Renamed some files. mainWindow->diagramMainWindow, formsegmentator->formSegmentator, mixedgesturesmanager- >mixedGesturesManager, nearestposgridgesturesmanager- >nearestPosGridGesturesManager, rectanglegesturemanager- >rectangleGesturesManager, simpleforminitializer->simpleFormInitializer --- DiagramRecognizer/DiagramRecognizer.pro | 4 +- .../{mainWindow.cpp => diagramMainWIndow.cpp} | 2 +- .../{mainWindow.h => diagramMainWindow.h} | 2 +- DiagramRecognizer/formSegmentator.h | 32 ++++++++++ .../recognizers/mixedGesturesManager.h | 58 +++++++++++++++++++ .../nearestPosGridGesturesManager.h | 13 +++++ .../recognizers/rectangleGesturesManager.h | 13 +++++ DiagramRecognizer/simpleFormsInitializer.h | 9 +++ 8 files changed, 129 insertions(+), 4 deletions(-) rename DiagramRecognizer/{mainWindow.cpp => diagramMainWIndow.cpp} (99%) rename DiagramRecognizer/{mainWindow.h => diagramMainWindow.h} (97%) create mode 100644 DiagramRecognizer/formSegmentator.h create mode 100644 DiagramRecognizer/recognizers/mixedGesturesManager.h create mode 100644 DiagramRecognizer/recognizers/nearestPosGridGesturesManager.h create mode 100644 DiagramRecognizer/recognizers/rectangleGesturesManager.h create mode 100644 DiagramRecognizer/simpleFormsInitializer.h diff --git a/DiagramRecognizer/DiagramRecognizer.pro b/DiagramRecognizer/DiagramRecognizer.pro index 907144c..51d1e00 100644 --- a/DiagramRecognizer/DiagramRecognizer.pro +++ b/DiagramRecognizer/DiagramRecognizer.pro @@ -19,7 +19,7 @@ SOURCES += main.cpp\ recognizers/mixedGesturesManager.cpp \ recognizers/nearestPosGridGesturesManager.cpp \ recognizers/rectangleGesturesManager.cpp \ - mainWindow.cpp + diagramMainWIndow.cpp HEADERS += \ geometricForms.h \ @@ -35,7 +35,7 @@ HEADERS += \ recognizers/mixedGesturesManager.h \ recognizers/nearestPosGridGesturesmanager.h \ recognizers/rectangleGesturesManager.h \ - mainWindow.h + diagramMainWindow.h FORMS += \ mainWindow.ui diff --git a/DiagramRecognizer/mainWindow.cpp b/DiagramRecognizer/diagramMainWIndow.cpp similarity index 99% rename from DiagramRecognizer/mainWindow.cpp rename to DiagramRecognizer/diagramMainWIndow.cpp index 4bf758a..664147f 100644 --- a/DiagramRecognizer/mainWindow.cpp +++ b/DiagramRecognizer/diagramMainWIndow.cpp @@ -1,4 +1,4 @@ -#include "mainWindow.h" +#include "diagramMainWindow.h" #include "ui_mainWindow.h" #include "bitmap.h" diff --git a/DiagramRecognizer/mainWindow.h b/DiagramRecognizer/diagramMainWindow.h similarity index 97% rename from DiagramRecognizer/mainWindow.h rename to DiagramRecognizer/diagramMainWindow.h index 92e4db5..ff100fe 100644 --- a/DiagramRecognizer/mainWindow.h +++ b/DiagramRecognizer/diagramMainWindow.h @@ -2,7 +2,7 @@ #include #include "bitmap.h" -#include "formsegmentator.h" +#include "formSegmentator.h" #include "abstractRecognizer.h" #include "output.h" #include diff --git a/DiagramRecognizer/formSegmentator.h b/DiagramRecognizer/formSegmentator.h new file mode 100644 index 0000000..a014804 --- /dev/null +++ b/DiagramRecognizer/formSegmentator.h @@ -0,0 +1,32 @@ +#pragma once +#include "bitmap.h" + +class FormSegmentator +{ +public: + FormSegmentator(Bitmap *bitmap); + + //further follows new methods + void analyze(QList &objects, QList &edges); + void uniteComponents(); + QList getAllComponents() const; + QList getObjects() const; + QList getEdges() const; + Component component(QPoint const &point) const; + +private: + void uniteCorners(); + void uniteSmoothFigure(); + void uniteCornersWithEdges(); + QList > findCycle(QList > const &polygon); + bool contains(QList > const &polygon, int i) const; + int neighbourPos(const SquarePos &pos, int diagramNum) const; + void analyzeBitmap(); + void initComponent(int x, int y); + bool isMergedDiagrams(int i, int j, + bool isBeginDiagram1, bool isBeginDiagram2); + + Component *mCurrentDiagram; + Bitmap *mBitmap; + QList mAllComponents; +}; diff --git a/DiagramRecognizer/recognizers/mixedGesturesManager.h b/DiagramRecognizer/recognizers/mixedGesturesManager.h new file mode 100644 index 0000000..31b5bb9 --- /dev/null +++ b/DiagramRecognizer/recognizers/mixedGesturesManager.h @@ -0,0 +1,58 @@ +#pragma once +#include "abstractRecognizer.h" +#include "geometricForms.h" + +class MixedGesturesManager : public GesturesRecognizer +{ +public: + MixedGesturesManager(); + double maxDistance(QString const &) const; + bool isMultistroke() const; + double distance(MixedKey const & key1, + MixedKey const & key2) const; + MixedKey key(PathVector const &path) const; +}; + +class MixedClassifier +{ +public: + MixedClassifier(const PathVector &path) + { + MixedGesturesManager gManager; + mKey = gManager.key(path); + } + + MixedClassifier(){} + + double distance(const MixedClassifier &classifier) + { + MixedKey key = classifier.key(); + MixedGesturesManager gManager; + return gManager.distance(key, mKey); + } + MixedClassifier getPoint(MixedClassifier const & centre, double centreWeight) + { + double * key1 = centre.key().first; + double * key2 = centre.key().second; + double * finalKey1 = new double[gridSize * gridSize]; + double * finalKey2 = new double[gridSize * gridSize]; + for (int i = 0; i < gridSize * gridSize; i ++) + { + finalKey1[i] = (key1[i] * centreWeight + mKey.first[i]) / (centreWeight + 1); + finalKey2[i] = (key2[i] * centreWeight + mKey.second[i]) / (centreWeight + 1); + } + return MixedClassifier(MixedKey(finalKey1, finalKey2)); + } + + MixedKey key() const + { + return mKey; + } + +private: + MixedClassifier(MixedKey const & key) + { + mKey = key; + } + MixedKey mKey; +}; diff --git a/DiagramRecognizer/recognizers/nearestPosGridGesturesManager.h b/DiagramRecognizer/recognizers/nearestPosGridGesturesManager.h new file mode 100644 index 0000000..b5a448d --- /dev/null +++ b/DiagramRecognizer/recognizers/nearestPosGridGesturesManager.h @@ -0,0 +1,13 @@ +#pragma once +#include "abstractRecognizer.h" +#include "geometricForms.h" + +class NearestPosGridGesturesManager : public GesturesRecognizer +{ +public: + NearestPosGridGesturesManager(); + double maxDistance(QString const &objectName) const; + bool isMultistroke() const; + double distance(double * const &key1, double * const &key2) const; + double * key(PathVector const &path) const; +}; diff --git a/DiagramRecognizer/recognizers/rectangleGesturesManager.h b/DiagramRecognizer/recognizers/rectangleGesturesManager.h new file mode 100644 index 0000000..c34f2e9 --- /dev/null +++ b/DiagramRecognizer/recognizers/rectangleGesturesManager.h @@ -0,0 +1,13 @@ +#pragma once +#include "abstractRecognizer.h" +#include "geometricForms.h" + +class RectangleGesturesManager : public GesturesRecognizer +{ +public: + RectangleGesturesManager(); + double maxDistance(QString const &objectName) const; + bool isMultistroke() const; + double distance(double * const & key1, double * const & key2) const; + double * key(PathVector const & path) const; +}; diff --git a/DiagramRecognizer/simpleFormsInitializer.h b/DiagramRecognizer/simpleFormsInitializer.h new file mode 100644 index 0000000..3dfee95 --- /dev/null +++ b/DiagramRecognizer/simpleFormsInitializer.h @@ -0,0 +1,9 @@ +#pragma once +#include "geometricForms.h" + +class SimpleFormsInitializer +{ +public: + static QMap initialForms(); +}; + From 6d76d579693cbc1a84fb18b29168ed9ebfb5d903 Mon Sep 17 00:00:00 2001 From: Alexey Date: Tue, 5 Mar 2013 22:19:19 +0400 Subject: [PATCH 7/9] renamed some files. added deleted files --- DiagramRecognizer/formsegmentator.h | 32 ---------- DiagramRecognizer/output.h | 2 +- .../recognizers/mixedgesturesmanager.h | 58 ------------------- .../nearestposgridgesturesmanager.h | 13 ----- .../recognizers/rectanglegesturesmanager.h | 13 ----- DiagramRecognizer/simpleformsinitializer.h | 9 --- 6 files changed, 1 insertion(+), 126 deletions(-) delete mode 100644 DiagramRecognizer/formsegmentator.h delete mode 100644 DiagramRecognizer/recognizers/mixedgesturesmanager.h delete mode 100644 DiagramRecognizer/recognizers/nearestposgridgesturesmanager.h delete mode 100644 DiagramRecognizer/recognizers/rectanglegesturesmanager.h delete mode 100644 DiagramRecognizer/simpleformsinitializer.h diff --git a/DiagramRecognizer/formsegmentator.h b/DiagramRecognizer/formsegmentator.h deleted file mode 100644 index a014804..0000000 --- a/DiagramRecognizer/formsegmentator.h +++ /dev/null @@ -1,32 +0,0 @@ -#pragma once -#include "bitmap.h" - -class FormSegmentator -{ -public: - FormSegmentator(Bitmap *bitmap); - - //further follows new methods - void analyze(QList &objects, QList &edges); - void uniteComponents(); - QList getAllComponents() const; - QList getObjects() const; - QList getEdges() const; - Component component(QPoint const &point) const; - -private: - void uniteCorners(); - void uniteSmoothFigure(); - void uniteCornersWithEdges(); - QList > findCycle(QList > const &polygon); - bool contains(QList > const &polygon, int i) const; - int neighbourPos(const SquarePos &pos, int diagramNum) const; - void analyzeBitmap(); - void initComponent(int x, int y); - bool isMergedDiagrams(int i, int j, - bool isBeginDiagram1, bool isBeginDiagram2); - - Component *mCurrentDiagram; - Bitmap *mBitmap; - QList mAllComponents; -}; diff --git a/DiagramRecognizer/output.h b/DiagramRecognizer/output.h index d726827..481638a 100644 --- a/DiagramRecognizer/output.h +++ b/DiagramRecognizer/output.h @@ -3,7 +3,7 @@ #include "component.h" #include #include "bitmap.h" -#include "formsegmentator.h" +#include "formSegmentator.h" #include #include diff --git a/DiagramRecognizer/recognizers/mixedgesturesmanager.h b/DiagramRecognizer/recognizers/mixedgesturesmanager.h deleted file mode 100644 index 31b5bb9..0000000 --- a/DiagramRecognizer/recognizers/mixedgesturesmanager.h +++ /dev/null @@ -1,58 +0,0 @@ -#pragma once -#include "abstractRecognizer.h" -#include "geometricForms.h" - -class MixedGesturesManager : public GesturesRecognizer -{ -public: - MixedGesturesManager(); - double maxDistance(QString const &) const; - bool isMultistroke() const; - double distance(MixedKey const & key1, - MixedKey const & key2) const; - MixedKey key(PathVector const &path) const; -}; - -class MixedClassifier -{ -public: - MixedClassifier(const PathVector &path) - { - MixedGesturesManager gManager; - mKey = gManager.key(path); - } - - MixedClassifier(){} - - double distance(const MixedClassifier &classifier) - { - MixedKey key = classifier.key(); - MixedGesturesManager gManager; - return gManager.distance(key, mKey); - } - MixedClassifier getPoint(MixedClassifier const & centre, double centreWeight) - { - double * key1 = centre.key().first; - double * key2 = centre.key().second; - double * finalKey1 = new double[gridSize * gridSize]; - double * finalKey2 = new double[gridSize * gridSize]; - for (int i = 0; i < gridSize * gridSize; i ++) - { - finalKey1[i] = (key1[i] * centreWeight + mKey.first[i]) / (centreWeight + 1); - finalKey2[i] = (key2[i] * centreWeight + mKey.second[i]) / (centreWeight + 1); - } - return MixedClassifier(MixedKey(finalKey1, finalKey2)); - } - - MixedKey key() const - { - return mKey; - } - -private: - MixedClassifier(MixedKey const & key) - { - mKey = key; - } - MixedKey mKey; -}; diff --git a/DiagramRecognizer/recognizers/nearestposgridgesturesmanager.h b/DiagramRecognizer/recognizers/nearestposgridgesturesmanager.h deleted file mode 100644 index b5a448d..0000000 --- a/DiagramRecognizer/recognizers/nearestposgridgesturesmanager.h +++ /dev/null @@ -1,13 +0,0 @@ -#pragma once -#include "abstractRecognizer.h" -#include "geometricForms.h" - -class NearestPosGridGesturesManager : public GesturesRecognizer -{ -public: - NearestPosGridGesturesManager(); - double maxDistance(QString const &objectName) const; - bool isMultistroke() const; - double distance(double * const &key1, double * const &key2) const; - double * key(PathVector const &path) const; -}; diff --git a/DiagramRecognizer/recognizers/rectanglegesturesmanager.h b/DiagramRecognizer/recognizers/rectanglegesturesmanager.h deleted file mode 100644 index c34f2e9..0000000 --- a/DiagramRecognizer/recognizers/rectanglegesturesmanager.h +++ /dev/null @@ -1,13 +0,0 @@ -#pragma once -#include "abstractRecognizer.h" -#include "geometricForms.h" - -class RectangleGesturesManager : public GesturesRecognizer -{ -public: - RectangleGesturesManager(); - double maxDistance(QString const &objectName) const; - bool isMultistroke() const; - double distance(double * const & key1, double * const & key2) const; - double * key(PathVector const & path) const; -}; diff --git a/DiagramRecognizer/simpleformsinitializer.h b/DiagramRecognizer/simpleformsinitializer.h deleted file mode 100644 index 3dfee95..0000000 --- a/DiagramRecognizer/simpleformsinitializer.h +++ /dev/null @@ -1,9 +0,0 @@ -#pragma once -#include "geometricForms.h" - -class SimpleFormsInitializer -{ -public: - static QMap initialForms(); -}; - From 26fe0a6b54df32e597dbaac9c2d41869727ecd73 Mon Sep 17 00:00:00 2001 From: Alexey Date: Tue, 5 Mar 2013 22:28:06 +0400 Subject: [PATCH 8/9] small fix changed name of mainWindow in code in main.cpp --- DiagramRecognizer/main.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DiagramRecognizer/main.cpp b/DiagramRecognizer/main.cpp index 9dd4228..8bab19e 100644 --- a/DiagramRecognizer/main.cpp +++ b/DiagramRecognizer/main.cpp @@ -1,5 +1,5 @@ #include -#include "mainWindow.h" +#include "diagramMainWindow.h" int main(int argc, char *argv[]) { From 460ecc7a4183744936cf51bce3a9c9ae82315a91 Mon Sep 17 00:00:00 2001 From: AlexeyKor Date: Wed, 6 Mar 2013 14:47:16 +0400 Subject: [PATCH 9/9] Renamed some files. paintmanager->paintManager, mixedgesturesmanager.cpp- >mixedGesturesManager.cpp, nearestposgridgesturesmanager.cpp- >nearestPosGridGesturesManager.cpp, rectanglegesturesmanager.cpp- >rectangleGesturesManager.cpp --- DiagramRecognizer/abstractRecognizer.h | 2 +- DiagramRecognizer/{paintmanager.cpp => paintManager.cpp} | 0 DiagramRecognizer/{paintmanager.h => paintManager.h} | 0 .../{mixedgesturesmanager.cpp => mixedGesturesManager.cpp} | 0 ...ridgesturesmanager.cpp => nearestPosGridGesturesManager.cpp} | 0 ...ectanglegesturesmanager.cpp => rectangleGesturesManager.cpp} | 0 6 files changed, 1 insertion(+), 1 deletion(-) rename DiagramRecognizer/{paintmanager.cpp => paintManager.cpp} (100%) rename DiagramRecognizer/{paintmanager.h => paintManager.h} (100%) rename DiagramRecognizer/recognizers/{mixedgesturesmanager.cpp => mixedGesturesManager.cpp} (100%) rename DiagramRecognizer/recognizers/{nearestposgridgesturesmanager.cpp => nearestPosGridGesturesManager.cpp} (100%) rename DiagramRecognizer/recognizers/{rectanglegesturesmanager.cpp => rectangleGesturesManager.cpp} (100%) diff --git a/DiagramRecognizer/abstractRecognizer.h b/DiagramRecognizer/abstractRecognizer.h index 2e0cb3a..22d1fb6 100644 --- a/DiagramRecognizer/abstractRecognizer.h +++ b/DiagramRecognizer/abstractRecognizer.h @@ -4,7 +4,7 @@ #include #include #include "geometricForms.h" -#include "paintmanager.h" +#include "paintManager.h" class GesturesManager { diff --git a/DiagramRecognizer/paintmanager.cpp b/DiagramRecognizer/paintManager.cpp similarity index 100% rename from DiagramRecognizer/paintmanager.cpp rename to DiagramRecognizer/paintManager.cpp diff --git a/DiagramRecognizer/paintmanager.h b/DiagramRecognizer/paintManager.h similarity index 100% rename from DiagramRecognizer/paintmanager.h rename to DiagramRecognizer/paintManager.h diff --git a/DiagramRecognizer/recognizers/mixedgesturesmanager.cpp b/DiagramRecognizer/recognizers/mixedGesturesManager.cpp similarity index 100% rename from DiagramRecognizer/recognizers/mixedgesturesmanager.cpp rename to DiagramRecognizer/recognizers/mixedGesturesManager.cpp diff --git a/DiagramRecognizer/recognizers/nearestposgridgesturesmanager.cpp b/DiagramRecognizer/recognizers/nearestPosGridGesturesManager.cpp similarity index 100% rename from DiagramRecognizer/recognizers/nearestposgridgesturesmanager.cpp rename to DiagramRecognizer/recognizers/nearestPosGridGesturesManager.cpp diff --git a/DiagramRecognizer/recognizers/rectanglegesturesmanager.cpp b/DiagramRecognizer/recognizers/rectangleGesturesManager.cpp similarity index 100% rename from DiagramRecognizer/recognizers/rectanglegesturesmanager.cpp rename to DiagramRecognizer/recognizers/rectangleGesturesManager.cpp