Commit 950f19d7 authored by chrisryancombs's avatar chrisryancombs
Browse files

Merge branch 'ipceBundleWindow_tabs' of... 

Merge branch 'ipceBundleWindow_tabs' of https://github.com/chrisryancombs/ISIS3 into ipceBundleWindow_run
parents 68a84482 7baa380e

isis/src/control/objs/BundleSettings/BundleSettings.cpp

+3 −3
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ namespace Isis { 
    m_createInverseMatrix  = false;



    m_outlierRejection     = false;

    m_outlierRejectionMultiplier = 1.0;

    m_outlierRejectionMultiplier = 3.0;



    // Parameter Uncertainties (Weighting)

    m_globalLatitudeAprioriSigma  = Isis::Null;
@@ -271,7 +271,7 @@ namespace Isis { 
      m_outlierRejectionMultiplier = multiplier;

    }

    else {

      m_outlierRejectionMultiplier = 1.0;

      m_outlierRejectionMultiplier = 3.0;

    }

  }
@@ -1154,7 +1154,7 @@ namespace Isis { 
                = toDouble(outlierRejectionMultiplierStr);

          }

          else {

            m_xmlHandlerBundleSettings->m_outlierRejectionMultiplier = 1.0;

            m_xmlHandlerBundleSettings->m_outlierRejectionMultiplier = 3.0;

          }

        }

      }

isis/src/qisis/objs/JigsawSetupDialog/JigsawSetupDialog.cpp

