Fixing Ghost warning

sm6srw · Mar 14, 2023 · 04c14c1 · 04c14c1
1 parent 16caf9b
commit 04c14c1
Show file tree

Hide file tree

Showing 4 changed files with 65 additions and 26 deletions.
diff --git a/src/DynamoCore/Graph/Nodes/NodeModel.cs b/src/DynamoCore/Graph/Nodes/NodeModel.cs
@@ -1912,6 +1912,31 @@ public void NotifyAstBuildBroken(string p)
             infos.Add(new Info(p, ElementState.AstBuildBroken));
         }
 
+        public void UpdateAssociatedWarning(string fileFromPathNodeName, string imageReadFromFileNodeName)
+        {
+
+            if (this.Name == imageReadFromFileNodeName && this.InputNodes.Count > 0)
+            {
+                if (this.InputNodes.First().Value != null)
+                {
+                    var previousNode = this.InputNodes.First().Value.Item2;
+
+
+                    if (previousNode != null && previousNode.Name == fileFromPathNodeName)
+                    {
+                        if (this.Infos.Count > 0)
+                        {
+                            previousNode.State = ElementState.AssociatedWarning;
+                        }
+                        else
+                        {
+                            previousNode.State = ElementState.Active;
+                        }
+                    }
+                }
+            }
+        }
+
         #endregion
 
         #region Port Management
@@ -2914,6 +2939,7 @@ public enum ElementState
         Active,
         Warning,
         PersistentWarning,
+        AssociatedWarning,
         Error,
         AstBuildBroken,
         Info

diff --git a/src/DynamoCoreWpf/UI/Converters.cs b/src/DynamoCoreWpf/UI/Converters.cs
@@ -1736,19 +1736,21 @@ public object ConvertBack(object value, Type targetType, object parameter, Syste
     /// <summary>
     /// Hides (collapses) if the zoom level is larger than the designated value
     /// </summary>
-    public class ZoomToVisibilityCollapsedConverter : IValueConverter
+    public class ZoomToVisibilityCollapsedConverter : IMultiValueConverter
     {
-        public object Convert(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture)
+        public object Convert(object[] values, Type targetType, object parameter, System.Globalization.CultureInfo culture)
         {
-            double number = (double)System.Convert.ChangeType(value, typeof(double));
+            double number = (double)System.Convert.ChangeType(values[0], typeof(double));
+            ElementState state = (ElementState)values[1];
+            bool nodeWarningBarVisible = (bool)values[2];
 
-            if (number > Configurations.ZoomThreshold)
-                return Visibility.Collapsed;
+            if (number < Configurations.ZoomThreshold && (state == ElementState.AssociatedWarning || nodeWarningBarVisible))
+                return Visibility.Visible;
 
-            return Visibility.Visible;    
+            return Visibility.Collapsed;
         }
 
-        public object ConvertBack(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture)
+        public object[] ConvertBack(object values, Type[] targetTypes, object parameter, System.Globalization.CultureInfo culture)
         {
             throw new NotSupportedException();
         }

diff --git a/src/DynamoCoreWpf/ViewModels/Core/NodeViewModel.cs b/src/DynamoCoreWpf/ViewModels/Core/NodeViewModel.cs
@@ -1342,8 +1342,7 @@ Pass through all possible states in reverse order
                     ImgGlyphThreeSource = infoGlyph;
                 }
             }
-
-            if (NodeModel.State == ElementState.Warning || NodeModel.State == ElementState.PersistentWarning)
+            if (NodeModel.State == ElementState.Warning || NodeModel.State == ElementState.PersistentWarning || NodeModel.State == ElementState.AssociatedWarning)
             {
                 result = warningColor;
                 if (ImgGlyphTwoSource == null)
@@ -1366,7 +1365,7 @@ Pass through all possible states in reverse order
                 {
                     ImgGlyphThreeSource = errorGlyph;
                 }
-            }
+            }            
 
             return result;
         }
@@ -1399,15 +1398,20 @@ private void DisposeErrorBubble()
             ErrorBubble.PropertyChanged -= ErrorBubble_PropertyChanged;
 
             ErrorBubble.Dispose();
