Commit ba6c89aa authored by Tracie Sucharski's avatar Tracie Sucharski
Browse files

Removed unused experimental code.

parent 404f57cd
Loading
Loading
Loading
Loading
+8 −14
Original line number Diff line number Diff line
@@ -150,7 +150,6 @@ namespace Isis {
                         QDockWidget::DockWidgetFloatable);
    historyDock->setWhatsThis(tr("This shows all operations performed on the current project."));
    historyDock->setAllowedAreas(Qt::BottomDockWidgetArea);
    addDockWidget(Qt::BottomDockWidgetArea, historyDock);
    m_directory->setHistoryContainer(historyDock);
    tabifyDockWidget(m_warningsDock, historyDock);

@@ -221,14 +220,18 @@ namespace Isis {
      m_specialDocks.append(dock);
    }
    else {
      // The following logic not guaranteed to work as intented. If user moves one of the "special"
      // views such as sensor from below the project dock to the right side of project, the following
      // Desired behavior of docking views:
      // First regular view (footprint,cubeDisplay) is added to the right of the "special" views
      // (project, sensor, jigsaw, controlHealth).  Adding additional "regular" views are tabbed
      // with the last "regular" view which was added.
      // The following logic not guaranteed to work as intended. If user moves one of the "special"
      // views such as sensor from below the project dock to the right of the project, the following
      // will put the new dock to the right of the moved "special" dock instead of tabbing.  The only
      // way to possibly insure the intended functionality would be to check for the position of the
      // way to possibly ensure the intended functionality would be to check for the position of the
      // last added dock and either add or tabify depending on location.  This might also allow the
      // docks to be kept in a single list instead of m_specialDocks & m_viewDocks.
      if (m_viewDocks.count() == 0) {
        addDockWidget(Qt::RightDockWidgetArea, dock, Qt::Horizontal);
        addDockWidget(Qt::LeftDockWidgetArea, dock, Qt::Horizontal);
      }
      else {
        tabifyDockWidget(m_viewDocks.last(), dock);
@@ -244,15 +247,6 @@ namespace Isis {
    connect(dock, SIGNAL(destroyed(QObject *)), newWidget, SLOT(deleteLater()));
    // The list of dock widgets needs cleanup as each view is destroyed
    connect(dock, SIGNAL(destroyed(QObject *)), this, SLOT(cleanupViewDockList(QObject *)));

    // Redmine #5471 TODO Hiding the centralWidget in this constructor gets rid of the space which
    // is a place holder for the dumy centralWidget, which causes the project view to fill the space
    // horizontally and the history/warning widgets are show much larger vertically and user is not
    // able to make smaller. Attempts to change the sizePolicy on the history/warning widgets did
    // not fix this (see Directory::setHistoryContainer, Directory::setWarningContainer.  Calling
    // hide here keeps the project tree view smaller until a view is shown, however, the history/
    // warning widgets are still too large vertically.
    // centralWidget()->hide();
  }


+0 −13
Original line number Diff line number Diff line
@@ -518,15 +518,6 @@ namespace Isis {
  void Directory::setHistoryContainer(QDockWidget *historyContainer) {
    if (!m_historyTreeWidget) {
      m_historyTreeWidget = new HistoryTreeWidget( project() );

      // Redmine #5471 TODO: The sizePolicy calls were an attempt to remove the centralWidget from
      // IpceMainWindow to get rid of some odd behaviors with docking widgets.
      // 2 following sizePolicy: warning/history looks good until view added, then too large vertically - can't make smaller, just larger
      //m_historyTreeWidget->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Expanding);
      //m_historyTreeWidget->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::MinimumExpanding);
      // This keeps small after adding view, but it cannot be made larger , so keeps at sizeHint which is good
      //m_historyTreeWidget->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Maximum);
      //m_historyTreeWidget->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred);
    }
    historyContainer->setWidget(m_historyTreeWidget);
  }
@@ -539,10 +530,6 @@ namespace Isis {
  void Directory::setWarningContainer(QDockWidget *warningContainer) {
    if (!m_warningTreeWidget) {
      m_warningTreeWidget = new WarningTreeWidget;

      // Redmine #5471 TODO: The sizePolicy calls were an attempt to remove the centralWidget from
      // IpceMainWindow to get rid of some odd behaviors with docking widgets.
      //m_warningTreeWidget->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred);
    }
    warningContainer->setWidget(m_warningTreeWidget);
  }
+0 −1
Original line number Diff line number Diff line
@@ -267,7 +267,6 @@ namespace Isis {
   *                           the close/open control net from reloadActiveControlInCnetEditorView
   *                           to Project::setActiveControl to prevent seg fault when there are
   *                           multiple cnetEditorViews with same cnet.
   *   @history 2018-07-26 Tracie Sucharski - Added some documentation. 
   */
  class Directory : public QObject {
    Q_OBJECT