Changeset 6141 for trunk/PGT/image_dialog.cxx
- Timestamp:
- 14/08/09 16:29:27 (3 years ago)
- Files:
-
- 1 modified
-
trunk/PGT/image_dialog.cxx (modified) (9 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/PGT/image_dialog.cxx
r5825 r6141 187 187 for(spot_it= m_spotList.begin(); spot_it != m_spotList.end(); spot_it++) 188 188 { 189 // if((*spot_it).text) free((*spot_it).text); // DON T! POINTER TO DESCR.LIST!!!189 // if((*spot_it).text) free((*spot_it).text); // DON'T! POINTER TO DESCR.LIST!!! 190 190 if((*spot_it).id) free((*spot_it).id); 191 191 } … … 278 278 XtAddCallback(m_drawingArea, XmNexposeCallback, staticImageRedrawCallback, this); 279 279 280 // CALLBACK FOR DRAWING AREA: IF A MOUSE (KEYBOARD) EVENT OCCUR ED280 // CALLBACK FOR DRAWING AREA: IF A MOUSE (KEYBOARD) EVENT OCCURRED 281 281 XtAddCallback(m_drawingArea, XmNinputCallback, staticImageEventCallback, this); 282 282 … … 1360 1360 m_hasImagedata= true; 1361 1361 1362 // FREE OUR GC AS WE DON T NEED IT ANYMORE1362 // FREE OUR GC AS WE DON'T NEED IT ANYMORE 1363 1363 XFreeGC(display, gc); 1364 1364 … … 1397 1397 XCopyArea(display, m_pixmap, window, gc, 0, 0, m_width, m_height, 0, 0); 1398 1398 1399 // FREE OUR GC AS WE DON T NEED IT ANYMORE1399 // FREE OUR GC AS WE DON'T NEED IT ANYMORE 1400 1400 XFreeGC(display, gc); 1401 1401 } … … 1974 1974 getSettings(); 1975 1975 1976 // SPOT LIST MAY HAVE CHANGED AS WELL - CREATE A NEW ONE...1976 // SPOT LIST MAY HAVE CHANGED AS WELL - CREATE A NEW ONE... 1977 1977 createDescriptions(); 1978 1978 createSpotList(); … … 2073 2073 for(spot_it= m_spotList.begin(); spot_it != m_spotList.end(); ++spot_it) 2074 2074 { 2075 // if((*spot_it).text) free((*spot_it).text); // DON T! ALSO POINTER TO DESCR.LIST!!!2075 // if((*spot_it).text) free((*spot_it).text); // DON'T! ALSO POINTER TO DESCR.LIST!!! 2076 2076 if((*spot_it).id) free((*spot_it).id); 2077 2077 } … … 2170 2170 2171 2171 // FETCH NECESSARY AWARS 2172 char *awar_protein_info s= get_CONFIG(CONFIG_PGT_INFO_PROTEIN);2173 char *awar_gene_info s= get_CONFIG(CONFIG_PGT_INFO_GENE);2172 char *awar_protein_information= get_CONFIG(CONFIG_PGT_INFO_PROTEIN); 2173 char *awar_gene_information= get_CONFIG(CONFIG_PGT_INFO_GENE); 2174 2174 char *awar_protein_id= get_CONFIG(CONFIG_PGT_ID_PROTEIN); 2175 2175 char *awar_gene_id= get_CONFIG(CONFIG_PGT_ID_GENE); 2176 2176 char *awar_protein_x= const_cast<char*>("x_coordinate"); // DEBUG - HARDCODED 2177 2177 char *awar_protein_y= const_cast<char*>("y_coordinate"); // DEBUG - HARDCODED 2178 if(!awar_protein_info s || !awar_gene_infos||2178 if(!awar_protein_information || !awar_gene_information || 2179 2179 !awar_protein_id || !awar_gene_id) return false; 2180 2180 … … 2249 2249 // if((id && (strlen(id) > 0)) || ((x + y) != 0)) 2250 2250 // { 2251 strncpy(buf, awar_protein_info s, 1023);2251 strncpy(buf, awar_protein_information, 1023); 2252 2252 token= strtok(buf, ",; "); 2253 2253 while(token) … … 2287 2287 if(gb_gene) 2288 2288 { 2289 strncpy(buf, awar_gene_info s, 1023);2289 strncpy(buf, awar_gene_information, 1023); 2290 2290 token= strtok(buf, ",; "); 2291 2291 while(token)
