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

Added elements_names property to OBIDMS_column class

Browse Source
This commit is contained in:
Celine Mercier
2016-09-26 16:53:16 +02:00
parent 76f89717fe
commit a0bc45cc92
3 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
python/obitools3/commands/test.pyx
View File

@ -93,7 +93,7 @@ def test_set_and_get(config, infos):
print_test(config, ">>> Set and get test") print_test(config, ">>> Set and get test")
col_name = random_column(infos) col_name = random_column(infos)
col = infos['view'][col_name] col = infos['view'][col_name]
element_names = col.get_elements_names() element_names = col.elements_names
data_type = col.get_data_type() data_type = col.get_data_type()
if data_type == "OBI_QUAL" : if data_type == "OBI_QUAL" :
print_test(config, "-") print_test(config, "-")
@ -173,7 +173,7 @@ def random_col_type():
def fill_column(config, infos, col) : def fill_column(config, infos, col) :
data_type = col.get_data_type() data_type = col.get_data_type()
element_names = col.get_elements_names() element_names = col.elements_names
if len(element_names) > 1 : if len(element_names) > 1 :
for i in range(random_int(config)) : for i in range(random_int(config)) :

5
python/obitools3/obidms/_obidms.pxd
View File

@ -10,16 +10,15 @@ from ._obitaxo cimport OBI_Taxonomy
cdef class OBIDMS_column: cdef class OBIDMS_column:
cdef str column_name cdef str column_name
cdef str column_alias cdef str column_alias # associated property: alias
cdef OBIDMS_column_p* pointer cdef OBIDMS_column_p* pointer
cdef OBIDMS dms cdef OBIDMS dms
cdef OBIView view cdef OBIView view
cdef str data_type cdef str data_type
cdef str dms_name cdef str dms_name
cdef index_t nb_elements_per_line cdef index_t nb_elements_per_line
cdef list elements_names cdef list elements_names # associated property: elements_names
cpdef list get_elements_names(self)
cpdef str get_data_type(self) cpdef str get_data_type(self)
cpdef index_t get_nb_lines_used(self) cpdef index_t get_nb_lines_used(self)
cpdef str get_creation_date(self) cpdef str get_creation_date(self)

8
python/obitools3/obidms/_obidms.pyx
View File

@ -125,9 +125,6 @@ cdef class OBIDMS_column :
for line_nb in range(lines_used): for line_nb in range(lines_used):
yield self.get_line(line_nb) yield self.get_line(line_nb)
cpdef list get_elements_names(self):
return self.elements_names
cpdef str get_data_type(self): cpdef str get_data_type(self):
return self.data_type return self.data_type
@ -168,6 +165,11 @@ cdef class OBIDMS_column :
def alias(self, new_alias): def alias(self, new_alias):
self.view.change_column_alias(self.column_alias, new_alias) self.view.change_column_alias(self.column_alias, new_alias)
# Element names property getter
@property
def elements_names(self):
return self.elements_names
@staticmethod @staticmethod
cdef object get_subclass_type(OBIDMS_column_p column_p) : cdef object get_subclass_type(OBIDMS_column_p column_p) :