[Lprof-devel] lprof/src/checkerqt profilechecker.cpp, 1.49.2.3, 1.49.2.4 profilecheckerbase.ui, 1.2
Brought to you by:
hvengel
Menu
▾
▴
[Lprof-devel] lprof/src/checkerqt profilechecker.cpp, 1.49.2.3, 1.49.2.4 profilecheckerbase.ui, 1.25.2.1, 1.25.2.2 qtdrawcurve.cpp, 1.6, 1.6.2.1
|
From: Amit K. <ami...@us...> - 2009-07-05 20:33:24
|
Update of /cvsroot/lprof/lprof/src/checkerqt In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv11270/checkerqt Modified Files: Tag: GSoC-2009 profilechecker.cpp profilecheckerbase.ui qtdrawcurve.cpp Log Message: With these changes lprof is now ported Index: qtdrawcurve.cpp =================================================================== RCS file: /cvsroot/lprof/lprof/src/checkerqt/qtdrawcurve.cpp,v retrieving revision 1.6 retrieving revision 1.6.2.1 diff -C2 -d -r1.6 -r1.6.2.1 *** qtdrawcurve.cpp 6 Mar 2008 21:18:58 -0000 1.6 --- qtdrawcurve.cpp 5 Jul 2009 20:33:17 -0000 1.6.2.1 *************** *** 43,47 **** Pnt.begin(&Pix); ! Pnt.setBackgroundColor(qRgb(0, 0, 0)); Pnt.eraseRect(0, 0, pixcols-1, pixrows-1); Pnt.setPen(qRgb(255, 255, 255)); --- 43,47 ---- Pnt.begin(&Pix); ! Pnt.setBackground(QBrush::QBrush(QColor::QColor(qRgb(0, 0, 0)))); Pnt.eraseRect(0, 0, pixcols-1, pixrows-1); Pnt.setPen(qRgb(255, 255, 255)); Index: profilecheckerbase.ui =================================================================== RCS file: /cvsroot/lprof/lprof/src/checkerqt/profilecheckerbase.ui,v retrieving revision 1.25.2.1 retrieving revision 1.25.2.2 diff -C2 -d -r1.25.2.1 -r1.25.2.2 *** profilecheckerbase.ui 25 Jun 2009 13:32:06 -0000 1.25.2.1 --- profilecheckerbase.ui 5 Jul 2009 20:33:17 -0000 1.25.2.2 *************** *** 211,214 **** --- 211,315 ---- </layout> </item> + <item row="3" column="0"> + <layout class="QHBoxLayout"> + <property name="margin"> + <number>0</number> + </property> + <item> + <widget class="QPushButton" name="buttonHelp"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Maximum" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="text"> + <string>&Help</string> + </property> + <property name="shortcut"> + <string>Alt+H</string> + </property> + </widget> + </item> + <item> + <spacer> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeType"> + <enum>QSizePolicy::MinimumExpanding</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>20</width> + <height>10</height> + </size> + </property> + </spacer> + </item> + <item> + <widget class="QPushButton" name="TheGoButton"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Preferred" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="minimumSize"> + <size> + <width>89</width> + <height>0</height> + </size> + </property> + <property name="toolTip"> + <string>Press this button to run the inspection routines.</string> + </property> + <property name="whatsThis"> + <string>Press this button to run the inspection routines.</string> + </property> + <property name="text"> + <string>&Inspect Profile</string> + </property> + <property name="shortcut"> + <string>Alt+I</string> + </property> + <property name="default"> + <bool>true</bool> + </property> + </widget> + </item> + <item> + <widget class="QPushButton" name="buttonOk"> + <property name="minimumSize"> + <size> + <width>134</width> + <height>0</height> + </size> + </property> + <property name="windowTitle"> + <string/> + </property> + <property name="toolTip"> + <string>Cancel</string> + </property> + <property name="whatsThis"> + <string>Cancel</string> + </property> + <property name="text"> + <string>&Cancel</string> + </property> + <property name="shortcut"> + <string>Alt+C</string> + </property> + <property name="autoDefault"> + <bool>true</bool> + </property> + <property name="default"> + <bool>false</bool> + </property> + </widget> + </item> + </layout> + </item> <item row="2" column="0"> <widget class="QTabWidget" name="TabProfiler"> *************** *** 232,236 **** </property> <property name="currentIndex"> ! <number>2</number> </property> <widget class="QWidget" name="InfoTab"> --- 333,337 ---- </property> <property name="currentIndex"> ! <number>3</number> </property> <widget class="QWidget" name="InfoTab"> *************** *** 243,247 **** </property> <item row="0" column="0"> ! <widget class="Q3MultiLineEdit" name="InfoView" native="true"> <property name="sizePolicy"> <sizepolicy hsizetype="Ignored" vsizetype="Ignored"> --- 344,348 ---- </property> <item row="0" column="0"> ! <widget class="QTextEdit" name="InfoView"> <property name="sizePolicy"> <sizepolicy hsizetype="Ignored" vsizetype="Ignored"> *************** *** 259,263 **** <string>This is the message console</string> </property> ! <property name="readOnly" stdset="0"> <bool>true</bool> </property> --- 360,364 ---- <string>This is the message console</string> </property> ! <property name="readOnly"> <bool>true</bool> </property> *************** *** 268,272 **** </item> <item row="1" column="0"> ! <widget class="Q3GroupBox" name="GroupBox1_2"> <property name="sizePolicy"> <sizepolicy hsizetype="Preferred" vsizetype="Maximum"> --- 369,373 ---- </item> <item row="1" column="0"> ! <widget class="QGroupBox" name="GroupBox1_2"> <property name="sizePolicy"> <sizepolicy hsizetype="Preferred" vsizetype="Maximum"> *************** *** 414,418 **** </property> <item> ! <widget class="Q3TextView" name="ResultsResume" native="true"> <property name="sizePolicy"> <sizepolicy hsizetype="Preferred" vsizetype="Maximum"> --- 515,522 ---- </property> <item> ! <widget class="QTextEdit" name="ResultsResume"> ! <property name="enabled"> ! <bool>true</bool> ! </property> <property name="sizePolicy"> <sizepolicy hsizetype="Preferred" vsizetype="Maximum"> *************** *** 424,428 **** <size> <width>0</width> ! <height>70</height> </size> </property> --- 528,532 ---- <size> <width>0</width> ! <height>40</height> </size> </property> *************** *** 433,436 **** --- 537,543 ---- <string>Profile statisics</string> </property> + <property name="textInteractionFlags"> + <set>Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set> + </property> </widget> </item> *************** *** 477,481 **** </property> <item row="0" column="0"> ! <widget class="Q3Frame" name="CurveFrame_2"> <property name="sizePolicy"> <sizepolicy hsizetype="Preferred" vsizetype="Preferred"> --- 584,588 ---- </property> <item row="0" column="0"> ! <widget class="QFrame" name="CurveFrame_2"> <property name="sizePolicy"> <sizepolicy hsizetype="Preferred" vsizetype="Preferred"> *************** *** 532,536 **** </item> <item row="1" column="0"> ! <widget class="Q3ButtonGroup" name="ButtonGroup4_2_2"> <property name="sizePolicy"> <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed"> --- 639,643 ---- </item> <item row="1" column="0"> ! <widget class="QGroupBox" name="ButtonGroup4_2_2"> <property name="sizePolicy"> <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed"> *************** *** 557,566 **** <set>Qt::AlignLeading</set> </property> - <property name="exclusive"> - <bool>true</bool> - </property> - <property name="radioButtonExclusive"> - <bool>true</bool> - </property> <layout class="QGridLayout"> <item row="0" column="0"> --- 664,667 ---- *************** *** 725,829 **** </widget> </item> - <item row="3" column="0"> - <layout class="QHBoxLayout"> - <property name="margin"> - <number>0</number> - </property> - <item> - <widget class="QPushButton" name="buttonHelp"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Maximum" vsizetype="Fixed"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="text"> - <string>&Help</string> - </property> - <property name="shortcut"> - <string>Alt+H</string> - </property> - </widget> - </item> - <item> - <spacer> - <property name="orientation"> - <enum>Qt::Horizontal</enum> - </property> - <property name="sizeType"> - <enum>QSizePolicy::MinimumExpanding</enum> - </property> - <property name="sizeHint" stdset="0"> - <size> - <width>20</width> - <height>10</height> - </size> - </property> - </spacer> - </item> - <item> - <widget class="QPushButton" name="TheGoButton"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Preferred" vsizetype="Fixed"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="minimumSize"> - <size> - <width>89</width> - <height>0</height> - </size> - </property> - <property name="toolTip"> - <string>Press this button to run the inspection routines.</string> - </property> - <property name="whatsThis"> - <string>Press this button to run the inspection routines.</string> - </property> - <property name="text"> - <string>&Inspect Profile</string> - </property> - <property name="shortcut"> - <string>Alt+I</string> - </property> - <property name="default"> - <bool>true</bool> - </property> - </widget> - </item> - <item> - <widget class="QPushButton" name="buttonOk"> - <property name="minimumSize"> - <size> - <width>134</width> - <height>0</height> - </size> - </property> - <property name="windowTitle"> - <string/> - </property> - <property name="toolTip"> - <string>Cancel</string> - </property> - <property name="whatsThis"> - <string>Cancel</string> - </property> - <property name="text"> - <string>&Cancel</string> - </property> - <property name="shortcut"> - <string>Alt+C</string> - </property> - <property name="autoDefault"> - <bool>true</bool> - </property> - <property name="default"> - <bool>false</bool> - </property> - </widget> - </item> - </layout> - </item> </layout> </widget> --- 826,829 ---- *************** *** 831,854 **** <customwidgets> <customwidget> - <class>Q3GroupBox</class> - <extends>QGroupBox</extends> - <header>Qt3Support/Q3GroupBox</header> - <container>1</container> - </customwidget> - <customwidget> - <class>Q3Frame</class> - <extends>QFrame</extends> - <header>Qt3Support/Q3Frame</header> - <container>1</container> - </customwidget> - <customwidget> - <class>Q3ButtonGroup</class> - <extends>Q3GroupBox</extends> - <header>Qt3Support/Q3ButtonGroup</header> - <container>1</container> - </customwidget> - <customwidget> <class>ICCProfileSelector</class> ! <extends>Q3Frame</extends> <header>qtlcmswidgets.h</header> <container>1</container> --- 831,836 ---- <customwidgets> <customwidget> <class>ICCProfileSelector</class> ! <extends>QFrame</extends> <header>qtlcmswidgets.h</header> <container>1</container> *************** *** 856,878 **** <customwidget> <class>IT8SelectorWithFileDialog</class> ! <extends>Q3Frame</extends> <header>qtlcmswidgets.h</header> <container>1</container> </customwidget> <customwidget> - <class>Q3MultiLineEdit</class> - <extends>QWidget</extends> - <header>q3multilineedit.h</header> - </customwidget> - <customwidget> <class>cmsxCIETonge</class> <extends>QLabel</extends> <header>qtlcmswidgets.h</header> </customwidget> - <customwidget> - <class>Q3TextView</class> - <extends>QWidget</extends> - <header>q3textview.h</header> - </customwidget> </customwidgets> <includes> --- 838,850 ---- <customwidget> <class>IT8SelectorWithFileDialog</class> ! <extends>QFrame</extends> <header>qtlcmswidgets.h</header> <container>1</container> </customwidget> <customwidget> <class>cmsxCIETonge</class> <extends>QLabel</extends> <header>qtlcmswidgets.h</header> </customwidget> </customwidgets> <includes> Index: profilechecker.cpp =================================================================== RCS file: /cvsroot/lprof/lprof/src/checkerqt/profilechecker.cpp,v retrieving revision 1.49.2.3 retrieving revision 1.49.2.4 diff -C2 -d -r1.49.2.3 -r1.49.2.4 *** profilechecker.cpp 3 Jul 2009 16:10:56 -0000 1.49.2.3 --- profilechecker.cpp 5 Jul 2009 20:33:17 -0000 1.49.2.4 *************** *** 32,41 **** #include <qstringlist.h> ! #include <q3buttongroup.h> #include <qcheckbox.h> #include <qspinbox.h> #include <qslider.h> ! #include <q3filedialog.h> ! #include <q3progressbar.h> #include <qapplication.h> #include <qvariant.h> --- 32,41 ---- #include <qstringlist.h> ! #include <QButtonGroup> #include <qcheckbox.h> #include <qspinbox.h> #include <qslider.h> ! #include <QFileDialog> ! #include <QProgressBar> #include <qapplication.h> #include <qvariant.h> *************** *** 47,60 **** #include <qtabwidget.h> #include <qwidget.h> ! #include <q3groupbox.h> ! #include <q3multilineedit.h> ! #include <q3textview.h> ! #include <q3table.h> ! #include <q3buttongroup.h> #include <qradiobutton.h> ! #include <q3frame.h> #include <qlayout.h> #include <qtooltip.h> ! #include <q3whatsthis.h> #include <qimage.h> #include <qpixmap.h> --- 47,58 ---- #include <qtabwidget.h> #include <qwidget.h> ! #include <QGroupBox> ! #include <QTextEdit> ! #include <QTableWidget> #include <qradiobutton.h> ! #include <QFrame> #include <qlayout.h> #include <qtooltip.h> ! #include <QWhatsThis> #include <qimage.h> #include <qpixmap.h> *************** *** 154,161 **** ComboBoxIntent -> clear(); ! ComboBoxIntent -> insertItem(QString::fromLocal8Bit("(*) ") + tr("Perceptual")); ! ComboBoxIntent -> insertItem(QString::fromLocal8Bit("(*) ") + tr("Relative colorimetric")); ! ComboBoxIntent -> insertItem(QString::fromLocal8Bit("(*) ") + tr("Saturation")); ! ComboBoxIntent -> insertItem(QString::fromLocal8Bit("(*) ") + tr("Absolute")); /* TRANSLATOR White point text for Profile Checker information screen */ --- 152,159 ---- ComboBoxIntent -> clear(); ! ComboBoxIntent -> insertItem(100, QString::fromLocal8Bit("(*) ") + tr("Perceptual")); ! ComboBoxIntent -> insertItem(101, QString::fromLocal8Bit("(*) ") + tr("Relative colorimetric")); ! ComboBoxIntent -> insertItem(102, QString::fromLocal8Bit("(*) ") + tr("Saturation")); ! ComboBoxIntent -> insertItem(103, QString::fromLocal8Bit("(*) ") + tr("Absolute")); /* TRANSLATOR White point text for Profile Checker information screen */ *************** *** 180,184 **** // hide monitor profile page. This value is passed from the main dialog ! TabProfiler->removePage(MonitorProfilePage); // CIETonge->setScaledContents(true); CurvePixLabel->setScaledContents(true); --- 178,182 ---- // hide monitor profile page. This value is passed from the main dialog ! TabProfiler->removeTab(TabProfiler->indexOf(MonitorProfilePage)); // CIETonge->setScaledContents(true); CurvePixLabel->setScaledContents(true); *************** *** 253,259 **** ZeroMemory(&MediaWhite, sizeof(cmsCIEXYZ)); ! TabProfiler -> setTabEnabled(ResultsTab, FALSE); ! TabProfiler -> setTabEnabled(CurvesTab, FALSE); ! TabProfiler -> setTabEnabled(DiagramTab, FALSE); RadioPreA2B -> setEnabled(FALSE); --- 251,257 ---- ZeroMemory(&MediaWhite, sizeof(cmsCIEXYZ)); ! TabProfiler -> setTabEnabled(TabProfiler->indexOf(ResultsTab), FALSE); ! TabProfiler -> setTabEnabled(TabProfiler->indexOf(CurvesTab), FALSE); ! TabProfiler -> setTabEnabled(TabProfiler->indexOf(DiagramTab), FALSE); RadioPreA2B -> setEnabled(FALSE); *************** *** 624,637 **** MonitorProfileSelector->getFilename().toLocal8Bit()); ResultsResume -> setText(Results); ! TabProfiler -> setTabEnabled(ResultsTab, TRUE); } ! TabProfiler -> setTabEnabled(CurvesTab, TRUE); ! TabProfiler -> setTabEnabled(DiagramTab, TRUE); ComboBoxIntent -> clear(); ! ComboBoxIntent -> insertItem(SupportedIntent(hProfile, INTENT_PERCEPTUAL)); ! ComboBoxIntent -> insertItem(SupportedIntent(hProfile, INTENT_RELATIVE_COLORIMETRIC)); ! ComboBoxIntent -> insertItem(SupportedIntent(hProfile, INTENT_SATURATION)); cmsCloseProfile(hProfile); --- 622,635 ---- MonitorProfileSelector->getFilename().toLocal8Bit()); ResultsResume -> setText(Results); ! TabProfiler ->setTabEnabled(TabProfiler ->indexOf(ResultsTab), TRUE); } ! TabProfiler ->setTabEnabled(TabProfiler ->indexOf(CurvesTab), TRUE); ! TabProfiler ->setTabEnabled(TabProfiler ->indexOf(DiagramTab), TRUE); ComboBoxIntent -> clear(); ! ComboBoxIntent -> insertItem(104, SupportedIntent(hProfile, INTENT_PERCEPTUAL)); ! ComboBoxIntent -> insertItem(105, SupportedIntent(hProfile, INTENT_RELATIVE_COLORIMETRIC)); ! ComboBoxIntent -> insertItem(106, SupportedIntent(hProfile, INTENT_SATURATION)); cmsCloseProfile(hProfile); *************** *** 739,743 **** int ProfileChecker::GetIntent(void) { ! return ComboBoxIntent -> currentItem(); } --- 737,741 ---- int ProfileChecker::GetIntent(void) { ! return ComboBoxIntent -> currentIndex(); } *************** *** 747,751 **** // qDebug("RedrawCurve"); ! if (TabProfiler -> currentPage() != CurvesTab) return; int w = CurvePixLabel-> width() - 2; --- 745,749 ---- // qDebug("RedrawCurve"); ! if (TabProfiler -> currentWidget() != CurvesTab) return; int w = CurvePixLabel-> width() - 2; *************** *** 794,798 **** // char buff[128]; // qDebug("RedrawTonge"); ! if (TabProfiler -> currentPage() != DiagramTab) return; return; } --- 792,796 ---- // char buff[128]; // qDebug("RedrawTonge"); ! if (TabProfiler -> currentWidget() != DiagramTab) return; return; } *************** *** 806,812 **** void ProfileChecker::slotUpdateLabels() { ! if (TabProfiler -> currentPage() == CurvesTab) ComboBoxIntent -> show(); else ComboBoxIntent -> hide(); ! if (TabProfiler -> currentPage() == ResultsTab) ComboBoxCorrection -> show(); else ComboBoxCorrection -> hide(); --- 804,810 ---- void ProfileChecker::slotUpdateLabels() { ! if (TabProfiler -> currentWidget() == CurvesTab) ComboBoxIntent -> show(); else ComboBoxIntent -> hide(); ! if (TabProfiler -> currentWidget() == ResultsTab) ComboBoxCorrection -> show(); else ComboBoxCorrection -> hide(); *************** *** 861,868 **** { // if (TabProfiler->isTabEnabled(ResultsTab)) ! int i = TabProfiler->currentPageIndex(); slotGO(); ! TabProfiler->setTabEnabled(ResultsTab, TRUE); ! TabProfiler->setCurrentPage(i); } --- 859,866 ---- { // if (TabProfiler->isTabEnabled(ResultsTab)) ! int i = TabProfiler->currentIndex(); slotGO(); ! TabProfiler->setTabEnabled(TabProfiler ->indexOf(ResultsTab), TRUE); ! TabProfiler->setCurrentIndex(i); } |
