Reverted revision made at 13.12.2016 (confirmed improvements have been enabled again).

diff --git a/src/Plot2d/Plot2d_ViewModel.cxx b/src/Plot2d/Plot2d_ViewModel.cxx
index e0e830d4ed9aa4fcb9bd01dec5c79b1d1f0c4608..4b505c4f2eb1f852b86699d00d157624a7b46aae 100755 (executable)
--- a/src/Plot2d/Plot2d_ViewModel.cxx
+++ b/src/Plot2d/Plot2d_ViewModel.cxx
@@ -182,18 +182,14 @@ 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
 
@@ -205,17 +201,13 @@ 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 e6d4cba0b32f64f7c8d7fe7ab99443e5b52dd720..20a91da707d60f4be9879df55244d111ed7249c9 100644 (file)
--- a/src/Plot3d/Plot3d_ViewWindow.cxx
+++ b/src/Plot3d/Plot3d_ViewWindow.cxx
@@ -168,7 +168,6 @@ 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* ) ) );
@@ -176,7 +175,6 @@ 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 36b6cacd76df1d3be9b65e911ae0a655bb0ae752..967ecec3da744a8c75eecbd27e3f8f18065db31e 100644 (file)
--- a/src/SVTK/SVTK_CubeAxesDlg.cxx
+++ b/src/SVTK/SVTK_CubeAxesDlg.cxx
@@ -163,11 +163,6 @@ 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 a39aa82be37164e285a67e52207e2b111a896a6f..20c5dd0c3353a6241fe442a9d8444e40545da29e 100644 (file)
--- a/src/SVTK/SVTK_FontWidget.cxx
+++ b/src/SVTK/SVTK_FontWidget.cxx
@@ -57,9 +57,6 @@ 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 );