Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge renderer branch to trunk r7761:7920
git-svn-id: http://svn.osgeo.org/qgis/trunk@7922 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
timlinux committed Jan 10, 2008
1 parent e70e53d commit 8a55d7f
Show file tree
Hide file tree
Showing 56 changed files with 3,635 additions and 2,288 deletions.
1 change: 0 additions & 1 deletion CMakeLists.txt
@@ -1,4 +1,3 @@

PROJECT(qgis0.9.2)

# TODO:
Expand Down
76 changes: 76 additions & 0 deletions images/svg/gpsicons/plane_orange.svg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
102 changes: 102 additions & 0 deletions images/svg/icon/cameraangle.svg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
25 changes: 15 additions & 10 deletions src/app/qgsgraduatedsymboldialog.cpp
Expand Up @@ -89,16 +89,18 @@ QgsGraduatedSymbolDialog::QgsGraduatedSymbolDialog(QgsVectorLayer * layer): QDia
//fill the items of the renderer into mValues
for(QList<QgsSymbol*>::iterator it=list.begin();it!=list.end();++it)
{
//todo: make an assignment operator and a copy constructor for QgsSymbol
QString classbreak=(*it)->lowerValue()+" - "+(*it)->upperValue();
QgsSymbol* sym=new QgsSymbol(mVectorLayer->vectorType(), (*it)->lowerValue(), (*it)->upperValue(), (*it)->label());
sym->setPen((*it)->pen());
sym->setCustomTexture((*it)->customTexture());
sym->setBrush((*it)->brush());
sym->setNamedPointSymbol((*it)->pointSymbolName());
sym->setPointSize((*it)->pointSize());
mEntries.insert(std::make_pair(classbreak,sym));
mClassListWidget->addItem(classbreak);
//todo: make an assignment operator and a copy constructor for QgsSymbol
QString classbreak=(*it)->lowerValue()+" - "+(*it)->upperValue();
QgsSymbol* sym=new QgsSymbol(mVectorLayer->vectorType(), (*it)->lowerValue(), (*it)->upperValue(), (*it)->label());
sym->setPen((*it)->pen());
sym->setCustomTexture((*it)->customTexture());
sym->setBrush((*it)->brush());
sym->setNamedPointSymbol((*it)->pointSymbolName());
sym->setPointSize((*it)->pointSize());
sym->setScaleClassificationField((*it)->scaleClassificationField());
sym->setRotationClassificationField((*it)->rotationClassificationField());
mEntries.insert(std::make_pair(classbreak,sym));
mClassListWidget->addItem(classbreak);
}

}
Expand Down Expand Up @@ -177,6 +179,8 @@ void QgsGraduatedSymbolDialog::apply()
{
sy->setNamedPointSymbol(it->second->pointSymbolName());
sy->setPointSize(it->second->pointSize());
sy->setScaleClassificationField(it->second->scaleClassificationField());
sy->setRotationClassificationField(it->second->rotationClassificationField());

}

Expand Down Expand Up @@ -215,6 +219,7 @@ void QgsGraduatedSymbolDialog::apply()
delete sy;
}
}
renderer->updateSymbolAttributes();

std::map<QString,int>::iterator iter=mFieldMap.find(classificationComboBox->currentText());
if(iter!=mFieldMap.end())
Expand Down

0 comments on commit 8a55d7f

Please sign in to comment.