Merge branch 'main' of github.com:rodjjo/diffusion-expert

Author: rodjjo

python_stuff/images/diffusion_routines.py

@@ -13,8 +13,19 @@
 from dexpert import progress, progress_canceled, progress_title
 
 
+REPORT_PREFIX = 'Text To Image'
+REPORT_PREFIXES = {
+    'txt2img': 'Text to Image',
+    'inpaint2img': 'Inpaint',
+    'img2img': 'Image to Image',
+}
+
+def set_prefix(text):
+    global REPORT_PREFIX
+    REPORT_PREFIX = text
+
 def report(message):
-    progress_title(f'[Text To Image] - {message}')
+    progress_title(f'[{REPORT_PREFIX}] - {message}')
 
 
 def get_lora_path(lora: str) -> str:
@@ -90,11 +101,14 @@ def _run_pipeline(pipeline_type, params):
     latents_noise = create_latents_noise(shape, seed, subseed, var_stren)
 
     generator = None if seed == -1  else torch.Generator(device=device).manual_seed(seed)
-    report("started")
 
     if pipeline_type == 'img2img' and input_mask is not None:
         pipeline_type = 'inpaint2img'
 
+    set_prefix(REPORT_PREFIXES.get(pipeline_type, "Text to Image"))
+
+    report("started")
+
     report("creating the pipeline")
     pipeline = create_pipeline(pipeline_type, model, controlnets=controlnets, lora_list=lora_list, reload_model=reload_model) 
     report("pipeline created")

src/controls/image_panel.cpp

@@ -188,13 +188,6 @@ namespace dexpert
     }
 
     bool ImagePanel::isSelecting() {
-        if (images_[image_type_paste]) {
-            selection_start_ = paste_coords_;
-            selection_end_ = paste_coords_;
-            selection_end_.x += images_[image_type_paste]->w();
-            selection_end_.y += images_[image_type_paste]->h();
-            return false;
-        }
         return tool_ == image_tool_select && mouse_down_left_;
     }
 
@@ -497,11 +490,19 @@ namespace dexpert
         scrollAgain();
     }
 
+    void ImagePanel::setMaskPanel(ImagePanel *mask_panel) {
+        mask_panel_ = mask_panel;
+    }
+
     RawImage* ImagePanel::get_cached_image(int layer) {
         /*
             Dim the image to fit the window. Don't draw a huge image in a smaller area...
         */
         RawImage *original = images_[layer].get();
+        if (mask_panel_ != NULL && layer == image_type_mask && mask_panel_->image_visible_[layer]) {
+            original = mask_panel_->images_[layer].get();
+        }
+
         if (layer == image_type_paste) {
             return NULL;
         } else if (layer == image_type_image && original == NULL) {
@@ -523,6 +524,7 @@ namespace dexpert
         }
 
         image_ptr_t &cache = caches_[layer];
+
         if (!cache.get() || 
             !valid_caches_[layer] ||
             cache_versions_[layer] != original->getVersion() ||
@@ -546,6 +548,8 @@ namespace dexpert
                 s1.x -= xmove * zoom_;
                 s1.y -= ymove * zoom_;
                 cache->pasteAt(s1.x , s1.y, img->w() * zoom_, img->h() * zoom_, img);
+            } else if (layer == image_type_mask && caches_[image_type_image].get() != NULL) {
+                cache->pasteInvertMask(caches_[image_type_image].get());
             }
         }
 
@@ -577,6 +581,7 @@ namespace dexpert
                 draw_buffer(img);
             }
         }
+        
         blur_gl_contents(this->w(), this->h(), current_x_, current_y_);
         draw_tool();
     }
