Title block templates: improved span management

git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/branches/0.3@1636 bfdf4180-ca20-0410-9c96-a3a8aa849046
This commit is contained in:
xavier
2012-04-08 20:51:40 +00:00
parent e3eaed2314
commit ba7e030d9f
7 changed files with 112 additions and 53 deletions

View File

@@ -198,6 +198,9 @@ class MergeCellsCommand : public TitleBlockTemplateCommand {
QHash<TitleBlockCell *, TitleBlockCell *> spanner_cells_before_merge_;
int row_span_before_; ///< the row_span attribute of the spanning cell before the merge
int col_span_before_; ///< the col_span attribute of the spanning cell before the merge
int applied_row_span_before_; ///< the applied_row_span attribute of the spanning cell before the merge
int applied_col_span_before_; ///< the applied_col_span attribute of the spanning cell before the merge
int span_state_before_; ///< the span_state attribute of the spanning cell before the merge
int row_span_after_; ///< the row_span attribute of the spanning cell after the merge
int col_span_after_; ///< the col_span attribute of the spanning cell after the merge
};
@@ -222,8 +225,11 @@ class SplitCellsCommand : public TitleBlockTemplateCommand {
private:
TitleBlockCell *spanning_cell_; ///< the cell spanning over the other ones
QSet<TitleBlockCell *> spanned_cells_; ///< the spanned cells
int row_span_before_; ///< the row_span attribute of the spanning cell after the merge
int col_span_before_; ///< the col_span attribute of the spanning cell after the merge
int row_span_before_; ///< the row_span attribute of the spanning cell before splitting
int col_span_before_; ///< the col_span attribute of the spanning cell before splitting
int applied_row_span_before_; ///< the applied_row_span attribute of the spanning cell before splitting
int applied_col_span_before_; ///< the applied_col_span attribute of the spanning cell before splitting
int span_state_before_; ///< the span_state attribute of the spanning cell before splitting
};
/**