Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Implementing "delete" function for a separate object #471

Closed
wants to merge 18 commits into from
Closed
Changes from 1 commit
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
2aba2ef
Added delete Object function
SamuilsRulovs Sep 6, 2021
2d2ef2f
Trying to implement delete object function
SamuilsRulovs Sep 8, 2021
e1fcc3f
Updated function "Delete object", thus it would work on click
SamuilsRulovs Sep 12, 2021
acc9fca
Merge remote-tracking branch 'tumcms/development' into DeleteObject
SamuilsRulovs Sep 16, 2021
c1c063e
Merge remote-tracking branch 'tumcms/development' into DeleteObject
SamuilsRulovs Oct 7, 2021
c7ef98f
Merge remote-tracking branch 'tumcms/development' into DeleteObject
SamuilsRulovs Nov 12, 2021
af21b5f
Some changes to delete Object function
SamuilsRulovs Nov 12, 2021
eef1ad2
Merge remote-tracking branch 'tumcms/development' into DeleteObject
SamuilsRulovs Nov 19, 2021
d21aa00
Merge remote-tracking branch 'tumcms/development' into DeleteObject
SamuilsRulovs Nov 27, 2021
95e1cfb
Merge remote-tracking branch 'tumcms/development' into DeleteObject
SamuilsRulovs Dec 1, 2021
cc686bb
Merge remote-tracking branch 'tumcms/development' into DeleteObject
SamuilsRulovs Dec 3, 2021
f6ea243
Merge remote-tracking branch 'tumcms/development' into DeleteObject
SamuilsRulovs Dec 9, 2021
9c2da38
Merge remote-tracking branch 'tumcms/development' into DeleteObject
SamuilsRulovs Apr 29, 2022
542b946
Merge remote-tracking branch 'tumcms/development' into DeleteObject
SamuilsRulovs May 18, 2022
63c8e1b
Merge branch 'development' into DeleteObject
SamuilsRulovs Jun 3, 2022
b64b607
Merge remote-tracking branch 'tumcms/development' into DeleteObject
SamuilsRulovs Jul 12, 2022
24dca4a
Merge remote-tracking branch 'tumcms/development' into DeleteObject
SamuilsRulovs Mar 11, 2023
4166de8
Commenting out the code
SamuilsRulovs Apr 9, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Trying to implement delete object function
SamuilsRulovs committed Sep 8, 2021

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
commit 2d2ef2f380a98b9283a64b537a9b010f8bc67b89
10 changes: 8 additions & 2 deletions UserInterface/MainWindow.cpp
Original file line number Diff line number Diff line change
@@ -560,7 +560,7 @@ void OpenInfraPlatform::UserInterface::MainWindow::updateModelsUI()

QPushButton *launchDeleteObjectButton = new QPushButton();
launchDeleteObjectButton->setText("Delete object");
QObject::connect(launchDeleteObjectButton, SIGNAL(clicked()), this, SLOT(on_actionDeleteObject_triggered()));
QObject::connect(launchDeleteObjectButton, SIGNAL(clicked()), this, SLOT(on_actionDeleteObject_triggered(model, filename)));
modelsTreeWidget_->setItemWidget(itemDeleteObject, 1, launchDeleteObjectButton);
}
// expanded per default
@@ -921,8 +921,14 @@ void OpenInfraPlatform::UserInterface::MainWindow::actionGetCameraState() {
*/
}

void OpenInfraPlatform::UserInterface::MainWindow::on_actionDeleteObject_triggered(){
void OpenInfraPlatform::UserInterface::MainWindow::on_actionDeleteObject_triggered(const std::shared_ptr<oip::IfcModel>& model, const QString& filename){

QMessageBox::information(this, tr("Delete object"),
tr("The Button works!"), QMessageBox::Ok);
//OpenInfraPlatform::Core::DataManagement::Data::removeModel(model);

for (auto el : modelsTreeWidget_->findItems(filename, Qt::MatchFlag::MatchExactly, 1))
modelsTreeWidget_->invisibleRootItem()->removeChild(el);
}

#ifdef OIP_WITH_POINT_CLOUD_PROCESSING
2 changes: 1 addition & 1 deletion UserInterface/MainWindow.h
Original file line number Diff line number Diff line change
@@ -186,7 +186,7 @@ namespace OpenInfraPlatform
//void on_actionVertical_alignment_triggered();
void on_actionViewport_as_screenshot_triggered();
//void on_actionAdd_Georeference_triggered();
void on_actionDeleteObject_triggered();
void on_actionDeleteObject_triggered(const std::shared_ptr<oip::IfcModel>& model, const QString& fileName);

//void on_checkBoxDifferentColorsForVerticalAlignmentElements_clicked(bool checked);
//void on_checkBoxHighlightSelectedAlignmentSegment_clicked(bool checked);