Thread: [fwbuilder-commits] r1522 - in branches/v3_1: . src/gui
Brought to you by:
mikehorn
From: <va...@in...> - 2009-09-30 01:11:52
|
Author: vadim Date: 2009-09-29 18:11:33 -0700 (Tue, 29 Sep 2009) New Revision: 1522 Modified: branches/v3_1/build_num branches/v3_1/src/gui/RuleSetView.cpp Log: fixes #479, #470 Modified: branches/v3_1/build_num =================================================================== --- branches/v3_1/build_num 2009-09-30 00:50:55 UTC (rev 1521) +++ branches/v3_1/build_num 2009-09-30 01:11:33 UTC (rev 1522) @@ -1 +1 @@ -#define BUILD_NUM 1520 +#define BUILD_NUM 1521 Modified: branches/v3_1/src/gui/RuleSetView.cpp =================================================================== --- branches/v3_1/src/gui/RuleSetView.cpp 2009-09-30 00:50:55 UTC (rev 1521) +++ branches/v3_1/src/gui/RuleSetView.cpp 2009-09-30 01:11:33 UTC (rev 1522) @@ -233,12 +233,13 @@ "obj=%s row=%d col=%d", (object)?object->getName().c_str():"NULL", index.row(), index.column()); - selectObject(object, index); - - startingDrag = (fwosm->index.row()==index.row() && - fwosm->index.column()==index.column() && - fwosm->selectedObject==object); - + if (object) + { + selectObject(object, index); + startingDrag = (fwosm->index.row()==index.row() && + fwosm->index.column()==index.column() && + fwosm->selectedObject==object); + } } void RuleSetView::mouseReleaseEvent( QMouseEvent* ev ) @@ -1410,7 +1411,7 @@ FWObject *RuleSetView::getObject(const QPoint &pos, const QModelIndex &index) { - if (fwbdebug) qDebug() << "RuleSetView::getObject"; + if (fwbdebug) qDebug() << "RuleSetView::getObject(const QPoint &pos, const QModelIndex &index)"; if (!index.isValid() || index.column() == 0) return 0; @@ -1453,7 +1454,7 @@ FWObject *RuleSetView::getObject(int number, const QModelIndex &index) { - if (fwbdebug) qDebug() << "RuleSetView::getObject"; + if (fwbdebug) qDebug() << "RuleSetView::getObject(int number, const QModelIndex &index)"; if (!index.isValid() || index.column() == 0) return 0; @@ -1487,7 +1488,7 @@ int RuleSetView::getObjectNumber(FWObject *object, const QModelIndex &index) { - if (fwbdebug) qDebug() << "RuleSetView::getObjectNumber"; + if (fwbdebug) qDebug() << "RuleSetView::getObjectNumber(FWObject *object, const QModelIndex &index)"; if (!index.isValid() || index.column() == 0) return 0; |