Unverified Commit 6bb48860 authored by kledmundson's avatar kledmundson Committed by GitHub
Browse files

Merge pull request #148 from TracieSucharski/ipce 

Ipce
parents 923bb569 0cb1b3b9

isis/src/qisis/apps/ipce/ControlNetTool.cpp

0 → 120000
+1 −0
Original line number Diff line number Diff line 
../../objs/ControlNetTool/ControlNetTool.cpp
 
 No newline at end of file

isis/src/qisis/apps/ipce/ipce.cpp

+10 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ 
#include <QLocale>

#include <QTranslator>



#include "FileName.h"

#include "Gui.h"

#include "IException.h"

#include "IpceMainWindow.h"
@@ -39,11 +40,20 @@ int main(int argc, char *argv[]) { 
  Gui::checkX11();



  try {



    // Add the Qt plugin directory to the library path

    FileName qtpluginpath("$ISISROOT/3rdParty/plugins");

    QCoreApplication::addLibraryPath(qtpluginpath.expanded());



    QApplication *app = new QIsisApplication(argc, argv);

    QApplication::setApplicationName("ipce");



    IpceMainWindow *mainWindow = new IpceMainWindow();



    //  For OSX, had problems with cneteditor view because it has it's own menus, caused the

    //  menubar on OSX to lockup

    QCoreApplication::setAttribute(Qt::AA_DontUseNativeMenuBar, true);



    // We do not want a showMaximized call, as that will negate the settings read during the main

    // window's initialization. References #4358.

    mainWindow->show();

isis/src/qisis/objs/ControlNetTool/ControlNetTool.cpp

+2 −1
Original line number Diff line number Diff line
@@ -35,7 +35,8 @@ using namespace std; 


namespace Isis {

  /**

   * ControlNet (Qnet) tool - Handles mouse button actions and drawing control points on viewports

   * ControlNet tool - Handles mouse button actions and drawing control points on viewports in the

   * CubeDnView for the ipce application. 

   *

   * @param parent Pointer to the parent widget for the ControlNet tool

   *

isis/src/qisis/objs/ControlPointEditWidget/ControlPointEditWidget.cpp

+1 −4
Original line number Diff line number Diff line
@@ -710,7 +710,6 @@ namespace Isis { 
  FileName ControlPointEditWidget::findGroundFile() {



    FileName groundFile(m_editPoint->GetAprioriSurfacePointSourceFile());



    if (m_changeAllGroundLocation) {

      QFileInfo oldFile(groundFile.expanded());

      QFileInfo newFile(m_newGroundDir, oldFile.fileName());
@@ -1028,7 +1027,7 @@ namespace Isis { 


    Camera *cam;

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

//    if (m_serialNumberList->serialNumber(i) == m_groundSN) continue;

      if (m_serialNumberList->serialNumber(i) == m_groundSN) continue;

      cam = m_controlNet->Camera(i);

      if (cam->SetUniversalGround(latitude, longitude)) {

        //  Make sure point is within image boundary
@@ -1246,9 +1245,7 @@ namespace Isis { 
      }



      // emit a signal to alert user to save when exiting

      qDebug()<<"ControlPointEditWidget before cnetModified signal";

      emit cnetModified();

      qDebug()<<"ControlPointEditWidget after cnetModified signal";

      emit saveControlNet();



      if (m_editPoint != NULL) {

isis/src/qisis/objs/ControlPointEditWidget/ControlPointEditWidget.h

+4 −1
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ namespace Isis { 
  class UniversalGroundMap;



  /**

   * @brief Gui for editing ControlPoint

   * @brief Gui for editing ControlPoints in ipce application

   *

   * @ingroup Visualization Tools

   *
@@ -85,6 +85,9 @@ namespace Isis { 
   *   @history 2018-03-30 Tracie Sucharski - Save Control in addition to the control net and use

   *                           Control to write the control net so Control can keep track of the

   *                           modification state of the control net.

   *   @history 2018-04-25 Tracie Sucharski - Fix bug when creating a control point from CubeDnView

   *                           or FootprintView if a ground source exists in the serial number list.

   *                           Fixes #5399.

   */

  class ControlPointEditWidget : public QWidget {

    Q_OBJECT