suzanne.soy/FreeCAD
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

+ rename signal to signalRelabelObject and remove unused code

Browse Source
This commit is contained in:
wmayer 2015-09-22 17:13:03 +02:00
parent a8507628fa
commit b33be62bb6
12 changed files with 24 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/App/Application.cpp
View File

@ -315,7 +315,7 @@ Document* Application::newDocument(const char * Name, const char * UserName)
_pActiveDoc->signalNewObject.connect(boost::bind(&App::Application::slotNewObject, this, _1));
_pActiveDoc->signalDeletedObject.connect(boost::bind(&App::Application::slotDeletedObject, this, _1));
_pActiveDoc->signalChangedObject.connect(boost::bind(&App::Application::slotChangedObject, this, _1, _2));
_pActiveDoc->signalRenamedObject.connect(boost::bind(&App::Application::slotRenamedObject, this, _1));
_pActiveDoc->signalRelabelObject.connect(boost::bind(&App::Application::slotRelabelObject, this, _1));
_pActiveDoc->signalActivatedObject.connect(boost::bind(&App::Application::slotActivatedObject, this, _1));
_pActiveDoc->signalUndo.connect(boost::bind(&App::Application::slotUndoDocument, this, _1));
_pActiveDoc->signalRedo.connect(boost::bind(&App::Application::slotRedoDocument, this, _1));
@ -859,9 +859,9 @@ void Application::slotChangedObject(const App::DocumentObject&O, const App::Prop
this->signalChangedObject(O,P);
}
void Application::slotRenamedObject(const App::DocumentObject&O)
void Application::slotRelabelObject(const App::DocumentObject&O)
{
this->signalRenamedObject(O);
this->signalRelabelObject(O);
}
void Application::slotActivatedObject(const App::DocumentObject&O)

6
src/App/Application.h
View File

@ -135,8 +135,8 @@ public:
boost::signal<void (const App::DocumentObject&)> signalDeletedObject;
/// signal on changed Object
boost::signal<void (const App::DocumentObject&, const App::Property&)> signalChangedObject;
/// signal on renamed Object
boost::signal<void (const App::DocumentObject&)> signalRenamedObject;
/// signal on relabeled Object
boost::signal<void (const App::DocumentObject&)> signalRelabelObject;
/// signal on activated Object
boost::signal<void (const App::DocumentObject&)> signalActivatedObject;
//@}
@ -251,7 +251,7 @@ protected:
void slotNewObject(const App::DocumentObject&);
void slotDeletedObject(const App::DocumentObject&);
void slotChangedObject(const App::DocumentObject&, const App::Property& Prop);
void slotRenamedObject(const App::DocumentObject&);
void slotRelabelObject(const App::DocumentObject&);
void slotActivatedObject(const App::DocumentObject&);
void slotUndoDocument(const App::Document&);
void slotRedoDocument(const App::Document&);

4
src/App/Document.h
View File

@ -106,8 +106,8 @@ public:
boost::signal<void (const App::DocumentObject&)> signalDeletedObject;
/// signal on changed Object
boost::signal<void (const App::DocumentObject&, const App::Property&)> signalChangedObject;
/// signal on renamed Object
boost::signal<void (const App::DocumentObject&)> signalRenamedObject;
/// signal on relabeled Object
boost::signal<void (const App::DocumentObject&)> signalRelabelObject;
/// signal on activated Object
boost::signal<void (const App::DocumentObject&)> signalActivatedObject;
/// signal on undo

4
src/App/DocumentObject.cpp
View File

