Remove Show/Hide geometry preview upstream (#9294)

QilongTang · web-flow · commit d7eb46eec0c5 · 2018-12-07T11:38:11.000-05:00
* Remove Show/Hide geometry preview upstream

* Remove all resource strings related

* clean-ups
diff --git a/src/DynamoCoreWpf/Commands/WorkspaceCommands.cs b/src/DynamoCoreWpf/Commands/WorkspaceCommands.cs
@@ -265,7 +265,7 @@ public bool IsGeometryOperationEnabled
                     return false; // No selection.
 
                 // Menu options that are specific to geometry (show/hide all 
-                // geometry previews, upstream previews, etc.) are only enabled
+                // geometry previews, etc.) are only enabled
                 // in the home workspace.
                 // 
                 return (this.Model is HomeWorkspaceModel);
diff --git a/src/DynamoCoreWpf/Properties/Resources.Designer.cs b/src/DynamoCoreWpf/Properties/Resources.Designer.cs
diff --git a/src/DynamoCoreWpf/Properties/Resources.en-US.resx b/src/DynamoCoreWpf/Properties/Resources.en-US.resx
@@ -285,10 +285,6 @@
     <value>Hide all text bubble</value>
     <comment>Context menu item - Specific to canvas</comment>
   </data>
-  <data name="ContextMenuHideUpstreamPreview" xml:space="preserve">
-    <value>Hide upstream geometry preview</value>
-    <comment>Context menu item - Specific to canvas</comment>
-  </data>
   <data name="ContextMenuInsertCodeBlock" xml:space="preserve">
     <value>Insert code block</value>
     <comment>Context menu item - Specific to canvas</comment>
@@ -349,10 +345,6 @@
     <value>Show all text buble</value>
     <comment>Context menu item - Specific to canvas</comment>
   </data>
-  <data name="ContextMenuShowUpstreamPreview" xml:space="preserve">
-    <value>Show upstream geometry preview</value>
-    <comment>Context menu item - Specific to canvas</comment>
-  </data>
   <data name="ContextUnGroupFromSelection" xml:space="preserve">
     <value>Remove from Group</value>
     <comment>Context menu item</comment>
@@ -881,7 +873,7 @@ It does not contain your graph or any personal data</value>
     <comment>Settings menu | Geometry Scaling</comment>
   </data>
   <data name="DynamoViewSettingsMenuIsolationMode" xml:space="preserve">
-    <value>Isolate Selected Geometries</value>
+    <value>Isolate Selected Geometry</value>
   </data>
   <data name="DynamoViewSettingsMenuShowEdges" xml:space="preserve">
     <value>Show Edges</value>
@@ -1455,10 +1447,6 @@ Uninstall the following dependent packages: {1}?</value>
     <value>Preview</value>
     <comment>Context menu item - preview geometry</comment>
   </data>
-  <data name="NodeContextMenuPreviewUpstream" xml:space="preserve">
-    <value>Preview Upstream</value>
-    <comment>Context menu item - preview geometry of upstream nodes</comment>
-  </data>
   <data name="NodeContextMenuRenameNode" xml:space="preserve">
     <value>Rename Node...</value>
     <comment>Context menu item - rename this node</comment>
@@ -1619,10 +1607,10 @@ Next assemblies were loaded several times:
     <value>Package Path Added</value>
   </data>
   <data name="PackagePathAutoAddNotificationShortDescription" xml:space="preserve">
-    <value>A library (*.dll, *.ds) was recently imported into Dynamo. Its path was automatically added to "Settings > Manage Node and Package Paths..."</value>
+    <value>A library (*.dll, *.ds) was recently imported into Dynamo. Its path was automatically added to "Settings &gt; Manage Node and Package Paths..."</value>
   </data>
   <data name="PackagePathAutoAddNotificationDetailedDescription" xml:space="preserve">
-    <value>The import path "{0}" was added to "Manage Node and Package Paths". If you want to update or remove this path, please open "Settings > Manage Node and Package Paths..."</value>
+    <value>The import path "{0}" was added to "Manage Node and Package Paths". If you want to update or remove this path, please open "Settings &gt; Manage Node and Package Paths..."</value>
   </data>
   <data name="PackageSearchStateNoResult" xml:space="preserve">
     <value>Search returned no results!</value>
@@ -1855,9 +1843,6 @@ Want to publish a different package?</value>
   <data name="PublishPackageViewPackageVersion" xml:space="preserve">
     <value>Version (major minor build)</value>
   </data>
-  <data name="DynamoViewSettingsMenuIsolationMode" xml:space="preserve">
-    <value>Isolate Selected Geometry</value>
-  </data>
   <data name="PublishPackageViewPackageVersionTooltip" xml:space="preserve">
     <value>A version name helps a submitter keep track of updates to the package.  A new version of a package will be REJECTED if this is not incremeneted.</value>
   </data>
diff --git a/src/DynamoCoreWpf/Properties/Resources.resx b/src/DynamoCoreWpf/Properties/Resources.resx
@@ -740,10 +740,6 @@ It does not contain your graph or any personal data</value>
     <value>Preview</value>
     <comment>Context menu item - preview geometry</comment>
   </data>
-  <data name="NodeContextMenuPreviewUpstream" xml:space="preserve">
-    <value>Preview Upstream</value>
-    <comment>Context menu item - preview geometry of upstream nodes</comment>
-  </data>
   <data name="NodeContextMenuRenameNode" xml:space="preserve">
     <value>Rename Node...</value>
     <comment>Context menu item - rename this node</comment>
@@ -1702,10 +1698,6 @@ Do you want to install the latest Dynamo update?</value>
     <value>Hide all text bubble</value>
     <comment>Context menu item - Specific to canvas</comment>
   </data>
-  <data name="ContextMenuHideUpstreamPreview" xml:space="preserve">
-    <value>Hide upstream geometry preview</value>
-    <comment>Context menu item - Specific to canvas</comment>
-  </data>
   <data name="ContextMenuInsertCodeBlock" xml:space="preserve">
     <value>Insert code block</value>
     <comment>Context menu item - Specific to canvas</comment>
@@ -1722,10 +1714,6 @@ Do you want to install the latest Dynamo update?</value>
     <value>Show all text buble</value>
     <comment>Context menu item - Specific to canvas</comment>
   </data>
-  <data name="ContextMenuShowUpstreamPreview" xml:space="preserve">
-    <value>Show upstream geometry preview</value>
-    <comment>Context menu item - Specific to canvas</comment>
-  </data>
   <data name="MoreButton" xml:space="preserve">
     <value>More</value>
     <comment>The "More" button on "Publish a Dynamo Package" dialog</comment>
@@ -1961,10 +1949,10 @@ Do you want to install the latest Dynamo update?</value>
     <value>Package Path Added</value>
   </data>
   <data name="PackagePathAutoAddNotificationShortDescription" xml:space="preserve">
-    <value>A library (*.dll, *.ds) was recently imported into Dynamo. Its path was automatically added to "Settings > Manage Node and Package Paths..."</value>
+    <value>A library (*.dll, *.ds) was recently imported into Dynamo. Its path was automatically added to "Settings &gt; Manage Node and Package Paths..."</value>
   </data>
   <data name="PackagePathAutoAddNotificationDetailedDescription" xml:space="preserve">
-    <value>The import path "{0}" was added to "Manage Node and Package Paths". If you want to update or remove this path, please open "Settings > Manage Node and Package Paths..."</value>
+    <value>The import path "{0}" was added to "Manage Node and Package Paths". If you want to update or remove this path, please open "Settings &gt; Manage Node and Package Paths..."</value>
   </data>
   <data name="NodeContextMenuIsInput" xml:space="preserve">
     <value>Is Input</value>
diff --git a/src/DynamoCoreWpf/ViewModels/Core/WorkspaceViewModel.cs b/src/DynamoCoreWpf/ViewModels/Core/WorkspaceViewModel.cs
@@ -1379,7 +1379,6 @@ private void RefreshViewOnSelectionChange(object sender, NotifyCollectionChanged
             RaisePropertyChanged("HasSelection");
             RaisePropertyChanged("IsGeometryOperationEnabled");
             RaisePropertyChanged("AnyNodeVisible");
-            RaisePropertyChanged("AnyNodeUpstreamVisible");
             RaisePropertyChanged("SelectionArgumentLacing");            
         }
     }
