Loading isis/src/qisis/objs/JigsawSetupDialog/JigsawSetupDialog.cpp +41 −10 Original line number Diff line number Diff line Loading @@ -103,6 +103,46 @@ namespace Isis { // initializations for observation solve settings tab createObservationSolveSettingsTreeView(); // Create default settings for all of the observations BundleObservationSolveSettings defaultObservationSettings; QList<BundleObservationSolveSettings> solveSettingsList; // If we have selected any project items, add them to the default obs solve settings object if (!m_project->directory()->model()->selectedItems().isEmpty()) { foreach (ProjectItem * projItem, m_project->directory()->model()->selectedItems()) { if (projItem->isImage()) { defaultObservationSettings.addObservationNumber(projItem->image()->serialNumber()); } else if (projItem->isImageList()) { for (int i = 0; i < projItem->rowCount(); i++) { ProjectItem * childItem = projItem->child(i); defaultObservationSettings.addObservationNumber(childItem->image()->serialNumber()); } } } } // if we didnt have any images selected in the previous case, or no proj items were selected, // take all images from the project tree if (defaultObservationSettings.observationNumbers().isEmpty()) { ProjectItem *imgRoot = m_project->directory()->model()->findItemData(QVariant("Images"),0); if (imgRoot) { for (int i = 0; i < imgRoot->rowCount(); i++) { ProjectItem * imglistItem = imgRoot->child(i); for (int j = 0; j < imglistItem->rowCount(); j++) { ProjectItem * imgItem = imglistItem->child(j); if (imgItem->isImage()) { defaultObservationSettings.addObservationNumber(imgItem->image()->serialNumber()); } } } } } solveSettingsList.append(defaultObservationSettings); m_bundleSettings->setObservationSolveOptions(solveSettingsList); // Populate the solve option comboboxes const QStringList positionOptions{"NONE", "POSITION", "VELOCITY", "ACCELERATION", "ALL"}; m_ui->positionComboBox->insertItems(0, positionOptions); Loading Loading @@ -1644,15 +1684,6 @@ namespace Isis { } // Generate observation numbers for the images QStringList observationNumbers; // Create default settings for all of the observations BundleObservationSolveSettings defaultObservationSettings; foreach (const QString &observationNumber, observationNumbers) { defaultObservationSettings.addObservationNumber(observationNumber); } // Try to loop through the view here to add the "groups" so they aren't part of the model // Add apply button to the tab view Loading Loading
isis/src/qisis/objs/JigsawSetupDialog/JigsawSetupDialog.cpp +41 −10 Original line number Diff line number Diff line Loading @@ -103,6 +103,46 @@ namespace Isis { // initializations for observation solve settings tab createObservationSolveSettingsTreeView(); // Create default settings for all of the observations BundleObservationSolveSettings defaultObservationSettings; QList<BundleObservationSolveSettings> solveSettingsList; // If we have selected any project items, add them to the default obs solve settings object if (!m_project->directory()->model()->selectedItems().isEmpty()) { foreach (ProjectItem * projItem, m_project->directory()->model()->selectedItems()) { if (projItem->isImage()) { defaultObservationSettings.addObservationNumber(projItem->image()->serialNumber()); } else if (projItem->isImageList()) { for (int i = 0; i < projItem->rowCount(); i++) { ProjectItem * childItem = projItem->child(i); defaultObservationSettings.addObservationNumber(childItem->image()->serialNumber()); } } } } // if we didnt have any images selected in the previous case, or no proj items were selected, // take all images from the project tree if (defaultObservationSettings.observationNumbers().isEmpty()) { ProjectItem *imgRoot = m_project->directory()->model()->findItemData(QVariant("Images"),0); if (imgRoot) { for (int i = 0; i < imgRoot->rowCount(); i++) { ProjectItem * imglistItem = imgRoot->child(i); for (int j = 0; j < imglistItem->rowCount(); j++) { ProjectItem * imgItem = imglistItem->child(j); if (imgItem->isImage()) { defaultObservationSettings.addObservationNumber(imgItem->image()->serialNumber()); } } } } } solveSettingsList.append(defaultObservationSettings); m_bundleSettings->setObservationSolveOptions(solveSettingsList); // Populate the solve option comboboxes const QStringList positionOptions{"NONE", "POSITION", "VELOCITY", "ACCELERATION", "ALL"}; m_ui->positionComboBox->insertItems(0, positionOptions); Loading Loading @@ -1644,15 +1684,6 @@ namespace Isis { } // Generate observation numbers for the images QStringList observationNumbers; // Create default settings for all of the observations BundleObservationSolveSettings defaultObservationSettings; foreach (const QString &observationNumber, observationNumbers) { defaultObservationSettings.addObservationNumber(observationNumber); } // Try to loop through the view here to add the "groups" so they aren't part of the model // Add apply button to the tab view Loading