Subversion Repositories seema-scanner

Rev

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

Rev 207 Rev 225
Line 101... Line 101...
101 
    // Pattern mode
 101 
    // Pattern mode
102 
    QString patternMode = ui->algorithmComboBox->itemData(ui->algorithmComboBox->currentIndex()).toString();
 102 
    QString patternMode = ui->algorithmComboBox->itemData(ui->algorithmComboBox->currentIndex()).toString();
103 
    settings.setValue("algorithm", patternMode);
 103 
    settings.setValue("algorithm", patternMode);
104 
 
 104 
 
105 
    // Projector
 105 
    // Projector
- 
 
 106 
    if(ui->projectorComboBox->currentIndex() >= 0){
106 
    int proj = ui->projectorComboBox->itemData(ui->projectorComboBox->currentIndex()).toInt();
 107 
        int proj = ui->projectorComboBox->itemData(ui->projectorComboBox->currentIndex()).toInt();
107 
    settings.setValue("projector/screenNumber", proj);
 108 
        settings.setValue("projector/screenNumber", proj);
- 
 
 109 
        vector<ScreenInfo> screenList = OpenGLContext::GetScreenInfo();
- 
 
 110 
        settings.setValue("projector/resX", screenList[proj].resX);
- 
 
 111 
        settings.setValue("projector/resY", screenList[proj].resY);
- 
 
 112 
    }
108 
    bool diamondPattern = ui->diamondPatternCheckBox->isChecked();
 113 
    bool diamondPattern = ui->diamondPatternCheckBox->isChecked();
109 
    settings.setValue("projector/diamondPattern", diamondPattern);
 114 
    settings.setValue("projector/diamondPattern", diamondPattern);
110 
    vector<ScreenInfo> screenList = OpenGLContext::GetScreenInfo();
 - 
 
111 
    settings.setValue("projector/resX", screenList[proj].resX);
 - 
 
112 
    settings.setValue("projector/resY", screenList[proj].resY);
 - 
 
113 
    //bool verticalBaseline = ui->verticalBaselineCheckbox->isChecked();
 115 
    //bool verticalBaseline = ui->verticalBaselineCheckbox->isChecked();
114 
    //settings.setValue("projector/verticalBaseline", verticalBaseline);
 116 
    //settings.setValue("projector/verticalBaseline", verticalBaseline);
115 
 
 117 
 
116 
    // Cameras
 118 
    // Cameras
- 
 
 119 
    if(ui->camera0ComboBox->currentIndex() >=0){
117 
    QPoint cam0 = ui->camera0ComboBox->itemData(ui->camera0ComboBox->currentIndex()).toPoint();
 120 
        QPoint cam0 = ui->camera0ComboBox->itemData(ui->camera0ComboBox->currentIndex()).toPoint();
118 
    settings.setValue("camera0/interfaceNumber", cam0.x());
 121 
        settings.setValue("camera0/interfaceNumber", cam0.x());
119 
    settings.setValue("camera0/cameraNumber", cam0.y());
 122 
        settings.setValue("camera0/cameraNumber", cam0.y());
120 
 
 123 
    }
- 
 
 124 
    if(ui->camera1ComboBox->currentIndex() >=0){
121 
    QPoint cam1 = ui->camera1ComboBox->itemData(ui->camera1ComboBox->currentIndex()).toPoint();
 125 
        QPoint cam1 = ui->camera1ComboBox->itemData(ui->camera1ComboBox->currentIndex()).toPoint();
122 
    settings.setValue("camera1/interfaceNumber", cam1.x());
 126 
        settings.setValue("camera1/interfaceNumber", cam1.x());
123 
    // TODO make sure this is not the same as cam0.y()
 - 
 
124 
    settings.setValue("camera1/cameraNumber", (cam0.x()==cam1.x() && cam0.y()==cam1.y())?-1:cam1.y());
 127 
        settings.setValue("camera1/cameraNumber", cam1.y());
- 
 
 128 
    }
125 
 
 129 
 
126 
    float shutter = ui->shutterDoubleSpinBox->value();
 130 
    float shutter = ui->shutterDoubleSpinBox->value();
127 
    settings.setValue("camera/shutter", shutter);
 131 
    settings.setValue("camera/shutter", shutter);
128 
 
 132 
 
129 
    // Trigger mode
 133 
    // Trigger mode