source: branches/tree/MERGE/mg_merge.hxx

Last change on this file was 9817, checked in by westram, 12 years ago
  • merging DBs from intro-window was no longer possible if arb_ntree was started via 'arb'-script
    • since the merge was started as async call to arb_ntree (since [9797]), the arb_ntree-instance started from 'arb'-script terminated. Afterwards all arb-processes running under current ARB_PID got killed by 'arb_clean' (from script). One of them was the just started merge-tool :/
    • fixes:
      • arb_clean is no longer called from 'arb'-script, instead arb_ntree itself calls arb_clean
        • drawback: if arb_ntree crashes, clients survive a little bit longer
      • added nt_restart()
        • similar to nt_exit(), but does restart arb(_ntree) async before exiting
    • features/changed behavior:
      • added new entries to ARB_NT/File:
        • 'Start second database'
        • 'Quit + load other database'
      • merge tool starts in directory selected in intro window
      • starting target-DB out of merge-tool now also works if source-DB is already running in ARB
      • quit from merge tool drops back to intro-window (not if merging in/out running DB)
      • pressing cancel while selecting merged databases drops back to intro as well
  • Property svn:eol-style set to native
  • Property svn:keywords set to Author Date Id Revision
File size: 798 bytes
Line 
1/* Merge tool external interface.
2 *
3 * This file is generated by aisc_mkpt.
4 * Any changes you make here will be overwritten later!
5 */
6
7#ifndef MG_MERGE_HXX
8#define MG_MERGE_HXX
9
10/* define ARB attributes: */
11#ifndef ATTRIBUTES_H
12# include <attributes.h>
13#endif
14
15
16/* MG_main.cxx */
17
18// source and destination DBs for merge:
19extern GBDATA *GLOBAL_gb_src;
20extern GBDATA *GLOBAL_gb_dst;
21
22AW_window *MERGE_create_main_window(AW_root *aw_root, bool dst_is_new, void (*exit_cb)(const char *));
23void MERGE_create_all_awars(AW_root *awr, AW_default aw_def);
24void MERGE_create_db_file_awars(AW_root *awr, AW_default aw_def, const char *src_name, const char *dst_name);
25
26/* MG_species.cxx */
27GB_ERROR MERGE_sequences_simple(AW_root *awr);
28
29#else
30#error mg_merge.hxx included twice
31#endif /* MG_MERGE_HXX */
Note: See TracBrowser for help on using the repository browser.