Skip to content

Commit

Permalink
Add a changes_saved flag instead of using the save button
Browse files Browse the repository at this point in the history 
enabled/disabled
Add data retrieved from RQT plugin to fill apropriated annotation's
fields
Some rearrangements and extra protections
  • Loading branch information
@corot
corot committed Oct 15, 2014
1 parent fbd34ea commit 641519e
Show file tree
Hide file tree
Showing 2 changed files with 47 additions and 21 deletions.
67 changes: 46 additions & 21 deletions world_canvas_editor/src/editor_panel.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,8 @@ RVizPluginEditor::RVizPluginEditor(QWidget* parent)
ui_->shapeComboBox->addItem("SPHERE", visualization_msgs::Marker::SPHERE);
ui_->shapeComboBox->addItem("CYLINDER", visualization_msgs::Marker::CYLINDER);
ui_->shapeComboBox->addItem("TEXT", visualization_msgs::Marker::TEXT_VIEW_FACING);

changes_saved_ = true;
}

void RVizPluginEditor::newButtonClicked()
Expand All @@ -93,6 +95,7 @@ void RVizPluginEditor::newButtonClicked()
current_annot_->shape = visualization_msgs::Marker::TEXT_VIEW_FACING; // reasonable default
current_annot_->color.a = 0.5; // Avoid a rather confusing invisible shape

// Update GUI
annot2widgets(current_annot_);
showCurrentAnnot();

Expand All @@ -109,6 +112,7 @@ void RVizPluginEditor::updButtonClicked()

widgets2annot(current_annot_);
showCurrentAnnot();
changes_saved_ = false;

// Now it makes sense to save but only if we have already annotation's data
if (current_data_)
Expand All @@ -121,8 +125,7 @@ void RVizPluginEditor::msgButtonClicked()

ext_process_.reset(new QProcess(this));
QString command_line = "rosrun rqt_annotation_data rqt_annotation_data";
QStringList parameters;
parameters << "param1" << "param2" << "param3";
// QStringList parameters; parameters << "param1" << "param2" << "param3";

QApplication::setOverrideCursor(Qt::WaitCursor);
ext_process_->start(command_line);//, parameters);
Expand All @@ -145,6 +148,7 @@ void RVizPluginEditor::msgButtonClicked()
}

// Prepare request depending on whether current annotation has already associated data
assert(current_annot_);
world_canvas_msgs::EditAnnotationsData srv;
srv.request.annotation = *current_annot_;

Expand All @@ -167,23 +171,24 @@ void RVizPluginEditor::msgButtonClicked()
case world_canvas_msgs::EditAnnotationsData::Response::UPDATE:
if (!current_data_)
current_data_.reset(new world_canvas_msgs::AnnotationData);

*current_data_ = srv.response.data;
// current_data_->id = uuid::toMsg(uuid::fromRandom());
// current_data_->type = msg->getDataType();
// current_data_->data.resize(msg->size() + 4);

// current_annot_->data_id = current_data_->id;
// current_annot_->type = current_data_->type;
current_annot_->data_id = current_data_->id;
current_annot_->type = current_data_->type;

// The current annotation have type and data, so it's now complete; we can save it!
ui_->typeLineEdit->setText(current_data_->type.c_str());
ui_->saveAnnButton->setEnabled(true);
changes_saved_ = false;
break;
case world_canvas_msgs::EditAnnotationsData::Response::DELETE:
current_data_.reset();

// The current annotation have no type or data anymore; we cannot save it
ui_->typeLineEdit->setText("");
ui_->saveAnnButton->setEnabled(false);
changes_saved_ = false;
break;
case world_canvas_msgs::EditAnnotationsData::Response::CANCEL:
break;
Expand All @@ -204,6 +209,8 @@ void RVizPluginEditor::msgButtonClicked()

