Added column showing number of children.

diff --git a/src2/creaImageIOSQLiteTreeHandler.cpp b/src2/creaImageIOSQLiteTreeHandler.cpp
index 3a01e117f8a78f3861ede83c5200f4e054f57e8c..f3595c9f156caa9fed39e9e5ff173f163f8cf33f 100644 (file)
--- a/src2/creaImageIOSQLiteTreeHandler.cpp
+++ b/src2/creaImageIOSQLiteTreeHandler.cpp
@@ -106,13 +106,7 @@ namespace creaImageIO
   {
     return false;
   }
-  //=====================================================================
-
-  //===================================================================== 
-  unsigned int SQLiteTreeHandler::GetNumberOfChildren(tree::Node* n) 
-  { 
-    return 0; 
-  }
+  
   //===================================================================== 
 
   //===================================================================== 
@@ -682,6 +676,7 @@ namespace creaImageIO
     // Query DB
     int level = node->GetLevel();
     std::string query = "SELECT * FROM ";
+       
     query += GetTree().GetLevelDescriptor(level+1).GetName();
     if (level>0)
       {
@@ -853,6 +848,37 @@ namespace creaImageIO
       }
   }
 
+  //=====================================================================
+
+  //===================================================================== 
+  unsigned int SQLiteTreeHandler::GetNumberOfChildren(tree::Node* n) 
+  { 
+         // Query DB
+       int nb=0;
+    int level = n->GetLevel();
+       if(GetTree().GetNumberOfLevels()!=(level+1))
+       {
+       std::string query = "SELECT * FROM ";
+    query += GetTree().GetLevelDescriptor(level+1).GetName();
+    if (level>0)
+      {
+       query += " WHERE PARENT_ID='" + n->UnsafeGetAttribute("ID") 
+         + "'";
+      }
+
+    CppSQLite3Query q;
+    QUERYDB(query,q);
+       
+
+               while (!q.eof())
+               {
+                       nb++;
+                       q.nextRow();
+               }
+       }
+    return nb; 
+  }
+
   /*
   //=====================================================================
   bool SQLiteTreeHandler::DBInsert(Node* alien_node,

diff --git a/src2/creaImageIOWxGimmickFrame.cpp b/src2/creaImageIOWxGimmickFrame.cpp
index d0e04fe99c01631eae056e3ed5a23b7fb6be1faf..3e6b61651adadad8625c447d79f8ec4b1c57411a 100644 (file)
--- a/src2/creaImageIOWxGimmickFrame.cpp
+++ b/src2/creaImageIOWxGimmickFrame.cpp
@@ -16,7 +16,7 @@ namespace creaImageIO
                  pos,
                  size,
                  wxRESIZE_BORDER | 
-             //  wxSYSTEM_MENU  |
+             wxSYSTEM_MENU  |
                  wxCLOSE_BOX |
                  wxMAXIMIZE_BOX | 
                  wxMINIMIZE_BOX | 

diff --git a/src2/creaImageIOWxGimmickView.cpp b/src2/creaImageIOWxGimmickView.cpp
index c28c285afccc369dc1c153c1b31b99003fa213a0..064accc941394e18dd560df5372ed44f2ec34447 100644 (file)
--- a/src2/creaImageIOWxGimmickView.cpp
+++ b/src2/creaImageIOWxGimmickView.cpp
@@ -332,7 +332,7 @@ namespace creaImageIO
    //=================================================
   void WxGimmickView::OnRemove(wxCommandEvent& event)
   {
-       //TODO Select current tree handler
+       //TODO Select current tree handler       
     wxBusyCursor busy;
     GetTreeViewMap()["Local database"]->RemoveSelected(1);
   }

diff --git a/src2/creaImageIOWxTreeView.cpp b/src2/creaImageIOWxTreeView.cpp
index cd6e9600a272cc2d637f6423d99b265f8068ac63..7f2826049c77f19aa56bf9a3290d51c32ddfa38f 100644 (file)
--- a/src2/creaImageIOWxTreeView.cpp
+++ b/src2/creaImageIOWxTreeView.cpp
@@ -44,21 +44,35 @@ namespace creaImageIO
 
        // Create the columns : one for each attribute of the level
        int col = 0;
+                       //ctrl->InsertItem(0, "1");
+       
        tree::LevelDescriptor::AttributeDescriptorListType::const_iterator a;
        for (a  = handler->GetTree().GetAttributeDescriptorList(i).begin();
             a != handler->GetTree().GetAttributeDescriptorList(i).end();
             ++a)
          {
-           GimmickDebugMessage(5,"Creating column "<<col<<" : "
+                 if(col==0)
+                 {
+                       ctrl->InsertColumn(col, _("Children"), col_style);
+                       //ctrl->InsertItem(0, "1");
+                       //level.key.push_back(_("Children"));
+                       //level.key.push_back(handler->GetTree().GetChildrenList().size());
+                       col++;
+                 }
+                 
+               GimmickDebugMessage(5,"Creating column "<<col<<" : "
                                <<a->GetName()
                                <<std::endl);
-           ctrl->InsertColumn(col, 
-                              crea::std2wx(a->GetName()),
-                              col_style);
-           level.key.push_back(a->GetKey());
-           //      ctrl->SetColumnWidth(col, wxLIST_AUTOSIZE );
-           col++;
+               ctrl->InsertColumn(col, 
+                               crea::std2wx(a->GetName()),
+                               col_style);
+               level.key.push_back(a->GetKey());
+               //          ctrl->SetColumnWidth(col, wxLIST_AUTOSIZE );
+               col++;
+               
+               
          }
+         
        mLevelList.push_back(level);
        sizer->Add( ctrl ,1, wxGROW  ,0);
       }
@@ -94,6 +108,7 @@ namespace creaImageIO
     int l = level - 1;
     // the selection of upper level
     std::vector<tree::Node*> sel;
+       
     if (level == 1) 
       {
        sel.push_back(GetTreeHandler()->GetTree().GetTree());
@@ -111,6 +126,7 @@ namespace creaImageIO
              }
          }     
       }
+       
          return sel;
   }
 
@@ -120,19 +136,28 @@ namespace creaImageIO
   void WxTreeView::RemoveSelected( int level )
   {
          std::vector<tree::Node*> sel=GetSelected(level+1);
-
-         std::vector<tree::Node*>::iterator i;
-         for (i=sel.begin(); i!=sel.end(); ++i)
-      {
-               GimmickDebugMessage(2,
-                           "deleting '"
-                           <<(*i)->GetLabel()
-                           <<"'"<<level
-                           <<std::endl);
-                       GetTreeHandler()->Remove(*i);
+         bool erase=false;
+         if (wxMessageBox(_T("Delete file(s) ?"),
+                        _T("Remove Files"),
+                        wxYES_NO,this ) == wxYES)
+         {
+           erase = true;
+         }
+         if(erase)
+         {
+               std::vector<tree::Node*>::iterator i;
+               for (i=sel.begin(); i!=sel.end(); ++i)
+               {
+                       GimmickDebugMessage(2,
+                                       "deleting '"
+                                       <<(*i)->GetLabel()
+                                       <<"'"<<level
+                                       <<std::endl);
+                               GetTreeHandler()->Remove(*i);
+               }
+
+               UpdateLevel(level);
          }
-
-         UpdateLevel(level);
          
   }
     
@@ -150,7 +175,6 @@ namespace creaImageIO
                        <<std::endl);
 
        wxBusyCursor busy;
-
     std::vector<tree::Node*> sel=GetSelected(level);
 
          int l = level - 1;
@@ -168,6 +192,7 @@ namespace creaImageIO
                            <<"'"<<level
                            <<std::endl);
        
+       //Adds columns
        GetTreeHandler()->LoadChildren(*i,1);
        tree::Node::ChildrenListType::reverse_iterator j;
        for (j = (*i)->GetChildrenList().rbegin(); 
@@ -187,14 +212,26 @@ namespace creaImageIO
            data->node = *j;
            item.SetData(data);
            
+         
            long id = GetCtrl(l)->InsertItem(item);
 
-           for (int k=0; k<GetCtrl(l)->GetColumnCount(); k++)
+               std::ostringstream oss;
+               
+               int     n= GetTreeHandler()->GetNumberOfChildren(*j);
+               
+               oss << n;
+               std::string s(oss.str());
+               
+               GetCtrl(l)->SetItem(id,0, crea::std2wx(s));
+               GetCtrl(l)->SetColumnWidth(0, wxLIST_AUTOSIZE );
+
+         for (int k=1; k<GetCtrl(l)->GetColumnCount(); k++)
              {
-               std::string val = (*j)->GetAttribute(mLevelList[l].key[k]);
+               std::string val = (*j)->GetAttribute(mLevelList[l].key[k-1]);
                if (val.size()==0) val = "?";
                GetCtrl(l)->SetItem(id,k, crea::std2wx(val));
                GetCtrl(l)->SetColumnWidth(k, wxLIST_AUTOSIZE );
+               
              }
            
          }