diff --git a/src/ChangeLog b/src/ChangeLog --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,12 @@ 2011-01-13 + * transporterdialog.cpp (TransporterDialog): Use wn to discern + which cell a wallitem belongs to. + + * wallitem.cpp (WallItem): Add a comment explaining how + wallnumber(wn) can be used to tell which cell a wallitem belongs + to. + * VirtualLeaf-install-windows.nsi: Remove previous change that added icon directory. * canvas.cpp: Instead of using a separate icon directory, compile diff --git a/src/transporterdialog.cpp b/src/transporterdialog.cpp --- a/src/transporterdialog.cpp +++ b/src/transporterdialog.cpp @@ -42,8 +42,10 @@ TransporterDialog::TransporterDialog(Wal // compose a label describing the cells and nodes associated with this wall std::stringstream desc; - desc << "between cells "<< wall->C1()->Index() << " and " << wall->C2()->Index() << ", and" << endl << - "connecting nodes " << wall->N1()->Index() << " and " << wall->N2()->Index(); + + desc << "Transporters for cell "<< ((wall_num == 1) ? wall->C1() : wall->C2())->Index() + << "; adjacent to cell " << ((wall_num == 2) ? wall->C1() : wall->C2())->Index() << "," << endl + << "and connecting nodes " << wall->N1()->Index() << " and " << wall->N2()->Index() << "."; // description label label = new QLabel; @@ -92,7 +94,7 @@ TransporterDialog::TransporterDialog(Wal layout->addLayout(b_grid); setLayout(layout); - setWindowTitle(QString("Edit Transporters")); + setWindowTitle(QString("Edit Cell Transporters")); } void TransporterDialog::setTransporterValues() diff --git a/src/wallitem.cpp b/src/wallitem.cpp --- a/src/wallitem.cpp +++ b/src/wallitem.cpp @@ -34,6 +34,7 @@ static const std::string _module_id("$Id WallItem::WallItem( Wall *w, int wallnumber, QGraphicsScene *canvas ) : QGraphicsLineItem( 0, canvas ), SimItemBase( w, canvas){ + /* wn == 1 -> C1; wn == 2 -> C2. This way we can tell which cell a wallitem belongs to. */ wn = wallnumber; extern Parameter par;