Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove Show/Hide geometry preview upstream #9294

Merged
merged 3 commits into from
Dec 7, 2018
Merged

Remove Show/Hide geometry preview upstream #9294

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
84b566a
Remove Show/Hide geometry preview upstream
QilongTang Dec 6, 2018
a852793
Remove all resource strings related
QilongTang Dec 6, 2018
72f77d0
clean-ups
QilongTang Dec 6, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/DynamoCoreWpf/Commands/WorkspaceCommands.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
27 changes: 0 additions & 27 deletions src/DynamoCoreWpf/Properties/Resources.Designer.cs
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

21 changes: 3 additions & 18 deletions src/DynamoCoreWpf/Properties/Resources.en-US.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We are probably going to see this happening more in VS2017 now, converting special characters to syntax automatically. I don't think there are any repercussions opening it back up in VS2015.

</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>
Expand Down Expand Up @@ -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>
Expand Down
16 changes: 2 additions & 14 deletions src/DynamoCoreWpf/Properties/Resources.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand All @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
1 change: 0 additions & 1 deletion src/DynamoCoreWpf/ViewModels/Core/WorkspaceViewModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1379,7 +1379,6 @@ private void RefreshViewOnSelectionChange(object sender, NotifyCollectionChanged
RaisePropertyChanged("HasSelection");
RaisePropertyChanged("IsGeometryOperationEnabled");
RaisePropertyChanged("AnyNodeVisible");
RaisePropertyChanged("AnyNodeUpstreamVisible");
RaisePropertyChanged("SelectionArgumentLacing");
}
}
Expand Down
12 changes: 0 additions & 12 deletions src/DynamoCoreWpf/Views/Core/WorkspaceView.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}"
Expand Down
4 changes: 2 additions & 2 deletions src/VisualizationTests/HelixWatch3DViewModelTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ public void Node_RenderingUpToDate()
}

[Test]
public void Node_PreviewUpstreamToggled_RenderingUpToDate()
public void Node_PreviewToggled_RenderingUpToDate()
{
var model = ViewModel.Model;

Expand All @@ -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>();
Expand Down