Skip to content

Commit d7eb46e

Browse files
QilongTangQilongTang
authored
Remove Show/Hide geometry preview upstream (#9294)
* Remove Show/Hide geometry preview upstream * Remove all resource strings related * clean-ups
1 parent 34a15ef commit d7eb46e

File tree

7 files changed

+8
-75
lines changed

7 files changed

+8
-75
lines changed

‎src/DynamoCoreWpf/Commands/WorkspaceCommands.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -265,7 +265,7 @@ public bool IsGeometryOperationEnabled
265265
return false; // No selection.
266266

267267
// Menu options that are specific to geometry (show/hide all
268-
// geometry previews, upstream previews, etc.) are only enabled
268+
// geometry previews, etc.) are only enabled
269269
// in the home workspace.
270270
//
271271
return (this.Model is HomeWorkspaceModel);

‎src/DynamoCoreWpf/Properties/Resources.Designer.cs

Lines changed: 0 additions & 27 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/DynamoCoreWpf/Properties/Resources.en-US.resx

Lines changed: 3 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -285,10 +285,6 @@
285285
<value>Hide all text bubble</value>
286286
<comment>Context menu item - Specific to canvas</comment>
287287
</data>
288-
<data name="ContextMenuHideUpstreamPreview" xml:space="preserve">
289-
<value>Hide upstream geometry preview</value>
290-
<comment>Context menu item - Specific to canvas</comment>
291-
</data>
292288
<data name="ContextMenuInsertCodeBlock" xml:space="preserve">
293289
<value>Insert code block</value>
294290
<comment>Context menu item - Specific to canvas</comment>
@@ -349,10 +345,6 @@
349345
<value>Show all text buble</value>
350346
<comment>Context menu item - Specific to canvas</comment>
351347
</data>
352-
<data name="ContextMenuShowUpstreamPreview" xml:space="preserve">
353-
<value>Show upstream geometry preview</value>
354-
<comment>Context menu item - Specific to canvas</comment>
355-
</data>
356348
<data name="ContextUnGroupFromSelection" xml:space="preserve">
357349
<value>Remove from Group</value>
358350
<comment>Context menu item</comment>
@@ -881,7 +873,7 @@ It does not contain your graph or any personal data</value>
881873
<comment>Settings menu | Geometry Scaling</comment>
882874
</data>
883875
<data name="DynamoViewSettingsMenuIsolationMode" xml:space="preserve">
884-
<value>Isolate Selected Geometries</value>
876+
<value>Isolate Selected Geometry</value>
885877
</data>
886878
<data name="DynamoViewSettingsMenuShowEdges" xml:space="preserve">
887879
<value>Show Edges</value>
@@ -1455,10 +1447,6 @@ Uninstall the following dependent packages: {1}?</value>
14551447
<value>Preview</value>
14561448
<comment>Context menu item - preview geometry</comment>
14571449
</data>
1458-
<data name="NodeContextMenuPreviewUpstream" xml:space="preserve">
1459-
<value>Preview Upstream</value>
1460-
<comment>Context menu item - preview geometry of upstream nodes</comment>
1461-
</data>
14621450
<data name="NodeContextMenuRenameNode" xml:space="preserve">
14631451
<value>Rename Node...</value>
14641452
<comment>Context menu item - rename this node</comment>
@@ -1619,10 +1607,10 @@ Next assemblies were loaded several times:
16191607
<value>Package Path Added</value>
16201608
</data>
16211609
<data name="PackagePathAutoAddNotificationShortDescription" xml:space="preserve">
1622-
<value>A library (*.dll, *.ds) was recently imported into Dynamo. Its path was automatically added to "Settings > Manage Node and Package Paths..."</value>
1610+
<value>A library (*.dll, *.ds) was recently imported into Dynamo. Its path was automatically added to "Settings &gt; Manage Node and Package Paths..."</value>
16231611
</data>
16241612
<data name="PackagePathAutoAddNotificationDetailedDescription" xml:space="preserve">
1625-
<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>
1613+
<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>
16261614
</data>
16271615
<data name="PackageSearchStateNoResult" xml:space="preserve">
16281616
<value>Search returned no results!</value>
@@ -1855,9 +1843,6 @@ Want to publish a different package?</value>
18551843
<data name="PublishPackageViewPackageVersion" xml:space="preserve">
18561844
<value>Version (major minor build)</value>
18571845
</data>
1858-
<data name="DynamoViewSettingsMenuIsolationMode" xml:space="preserve">
1859-
<value>Isolate Selected Geometry</value>
1860-
</data>
18611846
<data name="PublishPackageViewPackageVersionTooltip" xml:space="preserve">
18621847
<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>
18631848
</data>

‎src/DynamoCoreWpf/Properties/Resources.resx

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -740,10 +740,6 @@ It does not contain your graph or any personal data</value>
740740
<value>Preview</value>
741741
<comment>Context menu item - preview geometry</comment>
742742
</data>
743-
<data name="NodeContextMenuPreviewUpstream" xml:space="preserve">
744-
<value>Preview Upstream</value>
745-
<comment>Context menu item - preview geometry of upstream nodes</comment>
746-
</data>
747743
<data name="NodeContextMenuRenameNode" xml:space="preserve">
748744
<value>Rename Node...</value>
749745
<comment>Context menu item - rename this node</comment>
@@ -1702,10 +1698,6 @@ Do you want to install the latest Dynamo update?</value>
17021698
<value>Hide all text bubble</value>
17031699
<comment>Context menu item - Specific to canvas</comment>
17041700
</data>
1705-
<data name="ContextMenuHideUpstreamPreview" xml:space="preserve">
1706-
<value>Hide upstream geometry preview</value>
1707-
<comment>Context menu item - Specific to canvas</comment>
1708-
</data>
17091701
<data name="ContextMenuInsertCodeBlock" xml:space="preserve">
17101702
<value>Insert code block</value>
17111703
<comment>Context menu item - Specific to canvas</comment>
@@ -1722,10 +1714,6 @@ Do you want to install the latest Dynamo update?</value>
17221714
<value>Show all text buble</value>
17231715
<comment>Context menu item - Specific to canvas</comment>
17241716
</data>
1725-
<data name="ContextMenuShowUpstreamPreview" xml:space="preserve">
1726-
<value>Show upstream geometry preview</value>
1727-
<comment>Context menu item - Specific to canvas</comment>
1728-
</data>
17291717
<data name="MoreButton" xml:space="preserve">
17301718
<value>More</value>
17311719
<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>
19611949
<value>Package Path Added</value>
19621950
</data>
19631951
<data name="PackagePathAutoAddNotificationShortDescription" xml:space="preserve">
1964-
<value>A library (*.dll, *.ds) was recently imported into Dynamo. Its path was automatically added to "Settings > Manage Node and Package Paths..."</value>
1952+
<value>A library (*.dll, *.ds) was recently imported into Dynamo. Its path was automatically added to "Settings &gt; Manage Node and Package Paths..."</value>
19651953
</data>
19661954
<data name="PackagePathAutoAddNotificationDetailedDescription" xml:space="preserve">
1967-
<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>
1955+
<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>
19681956
</data>
19691957
<data name="NodeContextMenuIsInput" xml:space="preserve">
19701958
<value>Is Input</value>

‎src/DynamoCoreWpf/ViewModels/Core/WorkspaceViewModel.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1379,7 +1379,6 @@ private void RefreshViewOnSelectionChange(object sender, NotifyCollectionChanged
13791379
RaisePropertyChanged("HasSelection");
13801380
RaisePropertyChanged("IsGeometryOperationEnabled");
13811381
RaisePropertyChanged("AnyNodeVisible");
1382-
RaisePropertyChanged("AnyNodeUpstreamVisible");
13831382
RaisePropertyChanged("SelectionArgumentLacing");
13841383
}
13851384
}

