Add Map Caps to the UI, Fix Cancel for EM Placement dialog

Author: pemsley

src/create-menu-item-actions.cc

@@ -4005,6 +4005,15 @@ molecular_surface_action(G_GNUC_UNUSED GSimpleAction *simple_action,
    graphics_info_t::graphics_grab_focus();
 }
 
+void
+map_caps_action(G_GNUC_UNUSED GSimpleAction *simple_action,
+                G_GNUC_UNUSED GVariant *parameter,
+                G_GNUC_UNUSED gpointer user_data) {
+
+   add_density_map_cap();
+   graphics_info_t::graphics_grab_focus();
+}
+
 void
 electrostatic_surface_action(G_GNUC_UNUSED GSimpleAction *simple_action,
                              G_GNUC_UNUSED GVariant *parameter,
@@ -6294,6 +6303,7 @@ create_actions(GtkApplication *application) {
    add_action(        "bond_parameters_action",         bond_parameters_action);
    add_action(           "bond_colours_action",            bond_colours_action);
    add_action(             "fullscreen_action",              fullscreen_action);
+   add_action(               "map_caps_action",                map_caps_action);
    add_action(             "go_to_atom_action",              go_to_atom_action);
    add_action(         "label_CA_atoms_action",          label_CA_atoms_action);
    add_action(         "map_parameters_action",          map_parameters_action);

src/generic-objects.cc

@@ -765,7 +765,7 @@ PyObject *generic_object_name_py(unsigned int obj_number_in) {
      Py_INCREF(r);
    }
    return r;
-} 
+}
 #endif /* USE_PYTHON */
 
 
@@ -802,17 +802,20 @@ void close_generic_object(int object_number) {
       std::string label_name = stub + "_label";
       // GtkWidget *toggle_button = lookup_widget(g.generic_objects_dialog, toggle_button_name.c_str());
       // GtkWidget *label = lookup_widget(g.generic_objects_dialog, label_name.c_str());
-      std::cout << "WARNING:: in close_generic_object() set the toggle_button and label correctly " << std::endl;
+      std::cout << "WARNING:: in close_generic_object() set the toggle_button and label correctly "
+                << std::endl;
       GtkWidget *toggle_button = 0;
       GtkWidget *label = 0;
       if (toggle_button)
 	 gtk_widget_set_visible(toggle_button, FALSE);
       if (label)
 	 gtk_widget_set_visible(label, FALSE);
    }
+
+   g.graphics_draw();
 }
 
-/*! \brief has the generic object been closed? 
+/*! \brief has the generic object been closed?
 
    @return 1 for yes, 0 othersize
 */

src/glade-callbacks-main-window.cc

@@ -49,6 +49,7 @@ typedef const char entry_char_type;
 #include "graphics-info.h"
 
 #include "cc-interface.hh" // for read_ccp4_map()
+#include "c-interface-generic-objects.h"
 
 #include "utils/logging.hh"
 extern logging logger;
@@ -2197,10 +2198,12 @@ void
 on_emplacement_cancel_button_clicked(G_GNUC_UNUSED GtkButton       *button,
                                      G_GNUC_UNUSED gpointer         user_data) {
 
-   GtkWidget *frame = widget_from_builder("emplacement_frame");
-
-   gtk_widget_set_visible(frame, FALSE);
+   GtkWidget *dialog = widget_from_builder("emplacement_dialog");
+   gtk_widget_set_visible(dialog, FALSE);
 
+   int obj = generic_object_index("Emplacement Sphere");
+   if (obj >= 0)
+      close_generic_object(obj);
 }
 
 extern "C" G_MODULE_EXPORT

ui/coot.ui

@@ -723,15 +723,6 @@
           <!--   <attribute name="label">Central Atom Label...</attribute> -->
           <!--   <attribute name="action">app.draw_central_atom_label_action</attribute> -->
           <!-- </item> -->
-          <item>
-            <!-- this needs an atom selection overlay -->
-            <attribute name="label">Electrostatic Surface</attribute>
-            <attribute name="action">app.electrostatic_surface_action</attribute>
-          </item>
-          <item>
-            <attribute name="label">Gaussian Surface...</attribute>
-            <attribute name="action">app.gaussian_surface_action</attribute>
-          </item>
           <item>
             <attribute name="label">Go To Atom...</attribute>
             <attribute name="action">app.go_to_atom_action</attribute>
@@ -740,10 +731,6 @@
             <attribute name="label">Map Parameters...</attribute>
             <attribute name="action">app.map_parameters_action</attribute>
           </item>
-          <item>
-            <attribute name="label">Molecular Surface</attribute>
-            <attribute name="action">app.molecular_surface_action</attribute>
-          </item>
           <item>
             <attribute name="label">NCS Ghost Control...</attribute>
             <attribute name="action">app.ghost_control_action</attribute>
@@ -788,6 +775,23 @@
           </item>
         </section>
         <section>
+          <item>
+            <attribute name="label">Gaussian Surface...</attribute>
+            <attribute name="action">app.gaussian_surface_action</attribute>
+          </item>
+          <item>
+            <attribute name="label">Molecular Surface</attribute>
+            <attribute name="action">app.molecular_surface_action</attribute>
+          </item>
+          <item>
+            <attribute name="label">Map Caps</attribute>
+            <attribute name="action">app.map_caps_action</attribute>
+          </item>
+          <item>
+            <!-- this needs an atom selection overlay -->
+            <attribute name="label">Electrostatic Surface</attribute>
+            <attribute name="action">app.electrostatic_surface_action</attribute>
+          </item>
           <item>
             <attribute name="label">Ribbons: By Chain</attribute>
             <attribute name="action">app.ribbons_colour_by_chain_action</attribute>