Commit 0ddc66b5 authored by Tracie Sucharski's avatar Tracie Sucharski
Browse files

Changed the defaults for the spatial and spectral plot curves to :solid line,... 

Changed the defaults for the spatial and spectral plot curves to :solid line, line width=1, no symbols.

git-svn-id: http://subversion.wr.usgs.gov/repos/prog/isis3/trunk@5777 41f8697f-d340-4b68-9986-7bafba869bb8
parent b60b3075

isis/src/qisis/objs/SpatialPlotTool/SpatialPlotTool.cpp

+3 −1
Original line number Diff line number Diff line
@@ -269,13 +269,15 @@ namespace Isis { 
            m_xUnitsCombo->currentIndex()).toInt();



      QPen spatialPen(Qt::white);

      spatialPen.setWidth(2);

      spatialPen.setWidth(1);

      spatialPen.setStyle(Qt::SolidLine);



      foreach (MdiCubeViewport *viewport, viewportsToPlot()) {

        if (!(*m_spatialCurves)[viewport] ||

            (*m_spatialCurves)[viewport]->xUnits() != targetUnits) {

          CubePlotCurve *plotCurve = createCurve("DN Values", spatialPen,

              targetUnits, CubePlotCurve::CubeDN);

          plotCurve->setMarkerSymbol(QwtSymbol::NoSymbol);

          m_spatialCurves->insert(viewport, plotCurve);

          targetWindow->add(plotCurve);

        }

isis/src/qisis/objs/SpatialPlotTool/SpatialPlotTool.h

+3 −0
Original line number Diff line number Diff line
@@ -45,6 +45,9 @@ namespace Isis { 
   *                           instead of Projection.  References #775.

   *   @history 2013-01-24 Steven Lambright - Fixed positioning of portal/interpolator used

   *                           when reading DN data to create a plot. Fixes #997.

   *   @history 2014-04-15 Tracie Sucharski - Reset defaults for plots to the following:

   *                         SolidLine, Width=1, NoSymbols.  This is a temporary fix until

   *                         the defaults can be saved on a user basis.  Fixes #2062.

   */

  class SpatialPlotTool : public AbstractPlotTool {

      Q_OBJECT

isis/src/qisis/objs/SpectralPlotTool/SpectralPlotTool.cpp

+15 −8
Original line number Diff line number Diff line
@@ -458,23 +458,23 @@ namespace Isis { 
            m_displayCombo->currentIndex()).toInt();



      QPen avgPen(Qt::white);

      avgPen.setWidth(2);

      avgPen.setStyle(Qt::NoPen);

      avgPen.setWidth(1);

      avgPen.setStyle(Qt::SolidLine);



      QPen minMaxPen(Qt::cyan);

//       minMaxPen.setStyle(Qt::DashLine);

      minMaxPen.setWidth(2);

      minMaxPen.setStyle(Qt::NoPen);

      minMaxPen.setWidth(1);

      minMaxPen.setStyle(Qt::SolidLine);



      QPen stdDevPen(Qt::red);

      stdDevPen.setWidth(2);

      stdDevPen.setWidth(1);

//       stdDevPen.setStyle(Qt::DotLine);

      stdDevPen.setStyle(Qt::NoPen);

      stdDevPen.setStyle(Qt::SolidLine);



      QPen stdErrPen(Qt::green);

      stdErrPen.setWidth(2);

      stdErrPen.setWidth(1);

//       stdErrPen.setStyle(Qt::DotLine);

      stdErrPen.setStyle(Qt::NoPen);

      stdErrPen.setStyle(Qt::SolidLine);



      foreach (MdiCubeViewport *viewport, viewportsToPlot()) {

        if (m_plotAvgAction->isChecked() &&
@@ -482,6 +482,7 @@ namespace Isis { 
            (*m_avgCurves)[viewport]->xUnits() != targetUnits)) {

          CubePlotCurve *plotCurve = createCurve("Average", avgPen,

              targetUnits, CubePlotCurve::CubeDN);

          plotCurve->setMarkerSymbol(QwtSymbol::NoSymbol);

          m_avgCurves->insert(viewport, plotCurve);

          targetWindow->add(plotCurve);

        }
@@ -491,6 +492,7 @@ namespace Isis { 
            (*m_minCurves)[viewport]->xUnits() != targetUnits)) {

          CubePlotCurve *plotCurve = createCurve("Minimum", minMaxPen,

              targetUnits, CubePlotCurve::CubeDN);

          plotCurve->setMarkerSymbol(QwtSymbol::NoSymbol);

          m_minCurves->insert(viewport, plotCurve);

          targetWindow->add(plotCurve);

        }
@@ -500,6 +502,7 @@ namespace Isis { 
            (*m_maxCurves)[viewport]->xUnits() != targetUnits)) {

          CubePlotCurve *plotCurve = createCurve("Maximum", minMaxPen,

              targetUnits, CubePlotCurve::CubeDN);

          plotCurve->setMarkerSymbol(QwtSymbol::NoSymbol);

          m_maxCurves->insert(viewport, plotCurve);

          targetWindow->add(plotCurve);

        }
@@ -509,6 +512,7 @@ namespace Isis { 
            (*m_stdDev1Curves)[viewport]->xUnits() != targetUnits)) {

          CubePlotCurve *plotCurve = createCurve("+ Sigma", stdDevPen,

              targetUnits, CubePlotCurve::CubeDN);

          plotCurve->setMarkerSymbol(QwtSymbol::NoSymbol);

          m_stdDev1Curves->insert(viewport, plotCurve);

          targetWindow->add(plotCurve);

        }
@@ -518,6 +522,7 @@ namespace Isis { 
            (*m_stdDev2Curves)[viewport]->xUnits() != targetUnits)) {

          CubePlotCurve *plotCurve = createCurve("- Sigma", stdDevPen,

              targetUnits, CubePlotCurve::CubeDN);

          plotCurve->setMarkerSymbol(QwtSymbol::NoSymbol);

          m_stdDev2Curves->insert(viewport, plotCurve);

          targetWindow->add(plotCurve);

        }
