[Lprof-devel] lprof/src/reference_inst_qt installreffile.cpp, 1.57.2.2, 1.57.2.3 installreffile.h,
Brought to you by:
hvengel
Menu
▾
▴
[Lprof-devel] lprof/src/reference_inst_qt installreffile.cpp, 1.57.2.2, 1.57.2.3 installreffile.h, 1.21.2.2, 1.21.2.3 installreffilebase.ui, 1.24, 1.24.2.1
|
From: Amit K. <ami...@us...> - 2009-07-05 20:33:29
|
Update of /cvsroot/lprof/lprof/src/reference_inst_qt In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv11270/reference_inst_qt Modified Files: Tag: GSoC-2009 installreffile.cpp installreffile.h installreffilebase.ui Log Message: With these changes lprof is now ported Index: installreffile.h =================================================================== RCS file: /cvsroot/lprof/lprof/src/reference_inst_qt/installreffile.h,v retrieving revision 1.21.2.2 retrieving revision 1.21.2.3 diff -C2 -d -r1.21.2.2 -r1.21.2.3 *** installreffile.h 1 Jul 2009 18:34:03 -0000 1.21.2.2 --- installreffile.h 5 Jul 2009 20:33:18 -0000 1.21.2.3 *************** *** 35,41 **** #include <ui_installreffilebase.h> #include <QFile> - //#include <q3urloperator.h> - - //class Q3NetworkOperation; enum TemplateType --- 35,38 ---- *************** *** 72,77 **** bool refNotToOld(); - //Q3UrlOperator urlOp; - //int copyNum; ref_file_parms dirs; targetTemplate files; --- 69,72 ---- *************** *** 82,86 **** void slotCancel(); void slotHelpButton(); - //void slotFileCopied( Q3NetworkOperation * ); void slotTargetSelectorChanged(); --- 77,80 ---- Index: installreffile.cpp =================================================================== RCS file: /cvsroot/lprof/lprof/src/reference_inst_qt/installreffile.cpp,v retrieving revision 1.57.2.2 retrieving revision 1.57.2.3 diff -C2 -d -r1.57.2.2 -r1.57.2.3 *** installreffile.cpp 1 Jul 2009 18:34:02 -0000 1.57.2.2 --- installreffile.cpp 5 Jul 2009 20:33:18 -0000 1.57.2.3 *************** *** 42,52 **** #include <qmessagebox.h> #include <qmutex.h> - #include <q3textstream.h> #include <qfile.h> - //#include <q3urloperator.h> #include <qdir.h> #include <qdatetime.h> #include <QTranslator> #include <QFile> #if !defined(__WIN32__) && (defined(_WIN32) || defined(WIN32)) --- 42,51 ---- #include <qmessagebox.h> #include <qmutex.h> #include <qfile.h> #include <qdir.h> #include <qdatetime.h> #include <QTranslator> #include <QFile> + #include <QTextStream> #if !defined(__WIN32__) && (defined(_WIN32) || defined(WIN32)) *************** *** 100,104 **** QFile ReferenceFileInput(fn); ReferenceFileInput.open(QIODevice::ReadOnly); ! Q3TextStream inTargetStream(&ReferenceFileInput); bool dateComplete = FALSE; --- 99,103 ---- QFile ReferenceFileInput(fn); ReferenceFileInput.open(QIODevice::ReadOnly); ! QTextStream inTargetStream(&ReferenceFileInput); bool dateComplete = FALSE; *************** *** 130,134 **** QString created = QString::fromLocal8Bit(cmsIT8GetProperty(hIT8, "CREATED")); QDate date = QDate::currentDate(); ! refToOld = (((date.month() - strMonthToInt(created.left(created.find(QString::fromLocal8Bit(" "))))) + ((date.year() - created.right(4).toInt()) * 12)) > 36); refToOld = false; cmsIT8Free(hIT8); --- 129,133 ---- QString created = QString::fromLocal8Bit(cmsIT8GetProperty(hIT8, "CREATED")); QDate date = QDate::currentDate(); ! refToOld = (((date.month() - strMonthToInt(created.left(created.indexOf(QString::fromLocal8Bit(" "))))) + ((date.year() - created.right(4).toInt()) * 12)) > 36); refToOld = false; cmsIT8Free(hIT8); *************** *** 144,148 **** InstallRefFile::InstallRefFile(QWidget *parent) ! : QDialog(parent, "", 0, Qt::WindowSystemMenuHint) //, urlOp(QString::fromLocal8Bit("/")) { setupUi(this); --- 143,147 ---- InstallRefFile::InstallRefFile(QWidget *parent) ! : QDialog(parent, Qt::WindowSystemMenuHint) { setupUi(this); *************** *** 167,177 **** settings = a.items.settings; ! TargetSelector->Dir = settings -> readEntry(QString::fromLocal8Bit("/LPROF/Files/referencefile_default_dir"), QDir::homeDirPath()); TargetSelector->setFilename(QString::fromLocal8Bit("")); ! if (!QString::compare(QDir::homeDirPath() + QString (QString::fromLocal8Bit("/")), TargetSelector->ReadDir()) == 0) TargetSelector->FillValues(); - //connect( &urlOp, SIGNAL( finished( Q3NetworkOperation *) ), this, SLOT( slotFileCopied( Q3NetworkOperation * ) ) ); connect(TargetSelector, SIGNAL(valueChanged()), this, SLOT(slotTargetSelectorChanged())); --- 166,175 ---- settings = a.items.settings; ! TargetSelector->Dir = settings -> value(QString::fromLocal8Bit("/LPROF/Files/referencefile_default_dir"), QDir::homePath()).toString(); TargetSelector->setFilename(QString::fromLocal8Bit("")); ! if (!QString::compare(QDir::homePath() + QString (QString::fromLocal8Bit("/")), TargetSelector->ReadDir()) == 0) TargetSelector->FillValues(); connect(TargetSelector, SIGNAL(valueChanged()), this, SLOT(slotTargetSelectorChanged())); *************** *** 195,226 **** } - /* - void InstallRefFile::slotFileCopied( Q3NetworkOperation *op ) - { - QString errorInfo; - - if ( !op ) - return; - - mutex.lock(); - if ( op && op->state() == Q3NetworkProtocol::StFailed ) - // The copy operation failed - // Let users know there is a problem - QMessageBox::critical( this, tr( "ERROR" ), op->protocolDetail() ); - else if (op -> operation () == Q3NetworkProtocol::OpPut) - { - copyNum = copyNum - 1; - QMessageBox::information( this, tr( "Reference File Installed" ), tr("The reference file was succesfully installed")); - } - if (copyNum == 0) - buttonCancel->setEnabled(true); - mutex.unlock(); - } - */ TemplateType InstallRefFile::CheckTemplateType() { QFile ReferenceFile(TargetSelector->getFilename()); ReferenceFile.open(QIODevice::ReadOnly); ! Q3TextStream checkSets(&ReferenceFile); QString currentString; --- 193,201 ---- } TemplateType InstallRefFile::CheckTemplateType() { QFile ReferenceFile(TargetSelector->getFilename()); ReferenceFile.open(QIODevice::ReadOnly); ! QTextStream checkSets(&ReferenceFile); QString currentString; *************** *** 244,249 **** checkSets >> currentString; LogoSerial = currentString.right(currentString.length() - 1).left(currentString.length() - 2); ! int year = LogoSerial.mid(LogoSerial.findRev(QString::fromLocal8Bit("/")) + 1, LogoSerial.length() - LogoSerial.findRev(QString::fromLocal8Bit("/"))).toInt(); ! int month = LogoSerial.left(LogoSerial.find(QString::fromLocal8Bit("/"))).toInt(); checkSets >> currentString; checkSets >> currentString; --- 219,224 ---- checkSets >> currentString; LogoSerial = currentString.right(currentString.length() - 1).left(currentString.length() - 2); ! int year = LogoSerial.mid(LogoSerial.lastIndexOf(QString::fromLocal8Bit("/")) + 1, LogoSerial.length() - LogoSerial.lastIndexOf(QString::fromLocal8Bit("/"))).toInt(); ! int month = LogoSerial.left(LogoSerial.indexOf(QString::fromLocal8Bit("/"))).toInt(); checkSets >> currentString; checkSets >> currentString; *************** *** 257,261 **** if (logo) { ! int pos = TargetSelector->getFilename().findRev(QString::fromLocal8Bit("/"), TargetSelector->getFilename().length() -1, FALSE); LogoDescriptor = TargetSelector->getFilename().right(TargetSelector->getFilename().length() - (pos + 1)); } --- 232,236 ---- if (logo) { ! int pos = TargetSelector->getFilename().lastIndexOf(QString::fromLocal8Bit("/"), TargetSelector->getFilename().length() -1, Qt::CaseInsensitive); LogoDescriptor = TargetSelector->getFilename().right(TargetSelector->getFilename().length() - (pos + 1)); } *************** *** 320,324 **** QFile ReferenceFileInput(TargetSelector->getFilename()); ReferenceFileInput.open(QIODevice::ReadOnly); ! Q3TextStream inTargetStream(&ReferenceFileInput); int dateCompletionFlag = 0; --- 295,299 ---- QFile ReferenceFileInput(TargetSelector->getFilename()); ReferenceFileInput.open(QIODevice::ReadOnly); ! QTextStream inTargetStream(&ReferenceFileInput); int dateCompletionFlag = 0; *************** *** 451,460 **** int textCutOff; ! monthParse = createdTextParse.copy(); ! textCutOff = monthParse.find(QString::fromLocal8Bit(","), 0, true); monthParse.remove(textCutOff, monthParse.length()); createdTextParse.remove(0, textCutOff + 2); ! createdTextParse.remove(0, createdTextParse.find(QString::fromLocal8Bit(" ")) + 1); ! yearParse = createdTextParse.copy(); newProductionDateText = yearParse; --- 426,435 ---- int textCutOff; ! monthParse = createdTextParse; ! textCutOff = monthParse.indexOf(QString::fromLocal8Bit(","), 0, Qt::CaseSensitive); monthParse.remove(textCutOff, monthParse.length()); createdTextParse.remove(0, textCutOff + 2); ! createdTextParse.remove(0, createdTextParse.indexOf(QString::fromLocal8Bit(" ")) + 1); ! yearParse = createdTextParse; newProductionDateText = yearParse; *************** *** 510,514 **** QFile newTargetFile(files.items.targetFile); newTargetFile.open(QIODevice::ReadOnly); ! Q3TextStream newTargetStream(&newTargetFile); while(fileStringTraversal != QString::fromLocal8Bit("BEGIN_DATA")) --- 485,489 ---- QFile newTargetFile(files.items.targetFile); newTargetFile.open(QIODevice::ReadOnly); ! QTextStream newTargetStream(&newTargetFile); while(fileStringTraversal != QString::fromLocal8Bit("BEGIN_DATA")) *************** *** 517,521 **** QFile sourceTargetFile(dirs.template_dir + QString::fromLocal8Bit("/") + QString::fromLocal8Bit("hutchtone.ITX")); sourceTargetFile.open(QIODevice::ReadOnly); ! Q3TextStream compare(&sourceTargetFile); while(fileStringTraversalCmp != QString::fromLocal8Bit("BEGIN_DATA")) --- 492,496 ---- QFile sourceTargetFile(dirs.template_dir + QString::fromLocal8Bit("/") + QString::fromLocal8Bit("hutchtone.ITX")); sourceTargetFile.open(QIODevice::ReadOnly); ! QTextStream compare(&sourceTargetFile); while(fileStringTraversalCmp != QString::fromLocal8Bit("BEGIN_DATA")) *************** *** 563,567 **** { files.items.targetFile = dirs.ref_dir + ! TargetSelector->getFilename().mid(TargetSelector->getFilename().findRev(QString::fromLocal8Bit("/"), -1), TargetSelector->getFilename().length()); --- 538,542 ---- { files.items.targetFile = dirs.ref_dir + ! TargetSelector->getFilename().mid(TargetSelector->getFilename().lastIndexOf(QString::fromLocal8Bit("/"), -1), TargetSelector->getFilename().length()); *************** *** 664,668 **** ds.put(refile, this -> height(), this -> width()); ! settings -> writeEntry(QString::fromLocal8Bit("/LPROF/Files/referencefile_default_dir"), TargetSelector->ReadDir()); } --- 639,643 ---- ds.put(refile, this -> height(), this -> width()); ! settings -> setValue(QString::fromLocal8Bit("/LPROF/Files/referencefile_default_dir"), TargetSelector->ReadDir()); } *************** *** 713,724 **** files.items.templateFile = dirs.template_dir + QString::fromLocal8Bit("/") + templateFileName; files.items.targetFile = dirs.ref_dir + ! TargetSelector->getFilename().mid(TargetSelector->getFilename().findRev(QString::fromLocal8Bit("/"), -1), TargetSelector->getFilename().length()); ! QDir::cleanDirPath( files.items.targetFile ); if (copy) { files.items.targetFile = dirs.ref_dir + ! TargetSelector->getFilename().mid(TargetSelector->getFilename().findRev(QString::fromLocal8Bit("/"), -1), TargetSelector->getFilename().length()); //mutex.lock(); --- 688,699 ---- files.items.templateFile = dirs.template_dir + QString::fromLocal8Bit("/") + templateFileName; files.items.targetFile = dirs.ref_dir + ! TargetSelector->getFilename().mid(TargetSelector->getFilename().lastIndexOf(QString::fromLocal8Bit("/"), -1), TargetSelector->getFilename().length()); ! QDir::cleanPath( files.items.targetFile ); if (copy) { files.items.targetFile = dirs.ref_dir + ! TargetSelector->getFilename().mid(TargetSelector->getFilename().lastIndexOf(QString::fromLocal8Bit("/"), -1), TargetSelector->getFilename().length()); //mutex.lock(); *************** *** 756,763 **** if (ArgyllCGTSFile.open(QIODevice::ReadOnly)) { ! Q3TextStream in(&ArgyllCGTSFile); if (cleanCGATS.open(QIODevice::WriteOnly)) { ! Q3TextStream out(&cleanCGATS); int i = 1; while ( !in.atEnd() ) --- 731,738 ---- if (ArgyllCGTSFile.open(QIODevice::ReadOnly)) { ! QTextStream in(&ArgyllCGTSFile); if (cleanCGATS.open(QIODevice::WriteOnly)) { ! QTextStream out(&cleanCGATS); int i = 1; while ( !in.atEnd() ) *************** *** 805,817 **** int startOfFileName, lowSpec, highSpec, specBands; ! startOfFileName = TargetSelector->getFilename().findRev(QString::fromLocal8Bit("/"), -1); CCFilename = TargetSelector->getFilename(); CCFilename.remove(0, startOfFileName + 1); ! CCFilename.remove(CCFilename.findRev(QString::fromLocal8Bit("."), -1), 4); QString fileName = dirs.ref_dir + QString::fromLocal8Bit("/") + CCFilename + QString::fromLocal8Bit(".txt"); QFile ReferenceFile(TargetSelector->getFilename()); ReferenceFile.open(QIODevice::ReadOnly); ! Q3TextStream inStream(&ReferenceFile); logoSerial = QString::fromLocal8Bit(""); --- 780,792 ---- int startOfFileName, lowSpec, highSpec, specBands; ! startOfFileName = TargetSelector->getFilename().lastIndexOf(QString::fromLocal8Bit("/"), -1); CCFilename = TargetSelector->getFilename(); CCFilename.remove(0, startOfFileName + 1); ! CCFilename.remove(CCFilename.lastIndexOf(QString::fromLocal8Bit("."), -1), 4); QString fileName = dirs.ref_dir + QString::fromLocal8Bit("/") + CCFilename + QString::fromLocal8Bit(".txt"); QFile ReferenceFile(TargetSelector->getFilename()); ReferenceFile.open(QIODevice::ReadOnly); ! QTextStream inStream(&ReferenceFile); logoSerial = QString::fromLocal8Bit(""); *************** *** 834,839 **** inStream >> currentString; logoSerial = currentString.right(currentString.length() - 1).left(currentString.length() - 2); ! int year = logoSerial.mid(logoSerial.findRev(QString::fromLocal8Bit("/")) + 1, logoSerial.length() - logoSerial.findRev(QString::fromLocal8Bit("/"))).toInt(); ! int month = logoSerial.left(logoSerial.find(QString::fromLocal8Bit("/"))).toInt(); inStream >> currentString; inStream >> currentString; --- 809,814 ---- inStream >> currentString; logoSerial = currentString.right(currentString.length() - 1).left(currentString.length() - 2); ! int year = logoSerial.mid(logoSerial.lastIndexOf(QString::fromLocal8Bit("/")) + 1, logoSerial.length() - logoSerial.lastIndexOf(QString::fromLocal8Bit("/"))).toInt(); ! int month = logoSerial.left(logoSerial.indexOf(QString::fromLocal8Bit("/"))).toInt(); inStream >> currentString; inStream >> currentString; *************** *** 1040,1050 **** int startOfFileName; ! startOfFileName = TargetSelector->getFilename().findRev(QString::fromLocal8Bit("/"), -1); CCFilename = TargetSelector->getFilename(); CCFilename.remove(0, startOfFileName + 1); ! CCFilename.remove(CCFilename.findRev(QString::fromLocal8Bit("."), -1), 4); // Save current dir and switch into temp dir ! QString currPath = QDir::currentDirPath(); QDir::setCurrent(dirs.temp_dir); --- 1015,1025 ---- int startOfFileName; ! startOfFileName = TargetSelector->getFilename().lastIndexOf(QString::fromLocal8Bit("/"), -1); CCFilename = TargetSelector->getFilename(); CCFilename.remove(0, startOfFileName + 1); ! CCFilename.remove(CCFilename.lastIndexOf(QString::fromLocal8Bit("."), -1), 4); // Save current dir and switch into temp dir ! QString currPath = QDir::currentPath(); QDir::setCurrent(dirs.temp_dir); *************** *** 1090,1094 **** cmsIT8SaveToFile(hIT8, (const char *) files.items.targetFile.toLocal8Bit()); ! // QDir::cleanDirPath( files.items.targetFile ); logoConvert(); } --- 1065,1069 ---- cmsIT8SaveToFile(hIT8, (const char *) files.items.targetFile.toLocal8Bit()); ! // QDir::cleanPath( files.items.targetFile ); logoConvert(); } Index: installreffilebase.ui =================================================================== RCS file: /cvsroot/lprof/lprof/src/reference_inst_qt/installreffilebase.ui,v retrieving revision 1.24 retrieving revision 1.24.2.1 diff -C2 -d -r1.24 -r1.24.2.1 *** installreffilebase.ui 1 Feb 2009 20:04:01 -0000 1.24 --- installreffilebase.ui 5 Jul 2009 20:33:18 -0000 1.24.2.1 *************** *** 473,477 **** <customwidget> <class>IT8SelectorWithFileDialog</class> ! <extends>Q3Frame</extends> <header>qtlcmswidgets.h</header> <container>1</container> --- 473,477 ---- <customwidget> <class>IT8SelectorWithFileDialog</class> ! <extends>QFrame</extends> <header>qtlcmswidgets.h</header> <container>1</container> |
