[Lprof-devel] lprof/src/lprofqt config.cpp, 1.8.2.3, 1.8.2.4 griditem.cpp, 1.4.2.3, 1.4.2.4 imageit
Brought to you by:
hvengel
Menu
▾
▴
[Lprof-devel] lprof/src/lprofqt config.cpp, 1.8.2.3, 1.8.2.4 griditem.cpp, 1.4.2.3, 1.4.2.4 imageitem.cpp, 1.4.2.5, 1.4.2.6 interfaces.cpp, 1.5, 1.5.2.1 lprofmain-priv.cpp, 1.4.2.3, 1.4.2.4 lprofmain-priv.h, 1.6.2.3, 1.6.2.4 lprofmain.cpp, 1.188.2.6, 1.188.2.7 lprofmain.h, 1.52.2.4, 1.52.2.5 lprofmainbase.ui, 1.50.2.2, 1.50.2.3 main.cpp, 1.43.2.1, 1.43.2.2 slots.cpp, 1.5.2.3, 1.5.2.4
|
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; } |
