Changeset 6666 for trunk/PHYLO/PH_main.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/PHYLO/PH_main.cxx (modified) (3 diffs)

trunk/PHYLO/PH_main.cxx

@@ -483 +483 @@
     awm->insert_menu_topic("props_menu", "Menu: Colors and Fonts ...",                 "M", "props_frame.hlp",   AWM_ALL, AW_POPUP, (AW_CL)AW_preset_window,   0);
     awm->insert_menu_topic("props_data", "Data: Colors and Fonts ...",                 "D", "ph_props_data.hlp", AWM_ALL, AW_POPUP, (AW_CL)AW_create_gc_window, (AW_CL)gcmiddle);
-    awm->insert_menu_topic("save_props", "Save Properties (in ~/.arb_prop/phylo.arb)", "S", "savedef.hlp",       AWM_ALL,          (AW_CB)AW_save_defaults,    0, 0);
+    awm->insert_menu_topic("save_props", "Save Properties (in ~/.arb_prop/phylo.arb)", "S", "savedef.hlp",       AWM_ALL,          (AW_CB)AW_save_properties,    0, 0);
 
 
@@ -555 +555 @@
     aw_initstatus();
 
-    AW_root    *aw_root    = new AW_root;
-    AW_default  aw_default = AWT_open_properties(aw_root, ".arb_prop/phylo.arb");
-    aw_root->init_variables(aw_default);
-    aw_root->init_root("ARB_PHYLO", false);
-
-
+    AW_root  *aw_root = AWT_create_root(".arb_prop/phylo.arb", "ARB_PHYLO");
     PH_root  *ph_root = new PH_root;
     GB_ERROR  error   = ph_root->open(db_server);
@@ -569 +564 @@
 
     // create arb_phylo awars :
-    PH_create_filter_variables(aw_root, aw_default);
-    PH_create_matrix_variables(aw_root, aw_default);
-    ARB_init_global_awars(aw_root, aw_default, GLOBAL_gb_main);
+    PH_create_filter_variables(aw_root, AW_ROOT_DEFAULT);
+    PH_create_matrix_variables(aw_root, AW_ROOT_DEFAULT);
+    ARB_init_global_awars(aw_root, AW_ROOT_DEFAULT, GLOBAL_gb_main);
 #if defined(DEBUG)
-    AWT_create_db_browser_awars(aw_root, aw_default);
+    AWT_create_db_browser_awars(aw_root, AW_ROOT_DEFAULT);
 #endif // DEBUG