Commit 3a3f6f00 authored by Dirk Wilden's avatar Dirk Wilden
Browse files

moved deleteObject to LoadSaveInterface

git-svn-id: http://www.openflipper.org/svnrepo/OpenFlipper/branches/Free@5385 383ad7c9-94d9-4d36-a494-682f7c89f535
parent 14909f89
......@@ -303,7 +303,7 @@ void SelectionPlugin::surfaceLassoSelection(QMouseEvent* _event){
surfaceLassoSelection(m, pline->line(), fh, tbsp );
PluginFunctions::deleteObject(polyLineID_);
emit deleteObject(polyLineID_);
emit updatedObject(-1);
......
......@@ -280,7 +280,7 @@ void SelectionPlugin::slotObjectUpdated(int _id){
polyLineID_ = _id;
}else if (polyLineID_ != _id){
//the user added a second polyline so delete the first
PluginFunctions::deleteObject(polyLineID_);
emit deleteObject(polyLineID_);
polyLineID_ = _id;
}
if (pline->line()->is_closed()){
......@@ -478,7 +478,7 @@ void SelectionPlugin::slotPickModeChanged( const std::string& _mode) {
if (waitingForPolyLineSelection_)
if (_mode != "" && _mode != "PolyLine" && _mode != SURFACE_LASSO_SELECTION ){
waitingForPolyLineSelection_ = false;
PluginFunctions::deleteObject(polyLineID_);
emit deleteObject(polyLineID_);
polyLineID_ = -1;
}
#endif
......
......@@ -45,6 +45,7 @@
#include <OpenFlipper/BasePlugin/PickingInterface.hh>
#include <OpenFlipper/BasePlugin/ToolboxInterface.hh>
#include <OpenFlipper/BasePlugin/ToolbarInterface.hh>
#include <OpenFlipper/BasePlugin/LoadSaveInterface.hh>
#include <OpenFlipper/BasePlugin/BackupInterface.hh>
#include <OpenFlipper/BasePlugin/INIInterface.hh>
#include <OpenFlipper/BasePlugin/ScriptInterface.hh>
......@@ -87,7 +88,7 @@ enum SelectionPrimitive {
OBJECT = 0x08
};
class SelectionPlugin : public QObject, BaseInterface , MouseInterface, KeyInterface, PickingInterface, ToolboxInterface, INIInterface, BackupInterface, LoggingInterface, ScriptInterface, ContextMenuInterface, ToolbarInterface
class SelectionPlugin : public QObject, BaseInterface , MouseInterface, KeyInterface, PickingInterface, ToolboxInterface, INIInterface, BackupInterface, LoggingInterface, ScriptInterface, ContextMenuInterface, ToolbarInterface, LoadSaveInterface
{
Q_OBJECT
Q_INTERFACES(BaseInterface)
......@@ -101,6 +102,7 @@ class SelectionPlugin : public QObject, BaseInterface , MouseInterface, KeyInter
Q_INTERFACES(ScriptInterface)
Q_INTERFACES(ContextMenuInterface)
Q_INTERFACES(ToolbarInterface)
Q_INTERFACES(LoadSaveInterface)
signals:
//BaseInterface
......@@ -129,6 +131,9 @@ class SelectionPlugin : public QObject, BaseInterface , MouseInterface, KeyInter
void addToolbar(QToolBar* _toolbar);
void getToolBar(QString _name, QToolBar*& _toolbar);
//LoadSaveInterface
void deleteObject( int _id );
private slots:
//MouseInterface
void slotMouseWheelEvent(QWheelEvent * _event, const std::string & _mode);
......
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