[Lprof-devel] lprof/src/moncalqt monitorcal.cpp, 1.62, 1.62.2.1 monitorcalbase.ui, 1.11, 1.11.2.1
Brought to you by:
hvengel
Menu
▾
▴
[Lprof-devel] lprof/src/moncalqt monitorcal.cpp, 1.62, 1.62.2.1 monitorcalbase.ui, 1.11, 1.11.2.1
|
From: Amit K. <ami...@us...> - 2009-07-05 20:33:24
|
Update of /cvsroot/lprof/lprof/src/moncalqt In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv11270/moncalqt Modified Files: Tag: GSoC-2009 monitorcal.cpp monitorcalbase.ui Log Message: With these changes lprof is now ported Index: monitorcal.cpp =================================================================== RCS file: /cvsroot/lprof/lprof/src/moncalqt/monitorcal.cpp,v retrieving revision 1.62 retrieving revision 1.62.2.1 diff -C2 -d -r1.62 -r1.62.2.1 *** monitorcal.cpp 8 Mar 2008 23:16:37 -0000 1.62 --- monitorcal.cpp 5 Jul 2009 20:33:17 -0000 1.62.2.1 *************** *** 54,58 **** // QT stuff ! #include <q3textedit.h> #include <qradiobutton.h> #include <qpixmap.h> --- 54,58 ---- // QT stuff ! #include <QTextEdit> #include <qradiobutton.h> #include <qpixmap.h> *************** *** 60,64 **** #include <qpainter.h> #include <qapplication.h> ! #include <q3progressbar.h> #include <qmessagebox.h> #include <qworkspace.h> --- 60,64 ---- #include <qpainter.h> #include <qapplication.h> ! #include <QProgressBar> #include <qmessagebox.h> #include <qworkspace.h> *************** *** 4427,4431 **** } // cd.data.selectedInst.port = listedInst[cd.data.selectedInst.position].port; ! strcpy(instName, cd.data.selectedInst.name.local8Bit()); cd.data.selectedInst.Inst = inst_enum(instName); return TRUE; --- 4427,4431 ---- } // cd.data.selectedInst.port = listedInst[cd.data.selectedInst.position].port; ! strcpy(instName, cd.data.selectedInst.name.toLocal8Bit()); cd.data.selectedInst.Inst = inst_enum(instName); return TRUE; *************** *** 4464,4468 **** { qDebug("initIntrument(): failed new_inst()"); ! messageText -> insertParagraph(tr("Unknown, inappropriate or no instrument detected"), -1); QMessageBox::critical(this, QTranslator::tr("Failed to Initialize the Device"), tr("Failed to initialize device. Call to new_inst failed.")); --- 4464,4468 ---- { qDebug("initIntrument(): failed new_inst()"); ! messageText -> append(tr("Unknown, inappropriate or no instrument detected")); QMessageBox::critical(this, QTranslator::tr("Failed to Initialize the Device"), tr("Failed to initialize device. Call to new_inst failed.")); *************** *** 4477,4483 **** { // qDebug("initIntrument(): failed init_coms()"); ! messageText -> insertParagraph(tr("Failed to initialize communications with instrument or wrong instrument or bad configuration! (") + QString::fromLocal8Bit(it->inst_interp_error(it, rv)) + QString::fromLocal8Bit(" + ") ! + QString::fromLocal8Bit(it->inst_interp_error(it, rv)) + QString::fromLocal8Bit(")"), -1); QMessageBox::critical(this, QTranslator::tr("Failed to Initialize the Device"), tr("Failed to initialize communications with instrument or wrong instrument or bad configuration! (") --- 4477,4483 ---- { // qDebug("initIntrument(): failed init_coms()"); ! messageText -> append(tr("Failed to initialize communications with instrument or wrong instrument or bad configuration! (") + QString::fromLocal8Bit(it->inst_interp_error(it, rv)) + QString::fromLocal8Bit(" + ") ! + QString::fromLocal8Bit(it->inst_interp_error(it, rv)) + QString::fromLocal8Bit(")")); QMessageBox::critical(this, QTranslator::tr("Failed to Initialize the Device"), tr("Failed to initialize communications with instrument or wrong instrument or bad configuration! (") *************** *** 4493,4497 **** { // qDebug ("initIntrument(): failed set_opt_mode"); ! messageText -> insertParagraph(tr("Setting filter configuration not supported by instrument"), -1); QMessageBox::critical(this, QTranslator::tr("Failed to Initialize the Device"), tr("Setting filter configuration not supported by instrument")); --- 4493,4497 ---- { // qDebug ("initIntrument(): failed set_opt_mode"); ! messageText -> append(tr("Setting filter configuration not supported by instrument")); QMessageBox::critical(this, QTranslator::tr("Failed to Initialize the Device"), tr("Setting filter configuration not supported by instrument")); *************** *** 4503,4512 **** { ! messageText -> insertParagraph(tr("init_inst returned ") + QString::fromLocal8Bit(it->inst_interp_error(it, rv)) + QString::fromLocal8Bit("(") + QString::fromLocal8Bit(it->interp_error(it, rv)) + QString::fromLocal8Bit(")") ! + tr(" Instrument initialization failed!"), -1); QMessageBox::critical(this, QTranslator::tr("Problem Initializing Instrument."), --- 4503,4512 ---- { ! messageText -> append(tr("init_inst returned ") + QString::fromLocal8Bit(it->inst_interp_error(it, rv)) + QString::fromLocal8Bit("(") + QString::fromLocal8Bit(it->interp_error(it, rv)) + QString::fromLocal8Bit(")") ! + tr(" Instrument initialization failed!")); QMessageBox::critical(this, QTranslator::tr("Problem Initializing Instrument."), *************** *** 4541,4545 **** if ((cap & inst_trans_spot) == 0) { ! messageText -> insertParagraph (tr("Need transmission spot capability, and instrument doesn't support it"), -1); QMessageBox::critical(this, QTranslator::tr("Problem Initializing Instrument."), tr("Need transmission spot capability, and instrument doesn't support it")); --- 4541,4545 ---- if ((cap & inst_trans_spot) == 0) { ! messageText -> append (tr("Need transmission spot capability, and instrument doesn't support it")); QMessageBox::critical(this, QTranslator::tr("Problem Initializing Instrument."), tr("Need transmission spot capability, and instrument doesn't support it")); *************** *** 4550,4554 **** if ((cap & inst_emis_spot) == 0) { ! messageText -> insertParagraph (tr("Need emissive spot capability and instrument doesn't support it"), -1); QMessageBox::critical(this, QTranslator::tr("Problem Initializing Instrument."), tr("Need emissive spot capability and instrument doesn't support it")); --- 4550,4554 ---- if ((cap & inst_emis_spot) == 0) { ! messageText -> append (tr("Need emissive spot capability and instrument doesn't support it")); QMessageBox::critical(this, QTranslator::tr("Problem Initializing Instrument."), tr("Need emissive spot capability and instrument doesn't support it")); *************** *** 4558,4564 **** if ((rv = it->set_mode(it, inst_mode_emis_disp)) != inst_ok) { ! messageText -> insertParagraph(tr("Failed to set emission display mode. ") + QString::fromLocal8Bit(it->inst_interp_error(it, rv)) + QString::fromLocal8Bit(" ") + ! QString::fromLocal8Bit(it->interp_error(it, rv)), -1); QMessageBox::critical(this, QTranslator::tr("Problem Initializing Instrument."), tr("Failed to set emission display mode. ") + --- 4558,4564 ---- if ((rv = it->set_mode(it, inst_mode_emis_disp)) != inst_ok) { ! messageText -> append(tr("Failed to set emission display mode. ") + QString::fromLocal8Bit(it->inst_interp_error(it, rv)) + QString::fromLocal8Bit(" ") + ! QString::fromLocal8Bit(it->interp_error(it, rv))); QMessageBox::critical(this, QTranslator::tr("Problem Initializing Instrument."), tr("Failed to set emission display mode. ") + *************** *** 4582,4586 **** temp = tr("LCD"); // qDebug ("it initialized OK so configure the instrument mode 5.2"); ! messageText -> insertParagraph(tr("Setting display mode ") + temp + tr(" not supported by this instrument"), -1); // qDebug ("it initialized OK so configure the instrument mode 5.3"); // qDebug ("it initialized OK so configure the instrument mode 5.4"); --- 4582,4586 ---- temp = tr("LCD"); // qDebug ("it initialized OK so configure the instrument mode 5.2"); ! messageText -> append(tr("Setting display mode ") + temp + tr(" not supported by this instrument")); // qDebug ("it initialized OK so configure the instrument mode 5.3"); // qDebug ("it initialized OK so configure the instrument mode 5.4"); *************** *** 4592,4599 **** if (rv != inst_ok) { ! messageText -> insertParagraph(tr("Setting trigger mode failed with error : ") + QString::fromLocal8Bit(it->inst_interp_error(it, rv)) + QString::fromLocal8Bit(" ") ! + QString::fromLocal8Bit(it->interp_error(it, rv)), -1); QMessageBox::critical(this, QTranslator::tr("Problem Initializing Instrument."), --- 4592,4599 ---- if (rv != inst_ok) { ! messageText -> append(tr("Setting trigger mode failed with error : ") + QString::fromLocal8Bit(it->inst_interp_error(it, rv)) + QString::fromLocal8Bit(" ") ! + QString::fromLocal8Bit(it->interp_error(it, rv))); QMessageBox::critical(this, QTranslator::tr("Problem Initializing Instrument."), *************** *** 4684,4688 **** flashLEDsThread flashLEDs; ! processEventsTimer -> start( 100, FALSE); rv = it->read_sample(it, "SPOT", &val); processEventsTimer -> stop(); --- 4684,4689 ---- flashLEDsThread flashLEDs; ! processEventsTimer ->setSingleShot(FALSE); ! processEventsTimer->start(100); rv = it->read_sample(it, "SPOT", &val); processEventsTimer -> stop(); *************** *** 4690,4696 **** if (!rv == inst_ok) { ! messageText -> insertParagraph (tr("read_sample returned '") + QString::fromLocal8Bit(it->inst_interp_error(it, rv)) + QString::fromLocal8Bit("' (") ! + QString::fromLocal8Bit(it->interp_error(it, rv)) + QString::fromLocal8Bit(")"), -1); qDebug((tr("read_sample returned '") + QString::fromLocal8Bit(it->inst_interp_error(it, rv)) + QString::fromLocal8Bit("' (") --- 4691,4697 ---- if (!rv == inst_ok) { ! messageText -> append(tr("read_sample returned '") + QString::fromLocal8Bit(it->inst_interp_error(it, rv)) + QString::fromLocal8Bit("' (") ! + QString::fromLocal8Bit(it->interp_error(it, rv)) + QString::fromLocal8Bit(")")); qDebug((tr("read_sample returned '") + QString::fromLocal8Bit(it->inst_interp_error(it, rv)) + QString::fromLocal8Bit("' (") *************** *** 4699,4703 **** if ((rv & inst_mask) == inst_misread) { ! messageText -> insertParagraph (tr("Spot read failed due to misread"), -1); --- 4700,4704 ---- if ((rv & inst_mask) == inst_misread) { ! messageText -> append(tr("Spot read failed due to misread")); *************** *** 4723,4732 **** // Issue error message /* Communication problem */ ! messageText -> insertParagraph (tr("Read failed due to communication problem."), -1); // if ((rv = it->init_coms(it, comport, br, 15.0)) != inst_ok) { ! // messageText -> insertParagraph (tr("init_coms returned '") // + (QString) it->inst_interp_error(it, rv) ! // + "' (" + (QString) it->interp_error(it, rv) + ")", -1); // } } --- 4724,4733 ---- // Issue error message /* Communication problem */ ! messageText -> append(tr("Read failed due to communication problem.")); // if ((rv = it->init_coms(it, comport, br, 15.0)) != inst_ok) { ! // messageText -> append (tr("init_coms returned '") // + (QString) it->inst_interp_error(it, rv) ! // + "' (" + (QString) it->interp_error(it, rv) + ")"); // } } *************** *** 4735,4743 **** else { ! messageText -> insertParagraph(tr("Got fatal error '") + QString::fromLocal8Bit(it->inst_interp_error(it, rv)) + QString::fromLocal8Bit("' (") + QString::fromLocal8Bit(it->interp_error(it, rv)) ! + QString::fromLocal8Bit(")"), -1); } } --- 4736,4744 ---- else { ! messageText -> append(tr("Got fatal error '") + QString::fromLocal8Bit(it->inst_interp_error(it, rv)) + QString::fromLocal8Bit("' (") + QString::fromLocal8Bit(it->interp_error(it, rv)) ! + QString::fromLocal8Bit(")")); } } *************** *** 4749,4755 **** if (val.sp.spec_n <= 0) { ! // messageText -> insertParagraph(tr("Instrument didn't return spectral data"), -1); if (val.XYZ_v == 0 && val.aXYZ_v == 0) ! messageText -> insertParagraph(tr("Instrument didn't return XYZ value"), -1); if (val.XYZ_v != 0) --- 4750,4756 ---- if (val.sp.spec_n <= 0) { ! // messageText -> append(tr("Instrument didn't return spectral data")); if (val.XYZ_v == 0 && val.aXYZ_v == 0) ! messageText -> append(tr("Instrument didn't return XYZ value")); if (val.XYZ_v != 0) *************** *** 4802,4806 **** QMutex dummy; ! pix.resize(pixmapColor -> width() - 6, pixmapColor -> height() -6); color.setRgb(R, G, B); pix.fill(color); --- 4803,4807 ---- QMutex dummy; ! pix = pix.copy(QRect(0, 0, pixmapColor -> width() - 6, pixmapColor -> height() -6)); color.setRgb(R, G, B); pix.fill(color); *************** *** 5016,5020 **** while (!stop) { ! progressBar -> setProgress(progress++); // patch is RGB = 255 no need to change it // take another reading --- 5017,5021 ---- while (!stop) { ! progressBar -> setValue(progress++); // patch is RGB = 255 no need to change it // take another reading *************** *** 5064,5069 **** { stop = true; ! buttonOk -> setOn(TRUE); ! if (!measuring) { accept(); --- 5065,5071 ---- { stop = true; ! //buttonOk -> setOn(TRUE); //qt3 ! buttonOk -> setChecked(TRUE); ! if (!measuring) { accept(); *************** *** 5138,5151 **** cmsCIEXYZ readXYZ[3], targetXYZ; // black, gray, white ! progressBar -> setTotalSteps(4); ! progressBar -> reset(); paintPatch(0, 0, 0); readXYZ[0] = takeSpotReading(); ! progressBar -> setProgress(1); paintPatch(127, 127, 127); readXYZ[1] = takeSpotReading(); ! progressBar -> setProgress(2); targetXYZ = setWhitePoint(); --- 5140,5153 ---- cmsCIEXYZ readXYZ[3], targetXYZ; // black, gray, white ! progressBar -> setRange(1,4); ! progressBar -> reset(); paintPatch(0, 0, 0); readXYZ[0] = takeSpotReading(); ! progressBar -> setValue(1); paintPatch(127, 127, 127); readXYZ[1] = takeSpotReading(); ! progressBar -> setValue(2); targetXYZ = setWhitePoint(); *************** *** 5153,5157 **** paintPatch(255, 255, 255); readXYZ[2] = takeSpotReading(); ! progressBar -> setProgress(3); /* Normalised XYZ white point */ --- 5155,5159 ---- paintPatch(255, 255, 255); readXYZ[2] = takeSpotReading(); ! progressBar -> setValue(3); /* Normalised XYZ white point */ *************** *** 5173,5177 **** paintPatch(8, 8, 8); readXYZ[0] = takeSpotReading(); ! progressBar -> setProgress(4); QString temp1 = tr("Display gamma = %1\n").arg(gamma, 0, 'f', 2); --- 5175,5179 ---- paintPatch(8, 8, 8); readXYZ[0] = takeSpotReading(); ! progressBar -> setValue(4); QString temp1 = tr("Display gamma = %1\n").arg(gamma, 0, 'f', 2); *************** *** 5196,5200 **** const int level = 5; ! progressBar -> setProgress(progress++); WORD RGB[3]; --- 5198,5202 ---- const int level = 5; ! progressBar -> setValue(progress++); WORD RGB[3]; *************** *** 5247,5251 **** QMessageBox::critical( this, tr("Display Measurement Failed"), tr("The measurement instrument returned an error.")); } //end else ! progressBar -> setProgress(progress++); if (progress > 5) progress = 0; --- 5249,5253 ---- QMessageBox::critical( this, tr("Display Measurement Failed"), tr("The measurement instrument returned an error.")); } //end else ! progressBar -> setValue(progress++); if (progress > 5) progress = 0; *************** *** 5284,5289 **** cmsxIT8SetDataFormat(it8, nFields++, "XYZ_Z"); ! progressBar -> setTotalSteps(number_of_patches); ! progressBar -> reset(); char patchNumber[10]; --- 5286,5291 ---- cmsxIT8SetDataFormat(it8, nFields++, "XYZ_Z"); ! progressBar -> setRange(1,number_of_patches); ! progressBar -> reset(); char patchNumber[10]; *************** *** 5321,5325 **** lprofApp -> processEvents(); } ! progressBar -> setProgress(i + 1); if (stop) { --- 5323,5327 ---- lprofApp -> processEvents(); } ! progressBar -> setValue(i + 1); if (stop) { *************** *** 5355,5359 **** whiteXYZ = takeSpotReading(); targetwhite = whiteXYZ.Y; ! progressBar -> setProgress(progress++); if (targetBrightness > 0.000000001) --- 5357,5361 ---- whiteXYZ = takeSpotReading(); targetwhite = whiteXYZ.Y; ! progressBar -> setValue(progress++); if (targetBrightness > 0.000000001) *************** *** 5372,5376 **** QMessageBox::critical( this, tr("Display Measurement Failed"), tr("The measurement instrument returned an error.")); ! progressBar -> setProgress(progress++); if (progress > 5) progress = 0; --- 5374,5378 ---- QMessageBox::critical( this, tr("Display Measurement Failed"), tr("The measurement instrument returned an error.")); ! progressBar -> setValue(progress++); if (progress > 5) progress = 0; *************** *** 5395,5399 **** while (!stop) { ! progressBar -> setProgress(progress++); measuredXYZ = takeSpotReading(); --- 5397,5401 ---- while (!stop) { ! progressBar -> setValue(progress++); measuredXYZ = takeSpotReading(); *************** *** 5586,5591 **** cmsCIEXYZ gammaXYZ[3], measuredXYZ; // black, gray, white ! progressBar -> setTotalSteps(calibration_set_size); ! progressBar -> reset(); if (dtype == LCD) --- 5588,5593 ---- cmsCIEXYZ gammaXYZ[3], measuredXYZ; // black, gray, white ! progressBar->setRange(1,calibration_set_size); ! progressBar -> reset(); if (dtype == LCD) *************** *** 5682,5686 **** QString mess = tr("Calibration file ") + QString::fromLocal8Bit(calfile) + tr(" has been created."); ! messageText -> insertParagraph(mess, -1); QMessageBox::information( this, tr("Display Calibration File Created"), tr("The calibration process has completed")); --- 5684,5688 ---- QString mess = tr("Calibration file ") + QString::fromLocal8Bit(calfile) + tr(" has been created."); ! messageText -> append(mess); QMessageBox::information( this, tr("Display Calibration File Created"), tr("The calibration process has completed")); *************** *** 5792,5796 **** { QString mess = tr("Measurement file ") + QString::fromLocal8Bit(measfile) + tr(" has been created."); ! messageText -> insertParagraph(mess, -1); QMessageBox::information( this, tr("Display Measurement File Created"), tr("The display measurement process has completed")); } --- 5794,5798 ---- { QString mess = tr("Measurement file ") + QString::fromLocal8Bit(measfile) + tr(" has been created."); ! messageText -> append(mess); QMessageBox::information( this, tr("Display Measurement File Created"), tr("The display measurement process has completed")); } *************** *** 5836,5840 **** WPandDEframe -> hide(); mess = tr("Place meter over measurement area. Press Go to start measurements.\nCalibration report will pop up when measurements are done"); ! messageText -> insertParagraph(mess, -1); break; case opUncalReport: --- 5838,5842 ---- WPandDEframe -> hide(); mess = tr("Place meter over measurement area. Press Go to start measurements.\nCalibration report will pop up when measurements are done"); ! messageText -> append(mess); break; case opUncalReport: *************** *** 5843,5877 **** WPandDEframe -> hide(); mess = tr("Place meter over measurement area. Press Go to start measurements.\nCalibration report will pop up when measurements are done"); ! messageText -> insertParagraph(mess, -1); break; case opSetWhitePoint: frameBWLevel -> hide(); ! progressBar -> setTotalSteps (5); ! progressBar -> setPercentageVisible (false); mess = tr("Place meter over measurement area. Press Go to start measurements.\nAdjust display R,G & B gain to center red, green and blue bars.\nWhen done press the Done button."); ! messageText -> insertParagraph(mess, -1); break; case opSetBlackLevel: frameRGBscales -> hide(); WPandDEframe -> hide(); ! progressBar -> setTotalSteps (5); ! progressBar -> setPercentageVisible (false); mess = tr("Place meter over measurement area. Press Go to start measurements.\nAdjust display CRT brightness control to center the dark gray bar.\nWhen done press the Done button."); ! messageText -> insertParagraph(mess, -1); break; case opSetWhiteLevel: frameRGBscales -> hide(); WPandDEframe -> hide(); ! progressBar -> setTotalSteps (5); ! progressBar -> setPercentageVisible (false); mess = tr("Place meter over measurement area. Press Go to start measurements.\nAdjust display CRT contrast or LDC brightness control to center the dark gray bar.\nWhen done press the Done button."); ! messageText -> insertParagraph(mess, -1); break; case opSetBlackPoint: frameBWLevel -> hide(); ! progressBar -> setTotalSteps (5); ! progressBar -> setPercentageVisible (false); mess = tr("Place meter over measurement area. Press Go to start measurements.\nAdjust display R,G & B gain to center red, green and blue bars.\nWhen done press the Done button."); ! messageText -> insertParagraph(mess, -1); break; case opMeasure: --- 5845,5879 ---- WPandDEframe -> hide(); mess = tr("Place meter over measurement area. Press Go to start measurements.\nCalibration report will pop up when measurements are done"); ! messageText -> append(mess); break; case opSetWhitePoint: frameBWLevel -> hide(); ! progressBar->setRange(1,5); ! progressBar -> setTextVisible (false); mess = tr("Place meter over measurement area. Press Go to start measurements.\nAdjust display R,G & B gain to center red, green and blue bars.\nWhen done press the Done button."); ! messageText -> append(mess); break; case opSetBlackLevel: frameRGBscales -> hide(); WPandDEframe -> hide(); ! progressBar -> setRange(1,5); ! progressBar -> setTextVisible (false); mess = tr("Place meter over measurement area. Press Go to start measurements.\nAdjust display CRT brightness control to center the dark gray bar.\nWhen done press the Done button."); ! messageText -> append(mess); break; case opSetWhiteLevel: frameRGBscales -> hide(); WPandDEframe -> hide(); ! progressBar -> setRange(1,5); ! progressBar -> setTextVisible (false); mess = tr("Place meter over measurement area. Press Go to start measurements.\nAdjust display CRT contrast or LDC brightness control to center the dark gray bar.\nWhen done press the Done button."); ! messageText -> append(mess); break; case opSetBlackPoint: frameBWLevel -> hide(); ! progressBar -> setRange(1,5); ! progressBar -> setTextVisible (false); mess = tr("Place meter over measurement area. Press Go to start measurements.\nAdjust display R,G & B gain to center red, green and blue bars.\nWhen done press the Done button."); ! messageText -> append(mess); break; case opMeasure: *************** *** 5880,5884 **** WPandDEframe -> hide(); mess = tr("Place meter over measurement area. Press Go to start measurement process.\nPress Done to abort measurement process."); ! messageText -> insertParagraph(mess, -1); break; case opCalibrate: --- 5882,5886 ---- WPandDEframe -> hide(); mess = tr("Place meter over measurement area. Press Go to start measurement process.\nPress Done to abort measurement process."); ! messageText -> append(mess); break; case opCalibrate: *************** *** 5887,5891 **** WPandDEframe -> hide(); mess = tr("Place meter over measurement area. Press Go to start measurement process.\nPress Done to abort measurement process."); ! messageText -> insertParagraph(mess, -1); break; case opBigCalReport: --- 5889,5893 ---- WPandDEframe -> hide(); mess = tr("Place meter over measurement area. Press Go to start measurement process.\nPress Done to abort measurement process."); ! messageText -> append(mess); break; case opBigCalReport: *************** *** 5894,5898 **** WPandDEframe -> hide(); mess = tr("Place meter over measurement area. Press Go to start measurements.\nCalibration report will pop up when measurements are done"); ! messageText -> insertParagraph(mess, -1); break; --- 5896,5900 ---- WPandDEframe -> hide(); mess = tr("Place meter over measurement area. Press Go to start measurements.\nCalibration report will pop up when measurements are done"); ! messageText -> append(mess); break; *************** *** 5945,5949 **** MonitorCal::MonitorCal(QWidget *parent) ! : QDialog(parent, "", 0, Qt::WStyle_StaysOnTop | Qt::FramelessWindowHint) { setupUi(this); --- 5947,5951 ---- MonitorCal::MonitorCal(QWidget *parent) ! : QDialog(parent, Qt::WindowStaysOnTopHint | Qt::FramelessWindowHint) { setupUi(this); *************** *** 5958,5964 **** processEventsTimer -> stop(); ! buttonOk -> setToggleButton (TRUE); ! messageText -> setTextFormat( Qt::LogText); for (int i = 0; i < 26; i++) --- 5960,5967 ---- processEventsTimer -> stop(); ! //buttonOk -> setToggleButton (TRUE); //qt3 ! buttonOk -> setCheckable (TRUE); ! //messageText -> setTextFormat( Qt::LogText); for (int i = 0; i < 26; i++) *************** *** 6003,6011 **** cmsCIEXYZ redXYZ[2], greenXYZ[2], blueXYZ[2], locusXYZ[size], targetXYZ, readXYZ; // black, gray, white ! progressBar -> setTotalSteps(size + 8); ! progressBar -> reset(); targetXYZ = setWhitePoint(); ! progressBar -> setProgress(1); for (int i=0; i<size; i++) --- 6006,6014 ---- cmsCIEXYZ redXYZ[2], greenXYZ[2], blueXYZ[2], locusXYZ[size], targetXYZ, readXYZ; // black, gray, white ! progressBar -> setRange(1,size+8); ! progressBar -> reset(); targetXYZ = setWhitePoint(); ! progressBar -> setValue(1); for (int i=0; i<size; i++) *************** *** 6019,6048 **** paintPatch(rgb, rgb, rgb); locusXYZ[i] = takeSpotReading(); ! progressBar -> setProgress(i+2); } paintPatch(127, 0, 0); redXYZ[0] = takeSpotReading(); ! progressBar -> setProgress(size + 2); paintPatch(255, 0, 0); redXYZ[1] = takeSpotReading(); ! progressBar -> setProgress(size + 3); paintPatch(0, 127, 0); greenXYZ[0] = takeSpotReading(); ! progressBar -> setProgress(size + 4); paintPatch(0, 255, 0); greenXYZ[1] = takeSpotReading(); ! progressBar -> setProgress(size + 5); paintPatch(0, 0, 127); blueXYZ[0] = takeSpotReading(); ! progressBar -> setProgress(size + 6); paintPatch(0, 0, 255); blueXYZ[1] = takeSpotReading(); ! progressBar -> setProgress(size + 7); /* Normalised XYZ white point */ --- 6022,6051 ---- paintPatch(rgb, rgb, rgb); locusXYZ[i] = takeSpotReading(); ! progressBar -> setValue(i+2); } paintPatch(127, 0, 0); redXYZ[0] = takeSpotReading(); ! progressBar -> setValue(size + 2); paintPatch(255, 0, 0); redXYZ[1] = takeSpotReading(); ! progressBar -> setValue(size + 3); paintPatch(0, 127, 0); greenXYZ[0] = takeSpotReading(); ! progressBar -> setValue(size + 4); paintPatch(0, 255, 0); greenXYZ[1] = takeSpotReading(); ! progressBar -> setValue(size + 5); paintPatch(0, 0, 127); blueXYZ[0] = takeSpotReading(); ! progressBar -> setValue(size + 6); paintPatch(0, 0, 255); blueXYZ[1] = takeSpotReading(); ! progressBar -> setValue(size + 7); /* Normalised XYZ white point */ *************** *** 6067,6071 **** paintPatch(8, 8, 8); readXYZ = takeSpotReading(); ! progressBar -> setProgress(size + 8); QString temp1 = tr("Display gamma = %1\n").arg(gamma, 0, 'f', 2); --- 6070,6074 ---- paintPatch(8, 8, 8); readXYZ = takeSpotReading(); ! progressBar -> setValue(size + 8); QString temp1 = tr("Display gamma = %1\n").arg(gamma, 0, 'f', 2); Index: monitorcalbase.ui =================================================================== RCS file: /cvsroot/lprof/lprof/src/moncalqt/monitorcalbase.ui,v retrieving revision 1.11 retrieving revision 1.11.2.1 diff -C2 -d -r1.11 -r1.11.2.1 *** monitorcalbase.ui 19 Feb 2008 21:02:50 -0000 1.11 --- monitorcalbase.ui 5 Jul 2009 20:33:17 -0000 1.11.2.1 *************** *** 1,9 **** ! <ui version="4.0" > <class>MonitorCalBase</class> ! <widget class="QDialog" name="MonitorCalBase" > ! <property name="windowModality" > <enum>Qt::ApplicationModal</enum> </property> ! <property name="geometry" > <rect> <x>0</x> --- 1,10 ---- [...2675 lines suppressed...] </customwidget> - <customwidget> - <class>Q3Frame</class> - <extends>QFrame</extends> - <header>Qt3Support/Q3Frame</header> - <container>1</container> - </customwidget> - <customwidget> - <class>Q3TextEdit</class> - <extends>Q3Frame</extends> - <header>q3textedit.h</header> - </customwidget> - <customwidget> - <class>Q3ProgressBar</class> - <extends>QFrame</extends> - <header>Qt3Support/Q3ProgressBar</header> - </customwidget> </customwidgets> <resources/> --- 1387,1390 ---- |
