Commit ae10062f authored by Jeannie Backer's avatar Jeannie Backer
Browse files

Merged qisis, some control, some base changes from v006LibrariesV2 to ipce. 

git-svn-id: http://subversion.wr.usgs.gov/repos/prog/isis3/branches/ipce@7135 41f8697f-d340-4b68-9986-7bafba869bb8
parent add9800f

isis/src/base/apps/algebra/algebra.cpp

+2 −0
Original line number Diff line number Diff line
@@ -20,6 +20,8 @@ void unaryFunction(Buffer &in, Buffer &out); 
double Isisa, Isisb, Isisc, Isisd, Isise;



void IsisMain() {

  std::cout << "algebra - got to main...\n";



  // We will be processing by line

  ProcessByLine p;

isis/src/base/apps/barscale/barscale.cpp

+13 −14
Original line number Diff line number Diff line
@@ -13,7 +13,6 @@ 
#include "UniversalGroundMap.h"



#include <cmath>



#include <QFile>

#include <QFont>

#include <QFontMetrics>

isis/src/base/apps/cubeit/cubeit.cpp

+29 −31
Original line number Diff line number Diff line
@@ -210,7 +210,7 @@ void IsisMain() { 
      }

    }



    Cube *icube = m.SetInputCube(newcubeList[i].toString(), attrib);

    Cube *icube = m.SetInputCube(newcubeList[i].toString(), attrib, 1, 1, 1, -1, -1, -1);



    // Delete any tracking tables from the input cube if necessary

    if (icube->hasTable("InputImages")) {
@@ -242,5 +242,3 @@ void helperButtonLog() { 
    Application::GuiLog(line);

  }

}

isis/src/base/apps/isisminer/AssetSidebarStrategy.h

+20 −17
Original line number Diff line number Diff line
@@ -84,6 +84,9 @@ namespace Isis { 
   *                          a global resource list.

   *   @history 2015-09-15 Kris Becker - Reworked how the create option is

   *                         implemented.

   *   @history 2016-08-28 Kelvin Rodriguez - Added using Strategy::apply; to avoid

   *                           hidden virtual function warnings in clang.

   *                           Part of porting to OS X 10.11.

   */

  class AssetSidebarStrategy : public SidebarStrategy {
@@ -95,10 +98,10 @@ namespace Isis { 
    protected:

      virtual int preRunProcess(ResourceList &resources, const ResourceList &globals);



      using SidebarStrategy::apply;  // make parent functions visable

      virtual int apply(SharedStrategy &strategy, ResourceList &resources,

                        const ResourceList &globals);



      

      virtual int postRunProcess(ResourceList &resources, const ResourceList &globals);



    private:

isis/src/base/apps/isisminer/CsvWriterStrategy.h

+22 −18
Original line number Diff line number Diff line
@@ -84,6 +84,9 @@ namespace Isis { 
   *                          a global resource list.

   *   @history 2015-06-11 Kris Becker - Ensure GIS keyword takes precidence

   *                          over any other Resource keyword

   *   @history 2016-08-28 Kelvin Rodriguez - Added using Strategy::apply; to avoid

   *                           hidden virtual function warnings in clang.

   *                           Part of porting to OS X 10.11.

   */

  class CsvWriterStrategy : public Strategy {
@@ -95,6 +98,7 @@ namespace Isis { 
      virtual int apply(ResourceList &resources, const ResourceList &globals);



    protected:

      using Strategy::apply;

      int apply(SharedResource &resource, std::ofstream &os);



    private: