Unverified Commit af638552 authored by AustinSanders's avatar AustinSanders Committed by GitHub
Browse files

Initial application + testing refactor for cnetbin2pvl (#3693) 

* Initial application/testing refactor of cnetbin2pvl

* Removed makefile for old test.

* Adjusted spacing to better comply with isis3 internal standard.

* Removed default cnetbin2pvl testing makefile

* Addressed PR comments / reviews.

Removed old comment
Removed unnecessary cnet write
Added default null pointer for progress parameter.

* Removed extra whitespace
parent b88a1052

isis/src/control/apps/cnetbin2pvl/cnetbin2pvl.cpp

0 → 100644
+21 −0
Original line number Diff line number Diff line 
#include "cnetbin2pvl.h"



using namespace std;

using namespace Isis;



namespace Isis{

  void cnetbin2pvl(UserInterface &ui, Progress *progress) {

    ControlNet cnet;

    cnet.ReadControl(ui.GetFileName("FROM"), progress);



    cnetbin2pvl(cnet, ui, progress);

  }



  void cnetbin2pvl(ControlNet &cnet, UserInterface &ui, Progress *progress) {

    progress->SetText("Writing Control Network...");

    progress->SetMaximumSteps(1);

    progress->CheckStatus();

    cnet.Write(ui.GetFileName("TO"), true);

    progress->CheckStatus();

  }

}

isis/src/control/apps/cnetbin2pvl/cnetbin2pvl.h

0 → 100644
+13 −0
Original line number Diff line number Diff line 
#ifndef cnetbin2pvl_h

#define cnetbin2pvl_h



#include "UserInterface.h"

#include "ControlNet.h"

#include "Progress.h"



namespace Isis {

  extern void cnetbin2pvl(UserInterface &ui, Progress *progress=0);

  extern void cnetbin2pvl(ControlNet &net, UserInterface &ui, Progress *progress=0);

}



#endif

isis/src/control/apps/cnetbin2pvl/main.cpp

+5 −13
Original line number Diff line number Diff line 
#include "Isis.h"



#include "ControlNet.h"

#include "IString.h"

#include "Progress.h"

#include "cnetbin2pvl.h"

#include "Application.h"



using namespace Isis;



void IsisMain() {

  // Get user entered file name & mode

  UserInterface &ui = Application::GetUserInterface();

  Progress p;



  ControlNet cnet;

  cnet.ReadControl(ui.GetFileName("FROM"), &p);

  p.SetText("Writing Control Network...");

  p.SetMaximumSteps(1);

  p.CheckStatus();

  cnet.Write(ui.GetFileName("TO"), true);

  p.CheckStatus();

  Progress progress;

  cnetbin2pvl(ui, &progress);

}

isis/src/control/apps/cnetbin2pvl/tsts/Makefile

deleted100644 → 0
+0 −4
Original line number Diff line number Diff line 
BLANKS = "%-6s"    

LENGTH = "%-40s"



include $(ISISROOT)/make/isismake.tststree

isis/src/control/apps/cnetbin2pvl/tsts/default/Makefile

deleted100644 → 0
+0 −7
Original line number Diff line number Diff line 
APPNAME = cnetbin2pvl



include $(ISISROOT)/make/isismake.tsts



commands:

	$(APPNAME) from=$(INPUT)/simplenet.net to=$(OUTPUT)/simplenet.pvl \

	  > /dev/null;