Unverified Commit 88a6e5c4 authored by Jacob Cain's avatar Jacob Cain Committed by GitHub
Browse files

Changed some types to be cube instead of filename (#5087) 



* changed types to cube

* Added name to zendoro

* Added ORCiD to zendoro

* added changes to changelog

* GetCubeName in spiceserver.cpp

* changed line in sumspice

* Changed filenames to cubs

Co-authored-by: default avatarAustin Sanders <arsanders@usgs.gov>
parent bfb43ee8

.zenodo.json

+7 −2
Original line number Original line Diff line number Diff line
@@ -84,6 +84,11 @@ 
    {

    {

      "name": "Brownsberger, Sasha"

      "name": "Brownsberger, Sasha"

    },

    },

    {

      "affiliation": "United States Geological Survey, Astro Geology Science Center",

      "name": "Cain, Jacob",

      "orcid": "0000-0002-7734-2485"

    },

    {

    {

      "name": "Chaves, Pat"

      "name": "Chaves, Pat"

    },

    },

CHANGELOG.md

+1 −1
Original line number Original line Diff line number Diff line
@@ -44,7 +44,7 @@ release. 
### Deprecated

### Deprecated





### Fixed

### Fixed



- Fixed some wrong parameter types [#4780](https://github.com/USGS-Astrogeology/ISIS3/issues/4780)

- Added mapping group to track cube via processmosaic [#4810](https://github.com/USGS-Astrogeology/ISIS3/issues/4810)

- Added mapping group to track cube via processmosaic [#4810](https://github.com/USGS-Astrogeology/ISIS3/issues/4810)

- Fixed bugs in downloadIsisData script [#5024](https://github.com/USGS-Astrogeology/ISIS3/issues/5024) 

- Fixed bugs in downloadIsisData script [#5024](https://github.com/USGS-Astrogeology/ISIS3/issues/5024) 

- Fixed shadow shifting image by 2 pixels to the upper left corner. [#5035](https://github.com/USGS-Astrogeology/ISIS3/issues/5035)

- Fixed shadow shifting image by 2 pixels to the upper left corner. [#5035](https://github.com/USGS-Astrogeology/ISIS3/issues/5035)

isis/src/apollo/apps/apollopaninit/apollopaninit.xml

+5 −2
Original line number Original line Diff line number Diff line
@@ -24,6 +24,9 @@ 
    <change name="Lynn Weller" date="2012-01-22">

    <change name="Lynn Weller" date="2012-01-22">

      Application category name changed from Import and Export to Apollo.  Fixes mantis ticket #951.

      Application category name changed from Import and Export to Apollo.  Fixes mantis ticket #951.

    </change>

    </change>

    <change name="Jacob Cain" date="2022-11-22">

        Changed FROM type to cube. Fixes #4780.

    </change>

  </history>

  </history>





  <category>

  <category>
@@ -39,13 +42,13 @@ 
  <groups>

  <groups>

    <group name="Files">

    <group name="Files">

      <parameter name="FROM">

      <parameter name="FROM">

        <type>filename</type>

        <type>cube</type>

        <fileMode>input</fileMode>

        <fileMode>input</fileMode>

        <brief>

        <brief>

          Input Cube

          Input Cube

        </brief>

        </brief>

        <description>

        <description>

          Use this parameter to select the filename to import.

          Use this parameter to select the cube filename to import.

        </description>

        </description>

        <filter>

        <filter>

          *.cub

          *.cub

isis/src/apollo/apps/apollopaninit/main.cpp

+4 −4
Original line number Original line Diff line number Diff line
@@ -117,11 +117,11 @@ void IsisMain() { 
  insCode = scFrameCode - 230;

  insCode = scFrameCode - 230;





  try {

  try {

    panCube.open(ui.GetFileName("FROM"),"rw");

    panCube.open(ui.GetCubeName("FROM"),"rw");

  }

  }

  catch (IException &e) {

  catch (IException &e) {

    throw IException(IException::User,

    throw IException(IException::User,

                     "Unable to open the file [" + ui.GetFileName("FROM") + "] as a cube.",

                     "Unable to open the file [" + ui.GetCubeName("FROM") + "] as a cube.",

                     _FILEINFO_);

                     _FILEINFO_);

  }

  }
@@ -639,7 +639,7 @@ void IsisMain() { 
  CentroidApolloPan centroid(resolution);

  CentroidApolloPan centroid(resolution);

  Chip inputChip,selectionChip;

  Chip inputChip,selectionChip;

  inputChip.SetSize(int(ceil(200*5.0/resolution)), int(ceil(200*5.0/resolution)));

  inputChip.SetSize(int(ceil(200*5.0/resolution)), int(ceil(200*5.0/resolution)));

  fileName = ui.GetFileName("FROM");

  fileName = ui.GetCubeName("FROM");

  if( panCube.pixelType() == 1)  //UnsignedByte

  if( panCube.pixelType() == 1)  //UnsignedByte

    centroid.setDNRange(12, 1e99);  //8 bit bright target

    centroid.setDNRange(12, 1e99);  //8 bit bright target

  else

  else
@@ -768,7 +768,7 @@ void IsisMain() { 
  panCube.write(tableFid);

  panCube.write(tableFid);

  //close the new cube

  //close the new cube

  panCube.close(false);

  panCube.close(false);

  panCube.open(ui.GetFileName("FROM"),"rw");

  panCube.open(ui.GetCubeName("FROM"),"rw");





  delete spPos;

  delete spPos;

  delete spRot;

  delete spRot;

isis/src/base/apps/bit2bit/bit2bit.xml

+5 −1
Original line number Original line Diff line number Diff line
@@ -69,6 +69,9 @@ 
    <change name="Philip Martinez" date="2010-06-10">

    <change name="Philip Martinez" date="2010-06-10">

      Original version

      Original version

    </change>

    </change>

    <change name="Jacob Cain" date="2022-11-22">

      Changed TO type to cube. Fixes #4780.

    </change>

  </history>

  </history>





  <groups>

  <groups>
@@ -88,7 +91,8 @@ 
      </parameter>

      </parameter>





      <parameter name="TO">

      <parameter name="TO">

        <type>filename</type>

        <type>cube</type>

        <filter>*.cub</filter>

        <fileMode>output</fileMode>

        <fileMode>output</fileMode>

        <brief>

        <brief>

          Output cube

          Output cube