+1 −0
Original line number Diff line number Diff line
@@ -373,6 +373,7 @@ namespace Isis { 
    m_ui->outlierRejectionMultiplierLineEdit->setEnabled(arg1);



    // sigma and maxlikelihood options are exclusive

    m_ui->CQuantileLabel->setEnabled(!arg1);

    m_ui->maxLikelihoodEstimationLabel->setEnabled(!arg1);

    m_ui->maximumLikelihoodModel1ComboBox->setEnabled(!arg1);

    m_ui->maximumLikelihoodModel1Label->setEnabled(!arg1);

isis/src/qisis/objs/JigsawSetupDialog/JigsawSetupDialog.ui

+104 −91
Original line number Diff line number Diff line
@@ -330,69 +330,98 @@ Must be positive.</string> 
                  <bool>false</bool>

                 </property>

                 <layout class="QGridLayout" name="gridLayout_14">

                  <item row="7" column="0" alignment="Qt::AlignRight">

                   <widget class="QLabel" name="maximumLikelihoodModel3Label">

                  <item row="6" column="1" colspan="2">

                   <widget class="QComboBox" name="maximumLikelihoodModel1ComboBox">

                    <property name="sizePolicy">

                     <sizepolicy hsizetype="Expanding" vsizetype="Fixed">

                      <horstretch>0</horstretch>

                      <verstretch>0</verstretch>

                     </sizepolicy>

                    </property>

                    <item>

                     <property name="text">

                      <string>NONE</string>

                     </property>

                    </item>

                    <item>

                     <property name="text">

                      <string>HUBER</string>

                     </property>

                    </item>

                    <item>

                     <property name="text">

                      <string>HUBER MODIFIED</string>

                     </property>

                    </item>

                   </widget>

                  </item>

                  <item row="8" column="3">

                   <widget class="QLineEdit" name="maximumLikelihoodModel3QuantileLineEdit">

                    <property name="enabled">

                     <bool>false</bool>

                    </property>

                    <property name="sizePolicy">

                     <sizepolicy hsizetype="Minimum" vsizetype="Fixed">

                     <sizepolicy hsizetype="Expanding" vsizetype="Fixed">

                      <horstretch>0</horstretch>

                      <verstretch>0</verstretch>

                     </sizepolicy>

                    </property>

                    <property name="minimumSize">

                     <size>

                      <width>0</width>

                      <height>0</height>

                     </size>

                    </property>

                    <property name="maximumSize">

                     <size>

                      <width>100</width>

                      <height>16777215</height>

                     </size>

                    </property>

                    <property name="acceptDrops">

                     <bool>false</bool>

                    </property>

                    <property name="toolTip">

                     <string>Valid Range: 1.0e-10 to 1.0</string>

                    </property>

                    <property name="text">

                     <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;Model 3&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>

                    </property>

                    <property name="buddy">

                     <cstring>maximumLikelihoodModel3ComboBox</cstring>

                     <string>0.5</string>

                    </property>

                   </widget>

                  </item>

                  <item row="5" column="1" colspan="2">

                   <widget class="QComboBox" name="maximumLikelihoodModel1ComboBox">

                  <item row="7" column="3">

                   <widget class="QLineEdit" name="maximumLikelihoodModel2QuantileLineEdit">

                    <property name="enabled">

                     <bool>false</bool>

                    </property>

                    <property name="sizePolicy">

                     <sizepolicy hsizetype="Expanding" vsizetype="Fixed">

                      <horstretch>0</horstretch>

                      <verstretch>0</verstretch>

                     </sizepolicy>

                    </property>

                    <item>

                     <property name="text">

                      <string>NONE</string>

                    <property name="maximumSize">

                     <size>

                      <width>100</width>

                      <height>16777215</height>

                     </size>

                    </property>

                    </item>

                    <item>

                    <property name="text">

                      <string>HUBER</string>

                     <string>0.5</string>

                    </property>

                   </widget>

                  </item>

                    <item>

                  <item row="6" column="3">

                   <widget class="QLineEdit" name="maximumLikelihoodModel1QuantileLineEdit">

                    <property name="enabled">

                     <bool>false</bool>

                    </property>

                    <property name="sizePolicy">

                     <sizepolicy hsizetype="Preferred" vsizetype="Fixed">

                      <horstretch>0</horstretch>

                      <verstretch>0</verstretch>

                     </sizepolicy>

                    </property>

                    <property name="maximumSize">

                     <size>

                      <width>100</width>

                      <height>16777215</height>

                     </size>

                    </property>

                    <property name="text">

                      <string>HUBER MODIFIED</string>

                     <string>0.5</string>

                    </property>

                    </item>

                   </widget>

                  </item>

                  <item row="6" column="1" colspan="2">

                  <item row="7" column="1" colspan="2">

                   <widget class="QComboBox" name="maximumLikelihoodModel2ComboBox">

                    <property name="enabled">

                     <bool>false</bool>
@@ -430,25 +459,11 @@ Must be positive.</string> 
                    </item>

                   </widget>

                  </item>

                  <item row="4" column="0" colspan="4">

                   <widget class="QLabel" name="maxLikelihoodEstimationLabel">

                    <property name="sizePolicy">

                     <sizepolicy hsizetype="Expanding" vsizetype="Fixed">

                      <horstretch>0</horstretch>

                      <verstretch>0</verstretch>

                     </sizepolicy>

                    </property>

                    <property name="toolTip">

                     <string>Maximum Likelihood Estimation and Sigma Multiplier are exclusive options. 

Set Model 1 to &quot;NONE&quot; before checking Sigma Multiplier.</string>

                    </property>

                    <property name="text">

                     <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;Maximum Likelihood Estimation&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>

                  <item row="7" column="0" alignment="Qt::AlignRight">

                   <widget class="QLabel" name="maximumLikelihoodModel2Label">

                    <property name="enabled">

                     <bool>false</bool>

                    </property>

                   </widget>

                  </item>

                  <item row="5" column="0" alignment="Qt::AlignRight">

                   <widget class="QLabel" name="maximumLikelihoodModel1Label">

                    <property name="sizePolicy">

                     <sizepolicy hsizetype="Minimum" vsizetype="Fixed">

                      <horstretch>0</horstretch>
@@ -471,14 +486,14 @@ Set Model 1 to &quot;NONE&quot; before checking Sigma Multiplier.</string> 
                     <string>Valid Range: 1.0e-10 to 1.0</string>

                    </property>

                    <property name="text">

                     <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;Model 1&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>

                     <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;Model 2&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>

                    </property>

                    <property name="buddy">

                     <cstring>maximumLikelihoodModel1ComboBox</cstring>

                     <cstring>maximumLikelihoodModel2ComboBox</cstring>

                    </property>

                   </widget>

                  </item>

                  <item row="7" column="1" colspan="2">

                  <item row="8" column="1" colspan="2">

                   <widget class="QComboBox" name="maximumLikelihoodModel3ComboBox">

                    <property name="enabled">

                     <bool>false</bool>
@@ -516,30 +531,39 @@ Set Model 1 to &quot;NONE&quot; before checking Sigma Multiplier.</string> 
                    </item>

                   </widget>

                  </item>

                  <item row="5" column="3">

                   <widget class="QLineEdit" name="maximumLikelihoodModel1QuantileLineEdit">

                    <property name="enabled">

                     <bool>false</bool>

                    </property>

                  <item row="6" column="0" alignment="Qt::AlignRight">

                   <widget class="QLabel" name="maximumLikelihoodModel1Label">

                    <property name="sizePolicy">

                     <sizepolicy hsizetype="Preferred" vsizetype="Fixed">

                     <sizepolicy hsizetype="Minimum" vsizetype="Fixed">

                      <horstretch>0</horstretch>

                      <verstretch>0</verstretch>

                     </sizepolicy>

                    </property>

                    <property name="minimumSize">

                     <size>

                      <width>0</width>

                      <height>0</height>

                     </size>

                    </property>

                    <property name="maximumSize">

                     <size>

                      <width>100</width>

                      <height>16777215</height>

                     </size>

                    </property>

                    <property name="toolTip">

                     <string>Valid Range: 1.0e-10 to 1.0</string>

                    </property>

                    <property name="text">

                     <string>0.5</string>

                     <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;Model 1&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>

                    </property>

                    <property name="buddy">

                     <cstring>maximumLikelihoodModel1ComboBox</cstring>

                    </property>

                   </widget>

                  </item>

                  <item row="6" column="0" alignment="Qt::AlignRight">

                   <widget class="QLabel" name="maximumLikelihoodModel2Label">

                  <item row="8" column="0" alignment="Qt::AlignRight">

                   <widget class="QLabel" name="maximumLikelihoodModel3Label">

                    <property name="enabled">

                     <bool>false</bool>

                    </property>
@@ -561,58 +585,47 @@ Set Model 1 to &quot;NONE&quot; before checking Sigma Multiplier.</string> 
                      <height>16777215</height>

                     </size>

                    </property>

                    <property name="acceptDrops">

                     <bool>false</bool>

                    </property>

                    <property name="toolTip">

                     <string>Valid Range: 1.0e-10 to 1.0</string>

                    </property>

                    <property name="text">

                     <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;Model 2&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>

                     <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;Model 3&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>

                    </property>

                    <property name="buddy">

                     <cstring>maximumLikelihoodModel2ComboBox</cstring>

                     <cstring>maximumLikelihoodModel3ComboBox</cstring>

                    </property>

                   </widget>

                  </item>

                  <item row="7" column="3">

                   <widget class="QLineEdit" name="maximumLikelihoodModel3QuantileLineEdit">

                    <property name="enabled">

                     <bool>false</bool>

                    </property>

                  <item row="4" column="0" colspan="4">

                   <widget class="QLabel" name="maxLikelihoodEstimationLabel">

                    <property name="sizePolicy">

                     <sizepolicy hsizetype="Expanding" vsizetype="Fixed">

                      <horstretch>0</horstretch>

                      <verstretch>0</verstretch>

                     </sizepolicy>

                    </property>

                    <property name="maximumSize">

                     <size>

                      <width>100</width>

                      <height>16777215</height>

                     </size>

                    <property name="toolTip">

                     <string>Maximum Likelihood Estimation and Sigma Multiplier are exclusive options. 

Set Model 1 to &quot;NONE&quot; before checking Sigma Multiplier.</string>

                    </property>

                    <property name="text">

                     <string>0.5</string>

                     <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;Maximum Likelihood Estimation&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>

                    </property>

                   </widget>

                  </item>

                  <item row="6" column="3">

                   <widget class="QLineEdit" name="maximumLikelihoodModel2QuantileLineEdit">

                    <property name="enabled">

                     <bool>false</bool>

                    </property>

                  <item row="5" column="3" alignment="Qt::AlignHCenter">

                   <widget class="QLabel" name="CQuantileLabel">

                    <property name="sizePolicy">

                     <sizepolicy hsizetype="Expanding" vsizetype="Fixed">

                     <sizepolicy hsizetype="Preferred" vsizetype="Fixed">

                      <horstretch>0</horstretch>

                      <verstretch>0</verstretch>

                     </sizepolicy>

                    </property>

                    <property name="maximumSize">

                     <size>

                      <width>100</width>

                      <height>16777215</height>

                     </size>

                    </property>

                    <property name="text">

                     <string>0.5</string>

                     <string>C Quantile</string>

                    </property>

                   </widget>

                  </item>