Validate is now linear

[creaImageIO.git] / src2 / creaImageIOGimmickView.cpp

diff --git a/src2/creaImageIOGimmickView.cpp b/src2/creaImageIOGimmickView.cpp
index a1c29cea8c6fc223e86d69bb716c5b9f70a2cc1a..0a2b8e1800b944ea7685a10072d02e9bba22aae9 100644 (file)
--- a/src2/creaImageIOGimmickView.cpp
+++ b/src2/creaImageIOGimmickView.cpp
@@ -7,6 +7,7 @@ namespace fs = boost::filesystem;
 
 namespace creaImageIO
 {
+
   //======================================================================
   // CTor
   GimmickView::GimmickView(Gimmick* gimmick, int threads)
@@ -15,8 +16,9 @@ namespace creaImageIO
   {
     GimmickDebugMessage(1,"GimmickView::GimmickView"
                        <<std::endl);
-       // Start the threads ...
-    mReader.Start();
+       // Anciently started the threads ...
+    // Threads now automatically start at first image request
+    //mReader.Start();
 
   }
   //======================================================================
@@ -36,6 +38,10 @@ namespace creaImageIO
   /// 
   void GimmickView::Initialize()
   {
+         row="";
+         col="";
+         plane="";
+         selectionSize=0;
   }
   //======================================================================
   
@@ -77,43 +83,47 @@ namespace creaImageIO
     i->second->UpdateLevel(l);    
   }
   //======================================================================
+  /// Clears the status and begins a new selection process
+  void GimmickView::ClearStatus()
+  {
+         row="";
+         col="";
+         plane="";
+         selectionSize=0;
+         valid=true;
+  }
+  //======================================================================
   ///Validates the dimension compliance of the images with the maximum and 
   ///minimum given, and between their sizes
-  bool GimmickView::ValidateSelected (std::vector<tree::Node*>& sel, int min_dim, int max_dim)
+  bool GimmickView::ValidateSelected (tree::Node* sel, int min_dim, int max_dim)
   {
        GimmickMessage(2,"Validating selected"<<std::endl);
-       bool valid=true;
+       selectionSize++;
+         /*// EED validate all
+         mValidationSignal(valid);
+         return valid;*/
+         
        int level;
        std::string mMessage;
-       if(sel.size()>0)
+       
+       if(row.compare("")==0 || col.compare("")==0)
        {
-               std::vector<tree::Node*>::iterator i;
-               std::string row;
-               std::string col;
-               std::string plane;
-               
-               //Validation between image sizes
-               for (i=sel.begin(); i!=sel.end() && valid; ++i)
-               {
-                       if(i==sel.begin())
-                       {
-                               row=(*i)->GetAttribute("D0028_0010");
-                               col=(*i)->GetAttribute("D0028_0011");
-                               plane=(*i)->GetAttribute("D0028_0012");
-                               level=(*i)->GetLevel();
-                               
-                       }
-                       else
+               row=(*sel).GetAttribute("D0028_0010");
+               col=(*sel).GetAttribute("D0028_0011");
+               plane=(*sel).GetAttribute("D0028_0012");
+               level=(*sel).GetLevel();
+       }
+       else
+       {
+               if(((*sel).GetAttribute("D0028_0010"))!=row ||
+                       ((*sel).GetAttribute("D0028_0011"))!=col ||
+                       ((*sel).GetAttribute("D0028_0012"))!=plane)
                        {
-                               if(((*i)->GetAttribute("D0028_0010"))!=row ||
-                                       ((*i)->GetAttribute("D0028_0011"))!=col ||
-                                       ((*i)->GetAttribute("D0028_0012"))!=plane)
-                                       {
-                                               mMessage="The selected images are not compatible.";
-                                               valid=false;
-                                       }
+                               mMessage="The selected images are not compatible.";
+                               valid=false;
                        }
-               }
+       }
+               
 
                //Dimention validation
                //Compatibility with maximum and minimum
@@ -160,27 +170,29 @@ namespace creaImageIO
                                        
                                        valid= false;
                                }
