Merge remote-tracking branch 'origin/develop' into issues-58
This commit is contained in:
13
lib/fort.c
13
lib/fort.c
@@ -2829,6 +2829,19 @@ size_t ft_row_count(const ft_table_t *table)
|
||||
return vector_size(table->rows);
|
||||
}
|
||||
|
||||
size_t ft_col_count(const ft_table_t *table)
|
||||
{
|
||||
assert(table && table->rows);
|
||||
size_t cols_n = 0;
|
||||
size_t rows_n = vector_size(table->rows);
|
||||
for (size_t i = 0; i < rows_n; ++i) {
|
||||
f_row_t *row = VECTOR_AT(table->rows, i, f_row_t *);
|
||||
size_t ncols = columns_in_row(row);
|
||||
cols_n = MAX(cols_n, ncols);
|
||||
}
|
||||
return cols_n;
|
||||
}
|
||||
|
||||
int ft_erase_range(ft_table_t *table,
|
||||
size_t top_left_row, size_t top_left_col,
|
||||
size_t bottom_right_row, size_t bottom_right_col)
|
||||
|
16
lib/fort.h
16
lib/fort.h
@@ -45,9 +45,9 @@ SOFTWARE.
|
||||
*****************************************************************************/
|
||||
|
||||
#define LIBFORT_MAJOR_VERSION 0
|
||||
#define LIBFORT_MINOR_VERSION 4
|
||||
#define LIBFORT_REVISION 2
|
||||
#define LIBFORT_VERSION_STR "0.4.2"
|
||||
#define LIBFORT_MINOR_VERSION 5
|
||||
#define LIBFORT_REVISION 0
|
||||
#define LIBFORT_VERSION_STR "0.5.0"
|
||||
|
||||
|
||||
/*****************************************************************************
|
||||
@@ -370,6 +370,16 @@ int ft_is_empty(const ft_table_t *table);
|
||||
*/
|
||||
size_t ft_row_count(const ft_table_t *table);
|
||||
|
||||
/**
|
||||
* Get number of columns in the table.
|
||||
*
|
||||
* @param table
|
||||
* Pointer to formatted table.
|
||||
* @return
|
||||
* Number of columns in the table.
|
||||
*/
|
||||
size_t ft_col_count(const ft_table_t *table);
|
||||
|
||||
/**
|
||||
* Erase range of cells.
|
||||
*
|
||||
|
12
lib/fort.hpp
12
lib/fort.hpp
@@ -1172,6 +1172,18 @@ public:
|
||||
return ft_row_count(table_);
|
||||
}
|
||||
|
||||
/**
|
||||
* Get number of columns in the table.
|
||||
*
|
||||
* @return
|
||||
* Number of columns in the table.
|
||||
*/
|
||||
std::size_t
|
||||
col_count() const noexcept
|
||||
{
|
||||
return ft_col_count(table_);
|
||||
}
|
||||
|
||||
/**
|
||||
* Get current cell.
|
||||
*
|
||||
|
Reference in New Issue
Block a user