[CORRECTIVE] Fix expression editor messing up expression when overwri…

…ting pre-existing value or a section of the value. Should fix issue #108.
kactus2 · Jul 3, 2024 · 8fd2ee3 · 8fd2ee3
1 parent 255be9d
commit 8fd2ee3
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 12 deletions.
diff --git a/editors/ComponentEditor/common/MasterExpressionEditor.cpp b/editors/ComponentEditor/common/MasterExpressionEditor.cpp
@@ -77,7 +77,7 @@ void MasterExpressionEditor::finishEditingCurrentWord()
     if (shouldChangeTerm)
     {
         expression_ = replaceNthWordWith(currentWordIndex(), expression_, finishedWord);
-    
+
         if (currentWordIsUniqueParameterName())
         {
             complete(nameCompleter_->currentIndex());
@@ -118,7 +118,7 @@ void MasterExpressionEditor::handleKeyPressEvent(QKeyEvent* keyEvent)
     {
         if (hasSelection())
         {
-            removeSelectionInExpression();
+            replaceSelectionInExpression(keyEvent);
         }
         else if (removesOperatorBeforeWord(keyEvent))
         {
@@ -479,7 +479,7 @@ bool MasterExpressionEditor::keyMovesCursor(QKeyEvent* keyEvent) const
 //-----------------------------------------------------------------------------
 // Function: ExpressionLineEditor::removeSelectionInExpression()
 //-----------------------------------------------------------------------------
-void MasterExpressionEditor::removeSelectionInExpression()
+void MasterExpressionEditor::replaceSelectionInExpression(QKeyEvent* keyEvent)
 {
     QString selectedText = getSelectedText();
 
@@ -490,6 +490,7 @@ void MasterExpressionEditor::removeSelectionInExpression()
 
     int firstTermPos = indexOfNthWord(firstWord, expression_);
     expression_.remove(expression_.indexOf(selectedText, firstTermPos), selectedText.length());
+    expression_.insert(firstTermPos, keyEvent->text()); // Don't just remove selection, also insert whatever was typed.
 }
 
 //-----------------------------------------------------------------------------

diff --git a/editors/ComponentEditor/common/MasterExpressionEditor.h b/editors/ComponentEditor/common/MasterExpressionEditor.h
@@ -418,9 +418,11 @@ class MasterExpressionEditor
     bool keyMovesCursor(QKeyEvent* keyEvent) const;
 
     /*!
-     *  Removes the current selection in the underlying expression.
+     *  Replaces the current selection in the underlying expression with whatever was typed.
+     *      
+     *      @param [in] keyEvent    The event to check.
      */
-    void removeSelectionInExpression();
+    void replaceSelectionInExpression(QKeyEvent* keyEvent);
 
     /*!
      *  Replaces the references in the underlying expression with the referenced names.

diff --git a/version.h b/version.h
@@ -10,20 +10,20 @@
 #ifndef VERSIONNO__H
 #define VERSIONNO__H
 
-#define VERSION_FULL           3.13.449.0
+#define VERSION_FULL           3.13.474.0
 
 #define VERSION_BASEYEAR       0
 #define VERSION_DATE           "2024-07-03"
-#define VERSION_TIME           "09:59:59"
+#define VERSION_TIME           "16:41:00"
 
 #define VERSION_MAJOR          3
 #define VERSION_MINOR          13
-#define VERSION_BUILDNO        449
+#define VERSION_BUILDNO        474
 #define VERSION_EXTEND         0
 
-#define VERSION_FILE           3,13,449,0
-#define VERSION_PRODUCT        3,13,449,0
-#define VERSION_FILESTR        "3,13,449,0"
-#define VERSION_PRODUCTSTR     "3,13,449,0"
+#define VERSION_FILE           3,13,474,0
+#define VERSION_PRODUCT        3,13,474,0
+#define VERSION_FILESTR        "3,13,474,0"
+#define VERSION_PRODUCTSTR     "3,13,474,0"
 
 #endif