reset state machine state when switching from geometry view back to graph view (#13881)

QilongTang · web-flow · commit 88c8eb18a89c · 2023-04-11T10:39:05.000-07:00
diff --git a/src/DynamoCoreWpf/ViewModels/Core/DynamoViewModel.cs b/src/DynamoCoreWpf/ViewModels/Core/DynamoViewModel.cs
@@ -810,6 +810,8 @@ void Watch3DViewModelPropertyChanged(object sender, PropertyChangedEventArgs e)
                     {
                         // Return focus back to Dynamo View
                         OnRequestReturnFocusToView();
+                        // Reset state machine
+                        CurrentSpaceViewModel.CancelActiveState();
                     }
                     break;
             }
diff --git a/src/DynamoCoreWpf/ViewModels/Watch3D/DefaultWatch3DViewModel.cs b/src/DynamoCoreWpf/ViewModels/Watch3D/DefaultWatch3DViewModel.cs
@@ -1,4 +1,4 @@
-﻿using System;
+using System;
 using System.Collections.Generic;
 using System.Collections.Specialized;
 using System.ComponentModel;
@@ -33,11 +33,18 @@ public class Watch3DViewModelStartupParams
         public IPreferences Preferences { get; set; }
         public IEngineControllerManager EngineControllerManager { get; set; }
 
+        /// <summary>
+        /// Constructor
+        /// </summary>
         public Watch3DViewModelStartupParams()
         {
             
         }
 
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        /// <param name="model"></param>
         public Watch3DViewModelStartupParams(DynamoModel model)
         {
             Model = model;
@@ -133,6 +140,9 @@ public virtual bool IsBackgroundPreview
         }
 
         private bool canNavigateBackground = false;
+        /// <summary>
+        /// Indicate if user can natigvate background geometry view
+        /// </summary>
         public bool CanNavigateBackground
         {
             get
@@ -142,15 +152,15 @@ public bool CanNavigateBackground
             set
             {
                 canNavigateBackground = value;
-                Dynamo.Logging.Analytics.TrackScreenView(canNavigateBackground ? "Geometry" : "Nodes");
-                RaisePropertyChanged("CanNavigateBackground");
+                Analytics.TrackScreenView(canNavigateBackground ? "Geometry" : "Nodes");
+                RaisePropertyChanged(nameof(CanNavigateBackground));
             }
         }
 
+        private bool isolationMode;
         /// <summary>
         /// A flag which indicates whether Isolate Selected Geometry mode is activated.
         /// </summary>
-        private bool isolationMode;
         public bool IsolationMode
         {
             get
@@ -554,6 +564,9 @@ public virtual void HighlightNodeGraphics(IEnumerable<NodeModel> nodes)
         public virtual void UnHighlightNodeGraphics(IEnumerable<NodeModel> nodes)
         {
             // Override in derived classes.
+
+            // Reset state machine
+            CurrentSpaceViewModel.CancelActiveState();
         }
 
         private void RegisterNodeEventHandlers(NodeModel node)

Original file line number	Diff line number	Diff line change
`@@ -810,6 +810,8 @@ void Watch3DViewModelPropertyChanged(object sender, PropertyChangedEventArgs e)`
`810`	`810`	`{`
`811`	`811`	`// Return focus back to Dynamo View`
`812`	`812`	`OnRequestReturnFocusToView();`
	`813`	`+ // Reset state machine`
	`814`	`+ CurrentSpaceViewModel.CancelActiveState();`
`813`	`815`	`}`
`814`	`816`	`break;`
`815`	`817`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-using System;`
	`1`	`+using System;`
`2`	`2`	`using System.Collections.Generic;`
`3`	`3`	`using System.Collections.Specialized;`
`4`	`4`	`using System.ComponentModel;`
`@@ -33,11 +33,18 @@ public class Watch3DViewModelStartupParams`
`33`	`33`	`public IPreferences Preferences { get; set; }`
`34`	`34`	`public IEngineControllerManager EngineControllerManager { get; set; }`
`35`	`35`
	`36`	`+ /// <summary>`
	`37`	`+ /// Constructor`
	`38`	`+ /// </summary>`
`36`	`39`	`public Watch3DViewModelStartupParams()`
`37`	`40`	`{`
`38`	`41`
`39`	`42`	`}`
`40`	`43`
	`44`	`+ /// <summary>`
	`45`	`+ /// Constructor`
	`46`	`+ /// </summary>`
	`47`	`+ /// <param name="model"></param>`
`41`	`48`	`public Watch3DViewModelStartupParams(DynamoModel model)`
`42`	`49`	`{`
`43`	`50`	`Model = model;`
`@@ -133,6 +140,9 @@ public virtual bool IsBackgroundPreview`
`133`	`140`	`}`
`134`	`141`
`135`	`142`	`private bool canNavigateBackground = false;`
	`143`	`+ /// <summary>`
	`144`	`+ /// Indicate if user can natigvate background geometry view`
	`145`	`+ /// </summary>`
`136`	`146`	`public bool CanNavigateBackground`
`137`	`147`	`{`
`138`	`148`	`get`
`@@ -142,15 +152,15 @@ public bool CanNavigateBackground`
`142`	`152`	`set`
`143`	`153`	`{`
`144`	`154`	`canNavigateBackground = value;`
`145`		`- Dynamo.Logging.Analytics.TrackScreenView(canNavigateBackground ? "Geometry" : "Nodes");`
`146`		`- RaisePropertyChanged("CanNavigateBackground");`
	`155`	`+ Analytics.TrackScreenView(canNavigateBackground ? "Geometry" : "Nodes");`
	`156`	`+ RaisePropertyChanged(nameof(CanNavigateBackground));`
`147`	`157`	`}`
`148`	`158`	`}`
`149`	`159`
	`160`	`+ private bool isolationMode;`
`150`	`161`	`/// <summary>`
`151`	`162`	`/// A flag which indicates whether Isolate Selected Geometry mode is activated.`
`152`	`163`	`/// </summary>`
`153`		`- private bool isolationMode;`
`154`	`164`	`public bool IsolationMode`
`155`	`165`	`{`
`156`	`166`	`get`
`@@ -554,6 +564,9 @@ public virtual void HighlightNodeGraphics(IEnumerable<NodeModel> nodes)`
`554`	`564`	`public virtual void UnHighlightNodeGraphics(IEnumerable<NodeModel> nodes)`
`555`	`565`	`{`
`556`	`566`	`// Override in derived classes.`
	`567`	`+`
	`568`	`+ // Reset state machine`
	`569`	`+ CurrentSpaceViewModel.CancelActiveState();`
`557`	`570`	`}`
`558`	`571`
`559`	`572`	`private void RegisterNodeEventHandlers(NodeModel node)`