From 0845daab79f5e754295d2713e5986dd34750b0ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20M=C3=B6bius?= <moebius@cs.rwth-aachen.de>
Date: Tue, 8 Dec 2009 10:13:37 +0000
Subject: [PATCH] use new visibilityChanged handling
git-svn-id: http://www.openflipper.org/svnrepo/OpenFlipper/branches/Free@7793 383ad7c9-94d9-4d36-a494-682f7c89f535
---
ContextMenuDataControl.cc | 3 ---
DataControlPlugin.cc | 1 -
DataControlPlugin.hh | 1 -
DataControlPluginScripting.cc | 13 -------------
Popup.cc | 3 ---
5 files changed, 21 deletions(-)
diff --git a/ContextMenuDataControl.cc b/ContextMenuDataControl.cc
index ab58829..51f51af 100644
--- a/ContextMenuDataControl.cc
+++ b/ContextMenuDataControl.cc
@@ -74,9 +74,6 @@ void DataControlPlugin::slotContextMenuHide( ) {
return;
object->hide();
-
- emit visibilityChanged(objectId);
- emit updateView();
}
diff --git a/DataControlPlugin.cc b/DataControlPlugin.cc
index 8046d6a..0d91298 100644
--- a/DataControlPlugin.cc
+++ b/DataControlPlugin.cc
@@ -334,7 +334,6 @@ void DataControlPlugin::slotDataChanged ( int _id, int _column, const QVariant&
// show/hide
case 1:
obj->visible( _value.toBool() );
- emit visibilityChanged( obj->id() );
break;
// source
diff --git a/DataControlPlugin.hh b/DataControlPlugin.hh
index 6db3a9f..e2352ab 100644
--- a/DataControlPlugin.hh
+++ b/DataControlPlugin.hh
@@ -80,7 +80,6 @@ class DataControlPlugin : public QObject, BaseInterface, ToolboxInterface, KeyIn
// BaseInterface
void updateView();
void updatedObject(int);
- void visibilityChanged(int);
void objectSelectionChanged(int);
void objectPropertiesChanged(int);
diff --git a/DataControlPluginScripting.cc b/DataControlPluginScripting.cc
index 0c0549d..a9c841e 100644
--- a/DataControlPluginScripting.cc
+++ b/DataControlPluginScripting.cc
@@ -174,11 +174,8 @@ void DataControlPlugin::hideObject( int objectId ) {
BaseObjectData* object;
if ( PluginFunctions::getObject(objectId,object) ){
object->hide();
-
- emit visibilityChanged( object->id() );
}
- emit updateView();
}
@@ -267,11 +264,8 @@ void DataControlPlugin::showObject( int objectId ) {
BaseObjectData* object;
if ( PluginFunctions::getObject(objectId,object) ){
object->show();
-
- emit visibilityChanged( object->id() );
}
- emit updateView();
}
@@ -346,7 +340,6 @@ void DataControlPlugin::groupObjects(idList _objectIDs, QString _groupName) {
groupItem->source(source);
emit objectPropertiesChanged( groupItem->id() );
- emit visibilityChanged ( groupItem->id() );
emit objectSelectionChanged ( groupItem->id() );
}
@@ -465,11 +458,8 @@ void DataControlPlugin::hideAll() {
for ( PluginFunctions::ObjectIterator o_it(PluginFunctions::ALL_OBJECTS,type) ;
o_it != PluginFunctions::objectsEnd(); ++o_it){
o_it->hide();
-
- emit visibilityChanged( o_it->id() );
}
- emit updateView();
}
@@ -490,9 +480,6 @@ void DataControlPlugin::showAll() {
for ( PluginFunctions::ObjectIterator o_it(PluginFunctions::ALL_OBJECTS, type); o_it != PluginFunctions::objectsEnd(); ++o_it){
o_it->show();
-
- emit visibilityChanged( o_it->id() );
}
- emit updateView();
}
diff --git a/Popup.cc b/Popup.cc
index bc56fda..3e35d7a 100644
--- a/Popup.cc
+++ b/Popup.cc
@@ -247,7 +247,6 @@ void DataControlPlugin::slotGroup() {
groupItem->target(target);
groupItem->source(source);
- emit visibilityChanged( groupItem->id() );
emit objectPropertiesChanged( groupItem->id() );
emit objectSelectionChanged ( groupItem->id() );
}
@@ -558,7 +557,6 @@ void DataControlPlugin::slotZoomTo(){
if ( !child->visible() ){
child->show();
- emit visibilityChanged( child->id() );
}
ACG::Vec3d cur_min;
@@ -596,7 +594,6 @@ void DataControlPlugin::slotZoomTo(){
if ( !obj->visible() ){
obj->show();
- emit visibilityChanged( obj->id() );
}
if (obj){
--
GitLab