From: Eduardo DAVILA <davila@creatis.insa-lyon.fr>
Date: Tue, 7 Aug 2018 14:11:56 +0000 (+0200)
Subject: #3218 creaImageIO Feature New Normal  -  vtk8itk4wx3-mingw64
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=98e1f28f00373ed1119229eb1b4cd7bf45b44613;hp=-c;p=creaImageIO.git

#3218 creaImageIO Feature New Normal  -  vtk8itk4wx3-mingw64
---

98e1f28f00373ed1119229eb1b4cd7bf45b44613
diff --combined src/creaImageIOGimmick.cpp
index 1ec42e1,5b01f74..7ba9b2a
--- a/src/creaImageIOGimmick.cpp
+++ b/src/creaImageIOGimmick.cpp
@@@ -202,10 -202,10 +202,10 @@@ namespace creaImageI
    {
      if (mHomeDirectory.size()==0) 
        {
 -#if defined(__GNUC__)
 -	mHomeDirectory = getenv("HOME");
 -#elif defined(_WIN32)
 +#if defined(_WIN32)
  	mHomeDirectory = getenv("USERPROFILE");
 +#elif defined(__GNUC__)
 +	mHomeDirectory = getenv("HOME");
  #endif
        }
      return mHomeDirectory;
@@@ -560,11 -560,13 +560,13 @@@ void Gimmick::fillVectInfos(std::vector
  	{
  		if( mImageAdder.isAttributeExist((*it)) != "" ) // in DB
  		{
+ printf("EED Gimmick::fillVectInfos inside %s\n",(*it).c_str());
  			infos.inside.push_back((*it));
  		}
  		else
  		{
  				infos.outside.push_back((*it)); // Need to scan again the files
+ printf("EED Gimmick::fillVectInfos outside %s\n",(*it).c_str());
  		}
  	}
  }
@@@ -580,4 -582,4 +582,4 @@@ const std::string Gimmick::getSummary(
      return mess.str();
  }
  
- }
+ }
diff --combined src/creaImageIOWxGimmickReaderDialog.cpp
index 1dff6b3,771bb05..8c11f03
--- a/src/creaImageIOWxGimmickReaderDialog.cpp
+++ b/src/creaImageIOWxGimmickReaderDialog.cpp
@@@ -67,10 -67,10 +67,10 @@@ namespace creaImageI
  
      try {
  
- 	  mGimmick = boost::shared_ptr<Gimmick>(new Gimmick());
-       mGimmick->Initialize(i_namedescp,i_namedb);
+ 	mGimmick = boost::shared_ptr<Gimmick>(new Gimmick());
+ 	mGimmick->Initialize(i_namedescp,i_namedb);
  
-       mView = new WxGimmickView(mGimmick,
+       	mView = new WxGimmickView(mGimmick,
  				this,
  				TVID,
  				wxDefaultPosition,
@@@ -78,29 -78,25 +78,24 @@@
  				min_dim,
  				max_dim,
  				threads);
-       mView->Initialize();
+       	mView->Initialize();
  	   // Connect the AddProgress callback
 -      	mView->ConnectValidationObserver
 -      		( boost::bind( &WxGimmickReaderDialog::OnValid , this, _1 ) );
 +      mView->ConnectValidationObserver( boost::bind( &WxGimmickReaderDialog::OnValid , this, _1 ) );
      }
      catch (crea::Exception e)
      {
        e.Print();
        return;
      }
- 
      mtopsizer->Add( mView,1,wxGROW,0);
- 
      wxSizer* bsizer = this->CreateSeparatedButtonSizer(wxOK|wxCANCEL);
  	/*mOkButton = new wxButton(this, wxID_OK, _T("OK"), wxPoint(170,50));
  	mCancelButton = new wxButton(this, wxID_CANCEL, _T("CANCEL"), wxPoint(210,50));
  	*/	mOkButton = (wxButton*)FindWindowById(GetAffirmativeId(), this);
      mCancelButton = (wxButton*)FindWindowById(GetEscapeId(),      this);
- 
      mOkButton->Enable(false);
      mtopsizer->Add ( bsizer, 0, wxGROW );
- 
-     SetSizer( mtopsizer );     
-  
+     SetSizer( mtopsizer );
      Layout(); 
    }
  
