Subversion Repositories seema-scanner

Rev

Rev 225 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 225 Rev 244
Line 62... Line 62...
62
 
62
 
63
    QPoint camera1InterfaceSetting = QPoint(settings.value("camera1/interfaceNumber",-1).toInt(), settings.value("camera1/cameraNumber",-1).toInt());
63
    QPoint camera1InterfaceSetting = QPoint(settings.value("camera1/interfaceNumber",-1).toInt(), settings.value("camera1/cameraNumber",-1).toInt());
64
    unsigned int camera1Index = ui->camera1ComboBox->findData(camera1InterfaceSetting);
64
    unsigned int camera1Index = ui->camera1ComboBox->findData(camera1InterfaceSetting);
65
    ui->camera1ComboBox->setCurrentIndex(camera1Index);
65
    ui->camera1ComboBox->setCurrentIndex(camera1Index);
66
 
66
 
67
    float shutter = settings.value("camera/shutter", 16.666).toFloat();
67
    double shutter = settings.value("camera/shutter", 50.0/3.0).toDouble();
-
 
68
    ui->shutterTimeLabel->setText(QString::number(shutter));
68
    ui->shutterDoubleSpinBox->setValue(shutter);
69
    ui->shutterSpinBox->setValue(shutter/(50.0/3.0));
69
 
70
 
70
    // Trigger mode
71
    // Trigger mode
71
    QString triggerMode = settings.value("trigger/mode","software").toString();
72
    QString triggerMode = settings.value("trigger/mode","software").toString();
72
    if(triggerMode == "hardware"){
73
    if(triggerMode == "hardware"){
73
        ui->triggerHardwareRadioButton->setChecked(true);
74
        ui->triggerHardwareRadioButton->setChecked(true);
Line 125... Line 126...
125
        QPoint cam1 = ui->camera1ComboBox->itemData(ui->camera1ComboBox->currentIndex()).toPoint();
126
        QPoint cam1 = ui->camera1ComboBox->itemData(ui->camera1ComboBox->currentIndex()).toPoint();
126
        settings.setValue("camera1/interfaceNumber", cam1.x());
127
        settings.setValue("camera1/interfaceNumber", cam1.x());
127
        settings.setValue("camera1/cameraNumber", cam1.y());
128
        settings.setValue("camera1/cameraNumber", cam1.y());
128
    }
129
    }
129
 
130
 
130
    float shutter = ui->shutterDoubleSpinBox->value();
131
    double shutter = ui->shutterSpinBox->value() * 50.0/3.0;
131
    settings.setValue("camera/shutter", shutter);
132
    settings.setValue("camera/shutter", shutter);
132
 
133
 
133
    // Trigger mode
134
    // Trigger mode
134
    if(ui->triggerHardwareRadioButton->isChecked())
135
    if(ui->triggerHardwareRadioButton->isChecked())
135
        settings.setValue("trigger/mode", "hardware");
136
        settings.setValue("trigger/mode", "hardware");
Line 167... Line 168...
167
    ui->shiftSpinBox->setEnabled(false);
168
    ui->shiftSpinBox->setEnabled(false);
168
    ui->delayLabel->setEnabled(true);
169
    ui->delayLabel->setEnabled(true);
169
    ui->delaySpinBox->setEnabled(true);
170
    ui->delaySpinBox->setEnabled(true);
170
    ui->delayMsLabel->setEnabled(true);
171
    ui->delayMsLabel->setEnabled(true);
171
}
172
}
-
 
173
 
-
 
174
void SMPreferenceDialog::on_shutterSpinBox_valueChanged(int arg1)
-
 
175
{
-
 
176
    ui->shutterTimeLabel->setText(QString::number(50.0/3.0 * arg1));
-
 
177
}