‎src/DynamoCoreWpf/Views/Core/WorkspaceView.xaml

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -397,18 +397,6 @@
397397
CommandParameter="false"
398398
Visibility="{Binding Path=AnyNodeVisible, Converter={StaticResource BooleanToVisibilityCollapsedConverter}}" />
399399

400-
<MenuItem IsEnabled="{Binding Path=IsGeometryOperationEnabled}"
401-
Header="{x:Static p:Resources.ContextMenuShowUpstreamPreview}"
402-
Command="{Binding Path=ShowHideAllUpstreamPreviewCommand}"
403-
CommandParameter="true"
404-
Visibility="{Binding Path=AnyNodeUpstreamVisible, Converter={StaticResource InverseBoolToVisibilityCollapsedConverter}}" />
405-
406-
<MenuItem IsEnabled="{Binding Path=IsGeometryOperationEnabled}"
407-
Header="{x:Static p:Resources.ContextMenuHideUpstreamPreview}"
408-
Command="{Binding Path=ShowHideAllUpstreamPreviewCommand}"
409-
CommandParameter="false"
410-
Visibility="{Binding Path=AnyNodeUpstreamVisible, Converter={StaticResource BooleanToVisibilityCollapsedConverter}}" />
411-
412400
<controls:ParentMenuItem Header="{x:Static p:Resources.DynamoViewEditMenuAlignSelection}" x:Name="Align">
413401
<MenuItem Header="{x:Static p:Resources.DynamoViewEditMenuAlignXAverage}"
414402
Command="{Binding AlignSelectedCommand}"

‎src/VisualizationTests/HelixWatch3DViewModelTests.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ public void Node_RenderingUpToDate()
172172
}
173173

174174
[Test]
175-
public void Node_PreviewUpstreamToggled_RenderingUpToDate()
175+
public void Node_PreviewToggled_RenderingUpToDate()
176176
{
177177
var model = ViewModel.Model;
178178

@@ -183,7 +183,7 @@ public void Node_PreviewUpstreamToggled_RenderingUpToDate()
183183
//we start with all previews disabled
184184
//the graph is two points feeding into a line
185185

186-
//ensure that visulations match our expectations
186+
//ensure that visualizations match our expectations
187187
Assert.True(BackgroundPreviewGeometry.HasNumberOfPointsCurvesAndMeshes(7, 6, 0));
188188

189189
var watch3D = Model.CurrentWorkspace.FirstNodeFromWorkspace<Watch3D>();

0 commit comments

Comments
 (0)