[rkward-cvs] rkward/rkward/dataeditor rkeditordataframe.cpp,1.24,1.25 twintable.cpp,1.25,1.26 twintabledatamember.cpp,1.8,1.9 twintablemember.cpp,1.14,1.15 twintablemember.h,1.13,1.14 twintablemetamember.cpp,1.10,1.11
Thomas Friedrichsmeier
tfry at users.sourceforge.net
Thu Oct 21 16:34:44 UTC 2004
Update of /cvsroot/rkward/rkward/rkward/dataeditor
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12042
Modified Files:
rkeditordataframe.cpp twintable.cpp twintabledatamember.cpp
twintablemember.cpp twintablemember.h twintablemetamember.cpp
Log Message:
renamed numRows () to numTrueRows () and updated accordingly; should be less confusing
Index: twintablemetamember.cpp
===================================================================
RCS file: /cvsroot/rkward/rkward/rkward/dataeditor/twintablemetamember.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** twintablemetamember.cpp 5 Oct 2004 12:58:44 -0000 1.10
--- twintablemetamember.cpp 21 Oct 2004 16:34:42 -0000 1.11
***************
*** 79,83 ****
brush = cg.brush (QColorGroup::Base);
}
! if ((row >= numRows ()) || (!var)) {
brush = QBrush (Qt::gray);
}
--- 79,83 ----
brush = cg.brush (QColorGroup::Base);
}
! if ((row >= numTrueRows ()) || (!var)) {
brush = QBrush (Qt::gray);
}
***************
*** 112,116 ****
}
! if (var && (row < numRows ())) {
p->drawText (2, 0, cr.width () - 4, cr.height (), Qt::AlignLeft, formattedText (row, col));
}
--- 112,116 ----
}
! if (var && (row < numTrueRows ())) {
p->drawText (2, 0, cr.width () - 4, cr.height (), Qt::AlignLeft, formattedText (row, col));
}
Index: twintablemember.cpp
===================================================================
RCS file: /cvsroot/rkward/rkward/rkward/dataeditor/twintablemember.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** twintablemember.cpp 7 Oct 2004 15:58:20 -0000 1.14
--- twintablemember.cpp 21 Oct 2004 16:34:42 -0000 1.15
***************
*** 45,57 ****
}
- int TwinTableMember::numAllRows () {
- return QTable::numRows ();
- }
-
int TwinTableMember::numTrueCols () {
return numCols () - trailing_cols;
}
! int TwinTableMember::numRows () {
return QTable::numRows () - trailing_rows;
}
--- 45,53 ----
}
int TwinTableMember::numTrueCols () {
return numCols () - trailing_cols;
}
! int TwinTableMember::numTrueRows () {
return QTable::numRows () - trailing_rows;
}
Index: twintablemember.h
===================================================================
RCS file: /cvsroot/rkward/rkward/rkward/dataeditor/twintablemember.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** twintablemember.h 1 Oct 2004 16:37:59 -0000 1.13
--- twintablemember.h 21 Oct 2004 16:34:42 -0000 1.14
***************
*** 48,54 ****
virtual QString rText (int row, int col) const;
TwinTableMember *getTwin () { return twin; };
! /** reimplemented from QTable to return only the number of used rows */
! int numRows ();
! int numAllRows ();
/** like QTable::numCols (), but returns only the "true", i.e. active columns (excluding the trailing_cols) */
int numTrueCols ();
--- 48,53 ----
virtual QString rText (int row, int col) const;
TwinTableMember *getTwin () { return twin; };
! /** like QTable::numRows (), but returns only the "true", i.e. active rows (excluding the trailing_rows) */
! int numTrueRows ();
/** like QTable::numCols (), but returns only the "true", i.e. active columns (excluding the trailing_cols) */
int numTrueCols ();
Index: twintabledatamember.cpp
===================================================================
RCS file: /cvsroot/rkward/rkward/rkward/dataeditor/twintabledatamember.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** twintabledatamember.cpp 7 Oct 2004 15:58:20 -0000 1.8
--- twintabledatamember.cpp 21 Oct 2004 16:34:42 -0000 1.9
***************
*** 40,44 ****
table->getColObject (i)->removeRow (row);
}
! for (int i=row; i < numRows (); ++i) {
for (int j=0; j < table->numTrueCols (); ++j) {
updateCell (i, j);
--- 40,44 ----
table->getColObject (i)->removeRow (row);
}
! for (int i=row; i < numTrueRows (); ++i) {
for (int j=0; j < table->numTrueCols (); ++j) {
updateCell (i, j);
***************
*** 71,75 ****
brush = cg.brush(QColorGroup::Highlight);
}
! if ((row >= numRows ()) || (!var)) {
brush = QBrush (Qt::gray);
} else if (cell_state != RKVariable::ValueInvalid) {
--- 71,75 ----
brush = cg.brush(QColorGroup::Highlight);
}
! if ((row >= numTrueRows ()) || (!var)) {
brush = QBrush (Qt::gray);
} else if (cell_state != RKVariable::ValueInvalid) {
***************
*** 110,114 ****
}
! if (var && (row < numRows ())) {
if (var->getAlignment () == RKVariable::AlignCellRight) {
p->drawText (2, 0, cr.width () - 4, cr.height (), Qt::AlignRight, var->getFormatted (row));
--- 110,114 ----
}
! if (var && (row < numTrueRows ())) {
if (var->getAlignment () == RKVariable::AlignCellRight) {
p->drawText (2, 0, cr.width () - 4, cr.height (), Qt::AlignRight, var->getFormatted (row));
***************
*** 133,137 ****
}
! if (row >= numRows ()) {
table->insertNewRow ();
}
--- 133,137 ----
}
! if (row >= numTrueRows ()) {
table->insertNewRow ();
}
Index: rkeditordataframe.cpp
===================================================================
RCS file: /cvsroot/rkward/rkward/rkward/dataeditor/rkeditordataframe.cpp,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** rkeditordataframe.cpp 24 Sep 2004 16:10:58 -0000 1.24
--- rkeditordataframe.cpp 21 Oct 2004 16:34:42 -0000 1.25
***************
*** 81,85 ****
RObject *obj = static_cast<RContainerObject *> (getObject ())->createNewChild (static_cast<RContainerObject *> (getObject ())->validizeName ("var"), this);
if (obj->isVariable ()) {
! static_cast<RKVariable*> (obj)->setLength (dataview->numRows ());
setColObject (i, static_cast<RKVariable*> (obj));
obj->setCreatedInEditor (this);
--- 81,85 ----
RObject *obj = static_cast<RContainerObject *> (getObject ())->createNewChild (static_cast<RContainerObject *> (getObject ())->validizeName ("var"), this);
if (obj->isVariable ()) {
! static_cast<RKVariable*> (obj)->setLength (dataview->numTrueRows ());
setColObject (i, static_cast<RKVariable*> (obj));
obj->setCreatedInEditor (this);
***************
*** 127,132 ****
open_chain = RKGlobals::rInterface ()->closeChain (open_chain);
/* make sure enough rows are displayed. Note: Calling QTable::insertRows, since no data should be juggled around, only the number of visible rows is to be changed. */
! if (dataview->numRows () < getColObject (0)->getLength ()) {
! dataview->QTable::insertRows (0, getColObject (0)->getLength () - dataview->numRows ());
}
enableEditing (true);
--- 127,132 ----
open_chain = RKGlobals::rInterface ()->closeChain (open_chain);
/* make sure enough rows are displayed. Note: Calling QTable::insertRows, since no data should be juggled around, only the number of visible rows is to be changed. */
! if (dataview->numTrueRows () < getColObject (0)->getLength ()) {
! dataview->QTable::insertRows (0, getColObject (0)->getLength () - dataview->numTrueRows ());
}
enableEditing (true);
***************
*** 183,187 ****
RK_ASSERT (obj->isVariable ());
RKGlobals::rInterface ()->issueCommand (new RCommand (".rk.data.frame.insert.column (" + getObject ()->getFullName () + ", \"" + obj->getShortName () + "\", " + QString ().setNum (col+1) + ")", RCommand::App | RCommand::Sync));
! static_cast<RKVariable*> (obj)->setLength (dataview->numRows ());
obj->setCreatedInEditor (this);
--- 183,187 ----
RK_ASSERT (obj->isVariable ());
RKGlobals::rInterface ()->issueCommand (new RCommand (".rk.data.frame.insert.column (" + getObject ()->getFullName () + ", \"" + obj->getShortName () + "\", " + QString ().setNum (col+1) + ")", RCommand::App | RCommand::Sync));
! static_cast<RKVariable*> (obj)->setLength (dataview->numTrueRows ());
obj->setCreatedInEditor (this);
***************
*** 280,284 ****
int col = getObjectCol (object);
! for (int i=0; i < varview->numRows (); ++i) {
varview->updateCell (i, col);
}
--- 280,284 ----
int col = getObjectCol (object);
! for (int i=0; i < varview->numTrueRows (); ++i) {
varview->updateCell (i, col);
}
***************
*** 290,294 ****
if (object != getObject ()) {
int col = getObjectCol (object);
! for (int i=0; i < dataview->numRows (); ++i) {
dataview->updateCell (i, col);
}
--- 290,294 ----
if (object != getObject ()) {
int col = getObjectCol (object);
! for (int i=0; i < dataview->numTrueRows (); ++i) {
dataview->updateCell (i, col);
}
Index: twintable.cpp
===================================================================
RCS file: /cvsroot/rkward/rkward/rkward/dataeditor/twintable.cpp,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** twintable.cpp 7 Oct 2004 15:58:20 -0000 1.25
--- twintable.cpp 21 Oct 2004 16:34:42 -0000 1.26
***************
*** 158,163 ****
if (!table) table = dataview;
! if ((where < 0) || (where > table->numRows ())) {
! where = table->numAllRows ();
}
--- 158,163 ----
if (!table) table = dataview;
! if ((where < 0) || (where > table->numTrueRows ())) {
! where = table->numRows ();
}
***************
*** 175,180 ****
if (!table) table = dataview;
! if ((where < 0) || (where > table->numRows ())) {
! where = table->numRows ();
}
--- 175,180 ----
if (!table) table = dataview;
! if ((where < 0) || (where > table->numTrueRows ())) {
! where = table->numRows () - 1;
}
***************
*** 191,195 ****
QTableSelection selection;
selection.init (0, col);
! selection.expandTo (dataview->numRows (), col);
dataview->addSelection (selection);
--- 191,195 ----
QTableSelection selection;
selection.init (0, col);
! selection.expandTo (dataview->numTrueRows (), col);
dataview->addSelection (selection);
***************
*** 215,224 ****
} else if (row >= 0) {
header_pos = row;
! if (row < dataview->numRows ()) {
left_header_menu->setItemVisible (HEADER_MENU_ID_ADD_ROW_ABOVE, true);
left_header_menu->setItemVisible (HEADER_MENU_ID_ADD_ROW_BELOW, true);
left_header_menu->setItemVisible (HEADER_MENU_ID_DEL_ROW, true);
left_header_menu->popup (dataview->mouse_at);
! } else if (row == dataview->numRows ()) { // trailing row
left_header_menu->setItemVisible (HEADER_MENU_ID_ADD_ROW_ABOVE, true);
left_header_menu->setItemVisible (HEADER_MENU_ID_ADD_ROW_BELOW, false);
--- 215,224 ----
} else if (row >= 0) {
header_pos = row;
! if (row < dataview->numTrueRows ()) {
left_header_menu->setItemVisible (HEADER_MENU_ID_ADD_ROW_ABOVE, true);
left_header_menu->setItemVisible (HEADER_MENU_ID_ADD_ROW_BELOW, true);
left_header_menu->setItemVisible (HEADER_MENU_ID_DEL_ROW, true);
left_header_menu->popup (dataview->mouse_at);
! } else if (row == dataview->numTrueRows ()) { // trailing row
left_header_menu->setItemVisible (HEADER_MENU_ID_ADD_ROW_ABOVE, true);
left_header_menu->setItemVisible (HEADER_MENU_ID_ADD_ROW_BELOW, false);
***************
*** 361,365 ****
row++;
col = selection.leftCol ();
! if (row >= table->numRows ()) {
next_delim = pasted.length ();
}
--- 361,365 ----
row++;
col = selection.leftCol ();
! if (row >= table->numTrueRows ()) {
next_delim = pasted.length ();
}
***************
*** 381,385 ****
}
}
! if (row >= table->numRows ()) {
if (paste_mode == RKEditor::PasteToTable) {
next_delim = pasted.length ();
--- 381,385 ----
}
}
! if (row >= table->numTrueRows ()) {
if (paste_mode == RKEditor::PasteToTable) {
next_delim = pasted.length ();
***************
*** 449,454 ****
void TwinTable::setColumn (TwinTableMember* table, int col, int start_row, int end_row, char **data) {
flushEdit ();
! while (table->numRows () <= end_row) {
! insertNewRow (table->numRows (), table);
}
--- 449,454 ----
void TwinTable::setColumn (TwinTableMember* table, int col, int start_row, int end_row, char **data) {
flushEdit ();
! while (table->numTrueRows () <= end_row) {
! insertNewRow (table->numTrueRows (), table);
}
More information about the rkward-tracker
mailing list