From: Juan Prieto Date: Thu, 21 Jan 2010 16:03:17 +0000 (+0000) Subject: *** empty log message *** X-Git-Tag: CREATOOLS.2-0-3~88 X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=b297410bce4fc9141ade21cbeca71061369b4932;p=bbtk.git *** empty log message *** --- diff --git a/kernel/src/bbtkBlackBox.cxx b/kernel/src/bbtkBlackBox.cxx index c74b2e9..c35e82c 100644 --- a/kernel/src/bbtkBlackBox.cxx +++ b/kernel/src/bbtkBlackBox.cxx @@ -2,8 +2,8 @@ Program: bbtk Module: $RCSfile: bbtkBlackBox.cxx,v $ Language: C++ - Date: $Date: 2009/06/08 14:50:02 $ - Version: $Revision: 1.48 $ + Date: $Date: 2010/01/21 16:03:17 $ + Version: $Revision: 1.49 $ =========================================================================*/ /* --------------------------------------------------------------------- @@ -114,6 +114,10 @@ namespace bbtk bbmParent() { + //JCP 02-11-09 + // bbmBoxProcessMode = "Pipeline"; +//std::cout<<"JCP BlackBox::BlackBox(const std::string &name) name=" < BlackBox::BlackBox(\"" < BlackBox::BlackBox(" <second->SetStatus(OUTOFDATE); o->second->SignalChange(GetThisPointer(),o->first); } - } + } if ( ( bbBoxProcessModeIsReactive() || (c==bbGetInputConnectorMap().find("BoxExecute")->second)) diff --git a/kernel/src/bbtkFactory.cxx b/kernel/src/bbtkFactory.cxx index 627bc80..7ddf177 100644 --- a/kernel/src/bbtkFactory.cxx +++ b/kernel/src/bbtkFactory.cxx @@ -2,8 +2,8 @@ Program: bbtk Module: $RCSfile: bbtkFactory.cxx,v $ Language: C++ - Date: $Date: 2009/10/05 22:44:48 $ - Version: $Revision: 1.46 $ + Date: $Date: 2010/01/21 16:03:17 $ + Version: $Revision: 1.47 $ =========================================================================*/ /* --------------------------------------------------------------------- @@ -893,71 +893,71 @@ namespace bbtk // Builds the index map PackageMapType::const_iterator i; for (i = mPackageMap.begin(); i!=mPackageMap.end(); ++i ) - { - Package::Pointer pack = i->second; - if (pack->GetName()=="user") continue; - Package::DescriptorMapType::const_iterator j; - for (j = pack->GetDescriptorMap().begin(); - j!= pack->GetDescriptorMap().end(); - ++j) - { + { + Package::Pointer pack = i->second; + if (pack->GetName()=="user") continue; + Package::DescriptorMapType::const_iterator j; + for (j = pack->GetDescriptorMap().begin(); + j!= pack->GetDescriptorMap().end(); + ++j) + { // Skip adaptors - if ( type==Adaptors ) - { - if (j->second->GetKind() == BlackBoxDescriptor::STANDARD ) - continue; - } - else - if (j->second->GetKind() != BlackBoxDescriptor::STANDARD ) - continue; + if ( type==Adaptors ) + { + if (j->second->GetKind() == BlackBoxDescriptor::STANDARD ) + continue; + } + else + if (j->second->GetKind() != BlackBoxDescriptor::STANDARD ) + continue; - std::vector keys; - if (type==Packages) - { - std::string k(""); - k += pack->GetName(); - keys.push_back(k); - title = "Boxes by package"; - } - else if ((type==Initials) || (type==Adaptors)) - { - std::string init(" "); - init[0] = std::toupper(j->second->GetTypeName()[0]); - keys.push_back(init); - title = "Alphabetical list"; - } - else if (type==Categories) - { - // Split the category string - std::string delimiters = ";,"; - Utilities::SplitString(j->second->GetCategory(), - delimiters,keys); - if (keys.size()==0) - keys.push_back(" NONE"); - title = "Boxes by category"; - } - - - std::vector::const_iterator k; - for (k=keys.begin(); k!=keys.end(); ++k ) - { - IndexType::iterator p; - p = index.find(*k); - if (p != index.end()) - { - p->second.push_back(j->second); - } - else - { - std::vector v; - v.push_back(j->second); - index[*k] = v; - } - } - - } - } + std::vector keys; + if (type==Packages) + { + std::string k(""); + k += pack->GetName(); + keys.push_back(k); + title = "Boxes by package"; + } + else if ((type==Initials) || (type==Adaptors)) + { + std::string init(" "); + init[0] = std::toupper(j->second->GetTypeName()[0]); + keys.push_back(init); + title = "Alphabetical list"; + } + else if (type==Categories) + { + // Split the category string + std::string delimiters = ";,"; + Utilities::SplitString(j->second->GetCategory(), + delimiters,keys); + if (keys.size()==0) + keys.push_back(" NONE"); + title = "Boxes by category"; + } + + + std::vector::const_iterator k; + for (k=keys.begin(); k!=keys.end(); ++k ) + { + IndexType::iterator p; + p = index.find(*k); + if (p != index.end()) + { + p->second.push_back(j->second); + } + else + { + std::vector v; + v.push_back(j->second); + index[*k] = v; + } + } + + } + } // Creates the file //--------------------- // Open output file @@ -1002,7 +1002,7 @@ namespace bbtk IndexType::iterator ii; for (ii=index.begin();ii!=index.end();++ii) { - s << "first<<"\">"<first<<"  "; + s << "first<<"\">"<first<<"  "; } for (ii=index.begin();ii!=index.end();++ii) @@ -1018,9 +1018,14 @@ namespace bbtk s << "  -  \n"; s << "\n"; -//EED 26Mars2009 + +//EED 26Mars2009 + /*JCP 19 Nov 2009 std::string bin_path = bbtk::ConfigurationFile::GetInstance().Get_bin_path(); s << "first << "/main.html>(Doxygen documentation of the source)\n"; + JCP 19 Nov 2009*/ + std::string bin_path = bbtk::ConfigurationFile::GetInstance().Get_bin_path(); + s << "first << "/main.html>(Doxygen documentation of the source)\n"; } else { diff --git a/packages/vtk/src/bbvtkImagePlanes.cxx b/packages/vtk/src/bbvtkImagePlanes.cxx index 9f61f6e..b62cd07 100644 --- a/packages/vtk/src/bbvtkImagePlanes.cxx +++ b/packages/vtk/src/bbvtkImagePlanes.cxx @@ -2,8 +2,8 @@ Program: bbtk Module: $RCSfile: bbvtkImagePlanes.cxx,v $ Language: C++ - Date: $Date: 2009/09/01 13:59:48 $ - Version: $Revision: 1.30 $ + Date: $Date: 2010/01/21 16:03:19 $ + Version: $Revision: 1.31 $ =========================================================================*/ /* --------------------------------------------------------------------- @@ -137,7 +137,7 @@ namespace bbvtk }; //================================================================ - //vtkCxxRevisionMacro(ImagePlanes::VtkCallbackType, "$Revision: 1.30 $"); + //vtkCxxRevisionMacro(ImagePlanes::VtkCallbackType, "$Revision: 1.31 $"); //================================================================ @@ -190,36 +190,14 @@ namespace bbvtk picker->SetTolerance(0.005); // The 3 image plane widgets - vtkImagePlaneWidget* planeWidgetX = vtkImagePlaneWidget::New(); - planeWidgetX->DisplayTextOn(); - planeWidgetX->SetPicker(picker); - planeWidgetX->SetKeyPressActivationValue('x'); - vtkProperty* prop1 = planeWidgetX->GetPlaneProperty(); - prop1->SetColor(1, 0, 0); - - vtkImagePlaneWidget* planeWidgetY = vtkImagePlaneWidget::New(); - planeWidgetY->DisplayTextOn(); - planeWidgetY->SetPicker(picker); - planeWidgetY->SetKeyPressActivationValue('y'); - vtkProperty* prop2 = planeWidgetY->GetPlaneProperty(); - prop2->SetColor(1, 1, 0); + vtkImagePlaneWidget* planeWidgetX = GetPlaneWidget('x', 1, 0, 0, picker); + vtkImagePlaneWidget* planeWidgetY = GetPlaneWidget('y', 1, 1, 0, picker); planeWidgetY->SetLookupTable(planeWidgetX->GetLookupTable()); - vtkImagePlaneWidget* planeWidgetZ = vtkImagePlaneWidget::New(); - planeWidgetZ->DisplayTextOn(); - planeWidgetZ->SetPicker(picker); - planeWidgetZ->SetKeyPressActivationValue('z'); - vtkProperty* prop3 = planeWidgetZ->GetPlaneProperty(); - prop3->SetColor(0, 0, 1); + vtkImagePlaneWidget* planeWidgetZ = GetPlaneWidget('z', 0, 0, 1, picker); planeWidgetZ->SetLookupTable(planeWidgetX->GetLookupTable()); - vtkImagePlaneWidget* planeWidget3Pts = vtkImagePlaneWidget::New(); - //vtkPlaneWidget* planeWidget3Pts = vtkPlaneWidget::New(); - planeWidget3Pts->DisplayTextOn(); - planeWidget3Pts->SetPicker(picker); - planeWidget3Pts->SetKeyPressActivationValue('3'); - vtkProperty* prop3Pts = planeWidget3Pts->GetPlaneProperty(); - prop3Pts->SetColor(0, 1, 1); + vtkImagePlaneWidget* planeWidget3Pts = GetPlaneWidget('3', 0, 1, 1, picker); planeWidget3Pts->SetLookupTable(planeWidgetX->GetLookupTable()); bbSetOutputPlaneX(planeWidgetX); @@ -229,6 +207,7 @@ namespace bbvtk bbSetOutputImageX(planeWidgetX->GetResliceOutput()); bbSetOutputImageY(planeWidgetY->GetResliceOutput()); bbSetOutputImageZ(planeWidgetZ->GetResliceOutput()); + bbSetInputInteractor(0); //bbSetOutputImage3Pts(planeWidget3Pts->GetResliceOutput()); picker->UnRegister(NULL); @@ -315,6 +294,8 @@ void ImagePlanes::Process() 0.5*(range[1]+range[0])); } + updateInteractor(); + } // UPDATE DES SORTIES bbGetOutputPlaneX()->GetResliceOutput()->Update(); @@ -325,7 +306,7 @@ void ImagePlanes::Process() std::vector pointsy = bbGetInputPointsY(); std::vector pointsz = bbGetInputPointsZ(); - std::cout<=3){ @@ -421,10 +402,25 @@ void ImagePlanes::Process() } } - +void ImagePlanes::updateInteractor(){ + + vtkRenderWindowInteractor* interactor = bbGetInputInteractor(); + + if(interactor){ + bbGetOutputPlaneX()->SetInteractor(interactor); + bbGetOutputPlaneX()->EnabledOn(); + bbGetOutputPlaneY()->SetInteractor(interactor); + bbGetOutputPlaneY()->EnabledOn(); + bbGetOutputPlaneZ()->SetInteractor(interactor); + bbGetOutputPlaneZ()->EnabledOn(); + bbGetOutputPlane3Pts()->SetInteractor(interactor); + bbGetOutputPlane3Pts()->EnabledOn(); + } +} //----------------------------------------------------------------- void vtkImageDataPointerRelay::bbUserSetDefaultValues() { + } //----------------------------------------------------------------- @@ -437,7 +433,20 @@ void ImagePlanes::Process() { } - + vtkImagePlaneWidget* ImagePlanes::GetPlaneWidget(unsigned char activationkey, double r, double g, double b, vtkCellPicker* picker){ + + vtkProperty* prop1 = 0; + vtkImagePlaneWidget* planeWidget = 0; + + planeWidget = vtkImagePlaneWidget::New(); + planeWidget->DisplayTextOn(); + planeWidget->SetPicker(picker); + planeWidget->SetKeyPressActivationValue(activationkey); + prop1 = planeWidget->GetPlaneProperty(); + prop1->SetColor(r, g, b); + + return planeWidget; + } double* ImagePlanes::getCrossProduct(double* vect0,double* vect1){ double* vectCross; diff --git a/packages/vtk/src/bbvtkImagePlanes.h b/packages/vtk/src/bbvtkImagePlanes.h index aec9cba..aba6557 100644 --- a/packages/vtk/src/bbvtkImagePlanes.h +++ b/packages/vtk/src/bbvtkImagePlanes.h @@ -2,8 +2,8 @@ Program: bbtk Module: $RCSfile: bbvtkImagePlanes.h,v $ Language: C++ - Date: $Date: 2009/07/02 07:17:33 $ - Version: $Revision: 1.19 $ + Date: $Date: 2010/01/21 16:03:19 $ + Version: $Revision: 1.20 $ =========================================================================*/ /* --------------------------------------------------------------------- @@ -72,6 +72,7 @@ namespace bbvtk BBTK_DECLARE_INPUT(PointsX, std::vector); BBTK_DECLARE_INPUT(PointsY, std::vector); BBTK_DECLARE_INPUT(PointsZ, std::vector); + BBTK_DECLARE_INPUT(Interactor, vtkRenderWindowInteractor*); BBTK_DECLARE_OUTPUT(PlaneX, vtkImagePlaneWidget*); BBTK_DECLARE_OUTPUT(PlaneY, vtkImagePlaneWidget*); @@ -102,6 +103,9 @@ namespace bbvtk double* getNormal(double* vect); double getMagnitud(double* vect); double* makeVector(double podouble0[3], double podouble1[3]); + void updateInteractor(); + + vtkImagePlaneWidget* GetPlaneWidget(unsigned char activationkey, double r, double g, double b, vtkCellPicker* picker); }; //================================================================= @@ -117,6 +121,7 @@ namespace bbvtk BBTK_INPUT(ImagePlanes, PointsX, "Points in X", std::vector, ""); BBTK_INPUT(ImagePlanes, PointsY, "Points in Y", std::vector, ""); BBTK_INPUT(ImagePlanes, PointsZ, "Points in Z", std::vector, ""); + BBTK_INPUT(ImagePlanes, Interactor, "Interactor for the planes", vtkRenderWindowInteractor*, ""); BBTK_OUTPUT(ImagePlanes,PlaneX, "The image plane in X direction", vtkImagePlaneWidget*, ""); BBTK_OUTPUT(ImagePlanes,PlaneY, "The image plane in Y direction", vtkImagePlaneWidget*, "");