? Servers/Filters/vtkPVBoxZoom.cxx ? Servers/Filters/vtkPVBoxZoom.h Index: Qt/Components/pqGlobalRenderViewOptions.cxx =================================================================== RCS file: /cvsroot/ParaView3/ParaView3/Qt/Components/pqGlobalRenderViewOptions.cxx,v retrieving revision 1.11 diff -u -8 -p -r1.11 pqGlobalRenderViewOptions.cxx --- Qt/Components/pqGlobalRenderViewOptions.cxx 9 Sep 2008 13:03:29 -0000 1.11 +++ Qt/Components/pqGlobalRenderViewOptions.cxx 10 Oct 2008 10:18:20 -0000 @@ -144,17 +144,17 @@ void pqGlobalRenderViewOptions::init() { this->Internal->CameraControl3DComboBoxList << this->Internal->comboBoxCamera3D << this->Internal->comboBoxCamera3D_2 << this->Internal->comboBoxCamera3D_3 << this->Internal->comboBoxCamera3D_4 << this->Internal->comboBoxCamera3D_5 << this->Internal->comboBoxCamera3D_6 << this->Internal->comboBoxCamera3D_7 << this->Internal->comboBoxCamera3D_8 << this->Internal->comboBoxCamera3D_9; this->Internal->CameraControl3DComboItemList //<< "FlyIn" << "FlyOut" << "Move" - << "Pan" << "Roll" << "Rotate" << "Zoom"; + << "Pan" << "Roll" << "Rotate" << "Zoom" << "Box"; for ( int cc = 0; cc < this->Internal->CameraControl3DComboBoxList.size(); cc++ ) { foreach(QString name, this->Internal->CameraControl3DComboItemList) { this->Internal->CameraControl3DComboBoxList.at(cc)->addItem(name); } } Index: Qt/Core/pqRenderView.cxx =================================================================== RCS file: /cvsroot/ParaView3/ParaView3/Qt/Core/pqRenderView.cxx,v retrieving revision 1.41 diff -u -8 -p -r1.41 pqRenderView.cxx --- Qt/Core/pqRenderView.cxx 12 Aug 2008 18:23:38 -0000 1.41 +++ Qt/Core/pqRenderView.cxx 10 Oct 2008 10:18:24 -0000 @@ -78,17 +78,17 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBI #include "pqSettings.h" #include "pqSMAdaptor.h" #include "vtkPVAxesWidget.h" pqRenderView::ManipulatorType pqRenderView::DefaultManipulatorTypes[] = { { 1, 0, 0, "Rotate"}, { 2, 0, 0, "Pan"}, - { 3, 0, 0, "Zoom"}, + { 3, 0, 0, "Box"}, { 1, 1, 0, "Roll"}, { 2, 1, 0, "Rotate"}, { 3, 1, 0, "Pan"}, { 1, 0, 1, "Zoom"}, { 2, 0, 1, "Rotate"}, { 3, 0, 1, "Zoom"}, }; @@ -959,8 +959,9 @@ void pqRenderView::selectFrustumPoints(i void pqRenderView::selectBlock(int rectangle[4], bool expand) { bool block = this->blockSignals(true); QList opPorts; this->selectOnSurfaceInternal(rectangle, opPorts, false, expand, true); this->blockSignals(block); this->emitSelectionSignal(opPorts); } + Index: Qt/Core/pqRenderViewBase.cxx =================================================================== RCS file: /cvsroot/ParaView3/ParaView3/Qt/Core/pqRenderViewBase.cxx,v retrieving revision 1.6 diff -u -8 -p -r1.6 pqRenderViewBase.cxx --- Qt/Core/pqRenderViewBase.cxx 9 Sep 2008 13:03:29 -0000 1.6 +++ Qt/Core/pqRenderViewBase.cxx 10 Oct 2008 10:18:24 -0000 @@ -271,16 +271,20 @@ vtkSMProxy* pqRenderViewBase::createCame else if(name.compare("Roll")==0) { strManipName = "TrackballRoll"; } else if(name.compare("Move")==0) { strManipName = "TrackballMoveActor"; } + else if(name.compare("Box")==0) + { + strManipName = "BoxZoom"; + } else if(name.compare("Zoom")==0) { strManipName = "TrackballZoom"; } else if(name.compare("Pan")==0) { strManipName = "TrackballPan1"; } Index: Servers/Filters/CMakeLists.txt =================================================================== RCS file: /cvsroot/ParaView3/ParaView3/Servers/Filters/CMakeLists.txt,v retrieving revision 1.179 diff -u -8 -p -r1.179 CMakeLists.txt --- Servers/Filters/CMakeLists.txt 8 Oct 2008 13:00:06 -0000 1.179 +++ Servers/Filters/CMakeLists.txt 10 Oct 2008 10:18:25 -0000 @@ -107,16 +107,17 @@ SET(Filters_SRCS vtkPVStringArrayHelper.cxx vtkPVSummaryHelper.cxx vtkPVTextSource.cxx vtkPVTrackballMoveActor.cxx vtkPVTrackballPan.cxx vtkPVTrackballRoll.cxx vtkPVTrackballRotate.cxx vtkPVTrackballZoom.cxx + vtkPVBoxZoom.cxx vtkPVTrivialExtentTranslator.cxx vtkPVTrivialProducer.cxx vtkPVUpdateSuppressor.cxx vtkPVHardwareSelector.cxx vtkRealtimeAnimationPlayer.cxx vtkReductionFilter.cxx vtkSequenceAnimationPlayer.cxx vtkSpyPlotBlock.cxx Index: Servers/ServerManager/Resources/rendering.xml =================================================================== RCS file: /cvsroot/ParaView3/ParaView3/Servers/ServerManager/Resources/rendering.xml,v retrieving revision 1.315 diff -u -8 -p -r1.315 rendering.xml --- Servers/ServerManager/Resources/rendering.xml 9 Oct 2008 21:34:08 -0000 1.315 +++ Servers/ServerManager/Resources/rendering.xml 10 Oct 2008 10:19:50 -0000 @@ -2721,16 +2721,19 @@ + +