Rename EIImageService class -> INSAimageService

app/Services/INSAimageService.cpp

@@ -24,12 +24,12 @@
 using namespace genericinterface;
 using namespace std;
 
-EIImageService::EIImageService(GenericInterface* gi) : WindowService(Qt::LeftDockWidgetArea) {
+INSAimageService::INSAimageService(GenericInterface* gi) : WindowService(Qt::LeftDockWidgetArea) {
     _gi = gi;
     _operationBar = new OperationBar();
 }
 
-void EIImageService::display(GenericInterface* gi)
+void INSAimageService::display(GenericInterface* gi)
 {
     WindowService::display(gi);
 //    QDockWidget* _operationDock = new QDockWidget(tr("Operations"), gi);
@@ -49,12 +49,12 @@ void EIImageService::display(GenericInterface* gi)
     _statusEdit->hide();
 }
 
-void EIImageService::connect(GenericInterface* gi)
+void INSAimageService::connect(GenericInterface* gi)
 {
     WindowService::connect(gi);
 }
 
-void EIImageService::addOpSet(OpSet* opSet) {
+void INSAimageService::addOpSet(OpSet* opSet) {
     for(vector<OpSetService*>::iterator it = _opSetServices.begin(); it != _opSetServices.end(); ++it) {
         if((*it)->getOpSet() == opSet) {
             return;
@@ -69,7 +69,7 @@ void EIImageService::addOpSet(OpSet* opSet) {
     }
 }
 
-void EIImageService::removeOpSet(OpSet* opSet) {
+void INSAimageService::removeOpSet(OpSet* opSet) {
     for(vector<OpSetService*>::iterator it = _opSetServices.begin(); it != _opSetServices.end(); ++it) {
         if((*it)->getOpSet() == opSet) {
             _gi->removeService(*it);
@@ -79,14 +79,14 @@ void EIImageService::removeOpSet(OpSet* opSet) {
     }
 }
 
-void EIImageService::outputText(QString text) {
+void INSAimageService::outputText(QString text) {
     _statusEdit->append(text);
     _statusEdit->show();
     if(_statusEdit->minimumHeight() < 92) _statusEdit->setMinimumHeight(_statusEdit->minimumHeight()+24);
 //    _statusEdit->setMinimumHeight(32);
 }
 
-void EIImageService::addText(std::string s) {
+void INSAimageService::addText(std::string s) {
     _statusEdit->append(QString::fromStdString(s));
     _statusEdit->show();
     if(_statusEdit->minimumHeight() < 92) _statusEdit->setMinimumHeight(_statusEdit->minimumHeight()+24);

app/Services/INSAimageService.h

@@ -30,11 +30,11 @@
 #include "../Widgets/OperationBar.h"
 #include "Services/WindowService.h"
 
-class EIImageService : public genericinterface::WindowService
+class INSAimageService : public genericinterface::WindowService
 {
   Q_OBJECT
   public:
-    EIImageService(genericinterface::GenericInterface* gi); 
+    INSAimageService(genericinterface::GenericInterface* gi);
     void display(genericinterface::GenericInterface* gi);
     void connect(genericinterface::GenericInterface* gi);
 

app/Services/OperationService.cpp

@@ -78,7 +78,7 @@ void OperationService::operation() {
         wndList.insert(pair<const ImageWindow*, string>(*it, (*it)->windowTitle().toStdString()));
     }
 
-    _operation->operator()(dynamic_cast<EIImageService*>(ws));
+    _operation->operator()(dynamic_cast<INSAimageService*>(ws));
     
 //    for(vector<QWidget*>::iterator it = result.begin(); it < result.end(); ++it) {
 //        QWidget* widget = *it;

app/main.cpp

@@ -111,14 +111,12 @@ int main(int argc, char** argv)
     GenericInterface gi("eiimage", Qt::LeftDockWidgetArea);
 
     PluginManager* pluginManager = new PluginManager(&gi);
-    EIImageService* eiimageService = new EIImageService(&gi);
+    INSAimageService* insaimageService = new INSAimageService(&gi);
 
-    //  gi.addService(eiimageService);
-    gi.changeService(GenericInterface::WINDOW_SERVICE, eiimageService);
-    //  gi.addService(GenericInterface::WINDOW_SERVICE, eiimageService);
+    gi.changeService(GenericInterface::WINDOW_SERVICE, insaimageService);
 
-    QObject::connect(pluginManager, SIGNAL(addPlugin(OpSet*)), eiimageService, SLOT(addOpSet(OpSet*)));
-    QObject::connect(pluginManager, SIGNAL(removePlugin(OpSet*)), eiimageService, SLOT(removeOpSet(OpSet*)));
+    QObject::connect(pluginManager, SIGNAL(addPlugin(OpSet*)), insaimageService, SLOT(addOpSet(OpSet*)));
+    QObject::connect(pluginManager, SIGNAL(removePlugin(OpSet*)), insaimageService, SLOT(removeOpSet(OpSet*)));
 
     BuiltinOpSet* image = new BuiltinOpSet(qApp->translate("", "&Image").toStdString());
     image->addOperation(new PointOp());
@@ -175,15 +173,15 @@ int main(int argc, char** argv)
     BuiltinOpSet* filter = new BuiltinOpSet(qApp->translate("", "Filtering").toStdString());
     filter->addOperation(new BFlitOp());
 
-    eiimageService->addOpSet(image);
-    eiimageService->addOpSet(encode);
-    eiimageService->addOpSet(morpho);
-    eiimageService->addOpSet(analyse);
-    eiimageService->addOpSet(transfo);
+    insaimageService->addOpSet(image);
+    insaimageService->addOpSet(encode);
+    insaimageService->addOpSet(morpho);
+    insaimageService->addOpSet(analyse);
+    insaimageService->addOpSet(transfo);
     gi.addService(new MorphoMatService);
     gi.addService(new filtrme::FilteringService);
-    eiimageService->addOpSet(filter);
-    eiimageService->addOpSet(tools);
+    insaimageService->addOpSet(filter);
+    insaimageService->addOpSet(tools);
 
     gi.addService(pluginManager);
 

core/Operation.cpp

@@ -28,7 +28,7 @@ using namespace genericinterface;
 #include "Services/WindowService.h"
 #include "Services/Node.h"
 
-class EIImageService : public genericinterface::WindowService
+class INSAimageService : public genericinterface::WindowService
 {
     public:
     void outputText(QString text);