[Lprof-devel] lprof/src/lprofqt lprofmain.cpp, 1.169, 1.170 lprofmain.h, 1.44, 1.45 lprofmainbase.u
Brought to you by:
hvengel
Menu
▾
▴
[Lprof-devel] lprof/src/lprofqt lprofmain.cpp, 1.169, 1.170 lprofmain.h, 1.44, 1.45 lprofmainbase.ui, 1.46, 1.47
|
From: Hal E. <hv...@us...> - 2007-10-13 21:20:28
|
Update of /cvsroot/lprof/lprof/src/lprofqt In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv15439/src/lprofqt Modified Files: lprofmain.cpp lprofmain.h lprofmainbase.ui Log Message: GUI changes. Move profile file name widgets to profile ID dialog. This will force user to at least look at the profile ID info when creating a new profile. Also moved Description to just below profile file name since this is the most important of the setting in this dialog. Move Safe Frame, input proof profile, install reference file widgets to camera/scanner profiler tab. Move display proofing profile and proofing intent widgets to monitor profiling tab. Rearrange widgets on camera/scanner and monitor profiler tabs to create room for new widgets. Preference tab is now empty. Safe Frame value changes now automatically trigger pick of target image. Safe Frame can now be set as low as 35%. Progress bar is now reset to 0% with any user action after profile creation is complete. Index: lprofmain.cpp =================================================================== RCS file: /cvsroot/lprof/lprof/src/lprofqt/lprofmain.cpp,v retrieving revision 1.169 retrieving revision 1.170 diff -C2 -d -r1.169 -r1.170 *** lprofmain.cpp 11 Oct 2007 22:54:13 -0000 1.169 --- lprofmain.cpp 13 Oct 2007 21:20:24 -0000 1.170 *************** *** 1218,1221 **** --- 1218,1222 ---- QCanvasView::resizeEvent( e ); maindialog.FigEditor-> resize(width(), height()); + maindialog.zeroProgressBars(); } *************** *** 1223,1227 **** void FigureEditor::contentsMousePressEvent(QMouseEvent* e) { ! if (!SelectWPpatch) {// qDebug("FigureEditor::contentsMousePressEvent"); --- 1224,1228 ---- void FigureEditor::contentsMousePressEvent(QMouseEvent* e) { ! maindialog.zeroProgressBars(); if (!SelectWPpatch) {// qDebug("FigureEditor::contentsMousePressEvent"); *************** *** 1351,1354 **** --- 1352,1356 ---- { // qDebug("lprofMain::slotLoad"); + zeroProgressBars(); QString dir = settings -> readEntry("/LPROF/Files/last_load_dir", QDir::homeDirPath()); *************** *** 1399,1402 **** --- 1401,1405 ---- ControlsToValues(); } + zeroProgressBars(); } *************** *** 1619,1628 **** void lprofMain::SetOutputFile( const QString OutputFile ) { ! switch (TabProfiler -> currentPageIndex()) { case 0: OutputFileEdit -> setText(OutputFile); break; case 1: OutputFileEdit_Mon -> setText(OutputFile); break; ! default:; // if not on a profiling tab do nothing } } --- 1622,1632 ---- void lprofMain::SetOutputFile( const QString OutputFile ) { ! switch (TabProfiler -> currentPageIndex()) ! { case 0: OutputFileEdit -> setText(OutputFile); break; case 1: OutputFileEdit_Mon -> setText(OutputFile); break; ! default:; // if not on a profiling tab do nothing } } *************** *** 1887,1891 **** if (found) { ! cmdLst << "-showSidebar"; // setup help directory for current system language code --- 1891,1895 ---- if (found) { ! // cmdLst << "-showSidebar"; // setup help directory for current system language code *************** *** 1893,1897 **** // If QTextCodec::locale() is not supprted then default to english help files ! // currently only english is supported QString path; --- 1897,1901 ---- // If QTextCodec::locale() is not supprted then default to english help files ! // currently only english and Russian is supported QString path; *************** *** 1902,1906 **** if (test == (QString) "ru") path = QDir::currentDirPath() + "/help/" + (QString) QTextCodec::locale(); ! else // since at this point only english and russian // help pages exist // everyone else still gets english help --- 1906,1910 ---- if (test == (QString) "ru") path = QDir::currentDirPath() + "/help/" + (QString) QTextCodec::locale(); ! else // since at this point only english and Russian // help pages exist // everyone else still gets english help *************** *** 1913,1916 **** --- 1917,1936 ---- cmdLst << "-profile" << path + QDir::separator() + QString("lprof-help.adp"); help->setArguments( cmdLst ); + + qDebug("help path = " + path); + + if (!QFile::exists(path + "/lprof-help.html")) + { + QMessageBox mb( QTranslator::tr((QString)"Help system files not found"), + QTranslator::tr((QString)"The path to the help files is not\n" + "correct. Please contact LProf support with\n" + "the contents of this message.\n" + "The current help path is set to:\n") + path, + QMessageBox::Critical, + QMessageBox::Ok | QMessageBox::Default, + QMessageBox::NoButton, QMessageBox::NoButton); + + mb.exec(); + } } else // let the user know that help will not work *************** *** 2223,2226 **** --- 2243,2247 ---- init_measurement_tool(); + ProgBar = ProgressBar; LoadConfig(); *************** *** 2229,2233 **** // init_targetlist(); ! last_tab=0; global_help_path = new QString; setupHelp(global_help_path); --- 2250,2254 ---- // init_targetlist(); ! last_tab=0; global_help_path = new QString; setupHelp(global_help_path); *************** *** 2239,2244 **** --- 2260,2267 ---- // comboBoxDevice -> setEnabled (FALSE); Console = ProgressConsole; + slotProofProfilesChanged(); + sys.hdr.instArray = new serialInsts[1]; // validProfileFilenameRegEx.setCaseSensitive(FALSE); // profileExtensionValidator = new QRegExpValidator(validProfileFilenameRegEx, this); *************** *** 2638,2641 **** --- 2661,2665 ---- // check what type of profile is currently being worked on // and decide if the GoButton should be enabled + zeroProgressBars(); switch (TabProfiler -> currentPageIndex()) { *************** *** 2923,2926 **** --- 2947,2951 ---- // qDebug("lprofMain::slotUpdateProfileParmsText()"); setProfileParmsText(); + zeroProgressBars(); } *************** *** 3338,3355 **** { // qDebug("lprofMain::setProfileIDText"); if (sys.hdr.ProfilerTab == 0) // camera/scanner profiler { ! textEditProfileID->setText( tr("Model: ")); ! textEditProfileID->moveCursor(QTextEdit::MoveLineEnd, 0); ! textEditProfileID->insert( sys.hdr.Model); ! textEditProfileID->insertParagraph(tr("Manufacturer: "), 3); textEditProfileID->moveCursor(QTextEdit::MoveDown, 0); textEditProfileID->moveCursor(QTextEdit::MoveLineEnd, 0); ! textEditProfileID->insert(sys.hdr.Manufacturer); ! textEditProfileID->insertParagraph(tr("Description: "), 5); textEditProfileID->moveCursor(QTextEdit::MoveDown, 0); textEditProfileID->moveCursor(QTextEdit::MoveLineEnd, 0); textEditProfileID->insert(sys.hdr.Description); ! textEditProfileID->insertParagraph(tr("Copyright: "), 7); textEditProfileID->moveCursor(QTextEdit::MoveDown, 0); textEditProfileID->moveCursor(QTextEdit::MoveLineEnd, 0); --- 3363,3386 ---- { // qDebug("lprofMain::setProfileIDText"); + zeroProgressBars(); if (sys.hdr.ProfilerTab == 0) // camera/scanner profiler { ! textEditProfileID->setText( tr("File_Name: ")); textEditProfileID->moveCursor(QTextEdit::MoveDown, 0); textEditProfileID->moveCursor(QTextEdit::MoveLineEnd, 0); ! textEditProfileID->insert(sys.hdr.OutputProfileFile); ! textEditProfileID->insertParagraph(tr("Description: "), 3); textEditProfileID->moveCursor(QTextEdit::MoveDown, 0); textEditProfileID->moveCursor(QTextEdit::MoveLineEnd, 0); textEditProfileID->insert(sys.hdr.Description); ! textEditProfileID->insertParagraph( tr("Model: "), 5); ! textEditProfileID->moveCursor(QTextEdit::MoveDown, 0); ! textEditProfileID->moveCursor(QTextEdit::MoveLineEnd, 0); ! textEditProfileID->insert( sys.hdr.Model); ! textEditProfileID->insertParagraph(tr("Manufacturer: "), 7); ! textEditProfileID->moveCursor(QTextEdit::MoveDown, 0); ! textEditProfileID->moveCursor(QTextEdit::MoveLineEnd, 0); ! textEditProfileID->insert(sys.hdr.Manufacturer); ! textEditProfileID->insertParagraph(tr("Copyright: "), 9); textEditProfileID->moveCursor(QTextEdit::MoveDown, 0); textEditProfileID->moveCursor(QTextEdit::MoveLineEnd, 0); *************** *** 3358,3373 **** if (sys.hdr.ProfilerTab == 1) // monitor profiler { ! textEditProfileID_mon->setText( tr("Model: ")); textEditProfileID_mon->moveCursor(QTextEdit::MoveLineEnd, 0); ! textEditProfileID_mon->insert( sys.hdr.Model); ! textEditProfileID_mon->insertParagraph(tr("Manufacturer: "), 3); textEditProfileID_mon->moveCursor(QTextEdit::MoveDown, 0); textEditProfileID_mon->moveCursor(QTextEdit::MoveLineEnd, 0); ! textEditProfileID_mon->insert(sys.hdr.Manufacturer); ! textEditProfileID_mon->insertParagraph(tr("Description: "), 5); textEditProfileID_mon->moveCursor(QTextEdit::MoveDown, 0); textEditProfileID_mon->moveCursor(QTextEdit::MoveLineEnd, 0); textEditProfileID_mon->insert(sys.hdr.Description); ! textEditProfileID_mon->insertParagraph(tr("Copyright: "), 7); textEditProfileID_mon->moveCursor(QTextEdit::MoveDown, 0); textEditProfileID_mon->moveCursor(QTextEdit::MoveLineEnd, 0); --- 3389,3410 ---- if (sys.hdr.ProfilerTab == 1) // monitor profiler { ! textEditProfileID_mon->setText( tr("File_Name: ")); ! textEditProfileID_mon->moveCursor(QTextEdit::MoveDown, 0); textEditProfileID_mon->moveCursor(QTextEdit::MoveLineEnd, 0); ! textEditProfileID_mon->insert(sys.hdr.mon_profile_file_name); ! textEditProfileID_mon->insertParagraph(tr("Description: "), 3); textEditProfileID_mon->moveCursor(QTextEdit::MoveDown, 0); textEditProfileID_mon->moveCursor(QTextEdit::MoveLineEnd, 0); ! textEditProfileID_mon->insert(sys.hdr.Description); ! textEditProfileID_mon->insertParagraph( tr("Model: "), 5); textEditProfileID_mon->moveCursor(QTextEdit::MoveDown, 0); textEditProfileID_mon->moveCursor(QTextEdit::MoveLineEnd, 0); + textEditProfileID_mon->insert( sys.hdr.Model); + textEditProfileID_mon->insertParagraph(tr("Manufacturer: "), 7); + textEditProfileID_mon->moveCursor(QTextEdit::MoveDown, 0); + textEditProfileID_mon->moveCursor(QTextEdit::MoveLineEnd, 0); + textEditProfileID_mon->insert(sys.hdr.Manufacturer); textEditProfileID_mon->insert(sys.hdr.Description); ! textEditProfileID_mon->insertParagraph(tr("Copyright: "), 9); textEditProfileID_mon->moveCursor(QTextEdit::MoveDown, 0); textEditProfileID_mon->moveCursor(QTextEdit::MoveLineEnd, 0); *************** *** 3443,3446 **** --- 3480,3484 ---- { // qDebug("lprofMain::slotTargetRefChanged"); + zeroProgressBars(); if (!targetList->isEmpty()) // taragetList has items and we are now at the begining for (uint i=0; i<targetList->count(); i++) *************** *** 3457,3460 **** --- 3495,3499 ---- { // qDebug("lprofMain::profChecker_clicked"); + zeroProgressBars(); QString temp_measurement, temp_Output, Mon_temp_measure, Mon_temp_cal; *************** *** 3474,3478 **** break; ! default:; // if not on a profiling tab do nothing } --- 3513,3517 ---- break; ! default:; // if not on a profiling tab do nothing } *************** *** 3483,3487 **** check.exec(); strcpy(sys.hdr.MonMeasurementSheet, Mon_temp_measure); ! strcpy( sys.hdr.MeasurementSheet, temp_measurement); strcpy(sys.hdr.OutputProfileFile, temp_Output); strcpy(sys.hdr.MonCalibrationSheet, Mon_temp_cal); --- 3522,3526 ---- check.exec(); strcpy(sys.hdr.MonMeasurementSheet, Mon_temp_measure); ! strcpy(sys.hdr.MeasurementSheet, temp_measurement); strcpy(sys.hdr.OutputProfileFile, temp_Output); strcpy(sys.hdr.MonCalibrationSheet, Mon_temp_cal); *************** *** 3497,3500 **** --- 3536,3551 ---- // profID.show(); profID.exec(); + + switch (lprofMain::TabProfiler -> currentPageIndex()) + { + case 0: + OutputFileEdit -> setText(sys.hdr.OutputProfileFile); + break; + case 1: + OutputFileEdit_Mon -> setText(sys.hdr.mon_profile_file_name); + break; + + default:; // if not on a profiling tab do nothing + } setProfileIDText(); *************** *** 3678,3681 **** --- 3729,3734 ---- { // qDebug("lprofMain::ProfIDButton_clicked"); + + zeroProgressBars(); refinstOK = false; *************** *** 3741,3744 **** --- 3794,3799 ---- double mult; + + zeroProgressBars(); vigra::DRGBImage in(image_data->width(), image_data->height()); *************** *** 3815,3818 **** --- 3870,3874 ---- { + zeroProgressBars(); QMessageBox mb( QTranslator::tr(QString("Select white point area from target.")), QTranslator::tr(QString("Bring the main LProf window into focus\n") + *************** *** 3845,3850 **** void lprofMain::slotHelpButton() { QString path = global_help_path->local8Bit() + "/lprof-help.html"; ! // qDebug(path); help->openAssistant (); help->showPage(path); --- 3901,3907 ---- void lprofMain::slotHelpButton() { + zeroProgressBars(); QString path = global_help_path->local8Bit() + "/lprof-help.html"; ! qDebug(path); help->openAssistant (); help->showPage(path); *************** *** 3908,3910 **** --- 3965,3980 ---- InputProfileSelector->getFilename() != QString::null); // qDebug("lprofMain::slotProofProfilesChanged()"); + zeroProgressBars(); + } + + void lprofMain::zeroProgressBars() + { + Gauger("Init...", 0, 100, 0); } + + + void lprofMain::safeFarmeChanged() + { + AddTemplate(); + slotPick(); + } \ No newline at end of file Index: lprofmainbase.ui =================================================================== RCS file: /cvsroot/lprof/lprof/src/lprofqt/lprofmainbase.ui,v retrieving revision 1.46 retrieving revision 1.47 diff -C2 -d -r1.46 -r1.47 *** lprofmainbase.ui 11 Oct 2007 22:54:13 -0000 1.46 --- lprofmainbase.ui 13 Oct 2007 21:20:24 -0000 1.47 *************** *** 9,14 **** <x>0</x> <y>0</y> ! <width>958</width> ! <height>745</height> </rect> </property> --- 9,14 ---- <x>0</x> <y>0</y> ! <width>1107</width> [...3196 lines suppressed...] ! <sender>Reference_install</sender> ! <signal>clicked()</signal> ! <receiver>lprofMainBase</receiver> ! <slot>slotInstallReference()</slot> ! </connection> ! <connection> ! <sender>SafeFrame</sender> ! <signal>valueChanged(int)</signal> ! <receiver>lprofMainBase</receiver> ! <slot>safeFarmeChanged()</slot> </connection> </connections> *************** *** 2918,2921 **** --- 2803,2807 ---- <slot>slotIsAllReady()</slot> <slot>slotProofProfilesChanged()</slot> + <slot>safeFarmeChanged()</slot> </slots> <layoutdefaults spacing="6" margin="11"/> Index: lprofmain.h =================================================================== RCS file: /cvsroot/lprof/lprof/src/lprofqt/lprofmain.h,v retrieving revision 1.44 retrieving revision 1.45 diff -C2 -d -r1.44 -r1.45 *** lprofmain.h 11 Oct 2007 22:54:13 -0000 1.44 --- lprofmain.h 13 Oct 2007 21:20:24 -0000 1.45 *************** *** 308,312 **** ref_file_parms items; void get(ref_file &out); ! }; class lprofMain; --- 308,312 ---- ref_file_parms items; void get(ref_file &out); ! }; class lprofMain; *************** *** 349,362 **** ~lprofMain(); - - virtual void Reload(); - virtual void AddTemplate(); - virtual void slotLoad(); - virtual void slotPick(); - - void updateTargetList(target_template &in); - - virtual void slotTargetRefChanged(); - FigureEditor* FigEditor; --- 349,352 ---- *************** *** 366,369 **** --- 356,363 ---- virtual void setRGBpatchValues(); void templateFileCopied( QNetworkOperation *op ); + void zeroProgressBars(); + virtual void AddTemplate(); + virtual void slotPick(); + // void updateTargetList(target_template &in); private slots: *************** *** 384,387 **** --- 378,385 ---- // void helpSignal(const QString &msg); // virtual void setupHelp(); + virtual void Reload(); + virtual void slotLoad(); + virtual void slotTargetRefChanged(); + void safeFarmeChanged(); protected: *************** *** 446,450 **** void Create_Config_Dir(const QString a); - signals: void showProfileParms(); --- 444,447 ---- |
