Merge branch 'DYN-7923-Curve-Mapper-node' of https://github.com/ivayl…

…o-matov/Dynamo into DYN-7923-Curve-Mapper-node
DynamoDS · Jan 10, 2025 · 68d0945 · 68d0945
2 parents 2bce244 + ce388d5
commit 68d0945
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 52 deletions.
diff --git a/src/Libraries/CoreNodeModelsWpf/CoreNodeModelsWpf.csproj b/src/Libraries/CoreNodeModelsWpf/CoreNodeModelsWpf.csproj
@@ -134,6 +134,9 @@
     <Page Update="Charts\Controls\XYLineChartControl.xaml">
       <XamlRuntime>$(DefaultXamlRuntime)</XamlRuntime>
     </Page>
+    <Page Update="Charts\Controls\CurveMapperControl.xaml">
+      <XamlRuntime>$(DefaultXamlRuntime)</XamlRuntime>
+    </Page>
   </ItemGroup>
   <Target Name="GenerateFiles" AfterTargets="ResolveSateliteResDeps" Condition=" '$(OS)' != 'Unix' ">
     <!-- Generate customization dll -->

diff --git a/src/Libraries/CoreNodeModelsWpf/CoreNodeModelsWpfImages.resx b/src/Libraries/CoreNodeModelsWpf/CoreNodeModelsWpfImages.resx
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!-- 
     Microsoft ResX Schema 
@@ -968,7 +968,7 @@
         BADUJ0MAQH0yBADUJ0MAQH0yBADUJ0MAQHWv/vC/kVnCAi+G/oMAAAAASUVORK5CYII=
 </value>
   </data>
-  <data name="CoreNodeModelsWpf.Charts.CurveMapper.Large" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="CoreNodeModelsWpf.Charts.CurveMapperNodeModel.Large" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAAIAAAACACAYAAADDPmHLAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
         YQUAAAW6SURBVHhe7ZxNih03FIV7Cb0EL8FLyBK8hCzBkKEz8AaMZ5l6AwYPMsrIEAghIdAmCcRNQgwZ
@@ -996,55 +996,9 @@
         uwJ+84slDltMfve9HlBaAOeSwLjFbEVpAZyzuMVshQXQOYUEMLbkO2pxi9mKEgIwO8IC6BwLoHMsgM6x
         ADrHAugcC6BzLIDOsQA6xwLoHAugc1IBxO+2GRah3CfxECoA20yLUO4TPIAFsNAilPsED2ABLLQIpTHG
         GGOMMcYYY4wxxhhjjDHGGGOMMcYYY4wxxhhjTMLV1f+3muueTYv7ygAAAABJRU5ErkJggg==
-</value>
-  </data>
-  <data name="CoreNodeModelsWpf.Charts.CurveMapper.Small" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAACxEAAAsRAX9kX5EAAAI/SURBVFhHzZNNSFRRGIY1qTZOToGgIBYmOFggzmIgKXUX
-        LcqdOzFEjFAycTmBLhSFkCxXCv4NhQvNHzCYIBUFNQZitI1MG7dtwkVRiyE+3w+8cDi+dwIZz7R4mLnP
-        991z3vNz80Qkp1DpEipdQqVLqHQJlYFAID8UChWyWrahMhKJBGOx2AarZRsqcx6geWzj3eje33T0sxyV
-        1TYUsZ5sQSUCLP1Oi0wdiCBAkPWYXC4sutg0tPSyM3602fjs1RPW4weVj15MDg0m0vJ4NvmluLLmn5cR
-        kw/fj073IsillpnkOP73sD4GlXoHlve/C1bTweom2KGy9oXDdUyer8/4LcDzGnzI7mVQqQHiu18PMNAH
-        VjfBagfCzd0PTXfzXlMN3n1vOj+o9L4CDPIJR3CN9ShY7YXebUnoqu0ajmIeQW7b3oZKL4AeAXjKepRb
-        D1rv4vzf+NTqcJknWM2ESi/AlZLrQezCFutRMPmIhmA1BV/FDsbIeImp9ALof6xiFpOE7Z6T7d/VX7vm
-        gd17fqetr5XVPKg0A+jkCDFn98DXYwdGbW+C+1OKHVxlNQ8qzQAKBlmxLxRCvdXbbjoG3v2IIFdZTaHS
-        DoBvugoDbWLS6RPG8Rw33/EDx9CV6RiotAMoGKjt9b7Ijz8iOPtfWH21WfcD4cvxSS6ymkIlC6D0J0Tm
-        volgB07VMoEQFcwrVPoFwEA3FJxpiV07K1T6BTgPqPwvAqRSqZ8gmS3YPAqVLqHSJVS6hEqXUOkSKt0h
-        ecepQ1gqyX7mlgAAAABJRU5ErkJggg==
-</value>
-  </data>
-  <data name="Display.Charts.CurveMapper.Large" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        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
-</value>
+    </value>
   </data>
-  <data name="Display.Charts.CurveMapper.Small" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="CoreNodeModelsWpf.Charts.CurveMapperNodeModel.Small" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
         YQUAAAAJcEhZcwAACxEAAAsRAX9kX5EAAAI/SURBVFhHzZNNSFRRGIY1qTZOToGgIBYmOFggzmIgKXUX
@@ -1058,6 +1012,6 @@
         DoBvugoDbWLS6RPG8Rw33/EDx9CV6RiotAMoGKjt9b7Ijz8iOPtfWH21WfcD4cvxSS6ymkIlC6D0J0Tm
         volgB07VMoEQFcwrVPoFwEA3FJxpiV07K1T6BTgPqPwvAqRSqZ8gmS3YPAqVLqHSJVS6hEqXUOkSKt0h
         ecepQ1gqyX7mlgAAAABJRU5ErkJggg==
-</value>
+    </value>
   </data>
-</root>
+</root>
diff --git a/src/LibraryViewExtensionWebView2/Packages/LibrarieJS/layoutSpecs.json b/src/LibraryViewExtensionWebView2/Packages/LibrarieJS/layoutSpecs.json
@@ -1013,6 +1013,9 @@
                         },
                         {
                             "path": "Display.Charts.Bar Chart"
+                        },
+                        {
+                            "path": "Display.Charts.CurveMapper"
                         }
                     ],
                     "childElements": []
-Original file line number
+Diff line change
@@ Expand Up / @@ -1013,6 +1013,9 @@ @@
                             },
                             {
                                 "path": "Display.Charts.Bar Chart"
+                            },
+                            {
+                                "path": "Display.Charts.CurveMapper"
                             }
                         ],
                         "childElements": []
@@ Expand Down @@