Show
Ignore:
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:
1 modified

Legend:

Unmodified
Added
Removed
  • trunk/PHYLO/PH_main.cxx

    r6501 r6666  
    483483    awm->insert_menu_topic("props_menu", "Menu: Colors and Fonts ...",                 "M", "props_frame.hlp",   AWM_ALL, AW_POPUP, (AW_CL)AW_preset_window,   0); 
    484484    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); 
    485     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); 
     485    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); 
    486486 
    487487 
     
    555555    aw_initstatus(); 
    556556 
    557     AW_root    *aw_root    = new AW_root; 
    558     AW_default  aw_default = AWT_open_properties(aw_root, ".arb_prop/phylo.arb"); 
    559     aw_root->init_variables(aw_default); 
    560     aw_root->init_root("ARB_PHYLO", false); 
    561  
    562  
     557    AW_root  *aw_root = AWT_create_root(".arb_prop/phylo.arb", "ARB_PHYLO"); 
    563558    PH_root  *ph_root = new PH_root; 
    564559    GB_ERROR  error   = ph_root->open(db_server); 
     
    569564 
    570565    // create arb_phylo awars : 
    571     PH_create_filter_variables(aw_root, aw_default); 
    572     PH_create_matrix_variables(aw_root, aw_default); 
    573     ARB_init_global_awars(aw_root, aw_default, GLOBAL_gb_main); 
     566    PH_create_filter_variables(aw_root, AW_ROOT_DEFAULT); 
     567    PH_create_matrix_variables(aw_root, AW_ROOT_DEFAULT); 
     568    ARB_init_global_awars(aw_root, AW_ROOT_DEFAULT, GLOBAL_gb_main); 
    574569#if defined(DEBUG) 
    575     AWT_create_db_browser_awars(aw_root, aw_default); 
     570    AWT_create_db_browser_awars(aw_root, AW_ROOT_DEFAULT); 
    576571#endif // DEBUG 
    577572