obitools/obitools3
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 66 Wiki Activity

Fixed all compilation problems with new function names, locations etc

Browse Source
This commit is contained in:
Celine Mercier
2016-04-25 18:35:02 +02:00
parent 92980508c0
commit 87935c6678
6 changed files with 30 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/obiview.c
View File

@ -435,7 +435,7 @@ Obiview_p obi_new_view(OBIDMS_p dms, const char* view_name, Obiview_p view_to_cl
Obiviews_infos_all_p views_infos;
// Check uniqueness of name TODO but problem if view not written yet has the same name. Save lists of open views in DMS ?
views_infos = obi_read_views(dms);
views_infos = obi_read_view_infos(dms);
if (views_infos != NULL)
{
for (i=0; i<((views_infos->header)->view_count); i++)
@ -444,11 +444,11 @@ Obiview_p obi_new_view(OBIDMS_p dms, const char* view_name, Obiview_p view_to_cl
{
obi_set_errno(OBIVIEW_ERROR);
obidebug(1, "\nView name already exists for a previous view");
obi_unmap_read_views(views_infos);
obi_close_view_infos(views_infos);
return NULL;
}
}
obi_unmap_read_views(views_infos);
obi_close_view_infos(views_infos);
}
view = (Obiview_p) malloc(sizeof(Obiview_t));
@ -826,7 +826,7 @@ int obi_view_add_column(Obiview_p view,
if (view->line_count > nb_lines)
nb_lines = view->line_count;
else if (nb_lines > view->line_count)
obi_view_update_lines(view, nb_lines);
update_lines(view, nb_lines);
// Open or create the column
if (create)

4
src/obiview.h
View File

@ -72,7 +72,7 @@ typedef struct Obiview {
*/
char created_from[OBIVIEW_NAME_MAX_LENGTH+1]; /**< Name of the view from which that view was cloned if the view was cloned.
*/
char view_type[VIEW_TYPE_MAX_NAME+1]; /**< Type of the view if there is one.
char view_type[VIEW_TYPE_MAX_LENGTH+1]; /**< Type of the view if there is one.
* Types existing: NUC_SEQS_VIEW.
*/
bool read_only; /**< Whether the view is read-only or can be modified.
@ -125,7 +125,7 @@ typedef struct Obiview_infos {
*/
char created_from[OBIVIEW_NAME_MAX_LENGTH+1]; /**< Name of the view from which that view was cloned, if it was cloned.
*/
char view_type[VIEW_TYPE_MAX_NAME+1]; /**< Type of the view if there is one.
char view_type[VIEW_TYPE_MAX_LENGTH+1]; /**< Type of the view if there is one.
* Types existing: NUC_SEQS_VIEW.
*/
bool all_lines; /**< Whether there is a line selection associated with the view.