| Line 29... |
Line 29... |
| 29 |
// Query cameras
|
29 |
// Query cameras
|
| 30 |
vector< vector<CameraInfo> > interfaceCameraList = Camera::GetInterfaceCameraList();
|
30 |
vector< vector<CameraInfo> > interfaceCameraList = Camera::GetInterfaceCameraList();
|
| 31 |
for(unsigned int i=0; i<interfaceCameraList.size(); i++){
|
31 |
for(unsigned int i=0; i<interfaceCameraList.size(); i++){
|
| 32 |
vector<CameraInfo> cameraList = interfaceCameraList[i];
|
32 |
vector<CameraInfo> cameraList = interfaceCameraList[i];
|
| 33 |
for(unsigned int j=0; j<cameraList.size(); j++){
|
33 |
for(unsigned int j=0; j<cameraList.size(); j++){
|
| 34 |
QString cameraString = QString("%1: %2").arg(cameraList[j].vendor.c_str()).arg(cameraList[j].model.c_str());
|
34 |
QString cameraString = QString("%1: %2 # %3").arg(cameraList[j].vendor.c_str()).arg(cameraList[j].model.c_str()).arg(cameraList[j].serialNumber);
|
| 35 |
ui->camera0ComboBox->addItem(cameraString, QPoint(i, j));
|
35 |
ui->camera0ComboBox->addItem(cameraString, QPoint(i, j));
|
| 36 |
ui->camera1ComboBox->addItem(cameraString, QPoint(i, j));
|
36 |
ui->camera1ComboBox->addItem(cameraString, QPoint(i, j));
|
| 37 |
}
|
37 |
}
|
| 38 |
}
|
38 |
}
|
| 39 |
|
39 |
|
| Line 62... |
Line 62... |
| 62 |
ui->camera1ComboBox->setCurrentIndex(camera1Index);
|
62 |
ui->camera1ComboBox->setCurrentIndex(camera1Index);
|
| 63 |
|
63 |
|
| 64 |
float shutter = settings.value("camera/shutter", 16.666).toFloat();
|
64 |
float shutter = settings.value("camera/shutter", 16.666).toFloat();
|
| 65 |
ui->shutterDoubleSpinBox->setValue(shutter);
|
65 |
ui->shutterDoubleSpinBox->setValue(shutter);
|
| 66 |
|
66 |
|
| 67 |
QString triggerMode = settings.value("trigger/mode","hardware").toString();
|
67 |
QString triggerMode = settings.value("trigger/mode","software").toString();
|
| 68 |
if(triggerMode == "hardware"){
|
68 |
if(triggerMode == "hardware"){
|
| 69 |
ui->triggerHardwareRadioButton->setChecked(true);
|
69 |
ui->triggerHardwareRadioButton->setChecked(true);
|
| 70 |
on_triggerHardwareRadioButton_clicked();
|
70 |
on_triggerHardwareRadioButton_clicked();
|
| 71 |
} else {
|
71 |
} else {
|
| 72 |
ui->triggerSoftwareRadioButton->setChecked(true);
|
72 |
ui->triggerSoftwareRadioButton->setChecked(true);
|