Update app.py

app.py

@@ -1,6 +1,5 @@
 import gradio as gr
 import pandas as pd
-import plotly.graph_objects as go
 from shapely.geometry import Point, Polygon
 
 def load_csv(file):
@@ -9,71 +8,53 @@ def load_csv(file):
 def update_dropdowns(df):
     return gr.Dropdown(choices=df.columns.tolist()), gr.Dropdown(choices=df.columns.tolist())
 
-def create_plot(df, x_col, y_col, polygon_points=None):
-    fig = go.Figure()
-    
-    # Ana veri noktaları
-    if df is not None and x_col and y_col:
-        fig.add_trace(go.Scatter(
-            x=df[x_col],
-            y=df[y_col],
-            mode='markers',
-            marker=dict(color='blue', size=8),
-            name='Veri Noktaları'
-        ))
-    
-    # Polygon çizgileri
-    if polygon_points and len(polygon_points) > 0:
-        fig.add_trace(go.Scatter(
-            x=[p[0] for p in polygon_points],
-            y=[p[1] for p in polygon_points],
-            mode='lines+markers',
-            line=dict(color='red', width=2),
-            marker=dict(color='red', size=10),
-            name='Polygon'
-        ))
-    
-    fig.update_layout(
-        title=f"{x_col} vs {y_col}" if x_col and y_col else "Veri Görselleştirme",
-        dragmode='drawpoint',
-        clickmode='event+select'
+def create_scatter(df, x_col, y_col):
+    if df is None or x_col is None or y_col is None:
+        return None
+    return gr.ScatterPlot(
+        value=df[[x_col, y_col]],
+        x=x_col,
+        y=y_col,
+        title=f"{x_col} vs {y_col}",
+        interactive=True,
+        tooltip=list(df.columns),
+        color="blue"
     )
-    return fig
 
-def handle_plot_click(click_data, df, x_col, y_col, polygon_points):
-    if not click_data or not x_col or not y_col:
-        return polygon_points, pd.DataFrame()
+def filter_points(selected_data, df, x_col, y_col):
+    if not selected_data or not df.empty:
+        return pd.DataFrame()
     
-    # Tıklanan noktanın koordinatlarını al
-    new_point = (click_data['points'][0]['x'], click_data['points'][0]['y'])
-    updated_points = polygon_points + [new_point]
+    # Seçilen polygon noktalarını al
+    points = selected_data["points"]
+    if len(points) < 3:
+        return pd.DataFrame()
     
-    # Polygon'u kontrol et ve noktaları filtrele
-    if len(updated_points) >= 3:
-        try:
-            poly = Polygon(updated_points)
-            mask = df.apply(lambda row: poly.contains(Point(row[x_col], row[y_col])), axis=1)
-            return updated_points, df[mask]
-        except:
-            return updated_points, pd.DataFrame()
+    # Polygon oluştur
+    polygon = Polygon([(p["x"], p["y"]) for p in points])
     
-    return updated_points, pd.DataFrame()
+    # İçerde kalan noktaları bul
+    mask = df.apply(lambda row: polygon.contains(Point(row[x_col], row[y_col])), axis=1)
+    return df[mask]
 
 with gr.Blocks() as demo:
-    gr.Markdown("## Interaktif Polygon Seçim Aracı")
+    gr.Markdown("## Interaktif Veri Seçim Aracı")
     
-    df_state = gr.State()
-    polygon_state = gr.State([])
+    df_state = gr.State(pd.DataFrame())
     
     with gr.Row():
         csv_upload = gr.File(label="CSV Yükle", file_types=[".csv"])
         x_col = gr.Dropdown(label="X Sütunu")
         y_col = gr.Dropdown(label="Y Sütunu")
     
-    plot = gr.Plot(label="Veri Görselleştirme")
-    results = gr.DataFrame(label="Seçilen Veriler", interactive=False)
+    plot = gr.ScatterPlot(
+        label="Veri Dağılımı",
+        show_export_button=True,
+        interactive=True
+    )
+    results = gr.DataFrame(label="Seçilen Veriler")
     
-    # CSV yükleme ve dropdown güncelleme
+    # CSV yükleme işlemi
     csv_upload.upload(
         load_csv,
         inputs=csv_upload,
@@ -84,28 +65,24 @@ with gr.Blocks() as demo:
         outputs=[x_col, y_col]
     )
     
-    # Plot güncelleme
+    # Sütun değişikliklerinde plot güncelleme
     x_col.change(
-        create_plot,
-        inputs=[df_state, x_col, y_col, polygon_state],
+        create_scatter,
+        inputs=[df_state, x_col, y_col],
         outputs=plot
     )
     
     y_col.change(
-        create_plot,
-        inputs=[df_state, x_col, y_col, polygon_state],
+        create_scatter,
+        inputs=[df_state, x_col, y_col],
         outputs=plot
     )
     
-    # Tıklama olayı işleyicisi
-    plot.click(
-        handle_plot_click,
-        inputs=[df_state, x_col, y_col, polygon_state],
-        outputs=[polygon_state, results]
-    ).then(
-        create_plot,
-        inputs=[df_state, x_col, y_col, polygon_state],
-        outputs=plot
+    # Polygon seçim etkinliği
+    plot.select(
+        filter_points,
+        inputs=[df_state, x_col, y_col],
+        outputs=results
     )
 
 demo.launch()