Revert "Merge branch 'master' of https://github.com/DynamoDS/Dynamo"

This reverts commit 085fb51, reversing changes made to d055de4.
DynamoDS · Dec 10, 2018 · 12538ab · 12538ab
1 parent 085fb51
commit 12538ab
Show file tree

Hide file tree

Showing 32 changed files with 97 additions and 4,065 deletions.
diff --git a/src/DynamoCore/DynamoCore.csproj b/src/DynamoCore/DynamoCore.csproj
@@ -78,8 +78,8 @@ limitations under the License.
     <Reference Include="Analytics.NET.Google">
       <HintPath>..\..\extern\Analytics.NET\Analytics.NET.Google.dll</HintPath>
     </Reference>
-    <Reference Include="Greg, Version=1.1.6913.31484, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Greg.1.1.6913.31484\lib\net47\Greg.dll</HintPath>
+    <Reference Include="Greg, Version=1.1.6907.32055, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Greg.1.1.6907.32055\lib\net45\Greg.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="Newtonsoft.Json, Version=8.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">

diff --git a/src/DynamoCore/packages.config b/src/DynamoCore/packages.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Greg" version="1.1.6913.31484" targetFramework="net47" />
+  <package id="Greg" version="1.1.6907.32055" targetFramework="net47" />
   <package id="Newtonsoft.Json" version="8.0.3" targetFramework="net45" />
   <package id="RestSharp" version="105.2.3" targetFramework="net47" />
 </packages>
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, etc.) are only enabled
+                // geometry previews, upstream previews, etc.) are only enabled
                 // in the home workspace.
                 // 
                 return (this.Model is HomeWorkspaceModel);

diff --git a/src/DynamoCoreWpf/DynamoCoreWpf.csproj b/src/DynamoCoreWpf/DynamoCoreWpf.csproj
@@ -50,8 +50,8 @@
     <Reference Include="FontAwesome.WPF">
       <HintPath>..\..\extern\FontAwesome\FontAwesome.WPF.dll</HintPath>
     </Reference>
-    <Reference Include="Greg, Version=1.1.6913.31484, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Greg.1.1.6913.31484\lib\net47\Greg.dll</HintPath>
+    <Reference Include="Greg, Version=1.1.6907.32055, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Greg.1.1.6907.32055\lib\net45\Greg.dll</HintPath>
     </Reference>
     <Reference Include="HelixToolkit, Version=2015.1.629.0, Culture=neutral, PublicKeyToken=52aa3500039caf0d, processorArchitecture=MSIL">
       <HintPath>..\packages\HelixToolkit.2015.1.629\lib\portable-net4+sl4+wp71+win8\HelixToolkit.dll</HintPath>

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,6 +285,10 @@
     <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>
@@ -345,6 +349,10 @@
     <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>
@@ -873,7 +881,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 Geometry</value>
+    <value>Isolate Selected Geometries</value>
   </data>
   <data name="DynamoViewSettingsMenuShowEdges" xml:space="preserve">
     <value>Show Edges</value>
@@ -1451,6 +1459,10 @@ 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>
@@ -1611,10 +1623,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 &gt; Manage Node and Package Paths..."</value>
+    <value>A library (*.dll, *.ds) was recently imported into Dynamo. Its path was automatically added to "Settings > 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 &gt; 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 > Manage Node and Package Paths..."</value>
   </data>
   <data name="PackageSearchStateNoResult" xml:space="preserve">
     <value>Search returned no results!</value>
@@ -1847,6 +1859,9 @@ 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,6 +740,10 @@ 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,6 +1706,10 @@ 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>
@@ -1718,6 +1726,10 @@ 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>
@@ -1953,10 +1965,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 &gt; Manage Node and Package Paths..."</value>
+    <value>A library (*.dll, *.ds) was recently imported into Dynamo. Its path was automatically added to "Settings > 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 &gt; 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 > 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,6 +1379,7 @@ 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,6 +397,18 @@
                           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/DynamoCoreWpf/packages.config b/src/DynamoCoreWpf/packages.config
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Cyotek.Drawing.BitmapFont" version="1.0.2.0" targetFramework="net45" />
-  <package id="Greg" version="1.1.6913.31484" targetFramework="net47" />
+  <package id="Greg" version="1.1.6907.32055" targetFramework="net47" />
   <package id="HelixToolkit" version="2015.1.629" targetFramework="net45" />
   <package id="HelixToolkit.Wpf" version="2015.1.629" targetFramework="net45" />
   <package id="HelixToolkit.Wpf.SharpDX" version="2015.1.629" targetFramework="net45" />

diff --git a/src/DynamoPackages/DynamoPackages.csproj b/src/DynamoPackages/DynamoPackages.csproj
@@ -39,8 +39,8 @@
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Greg, Version=1.1.6913.31484, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Greg.1.1.6913.31484\lib\net47\Greg.dll</HintPath>
+    <Reference Include="Greg, Version=1.1.6907.32055, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Greg.1.1.6907.32055\lib\net45\Greg.dll</HintPath>
     </Reference>
     <Reference Include="Newtonsoft.Json, Version=8.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
       <HintPath>..\packages\Newtonsoft.Json.8.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>

diff --git a/src/DynamoPackages/packages.config b/src/DynamoPackages/packages.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Greg" version="1.1.6913.31484" targetFramework="net47" />
+  <package id="Greg" version="1.1.6907.32055" targetFramework="net47" />
   <package id="Newtonsoft.Json" version="8.0.3" targetFramework="net45" />
   <package id="RestSharp" version="105.2.3" targetFramework="net47" />
 </packages>
diff --git a/src/Libraries/CoreNodes/CoreNodes.csproj b/src/Libraries/CoreNodes/CoreNodes.csproj
@@ -74,7 +74,6 @@
     <Compile Include="Compare.cs" />
     <Compile Include="DateTime.cs" />
     <Compile Include="FileSystem.cs" />
-    <Compile Include="Data.cs" />
     <Compile Include="List.cs" />
     <Compile Include="Math.cs" />
     <Compile Include="Object.cs" />

diff --git a/src/Libraries/CoreNodes/Data.cs b/src/Libraries/CoreNodes/Data.cs
diff --git a/src/LibraryViewExtension/LibraryViewExtension.csproj b/src/LibraryViewExtension/LibraryViewExtension.csproj
@@ -37,8 +37,8 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Greg, Version=1.1.6913.31484, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Greg.1.1.6913.31484\lib\net47\Greg.dll</HintPath>
+    <Reference Include="Greg, Version=1.1.6907.32055, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Greg.1.1.6907.32055\lib\net45\Greg.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Practices.Prism, Version=4.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>

diff --git a/src/LibraryViewExtension/packages.config b/src/LibraryViewExtension/packages.config
@@ -4,7 +4,7 @@
   <package id="cef.redist.x86" version="3.3325.1758" targetFramework="net452" />
   <package id="CefSharp.Common" version="65.0.1" targetFramework="net452" />
   <package id="CefSharp.Wpf" version="65.0.1" targetFramework="net452" />
-  <package id="Greg" version="1.1.6913.31484" targetFramework="net47" />
+  <package id="Greg" version="1.1.6907.32055" targetFramework="net47" />
   <package id="Newtonsoft.Json" version="8.0.3" targetFramework="net45" />
   <package id="RestSharp" version="105.2.3" targetFramework="net47" />
 </packages>