CR Load Image List nodes

Patch_Notes.md

@@ -1,151 +1,88 @@
 # 🧩 Comfyroll Custom Nodes - Patch Notes
 
-## PR59 Dec 6, 2023
-
-__Changed Nodes__
+## v1.45 Dec 22, 2023
+- added CR Load Image List
+- added CR Load Image List Plus
 
- CR Aspect Ratio
-
- - added prescale_factor
+## v1.45 Dec 22, 2023
+- PR70 fixed issue #62 with RGB output from gradient nodes
 
-## PR55 Dec 2, 2023
+## PR78 Dec 21, 2023
+- added CR Feathered Border
+- added CR Vignette Filter
 
-__Other Changes__
+## PR76 Dec 19, 2023
+- updated CR Font File List
+- added CR Text List
 
- - removed node images
- - fixes to CR Page Layout 
+## PR73 Dec 18, 2023
+- issue #72 fixed, make font path agnostic
 
-## PR54 Dec 2, 2023
+## PR70 Dec 18, 2023
+- updated CR String To Number
+- updated CR Image Output
+- added CR Aspect Ratio Banners
+- added CR Font File List
+- added CR Simple Image Compare
+- updated logic nodes to make inputs optional
 
-__Other Changes__
-
- - added show-help outputs on animation nodes with links to wiki
-
-## PR51, PR52 Dec 2, 2023 
+## PR67 Dec 18, 2023
+- added CR Simple Banner
 
-__Added Nodes__
+## PR65 Dec 18, 2023
+- added CR Random Multiline Values
+- added CR Random RGB Gradient
+- added CR Overlay Transparent Image
+- added CR Binary PatternSimple
+- added CR Binary Pattern
 
- CR Random RGB
+## PR61 Dec 18, 2023
+- updated max images sizes on gradient nodes
 
-## PR50 Dec 1, 2023
+## PR60 Dec 18, 2023
+- added CR Random LoRA Stack and CR Random Weight LoRA
 
-__Other Changes__
-
- - added show-help outputs with links to wiki
+## PR59 Dec 6, 2023
+- updated CR Aspect Ratio
 
-## PR48 Nov 30, 2023
+## PR55 Dec 2, 2023
+- updated CR Page Layout 
 
-__Other Changes__
+## PR51, PR52 Dec 2, 2023 
+- added CR Random RGB
 
- - disabled CR Load Prompt Style
- - rename classes on logic nodes
- - increased max sizes on Aspect Ratio nodes
+## PR48 Nov 30, 2023
+- disabled CR Load Prompt Style
+- rename classes on logic nodes
+- increased max sizes on aspect ratio nodes
 
 ## PR45 Nov 29, 2023
-
-__Added Nodes__
-
- CR Random Hex Color
-
-__Changed Nodes__
-
- CR Color Tint 
-
- - added custom color
-
- CR Simple Text Panel
-
- - added outline text
-
-__Other Changes__
-
- - added demo workflows
+- added CR Random Hex Color
+- updated CR Color Tint 
+- updated CR Simple Text Panel
 
 ## PR44 Nov 28, 2023
-
-__Changed Nodes__
-
- CR Select Model
-
- - added ckpt_name output
-
-__Other Changes__
-
- - added new Patch Notes page 
+- updated CR Select Model
+- added new Patch Notes page 
 
 ## PR40 Nov 27, 2023
-
-__Added Nodes__
-
- CR Select Model
-
- - allows selection of model from one of 5 preset models 
-
-__Changed Nodes__
-
- CR Simple Text Watermark
-
- - added batch support
- - added custom font hex color
-
- CR Aspect Ratio
-
- - changed descriptions in aspect_ratios for issue 24
-
- CR Upscale Image
-
- - fixed issue with batched images
-
-__Other Changes__
-
- - changed preset RGB for brown to 160, 85, 15 
-
+- added CR Select Model
+- updated CR Simple Text Watermark
+- updated CR Aspect Ratio
+- updated CR Upscale Image
+- changed preset RGB for brown to 160, 85, 15 
 
 ## PR39 Nov 26, 2023
-
-__Changed Nodes__
-
- CR Halftone Filter
-
- - changed handling for RGBA inputs 
-
+- updated CR Halftone Filter
 
 ## PR38 Nov 26, 2023
-
- __Added Nodes__
-
- CR Aspect Ratio
-
- - combines aspect ratio options for both SD1.5 and SDXL
- - includes empty_latent output
-
-__Changed Nodes__
-
- CR Halftone Filter
-
- - added resolution options 
- - modified antialias_scale parameters
-
- CR SDXL Aspect Ratio
-
- - added empty_latent output 
-
- CR SD1.5 Aspect Ratio
-
- - added empty_latent output 
-
+- added CR Aspect Ratio
+- updated CR Halftone Filter
+- updated CR SDXL Aspect Ratio
+- updated CR SD1.5 Aspect Ratio
 
 ## PR37 Nov 19, 2023
-
-__Added Nodes__
-
- CR Simple Text Watermark
-
- - adds a text watermark to an image
-
-__Other Changes__
-
- - merged CR Animation Nodes into Comfyroll custom Nodes
- - added CR Animation Nodes demo workflows
- - added reduce_opacity function in graphics_functions
+- added CR Simple Text Watermark
+- merged CR Animation Nodes into Comfyroll custom Nodes
+- added reduce_opacity function in graphics_functions
 

README.md

