Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 21 additions & 3 deletions ai_diffusion/model.py
Original file line number Diff line number Diff line change
Expand Up @@ -599,7 +599,13 @@ def show_preview(self, job_id: str, index: int, name_prefix="Preview"):
if job.kind is JobKind.animation:
return # don't show animation preview on canvas (it's slow and clumsy)

name = f"[{name_prefix}] {trim_text(job.params.name, 77)}"
layer_name = ""
if settings.prompt_as_layer_name:
if job.params.name == "":
layer_name = "<no prompt>"
else:
layer_name = trim_text(job.params.name, 77)
name = f"[{name_prefix}] {layer_name} ({job.params.seed})"
image = job.results[index]
bounds = job.params.bounds
if image.extent != bounds.extent:
Expand Down Expand Up @@ -631,7 +637,13 @@ def apply_result(
if behavior is ApplyBehavior.replace:
self.layers.update_layer_image(self.layers.active, image, bounds)
else:
name = f"{prefix}{trim_text(params.name, 200)} ({params.seed})"
layer_name = ""
if settings.prompt_as_layer_name:
if params.name == "":
layer_name = "<no prompt>"
else:
layer_name = trim_text(params.name, 200)
name = f"{prefix}{layer_name} ({params.seed})"
pos = self.layers.active if behavior is ApplyBehavior.layer_active else None
self.layers.create(name, image, bounds, above=pos)
else: # apply to regions
Expand Down Expand Up @@ -740,7 +752,13 @@ def apply_animation(self, job: Job):
self.document.import_animation(frames, self.document.playback_time_range[0])

async def _set_layer_name():
self.layers.active.name = f"[Animation] {trim_text(job.params.name, 200)}"
layer_name = ""
if settings.prompt_as_layer_name:
if job.params.name == "":
layer_name = "<no prompt>"
else:
layer_name = trim_text(job.params.name, 200)
self.layers.active.name = f"[Animation] {layer_name}"

eventloop.run(_set_layer_name())

Expand Down
7 changes: 7 additions & 0 deletions ai_diffusion/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -276,6 +276,13 @@ class Settings(QObject):
"Apply Region Behavior (Live)", ApplyRegionBehavior.replace
)

prompt_as_layer_name: bool
_prompt_as_layer_name = Setting(
_("Prompt as Layer Name"),
True,
_("Use the positive prompt as the layer name for the preview layer and new layers"),
)

show_builtin_styles: bool
_show_builtin_styles = Setting(_("Show pre-installed styles"), True)

Expand Down
1 change: 1 addition & 0 deletions ai_diffusion/ui/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -483,6 +483,7 @@ def __init__(self):
"apply_region_behavior_live",
ComboBoxSetting(S._apply_region_behavior_live, parent=self),
)
self.add("prompt_as_layer_name", SwitchSetting(S._prompt_as_layer_name, parent=self))
self.add("new_seed_after_apply", SwitchSetting(S._new_seed_after_apply, parent=self))
self.add("debug_dump_workflow", SwitchSetting(S._debug_dump_workflow, parent=self))
self.add("save_image_metadata", SwitchSetting(S._save_image_metadata, parent=self))
Expand Down