[Lprof-devel] lprof/src/lprofqt config.cpp, 1.8.2.1, 1.8.2.2 figureeditor.cpp, 1.3.2.1, 1.3.2.2 gri
Brought to you by:
hvengel
Menu
▾
▴
[Lprof-devel] lprof/src/lprofqt config.cpp, 1.8.2.1, 1.8.2.2 figureeditor.cpp, 1.3.2.1, 1.3.2.2 griditem.cpp, 1.4.2.1, 1.4.2.2 imageitem.cpp, 1.4.2.1, 1.4.2.2 lprofmain-priv.cpp, 1.4.2.1, 1.4.2.2 lprofmain-priv.h, 1.6.2.1, 1.6.2.2 lprofmain.cpp, 1.188.2.1, 1.188.2.2 lprofmain.h, 1.52.2.1, 1.52.2.2 lprofmainbase.ui, 1.50.2.1, 1.50.2.2 slots.cpp, 1.5.2.1, 1.5.2.2
|
From: Amit K. <ami...@us...> - 2009-06-16 07:26:31
|
Update of /cvsroot/lprof/lprof/src/lprofqt In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv20776/lprof/src/lprofqt Modified Files: Tag: GSoC-2009 config.cpp figureeditor.cpp griditem.cpp imageitem.cpp lprofmain-priv.cpp lprofmain-priv.h lprofmain.cpp lprofmain.h lprofmainbase.ui slots.cpp Log Message: Index: slots.cpp =================================================================== RCS file: /cvsroot/lprof/lprof/src/lprofqt/slots.cpp,v retrieving revision 1.5.2.1 retrieving revision 1.5.2.2 diff -C2 -d -r1.5.2.1 -r1.5.2.2 *** slots.cpp 9 Jun 2009 12:25:25 -0000 1.5.2.1 --- slots.cpp 16 Jun 2009 07:26:25 -0000 1.5.2.2 *************** *** 146,152 **** Canvas); ! //changed by me ------------------------------------------------------------------- ! //Canvas->setChanged(rect()); ! Canvas->update(rect()); //added by me in place of Canvas->setChanged(rect());--------------------------------- Canvas->update(); ControlsToValues(); --- 146,150 ---- Canvas); ! Canvas->update(rect()); Canvas->update(); ControlsToValues(); *************** *** 623,640 **** { case 0: ! //ui->textEditProfileParms->insertParagraph(verb1, 3); //removed by me ===================================== ! ui->textEditProfileParms->append(verb1); //added by me ==================================== break; case 1: - //ui->textEditProfileParms->insertParagraph(verb2, 3); ui->textEditProfileParms->append(verb2); break; case 2: - //ui->textEditProfileParms->insertParagraph(verb3, 3); ui->textEditProfileParms->append(verb3); break; } ! //ui->textEditProfileParms->insertParagraph(reg, 4); ! ui->textEditProfileParms->append(reg); //added by me===================================== if (sys.lOptRGCV) --- 621,634 ---- { case 0: ! ui->textEditProfileParms->append(verb1); break; case 1: ui->textEditProfileParms->append(verb2); break; case 2: ui->textEditProfileParms->append(verb3); break; } ! ui->textEditProfileParms->append(reg); if (sys.lOptRGCV) *************** *** 643,650 **** Buff = QString::fromLocal8Bit(" ") + manSm + Buff.sprintf(" %i" ,sys.RsplSmoothness); - //ui->textEditProfileParms->insertParagraph(Buff, 5); ui->textEditProfileParms->append(Buff); - //ui->textEditProfileParms->insertParagraph(VC, 6); ui->textEditProfileParms->append(VC); --- 637,642 ---- *************** *** 652,683 **** { case 0: - //ui->textEditProfileParms->insertParagraph(capav4,7); ui->textEditProfileParms->append(capav4); break; case 1: - //ui->textEditProfileParms->insertParagraph(capav, 7); ui->textEditProfileParms->append(capav); break; case 2: - //ui->textEditProfileParms->insertParagraph(capdim, 7); ui->textEditProfileParms->append(capdim); break; case 3: - //ui->textEditProfileParms->insertParagraph(capdark, 7); ui->textEditProfileParms->append(capdark); break; case 4: ui->textEditProfileParms->append(capcut); - //ui->textEditProfileParms->insertParagraph(capcut, 7); break; default: - //ui->textEditProfileParms->insertParagraph(capav, 7); ui->textEditProfileParms->append(capav); } Buff = capLa + Buff.sprintf(" %g", sys.hdr.device.La); - //ui->textEditProfileParms->insertParagraph(Buff, 8); ui->textEditProfileParms->append(Buff); Buff = capYb + Buff.sprintf(" %g", sys.hdr.device.Yb); - //ui->textEditProfileParms->insertParagraph(Buff, 8); ui->textEditProfileParms->append(Buff); --- 644,667 ---- *************** *** 685,721 **** { case 0: ! //ui->textEditProfileParms->insertParagraph(pcsav4,9); ! ui->textEditProfileParms->append(pcsav4); break; case 1: ! // ui->textEditProfileParms->insertParagraph(pcsav, 9); ! ui->textEditProfileParms->append(pcsav); break; case 2: ! //ui->textEditProfileParms->insertParagraph(pcsdim, 9); ! ui->textEditProfileParms->append(pcsdim); break; case 3: ! //ui->textEditProfileParms->insertParagraph(pcsdark, 9); ! ui->textEditProfileParms->append(pcsdark); break; case 4: - //ui->textEditProfileParms->insertParagraph(pcscut, 9); ui->textEditProfileParms->append(pcscut); ! break; default: ! //ui->textEditProfileParms->insertParagraph(pcsav, 9); ! ui->textEditProfileParms->append(pcsav); } Buff = pcsLa + Buff.sprintf(" %g", sys.hdr.PCS.La); - //ui->textEditProfileParms->insertParagraph(Buff, 10); ui->textEditProfileParms->append(Buff); ! Buff = pcsYb + Buff.sprintf(" %g", sys.hdr.PCS.Yb); ! //ui->textEditProfileParms->insertParagraph(Buff, 11); ! ui->textEditProfileParms->append(Buff); Buff = WPH + QString::fromLocal8Bit(":"); - //ui->textEditProfileParms->insertParagraph(Buff, 11); ui->textEditProfileParms->append(Buff); Buff = QString::fromLocal8Bit(" ") + loc + QString::fromLocal8Bit(": "); --- 669,696 ---- { case 0: ! ui->textEditProfileParms->append(pcsav4); break; case 1: ! ui->textEditProfileParms->append(pcsav); break; case 2: ! ui->textEditProfileParms->append(pcsdim); break; case 3: ! ui->textEditProfileParms->append(pcsdark); break; case 4: ui->textEditProfileParms->append(pcscut); ! break; default: ! ui->textEditProfileParms->append(pcsav); } Buff = pcsLa + Buff.sprintf(" %g", sys.hdr.PCS.La); ui->textEditProfileParms->append(Buff); ! Buff = pcsYb + Buff.sprintf(" %g", sys.hdr.PCS.Yb); ! ui->textEditProfileParms->append(Buff); Buff = WPH + QString::fromLocal8Bit(":"); ui->textEditProfileParms->append(Buff); Buff = QString::fromLocal8Bit(" ") + loc + QString::fromLocal8Bit(": "); *************** *** 756,761 **** break; } ! //ui->textEditProfileParms->insertParagraph(Buff, 12); ! ui->textEditProfileParms->append(Buff); Buff = QString::fromLocal8Bit(" ") + lumScaling + QString::fromLocal8Bit(": "); --- 731,735 ---- break; } ! ui->textEditProfileParms->append(Buff); Buff = QString::fromLocal8Bit(" ") + lumScaling + QString::fromLocal8Bit(": "); *************** *** 772,777 **** break; } ! //ui->textEditProfileParms->insertParagraph(Buff, 13); ! ui->textEditProfileParms->append(Buff); } --- 746,750 ---- break; } ! ui->textEditProfileParms->append(Buff); } *************** *** 792,875 **** { case 0: ! //ui->textEditProfileParms_mon->insertParagraph(verb1, 3); ! ui->textEditProfileParms_mon->append(verb1); break; case 1: ! //ui->textEditProfileParms_mon->insertParagraph(verb2, 3); ! ui->textEditProfileParms_mon->append(verb2); break; case 2: ! //ui->textEditProfileParms_mon->insertParagraph(verb3, 3); ! ui->textEditProfileParms_mon->append(verb3); ! break; } ! //ui->textEditProfileParms_mon->insertParagraph(VC, 4); ! ui->textEditProfileParms_mon->append(VC); switch (sys.hdr.device.surround) { case 0: - //ui->textEditProfileParms_mon->insertParagraph(monav4,5); ui->textEditProfileParms_mon->append(monav4); ! break; case 1: - //ui->textEditProfileParms_mon->insertParagraph(monav, 5); ui->textEditProfileParms_mon->append(monav); ! break; case 2: - //ui->textEditProfileParms_mon->insertParagraph(mondim, 5); ui->textEditProfileParms_mon->append(mondim); ! break; case 3: - //ui->textEditProfileParms_mon->insertParagraph(mondark, 5); ui->textEditProfileParms_mon->append(mondark); ! break; case 4: - //ui->textEditProfileParms_mon->insertParagraph(moncut, 5); ui->textEditProfileParms_mon->append(moncut); ! break; default: ! //ui->textEditProfileParms_mon->insertParagraph(monav, 5); ! ui->textEditProfileParms_mon->append(monav); } Buff = monLa + Buff.sprintf(" %g", sys.hdr.device.La); ! //ui->textEditProfileParms_mon->insertParagraph(Buff, 6); ui->textEditProfileParms_mon->append(Buff); - Buff = monYb + Buff.sprintf(" %g", sys.hdr.device.Yb); - //ui->textEditProfileParms_mon->insertParagraph(Buff, 6); - ui->textEditProfileParms_mon->append(Buff); switch (sys.hdr.PCS.surround) { case 0: ! //ui->textEditProfileParms_mon->insertParagraph(pcsav4,7); ! ui->textEditProfileParms_mon->append(pcsav4); break; case 1: - //ui->textEditProfileParms_mon->insertParagraph(pcsav, 7); ui->textEditProfileParms_mon->append(pcsav); ! break; case 2: - //ui->textEditProfileParms_mon->insertParagraph(pcsdim, 7); ui->textEditProfileParms_mon->append(pcsdim); ! break; case 3: - //ui->textEditProfileParms_mon->insertParagraph(pcsdark, 7); ui->textEditProfileParms_mon->append(pcsdark); ! break; case 4: - //ui->textEditProfileParms_mon->insertParagraph(pcscut, 7); ui->textEditProfileParms_mon->append(pcscut); ! break; default: ! //ui->textEditProfileParms_mon->insertParagraph(pcsav, 7); ! ui->textEditProfileParms_mon->append(pcsav); } Buff = pcsLa + Buff.sprintf(" %g", sys.hdr.PCS.La); ! //ui->textEditProfileParms_mon->insertParagraph(Buff, 8); ui->textEditProfileParms_mon->append(Buff); - Buff = pcsYb + Buff.sprintf(" %g", sys.hdr.PCS.Yb); - //ui->textEditProfileParms_mon->insertParagraph(Buff, 8); - ui->textEditProfileParms_mon->append(Buff); } } --- 765,828 ---- { case 0: ! ui->textEditProfileParms_mon->append(verb1); break; case 1: ! ui->textEditProfileParms_mon->append(verb2); break; case 2: ! ui->textEditProfileParms_mon->append(verb3); ! break; } ! ui->textEditProfileParms_mon->append(VC); switch (sys.hdr.device.surround) { case 0: ui->textEditProfileParms_mon->append(monav4); ! break; case 1: ui->textEditProfileParms_mon->append(monav); ! break; case 2: ui->textEditProfileParms_mon->append(mondim); ! break; case 3: ui->textEditProfileParms_mon->append(mondark); ! break; case 4: ui->textEditProfileParms_mon->append(moncut); ! break; default: ! ui->textEditProfileParms_mon->append(monav); } Buff = monLa + Buff.sprintf(" %g", sys.hdr.device.La); ! ui->textEditProfileParms_mon->append(Buff); ! Buff = monYb + Buff.sprintf(" %g", sys.hdr.device.Yb); ui->textEditProfileParms_mon->append(Buff); switch (sys.hdr.PCS.surround) { case 0: ! ui->textEditProfileParms_mon->append(pcsav4); break; case 1: ui->textEditProfileParms_mon->append(pcsav); ! break; case 2: ui->textEditProfileParms_mon->append(pcsdim); ! break; case 3: ui->textEditProfileParms_mon->append(pcsdark); ! break; case 4: ui->textEditProfileParms_mon->append(pcscut); ! break; default: ! ui->textEditProfileParms_mon->append(pcsav); } Buff = pcsLa + Buff.sprintf(" %g", sys.hdr.PCS.La); ! ui->textEditProfileParms_mon->append(Buff); ! Buff = pcsYb + Buff.sprintf(" %g", sys.hdr.PCS.Yb); ui->textEditProfileParms_mon->append(Buff); } } *************** *** 882,974 **** { ui->textEditProfileID->setText( tr("File_Name: ")); - //ui->textEditProfileID->moveCursor(Q3TextEdit::MoveDown, 0); - //ui->textEditProfileID->moveCursor(Q3TextEdit::MoveLineEnd, 0); ui->textEditProfileID->moveCursor(QTextCursor::Down,QTextCursor::MoveAnchor); ! ui->textEditProfileID->moveCursor(QTextCursor::EndOfLine,QTextCursor::MoveAnchor); ! ! ui->textEditProfileID->insert(QString::fromLocal8Bit(sys.hdr.OutputProfileFile)); ! //ui->textEditProfileID->insertParagraph(tr("Description: "), 3); ui->textEditProfileID->append(tr("Description: ")); ! ! //ui->textEditProfileID->moveCursor(Q3TextEdit::MoveDown, 0); ! //ui->textEditProfileID->moveCursor(Q3TextEdit::MoveLineEnd, 0); ! ui->textEditProfileID->moveCursor(QTextCursor::Down,QTextCursor::MoveAnchor); ! ui->textEditProfileID->moveCursor(QTextCursor::EndOfLine,QTextCursor::MoveAnchor); ! ! ui->textEditProfileID->insert(QString::fromLocal8Bit(sys.hdr.Description)); ! //ui->textEditProfileID->insertParagraph( tr("Model: "), 5); ! ui->textEditProfileID->append(tr("Moel: ")); ! ! //ui->textEditProfileID->moveCursor(Q3TextEdit::MoveDown, 0); ! // ui->textEditProfileID->moveCursor(Q3TextEdit::MoveLineEnd, 0); ui->textEditProfileID->moveCursor(QTextCursor::Down,QTextCursor::MoveAnchor); ! ui->textEditProfileID->moveCursor(QTextCursor::EndOfLine,QTextCursor::MoveAnchor); ! ! ui->textEditProfileID->insert(QString::fromLocal8Bit(sys.hdr.Model)); ! //ui->textEditProfileID->insertParagraph(tr("Manufacturer: "), 7); ! ui->textEditProfileID->append(tr("Manufacturer: ")); ! ! //ui->textEditProfileID->moveCursor(Q3TextEdit::MoveDown, 0); ! // ui->textEditProfileID->moveCursor(Q3TextEdit::MoveLineEnd, 0); ui->textEditProfileID->moveCursor(QTextCursor::Down,QTextCursor::MoveAnchor); ! ui->textEditProfileID->moveCursor(QTextCursor::EndOfLine,QTextCursor::MoveAnchor); ! ! ui->textEditProfileID->insert(QString::fromLocal8Bit(sys.hdr.Manufacturer)); ! //ui->textEditProfileID->insertParagraph(tr("Copyright: "), 9); ! ui->textEditProfileID->append(tr("Copyright: ")); ! ! //ui->textEditProfileID->moveCursor(Q3TextEdit::MoveDown, 0); ! // ui->textEditProfileID->moveCursor(Q3TextEdit::MoveLineEnd, 0); ui->textEditProfileID->moveCursor(QTextCursor::Down,QTextCursor::MoveAnchor); ! ui->textEditProfileID->moveCursor(QTextCursor::EndOfLine,QTextCursor::MoveAnchor); ! ! ui->textEditProfileID->insert(QString::fromLocal8Bit(sys.hdr.Copyright)); } if (sys.hdr.ProfilerTab == 1) // monitor profiler { ui->textEditProfileID_mon->setText( tr("File_Name: ")); ! ! //ui->textEditProfileID_mon->moveCursor(Q3TextEdit::MoveDown, 0); ! //ui->textEditProfileID_mon->moveCursor(Q3TextEdit::MoveLineEnd, 0); ! ui->textEditProfileID->moveCursor(QTextCursor::Down,QTextCursor::MoveAnchor); ! ui->textEditProfileID->moveCursor(QTextCursor::EndOfLine,QTextCursor::MoveAnchor); ! ! ui->textEditProfileID_mon->insert(QString::fromLocal8Bit(sys.hdr.mon_profile_file_name)); ! //ui->textEditProfileID_mon->insertParagraph(tr("Description: "), 3); ! ui->textEditProfileID->append(tr("Description: ")); ! ! //ui->textEditProfileID_mon->moveCursor(Q3TextEdit::MoveDown, 0); ! //ui->textEditProfileID_mon->moveCursor(Q3TextEdit::MoveLineEnd, 0); ! ui->textEditProfileID->moveCursor(QTextCursor::Down,QTextCursor::MoveAnchor); ! ui->textEditProfileID->moveCursor(QTextCursor::EndOfLine,QTextCursor::MoveAnchor); ! ! ui->textEditProfileID_mon->insert(QString::fromLocal8Bit(sys.hdr.Description)); ! // ui->textEditProfileID_mon->insertParagraph( tr("Model: "), 5); ! ui->textEditProfileID->append(tr("Model: ")); ! ! //ui->textEditProfileID_mon->moveCursor(Q3TextEdit::MoveDown, 0); ! // ui->textEditProfileID_mon->moveCursor(Q3TextEdit::MoveLineEnd, 0); ! ui->textEditProfileID->moveCursor(QTextCursor::Down,QTextCursor::MoveAnchor); ! ui->textEditProfileID->moveCursor(QTextCursor::EndOfLine,QTextCursor::MoveAnchor); ! ! ui->textEditProfileID_mon->insert(QString::fromLocal8Bit(sys.hdr.Model)); ! //ui->textEditProfileID_mon->insertParagraph(tr("Manufacturer: "), 7); ! ui->textEditProfileID->append(tr("Manufacturer: ")); ! ! //ui->textEditProfileID_mon->moveCursor(Q3TextEdit::MoveDown, 0); ! //ui->textEditProfileID_mon->moveCursor(Q3TextEdit::MoveLineEnd, 0); ! ui->textEditProfileID->moveCursor(QTextCursor::Down,QTextCursor::MoveAnchor); ! ui->textEditProfileID->moveCursor(QTextCursor::EndOfLine,QTextCursor::MoveAnchor); ! ! ui->textEditProfileID_mon->insert(QString::fromLocal8Bit(sys.hdr.Manufacturer)); ! //ui->textEditProfileID_mon->insertParagraph(tr("Copyright: "), 9); ! ui->textEditProfileID->append(tr("Copyright: ")); ! ! //ui->textEditProfileID_mon->moveCursor(Q3TextEdit::MoveDown, 0); ! //ui->textEditProfileID_mon->moveCursor(Q3TextEdit::MoveLineEnd, 0); ! ui->textEditProfileID->moveCursor(QTextCursor::Down,QTextCursor::MoveAnchor); ! ui->textEditProfileID->moveCursor(QTextCursor::EndOfLine,QTextCursor::MoveAnchor); ! ! ui->textEditProfileID_mon->insert(QString::fromLocal8Bit(sys.hdr.Copyright)); } } --- 835,880 ---- { ui->textEditProfileID->setText( tr("File_Name: ")); ui->textEditProfileID->moveCursor(QTextCursor::Down,QTextCursor::MoveAnchor); ! ui->textEditProfileID->moveCursor(QTextCursor::EndOfLine,QTextCursor::MoveAnchor); ! ui->textEditProfileID->insert(QString::fromLocal8Bit(sys.hdr.OutputProfileFile)); ui->textEditProfileID->append(tr("Description: ")); ! ui->textEditProfileID->moveCursor(QTextCursor::Down,QTextCursor::MoveAnchor); ! ui->textEditProfileID->moveCursor(QTextCursor::EndOfLine,QTextCursor::MoveAnchor); ! ui->textEditProfileID->insert(QString::fromLocal8Bit(sys.hdr.Description)); ! ui->textEditProfileID->append(tr("Moel: ")); ui->textEditProfileID->moveCursor(QTextCursor::Down,QTextCursor::MoveAnchor); ! ui->textEditProfileID->moveCursor(QTextCursor::EndOfLine,QTextCursor::MoveAnchor); ! ui->textEditProfileID->insert(QString::fromLocal8Bit(sys.hdr.Model)); ! ui->textEditProfileID->append(tr("Manufacturer: ")); ui->textEditProfileID->moveCursor(QTextCursor::Down,QTextCursor::MoveAnchor); ! ui->textEditProfileID->moveCursor(QTextCursor::EndOfLine,QTextCursor::MoveAnchor); ! ui->textEditProfileID->insert(QString::fromLocal8Bit(sys.hdr.Manufacturer)); ! ui->textEditProfileID->append(tr("Copyright: ")); ui->textEditProfileID->moveCursor(QTextCursor::Down,QTextCursor::MoveAnchor); ! ui->textEditProfileID->moveCursor(QTextCursor::EndOfLine,QTextCursor::MoveAnchor); ! ui->textEditProfileID->insert(QString::fromLocal8Bit(sys.hdr.Copyright)); } if (sys.hdr.ProfilerTab == 1) // monitor profiler { ui->textEditProfileID_mon->setText( tr("File_Name: ")); ! ui->textEditProfileID_mon->moveCursor(QTextCursor::Down,QTextCursor::MoveAnchor); ! ui->textEditProfileID_mon->moveCursor(QTextCursor::EndOfLine,QTextCursor::MoveAnchor); ! ui->textEditProfileID_mon->insert(QString::fromLocal8Bit(sys.hdr.mon_profile_file_name)); ! ui->textEditProfileID_mon->append(tr("Description: ")); ! ui->textEditProfileID_mon->moveCursor(QTextCursor::Down,QTextCursor::MoveAnchor); ! ui->textEditProfileID_mon->moveCursor(QTextCursor::EndOfLine,QTextCursor::MoveAnchor); ! ui->textEditProfileID_mon->insert(QString::fromLocal8Bit(sys.hdr.Description)); ! ui->textEditProfileID_mon->append(tr("Model: ")); ! ui->textEditProfileID_mon->moveCursor(QTextCursor::Down,QTextCursor::MoveAnchor); ! ui->textEditProfileID_mon->moveCursor(QTextCursor::EndOfLine,QTextCursor::MoveAnchor); ! ui->textEditProfileID_mon->insert(QString::fromLocal8Bit(sys.hdr.Model)); ! ui->textEditProfileID_mon->append(tr("Manufacturer: ")); ! ui->textEditProfileID_mon->moveCursor(QTextCursor::Down,QTextCursor::MoveAnchor); ! ui->textEditProfileID_mon->moveCursor(QTextCursor::EndOfLine,QTextCursor::MoveAnchor); ! ui->textEditProfileID_mon->insert(QString::fromLocal8Bit(sys.hdr.Manufacturer)); ! ui->textEditProfileID_mon->append(tr("Copyright: ")); ! ui->textEditProfileID_mon->moveCursor(QTextCursor::Down,QTextCursor::MoveAnchor); ! ui->textEditProfileID_mon->moveCursor(QTextCursor::EndOfLine,QTextCursor::MoveAnchor); ! ui->textEditProfileID_mon->insert(QString::fromLocal8Bit(sys.hdr.Copyright)); } } Index: imageitem.cpp =================================================================== RCS file: /cvsroot/lprof/lprof/src/lprofqt/imageitem.cpp,v retrieving revision 1.4.2.1 retrieving revision 1.4.2.2 diff -C2 -d -r1.4.2.1 -r1.4.2.2 *** imageitem.cpp 9 Jun 2009 12:25:25 -0000 1.4.2.1 --- imageitem.cpp 16 Jun 2009 07:26:25 -0000 1.4.2.2 *************** *** 118,138 **** } - - //changed by me ==-=========================================================================== - /* - ImageItem::ImageItem(QString ImageFile, const QString Monitor, const QString Scanner, Q3Canvas *canvas ) - : Q3CanvasRectangle( canvas ), image() - { - - // qDebug("ImageItem::ImageItem"); - lProof = FALSE; - Reload(ImageFile, Monitor, Scanner, canvas); - } - */ - ImageItem::ImageItem(QString ImageFile, const QString Monitor, const QString Scanner, QGraphicsScene *canvas ) ! : QGraphicsRectItem( (QGraphicsItem *)canvas ), image() { ! // qDebug("ImageItem::ImageItem"); lProof = FALSE; --- 118,125 ---- } 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; *************** *** 140,147 **** } - - //======================================================================================== - - void ImageItem::Reload(QString ImageFile, const QString Monitor, const QString Scanner, QGraphicsScene *canvas ) //changed by me from Q3Canvas to QGraphicsScene { --- 127,130 ---- *************** *** 281,286 **** QImage scaled = image.smoothScale(canvas->width(), canvas->height()); ! // setSize( scaled.width(), scaled.height() ); //removed by me----------------------------------------------------- ! setRect ((qreal)0, (qreal)0, scaled.width(), scaled.height()); //added by me -------------------------------------------- sx = (double) image.width() / scaled.width(); sy = (double) image.height() / scaled.height(); --- 264,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(); *************** *** 305,312 **** proof.convertFromImage(pscaled); ! // move(0, 0); //removed by me ------------------------------------------------------------------- ! setPos((qreal) 0, (qreal) 0); //added by me ----------------------------------------------------- ! // setZ(5); //removed by me ---------------------------------------------------------- ! setZValue(5); //added by me ---------------------------------------------------------- show(); // qDebug("ImageItem::Reload Done"); --- 287,292 ---- proof.convertFromImage(pscaled); ! setPos((qreal) 0, (qreal) 0); ! setZValue(5); show(); // qDebug("ImageItem::Reload Done"); Index: lprofmain-priv.h =================================================================== RCS file: /cvsroot/lprof/lprof/src/lprofqt/lprofmain-priv.h,v retrieving revision 1.6.2.1 retrieving revision 1.6.2.2 diff -C2 -d -r1.6.2.1 -r1.6.2.2 *** lprofmain-priv.h 9 Jun 2009 12:25:25 -0000 1.6.2.1 --- lprofmain-priv.h 16 Jun 2009 07:26:25 -0000 1.6.2.2 *************** *** 42,51 **** #include "lprofmain.h" #include <QProgressBar> ! ! //added by me ------------------------------------------------------ ! #include <QPolygon> //in place of Q3PointArray #include <QList> #include <QTextEdit> - //removed by me ---------------------------------------------------- #include <Q3TextEdit> --- 42,48 ---- #include "lprofmain.h" #include <QProgressBar> ! #include <QPolygon> #include <QList> #include <QTextEdit> #include <Q3TextEdit> *************** *** 53,57 **** #include <Q3PtrList> - //----------------------------------------------------------------------- // Anything listed here should only be used in files that are // located in src/lprofqt. As the routines in these files are --- 50,53 ---- *************** *** 100,109 **** extern uint last_tab; - //removed by me ------------------------------------------------------------------------------------- - //extern Q3TextEdit* Console; - //added by me --------------------------------------------------------------------------------------- extern QTextEdit* Console; - extern QProgressBar* ProgBar; --- 96,101 ---- *************** *** 120,129 **** extern markPositions Marks; - //removed by me ------------------------------------------------------------------------------------------------ - //extern Q3PointArray grid_corners; - //added by me -------------------------------------------------------------------------------------------------- extern QPolygon grid_corners; - //-------------------------------------------------------------- - extern QString outprofile; --- 112,116 ---- Index: lprofmain.cpp =================================================================== RCS file: /cvsroot/lprof/lprof/src/lprofqt/lprofmain.cpp,v retrieving revision 1.188.2.1 retrieving revision 1.188.2.2 diff -C2 -d -r1.188.2.1 -r1.188.2.2 *** lprofmain.cpp 9 Jun 2009 12:25:25 -0000 1.188.2.1 --- lprofmain.cpp 16 Jun 2009 07:26:25 -0000 1.188.2.2 *************** *** 85,109 **** #include <QTranslator> - //removed by me--------------------------------------------- - - #include <Q3PtrList> - #include <q3buttongroup.h> - #include <q3groupbox.h> - #include <q3filedialog.h> - #include <q3multilineedit.h> - #include <q3textview.h> - #include <q3progressbar.h> - #include <q3table.h> - #include <q3mainwindow.h> - #include <q3filedialog.h> - #include <q3canvas.h> - #include <q3multilineedit.h> - #include <q3textbrowser.h> - #include <q3textstream.h> - #include <q3listview.h> - - - //added by me ---------------------------------------------- - #include <QList> #include <QGroupBox> --- 85,88 ---- *************** *** 117,125 **** #include <QTextBrowser> #include <QTextStream> ! #include <QListView> ! #include <QListWidget> ! ! //------------------------------------------------------ ! #include "ui_lprofmainbase.h" --- 96,101 ---- #include <QTextBrowser> #include <QTextStream> ! #include <QListView> ! #include <QListWidget> #include "ui_lprofmainbase.h" *************** *** 205,214 **** temp = QString::fromLocal8Bit(coms -> paths[position]->path); ! start = temp.find(QChar::fromAscii('('), 0, TRUE) + 1; ! end = temp.find(QChar::fromAscii(')'), 0, TRUE); port = temp.mid(0, start -1); ! strcpy(sys.hdr.instArray[k].port, port.ascii()); ! sys.hdr.instArray[k].pos = position; sys.hdr.instArray[k].inst = instUnknown; --- 181,193 ---- temp = QString::fromLocal8Bit(coms -> paths[position]->path); ! start = temp.indexOf(QChar::fromAscii('('), 0, Qt::CaseSensitive) + 1; ! end = temp.indexOf(QChar::fromAscii(')'), 0, Qt::CaseSensitive); port = temp.mid(0, start -1); ! QByteArray asciiData=port.toAscii(); ! const char *data = asciiData.constData(); ! strcpy(sys.hdr.instArray[k].port, data); ! ! sys.hdr.instArray[k].pos = position; sys.hdr.instArray[k].inst = instUnknown; *************** *** 217,227 **** { temp.sprintf("/LPROF/serial_instruments/port%i", j); ! strcpy(tempInst.port, lprofSettings->readEntry(temp, QString::fromLocal8Bit("")).toLocal8Bit()); ! if (QString::fromLocal8Bit(sys.hdr.instArray[k].port) == QString::fromLocal8Bit(tempInst.port)) { sys.hdr.instArray[k].inst = instUnknown; temp.sprintf("/LPROF/serial_instruments/instType%i", j); ! sys.hdr.instArray[k].inst = instType (lprofSettings->readNumEntry(temp, instUnknown)); } } --- 196,207 ---- { temp.sprintf("/LPROF/serial_instruments/port%i", j); ! strcpy(tempInst.port, lprofSettings->value(temp, QString::fromLocal8Bit("")).toString().toLocal8Bit()); ! ! if (QString::fromLocal8Bit(sys.hdr.instArray[k].port) == QString::fromLocal8Bit(tempInst.port)) { sys.hdr.instArray[k].inst = instUnknown; temp.sprintf("/LPROF/serial_instruments/instType%i", j); ! sys.hdr.instArray[k].inst = instType (lprofSettings->value(temp, instUnknown).toInt()); } } *************** *** 300,305 **** int start, end, i, count; int number; ! ! sys.hdr.validInst = lprofSettings->readNumEntry( QString::fromLocal8Bit("/LPROF/numbers/instCount"), 0); populatePortArray(); spyd2FirmwareOK = TRUE; --- 280,286 ---- int start, end, i, count; int number; ! ! sys.hdr.validInst = lprofSettings->value( QString::fromLocal8Bit("/LPROF/numbers/instCount"), 0).toInt(); ! populatePortArray(); spyd2FirmwareOK = TRUE; *************** *** 332,338 **** { temp = QString::fromLocal8Bit(coms -> paths[i]->path); ! start = temp.find(QString::fromLocal8Bit("("), 0, TRUE) + 1; ! end = temp.find(QString::fromLocal8Bit(")"), 0, TRUE); ! instName = temp.mid(start, end - start); port = temp.mid(0, start -1); instlist[i].deviceFlag = OK; --- 313,320 ---- { temp = QString::fromLocal8Bit(coms -> paths[i]->path); ! start = temp.indexOf(QString::fromLocal8Bit("("), 0, Qt::CaseSensitive) + 1; ! end = temp.indexOf(QString::fromLocal8Bit(")"), 0, Qt::CaseSensitive); ! ! instName = temp.mid(start, end - start); port = temp.mid(0, start -1); instlist[i].deviceFlag = OK; *************** *** 443,447 **** bool found = FALSE, notOK = FALSE, OK = FALSE; ! sys.hdr.validInst = lprofSettings->readNumEntry( QString::fromLocal8Bit("/LPROF/numbers/instCount"), 0); populatePortArray(); --- 425,429 ---- bool found = FALSE, notOK = FALSE, OK = FALSE; ! sys.hdr.validInst = lprofSettings->value( QString::fromLocal8Bit("/LPROF/numbers/instCount"), 0).toInt(); populatePortArray(); *************** *** 519,550 **** instType itype; - //Q3ListViewItem *item = ui->listViewPortsInsts -> selectedItem (); //removed by me ================================== QTableWidgetItem *item = ui->listViewPortsInsts -> currentItem (); ! itype = mapCombo2Inst[ui->comboBoxDevice -> currentItem()]; ! int my_row=item->row (); //adedd by me==== ! QTableWidgetItem *item2 =ui->listViewPortsInsts->item(my_row,1); //changed by me ================================ ! if (validateIntrument(item2 -> text(), itype)) //changed by me ================================ { ! ! //item -> setText(2, ui->comboBoxDevice -> currentText()); //removed by me ======================= ! QTableWidgetItem *item3 =ui->listViewPortsInsts->item(my_row,2); //added by me ! item3->setText(ui->comboBoxDevice -> currentText()); //added by me ! //item -> setText(3, tr("Device verified")); //removed by me ! item3 =ui->listViewPortsInsts->item(my_row,3); //added by me ! item3->setText(tr("Device verified")); //added by me charInstType.sprintf("%i", itype); - //item -> setText(4, charInstType); //removed by me item3 =ui->listViewPortsInsts->item(my_row,4); item3->setText(charInstType); - //index = item -> text(0).toInt(&OK) - 1; //removed by me item3=ui->listViewPortsInsts->item(my_row,0); ! index=item3->text().toInt(&OK) - 1; //added by me if (OK) { sys.hdr.instArray[index].inst = itype; ! // strcpy(sys.hdr.instArray[index].port, item -> text(1).toLocal8Bit()); //removed by me=================== ! item3=ui->listViewPortsInsts->item(my_row,1); //added by me ! strcpy(sys.hdr.instArray[index].port, item3 -> text().toLocal8Bit()); //added by me } else --- 501,526 ---- instType itype; QTableWidgetItem *item = ui->listViewPortsInsts -> currentItem (); ! itype = mapCombo2Inst[ui->comboBoxDevice -> currentIndex()]; ! ! int my_row=item->row (); ! QTableWidgetItem *item2 =ui->listViewPortsInsts->item(my_row,1); ! if (validateIntrument(item2 -> text(), itype)) { ! QTableWidgetItem *item3 =ui->listViewPortsInsts->item(my_row,2); ! item3->setText(ui->comboBoxDevice -> currentText()); ! item3 =ui->listViewPortsInsts->item(my_row,3); ! item3->setText(tr("Device verified")); charInstType.sprintf("%i", itype); item3 =ui->listViewPortsInsts->item(my_row,4); item3->setText(charInstType); item3=ui->listViewPortsInsts->item(my_row,0); ! index=item3->text().toInt(&OK) - 1; if (OK) { sys.hdr.instArray[index].inst = itype; ! item3=ui->listViewPortsInsts->item(my_row,1); ! strcpy(sys.hdr.instArray[index].port, item3 -> text().toLocal8Bit()); } else *************** *** 562,566 **** else { - // item -> setText(3, tr("Device failed verification.")); QTableWidgetItem *item3 =ui->listViewPortsInsts->item(my_row,3); item3->setText( tr("Device failed verification.")); --- 538,541 ---- *************** *** 576,580 **** // qDebug("instCount = %i", sys.hdr.validInst); ! lprofSettings->writeEntry( QString::fromLocal8Bit("/LPROF/numbers/instCount"), sys.hdr.validInst); // qDebug("save settings for serial devices and ports"); --- 551,555 ---- // qDebug("instCount = %i", sys.hdr.validInst); ! lprofSettings->setValue( QString::fromLocal8Bit("/LPROF/numbers/instCount"), sys.hdr.validInst); // qDebug("save settings for serial devices and ports"); *************** *** 582,588 **** { temp.sprintf("/LPROF/serial_instruments/port%i", j); ! lprofSettings->writeEntry(temp, sys.hdr.instArray[j].port); temp.sprintf("/LPROF/serial_instruments/instType%i", j); ! lprofSettings->writeEntry(temp, sys.hdr.instArray[j].inst); } } --- 557,563 ---- { temp.sprintf("/LPROF/serial_instruments/port%i", j); ! lprofSettings->setValue(temp, QString::fromLocal8Bit(sys.hdr.instArray[j].port)); temp.sprintf("/LPROF/serial_instruments/instType%i", j); ! lprofSettings->setValue(temp, sys.hdr.instArray[j].inst); } } *************** *** 590,614 **** void lprofMain::populatePortandInstListView() { ! sys.hdr.validInst = lprofSettings->readNumEntry( QString::fromLocal8Bit("/LPROF/numbers/instCount"), 0); populatePortArray(); QString portnum, insttype; QString device, status; ! ui->listViewPortsInsts->setColumnCount(5); //added by me //set the no of columns in table widget ! //ui->listViewPortsInsts->setRowCount(0); ! ui->listViewPortsInsts -> setSelectionMode(QAbstractItemView::SingleSelection); //change by me from Q3ListView::Single to QAbstractItemView::SingleSelection ! //ui->listViewPortsInsts -> setAllColumnsShowFocus(TRUE); //removed by me ====does the same as selectRowOnly=========== ! //ui->listViewPortsInsts -> setColumnWidthMode (0, Q3ListView::Manual); ! ui->listViewPortsInsts -> setColumnWidth (0, 0); ! //ui->listViewPortsInsts -> setColumnWidthMode (1, Q3ListView::Maximum ); ui->listViewPortsInsts ->resizeColumnToContents(1); ui->listViewPortsInsts -> setColumnWidth (1, 200); - //ui->listViewPortsInsts -> setColumnWidthMode (2, Q3ListView::Maximum ); ui->listViewPortsInsts ->resizeColumnToContents(2); ui->listViewPortsInsts -> setColumnWidth (2, 200); - //ui->listViewPortsInsts -> setColumnWidthMode (3, Q3ListView::Maximum ); ui->listViewPortsInsts ->resizeColumnToContents(3); ui->listViewPortsInsts -> setColumnWidth (3, 350); - //ui->listViewPortsInsts -> setColumnWidthMode (4, Q3ListView::Manual); ui->listViewPortsInsts -> setColumnWidth (4, 0); for (int i=0; i < sys.hdr.validPorts; i++) --- 565,593 ---- void lprofMain::populatePortandInstListView() { ! sys.hdr.validInst = lprofSettings->value( QString::fromLocal8Bit("/LPROF/numbers/instCount"), 0).toInt(); populatePortArray(); QString portnum, insttype; QString device, status; ! ui->listViewPortsInsts->setColumnCount(5); ! ui->listViewPortsInsts -> setColumnWidth (0, 30); ui->listViewPortsInsts ->resizeColumnToContents(1); ui->listViewPortsInsts -> setColumnWidth (1, 200); ui->listViewPortsInsts ->resizeColumnToContents(2); ui->listViewPortsInsts -> setColumnWidth (2, 200); ui->listViewPortsInsts ->resizeColumnToContents(3); ui->listViewPortsInsts -> setColumnWidth (3, 350); ui->listViewPortsInsts -> setColumnWidth (4, 0); + QString str = QString(QLatin1String("p#")) ; + QTableWidgetItem *item1 = new QTableWidgetItem(str,0); + ui->listViewPortsInsts->setHorizontalHeaderItem(0,item1); + str = QString(QLatin1String("Port")); + item1 = new QTableWidgetItem(str,0); + ui->listViewPortsInsts->setHorizontalHeaderItem(1,item1); + str = QString(QLatin1String("Device")); + item1 = new QTableWidgetItem(str,0); + ui->listViewPortsInsts->setHorizontalHeaderItem(2,item1); + str = QString(QLatin1String("Status")); + item1 = new QTableWidgetItem(str,0); + ui->listViewPortsInsts->setHorizontalHeaderItem(3,item1); for (int i=0; i < sys.hdr.validPorts; i++) *************** *** 616,620 **** portnum.sprintf("%i", i + 1); insttype.sprintf("%i", sys.hdr.instArray[i].inst); ! ui->comboBoxDevice -> setCurrentItem(mapInst2Combo[sys.hdr.instArray[i].inst + 1]); if (sys.hdr.instArray[i].inst != instUnknown) { --- 595,599 ---- portnum.sprintf("%i", i + 1); insttype.sprintf("%i", sys.hdr.instArray[i].inst); ! ui->comboBoxDevice -> setCurrentIndex(mapInst2Combo[sys.hdr.instArray[i].inst + 1]); if (sys.hdr.instArray[i].inst != instUnknown) { *************** *** 627,654 **** status = tr("No device installed."); ! //following code is added by me ================================================ ! /* I am simulating qt3's multi column q3listview by using qt4's qtablewidget. For this first i am creating a tablewidget listViewPortInsts in ! * ui_lprofmainbase.h. Then above i have set no of columns to 5 by using ui->listViewPortsInsts->setColumnCount(5); and also set the ! * width of columns. In qt3 we can simply create a Q3ListViewItem with parent pointer and texts of all columns but in qt4 we can not do this. ! * In qt4 we first create a independent QTableWidgetItem without pointer but with text. Then we can attach the QTableWidgetItem to parent ! * QTableWidget. So first I am adding a row to table then add QTableWidgetItem to this row one by one. ! */ ! int no_of_rows = ui->listViewPortsInsts->rowCount (); ! ui->listViewPortsInsts->insertRow (no_of_rows); //rows no start from 0 ! no_of_rows = ui->listViewPortsInsts->rowCount (); ! QTableWidgetItem *newItem = new QTableWidgetItem(portnum,0); ! ui->listViewPortsInsts->setItem(no_of_rows-1, 0, newItem); ! newItem = new QTableWidgetItem(QString::fromLocal8Bit(sys.hdr.instArray[i].port),0); ! ui->listViewPortsInsts->setItem(no_of_rows-1, 1, newItem); ! newItem = new QTableWidgetItem(ui->comboBoxDevice -> currentText(),0); ! ui->listViewPortsInsts->setItem(no_of_rows-1, 2, newItem); ! newItem = new QTableWidgetItem(status,0); ! ui->listViewPortsInsts->setItem(no_of_rows-1, 3, newItem); ! newItem = new QTableWidgetItem(insttype,0); ! ui->listViewPortsInsts->setItem(no_of_rows-1, 4, newItem); ! //================================================================== ! /* (void) new Q3ListViewItem(ui->listViewPortsInsts, portnum, //removed by me================ ! QString::fromLocal8Bit(sys.hdr.instArray[i].port), ! ui->comboBoxDevice -> currentText(), status, insttype);*/ } } --- 606,623 ---- status = tr("No device installed."); ! int no_of_rows = ui->listViewPortsInsts->rowCount (); ! ui->listViewPortsInsts->insertRow (no_of_rows); ! no_of_rows = ui->listViewPortsInsts->rowCount (); ! QTableWidgetItem *newItem = new QTableWidgetItem(portnum,0); ! ui->listViewPortsInsts->setItem(no_of_rows-1, 0, newItem); ! newItem = new QTableWidgetItem(QString::fromLocal8Bit(sys.hdr.instArray[i].port),0); ! ui->listViewPortsInsts->setItem(no_of_rows-1, 1, newItem); ! newItem = new QTableWidgetItem(ui->comboBoxDevice -> currentText(),0); ! ui->listViewPortsInsts->setItem(no_of_rows-1, 2, newItem); ! newItem = new QTableWidgetItem(status,0); ! ui->listViewPortsInsts->setItem(no_of_rows-1, 3, newItem); ! newItem = new QTableWidgetItem(insttype,0); ! ui->listViewPortsInsts->setItem(no_of_rows-1, 4, newItem); ! } } *************** *** 780,784 **** Console -> append(Buffer); - Console -> sync(); va_end(args); lprofApp -> processEvents(); --- 749,752 ---- *************** *** 961,966 **** { // qDebug("lprofMain::SetGoButton"); ! QToolTip::remove( ui->TheGoButton ); ! QToolTip::add( ui->TheGoButton, Caption ); ui->TheGoButton -> setEnabled(TRUE); --- 929,935 ---- { // qDebug("lprofMain::SetGoButton"); ! ! ui->TheGoButton->setToolTip(QString(QLatin1String(""))); ! ui->TheGoButton->setToolTip(Caption); ui->TheGoButton -> setEnabled(TRUE); *************** *** 972,978 **** { // qDebug("lprofMain::SetGoButton"); - QToolTip::remove( ui->TheGoButton_2 ); - QToolTip::add( ui->TheGoButton_2, Caption ); ui->TheGoButton_2 -> setEnabled(TRUE); ui->TheGoButton_2 -> setEnabled(lEnable); --- 941,948 ---- { // qDebug("lprofMain::SetGoButton"); + ui->TheGoButton_2->setToolTip(QString(QLatin1String(""))); + ui->TheGoButton_2->setToolTip(Caption); + ui->TheGoButton_2 -> setEnabled(TRUE); ui->TheGoButton_2 -> setEnabled(lEnable); *************** *** 982,986 **** void lprofMain::SetOutputFile( const QString OutputFile ) { ! switch (ui->TabProfiler -> currentPageIndex()) { --- 952,956 ---- void lprofMain::SetOutputFile( const QString OutputFile ) { ! switch (ui->TabProfiler -> currentIndex()) { *************** *** 1002,1008 **** #ifdef __WIN32__ ! pos = fn.findRev(QString::fromLocal8Bit("\\"), -1, FALSE); #else ! pos = fn.findRev(QString::fromLocal8Bit("/"), -1, FALSE); #endif --- 972,978 ---- #ifdef __WIN32__ ! pos = fn.lastIndexOf(QString::fromLocal8Bit("\\"), -1, Qt::CaseInsensitive); #else ! pos = fn.lastIndexOf(QString::fromLocal8Bit("/"), -1, Qt::CaseInsensitive); #endif *************** *** 1032,1043 **** if (OK) { ! if ((fn.findRev(QString::fromLocal8Bit(".i")) == (fn.length() - 4) || ! fn.findRev(QString::fromLocal8Bit(".I")) == (fn.length() - 4)) && // .i or ,I && ! (fn.findRev(QString::fromLocal8Bit("C"), -2 ) == (fn.length() - 2) || ! fn.findRev(QString::fromLocal8Bit("c"), -2 ) == (fn.length() - 2)) && // c or C && ! ((fn.findRev(QString::fromLocal8Bit("C") ) == (fn.length() - 1) || ! fn.findRev(QString::fromLocal8Bit("c")) == (fn.length() - 1)) || // c or C ! (fn.findRev(QString::fromLocal8Bit("M")) == (fn.length() - 1) || ! fn.findRev(QString::fromLocal8Bit("m")) == (fn.length() -1 )))) // or m or M { // the directory and extension are OK --- 1002,1013 ---- if (OK) { ! if ((fn.lastIndexOf(QString::fromLocal8Bit(".i")) == (fn.length() - 4) || ! fn.lastIndexOf(QString::fromLocal8Bit(".I")) == (fn.length() - 4)) && // .i or ,I && ! (fn.lastIndexOf(QString::fromLocal8Bit("C"), -2 ) == (fn.length() - 2) || ! fn.lastIndexOf(QString::fromLocal8Bit("c"), -2 ) == (fn.length() - 2)) && // c or C && ! ((fn.lastIndexOf(QString::fromLocal8Bit("C") ) == (fn.length() - 1) || ! fn.lastIndexOf(QString::fromLocal8Bit("c")) == (fn.length() - 1)) || // c or C ! (fn.lastIndexOf(QString::fromLocal8Bit("M")) == (fn.length() - 1) || ! fn.lastIndexOf(QString::fromLocal8Bit("m")) == (fn.length() -1 )))) // or m or M { // the directory and extension are OK *************** *** 1047,1051 **** { // direcotry OK but extesion is not ! if (!fn.find(QString::fromLocal8Bit("."), pos) == -1) // There is an extension so this is a user error that we can not fix { OK = FALSE; --- 1017,1021 ---- { // direcotry OK but extesion is not ! if (!fn.indexOf(QString::fromLocal8Bit("."), pos) == -1) // There is an extension so this is a user error that we can not fix { OK = FALSE; *************** *** 1071,1077 **** lprofMain::lprofMain( QWidget* parent) ! : QDialog( parent, "", 0, ! Qt::WindowSystemMenuHint), ! FigEditor( 0 ), Canvas( 0 ), CanvasFrameLayout( 0 ), --- 1041,1047 ---- lprofMain::lprofMain( QWidget* parent) ! : QDialog( parent, ! Qt::Window | Qt::WindowSystemMenuHint | Qt::WindowMinMaxButtonsHint | Qt::WindowTitleHint), ! FigEditor( 0 ), Canvas( 0 ), CanvasFrameLayout( 0 ), *************** *** 1121,1125 **** connect(ui->Reference_install, SIGNAL(clicked()), this, SLOT(slotInstallReference())); connect(ui->SafeFrame, SIGNAL(valueChanged(int)), this, SLOT(safeFarmeChanged())); ! connect(ui->listViewPortsInsts, SIGNAL(selectionChanged()), this, SLOT(slotEnablecomboBoxDevice())); connect(ui->comboBoxDevice, SIGNAL(activated(int)), this, SLOT(slotUpdateInst())); connect(ui->TargetSelector, SIGNAL(valueChanged()), this, SLOT(safeFarmeChanged())); --- 1091,1097 ---- connect(ui->Reference_install, SIGNAL(clicked()), this, SLOT(slotInstallReference())); connect(ui->SafeFrame, SIGNAL(valueChanged(int)), this, SLOT(safeFarmeChanged())); ! ! connect(ui->listViewPortsInsts, SIGNAL(itemSelectionChanged()), this, SLOT(slotEnablecomboBoxDevice())); ! connect(ui->comboBoxDevice, SIGNAL(activated(int)), this, SLOT(slotUpdateInst())); connect(ui->TargetSelector, SIGNAL(valueChanged()), this, SLOT(safeFarmeChanged())); *************** *** 1134,1139 **** init_env(); ! Create_Config_Dir(QDir::currentDirPath()); ! while (copyNumTempFile>0) { --- 1106,1112 ---- init_env(); ! //Create_Config_Dir(QDir::currentDirPath()); ! Create_Config_Dir(QDir::currentPath()); ! while (copyNumTempFile>0) { *************** *** 1164,1179 **** ui->ComboBoxIntent -> clear(); ! ui->ComboBoxIntent -> insertItem(per); ! ui->ComboBoxIntent -> insertItem(relcolor); ! ui->ComboBoxIntent -> insertItem(sat); ! ui->ComboBoxIntent -> insertItem(Absolute); ! init_mon(); ! // Hide Printer_Tab until printer profiling is available ! ui->TabProfiler->removePage(ui->Printer_Tab); ! // Hidden tab is used for items that are no longer visible to users ! ui->TabProfiler->removePage(ui->Hidden); ! init_measurement_tool(); --- 1137,1152 ---- ui->ComboBoxIntent -> clear(); ! ui->ComboBoxIntent -> insertItem(1000,per); ! ui->ComboBoxIntent -> insertItem(1000,relcolor); ! ui->ComboBoxIntent -> insertItem(1000,sat); ! ui->ComboBoxIntent -> insertItem(1000,Absolute); ! init_mon(); ! // Hide Printer_Tab until printer profiling is available ! ui->TabProfiler->removeTab(ui->TabProfiler->indexOf(ui->Printer_Tab)); ! // Hidden tab is used for items that are no longer visible to users ! ui->TabProfiler->removeTab(ui->TabProfiler->indexOf(ui->Hidden)); ! init_measurement_tool(); *************** *** 1188,1192 **** // global_help_path = new QString; setupHelp(global_help_path); ! sys.hdr.ProfilerTab = ui->TabProfiler -> currentPageIndex(); monCalOK = FALSE; monMeasOK = FALSE; --- 1161,1165 ---- // global_help_path = new QString; setupHelp(global_help_path); ! sys.hdr.ProfilerTab = ui->TabProfiler ->currentIndex(); monCalOK = FALSE; monMeasOK = FALSE; *************** *** 1225,1229 **** strcpy(sys.hdr.MeasurementSheet, measfile.toLocal8Bit()); ! if (ui->radioButtonCandMFile -> isOn()) { strcpy(sys.hdr.MonMeasurementSheet, (const char*)ui->MonMeasurementSheet->getFilename().toLocal8Bit()); --- 1198,1202 ---- strcpy(sys.hdr.MeasurementSheet, measfile.toLocal8Bit()); ! if (ui->radioButtonCandMFile ->isChecked()) { strcpy(sys.hdr.MonMeasurementSheet, (const char*)ui->MonMeasurementSheet->getFilename().toLocal8Bit()); *************** *** 1239,1244 **** strcpy(sys.hdr.MonOutputProfileFile, (const char*) ui->OutputFileEdit_Mon -> text().toLocal8Bit()); sys.hdr.cur_ref = ui->TargetSelector->getCurrItem(); ! strcpy(sys.hdr.template_dir, templates.local8Bit()); ! strcpy(sys.hdr.mon_profile_dir, (const char*) ui->MonitorProfileSelector->Dir.local8Bit()); strcpy(sys.hdr.mon_profile_file_name, (const char*)ui->MonitorProfileSelector->getFilename().toLocal8Bit()); } --- 1212,1217 ---- strcpy(sys.hdr.MonOutputProfileFile, (const char*) ui->OutputFileEdit_Mon -> text().toLocal8Bit()); sys.hdr.cur_ref = ui->TargetSelector->getCurrItem(); ! strcpy(sys.hdr.template_dir, templates.toLocal8Bit()); ! strcpy(sys.hdr.mon_profile_dir, (const char*) ui->MonitorProfileSelector->Dir.toLocal8Bit()); strcpy(sys.hdr.mon_profile_file_name, (const char*)ui->MonitorProfileSelector->getFilename().toLocal8Bit()); } *************** *** 1281,1285 **** if (!checkDescription()) return; Console = ui->ProgressConsole; - Console -> setTextFormat( Qt::LogText); strcpy(sys.hdr.temp_file, WorkTempFileName.toLocal8Bit()); --- 1254,1257 ---- *************** *** 1326,1330 **** Console = ui->ProgressConsole_mon; ! Console -> setTextFormat( Qt::LogText); strcpy(sys.hdr.temp_file, WorkTempFileName.toLocal8Bit()); --- 1298,1302 ---- Console = ui->ProgressConsole_mon; ! //Console -> setTextFormat( Qt::LogText); strcpy(sys.hdr.temp_file, WorkTempFileName.toLocal8Bit()); *************** *** 1345,1349 **** strcpy(sys.hdr.MonCalibrationSheet, ""); } ! else if (ui->radioButtonCandMFile -> isOn()) { strcpy(sys.hdr.MonMeasurementSheet, ui->MonMeasurementSheet->getFilename().toLocal8Bit()); --- 1317,1321 ---- strcpy(sys.hdr.MonCalibrationSheet, ""); } ! else if (ui->radioButtonCandMFile -> isChecked()) { strcpy(sys.hdr.MonMeasurementSheet, ui->MonMeasurementSheet->getFilename().toLocal8Bit()); Index: lprofmain-priv.cpp =================================================================== RCS file: /cvsroot/lprof/lprof/src/lprofqt/lprofmain-priv.cpp,v retrieving revision 1.4.2.1 retrieving revision 1.4.2.2 diff -C2 -d -r1.4.2.1 -r1.4.2.2 *** lprofmain-priv.cpp 9 Jun 2009 12:25:25 -0000 1.4.2.1 --- lprofmain-priv.cpp 16 Jun 2009 07:26:25 -0000 1.4.2.2 *************** *** 39,44 **** markPositions Marks; ! //Q3PointArray grid_corners; //removed by me ============================================= ! QPolygon grid_corners; //added by me ========================================== QString outprofile; --- 39,43 ---- markPositions Marks; ! QPolygon grid_corners; QString outprofile; Index: griditem.cpp =================================================================== RCS file: /cvsroot/lprof/lprof/src/lprofqt/griditem.cpp,v retrieving revision 1.4.2.1 retrieving revision 1.4.2.2 diff -C2 -d -r1.4.2.1 -r1.4.2.2 *** griditem.cpp 9 Jun 2009 12:25:25 -0000 1.4.2.1 --- griditem.cpp 16 Jun 2009 07:26:25 -0000 1.4.2.2 *************** *** 39,88 **** // ----- The grid item -------------- - // changed by me ----------------------------------------------------- - /* - GridItem::GridItem( Q3Canvas *canvas, QString Template, int SafeFrame ) - : Q3CanvasRectangle( 10, 10, canvas->width() - 10, canvas->height() - 10, canvas) - { - // qDebug("GridItem::GridItem"); - SafeFrameFactor = SafeFrame / 100.; - setBrush( Qt::NoBrush) ; - - LCMSHANDLE hIT8 = cmsxIT8LoadFromFile(Template.local8Bit()); - - if (hIT8) - { - int nRects = (int) cmsxIT8GetPropertyDbl(hIT8, "NUMBER_OF_SETS"); - char PatchName[256]; - - for (int i=0; i < nRects; i++) - { - if (cmsxIT8GetDataSetByPos(hIT8, 0, i, PatchName, 256)) - { - - GridLayout Patch; - - double x, y, xSize, ySize; - - cmsxIT8GetDataSetDbl(hIT8, PatchName, "POS_X", &x); - cmsxIT8GetDataSetDbl(hIT8, PatchName, "POS_Y", &y); - cmsxIT8GetDataSetDbl(hIT8, PatchName, "SIZE_X", &xSize); - cmsxIT8GetDataSetDbl(hIT8, PatchName, "SIZE_Y", &ySize); - - strcpy(Patch.p.Name, (const char *) PatchName); - Patch.rect.setRect(int(x), int(y), int(xSize), int (ySize)); - - Layout.append(Patch); - - } - } - - cmsxIT8Free(hIT8); - } - - setZ(10); - show(); - } - */ - GridItem::GridItem( QGraphicsScene *canvas, QString Template, int SafeFrame ) --- 39,42 ---- *************** *** 125,141 **** } - //setZ(10); //removed by me and added setZValue() instead -------------------- setZValue(10); show(); } - //------------------------------------------------------------ - - - - - - - static void DoDeflateRect(QRect& rect, int sx, int sy) --- 79,86 ---- Index: figureeditor.cpp =================================================================== RCS file: /cvsroot/lprof/lprof/src/lprofqt/figureeditor.cpp,v retrieving revision 1.3.2.1 retrieving revision 1.3.2.2 diff -C2 -d -r1.3.2.1 -r1.3.2.2 *** figureeditor.cpp 9 Jun 2009 12:25:25 -0000 1.3.2.1 --- figureeditor.cpp 16 Jun 2009 07:26:25 -0000 1.3.2.2 *************** *** 36,40 **** #include <QResizeEvent> #include <QMouseEvent> ! #include <QList> //added by me ----------------------------------------------------------- // --- The figure editor ---------------------- --- 36,40 ---- #include <QResizeEvent> #include <QMouseEvent> ! #include <QList> // --- The figure editor ---------------------- *************** *** 44,51 **** // qDebug("FigureEditor::resizeEvent"); - //following line is changed by me ----------------------------------------------------------- - //Q3CanvasView::resizeEvent( e ); QGraphicsView::resizeEvent( e ); - //------------------------------------------------------------------------------ maindialog.FigEditor-> resize(width(), height()); maindialog.zeroProgressBars(); --- 44,48 ---- *************** *** 147,173 **** } - - - //changed by me ------------------------------------------------------------------------------- - /* void FigureEditor::clear() { // qDebug("FigureEditor::clear"); - Q3CanvasItemList list = canvas()->allItems(); - Q3CanvasItemList::Iterator it = list.begin(); - for (; it != list.end(); ++it) { - if ( *it ) - delete *it; - } - - moving = NULL; - sizing = NULL; - unshearing = NULL; - } - */ - - void FigureEditor::clear() - { - // qDebug("FigureEditor::clear"); QList<QGraphicsItem *> list =items(); QList<QGraphicsItem *> ::Iterator it = list.begin(); --- 144,150 ---- *************** *** 181,183 **** unshearing = NULL; } ! //----------------------------------------------------------------------------------------- --- 158,160 ---- unshearing = NULL; } ! Index: lprofmain.h =================================================================== RCS file: /cvsroot/lprof/lprof/src/lprofqt/lprofmain.h,v retrieving revision 1.52.2.1 retrieving revision 1.52.2.2 diff -C2 -d -r1.52.2.1 -r1.52.2.2 *** lprofmain.h 9 Jun 2009 12:25:25 -0000 1.52.2.1 --- lprofmain.h 16 Jun 2009 07:26:25 -0000 1.52.2.2 *************** *** 48,53 **** #include "main.h" - - //added by me --------------------------------------------------------------------- #include <QVBoxLayout> #include <QGraphicsView> --- 48,51 ---- *************** *** 56,69 **** #include <QGraphicsRectItem> #include <QApplication> - #include <q3urloperator.h> - //removed by me----------------------------------------------------------------------- - /* - #include <q3canvas.h> - - #include <Q3VBoxLayout> - */ - //---------------------------------------------------------------------------- -------- QAssistantClient* getHelp(); --- 54,59 ---- *************** *** 208,246 **** // The back image - // ported from Q3CanvasRectangle to QGraphicsRectItem ------------------------------------------------------------------------------------ - /* - class ImageItem: public Q3CanvasRectangle { - - public: - - ImageItem(QString ImageFile, - const QString MonitorProfile, - const QString ScannerProfile, - Q3Canvas *canvas ); - - int rtti () const { return imageRTTI; } - - void Reload(QString ImageFile, - const QString MonitorProfile, - const QString ScannerProfile, - Q3Canva... [truncated message content] |
