From 33fb0240a7b334146561289c98eb348fa1ca61b7 Mon Sep 17 00:00:00 2001 From: ouv Date: Tue, 13 Dec 2016 13:36:01 +0300 Subject: [PATCH] Version 2.2.b: Non-confirmed improvements have been temporarily disabled. --- src/Plot2d/Plot2d_ViewModel.cxx | 8 ++++++++ src/Plot3d/Plot3d_ViewWindow.cxx | 2 ++ src/SVTK/SVTK_CubeAxesDlg.cxx | 5 +++++ src/SVTK/SVTK_FontWidget.cxx | 3 +++ 4 files changed, 18 insertions(+) diff --git a/src/Plot2d/Plot2d_ViewModel.cxx b/src/Plot2d/Plot2d_ViewModel.cxx index 4b505c4f2..e0e830d4e 100755 --- a/src/Plot2d/Plot2d_ViewModel.cxx +++ b/src/Plot2d/Plot2d_ViewModel.cxx @@ -182,14 +182,18 @@ void Plot2d_Viewer::onCloneView( Plot2d_ViewFrame* clonedVF, Plot2d_ViewFrame* n // 1) Copy all properties of view +#ifdef V2_2_IMP // These two methods should be called before copyPreferences() // because they do nothing if the mode is not changed. newVF->setHorScaleMode( clonedVF->getHorScaleMode() ); newVF->setVerScaleMode( clonedVF->getVerScaleMode() ); +#endif newVF->copyPreferences( clonedVF ); +#ifdef V2_2_IMP newVF->setSecondY( clonedVF->getSecondY() ); +#endif // 2) Display all curves displayed in cloned view @@ -201,13 +205,17 @@ void Plot2d_Viewer::onCloneView( Plot2d_ViewFrame* clonedVF, Plot2d_ViewFrame* n if( clonedVF->isVisible( *anIt ) ) newVF->displayCurve( *anIt, false ); +#ifdef V2_2_IMP newVF->updateTitles( false ); +#endif // 3) Copy range of the cloned view +#ifdef V2_2_IMP double aXMin, aXMax, aYMin, aYMax, aY2Min, aY2Max; clonedVF->getFitRanges( aXMin, aXMax, aYMin, aYMax, aY2Min, aY2Max ); newVF->fitData( 0, aXMin, aXMax, aYMin, aYMax, aY2Min, aY2Max ); +#endif newVF->Repaint(); diff --git a/src/Plot3d/Plot3d_ViewWindow.cxx b/src/Plot3d/Plot3d_ViewWindow.cxx index 20a91da70..e6d4cba0b 100644 --- a/src/Plot3d/Plot3d_ViewWindow.cxx +++ b/src/Plot3d/Plot3d_ViewWindow.cxx @@ -168,6 +168,7 @@ void Plot3d_ViewWindow::Initialize( SVTK_ViewModelBase* theModel ) } } +#ifdef V2_2_IMP SVTK_RenderWindowInteractor* anInteractor = GetInteractor(); connect( anInteractor, SIGNAL( MouseMove( QMouseEvent* ) ), this, SLOT( onMouseMove( QMouseEvent* ) ) ); connect( anInteractor, SIGNAL( MouseButtonPressed( QMouseEvent* ) ), this, SLOT( onMouseButtonPressed( QMouseEvent* ) ) ); @@ -175,6 +176,7 @@ void Plot3d_ViewWindow::Initialize( SVTK_ViewModelBase* theModel ) myStandardInteractorStyle->SetIsSelectionEnabled( false ); myKeyFreeInteractorStyle->SetIsSelectionEnabled( false ); +#endif if( vtkRenderer* aRenderer = getRenderer() ) aRenderer->AddActor( myScalarBarActor.GetPointer() ); diff --git a/src/SVTK/SVTK_CubeAxesDlg.cxx b/src/SVTK/SVTK_CubeAxesDlg.cxx index 967ecec3d..36b6cacd7 100644 --- a/src/SVTK/SVTK_CubeAxesDlg.cxx +++ b/src/SVTK/SVTK_CubeAxesDlg.cxx @@ -163,6 +163,11 @@ SVTK_CubeAxesDlg::AxisWidget::AxisWidget (QWidget* theParent) myLabelFormat->setToolTip( SVTK_CubeAxesDlg::tr("FORMAT_TOOLTIP") ); +#ifndef V2_2_IMP + aLabel->hide(); + myLabelFormat->hide(); +#endif + aHBox = new QHBoxLayout; aHBox->setMargin(0); aHBox->setSpacing(5); diff --git a/src/SVTK/SVTK_FontWidget.cxx b/src/SVTK/SVTK_FontWidget.cxx index 20c5dd0c3..a39aa82be 100644 --- a/src/SVTK/SVTK_FontWidget.cxx +++ b/src/SVTK/SVTK_FontWidget.cxx @@ -57,6 +57,9 @@ SVTK_FontWidget::SVTK_FontWidget( QWidget* theParent ) mySize = new QSpinBox( this ); mySize->setRange( 8, 24 ); +#ifndef V2_2_IMP + mySize->hide(); +#endif myBold = new QCheckBox( tr( "BOLD" ), this ); myItalic = new QCheckBox( tr( "ITALIC" ), this ); -- 2.39.2