lprof-devel Mailing List for LProf open source ICC profiler (Page 3)
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-01 18:34:09
|
Update of /cvsroot/lprof/lprof/src/lprofqt In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv1838/lprofqt Modified Files: Tag: GSoC-2009 config.cpp griditem.cpp imageitem.cpp interfaces.cpp lprofmain-priv.cpp lprofmain-priv.h lprofmain.cpp lprofmain.h lprofmainbase.ui main.cpp slots.cpp Log Message: Index: main.cpp =================================================================== RCS file: /cvsroot/lprof/lprof/src/lprofqt/main.cpp,v retrieving revision 1.43.2.1 retrieving revision 1.43.2.2 diff -C2 -d -r1.43.2.1 -r1.43.2.2 *** main.cpp 30 Jun 2009 00:00:09 -0000 1.43.2.1 --- main.cpp 1 Jul 2009 18:34:02 -0000 1.43.2.2 *************** *** 126,130 **** QTranslator translator( 0 ); // QString::fromLocal8Bit translations = ":/translations/lprof_" + (QString::fromLocal8Bit) QTextCodec::locale(); ! translator.load( QString::fromLocal8Bit("lprof_") + QString::fromLocal8Bit(QTextCodec::locale()), QString::fromLocal8Bit(":/") ); lprofApp -> installTranslator( &translator ); --- 126,132 ---- 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 ); Index: slots.cpp =================================================================== RCS file: /cvsroot/lprof/lprof/src/lprofqt/slots.cpp,v retrieving revision 1.5.2.3 retrieving revision 1.5.2.4 diff -C2 -d -r1.5.2.3 -r1.5.2.4 *** slots.cpp 30 Jun 2009 00:00:09 -0000 1.5.2.3 --- slots.cpp 1 Jul 2009 18:34:02 -0000 1.5.2.4 *************** *** 51,55 **** #include <QTranslator> - #include <q3buttongroup.h> #include <qradiobutton.h> #include <qpushbutton.h> --- 51,54 ---- *************** *** 57,60 **** --- 56,60 ---- #include <QFile> #include <QFileDialog> + #include <QButtonGroup> #include "vigra/imageiterator.hxx" *************** *** 109,113 **** // qDebug("lprofMain::slotLoad"); zeroProgressBars(); ! QString dir = lprofSettings -> value(QString::fromLocal8Bit("/LPROF/Files/last_load_dir"), QDir::homeDirPath()).toString(); fn = QFileDialog::getOpenFileName(this, tr("Select target image"), dir, tr("Image files (*.gif *.png *.jpg *.bmp *.pbm *.pgm *.pnm *.sun *.tif *.tiff *.viff *.GIF *.PNG *.JPG *.BMP *.PBM *.PGM *.PNM *.SUN *.TIF *.TIFF *.VIFF)\nAll files (*.*)")); --- 109,113 ---- // qDebug("lprofMain::slotLoad"); zeroProgressBars(); ! QString dir = lprofSettings -> value(QString::fromLocal8Bit("/LPROF/Files/last_load_dir"), QDir::homePath()).toString(); fn = QFileDialog::getOpenFileName(this, tr("Select target image"), dir, tr("Image files (*.gif *.png *.jpg *.bmp *.pbm *.pgm *.pnm *.sun *.tif *.tiff *.viff *.GIF *.PNG *.JPG *.BMP *.PBM *.PGM *.PNM *.SUN *.TIF *.TIFF *.VIFF)\nAll files (*.*)")); *************** *** 115,119 **** if (!fn.isNull()) // return; { ! lprofSettings -> setValue(QString::fromLocal8Bit("/LPROF/Files/last_load_dir"), fn.left(fn.findRev(QString::fromLocal8Bit("/")))); FigEditor->clear(); --- 115,119 ---- if (!fn.isNull()) // return; { ! lprofSettings -> setValue(QString::fromLocal8Bit("/LPROF/Files/last_load_dir"), fn.left(fn.lastIndexOf(QString::fromLocal8Bit("/")))); FigEditor->clear(); *************** *** 121,125 **** CurrentTemplate = QString::fromLocal8Bit(""); // if ui->ProofToggle isOn turn it off ! if (ui->ProofToggle -> isOn()) ui->ProofToggle -> toggle(); TheImage = new ImageItem(fn, ui->MonitorProfileSelector ->getFilename(), --- 121,125 ---- CurrentTemplate = QString::fromLocal8Bit(""); // if ui->ProofToggle isOn turn it off ! if (ui->ProofToggle -> isChecked()) ui->ProofToggle ->toggle(); TheImage = new ImageItem(fn, ui->MonitorProfileSelector ->getFilename(), *************** *** 135,140 **** if (TheImage) { ! intent = ui->ComboBoxIntent -> currentItem(); ! TheImage -> lProof = ui->ProofToggle -> isOn(); TheImage -> Reload(fn, ui->MonitorProfileSelector ->getFilename(), --- 135,140 ---- if (TheImage) { ! intent = ui->ComboBoxIntent -> currentIndex(); ! TheImage -> lProof = ui->ProofToggle -> isChecked(); TheImage -> Reload(fn, ui->MonitorProfileSelector ->getFilename(), *************** *** 214,221 **** { // qDebug(QString::fromLocal8Bit("tabChanged")); ! sys.hdr.ProfilerTab = ui->TabProfiler -> currentPageIndex(); setData(last_tab); ! last_tab = ui->TabProfiler -> currentPageIndex(); if (last_tab == 0) Console = ui->ProgressConsole; --- 214,221 ---- { // qDebug(QString::fromLocal8Bit("tabChanged")); ! sys.hdr.ProfilerTab = ui->TabProfiler -> currentIndex(); setData(last_tab); ! last_tab = ui->TabProfiler -> currentIndex(); if (last_tab == 0) Console = ui->ProgressConsole; *************** *** 249,254 **** // qDebug(QString::fromLocal8Bit("OutputFileNameChangedMon")); ! profile = ui->OutputFileEdit_Mon -> text().mid(ui->OutputFileEdit_Mon -> text().findRev(QString::fromLocal8Bit("/")) + 1, ! ui->OutputFileEdit_Mon -> text().length() - ui->OutputFileEdit_Mon -> text().findRev(QString::fromLocal8Bit("/")) - 1); ok = lprofSettings->contains(QString::fromLocal8Bit("/LPROF/profile-") + profile + QString::fromLocal8Bit("/Files/MON_OUTPUT_PROFILE")); temp = lprofSettings->value(QString::fromLocal8Bit("/LPROF/profile-") + profile + QString::fromLocal8Bit("/Files/MON_OUTPUT_PROFILE"), QVariant(QString::null)).toString(); --- 249,254 ---- // qDebug(QString::fromLocal8Bit("OutputFileNameChangedMon")); ! profile = ui->OutputFileEdit_Mon -> text().mid(ui->OutputFileEdit_Mon -> text().lastIndexOf(QString::fromLocal8Bit("/")) + 1, ! ui->OutputFileEdit_Mon -> text().length() - ui->OutputFileEdit_Mon -> text().lastIndexOf(QString::fromLocal8Bit("/")) - 1); ok = lprofSettings->contains(QString::fromLocal8Bit("/LPROF/profile-") + profile + QString::fromLocal8Bit("/Files/MON_OUTPUT_PROFILE")); temp = lprofSettings->value(QString::fromLocal8Bit("/LPROF/profile-") + profile + QString::fromLocal8Bit("/Files/MON_OUTPUT_PROFILE"), QVariant(QString::null)).toString(); *************** *** 323,328 **** // qDebug("lprofMain::OutputFileNameChanged"); ! profile = ui->OutputFileEdit -> text().mid(ui->OutputFileEdit -> text().findRev(QString::fromLocal8Bit("/")) + 1, ! ui->OutputFileEdit -> text().length() - ui->OutputFileEdit -> text().findRev(QString::fromLocal8Bit("/")) - 1); ok=lprofSettings->contains(QString::fromLocal8Bit("/LPROF/profile-") + profile + QString::fromLocal8Bit("/Files/OUTPUT_PROFILE")); --- 323,328 ---- // qDebug("lprofMain::OutputFileNameChanged"); ! profile = ui->OutputFileEdit -> text().mid(ui->OutputFileEdit -> text().lastIndexOf(QString::fromLocal8Bit("/")) + 1, ! ui->OutputFileEdit -> text().length() - ui->OutputFileEdit -> text().lastIndexOf(QString::fromLocal8Bit("/")) - 1); ok=lprofSettings->contains(QString::fromLocal8Bit("/LPROF/profile-") + profile + QString::fromLocal8Bit("/Files/OUTPUT_PROFILE")); *************** *** 389,393 **** CurrentTemplate = QString::fromLocal8Bit(""); // if ProofTogle isON turn it off. ! if (ui->ProofToggle -> isOn()) ui->ProofToggle -> toggle(); TheImage = new ImageItem(fn, ui->MonitorProfileSelector ->getFilename(), ui->InputProfileSelector->getFilename(), --- 389,393 ---- CurrentTemplate = QString::fromLocal8Bit(""); // if ProofTogle isON turn it off. ! if (ui->ProofToggle -> isChecked()) ui->ProofToggle -> toggle(); TheImage = new ImageItem(fn, ui->MonitorProfileSelector ->getFilename(), ui->InputProfileSelector->getFilename(), *************** *** 433,437 **** // and decide if the GoButton should be enabled zeroProgressBars(); ! switch (ui->TabProfiler -> currentPageIndex()) { case 0: --- 433,437 ---- // and decide if the GoButton should be enabled zeroProgressBars(); ! switch (ui->TabProfiler -> currentIndex()) { case 0: *************** *** 462,467 **** SetGoButton_2(tr("You need to enter monitor values."), FALSE); } ! else if (ui->RadioAccurate -> isOn()) ! if (ui->radioButtonCandMFile -> isOn()) { if (ui->MonMeasurementSheet->getFilename() == QString::fromLocal8Bit("")) --- 462,467 ---- SetGoButton_2(tr("You need to enter monitor values."), FALSE); } ! else if (ui->RadioAccurate -> isChecked()) ! if (ui->radioButtonCandMFile -> isChecked()) { if (ui->MonMeasurementSheet->getFilename() == QString::fromLocal8Bit("")) *************** *** 495,499 **** QString fn; // qDebug("lprofMain::Go_button_clicked"); ! switch (ui->TabProfiler -> currentPageIndex()) { --- 495,499 ---- QString fn; // qDebug("lprofMain::Go_button_clicked"); ! switch (ui->TabProfiler -> currentIndex()) { *************** *** 536,540 **** if (TargetFile == QString::null) return; ! LCMSHANDLE hIT8 = cmsxIT8LoadFromFile(TargetFile.local8Bit()); if (hIT8 == NULL) return; --- 536,540 ---- if (TargetFile == QString::null) return; ! LCMSHANDLE hIT8 = cmsxIT8LoadFromFile(TargetFile.toLocal8Bit()); if (hIT8 == NULL) return; *************** *** 833,853 **** ui->textEditProfileID->moveCursor(QTextCursor::Down,QTextCursor::MoveAnchor); ui->textEditProfileID->moveCursor(QTextCursor::EndOfLine,QTextCursor::MoveAnchor); ! ui->textEditProfileID->insert(QString::fromLocal8Bit(sys.hdr.OutputProfileFile)); ui->textEditProfileID->append(tr("Description: ")); ui->textEditProfileID->moveCursor(QTextCursor::Down,QTextCursor::MoveAnchor); ui->textEditProfileID->moveCursor(QTextCursor::EndOfLine,QTextCursor::MoveAnchor); ! ui->textEditProfileID->insert(QString::fromLocal8Bit(sys.hdr.Description)); ui->textEditProfileID->append(tr("Moel: ")); ui->textEditProfileID->moveCursor(QTextCursor::Down,QTextCursor::MoveAnchor); ui->textEditProfileID->moveCursor(QTextCursor::EndOfLine,QTextCursor::MoveAnchor); ! ui->textEditProfileID->insert(QString::fromLocal8Bit(sys.hdr.Model)); ui->textEditProfileID->append(tr("Manufacturer: ")); ui->textEditProfileID->moveCursor(QTextCursor::Down,QTextCursor::MoveAnchor); ui->textEditProfileID->moveCursor(QTextCursor::EndOfLine,QTextCursor::MoveAnchor); ! ui->textEditProfileID->insert(QString::fromLocal8Bit(sys.hdr.Manufacturer)); ui->textEditProfileID->append(tr("Copyright: ")); ui->textEditProfileID->moveCursor(QTextCursor::Down,QTextCursor::MoveAnchor); ui->textEditProfileID->moveCursor(QTextCursor::EndOfLine,QTextCursor::MoveAnchor); ! ui->textEditProfileID->insert(QString::fromLocal8Bit(sys.hdr.Copyright)); } if (sys.hdr.ProfilerTab == 1) // monitor profiler --- 833,853 ---- ui->textEditProfileID->moveCursor(QTextCursor::Down,QTextCursor::MoveAnchor); ui->textEditProfileID->moveCursor(QTextCursor::EndOfLine,QTextCursor::MoveAnchor); ! ui->textEditProfileID->insertPlainText(QString::fromLocal8Bit(sys.hdr.OutputProfileFile)); ui->textEditProfileID->append(tr("Description: ")); ui->textEditProfileID->moveCursor(QTextCursor::Down,QTextCursor::MoveAnchor); ui->textEditProfileID->moveCursor(QTextCursor::EndOfLine,QTextCursor::MoveAnchor); ! ui->textEditProfileID->insertPlainText(QString::fromLocal8Bit(sys.hdr.Description)); ui->textEditProfileID->append(tr("Moel: ")); ui->textEditProfileID->moveCursor(QTextCursor::Down,QTextCursor::MoveAnchor); ui->textEditProfileID->moveCursor(QTextCursor::EndOfLine,QTextCursor::MoveAnchor); ! ui->textEditProfileID->insertPlainText(QString::fromLocal8Bit(sys.hdr.Model)); ui->textEditProfileID->append(tr("Manufacturer: ")); ui->textEditProfileID->moveCursor(QTextCursor::Down,QTextCursor::MoveAnchor); ui->textEditProfileID->moveCursor(QTextCursor::EndOfLine,QTextCursor::MoveAnchor); ! ui->textEditProfileID->insertPlainText(QString::fromLocal8Bit(sys.hdr.Manufacturer)); ui->textEditProfileID->append(tr("Copyright: ")); ui->textEditProfileID->moveCursor(QTextCursor::Down,QTextCursor::MoveAnchor); ui->textEditProfileID->moveCursor(QTextCursor::EndOfLine,QTextCursor::MoveAnchor); ! ui->textEditProfileID->insertPlainText(QString::fromLocal8Bit(sys.hdr.Copyright)); } if (sys.hdr.ProfilerTab == 1) // monitor profiler *************** *** 856,876 **** ui->textEditProfileID_mon->moveCursor(QTextCursor::Down,QTextCursor::MoveAnchor); ui->textEditProfileID_mon->moveCursor(QTextCursor::EndOfLine,QTextCursor::MoveAnchor); ! ui->textEditProfileID_mon->insert(QString::fromLocal8Bit(sys.hdr.mon_profile_file_name)); ui->textEditProfileID_mon->append(tr("Description: ")); ui->textEditProfileID_mon->moveCursor(QTextCursor::Down,QTextCursor::MoveAnchor); ui->textEditProfileID_mon->moveCursor(QTextCursor::EndOfLine,QTextCursor::MoveAnchor); ! ui->textEditProfileID_mon->insert(QString::fromLocal8Bit(sys.hdr.Description)); ui->textEditProfileID_mon->append(tr("Model: ")); ui->textEditProfileID_mon->moveCursor(QTextCursor::Down,QTextCursor::MoveAnchor); ui->textEditProfileID_mon->moveCursor(QTextCursor::EndOfLine,QTextCursor::MoveAnchor); ! ui->textEditProfileID_mon->insert(QString::fromLocal8Bit(sys.hdr.Model)); ui->textEditProfileID_mon->append(tr("Manufacturer: ")); ui->textEditProfileID_mon->moveCursor(QTextCursor::Down,QTextCursor::MoveAnchor); ui->textEditProfileID_mon->moveCursor(QTextCursor::EndOfLine,QTextCursor::MoveAnchor); ! ui->textEditProfileID_mon->insert(QString::fromLocal8Bit(sys.hdr.Manufacturer)); ui->textEditProfileID_mon->append(tr("Copyright: ")); ui->textEditProfileID_mon->moveCursor(QTextCursor::Down,QTextCursor::MoveAnchor); ui->textEditProfileID_mon->moveCursor(QTextCursor::EndOfLine,QTextCursor::MoveAnchor); ! ui->textEditProfileID_mon->insert(QString::fromLocal8Bit(sys.hdr.Copyright)); } } --- 856,876 ---- ui->textEditProfileID_mon->moveCursor(QTextCursor::Down,QTextCursor::MoveAnchor); ui->textEditProfileID_mon->moveCursor(QTextCursor::EndOfLine,QTextCursor::MoveAnchor); ! ui->textEditProfileID_mon->insertPlainText(QString::fromLocal8Bit(sys.hdr.mon_profile_file_name)); ui->textEditProfileID_mon->append(tr("Description: ")); ui->textEditProfileID_mon->moveCursor(QTextCursor::Down,QTextCursor::MoveAnchor); ui->textEditProfileID_mon->moveCursor(QTextCursor::EndOfLine,QTextCursor::MoveAnchor); ! ui->textEditProfileID_mon->insertPlainText(QString::fromLocal8Bit(sys.hdr.Description)); ui->textEditProfileID_mon->append(tr("Model: ")); ui->textEditProfileID_mon->moveCursor(QTextCursor::Down,QTextCursor::MoveAnchor); ui->textEditProfileID_mon->moveCursor(QTextCursor::EndOfLine,QTextCursor::MoveAnchor); ! ui->textEditProfileID_mon->insertPlainText(QString::fromLocal8Bit(sys.hdr.Model)); ui->textEditProfileID_mon->append(tr("Manufacturer: ")); ui->textEditProfileID_mon->moveCursor(QTextCursor::Down,QTextCursor::MoveAnchor); ui->textEditProfileID_mon->moveCursor(QTextCursor::EndOfLine,QTextCursor::MoveAnchor); ! ui->textEditProfileID_mon->insertPlainText(QString::fromLocal8Bit(sys.hdr.Manufacturer)); ui->textEditProfileID_mon->append(tr("Copyright: ")); ui->textEditProfileID_mon->moveCursor(QTextCursor::Down,QTextCursor::MoveAnchor); ui->textEditProfileID_mon->moveCursor(QTextCursor::EndOfLine,QTextCursor::MoveAnchor); ! ui->textEditProfileID_mon->insertPlainText(QString::fromLocal8Bit(sys.hdr.Copyright)); } } *************** *** 919,923 **** Mon_temp_cal = QString::fromLocal8Bit(sys.hdr.MonCalibrationSheet); ! switch (lprofMain::ui->TabProfiler -> currentPageIndex()) { case 0: break; --- 919,923 ---- Mon_temp_cal = QString::fromLocal8Bit(sys.hdr.MonCalibrationSheet); ! switch (lprofMain::ui->TabProfiler -> currentIndex()) { case 0: break; *************** *** 953,957 **** profID.exec(); ! switch (lprofMain::ui->TabProfiler -> currentPageIndex()) { case 0: --- 953,957 ---- profID.exec(); ! switch (lprofMain::ui->TabProfiler -> currentIndex()) { case 0: *************** *** 972,980 **** { // qDebug("lprofMain::ProfileParmsbutton"); ! if (ui->TabProfiler -> currentPageIndex() == 0) { // camera/scanner profile parms emit showProfileParms(); } ! else if (ui->TabProfiler -> currentPageIndex() == 1) { // display profile parms ProfileParmsMon ParmsMon(this); --- 972,980 ---- { // qDebug("lprofMain::ProfileParmsbutton"); ! if (ui->TabProfiler -> currentIndex() == 0) { // camera/scanner profile parms emit showProfileParms(); } ! else if (ui->TabProfiler -> currentIndex() == 1) { // display profile parms ProfileParmsMon ParmsMon(this); *************** *** 1162,1167 **** void lprofMain::slotMeasureTypeChanged() { ! if (ui->RadioAccurate -> isOn()) ! if (ui->radioButtonCandM -> isOn()) { ui->frameIT8Selectors -> setEnabled(FALSE); --- 1162,1167 ---- void lprofMain::slotMeasureTypeChanged() { ! if (ui->RadioAccurate -> isChecked()) ! if (ui->radioButtonCandM -> isChecked()) { ui->frameIT8Selectors -> setEnabled(FALSE); Index: imageitem.cpp =================================================================== RCS file: /cvsroot/lprof/lprof/src/lprofqt/imageitem.cpp,v retrieving revision 1.4.2.5 retrieving revision 1.4.2.6 diff -C2 -d -r1.4.2.5 -r1.4.2.6 *** imageitem.cpp 30 Jun 2009 00:00:09 -0000 1.4.2.5 --- imageitem.cpp 1 Jul 2009 18:34:02 -0000 1.4.2.6 *************** *** 74,79 **** cmsHPROFILE hIn, hOut; qDebug("about to call lcms"); ! hIn = cmsOpenProfileFromFile(InputProfile.local8Bit(), "r"); ! hOut = cmsOpenProfileFromFile(OutputProfile.local8Bit(), "r"); qDebug("back from lcms"); --- 74,79 ---- cmsHPROFILE hIn, hOut; qDebug("about to call lcms"); ! hIn = cmsOpenProfileFromFile(InputProfile.toLocal8Bit(), "r"); ! hOut = cmsOpenProfileFromFile(OutputProfile.toLocal8Bit(), "r"); qDebug("back from lcms"); *************** *** 138,142 **** if (ImageFile == QString::null) return; // make sure there is a file name if (!QFile::exists(ImageFile)) return; ! strcpy(file, ImageFile.local8Bit()); // check to see if the file name point to a valid image file --- 138,142 ---- if (ImageFile == QString::null) return; // make sure there is a file name if (!QFile::exists(ImageFile)) return; ! strcpy(file, ImageFile.toLocal8Bit()); // check to see if the file name point to a valid image file *************** *** 181,188 **** vigra::DRGBImage::Iterator point=in.upperLeft(); ! if (! image.create (image_data->width(), ! image_data->height(), 32, 0, ! QImage::IgnoreEndian)) ! qDebug( "image create failed"); // should never happen for (int i=0; i < image_data->height(); i++) --- 181,185 ---- vigra::DRGBImage::Iterator point=in.upperLeft(); ! image=QImage(image_data->width(),image_data->height(),QImage::Format_ARGB32); for (int i=0; i < image_data->height(); i++) *************** *** 259,263 **** } ! QImage scaled = image.smoothScale(canvas->width(), canvas->height()); setRect(0, 0, scaled.width(), scaled.width()); --- 256,260 ---- } ! QImage scaled = image.scaled(canvas->width(), canvas->height(),Qt::IgnoreAspectRatio,Qt::SmoothTransformation); setRect(0, 0, scaled.width(), scaled.width()); *************** *** 265,269 **** sy = (double) image.height() / scaled.height(); ! pixmap.convertFromImage(scaled); if (lProof) --- 262,266 ---- sy = (double) image.height() / scaled.height(); ! pixmap = QPixmap::fromImage(scaled); if (lProof) *************** *** 280,285 **** } ! QImage pscaled = image.smoothScale(canvas->width(), canvas->height()); ! proof.convertFromImage(pscaled); setPos(0,0); --- 277,282 ---- } ! QImage pscaled = image.scaled(canvas->width(), canvas->height(),Qt::IgnoreAspectRatio,Qt::SmoothTransformation); ! proof=QPixmap::fromImage(pscaled); setPos(0,0); Index: lprofmain-priv.h =================================================================== RCS file: /cvsroot/lprof/lprof/src/lprofqt/lprofmain-priv.h,v retrieving revision 1.6.2.3 retrieving revision 1.6.2.4 diff -C2 -d -r1.6.2.3 -r1.6.2.4 *** lprofmain-priv.h 30 Jun 2009 00:00:09 -0000 1.6.2.3 --- lprofmain-priv.h 1 Jul 2009 18:34:02 -0000 1.6.2.4 *************** *** 134,139 **** // extern QSettings* lprofSettings; - //extern Q3UrlOperator urlOpTempFile; - extern int copyNumTempFile; --- 134,137 ---- Index: lprofmain.cpp =================================================================== RCS file: /cvsroot/lprof/lprof/src/lprofqt/lprofmain.cpp,v retrieving revision 1.188.2.6 retrieving revision 1.188.2.7 diff -C2 -d -r1.188.2.6 -r1.188.2.7 *** lprofmain.cpp 30 Jun 2009 00:00:09 -0000 1.188.2.6 --- lprofmain.cpp 1 Jul 2009 18:34:02 -0000 1.188.2.7 *************** *** 1098,1103 **** connect(ui->TargetSelector, SIGNAL(valueChanged()), this, SLOT(safeFarmeChanged())); - // connect( &urlOpTempFile, SIGNAL( finished( Q3NetworkOperation *) ), this, SLOT( templateFileCopied( Q3NetworkOperation * ) ) ); - connect(ui->MonMeasurementSheet, SIGNAL(valueChanged()), this, SLOT(slotChangeStrategy())); connect(ui->MonCalibrationSheet, SIGNAL(valueChanged()), this, SLOT(slotChangeStrategy())); --- 1098,1101 ---- Index: lprofmain-priv.cpp =================================================================== RCS file: /cvsroot/lprof/lprof/src/lprofqt/lprofmain-priv.cpp,v retrieving revision 1.4.2.3 retrieving revision 1.4.2.4 diff -C2 -d -r1.4.2.3 -r1.4.2.4 *** lprofmain-priv.cpp 30 Jun 2009 00:00:09 -0000 1.4.2.3 --- lprofmain-priv.cpp 1 Jul 2009 18:34:02 -0000 1.4.2.4 *************** *** 61,65 **** // QSettings* lprofSettings; - //Q3UrlOperator urlOpTempFile; int copyNumTempFile = 0; --- 61,64 ---- Index: griditem.cpp =================================================================== RCS file: /cvsroot/lprof/lprof/src/lprofqt/griditem.cpp,v retrieving revision 1.4.2.3 retrieving revision 1.4.2.4 diff -C2 -d -r1.4.2.3 -r1.4.2.4 *** griditem.cpp 23 Jun 2009 19:30:36 -0000 1.4.2.3 --- griditem.cpp 1 Jul 2009 18:34:02 -0000 1.4.2.4 *************** *** 47,51 **** setBrush( Qt::NoBrush) ; ! LCMSHANDLE hIT8 = cmsxIT8LoadFromFile(Template.local8Bit()); if (hIT8) --- 47,51 ---- setBrush( Qt::NoBrush) ; ! LCMSHANDLE hIT8 = cmsxIT8LoadFromFile(Template.toLocal8Bit()); if (hIT8) *************** *** 103,107 **** int translateY = OurViewport.y(); ! Scaled.moveBy(translateX, translateY); Frame = Scaled; --- 103,107 ---- int translateY = OurViewport.y(); ! Scaled.translate(translateX, translateY); Frame = Scaled; Index: lprofmain.h =================================================================== RCS file: /cvsroot/lprof/lprof/src/lprofqt/lprofmain.h,v retrieving revision 1.52.2.4 retrieving revision 1.52.2.5 diff -C2 -d -r1.52.2.4 -r1.52.2.5 *** lprofmain.h 30 Jun 2009 00:00:09 -0000 1.52.2.4 --- lprofmain.h 1 Jul 2009 18:34:02 -0000 1.52.2.5 *************** *** 55,60 **** #include <QApplication> #include <QVBoxLayout> - //#include <q3urloperator.h> - QAssistantClient* getHelp(); --- 55,58 ---- Index: config.cpp =================================================================== RCS file: /cvsroot/lprof/lprof/src/lprofqt/config.cpp,v retrieving revision 1.8.2.3 retrieving revision 1.8.2.4 diff -C2 -d -r1.8.2.3 -r1.8.2.4 *** config.cpp 30 Jun 2009 00:00:09 -0000 1.8.2.3 --- config.cpp 1 Jul 2009 18:34:02 -0000 1.8.2.4 *************** *** 41,45 **** #include <qlineedit.h> #include <qtextcodec.h> - //#include <q3urloperator.h> #include <QSettings> #include <qassistantclient.h> --- 41,44 ---- *************** *** 52,57 **** #include "ui_lprofmainbase.h" - //Q3UrlOperator urlOp; - #if !defined(__WIN32__) && (defined(_WIN32) || defined(WIN32)) #define __WIN32__ --- 51,54 ---- *************** *** 99,110 **** mon_profile = QString::fromLocal8Bit("/Library/ColorSync/Profiles"); in_profile = QString::fromLocal8Bit("/Library/ColorSync/Profiles"); ! outprofile = d.homeDirPath() + QString::fromLocal8Bit("/Library/ColorSync/Profiles"); # else mon_profile = QString::fromLocal8Bit("/usr/share/color/icc"); in_profile = QString::fromLocal8Bit("/usr/share/color/icc"); ! outprofile = d.homeDirPath() + QString::fromLocal8Bit("/.color/icc"); # endif /* __WIN32__ */ ! QString home = d.homeDirPath(); measurement_dir = home + measure_dir_const; --- 96,107 ---- mon_profile = QString::fromLocal8Bit("/Library/ColorSync/Profiles"); in_profile = QString::fromLocal8Bit("/Library/ColorSync/Profiles"); ! outprofile = d.homePath() + QString::fromLocal8Bit("/Library/ColorSync/Profiles"); # else mon_profile = QString::fromLocal8Bit("/usr/share/color/icc"); in_profile = QString::fromLocal8Bit("/usr/share/color/icc"); ! outprofile = d.homePath() + QString::fromLocal8Bit("/.color/icc"); # endif /* __WIN32__ */ ! QString home = d.homePath(); measurement_dir = home + measure_dir_const; *************** *** 229,234 **** else { ! execpath = Path.left(Path.find(pathSep)); ! Path = Path.right(Path.length() - Path.find(pathSep) - 1); } } --- 226,231 ---- else { ! execpath = Path.left(Path.indexOf(pathSep)); ! Path = Path.right(Path.length() - Path.indexOf(pathSep) - 1); } } *************** *** 244,248 **** // execution path should be <prefix>/bin ! execpath = QDir::currentDirPath().replace(QDir::currentDirPath().length() - 16, 16, QString::fromLocal8Bit("bin")); fileinfo.setFile(execpath + QString::fromLocal8Bit("/") + assist); if (fileinfo.exists()) --- 241,245 ---- // execution path should be <prefix>/bin ! execpath = QDir::currentPath().replace(QDir::currentPath().length() - 16, 16, QString::fromLocal8Bit("bin")); fileinfo.setFile(execpath + QString::fromLocal8Bit("/") + assist); if (fileinfo.exists()) *************** *** 266,275 **** QString path; ! QString test = QString::fromLocal8Bit(QTextCodec::locale()); ! if ((test.find((QString::fromLocal8Bit("C")), 0, false) >= 0)) ! path = QDir::currentDirPath() + QString::fromLocal8Bit("/help/") + QString::fromLocal8Bit("en"); else if (test == QString::fromLocal8Bit("ru")) ! path = QDir::currentDirPath() + QString::fromLocal8Bit("/help/") + QString::fromLocal8Bit(QTextCodec::locale()); else // since at this point only english and Russian // help pages exist --- 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 *************** *** 277,281 **** // This will need to be updated whenever a new // language is added to the help files ! path = QDir::currentDirPath() + QString::fromLocal8Bit("/help/") + QString::fromLocal8Bit("en"); g_path.insert(0, path); --- 275,279 ---- // This will need to be updated whenever a new // language is added to the help files ! path = QDir::currentPath() + QString::fromLocal8Bit("/help/") + QString::fromLocal8Bit("en"); g_path.insert(0, path); *************** *** 335,339 **** { QString files; ! QDir* dir = new QDir (dir->homeDirPath()); // Check to see if the home directory exists and is writable --- 333,337 ---- { QString files; ! QDir* dir = new QDir (dir->homePath()); // Check to see if the home directory exists and is writable *************** *** 342,346 **** { QMessageBox mb( QTranslator::tr("Problem With Home Directory"), ! QTranslator::tr("Home directory ") + dir->homeDirPath() + QTranslator::tr(" does not exist or can not be writen to. LProf will not function correctly until this is condition is corrected"), QMessageBox::Critical, QMessageBox::Ok | QMessageBox::Default, --- 340,344 ---- { QMessageBox mb( QTranslator::tr("Problem With Home Directory"), ! QTranslator::tr("Home directory ") + dir->homePath() + QTranslator::tr(" does not exist or can not be writen to. LProf will not function correctly until this is condition is corrected"), QMessageBox::Critical, QMessageBox::Ok | QMessageBox::Default, *************** *** 353,362 **** // if not create it and move template files into it // home_path = dir->homeDirPath() + QString::fromLocal8Bit("/") + QString::fromLocal8Bit(".lprof")); ! if (!dir->exists(dir->homeDirPath() + lprofBaseDir)) { ! if (!dir->mkdir(dir->homeDirPath() + lprofBaseDir, TRUE)) { QMessageBox mb( QTranslator::tr("Can Not Create Configuration Directory"), ! QTranslator::tr("LProf can not create ") + dir->homeDirPath() + lprofBaseDir + QTranslator::tr(" LProf will not function correctly until this is condition is corrected"), QMessageBox::Critical, QMessageBox::Ok | QMessageBox::Default, --- 351,360 ---- // if not create it and move template files into it // home_path = dir->homeDirPath() + QString::fromLocal8Bit("/") + QString::fromLocal8Bit(".lprof")); ! if (!dir->exists(dir->homePath() + lprofBaseDir)) { ! if (!dir->mkdir(dir->homePath() + lprofBaseDir)) { QMessageBox mb( QTranslator::tr("Can Not Create Configuration Directory"), ! QTranslator::tr("LProf can not create ") + dir->homePath() + lprofBaseDir + QTranslator::tr(" LProf will not function correctly until this is condition is corrected"), QMessageBox::Critical, QMessageBox::Ok | QMessageBox::Default, *************** *** 368,391 **** # ifdef __WIN32__ // hide the user configuration directory ! QString home_path = dir->homeDirPath() + lprofBaseDir; ! files = QString::fromLocal8Bit("attrib +h \"")) + dir->convertSeparators(home_path) + QString::fromLocal8Bit("\"")); system(files.latin1()); # endif /* __WIN32__ */ ! if (!dir->exists(dir->homeDirPath() + lprofBaseDir + QString::fromLocal8Bit("/config"))) ! dir->mkdir(dir->homeDirPath() + lprofBaseDir + QString::fromLocal8Bit("/config"), TRUE); ! if (!dir->exists(dir->homeDirPath() + lprofBaseDir + QString::fromLocal8Bit("/target_refs"))) ! dir->mkdir(dir->homeDirPath() + lprofBaseDir + QString::fromLocal8Bit("/target_refs"), TRUE); ! if (!dir->exists(dir->homeDirPath() + lprofBaseDir + QString::fromLocal8Bit("/temp"))) ! dir->mkdir(dir->homeDirPath() + lprofBaseDir + QString::fromLocal8Bit("/temp"), TRUE); ! if (!dir->exists(dir->homeDirPath() + lprofBaseDir + QString::fromLocal8Bit("/templates"))) ! dir->mkdir(dir->homeDirPath() + lprofBaseDir + QString::fromLocal8Bit("/templates"), TRUE); ! if (!dir->exists(dir->homeDirPath() + lprofBaseDir + QString::fromLocal8Bit("/measurements"))) ! dir->mkdir(dir->homeDirPath() + lprofBaseDir + QString::fromLocal8Bit("/measurements"), TRUE); } // Copy the template files into the users config directory --- 366,389 ---- # ifdef __WIN32__ // hide the user configuration directory ! QString home_path = dir->homePath() + lprofBaseDir; ! files = QString::fromLocal8Bit("attrib +h \"")) + dir->convertSeparators(home_path) + QString::fromLocal8Bit("\"")); system(files.latin1()); # endif /* __WIN32__ */ ! if (!dir->exists(dir->homePath() + lprofBaseDir + QString::fromLocal8Bit("/config"))) ! dir->mkdir(dir->homePath() + lprofBaseDir + QString::fromLocal8Bit("/config")); ! if (!dir->exists(dir->homePath() + lprofBaseDir + QString::fromLocal8Bit("/target_refs"))) ! dir->mkdir(dir->homePath() + lprofBaseDir + QString::fromLocal8Bit("/target_refs")); ! if (!dir->exists(dir->homePath() + lprofBaseDir + QString::fromLocal8Bit("/temp"))) ! dir->mkdir(dir->homePath() + lprofBaseDir + QString::fromLocal8Bit("/temp")); ! if (!dir->exists(dir->homePath() + lprofBaseDir + QString::fromLocal8Bit("/templates"))) ! dir->mkdir(dir->homePath() + lprofBaseDir + QString::fromLocal8Bit("/templates")); ! if (!dir->exists(dir->homePath() + lprofBaseDir + QString::fromLocal8Bit("/measurements"))) ! dir->mkdir(dir->homePath() + lprofBaseDir + QString::fromLocal8Bit("/measurements")); } // Copy the template files into the users config directory *************** *** 400,406 **** for ( QList<QFileInfo>::const_iterator it = list.begin(); it != itEnd; ++it) { ! if ((*it).fileName().contains(QString::fromLocal8Bit("ITX"), FALSE)) { ! f.setName(dir->homeDirPath() + lprofBaseDir + QString::fromLocal8Bit("/templates/") + (*it).fileName()); --- 398,404 ---- for ( QList<QFileInfo>::const_iterator it = list.begin(); it != itEnd; ++it) { ! if ((*it).fileName().contains(QString::fromLocal8Bit("ITX"), Qt::CaseInsensitive)) { ! f.setFileName(dir->homePath() + lprofBaseDir + QString::fromLocal8Bit("/templates/") + (*it).fileName()); *************** *** 408,421 **** { //mutexTempFile.lock(); - /* copyNumTempFile = copyNumTempFile + 1; - urlOpTempFile.copy( data_path + QString::fromLocal8Bit("/template/") + - (*it).fileName(), dir->homeDirPath() + - lprofBaseDir + QString::fromLocal8Bit("/templates/"));*/ bool file_copied; file_copied=QFile::copy(data_path + QString::fromLocal8Bit("/template/") +(*it).fileName(), ! dir->homeDirPath() +lprofBaseDir + QString::fromLocal8Bit("/templates/") + (*it).fileName()); if(!file_copied) { ! // qDebug("Error on template file copy"); QMessageBox::information( this, tr( "Template File not copied" ), tr("The template file could not be copied")); } --- 406,415 ---- { //mutexTempFile.lock(); bool file_copied; file_copied=QFile::copy(data_path + QString::fromLocal8Bit("/template/") +(*it).fileName(), ! dir->homePath() +lprofBaseDir + QString::fromLocal8Bit("/templates/") + (*it).fileName()); if(!file_copied) { ! // qDebug("Error no template file copy"); QMessageBox::information( this, tr( "Template File not copied" ), tr("The template file could not be copied")); } *************** *** 434,438 **** QFile f; ! QDir d (QDir::currentDirPath() + QString::fromLocal8Bit("/template/")); if (!d.exists()) { --- 428,432 ---- QFile f; ! QDir d (QDir::currentPath() + QString::fromLocal8Bit("/template/")); if (!d.exists()) { *************** *** 447,453 **** for ( QList<QFileInfo>::const_iterator it = list.begin(); it != itEnd; ++it) { ! if ((*it).fileName().contains(QString::fromLocal8Bit("ITX"), FALSE)) { ! f.setName(d.homeDirPath() + lprofBaseDir + QString::fromLocal8Bit("/templates/") + (*it).fileName()); --- 441,447 ---- for ( QList<QFileInfo>::const_iterator it = list.begin(); it != itEnd; ++it) { ! if ((*it).fileName().contains(QString::fromLocal8Bit("ITX"), Qt::CaseInsensitive)) { ! f.setFileName(d.homePath() + lprofBaseDir + QString::fromLocal8Bit("/templates/") + (*it).fileName()); *************** *** 492,496 **** if (lprofSettings) delete lprofSettings; ! QSettings::setPath(QSettings::NativeFormat, QSettings::UserScope, QDir::homeDirPath() + lprofBaseDir + QString::fromLocal8Bit("/config")); lprofSettings = new QSettings(QString::fromLocal8Bit("lprof.sourceforge.net"), QString::fromLocal8Bit("lprof")); lprofSettings -> setFallbacksEnabled (FALSE); --- 486,490 ---- if (lprofSettings) delete lprofSettings; ! QSettings::setPath(QSettings::NativeFormat, QSettings::UserScope, QDir::homePath() + lprofBaseDir + QString::fromLocal8Bit("/config")); lprofSettings = new QSettings(QString::fromLocal8Bit("lprof.sourceforge.net"), QString::fromLocal8Bit("lprof")); lprofSettings -> setFallbacksEnabled (FALSE); *************** *** 526,530 **** targetList->clear(); const int n=lprofSettings->value( QString::fromLocal8Bit("/LPROF/numbers/NUMBER_TARGETS"), 0).toInt(); ! ui->ComboBoxIntent -> setCurrentItem (lprofSettings -> value(QString::fromLocal8Bit("/LPROF/numbers/intent_curr_item"), 0).toInt()); for (int i=0; i < n; i++) --- 520,524 ---- targetList->clear(); const int n=lprofSettings->value( QString::fromLocal8Bit("/LPROF/numbers/NUMBER_TARGETS"), 0).toInt(); ! ui->ComboBoxIntent -> setCurrentIndex (lprofSettings -> value(QString::fromLocal8Bit("/LPROF/numbers/intent_curr_item"), 0).toInt()); for (int i=0; i < n; i++) *************** *** 710,714 **** lprofSettings -> setValue(QString::fromLocal8Bit("/LPROF/numbers/profch_h"),dsizes.profchH); lprofSettings -> setValue(QString::fromLocal8Bit("/LPROF/numbers/profch_w"),dsizes.profchW); ! lprofSettings -> setValue(QString::fromLocal8Bit("/LPROF/numbers/intent_curr_item"),ui->ComboBoxIntent -> currentItem()); // lprofSettings->~QSettings(); --- 704,708 ---- lprofSettings -> setValue(QString::fromLocal8Bit("/LPROF/numbers/profch_h"),dsizes.profchH); lprofSettings -> setValue(QString::fromLocal8Bit("/LPROF/numbers/profch_w"),dsizes.profchW); ! lprofSettings -> setValue(QString::fromLocal8Bit("/LPROF/numbers/intent_curr_item"),ui->ComboBoxIntent -> currentIndex()); // lprofSettings->~QSettings(); *************** *** 795,809 **** // qDebug(QString::fromLocal8Bit("lprofMain::saveProfileDetails")); ! if (ui->TabProfiler -> currentPageIndex()== 0) { ! profile = ui->OutputFileEdit -> text().mid(ui->OutputFileEdit -> text().findRev(QString::fromLocal8Bit("/")) + 1, ! ui->OutputFileEdit -> text().length() - ui->OutputFileEdit -> text().findRev(QString::fromLocal8Bit("/")) - 1); lprofSettings->setValue(QString::fromLocal8Bit("/LPROF/profile-") + profile + QString::fromLocal8Bit("/Files/OUTPUT_PROFILE"), ui->OutputFileEdit -> text()); ! /*urlOp.copy(measfile, d.homeDirPath() + ! lprofBaseDir + QString::fromLocal8Bit("/measurements/") + profile + QString::fromLocal8Bit(".cgt"), false, false); */ ! if(QFile::exists(d.homeDirPath()+lprofBaseDir + QString::fromLocal8Bit("/measurements/") + profile + QString::fromLocal8Bit(".cgt"))) ! { QFile::remove(d.homeDirPath()+lprofBaseDir + QString::fromLocal8Bit("/measurements/") + profile + QString::fromLocal8Bit(".cgt"));} ! QFile::copy(measfile, d.homeDirPath() + lprofBaseDir + QString::fromLocal8Bit("/measurements/") + profile + QString::fromLocal8Bit(".cgt")); --- 789,801 ---- // qDebug(QString::fromLocal8Bit("lprofMain::saveProfileDetails")); ! if (ui->TabProfiler -> currentIndex()== 0) { ! profile = ui->OutputFileEdit -> text().mid(ui->OutputFileEdit -> text().lastIndexOf(QString::fromLocal8Bit("/")) + 1, ! ui->OutputFileEdit -> text().length() - ui->OutputFileEdit -> text().lastIndexOf(QString::fromLocal8Bit("/")) - 1); lprofSettings->setValue(QString::fromLocal8Bit("/LPROF/profile-") + profile + QString::fromLocal8Bit("/Files/OUTPUT_PROFILE"), ui->OutputFileEdit -> text()); ! if(QFile::exists(d.homePath()+lprofBaseDir + QString::fromLocal8Bit("/measurements/") + profile + QString::fromLocal8Bit(".cgt"))) ! { QFile::remove(d.homePath()+lprofBaseDir + QString::fromLocal8Bit("/measurements/") + profile + QString::fromLocal8Bit(".cgt"));} ! QFile::copy(measfile, d.homePath() + lprofBaseDir + QString::fromLocal8Bit("/measurements/") + profile + QString::fromLocal8Bit(".cgt")); *************** *** 846,853 **** } ! else if (ui->TabProfiler -> currentPageIndex()== 1) { ! profile = ui->OutputFileEdit_Mon -> text().mid(ui->OutputFileEdit_Mon -> text().findRev(QString::fromLocal8Bit("/")) + 1, ! ui->OutputFileEdit_Mon -> text().length() - ui->OutputFileEdit_Mon -> text().findRev(QString::fromLocal8Bit("/")) - 1); cs_profile = false; lprofSettings->setValue((QString::fromLocal8Bit("/LPROF/profile-") + --- 838,845 ---- } ! else if (ui->TabProfiler -> currentIndex()== 1) { ! profile = ui->OutputFileEdit_Mon -> text().mid(ui->OutputFileEdit_Mon -> text().lastIndexOf(QString::fromLocal8Bit("/")) + 1, ! ui->OutputFileEdit_Mon -> text().length() - ui->OutputFileEdit_Mon -> text().lastIndexOf(QString::fromLocal8Bit("/")) - 1); cs_profile = false; lprofSettings->setValue((QString::fromLocal8Bit("/LPROF/profile-") + *************** *** 857,870 **** if (!ui->RadioCoarse->isChecked()) { ! QString meas_file = d.homeDirPath() + lprofBaseDir + QString::fromLocal8Bit("/measurements/") + profile + QString::fromLocal8Bit(".cgt"); - //urlOp.copy(ui->MonMeasurementSheet->getFilename(), meas_file, false, false); if(QFile::exists(meas_file)) QFile::remove(meas_file); QFile::copy(ui->MonMeasurementSheet->getFilename(), meas_file); ! QString cal_file = d.homeDirPath() + lprofBaseDir + QString::fromLocal8Bit("/measurements/") + QString::fromLocal8Bit("cal-") + profile + QString::fromLocal8Bit(".cgt"); - //urlOp.copy(ui->MonCalibrationSheet->getFilename(), cal_file, false, false); if(QFile::exists(cal_file)) QFile::remove(cal_file); --- 849,860 ---- if (!ui->RadioCoarse->isChecked()) { ! QString meas_file = d.homePath() + lprofBaseDir + QString::fromLocal8Bit("/measurements/") + profile + QString::fromLocal8Bit(".cgt"); if(QFile::exists(meas_file)) QFile::remove(meas_file); QFile::copy(ui->MonMeasurementSheet->getFilename(), meas_file); ! QString cal_file = d.homePath() + lprofBaseDir + QString::fromLocal8Bit("/measurements/") + QString::fromLocal8Bit("cal-") + profile + QString::fromLocal8Bit(".cgt"); if(QFile::exists(cal_file)) QFile::remove(cal_file); Index: lprofmainbase.ui =================================================================== RCS file: /cvsroot/lprof/lprof/src/lprofqt/lprofmainbase.ui,v retrieving revision 1.50.2.2 retrieving revision 1.50.2.3 diff -C2 -d -r1.50.2.2 -r1.50.2.3 *** lprofmainbase.ui 16 Jun 2009 07:26:25 -0000 1.50.2.2 --- lprofmainbase.ui 1 Jul 2009 18:34:02 -0000 1.50.2.3 *************** *** 234,238 **** <widget class="QTabWidget" name="TabProfiler"> <property name="currentIndex"> ! <number>2</number> </property> <widget class="QWidget" name="Camera_Scanner_Profiler_Tab"> --- 234,238 ---- <widget class="QTabWidget" name="TabProfiler"> <property name="currentIndex"> ! <number>0</number> </property> <widget class="QWidget" name="Camera_Scanner_Profiler_Tab"> *************** *** 1672,1676 **** </property> <attribute name="horizontalHeaderVisible"> ! <bool>true</bool> </attribute> <attribute name="verticalHeaderVisible"> --- 1672,1676 ---- </property> <attribute name="horizontalHeaderVisible"> ! <bool>false</bool> </attribute> <attribute name="verticalHeaderVisible"> Index: interfaces.cpp =================================================================== RCS file: /cvsroot/lprof/lprof/src/lprofqt/interfaces.cpp,v retrieving revision 1.5 retrieving revision 1.5.2.1 diff -C2 -d -r1.5 -r1.5.2.1 *** interfaces.cpp 6 Mar 2008 21:18:58 -0000 1.5 --- interfaces.cpp 1 Jul 2009 18:34:02 -0000 1.5.2.1 *************** *** 56,60 **** out.items.template_dir = templates; out.items.ref_dir = ref_dir; ! out.items.home_dir = d.homeDirPath(); out.items.settings = lprofSettings; } --- 56,60 ---- out.items.template_dir = templates; out.items.ref_dir = ref_dir; ! out.items.home_dir = d.homePath(); out.items.settings = lprofSettings; } |
|
From: Amit K. <ami...@us...> - 2009-07-01 18:34:08
|
Update of /cvsroot/lprof/lprof/src/reference_inst_qt In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv1838/reference_inst_qt Modified Files: Tag: GSoC-2009 installreffile.cpp installreffile.h Log Message: |
|
From: Amit K. <ami...@us...> - 2009-07-01 18:34:06
|
Update of /cvsroot/lprof/lprof/src/checkerqt In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv1838/checkerqt Modified Files: Tag: GSoC-2009 profilechecker.cpp Log Message: |
|
From: Amit K. <ami...@us...> - 2009-06-30 01:21:01
|
Update of /cvsroot/lprof/lprof/src/monqt In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv20052/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 retrieving revision 1.28.2.1 diff -C2 -d -r1.28 -r1.28.2.1 *** monitorvalues.cpp 18 May 2009 21:17:17 -0000 1.28 --- monitorvalues.cpp 30 Jun 2009 00:00:10 -0000 1.28.2.1 *************** *** 65,68 **** --- 65,69 ---- #include <qimage.h> #include <qtooltip.h> + #include <QFileDialog> static PROFILERDATA sys; |
|
From: Amit K. <ami...@us...> - 2009-06-30 01:21:00
|
Update of /cvsroot/lprof/lprof/src/checkerqt In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv20052/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 retrieving revision 1.49.2.1 diff -C2 -d -r1.49 -r1.49.2.1 *** profilechecker.cpp 18 May 2009 21:17:17 -0000 1.49 --- profilechecker.cpp 30 Jun 2009 00:00:09 -0000 1.49.2.1 *************** *** 61,64 **** --- 61,66 ---- #include <qdir.h> #include <qmessagebox.h> + + #include <QFileDialog> //Added by qt3to4: #include <QTranslator> *************** *** 815,824 **** void ProfileChecker::slotSelectOutputFile() { ! ! QString fn = Q3FileDialog::getOpenFileName( QString::null, ! QTranslator::tr("icc profiles (*.icc *.icm)\nAll files (*.*)"), ! this, ! "", ! QTranslator::tr("Select profile filename")); if (fn != QString::null) --- 817,821 ---- void ProfileChecker::slotSelectOutputFile() { ! QString fn = QFileDialog::getOpenFileName(this, QTranslator::tr("Select profile filename"), QString::null, QTranslator::tr("icc profiles (*.icc *.icm)\nAll files (*.*)")); if (fn != QString::null) *************** *** 841,850 **** void ProfileChecker::slotSelectScanoutIT8() { ! ! QString fn = Q3FileDialog::getOpenFileName( QString::fromLocal8Bit(""), ! QTranslator::tr("IT8/CGATS.5 Files (*.it? *.cgt)\nAll files (*.*)"), ! this, ! "", ! QTranslator::tr("Select measurement filename")); if (fn != QString::null) --- 838,843 ---- void ProfileChecker::slotSelectScanoutIT8() { ! QString fn = QFileDialog::getOpenFileName(this, QTranslator::tr("Select measurement filename"), QString::fromLocal8Bit(""), ! QTranslator::tr("IT8/CGATS.5 Files (*.it? *.cgt)\nAll files (*.*)")); if (fn != QString::null) |
|
From: Amit K. <ami...@us...> - 2009-06-30 00:03:11
|
Update of /cvsroot/lprof/lprof/src/moncalcontrolqt In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv20052/moncalcontrolqt Modified Files: Tag: GSoC-2009 moncalcontrol.cpp Log Message: Index: moncalcontrol.cpp =================================================================== RCS file: /cvsroot/lprof/lprof/src/moncalcontrolqt/moncalcontrol.cpp,v retrieving revision 1.37 retrieving revision 1.37.2.1 diff -C2 -d -r1.37 -r1.37.2.1 *** moncalcontrol.cpp 6 Mar 2008 21:18:59 -0000 1.37 --- moncalcontrol.cpp 30 Jun 2009 00:00:10 -0000 1.37.2.1 *************** *** 56,59 **** --- 56,60 ---- //Added by qt3to4: #include <QTranslator> + #include <QFileDialog> // ArgyllCMS instrument support stuff *************** *** 570,578 **** #endif filter = QString::fromLocal8Bit("Spyder 2 Files (Spyder.lib; CVSpyder.dll; setup.exe)"); ! Q3FileDialog fd(startDir, filter, this, tr("Locate Firmware").toLocal8Bit(), TRUE); ! fd.show(); fd.exec(); ! if (!fd.selectedFile().isEmpty()) ! command = command + QString::fromLocal8Bit(" ") + fd.selectedFile(); system(command.toLocal8Bit()); qDebug(command.toLocal8Bit()); --- 571,582 ---- #endif filter = QString::fromLocal8Bit("Spyder 2 Files (Spyder.lib; CVSpyder.dll; setup.exe)"); ! QFileDialog fd(this, tr("Locate Firmware"), startDir, filter); ! fd.show(); fd.exec(); ! ! QStringList files_selected = fd.selectedFiles(); ! //if (!fd.selectedFile().isEmpty()) ! if (!files_selected[0].isEmpty()) ! command = command + QString::fromLocal8Bit(" ") + files_selected[0]; system(command.toLocal8Bit()); qDebug(command.toLocal8Bit()); |
|
From: Amit K. <ami...@us...> - 2009-06-30 00:01:37
|
Update of /cvsroot/lprof/lprof/src/IDqt In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv20052/IDqt Modified Files: Tag: GSoC-2009 profileid.cpp Log Message: Index: profileid.cpp =================================================================== RCS file: /cvsroot/lprof/lprof/src/IDqt/profileid.cpp,v retrieving revision 1.20 retrieving revision 1.20.2.1 diff -C2 -d -r1.20 -r1.20.2.1 *** profileid.cpp 18 May 2009 21:17:17 -0000 1.20 --- profileid.cpp 30 Jun 2009 00:00:09 -0000 1.20.2.1 *************** *** 49,52 **** --- 49,54 ---- #include "main.h" + #include <QFileDialog> + #if !defined(__WIN32__) && (defined(_WIN32) || defined(WIN32)) #define __WIN32__ *************** *** 163,171 **** outprofile = OutputFileEdit -> text(); ! QString fn = Q3FileDialog::getSaveFileName( outprofile, ! tr("icc profiles (*.icc *.icm)\nAll files (*.*)"), ! this, ! "", ! tr("Select output profile filename")); if (fn != QString::null) { --- 165,171 ---- outprofile = OutputFileEdit -> text(); ! QString fn = QFileDialog::getSaveFileName( this, tr("Select output profile filename"), outprofile, ! tr("icc profiles (*.icc *.icm)\nAll files (*.*)")); ! if (fn != QString::null) { |
|
From: Amit K. <ami...@us...> - 2009-06-30 00:01:14
|
Update of /cvsroot/lprof/lprof/src/lprofqt In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv20052/lprofqt Modified Files: Tag: GSoC-2009 config.cpp imageitem.cpp lprofmain-priv.cpp lprofmain-priv.h lprofmain.cpp lprofmain.h main.cpp slots.cpp Log Message: Index: main.cpp =================================================================== RCS file: /cvsroot/lprof/lprof/src/lprofqt/main.cpp,v retrieving revision 1.43 retrieving revision 1.43.2.1 diff -C2 -d -r1.43 -r1.43.2.1 *** main.cpp 20 Mar 2008 01:50:09 -0000 1.43 --- main.cpp 30 Jun 2009 00:00:09 -0000 1.43.2.1 *************** *** 64,68 **** exec = getAppExecDir() + QString::fromLocal8Bit("/"); ! strcpy(execPath, exec.local8Bit()); if (setup_spyd2(execPath) == 0) // Device will not work. --- 64,68 ---- exec = getAppExecDir() + QString::fromLocal8Bit("/"); ! strcpy(execPath, exec.toLocal8Bit()); if (setup_spyd2(execPath) == 0) // Device will not work. *************** *** 92,96 **** // but also so the help system can locate the help files. // Otherwise it would be inside of the if below ! prefix_path.truncate(prefix_path.find( QString::fromLocal8Bit("/build") )); prefix_path = prefix_path + QString::fromLocal8Bit("/data"); if ( dir->exists(prefix_path) ) --- 92,96 ---- // but also so the help system can locate the help files. // Otherwise it would be inside of the if below ! prefix_path.truncate(prefix_path.indexOf( QString::fromLocal8Bit("/build") )); prefix_path = prefix_path + QString::fromLocal8Bit("/data"); if ( dir->exists(prefix_path) ) *************** *** 126,130 **** QTranslator translator( 0 ); // QString::fromLocal8Bit translations = ":/translations/lprof_" + (QString::fromLocal8Bit) QTextCodec::locale(); ! translator.load( QString::fromLocal8Bit("lprof_") + QString::fromLocal8Bit(QTextCodec::locale()), QString::fromLocal8Bit(":/") ); lprofApp -> installTranslator( &translator ); --- 126,130 ---- QTranslator translator( 0 ); // QString::fromLocal8Bit translations = ":/translations/lprof_" + (QString::fromLocal8Bit) QTextCodec::locale(); ! translator.load( QString::fromLocal8Bit("lprof_") + QString::fromLocal8Bit(QTextCodec::locale()), QString::fromLocal8Bit(":/") ); lprofApp -> installTranslator( &translator ); Index: slots.cpp =================================================================== RCS file: /cvsroot/lprof/lprof/src/lprofqt/slots.cpp,v retrieving revision 1.5.2.2 retrieving revision 1.5.2.3 diff -C2 -d -r1.5.2.2 -r1.5.2.3 *** slots.cpp 16 Jun 2009 07:26:25 -0000 1.5.2.2 --- slots.cpp 30 Jun 2009 00:00:09 -0000 1.5.2.3 *************** *** 55,60 **** #include <qpushbutton.h> #include <qmessagebox.h> - #include <Q3FileDialog> #include <QFile> #include "vigra/imageiterator.hxx" --- 55,60 ---- #include <qpushbutton.h> #include <qmessagebox.h> #include <QFile> + #include <QFileDialog> #include "vigra/imageiterator.hxx" *************** *** 109,123 **** // qDebug("lprofMain::slotLoad"); zeroProgressBars(); ! QString dir = lprofSettings -> readEntry(QString::fromLocal8Bit("/LPROF/Files/last_load_dir"), QDir::homeDirPath()); ! ! fn = Q3FileDialog::getOpenFileName( dir, ! tr("Image files (*.gif *.png *.jpg *.bmp *.pbm *.pgm *.pnm *.sun *.tif *.tiff *.viff *.GIF *.PNG *.JPG *.BMP *.PBM *.PGM *.PNM *.SUN *.TIF *.TIFF *.VIFF)\nAll files (*.*)"), ! this, ! "", ! tr("Select target image")); if (!fn.isNull()) // return; { ! lprofSettings -> writeEntry(QString::fromLocal8Bit("/LPROF/Files/last_load_dir"), fn.left(fn.findRev(QString::fromLocal8Bit("/")))); FigEditor->clear(); --- 109,119 ---- // qDebug("lprofMain::slotLoad"); zeroProgressBars(); ! QString dir = lprofSettings -> value(QString::fromLocal8Bit("/LPROF/Files/last_load_dir"), QDir::homeDirPath()).toString(); + fn = QFileDialog::getOpenFileName(this, tr("Select target image"), dir, tr("Image files (*.gif *.png *.jpg *.bmp *.pbm *.pgm *.pnm *.sun *.tif *.tiff *.viff *.GIF *.PNG *.JPG *.BMP *.PBM *.PGM *.PNM *.SUN *.TIF *.TIFF *.VIFF)\nAll files (*.*)")); + if (!fn.isNull()) // return; { ! lprofSettings -> setValue(QString::fromLocal8Bit("/LPROF/Files/last_load_dir"), fn.left(fn.findRev(QString::fromLocal8Bit("/")))); FigEditor->clear(); *************** *** 255,259 **** profile = ui->OutputFileEdit_Mon -> text().mid(ui->OutputFileEdit_Mon -> text().findRev(QString::fromLocal8Bit("/")) + 1, ui->OutputFileEdit_Mon -> text().length() - ui->OutputFileEdit_Mon -> text().findRev(QString::fromLocal8Bit("/")) - 1); ! temp = lprofSettings->readEntry(QString::fromLocal8Bit("/LPROF/profile-") + profile + QString::fromLocal8Bit("/Files/MON_OUTPUT_PROFILE"), QString::null, &ok); if (ok) // found entry in lprof lprofSettings { --- 251,256 ---- profile = ui->OutputFileEdit_Mon -> text().mid(ui->OutputFileEdit_Mon -> text().findRev(QString::fromLocal8Bit("/")) + 1, ui->OutputFileEdit_Mon -> text().length() - ui->OutputFileEdit_Mon -> text().findRev(QString::fromLocal8Bit("/")) - 1); ! ok = lprofSettings->contains(QString::fromLocal8Bit("/LPROF/profile-") + profile + QString::fromLocal8Bit("/Files/MON_OUTPUT_PROFILE")); ! temp = lprofSettings->value(QString::fromLocal8Bit("/LPROF/profile-") + profile + QString::fromLocal8Bit("/Files/MON_OUTPUT_PROFILE"), QVariant(QString::null)).toString(); if (ok) // found entry in lprof lprofSettings { *************** *** 261,267 **** getConfigParmsandID(profile); ! ok = lprofSettings->readBoolEntry(QString::fromLocal8Bit("/LPROF/profile-") + profile + ! QString::fromLocal8Bit("/boolians/Course")); ui->RadioCoarse->setChecked(ok); ui->RadioAccurate->setChecked(!ok); --- 258,264 ---- getConfigParmsandID(profile); ! ok = lprofSettings->value(QString::fromLocal8Bit("/LPROF/profile-") + profile + ! QString::fromLocal8Bit("/boolians/Course")).toBool(); ui->RadioCoarse->setChecked(ok); ui->RadioAccurate->setChecked(!ok); *************** *** 269,294 **** if (!ok) { ! ui->MonMeasurementSheet -> setFilename( lprofSettings->readEntry(QString::fromLocal8Bit("/LPROF/profile-") + profile + QString::fromLocal8Bit("/Files/MEASUREMENT_SHEET") )); ! ui->MonCalibrationSheet -> setFilename( lprofSettings->readEntry(QString::fromLocal8Bit("/LPROF/profile-") + profile + QString::fromLocal8Bit("/Files/MON_CAL_SHEET") )); } else ! { ! monitorValues.items.wppos = lprofSettings->readNumEntry(QString::fromLocal8Bit("/LPROF/profile-") + profile + QString::fromLocal8Bit("/numbers/whitePpos") ); ! monitorValues.items.ppos = lprofSettings->readNumEntry(QString::fromLocal8Bit("/LPROF/profile-") + profile + QString::fromLocal8Bit("/numbers/primePos") ); ! monitorValues.items.rgamma = lprofSettings->readDoubleEntry(QString::fromLocal8Bit("/LPROF/profile-") + profile + QString::fromLocal8Bit("/numbers/rgamma") ); ! monitorValues.items.ggamma = lprofSettings->readDoubleEntry(QString::fromLocal8Bit("/LPROF/profile-") + profile + QString::fromLocal8Bit("/numbers/ggamma") ); ! monitorValues.items.bgamma = lprofSettings->readDoubleEntry(QString::fromLocal8Bit("/LPROF/profile-") + profile + QString::fromLocal8Bit("/numbers/bgamma") ); ! sys.hdr.Primaries.Red.x = lprofSettings->readDoubleEntry(QString::fromLocal8Bit("/LPROF/profile-") + profile + QString::fromLocal8Bit("/numbers/red_x")); ! sys.hdr.Primaries.Red.y = lprofSettings->readDoubleEntry(QString::fromLocal8Bit("/LPROF/profile-") + profile + QString::fromLocal8Bit("/numbers/red_y") ); ! sys.hdr.Primaries.Green.x = lprofSettings->readDoubleEntry(QString::fromLocal8Bit("/LPROF/profile-") +profile + QString::fromLocal8Bit("/numbers/green_x") ); ! sys.hdr.Primaries.Green.y = lprofSettings->readDoubleEntry(QString::fromLocal8Bit("/LPROF/profile-") + profile + QString::fromLocal8Bit("/numbers/green_y") ); ! sys.hdr.Primaries.Blue.x = lprofSettings->readDoubleEntry(QString::fromLocal8Bit("/LPROF/profile-") + profile + QString::fromLocal8Bit("/numbers/blue_x") ); ! sys.hdr.Primaries.Blue.y = lprofSettings->readDoubleEntry(QString::fromLocal8Bit("/LPROF/profile-") + profile + QString::fromLocal8Bit("/numbers/blue_y") ); ! monitorValues.items.temp = lprofSettings->readNumEntry(QString::fromLocal8Bit("/LPROF/profile-") + profile + QString::fromLocal8Bit("/numbers/whitePoint") ); monitorValues.items.valid_mon = FALSE; ! monitorValues.items.linked = lprofSettings->readBoolEntry(QString::fromLocal8Bit("/LPROF/profile-") + profile + QString::fromLocal8Bit("/boolians/linked") ); if (sys.Prelinearization[0]) cmsFreeGamma(sys.Prelinearization[0]); --- 266,291 ---- if (!ok) { ! ui->MonMeasurementSheet -> setFilename( lprofSettings->value(QString::fromLocal8Bit("/LPROF/profile-") + profile + QString::fromLocal8Bit("/Files/MEASUREMENT_SHEET") ).toString()); ! ui->MonCalibrationSheet -> setFilename( lprofSettings->value(QString::fromLocal8Bit("/LPROF/profile-") + profile + QString::fromLocal8Bit("/Files/MON_CAL_SHEET") ).toString()); } else ! { ! monitorValues.items.wppos = lprofSettings->value(QString::fromLocal8Bit("/LPROF/profile-") + profile + QString::fromLocal8Bit("/numbers/whitePpos") ).toInt(); ! monitorValues.items.ppos = lprofSettings->value(QString::fromLocal8Bit("/LPROF/profile-") + profile + QString::fromLocal8Bit("/numbers/primePos") ).toInt(); ! monitorValues.items.rgamma = lprofSettings->value(QString::fromLocal8Bit("/LPROF/profile-") + profile + QString::fromLocal8Bit("/numbers/rgamma") ).toDouble(); ! monitorValues.items.ggamma = lprofSettings->value(QString::fromLocal8Bit("/LPROF/profile-") + profile + QString::fromLocal8Bit("/numbers/ggamma") ).toDouble(); ! monitorValues.items.bgamma = lprofSettings->value(QString::fromLocal8Bit("/LPROF/profile-") + profile + QString::fromLocal8Bit("/numbers/bgamma") ).toDouble(); ! sys.hdr.Primaries.Red.x = lprofSettings->value(QString::fromLocal8Bit("/LPROF/profile-") + profile + QString::fromLocal8Bit("/numbers/red_x")).toDouble(); ! sys.hdr.Primaries.Red.y = lprofSettings->value(QString::fromLocal8Bit("/LPROF/profile-") + profile + QString::fromLocal8Bit("/numbers/red_y") ).toDouble(); ! sys.hdr.Primaries.Green.x = lprofSettings->value(QString::fromLocal8Bit("/LPROF/profile-") +profile + QString::fromLocal8Bit("/numbers/green_x") ).toDouble(); ! sys.hdr.Primaries.Green.y = lprofSettings->value(QString::fromLocal8Bit("/LPROF/profile-") + profile + QString::fromLocal8Bit("/numbers/green_y") ).toDouble(); ! sys.hdr.Primaries.Blue.x = lprofSettings->value(QString::fromLocal8Bit("/LPROF/profile-") + profile + QString::fromLocal8Bit("/numbers/blue_x") ).toDouble(); ! sys.hdr.Primaries.Blue.y = lprofSettings->value(QString::fromLocal8Bit("/LPROF/profile-") + profile + QString::fromLocal8Bit("/numbers/blue_y") ).toDouble(); ! monitorValues.items.temp = lprofSettings->value(QString::fromLocal8Bit("/LPROF/profile-") + profile + QString::fromLocal8Bit("/numbers/whitePoint") ).toInt(); monitorValues.items.valid_mon = FALSE; ! monitorValues.items.linked = lprofSettings->value(QString::fromLocal8Bit("/LPROF/profile-") + profile + QString::fromLocal8Bit("/boolians/linked") ).toBool(); if (sys.Prelinearization[0]) cmsFreeGamma(sys.Prelinearization[0]); *************** *** 296,311 **** if (sys.Prelinearization[2]) cmsFreeGamma(sys.Prelinearization[2]); ! sys.Prelinearization[0] = cmsBuildGamma(256, ! lprofSettings->readDoubleEntry(QString::fromLocal8Bit("/LPROF/profile-") + profile + ! QString::fromLocal8Bit("/numbers/rgamma"))); sys.Prelinearization[1] = cmsBuildGamma(256, ! lprofSettings->readDoubleEntry(QString::fromLocal8Bit("/LPROF/profile-") + profile + ! QString::fromLocal8Bit("/numbers/ggamma"))); sys.Prelinearization[2] = cmsBuildGamma(256, ! lprofSettings->readDoubleEntry(QString::fromLocal8Bit("/LPROF/profile-") + profile + ! QString::fromLocal8Bit("/numbers/bgamma"))); } setData(1); --- 293,308 ---- if (sys.Prelinearization[2]) cmsFreeGamma(sys.Prelinearization[2]); ! sys.Prelinearization[0] = cmsBuildGamma(256, ! lprofSettings->value(QString::fromLocal8Bit("/LPROF/profile-") + profile + ! QString::fromLocal8Bit("/numbers/rgamma")).toDouble()); sys.Prelinearization[1] = cmsBuildGamma(256, ! lprofSettings->value(QString::fromLocal8Bit("/LPROF/profile-") + profile + ! QString::fromLocal8Bit("/numbers/ggamma")).toDouble()); sys.Prelinearization[2] = cmsBuildGamma(256, ! lprofSettings->value(QString::fromLocal8Bit("/LPROF/profile-") + profile + ! QString::fromLocal8Bit("/numbers/bgamma")).toDouble()); } setData(1); *************** *** 329,346 **** ui->OutputFileEdit -> text().length() - ui->OutputFileEdit -> text().findRev(QString::fromLocal8Bit("/")) - 1); ! temp = lprofSettings->readEntry(QString::fromLocal8Bit("/LPROF/profile-") + profile + QString::fromLocal8Bit("/Files/OUTPUT_PROFILE"), ! QString::null, &ok); if (ok) // found entry in lprofSettings { ! fn = lprofSettings->readEntry(QString::fromLocal8Bit("/LPROF/profile-") + profile + ! QString::fromLocal8Bit("/Files/IT8Image") ); ! target = lprofSettings->readEntry(QString::fromLocal8Bit("/LPROF/profile-") + profile + ! QString::fromLocal8Bit("/numbers/TARGET_Filename") ); if (targetList->count() > 0) --- 326,344 ---- ui->OutputFileEdit -> text().length() - ui->OutputFileEdit -> text().findRev(QString::fromLocal8Bit("/")) - 1); ! ok=lprofSettings->contains(QString::fromLocal8Bit("/LPROF/profile-") + profile + QString::fromLocal8Bit("/Files/OUTPUT_PROFILE")); ! temp = lprofSettings->value(QString::fromLocal8Bit("/LPROF/profile-") + profile + QString::fromLocal8Bit("/Files/OUTPUT_PROFILE"), ! QVariant(QString::null)).toString(); if (ok) // found entry in lprofSettings { ! fn = lprofSettings->value(QString::fromLocal8Bit("/LPROF/profile-") + profile + ! QString::fromLocal8Bit("/Files/IT8Image") ).toString(); ! target = lprofSettings->value(QString::fromLocal8Bit("/LPROF/profile-") + profile + ! QString::fromLocal8Bit("/numbers/TARGET_Filename") ).toString(); if (targetList->count() > 0) *************** *** 362,390 **** FigEditor->clear(); if (QFile::exists(fn)) // only if image exists ! { ! Marks.ur_x = lprofSettings->readNumEntry(QString::fromLocal8Bit("/LPROF/profile-") + profile + ! QString::fromLocal8Bit("/numbers/ur_x")); ! Marks.ur_y = lprofSettings->readNumEntry(QString::fromLocal8Bit("/LPROF/profile-") + profile + ! QString::fromLocal8Bit("/numbers/ur_y")); ! Marks.lr_x = lprofSettings->readNumEntry(QString::fromLocal8Bit("/LPROF/profile-") + profile + ! QString::fromLocal8Bit("/numbers/lr_x")); ! Marks.lr_y = lprofSettings->readNumEntry(QString::fromLocal8Bit("/LPROF/profile-") + profile + ! QString::fromLocal8Bit("/numbers/lr_y")); ! Marks.ul_x = lprofSettings->readNumEntry(QString::fromLocal8Bit("/LPROF/profile-") + profile + ! QString::fromLocal8Bit("/numbers/ul_x")); ! Marks.ul_y = lprofSettings->readNumEntry(QString::fromLocal8Bit("/LPROF/profile-") + profile + ! QString::fromLocal8Bit("/numbers/ul_y")); ! Marks.ll_x = lprofSettings->readNumEntry(QString::fromLocal8Bit("/LPROF/profile-") + profile + ! QString::fromLocal8Bit("/numbers/ll_x")); ! Marks.ll_y = lprofSettings->readNumEntry(QString::fromLocal8Bit("/LPROF/profile-") + profile + ! QString::fromLocal8Bit("/numbers/ll_y")); TheGrid = NULL; --- 360,388 ---- FigEditor->clear(); if (QFile::exists(fn)) // only if image exists ! { ! Marks.ur_x = lprofSettings->value(QString::fromLocal8Bit("/LPROF/profile-") + profile + ! QString::fromLocal8Bit("/numbers/ur_x")).toInt(); ! Marks.ur_y = lprofSettings->value(QString::fromLocal8Bit("/LPROF/profile-") + profile + ! QString::fromLocal8Bit("/numbers/ur_y")).toInt(); ! Marks.lr_x = lprofSettings->value(QString::fromLocal8Bit("/LPROF/profile-") + profile + ! QString::fromLocal8Bit("/numbers/lr_x")).toInt(); ! Marks.lr_y = lprofSettings->value(QString::fromLocal8Bit("/LPROF/profile-") + profile + ! QString::fromLocal8Bit("/numbers/lr_y")).toInt(); ! Marks.ul_x = lprofSettings->value(QString::fromLocal8Bit("/LPROF/profile-") + profile + ! QString::fromLocal8Bit("/numbers/ul_x")).toInt(); ! Marks.ul_y = lprofSettings->value(QString::fromLocal8Bit("/LPROF/profile-") + profile + ! QString::fromLocal8Bit("/numbers/ul_y")).toInt(); ! Marks.ll_x = lprofSettings->value(QString::fromLocal8Bit("/LPROF/profile-") + profile + ! QString::fromLocal8Bit("/numbers/ll_x")).toInt(); ! Marks.ll_y = lprofSettings->value(QString::fromLocal8Bit("/LPROF/profile-") + profile + ! QString::fromLocal8Bit("/numbers/ll_y")).toInt(); TheGrid = NULL; *************** *** 417,425 **** // qDebug("lprofMain::slotSelectOutputFile"); ! QString fn = Q3FileDialog::getSaveFileName( outprofile, ! tr("icc profiles (*.icc *.icm)\nAll files (*.*)"), ! this, ! "", ! tr("Select output profile filename")); if (fn != QString::null) { --- 415,421 ---- // qDebug("lprofMain::slotSelectOutputFile"); ! QString fn = QFileDialog::getSaveFileName( this, tr("Select output profile filename"), ! outprofile, tr("icc profiles (*.icc *.icm)\nAll files (*.*)")); ! if (fn != QString::null) { Index: imageitem.cpp =================================================================== RCS file: /cvsroot/lprof/lprof/src/lprofqt/imageitem.cpp,v retrieving revision 1.4.2.4 retrieving revision 1.4.2.5 diff -C2 -d -r1.4.2.4 -r1.4.2.5 *** imageitem.cpp 23 Jun 2009 19:30:36 -0000 1.4.2.4 --- imageitem.cpp 30 Jun 2009 00:00:09 -0000 1.4.2.5 *************** *** 126,130 **** } ! void ImageItem::Reload(QString ImageFile, const QString Monitor, const QString Scanner, QGraphicsScene *canvas ) //changed by me from Q3Canvas to QGraphicsScene { // qDebug("ImageItem::Reload"); --- 126,130 ---- } ! void ImageItem::Reload(QString ImageFile, const QString Monitor, const QString Scanner, QGraphicsScene *canvas ) { // qDebug("ImageItem::Reload"); Index: lprofmain-priv.h =================================================================== RCS file: /cvsroot/lprof/lprof/src/lprofqt/lprofmain-priv.h,v retrieving revision 1.6.2.2 retrieving revision 1.6.2.3 diff -C2 -d -r1.6.2.2 -r1.6.2.3 *** lprofmain-priv.h 16 Jun 2009 07:26:25 -0000 1.6.2.2 --- lprofmain-priv.h 30 Jun 2009 00:00:09 -0000 1.6.2.3 *************** *** 45,52 **** #include <QList> #include <QTextEdit> - #include <Q3TextEdit> - #include <Q3PointArray> - #include <Q3PtrList> // Anything listed here should only be used in files that are --- 45,50 ---- #include <QList> #include <QTextEdit> + #include <QList> // Anything listed here should only be used in files that are *************** *** 122,126 **** extern double clippedPatches, patchCount; ! extern Q3PtrList<target_template> *targetList; extern QString measfile; --- 120,124 ---- extern double clippedPatches, patchCount; ! extern QList<target_template *> *targetList; extern QString measfile; *************** *** 136,140 **** // extern QSettings* lprofSettings; ! extern Q3UrlOperator urlOpTempFile; extern int copyNumTempFile; --- 134,138 ---- // extern QSettings* lprofSettings; ! //extern Q3UrlOperator urlOpTempFile; extern int copyNumTempFile; Index: lprofmain.cpp =================================================================== RCS file: /cvsroot/lprof/lprof/src/lprofqt/lprofmain.cpp,v retrieving revision 1.188.2.5 retrieving revision 1.188.2.6 diff -C2 -d -r1.188.2.5 -r1.188.2.6 *** lprofmain.cpp 25 Jun 2009 13:32:07 -0000 1.188.2.5 --- lprofmain.cpp 30 Jun 2009 00:00:09 -0000 1.188.2.6 *************** *** 171,175 **** // Now get port info ! // sys.hdr.validInst = lprofSettings->readNumEntry( "/LPROF/numbers/instCount", 0); // qDebug("lprofMain::populatePortArray() instCount = %i", sys.hdr.validInst); --- 171,175 ---- // Now get port info ! // sys.hdr.validInst = lprofSettings->value( "/LPROF/numbers/instCount", 0).toInt(); // qDebug("lprofMain::populatePortArray() instCount = %i", sys.hdr.validInst); *************** *** 1098,1102 **** connect(ui->TargetSelector, SIGNAL(valueChanged()), this, SLOT(safeFarmeChanged())); ! connect( &urlOpTempFile, SIGNAL( finished( Q3NetworkOperation *) ), this, SLOT( templateFileCopied( Q3NetworkOperation * ) ) ); connect(ui->MonMeasurementSheet, SIGNAL(valueChanged()), this, SLOT(slotChangeStrategy())); --- 1098,1102 ---- connect(ui->TargetSelector, SIGNAL(valueChanged()), this, SLOT(safeFarmeChanged())); ! // connect( &urlOpTempFile, SIGNAL( finished( Q3NetworkOperation *) ), this, SLOT( templateFileCopied( Q3NetworkOperation * ) ) ); connect(ui->MonMeasurementSheet, SIGNAL(valueChanged()), this, SLOT(slotChangeStrategy())); *************** *** 1121,1125 **** if (targetList) delete targetList; ! targetList = new Q3PtrList<target_template>; // Init the lcmsx engine, this always does success --- 1121,1125 ---- if (targetList) delete targetList; ! targetList = new QList<target_template *>; // Init the lcmsx engine, this always does success Index: lprofmain-priv.cpp =================================================================== RCS file: /cvsroot/lprof/lprof/src/lprofqt/lprofmain-priv.cpp,v retrieving revision 1.4.2.2 retrieving revision 1.4.2.3 diff -C2 -d -r1.4.2.2 -r1.4.2.3 *** lprofmain-priv.cpp 16 Jun 2009 07:26:25 -0000 1.4.2.2 --- lprofmain-priv.cpp 30 Jun 2009 00:00:09 -0000 1.4.2.3 *************** *** 1,7 **** #include "lprofmain-priv.h" #include "lprofmain.h" ! //Added by qt3to4: ! #include <Q3PtrList> ! #include <Q3PointArray> // variables that are global to the lprofmain... files. --- 1,5 ---- #include "lprofmain-priv.h" #include "lprofmain.h" ! #include <QList> // variables that are global to the lprofmain... files. *************** *** 49,53 **** double clippedPatches, patchCount; ! Q3PtrList<target_template> *targetList=0; QString measfile; --- 47,51 ---- double clippedPatches, patchCount; ! QList<target_template *> *targetList=0; QString measfile; *************** *** 63,67 **** // QSettings* lprofSettings; ! Q3UrlOperator urlOpTempFile; int copyNumTempFile = 0; --- 61,65 ---- // QSettings* lprofSettings; ! //Q3UrlOperator urlOpTempFile; int copyNumTempFile = 0; Index: lprofmain.h =================================================================== RCS file: /cvsroot/lprof/lprof/src/lprofqt/lprofmain.h,v retrieving revision 1.52.2.3 retrieving revision 1.52.2.4 diff -C2 -d -r1.52.2.3 -r1.52.2.4 *** lprofmain.h 23 Jun 2009 19:30:36 -0000 1.52.2.3 --- lprofmain.h 30 Jun 2009 00:00:09 -0000 1.52.2.4 *************** *** 54,58 **** #include <QGraphicsRectItem> #include <QApplication> ! #include <q3urloperator.h> --- 54,59 ---- #include <QGraphicsRectItem> #include <QApplication> ! #include <QVBoxLayout> ! //#include <q3urloperator.h> *************** *** 188,192 **** // measurement tool stuff ! class Q3VBoxLayout; // RTTI numbers --- 189,193 ---- // measurement tool stuff ! class QVBoxLayout; // RTTI numbers *************** *** 375,379 **** virtual void slotUpdateProfileParmsText(); virtual void setRGBpatchValues(); ! void templateFileCopied( Q3NetworkOperation *op ); void zeroProgressBars(); virtual void AddTemplate(); --- 376,380 ---- virtual void slotUpdateProfileParmsText(); virtual void setRGBpatchValues(); ! // void templateFileCopied( Q3NetworkOperation *op ); ============================================================== void zeroProgressBars(); virtual void AddTemplate(); *************** *** 420,425 **** QGraphicsScene* Canvas; ! Q3VBoxLayout* CanvasFrameLayout; ! GridItem* TheGrid; ImageItem* TheImage; --- 421,426 ---- QGraphicsScene* Canvas; ! QVBoxLayout* CanvasFrameLayout; ! GridItem* TheGrid; ImageItem* TheImage; Index: config.cpp =================================================================== RCS file: /cvsroot/lprof/lprof/src/lprofqt/config.cpp,v retrieving revision 1.8.2.2 retrieving revision 1.8.2.3 diff -C2 -d -r1.8.2.2 -r1.8.2.3 *** config.cpp 16 Jun 2009 07:26:25 -0000 1.8.2.2 --- config.cpp 30 Jun 2009 00:00:09 -0000 1.8.2.3 *************** *** 41,45 **** #include <qlineedit.h> #include <qtextcodec.h> ! #include <q3urloperator.h> #include <QSettings> #include <qassistantclient.h> --- 41,45 ---- #include <qlineedit.h> #include <qtextcodec.h> ! //#include <q3urloperator.h> #include <QSettings> #include <qassistantclient.h> *************** *** 48,57 **** //Added by qt3to4: #include <QTranslator> ! #include <Q3VBoxLayout> #include <QTimer> - #include "ui_lprofmainbase.h" ! Q3UrlOperator urlOp; #if !defined(__WIN32__) && (defined(_WIN32) || defined(WIN32)) --- 48,56 ---- //Added by qt3to4: #include <QTranslator> ! #include <QVBoxLayout> #include <QTimer> #include "ui_lprofmainbase.h" ! //Q3UrlOperator urlOp; #if !defined(__WIN32__) && (defined(_WIN32) || defined(WIN32)) *************** *** 177,182 **** int h = ui->CanvasFrame -> height(); if (CanvasFrameLayout) delete CanvasFrameLayout; ! CanvasFrameLayout =new Q3VBoxLayout( ui->CanvasFrame ); ! CanvasFrameLayout->setSpacing( 1 ); CanvasFrameLayout->setMargin( 1 ); if (Canvas) delete Canvas; --- 176,181 ---- int h = ui->CanvasFrame -> height(); if (CanvasFrameLayout) delete CanvasFrameLayout; ! CanvasFrameLayout =new QVBoxLayout( ui->CanvasFrame ); ! CanvasFrameLayout->setSpacing( 1 ); CanvasFrameLayout->setMargin( 1 ); if (Canvas) delete Canvas; *************** *** 307,314 **** } void lprofMain::templateFileCopied( Q3NetworkOperation *op ) { ! // qDebug(QString::fromLocal8Bit("templateFileCopied()")); ! if ( !op ) return; --- 306,314 ---- } + /* void lprofMain::templateFileCopied( Q3NetworkOperation *op ) { ! //qDebug(QString::fromLocal8Bit("templateFileCopied()")); ! qDebug("templateFileCopied()"); if ( !op ) return; *************** *** 323,335 **** 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) { --- 323,335 ---- 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) { *************** *** 407,416 **** if (!f.exists()) { ! mutexTempFile.lock(); ! copyNumTempFile = copyNumTempFile + 1; ! urlOpTempFile.copy( data_path + QString::fromLocal8Bit("/template/") + (*it).fileName(), dir->homeDirPath() + ! lprofBaseDir + QString::fromLocal8Bit("/templates/")); ! mutexTempFile.unlock(); } } --- 407,424 ---- if (!f.exists()) { ! //mutexTempFile.lock(); ! /* copyNumTempFile = copyNumTempFile + 1; ! urlOpTempFile.copy( data_path + QString::fromLocal8Bit("/template/") + (*it).fileName(), dir->homeDirPath() + ! lprofBaseDir + QString::fromLocal8Bit("/templates/"));*/ ! bool file_copied; ! file_copied=QFile::copy(data_path + QString::fromLocal8Bit("/template/") +(*it).fileName(), ! dir->homeDirPath() +lprofBaseDir + QString::fromLocal8Bit("/templates/") + (*it).fileName()); ! if(!file_copied) ! { ! // qDebug("Error on template file copy"); ! QMessageBox::information( this, tr( "Template File not copied" ), tr("The template file could not be copied")); ! } ! // mutexTempFile.unlock(); } } *************** *** 484,493 **** if (lprofSettings) delete lprofSettings; ! QSettings::setPath(QSettings::NativeFormat, QSettings::UserScope, QDir::homeDirPath() + lprofBaseDir + QString::fromLocal8Bit("/config")); lprofSettings = new QSettings(QString::fromLocal8Bit("lprof.sourceforge.net"), QString::fromLocal8Bit("lprof")); lprofSettings -> setFallbacksEnabled (FALSE); ! ui->SelectTemplate-> Dir = lprofSettings->readEntry(QString::fromLocal8Bit("/LPROF/Files/TEMPLATE_DIR"), QString::fromLocal8Bit("")); ! // do set up serial devices // FIXME --- 492,501 ---- if (lprofSettings) delete lprofSettings; ! QSettings::setPath(QSettings::NativeFormat, QSettings::UserScope, QDir::homeDirPath() + lprofBaseDir + QString::fromLocal8Bit("/config")); lprofSettings = new QSettings(QString::fromLocal8Bit("lprof.sourceforge.net"), QString::fromLocal8Bit("lprof")); lprofSettings -> setFallbacksEnabled (FALSE); ! ui->SelectTemplate-> Dir = lprofSettings->value(QString::fromLocal8Bit("/LPROF/Files/TEMPLATE_DIR"), QString::fromLocal8Bit("")).toString(); ! // do set up serial devices // FIXME *************** *** 499,524 **** ui->SelectTemplate->setCurrItem(0); ! ui->MonitorProfileSelector -> Dir = lprofSettings->readEntry( QString::fromLocal8Bit("/LPROF/Files/MONITOR_PROFILES_DIR"), QString::fromLocal8Bit("")); ! ui->MonitorProfileSelector -> RestrictColorspace = icSigRgbData; ui->MonitorProfileSelector -> RestrictClass = icSigDisplayClass; ui->MonitorProfileSelector -> FillValues(); ! temp = lprofSettings->readEntry( QString::fromLocal8Bit("/LPROF/Files/MONITOR_PROFILE"), QString::fromLocal8Bit("")); ! ! ui->MonitorProfileSelector -> setFilename(lprofSettings->readEntry( QString::fromLocal8Bit("/LPROF/Files/MONITOR_PROFILE"), QString::fromLocal8Bit(""))); ! ui->InputProfileSelector->Dir = lprofSettings->readEntry( QString::fromLocal8Bit("/LPROF/Files/INPUT_PROFILES_DIR") , QString::fromLocal8Bit("")); ui->InputProfileSelector-> RestrictColorspace = icSigRgbData; ui->InputProfileSelector->FillValues(); ! ui->InputProfileSelector->setFilename(lprofSettings->readEntry( QString::fromLocal8Bit("/LPROF/Files/INPUT_PROFILE") , QString::fromLocal8Bit(""))); ! ! ui->SafeFrame -> setValue(lprofSettings->readNumEntry( QString::fromLocal8Bit("/LPROF/numbers/SAFE_FRAME"), 0)); ! ui->TargetSelector->Dir = lprofSettings->readEntry(QString::fromLocal8Bit("/LPROF/Files/TARGET_DIR"), QString::fromLocal8Bit("")); ui->TargetSelector->setCurrItem(0); targetList->clear(); ! const int n=lprofSettings->readNumEntry( QString::fromLocal8Bit("/LPROF/numbers/NUMBER_TARGETS"), 0); ! ui->ComboBoxIntent -> setCurrentItem (lprofSettings -> readNumEntry(QString::fromLocal8Bit("/LPROF/numbers/intent_curr_item"), 0)); for (int i=0; i < n; i++) --- 507,530 ---- ui->SelectTemplate->setCurrItem(0); ! ui->MonitorProfileSelector -> Dir = lprofSettings->value( QString::fromLocal8Bit("/LPROF/Files/MONITOR_PROFILES_DIR"), QString::fromLocal8Bit("")).toString(); ! ui->MonitorProfileSelector -> RestrictColorspace = icSigRgbData; ui->MonitorProfileSelector -> RestrictClass = icSigDisplayClass; ui->MonitorProfileSelector -> FillValues(); ! temp = lprofSettings->value( QString::fromLocal8Bit("/LPROF/Files/MONITOR_PROFILE"), QString::fromLocal8Bit("")).toString(); ! ui->MonitorProfileSelector -> setFilename(lprofSettings->value(QString::fromLocal8Bit("/LPROF/Files/MONITOR_PROFILE"), QString::fromLocal8Bit("")).toString()); ! ui->InputProfileSelector->Dir = lprofSettings->value( QString::fromLocal8Bit("/LPROF/Files/INPUT_PROFILES_DIR") , QString::fromLocal8Bit("")).toString(); ui->InputProfileSelector-> RestrictColorspace = icSigRgbData; ui->InputProfileSelector->FillValues(); ! ui->InputProfileSelector->setFilename(lprofSettings->value( QString::fromLocal8Bit("/LPROF/Files/INPUT_PROFILE") , QString::fromLocal8Bit("")).toString()); ! ui->SafeFrame -> setValue(lprofSettings->value( QString::fromLocal8Bit("/LPROF/numbers/SAFE_FRAME"), 0).toInt()); ! ui->TargetSelector->Dir = lprofSettings->value(QString::fromLocal8Bit("/LPROF/Files/TARGET_DIR"), QString::fromLocal8Bit("")).toString(); ui->TargetSelector->setCurrItem(0); targetList->clear(); ! const int n=lprofSettings->value( QString::fromLocal8Bit("/LPROF/numbers/NUMBER_TARGETS"), 0).toInt(); ! ui->ComboBoxIntent -> setCurrentItem (lprofSettings -> value(QString::fromLocal8Bit("/LPROF/numbers/intent_curr_item"), 0).toInt()); for (int i=0; i < n; i++) *************** *** 526,532 **** // file target to template list with information temp.sprintf("/LPROF/Files/TARGET%i", i); ! hold.targetFile=lprofSettings->readEntry(temp, QString::fromLocal8Bit("")); temp.sprintf("/LPROF/Files/TEMPLATE%i", i); ! hold.templateFile=lprofSettings->readEntry(temp, QString::fromLocal8Bit("")); add_target(hold); } --- 532,538 ---- // file target to template list with information temp.sprintf("/LPROF/Files/TARGET%i", i); ! hold.targetFile=lprofSettings->value(temp, QString::fromLocal8Bit("")).toString(); temp.sprintf("/LPROF/Files/TEMPLATE%i", i); ! hold.templateFile=lprofSettings->value(temp, QString::fromLocal8Bit("")).toString(); add_target(hold); } *************** *** 546,557 **** slotTargetRefChanged(); ! ui->OutputFileEdit_Mon -> setText(lprofSettings->readEntry( QString::fromLocal8Bit("/LPROF/Files/MON_OUTPUT_PROFILE"), ! QString::fromLocal8Bit(""))); ! ui->OutputFileEdit -> setText(lprofSettings->readEntry( QString::fromLocal8Bit("/LPROF/Files/OUTPUT_PROFILE"), ! QString::fromLocal8Bit(""))); ! ! dsizes.reffileH = lprofSettings -> readNumEntry(QString::fromLocal8Bit("/LPROF/numbers/refFile_h"),0); if (dsizes.reffileH == 0) --- 552,563 ---- slotTargetRefChanged(); ! ui->OutputFileEdit_Mon -> setText(lprofSettings->value( QString::fromLocal8Bit("/LPROF/Files/MON_OUTPUT_PROFILE"), ! QString::fromLocal8Bit("")).toString()); ! ui->OutputFileEdit -> setText(lprofSettings->value( QString::fromLocal8Bit("/LPROF/Files/OUTPUT_PROFILE"), ! QString::fromLocal8Bit("")).toString()); ! ! dsizes.reffileH = lprofSettings -> value(QString::fromLocal8Bit("/LPROF/numbers/refFile_h"),0).toInt(); if (dsizes.reffileH == 0) *************** *** 595,611 **** else { ! dsizes.reffileW = lprofSettings -> readNumEntry(QString::fromLocal8Bit("/LPROF/numbers/refFile_w"),0); ! dsizes.profparmsH = lprofSettings -> readNumEntry(QString::fromLocal8Bit("/LPROF/numbers/profparms_h"),0); ! dsizes.profparmsW = lprofSettings -> readNumEntry(QString::fromLocal8Bit("/LPROF/numbers/profparms_w"),0); ! dsizes.profparmsmonH = lprofSettings -> readNumEntry(QString::fromLocal8Bit("/LPROF/numbers/profparmsmon_h"),0); ! dsizes.profparmsmonW = lprofSettings -> readNumEntry(QString::fromLocal8Bit("/LPROF/numbers/profparmsmon_w"),0); ! dsizes.profidH = lprofSettings -> readNumEntry(QString::fromLocal8Bit("/LPROF/numbers/profid_h"),0); ! dsizes.profidW = lprofSettings -> readNumEntry(QString::fromLocal8Bit("/LPROF/numbers/profid_w"),0); ! dsizes.profchH = lprofSettings -> readNumEntry(QString::fromLocal8Bit("/LPROF/numbers/profch_h"),0); ! dsizes.profchW = lprofSettings -> readNumEntry(QString::fromLocal8Bit("/LPROF/numbers/profch_w"),0); ! dsizes.monvalH = lprofSettings -> readNumEntry(QString::fromLocal8Bit("/LPROF/numbers/monval_h"),0); ! dsizes.monvalW = lprofSettings -> readNumEntry(QString::fromLocal8Bit("/LPROF/numbers/monval_w"),0); ! dsizes.lprofH = lprofSettings -> readNumEntry(QString::fromLocal8Bit("/LPROF/numbers/lprof_h"),0); ! dsizes.lprofW = lprofSettings -> readNumEntry(QString::fromLocal8Bit("/LPROF/numbers/lprof_w"),0); } // qDebug(QString::fromLocal8Bit("lprofMain::LoadConfig() done")); --- 601,617 ---- else { ! dsizes.reffileW = lprofSettings -> value(QString::fromLocal8Bit("/LPROF/numbers/refFile_w"),0).toInt(); ! dsizes.profparmsH = lprofSettings -> value(QString::fromLocal8Bit("/LPROF/numbers/profparms_h"),0).toInt(); ! dsizes.profparmsW = lprofSettings -> value(QString::fromLocal8Bit("/LPROF/numbers/profparms_w"),0).toInt(); ! dsizes.profparmsmonH = lprofSettings -> value(QString::fromLocal8Bit("/LPROF/numbers/profparmsmon_h"),0).toInt(); ! dsizes.profparmsmonW = lprofSettings -> value(QString::fromLocal8Bit("/LPROF/numbers/profparmsmon_w"),0).toInt(); ! dsizes.profidH = lprofSettings -> value(QString::fromLocal8Bit("/LPROF/numbers/profid_h"),0).toInt(); ! dsizes.profidW = lprofSettings -> value(QString::fromLocal8Bit("/LPROF/numbers/profid_w"),0).toInt(); ! dsizes.profchH = lprofSettings -> value(QString::fromLocal8Bit("/LPROF/numbers/profch_h"),0).toInt(); ! dsizes.profchW = lprofSettings -> value(QString::fromLocal8Bit("/LPROF/numbers/profch_w"),0).toInt(); ! dsizes.monvalH = lprofSettings -> value(QString::fromLocal8Bit("/LPROF/numbers/monval_h"),0).toInt(); ! dsizes.monvalW = lprofSettings -> value(QString::fromLocal8Bit("/LPROF/numbers/monval_w"),0).toInt(); ! dsizes.lprofH = lprofSettings -> value(QString::fromLocal8Bit("/LPROF/numbers/lprof_h"),0).toInt(); ! dsizes.lprofW = lprofSettings -> value(QString::fromLocal8Bit("/LPROF/numbers/lprof_w"),0).toInt(); } // qDebug(QString::fromLocal8Bit("lprofMain::LoadConfig() done")); *************** *** 669,674 **** // qDebug(QString::fromLocal8Bit("lprofMain::SaveConfig")); ! lprofSettings->writeEntry(QString::fromLocal8Bit("/LPROF/Files/TARGET_DIR"), ui->TargetSelector->Dir); ! lprofSettings->writeEntry(QString::fromLocal8Bit("/LPROF/numbers/NUMBER_TARGETS"), (int) targetList->count()); if (targetList->count() > 0) for (uint i=0; i<=targetList->count()-1; i++) --- 675,680 ---- // qDebug(QString::fromLocal8Bit("lprofMain::SaveConfig")); ! lprofSettings->setValue(QString::fromLocal8Bit("/LPROF/Files/TARGET_DIR"), ui->TargetSelector->Dir); ! lprofSettings->setValue(QString::fromLocal8Bit("/LPROF/numbers/NUMBER_TARGETS"), (int) targetList->count()); if (targetList->count() > 0) for (uint i=0; i<=targetList->count()-1; i++) *************** *** 676,708 **** // add target to template information temp.sprintf("/LPROF/Files/TARGET%i", i); ! lprofSettings->writeEntry(temp, targetList->at(i)->targetFile); temp.sprintf("/LPROF/Files/TEMPLATE%i", i); ! lprofSettings->writeEntry(temp, targetList->at(i)->templateFile); } ! lprofSettings->writeEntry(QString::fromLocal8Bit("/LPROF/Files/OUTPUT_PROFILE"), ui->OutputFileEdit -> text()); ! lprofSettings->writeEntry(QString::fromLocal8Bit("/LPROF/Files/MON_OUTPUT_PROFILE"), ui->OutputFileEdit_Mon ->text()); ! lprofSettings->writeEntry(QString::fromLocal8Bit("/LPROF/Files/TEMPLATE_DIR"), ui->SelectTemplate->Dir); ! // lprofSettings->writeEntry("/LPROF/numbers/TEMPLATE_NUM", (int) ui->SelectTemplate->getCurrItem()); ! lprofSettings->writeEntry(QString::fromLocal8Bit("/LPROF/Files/MONITOR_PROFILES_DIR"), ui->MonitorProfileSelector->Dir); ! lprofSettings->writeEntry(QString::fromLocal8Bit("/LPROF/Files/MONITOR_PROFILE"), ui->MonitorProfileSelector->getFilename()); ! lprofSettings->writeEntry(QString::fromLocal8Bit("/LPROF/Files/INPUT_PROFILES_DIR"), ui->InputProfileSelector->Dir); ! lprofSettings->writeEntry(QString::fromLocal8Bit("/LPROF/Files/INPUT_PROFILE"), ui->InputProfileSelector->getFilename()); ! lprofSettings->writeEntry(QString::fromLocal8Bit("/LPROF/numbers/SAFE_FRAME"), (int) ui->SafeFrame->value()); ! lprofSettings -> writeEntry(QString::fromLocal8Bit("/LPROF/numbers/lprof_h"), this -> height()); ! lprofSettings -> writeEntry(QString::fromLocal8Bit("/LPROF/numbers/lprof_w"), this -> width()); ! lprofSettings -> writeEntry(QString::fromLocal8Bit("/LPROF/numbers/refFile_h"),dsizes.reffileH); ! lprofSettings -> writeEntry(QString::fromLocal8Bit("/LPROF/numbers/refFile_w"),dsizes.reffileW); ! lprofSettings -> writeEntry(QString::fromLocal8Bit("/LPROF/numbers/monval_h"),dsizes.monvalH); ! lprofSettings -> writeEntry(QString::fromLocal8Bit("/LPROF/numbers/monval_w"),dsizes.monvalW); ! lprofSettings -> writeEntry(QString::fromLocal8Bit("/LPROF/numbers/profparms_h"),dsizes.profparmsH); ! lprofSettings -> writeEntry(QString::fromLocal8Bit("/LPROF/numbers/profparms_w"),dsizes.profparmsW); ! lprofSettings -> writeEntry(QString::fromLocal8Bit("/LPROF/numbers/profparmsmon_h"),dsizes.profparmsmonH); ! lprofSettings -> writeEntry(QString::fromLocal8Bit("/LPROF/numbers/profparmsmon_w"),dsizes.profparmsmonW); ! lprofSettings -> writeEntry(QString::fromLocal8Bit("/LPROF/numbers/profid_h"),dsizes.profidH); ! lprofSettings -> writeEntry(QString::fromLocal8Bit("/LPROF/numbers/profid_w"),dsizes.profidW); ! lprofSettings -> writeEntry(QString::fromLocal8Bit("/LPROF/numbers/profch_h"),dsizes.profchH); ! lprofSettings -> writeEntry(QString::fromLocal8Bit("/LPROF/numbers/profch_w"),dsizes.profchW); ! lprofSettings -> writeEntry(QString::fromLocal8Bit("/LPROF/numbers/intent_curr_item"),ui->ComboBoxIntent -> currentItem()); // lprofSettings->~QSettings(); --- 682,714 ---- // add target to template information temp.sprintf("/LPROF/Files/TARGET%i", i); ! lprofSettings->setValue(temp, targetList->at(i)->targetFile); temp.sprintf("/LPROF/Files/TEMPLATE%i", i); ! lprofSettings->setValue(temp, targetList->at(i)->templateFile); } ! lprofSettings->setValue(QString::fromLocal8Bit("/LPROF/Files/OUTPUT_PROFILE"), ui->OutputFileEdit -> text()); ! lprofSettings->setValue(QString::fromLocal8Bit("/LPROF/Files/MON_OUTPUT_PROFILE"), ui->OutputFileEdit_Mon ->text()); ! lprofSettings->setValue(QString::fromLocal8Bit("/LPROF/Files/TEMPLATE_DIR"), ui->SelectTemplate->Dir); ! // lprofSettings->setValue("/LPROF/numbers/TEMPLATE_NUM", (int) ui->SelectTemplate->getCurrItem()); ! lprofSettings->setValue(QString::fromLocal8Bit("/LPROF/Files/MONITOR_PROFILES_DIR"), ui->MonitorProfileSelector->Dir); ! lprofSettings->setValue(QString::fromLocal8Bit("/LPROF/Files/MONITOR_PROFILE"), ui->MonitorProfileSelector->getFilename()); ! lprofSettings->setValue(QString::fromLocal8Bit("/LPROF/Files/INPUT_PROFILES_DIR"), ui->InputProfileSelector->Dir); ! lprofSettings->setValue(QString::fromLocal8Bit("/LPROF/Files/INPUT_PROFILE"), ui->InputProfileSelector->getFilename()); ! lprofSettings->setValue(QString::fromLocal8Bit("/LPROF/numbers/SAFE_FRAME"), (int) ui->SafeFrame->value()); ! lprofSettings -> setValue(QString::fromLocal8Bit("/LPROF/numbers/lprof_h"), this -> height()); ! lprofSettings -> setValue(QString::fromLocal8Bit("/LPROF/numbers/lprof_w"), this -> width()); ! lprofSettings -> setValue(QString::fromLocal8Bit("/LPROF/numbers/refFile_h"),dsizes.reffileH); ! lprofSettings -> setValue(QString::fromLocal8Bit("/LPROF/numbers/refFile_w"),dsizes.reffileW); ! lprofSettings -> setValue(QString::fromLocal8Bit("/LPROF/numbers/monval_h"),dsizes.monvalH); ! lprofSettings -> setValue(QString::fromLocal8Bit("/LPROF/numbers/monval_w"),dsizes.monvalW); ! lprofSettings -> setValue(QString::fromLocal8Bit("/LPROF/numbers/profparms_h"),dsizes.profparmsH); ! lprofSettings -> setValue(QString::fromLocal8Bit("/LPROF/numbers/profparms_w"),dsizes.profparmsW); ! lprofSettings -> setValue(QString::fromLocal8Bit("/LPROF/numbers/profparmsmon_h"),dsizes.profparmsmonH); ! lprofSettings -> setValue(QString::fromLocal8Bit("/LPROF/numbers/profparmsmon_w"),dsizes.profparmsmonW); ! lprofSettings -> setValue(QString::fromLocal8Bit("/LPROF/numbers/profid_h"),dsizes.profidH); ! lprofSettings -> setValue(QString::fromLocal8Bit("/LPROF/numbers/profid_w"),dsizes.profidW); ! lprofSettings -> setValue(QString::fromLocal8Bit("/LPROF/numbers/profch_h"),dsizes.profchH); ! lprofSettings -> setValue(QString::fromLocal8Bit("/LPROF/numbers/profch_w"),dsizes.profchW); ! lprofSettings -> setValue(QString::fromLocal8Bit("/LPROF/numbers/intent_curr_item"),ui->ComboBoxIntent -> currentItem()); // lprofSettings->~QSettings(); *************** *** 793,837 **** profile = ui->OutputFileEdit -> text().mid(ui->OutputFileEdit -> text().findRev(QString::fromLocal8Bit("/")) + 1, ui->OutputFileEdit -> text().length() - ui->OutputFileEdit -> text().findRev(QString::fromLocal8Bit("/")) - 1); ! lprofSettings->writeEntry(QString::fromLocal8Bit("/LPROF/profile-") + profile + QString::fromLocal8Bit("/Files/OUTPUT_PROFILE"), ui->OutputFileEdit -> text()); ! urlOp.copy(measfile, d.homeDirPath() + ! lprofBaseDir + QString::fromLocal8Bit("/measurements/") + profile + QString::fromLocal8Bit(".cgt"), false, false); ! lprofSettings->writeEntry(QString::fromLocal8Bit("/LPROF/profile-") + profile + QString::fromLocal8Bit("/Files/MEASUREMENT_SHEET") , profile + QString::fromLocal8Bit(".cgt")); ! lprofSettings->writeEntry(QString::fromLocal8Bit("/LPROF/profile-") + profile + QString::fromLocal8Bit("/numbers/ur_x"), Marks.ur_x); ! lprofSettings->writeEntry(QString::fromLocal8Bit("/LPROF/profile-") + profile + QString::fromLocal8Bit("/numbers/ur_y"), Marks.ur_y); ! lprofSettings->writeEntry(QString::fromLocal8Bit("/LPROF/profile-") + profile + QString::fromLocal8Bit("/numbers/lr_x"), Marks.lr_x); ! lprofSettings->writeEntry(QString::fromLocal8Bit("/LPROF/profile-") + profile + QString::fromLocal8Bit("/numbers/lr_y"), Marks.lr_y); ! lprofSettings->writeEntry(QString::fromLocal8Bit("/LPROF/profile-") + profile + QString::fromLocal8Bit("/numbers/ul_x"), Marks.ul_x); ! lprofSettings->writeEntry(QString::fromLocal8Bit("/LPROF/profile-") + profile + QString::fromLocal8Bit("/numbers/ul_y"), Marks.ul_y); ! lprofSettings->writeEntry(QString::fromLocal8Bit("/LPROF/profile-") + profile + QString::fromLocal8Bit("/numbers/ll_x"), Marks.ll_x); ! lprofSettings->writeEntry(QString::fromLocal8Bit("/LPROF/profile-") + profile + QString::fromLocal8Bit("/numbers/ll_y"), Marks.ll_y); ! lprofSettings->writeEntry(QString::fromLocal8Bit("/LPROF/profile-") + profile + QString::fromLocal8Bit("/Files/IT8Image"), image_file_name); ! lprofSettings->writeEntry(QString::fromLocal8Bit("/LPROF/profile-") + profile + QString::fromLocal8Bit("/numbers/RsplSmoothness"), sys.RsplSmoothness); ! lprofSettings->writeEntry(QString::fromLocal8Bit("/LPROF/profile-") + profile + QString::fromLocal8Bit("/boolians/lOptRGCV"), sys.lOptRGCV); ! lprofSettings->writeEntry(QString::fromLocal8Bit("/LPROF/profile-") + profile + QString::fromLocal8Bit("/numbers/CLUT_POINTS") , (int) sys.hdr.CLUTPoints); ! lprofSettings->writeEntry(QString::fromLocal8Bit("/LPROF/profile-") + profile + QString::fromLocal8Bit("/numbers/PROFILE_VERBOSITY_LEVEL") , (int) sys.hdr.ProfileVerbosityLevel); ! lprofSettings->writeEntry( QString::fromLocal8Bit("/LPROF/profile-") + profile + QString::fromLocal8Bit("/numbers/TEMPLATE_NUM"), ui->SelectTemplate->getCurrItem() ); ! lprofSettings->writeEntry( QString::fromLocal8Bit("/LPROF/profile-") + profile + QString::fromLocal8Bit("/numbers/TARGET_NUM"), ui->TargetSelector->getCurrItem()); ! lprofSettings->writeEntry( QString::fromLocal8Bit("/LPROF/profile-") + profile + QString::fromLocal8Bit("/numbers/TEMPLATE_Filename"), ui->SelectTemplate->getFilename() ); ! lprofSettings->writeEntry( QString::fromLocal8Bit("/LPROF/profile-") + profile + QString::fromLocal8Bit("/numbers/TARGET_Filename"), ui->TargetSelector->getFilename()); // Profile viewing conditions lprofSettings // from profile parms dialog ! lprofSettings->writeEntry(QString::fromLocal8Bit("/LPROF/profile-") + profile + QString::fromLocal8Bit("/numbers/surround"), sys.hdr.device.surround); ! lprofSettings->writeEntry(QString::fromLocal8Bit("/LPROF/profile-") + profile + QString::fromLocal8Bit("/numbers/La"), sys.hdr.device.La); ! lprofSettings->writeEntry(QString::fromLocal8Bit("/LPROF/profile-") + profile + QString::fromLocal8Bit("/numbers/Yb"), sys.hdr.device.Yb); ! lprofSettings->writeEntry(QString::fromLocal8Bit("/LPROF/profile-") + profile + QString::fromLocal8Bit("/numbers/PCSsurround"), sys.hdr.PCS.surround); ! lprofSettings->writeEntry(QString::fromLocal8Bit("/LPROF/profile-") + profile + QString::fromLocal8Bit("/numbers/PCSLa"), sys.hdr.PCS.La); ! lprofSettings->writeEntry(QString::fromLocal8Bit("/LPROF/profile-") + profile + QString::fromLocal8Bit("/numbers/PCSYb"), sys.hdr.PCS.Yb); ! lprofSettings->writeEntry(QString::fromLocal8Bit("/LPROF/profile-") + profile + QString::fromLocal8Bit("/numbers/deviceVC"), sys.hdr.viewingConditionsPredefDevice); ! lprofSettings->writeEntry(QString::fromLocal8Bit("/LPROF/profile-") + profile + QString::fromLocal8Bit("/numbers/PCSVC"), sys.hdr.viewingConditionsPredefPCS); // profile ID ! lprofSettings->writeEntry(QString::fromLocal8Bit("/LPROF/profile-") + profile + QString::fromLocal8Bit("/text/manufacturer"), sys.hdr.Manufacturer); ! lprofSettings->writeEntry(QString::fromLocal8Bit("/LPROF/profile-") + profile + QString::fromLocal8Bit("/text/model"), sys.hdr.Model); ! lprofSettings->writeEntry(QString::fromLocal8Bit("/LPROF/profile-") + profile + QString::fromLocal8Bit("/text/copyright"), sys.hdr.Copyright); ! lprofSettings->writeEntry(QString::fromLocal8Bit("/LPROF/profile-") + profile + QString::fromLocal8Bit("/text/description"), sys.hdr.Description); } --- 799,847 ---- profile = ui->OutputFileEdit -> text().mid(ui->OutputFileEdit -> text().findRev(QString::fromLocal8Bit("/")) + 1, ui->OutputFileEdit -> text().length() - ui->OutputFileEdit -> text().findRev(QString::fromLocal8Bit("/")) - 1); ! lprofSettings->setValue(QString::fromLocal8Bit("/LPROF/profile-") + profile + QString::fromLocal8Bit("/Files/OUTPUT_PROFILE"), ui->OutputFileEdit -> text()); ! /*urlOp.copy(measfile, d.homeDirPath() + ! lprofBaseDir + QString::fromLocal8Bit("/measurements/") + profile + QString::fromLocal8Bit(".cgt"), false, false); */ ! if(QFile::exists(d.homeDirPath()+lprofBaseDir + QString::fromLocal8Bit("/measurements/") + profile + QString::fromLocal8Bit(".cgt"))) ! { QFile::remove(d.homeDirPath()+lprofBaseDir + QString::fromLocal8Bit("/measurements/") + profile + QString::fromLocal8Bit(".cgt"));} ! QFile::copy(measfile, d.homeDirPath() + ! lprofBaseDir + QString::fromLocal8Bit("/measurements/") + profile + QString::fromLocal8Bit(".cgt")); ! lprofSettings->setValue(QString::fromLocal8Bit("/LPROF/profile-") + profile + QString::fromLocal8Bit("/Files/MEASUREMENT_SHEET") , profile + QString::fromLocal8Bit(".cgt")); ! lprofSettings->setValue(QString::fromLocal8Bit("/LPROF/profile-") + profile + QString::fromLocal8Bit("/numbers/ur_x"), Marks.ur_x); ! lprofSettings->setValue(QString::fromLocal8Bit("/LPROF/profile-") + profile + QString::fromLocal8Bit("/numbers/ur_y"), Marks.ur_y); ! lprofSettings->setValue(QString::fromLocal8Bit("/LPROF/profile-") + profile + QString::fromLocal8Bit("/numbers/lr_x"), Marks.lr_x); ! lprofSettings->setValue(QString::fromLocal8Bit("/LPROF/profile-") + profile + QString::fromLocal8Bit("/numbers/lr_y"), Marks.lr_y); ! lprofSettings->setValue(QString::fromLocal8Bit("/LPROF/profile-") + profile + QString::fromLocal8Bit("/numbers/ul_x"), Marks.ul_x); ! lprofSettings->setValue(QString::fromLocal8Bit("/LPROF/profile-") + profile + QString::fromLocal8Bit("/numbers/ul_y"), Marks.ul_y); ! lprofSettings->setValue(QString::fromLocal8Bit("/LPROF/profile-") + profile + QString::fromLocal8Bit("/numbers/ll_x"), Marks.ll_x); ! lprofSettings->setValue(QString::fromLocal8Bit("/LPROF/profile-") + profile + QString::fromLocal8Bit("/numbers/ll_y"), Marks.ll_y); ! lprofSettings->setValue(QString::fromLocal8Bit("/LPROF/profile-") + profile + QString::fromLocal8Bit("/Files/IT8Image"), image_file_name); ! lprofSettings->setValue(QString::fromLocal8Bit("/LPROF/profile-") + profile + QString::fromLocal8Bit("/numbers/RsplSmoothness"), sys.RsplSmoothness); ! lprofSettings->setValue(QString::fromLocal8Bit("/LPROF/profile-") + profile + QString::fromLocal8Bit("/boolians/lOptRGCV"), sys.lOptRGCV); ! lprofSettings->setValue(QString::fromLocal8Bit("/LPROF/profile-") + profile + QString::fromLocal8Bit("/numbers/CLUT_POINTS") , (int) sys.hdr.CLUTPoints); ! lprofSettings->setValue(QString::fromLocal8Bit("/LPROF/profile-") + profile + QString::fromLocal8Bit("/numbers/PROFILE_VERBOSITY_LEVEL") , (int) sys.hdr.ProfileVerbosityLevel); ! lprofSettings->setValue( QString::fromLocal8Bit("/LPROF/profile-") + profile + QString::fromLocal8Bit("/numbers/TEMPLATE_NUM"), ui->SelectTemplate->getCurrItem() ); ! lprofSettings->setValue( QString::fromLocal8Bit("/LPROF/profile-") + profile + QString::fromLocal8Bit("/numbers/TARGET_NUM"), ui->TargetSelector->getCurrItem()); ! lprofSettings->setValue( QString::fromLocal8Bit("/LPROF/profile-") + profile + QString::fromLocal8Bit("/numbers/TEMPLATE_Filename"), ui->SelectTemplate->getFilename() ); ! lprofSettings->setValue( QString::fromLocal8Bit("/LPROF/profile-") + profile + QString::fromLocal8Bit("/numbers/TARGET_Filename"), ui->TargetSelector->getFilename()); // Profile viewing conditions lprofSettings // from profile parms dialog ! lprofSettings->setValue(QString::fromLocal8Bit("/LPROF/profile-") + profile + QString::fromLocal8Bit("/numbers/surround"), sys.hdr.device.surround); ! lprofSettings->setValue(QString::fromLocal8Bit("/LPROF/profile-") + profile + QString::fromLocal8Bit("/numbers/La"), sys.hdr.device.La); ! lprofSettings->setValue(QString::fromLocal8Bit("/LPROF/profile-") + profile + QString::fromLocal8Bit("/numbers/Yb"), sys.hdr.device.Yb); ! lprofSettings->setValue(QString::fromLocal8Bit("/LPROF/profile-") + profile + QString::fromLocal8Bit("/numbers/PCSsurround"), sys.hdr.PCS.surround); ! lprofSettings->setValue(QString::fromLocal8Bit("/LPROF/profile-") + profile + QString::fromLocal8Bit("/numbers/PCSLa"), sys.hdr.PCS.La); ! lprofSettings->setValue(QString::fromLocal8Bit("/LPROF/profile-") + profile + QString::fromLocal8Bit("/numbers/PCSYb"), sys.hdr.PCS.Yb); ! lprofSettings->setValue(QString::fromLocal8Bit("/LPROF/profile-") + profile + QString::fromLocal8Bit("/numbers/deviceVC"), sys.... [truncated message content] |
|
From: Amit K. <ami...@us...> - 2009-06-30 00:01:00
|
Update of /cvsroot/lprof/lprof/src/libqtlcmswidgets In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv20052/libqtlcmswidgets Modified Files: Tag: GSoC-2009 qtlcmswidgets.cpp Log Message: Index: qtlcmswidgets.cpp =================================================================== RCS file: /cvsroot/lprof/lprof/src/libqtlcmswidgets/qtlcmswidgets.cpp,v retrieving revision 1.42.2.3 retrieving revision 1.42.2.4 diff -C2 -d -r1.42.2.3 -r1.42.2.4 *** qtlcmswidgets.cpp 25 Jun 2009 13:32:07 -0000 1.42.2.3 --- qtlcmswidgets.cpp 30 Jun 2009 00:00:09 -0000 1.42.2.4 *************** *** 48,53 **** #include <qcursor.h> #include <QPolygon> ! ! #include <setjmp.h> --- 48,52 ---- #include <qcursor.h> #include <QPolygon> ! #include <QFileDialog> #include <setjmp.h> *************** *** 160,166 **** { QString fn; ! Q3FileDialog fd; ! ! fd.setShowHiddenFiles(TRUE); if (lUseLineEdit) --- 159,163 ---- { QString fn; ! QFileDialog fd; if (lUseLineEdit) *************** *** 168,191 **** if (lForOutput) { ! fn = fd.getSaveFileName(Dir, ! FileMask, ! this, ! /*QString::null */ "", ! Prompt->text()); } else { ! fn = fd.getOpenFileName(Dir, ! FileMask, ! this, ! /* QString::null */ "", ! Prompt->text()); } } else { ! fn = fd.getExistingDirectory(Dir, this, "", ! QTranslator::tr("Select ") + getPrompt() + ! QTranslator::tr(" directory"), TRUE); } --- 165,179 ---- if (lForOutput) { ! fn = fd.getSaveFileName(this, Prompt->text(), Dir, FileMask); } else { ! fn = fd.getOpenFileName(this, Prompt->text(), Dir, FileMask); } } else { ! fn = fd.getExistingDirectory(this, QTranslator::tr("Select ") + getPrompt() + QTranslator::tr(" directory"), ! Dir, QFileDialog::ShowDirsOnly); } *************** *** 679,683 **** { QTableWidgetItem* Item = new QTableWidgetItem(s,0); ! Item->setFlags(Qt::ItemIsSelectable); Grid -> setItem(row, col, Item); } --- 667,671 ---- { QTableWidgetItem* Item = new QTableWidgetItem(s,0); ! Item->setFlags(Qt::ItemIsSelectable|Qt::ItemIsEnabled); Grid -> setItem(row, col, Item); } *************** *** 696,704 **** QColor ColorInside(Scale(Inside[0]), Scale(Inside[1]), Scale(Inside[2])); QPixmap* pix = new QPixmap(34, 32); ! QPainter Painter(pix); ! ! Painter.fillRect(0, 0, 2, 32, Qt::white); Painter.fillRect(2, 0, 32, 32, ColorFrame); Painter.fillRect(8, 6, 20, 20, ColorInside); --- 684,693 ---- QColor ColorInside(Scale(Inside[0]), Scale(Inside[1]), Scale(Inside[2])); QPixmap* pix = new QPixmap(34, 32); ! ! pix->fill(Qt::white); ! QPainter Painter(pix); ! Painter.fillRect(0, 0, 2, 32, Qt::white); Painter.fillRect(2, 0, 32, 32, ColorFrame); Painter.fillRect(8, 6, 20, 20, ColorInside); *************** *** 710,716 **** { QPixmap* Pixmap = CreateProofPixmap(LabProof, RGB); - QTableWidgetItem* Item = new QTableWidgetItem(QIcon(*Pixmap), QString::null, 0); ! Item->setFlags(Qt::ItemIsSelectable); Grid -> setItem(row, col, Item); --- 699,704 ---- { QPixmap* Pixmap = CreateProofPixmap(LabProof, RGB); QTableWidgetItem* Item = new QTableWidgetItem(QIcon(*Pixmap), QString::null, 0); ! Item->setFlags(Qt::ItemIsSelectable|Qt::ItemIsEnabled); Grid -> setItem(row, col, Item); |
|
From: Amit K. <ami...@us...> - 2009-06-30 00:00:56
|
Update of /cvsroot/lprof/lprof/src/reference_inst_qt In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv20052/reference_inst_qt Modified Files: Tag: GSoC-2009 installreffile.cpp installreffile.h Log Message: Index: installreffile.h =================================================================== RCS file: /cvsroot/lprof/lprof/src/reference_inst_qt/installreffile.h,v retrieving revision 1.21 retrieving revision 1.21.2.1 diff -C2 -d -r1.21 -r1.21.2.1 *** installreffile.h 19 Feb 2008 21:03:02 -0000 1.21 --- installreffile.h 30 Jun 2009 00:00:10 -0000 1.21.2.1 *************** *** 34,40 **** #include <lprofmain.h> #include <ui_installreffilebase.h> ! #include <q3urloperator.h> ! class Q3NetworkOperation; enum TemplateType --- 34,41 ---- #include <lprofmain.h> #include <ui_installreffilebase.h> ! #include <QFile> ! //#include <q3urloperator.h> ! //class Q3NetworkOperation; enum TemplateType *************** *** 71,76 **** bool refNotToOld(); ! Q3UrlOperator urlOp; ! int copyNum; ref_file_parms dirs; targetTemplate files; --- 72,77 ---- bool refNotToOld(); ! //Q3UrlOperator urlOp; ! //int copyNum; ref_file_parms dirs; targetTemplate files; *************** *** 81,85 **** void slotCancel(); void slotHelpButton(); ! void slotFileCopied( Q3NetworkOperation * ); void slotTargetSelectorChanged(); --- 82,86 ---- void slotCancel(); void slotHelpButton(); ! //void slotFileCopied( Q3NetworkOperation * ); void slotTargetSelectorChanged(); Index: installreffile.cpp =================================================================== RCS file: /cvsroot/lprof/lprof/src/reference_inst_qt/installreffile.cpp,v retrieving revision 1.57 retrieving revision 1.57.2.1 diff -C2 -d -r1.57 -r1.57.2.1 *** installreffile.cpp 18 May 2009 21:17:17 -0000 1.57 --- installreffile.cpp 30 Jun 2009 00:00:10 -0000 1.57.2.1 *************** *** 44,53 **** #include <q3textstream.h> #include <qfile.h> ! #include <q3urloperator.h> #include <qdir.h> #include <qdatetime.h> - #include <q3urloperator.h> #include <QTranslator> ! #if !defined(__WIN32__) && (defined(_WIN32) || defined(WIN32)) --- 44,52 ---- #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)) *************** *** 145,149 **** InstallRefFile::InstallRefFile(QWidget *parent) ! : QDialog(parent, "", 0, Qt::WindowSystemMenuHint), urlOp(QString::fromLocal8Bit("/")) { setupUi(this); --- 144,148 ---- InstallRefFile::InstallRefFile(QWidget *parent) ! : QDialog(parent, "", 0, Qt::WindowSystemMenuHint) //, urlOp(QString::fromLocal8Bit("/")) { setupUi(this); *************** *** 174,182 **** TargetSelector->FillValues(); ! connect( &urlOp, SIGNAL( finished( Q3NetworkOperation *) ), this, SLOT( slotFileCopied( Q3NetworkOperation * ) ) ); ! connect(TargetSelector, SIGNAL(valueChanged()), this, SLOT(slotTargetSelectorChanged())); ! copyNum=0; slotTargetSelectorChanged(); --- 173,180 ---- TargetSelector->FillValues(); ! //connect( &urlOp, SIGNAL( finished( Q3NetworkOperation *) ), this, SLOT( slotFileCopied( Q3NetworkOperation * ) ) ); connect(TargetSelector, SIGNAL(valueChanged()), this, SLOT(slotTargetSelectorChanged())); ! //copyNum=0; slotTargetSelectorChanged(); *************** *** 197,201 **** } ! void InstallRefFile::slotFileCopied( Q3NetworkOperation *op ) { --- 195,199 ---- } ! /* void InstallRefFile::slotFileCopied( Q3NetworkOperation *op ) { *************** *** 219,223 **** mutex.unlock(); } ! TemplateType InstallRefFile::CheckTemplateType() { --- 217,221 ---- mutex.unlock(); } ! */ TemplateType InstallRefFile::CheckTemplateType() { *************** *** 724,734 **** TargetSelector->getFilename().mid(TargetSelector->getFilename().findRev(QString::fromLocal8Bit("/"), -1), TargetSelector->getFilename().length()); ! mutex.lock(); ! copyNum = copyNum + 1; // pull file names out of the dialog buttonCancel->setEnabled(false); // copy the reference file to ~/<lprofBaseDir>/target_refs ! urlOp.copy( TargetSelector->getFilename(), dirs.ref_dir + QString::fromLocal8Bit("/")); ! mutex.unlock(); } } --- 722,748 ---- TargetSelector->getFilename().mid(TargetSelector->getFilename().findRev(QString::fromLocal8Bit("/"), -1), TargetSelector->getFilename().length()); ! //mutex.lock(); ! //copyNum = copyNum + 1; // pull file names out of the dialog buttonCancel->setEnabled(false); // copy the reference file to ~/<lprofBaseDir>/target_refs ! //urlOp.copy( TargetSelector->getFilename(), dirs.ref_dir + QString::fromLocal8Bit("/")); ! ! QString ref_file_name = TargetSelector->getFilename().section(QString::fromLocal8Bit("/"), -1); ! if(QFile::exists(dirs.ref_dir + QString::fromLocal8Bit("/")+ref_file_name)) ! { ! if( !(QFile::remove(dirs.ref_dir + QString::fromLocal8Bit("/")+ref_file_name))) ! QMessageBox::information( this, tr( "Error " ), tr("The reference file can not be overwriten")); ! } ! ! bool ref_copied = QFile::copy(TargetSelector->getFilename(), dirs.ref_dir + QString::fromLocal8Bit("/")+ref_file_name); ! ! if(ref_copied) ! QMessageBox::information( this, tr( "Reference File Installed" ), tr("The reference file was succesfully installed")); ! else if(!ref_copied) ! QMessageBox::information( this, tr( "Reference File Not Installed" ), tr("The reference file could not be installed")); ! ! buttonCancel->setEnabled(true); ! //mutex.unlock(); } } |
|
From: Amit K. <ami...@us...> - 2009-06-30 00:00:44
|
Update of /cvsroot/lprof/lprof/src/gammaqt In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv20052/gammaqt Modified Files: Tag: GSoC-2009 setgamma.cpp Log Message: Index: setgamma.cpp =================================================================== RCS file: /cvsroot/lprof/lprof/src/gammaqt/setgamma.cpp,v retrieving revision 1.30 retrieving revision 1.30.2.1 diff -C2 -d -r1.30 -r1.30.2.1 *** setgamma.cpp 20 Apr 2008 19:01:15 -0000 1.30 --- setgamma.cpp 30 Jun 2009 00:00:09 -0000 1.30.2.1 *************** *** 60,63 **** --- 60,64 ---- #include <qvalidator.h> + #include <QFileDialog> static PROFILERDATA sys; Q3ButtonGroup* RGB_button_group; |
|
From: Amit K. <ami...@us...> - 2009-06-25 14:56:35
|
Update of /cvsroot/lprof/lprof/src/lprofqt In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv1511/lprofqt Modified Files: Tag: GSoC-2009 lprofmain.cpp Log Message: I have made changes in src/libqtlcmswidgets/qtlcmswidgets.cpp , src/libqtlcmswidgets/qtlcmswidgets.h , src/checkerqt/profilecheckerbase.ui Index: lprofmain.cpp =================================================================== RCS file: /cvsroot/lprof/lprof/src/lprofqt/lprofmain.cpp,v retrieving revision 1.188.2.4 retrieving revision 1.188.2.5 diff -C2 -d -r1.188.2.4 -r1.188.2.5 *** lprofmain.cpp 24 Jun 2009 14:34:02 -0000 1.188.2.4 --- lprofmain.cpp 25 Jun 2009 13:32:07 -0000 1.188.2.5 *************** *** 1042,1046 **** lprofMain::lprofMain( QWidget* parent) ! : QDialog( parent, "", 0, Qt::WindowSystemMenuHint), FigEditor( 0 ), --- 1042,1046 ---- lprofMain::lprofMain( QWidget* parent) ! : QDialog( parent, Qt::WindowSystemMenuHint), FigEditor( 0 ), |
|
From: Amit K. <ami...@us...> - 2009-06-25 14:56:25
|
Update of /cvsroot/lprof/lprof/src/libqtlcmswidgets In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv1511/libqtlcmswidgets Modified Files: Tag: GSoC-2009 qtlcmswidgets.cpp qtlcmswidgets.h Log Message: I have made changes in src/libqtlcmswidgets/qtlcmswidgets.cpp , src/libqtlcmswidgets/qtlcmswidgets.h , src/checkerqt/profilecheckerbase.ui Index: qtlcmswidgets.h =================================================================== RCS file: /cvsroot/lprof/lprof/src/libqtlcmswidgets/qtlcmswidgets.h,v retrieving revision 1.15.2.2 retrieving revision 1.15.2.3 diff -C2 -d -r1.15.2.2 -r1.15.2.3 *** qtlcmswidgets.h 16 Jun 2009 07:26:25 -0000 1.15.2.2 --- qtlcmswidgets.h 25 Jun 2009 13:32:07 -0000 1.15.2.3 *************** *** 46,53 **** #include <QTableView> #include <QTableWidget> ! #include <q3hbox.h> #include <q3table.h> ! // Base selector implements a selector for IT8 files and icc profiles // This is not intended to be a good hierarchy but a flexible widget --- 46,53 ---- #include <QTableView> #include <QTableWidget> ! /* #include <q3hbox.h> #include <q3table.h> ! */ // Base selector implements a selector for IT8 files and icc profiles // This is not intended to be a good hierarchy but a flexible widget *************** *** 92,99 **** int getForOutput() const { return lUseDescriptor; } - void setDirCaption(QString text) { PickButton->setText(text); } - QString Dir; QString FileMask; --- 92,97 ---- *************** *** 122,127 **** void valueChanged(); - - }; --- 120,123 ---- *************** *** 139,143 **** - virtual void FillValues(); --- 135,138 ---- *************** *** 365,369 **** CheckProfile(QComboBox *corrCombo = NULL); ! void cdecl Results(Q3Table* ResultsGrid, QString& ResultsText, LPMEASUREMENT m, --- 360,364 ---- CheckProfile(QComboBox *corrCombo = NULL); ! void cdecl Results(QTableWidget* ResultsGrid, QString& ResultsText, LPMEASUREMENT m, Index: qtlcmswidgets.cpp =================================================================== RCS file: /cvsroot/lprof/lprof/src/libqtlcmswidgets/qtlcmswidgets.cpp,v retrieving revision 1.42.2.2 retrieving revision 1.42.2.3 diff -C2 -d -r1.42.2.2 -r1.42.2.3 *** qtlcmswidgets.cpp 16 Jun 2009 07:26:25 -0000 1.42.2.2 --- qtlcmswidgets.cpp 25 Jun 2009 13:32:07 -0000 1.42.2.3 *************** *** 79,83 **** QString Mask, BOOL lLineEdit, BOOL showFileDialog, QWidget* parent, const char* name, Qt::WFlags f) : ! QWidget(parent, f), //changed ======= Dir(DefaultDir), FileMask(Mask), --- 79,83 ---- QString Mask, BOOL lLineEdit, BOOL showFileDialog, QWidget* parent, const char* name, Qt::WFlags f) : ! QWidget(parent, f), Dir(DefaultDir), FileMask(Mask), *************** *** 676,683 **** static ! void SetGridItem(Q3Table* Grid, int row, int col, QString& s) { ! Q3TableItem* Item = new Q3TableItem(Grid, Q3TableItem::Never, s); ! Grid -> setItem(row, col, Item); } --- 676,684 ---- static ! void SetGridItem(QTableWidget* Grid, int row, int col, QString& s) { ! QTableWidgetItem* Item = new QTableWidgetItem(s,0); ! Item->setFlags(Qt::ItemIsSelectable); ! Grid -> setItem(row, col, Item); } *************** *** 706,720 **** } ! ! static void ! SetGridPatch(Q3Table* Grid, int row, int col, WORD RGB[3], WORD LabProof[3]) { QPixmap* Pixmap = CreateProofPixmap(LabProof, RGB); ! Q3TableItem* Item = new Q3TableItem(Grid, Q3TableItem::Never, QString::null, *Pixmap); Grid -> setItem(row, col, Item); } void CheckProfile::CreateFancyReport(QString& Report, --- 707,721 ---- } ! static void SetGridPatch(QTableWidget* Grid, int row, int col, WORD RGB[3], WORD LabProof[3]) { QPixmap* Pixmap = CreateProofPixmap(LabProof, RGB); ! QTableWidgetItem* Item = new QTableWidgetItem(QIcon(*Pixmap), QString::null, 0); ! Item->setFlags(Qt::ItemIsSelectable); Grid -> setItem(row, col, Item); } + void CheckProfile::CreateFancyReport(QString& Report, *************** *** 1010,1014 **** } ! void CheckProfile::Results(Q3Table* ResultsGrid, QString& ResultsText, LPMEASUREMENT m, --- 1011,1015 ---- } ! void CheckProfile::Results(QTableWidget* ResultsGrid, QString& ResultsText, LPMEASUREMENT m, *************** *** 1023,1046 **** CHK_CORR_NONE; ! Q3Header* Vertical = ResultsGrid -> verticalHeader(); ! Q3Header* Horizontal = ResultsGrid -> horizontalHeader(); ! ! Vertical -> setResizeEnabled(FALSE); ! ! ResultsGrid -> setLeftMargin(60); ! ResultsGrid -> setNumCols(11); ! ! Horizontal -> setLabel(0, QString::fromLocal8Bit("")); ! Horizontal -> setLabel(1, QTranslator::tr("CIE La*b* dE")); ! Horizontal -> setLabel(2, QTranslator::tr("Target error")); ! Horizontal -> setLabel(3, QTranslator::tr("Chroma error")); ! Horizontal -> setLabel(4, QTranslator::tr("Hue error")); ! Horizontal -> setLabel(5, QTranslator::tr("Luma error")); ! Horizontal -> setLabel(6, QTranslator::tr("Target Lab")); ! Horizontal -> setLabel(7, QTranslator::tr("Got")); ! ! Horizontal -> setLabel(8, QTranslator::tr("dE CIE94")); ! Horizontal -> setLabel(9, QTranslator::tr("dE CMC")); ! Horizontal -> setLabel(10, QTranslator::tr("dE BFL")); ResultsGrid -> setColumnWidth (0, 37); --- 1024,1051 ---- CHK_CORR_NONE; ! ResultsGrid->setColumnCount(11); ! ! QTableWidgetItem *Horizontal = new QTableWidgetItem(QString::fromLocal8Bit(""),0); ! ResultsGrid->setHorizontalHeaderItem(0,Horizontal); ! Horizontal = new QTableWidgetItem(QTranslator::tr("CIE La*b* dE"),0); ! ResultsGrid->setHorizontalHeaderItem(1,Horizontal); ! Horizontal = new QTableWidgetItem(QTranslator::tr("Target error") ,0); ! ResultsGrid->setHorizontalHeaderItem(2,Horizontal); ! Horizontal = new QTableWidgetItem(QTranslator::tr("Chroma error"),0); ! ResultsGrid->setHorizontalHeaderItem(3,Horizontal); ! Horizontal = new QTableWidgetItem(QTranslator::tr("Hue error") ,0); ! ResultsGrid->setHorizontalHeaderItem(4,Horizontal); ! Horizontal = new QTableWidgetItem(QTranslator::tr("Luma error") ,0); ! ResultsGrid->setHorizontalHeaderItem(5,Horizontal); ! Horizontal = new QTableWidgetItem(QTranslator::tr("Target Lab") ,0); ! ResultsGrid->setHorizontalHeaderItem(6,Horizontal); ! Horizontal = new QTableWidgetItem(QTranslator::tr("Got") ,0); ! ResultsGrid->setHorizontalHeaderItem(7,Horizontal); ! Horizontal = new QTableWidgetItem(QTranslator::tr("dE CIE94") ,0); ! ResultsGrid->setHorizontalHeaderItem(8,Horizontal); ! Horizontal = new QTableWidgetItem(QTranslator::tr("dE CMC") ,0); ! ResultsGrid->setHorizontalHeaderItem(9,Horizontal); ! Horizontal = new QTableWidgetItem(QTranslator::tr("dE BFL") ,0); ! ResultsGrid->setHorizontalHeaderItem(10,Horizontal); ResultsGrid -> setColumnWidth (0, 37); *************** *** 1161,1165 **** } ! ResultsGrid -> setNumRows(m->nPatches); for (i =0; i < m->nPatches; i++) --- 1166,1170 ---- } ! ResultsGrid->setRowCount(m->nPatches); for (i =0; i < m->nPatches; i++) *************** *** 1265,1271 **** if (dE > 10) Title = QString::fromLocal8Bit("** ") + Title; ! ! Vertical -> setLabel( i, Title); ! } --- 1270,1276 ---- if (dE > 10) Title = QString::fromLocal8Bit("** ") + Title; ! ! QTableWidgetItem *Vertical = new QTableWidgetItem(Title,0); ! ResultsGrid->setVerticalHeaderItem(i,Vertical); } |
|
From: Amit K. <ami...@us...> - 2009-06-25 14:56:10
|
Update of /cvsroot/lprof/lprof/src/checkerqt In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv1511/checkerqt Modified Files: Tag: GSoC-2009 profilecheckerbase.ui Log Message: I have made changes in src/libqtlcmswidgets/qtlcmswidgets.cpp , src/libqtlcmswidgets/qtlcmswidgets.h , src/checkerqt/profilecheckerbase.ui Index: profilecheckerbase.ui =================================================================== RCS file: /cvsroot/lprof/lprof/src/checkerqt/profilecheckerbase.ui,v retrieving revision 1.25 retrieving revision 1.25.2.1 diff -C2 -d -r1.25 -r1.25.2.1 *** profilecheckerbase.ui 1 Feb 2009 20:04:01 -0000 1.25 --- profilecheckerbase.ui 25 Jun 2009 13:32:06 -0000 1.25.2.1 *************** *** 1,6 **** ! <ui version="4.0" > <class>ProfileCheckerBase</class> ! <widget class="QDialog" name="ProfileCheckerBase" > ! <property name="geometry" > <rect> <x>0</x> --- 1,7 ---- ! <?xml version="1.0" encoding="UTF-8"?> ! <ui version="4.0"> <class>ProfileCheckerBase</class> [...1649 lines suppressed...] *** 902,910 **** </customwidgets> <includes> ! <include location="local" >qtlcmswidgets.h</include> ! <include location="local" >qtlcmswidgets.h</include> </includes> <resources> ! <include location="../../lprof.qrc" /> </resources> <connections/> --- 877,885 ---- </customwidgets> <includes> ! <include location="local">qtlcmswidgets.h</include> ! <include location="local">qtlcmswidgets.h</include> </includes> <resources> ! <include location="../../lprof.qrc"/> </resources> <connections/> |
|
From: Amit K. <ami...@us...> - 2009-06-24 14:34:08
|
Update of /cvsroot/lprof/lprof/src/lprofqt In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv18435 Modified Files: Tag: GSoC-2009 lprofmain.cpp Log Message: Index: lprofmain.cpp =================================================================== RCS file: /cvsroot/lprof/lprof/src/lprofqt/lprofmain.cpp,v retrieving revision 1.188.2.3 retrieving revision 1.188.2.4 diff -C2 -d -r1.188.2.3 -r1.188.2.4 *** lprofmain.cpp 23 Jun 2009 19:30:36 -0000 1.188.2.3 --- lprofmain.cpp 24 Jun 2009 14:34:02 -0000 1.188.2.4 *************** *** 1042,1047 **** lprofMain::lprofMain( QWidget* parent) ! : QDialog( parent, ! Qt::Window | Qt::WindowSystemMenuHint | Qt::WindowMinMaxButtonsHint | Qt::WindowTitleHint), FigEditor( 0 ), Canvas( 0 ), --- 1042,1047 ---- lprofMain::lprofMain( QWidget* parent) ! : QDialog( parent, "", 0, ! Qt::WindowSystemMenuHint), FigEditor( 0 ), Canvas( 0 ), |
|
From: Amit K. <ami...@us...> - 2009-06-23 19:31:01
|
Update of /cvsroot/lprof/lprof/src/lprofqt In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv9879/lprofqt Modified Files: Tag: GSoC-2009 figureeditor.cpp griditem.cpp imageitem.cpp lprofmain.cpp lprofmain.h Log Message: Index: imageitem.cpp =================================================================== RCS file: /cvsroot/lprof/lprof/src/lprofqt/imageitem.cpp,v retrieving revision 1.4.2.3 retrieving revision 1.4.2.4 diff -C2 -d -r1.4.2.3 -r1.4.2.4 *** imageitem.cpp 17 Jun 2009 02:59:42 -0000 1.4.2.3 --- imageitem.cpp 23 Jun 2009 19:30:36 -0000 1.4.2.4 *************** *** 119,126 **** ImageItem::ImageItem(QString ImageFile, const QString Monitor, const QString Scanner, QGraphicsScene *canvas ) ! : QGraphicsRectItem(0,0,400,400), image() { ! canvas->addRect(rect()); ! // qDebug("ImageItem::ImageItem"); lProof = FALSE; Reload(ImageFile, Monitor, Scanner, canvas); --- 119,125 ---- ImageItem::ImageItem(QString ImageFile, const QString Monitor, const QString Scanner, QGraphicsScene *canvas ) ! : QGraphicsRectItem( 0, canvas ), image() { ! //qDebug("ImageItem::ImageItem"); lProof = FALSE; Reload(ImageFile, Monitor, Scanner, canvas); *************** *** 129,133 **** void ImageItem::Reload(QString ImageFile, const QString Monitor, const QString Scanner, QGraphicsScene *canvas ) //changed by me from Q3Canvas to QGraphicsScene { - // qDebug("ImageItem::Reload"); --- 128,131 ---- *************** *** 261,268 **** } - QImage scaled = image.smoothScale(canvas->width(), canvas->height()); ! setRect ((qreal)0, (qreal)0, scaled.width(), scaled.height()); sx = (double) image.width() / scaled.width(); sy = (double) image.height() / scaled.height(); --- 259,265 ---- } QImage scaled = image.smoothScale(canvas->width(), canvas->height()); ! setRect(0, 0, scaled.width(), scaled.width()); sx = (double) image.width() / scaled.width(); sy = (double) image.height() / scaled.height(); *************** *** 283,307 **** } - QImage pscaled = image.smoothScale(canvas->width(), canvas->height()); proof.convertFromImage(pscaled); ! setPos((qreal) 0, (qreal) 0); setZValue(5); show(); - - if (lProof) - canvas -> addPixmap(proof); - else - canvas -> addPixmap(pixmap); - // qDebug("ImageItem::Reload Done"); } ! ! void ImageItem::drawShape( QPainter &p ) { ! // qDebug("ImageItem::drawShape"); ! p.drawPixmap( int(x()), int(y()), lProof? proof : pixmap ); } - --- 280,295 ---- } QImage pscaled = image.smoothScale(canvas->width(), canvas->height()); proof.convertFromImage(pscaled); ! setPos(0,0); setZValue(5); show(); // qDebug("ImageItem::Reload Done"); } ! void ImageItem::paint(QPainter *p, const QStyleOptionGraphicsItem *, QWidget *) { ! //qDebug("ImageItem::paint"); ! p->drawPixmap(0, 0, lProof? proof : pixmap); } Index: lprofmain.cpp =================================================================== RCS file: /cvsroot/lprof/lprof/src/lprofqt/lprofmain.cpp,v retrieving revision 1.188.2.2 retrieving revision 1.188.2.3 diff -C2 -d -r1.188.2.2 -r1.188.2.3 *** lprofmain.cpp 16 Jun 2009 07:26:25 -0000 1.188.2.2 --- lprofmain.cpp 23 Jun 2009 19:30:36 -0000 1.188.2.3 *************** *** 98,101 **** --- 98,102 ---- #include <QListView> #include <QListWidget> + #include <QGraphicsItem> #include "ui_lprofmainbase.h" Index: griditem.cpp =================================================================== RCS file: /cvsroot/lprof/lprof/src/lprofqt/griditem.cpp,v retrieving revision 1.4.2.2 retrieving revision 1.4.2.3 diff -C2 -d -r1.4.2.2 -r1.4.2.3 *** griditem.cpp 16 Jun 2009 07:26:25 -0000 1.4.2.2 --- griditem.cpp 23 Jun 2009 19:30:36 -0000 1.4.2.3 *************** *** 41,45 **** GridItem::GridItem( QGraphicsScene *canvas, QString Template, int SafeFrame ) ! : QGraphicsRectItem( (qreal)10, (qreal)10, canvas->width() - 10, canvas->height() - 10, (QGraphicsItem *)canvas) { // qDebug("GridItem::GridItem"); --- 41,45 ---- GridItem::GridItem( QGraphicsScene *canvas, QString Template, int SafeFrame ) ! : QGraphicsRectItem( 10.0, 10.0, canvas->width() - 10, canvas->height() - 10, 0, canvas) { // qDebug("GridItem::GridItem"); *************** *** 133,141 **** ! void GridItem::drawShape( QPainter &p ) { QRect OurViewport; ! // qDebug("GridItem::drawShape"); ComputeViewport(OurViewport, 1.0, 1.0); --- 133,141 ---- ! void GridItem::paint(QPainter *p, const QStyleOptionGraphicsItem *, QWidget *) { QRect OurViewport; ! // qDebug("GridItem::paint"); ComputeViewport(OurViewport, 1.0, 1.0); *************** *** 155,160 **** // p.drawRect(Frame); ! p.setPen( Qt::green ); ! p.drawRect(HotZone); } // end for } // enf if --- 155,160 ---- // p.drawRect(Frame); ! p->setPen( Qt::green ); ! p->drawRect(HotZone); } // end for } // enf if *************** *** 163,190 **** // clicks to add a mark ! p.setPen( Qt::red ); // upper right corner only draw the corner mark of the user has clicked if (Marks.ur_x<measure_view_H && Marks.ur_y>0) { ! p.drawLine(Marks.ur_x, Marks.ur_y, Marks.ur_x - 50, Marks.ur_y); ! p.drawLine(Marks.ur_x, Marks.ur_y, Marks.ur_x, Marks.ur_y + 50); } // upper left corner if (Marks.ul_x>0 && Marks.ul_y>0) { ! p.drawLine(Marks.ul_x, Marks.ul_y, Marks.ul_x + 50, Marks.ul_y); ! p.drawLine(Marks.ul_x, Marks.ul_y, Marks.ul_x, Marks.ul_y + 50); } // lower right corner if (Marks.lr_x>0 && Marks.lr_y<measure_view_V) { ! p.drawLine(Marks.lr_x, Marks.lr_y, Marks.lr_x - 50, Marks.lr_y); ! p.drawLine(Marks.lr_x, Marks.lr_y, Marks.lr_x, Marks.lr_y - 50); } // lower left corner if (Marks.ll_x<measure_view_H && Marks.ll_y<measure_view_V) { ! p.drawLine(Marks.ll_x, Marks.ll_y, Marks.ll_x + 50, Marks.ll_y); ! p.drawLine(Marks.ll_x, Marks.ll_y, Marks.ll_x, Marks.ll_y - 50); } } --- 163,190 ---- // clicks to add a mark ! p->setPen( Qt::red ); // upper right corner only draw the corner mark of the user has clicked if (Marks.ur_x<measure_view_H && Marks.ur_y>0) { ! p->drawLine(Marks.ur_x, Marks.ur_y, Marks.ur_x - 50, Marks.ur_y); ! p->drawLine(Marks.ur_x, Marks.ur_y, Marks.ur_x, Marks.ur_y + 50); } // upper left corner if (Marks.ul_x>0 && Marks.ul_y>0) { ! p->drawLine(Marks.ul_x, Marks.ul_y, Marks.ul_x + 50, Marks.ul_y); ! p->drawLine(Marks.ul_x, Marks.ul_y, Marks.ul_x, Marks.ul_y + 50); } // lower right corner if (Marks.lr_x>0 && Marks.lr_y<measure_view_V) { ! p->drawLine(Marks.lr_x, Marks.lr_y, Marks.lr_x - 50, Marks.lr_y); ! p->drawLine(Marks.lr_x, Marks.lr_y, Marks.lr_x, Marks.lr_y - 50); } // lower left corner if (Marks.ll_x<measure_view_H && Marks.ll_y<measure_view_V) { ! p->drawLine(Marks.ll_x, Marks.ll_y, Marks.ll_x + 50, Marks.ll_y); ! p->drawLine(Marks.ll_x, Marks.ll_y, Marks.ll_x, Marks.ll_y - 50); } } Index: figureeditor.cpp =================================================================== RCS file: /cvsroot/lprof/lprof/src/lprofqt/figureeditor.cpp,v retrieving revision 1.3.2.2 retrieving revision 1.3.2.3 diff -C2 -d -r1.3.2.2 -r1.3.2.3 *** figureeditor.cpp 16 Jun 2009 07:26:25 -0000 1.3.2.2 --- figureeditor.cpp 23 Jun 2009 19:30:36 -0000 1.3.2.3 *************** *** 50,84 **** } ! void FigureEditor::contentsMousePressEvent(QMouseEvent* e) { maindialog.zeroProgressBars(); if (!SelectWPpatch) ! {// qDebug("FigureEditor::contentsMousePressEvent"); ! if (e->x()<measure_view_H/2 && e->y()<measure_view_V/2) { // upper left quadrant ! Marks.ul_x=e->x(); ! Marks.ul_y=e->y(); } ! else if (e->x()>measure_view_H/2 && e->y()<measure_view_V/2) { // upper right quadrant ! Marks.ur_x=e->x(); ! Marks.ur_y=e->y(); } ! else if (e->x()>measure_view_H/2 && e->y()>measure_view_V/2) { // lower right quadrant ! Marks.lr_x=e->x(); ! Marks.lr_y=e->y(); } ! else if (e->x()<measure_view_H/2 && e->y()>measure_view_V/2) { // lower left quadrant ! Marks.ll_x=e->x(); ! Marks.ll_y=e->y(); } - // place corner markers to give user feed back that the corner has been marked --- 50,85 ---- } ! void FigureEditor::mousePressEvent(QMouseEvent* e) { + QPointF point= mapToScene(QPoint(e->x(),e->y())); //calculate point at scene from point of viewport + maindialog.zeroProgressBars(); if (!SelectWPpatch) ! { //qDebug("FigureEditor::contentsMousePressEvent"); ! if (point.x()<measure_view_H/2 && point.y()<measure_view_V/2) { // upper left quadrant ! Marks.ul_x=point.x(); ! Marks.ul_y=point.y(); } ! else if (point.x()>measure_view_H/2 && point.y()<measure_view_V/2) { // upper right quadrant ! Marks.ur_x=point.x(); ! Marks.ur_y=point.y(); } ! else if (point.x()>measure_view_H/2 && point.y()>measure_view_V/2) { // lower right quadrant ! Marks.lr_x=point.x(); ! Marks.lr_y=point.y(); } ! else if (point.x()<measure_view_H/2 && point.y()>measure_view_V/2) { // lower left quadrant ! Marks.ll_x=point.x(); ! Marks.ll_y=point.y(); } // place corner markers to give user feed back that the corner has been marked *************** *** 107,111 **** { // store location and create 0 size rectangle ! WPHotZone.setCoords(e->x(), e->y(), e->x(), e->y()); // Mark the location on screen FIXME --- 108,112 ---- { // store location and create 0 size rectangle ! WPHotZone.setCoords(point.x(), point.y(), point.x(), point.y()); // Mark the location on screen FIXME *************** *** 115,131 **** else { ! int xsize = abs(e->x()- WPHotZone.x()); ! int ysize = abs(e->y() - WPHotZone.y()); ! if (e->y() < WPHotZone.y()) { // need to swap WPHotZone.setBottom(WPHotZone.y()); ! WPHotZone.setY(e->y()); } ! if (e->x() < WPHotZone.x()) { // need to swap WPHotZone.setRight(WPHotZone.top()); ! WPHotZone.setX(e->x()); } WPHotZone.setWidth(xsize); --- 116,132 ---- else { ! int xsize = abs(point.x()- WPHotZone.x()); ! int ysize = abs(point.y() - WPHotZone.y()); ! if (point.y() < WPHotZone.y()) { // need to swap WPHotZone.setBottom(WPHotZone.y()); ! WPHotZone.setY(point.y()); } ! if (point.x() < WPHotZone.x()) { // need to swap WPHotZone.setRight(WPHotZone.top()); ! WPHotZone.setX(point.x()); } WPHotZone.setWidth(xsize); *************** *** 158,160 **** unshearing = NULL; } - --- 159,160 ---- Index: lprofmain.h =================================================================== RCS file: /cvsroot/lprof/lprof/src/lprofqt/lprofmain.h,v retrieving revision 1.52.2.2 retrieving revision 1.52.2.3 diff -C2 -d -r1.52.2.2 -r1.52.2.3 *** lprofmain.h 16 Jun 2009 07:26:25 -0000 1.52.2.2 --- lprofmain.h 23 Jun 2009 19:30:36 -0000 1.52.2.3 *************** *** 207,211 **** QGraphicsScene *canvas ); ! int rtti () const { return imageRTTI; } void Reload(QString ImageFile, --- 207,211 ---- QGraphicsScene *canvas ); ! int type () const { return imageRTTI; } void Reload(QString ImageFile, *************** *** 221,225 **** protected: ! void drawShape( QPainter & ); void TransformImage(const QString OutputProfile, const QString InputProfile, --- 221,225 ---- protected: ! void paint(QPainter *, const QStyleOptionGraphicsItem *, QWidget *); void TransformImage(const QString OutputProfile, const QString InputProfile, *************** *** 261,276 **** protected: ! int ScaleX(int n) ! { ! QRectF w; ! w=rect (); ! return (int) ((double) (n * (w.width())) / LAYOUT_MAX); ! } ! int ScaleY(int n) ! { ! QRectF h; ! h=rect(); ! return (int) ((double) (n * (h.height())) / LAYOUT_MAX); ! } void ComputePatchRects(QRect& OurViewport, --- 261,266 ---- protected: ! int ScaleX(int n) { return (int) ((double) (n * (rect().width())) / LAYOUT_MAX); } ! int ScaleY(int n) { return (int) ((double) (n * (rect().height())) / LAYOUT_MAX); } void ComputePatchRects(QRect& OurViewport, *************** *** 280,284 **** void ComputeViewport(QRect& OurViewport, double sx, double sy); ! void drawShape(QPainter & ); }; --- 270,274 ---- void ComputeViewport(QRect& OurViewport, double sx, double sy); ! void paint(QPainter *, const QStyleOptionGraphicsItem *, QWidget *); }; *************** *** 343,358 **** public: ! FigureEditor(lprofMain &main_dialog, QGraphicsScene& c, QWidget* parent=0, const char* name=0, Qt::WFlags f=0) : QGraphicsView(&c,parent), maindialog(main_dialog) ! { ! ! QString str = QString(QLatin1String(name)) ; ! setObjectName(str); ! setWindowFlags(f); ! } void clear(); void resizeEvent( QResizeEvent* e ); protected: ! void contentsMousePressEvent(QMouseEvent*); signals: --- 333,346 ---- public: ! FigureEditor(lprofMain &main_dialog, QGraphicsScene& c, QWidget* parent=0, const char* name=0, Qt::WFlags f=0) : QGraphicsView(&c,parent), maindialog(main_dialog) ! { ! setObjectName(QString(QLatin1String(name))); ! setWindowFlags(f); ! } void clear(); void resizeEvent( QResizeEvent* e ); protected: ! void mousePressEvent(QMouseEvent*); signals: |
|
From: Amit K. <ami...@us...> - 2009-06-17 02:59:45
|
Update of /cvsroot/lprof/lprof/src/lprofqt In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv10644 Modified Files: Tag: GSoC-2009 imageitem.cpp Log Message: I just added following line at the end of ImageItem::reload function in file imageItem.cpp if (lProof) canvas -> addPixmap(proof); else canvas -> addPixmap(pixmap); Index: imageitem.cpp =================================================================== RCS file: /cvsroot/lprof/lprof/src/lprofqt/imageitem.cpp,v retrieving revision 1.4.2.2 retrieving revision 1.4.2.3 diff -C2 -d -r1.4.2.2 -r1.4.2.3 *** imageitem.cpp 16 Jun 2009 07:26:25 -0000 1.4.2.2 --- imageitem.cpp 17 Jun 2009 02:59:42 -0000 1.4.2.3 *************** *** 290,293 **** --- 290,299 ---- setZValue(5); show(); + + if (lProof) + canvas -> addPixmap(proof); + else + canvas -> addPixmap(pixmap); + // qDebug("ImageItem::Reload Done"); } |
|
From: Amit K. <ami...@us...> - 2009-06-16 07:26:31
|
Update of /cvsroot/lprof/lprof/src/lprofqt In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv20776/lprof/src/lprofqt Modified Files: Tag: GSoC-2009 config.cpp figureeditor.cpp griditem.cpp imageitem.cpp lprofmain-priv.cpp lprofmain-priv.h lprofmain.cpp lprofmain.h lprofmainbase.ui slots.cpp Log Message: Index: slots.cpp =================================================================== RCS file: /cvsroot/lprof/lprof/src/lprofqt/slots.cpp,v retrieving revision 1.5.2.1 retrieving revision 1.5.2.2 diff -C2 -d -r1.5.2.1 -r1.5.2.2 *** slots.cpp 9 Jun 2009 12:25:25 -0000 1.5.2.1 --- slots.cpp 16 Jun 2009 07:26:25 -0000 1.5.2.2 *************** *** 146,152 **** Canvas); ! //changed by me ------------------------------------------------------------------- ! //Canvas->setChanged(rect()); ! Canvas->update(rect()); //added by me in place of Canvas->setChanged(rect());--------------------------------- Canvas->update(); ControlsToValues(); --- 146,150 ---- Canvas); ! Canvas->update(rect()); Canvas->update(); ControlsToValues(); *************** *** 623,640 **** { case 0: ! //ui->textEditProfileParms->insertParagraph(verb1, 3); //removed by me ===================================== ! ui->textEditProfileParms->append(verb1); //added by me ==================================== break; case 1: - //ui->textEditProfileParms->insertParagraph(verb2, 3); ui->textEditProfileParms->append(verb2); break; case 2: - //ui->textEditProfileParms->insertParagraph(verb3, 3); ui->textEditProfileParms->append(verb3); break; } ! //ui->textEditProfileParms->insertParagraph(reg, 4); ! ui->textEditProfileParms->append(reg); //added by me===================================== if (sys.lOptRGCV) --- 621,634 ---- { case 0: ! ui->textEditProfileParms->append(verb1); break; case 1: ui->textEditProfileParms->append(verb2); break; case 2: ui->textEditProfileParms->append(verb3); break; } ! ui->textEditProfileParms->append(reg); if (sys.lOptRGCV) *************** *** 643,650 **** Buff = QString::fromLocal8Bit(" ") + manSm + Buff.sprintf(" %i" ,sys.RsplSmoothness); - //ui->textEditProfileParms->insertParagraph(Buff, 5); ui->textEditProfileParms->append(Buff); - //ui->textEditProfileParms->insertParagraph(VC, 6); ui->textEditProfileParms->append(VC); --- 637,642 ---- *************** *** 652,683 **** { case 0: - //ui->textEditProfileParms->insertParagraph(capav4,7); ui->textEditProfileParms->append(capav4); break; case 1: - //ui->textEditProfileParms->insertParagraph(capav, 7); ui->textEditProfileParms->append(capav); break; case 2: - //ui->textEditProfileParms->insertParagraph(capdim, 7); ui->textEditProfileParms->append(capdim); break; case 3: - //ui->textEditProfileParms->insertParagraph(capdark, 7); ui->textEditProfileParms->append(capdark); break; case 4: ui->textEditProfileParms->append(capcut); - //ui->textEditProfileParms->insertParagraph(capcut, 7); break; default: - //ui->textEditProfileParms->insertParagraph(capav, 7); ui->textEditProfileParms->append(capav); } Buff = capLa + Buff.sprintf(" %g", sys.hdr.device.La); - //ui->textEditProfileParms->insertParagraph(Buff, 8); ui->textEditProfileParms->append(Buff); Buff = capYb + Buff.sprintf(" %g", sys.hdr.device.Yb); - //ui->textEditProfileParms->insertParagraph(Buff, 8); ui->textEditProfileParms->append(Buff); --- 644,667 ---- *************** *** 685,721 **** { case 0: ! //ui->textEditProfileParms->insertParagraph(pcsav4,9); ! ui->textEditProfileParms->append(pcsav4); break; case 1: ! // ui->textEditProfileParms->insertParagraph(pcsav, 9); ! ui->textEditProfileParms->append(pcsav); break; case 2: ! //ui->textEditProfileParms->insertParagraph(pcsdim, 9); ! ui->textEditProfileParms->append(pcsdim); break; case 3: ! //ui->textEditProfileParms->insertParagraph(pcsdark, 9); ! ui->textEditProfileParms->append(pcsdark); break; case 4: - //ui->textEditProfileParms->insertParagraph(pcscut, 9); ui->textEditProfileParms->append(pcscut); ! break; default: ! //ui->textEditProfileParms->insertParagraph(pcsav, 9); ! ui->textEditProfileParms->append(pcsav); } Buff = pcsLa + Buff.sprintf(" %g", sys.hdr.PCS.La); - //ui->textEditProfileParms->insertParagraph(Buff, 10); ui->textEditProfileParms->append(Buff); ! Buff = pcsYb + Buff.sprintf(" %g", sys.hdr.PCS.Yb); ! //ui->textEditProfileParms->insertParagraph(Buff, 11); ! ui->textEditProfileParms->append(Buff); Buff = WPH + QString::fromLocal8Bit(":"); - //ui->textEditProfileParms->insertParagraph(Buff, 11); ui->textEditProfileParms->append(Buff); Buff = QString::fromLocal8Bit(" ") + loc + QString::fromLocal8Bit(": "); --- 669,696 ---- { case 0: ! ui->textEditProfileParms->append(pcsav4); break; case 1: ! ui->textEditProfileParms->append(pcsav); break; case 2: ! ui->textEditProfileParms->append(pcsdim); break; case 3: ! ui->textEditProfileParms->append(pcsdark); break; case 4: ui->textEditProfileParms->append(pcscut); ! break; default: ! ui->textEditProfileParms->append(pcsav); } Buff = pcsLa + Buff.sprintf(" %g", sys.hdr.PCS.La); ui->textEditProfileParms->append(Buff); ! Buff = pcsYb + Buff.sprintf(" %g", sys.hdr.PCS.Yb); ! ui->textEditProfileParms->append(Buff); Buff = WPH + QString::fromLocal8Bit(":"); ui->textEditProfileParms->append(Buff); Buff = QString::fromLocal8Bit(" ") + loc + QString::fromLocal8Bit(": "); *************** *** 756,761 **** break; } ! //ui->textEditProfileParms->insertParagraph(Buff, 12); ! ui->textEditProfileParms->append(Buff); Buff = QString::fromLocal8Bit(" ") + lumScaling + QString::fromLocal8Bit(": "); --- 731,735 ---- break; } ! ui->textEditProfileParms->append(Buff); Buff = QString::fromLocal8Bit(" ") + lumScaling + QString::fromLocal8Bit(": "); *************** *** 772,777 **** break; } ! //ui->textEditProfileParms->insertParagraph(Buff, 13); ! ui->textEditProfileParms->append(Buff); } --- 746,750 ---- break; } ! ui->textEditProfileParms->append(Buff); } *************** *** 792,875 **** { case 0: ! //ui->textEditProfileParms_mon->insertParagraph(verb1, 3); ! ui->textEditProfileParms_mon->append(verb1); break; case 1: ! //ui->textEditProfileParms_mon->insertParagraph(verb2, 3); ! ui->textEditProfileParms_mon->append(verb2); break; case 2: ! //ui->textEditProfileParms_mon->insertParagraph(verb3, 3); ! ui->textEditProfileParms_mon->append(verb3); ! break; } ! //ui->textEditProfileParms_mon->insertParagraph(VC, 4); ! ui->textEditProfileParms_mon->append(VC); switch (sys.hdr.device.surround) { case 0: - //ui->textEditProfileParms_mon->insertParagraph(monav4,5); ui->textEditProfileParms_mon->append(monav4); ! break; case 1: - //ui->textEditProfileParms_mon->insertParagraph(monav, 5); ui->textEditProfileParms_mon->append(monav); ! break; case 2: - //ui->textEditProfileParms_mon->insertParagraph(mondim, 5); ui->textEditProfileParms_mon->append(mondim); ! break; case 3: - //ui->textEditProfileParms_mon->insertParagraph(mondark, 5); ui->textEditProfileParms_mon->append(mondark); ! break; case 4: - //ui->textEditProfileParms_mon->insertParagraph(moncut, 5); ui->textEditProfileParms_mon->append(moncut); ! break; default: ! //ui->textEditProfileParms_mon->insertParagraph(monav, 5); ! ui->textEditProfileParms_mon->append(monav); } Buff = monLa + Buff.sprintf(" %g", sys.hdr.device.La); ! //ui->textEditProfileParms_mon->insertParagraph(Buff, 6); ui->textEditProfileParms_mon->append(Buff); - Buff = monYb + Buff.sprintf(" %g", sys.hdr.device.Yb); - //ui->textEditProfileParms_mon->insertParagraph(Buff, 6); - ui->textEditProfileParms_mon->append(Buff); switch (sys.hdr.PCS.surround) { case 0: ! //ui->textEditProfileParms_mon->insertParagraph(pcsav4,7); ! ui->textEditProfileParms_mon->append(pcsav4); break; case 1: - //ui->textEditProfileParms_mon->insertParagraph(pcsav, 7); ui->textEditProfileParms_mon->append(pcsav); ! break; case 2: - //ui->textEditProfileParms_mon->insertParagraph(pcsdim, 7); ui->textEditProfileParms_mon->append(pcsdim); ! break; case 3: - //ui->textEditProfileParms_mon->insertParagraph(pcsdark, 7); ui->textEditProfileParms_mon->append(pcsdark); ! break; case 4: - //ui->textEditProfileParms_mon->insertParagraph(pcscut, 7); ui->textEditProfileParms_mon->append(pcscut); ! break; default: ! //ui->textEditProfileParms_mon->insertParagraph(pcsav, 7); ! ui->textEditProfileParms_mon->append(pcsav); } Buff = pcsLa + Buff.sprintf(" %g", sys.hdr.PCS.La); ! //ui->textEditProfileParms_mon->insertParagraph(Buff, 8); ui->textEditProfileParms_mon->append(Buff); - Buff = pcsYb + Buff.sprintf(" %g", sys.hdr.PCS.Yb); - //ui->textEditProfileParms_mon->insertParagraph(Buff, 8); - ui->textEditProfileParms_mon->append(Buff); } } --- 765,828 ---- { case 0: ! ui->textEditProfileParms_mon->append(verb1); break; case 1: ! ui->textEditProfileParms_mon->append(verb2); break; case 2: ! ui->textEditProfileParms_mon->append(verb3); ! break; } ! ui->textEditProfileParms_mon->append(VC); switch (sys.hdr.device.surround) { case 0: ui->textEditProfileParms_mon->append(monav4); ! break; case 1: ui->textEditProfileParms_mon->append(monav); ! break; case 2: ui->textEditProfileParms_mon->append(mondim); ! break; case 3: ui->textEditProfileParms_mon->append(mondark); ! break; case 4: ui->textEditProfileParms_mon->append(moncut); ! break; default: ! ui->textEditProfileParms_mon->append(monav); } Buff = monLa + Buff.sprintf(" %g", sys.hdr.device.La); ! ui->textEditProfileParms_mon->append(Buff); ! Buff = monYb + Buff.sprintf(" %g", sys.hdr.device.Yb); ui->textEditProfileParms_mon->append(Buff); switch (sys.hdr.PCS.surround) { case 0: ! ui->textEditProfileParms_mon->append(pcsav4); break; case 1: ui->textEditProfileParms_mon->append(pcsav); ! break; case 2: ui->textEditProfileParms_mon->append(pcsdim); ! break; case 3: ui->textEditProfileParms_mon->append(pcsdark); ! break; case 4: ui->textEditProfileParms_mon->append(pcscut); ! break; default: ! ui->textEditProfileParms_mon->append(pcsav); } Buff = pcsLa + Buff.sprintf(" %g", sys.hdr.PCS.La); ! ui->textEditProfileParms_mon->append(Buff); ! Buff = pcsYb + Buff.sprintf(" %g", sys.hdr.PCS.Yb); ui->textEditProfileParms_mon->append(Buff); } } *************** *** 882,974 **** { ui->textEditProfileID->setText( tr("File_Name: ")); - //ui->textEditProfileID->moveCursor(Q3TextEdit::MoveDown, 0); - //ui->textEditProfileID->moveCursor(Q3TextEdit::MoveLineEnd, 0); ui->textEditProfileID->moveCursor(QTextCursor::Down,QTextCursor::MoveAnchor); ! ui->textEditProfileID->moveCursor(QTextCursor::EndOfLine,QTextCursor::MoveAnchor); ! ! ui->textEditProfileID->insert(QString::fromLocal8Bit(sys.hdr.OutputProfileFile)); ! //ui->textEditProfileID->insertParagraph(tr("Description: "), 3); ui->textEditProfileID->append(tr("Description: ")); ! ! //ui->textEditProfileID->moveCursor(Q3TextEdit::MoveDown, 0); ! //ui->textEditProfileID->moveCursor(Q3TextEdit::MoveLineEnd, 0); ! ui->textEditProfileID->moveCursor(QTextCursor::Down,QTextCursor::MoveAnchor); ! ui->textEditProfileID->moveCursor(QTextCursor::EndOfLine,QTextCursor::MoveAnchor); ! ! ui->textEditProfileID->insert(QString::fromLocal8Bit(sys.hdr.Description)); ! //ui->textEditProfileID->insertParagraph( tr("Model: "), 5); ! ui->textEditProfileID->append(tr("Moel: ")); ! ! //ui->textEditProfileID->moveCursor(Q3TextEdit::MoveDown, 0); ! // ui->textEditProfileID->moveCursor(Q3TextEdit::MoveLineEnd, 0); ui->textEditProfileID->moveCursor(QTextCursor::Down,QTextCursor::MoveAnchor); ! ui->textEditProfileID->moveCursor(QTextCursor::EndOfLine,QTextCursor::MoveAnchor); ! ! ui->textEditProfileID->insert(QString::fromLocal8Bit(sys.hdr.Model)); ! //ui->textEditProfileID->insertParagraph(tr("Manufacturer: "), 7); ! ui->textEditProfileID->append(tr("Manufacturer: ")); ! ! //ui->textEditProfileID->moveCursor(Q3TextEdit::MoveDown, 0); ! // ui->textEditProfileID->moveCursor(Q3TextEdit::MoveLineEnd, 0); ui->textEditProfileID->moveCursor(QTextCursor::Down,QTextCursor::MoveAnchor); ! ui->textEditProfileID->moveCursor(QTextCursor::EndOfLine,QTextCursor::MoveAnchor); ! ! ui->textEditProfileID->insert(QString::fromLocal8Bit(sys.hdr.Manufacturer)); ! //ui->textEditProfileID->insertParagraph(tr("Copyright: "), 9); ! ui->textEditProfileID->append(tr("Copyright: ")); ! ! //ui->textEditProfileID->moveCursor(Q3TextEdit::MoveDown, 0); ! // ui->textEditProfileID->moveCursor(Q3TextEdit::MoveLineEnd, 0); ui->textEditProfileID->moveCursor(QTextCursor::Down,QTextCursor::MoveAnchor); ! ui->textEditProfileID->moveCursor(QTextCursor::EndOfLine,QTextCursor::MoveAnchor); ! ! ui->textEditProfileID->insert(QString::fromLocal8Bit(sys.hdr.Copyright)); } if (sys.hdr.ProfilerTab == 1) // monitor profiler { ui->textEditProfileID_mon->setText( tr("File_Name: ")); ! ! //ui->textEditProfileID_mon->moveCursor(Q3TextEdit::MoveDown, 0); ! //ui->textEditProfileID_mon->moveCursor(Q3TextEdit::MoveLineEnd, 0); ! ui->textEditProfileID->moveCursor(QTextCursor::Down,QTextCursor::MoveAnchor); ! ui->textEditProfileID->moveCursor(QTextCursor::EndOfLine,QTextCursor::MoveAnchor); ! ! ui->textEditProfileID_mon->insert(QString::fromLocal8Bit(sys.hdr.mon_profile_file_name)); ! //ui->textEditProfileID_mon->insertParagraph(tr("Description: "), 3); ! ui->textEditProfileID->append(tr("Description: ")); ! ! //ui->textEditProfileID_mon->moveCursor(Q3TextEdit::MoveDown, 0); ! //ui->textEditProfileID_mon->moveCursor(Q3TextEdit::MoveLineEnd, 0); ! ui->textEditProfileID->moveCursor(QTextCursor::Down,QTextCursor::MoveAnchor); ! ui->textEditProfileID->moveCursor(QTextCursor::EndOfLine,QTextCursor::MoveAnchor); ! ! ui->textEditProfileID_mon->insert(QString::fromLocal8Bit(sys.hdr.Description)); ! // ui->textEditProfileID_mon->insertParagraph( tr("Model: "), 5); ! ui->textEditProfileID->append(tr("Model: ")); ! ! //ui->textEditProfileID_mon->moveCursor(Q3TextEdit::MoveDown, 0); ! // ui->textEditProfileID_mon->moveCursor(Q3TextEdit::MoveLineEnd, 0); ! ui->textEditProfileID->moveCursor(QTextCursor::Down,QTextCursor::MoveAnchor); ! ui->textEditProfileID->moveCursor(QTextCursor::EndOfLine,QTextCursor::MoveAnchor); ! ! ui->textEditProfileID_mon->insert(QString::fromLocal8Bit(sys.hdr.Model)); ! //ui->textEditProfileID_mon->insertParagraph(tr("Manufacturer: "), 7); ! ui->textEditProfileID->append(tr("Manufacturer: ")); ! ! //ui->textEditProfileID_mon->moveCursor(Q3TextEdit::MoveDown, 0); ! //ui->textEditProfileID_mon->moveCursor(Q3TextEdit::MoveLineEnd, 0); ! ui->textEditProfileID->moveCursor(QTextCursor::Down,QTextCursor::MoveAnchor); ! ui->textEditProfileID->moveCursor(QTextCursor::EndOfLine,QTextCursor::MoveAnchor); ! ! ui->textEditProfileID_mon->insert(QString::fromLocal8Bit(sys.hdr.Manufacturer)); ! //ui->textEditProfileID_mon->insertParagraph(tr("Copyright: "), 9); ! ui->textEditProfileID->append(tr("Copyright: ")); ! ! //ui->textEditProfileID_mon->moveCursor(Q3TextEdit::MoveDown, 0); ! //ui->textEditProfileID_mon->moveCursor(Q3TextEdit::MoveLineEnd, 0); ! ui->textEditProfileID->moveCursor(QTextCursor::Down,QTextCursor::MoveAnchor); ! ui->textEditProfileID->moveCursor(QTextCursor::EndOfLine,QTextCursor::MoveAnchor); ! ! ui->textEditProfileID_mon->insert(QString::fromLocal8Bit(sys.hdr.Copyright)); } } --- 835,880 ---- { ui->textEditProfileID->setText( tr("File_Name: ")); ui->textEditProfileID->moveCursor(QTextCursor::Down,QTextCursor::MoveAnchor); ! ui->textEditProfileID->moveCursor(QTextCursor::EndOfLine,QTextCursor::MoveAnchor); ! ui->textEditProfileID->insert(QString::fromLocal8Bit(sys.hdr.OutputProfileFile)); ui->textEditProfileID->append(tr("Description: ")); ! ui->textEditProfileID->moveCursor(QTextCursor::Down,QTextCursor::MoveAnchor); ! ui->textEditProfileID->moveCursor(QTextCursor::EndOfLine,QTextCursor::MoveAnchor); ! ui->textEditProfileID->insert(QString::fromLocal8Bit(sys.hdr.Description)); ! ui->textEditProfileID->append(tr("Moel: ")); ui->textEditProfileID->moveCursor(QTextCursor::Down,QTextCursor::MoveAnchor); ! ui->textEditProfileID->moveCursor(QTextCursor::EndOfLine,QTextCursor::MoveAnchor); ! ui->textEditProfileID->insert(QString::fromLocal8Bit(sys.hdr.Model)); ! ui->textEditProfileID->append(tr("Manufacturer: ")); ui->textEditProfileID->moveCursor(QTextCursor::Down,QTextCursor::MoveAnchor); ! ui->textEditProfileID->moveCursor(QTextCursor::EndOfLine,QTextCursor::MoveAnchor); ! ui->textEditProfileID->insert(QString::fromLocal8Bit(sys.hdr.Manufacturer)); ! ui->textEditProfileID->append(tr("Copyright: ")); ui->textEditProfileID->moveCursor(QTextCursor::Down,QTextCursor::MoveAnchor); ! ui->textEditProfileID->moveCursor(QTextCursor::EndOfLine,QTextCursor::MoveAnchor); ! ui->textEditProfileID->insert(QString::fromLocal8Bit(sys.hdr.Copyright)); } if (sys.hdr.ProfilerTab == 1) // monitor profiler { ui->textEditProfileID_mon->setText( tr("File_Name: ")); ! ui->textEditProfileID_mon->moveCursor(QTextCursor::Down,QTextCursor::MoveAnchor); ! ui->textEditProfileID_mon->moveCursor(QTextCursor::EndOfLine,QTextCursor::MoveAnchor); ! ui->textEditProfileID_mon->insert(QString::fromLocal8Bit(sys.hdr.mon_profile_file_name)); ! ui->textEditProfileID_mon->append(tr("Description: ")); ! ui->textEditProfileID_mon->moveCursor(QTextCursor::Down,QTextCursor::MoveAnchor); ! ui->textEditProfileID_mon->moveCursor(QTextCursor::EndOfLine,QTextCursor::MoveAnchor); ! ui->textEditProfileID_mon->insert(QString::fromLocal8Bit(sys.hdr.Description)); ! ui->textEditProfileID_mon->append(tr("Model: ")); ! ui->textEditProfileID_mon->moveCursor(QTextCursor::Down,QTextCursor::MoveAnchor); ! ui->textEditProfileID_mon->moveCursor(QTextCursor::EndOfLine,QTextCursor::MoveAnchor); ! ui->textEditProfileID_mon->insert(QString::fromLocal8Bit(sys.hdr.Model)); ! ui->textEditProfileID_mon->append(tr("Manufacturer: ")); ! ui->textEditProfileID_mon->moveCursor(QTextCursor::Down,QTextCursor::MoveAnchor); ! ui->textEditProfileID_mon->moveCursor(QTextCursor::EndOfLine,QTextCursor::MoveAnchor); ! ui->textEditProfileID_mon->insert(QString::fromLocal8Bit(sys.hdr.Manufacturer)); ! ui->textEditProfileID_mon->append(tr("Copyright: ")); ! ui->textEditProfileID_mon->moveCursor(QTextCursor::Down,QTextCursor::MoveAnchor); ! ui->textEditProfileID_mon->moveCursor(QTextCursor::EndOfLine,QTextCursor::MoveAnchor); ! ui->textEditProfileID_mon->insert(QString::fromLocal8Bit(sys.hdr.Copyright)); } } Index: imageitem.cpp =================================================================== RCS file: /cvsroot/lprof/lprof/src/lprofqt/imageitem.cpp,v retrieving revision 1.4.2.1 retrieving revision 1.4.2.2 diff -C2 -d -r1.4.2.1 -r1.4.2.2 *** imageitem.cpp 9 Jun 2009 12:25:25 -0000 1.4.2.1 --- imageitem.cpp 16 Jun 2009 07:26:25 -0000 1.4.2.2 *************** *** 118,138 **** } - - //changed by me ==-=========================================================================== - /* - ImageItem::ImageItem(QString ImageFile, const QString Monitor, const QString Scanner, Q3Canvas *canvas ) - : Q3CanvasRectangle( canvas ), image() - { - - // qDebug("ImageItem::ImageItem"); - lProof = FALSE; - Reload(ImageFile, Monitor, Scanner, canvas); - } - */ - ImageItem::ImageItem(QString ImageFile, const QString Monitor, const QString Scanner, QGraphicsScene *canvas ) ! : QGraphicsRectItem( (QGraphicsItem *)canvas ), image() { ! // qDebug("ImageItem::ImageItem"); lProof = FALSE; --- 118,125 ---- } ImageItem::ImageItem(QString ImageFile, const QString Monitor, const QString Scanner, QGraphicsScene *canvas ) ! : QGraphicsRectItem(0,0,400,400), image() { ! canvas->addRect(rect()); // qDebug("ImageItem::ImageItem"); lProof = FALSE; *************** *** 140,147 **** } - - //======================================================================================== - - void ImageItem::Reload(QString ImageFile, const QString Monitor, const QString Scanner, QGraphicsScene *canvas ) //changed by me from Q3Canvas to QGraphicsScene { --- 127,130 ---- *************** *** 281,286 **** QImage scaled = image.smoothScale(canvas->width(), canvas->height()); ! // setSize( scaled.width(), scaled.height() ); //removed by me----------------------------------------------------- ! setRect ((qreal)0, (qreal)0, scaled.width(), scaled.height()); //added by me -------------------------------------------- sx = (double) image.width() / scaled.width(); sy = (double) image.height() / scaled.height(); --- 264,268 ---- QImage scaled = image.smoothScale(canvas->width(), canvas->height()); ! setRect ((qreal)0, (qreal)0, scaled.width(), scaled.height()); sx = (double) image.width() / scaled.width(); sy = (double) image.height() / scaled.height(); *************** *** 305,312 **** proof.convertFromImage(pscaled); ! // move(0, 0); //removed by me ------------------------------------------------------------------- ! setPos((qreal) 0, (qreal) 0); //added by me ----------------------------------------------------- ! // setZ(5); //removed by me ---------------------------------------------------------- ! setZValue(5); //added by me ---------------------------------------------------------- show(); // qDebug("ImageItem::Reload Done"); --- 287,292 ---- proof.convertFromImage(pscaled); ! setPos((qreal) 0, (qreal) 0); ! setZValue(5); show(); // qDebug("ImageItem::Reload Done"); Index: lprofmain-priv.h =================================================================== RCS file: /cvsroot/lprof/lprof/src/lprofqt/lprofmain-priv.h,v retrieving revision 1.6.2.1 retrieving revision 1.6.2.2 diff -C2 -d -r1.6.2.1 -r1.6.2.2 *** lprofmain-priv.h 9 Jun 2009 12:25:25 -0000 1.6.2.1 --- lprofmain-priv.h 16 Jun 2009 07:26:25 -0000 1.6.2.2 *************** *** 42,51 **** #include "lprofmain.h" #include <QProgressBar> ! ! //added by me ------------------------------------------------------ ! #include <QPolygon> //in place of Q3PointArray #include <QList> #include <QTextEdit> - //removed by me ---------------------------------------------------- #include <Q3TextEdit> --- 42,48 ---- #include "lprofmain.h" #include <QProgressBar> ! #include <QPolygon> #include <QList> #include <QTextEdit> #include <Q3TextEdit> *************** *** 53,57 **** #include <Q3PtrList> - //----------------------------------------------------------------------- // Anything listed here should only be used in files that are // located in src/lprofqt. As the routines in these files are --- 50,53 ---- *************** *** 100,109 **** extern uint last_tab; - //removed by me ------------------------------------------------------------------------------------- - //extern Q3TextEdit* Console; - //added by me --------------------------------------------------------------------------------------- extern QTextEdit* Console; - extern QProgressBar* ProgBar; --- 96,101 ---- *************** *** 120,129 **** extern markPositions Marks; - //removed by me ------------------------------------------------------------------------------------------------ - //extern Q3PointArray grid_corners; - //added by me -------------------------------------------------------------------------------------------------- extern QPolygon grid_corners; - //-------------------------------------------------------------- - extern QString outprofile; --- 112,116 ---- Index: lprofmain.cpp =================================================================== RCS file: /cvsroot/lprof/lprof/src/lprofqt/lprofmain.cpp,v retrieving revision 1.188.2.1 retrieving revision 1.188.2.2 diff -C2 -d -r1.188.2.1 -r1.188.2.2 *** lprofmain.cpp 9 Jun 2009 12:25:25 -0000 1.188.2.1 --- lprofmain.cpp 16 Jun 2009 07:26:25 -0000 1.188.2.2 *************** *** 85,109 **** #include <QTranslator> - //removed by me--------------------------------------------- - - #include <Q3PtrList> - #include <q3buttongroup.h> - #include <q3groupbox.h> - #include <q3filedialog.h> - #include <q3multilineedit.h> - #include <q3textview.h> - #include <q3progressbar.h> - #include <q3table.h> - #include <q3mainwindow.h> - #include <q3filedialog.h> - #include <q3canvas.h> - #include <q3multilineedit.h> - #include <q3textbrowser.h> - #include <q3textstream.h> - #include <q3listview.h> - - - //added by me ---------------------------------------------- - #include <QList> #include <QGroupBox> --- 85,88 ---- *************** *** 117,125 **** #include <QTextBrowser> #include <QTextStream> ! #include <QListView> ! #include <QListWidget> ! ! //------------------------------------------------------ ! #include "ui_lprofmainbase.h" --- 96,101 ---- #include <QTextBrowser> #include <QTextStream> ! #include <QListView> ! #include <QListWidget> #include "ui_lprofmainbase.h" *************** *** 205,214 **** temp = QString::fromLocal8Bit(coms -> paths[position]->path); ! start = temp.find(QChar::fromAscii('('), 0, TRUE) + 1; ! end = temp.find(QChar::fromAscii(')'), 0, TRUE); port = temp.mid(0, start -1); ! strcpy(sys.hdr.instArray[k].port, port.ascii()); ! sys.hdr.instArray[k].pos = position; sys.hdr.instArray[k].inst = instUnknown; --- 181,193 ---- temp = QString::fromLocal8Bit(coms -> paths[position]->path); ! start = temp.indexOf(QChar::fromAscii('('), 0, Qt::CaseSensitive) + 1; ! end = temp.indexOf(QChar::fromAscii(')'), 0, Qt::CaseSensitive); port = temp.mid(0, start -1); ! QByteArray asciiData=port.toAscii(); ! const char *data = asciiData.constData(); ! strcpy(sys.hdr.instArray[k].port, data); ! ! sys.hdr.instArray[k].pos = position; sys.hdr.instArray[k].inst = instUnknown; *************** *** 217,227 **** { temp.sprintf("/LPROF/serial_instruments/port%i", j); ! strcpy(tempInst.port, lprofSettings->readEntry(temp, QString::fromLocal8Bit("")).toLocal8Bit()); ! if (QString::fromLocal8Bit(sys.hdr.instArray[k].port) == QString::fromLocal8Bit(tempInst.port)) { sys.hdr.instArray[k].inst = instUnknown; temp.sprintf("/LPROF/serial_instruments/instType%i", j); ! sys.hdr.instArray[k].inst = instType (lprofSettings->readNumEntry(temp, instUnknown)); } } --- 196,207 ---- { temp.sprintf("/LPROF/serial_instruments/port%i", j); ! strcpy(tempInst.port, lprofSettings->value(temp, QString::fromLocal8Bit("")).toString().toLocal8Bit()); ! ! if (QString::fromLocal8Bit(sys.hdr.instArray[k].port) == QString::fromLocal8Bit(tempInst.port)) { sys.hdr.instArray[k].inst = instUnknown; temp.sprintf("/LPROF/serial_instruments/instType%i", j); ! sys.hdr.instArray[k].inst = instType (lprofSettings->value(temp, instUnknown).toInt()); } } *************** *** 300,305 **** int start, end, i, count; int number; ! ! sys.hdr.validInst = lprofSettings->readNumEntry( QString::fromLocal8Bit("/LPROF/numbers/instCount"), 0); populatePortArray(); spyd2FirmwareOK = TRUE; --- 280,286 ---- int start, end, i, count; int number; ! ! sys.hdr.validInst = lprofSettings->value( QString::fromLocal8Bit("/LPROF/numbers/instCount"), 0).toInt(); ! populatePortArray(); spyd2FirmwareOK = TRUE; *************** *** 332,338 **** { temp = QString::fromLocal8Bit(coms -> paths[i]->path); ! start = temp.find(QString::fromLocal8Bit("("), 0, TRUE) + 1; ! end = temp.find(QString::fromLocal8Bit(")"), 0, TRUE); ! instName = temp.mid(start, end - start); port = temp.mid(0, start -1); instlist[i].deviceFlag = OK; --- 313,320 ---- { temp = QString::fromLocal8Bit(coms -> paths[i]->path); ! start = temp.indexOf(QString::fromLocal8Bit("("), 0, Qt::CaseSensitive) + 1; ! end = temp.indexOf(QString::fromLocal8Bit(")"), 0, Qt::CaseSensitive); ! ! instName = temp.mid(start, end - start); port = temp.mid(0, start -1); instlist[i].deviceFlag = OK; *************** *** 443,447 **** bool found = FALSE, notOK = FALSE, OK = FALSE; ! sys.hdr.validInst = lprofSettings->readNumEntry( QString::fromLocal8Bit("/LPROF/numbers/instCount"), 0); populatePortArray(); --- 425,429 ---- bool found = FALSE, notOK = FALSE, OK = FALSE; ! sys.hdr.validInst = lprofSettings->value( QString::fromLocal8Bit("/LPROF/numbers/instCount"), 0).toInt(); populatePortArray(); *************** *** 519,550 **** instType itype; - //Q3ListViewItem *item = ui->listViewPortsInsts -> selectedItem (); //removed by me ================================== QTableWidgetItem *item = ui->listViewPortsInsts -> currentItem (); ! itype = mapCombo2Inst[ui->comboBoxDevice -> currentItem()]; ! int my_row=item->row (); //adedd by me==== ! QTableWidgetItem *item2 =ui->listViewPortsInsts->item(my_row,1); //changed by me ================================ ! if (validateIntrument(item2 -> text(), itype)) //changed by me ================================ { ! ! //item -> setText(2, ui->comboBoxDevice -> currentText()); //removed by me ======================= ! QTableWidgetItem *item3 =ui->listViewPortsInsts->item(my_row,2); //added by me ! item3->setText(ui->comboBoxDevice -> currentText()); //added by me ! //item -> setText(3, tr("Device verified")); //removed by me ! item3 =ui->listViewPortsInsts->item(my_row,3); //added by me ! item3->setText(tr("Device verified")); //added by me charInstType.sprintf("%i", itype); - //item -> setText(4, charInstType); //removed by me item3 =ui->listViewPortsInsts->item(my_row,4); item3->setText(charInstType); - //index = item -> text(0).toInt(&OK) - 1; //removed by me item3=ui->listViewPortsInsts->item(my_row,0); ! index=item3->text().toInt(&OK) - 1; //added by me if (OK) { sys.hdr.instArray[index].inst = itype; ! // strcpy(sys.hdr.instArray[index].port, item -> text(1).toLocal8Bit()); //removed by me=================== ! item3=ui->listViewPortsInsts->item(my_row,1); //added by me ! strcpy(sys.hdr.instArray[index].port, item3 -> text().toLocal8Bit()); //added by me } else --- 501,526 ---- instType itype; QTableWidgetItem *item = ui->listViewPortsInsts -> currentItem (); ! itype = mapCombo2Inst[ui->comboBoxDevice -> currentIndex()]; ! ! int my_row=item->row (); ! QTableWidgetItem *item2 =ui->listViewPortsInsts->item(my_row,1); ! if (validateIntrument(item2 -> text(), itype)) { ! QTableWidgetItem *item3 =ui->listViewPortsInsts->item(my_row,2); ! item3->setText(ui->comboBoxDevice -> currentText()); ! item3 =ui->listViewPortsInsts->item(my_row,3); ! item3->setText(tr("Device verified")); charInstType.sprintf("%i", itype); item3 =ui->listViewPortsInsts->item(my_row,4); item3->setText(charInstType); item3=ui->listViewPortsInsts->item(my_row,0); ! index=item3->text().toInt(&OK) - 1; if (OK) { sys.hdr.instArray[index].inst = itype; ! item3=ui->listViewPortsInsts->item(my_row,1); ! strcpy(sys.hdr.instArray[index].port, item3 -> text().toLocal8Bit()); } else *************** *** 562,566 **** else { - // item -> setText(3, tr("Device failed verification.")); QTableWidgetItem *item3 =ui->listViewPortsInsts->item(my_row,3); item3->setText( tr("Device failed verification.")); --- 538,541 ---- *************** *** 576,580 **** // qDebug("instCount = %i", sys.hdr.validInst); ! lprofSettings->writeEntry( QString::fromLocal8Bit("/LPROF/numbers/instCount"), sys.hdr.validInst); // qDebug("save settings for serial devices and ports"); --- 551,555 ---- // qDebug("instCount = %i", sys.hdr.validInst); ! lprofSettings->setValue( QString::fromLocal8Bit("/LPROF/numbers/instCount"), sys.hdr.validInst); // qDebug("save settings for serial devices and ports"); *************** *** 582,588 **** { temp.sprintf("/LPROF/serial_instruments/port%i", j); ! lprofSettings->writeEntry(temp, sys.hdr.instArray[j].port); temp.sprintf("/LPROF/serial_instruments/instType%i", j); ! lprofSettings->writeEntry(temp, sys.hdr.instArray[j].inst); } } --- 557,563 ---- { temp.sprintf("/LPROF/serial_instruments/port%i", j); ! lprofSettings->setValue(temp, QString::fromLocal8Bit(sys.hdr.instArray[j].port)); temp.sprintf("/LPROF/serial_instruments/instType%i", j); ! lprofSettings->setValue(temp, sys.hdr.instArray[j].inst); } } *************** *** 590,614 **** void lprofMain::populatePortandInstListView() { ! sys.hdr.validInst = lprofSettings->readNumEntry( QString::fromLocal8Bit("/LPROF/numbers/instCount"), 0); populatePortArray(); QString portnum, insttype; QString device, status; ! ui->listViewPortsInsts->setColumnCount(5); //added by me //set the no of columns in table widget ! //ui->listViewPortsInsts->setRowCount(0); ! ui->listViewPortsInsts -> setSelectionMode(QAbstractItemView::SingleSelection); //change by me from Q3ListView::Single to QAbstractItemView::SingleSelection ! //ui->listViewPortsInsts -> setAllColumnsShowFocus(TRUE); //removed by me ====does the same as selectRowOnly=========== ! //ui->listViewPortsInsts -> setColumnWidthMode (0, Q3ListView::Manual); ! ui->listViewPortsInsts -> setColumnWidth (0, 0); ! //ui->listViewPortsInsts -> setColumnWidthMode (1, Q3ListView::Maximum ); ui->listViewPortsInsts ->resizeColumnToContents(1); ui->listViewPortsInsts -> setColumnWidth (1, 200); - //ui->listViewPortsInsts -> setColumnWidthMode (2, Q3ListView::Maximum ); ui->listViewPortsInsts ->resizeColumnToContents(2); ui->listViewPortsInsts -> setColumnWidth (2, 200); - //ui->listViewPortsInsts -> setColumnWidthMode (3, Q3ListView::Maximum ); ui->listViewPortsInsts ->resizeColumnToContents(3); ui->listViewPortsInsts -> setColumnWidth (3, 350); - //ui->listViewPortsInsts -> setColumnWidthMode (4, Q3ListView::Manual); ui->listViewPortsInsts -> setColumnWidth (4, 0); for (int i=0; i < sys.hdr.validPorts; i++) --- 565,593 ---- void lprofMain::populatePortandInstListView() { ! sys.hdr.validInst = lprofSettings->value( QString::fromLocal8Bit("/LPROF/numbers/instCount"), 0).toInt(); populatePortArray(); QString portnum, insttype; QString device, status; ! ui->listViewPortsInsts->setColumnCount(5); ! ui->listViewPortsInsts -> setColumnWidth (0, 30); ui->listViewPortsInsts ->resizeColumnToContents(1); ui->listViewPortsInsts -> setColumnWidth (1, 200); ui->listViewPortsInsts ->resizeColumnToContents(2); ui->listViewPortsInsts -> setColumnWidth (2, 200); ui->listViewPortsInsts ->resizeColumnToContents(3); ui->listViewPortsInsts -> setColumnWidth (3, 350); ui->listViewPortsInsts -> setColumnWidth (4, 0); + QString str = QString(QLatin1String("p#")) ; + QTableWidgetItem *item1 = new QTableWidgetItem(str,0); + ui->listViewPortsInsts->setHorizontalHeaderItem(0,item1); + str = QString(QLatin1String("Port")); + item1 = new QTableWidgetItem(str,0); + ui->listViewPortsInsts->setHorizontalHeaderItem(1,item1); + str = QString(QLatin1String("Device")); + item1 = new QTableWidgetItem(str,0); + ui->listViewPortsInsts->setHorizontalHeaderItem(2,item1); + str = QString(QLatin1String("Status")); + item1 = new QTableWidgetItem(str,0); + ui->listViewPortsInsts->setHorizontalHeaderItem(3,item1); for (int i=0; i < sys.hdr.validPorts; i++) *************** *** 616,620 **** portnum.sprintf("%i", i + 1); insttype.sprintf("%i", sys.hdr.instArray[i].inst); ! ui->comboBoxDevice -> setCurrentItem(mapInst2Combo[sys.hdr.instArray[i].inst + 1]); if (sys.hdr.instArray[i].inst != instUnknown) { --- 595,599 ---- portnum.sprintf("%i", i + 1); insttype.sprintf("%i", sys.hdr.instArray[i].inst); ! ui->comboBoxDevice -> setCurrentIndex(mapInst2Combo[sys.hdr.instArray[i].inst + 1]); if (sys.hdr.instArray[i].inst != instUnknown) { *************** *** 627,654 **** status = tr("No device installed."); ! //following code is added by me ================================================ ! /* I am simulating qt3's multi column q3listview by using qt4's qtablewidget. For this first i am creating a tablewidget listViewPortInsts in ! * ui_lprofmainbase.h. Then above i have set no of columns to 5 by using ui->listViewPortsInsts->setColumnCount(5); and also set the ! * width of columns. In qt3 we can simply create a Q3ListViewItem with parent pointer and texts of all columns but in qt4 we can not do this. ! * In qt4 we first create a independent QTableWidgetItem without pointer but with text. Then we can attach the QTableWidgetItem to parent ! * QTableWidget. So first I am adding a row to table then add QTableWidgetItem to this row one by one. ! */ ! int no_of_rows = ui->listViewPortsInsts->rowCount (); ! ui->listViewPortsInsts->insertRow (no_of_rows); //rows no start from 0 ! no_of_rows = ui->listViewPortsInsts->rowCount (); ! QTableWidgetItem *newItem = new QTableWidgetItem(portnum,0); ! ui->listViewPortsInsts->setItem(no_of_rows-1, 0, newItem); ! newItem = new QTableWidgetItem(QString::fromLocal8Bit(sys.hdr.instArray[i].port),0); ! ui->listViewPortsInsts->setItem(no_of_rows-1, 1, newItem); ! newItem = new QTableWidgetItem(ui->comboBoxDevice -> currentText(),0); ! ui->listViewPortsInsts->setItem(no_of_rows-1, 2, newItem); ! newItem = new QTableWidgetItem(status,0); ! ui->listViewPortsInsts->setItem(no_of_rows-1, 3, newItem); ! newItem = new QTableWidgetItem(insttype,0); ! ui->listViewPortsInsts->setItem(no_of_rows-1, 4, newItem); ! //================================================================== ! /* (void) new Q3ListViewItem(ui->listViewPortsInsts, portnum, //removed by me================ ! QString::fromLocal8Bit(sys.hdr.instArray[i].port), ! ui->comboBoxDevice -> currentText(), status, insttype);*/ } } --- 606,623 ---- status = tr("No device installed."); ! int no_of_rows = ui->listViewPortsInsts->rowCount (); ! ui->listViewPortsInsts->insertRow (no_of_rows); ! no_of_rows = ui->listViewPortsInsts->rowCount (); ! QTableWidgetItem *newItem = new QTableWidgetItem(portnum,0); ! ui->listViewPortsInsts->setItem(no_of_rows-1, 0, newItem); ! newItem = new QTableWidgetItem(QString::fromLocal8Bit(sys.hdr.instArray[i].port),0); ! ui->listViewPortsInsts->setItem(no_of_rows-1, 1, newItem); ! newItem = new QTableWidgetItem(ui->comboBoxDevice -> currentText(),0); ! ui->listViewPortsInsts->setItem(no_of_rows-1, 2, newItem); ! newItem = new QTableWidgetItem(status,0); ! ui->listViewPortsInsts->setItem(no_of_rows-1, 3, newItem); ! newItem = new QTableWidgetItem(insttype,0); ! ui->listViewPortsInsts->setItem(no_of_rows-1, 4, newItem); ! } } *************** *** 780,784 **** Console -> append(Buffer); - Console -> sync(); va_end(args); lprofApp -> processEvents(); --- 749,752 ---- *************** *** 961,966 **** { // qDebug("lprofMain::SetGoButton"); ! QToolTip::remove( ui->TheGoButton ); ! QToolTip::add( ui->TheGoButton, Caption ); ui->TheGoButton -> setEnabled(TRUE); --- 929,935 ---- { // qDebug("lprofMain::SetGoButton"); ! ! ui->TheGoButton->setToolTip(QString(QLatin1String(""))); ! ui->TheGoButton->setToolTip(Caption); ui->TheGoButton -> setEnabled(TRUE); *************** *** 972,978 **** { // qDebug("lprofMain::SetGoButton"); - QToolTip::remove( ui->TheGoButton_2 ); - QToolTip::add( ui->TheGoButton_2, Caption ); ui->TheGoButton_2 -> setEnabled(TRUE); ui->TheGoButton_2 -> setEnabled(lEnable); --- 941,948 ---- { // qDebug("lprofMain::SetGoButton"); + ui->TheGoButton_2->setToolTip(QString(QLatin1String(""))); + ui->TheGoButton_2->setToolTip(Caption); + ui->TheGoButton_2 -> setEnabled(TRUE); ui->TheGoButton_2 -> setEnabled(lEnable); *************** *** 982,986 **** void lprofMain::SetOutputFile( const QString OutputFile ) { ! switch (ui->TabProfiler -> currentPageIndex()) { --- 952,956 ---- void lprofMain::SetOutputFile( const QString OutputFile ) { ! switch (ui->TabProfiler -> currentIndex()) { *************** *** 1002,1008 **** #ifdef __WIN32__ ! pos = fn.findRev(QString::fromLocal8Bit("\\"), -1, FALSE); #else ! pos = fn.findRev(QString::fromLocal8Bit("/"), -1, FALSE); #endif --- 972,978 ---- #ifdef __WIN32__ ! pos = fn.lastIndexOf(QString::fromLocal8Bit("\\"), -1, Qt::CaseInsensitive); #else ! pos = fn.lastIndexOf(QString::fromLocal8Bit("/"), -1, Qt::CaseInsensitive); #endif *************** *** 1032,1043 **** if (OK) { ! if ((fn.findRev(QString::fromLocal8Bit(".i")) == (fn.length() - 4) || ! fn.findRev(QString::fromLocal8Bit(".I")) == (fn.length() - 4)) && // .i or ,I && ! (fn.findRev(QString::fromLocal8Bit("C"), -2 ) == (fn.length() - 2) || ! fn.findRev(QString::fromLocal8Bit("c"), -2 ) == (fn.length() - 2)) && // c or C && ! ((fn.findRev(QString::fromLocal8Bit("C") ) == (fn.length() - 1) || ! fn.findRev(QString::fromLocal8Bit("c")) == (fn.length() - 1)) || // c or C ! (fn.findRev(QString::fromLocal8Bit("M")) == (fn.length() - 1) || ! fn.findRev(QString::fromLocal8Bit("m")) == (fn.length() -1 )))) // or m or M { // the directory and extension are OK --- 1002,1013 ---- if (OK) { ! if ((fn.lastIndexOf(QString::fromLocal8Bit(".i")) == (fn.length() - 4) || ! fn.lastIndexOf(QString::fromLocal8Bit(".I")) == (fn.length() - 4)) && // .i or ,I && ! (fn.lastIndexOf(QString::fromLocal8Bit("C"), -2 ) == (fn.length() - 2) || ! fn.lastIndexOf(QString::fromLocal8Bit("c"), -2 ) == (fn.length() - 2)) && // c or C && ! ((fn.lastIndexOf(QString::fromLocal8Bit("C") ) == (fn.length() - 1) || ! fn.lastIndexOf(QString::fromLocal8Bit("c")) == (fn.length() - 1)) || // c or C ! (fn.lastIndexOf(QString::fromLocal8Bit("M")) == (fn.length() - 1) || ! fn.lastIndexOf(QString::fromLocal8Bit("m")) == (fn.length() -1 )))) // or m or M { // the directory and extension are OK *************** *** 1047,1051 **** { // direcotry OK but extesion is not ! if (!fn.find(QString::fromLocal8Bit("."), pos) == -1) // There is an extension so this is a user error that we can not fix { OK = FALSE; --- 1017,1021 ---- { // direcotry OK but extesion is not ! if (!fn.indexOf(QString::fromLocal8Bit("."), pos) == -1) // There is an extension so this is a user error that we can not fix { OK = FALSE; *************** *** 1071,1077 **** lprofMain::lprofMain( QWidget* parent) ! : QDialog( parent, "", 0, ! Qt::WindowSystemMenuHint), ! FigEditor( 0 ), Canvas( 0 ), CanvasFrameLayout( 0 ), --- 1041,1047 ---- lprofMain::lprofMain( QWidget* parent) ! : QDialog( parent, ! Qt::Window | Qt::WindowSystemMenuHint | Qt::WindowMinMaxButtonsHint | Qt::WindowTitleHint), ! FigEditor( 0 ), Canvas( 0 ), CanvasFrameLayout( 0 ), *************** *** 1121,1125 **** connect(ui->Reference_install, SIGNAL(clicked()), this, SLOT(slotInstallReference())); connect(ui->SafeFrame, SIGNAL(valueChanged(int)), this, SLOT(safeFarmeChanged())); ! connect(ui->listViewPortsInsts, SIGNAL(selectionChanged()), this, SLOT(slotEnablecomboBoxDevice())); connect(ui->comboBoxDevice, SIGNAL(activated(int)), this, SLOT(slotUpdateInst())); connect(ui->TargetSelector, SIGNAL(valueChanged()), this, SLOT(safeFarmeChanged())); --- 1091,1097 ---- connect(ui->Reference_install, SIGNAL(clicked()), this, SLOT(slotInstallReference())); connect(ui->SafeFrame, SIGNAL(valueChanged(int)), this, SLOT(safeFarmeChanged())); ! ! connect(ui->listViewPortsInsts, SIGNAL(itemSelectionChanged()), this, SLOT(slotEnablecomboBoxDevice())); ! connect(ui->comboBoxDevice, SIGNAL(activated(int)), this, SLOT(slotUpdateInst())); connect(ui->TargetSelector, SIGNAL(valueChanged()), this, SLOT(safeFarmeChanged())); *************** *** 1134,1139 **** init_env(); ! Create_Config_Dir(QDir::currentDirPath()); ! while (copyNumTempFile>0) { --- 1106,1112 ---- init_env(); ! //Create_Config_Dir(QDir::currentDirPath()); ! Create_Config_Dir(QDir::currentPath()); ! while (copyNumTempFile>0) { *************** *** 1164,1179 **** ui->ComboBoxIntent -> clear(); ! ui->ComboBoxIntent -> insertItem(per); ! ui->ComboBoxIntent -> insertItem(relcolor); ! ui->ComboBoxIntent -> insertItem(sat); ! ui->ComboBoxIntent -> insertItem(Absolute); ! init_mon(); ! // Hide Printer_Tab until printer profiling is available ! ui->TabProfiler->removePage(ui->Printer_Tab); ! // Hidden tab is used for items that are no longer visible to users ! ui->TabProfiler->removePage(ui->Hidden); ! init_measurement_tool(); --- 1137,1152 ---- ui->ComboBoxIntent -> clear(); ! ui->ComboBoxIntent -> insertItem(1000,per); ! ui->ComboBoxIntent -> insertItem(1000,relcolor); ! ui->ComboBoxIntent -> insertItem(1000,sat); ! ui->ComboBoxIntent -> insertItem(1000,Absolute); ! init_mon(); ! // Hide Printer_Tab until printer profiling is available ! ui->TabProfiler->removeTab(ui->TabProfiler->indexOf(ui->Printer_Tab)); ! // Hidden tab is used for items that are no longer visible to users ! ui->TabProfiler->removeTab(ui->TabProfiler->indexOf(ui->Hidden)); ! init_measurement_tool(); *************** *** 1188,1192 **** // global_help_path = new QString; setupHelp(global_help_path); ! sys.hdr.ProfilerTab = ui->TabProfiler -> currentPageIndex(); monCalOK = FALSE; monMeasOK = FALSE; --- 1161,1165 ---- // global_help_path = new QString; setupHelp(global_help_path); ! sys.hdr.ProfilerTab = ui->TabProfiler ->currentIndex(); monCalOK = FALSE; monMeasOK = FALSE; *************** *** 1225,1229 **** strcpy(sys.hdr.MeasurementSheet, measfile.toLocal8Bit()); ! if (ui->radioButtonCandMFile -> isOn()) { strcpy(sys.hdr.MonMeasurementSheet, (const char*)ui->MonMeasurementSheet->getFilename().toLocal8Bit()); --- 1198,1202 ---- strcpy(sys.hdr.MeasurementSheet, measfile.toLocal8Bit()); ! if (ui->radioButtonCandMFile ->isChecked()) { strcpy(sys.hdr.MonMeasurementSheet, (const char*)ui->MonMeasurementSheet->getFilename().toLocal8Bit()); *************** *** 1239,1244 **** strcpy(sys.hdr.MonOutputProfileFile, (const char*) ui->OutputFileEdit_Mon -> text().toLocal8Bit()); sys.hdr.cur_ref = ui->TargetSelector->getCurrItem(); ! strcpy(sys.hdr.template_dir, templates.local8Bit()); ! strcpy(sys.hdr.mon_profile_dir, (const char*) ui->MonitorProfileSelector->Dir.local8Bit()); strcpy(sys.hdr.mon_profile_file_name, (const char*)ui->MonitorProfileSelector->getFilename().toLocal8Bit()); } --- 1212,1217 ---- strcpy(sys.hdr.MonOutputProfileFile, (const char*) ui->OutputFileEdit_Mon -> text().toLocal8Bit()); sys.hdr.cur_ref = ui->TargetSelector->getCurrItem(); ! strcpy(sys.hdr.template_dir, templates.toLocal8Bit()); ! strcpy(sys.hdr.mon_profile_dir, (const char*) ui->MonitorProfileSelector->Dir.toLocal8Bit()); strcpy(sys.hdr.mon_profile_file_name, (const char*)ui->MonitorProfileSelector->getFilename().toLocal8Bit()); } *************** *** 1281,1285 **** if (!checkDescription()) return; Console = ui->ProgressConsole; - Console -> setTextFormat( Qt::LogText); strcpy(sys.hdr.temp_file, WorkTempFileName.toLocal8Bit()); --- 1254,1257 ---- *************** *** 1326,1330 **** Console = ui->ProgressConsole_mon; ! Console -> setTextFormat( Qt::LogText); strcpy(sys.hdr.temp_file, WorkTempFileName.toLocal8Bit()); --- 1298,1302 ---- Console = ui->ProgressConsole_mon; ! //Console -> setTextFormat( Qt::LogText); strcpy(sys.hdr.temp_file, WorkTempFileName.toLocal8Bit()); *************** *** 1345,1349 **** strcpy(sys.hdr.MonCalibrationSheet, ""); } ! else if (ui->radioButtonCandMFile -> isOn()) { strcpy(sys.hdr.MonMeasurementSheet, ui->MonMeasurementSheet->getFilename().toLocal8Bit()); --- 1317,1321 ---- strcpy(sys.hdr.MonCalibrationSheet, ""); } ! else if (ui->radioButtonCandMFile -> isChecked()) { strcpy(sys.hdr.MonMeasurementSheet, ui->MonMeasurementSheet->getFilename().toLocal8Bit()); Index: lprofmain-priv.cpp =================================================================== RCS file: /cvsroot/lprof/lprof/src/lprofqt/lprofmain-priv.cpp,v retrieving revision 1.4.2.1 retrieving revision 1.4.2.2 diff -C2 -d -r1.4.2.1 -r1.4.2.2 *** lprofmain-priv.cpp 9 Jun 2009 12:25:25 -0000 1.4.2.1 --- lprofmain-priv.cpp 16 Jun 2009 07:26:25 -0000 1.4.2.2 *************** *** 39,44 **** markPositions Marks; ! //Q3PointArray grid_corners; //removed by me ============================================= ! QPolygon grid_corners; //added by me ========================================== QString outprofile; --- 39,43 ---- markPositions Marks; ! QPolygon grid_corners; QString outprofile; Index: griditem.cpp =================================================================== RCS file: /cvsroot/lprof/lprof/src/lprofqt/griditem.cpp,v retrieving revision 1.4.2.1 retrieving revision 1.4.2.2 diff -C2 -d -r1.4.2.1 -r1.4.2.2 *** griditem.cpp 9 Jun 2009 12:25:25 -0000 1.4.2.1 --- griditem.cpp 16 Jun 2009 07:26:25 -0000 1.4.2.2 *************** *** 39,88 **** // ----- The grid item -------------- - // changed by me ----------------------------------------------------- - /* - GridItem::GridItem( Q3Canvas *canvas, QString Template, int SafeFrame ) - : Q3CanvasRectangle( 10, 10, canvas->width() - 10, canvas->height() - 10, canvas) - { - // qDebug("GridItem::GridItem"); - SafeFrameFactor = SafeFrame / 100.; - setBrush( Qt::NoBrush) ; - - LCMSHANDLE hIT8 = cmsxIT8LoadFromFile(Template.local8Bit()); - - if (hIT8) - { - int nRects = (int) cmsxIT8GetPropertyDbl(hIT8, "NUMBER_OF_SETS"); - char PatchName[256]; - - for (int i=0; i < nRects; i++) - { - if (cmsxIT8GetDataSetByPos(hIT8, 0, i, PatchName, 256)) - { - - GridLayout Patch; - - double x, y, xSize, ySize; - - cmsxIT8GetDataSetDbl(hIT8, PatchName, "POS_X", &x); - cmsxIT8GetDataSetDbl(hIT8, PatchName, "POS_Y", &y); - cmsxIT8GetDataSetDbl(hIT8, PatchName, "SIZE_X", &xSize); - cmsxIT8GetDataSetDbl(hIT8, PatchName, "SIZE_Y", &ySize); - - strcpy(Patch.p.Name, (const char *) PatchName); - Patch.rect.setRect(int(x), int(y), int(xSize), int (ySize)); - - Layout.append(Patch); - - } - } - - cmsxIT8Free(hIT8); - } - - setZ(10); - show(); - } - */ - GridItem::GridItem( QGraphicsScene *canvas, QString Template, int SafeFrame ) --- 39,42 ---- *************** *** 125,141 **** } - //setZ(10); //removed by me and added setZValue() instead -------------------- setZValue(10); show(); } - //------------------------------------------------------------ - - - - - - - static void DoDeflateRect(QRect& rect, int sx, int sy) --- 79,86 ---- Index: figureeditor.cpp =================================================================== RCS file: /cvsroot/lprof/lprof/src/lprofqt/figureeditor.cpp,v retrieving revision 1.3.2.1 retrieving revision 1.3.2.2 diff -C2 -d -r1.3.2.1 -r1.3.2.2 *** figureeditor.cpp 9 Jun 2009 12:25:25 -0000 1.3.2.1 --- figureeditor.cpp 16 Jun 2009 07:26:25 -0000 1.3.2.2 *************** *** 36,40 **** #include <QResizeEvent> #include <QMouseEvent> ! #include <QList> //added by me ----------------------------------------------------------- // --- The figure editor ---------------------- --- 36,40 ---- #include <QResizeEvent> #include <QMouseEvent> ! #include <QList> // --- The figure editor ---------------------- *************** *** 44,51 **** // qDebug("FigureEditor::resizeEvent"); - //following line is changed by me ----------------------------------------------------------- - //Q3CanvasView::resizeEvent( e ); QGraphicsView::resizeEvent( e ); - //------------------------------------------------------------------------------ maindialog.FigEditor-> resize(width(), height()); maindialog.zeroProgressBars(); --- 44,48 ---- *************** *** 147,173 **** } - - - //changed by me ------------------------------------------------------------------------------- - /* void FigureEditor::clear() { // qDebug("FigureEditor::clear"); - Q3CanvasItemList list = canvas()->allItems(); - Q3CanvasItemList::Iterator it = list.begin(); - for (; it != list.end(); ++it) { - if ( *it ) - delete *it; - } - - moving = NULL; - sizing = NULL; - unshearing = NULL; - } - */ - - void FigureEditor::clear() - { - // qDebug("FigureEditor::clear"); QList<QGraphicsItem *> list =items(); QList<QGraphicsItem *> ::Iterator it = list.begin(); --- 144,150 ---- *************** *** 181,183 **** unshearing = NULL; } ! //----------------------------------------------------------------------------------------- --- 158,160 ---- unshearing = NULL; } ! Index: lprofmain.h =================================================================== RCS file: /cvsroot/lprof/lprof/src/lprofqt/lprofmain.h,v retrieving revision 1.52.2.1 retrieving revision 1.52.2.2 diff -C2 -d -r1.52.2.1 -r1.52.2.2 *** lprofmain.h 9 Jun 2009 12:25:25 -0000 1.52.2.1 --- lprofmain.h 16 Jun 2009 07:26:25 -0000 1.52.2.2 *************** *** 48,53 **** #include "main.h" - - //added by me --------------------------------------------------------------------- #include <QVBoxLayout> #include <QGraphicsView> --- 48,51 ---- *************** *** 56,69 **** #include <QGraphicsRectItem> #include <QApplication> - #include <q3urloperator.h> - //removed by me----------------------------------------------------------------------- - /* - #include <q3canvas.h> - - #include <Q3VBoxLayout> - */ - //---------------------------------------------------------------------------- -------- QAssistantClient* getHelp(); --- 54,59 ---- *************** *** 208,246 **** // The back image - // ported from Q3CanvasRectangle to QGraphicsRectItem ------------------------------------------------------------------------------------ - /* - class ImageItem: public Q3CanvasRectangle { - - public: - - ImageItem(QString ImageFile, - const QString MonitorProfile, - const QString ScannerProfile, - Q3Canvas *canvas ); - - int rtti () const { return imageRTTI; } - - void Reload(QString ImageFile, - const QString MonitorProfile, - const QString ScannerProfile, - Q3Canva... [truncated message content] |
|
From: Amit K. <ami...@us...> - 2009-06-16 07:26:30
|
Update of /cvsroot/lprof/lprof/src/libqtlcmswidgets In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv20776/lprof/src/libqtlcmswidgets Modified Files: Tag: GSoC-2009 qtlcmswidgets.cpp qtlcmswidgets.h Log Message: Index: qtlcmswidgets.h =================================================================== RCS file: /cvsroot/lprof/lprof/src/libqtlcmswidgets/qtlcmswidgets.h,v retrieving revision 1.15.2.1 retrieving revision 1.15.2.2 diff -C2 -d -r1.15.2.1 -r1.15.2.2 *** qtlcmswidgets.h 10 Jun 2009 19:38:08 -0000 1.15.2.1 --- qtlcmswidgets.h 16 Jun 2009 07:26:25 -0000 1.15.2.2 *************** *** 36,48 **** #define __qtlcmswidgets_H - #include <q3hbox.h> #include <QLabel> #include <QComboBox> #include <QPushButton> - #include <q3table.h> #include <QLineEdit> #include <QPainter> #include <QWidget> #include "lcmsprf.h" // Base selector implements a selector for IT8 files and icc profiles --- 36,52 ---- #define __qtlcmswidgets_H #include <QLabel> #include <QComboBox> #include <QPushButton> #include <QLineEdit> #include <QPainter> #include <QWidget> #include "lcmsprf.h" + #include <QHBoxLayout> + #include <QTableView> + #include <QTableWidget> + + #include <q3hbox.h> + #include <q3table.h> // Base selector implements a selector for IT8 files and icc profiles *************** *** 50,129 **** // It has bed designed to never be extended anymore - // changed by me =========================================================================== - /* - class BaseSelector: public Q3HBox { - - - Q_OBJECT - Q_PROPERTY(QString FileMask READ ReadFileMask WRITE WriteFileMask); - Q_PROPERTY(QString Dir READ ReadDir WRITE WriteDir); - Q_PROPERTY(QString Prompt READ getPrompt WRITE setPrompt); - Q_PROPERTY(int lUseDescriptor READ getUseDescriptor WRITE setUseDescriptor); - Q_PROPERTY(int lForOutput READ getForOutput WRITE setForOutput);; - - public: - - BaseSelector(QString ThePrompt, QString DefaultDir, QString Mask = "*.*", BOOL lUseLineEdit = FALSE, BOOL showFileDialog = TRUE, - QWidget* parent=0, const char* name=0, Qt::WFlags f=0); - - QString getFilename() const; - void setFilename(const QString name); - - QString getPrompt() const { return Prompt->text(); } - void setPrompt(QString text) { Prompt->setText(text); } - - - QString ReadFileMask() const { return FileMask; } - void WriteFileMask(QString Mask) { FileMask = Mask; } - - QString ReadDir() const { return Dir; } - void WriteDir(QString TheDir) { Dir= TheDir; } - - void setCurrItem(int n) { Combo->setCurrentItem(n); } - int getCurrItem() { return Combo->currentItem(); } - int count() {return Combo->count();} - - void setUseDescriptor(int n) { lUseDescriptor = n; } - int getUseDescriptor() const { return lUseDescriptor; } - - void setForOutput(int n) { lUseDescriptor = n; } - int getForOutput() const { return lUseDescriptor; } - - - void setDirCaption(QString text) { PickButton->setText(text); } - - - QString Dir; - QString FileMask; - int lUseDescriptor; - int lUseLineEdit; - int lForOutput; - - virtual void FillValues() = 0; - - protected: - - QStringList Descriptions, FileNames; - QLabel* Prompt; - QComboBox* Combo; - QLineEdit* LineEdit; - QPushButton* PickButton; - - QPushButton* NewButtonPtr; - - protected slots: - - void slotButtonClicked(); - void slotValueChanged(); - - signals: - - void valueChanged(); - - - }; - */ - - class BaseSelector: public QWidget { --- 54,57 ---- *************** *** 154,159 **** void WriteDir(QString TheDir) { Dir= TheDir; } ! void setCurrItem(int n) { Combo->setCurrentItem(n); } ! int getCurrItem() { return Combo->currentItem(); } int count() {return Combo->count();} --- 82,87 ---- void WriteDir(QString TheDir) { Dir= TheDir; } ! void setCurrItem(int n) { Combo->setCurrentIndex(n); } ! int getCurrItem() { return Combo->currentIndex(); } int count() {return Combo->count();} *************** *** 199,209 **** - - - //=================================================================== - - - - // Selects a IT8/CGATS.5 file using a combo box --- 127,130 ---- Index: qtlcmswidgets.cpp =================================================================== RCS file: /cvsroot/lprof/lprof/src/libqtlcmswidgets/qtlcmswidgets.cpp,v retrieving revision 1.42.2.1 retrieving revision 1.42.2.2 diff -C2 -d -r1.42.2.1 -r1.42.2.2 *** qtlcmswidgets.cpp 10 Jun 2009 19:38:08 -0000 1.42.2.1 --- qtlcmswidgets.cpp 16 Jun 2009 07:26:25 -0000 1.42.2.2 *************** *** 76,129 **** // A selector widget - - //removed by me ============================================================= - /* - BaseSelector::BaseSelector(QString ThePrompt, QString DefaultDir, - QString Mask, BOOL lLineEdit, BOOL showFileDialog, - QWidget* parent, const char* name, Qt::WFlags f) : - Q3HBox(parent, name, f), - Dir(DefaultDir), - FileMask(Mask), - lUseDescriptor(0), - lUseLineEdit(lLineEdit) - { - lForOutput = FALSE; - Prompt = new QLabel(ThePrompt, this); - Prompt->setAlignment(Qt::AlignRight|Qt::AlignVCenter); - Prompt->setSizePolicy(QSizePolicy (QSizePolicy::Preferred, QSizePolicy::Preferred)); - - if (lUseLineEdit) - { - LineEdit = new QLineEdit(this); - Prompt->setBuddy(LineEdit); - Combo = NULL; - } - else - { - Combo = new QComboBox(FALSE, this), - Combo->setEditable(FALSE); - Combo-> setSizePolicy(QSizePolicy (QSizePolicy::Expanding, QSizePolicy::Preferred)); - Prompt->setBuddy(Combo); - LineEdit = NULL; - } - - setMargin(2); - setSpacing(10); - if (showFileDialog) - { - PickButton = new QPushButton(this); - PickButton -> setSizePolicy(QSizePolicy (QSizePolicy::Minimum, QSizePolicy::Preferred)); - PickButton-> setText(tr (" Select Directory ")); - NewButtonPtr = NULL; - connect(PickButton, SIGNAL( clicked() ), this, SLOT( slotButtonClicked() ) ); - } - - if (lUseLineEdit) - connect( LineEdit, SIGNAL( textChanged(const QString&) ), this, SLOT( slotValueChanged() ) ); - else - connect( Combo, SIGNAL( activated(int) ), this, SLOT( slotValueChanged() ) ); - } - */ - BaseSelector::BaseSelector(QString ThePrompt, QString DefaultDir, QString Mask, BOOL lLineEdit, BOOL showFileDialog, --- 76,79 ---- *************** *** 135,140 **** lUseLineEdit(lLineEdit) { - //added ========================================== - //now on when we want to add any widget we will add to layout_baseselector instead to this. setAccessibleName(QString(QLatin1String(name))); QHBoxLayout *layout_baseselector = new QHBoxLayout; --- 85,88 ---- *************** *** 142,151 **** layout_baseselector->setContentsMargins(2,2,2,2); this->setLayout(layout_baseselector); - //=============================================== lForOutput = FALSE; ! //Prompt = new QLabel(ThePrompt, this); ! Prompt=new QLabel(ThePrompt); //added=== ! this->layout()->addWidget(Prompt); //added=== Prompt->setAlignment(Qt::AlignRight|Qt::AlignVCenter); Prompt->setSizePolicy(QSizePolicy (QSizePolicy::Preferred, QSizePolicy::Preferred)); --- 90,97 ---- layout_baseselector->setContentsMargins(2,2,2,2); this->setLayout(layout_baseselector); lForOutput = FALSE; ! Prompt=new QLabel(ThePrompt); ! this->layout()->addWidget(Prompt); Prompt->setAlignment(Qt::AlignRight|Qt::AlignVCenter); Prompt->setSizePolicy(QSizePolicy (QSizePolicy::Preferred, QSizePolicy::Preferred)); *************** *** 153,159 **** if (lUseLineEdit) { ! // LineEdit = new QLineEdit(this); ! LineEdit = new QLineEdit(); //added=== ! this->layout()->addWidget(LineEdit); //added=== Prompt->setBuddy(LineEdit); Combo = NULL; --- 99,104 ---- if (lUseLineEdit) { ! LineEdit = new QLineEdit(); ! this->layout()->addWidget(LineEdit); Prompt->setBuddy(LineEdit); Combo = NULL; *************** *** 161,167 **** else { ! // Combo = new QComboBox(FALSE, this), ! Combo =new QComboBox(FALSE); //added=== ! this->layout()->addWidget(Combo); //added=== Combo->setEditable(FALSE); Combo-> setSizePolicy(QSizePolicy (QSizePolicy::Expanding, QSizePolicy::Preferred)); --- 106,111 ---- else { ! Combo =new QComboBox(FALSE); ! this->layout()->addWidget(Combo); Combo->setEditable(FALSE); Combo-> setSizePolicy(QSizePolicy (QSizePolicy::Expanding, QSizePolicy::Preferred)); *************** *** 170,180 **** } - //setMargin(2); //implemented this when created layout - //setSpacing(10); if (showFileDialog) { ! //PickButton = new QPushButton(this); ! PickButton = new QPushButton(); //added=== ! this->layout()->addWidget(PickButton); //added=== PickButton -> setSizePolicy(QSizePolicy (QSizePolicy::Minimum, QSizePolicy::Preferred)); --- 114,121 ---- } if (showFileDialog) { ! PickButton = new QPushButton(); ! this->layout()->addWidget(PickButton); PickButton -> setSizePolicy(QSizePolicy (QSizePolicy::Minimum, QSizePolicy::Preferred)); *************** *** 190,198 **** } - //=================================================================== - - - - QString BaseSelector::getFilename() const --- 131,134 ---- |
|
From: Hal E. <hv...@us...> - 2009-06-11 19:38:41
|
Update of /cvsroot/lprof/lprof/src/lprofqt In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv11284/src/lprofqt Modified Files: lprofmainbase.ui Log Message: Revert to 1.50 Index: lprofmainbase.ui =================================================================== RCS file: /cvsroot/lprof/lprof/src/lprofqt/lprofmainbase.ui,v retrieving revision 1.56 retrieving revision 1.57 diff -C2 -d -r1.56 -r1.57 *** lprofmainbase.ui 11 Jun 2009 19:19:18 -0000 1.56 --- lprofmainbase.ui 11 Jun 2009 19:38:21 -0000 1.57 *************** *** 1,7 **** ! <?xml version="1.0" encoding="UTF-8"?> ! <ui version="4.0"> <class>lprofMainBase</class> ! <widget class="QDialog" name="lprofMainBase"> ! <property name="geometry"> <rect> <x>0</x> --- 1,6 ---- ! <ui version="4.0" > <class>lprofMainBase</class> [...4520 lines suppressed...] </customwidgets> <includes> ! <include location="local">qtlcmswidgets.h</include> </includes> <resources> ! <include location="../../lprof.qrc"/> </resources> <connections/> --- 2487,2497 ---- <extends>Q3Frame</extends> <header>qtlcmswidgets.h</header> </customwidget> </customwidgets> <includes> ! <include location="local" >qtlcmswidgets.h</include> </includes> <resources> ! <include location="../../lprof.qrc" /> </resources> <connections/> |
|
From: Amit K. <ami...@us...> - 2009-06-11 19:19:26
|
Update of /cvsroot/lprof/lprof/src/lprofqt In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv9400 Added Files: lprofmainbase.ui Log Message: --- NEW FILE: lprofmainbase.ui --- <?xml version="1.0" encoding="UTF-8"?> <ui version="4.0"> <class>lprofMainBase</class> <widget class="QDialog" name="lprofMainBase"> <property name="geometry"> <rect> <x>0</x> <y>0</y> <width>1101</width> <height>779</height> </rect> </property> <property name="windowTitle"> <string>Little CMS Profiler</string> </property> <property name="sizeGripEnabled"> <bool>true</bool> </property> <layout class="QGridLayout"> [...2290 lines suppressed...] <class>IT8FileSelector</class> <extends>Q3Frame</extends> <header>qtlcmswidgets.h</header> <container>1</container> </customwidget> <customwidget> <class>ICCProfileSelector</class> <extends>Q3Frame</extends> <header>qtlcmswidgets.h</header> <container>1</container> </customwidget> </customwidgets> <includes> <include location="local">qtlcmswidgets.h</include> </includes> <resources> <include location="../../lprof.qrc"/> </resources> <connections/> </ui> |
|
From: Amit K. <ami...@us...> - 2009-06-11 19:15:49
|
Update of /cvsroot/lprof/lprof/src/lprofqt In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv9065 Removed Files: lprofmainbase.ui Log Message: --- lprofmainbase.ui DELETED --- |
|
From: Amit K. <ami...@us...> - 2009-06-11 17:59:34
|
Update of /cvsroot/lprof/lprof/src/lprofqt In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv949 Added Files: lprofmainbase.ui Log Message: --- NEW FILE: lprofmainbase.ui --- <?xml version="1.0" encoding="UTF-8"?> <ui version="4.0"> <class>lprofMainBase</class> <widget class="QDialog" name="lprofMainBase"> <property name="geometry"> <rect> <x>0</x> <y>0</y> <width>1101</width> <height>779</height> </rect> </property> <property name="windowTitle"> <string>Little CMS Profiler</string> </property> <property name="sizeGripEnabled"> <bool>true</bool> </property> <layout class="QGridLayout"> [...2290 lines suppressed...] <class>IT8FileSelector</class> <extends>Q3Frame</extends> <header>qtlcmswidgets.h</header> <container>1</container> </customwidget> <customwidget> <class>ICCProfileSelector</class> <extends>Q3Frame</extends> <header>qtlcmswidgets.h</header> <container>1</container> </customwidget> </customwidgets> <includes> <include location="local">qtlcmswidgets.h</include> </includes> <resources> <include location="../../lprof.qrc"/> </resources> <connections/> </ui> |
|
From: Amit K. <ami...@us...> - 2009-06-11 17:48:54
|
Update of /cvsroot/lprof/lprof/src/lprofqt In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv32175 Removed Files: lprofmainbase.ui Log Message: --- lprofmainbase.ui DELETED --- |
|
From: Amit K. <ami...@us...> - 2009-06-11 16:47:56
|
Update of /cvsroot/lprof/lprof/src/lprofqt In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv24528 Added Files: lprofmainbase.ui Log Message: i --- NEW FILE: lprofmainbase.ui --- <ui version="4.0" > <class>lprofMainBase</class> <widget class="QDialog" name="lprofMainBase" > <property name="geometry" > <rect> <x>0</x> <y>0</y> <width>1101</width> <height>779</height> </rect> </property> <property name="windowTitle" > <string>Little CMS Profiler</string> </property> <property name="sizeGripEnabled" > <bool>true</bool> </property> <layout class="QGridLayout" > <item row="0" column="0" > [...2459 lines suppressed...] </customwidget> <customwidget> <class>IT8FileSelector</class> <extends>Q3Frame</extends> <header>qtlcmswidgets.h</header> </customwidget> <customwidget> <class>ICCProfileSelector</class> <extends>Q3Frame</extends> <header>qtlcmswidgets.h</header> </customwidget> </customwidgets> <includes> <include location="local" >qtlcmswidgets.h</include> </includes> <resources> <include location="../../lprof.qrc" /> </resources> <connections/> </ui> |
44 messages has been excluded from this view by a project administrator.
