From 4f05b9a3ab42185e11fdcc3d55d71a5111ef9c2a Mon Sep 17 00:00:00 2001 From: caballero Date: Wed, 1 Apr 2009 16:28:33 +0000 Subject: [PATCH] Validation changed and added number of children to the database. --- src2/creaImageIOGimmickView.cpp | 254 ++++++++++++++------------ src2/creaImageIOGimmickView.h | 13 +- src2/creaImageIOSQLiteTreeHandler.cpp | 10 +- src2/creaImageIOSQLiteTreeHandler.h | 2 +- src2/creaImageIOTreeDescriptor.cpp | 4 + src2/creaImageIOWxGimmickView.cpp | 6 +- src2/creaImageIOWxTreeView.cpp | 193 ++++--------------- src2/creaImageIOWxTreeView.h | 4 - 8 files changed, 192 insertions(+), 294 deletions(-) diff --git a/src2/creaImageIOGimmickView.cpp b/src2/creaImageIOGimmickView.cpp index 9d2b3dc..16ad8ff 100644 --- a/src2/creaImageIOGimmickView.cpp +++ b/src2/creaImageIOGimmickView.cpp @@ -8,6 +8,54 @@ namespace fs = boost::filesystem; namespace creaImageIO { + ///Class used to represent the actual state of the image selected and to perform comparisons on its values + class ImageExtent + { + public: + ImageExtent(const std::string& x, const std::string& y, const std::string& z, const std::string& t) + { + sscanf(x.c_str(),"%d",&mExtent[0]); + sscanf(y.c_str(),"%d",&mExtent[1]); + sscanf(z.c_str(),"%d",&mExtent[2]); + sscanf(t.c_str(),"%d",&mExtent[3]); + if(x==""){mExtent[0]=1;} + if(y==""){mExtent[1]=1;} + if(z==""){mExtent[2]=1;} + if(t==""){mExtent[3]=1;} + + if (mExtent[3]>1) mDim=4; + else if (mExtent[2]>1) mDim=3; + else if (mExtent[1]>1) mDim=2; + else if (mExtent[0]>1) mDim=1; + else mDim=0; + } + + + ///Clears the extent + void Clear() { mExtent[0] = mExtent[1] = mExtent[2] = mExtent[3] = 1; } + + ///Returns true if the two extents are compatible + bool IsCompatible( const ImageExtent& ); + + ///Adds the extent passed as a parameter to the current extent + void Add ( const ImageExtent& ); + + ///Returns the ieth position of the extent + int Get(int i) { return mExtent[i]; } + + ///Returns the dimension of the current image + void SetDimension(int dim) { mDim=dim; } + + ///Returns the dimension of the current image + int GetDimension() { return mDim; } + + private: + int mExtent[4]; + int mDim; + }; + + //====================================================================== + //====================================================================== // CTor GimmickView::GimmickView(Gimmick* gimmick, int threads) @@ -19,7 +67,7 @@ namespace creaImageIO // Anciently started the threads ... // Threads now automatically start at first image request //mReader.Start(); - + } //====================================================================== @@ -38,10 +86,7 @@ namespace creaImageIO /// void GimmickView::Initialize() { - row=""; - col=""; - plane=""; - selectionSize=0; + mImageExtent=0; } //====================================================================== @@ -84,152 +129,129 @@ namespace creaImageIO } //====================================================================== /// Clears the status and begins a new selection process - void GimmickView::ClearStatus() + void GimmickView::ResetExtent() { - row=""; - col=""; - plane=""; - selectionSize=0; + if(mImageExtent!=0) + { + mImageExtent=0; + } valid=true; } - class ImageExtent + //====================================================================== + + //====================================================================== + bool ImageExtent::IsCompatible(const ImageExtent& ie) { - public: - ImageExtent(const std::string& x, const std::string& y, const std::string& z, const std::string& t); - - void Clear() { mExtent[0] = mExtent[1] = mExtent[2] = mExtent[3] = 1; } - - bool IsCompatible( const ImageExtent& ); - - void Add ( const ImageExtent& ); - - int Get(int i) { return mExtent[i]; } - - int GetDimension() { return mDim; } - - private: - int mExtent[4]; - int mDim; - }; + bool compatible=true; + ImageExtent * extent= (ImageExtent*)&ie; + if((*extent).Get(0)!=Get(0) + || (*extent).Get(1)!=Get(1)) + { + compatible=false; + } + return compatible; + } + //====================================================================== + + //====================================================================== + void ImageExtent::Add(const ImageExtent& ie) + { + ImageExtent * extent= (ImageExtent*)&ie; + mExtent[2]+=(*extent).Get(2); + SetDimension(3); + } //====================================================================== ///Validates the dimension compliance of the images with the maximum and ///minimum given, and between their sizes bool GimmickView::ValidateSelected (tree::Node* sel, int min_dim, int max_dim) { - GimmickMessage(2,"Validating selected"<Get(min_dim-1)<2)||(mImageExtent->Get(max_dim)>1)) + { + valid=false; + } + else + { + std::stringstream out; + out << mImageExtent->GetDimension() << "D image " << mImageExtent->Get(0) << "x"<< mImageExtent->Get(1) << "x"<< mImageExtent->Get(2) <<" selected"; + mMessage = out.str(); + mImageExtent->SetDimension(2); + valid=true; + } } else { - if(((*sel).GetAttribute("D0028_0010"))!=row || - ((*sel).GetAttribute("D0028_0011"))!=col || - ((*sel).GetAttribute("D0028_0012"))!=plane) + if(mImageExtent->IsCompatible(*ie)) + { + if(mImageExtent->GetDimension()==max_dim && mImageExtent->Get(max_dim)>2) + { + std::stringstream out; + out<<"Cannot add this image to selection : would result in a "<GetDimension()+1<<"D image!"; + mMessage=out.str(); + valid=false; + } + else if(max_dim<3) + { + std::stringstream out; + out<<"Selecting "<GetDimension()<<"D images is not allowed !"; + mMessage=out.str(); + valid=false; + } + else if(min_dim==3 && (ie->Get(2)+mImageExtent->Get(2))<2) { - mMessage="The selected images are not compatible."; + std::stringstream out; + out << "Cannot build the selection as it would result in a "; + out << mImageExtent->GetDimension(); + out << "D image, and the minimum is "; + out << min_dim; + out << "D!"; + mMessage=out.str(); valid=false; } + else + { + mImageExtent->Add(*ie); + std::stringstream out; + out << mImageExtent->GetDimension() << "D image " << mImageExtent->Get(0) << "x"<< mImageExtent->Get(1) << "x"<< mImageExtent->Get(2) <<" selected"; + mMessage = out.str(); + } + + } + else + { + mMessage="The selected images are not compatible."; + valid=false; + } + } } - - - int dim = 0; - int rows; - int cols; - int planes; - - //Dimention validation - //Compatibility with maximum and minimum - if(valid) - { - sscanf(row.c_str(),"%d",&rows); - sscanf(col.c_str(),"%d",&cols); - sscanf(plane.c_str(),"%d",&planes); - if(row==""){rows=1;} - if(col==""){cols=1;} - if(plane==""){planes=1;} - - std::cout << cols << "x"<1) dim=3; - else if (cols>1) dim=2; - else if (rows>1) dim=1; - - if (dim == 0) - { - mMessage="Unknown image dimension : cannot select !"; - valid= false; - } - else if (dim>max_dim) - { - mMessage="Selecting "; - mMessage+=dim; - mMessage+="D images is not allowed !"; - valid= false; - } - if ( dim == max_dim ) - { - mMessage="Cannot add this image to selection : would result in a "; - mMessage+=(dim+1); - mMessage+="D image!"; - - valid= false; - } - if ( dim < min_dim ) - { - GimmickMessage(1, "State Check: Dim: " - < ImageEventQueueType; //ImageEventQueueType mImageEventQueue; + ImageExtent* mImageExtent; ValidationSignalType mValidationSignal; - std::string row; - std::string col; - std::string plane; - int selectionSize; bool valid; }; diff --git a/src2/creaImageIOSQLiteTreeHandler.cpp b/src2/creaImageIOSQLiteTreeHandler.cpp index 7d9f7ef..a7185fd 100644 --- a/src2/creaImageIOSQLiteTreeHandler.cpp +++ b/src2/creaImageIOSQLiteTreeHandler.cpp @@ -132,6 +132,13 @@ namespace creaImageIO { tree::Node* parent = DBGetParent(attr); DBGraftToParent(parent,attr); + int nChildren = GetNumberOfChildren(parent); + std::stringstream out; + out << nChildren; + if(parent->GetLevel()>0&&parent->GetLevel()GetLevel()+1); } //===================================================================== @@ -381,7 +388,6 @@ namespace creaImageIO << i->GetGroup() << "," << i->GetElement() << "," << i->GetFlags() << ");"; - UPDATEDB(insert.str()); } @@ -848,8 +854,6 @@ namespace creaImageIO } } - //===================================================================== - //===================================================================== unsigned int SQLiteTreeHandler::GetNumberOfChildren(tree::Node* n) { diff --git a/src2/creaImageIOSQLiteTreeHandler.h b/src2/creaImageIOSQLiteTreeHandler.h index cc11b74..611872c 100644 --- a/src2/creaImageIOSQLiteTreeHandler.h +++ b/src2/creaImageIOSQLiteTreeHandler.h @@ -160,7 +160,7 @@ namespace creaImageIO //====================================================================== - // Recursively Removes the nodes whose parent is given as a parameter + /// Recursively Removes the nodes whose parent is given as a parameter void DBRecursiveRemoveNode(tree::Node* node); /* /// diff --git a/src2/creaImageIOTreeDescriptor.cpp b/src2/creaImageIOTreeDescriptor.cpp index 79e623f..5b2a447 100644 --- a/src2/creaImageIOTreeDescriptor.cpp +++ b/src2/creaImageIOTreeDescriptor.cpp @@ -50,6 +50,8 @@ namespace creaImageIO // Patient level Add(LevelDescriptor("Patient")); + Add(AttributeDescriptor(0x1111,0x0011, // Number of Series + AttributeDescriptor::LABEL),1); Add(AttributeDescriptor(0x0010,0x0010, // Patient name AttributeDescriptor::LABEL),1); Add(AttributeDescriptor(0x0010,0x0040),1); // Patient sex @@ -59,6 +61,8 @@ namespace creaImageIO // Study-series level Add(LevelDescriptor("Series")); + Add(AttributeDescriptor(0x1111,0x0011, // Number of Images + AttributeDescriptor::LABEL),2); Add(AttributeDescriptor(0x0008,0x0060, // Modality AttributeDescriptor::LABEL),2); Add(AttributeDescriptor(0x0008,0x1030),2); // Study Description diff --git a/src2/creaImageIOWxGimmickView.cpp b/src2/creaImageIOWxGimmickView.cpp index 2d87851..7e018a0 100644 --- a/src2/creaImageIOWxGimmickView.cpp +++ b/src2/creaImageIOWxGimmickView.cpp @@ -388,7 +388,7 @@ namespace creaImageIO } else if(needProcess) { - ClearStatus(); + ResetExtent(); std::vector::iterator i; for(i=sel.begin();i!=sel.end()&&valid;++i) { @@ -405,7 +405,7 @@ namespace creaImageIO } else { - ClearStatus(); + ResetExtent(); std::vector::iterator i; for(i=sel.begin();i!=sel.end()&&valid;++i) { @@ -537,7 +537,7 @@ namespace creaImageIO pointers.push_back(new ImagePointerHolder(GetDefaultImage())); mViewer->SetImageVector(pointers); mViewer->RefreshIfNecessary(); - ClearStatus(); + ResetExtent(); } //================================================= diff --git a/src2/creaImageIOWxTreeView.cpp b/src2/creaImageIOWxTreeView.cpp index 18ced63..422a4f5 100644 --- a/src2/creaImageIOWxTreeView.cpp +++ b/src2/creaImageIOWxTreeView.cpp @@ -111,21 +111,10 @@ namespace creaImageIO level.wxCtrl = ctrl; level.wxSplitter->Initialize(ctrl); - // Create the first column : number of children - if(iGetTree().GetNumberOfLevels()-1) - { - std::string title = "#"; - if (iGetTree().GetNumberOfLevels()-1) - { - title += handler->GetTree().GetLevelDescriptor(i+1).GetName(); - if (title[title.size()-1]!='s') - title += "s"; - } - ctrl->InsertColumn(0,crea::std2wx(title),col_style); - } // Create the columns : one for each attribute of the level - int col = 1; + int col = 0; + std::string title; tree::LevelDescriptor::AttributeDescriptorListType::const_iterator a; for (a = handler->GetTree().GetAttributeDescriptorList(i).begin(); a != handler->GetTree().GetAttributeDescriptorList(i).end(); @@ -135,8 +124,20 @@ namespace creaImageIO GimmickDebugMessage(5,"Creating column "<GetName() <GetName()=="UNKNOWN") + { + title = "#"; + title += handler->GetTree().GetLevelDescriptor(i+1).GetName(); + if (title[title.size()-1]!='s') + title += "s"; + + } + else + { + title=a->GetName(); + } ctrl->InsertColumn(col, - crea::std2wx(a->GetName()), + crea::std2wx(title), col_style); level.key.push_back(a->GetKey()); // ctrl->SetColumnWidth(col, wxLIST_AUTOSIZE ); @@ -313,9 +314,7 @@ namespace creaImageIO std::vector::iterator i; - //Adds the first item (filter) - - for (i=sel.begin(); i!=sel.end(); ++i) + for (i=sel.begin(); i!=sel.end(); ++i) { GimmickDebugMessage(2, "adding children of '" @@ -324,8 +323,8 @@ namespace creaImageIO <InsertItem(0, _T("")); + //Adds items and sets their attributes + GetCtrl(l)->InsertItem(0, _T("")); GetTreeHandler()->LoadChildren(*i,1); tree::Node::ChildrenListType::reverse_iterator j; for (j = (*i)->GetChildrenList().rbegin(); @@ -350,54 +349,25 @@ namespace creaImageIO item->SetData(data); _id++; + GetCtrl(l)->InsertItem(*item); - - //Setting first column (number of children) - std::ostringstream oss; - int n= 0; //GetTreeHandler()->GetNumberOfChildren(*j); - oss << n; - std::string s(oss.str()); - item->SetText( crea::std2wx(s)); - - item->SetColumn(0); - GetCtrl(l)->InsertItem(*item); - //GetCtrl(l)->SetItem(item); - - //Setting other attributes - if(levelGetColumnCount(); k++) + //Setting attributes + + for (int k=0; kGetColumnCount(); k++) { - std::string val = (*j)->GetAttribute(mLevelList[l].key[k-1]); + std::string val = (*j)->GetAttribute(mLevelList[l].key[k]); if (val.size()==0) val = "?"; item->SetText( crea::std2wx(val)); item->SetColumn(k); GetCtrl(l)->SetItem(*item); - // Unefficient - // GetCtrl(l)->RefreshItem(*item); - } - } - else - { - for (int k=0; kGetColumnCount(); k++) - { - std::string val = (*j)->GetAttribute(mLevelList[l].key[k]); - if (val.size()==0) val = "?"; - item->SetText( crea::std2wx(val)); - item->SetColumn(k); - GetCtrl(l)->SetItem(*item); - // GetCtrl(l)->RefreshItem(*item); } - } } GetCtrl(l)->DeleteItem(0); } GetCtrl(l)->Show(); - - // if (levelSetItemText(0,crea::std2wx("")); - GetCtrl(level)->EditLabel(event.m_itemIndex); - } - - }*/ - } //================================================================ @@ -483,7 +424,6 @@ namespace creaImageIO { long item = -1; int level=mLevelList.size()-1; - for ( ;; ) { item = GetCtrl(level)->GetNextItem(item, @@ -499,29 +439,11 @@ namespace creaImageIO { mProcess=false; } - - /*if(item!=0) - {*/ GetCtrl(level)->SetItemState(item,wxLIST_STATE_SELECTED, wxLIST_MASK_STATE | wxLIST_MASK_TEXT |wxLIST_MASK_IMAGE | wxLIST_MASK_DATA | wxLIST_MASK_WIDTH | wxLIST_MASK_FORMAT); - //} - } - - } - - //================================================================ - //================================================================ - - void WxTreeView::OnMouseClick(wxMouseEvent& event) - { - if (event.ButtonDown()) - { - } - std::cout<<"HELLO WORLD"<GetColumnWidth(i); - } - for(int i=0;iGetSashPosition(); - } - clientpt.y+=level*2; */ - if(level==mLevelList.size()-1) - { - mColumnSelected+=1; - PopupMenu(menu, clientpt); - } - else if(mColumnSelected!=0) - { - PopupMenu(menu, clientpt); - } + PopupMenu(menu, clientpt); } - //================================================================ + + //================================================================ + //================================================================ + void WxTreeView::OnPopupFilter(wxCommandEvent& event) { wxBusyCursor busy; @@ -589,7 +497,7 @@ namespace creaImageIO long adr = GetCtrl(level)->GetItemData(it); tree::Node* nod = ((ItemData*)adr)->node; - att=(*nod).GetAttribute(mLevelList[level].key[mColumnSelected-1]); + att=(*nod).GetAttribute(mLevelList[level].key[mColumnSelected]); if(att.find(filter)>900) @@ -642,10 +550,7 @@ namespace creaImageIO { //Obtain the column name and the level that needs to be organized - if(level==mLevelList.size()-1||mColumnSelected!=0) - { int l = level - 1; - //GetCtrl(level)->DeleteItem(0); //Sets the data for the items to be sorted std::string att; unsigned int ty=0; @@ -660,10 +565,10 @@ namespace creaImageIO tree::Node* nod = ((ItemData*)adr)->node; if(i==0) { - (*nod).GetAttributeDescriptor(mLevelList[level].key[mColumnSelected-1]).DecodeType(ty); + (*nod).GetAttributeDescriptor(mLevelList[level].key[mColumnSelected]).DecodeType(ty); } //Obtains the organizing attribute - att=(*nod).GetAttribute(mLevelList[level].key[mColumnSelected-1]); + att=(*nod).GetAttribute(mLevelList[level].key[mColumnSelected]); char* d= new char [att.size()+1]; strcpy (d, att.c_str()); @@ -702,6 +607,7 @@ namespace creaImageIO } //Resets original data + std::vector::iterator selection; std::vector change; long it = -1; @@ -715,40 +621,9 @@ namespace creaImageIO //Gets current item data, extracts the node and resets it long item = GetCtrl(level)->GetItemData(it); GetCtrl(level)->SetItemData(it,((long*)item)[0]); - tree::Node* n= ((ItemData*)((long*)item)[0])->node; - if(levelGetAttribute("ID").compare(n->GetAttribute("ID"))==0) - { - change.push_back(it); - } - } - } - else - { - for(selection=mLastLevelSelected.begin();selection!=mLastLevelSelected.end();++selection) - { - if((*selection)->GetAttribute("ID").compare(n->GetAttribute("ID"))==0) - { - change.push_back(it); - } - } - } - + tree::Node* n= ((ItemData*)((long*)item)[0])->node; } - //Resets the selected items - std::vector::iterator selectedIts; - for(selectedIts=change.begin();selectedIts!=change.end();++selectedIts) - { - GetCtrl(level)->SetItemState(*selectedIts,wxLIST_STATE_SELECTED, wxLIST_MASK_STATE - | wxLIST_MASK_TEXT |wxLIST_MASK_IMAGE | wxLIST_MASK_DATA | wxLIST_MASK_WIDTH | wxLIST_MASK_FORMAT); - - } - //GetCtrl(level)->InsertItem(0,_T("Filter:")); - } } diff --git a/src2/creaImageIOWxTreeView.h b/src2/creaImageIOWxTreeView.h index 0cff8a1..201335d 100644 --- a/src2/creaImageIOWxTreeView.h +++ b/src2/creaImageIOWxTreeView.h @@ -101,10 +101,6 @@ namespace creaImageIO bool mDirection; ///The last selected item on the list long mLastSelected; - ///The last selection of nodes (for every level, except the last) - std::vector mSelected; - ///The last selection of nodes (for the last level) - std::vector mLastLevelSelected; ///The color map typedef std::map ColorMap; typedef std::pair NodeColorPair; -- 2.46.1