Commit f23acf66 authored by Marjorie Hahn's avatar Marjorie Hahn
Browse files

Moved default template file location for AutoRegFactory to ControlPointEdit's... 

Moved default template file location for AutoRegFactory to ControlPointEdit's constructor. Should solve issues regarding this file never getting initialized. References #4590.

git-svn-id: http://subversion.wr.usgs.gov/repos/prog/isis3/trunk@7707 41f8697f-d340-4b68-9986-7bafba869bb8
parent ec7758b8

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

+7 −5
Original line number Diff line number Diff line
@@ -68,6 +68,8 @@ namespace Isis { 
    p_leftGroundMap = 0;

    p_rightGroundMap = 0;

    

    p_templateFileName = "$base/templates/autoreg/qnetReg.def";



    createPointEditor(parent);

    if (cnet != NULL) emit newControlNetwork(cnet);

  }
@@ -930,9 +932,9 @@ namespace Isis { 
   */

  void ControlPointEdit::registerPoint() {

    

    // if the auto registration factory has not been initialized, do it here

    if (p_autoRegFact == NULL) {

      try {

        p_templateFileName = "$base/templates/autoreg/qnetReg.def";

        Pvl pvl(p_templateFileName);

        p_autoRegFact = AutoRegFactory::Create(pvl);

      }

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

+1 −1

File changed.

Contains only whitespace changes.

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

+1 −1

File changed.

Contains only whitespace changes.