-        }
+        }        
 
         public void UpdateBubbleContent()
         {
             if (DynamoViewModel == null) return;
 
-            bool hasErrorOrWarning = NodeModel.IsInErrorState || NodeModel.State == ElementState.Warning; 
+            bool hasErrorOrWarning = NodeModel.IsInErrorState || NodeModel.State == ElementState.Warning;
             bool isNodeStateInfo = NodeModel.State == ElementState.Info;
 
+            var fileFromPathNode = typeof(CoreNodeModels.Input.FileObject).GetCustomAttributes(typeof(NodeNameAttribute), true).FirstOrDefault() as NodeNameAttribute;
+            string imageReadFromFileNodeName = "Image.ReadFromFile";
+
+            NodeModel.UpdateAssociatedWarning(fileFromPathNode.Name, imageReadFromFileNodeName);
+
             // Persistent warnings should continue to be displayed even if nodes are not involved in an execution as they can include:
             // 1. Compile-time warnings in CBNs
             // 2. Obsolete nodes with warnings
@@ -1488,7 +1492,7 @@ public void UpdateBubbleContent()
                 }
                 HandleColorOverlayChange();
             }
-            ErrorBubble.ChangeInfoBubbleStateCommand.Execute(InfoBubbleViewModel.State.Pinned);            
+            ErrorBubble.ChangeInfoBubbleStateCommand.Execute(InfoBubbleViewModel.State.Pinned);
         }
 
         private void UpdateErrorBubblePosition()

diff --git a/src/DynamoCoreWpf/Views/Core/NodeView.xaml b/src/DynamoCoreWpf/Views/Core/NodeView.xaml
@@ -1,4 +1,4 @@
-<UserControl x:Class="Dynamo.Controls.NodeView"
+<UserControl x:Class="Dynamo.Controls.NodeView"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:configuration="clr-namespace:Dynamo.Configuration;assembly=DynamoCore"
@@ -601,11 +601,15 @@
                 CornerRadius="8,8,0,0"
                 IsHitTestVisible="False"
                 Opacity="0.5"
-                Style="{StaticResource SZoomFadeInPreview}"
-                Visibility="{Binding Path=DataContext.Zoom, 
-                                     RelativeSource={RelativeSource FindAncestor, 
-                                     AncestorType={x:Type controls:WorkspaceView}}, 
-                                     Converter={StaticResource ZoomToVisibilityCollapsedConverter}}" />
+                Style="{StaticResource SZoomFadeInPreview}">
+            <Border.Visibility>
+                <MultiBinding Converter="{StaticResource ZoomToVisibilityCollapsedConverter}">
+                    <Binding Path="DataContext.Zoom" RelativeSource="{RelativeSource FindAncestor,AncestorType={x:Type controls:WorkspaceView}}"/>
+                    <Binding Path="State"/>
+                    <Binding Path="NodeWarningBarVisible"/>
+                </MultiBinding>
+            </Border.Visibility>
+        </Border>
 
         <!-- Grid containing the State overlay Glyphs in Zoomed Out state -->
         <Grid Name="zoomGlyphsGrid"
@@ -617,12 +621,15 @@
                     IsHitTestVisible="False"
                     Margin="0 5 0 0"
                     HorizontalAlignment="Stretch" VerticalAlignment="Stretch" 
-                    Style="{StaticResource SZoomFadeInFrameworkElement}"                    
-                    Visibility="{Binding Path=DataContext.Zoom, 
-                                         RelativeSource={RelativeSource FindAncestor, 
-                                         AncestorType={x:Type controls:WorkspaceView}}, 
-                                         Converter={StaticResource ZoomToVisibilityCollapsedConverter}}" 
-                    MinWidth="48">
+                    Style="{StaticResource SZoomFadeInFrameworkElement}"
+              MinWidth="48">
+            <Grid.Visibility>
+                <MultiBinding Converter="{StaticResource ZoomToVisibilityCollapsedConverter}">
+                    <Binding Path="DataContext.Zoom" RelativeSource="{RelativeSource FindAncestor,AncestorType={x:Type controls:WorkspaceView}}"/>
+                    <Binding Path="State"/>
+                    <Binding Path="NodeWarningBarVisible"/>
+                </MultiBinding>
+            </Grid.Visibility>
             <Grid.RowDefinitions>
                 <RowDefinition Height="{Binding ImgGlyphThreeSource, Mode=OneWay, Converter={StaticResource EmptyToZeroLengthConverter}, UpdateSourceTrigger=PropertyChanged}" />
                 <RowDefinition></RowDefinition>
@@ -734,4 +741,4 @@
             <Label HorizontalContentAlignment="Center" Content="{Binding ASTText}" />
         </Canvas>
     </Grid>
-</UserControl>
+</UserControl>