Revert "Do not force redraw when undo/redo is used from Icon/Diagram …

…view." This reverts commit 263c70d.
OpenModelica · Mar 30, 2017 · d7c851f · d7c851f
1 parent 263c70d
commit d7c851f
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 12 deletions.
diff --git a/OMEdit/OMEditGUI/Editors/BaseEditor.cpp b/OMEdit/OMEditGUI/Editors/BaseEditor.cpp
@@ -1698,7 +1698,6 @@ void BaseEditor::initialize()
   mpFindReplaceWidget->hide();
   createActions();
   mForceSetPlainText = false;
-  mTextChanged = false;
   // set the layout
   QVBoxLayout *pMainLayout = new QVBoxLayout;
   pMainLayout->setContentsMargins(0, 0, 0, 0);

diff --git a/OMEdit/OMEditGUI/Editors/BaseEditor.h b/OMEdit/OMEditGUI/Editors/BaseEditor.h
@@ -278,8 +278,6 @@ class BaseEditor : public QWidget
   QAction* getUnFoldAllAction() {return mpUnFoldAllAction;}
   DocumentMarker* getDocumentMarker() {return mpDocumentMarker;}
   void setForceSetPlainText(bool forceSetPlainText) {mForceSetPlainText = forceSetPlainText;}
-  void setTextChanged(bool changed) {mTextChanged = changed;}
-  bool isTextChanged() {return mTextChanged;}
 private:
   void initialize();
   void createActions();
@@ -301,7 +299,6 @@ class BaseEditor : public QWidget
   QAction *mpUnFoldAllAction;
   DocumentMarker *mpDocumentMarker;
   bool mForceSetPlainText;
-  bool mTextChanged;
 
   QMenu* createStandardContextMenu();
 private slots:

diff --git a/OMEdit/OMEditGUI/Editors/CompositeModelEditor.cpp b/OMEdit/OMEditGUI/Editors/CompositeModelEditor.cpp
@@ -57,7 +57,7 @@ QString XMLDocument::toString() const
 
 
 CompositeModelEditor::CompositeModelEditor(QWidget *pParent)
-  : BaseEditor(pParent), mLastValidText("")
+  : BaseEditor(pParent), mLastValidText(""), mTextChanged(false)
 {
   mXmlDocument = XMLDocument(this);
 }
@@ -69,7 +69,7 @@ CompositeModelEditor::CompositeModelEditor(QWidget *pParent)
  */
 bool CompositeModelEditor::validateText()
 {
-  if (isTextChanged()) {
+  if (mTextChanged) {
     // if the user makes few mistakes in the text then dont let him change the perspective
     if (!mpModelWidget->compositeModelEditorTextChanged()) {
       QMessageBox *pMessageBox = new QMessageBox(MainWindow::instance());
@@ -87,17 +87,17 @@ bool CompositeModelEditor::validateText()
       int answer = pMessageBox->exec();
       switch (answer) {
         case QMessageBox::RejectRole:
-          setTextChanged(false);
+          mTextChanged = false;
           // revert back to last correct version
           setPlainText(mLastValidText);
           return true;
         case QMessageBox::AcceptRole:
         default:
-          setTextChanged(true);
+          mTextChanged = true;
           return false;
       }
     } else {
-      setTextChanged(false);
+      mTextChanged = false;
       mLastValidText = mpPlainTextEdit->toPlainText();
     }
   }
@@ -1270,7 +1270,6 @@ void CompositeModelEditor::setPlainText(const QString &text, bool useInserText)
       textCursor.insertText(mXmlDocument.toString());
       textCursor.endEditBlock();
     }
-    setTextChanged(false);
     mForceSetPlainText = false;
     mLastValidText = text;
   }
@@ -1301,7 +1300,7 @@ void CompositeModelEditor::contentsHasChanged(int position, int charsRemoved, in
         mpModelWidget->setWindowTitle(QString(mpModelWidget->getLibraryTreeItem()->getName()).append("*"));
         mpModelWidget->getLibraryTreeItem()->setIsSaved(false);
         MainWindow::instance()->getLibraryWidget()->getLibraryTreeModel()->updateLibraryTreeItem(mpModelWidget->getLibraryTreeItem());
-        setTextChanged(true);
+        mTextChanged = true;
       }
     }
   }

diff --git a/OMEdit/OMEditGUI/Editors/CompositeModelEditor.h b/OMEdit/OMEditGUI/Editors/CompositeModelEditor.h
@@ -96,6 +96,7 @@ class CompositeModelEditor : public BaseEditor
   bool deleteConnection(QString startComponentName, QString endComponentName);
 private:
   QString mLastValidText;
+  bool mTextChanged;
   XMLDocument mXmlDocument;
 
   bool existInterfacePoint(QString subModelName, QString interfaceName);

diff --git a/OMEdit/OMEditGUI/Editors/ModelicaEditor.cpp b/OMEdit/OMEditGUI/Editors/ModelicaEditor.cpp
@@ -51,7 +51,7 @@
  * \param pParent
  */
 ModelicaEditor::ModelicaEditor(QWidget *pParent)
-  : BaseEditor(pParent), mLastValidText("")
+  : BaseEditor(pParent), mLastValidText(""), mTextChanged(false)
 {
   mpPlainTextEdit->setCanHaveBreakpoints(true);
   /* set the document marker */

diff --git a/OMEdit/OMEditGUI/Editors/ModelicaEditor.h b/OMEdit/OMEditGUI/Editors/ModelicaEditor.h
@@ -55,8 +55,11 @@ class ModelicaEditor : public BaseEditor
   QString removeLeadingSpaces(QString contents);
   void storeLeadingSpaces(QMap<int, int> leadingSpacesMap);
   QString getPlainText();
+  void setTextChanged(bool changed) {mTextChanged = changed;}
+  bool isTextChanged() {return mTextChanged;}
 private:
   QString mLastValidText;
+  bool mTextChanged;
 private slots:
   virtual void showContextMenu(QPoint point);
 public slots: