[gui] Change of notation: cam -> mac

gui/cadbiom_gui/gt_gui/chart_checker/chart_checker_controler.py

@@ -163,10 +163,10 @@ class OccurenceForm(object):
         self.but_solutions.connect("clicked", self.on_solutions)
         self.but_solutions.set_sensitive(False)
 
-        self.but_cam = self.__wtree.get_widget("but_cam")
-        self.but_cam.connect("clicked", self.on_cam)
-        self.but_cam.connect("clicked", self.on_entry_changed)
-        self.but_cam.set_sensitive(False)
+        self.but_mac = self.__wtree.get_widget("but_mac")
+        self.but_mac.connect("clicked", self.on_mac)
+        self.but_mac.connect("clicked", self.on_entry_changed)
+        self.but_mac.set_sensitive(False)
 
         # children
         self.__aux_win = []
@@ -192,7 +192,7 @@ class OccurenceForm(object):
         """
         #  buttons
         self.but_solutions.set_sensitive(False)
-        self.but_cam.set_sensitive(False)
+        self.but_mac.set_sensitive(False)
 
     def on_yn(self, widget):
         """
@@ -258,7 +258,7 @@ class OccurenceForm(object):
         """
         # desactivate buttons
         self.but_solutions.set_sensitive(False)
-        self.but_cam.set_sensitive(False)
+        self.but_mac.set_sensitive(False)
 
         # get info
         final_prop = self.property_entry.get_text()
@@ -333,7 +333,7 @@ class OccurenceForm(object):
 
         # activate buttons
         self.but_solutions.set_sensitive(True)
-        self.but_cam.set_sensitive(True)
+        self.but_mac.set_sensitive(True)
 
     def on_solutions(self, widget):
         """
@@ -357,7 +357,7 @@ class OccurenceForm(object):
 #            ok_warn("There is no common solution")
         pass
 
-    def on_cam(self, widget):
+    def on_mac(self, widget):
         """
         launch mac computations
         """
@@ -367,12 +367,12 @@ class OccurenceForm(object):
         if ask:
             query = MCLSimpleQuery(self.start_prop,
                                    self.inv_prop, self.property)
-            cam_list = self.mcla.mac_search(query, self.max_step)
-            if len(cam_list)==0 :
+            mac_list = self.mcla.mac_search(query, self.max_step)
+            if len(mac_list)==0 :
                 ok_warn("The solver could not find a MAC," +
                         "\n you should refine your query")
             else :
-                CNSWindow(cam_list, self.__emvc,
+                CNSWindow(mac_list, self.__emvc,
                           self.__error_reporter, self)
 
     # sub windows management

gui/cadbiom_gui/gt_gui/chart_glade/occurence_form.glade

@@ -265,7 +265,7 @@
                           </packing>
                         </child>
                         <child>
-                          <widget class="GtkButton" id="but_cam">
+                          <widget class="GtkButton" id="but_mac">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>