-                               if ( dim < min_dim && sel.size()<2 )
+                               if ( dim < min_dim )
                                {
-                                       GimmickDebugMessage(2, "State Check: Dim: "
+                                       GimmickMessage(1, "State Check: Dim: "
                                                <<dim
                                                <<" Dim min:"
                                                <<min_dim
                                                <<std::endl);
                                        mMessage="Cannot build the selection as it would result in a ";
-                                       mMessage+=dim;
+                                       std::string a;
+                                       std::stringstream out;
+                                       out<<dim;
+                                       a=out.str();
+                                       mMessage+=a;
                                        mMessage+="D image, and the minimum is ";
-                                       mMessage+=min_dim;
+                                       out<<min_dim;
+                                       a=out.str();
+                                       mMessage+=a;
                                        mMessage+="D!";
                                        valid= false;
                                }
                        }
-         }
-       else
-       {
-               mMessage="Cannot have 0 images selected";
-               valid=false;
-       }
+       
+       
        if(valid)
        {
                mMessage="Selection OK !";
@@ -274,9 +286,10 @@ namespace creaImageIO
   //======================================================================
   ///Requests the reading of an image
   void GimmickView::RequestReading(tree::Node* n, 
-                                  int prio, int selection_index)
+                                  int prio, int selection_index, ImagePointerHolder *p)
   {
-    ImageEventType t(n,0,selection_index);
+       mReader.Start();
+    ImageEventType t(n,selection_index, p);
     mImageEventMap[n->GetAttribute("FullFileName")] = t;    
     mReader.Request(this,n->GetAttribute("FullFileName"),prio);
   }
@@ -294,23 +307,25 @@ namespace creaImageIO
        {
     if (filename.size()==0)
       {
-       GimmickDebugMessage(5,
-                           "Pushing unknown image in queue"
-                           <<std::endl);
-       mImageEventQueue.push_back(ImageEventType(image));
-       return;
+                 //What to do in this case?
+                 /*
+               GimmickDebugMessage(5,
+                                       "Pushing unknown image in queue"
+                                       <<std::endl);
+               mImageEventQueue.push_back(ImageEventType(image));*/
+               return;
       }
     ImageEventTypeMap::iterator i;
     i = mImageEventMap.find(filename);
     if (i!=mImageEventMap.end())
       {
-       GimmickDebugMessage(5,
-                           "Pushing image of file '"<<filename<<"' in queue"
-                           <<std::endl);
-       ImageEventType e(i->second);
-       e.image = image;
-       mImageEventQueue.push_back(e);
-       mImageEventMap.erase(i);
+               GimmickDebugMessage(5,
+                                       "Putting image of file '"<<filename<<"' on pointer"
+                                       <<std::endl);
+               ImageEventType ie(i->second);
+               ie.image = image;
+               ie.pointerHolder->Set(ie.image);
+               //mImageEventMap.erase(i);
       }
        }
        else if (e==Error)
@@ -319,6 +334,15 @@ namespace creaImageIO
                mess+=filename;
                mess+="\n";
                GimmickMessage(1,mess);
+               ImageEventTypeMap::iterator i;
+               i = mImageEventMap.find(filename);
+               if (i!=mImageEventMap.end())
+               {
+               ImageEventType ie(i->second);
+               ie.image = image;
+               ie.pointerHolder->Set(GetDefaultImage());
+               //mImageEventMap.erase(i);
+               }
        }
 
        else if (e==ImageUnloaded)
@@ -327,6 +351,16 @@ namespace creaImageIO
                mess+=filename;
                mess+="\n";
                GimmickMessage(1,mess);
+                               ImageEventTypeMap::iterator i;
+               i = mImageEventMap.find(filename);
+               if (i!=mImageEventMap.end())
+               {
+               ImageEventType ie(i->second);
+               ie.image = image;
+               ie.pointerHolder->Set(GetDefaultImage());
+               //mImageEventMap.erase(i);
+               }
+
        }
   }