Changeset - da628cac41fc
[Not reviewed]
default
0 3 0
Michael Guravage - 14 years ago 2011-01-13 15:15:46
michael.guravage@cwi.nl
Use the wallnumber (wn) to discern which cell a wallitem belongs to.

--
user: Michael Guravage <michael.guravage@cwi.nl>
branch 'default'
changed src/ChangeLog
changed src/transporterdialog.cpp
changed src/wallitem.cpp
3 files changed with 13 insertions and 3 deletions:
0 comments (0 inline, 0 general)
src/ChangeLog
Show inline comments
 
2011-01-13    <guravage@petitdru.sen.cwi.nl>
 

	
 
	* 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
src/transporterdialog.cpp
Show inline comments
 
@@ -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()
src/wallitem.cpp
Show inline comments
 
@@ -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;
0 comments (0 inline, 0 general)