Changeset 558

Timestamp:

Feb 9, 2015, 3:36:46 PM (10 years ago)

Author:

djay

Message:

Add OTB Application Observer.

Location:

trunk/zoo-project

Files:

• HISTORY.txt (modified) (1 diff)
• LICENSE (modified) (2 diffs)
• zoo-kernel/otbZooWatcher.cxx (added)
• zoo-kernel/otbZooWatcher.h (added)
• zoo-kernel/service_internal_otb.c (modified) (8 diffs)
• zoo-kernel/service_internal_otb.h (modified) (2 diffs)

trunk/zoo-project/HISTORY.txt

@@ -2 +2 @@
   * Add Orfeo Toolbox support for applications as a service
   * Add the otb2zcfg utility to produce zcfg for otb applications
+  * Add OTB Application Observer to have progress status updates
   * Fix maxOccurs handling
   * Fix gesture of downloaded inputs when multiple values are given

trunk/zoo-project/LICENSE

@@ -9 +9 @@
 ------------------
 
-Copyright (c) 2009-2013 GeoLabs SARL
+Copyright (c) 2009-2015 GeoLabs SARL
 Copyright 2010-2011 Fondazione Edmund Mach. All rights reserved.
 
@@ -29 +29 @@
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
+
+ZOO-Kernel OTB Support
+----------------------
+
+Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+See OTBCopyright.txt for details.
+
+Some parts of this code are derived from ITK. See ITKCopyright.txt
+for details.
+
+ This software is distributed WITHOUT ANY WARRANTY; without even
+ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ PURPOSE.  See the above copyright notices for more information.
+
+See Ref: http://hg.orfeo-toolbox.org/OTB/ Copyright
 
 ZOO-API License

trunk/zoo-project/zoo-kernel/service_internal_otb.c

@@ -21 +21 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
+ *
+ * See Ref: http://hg.orfeo-toolbox.org/OTB/ Copyright
+ * Some parts of this code are derived from ITK. See ITKCopyright.txt for 
+ * details.
  */
 
 #include "service_internal_otb.h"
-#include <vector>
-#include <string>
 
 using namespace otb::Wrapper;
+
+class MyCommand : public itk::Command
+{
+ public:
+  itkNewMacro( MyCommand );
+ public:
+
+  void Execute(itk::Object *caller, const itk::EventObject & event)
+  {
+    Execute( (const itk::Object *)caller, event);
+  }
+ 
+  void Execute(const itk::Object * object, const itk::EventObject & event)
+  {
+    const AddProcessToWatchEvent* eventToWatch = dynamic_cast< const AddProcessToWatchEvent*> ( &event );
+    std::string m_CurrentDescription = eventToWatch->GetProcessDescription();
+    std::cerr << "err_service_zooo start ccalled." << m_CurrentDescription << std::endl;
+    ZooWatcher * watch = new ZooWatcher(eventToWatch->GetProcess(),
+                                        eventToWatch->GetProcessDescription());
+    watch->SetConf(&m_Conf);
+    m_WatcherList.push_back(watch);
+  }
+
+
+
+};
+
 
 std::string ReplaceAll(std::string str, const std::string& from, const std::string& to) {
@@ -42 +71 @@
   maps* inputs=*real_inputs;
   maps* outputs=*real_outputs;
+  map* tmp0=getMapFromMaps(*main_conf,"lenv","cwd");
+  char *ntmp=tmp0->value;
   map* tmp=NULL;
   int res=-1;
@@ -68 +99 @@
           res=-1;
         }else{
+          // Create Observer on AddProcessToWatchEvent
+          m_Conf=m;
+          MyCommand::Pointer myCommand = MyCommand::New();
+          m_Application->AddObserver(AddProcessToWatchEvent(), myCommand);
           char tmpS[1024];
-          sprintf(tmpS, "The OTB Application %s was loaded correctly.", (*it).c_str());
           const std::vector<std::string> appKeyList = m_Application->GetParametersKeys(true);
           for (unsigned int i = 0; i < appKeyList.size(); i++){
@@ -80 +114 @@
               if(test==NULL){
                 test=getMapFromMaps(inputs,paramKey.c_str(),"inRequest");
+                map* tmpPath=getMapFromMaps(m,"main","tmpPath");
+                map* tmpSid=getMapFromMaps(m,"lenv","usid");
+                char tmp[1024];
+                map* tmpVal=getMapFromMaps(outputs,paramKey.c_str(),"mimeType");
                 if(test!=NULL && test->value!=NULL && strncasecmp(test->value,"true",4)==0){
                   test=getMapFromMaps(inputs,paramKey.c_str(),"value");
@@ -96 +134 @@
                     else if (strncasecmp(test->value,"double",6)==0)
                       outPixType = ImagePixelType_double;
-                    map* tmpPath=getMapFromMaps(m,"main","tmpPath");
-                    map* tmpSid=getMapFromMaps(m,"lenv","sid");
-                    char tmp[1024];
-                    map* tmpVal=getMapFromMaps(outputs,paramKey.c_str(),"mimeType");
                     char* ext="tiff";
                     if(tmpVal!=NULL){
@@ -122 +156 @@
                 }else{
                   if(type == ParameterType_OutputVectorData){
-                      map* tmpPath=getMapFromMaps(m,"main","tmpPath");
-                      map* tmpSid=getMapFromMaps(m,"lenv","sid");
-                      char tmp[1024];
-                      map* tmpVal=getMapFromMaps(outputs,paramKey.c_str(),"mimeType");
                       char* ext="json";
                       if(tmpVal!=NULL){
@@ -146 +176 @@
                   else
                     if(type == ParameterType_OutputFilename){
-                      map* tmpPath=getMapFromMaps(m,"main","tmpPath");
-                      map* tmpSid=getMapFromMaps(m,"lenv","sid");
-                      char tmp[1024];
-                      map* tmpVal=getMapFromMaps(outputs,paramKey.c_str(),"mimeType");
                       char* ext="txt";
                       if(tmpVal!=NULL){
@@ -355 +381 @@
     }
   }
+
+  for (unsigned int i = 0; i < m_WatcherList.size(); i++){
+    m_WatcherList[i]->FreeConf();
+    delete m_WatcherList[i];
+    m_WatcherList[i] = NULL;
+  }
+  m_WatcherList.clear();
+
   return res;
 }

trunk/zoo-project/zoo-kernel/service_internal_otb.h

@@ -31 +31 @@
 #include "otbWrapperApplicationRegistry.h"
 #include "otbWrapperInputImageListParameter.h"
+#include "otbWrapperAddProcessToWatchEvent.h"
+#include "otbZooWatcher.h"
 #include "service_internal.h"
 #include "service.h"
@@ -38 +40 @@
 #include <direct.h>
 #endif
+#include <vector>
+#include <string>
 
+typedef std::vector<ZooWatcher *> WatcherListType;
+WatcherListType m_WatcherList;
+maps* m_Conf;
 int zoo_otb_support(maps**,map*,service*,maps**,maps**);