Loading isis/src/qisis/apps/ipce/IpceMainWindow.h +25 −22 Original line number Original line Diff line number Diff line Loading @@ -141,20 +141,21 @@ namespace Isis { * @history 2018-06-13 Tracie Sucharski - Fixed cleanup of views and QDockWidgets. * @history 2018-06-13 Tracie Sucharski - Fixed cleanup of views and QDockWidgets. * @history 2018-06-13 Kaitlyn Lee - Since views now inherit from QMainWindow, each individual * @history 2018-06-13 Kaitlyn Lee - Since views now inherit from QMainWindow, each individual * view has its own toolbar, so having an active toolbar and tool pad is * view has its own toolbar, so having an active toolbar and tool pad is * not needed. Removed code adding the save active control net button and * not needed. Removed code adding the save active control net button * the toolpad, since control nets can be saved with the project save button. * and the toolpad, since control nets can be saved with the project * save button. * @history 2018-06-15 Tracie Sucharski - Fixed break to recent projects. The readSettings * @history 2018-06-15 Tracie Sucharski - Fixed break to recent projects. The readSettings * must be called before initializeActions to get the recent projects * must be called before initializeActions to get the recent projects * from the config file. * from the config file. * @history 2018-06-18 Makayla Shepherd - Set the QApplication name so that BundleAdjust does * @history 2018-06-18 Makayla Shepherd - Set the QApplication name so that BundleAdjust does * not output text to the command line for ipce. Fixes #4171. * not output text to the command line for ipce. Fixes #4171. * @history 2018-06-19 Kaitlyn Lee - Added tabViews() and the menu option under the View menu to * @history 2018-06-19 Kaitlyn Lee - Added tabViews() and the menu option under the View menu to * tab the views. Currently, this can tab all attached/detached views. I * tab the views. Currently, this can tab all attached/detached views. * left the line setting dock options to allow grouped dragging, but tabbing * I left the line setting dock options to allow grouped dragging, but * views does not always work with this enabled. With this option enabled, the * tabbing views does not always work with this enabled. With this * type of a view will randomly change and setting its type has no effect. * option enabled, the type of a view will randomly change and setting * Use windowType() to get the type. Also added the toolbar title in the * its type has no effect. Use windowType() to get the type. Also added * permanent toolbar constructor. * the toolbar title in the permanent toolbar constructor. * @history 2018-06-22 Tracie Sucharski - Cleanup destruction of dock widgets and the views they * @history 2018-06-22 Tracie Sucharski - Cleanup destruction of dock widgets and the views they * hold. Extra destroy slots were causing double deletion of memory. * hold. Extra destroy slots were causing double deletion of memory. * @history 2018-06-22 Tracie Sucharski - Added a showEvent handler so that the project clean * @history 2018-06-22 Tracie Sucharski - Added a showEvent handler so that the project clean Loading @@ -164,25 +165,27 @@ namespace Isis { * @history 2018-07-07 Summer Stapleton - Added check in the closeEvent() for changes to any * @history 2018-07-07 Summer Stapleton - Added check in the closeEvent() for changes to any * TemplateEditorWidget currently open to create a pop-up warning/ * TemplateEditorWidget currently open to create a pop-up warning/ * option to save. * option to save. * @history 2018-07-09 Kaitlyn Lee - Added tileViews() and the menu option to tile all docked/undocked * @history 2018-07-09 Kaitlyn Lee - Added tileViews() and the menu option to tile all * and tabbed/untabbed views. Changed removeView() to delete the parent dock widget. * docked/undocked and tabbed/untabbed views. Changed removeView() to * If we do not delete the dock widget, an empty dock widget will remain where the * delete the parent dock widget. If we do not delete the dock widget, * view used to be. * an empty dock widget will remain where the view used to be. * @history 2018-07-10 Tracie Sucharski - Change initial interface of views to tabbed view. * @history 2018-07-10 Tracie Sucharski - Change initial interface of views to tabbed view. * Changed the QMainWindow separator to a different color and wider size * Changed the QMainWindow separator to a different color and wider size * for ease of use. Create the QMainWindow initial size to prevent the * for ease of use. Create the QMainWindow initial size to prevent the * Viewports in CubeDnView from being created as a small size. * Viewports in CubeDnView from being created as a small size. * @history 2018-07-11 Kaitlyn Lee - Added a value in the project settings that stores whether a * @history 2018-07-11 Kaitlyn Lee - Added a value in the project settings that stores whether a * project was in fullscreen or not when saved. If not, we call showNormal() * project was in fullscreen or not when saved. If not, we call * to restore the poject's window size. This also fixes the warning/history tabs * showNormal() to restore the poject's window size. This also fixes the * being misplaced when opening a project. Fixes #5175. * warning/history tabs being misplaced when opening a project. * @history 2018-07-12 Kaitlyn Lee - Removed code that makes the window fullscreen in memory, since this * Fixes #5175. * was causing a project's window size to not be restored when opening from the * @history 2018-07-12 Kaitlyn Lee - Removed code that makes the window fullscreen in memory, * command line. Decreased the size and changed the color of the splitter. * since this was causing a project's window size to not be restored * In writeGlobalSettings(), check to see if the geometry value does not exist * when opening from the command line. Decreased the size and changed * in the config file. This allows the geometry to be saved if the config file * the color of the splitter. In writeGlobalSettings(), check to see if * does not exist and a user opens a project. Before, it would not save the * the geometry value does not exist in the config file. This allows the * geometry because the opened project was not temporary. References #5433 * geometry to be saved if the config file does not exist and a user * opens a project. Before, it would not save the geometry because the * opened project was not temporary. References #5433 */ */ class IpceMainWindow : public QMainWindow { class IpceMainWindow : public QMainWindow { Q_OBJECT Q_OBJECT Loading isis/src/qisis/objs/AbstractProjectItemView/AbstractProjectItemView.h +15 −12 Original line number Original line Diff line number Diff line Loading @@ -62,25 +62,28 @@ namespace Isis { * to be main windows themselves, changing from an mdi interface to an * to be main windows themselves, changing from an mdi interface to an * sdi interface. * sdi interface. * @history 2018-05-30 Tracie Sucharski - Added the WindowFlag to set this as a Widget. * @history 2018-05-30 Tracie Sucharski - Added the WindowFlag to set this as a Widget. * @history 2018-06-15 Kaitlyn Lee - Removed methods returing toolbar and menu actions because each * @history 2018-06-15 Kaitlyn Lee - Removed methods returing toolbar and menu actions because * individual has its own toolbar. These methods are not needed anymore. * each individual has its own toolbar. These methods are not needed * anymore. * @history 2018-06-18 Summer Stapleton - Overloaded moveEvent and resizeEvent and added a * @history 2018-06-18 Summer Stapleton - Overloaded moveEvent and resizeEvent and added a * windowChangeEvent signal to allow project to recognize a new save * windowChangeEvent signal to allow project to recognize a new save * state. Fixes #5114 * state. Fixes #5114 * @history 2018-06-25 Kaitlyn Lee - When multiple views are open, there is a possibility of getting * @history 2018-06-25 Kaitlyn Lee - When multiple views are open, there is a possibility of * ambiguous shortcut errors. To counter this, we need a way to focus on one * getting ambiguous shortcut errors. To counter this, we need a way to * widget. Giving the views focus did not work completely. Instead, * focus on one widget. Giving the views focus did not work completely. * enabling/disabling actions was the best option. Added enableActions(), * Instead, enabling/disabling actions was the best option. Added * disableActions(), enterEvent(), and leaveEvent(). On default, a view's * enableActions(), disableActions(), enterEvent(), and leaveEvent(). On * actions are disabled. To enable the actions, move the cursor over the view. * default, a view's actions are disabled. To enable the actions, move * When a user moves the cursor outside of the view, the actions are disabled. * the cursor over the view. When a user moves the cursor outside of the * view, the actions are disabled. * @history 2018-07-05 Tracie Sucharski - Added SizePolicy and a large sizeHint. The large * @history 2018-07-05 Tracie Sucharski - Added SizePolicy and a large sizeHint. The large * sizeHint() is because using sizePolicy with a reasonable sizeHint did * sizeHint() is because using sizePolicy with a reasonable sizeHint did * not work to have views fill the available space in the dock area. * not work to have views fill the available space in the dock area. * References #5433. * References #5433. * @history 2018-07-12 Kaitlyn Lee - Changed the sizeHint to be calculated based on the deskTop size, * @history 2018-07-12 Kaitlyn Lee - Changed the sizeHint to be calculated based on the deskTop * instead of being hard-coded. The percentages chosen allow for 2 CubeDnViews * size, instead of being hard-coded. The percentages chosen allow for 2 * to be opened at once, since CubeDnView has an internal size policy. References #5433 * CubeDnViews to be opened at once, since CubeDnView has an internal * size policy. References #5433 */ */ class AbstractProjectItemView : public QMainWindow { class AbstractProjectItemView : public QMainWindow { Loading isis/src/qisis/objs/CubeDnView/CubeDnView.h +9 −9 Original line number Original line Diff line number Diff line Loading @@ -93,15 +93,15 @@ namespace Isis { * view has its own toolbar, so having getters that return toolbar * view has its own toolbar, so having getters that return toolbar * actions to fill the toolbar of the IpceMainWindow are unnecessary. * actions to fill the toolbar of the IpceMainWindow are unnecessary. * Removed methods that returned menu and toolbar actions. * Removed methods that returned menu and toolbar actions. * Removed connections that connected the project and CubeDnView and called * Removed connections that connected the project and CubeDnView and * enableControlNetTool() because Directory now does this. * called enableControlNetTool() because Directory now does this. * @history 2018-06-25 Kaitlyn Lee - When multiple views are open, there is a possibility of getting * @history 2018-06-25 Kaitlyn Lee - When multiple views are open, there is a possibility of * ambiguous shortcut errors. To counter this, we enable/disable actions. * getting ambiguous shortcut errors. To counter this, we enable/disable * Overrode leaveEvent() to handle open menus causing a leave event. Overrode * actions. Overrode leaveEvent() to handle open menus causing a leave * enable/disableActions() because we need to disable the active toolbar's widgets. * event. Overrode enable/disableActions() because we need to disable * On default, a view's actions are disabled. To enable the actions, move the * the active toolbar's widgets. On default, a view's actions are * cursor over the view. When a user moves the cursor outside of the view, the * disabled. To enable the actions, move the cursor over the view. When * actions are disabled. * a user moves the cursor outside of a view, the actions are disabled. * @history 2018-07-05 Tracie Sucharski - Moved sizeHint and sizePolicy to * @history 2018-07-05 Tracie Sucharski - Moved sizeHint and sizePolicy to * AbstractProjectItemView. References #5433. * AbstractProjectItemView. References #5433. * @history 2018-07-09 Tracie Sucharski - Serialize the objectName for this view so that the * @history 2018-07-09 Tracie Sucharski - Serialize the objectName for this view so that the Loading isis/src/qisis/objs/Footprint2DView/Footprint2DView.h +9 −8 Original line number Original line Diff line number Diff line Loading @@ -84,12 +84,13 @@ namespace Isis { * Removed methods that returned menu and toolbar actions. * Removed methods that returned menu and toolbar actions. * Made it so that on default and if there is no active control net, * Made it so that on default and if there is no active control net, * the Control Net Tool will be disabled. * the Control Net Tool will be disabled. * Added enableControlNetTool(bool) so when an active control net is set, * Added enableControlNetTool(bool) so when an active control net is * the tool becomes enabled. * set, the tool becomes enabled. * @history 2018-06-25 Kaitlyn Lee - When multiple views are open, there is a possibility of getting * @history 2018-06-25 Kaitlyn Lee - When multiple views are open, there is a possibility of * ambiguous shortcut errors. To counter this, we enable/disable actions. * getting ambiguous shortcut errors. To counter this, we enable/disable * On default, actions are disabled until a user moves the cursor over the view. * actions. On default, actions are disabled until a user moves the * When a user moves the cursor outside of the view, the actions are disabled. * cursor over the view. When a user moves the cursor outside of the * view, the actions are disabled. * @history 2018-07-09 Tracie Sucharski - Serialize the objectName for this view so that the * @history 2018-07-09 Tracie Sucharski - Serialize the objectName for this view so that the * view can be re-created with the same objectName for restoring the * view can be re-created with the same objectName for restoring the * project state. Qt's save/restoreState use the objectName. Remove * project state. Qt's save/restoreState use the objectName. Remove Loading Loading
isis/src/qisis/apps/ipce/IpceMainWindow.h +25 −22 Original line number Original line Diff line number Diff line Loading @@ -141,20 +141,21 @@ namespace Isis { * @history 2018-06-13 Tracie Sucharski - Fixed cleanup of views and QDockWidgets. * @history 2018-06-13 Tracie Sucharski - Fixed cleanup of views and QDockWidgets. * @history 2018-06-13 Kaitlyn Lee - Since views now inherit from QMainWindow, each individual * @history 2018-06-13 Kaitlyn Lee - Since views now inherit from QMainWindow, each individual * view has its own toolbar, so having an active toolbar and tool pad is * view has its own toolbar, so having an active toolbar and tool pad is * not needed. Removed code adding the save active control net button and * not needed. Removed code adding the save active control net button * the toolpad, since control nets can be saved with the project save button. * and the toolpad, since control nets can be saved with the project * save button. * @history 2018-06-15 Tracie Sucharski - Fixed break to recent projects. The readSettings * @history 2018-06-15 Tracie Sucharski - Fixed break to recent projects. The readSettings * must be called before initializeActions to get the recent projects * must be called before initializeActions to get the recent projects * from the config file. * from the config file. * @history 2018-06-18 Makayla Shepherd - Set the QApplication name so that BundleAdjust does * @history 2018-06-18 Makayla Shepherd - Set the QApplication name so that BundleAdjust does * not output text to the command line for ipce. Fixes #4171. * not output text to the command line for ipce. Fixes #4171. * @history 2018-06-19 Kaitlyn Lee - Added tabViews() and the menu option under the View menu to * @history 2018-06-19 Kaitlyn Lee - Added tabViews() and the menu option under the View menu to * tab the views. Currently, this can tab all attached/detached views. I * tab the views. Currently, this can tab all attached/detached views. * left the line setting dock options to allow grouped dragging, but tabbing * I left the line setting dock options to allow grouped dragging, but * views does not always work with this enabled. With this option enabled, the * tabbing views does not always work with this enabled. With this * type of a view will randomly change and setting its type has no effect. * option enabled, the type of a view will randomly change and setting * Use windowType() to get the type. Also added the toolbar title in the * its type has no effect. Use windowType() to get the type. Also added * permanent toolbar constructor. * the toolbar title in the permanent toolbar constructor. * @history 2018-06-22 Tracie Sucharski - Cleanup destruction of dock widgets and the views they * @history 2018-06-22 Tracie Sucharski - Cleanup destruction of dock widgets and the views they * hold. Extra destroy slots were causing double deletion of memory. * hold. Extra destroy slots were causing double deletion of memory. * @history 2018-06-22 Tracie Sucharski - Added a showEvent handler so that the project clean * @history 2018-06-22 Tracie Sucharski - Added a showEvent handler so that the project clean Loading @@ -164,25 +165,27 @@ namespace Isis { * @history 2018-07-07 Summer Stapleton - Added check in the closeEvent() for changes to any * @history 2018-07-07 Summer Stapleton - Added check in the closeEvent() for changes to any * TemplateEditorWidget currently open to create a pop-up warning/ * TemplateEditorWidget currently open to create a pop-up warning/ * option to save. * option to save. * @history 2018-07-09 Kaitlyn Lee - Added tileViews() and the menu option to tile all docked/undocked * @history 2018-07-09 Kaitlyn Lee - Added tileViews() and the menu option to tile all * and tabbed/untabbed views. Changed removeView() to delete the parent dock widget. * docked/undocked and tabbed/untabbed views. Changed removeView() to * If we do not delete the dock widget, an empty dock widget will remain where the * delete the parent dock widget. If we do not delete the dock widget, * view used to be. * an empty dock widget will remain where the view used to be. * @history 2018-07-10 Tracie Sucharski - Change initial interface of views to tabbed view. * @history 2018-07-10 Tracie Sucharski - Change initial interface of views to tabbed view. * Changed the QMainWindow separator to a different color and wider size * Changed the QMainWindow separator to a different color and wider size * for ease of use. Create the QMainWindow initial size to prevent the * for ease of use. Create the QMainWindow initial size to prevent the * Viewports in CubeDnView from being created as a small size. * Viewports in CubeDnView from being created as a small size. * @history 2018-07-11 Kaitlyn Lee - Added a value in the project settings that stores whether a * @history 2018-07-11 Kaitlyn Lee - Added a value in the project settings that stores whether a * project was in fullscreen or not when saved. If not, we call showNormal() * project was in fullscreen or not when saved. If not, we call * to restore the poject's window size. This also fixes the warning/history tabs * showNormal() to restore the poject's window size. This also fixes the * being misplaced when opening a project. Fixes #5175. * warning/history tabs being misplaced when opening a project. * @history 2018-07-12 Kaitlyn Lee - Removed code that makes the window fullscreen in memory, since this * Fixes #5175. * was causing a project's window size to not be restored when opening from the * @history 2018-07-12 Kaitlyn Lee - Removed code that makes the window fullscreen in memory, * command line. Decreased the size and changed the color of the splitter. * since this was causing a project's window size to not be restored * In writeGlobalSettings(), check to see if the geometry value does not exist * when opening from the command line. Decreased the size and changed * in the config file. This allows the geometry to be saved if the config file * the color of the splitter. In writeGlobalSettings(), check to see if * does not exist and a user opens a project. Before, it would not save the * the geometry value does not exist in the config file. This allows the * geometry because the opened project was not temporary. References #5433 * geometry to be saved if the config file does not exist and a user * opens a project. Before, it would not save the geometry because the * opened project was not temporary. References #5433 */ */ class IpceMainWindow : public QMainWindow { class IpceMainWindow : public QMainWindow { Q_OBJECT Q_OBJECT Loading
isis/src/qisis/objs/AbstractProjectItemView/AbstractProjectItemView.h +15 −12 Original line number Original line Diff line number Diff line Loading @@ -62,25 +62,28 @@ namespace Isis { * to be main windows themselves, changing from an mdi interface to an * to be main windows themselves, changing from an mdi interface to an * sdi interface. * sdi interface. * @history 2018-05-30 Tracie Sucharski - Added the WindowFlag to set this as a Widget. * @history 2018-05-30 Tracie Sucharski - Added the WindowFlag to set this as a Widget. * @history 2018-06-15 Kaitlyn Lee - Removed methods returing toolbar and menu actions because each * @history 2018-06-15 Kaitlyn Lee - Removed methods returing toolbar and menu actions because * individual has its own toolbar. These methods are not needed anymore. * each individual has its own toolbar. These methods are not needed * anymore. * @history 2018-06-18 Summer Stapleton - Overloaded moveEvent and resizeEvent and added a * @history 2018-06-18 Summer Stapleton - Overloaded moveEvent and resizeEvent and added a * windowChangeEvent signal to allow project to recognize a new save * windowChangeEvent signal to allow project to recognize a new save * state. Fixes #5114 * state. Fixes #5114 * @history 2018-06-25 Kaitlyn Lee - When multiple views are open, there is a possibility of getting * @history 2018-06-25 Kaitlyn Lee - When multiple views are open, there is a possibility of * ambiguous shortcut errors. To counter this, we need a way to focus on one * getting ambiguous shortcut errors. To counter this, we need a way to * widget. Giving the views focus did not work completely. Instead, * focus on one widget. Giving the views focus did not work completely. * enabling/disabling actions was the best option. Added enableActions(), * Instead, enabling/disabling actions was the best option. Added * disableActions(), enterEvent(), and leaveEvent(). On default, a view's * enableActions(), disableActions(), enterEvent(), and leaveEvent(). On * actions are disabled. To enable the actions, move the cursor over the view. * default, a view's actions are disabled. To enable the actions, move * When a user moves the cursor outside of the view, the actions are disabled. * the cursor over the view. When a user moves the cursor outside of the * view, the actions are disabled. * @history 2018-07-05 Tracie Sucharski - Added SizePolicy and a large sizeHint. The large * @history 2018-07-05 Tracie Sucharski - Added SizePolicy and a large sizeHint. The large * sizeHint() is because using sizePolicy with a reasonable sizeHint did * sizeHint() is because using sizePolicy with a reasonable sizeHint did * not work to have views fill the available space in the dock area. * not work to have views fill the available space in the dock area. * References #5433. * References #5433. * @history 2018-07-12 Kaitlyn Lee - Changed the sizeHint to be calculated based on the deskTop size, * @history 2018-07-12 Kaitlyn Lee - Changed the sizeHint to be calculated based on the deskTop * instead of being hard-coded. The percentages chosen allow for 2 CubeDnViews * size, instead of being hard-coded. The percentages chosen allow for 2 * to be opened at once, since CubeDnView has an internal size policy. References #5433 * CubeDnViews to be opened at once, since CubeDnView has an internal * size policy. References #5433 */ */ class AbstractProjectItemView : public QMainWindow { class AbstractProjectItemView : public QMainWindow { Loading
isis/src/qisis/objs/CubeDnView/CubeDnView.h +9 −9 Original line number Original line Diff line number Diff line Loading @@ -93,15 +93,15 @@ namespace Isis { * view has its own toolbar, so having getters that return toolbar * view has its own toolbar, so having getters that return toolbar * actions to fill the toolbar of the IpceMainWindow are unnecessary. * actions to fill the toolbar of the IpceMainWindow are unnecessary. * Removed methods that returned menu and toolbar actions. * Removed methods that returned menu and toolbar actions. * Removed connections that connected the project and CubeDnView and called * Removed connections that connected the project and CubeDnView and * enableControlNetTool() because Directory now does this. * called enableControlNetTool() because Directory now does this. * @history 2018-06-25 Kaitlyn Lee - When multiple views are open, there is a possibility of getting * @history 2018-06-25 Kaitlyn Lee - When multiple views are open, there is a possibility of * ambiguous shortcut errors. To counter this, we enable/disable actions. * getting ambiguous shortcut errors. To counter this, we enable/disable * Overrode leaveEvent() to handle open menus causing a leave event. Overrode * actions. Overrode leaveEvent() to handle open menus causing a leave * enable/disableActions() because we need to disable the active toolbar's widgets. * event. Overrode enable/disableActions() because we need to disable * On default, a view's actions are disabled. To enable the actions, move the * the active toolbar's widgets. On default, a view's actions are * cursor over the view. When a user moves the cursor outside of the view, the * disabled. To enable the actions, move the cursor over the view. When * actions are disabled. * a user moves the cursor outside of a view, the actions are disabled. * @history 2018-07-05 Tracie Sucharski - Moved sizeHint and sizePolicy to * @history 2018-07-05 Tracie Sucharski - Moved sizeHint and sizePolicy to * AbstractProjectItemView. References #5433. * AbstractProjectItemView. References #5433. * @history 2018-07-09 Tracie Sucharski - Serialize the objectName for this view so that the * @history 2018-07-09 Tracie Sucharski - Serialize the objectName for this view so that the Loading
isis/src/qisis/objs/Footprint2DView/Footprint2DView.h +9 −8 Original line number Original line Diff line number Diff line Loading @@ -84,12 +84,13 @@ namespace Isis { * Removed methods that returned menu and toolbar actions. * Removed methods that returned menu and toolbar actions. * Made it so that on default and if there is no active control net, * Made it so that on default and if there is no active control net, * the Control Net Tool will be disabled. * the Control Net Tool will be disabled. * Added enableControlNetTool(bool) so when an active control net is set, * Added enableControlNetTool(bool) so when an active control net is * the tool becomes enabled. * set, the tool becomes enabled. * @history 2018-06-25 Kaitlyn Lee - When multiple views are open, there is a possibility of getting * @history 2018-06-25 Kaitlyn Lee - When multiple views are open, there is a possibility of * ambiguous shortcut errors. To counter this, we enable/disable actions. * getting ambiguous shortcut errors. To counter this, we enable/disable * On default, actions are disabled until a user moves the cursor over the view. * actions. On default, actions are disabled until a user moves the * When a user moves the cursor outside of the view, the actions are disabled. * cursor over the view. When a user moves the cursor outside of the * view, the actions are disabled. * @history 2018-07-09 Tracie Sucharski - Serialize the objectName for this view so that the * @history 2018-07-09 Tracie Sucharski - Serialize the objectName for this view so that the * view can be re-created with the same objectName for restoring the * view can be re-created with the same objectName for restoring the * project state. Qt's save/restoreState use the objectName. Remove * project state. Qt's save/restoreState use the objectName. Remove Loading
