Commit 1851ae4e authored by Tracie Sucharski's avatar Tracie Sucharski
Browse files

Fixed bug introduced when changing plot defaults. References #2062. 

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

isis/src/qisis/objs/PlotCurve/PlotCurve.cpp

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ namespace Isis { 
   * properties.

   */

  PlotCurve::PlotCurve(Units xUnits, Units yUnits)  : QwtPlotCurve() {

    m_markerSymbol.setStyle(QwtSymbol::XCross);

    m_markerSymbol.setStyle(QwtSymbol::NoSymbol);

    m_markerSymbol.setSize(6, 6);

    m_color = QColor(Qt::white);

    m_xUnits = xUnits;

isis/src/qisis/objs/PlotCurve/PlotCurve.h

+3 −0
Original line number Diff line number Diff line
@@ -37,6 +37,9 @@ namespace Isis { 
   *   @history 2012-01-20 Steven Lambright - Completed documentation.

   *   @history 2012-07-03 Steven Lambright - Added Meters, Kilometers to the Units enum.

   *                           References #853.

   *   @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 PlotCurve : public QwtPlotCurve {

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

+0 −1
Original line number Diff line number Diff line
@@ -277,7 +277,6 @@ namespace Isis { 
            (*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/SpectralPlotTool/SpectralPlotTool.cpp

+0 −7
Original line number Diff line number Diff line
@@ -482,7 +482,6 @@ 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);

        }
@@ -492,7 +491,6 @@ 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);

        }
@@ -502,7 +500,6 @@ 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);

        }
@@ -512,7 +509,6 @@ 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);

        }
@@ -522,7 +518,6 @@ 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);

        }
@@ -532,7 +527,6 @@ 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);

        }
@@ -542,7 +536,6 @@ 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);

        }