Unverified Commit b8f2b813 authored by Amy Stamile's avatar Amy Stamile Committed by GitHub
Browse files

Reverted alphabetization from PR #4595 (#4598) 

* Reverted alphabetization from PR #4595.

* Updated changelog.
parent 96f19702

CHANGELOG.md

+3 −1
Original line number Diff line number Diff line
@@ -35,13 +35,15 @@ release. 


## [Unreleased]



### Added

- Added the ability to search filenames in measure's drop down boxes in Qnet Point Editor. [#4581](https://github.com/USGS-Astrogeology/ISIS3/issues/4581)



## [6.0.0] - 2021-08-27



### Added

- Added a new application, isisimport. The application is designed to be a replacement for many of the mission/instrument specific import applications. It does not contain the templates for those applications at this time. It uses a templateing engine instead of the translation files.

- Added a new dark current correction to hical that works with the higher temperatures recent images are captured at. Use the new config file, $ISISDATA/mro/calibration/hical.0023_darkrate.conf, to enable the new dark current correction over the old dark current correction. Runs of hical without the new dark current correction will also produce an extra line in the output log indicating that the ZeroDarkRate module is disabled. [#4324](https://github.com/USGS-Astrogeology/ISIS3/issues/4324)

- Added the ability to bundle adjust CSM models in jigsaw. Use the new CSMSOLVESET, CSMSOLVETYPE, and CSMSOLVELIST arguments to specify what you solve for. [#4537](https://github.com/USGS-Astrogeology/ISIS3/pull/4537)

- Added the ability to search filenames in measure's drop down boxes in Qnet Point Editor. [#4581](https://github.com/USGS-Astrogeology/ISIS3/issues/4581)



### Changed

- Added the ability to export footprint information from a CaSSIS ISIS Cube label to the generated output PDS4 label in tgocassisrdrgen. [#4473](https://github.com/USGS-Astrogeology/ISIS3/issues/4473)

isis/src/qisis/objs/QnetTools/QnetTool.cpp

+0 −15
Original line number Diff line number Diff line
@@ -2310,21 +2310,6 @@ namespace Isis { 
          m_rightCombo->setItemData(i,QFont("DejaVu Sans", 12, QFont::Bold), Qt::FontRole);

      }

    }

    // sort left and right combo boxes alphabetically

    QSortFilterProxyModel* leftProxy = new QSortFilterProxyModel(m_leftCombo);

    QSortFilterProxyModel* rightProxy = new QSortFilterProxyModel(m_rightCombo);



    leftProxy->setSourceModel(m_leftCombo->model());

    rightProxy->setSourceModel(m_rightCombo->model());



    m_leftCombo->model()->setParent(leftProxy);

    m_rightCombo->model()->setParent(rightProxy);



    m_leftCombo->setModel(leftProxy);

    m_rightCombo->setModel(rightProxy);



    m_leftCombo->model()->sort(0);

    m_rightCombo->model()->sort(0);





    //  TODO:  WHAT HAPPENS IF THERE IS ONLY ONE MEASURE IN THIS CONTROLPOINT??

isis/src/qisis/objs/QnetTools/QnetTool.h

+2 −2
Original line number Diff line number Diff line
@@ -254,7 +254,7 @@ namespace Isis { 
   *                           both no longer needed and no longer available. Fixes #5457.

   *   @history 2021-08-12 Amy Stamile - Added the ability to search filenames in measure's drop

                               down boxes by setting m_leftCombo and m_rightCombo to be editable.

                               Added alphabetization to these combo boxes. Fixes #4581.

                               Fixes #4581.

   */

  class QnetTool : public Tool {

    Q_OBJECT