ver 1.2

app.R

@@ -70,6 +70,8 @@ ui <- fluidPage(
             } else {
                 Shiny.setInputValue('clicked_caption', caption, {priority: 'event'});
             }
+        } else if (operationModeElement && operationModeElement.innerText === 'Database Making') {
+            Shiny.setInputValue('clicked_caption_RDB', caption, {priority: 'event'});
         } else {
             copyToClipboard(caption);
         }
@@ -80,6 +82,7 @@ ui <- fluidPage(
   # ユーザー入力を受け付ける部分
   sidebarLayout(
     sidebarPanel(
+      width = 3,
       uiOutput("operation_mode_UI"),
       
       # ディレクトリパスを入力するテキストボックス
@@ -102,7 +105,7 @@ ui <- fluidPage(
         tags$br(),
         tags$br(),
         
-        # Direct Removerボタンの追加
+        # Direct Removerモード
         actionButton("direct_remover", "Direct Remover"),
         conditionalPanel(
           condition = "output.operation_mode_UI === 'direct remove'",
@@ -110,12 +113,32 @@ ui <- fluidPage(
         ),
         tags$br(),
         tags$br(),
+        
+        # Database Makingモード
+        actionButton("enter_database_mode", "Enter Database Making Mode"),
+        conditionalPanel(
+          condition = "output.operation_mode_UI === 'Database Making'",
+          actionButton("exit_database_mode", "Exit Database Making Mode"),
+          tags$br(),
+          tags$br(),
+          textInput("parent_caption_input", "Parent Caption:"),
+          textInput("child_caption_input", "Child Caption:"),
+          actionButton("add_to_RDB", "Add to Database"),
+          actionButton("clear_inputs_RDB", "Clear"),
+          tags$br(),
+          tags$br(),
+          fileInput("load_relation_database", "Load Relation DB", accept = ".csv"),
+          downloadButton("save_relation_database", "Save Relation DB"),
+          tags$br(),
+          tags$br(),
+          actionButton("aggregate_single", "Aggregation Single"),
+          actionButton("aggregate_all", "Aggregation All")
+        ),
+        
         conditionalPanel(
-          condition = "output.operation_mode_UI !== 'direct remove'",
-            
-          # タブセット
-          actionButton("shuffle_single", "Shuffle Order for Current Image"),
-          actionButton("shuffle_all", "Shuffle Order for All Images"),
+          condition = "output.operation_mode_UI !== 'direct remove' && output.operation_mode_UI !== 'Database Making'",
+          actionButton("shuffle_single", "Shuffle Single"),
+          actionButton("shuffle_all", "Shuffle All"),
           tags$br(),
           tags$br(),
           numericInput("frequency_threshold", "Frequency Threshold:", value = 5, min = 1),
@@ -123,18 +146,18 @@ ui <- fluidPage(
           tags$br(),
           tags$br(),
           textInput("edit_caption", "Caption to Edit:", ""),
-          actionButton("remove_single", "Remove from Single"),
-          actionButton("remove_from_all", "Remove from All"),
+          actionButton("remove_single", "Remove Single"),
+          actionButton("remove_from_all", "Remove All"),
           # actionButton("edit_interactively", "Edit Interactively"),
           tags$br(),
-          actionButton("add_single", "Add to Single"),
-          actionButton("add_to_all", "Add to All"),
+          actionButton("add_single", "Add Single"),
+          actionButton("add_to_all", "Add All"),
           tags$br(),
-          actionButton("move_caption", "Move Caption"),
-          actionButton("move_caption_all", "Move Caption of All"),
+          actionButton("move_caption", "Move Single"),
+          actionButton("move_caption_all", "Move All"),
           tags$br(),
-          actionButton("remove_related_single", "Remove Related from Single"),
-          actionButton("remove_related_all", "Remove Related from all"),
+          actionButton("remove_related_single", "Remove Related Single"),
+          actionButton("remove_related_all", "Remove Related All"),
           orderInputPanel(),
           textInputPanel(),  # ここで関数を呼び出しています
           tags$br(),
@@ -160,8 +183,9 @@ ui <- fluidPage(
                actionButton("search_button", "Search"),
                actionButton("clear_search", "Clear"),
                fluidRow(
-                 column(6, tableOutput("selected_image_captions")),
-                 column(6, tableOutput("caption_frequency_table_with_links"))
+                 column(4, tableOutput("selected_image_captions")),
+                 column(4, tableOutput("caption_frequency_table_with_links")),
+                 column(4, tableOutput("relation_database_table"))
                )
         )
       )
@@ -176,7 +200,7 @@ server <- function(input, output, session) {
   directory_path <- reactiveVal()
   captions_data <- reactiveVal()
   caption_frequency <- reactiveVal()
-  operation_mode <- reactiveVal("normal")
+  operation_mode <- reactiveVal("Normal")
   log_text <- reactiveVal("Log:\n")
   
   ## ログ表示用
@@ -268,20 +292,159 @@ server <- function(input, output, session) {
     }
   })
   
-  # Direct Removerボタンの動作
+  # Direct Removerモード
   observeEvent(input$direct_remover, {
     operation_mode("direct remove")
     update_log("DIRECT REMOVER MODE.")
   })
   
   observeEvent(input$exit_direct_remover, {
-    operation_mode("normal")
+    operation_mode("Normal")
     update_log("Exited Direct Remover mode.")
   })
   
-  # Shuffle Order for Current Image
+  ## Relation Databaseモード
+  relation_database <- reactiveVal(data.frame(parent_caption = character(0), child_caption = character(0), stringsAsFactors = FALSE))
+  
+  observeEvent(input$enter_database_mode, {
+    operation_mode("Database Making")
+    update_log("DATABASE MAKING MODE.")
+  })
+  
+  observeEvent(input$exit_database_mode, {
+    operation_mode("Normal")
+    update_log("Exited Database Making mode.")
+  })
+  
+  observeEvent(input$clicked_caption_RDB, {
+    if (input$parent_caption_input == "") {
+      updateTextInput(session, "parent_caption_input", value = input$clicked_caption_RDB)
+    } else {
+      updateTextInput(session, "child_caption_input", value = input$clicked_caption_RDB)
+    }
+  })
+    
+  observeEvent(input$add_to_RDB, {
+    # 親キャプションまたは子キャプションが空欄の場合、または親キャプションと子キャプションが同じ場合、エラーログを出力
+    if (input$parent_caption_input == "" || input$child_caption_input == "" || input$parent_caption_input == input$child_caption_input) {
+      showNotification("Error: Invalid parent or child caption.", type = "error")
+      return()
+    }
+    
+    # 同じ組み合わせがrelation_databaseに存在するかチェック
+    existing_relation <- with(relation_database(), parent_caption == input$parent_caption_input & 
+                                child_caption == input$child_caption_input)
+    if (any(existing_relation)) {
+      showNotification("Error: This relation already exists in the database.", type = "error")
+      return() # このobserveEventの処理を終了
+    }
+    
+    # relation_databaseに関係を追加するコード
+    new_relation <- data.frame(parent_caption = input$parent_caption_input, 
+                               child_caption = input$child_caption_input)
+    updated_database <- rbind(relation_database(), new_relation)
+    relation_database(updated_database)
+    update_log("Relation added to database.")
+  })
+    
+  observeEvent(input$clear_inputs_RDB, {
+    updateTextInput(session, "parent_caption_input", value = "")
+    updateTextInput(session, "child_caption_input", value = "")
+  })
+  
+  observeEvent(input$aggregate_single, {
+    updated_data <- captions_data()
+    # 選択されている画像のcaptionを別変数に保存
+    captions_for_selected_image <- updated_data$caption[updated_data$image_path == input$selected_image]
+    
+    for (i in 1:nrow(relation_database())) {
+      parent <- relation_database()$parent_caption[i]
+      child <- relation_database()$child_caption[i]
+      
+      # parent_captionの存在確認を行い、存在する場合remove_caption_and_adjust_orderを実行
+      if (parent %in% captions_for_selected_image) {
+        updated_data <- remove_caption_and_adjust_order(updated_data, input$selected_image, child)
+      }
+    }
+    
+    captions_data(updated_data)
+    
+    # キャプションの頻度を更新
+    updated_caption_frequency <- get_caption_frequency(captions_data())
+    caption_frequency(updated_caption_frequency)
+    
+    update_log("Captions aggregated for this image.")
+  })
+  
+  observeEvent(input$aggregate_all, {
+    updated_data <- captions_data()
+    
+    for (image_path in unique(updated_data$image_path)) {
+      # 各画像のcaptionを別変数に保存
+      captions_for_image <- updated_data$caption[updated_data$image_path == image_path]
+      
+      for (i in 1:nrow(relation_database())) {
+        parent <- relation_database()$parent_caption[i]
+        child <- relation_database()$child_caption[i]
+        
+        # parent_captionの存在確認を行い、存在する場合remove_caption_and_adjust_orderを実行
+        if (parent %in% captions_for_image) {
+          updated_data <- remove_caption_and_adjust_order(updated_data, image_path, child)
+        }
+      }
+    }
+    
+    captions_data(updated_data)
+    
+    # キャプションの頻度を更新
+    updated_caption_frequency <- get_caption_frequency(captions_data())
+    caption_frequency(updated_caption_frequency)
+    
+    update_log("Captions aggregated for all images.")
+  })
+  
+  # Relation Databaseをセーブ
+  output$save_relation_database <- downloadHandler(
+    filename = function() {
+      paste("relation_database_", Sys.Date(), ".csv", sep="")
+    },
+    content = function(file) {
+      write.csv(relation_database(), file, row.names = FALSE)
+    },
+    contentType = "text/csv"
+  )
+  
+  observeEvent(input$load_relation_database, {
+    # ファイルが選択された場合のみ処理を実行
+    if (!is.null(input$load_relation_database$datapath)) {
+      # CSV���ァイルを読み込む
+      new_data <- read.csv(input$load_relation_database$datapath, stringsAsFactors = FALSE)
+      
+      # データの整合性チェック
+      if (!all(c("parent_caption", "child_caption") %in% names(new_data))) {
+        showNotification("Error: The file does not have the required columns (parent_caption and child_caption).", type = "error")
+        return()
+      }
+      
+      if (any(is.na(new_data$parent_caption)) || any(is.na(new_data$child_caption))) {
+        showNotification("Error: The file contains missing values in parent_caption or child_caption.", type = "error")
+        return()
+      }
+      
+      if (any(nchar(new_data$parent_caption) == 0) || any(nchar(new_data$child_caption) == 0)) {
+        showNotification("Error: The file contains empty strings in parent_caption or child_caption.", type = "error")
+        return()
+      }
+      
+      # relation_database()に新しいデータを格納
+      relation_database(new_data)
+      update_log("Relation database loaded.")
+    }
+  })
+  
+  ## Shuffle Order for Current Image
   observeEvent(input$shuffle_single, {
-    if (operation_mode() != "normal") {
+    if (operation_mode() != "Normal") {
       showNotification("Another operation is in progress. Please finish or cancel it first.", type = "error")
       return()
     }
@@ -303,7 +466,7 @@ server <- function(input, output, session) {
   
   # Shuffle Order for All Images
   observeEvent(input$shuffle_all, {
-    if (operation_mode() != "normal") {
+    if (operation_mode() != "Normal") {
       showNotification("Another operation is in progress. Please finish or cancel it first.", type = "error")
       return()
     }
@@ -324,7 +487,7 @@ server <- function(input, output, session) {
   
   # remove_low_freqボタンが押されたときの処理
   observeEvent(input$remove_low_freq, {
-    if (operation_mode() != "normal") {
+    if (operation_mode() != "Normal") {
       showNotification("Another operation is in progress. Please finish or cancel it first.", type = "error")
       return()
     }
@@ -335,7 +498,7 @@ server <- function(input, output, session) {
       captions_data(updated_data)
       
       # キャプションの頻度を更新
-      updated_caption_frequency <- get_caption_frequency(updated_data)
+      updated_caption_frequency <- get_caption_frequency(captions_data())
       caption_frequency(updated_caption_frequency)
     }
     
@@ -344,7 +507,7 @@ server <- function(input, output, session) {
   
   # Remove Captions from All Images
   observeEvent(input$remove_from_all, {
-    if (operation_mode() != "normal") {
+    if (operation_mode() != "Normal") {
       showNotification("Another operation is in progress. Please finish or cancel it first.", type = "error")
       return()
     }
@@ -359,7 +522,7 @@ server <- function(input, output, session) {
     captions_data(updated_data)
     
     # キャプションの頻度を更新
-    updated_caption_frequency <- get_caption_frequency(updated_data)
+    updated_caption_frequency <- get_caption_frequency(captions_data())
     caption_frequency(updated_caption_frequency)
     
     update_log("Caption removed from all images.")
@@ -370,7 +533,7 @@ server <- function(input, output, session) {
   showTextInput <- reactiveVal(FALSE)
   
   observeEvent(input$remove_single, {
-    if (operation_mode() != "normal") {
+    if (operation_mode() != "Normal") {
       showNotification("Another operation is in progress. Please finish or cancel it first.", type = "error")
       return()
     }
@@ -385,7 +548,7 @@ server <- function(input, output, session) {
   })
   
   observeEvent(input$add_single, {
-    if (operation_mode() != "normal") {
+    if (operation_mode() != "Normal") {
       showNotification("Another operation is in progress. Please finish or cancel it first.", type = "error")
       return()
     }
@@ -395,7 +558,7 @@ server <- function(input, output, session) {
   })
 
   observeEvent(input$add_to_all, {
-    if (operation_mode() != "normal") {
+    if (operation_mode() != "Normal") {
       showNotification("Another operation is in progress. Please finish or cancel it first.", type = "error")
       return()
     }
@@ -405,7 +568,7 @@ server <- function(input, output, session) {
   })
   
   observeEvent(input$move_caption, {
-    if (operation_mode() != "normal") {
+    if (operation_mode() != "Normal") {
       showNotification("Another operation is in progress. Please finish or cancel it first.", type = "error")
       return()
     }
@@ -420,7 +583,7 @@ server <- function(input, output, session) {
   })
   
   observeEvent(input$move_caption_all, {
-    if (operation_mode() != "normal") {
+    if (operation_mode() != "Normal") {
       showNotification("Another operation is in progress. Please finish or cancel it first.", type = "error")
       return()
     }
@@ -430,7 +593,7 @@ server <- function(input, output, session) {
   })
   
   observeEvent(input$remove_related_single, {
-    if (operation_mode() != "normal") {
+    if (operation_mode() != "Normal") {
       showNotification("Another operation is in progress. Please finish or cancel it first.", type = "error")
       return()
     }
@@ -450,7 +613,7 @@ server <- function(input, output, session) {
   })
   
   observeEvent(input$remove_related_all, {
-    if (operation_mode() != "normal") {
+    if (operation_mode() != "Normal") {
       showNotification("Another operation is in progress. Please finish or cancel it first.", type = "error")
       return()
     }
@@ -503,9 +666,9 @@ server <- function(input, output, session) {
     )
 
     # キャプションの頻度を更新
-    updated_caption_frequency <- get_caption_frequency(updated_data)
+    updated_caption_frequency <- get_caption_frequency(captions_data())
     caption_frequency(updated_caption_frequency)
-    operation_mode("normal")
+    operation_mode("Normal")
     showOrderInput(FALSE)
   })
   
@@ -542,21 +705,21 @@ server <- function(input, output, session) {
     )
     
     # キャプションの頻度を更新
-    updated_caption_frequency <- get_caption_frequency(updated_data)
+    updated_caption_frequency <- get_caption_frequency(captions_data())
     caption_frequency(updated_caption_frequency)
-    operation_mode("normal")
+    operation_mode("Normal")
     showTextInput(FALSE)
   })
   
   
   observeEvent(input$cancel_order, {
-    operation_mode("normal")
+    operation_mode("Normal")
     showOrderInput(FALSE)
     update_log("Operation was canceled.")
   })
   
   observeEvent(input$cancel_text, {
-    operation_mode("normal")
+    operation_mode("Normal")
     showTextInput(FALSE)
     update_log("Operation was canceled.")
   })
@@ -582,7 +745,7 @@ server <- function(input, output, session) {
     captions_data(updated_data)
     
     # キャプションの頻度を更新
-    updated_caption_frequency <- get_caption_frequency(updated_data)
+    updated_caption_frequency <- get_caption_frequency(captions_data())
     caption_frequency(updated_caption_frequency)
     
     update_log("Caption removed from this image.")
@@ -600,32 +763,12 @@ server <- function(input, output, session) {
     captions_data(updated_data)
     
     # キャプションの頻度を更新
-    updated_caption_frequency <- get_caption_frequency(updated_data)
+    updated_caption_frequency <- get_caption_frequency(captions_data())
     caption_frequency(updated_caption_frequency)
     
     update_log("Caption removed from all images.")
   })
   
-  ## Restore Captions
-  # 3. 「Restore captions」ボタンがクリックされたときの処理
-  # observeEvent(input$restore_captions, {
-  #   # 確認のダイアログを表示
-  #   if (modalDialog(
-  #     title = "Confirmation",
-  #     "Are you sure you want to restore the captions?",
-  #     footer = tagList(
-  #       modalButton("Cancel"),
-  #       actionButton("proceed_restore", "Yes, Restore")
-  #     )
-  #   )) {
-  #     # 復元処理
-  #     observeEvent(input$proceed_restore, {
-  #       captions_data(temp_captions_data())
-  #       removeModal()
-  #     })
-  #   }
-  # })
-  
   # yes/no選択dialog
   show_confirmation_dialog <- function() {
     showModal(
@@ -655,6 +798,9 @@ server <- function(input, output, session) {
     observeEvent(user_choice(), {
       if (user_choice() == "Yes") {
         captions_data(temp_captions_data())
+        # キャプションの頻度を更新
+        updated_caption_frequency <- get_caption_frequency(captions_data())
+        caption_frequency(updated_caption_frequency)
       }
       # リアクティブな変数をリセット
       user_choice(NULL)
@@ -701,22 +847,6 @@ server <- function(input, output, session) {
     list(src = file.path(input$selected_image), alt = "Selected Image", width = "80%")
   }, deleteFile = FALSE)
   
-  # output$image_captions <- renderUI({
-  #   if (!is.null(captions_data())) {
-  #     selected_image_path <- input$selected_image
-  #     captions <- filter(captions_data(), image_path == selected_image_path) %>%
-  #       arrange(caption_order) %>%
-  #       pull(caption)
-  #     
-  #     # キャプションをリンク付きのHTMLに変換
-  #     linked_captions <- lapply(captions, function(caption) {
-  #       sprintf("<a href='javascript:void(0);' onclick='handleCaptionClick(\"%s\", \"image\");'>%s</a>", caption, caption)
-  #     })
-  #   
-  #     HTML(paste(linked_captions, collapse = ", "))
-  #   }
-  # })
-  # 
   output$image_captions <- renderUI({
     if (!is.null(captions_data())) {
       selected_image_path <- input$selected_image
@@ -770,34 +900,11 @@ server <- function(input, output, session) {
       
       return(sorted_freq_data)
     }
-  }, sanitize.text.function = function(x) x, rownames = TRUE)
-  
-  
-  
-  
-  
-  # output$selected_image_captions <- renderTable({
-  #   if (!is.null(captions_data())) {
-  #     selected_image_path <- input$selected_image
-  #     selected_captions <- filter(captions_data(), image_path == selected_image_path) %>%
-  #       select(caption, caption_order) %>%
-  #       arrange(caption_order)
-  #     
-  #     # caption列の各エントリにリンクを追加
-  #     selected_captions$caption <- sprintf("<a href='javascript:void(0);' onclick='handleCaptionClick(\"%s\", \"image\");'>%s</a>", selected_captions$caption, selected_captions$caption)
-  #     
-  #     return(selected_captions)
-  #   }
-  # }, sanitize.text.function = function(x) x) # HTMLをエスケープしないようにする
-  # 
-  # output$caption_frequency_table_with_links <- renderTable({
-  #   if (!is.null(caption_frequency())) {
-  #     freq_data <- caption_frequency()
-  #     freq_data$caption <- sprintf("<a href='javascript:void(0);' onclick='handleCaptionClick(\"%s\", \"frequency\");'>%s</a>", freq_data$caption, freq_data$caption)
-  #     freq_data
-  #   }
-  # }, sanitize.text.function = function(x) x, rownames = TRUE)
+  }, sanitize.text.function = function(x) x)
   
+  output$relation_database_table <- renderTable({
+    relation_database()
+  }, sanitize.text.function = function(x) x)
 }
 
 # アプリを実行