Backed out change to skip resetting of grid removal parameters at loa…

…d for issue #132
markummitchell · Jun 9, 2016 · 776cda4 · 776cda4
1 parent be39ee8
commit 776cda4
Show file tree

Hide file tree

Showing 7 changed files with 2 additions and 28 deletions.
diff --git a/dev/engauge.pro.user.mmitchell.linux b/dev/engauge.pro.user.mmitchell.linux
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 3.0.1, 2016-05-30T14:07:10. -->
+<!-- Written by QtCreator 3.0.1, 2016-06-08T22:08:48. -->
 <qtcreator>
  <data>
   <variable>ProjectExplorer.Project.ActiveTarget</variable>
@@ -230,7 +230,7 @@
     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">engauge</value>
     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
     <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4RunConfiguration:/home/mark/engauge-digitizer/engauge.pro</value>
-    <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.CommandLineArguments">-errorreport ../test/undo_redo.xml -regression</value>
+    <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.CommandLineArguments">-errorreport ../test/cartesian_linear_log.xml -regression</value>
     <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.ProFile">engauge.pro</value>
     <value type="bool" key="Qt4ProjectManager.Qt4RunConfiguration.UseDyldImageSuffix">false</value>
     <value type="bool" key="Qt4ProjectManager.Qt4RunConfiguration.UseTerminal">false</value>

diff --git a/src/CoordSystem/CoordSystem.cpp b/src/CoordSystem/CoordSystem.cpp
@@ -915,12 +915,6 @@ void CoordSystem::setSelectedCurveName(const QString &selectedCurveName)
   m_selectedCurveName = selectedCurveName;
 }
 
-void CoordSystem::setStableAfterLoad ()
-{
-  m_modelGridDisplay.setStable (true);
-  m_modelGridRemoval.setStable ();
-}
-
 bool CoordSystem::successfulRead () const
 {
   return m_successfulRead;

diff --git a/src/CoordSystem/CoordSystem.h b/src/CoordSystem/CoordSystem.h
@@ -146,7 +146,6 @@ class CoordSystem : public CoordSystemInterface
   void setModelPointMatch(const DocumentModelPointMatch &modelPointMatch);
   virtual void setModelSegments(const DocumentModelSegments &modelSegments);
   virtual void setSelectedCurveName(const QString &selectedCurveName);
-  virtual void setStableAfterLoad ();
   virtual bool successfulRead () const;
   virtual void updatePointOrdinals (const Transformation &transformation);
 

diff --git a/src/CoordSystem/CoordSystemContext.cpp b/src/CoordSystem/CoordSystemContext.cpp
@@ -557,13 +557,6 @@ void CoordSystemContext::setSelectedCurveName(const QString &selectedCurveName)
   m_coordSystems [m_coordSystemIndex]->setSelectedCurveName(selectedCurveName);
 }
 
-void CoordSystemContext::setStableAfterLoad ()
-{
-  for (int i = 0; i < m_coordSystems.count(); i++) {
-    m_coordSystems [i]->setStableAfterLoad ();
-  }
-}
-
 bool CoordSystemContext::successfulRead () const
 {
   LOG4CPP_INFO_S ((*mainCat)) << "CoordSystemContext::successfulRead";

diff --git a/src/CoordSystem/CoordSystemContext.h b/src/CoordSystem/CoordSystemContext.h
@@ -146,7 +146,6 @@ class CoordSystemContext : public CoordSystemInterface
   void setModelPointMatch(const DocumentModelPointMatch &modelPointMatch);
   virtual void setModelSegments(const DocumentModelSegments &modelSegments);
   virtual void setSelectedCurveName(const QString &selectedCurveName);
-  virtual void setStableAfterLoad ();
   virtual bool successfulRead () const;
   virtual void updatePointOrdinals (const Transformation &transformation);
 

diff --git a/src/CoordSystem/CoordSystemInterface.h b/src/CoordSystem/CoordSystemInterface.h
@@ -247,14 +247,6 @@ class CoordSystemInterface
   /// Save curve name that is selected for the current coordinate system, for the next time the coordinate system reappears
   virtual void setSelectedCurveName(const QString &selectedCurveName) = 0;
 
-  /// Any unstable flags are set to stable when loading a saved DIG file since:
-  /// -* For huge (6000x3000 pixels) files, the grid removal parameters would otherwise be continually
-  ///    updated (like when the DIG file is loaded) which results in frequent 30 second delays that probably
-  ///    would probably not be helpful for most users (=those not doing grid removal)
-  /// -* Because of the previous point, we can consider the act of saving the file to be the same as
-  ///    accepting the current settings
-  virtual void setStableAfterLoad () = 0;
-
   /// Return true if startup loading succeeded. If the loading failed then reasonForUnsuccessfulRed will explain why
   virtual bool successfulRead () const = 0;
 

diff --git a/src/Document/Document.cpp b/src/Document/Document.cpp
@@ -138,9 +138,6 @@ Document::Document (const QString &fileName) :
                                   .arg (QObject::tr ("was not found"));
 
   }
-
-  // See documentation for CoordSystemContext::setStable
-  m_coordSystemContext.setStableAfterLoad ();
 }
 
 void Document::addCoordSystems(unsigned int numberCoordSystemToAdd)