diff --git a/src/DynamoCoreWpf/Views/Core/WorkspaceView.xaml b/src/DynamoCoreWpf/Views/Core/WorkspaceView.xaml
@@ -397,18 +397,6 @@
                           CommandParameter="false"
                           Visibility="{Binding Path=AnyNodeVisible, Converter={StaticResource BooleanToVisibilityCollapsedConverter}}" />
 
-                    <MenuItem IsEnabled="{Binding Path=IsGeometryOperationEnabled}"
-                          Header="{x:Static  p:Resources.ContextMenuShowUpstreamPreview}"
-                          Command="{Binding Path=ShowHideAllUpstreamPreviewCommand}"
-                          CommandParameter="true"
-                          Visibility="{Binding Path=AnyNodeUpstreamVisible, Converter={StaticResource InverseBoolToVisibilityCollapsedConverter}}" />
-
-                    <MenuItem IsEnabled="{Binding Path=IsGeometryOperationEnabled}"
-                          Header="{x:Static p:Resources.ContextMenuHideUpstreamPreview}"
-                          Command="{Binding Path=ShowHideAllUpstreamPreviewCommand}"
-                          CommandParameter="false"
-                          Visibility="{Binding Path=AnyNodeUpstreamVisible, Converter={StaticResource BooleanToVisibilityCollapsedConverter}}" />
-
                     <controls:ParentMenuItem  Header="{x:Static p:Resources.DynamoViewEditMenuAlignSelection}" x:Name="Align">
                         <MenuItem  Header="{x:Static p:Resources.DynamoViewEditMenuAlignXAverage}"
                                Command="{Binding AlignSelectedCommand}"
