Unverified Commit b02ad983 authored by Lauren Adoram-Kershner's avatar Lauren Adoram-Kershner Committed by GitHub
Browse files

Updates for 3.10.1 (#3730) 



* Fixes ddd2isis to support updated uvflat files (#3719)

* Fixes ddd2isis to support updated uvflat files

* Added history comment

* Fix for QMOS not updating lat/lon ranges correctly.  (#3714)

* qqqqqqmoooooosssssss

* added doc string

* Prep for 3.10.1

Co-authored-by: default avataracpaquette <acp263@nau.edu>
Co-authored-by: default avatarKelvin Rodriguez <kr788@nau.edu>
parent 2c9fbf18

isis/CMakeLists.txt

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ set(PACKAGE "ISIS") 
set(PACKAGE_NAME       "USGS ISIS")



# Version number

set(VERSION            "3.10.0")

set(VERSION            "3.10.1")

set(PACKAGE_VERSION    ${VERSION})



# Full name and version number

isis/src/base/apps/ddd2isis/ddd2isis.xml

+4 −0
Original line number Diff line number Diff line
@@ -41,6 +41,10 @@ 
      bands. Removed the internal default of the output parameter set to None so

      that an output file is now requried. Fixes #703.

    </change>

    <change name="Adam Paquette" date="2020-02-28">

      Updated the dataTypes QMap with a new mapping (32, 4) to handle ingesting

      the updated uvflat files from malin. Fixes #3715.

    </change>

  </history>



  <category>

isis/src/base/apps/ddd2isis/main.cpp

+7 −0
Original line number Diff line number Diff line
@@ -100,6 +100,7 @@ void IsisMain() { 
  dataTypes.insert(1450903360, 8);

  dataTypes.insert(8, 1);

  dataTypes.insert(16, 2);

  dataTypes.insert(32, 4);

  dataTypes.insert(48, 2);



  // Read bytes 16-19 to get the bit type
@@ -130,6 +131,12 @@ void IsisMain() { 
     nOffset = 1024;

  }



  if (dataTypeBytes == 0) {

    string msg = "The value totalBandBits [" + to_string(totalBandBits) + "] does not map " +

                  "to any byte size in the dataTypes table.";

    throw IException(IException::Programmer, msg, _FILEINFO_);

  }



  fin.close();



  PvlGroup results("FileInfo");

isis/src/base/apps/ddd2isis/tsts/badBandBit/Makefile

0 → 100644
+24 −0
Original line number Diff line number Diff line 
APPNAME = ddd2isis



include $(ISISROOT)/make/isismake.tsts



commands:

	# TEST: Throws an error when trying to open the file

	if [ `$(APPNAME) \

                FROM=$(INPUT)/bad_flat.ddd \

                TO=$(OUTPUT)/bad_flat.cub \

                2> $(OUTPUT)/temp.txt > /dev/null` ]; \

                then true; \

                fi;

	

	# TEST: Throws an error when trying to read from a cub instead of ddd

	if [ `$(APPNAME) \

                FROM=$(INPUT)/bad_flat.cub \

                TO=$(OUTPUT)/bad_flat.cub \

                2>> $(OUTPUT)/temp.txt > /dev/null` ]; \

                then true; \

                fi;



        # Removes input file path up until input

	$(SED) 's+\[.*/input+[input+' $(OUTPUT)/temp.txt > $(OUTPUT)/errorTruth.txt;

	$(RM) $(OUTPUT)/temp.txt

isis/src/qisis/objs/MosaicSceneWidget/GridGraphicsItem.cpp

+8 −6
Original line number Diff line number Diff line
@@ -53,7 +53,6 @@ namespace Isis { 
        lonMin = lonMax;

        lonMax = temp;

      }

      

      if (mappingGroup["LatitudeType"][0] == "Planetographic") {



          Distance equaRad(tproj->EquatorialRadius(), Distance::Meters);
@@ -116,6 +115,7 @@ namespace Isis { 
          maxLat = Latitude(latMax.degrees(), mappingGroup,

                          Angle::Degrees);

          



          // Make sure our lat increment is non-zero

          if (!qFuzzyCompare(latInc.radians(), 0.0)) {

            startLat = Latitude(
@@ -300,8 +300,10 @@ namespace Isis { 
              // Set ground according to lon direction to get correct X,Y values 

              // when drawing lines.  

              bool valid;

              

              if (tproj->IsPositiveWest()) {

                valid = tproj->SetGround(lat.degrees(), lon.positiveWest(Angle::Degrees));

                  double glon = tproj->Has180Domain() ? -1*lon.positiveEast(Angle::Degrees): lon.positiveWest(Angle::Degrees);

                  valid = tproj->SetGround(lat.degrees(), glon);

              }

              else {

                valid = tproj->SetGround(lat.degrees(), lon.positiveEast(Angle::Degrees));