Skip to content

Commit

Permalink
Actions now provide access to the coordinates for points and the
Browse files Browse the repository at this point in the history 
start/end points for linestrings. Also includes some
raionalisation of, and subtle bug fies for, the action code.


git-svn-id: http://svn.osgeo.org/qgis/trunk@9031 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
gjm committed Aug 8, 2008
1 parent 4040ddd commit 4f65b2b
Show file tree
Hide file tree
Showing 3 changed files with 79 additions and 40 deletions.
96 changes: 56 additions & 40 deletions src/app/qgsidentifyresults.cpp
View file
Expand Up @@ -54,6 +54,9 @@ QgsIdentifyResults::QgsIdentifyResults(const QgsAttributeAction& actions,

connect( lstResults, SIGNAL(currentItemChanged(QTreeWidgetItem*, QTreeWidgetItem*)),
this, SLOT(handleCurrentItemChanged(QTreeWidgetItem*, QTreeWidgetItem*)));

// The label to use for the Derived node in the identify results
mDerivedLabel = tr("(Derived)");
}

QgsIdentifyResults::~QgsIdentifyResults()
Expand Down Expand Up @@ -121,30 +124,7 @@ void QgsIdentifyResults::contextMenuEvent(QContextMenuEvent* event)
}
// Save the attribute values as these are needed for substituting into
// the action.
// A little bit complicated because the user could of right-clicked
// on a parent or a child in the dialog box. We also want to keep
// track of which row in the identify results table was actually
// clicked on. This is stored as an index into the mValues vector.

QTreeWidgetItem* parent = item->parent();
if (parent == 0)
parent = item;

mValues.clear();
for (int j = 0; j < parent->childCount(); ++j)
{
if ( parent->child(j)->text(0) != "action" ) {
mValues.push_back(std::make_pair(parent->child(j)->text(0),
parent->child(j)->text(1)));
// Need to do the comparison on the text strings rather than the
// pointers because if the user clicked on the parent, we need
// to pick up which child that actually is (the parent in the
// identify results dialog box is just one of the children
// that has been chosen by some method).
if (parent->child(j)->text(0) == item->text(0))
mClickedOnValue = j;
}
}
extractAllItemData(item);