@@ -34,6 +34,8 @@ __🔳 Aspect Ratio__
 __📜 List Nodes__
 * CR Font File List (new 18/12/2023)
 * CR Text List (new 19/12/2023)
+* CR Load Image List (new 23/12/2023)
+* CR Load Image List Plus (new 23/12/2023)
 
 __🌟 SDXL__
 * CR SDXL Prompt Mix Presets

__init__.py

@@ -24,6 +24,8 @@
 from .nodes.pil_template import *
 from .nodes.pil_pattern import *
 from .nodes.nodes_random import *
+from .nodes.nodes_list import *
+from .nodes.nodes_aspect_ratio import *
 
 from .animation_nodes.interpolation import *
 from .animation_nodes.io import *
@@ -47,7 +49,9 @@
  "CR Select Model": CR_SelectModel,
  ### List Nodes
  "CR Font File List": CR_FontFileList,
- "CR Text List": CR_TextList, 
+ "CR Text List": CR_TextList,
+ "CR Load Image List": CR_LoadImageList,
+ "CR Load Image List Plus": CR_LoadImageListPlus, 
  ### Aspect Ratio Nodes
  "CR SD1.5 Aspect Ratio":CR_AspectRatioSD15,
  "CR SDXL Aspect Ratio":CR_SDXLAspectRatio,
@@ -203,7 +207,7 @@
  "CR LoRA List": CR_LoRAList,
  #"CR Text List": CR_TextList,
  "CR Text List Simple": CR_TextListSimple,
- "CR Image List": CR_ImageList,
+ #"CR Image List": CR_ImageList,
  "CR Image List Simple": CR_ImageListSimple, 
  # Cyclers
  "CR Cycle Models": CR_CycleModels, 
@@ -235,7 +239,9 @@
  "CR Select Model": "🔮 CR Select Model",
  ### List Nodes
  "CR Font File List": "📜 CR Font File List",
- "CR Text List": "📜 CR Text List", 
+ "CR Text List": "📜 CR Text List",
+ "CR Load Image List": "📜 CR Load Image List",
+ "CR Load Image List Plus": "📜 CR Load Image List Plus", 
  ### Aspect Ratio Nodes
  "CR SD1.5 Aspect Ratio": "🔳 CR SD1.5 Aspect Ratio",
  "CR SDXL Aspect Ratio": "🔳 CR SDXL Aspect Ratio", 
@@ -392,7 +398,7 @@
  "CR LoRA List": "📃 CR LoRA List",
  #"CR Text List": "📃 CR Text List",
  "CR Text List Simple": "📃 CR Text List Simple",
- "CR Image List": "📃 CR Image List",
+ #"CR Image List": "📃 CR Image List",
  "CR Image List Simple": "📃 CR Image List Simple", 
  "CR Input Text List": "📃 CR Input Text List", 
  # Cyclers

animation_nodes/lists.py

@@ -274,6 +274,7 @@ def text_list_simple(self, text_1, text_2, text_3, text_4, text_5, text_list_si
  return (texts, show_help, )
 
 #---------------------------------------------------------------------------------------------------------------------#
+'''
 class CR_ImageList:
 
  @classmethod
@@ -334,8 +335,7 @@ def image_list(self,
  show_help = "https://github.com/Suzie1/ComfyUI_Comfyroll_CustomNodes/wiki/List-Nodes#cr-image-list" 
 
  return (images, show_help, ) 
-
-
+'''
 #---------------------------------------------------------------------------------------------------------------------#
 class CR_ImageListSimple:
 
@@ -434,9 +434,8 @@ def text_list_simple(self, text):
  "CR Text List":CR_TextList,
  "CR Text List Simple":CR_TextListSimple,
  "CR Image List":CR_ImageList, 
- "CR Image List Simple":CR_ImageListSimple, 
- ### More
- "CR Input Text List":CR_InputTextList, 
+ "CR Image List Simple":CR_ImageListSimple,
+ "CR Input Text List":CR_InputTextList, 
 }
 '''
 

config.py

@@ -13,7 +13,7 @@
  "brown": (160, 85, 15),
  "gray": (128, 128, 128),
  "lightgray": (211, 211, 211),
- "darkgray": (169, 169, 169),
+ "darkgray": (102, 102, 102),
  "olive": (128, 128, 0),
  "lime": (0, 128, 0),
  "teal": (0, 128, 128),

dev_nodes/dev_nodes.py

@@ -6,6 +6,34 @@
 from ..categories import icons
 
 #---------------------------------------------------------------------------------------------------------------------#
+'''
+class CR_ListLength:
+
+ @classmethod
+ def INPUT_TYPES(s):
+ 
+ input_dir = folder_paths.input_directory
+ image_folder = [name for name in os.listdir(input_dir) if os.path.isdir(os.path.join(input_dir,name))] 
+ 
+ return {"required": {
+ "any_type": (any_type,),
+ }
+ }
+
+ RETURN_TYPES = ("INT", "STRING", )
+ RETURN_NAMES = ("INT", "show_help", )
+ OUTPUT_IS_LIST = (False, False)
+ FUNCTION = "get_length"
+ CATEGORY = icons.get("Comfyroll/List")
+
+ def get_length(self, any_type):
+
+ list_len = len(any_type)
+
+ show_help = "https://github.com/Suzie1/ComfyUI_Comfyroll_CustomNodes/wiki/Other-Nodes#cr-list-length"
+
+ return (list_len, show_help, )
+'''
 
 #---------------------------------------------------------------------------------------------------------------------#
 # MAPPINGS