Sophie

Sophie

distrib > Mageia > 5 > x86_64 > media > core-release-src > by-pkgid > a9f15ec741a5d54685ef5db0f5da5710 > files > 14

elmer-7.0-0.svn6359.7.mga5.src.rpm

diff --git a/ElmerGUI/Application/cad/cadview.cpp b/ElmerGUI/Application/cad/cadview.cpp
index 2dda67b..cd22b25 100644
--- a/ElmerGUI/Application/cad/cadview.cpp
+++ b/ElmerGUI/Application/cad/cadview.cpp
@@ -380,7 +380,7 @@ bool CadView::readFile(QString fileName)
     // Draw part:
     //-----------
     vtkCleanPolyData* partCleaner = vtkCleanPolyData::New();
-    partCleaner->SetInput(partGrid);
+    partCleaner->SetInputData(partGrid);
     if(mergePoints) {
       partCleaner->PointMergingOn();
     } else {
@@ -423,8 +423,8 @@ bool CadView::readFile(QString fileName)
 
     // Add triangles and edges to STL structures:
     //--------------------------------------------
-    stlSurfaceData->AddInput(partCleaner->GetOutput());
-    stlEdgeData->AddInput(partFeature->GetOutput());
+    stlSurfaceData->AddInputConnection(partCleaner->GetOutputPort());
+    stlEdgeData->AddInputConnection(partFeature->GetOutputPort());
 
     // Clean up:
     //----------
@@ -492,7 +492,7 @@ void CadView::generateSTLSlot()
   //--------------------------------
   vtkCleanPolyData* stlSurface = vtkCleanPolyData::New();
   stlSurface->PointMergingOn();
-  stlSurface->SetInput(stlSurfaceData->GetOutput());
+  stlSurface->SetInputConnection(stlSurfaceData->GetOutputPort());
   stlSurface->Update();
 
   if(stlSurface->GetOutput()->GetNumberOfCells() < 1) {
@@ -518,7 +518,7 @@ void CadView::generateSTLSlot()
   //----------------------------
   vtkCleanPolyData* stlEdge = vtkCleanPolyData::New();
   stlEdge->PointMergingOn();
-  stlEdge->SetInput(stlEdgeData->GetOutput());
+  stlEdge->SetInputConnection(stlEdgeData->GetOutputPort());
   stlEdge->Update();
 
   for(int i = 0; i < stlEdge->GetOutput()->GetNumberOfCells(); i++) {
diff --git a/ElmerGUI/Application/vtkpost/featureedge.cpp b/ElmerGUI/Application/vtkpost/featureedge.cpp
index e37c5ab..28bca00 100755
--- a/ElmerGUI/Application/vtkpost/featureedge.cpp
+++ b/ElmerGUI/Application/vtkpost/featureedge.cpp
@@ -95,7 +95,7 @@ void FeatureEdge::draw(VtkPost* vtkPost, Preferences* preferences)
 
   // Convert from vtkUnstructuredGrid to vtkPolyData:
   vtkGeometryFilter* filter = vtkGeometryFilter::New();
-  filter->SetInput(grid);
+  filter->SetInputData(grid);
   // filter->GetOutput()->ReleaseDataFlagOn();
 
   vtkFeatureEdges* edges = vtkFeatureEdges::New();
diff --git a/ElmerGUI/Application/vtkpost/isocontour.cpp b/ElmerGUI/Application/vtkpost/isocontour.cpp
index d2814ca..5e409bb 100644
--- a/ElmerGUI/Application/vtkpost/isocontour.cpp
+++ b/ElmerGUI/Application/vtkpost/isocontour.cpp
@@ -226,7 +226,7 @@ void IsoContour::draw(VtkPost* vtkPost, TimeStep* timeStep)
   //--------------
   vtkContourFilter* iso = vtkContourFilter::New();
   vtkPost->GetSurfaceGrid()->GetPointData()->SetActiveScalars("IsoContour");
-  iso->SetInput(vtkPost->GetSurfaceGrid());
+  iso->SetInputData(vtkPost->GetSurfaceGrid());
   iso->ComputeScalarsOn();
   if(useListValues) {
     iso->SetNumberOfContours(contourValues);
diff --git a/ElmerGUI/Application/vtkpost/isosurface.cpp b/ElmerGUI/Application/vtkpost/isosurface.cpp
index 347c7ab..7c8e618 100644
--- a/ElmerGUI/Application/vtkpost/isosurface.cpp
+++ b/ElmerGUI/Application/vtkpost/isosurface.cpp
@@ -226,7 +226,7 @@ void IsoSurface::draw(VtkPost* vtkPost, TimeStep* timeStep)
   //--------------
   vtkContourFilter* iso = vtkContourFilter::New();
   vtkPost->GetVolumeGrid()->GetPointData()->SetActiveScalars("IsoSurface");
-  iso->SetInput(vtkPost->GetVolumeGrid());
+  iso->SetInputData(vtkPost->GetVolumeGrid());
   iso->ComputeScalarsOn();
   if(useListValues) {
     iso->SetNumberOfContours(contourValues);
diff --git a/ElmerGUI/Application/vtkpost/matc.cpp b/ElmerGUI/Application/vtkpost/matc.cpp
index 887167f..defd299 100755
--- a/ElmerGUI/Application/vtkpost/matc.cpp
+++ b/ElmerGUI/Application/vtkpost/matc.cpp
@@ -102,16 +102,16 @@ void Matc::grad(VtkPost* vtkPost, double *in, double *out)
   vtkCellDerivatives *cd = vtkCellDerivatives::New();
   if ( volumeGrid->GetNumberOfCells()>0 ) {
     volumeGrid->GetPointData()->SetScalars(s);
-    cd->SetInput(volumeGrid);
+    cd->SetInputData(volumeGrid);
   } else {
     surfaceGrid->GetPointData()->SetScalars(s);
-    cd->SetInput(surfaceGrid);
+    cd->SetInputData(surfaceGrid);
   }
   cd->SetVectorModeToComputeGradient();
   cd->Update();
   
   vtkCellDataToPointData *nd = vtkCellDataToPointData::New();
-  nd->SetInput(cd->GetOutput());
+  nd->SetInputConnection(cd->GetOutputPort());
   nd->Update();
   
   vtkDataArray *da = nd->GetOutput()->GetPointData()->GetVectors();
@@ -144,16 +144,16 @@ void Matc::div(VtkPost* vtkPost, double *in, double *out)
   vtkCellDerivatives *cd = vtkCellDerivatives::New();
   if ( n>0 ) {
     volumeGrid->GetPointData()->SetVectors(s);
-    cd->SetInput(volumeGrid);
+    cd->SetInputData(volumeGrid);
   } else {
     surfaceGrid->GetPointData()->SetVectors(s);
-    cd->SetInput(surfaceGrid);
+    cd->SetInputData(surfaceGrid);
   }
   cd->SetTensorModeToComputeGradient();
   cd->Update();
   
   vtkCellDataToPointData *nd = vtkCellDataToPointData::New();
-  nd->SetInput(cd->GetOutput());
+  nd->SetInputConnection(cd->GetOutputPort());
   nd->Update();
   
   vtkDataArray *da = nd->GetOutput()->GetPointData()->GetTensors();
@@ -189,16 +189,16 @@ void Matc::curl(VtkPost* vtkPost, double *in, double *out)
   vtkCellDerivatives *cd = vtkCellDerivatives::New();
   if ( n>0 ) {
     volumeGrid->GetPointData()->SetVectors(s);
-    cd->SetInput(volumeGrid);
+    cd->SetInputData(volumeGrid);
   } else {
     surfaceGrid->GetPointData()->SetVectors(s);
-    cd->SetInput(surfaceGrid);
+    cd->SetInputData(surfaceGrid);
   }
   cd->SetTensorModeToComputeGradient();
   cd->Update();
   
   vtkCellDataToPointData *nd = vtkCellDataToPointData::New();
-  nd->SetInput(cd->GetOutput());
+  nd->SetInputConnection(cd->GetOutputPort());
   nd->Update();
   
   vtkDataArray *da = nd->GetOutput()->GetPointData()->GetTensors();
diff --git a/ElmerGUI/Application/vtkpost/meshedge.cpp b/ElmerGUI/Application/vtkpost/meshedge.cpp
index 0590823..f8fc484 100755
--- a/ElmerGUI/Application/vtkpost/meshedge.cpp
+++ b/ElmerGUI/Application/vtkpost/meshedge.cpp
@@ -91,7 +91,7 @@ void MeshEdge::draw(VtkPost* vtkPost, Preferences* preferences)
   if(grid->GetNumberOfCells() < 1) return;
 
   vtkExtractEdges* edges = vtkExtractEdges::New();
-  edges->SetInput(grid);
+  edges->SetInputData(grid);
 
   vtkTubeFilter* tubes = vtkTubeFilter::New();
   if(useTubeFilter) {
diff --git a/ElmerGUI/Application/vtkpost/meshpoint.cpp b/ElmerGUI/Application/vtkpost/meshpoint.cpp
index 4ee997f..329110e 100755
--- a/ElmerGUI/Application/vtkpost/meshpoint.cpp
+++ b/ElmerGUI/Application/vtkpost/meshpoint.cpp
@@ -95,7 +95,7 @@ void MeshPoint::draw(VtkPost* vtkPost, Preferences* preferences)
   if(grid->GetNumberOfPoints() < 1) return;
 
   vtkGlyph3D* glyph = vtkGlyph3D::New();
-  glyph->SetInput(grid);
+  glyph->SetInputData(grid);
   glyph->SetSourceConnection(sphere->GetOutputPort());
 
   vtkClipPolyData* clipper = vtkClipPolyData::New();
diff --git a/ElmerGUI/Application/vtkpost/streamline.cpp b/ElmerGUI/Application/vtkpost/streamline.cpp
index b0b71fb..bc0516c 100755
--- a/ElmerGUI/Application/vtkpost/streamline.cpp
+++ b/ElmerGUI/Application/vtkpost/streamline.cpp
@@ -292,12 +292,12 @@ void StreamLine::draw(VtkPost* vtkPost, TimeStep* timeStep)
   vtkStreamLine* streamer = vtkStreamLine::New();
   vtkRungeKutta4* integrator = vtkRungeKutta4::New();
 
-  streamer->SetInput(grid);
+  streamer->SetInputData(grid);
 
   if(lineSource) {
-    streamer->SetSource(line->GetOutput());
+    streamer->SetInputConnection(line->GetOutputPort());
   } else {
-    streamer->SetSource(point->GetOutput());
+    streamer->SetInputConnection(point->GetOutputPort());
   }
 
   streamer->SetIntegrator(integrator);
diff --git a/ElmerGUI/Application/vtkpost/surface.cpp b/ElmerGUI/Application/vtkpost/surface.cpp
index d745b27..3944b2d 100755
--- a/ElmerGUI/Application/vtkpost/surface.cpp
+++ b/ElmerGUI/Application/vtkpost/surface.cpp
@@ -163,8 +163,7 @@ void Surface::draw(VtkPost* vtkPost, TimeStep* timeStep)
   //-------------------------------------------------
   vtkGeometryFilter* filter = vtkGeometryFilter::New();
 
-  filter->SetInput(vtkPost->GetSurfaceGrid());
-  filter->GetOutput()->ReleaseDataFlagOn();
+  filter->SetInputData(vtkPost->GetSurfaceGrid());
 
   // Apply the clip plane:
   //-----------------------
@@ -200,7 +199,7 @@ void Surface::draw(VtkPost* vtkPost, TimeStep* timeStep)
     if(useClip) {
       mapper->SetInputConnection(clipper->GetOutputPort());
     } else {
-      mapper->SetInput(vtkPost->GetSurfaceGrid());
+      mapper->SetInputData(vtkPost->GetSurfaceGrid());
     }
   }
 
diff --git a/ElmerGUI/Application/vtkpost/vector.cpp b/ElmerGUI/Application/vtkpost/vector.cpp
index ec707a7..d5da697 100755
--- a/ElmerGUI/Application/vtkpost/vector.cpp
+++ b/ElmerGUI/Application/vtkpost/vector.cpp
@@ -287,7 +287,7 @@ void Vector::draw(VtkPost* vtkPost, TimeStep* timeStep)
   // Mask points:
   //-------------
   vtkMaskPoints* maskPoints = vtkMaskPoints::New();
-  maskPoints->SetInput(vtkPost->GetVolumeGrid());
+  maskPoints->SetInputData(vtkPost->GetVolumeGrid());
   if(randomMode) {
     maskPoints->RandomModeOn();
   } else {
diff --git a/ElmerGUI/Application/vtkpost/vtkpost.cpp b/ElmerGUI/Application/vtkpost/vtkpost.cpp
index c3b5ca3..15a2c20 100755
--- a/ElmerGUI/Application/vtkpost/vtkpost.cpp
+++ b/ElmerGUI/Application/vtkpost/vtkpost.cpp
@@ -185,7 +185,7 @@ static void pEventHandler(vtkObject* caller, unsigned long eid,
     line->GetPointIds()->SetId(1, 5);
     cross->InsertNextCell(line->GetCellType(), line->GetPointIds());
 
-    mapper->SetInput(cross);
+    mapper->SetInputData(cross);
 
     pickedPointActor->SetMapper(mapper);
     pickedPointActor->SetPosition(pickPos);
@@ -812,15 +812,13 @@ void VtkPost::savePovraySlot()
   // Convert to vtkPolyData with normals:
   //======================================
   vtkGeometryFilter *geometry = vtkGeometryFilter::New();
-  geometry->SetInput(surfaceGrid);
+  geometry->SetInputData(surfaceGrid);
   
   vtkPolyDataNormals *normals = vtkPolyDataNormals::New();
   normals->SetInputConnection(geometry->GetOutputPort());
   
   vtkPolyData *polyData = normals->GetOutput();
 
-  polyData->Update();
-
   polyData->ComputeBounds();
   
   double *bounds = polyData->GetBounds();

--- a/ElmerGUI/ElmerGUI.pri	2013-10-09 10:29:45.996931947 +0800
+++ b/ElmerGUI/ElmerGUI.pri	2013-10-08 21:43:14.000000000 +0800
@@ -11,7 +11,7 @@ DEFINES += EG_QWT      # Use QWT for con
 DEFINES += EG_VTK      # Use VTK for postprocessing?
 DEFINES += EG_MATC     # Use MATC for internal operations in postprocessing?
 DEFINES += EG_OCC      # Use OpenCASCADE 6.3 for importing CAD files? Needs VTK.
-DEFINES -= EG_PYTHONQT # Use PythonQt for scripting in post processor?
+DEFINES += EG_PYTHONQT # Use PythonQt for scripting in post processor?
 
 #------------------------------------------------------------------------------
 # 64 bit system?
@@ -36,9 +36,9 @@ isEmpty(ELMERGUI_HOME) {
 # Python library:
 #------------------------------------------------------------------------------
 unix {
-   PY_INCLUDEPATH = /usr/include/python2.5
+   PY_INCLUDEPATH = /usr/include/python2.7
    PY_LIBPATH = /usr/lib
-   PY_LIBS = -lpython2.5
+   PY_LIBS = -lpython2.7
 }
 
 win32 {
@@ -54,9 +54,9 @@ macx {
 # QWT library:
 #------------------------------------------------------------------------------
 unix {
-  QWT_INCLUDEPATH = /usr/include/qwt-qt4
+  QWT_INCLUDEPATH = /usr/include/qwt
   QWT_LIBPATH = /usr/lib
-  QWT_LIBS = -lqwt-qt4
+  QWT_LIBS = -lqwt
 }
 
 win32 {
@@ -75,23 +75,36 @@ macx {
 # VTK library:
 #------------------------------------------------------------------------------
 unix {
-   VTK_INCLUDEPATH = /usr/include/vtk-5.2
+   VTK_INCLUDEPATH = /usr/include/vtk
    VTK_LIBPATH = /usr/lib
+   VTK_LIBS = -lvtkCommonCore \
+              -lvtkCommonExecutionModel \
+              -lvtkCommonDataModel \
+              -lvtkCommonMisc \
+              -lvtkCommonMath \
-   VTK_LIBS = -lQVTK \
-              -lvtkCommon \
               -lvtkDICOMParser \
+              -lvtkInteractionWidgets \
+              -lvtkFiltersCore \
+              -lvtkFiltersExtraction \
+              -lvtkFiltersGeneral \
+              -lvtkFiltersGeometry \
+              -lvtkFiltersSources \
+              -lvtkFiltersModeling \
+              -lvtkFiltersTexture \
+              -lvtkFiltersFlowPaths \
+              -lvtkRenderingAnnotation \
+              -lvtkRenderingFreeType \
+              -lvtkRenderingOpenGL \
+              -lvtkInteractionStyle \
+              -lvtkRenderingVolumeOpenGL \
+              -lvtkIOCore \
+              -lvtkIOImage \
+              -lvtkInfovisCore \
-              -lvtkFiltering \
-              -lvtkGenericFiltering \
-              -lvtkGraphics \
-              -lvtkHybrid \
-              -lvtkIO \
-              -lvtkImaging \
-              -lvtkInfovis \
               -lvtkNetCDF \
+              -lvtkRenderingCore \
+              -lvtkRenderingFreeTypeOpenGL \
+              -lvtkViewsCore \
+              -lvtkGUISupportQt
-              -lvtkRendering \
-              -lvtkViews \
-              -lvtkVolumeRendering \
-              -lvtkWidgets
 }
 
 win32 {

Perl :: Catalyst :: PostgreSQL :: RPM Valid HTML 4.01 Transitional