lprof-devel Mailing List for LProf open source ICC profiler (Page 2)
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-07-12 15:09:07
|
Update of /cvsroot/lprof/lprof/src/lprofqt In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv3010/lprofqt Modified Files: Tag: GSoC-2009 config.cpp figureeditor.cpp imageitem.cpp lprofmain-priv.h lprofmain.cpp lprofmain.h lprofmainbase.ui main.cpp Log Message: Index: main.cpp =================================================================== RCS file: /cvsroot/lprof/lprof/src/lprofqt/main.cpp,v retrieving revision 1.43.2.2 retrieving revision 1.43.2.3 diff -C2 -d -r1.43.2.2 -r1.43.2.3 *** main.cpp 1 Jul 2009 18:34:02 -0000 1.43.2.2 --- main.cpp 12 Jul 2009 15:09:00 -0000 1.43.2.3 *************** *** 126,131 **** QTranslator translator( 0 ); // QString::fromLocal8Bit translations = ":/translations/lprof_" + (QString::fromLocal8Bit) QTextCodec::locale(); ! //translator.load( QString::fromLocal8Bit("lprof_") + QString::fromLocal8Bit(QTextCodec::locale()), QString::fromLocal8Bit(":/") ); //removed by me===========29june======== ! translator.load( QString::fromLocal8Bit("lprof_") + QLocale::system().name(), QString::fromLocal8Bit(":/") ); //added by me===========28june============ lprofApp -> installTranslator( &translator ); --- 126,130 ---- QTranslator translator( 0 ); // QString::fromLocal8Bit translations = ":/translations/lprof_" + (QString::fromLocal8Bit) QTextCodec::locale(); ! translator.load( QString::fromLocal8Bit("lprof_") + QLocale::system().name(), QString::fromLocal8Bit(":/") ); lprofApp -> installTranslator( &translator ); Index: imageitem.cpp =================================================================== RCS file: /cvsroot/lprof/lprof/src/lprofqt/imageitem.cpp,v retrieving revision 1.4.2.6 retrieving revision 1.4.2.7 diff -C2 -d -r1.4.2.6 -r1.4.2.7 *** imageitem.cpp 1 Jul 2009 18:34:02 -0000 1.4.2.6 --- imageitem.cpp 12 Jul 2009 15:09:00 -0000 1.4.2.7 *************** *** 37,41 **** #include <qmessagebox.h> #include <qfile.h> - //Added by qt3to4: #include <QTranslator> --- 37,40 ---- Index: lprofmain-priv.h =================================================================== RCS file: /cvsroot/lprof/lprof/src/lprofqt/lprofmain-priv.h,v retrieving revision 1.6.2.4 retrieving revision 1.6.2.5 diff -C2 -d -r1.6.2.4 -r1.6.2.5 *** lprofmain-priv.h 1 Jul 2009 18:34:02 -0000 1.6.2.4 --- lprofmain-priv.h 12 Jul 2009 15:09:00 -0000 1.6.2.5 *************** *** 37,41 **** #include <qassistantclient.h> #include <QTextEdit> - //Added by qt3to4: #include <lcmsprf.h> #include <qtabwidget.h> --- 37,40 ---- Index: lprofmain.cpp =================================================================== RCS file: /cvsroot/lprof/lprof/src/lprofqt/lprofmain.cpp,v retrieving revision 1.188.2.7 retrieving revision 1.188.2.8 diff -C2 -d -r1.188.2.7 -r1.188.2.8 *** lprofmain.cpp 1 Jul 2009 18:34:02 -0000 1.188.2.7 --- lprofmain.cpp 12 Jul 2009 15:09:00 -0000 1.188.2.8 *************** *** 38,47 **** #include <profilechecker.h> #include <qtlcmswidgets.h> - //Added by qt3to4: - #include "lprofmain.h" #include "lprofmain-priv.h" #include "lcmsprf.h" - #include <string.h> #include <stdlib.h> --- 38,44 ---- *************** *** 502,520 **** instType itype; ! QTableWidgetItem *item = ui->listViewPortsInsts -> currentItem (); ! itype = mapCombo2Inst[ui->comboBoxDevice -> currentIndex()]; ! int my_row=item->row (); ! QTableWidgetItem *item2 =ui->listViewPortsInsts->item(my_row,1); if (validateIntrument(item2 -> text(), itype)) { ! QTableWidgetItem *item3 =ui->listViewPortsInsts->item(my_row,2); item3->setText(ui->comboBoxDevice -> currentText()); ! item3 =ui->listViewPortsInsts->item(my_row,3); item3->setText(tr("Device verified")); charInstType.sprintf("%i", itype); ! item3 =ui->listViewPortsInsts->item(my_row,4); item3->setText(charInstType); ! item3=ui->listViewPortsInsts->item(my_row,0); index=item3->text().toInt(&OK) - 1; --- 499,517 ---- instType itype; ! QTableWidgetItem *item = ui->listViewPortsInsts ->currentItem (); ! itype = mapCombo2Inst[ui->comboBoxDevice ->currentIndex()]; ! int currentrow=item->row (); ! QTableWidgetItem *item2 =ui->listViewPortsInsts->item(currentrow,1); if (validateIntrument(item2 -> text(), itype)) { ! QTableWidgetItem *item3 =ui->listViewPortsInsts->item(currentrow,2); item3->setText(ui->comboBoxDevice -> currentText()); ! item3 =ui->listViewPortsInsts->item(currentrow,3); item3->setText(tr("Device verified")); charInstType.sprintf("%i", itype); ! item3 =ui->listViewPortsInsts->item(currentrow,4); item3->setText(charInstType); ! item3=ui->listViewPortsInsts->item(currentrow,0); index=item3->text().toInt(&OK) - 1; *************** *** 522,526 **** { sys.hdr.instArray[index].inst = itype; ! item3=ui->listViewPortsInsts->item(my_row,1); strcpy(sys.hdr.instArray[index].port, item3 -> text().toLocal8Bit()); } --- 519,523 ---- { sys.hdr.instArray[index].inst = itype; ! item3=ui->listViewPortsInsts->item(currentrow,1); strcpy(sys.hdr.instArray[index].port, item3 -> text().toLocal8Bit()); } *************** *** 539,543 **** else { ! QTableWidgetItem *item3 =ui->listViewPortsInsts->item(my_row,3); item3->setText( tr("Device failed verification.")); QMessageBox::critical(this, QTranslator::tr("Error installing measurement device."), --- 536,540 ---- else { ! QTableWidgetItem *item3 =ui->listViewPortsInsts->item(currentrow,3); item3->setText( tr("Device failed verification.")); QMessageBox::critical(this, QTranslator::tr("Error installing measurement device."), *************** *** 579,594 **** ui->listViewPortsInsts -> setColumnWidth (3, 350); ui->listViewPortsInsts -> setColumnWidth (4, 0); ! QString str = QString(QLatin1String("p#")) ; ! QTableWidgetItem *item1 = new QTableWidgetItem(str,0); ! ui->listViewPortsInsts->setHorizontalHeaderItem(0,item1); ! str = QString(QLatin1String("Port")); ! item1 = new QTableWidgetItem(str,0); ! ui->listViewPortsInsts->setHorizontalHeaderItem(1,item1); ! str = QString(QLatin1String("Device")); ! item1 = new QTableWidgetItem(str,0); ! ui->listViewPortsInsts->setHorizontalHeaderItem(2,item1); ! str = QString(QLatin1String("Status")); ! item1 = new QTableWidgetItem(str,0); ! ui->listViewPortsInsts->setHorizontalHeaderItem(3,item1); for (int i=0; i < sys.hdr.validPorts; i++) --- 576,589 ---- ui->listViewPortsInsts -> setColumnWidth (3, 350); ui->listViewPortsInsts -> setColumnWidth (4, 0); ! ! QTableWidgetItem *Horizontal = new QTableWidgetItem(QString::fromLocal8Bit("p#"),0); ! ui->listViewPortsInsts->setHorizontalHeaderItem(0,Horizontal); ! Horizontal = new QTableWidgetItem(QString::fromLocal8Bit("Port"),0); ! ui->listViewPortsInsts->setHorizontalHeaderItem(1,Horizontal); ! Horizontal = new QTableWidgetItem(QString::fromLocal8Bit("Device"),0); ! ui->listViewPortsInsts->setHorizontalHeaderItem(2,Horizontal); ! Horizontal = new QTableWidgetItem(QString::fromLocal8Bit("Status"),0); ! ui->listViewPortsInsts->setHorizontalHeaderItem(3,Horizontal); ! for (int i=0; i < sys.hdr.validPorts; i++) *************** *** 1136,1143 **** ui->ComboBoxIntent -> clear(); ! ui->ComboBoxIntent -> insertItem(1000,per); ! ui->ComboBoxIntent -> insertItem(1000,relcolor); ! ui->ComboBoxIntent -> insertItem(1000,sat); ! ui->ComboBoxIntent -> insertItem(1000,Absolute); init_mon(); --- 1131,1138 ---- ui->ComboBoxIntent -> clear(); ! ui->ComboBoxIntent -> insertItem((ui->ComboBoxIntent->count() + 1), per); ! ui->ComboBoxIntent -> insertItem((ui->ComboBoxIntent->count() + 1),relcolor); ! ui->ComboBoxIntent -> insertItem((ui->ComboBoxIntent->count() + 1),sat); ! ui->ComboBoxIntent -> insertItem((ui->ComboBoxIntent->count() + 1),Absolute); init_mon(); Index: figureeditor.cpp =================================================================== RCS file: /cvsroot/lprof/lprof/src/lprofqt/figureeditor.cpp,v retrieving revision 1.3.2.3 retrieving revision 1.3.2.4 diff -C2 -d -r1.3.2.3 -r1.3.2.4 *** figureeditor.cpp 23 Jun 2009 19:30:36 -0000 1.3.2.3 --- figureeditor.cpp 12 Jul 2009 15:09:00 -0000 1.3.2.4 *************** *** 33,37 **** #include "lprofmain-priv.h" #include "lprofmain.h" - //Added by qt3to4: #include <QResizeEvent> #include <QMouseEvent> --- 33,36 ---- Index: lprofmain.h =================================================================== RCS file: /cvsroot/lprof/lprof/src/lprofqt/lprofmain.h,v retrieving revision 1.52.2.7 retrieving revision 1.52.2.8 diff -C2 -d -r1.52.2.7 -r1.52.2.8 *** lprofmain.h 5 Jul 2009 20:33:17 -0000 1.52.2.7 --- lprofmain.h 12 Jul 2009 15:09:00 -0000 1.52.2.8 *************** *** 39,43 **** #include <qmutex.h> #include <QDialog> - //Added by qt3to4: #include <QTranslator> #include <QPixmap> --- 39,42 ---- Index: config.cpp =================================================================== RCS file: /cvsroot/lprof/lprof/src/lprofqt/config.cpp,v retrieving revision 1.8.2.6 retrieving revision 1.8.2.7 diff -C2 -d -r1.8.2.6 -r1.8.2.7 *** config.cpp 5 Jul 2009 20:33:17 -0000 1.8.2.6 --- config.cpp 12 Jul 2009 15:09:00 -0000 1.8.2.7 *************** *** 45,49 **** #include <qradiobutton.h> #include <QDesktopWidget> - //Added by qt3to4: #include <QTranslator> #include <QVBoxLayout> --- 45,48 ---- Index: lprofmainbase.ui =================================================================== RCS file: /cvsroot/lprof/lprof/src/lprofqt/lprofmainbase.ui,v retrieving revision 1.50.2.3 retrieving revision 1.50.2.4 diff -C2 -d -r1.50.2.3 -r1.50.2.4 *** lprofmainbase.ui 1 Jul 2009 18:34:02 -0000 1.50.2.3 --- lprofmainbase.ui 12 Jul 2009 15:09:00 -0000 1.50.2.4 *************** *** 1666,1670 **** </property> <property name="showGrid"> ! <bool>false</bool> </property> <property name="gridStyle"> --- 1666,1670 ---- </property> <property name="showGrid"> ! <bool>true</bool> </property> <property name="gridStyle"> *************** *** 1672,1676 **** </property> <attribute name="horizontalHeaderVisible"> ! <bool>false</bool> </attribute> <attribute name="verticalHeaderVisible"> --- 1672,1676 ---- </property> <attribute name="horizontalHeaderVisible"> ! <bool>true</bool> </attribute> <attribute name="verticalHeaderVisible"> |
|
From: Amit K. <ami...@us...> - 2009-07-12 15:09:03
|
Update of /cvsroot/lprof/lprof/src/monqt In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv3010/monqt Modified Files: Tag: GSoC-2009 monitorvalues.cpp Log Message: Index: monitorvalues.cpp =================================================================== RCS file: /cvsroot/lprof/lprof/src/monqt/monitorvalues.cpp,v retrieving revision 1.28.2.3 retrieving revision 1.28.2.4 diff -C2 -d -r1.28.2.3 -r1.28.2.4 *** monitorvalues.cpp 7 Jul 2009 22:09:30 -0000 1.28.2.3 --- monitorvalues.cpp 12 Jul 2009 15:09:00 -0000 1.28.2.4 *************** *** 35,39 **** #include "qtlcmswidgets.h" #include <QDesktopWidget> - //Added by qt3to4: #include <QTranslator> #include "lprofmain.h" --- 35,38 ---- |
|
From: Amit K. <ami...@us...> - 2009-07-07 22:09:40
|
Update of /cvsroot/lprof/lprof/src/checkerqt In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv15386/checkerqt Modified Files: Tag: GSoC-2009 profilechecker.cpp Log Message: Changes made to make help working in lprof Index: profilechecker.cpp =================================================================== RCS file: /cvsroot/lprof/lprof/src/checkerqt/profilechecker.cpp,v retrieving revision 1.49.2.4 retrieving revision 1.49.2.5 diff -C2 -d -r1.49.2.4 -r1.49.2.5 *** profilechecker.cpp 5 Jul 2009 20:33:17 -0000 1.49.2.4 --- profilechecker.cpp 7 Jul 2009 22:09:30 -0000 1.49.2.5 *************** *** 873,877 **** { QString path = get_global_help_path() + QString::fromLocal8Bit("/checker.html"); ! qDebug(path.toLocal8Bit()); getHelp()->openAssistant (); getHelp()->showPage(path); --- 873,877 ---- { QString path = get_global_help_path() + QString::fromLocal8Bit("/checker.html"); ! // qDebug(path.toLocal8Bit()); getHelp()->openAssistant (); getHelp()->showPage(path); |
|
From: Amit K. <ami...@us...> - 2009-07-07 22:09:39
|
Update of /cvsroot/lprof/lprof/src/lprofqt In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv15386/lprofqt Modified Files: Tag: GSoC-2009 slots.cpp Log Message: Changes made to make help working in lprof Index: slots.cpp =================================================================== RCS file: /cvsroot/lprof/lprof/src/lprofqt/slots.cpp,v retrieving revision 1.5.2.4 retrieving revision 1.5.2.5 diff -C2 -d -r1.5.2.4 -r1.5.2.5 *** slots.cpp 1 Jul 2009 18:34:02 -0000 1.5.2.4 --- slots.cpp 7 Jul 2009 22:09:30 -0000 1.5.2.5 *************** *** 1132,1138 **** { zeroProgressBars(); ! QString temp = QString::fromLocal8Bit("/lprof-help.html"); ! QString path = global_help_path.append(temp); ! // qDebug(path.toLocal8Bit()); help->openAssistant (); help->showPage(path); --- 1132,1137 ---- { zeroProgressBars(); ! QString path = global_help_path + QString::fromLocal8Bit("/lprof-help.html"); ! // qDebug(path.toLocal8Bit()); help->openAssistant (); help->showPage(path); |
|
From: Amit K. <ami...@us...> - 2009-07-07 22:09:35
|
Update of /cvsroot/lprof/lprof/src/gammaqt In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv15386/gammaqt Modified Files: Tag: GSoC-2009 setgamma.cpp Log Message: Changes made to make help working in lprof Index: setgamma.cpp =================================================================== RCS file: /cvsroot/lprof/lprof/src/gammaqt/setgamma.cpp,v retrieving revision 1.30.2.2 retrieving revision 1.30.2.3 diff -C2 -d -r1.30.2.2 -r1.30.2.3 *** setgamma.cpp 5 Jul 2009 20:33:17 -0000 1.30.2.2 --- setgamma.cpp 7 Jul 2009 22:09:30 -0000 1.30.2.3 *************** *** 362,367 **** void SetGamma::slotHelpButton() { ! QString path = get_global_help_path() + QString::fromLocal8Bit("/help/gamma.html"); ! qDebug(path.toLocal8Bit()); getHelp()->openAssistant (); getHelp()->showPage(path); --- 362,367 ---- void SetGamma::slotHelpButton() { ! QString path = get_global_help_path() + QString::fromLocal8Bit("/gamma.html"); ! //qDebug(path.toLocal8Bit()); getHelp()->openAssistant (); getHelp()->showPage(path); |
|
From: Amit K. <ami...@us...> - 2009-07-07 22:09:34
|
Update of /cvsroot/lprof/lprof/src/IDqt In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv15386/IDqt Modified Files: Tag: GSoC-2009 profileid.cpp Log Message: Changes made to make help working in lprof Index: profileid.cpp =================================================================== RCS file: /cvsroot/lprof/lprof/src/IDqt/profileid.cpp,v retrieving revision 1.20.2.2 retrieving revision 1.20.2.3 diff -C2 -d -r1.20.2.2 -r1.20.2.3 *** profileid.cpp 5 Jul 2009 20:33:17 -0000 1.20.2.2 --- profileid.cpp 7 Jul 2009 22:09:30 -0000 1.20.2.3 *************** *** 151,155 **** void ProfileID::slotHelpButton() { ! QString path = get_global_help_path() + QString::fromLocal8Bit("/help/profile-id.html"); // qDebug(path); getHelp()->openAssistant (); --- 151,155 ---- void ProfileID::slotHelpButton() { ! QString path = get_global_help_path() + QString::fromLocal8Bit("/profile-id.html"); // qDebug(path); getHelp()->openAssistant (); |
|
From: Amit K. <ami...@us...> - 2009-07-07 22:09:34
|
Update of /cvsroot/lprof/lprof/src/monqt In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv15386/monqt Modified Files: Tag: GSoC-2009 monitorvalues.cpp Log Message: Changes made to make help working in lprof Index: monitorvalues.cpp =================================================================== RCS file: /cvsroot/lprof/lprof/src/monqt/monitorvalues.cpp,v retrieving revision 1.28.2.2 retrieving revision 1.28.2.3 diff -C2 -d -r1.28.2.2 -r1.28.2.3 *** monitorvalues.cpp 5 Jul 2009 20:33:17 -0000 1.28.2.2 --- monitorvalues.cpp 7 Jul 2009 22:09:30 -0000 1.28.2.3 *************** *** 390,394 **** { QString path = get_global_help_path() + QString::fromLocal8Bit("/mon-val.html"); ! qDebug(path.toLocal8Bit()); getHelp()->openAssistant (); getHelp()->showPage(path); --- 390,394 ---- { QString path = get_global_help_path() + QString::fromLocal8Bit("/mon-val.html"); ! //qDebug(path.toLocal8Bit()); getHelp()->openAssistant (); getHelp()->showPage(path); |
|
From: Amit K. <ami...@us...> - 2009-07-07 22:09:33
|
Update of /cvsroot/lprof/lprof/src/moncalcontrolqt In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv15386/moncalcontrolqt Modified Files: Tag: GSoC-2009 moncalcontrolbase.ui moncalreportsbase.ui Log Message: Changes made to make help working in lprof Index: moncalcontrolbase.ui =================================================================== RCS file: /cvsroot/lprof/lprof/src/moncalcontrolqt/moncalcontrolbase.ui,v retrieving revision 1.21.2.2 retrieving revision 1.21.2.3 diff -C2 -d -r1.21.2.2 -r1.21.2.3 *** moncalcontrolbase.ui 3 Jul 2009 16:10:56 -0000 1.21.2.2 --- moncalcontrolbase.ui 7 Jul 2009 22:09:30 -0000 1.21.2.3 *************** *** 11,254 **** </rect> </property> - <property name="sizePolicy"> - <sizepolicy hsizetype="Preferred" vsizetype="Preferred"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="minimumSize"> - <size> [...2645 lines suppressed...] ! </layout> ! </item> ! <item row="2" column="1"> ! <widget class="QPushButton" name="pushButtonReports4"> ! <property name="whatsThis"> ! <string>Run various reports on the calibration state of your display. You can also run an ambient light report to help evaluate your rooms lighting.</string> ! </property> ! <property name="text"> ! <string>Calibration Reports</string> ! </property> ! </widget> ! </item> ! </layout> </widget> </widget> + <layoutdefault spacing="6" margin="11"/> <customwidgets> <customwidget> <class>customPage</class> <extends>QWizardPage</extends> Index: moncalreportsbase.ui =================================================================== RCS file: /cvsroot/lprof/lprof/src/moncalcontrolqt/moncalreportsbase.ui,v retrieving revision 1.5 retrieving revision 1.5.2.1 diff -C2 -d -r1.5 -r1.5.2.1 *** moncalreportsbase.ui 1 Feb 2009 20:04:01 -0000 1.5 --- moncalreportsbase.ui 7 Jul 2009 22:09:30 -0000 1.5.2.1 *************** *** 48,52 **** </item> <item row="2" column="1" > ! <widget class="Q3ButtonGroup" name="buttonGroup9" > <property name="sizePolicy" > <sizepolicy vsizetype="Fixed" hsizetype="Preferred" > --- 48,52 ---- </item> <item row="2" column="1" > ! <widget class="QGroupBox" name="buttonGroup9" > <property name="sizePolicy" > <sizepolicy vsizetype="Fixed" hsizetype="Preferred" > *************** *** 313,324 **** </widget> <layoutdefault spacing="6" margin="11" /> - <customwidgets> - <customwidget> - <class>Q3ButtonGroup</class> - <extends>Q3GroupBox</extends> - <header>Qt3Support/Q3ButtonGroup</header> - <container>1</container> - </customwidget> - </customwidgets> <resources> <include location="../../lprof.qrc" /> --- 313,316 ---- |
|
From: Amit K. <ami...@us...> - 2009-07-05 22:05:20
|
Update of /cvsroot/lprof/lprof/src/moncalcontrolqt In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv22902/moncalcontrolqt Modified Files: Tag: GSoC-2009 moncalcontrol.cpp moncalreports.cpp Log Message: Index: moncalcontrol.cpp =================================================================== RCS file: /cvsroot/lprof/lprof/src/moncalcontrolqt/moncalcontrol.cpp,v retrieving revision 1.37.2.3 retrieving revision 1.37.2.4 diff -C2 -d -r1.37.2.3 -r1.37.2.4 *** moncalcontrol.cpp 3 Jul 2009 16:10:56 -0000 1.37.2.3 --- moncalcontrol.cpp 5 Jul 2009 22:05:17 -0000 1.37.2.4 *************** *** 38,42 **** #include "main.h" - #include <q3textedit.h> #include <qradiobutton.h> #include <qpixmap.h> --- 38,41 ---- *************** *** 48,55 **** #include <qstring.h> #include <qpushbutton.h> - #include <q3buttongroup.h> #include <qtimer.h> #include <qmutex.h> - #include <q3filedialog.h> #include <qfileinfo.h> #include <qthread.h> --- 47,52 ---- *************** *** 256,260 **** char instName[64]; ! strcpy(instName, cd.data.selectedInst.name.local8Bit()); cd.data.selectedInst.Inst = inst_enum(instName); --- 253,257 ---- char instName[64]; ! strcpy(instName, cd.data.selectedInst.name.toLocal8Bit()); cd.data.selectedInst.Inst = inst_enum(instName); *************** *** 360,408 **** { // qDebug("controlsToValues()"); ! if (LCDradioButton -> isOn()) cd.data.disp = LCD; else cd.data.disp = CRT; ! if (k6500 -> isOn()) { cd.data.wp = 6500.0; } ! else if (k5000 -> isOn()) { cd.data.wp = 5000.0; } ! else if (native -> isOn()) { cd.data.wp = 0.0; } ! else if ( tempUser -> isOn()) cd.data.wp = spinBoxTempUser -> value(); else qDebug("whitePoint is not being correctly set"); ! if (nativeBrightness -> isOn()) cd.data.displayBr=0.0; else cd.data.displayBr = (double) spinBoxBrightness -> value(); ! if (sampleSmall -> isOn()) cd.data.size = smallest; ! else if (sampleMedium -> isOn()) cd.data.size = medium; ! else if (sampleLarge -> isOn()) cd.data.size = large; ! else if (sampleHuge -> isOn()) cd.data.size = huge; ! if (radioButtonGammaUser -> isOn()) cd.data.gamma = userGamma -> value(); ! else if (radioButtonGamma1_8 -> isOn()) cd.data.gamma = 1.8; else cd.data.gamma = 2.2; ! if (radioGammasRGB -> isOn()) cd.data.gammaType = gtsRGB; ! else if (radioButtonLstar -> isOn()) cd.data.gammaType = gtLstar; else --- 357,405 ---- { // qDebug("controlsToValues()"); ! if (LCDradioButton -> isChecked()) cd.data.disp = LCD; else cd.data.disp = CRT; ! if (k6500 -> isChecked()) { cd.data.wp = 6500.0; } ! else if (k5000 -> isChecked()) { cd.data.wp = 5000.0; } ! else if (native -> isChecked()) { cd.data.wp = 0.0; } ! else if ( tempUser -> isChecked()) cd.data.wp = spinBoxTempUser -> value(); else qDebug("whitePoint is not being correctly set"); ! if (nativeBrightness -> isChecked()) cd.data.displayBr=0.0; else cd.data.displayBr = (double) spinBoxBrightness -> value(); ! if (sampleSmall -> isChecked()) cd.data.size = smallest; ! else if (sampleMedium -> isChecked()) cd.data.size = medium; ! else if (sampleLarge -> isChecked()) cd.data.size = large; ! else if (sampleHuge -> isChecked()) cd.data.size = huge; ! if (radioButtonGammaUser -> isChecked()) cd.data.gamma = userGamma -> value(); ! else if (radioButtonGamma1_8 -> isChecked()) cd.data.gamma = 1.8; else cd.data.gamma = 2.2; ! if (radioGammasRGB -> isChecked()) cd.data.gammaType = gtsRGB; ! else if (radioButtonLstar -> isChecked()) cd.data.gammaType = gtLstar; else *************** *** 410,414 **** mutex.lock(); ! cd.data.selectedInst = listedInsts[comboBoxInstruments -> currentItem()]; mutex.unlock(); --- 407,411 ---- mutex.lock(); ! cd.data.selectedInst = listedInsts[comboBoxInstruments -> currentIndex()]; mutex.unlock(); *************** *** 441,445 **** if (reportOP != noOp) { ! if (listedInsts[comboBoxInstruments -> currentItem()].Inst != instUnknown) { if (reportOP == opAmbient) --- 438,442 ---- if (reportOP != noOp) { ! if (listedInsts[comboBoxInstruments -> currentIndex()].Inst != instUnknown) { if (reportOP == opAmbient) *************** *** 467,477 **** void MonitorCalControl::slotControls() { ! if (setBlackPoint -> isOn()) cd.data.op = opSetBlackPoint; ! else if (setWhitePoint -> isOn()) cd.data.op = opSetWhitePoint; ! else if (setBlackLevel -> isOn()) cd.data.op = opSetBlackLevel; ! else if (setWhiteLevel -> isOn()) cd.data.op = opSetWhiteLevel; else qDebug("Operation not yet setup - moncalcontrol"); --- 464,474 ---- void MonitorCalControl::slotControls() { ! if (setBlackPoint -> isChecked()) cd.data.op = opSetBlackPoint; ! else if (setWhitePoint -> isChecked()) cd.data.op = opSetWhitePoint; ! else if (setBlackLevel -> isChecked()) cd.data.op = opSetBlackLevel; ! else if (setWhiteLevel -> isChecked()) cd.data.op = opSetWhiteLevel; else qDebug("Operation not yet setup - moncalcontrol"); *************** *** 482,494 **** void MonitorCalControl::slotUserTemp() { ! spinBoxTempUser -> setEnabled(tempUser -> isOn()); } void MonitorCalControl::slotUserGamma() { ! if (radioButtonGenericGamma -> isOn()) { buttonGroupGamma -> setEnabled(TRUE); ! userGamma -> setEnabled(radioButtonGammaUser -> isOn()); } else --- 479,491 ---- void MonitorCalControl::slotUserTemp() { ! spinBoxTempUser -> setEnabled(tempUser -> isChecked()); } void MonitorCalControl::slotUserGamma() { ! if (radioButtonGenericGamma -> isChecked()) { buttonGroupGamma -> setEnabled(TRUE); ! userGamma -> setEnabled(radioButtonGammaUser -> isChecked()); } else *************** *** 502,519 **** { // qDebug("slotUserLuninosity()"); ! spinBoxBrightness -> setEnabled(specifiedBrightness -> isOn()); ! setWhiteLevel -> setEnabled(specifiedBrightness -> isOn()); } void MonitorCalControl::slotDisplayType() { ! setBlackLevel -> setEnabled(CRTradioButton -> isOn()); } void MonitorCalControl::slotGo() { ! qDebug("inst type = %i", listedInsts[comboBoxInstruments -> currentItem()].Inst); ! if (// listedInsts[comboBoxInstruments -> currentItem()].Inst != instUnknown && ! listedInsts[comboBoxInstruments -> currentItem()].deviceFlag == OK) { instUpdate = FALSE; --- 499,516 ---- { // qDebug("slotUserLuninosity()"); ! spinBoxBrightness -> setEnabled(specifiedBrightness -> isChecked()); ! setWhiteLevel -> setEnabled(specifiedBrightness -> isChecked()); } void MonitorCalControl::slotDisplayType() { ! setBlackLevel -> setEnabled(CRTradioButton -> isChecked()); } void MonitorCalControl::slotGo() { ! qDebug("inst type = %i", listedInsts[comboBoxInstruments -> currentIndex()].Inst); ! if (// listedInsts[comboBoxInstruments -> currentIndex()].Inst != instUnknown && ! listedInsts[comboBoxInstruments -> currentIndex()].deviceFlag == OK) { instUpdate = FALSE; *************** *** 602,606 **** currPos = 0; else if (comboBoxInstruments -> count() > 0) ! currPos = comboBoxInstruments -> currentItem(); else currPos = 0; --- 599,603 ---- currPos = 0; else if (comboBoxInstruments -> count() > 0) ! currPos = comboBoxInstruments -> currentIndex(); else currPos = 0; *************** *** 617,621 **** while (i < listedInsts[0].listSize && !changed) { ! comboBoxInstruments -> setCurrentItem(i); if (listedInsts[i].name != comboBoxInstruments -> currentText()) changed = true; --- 614,618 ---- while (i < listedInsts[0].listSize && !changed) { ! comboBoxInstruments -> setCurrentIndex(i); if (listedInsts[i].name != comboBoxInstruments -> currentText()) changed = true; *************** *** 623,627 **** } // restore position in combobox ! comboBoxInstruments -> setCurrentItem(currPos); } else // size is different so it must have changed --- 620,624 ---- } // restore position in combobox ! comboBoxInstruments -> setCurrentIndex(currPos); } else // size is different so it must have changed *************** *** 634,638 **** for (int i=0; i < listedInsts[0].listSize; i++) { ! comboBoxInstruments -> insertItem(listedInsts[i].name); } if (!spyd2FirmwareOK) --- 631,635 ---- for (int i=0; i < listedInsts[0].listSize; i++) { ! comboBoxInstruments -> insertItem((comboBoxInstruments->count() + 1), listedInsts[i].name); } if (!spyd2FirmwareOK) *************** *** 654,658 **** mutex.unlock(); instUpdate = TRUE; ! int i = timer->start( 1000, TRUE ); } else --- 651,658 ---- mutex.unlock(); instUpdate = TRUE; ! //int i = timer->start( 1000, TRUE ); ! timer->setSingleShot(TRUE); ! timer->start(1000); ! int i = timer->timerId(); } else *************** *** 662,666 **** MonitorCalControl::MonitorCalControl(QWidget *parent ) ! : QWizard(parent, Qt::WStyle_SysMenu | Qt::WStyle_MinMax | Qt::WStyle_Title) { setupUi(this); --- 662,666 ---- MonitorCalControl::MonitorCalControl(QWidget *parent ) ! : QWizard(parent, Qt::WindowSystemMenuHint | Qt::WindowMinMaxButtonsHint | Qt::WindowTitleHint) { setupUi(this); Index: moncalreports.cpp =================================================================== RCS file: /cvsroot/lprof/lprof/src/moncalcontrolqt/moncalreports.cpp,v retrieving revision 1.4 retrieving revision 1.4.2.1 diff -C2 -d -r1.4 -r1.4.2.1 *** moncalreports.cpp 18 May 2009 21:17:17 -0000 1.4 --- moncalreports.cpp 5 Jul 2009 22:05:17 -0000 1.4.2.1 *************** *** 36,40 **** MonitorCalReports::MonitorCalReports(QWidget *parent ) ! : QDialog(parent, "", 0, Qt::WindowSystemMenuHint) { setupUi(this); --- 36,40 ---- MonitorCalReports::MonitorCalReports(QWidget *parent ) ! : QDialog(parent, Qt::WindowSystemMenuHint) { setupUi(this); *************** *** 52,62 **** void MonitorCalReports::slotReport() { ! if (checkCal -> isOn()) reportOP = opCalReport; ! else if (reportUncalibrated -> isOn()) reportOP = opUncalReport; ! else if (BigCalibrationReport -> isOn()) reportOP = opBigCalReport; ! else if (ambientReport -> isOn()) reportOP = opAmbient; else qDebug("Operation not yet setup - moncalreports"); --- 52,62 ---- void MonitorCalReports::slotReport() { ! if (checkCal -> isChecked()) reportOP = opCalReport; ! else if (reportUncalibrated -> isChecked()) reportOP = opUncalReport; ! else if (BigCalibrationReport -> isChecked()) reportOP = opBigCalReport; ! else if (ambientReport -> isChecked()) reportOP = opAmbient; else qDebug("Operation not yet setup - moncalreports"); |
|
From: Amit K. <ami...@us...> - 2009-07-05 20:33:29
|
Update of /cvsroot/lprof/lprof/src/reference_inst_qt In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv11270/reference_inst_qt Modified Files: Tag: GSoC-2009 installreffile.cpp installreffile.h installreffilebase.ui Log Message: With these changes lprof is now ported Index: installreffile.h =================================================================== RCS file: /cvsroot/lprof/lprof/src/reference_inst_qt/installreffile.h,v retrieving revision 1.21.2.2 retrieving revision 1.21.2.3 diff -C2 -d -r1.21.2.2 -r1.21.2.3 *** installreffile.h 1 Jul 2009 18:34:03 -0000 1.21.2.2 --- installreffile.h 5 Jul 2009 20:33:18 -0000 1.21.2.3 *************** *** 35,41 **** #include <ui_installreffilebase.h> #include <QFile> - //#include <q3urloperator.h> - - //class Q3NetworkOperation; enum TemplateType --- 35,38 ---- *************** *** 72,77 **** bool refNotToOld(); - //Q3UrlOperator urlOp; - //int copyNum; ref_file_parms dirs; targetTemplate files; --- 69,72 ---- *************** *** 82,86 **** void slotCancel(); void slotHelpButton(); - //void slotFileCopied( Q3NetworkOperation * ); void slotTargetSelectorChanged(); --- 77,80 ---- Index: installreffile.cpp =================================================================== RCS file: /cvsroot/lprof/lprof/src/reference_inst_qt/installreffile.cpp,v retrieving revision 1.57.2.2 retrieving revision 1.57.2.3 diff -C2 -d -r1.57.2.2 -r1.57.2.3 *** installreffile.cpp 1 Jul 2009 18:34:02 -0000 1.57.2.2 --- installreffile.cpp 5 Jul 2009 20:33:18 -0000 1.57.2.3 *************** *** 42,52 **** #include <qmessagebox.h> #include <qmutex.h> - #include <q3textstream.h> #include <qfile.h> - //#include <q3urloperator.h> #include <qdir.h> #include <qdatetime.h> #include <QTranslator> #include <QFile> #if !defined(__WIN32__) && (defined(_WIN32) || defined(WIN32)) --- 42,51 ---- #include <qmessagebox.h> #include <qmutex.h> #include <qfile.h> #include <qdir.h> #include <qdatetime.h> #include <QTranslator> #include <QFile> + #include <QTextStream> #if !defined(__WIN32__) && (defined(_WIN32) || defined(WIN32)) *************** *** 100,104 **** QFile ReferenceFileInput(fn); ReferenceFileInput.open(QIODevice::ReadOnly); ! Q3TextStream inTargetStream(&ReferenceFileInput); bool dateComplete = FALSE; --- 99,103 ---- QFile ReferenceFileInput(fn); ReferenceFileInput.open(QIODevice::ReadOnly); ! QTextStream inTargetStream(&ReferenceFileInput); bool dateComplete = FALSE; *************** *** 130,134 **** QString created = QString::fromLocal8Bit(cmsIT8GetProperty(hIT8, "CREATED")); QDate date = QDate::currentDate(); ! refToOld = (((date.month() - strMonthToInt(created.left(created.find(QString::fromLocal8Bit(" "))))) + ((date.year() - created.right(4).toInt()) * 12)) > 36); refToOld = false; cmsIT8Free(hIT8); --- 129,133 ---- QString created = QString::fromLocal8Bit(cmsIT8GetProperty(hIT8, "CREATED")); QDate date = QDate::currentDate(); ! refToOld = (((date.month() - strMonthToInt(created.left(created.indexOf(QString::fromLocal8Bit(" "))))) + ((date.year() - created.right(4).toInt()) * 12)) > 36); refToOld = false; cmsIT8Free(hIT8); *************** *** 144,148 **** InstallRefFile::InstallRefFile(QWidget *parent) ! : QDialog(parent, "", 0, Qt::WindowSystemMenuHint) //, urlOp(QString::fromLocal8Bit("/")) { setupUi(this); --- 143,147 ---- InstallRefFile::InstallRefFile(QWidget *parent) ! : QDialog(parent, Qt::WindowSystemMenuHint) { setupUi(this); *************** *** 167,177 **** settings = a.items.settings; ! TargetSelector->Dir = settings -> readEntry(QString::fromLocal8Bit("/LPROF/Files/referencefile_default_dir"), QDir::homeDirPath()); TargetSelector->setFilename(QString::fromLocal8Bit("")); ! if (!QString::compare(QDir::homeDirPath() + QString (QString::fromLocal8Bit("/")), TargetSelector->ReadDir()) == 0) TargetSelector->FillValues(); - //connect( &urlOp, SIGNAL( finished( Q3NetworkOperation *) ), this, SLOT( slotFileCopied( Q3NetworkOperation * ) ) ); connect(TargetSelector, SIGNAL(valueChanged()), this, SLOT(slotTargetSelectorChanged())); --- 166,175 ---- settings = a.items.settings; ! TargetSelector->Dir = settings -> value(QString::fromLocal8Bit("/LPROF/Files/referencefile_default_dir"), QDir::homePath()).toString(); TargetSelector->setFilename(QString::fromLocal8Bit("")); ! if (!QString::compare(QDir::homePath() + QString (QString::fromLocal8Bit("/")), TargetSelector->ReadDir()) == 0) TargetSelector->FillValues(); connect(TargetSelector, SIGNAL(valueChanged()), this, SLOT(slotTargetSelectorChanged())); *************** *** 195,226 **** } - /* - void InstallRefFile::slotFileCopied( Q3NetworkOperation *op ) - { - QString errorInfo; - - if ( !op ) - return; - - mutex.lock(); - if ( op && op->state() == Q3NetworkProtocol::StFailed ) - // The copy operation failed - // Let users know there is a problem - QMessageBox::critical( this, tr( "ERROR" ), op->protocolDetail() ); - else if (op -> operation () == Q3NetworkProtocol::OpPut) - { - copyNum = copyNum - 1; - QMessageBox::information( this, tr( "Reference File Installed" ), tr("The reference file was succesfully installed")); - } - if (copyNum == 0) - buttonCancel->setEnabled(true); - mutex.unlock(); - } - */ TemplateType InstallRefFile::CheckTemplateType() { QFile ReferenceFile(TargetSelector->getFilename()); ReferenceFile.open(QIODevice::ReadOnly); ! Q3TextStream checkSets(&ReferenceFile); QString currentString; --- 193,201 ---- } TemplateType InstallRefFile::CheckTemplateType() { QFile ReferenceFile(TargetSelector->getFilename()); ReferenceFile.open(QIODevice::ReadOnly); ! QTextStream checkSets(&ReferenceFile); QString currentString; *************** *** 244,249 **** checkSets >> currentString; LogoSerial = currentString.right(currentString.length() - 1).left(currentString.length() - 2); ! int year = LogoSerial.mid(LogoSerial.findRev(QString::fromLocal8Bit("/")) + 1, LogoSerial.length() - LogoSerial.findRev(QString::fromLocal8Bit("/"))).toInt(); ! int month = LogoSerial.left(LogoSerial.find(QString::fromLocal8Bit("/"))).toInt(); checkSets >> currentString; checkSets >> currentString; --- 219,224 ---- checkSets >> currentString; LogoSerial = currentString.right(currentString.length() - 1).left(currentString.length() - 2); ! int year = LogoSerial.mid(LogoSerial.lastIndexOf(QString::fromLocal8Bit("/")) + 1, LogoSerial.length() - LogoSerial.lastIndexOf(QString::fromLocal8Bit("/"))).toInt(); ! int month = LogoSerial.left(LogoSerial.indexOf(QString::fromLocal8Bit("/"))).toInt(); checkSets >> currentString; checkSets >> currentString; *************** *** 257,261 **** if (logo) { ! int pos = TargetSelector->getFilename().findRev(QString::fromLocal8Bit("/"), TargetSelector->getFilename().length() -1, FALSE); LogoDescriptor = TargetSelector->getFilename().right(TargetSelector->getFilename().length() - (pos + 1)); } --- 232,236 ---- if (logo) { ! int pos = TargetSelector->getFilename().lastIndexOf(QString::fromLocal8Bit("/"), TargetSelector->getFilename().length() -1, Qt::CaseInsensitive); LogoDescriptor = TargetSelector->getFilename().right(TargetSelector->getFilename().length() - (pos + 1)); } *************** *** 320,324 **** QFile ReferenceFileInput(TargetSelector->getFilename()); ReferenceFileInput.open(QIODevice::ReadOnly); ! Q3TextStream inTargetStream(&ReferenceFileInput); int dateCompletionFlag = 0; --- 295,299 ---- QFile ReferenceFileInput(TargetSelector->getFilename()); ReferenceFileInput.open(QIODevice::ReadOnly); ! QTextStream inTargetStream(&ReferenceFileInput); int dateCompletionFlag = 0; *************** *** 451,460 **** int textCutOff; ! monthParse = createdTextParse.copy(); ! textCutOff = monthParse.find(QString::fromLocal8Bit(","), 0, true); monthParse.remove(textCutOff, monthParse.length()); createdTextParse.remove(0, textCutOff + 2); ! createdTextParse.remove(0, createdTextParse.find(QString::fromLocal8Bit(" ")) + 1); ! yearParse = createdTextParse.copy(); newProductionDateText = yearParse; --- 426,435 ---- int textCutOff; ! monthParse = createdTextParse; ! textCutOff = monthParse.indexOf(QString::fromLocal8Bit(","), 0, Qt::CaseSensitive); monthParse.remove(textCutOff, monthParse.length()); createdTextParse.remove(0, textCutOff + 2); ! createdTextParse.remove(0, createdTextParse.indexOf(QString::fromLocal8Bit(" ")) + 1); ! yearParse = createdTextParse; newProductionDateText = yearParse; *************** *** 510,514 **** QFile newTargetFile(files.items.targetFile); newTargetFile.open(QIODevice::ReadOnly); ! Q3TextStream newTargetStream(&newTargetFile); while(fileStringTraversal != QString::fromLocal8Bit("BEGIN_DATA")) --- 485,489 ---- QFile newTargetFile(files.items.targetFile); newTargetFile.open(QIODevice::ReadOnly); ! QTextStream newTargetStream(&newTargetFile); while(fileStringTraversal != QString::fromLocal8Bit("BEGIN_DATA")) *************** *** 517,521 **** QFile sourceTargetFile(dirs.template_dir + QString::fromLocal8Bit("/") + QString::fromLocal8Bit("hutchtone.ITX")); sourceTargetFile.open(QIODevice::ReadOnly); ! Q3TextStream compare(&sourceTargetFile); while(fileStringTraversalCmp != QString::fromLocal8Bit("BEGIN_DATA")) --- 492,496 ---- QFile sourceTargetFile(dirs.template_dir + QString::fromLocal8Bit("/") + QString::fromLocal8Bit("hutchtone.ITX")); sourceTargetFile.open(QIODevice::ReadOnly); ! QTextStream compare(&sourceTargetFile); while(fileStringTraversalCmp != QString::fromLocal8Bit("BEGIN_DATA")) *************** *** 563,567 **** { files.items.targetFile = dirs.ref_dir + ! TargetSelector->getFilename().mid(TargetSelector->getFilename().findRev(QString::fromLocal8Bit("/"), -1), TargetSelector->getFilename().length()); --- 538,542 ---- { files.items.targetFile = dirs.ref_dir + ! TargetSelector->getFilename().mid(TargetSelector->getFilename().lastIndexOf(QString::fromLocal8Bit("/"), -1), TargetSelector->getFilename().length()); *************** *** 664,668 **** ds.put(refile, this -> height(), this -> width()); ! settings -> writeEntry(QString::fromLocal8Bit("/LPROF/Files/referencefile_default_dir"), TargetSelector->ReadDir()); } --- 639,643 ---- ds.put(refile, this -> height(), this -> width()); ! settings -> setValue(QString::fromLocal8Bit("/LPROF/Files/referencefile_default_dir"), TargetSelector->ReadDir()); } *************** *** 713,724 **** files.items.templateFile = dirs.template_dir + QString::fromLocal8Bit("/") + templateFileName; files.items.targetFile = dirs.ref_dir + ! TargetSelector->getFilename().mid(TargetSelector->getFilename().findRev(QString::fromLocal8Bit("/"), -1), TargetSelector->getFilename().length()); ! QDir::cleanDirPath( files.items.targetFile ); if (copy) { files.items.targetFile = dirs.ref_dir + ! TargetSelector->getFilename().mid(TargetSelector->getFilename().findRev(QString::fromLocal8Bit("/"), -1), TargetSelector->getFilename().length()); //mutex.lock(); --- 688,699 ---- files.items.templateFile = dirs.template_dir + QString::fromLocal8Bit("/") + templateFileName; files.items.targetFile = dirs.ref_dir + ! TargetSelector->getFilename().mid(TargetSelector->getFilename().lastIndexOf(QString::fromLocal8Bit("/"), -1), TargetSelector->getFilename().length()); ! QDir::cleanPath( files.items.targetFile ); if (copy) { files.items.targetFile = dirs.ref_dir + ! TargetSelector->getFilename().mid(TargetSelector->getFilename().lastIndexOf(QString::fromLocal8Bit("/"), -1), TargetSelector->getFilename().length()); //mutex.lock(); *************** *** 756,763 **** if (ArgyllCGTSFile.open(QIODevice::ReadOnly)) { ! Q3TextStream in(&ArgyllCGTSFile); if (cleanCGATS.open(QIODevice::WriteOnly)) { ! Q3TextStream out(&cleanCGATS); int i = 1; while ( !in.atEnd() ) --- 731,738 ---- if (ArgyllCGTSFile.open(QIODevice::ReadOnly)) { ! QTextStream in(&ArgyllCGTSFile); if (cleanCGATS.open(QIODevice::WriteOnly)) { ! QTextStream out(&cleanCGATS); int i = 1; while ( !in.atEnd() ) *************** *** 805,817 **** int startOfFileName, lowSpec, highSpec, specBands; ! startOfFileName = TargetSelector->getFilename().findRev(QString::fromLocal8Bit("/"), -1); CCFilename = TargetSelector->getFilename(); CCFilename.remove(0, startOfFileName + 1); ! CCFilename.remove(CCFilename.findRev(QString::fromLocal8Bit("."), -1), 4); QString fileName = dirs.ref_dir + QString::fromLocal8Bit("/") + CCFilename + QString::fromLocal8Bit(".txt"); QFile ReferenceFile(TargetSelector->getFilename()); ReferenceFile.open(QIODevice::ReadOnly); ! Q3TextStream inStream(&ReferenceFile); logoSerial = QString::fromLocal8Bit(""); --- 780,792 ---- int startOfFileName, lowSpec, highSpec, specBands; ! startOfFileName = TargetSelector->getFilename().lastIndexOf(QString::fromLocal8Bit("/"), -1); CCFilename = TargetSelector->getFilename(); CCFilename.remove(0, startOfFileName + 1); ! CCFilename.remove(CCFilename.lastIndexOf(QString::fromLocal8Bit("."), -1), 4); QString fileName = dirs.ref_dir + QString::fromLocal8Bit("/") + CCFilename + QString::fromLocal8Bit(".txt"); QFile ReferenceFile(TargetSelector->getFilename()); ReferenceFile.open(QIODevice::ReadOnly); ! QTextStream inStream(&ReferenceFile); logoSerial = QString::fromLocal8Bit(""); *************** *** 834,839 **** inStream >> currentString; logoSerial = currentString.right(currentString.length() - 1).left(currentString.length() - 2); ! int year = logoSerial.mid(logoSerial.findRev(QString::fromLocal8Bit("/")) + 1, logoSerial.length() - logoSerial.findRev(QString::fromLocal8Bit("/"))).toInt(); ! int month = logoSerial.left(logoSerial.find(QString::fromLocal8Bit("/"))).toInt(); inStream >> currentString; inStream >> currentString; --- 809,814 ---- inStream >> currentString; logoSerial = currentString.right(currentString.length() - 1).left(currentString.length() - 2); ! int year = logoSerial.mid(logoSerial.lastIndexOf(QString::fromLocal8Bit("/")) + 1, logoSerial.length() - logoSerial.lastIndexOf(QString::fromLocal8Bit("/"))).toInt(); ! int month = logoSerial.left(logoSerial.indexOf(QString::fromLocal8Bit("/"))).toInt(); inStream >> currentString; inStream >> currentString; *************** *** 1040,1050 **** int startOfFileName; ! startOfFileName = TargetSelector->getFilename().findRev(QString::fromLocal8Bit("/"), -1); CCFilename = TargetSelector->getFilename(); CCFilename.remove(0, startOfFileName + 1); ! CCFilename.remove(CCFilename.findRev(QString::fromLocal8Bit("."), -1), 4); // Save current dir and switch into temp dir ! QString currPath = QDir::currentDirPath(); QDir::setCurrent(dirs.temp_dir); --- 1015,1025 ---- int startOfFileName; ! startOfFileName = TargetSelector->getFilename().lastIndexOf(QString::fromLocal8Bit("/"), -1); CCFilename = TargetSelector->getFilename(); CCFilename.remove(0, startOfFileName + 1); ! CCFilename.remove(CCFilename.lastIndexOf(QString::fromLocal8Bit("."), -1), 4); // Save current dir and switch into temp dir ! QString currPath = QDir::currentPath(); QDir::setCurrent(dirs.temp_dir); *************** *** 1090,1094 **** cmsIT8SaveToFile(hIT8, (const char *) files.items.targetFile.toLocal8Bit()); ! // QDir::cleanDirPath( files.items.targetFile ); logoConvert(); } --- 1065,1069 ---- cmsIT8SaveToFile(hIT8, (const char *) files.items.targetFile.toLocal8Bit()); ! // QDir::cleanPath( files.items.targetFile ); logoConvert(); } Index: installreffilebase.ui =================================================================== RCS file: /cvsroot/lprof/lprof/src/reference_inst_qt/installreffilebase.ui,v retrieving revision 1.24 retrieving revision 1.24.2.1 diff -C2 -d -r1.24 -r1.24.2.1 *** installreffilebase.ui 1 Feb 2009 20:04:01 -0000 1.24 --- installreffilebase.ui 5 Jul 2009 20:33:18 -0000 1.24.2.1 *************** *** 473,477 **** <customwidget> <class>IT8SelectorWithFileDialog</class> ! <extends>Q3Frame</extends> <header>qtlcmswidgets.h</header> <container>1</container> --- 473,477 ---- <customwidget> <class>IT8SelectorWithFileDialog</class> ! <extends>QFrame</extends> <header>qtlcmswidgets.h</header> <container>1</container> |
|
From: Amit K. <ami...@us...> - 2009-07-05 20:33:26
|
Update of /cvsroot/lprof/lprof/src/gammaqt In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv11270/gammaqt Modified Files: Tag: GSoC-2009 setgamma.cpp setgammabase.ui Log Message: With these changes lprof is now ported Index: setgamma.cpp =================================================================== RCS file: /cvsroot/lprof/lprof/src/gammaqt/setgamma.cpp,v retrieving revision 1.30.2.1 retrieving revision 1.30.2.2 diff -C2 -d -r1.30.2.1 -r1.30.2.2 *** setgamma.cpp 30 Jun 2009 00:00:09 -0000 1.30.2.1 --- setgamma.cpp 5 Jul 2009 20:33:17 -0000 1.30.2.2 *************** *** 40,48 **** #include <qtooltip.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> --- 40,48 ---- #include <qtooltip.h> #include <qstringlist.h> ! #include <QButtonGroup> #include <qlayout.h> #include <qradiobutton.h> #include <qcheckbox.h> ! #include <QGroupBox> #include <qpushbutton.h> #include <qspinbox.h> *************** *** 50,71 **** #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 <qapplication.h> ! #include <q3table.h> #include <qvalidator.h> - #include <QFileDialog> static PROFILERDATA sys; ! Q3ButtonGroup* RGB_button_group; monitorVal mongamma; SetGamma::SetGamma(QWidget *parent ) ! : QDialog(parent,"", Qt::WStyle_NoBorder | Qt::FramelessWindowHint) { setupUi(this); --- 50,70 ---- #include <qlabel.h> #include <qslider.h> ! #include <QFileDialog> ! #include <QTextEdit> #include <qtabwidget.h> ! #include <QProgressBar> #include <qdir.h> #include <qapplication.h> ! #include <QTableWidget> #include <qvalidator.h> + #include <QTableView> static PROFILERDATA sys; ! QButtonGroup* RGB_button_group; monitorVal mongamma; SetGamma::SetGamma(QWidget *parent ) ! : QDialog(parent, Qt::FramelessWindowHint) { setupUi(this); *************** *** 91,98 **** mongamma.get(&mongamma); ! RGB_button_group = new Q3ButtonGroup(this); ! RGB_button_group->insert(AdjustR,0); ! RGB_button_group->insert(AdjustG,1); ! RGB_button_group->insert(AdjustB,2); RGB_button_group->setExclusive(TRUE); --- 90,97 ---- mongamma.get(&mongamma); ! RGB_button_group = new QButtonGroup(this); ! RGB_button_group->addButton(AdjustR,0); ! RGB_button_group->addButton(AdjustG,1); ! RGB_button_group->addButton(AdjustB,2); RGB_button_group->setExclusive(TRUE); Index: setgammabase.ui =================================================================== RCS file: /cvsroot/lprof/lprof/src/gammaqt/setgammabase.ui,v retrieving revision 1.15 retrieving revision 1.15.2.1 diff -C2 -d -r1.15 -r1.15.2.1 *** setgammabase.ui 1 Feb 2009 16:56:14 -0000 1.15 --- setgammabase.ui 5 Jul 2009 20:33:17 -0000 1.15.2.1 *************** *** 199,203 **** </property> <item row="0" column="1" > ! <widget class="Q3GroupBox" name="BigChartGroup" > <property name="sizePolicy" > <sizepolicy vsizetype="Expanding" hsizetype="Expanding" > --- 199,203 ---- </property> <item row="0" column="1" > ! <widget class="QGroupBox" name="BigChartGroup" > <property name="sizePolicy" > <sizepolicy vsizetype="Expanding" hsizetype="Expanding" > *************** *** 694,698 **** </item> <item row="0" column="0" > ! <widget class="Q3GroupBox" name="groupBox9" > <property name="sizePolicy" > <sizepolicy vsizetype="Expanding" hsizetype="Expanding" > --- 694,698 ---- </item> <item row="0" column="0" > ! <widget class="QGroupBox" name="groupBox9" > <property name="sizePolicy" > <sizepolicy vsizetype="Expanding" hsizetype="Expanding" > *************** *** 3160,3164 **** </item> <item> ! <widget class="Q3ButtonGroup" name="SmallChartGroup" > <property name="sizePolicy" > <sizepolicy vsizetype="Expanding" hsizetype="Preferred" > --- 3160,3164 ---- </item> <item> ! <widget class="QGroupBox" name="SmallChartGroup" > <property name="sizePolicy" > <sizepolicy vsizetype="Expanding" hsizetype="Preferred" > *************** *** 3299,3316 **** </widget> <layoutdefault spacing="6" margin="11" /> - <customwidgets> - <customwidget> - <class>Q3GroupBox</class> - <extends>QGroupBox</extends> - <header>Qt3Support/Q3GroupBox</header> - <container>1</container> - </customwidget> - <customwidget> - <class>Q3ButtonGroup</class> - <extends>Q3GroupBox</extends> - <header>Qt3Support/Q3ButtonGroup</header> - <container>1</container> - </customwidget> - </customwidgets> <resources> <include location="../../lprof.qrc" /> --- 3299,3302 ---- |
|
From: Amit K. <ami...@us...> - 2009-07-05 20:33:24
|
Update of /cvsroot/lprof/lprof/src/moncalqt In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv11270/moncalqt Modified Files: Tag: GSoC-2009 monitorcal.cpp monitorcalbase.ui Log Message: With these changes lprof is now ported Index: monitorcal.cpp =================================================================== RCS file: /cvsroot/lprof/lprof/src/moncalqt/monitorcal.cpp,v retrieving revision 1.62 retrieving revision 1.62.2.1 diff -C2 -d -r1.62 -r1.62.2.1 *** monitorcal.cpp 8 Mar 2008 23:16:37 -0000 1.62 --- monitorcal.cpp 5 Jul 2009 20:33:17 -0000 1.62.2.1 *************** *** 54,58 **** // QT stuff ! #include <q3textedit.h> #include <qradiobutton.h> #include <qpixmap.h> --- 54,58 ---- // QT stuff ! #include <QTextEdit> #include <qradiobutton.h> #include <qpixmap.h> *************** *** 60,64 **** #include <qpainter.h> #include <qapplication.h> ! #include <q3progressbar.h> #include <qmessagebox.h> #include <qworkspace.h> --- 60,64 ---- #include <qpainter.h> #include <qapplication.h> ! #include <QProgressBar> #include <qmessagebox.h> #include <qworkspace.h> *************** *** 4427,4431 **** } // cd.data.selectedInst.port = listedInst[cd.data.selectedInst.position].port; ! strcpy(instName, cd.data.selectedInst.name.local8Bit()); cd.data.selectedInst.Inst = inst_enum(instName); return TRUE; --- 4427,4431 ---- } // cd.data.selectedInst.port = listedInst[cd.data.selectedInst.position].port; ! strcpy(instName, cd.data.selectedInst.name.toLocal8Bit()); cd.data.selectedInst.Inst = inst_enum(instName); return TRUE; *************** *** 4464,4468 **** { qDebug("initIntrument(): failed new_inst()"); ! messageText -> insertParagraph(tr("Unknown, inappropriate or no instrument detected"), -1); QMessageBox::critical(this, QTranslator::tr("Failed to Initialize the Device"), tr("Failed to initialize device. Call to new_inst failed.")); --- 4464,4468 ---- { qDebug("initIntrument(): failed new_inst()"); ! messageText -> append(tr("Unknown, inappropriate or no instrument detected")); QMessageBox::critical(this, QTranslator::tr("Failed to Initialize the Device"), tr("Failed to initialize device. Call to new_inst failed.")); *************** *** 4477,4483 **** { // qDebug("initIntrument(): failed init_coms()"); ! messageText -> insertParagraph(tr("Failed to initialize communications with instrument or wrong instrument or bad configuration! (") + QString::fromLocal8Bit(it->inst_interp_error(it, rv)) + QString::fromLocal8Bit(" + ") ! + QString::fromLocal8Bit(it->inst_interp_error(it, rv)) + QString::fromLocal8Bit(")"), -1); QMessageBox::critical(this, QTranslator::tr("Failed to Initialize the Device"), tr("Failed to initialize communications with instrument or wrong instrument or bad configuration! (") --- 4477,4483 ---- { // qDebug("initIntrument(): failed init_coms()"); ! messageText -> append(tr("Failed to initialize communications with instrument or wrong instrument or bad configuration! (") + QString::fromLocal8Bit(it->inst_interp_error(it, rv)) + QString::fromLocal8Bit(" + ") ! + QString::fromLocal8Bit(it->inst_interp_error(it, rv)) + QString::fromLocal8Bit(")")); QMessageBox::critical(this, QTranslator::tr("Failed to Initialize the Device"), tr("Failed to initialize communications with instrument or wrong instrument or bad configuration! (") *************** *** 4493,4497 **** { // qDebug ("initIntrument(): failed set_opt_mode"); ! messageText -> insertParagraph(tr("Setting filter configuration not supported by instrument"), -1); QMessageBox::critical(this, QTranslator::tr("Failed to Initialize the Device"), tr("Setting filter configuration not supported by instrument")); --- 4493,4497 ---- { // qDebug ("initIntrument(): failed set_opt_mode"); ! messageText -> append(tr("Setting filter configuration not supported by instrument")); QMessageBox::critical(this, QTranslator::tr("Failed to Initialize the Device"), tr("Setting filter configuration not supported by instrument")); *************** *** 4503,4512 **** { ! messageText -> insertParagraph(tr("init_inst returned ") + QString::fromLocal8Bit(it->inst_interp_error(it, rv)) + QString::fromLocal8Bit("(") + QString::fromLocal8Bit(it->interp_error(it, rv)) + QString::fromLocal8Bit(")") ! + tr(" Instrument initialization failed!"), -1); QMessageBox::critical(this, QTranslator::tr("Problem Initializing Instrument."), --- 4503,4512 ---- { ! messageText -> append(tr("init_inst returned ") + QString::fromLocal8Bit(it->inst_interp_error(it, rv)) + QString::fromLocal8Bit("(") + QString::fromLocal8Bit(it->interp_error(it, rv)) + QString::fromLocal8Bit(")") ! + tr(" Instrument initialization failed!")); QMessageBox::critical(this, QTranslator::tr("Problem Initializing Instrument."), *************** *** 4541,4545 **** if ((cap & inst_trans_spot) == 0) { ! messageText -> insertParagraph (tr("Need transmission spot capability, and instrument doesn't support it"), -1); QMessageBox::critical(this, QTranslator::tr("Problem Initializing Instrument."), tr("Need transmission spot capability, and instrument doesn't support it")); --- 4541,4545 ---- if ((cap & inst_trans_spot) == 0) { ! messageText -> append (tr("Need transmission spot capability, and instrument doesn't support it")); QMessageBox::critical(this, QTranslator::tr("Problem Initializing Instrument."), tr("Need transmission spot capability, and instrument doesn't support it")); *************** *** 4550,4554 **** if ((cap & inst_emis_spot) == 0) { ! messageText -> insertParagraph (tr("Need emissive spot capability and instrument doesn't support it"), -1); QMessageBox::critical(this, QTranslator::tr("Problem Initializing Instrument."), tr("Need emissive spot capability and instrument doesn't support it")); --- 4550,4554 ---- if ((cap & inst_emis_spot) == 0) { ! messageText -> append (tr("Need emissive spot capability and instrument doesn't support it")); QMessageBox::critical(this, QTranslator::tr("Problem Initializing Instrument."), tr("Need emissive spot capability and instrument doesn't support it")); *************** *** 4558,4564 **** if ((rv = it->set_mode(it, inst_mode_emis_disp)) != inst_ok) { ! messageText -> insertParagraph(tr("Failed to set emission display mode. ") + QString::fromLocal8Bit(it->inst_interp_error(it, rv)) + QString::fromLocal8Bit(" ") + ! QString::fromLocal8Bit(it->interp_error(it, rv)), -1); QMessageBox::critical(this, QTranslator::tr("Problem Initializing Instrument."), tr("Failed to set emission display mode. ") + --- 4558,4564 ---- if ((rv = it->set_mode(it, inst_mode_emis_disp)) != inst_ok) { ! messageText -> append(tr("Failed to set emission display mode. ") + QString::fromLocal8Bit(it->inst_interp_error(it, rv)) + QString::fromLocal8Bit(" ") + ! QString::fromLocal8Bit(it->interp_error(it, rv))); QMessageBox::critical(this, QTranslator::tr("Problem Initializing Instrument."), tr("Failed to set emission display mode. ") + *************** *** 4582,4586 **** temp = tr("LCD"); // qDebug ("it initialized OK so configure the instrument mode 5.2"); ! messageText -> insertParagraph(tr("Setting display mode ") + temp + tr(" not supported by this instrument"), -1); // qDebug ("it initialized OK so configure the instrument mode 5.3"); // qDebug ("it initialized OK so configure the instrument mode 5.4"); --- 4582,4586 ---- temp = tr("LCD"); // qDebug ("it initialized OK so configure the instrument mode 5.2"); ! messageText -> append(tr("Setting display mode ") + temp + tr(" not supported by this instrument")); // qDebug ("it initialized OK so configure the instrument mode 5.3"); // qDebug ("it initialized OK so configure the instrument mode 5.4"); *************** *** 4592,4599 **** if (rv != inst_ok) { ! messageText -> insertParagraph(tr("Setting trigger mode failed with error : ") + QString::fromLocal8Bit(it->inst_interp_error(it, rv)) + QString::fromLocal8Bit(" ") ! + QString::fromLocal8Bit(it->interp_error(it, rv)), -1); QMessageBox::critical(this, QTranslator::tr("Problem Initializing Instrument."), --- 4592,4599 ---- if (rv != inst_ok) { ! messageText -> append(tr("Setting trigger mode failed with error : ") + QString::fromLocal8Bit(it->inst_interp_error(it, rv)) + QString::fromLocal8Bit(" ") ! + QString::fromLocal8Bit(it->interp_error(it, rv))); QMessageBox::critical(this, QTranslator::tr("Problem Initializing Instrument."), *************** *** 4684,4688 **** flashLEDsThread flashLEDs; ! processEventsTimer -> start( 100, FALSE); rv = it->read_sample(it, "SPOT", &val); processEventsTimer -> stop(); --- 4684,4689 ---- flashLEDsThread flashLEDs; ! processEventsTimer ->setSingleShot(FALSE); ! processEventsTimer->start(100); rv = it->read_sample(it, "SPOT", &val); processEventsTimer -> stop(); *************** *** 4690,4696 **** if (!rv == inst_ok) { ! messageText -> insertParagraph (tr("read_sample returned '") + QString::fromLocal8Bit(it->inst_interp_error(it, rv)) + QString::fromLocal8Bit("' (") ! + QString::fromLocal8Bit(it->interp_error(it, rv)) + QString::fromLocal8Bit(")"), -1); qDebug((tr("read_sample returned '") + QString::fromLocal8Bit(it->inst_interp_error(it, rv)) + QString::fromLocal8Bit("' (") --- 4691,4697 ---- if (!rv == inst_ok) { ! messageText -> append(tr("read_sample returned '") + QString::fromLocal8Bit(it->inst_interp_error(it, rv)) + QString::fromLocal8Bit("' (") ! + QString::fromLocal8Bit(it->interp_error(it, rv)) + QString::fromLocal8Bit(")")); qDebug((tr("read_sample returned '") + QString::fromLocal8Bit(it->inst_interp_error(it, rv)) + QString::fromLocal8Bit("' (") *************** *** 4699,4703 **** if ((rv & inst_mask) == inst_misread) { ! messageText -> insertParagraph (tr("Spot read failed due to misread"), -1); --- 4700,4704 ---- if ((rv & inst_mask) == inst_misread) { ! messageText -> append(tr("Spot read failed due to misread")); *************** *** 4723,4732 **** // Issue error message /* Communication problem */ ! messageText -> insertParagraph (tr("Read failed due to communication problem."), -1); // if ((rv = it->init_coms(it, comport, br, 15.0)) != inst_ok) { ! // messageText -> insertParagraph (tr("init_coms returned '") // + (QString) it->inst_interp_error(it, rv) ! // + "' (" + (QString) it->interp_error(it, rv) + ")", -1); // } } --- 4724,4733 ---- // Issue error message /* Communication problem */ ! messageText -> append(tr("Read failed due to communication problem.")); // if ((rv = it->init_coms(it, comport, br, 15.0)) != inst_ok) { ! // messageText -> append (tr("init_coms returned '") // + (QString) it->inst_interp_error(it, rv) ! // + "' (" + (QString) it->interp_error(it, rv) + ")"); // } } *************** *** 4735,4743 **** else { ! messageText -> insertParagraph(tr("Got fatal error '") + QString::fromLocal8Bit(it->inst_interp_error(it, rv)) + QString::fromLocal8Bit("' (") + QString::fromLocal8Bit(it->interp_error(it, rv)) ! + QString::fromLocal8Bit(")"), -1); } } --- 4736,4744 ---- else { ! messageText -> append(tr("Got fatal error '") + QString::fromLocal8Bit(it->inst_interp_error(it, rv)) + QString::fromLocal8Bit("' (") + QString::fromLocal8Bit(it->interp_error(it, rv)) ! + QString::fromLocal8Bit(")")); } } *************** *** 4749,4755 **** if (val.sp.spec_n <= 0) { ! // messageText -> insertParagraph(tr("Instrument didn't return spectral data"), -1); if (val.XYZ_v == 0 && val.aXYZ_v == 0) ! messageText -> insertParagraph(tr("Instrument didn't return XYZ value"), -1); if (val.XYZ_v != 0) --- 4750,4756 ---- if (val.sp.spec_n <= 0) { ! // messageText -> append(tr("Instrument didn't return spectral data")); if (val.XYZ_v == 0 && val.aXYZ_v == 0) ! messageText -> append(tr("Instrument didn't return XYZ value")); if (val.XYZ_v != 0) *************** *** 4802,4806 **** QMutex dummy; ! pix.resize(pixmapColor -> width() - 6, pixmapColor -> height() -6); color.setRgb(R, G, B); pix.fill(color); --- 4803,4807 ---- QMutex dummy; ! pix = pix.copy(QRect(0, 0, pixmapColor -> width() - 6, pixmapColor -> height() -6)); color.setRgb(R, G, B); pix.fill(color); *************** *** 5016,5020 **** while (!stop) { ! progressBar -> setProgress(progress++); // patch is RGB = 255 no need to change it // take another reading --- 5017,5021 ---- while (!stop) { ! progressBar -> setValue(progress++); // patch is RGB = 255 no need to change it // take another reading *************** *** 5064,5069 **** { stop = true; ! buttonOk -> setOn(TRUE); ! if (!measuring) { accept(); --- 5065,5071 ---- { stop = true; ! //buttonOk -> setOn(TRUE); //qt3 ! buttonOk -> setChecked(TRUE); ! if (!measuring) { accept(); *************** *** 5138,5151 **** cmsCIEXYZ readXYZ[3], targetXYZ; // black, gray, white ! progressBar -> setTotalSteps(4); ! progressBar -> reset(); paintPatch(0, 0, 0); readXYZ[0] = takeSpotReading(); ! progressBar -> setProgress(1); paintPatch(127, 127, 127); readXYZ[1] = takeSpotReading(); ! progressBar -> setProgress(2); targetXYZ = setWhitePoint(); --- 5140,5153 ---- cmsCIEXYZ readXYZ[3], targetXYZ; // black, gray, white ! progressBar -> setRange(1,4); ! progressBar -> reset(); paintPatch(0, 0, 0); readXYZ[0] = takeSpotReading(); ! progressBar -> setValue(1); paintPatch(127, 127, 127); readXYZ[1] = takeSpotReading(); ! progressBar -> setValue(2); targetXYZ = setWhitePoint(); *************** *** 5153,5157 **** paintPatch(255, 255, 255); readXYZ[2] = takeSpotReading(); ! progressBar -> setProgress(3); /* Normalised XYZ white point */ --- 5155,5159 ---- paintPatch(255, 255, 255); readXYZ[2] = takeSpotReading(); ! progressBar -> setValue(3); /* Normalised XYZ white point */ *************** *** 5173,5177 **** paintPatch(8, 8, 8); readXYZ[0] = takeSpotReading(); ! progressBar -> setProgress(4); QString temp1 = tr("Display gamma = %1\n").arg(gamma, 0, 'f', 2); --- 5175,5179 ---- paintPatch(8, 8, 8); readXYZ[0] = takeSpotReading(); ! progressBar -> setValue(4); QString temp1 = tr("Display gamma = %1\n").arg(gamma, 0, 'f', 2); *************** *** 5196,5200 **** const int level = 5; ! progressBar -> setProgress(progress++); WORD RGB[3]; --- 5198,5202 ---- const int level = 5; ! progressBar -> setValue(progress++); WORD RGB[3]; *************** *** 5247,5251 **** QMessageBox::critical( this, tr("Display Measurement Failed"), tr("The measurement instrument returned an error.")); } //end else ! progressBar -> setProgress(progress++); if (progress > 5) progress = 0; --- 5249,5253 ---- QMessageBox::critical( this, tr("Display Measurement Failed"), tr("The measurement instrument returned an error.")); } //end else ! progressBar -> setValue(progress++); if (progress > 5) progress = 0; *************** *** 5284,5289 **** cmsxIT8SetDataFormat(it8, nFields++, "XYZ_Z"); ! progressBar -> setTotalSteps(number_of_patches); ! progressBar -> reset(); char patchNumber[10]; --- 5286,5291 ---- cmsxIT8SetDataFormat(it8, nFields++, "XYZ_Z"); ! progressBar -> setRange(1,number_of_patches); ! progressBar -> reset(); char patchNumber[10]; *************** *** 5321,5325 **** lprofApp -> processEvents(); } ! progressBar -> setProgress(i + 1); if (stop) { --- 5323,5327 ---- lprofApp -> processEvents(); } ! progressBar -> setValue(i + 1); if (stop) { *************** *** 5355,5359 **** whiteXYZ = takeSpotReading(); targetwhite = whiteXYZ.Y; ! progressBar -> setProgress(progress++); if (targetBrightness > 0.000000001) --- 5357,5361 ---- whiteXYZ = takeSpotReading(); targetwhite = whiteXYZ.Y; ! progressBar -> setValue(progress++); if (targetBrightness > 0.000000001) *************** *** 5372,5376 **** QMessageBox::critical( this, tr("Display Measurement Failed"), tr("The measurement instrument returned an error.")); ! progressBar -> setProgress(progress++); if (progress > 5) progress = 0; --- 5374,5378 ---- QMessageBox::critical( this, tr("Display Measurement Failed"), tr("The measurement instrument returned an error.")); ! progressBar -> setValue(progress++); if (progress > 5) progress = 0; *************** *** 5395,5399 **** while (!stop) { ! progressBar -> setProgress(progress++); measuredXYZ = takeSpotReading(); --- 5397,5401 ---- while (!stop) { ! progressBar -> setValue(progress++); measuredXYZ = takeSpotReading(); *************** *** 5586,5591 **** cmsCIEXYZ gammaXYZ[3], measuredXYZ; // black, gray, white ! progressBar -> setTotalSteps(calibration_set_size); ! progressBar -> reset(); if (dtype == LCD) --- 5588,5593 ---- cmsCIEXYZ gammaXYZ[3], measuredXYZ; // black, gray, white ! progressBar->setRange(1,calibration_set_size); ! progressBar -> reset(); if (dtype == LCD) *************** *** 5682,5686 **** QString mess = tr("Calibration file ") + QString::fromLocal8Bit(calfile) + tr(" has been created."); ! messageText -> insertParagraph(mess, -1); QMessageBox::information( this, tr("Display Calibration File Created"), tr("The calibration process has completed")); --- 5684,5688 ---- QString mess = tr("Calibration file ") + QString::fromLocal8Bit(calfile) + tr(" has been created."); ! messageText -> append(mess); QMessageBox::information( this, tr("Display Calibration File Created"), tr("The calibration process has completed")); *************** *** 5792,5796 **** { QString mess = tr("Measurement file ") + QString::fromLocal8Bit(measfile) + tr(" has been created."); ! messageText -> insertParagraph(mess, -1); QMessageBox::information( this, tr("Display Measurement File Created"), tr("The display measurement process has completed")); } --- 5794,5798 ---- { QString mess = tr("Measurement file ") + QString::fromLocal8Bit(measfile) + tr(" has been created."); ! messageText -> append(mess); QMessageBox::information( this, tr("Display Measurement File Created"), tr("The display measurement process has completed")); } *************** *** 5836,5840 **** WPandDEframe -> hide(); mess = tr("Place meter over measurement area. Press Go to start measurements.\nCalibration report will pop up when measurements are done"); ! messageText -> insertParagraph(mess, -1); break; case opUncalReport: --- 5838,5842 ---- WPandDEframe -> hide(); mess = tr("Place meter over measurement area. Press Go to start measurements.\nCalibration report will pop up when measurements are done"); ! messageText -> append(mess); break; case opUncalReport: *************** *** 5843,5877 **** WPandDEframe -> hide(); mess = tr("Place meter over measurement area. Press Go to start measurements.\nCalibration report will pop up when measurements are done"); ! messageText -> insertParagraph(mess, -1); break; case opSetWhitePoint: frameBWLevel -> hide(); ! progressBar -> setTotalSteps (5); ! progressBar -> setPercentageVisible (false); mess = tr("Place meter over measurement area. Press Go to start measurements.\nAdjust display R,G & B gain to center red, green and blue bars.\nWhen done press the Done button."); ! messageText -> insertParagraph(mess, -1); break; case opSetBlackLevel: frameRGBscales -> hide(); WPandDEframe -> hide(); ! progressBar -> setTotalSteps (5); ! progressBar -> setPercentageVisible (false); mess = tr("Place meter over measurement area. Press Go to start measurements.\nAdjust display CRT brightness control to center the dark gray bar.\nWhen done press the Done button."); ! messageText -> insertParagraph(mess, -1); break; case opSetWhiteLevel: frameRGBscales -> hide(); WPandDEframe -> hide(); ! progressBar -> setTotalSteps (5); ! progressBar -> setPercentageVisible (false); mess = tr("Place meter over measurement area. Press Go to start measurements.\nAdjust display CRT contrast or LDC brightness control to center the dark gray bar.\nWhen done press the Done button."); ! messageText -> insertParagraph(mess, -1); break; case opSetBlackPoint: frameBWLevel -> hide(); ! progressBar -> setTotalSteps (5); ! progressBar -> setPercentageVisible (false); mess = tr("Place meter over measurement area. Press Go to start measurements.\nAdjust display R,G & B gain to center red, green and blue bars.\nWhen done press the Done button."); ! messageText -> insertParagraph(mess, -1); break; case opMeasure: --- 5845,5879 ---- WPandDEframe -> hide(); mess = tr("Place meter over measurement area. Press Go to start measurements.\nCalibration report will pop up when measurements are done"); ! messageText -> append(mess); break; case opSetWhitePoint: frameBWLevel -> hide(); ! progressBar->setRange(1,5); ! progressBar -> setTextVisible (false); mess = tr("Place meter over measurement area. Press Go to start measurements.\nAdjust display R,G & B gain to center red, green and blue bars.\nWhen done press the Done button."); ! messageText -> append(mess); break; case opSetBlackLevel: frameRGBscales -> hide(); WPandDEframe -> hide(); ! progressBar -> setRange(1,5); ! progressBar -> setTextVisible (false); mess = tr("Place meter over measurement area. Press Go to start measurements.\nAdjust display CRT brightness control to center the dark gray bar.\nWhen done press the Done button."); ! messageText -> append(mess); break; case opSetWhiteLevel: frameRGBscales -> hide(); WPandDEframe -> hide(); ! progressBar -> setRange(1,5); ! progressBar -> setTextVisible (false); mess = tr("Place meter over measurement area. Press Go to start measurements.\nAdjust display CRT contrast or LDC brightness control to center the dark gray bar.\nWhen done press the Done button."); ! messageText -> append(mess); break; case opSetBlackPoint: frameBWLevel -> hide(); ! progressBar -> setRange(1,5); ! progressBar -> setTextVisible (false); mess = tr("Place meter over measurement area. Press Go to start measurements.\nAdjust display R,G & B gain to center red, green and blue bars.\nWhen done press the Done button."); ! messageText -> append(mess); break; case opMeasure: *************** *** 5880,5884 **** WPandDEframe -> hide(); mess = tr("Place meter over measurement area. Press Go to start measurement process.\nPress Done to abort measurement process."); ! messageText -> insertParagraph(mess, -1); break; case opCalibrate: --- 5882,5886 ---- WPandDEframe -> hide(); mess = tr("Place meter over measurement area. Press Go to start measurement process.\nPress Done to abort measurement process."); ! messageText -> append(mess); break; case opCalibrate: *************** *** 5887,5891 **** WPandDEframe -> hide(); mess = tr("Place meter over measurement area. Press Go to start measurement process.\nPress Done to abort measurement process."); ! messageText -> insertParagraph(mess, -1); break; case opBigCalReport: --- 5889,5893 ---- WPandDEframe -> hide(); mess = tr("Place meter over measurement area. Press Go to start measurement process.\nPress Done to abort measurement process."); ! messageText -> append(mess); break; case opBigCalReport: *************** *** 5894,5898 **** WPandDEframe -> hide(); mess = tr("Place meter over measurement area. Press Go to start measurements.\nCalibration report will pop up when measurements are done"); ! messageText -> insertParagraph(mess, -1); break; --- 5896,5900 ---- WPandDEframe -> hide(); mess = tr("Place meter over measurement area. Press Go to start measurements.\nCalibration report will pop up when measurements are done"); ! messageText -> append(mess); break; *************** *** 5945,5949 **** MonitorCal::MonitorCal(QWidget *parent) ! : QDialog(parent, "", 0, Qt::WStyle_StaysOnTop | Qt::FramelessWindowHint) { setupUi(this); --- 5947,5951 ---- MonitorCal::MonitorCal(QWidget *parent) ! : QDialog(parent, Qt::WindowStaysOnTopHint | Qt::FramelessWindowHint) { setupUi(this); *************** *** 5958,5964 **** processEventsTimer -> stop(); ! buttonOk -> setToggleButton (TRUE); ! messageText -> setTextFormat( Qt::LogText); for (int i = 0; i < 26; i++) --- 5960,5967 ---- processEventsTimer -> stop(); ! //buttonOk -> setToggleButton (TRUE); //qt3 ! buttonOk -> setCheckable (TRUE); ! //messageText -> setTextFormat( Qt::LogText); for (int i = 0; i < 26; i++) *************** *** 6003,6011 **** cmsCIEXYZ redXYZ[2], greenXYZ[2], blueXYZ[2], locusXYZ[size], targetXYZ, readXYZ; // black, gray, white ! progressBar -> setTotalSteps(size + 8); ! progressBar -> reset(); targetXYZ = setWhitePoint(); ! progressBar -> setProgress(1); for (int i=0; i<size; i++) --- 6006,6014 ---- cmsCIEXYZ redXYZ[2], greenXYZ[2], blueXYZ[2], locusXYZ[size], targetXYZ, readXYZ; // black, gray, white ! progressBar -> setRange(1,size+8); ! progressBar -> reset(); targetXYZ = setWhitePoint(); ! progressBar -> setValue(1); for (int i=0; i<size; i++) *************** *** 6019,6048 **** paintPatch(rgb, rgb, rgb); locusXYZ[i] = takeSpotReading(); ! progressBar -> setProgress(i+2); } paintPatch(127, 0, 0); redXYZ[0] = takeSpotReading(); ! progressBar -> setProgress(size + 2); paintPatch(255, 0, 0); redXYZ[1] = takeSpotReading(); ! progressBar -> setProgress(size + 3); paintPatch(0, 127, 0); greenXYZ[0] = takeSpotReading(); ! progressBar -> setProgress(size + 4); paintPatch(0, 255, 0); greenXYZ[1] = takeSpotReading(); ! progressBar -> setProgress(size + 5); paintPatch(0, 0, 127); blueXYZ[0] = takeSpotReading(); ! progressBar -> setProgress(size + 6); paintPatch(0, 0, 255); blueXYZ[1] = takeSpotReading(); ! progressBar -> setProgress(size + 7); /* Normalised XYZ white point */ --- 6022,6051 ---- paintPatch(rgb, rgb, rgb); locusXYZ[i] = takeSpotReading(); ! progressBar -> setValue(i+2); } paintPatch(127, 0, 0); redXYZ[0] = takeSpotReading(); ! progressBar -> setValue(size + 2); paintPatch(255, 0, 0); redXYZ[1] = takeSpotReading(); ! progressBar -> setValue(size + 3); paintPatch(0, 127, 0); greenXYZ[0] = takeSpotReading(); ! progressBar -> setValue(size + 4); paintPatch(0, 255, 0); greenXYZ[1] = takeSpotReading(); ! progressBar -> setValue(size + 5); paintPatch(0, 0, 127); blueXYZ[0] = takeSpotReading(); ! progressBar -> setValue(size + 6); paintPatch(0, 0, 255); blueXYZ[1] = takeSpotReading(); ! progressBar -> setValue(size + 7); /* Normalised XYZ white point */ *************** *** 6067,6071 **** paintPatch(8, 8, 8); readXYZ = takeSpotReading(); ! progressBar -> setProgress(size + 8); QString temp1 = tr("Display gamma = %1\n").arg(gamma, 0, 'f', 2); --- 6070,6074 ---- paintPatch(8, 8, 8); readXYZ = takeSpotReading(); ! progressBar -> setValue(size + 8); QString temp1 = tr("Display gamma = %1\n").arg(gamma, 0, 'f', 2); Index: monitorcalbase.ui =================================================================== RCS file: /cvsroot/lprof/lprof/src/moncalqt/monitorcalbase.ui,v retrieving revision 1.11 retrieving revision 1.11.2.1 diff -C2 -d -r1.11 -r1.11.2.1 *** monitorcalbase.ui 19 Feb 2008 21:02:50 -0000 1.11 --- monitorcalbase.ui 5 Jul 2009 20:33:17 -0000 1.11.2.1 *************** *** 1,9 **** ! <ui version="4.0" > <class>MonitorCalBase</class> ! <widget class="QDialog" name="MonitorCalBase" > ! <property name="windowModality" > <enum>Qt::ApplicationModal</enum> </property> ! <property name="geometry" > <rect> <x>0</x> --- 1,10 ---- [...2675 lines suppressed...] </customwidget> - <customwidget> - <class>Q3Frame</class> - <extends>QFrame</extends> - <header>Qt3Support/Q3Frame</header> - <container>1</container> - </customwidget> - <customwidget> - <class>Q3TextEdit</class> - <extends>Q3Frame</extends> - <header>q3textedit.h</header> - </customwidget> - <customwidget> - <class>Q3ProgressBar</class> - <extends>QFrame</extends> - <header>Qt3Support/Q3ProgressBar</header> - </customwidget> </customwidgets> <resources/> --- 1387,1390 ---- |
|
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); } |
|
From: Amit K. <ami...@us...> - 2009-07-05 20:33:24
|
Update of /cvsroot/lprof/lprof/src/libqtlcmswidgets In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv11270/libqtlcmswidgets Modified Files: Tag: GSoC-2009 qtcietonge.cpp qtlcmswidgets.cpp qtlcmswidgets.h Log Message: With these changes lprof is now ported |
|
From: Amit K. <ami...@us...> - 2009-07-05 20:33:21
|
Update of /cvsroot/lprof/lprof/src/lprofqt In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv11270/lprofqt Modified Files: Tag: GSoC-2009 config.cpp lprofmain.h Log Message: With these changes lprof is now ported |
|
From: Amit K. <ami...@us...> - 2009-07-05 20:33:21
|
Update of /cvsroot/lprof/lprof/src/monqt In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv11270/monqt Modified Files: Tag: GSoC-2009 monitorvalues.cpp monitorvaluesbase.ui Log Message: With these changes lprof is now ported Index: monitorvalues.cpp =================================================================== RCS file: /cvsroot/lprof/lprof/src/monqt/monitorvalues.cpp,v retrieving revision 1.28.2.1 retrieving revision 1.28.2.2 diff -C2 -d -r1.28.2.1 -r1.28.2.2 *** monitorvalues.cpp 30 Jun 2009 00:00:10 -0000 1.28.2.1 --- monitorvalues.cpp 5 Jul 2009 20:33:17 -0000 1.28.2.2 *************** *** 44,52 **** #include "qmessagebox.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> --- 44,52 ---- #include "qmessagebox.h" #include <qstringlist.h> ! #include <QButtonGroup> #include <qlayout.h> #include <qradiobutton.h> #include <qcheckbox.h> ! #include <QGroupBox> #include <qpushbutton.h> #include <qspinbox.h> *************** *** 54,65 **** #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 <qapplication.h> ! #include <q3table.h> #include <qvalidator.h> #include <qimage.h> --- 54,65 ---- #include <qlabel.h> #include <qslider.h> ! #include <QFileDialog> ! #include <QTextEdit> #include <qtabwidget.h> ! #include <QProgressBar> #include <qdir.h> #include <qapplication.h> ! #include <QTableWidget> ! #include <QTableView> #include <qvalidator.h> #include <qimage.h> *************** *** 150,154 **** MonitorValues::MonitorValues(QWidget *parent ) ! : QDialog(parent, "", 0, Qt::WindowSystemMenuHint) { setupUi(this); --- 150,154 ---- MonitorValues::MonitorValues(QWidget *parent ) ! : QDialog(parent, Qt::WindowSystemMenuHint) { setupUi(this); *************** *** 188,195 **** for (i=0; i < NPRIMARIES; i++) { ! ComboPrimaries -> insertItem(tr(PrimTable[i].Name.toLocal8Bit())); } ! ComboPrimaries -> setCurrentItem(mon.items.ppos); if (mon.items.ppos< (NPRIMARIES-1)) --- 188,195 ---- for (i=0; i < NPRIMARIES; i++) { ! ComboPrimaries -> insertItem((ComboPrimaries->count()+1), tr(PrimTable[i].Name.toLocal8Bit())); } ! ComboPrimaries -> setCurrentIndex(mon.items.ppos); if (mon.items.ppos< (NPRIMARIES-1)) *************** *** 207,213 **** ComboBoxWP -> clear(); for (i=0; i < NWHITES; i++) ! ComboBoxWP -> insertItem(tr(WhitePoints[i].Name.toLocal8Bit())); ! ComboBoxWP-> setCurrentItem(mon.items.wppos); slotChangeWhitePoint(); --- 207,213 ---- ComboBoxWP -> clear(); for (i=0; i < NWHITES; i++) ! ComboBoxWP ->insertItem((ComboBoxWP ->count()+1), tr(WhitePoints[i].Name.toLocal8Bit())); ! ComboBoxWP-> setCurrentIndex(mon.items.wppos); slotChangeWhitePoint(); *************** *** 245,249 **** // char buff[32]; ! int nSel = ComboPrimaries -> currentItem(); BOOL IsUser = (nSel == NPRIMARIES - 1); --- 245,249 ---- // char buff[32]; ! int nSel = ComboPrimaries -> currentIndex(); BOOL IsUser = (nSel == NPRIMARIES - 1); *************** *** 301,305 **** cmsCIExyY wp; ! int nSel = ComboBoxWP-> currentItem(); if (nSel == NWHITES - 1) --- 301,305 ---- cmsCIExyY wp; ! int nSel = ComboBoxWP-> currentIndex(); if (nSel == NWHITES - 1) *************** *** 340,349 **** mon.items.bgamma = GammaB -> value(); mon.items.valid_mon=TRUE; ! if (ComboBoxWP-> currentItem() == NWHITES -1) mon.items.temp=TempWhitePoint -> value(); else mon.items.temp = 0; ! mon.items.wppos=ComboBoxWP-> currentItem(); ! mon.items.ppos=ComboPrimaries -> currentItem(); mon.put(mon); } --- 340,349 ---- mon.items.bgamma = GammaB -> value(); mon.items.valid_mon=TRUE; ! if (ComboBoxWP-> currentIndex() == NWHITES -1) mon.items.temp=TempWhitePoint -> value(); else mon.items.temp = 0; ! mon.items.wppos=ComboBoxWP-> currentIndex(); ! mon.items.ppos=ComboPrimaries -> currentIndex(); mon.put(mon); } Index: monitorvaluesbase.ui =================================================================== RCS file: /cvsroot/lprof/lprof/src/monqt/monitorvaluesbase.ui,v retrieving revision 1.18 retrieving revision 1.18.2.1 diff -C2 -d -r1.18 -r1.18.2.1 *** monitorvaluesbase.ui 1 Feb 2009 20:04:01 -0000 1.18 --- monitorvaluesbase.ui 5 Jul 2009 20:33:17 -0000 1.18.2.1 *************** *** 153,157 **** </item> <item row="1" column="0" > ! <widget class="Q3GroupBox" name="GroupBox6" > <property name="sizePolicy" > <sizepolicy vsizetype="Maximum" hsizetype="Preferred" > --- 153,157 ---- </item> <item row="1" column="0" > ! <widget class="QGroupBox" name="GroupBox6" > <property name="sizePolicy" > <sizepolicy vsizetype="Maximum" hsizetype="Preferred" > *************** *** 243,247 **** </item> <item rowspan="2" row="1" column="1" > ! <widget class="Q3ButtonGroup" name="ButtonGroup4_2" > <property name="sizePolicy" > <sizepolicy vsizetype="Preferred" hsizetype="MinimumExpanding" > --- 243,247 ---- </item> <item rowspan="2" row="1" column="1" > ! <widget class="QGroupBox" name="ButtonGroup4_2" > <property name="sizePolicy" > <sizepolicy vsizetype="Preferred" hsizetype="MinimumExpanding" > *************** *** 547,551 **** </item> <item row="2" column="0" > ! <widget class="Q3GroupBox" name="GroupBox5_2" > <property name="sizePolicy" > <sizepolicy vsizetype="MinimumExpanding" hsizetype="MinimumExpanding" > --- 547,551 ---- </item> <item row="2" column="0" > ! <widget class="QGroupBox" name="GroupBox5_2" > <property name="sizePolicy" > <sizepolicy vsizetype="MinimumExpanding" hsizetype="MinimumExpanding" > *************** *** 1212,1229 **** </widget> <layoutdefault spacing="6" margin="11" /> - <customwidgets> - <customwidget> - <class>Q3GroupBox</class> - <extends>QGroupBox</extends> - <header>Qt3Support/Q3GroupBox</header> - <container>1</container> - </customwidget> - <customwidget> - <class>Q3ButtonGroup</class> - <extends>Q3GroupBox</extends> - <header>Qt3Support/Q3ButtonGroup</header> - <container>1</container> - </customwidget> - </customwidgets> <resources> <include location="../../lprof.qrc" /> --- 1212,1215 ---- |
|
From: Amit K. <ami...@us...> - 2009-07-05 20:33:21
|
Update of /cvsroot/lprof/lprof/src/parmsqt In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv11270/parmsqt Modified Files: Tag: GSoC-2009 profileparms.cpp profileparmsbase.ui profileparmsmonbase.ui Log Message: With these changes lprof is now ported Index: profileparms.cpp =================================================================== RCS file: /cvsroot/lprof/lprof/src/parmsqt/profileparms.cpp,v retrieving revision 1.64.2.1 retrieving revision 1.64.2.2 diff -C2 -d -r1.64.2.1 -r1.64.2.2 *** profileparms.cpp 1 Jul 2009 18:34:02 -0000 1.64.2.1 --- profileparms.cpp 5 Jul 2009 20:33:18 -0000 1.64.2.2 *************** *** 28,33 **** // - //#include <q3buttongroup.h> - //#include <q3groupbox.h> #include <qlabel.h> #include <qpushbutton.h> --- 28,31 ---- *************** *** 258,265 **** setVCpresetList(); - smoothnessButtonGroup -> setRadioButtonExclusive ( true ); - smoothnessButtonGroup -> insert(autoSmoothness, -1); - smoothnessButtonGroup -> insert(manualSmoothness, -1); slotCancel(); } --- 256,265 ---- setVCpresetList(); + //smoothnessButtonGroup -> insert(autoSmoothness, -1); + //smoothnessButtonGroup -> insert(manualSmoothness, -1); + //smoothnessButtonGroup->layout()->addWidget(autoSmoothness); + //smoothnessButtonGroup->layout()->addWidget(manualSmoothness); + slotCancel(); } Index: profileparmsmonbase.ui =================================================================== RCS file: /cvsroot/lprof/lprof/src/parmsqt/profileparmsmonbase.ui,v retrieving revision 1.8 retrieving revision 1.8.2.1 diff -C2 -d -r1.8 -r1.8.2.1 *** profileparmsmonbase.ui 1 Feb 2009 20:04:01 -0000 1.8 --- profileparmsmonbase.ui 5 Jul 2009 20:33:18 -0000 1.8.2.1 *************** *** 181,185 **** </property> <item row="0" column="0" > ! <widget class="Q3ButtonGroup" name="ButtonGroup4" > <property name="sizePolicy" > <sizepolicy vsizetype="MinimumExpanding" hsizetype="Minimum" > --- 181,185 ---- </property> <item row="0" column="0" > ! <widget class="QGroupBox" name="ButtonGroup4" > <property name="sizePolicy" > <sizepolicy vsizetype="MinimumExpanding" hsizetype="Minimum" > *************** *** 331,335 **** </item> <item row="0" column="1" > ! <widget class="Q3ButtonGroup" name="StrategyGroup" > <property name="sizePolicy" > <sizepolicy vsizetype="MinimumExpanding" hsizetype="Minimum" > --- 331,335 ---- </item> <item row="0" column="1" > ! <widget class="QGroupBox" name="StrategyGroup" > <property name="sizePolicy" > <sizepolicy vsizetype="MinimumExpanding" hsizetype="Minimum" > *************** *** 420,424 **** </property> <item row="1" column="0" > ! <widget class="Q3GroupBox" name="groupBox1_2" > <property name="whatsThis" > <string>In most cases this should be set to "ISO-364 P2 ICC reference medium". The available presets includes a number of industry standard settings and users can select almost any set of arbitrary values. Settings other than "ISO-364 P2 ICC reference medium" are in general very specialized and should only be used by users who know specifically why they are making this change.</string> --- 420,424 ---- </property> <item row="1" column="0" > ! <widget class="QGroupBox" name="groupBox1_2" > <property name="whatsThis" > <string>In most cases this should be set to "ISO-364 P2 ICC reference medium". The available presets includes a number of industry standard settings and users can select almost any set of arbitrary values. Settings other than "ISO-364 P2 ICC reference medium" are in general very specialized and should only be used by users who know specifically why they are making this change.</string> *************** *** 771,775 **** </item> <item row="0" column="0" > ! <widget class="Q3GroupBox" name="source_or_dest_VC_groupBox" > <property name="whatsThis" > <string>This is for setting the lighting conditions that will be in use display viewing environment.<br><br> For most situations this should be setto one of the sRGB settings depending on how bright the lighting will be where the display is located. There are other pre-defined setting that are based on published standards that can be selected.<br><br> In addition, users can set these to almost any arbitrary set of values. Settings other than one of the sRGB settings are in general very specialized and should only be used by users who know specifically why they are making this change.</string> --- 771,775 ---- </item> <item row="0" column="0" > ! <widget class="QGroupBox" name="source_or_dest_VC_groupBox" > <property name="whatsThis" > <string>This is for setting the lighting conditions that will be in use display viewing environment.<br><br> For most situations this should be setto one of the sRGB settings depending on how bright the lighting will be where the display is located. There are other pre-defined setting that are based on published standards that can be selected.<br><br> In addition, users can set these to almost any arbitrary set of values. Settings other than one of the sRGB settings are in general very specialized and should only be used by users who know specifically why they are making this change.</string> *************** *** 1245,1262 **** </widget> <layoutdefault spacing="6" margin="11" /> - <customwidgets> - <customwidget> - <class>Q3GroupBox</class> - <extends>QGroupBox</extends> - <header>Qt3Support/Q3GroupBox</header> - <container>1</container> - </customwidget> - <customwidget> - <class>Q3ButtonGroup</class> - <extends>Q3GroupBox</extends> - <header>Qt3Support/Q3ButtonGroup</header> - <container>1</container> - </customwidget> - </customwidgets> <resources> <include location="../../lprof.qrc" /> --- 1245,1248 ---- Index: profileparmsbase.ui =================================================================== RCS file: /cvsroot/lprof/lprof/src/parmsqt/profileparmsbase.ui,v retrieving revision 1.44 retrieving revision 1.44.2.1 diff -C2 -d -r1.44 -r1.44.2.1 *** profileparmsbase.ui 18 May 2009 23:18:48 -0000 1.44 --- profileparmsbase.ui 5 Jul 2009 20:33:18 -0000 1.44.2.1 *************** *** 167,171 **** <layout class="QGridLayout" name="gridLayout_2"> <item row="0" column="0" rowspan="2"> ! <widget class="Q3ButtonGroup" name="ButtonGroup4"> <property name="sizePolicy"> <sizepolicy hsizetype="Expanding" vsizetype="MinimumExpanding"> --- 167,171 ---- <layout class="QGridLayout" name="gridLayout_2"> <item row="0" column="0" rowspan="2"> ! <widget class="QGroupBox" name="ButtonGroup4"> <property name="sizePolicy"> <sizepolicy hsizetype="Expanding" vsizetype="MinimumExpanding"> *************** *** 317,321 **** </item> <item row="0" column="1"> ! <widget class="Q3ButtonGroup" name="smoothnessButtonGroup"> <property name="sizePolicy"> <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding"> --- 317,321 ---- </item> <item row="0" column="1"> ! <widget class="QGroupBox" name="smoothnessButtonGroup"> <property name="sizePolicy"> <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding"> *************** *** 336,345 **** <string>Regression Parameters</string> </property> - <property name="exclusive"> - <bool>true</bool> - </property> - <property name="selectedId" stdset="0"> - <number>-1</number> - </property> <layout class="QGridLayout"> <property name="leftMargin"> --- 336,339 ---- *************** *** 347,351 **** </property> <property name="topMargin"> ! <number>0</number> </property> <property name="rightMargin"> --- 341,345 ---- </property> <property name="topMargin"> ! <number>10</number> </property> <property name="rightMargin"> *************** *** 353,357 **** </property> <property name="bottomMargin"> ! <number>0</number> </property> <property name="spacing"> --- 347,351 ---- </property> <property name="bottomMargin"> ! <number>20</number> </property> <property name="spacing"> *************** *** 360,366 **** <item row="0" column="0"> <layout class="QHBoxLayout"> ! <property name="margin"> <number>0</number> </property> <item> <layout class="QVBoxLayout"> --- 354,369 ---- <item row="0" column="0"> <layout class="QHBoxLayout"> ! <property name="leftMargin"> ! <number>0</number> ! </property> ! <property name="topMargin"> ! <number>10</number> ! </property> ! <property name="rightMargin"> <number>0</number> </property> + <property name="bottomMargin"> + <number>60</number> + </property> <item> <layout class="QVBoxLayout"> *************** *** 462,466 **** </item> <item row="1" column="1" rowspan="2"> ! <widget class="Q3ButtonGroup" name="StrategyGroup"> <property name="sizePolicy"> <sizepolicy hsizetype="Minimum" vsizetype="MinimumExpanding"> --- 465,469 ---- </item> <item row="1" column="1" rowspan="2"> ! <widget class="QGroupBox" name="StrategyGroup"> <property name="sizePolicy"> <sizepolicy hsizetype="Minimum" vsizetype="MinimumExpanding"> *************** *** 619,623 **** <layout class="QGridLayout"> <item row="0" column="0"> ! <widget class="Q3ButtonGroup" name="buttonGroup8"> <property name="sizePolicy"> <sizepolicy hsizetype="Ignored" vsizetype="Maximum"> --- 622,626 ---- <layout class="QGridLayout"> <item row="0" column="0"> ! <widget class="QGroupBox" name="buttonGroup8"> <property name="sizePolicy"> <sizepolicy hsizetype="Ignored" vsizetype="Maximum"> *************** *** 1329,1333 **** </item> <item row="1" column="0"> ! <widget class="Q3ButtonGroup" name="buttonGroup6"> <property name="sizePolicy"> <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed"> --- 1332,1336 ---- </item> <item row="1" column="0"> ! <widget class="QGroupBox" name="buttonGroup6"> <property name="sizePolicy"> <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed"> *************** *** 1402,1406 **** </property> <item row="0" column="0"> ! <widget class="Q3GroupBox" name="source_or_dest_VC_groupBox"> <property name="whatsThis"> <string>This is for setting the lighting conditions that were in use at the time the profiling target was captured.<br><br> For most situations this should be set the the default value of "Original scene - Bright Outdoors". There are other pre-defined setting that are based on published standards that can be selected.<br><br> In addition, users can set these to almost any arbitrary set of values. Settings other than "Original scene - Bright Outdoors" are in general very specialized and should only be used by users who know specifically why they are making this change.</string> --- 1405,1409 ---- </property> <item row="0" column="0"> ! <widget class="QGroupBox" name="source_or_dest_VC_groupBox"> <property name="whatsThis"> <string>This is for setting the lighting conditions that were in use at the time the profiling target was captured.<br><br> For most situations this should be set the the default value of "Original scene - Bright Outdoors". There are other pre-defined setting that are based on published standards that can be selected.<br><br> In addition, users can set these to almost any arbitrary set of values. Settings other than "Original scene - Bright Outdoors" are in general very specialized and should only be used by users who know specifically why they are making this change.</string> *************** *** 1765,1769 **** </item> <item row="1" column="0"> ! <widget class="Q3GroupBox" name="groupBox1_2"> <property name="whatsThis"> <string>In most this should be set to "ISO-364 P2 ICC reference medium". This includes a number of industry standard presets and users can select almost any set of arbitrary values. Settings other than "ISO-364 P2 ICC reference medium" are in general very specialized and should only be used by users who know specifically why they are making this change.</string> --- 1768,1772 ---- </item> <item row="1" column="0"> ! <widget class="QGroupBox" name="groupBox1_2"> <property name="whatsThis"> <string>In most this should be set to "ISO-364 P2 ICC reference medium". This includes a number of industry standard presets and users can select almost any set of arbitrary values. Settings other than "ISO-364 P2 ICC reference medium" are in general very specialized and should only be used by users who know specifically why they are making this change.</string> *************** *** 2244,2261 **** </widget> <layoutdefault spacing="6" margin="11"/> - <customwidgets> - <customwidget> - <class>Q3GroupBox</class> - <extends>QGroupBox</extends> - <header>Qt3Support/Q3GroupBox</header> - <container>1</container> - </customwidget> - <customwidget> - <class>Q3ButtonGroup</class> - <extends>Q3GroupBox</extends> - <header>Qt3Support/Q3ButtonGroup</header> - <container>1</container> - </customwidget> - </customwidgets> <resources> <include location="../../lprof.qrc"/> --- 2247,2250 ---- |
|
From: Amit K. <ami...@us...> - 2009-07-05 20:33:20
|
Update of /cvsroot/lprof/lprof/src/IDqt In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv11270/IDqt Modified Files: Tag: GSoC-2009 profileid.cpp profileidbase.ui Log Message: With these changes lprof is now ported Index: profileid.cpp =================================================================== RCS file: /cvsroot/lprof/lprof/src/IDqt/profileid.cpp,v retrieving revision 1.20.2.1 retrieving revision 1.20.2.2 diff -C2 -d -r1.20.2.1 -r1.20.2.2 *** profileid.cpp 30 Jun 2009 00:00:09 -0000 1.20.2.1 --- profileid.cpp 5 Jul 2009 20:33:17 -0000 1.20.2.2 *************** *** 35,40 **** #include <qwidget.h> #include <qlineedit.h> ! #include <q3multilineedit.h> ! #include <q3filedialog.h> #include <qfileinfo.h> #include <qmessagebox.h> --- 35,40 ---- #include <qwidget.h> #include <qlineedit.h> ! #include <QTextEdit> ! #include <QFileDialog> #include <qfileinfo.h> #include <qmessagebox.h> *************** *** 72,76 **** ProfileID::ProfileID( QWidget *parent) ! : QDialog(parent, "", 0, Qt::WindowSystemMenuHint) { setupUi(this); --- 72,76 ---- ProfileID::ProfileID( QWidget *parent) ! : QDialog(parent, Qt::WindowSystemMenuHint) { setupUi(this); *************** *** 129,133 **** strcpy(sys.hdr.Manufacturer, ManufacturerEdit->text().toLocal8Bit()); strcpy(sys.hdr.Model, ModelEdit -> text().toLocal8Bit()); ! strcpy(sys.hdr.Copyright, CopyrightEdit -> text().toLocal8Bit()); strcpy(sys.hdr.Description, DescriptionEdit -> text().toLocal8Bit()); --- 129,133 ---- strcpy(sys.hdr.Manufacturer, ManufacturerEdit->text().toLocal8Bit()); strcpy(sys.hdr.Model, ModelEdit -> text().toLocal8Bit()); ! strcpy(sys.hdr.Copyright, CopyrightEdit -> toPlainText().toLocal8Bit()); strcpy(sys.hdr.Description, DescriptionEdit -> text().toLocal8Bit()); *************** *** 234,240 **** #ifdef __WIN32__ ! pos = fn.findRev(QString::fromLocal8Bit("\\"), -1, FALSE); #else ! pos = fn.findRev(QString::fromLocal8Bit("/"), -1, FALSE); #endif --- 234,240 ---- #ifdef __WIN32__ ! pos = fn.lastIndexOf(QString::fromLocal8Bit("\\"), -1, Qt::CaseInsensitive); #else ! pos = fn.lastIndexOf(QString::fromLocal8Bit("/"), -1, Qt::CaseInsensitive); #endif *************** *** 270,281 **** { // check to make sure extension is some form of .icm or .icc ! if ((fn.findRev(QString::fromLocal8Bit(".i")) == fn.length() - 4 || ! fn.findRev(QString::fromLocal8Bit(".I")) == fn.length() - 4) && // .i or ,I && ! (fn.findRev(QString::fromLocal8Bit("C"), -2 ) == fn.length() - 2 || ! fn.findRev(QString::fromLocal8Bit("c"), -2 ) == fn.length() - 2) && // c or C && ! ((fn.findRev(QString::fromLocal8Bit("C")) == fn.length() - 1 || ! fn.findRev(QString::fromLocal8Bit("c")) == fn.length() - 1) || // c or C ! (fn.findRev(QString::fromLocal8Bit("M")) == fn.length() - 1 || ! fn.findRev(QString::fromLocal8Bit("m")) == fn.length() - 1 ))) // or m or M { // the directory and extension are OK --- 270,281 ---- { // check to make sure extension is some form of .icm or .icc ! if ((fn.lastIndexOf(QString::fromLocal8Bit(".i")) == fn.length() - 4 || ! fn.lastIndexOf(QString::fromLocal8Bit(".I")) == fn.length() - 4) && // .i or ,I && ! (fn.lastIndexOf(QString::fromLocal8Bit("C"), -2 ) == fn.length() - 2 || ! fn.lastIndexOf(QString::fromLocal8Bit("c"), -2 ) == fn.length() - 2) && // c or C && ! ((fn.lastIndexOf(QString::fromLocal8Bit("C")) == fn.length() - 1 || ! fn.lastIndexOf(QString::fromLocal8Bit("c")) == fn.length() - 1) || // c or C ! (fn.lastIndexOf(QString::fromLocal8Bit("M")) == fn.length() - 1 || ! fn.lastIndexOf(QString::fromLocal8Bit("m")) == fn.length() - 1 ))) // or m or M { // the directory and extension are OK *************** *** 285,289 **** { // direcotry OK but extesion is not ! if (fn.find(QString::fromLocal8Bit("."), pos) > -1) // There is an extension so this is a user error that we can not fix { // not really OK but we don't want to clobber the user entered file name --- 285,289 ---- { // direcotry OK but extesion is not ! if (fn.indexOf(QString::fromLocal8Bit("."), pos) > -1) // There is an extension so this is a user error that we can not fix { // not really OK but we don't want to clobber the user entered file name Index: profileidbase.ui =================================================================== RCS file: /cvsroot/lprof/lprof/src/IDqt/profileidbase.ui,v retrieving revision 1.15 retrieving revision 1.15.2.1 diff -C2 -d -r1.15 -r1.15.2.1 *** profileidbase.ui 1 Feb 2009 20:04:01 -0000 1.15 --- profileidbase.ui 5 Jul 2009 20:33:17 -0000 1.15.2.1 *************** *** 1,49 **** ! <ui version="4.0" > <class>ProfileIDBase</class> ! <widget class="QDialog" name="ProfileIDBase" > ! <property name="geometry" > <rect> <x>0</x> ! <y>0</y> ! <width>535</width> ! <height>533</height> </rect> [...984 lines suppressed...] ! <container>1</container> ! </customwidget> ! <customwidget> ! <class>Q3MultiLineEdit</class> ! <extends>QWidget</extends> ! <header>q3multilineedit.h</header> ! </customwidget> ! </customwidgets> <resources> ! <include location="../../lprof.qrc" /> </resources> <connections/> --- 497,503 ---- </layout> </widget> ! <layoutdefault spacing="6" margin="11"/> <resources> ! <include location="../../lprof.qrc"/> </resources> <connections/> |
|
From: Amit K. <ami...@us...> - 2009-07-05 19:26:11
|
Update of /cvsroot/lprof/lprof/src/moncalcontrolqt In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv3074 Added Files: Tag: GSoC-2009 custompage.h Log Message: I have added a new header custompage.h --- NEW FILE: custompage.h --- // $Id: custompage.h,v 1.1.2.1 2009/07/05 19:26:08 amitk203 Exp $ // Little cms Profiler // Copyright (C) 2007 Hal Engel // // THIS SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND, // EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY // WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. // // IN NO EVENT SHALL THE DEVELOPERS BE LIABLE FOR ANY SPECIAL, INCIDENTAL, // INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND, // OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, // WHETHER OR NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF // LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE // OF THIS SOFTWARE. // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by // the Free Software Foundation, either version 3 of the License, or // (at your option) any later version. // // This program is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // GNU General Public License for more details. // // You should have received a copy of the GNU General Public License // along with this program. If not, see <http://www.gnu.org/licenses/>. // // Version 1.11 #ifndef CUSTOMPAGE_H #define CUSTOMPAGE_H #include <QWizard> #include <QWizardPage> #include <QWidget> class customPage : public QWizardPage { private: bool filled; public: customPage(QWidget *parent=0):QWizardPage(parent) { filled=false; } bool isComplete(void) const { return filled; } void pageCompleted(bool x) { filled=x; emit completeChanged(); } }; #endif |
|
From: Amit K. <ami...@us...> - 2009-07-03 16:11:04
|
Update of /cvsroot/lprof/lprof/src/checkerqt In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv4835/checkerqt Modified Files: Tag: GSoC-2009 profilechecker.cpp Log Message: Index: profilechecker.cpp =================================================================== RCS file: /cvsroot/lprof/lprof/src/checkerqt/profilechecker.cpp,v retrieving revision 1.49.2.2 retrieving revision 1.49.2.3 diff -C2 -d -r1.49.2.2 -r1.49.2.3 *** profilechecker.cpp 1 Jul 2009 18:34:01 -0000 1.49.2.2 --- profilechecker.cpp 3 Jul 2009 16:10:56 -0000 1.49.2.3 *************** *** 117,121 **** ProfileChecker::ProfileChecker(QWidget *parent ) ! : QDialog(parent, "", 0, Qt::WindowSystemMenuHint), Checker(0) { --- 117,121 ---- ProfileChecker::ProfileChecker(QWidget *parent ) ! : QDialog(parent, Qt::WindowSystemMenuHint), Checker(0) { |
|
From: Amit K. <ami...@us...> - 2009-07-03 16:11:04
|
Update of /cvsroot/lprof/lprof/src/lprofqt In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv4835/lprofqt Modified Files: Tag: GSoC-2009 config.cpp lprofmain.h Log Message: Index: lprofmain.h =================================================================== RCS file: /cvsroot/lprof/lprof/src/lprofqt/lprofmain.h,v retrieving revision 1.52.2.5 retrieving revision 1.52.2.6 diff -C2 -d -r1.52.2.5 -r1.52.2.6 *** lprofmain.h 1 Jul 2009 18:34:02 -0000 1.52.2.5 --- lprofmain.h 3 Jul 2009 16:10:56 -0000 1.52.2.6 *************** *** 374,378 **** virtual void slotUpdateProfileParmsText(); virtual void setRGBpatchValues(); - // void templateFileCopied( Q3NetworkOperation *op ); ============================================================== void zeroProgressBars(); virtual void AddTemplate(); --- 374,377 ---- Index: config.cpp =================================================================== RCS file: /cvsroot/lprof/lprof/src/lprofqt/config.cpp,v retrieving revision 1.8.2.4 retrieving revision 1.8.2.5 diff -C2 -d -r1.8.2.4 -r1.8.2.5 *** config.cpp 1 Jul 2009 18:34:02 -0000 1.8.2.4 --- config.cpp 3 Jul 2009 16:10:56 -0000 1.8.2.5 *************** *** 263,273 **** QString path; ! //QString test = QString::fromLocal8Bit(QTextCodec::locale()); //removed by me ===============29june========== ! QString test = QLocale::system().name() ; //added by me=============29june==== if ((test.indexOf((QString::fromLocal8Bit("C")), 0, Qt::CaseInsensitive) >= 0)) path = QDir::currentPath() + QString::fromLocal8Bit("/help/") + QString::fromLocal8Bit("en"); else if (test == QString::fromLocal8Bit("ru")) ! path = QDir::currentPath() + QString::fromLocal8Bit("/help/") + QLocale::system().name(); //changed QString::fromLocal8Bit(QTextCodec::locale()) to QLocale::system().name() else // since at this point only english and Russian // help pages exist --- 263,272 ---- QString path; ! QString test = QLocale::system().name() ; if ((test.indexOf((QString::fromLocal8Bit("C")), 0, Qt::CaseInsensitive) >= 0)) path = QDir::currentPath() + QString::fromLocal8Bit("/help/") + QString::fromLocal8Bit("en"); else if (test == QString::fromLocal8Bit("ru")) ! path = QDir::currentPath() + QString::fromLocal8Bit("/help/") + QLocale::system().name(); else // since at this point only english and Russian // help pages exist *************** *** 304,333 **** } - /* - void lprofMain::templateFileCopied( Q3NetworkOperation *op ) - { - //qDebug(QString::fromLocal8Bit("templateFileCopied()")); - qDebug("templateFileCopied()"); - if ( !op ) - return; - - if ( op->state() == Q3NetworkProtocol::StFailed ) - { - // The copy operation failed - // Let users know there is a problem - // qDebug(QString::fromLocal8Bit("Error on template file copy")); - QMessageBox::critical( this, tr( "ERROR" ), op->protocolDetail() ); - } - else if(op->operation () == Q3NetworkProtocol::OpPut ) - { - qDebug("Template file saved - operation successful. %i", copyNumTempFile); - mutexTempFile.lock(); - copyNumTempFile = copyNumTempFile - 1; - mutexTempFile.unlock(); - } - qDebug("copyNumTempFile = %i", copyNumTempFile); - - } - */ void lprofMain::Create_Config_Dir(const QString data_path) { --- 303,306 ---- |
|
From: Amit K. <ami...@us...> - 2009-07-03 16:11:01
|
Update of /cvsroot/lprof/lprof/src/moncalcontrolqt In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv4835/moncalcontrolqt Modified Files: Tag: GSoC-2009 moncalcontrol.cpp moncalcontrol.h moncalcontrolbase.ui Log Message: Index: moncalcontrolbase.ui =================================================================== RCS file: /cvsroot/lprof/lprof/src/moncalcontrolqt/moncalcontrolbase.ui,v retrieving revision 1.21.2.1 retrieving revision 1.21.2.2 diff -C2 -d -r1.21.2.1 -r1.21.2.2 *** moncalcontrolbase.ui 1 Jul 2009 18:34:02 -0000 1.21.2.1 --- moncalcontrolbase.ui 3 Jul 2009 16:10:56 -0000 1.21.2.2 *************** *** 11,14 **** --- 11,20 ---- </rect> </property> + <property name="sizePolicy"> + <sizepolicy hsizetype="Preferred" vsizetype="Preferred"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> <property name="minimumSize"> <size> *************** *** 26,29 **** --- 32,39 ---- <string>Monitor Calibration and Measurement</string> </property> + <property name="windowIcon"> + <iconset resource="../../lprof.qrc"> + <normaloff>:/src/images/lcms.png</normaloff>:/src/images/lcms.png</iconset> + </property> <property name="wizardStyle"> <enum>QWizard::ModernStyle</enum> *************** *** 33,36 **** --- 43,52 ---- </property> <widget class="QWizardPage" name="Settings"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Preferred" vsizetype="Preferred"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> <attribute name="pageId"> <string>0</string> *************** *** 858,864 **** <rect> <x>10</x> ! <y>386</y> <width>521</width> ! <height>81</height> </rect> </property> --- 874,880 ---- <rect> <x>10</x> ! <y>400</y> <width>521</width> ! <height>67</height> </rect> </property> *************** *** 1006,1010 **** </widget> </widget> ! <widget class="QWizardPage" name="Calibrate"> <attribute name="pageId"> <string>2</string> --- 1022,1026 ---- </widget> </widget> ! <widget class="customPage" name="Calibrate"> <attribute name="pageId"> <string>2</string> *************** *** 1204,1208 **** </widget> </widget> ! <widget class="QWizardPage" name="Measure"> <attribute name="pageId"> <string>3</string> --- 1220,1224 ---- </widget> </widget> ! <widget class="customPage" name="Measure"> <attribute name="pageId"> <string>3</string> *************** *** 1407,1410 **** --- 1423,1432 ---- <container>1</container> </customwidget> + <customwidget> + <class>customPage</class> + <extends>QWizardPage</extends> + <header>custompage.h</header> + <container>1</container> + </customwidget> </customwidgets> <resources> Index: moncalcontrol.cpp =================================================================== RCS file: /cvsroot/lprof/lprof/src/moncalcontrolqt/moncalcontrol.cpp,v retrieving revision 1.37.2.2 retrieving revision 1.37.2.3 diff -C2 -d -r1.37.2.2 -r1.37.2.3 *** moncalcontrol.cpp 1 Jul 2009 18:34:02 -0000 1.37.2.2 --- moncalcontrol.cpp 3 Jul 2009 16:10:56 -0000 1.37.2.3 *************** *** 422,426 **** slotGo(); if (cd.data.OK) ! warning1->setText(QString::fromLocal8Bit("Display is calibrated. You can now proceed to next page.")); } --- 422,426 ---- slotGo(); if (cd.data.OK) ! Calibrate->pageCompleted(true); } *************** *** 431,435 **** slotGo(); if (cd.data.OK) ! warning2->setText(QString::fromLocal8Bit("Measurment sheet is created. You can now finish.")); } --- 431,435 ---- slotGo(); if (cd.data.OK) ! Measure->pageCompleted(true); } *************** *** 731,751 **** pal.setColor(textLabelHeading5 -> backgroundRole(), Qt::white); textLabelHeading5 -> setPalette(pal); - - warning1 = new QLabel(page(2)); - warning1->setObjectName(QString::fromUtf8("warning")); - warning1->setGeometry(QRect(10, 380, 605, 41)); - QFont font1; - font1.setPointSize(10); - font1.setBold(true); - font1.setWeight(75); - warning1->setFont(font1); - warning1->setCursor(QCursor(Qt::ArrowCursor)); - warning1->setText(QString::fromLocal8Bit("Warning! display is not calibrated. You must calibrate it before going to next page.")); - warning2 = new QLabel(page(3)); - warning2->setObjectName(QString::fromUtf8("warning")); - warning2->setGeometry(QRect(10, 380, 650, 41)); - warning2->setFont(font1); - warning2->setCursor(QCursor(Qt::ArrowCursor)); - warning2->setText(QString::fromLocal8Bit("Warning! Measurment sheet is not created. You must create it before finishing.")); } --- 731,734 ---- |
|
From: Amit K. <ami...@us...> - 2009-07-03 16:11:00
|
Update of /cvsroot/lprof/lprof/src/libqtlcmswidgets In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv4835/libqtlcmswidgets Modified Files: Tag: GSoC-2009 qtcietonge.cpp qtlcmswidgets.cpp qtlcmswidgets.h Log Message: Index: qtlcmswidgets.h =================================================================== RCS file: /cvsroot/lprof/lprof/src/libqtlcmswidgets/qtlcmswidgets.h,v retrieving revision 1.15.2.3 retrieving revision 1.15.2.4 diff -C2 -d -r1.15.2.3 -r1.15.2.4 *** qtlcmswidgets.h 25 Jun 2009 13:32:07 -0000 1.15.2.3 --- qtlcmswidgets.h 3 Jul 2009 16:10:56 -0000 1.15.2.4 *************** *** 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,50 ---- #include <QTableView> #include <QTableWidget> ! // Base selector implements a selector for IT8 files and icc profiles // This is not intended to be a good hierarchy but a flexible widget Index: qtcietonge.cpp =================================================================== RCS file: /cvsroot/lprof/lprof/src/libqtlcmswidgets/qtcietonge.cpp,v retrieving revision 1.3 retrieving revision 1.3.2.1 diff -C2 -d -r1.3 -r1.3.2.1 *** qtcietonge.cpp 6 Mar 2008 21:18:58 -0000 1.3 --- qtcietonge.cpp 3 Jul 2009 16:10:56 -0000 1.3.2.1 *************** *** 213,217 **** outline.setColor(Qt::white); path.addPolygon(tongePoly); ! painter.setBackgroundColor(Qt::black); painter.setPen(outline); painter.drawPath(path); --- 213,217 ---- outline.setColor(Qt::white); path.addPolygon(tongePoly); ! painter.setBackground(Qt::black); painter.setPen(outline); painter.drawPath(path); Index: qtlcmswidgets.cpp =================================================================== RCS file: /cvsroot/lprof/lprof/src/libqtlcmswidgets/qtlcmswidgets.cpp,v retrieving revision 1.42.2.5 retrieving revision 1.42.2.6 diff -C2 -d -r1.42.2.5 -r1.42.2.6 *** qtlcmswidgets.cpp 1 Jul 2009 18:34:01 -0000 1.42.2.5 --- qtlcmswidgets.cpp 3 Jul 2009 16:10:56 -0000 1.42.2.6 *************** *** 42,53 **** #include <qapplication.h> - #include <q3filedialog.h> - #include <q3textview.h> - #include <q3textstream.h> #include <qvariant.h> #include <qcursor.h> #include <QPolygon> #include <QFileDialog> ! #include <setjmp.h> --- 42,50 ---- #include <qapplication.h> #include <qvariant.h> #include <qcursor.h> #include <QPolygon> #include <QFileDialog> ! #include <QTextStream> #include <setjmp.h> *************** *** 135,139 **** if (lUseLineEdit) return LineEdit -> text(); ! int Key = Combo->currentItem(); if (Key < 0) return QString::null; --- 132,136 ---- if (lUseLineEdit) return LineEdit -> text(); ! int Key = Combo->currentIndex(); if (Key < 0) return QString::null; *************** *** 152,156 **** for (unsigned int i = 0; i < FileNames.count(); i++) { ! if (FileNames[i] == name) Combo->setCurrentItem(i); } } --- 149,153 ---- for (unsigned int i = 0; i < FileNames.count(); i++) { ! if (FileNames[i] == name) Combo->setCurrentIndex(i); } } *************** *** 230,234 **** fd.setFilter(QDir::Files | QDir::Hidden); ! fd.setNameFilter(FileMask); const QFileInfoList& files = fd.entryInfoList(); --- 227,231 ---- fd.setFilter(QDir::Files | QDir::Hidden); ! fd.setNameFilters(FileMask.split(QString::fromLocal8Bit(" "))); const QFileInfoList& files = fd.entryInfoList(); *************** *** 303,307 **** } ! Combo->insertStringList(Descriptions); QApplication::restoreOverrideCursor(); } --- 300,304 ---- } ! Combo->insertItems(50,Descriptions); QApplication::restoreOverrideCursor(); } *************** *** 314,319 **** QFile inFile(FileName); inFile.open(QIODevice::ReadOnly); ! Q3TextStream stream(&inFile); ! stream >> Description; if(Description == QString::fromLocal8Bit("HCT")) --- 311,316 ---- QFile inFile(FileName); inFile.open(QIODevice::ReadOnly); ! QTextStream stream(&inFile); ! stream >> Description; if(Description == QString::fromLocal8Bit("HCT")) *************** *** 338,343 **** QFile inFile(FileName); inFile.open(QIODevice::ReadOnly); ! Q3TextStream stream(&inFile); ! stream >> inString; --- 335,340 ---- QFile inFile(FileName); inFile.open(QIODevice::ReadOnly); ! QTextStream stream(&inFile); ! stream >> inString; *************** *** 349,356 **** QString gmDescription; ! startOfFileName = FileName.findRev(QString::fromLocal8Bit("/"), -1); gmFilename = FileName; gmFilename.remove(0, startOfFileName + 1); ! gmFilename.remove(gmFilename.findRev(QString::fromLocal8Bit("."), -1), 4); while(!stream.atEnd()) --- 346,353 ---- QString gmDescription; ! startOfFileName = FileName.lastIndexOf(QString::fromLocal8Bit("/"), -1); gmFilename = FileName; gmFilename.remove(0, startOfFileName + 1); ! gmFilename.remove(gmFilename.lastIndexOf(QString::fromLocal8Bit("."), -1), 4); while(!stream.atEnd()) *************** *** 388,393 **** QString inString; inFile.open(QIODevice::ReadOnly); ! Q3TextStream stream(&inFile); ! stream >> inString; inFile.close(); --- 385,391 ---- QString inString; inFile.open(QIODevice::ReadOnly); ! QTextStream stream(&inFile); ! ! stream >> inString; inFile.close(); *************** *** 426,430 **** fd.setFilter(QDir::Files | QDir::Hidden); ! fd.setNameFilter(FileMask); const QFileInfoList& files = fd.entryInfoList(); --- 424,428 ---- fd.setFilter(QDir::Files | QDir::Hidden); ! fd.setNameFilters(FileMask.split(QString::fromLocal8Bit(" "))); const QFileInfoList& files = fd.entryInfoList(); *************** *** 481,486 **** Backing = QString::fromLocal8Bit(" ") + Backing + QString::fromLocal8Bit(" backing "); QString temp = QString::fromLocal8Bit(cmsxIT8GetProperty(hIT8, "DESCRIPTOR")); ! if (temp.find(QString::fromLocal8Bit("(")) > -1 && temp.findRev(QString::fromLocal8Bit(")")) == temp.length() - 1) ! other = QString::fromLocal8Bit(" ") + temp.mid(temp.find(QString::fromLocal8Bit("(")) + 1, temp.length() - temp.find(QString::fromLocal8Bit("(")) - 2) + QString::fromLocal8Bit(" "); QString numFields = QString::fromLocal8Bit(" Number of Fields ") + QString::fromLocal8Bit(cmsxIT8GetProperty(hIT8, "NUMBER_OF_FIELDS")); --- 479,484 ---- Backing = QString::fromLocal8Bit(" ") + Backing + QString::fromLocal8Bit(" backing "); QString temp = QString::fromLocal8Bit(cmsxIT8GetProperty(hIT8, "DESCRIPTOR")); ! if (temp.indexOf(QString::fromLocal8Bit("(")) > -1 && temp.lastIndexOf(QString::fromLocal8Bit(")")) == temp.length() - 1) ! other = QString::fromLocal8Bit(" ") + temp.mid(temp.indexOf(QString::fromLocal8Bit("(")) + 1, temp.length() - temp.indexOf(QString::fromLocal8Bit("(")) - 2) + QString::fromLocal8Bit(" "); QString numFields = QString::fromLocal8Bit(" Number of Fields ") + QString::fromLocal8Bit(cmsxIT8GetProperty(hIT8, "NUMBER_OF_FIELDS")); *************** *** 513,517 **** } if (OK) ! Combo->insertStringList(Descriptions); QApplication::restoreOverrideCursor(); } --- 511,515 ---- } if (OK) ! Combo->insertItems(51,Descriptions); QApplication::restoreOverrideCursor(); } *************** *** 548,552 **** fd.setFilter(QDir::Files | QDir::Hidden); ! fd.setNameFilter(FileMask); const QFileInfoList& files = fd.entryInfoList(); --- 546,550 ---- fd.setFilter(QDir::Files | QDir::Hidden); ! fd.setNameFilters(FileMask.split(QString::fromLocal8Bit(" "))); const QFileInfoList& files = fd.entryInfoList(); *************** *** 607,611 **** cmsSetErrorHandler(NULL); ! Combo->insertStringList(Descriptions); QApplication::restoreOverrideCursor(); --- 605,609 ---- cmsSetErrorHandler(NULL); ! Combo->insertItems(52,Descriptions); QApplication::restoreOverrideCursor(); *************** *** 981,999 **** CorrByItem[0] = CHK_CORR_NONE; ! corrCombo->insertItem(QTranslator::tr("No Correction")); CorrByItem[1] = CHK_CORR_LUMINANCE; ! corrCombo->insertItem(QTranslator::tr("Luminance Correction")); CorrByItem[2] = CHK_CORR_MATRIX; ! corrCombo->insertItem(QTranslator::tr("Matrix Correction")); CorrByItem[3] = CHK_CORR_WP_WVK; ! corrCombo->insertItem(QTranslator::tr("Whitepoint Correction (Wrong von Kries)")); CorrByItem[4] = CHK_CORR_WP_BDF; ! corrCombo->insertItem(QTranslator::tr("Whitepoint Correction (Bradford)")); ! corrCombo->setCurrentItem(0); } } --- 979,997 ---- CorrByItem[0] = CHK_CORR_NONE; ! corrCombo->insertItem(50,QTranslator::tr("No Correction")); CorrByItem[1] = CHK_CORR_LUMINANCE; ! corrCombo->insertItem(51,QTranslator::tr("Luminance Correction")); CorrByItem[2] = CHK_CORR_MATRIX; ! corrCombo->insertItem(52,QTranslator::tr("Matrix Correction")); CorrByItem[3] = CHK_CORR_WP_WVK; ! corrCombo->insertItem(53,QTranslator::tr("Whitepoint Correction (Wrong von Kries)")); CorrByItem[4] = CHK_CORR_WP_BDF; ! corrCombo->insertItem(54,QTranslator::tr("Whitepoint Correction (Bradford)")); ! corrCombo->setCurrentIndex(0); } } *************** *** 1009,1013 **** CheckerCorrection corr = CorrectionCombo ? ! CorrByItem[CorrectionCombo->currentItem()] : CHK_CORR_NONE; --- 1007,1011 ---- CheckerCorrection corr = CorrectionCombo ? ! CorrByItem[CorrectionCombo->currentIndex()] : CHK_CORR_NONE; |
|
From: Amit K. <ami...@us...> - 2009-07-01 18:34:12
|
Update of /cvsroot/lprof/lprof/src/parmsqt In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv1838/parmsqt Modified Files: Tag: GSoC-2009 profileparms.cpp profileparmsmon.cpp Log Message: Index: profileparmsmon.cpp =================================================================== RCS file: /cvsroot/lprof/lprof/src/parmsqt/profileparmsmon.cpp,v retrieving revision 1.6 retrieving revision 1.6.2.1 diff -C2 -d -r1.6 -r1.6.2.1 *** profileparmsmon.cpp 18 May 2009 21:17:17 -0000 1.6 --- profileparmsmon.cpp 1 Jul 2009 18:34:02 -0000 1.6.2.1 *************** *** 28,37 **** // ! #include <q3buttongroup.h> ! #include <q3groupbox.h> #include <qlabel.h> #include <qpushbutton.h> #include <qradiobutton.h> #include <qcombobox.h> #include "profileparmsmon.h" --- 28,38 ---- // ! #include <qlabel.h> #include <qpushbutton.h> #include <qradiobutton.h> #include <qcombobox.h> + #include <QGroupBox> + #include <QButtonGroup> #include "profileparmsmon.h" *************** *** 114,130 **** source_or_dest_VC_groupBox -> setTitle (tr("Assumed display viewing conditions")); ! deviceVCcomboBox -> insertItem (tr(VCqStringValues[sRGB].toLocal8Bit()), 0); ! deviceVCcomboBox -> insertItem (tr(VCqStringValues[sRGBannexD].toLocal8Bit()), 1); ! deviceVCcomboBox -> insertItem (tr(VCqStringValues[iso9241].toLocal8Bit()), 2); ! deviceVCcomboBox -> insertItem (tr(VCqStringValues[projDark].toLocal8Bit()), 3); ! deviceVCcomboBox -> insertItem (tr(VCqStringValues[projDim].toLocal8Bit()), 4); ! deviceVCcomboBox -> insertItem (tr(VCqStringValues[userdef].toLocal8Bit()), 5); ! PCSVCcomboBox -> insertItem (tr(VCqStringValues[iso3664p2_pcs].toLocal8Bit()), 0); ! PCSVCcomboBox -> insertItem (tr(VCqStringValues[userdef].toLocal8Bit()), 1); } ProfileParmsMon::ProfileParmsMon(QWidget *parent ) ! : QDialog(parent, "", 0, Qt::WindowSystemMenuHint) { setupUi(this); --- 115,131 ---- source_or_dest_VC_groupBox -> setTitle (tr("Assumed display viewing conditions")); ! deviceVCcomboBox -> insertItem (0,tr(VCqStringValues[sRGB].toLocal8Bit())); ! deviceVCcomboBox -> insertItem (1,tr(VCqStringValues[sRGBannexD].toLocal8Bit())); ! deviceVCcomboBox -> insertItem (2,tr(VCqStringValues[iso9241].toLocal8Bit())); ! deviceVCcomboBox -> insertItem (3,tr(VCqStringValues[projDark].toLocal8Bit())); ! deviceVCcomboBox -> insertItem (4,tr(VCqStringValues[projDim].toLocal8Bit())); ! deviceVCcomboBox -> insertItem (5,tr(VCqStringValues[userdef].toLocal8Bit())); ! PCSVCcomboBox -> insertItem (0,tr(VCqStringValues[iso3664p2_pcs].toLocal8Bit())); ! PCSVCcomboBox -> insertItem (1,tr(VCqStringValues[userdef].toLocal8Bit())); } ProfileParmsMon::ProfileParmsMon(QWidget *parent ) ! : QDialog(parent, Qt::WindowSystemMenuHint) { setupUi(this); *************** *** 204,212 **** PCSYbSpinBox -> setValue(sys.hdr.PCS.Yb); PCSLaSpinBox -> setValue(sys.hdr.PCS.La); ! deviceSurroundCombo -> setCurrentItem(sys.hdr.device.surround); ! PCSSurroundCombo -> setCurrentItem(sys.hdr.PCS.surround); ! deviceVCcomboBox -> setCurrentItem(currItemFromIndex(sys.hdr.viewingConditionsPredefDevice, FALSE)); ! PCSVCcomboBox -> setCurrentItem(currItemFromIndex(sys.hdr.viewingConditionsPredefPCS, TRUE)); slotChangeStrategy(); --- 205,213 ---- PCSYbSpinBox -> setValue(sys.hdr.PCS.Yb); PCSLaSpinBox -> setValue(sys.hdr.PCS.La); ! deviceSurroundCombo -> setCurrentIndex(sys.hdr.device.surround); ! PCSSurroundCombo -> setCurrentIndex(sys.hdr.PCS.surround); ! deviceVCcomboBox -> setCurrentIndex(currItemFromIndex(sys.hdr.viewingConditionsPredefDevice, FALSE)); ! PCSVCcomboBox -> setCurrentIndex(currItemFromIndex(sys.hdr.viewingConditionsPredefPCS, TRUE)); slotChangeStrategy(); *************** *** 217,222 **** // qDebug("ProfileParmsMon:ControlsToValues())"); QString Buff; ! sys.hdr.device.surround = deviceSurroundCombo -> currentItem(); ! sys.hdr.PCS.surround = PCSSurroundCombo -> currentItem(); sys.hdr.viewingConditionsPredefDevice = getCVindex (deviceVCcomboBox -> currentText()); sys.hdr.viewingConditionsPredefPCS = getCVindex (PCSVCcomboBox -> currentText()); --- 218,223 ---- // qDebug("ProfileParmsMon:ControlsToValues())"); QString Buff; ! sys.hdr.device.surround = deviceSurroundCombo -> currentIndex(); ! sys.hdr.PCS.surround = PCSSurroundCombo -> currentIndex(); sys.hdr.viewingConditionsPredefDevice = getCVindex (deviceVCcomboBox -> currentText()); sys.hdr.viewingConditionsPredefPCS = getCVindex (PCSVCcomboBox -> currentText()); *************** *** 304,308 **** case iso3664p2: // ISO-3664 P2 Practical Reflection Print // qDebug("in slotVCpresetChanged case 0 source"); ! deviceSurroundCombo -> setCurrentItem( AVG_SURROUND); /* Average viewing conditions */ deviceYbSpinBox -> setValue (20.0); /* Grey world */ deviceLaSpinBox -> setValue (32.0); --- 305,309 ---- case iso3664p2: // ISO-3664 P2 Practical Reflection Print // qDebug("in slotVCpresetChanged case 0 source"); ! deviceSurroundCombo -> setCurrentIndex( AVG_SURROUND); /* Average viewing conditions */ deviceYbSpinBox -> setValue (20.0); /* Grey world */ deviceLaSpinBox -> setValue (32.0); *************** *** 310,314 **** case iso3664p2_pcs: // ISO-3664 P2 ICC refence medium // qDebug("in slotVCpresetChanged case 0 source"); ! deviceSurroundCombo -> setCurrentItem( AVG_SURROUND); /* Average viewing conditions */ deviceYbSpinBox -> setValue (20.0); /* Grey world */ deviceLaSpinBox -> setValue (32.0); --- 311,315 ---- case iso3664p2_pcs: // ISO-3664 P2 ICC refence medium // qDebug("in slotVCpresetChanged case 0 source"); ! deviceSurroundCombo -> setCurrentIndex( AVG_SURROUND); /* Average viewing conditions */ deviceYbSpinBox -> setValue (20.0); /* Grey world */ deviceLaSpinBox -> setValue (32.0); *************** *** 316,320 **** case cie1161995: // CIE 116-1995 dE color difference metric // qDebug("in slotVCpresetChanged case 1 source"); ! deviceSurroundCombo -> setCurrentItem( AVG_SURROUND); /* Average viewing conditions */ deviceYbSpinBox -> setValue (18.0); /* Grey world */ deviceLaSpinBox -> setValue (64.0); /* Bright */ --- 317,321 ---- case cie1161995: // CIE 116-1995 dE color difference metric // qDebug("in slotVCpresetChanged case 1 source"); ! deviceSurroundCombo -> setCurrentIndex( AVG_SURROUND); /* Average viewing conditions */ deviceYbSpinBox -> setValue (18.0); /* Grey world */ deviceLaSpinBox -> setValue (64.0); /* Bright */ *************** *** 323,327 **** // ISO-3664 P1 Critical print evaluation environment // qDebug("in slotVCpresetChanged case 2 source"); ! deviceSurroundCombo -> setCurrentItem( AVG_SURROUND); /* Average viewing conditions */ deviceYbSpinBox -> setValue (20.0); /* Grey world */ deviceLaSpinBox -> setValue (127.0); /* Bright */ --- 324,328 ---- // ISO-3664 P1 Critical print evaluation environment // qDebug("in slotVCpresetChanged case 2 source"); ! deviceSurroundCombo -> setCurrentIndex( AVG_SURROUND); /* Average viewing conditions */ deviceYbSpinBox -> setValue (20.0); /* Grey world */ deviceLaSpinBox -> setValue (127.0); /* Bright */ *************** *** 329,333 **** case brightOutdoors: // Original scene - Bright Outdoors // qDebug("in slotVCpresetChanged case 8 source"); ! deviceSurroundCombo -> setCurrentItem( AVG_SURROUND); /* Average viewing conditions */ deviceYbSpinBox -> setValue (20.0); /* Grey world */ deviceLaSpinBox -> setValue (2000.0); /* Bright Outdoors */ --- 330,334 ---- case brightOutdoors: // Original scene - Bright Outdoors // qDebug("in slotVCpresetChanged case 8 source"); ! deviceSurroundCombo -> setCurrentIndex( AVG_SURROUND); /* Average viewing conditions */ deviceYbSpinBox -> setValue (20.0); /* Grey world */ deviceLaSpinBox -> setValue (2000.0); /* Bright Outdoors */ *************** *** 335,339 **** case cutSheet: // Cut Sheet Transparencies on a viewing box // qDebug("in slotVCpresetChanged case 9 source"); ! deviceSurroundCombo -> setCurrentItem( CUTSHEET_SURROUND); /* Cut sheet viewing conditions */ deviceYbSpinBox -> setValue (20.0); /* Grey world */ deviceLaSpinBox -> setValue (53.0); /* Dim, adapted to slide ? */ --- 336,340 ---- case cutSheet: // Cut Sheet Transparencies on a viewing box // qDebug("in slotVCpresetChanged case 9 source"); ! deviceSurroundCombo -> setCurrentIndex( CUTSHEET_SURROUND); /* Cut sheet viewing conditions */ deviceYbSpinBox -> setValue (20.0); /* Grey world */ deviceLaSpinBox -> setValue (53.0); /* Dim, adapted to slide ? */ *************** *** 341,345 **** case sRGB: // Monitor in darkened work environment sRGB // qDebug("in slotVCpresetChanged case 3 source"); ! deviceSurroundCombo -> setCurrentItem( DIM_SURROUND); /* Dim viewing conditions */ deviceYbSpinBox -> setValue (20.0); /* Grey world */ deviceLaSpinBox -> setValue (4.0); /* Darkened work environment */ --- 342,346 ---- case sRGB: // Monitor in darkened work environment sRGB // qDebug("in slotVCpresetChanged case 3 source"); ! deviceSurroundCombo -> setCurrentIndex( DIM_SURROUND); /* Dim viewing conditions */ deviceYbSpinBox -> setValue (20.0); /* Grey world */ deviceLaSpinBox -> setValue (4.0); /* Darkened work environment */ *************** *** 347,351 **** case sRGBannexD: // Monitor in typical work environment sRGB annex D // qDebug("in slotVCpresetChanged case 4 source"); ! deviceSurroundCombo -> setCurrentItem( AVG_SURROUND); /* Average viewing conditions */ deviceYbSpinBox -> setValue (20.0); /* Grey world */ deviceLaSpinBox -> setValue (22.0); /* Typical work environment */ --- 348,352 ---- case sRGBannexD: // Monitor in typical work environment sRGB annex D // qDebug("in slotVCpresetChanged case 4 source"); ! deviceSurroundCombo -> setCurrentIndex( AVG_SURROUND); /* Average viewing conditions */ deviceYbSpinBox -> setValue (20.0); /* Grey world */ deviceLaSpinBox -> setValue (22.0); /* Typical work environment */ *************** *** 353,357 **** case iso9241: // Monitor in bright work environment ISO 9241 // qDebug("in slotVCpresetChanged case 5 source"); ! deviceSurroundCombo -> setCurrentItem( AVG_SURROUND); /* Average viewing conditions */ deviceYbSpinBox -> setValue (20.0); /* Grey world */ deviceLaSpinBox -> setValue (32.0); /* Bright work environment */ --- 354,358 ---- case iso9241: // Monitor in bright work environment ISO 9241 // qDebug("in slotVCpresetChanged case 5 source"); ! deviceSurroundCombo -> setCurrentIndex( AVG_SURROUND); /* Average viewing conditions */ deviceYbSpinBox -> setValue (20.0); /* Grey world */ deviceLaSpinBox -> setValue (32.0); /* Bright work environment */ *************** *** 359,363 **** case projDim: // Projector in dim environment // qDebug("in slotVCpresetChanged case 6 source"); ! deviceSurroundCombo -> setCurrentItem( DIM_SURROUND); /* Dim viewing conditions */ deviceYbSpinBox -> setValue (20.0); /* Grey world */ deviceLaSpinBox -> setValue ( 10.0); /* Adaptation is from display */ --- 360,364 ---- case projDim: // Projector in dim environment // qDebug("in slotVCpresetChanged case 6 source"); ! deviceSurroundCombo -> setCurrentIndex( DIM_SURROUND); /* Dim viewing conditions */ deviceYbSpinBox -> setValue (20.0); /* Grey world */ deviceLaSpinBox -> setValue ( 10.0); /* Adaptation is from display */ *************** *** 365,369 **** case projDark: // Projector in dark environment // qDebug("in slotVCpresetChanged case 7 source"); ! deviceSurroundCombo -> setCurrentItem( DARK_SURROUND); /* Dark viewing conditions */ deviceYbSpinBox -> setValue (20.0); /* Grey world */ deviceLaSpinBox -> setValue (10.0); /* Adaptation is from display */ --- 366,370 ---- case projDark: // Projector in dark environment // qDebug("in slotVCpresetChanged case 7 source"); ! deviceSurroundCombo -> setCurrentIndex( DARK_SURROUND); /* Dark viewing conditions */ deviceYbSpinBox -> setValue (20.0); /* Grey world */ deviceLaSpinBox -> setValue (10.0); /* Adaptation is from display */ *************** *** 374,378 **** default: // qDebug("in slotVCpresetChanged case default"); ! deviceSurroundCombo -> setCurrentItem( AVG_SURROUND); /* Average viewing conditions */ deviceYbSpinBox -> setValue (20.0); /* Grey world */ deviceLaSpinBox -> setValue (32.0); /* Compromise brightness */ --- 375,379 ---- default: // qDebug("in slotVCpresetChanged case default"); ! deviceSurroundCombo -> setCurrentIndex( AVG_SURROUND); /* Average viewing conditions */ deviceYbSpinBox -> setValue (20.0); /* Grey world */ deviceLaSpinBox -> setValue (32.0); /* Compromise brightness */ *************** *** 386,390 **** case iso3664p2: // ISO-3664 P2 Practical Reflection Print // qDebug("in slotVCpresetChanged case 0 source"); ! PCSSurroundCombo -> setCurrentItem( AVG_SURROUND); /* Average viewing conditions */ PCSYbSpinBox -> setValue (20.0); /* Grey world */ PCSLaSpinBox -> setValue (32.0); --- 387,391 ---- case iso3664p2: // ISO-3664 P2 Practical Reflection Print // qDebug("in slotVCpresetChanged case 0 source"); ! PCSSurroundCombo -> setCurrentIndex( AVG_SURROUND); /* Average viewing conditions */ PCSYbSpinBox -> setValue (20.0); /* Grey world */ PCSLaSpinBox -> setValue (32.0); *************** *** 392,396 **** case iso3664p2_pcs: // ISO-3664 P2 ICC refence medium // qDebug("in slotVCpresetChanged case 0 source"); ! PCSSurroundCombo -> setCurrentItem( AVG_SURROUND); /* Average viewing conditions */ PCSYbSpinBox -> setValue (20.0); /* Grey world */ PCSLaSpinBox -> setValue (32.0); --- 393,397 ---- case iso3664p2_pcs: // ISO-3664 P2 ICC refence medium // qDebug("in slotVCpresetChanged case 0 source"); ! PCSSurroundCombo -> setCurrentIndex( AVG_SURROUND); /* Average viewing conditions */ PCSYbSpinBox -> setValue (20.0); /* Grey world */ PCSLaSpinBox -> setValue (32.0); *************** *** 398,402 **** case cie1161995: // CIE 116-1995 dE color difference metric // qDebug("in slotVCpresetChanged case 1 source"); ! PCSSurroundCombo -> setCurrentItem( AVG_SURROUND); /* Average viewing conditions */ PCSYbSpinBox -> setValue (18.0); /* Grey world */ PCSLaSpinBox -> setValue (64.0); /* Bright */ --- 399,403 ---- case cie1161995: // CIE 116-1995 dE color difference metric // qDebug("in slotVCpresetChanged case 1 source"); ! PCSSurroundCombo -> setCurrentIndex( AVG_SURROUND); /* Average viewing conditions */ PCSYbSpinBox -> setValue (18.0); /* Grey world */ PCSLaSpinBox -> setValue (64.0); /* Bright */ *************** *** 405,409 **** // ISO-3664 P1 Critical print evaluation environment // qDebug("in slotVCpresetChanged case 2 source"); ! PCSSurroundCombo -> setCurrentItem( AVG_SURROUND); /* Average viewing conditions */ PCSYbSpinBox -> setValue (20.0); /* Grey world */ PCSLaSpinBox -> setValue (127.0); /* Bright */ --- 406,410 ---- // ISO-3664 P1 Critical print evaluation environment // qDebug("in slotVCpresetChanged case 2 source"); ! PCSSurroundCombo -> setCurrentIndex( AVG_SURROUND); /* Average viewing conditions */ PCSYbSpinBox -> setValue (20.0); /* Grey world */ PCSLaSpinBox -> setValue (127.0); /* Bright */ *************** *** 411,415 **** case brightOutdoors: // Original scene - Bright Outdoors // qDebug("in slotVCpresetChanged case 8 source"); ! PCSSurroundCombo -> setCurrentItem( AVG_SURROUND); /* Average viewing conditions */ PCSYbSpinBox -> setValue (20.0); /* Grey world */ PCSLaSpinBox -> setValue (2000.0); /* Bright Outdoors */ --- 412,416 ---- case brightOutdoors: // Original scene - Bright Outdoors // qDebug("in slotVCpresetChanged case 8 source"); ! PCSSurroundCombo -> setCurrentIndex( AVG_SURROUND); /* Average viewing conditions */ PCSYbSpinBox -> setValue (20.0); /* Grey world */ PCSLaSpinBox -> setValue (2000.0); /* Bright Outdoors */ *************** *** 417,421 **** case cutSheet: // Cut Sheet Transparencies on a viewing box // qDebug("in slotVCpresetChanged case 9 source"); ! PCSSurroundCombo -> setCurrentItem( CUTSHEET_SURROUND); /* Cut sheet viewing conditions */ PCSYbSpinBox -> setValue (20.0); /* Grey world */ PCSLaSpinBox -> setValue (53.0); /* Dim, adapted to slide ? */ --- 418,422 ---- case cutSheet: // Cut Sheet Transparencies on a viewing box // qDebug("in slotVCpresetChanged case 9 source"); ! PCSSurroundCombo -> setCurrentIndex( CUTSHEET_SURROUND); /* Cut sheet viewing conditions */ PCSYbSpinBox -> setValue (20.0); /* Grey world */ PCSLaSpinBox -> setValue (53.0); /* Dim, adapted to slide ? */ *************** *** 423,427 **** case sRGB: // Monitor in darkened work environment sRGB // qDebug("in slotVCpresetChanged case 3 source"); ! PCSSurroundCombo -> setCurrentItem( DIM_SURROUND); /* Dim viewing conditions */ PCSYbSpinBox -> setValue (20.0); /* Grey world */ PCSLaSpinBox -> setValue (4.0); /* Darkened work environment */ --- 424,428 ---- case sRGB: // Monitor in darkened work environment sRGB // qDebug("in slotVCpresetChanged case 3 source"); ! PCSSurroundCombo -> setCurrentIndex( DIM_SURROUND); /* Dim viewing conditions */ PCSYbSpinBox -> setValue (20.0); /* Grey world */ PCSLaSpinBox -> setValue (4.0); /* Darkened work environment */ *************** *** 429,433 **** case sRGBannexD: // Monitor in typical work environment sRGB annex D // qDebug("in slotVCpresetChanged case 4 source"); ! PCSSurroundCombo -> setCurrentItem( AVG_SURROUND); /* Average viewing conditions */ PCSYbSpinBox -> setValue (20.0); /* Grey world */ PCSLaSpinBox -> setValue (22.0); /* Typical work environment */ --- 430,434 ---- case sRGBannexD: // Monitor in typical work environment sRGB annex D // qDebug("in slotVCpresetChanged case 4 source"); ! PCSSurroundCombo -> setCurrentIndex( AVG_SURROUND); /* Average viewing conditions */ PCSYbSpinBox -> setValue (20.0); /* Grey world */ PCSLaSpinBox -> setValue (22.0); /* Typical work environment */ *************** *** 435,439 **** case iso9241: // Monitor in bright work environment ISO 9241 // qDebug("in slotVCpresetChanged case 5 source"); ! PCSSurroundCombo -> setCurrentItem( AVG_SURROUND); /* Average viewing conditions */ PCSYbSpinBox -> setValue (20.0); /* Grey world */ PCSLaSpinBox -> setValue (32.0); /* Bright work environment */ --- 436,440 ---- case iso9241: // Monitor in bright work environment ISO 9241 // qDebug("in slotVCpresetChanged case 5 source"); ! PCSSurroundCombo -> setCurrentIndex( AVG_SURROUND); /* Average viewing conditions */ PCSYbSpinBox -> setValue (20.0); /* Grey world */ PCSLaSpinBox -> setValue (32.0); /* Bright work environment */ *************** *** 441,445 **** case projDim: // Projector in dim environment // qDebug("in slotVCpresetChanged case 6 source"); ! PCSSurroundCombo -> setCurrentItem( DIM_SURROUND); /* Dim viewing conditions */ PCSYbSpinBox -> setValue (20.0); /* Grey world */ PCSLaSpinBox -> setValue ( 10.0); /* Adaptation is from display */ --- 442,446 ---- case projDim: // Projector in dim environment // qDebug("in slotVCpresetChanged case 6 source"); ! PCSSurroundCombo -> setCurrentIndex( DIM_SURROUND); /* Dim viewing conditions */ PCSYbSpinBox -> setValue (20.0); /* Grey world */ PCSLaSpinBox -> setValue ( 10.0); /* Adaptation is from display */ *************** *** 447,451 **** case projDark: // Projector in dark environment // qDebug("in slotVCpresetChanged case 7 source"); ! PCSSurroundCombo -> setCurrentItem( DARK_SURROUND); /* Dark viewing conditions */ PCSYbSpinBox -> setValue (20.0); /* Grey world */ PCSLaSpinBox -> setValue (10.0); /* Adaptation is from display */ --- 448,452 ---- case projDark: // Projector in dark environment // qDebug("in slotVCpresetChanged case 7 source"); ! PCSSurroundCombo -> setCurrentIndex( DARK_SURROUND); /* Dark viewing conditions */ PCSYbSpinBox -> setValue (20.0); /* Grey world */ PCSLaSpinBox -> setValue (10.0); /* Adaptation is from display */ *************** *** 456,460 **** default: // qDebug("in slotVCpresetChanged case default"); ! PCSSurroundCombo -> setCurrentItem( AVG_SURROUND); /* Average viewing conditions */ PCSYbSpinBox -> setValue (20.0); /* Grey world */ PCSLaSpinBox -> setValue (32.0); /* Compromise brightness */ --- 457,461 ---- default: // qDebug("in slotVCpresetChanged case default"); ! PCSSurroundCombo -> setCurrentIndex( AVG_SURROUND); /* Average viewing conditions */ PCSYbSpinBox -> setValue (20.0); /* Grey world */ PCSLaSpinBox -> setValue (32.0); /* Compromise brightness */ Index: profileparms.cpp =================================================================== RCS file: /cvsroot/lprof/lprof/src/parmsqt/profileparms.cpp,v retrieving revision 1.64 retrieving revision 1.64.2.1 diff -C2 -d -r1.64 -r1.64.2.1 *** profileparms.cpp 18 May 2009 23:18:48 -0000 1.64 --- profileparms.cpp 1 Jul 2009 18:34:02 -0000 1.64.2.1 *************** *** 28,33 **** // ! #include <q3buttongroup.h> ! #include <q3groupbox.h> #include <qlabel.h> #include <qpushbutton.h> --- 28,33 ---- // ! //#include <q3buttongroup.h> ! //#include <q3groupbox.h> #include <qlabel.h> #include <qpushbutton.h> *************** *** 152,173 **** PCSVCcomboBox -> clear(); source_or_dest_VC_groupBox -> setTitle (tr("Assumed viewing conditions for the captured medium")); ! deviceVCcomboBox -> insertItem (tr(VCqStringValues[iso3664p2].toLocal8Bit()), 0); ! deviceVCcomboBox -> insertItem (tr(VCqStringValues[cie1161995].toLocal8Bit()), 1); ! deviceVCcomboBox -> insertItem (tr(VCqStringValues[iso3664p1].toLocal8Bit()), 2); ! deviceVCcomboBox -> insertItem (tr(VCqStringValues[brightOutdoors].toLocal8Bit()), 3); ! deviceVCcomboBox -> insertItem (tr(VCqStringValues[cutSheet].toLocal8Bit()), 4); ! deviceVCcomboBox -> insertItem (tr(VCqStringValues[userdef].toLocal8Bit()), 5); ! PCSVCcomboBox -> insertItem (tr(VCqStringValues[iso3664p2_pcs].toLocal8Bit()), 0); ! PCSVCcomboBox -> insertItem (tr(VCqStringValues[cie1161995].toLocal8Bit()), 1); ! PCSVCcomboBox -> insertItem (tr(VCqStringValues[iso3664p1].toLocal8Bit()), 2); ! PCSVCcomboBox -> insertItem (tr(VCqStringValues[sRGB].toLocal8Bit()), 3); ! PCSVCcomboBox -> insertItem (tr(VCqStringValues[sRGBannexD].toLocal8Bit()), 4); ! PCSVCcomboBox -> insertItem (tr(VCqStringValues[iso9241].toLocal8Bit()), 5); ! PCSVCcomboBox -> insertItem (tr(VCqStringValues[userdef].toLocal8Bit()), 6); } ProfileParms::ProfileParms(QWidget *parent ) ! : QDialog(parent, "", 0, Qt::WindowSystemMenuHint) { setupUi(this); --- 152,173 ---- PCSVCcomboBox -> clear(); source_or_dest_VC_groupBox -> setTitle (tr("Assumed viewing conditions for the captured medium")); ! deviceVCcomboBox -> insertItem (0,tr(VCqStringValues[iso3664p2].toLocal8Bit())); ! deviceVCcomboBox -> insertItem (1,tr(VCqStringValues[cie1161995].toLocal8Bit())); ! deviceVCcomboBox -> insertItem (2,tr(VCqStringValues[iso3664p1].toLocal8Bit())); ! deviceVCcomboBox -> insertItem (3,tr(VCqStringValues[brightOutdoors].toLocal8Bit())); ! deviceVCcomboBox -> insertItem (4,tr(VCqStringValues[cutSheet].toLocal8Bit())); ! deviceVCcomboBox -> insertItem (5,tr(VCqStringValues[userdef].toLocal8Bit())); ! PCSVCcomboBox -> insertItem (0,tr(VCqStringValues[iso3664p2_pcs].toLocal8Bit())); ! PCSVCcomboBox -> insertItem (1,tr(VCqStringValues[cie1161995].toLocal8Bit())); ! PCSVCcomboBox -> insertItem (2,tr(VCqStringValues[iso3664p1].toLocal8Bit())); ! PCSVCcomboBox -> insertItem (3,tr(VCqStringValues[sRGB].toLocal8Bit())); ! PCSVCcomboBox -> insertItem (4,tr(VCqStringValues[sRGBannexD].toLocal8Bit())); ! PCSVCcomboBox -> insertItem (5,tr(VCqStringValues[iso9241].toLocal8Bit())); ! PCSVCcomboBox -> insertItem (6,tr(VCqStringValues[userdef].toLocal8Bit())); } ProfileParms::ProfileParms(QWidget *parent ) ! : QDialog(parent, Qt::WindowSystemMenuHint) { setupUi(this); *************** *** 344,352 **** PCSYbSpinBox -> setValue(sys.hdr.PCS.Yb); PCSLaSpinBox -> setValue(sys.hdr.PCS.La); ! deviceSurroundCombo -> setCurrentItem(sys.hdr.device.surround); ! PCSSurroundCombo -> setCurrentItem(sys.hdr.PCS.surround); ! deviceVCcomboBox -> setCurrentItem(currItemFromIndex(sys.hdr.viewingConditionsPredefDevice, FALSE)); ! PCSVCcomboBox -> setCurrentItem(currItemFromIndex(sys.hdr.viewingConditionsPredefPCS, TRUE)); --- 344,352 ---- PCSYbSpinBox -> setValue(sys.hdr.PCS.Yb); PCSLaSpinBox -> setValue(sys.hdr.PCS.La); ! deviceSurroundCombo -> setCurrentIndex(sys.hdr.device.surround); ! PCSSurroundCombo -> setCurrentIndex(sys.hdr.PCS.surround); ! deviceVCcomboBox -> setCurrentIndex(currItemFromIndex(sys.hdr.viewingConditionsPredefDevice, FALSE)); ! PCSVCcomboBox -> setCurrentIndex(currItemFromIndex(sys.hdr.viewingConditionsPredefPCS, TRUE)); *************** *** 393,398 **** QString Buff; // sys.hdr.lUseCIECAM02 = CAMRadio -> isChecked(); ! sys.hdr.device.surround = deviceSurroundCombo -> currentItem(); ! sys.hdr.PCS.surround = PCSSurroundCombo -> currentItem(); sys.hdr.viewingConditionsPredefDevice = getCVindex (deviceVCcomboBox -> currentText()); sys.hdr.viewingConditionsPredefPCS = getCVindex (PCSVCcomboBox -> currentText()); --- 393,398 ---- QString Buff; // sys.hdr.lUseCIECAM02 = CAMRadio -> isChecked(); ! sys.hdr.device.surround = deviceSurroundCombo -> currentIndex(); ! sys.hdr.PCS.surround = PCSSurroundCombo -> currentIndex(); sys.hdr.viewingConditionsPredefDevice = getCVindex (deviceVCcomboBox -> currentText()); sys.hdr.viewingConditionsPredefPCS = getCVindex (PCSVCcomboBox -> currentText()); *************** *** 598,602 **** case iso3664p2: // ISO-3664 P2 Practical Reflection Print // qDebug("in slotVCpresetChanged case 0 source"); ! deviceSurroundCombo -> setCurrentItem( AVG_SURROUND); /* Average viewing conditions */ deviceYbSpinBox -> setValue (20.0); /* Grey world */ deviceLaSpinBox -> setValue (32.0); --- 598,602 ---- case iso3664p2: // ISO-3664 P2 Practical Reflection Print // qDebug("in slotVCpresetChanged case 0 source"); ! deviceSurroundCombo -> setCurrentIndex( AVG_SURROUND); /* Average viewing conditions */ deviceYbSpinBox -> setValue (20.0); /* Grey world */ deviceLaSpinBox -> setValue (32.0); *************** *** 604,608 **** case iso3664p2_pcs: // ISO-3664 P2 ICC refence medium // qDebug("in slotVCpresetChanged case 0 source"); ! deviceSurroundCombo -> setCurrentItem( AVG_SURROUND); /* Average viewing conditions */ deviceYbSpinBox -> setValue (20.0); /* Grey world */ deviceLaSpinBox -> setValue (32.0); --- 604,608 ---- case iso3664p2_pcs: // ISO-3664 P2 ICC refence medium // qDebug("in slotVCpresetChanged case 0 source"); ! deviceSurroundCombo -> setCurrentIndex( AVG_SURROUND); /* Average viewing conditions */ deviceYbSpinBox -> setValue (20.0); /* Grey world */ deviceLaSpinBox -> setValue (32.0); *************** *** 610,614 **** case cie1161995: // CIE 116-1995 dE color difference metric // qDebug("in slotVCpresetChanged case 1 source"); ! deviceSurroundCombo -> setCurrentItem( AVG_SURROUND); /* Average viewing conditions */ deviceYbSpinBox -> setValue (18.0); /* Grey world */ deviceLaSpinBox -> setValue (64.0); /* Bright */ --- 610,614 ---- case cie1161995: // CIE 116-1995 dE color difference metric // qDebug("in slotVCpresetChanged case 1 source"); ! deviceSurroundCombo -> setCurrentIndex( AVG_SURROUND); /* Average viewing conditions */ deviceYbSpinBox -> setValue (18.0); /* Grey world */ deviceLaSpinBox -> setValue (64.0); /* Bright */ *************** *** 617,621 **** // ISO-3664 P1 Critical print evaluation environment // qDebug("in slotVCpresetChanged case 2 source"); ! deviceSurroundCombo -> setCurrentItem( AVG_SURROUND); /* Average viewing conditions */ deviceYbSpinBox -> setValue (20.0); /* Grey world */ deviceLaSpinBox -> setValue (127.0); /* Bright */ --- 617,621 ---- // ISO-3664 P1 Critical print evaluation environment // qDebug("in slotVCpresetChanged case 2 source"); ! deviceSurroundCombo -> setCurrentIndex( AVG_SURROUND); /* Average viewing conditions */ deviceYbSpinBox -> setValue (20.0); /* Grey world */ deviceLaSpinBox -> setValue (127.0); /* Bright */ *************** *** 623,627 **** case brightOutdoors: // Original scene - Bright Outdoors // qDebug("in slotVCpresetChanged case 8 source"); ! deviceSurroundCombo -> setCurrentItem( AVG_SURROUND); /* Average viewing conditions */ deviceYbSpinBox -> setValue (20.0); /* Grey world */ deviceLaSpinBox -> setValue (2000.0); /* Bright Outdoors */ --- 623,627 ---- case brightOutdoors: // Original scene - Bright Outdoors // qDebug("in slotVCpresetChanged case 8 source"); ! deviceSurroundCombo -> setCurrentIndex( AVG_SURROUND); /* Average viewing conditions */ deviceYbSpinBox -> setValue (20.0); /* Grey world */ deviceLaSpinBox -> setValue (2000.0); /* Bright Outdoors */ *************** *** 629,633 **** case cutSheet: // Cut Sheet Transparencies on a viewing box // qDebug("in slotVCpresetChanged case 9 source"); ! deviceSurroundCombo -> setCurrentItem( CUTSHEET_SURROUND); /* Cut sheet viewing conditions */ deviceYbSpinBox -> setValue (20.0); /* Grey world */ deviceLaSpinBox -> setValue (53.0); /* Dim, adapted to slide ? */ --- 629,633 ---- case cutSheet: // Cut Sheet Transparencies on a viewing box // qDebug("in slotVCpresetChanged case 9 source"); ! deviceSurroundCombo -> setCurrentIndex( CUTSHEET_SURROUND); /* Cut sheet viewing conditions */ deviceYbSpinBox -> setValue (20.0); /* Grey world */ deviceLaSpinBox -> setValue (53.0); /* Dim, adapted to slide ? */ *************** *** 635,639 **** case sRGB: // Monitor in darkened work environment sRGB // qDebug("in slotVCpresetChanged case 3 source"); ! deviceSurroundCombo -> setCurrentItem( DIM_SURROUND); /* Dim viewing conditions */ deviceYbSpinBox -> setValue (20.0); /* Grey world */ deviceLaSpinBox -> setValue (4.0); /* Darkened work environment */ --- 635,639 ---- case sRGB: // Monitor in darkened work environment sRGB // qDebug("in slotVCpresetChanged case 3 source"); ! deviceSurroundCombo -> setCurrentIndex( DIM_SURROUND); /* Dim viewing conditions */ deviceYbSpinBox -> setValue (20.0); /* Grey world */ deviceLaSpinBox -> setValue (4.0); /* Darkened work environment */ *************** *** 641,645 **** case sRGBannexD: // Monitor in typical work environment sRGB annex D // qDebug("in slotVCpresetChanged case 4 source"); ! deviceSurroundCombo -> setCurrentItem( AVG_SURROUND); /* Average viewing conditions */ deviceYbSpinBox -> setValue (20.0); /* Grey world */ deviceLaSpinBox -> setValue (22.0); /* Typical work environment */ --- 641,645 ---- case sRGBannexD: // Monitor in typical work environment sRGB annex D // qDebug("in slotVCpresetChanged case 4 source"); ! deviceSurroundCombo -> setCurrentIndex( AVG_SURROUND); /* Average viewing conditions */ deviceYbSpinBox -> setValue (20.0); /* Grey world */ deviceLaSpinBox -> setValue (22.0); /* Typical work environment */ *************** *** 647,651 **** case iso9241: // Monitor in bright work environment ISO 9241 // qDebug("in slotVCpresetChanged case 5 source"); ! deviceSurroundCombo -> setCurrentItem( AVG_SURROUND); /* Average viewing conditions */ deviceYbSpinBox -> setValue (20.0); /* Grey world */ deviceLaSpinBox -> setValue (32.0); /* Bright work environment */ --- 647,651 ---- case iso9241: // Monitor in bright work environment ISO 9241 // qDebug("in slotVCpresetChanged case 5 source"); ! deviceSurroundCombo -> setCurrentIndex( AVG_SURROUND); /* Average viewing conditions */ deviceYbSpinBox -> setValue (20.0); /* Grey world */ deviceLaSpinBox -> setValue (32.0); /* Bright work environment */ *************** *** 653,657 **** case projDim: // Projector in dim environment // qDebug("in slotVCpresetChanged case 6 source"); ! deviceSurroundCombo -> setCurrentItem( DIM_SURROUND); /* Dim viewing conditions */ deviceYbSpinBox -> setValue (20.0); /* Grey world */ deviceLaSpinBox -> setValue ( 10.0); /* Adaptation is from display */ --- 653,657 ---- case projDim: // Projector in dim environment // qDebug("in slotVCpresetChanged case 6 source"); ! deviceSurroundCombo -> setCurrentIndex( DIM_SURROUND); /* Dim viewing conditions */ deviceYbSpinBox -> setValue (20.0); /* Grey world */ deviceLaSpinBox -> setValue ( 10.0); /* Adaptation is from display */ *************** *** 659,663 **** case projDark: // Projector in dark environment // qDebug("in slotVCpresetChanged case 7 source"); ! deviceSurroundCombo -> setCurrentItem( DARK_SURROUND); /* Dark viewing conditions */ deviceYbSpinBox -> setValue (20.0); /* Grey world */ deviceLaSpinBox -> setValue (10.0); /* Adaptation is from display */ --- 659,663 ---- case projDark: // Projector in dark environment // qDebug("in slotVCpresetChanged case 7 source"); ! deviceSurroundCombo -> setCurrentIndex( DARK_SURROUND); /* Dark viewing conditions */ deviceYbSpinBox -> setValue (20.0); /* Grey world */ deviceLaSpinBox -> setValue (10.0); /* Adaptation is from display */ *************** *** 668,672 **** default: // qDebug("in slotVCpresetChanged case default"); ! deviceSurroundCombo -> setCurrentItem( AVG_SURROUND); /* Average viewing conditions */ deviceYbSpinBox -> setValue (20.0); /* Grey world */ deviceLaSpinBox -> setValue (32.0); /* Compromise brightness */ --- 668,672 ---- default: // qDebug("in slotVCpresetChanged case default"); ! deviceSurroundCombo -> setCurrentIndex( AVG_SURROUND); /* Average viewing conditions */ deviceYbSpinBox -> setValue (20.0); /* Grey world */ deviceLaSpinBox -> setValue (32.0); /* Compromise brightness */ *************** *** 680,684 **** case iso3664p2: // ISO-3664 P2 Practical Reflection Print // qDebug("in slotVCpresetChanged case 0 source"); ! PCSSurroundCombo -> setCurrentItem( AVG_SURROUND); /* Average viewing conditions */ PCSYbSpinBox -> setValue (20.0); /* Grey world */ PCSLaSpinBox -> setValue (32.0); --- 680,684 ---- case iso3664p2: // ISO-3664 P2 Practical Reflection Print // qDebug("in slotVCpresetChanged case 0 source"); ! PCSSurroundCombo -> setCurrentIndex( AVG_SURROUND); /* Average viewing conditions */ PCSYbSpinBox -> setValue (20.0); /* Grey world */ PCSLaSpinBox -> setValue (32.0); *************** *** 686,690 **** case iso3664p2_pcs: // ISO-3664 P2 ICC refence medium // qDebug("in slotVCpresetChanged case 0 source"); ! PCSSurroundCombo -> setCurrentItem( AVG_SURROUND); /* Average viewing conditions */ PCSYbSpinBox -> setValue (20.0); /* Grey world */ PCSLaSpinBox -> setValue (32.0); --- 686,690 ---- case iso3664p2_pcs: // ISO-3664 P2 ICC refence medium // qDebug("in slotVCpresetChanged case 0 source"); ! PCSSurroundCombo -> setCurrentIndex( AVG_SURROUND); /* Average viewing conditions */ PCSYbSpinBox -> setValue (20.0); /* Grey world */ PCSLaSpinBox -> setValue (32.0); *************** *** 692,696 **** case cie1161995: // CIE 116-1995 dE color difference metric // qDebug("in slotVCpresetChanged case 1 source"); ! PCSSurroundCombo -> setCurrentItem( AVG_SURROUND); /* Average viewing conditions */ PCSYbSpinBox -> setValue (18.0); /* Grey world */ PCSLaSpinBox -> setValue (64.0); /* Bright */ --- 692,696 ---- case cie1161995: // CIE 116-1995 dE color difference metric // qDebug("in slotVCpresetChanged case 1 source"); ! PCSSurroundCombo -> setCurrentIndex( AVG_SURROUND); /* Average viewing conditions */ PCSYbSpinBox -> setValue (18.0); /* Grey world */ PCSLaSpinBox -> setValue (64.0); /* Bright */ *************** *** 699,703 **** // ISO-3664 P1 Critical print evaluation environment // qDebug("in slotVCpresetChanged case 2 source"); ! PCSSurroundCombo -> setCurrentItem( AVG_SURROUND); /* Average viewing conditions */ PCSYbSpinBox -> setValue (20.0); /* Grey world */ PCSLaSpinBox -> setValue (127.0); /* Bright */ --- 699,703 ---- // ISO-3664 P1 Critical print evaluation environment // qDebug("in slotVCpresetChanged case 2 source"); ! PCSSurroundCombo -> setCurrentIndex( AVG_SURROUND); /* Average viewing conditions */ PCSYbSpinBox -> setValue (20.0); /* Grey world */ PCSLaSpinBox -> setValue (127.0); /* Bright */ *************** *** 705,709 **** case brightOutdoors: // Original scene - Bright Outdoors // qDebug("in slotVCpresetChanged case 8 source"); ! PCSSurroundCombo -> setCurrentItem( AVG_SURROUND); /* Average viewing conditions */ PCSYbSpinBox -> setValue (20.0); /* Grey world */ PCSLaSpinBox -> setValue (2000.0); /* Bright Outdoors */ --- 705,709 ---- case brightOutdoors: // Original scene - Bright Outdoors // qDebug("in slotVCpresetChanged case 8 source"); ! PCSSurroundCombo -> setCurrentIndex( AVG_SURROUND); /* Average viewing conditions */ PCSYbSpinBox -> setValue (20.0); /* Grey world */ PCSLaSpinBox -> setValue (2000.0); /* Bright Outdoors */ *************** *** 711,715 **** case cutSheet: // Cut Sheet Transparencies on a viewing box // qDebug("in slotVCpresetChanged case 9 source"); ! PCSSurroundCombo -> setCurrentItem( CUTSHEET_SURROUND); /* Cut sheet viewing conditions */ PCSYbSpinBox -> setValue (20.0); /* Grey world */ PCSLaSpinBox -> setValue (53.0); /* Dim, adapted to slide ? */ --- 711,715 ---- case cutSheet: // Cut Sheet Transparencies on a viewing box // qDebug("in slotVCpresetChanged case 9 source"); ! PCSSurroundCombo -> setCurrentIndex( CUTSHEET_SURROUND); /* Cut sheet viewing conditions */ PCSYbSpinBox -> setValue (20.0); /* Grey world */ PCSLaSpinBox -> setValue (53.0); /* Dim, adapted to slide ? */ *************** *** 717,721 **** case sRGB: // Monitor in darkened work environment sRGB // qDebug("in slotVCpresetChanged case 3 source"); ! PCSSurroundCombo -> setCurrentItem( DIM_SURROUND); /* Dim viewing conditions */ PCSYbSpinBox -> setValue (20.0); /* Grey world */ PCSLaSpinBox -> setValue (4.0); /* Darkened work environment */ --- 717,721 ---- case sRGB: // Monitor in darkened work environment sRGB // qDebug("in slotVCpresetChanged case 3 source"); ! PCSSurroundCombo -> setCurrentIndex( DIM_SURROUND); /* Dim viewing conditions */ PCSYbSpinBox -> setValue (20.0); /* Grey world */ PCSLaSpinBox -> setValue (4.0); /* Darkened work environment */ *************** *** 723,727 **** case sRGBannexD: // Monitor in typical work environment sRGB annex D // qDebug("in slotVCpresetChanged case 4 source"); ! PCSSurroundCombo -> setCurrentItem( AVG_SURROUND); /* Average viewing conditions */ PCSYbSpinBox -> setValue (20.0); /* Grey world */ PCSLaSpinBox -> setValue (22.0); /* Typical work environment */ --- 723,727 ---- case sRGBannexD: // Monitor in typical work environment sRGB annex D // qDebug("in slotVCpresetChanged case 4 source"); ! PCSSurroundCombo -> setCurrentIndex( AVG_SURROUND); /* Average viewing conditions */ PCSYbSpinBox -> setValue (20.0); /* Grey world */ PCSLaSpinBox -> setValue (22.0); /* Typical work environment */ *************** *** 729,733 **** case iso9241: // Monitor in bright work environment ISO 9241 // qDebug("in slotVCpresetChanged case 5 source"); ! PCSSurroundCombo -> setCurrentItem( AVG_SURROUND); /* Average viewing conditions */ PCSYbSpinBox -> setValue (20.0); /* Grey world */ PCSLaSpinBox -> setValue (32.0); /* Bright work environment */ --- 729,733 ---- case iso9241: // Monitor in bright work environment ISO 9241 // qDebug("in slotVCpresetChanged case 5 source"); ! PCSSurroundCombo -> setCurrentIndex( AVG_SURROUND); /* Average viewing conditions */ PCSYbSpinBox -> setValue (20.0); /* Grey world */ PCSLaSpinBox -> setValue (32.0); /* Bright work environment */ *************** *** 735,739 **** case projDim: // Projector in dim environment // qDebug("in slotVCpresetChanged case 6 source"); ! PCSSurroundCombo -> setCurrentItem( DIM_SURROUND); /* Dim viewing conditions */ PCSYbSpinBox -> setValue (20.0); /* Grey world */ PCSLaSpinBox -> setValue ( 10.0); /* Adaptation is from display */ --- 735,739 ---- case projDim: // Projector in dim environment // qDebug("in slotVCpresetChanged case 6 source"); ! PCSSurroundCombo -> setCurrentIndex( DIM_SURROUND); /* Dim viewing conditions */ PCSYbSpinBox -> setValue (20.0); /* Grey world */ PCSLaSpinBox -> setValue ( 10.0); /* Adaptation is from display */ *************** *** 741,745 **** case projDark: // Projector in dark environment // qDebug("in slotVCpresetChanged case 7 source"); ! PCSSurroundCombo -> setCurrentItem( DARK_SURROUND); /* Dark viewing conditions */ PCSYbSpinBox -> setValue (20.0); /* Grey world */ PCSLaSpinBox -> setValue (10.0); /* Adaptation is from display */ --- 741,745 ---- case projDark: // Projector in dark environment // qDebug("in slotVCpresetChanged case 7 source"); ! PCSSurroundCombo -> setCurrentIndex( DARK_SURROUND); /* Dark viewing conditions */ PCSYbSpinBox -> setValue (20.0); /* Grey world */ PCSLaSpinBox -> setValue (10.0); /* Adaptation is from display */ *************** *** 750,754 **** default: // qDebug("in slotVCpresetChanged case default"); ! PCSSurroundCombo -> setCurrentItem( AVG_SURROUND); /* Average viewing conditions */ PCSYbSpinBox -> setValue (20.0); /* Grey world */ PCSLaSpinBox -> setValue (32.0); /* Compromise brightness */ --- 750,754 ---- default: // qDebug("in slotVCpresetChanged case default"); ! PCSSurroundCombo -> setCurrentIndex( AVG_SURROUND); /* Average viewing conditions */ PCSYbSpinBox -> setValue (20.0); /* Grey world */ PCSLaSpinBox -> setValue (32.0); /* Compromise brightness */ |
|
From: Amit K. <ami...@us...> - 2009-07-01 18:34:12
|
Update of /cvsroot/lprof/lprof/src/libqtlcmswidgets In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv1838/libqtlcmswidgets Modified Files: Tag: GSoC-2009 qtlcmswidgets.cpp Log Message: |
44 messages has been excluded from this view by a project administrator.
