Update app.py

app.py

@@ -10,59 +10,59 @@ 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):
-    if df is None or x_col is None or y_col is None:
-        return None
-    
     fig = go.Figure()
     
-    # Ana scatter plot
-    fig.add_trace(go.Scatter(
-        x=df[x_col],
-        y=df[y_col],
-        mode='markers',
-        name='Data Points',
-        marker=dict(color='blue')
-    ))
+    # 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) >= 2:
+    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=8),
+            marker=dict(color='red', size=10),
             name='Polygon'
         ))
     
     fig.update_layout(
-        title=f"{x_col} vs {y_col}",
-        dragmode='drawclosedpath',
-        showlegend=False
+        title=f"{x_col} vs {y_col}" if x_col and y_col else "Veri Görselleştirme",
+        dragmode='drawpoint',
+        clickmode='event+select'
     )
-    
     return fig
 
-def handle_click(click_data, df, x_col, y_col, polygon_points):
-    if not click_data or not df.empty:
-        return [], pd.DataFrame()
+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()
     
-    # Tıklanan noktayı al
-    point = (click_data['points'][0]['x'], click_data['points'][0]['y'])
-    new_points = polygon_points + [point]
+    # 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]
     
-    # Polygon tamamlandıysa içinde kalan noktaları bul
-    if len(new_points) >= 3 and new_points[0] == new_points[-1]:
-        polygon = Polygon(new_points)
-        mask = df.apply(lambda row: polygon.contains(Point(row[x_col], row[y_col])), axis=1)
-        return [], df[mask]
+    # 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()
     
-    return new_points, pd.DataFrame()
+    return updated_points, pd.DataFrame()
 
 with gr.Blocks() as demo:
-    gr.Markdown("## Interactive Polygon Selection Tool")
+    gr.Markdown("## Interaktif Polygon Seçim Aracı")
     
-    df_state = gr.State(pd.DataFrame())
+    df_state = gr.State()
     polygon_state = gr.State([])
     
     with gr.Row():
@@ -70,9 +70,10 @@ with gr.Blocks() as demo:
         x_col = gr.Dropdown(label="X Sütunu")
         y_col = gr.Dropdown(label="Y Sütunu")
     
-    plot = gr.Plot(label="Scatter Plot ve Polygon")
-    results = gr.DataFrame(label="Seçilen Veriler")
+    plot = gr.Plot(label="Veri Görselleştirme")
+    results = gr.DataFrame(label="Seçilen Veriler", interactive=False)
     
+    # CSV yükleme ve dropdown güncelleme
     csv_upload.upload(
         load_csv,
         inputs=csv_upload,
@@ -83,6 +84,7 @@ with gr.Blocks() as demo:
         outputs=[x_col, y_col]
     )
     
+    # Plot güncelleme
     x_col.change(
         create_plot,
         inputs=[df_state, x_col, y_col, polygon_state],
@@ -95,10 +97,15 @@ with gr.Blocks() as demo:
         outputs=plot
     )
     
-    plot.select(
-        handle_click,
+    # 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
     )
 
 demo.launch()