@ -207,7 +207,7 @@ void DocumentObject::onChanged(const Property* prop)
_pDoc->onChangedProperty(this,prop);
if (prop == &Label && _pDoc)
_pDoc->signalRenamedObject(*this);
_pDoc->signalRelabelObject(*this);
if (prop->getType() & Prop_Output)
return;
@ -303,7 +303,7 @@ void DocumentObject::connectRelabelSignals()
// Not already connected?
if (!onRelabledObjectConnection.connected())
onRelabledObjectConnection = getDocument()->signalRenamedObject.connect(boost::bind(&PropertyExpressionEngine::slotObjectRenamed, &ExpressionEngine, _1));
onRelabledObjectConnection = getDocument()->signalRelabelObject.connect(boost::bind(&PropertyExpressionEngine::slotObjectRenamed, &ExpressionEngine, _1));
try {
// Crude method to resolve all expression dependencies

6
src/Gui/Application.cpp
View File

@ -650,7 +650,7 @@ void Application::slotNewDocument(const App::Document& Doc)
pDoc->signalNewObject.connect(boost::bind(&Gui::Application::slotNewObject, this, _1));
pDoc->signalDeletedObject.connect(boost::bind(&Gui::Application::slotDeletedObject, this, _1));
pDoc->signalChangedObject.connect(boost::bind(&Gui::Application::slotChangedObject, this, _1, _2));
pDoc->signalRenamedObject.connect(boost::bind(&Gui::Application::slotRenamedObject, this, _1));
pDoc->signalRelabelObject.connect(boost::bind(&Gui::Application::slotRelabelObject, this, _1));
pDoc->signalActivatedObject.connect(boost::bind(&Gui::Application::slotActivatedObject, this, _1));
@ -725,9 +725,9 @@ void Application::slotChangedObject(const ViewProvider& vp, const App::Property&
this->signalChangedObject(vp,prop);
}
void Application::slotRenamedObject(const ViewProvider& vp)
void Application::slotRelabelObject(const ViewProvider& vp)
{
this->signalRenamedObject(vp);
this->signalRelabelObject(vp);
}
void Application::slotActivatedObject(const ViewProvider& vp)

4
src/Gui/Application.h
View File

@ -104,7 +104,7 @@ public:
/// signal on changed object property
boost::signal<void (const Gui::ViewProvider&, const App::Property&)> signalChangedObject;
/// signal on renamed Object
boost::signal<void (const Gui::ViewProvider&)> signalRenamedObject;
boost::signal<void (const Gui::ViewProvider&)> signalRelabelObject;
/// signal on activated Object
boost::signal<void (const Gui::ViewProvider&)> signalActivatedObject;
/// signal on activated workbench
@ -129,7 +129,7 @@ protected:
void slotNewObject(const ViewProvider&);
void slotDeletedObject(const ViewProvider&);
void slotChangedObject(const ViewProvider&, const App::Property& Prop);
void slotRenamedObject(const ViewProvider&);
void slotRelabelObject(const ViewProvider&);
void slotActivatedObject(const ViewProvider&);
public:

8
src/Gui/Document.cpp
View File

@ -127,8 +127,8 @@ Document::Document(App::Document* pcDocument,Application * app)
(boost::bind(&Gui::Document::slotDeletedObject, this, _1));
d->connectCngObject = pcDocument->signalChangedObject.connect
(boost::bind(&Gui::Document::slotChangedObject, this, _1, _2));
d->connectRenObject = pcDocument->signalRenamedObject.connect
(boost::bind(&Gui::Document::slotRenamedObject, this, _1));
d->connectRenObject = pcDocument->signalRelabelObject.connect
(boost::bind(&Gui::Document::slotRelabelObject, this, _1));
d->connectActObject = pcDocument->signalActivatedObject.connect
(boost::bind(&Gui::Document::slotActivatedObject, this, _1));
d->connectSaveDocument = pcDocument->signalSaveDocument.connect
@ -529,11 +529,11 @@ void Document::slotChangedObject(const App::DocumentObject& Obj, const App::Prop
setModified(true);
}
void Document::slotRenamedObject(const App::DocumentObject& Obj)
void Document::slotRelabelObject(const App::DocumentObject& Obj)
{
ViewProvider* viewProvider = getViewProvider(&Obj);
if (viewProvider && viewProvider->isDerivedFrom(ViewProviderDocumentObject::getClassTypeId())) {
signalRenamedObject(*(static_cast<ViewProviderDocumentObject*>(viewProvider)));
signalRelabelObject(*(static_cast<ViewProviderDocumentObject*>(viewProvider)));
}
}

4
src/Gui/Document.h
View File

@ -73,7 +73,7 @@ protected:
void slotNewObject(const App::DocumentObject&);
void slotDeletedObject(const App::DocumentObject&);
void slotChangedObject(const App::DocumentObject&, const App::Property&);
void slotRenamedObject(const App::DocumentObject&);
void slotRelabelObject(const App::DocumentObject&);
void slotActivatedObject(const App::DocumentObject&);
void slotStartRestoreDocument(const App::Document&);
void slotFinishRestoreDocument(const App::Document&);
@ -93,7 +93,7 @@ public:
mutable boost::signal<void (const Gui::ViewProviderDocumentObject&,
const App::Property&)> signalChangedObject;
/// signal on renamed Object
mutable boost::signal<void (const Gui::ViewProviderDocumentObject&)> signalRenamedObject;
mutable boost::signal<void (const Gui::ViewProviderDocumentObject&)> signalRelabelObject;
/// signal on activated Object
mutable boost::signal<void (const Gui::ViewProviderDocumentObject&)> signalActivatedObject;
/// signal on entering in edit mode

2
src/Gui/DocumentModel.cpp
View File

@ -377,7 +377,7 @@ void DocumentModel::slotNewDocument(const Gui::Document& Doc)
Doc.signalNewObject.connect(boost::bind(&DocumentModel::slotNewObject, this, _1));
Doc.signalDeletedObject.connect(boost::bind(&DocumentModel::slotDeleteObject, this, _1));
Doc.signalChangedObject.connect(boost::bind(&DocumentModel::slotChangeObject, this, _1, _2));
Doc.signalRenamedObject.connect(boost::bind(&DocumentModel::slotRenameObject, this, _1));
Doc.signalRelabelObject.connect(boost::bind(&DocumentModel::slotRenameObject, this, _1));
Doc.signalActivatedObject.connect(boost::bind(&DocumentModel::slotActiveObject, this, _1));
Doc.signalInEdit.connect(boost::bind(&DocumentModel::slotInEdit, this, _1));
Doc.signalResetEdit.connect(boost::bind(&DocumentModel::slotResetEdit, this, _1));

12
src/Gui/Selection.cpp
View File

@ -923,17 +923,6 @@ void SelectionSingleton::slotDeletedObject(const App::DocumentObject& Obj)
Selection().rmvSelection( Obj.getDocument()->getName(), Obj.getNameInDocument() );
}
void SelectionSingleton::slotRenamedObject(const App::DocumentObject& Obj)
{
// compare internals with the document and change them if needed
App::Document* pDoc = Obj.getDocument();
for (std::list<_SelObj>::iterator it = _SelList.begin(); it != _SelList.end(); ++it) {
if (it->pDoc == pDoc) {
it->DocName = pDoc->getName();
}
}
}
//**************************************************************************
// Construction/Destruction
@ -946,7 +935,6 @@ SelectionSingleton::SelectionSingleton()
{
ActiveGate = 0;
App::GetApplication().signalDeletedObject.connect(boost::bind(&Gui::SelectionSingleton::slotDeletedObject, this, _1));
App::GetApplication().signalRenamedObject.connect(boost::bind(&Gui::SelectionSingleton::slotRenamedObject, this, _1));
CurrentPreselection.pDocName = 0;
CurrentPreselection.pObjectName = 0;
CurrentPreselection.pSubName = 0;

1
src/Gui/Selection.h
View File

@ -325,7 +325,6 @@ protected:
virtual ~SelectionSingleton();
/// Observer message from the App doc
void slotRenamedObject(const App::DocumentObject&);
void slotDeletedObject(const App::DocumentObject&);
/// helper to retrieve document by name

15
src/Gui/Tree.cpp
View File

@ -838,7 +838,7 @@ DocumentItem::DocumentItem(const Gui::Document* doc, QTreeWidgetItem * parent)
connectNewObject = doc->signalNewObject.connect(boost::bind(&DocumentItem::slotNewObject, this, _1));
connectDelObject = doc->signalDeletedObject.connect(boost::bind(&DocumentItem::slotDeleteObject, this, _1));
connectChgObject = doc->signalChangedObject.connect(boost::bind(&DocumentItem::slotChangeObject, this, _1));
connectRenObject = doc->signalRenamedObject.connect(boost::bind(&DocumentItem::slotRenameObject, this, _1));
connectRenObject = doc->signalRelabelObject.connect(boost::bind(&DocumentItem::slotRenameObject, this, _1));
connectActObject = doc->signalActivatedObject.connect(boost::bind(&DocumentItem::slotActiveObject, this, _1));
connectEdtObject = doc->signalInEdit.connect(boost::bind(&DocumentItem::slotInEdit, this, _1));
connectResObject = doc->signalResetEdit.connect(boost::bind(&DocumentItem::slotResetEdit, this, _1));
@ -995,18 +995,7 @@ void DocumentItem::slotChangeObject(const Gui::ViewProviderDocumentObject& view)
void DocumentItem::slotRenameObject(const Gui::ViewProviderDocumentObject& obj)
{
for (std::map<std::string,DocumentObjectItem*>::iterator it = ObjectMap.begin(); it != ObjectMap.end(); ++it) {
if (it->second->object() == &obj) {
DocumentObjectItem* item = it->second;
ObjectMap.erase(it);
std::string objectName = obj.getObject()->getNameInDocument();
ObjectMap[objectName] = item;
return;
}
}
// no such object found
Base::Console().Warning("DocumentItem::slotRenamedObject: Cannot rename unknown object.\n");
// Do nothing here because the Label is set in slotChangeObject
}
void DocumentItem::slotActiveObject(const Gui::ViewProviderDocumentObject& obj)