[Lprof-devel] lprof/src/lprofqt config.cpp, 1.8.2.2, 1.8.2.3 imageitem.cpp, 1.4.2.4, 1.4.2.5 lprofm
Brought to you by:
hvengel
Menu
▾
▴
[Lprof-devel] lprof/src/lprofqt config.cpp, 1.8.2.2, 1.8.2.3 imageitem.cpp, 1.4.2.4, 1.4.2.5 lprofmain-priv.cpp, 1.4.2.2, 1.4.2.3 lprofmain-priv.h, 1.6.2.2, 1.6.2.3 lprofmain.cpp, 1.188.2.5, 1.188.2.6 lprofmain.h, 1.52.2.3, 1.52.2.4 main.cpp, 1.43, 1.43.2.1 slots.cpp, 1.5.2.2, 1.5.2.3
|
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] |
