[Lprof-devel] lprof/src/libqtlcmswidgets qtlcmswidgets.cpp, 1.42.2.2, 1.42.2.3 qtlcmswidgets.h, 1.1
Brought to you by:
hvengel
Menu
▾
▴
[Lprof-devel] lprof/src/libqtlcmswidgets qtlcmswidgets.cpp, 1.42.2.2, 1.42.2.3 qtlcmswidgets.h, 1.15.2.2, 1.15.2.3
|
From: Amit K. <ami...@us...> - 2009-06-25 14:56:25
|
Update of /cvsroot/lprof/lprof/src/libqtlcmswidgets In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv1511/libqtlcmswidgets Modified Files: Tag: GSoC-2009 qtlcmswidgets.cpp qtlcmswidgets.h Log Message: I have made changes in src/libqtlcmswidgets/qtlcmswidgets.cpp , src/libqtlcmswidgets/qtlcmswidgets.h , src/checkerqt/profilecheckerbase.ui Index: qtlcmswidgets.h =================================================================== RCS file: /cvsroot/lprof/lprof/src/libqtlcmswidgets/qtlcmswidgets.h,v retrieving revision 1.15.2.2 retrieving revision 1.15.2.3 diff -C2 -d -r1.15.2.2 -r1.15.2.3 *** qtlcmswidgets.h 16 Jun 2009 07:26:25 -0000 1.15.2.2 --- qtlcmswidgets.h 25 Jun 2009 13:32:07 -0000 1.15.2.3 *************** *** 46,53 **** #include <QTableView> #include <QTableWidget> ! #include <q3hbox.h> #include <q3table.h> ! // Base selector implements a selector for IT8 files and icc profiles // This is not intended to be a good hierarchy but a flexible widget --- 46,53 ---- #include <QTableView> #include <QTableWidget> ! /* #include <q3hbox.h> #include <q3table.h> ! */ // Base selector implements a selector for IT8 files and icc profiles // This is not intended to be a good hierarchy but a flexible widget *************** *** 92,99 **** int getForOutput() const { return lUseDescriptor; } - void setDirCaption(QString text) { PickButton->setText(text); } - QString Dir; QString FileMask; --- 92,97 ---- *************** *** 122,127 **** void valueChanged(); - - }; --- 120,123 ---- *************** *** 139,143 **** - virtual void FillValues(); --- 135,138 ---- *************** *** 365,369 **** CheckProfile(QComboBox *corrCombo = NULL); ! void cdecl Results(Q3Table* ResultsGrid, QString& ResultsText, LPMEASUREMENT m, --- 360,364 ---- CheckProfile(QComboBox *corrCombo = NULL); ! void cdecl Results(QTableWidget* ResultsGrid, QString& ResultsText, LPMEASUREMENT m, Index: qtlcmswidgets.cpp =================================================================== RCS file: /cvsroot/lprof/lprof/src/libqtlcmswidgets/qtlcmswidgets.cpp,v retrieving revision 1.42.2.2 retrieving revision 1.42.2.3 diff -C2 -d -r1.42.2.2 -r1.42.2.3 *** qtlcmswidgets.cpp 16 Jun 2009 07:26:25 -0000 1.42.2.2 --- qtlcmswidgets.cpp 25 Jun 2009 13:32:07 -0000 1.42.2.3 *************** *** 79,83 **** QString Mask, BOOL lLineEdit, BOOL showFileDialog, QWidget* parent, const char* name, Qt::WFlags f) : ! QWidget(parent, f), //changed ======= Dir(DefaultDir), FileMask(Mask), --- 79,83 ---- QString Mask, BOOL lLineEdit, BOOL showFileDialog, QWidget* parent, const char* name, Qt::WFlags f) : ! QWidget(parent, f), Dir(DefaultDir), FileMask(Mask), *************** *** 676,683 **** static ! void SetGridItem(Q3Table* Grid, int row, int col, QString& s) { ! Q3TableItem* Item = new Q3TableItem(Grid, Q3TableItem::Never, s); ! Grid -> setItem(row, col, Item); } --- 676,684 ---- static ! void SetGridItem(QTableWidget* Grid, int row, int col, QString& s) { ! QTableWidgetItem* Item = new QTableWidgetItem(s,0); ! Item->setFlags(Qt::ItemIsSelectable); ! Grid -> setItem(row, col, Item); } *************** *** 706,720 **** } ! ! static void ! SetGridPatch(Q3Table* Grid, int row, int col, WORD RGB[3], WORD LabProof[3]) { QPixmap* Pixmap = CreateProofPixmap(LabProof, RGB); ! Q3TableItem* Item = new Q3TableItem(Grid, Q3TableItem::Never, QString::null, *Pixmap); Grid -> setItem(row, col, Item); } void CheckProfile::CreateFancyReport(QString& Report, --- 707,721 ---- } ! static void SetGridPatch(QTableWidget* Grid, int row, int col, WORD RGB[3], WORD LabProof[3]) { QPixmap* Pixmap = CreateProofPixmap(LabProof, RGB); ! QTableWidgetItem* Item = new QTableWidgetItem(QIcon(*Pixmap), QString::null, 0); ! Item->setFlags(Qt::ItemIsSelectable); Grid -> setItem(row, col, Item); } + void CheckProfile::CreateFancyReport(QString& Report, *************** *** 1010,1014 **** } ! void CheckProfile::Results(Q3Table* ResultsGrid, QString& ResultsText, LPMEASUREMENT m, --- 1011,1015 ---- } ! void CheckProfile::Results(QTableWidget* ResultsGrid, QString& ResultsText, LPMEASUREMENT m, *************** *** 1023,1046 **** CHK_CORR_NONE; ! Q3Header* Vertical = ResultsGrid -> verticalHeader(); ! Q3Header* Horizontal = ResultsGrid -> horizontalHeader(); ! ! Vertical -> setResizeEnabled(FALSE); ! ! ResultsGrid -> setLeftMargin(60); ! ResultsGrid -> setNumCols(11); ! ! Horizontal -> setLabel(0, QString::fromLocal8Bit("")); ! Horizontal -> setLabel(1, QTranslator::tr("CIE La*b* dE")); ! Horizontal -> setLabel(2, QTranslator::tr("Target error")); ! Horizontal -> setLabel(3, QTranslator::tr("Chroma error")); ! Horizontal -> setLabel(4, QTranslator::tr("Hue error")); ! Horizontal -> setLabel(5, QTranslator::tr("Luma error")); ! Horizontal -> setLabel(6, QTranslator::tr("Target Lab")); ! Horizontal -> setLabel(7, QTranslator::tr("Got")); ! ! Horizontal -> setLabel(8, QTranslator::tr("dE CIE94")); ! Horizontal -> setLabel(9, QTranslator::tr("dE CMC")); ! Horizontal -> setLabel(10, QTranslator::tr("dE BFL")); ResultsGrid -> setColumnWidth (0, 37); --- 1024,1051 ---- CHK_CORR_NONE; ! ResultsGrid->setColumnCount(11); ! ! QTableWidgetItem *Horizontal = new QTableWidgetItem(QString::fromLocal8Bit(""),0); ! ResultsGrid->setHorizontalHeaderItem(0,Horizontal); ! Horizontal = new QTableWidgetItem(QTranslator::tr("CIE La*b* dE"),0); ! ResultsGrid->setHorizontalHeaderItem(1,Horizontal); ! Horizontal = new QTableWidgetItem(QTranslator::tr("Target error") ,0); ! ResultsGrid->setHorizontalHeaderItem(2,Horizontal); ! Horizontal = new QTableWidgetItem(QTranslator::tr("Chroma error"),0); ! ResultsGrid->setHorizontalHeaderItem(3,Horizontal); ! Horizontal = new QTableWidgetItem(QTranslator::tr("Hue error") ,0); ! ResultsGrid->setHorizontalHeaderItem(4,Horizontal); ! Horizontal = new QTableWidgetItem(QTranslator::tr("Luma error") ,0); ! ResultsGrid->setHorizontalHeaderItem(5,Horizontal); ! Horizontal = new QTableWidgetItem(QTranslator::tr("Target Lab") ,0); ! ResultsGrid->setHorizontalHeaderItem(6,Horizontal); ! Horizontal = new QTableWidgetItem(QTranslator::tr("Got") ,0); ! ResultsGrid->setHorizontalHeaderItem(7,Horizontal); ! Horizontal = new QTableWidgetItem(QTranslator::tr("dE CIE94") ,0); ! ResultsGrid->setHorizontalHeaderItem(8,Horizontal); ! Horizontal = new QTableWidgetItem(QTranslator::tr("dE CMC") ,0); ! ResultsGrid->setHorizontalHeaderItem(9,Horizontal); ! Horizontal = new QTableWidgetItem(QTranslator::tr("dE BFL") ,0); ! ResultsGrid->setHorizontalHeaderItem(10,Horizontal); ResultsGrid -> setColumnWidth (0, 37); *************** *** 1161,1165 **** } ! ResultsGrid -> setNumRows(m->nPatches); for (i =0; i < m->nPatches; i++) --- 1166,1170 ---- } ! ResultsGrid->setRowCount(m->nPatches); for (i =0; i < m->nPatches; i++) *************** *** 1265,1271 **** if (dE > 10) Title = QString::fromLocal8Bit("** ") + Title; ! ! Vertical -> setLabel( i, Title); ! } --- 1270,1276 ---- if (dE > 10) Title = QString::fromLocal8Bit("** ") + Title; ! ! QTableWidgetItem *Vertical = new QTableWidgetItem(Title,0); ! ResultsGrid->setVerticalHeaderItem(i,Vertical); } |
