disable attr for count

Author: robertcv

orangecontrib/geo/widgets/owchoropleth.py

@@ -555,16 +555,17 @@ def _add_controls(self):
         self.agg_attr_model = DomainModel(valid_types=(ContinuousVariable,
                                                        DiscreteVariable))
 
-        gui.comboBox(agg_box, self, 'agg_attr', label='Attribute:',
-                     callback=self.setup_plot, model=self.agg_attr_model,
-                     **options)
-
         gui.comboBox(agg_box, self, 'agg_func', label='Agg.:',
                      items=AGG_FUNCS, callback=self.setup_plot, **options)
 
+        self.agg_attr_combo = gui.comboBox(agg_box, self, 'agg_attr',
+                                           label='Attribute:',
+                                           callback=self.setup_plot,
+                                           model=self.agg_attr_model,
+                                           **options)
+
         gui.hSlider(agg_box, self, 'admin_level', None, 0, 2, 1,
-                    label='Detail:        ',
-                    callback=self.setup_plot)
+                    label='Detail:', callback=self.setup_plot)
 
         plot_gui = OWPlotGUI(self)
         visualization_box = gui.vBox(area, True)
@@ -609,10 +610,18 @@ def init_attr_values(self):
                 self.attr_lat, self.attr_lon = attr_lat, attr_lon
 
     def setup_plot(self):
-        if self.attr_lat is None or self.attr_lon is None or \
-                self.agg_attr is None:
+        self.agg_attr_combo.setEnabled(not self.agg_func == "Count")
+
+        if self.attr_lat is None or self.attr_lon is None:
             return
 
+        if self.agg_attr is None:
+            if self.agg_func != "Count":
+                return
+            else:
+                # for counting we just need a placeholder
+                self.agg_attr = self.attr_lat
+
         self.Error.aggregation_discrete.clear()
         if self.agg_attr.is_discrete and \
                 self.agg_func not in AGG_FUNCS_DISCRETE: