Changeset 6666 for trunk/EDIT4/ED4_root.cxx

Timestamp:

21/05/10 19:44:17 (2 years ago)

Author:

westram

Message:

• AW_root
  • ctor initializes AWAR subsystem
  • made more clear that AW_root is a singleton
  • call dtor atexit; unlink AWARs from prop-DB and free memory (AW_window instances and releated mem still remain)
  • close properties DB
  • renamed some functions
• AW_awar
  • added dtor
• added AWT_create_root (necessary to add properties DB to DB-browser)
• removed AWT_open_properties (done inside AW_root-ctor now)
• EDIT properties
  • detect existing properties before constructing AW_root
• removed AW_config_struct

Files:

• trunk/EDIT4/ED4_root.cxx (modified) (5 diffs)

trunk/EDIT4/ED4_root.cxx

@@ -1281 +1281 @@
 }
 
-static void ED4_save_defaults(AW_window *aw, AW_CL cl_mode, AW_CL) {
+static void ED4_save_properties(AW_window *aw, AW_CL cl_mode, AW_CL) {
     int mode = (int)cl_mode;
 
-    AW_save_specific_defaults(aw, ED4_propertyName(mode));
+    AW_save_specific_properties(aw, ED4_propertyName(mode));
 }
 
@@ -1589 +1589 @@
 
         const char *entry = GBS_global_string("Save loaded Properties (~/%s)", db_name);
-        awmm->insert_menu_topic("save_loaded_props", entry, "l", "e4_defaults.hlp", AWM_ALL, ED4_save_defaults, (AW_CL)default_mode, 0);
+        awmm->insert_menu_topic("save_loaded_props", entry, "l", "e4_defaults.hlp", AWM_ALL, ED4_save_properties, (AW_CL)default_mode, 0);
         SEP________________________SEP;
 
@@ -1596 +1596 @@
             hotkey[0]     = "Pta"[mode];
             entry         = GBS_global_string("Save %sProperties (~/%s)", entry_type[mode], ED4_propertyName(mode));
-            awmm->insert_menu_topic(tag[mode], entry, hotkey, "e4_defaults.hlp", AWM_ALL, ED4_save_defaults, (AW_CL)mode, 0);
+            awmm->insert_menu_topic(tag[mode], entry, hotkey, "e4_defaults.hlp", AWM_ALL, ED4_save_properties, (AW_CL)mode, 0);
         }
     }
@@ -1887 +1887 @@
 }
 
-ED4_root::ED4_root()
-{
+static char *detectProperties() {
+    char *propname = NULL;
+
+    for (int mode = 0; !propname && mode <= 2; ++mode) { // search for properties-database
+        const char *fullprop = AW_root::property_DB_fullname(ED4_propertyName(mode));
+        if (mode == 2 || GB_is_regularfile(fullprop)) {
+            freedup(propname, fullprop);
+        }
+    }
+
+    GB_informationf("Using properties from '%s'", propname);
+    return propname;
+}
+
+ED4_root::ED4_root() {
     memset((char *)this, 0, sizeof(*this));
 
-    aw_root      = new AW_root;
-    first_window = NULL;
-    main_manager = NULL;
-    database     = NULL;
-    tmp_ed4w     = NULL;
-    tmp_aww      = NULL;
-    tmp_device   = NULL;
-    temp_gc      = 0;
-
-    scroll_links.link_for_hor_slider = NULL;
-    scroll_links.link_for_ver_slider = NULL;
-
-    folding_action = 0;
-
-    species_mode            = ED4_SM_MOVE;
-    scroll_picture.scroll   = 0;
-    scroll_picture.old_x    = 0;
-    scroll_picture.old_y    = 0;
-    middle_area_man         = NULL;
-    top_area_man            = NULL;
-    root_group_man          = NULL;
-    ecoli_ref               = NULL;
-    protstruct              = NULL;
-    protstruct_len          = 0;
-    column_stat_activated   = 0;
-    column_stat_initialized = 0;
-    visualizeSAI            = 0;
-    visualizeSAI_allSpecies = 0;
-
-    aw_initstatus();
-}
-
-
-ED4_root::~ED4_root()
-{
+    db_name  = detectProperties();
+    aw_root  = AWT_create_root(db_name, "ARB_EDIT4");
+    props_db = AW_ROOT_DEFAULT;
+
+    species_mode = ED4_SM_MOVE;
+}
+
+
+ED4_root::~ED4_root() {
     delete aw_root;
     delete first_window;
@@ -1933 +1920 @@
     delete database;
     delete ecoli_ref;
-    if (protstruct) free(protstruct);
-}
+
+    free(protstruct);
+    free(db_name);
+}