commit 21aaef67761a6212078e109da16e8491b5b020e3 Author: Ankitkumar Satapara Date: Fri Apr 17 22:31:58 2026 +0530 Add project files. diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 0000000..942f07f --- /dev/null +++ b/.editorconfig @@ -0,0 +1,48 @@ + +[*.{c,c++,cc,cginc,compute,cp,cpp,cu,cuh,cxx,h,hh,hlsl,hlsli,hlslinc,hpp,hxx,inc,inl,ino,ipp,mpp,mq4,mq5,mqh,tpp,usf,ush}] +indent_style = tab +indent_size = tab +tab_width = 4 + +[*.{asax,ascx,aspx,axaml,cs,cshtml,css,htm,html,js,jsx,master,paml,razor,skin,ts,tsx,vb,xaml,xamlx,xoml}] +indent_style = space +indent_size = 4 +tab_width = 4 + +[*.{appxmanifest,axml,build,config,csproj,dbml,discomap,dtd,json,jsproj,lsproj,njsproj,nuspec,proj,props,resjson,resw,resx,StyleCop,targets,tasks,vbproj,xml,xsd}] +indent_style = space +indent_size = 2 +tab_width = 2 + +[*] + +# Microsoft .NET properties +csharp_new_line_before_members_in_object_initializers = false +csharp_preferred_modifier_order = public, private, protected, internal, new, abstract, virtual, sealed, override, static, readonly, extern, unsafe, volatile, async:suggestion +csharp_style_var_for_built_in_types = false:suggestion +dotnet_style_parentheses_in_arithmetic_binary_operators = never_if_unnecessary:none +dotnet_style_parentheses_in_other_binary_operators = never_if_unnecessary:none +dotnet_style_parentheses_in_relational_binary_operators = never_if_unnecessary:none +dotnet_style_predefined_type_for_locals_parameters_members = true:suggestion +dotnet_style_predefined_type_for_member_access = true:suggestion +dotnet_style_qualification_for_event = false:suggestion +dotnet_style_qualification_for_field = false:suggestion +dotnet_style_qualification_for_method = false:suggestion +dotnet_style_qualification_for_property = false:suggestion +dotnet_style_require_accessibility_modifiers = for_non_interface_members:suggestion + +# ReSharper properties +resharper_for_built_in_types = use_var_when_evident +resharper_for_simple_types = use_var_when_evident + +# ReSharper inspection severities +resharper_arrange_object_creation_when_type_evident_highlighting = none +resharper_arrange_redundant_parentheses_highlighting = hint +resharper_arrange_this_qualifier_highlighting = hint +resharper_arrange_type_member_modifiers_highlighting = hint +resharper_arrange_type_modifiers_highlighting = hint +resharper_built_in_type_reference_style_for_member_access_highlighting = hint +resharper_built_in_type_reference_style_highlighting = hint +resharper_merge_sequential_patterns_highlighting = none +resharper_redundant_base_qualifier_highlighting = warning +resharper_suggest_var_or_type_built_in_types_highlighting = hint diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..1ff0c42 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,63 @@ +############################################################################### +# Set default behavior to automatically normalize line endings. +############################################################################### +* text=auto + +############################################################################### +# Set default behavior for command prompt diff. +# +# This is need for earlier builds of msysgit that does not have it on by +# default for csharp files. +# Note: This is only used by command line +############################################################################### +#*.cs diff=csharp + +############################################################################### +# Set the merge driver for project and solution files +# +# Merging from the command prompt will add diff markers to the files if there +# are conflicts (Merging from VS is not affected by the settings below, in VS +# the diff markers are never inserted). Diff markers may cause the following +# file extensions to fail to load in VS. An alternative would be to treat +# these files as binary and thus will always conflict and require user +# intervention with every merge. To do so, just uncomment the entries below +############################################################################### +#*.sln merge=binary +#*.csproj merge=binary +#*.vbproj merge=binary +#*.vcxproj merge=binary +#*.vcproj merge=binary +#*.dbproj merge=binary +#*.fsproj merge=binary +#*.lsproj merge=binary +#*.wixproj merge=binary +#*.modelproj merge=binary +#*.sqlproj merge=binary +#*.wwaproj merge=binary + +############################################################################### +# behavior for image files +# +# image files are treated as binary by default. +############################################################################### +#*.jpg binary +#*.png binary +#*.gif binary + +############################################################################### +# diff behavior for common document formats +# +# Convert binary document formats to text before diffing them. This feature +# is only available from the command line. Turn it on by uncommenting the +# entries below. +############################################################################### +#*.doc diff=astextplain +#*.DOC diff=astextplain +#*.docx diff=astextplain +#*.DOCX diff=astextplain +#*.dot diff=astextplain +#*.DOT diff=astextplain +#*.pdf diff=astextplain +#*.PDF diff=astextplain +#*.rtf diff=astextplain +#*.RTF diff=astextplain diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml new file mode 100644 index 0000000..6359d68 --- /dev/null +++ b/.github/FUNDING.yml @@ -0,0 +1,4 @@ +# These are supported funding model platforms + +github: miroiu +custom: ["https://www.buymeacoffee.com/miroiu", "https://paypal.me/miroiuemanuel"] diff --git a/.github/ISSUE_TEMPLATE/add_example_app.md b/.github/ISSUE_TEMPLATE/add_example_app.md new file mode 100644 index 0000000..cbd4ab5 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/add_example_app.md @@ -0,0 +1,17 @@ +--- +name: "\U0001F680 Example application" +about: Suggest an example application that others can benefit from +title: "[Application]" +labels: application +assignees: miroiu + +--- + +**Describe the application** +A clear and concise description of what the application is doing. + +**Screenshots** +If applicable, add screenshots. + +**Additional context** +Add any other context here. diff --git a/.github/ISSUE_TEMPLATE/ask-a-question.md b/.github/ISSUE_TEMPLATE/ask-a-question.md new file mode 100644 index 0000000..117be2b --- /dev/null +++ b/.github/ISSUE_TEMPLATE/ask-a-question.md @@ -0,0 +1,10 @@ +--- +name: "❓ Ask a question" +about: Need help or have a question? +title: "[Question]" +labels: question +assignees: miroiu + +--- + + diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md new file mode 100644 index 0000000..6cf7d0a --- /dev/null +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -0,0 +1,30 @@ +--- +name: "\U0001F41B Bug report" +about: Create a bug report to help this project improve +title: "[Bug]" +labels: bug +assignees: miroiu + +--- + + + +**Describe the bug** +A clear and concise description of what the bug is. + +**To Reproduce** +Steps to reproduce the behavior. + +**Expected behavior** +A clear and concise description of what you expected to happen. + +**Screenshots** +If applicable, add screenshots to help explain your problem. + +**Additional context** +Add any other context about the problem here. diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml new file mode 100644 index 0000000..f8be10a --- /dev/null +++ b/.github/ISSUE_TEMPLATE/config.yml @@ -0,0 +1,5 @@ +blank_issues_enabled: false +contact_links: + - name: 📝 Read the docs + url: https://github.com/miroiu/nodify/wiki + about: Be sure you've read the docs! diff --git a/.github/ISSUE_TEMPLATE/documentation.md b/.github/ISSUE_TEMPLATE/documentation.md new file mode 100644 index 0000000..a67d328 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/documentation.md @@ -0,0 +1,17 @@ +--- +name: 📖 Documentation +about: Report an issue related to documentation +title: "[Docs]" +labels: documentation +assignees: miroiu + +--- + +**Describe the issue** +A clear and concise description of what the issue is. + +**Screenshots** +If applicable, add screenshots. + +**Additional context** +Add any other context here. diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md new file mode 100644 index 0000000..b98f1da --- /dev/null +++ b/.github/ISSUE_TEMPLATE/feature_request.md @@ -0,0 +1,27 @@ +--- +name: "⭐️ Feature request" +about: Submit a request or a proposal for this project +title: "[Feature]" +labels: enhancement +assignees: miroiu + +--- + + + +**Is your feature request related to a problem? Please describe.** +A clear and concise description of what the problem is. Ex. I'm always frustrated when [...] + +**Describe the solution you'd like** +A clear and concise description of what you want to happen. + +**Describe alternatives you've considered** +A clear and concise description of any alternative solutions or features you've considered. + +**Additional context** +Add any other context or screenshots about the feature request here. diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml new file mode 100644 index 0000000..3821679 --- /dev/null +++ b/.github/workflows/build.yml @@ -0,0 +1,22 @@ +name: Build + +on: + push: + branches: ["master", "release-v*"] + paths-ignore: + - "docs/**" + pull_request: + paths-ignore: + - "docs/**" + +jobs: + build: + runs-on: windows-latest + steps: + - uses: actions/checkout@v4 + - name: Setup .NET + uses: actions/setup-dotnet@v4 + with: + dotnet-version: "9.0.x" + - name: Build + run: dotnet build --configuration Release diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml new file mode 100644 index 0000000..c9d4e74 --- /dev/null +++ b/.github/workflows/codeql-analysis.yml @@ -0,0 +1,49 @@ +name: "CodeQL" + +on: + push: + branches: ["master", "release-v*"] + paths: + - Nodify/** + pull_request: + branches: ["master", "release-v*"] + schedule: + - cron: "27 6 * * 2" + +jobs: + analyze: + name: Analyze (${{ matrix.language }}) + runs-on: windows-latest + permissions: + # required for all workflows + security-events: write + + # required to fetch internal or private CodeQL packs + packages: read + + # only required for workflows in private repositories + actions: read + contents: read + + strategy: + fail-fast: false + matrix: + include: + - language: csharp + build-mode: none + + steps: + - name: Checkout repository + uses: actions/checkout@v4 + + # Initializes the CodeQL tools for scanning. + - name: Initialize CodeQL + uses: github/codeql-action/init@v3 + with: + languages: ${{ matrix.language }} + build-mode: ${{ matrix.build-mode }} + + - name: Perform CodeQL Analysis + uses: github/codeql-action/analyze@v3 + with: + category: "/language:${{matrix.language}}" diff --git a/.github/workflows/create-release-branch.yml b/.github/workflows/create-release-branch.yml new file mode 100644 index 0000000..e356c21 --- /dev/null +++ b/.github/workflows/create-release-branch.yml @@ -0,0 +1,29 @@ +name: Create release branch + +on: + push: + tags: + - "v*.0.0" + +jobs: + create-release: + runs-on: windows-latest + steps: + - uses: actions/checkout@v4 + - name: Save tag version + uses: little-core-labs/get-git-tag@v3.0.1 + id: tagName + - name: Setup .NET Core + uses: actions/setup-dotnet@v4 + with: + dotnet-version: "9.0.x" + - name: Install dependencies + run: dotnet restore + - name: Build + run: dotnet build --configuration Release --no-restore + - name: Create release branch + uses: peterjgrainger/action-create-branch@v2.2.0 + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + with: + branch: release-${{ steps.tagName.outputs.tag }} diff --git a/.github/workflows/publish-package.yml b/.github/workflows/publish-package.yml new file mode 100644 index 0000000..163a030 --- /dev/null +++ b/.github/workflows/publish-package.yml @@ -0,0 +1,24 @@ +name: Publish package + +on: + workflow_dispatch: + push: + tags: + - "v*.*.*" + +jobs: + publish: + runs-on: windows-latest + + steps: + - uses: actions/checkout@v4 + - name: Setup .NET Core + uses: actions/setup-dotnet@v4 + with: + dotnet-version: "9.0.x" + - name: Install dependencies + run: dotnet restore + - name: Build + run: dotnet build --configuration Release --no-restore + - name: Publish the package + run: dotnet nuget push "*/bin/Release/*.nupkg" -k ${{ secrets.NUGET_KEY }} -s https://api.nuget.org/v3/index.json diff --git a/.github/workflows/sync-docs.yml b/.github/workflows/sync-docs.yml new file mode 100644 index 0000000..157999c --- /dev/null +++ b/.github/workflows/sync-docs.yml @@ -0,0 +1,22 @@ +name: Documentation + +on: + push: + branches: + - master + paths: + - "docs/**" + workflow_dispatch: + +jobs: + job-sync-docs-to-wiki: + runs-on: ubuntu-latest + steps: + - name: Checkout Repo + uses: actions/checkout@v2 + - name: Sync docs to wiki + uses: newrelic/wiki-sync-action@main + with: + source: docs + destination: wiki + token: ${{ secrets.DOCS_TOKEN }} diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..dfcfd56 --- /dev/null +++ b/.gitignore @@ -0,0 +1,350 @@ +## Ignore Visual Studio temporary files, build results, and +## files generated by popular Visual Studio add-ons. +## +## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore + +# User-specific files +*.rsuser +*.suo +*.user +*.userosscache +*.sln.docstates + +# User-specific files (MonoDevelop/Xamarin Studio) +*.userprefs + +# Mono auto generated files +mono_crash.* + +# Build results +[Dd]ebug/ +[Dd]ebugPublic/ +[Rr]elease/ +[Rr]eleases/ +x64/ +x86/ +[Aa][Rr][Mm]/ +[Aa][Rr][Mm]64/ +bld/ +[Bb]in/ +[Oo]bj/ +[Ll]og/ +[Ll]ogs/ + +# Visual Studio 2015/2017 cache/options directory +.vs/ +# Uncomment if you have tasks that create the project's static files in wwwroot +#wwwroot/ + +# Visual Studio 2017 auto generated files +Generated\ Files/ + +# MSTest test Results +[Tt]est[Rr]esult*/ +[Bb]uild[Ll]og.* + +# NUnit +*.VisualState.xml +TestResult.xml +nunit-*.xml + +# Build Results of an ATL Project +[Dd]ebugPS/ +[Rr]eleasePS/ +dlldata.c + +# Benchmark Results +BenchmarkDotNet.Artifacts/ + +# .NET Core +project.lock.json +project.fragment.lock.json +artifacts/ + +# StyleCop +StyleCopReport.xml + +# Files built by Visual Studio +*_i.c +*_p.c +*_h.h +*.ilk +*.meta +*.obj +*.iobj +*.pch +*.pdb +*.ipdb +*.pgc +*.pgd +*.rsp +*.sbr +*.tlb +*.tli +*.tlh +*.tmp +*.tmp_proj +*_wpftmp.csproj +*.log +*.vspscc +*.vssscc +.builds +*.pidb +*.svclog +*.scc + +# Chutzpah Test files +_Chutzpah* + +# Visual C++ cache files +ipch/ +*.aps +*.ncb +*.opendb +*.opensdf +*.sdf +*.cachefile +*.VC.db +*.VC.VC.opendb + +# Visual Studio profiler +*.psess +*.vsp +*.vspx +*.sap + +# Visual Studio Trace Files +*.e2e + +# TFS 2012 Local Workspace +$tf/ + +# Guidance Automation Toolkit +*.gpState + +# ReSharper is a .NET coding add-in +_ReSharper*/ +*.[Rr]e[Ss]harper +*.DotSettings.user + +# TeamCity is a build add-in +_TeamCity* + +# DotCover is a Code Coverage Tool +*.dotCover + +# AxoCover is a Code Coverage Tool +.axoCover/* +!.axoCover/settings.json + +# Visual Studio code coverage results +*.coverage +*.coveragexml + +# NCrunch +_NCrunch_* +.*crunch*.local.xml +nCrunchTemp_* + +# MightyMoose +*.mm.* +AutoTest.Net/ + +# Web workbench (sass) +.sass-cache/ + +# Installshield output folder +[Ee]xpress/ + +# DocProject is a documentation generator add-in +DocProject/buildhelp/ +DocProject/Help/*.HxT +DocProject/Help/*.HxC +DocProject/Help/*.hhc +DocProject/Help/*.hhk +DocProject/Help/*.hhp +DocProject/Help/Html2 +DocProject/Help/html + +# Click-Once directory +publish/ + +# Publish Web Output +*.[Pp]ublish.xml +*.azurePubxml +# Note: Comment the next line if you want to checkin your web deploy settings, +# but database connection strings (with potential passwords) will be unencrypted +*.pubxml +*.publishproj + +# Microsoft Azure Web App publish settings. Comment the next line if you want to +# checkin your Azure Web App publish settings, but sensitive information contained +# in these scripts will be unencrypted +PublishScripts/ + +# NuGet Packages +*.nupkg +# NuGet Symbol Packages +*.snupkg +# The packages folder can be ignored because of Package Restore +**/[Pp]ackages/* +# except build/, which is used as an MSBuild target. +!**/[Pp]ackages/build/ +# Uncomment if necessary however generally it will be regenerated when needed +#!**/[Pp]ackages/repositories.config +# NuGet v3's project.json files produces more ignorable files +*.nuget.props +*.nuget.targets + +# Microsoft Azure Build Output +csx/ +*.build.csdef + +# Microsoft Azure Emulator +ecf/ +rcf/ + +# Windows Store app package directories and files +AppPackages/ +BundleArtifacts/ +Package.StoreAssociation.xml +_pkginfo.txt +*.appx +*.appxbundle +*.appxupload + +# Visual Studio cache files +# files ending in .cache can be ignored +*.[Cc]ache +# but keep track of directories ending in .cache +!?*.[Cc]ache/ + +# Others +ClientBin/ +~$* +*~ +*.dbmdl +*.dbproj.schemaview +*.jfm +*.pfx +*.publishsettings +orleans.codegen.cs + +# Including strong name files can present a security risk +# (https://github.com/github/gitignore/pull/2483#issue-259490424) +#*.snk + +# Since there are multiple workflows, uncomment next line to ignore bower_components +# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622) +#bower_components/ + +# RIA/Silverlight projects +Generated_Code/ + +# Backup & report files from converting an old project file +# to a newer Visual Studio version. Backup files are not needed, +# because we have git ;-) +_UpgradeReport_Files/ +Backup*/ +UpgradeLog*.XML +UpgradeLog*.htm +ServiceFabricBackup/ +*.rptproj.bak + +# SQL Server files +*.mdf +*.ldf +*.ndf + +# Business Intelligence projects +*.rdl.data +*.bim.layout +*.bim_*.settings +*.rptproj.rsuser +*- [Bb]ackup.rdl +*- [Bb]ackup ([0-9]).rdl +*- [Bb]ackup ([0-9][0-9]).rdl + +# Microsoft Fakes +FakesAssemblies/ + +# GhostDoc plugin setting file +*.GhostDoc.xml + +# Node.js Tools for Visual Studio +.ntvs_analysis.dat +node_modules/ + +# Visual Studio 6 build log +*.plg + +# Visual Studio 6 workspace options file +*.opt + +# Visual Studio 6 auto-generated workspace file (contains which files were open etc.) +*.vbw + +# Visual Studio LightSwitch build output +**/*.HTMLClient/GeneratedArtifacts +**/*.DesktopClient/GeneratedArtifacts +**/*.DesktopClient/ModelManifest.xml +**/*.Server/GeneratedArtifacts +**/*.Server/ModelManifest.xml +_Pvt_Extensions + +# Paket dependency manager +.paket/paket.exe +paket-files/ + +# FAKE - F# Make +.fake/ + +# CodeRush personal settings +.cr/personal + +# Python Tools for Visual Studio (PTVS) +__pycache__/ +*.pyc + +# Cake - Uncomment if you are using it +# tools/** +# !tools/packages.config + +# Tabs Studio +*.tss + +# Telerik's JustMock configuration file +*.jmconfig + +# BizTalk build output +*.btp.cs +*.btm.cs +*.odx.cs +*.xsd.cs + +# OpenCover UI analysis results +OpenCover/ + +# Azure Stream Analytics local run output +ASALocalRun/ + +# MSBuild Binary and Structured Log +*.binlog + +# NVidia Nsight GPU debugger configuration file +*.nvuser + +# MFractors (Xamarin productivity tool) working folder +.mfractor/ + +# Local History for Visual Studio +.localhistory/ + +# BeatPulse healthcheck temp database +healthchecksdb + +# Backup folder for Package Reference Convert tool in Visual Studio 2017 +MigrationBackup/ + +# Ionide (cross platform F# VS Code tools) working folder +.ionide/ diff --git a/APIVisualExecutor-master.7z b/APIVisualExecutor-master.7z new file mode 100644 index 0000000..745f2b2 Binary files /dev/null and b/APIVisualExecutor-master.7z differ diff --git a/CHANGELOG.md b/CHANGELOG.md new file mode 100644 index 0000000..e1a65c0 --- /dev/null +++ b/CHANGELOG.md @@ -0,0 +1,353 @@ +## Changelog + +#### **In development** + +> - Breaking Changes: +> - Features: +> - Bugfixes: + +#### **Version 7.1.0** + +> - Breaking Changes: +> - Added ProcessHandledEvents to IInputHandler and removed it from InputProcessor +> - Renamed EditorGestures.Editor.ResetViewportLocation to EditorGestures.Editor.ResetViewport +> - Features: +> - Introduced a new BringIntoView method overload in NodifyEditor that accepts an offset from the viewport edges +> - Added BringIntoViewEdgeOffset to NodifyEditor to control the viewport edge offset when bringing the focused element into view +> - Added ResetViewport to NodifyEditor to reset the viewport's location and zoom +> - Improved tab and directional navigation, ensuring that focused elements are automatically brought into view +> - Added keyboard navigation layers for nodes, connections and decorators; restricting keyboard navigation to the active layer +> - Added ActiveNavigationLayer, ActivateNextNavigationLayer, ActivatePreviousNavigationLayer, RegisterNavigationLayer, RemoveNavigationLayer and ActivateNavigationLayer to NodifyEditor for keyboard layers management +> - Added KeyboardNavigationLayer property to NodifyEditor that allows navigating through the ItemContainers +> - Added AutoRegisterConnectionsLayer, AutoRegisterDecoratorsLayer, AutoFocusFirstElement, AutoPanOnNodeFocus, PanViewportOnKeyboardDrag and MinimumNavigationStepSize to NodifyEditor +> - Added EditorGestures.Editor.Keyboard for keyboard navigation gestures +> - Added FindNextFocusTarget, OnElementFocused and OnKeyboardNavigationLayerActivated virtual methods to NodifyEditor +> - Added new gestures for keyboard navigation available in EditorGestures.Editor.Keyboard +> - Added ToggleContentSelection to GroupingNode and its corresponding gesture to toggle the selection of nodes inside the group +> - Added ZoomIn, ZoomOut and ResetViewport methods to the Minimap control +> - Added ZoomIn, ZoomOut, ResetViewport and Pan gestures to EditorGestures.Minimap +> - Added NavigationStepSize static property to Minimap +> - Added Unbind to all gestures inside EditorGestures +> - Added the KeyComboGesture that requires a trigger key to be held down before pressing a combo key +> - Added FocusVisualPen and FocusVisualPadding dependency properties to BaseConnection +> - Added default focus visuals for base editor controls that can be included by referencing the FocusVisual.xaml file +> - Added MaxHotKeys and HotKeysDisplayMode static configuration fields to PendingConnection +> - Added HotKeyControl with its corresponding theme resources to display the hotkeys for a pending connection + +#### **Version 7.0.4** + +> - Features: +> - Added AsRef extension method to InputGesture to convert it to an InputGestureRef +> - Bugfixes: +> - Fixed an issue where the gesture used for EditorGestures.Editor.SelectAll extracted from the ApplicationCommands was assumed to be a KeyGesture +> - Fixed overrides of DrawDirectionalArrowheadGeometry virtual method not working in subclasses of the built in connections +> - Fixed a memory leak caused by the auto panning timer + +#### **Version 7.0.3** + +> - Bugfixes: +> - Fixed an issue where the SelectedEvent and UnselectedEvent events on the ItemContainer were not raised when the selection was completed + +#### **Version 7.0.2** + +> - Features: +> - Added EditorGestures.Editor.SelectAll +> - Bugfixes: +> - Fixed an issue where the EditorCommands.SelectAll gesture could not be customized + +#### **Version 7.0.1** + +> - Bugfixes: +> - Fixed an issue where connections would not gain focus when selected, which could prevent editor keybindings from functioning in certain scenarios +> - Resolved an issue where selecting a node did not deselect connections and vice versa +> - Fixed a bug preventing ItemContainers from being selected when the mouse could not be captured +> - Fixed an issue with key detection in Japanese IME environments, causing issues with the MouseGesture + +#### **Version 7.0.0** + +> - Breaking Changes: +> - Made the setter of NodifyEditor.IsPanning private +> - Made SelectionHelper internal +> - Renamed HandleRightClickAfterPanningThreshold to MouseActionSuppressionThreshold in NodifyEditor +> - Renamed StartCutting to BeginCutting in NodifyEditor +> - Renamed Connector.EnableStickyConnections to ConnectorState.EnabledToggledConnectingMode +> - Renamed PushItems to UpdatePushedArea and StartPushingItems to BeginPushingItems in NodifyEditor +> - Renamed UnselectAllConnection to UnselectAllConnections in NodifyEditor +> - Removed DragStarted, DragDelta and DragCompleted routed events from ItemContainer +> - Replaced the System.Windows.Input.MouseGesture with Nodify.Interactivity.MouseGesture for default EditorGesture mappings +> - Removed State, GetInitialState, PushState, PopState and PopAllStates from NodifyEditor and ItemContainer +> - Replaced EditorState and ContainerState with InputElementState +> - Moved AllowCuttingCancellation from CuttingLine to NodifyEditor +> - Moved AllowDraggingCancellation from ItemContainer to NodifyEditor +> - Moved EditorGestures under the Nodify.Interactivity namespace +> - Moved editor events under the Nodify.Events namespace +> - Features: +> - Added BeginPanning, UpdatePanning, EndPanning, CancelPanning and AllowPanningCancellation to NodifyEditor and Minimap +> - Added MouseLocation, ZoomAtPosition and GetLocationInsideMinimap to Minimap +> - Added UpdateCuttingLine to NodifyEditor +> - Added Select, BeginSelecting, UpdateSelection, EndSelecting, CancelSelecting and AllowSelectionCancellation to NodifyEditor +> - Added IsDragging, BeginDragging, UpdateDragging, EndDragging and CancelDragging to NodifyEditor +> - Added AlignSelection and AlignContainers methods to NodifyEditor +> - Added LockSelection and UnlockSelection methods to NodifyEditor and EditorCommands +> - Added ItemsMoved routed event to NodifyEditor +> - Added HasCustomContextMenu dependency property to NodifyEditor, ItemContainer, Connector and BaseConnection +> - Added Select, BeginDragging, UpdateDragging, EndDragging and CancelDragging to ItemContainer +> - Added PreserveSelectionOnRightClick configuration field to ItemContainer +> - Added BeginConnecting, UpdatePendingConnection, EndConnecting, CancelConnecting and RemoveConnections methods to Connector +> - Added FindTargetConnector and FindConnectionTarget methods to Connector +> - Added a custom MouseGesture with support for key combinations +> - Added InputProcessor to NodifyEditor, ItemContainer, Connector, BaseConnection and Minimap, enabling the extension of controls with custom states +> - Added DragState to simplify creating click-and-drag interactions, with support for initiating and completing them using the keyboard +> - Added InputElementStateStack, InputElementStateStack.DragState and InputElementStateStack.InputElementState to manage transitions between states in UI elements +> - Added InputProcessor.Shared to enable the addition of global input handlers +> - Move the viewport to the mouse position when zooming on the Minimap if ResizeToViewport is false +> - Added SplitAtLocation and Remove methods to BaseConnection +> - Added AllowPanningWhileSelecting, AllowPanningWhileCutting and AllowPanningWhilePushingItems to EditorState +> - Added AllowZoomingWhilePanning, AllowZoomingWhileSelecting, AllowZoomingWhileCutting and AllowZoomingWhilePushingItems to EditorState +> - Added EnableToggledSelectingMode, EnableToggledPanningMode, EnableToggledPushingItemsMode and EnableToggledCuttingMode to EditorState +> - Added MinimapState.EnableToggledPanningMode +> - Added ContainerState.EnableToggledDraggingMode +> - Added Unbind to InputGestureRef and EditorGestures.SelectionGestures +> - Added EnableHitTesting to PendingConnection +> - Bugfixes: +> - Fixed an issue where the ItemContainer was selected by releasing the mouse button on it, even when the mouse was not captured +> - Fixed an issue where the ItemContainer could open its context menu even when it was not selected +> - Fixed an issue where the Home button caused the editor to fail to display items when contained within a ScrollViewer +> - Fixed an issue where connector optimization did not work when SelectedItems was not data-bound +> - Fixed EditorCommands.Align to perform a single arrange invalidation instead of one for each aligned container +> - Fixed an issue where controls would capture the mouse unnecessarily; they now capture it only in response to a defined gesture +> - Fixed an issue where the minimap could update the viewport without having the mouse captured +> - Fixed ItemContainer.Select and NodifyEditor.SelectArea to clear the existing selection and select the containers within the same transaction +> - Fixed an issue where editor interactions failed to cancel upon losing mouse capture +> - Fixed an issue where selecting a new connection would not clear the previous selection within the same transaction + +#### **Version 6.6.0** + +> - Features: +> - Added InputGroupStyle and OutputGroupStyle to Node +> - Added PanWithMouseWheel, PanHorizontalModifierKey and PanVerticalModifierKey to EditorGestures.Editor +> - Added CornerRadius dependency property to LineConnection, CircuitConnection and StepConnection +> - Added EditorGestures.Editor.PushItems gesture used to start pushing ItemContainers vertically or horizontally +> - Added PushedAreaStyle, PushedAreaOrientation and IsPushingItems dependency properties to NodifyEditor +> - Added NodifyEditor.SnapToGrid utility function +> - Bugfixes: +> - Fixed ItemContainer.BorderBrush and ItemContainer.SelectedBrush not reacting to theme changes + +#### **Version 6.5.0** + +> - Features: +> - Added SelectedConnection, SelectedConnections, CanSelectMultipleConnections and CanSelectMultipleItems dependency properties to NodifyEditor +> - Added IsSelected and IsSelectable attached dependency properties to BaseConnection +> - Added PrioritizeBaseConnectionForSelection static field to BaseConnection +> - Added EditorGestures.Connection.Selection +> - Added support for ScrollViewer in NodifyEditor (implements IScrollInfo) +> - Added NodifyEditor.ScrollIncrement dependency property + +#### **Version 6.4.0** + +> - Features: +> - Added OutlineBrush and OutlineThickness dependency properties to BaseConnection to support increasing the selection area without increasing the stroke thickness +> - Added IsAnimatingDirectionalArrows and DirectionalArrowsAnimationDuration dependency properties to BaseConnection to support controlling the animation from XAML + +#### **Version 6.3.0** + +> - Features: +> - Added a CuttingLine control that removes intersecting connections +> - Added CuttingLineStyle, CuttingStartedCommand, CuttingCompletedCommand, IsCutting, EnableCuttingLinePreview and CuttingConnectionTypes to NodifyEditor +> - Added EditorGestures.Editor.Cutting and EditorGestures.Editor.CancelAction +> - Bugfixes: +> - Fixed connection styles not inheriting from the BaseConnection style + +#### **Version 6.2.0** + +> - Features: +> - Added a Minimap control and EditorGestures.Minimap +> - Added ContentContainerStyle, HeaderContainerStyle and FooterContainerStyle dependency properties to Node +> - Added BringIntoView that takes a Rect parameter to NodifyEditor +> - Added the NodifyEditor's DataContext as the parameter of the ItemsSelectStartedCommand, ItemsSelectCompletedCommand, ItemsDragStartedCommand and ItemsDragCompletedCommand commands +> - Bugfixes: +> - Fixed hover effect and padding of NodeInput and NodeOutput for vertical orientation +> - Fixed ItemContainers being selected sometimes when double clicking the canvas + +#### **Version 6.1.0** + +> - Features: +> - Added new built-in connection type: StepConnection +> - Bugfixes: +> - Fixed CircuitConnection directional arrows not interpolating correctly +> - Fixed BaseConnection SplitEvent and DisconnectEvent not being raised if the corresponding command is null +> - Fixed DecoratorContainer scaling with zoom when not referencing a theme in App.xaml +> - Fixed style not applying to the default Connection template outside App.xaml + +#### **Version 6.0.0** + +> - Breaking Changes: +> - Added a parameter for the orientation to DrawArrowGeometry, DrawDefaultArrowhead, DrawRectangleArrowhead and DrawEllipseArrowhead in BaseConnection +> - Added source and target parameters to GetTextPosition in BaseConnection +> - EditorGestures is now a singleton instead of a static class (can be inherited to create custom mappings) +> - Selection gestures for ItemContainer and GroupingNode are now separated from the NodifyEditor selection gestures +> - Renamed EditorGestures.Editor.Zoom to ZoomModifierKey +> - Features: +> - Added SourceOrientation and TargetOrientation to BaseConnection to support vertical connectors (vertical/mixed connection orientation) +> - Added DirectionalArrowsCount to BaseConnection to allow drawing multipe arrows on a connection flowing in the connection direction +> - Added DrawDirectionalArrowsGeometry and DrawDirectionalArrowheadGeometry to BaseConnection to allow customizing the directional arrows +> - Improved EditorGestures to allow changing input gestures at runtime +> - Added new gesture types: AnyGesture, AllGestures, and InputGestureRef +> - Added Orientation dependency property to NodeInput and NodeOutput +> - Added DirectionalArrowsOffset dependency property to BaseConnection +> - Added StartAnimation and StopAnimation methods to BaseConnection +> - Bugfixes: +> - Fixed BaseConnection.Text not always displaying in the center of the connection +> - Fixed a bug where the item container would incorrectly transition to the dragging state on mouse over + +#### **Version 5.2.0** + +> - Features: +> - Added Text to BaseConnection, allowing displaying of text on connections +> - Added Foreground, FontSize, FontWeight, FontStyle, FontStretch and FontFamily to BaseConnection, allowing styling the displaying text +> - Bugfixes: +> - Fixed MouseCapture not being released when EnableStickyConnections is enabled and the PendingConnection is canceled by a key gesture + +#### **Version 5.1.0** + +> - Features: +> - Added ItemContainer.SelectedBorderThickness dependency property +> - Added NodifyEditor.GetLocationInsideEditor +> - Bugfixes: +> - Fixed PendingConnection.PreviewTarget not being set to null when there is no actual target +> - Fixed PendingConnection.PreviewTarget not being set on Connector.PendingConnectionStartedEvent +> - Fixed PendingConnection.PreviewTarget not being set to null on Connector.PendingConnectionCompletedEvent +> - Fixed connectors panel not being affected by Node.VerticalAlignment +> - Changing BorderThickness causes layout shift when selecting an item container +> - Fixed the unintentional movement caused by snapping correction + +#### **Version 5.0.2** + +> - Bugfixes: +> - Fixed NodeOutput content horizontal alignment +> - Fixed Connector not opening Context Menu + +#### **Version 5.0.1** + +> - Bugfixes: +> - Returning false from PendingConnection.StartedCommand.CanExecute does not stop the creation of a pending connection +> - BaseConnection.ArrowEnds does not display correctly when BaseConnection.Direction is ConnectionDirection.Backward + +#### **Version 5.0.0** + +> - Breaking Changes: +> - Removed BaseConnection.GetArrowHeadPoints +> - Removed BaseConnection.OffsetMode +> - Changed return type of BaseConnection.DrawLineGeometry to support both arrowheads no matter the number of points on the line +> - Changed the default for BaseConnection.SourceOffset and BaseConnection.TargetOffset from Size(0, 0) to Size(14, 0) +> - Changed the default for BaseConnection.ArrowSize from Size(7, 6) to Size(8, 8) +> - Features: +> - Added BaseConnection.SourceOffsetMode and BaseConnection.TargetOffsetMode +> - Added BaseConnection.ArrowEnds dependency property to allow configurable arrowhead ends +> - Added BaseConnection.ArrowShape dependency property to allow configurable arrowhead shape +> - Added NodifyEditor.EnableDraggingContainersOptimizations to allow receiving ItemContainer.Location updates in realtime +> - Added ConnectionOffsetMode.Static to allow offsetting the source and target points of the connection on the X and the Y axis without revolving around the source or target points + +#### **Version 4.1.0** + +> - Features: +> - Added EditorGestures.Selection.DefaultMouseAction to make it easier to change between mouse buttons for selection +> - Added EditorGestures.Selection.Cancel gesture to cancel the selection operation reverting to the previous selection +> - Added ItemsSelectStartedCommand and ItemsSelectCompletedCommand dependency properties to NodifyEditor for better undo/redo support +> - Bugfixes: +> - Fixed NodifyEditor.SelectedItems being empty after selection is completed +> - Fixed drag canceling when Drag and CancelAction are bound to the same gesture + +#### **Version 4.0.1** + +> - Bugfixes: +> - Fixed DisablePanning not working anymore + +#### **Version 4.0.0** + +> - Breaking Changes: +> - Removed Selection field from NodifyEditor +> - Removed InitialMousePosition, CurrentMousePosition, PreviousMousePosition fields from NodifyEditor +> - Removed ItemContainer.DraggableHost (use Editor.ItemsHost instead) +> - Made SelectionType required in SelectionHelper +> - Moved GroupingNode.SwitchMovementModeModifierKey to EditorGestures.GroupingNode +> - Pending connections are now restricted to connect only to Connectors or to NodifyEditors and ItemContainers if PendingConnection.AllowOnlyConnectors is false +> - Features: +> - Added Connector.EnableStickyConnections to allow completing pending connections in two steps +> - Added editor states which can be overriden by inheriting from NodifyEditor and implementing NodifyEditor.GetInitialState() +> - EditorState - base class for all editor states +> - EditorDefaultState +> - EditorSelectingState +> - EditorPanningState +> - Added container states which can be overriden by inheriting from ItemContainer and implementing ItemContainer.GetInitialState() +> - ContainerState - base class for all container states +> - ContainerDefaultState +> - ContainerDraggingState +> - Added MultiGesture utility that can combine multiple input gestures into one gesture +> - Added configurable input gestures for NodifyEditor, ItemContainer, Connector, BaseConnection and GroupingNode to EditorGestures +> - Added State, PushState, PopState and PopAllStates to NodifyEditor and ItemContainer +> - Changed the default AutoPanSpeed to 15 from 10 pixels per tick +> - Allow setting ItemContainer.IsPreviewingLocation from derived classes +> - Bugfixes: +> - Fixed HandleRightClickAfterPanningThreshold not working as expected +> - Fixed DisablePanning not disabling auto panning in certain situations +> - Fixed GroupingNode selection not working with multiple selection modes +> - Fixed PendingConnection connecting cross editors + +#### **Version 3.0.0** + +> - Breaking Changes: +> - Changed Decorators from UIElement collection to IEnumerable +> - Features: +> - Added ItemsExtent and DecoratorsExtent dependency properties to NodifyEditor +> - Added DecoratorTemplate dependency property to NodifyEditor +> - Added FitToScreenExtentMargin static field to NodifyEditor +> - Added Extent dependency property to NodifyCanvas +> - Bugfixes: +> - Selection rectangle and Decorators are no longer scaled with the viewport zoom +> - Fixed connector anchor not updating when container size changed + +#### **Version 2.0.1** + +> - Bugfixes: +> - Fixed pending connection default style + +#### **Version 2.0.0** + +> - Breaking Changes: +> - Renamed Offset to ViewportLocation in NodifyEditor +> - Renamed Scale to ViewportZoom in NodifyEditor +> - Renamed MinScale to MinViewportZoom in NodifyEditor +> - Renamed MaxScale to MaxViewportZoom in NodifyEditor +> - Renamed AppliedTransform to ViewportTransform in NodifyEditor +> - Renamed DirectionalConnection to LineConnection +> - Removed BringIntoViewAnimationDuration from NodifyEditor +> - Removed Viewport dependency property from NodifyEditor +> - Removed ActualSize dependency property from StateNode +> - Removed Icon dependency property from Node as the icon can _(and should)_ be added in the HeaderTemplate if necessary +> - PART_ItemsHost is now required for NodifyEditor to work +> - ItemContainers cannot be used outside a NodifyEditor anymore +> - ZoomAtPosition now requires graph space coordinates instead of screen space coordinates +> - Removed custom value converters +> - Made DependencyObjectExtensions internal +> - Removed the xaml prefix +> - Features: +> - Added ResizeStartedEvent routed event to GroupingNode +> - Added ViewportSize - **OneWayToSource** dependency property to NodifyEditor +> - Added ActualSize - **OneWayToSource** dependency property to ItemContainer +> - Added DecoratorContainer and DecoratorContainerStyle dependency properties to NodifyEditor +> - Added RemoveConnectionCommand command to NodifyEditor +> - Added DisconnectCommand and SplitCommand commands to BaseConnection +> - Added ContentBrush dependency property to NodifyEditor +> - Added HasFooter dependency property to Node +> - Added FitToScreen command to NodifyEditor and EditorCommands +> - Added onFinish callback to BringIntoView in NodifyEditor +> - Added ArrowSize and Spacing dependency properties to all connections inheriting from BaseConnection +> - Added BringIntoViewMaxDuration dependency property to NodifyEditor +> - Added BringIntoViewSpeed dependency property to NodifyEditor +> - Auto panning speed now scales with the zoom factor +> - Bugfixes: +> - Every public property or method should work with graph space coordinates +> - Disable auto panning when panning is disabled +> - Min zoom could be set to a very small value +> - Bring into view was not disabling all interfering operations diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md new file mode 100644 index 0000000..8356d9b --- /dev/null +++ b/CODE_OF_CONDUCT.md @@ -0,0 +1,76 @@ +# Contributor Covenant Code of Conduct + +## Our Pledge + +In the interest of fostering an open and welcoming environment, we as +contributors and maintainers pledge to making participation in our project and +our community a harassment-free experience for everyone, regardless of age, body +size, disability, ethnicity, sex characteristics, gender identity and expression, +level of experience, education, socio-economic status, nationality, personal +appearance, race, religion, or sexual identity and orientation. + +## Our Standards + +Examples of behavior that contributes to creating a positive environment +include: + +* Using welcoming and inclusive language +* Being respectful of differing viewpoints and experiences +* Gracefully accepting constructive criticism +* Focusing on what is best for the community +* Showing empathy towards other community members + +Examples of unacceptable behavior by participants include: + +* The use of sexualized language or imagery and unwelcome sexual attention or + advances +* Trolling, insulting/derogatory comments, and personal or political attacks +* Public or private harassment +* Publishing others' private information, such as a physical or electronic + address, without explicit permission +* Other conduct which could reasonably be considered inappropriate in a + professional setting + +## Our Responsibilities + +Project maintainers are responsible for clarifying the standards of acceptable +behavior and are expected to take appropriate and fair corrective action in +response to any instances of unacceptable behavior. + +Project maintainers have the right and responsibility to remove, edit, or +reject comments, commits, code, wiki edits, issues, and other contributions +that are not aligned to this Code of Conduct, or to ban temporarily or +permanently any contributor for other behaviors that they deem inappropriate, +threatening, offensive, or harmful. + +## Scope + +This Code of Conduct applies both within project spaces and in public spaces +when an individual is representing the project or its community. Examples of +representing a project or community include using an official project e-mail +address, posting via an official social media account, or acting as an appointed +representative at an online or offline event. Representation of a project may be +further defined and clarified by project maintainers. + +## Enforcement + +Instances of abusive, harassing, or otherwise unacceptable behavior may be +reported by contacting the project team at miroiu.emanuel@gmail.com. All +complaints will be reviewed and investigated and will result in a response that +is deemed necessary and appropriate to the circumstances. The project team is +obligated to maintain confidentiality with regard to the reporter of an incident. +Further details of specific enforcement policies may be posted separately. + +Project maintainers who do not follow or enforce the Code of Conduct in good +faith may face temporary or permanent repercussions as determined by other +members of the project's leadership. + +## Attribution + +This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, +available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html + +[homepage]: https://www.contributor-covenant.org + +For answers to common questions about this code of conduct, see +https://www.contributor-covenant.org/faq diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md new file mode 100644 index 0000000..cfc4931 --- /dev/null +++ b/CONTRIBUTING.md @@ -0,0 +1,26 @@ +# 👋 **Welcome to Nodify!** 👋 + +👍🎉 First off, thanks for taking the time to contribute! Your contributions help make Nodify better for everyone. 👍🎉 + +If you find Nodify useful, please consider giving us a ⭐ **star** ⭐ on our GitHub repository! + +Code of Conduct: By contributing to Nodify, you agree to uphold our [Code of Conduct](CODE_OF_CONDUCT.md). We expect all contributors to be respectful and inclusive. (Don't worry, it's all common sense 😎) + +## How you can contribute + +- ❓ [Ask a question](https://github.com/miroiu/nodify/issues/new?assignees=miroiu&labels=question&template=ask-a-question.md&title=%5BQuestion%5D) - If you're unsure about anything related to Nodify, feel free to ask! No question is too small. +- 🐛 [Create a bug report](https://github.com/miroiu/nodify/issues/new?assignees=miroiu&labels=bug&template=bug_report.md&title=%5BBug%5D) - Noticed something not working as expected? Let us know by creating a bug report. Please provide as much detail as possible to help us address the issue. +- 🌺 [Suggest an enhancement](https://github.com/miroiu/nodify/issues/new?assignees=miroiu&labels=enhancement&template=feature_request.md&title=%5BFeature%5D) - Have an idea to make Nodify even better? We'd love to hear it! Share your suggestions for new features or improvements. +- ✨ [Explore example applications](https://github.com/miroiu/nodify/tree/master/Examples) - Check out the example applications provided with Nodify. They're great for learning how to use the library in different scenarios. +- 🎉 [Showcase your application](https://github.com/miroiu/nodify/issues/56) - Built something cool with Nodify? Share it with the community! We'd love to see what you've created. +- 📝 [Help with the documentation](https://github.com/miroiu/nodify/wiki) - Documentation is crucial for making Nodify accessible to everyone. If you spot errors or have suggestions for improvement, please let us know or update the docs yourself! +- 🔧 [Fix a bug](https://github.com/miroiu/nodify/labels/bug) - If you're a developer, you can contribute by fixing bugs in Nodify. Simply locate an open issue tagged as a bug and submit a pull request with your fix. +- 🔗 [Create a pull request linking to a feature](https://github.com/miroiu/nodify/labels/enhancement) - Implemented a new feature or enhancement? Fantastic! Submit a pull request linking to the relevant feature or enhancement issue. + +## Some tips + +- Write clear and descriptive issues and try to avoid duplication +- If you find a **Closed** issue that relates to yours, open a new issue and include a link to the original issue in the body of your new one. +- The easiest way to update documentation is to navigate [to the docs website](https://github.com/miroiu/nodify/wiki) and click 'Edit this page' which is found at the top right of any page. +- If you want to create an example application that others can use to learn from, then [create an issue](https://github.com/miroiu/nodify/issues/new?assignees=miroiu&labels=application&template=add_example_app.md&title=%5BApplication%5D) describing what your application is doing and if you need help with anything. +- The application you showcase can use any license. diff --git a/Examples/Nodify.Calculator.7z b/Examples/Nodify.Calculator.7z new file mode 100644 index 0000000..df111b5 Binary files /dev/null and b/Examples/Nodify.Calculator.7z differ diff --git a/Examples/Nodify.Calculator/APIOperationViewModel.cs b/Examples/Nodify.Calculator/APIOperationViewModel.cs new file mode 100644 index 0000000..00d9943 --- /dev/null +++ b/Examples/Nodify.Calculator/APIOperationViewModel.cs @@ -0,0 +1,24 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Nodify.Calculator +{ + public class APIOperationViewModel : OperationViewModel + { + public APIOperationViewModel() + { + _operationType = "GET"; + } + + private string _operationType; + + public string OperationType + { + get => _operationType; + set => SetProperty(ref _operationType, value); + } + } +} diff --git a/Examples/Nodify.Calculator/AddVariableDialog.xaml b/Examples/Nodify.Calculator/AddVariableDialog.xaml new file mode 100644 index 0000000..a9ca29a --- /dev/null +++ b/Examples/Nodify.Calculator/AddVariableDialog.xaml @@ -0,0 +1,52 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +