Repository navigation
Merging master into library reorg branch - #7960
Merged
Merged
Conversation
Fix node help prompt
* Recategorize built-in methods * Added methods for List.cs, Math.cs and ImportExport.cs * Updated Math.MapTo * Updated List.cs * Icons and test cases - built-in methods are hidden from user's search - test cases moved to DSCoreNodesImages.resx - minor refinement to some methods - added test cases for List.cs and Math.cs * Set copy local in DynamoCoreWpfTests to false * Updated methods and test cases - Implementation for SetUnion, SetIntersection and SetDifference are the same as built-in methods - Edited ImportExport.ImportFromCSV to reuse the implementation from built-in - Added test cases for ImportExport.ImportFromCSV and fixed other test cases - Consolidated List.Contains with List.ContainsItem - Consolidated NormalizeDepth(list, rank) with NormalizeDepth(list) - Hid some of the built-in methods - Public methods and private helper methods are grouped using regions - Overload of List.Flatten is renamed as FlattenCompletely * Fixes for built in method test cases * Hide SortIndexByValue overload from builtin * Edited List, Math and ImportExport functions - consolidated CSV.ReadFromFile with ImportExport.ImportFromCSV - renamed ImportFromCSV to ImportCSV - moved CSV.WriteToFile to ImportExport.ExportCSV - fixed some of the list functions - reused builtin implememtations for Math.Map and Math.MapTo - moved test cases for CSV functions to ImportExport * migrations for csv.writetofile replacement of CSV.WriteToFile to ImportExport.ExportCSV * migrations for builtin nodes * Renamed FlattenCompletely and removed GetValues * updated icon for list.flatten * Update List.Flatten test case and revert migration for File.ExportToCSV
Here is the correct branch with the Colorpicker undo functionality
Since I am using the DsColor class for the node there is no need to have the override since it's being controlled there anyway and has been removed.
Duplicate connections using ctrl + click
This fixes the double up of value stores, however it still requires to do an initial undo twice.
* Recover from geometry exceptions thrown during manipulator creation (DynamoDS#7623) * update LibG binaries * cherry-pick: update preloader for ASM223 * remove support for LibG220 * update test frameworks to preload appropriate ASM version * remove ASM220 library version * update LibG binaries for newer ASM 223 version used in Revit2018 * fix flaky test case * recover from geometry exceptions thrown during manipulator creation * fix for graph re-execution after changing scaling * build fix * fix for migration of newly added default arguments * reverting unchanged file * added test case for instance node migration on adding default argument
add undo test
…7811) * Recover from geometry exceptions thrown during manipulator creation (DynamoDS#7623) * update LibG binaries * cherry-pick: update preloader for ASM223 * remove support for LibG220 * update test frameworks to preload appropriate ASM version * remove ASM220 library version * update LibG binaries for newer ASM 223 version used in Revit2018 * fix flaky test case * recover from geometry exceptions thrown during manipulator creation * fix for graph re-execution after changing scaling * build fix * update references to MIConvexHull NuGet package used in Tessellation * added Nuget package config file for MIConvexHull * revert unchanged file * remove xml file
add IsInputNode property back.
only set the undo state when the color picker window closes - this is closer to what is done with slider update tests
Color picker undo fix
Update at level syntax in test case
* Recover from geometry exceptions thrown during manipulator creation (DynamoDS#7623) * update LibG binaries * cherry-pick: update preloader for ASM223 * remove support for LibG220 * update test frameworks to preload appropriate ASM version * remove ASM220 library version * update LibG binaries for newer ASM 223 version used in Revit2018 * fix flaky test case * recover from geometry exceptions thrown during manipulator creation * fix for graph re-execution after changing scaling * build fix * prevent ExportSAT UI node from executing by default * revert unchanged file
start using workspaceViewModel instead of model in all circumstances where we want x y or zoom add x and y to workspaceViewModel which mirror x and y props on model move zoom constants from workspaceModel to workspaceViewModel class
fix constructor for workspaceViewModel needs to set zoom to 1.0
Adjust nuget build file to allow you to specify Dynamo directory.
get rid of constructor default in wsviewmodel for zoom add default into ws constructor for zoom deserialize zoom correctly and set on model
ids serialization and deserialization: merging!
…me-list-structure
Rename ShouldKeepListStructure
stop reading name when reading json for nodes
# Conflicts: # src/DynamoCore/Graph/Workspaces/Serialiaztion/SerializationConverters.cs
* Move workspace functionality into partials. * Make NodeToCode static. * Make graph Layout a static class. * Make Layout and Presets extension classes. * More extensions. * Remove one obsolete test. Use one extension method. * Downgrade one c# language feature to fix build. Make serialization extension methods. * Cleanup missing file references.
Add x and Y to NodeViewModel
Rename InputPorts and OutputPorts
Nickname and PortName should be serialized to Name
Contributor
|
@benglin LGTM! |
Contributor
Author
|
Thanks so much, @aparajit-pratap! 👍 |
benglin
pushed a commit
that referenced
this pull request
Jun 15, 2017
Fix build issues introduced by #7960
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Purpose
This pull request merges
DynamoDS/Dynamo:masterbranch intoDynamoDS/Dynamo:LibraryReorgbranch. There were conflicts in the following files and in most cases changes inLibraryReorgis taken:And for conflicts in resource files, local changes are simply accepted:
Declarations
Check these if you believe they are true
*.resxfilesReviewers
@aparajit-pratap since you have dealt with changes in the above file lists, you can help to see only the first four code changes, the other resource file changes are not possible to review. Thanks!
FYIs
@sharadkjaiswal