Changeset 8727:162096647897 in orange

Timestamp:

08/17/11 23:07:14 (21 months ago)

Author:

matejd <matejd@…>

Branch:

default

Convert:

31f9b2efa9bb4cc9822424a1b0b4e7858187ec4b

Message:

Added data == None check; added deleting OpenGL resources

Location:

orange/OrangeWidgets

Files:

• Visualize Qt/OWScatterPlot3D.py (modified) (2 diffs)
• plot/owplot3d.py (modified) (1 diff)

orange/OrangeWidgets/Visualize Qt/OWScatterPlot3D.py

@@ -48 +48 @@
 
     def set_data(self, data, subset_data=None, **args):
+        if data == None:
+            return
         orngScaleScatterPlotData.set_data(self, data, subset_data, **args)
         OWPlot3D.set_data(self, self.no_jittering_scaled_data, self.no_jittering_scaled_subset_data)
@@ -54 +56 @@
     def update_data(self, x_attr, y_attr, z_attr,
                     color_attr, symbol_attr, size_attr, label_attr):
+        if self.data == None:
+            return
         self.before_draw_callback = self.before_draw
 

orange/OrangeWidgets/plot/owplot3d.py

@@ -404 +404 @@
 
     def __del__(self):
-        # TODO: check if anything needs deleting
-        # TODO: yes it does!
-        pass
+        # TODO: never reached!
+        glDeleteVertexArrays(1, self.dummy_vao)
+        glDeleteVertexArrays(1, self.feedback_vao)
+        glDeleteBuffers(1, self.symbol_buffer)
+        if hasattr(self, 'data_buffer'):
+            glDeleteBuffers(1, self.data_buffer)
 
     def initializeGL(self):