@@ -527,6 +532,7 @@ namespace Isis { 
            (*m_stdErr1Curves)[viewport]->xUnits() != targetUnits)) {

          CubePlotCurve *plotCurve = createCurve("+ Std Error", stdErrPen,

              targetUnits, CubePlotCurve::CubeDN);

          plotCurve->setMarkerSymbol(QwtSymbol::NoSymbol);

          m_stdErr1Curves->insert(viewport, plotCurve);

          targetWindow->add(plotCurve);

        }
@@ -536,6 +542,7 @@ namespace Isis { 
            (*m_stdErr2Curves)[viewport]->xUnits() != targetUnits)) {

          CubePlotCurve *plotCurve = createCurve("- Std Error", stdErrPen,

              targetUnits, CubePlotCurve::CubeDN);

          plotCurve->setMarkerSymbol(QwtSymbol::NoSymbol);

          m_stdErr2Curves->insert(viewport, plotCurve);

          targetWindow->add(plotCurve);

        }

isis/src/qisis/objs/SpectralPlotTool/SpectralPlotTool.h

+3 −0
Original line number Diff line number Diff line
@@ -46,6 +46,9 @@ namespace Isis { 
   *                         when graphing by not displaying them. Fixes #234.

   *   @history 2012-02-16 Steven Lambright and Jai Rideout - Added standard

   *                         error of the mean curves. Fixes #713.

   *   @history 2014-04-03 Tracie Sucharski - Reset defaults for plots to the following:

   *                         SolidLine, Width=1, NoSymbols.  This is a temporary fix until

   *                         the defaults can be saved on a user basis.  Fixes #2062.

   */

  class SpectralPlotTool : public AbstractPlotTool {

      Q_OBJECT