From d7daad15723494290fbb75a32856eb2870075e96 Mon Sep 17 00:00:00 2001
From: Christophe Geuzaine <cgeuzaine@ulg.ac.be>
Date: Thu, 17 Mar 2011 17:04:09 +0000
Subject: [PATCH] use adapted data wherever possible, and issue a warning if we
do (since only a single time step is then available to the plugin) -- for
Koen
---
Plugin/AnalyseCurvedMesh.cpp | 4 ++--
Plugin/AnalyseCurvedMesh.h | 2 +-
Plugin/Annotate.cpp | 2 +-
Plugin/Annotate.h | 2 +-
Plugin/Bubbles.cpp | 2 +-
Plugin/Bubbles.h | 2 +-
Plugin/CMakeLists.txt | 2 +-
Plugin/Curl.cpp | 4 ++--
Plugin/Curl.h | 2 +-
Plugin/CutGrid.cpp | 4 ++--
Plugin/CutGrid.h | 2 +-
Plugin/CutParametric.cpp | 4 ++--
Plugin/CutParametric.h | 2 +-
Plugin/CutPlane.cpp | 2 +-
Plugin/CutPlane.h | 2 +-
Plugin/CutSphere.cpp | 2 +-
Plugin/CutSphere.h | 2 +-
Plugin/Distance.cpp | 2 +-
Plugin/Distance.h | 2 +-
Plugin/Divergence.cpp | 4 ++--
Plugin/Divergence.h | 2 +-
Plugin/Eigenvalues.cpp | 4 ++--
Plugin/Eigenvalues.h | 2 +-
Plugin/Eigenvectors.cpp | 4 ++--
Plugin/Eigenvectors.h | 2 +-
Plugin/ExtractEdges.cpp | 2 +-
Plugin/ExtractEdges.h | 2 +-
Plugin/ExtractElements.cpp | 4 ++--
Plugin/ExtractElements.h | 2 +-
Plugin/FieldFromAmplitudePhase.cpp | 2 +-
Plugin/FieldFromAmplitudePhase.h | 2 +-
Plugin/GSHHS.h | 2 +-
Plugin/Gradient.cpp | 4 ++--
Plugin/Gradient.h | 2 +-
Plugin/HarmonicToTime.cpp | 2 +-
Plugin/HarmonicToTime.h | 2 +-
Plugin/HomologyComputation.cpp | 2 +-
Plugin/HomologyComputation.h | 2 +-
Plugin/Integrate.cpp | 4 ++--
Plugin/Integrate.h | 2 +-
Plugin/Isosurface.cpp | 2 +-
Plugin/Isosurface.h | 2 +-
Plugin/Lambda2.cpp | 2 +-
Plugin/Lambda2.h | 2 +-
Plugin/Levelset.cpp | 6 +++---
Plugin/Levelset.h | 2 +-
Plugin/LongitudeLatitude.cpp | 2 +-
Plugin/LongitudeLatitude.h | 2 +-
Plugin/MakeSimplex.cpp | 2 +-
Plugin/MakeSimplex.h | 2 +-
Plugin/MathEval.cpp | 6 +++---
Plugin/MathEval.h | 2 +-
Plugin/MinMax.cpp | 2 +-
Plugin/MinMax.h | 2 +-
Plugin/ModifyComponent.cpp | 6 +++---
Plugin/ModifyComponent.h | 2 +-
Plugin/ModulusPhase.cpp | 2 +-
Plugin/ModulusPhase.h | 2 +-
Plugin/NearestNeighbor.cpp | 4 ++--
Plugin/NearestNeighbor.h | 2 +-
Plugin/Particles.cpp | 4 ++--
Plugin/Particles.h | 2 +-
Plugin/Plugin.cpp | 12 +++++++++++-
Plugin/Plugin.h | 5 ++++-
Plugin/PluginManager.cpp | 2 +-
Plugin/PluginManager.h | 2 +-
Plugin/Probe.cpp | 2 +-
Plugin/Probe.h | 2 +-
Plugin/Remove.cpp | 2 +-
Plugin/Remove.h | 2 +-
Plugin/Skin.cpp | 4 ++--
Plugin/Skin.h | 2 +-
Plugin/Smooth.cpp | 2 +-
Plugin/Smooth.h | 2 +-
Plugin/SphericalRaise.cpp | 2 +-
Plugin/SphericalRaise.h | 2 +-
Plugin/StreamLines.cpp | 6 +++---
Plugin/StreamLines.h | 2 +-
Plugin/Tetrahedralize.cpp | 2 +-
Plugin/Tetrahedralize.h | 2 +-
Plugin/Transform.cpp | 2 +-
Plugin/Transform.h | 2 +-
Plugin/Triangulate.cpp | 2 +-
Plugin/Triangulate.h | 2 +-
Plugin/Warp.cpp | 2 +-
Plugin/Warp.h | 2 +-
86 files changed, 120 insertions(+), 107 deletions(-)
diff --git a/Plugin/AnalyseCurvedMesh.cpp b/Plugin/AnalyseCurvedMesh.cpp
index 3edb335298..9811032167 100644
--- a/Plugin/AnalyseCurvedMesh.cpp
+++ b/Plugin/AnalyseCurvedMesh.cpp
@@ -1,4 +1,4 @@
-// Gmsh - Copyright (C) 1997-2010 C. Geuzaine, J.-F. Remacle
+// Gmsh - Copyright (C) 1997-2011 C. Geuzaine, J.-F. Remacle
//
// See the LICENSE.txt file for license information. Please report all
// bugs and problems to <gmsh@geuz.org>.
@@ -797,4 +797,4 @@ int GMSH_AnalyseCurvedMeshPlugin::division
}
}
Msg::Info(" ");
- }*/
\ No newline at end of file
+ }*/
diff --git a/Plugin/AnalyseCurvedMesh.h b/Plugin/AnalyseCurvedMesh.h
index 985cdc7383..f00a97a87e 100644
--- a/Plugin/AnalyseCurvedMesh.h
+++ b/Plugin/AnalyseCurvedMesh.h
@@ -1,4 +1,4 @@
-// Gmsh - Copyright (C) 1997-2010 C. Geuzaine, J.-F. Remacle
+// Gmsh - Copyright (C) 1997-2011 C. Geuzaine, J.-F. Remacle
//
// See the LICENSE.txt file for license information. Please report all
// bugs and problems to <gmsh@geuz.org>.
diff --git a/Plugin/Annotate.cpp b/Plugin/Annotate.cpp
index 6614681233..3ff4aa216e 100644
--- a/Plugin/Annotate.cpp
+++ b/Plugin/Annotate.cpp
@@ -1,4 +1,4 @@
-// Gmsh - Copyright (C) 1997-2010 C. Geuzaine, J.-F. Remacle
+// Gmsh - Copyright (C) 1997-2011 C. Geuzaine, J.-F. Remacle
//
// See the LICENSE.txt file for license information. Please report all
// bugs and problems to <gmsh@geuz.org>.
diff --git a/Plugin/Annotate.h b/Plugin/Annotate.h
index 4c0bad1010..c29a77c2a5 100644
--- a/Plugin/Annotate.h
+++ b/Plugin/Annotate.h
@@ -1,4 +1,4 @@
-// Gmsh - Copyright (C) 1997-2010 C. Geuzaine, J.-F. Remacle
+// Gmsh - Copyright (C) 1997-2011 C. Geuzaine, J.-F. Remacle
//
// See the LICENSE.txt file for license information. Please report all
// bugs and problems to <gmsh@geuz.org>.
diff --git a/Plugin/Bubbles.cpp b/Plugin/Bubbles.cpp
index b904f57db8..e21e96a457 100644
--- a/Plugin/Bubbles.cpp
+++ b/Plugin/Bubbles.cpp
@@ -1,4 +1,4 @@
-// Gmsh - Copyright (C) 1997-2010 C. Geuzaine, J.-F. Remacle
+// Gmsh - Copyright (C) 1997-2011 C. Geuzaine, J.-F. Remacle
//
// See the LICENSE.txt file for license information. Please report all
// bugs and problems to <gmsh@geuz.org>.
diff --git a/Plugin/Bubbles.h b/Plugin/Bubbles.h
index f6ba36852f..db18714571 100644
--- a/Plugin/Bubbles.h
+++ b/Plugin/Bubbles.h
@@ -1,4 +1,4 @@
-// Gmsh - Copyright (C) 1997-2010 C. Geuzaine, J.-F. Remacle
+// Gmsh - Copyright (C) 1997-2011 C. Geuzaine, J.-F. Remacle
//
// See the LICENSE.txt file for license information. Please report all
// bugs and problems to <gmsh@geuz.org>.
diff --git a/Plugin/CMakeLists.txt b/Plugin/CMakeLists.txt
index c2c0a550a2..15fae2bc0f 100644
--- a/Plugin/CMakeLists.txt
+++ b/Plugin/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Gmsh - Copyright (C) 1997-2010 C. Geuzaine, J.-F. Remacle
+# Gmsh - Copyright (C) 1997-2011 C. Geuzaine, J.-F. Remacle
#
# See the LICENSE.txt file for license information. Please report all
# bugs and problems to <gmsh@geuz.org>.
diff --git a/Plugin/Curl.cpp b/Plugin/Curl.cpp
index 307ac6cb83..1051eafbb2 100644
--- a/Plugin/Curl.cpp
+++ b/Plugin/Curl.cpp
@@ -1,4 +1,4 @@
-// Gmsh - Copyright (C) 1997-2010 C. Geuzaine, J.-F. Remacle
+// Gmsh - Copyright (C) 1997-2011 C. Geuzaine, J.-F. Remacle
//
// See the LICENSE.txt file for license information. Please report all
// bugs and problems to <gmsh@geuz.org>.
@@ -44,7 +44,7 @@ PView *GMSH_CurlPlugin::execute(PView *v)
PView *v1 = getView(iView, v);
if(!v1) return v;
- PViewData *data1 = v1->getData(true); // get adaptive data if available
+ PViewData *data1 = getPossiblyAdaptiveData(v1);
if(data1->hasMultipleMeshes()){
Msg::Error("Curl plugin cannot be run on multi-mesh views");
return v;
diff --git a/Plugin/Curl.h b/Plugin/Curl.h
index 5a10f7ed17..de366551fa 100644
--- a/Plugin/Curl.h
+++ b/Plugin/Curl.h
@@ -1,4 +1,4 @@
-// Gmsh - Copyright (C) 1997-2010 C. Geuzaine, J.-F. Remacle
+// Gmsh - Copyright (C) 1997-2011 C. Geuzaine, J.-F. Remacle
//
// See the LICENSE.txt file for license information. Please report all
// bugs and problems to <gmsh@geuz.org>.
diff --git a/Plugin/CutGrid.cpp b/Plugin/CutGrid.cpp
index c74cf9129f..cd7ef8786c 100644
--- a/Plugin/CutGrid.cpp
+++ b/Plugin/CutGrid.cpp
@@ -1,4 +1,4 @@
-// Gmsh - Copyright (C) 1997-2010 C. Geuzaine, J.-F. Remacle
+// Gmsh - Copyright (C) 1997-2011 C. Geuzaine, J.-F. Remacle
//
// See the LICENSE.txt file for license information. Please report all
// bugs and problems to <gmsh@geuz.org>.
@@ -313,7 +313,7 @@ PView *GMSH_CutGridPlugin::GenerateView(PView *v1, int connect)
if(getNbU() <= 0 || getNbV() <= 0)
return v1;
- PViewData *data1 = v1->getData(true); // get adaptive data if available
+ PViewData *data1 = getPossiblyAdaptiveData(v1);
PView *v2 = new PView();
PViewDataList *data2 = getDataList(v2);
diff --git a/Plugin/CutGrid.h b/Plugin/CutGrid.h
index 3e322737c1..66147b3cb3 100644
--- a/Plugin/CutGrid.h
+++ b/Plugin/CutGrid.h
@@ -1,4 +1,4 @@
-// Gmsh - Copyright (C) 1997-2010 C. Geuzaine, J.-F. Remacle
+// Gmsh - Copyright (C) 1997-2011 C. Geuzaine, J.-F. Remacle
//
// See the LICENSE.txt file for license information. Please report all
// bugs and problems to <gmsh@geuz.org>.
diff --git a/Plugin/CutParametric.cpp b/Plugin/CutParametric.cpp
index 584ac0d266..e066b3adac 100644
--- a/Plugin/CutParametric.cpp
+++ b/Plugin/CutParametric.cpp
@@ -1,4 +1,4 @@
-// Gmsh - Copyright (C) 1997-2010 C. Geuzaine, J.-F. Remacle
+// Gmsh - Copyright (C) 1997-2011 C. Geuzaine, J.-F. Remacle
//
// See the LICENSE.txt file for license information. Please report all
// bugs and problems to <gmsh@geuz.org>.
@@ -237,7 +237,7 @@ PView *GMSH_CutParametricPlugin::execute(PView *v)
if(!fillXYZ()) return v;
- PViewData *data1 = v1->getData();
+ PViewData *data1 = getPossiblyAdaptiveData(v1);
int numSteps = data1->getNumTimeSteps();
int nbU = (int)CutParametricOptions_Number[2].def;
diff --git a/Plugin/CutParametric.h b/Plugin/CutParametric.h
index 1f1a8620ab..1c6594c09f 100644
--- a/Plugin/CutParametric.h
+++ b/Plugin/CutParametric.h
@@ -1,4 +1,4 @@
-// Gmsh - Copyright (C) 1997-2010 C. Geuzaine, J.-F. Remacle
+// Gmsh - Copyright (C) 1997-2011 C. Geuzaine, J.-F. Remacle
//
// See the LICENSE.txt file for license information. Please report all
// bugs and problems to <gmsh@geuz.org>.
diff --git a/Plugin/CutPlane.cpp b/Plugin/CutPlane.cpp
index e8b1376606..6548a7f38a 100644
--- a/Plugin/CutPlane.cpp
+++ b/Plugin/CutPlane.cpp
@@ -1,4 +1,4 @@
-// Gmsh - Copyright (C) 1997-2010 C. Geuzaine, J.-F. Remacle
+// Gmsh - Copyright (C) 1997-2011 C. Geuzaine, J.-F. Remacle
//
// See the LICENSE.txt file for license information. Please report all
// bugs and problems to <gmsh@geuz.org>.
diff --git a/Plugin/CutPlane.h b/Plugin/CutPlane.h
index 9ca821e2e5..271754cdc0 100644
--- a/Plugin/CutPlane.h
+++ b/Plugin/CutPlane.h
@@ -1,4 +1,4 @@
-// Gmsh - Copyright (C) 1997-2010 C. Geuzaine, J.-F. Remacle
+// Gmsh - Copyright (C) 1997-2011 C. Geuzaine, J.-F. Remacle
//
// See the LICENSE.txt file for license information. Please report all
// bugs and problems to <gmsh@geuz.org>.
diff --git a/Plugin/CutSphere.cpp b/Plugin/CutSphere.cpp
index f3aa1f40af..a7f8c262f4 100644
--- a/Plugin/CutSphere.cpp
+++ b/Plugin/CutSphere.cpp
@@ -1,4 +1,4 @@
-// Gmsh - Copyright (C) 1997-2010 C. Geuzaine, J.-F. Remacle
+// Gmsh - Copyright (C) 1997-2011 C. Geuzaine, J.-F. Remacle
//
// See the LICENSE.txt file for license information. Please report all
// bugs and problems to <gmsh@geuz.org>.
diff --git a/Plugin/CutSphere.h b/Plugin/CutSphere.h
index 0ef85f2d47..338394daa7 100644
--- a/Plugin/CutSphere.h
+++ b/Plugin/CutSphere.h
@@ -1,4 +1,4 @@
-// Gmsh - Copyright (C) 1997-2010 C. Geuzaine, J.-F. Remacle
+// Gmsh - Copyright (C) 1997-2011 C. Geuzaine, J.-F. Remacle
//
// See the LICENSE.txt file for license information. Please report all
// bugs and problems to <gmsh@geuz.org>.
diff --git a/Plugin/Distance.cpp b/Plugin/Distance.cpp
index c29d9d4533..3b178a9ab8 100644
--- a/Plugin/Distance.cpp
+++ b/Plugin/Distance.cpp
@@ -1,4 +1,4 @@
-// Gmsh - Copyright (C) 1997-2010 C. Geuzaine, J.-F. Remacle
+// Gmsh - Copyright (C) 1997-2011 C. Geuzaine, J.-F. Remacle
//
// See the LICENSE.txt file for license information. Please report all
// bugs and problems to <gmsh@geuz.org>.
diff --git a/Plugin/Distance.h b/Plugin/Distance.h
index 70f265d7c3..70b2d0adea 100644
--- a/Plugin/Distance.h
+++ b/Plugin/Distance.h
@@ -1,4 +1,4 @@
-// Gmsh - Copyright (C) 1997-2010 C. Geuzaine, J.-F. Remacle
+// Gmsh - Copyright (C) 1997-2011 C. Geuzaine, J.-F. Remacle
//
// See the LICENSE.txt file for license information. Please report all
// bugs and problems to <gmsh@geuz.org>.
diff --git a/Plugin/Divergence.cpp b/Plugin/Divergence.cpp
index 6b02c42d2c..d1f1698a8c 100644
--- a/Plugin/Divergence.cpp
+++ b/Plugin/Divergence.cpp
@@ -1,4 +1,4 @@
-// Gmsh - Copyright (C) 1997-2010 C. Geuzaine, J.-F. Remacle
+// Gmsh - Copyright (C) 1997-2011 C. Geuzaine, J.-F. Remacle
//
// See the LICENSE.txt file for license information. Please report all
// bugs and problems to <gmsh@geuz.org>.
@@ -44,7 +44,7 @@ PView *GMSH_DivergencePlugin::execute(PView *v)
PView *v1 = getView(iView, v);
if(!v1) return v;
- PViewData *data1 = v1->getData(true); // get adaptive data if available
+ PViewData *data1 = getPossiblyAdaptiveData(v1);
if(data1->hasMultipleMeshes()){
Msg::Error("Divergence plugin cannot be run on multi-mesh views");
return v;
diff --git a/Plugin/Divergence.h b/Plugin/Divergence.h
index ef6f381317..a10df9854b 100644
--- a/Plugin/Divergence.h
+++ b/Plugin/Divergence.h
@@ -1,4 +1,4 @@
-// Gmsh - Copyright (C) 1997-2010 C. Geuzaine, J.-F. Remacle
+// Gmsh - Copyright (C) 1997-2011 C. Geuzaine, J.-F. Remacle
//
// See the LICENSE.txt file for license information. Please report all
// bugs and problems to <gmsh@geuz.org>.
diff --git a/Plugin/Eigenvalues.cpp b/Plugin/Eigenvalues.cpp
index 933d91d440..8fe6eaa78d 100644
--- a/Plugin/Eigenvalues.cpp
+++ b/Plugin/Eigenvalues.cpp
@@ -1,4 +1,4 @@
-// Gmsh - Copyright (C) 1997-2010 C. Geuzaine, J.-F. Remacle
+// Gmsh - Copyright (C) 1997-2011 C. Geuzaine, J.-F. Remacle
//
// See the LICENSE.txt file for license information. Please report all
// bugs and problems to <gmsh@geuz.org>.
@@ -44,7 +44,7 @@ PView *GMSH_EigenvaluesPlugin::execute(PView *v)
PView *v1 = getView(iView, v);
if(!v1) return v;
- PViewData *data1 = v1->getData();
+ PViewData *data1 = getPossiblyAdaptiveData(v1);
if(data1->hasMultipleMeshes()){
Msg::Error("Eigenvalues plugin cannot be run on multi-mesh views");
return v;
diff --git a/Plugin/Eigenvalues.h b/Plugin/Eigenvalues.h
index 7c71996c8a..b0fd2981f6 100644
--- a/Plugin/Eigenvalues.h
+++ b/Plugin/Eigenvalues.h
@@ -1,4 +1,4 @@
-// Gmsh - Copyright (C) 1997-2010 C. Geuzaine, J.-F. Remacle
+// Gmsh - Copyright (C) 1997-2011 C. Geuzaine, J.-F. Remacle
//
// See the LICENSE.txt file for license information. Please report all
// bugs and problems to <gmsh@geuz.org>.
diff --git a/Plugin/Eigenvectors.cpp b/Plugin/Eigenvectors.cpp
index 2a84e7c954..3060d03438 100644
--- a/Plugin/Eigenvectors.cpp
+++ b/Plugin/Eigenvectors.cpp
@@ -1,4 +1,4 @@
-// Gmsh - Copyright (C) 1997-2010 C. Geuzaine, J.-F. Remacle
+// Gmsh - Copyright (C) 1997-2011 C. Geuzaine, J.-F. Remacle
//
// See the LICENSE.txt file for license information. Please report all
// bugs and problems to <gmsh@geuz.org>.
@@ -52,7 +52,7 @@ PView *GMSH_EigenvectorsPlugin::execute(PView *v)
PView *v1 = getView(iView, v);
if(!v1) return v;
- PViewData *data1 = v1->getData();
+ PViewData *data1 = getPossiblyAdaptiveData(v1);
if(data1->hasMultipleMeshes()){
Msg::Error("Eigenvectors plugin cannot be run on multi-mesh views");
return v;
diff --git a/Plugin/Eigenvectors.h b/Plugin/Eigenvectors.h
index ec8dc20d78..b568477b01 100644
--- a/Plugin/Eigenvectors.h
+++ b/Plugin/Eigenvectors.h
@@ -1,4 +1,4 @@
-// Gmsh - Copyright (C) 1997-2010 C. Geuzaine, J.-F. Remacle
+// Gmsh - Copyright (C) 1997-2011 C. Geuzaine, J.-F. Remacle
//
// See the LICENSE.txt file for license information. Please report all
// bugs and problems to <gmsh@geuz.org>.
diff --git a/Plugin/ExtractEdges.cpp b/Plugin/ExtractEdges.cpp
index f3fade5443..d7591e9578 100644
--- a/Plugin/ExtractEdges.cpp
+++ b/Plugin/ExtractEdges.cpp
@@ -1,4 +1,4 @@
-// Gmsh - Copyright (C) 1997-2010 C. Geuzaine, J.-F. Remacle
+// Gmsh - Copyright (C) 1997-2011 C. Geuzaine, J.-F. Remacle
//
// See the LICENSE.txt file for license information. Please report all
// bugs and problems to <gmsh@geuz.org>.
diff --git a/Plugin/ExtractEdges.h b/Plugin/ExtractEdges.h
index 795ac0ed44..352b15d33a 100644
--- a/Plugin/ExtractEdges.h
+++ b/Plugin/ExtractEdges.h
@@ -1,4 +1,4 @@
-// Gmsh - Copyright (C) 1997-2010 C. Geuzaine, J.-F. Remacle
+// Gmsh - Copyright (C) 1997-2011 C. Geuzaine, J.-F. Remacle
//
// See the LICENSE.txt file for license information. Please report all
// bugs and problems to <gmsh@geuz.org>.
diff --git a/Plugin/ExtractElements.cpp b/Plugin/ExtractElements.cpp
index 3c16fe2fe2..3824c913c1 100644
--- a/Plugin/ExtractElements.cpp
+++ b/Plugin/ExtractElements.cpp
@@ -1,4 +1,4 @@
-// Gmsh - Copyright (C) 1997-2010 C. Geuzaine, J.-F. Remacle
+// Gmsh - Copyright (C) 1997-2011 C. Geuzaine, J.-F. Remacle
//
// See the LICENSE.txt file for license information. Please report all
// bugs and problems to <gmsh@geuz.org>.
@@ -55,7 +55,7 @@ PView *GMSH_ExtractElementsPlugin::execute(PView *v)
PView *v1 = getView(iView, v);
if(!v1) return v;
- PViewData *data1 = v1->getData();
+ PViewData *data1 = getPossiblyAdaptiveData(v1);
bool checkMinMax = MinVal != MaxVal;
diff --git a/Plugin/ExtractElements.h b/Plugin/ExtractElements.h
index a735cc5d8f..8b5d81d3a2 100644
--- a/Plugin/ExtractElements.h
+++ b/Plugin/ExtractElements.h
@@ -1,4 +1,4 @@
-// Gmsh - Copyright (C) 1997-2010 C. Geuzaine, J.-F. Remacle
+// Gmsh - Copyright (C) 1997-2011 C. Geuzaine, J.-F. Remacle
//
// See the LICENSE.txt file for license information. Please report all
// bugs and problems to <gmsh@geuz.org>.
diff --git a/Plugin/FieldFromAmplitudePhase.cpp b/Plugin/FieldFromAmplitudePhase.cpp
index 2a5bad0e8e..7681dd0761 100644
--- a/Plugin/FieldFromAmplitudePhase.cpp
+++ b/Plugin/FieldFromAmplitudePhase.cpp
@@ -1,4 +1,4 @@
-// Gmsh - Copyright (C) 1997-2010 C. Geuzaine, J.-F. Remacle
+// Gmsh - Copyright (C) 1997-2011 C. Geuzaine, J.-F. Remacle
//
// See the LICENSE.txt file for license information. Please report all
// bugs and problems to <gmsh@geuz.org>.
diff --git a/Plugin/FieldFromAmplitudePhase.h b/Plugin/FieldFromAmplitudePhase.h
index ea8293bf77..e5c94c760b 100644
--- a/Plugin/FieldFromAmplitudePhase.h
+++ b/Plugin/FieldFromAmplitudePhase.h
@@ -1,4 +1,4 @@
-// Gmsh - Copyright (C) 1997-2010 C. Geuzaine, J.-F. Remacle
+// Gmsh - Copyright (C) 1997-2011 C. Geuzaine, J.-F. Remacle
//
// See the LICENSE.txt file for license information. Please report all
// bugs and problems to <gmsh@geuz.org>.
diff --git a/Plugin/GSHHS.h b/Plugin/GSHHS.h
index aa5b5f4705..ff3803bd8e 100644
--- a/Plugin/GSHHS.h
+++ b/Plugin/GSHHS.h
@@ -1,4 +1,4 @@
-// Gmsh - Copyright (C) 1997-2010 C. Geuzaine, J.-F. Remacle
+// Gmsh - Copyright (C) 1997-2011 C. Geuzaine, J.-F. Remacle
//
// See the LICENSE.txt file for license information. Please report all
// bugs and problems to <gmsh@geuz.org>.
diff --git a/Plugin/Gradient.cpp b/Plugin/Gradient.cpp
index f299217a04..17b210c0a6 100644
--- a/Plugin/Gradient.cpp
+++ b/Plugin/Gradient.cpp
@@ -1,4 +1,4 @@
-// Gmsh - Copyright (C) 1997-2010 C. Geuzaine, J.-F. Remacle
+// Gmsh - Copyright (C) 1997-2011 C. Geuzaine, J.-F. Remacle
//
// See the LICENSE.txt file for license information. Please report all
// bugs and problems to <gmsh@geuz.org>.
@@ -44,7 +44,7 @@ PView *GMSH_GradientPlugin::execute(PView *v)
PView *v1 = getView(iView, v);
if(!v1) return v;
- PViewData *data1 = v1->getData(true); // get adaptive data if available
+ PViewData *data1 = getPossiblyAdaptiveData(v1);
if(data1->hasMultipleMeshes()){
Msg::Error("Gradient plugin cannot be run on multi-mesh views");
return v;
diff --git a/Plugin/Gradient.h b/Plugin/Gradient.h
index abaced418a..bd751a7312 100644
--- a/Plugin/Gradient.h
+++ b/Plugin/Gradient.h
@@ -1,4 +1,4 @@
-// Gmsh - Copyright (C) 1997-2010 C. Geuzaine, J.-F. Remacle
+// Gmsh - Copyright (C) 1997-2011 C. Geuzaine, J.-F. Remacle
//
// See the LICENSE.txt file for license information. Please report all
// bugs and problems to <gmsh@geuz.org>.
diff --git a/Plugin/HarmonicToTime.cpp b/Plugin/HarmonicToTime.cpp
index 67b4b5f498..d85dd61024 100644
--- a/Plugin/HarmonicToTime.cpp
+++ b/Plugin/HarmonicToTime.cpp
@@ -1,4 +1,4 @@
-// Gmsh - Copyright (C) 1997-2010 C. Geuzaine, J.-F. Remacle
+// Gmsh - Copyright (C) 1997-2011 C. Geuzaine, J.-F. Remacle
//
// See the LICENSE.txt file for license information. Please report all
// bugs and problems to <gmsh@geuz.org>.
diff --git a/Plugin/HarmonicToTime.h b/Plugin/HarmonicToTime.h
index 4d6c85a460..085d0da788 100644
--- a/Plugin/HarmonicToTime.h
+++ b/Plugin/HarmonicToTime.h
@@ -1,4 +1,4 @@
-// Gmsh - Copyright (C) 1997-2010 C. Geuzaine, J.-F. Remacle
+// Gmsh - Copyright (C) 1997-2011 C. Geuzaine, J.-F. Remacle
//
// See the LICENSE.txt file for license information. Please report all
// bugs and problems to <gmsh@geuz.org>.
diff --git a/Plugin/HomologyComputation.cpp b/Plugin/HomologyComputation.cpp
index 683305092e..529ace41fc 100644
--- a/Plugin/HomologyComputation.cpp
+++ b/Plugin/HomologyComputation.cpp
@@ -1,4 +1,4 @@
-// Gmsh - Copyright (C) 1997-2010 C. Geuzaine, J.-F. Remacle
+// Gmsh - Copyright (C) 1997-2011 C. Geuzaine, J.-F. Remacle
//
// See the LICENSE.txt file for license information. Please report all
// bugs and problems to <gmsh@geuz.org>.
diff --git a/Plugin/HomologyComputation.h b/Plugin/HomologyComputation.h
index ad4b826d39..a691a5b9e3 100644
--- a/Plugin/HomologyComputation.h
+++ b/Plugin/HomologyComputation.h
@@ -1,4 +1,4 @@
-// Gmsh - Copyright (C) 1997-2010 C. Geuzaine, J.-F. Remacle
+// Gmsh - Copyright (C) 1997-2011 C. Geuzaine, J.-F. Remacle
//
// See the LICENSE.txt file for license information. Please report all
// bugs and problems to <gmsh@geuz.org>.
diff --git a/Plugin/Integrate.cpp b/Plugin/Integrate.cpp
index 31870fae86..bb2577e0d7 100644
--- a/Plugin/Integrate.cpp
+++ b/Plugin/Integrate.cpp
@@ -1,4 +1,4 @@
-// Gmsh - Copyright (C) 1997-2010 C. Geuzaine, J.-F. Remacle
+// Gmsh - Copyright (C) 1997-2011 C. Geuzaine, J.-F. Remacle
//
// See the LICENSE.txt file for license information. Please report all
// bugs and problems to <gmsh@geuz.org>.
@@ -46,7 +46,7 @@ PView *GMSH_IntegratePlugin::execute(PView * v)
PView *v1 = getView(iView, v);
if(!v1) return v;
- PViewData *data1 = v1->getData(true); // get adaptive data if available
+ PViewData *data1 = getPossiblyAdaptiveData(v1);
PView *v2 = new PView();
PViewDataList *data2 = getDataList(v2);
diff --git a/Plugin/Integrate.h b/Plugin/Integrate.h
index 486221d89f..d84fe71d5c 100644
--- a/Plugin/Integrate.h
+++ b/Plugin/Integrate.h
@@ -1,4 +1,4 @@
-// Gmsh - Copyright (C) 1997-2010 C. Geuzaine, J.-F. Remacle
+// Gmsh - Copyright (C) 1997-2011 C. Geuzaine, J.-F. Remacle
//
// See the LICENSE.txt file for license information. Please report all
// bugs and problems to <gmsh@geuz.org>.
diff --git a/Plugin/Isosurface.cpp b/Plugin/Isosurface.cpp
index 9198ee9331..2ec0d6ab7b 100644
--- a/Plugin/Isosurface.cpp
+++ b/Plugin/Isosurface.cpp
@@ -1,4 +1,4 @@
-// Gmsh - Copyright (C) 1997-2010 C. Geuzaine, J.-F. Remacle
+// Gmsh - Copyright (C) 1997-2011 C. Geuzaine, J.-F. Remacle
//
// See the LICENSE.txt file for license information. Please report all
// bugs and problems to <gmsh@geuz.org>.
diff --git a/Plugin/Isosurface.h b/Plugin/Isosurface.h
index 174a177208..99c75ea5af 100644
--- a/Plugin/Isosurface.h
+++ b/Plugin/Isosurface.h
@@ -1,4 +1,4 @@
-// Gmsh - Copyright (C) 1997-2010 C. Geuzaine, J.-F. Remacle
+// Gmsh - Copyright (C) 1997-2011 C. Geuzaine, J.-F. Remacle
//
// See the LICENSE.txt file for license information. Please report all
// bugs and problems to <gmsh@geuz.org>.
diff --git a/Plugin/Lambda2.cpp b/Plugin/Lambda2.cpp
index 647263c068..579203b8e0 100644
--- a/Plugin/Lambda2.cpp
+++ b/Plugin/Lambda2.cpp
@@ -1,4 +1,4 @@
-// Gmsh - Copyright (C) 1997-2010 C. Geuzaine, J.-F. Remacle
+// Gmsh - Copyright (C) 1997-2011 C. Geuzaine, J.-F. Remacle
//
// See the LICENSE.txt file for license information. Please report all
// bugs and problems to <gmsh@geuz.org>.
diff --git a/Plugin/Lambda2.h b/Plugin/Lambda2.h
index 38031da845..a4be8bb560 100644
--- a/Plugin/Lambda2.h
+++ b/Plugin/Lambda2.h
@@ -1,4 +1,4 @@
-// Gmsh - Copyright (C) 1997-2010 C. Geuzaine, J.-F. Remacle
+// Gmsh - Copyright (C) 1997-2011 C. Geuzaine, J.-F. Remacle
//
// See the LICENSE.txt file for license information. Please report all
// bugs and problems to <gmsh@geuz.org>.
diff --git a/Plugin/Levelset.cpp b/Plugin/Levelset.cpp
index 79b5589b67..75097b880e 100644
--- a/Plugin/Levelset.cpp
+++ b/Plugin/Levelset.cpp
@@ -1,4 +1,4 @@
-// Gmsh - Copyright (C) 1997-2010 C. Geuzaine, J.-F. Remacle
+// Gmsh - Copyright (C) 1997-2011 C. Geuzaine, J.-F. Remacle
//
// See the LICENSE.txt file for license information. Please report all
// bugs and problems to <gmsh@geuz.org>.
@@ -407,7 +407,7 @@ PView *GMSH_LevelsetPlugin::execute(PView *v)
}
// get adaptive data if available
- PViewData *vdata = v->getData(true), *wdata;
+ PViewData *vdata = getPossiblyAdaptiveData(v), *wdata;
if(_valueView < 0) {
wdata = vdata;
}
@@ -417,7 +417,7 @@ PView *GMSH_LevelsetPlugin::execute(PView *v)
wdata = vdata;
}
else{
- wdata = PView::list[_valueView]->getData();
+ wdata = getPossiblyAdaptiveData(PView::list[_valueView]);
}
// sanity checks
diff --git a/Plugin/Levelset.h b/Plugin/Levelset.h
index 93233e7257..fb5956aae6 100644
--- a/Plugin/Levelset.h
+++ b/Plugin/Levelset.h
@@ -1,4 +1,4 @@
-// Gmsh - Copyright (C) 1997-2010 C. Geuzaine, J.-F. Remacle
+// Gmsh - Copyright (C) 1997-2011 C. Geuzaine, J.-F. Remacle
//
// See the LICENSE.txt file for license information. Please report all
// bugs and problems to <gmsh@geuz.org>.
diff --git a/Plugin/LongitudeLatitude.cpp b/Plugin/LongitudeLatitude.cpp
index d372a43c40..5af82460ab 100644
--- a/Plugin/LongitudeLatitude.cpp
+++ b/Plugin/LongitudeLatitude.cpp
@@ -1,4 +1,4 @@
-// Gmsh - Copyright (C) 1997-2010 C. Geuzaine, J.-F. Remacle
+// Gmsh - Copyright (C) 1997-2011 C. Geuzaine, J.-F. Remacle
//
// See the LICENSE.txt file for license information. Please report all
// bugs and problems to <gmsh@geuz.org>.
diff --git a/Plugin/LongitudeLatitude.h b/Plugin/LongitudeLatitude.h
index 328b896d97..08de79bfcc 100644
--- a/Plugin/LongitudeLatitude.h
+++ b/Plugin/LongitudeLatitude.h
@@ -1,4 +1,4 @@
-// Gmsh - Copyright (C) 1997-2010 C. Geuzaine, J.-F. Remacle
+// Gmsh - Copyright (C) 1997-2011 C. Geuzaine, J.-F. Remacle
//
// See the LICENSE.txt file for license information. Please report all
// bugs and problems to <gmsh@geuz.org>.
diff --git a/Plugin/MakeSimplex.cpp b/Plugin/MakeSimplex.cpp
index 6934d36359..651c3617d3 100644
--- a/Plugin/MakeSimplex.cpp
+++ b/Plugin/MakeSimplex.cpp
@@ -1,4 +1,4 @@
-// Gmsh - Copyright (C) 1997-2010 C. Geuzaine, J.-F. Remacle
+// Gmsh - Copyright (C) 1997-2011 C. Geuzaine, J.-F. Remacle
//
// See the LICENSE.txt file for license information. Please report all
// bugs and problems to <gmsh@geuz.org>.
diff --git a/Plugin/MakeSimplex.h b/Plugin/MakeSimplex.h
index 4d851f3612..a85d01630e 100644
--- a/Plugin/MakeSimplex.h
+++ b/Plugin/MakeSimplex.h
@@ -1,4 +1,4 @@
-// Gmsh - Copyright (C) 1997-2010 C. Geuzaine, J.-F. Remacle
+// Gmsh - Copyright (C) 1997-2011 C. Geuzaine, J.-F. Remacle
//
// See the LICENSE.txt file for license information. Please report all
// bugs and problems to <gmsh@geuz.org>.
diff --git a/Plugin/MathEval.cpp b/Plugin/MathEval.cpp
index 7cf42c3d4a..1fbcd6dfc8 100644
--- a/Plugin/MathEval.cpp
+++ b/Plugin/MathEval.cpp
@@ -1,4 +1,4 @@
-// Gmsh - Copyright (C) 1997-2010 C. Geuzaine, J.-F. Remacle
+// Gmsh - Copyright (C) 1997-2011 C. Geuzaine, J.-F. Remacle
//
// See the LICENSE.txt file for license information. Please report all
// bugs and problems to <gmsh@geuz.org>.
@@ -95,7 +95,7 @@ PView *GMSH_MathEvalPlugin::execute(PView *view)
PView *v1 = getView(iView, view);
if(!v1) return view;
- PViewData *data1 = v1->getData();
+ PViewData *data1 = getPossiblyAdaptiveData(v1);
if(data1->hasMultipleMeshes()){
Msg::Error("MathEval plugin cannot be applied to multi-mesh views");
@@ -111,7 +111,7 @@ PView *GMSH_MathEvalPlugin::execute(PView *view)
}
}
- PViewData *otherData = otherView->getData();
+ PViewData *otherData = getPossiblyAdaptiveData(otherView);
if(otherData->hasMultipleMeshes()){
Msg::Error("MathEval plugin cannot be applied to multi-mesh views");
return view;
diff --git a/Plugin/MathEval.h b/Plugin/MathEval.h
index df6ff53695..bab16f4fa2 100644
--- a/Plugin/MathEval.h
+++ b/Plugin/MathEval.h
@@ -1,4 +1,4 @@
-// Gmsh - Copyright (C) 1997-2010 C. Geuzaine, J.-F. Remacle
+// Gmsh - Copyright (C) 1997-2011 C. Geuzaine, J.-F. Remacle
//
// See the LICENSE.txt file for license information. Please report all
// bugs and problems to <gmsh@geuz.org>.
diff --git a/Plugin/MinMax.cpp b/Plugin/MinMax.cpp
index bee33744eb..10ed76d800 100644
--- a/Plugin/MinMax.cpp
+++ b/Plugin/MinMax.cpp
@@ -1,4 +1,4 @@
-// Gmsh - Copyright (C) 1997-2010 C. Geuzaine, J.-F. Remacle
+// Gmsh - Copyright (C) 1997-2011 C. Geuzaine, J.-F. Remacle
//
// See the LICENSE.txt file for license information. Please report all
// bugs and problems to <gmsh@geuz.org>.
diff --git a/Plugin/MinMax.h b/Plugin/MinMax.h
index ae37f205d8..8444fcb14b 100644
--- a/Plugin/MinMax.h
+++ b/Plugin/MinMax.h
@@ -1,4 +1,4 @@
-// Gmsh - Copyright (C) 1997-2010 C. Geuzaine, J.-F. Remacle
+// Gmsh - Copyright (C) 1997-2011 C. Geuzaine, J.-F. Remacle
//
// See the LICENSE.txt file for license information. Please report all
// bugs and problems to <gmsh@geuz.org>.
diff --git a/Plugin/ModifyComponent.cpp b/Plugin/ModifyComponent.cpp
index 632b3a0594..904d12ec50 100644
--- a/Plugin/ModifyComponent.cpp
+++ b/Plugin/ModifyComponent.cpp
@@ -1,4 +1,4 @@
-// Gmsh - Copyright (C) 1997-2010 C. Geuzaine, J.-F. Remacle
+// Gmsh - Copyright (C) 1997-2011 C. Geuzaine, J.-F. Remacle
//
// See the LICENSE.txt file for license information. Please report all
// bugs and problems to <gmsh@geuz.org>.
@@ -100,7 +100,7 @@ PView *GMSH_ModifyComponentPlugin::execute(PView *view)
PView *v1 = getView(iView, view);
if(!v1) return view;
- PViewData *data1 = v1->getData();
+ PViewData *data1 = getPossiblyAdaptiveData(v1);
if(timeStep > data1->getNumTimeSteps() - 1){
Msg::Error("Invalid time step (%d) in View[%d]: using step 0 instead",
@@ -117,7 +117,7 @@ PView *GMSH_ModifyComponentPlugin::execute(PView *view)
Msg::Error("View[%d] does not exist: using self", otherView);
}
- PViewData *data2 = v2->getData();
+ PViewData *data2 = getPossiblyAdaptiveData(v2);
if(otherTimeStep < 0 && data2->getNumTimeSteps() != data1->getNumTimeSteps()){
Msg::Error("Number of time steps don't match: using step 0");
diff --git a/Plugin/ModifyComponent.h b/Plugin/ModifyComponent.h
index 30040c5a21..efac5d14b0 100644
--- a/Plugin/ModifyComponent.h
+++ b/Plugin/ModifyComponent.h
@@ -1,4 +1,4 @@
-// Gmsh - Copyright (C) 1997-2010 C. Geuzaine, J.-F. Remacle
+// Gmsh - Copyright (C) 1997-2011 C. Geuzaine, J.-F. Remacle
//
// See the LICENSE.txt file for license information. Please report all
// bugs and problems to <gmsh@geuz.org>.
diff --git a/Plugin/ModulusPhase.cpp b/Plugin/ModulusPhase.cpp
index d371ece4a5..ba74b53d0a 100644
--- a/Plugin/ModulusPhase.cpp
+++ b/Plugin/ModulusPhase.cpp
@@ -1,4 +1,4 @@
-// Gmsh - Copyright (C) 1997-2010 C. Geuzaine, J.-F. Remacle
+// Gmsh - Copyright (C) 1997-2011 C. Geuzaine, J.-F. Remacle
//
// See the LICENSE.txt file for license information. Please report all
// bugs and problems to <gmsh@geuz.org>.
diff --git a/Plugin/ModulusPhase.h b/Plugin/ModulusPhase.h
index 55ff010f7c..9a62290d34 100644
--- a/Plugin/ModulusPhase.h
+++ b/Plugin/ModulusPhase.h
@@ -1,4 +1,4 @@
-// Gmsh - Copyright (C) 1997-2010 C. Geuzaine, J.-F. Remacle
+// Gmsh - Copyright (C) 1997-2011 C. Geuzaine, J.-F. Remacle
//
// See the LICENSE.txt file for license information. Please report all
// bugs and problems to <gmsh@geuz.org>.
diff --git a/Plugin/NearestNeighbor.cpp b/Plugin/NearestNeighbor.cpp
index 1b598d9a61..9509d9b5f3 100644
--- a/Plugin/NearestNeighbor.cpp
+++ b/Plugin/NearestNeighbor.cpp
@@ -1,4 +1,4 @@
-// Gmsh - Copyright (C) 1997-2010 C. Geuzaine, J.-F. Remacle
+// Gmsh - Copyright (C) 1997-2011 C. Geuzaine, J.-F. Remacle
//
// See the LICENSE.txt file for license information. Please report all
// bugs and problems to <gmsh@geuz.org>.
@@ -46,7 +46,7 @@ PView *GMSH_NearestNeighborPlugin::execute(PView *v)
PView *v1 = getView(iView, v);
if(!v1) return v;
- PViewData *data1 = v1->getData();
+ PViewData *data1 = getPossiblyAdaptiveData(v1);
int totpoints = data1->getNumPoints();
if(!totpoints){
diff --git a/Plugin/NearestNeighbor.h b/Plugin/NearestNeighbor.h
index de6f5623bb..d27f49d02d 100644
--- a/Plugin/NearestNeighbor.h
+++ b/Plugin/NearestNeighbor.h
@@ -1,4 +1,4 @@
-// Gmsh - Copyright (C) 1997-2010 C. Geuzaine, J.-F. Remacle
+// Gmsh - Copyright (C) 1997-2011 C. Geuzaine, J.-F. Remacle
//
// See the LICENSE.txt file for license information. Please report all
// bugs and problems to <gmsh@geuz.org>.
diff --git a/Plugin/Particles.cpp b/Plugin/Particles.cpp
index 21bfa752ee..cd99cd4035 100644
--- a/Plugin/Particles.cpp
+++ b/Plugin/Particles.cpp
@@ -1,4 +1,4 @@
-// Gmsh - Copyright (C) 1997-2010 C. Geuzaine, J.-F. Remacle
+// Gmsh - Copyright (C) 1997-2011 C. Geuzaine, J.-F. Remacle
//
// See the LICENSE.txt file for license information. Please report all
// bugs and problems to <gmsh@geuz.org>.
@@ -217,7 +217,7 @@ PView *GMSH_ParticlesPlugin::execute(PView *v)
PView *v1 = getView(iView, v);
if(!v1) return v;
- PViewData *data1 = v1->getData();
+ PViewData *data1 = getPossiblyAdaptiveData(v1);
// sanity checks
if(timeStep > data1->getNumTimeSteps() - 1){
diff --git a/Plugin/Particles.h b/Plugin/Particles.h
index bb754e8e98..209225d2e0 100644
--- a/Plugin/Particles.h
+++ b/Plugin/Particles.h
@@ -1,4 +1,4 @@
-// Gmsh - Copyright (C) 1997-2010 C. Geuzaine, J.-F. Remacle
+// Gmsh - Copyright (C) 1997-2011 C. Geuzaine, J.-F. Remacle
//
// See the LICENSE.txt file for license information. Please report all
// bugs and problems to <gmsh@geuz.org>.
diff --git a/Plugin/Plugin.cpp b/Plugin/Plugin.cpp
index f0ee0db5a5..820cbf8502 100644
--- a/Plugin/Plugin.cpp
+++ b/Plugin/Plugin.cpp
@@ -1,4 +1,4 @@
-// Gmsh - Copyright (C) 1997-2010 C. Geuzaine, J.-F. Remacle
+// Gmsh - Copyright (C) 1997-2011 C. Geuzaine, J.-F. Remacle
//
// See the LICENSE.txt file for license information. Please report all
// bugs and problems to <gmsh@geuz.org>.
@@ -90,6 +90,16 @@ PView *GMSH_PostPlugin::getView(int index, PView *view)
}
}
+PViewData *GMSH_PostPlugin::getPossiblyAdaptiveData(PView *view)
+{
+ if(!view) return 0;
+
+ if(view->getData()->isAdaptive())
+ Msg::Warning("Using adapted data from view '%s': only the current time step "
+ "is available to the plugin", view->getData()->getName().c_str());
+ return view->getData(true);
+}
+
PViewDataList *GMSH_PostPlugin::getDataList(PView *view, bool showError)
{
if(!view) return 0;
diff --git a/Plugin/Plugin.h b/Plugin/Plugin.h
index d896952f8b..1f67856c08 100644
--- a/Plugin/Plugin.h
+++ b/Plugin/Plugin.h
@@ -1,4 +1,4 @@
-// Gmsh - Copyright (C) 1997-2010 C. Geuzaine, J.-F. Remacle
+// Gmsh - Copyright (C) 1997-2011 C. Geuzaine, J.-F. Remacle
//
// See the LICENSE.txt file for license information. Please report all
// bugs and problems to <gmsh@geuz.org>.
@@ -94,6 +94,9 @@ class GMSH_PostPlugin : public GMSH_Plugin
virtual PView *getView(int index, PView *view);
// get the data in list format
virtual PViewDataList *getDataList(PView *view, bool showError=true);
+ // get the the adapted data (i.e. linear, on refined mesh) if
+ // available, otherwise get the original data
+ virtual PViewData *getPossiblyAdaptiveData(PView *view);
virtual void assignSpecificVisibility() const {}
virtual bool geometricalFilter(fullMatrix<double> *) const { return true; }
};
diff --git a/Plugin/PluginManager.cpp b/Plugin/PluginManager.cpp
index 36caecaf91..e8520f371b 100644
--- a/Plugin/PluginManager.cpp
+++ b/Plugin/PluginManager.cpp
@@ -1,4 +1,4 @@
-// Gmsh - Copyright (C) 1997-2010 C. Geuzaine, J.-F. Remacle
+// Gmsh - Copyright (C) 1997-2011 C. Geuzaine, J.-F. Remacle
//
// See the LICENSE.txt file for license information. Please report all
// bugs and problems to <gmsh@geuz.org>.
diff --git a/Plugin/PluginManager.h b/Plugin/PluginManager.h
index a5476c0ad0..01242c96cc 100644
--- a/Plugin/PluginManager.h
+++ b/Plugin/PluginManager.h
@@ -1,4 +1,4 @@
-// Gmsh - Copyright (C) 1997-2010 C. Geuzaine, J.-F. Remacle
+// Gmsh - Copyright (C) 1997-2011 C. Geuzaine, J.-F. Remacle
//
// See the LICENSE.txt file for license information. Please report all
// bugs and problems to <gmsh@geuz.org>.
diff --git a/Plugin/Probe.cpp b/Plugin/Probe.cpp
index 4655beda2f..d15212bda0 100644
--- a/Plugin/Probe.cpp
+++ b/Plugin/Probe.cpp
@@ -1,4 +1,4 @@
-// Gmsh - Copyright (C) 1997-2010 C. Geuzaine, J.-F. Remacle
+// Gmsh - Copyright (C) 1997-2011 C. Geuzaine, J.-F. Remacle
//
// See the LICENSE.txt file for license information. Please report all
// bugs and problems to <gmsh@geuz.org>.
diff --git a/Plugin/Probe.h b/Plugin/Probe.h
index cd40cd035f..2846d69284 100644
--- a/Plugin/Probe.h
+++ b/Plugin/Probe.h
@@ -1,4 +1,4 @@
-// Gmsh - Copyright (C) 1997-2010 C. Geuzaine, J.-F. Remacle
+// Gmsh - Copyright (C) 1997-2011 C. Geuzaine, J.-F. Remacle
//
// See the LICENSE.txt file for license information. Please report all
// bugs and problems to <gmsh@geuz.org>.
diff --git a/Plugin/Remove.cpp b/Plugin/Remove.cpp
index 6290345f75..87bef4ad2d 100644
--- a/Plugin/Remove.cpp
+++ b/Plugin/Remove.cpp
@@ -1,4 +1,4 @@
-// Gmsh - Copyright (C) 1997-2010 C. Geuzaine, J.-F. Remacle
+// Gmsh - Copyright (C) 1997-2011 C. Geuzaine, J.-F. Remacle
//
// See the LICENSE.txt file for license information. Please report all
// bugs and problems to <gmsh@geuz.org>.
diff --git a/Plugin/Remove.h b/Plugin/Remove.h
index 52aaeb0fcd..3a842ab74d 100644
--- a/Plugin/Remove.h
+++ b/Plugin/Remove.h
@@ -1,4 +1,4 @@
-// Gmsh - Copyright (C) 1997-2010 C. Geuzaine, J.-F. Remacle
+// Gmsh - Copyright (C) 1997-2011 C. Geuzaine, J.-F. Remacle
//
// See the LICENSE.txt file for license information. Please report all
// bugs and problems to <gmsh@geuz.org>.
diff --git a/Plugin/Skin.cpp b/Plugin/Skin.cpp
index a9f32f9639..dfff3a0cc0 100644
--- a/Plugin/Skin.cpp
+++ b/Plugin/Skin.cpp
@@ -1,4 +1,4 @@
-// Gmsh - Copyright (C) 1997-2010 C. Geuzaine, J.-F. Remacle
+// Gmsh - Copyright (C) 1997-2011 C. Geuzaine, J.-F. Remacle
//
// See the LICENSE.txt file for license information. Please report all
// bugs and problems to <gmsh@geuz.org>.
@@ -143,7 +143,7 @@ PView *GMSH_SkinPlugin::execute(PView *v)
PView *v1 = getView(iView, v);
if(!v1) return v;
- PViewData *data1 = v1->getData(true); // get adaptive data if available
+ PViewData *data1 = getPossiblyAdaptiveData(v1);
if(data1->hasMultipleMeshes()){
Msg::Error("Skin plugin cannot be applied to multi-mesh views");
diff --git a/Plugin/Skin.h b/Plugin/Skin.h
index 6869cea7e3..785cb011df 100644
--- a/Plugin/Skin.h
+++ b/Plugin/Skin.h
@@ -1,4 +1,4 @@
-// Gmsh - Copyright (C) 1997-2010 C. Geuzaine, J.-F. Remacle
+// Gmsh - Copyright (C) 1997-2011 C. Geuzaine, J.-F. Remacle
//
// See the LICENSE.txt file for license information. Please report all
// bugs and problems to <gmsh@geuz.org>.
diff --git a/Plugin/Smooth.cpp b/Plugin/Smooth.cpp
index 2c14d55471..7733927e67 100644
--- a/Plugin/Smooth.cpp
+++ b/Plugin/Smooth.cpp
@@ -1,4 +1,4 @@
-// Gmsh - Copyright (C) 1997-2010 C. Geuzaine, J.-F. Remacle
+// Gmsh - Copyright (C) 1997-2011 C. Geuzaine, J.-F. Remacle
//
// See the LICENSE.txt file for license information. Please report all
// bugs and problems to <gmsh@geuz.org>.
diff --git a/Plugin/Smooth.h b/Plugin/Smooth.h
index 2c04b91d2a..12e5c9b6ff 100644
--- a/Plugin/Smooth.h
+++ b/Plugin/Smooth.h
@@ -1,4 +1,4 @@
-// Gmsh - Copyright (C) 1997-2010 C. Geuzaine, J.-F. Remacle
+// Gmsh - Copyright (C) 1997-2011 C. Geuzaine, J.-F. Remacle
//
// See the LICENSE.txt file for license information. Please report all
// bugs and problems to <gmsh@geuz.org>.
diff --git a/Plugin/SphericalRaise.cpp b/Plugin/SphericalRaise.cpp
index 4bfc578a9e..10da7d3668 100644
--- a/Plugin/SphericalRaise.cpp
+++ b/Plugin/SphericalRaise.cpp
@@ -1,4 +1,4 @@
-// Gmsh - Copyright (C) 1997-2010 C. Geuzaine, J.-F. Remacle
+// Gmsh - Copyright (C) 1997-2011 C. Geuzaine, J.-F. Remacle
//
// See the LICENSE.txt file for license information. Please report all
// bugs and problems to <gmsh@geuz.org>.
diff --git a/Plugin/SphericalRaise.h b/Plugin/SphericalRaise.h
index ce1ec0f17c..eb7845476d 100644
--- a/Plugin/SphericalRaise.h
+++ b/Plugin/SphericalRaise.h
@@ -1,4 +1,4 @@
-// Gmsh - Copyright (C) 1997-2010 C. Geuzaine, J.-F. Remacle
+// Gmsh - Copyright (C) 1997-2011 C. Geuzaine, J.-F. Remacle
//
// See the LICENSE.txt file for license information. Please report all
// bugs and problems to <gmsh@geuz.org>.
diff --git a/Plugin/StreamLines.cpp b/Plugin/StreamLines.cpp
index 865d629910..ccfab00490 100644
--- a/Plugin/StreamLines.cpp
+++ b/Plugin/StreamLines.cpp
@@ -1,4 +1,4 @@
-// Gmsh - Copyright (C) 1997-2010 C. Geuzaine, J.-F. Remacle
+// Gmsh - Copyright (C) 1997-2011 C. Geuzaine, J.-F. Remacle
//
// See the LICENSE.txt file for license information. Please report all
// bugs and problems to <gmsh@geuz.org>.
@@ -208,10 +208,10 @@ PView *GMSH_StreamLinesPlugin::execute(PView *v)
PView *v1 = getView(iView, v);
if(!v1) return v;
- PViewData *data1 = v1->getData();
+ PViewData *data1 = getPossiblyAdaptiveData(v1);
PView *v2 = (otherView < 0) ? 0 : getView(otherView, v);
- PViewData *data2 = v2 ? v2->getData() : 0;
+ PViewData *data2 = v2 ? getPossiblyAdaptiveData(v2) : 0;
// sanity checks
if(timeStep > data1->getNumTimeSteps() - 1){
diff --git a/Plugin/StreamLines.h b/Plugin/StreamLines.h
index a02042b541..40005a82c6 100644
--- a/Plugin/StreamLines.h
+++ b/Plugin/StreamLines.h
@@ -1,4 +1,4 @@
-// Gmsh - Copyright (C) 1997-2010 C. Geuzaine, J.-F. Remacle
+// Gmsh - Copyright (C) 1997-2011 C. Geuzaine, J.-F. Remacle
//
// See the LICENSE.txt file for license information. Please report all
// bugs and problems to <gmsh@geuz.org>.
diff --git a/Plugin/Tetrahedralize.cpp b/Plugin/Tetrahedralize.cpp
index 90bc73ab9a..83f5599a53 100644
--- a/Plugin/Tetrahedralize.cpp
+++ b/Plugin/Tetrahedralize.cpp
@@ -1,4 +1,4 @@
-// Gmsh - Copyright (C) 1997-2010 C. Geuzaine, J.-F. Remacle
+// Gmsh - Copyright (C) 1997-2011 C. Geuzaine, J.-F. Remacle
//
// See the LICENSE.txt file for license information. Please report all
// bugs and problems to <gmsh@geuz.org>.
diff --git a/Plugin/Tetrahedralize.h b/Plugin/Tetrahedralize.h
index a1a586dc29..8c7ea8d37e 100644
--- a/Plugin/Tetrahedralize.h
+++ b/Plugin/Tetrahedralize.h
@@ -1,4 +1,4 @@
-// Gmsh - Copyright (C) 1997-2010 C. Geuzaine, J.-F. Remacle
+// Gmsh - Copyright (C) 1997-2011 C. Geuzaine, J.-F. Remacle
//
// See the LICENSE.txt file for license information. Please report all
// bugs and problems to <gmsh@geuz.org>.
diff --git a/Plugin/Transform.cpp b/Plugin/Transform.cpp
index 810dc2142b..b23f80ea4f 100644
--- a/Plugin/Transform.cpp
+++ b/Plugin/Transform.cpp
@@ -1,4 +1,4 @@
-// Gmsh - Copyright (C) 1997-2010 C. Geuzaine, J.-F. Remacle
+// Gmsh - Copyright (C) 1997-2011 C. Geuzaine, J.-F. Remacle
//
// See the LICENSE.txt file for license information. Please report all
// bugs and problems to <gmsh@geuz.org>.
diff --git a/Plugin/Transform.h b/Plugin/Transform.h
index 0561a20dfe..15892109ee 100644
--- a/Plugin/Transform.h
+++ b/Plugin/Transform.h
@@ -1,4 +1,4 @@
-// Gmsh - Copyright (C) 1997-2010 C. Geuzaine, J.-F. Remacle
+// Gmsh - Copyright (C) 1997-2011 C. Geuzaine, J.-F. Remacle
//
// See the LICENSE.txt file for license information. Please report all
// bugs and problems to <gmsh@geuz.org>.
diff --git a/Plugin/Triangulate.cpp b/Plugin/Triangulate.cpp
index 3f69ab34c2..0c5b4eb991 100644
--- a/Plugin/Triangulate.cpp
+++ b/Plugin/Triangulate.cpp
@@ -1,4 +1,4 @@
-// Gmsh - Copyright (C) 1997-2010 C. Geuzaine, J.-F. Remacle
+// Gmsh - Copyright (C) 1997-2011 C. Geuzaine, J.-F. Remacle
//
// See the LICENSE.txt file for license information. Please report all
// bugs and problems to <gmsh@geuz.org>.
diff --git a/Plugin/Triangulate.h b/Plugin/Triangulate.h
index 6010e90231..0249b63f63 100644
--- a/Plugin/Triangulate.h
+++ b/Plugin/Triangulate.h
@@ -1,4 +1,4 @@
-// Gmsh - Copyright (C) 1997-2010 C. Geuzaine, J.-F. Remacle
+// Gmsh - Copyright (C) 1997-2011 C. Geuzaine, J.-F. Remacle
//
// See the LICENSE.txt file for license information. Please report all
// bugs and problems to <gmsh@geuz.org>.
diff --git a/Plugin/Warp.cpp b/Plugin/Warp.cpp
index d80732283b..96dee79908 100644
--- a/Plugin/Warp.cpp
+++ b/Plugin/Warp.cpp
@@ -1,4 +1,4 @@
-// Gmsh - Copyright (C) 1997-2010 C. Geuzaine, J.-F. Remacle
+// Gmsh - Copyright (C) 1997-2011 C. Geuzaine, J.-F. Remacle
//
// See the LICENSE.txt file for license information. Please report all
// bugs and problems to <gmsh@geuz.org>.
diff --git a/Plugin/Warp.h b/Plugin/Warp.h
index bba712c2fd..bc3b19496c 100644
--- a/Plugin/Warp.h
+++ b/Plugin/Warp.h
@@ -1,4 +1,4 @@
-// Gmsh - Copyright (C) 1997-2010 C. Geuzaine, J.-F. Remacle
+// Gmsh - Copyright (C) 1997-2011 C. Geuzaine, J.-F. Remacle
//
// See the LICENSE.txt file for license information. Please report all
// bugs and problems to <gmsh@geuz.org>.
--
GitLab