diff --git a/src/VisualizationTests/HelixWatch3DViewModelTests.cs b/src/VisualizationTests/HelixWatch3DViewModelTests.cs
@@ -172,7 +172,7 @@ public void Node_RenderingUpToDate()
         }
 
         [Test]
-        public void Node_PreviewUpstreamToggled_RenderingUpToDate()
+        public void Node_PreviewToggled_RenderingUpToDate()
         {
             var model = ViewModel.Model;
 
@@ -183,7 +183,7 @@ public void Node_PreviewUpstreamToggled_RenderingUpToDate()
             //we start with all previews disabled
             //the graph is two points feeding into a line
 
-            //ensure that visulations match our expectations
+            //ensure that visualizations match our expectations
             Assert.True(BackgroundPreviewGeometry.HasNumberOfPointsCurvesAndMeshes(7, 6, 0));
 
             var watch3D = Model.CurrentWorkspace.FirstNodeFromWorkspace<Watch3D>();

Original file line number	Diff line number	Diff line change
`@@ -1379,7 +1379,6 @@ private void RefreshViewOnSelectionChange(object sender, NotifyCollectionChanged`
`1379`	`1379`	`RaisePropertyChanged("HasSelection");`
`1380`	`1380`	`RaisePropertyChanged("IsGeometryOperationEnabled");`
`1381`	`1381`	`RaisePropertyChanged("AnyNodeVisible");`
`1382`		`- RaisePropertyChanged("AnyNodeUpstreamVisible");`
`1383`	`1382`	`RaisePropertyChanged("SelectionArgumentLacing");`
`1384`	`1383`	`}`
`1385`	`1384`	`}`
Original file line number	Diff line number	Diff line change
`@@ -172,7 +172,7 @@ public void Node_RenderingUpToDate()`
`172`	`172`	`}`
`173`	`173`
`174`	`174`	`[Test]`
`175`		`- public void Node_PreviewUpstreamToggled_RenderingUpToDate()`
	`175`	`+ public void Node_PreviewToggled_RenderingUpToDate()`
`176`	`176`	`{`
`177`	`177`	`var model = ViewModel.Model;`
`178`	`178`
`@@ -183,7 +183,7 @@ public void Node_PreviewUpstreamToggled_RenderingUpToDate()`
`183`	`183`	`//we start with all previews disabled`
`184`	`184`	`//the graph is two points feeding into a line`
`185`	`185`
`186`		`- //ensure that visulations match our expectations`
	`186`	`+ //ensure that visualizations match our expectations`
`187`	`187`	`Assert.True(BackgroundPreviewGeometry.HasNumberOfPointsCurvesAndMeshes(7, 6, 0));`
`188`	`188`
`189`	`189`	`var watch3D = Model.CurrentWorkspace.FirstNodeFromWorkspace<Watch3D>();`