[Lprof-devel] lprof/src/lprofqt figureeditor.cpp, 1.3.2.2, 1.3.2.3 griditem.cpp, 1.4.2.2, 1.4.2.3 i
Brought to you by:
hvengel
Menu
▾
▴
[Lprof-devel] lprof/src/lprofqt figureeditor.cpp, 1.3.2.2, 1.3.2.3 griditem.cpp, 1.4.2.2, 1.4.2.3 imageitem.cpp, 1.4.2.3, 1.4.2.4 lprofmain.cpp, 1.188.2.2, 1.188.2.3 lprofmain.h, 1.52.2.2, 1.52.2.3
|
From: Amit K. <ami...@us...> - 2009-06-23 19:31:01
|
Update of /cvsroot/lprof/lprof/src/lprofqt In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv9879/lprofqt Modified Files: Tag: GSoC-2009 figureeditor.cpp griditem.cpp imageitem.cpp lprofmain.cpp lprofmain.h Log Message: Index: imageitem.cpp =================================================================== RCS file: /cvsroot/lprof/lprof/src/lprofqt/imageitem.cpp,v retrieving revision 1.4.2.3 retrieving revision 1.4.2.4 diff -C2 -d -r1.4.2.3 -r1.4.2.4 *** imageitem.cpp 17 Jun 2009 02:59:42 -0000 1.4.2.3 --- imageitem.cpp 23 Jun 2009 19:30:36 -0000 1.4.2.4 *************** *** 119,126 **** ImageItem::ImageItem(QString ImageFile, const QString Monitor, const QString Scanner, QGraphicsScene *canvas ) ! : QGraphicsRectItem(0,0,400,400), image() { ! canvas->addRect(rect()); ! // qDebug("ImageItem::ImageItem"); lProof = FALSE; Reload(ImageFile, Monitor, Scanner, canvas); --- 119,125 ---- ImageItem::ImageItem(QString ImageFile, const QString Monitor, const QString Scanner, QGraphicsScene *canvas ) ! : QGraphicsRectItem( 0, canvas ), image() { ! //qDebug("ImageItem::ImageItem"); lProof = FALSE; Reload(ImageFile, Monitor, Scanner, canvas); *************** *** 129,133 **** void ImageItem::Reload(QString ImageFile, const QString Monitor, const QString Scanner, QGraphicsScene *canvas ) //changed by me from Q3Canvas to QGraphicsScene { - // qDebug("ImageItem::Reload"); --- 128,131 ---- *************** *** 261,268 **** } - QImage scaled = image.smoothScale(canvas->width(), canvas->height()); ! setRect ((qreal)0, (qreal)0, scaled.width(), scaled.height()); sx = (double) image.width() / scaled.width(); sy = (double) image.height() / scaled.height(); --- 259,265 ---- } QImage scaled = image.smoothScale(canvas->width(), canvas->height()); ! setRect(0, 0, scaled.width(), scaled.width()); sx = (double) image.width() / scaled.width(); sy = (double) image.height() / scaled.height(); *************** *** 283,307 **** } - QImage pscaled = image.smoothScale(canvas->width(), canvas->height()); proof.convertFromImage(pscaled); ! setPos((qreal) 0, (qreal) 0); setZValue(5); show(); - - if (lProof) - canvas -> addPixmap(proof); - else - canvas -> addPixmap(pixmap); - // qDebug("ImageItem::Reload Done"); } ! ! void ImageItem::drawShape( QPainter &p ) { ! // qDebug("ImageItem::drawShape"); ! p.drawPixmap( int(x()), int(y()), lProof? proof : pixmap ); } - --- 280,295 ---- } QImage pscaled = image.smoothScale(canvas->width(), canvas->height()); proof.convertFromImage(pscaled); ! setPos(0,0); setZValue(5); show(); // qDebug("ImageItem::Reload Done"); } ! void ImageItem::paint(QPainter *p, const QStyleOptionGraphicsItem *, QWidget *) { ! //qDebug("ImageItem::paint"); ! p->drawPixmap(0, 0, lProof? proof : pixmap); } Index: lprofmain.cpp =================================================================== RCS file: /cvsroot/lprof/lprof/src/lprofqt/lprofmain.cpp,v retrieving revision 1.188.2.2 retrieving revision 1.188.2.3 diff -C2 -d -r1.188.2.2 -r1.188.2.3 *** lprofmain.cpp 16 Jun 2009 07:26:25 -0000 1.188.2.2 --- lprofmain.cpp 23 Jun 2009 19:30:36 -0000 1.188.2.3 *************** *** 98,101 **** --- 98,102 ---- #include <QListView> #include <QListWidget> + #include <QGraphicsItem> #include "ui_lprofmainbase.h" Index: griditem.cpp =================================================================== RCS file: /cvsroot/lprof/lprof/src/lprofqt/griditem.cpp,v retrieving revision 1.4.2.2 retrieving revision 1.4.2.3 diff -C2 -d -r1.4.2.2 -r1.4.2.3 *** griditem.cpp 16 Jun 2009 07:26:25 -0000 1.4.2.2 --- griditem.cpp 23 Jun 2009 19:30:36 -0000 1.4.2.3 *************** *** 41,45 **** GridItem::GridItem( QGraphicsScene *canvas, QString Template, int SafeFrame ) ! : QGraphicsRectItem( (qreal)10, (qreal)10, canvas->width() - 10, canvas->height() - 10, (QGraphicsItem *)canvas) { // qDebug("GridItem::GridItem"); --- 41,45 ---- GridItem::GridItem( QGraphicsScene *canvas, QString Template, int SafeFrame ) ! : QGraphicsRectItem( 10.0, 10.0, canvas->width() - 10, canvas->height() - 10, 0, canvas) { // qDebug("GridItem::GridItem"); *************** *** 133,141 **** ! void GridItem::drawShape( QPainter &p ) { QRect OurViewport; ! // qDebug("GridItem::drawShape"); ComputeViewport(OurViewport, 1.0, 1.0); --- 133,141 ---- ! void GridItem::paint(QPainter *p, const QStyleOptionGraphicsItem *, QWidget *) { QRect OurViewport; ! // qDebug("GridItem::paint"); ComputeViewport(OurViewport, 1.0, 1.0); *************** *** 155,160 **** // p.drawRect(Frame); ! p.setPen( Qt::green ); ! p.drawRect(HotZone); } // end for } // enf if --- 155,160 ---- // p.drawRect(Frame); ! p->setPen( Qt::green ); ! p->drawRect(HotZone); } // end for } // enf if *************** *** 163,190 **** // clicks to add a mark ! p.setPen( Qt::red ); // upper right corner only draw the corner mark of the user has clicked if (Marks.ur_x<measure_view_H && Marks.ur_y>0) { ! p.drawLine(Marks.ur_x, Marks.ur_y, Marks.ur_x - 50, Marks.ur_y); ! p.drawLine(Marks.ur_x, Marks.ur_y, Marks.ur_x, Marks.ur_y + 50); } // upper left corner if (Marks.ul_x>0 && Marks.ul_y>0) { ! p.drawLine(Marks.ul_x, Marks.ul_y, Marks.ul_x + 50, Marks.ul_y); ! p.drawLine(Marks.ul_x, Marks.ul_y, Marks.ul_x, Marks.ul_y + 50); } // lower right corner if (Marks.lr_x>0 && Marks.lr_y<measure_view_V) { ! p.drawLine(Marks.lr_x, Marks.lr_y, Marks.lr_x - 50, Marks.lr_y); ! p.drawLine(Marks.lr_x, Marks.lr_y, Marks.lr_x, Marks.lr_y - 50); } // lower left corner if (Marks.ll_x<measure_view_H && Marks.ll_y<measure_view_V) { ! p.drawLine(Marks.ll_x, Marks.ll_y, Marks.ll_x + 50, Marks.ll_y); ! p.drawLine(Marks.ll_x, Marks.ll_y, Marks.ll_x, Marks.ll_y - 50); } } --- 163,190 ---- // clicks to add a mark ! p->setPen( Qt::red ); // upper right corner only draw the corner mark of the user has clicked if (Marks.ur_x<measure_view_H && Marks.ur_y>0) { ! p->drawLine(Marks.ur_x, Marks.ur_y, Marks.ur_x - 50, Marks.ur_y); ! p->drawLine(Marks.ur_x, Marks.ur_y, Marks.ur_x, Marks.ur_y + 50); } // upper left corner if (Marks.ul_x>0 && Marks.ul_y>0) { ! p->drawLine(Marks.ul_x, Marks.ul_y, Marks.ul_x + 50, Marks.ul_y); ! p->drawLine(Marks.ul_x, Marks.ul_y, Marks.ul_x, Marks.ul_y + 50); } // lower right corner if (Marks.lr_x>0 && Marks.lr_y<measure_view_V) { ! p->drawLine(Marks.lr_x, Marks.lr_y, Marks.lr_x - 50, Marks.lr_y); ! p->drawLine(Marks.lr_x, Marks.lr_y, Marks.lr_x, Marks.lr_y - 50); } // lower left corner if (Marks.ll_x<measure_view_H && Marks.ll_y<measure_view_V) { ! p->drawLine(Marks.ll_x, Marks.ll_y, Marks.ll_x + 50, Marks.ll_y); ! p->drawLine(Marks.ll_x, Marks.ll_y, Marks.ll_x, Marks.ll_y - 50); } } Index: figureeditor.cpp =================================================================== RCS file: /cvsroot/lprof/lprof/src/lprofqt/figureeditor.cpp,v retrieving revision 1.3.2.2 retrieving revision 1.3.2.3 diff -C2 -d -r1.3.2.2 -r1.3.2.3 *** figureeditor.cpp 16 Jun 2009 07:26:25 -0000 1.3.2.2 --- figureeditor.cpp 23 Jun 2009 19:30:36 -0000 1.3.2.3 *************** *** 50,84 **** } ! void FigureEditor::contentsMousePressEvent(QMouseEvent* e) { maindialog.zeroProgressBars(); if (!SelectWPpatch) ! {// qDebug("FigureEditor::contentsMousePressEvent"); ! if (e->x()<measure_view_H/2 && e->y()<measure_view_V/2) { // upper left quadrant ! Marks.ul_x=e->x(); ! Marks.ul_y=e->y(); } ! else if (e->x()>measure_view_H/2 && e->y()<measure_view_V/2) { // upper right quadrant ! Marks.ur_x=e->x(); ! Marks.ur_y=e->y(); } ! else if (e->x()>measure_view_H/2 && e->y()>measure_view_V/2) { // lower right quadrant ! Marks.lr_x=e->x(); ! Marks.lr_y=e->y(); } ! else if (e->x()<measure_view_H/2 && e->y()>measure_view_V/2) { // lower left quadrant ! Marks.ll_x=e->x(); ! Marks.ll_y=e->y(); } - // place corner markers to give user feed back that the corner has been marked --- 50,85 ---- } ! void FigureEditor::mousePressEvent(QMouseEvent* e) { + QPointF point= mapToScene(QPoint(e->x(),e->y())); //calculate point at scene from point of viewport + maindialog.zeroProgressBars(); if (!SelectWPpatch) ! { //qDebug("FigureEditor::contentsMousePressEvent"); ! if (point.x()<measure_view_H/2 && point.y()<measure_view_V/2) { // upper left quadrant ! Marks.ul_x=point.x(); ! Marks.ul_y=point.y(); } ! else if (point.x()>measure_view_H/2 && point.y()<measure_view_V/2) { // upper right quadrant ! Marks.ur_x=point.x(); ! Marks.ur_y=point.y(); } ! else if (point.x()>measure_view_H/2 && point.y()>measure_view_V/2) { // lower right quadrant ! Marks.lr_x=point.x(); ! Marks.lr_y=point.y(); } ! else if (point.x()<measure_view_H/2 && point.y()>measure_view_V/2) { // lower left quadrant ! Marks.ll_x=point.x(); ! Marks.ll_y=point.y(); } // place corner markers to give user feed back that the corner has been marked *************** *** 107,111 **** { // store location and create 0 size rectangle ! WPHotZone.setCoords(e->x(), e->y(), e->x(), e->y()); // Mark the location on screen FIXME --- 108,112 ---- { // store location and create 0 size rectangle ! WPHotZone.setCoords(point.x(), point.y(), point.x(), point.y()); // Mark the location on screen FIXME *************** *** 115,131 **** else { ! int xsize = abs(e->x()- WPHotZone.x()); ! int ysize = abs(e->y() - WPHotZone.y()); ! if (e->y() < WPHotZone.y()) { // need to swap WPHotZone.setBottom(WPHotZone.y()); ! WPHotZone.setY(e->y()); } ! if (e->x() < WPHotZone.x()) { // need to swap WPHotZone.setRight(WPHotZone.top()); ! WPHotZone.setX(e->x()); } WPHotZone.setWidth(xsize); --- 116,132 ---- else { ! int xsize = abs(point.x()- WPHotZone.x()); ! int ysize = abs(point.y() - WPHotZone.y()); ! if (point.y() < WPHotZone.y()) { // need to swap WPHotZone.setBottom(WPHotZone.y()); ! WPHotZone.setY(point.y()); } ! if (point.x() < WPHotZone.x()) { // need to swap WPHotZone.setRight(WPHotZone.top()); ! WPHotZone.setX(point.x()); } WPHotZone.setWidth(xsize); *************** *** 158,160 **** unshearing = NULL; } - --- 159,160 ---- Index: lprofmain.h =================================================================== RCS file: /cvsroot/lprof/lprof/src/lprofqt/lprofmain.h,v retrieving revision 1.52.2.2 retrieving revision 1.52.2.3 diff -C2 -d -r1.52.2.2 -r1.52.2.3 *** lprofmain.h 16 Jun 2009 07:26:25 -0000 1.52.2.2 --- lprofmain.h 23 Jun 2009 19:30:36 -0000 1.52.2.3 *************** *** 207,211 **** QGraphicsScene *canvas ); ! int rtti () const { return imageRTTI; } void Reload(QString ImageFile, --- 207,211 ---- QGraphicsScene *canvas ); ! int type () const { return imageRTTI; } void Reload(QString ImageFile, *************** *** 221,225 **** protected: ! void drawShape( QPainter & ); void TransformImage(const QString OutputProfile, const QString InputProfile, --- 221,225 ---- protected: ! void paint(QPainter *, const QStyleOptionGraphicsItem *, QWidget *); void TransformImage(const QString OutputProfile, const QString InputProfile, *************** *** 261,276 **** protected: ! int ScaleX(int n) ! { ! QRectF w; ! w=rect (); ! return (int) ((double) (n * (w.width())) / LAYOUT_MAX); ! } ! int ScaleY(int n) ! { ! QRectF h; ! h=rect(); ! return (int) ((double) (n * (h.height())) / LAYOUT_MAX); ! } void ComputePatchRects(QRect& OurViewport, --- 261,266 ---- protected: ! int ScaleX(int n) { return (int) ((double) (n * (rect().width())) / LAYOUT_MAX); } ! int ScaleY(int n) { return (int) ((double) (n * (rect().height())) / LAYOUT_MAX); } void ComputePatchRects(QRect& OurViewport, *************** *** 280,284 **** void ComputeViewport(QRect& OurViewport, double sx, double sy); ! void drawShape(QPainter & ); }; --- 270,274 ---- void ComputeViewport(QRect& OurViewport, double sx, double sy); ! void paint(QPainter *, const QStyleOptionGraphicsItem *, QWidget *); }; *************** *** 343,358 **** public: ! FigureEditor(lprofMain &main_dialog, QGraphicsScene& c, QWidget* parent=0, const char* name=0, Qt::WFlags f=0) : QGraphicsView(&c,parent), maindialog(main_dialog) ! { ! ! QString str = QString(QLatin1String(name)) ; ! setObjectName(str); ! setWindowFlags(f); ! } void clear(); void resizeEvent( QResizeEvent* e ); protected: ! void contentsMousePressEvent(QMouseEvent*); signals: --- 333,346 ---- public: ! FigureEditor(lprofMain &main_dialog, QGraphicsScene& c, QWidget* parent=0, const char* name=0, Qt::WFlags f=0) : QGraphicsView(&c,parent), maindialog(main_dialog) ! { ! setObjectName(QString(QLatin1String(name))); ! setWindowFlags(f); ! } void clear(); void resizeEvent( QResizeEvent* e ); protected: ! void mousePressEvent(QMouseEvent*); signals: |
