Commit Graph
110 Commits
Author SHA1 Message Date
JaredTherriault 6fbddeedee Fix search 2024-05-10 21:46:43 -07:00
JaredTherriault 34c1ce82dd Speed up loading of images in SubFolderExplorer contexts
-Speed up loading of images in SubFolderExplorer contexts like Input and Output (up to 6x!)
-Separate logic for loading images and gathering subdirectories
-Update some code to reflect the move to a unified usage of  "directory" rather than "folder" (WIP)
-Return more useful responses from python backend
2024-05-10 20:33:18 -07:00
JaredTherriault f0338b0c5f Batch selection, batch deletion, classifying some scripts, module manager
-Added new batch selection and batch deletion features. All imageElements now have a checkbox and each selected element is tracked within a context or folder. When you've selected all you want to delete, click the recycle button on the toolbar, then again to confirm. All checked items will be recylced/deleted. You can also click on the selection widget next to the batch delete button to toggle select/deselect all.
-Renamed ImageDrawer.js to ImageDrawerMain.js
-Separated ImageListAndSearch out into separate scripts and classes named ImageDrawerList and ImageDrawerSearch
-Changed order of some initialized functions and variables in imageElements to better accommodate batch selection
-
-Moved some scripts over to a classy architecture. More scripts will be moved over time. This will eventually allow for multiple image drawer instances in the same window.
-Added a new module script that manages all class instances. See ImageDrawerModule.js for an explanation of the new architecture. Basically, it makes cyclical dependencies impossible.
-Updated imports
-Updated various scripts to use class instances where applicable
-Updated some outdated comments
-Added option to prepend or append labels to Labeled widgets
-Parameter optimizations
-
2024-05-07 20:39:40 -07:00
JaredTherriault 2b8b864fd7 Remove width calculation from imageElements and extraNetworks as it's redundant performance loss 2024-05-05 18:32:46 -07:00
JaredTherriault 8164bec931 Further iteration on last 2024-05-05 17:08:56 -07:00
JaredTherriault b87cf45681 Add option to collapse imageDrawer options (button in top-right) 2024-05-05 16:58:42 -07:00
JaredTherriault 7a3d3ba30b Add delete button to imageElements flyout
-Separate much of the logic for imageElements into imageElementsUtils for a more streamlined maintenance experience
-Add button to delete an image or video from the disk and list, preferring to move it to trash/recycling before deleting directly
2024-05-05 14:33:33 -07:00
JaredTherriault a0a9f1d675 Fix issue where undefined element was always being sent to be removed from imageList 2024-05-05 14:30:31 -07:00
JaredTherriault 3ed7fbee1b Fix sorting for image elements 2024-05-04 23:48:38 -07:00
JaredTherriault 55c3a96efb no-store all api calls 2024-05-04 17:01:52 -07:00
JaredTherriault 5566e237d0 Flyout improvements
-Simplify CSS
-Set layout CSS properties for flyouts from JS directly
-Apply layout rules to all flyouts
-Move imageElements flyout handle to top right rather than top left
2024-05-04 15:50:57 -07:00
JaredTherriault 1e55333ce0 Implement overflow control on x axis for image overflow menus 2024-05-03 19:54:46 -07:00
JaredTherriault e7538f0bb9 Update slider tooltip text for column count, drawer width, and drawer height sliders every time the slider is moved 2024-05-03 19:41:05 -07:00
JaredTherriault 6b5207e2b9 Replace options menu on images with flyout, Highlight menu options
-Replace options menu on images with flyout
-Highlight menu options and lora/embedding commands when hovered or clicked
2024-05-03 19:39:31 -07:00
JaredTherriault b84e19b4c3 Fix automatic Upload Visual Media node sizing for videos
-Fix automatic Upload Visual Media node sizing for videos
-Infer some display data from mediaElement when image or video doesn't originate from imageDrawer drag and drop
-Linter adherence
2024-05-02 16:04:46 -07:00
JaredTherriault e4d01c1bba Sort Json Object By Keys in ImageElements 2024-05-01 22:19:50 -07:00
JaredTherriault b1f6b374e2 Add SortJsonObjectByKeys 2024-05-01 22:19:18 -07:00
JaredTherriault 2367848782 Correctly calculate height for image drawer drag-ins 2024-05-01 20:49:23 -07:00
JaredTherriault 2172b88f35 Init DisplayData before assigning 2024-05-01 16:52:56 -07:00
JaredTherriault df8c6da431 Add DiisplayData structure to imageElement and drag and drop payload for imageElements 2024-05-01 16:28:50 -07:00
JaredTherriault d4fd0d9bc8 Fix event listener name 2024-05-01 16:28:11 -07:00
JaredTherriault 4e1ca6a008 update some function signatures to be functions rather than lambdas (for consistency) 2024-05-01 11:10:57 -07:00
JaredTherriault 306fc985f8 Update dimensional meta data on image load if it wasn't read from python 2024-05-01 11:10:23 -07:00
JaredTherriault 7f7625855f Merge branch 'main' into Iteration-On-Upload-Video-Widget 2024-04-30 22:06:26 -07:00
JaredTherriault 219d3a8a67 Implement image aspect ratio sort type 2024-04-30 22:05:52 -07:00
JaredTherriault 28e0d896bb Solve upload visual media sizing for image file types 2024-04-30 21:45:48 -07:00
JaredTherriault 811111102b Implement new sorting types: SortTypeFileSize, SortTypeImageWidth, SortTypeImageHeight, SortTypeFileType 2024-04-30 21:44:47 -07:00
JaredTherriault 690bfb3bdc Iteration 2024-04-30 13:28:13 -07:00
JaredTherriault fe91515ed8 Size images correctly 2024-04-29 20:33:06 -07:00
JaredTherriault acb386e956 Expose main element in labeled controls and fix subfolder toggle staying on when subfolder is changed 2024-04-29 18:56:08 -07:00
JaredTherriault 073d6fe6c4 Validate playback speed input value and fix setting volume and playback speed for all videos at once
Also remove reference to setting_VideoPlaybackOptions in onScrollVideo, invertWheelSeek is now a function parameter
2024-04-29 16:36:30 -07:00
JaredTherriault 75fd65d400 Merge branch 'main' into Iteration-On-Upload-Video-Widget 2024-04-29 14:46:15 -07:00
JaredTherriault b954c0e187 Fix for sub folder images constantly calling the sort method 2024-04-29 14:45:11 -07:00
JaredTherriault b9e0e3bc81 Iteration on Upload Video 2024-04-24 09:42:23 -07:00
JaredTherriault a8d62066f6 Media preview improvements
-Autosize node to media (still needs work)
-Center media and media info
-Be smarter about when Media info is displayed based on file type and whether or not they payload data is good
-Move some variables and calls around to minimize resource usage
-Apply existing callbacks
-Create media preview on configure so it appears when the user loads the workflow
-Update some names for linter
2024-04-23 18:27:19 -07:00
JaredTherriault 795690ed20 Show video metadata on Upload Visual Media node
-Update VideoPreview import
-Pass JNodes Payload through so we can display information from metadata
-Show video metadata on Upload Visual Media node
-Show current time in seconds and current frame during playback
2024-04-22 18:03:11 -07:00
JaredTherriault f2774fb9f5 Include renaming 2024-04-22 14:51:09 -07:00
JaredTherriault 25c05234cc Script renaming 2024-04-22 14:46:25 -07:00
JaredTherriault fc989fb216 Script renaming
-Uppercase script names for js, video -> media
2024-04-22 14:46:11 -07:00
JaredTherriault 6838fd084a Generify Media Upload nodes, fix video previews, image drawer drag and drop to node support
-Generify video loading nodes to work for many visual media types, still images, animated images, some video types, etc. 'Video' nodes and scripts and params have been renamed to 'media' to reflect the change.
-Added some accessors for MediaInfo
-Replaced OutVideoInfo with BreakMediaInfo
-Added some more information to MediaInfo
-Stashed renamed nodes into deprecated_nodes so they're still accessible for now
-Cleaned up some unnecessary variables and params in the media loading code, now runs a tiny bit faster
-Now possible to sample media by seconds or frames
-Added some filetype support in js, still need to just pull this directly from python
-Renamed some js variables to be less parsimonious and more clear
-Fix video preview in SaveVideo
-Encode text in video preview uri (so spaces in filenames work, et al)
-Add support for images and videos from the image drawer to be dragged onto UploadMedia node
-Formatting
2024-04-22 13:32:25 -07:00
JaredTherriault 6c75bbd8ba Try/Catch when decoding filemap from python 2024-04-22 13:05:21 -07:00
JaredTherriault 47ffb7f703 Fix Show button not appearing after hiding drawer 2024-04-22 12:53:26 -07:00
JaredTherriault 2c53fa8dfd Fix image loading in Extra Networks 2024-04-21 16:04:44 -07:00
JaredTherriault 6cbd1440f1 video_preview polish
-Enable controls on video preview
-Account for file paths deeper than 3 folders
-Rename some variables for clarity
2024-04-18 22:38:04 -07:00
JaredTherriault 8c0920657c Add agnostic VideoControls
-Create VideoControls script for agnostic control of video elements
-Update classes to use VideoControls where appropriate
-Create jnodes_image_drawer_payload payload for drag and drop from image drawer to upload nodes
-Add href to fileInfo on imageElement creation to facilitate payload
2024-04-18 22:36:33 -07:00
JaredTherriault b1a44cf0cc Add playbackRate video option, improve menu widget options
-Add option for playback rate (speed)
-Add hotkeys for changing playback rate ( , and . )
-Add labeled number input widget
-Inherit labeled widget types from base class
-Add option for onchange to above base class
-Clamp numbers when setting numeric values on videos
-Add some helper functions to video elements
-Remove bPropagateOnChange, roll functionality into forEachElement delegate
-Add widgetType parameter to inform the widget type to be created
-Removed unnecessary and incorrect comments
2024-04-18 17:58:33 -07:00
JaredTherriault a514999008 video_preview improvements
-Add ogg support
-Set video parameters before load (fixes autoplay)
-Remove unnecessary OR
-Rename preview widget
-Remove widget video typing (not necessary)
2024-04-18 13:58:27 -07:00
JaredTherriault 4890108b8f Remove unnecessary include 2024-04-18 13:55:28 -07:00
JaredTherriault e6b546c99a Fix indefinite recursion bug with handleFile, add ogg support for video metadata 2024-04-18 10:37:27 -07:00
JaredTherriault ebd1b837d6 Add function to hide tooltip in imageElements and hide tooltip on drag start 2024-04-18 10:35:48 -07:00