Commit 973440fb authored by Amy Stamile's avatar Amy Stamile Committed by Amy Stamile
Browse files

Remove qt deps (#5313) 



* Added history comment.

* Initial move to core

* Removed Pvl cmakelists

* Removed more cmakelists.txt

* Add subdirectory

* Fully modularized core

* Fully modularized core

* replaced PvlEditDialog that was accidentally removed in prev commit

* Initial constants unit gtest

* Fixed pvl core test config (#4349)

* Fixed pvl core test config

* Changed cmake_source to project_source for submodule

* Fixed pvl core test config

* Changed cmake_source to project_source for submodule

* First working swig wrappers

* Rebased off of pvl_core

* Moved old ISIS unitTests into core (#4351)

* First pass at old unitTests

* re-removed old files

* Slim down and unittest port

* installing IsisPreferences

* Fixed tests in a full build

* Finished swig wrapper with some syntax sugar for ease of use in python (#4352)

* Initial core deployment (#4355)

* Updated preference files (#4354)

* Reset main build and created core recipe

Forgot meta.yaml

Change where the build is pulling from

Fixed qt requirement in core recipe

Removed complier definition

Turn swig build on

* Changed pvl recipe url to point to usgsastro

* Fixed typo

* Removed a chunk of files that made it through the rebase (#4523)

* Add Blob to core from base (#4525)

* Fixed tests

* Remove Blob from base

* Pvl core Docs (#4536)

* Small doc string changes

* Fixed more doc strings and updated RTD configs

* Added core docs

* Removed path setup from config

* Added subprocess import

* Added back os import

* Added breathe to env file

* Maybe fix?

* Added doxyfile

* Trying doxygen change

* Blob Swig Wrapper (#4613)

* Moved wrapper under one package

* Add pvl construction from reading a string, give access to blob internals

* Updated meta.yaml to build isisio rather than isispvl

* Post rebase fixes

* Fixed app logging for all call able apps

* Moved table reading/writing into core

* Fixed missing license identifiers, and leftover merge conflict from rebase

* Exposed error formatting and file line reporting flags on preference class

* Updates IException to use the exposed Preference flags

* Application handles adding program name to error

* Removed unnecessary includes to classes outside of core

* Removed tempFixtures include in core tests

* Updates sources and includes for building

* Moves necessary fixtures into core

* Enforce that core unit tests use the test preferences

* Removed commented Application::Name all

* Initial round of test fixes

* Fixed last 3 failing gtests

* Fixed AppendAndLog function uses

* Updated IException test truth data

* Caught another missused AppendAndLog call

* Fixed last failing gtest

* Fixed output from getsn

* Moved Endian into core

* Remove additional 'm' extension for python 3.10

* Set version to 0.0.1 and clamped qt bellow 5.15

* Initial changes for isis pvl python interface

* Fixed missed conflict in rebase

* Removed prints causing test failures

* QPair -> std::pair

* removed QT from ArraySubscriptNotInRange

* removed QT from Message::Keyword*

* Updated MissingDelimiter.cpp and deps

* Updated MemoryAllocFailed

* compiling updates

* PvlSequence updated

* Updated table, tablefield, and tablerecord

---------

Co-authored-by: default avatarAustin Sanders <arsanders@usgs.gov>
Co-authored-by: default avatarAustin Sanders <arsanders@ugs.gov>
Co-authored-by: default avatarJesse Mapel <jmapel@usgs.gov>
Co-authored-by: default avataracpaquette <acpaquette@usgs.gov>
Co-authored-by: default avatarStuart Sides <ssides@usgs.gov>
parent 2dcbd2a3

isis/src/base/apps/camstats/camstats.cpp

+1 −1
Original line number Diff line number Diff line
@@ -192,7 +192,7 @@ namespace Isis { 
        PvlGroup &group = statsPvl.group(i);



        int entry = 0;

        record[entry] = group.name();

        record[entry] = group.name().toStdString();

        entry++;

        for (int j = 0; j < group.keywords(); j++) {

          record[entry] = std::stod(group[j][0]);

isis/src/core/src/PvlKeyword.cpp

+1 −1
Original line number Diff line number Diff line
@@ -654,7 +654,7 @@ namespace Isis { 
        if (j < (int) seq[i].size() - 1) temp += ", ";

      }

      temp += ")";

      this->operator+=(temp);

      this->operator+=(QString::fromStdString(temp));

    }



    return *this;

isis/src/core/src/PvlSequence.cpp

+2 −2
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ namespace Isis { 
   */

  PvlSequence &PvlSequence::operator=(PvlKeyword &key) {

    for(int i = 0; i < key.size(); i++) {

      this->operator+=(key[i]);

      this->operator+=(key[i].toStdString());

    }

    return *this;

  }
@@ -42,7 +42,7 @@ namespace Isis { 
    PvlKeyword &key = pvl["temp"];

    std::vector<std::string> temp;

    for(int i = 0; i < key.size(); i++) {

      temp.push_back(key[i]);

      temp.push_back(key[i].toStdString());

    }

    p_sequence.push_back(temp);

    return *this;

isis/src/core/src/TableField.cpp

+1 −1
Original line number Diff line number Diff line
@@ -589,7 +589,7 @@ namespace Isis { 
   */

  PvlGroup TableField::pvlGroup() {

    PvlGroup group("Field");

    group += PvlKeyword("Name", m_name);

    group += PvlKeyword("Name", QString::fromStdString(m_name));

    if (m_type == TableField::Double) {

      group += PvlKeyword("Type", "Double");

    }