lprof-devel Mailing List for LProf open source ICC profiler (Page 4)
Brought to you by:
hvengel
Menu
▾
▴
lprof-devel — email list intended for lprof developers and other interested parties
You can subscribe to this list here.
| 2005 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(36) |
Dec
(61) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2006 |
Jan
(26) |
Feb
(125) |
Mar
(171) |
Apr
(129) |
May
(28) |
Jun
(31) |
Jul
|
Aug
(16) |
Sep
(1) |
Oct
|
Nov
(1) |
Dec
(10) |
| 2007 |
Jan
(37) |
Feb
(16) |
Mar
(60) |
Apr
(151) |
May
(13) |
Jun
(106) |
Jul
(7) |
Aug
(11) |
Sep
(105) |
Oct
(219) |
Nov
(68) |
Dec
(7) |
| 2008 |
Jan
(401) |
Feb
(70) |
Mar
(26) |
Apr
(2) |
May
(2) |
Jun
|
Jul
|
Aug
(2) |
Sep
|
Oct
|
Nov
|
Dec
|
| 2009 |
Jan
(1) |
Feb
(15) |
Mar
|
Apr
|
May
(17) |
Jun
(26) |
Jul
(35) |
Aug
(7) |
Sep
(3) |
Oct
|
Nov
|
Dec
(14) |
| 2010 |
Jan
(11) |
Feb
(6) |
Mar
(1) |
Apr
|
May
(3) |
Jun
(6) |
Jul
(3) |
Aug
(1) |
Sep
|
Oct
(2) |
Nov
|
Dec
|
| 2012 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(1) |
Jun
|
Jul
|
Aug
(3) |
Sep
|
Oct
|
Nov
|
Dec
|
| 2014 |
Jan
|
Feb
|
Mar
|
Apr
(1) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Amit K. <ami...@us...> - 2009-06-11 16:42:23
|
Update of /cvsroot/lprof/lprof/src/lprofqt In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv24055 Removed Files: lprofmainbase.ui Log Message: i --- lprofmainbase.ui DELETED --- |
|
From: Amit K. <ami...@us...> - 2009-06-10 19:38:12
|
Update of /cvsroot/lprof/lprof/src/libqtlcmswidgets In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv14655 Modified Files: Tag: GSoC-2009 qtlcmswidgets.cpp qtlcmswidgets.h Log Message: Problems that were coming before are not coming now. I think now it is working good. I was getting errors in ProfileSelector and IT8Selector when qt3support was disabled only. This errors was due to the fact that these were inheriting class BaseSelector. BaseSelector was inherited by q3hbox class that is not present in qt4. In qt4 the functionality of q3hbox can be obtained by creating a simple QWidget instance and a QHBoxLayout type layout. So i made change in /src/libqtlcmswidgets/qtlcmswidgets.cpp and /src/libqtlcmswidgets/qtlcmswidgets.h files. I made BaseSelector to inherit from QWidget. And attached a QHBoxLayout type layout named layout_baseselector. Then I attached all widget previously attached to baseslector to this layout. Index: qtlcmswidgets.h =================================================================== RCS file: /cvsroot/lprof/lprof/src/libqtlcmswidgets/qtlcmswidgets.h,v retrieving revision 1.15 retrieving revision 1.15.2.1 diff -C2 -d -r1.15 -r1.15.2.1 *** qtlcmswidgets.h 6 Mar 2008 21:18:58 -0000 1.15 --- qtlcmswidgets.h 10 Jun 2009 19:38:08 -0000 1.15.2.1 *************** *** 43,47 **** #include <QLineEdit> #include <QPainter> ! #include "lcmsprf.h" --- 43,47 ---- #include <QLineEdit> #include <QPainter> ! #include <QWidget> #include "lcmsprf.h" *************** *** 50,53 **** --- 50,55 ---- // It has bed designed to never be extended anymore + // changed by me =========================================================================== + /* class BaseSelector: public Q3HBox { *************** *** 121,124 **** --- 123,207 ---- }; + */ + + + class BaseSelector: public QWidget { + + + Q_OBJECT + Q_PROPERTY(QString FileMask READ ReadFileMask WRITE WriteFileMask); + Q_PROPERTY(QString Dir READ ReadDir WRITE WriteDir); + Q_PROPERTY(QString Prompt READ getPrompt WRITE setPrompt); + Q_PROPERTY(int lUseDescriptor READ getUseDescriptor WRITE setUseDescriptor); + Q_PROPERTY(int lForOutput READ getForOutput WRITE setForOutput);; + + public: + + BaseSelector(QString ThePrompt, QString DefaultDir, QString Mask = "*.*", BOOL lUseLineEdit = FALSE, BOOL showFileDialog = TRUE, + QWidget* parent=0, const char* name=0, Qt::WFlags f=0); + + QString getFilename() const; + void setFilename(const QString name); + + QString getPrompt() const { return Prompt->text(); } + void setPrompt(QString text) { Prompt->setText(text); } + + + QString ReadFileMask() const { return FileMask; } + void WriteFileMask(QString Mask) { FileMask = Mask; } + + QString ReadDir() const { return Dir; } + void WriteDir(QString TheDir) { Dir= TheDir; } + + void setCurrItem(int n) { Combo->setCurrentItem(n); } + int getCurrItem() { return Combo->currentItem(); } + int count() {return Combo->count();} + + void setUseDescriptor(int n) { lUseDescriptor = n; } + int getUseDescriptor() const { return lUseDescriptor; } + + void setForOutput(int n) { lUseDescriptor = n; } + int getForOutput() const { return lUseDescriptor; } + + + void setDirCaption(QString text) { PickButton->setText(text); } + + + QString Dir; + QString FileMask; + int lUseDescriptor; + int lUseLineEdit; + int lForOutput; + + virtual void FillValues() = 0; + + protected: + + QStringList Descriptions, FileNames; + QLabel* Prompt; + QComboBox* Combo; + QLineEdit* LineEdit; + QPushButton* PickButton; + + QPushButton* NewButtonPtr; + + protected slots: + + void slotButtonClicked(); + void slotValueChanged(); + + signals: + + void valueChanged(); + + + }; + + + + + //=================================================================== + + Index: qtlcmswidgets.cpp =================================================================== RCS file: /cvsroot/lprof/lprof/src/libqtlcmswidgets/qtlcmswidgets.cpp,v retrieving revision 1.42 retrieving revision 1.42.2.1 diff -C2 -d -r1.42 -r1.42.2.1 *** qtlcmswidgets.cpp 6 Mar 2008 21:18:58 -0000 1.42 --- qtlcmswidgets.cpp 10 Jun 2009 19:38:08 -0000 1.42.2.1 *************** *** 77,80 **** --- 77,82 ---- // A selector widget + //removed by me ============================================================= + /* BaseSelector::BaseSelector(QString ThePrompt, QString DefaultDir, QString Mask, BOOL lLineEdit, BOOL showFileDialog, *************** *** 122,125 **** --- 124,197 ---- connect( Combo, SIGNAL( activated(int) ), this, SLOT( slotValueChanged() ) ); } + */ + + BaseSelector::BaseSelector(QString ThePrompt, QString DefaultDir, + QString Mask, BOOL lLineEdit, BOOL showFileDialog, + QWidget* parent, const char* name, Qt::WFlags f) : + QWidget(parent, f), //changed ======= + Dir(DefaultDir), + FileMask(Mask), + lUseDescriptor(0), + lUseLineEdit(lLineEdit) + { + //added ========================================== + //now on when we want to add any widget we will add to layout_baseselector instead to this. + setAccessibleName(QString(QLatin1String(name))); + QHBoxLayout *layout_baseselector = new QHBoxLayout; + layout_baseselector->setSpacing(10); + layout_baseselector->setContentsMargins(2,2,2,2); + this->setLayout(layout_baseselector); + //=============================================== + + lForOutput = FALSE; + //Prompt = new QLabel(ThePrompt, this); + Prompt=new QLabel(ThePrompt); //added=== + this->layout()->addWidget(Prompt); //added=== + Prompt->setAlignment(Qt::AlignRight|Qt::AlignVCenter); + Prompt->setSizePolicy(QSizePolicy (QSizePolicy::Preferred, QSizePolicy::Preferred)); + + if (lUseLineEdit) + { + // LineEdit = new QLineEdit(this); + LineEdit = new QLineEdit(); //added=== + this->layout()->addWidget(LineEdit); //added=== + Prompt->setBuddy(LineEdit); + Combo = NULL; + } + else + { + // Combo = new QComboBox(FALSE, this), + Combo =new QComboBox(FALSE); //added=== + this->layout()->addWidget(Combo); //added=== + Combo->setEditable(FALSE); + Combo-> setSizePolicy(QSizePolicy (QSizePolicy::Expanding, QSizePolicy::Preferred)); + Prompt->setBuddy(Combo); + LineEdit = NULL; + } + + //setMargin(2); //implemented this when created layout + //setSpacing(10); + if (showFileDialog) + { + //PickButton = new QPushButton(this); + PickButton = new QPushButton(); //added=== + this->layout()->addWidget(PickButton); //added=== + + PickButton -> setSizePolicy(QSizePolicy (QSizePolicy::Minimum, QSizePolicy::Preferred)); + PickButton-> setText(tr (" Select Directory ")); + NewButtonPtr = NULL; + connect(PickButton, SIGNAL( clicked() ), this, SLOT( slotButtonClicked() ) ); + } + + if (lUseLineEdit) + connect( LineEdit, SIGNAL( textChanged(const QString&) ), this, SLOT( slotValueChanged() ) ); + else + connect( Combo, SIGNAL( activated(int) ), this, SLOT( slotValueChanged() ) ); + } + + //=================================================================== + + + |
|
From: Amit K. <ami...@us...> - 2009-06-09 12:53:30
|
Update of /cvsroot/lprof/lprof/src/lprofqt In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv11486 Modified Files: Tag: GSoC-2009 lprofmainbase.ui Log Message: yryr Index: lprofmainbase.ui =================================================================== RCS file: /cvsroot/lprof/lprof/src/lprofqt/lprofmainbase.ui,v retrieving revision 1.50 retrieving revision 1.50.2.1 diff -C2 -d -r1.50 -r1.50.2.1 *** lprofmainbase.ui 19 Feb 2008 21:02:47 -0000 1.50 --- lprofmainbase.ui 9 Jun 2009 12:21:11 -0000 1.50.2.1 *************** *** 1,6 **** ! <ui version="4.0" > <class>lprofMainBase</class> ! <widget class="QDialog" name="lprofMainBase" > ! <property name="geometry" > <rect> <x>0</x> --- 1,7 ---- ! <?xml version="1.0" encoding="UTF-8"?> ! <ui version="4.0"> <class>lprofMainBase</class> [...4537 lines suppressed...] <customwidget> <class>IT8FileSelector</class> ! <extends>QFrame</extends> <header>qtlcmswidgets.h</header> + <container>1</container> </customwidget> <customwidget> <class>ICCProfileSelector</class> ! <extends>QFrame</extends> <header>qtlcmswidgets.h</header> + <container>1</container> </customwidget> </customwidgets> <includes> ! <include location="local">qtlcmswidgets.h</include> </includes> <resources> ! <include location="../../lprof.qrc"/> </resources> <connections/> |
|
From: Amit K. <ami...@us...> - 2009-06-09 12:52:22
|
Update of /cvsroot/lprof/lprof/src/lprofqt In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv11550 Modified Files: Tag: GSoC-2009 config.cpp figureeditor.cpp griditem.cpp imageitem.cpp lprofmain-priv.cpp lprofmain-priv.h lprofmain.cpp lprofmain.h slots.cpp Log Message: I have made some changes in src\lprofqt. Index: slots.cpp =================================================================== RCS file: /cvsroot/lprof/lprof/src/lprofqt/slots.cpp,v retrieving revision 1.5 retrieving revision 1.5.2.1 diff -C2 -d -r1.5 -r1.5.2.1 *** slots.cpp 8 Mar 2008 22:53:14 -0000 1.5 --- slots.cpp 9 Jun 2009 12:25:25 -0000 1.5.2.1 *************** *** 146,150 **** Canvas); ! Canvas->setChanged(rect()); Canvas->update(); ControlsToValues(); --- 146,152 ---- Canvas); ! //changed by me ------------------------------------------------------------------- ! //Canvas->setChanged(rect()); ! Canvas->update(rect()); //added by me in place of Canvas->setChanged(rect());--------------------------------- Canvas->update(); ControlsToValues(); *************** *** 621,634 **** { case 0: ! ui->textEditProfileParms->insertParagraph(verb1, 3); ! break; case 1: ! ui->textEditProfileParms->insertParagraph(verb2, 3); ! break; case 2: ! ui->textEditProfileParms->insertParagraph(verb3, 3); ! break; } ! ui->textEditProfileParms->insertParagraph(reg, 4); if (sys.lOptRGCV) --- 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) *************** *** 637,697 **** Buff = QString::fromLocal8Bit(" ") + manSm + Buff.sprintf(" %i" ,sys.RsplSmoothness); ! ui->textEditProfileParms->insertParagraph(Buff, 5); ! ! ! ui->textEditProfileParms->insertParagraph(VC, 6); switch (sys.hdr.device.surround) { case 0: ! ui->textEditProfileParms->insertParagraph(capav4,7); break; case 1: ! ui->textEditProfileParms->insertParagraph(capav, 7); ! break; case 2: ! ui->textEditProfileParms->insertParagraph(capdim, 7); break; case 3: ! ui->textEditProfileParms->insertParagraph(capdark, 7); ! break; case 4: ! ui->textEditProfileParms->insertParagraph(capcut, 7); break; default: ! ui->textEditProfileParms->insertParagraph(capav, 7); } ! Buff = capLa + Buff.sprintf(" %g", sys.hdr.device.La); ui->textEditProfileParms->insertParagraph(Buff, 8); ! Buff = capYb + Buff.sprintf(" %g", sys.hdr.device.Yb); ! ui->textEditProfileParms->insertParagraph(Buff, 8); switch (sys.hdr.PCS.surround) { case 0: ! ui->textEditProfileParms->insertParagraph(pcsav4,9); break; case 1: ! ui->textEditProfileParms->insertParagraph(pcsav, 9); break; case 2: ! ui->textEditProfileParms->insertParagraph(pcsdim, 9); break; case 3: ! ui->textEditProfileParms->insertParagraph(pcsdark, 9); break; case 4: ! ui->textEditProfileParms->insertParagraph(pcscut, 9); ! break; default: ! ui->textEditProfileParms->insertParagraph(pcsav, 9); } ! Buff = pcsLa + Buff.sprintf(" %g", sys.hdr.PCS.La); ui->textEditProfileParms->insertParagraph(Buff, 10); ! Buff = pcsYb + Buff.sprintf(" %g", sys.hdr.PCS.Yb); ! ui->textEditProfileParms->insertParagraph(Buff, 11); Buff = WPH + QString::fromLocal8Bit(":"); ! ui->textEditProfileParms->insertParagraph(Buff, 11); ! Buff = QString::fromLocal8Bit(" ") + loc + QString::fromLocal8Bit(": "); switch (sys.hdr.WhitePointParams.location) { --- 643,723 ---- 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); + switch (sys.hdr.device.surround) { 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); switch (sys.hdr.PCS.surround) { 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(": "); switch (sys.hdr.WhitePointParams.location) { *************** *** 730,734 **** break; } ! ui->textEditProfileParms->insertParagraph(Buff, 12); Buff = QString::fromLocal8Bit(" ") + lumScaling + QString::fromLocal8Bit(": "); --- 756,761 ---- break; } ! //ui->textEditProfileParms->insertParagraph(Buff, 12); ! ui->textEditProfileParms->append(Buff); Buff = QString::fromLocal8Bit(" ") + lumScaling + QString::fromLocal8Bit(": "); *************** *** 745,749 **** break; } ! ui->textEditProfileParms->insertParagraph(Buff, 13); } --- 772,777 ---- break; } ! //ui->textEditProfileParms->insertParagraph(Buff, 13); ! ui->textEditProfileParms->append(Buff); } *************** *** 764,826 **** { case 0: ! ui->textEditProfileParms_mon->insertParagraph(verb1, 3); break; case 1: ! ui->textEditProfileParms_mon->insertParagraph(verb2, 3); break; case 2: ! ui->textEditProfileParms_mon->insertParagraph(verb3, 3); ! break; } ! ui->textEditProfileParms_mon->insertParagraph(VC, 4); switch (sys.hdr.device.surround) { case 0: ! ui->textEditProfileParms_mon->insertParagraph(monav4,5); ! break; case 1: ! ui->textEditProfileParms_mon->insertParagraph(monav, 5); ! break; case 2: ! ui->textEditProfileParms_mon->insertParagraph(mondim, 5); ! break; case 3: ! ui->textEditProfileParms_mon->insertParagraph(mondark, 5); ! break; case 4: ! ui->textEditProfileParms_mon->insertParagraph(moncut, 5); ! break; default: ! ui->textEditProfileParms_mon->insertParagraph(monav, 5); } ! Buff = monLa + Buff.sprintf(" %g", sys.hdr.device.La); ui->textEditProfileParms_mon->insertParagraph(Buff, 6); ! Buff = monYb + Buff.sprintf(" %g", sys.hdr.device.Yb); ! ui->textEditProfileParms_mon->insertParagraph(Buff, 6); switch (sys.hdr.PCS.surround) { case 0: ! ui->textEditProfileParms_mon->insertParagraph(pcsav4,7); break; case 1: ! ui->textEditProfileParms_mon->insertParagraph(pcsav, 7); ! break; case 2: ! ui->textEditProfileParms_mon->insertParagraph(pcsdim, 7); ! break; case 3: ! ui->textEditProfileParms_mon->insertParagraph(pcsdark, 7); ! break; case 4: ! ui->textEditProfileParms_mon->insertParagraph(pcscut, 7); ! break; default: ! ui->textEditProfileParms_mon->insertParagraph(pcsav, 7); } ! Buff = pcsLa + Buff.sprintf(" %g", sys.hdr.PCS.La); ui->textEditProfileParms_mon->insertParagraph(Buff, 8); ! Buff = pcsYb + Buff.sprintf(" %g", sys.hdr.PCS.Yb); ! ui->textEditProfileParms_mon->insertParagraph(Buff, 8); ! } } --- 792,876 ---- { 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); ! } } *************** *** 832,877 **** { ui->textEditProfileID->setText( tr("File_Name: ")); ! ui->textEditProfileID->moveCursor(Q3TextEdit::MoveDown, 0); ! ui->textEditProfileID->moveCursor(Q3TextEdit::MoveLineEnd, 0); ! ui->textEditProfileID->insert(QString::fromLocal8Bit(sys.hdr.OutputProfileFile)); ! ui->textEditProfileID->insertParagraph(tr("Description: "), 3); ! ui->textEditProfileID->moveCursor(Q3TextEdit::MoveDown, 0); ! ui->textEditProfileID->moveCursor(Q3TextEdit::MoveLineEnd, 0); ! ui->textEditProfileID->insert(QString::fromLocal8Bit(sys.hdr.Description)); ! ui->textEditProfileID->insertParagraph( tr("Model: "), 5); ! ui->textEditProfileID->moveCursor(Q3TextEdit::MoveDown, 0); ! ui->textEditProfileID->moveCursor(Q3TextEdit::MoveLineEnd, 0); ! ui->textEditProfileID->insert(QString::fromLocal8Bit(sys.hdr.Model)); ! ui->textEditProfileID->insertParagraph(tr("Manufacturer: "), 7); ! ui->textEditProfileID->moveCursor(Q3TextEdit::MoveDown, 0); ! ui->textEditProfileID->moveCursor(Q3TextEdit::MoveLineEnd, 0); ! ui->textEditProfileID->insert(QString::fromLocal8Bit(sys.hdr.Manufacturer)); ! ui->textEditProfileID->insertParagraph(tr("Copyright: "), 9); ! ui->textEditProfileID->moveCursor(Q3TextEdit::MoveDown, 0); ! ui->textEditProfileID->moveCursor(Q3TextEdit::MoveLineEnd, 0); ! 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_mon->insert(QString::fromLocal8Bit(sys.hdr.mon_profile_file_name)); ! ui->textEditProfileID_mon->insertParagraph(tr("Description: "), 3); ! ui->textEditProfileID_mon->moveCursor(Q3TextEdit::MoveDown, 0); ! ui->textEditProfileID_mon->moveCursor(Q3TextEdit::MoveLineEnd, 0); ! ui->textEditProfileID_mon->insert(QString::fromLocal8Bit(sys.hdr.Description)); ! ui->textEditProfileID_mon->insertParagraph( tr("Model: "), 5); ! ui->textEditProfileID_mon->moveCursor(Q3TextEdit::MoveDown, 0); ! ui->textEditProfileID_mon->moveCursor(Q3TextEdit::MoveLineEnd, 0); ! ui->textEditProfileID_mon->insert(QString::fromLocal8Bit(sys.hdr.Model)); ! ui->textEditProfileID_mon->insertParagraph(tr("Manufacturer: "), 7); ! ui->textEditProfileID_mon->moveCursor(Q3TextEdit::MoveDown, 0); ! ui->textEditProfileID_mon->moveCursor(Q3TextEdit::MoveLineEnd, 0); ! ui->textEditProfileID_mon->insert(QString::fromLocal8Bit(sys.hdr.Manufacturer)); ! ui->textEditProfileID_mon->insertParagraph(tr("Copyright: "), 9); ! ui->textEditProfileID_mon->moveCursor(Q3TextEdit::MoveDown, 0); ! ui->textEditProfileID_mon->moveCursor(Q3TextEdit::MoveLineEnd, 0); ! ui->textEditProfileID_mon->insert(QString::fromLocal8Bit(sys.hdr.Copyright)); } } --- 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)); } } Index: imageitem.cpp =================================================================== RCS file: /cvsroot/lprof/lprof/src/lprofqt/imageitem.cpp,v retrieving revision 1.4 retrieving revision 1.4.2.1 diff -C2 -d -r1.4 -r1.4.2.1 *** imageitem.cpp 6 Mar 2008 21:18:58 -0000 1.4 --- imageitem.cpp 9 Jun 2009 12:25:25 -0000 1.4.2.1 *************** *** 119,123 **** ! ImageItem::ImageItem(QString ImageFile, const QString Monitor, const QString Scanner, Q3Canvas *canvas ) : Q3CanvasRectangle( canvas ), image() --- 119,124 ---- ! //changed by me ==-=========================================================================== ! /* ImageItem::ImageItem(QString ImageFile, const QString Monitor, const QString Scanner, Q3Canvas *canvas ) : Q3CanvasRectangle( canvas ), image() *************** *** 128,134 **** Reload(ImageFile, Monitor, Scanner, canvas); } ! void ImageItem::Reload(QString ImageFile, const QString Monitor, const QString Scanner, Q3Canvas *canvas ) { --- 129,148 ---- 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; + Reload(ImageFile, Monitor, Scanner, canvas); + } ! //======================================================================================== ! ! ! void ImageItem::Reload(QString ImageFile, const QString Monitor, const QString Scanner, QGraphicsScene *canvas ) //changed by me from Q3Canvas to QGraphicsScene { *************** *** 267,272 **** QImage scaled = image.smoothScale(canvas->width(), canvas->height()); ! setSize( scaled.width(), scaled.height() ); ! sx = (double) image.width() / scaled.width(); sy = (double) image.height() / scaled.height(); --- 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(); *************** *** 291,296 **** proof.convertFromImage(pscaled); ! move(0, 0); ! setZ(5); show(); // qDebug("ImageItem::Reload Done"); --- 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"); Index: lprofmain-priv.h =================================================================== RCS file: /cvsroot/lprof/lprof/src/lprofqt/lprofmain-priv.h,v retrieving revision 1.6 retrieving revision 1.6.2.1 diff -C2 -d -r1.6 -r1.6.2.1 *** lprofmain-priv.h 6 Mar 2008 21:18:58 -0000 1.6 --- lprofmain-priv.h 9 Jun 2009 12:25:25 -0000 1.6.2.1 *************** *** 36,43 **** #include <qrect.h> #include <qassistantclient.h> ! #include <Q3TextEdit> //Added by qt3to4: - #include <Q3PointArray> - #include <Q3PtrList> #include <lcmsprf.h> #include <qtabwidget.h> --- 36,41 ---- #include <qrect.h> #include <qassistantclient.h> ! #include <QTextEdit> //Added by qt3to4: #include <lcmsprf.h> #include <qtabwidget.h> *************** *** 45,48 **** --- 43,57 ---- #include <QProgressBar> + //added by me ------------------------------------------------------ + #include <QPolygon> //in place of Q3PointArray + #include <QList> + #include <QTextEdit> + //removed by me ---------------------------------------------------- + + #include <Q3TextEdit> + #include <Q3PointArray> + #include <Q3PtrList> + + //----------------------------------------------------------------------- // Anything listed here should only be used in files that are // located in src/lprofqt. As the routines in these files are *************** *** 91,95 **** extern uint last_tab; ! extern Q3TextEdit* Console; extern QProgressBar* ProgBar; --- 100,109 ---- extern uint last_tab; ! //removed by me ------------------------------------------------------------------------------------- ! //extern Q3TextEdit* Console; ! //added by me --------------------------------------------------------------------------------------- ! extern QTextEdit* Console; ! ! extern QProgressBar* ProgBar; *************** *** 106,110 **** extern markPositions Marks; ! extern Q3PointArray grid_corners; extern QString outprofile; --- 120,129 ---- extern markPositions Marks; ! //removed by me ------------------------------------------------------------------------------------------------ ! //extern Q3PointArray grid_corners; ! //added by me -------------------------------------------------------------------------------------------------- ! extern QPolygon grid_corners; ! //-------------------------------------------------------------- ! extern QString outprofile; Index: lprofmain.cpp =================================================================== RCS file: /cvsroot/lprof/lprof/src/lprofqt/lprofmain.cpp,v retrieving revision 1.188 retrieving revision 1.188.2.1 diff -C2 -d -r1.188 -r1.188.2.1 *** lprofmain.cpp 18 May 2009 21:17:17 -0000 1.188 --- lprofmain.cpp 9 Jun 2009 12:25:25 -0000 1.188.2.1 *************** *** 39,43 **** #include <qtlcmswidgets.h> //Added by qt3to4: ! #include <Q3PtrList> #include "lprofmain.h" #include "lprofmain-priv.h" --- 39,43 ---- #include <qtlcmswidgets.h> //Added by qt3to4: ! #include "lprofmain.h" #include "lprofmain-priv.h" *************** *** 46,56 **** #include <string.h> #include <stdlib.h> - #include <qstringlist.h> - #include <q3buttongroup.h> #include <qlayout.h> #include <qradiobutton.h> #include <qcheckbox.h> - #include <q3groupbox.h> #include <qpushbutton.h> #include <qspinbox.h> --- 46,53 ---- *************** *** 58,82 **** #include <qlabel.h> #include <qslider.h> - #include <q3filedialog.h> - #include <q3multilineedit.h> #include <qtabwidget.h> - #include <q3textview.h> - #include <q3progressbar.h> #include <qdir.h> - #include <q3table.h> #include <qtooltip.h> #include <qfileinfo.h> - #include <qvariant.h> #include <qpixmap.h> - #include <q3mainwindow.h> - #include <q3filedialog.h> #include <qcombobox.h> #include <qtabwidget.h> - #include <q3canvas.h> #include <qimage.h> #include <qpainter.h> - #include <q3multilineedit.h> - #include <q3textstream.h> #include <qapplication.h> #include <qspinbox.h> --- 55,68 ---- *************** *** 88,94 **** #include <qtranslator.h> #include <qthread.h> - #include <qapplication.h> - #include <q3textbrowser.h> #include <qlineedit.h> #include <qlist.h> --- 74,78 ---- *************** *** 96,100 **** #include <qcolor.h> #include <qtextcodec.h> - #include <q3listview.h> #include <qfileinfo.h> #include <qvalidator.h> --- 80,83 ---- *************** *** 102,107 **** #include <QTranslator> ! #include "ui_lprofmainbase.h" #include "vigra/imageiterator.hxx" #include "vigra/rgbvalue.hxx" --- 85,127 ---- #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> + #include <QFileDialog> + #include <QTextEdit> + #include <QProgressBar> + #include <QTableView> + #include <QTableWidget> + #include <QMainWindow> + #include <QGraphicsScene> + #include <QTextBrowser> + #include <QTextStream> + #include <QListView> + #include <QListWidget> + + //------------------------------------------------------ + + + #include "ui_lprofmainbase.h" #include "vigra/imageiterator.hxx" #include "vigra/rgbvalue.hxx" *************** *** 499,517 **** instType itype; ! Q3ListViewItem *item = ui->listViewPortsInsts -> selectedItem (); itype = mapCombo2Inst[ui->comboBoxDevice -> currentItem()]; ! ! if (validateIntrument(item -> text(1), itype)) { ! item -> setText(2, ui->comboBoxDevice -> currentText()); ! item -> setText(3, tr("Device verified")); charInstType.sprintf("%i", itype); ! item -> setText(4, charInstType); ! index = item -> text(0).toInt(&OK) - 1; if (OK) { sys.hdr.instArray[index].inst = itype; ! strcpy(sys.hdr.instArray[index].port, item -> text(1).toLocal8Bit()); } else --- 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 *************** *** 529,533 **** else { ! item -> setText(3, tr("Device failed verification.")); QMessageBox::critical(this, QTranslator::tr("Error installing measurement device."), QTranslator::tr("The measurement device was not found. It either it does not exist or does not match the device you selected. Please correct this condition and retry the operation")); --- 562,568 ---- else { ! // item -> setText(3, tr("Device failed verification.")); ! QTableWidgetItem *item3 =ui->listViewPortsInsts->item(my_row,3); ! item3->setText( tr("Device failed verification.")); QMessageBox::critical(this, QTranslator::tr("Error installing measurement device."), QTranslator::tr("The measurement device was not found. It either it does not exist or does not match the device you selected. Please correct this condition and retry the operation")); *************** *** 559,574 **** QString portnum, insttype; QString device, status; ! ! ui->listViewPortsInsts -> setSelectionMode(Q3ListView::Single); ! ui->listViewPortsInsts -> setAllColumnsShowFocus(TRUE); ! ui->listViewPortsInsts -> setColumnWidthMode (0, Q3ListView::Manual); ui->listViewPortsInsts -> setColumnWidth (0, 0); ! ui->listViewPortsInsts -> setColumnWidthMode (1, Q3ListView::Maximum ); ui->listViewPortsInsts -> setColumnWidth (1, 200); ! ui->listViewPortsInsts -> setColumnWidthMode (2, Q3ListView::Maximum ); ! ui->listViewPortsInsts -> setColumnWidth (2, 200); ! ui->listViewPortsInsts -> setColumnWidthMode (3, Q3ListView::Maximum ); ! ui->listViewPortsInsts -> setColumnWidth (3, 350); ! ui->listViewPortsInsts -> setColumnWidthMode (4, Q3ListView::Manual); ui->listViewPortsInsts -> setColumnWidth (4, 0); --- 594,613 ---- 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); *************** *** 587,593 **** else status = tr("No device installed."); ! (void) new Q3ListViewItem(ui->listViewPortsInsts, portnum, QString::fromLocal8Bit(sys.hdr.instArray[i].port), ! ui->comboBoxDevice -> currentText(), status, insttype); } } --- 626,654 ---- else 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);*/ } } Index: lprofmain-priv.cpp =================================================================== RCS file: /cvsroot/lprof/lprof/src/lprofqt/lprofmain-priv.cpp,v retrieving revision 1.4 retrieving revision 1.4.2.1 diff -C2 -d -r1.4 -r1.4.2.1 *** lprofmain-priv.cpp 6 Mar 2008 21:18:58 -0000 1.4 --- lprofmain-priv.cpp 9 Jun 2009 12:25:25 -0000 1.4.2.1 *************** *** 32,36 **** uint last_tab; ! Q3TextEdit* Console; QProgressBar* ProgBar; --- 32,36 ---- uint last_tab; ! QTextEdit* Console; QProgressBar* ProgBar; *************** *** 39,43 **** markPositions Marks; ! Q3PointArray grid_corners; QString outprofile; --- 39,44 ---- markPositions Marks; ! //Q3PointArray grid_corners; //removed by me ============================================= ! QPolygon grid_corners; //added by me ========================================== QString outprofile; Index: griditem.cpp =================================================================== RCS file: /cvsroot/lprof/lprof/src/lprofqt/griditem.cpp,v retrieving revision 1.4 retrieving revision 1.4.2.1 diff -C2 -d -r1.4 -r1.4.2.1 *** griditem.cpp 6 Mar 2008 21:18:58 -0000 1.4 --- griditem.cpp 9 Jun 2009 12:25:25 -0000 1.4.2.1 *************** *** 38,43 **** #include <QFile> ! // ----- The grid item -------------------------------------------------- ! GridItem::GridItem( Q3Canvas *canvas, QString Template, int SafeFrame ) : Q3CanvasRectangle( 10, 10, canvas->width() - 10, canvas->height() - 10, canvas) --- 38,44 ---- #include <QFile> ! // ----- The grid item -------------- ! // changed by me ----------------------------------------------------- ! /* GridItem::GridItem( Q3Canvas *canvas, QString Template, int SafeFrame ) : Q3CanvasRectangle( 10, 10, canvas->width() - 10, canvas->height() - 10, canvas) *************** *** 82,85 **** --- 83,138 ---- show(); } + */ + + + GridItem::GridItem( QGraphicsScene *canvas, QString Template, int SafeFrame ) + : QGraphicsRectItem( (qreal)10, (qreal)10, canvas->width() - 10, canvas->height() - 10, (QGraphicsItem *)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); //removed by me and added setZValue() instead -------------------- + setZValue(10); + show(); + } + + //------------------------------------------------------------ + + + + Index: figureeditor.cpp =================================================================== RCS file: /cvsroot/lprof/lprof/src/lprofqt/figureeditor.cpp,v retrieving revision 1.3 retrieving revision 1.3.2.1 diff -C2 -d -r1.3 -r1.3.2.1 *** figureeditor.cpp 19 Feb 2008 21:02:42 -0000 1.3 --- figureeditor.cpp 9 Jun 2009 12:25:25 -0000 1.3.2.1 *************** *** 36,39 **** --- 36,40 ---- #include <QResizeEvent> #include <QMouseEvent> + #include <QList> //added by me ----------------------------------------------------------- // --- The figure editor ---------------------- *************** *** 42,46 **** { // qDebug("FigureEditor::resizeEvent"); ! Q3CanvasView::resizeEvent( e ); maindialog.FigEditor-> resize(width(), height()); maindialog.zeroProgressBars(); --- 43,51 ---- { // qDebug("FigureEditor::resizeEvent"); ! ! //following line is changed by me ----------------------------------------------------------- ! //Q3CanvasView::resizeEvent( e ); ! QGraphicsView::resizeEvent( e ); ! //------------------------------------------------------------------------------ maindialog.FigEditor-> resize(width(), height()); maindialog.zeroProgressBars(); *************** *** 143,146 **** --- 148,154 ---- + + //changed by me ------------------------------------------------------------------------------- + /* void FigureEditor::clear() { *************** *** 157,159 **** unshearing = NULL; } ! --- 165,183 ---- unshearing = NULL; } ! */ ! ! void FigureEditor::clear() ! { ! // qDebug("FigureEditor::clear"); ! QList<QGraphicsItem *> list =items(); ! QList<QGraphicsItem *> ::Iterator it = list.begin(); ! for (; it != list.end(); ++it) { ! if ( *it ) ! delete *it; ! } ! ! moving = NULL; ! sizing = NULL; ! unshearing = NULL; ! } ! //----------------------------------------------------------------------------------------- Index: lprofmain.h =================================================================== RCS file: /cvsroot/lprof/lprof/src/lprofqt/lprofmain.h,v retrieving revision 1.52 retrieving revision 1.52.2.1 diff -C2 -d -r1.52 -r1.52.2.1 *** lprofmain.h 6 Mar 2008 21:18:59 -0000 1.52 --- lprofmain.h 9 Jun 2009 12:25:25 -0000 1.52.2.1 *************** *** 34,43 **** #include "lcmsprf.h" - #include <q3canvas.h> #include <qimage.h> #include <qassistantclient.h> #include <qsettings.h> #include <qmutex.h> - #include <q3urloperator.h> #include <QDialog> //Added by qt3to4: --- 34,41 ---- *************** *** 46,51 **** #include <QResizeEvent> #include <QMouseEvent> - #include <Q3VBoxLayout> - #include "vigra/config.hxx" #include "vigra/stdimage.hxx" --- 44,47 ---- *************** *** 53,56 **** --- 49,70 ---- #include "main.h" + //added by me --------------------------------------------------------------------- + #include <QVBoxLayout> + #include <QGraphicsView> + #include <QGraphicsScene> + #include <QString> + #include <QGraphicsRectItem> + #include <QApplication> + + #include <q3urloperator.h> + + //removed by me----------------------------------------------------------------------- + /* + #include <q3canvas.h> + + #include <Q3VBoxLayout> + */ + //---------------------------------------------------------------------------- -------- + QAssistantClient* getHelp(); QString get_global_help_path(); *************** *** 194,197 **** --- 208,213 ---- // The back image + // ported from Q3CanvasRectangle to QGraphicsRectItem ------------------------------------------------------------------------------------ + /* class ImageItem: public Q3CanvasRectangle { *************** *** 225,228 **** --- 241,285 ---- }; + */ + + class ImageItem: public QGraphicsRectItem { + + public: + + ImageItem(QString ImageFile, + const QString MonitorProfile, + const QString ScannerProfile, + QGraphicsScene *canvas ); //changed by me from Q3Canvas into QGraphicsScene. + + int rtti () const { return imageRTTI; } + + void Reload(QString ImageFile, + const QString MonitorProfile, + const QString ScannerProfile, + QGraphicsScene *canvas ); + + QImage image; + QPixmap pixmap, proof; + double sx, sy; + BOOL lProof; + + protected: + + void drawShape( QPainter & ); + void TransformImage(const QString OutputProfile, + const QString InputProfile, + vigra::DRGBImage& p, + QImage& pout); + + + }; + //------------------------------------------------------------------------------------------------------------------------------- + + + + + + + *************** *** 243,248 **** ! ! class GridItem: public Q3CanvasRectangle { --- 300,305 ---- ! //ported from Q3CanvasRectangle to QGraphicsRectItem -------------------------------------------------------------------------------------- ! /* class GridItem: public Q3CanvasRectangle { *************** *** 272,275 **** --- 329,381 ---- void drawShape(QPainter & ); }; + */ + + class GridItem: public QGraphicsRectItem { + + + public: + + GridItem( QGraphicsScene *canvas, QString TemplateFile, int SafeFrame ); + int rtti () const { return gridRTTI; } + + void Pick(QString InputProfile, QImage& Image, double sx, double sy); + + QList<GridLayout> Layout; + double SafeFrameFactor; + + + protected: + + int ScaleX(int n) + { + QRectF w; + w=rect (); + return (int) ((double) (n * (w.width())) / LAYOUT_MAX); //changed by me----------------------------------------- + } + int ScaleY(int n) + { + QRectF h; + h=rect(); + return (int) ((double) (n * (h.height())) / LAYOUT_MAX); //changed by me ------------------------------------------ + } + + void ComputePatchRects(QRect& OurViewport, + GridLayout* Patch, + QRect& Frame, + QRect& HotZone); + + void ComputeViewport(QRect& OurViewport, double sx, double sy); + void drawShape(QPainter & ); + }; + + //------------------------------------------------------------------------------------------------------------------------------------- + + + + + + + + *************** *** 327,330 **** --- 433,439 ---- class lprofMain; + // Porting from Q3CanvasView to QGraphicsView ................................................................................ + + /* class FigureEditor : public Q3CanvasView { *************** *** 354,357 **** --- 463,519 ---- }; + */ + class FigureEditor : public QGraphicsView { + + Q_OBJECT + + 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)) ;//added by me -------------------------------------------------------------------------------- + setObjectName(str); //added by me -------------------------------------------------------------------------------- + setWindowFlags(f); //added by me -------------------------------------------------------------------------------- + } + void clear(); + void resizeEvent( QResizeEvent* e ); + + protected: + void contentsMousePressEvent(QMouseEvent*); + + signals: + void status(const QString&); + void WPPointsSelected(); + + protected: + FigureEditor& operator=( const FigureEditor& rhs ); + + GridItem* moving; + GridItem* sizing; + GridItem* unshearing; + QPoint moving_start; + lprofMain &maindialog; + + }; + + + + + + + + + + + + + + + + + + + namespace Ui { class lprofMainBase; } ; *************** *** 415,419 **** void ReferenceFileExists(); ! Q3Canvas* Canvas; Q3VBoxLayout* CanvasFrameLayout; GridItem* TheGrid; --- 577,581 ---- void ReferenceFileExists(); ! QGraphicsScene* Canvas; //changed by me from Q3Canvas to QGraphicsScene --------------------------------------------------- Q3VBoxLayout* CanvasFrameLayout; GridItem* TheGrid; Index: config.cpp =================================================================== RCS file: /cvsroot/lprof/lprof/src/lprofqt/config.cpp,v retrieving revision 1.8 retrieving revision 1.8.2.1 diff -C2 -d -r1.8 -r1.8.2.1 *** config.cpp 8 Mar 2008 22:31:11 -0000 1.8 --- config.cpp 9 Jun 2009 12:25:25 -0000 1.8.2.1 *************** *** 50,53 **** --- 50,57 ---- #include <Q3VBoxLayout> + //added by me ------------------------------------------------------------ + #include <QTimer> + //------------------------------------------------------------------- + #include "ui_lprofmainbase.h" *************** *** 180,185 **** CanvasFrameLayout->setMargin( 1 ); if (Canvas) delete Canvas; ! Canvas = new Q3Canvas(measure_view_H, measure_view_V); ! Canvas -> setAdvancePeriod(30); if (FigEditor) delete FigEditor; FigEditor = new FigureEditor(*this, *Canvas, ui->CanvasFrame); --- 184,197 ---- CanvasFrameLayout->setMargin( 1 ); if (Canvas) delete Canvas; ! // Canvas = new Q3Canvas(measure_view_H, measure_view_V); //removed by me --------------------------------------- ! Canvas = new QGraphicsScene(0,0,measure_view_H, measure_view_V); //added by me ---------------------------------- ! //Canvas -> setAdvancePeriod(30); //set to call advance() every 30 msec. //removed by me ! ! //added by me for the replacement of setAdvancePeriod-------------------------------------------------------- ! QTimer *timer = new QTimer(this); ! connect(timer, SIGNAL(timeout()), this, SLOT(Canvas->advance())); //every 30 msec Canvas-advance() is called ! timer->start(30); ! //------------------------------------------------------------------- ! if (FigEditor) delete FigEditor; FigEditor = new FigureEditor(*this, *Canvas, ui->CanvasFrame); *************** *** 187,192 **** FigEditor -> clear(); FigEditor-> resize(w, h); ! FigEditor->setHScrollBarMode(Q3ScrollView::Auto); ! FigEditor->setVScrollBarMode(Q3ScrollView::Auto); CanvasFrameLayout->addWidget(FigEditor); --- 199,204 ---- FigEditor -> clear(); FigEditor-> resize(w, h); ! // FigEditor->setHScrollBarMode(Q3ScrollView::Auto); //unable to implement ----------------------------------------- ! //FigEditor->setVScrollBarMode(Q3ScrollView::Auto); //unable to implement CanvasFrameLayout->addWidget(FigEditor); |
|
From: Hal E. <hv...@us...> - 2009-05-18 23:18:59
|
Update of /cvsroot/lprof/lprof/src/parmsqt In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv29693/src/parmsqt Modified Files: profileparms.cpp profileparmsbase.ui Log Message: Changes glare spinbox to a doubleSpinbox and adjusted the code to fit. It now has 1 decimal place and a max value if 5.0. Index: profileparmsbase.ui =================================================================== RCS file: /cvsroot/lprof/lprof/src/parmsqt/profileparmsbase.ui,v retrieving revision 1.43 retrieving revision 1.44 diff -C2 -d -r1.43 -r1.44 *** profileparmsbase.ui 18 May 2009 21:39:55 -0000 1.43 --- profileparmsbase.ui 18 May 2009 23:18:48 -0000 1.44 *************** *** 556,574 **** <layout class="QGridLayout" name="gridLayout"> <item row="0" column="0"> ! <layout class="QHBoxLayout" name="horizontalLayout"> <item> <widget class="QLabel" name="label"> <property name="text"> ! <string>Glare (per mille)</string> </property> </widget> </item> <item> ! <widget class="QSpinBox" name="spinBoxGlare"> <property name="maximum"> ! <number>25</number> </property> </widget> </item> </layout> </item> --- 556,609 ---- <layout class="QGridLayout" name="gridLayout"> <item row="0" column="0"> ! <layout class="QHBoxLayout" name="horizontalLayout_2"> ! <item> ! <spacer name="horizontalSpacer"> ! <property name="orientation"> ! <enum>Qt::Horizontal</enum> ! </property> ! <property name="sizeType"> ! <enum>QSizePolicy::Fixed</enum> ! </property> ! <property name="sizeHint" stdset="0"> ! <size> ! <width>1</width> ! <height>20</height> ! </size> ! </property> ! </spacer> ! </item> <item> <widget class="QLabel" name="label"> <property name="text"> ! <string>Glare %</string> </property> </widget> </item> <item> ! <widget class="QDoubleSpinBox" name="spinBoxGlare"> ! <property name="decimals"> ! <number>1</number> ! </property> <property name="maximum"> ! <double>5.000000000000000</double> ! </property> ! <property name="singleStep"> ! <double>0.100000000000000</double> </property> </widget> </item> + <item> + <spacer name="horizontalSpacer_2"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>40</width> + <height>20</height> + </size> + </property> + </spacer> + </item> </layout> </item> Index: profileparms.cpp =================================================================== RCS file: /cvsroot/lprof/lprof/src/parmsqt/profileparms.cpp,v retrieving revision 1.63 retrieving revision 1.64 diff -C2 -d -r1.63 -r1.64 *** profileparms.cpp 18 May 2009 21:39:55 -0000 1.63 --- profileparms.cpp 18 May 2009 23:18:48 -0000 1.64 *************** *** 363,367 **** spinBoxB -> setValue(sys.hdr.WhitePointParams.RGB[2]); ! spinBoxGlare->setValue(floor(sys.GlarePercent*10+0.5)); if (sys.hdr.WhitePointParams.location==WP_LOC_ILLUMINANT) --- 363,367 ---- spinBoxB -> setValue(sys.hdr.WhitePointParams.RGB[2]); ! spinBoxGlare->setValue(floor(sys.GlarePercent + 0.05)); if (sys.hdr.WhitePointParams.location==WP_LOC_ILLUMINANT) *************** *** 449,453 **** sys.hdr.WhitePointParams.XYZ.Z = wwFloatSpinBoxXYZ_Z -> value(); ! sys.GlarePercent = spinBoxGlare->value() * 0.1; if (radioButtonDoNotScale -> isChecked()) --- 449,453 ---- sys.hdr.WhitePointParams.XYZ.Z = wwFloatSpinBoxXYZ_Z -> value(); ! sys.GlarePercent = spinBoxGlare->value(); if (radioButtonDoNotScale -> isChecked()) |
|
From: Gerhard F. <gf...@us...> - 2009-05-18 21:40:03
|
Update of /cvsroot/lprof/lprof/src/parmsqt In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv11688/src/parmsqt Modified Files: profileparms.cpp profileparmsbase.ui Log Message: Changed spin box units to per mille. Index: profileparmsbase.ui =================================================================== RCS file: /cvsroot/lprof/lprof/src/parmsqt/profileparmsbase.ui,v retrieving revision 1.42 retrieving revision 1.43 diff -C2 -d -r1.42 -r1.43 *** profileparmsbase.ui 18 May 2009 21:12:50 -0000 1.42 --- profileparmsbase.ui 18 May 2009 21:39:55 -0000 1.43 *************** *** 560,564 **** <widget class="QLabel" name="label"> <property name="text"> ! <string>Glare %</string> </property> </widget> --- 560,564 ---- <widget class="QLabel" name="label"> <property name="text"> ! <string>Glare (per mille)</string> </property> </widget> Index: profileparms.cpp =================================================================== RCS file: /cvsroot/lprof/lprof/src/parmsqt/profileparms.cpp,v retrieving revision 1.62 retrieving revision 1.63 diff -C2 -d -r1.62 -r1.63 *** profileparms.cpp 18 May 2009 21:12:50 -0000 1.62 --- profileparms.cpp 18 May 2009 21:39:55 -0000 1.63 *************** *** 363,367 **** spinBoxB -> setValue(sys.hdr.WhitePointParams.RGB[2]); ! spinBoxGlare -> setValue(sys.GlarePercent); if (sys.hdr.WhitePointParams.location==WP_LOC_ILLUMINANT) --- 363,367 ---- spinBoxB -> setValue(sys.hdr.WhitePointParams.RGB[2]); ! spinBoxGlare->setValue(floor(sys.GlarePercent*10+0.5)); if (sys.hdr.WhitePointParams.location==WP_LOC_ILLUMINANT) *************** *** 449,453 **** sys.hdr.WhitePointParams.XYZ.Z = wwFloatSpinBoxXYZ_Z -> value(); ! sys.GlarePercent = spinBoxGlare -> value(); if (radioButtonDoNotScale -> isChecked()) --- 449,453 ---- sys.hdr.WhitePointParams.XYZ.Z = wwFloatSpinBoxXYZ_Z -> value(); ! sys.GlarePercent = spinBoxGlare->value() * 0.1; if (radioButtonDoNotScale -> isChecked()) |
|
From: Gerhard F. <gf...@us...> - 2009-05-18 21:39:20
|
Update of /cvsroot/lprof/lprof/src/liblprof In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv11379/src/liblprof Modified Files: cmsscn.c Log Message: Write glare message to message frame instead of stdout. Index: cmsscn.c =================================================================== RCS file: /cvsroot/lprof/lprof/src/liblprof/cmsscn.c,v retrieving revision 1.60 retrieving revision 1.61 diff -C2 -d -r1.60 -r1.61 *** cmsscn.c 16 May 2009 15:15:44 -0000 1.60 --- cmsscn.c 18 May 2009 21:39:11 -0000 1.61 *************** *** 1390,1394 **** if (sys->GlarePercent > 0) { int i; ! printf("Adding %f%% glare to the measurements\n", sys->GlarePercent); for (i = 0; i < sys->hdr.m.nPatches; i++) { sys->hdr.m.Patches[i].XYZ.X += --- 1390,1395 ---- if (sys->GlarePercent > 0) { int i; ! sys->hdr.cmsprintf("Adding %1% glare to the measurements", ! 1, 'f', sys->GlarePercent); for (i = 0; i < sys->hdr.m.nPatches; i++) { sys->hdr.m.Patches[i].XYZ.X += |
|
From: Hal E. <hv...@us...> - 2009-05-18 21:17:30
|
Update of /cvsroot/lprof/lprof/src/moncalcontrolqt In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv2529/src/moncalcontrolqt Modified Files: moncalreports.cpp Log Message: Change the way various dialogs are instantiated so that the close button in the title bar will show up when using newer versions of Qt. Index: moncalreports.cpp =================================================================== RCS file: /cvsroot/lprof/lprof/src/moncalcontrolqt/moncalreports.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** moncalreports.cpp 8 Mar 2008 18:47:33 -0000 1.3 --- moncalreports.cpp 18 May 2009 21:17:17 -0000 1.4 *************** *** 36,40 **** MonitorCalReports::MonitorCalReports(QWidget *parent ) ! : QDialog(parent, "", 0, Qt::WStyle_SysMenu | Qt::WStyle_MinMax | Qt::WStyle_Title) { setupUi(this); --- 36,40 ---- MonitorCalReports::MonitorCalReports(QWidget *parent ) ! : QDialog(parent, "", 0, Qt::WindowSystemMenuHint) { setupUi(this); |
|
From: Hal E. <hv...@us...> - 2009-05-18 21:17:25
|
Update of /cvsroot/lprof/lprof/src/lprofqt In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv2529/src/lprofqt Modified Files: lprofmain.cpp Log Message: Change the way various dialogs are instantiated so that the close button in the title bar will show up when using newer versions of Qt. Index: lprofmain.cpp =================================================================== RCS file: /cvsroot/lprof/lprof/src/lprofqt/lprofmain.cpp,v retrieving revision 1.187 retrieving revision 1.188 diff -C2 -d -r1.187 -r1.188 *** lprofmain.cpp 8 Mar 2008 22:31:11 -0000 1.187 --- lprofmain.cpp 18 May 2009 21:17:17 -0000 1.188 *************** *** 1011,1015 **** lprofMain::lprofMain( QWidget* parent) : QDialog( parent, "", 0, ! Qt::WType_TopLevel | Qt::WStyle_SysMenu | Qt::WStyle_MinMax | Qt::WStyle_Title), FigEditor( 0 ), Canvas( 0 ), --- 1011,1015 ---- lprofMain::lprofMain( QWidget* parent) : QDialog( parent, "", 0, ! Qt::WindowSystemMenuHint), FigEditor( 0 ), Canvas( 0 ), |
|
From: Hal E. <hv...@us...> - 2009-05-18 21:17:25
|
Update of /cvsroot/lprof/lprof/src/monqt In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv2529/src/monqt Modified Files: monitorvalues.cpp Log Message: Change the way various dialogs are instantiated so that the close button in the title bar will show up when using newer versions of Qt. Index: monitorvalues.cpp =================================================================== RCS file: /cvsroot/lprof/lprof/src/monqt/monitorvalues.cpp,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -d -r1.27 -r1.28 *** monitorvalues.cpp 6 Mar 2008 21:18:59 -0000 1.27 --- monitorvalues.cpp 18 May 2009 21:17:17 -0000 1.28 *************** *** 149,153 **** MonitorValues::MonitorValues(QWidget *parent ) ! : QDialog(parent, "", 0, Qt::WStyle_SysMenu | Qt::WStyle_MinMax | Qt::WStyle_Title) { setupUi(this); --- 149,153 ---- MonitorValues::MonitorValues(QWidget *parent ) ! : QDialog(parent, "", 0, Qt::WindowSystemMenuHint) { setupUi(this); |
|
From: Hal E. <hv...@us...> - 2009-05-18 21:17:25
|
Update of /cvsroot/lprof/lprof/src/IDqt In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv2529/src/IDqt Modified Files: profileid.cpp Log Message: Change the way various dialogs are instantiated so that the close button in the title bar will show up when using newer versions of Qt. Index: profileid.cpp =================================================================== RCS file: /cvsroot/lprof/lprof/src/IDqt/profileid.cpp,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** profileid.cpp 6 Mar 2008 21:18:58 -0000 1.19 --- profileid.cpp 18 May 2009 21:17:17 -0000 1.20 *************** *** 70,74 **** ProfileID::ProfileID( QWidget *parent) ! : QDialog(parent, "", 0, Qt::WStyle_SysMenu | Qt::WStyle_MinMax | Qt::WStyle_Title) { setupUi(this); --- 70,74 ---- ProfileID::ProfileID( QWidget *parent) ! : QDialog(parent, "", 0, Qt::WindowSystemMenuHint) { setupUi(this); |
|
From: Hal E. <hv...@us...> - 2009-05-18 21:17:25
|
Update of /cvsroot/lprof/lprof/src/reference_inst_qt In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv2529/src/reference_inst_qt Modified Files: installreffile.cpp Log Message: Change the way various dialogs are instantiated so that the close button in the title bar will show up when using newer versions of Qt. Index: installreffile.cpp =================================================================== RCS file: /cvsroot/lprof/lprof/src/reference_inst_qt/installreffile.cpp,v retrieving revision 1.56 retrieving revision 1.57 diff -C2 -d -r1.56 -r1.57 *** installreffile.cpp 6 Mar 2008 21:18:59 -0000 1.56 --- installreffile.cpp 18 May 2009 21:17:17 -0000 1.57 *************** *** 145,149 **** InstallRefFile::InstallRefFile(QWidget *parent) ! : QDialog(parent, "", 0, Qt::WStyle_SysMenu | Qt::WStyle_MinMax | Qt::WStyle_Title), urlOp(QString::fromLocal8Bit("/")) { setupUi(this); --- 145,149 ---- InstallRefFile::InstallRefFile(QWidget *parent) ! : QDialog(parent, "", 0, Qt::WindowSystemMenuHint), urlOp(QString::fromLocal8Bit("/")) { setupUi(this); |
|
From: Hal E. <hv...@us...> - 2009-05-18 21:17:25
|
Update of /cvsroot/lprof/lprof/src/parmsqt In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv2529/src/parmsqt Modified Files: profileparmsmon.cpp Log Message: Change the way various dialogs are instantiated so that the close button in the title bar will show up when using newer versions of Qt. Index: profileparmsmon.cpp =================================================================== RCS file: /cvsroot/lprof/lprof/src/parmsqt/profileparmsmon.cpp,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** profileparmsmon.cpp 6 Mar 2008 21:18:59 -0000 1.5 --- profileparmsmon.cpp 18 May 2009 21:17:17 -0000 1.6 *************** *** 126,130 **** ProfileParmsMon::ProfileParmsMon(QWidget *parent ) ! : QDialog(parent, "", 0, Qt::WStyle_SysMenu | Qt::WStyle_MinMax | Qt::WStyle_Title) { setupUi(this); --- 126,130 ---- ProfileParmsMon::ProfileParmsMon(QWidget *parent ) ! : QDialog(parent, "", 0, Qt::WindowSystemMenuHint) { setupUi(this); |
|
From: Hal E. <hv...@us...> - 2009-05-18 21:17:25
|
Update of /cvsroot/lprof/lprof/src/checkerqt In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv2529/src/checkerqt Modified Files: profilechecker.cpp Log Message: Change the way various dialogs are instantiated so that the close button in the title bar will show up when using newer versions of Qt. Index: profilechecker.cpp =================================================================== RCS file: /cvsroot/lprof/lprof/src/checkerqt/profilechecker.cpp,v retrieving revision 1.48 retrieving revision 1.49 diff -C2 -d -r1.48 -r1.49 *** profilechecker.cpp 6 Mar 2008 21:18:58 -0000 1.48 --- profilechecker.cpp 18 May 2009 21:17:17 -0000 1.49 *************** *** 115,119 **** ProfileChecker::ProfileChecker(QWidget *parent ) ! : QDialog(parent, "", 0, Qt::WStyle_SysMenu | Qt::WStyle_MinMax | Qt::WStyle_Title), Checker(0) { --- 115,119 ---- ProfileChecker::ProfileChecker(QWidget *parent ) ! : QDialog(parent, "", 0, Qt::WindowSystemMenuHint), Checker(0) { |
|
From: Hal E. <hv...@us...> - 2009-05-18 21:13:04
|
Update of /cvsroot/lprof/lprof/src/parmsqt In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv606/src/parmsqt Modified Files: profileparms.cpp profileparmsbase.ui Log Message: Expose GlarePercent in the UI. I limited this to a max of 25 and this is currently using a int spinbox so glare is limited to while percentage point values. This only does basic exposure and at this point no attempt is make to do things like save this when profile is created to to retrieve this when opening a profile. Index: profileparmsbase.ui =================================================================== RCS file: /cvsroot/lprof/lprof/src/parmsqt/profileparmsbase.ui,v retrieving revision 1.41 retrieving revision 1.42 diff -C2 -d -r1.41 -r1.42 *** profileparmsbase.ui 1 Feb 2009 20:04:01 -0000 1.41 --- profileparmsbase.ui 18 May 2009 21:12:50 -0000 1.42 *************** *** 1,6 **** ! <ui version="4.0" > <class>ProfileParmsBase</class> ! <widget class="QDialog" name="ProfileParmsBase" > ! <property name="geometry" > <rect> <x>0</x> --- 1,7 ---- ! <?xml version="1.0" encoding="UTF-8"?> ! <ui version="4.0"> <class>ProfileParmsBase</class> [...4237 lines suppressed...] <customwidget> --- 2208,2212 ---- </layout> </widget> ! <layoutdefault spacing="6" margin="11"/> <customwidgets> <customwidget> *************** *** 2205,2209 **** </customwidgets> <resources> ! <include location="../../lprof.qrc" /> </resources> <connections/> --- 2224,2228 ---- </customwidgets> <resources> ! <include location="../../lprof.qrc"/> </resources> <connections/> Index: profileparms.cpp =================================================================== RCS file: /cvsroot/lprof/lprof/src/parmsqt/profileparms.cpp,v retrieving revision 1.61 retrieving revision 1.62 diff -C2 -d -r1.61 -r1.62 *** profileparms.cpp 7 Mar 2008 16:29:01 -0000 1.61 --- profileparms.cpp 18 May 2009 21:12:50 -0000 1.62 *************** *** 169,173 **** ProfileParms::ProfileParms(QWidget *parent ) ! : QDialog(parent, "", 0, Qt::WStyle_SysMenu | Qt::WStyle_MinMax | Qt::WStyle_Dialog | Qt::WStyle_Title) { setupUi(this); --- 169,173 ---- ProfileParms::ProfileParms(QWidget *parent ) ! : QDialog(parent, "", 0, Qt::WindowSystemMenuHint) { setupUi(this); *************** *** 363,366 **** --- 363,368 ---- spinBoxB -> setValue(sys.hdr.WhitePointParams.RGB[2]); + spinBoxGlare -> setValue(sys.GlarePercent); + if (sys.hdr.WhitePointParams.location==WP_LOC_ILLUMINANT) radioButtonDiffuse -> setChecked(TRUE); *************** *** 447,450 **** --- 449,454 ---- sys.hdr.WhitePointParams.XYZ.Z = wwFloatSpinBoxXYZ_Z -> value(); + sys.GlarePercent = spinBoxGlare -> value(); + if (radioButtonDoNotScale -> isChecked()) sys.hdr.WhitePointParams.scale = WP_SCALE_NONE; |
|
From: Gerhard F. <gf...@us...> - 2009-05-16 15:15:57
|
Update of /cvsroot/lprof/lprof/src/liblprof In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv9674 Modified Files: cmsscn.c lcmsprf.h Log Message: Added experimental support for dealing with glare introduced by the scaner's optics by adding a (just constant, but configurable) amount of glare to the XYZ measurements from the reference file as well. Index: cmsscn.c =================================================================== RCS file: /cvsroot/lprof/lprof/src/liblprof/cmsscn.c,v retrieving revision 1.59 retrieving revision 1.60 diff -C2 -d -r1.59 -r1.60 *** cmsscn.c 19 Feb 2008 21:02:39 -0000 1.59 --- cmsscn.c 16 May 2009 15:15:44 -0000 1.60 *************** *** 283,292 **** */ ! #if 0 ! for (i = 0; i < 10; i++) ! { ! for (j = 0; j < 3; j++) ! data[n].p[j] = data[n].v[j] = 0.0; ! n++; } #endif --- 283,299 ---- */ ! /* ! * When adding glare, then try to map RGB=0 -> Lab=0, ! * since after adding glare the dark regions are no ! * longer reasonably covered with data points. ! */ ! ! #if 1 ! if (sys->GlarePercent > 0) { ! for (i = 0; i < 10; i++) { ! for (j = 0; j < 3; j++) ! data[n].p[j] = data[n].v[j] = 0.0; ! n++; ! } } #endif *************** *** 1162,1165 **** --- 1169,1178 ---- strcpy(sys->hdr.Comments, "Your comment"); + /* glare to be added */ + sys->GlarePercent = 0.0; + /* XXX need to be exposed in GUI */ + if (getenv("GLARE")) + sys->GlarePercent = atof(getenv("GLARE")); + sys->Rspl = NULL; *************** *** 1232,1235 **** --- 1245,1261 ---- GetRGB(&sys->hdr, In, &r, &g, &b); + /* When adding glare, then force RGB=0 -> Lab=0, since + the dark regions are not reasonably covered with + data points then */ + + if (sys->GlarePercent > 0 && + In[0] == 0 && In[1] == 0 && In[2] == 0) + { + Lab.L = Lab.a = Lab.b = 0.0; + /* To PCS encoding */ + cmsFloat2LabEncoded(Out, &Lab); + return TRUE; + } + spline = (rspl *) sys->Rspl; *************** *** 1361,1364 **** --- 1387,1404 ---- dwNeedSamples)) return FALSE; + /* add glare to the measurements */ + if (sys->GlarePercent > 0) { + int i; + printf("Adding %f%% glare to the measurements\n", sys->GlarePercent); + for (i = 0; i < sys->hdr.m.nPatches; i++) { + sys->hdr.m.Patches[i].XYZ.X += + 0.01 * sys->GlarePercent * sys->hdr.m.Illuminant.X; + sys->hdr.m.Patches[i].XYZ.Y += + 0.01 * sys->GlarePercent * sys->hdr.m.Illuminant.Y; + sys->hdr.m.Patches[i].XYZ.Z += + 0.01 * sys->GlarePercent * sys->hdr.m.Illuminant.Z; + } + } + sys->hdr.hProfile = cmsCreateRGBProfile(NULL, NULL, NULL); Index: lcmsprf.h =================================================================== RCS file: /cvsroot/lprof/lprof/src/liblprof/lcmsprf.h,v retrieving revision 1.39 retrieving revision 1.40 diff -C2 -d -r1.39 -r1.40 *** lcmsprf.h 19 Feb 2008 21:02:39 -0000 1.39 --- lcmsprf.h 16 May 2009 15:15:45 -0000 1.40 *************** *** 593,596 **** --- 593,599 ---- LPMATN LoTerms; /* Low order regression matrix used for extrapolation */ + /* glare to add to the measurements */ + double GlarePercent; + struct _rspl *Rspl; /* smoothing spline */ int RsplSmoothness; /* smoothing factor */ |
|
From: Hal E. <hv...@us...> - 2009-05-03 02:22:29
|
Update of /cvsroot/lprof/lprof/src/argyll In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv18475/src/argyll Modified Files: CMakeLists.txt Log Message: Add support for building the spyder II firmware installer. Index: CMakeLists.txt =================================================================== RCS file: /cvsroot/lprof/lprof/src/argyll/CMakeLists.txt,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** CMakeLists.txt 19 Feb 2008 21:02:10 -0000 1.2 --- CMakeLists.txt 3 May 2009 02:22:18 -0000 1.3 *************** *** 84,85 **** --- 84,129 ---- COMPILE_FLAGS "${argyll_flags}" ) + + + SET(SPYD2_SOURCES + spectro/spyd2en.c + spectro/vinflate.c + ) + + ADD_EXECUTABLE(spyd2enlprof + ${SPYD2_SOURCES} + ) + + SET_DIRECTORY_PROPERTIES( + PROPERTIES + INCLUDE_DIRECTORIES "${ARGYLL_INCLUDE_DIRS};${LIBUSB_INCLUDE_DIR};${WINDDK_INCLUDE_DIR}" + ) + + TARGET_LINK_LIBRARIES(spyd2enlprof argyll ${COMMON_PLATFORM_LIBS}) + + INSTALL( + TARGETS spyd2enlprof + RUNTIME DESTINATION ${BINDIR} + LIBRARY DESTINATION ${DYNLIBDIR} + ARCHIVE DESTINATION ${STATICLIBDIR} + ) + + + + + + + + + + + + + + + + + + + + |
|
From: Hal E. <hv...@us...> - 2009-05-03 01:24:27
|
Update of /cvsroot/lprof/lprof In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv12686 Modified Files: CMakeLists.txt Added Files: cmake_uninstall.cmake.in Log Message: Add uninstall target to cmake build. Index: CMakeLists.txt =================================================================== RCS file: /cvsroot/lprof/lprof/CMakeLists.txt,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** CMakeLists.txt 3 May 2009 00:47:24 -0000 1.3 --- CMakeLists.txt 3 May 2009 01:24:24 -0000 1.4 *************** *** 170,173 **** --- 170,184 ---- ) + # setup an uninstall target + + CONFIGURE_FILE( + "${CMAKE_CURRENT_SOURCE_DIR}/cmake_uninstall.cmake.in" + "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake" + IMMEDIATE @ONLY) + + ADD_CUSTOM_TARGET(uninstall + "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake") + + # todo: cpack --- NEW FILE: cmake_uninstall.cmake.in --- IF(NOT EXISTS "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt") MESSAGE(FATAL_ERROR "Cannot find install manifest: \"@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt\"") ENDIF(NOT EXISTS "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt") FILE(READ "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt" files) STRING(REGEX REPLACE "\n" ";" files "${files}") FOREACH(file ${files}) MESSAGE(STATUS "Uninstalling \"$ENV{DESTDIR}${file}\"") IF(EXISTS "$ENV{DESTDIR}${file}") EXEC_PROGRAM( "@CMAKE_COMMAND@" ARGS "-E remove \"$ENV{DESTDIR}${file}\"" OUTPUT_VARIABLE rm_out RETURN_VALUE rm_retval ) IF(NOT "${rm_retval}" STREQUAL 0) MESSAGE(FATAL_ERROR "Problem when removing \"$ENV{DESTDIR}${file}\"") ENDIF(NOT "${rm_retval}" STREQUAL 0) ELSE(EXISTS "$ENV{DESTDIR}${file}") MESSAGE(STATUS "File \"$ENV{DESTDIR}${file}\" does not exist.") ENDIF(EXISTS "$ENV{DESTDIR}${file}") ENDFOREACH(file) |
|
From: Hal E. <hv...@us...> - 2009-05-03 00:47:32
|
Update of /cvsroot/lprof/lprof/data In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv9213/data Modified Files: CMakeLists.txt Log Message: Updated cmake build to correctly install data files. Also handles translation *.qm files correctly now. Index: CMakeLists.txt =================================================================== RCS file: /cvsroot/lprof/lprof/data/CMakeLists.txt,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** CMakeLists.txt 19 Feb 2008 21:01:30 -0000 1.2 --- CMakeLists.txt 3 May 2009 00:47:24 -0000 1.3 *************** *** 17,21 **** INSTALL( FILES "icons/lprof.png" ! DESTINATION "data/icons/lprof.png" ) ENDIF(WIN32) --- 17,21 ---- INSTALL( FILES "icons/lprof.png" ! DESTINATION "share/lprof/data/icons/lprof.png" ) ENDIF(WIN32) *************** *** 31,35 **** "pics/e3199608.TXT" "pics/scandmo.png" ! DESTINATION "data/pics" ) --- 31,35 ---- "pics/e3199608.TXT" "pics/scandmo.png" ! DESTINATION "share/lprof/data/pics" ) *************** *** 38,42 **** "profiles/scandmo.icm" "profiles/CIEE.icm" ! DESTINATION "data/profiles" ) --- 38,42 ---- "profiles/scandmo.icm" "profiles/CIEE.icm" ! DESTINATION "share/lprof/data/profiles" ) *************** *** 51,55 **** "template/KODAK.ITX" "template/IT8_19.ITX" ! DESTINATION "data/template" ) --- 51,55 ---- "template/KODAK.ITX" "template/IT8_19.ITX" ! DESTINATION "share/lprof/data/template" ) *************** *** 71,76 **** "${CMAKE_CURRENT_SOURCE_DIR}/help/${language_code}/images/*.tiff" ) ! INSTALL(FILES ${help_files} DESTINATION "data/help/${language_code}") ! INSTALL(FILES ${help_image_files} DESTINATION "data/help/${language_code}/images") ENDFOREACH(language_code) --- 71,76 ---- "${CMAKE_CURRENT_SOURCE_DIR}/help/${language_code}/images/*.tiff" ) ! INSTALL(FILES ${help_files} DESTINATION "share/lprof/data/help/${language_code}") ! INSTALL(FILES ${help_image_files} DESTINATION "share/lprof/data//help/${language_code}/images") ENDFOREACH(language_code) |
|
From: Hal E. <hv...@us...> - 2009-05-03 00:47:27
|
Update of /cvsroot/lprof/lprof In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv9213 Modified Files: CMakeLists.txt Log Message: Updated cmake build to correctly install data files. Also handles translation *.qm files correctly now. Index: CMakeLists.txt =================================================================== RCS file: /cvsroot/lprof/lprof/CMakeLists.txt,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** CMakeLists.txt 19 Feb 2008 21:01:09 -0000 1.2 --- CMakeLists.txt 3 May 2009 00:47:24 -0000 1.3 *************** *** 10,20 **** # we may want to later and it's a handy reminder. # ! #INCLUDE(CheckIncludeFile) ! #INCLUDE(CheckCCompilerFlag) ! #INCLUDE(CheckCXXCompilerFlag) ! #INCLUDE(CheckTypeSize) # Only for cmake >= 2.5 but we should add it soon ! #INCLUDE(ConfigureChecks.cmake) #Set the custom CMake module directory where our INCLUDE/lib finders are --- 10,20 ---- # we may want to later and it's a handy reminder. # ! # INCLUDE(CheckIncludeFile) ! # INCLUDE(CheckCCompilerFlag) ! # INCLUDE(CheckCXXCompilerFlag) ! # INCLUDE(CheckTypeSize) # Only for cmake >= 2.5 but we should add it soon ! # INCLUDE(ConfigureChecks.cmake) #Set the custom CMake module directory where our INCLUDE/lib finders are *************** *** 31,34 **** --- 31,35 ---- IF(UNIX) SET(DOCDIR "share/doc/lprof") + SET(DATADIR "share/lprof/data") ELSE(UNIX) SET(DOCDIR "doc") *************** *** 169,173 **** ) - # todo: install data # todo: cpack ! # todo: generate translations --- 170,173 ---- ) # todo: cpack ! |
|
From: Hal E. <hv...@us...> - 2009-05-03 00:47:26
|
Update of /cvsroot/lprof/lprof/src In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv9213/src Modified Files: CMakeLists.txt Log Message: Updated cmake build to correctly install data files. Also handles translation *.qm files correctly now. Index: CMakeLists.txt =================================================================== RCS file: /cvsroot/lprof/lprof/src/CMakeLists.txt,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** CMakeLists.txt 19 Feb 2008 21:01:32 -0000 1.2 --- CMakeLists.txt 3 May 2009 00:47:24 -0000 1.3 *************** *** 99,103 **** QTTRANS_COMPILE_TRANSLATIONS( lprof_qm_files ! "${CMAKE_BINARY_DIR}/translations" ${lprof_ts_files} ) --- 99,103 ---- QTTRANS_COMPILE_TRANSLATIONS( lprof_qm_files ! "${CMAKE_SOURCE_DIR}/translations" ${lprof_ts_files} ) *************** *** 164,170 **** ) - INSTALL( - FILES ${lprof_qm_files} - DESTINATION "data/translations" - ) - --- 164,165 ---- |
|
From: Hal E. <hv...@us...> - 2009-02-01 23:44:07
|
Update of /cvsroot/lprof/lprof/src/images In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv30253/src/images Modified Files: logo.png Log Message: Updated splash screen. Needs to have a copy right notice added. Index: logo.png =================================================================== RCS file: /cvsroot/lprof/lprof/src/images/logo.png,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Binary files /tmp/cvsSecDJy and /tmp/cvsS2VLYp differ |
|
From: Alexandre P. <pro...@us...> - 2009-02-01 20:04:13
|
Update of /cvsroot/lprof/lprof/src/moncalcontrolqt In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv32731/src/moncalcontrolqt Modified Files: moncalcontrolbase.ui moncalreportsbase.ui Log Message: removed '- LProf' after confirmation from Hal Index: moncalreportsbase.ui =================================================================== RCS file: /cvsroot/lprof/lprof/src/moncalcontrolqt/moncalreportsbase.ui,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** moncalreportsbase.ui 1 Feb 2009 16:56:14 -0000 1.4 --- moncalreportsbase.ui 1 Feb 2009 20:04:01 -0000 1.5 *************** *** 11,15 **** </property> <property name="windowTitle" > ! <string>Display Calibration and Ambient Light Reports - LProf</string> </property> <layout class="QGridLayout" > --- 11,15 ---- </property> <property name="windowTitle" > ! <string>Display Calibration and Ambient Light Reports</string> </property> <layout class="QGridLayout" > Index: moncalcontrolbase.ui =================================================================== RCS file: /cvsroot/lprof/lprof/src/moncalcontrolqt/moncalcontrolbase.ui,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** moncalcontrolbase.ui 1 Feb 2009 16:56:14 -0000 1.20 --- moncalcontrolbase.ui 1 Feb 2009 20:04:01 -0000 1.21 *************** *** 11,15 **** </property> <property name="windowTitle" > ! <string>Monitor Calibration and Measurement - LProf</string> </property> <property name="caption" stdset="0" > --- 11,15 ---- </property> <property name="windowTitle" > ! <string>Monitor Calibration and Measurement</string> </property> <property name="caption" stdset="0" > |
|
From: Alexandre P. <pro...@us...> - 2009-02-01 20:04:13
|
Update of /cvsroot/lprof/lprof/src/checkerqt In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv32731/src/checkerqt Modified Files: profilecheckerbase.ui Log Message: removed '- LProf' after confirmation from Hal Index: profilecheckerbase.ui =================================================================== RCS file: /cvsroot/lprof/lprof/src/checkerqt/profilecheckerbase.ui,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** profilecheckerbase.ui 1 Feb 2009 16:56:14 -0000 1.24 --- profilecheckerbase.ui 1 Feb 2009 20:04:01 -0000 1.25 *************** *** 11,15 **** </property> <property name="windowTitle" > ! <string>Profile Checker - LProf</string> </property> <layout class="QGridLayout" > --- 11,15 ---- </property> <property name="windowTitle" > ! <string>Profile Checker</string> </property> <layout class="QGridLayout" > |
|
From: Alexandre P. <pro...@us...> - 2009-02-01 20:04:12
|
Update of /cvsroot/lprof/lprof/src/IDqt In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv32731/src/IDqt Modified Files: profileidbase.ui Log Message: removed '- LProf' after confirmation from Hal Index: profileidbase.ui =================================================================== RCS file: /cvsroot/lprof/lprof/src/IDqt/profileidbase.ui,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** profileidbase.ui 1 Feb 2009 16:56:14 -0000 1.14 --- profileidbase.ui 1 Feb 2009 20:04:01 -0000 1.15 *************** *** 17,21 **** </property> <property name="windowTitle" > ! <string>Profile Identification - LProf</string> </property> <property name="sizeGripEnabled" > --- 17,21 ---- </property> <property name="windowTitle" > ! <string>Profile Identification</string> </property> <property name="sizeGripEnabled" > |
44 messages has been excluded from this view by a project administrator.
