Commit e0936dcc authored by Jan Möbius's avatar Jan Möbius

git-svn-id: http://www.openflipper.org/svnrepo/OpenFlipper/branches/Free@4183 383ad7c9-94d9-4d36-a494-682f7c89f535
parent 6f8ebc69
...@@ -49,7 +49,7 @@ void DataControlPlugin::slotContextMenuTarget( ) { ...@@ -49,7 +49,7 @@ void DataControlPlugin::slotContextMenuTarget( ) {
object->target( targetAction_->isChecked() ); object->target( targetAction_->isChecked() );
emit activeObjectChanged(); emit activeObjectChanged();
emit updated_objects(objectId); emit updatedObject(objectId);
} }
void DataControlPlugin::slotContextMenuHide( ) { void DataControlPlugin::slotContextMenuHide( ) {
...@@ -65,8 +65,8 @@ void DataControlPlugin::slotContextMenuHide( ) { ...@@ -65,8 +65,8 @@ void DataControlPlugin::slotContextMenuHide( ) {
object->hide(); object->hide();
emit update_view(); emit updateView();
emit updated_objects(objectId); emit updatedObject(objectId);
} }
...@@ -83,7 +83,7 @@ void DataControlPlugin::slotContextMenuSource( ) { ...@@ -83,7 +83,7 @@ void DataControlPlugin::slotContextMenuSource( ) {
object->source( sourceAction_->isChecked() ); object->source( sourceAction_->isChecked() );
emit updated_objects(objectId); emit updatedObject(objectId);
} }
void DataControlPlugin::slotUpdateContextMenu( int _objectId) { void DataControlPlugin::slotUpdateContextMenu( int _objectId) {
......
...@@ -214,7 +214,7 @@ void DataControlPlugin::update_active( ) { ...@@ -214,7 +214,7 @@ void DataControlPlugin::update_active( ) {
} }
} }
emit update_view(); emit updateView();
} }
void DataControlPlugin::slotKeyEvent( QKeyEvent* _event ) void DataControlPlugin::slotKeyEvent( QKeyEvent* _event )
...@@ -259,7 +259,7 @@ void DataControlPlugin::slotKeyEvent( QKeyEvent* _event ) ...@@ -259,7 +259,7 @@ void DataControlPlugin::slotKeyEvent( QKeyEvent* _event )
// for ( uint i = 0 ; i < data_->size() ; ++i ) { // for ( uint i = 0 ; i < data_->size() ; ++i ) {
// (*data_)[i]->source(false); // (*data_)[i]->source(false);
// } // }
// emit updated_objects(-1); // emit updatedObject(-1);
// return; // return;
// } // }
// //
...@@ -267,7 +267,7 @@ void DataControlPlugin::slotKeyEvent( QKeyEvent* _event ) ...@@ -267,7 +267,7 @@ void DataControlPlugin::slotKeyEvent( QKeyEvent* _event )
// for ( uint i = 0 ; i < data_->size() ; ++i ) { // for ( uint i = 0 ; i < data_->size() ; ++i ) {
// (*data_)[i]->target(false); // (*data_)[i]->target(false);
// } // }
// emit updated_objects(-1); // emit updatedObject(-1);
// return; // return;
// } // }
// //
...@@ -278,7 +278,7 @@ void DataControlPlugin::slotKeyEvent( QKeyEvent* _event ) ...@@ -278,7 +278,7 @@ void DataControlPlugin::slotKeyEvent( QKeyEvent* _event )
// for ( uint i = 0 ; i < data_->size() ; ++i ) { // for ( uint i = 0 ; i < data_->size() ; ++i ) {
// (*data_)[i]->source(true); // (*data_)[i]->source(true);
// } // }
// emit updated_objects(-1); // emit updatedObject(-1);
// return; // return;
// } // }
// //
...@@ -286,7 +286,7 @@ void DataControlPlugin::slotKeyEvent( QKeyEvent* _event ) ...@@ -286,7 +286,7 @@ void DataControlPlugin::slotKeyEvent( QKeyEvent* _event )
// for ( uint i = 0 ; i < data_->size() ; ++i ) { // for ( uint i = 0 ; i < data_->size() ; ++i ) {
// (*data_)[i]->target(true); // (*data_)[i]->target(true);
// } // }
// emit updated_objects(-1); // emit updatedObject(-1);
// return; // return;
// } // }
// //
...@@ -320,14 +320,14 @@ void DataControlPlugin::setAllTarget() { ...@@ -320,14 +320,14 @@ void DataControlPlugin::setAllTarget() {
o_it != PluginFunctions::objects_end(); ++o_it) o_it != PluginFunctions::objects_end(); ++o_it)
o_it->target(true); o_it->target(true);
emit activeObjectChanged(); emit activeObjectChanged();
emit updated_objects(-1); emit updatedObject(-1);
} }
void DataControlPlugin::setAllSource() { void DataControlPlugin::setAllSource() {
for ( PluginFunctions::ObjectIterator o_it(PluginFunctions::ALL_OBJECTS) ; for ( PluginFunctions::ObjectIterator o_it(PluginFunctions::ALL_OBJECTS) ;
o_it != PluginFunctions::objects_end(); ++o_it) o_it != PluginFunctions::objects_end(); ++o_it)
o_it->source(true); o_it->source(true);
emit updated_objects(-1); emit updatedObject(-1);
} }
void DataControlPlugin::clearAllTarget() { void DataControlPlugin::clearAllTarget() {
...@@ -335,28 +335,28 @@ void DataControlPlugin::clearAllTarget() { ...@@ -335,28 +335,28 @@ void DataControlPlugin::clearAllTarget() {
o_it != PluginFunctions::objects_end(); ++o_it) o_it != PluginFunctions::objects_end(); ++o_it)
o_it->target(false); o_it->target(false);
emit activeObjectChanged(); emit activeObjectChanged();
emit updated_objects(-1); emit updatedObject(-1);
} }
void DataControlPlugin::clearAllSource() { void DataControlPlugin::clearAllSource() {
for ( PluginFunctions::ObjectIterator o_it(PluginFunctions::ALL_OBJECTS) ; for ( PluginFunctions::ObjectIterator o_it(PluginFunctions::ALL_OBJECTS) ;
o_it != PluginFunctions::objects_end(); ++o_it) o_it != PluginFunctions::objects_end(); ++o_it)
o_it->source(false); o_it->source(false);
emit updated_objects(-1); emit updatedObject(-1);
} }
void DataControlPlugin::hideAll() { void DataControlPlugin::hideAll() {
for ( PluginFunctions::ObjectIterator o_it(PluginFunctions::ALL_OBJECTS) ; for ( PluginFunctions::ObjectIterator o_it(PluginFunctions::ALL_OBJECTS) ;
o_it != PluginFunctions::objects_end(); ++o_it) o_it != PluginFunctions::objects_end(); ++o_it)
o_it->hide(); o_it->hide();
emit update_view(); emit updateView();
} }
void DataControlPlugin::showAll() { void DataControlPlugin::showAll() {
for ( PluginFunctions::ObjectIterator o_it(PluginFunctions::ALL_OBJECTS) ; for ( PluginFunctions::ObjectIterator o_it(PluginFunctions::ALL_OBJECTS) ;
o_it != PluginFunctions::objects_end(); ++o_it) o_it != PluginFunctions::objects_end(); ++o_it)
o_it->show(); o_it->show();
emit update_view(); emit updateView();
} }
void DataControlPlugin::slotDataChanged ( const QModelIndex & topLeft, void DataControlPlugin::slotDataChanged ( const QModelIndex & topLeft,
...@@ -371,7 +371,7 @@ void DataControlPlugin::slotDataChanged ( const QModelIndex & topLeft, ...@@ -371,7 +371,7 @@ void DataControlPlugin::slotDataChanged ( const QModelIndex & topLeft,
// show/hide // show/hide
case 1: case 1:
emit update_view(); emit updateView();
break; break;
// source // source
...@@ -390,7 +390,7 @@ void DataControlPlugin::slotDataChanged ( const QModelIndex & topLeft, ...@@ -390,7 +390,7 @@ void DataControlPlugin::slotDataChanged ( const QModelIndex & topLeft,
void DataControlPlugin::slotRowsRemoved ( const QModelIndex & /*_parent*/, int /*_start*/, int /*_end*/ ) { void DataControlPlugin::slotRowsRemoved ( const QModelIndex & /*_parent*/, int /*_start*/, int /*_end*/ ) {
std::cerr << "Row removed! " << std::endl; std::cerr << "Row removed! " << std::endl;
emit update_view(); emit updateView();
} }
void DataControlPlugin::loadIniFileOptions( INIFile& _ini ) { void DataControlPlugin::loadIniFileOptions( INIFile& _ini ) {
...@@ -455,7 +455,7 @@ void DataControlPlugin::loadIniFileOptions( INIFile& _ini ) { ...@@ -455,7 +455,7 @@ void DataControlPlugin::loadIniFileOptions( INIFile& _ini ) {
} }
} }
emit updated_objects(-1); emit updatedObject(-1);
} }
void DataControlPlugin::saveIniFileOptions( INIFile& _ini ) { void DataControlPlugin::saveIniFileOptions( INIFile& _ini ) {
......
...@@ -72,10 +72,10 @@ class DataControlPlugin : public QObject, BaseInterface, ToolboxInterface, Globa ...@@ -72,10 +72,10 @@ class DataControlPlugin : public QObject, BaseInterface, ToolboxInterface, Globa
signals: signals:
/// Force Examiner widget to update their views /// Force Examiner widget to update their views
void update_view(); void updateView();
/// Emit this Signal, if object list has changed (e.g. Source or Target changed) /// Emit this Signal, if object list has changed (e.g. Source or Target changed)
void updated_objects(int); void updatedObject(int);
void activeObjectChanged(); void activeObjectChanged();
...@@ -110,7 +110,7 @@ class DataControlPlugin : public QObject, BaseInterface, ToolboxInterface, Globa ...@@ -110,7 +110,7 @@ class DataControlPlugin : public QObject, BaseInterface, ToolboxInterface, Globa
* Creates Table and buttons */ * Creates Table and buttons */
bool initializeToolbox(QWidget*& _widget); bool initializeToolbox(QWidget*& _widget);
/// Sets examiner Widget (dummy here, using update_view signal here) /// Sets examiner Widget (dummy here, using updateView signal here)
void set_examiner(ACG::QtWidgets::QtExaminerViewer* /* _examiner_widget */ ) { }; void set_examiner(ACG::QtWidgets::QtExaminerViewer* /* _examiner_widget */ ) { };
/// Name of the Plugin /// Name of the Plugin
......
...@@ -154,6 +154,6 @@ void DataControlPlugin::groupObjects(idList _objectIDs, QString _groupName) { ...@@ -154,6 +154,6 @@ void DataControlPlugin::groupObjects(idList _objectIDs, QString _groupName) {
groupItem->appendChild( objs[i] ); groupItem->appendChild( objs[i] );
} }
emit updated_objects(-1); emit updatedObject(-1);
} }
...@@ -87,8 +87,8 @@ void DataControlPlugin::slotPopupRemove ( ) { ...@@ -87,8 +87,8 @@ void DataControlPlugin::slotPopupRemove ( ) {
delete deleteItem; delete deleteItem;
} }
emit update_view(); emit updateView();
emit updated_objects(-1); emit updatedObject(-1);
} }
/// Slot for Ungroup action in ContextMenu /// Slot for Ungroup action in ContextMenu
...@@ -110,7 +110,7 @@ void DataControlPlugin::slotUngroup ( ) { ...@@ -110,7 +110,7 @@ void DataControlPlugin::slotUngroup ( ) {
delete group; delete group;
emit updated_objects(-1); emit updatedObject(-1);
} }
/// Slot for Copy action in ContextMenu /// Slot for Copy action in ContextMenu
...@@ -132,10 +132,10 @@ void DataControlPlugin::slotCopy ( ) { ...@@ -132,10 +132,10 @@ void DataControlPlugin::slotCopy ( ) {
continue; continue;
} }
emit updated_objects(copyItem->id()); emit updatedObject(copyItem->id());
} }
emit update_view(); emit updateView();
} }
/// Slot for Group action in ContextMenu /// Slot for Group action in ContextMenu
...@@ -172,7 +172,7 @@ void DataControlPlugin::slotGroup ( ) { ...@@ -172,7 +172,7 @@ void DataControlPlugin::slotGroup ( ) {
groupItem->appendChild(item); groupItem->appendChild(item);
} }
emit updated_objects(-1); emit updatedObject(-1);
} }
/// ContextMenu requested - creates the contextMenu /// ContextMenu requested - creates the contextMenu
...@@ -324,7 +324,7 @@ void DataControlPlugin::slotMaterialProperties(){ ...@@ -324,7 +324,7 @@ void DataControlPlugin::slotMaterialProperties(){
///Called when the material properties were changed inside the material dialog ///Called when the material properties were changed inside the material dialog
void DataControlPlugin::slotNodeChanged( ACG::SceneGraph::BaseNode* /*_node*/ ){ void DataControlPlugin::slotNodeChanged( ACG::SceneGraph::BaseNode* /*_node*/ ){
emit update_view(); emit updateView();
} }
void DataControlPlugin::slotZoomTo(){ void DataControlPlugin::slotZoomTo(){
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment