Upload app.R

app.R

@@ -16,15 +16,6 @@ orderInputPanel <- function() {
   )
 }
 
-textInputPanel <- function() {
-  conditionalPanel(
-    condition = "output.showTextInput",
-    textInput("related_captions_input", "Enter related captions (comma separated):"),
-    actionButton("confirm_text", "Confirm Order"),
-    actionButton("cancel_text", "Cancel")
-  )
-}
-
 # キャプションの並び替え関数
 sort_captions_by_search <- function(data, search_term) {
   if (is.null(search_term) || search_term == "") {
@@ -64,14 +55,16 @@ ui <- fluidPage(
   tags$script(HTML("
     function handleCaptionClick(caption, source) {
         var operationModeElement = document.getElementById('operation_mode_UI');
-        if (operationModeElement && operationModeElement.innerText === 'direct remove') {
-            if (source === 'frequency') {
-                Shiny.setInputValue('clicked_caption_frequency', caption, {priority: 'event'});
-            } else {
-                Shiny.setInputValue('clicked_caption', caption, {priority: 'event'});
-            }
+        if (source === 'remove_RDB') {
+          Shiny.setInputValue('remove_relation_index', caption, {priority: 'event'});
+        } else if (operationModeElement && operationModeElement.innerText === 'direct remove') {
+          if (source === 'frequency') {
+            Shiny.setInputValue('clicked_caption_frequency', caption, {priority: 'event'});
+          } else {
+            Shiny.setInputValue('clicked_caption', caption, {priority: 'event'});
+          }
         } else if (operationModeElement && operationModeElement.innerText === 'Database Making') {
-            Shiny.setInputValue('clicked_caption_RDB', caption, {priority: 'event'});
+          Shiny.setInputValue('clicked_caption_RDB', caption, {priority: 'event'});
         } else {
             copyToClipboard(caption);
         }
@@ -106,7 +99,7 @@ ui <- fluidPage(
         tags$br(),
         
         # Direct Removerモード
-        actionButton("direct_remover", "Direct Remover"),
+        actionButton("direct_remover", "Enter Direct Remover Mode"),
         conditionalPanel(
           condition = "output.operation_mode_UI === 'direct remove'",
           actionButton("exit_direct_remover", "Exit Direct Remover")
@@ -134,6 +127,8 @@ ui <- fluidPage(
           actionButton("aggregate_single", "Aggregation Single"),
           actionButton("aggregate_all", "Aggregation All")
         ),
+        tags$br(),
+        tags$br(),
         
         conditionalPanel(
           condition = "output.operation_mode_UI !== 'direct remove' && output.operation_mode_UI !== 'Database Making'",
@@ -156,10 +151,10 @@ ui <- fluidPage(
           actionButton("move_caption", "Move Single"),
           actionButton("move_caption_all", "Move All"),
           tags$br(),
-          actionButton("remove_related_single", "Remove Related Single"),
-          actionButton("remove_related_all", "Remove Related All"),
+          # actionButton("remove_related_single", "Remove Related Single"),
+          # actionButton("remove_related_all", "Remove Related All"),
           orderInputPanel(),
-          textInputPanel(),  # ここで関数を呼び出しています
+          # textInputPanel(),  # ここで関数を呼び出しています
           tags$br(),
         ),
         tags$br(),
@@ -182,10 +177,12 @@ ui <- fluidPage(
                textInput("search_caption", "Search Caption:", ""),
                actionButton("search_button", "Search"),
                actionButton("clear_search", "Clear"),
+               tags$br(),
+               tags$br(),
                fluidRow(
                  column(4, tableOutput("selected_image_captions")),
                  column(4, tableOutput("caption_frequency_table_with_links")),
-                 column(4, tableOutput("relation_database_table"))
+                 column(4, tableOutput("relation_database_display"))
                )
         )
       )
@@ -357,13 +354,15 @@ server <- function(input, output, session) {
     # 選択されている画像の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)
+    if (nrow(relation_database()) > 0) {
+      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)
+        }
       }
     }
     
@@ -379,17 +378,19 @@ server <- function(input, output, session) {
   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]
+    if (nrow(relation_database()) > 0) {
+      for (image_path in unique(updated_data$image_path)) {
+        # 各画像のcaptionを別変数に保存
+        captions_for_image <- updated_data$caption[updated_data$image_path == image_path]
         
-        # 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)
+        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)
+          }
         }
       }
     }
@@ -403,6 +404,20 @@ server <- function(input, output, session) {
     update_log("Captions aggregated for all images.")
   })
   
+  observeEvent(input$remove_relation_index, {
+    index_to_remove <- as.numeric(input$remove_relation_index)
+    
+    # 削除する関係の情報を保存
+    parent_to_remove <- relation_database()$parent_caption[index_to_remove]
+    child_to_remove <- relation_database()$child_caption[index_to_remove]
+    
+    # 関係を削除
+    relation_database(relation_database()[-index_to_remove, ])
+    
+    # ログを更新
+    update_log(paste("Removed relation:", parent_to_remove, "->", child_to_remove))
+  })
+  
   # Relation Databaseをセーブ
   output$save_relation_database <- downloadHandler(
     filename = function() {
@@ -592,36 +607,6 @@ server <- function(input, output, session) {
     update_log("MOVE CAPTION ALL MODE.")
   })
   
-  observeEvent(input$remove_related_single, {
-    if (operation_mode() != "Normal") {
-      showNotification("Another operation is in progress. Please finish or cancel it first.", type = "error")
-      return()
-    }
-    if (!is.null(captions_data())) {
-      selected_image_path <- input$selected_image
-      target_caption <- input$edit_caption
-      
-      # target_captionが選択された画像に紐づいているか確認
-      if (any(captions_data()$image_path == selected_image_path & captions_data()$caption == target_caption)) {
-        operation_mode("remove_related_single")
-        showTextInput(TRUE)
-        update_log("RELATIVE REMOVE SINGLE MODE.")
-      } else {
-        showNotification("Error: Caption not found in the selected image.", type = "error")
-      }
-    }
-  })
-  
-  observeEvent(input$remove_related_all, {
-    if (operation_mode() != "Normal") {
-      showNotification("Another operation is in progress. Please finish or cancel it first.", type = "error")
-      return()
-    }
-    operation_mode("remove_related_all")
-    showTextInput(TRUE)
-    update_log("RELATIVE REMOVE ALL MODE.")
-  })
-  
   observeEvent(input$confirm_order, {
     switch(operation_mode(),
       "add_single" = {
@@ -672,46 +657,6 @@ server <- function(input, output, session) {
     showOrderInput(FALSE)
   })
   
-  
-  observeEvent(input$confirm_text, {
-    switch(operation_mode(),
-           "remove_related_single" = {
-             # Remove Related captions of Singleの処理
-             related_captions <- unlist(strsplit(input$related_captions_input, ","))
-             related_captions <- trimws(related_captions)  # スペースを削除
-             representative_caption <- input$edit_caption
-             
-             updated_data <- remove_related_captions_except_representative(captions_data(), related_captions, representative_caption, input$selected_image)
-             captions_data(updated_data)
-             update_log("Relative captions were removed from this image.")
-           },
-           "remove_related_all" = {
-             # Remove Related captions from All Imagesの処理
-             related_captions <- unlist(strsplit(input$related_captions_input, ","))
-             related_captions <- trimws(related_captions)  # スペースを削除
-             representative_caption <- input$edit_caption
-             
-             updated_data <- captions_data()
-             # representative_captionを持つすべての画像を検索
-             images_with_rep_caption <- unique(updated_data$image_path[updated_data$caption == representative_caption])
-             
-             for (image_path in images_with_rep_caption) {
-               updated_data <- remove_related_captions_except_representative(updated_data, related_captions, representative_caption, image_path)
-             }
-             
-             captions_data(updated_data)
-             update_log("Relative captions were removed from all images.")
-           }
-    )
-    
-    # キャプションの頻度を更新
-    updated_caption_frequency <- get_caption_frequency(captions_data())
-    caption_frequency(updated_caption_frequency)
-    operation_mode("Normal")
-    showTextInput(FALSE)
-  })
-  
-  
   observeEvent(input$cancel_order, {
     operation_mode("Normal")
     showOrderInput(FALSE)
@@ -902,9 +847,17 @@ server <- function(input, output, session) {
     }
   }, sanitize.text.function = function(x) x)
   
-  output$relation_database_table <- renderTable({
-    relation_database()
-  }, sanitize.text.function = function(x) x)
+  output$relation_database_display <- renderTable({
+    db <- relation_database()
+    
+    # relation_databaseが空でない場合のみリンクを作成
+    if (nrow(db) > 0) {
+      db$remove <- sprintf("<a href='javascript:void(0);' onclick='handleCaptionClick(\"%s\", \"remove_RDB\");'>Remove</a>", 1:nrow(db))
+    }
+    
+    db
+  }, sanitize.text.function = function(x) x) # HTMLをエスケープしないようにする
+  
 }
 
 # アプリを実行