@@ -607,6 +612,26 @@ namespace dexpert
     void ImagePanel::draw_tool() {
         float sx = 2.0 / this->w();
         float sy = 2.0 / this->h();
+
+        auto r = getReferenceImage();
+        if (r) {
+            coordinate_t s1, s2;
+            s1.x = -1;
+            s1.y = -1;
+            s2.x = r->w()+2;
+            s2.y = r->h()+2;
+            convertToScreenCoords(&s1.x, &s1.y);
+            convertToScreenCoords(&s2.x, &s2.y);
+            glBegin(GL_LINE_LOOP);
+            glColor4f(0.5, 0.5, 0.5, 0.3);
+            glVertex2f(s1.x * sx - 1.0, 1.0 - s1.y * sy);
+            glVertex2f(s2.x * sx - 1.0, 1.0 - s1.y * sy);
+            glVertex2f(s2.x * sx - 1.0, 1.0 - s2.y * sy);
+            glVertex2f(s1.x * sx - 1.0, 1.0 - s2.y * sy);
+            glVertex2f(s1.x * sx - 1.0, 1.0 - s1.y * sy);
+            glEnd();
+        }
+
         if (tool_ == image_tool_brush) {
             glBegin(GL_LINE_LOOP);
             float theta;
@@ -767,7 +792,6 @@ namespace dexpert
         scrollAgain();
     }
 
-
     void ImagePanel::setBrushSize(uint8_t size) {
         if (size > 128)
             brush_size_ = 128;
@@ -1036,7 +1060,7 @@ namespace dexpert
     }
 
     void ImagePanel::selectAll() {
-         if (images_[image_type_paste]) {
+        if (images_[image_type_paste]) {
             return;
         }
         auto r = getReferenceImage();

src/controls/image_panel.h

@@ -11,8 +11,8 @@
 typedef enum {
   image_type_image,         // the final image
   image_type_paste,         // a image that floats before being pasted in the image
-  image_type_controlnet,    // pre-processed
   image_type_mask,  
+  image_type_controlnet,    // pre-processed
   // keep layer count at the end
   image_type_count
 } image_type_t;
@@ -42,8 +42,9 @@ typedef enum {
     edit_type_none,         // edit disabled
     edit_type_image,        // the user can change the main image
     edit_type_paste,
-    edit_type_controlnet,   // the user can change the controlnet image
     edit_type_mask,         // the user can change the mask
+    edit_type_controlnet,   // the user can change the controlnet image
+
     // keep edit_type_count at the end.
     edit_type_count
 } edit_type_t;
@@ -125,6 +126,7 @@ namespace dexpert
         bool clicked();
         void scheduleRedraw();
         void zoomFit();
+        void setMaskPanel(ImagePanel *mask_panel);
 
     protected:
         int handle(int event) override;
@@ -159,10 +161,10 @@ namespace dexpert
 
         void convertToImageCoords(int *x, int *y);
         void convertToScreenCoords(int *x, int *y);
-
         void applyBrush(int mousex, int mousey, bool clear);
 
     private:
+        ImagePanel *mask_panel_ = NULL;
         callback_t on_change_;
         image_tool_t tool_ = image_tool_none;
         bool mouse_changed_ = false;

src/dialogs/common_dialogs.cpp

@@ -131,17 +131,31 @@ std::string executeChooser(Fl_File_Chooser *fc) {
 }
 
 std::string choose_image_to_open_fl(std::string* current_dir) {
-    Fl_File_Chooser dialog("", kIMAGE_FILES_FILTER_FL, Fl_File_Chooser::SINGLE, "Open image");
-    return executeChooser(&dialog);
+    if (!path_exists(current_dir->c_str())) {
+        *current_dir = "";
+    }
+    Fl_File_Chooser dialog(current_dir->c_str(), kIMAGE_FILES_FILTER_FL, Fl_File_Chooser::SINGLE, "Open image");
+    std::string result = executeChooser(&dialog);
+    if (!result.empty()) {
+        size_t latest = result.find_last_of("/\\");
+        *current_dir = result.substr(0, latest);
+    }
+    return result;
 }
 
 std::string choose_image_to_save_fl(std::string* current_dir) {
-    Fl_File_Chooser dialog("", kIMAGE_FILES_FILTER_FL, Fl_File_Chooser::SINGLE | Fl_File_Chooser::CREATE, "Save image");
+    if (!path_exists(current_dir->c_str())) {
+        *current_dir = "";
+    }
+    Fl_File_Chooser dialog(current_dir->c_str(), kIMAGE_FILES_FILTER_FL, Fl_File_Chooser::SINGLE | Fl_File_Chooser::CREATE, "Save image");
     std::string result = executeChooser(&dialog);
 
     if (!result.empty() && path_exists(result.c_str())) {
         if (!ask("Do you want to replace the destination file ?")) {
             result.clear();
+        } else {
+            size_t latest = result.find_last_of("/\\");
+            *current_dir = result.substr(0, latest);
         }
     }
 

src/dialogs/utils.cpp

@@ -11,7 +11,7 @@ namespace dexpert
 
 image_ptr_t open_image_from_dialog() {
     image_ptr_t result;
-    std::string path = choose_image_to_open(&getConfig().lastImageSaveDir());
+    std::string path = choose_image_to_open(&getConfig().lastImageOpenDir());
     if (!path.empty()) {
         result = get_sd_state()->openImage(path.c_str());
         if (!result) {

src/panels/embedding_panel.cpp

@@ -23,13 +23,25 @@ EmbeddingPanel::EmbeddingPanel(embedding_type_t embedding_type, int x, int y, in
 
     btnLeft_.reset(new Button(xpm::image(xpm::arrow_left_16x16), [this]{
         if (index_ > 0) {
-            --index_;
+            if (Fl::event_shift() != 0) {
+                if ((int)index_ - (int)images_.size() >= 0) {
+                    index_ -= images_.size();
+                } else {
+                    index_ = 0;
+                }
+            } else if (index_> 0){
+                --index_;
+            }
         }
         updateData();
     }));
 
     btnRight_.reset(new Button(xpm::image(xpm::arrow_right_16x16), [this]{
-        ++index_;
+        if (Fl::event_shift() != 0) {
+            index_ += images_.size();
+        } else {
+            ++index_;
+        }
         updateData();
     }));
 

src/panels/painting_panel.cpp

@@ -222,6 +222,8 @@ PaintingPanel::PaintingPanel(int x, int y, int w, int h,  PromptPanel *prompt, P
 
     if (!inputPanel_) {
         btnInput_->hide();
+    } else {
+        this->image_panel_->setMaskPanel(inputPanel_->image_panel_);
     }
 
     blur_mask_->hide();
@@ -508,6 +510,7 @@ void PaintingPanel::modeSelected() {
         case painting_canny:
         case painting_scribble:
         case painting_deepth: {
+            image_panel_->setLayerVisible(image_type_mask, only_control_net_);
             image_panel_->setEditType(edit_type_controlnet);
             image_panel_->setControlnetImageType(controltype_from_mode(getSelectedMode()));
             image_panel_->setLayerVisible(image_type_controlnet, true);

src/panels/preview_panel.cpp

@@ -126,6 +126,9 @@ void PreviewPanel::setRow(size_t value) {
 }
 
 size_t PreviewPanel::getRow() {
+    if (row_ >= get_sd_state()->getGeneratorSize() && get_sd_state()->getGeneratorSize() > 0) {
+        row_ = get_sd_state()->getGeneratorSize() - 1;
+    }
     return row_;
 }
 

src/panels/preview_panel.h

@@ -37,8 +37,6 @@ namespace dexpert
         Fl_Box *lblCounter_;
 
         std::unique_ptr<Button> btnUse_;
-        std::unique_ptr<Button> btnNext_;
-        std::unique_ptr<Button> btnNextVar_;
         std::unique_ptr<Button> btnRemove_;
         std::unique_ptr<Button> btnView_;
         std::unique_ptr<Button> btnScrollLeft_;

src/panels/prompt_panel.cpp

@@ -280,48 +280,29 @@ void PromptPanel::refreshModels() {
         return;
     }
 
-    std::string modelName = "";
-    std::string modelInpaint = "";
-    if (models_->value() >= 0) {
-        modelName = models_->text(models_->value());
-    } else {
-        modelName = getConfig().getLatestSdModel();
-    }
-    if (modelsInpaint_->value() >= 0) {
-        modelInpaint = modelsInpaint_->text(modelsInpaint_->value());
-    } else {
-        modelInpaint = getConfig().getLatestSdModelInpaint();
-    }
+    std::string modelName = getConfig().getLatestSdModel();
+    std::string modelInpaint = getConfig().getLatestSdModelInpaint();
 
     models_->clear();
     modelsInpaint_->clear();
 
     auto mdls = get_sd_state()->getSdModels();
 
-    int index = 0;
-    int inpaintIndex = 0;
-    int value = -1;
-    int valueInpaint = -1;
     std::string name_lower;
 
     for (auto it = mdls.cbegin(); it != mdls.cend(); it++) {
         name_lower = it->name;
         std::transform(name_lower.begin(), name_lower.end(), name_lower.begin(), ::tolower);
         if (name_lower.find("inpaint") != std::string::npos) {
             modelsInpaint_->add(it->name.c_str());
-            if (valueInpaint == -1 && it->name == modelInpaint) {
-                valueInpaint = inpaintIndex;
-            }
-            ++inpaintIndex;
         } else {
             models_->add(it->name.c_str());
-            if (value == -1 && it->name == modelName) {
-                value = index;
-            }
-            ++index;
         }
     }
-    
+
+    int value = models_->find_index(modelName.c_str());
+    int valueInpaint = modelsInpaint_->find_index(modelInpaint.c_str());
+   
     if (value < 0) 
         value = 0;
 
@@ -350,11 +331,9 @@ const char *PromptPanel::getSdModel(bool for_inpainting) {
         if (hasInpaint) {
             return modelsInpaint_->text(modelsInpaint_->value());
         }
-    } else {
-        if (hasNormal) {
-            return models_->text(models_->value());
-        }
-    }
+    } else if (hasNormal) {
+        return models_->text(models_->value());
+    }   
 
     return NULL;
 }