Commit 799a0330 authored by Ian Humphrey's avatar Ian Humphrey
Browse files

Udpated from trunk. 

git-svn-id: http://subversion.wr.usgs.gov/repos/prog/isis3/branches/ipce@6767 41f8697f-d340-4b68-9986-7bafba869bb8
parents bd8429d2 652f1810

isis/src/apollo/apps/apollocal/tsts/default/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -3,5 +3,6 @@ APPNAME = apollocal 
include $(ISISROOT)/make/isismake.tsts



commands:

	$(APPNAME) FROM=$(INPUT)/apollowarptrimmed.cub TO=$(OUTPUT)/apollocaltrimmed.cub > /dev/null;

	$(APPNAME) FROM=$(INPUT)/apollowarptrimmed.cub \

	TO=$(OUTPUT)/apollocaltrimmed.cub > /dev/null;

isis/src/qisis/objs/ControlPointEdit/ControlPointEdit.cpp

+1 −1
Original line number Diff line number Diff line
@@ -772,7 +772,7 @@ namespace Isis { 
      }

    }



    // Dump into left chipViewport

    // Dump into right chipViewport

    p_rightView->setChip(p_rightChip, p_rightCube);



    updateRightGeom();

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

+7 −5
Original line number Diff line number Diff line
@@ -3006,6 +3006,9 @@ namespace Isis { 
   *                           implementation of binary control networks.

   * @history 2011-04-06  Tracie Sucharski - If not a fixed point, use the

   *                           Reference measure to get lat,lon.

   * @history 2016-03-17  Makayla Shepherd - All new measures added use the 

   *                           Reference Measure to get the lat, lon, in order

   *                           to make keep behavior consistant. Fixes #2326.

   *

   */

  void QnetTool::addMeasure() {
@@ -3018,10 +3021,10 @@ namespace Isis { 
    //  TODO::   Needs to be moved to QnetFileTool.cpp

    Camera *cam;



    // If no apriori or adjusted lat/lon for this point, use lat/lon of first measure

    double lat = m_editPoint->GetBestSurfacePoint().GetLatitude().degrees();

    double lon = m_editPoint->GetBestSurfacePoint().GetLongitude().degrees();

    if (lat == Null || lon == Null) {

    // Use lat/lon of first measure

    double lat;

    double lon;

    

    ControlMeasure m = *(m_editPoint->GetRefMeasure());

    int camIndex = m_serialNumberList->serialNumberIndex(m.GetCubeSerialNumber());

    cam = m_controlNet->Camera(camIndex);
@@ -3029,7 +3032,6 @@ namespace Isis { 
    cam->SetImage(m.GetSample(),m.GetLine());

    lat = cam->UniversalLatitude();

    lon = cam->UniversalLongitude();

    }



    for (int i=0; i<m_serialNumberList->size(); i++) {

      cam = m_controlNet->Camera(i);

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

+3 −0
Original line number Diff line number Diff line
@@ -231,6 +231,9 @@ namespace Isis { 
   *                           buttons. Added shortcuts (PageUp/PageDown) for selecting right

   *                           measures and added slots to handle these shortcuts. Added save

   *                           control network shortcut. Fixes #2324.

   *   @history 2016-03-17 Makayla Shepherd - Modified addMeasures so that new measures use the

   *                           Reference Measure in order to keep the behavior consistent. 

   *                           Fixes #2326.

   *                           

   */

  class QnetTool : public Tool {