@@@ -117,7 -113,6 +112,6 @@@
        {
  		mGimmick->Finalize();
        }
- 
    }
  
    ///Callback method on a selection
diff --combined src/creaImageIOWxGimmickView.cpp
index 46e2507,ef9ee5c..11e8c88
--- a/src/creaImageIOWxGimmickView.cpp
+++ b/src/creaImageIOWxGimmickView.cpp
@@@ -204,8 -204,8 +204,8 @@@ namespace creaImageI
      /// \TODO fix warning: unused variable hsize
      int hsize = size.GetHeight();
  
-     int top_minsize = 450;
-     int bottom_minsize = 50;
+     int top_minsize 	= 450;
+     int bottom_minsize 	= 50;
  
      mSplitter->SetMinimumPaneSize( bottom_minsize );
      mSplitter->SplitHorizontally( mNotebook, mBottomPanel, 
@@@ -504,15 -504,7 +504,15 @@@
    void WxGimmickView::OnAddFiles(wxCommandEvent& event)
    {
      mViewer->StopPlayer();
 +
 +//EED 2017-09-16 Migration wxWidgets 2.8 to 3.0
 +#if wxMAJOR_VERSION <= 2
      long style = wxOPEN | wxFILE_MUST_EXIST | wxFD_MULTIPLE;
 +#else
 +    long style = wxFD_OPEN | wxFD_FILE_MUST_EXIST | wxFD_MULTIPLE;
 +#endif
 +
 +
      std::string wc("*");
      wxFileDialog* FD = new wxFileDialog( 0, 
  					 _T("Select file"),
@@@ -708,11 -700,7 +708,11 @@@
        {
  		  ClearSelection();
        }*/
 -	ReadImageThreaded(sel);
 +	  
 +  printf("EED Warnning WxGimmickView::OnSelectionChange ....... To avoid threads conflicts//ReadImageThreaded(sel)\n ");
 +//EED1	ReadImageThreaded(sel);
 +
 +
     }
  
    //==================================================
@@@ -1187,9 -1175,9 +1187,9 @@@
    //========================================================================
    void WxGimmickView::CreateEditFieldsDialog(tree::Node* node, std::vector<std::string> names, std::vector<std::string> keys)
    {
-     wxDialog* dial= new wxDialog (this,-1,crea::std2wx("Edit Fields for node "+node->GetLabel()),wxDefaultPosition, wxSize(350,155));
-     wxBoxSizer	*siz = new wxBoxSizer(wxVERTICAL);
-     WxEditFieldsPanel* ef = new WxEditFieldsPanel(dial, dial, this, node, names, keys);
+     wxDialog		*dial= new wxDialog (this,-1,crea::std2wx("Edit Fields for node "+node->GetLabel()),wxDefaultPosition, wxSize(350,155));
+     wxBoxSizer		*siz = new wxBoxSizer(wxVERTICAL);
+     WxEditFieldsPanel	*ef  = new WxEditFieldsPanel(dial, dial, this, node, names, keys);
  
      siz->Add( ef,1,wxGROW  ,0); 
      dial->SetSizer(siz);
diff --combined src/creaImageIOWxSimpleDlg.cpp
index eb9882e,1c076b0..88cf784
--- a/src/creaImageIOWxSimpleDlg.cpp
+++ b/src/creaImageIOWxSimpleDlg.cpp
@@@ -69,12 -69,7 +69,12 @@@ namespace creaImageI
  	  void WxSimpleDlg::OnReadFile(wxCommandEvent& event)
  	  {
  		  int resultShowModal;
 +//EED 2017-09-16 Migration wxWidgets 2.8 to 3.0
 +#if wxMAJOR_VERSION <= 2
  		  wxFileDialog* fileDlg = new wxFileDialog( 0,  _T("Select file"), _T(""), _T(""), crea::std2wx("*"), wxOPEN |wxFD_MULTIPLE, wxDefaultPosition);
 +#else
 +		  wxFileDialog* fileDlg = new wxFileDialog( 0,  _T("Select file"), _T(""), _T(""), crea::std2wx("*"), wxFD_OPEN |wxFD_MULTIPLE, wxDefaultPosition);
 +#endif
      
  		    resultShowModal = fileDlg->ShowModal();
  			if ( resultShowModal==wxID_OK )
@@@ -140,7 -135,7 +140,7 @@@
  		   WxGimmickReaderDialog dlg(0,-1, 
  				   namedescp,
  				   namedb, 
- 				   _T("Select image(s)        - Gimmick! (c) CREATIS-LRMN 2008"),
+ 				   _T("Select image(s)        - Gimmick! (c)"),
                     wxDefaultPosition,
                     wxSize(810,750),
                     GIMMICK_2D_IMAGE_SELECTION,
@@@ -150,11 -145,9 +150,7 @@@
  		 dlg.ShowModal();
  		 if (dlg.GetReturnCode() == wxID_OK)
  	     {
 -			dlg.stopReading();
 -			std::vector<creaImageIO::OutStrGimmick> outStrGimmick;
 -			dlg.getSelected(outStrGimmick, m_attrDicomTags,true,"");
 +//EED1				dlg.stopReading();
- 
- 				std::vector<creaImageIO::OutStrGimmick> outStrGimmick;
- 				dlg.getSelected(outStrGimmick, m_attrDicomTags,true,"");
- 
  			m_results.clear();
  			int size=(int)outStrGimmick.size();
  			int ii;
@@@ -162,7 -155,8 +158,6 @@@
  //			{
  				for (ii=0;ii<size;ii++)
  				{
- printf("EED1 WxSimpleDlg::OnReadGimmick %d \n", ii);
 -					outStrGimmick[ii].img->Modified();
 -					outStrGimmick[ii].img->Update();
  					m_results.push_back(outStrGimmick[ii].img);
  					m_resultsDicomAtr.push_back( outStrGimmick[ii].infos );
  				}
@@@ -175,7 -169,6 +170,6 @@@
  
  			infoimage		=	_T("EED Missing info <void> ???");
  			infoimageSource	=	_T("GIMMICK");
- 
  			dlg.OnExit();
  		 }
  		 SetReturnCode( dlg.GetReturnCode() );
@@@ -238,14 -231,12 +232,14 @@@
  			  	first->GetDimensions(dim);
  			  	if (dim[2]==1)
  				{
 -					vtkImageData *out;
 -				  	out  = vtkImageData::New();
 -				  	out->SetScalarType(first->GetScalarType());
 -				  	out->SetNumberOfScalarComponents(first->GetNumberOfScalarComponents());
 +					vtkImageData *out = vtkImageData::New();
  				  	int ext[6];
 +//EED 2017-01-01 Migration VTK7
 +#if VTK_MAJOR_VERSION <= 5
  				  	first->GetWholeExtent(ext); 
 +#else
 +				  	first->GetExtent(ext); 
 +#endif
  				  	if(ext[5] == 0)
  				  	{
  				 	   ext[5] = getImagesSelected().size()-1;
@@@ -262,18 -253,8 +256,18 @@@
  		          	}
  					out->SetSpacing(spac);
  					out->SetDimensions(dim[0], dim[1], getImagesSelected().size() );
 +//EED 2017-01-01 Migration VTK7
 +#if VTK_MAJOR_VERSION <= 5
 +
 +				  	out->SetScalarType(first->GetScalarType());
 +				  	out->SetNumberOfScalarComponents(first->GetNumberOfScalarComponents());
  					out->AllocateScalars();
  					out->Update();
 +#else
 +					out->AllocateScalars(first->GetScalarType(),first->GetNumberOfScalarComponents());
 +#endif
 +
 +
  					unsigned long imsize = dim[0] * dim[1];
  					imsize = imsize * dim[2];  // deal with multiframes here
  					// differents formats char , short, etc...
@@@ -286,7 -267,8 +280,8 @@@
  						memcpy(out->GetScalarPointer(0,0,slice), img->GetScalarPointer(0,0,0), imsize);
  						//img->Delete();
  				 	} // for slice	
- 
+ 					out->Modified();
+ 					out->Update();
  //EED This is NOT working. The iteration over the pointer vtkImageData
  //		    	  	int slice=0;
  //		  	    	std::vector<vtkImageData*>::iterator it;
@@@ -310,7 -292,8 +305,8 @@@
  	    	result = NULL;  
  		} // getImagesSelected().size()!=0
  
- 
+ 			result->Modified();
+ 			result->Update();
          	return result;
  
  		}