Changeset 6141 for trunk/AWT/AWT_dtree.cxx
- Timestamp:
- 14/08/09 16:29:27 (3 years ago)
- Files:
-
- 1 modified
-
trunk/AWT/AWT_dtree.cxx (modified) (11 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/AWT/AWT_dtree.cxx
r6008 r6141 547 547 548 548 // Note : radius goes against infinite, if bootstrap values go against zero 549 // For this reason we do some limita ion here:549 // For this reason we do some limitation here: 550 550 551 551 // printf("bootstrap=%i -> radius=%f\n", atoi(bootstrap), radius); … … 961 961 } 962 962 963 inline double discrete_ruler_leng ht(double analog_ruler_lenth, double min_length) {964 double drl = int(analog_ruler_len th*10+0.5)/10.0;963 inline double discrete_ruler_length(double analog_ruler_length, double min_length) { 964 double drl = int(analog_ruler_length*10+0.5)/10.0; 965 965 if (drl<min_length) { 966 966 drl = min_length; … … 1119 1119 tree_awar = show_ruler(device, this->drag_gc); 1120 1120 double rulerSize = *GBT_readOrCreate_float(this->tree_static->gb_tree, awar, 0.0); 1121 GBT_write_float(this->tree_static->gb_tree, awar, discrete_ruler_leng ht(rulerSize, 0.1));1121 GBT_write_float(this->tree_static->gb_tree, awar, discrete_ruler_length(rulerSize, 0.1)); 1122 1122 tree_awar = show_ruler(device, this->drag_gc); 1123 1123 } … … 1127 1127 h = *GBT_readOrCreate_float(this->tree_static->gb_tree, awar, 0.0); 1128 1128 if (button == AWT_M_RIGHT) { 1129 GBT_write_float(this->tree_static->gb_tree, awar, discrete_ruler_leng ht(h, 0.1));1129 GBT_write_float(this->tree_static->gb_tree, awar, discrete_ruler_length(h, 0.1)); 1130 1130 } 1131 1131 tree_awar = show_ruler(device, this->drag_gc); … … 1142 1142 double h_rounded = h; 1143 1143 if (button==AWT_M_RIGHT) { // if right mouse button is used -> adjust to 1 digit behind comma 1144 h_rounded = discrete_ruler_leng ht(h, 0.1);1144 h_rounded = discrete_ruler_length(h, 0.1); 1145 1145 GBT_write_float(this->tree_static->gb_tree, awar, h_rounded); 1146 1146 show_ruler(device, this->drag_gc); … … 1161 1161 sprintf(awar,"ruler/size"); 1162 1162 double rulerSize = *GBT_readOrCreate_float(this->tree_static->gb_tree, awar, 0.0); 1163 GBT_write_float(this->tree_static->gb_tree, awar, discrete_ruler_leng ht(rulerSize, 0.1));1163 GBT_write_float(this->tree_static->gb_tree, awar, discrete_ruler_length(rulerSize, 0.1)); 1164 1164 } 1165 1165 break; … … 1318 1318 1319 1319 if (button==AWT_M_RIGHT) { // if right mouse button is used -> adjust to 1 digit behind comma 1320 len = discrete_ruler_leng ht(len, 0.0);1320 len = discrete_ruler_length(len, 0.0); 1321 1321 } 1322 1322 else if (len<0.0) { … … 1732 1732 break; 1733 1733 1734 case AP_TREE_IRS: // folded dend ogram1734 case AP_TREE_IRS: // folded dendrogram 1735 1735 exports.dont_fit_x = 1; 1736 1736 exports.dont_fit_y = 1; … … 1743 1743 break; 1744 1744 1745 case AP_TREE_NORMAL: // normal dend ogram1745 case AP_TREE_NORMAL: // normal dendrogram 1746 1746 exports.dont_fit_x = 0; 1747 1747 exports.dont_fit_y = 1; … … 1857 1857 1858 1858 if (!error) { 1859 aw_message(GBS_global_string("Tree '%s' lost all lea fes and has been deleted", tree_name));1859 aw_message(GBS_global_string("Tree '%s' lost all leaves and has been deleted", tree_name)); 1860 1860 #if defined(DEVEL_RALF) 1861 1861 #warning somehow update selected tree … … 2019 2019 2020 2020 if (at->name && (disp_device->filter & text_filter) ){ 2021 // text darstellen2021 // display text 2022 2022 const char *data = make_node_text_nds(this->gb_main, at->gb_node,0,at->get_gbt_tree(), tree_name); 2023 2023
