| Line 182... |
Line 182... |
| 182 |
|
182 |
|
| 183 |
ui->captureRotationDial->setValue(ui->calibrationRotationDial->value());
|
183 |
ui->captureRotationDial->setValue(ui->calibrationRotationDial->value());
|
| 184 |
}
|
184 |
}
|
| 185 |
|
185 |
|
| 186 |
void SMScanner::onReceiveCalibrationSet(SMCalibrationSet calibrationSet){
|
186 |
void SMScanner::onReceiveCalibrationSet(SMCalibrationSet calibrationSet){
|
| - |
|
187 |
|
| - |
|
188 |
int id = ui->calibrationListWidget->count();
|
| - |
|
189 |
calibrationSet.id = id;
|
| - |
|
190 |
|
| 187 |
calibrationData.push_back(calibrationSet);
|
191 |
calibrationData.push_back(calibrationSet);
|
| 188 |
|
192 |
|
| 189 |
// Add identifier to list
|
193 |
// Add identifier to list
|
| 190 |
QListWidgetItem* item = new QListWidgetItem(QString("Calibration Set %1 -- %2 deg").arg(ui->calibrationListWidget->count()).arg(calibrationSet.rotationAngle), ui->calibrationListWidget);
|
194 |
QListWidgetItem* item = new QListWidgetItem(QString("Calibration Set %1 -- %2 deg").arg(id).arg(calibrationSet.rotationAngle), ui->calibrationListWidget);
|
| 191 |
item->setFlags(item->flags() | Qt::ItemIsUserCheckable);
|
195 |
item->setFlags(item->flags() | Qt::ItemIsUserCheckable);
|
| 192 |
item->setCheckState(Qt::Checked);
|
196 |
item->setCheckState(Qt::Checked);
|
| 193 |
ui->calibrationListWidget->addItem(item);
|
197 |
ui->calibrationListWidget->addItem(item);
|
| 194 |
|
198 |
|
| 195 |
// Set enabled checkmark
|
199 |
// Set enabled checkmark
|
| Line 213... |
Line 217... |
| 213 |
|
217 |
|
| 214 |
// Set up calibration thread
|
218 |
// Set up calibration thread
|
| 215 |
calibrationWorker = new SMCalibrationWorker;
|
219 |
calibrationWorker = new SMCalibrationWorker;
|
| 216 |
calibrationWorkerThread = new QThread(this);
|
220 |
calibrationWorkerThread = new QThread(this);
|
| 217 |
calibrationWorkerThread->setObjectName("calibrationWorkerThread");
|
221 |
calibrationWorkerThread->setObjectName("calibrationWorkerThread");
|
| 218 |
calibrationWorker->moveToThread(captureWorkerThread);
|
222 |
calibrationWorker->moveToThread(calibrationWorkerThread);
|
| 219 |
calibrationWorkerThread->start();
|
223 |
calibrationWorkerThread->start();
|
| 220 |
|
224 |
|
| 221 |
// Connections
|
225 |
// Connections
|
| 222 |
connect(calibrationWorker, SIGNAL(newSetProcessed(int)), this, SLOT(onCalibrationSetProcessed(int)));
|
226 |
connect(calibrationWorker, SIGNAL(newSetProcessed(int)), this, SLOT(onCalibrationSetProcessed(int)));
|
| 223 |
connect(calibrationWorker, SIGNAL(newFrameResult(int,int,bool,cv::Mat)), this, SLOT(onCalibrationFrameResult(int,int,bool,cv::Mat)));
|
227 |
connect(calibrationWorker, SIGNAL(newFrameResult(int,int,bool,cv::Mat)), this, SLOT(onCalibrationFrameResult(int,int,bool,cv::Mat)));
|