void RVizPluginEditor::delButtonClicked()
{
ROS_DEBUG("Delete annotation");

if (!current_annot_ || ! current_data_)
{
// This should not happen, as the delete button should be disabled in this case!
Expand All @@ -212,7 +219,6 @@ void RVizPluginEditor::delButtonClicked()
assert(current_data_);
return;
}
ROS_DEBUG("Delete annotation");

// Confirmation dialog
int ret = QMessageBox::question(this, tr("Annotations Editor"),
Expand All @@ -223,12 +229,6 @@ void RVizPluginEditor::delButtonClicked()
if (ret != QMessageBox::Yes)
return;

ui_->updateButton->setEnabled(false);
ui_->editMsgButton->setEnabled(false);
ui_->delAnnButton->setEnabled(false);
ui_->saveAnnButton->setEnabled(true);
ui_->pickColorButton->setEnabled(false);

worlds_list_->annotations_->del(current_annot_->id);

// Reset current annotation and make widgets empty
Expand All @@ -237,12 +237,24 @@ void RVizPluginEditor::delButtonClicked()

world_canvas_msgs::Annotation::Ptr empty(new world_canvas_msgs::Annotation);
empty->pose.pose.pose.orientation.w = 1.0; // Avoid non-normalized quaternions

// Update GUI
annot2widgets(empty);
hideCurrentAnnot();

ui_->updateButton->setEnabled(false);
ui_->editMsgButton->setEnabled(false);
ui_->delAnnButton->setEnabled(false);
ui_->saveAnnButton->setEnabled(true);
ui_->pickColorButton->setEnabled(false);

changes_saved_ = false;
}

void RVizPluginEditor::saveButtonClicked()
{
ROS_DEBUG("Save annotation");

if (!current_annot_ != ! current_data_)
{
// XOR; this should not happen, as the save button should be disabled in this case!
Expand All @@ -254,14 +266,13 @@ void RVizPluginEditor::saveButtonClicked()
assert(current_data_);
return;
}
ROS_DEBUG("Save annotation");

if (current_annot_ && current_data_)
{
// Only apply for the 1st valid case
ui_->delAnnButton->setEnabled(true);

// TODO: replace by an "update" method; and provide feedback to user in case of failure
// TODO: replace by an "update" method; and provide feedback to user in case of failure URGENT --> creates a problem now!!!
worlds_list_->annotations_->del(current_annot_->id);
if (worlds_list_->annotations_->add(*current_annot_, *current_data_) == false)
{
Expand All @@ -272,6 +283,7 @@ void RVizPluginEditor::saveButtonClicked()

// The rest apply for both
ui_->saveAnnButton->setEnabled(false);
changes_saved_ = true;

if (worlds_list_->annotations_->save() == false)
{
Expand All @@ -293,18 +305,18 @@ void RVizPluginEditor::annsTreeDoubleClicked(QTreeWidgetItem *item, int column)

void RVizPluginEditor::worldSelected(QTreeWidgetItem *item, int column)
{
// Check that user is not selecting again the current world
int world_index = ui_->annsTreeWidget->indexOfTopLevelItem(item);
ROS_DEBUG("World %d selected (%s)", world_index, worlds_list_->getName(world_index).c_str());

// Check that user is not selecting again the current world
if (world_index == worlds_list_->getCurrent())
return;

ROS_DEBUG("World %d selected (%s)", world_index, worlds_list_->getName(world_index).c_str());
ui_->newAnnButton->setEnabled(true);

// Change world resets current annotation, so confirm that user want to discard changes (if any)
if (discardCurrentChanges() == false)
return;

ui_->newAnnButton->setEnabled(true);
worlds_list_->setCurrent(world_index);
ui_->editAnnGroupBox->setTitle(tr("Edit annotations for world '%1'")
.arg(worlds_list_->getName(world_index).c_str()));
Expand All @@ -315,6 +327,8 @@ void RVizPluginEditor::worldSelected(QTreeWidgetItem *item, int column)

world_canvas_msgs::Annotation::Ptr empty(new world_canvas_msgs::Annotation);
empty->pose.pose.pose.orientation.w = 1.0; // Avoid non-normalized quaternions

// Update GUI
annot2widgets(empty);
hideCurrentAnnot();

Expand All @@ -323,6 +337,7 @@ void RVizPluginEditor::worldSelected(QTreeWidgetItem *item, int column)
ui_->delAnnButton->setEnabled(false);
ui_->saveAnnButton->setEnabled(false);
ui_->pickColorButton->setEnabled(false);
changes_saved_ = true;
}

void RVizPluginEditor::annotSelected(QTreeWidgetItem *item, int column)
Expand All @@ -334,11 +349,16 @@ void RVizPluginEditor::annotSelected(QTreeWidgetItem *item, int column)
if (current_annot_ && (current_annot_->id.uuid == worlds_list_->annotations_->at(annot_index).id.uuid))
return;

// Choose another annotation resets current one, so confirm that user want to discard changes (if any)
if (discardCurrentChanges() == false)
return;

current_annot_.reset(new world_canvas_msgs::Annotation);
*current_annot_ = worlds_list_->annotations_->at(annot_index);
current_data_.reset(new world_canvas_msgs::AnnotationData);
*current_data_ = worlds_list_->annotations_->getData(*current_annot_);

// Update GUI
annot2widgets(current_annot_);
showCurrentAnnot();

Expand All @@ -347,6 +367,7 @@ void RVizPluginEditor::annotSelected(QTreeWidgetItem *item, int column)
ui_->delAnnButton->setEnabled(true);
ui_->saveAnnButton->setEnabled(false);
ui_->pickColorButton->setEnabled(true);
changes_saved_ = true;
}

void RVizPluginEditor::pickColorClicked()
Expand All @@ -365,6 +386,8 @@ void RVizPluginEditor::pickColorClicked()

void RVizPluginEditor::widgets2annot(world_canvas_msgs::Annotation::Ptr annot)
{
assert(annot);

annot->name = ui_->nameLineEdit->text().toStdString();
annot->type = ui_->typeLineEdit->text().toStdString();

Expand Down Expand Up @@ -428,6 +451,8 @@ void RVizPluginEditor::widgets2annot(world_canvas_msgs::Annotation::Ptr annot)

void RVizPluginEditor::annot2widgets(world_canvas_msgs::Annotation::Ptr annot)
{
assert(annot);

ui_->nameLineEdit->setText(annot->name.c_str());
ui_->typeLineEdit->setText(annot->type.c_str());

Expand Down Expand Up @@ -480,7 +505,7 @@ void RVizPluginEditor::annot2widgets(world_canvas_msgs::Annotation::Ptr annot)

bool RVizPluginEditor::discardCurrentChanges()
{
if (! current_annot_ || ! ui_->saveAnnButton->isEnabled()) // no current annotation or already saved
if (! current_annot_ || changes_saved_) // no current annotation or already saved
return true;

int ret = QMessageBox::warning(this, tr("Annotations Editor"),
Expand Down
1 change: 1 addition & 0 deletions world_canvas_editor/src/editor_panel.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,7 @@ protected Q_SLOTS:
boost::shared_ptr<QProcess> ext_process_;
boost::shared_ptr<WorldsList> worlds_list_;

bool changes_saved_;
QColor current_color_;
world_canvas_msgs::Annotation::Ptr current_annot_;
world_canvas_msgs::AnnotationData::Ptr current_data_;
Expand Down

0 comments on commit 641519e

Please sign in to comment.