1.1 --- a/branchpropwindow.cpp	Thu May 07 08:48:53 2009 +0000
     1.2 +++ b/branchpropwindow.cpp	Wed May 13 08:26:27 2009 +0000
     1.3 @@ -27,13 +27,14 @@
     1.4  	ui.framePenColorButton->setPixmap (pix);
     1.5  	ui.frameBrushColorButton->setPixmap (pix);
     1.6  
     1.7 -	// Create Model and View to hold attributes
     1.8 +	// Create Model and View to hold attributes 
     1.9 +	/*
    1.10  	attributeModel = new QStandardItemModel (1,3,this);
    1.11  	attributeModel->setHeaderData(0, Qt::Horizontal, tr("Name","Branchprop window: Attribute name"));
    1.12  	attributeModel->setHeaderData(1, Qt::Horizontal, tr("Value","Branchprop window: Attribute value"));
    1.13  	attributeModel->setHeaderData(2, Qt::Horizontal, tr("Type","Branchprop window: Attribute type"));
    1.14  	ui.attributeTableView->setModel (attributeModel);
    1.15 -	
    1.16 +	*/
    1.17  
    1.18  	// Load Settings
    1.19  	resize (settings.value ( "/satellite/propertywindow/geometry/size", QSize(450,600)).toSize());
    1.20 @@ -56,7 +57,7 @@
    1.21  	settings.setValue( "/satellite/propertywindow/showWithMain",isVisible() );
    1.22  }
    1.23  
    1.24 -void BranchPropertyWindow::setBranch (BranchObj *bo)
    1.25 +void BranchPropertyWindow::setBranch (BranchObj *bo)	//FIXME-2 maybe do this via signals emitted anyway from model?
    1.26  {
    1.27  	disconnectSignals();
    1.28  	branch=bo;
    1.29 @@ -122,10 +123,10 @@
    1.30  		else	
    1.31  			ui.incImgHor->setCheckState (Qt::Unchecked);
    1.32  
    1.33 +/*
    1.34  		// Attributes
    1.35  		attributeModel->removeRows(0, attributeModel->rowCount(), QModelIndex());
    1.36  
    1.37 -/*
    1.38  		// FIXME-3 some samples for attribute testing
    1.39  		QStringList attrTypes=mapEditor->attributeTable()->getTypes();
    1.40  		for (int i=0; i<attrTypes.count()-1;i++)
    1.41 @@ -241,6 +242,7 @@
    1.42      return;
    1.43  }
    1.44  
    1.45 +/*
    1.46  void BranchPropertyWindow::addAttributeClicked()
    1.47  {
    1.48  	// Add empty line for adding attributes
    1.49 @@ -265,6 +267,7 @@
    1.50  {
    1.51  	//FIXME-3 cout << "BPW::delete\n";
    1.52  }
    1.53 +*/
    1.54  
    1.55  void BranchPropertyWindow::connectSignals()
    1.56  {
    1.57 @@ -299,6 +302,7 @@
    1.58  		ui.incImgHor, SIGNAL (stateChanged( int)), 
    1.59  		this, SLOT (incImgHorChanged (int)));
    1.60  
    1.61 +/*
    1.62  	// Attributes	
    1.63  	connect ( 
    1.64  		ui.addAttributeButton, SIGNAL (clicked()), 
    1.65 @@ -306,6 +310,7 @@
    1.66  	connect ( 
    1.67  		ui.deleteAttributeButton, SIGNAL (clicked()), 
    1.68  		this, SLOT (deleteAttributeClicked()));
    1.69 +*/		
    1.70  }
    1.71  
    1.72  
    1.73 @@ -326,8 +331,10 @@
    1.74  	disconnect ( ui.incImgHor, 0,0,0);
    1.75  
    1.76  	// Attributes
    1.77 +	/*
    1.78  	disconnect ( ui.addAttributeButton, 0,0,0);
    1.79  	disconnect ( ui.deleteAttributeButton, 0,0,0);
    1.80 +	*/
    1.81  }
    1.82  
    1.83