if (mActions.size() > 0)
mActionPopup->popup(event->globalPos());
Expand Down Expand Up @@ -194,7 +174,7 @@ void QgsIdentifyResults::addDerivedAttribute(QTreeWidgetItem * fnode, QString fi
else
{
// Create new derived-attribute root node
daRootNode = new QTreeWidgetItem(fnode, QStringList(tr("(Derived)")));
daRootNode = new QTreeWidgetItem(fnode, QStringList(mDerivedLabel));
QFont font = daRootNode->font(0);
font.setItalic(true);
daRootNode->setFont(0, font);
Expand Down Expand Up @@ -277,21 +257,7 @@ void QgsIdentifyResults::clicked ( QTreeWidgetItem *item )

int id = item->text(3).toInt();

QTreeWidgetItem* parent = item->parent();
if (parent == 0)
parent = item;

mValues.clear();

for (int j = 0; j < parent->childCount(); ++j)
{
if ( parent->child(j)->text(0) != "action" ) {
mValues.push_back(std::make_pair(parent->child(j)->text(0),
parent->child(j)->text(1)));
if (parent->child(j)->text(0) == item->text(0))
mClickedOnValue = j;
}
}
extractAllItemData(item);

mActions.doAction(id, mValues, mClickedOnValue);
}
Expand Down Expand Up @@ -337,3 +303,53 @@ void QgsIdentifyResults::handleCurrentItemChanged(QTreeWidgetItem* current, QTre
mCurrentFeatureId = fid2;
emit selectedFeatureChanged(mCurrentFeatureId);
}

void QgsIdentifyResults::extractAllItemData(QTreeWidgetItem* item)
{
// Extracts the name/value pairs from the given item. This includes data
// under the (Derived) item.

// A little bit complicated because the user could of right-clicked
// on any item in the dialog box. We want a toplevel item, so walk upwards
// as far as possible.
// We also want to keep track of which row in the identify results table was
// actually clicked on. This is stored as an index into the mValues vector.

QTreeWidgetItem* child = item;
QTreeWidgetItem* parent = child->parent();
while (parent != 0)
{
child = parent;
parent = parent->parent();
}
parent = child;

mValues.clear();

// For the code below we
// need to do the comparison on the text strings rather than the
// pointers because if the user clicked on the parent, we need
// to pick up which child that actually is (the parent in the
// identify results dialog box is just one of the children
// that has been chosen by some method).

for (int j = 0; j < parent->childCount(); ++j)
{
if ( parent->child(j)->text(0) != "action" ) {
// For derived attributes, build up a virtual name
if (parent->child(j)->text(0) == mDerivedLabel ) {
for (int k = 0; k < parent->child(j)->childCount(); ++k)
mValues.push_back(
std::make_pair(mDerivedLabel + "."
+ parent->child(j)->child(k)->text(0),
parent->child(j)->child(k)->text(1)));
}
else // do the actual feature attributes
mValues.push_back(std::make_pair(parent->child(j)->text(0),
parent->child(j)->text(1)));

if (parent->child(j)->text(0) == item->text(0))
mClickedOnValue = j;
}
}
}
5 changes: 5 additions & 0 deletions src/app/qgsidentifyresults.h
View file
Expand Up @@ -116,6 +116,7 @@ class QgsIdentifyResults: public QDialog, private Ui::QgsIdentifyResultsBase
std::vector<std::pair<QString, QString> > mValues;
static const int context_id = 689216579;
int mCurrentFeatureId;
QString mDerivedLabel;

/**
Keeps track of what derived-attribute (e.g. Length, Area)
Expand All @@ -125,6 +126,10 @@ class QgsIdentifyResults: public QDialog, private Ui::QgsIdentifyResultsBase
Second item: Derived-attribute root node for that feature
*/
std::map<QTreeWidgetItem *, QTreeWidgetItem *> mDerivedAttributeRootNodes;

// Convenience function to populate mValues with all of the item names and
// values for a item, including the derived ones.
void extractAllItemData(QTreeWidgetItem* item);
};

#endif
18 changes: 18 additions & 0 deletions src/app/qgsmaptoolidentify.cpp
View file
Expand Up @@ -314,13 +314,31 @@ void QgsMapToolIdentify::identifyVectorLayer(QgsVectorLayer* layer, const QgsPoi
double dist = calc.measure(f_it->geometry());
QString str = calc.textUnit(dist, 3, mCanvas->mapUnits(), false);
mResults->addDerivedAttribute(featureNode, QObject::tr("Length"), str);
// Add the start and end points in as derived attributes
str.setNum(f_it->geometry()->asPolyline().first().x(), 'g', 10);
mResults->addDerivedAttribute(featureNode, "startX", str);
str.setNum(f_it->geometry()->asPolyline().first().y(), 'g', 10);
mResults->addDerivedAttribute(featureNode, "startY", str);
str.setNum(f_it->geometry()->asPolyline().last().x(), 'g', 10);
mResults->addDerivedAttribute(featureNode, "endX", str);
str.setNum(f_it->geometry()->asPolyline().last().y(), 'g', 10);
mResults->addDerivedAttribute(featureNode, "endY", str);
}
else if (layer->vectorType() == QGis::Polygon)
{
double area = calc.measure(f_it->geometry());
QString str = calc.textUnit(area, 3, mCanvas->mapUnits(), true);
mResults->addDerivedAttribute(featureNode, QObject::tr("Area"), str);
}
else if (layer->vectorType() == QGis::Point)
{
// Include the x and y coordinates of the point as a derived attribute
QString str;
str.setNum(f_it->geometry()->asPoint().x(), 'g', 10);
mResults->addDerivedAttribute(featureNode, "X", str);
str.setNum(f_it->geometry()->asPoint().y(), 'g', 10);
mResults->addDerivedAttribute(featureNode, "Y", str);
}

// Add actions
QgsAttributeAction::aIter iter = actions.begin();
Expand Down

0 comments on commit 4f65b2b

Please sign in to comment.