Merge pull request #357 from twilson271828/dev (ea8b672c) · Commits · aflab / astrogeology / ISIS3

isis/src/qisis/objs/ProgressBar/ProgressBar.h

+3 −2

Original line number	Diff line number	Diff line
		@@ -5,9 +5,10 @@

		namespace Isis {
		/**
		* @brief QProgressBar with customizable text
		*
		* @author ????-??-?? Steven Lambright
		* @internal ????-??-?? Steven Lambright - QProgressBar with customizable text
		*
		*
		*/

+3 −6

Original line number	Diff line number	Diff line
		@@ -36,15 +36,12 @@ class QVariant;
		namespace Isis {

		/**
		* @brief A proxy class for filtering data within the JigsawSetupDialog
		* Bundle Observation Solve Settings (BOSS) tab.
		*
		* @ingroup
		*
		* @author 2018-06-18 Tyler Wilson
		*
		* @internal
		* @history 2018-06-18 Tyler Wilson - Original version.
		* @history 2018-06-18 Tyler Wilson - Original version. A proxy class for filtering data
		* within the JigsawSetupDialog Bundle Observation Solve Settings (BOSS) tab.
		*/

		class ProjectItem;

+8 −0

Original line number	Diff line number	Diff line
		@@ -13,6 +13,14 @@ class QVariant;

		namespace Isis {

		/**
		*
		* @author ????-??-?? Ian Humphrey
		* @internal ????-??-?? Ian Humphrey
		*
		*
		*/

		class SubTreeProxyModel : public QIdentityProxyModel {
		Q_OBJECT

+9 −8

Original line number	Diff line number	Diff line
		@@ -35,10 +35,11 @@
		class Project;

		/**
		* This represents an ISIS template in a project-based GUI interface.
		* This encapsulates ideas about a template such as it's filename and import name.
		*
		* @author 2017-11-01 Christopher Combs
		* @internal
		* @history - 2017-11-01 Christopher Combs - This represents an ISIS template in a
		* project-based GUI interface. This encapsulates ideas about a
		* template such as it's filename and import name.
		*/
		class Template : public QObject {
		Q_OBJECT
		@@ -60,12 +61,12 @@

		private:
		/**
		* Nested class used to write the Template object information to an XML file for the
		* purpose of saving and restoring the state of the project.
		*
		* @author 2012-??-?? Steven Lambright
		*
		* @internal
		* @history 2012-??-?? Steven Lambright - Nested class used to write the Template object
		* information to an XML file for the purpose of saving and
		* restoring the state of the project.
		*/
		class XmlHandler : public XmlStackedHandler {
		public:

+13 −3

Original line number	Diff line number	Diff line
		@@ -35,10 +35,12 @@
		namespace Isis {

		/**
		* Maintains a list of Templates so that templates can easily be copied from one Project to
		* another, saved to disk, or deleted from disk. Adapted from ControlList.
		*
		* @author 2017-11-01 Christopher Combs
		* @internal
		* @history 2017-11-01 Christopher Combs - Maintains a list of Templates so that templates
		* can easily be copied from one Project to another, saved to disk, or deleted from disk.
		* Adapted from ControlList.
		*/
		class TemplateList : public QObject, public QList<Template *> {
		Q_OBJECT
		@@ -67,6 +69,14 @@
		QString m_type;

		class XmlHandler : public XmlStackedHandler {
		/**
		*
		* @author 2017-11-01 Christopher Combs
		* @internal
		* @history 2017-11-01 Christopher Combs - Maintains a list of Templates so that templates
		* can easily be copied from one Project to another, saved to disk, or deleted from disk.
		* Adapted from ControlList.
		*/
		public:
		XmlHandler(TemplateList templateList, Project project);